X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0d9a15e44114bd49c578a0ceda7503abdd9b39a9..40616078da72e823931c1fb884949054699ec39d:/src/simix/simcalls.py

diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py
index 7d1b2b76bb..70b1bb34c1 100755
--- a/src/simix/simcalls.py
+++ b/src/simix/simcalls.py
@@ -36,7 +36,7 @@ class Simcall(object):
         # libsmx.c  simcall_BODY_
         if self.simcalls_BODY is None:
             f = open('libsmx.cpp')
-            self.simcalls_BODY = set(re.findall('simcall_BODY_(.*?)\(', f.read()))
+            self.simcalls_BODY = set(re.findall(r'simcall_BODY_(.*?)\(', f.read()))
             f.close()
         if self.name not in self.simcalls_BODY:
             print ('# ERROR: No function calling simcall_BODY_%s' % self.name)
@@ -51,9 +51,9 @@ class Simcall(object):
         # smx_host_t h)
         if self.simcalls_PRE is None:
             self.simcalls_PRE = set()
-            for fn in glob.glob('smx_*') + glob.glob('../mc/*'):
+            for fn in glob.glob('smx_*') + glob.glob('ActorImpl*') + glob.glob('../mc/*cpp'):
                 f = open(fn)
-                self.simcalls_PRE |= set(re.findall('simcall_HANDLER_(.*?)\(', f.read()))
+                self.simcalls_PRE |= set(re.findall(r'simcall_HANDLER_(.*?)\(', f.read()))
                 f.close()
         if self.need_handler:
             if self.name not in self.simcalls_PRE:
@@ -75,7 +75,7 @@ class Simcall(object):
         return '  SIMCALL_%s,' % (self.name.upper())
 
     def string(self):
-        return '  "SIMCALL_%s",' % self.name.upper()
+        return '    "SIMCALL_%s",' % self.name.upper()
 
     def accessors(self):
         res = []
@@ -174,10 +174,10 @@ def parse(fn):
         assert match, line
         ret, name, args, attrs = match.groups()
         sargs = []
-        if not re.match("^\s*$", args):
+        if not re.match(r"^\s*$", args):
             for arg in re.split(",", args):
                 args = args.strip()
-                match = re.match("^(.*?)\s*?(\S+)$", arg)
+                match = re.match(r"^(.*?)\s*?(\S+)$", arg)
                 t, n = match.groups()
                 t = t.strip()
                 n = n.strip()
@@ -300,10 +300,10 @@ if __name__ == '__main__':
         '/** @brief Simcalls\' names (generated from src/simix/simcalls.in) */\n')
     fd.write('const char* simcall_names[] = {\n')
 
-    fd.write('   "SIMCALL_NONE",')
+    fd.write('    "SIMCALL_NONE",\n')
     handle(fd, Simcall.string, simcalls, simcalls_dict)
 
-    fd.write('};\n\n')
+    fd.write('\n};\n\n')
 
     fd.write('/** @private\n')
     fd.write(
@@ -326,11 +326,9 @@ if __name__ == '__main__':
     fd.write('    case NUM_SIMCALLS:\n')
     fd.write('      break;\n')
     fd.write('    case SIMCALL_NONE:\n')
-    fd.write(
-        '      THROWF(arg_error,0,"Asked to do the noop syscall on %s@%s",\n')
-    fd.write('          SIMIX_process_get_name(simcall->issuer),\n')
-    fd.write(
-        '          sg_host_get_name(SIMIX_process_get_host(simcall->issuer))\n')
+    fd.write('      THROWF(arg_error,0,"Asked to do the noop syscall on %s@%s",\n')
+    fd.write('          simcall->issuer->name.c_str(),\n')
+    fd.write('          sg_host_get_name(simcall->issuer->host)\n')
     fd.write('          );\n')
     fd.write('      break;\n')
     fd.write('\n')
@@ -353,7 +351,7 @@ if __name__ == '__main__':
 template<class R, class... T>
 inline static R simcall(e_smx_simcall_t call, T const&... t)
 {
-  smx_process_t self = SIMIX_process_self();
+  smx_actor_t self = SIMIX_process_self();
   simgrid::simix::marshal(&self->simcall, call, t...);
   if (self != simix_global->maestro_process) {
     XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),