diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/oom-listener/impl/oom_listener_main.c b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/oom-listener/impl/oom_listener_main.c index eb7fc3e473c..2f4bac896fb 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/oom-listener/impl/oom_listener_main.c +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/oom-listener/impl/oom_listener_main.c @@ -25,6 +25,8 @@ #include "oom_listener.h" +extern inline void cleanup(_oom_listener_descriptors *descriptors); + void print_usage(void) { fprintf(stderr, "oom-listener"); fprintf(stderr, "Listen to OOM events in a cgroup"); @@ -101,4 +103,4 @@ int main() { return 1; } -#endif \ No newline at end of file +#endif diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/oom-listener/test/oom_listener_test_main.cc b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/oom-listener/test/oom_listener_test_main.cc index 421c21e0677..69c19b17ed1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/oom-listener/test/oom_listener_test_main.cc +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/oom-listener/test/oom_listener_test_main.cc @@ -253,7 +253,7 @@ TEST_F(OOMListenerTest, test_oom) { ASSERT_EQ(0, kill(mem_hog_pid, SIGKILL)); // Verify that process was killed - __WAIT_STATUS mem_hog_status = {}; + int* mem_hog_status = {}; __pid_t exited0 = wait(mem_hog_status); ASSERT_EQ(mem_hog_pid, exited0) << "Wrong process exited"; @@ -272,7 +272,7 @@ TEST_F(OOMListenerTest, test_oom) { << "Could not delete cgroup " << GetCGroup(); // Check that oom_listener exited on the deletion of the cgroup - __WAIT_STATUS oom_listener_status = {}; + int* oom_listener_status = {}; __pid_t exited1 = wait(oom_listener_status); ASSERT_EQ(listener, exited1) << "Wrong process exited";