WebSVN – HomeAutomation – Diff – /trunk/PcSoftware/Atom/VM/virtualmachine.cpp

     //access global context within this scope
     Context::Scope context_scope(myContext);
     //exception handler
-    TryCatch try_catch;
+    TryCatch tryCatch;
     //compile script to binary code - JIT
     Handle<Script> script = Script::Compile(source, name);
     //check if we got problems on compilation
     if (script.IsEmpty())
+    {
-        // Print errors that happened during compilation.
-        String::AsciiValue error(try_catch.Exception());
+        printException(&tryCatch);
-        string sError = *error;
+        slog << "\n";
-        slog << "Failed to compile script: " + sError + "\n";
+        return;
+    }
     else
+    {
         //no errors , let's continue
         Handle<Value> result = script->Run();
         //check if execution ended with errors
         if (result.IsEmpty())
+        {
-            // Print errors that happened during execution.
-            String::AsciiValue error(try_catch.Exception());
+            printException(&tryCatch);
-            string sError = *error;
+            slog << "\n";
-            slog << "Constructor: Failed to run script: " << sError << "\n";
+            return;
+        }
         else
+        {
             loadScript("System/Startup.js");
+            }
             else
+            {
                 callHandleMessage(canMessage);
+            }
         }
         mySemaphore.wait();
     }
     mySemaphore.unlock();
 }
 void VirtualMachine::queueCanMessage(CanMessage canMessage)
+{
     myCanMessages.push(canMessage);
     mySemaphore.broadcast();
+}
 void VirtualMachine::queueExpression(string expression)
