Inicio Explorar Axuda
Iniciar sesión
jonathanvdc
/
modelverse
Fork de yentl/modelverse
Seguir 1
Destacar 0
Fork 0
Ficheiros
Explorar o código

for yentl

Simon Van Mierlo %!s(int64=8) %!d(string=hai) anos
pai
e0b8e827fd
achega
360569e33c
Modificáronse 6 ficheiros con 1718 adicións e 3006 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 67 4
      kernel/mvk_server/classes/executor.xml
  2. 1 1
      kernel/mvk_server/classes/local_mvs.xml
  3. 12 16
      kernel/mvk_server/classes/mvkcontroller.xml
  4. 1 0
      kernel/mvk_server/classes/user_statechart.xml
  5. 1635 2983
      kernel/mvk_server/server.py
  6. 2 2
      scripts/run_local_modelverse.py

+ 67 - 4
kernel/mvk_server/classes/executor.xml
Ver ficheiro 

@@ -6,13 +6,58 @@
 
         <parameter name="mvk"/>
 
         <body>
 
             <![CDATA[
 
+            self.mvs = ModelverseState("../bootstrap/bootstrap.m.gz")
 
             self.request_queue = [("", "", "load_primitives", [], None)]
 
+            self.mvs.GC = True
 
             self.mvk = mvk
 
             self.first = True
 
             self.mvs_response = None
 
+            
+            self.mvs_operations = {
 
+                    "CN": self.mvs.create_node,
 
+                    "CE": self.mvs.create_edge,
 
+                    "CNV": self.mvs.create_nodevalue,
 
+                    "CD": self.mvs.create_dict,
 
+
 
+                    "RV": self.mvs.read_value,
 
+                    "RO": self.mvs.read_outgoing,
 
+                    "RI": self.mvs.read_incoming,
 
+                    "RE": self.mvs.read_edge,
 
+                    "RD": self.mvs.read_dict,
 
+                    "RDN": self.mvs.read_dict_node,
 
+                    "RDNE": self.mvs.read_dict_node_edge,
 
+                    "RDE": self.mvs.read_dict_edge,
 
+                    "RRD": self.mvs.read_reverse_dict,
 
+                    "RR": self.mvs.read_root,
 
+                    "RDK": self.mvs.read_dict_keys,
 
+
 
+                    "DE": self.mvs.delete_edge,
 
+                    "DN": self.mvs.delete_node,
 
+                }
 
+
 
             ]]>
 
         </body>
 
     </constructor>
 
+
 
+    <method name="execute_modelverse">
 
+        <parameter name="username"/>
 
+        <parameter name="operation"/>
 
+        <parameter name="params"/>
 
+        <body>
 
+            <![CDATA[
 
+            reply = None
 
+            commands = []
 
+            while 1:
 
+                commands = self.mvk.execute_yields(username, operation, params, reply)
 
+                if commands is None:
 
+                    break
 
+                reply = [self.mvs_operations[command[0]](*(command[1]))[0] for command in commands]
 
+                #for c, r in zip(commands, reply):
 
+                #    print("%s --> %s" % (c, r))
 
+            ]]>
 
+        </body>
 
+    </method>
 
+    
     <scxml initial="init">
 
         <parallel id="init">
 
             <state id="queue">
 
@@ -24,6 +69,7 @@
 
                         <parameter name="params"/>
 
                         <parameter name="request_id"/>
 
                         <script>
 
+                            print 'got execute event'
 
                             self.request_queue.append(("/" + returnpath, username, operation, params, request_id))
 
                         </script>
 
                     </transition>
 
@@ -32,6 +78,11 @@
 
 
             <state id="execute" initial="idle">
 
                 <state id="idle">
 
+                    <onentry>
 
+                        <script>
 
+                            print 'in idle'
 
+                        </script>
 
+                    </onentry>
 
                     <transition cond="self.request_queue" target="../execution"/>
 
                 </state>
 
 
@@ -40,6 +91,7 @@
 
                         <script>
 
                             try:
 
                                 _, username, operation, params, _ = self.request_queue[0]
 
+                                print 'executing %s %s' % (operation, params)
 
                                 self.mvs_commands = self.mvk.execute_yields(username, operation, params, self.mvs_response)
 
                             except:
 
                                 import traceback
 
@@ -69,14 +121,17 @@
 
                         </script>
 
                     </transition>
 
 
-                    <transition cond="len(self.mvs_commands) > 0" target="../waiting_for_response">
 
+                    <transition cond="self.mvs_commands is not None and len(self.mvs_commands) > 0" target="../waiting_for_response">
 
                         <raise event="HTTP_input" scope="narrow" target="'parent/to_mvs'">
 
                             <parameter expr="'requests=%s' % json.dumps(self.mvs_commands)"/>
 
                             <parameter expr="'parent/executor'"/>
 
                         </raise>
 
                     </transition>
 
 
