X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/29a3b2869c0075fc75e8ccc66fc1d9c4c8bf6a85..db98b9792e2e334d16905500c9464bb17c707396:/src/simix/simcalls.py

diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py
index be84fb8186..2f8b00cc40 100755
--- a/src/simix/simcalls.py
+++ b/src/simix/simcalls.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2014-2018. The SimGrid Team. All rights reserved.
+# Copyright (c) 2014-2019. The SimGrid Team. All rights reserved.
 
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the license (GNU LGPL) which comes with this package.
@@ -236,7 +236,7 @@ def header(name):
     fd.write(
         '/* change simcalls specification in src/simix/simcalls.in             */\n')
     fd.write(
-        '/* Copyright (c) 2014-2018. The SimGrid Team. All rights reserved.    */\n')
+        '/* Copyright (c) 2014-2019. The SimGrid Team. All rights reserved.    */\n')
     fd.write(
         '/**********************************************************************/\n\n')
     fd.write('/*\n')
@@ -314,7 +314,6 @@ if __name__ == '__main__':
     fd.write('#endif\n')
     fd.write('#include "src/kernel/activity/ConditionVariableImpl.hpp"\n')
     fd.write('#include "src/simix/smx_host_private.hpp"\n')
-    fd.write('#include "src/simix/smx_synchro_private.hpp"\n')
 
     fd.write('\n')
     fd.write('XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_popping);\n\n')
@@ -350,7 +349,7 @@ if __name__ == '__main__':
     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", simcall->issuer->get_cname(),\n')
-    fd.write('             sg_host_get_name(simcall->issuer->host_));\n')
+    fd.write('             sg_host_get_name(simcall->issuer->get_host()));\n')
     fd.write('      break;\n')
     fd.write('    default:\n')
     fd.write('      THROW_IMPOSSIBLE;\n')
@@ -365,7 +364,6 @@ if __name__ == '__main__':
     fd = header('popping_bodies.cpp')
     fd.write('#include "smx_private.hpp"\n')
     fd.write('#include "src/mc/mc_forward.hpp"\n')
-    fd.write('#include "src/simix/smx_synchro_private.hpp"\n')
     fd.write('#include "xbt/ex.h"\n')
     fd.write('#include <functional>\n')
     fd.write('#include <simgrid/simix.hpp>\n')
@@ -380,7 +378,7 @@ inline static R simcall(e_smx_simcall_t call, T const&... t)
   if (self != simix_global->maestro_process) {
     XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->get_cname(), SIMIX_simcall_name(self->simcall.call),
               (int)self->simcall.call);
-    SIMIX_process_yield(self);
+    self->yield();
   } else {
     SIMIX_simcall_handle(&self->simcall, 0);
   }