X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d5b29830df70e823202e384a7655e4371193ecd7..8adeec4061e3ee9bfee9a55378e883e25b2c6e9a:/src/simix/smx_synchro.cpp diff --git a/src/simix/smx_synchro.cpp b/src/simix/smx_synchro.cpp index 6f5395883f..66f332c15e 100644 --- a/src/simix/smx_synchro.cpp +++ b/src/simix/smx_synchro.cpp @@ -1,5 +1,4 @@ - -/* Copyright (c) 2007-2015. The SimGrid Team. +/* Copyright (c) 2007-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -169,7 +168,7 @@ void MutexImpl::unlock(smx_actor_t issuer) /* If the mutex is not owned by the issuer, that's not good */ if (issuer != this->owner) - THROWF(mismatch_error, 0, "Cannot release that mutex: it was locked by %s (pid:%ld), not by you.", + THROWF(mismatch_error, 0, "Cannot release that mutex: it was locked by %s (pid:%lu), not by you.", this->owner->cname(), this->owner->pid); if (xbt_swag_size(this->sleeping) > 0) { @@ -204,11 +203,6 @@ void SIMIX_mutex_unref(smx_mutex_t mutex) intrusive_ptr_release(mutex); } -smx_mutex_t simcall_HANDLER_mutex_init(smx_simcall_t simcall) -{ - return new simgrid::simix::MutexImpl(); -} - // Simcall handlers: void simcall_HANDLER_mutex_lock(smx_simcall_t simcall, smx_mutex_t mutex) @@ -414,9 +408,6 @@ void SIMIX_sem_destroy(smx_sem_t sem) XBT_OUT(); } -void simcall_HANDLER_sem_release(smx_simcall_t simcall, smx_sem_t sem){ - SIMIX_sem_release(sem); -} /** @brief release the semaphore * * Unlock a process waiting on the semaphore. @@ -445,9 +436,6 @@ int SIMIX_sem_would_block(smx_sem_t sem) return (sem->value <= 0); } -int simcall_HANDLER_sem_get_capacity(smx_simcall_t simcall, smx_sem_t sem){ - return SIMIX_sem_get_capacity(sem); -} /** @brief Returns the current capacity of the semaphore */ int SIMIX_sem_get_capacity(smx_sem_t sem) { @@ -496,6 +484,3 @@ void simcall_HANDLER_sem_acquire_timeout(smx_simcall_t simcall, smx_sem_t sem, d _SIMIX_sem_wait(sem, timeout, simcall->issuer, simcall); XBT_OUT(); } -int simcall_HANDLER_sem_would_block(smx_simcall_t simcall, smx_sem_t sem) { - return SIMIX_sem_would_block(sem); -}