commit 20f4ee8c46a35f6ec4bf6c634bee866a2a92be0a
author Yifan Hong <elsk@google.com> Mon Jun 25 16:21:29 2018 -0700
committer Yifan Hong <elsk@google.com> Thu Jun 28 13:23:15 2018 -0700
tree cba646334e7e91527d37494123e905611f8434c8
parent c443091cbc9d4ce9f16bc85222eda932adbd2b65

lshal: Remove obsolete TableEntrySource type.

HalType is a better type.
Test: lshal_test

Change-Id: I2de08a6cce8413d93d3b7fb2367d0c1ad09d032a

cmds/lshal/ListCommand.cpp

diff --git a/cmds/lshal/ListCommand.cpp b/cmds/lshal/ListCommand.cpp
index c313175..fae96d3 100644
--- a/cmds/lshal/ListCommand.cpp
+++ b/cmds/lshal/ListCommand.cpp
@@ -552,17 +552,17 @@
     return OK;
 }
 
-void ListCommand::putEntry(TableEntrySource source, TableEntry &&entry) {
+void ListCommand::putEntry(HalType type, TableEntry &&entry) {
     Table *table = nullptr;
-    switch (source) {
-        case HWSERVICEMANAGER_LIST :
+    switch (type) {
+        case HalType::BINDERIZED_SERVICES :
             table = &mServicesTable; break;
-        case PTSERVICEMANAGER_REG_CLIENT :
+        case HalType::PASSTHROUGH_CLIENTS :
             table = &mPassthroughRefTable; break;
-        case LIST_DLLIB :
+        case HalType::PASSTHROUGH_LIBRARIES :
             table = &mImplementationsTable; break;
         default:
-            err() << "Error: Unknown source of entry " << source << std::endl;
+            err() << "Error: Unknown type of entry " << static_cast<int64_t>(type) << std::endl;
     }
     if (table) {
         table->add(std::forward<TableEntry>(entry));
@@ -588,7 +588,7 @@
             }).first->second.arch |= fromBaseArchitecture(info.arch);
         }
         for (auto &&pair : entries) {
-            putEntry(LIST_DLLIB, std::move(pair.second));
+            putEntry(HalType::PASSTHROUGH_LIBRARIES, std::move(pair.second));
         }
     });
     if (!ret.isOk()) {
@@ -611,7 +611,7 @@
             if (info.clientPids.size() <= 0) {
                 continue;
             }
-            putEntry(PTSERVICEMANAGER_REG_CLIENT, {
+            putEntry(HalType::PASSTHROUGH_CLIENTS, {
                 .interfaceName =
                         std::string{info.interfaceName.c_str()} + "/" +
                         std::string{info.instanceName.c_str()},
@@ -659,7 +659,7 @@
     }
 
     for (auto& pair : allTableEntries) {
-        putEntry(HWSERVICEMANAGER_LIST, std::move(pair.second));
+        putEntry(HalType::BINDERIZED_SERVICES, std::move(pair.second));
     }
     return status;
 }

cmds/lshal/ListCommand.h

diff --git a/cmds/lshal/ListCommand.h b/cmds/lshal/ListCommand.h
index 87d93b5..45f6314 100644
--- a/cmds/lshal/ListCommand.h
+++ b/cmds/lshal/ListCommand.h
@@ -93,7 +93,7 @@
     // Retrieve derived information base on existing table
     virtual void postprocess();
     Status dump();
-    void putEntry(TableEntrySource source, TableEntry &&entry);
+    void putEntry(HalType type, TableEntry &&entry);
     Status fetchPassthrough(const sp<::android::hidl::manager::V1_0::IServiceManager> &manager);
     Status fetchBinderized(const sp<::android::hidl::manager::V1_0::IServiceManager> &manager);
     Status fetchAllLibraries(const sp<::android::hidl::manager::V1_0::IServiceManager> &manager);

cmds/lshal/TableEntry.h

diff --git a/cmds/lshal/TableEntry.h b/cmds/lshal/TableEntry.h
index c9a6a23..d68417b 100644
--- a/cmds/lshal/TableEntry.h
+++ b/cmds/lshal/TableEntry.h
@@ -35,13 +35,6 @@
 using android::procpartition::Partition;
 using Pids = std::vector<int32_t>;
 
-enum : unsigned int {
-    HWSERVICEMANAGER_LIST, // through defaultServiceManager()->list()
-    PTSERVICEMANAGER_REG_CLIENT, // through registerPassthroughClient
-    LIST_DLLIB, // through listing dynamic libraries
-};
-using TableEntrySource = unsigned int;
-
 enum class TableColumnType : unsigned int {
     INTERFACE_NAME,
     TRANSPORT,