Changeset 14540

Timestamp:

10/30/12 12:52:15 (12 years ago)

Author:

tbretz

Message:

Use State in JsState and added 'time' to the data members. Make sure there is no crash if an mpty event was received. Added 'size' to service objects.

Location:

trunk/FACT++/src

Files:

• InterpreterV8.cc (modified) (3 diffs)
• InterpreterV8.h (modified) (2 diffs)
• RemoteControl.h (modified) (4 diffs)

trunk/FACT++/src/InterpreterV8.cc

@@ -222 +222 @@
     const String::Utf8Value str(args[0]);
 
-    const pair<int32_t, string> rc = JsState(*str);
+    const State rc = JsState(*str);
+
+    //if (rc.first<=-256)
+    //    return Undefined();
 
     Handle<ObjectTemplate> obj = ObjectTemplate::New();
 
-    obj->Set(String::New("index"), rc.first<=-256?Undefined():Integer::New(rc.first),         ReadOnly);
-    obj->Set(String::New("name"),  rc.first<=-256?Undefined():String::New(rc.second.c_str()), ReadOnly);
-    //obj->Set(String::New("toString"),  String::New(("[Object state "+string(*str)+"]").c_str()), ReadOnly);
+    obj->Set(String::New("index"), rc.index<=-256?Undefined():Integer::New(rc.index),       ReadOnly);
+    obj->Set(String::New("name"),  rc.index<=-256?Undefined():String::New(rc.name.c_str()), ReadOnly);
+    obj->Set(String::New("time"),  Date::New(rc.time.JavaDate()),                           ReadOnly);
+    //obj->Set(String::New("toString"),  String::New(("[Object state "+string(*str)+":"+to_string(rc.index)+"]").c_str()));
 
     return handle_scope.Close(obj->NewInstance());
@@ -588 +592 @@
     ret->Set(String::New("counter"), Integer::New(p.first), ReadOnly);
     ret->Set(String::New("time"),    Date::New(evt->GetJavaDate()), ReadOnly);
-    ret->Set(String::New("qos"),     Integer::New(evt->GetQoS()), ReadOnly);
+    ret->Set(String::New("qos"),     Integer::New(evt->GetQoS()),   ReadOnly);
+    ret->Set(String::New("size"),    Integer::New(evt->GetSize()),  ReadOnly);
 
     typedef boost::char_separator<char> separator;
@@ -603 +608 @@
         for (auto it=tok.begin(); it!=tok.end(); it++, pos++)
         {
+            if (ptr>=evt->GetText())
+                return handle_scope.Close(ret);
+
             char type = (*it)[0];
             it++;

trunk/FACT++/src/InterpreterV8.h

@@ -10 +10 @@
 #endif
 
+#include "State.h"
 #include "Description.h"
 #include "EventImp.h"
@@ -94 +95 @@
     virtual void  JsSleep(uint32_t) { }
     virtual int   JsWait(const std::string &, int32_t, uint32_t) { return -1; };
-    virtual std::pair<int32_t, std::string>  JsState(const std::string &) { return std::make_pair(-256, ""); };
+    virtual State JsState(const std::string &) { return State(); };
     virtual void *JsSubscribe(const std::string &) { return 0; };
     virtual bool  JsUnsubscribe(const std::string &) { return false; };

trunk/FACT++/src/RemoteControl.h

@@ -170 +170 @@
     virtual void  JsException(const std::string &str) { if (fImp) fImp->Error(str.empty()?" ":str); }
 
-    pair<int32_t, string> JsState(const std::string &server)
-    {
-        return fImp ? fImp->GetServerState(server) : make_pair(-256, string());
+    State JsState(const std::string &server)
+    {
+        return fImp ? fImp->GetServerState(server) : State(-256, string());
     }
 
@@ -208 +208 @@
 
         int rc = 0;
-        while (timeout>Time() && !T::IsScriptStopped())
-        {
-            const pair<int32_t, string> st = fImp->GetServerState(server);
-            if (st.first==-256)
+        do
+        {
+            State st = fImp->GetServerState(server);
+            if (st.index==-256)
             {
                 lout << kRed << "Server '" << server << "' disconnected." << endl;
@@ -217 +217 @@
                 return -1;
             }
-            if (st.first==state)
+            if (st.index==state)
             {
                 rc = 1;
@@ -225 +225 @@
             usleep(1);
         }
+        while (timeout>Time() && !T::IsScriptStopped());
+
         T::Unlock();