Merge "Allow passthrough service manager to register client PIDs."
diff --git a/base/HidlSupport.cpp b/base/HidlSupport.cpp
index 094e0b1..912a5b0 100644
--- a/base/HidlSupport.cpp
+++ b/base/HidlSupport.cpp
@@ -397,8 +397,10 @@
const char *,
const char *,
std::vector<void *> *);
- auto cb = (cb_fun)dlsym(handle,
- ("HIDL_INSTRUMENTATION_FUNCTION_" + mInterfaceName).c_str());
+ FQName package_name = FQName(mInstrumentationLibPackage);
+ auto cb = (cb_fun)dlsym(handle, ("HIDL_INSTRUMENTATION_FUNCTION_"
+ + package_name.tokenName() + "_"
+ + mInterfaceName).c_str());
if ((error = dlerror()) != NULL) {
LOG(WARNING)
<< "couldn't find symbol: HIDL_INSTRUMENTATION_FUNCTION_"
diff --git a/transport/HidlPassthroughSupport.cpp b/transport/HidlPassthroughSupport.cpp
index 9d4e2b4..2e1671d 100644
--- a/transport/HidlPassthroughSupport.cpp
+++ b/transport/HidlPassthroughSupport.cpp
@@ -33,11 +33,11 @@
// interfaceChain fails
return nullptr;
}
- auto iter = gBsConstructorMap.find(myDescriptor);
- if (iter == gBsConstructorMap.end()) {
+ auto func = gBsConstructorMap.get(myDescriptor, nullptr);
+ if (!func) {
return nullptr;
}
- return (iter->second)(reinterpret_cast<void *>(iface.get()));
+ return func(reinterpret_cast<void *>(iface.get()));
}
diff --git a/transport/LegacySupport.cpp b/transport/LegacySupport.cpp
index 44e6df1..17371d4 100644
--- a/transport/LegacySupport.cpp
+++ b/transport/LegacySupport.cpp
@@ -35,6 +35,9 @@
while (!property_get_bool(kDataProperty, false)) {
std::this_thread::sleep_for(300ms);
}
+
+ // TODO(b/35178781) wait a bit longer
+ std::this_thread::sleep_for(300ms);
}
namespace details {
diff --git a/transport/Static.cpp b/transport/Static.cpp
index 4a140e5..d5b335e 100644
--- a/transport/Static.cpp
+++ b/transport/Static.cpp
@@ -25,10 +25,10 @@
Mutex gDefaultServiceManagerLock;
sp<android::hidl::manager::V1_0::IServiceManager> gDefaultServiceManager;
-std::map<std::string, std::function<sp<IBinder>(void *)>>
+ConcurrentMap<std::string, std::function<sp<IBinder>(void *)>>
gBnConstructorMap{};
-std::map<std::string, std::function<sp<::android::hidl::base::V1_0::IBase>(void *)>>
+ConcurrentMap<std::string, std::function<sp<::android::hidl::base::V1_0::IBase>(void *)>>
gBsConstructorMap;
} // namespace hardware
diff --git a/transport/base/1.0/Android.bp b/transport/base/1.0/Android.bp
index c169304..eb6b88f 100644
--- a/transport/base/1.0/Android.bp
+++ b/transport/base/1.0/Android.bp
@@ -1,5 +1,13 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hidl.base@1.0_hal",
+ srcs: [
+ "types.hal",
+ "IBase.hal",
+ ],
+}
+
genrule {
name: "android.hidl.base@1.0_genc++",
tools: ["hidl-gen"],
diff --git a/transport/base/1.0/Android.mk b/transport/base/1.0/Android.mk
index 0d2ff24..c4a1de9 100644
--- a/transport/base/1.0/Android.mk
+++ b/transport/base/1.0/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hidl.base@1.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -58,7 +58,7 @@
LOCAL_MODULE := android.hidl.base@1.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
diff --git a/transport/base/1.0/IBase.hal b/transport/base/1.0/IBase.hal
index 5d4d51a..3eae7ea 100644
--- a/transport/base/1.0/IBase.hal
+++ b/transport/base/1.0/IBase.hal
@@ -25,7 +25,7 @@
*
* Methods defined here are shared by all interfaces (this is like
* java.lang.Object.notify(), for example.) However, the behavior of these
- * functions cannot be overridden.
+ * functions cannot be overridden (with the exception of the "debug" method).
*/
interface IBase {
@@ -98,4 +98,16 @@
* @return info debugging information. See comments of DebugInfo.
*/
getDebugInfo() generates (DebugInfo info);
+
+ /*
+ * Emit diagnostic information to the given file.
+ *
+ * Optionally overriden.
+ *
+ * @param fd File descriptor to dump data to.
+ * Must only be used for the duration of this call.
+ * @param options Arguments for debugging.
+ * Must support empty for default debug information.
+ */
+ debug(handle fd, vec<string> options);
};
diff --git a/transport/include/hidl/ConcurrentMap.h b/transport/include/hidl/ConcurrentMap.h
new file mode 100644
index 0000000..18881f1
--- /dev/null
+++ b/transport/include/hidl/ConcurrentMap.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef ANDROID_HIDL_CONCURRENT_MAP_H
+#define ANDROID_HIDL_CONCURRENT_MAP_H
+
+#include <mutex>
+#include <map>
+
+namespace android {
+namespace hardware {
+
+template<typename K, typename V>
+class ConcurrentMap {
+private:
+ using size_type = typename std::map<K, V>::size_type;
+ using iterator = typename std::map<K, V>::iterator;
+ using const_iterator = typename std::map<K, V>::const_iterator;
+
+public:
+ void set(K &&k, V &&v) {
+ std::unique_lock<std::mutex> _lock(mMutex);
+ mMap[std::forward<K>(k)] = std::forward<V>(v);
+ }
+
+ // get with the given default value.
+ const V &get(const K &k, const V &def) const {
+ std::unique_lock<std::mutex> _lock(mMutex);
+ const_iterator iter = mMap.find(k);
+ if (iter == mMap.end()) {
+ return def;
+ }
+ return iter->second;
+ }
+
+ size_type erase(const K &k) {
+ std::unique_lock<std::mutex> _lock(mMutex);
+ return mMap.erase(k);
+ }
+
+private:
+ mutable std::mutex mMutex;
+ std::map<K, V> mMap;
+};
+
+} // namespace hardware
+} // namespace android
+
+
+#endif // ANDROID_HIDL_CONCURRENT_MAP_H
diff --git a/transport/include/hidl/HidlBinderSupport.h b/transport/include/hidl/HidlBinderSupport.h
index fb0b1f0..2fff6cb 100644
--- a/transport/include/hidl/HidlBinderSupport.h
+++ b/transport/include/hidl/HidlBinderSupport.h
@@ -328,11 +328,11 @@
// interfaceChain fails
return nullptr;
}
- auto iter = gBnConstructorMap.find(myDescriptor);
- if (iter == gBnConstructorMap.end()) {
+ auto func = gBnConstructorMap.get(myDescriptor, nullptr);
+ if (!func) {
return nullptr;
}
- return sp<IBinder>((iter->second)(reinterpret_cast<void *>(ifacePtr)));
+ return sp<IBinder>(func(reinterpret_cast<void *>(ifacePtr)));
}
}
diff --git a/transport/include/hidl/LegacySupport.h b/transport/include/hidl/LegacySupport.h
index 9ee0635..3cc23f3 100644
--- a/transport/include/hidl/LegacySupport.h
+++ b/transport/include/hidl/LegacySupport.h
@@ -71,7 +71,7 @@
* Return value is exit status.
*/
template<class Interface>
-int defaultPassthroughServiceImplementation(std::string name = "default",
+int defaultPassthroughServiceImplementation(std::string name,
size_t maxThreads = 1) {
configureRpcThreadpool(maxThreads, true);
status_t result = registerPassthroughServiceImplementation<Interface>(name);
@@ -83,6 +83,10 @@
joinRpcThreadpool();
return 0;
}
+template<class Interface>
+int defaultPassthroughServiceImplementation(size_t maxThreads = 1) {
+ return defaultPassthroughServiceImplementation<Interface>("default", maxThreads);
+}
} // namespace hardware
} // namespace android
diff --git a/transport/include/hidl/Static.h b/transport/include/hidl/Static.h
index 1f6fa9f..d62d675 100644
--- a/transport/include/hidl/Static.h
+++ b/transport/include/hidl/Static.h
@@ -19,6 +19,7 @@
#include <android/hidl/base/1.0/IBase.h>
#include <android/hidl/manager/1.0/IServiceManager.h>
+#include <hidl/ConcurrentMap.h>
#include <hwbinder/IBinder.h>
#include <utils/threads.h>
@@ -32,14 +33,14 @@
// For HidlBinderSupport
// value function receives reinterpret_cast<void *>(static_cast<IFoo *>(foo)),
// returns sp<IBinder>
-extern std::map<std::string, std::function<sp<IBinder>(void *)>>
- gBnConstructorMap;
+extern ConcurrentMap<std::string,
+ std::function<sp<IBinder>(void *)>> gBnConstructorMap;
// For HidlPassthroughSupport
// value function receives reinterpret_cast<void *>(static_cast<IFoo *>(foo)),
// returns sp<IBase>
-extern std::map<std::string, std::function<sp<::android::hidl::base::V1_0::IBase>(void *)>>
- gBsConstructorMap;
+extern ConcurrentMap<std::string,
+ std::function<sp<::android::hidl::base::V1_0::IBase>(void *)>> gBsConstructorMap;
} // namespace hardware
} // namespace android
diff --git a/transport/manager/1.0/Android.bp b/transport/manager/1.0/Android.bp
index c0ebdab..499b560 100644
--- a/transport/manager/1.0/Android.bp
+++ b/transport/manager/1.0/Android.bp
@@ -1,5 +1,13 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hidl.manager@1.0_hal",
+ srcs: [
+ "IServiceManager.hal",
+ "IServiceNotification.hal",
+ ],
+}
+
genrule {
name: "android.hidl.manager@1.0_genc++",
tools: ["hidl-gen"],
diff --git a/transport/manager/1.0/Android.mk b/transport/manager/1.0/Android.mk
index 27fc2a2..ce0947c 100644
--- a/transport/manager/1.0/Android.mk
+++ b/transport/manager/1.0/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hidl.manager@1.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -62,7 +62,7 @@
LOCAL_MODULE := android.hidl.manager@1.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
diff --git a/transport/memory/1.0/Android.bp b/transport/memory/1.0/Android.bp
index b2454ea..0a7b88f 100644
--- a/transport/memory/1.0/Android.bp
+++ b/transport/memory/1.0/Android.bp
@@ -1,5 +1,14 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hidl.memory@1.0_hal",
+ srcs: [
+ "IAllocator.hal",
+ "IMapper.hal",
+ "IMemory.hal",
+ ],
+}
+
genrule {
name: "android.hidl.memory@1.0_genc++",
tools: ["hidl-gen"],
diff --git a/transport/token/1.0/Android.bp b/transport/token/1.0/Android.bp
index 62b5dbc..ffa1c18 100644
--- a/transport/token/1.0/Android.bp
+++ b/transport/token/1.0/Android.bp
@@ -1,5 +1,12 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hidl.token@1.0_hal",
+ srcs: [
+ "ITokenManager.hal",
+ ],
+}
+
genrule {
name: "android.hidl.token@1.0_genc++",
tools: ["hidl-gen"],
diff --git a/transport/token/1.0/Android.mk b/transport/token/1.0/Android.mk
index 2e4a58d..fe2e7bf 100644
--- a/transport/token/1.0/Android.mk
+++ b/transport/token/1.0/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hidl.token@1.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -42,7 +42,7 @@
LOCAL_MODULE := android.hidl.token@1.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)