summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Gao <jmgao@google.com>2017-04-14 22:04:02 +0200
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-04-14 22:04:04 +0200
commitd3d91e559582d253fd75bebd11f63ef3ea41aab8 (patch)
tree07f0c3ce60b65fcfa4738b99c022c26263252f30
parentMerge "Protect filename_cache with lock in ota fault" (diff)
parentminadbd: switch adb_thread_create to std::thread. (diff)
downloadandroid_bootable_recovery-d3d91e559582d253fd75bebd11f63ef3ea41aab8.tar
android_bootable_recovery-d3d91e559582d253fd75bebd11f63ef3ea41aab8.tar.gz
android_bootable_recovery-d3d91e559582d253fd75bebd11f63ef3ea41aab8.tar.bz2
android_bootable_recovery-d3d91e559582d253fd75bebd11f63ef3ea41aab8.tar.lz
android_bootable_recovery-d3d91e559582d253fd75bebd11f63ef3ea41aab8.tar.xz
android_bootable_recovery-d3d91e559582d253fd75bebd11f63ef3ea41aab8.tar.zst
android_bootable_recovery-d3d91e559582d253fd75bebd11f63ef3ea41aab8.zip
-rw-r--r--minadbd/minadbd_services.cpp30
1 files changed, 3 insertions, 27 deletions
diff --git a/minadbd/minadbd_services.cpp b/minadbd/minadbd_services.cpp
index 426d982eb..a6aa321ca 100644
--- a/minadbd/minadbd_services.cpp
+++ b/minadbd/minadbd_services.cpp
@@ -21,25 +21,13 @@
#include <string.h>
#include <unistd.h>
+#include <thread>
+
#include "adb.h"
#include "fdevent.h"
#include "fuse_adb_provider.h"
#include "sysdeps.h"
-typedef struct stinfo stinfo;
-
-struct stinfo {
- void (*func)(int fd, void *cookie);
- int fd;
- void *cookie;
-};
-
-void service_bootstrap_func(void* x) {
- stinfo* sti = reinterpret_cast<stinfo*>(x);
- sti->func(sti->fd, sti->cookie);
- free(sti);
-}
-
static void sideload_host_service(int sfd, void* data) {
char* args = reinterpret_cast<char*>(data);
int file_size;
@@ -66,19 +54,7 @@ static int create_service_thread(void (*func)(int, void *), void *cookie) {
return -1;
}
- stinfo* sti = static_cast<stinfo*>(malloc(sizeof(stinfo)));
- if(sti == 0) fatal("cannot allocate stinfo");
- sti->func = func;
- sti->cookie = cookie;
- sti->fd = s[1];
-
- if (!adb_thread_create(service_bootstrap_func, sti)) {
- free(sti);
- adb_close(s[0]);
- adb_close(s[1]);
- printf("cannot create service thread\n");
- return -1;
- }
+ std::thread([s, func, cookie]() { func(s[1], cookie); }).detach();
VLOG(SERVICES) << "service thread started, " << s[0] << ":" << s[1];
return s[0];