Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jkryl wants to merge 1 commit into
base:master
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/binding.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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());
}
Expand Down
32 changes: 17 additions & 15 deletions src/solaris.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
#include <stdio.h>
#include "solaris.h"

/*
Getting CPU Usage from the /proc
*/
Expand All@@ -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/");
Expand DownExpand Up@@ -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 {
Expand All@@ -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();
}
5 changes: 3 additions & 2 deletions src/solaris.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
#include <string.h>
#include <node.h>
#include <uv.h>
#include <nan.h>

typedef struct ps_usage {
float cpu;
Expand All@@ -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
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Fix usage module to work on Solaris with node 4.x by jkryl · Pull Request #55 · arunoda/node-usage · GitHub
Skip to content
Fix usage module to work on Solaris with node 4.x#55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

jkryl
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Fix usage module to work on Solaris with node 4.x
#55
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/binding.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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());
}
Expand Down

32 changes: 17 additions & 15 deletions
src/solaris.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
#include <stdio.h>
#include "solaris.h"

/*
 Getting CPU Usage from the /proc
*/
Expand All@@ -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/");
Expand DownExpand Up@@ -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 {
Expand All@@ -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();
}

5 changes: 3 additions & 2 deletions
src/solaris.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
#include <string.h>
#include <node.h>
#include <uv.h>
#include <nan.h>

typedef struct ps_usage {
 float cpu;
Expand All@@ -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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Fix usage module to work on Solaris with node 4.x by jkryl · Pull Request #55 · arunoda/node-usage · GitHub
Skip to content
Fix usage module to work on Solaris with node 4.x#55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

jkryl
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Fix usage module to work on Solaris with node 4.x
#55
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/binding.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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());
}
Expand Down

32 changes: 17 additions & 15 deletions
src/solaris.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
#include <stdio.h>
#include "solaris.h"

/*
 Getting CPU Usage from the /proc
*/
Expand All@@ -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/");
Expand DownExpand Up@@ -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 {
Expand All@@ -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();
}

5 changes: 3 additions & 2 deletions
src/solaris.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
#include <string.h>
#include <node.h>
#include <uv.h>
#include <nan.h>

typedef struct ps_usage {
 float cpu;
Expand All@@ -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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Fix usage module to work on Solaris with node 4.x by jkryl · Pull Request #55 · arunoda/node-usage · GitHub
Skip to content
Fix usage module to work on Solaris with node 4.x#55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

jkryl
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Fix usage module to work on Solaris with node 4.x
#55
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/binding.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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());
}
Expand Down

32 changes: 17 additions & 15 deletions
src/solaris.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
#include <stdio.h>
#include "solaris.h"

/*
 Getting CPU Usage from the /proc
*/
Expand All@@ -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/");
Expand DownExpand Up@@ -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 {
Expand All@@ -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();
}

5 changes: 3 additions & 2 deletions
src/solaris.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
#include <string.h>
#include <node.h>
#include <uv.h>
#include <nan.h>

typedef struct ps_usage {
 float cpu;
Expand All@@ -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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Fix usage module to work on Solaris with node 4.x by jkryl · Pull Request #55 · arunoda/node-usage · GitHub
Skip to content
Fix usage module to work on Solaris with node 4.x#55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

jkryl
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Fix usage module to work on Solaris with node 4.x
#55
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/binding.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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());
}
Expand Down

32 changes: 17 additions & 15 deletions
src/solaris.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
#include <stdio.h>
#include "solaris.h"

/*
 Getting CPU Usage from the /proc
*/
Expand All@@ -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/");
Expand DownExpand Up@@ -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 {
Expand All@@ -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();
}

5 changes: 3 additions & 2 deletions
src/solaris.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
#include <string.h>
#include <node.h>
#include <uv.h>
#include <nan.h>

typedef struct ps_usage {
 float cpu;
Expand All@@ -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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Fix usage module to work on Solaris with node 4.x by jkryl · Pull Request #55 · arunoda/node-usage · GitHub
Skip to content
Fix usage module to work on Solaris with node 4.x#55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

jkryl
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Fix usage module to work on Solaris with node 4.x
#55
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/binding.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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());
}
Expand Down

32 changes: 17 additions & 15 deletions
src/solaris.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
#include <stdio.h>
#include "solaris.h"

/*
 Getting CPU Usage from the /proc
*/
Expand All@@ -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/");
Expand DownExpand Up@@ -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 {
Expand All@@ -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();
}

5 changes: 3 additions & 2 deletions
src/solaris.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
#include <string.h>
#include <node.h>
#include <uv.h>
#include <nan.h>

typedef struct ps_usage {
 float cpu;
Expand All@@ -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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Fix usage module to work on Solaris with node 4.x by jkryl · Pull Request #55 · arunoda/node-usage · GitHub
Skip to content
Fix usage module to work on Solaris with node 4.x#55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

jkryl
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Fix usage module to work on Solaris with node 4.x
#55
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/binding.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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());
}
Expand Down

32 changes: 17 additions & 15 deletions
src/solaris.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
#include <stdio.h>
#include "solaris.h"

/*
 Getting CPU Usage from the /proc
*/
Expand All@@ -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/");
Expand DownExpand Up@@ -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 {
Expand All@@ -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();
}

5 changes: 3 additions & 2 deletions
src/solaris.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
#include <string.h>
#include <node.h>
#include <uv.h>
#include <nan.h>

typedef struct ps_usage {
 float cpu;
Expand All@@ -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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Fix usage module to work on Solaris with node 4.x by jkryl · Pull Request #55 · arunoda/node-usage · GitHub
Skip to content
Fix usage module to work on Solaris with node 4.x#55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

jkryl
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Fix usage module to work on Solaris with node 4.x
#55
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/binding.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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());
}
Expand Down

32 changes: 17 additions & 15 deletions
src/solaris.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
#include <stdio.h>
#include "solaris.h"

/*
 Getting CPU Usage from the /proc
*/
Expand All@@ -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/");
Expand DownExpand Up@@ -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 {
Expand All@@ -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();
}

5 changes: 3 additions & 2 deletions
src/solaris.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
#include <string.h>
#include <node.h>
#include <uv.h>
#include <nan.h>

typedef struct ps_usage {
 float cpu;
Expand All@@ -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