From d883d8e785f8290902ea2a3f9f9a6b0fe3ae3a93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustaf=20Sj=C3=B6berg?= Date: Thu, 22 Sep 2016 22:07:24 +0200 Subject: [PATCH] Removed stale code. --- c_src/erlang_v8.cc | 2 -- c_src/vm.cc | 13 ++++++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/c_src/erlang_v8.cc b/c_src/erlang_v8.cc index 0593282..751e3d8 100644 --- a/c_src/erlang_v8.cc +++ b/c_src/erlang_v8.cc @@ -43,7 +43,6 @@ size_t PacketLength() { } bool NextPacket(Packet* packet) { - TRACE("Ready for next!!\n"); size_t len = PacketLength(); uint32_t ref = 0; uint32_t timeout = 0; @@ -91,7 +90,6 @@ bool CommandLoop(VM& vm) { case OP_EVAL: FTRACE("Eval in context: %i\n", packet.ref); vm.Eval(&packet); - TRACE("Evaled!!!\n"); break; case OP_CALL: FTRACE("Call in context: %i\n", packet.ref); diff --git a/c_src/vm.cc b/c_src/vm.cc index 580da29..4ad5133 100644 --- a/c_src/vm.cc +++ b/c_src/vm.cc @@ -23,10 +23,10 @@ struct TimeoutHandlerArgs { void* TimeoutHandler(void *arg) { struct TimeoutHandlerArgs *args = (struct TimeoutHandlerArgs*)arg; - TRACE("Timeout started.\n"); - FTRACE("With timeout: %i\n", args->timeout); + + FTRACE("Timeout handler started: %i\n", args->timeout); usleep(args->timeout); - TRACE("After sleep,\n"); + TRACE("Timeout expired. Terminating execution.\n"); pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, 0x00); pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, 0x00); @@ -135,14 +135,13 @@ void VM::Eval(Packet* packet) { if (result.IsEmpty()) { assert(try_catch.HasCaught()); if (try_catch.Message().IsEmpty() && try_catch.StackTrace().IsEmpty()) { - TRACE("It's a timeout!\n"); + TRACE("Execution timed out.\n"); Local tt = String::NewFromUtf8(isolate, "timeout"); Report(isolate, tt, OP_TIMEOUT); } else { - TRACE("It's a regular error\n"); + TRACE("Regular error\n"); ReportException(isolate, &try_catch); } - FTRACE("Replacing context: %i\n", packet->ref); // vm.CreateContext(packet->ref); } else { ReportOK(isolate, result); @@ -161,7 +160,7 @@ void VM::Call(Packet* packet) { contexts[packet->ref]); if (context.IsEmpty()) { - Local tt = String::NewFromUtf8(isolate, "empty contextz"); + Local tt = String::NewFromUtf8(isolate, "empty context"); Report(isolate, tt, OP_INVALID_CONTEXT); } else { Context::Scope context_scope(context);