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
rename simix::Mutex to simix::MutexImpl
[simgrid.git]
/
src
/
simix
/
smx_synchro.cpp
diff --git
a/src/simix/smx_synchro.cpp
b/src/simix/smx_synchro.cpp
index
7825471
..
2095a4c
100644
(file)
--- a/
src/simix/smx_synchro.cpp
+++ b/
src/simix/smx_synchro.cpp
@@
-5,8
+5,9
@@
/* 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>
@@
-27,7
+28,7
@@
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();
XBT_IN("(%p, %f)",smx_host,timeout);
simgrid::kernel::activity::Raw *sync = new simgrid::kernel::activity::Raw();
- sync->sleep
= surf_host_sleep(smx_host,
timeout);
+ sync->sleep
= smx_host->pimpl_cpu->sleep(
timeout);
sync->sleep->setData(sync);
XBT_OUT();
return sync;
sync->sleep->setData(sync);
XBT_OUT();
return sync;
@@
-97,7
+98,7
@@
void SIMIX_synchro_finish(smx_activity_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:
@@
-106,14
+107,14
@@
Mutex::Mutex() : mutex_(this)
XBT_OUT();
}
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_actor_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 */
@@
-140,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
*/
* \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) {
{
XBT_IN("(%p, %p)", this, issuer);
if (this->locked) {
@@
-160,9
+161,11
@@
bool Mutex::try_lock(smx_actor_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_actor_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)
@@
-204,7
+207,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:
@@
-372,7
+375,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)
@@
-387,7
+389,6
@@
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)
{
/** @brief Initialize a semaphore */
smx_sem_t SIMIX_sem_init(unsigned int value)
{
@@
-433,7
+434,7
@@
void SIMIX_sem_release(smx_sem_t sem)
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();