commit cbff561b4269b8b2885a7b435bd7fd2f3d585a6a
author Steven Moreland <smoreland@google.com> Wed Oct 11 17:01:54 2017 -0700
committer Steven Moreland <smoreland@google.com> Thu Oct 12 16:47:30 2017 +0000
tree dd185dd9a6b2b90b4d712795f7d81ec316ab268b
parent adc25027fdb8162dbd3f661131ba978339fd4db0

Remove use of LOG(*) from HIDL.

This has been a long time complaint since it makes the error
output of HIDL look inconsistent and include unnecessary data.

Also fixed a couple of bugs around logging:
- VTS printing an error message but not erroring
- Places logging instead of CHECKing
- Updating LOG(VERBOSE) logs to follow the '-v' flag

Also replaced LOG(FATAL) with CHECK(false) for consistency.

Test: ./test/run_all_host_tests.sh
Test: manual test for verbose
Change-Id: I1c29f8561aec8fc75c8d3db4d264778cec736d07

Interface.cpp

diff --git a/Interface.cpp b/Interface.cpp
index dac6669..e9e1c8f 100644
--- a/Interface.cpp
+++ b/Interface.cpp
@@ -444,8 +444,8 @@
 bool Interface::addMethod(Method *method) {
     if (isIBase()) {
         if (!gAllReservedMethods.emplace(method->name(), method).second) {
-            LOG(ERROR) << "ERROR: hidl-gen encountered duplicated reserved method "
-                       << method->name();
+            std::cerr << "ERROR: hidl-gen encountered duplicated reserved method " << method->name()
+                      << std::endl;
             return false;
         }
         // will add it in addAllReservedMethods
@@ -510,7 +510,7 @@
         if (serial > LAST_CALL_TRANSACTION) {
             std::cerr << "ERROR: More than " << LAST_CALL_TRANSACTION
                       << " methods (including super and reserved) are not allowed at " << location()
-                      << "\n";
+                      << std::endl;
             return UNKNOWN_ERROR;
         }
 
@@ -525,7 +525,8 @@
     CHECK(isIBase() == mSuperType.isEmptyReference());
 
     if (!isIBase() && !mSuperType->isInterface()) {
-        std::cerr << "ERROR: You can only extend interfaces at " << mSuperType.location() << "\n";
+        std::cerr << "ERROR: You can only extend interfaces at " << mSuperType.location()
+                  << std::endl;
         return UNKNOWN_ERROR;
     }
 
@@ -559,7 +560,7 @@
                 std::cerr << "ERROR: Redefinition of method '" << method->name()
                           << "' defined in interface '" << definedInType->fullName() << "'";
             }
-            std::cerr << " at " << method->location() << "\n";
+            std::cerr << " at " << method->location() << std::endl;
             return UNKNOWN_ERROR;
         }
 
@@ -586,15 +587,14 @@
             || fillDebugMethod(method);
 
         if (!fillSuccess) {
-            LOG(ERROR) << "ERROR: hidl-gen does not recognize a reserved method "
-                       << method->name();
+            std::cerr << "ERROR: hidl-gen does not recognize a reserved method " << method->name()
+                      << std::endl;
             return false;
         }
         if (!reservedMethodsById.emplace(method->getSerialId(), method).second) {
-            LOG(ERROR) << "ERROR: hidl-gen uses duplicated serial id for "
-                       << method->name() << " and "
-                       << reservedMethodsById[method->getSerialId()]->name()
-                       << ", serialId = " << method->getSerialId();
+            std::cerr << "ERROR: hidl-gen uses duplicated serial id for " << method->name()
+                      << " and " << reservedMethodsById[method->getSerialId()]->name()
+                      << ", serialId = " << method->getSerialId() << std::endl;
             return false;
         }
     }
@@ -937,10 +937,11 @@
                     }
                 }
             } else {
-                std::cerr << "Unrecognized annotation '"
-                          << name << "' for method: " << method->name()
+                std::cerr << "ERROR: Unrecognized annotation '" << name
+                          << "' for method: " << method->name()
                           << ". A VTS annotation should be one of: "
-                          << "entry, exit, callflow. \n";
+                          << "entry, exit, callflow." << std::endl;
+                return UNKNOWN_ERROR;
             }
             out.unindent();
             out << "}\n";