A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
give s_val PJ_value as a constructor
[simgrid.git]
/
src
/
simix
/
smx_synchro.cpp
diff --git
a/src/simix/smx_synchro.cpp
b/src/simix/smx_synchro.cpp
index
b2867f4
..
6f53958
100644
(file)
--- a/
src/simix/smx_synchro.cpp
+++ b/
src/simix/smx_synchro.cpp
@@
-27,9
+27,10
@@
static smx_activity_t SIMIX_synchro_wait(sg_host_t smx_host, double timeout)
{
XBT_IN("(%p, %f)",smx_host,timeout);
- simgrid::kernel::activity::Raw *sync = new simgrid::kernel::activity::Raw();
+ simgrid::kernel::activity::RawImplPtr sync =
+ simgrid::kernel::activity::RawImplPtr(new simgrid::kernel::activity::RawImpl());
sync->sleep = smx_host->pimpl_cpu->sleep(timeout);
- sync->sleep->setData(sync);
+ sync->sleep->setData(
&*
sync);
XBT_OUT();
return sync;
}
@@
-67,7
+68,7
@@
void SIMIX_synchro_stop_waiting(smx_actor_t process, smx_simcall_t simcall)
void SIMIX_synchro_finish(smx_activity_t synchro)
{
- XBT_IN("(%p)",
synchro
);
+ XBT_IN("(%p)",
synchro.get()
);
smx_simcall_t simcall = synchro->simcalls.front();
synchro->simcalls.pop_front();
@@
-89,7
+90,6
@@
void SIMIX_synchro_finish(smx_activity_t synchro)
SIMIX_synchro_stop_waiting(simcall->issuer, simcall);
simcall->issuer->waiting_synchro = nullptr;
- delete synchro;
SIMIX_simcall_answer(simcall);
XBT_OUT();
}
@@
-98,7
+98,7
@@
void SIMIX_synchro_finish(smx_activity_t synchro)
namespace simgrid {
namespace simix {
-Mutex
::Mutex
() : mutex_(this)
+Mutex
Impl::MutexImpl
() : mutex_(this)
{
XBT_IN("(%p)", this);
// Useful to initialize sleeping swag:
@@
-107,14
+107,14
@@
Mutex::Mutex() : mutex_(this)
XBT_OUT();
}
-Mutex
::~Mutex
()
+Mutex
Impl::~MutexImpl
()
{
XBT_IN("(%p)", this);
xbt_swag_free(this->sleeping);
XBT_OUT();
}
-void Mutex::lock(smx_actor_t issuer)
+void Mutex
Impl
::lock(smx_actor_t issuer)
{
XBT_IN("(%p; %p)", this, issuer);
/* FIXME: check where to validate the arguments */
@@
-141,7
+141,7
@@
void Mutex::lock(smx_actor_t issuer)
* \param issuer the process that tries to acquire the mutex
* \return whether we managed to lock the mutex
*/
-bool Mutex::try_lock(smx_actor_t issuer)
+bool Mutex
Impl
::try_lock(smx_actor_t issuer)
{
XBT_IN("(%p, %p)", this, issuer);
if (this->locked) {
@@
-157,25
+157,24
@@
bool Mutex::try_lock(smx_actor_t issuer)
/** Unlock a mutex for a process
*
- * Unlocks the mutex and gives it to a process waiting for it.
+ * Unlocks the mutex and gives it to a process waiting for it.
* If the unlocker is not the owner of the mutex nothing happens.
* If there are no process waiting, it sets the mutex as free.
*/
-void Mutex::unlock(smx_actor_t issuer)
+void Mutex
Impl
::unlock(smx_actor_t issuer)
{
XBT_IN("(%p, %p)", this, issuer);
- if
(!
this->locked)
+ if
(not
this->locked)
THROWF(mismatch_error, 0, "Cannot release that mutex: it was not locked.");
/* 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.",
-
this->owner->name.c_str(),
this->owner->pid);
+
this->owner->cname(),
this->owner->pid);
if (xbt_swag_size(this->sleeping) > 0) {
/*process to wake up */
smx_actor_t p = (smx_actor_t) xbt_swag_extract(this->sleeping);
- delete p->waiting_synchro;
p->waiting_synchro = nullptr;
this->owner = p;
SIMIX_simcall_answer(&p->simcall);
@@
-207,7
+206,7
@@
void SIMIX_mutex_unref(smx_mutex_t mutex)
smx_mutex_t simcall_HANDLER_mutex_init(smx_simcall_t simcall)
{
- return new simgrid::simix::Mutex();
+ return new simgrid::simix::Mutex
Impl
();
}
// Simcall handlers:
@@
-293,14
+292,14
@@
static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout,
synchro = SIMIX_synchro_wait(issuer->host, timeout);
synchro->simcalls.push_front(simcall);
issuer->waiting_synchro = synchro;
- xbt_swag_insert(simcall->issuer, cond->sleeping);
+ xbt_swag_insert(simcall->issuer, cond->sleeping);
XBT_OUT();
}
/**
* \brief Signalizes a condition.
*
- * Signalizes a condition and wakes up a sleeping process.
+ * Signalizes a condition and wakes up a sleeping process.
* If there are no process sleeping, no action is done.
* \param cond A condition
*/
@@
-313,12
+312,11
@@
void SIMIX_cond_signal(smx_cond_t cond)
XBT_DEBUG("Signal condition %p", cond);
- /* If there are processes waiting for the condition choose one and try
+ /* If there are processes waiting for the condition choose one and try
to make it acquire the mutex */
if ((proc = (smx_actor_t) xbt_swag_extract(cond->sleeping))) {
/* Destroy waiter's synchronization */
- delete proc->waiting_synchro;
proc->waiting_synchro = nullptr;
/* Now transform the cond wait simcall into a mutex lock one */
@@
-375,7
+373,6
@@
void intrusive_ptr_add_ref(s_smx_cond_t *cond)
{
auto previous = (cond->refcount_)++;
xbt_assert(previous != 0);
- (void) previous;
}
void intrusive_ptr_release(s_smx_cond_t *cond)
@@
-390,7
+387,6
@@
void intrusive_ptr_release(s_smx_cond_t *cond)
}
/******************************** Semaphores **********************************/
-#define SMX_SEM_NOLIMIT 99999
/** @brief Initialize a semaphore */
smx_sem_t SIMIX_sem_init(unsigned int value)
{
@@
-433,10
+429,9
@@
void SIMIX_sem_release(smx_sem_t sem)
XBT_DEBUG("Sem release semaphore %p", sem);
if ((proc = (smx_actor_t) xbt_swag_extract(sem->sleeping))) {
- delete proc->waiting_synchro;
proc->waiting_synchro = nullptr;
SIMIX_simcall_answer(&proc->simcall);
- } else
if (sem->value < SMX_SEM_NOLIMIT)
{
+ } else {
sem->value++;
}
XBT_OUT();
@@
-498,7
+493,7
@@
void simcall_HANDLER_sem_acquire(smx_simcall_t simcall, smx_sem_t sem)
void simcall_HANDLER_sem_acquire_timeout(smx_simcall_t simcall, smx_sem_t sem, double timeout)
{
XBT_IN("(%p)",simcall);
- _SIMIX_sem_wait(sem, timeout, simcall->issuer, simcall);
+ _SIMIX_sem_wait(sem, timeout, simcall->issuer, simcall);
XBT_OUT();
}
int simcall_HANDLER_sem_would_block(smx_simcall_t simcall, smx_sem_t sem) {