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
please sonar
[simgrid.git]
/
src
/
simix
/
smx_synchro.cpp
diff --git
a/src/simix/smx_synchro.cpp
b/src/simix/smx_synchro.cpp
index
bdda602
..
6f53958
100644
(file)
--- a/
src/simix/smx_synchro.cpp
+++ b/
src/simix/smx_synchro.cpp
@@
-5,36
+5,37
@@
/* 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. */
/* 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 "src/surf/surf_interface.hpp"
#include "smx_private.h"
#include "smx_private.h"
+#include "src/surf/cpu_interface.hpp"
+#include "src/surf/surf_interface.hpp"
#include <xbt/ex.hpp>
#include <xbt/log.h>
#include "src/kernel/activity/SynchroRaw.hpp"
#include <xbt/ex.hpp>
#include <xbt/log.h>
#include "src/kernel/activity/SynchroRaw.hpp"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_synchro, simix,
- "SIMIX Synchronization (mutex, semaphores and conditions)");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_synchro, simix, "SIMIX Synchronization (mutex, semaphores and conditions)");
-static smx_
synchro
_t SIMIX_synchro_wait(sg_host_t smx_host, double timeout);
+static smx_
activity
_t SIMIX_synchro_wait(sg_host_t smx_host, double timeout);
static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout,
static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout,
- smx_
process
_t issuer, smx_simcall_t simcall);
-static void _SIMIX_sem_wait(smx_sem_t sem, double timeout, smx_
process
_t issuer,
+ smx_
actor
_t issuer, smx_simcall_t simcall);
+static void _SIMIX_sem_wait(smx_sem_t sem, double timeout, smx_
actor
_t issuer,
smx_simcall_t simcall);
/***************************** Raw synchronization *********************************/
smx_simcall_t simcall);
/***************************** Raw synchronization *********************************/
-static smx_
synchro
_t SIMIX_synchro_wait(sg_host_t smx_host, double timeout)
+static smx_
activity
_t SIMIX_synchro_wait(sg_host_t smx_host, double timeout)
{
XBT_IN("(%p, %f)",smx_host,timeout);
{
XBT_IN("(%p, %f)",smx_host,timeout);
- simgrid::simix::Raw *sync = new simgrid::simix::Raw();
- sync->sleep = surf_host_sleep(smx_host, timeout);
- sync->sleep->setData(sync);
+ 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);
XBT_OUT();
return sync;
}
XBT_OUT();
return sync;
}
-void SIMIX_synchro_stop_waiting(smx_
process
_t process, smx_simcall_t simcall)
+void SIMIX_synchro_stop_waiting(smx_
actor
_t process, smx_simcall_t simcall)
{
XBT_IN("(%p, %p)",process,simcall);
switch (simcall->call) {
{
XBT_IN("(%p, %p)",process,simcall);
switch (simcall->call) {
@@
-65,9
+66,9
@@
void SIMIX_synchro_stop_waiting(smx_process_t process, smx_simcall_t simcall)
XBT_OUT();
}
XBT_OUT();
}
-void SIMIX_synchro_finish(smx_
synchro
_t synchro)
+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();
smx_simcall_t simcall = synchro->simcalls.front();
synchro->simcalls.pop_front();
@@
-89,7
+90,6
@@
void SIMIX_synchro_finish(smx_synchro_t synchro)
SIMIX_synchro_stop_waiting(simcall->issuer, simcall);
simcall->issuer->waiting_synchro = nullptr;
SIMIX_synchro_stop_waiting(simcall->issuer, simcall);
simcall->issuer->waiting_synchro = nullptr;
- delete synchro;
SIMIX_simcall_answer(simcall);
XBT_OUT();
}
SIMIX_simcall_answer(simcall);
XBT_OUT();
}
@@
-98,27
+98,27
@@
void SIMIX_synchro_finish(smx_synchro_t synchro)
namespace simgrid {
namespace simix {
namespace simgrid {
namespace simix {
-Mutex
::Mutex
() : mutex_(this)
+Mutex
Impl::MutexImpl
() : mutex_(this)
{
XBT_IN("(%p)", this);
// Useful to initialize sleeping swag:
{
XBT_IN("(%p)", this);
// Useful to initialize sleeping swag:
- simgrid::simix::
Process
p;
+ simgrid::simix::
ActorImpl
p;
this->sleeping = xbt_swag_new(xbt_swag_offset(p, synchro_hookup));
XBT_OUT();
}
this->sleeping = xbt_swag_new(xbt_swag_offset(p, synchro_hookup));
XBT_OUT();
}
-Mutex
::~Mutex
()
+Mutex
Impl::~MutexImpl
()
{
XBT_IN("(%p)", this);
xbt_swag_free(this->sleeping);
XBT_OUT();
}
{
XBT_IN("(%p)", this);
xbt_swag_free(this->sleeping);
XBT_OUT();
}
-void Mutex
::lock(smx_process
_t issuer)
+void Mutex
Impl::lock(smx_actor
_t issuer)
{
XBT_IN("(%p; %p)", this, issuer);
/* FIXME: check where to validate the arguments */
{
XBT_IN("(%p; %p)", this, issuer);
/* FIXME: check where to validate the arguments */
- smx_
synchro
_t synchro = nullptr;
+ smx_
activity
_t synchro = nullptr;
if (this->locked) {
/* FIXME: check if the host is active ? */
if (this->locked) {
/* FIXME: check if the host is active ? */
@@
-141,7
+141,7
@@
void Mutex::lock(smx_process_t issuer)
* \param issuer the process that tries to acquire the mutex
* \return whether we managed to lock the mutex
*/
* \param issuer the process that tries to acquire the mutex
* \return whether we managed to lock the mutex
*/
-bool Mutex
::try_lock(smx_process
_t issuer)
+bool Mutex
Impl::try_lock(smx_actor
_t issuer)
{
XBT_IN("(%p, %p)", this, issuer);
if (this->locked) {
{
XBT_IN("(%p, %p)", this, issuer);
if (this->locked) {
@@
-157,23
+157,24
@@
bool Mutex::try_lock(smx_process_t issuer)
/** Unlock a mutex for a process
*
/** 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.
*/
* 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_process
_t issuer)
+void Mutex
Impl::unlock(smx_actor
_t issuer)
{
XBT_IN("(%p, %p)", this, issuer);
{
XBT_IN("(%p, %p)", this, issuer);
+ 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)
/* 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:%d), not by you.",
-
SIMIX_process_get_name(this->owner),SIMIX_process_get_PID(this->owner)
);
+ THROWF(mismatch_error, 0, "Cannot release that mutex: it was locked by %s (pid:%
l
d), not by you.",
+
this->owner->cname(), this->owner->pid
);
if (xbt_swag_size(this->sleeping) > 0) {
/*process to wake up */
if (xbt_swag_size(this->sleeping) > 0) {
/*process to wake up */
- smx_process_t p = (smx_process_t) xbt_swag_extract(this->sleeping);
- delete p->waiting_synchro;
+ smx_actor_t p = (smx_actor_t) xbt_swag_extract(this->sleeping);
p->waiting_synchro = nullptr;
this->owner = p;
SIMIX_simcall_answer(&p->simcall);
p->waiting_synchro = nullptr;
this->owner = p;
SIMIX_simcall_answer(&p->simcall);
@@
-205,7
+206,7
@@
void SIMIX_mutex_unref(smx_mutex_t mutex)
smx_mutex_t simcall_HANDLER_mutex_init(smx_simcall_t simcall)
{
smx_mutex_t simcall_HANDLER_mutex_init(smx_simcall_t simcall)
{
- return new simgrid::simix::Mutex();
+ return new simgrid::simix::Mutex
Impl
();
}
// Simcall handlers:
}
// Simcall handlers:
@@
-234,10
+235,10
@@
void simcall_HANDLER_mutex_unlock(smx_simcall_t simcall, smx_mutex_t mutex)
* It have to be called before the use of the condition.
* \return A condition
*/
* It have to be called before the use of the condition.
* \return A condition
*/
-smx_cond_t SIMIX_cond_init(
void
)
+smx_cond_t SIMIX_cond_init()
{
XBT_IN("()");
{
XBT_IN("()");
- simgrid::simix::
Process
p;
+ simgrid::simix::
ActorImpl
p;
smx_cond_t cond = new s_smx_cond();
cond->sleeping = xbt_swag_new(xbt_swag_offset(p, synchro_hookup));
cond->refcount_ = 1;
smx_cond_t cond = new s_smx_cond();
cond->sleeping = xbt_swag_new(xbt_swag_offset(p, synchro_hookup));
cond->refcount_ = 1;
@@
-252,7
+253,7
@@
smx_cond_t SIMIX_cond_init(void)
void simcall_HANDLER_cond_wait(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mutex)
{
XBT_IN("(%p)",simcall);
void simcall_HANDLER_cond_wait(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mutex)
{
XBT_IN("(%p)",simcall);
- smx_
process
_t issuer = simcall->issuer;
+ smx_
actor
_t issuer = simcall->issuer;
_SIMIX_cond_wait(cond, mutex, -1, issuer, simcall);
XBT_OUT();
_SIMIX_cond_wait(cond, mutex, -1, issuer, simcall);
XBT_OUT();
@@
-266,7
+267,7
@@
void simcall_HANDLER_cond_wait_timeout(smx_simcall_t simcall, smx_cond_t cond,
smx_mutex_t mutex, double timeout)
{
XBT_IN("(%p)",simcall);
smx_mutex_t mutex, double timeout)
{
XBT_IN("(%p)",simcall);
- smx_
process
_t issuer = simcall->issuer;
+ smx_
actor
_t issuer = simcall->issuer;
_SIMIX_cond_wait(cond, mutex, timeout, issuer, simcall);
XBT_OUT();
_SIMIX_cond_wait(cond, mutex, timeout, issuer, simcall);
XBT_OUT();
@@
-274,10
+275,10
@@
void simcall_HANDLER_cond_wait_timeout(smx_simcall_t simcall, smx_cond_t cond,
static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout,
static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout,
- smx_
process
_t issuer, smx_simcall_t simcall)
+ smx_
actor
_t issuer, smx_simcall_t simcall)
{
XBT_IN("(%p, %p, %f, %p,%p)",cond,mutex,timeout,issuer,simcall);
{
XBT_IN("(%p, %p, %f, %p,%p)",cond,mutex,timeout,issuer,simcall);
- smx_
synchro
_t synchro = nullptr;
+ smx_
activity
_t synchro = nullptr;
XBT_DEBUG("Wait condition %p", cond);
XBT_DEBUG("Wait condition %p", cond);
@@
-291,32
+292,31
@@
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;
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.
*
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
*/
void SIMIX_cond_signal(smx_cond_t cond)
{
XBT_IN("(%p)",cond);
* If there are no process sleeping, no action is done.
* \param cond A condition
*/
void SIMIX_cond_signal(smx_cond_t cond)
{
XBT_IN("(%p)",cond);
- smx_
process
_t proc = nullptr;
+ smx_
actor
_t proc = nullptr;
smx_mutex_t mutex = nullptr;
smx_simcall_t simcall = nullptr;
XBT_DEBUG("Signal condition %p", cond);
smx_mutex_t mutex = nullptr;
smx_simcall_t simcall = nullptr;
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 */
to make it acquire the mutex */
- if ((proc = (smx_
process
_t) xbt_swag_extract(cond->sleeping))) {
+ if ((proc = (smx_
actor
_t) xbt_swag_extract(cond->sleeping))) {
/* Destroy waiter's synchronization */
/* Destroy waiter's synchronization */
- delete proc->waiting_synchro;
proc->waiting_synchro = nullptr;
/* Now transform the cond wait simcall into a mutex lock one */
proc->waiting_synchro = nullptr;
/* Now transform the cond wait simcall into a mutex lock one */
@@
-373,7
+373,6
@@
void intrusive_ptr_add_ref(s_smx_cond_t *cond)
{
auto previous = (cond->refcount_)++;
xbt_assert(previous != 0);
{
auto previous = (cond->refcount_)++;
xbt_assert(previous != 0);
- (void) previous;
}
void intrusive_ptr_release(s_smx_cond_t *cond)
}
void intrusive_ptr_release(s_smx_cond_t *cond)
@@
-388,12
+387,11
@@
void intrusive_ptr_release(s_smx_cond_t *cond)
}
/******************************** Semaphores **********************************/
}
/******************************** Semaphores **********************************/
-#define SMX_SEM_NOLIMIT 99999
/** @brief Initialize a semaphore */
smx_sem_t SIMIX_sem_init(unsigned int value)
{
XBT_IN("(%u)",value);
/** @brief Initialize a semaphore */
smx_sem_t SIMIX_sem_init(unsigned int value)
{
XBT_IN("(%u)",value);
- simgrid::simix::
Process
p;
+ simgrid::simix::
ActorImpl
p;
smx_sem_t sem = xbt_new0(s_smx_sem_t, 1);
sem->sleeping = xbt_swag_new(xbt_swag_offset(p, synchro_hookup));
smx_sem_t sem = xbt_new0(s_smx_sem_t, 1);
sem->sleeping = xbt_swag_new(xbt_swag_offset(p, synchro_hookup));
@@
-427,14
+425,13
@@
void simcall_HANDLER_sem_release(smx_simcall_t simcall, smx_sem_t sem){
void SIMIX_sem_release(smx_sem_t sem)
{
XBT_IN("(%p)",sem);
void SIMIX_sem_release(smx_sem_t sem)
{
XBT_IN("(%p)",sem);
- smx_
process
_t proc;
+ smx_
actor
_t proc;
XBT_DEBUG("Sem release semaphore %p", sem);
XBT_DEBUG("Sem release semaphore %p", sem);
- if ((proc = (smx_process_t) xbt_swag_extract(sem->sleeping))) {
- delete proc->waiting_synchro;
+ if ((proc = (smx_actor_t) xbt_swag_extract(sem->sleeping))) {
proc->waiting_synchro = nullptr;
SIMIX_simcall_answer(&proc->simcall);
proc->waiting_synchro = nullptr;
SIMIX_simcall_answer(&proc->simcall);
- } else
if (sem->value < SMX_SEM_NOLIMIT)
{
+ } else {
sem->value++;
}
XBT_OUT();
sem->value++;
}
XBT_OUT();
@@
-459,11
+456,11
@@
int SIMIX_sem_get_capacity(smx_sem_t sem)
return sem->value;
}
return sem->value;
}
-static void _SIMIX_sem_wait(smx_sem_t sem, double timeout, smx_
process
_t issuer,
+static void _SIMIX_sem_wait(smx_sem_t sem, double timeout, smx_
actor
_t issuer,
smx_simcall_t simcall)
{
XBT_IN("(%p, %f, %p, %p)",sem,timeout,issuer,simcall);
smx_simcall_t simcall)
{
XBT_IN("(%p, %f, %p, %p)",sem,timeout,issuer,simcall);
- smx_
synchro
_t synchro = nullptr;
+ smx_
activity
_t synchro = nullptr;
XBT_DEBUG("Wait semaphore %p (timeout:%f)", sem, timeout);
if (sem->value <= 0) {
XBT_DEBUG("Wait semaphore %p (timeout:%f)", sem, timeout);
if (sem->value <= 0) {
@@
-496,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);
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) {
XBT_OUT();
}
int simcall_HANDLER_sem_would_block(smx_simcall_t simcall, smx_sem_t sem) {