1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

timer_wrap: remove HandleScopes, check return size

Browse Source 
Calls from JS to C++ have an implicit HandleScope. So there is no need
to instantiate a new HandleScope in these basic cases.

Check if the returned int64_t is an SMI and cast the return value to
uint32_t instead of a double. Prevents needing to box the return value,
and saves a small amount of execution time.

Signed-off-by: Trevor Norris <trev.norris@gmail.com>
This commit is contained in:
Trevor Norris 2014-09-29 10:13:35 -07:00
parent 2122a77f51
commit de312cfd7c
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/timer_wrap.cc
View File

@ -97,8 +97,6 @@ class TimerWrap : public HandleWrap {
} }
static void Start(const FunctionCallbackInfo<Value>& args) { static void Start(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args.GetIsolate());
HandleScope scope(env->isolate());
TimerWrap* wrap = Unwrap<TimerWrap>(args.Holder()); TimerWrap* wrap = Unwrap<TimerWrap>(args.Holder());
int64_t timeout = args[0]->IntegerValue(); int64_t timeout = args[0]->IntegerValue();
@ -108,8 +106,6 @@ class TimerWrap : public HandleWrap {
} }
static void Stop(const FunctionCallbackInfo<Value>& args) { static void Stop(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args.GetIsolate());
HandleScope scope(env->isolate());
TimerWrap* wrap = Unwrap<TimerWrap>(args.Holder()); TimerWrap* wrap = Unwrap<TimerWrap>(args.Holder());
int err = uv_timer_stop(&wrap->handle_); int err = uv_timer_stop(&wrap->handle_);
@ -117,8 +113,6 @@ class TimerWrap : public HandleWrap {
} }
static void Again(const FunctionCallbackInfo<Value>& args) { static void Again(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args.GetIsolate());
HandleScope scope(env->isolate());
TimerWrap* wrap = Unwrap<TimerWrap>(args.Holder()); TimerWrap* wrap = Unwrap<TimerWrap>(args.Holder());
int err = uv_timer_again(&wrap->handle_); int err = uv_timer_again(&wrap->handle_);
@ -126,8 +120,6 @@ class TimerWrap : public HandleWrap {
} }
static void SetRepeat(const FunctionCallbackInfo<Value>& args) { static void SetRepeat(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args.GetIsolate());
HandleScope scope(env->isolate());
TimerWrap* wrap = Unwrap<TimerWrap>(args.Holder()); TimerWrap* wrap = Unwrap<TimerWrap>(args.Holder());
int64_t repeat = args[0]->IntegerValue(); int64_t repeat = args[0]->IntegerValue();
@ -136,12 +128,13 @@ class TimerWrap : public HandleWrap {
} }
static void GetRepeat(const FunctionCallbackInfo<Value>& args) { static void GetRepeat(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args.GetIsolate());
HandleScope scope(env->isolate());
TimerWrap* wrap = Unwrap<TimerWrap>(args.Holder()); TimerWrap* wrap = Unwrap<TimerWrap>(args.Holder());
int64_t repeat = uv_timer_get_repeat(&wrap->handle_); int64_t repeat = uv_timer_get_repeat(&wrap->handle_);
args.GetReturnValue().Set(static_cast<double>(repeat)); if (repeat <= 0xfffffff)
args.GetReturnValue().Set(static_cast<uint32_t>(repeat));
else
args.GetReturnValue().Set(static_cast<double>(repeat));
} }
static void OnTimeout(uv_timer_t* handle) { static void OnTimeout(uv_timer_t* handle) {
@ -153,11 +146,13 @@ class TimerWrap : public HandleWrap {
} }
static void Now(const FunctionCallbackInfo<Value>& args) { static void Now(const FunctionCallbackInfo<Value>& args) {
HandleScope handle_scope(args.GetIsolate());
Environment* env = Environment::GetCurrent(args.GetIsolate()); Environment* env = Environment::GetCurrent(args.GetIsolate());
uv_update_time(env->event_loop()); uv_update_time(env->event_loop());
double now = static_cast<double>(uv_now(env->event_loop())); uint64_t now = uv_now(env->event_loop());
args.GetReturnValue().Set(now); if (now <= 0xfffffff)
args.GetReturnValue().Set(static_cast<uint32_t>(now));
else
args.GetReturnValue().Set(static_cast<double>(now));
} }
uv_timer_t handle_; uv_timer_t handle_;