X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d5b29830df70e823202e384a7655e4371193ecd7..ca9c986801463f350a0564a786d3334eb3a2c45a:/src/simix/popping_bodies.cpp

diff --git a/src/simix/popping_bodies.cpp b/src/simix/popping_bodies.cpp
index 79b16f1081..e1fb759745 100644
--- a/src/simix/popping_bodies.cpp
+++ b/src/simix/popping_bodies.cpp
@@ -60,24 +60,6 @@ inline static void simcall_BODY_process_suspend(smx_actor_t process) {
     return simcall<void, smx_actor_t>(SIMCALL_PROCESS_SUSPEND, process);
   }
 
-inline static void simcall_BODY_process_resume(smx_actor_t process) {
-    /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_process_resume(process);
-    return simcall<void, smx_actor_t>(SIMCALL_PROCESS_RESUME, process);
-  }
-
-inline static void simcall_BODY_process_set_host(smx_actor_t process, sg_host_t dest) {
-    /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) simcall_HANDLER_process_set_host(&SIMIX_process_self()->simcall, process, dest);
-    return simcall<void, smx_actor_t, sg_host_t>(SIMCALL_PROCESS_SET_HOST, process, dest);
-  }
-
-inline static int simcall_BODY_process_is_suspended(smx_actor_t process) {
-    /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_process_is_suspended(process);
-    return simcall<int, smx_actor_t>(SIMCALL_PROCESS_IS_SUSPENDED, process);
-  }
-
 inline static int simcall_BODY_process_join(smx_actor_t process, double timeout) {
     /* Go to that function to follow the code flow through the simcall barrier */
     if (0) simcall_HANDLER_process_join(&SIMIX_process_self()->simcall, process, timeout);
@@ -90,22 +72,22 @@ inline static int simcall_BODY_process_sleep(double duration) {
     return simcall<int, double>(SIMCALL_PROCESS_SLEEP, duration);
   }
 
-  inline static boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>
+  inline static boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>
   simcall_BODY_execution_start(const char* name, double flops_amount, double priority, double bound)
   {
     /* Go to that function to follow the code flow through the simcall barrier */
     if (0) simcall_HANDLER_execution_start(&SIMIX_process_self()->simcall, name, flops_amount, priority, bound);
-    return simcall<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>, const char*, double, double, double>(
+    return simcall<boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>, const char*, double, double, double>(
         SIMCALL_EXECUTION_START, name, flops_amount, priority, bound);
   }
 
-  inline static boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>
+  inline static boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>
   simcall_BODY_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_list, double* flops_amount,
                                         double* bytes_amount, double amount, double rate, double timeout)
   {
     /* Go to that function to follow the code flow through the simcall barrier */
     if (0) SIMIX_execution_parallel_start(name, host_nb, host_list, flops_amount, bytes_amount, amount, rate, timeout);
-    return simcall<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>, const char*, int, sg_host_t*, double*,
+    return simcall<boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>, const char*, int, sg_host_t*, double*,
                    double*, double, double, double>(SIMCALL_EXECUTION_PARALLEL_START, name, host_nb, host_list,
                                                     flops_amount, bytes_amount, amount, rate, timeout);
   }
@@ -331,63 +313,33 @@ inline static int simcall_BODY_sem_get_capacity(smx_sem_t sem) {
     return simcall<int, smx_sem_t>(SIMCALL_SEM_GET_CAPACITY, sem);
   }
 
-inline static sg_size_t simcall_BODY_file_read(smx_file_t fd, sg_size_t size, sg_host_t host) {
+  inline static sg_size_t simcall_BODY_file_read(surf_file_t fd, sg_size_t size, sg_host_t host)
+  {
     /* Go to that function to follow the code flow through the simcall barrier */
     if (0) simcall_HANDLER_file_read(&SIMIX_process_self()->simcall, fd, size, host);
-    return simcall<sg_size_t, smx_file_t, sg_size_t, sg_host_t>(SIMCALL_FILE_READ, fd, size, host);
+    return simcall<sg_size_t, surf_file_t, sg_size_t, sg_host_t>(SIMCALL_FILE_READ, fd, size, host);
   }
 
-inline static sg_size_t simcall_BODY_file_write(smx_file_t fd, sg_size_t size, sg_host_t host) {
+  inline static sg_size_t simcall_BODY_file_write(surf_file_t fd, sg_size_t size, sg_host_t host)
+  {
     /* Go to that function to follow the code flow through the simcall barrier */
     if (0) simcall_HANDLER_file_write(&SIMIX_process_self()->simcall, fd, size, host);
-    return simcall<sg_size_t, smx_file_t, sg_size_t, sg_host_t>(SIMCALL_FILE_WRITE, fd, size, host);
+    return simcall<sg_size_t, surf_file_t, sg_size_t, sg_host_t>(SIMCALL_FILE_WRITE, fd, size, host);
   }
 
-  inline static smx_file_t simcall_BODY_file_open(const char* mount, const char* path, sg_storage_t st)
+  inline static surf_file_t simcall_BODY_file_open(const char* mount, const char* path, sg_storage_t st)
   {
     /* Go to that function to follow the code flow through the simcall barrier */
     if (0)
       simcall_HANDLER_file_open(&SIMIX_process_self()->simcall, mount, path, st);
-    return simcall<smx_file_t, const char*, const char*, sg_storage_t>(SIMCALL_FILE_OPEN, mount, path, st);
+    return simcall<surf_file_t, const char*, const char*, sg_storage_t>(SIMCALL_FILE_OPEN, mount, path, st);
   }
 
-inline static int simcall_BODY_file_close(smx_file_t fd, sg_host_t host) {
+  inline static int simcall_BODY_file_close(surf_file_t fd, sg_host_t host)
+  {
     /* Go to that function to follow the code flow through the simcall barrier */
     if (0) simcall_HANDLER_file_close(&SIMIX_process_self()->simcall, fd, host);
-    return simcall<int, smx_file_t, sg_host_t>(SIMCALL_FILE_CLOSE, fd, host);
-  }
-
-inline static int simcall_BODY_file_unlink(smx_file_t fd, sg_host_t host) {
-    /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_file_unlink(fd, host);
-    return simcall<int, smx_file_t, sg_host_t>(SIMCALL_FILE_UNLINK, fd, host);
-  }
-
-inline static sg_size_t simcall_BODY_file_get_size(smx_file_t fd) {
-    /* Go to that function to follow the code flow through the simcall barrier */
-    if (0)
-      SIMIX_file_get_size(fd);
-    return simcall<sg_size_t, smx_file_t>(SIMCALL_FILE_GET_SIZE, fd);
-  }
-
-inline static sg_size_t simcall_BODY_file_tell(smx_file_t fd) {
-    /* Go to that function to follow the code flow through the simcall barrier */
-    if (0)
-      SIMIX_file_tell(fd);
-    return simcall<sg_size_t, smx_file_t>(SIMCALL_FILE_TELL, fd);
-  }
-
-inline static int simcall_BODY_file_seek(smx_file_t fd, sg_offset_t offset, int origin) {
-    /* Go to that function to follow the code flow through the simcall barrier */
-    if (0)
-      SIMIX_file_seek(fd, offset, origin);
-    return simcall<int, smx_file_t, sg_offset_t, int>(SIMCALL_FILE_SEEK, fd, offset, origin);
-  }
-
-inline static int simcall_BODY_file_move(smx_file_t fd, const char* fullpath) {
-    /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) simcall_HANDLER_file_move(&SIMIX_process_self()->simcall, fd, fullpath);
-    return simcall<int, smx_file_t, const char*>(SIMCALL_FILE_MOVE, fd, fullpath);
+    return simcall<int, surf_file_t, sg_host_t>(SIMCALL_FILE_CLOSE, fd, host);
   }
 
 inline static int simcall_BODY_mc_random(int min, int max) {