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
sanitize the OOP of kernel::profile
[simgrid.git]
/
src
/
simix
/
smx_synchro.cpp
diff --git
a/src/simix/smx_synchro.cpp
b/src/simix/smx_synchro.cpp
index
f961a2c
..
11c4716
100644
(file)
--- a/
src/simix/smx_synchro.cpp
+++ b/
src/simix/smx_synchro.cpp
@@
-1,23
+1,17
@@
-/* Copyright (c) 2007-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-201
9
. 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. */
/* 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/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 "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)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_synchro, simix, "SIMIX Synchronization (mutex, semaphores and conditions)");
-static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout,
- 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_activity_t SIMIX_synchro_wait(sg_host_t smx_host, double timeout)
/***************************** Raw synchronization *********************************/
smx_activity_t SIMIX_synchro_wait(sg_host_t smx_host, double timeout)
@@
-26,8
+20,8
@@
smx_activity_t SIMIX_synchro_wait(sg_host_t smx_host, double timeout)
simgrid::kernel::activity::RawImplPtr sync =
simgrid::kernel::activity::RawImplPtr(new simgrid::kernel::activity::RawImpl());
simgrid::kernel::activity::RawImplPtr sync =
simgrid::kernel::activity::RawImplPtr(new simgrid::kernel::activity::RawImpl());
- sync->s
leep
= smx_host->pimpl_cpu->sleep(timeout);
- sync->s
leep
->set_data(sync.get());
+ sync->s
urf_action_
= smx_host->pimpl_cpu->sleep(timeout);
+ sync->s
urf_action_
->set_data(sync.get());
XBT_OUT();
return sync;
}
XBT_OUT();
return sync;
}
@@
-47,6
+41,7
@@
void SIMIX_synchro_stop_waiting(smx_actor_t process, smx_simcall_t simcall)
case SIMCALL_COND_WAIT_TIMEOUT:
simgrid::xbt::intrusive_erase(simcall_cond_wait_timeout__get__cond(simcall)->sleeping, *process);
case SIMCALL_COND_WAIT_TIMEOUT:
simgrid::xbt::intrusive_erase(simcall_cond_wait_timeout__get__cond(simcall)->sleeping, *process);
+ simcall_cond_wait_timeout__set__result(simcall, 1); // signal a timeout
break;
case SIMCALL_SEM_ACQUIRE:
break;
case SIMCALL_SEM_ACQUIRE:
@@
-55,6
+50,7
@@
void SIMIX_synchro_stop_waiting(smx_actor_t process, smx_simcall_t simcall)
case SIMCALL_SEM_ACQUIRE_TIMEOUT:
simgrid::xbt::intrusive_erase(simcall_sem_acquire_timeout__get__sem(simcall)->sleeping, *process);
case SIMCALL_SEM_ACQUIRE_TIMEOUT:
simgrid::xbt::intrusive_erase(simcall_sem_acquire_timeout__get__sem(simcall)->sleeping, *process);
+ simcall_sem_acquire_timeout__set__result(simcall, 1); // signal a timeout
break;
default:
break;
default:
@@
-66,22
+62,14
@@
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.get());
void SIMIX_synchro_finish(smx_activity_t synchro)
{
XBT_IN("(%p)", synchro.get());
- smx_simcall_t simcall = synchro->simcalls.front();
- synchro->simcalls.pop_front();
-
- switch (synchro->state) {
-
- case SIMIX_SRC_TIMEOUT:
- SMX_EXCEPTION(simcall->issuer, timeout_error, 0, "Synchro's wait timeout");
- break;
+ smx_simcall_t simcall = synchro->simcalls_.front();
+ synchro->simcalls_.pop_front();
- case SIMIX_FAILED:
- simcall->issuer->context->iwannadie = 1;
- break;
-
- default:
+ if (synchro->state_ != SIMIX_SRC_TIMEOUT) {
+ if (synchro->state_ == SIMIX_FAILED)
+ simcall->issuer->context_->iwannadie = true;
+ else
THROW_IMPOSSIBLE;
THROW_IMPOSSIBLE;
- break;
}
SIMIX_synchro_stop_waiting(simcall->issuer, simcall);
}
SIMIX_synchro_stop_waiting(simcall->issuer, simcall);
@@
-157,8
+145,8
@@
static void _SIMIX_sem_wait(smx_sem_t sem, double timeout, smx_actor_t issuer,
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) {
- 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 {
issuer->waiting_synchro = synchro;
sem->sleeping.push_back(*issuer);
} else {
@@
-169,8
+157,7
@@
static void _SIMIX_sem_wait(smx_sem_t sem, double timeout, smx_actor_t issuer,
}
/**
}
/**
- * \brief Handles a sem acquire simcall without timeout.
- * \param simcall the simcall
+ * @brief Handles a sem acquire simcall without timeout.
*/
void simcall_HANDLER_sem_acquire(smx_simcall_t simcall, smx_sem_t sem)
{
*/
void simcall_HANDLER_sem_acquire(smx_simcall_t simcall, smx_sem_t sem)
{
@@
-180,12
+167,12
@@
void simcall_HANDLER_sem_acquire(smx_simcall_t simcall, smx_sem_t sem)
}
/**
}
/**
- * \brief Handles a sem acquire simcall with timeout.
- * \param simcall the simcall
+ * @brief Handles a sem acquire simcall with timeout.
*/
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);
+ simcall_sem_acquire_timeout__set__result(simcall, 0); // default result, will be set to 1 on timeout
_SIMIX_sem_wait(sem, timeout, simcall->issuer, simcall);
XBT_OUT();
}
_SIMIX_sem_wait(sem, timeout, simcall->issuer, simcall);
XBT_OUT();
}