From 78354c0a4ca064bf347f523b05fd490ede98e151 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sat, 1 Jul 2017 01:39:28 +0200 Subject: [PATCH] try to reduce the amount of casts by using the right type for simcalls --- src/simix/simcalls.in | 4 ++-- src/simix/smx_host.cpp | 17 +++++++++++------ src/simix/smx_host_private.h | 10 +++++----- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/simix/simcalls.in b/src/simix/simcalls.in index fe851a0c26..469e761bbf 100644 --- a/src/simix/simcalls.in +++ b/src/simix/simcalls.in @@ -46,8 +46,8 @@ int process_is_suspended(smx_actor_t process) [[nohandler]]; int process_join(smx_actor_t process, double timeout) [[block]]; int process_sleep(double duration) [[block]]; -boost::intrusive_ptr execution_start(const char* name, double flops_amount, double priority, double bound); -boost::intrusive_ptr 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) [[nohandler]]; +boost::intrusive_ptr execution_start(const char* name, double flops_amount, double priority, double bound); +boost::intrusive_ptr 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) [[nohandler]]; void execution_cancel(boost::intrusive_ptr execution) [[nohandler]]; void execution_set_priority(boost::intrusive_ptr execution, double priority) [[nohandler]]; void execution_set_bound(boost::intrusive_ptr execution, double bound) [[nohandler]]; diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp index 751916292b..2ac7f7d415 100644 --- a/src/simix/smx_host.cpp +++ b/src/simix/smx_host.cpp @@ -152,13 +152,17 @@ void SIMIX_host_autorestart(sg_host_t host) process_list.clear(); } -smx_activity_t simcall_HANDLER_execution_start(smx_simcall_t simcall, const char* name, double flops_amount, - double priority, double bound) { +boost::intrusive_ptr simcall_HANDLER_execution_start(smx_simcall_t simcall, + const char* name, + double flops_amount, + double priority, double bound) +{ return SIMIX_execution_start(simcall->issuer, name,flops_amount,priority,bound); } -smx_activity_t SIMIX_execution_start(smx_actor_t issuer, const char *name, double flops_amount, double priority, - double bound){ +boost::intrusive_ptr +SIMIX_execution_start(smx_actor_t issuer, const char* name, double flops_amount, double priority, double bound) +{ /* alloc structures and initialize */ simgrid::kernel::activity::ExecImplPtr exec = @@ -180,8 +184,9 @@ smx_activity_t SIMIX_execution_start(smx_actor_t issuer, const char *name, doubl return exec; } -smx_activity_t SIMIX_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) +boost::intrusive_ptr +SIMIX_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) { /* alloc structures and initialize */ diff --git a/src/simix/smx_host_private.h b/src/simix/smx_host_private.h index 5a953dd552..a642409d10 100644 --- a/src/simix/smx_host_private.h +++ b/src/simix/smx_host_private.h @@ -58,11 +58,11 @@ XBT_PRIVATE void SIMIX_set_category(smx_activity_t synchro, const char *category SG_END_DECL() -XBT_PRIVATE smx_activity_t SIMIX_execution_start(smx_actor_t issuer, const char* name, double flops_amount, - double priority, double bound); -XBT_PRIVATE smx_activity_t SIMIX_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); +XBT_PRIVATE boost::intrusive_ptr +SIMIX_execution_start(smx_actor_t issuer, const char* name, double flops_amount, double priority, double bound); +XBT_PRIVATE boost::intrusive_ptr +SIMIX_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); #endif -- 2.20.1