Merge "Use createProcessGroup() from libprocessgroup" am: 49dc2148a1 am: ff3d9f7746

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1971549

Change-Id: I5a30b54781ccd5d3b7e9ba7255dc626cbdee5823

2 files changed, 4 insertions, 31 deletions

diff --git a/alloc-stress/Android.bp b/alloc-stress/Android.bp
index 4d74841a..e64c822b 100644
--- a/alloc-stress/Android.bp
+++ b/alloc-stress/Android.bp
@@ -24,6 +24,7 @@ cc_binary {
     shared_libs: [
         "libhardware",
         "libcutils",
+        "libprocessgroup",
     ],
     cppflags: [
         "-g",
diff --git a/alloc-stress/alloc-stress.cpp b/alloc-stress/alloc-stress.cpp
index 33c12635..ad2353cc 100644
--- a/alloc-stress/alloc-stress.cpp
+++ b/alloc-stress/alloc-stress.cpp
@@ -14,6 +14,8 @@
 #include <tuple>
 #include <vector>
 
+#include <processgroup/processgroup.h>
+
 //#define TRACE_CHILD_LIFETIME
 
 #ifdef TRACE_CHILD_LIFETIME
@@ -157,36 +159,6 @@ static void write_oomadj_to_lmkd(int oomadj) {
     cout << "Wrote " << written << " bytes to lmkd control socket." << endl;
 }
 
-static void create_memcg() {
-    char buf[256];
-    uid_t uid = getuid();
-    pid_t pid = getpid();
-
-    snprintf(buf, sizeof(buf), "/dev/memcg/apps/uid_%u", uid);
-    int tasks = mkdir(buf, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
-    if (tasks < 0 && errno != EEXIST) {
-        cerr << "Failed to create memory cgroup under " << buf << endl;
-        return;
-    }
-
-    snprintf(buf, sizeof(buf), "/dev/memcg/apps/uid_%u/pid_%u", uid, pid);
-    tasks = mkdir(buf, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
-    if (tasks < 0) {
-        cerr << "Failed to create memory cgroup under " << buf << endl;
-        return;
-    }
-
-    snprintf(buf, sizeof(buf), "/dev/memcg/apps/uid_%u/pid_%u/tasks", uid, pid);
-    tasks = open(buf, O_WRONLY);
-    if (tasks < 0) {
-        cerr << "Unable to add process to memory cgroup" << endl;
-        return;
-    }
-    snprintf(buf, sizeof(buf), "%u", pid);
-    write(tasks, buf, strlen(buf));
-    close(tasks);
-}
-
 void usage() {
     cout << "Application allocates memory until it's killed." << endl
          << "It starts at max oom_score_adj and gradually "
@@ -202,7 +174,7 @@ int main(int argc, char* argv[]) {
 
     if ((argc > 1) && (std::string(argv[1]) == "--worker")) {
         if (std::string(argv[5]) == "1") {
-            create_memcg();
+            createProcessGroup(getuid(), getpid(), true);
         }
 
         write_oomadj_to_lmkd(atoi(argv[2]));