#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,
- 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 *********************************/
-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);
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_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)", 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();
}
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 */
- smx_synchro_t synchro = nullptr;
+ smx_activity_t synchro = nullptr;
if (this->locked) {
/* FIXME: check if the host is active ? */
* \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) {
* 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);
/* 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.",
- this->owner->name.c_str(),SIMIX_process_get_PID(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);
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;
* 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("()");
- 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;
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();
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();
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);
- smx_synchro_t synchro = nullptr;
+ smx_activity_t synchro = nullptr;
XBT_DEBUG("Wait condition %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;
/* 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;
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));
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);
- 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);
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_synchro_t synchro = nullptr;
+ smx_activity_t synchro = nullptr;
XBT_DEBUG("Wait semaphore %p (timeout:%f)", sem, timeout);
if (sem->value <= 0) {
