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
jedule: obey our coding standards
[simgrid.git]
/
src
/
msg
/
msg_synchro.cpp
diff --git
a/src/msg/msg_synchro.cpp
b/src/msg/msg_synchro.cpp
index
5cf06a0
..
bce88e5
100644
(file)
--- a/
src/msg/msg_synchro.cpp
+++ b/
src/msg/msg_synchro.cpp
@@
-1,13
+1,13
@@
-/* Copyright (c) 2013-2017. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2013-2018. 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. */
#include "xbt/ex.hpp"
/* 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 "src/simix/smx_private.h"
+#include "msg_private.hpp"
+#include "src/simix/smx_private.hpp"
+#include "src/simix/smx_synchro_private.hpp"
#include "xbt/synchro.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_synchro, msg, "Logging specific to MSG (synchro)");
#include "xbt/synchro.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_synchro, msg, "Logging specific to MSG (synchro)");
@@
-19,7
+19,7
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_synchro, msg, "Logging specific to MSG (sync
/** @brief creates a semaphore object of the given initial capacity */
msg_sem_t MSG_sem_init(int initial_value) {
/** @brief creates a semaphore object of the given initial capacity */
msg_sem_t MSG_sem_init(int initial_value) {
- return simgrid::simix::
kernelImmediate
([initial_value] { return SIMIX_sem_init(initial_value); });
+ return simgrid::simix::
simcall
([initial_value] { return SIMIX_sem_init(initial_value); });
}
/** @brief locks on a semaphore object */
}
/** @brief locks on a semaphore object */
@@
-29,24
+29,16
@@
void MSG_sem_acquire(msg_sem_t 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) {
- msg_error_t res = MSG_OK;
- try {
- simcall_sem_acquire_timeout(sem,timeout);
- } catch(xbt_ex& e) {
- if (e.category == timeout_error)
- return MSG_TIMEOUT;
- throw;
- }
- return res;
+ return simcall_sem_acquire_timeout(sem, timeout) ? MSG_TIMEOUT : MSG_OK;
}
/** @brief releases the semaphore object */
void MSG_sem_release(msg_sem_t sem) {
}
/** @brief releases the semaphore object */
void MSG_sem_release(msg_sem_t sem) {
- simgrid::simix::
kernelImmediate
([sem] { SIMIX_sem_release(sem); });
+ simgrid::simix::
simcall
([sem] { SIMIX_sem_release(sem); });
}
int MSG_sem_get_capacity(msg_sem_t sem) {
}
int MSG_sem_get_capacity(msg_sem_t sem) {
- return simgrid::simix::
kernelImmediate
([sem] { return SIMIX_sem_get_capacity(sem); });
+ return simgrid::simix::
simcall
([sem] { return SIMIX_sem_get_capacity(sem); });
}
void MSG_sem_destroy(msg_sem_t sem) {
}
void MSG_sem_destroy(msg_sem_t sem) {
@@
-59,20
+51,20
@@
void MSG_sem_destroy(msg_sem_t sem) {
* But that's a classical semaphore issue, and SimGrid's semaphore are not different to usual ones here.
*/
int MSG_sem_would_block(msg_sem_t sem) {
* But that's a classical semaphore issue, and SimGrid's semaphore are not different to usual ones here.
*/
int MSG_sem_would_block(msg_sem_t sem) {
- return simgrid::simix::
kernelImmediate
([sem] { return SIMIX_sem_would_block(sem); });
+ return simgrid::simix::
simcall
([sem] { return SIMIX_sem_would_block(sem); });
}
/*-**** barrier related functions ****-*/
}
/*-**** barrier related functions ****-*/
-
typedef struct s_msg_bar
{
+
struct s_msg_bar_t
{
xbt_mutex_t mutex;
xbt_cond_t cond;
unsigned int arrived_processes;
unsigned int expected_processes;
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) {
- msg_bar_t bar =
xbt_new0(s_msg_bar, 1)
;
+ msg_bar_t bar =
new s_msg_bar_t
;
bar->expected_processes = count;
bar->arrived_processes = 0;
bar->mutex = xbt_mutex_init();
bar->expected_processes = count;
bar->arrived_processes = 0;
bar->mutex = xbt_mutex_init();
@@
-84,7
+76,7
@@
msg_bar_t MSG_barrier_init(unsigned int count) {
void MSG_barrier_destroy(msg_bar_t bar) {
xbt_mutex_destroy(bar->mutex);
xbt_cond_destroy(bar->cond);
void MSG_barrier_destroy(msg_bar_t bar) {
xbt_mutex_destroy(bar->mutex);
xbt_cond_destroy(bar->cond);
-
xbt_free(bar)
;
+
delete bar
;
}
/** @brief Performs a barrier already initialized */
}
/** @brief Performs a barrier already initialized */