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
kill 2 unused fields in MSG_Global o_O
[simgrid.git]
/
src
/
msg
/
msg_synchro.cpp
diff --git
a/src/msg/msg_synchro.cpp
b/src/msg/msg_synchro.cpp
index
70f1383
..
4090fb3
100644
(file)
--- a/
src/msg/msg_synchro.cpp
+++ b/
src/msg/msg_synchro.cpp
@@
-4,22
+4,20
@@
/* 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 <xbt/ex.hpp>
+
#include "msg_private.h"
#include "msg_private.h"
-#include "xbt/sysdep.h"
-#include "xbt/synchro_core.h"
#include "xbt/log.h"
#include "xbt/log.h"
+#include "xbt/synchro.h"
+#include "xbt/sysdep.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_synchro, msg,
- "Logging specific to MSG (synchro)");
-
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_synchro, msg, "Logging specific to MSG (synchro)");
/** @addtogroup msg_synchro
*
* @{
*/
/** @addtogroup msg_synchro
*
* @{
*/
-/********************************* Host **************************************/
-
/** @brief creates a semaphore object of the given initial capacity */
msg_sem_t MSG_sem_init(int initial_value) {
return simcall_sem_init(initial_value);
/** @brief creates a semaphore object of the given initial capacity */
msg_sem_t MSG_sem_init(int initial_value) {
return simcall_sem_init(initial_value);
@@
-29,33
+27,33
@@
msg_sem_t MSG_sem_init(int initial_value) {
void MSG_sem_acquire(msg_sem_t sem) {
simcall_sem_acquire(sem);
}
void MSG_sem_acquire(msg_sem_t sem) {
simcall_sem_acquire(sem);
}
+
/** @brief locks on a semaphore object up until the provided timeout expires */
msg_error_t MSG_sem_acquire_timeout(msg_sem_t sem, double timeout) {
/** @brief locks on a semaphore object up until the provided timeout expires */
msg_error_t MSG_sem_acquire_timeout(msg_sem_t sem, double timeout) {
- xbt_ex_t e;
msg_error_t res = MSG_OK;
msg_error_t res = MSG_OK;
-
TRY
{
+
try
{
simcall_sem_acquire_timeout(sem,timeout);
simcall_sem_acquire_timeout(sem,timeout);
- } CATCH(e) {
- if (e.category == timeout_error) {
- res = MSG_TIMEOUT;
- xbt_ex_free(e);
- } else {
- RETHROW;
- }
+ } catch(xbt_ex& e) {
+ if (e.category == timeout_error)
+ return MSG_TIMEOUT;
+ throw;
}
return res;
}
}
return res;
}
+
/** @brief releases the semaphore object */
void MSG_sem_release(msg_sem_t sem) {
simcall_sem_release(sem);
}
/** @brief releases the semaphore object */
void MSG_sem_release(msg_sem_t sem) {
simcall_sem_release(sem);
}
-void MSG_sem_get_capacity(msg_sem_t sem) {
- simcall_sem_get_capacity(sem);
+
+int MSG_sem_get_capacity(msg_sem_t sem) {
+ return simcall_sem_get_capacity(sem);
}
void MSG_sem_destroy(msg_sem_t sem) {
}
void MSG_sem_destroy(msg_sem_t sem) {
-
simcall
_sem_destroy(sem);
+
SIMIX
_sem_destroy(sem);
}
}
+
/** @brief returns a boolean indicating if this semaphore would block at this very specific time
*
* Note that the returned value may be wrong right after the function call, when you try to use it...
/** @brief returns a boolean indicating if this semaphore would block at this very specific time
*
* Note that the returned value may be wrong right after the function call, when you try to use it...
@@
-65,22
+63,44
@@
int MSG_sem_would_block(msg_sem_t sem) {
return simcall_sem_would_block(sem);
}
return simcall_sem_would_block(sem);
}
+/*-**** barrier related functions ****-*/
+typedef struct s_msg_bar {
+ xbt_mutex_t mutex;
+ xbt_cond_t cond;
+ unsigned int arrived_processes;
+ unsigned int expected_processes;
+} s_msg_bar_t;
+
/** @brief Initializes a barrier, with count elements */
msg_bar_t MSG_barrier_init(unsigned int count) {
/** @brief Initializes a barrier, with count elements */
msg_bar_t MSG_barrier_init(unsigned int count) {
- return (msg_bar_t)xbt_barrier_init(count);
+ msg_bar_t bar = xbt_new0(s_msg_bar, 1);
+ bar->expected_processes = count;
+ bar->arrived_processes = 0;
+ bar->mutex = xbt_mutex_init();
+ bar->cond = xbt_cond_init();
+ return bar;
}
/** @brief Initializes a barrier, with count elements */
void MSG_barrier_destroy(msg_bar_t bar) {
}
/** @brief Initializes a barrier, with count elements */
void MSG_barrier_destroy(msg_bar_t bar) {
- xbt_barrier_destroy((xbt_bar_t)bar);
+ xbt_mutex_destroy(bar->mutex);
+ xbt_cond_destroy(bar->cond);
+ xbt_free(bar);
}
/** @brief Performs a barrier already initialized */
int MSG_barrier_wait(msg_bar_t bar) {
}
/** @brief Performs a barrier already initialized */
int MSG_barrier_wait(msg_bar_t bar) {
- if(xbt_barrier_wait((xbt_bar_t)bar) == XBT_BARRIER_SERIAL_PROCESS)
+ xbt_mutex_acquire(bar->mutex);
+ bar->arrived_processes++;
+ if (bar->arrived_processes == bar->expected_processes) {
+ xbt_cond_broadcast(bar->cond);
+ xbt_mutex_release(bar->mutex);
+ bar->arrived_processes = 0;
return MSG_BARRIER_SERIAL_PROCESS;
return MSG_BARRIER_SERIAL_PROCESS;
- else
- return 0;
-}
+ }
+ xbt_cond_wait(bar->cond, bar->mutex);
+ xbt_mutex_release(bar->mutex);
+ return 0;
+}
/**@}*/
/**@}*/