Modernize simcall process_cleanup.

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

diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp
index 15f0a2e..254652c 100644 (file)
--- a/src/simix/libsmx.cpp
+++ b/src/simix/libsmx.cpp
@@ -5,7 +5,7 @@
 /*                                                                            */
 /* This is somehow the "libc" of SimGrid                                      */
 
 /*                                                                            */
 /* This is somehow the "libc" of SimGrid                                      */
 

-/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved.            */
+/* Copyright (c) 2010-2018. 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. */
 
 /* 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. */


@@ -20,6 +20,7 @@
 #include "simgrid/simix/blocking_simcall.hpp"
 #include "smx_private.hpp"
 #include "src/kernel/activity/CommImpl.hpp"
 #include "simgrid/simix/blocking_simcall.hpp"
 #include "smx_private.hpp"
 #include "src/kernel/activity/CommImpl.hpp"

+#include "src/kernel/activity/ConditionVariableImpl.hpp"

 #include "src/kernel/activity/MutexImpl.hpp"
 #include "src/mc/mc_forward.hpp"
 #include "src/mc/mc_replay.hpp"
 #include "src/kernel/activity/MutexImpl.hpp"
 #include "src/mc/mc_forward.hpp"
 #include "src/mc/mc_replay.hpp"


@@ -35,7 +36,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix);
 void simcall_call(smx_actor_t actor)
 {
   if (actor != simix_global->maestro_process) {
 void simcall_call(smx_actor_t actor)
 {
   if (actor != simix_global->maestro_process) {

-    XBT_DEBUG("Yield actor '%s' on simcall %s (%d)", actor->getCname(), SIMIX_simcall_name(actor->simcall.call),
+    XBT_DEBUG("Yield actor '%s' on simcall %s (%d)", actor->get_cname(), SIMIX_simcall_name(actor->simcall.call),

               (int)actor->simcall.call);
     SIMIX_process_yield(actor);
   } else {
               (int)actor->simcall.call);
     SIMIX_process_yield(actor);
   } else {


@@ -54,6 +55,7 @@ void simcall_call(smx_actor_t actor)
  * \param flops_amount amount Computation amount (in flops)
  * \param priority computation priority
  * \param bound
  * \param flops_amount amount Computation amount (in flops)
  * \param priority computation priority
  * \param bound

+ * \param host host where the synchro will be executed

  * \return A new SIMIX execution synchronization
  */
 smx_activity_t simcall_execution_start(const char* name, double flops_amount, double priority, double bound,
  * \return A new SIMIX execution synchronization
  */
 smx_activity_t simcall_execution_start(const char* name, double flops_amount, double priority, double bound,


@@ -77,7 +79,6 @@ smx_activity_t simcall_execution_start(const char* name, double flops_amount, do
  * \param flops_amount Array (of size host_nb) of computation amount of hosts (in bytes)
  * \param bytes_amount Array (of size host_nb * host_nb) representing the communication
  * amount between each pair of hosts
  * \param flops_amount Array (of size host_nb) of computation amount of hosts (in bytes)
  * \param bytes_amount Array (of size host_nb * host_nb) representing the communication
  * amount between each pair of hosts

- * \param amount the SURF action amount

  * \param rate the SURF action rate
  * \param timeout timeout
  * \return A new SIMIX execution synchronization
  * \param rate the SURF action rate
  * \param timeout timeout
  * \return A new SIMIX execution synchronization


@@ -138,7 +139,7 @@ void simcall_execution_set_priority(smx_activity_t execution, double priority)
     simgrid::kernel::activity::ExecImplPtr exec =
         boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(execution);
     if (exec->surfAction_)
     simgrid::kernel::activity::ExecImplPtr exec =
         boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(execution);
     if (exec->surfAction_)

-      exec->surfAction_->setSharingWeight(priority);
+      exec->surfAction_->set_priority(priority);

   });
 }
 
   });
 }
 


@@ -156,7 +157,7 @@ void simcall_execution_set_bound(smx_activity_t execution, double bound)
     simgrid::kernel::activity::ExecImplPtr exec =
         boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(execution);
     if (exec->surfAction_)
     simgrid::kernel::activity::ExecImplPtr exec =
         boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(execution);
     if (exec->surfAction_)

-      exec->surfAction_->setBound(bound);
+      exec->surfAction_->set_bound(bound);

   });
 }
 
   });
 }
 


