X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7ee0641f32c8e47aa709bbd472a4d0d2b4cc3663..4cd03d236d21b16b2607d67b146cc44b402e7bdd:/src/simix/simcalls.py

diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py
index 6d52267b8f..eff39b7a07 100755
--- a/src/simix/simcalls.py
+++ b/src/simix/simcalls.py
@@ -51,7 +51,7 @@ 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/*'):
                 f = open(fn)
                 self.simcalls_PRE |= set(re.findall(r'simcall_HANDLER_(.*?)\(', f.read()))
                 f.close()
@@ -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(simcall->issuer->host)\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(),