process_title belongs to the process not thread

nodejs · Dec 9, 2011 · 2ba80a0 · 2ba80a0
1 parent 91697a2
commit 2ba80a0
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 21 deletions.
diff --git a/src/node_vars.h b/src/node_vars.h
@@ -71,8 +71,6 @@ struct globals {
   v8::Isolate* node_isolate;
   volatile bool debugger_running;
 
-
-
   // stream_wrap.cc
   size_t slab_used;
   uv_stream_t* handle_that_last_alloced;
@@ -176,13 +174,6 @@ struct globals {
   v8::Persistent<v8::String> write_sym;
   v8::Persistent<v8::FunctionTemplate> buffer_constructor_template;
 
-  // platform*.cc
-  char* process_title;
-  struct {
-    char *str;
-    size_t len;
-  } linux_process_title;
-
   // node_signal_watcher.cc
   v8::Persistent<v8::String> callback_symbol;
   v8::Persistent<v8::FunctionTemplate> signal_watcher_constructor_template;

diff --git a/src/platform_darwin.cc b/src/platform_darwin.cc
@@ -39,14 +39,13 @@
 #include <arpa/inet.h>
 #include <ifaddrs.h>
 
-#include <node_vars.h>
-#define process_title NODE_VAR(process_title)
-
 
 namespace node {
 
 using namespace v8;
 
+static char* process_title;
+
 double Platform::prog_start_time = Platform::GetUptime();
 
 char** Platform::SetupArgs(int argc, char *argv[]) {

diff --git a/src/platform_freebsd.cc b/src/platform_freebsd.cc
@@ -37,14 +37,13 @@
 #include <unistd.h>
 #include <time.h>
 
-#include <node_vars.h>
-#define process_title NODE_VAR(process_title)
-
 
 namespace node {
 
 using namespace v8;
 
+static char* process_title;
+
 double Platform::prog_start_time = Platform::GetUptime();
 
 char** Platform::SetupArgs(int argc, char *argv[]) {

diff --git a/src/platform_linux.cc b/src/platform_linux.cc
@@ -49,7 +49,6 @@
 #endif
 
 #include <node_vars.h>
-#define linux_process_title NODE_VAR(linux_process_title)
 #define getbuf NODE_VAR(getbuf)
 
 extern char **environ;
@@ -58,6 +57,11 @@ namespace node {
 
 using namespace v8;
 
+static struct {
+  char *str;
+  size_t len;
+} linux_process_title;
+
 double Platform::prog_start_time = Platform::GetUptime();
 
 

diff --git a/src/platform_openbsd.cc b/src/platform_openbsd.cc
@@ -38,13 +38,13 @@
 #include <time.h>
 #include <stdio.h>
 
-#include <node_vars.h>
-#define process_title NODE_VAR(process_title)
 
 namespace node {
 
 using namespace v8;
 
+static char* process_title;
+
 double Platform::prog_start_time = Platform::GetUptime();
 
 char** Platform::SetupArgs(int argc, char *argv[]) {

diff --git a/src/platform_win32.cc b/src/platform_win32.cc
@@ -35,13 +35,12 @@
 #include <platform_win32.h>
 #include <psapi.h>
 
-#include <node_vars.h>
-#define process_title NODE_VAR(process_title)
-
 namespace node {
 
 using namespace v8;
 
+static char* process_title;
+
 double Platform::prog_start_time = Platform::GetUptime();