-                    <transition cond="len(self.mvs_commands) == 0" target=".">
 
+                    <transition cond="self.mvs_commands is not None and len(self.mvs_commands) == 0" target=".">
 
+                        <script>
 
+                            self.mvs_response = []
 
+                        </script>
 
                     </transition>
 
                 </state>
 
 
@@ -85,10 +140,18 @@
 
                         <parameter name="data"/>
 
                         <script>
 
                             self.mvs_response = [v[0] for v in json.loads(data["data"])]
 
-                            if len(self.mvs_response) == 1:
 
-                                self.mvs_response = self.mvs_response[0]
 
                         </script>
 
                     </transition>
 
+                    <onexit>
 
+                        <script>
 
+                            print 'leaving waiting_for_response'
 
+                        </script>
 
+                    </onexit>
 
+                    <onentry>
 
+                        <script>
 
+                            print 'entering waiting_for_response'
 
+                        </script>
 
+                    </onentry>
 
                 </state>
 
             </state>
 
         </parallel>

+ 1 - 1
kernel/mvk_server/classes/local_mvs.xml
Ver ficheiro 

@@ -11,7 +11,7 @@
 
             import sys
 
             sys.path.append("../../state")
 
             from modelverse_state.main import ModelverseState
 
-            self.mvs = ModelverseState(params[0])
 
+            self.mvs = ModelverseState("../../bootstrap/bootstrap.m.gz")
 
             self.mvs_operations = {
 
                "CN": self.mvs.create_node,
 
                "CE": self.mvs.create_edge,

+ 12 - 16
kernel/mvk_server/classes/mvkcontroller.xml
Ver ficheiro 

@@ -104,26 +104,21 @@
 
                     <transition event="from_mvi" target=".">

                         <parameter name="source"/>

                         <parameter name="data"/>

-                        <script>

+                        <script>                                

                             # No JSON encoding necessary, as it is not complex

                             try:

+                                print 'from_mvi %s' % data

+                                args = None

                                 if data["op"] == "set_input":

-                                    if data["element_type"] == "V":

-                                        value = json.loads(data["value"])

+                                    if "value" in data:

+                                        value = [json.loads(data["value"])]

                                     else:

-                                        value = data["value"]

-                                    args = (data["element_type"], value)

-                                    self.input_queue.append((source, "set_input", args, data["username"]))

-                                elif data["op"] == "get_output":

-                                    args = []

-                                    self.input_queue.append((source, "get_output", args, data["username"]))

-                                else:

-                                    print("DROPPING unknown operation: " + str(data["op"]))

-                            except:

-                                import traceback

-                                traceback.print_exc()

-                                print("DROPPING deserialization error")

-                                print("Decoding value " + str(data["value"]))

+                                        value = json.loads(data["data"])

+                                    args = value

+                                self.input_queue.append((source, data["op"], args, data["username"]))

+                            except ValueError:

+                                print("Error when deserializing request: " + str(data))

+                                raise

                         </script>

                     </transition>

                 </state>

@@ -224,6 +219,7 @@
 
                             <parameter expr="instancename"/>

                         </raise>

                         <script>

+                            print self.users[0]

                             self.user_statecharts[self.users[0]] = instancename

                             # Repush all this user's messages in the input queue

                             self.input_queue.extend(self.user_queue.pop(self.users[0], []))

+ 1 - 0
kernel/mvk_server/classes/user_statechart.xml
Ver ficheiro 

@@ -75,6 +75,7 @@
 
                             <parameter expr="self.request_id"/>
 
                         </raise>
 
                         <script>
 
+                            print 'set_input in userstatechart'
 
                             self.outstanding_input[self.request_id] = source
 
                             self.request_id += 1
 
                         </script>

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1635 - 2983
kernel/mvk_server/server.py


+ 2 - 2
scripts/run_local_modelverse.py
Ver ficheiro 

@@ -6,5 +6,5 @@ if len(sys.argv) != 2:
 
     sys.stderr.write("Expected different parameters!\n")
 
     sys.stderr.write("    %s port\n" % sys.argv[0])
 
 else:
 
-    subprocess.check_call([sys.executable, "-m", "sccd.compiler.sccdc", "-p", "threads", "server.xml"], cwd="hybrid_server")
 
-    subprocess.call([sys.executable, "run_mvk_server.py", sys.argv[1]], cwd="hybrid_server")
 
+    subprocess.check_call([sys.executable, "-m", "sccd.compiler.sccdc", "-p", "threads", "server.xml"], cwd="kernel/mvk_server")
 
+    subprocess.call([sys.executable, "run_mvk_server.py", sys.argv[1]], cwd="kernel/mvk_server")