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
Yet another dlopen merge
[simgrid.git]
/
src
/
simix
/
smx_synchro.cpp
diff --git
a/src/simix/smx_synchro.cpp
b/src/simix/smx_synchro.cpp
index
305fc32
..
f2a98c7
100644
(file)
--- a/
src/simix/smx_synchro.cpp
+++ b/
src/simix/smx_synchro.cpp
@@
-5,36
+5,36
@@
/* 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 <xbt/ex.hpp>
#include <xbt/log.h>
-#include "src/
simix
/SynchroRaw.hpp"
+#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);
+ simgrid::
kernel::activity::Raw *sync = new simgrid::kernel::activity
::Raw();
+ sync->sleep
= smx_host->pimpl_cpu->sleep(
timeout);
sync->sleep->setData(sync);
XBT_OUT();
return sync;
}
sync->sleep->setData(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,7
+65,7
@@
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);
smx_simcall_t simcall = synchro->simcalls.front();
{
XBT_IN("(%p)",synchro);
smx_simcall_t simcall = synchro->simcalls.front();
@@
-98,11
+98,11
@@
void SIMIX_synchro_finish(smx_synchro_t synchro)
namespace simgrid {
namespace simix {
namespace simgrid {
namespace simix {
-Mutex::Mutex()
+Mutex::Mutex()
: 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();
}
@@
-114,11
+114,11
@@
Mutex::~Mutex()
XBT_OUT();
}
XBT_OUT();
}
-void Mutex::lock(smx_
process
_t issuer)
+void Mutex::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::try_lock(smx_
actor
_t issuer)
{
XBT_IN("(%p, %p)", this, issuer);
if (this->locked) {
{
XBT_IN("(%p, %p)", this, issuer);
if (this->locked) {
@@
-161,18
+161,20
@@
bool Mutex::try_lock(smx_process_t issuer)
* 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::unlock(smx_
actor
_t issuer)
{
XBT_IN("(%p, %p)", this, issuer);
{
XBT_IN("(%p, %p)", this, issuer);
+ if(!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->name.c_str(),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);
+ smx_
actor_t p = (smx_actor
_t) xbt_swag_extract(this->sleeping);
delete p->waiting_synchro;
p->waiting_synchro = nullptr;
this->owner = p;
delete p->waiting_synchro;
p->waiting_synchro = nullptr;
this->owner = p;
@@
-234,13
+236,12
@@
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;
- smx_cond_t cond =
xbt_new0(s_smx_cond_t, 1
);
+ simgrid::simix::
ActorImpl
p;
+ smx_cond_t cond =
new s_smx_cond(
);
cond->sleeping = xbt_swag_new(xbt_swag_offset(p, synchro_hookup));
cond->sleeping = xbt_swag_new(xbt_swag_offset(p, synchro_hookup));
- cond->mutex = nullptr;
cond->refcount_ = 1;
XBT_OUT();
return cond;
cond->refcount_ = 1;
XBT_OUT();
return cond;
@@
-253,7
+254,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();
@@
-267,7
+268,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();
@@
-275,10
+276,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);
@@
-306,7
+307,7
@@
static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout,
void SIMIX_cond_signal(smx_cond_t cond)
{
XBT_IN("(%p)",cond);
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;
smx_mutex_t mutex = nullptr;
smx_simcall_t simcall = nullptr;
@@
-314,7
+315,7
@@
void SIMIX_cond_signal(smx_cond_t cond)
/* If there are processes waiting for the condition choose one and try
to make it acquire the mutex */
/* If there are processes waiting for the condition choose one and try
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 */
delete proc->waiting_synchro;
/* Destroy waiter's synchronization */
delete proc->waiting_synchro;
@@
-383,19
+384,17
@@
void intrusive_ptr_release(s_smx_cond_t *cond)
if (count == 0) {
xbt_assert(xbt_swag_size(cond->sleeping) == 0,
"Cannot destroy conditional since someone is still using it");
if (count == 0) {
xbt_assert(xbt_swag_size(cond->sleeping) == 0,
"Cannot destroy conditional since someone is still using it");
-
xbt_swag_free(cond->sleeping);
xbt_swag_free(cond->sleeping);
-
xbt_free(cond)
;
+
delete 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));
@@
-429,14
+428,14
@@
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))) {
+ if ((proc = (smx_
actor
_t) xbt_swag_extract(sem->sleeping))) {
delete proc->waiting_synchro;
proc->waiting_synchro = nullptr;
SIMIX_simcall_answer(&proc->simcall);
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();
sem->value++;
}
XBT_OUT();
@@
-461,11
+460,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) {