@@ -185,16 +186,6 @@ void simcall_process_killall()
   simcall_BODY_process_killall();
 }
 
   simcall_BODY_process_killall();
 }
 

-/**
- * \ingroup simix_process_management
- * \brief Cleans up a SIMIX process.
- * \param process poor victim (must have already been killed)
- */
-void simcall_process_cleanup(smx_actor_t process)
-{
-  simcall_BODY_process_cleanup(process);
-}
-

 void simcall_process_join(smx_actor_t process, double timeout)
 {
   simcall_BODY_process_join(process, timeout);
 void simcall_process_join(smx_actor_t process, double timeout)
 {
   simcall_BODY_process_join(process, timeout);


@@ -214,17 +205,6 @@ void simcall_process_suspend(smx_actor_t process)
   simcall_BODY_process_suspend(process);
 }
 
   simcall_BODY_process_suspend(process);
 }
 

-/**
- * \ingroup simix_process_management
- * \brief Returns the amount of SIMIX processes in the system
- *
- * Maestro internal process is not counted, only user code processes are
- */
-int simcall_process_count()
-{
-  return simgrid::simix::kernelImmediate(SIMIX_process_count);
-}
-

 /**
  * \ingroup simix_process_management
  * \brief Set the user data of a #smx_actor_t.
 /**
  * \ingroup simix_process_management
  * \brief Set the user data of a #smx_actor_t.


@@ -247,7 +227,7 @@ void simcall_process_set_kill_time(smx_actor_t process, double kill_time)
 
   if (kill_time <= SIMIX_get_clock() || simix_global->kill_process_function == nullptr)
     return;
 
   if (kill_time <= SIMIX_get_clock() || simix_global->kill_process_function == nullptr)
     return;

-  XBT_DEBUG("Set kill time %f for process %s@%s", kill_time, process->getCname(), process->host->getCname());
+  XBT_DEBUG("Set kill time %f for process %s@%s", kill_time, process->get_cname(), process->host->get_cname());

   process->kill_timer = SIMIX_timer_set(kill_time, [process] {
     simix_global->kill_process_function(process);
     process->kill_timer=nullptr;
   process->kill_timer = SIMIX_timer_set(kill_time, [process] {
     simix_global->kill_process_function(process);
     process->kill_timer=nullptr;


@@ -259,7 +239,7 @@ void simcall_process_set_kill_time(smx_actor_t process, double kill_time)
  * \brief Add an on_exit function
  * Add an on_exit function which will be executed when the process exits/is killed.
  */
  * \brief Add an on_exit function
  * Add an on_exit function which will be executed when the process exits/is killed.
  */

-XBT_PUBLIC(void) simcall_process_on_exit(smx_actor_t process, int_f_pvoid_pvoid_t fun, void *data)
+XBT_PUBLIC void simcall_process_on_exit(smx_actor_t process, int_f_pvoid_pvoid_t fun, void* data)

 {
   simcall_BODY_process_on_exit(process, fun, data);
 }
 {
   simcall_BODY_process_on_exit(process, fun, data);
 }


@@ -489,15 +469,6 @@ smx_cond_t simcall_cond_init()
   return simcall_BODY_cond_init();
 }
 
   return simcall_BODY_cond_init();
 }
 

-/**
- * \ingroup simix_synchro_management
- *
- */
-void simcall_cond_signal(smx_cond_t cond)
-{
-  simcall_BODY_cond_signal(cond);
-}
-

 /**
  * \ingroup simix_synchro_management
  *
 /**
  * \ingroup simix_synchro_management
  *


@@ -517,15 +488,6 @@ void simcall_cond_wait_timeout(smx_cond_t cond, smx_mutex_t mutex, double timeou
   simcall_BODY_cond_wait_timeout(cond, mutex, timeout);
 }
 
   simcall_BODY_cond_wait_timeout(cond, mutex, timeout);
 }
 

-/**
- * \ingroup simix_synchro_management
- *
- */
-void simcall_cond_broadcast(smx_cond_t cond)
-{
-  simcall_BODY_cond_broadcast(cond);
-}
-

 /**
  * \ingroup simix_synchro_management
  *
 /**
  * \ingroup simix_synchro_management
  *