X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0c13871d73e933c1847faf8debea7b7745a3ff44..8802406ce606cc44533b47d4c6f9d3f58a4bdfde:/src/simix/smx_synchro.c diff --git a/src/simix/smx_synchro.c b/src/simix/smx_synchro.c index 1237446d61..c9d14d0a46 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 @@ -28,7 +28,7 @@ static smx_action_t SIMIX_synchro_wait(smx_host_t smx_host, double timeout) action->type = SIMIX_ACTION_SYNCHRO; action->name = xbt_strdup("synchro"); action->synchro.sleep = - surf_workstation_model->extension.workstation.sleep(smx_host->host, timeout); + surf_workstation_model->extension.workstation.sleep(smx_host, timeout); surf_workstation_model->action_data_set(action->synchro.sleep, action); XBT_OUT(); @@ -456,7 +456,6 @@ void SIMIX_sem_release(smx_sem_t sem) XBT_DEBUG("Sem release semaphore %p", sem); if ((proc = xbt_swag_extract(sem->sleeping))) { - proc = xbt_swag_extract(sem->sleeping); SIMIX_synchro_destroy(proc->waiting_action); proc->waiting_action = NULL; SIMIX_simcall_answer(&proc->simcall); @@ -467,7 +466,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();