From: Martin Quinson Date: Sat, 1 Nov 2014 22:37:46 +0000 (+0100) Subject: kill dead code X-Git-Tag: v3_12~732^2~262 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/2081f6fe2b7e381943affa55acd913efb077b30f?ds=sidebyside kill dead code --- diff --git a/src/simix/smx_smurf.c b/src/simix/smx_smurf.c index 64b588b21b..f18141c0bf 100644 --- a/src/simix/smx_smurf.c +++ b/src/simix/smx_smurf.c @@ -14,30 +14,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_smurf, simix, "Logging specific to SIMIX (SMURF)"); -XBT_INLINE smx_simcall_t SIMIX_simcall_mine() -{ - smx_process_t issuer = SIMIX_process_self(); - return &issuer->simcall; -} - -/** - * \brief Makes the current process do a simcall to the kernel and yields - * until completion. If the current thread is maestro, we don't yield and - * execute the simcall directly. - * \param self the current process - */ -void SIMIX_simcall_push(smx_process_t self) -{ - if (self != simix_global->maestro_process) { - XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name, - SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); - SIMIX_process_yield(self); - } else { - XBT_DEBUG("I'm the maestro, execute the simcall directly"); - SIMIX_simcall_enter(&self->simcall, 0); - } -} - void SIMIX_simcall_answer(smx_simcall_t simcall) { if (simcall->issuer != simix_global->maestro_process){ diff --git a/src/simix/smx_smurf_private.h b/src/simix/smx_smurf_private.h index 68de744531..b8640daa3c 100644 --- a/src/simix/smx_smurf_private.h +++ b/src/simix/smx_smurf_private.h @@ -65,22 +65,13 @@ typedef struct s_smx_simcall { /******************************** General *************************************/ -void SIMIX_simcall_push(smx_process_t self); void SIMIX_simcall_answer(smx_simcall_t); void SIMIX_simcall_enter(smx_simcall_t, int); void SIMIX_simcall_exit(smx_action_t); -smx_simcall_t SIMIX_simcall_mine(void); const char *SIMIX_simcall_name(e_smx_simcall_t kind); //FIXME put it in a better place xbt_dict_t SIMIX_pre_asr_get_properties(smx_simcall_t simcall, const char *name); -/*************************** New simcall interface ****************************/ - -typedef smx_action_t (*simcall_handler_t)(u_smx_scalar_t *); - -extern const char *simcall_types[]; -extern simcall_handler_t simcall_table[]; - SG_END_DECL() #endif