-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "smx_private.hpp"
#include "src/kernel/activity/ConditionVariableImpl.hpp"
#include "src/kernel/activity/MutexImpl.hpp"
#include "src/kernel/activity/SynchroRaw.hpp"
+#include "src/kernel/context/Context.hpp"
#include "src/simix/smx_synchro_private.hpp"
#include "src/surf/cpu_interface.hpp"
-#include <xbt/ex.hpp>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_synchro, simix, "SIMIX Synchronization (mutex, semaphores and conditions)");
simgrid::kernel::activity::RawImplPtr sync =
simgrid::kernel::activity::RawImplPtr(new simgrid::kernel::activity::RawImpl());
- sync->sleep = smx_host->pimpl_cpu->sleep(timeout);
- sync->sleep->set_data(sync.get());
+ sync->surf_action_ = smx_host->pimpl_cpu->sleep(timeout);
+ sync->surf_action_->set_data(sync.get());
XBT_OUT();
return sync;
}
void SIMIX_synchro_finish(smx_activity_t synchro)
{
XBT_IN("(%p)", synchro.get());
- smx_simcall_t simcall = synchro->simcalls.front();
- synchro->simcalls.pop_front();
+ smx_simcall_t simcall = synchro->simcalls_.front();
+ synchro->simcalls_.pop_front();
- if (synchro->state != SIMIX_SRC_TIMEOUT) {
- if (synchro->state == SIMIX_FAILED)
- simcall->issuer->context->iwannadie = 1;
+ if (synchro->state_ != SIMIX_SRC_TIMEOUT) {
+ if (synchro->state_ == SIMIX_FAILED)
+ simcall->issuer->context_->iwannadie = true;
else
THROW_IMPOSSIBLE;
}
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.
XBT_DEBUG("Wait semaphore %p (timeout:%f)", sem, timeout);
if (sem->value <= 0) {
- synchro = SIMIX_synchro_wait(issuer->host, timeout);
- synchro->simcalls.push_front(simcall);
+ synchro = SIMIX_synchro_wait(issuer->host_, timeout);
+ synchro->simcalls_.push_front(simcall);
issuer->waiting_synchro = synchro;
sem->sleeping.push_back(*issuer);
} else {
}
/**
- * \brief Handles a sem acquire simcall without timeout.
+ * @brief Handles a sem acquire simcall without timeout.
*/
void simcall_HANDLER_sem_acquire(smx_simcall_t simcall, smx_sem_t sem)
{
}
/**
- * \brief Handles a sem acquire simcall with timeout.
+ * @brief Handles a sem acquire simcall with timeout.
*/
void simcall_HANDLER_sem_acquire_timeout(smx_simcall_t simcall, smx_sem_t sem, double timeout)
{