Move ForkJail into own target

Summary: ForkJail's super useful in its own right, shouldn't be limited to just Loom. Reviewed By: BurntBrunch Differential Revision: D6159922 fbshipit-source-id: fd519aeac69230fe72f88b6eccfb2c87d450d01d
facebookarchive · Dec 20, 2017 · 84a4075 · 84a4075
1 parent cc0fe4a
commit 84a4075
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 56 deletions.
diff --git a/cpp/profiler/ArtCompatibility.cpp b/cpp/profiler/ArtCompatibility.cpp
@@ -29,7 +29,7 @@
   #error "Invalid ART version"
 #endif
 
-#include <util/ForkJail.h>
+#include <forkjail/ForkJail.h>
 
 namespace fbjni = facebook::jni;
 
@@ -223,7 +223,7 @@ jboolean check(JNIEnv* env, jclass) {
     facebook::art::InitRuntime();
 #endif
 
-    util::ForkJail jail([
+    forkjail::ForkJail jail([
       &javaStack,
       env,
       nativeThread] {

diff --git a/cpp/profiler/BUCK b/cpp/profiler/BUCK
@@ -41,9 +41,9 @@ def tracer_library(version):
         ],
         deps = [
             loom_path("deps/fb:fb"),
+            loom_path("deps/forkjail:forkjail"),
             loom_path("deps/museum/{version}:{version}").format(version=version),
             loom_path("cpp/logger:logger"),
-            loom_path("cpp/util:forkjail"),
         ],
     )
 

diff --git a/cpp/util/BUCK b/cpp/util/BUCK
@@ -1,30 +1,6 @@
 load("//buck_imports:loom_path.bzl", "loom_path")
 load("//buck_imports:xplat", "fb_xplat_cxx_library")
 
-FORKJAIL_EXPORTED_HEADERS = ["ForkJail.h"]
-
-fb_xplat_cxx_library(
-    name = "forkjail",
-    srcs = glob([
-        "ForkJail.cpp",
-    ]),
-    headers = glob(
-        ["*.h"],
-        excludes = FORKJAIL_EXPORTED_HEADERS,
-    ),
-    header_namespace = "util",
-    exported_headers = FORKJAIL_EXPORTED_HEADERS,
-    compiler_flags = [
-        "-fexceptions",
-        "-fPIC",
-        "-std=gnu++14",
-    ],
-    force_static = True,
-    visibility = [
-        loom_path("..."),
-    ],
-)
-
 UTIL_EXPORTED_HEADERS = [
     "common.h",
     "ProcFs.h",

diff --git a/cpp/util/test/BUCK b/cpp/util/test/BUCK
@@ -1,19 +1,5 @@
 load("//buck_imports:loom_path.bzl", "loom_path")
 
-cxx_test(
-    name = "forkjail",
-    srcs = [
-        "ForkJailTest.cpp",
-    ],
-    compiler_flags = [
-        "-fexceptions",
-        "-DLOG_TAG=\"Loom\"",
-    ],
-    deps = [
-        loom_path("cpp/util:forkjail"),
-    ],
-)
-
 cxx_binary(
     name = "procfs_perf",
     srcs = [

diff --git a/deps/forkjail/BUCK b/deps/forkjail/BUCK
@@ -0,0 +1,26 @@
+include_defs("//buck_imports/xplat")  # THIS_IS_FBANDROID
+
+if not THIS_IS_FBANDROID:
+    FORKJAIL_EXPORTED_HEADERS = ["ForkJail.h"]
+
+    fb_xplat_cxx_library(
+        name = "forkjail",
+        srcs = glob([
+            "ForkJail.cpp",
+        ]),
+        compiler_flags = [
+            "-fexceptions",
+            "-fPIC",
+            "-std=gnu++14",
+        ],
+        exported_headers = FORKJAIL_EXPORTED_HEADERS,
+        force_static = True,
+        header_namespace = "forkjail",
+        headers = glob(
+            ["*.h"],
+            excludes = FORKJAIL_EXPORTED_HEADERS,
+        ),
+        visibility = [
+            "PUBLIC",
+        ],
+    )
diff --git a/cpp/util/ForkJail.cpp → deps/forkjail/ForkJail.cpp b/cpp/util/ForkJail.cpp → deps/forkjail/ForkJail.cpp
@@ -11,8 +11,7 @@
 #include <string>
 
 namespace facebook {
-namespace loom {
-namespace util {
+namespace forkjail {
 
 namespace {
 class SignalMask {
@@ -34,7 +33,7 @@ class SignalMask {
   sigset_t old_;
 };
 
-inline static std::system_error errno_error(std::string error){
+inline static std::system_error errno_error(std::string error) {
   return std::system_error(errno, std::system_category(), error);
 }
 
@@ -185,6 +184,5 @@ void ForkJail::alarm_handler(int signum){
   _exit(kChildTimeoutExitCode);
 }
 
-} // util
-} // loom
+} // forkjail
 } // facebook
diff --git a/cpp/util/ForkJail.h → deps/forkjail/ForkJail.h b/cpp/util/ForkJail.h → deps/forkjail/ForkJail.h
@@ -7,10 +7,9 @@
 #include <functional>
 
 namespace facebook {
-namespace loom {
-namespace util {
+namespace forkjail {
 
-// A utility class that forks and resets signal handlers in order to prevent a 
+// A utility class that forks and resets signal handlers in order to prevent a
 // dangerous operation from taking down our own process.
 class ForkJail {
 
@@ -46,6 +45,5 @@ class ForkJail {
   static void alarm_handler(int signum);
 };
 
-} // util
-} // loom
+} // forkjail
 } // facebook
diff --git a/cpp/util/test/ForkJailTest.cpp → deps/forkjail/test/ForkJailTest.cpp b/cpp/util/test/ForkJailTest.cpp → deps/forkjail/test/ForkJailTest.cpp
@@ -4,16 +4,15 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include <util/ForkJail.h>
+#include <forkjail/ForkJail.h>
 #include <gtest/gtest.h>
 
 #include <system_error>
 
 #include <iostream>
 
 namespace facebook {
-namespace loom {
-namespace util {
+namespace forkjail {
 
 namespace {
 
@@ -115,6 +114,5 @@ TEST(ForkJail, testProcessGroupChanged) {
   EXPECT_CHILD_STATUS(jail, kExitCodeSuccess);
 }
 
-} // util
-} // loom
+} // forkjail
 } // facebook