Fix usage module to work on Solaris with node 4.x

src/binding.cpp

@@ -11,7 +11,7 @@ void RegisterModule(Local<Object> exports) {
 
 #ifdef is_solaris
   exports->Set(Nan::New<String>("getUsage").ToLocalChecked(),
-    FunctionTemplate::New(GetUsage)->GetFunction());
+    Nan::New<FunctionTemplate>(GetUsage)->GetFunction());
 #endif
   exports->Set(Nan::New<String>("OS").ToLocalChecked(), Nan::New<String>(OS).ToLocalChecked());
 }

src/solaris.cpp

@@ -1,6 +1,5 @@
 #include <stdio.h>
 #include "solaris.h"
-
 /*
   Getting CPU Usage from the /proc
 */
@@ -19,7 +18,7 @@ static int read_buffer(char *buffer, int buffer_size, char* file_path) {
   }
 }
 
-static char* get_proc_file(char* type, char* pid) {
+static char* get_proc_file(const char* type, char* pid) {
   size_t type_len = strlen(type);
   size_t pid_len = strlen(pid);
   size_t proc_len = strlen("/proc/");
@@ -52,6 +51,8 @@ int get_usage(int pid, ps_usage_t* ps_usage) {
 
   if(success_psinfo) {
     ps_usage->cpu = get_pct(psinfo.pr_pctcpu);
+    // Note that rssize will be zero if we are getting info for 64-bit
+    // process from 32-bit process!
     ps_usage->memory = psinfo.pr_rssize * 1024;
     return 1;
   } else {
@@ -76,43 +77,44 @@ void AsyncGetUsage(uv_work_t* req) {
 }
 
 void AsyncAfterGetUsage(uv_work_t* req) {
+  Nan::HandleScope scope;
   UsageData* usageData = static_cast<UsageData*>(req->data);
 
   if(usageData->failed) {
     const unsigned argc = 1;
     Local<Value> argv[argc] = {
-      Exception::Error(String::New("INVALID_PID"))
+      Nan::RangeError("INVALID_PID")
     };
-    usageData->callback->Call(Context::GetCurrent()->Global(), argc, argv);
+    usageData->callback.Call(argc, argv);
   } else {
-    Local<Object> usage = Object::New();
-    usage->Set(String::NewSymbol("cpu"), Number::New(usageData->ps_usage.cpu));
-    usage->Set(String::NewSymbol("memory"), Number::New(usageData->ps_usage.memory));
+    Local<Object> usage = Nan::New<v8::Object>();
+    Nan::Set(usage, Nan::New<String>("cpu").ToLocalChecked(), Nan::New<Number>(usageData->ps_usage.cpu));
+    Nan::Set(usage, Nan::New<String>("memory").ToLocalChecked(), Nan::New<Number>(usageData->ps_usage.memory));
 
     const unsigned argc = 2;
-    Local<Value> argv[argc] = { Local<Value>::New(Null()), usage };
-    usageData->callback->Call(Context::GetCurrent()->Global(), argc, argv);
+    Local<Value> argv[argc] = { Nan::Null(), usage };
+    usageData->callback.Call(argc, argv);
   }
 
   delete usageData;
   delete req;
 }
 
-Handle<Value> GetUsage(const Arguments& args) {
-  HandleScope scope;
+NAN_METHOD(GetUsage) {
+  Nan::HandleScope();
 
-  int pid = (int)(Local<Number>::Cast(args[0])->Value());
-  Local<Function> callback = Local<Function>::Cast(args[1]);
+  int pid = Nan::To<int>(info[0]).FromJust();
+  Local<Function> callback = Local<Function>::Cast(info[1]);
 
   UsageData* usageData = new UsageData();
   usageData->pid = pid;
-  usageData->callback = Persistent<Function>::New(callback);
+  usageData->callback.SetFunction(callback);
   usageData->failed = false;
 
   uv_work_t* req = new uv_work_t();
   req->data = usageData;
 
   uv_queue_work(uv_default_loop(), req, AsyncGetUsage, (uv_after_work_cb)AsyncAfterGetUsage);
 
-  return scope.Close(Undefined());
+  Nan::Undefined();
 }

src/solaris.h

@@ -6,6 +6,7 @@
 #include <string.h>
 #include <node.h>
 #include <uv.h>
+#include <nan.h>
 
 typedef struct ps_usage {
   float cpu;
@@ -15,12 +16,12 @@ typedef struct ps_usage {
 using namespace v8;
 struct UsageData {
   int pid;
-  Persistent<Function> callback;
+  Nan::Callback callback;
   ps_usage_t ps_usage;
   bool failed;
 };
 
 extern int get_usage(int pid, ps_usage_t* ps_usage);
-extern Handle<Value> GetUsage(const Arguments& args);
+extern NAN_METHOD(GetUsage);
 
 #endif