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

     string scriptName = "Base.js";
     string scriptFileName = basePath + "System/" + scriptName;
     if (!file_exists(scriptFileName))
+    {
-        slog << "Failed to load :" << scriptFileName << "\n";
+        slog << "Failed to load :" + scriptFileName + "\n";
+    }
     string scriptSource = file_get_contents(scriptFileName);
     Handle<String> source =  String::New(scriptSource.c_str(), scriptSource.length());
     myGlobal->Set(String::New("log"), FunctionTemplate::New(VirtualMachine_log));
     myGlobal->Set(String::New("sendCanMessage"), FunctionTemplate::New(VirtualMachine_sendCanMessage));
     myGlobal->Set(String::New("loadScript"), FunctionTemplate::New(VirtualMachine_loadScript));
     myGlobal->Set(String::New("startIntervalThread"), FunctionTemplate::New(VirtualMachine_startIntervalThread));
     myGlobal->Set(String::New("stopIntervalThread"), FunctionTemplate::New(VirtualMachine_stopIntervalThread));
+    myGlobal->Set(String::New("startSocketThread"), FunctionTemplate::New(VirtualMachine_startSocketThread));
+    myGlobal->Set(String::New("stopSocketThread"), FunctionTemplate::New(VirtualMachine_stopSocketThread));
+    myGlobal->Set(String::New("sendToSocketThread"), FunctionTemplate::New(VirtualMachine_sendToSocketThread));
     //create context for the script
     myContext = Context::New(NULL, myGlobal);
     if (script.IsEmpty())
+    {
         // Print errors that happened during compilation.
         String::AsciiValue error(try_catch.Exception());
+        string sError = *error;
-        slog << "Failed to compile script: " << *error << "\n";
+        slog << "Failed to compile script: " + sError + "\n";
+    }
     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());
+            string sError = *error;
-            slog << "Constructor: Failed to run script: " << *error << "\n";
+            slog << "Constructor: Failed to run script: " << sError << "\n";
+        }
         else
+        {
             loadScript("System/Startup.js");
     string basePath = Settings::get("BasePath") + "/Services/";
     string scriptFileName = basePath + scriptName;
     if (!file_exists(scriptFileName))
+    {
-        slog << "Failed to load :" << scriptFileName << "\n";
+        slog << "Failed to load :" + scriptFileName + "\n";
         return false;
+    }
     string scriptSource = file_get_contents(scriptFileName);
     //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;
-        slog << "Failed to compile script: " << *error << "\n";
+        slog << "loadScript: Failed to compile script: " + sError + "\n";
         return false;
+    }
     else
+    {
         //no errors , let's continue
         //check if execution ended with errors
         if (result.IsEmpty())
+        {
             // Print errors that happened during execution.
             String::AsciiValue error(try_catch.Exception());
+            string sError = *error;
-            slog << "loadScript: Failed to run script: " << *error << "\n";
+            slog << "loadScript: Failed to run script: " + sError + "\n";
             return false;
+        }
+    }
     return true;
         myIntervalThreads.erase(id);
         return true;
+    }
     return false;
+}
+unsigned int VirtualMachine::startSocketThread(string address, int port, unsigned int reconnectTimeout)
+{
+    SocketThread socketThread(address, port, reconnectTimeout);
+    mySocketThreads[socketThread.getId()] = socketThread;
+    mySocketThreads[socketThread.getId()].start();
+    return socketThread.getId();
+}
+bool VirtualMachine::stopSocketThread(unsigned int id)
+{
+    if (mySocketThreads.find(id) != mySocketThreads.end())
+    {
+        mySocketThreads.erase(id);
+        return true;
+    }
+    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();
     //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;
-        slog << "Failed to compile script: " << *error << "\n";
+        slog << "runExpression: Failed to compile script: " + sError + "\n";
+        slog << expression << "\n\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());
+            string sError = *error;
-            slog << "runExpression: Failed to run script: " << *error << "\n";
+            slog << "runExpression: Failed to run script: " + sError + "\n";
             return false;
+        }
+    }
     return true;
     return Undefined();
+}
 Handle<Value> VirtualMachine_sendCanMessage(const Arguments& args)
+{
-    SyslogStream &slog = SyslogStream::getInstance();
+    //SyslogStream &slog = SyslogStream::getInstance();
     CanNetManager &canMan = CanNetManager::getInstance();
     CanMessage canMessage;
     String::AsciiValue className(args[0]);
+    }
     canMessage.setData(data);
     canMan.sendMessage(canMessage);
     return Undefined();
 }
 Handle<Value> VirtualMachine_loadScript(const Arguments& args)
+{
     VirtualMachine &vm = VirtualMachine::getInstance();
     String::AsciiValue str(args[0]);
     return Boolean::New(vm.loadScript(*str));
+}
 Handle<Value> VirtualMachine_startIntervalThread(const Arguments& args)
 {
     VirtualMachine &vm = VirtualMachine::getInstance();
     unsigned int timeout = args[0]->Uint32Value();
     return Integer::New(vm.startIntervalThread(timeout));
 }
 Handle<Value> VirtualMachine_stopIntervalThread(const Arguments& args)
+{
     VirtualMachine &vm = VirtualMachine::getInstance();
     unsigned int id = args[0]->Uint32Value();
-    return Integer::New(vm.stopIntervalThread(id));
+    return Boolean::New(vm.stopIntervalThread(id));
+}
+Handle<Value> VirtualMachine_startSocketThread(const Arguments& args)
+{
+    VirtualMachine &vm = VirtualMachine::getInstance();
+    String::AsciiValue address(args[0]);
+    int port = args[1]->Uint32Value();
+    unsigned int reconnectTimeout = args[2]->Uint32Value();
+    return Integer::New(vm.startSocketThread(*address, port, reconnectTimeout));
+}
+Handle<Value> VirtualMachine_stopSocketThread(const Arguments& args)
+{
+    VirtualMachine &vm = VirtualMachine::getInstance();
+    unsigned int id = args[0]->Uint32Value();
+    return Boolean::New(vm.stopSocketThread(id));
+}
+Handle<Value> VirtualMachine_sendToSocketThread(const Arguments& args)
+{
+    VirtualMachine &vm = VirtualMachine::getInstance();
+    unsigned int id = args[0]->Uint32Value();
+    String::AsciiValue data(args[1]);
+    vm.sendToSocketThread(id, *data);
+    return Undefined();
+}

Subversion Repositories HomeAutomation

(root)/trunk/PcSoftware/Atom/VM/virtualmachine.cpp @ 976 – Rev 973 → 976