convert SIMIX_simcall_answer() into ActorImpl::simcall_answer()

[simgrid.git] / src / simix / popping_generated.cpp

diff --git a/src/simix/popping_generated.cpp b/src/simix/popping_generated.cpp
index 2d14457..a4cc938 100644 (file)
--- a/src/simix/popping_generated.cpp
+++ b/src/simix/popping_generated.cpp
@@ -58,8 +58,7 @@ const char* simcall_names[] = {
  *
  * This function is generated from src/simix/simcalls.in
  */
-void simgrid::kernel::actor::ActorImpl::simcall_handle(int value)
-{
+void simgrid::kernel::actor::ActorImpl::simcall_handle(int value) {
   XBT_DEBUG("Handling simcall %p: %s", &simcall, SIMIX_simcall_name(simcall.call));
   SIMCALL_SET_MC_VALUE(simcall, value);
   if (context_->iwannadie)
@@ -70,8 +69,7 @@ void simgrid::kernel::actor::ActorImpl::simcall_handle(int value)
       break;
 
     case SIMCALL_PROCESS_JOIN:
-      simcall_HANDLER_process_join(&simcall, simgrid::simix::unmarshal<smx_actor_t>(simcall.args[0]),
-                                   simgrid::simix::unmarshal<double>(simcall.args[1]));
+      simcall_HANDLER_process_join(&simcall, simgrid::simix::unmarshal<smx_actor_t>(simcall.args[0]), simgrid::simix::unmarshal<double>(simcall.args[1]));
       break;
 
     case SIMCALL_PROCESS_SLEEP:
@@ -79,95 +77,49 @@ void simgrid::kernel::actor::ActorImpl::simcall_handle(int value)
       break;
 
     case SIMCALL_EXECUTION_WAIT:
-      simcall_HANDLER_execution_wait(&simcall,
-                                     simgrid::simix::unmarshal<simgrid::kernel::activity::ExecImpl*>(simcall.args[0]));
+      simcall_HANDLER_execution_wait(&simcall, simgrid::simix::unmarshal<simgrid::kernel::activity::ExecImpl*>(simcall.args[0]));
       break;
 
     case SIMCALL_EXECUTION_WAITANY_FOR:
-      simcall_HANDLER_execution_waitany_for(
-          &simcall, simgrid::simix::unmarshal<simgrid::kernel::activity::ExecImpl**>(simcall.args[0]),
-          simgrid::simix::unmarshal<size_t>(simcall.args[1]), simgrid::simix::unmarshal<double>(simcall.args[2]));
+      simcall_HANDLER_execution_waitany_for(&simcall, simgrid::simix::unmarshal<simgrid::kernel::activity::ExecImpl**>(simcall.args[0]), simgrid::simix::unmarshal<size_t>(simcall.args[1]), simgrid::simix::unmarshal<double>(simcall.args[2]));
       break;
 
     case SIMCALL_EXECUTION_TEST:
-      simcall_HANDLER_execution_test(&simcall,
-                                     simgrid::simix::unmarshal<simgrid::kernel::activity::ExecImpl*>(simcall.args[0]));
+      simcall_HANDLER_execution_test(&simcall, simgrid::simix::unmarshal<simgrid::kernel::activity::ExecImpl*>(simcall.args[0]));
       break;
 
     case SIMCALL_COMM_SEND:
-      simcall_HANDLER_comm_send(
-          &simcall, simgrid::simix::unmarshal<smx_actor_t>(simcall.args[0]),
-          simgrid::simix::unmarshal<smx_mailbox_t>(simcall.args[1]), simgrid::simix::unmarshal<double>(simcall.args[2]),
-          simgrid::simix::unmarshal<double>(simcall.args[3]),
-          simgrid::simix::unmarshal<unsigned char*>(simcall.args[4]),
-          simgrid::simix::unmarshal<size_t>(simcall.args[5]),
-          simgrid::simix::unmarshal<simix_match_func_t>(simcall.args[6]),
-          simgrid::simix::unmarshal<simix_copy_data_func_t>(simcall.args[7]),
-          simgrid::simix::unmarshal<void*>(simcall.args[8]), simgrid::simix::unmarshal<double>(simcall.args[9]));
+      simcall_HANDLER_comm_send(&simcall, simgrid::simix::unmarshal<smx_actor_t>(simcall.args[0]), simgrid::simix::unmarshal<smx_mailbox_t>(simcall.args[1]), simgrid::simix::unmarshal<double>(simcall.args[2]), simgrid::simix::unmarshal<double>(simcall.args[3]), simgrid::simix::unmarshal<unsigned char*>(simcall.args[4]), simgrid::simix::unmarshal<size_t>(simcall.args[5]), simgrid::simix::unmarshal<simix_match_func_t>(simcall.args[6]), simgrid::simix::unmarshal<simix_copy_data_func_t>(simcall.args[7]), simgrid::simix::unmarshal<void*>(simcall.args[8]), simgrid::simix::unmarshal<double>(simcall.args[9]));
       break;
 
     case SIMCALL_COMM_ISEND:
-      simgrid::simix::marshal<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>>(
-          simcall.result, simcall_HANDLER_comm_isend(&simcall, simgrid::simix::unmarshal<smx_actor_t>(simcall.args[0]),
-                                                     simgrid::simix::unmarshal<smx_mailbox_t>(simcall.args[1]),
-                                                     simgrid::simix::unmarshal<double>(simcall.args[2]),
-                                                     simgrid::simix::unmarshal<double>(simcall.args[3]),
-                                                     simgrid::simix::unmarshal<unsigned char*>(simcall.args[4]),
-                                                     simgrid::simix::unmarshal<size_t>(simcall.args[5]),
-                                                     simgrid::simix::unmarshal<simix_match_func_t>(simcall.args[6]),
-                                                     simgrid::simix::unmarshal<simix_clean_func_t>(simcall.args[7]),
-                                                     simgrid::simix::unmarshal<simix_copy_data_func_t>(simcall.args[8]),
-                                                     simgrid::simix::unmarshal<void*>(simcall.args[9]),
-                                                     simgrid::simix::unmarshal<bool>(simcall.args[10])));
-      SIMIX_simcall_answer(&simcall);
+      simgrid::simix::marshal<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>>(simcall.result, simcall_HANDLER_comm_isend(&simcall, simgrid::simix::unmarshal<smx_actor_t>(simcall.args[0]), simgrid::simix::unmarshal<smx_mailbox_t>(simcall.args[1]), simgrid::simix::unmarshal<double>(simcall.args[2]), simgrid::simix::unmarshal<double>(simcall.args[3]), simgrid::simix::unmarshal<unsigned char*>(simcall.args[4]), simgrid::simix::unmarshal<size_t>(simcall.args[5]), simgrid::simix::unmarshal<simix_match_func_t>(simcall.args[6]), simgrid::simix::unmarshal<simix_clean_func_t>(simcall.args[7]), simgrid::simix::unmarshal<simix_copy_data_func_t>(simcall.args[8]), simgrid::simix::unmarshal<void*>(simcall.args[9]), simgrid::simix::unmarshal<bool>(simcall.args[10])));
+      simcall_answer();
       break;
 
     case SIMCALL_COMM_RECV:
-      simcall_HANDLER_comm_recv(&simcall, simgrid::simix::unmarshal<smx_actor_t>(simcall.args[0]),
-                                simgrid::simix::unmarshal<smx_mailbox_t>(simcall.args[1]),
-                                simgrid::simix::unmarshal<unsigned char*>(simcall.args[2]),
-                                simgrid::simix::unmarshal<size_t*>(simcall.args[3]),
-                                simgrid::simix::unmarshal<simix_match_func_t>(simcall.args[4]),
-                                simgrid::simix::unmarshal<simix_copy_data_func_t>(simcall.args[5]),
-                                simgrid::simix::unmarshal<void*>(simcall.args[6]),
-                                simgrid::simix::unmarshal<double>(simcall.args[7]),
-                                simgrid::simix::unmarshal<double>(simcall.args[8]));
+      simcall_HANDLER_comm_recv(&simcall, simgrid::simix::unmarshal<smx_actor_t>(simcall.args[0]), simgrid::simix::unmarshal<smx_mailbox_t>(simcall.args[1]), simgrid::simix::unmarshal<unsigned char*>(simcall.args[2]), simgrid::simix::unmarshal<size_t*>(simcall.args[3]), simgrid::simix::unmarshal<simix_match_func_t>(simcall.args[4]), simgrid::simix::unmarshal<simix_copy_data_func_t>(simcall.args[5]), simgrid::simix::unmarshal<void*>(simcall.args[6]), simgrid::simix::unmarshal<double>(simcall.args[7]), simgrid::simix::unmarshal<double>(simcall.args[8]));
       break;
 
     case SIMCALL_COMM_IRECV:
-      simgrid::simix::marshal<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>>(
-          simcall.result, simcall_HANDLER_comm_irecv(&simcall, simgrid::simix::unmarshal<smx_actor_t>(simcall.args[0]),
-                                                     simgrid::simix::unmarshal<smx_mailbox_t>(simcall.args[1]),
-                                                     simgrid::simix::unmarshal<unsigned char*>(simcall.args[2]),
-                                                     simgrid::simix::unmarshal<size_t*>(simcall.args[3]),
-                                                     simgrid::simix::unmarshal<simix_match_func_t>(simcall.args[4]),
-                                                     simgrid::simix::unmarshal<simix_copy_data_func_t>(simcall.args[5]),
-                                                     simgrid::simix::unmarshal<void*>(simcall.args[6]),
-                                                     simgrid::simix::unmarshal<double>(simcall.args[7])));
-      SIMIX_simcall_answer(&simcall);
+      simgrid::simix::marshal<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>>(simcall.result, simcall_HANDLER_comm_irecv(&simcall, simgrid::simix::unmarshal<smx_actor_t>(simcall.args[0]), simgrid::simix::unmarshal<smx_mailbox_t>(simcall.args[1]), simgrid::simix::unmarshal<unsigned char*>(simcall.args[2]), simgrid::simix::unmarshal<size_t*>(simcall.args[3]), simgrid::simix::unmarshal<simix_match_func_t>(simcall.args[4]), simgrid::simix::unmarshal<simix_copy_data_func_t>(simcall.args[5]), simgrid::simix::unmarshal<void*>(simcall.args[6]), simgrid::simix::unmarshal<double>(simcall.args[7])));
+      simcall_answer();
       break;
 
     case SIMCALL_COMM_WAITANY:
-      simcall_HANDLER_comm_waitany(
-          &simcall, simgrid::simix::unmarshal<simgrid::kernel::activity::CommImpl**>(simcall.args[0]),
-          simgrid::simix::unmarshal<size_t>(simcall.args[1]), simgrid::simix::unmarshal<double>(simcall.args[2]));
+      simcall_HANDLER_comm_waitany(&simcall, simgrid::simix::unmarshal<simgrid::kernel::activity::CommImpl**>(simcall.args[0]), simgrid::simix::unmarshal<size_t>(simcall.args[1]), simgrid::simix::unmarshal<double>(simcall.args[2]));
       break;
 
     case SIMCALL_COMM_WAIT:
-      simcall_HANDLER_comm_wait(&simcall,
-                                simgrid::simix::unmarshal<simgrid::kernel::activity::CommImpl*>(simcall.args[0]),
-                                simgrid::simix::unmarshal<double>(simcall.args[1]));
+      simcall_HANDLER_comm_wait(&simcall, simgrid::simix::unmarshal<simgrid::kernel::activity::CommImpl*>(simcall.args[0]), simgrid::simix::unmarshal<double>(simcall.args[1]));
       break;
 
     case SIMCALL_COMM_TEST:
-      simcall_HANDLER_comm_test(&simcall,
-                                simgrid::simix::unmarshal<simgrid::kernel::activity::CommImpl*>(simcall.args[0]));
+      simcall_HANDLER_comm_test(&simcall, simgrid::simix::unmarshal<simgrid::kernel::activity::CommImpl*>(simcall.args[0]));
       break;
 
     case SIMCALL_COMM_TESTANY:
-      simcall_HANDLER_comm_testany(&simcall,
-                                   simgrid::simix::unmarshal<simgrid::kernel::activity::CommImpl**>(simcall.args[0]),
-                                   simgrid::simix::unmarshal<size_t>(simcall.args[1]));
+      simcall_HANDLER_comm_testany(&simcall, simgrid::simix::unmarshal<simgrid::kernel::activity::CommImpl**>(simcall.args[0]), simgrid::simix::unmarshal<size_t>(simcall.args[1]));
       break;
 
     case SIMCALL_MUTEX_LOCK:
@@ -175,26 +127,21 @@ void simgrid::kernel::actor::ActorImpl::simcall_handle(int value)
       break;
 
     case SIMCALL_MUTEX_TRYLOCK:
-      simgrid::simix::marshal<int>(
-          simcall.result,
-          simcall_HANDLER_mutex_trylock(&simcall, simgrid::simix::unmarshal<smx_mutex_t>(simcall.args[0])));
-      SIMIX_simcall_answer(&simcall);
+      simgrid::simix::marshal<int>(simcall.result, simcall_HANDLER_mutex_trylock(&simcall, simgrid::simix::unmarshal<smx_mutex_t>(simcall.args[0])));
+      simcall_answer();
       break;
 
     case SIMCALL_MUTEX_UNLOCK:
       simcall_HANDLER_mutex_unlock(&simcall, simgrid::simix::unmarshal<smx_mutex_t>(simcall.args[0]));
-      SIMIX_simcall_answer(&simcall);
+      simcall_answer();
       break;
 
     case SIMCALL_COND_WAIT:
-      simcall_HANDLER_cond_wait(&simcall, simgrid::simix::unmarshal<smx_cond_t>(simcall.args[0]),
-                                simgrid::simix::unmarshal<smx_mutex_t>(simcall.args[1]));
+      simcall_HANDLER_cond_wait(&simcall, simgrid::simix::unmarshal<smx_cond_t>(simcall.args[0]), simgrid::simix::unmarshal<smx_mutex_t>(simcall.args[1]));
       break;
 
     case SIMCALL_COND_WAIT_TIMEOUT:
-      simcall_HANDLER_cond_wait_timeout(&simcall, simgrid::simix::unmarshal<smx_cond_t>(simcall.args[0]),
-                                        simgrid::simix::unmarshal<smx_mutex_t>(simcall.args[1]),
-                                        simgrid::simix::unmarshal<double>(simcall.args[2]));
+      simcall_HANDLER_cond_wait_timeout(&simcall, simgrid::simix::unmarshal<smx_cond_t>(simcall.args[0]), simgrid::simix::unmarshal<smx_mutex_t>(simcall.args[1]), simgrid::simix::unmarshal<double>(simcall.args[2]));
       break;
 
     case SIMCALL_SEM_ACQUIRE:
@@ -202,8 +149,7 @@ void simgrid::kernel::actor::ActorImpl::simcall_handle(int value)
       break;
 
     case SIMCALL_SEM_ACQUIRE_TIMEOUT:
-      simcall_HANDLER_sem_acquire_timeout(&simcall, simgrid::simix::unmarshal<smx_sem_t>(simcall.args[0]),
-                                          simgrid::simix::unmarshal<double>(simcall.args[1]));
+      simcall_HANDLER_sem_acquire_timeout(&simcall, simgrid::simix::unmarshal<smx_sem_t>(simcall.args[0]), simgrid::simix::unmarshal<double>(simcall.args[1]));
       break;
 
     case SIMCALL_IO_WAIT:
@@ -211,15 +157,13 @@ void simgrid::kernel::actor::ActorImpl::simcall_handle(int value)
       break;
 
     case SIMCALL_MC_RANDOM:
-      simgrid::simix::marshal<int>(simcall.result,
-                                   simcall_HANDLER_mc_random(&simcall, simgrid::simix::unmarshal<int>(simcall.args[0]),
-                                                             simgrid::simix::unmarshal<int>(simcall.args[1])));
-      SIMIX_simcall_answer(&simcall);
+      simgrid::simix::marshal<int>(simcall.result, simcall_HANDLER_mc_random(&simcall, simgrid::simix::unmarshal<int>(simcall.args[0]), simgrid::simix::unmarshal<int>(simcall.args[1])));
+      simcall_answer();
       break;
 
     case SIMCALL_RUN_KERNEL:
       SIMIX_run_kernel(simgrid::simix::unmarshal<std::function<void()> const*>(simcall.args[0]));
-      SIMIX_simcall_answer(&simcall);
+      simcall_answer();
       break;
 
     case SIMCALL_RUN_BLOCKING:
@@ -229,7 +173,8 @@ void simgrid::kernel::actor::ActorImpl::simcall_handle(int value)
     case NUM_SIMCALLS:
       break;
     case SIMCALL_NONE:
-      throw std::invalid_argument(simgrid::xbt::string_printf("Asked to do the noop syscall on %s@%s", get_cname(),
+      throw std::invalid_argument(simgrid::xbt::string_printf("Asked to do the noop syscall on %s@%s",
+                                                              get_cname(),
                                                               sg_host_get_name(get_host())));
     default:
       THROW_IMPOSSIBLE;