Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
sonar: this simcall does not need a handler anymore
authorMartin Quinson <martin.quinson@loria.fr>
Tue, 12 Dec 2017 22:33:59 +0000 (23:33 +0100)
committerMartin Quinson <martin.quinson@loria.fr>
Tue, 12 Dec 2017 22:33:59 +0000 (23:33 +0100)
src/simix/popping_accessors.hpp
src/simix/popping_bodies.cpp
src/simix/popping_generated.cpp
src/simix/simcalls.in
src/simix/smx_host.cpp

index fc80fc2..106e960 100644 (file)
@@ -1403,9 +1403,6 @@ XBT_PRIVATE void simcall_HANDLER_process_killall(smx_simcall_t simcall, int rese
 XBT_PRIVATE void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_actor_t process);
 XBT_PRIVATE void simcall_HANDLER_process_join(smx_simcall_t simcall, smx_actor_t process, double timeout);
 XBT_PRIVATE void simcall_HANDLER_process_sleep(smx_simcall_t simcall, double duration);
-XBT_PRIVATE boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>
-simcall_HANDLER_execution_start(smx_simcall_t simcall, const char* name, double flops_amount, double priority,
-                                double bound, sg_host_t host);
 XBT_PRIVATE void simcall_HANDLER_execution_wait(smx_simcall_t simcall, boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> execution);
 XBT_PRIVATE void
 simcall_HANDLER_execution_test(smx_simcall_t simcall,
index f616cf5..8bae553 100644 (file)
@@ -75,7 +75,7 @@ inline static boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>
 simcall_BODY_execution_start(const char* name, double flops_amount, double priority, double bound, sg_host_t host)
 {
   if (0) /* Go to that function to follow the code flow through the simcall barrier */
-    simcall_HANDLER_execution_start(&SIMIX_process_self()->simcall, name, flops_amount, priority, bound, host);
+    SIMIX_execution_start(name, flops_amount, priority, bound, host);
   return simcall<boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>, const char*, double, double, double,
                  sg_host_t>(SIMCALL_EXECUTION_START, name, flops_amount, priority, bound, host);
 }
index 5184279..f24a394 100644 (file)
@@ -97,11 +97,11 @@ case SIMCALL_PROCESS_SLEEP:
 
 case SIMCALL_EXECUTION_START:
   simgrid::simix::marshal<boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>>(
-      simcall->result,
-      simcall_HANDLER_execution_start(
-          simcall, simgrid::simix::unmarshal<const char*>(simcall->args[0]),
-          simgrid::simix::unmarshal<double>(simcall->args[1]), simgrid::simix::unmarshal<double>(simcall->args[2]),
-          simgrid::simix::unmarshal<double>(simcall->args[3]), simgrid::simix::unmarshal<sg_host_t>(simcall->args[4])));
+      simcall->result, SIMIX_execution_start(simgrid::simix::unmarshal<const char*>(simcall->args[0]),
+                                             simgrid::simix::unmarshal<double>(simcall->args[1]),
+                                             simgrid::simix::unmarshal<double>(simcall->args[2]),
+                                             simgrid::simix::unmarshal<double>(simcall->args[3]),
+                                             simgrid::simix::unmarshal<sg_host_t>(simcall->args[4])));
   SIMIX_simcall_answer(simcall);
   break;
 
index b2425c0..82fd939 100644 (file)
@@ -41,7 +41,7 @@ void process_suspend(smx_actor_t process) [[block]];
 int  process_join(smx_actor_t process, double timeout) [[block]];
 int  process_sleep(double duration) [[block]];
 
-boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl> execution_start(const char* name, double flops_amount, double priority, double bound, sg_host_t host);
+boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl> execution_start(const char* name, double flops_amount, double priority, double bound, sg_host_t host) [[nohandler]];
 boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl> execution_parallel_start(const char* name, int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount, double rate, double timeout) [[nohandler]];
 int           execution_wait(boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> execution) [[block]];
 int           execution_test(boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> execution) [[block]];
index 692e828..f9fbcbc 100644 (file)
@@ -145,13 +145,6 @@ void SIMIX_host_autorestart(sg_host_t host)
   process_list.clear();
 }
 
-boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>
-simcall_HANDLER_execution_start(smx_simcall_t simcall, const char* name, double flops_amount, double priority,
-                                double bound, sg_host_t host)
-{
-  return SIMIX_execution_start(name, flops_amount, priority, bound, host);
-}
-
 boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>
 SIMIX_execution_start(const char* name, double flops_amount, double priority, double bound, sg_host_t host)
 {