XBT_PUBLIC void simcall_cond_wait(smx_cond_t cond, smx_mutex_t mutex);
XBT_PUBLIC int simcall_cond_wait_timeout(smx_cond_t cond, smx_mutex_t mutex, double max_duration);
-XBT_PUBLIC void SIMIX_sem_destroy(smx_sem_t sem);
XBT_PUBLIC void simcall_sem_acquire(smx_sem_t sem);
XBT_PUBLIC int simcall_sem_acquire_timeout(smx_sem_t sem, double max_duration);
Semaphore::Semaphore(unsigned int initial_capacity)
{
- sem_ = simgrid::simix::simcall([initial_capacity] { return SIMIX_sem_init(initial_capacity); });
+ sem_ = simgrid::simix::simcall([initial_capacity] { return SIMIX_sem_init(initial_capacity); });
}
Semaphore::~Semaphore()
{
- SIMIX_sem_destroy(sem_);
+ if (sem_ != nullptr) {
+ xbt_assert(sem_->sleeping.empty(), "Cannot destroy semaphore since someone is still using it");
+ delete sem_;
+ }
}
SemaphorePtr Semaphore::create(unsigned int initial_capacity)
{
- return SemaphorePtr(new Semaphore(initial_capacity));
+ return SemaphorePtr(new Semaphore(initial_capacity));
}
void Semaphore::acquire()
{
- simcall_sem_acquire(sem_);
+ simcall_sem_acquire(sem_);
}
int Semaphore::acquire_timeout(double timeout)
void Semaphore::release()
{
- simgrid::simix::simcall([this] { SIMIX_sem_release(sem_); });
+ simgrid::simix::simcall([this] { SIMIX_sem_release(sem_); });
}
int Semaphore::get_capacity()
return sem;
}
-/** @brief Destroys a semaphore */
-void SIMIX_sem_destroy(smx_sem_t sem)
-{
- XBT_IN("(%p)",sem);
- XBT_DEBUG("Destroy semaphore %p", sem);
- if (sem != nullptr) {
- xbt_assert(sem->sleeping.empty(), "Cannot destroy semaphore since someone is still using it");
- delete sem;
- }
- XBT_OUT();
-}
-
/** @brief release the semaphore
*
* Unlock a process waiting on the semaphore.