X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5faf49cdf3f8ad8751317b857a6d3134fe07eda3..0c43de62fbe4bfc243d6512296e09207e80bcd54:/src/simix/smx_synchro.c diff --git a/src/simix/smx_synchro.c b/src/simix/smx_synchro.c index 27b372600c..eebc903509 100644 --- a/src/simix/smx_synchro.c +++ b/src/simix/smx_synchro.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2007-2013. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -23,6 +23,7 @@ static void _SIMIX_sem_wait(smx_sem_t sem, double timeout, smx_process_t issuer, static smx_action_t SIMIX_synchro_wait(smx_host_t smx_host, double timeout) { XBT_IN("(%p, %f)",smx_host,timeout); + smx_action_t action; action = xbt_mallocator_get(simix_global->action_mallocator); action->type = SIMIX_ACTION_SYNCHRO; @@ -70,6 +71,7 @@ void SIMIX_synchro_destroy(smx_action_t action) { XBT_IN("(%p)",action); XBT_DEBUG("Destroying synchro %p", action); + xbt_assert(action->type == SIMIX_ACTION_SYNCHRO); surf_action_unref(action->synchro.sleep); xbt_free(action->name); xbt_mallocator_release(simix_global->action_mallocator, action); @@ -79,6 +81,7 @@ void SIMIX_synchro_destroy(smx_action_t action) void SIMIX_post_synchro(smx_action_t action) { XBT_IN("(%p)",action); + xbt_assert(action->type == SIMIX_ACTION_SYNCHRO); if (surf_action_get_state(action->synchro.sleep) == SURF_ACTION_FAILED) action->state = SIMIX_FAILED; else if(surf_action_get_state(action->synchro.sleep) == SURF_ACTION_DONE) @@ -466,7 +469,7 @@ void SIMIX_sem_release(smx_sem_t sem) } /** @brief Returns true if acquiring this semaphore would block */ -XBT_INLINE int SIMIX_sem_would_block(smx_sem_t sem) +int SIMIX_sem_would_block(smx_sem_t sem) { XBT_IN("(%p)",sem); XBT_OUT();