Merge pull request #230 from luvit/getpid

add process.pid, fix #218
luvit · May 29, 2012 · 641eeb2 · 641eeb2
2 parents 6899bd9 + 3288560
commit 641eeb2
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 1 deletion.
diff --git a/lib/luvit/luvit.lua b/lib/luvit/luvit.lua
@@ -133,6 +133,9 @@ process.env = setmetatable({}, {
   end
 })
 
+--Retrieve PID
+process.pid = native.getpid()
+
 -- Copy date and time over from lua os module into luvit os module
 local OLD_OS = require('os')
 local OS_BINDING = require('os_binding')

diff --git a/src/luv.c b/src/luv.c
@@ -66,7 +66,8 @@ static const luaL_reg luv_f[] = {
   /* Process functions */
   {"spawn", luv_spawn},
   {"processKill", luv_process_kill},
-
+  {"getpid", luv_getpid},
+
   /* Stream functions */
   {"shutdown", luv_shutdown},
   {"listen", luv_listen},

diff --git a/src/luv_portability.h b/src/luv_portability.h
@@ -20,6 +20,7 @@
 
 #if _MSC_VER
 #define snprintf _snprintf
+#define getpid _getpid
 #endif
 
 #if defined(__OpenBSD__) || defined(__MINGW32__) || defined(_MSC_VER)

diff --git a/src/luv_process.c b/src/luv_process.c
@@ -32,6 +32,12 @@ void luv_process_on_exit(uv_process_t* handle, int exit_status, int term_signal)
 
 }
 
+/* Retrieves Process ID */
+int luv_getpid(lua_State* L){
+  int pid = getpid();
+  lua_pushinteger(L, pid);
+  return 1;
+}
 
 /* Initializes uv_process_t and starts the process. */
 int luv_spawn(lua_State* L) {

diff --git a/src/luv_process.h b/src/luv_process.h
@@ -26,5 +26,6 @@
 
 int luv_spawn(lua_State* L);
 int luv_process_kill(lua_State* L);
+int luv_getpid(lua_State* L);
 
 #endif
diff --git a/tests/test-process.lua b/tests/test-process.lua
@@ -23,6 +23,8 @@ end
 
 test()
 
+assert(process.pid ~= nil)
+
 process:on('exit', function()
   assert(environmentTestResult == true)
 end)