add process.kill

6 files changed, 95 insertions, 2 deletions

diff --git a/core/src/xmake/machine.c b/core/src/xmake/machine.c
index 5d67992e0..115f85d08 100644
--- a/core/src/xmake/machine.c
+++ b/core/src/xmake/machine.c
@@ -172,6 +172,7 @@ tb_int_t xm_string_startswith(lua_State* lua);
 tb_int_t xm_process_open(lua_State* lua);
 tb_int_t xm_process_openv(lua_State* lua);
 tb_int_t xm_process_wait(lua_State* lua);
+tb_int_t xm_process_kill(lua_State* lua);
 tb_int_t xm_process_close(lua_State* lua);
 
 // the sandbox functions
@@ -335,6 +336,7 @@ static luaL_Reg const g_process_functions[] =
     { "open",           xm_process_open     }
 ,   { "openv",          xm_process_openv    }
 ,   { "wait",           xm_process_wait     }
+,   { "kill",           xm_process_kill     }
 ,   { "close",          xm_process_close    }
 ,   { tb_null,          tb_null             }
 };
diff --git a/core/src/xmake/makefile b/core/src/xmake/makefile
index d7fd339b7..37016d54d 100644
--- a/core/src/xmake/makefile
+++ b/core/src/xmake/makefile
@@ -100,6 +100,7 @@ xmake_C_FILES 			+= \
 						process/open \
 						process/openv \
 						process/wait \
+						process/kill \
 						process/close \
 						sandbox/interactive \
 						semver/parse \
diff --git a/core/src/xmake/process/kill.c b/core/src/xmake/process/kill.c
new file mode 100644
index 000000000..1a695dc27
--- /dev/null
+++ b/core/src/xmake/process/kill.c
@@ -0,0 +1,54 @@
+/*!A cross-platform build utility based on Lua
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * Copyright (C) 2015-2020, TBOOX Open Source Group.
+ *
+ * @author      ruki
+ * @file        kill.c
+ *
+ */
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * trace
+ */
+#define TB_TRACE_MODULE_NAME                "process.kill"
+#define TB_TRACE_MODULE_DEBUG               (0)
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * includes
+ */
+#include "prefix.h"
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * implementation
+ */
+
+// process.kill(p)
+tb_int_t xm_process_kill(lua_State* lua)
+{
+    // check
+    tb_assert_and_check_return_val(lua, 0);
+
+    // is user data?
+    if (!lua_isuserdata(lua, 1)) 
+        return 0;
+
+    // get the process
+    tb_process_ref_t process = (tb_process_ref_t)lua_touserdata(lua, 1);
+    tb_check_return_val(process, 0);
+
+    // kill process
+    tb_process_kill(process);
+    return 0;
+}
diff --git a/tests/modules/process/kill_process.lua b/tests/modules/process/kill_process.lua
new file mode 100644
index 000000000..96c83911c
--- /dev/null
+++ b/tests/modules/process/kill_process.lua
@@ -0,0 +1,13 @@
+import("core.base.process")
+import("core.base.scheduler")
+
+function main(program, ...)
+    for i = 1, 10 do
+        scheduler.co_start(function ()
+            -- we need terminate all unclosed processes automatically after parent process is exited
+            process.open("xmake l os.sleep 60000")
+        end)
+    end
+    -- check processes status after exiting
+    -- ps aux | grep sleep
+end
diff --git a/xmake/core/base/process.lua b/xmake/core/base/process.lua
index 2abcfa00b..20cfbe02c 100644
--- a/xmake/core/base/process.lua
+++ b/xmake/core/base/process.lua
@@ -34,9 +34,10 @@ local scheduler = require("base/scheduler")
 process._open       = process._open or process.open
 process._openv      = process._openv or process.openv
 process._wait       = process._wait or process.wait
-process._waitlist   = process._waitlist or process.waitlist
+process._kill       = process._kill or process.kill
 process._close      = process._close or process.close
 process.wait        = nil
+process.kill        = nil
 process.close       = nil
 process._subprocess = _subprocess
 
@@ -92,8 +93,22 @@ function _subprocess:wait(timeout)
     return result, status_or_errors
 end
 
+-- kill subprocess
+function _subprocess:kill()
+
+    -- ensure opened
+    local ok, errors = self:_ensure_opened()
+    if not ok then
+        return false, errors
+    end
+
+    -- kill process
+    process._kill(self:cdata())
+    return true
+end
+
 -- close subprocess
-function _subprocess:close(timeout)
+function _subprocess:close()
 
     -- ensure opened
     local ok, errors = self:_ensure_opened()
diff --git a/xmake/core/sandbox/modules/import/core/base/process.lua b/xmake/core/sandbox/modules/import/core/base/process.lua
index b05939028..b73e19fb5 100644
--- a/xmake/core/sandbox/modules/import/core/base/process.lua
+++ b/xmake/core/sandbox/modules/import/core/base/process.lua
@@ -38,6 +38,14 @@ function sandbox_core_base_instance.wait(proc, timeout)
     return ok, status
 end
 
+-- kill subprocess
+function sandbox_core_base_instance.kill(proc)
+    local ok, errors = proc:_kill()
+    if not ok then
+        raise(errors)
+    end
+end
+
 -- close subprocess
 function sandbox_core_base_instance.close(proc)
     local ok, errors = proc:_close()