+{
     myExpressions.push(expression);
+{
     SyslogStream &slog = SyslogStream::getInstance();
     string basePath = Settings::get("BasePath") + "Services/";
     string scriptFileName = basePath + scriptName;
     if (!file_exists(scriptFileName))
+    {
         slog << "Failed to load " + scriptFileName + "\n";
         return false;
     }
     string scriptSource = file_get_contents(scriptFileName);
     Handle<String> source =  String::New(scriptSource.c_str(), scriptSource.length());
     //each script name must be unique , for this demo I just run one embedded script, so the name can be fixed
     Handle<String> name = String::New(scriptName.c_str(), scriptName.length());
     //access global context within this scope
     Context::Scope context_scope(myContext);
     //exception handler
-    TryCatch try_catch;
+    TryCatch tryCatch;
     //compile script to binary code - JIT
     Handle<Script> script = Script::Compile(source, name);
     //check if we got problems on compilation
     if (script.IsEmpty())
     {
-        // Print errors that happened during compilation.
-        String::AsciiValue error(try_catch.Exception());
+        printException(&tryCatch);
-        string sError = *error;
+        slog << "\n";
-        slog << "loadScript: Failed to compile script: " + sError + "\n";
         return false;
+    }
     else
+    {
         //no errors , let's continue
         Handle<Value> result = script->Run();
         //check if execution ended with errors
         if (result.IsEmpty())
+        {
-            // Print errors that happened during execution.
-            String::AsciiValue error(try_catch.Exception());
+            printException(&tryCatch);
-            string sError = *error;
+            slog << "\n";
-            slog << "loadScript: Failed to run script: " + sError + "\n";
             return false;
+        }
         slog << "Loaded " + scriptName + "\n";
     }
     return true;
 }
 void VirtualMachine::callHandleNMTMessage(CanMessage canMessage)
+{
     const int argc = 3;
     string jsonData = canMessage.getJSONData();
     Handle<Value> argv[argc] = {String::New(canMessage.getClassName().c_str()),
                                 String::New(canMessage.getCommandName().c_str()),
                                 String::New(jsonData.c_str()) };
     Handle<Value> result = myFunctionHandleNMTMessage->Call(myFunctionHandleNMTMessage, argc, argv); // argc and argv are your standard arguments to a function
+}
 void VirtualMachine::callHandleMessage(CanMessage canMessage)
+{
     const int argc = 6;
     string jsonData = canMessage.getJSONData();
     Handle<Value> argv[argc] = {String::New(canMessage.getClassName().c_str()),
                                 String::New(canMessage.getDirectionFlag().c_str()),
                                 String::New(canMessage.getModuleName().c_str()),
                                 Integer::New(canMessage.getModuleId()),
                                 String::New(canMessage.getCommandName().c_str()),
                                 String::New(jsonData.c_str()) };
     Handle<Value> result = myFunctionHandleMessage->Call(myFunctionHandleMessage, argc, argv); // argc and argv are your standard arguments to a function
+}
 unsigned int VirtualMachine::startIntervalThread(unsigned int timeout)
 {
     IntervalThread intervalThread(timeout);
     myIntervalThreads[intervalThread.getId()] = intervalThread;
     myIntervalThreads[intervalThread.getId()].start();
     return intervalThread.getId();
 }
 bool VirtualMachine::stopIntervalThread(unsigned int id)
+{
     if (myIntervalThreads.find(id) != myIntervalThreads.end())
+    {
         myIntervalThreads.erase(id);
 unsigned int VirtualMachine::startSocketThread(string address, int port, unsigned int reconnectTimeout)
+{
     SocketThread *socketThread = new SocketThread(address, port, reconnectTimeout);
     mySocketThreads[socketThread->getId()] = socketThread;
     mySocketThreads[socketThread->getId()]->start();
     return socketThread->getId();
 }
 bool VirtualMachine::stopSocketThread(unsigned int id)
+{
     return false;
+}
 void VirtualMachine::sendToSocketThread(unsigned int id, string data)
 {
     if (mySocketThreads.find(id) != mySocketThreads.end())
+    {
         mySocketThreads[id]->send(data);
+    }
+}
 bool VirtualMachine::runExpression(string expression)
 {
     SyslogStream &slog = SyslogStream::getInstance();
     string scriptName = "runExpression";
     Handle<String> source =  String::New(expression.c_str(), expression.length());
     //each script name must be unique , for this demo I just run one embedded script, so the name can be fixed
     Handle<String> name = String::New(scriptName.c_str(), scriptName.length());
     //access global context within this scope
     Context::Scope context_scope(myContext);
     //exception handler
-    TryCatch try_catch;
+    TryCatch tryCatch;
     //compile script to binary code - JIT
     Handle<Script> script = Script::Compile(source, name);
     //check if we got problems on compilation
     if (script.IsEmpty())
+    {
-        // Print errors that happened during compilation.
-        String::AsciiValue error(try_catch.Exception());
-        string sError = *error;
+        printException(&tryCatch);
-        slog << "runExpression: Failed to compile script: " + sError + "\n";
-        slog << expression << "\n\n";
+        slog << "\n";
         return false;
+    }
     else
+    {
         //no errors , let's continue
         Handle<Value> result = script->Run();
         //check if execution ended with errors
         if (result.IsEmpty())
+        {
-            // Print errors that happened during execution.
-            String::AsciiValue error(try_catch.Exception());
+            printException(&tryCatch);
-            string sError = *error;
+            slog << "\n";
-            slog << "runExpression: Failed to run script: " + sError + "\n";
             return false;
+        }
+    }
     return true;
+}
+void VirtualMachine::printException(TryCatch* tryCatch)
+{
+    SyslogStream &slog = SyslogStream::getInstance();
+    HandleScope handle_scope;
+    String::Utf8Value exception(tryCatch->Exception());
+    Handle<v8::Message> message = tryCatch->Message();
+    string strException = *exception;
+    if (message.IsEmpty())
+    {
+        // V8 didn't provide any extra information about this error; just print the exception.
+        slog << strException + "\n";
+    }
+    else
+    {
+        // Print (filename):(line number): (message).
+        String::Utf8Value filename(message->GetScriptResourceName());
+        int linenum = message->GetLineNumber();
+        string strFilename = *filename;
+        slog << strFilename + ":" + itos(linenum) + ": " + strException + "\n";
+        // Print line of source code.
+        String::Utf8Value sourceline(message->GetSourceLine());
+        string strSourceline = *sourceline;
+        slog << strSourceline + "\n";
+        string underline;
+        // Print wavy underline (GetUnderline is deprecated).
+        int start = message->GetStartColumn();
+        for (int i = 0; i < start; i++)
+        {
+            underline += " ";
+        }
+        int end = message->GetEndColumn();
+        for (int i = start; i < end; i++)
+        {
+            underline += "^";
+        }
+        slog << underline + "\n";
+    }
 }
 Handle<Value> VirtualMachine_log(const Arguments& args)
+{
     SyslogStream &slog = SyslogStream::getInstance();

Subversion Repositories HomeAutomation

(root)/trunk/PcSoftware/Atom/VM/virtualmachine.cpp @ 995 – Rev 986 → 995