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
split SMPI documentation into a specific file (no real change)
[simgrid.git]
/
src
/
xbt
/
xbt_sg_synchro.c
diff --git
a/src/xbt/xbt_sg_synchro.c
b/src/xbt/xbt_sg_synchro.c
index
df45b81
..
ae49355
100644
(file)
--- a/
src/xbt/xbt_sg_synchro.c
+++ b/
src/xbt/xbt_sg_synchro.c
@@
-10,12
+10,10
@@
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "xbt/ex.h"
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "xbt/ex.h"
+#include "xbt/synchro_core.h"
-#include "xbt/synchro.h" /* This module */
-
-#include "simix/simix.h" /* used implementation */
-#include "simix/datatypes.h"
-#include "../simix/private.h" /* FIXME */
+#include "simgrid/simix.h" /* used implementation */
+#include "../simix/smx_private.h" /* FIXME */
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync, xbt,
"Synchronization mechanism");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync, xbt,
"Synchronization mechanism");
@@
-29,7
+27,7
@@
typedef struct s_xbt_thread_ {
void *userparam;
void *father_data;
/* stuff to allow other people to wait on me with xbt_thread_join */
void *userparam;
void *father_data;
/* stuff to allow other people to wait on me with xbt_thread_join */
-
int
joinable:1, done:1;
+
unsigned
joinable:1, done:1;
xbt_cond_t cond;
xbt_mutex_t mutex;
} s_xbt_thread_t;
xbt_cond_t cond;
xbt_mutex_t mutex;
} s_xbt_thread_t;
@@
-39,7
+37,7
@@
static int xbt_thread_create_wrapper(int argc, char *argv[])
smx_process_t self = SIMIX_process_self();
xbt_thread_t t =
(xbt_thread_t) SIMIX_process_self_get_data(self);
smx_process_t self = SIMIX_process_self();
xbt_thread_t t =
(xbt_thread_t) SIMIX_process_self_get_data(self);
-
SIMIX_req
_process_set_data(self, t->father_data);
+
simcall
_process_set_data(self, t->father_data);
t->code(t->userparam);
if (t->joinable) {
t->done = 1;
t->code(t->userparam);
if (t->joinable) {
t->done = 1;
@@
-64,10
+62,10
@@
xbt_thread_t xbt_thread_create(const char *name, void_f_pvoid_t code,
res->code = code;
res->father_data = SIMIX_process_self_get_data(SIMIX_process_self());
/* char*name = bprintf("%s#%p",SIMIX_process_self_get_name(), param); */
res->code = code;
res->father_data = SIMIX_process_self_get_data(SIMIX_process_self());
/* char*name = bprintf("%s#%p",SIMIX_process_self_get_name(), param); */
-
SIMIX_req
_process_create(&res->s_process, name,
+
simcall
_process_create(&res->s_process, name,
xbt_thread_create_wrapper, res,
xbt_thread_create_wrapper, res,
- SIMIX_host_self_get_name(), 0, NULL,
- /*props */ NULL);
+ SIMIX_host_self_get_name(),
-1.0,
0, NULL,
+ /*props */ NULL
,0
);
res->joinable = joinable;
res->done = 0;
res->cond = xbt_cond_init();
res->joinable = joinable;
res->done = 0;
res->cond = xbt_cond_init();
@@
-107,14
+105,14
@@
void xbt_thread_join(xbt_thread_t thread)
void xbt_thread_cancel(xbt_thread_t thread)
{
void xbt_thread_cancel(xbt_thread_t thread)
{
-
SIMIX_req
_process_kill(thread->s_process);
+
simcall
_process_kill(thread->s_process);
free(thread->name);
free(thread);
}
void xbt_thread_exit()
{
free(thread->name);
free(thread);
}
void xbt_thread_exit()
{
-
SIMIX_req
_process_kill(SIMIX_process_self());
+
simcall
_process_kill(SIMIX_process_self());
}
xbt_thread_t xbt_thread_self(void)
}
xbt_thread_t xbt_thread_self(void)
@@
-134,22
+132,22
@@
struct s_xbt_mutex_ {
xbt_mutex_t xbt_mutex_init(void)
{
xbt_mutex_t xbt_mutex_init(void)
{
- return (xbt_mutex_t)
SIMIX_req
_mutex_init();
+ return (xbt_mutex_t)
simcall
_mutex_init();
}
void xbt_mutex_acquire(xbt_mutex_t mutex)
{
}
void xbt_mutex_acquire(xbt_mutex_t mutex)
{
-
SIMIX_req
_mutex_lock((smx_mutex_t) mutex);
+
simcall
_mutex_lock((smx_mutex_t) mutex);
}
void xbt_mutex_release(xbt_mutex_t mutex)
{
}
void xbt_mutex_release(xbt_mutex_t mutex)
{
-
SIMIX_req
_mutex_unlock((smx_mutex_t) mutex);
+
simcall
_mutex_unlock((smx_mutex_t) mutex);
}
void xbt_mutex_destroy(xbt_mutex_t mutex)
{
}
void xbt_mutex_destroy(xbt_mutex_t mutex)
{
-
SIMIX_req
_mutex_destroy((smx_mutex_t) mutex);
+
simcall
_mutex_destroy((smx_mutex_t) mutex);
}
/***** condition related functions *****/
}
/***** condition related functions *****/
@@
-159,30
+157,30
@@
struct s_xbt_cond_ {
xbt_cond_t xbt_cond_init(void)
{
xbt_cond_t xbt_cond_init(void)
{
- return (xbt_cond_t)
SIMIX_req
_cond_init();
+ return (xbt_cond_t)
simcall
_cond_init();
}
void xbt_cond_wait(xbt_cond_t cond, xbt_mutex_t mutex)
{
}
void xbt_cond_wait(xbt_cond_t cond, xbt_mutex_t mutex)
{
-
SIMIX_req
_cond_wait((smx_cond_t) cond, (smx_mutex_t) mutex);
+
simcall
_cond_wait((smx_cond_t) cond, (smx_mutex_t) mutex);
}
void xbt_cond_timedwait(xbt_cond_t cond, xbt_mutex_t mutex, double delay)
{
}
void xbt_cond_timedwait(xbt_cond_t cond, xbt_mutex_t mutex, double delay)
{
-
SIMIX_req
_cond_wait_timeout((smx_cond_t) cond, (smx_mutex_t) mutex, delay);
+
simcall
_cond_wait_timeout((smx_cond_t) cond, (smx_mutex_t) mutex, delay);
}
void xbt_cond_signal(xbt_cond_t cond)
{
}
void xbt_cond_signal(xbt_cond_t cond)
{
-
SIMIX_req
_cond_signal((smx_cond_t) cond);
+
simcall
_cond_signal((smx_cond_t) cond);
}
void xbt_cond_broadcast(xbt_cond_t cond)
{
}
void xbt_cond_broadcast(xbt_cond_t cond)
{
-
SIMIX_req
_cond_broadcast((smx_cond_t) cond);
+
simcall
_cond_broadcast((smx_cond_t) cond);
}
void xbt_cond_destroy(xbt_cond_t cond)
{
}
void xbt_cond_destroy(xbt_cond_t cond)
{
-
SIMIX_req
_cond_destroy((smx_cond_t) cond);
+
simcall
_cond_destroy((smx_cond_t) cond);
}
}