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
forgot one include
[simgrid.git]
/
src
/
simix
/
smx_synchro.cpp
diff --git
a/src/simix/smx_synchro.cpp
b/src/simix/smx_synchro.cpp
index
7825471
..
f2a98c7
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;
@@
-163,6
+164,8
@@
bool Mutex::try_lock(smx_actor_t issuer)
void Mutex::unlock(smx_actor_t issuer)
{
XBT_IN("(%p, %p)", this, issuer);
void Mutex::unlock(smx_actor_t 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)
@@
-387,7
+390,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
+435,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();