src: use uv_os_getpid() to get process id

This commit uses the new uv_os_getpid() method to retrieve the current process id. PR-URL: #17415 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Jon Moss <[email protected]> Reviewed-By: Khaidi Chu <[email protected]>

Author: cjihrig

src/env.cc

@@ -177,7 +177,7 @@ void Environment::PrintSyncTrace() const{
 StackTrace::CurrentStackTrace(isolate(), 10, StackTrace::kDetailed);
 
 fprintf(stderr, "(node:%u) WARNING: Detected use of sync API\n",
-GetProcessId());
+uv_os_getpid());
 
 for (int i = 0; i < stack->GetFrameCount() - 1; i++){
  Local<StackFrame> stack_frame = stack->GetFrame(i);

src/inspector_agent.cc

@@ -109,7 +109,7 @@ static int StartDebugSignalHandler(){
 CHECK_EQ(0, pthread_attr_destroy(&attr));
 if (err != 0){
 fprintf(stderr, "node[%u]: pthread_create: %s\n",
-GetProcessId(), strerror(err));
+uv_os_getpid(), strerror(err));
 fflush(stderr);
 // Leave SIGUSR1 blocked. We don't install a signal handler,
 // receiving the signal would terminate the process.
@@ -144,7 +144,7 @@ static int StartDebugSignalHandler(){
  DWORD pid;
  LPTHREAD_START_ROUTINE* handler;
 
- pid = GetCurrentProcessId();
+ pid = uv_os_getpid();
 
 if (GetDebugSignalHandlerMappingName(pid,
  mapping_name,
@@ -692,4 +692,3 @@ bool Agent::IsWaitingForConnect(){
 
 } // namespace inspector
 } // namespace node
-

src/node.cc

@@ -3465,7 +3465,7 @@ void SetupProcessObject(Environment* env,
  process->Set(FIXED_ONE_BYTE_STRING(env->isolate(), "env"), process_env);
 
 READONLY_PROPERTY(process, "pid",
-Integer::New(env->isolate(), GetProcessId()));
+Integer::New(env->isolate(), uv_os_getpid()));
 READONLY_PROPERTY(process, "features", GetFeatures(env));
 
 CHECK(process->SetAccessor(env->context(),

src/node_internals.h

@@ -248,7 +248,6 @@ void RegisterSignalHandler(int signal,
 bool reset_handler = false);
 #endif
 
-uint32_tGetProcessId();
 boolSafeGetenv(constchar* key, std::string* text);
 
 std::string GetHumanReadableProcessName();

src/util.cc

@@ -22,16 +22,9 @@
 #include"string_bytes.h"
 #include"node_buffer.h"
 #include"node_internals.h"
+#include"uv.h"
 #include<stdio.h>
 
-#ifdef __POSIX__
-#include<unistd.h>// getpid()
-#endif
-
-#ifdef _MSC_VER
-#include<windows.h>// GetCurrentProcessId()
-#endif
-
 namespacenode{
 
 using v8::Isolate;
@@ -122,15 +115,7 @@ std::string GetHumanReadableProcessName(){
 voidGetHumanReadableProcessName(char (*name)[1024]){
 char title[1024] = "Node.js";
 uv_get_process_title(title, sizeof(title));
-snprintf(*name, sizeof(*name), "%s[%u]", title, GetProcessId());
-}
-
-uint32_tGetProcessId(){
-#ifdef _WIN32
-returnGetCurrentProcessId();
-#else
-returngetpid();
-#endif
+snprintf(*name, sizeof(*name), "%s[%u]", title, uv_os_getpid());
 }
 
 } // namespace node