support adb-shell style cpp_rpc (apache#8223)

* support adb-shell style cpp_rpc * fix review problems, apache#8223 * add comment & use /data/local/tmp dir in shell terminal case * fix spelling errors * fix spelling errors Co-authored-by: rqg <ranqingguo90@qq.com> Co-authored-by: rqg <ranqingguo318@gmail.com>
zxy844288792 · Jan 13, 2022 · b10c3bb · b10c3bb
1 parent 74ca50b
commit b10c3bb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/apps/cpp_rpc/rpc_env.cc b/apps/cpp_rpc/rpc_env.cc
@@ -39,6 +39,7 @@ int mkdir(const char* path, int /* ignored */) { return _mkdir(path); }
 #include <iostream>
 #include <string>
 #include <vector>
+
 #include "../../src/support/utils.h"
 #include "rpc_env.h"
 
@@ -95,7 +96,16 @@ RPCEnv::RPCEnv(const std::string& wd) {
     auto cmdline = fopen("/proc/self/cmdline", "r");
     fread(cwd, 1, sizeof(cwd), cmdline);
     fclose(cmdline);
-    base_ = "/data/data/" + std::string(cwd) + "/cache/rpc";
+    std::string android_base_ = "/data/data/" + std::string(cwd) + "/cache";
+    struct stat statbuf;
+    // Check if application data directory exist. If not exist, usually means we run tvm_rpc from
+    // adb shell terminal.
+    if (stat(android_base_.data(), &statbuf) == -1 || !S_ISDIR(statbuf.st_mode)) {
+      // Tmp directory is always writable for 'shell' user.
+      android_base_ = "/data/local/tmp";
+    }
+    base_ = android_base_ + "/rpc";
+
 #elif !defined(_WIN32)
     char cwd[PATH_MAX];
     if (getcwd(cwd, sizeof(cwd))) {

diff --git a/apps/cpp_rpc/rpc_server.cc b/apps/cpp_rpc/rpc_server.cc
@@ -203,7 +203,7 @@ class RPCServer {
         auto pid = fork();
         if (pid == 0) {
           ServerLoopProc(conn, addr, work_dir_);
-          exit(0);
+          _exit(0);
         }
         // Wait for the result
         int status = 0;