X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dccf1b41e9c7b5a696f01abceaa2779fe65f154f..8250fdfeb9c8dd3ae2a1d19f3c89871c9599d0f8:/src/simix/libsmx.cpp diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index 7ccc835004..bbc509cc4f 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -35,31 +35,17 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix); #include "popping_bodies.cpp" -void simcall_call(smx_actor_t process) +void simcall_call(smx_actor_t actor) { - if (process != simix_global->maestro_process) { - XBT_DEBUG("Yield process '%s' on simcall %s (%d)", process->name.c_str(), - SIMIX_simcall_name(process->simcall.call), (int)process->simcall.call); - SIMIX_process_yield(process); + if (actor != simix_global->maestro_process) { + XBT_DEBUG("Yield actor '%s' on simcall %s (%d)", actor->cname(), SIMIX_simcall_name(actor->simcall.call), + (int)actor->simcall.call); + SIMIX_process_yield(actor); } else { - SIMIX_simcall_handle(&process->simcall, 0); + SIMIX_simcall_handle(&actor->simcall, 0); } } -// ***** AS simcalls - -/** - * \ingroup simix_host_management - * \brief Returns a dict of the properties assigned to a router or AS. - * - * \param name The name of the router or AS - * \return The properties - */ -xbt_dict_t simcall_asr_get_properties(const char *name) -{ - return simcall_BODY_asr_get_properties(name); -} - /** * \ingroup simix_process_management * \brief Creates a synchro that executes some computation of an host. @@ -175,50 +161,6 @@ e_smx_state_t simcall_execution_wait(smx_activity_t execution) return (e_smx_state_t) simcall_BODY_execution_wait(execution); } -/** - * \ingroup simix_vm_management - * \brief Suspend the given VM - * - * \param vm VM - */ -void simcall_vm_suspend(sg_host_t vm) -{ - simcall_BODY_vm_suspend(vm); -} - -/** - * \ingroup simix_vm_management - * \brief Resume the given VM - * - * \param vm VM - */ -void simcall_vm_resume(sg_host_t vm) -{ - simcall_BODY_vm_resume(vm); -} - -/** - * \ingroup simix_vm_management - * \brief Save the given VM - * - * \param vm VM - */ -void simcall_vm_save(sg_host_t vm) -{ - simcall_BODY_vm_save(vm); -} - -/** - * \ingroup simix_vm_management - * \brief Shutdown the given VM - * - * \param vm VM - */ -void simcall_vm_shutdown(sg_host_t vm) -{ - simcall_BODY_vm_shutdown(vm); -} - /** * \ingroup simix_process_management * \brief Kills a SIMIX process. @@ -425,22 +367,6 @@ e_smx_state_t simcall_process_sleep(double duration) return (e_smx_state_t) simcall_BODY_process_sleep(duration); } -/** - * \ingroup simix_mbox_management - * \brief Creates a new rendez-vous point - * \param name The name of the rendez-vous point - * \return The created rendez-vous point - */ -smx_mailbox_t simcall_mbox_create(const char *name) -{ - return simcall_BODY_mbox_create(name); -} - -void simcall_mbox_set_receiver(smx_mailbox_t mbox, smx_actor_t process) -{ - simcall_BODY_mbox_set_receiver(mbox, process); -} - /** * \ingroup simix_comm_management */ @@ -584,7 +510,7 @@ void simcall_comm_wait(smx_activity_t comm, double timeout) * \brief Set the category of an synchro. * * This functions changes the category only. It calls a surf function. - * \param execution The execution synchro + * \param synchro The execution synchro * \param category The tracing category */ void simcall_set_category(smx_activity_t synchro, const char *category)