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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into LLL
[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
ec377f6
..
34dba4a
100644
(file)
--- a/
src/xbt/xbt_sg_synchro.c
+++ b/
src/xbt/xbt_sg_synchro.c
@@
-15,7
+15,7
@@
#include "simix/simix.h" /* used implementation */
#include "simix/datatypes.h"
#include "simix/simix.h" /* used implementation */
#include "simix/datatypes.h"
-#include "../simix/private.h" /* FIXME */
+#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");
@@
-36,10
+36,11
@@
typedef struct s_xbt_thread_ {
static int xbt_thread_create_wrapper(int argc, char *argv[])
{
static int xbt_thread_create_wrapper(int argc, char *argv[])
{
+ smx_process_t self = SIMIX_process_self();
xbt_thread_t t =
xbt_thread_t t =
- (xbt_thread_t) SIMIX_process_self_get_data();
-
SIMIX_req_process_set_data(SIMIX_process_self()
, t->father_data);
-
(*t->code)
(t->userparam);
+ (xbt_thread_t) SIMIX_process_self_get_data(
self
);
+
simcall_process_set_data(self
, t->father_data);
+
t->code
(t->userparam);
if (t->joinable) {
t->done = 1;
xbt_mutex_acquire(t->mutex);
if (t->joinable) {
t->done = 1;
xbt_mutex_acquire(t->mutex);
@@
-61,9
+62,9
@@
xbt_thread_t xbt_thread_create(const char *name, void_f_pvoid_t code,
res->name = xbt_strdup(name);
res->userparam = param;
res->code = code;
res->name = xbt_strdup(name);
res->userparam = param;
res->code = code;
- res->father_data = SIMIX_process_self_get_data();
+ res->father_data = SIMIX_process_self_get_data(
SIMIX_process_self()
);
/* char*name = bprintf("%s#%p",SIMIX_process_self_get_name(), param); */
/* 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,
SIMIX_host_self_get_name(), 0, NULL,
/*props */ NULL);
xbt_thread_create_wrapper, res,
SIMIX_host_self_get_name(), 0, NULL,
/*props */ NULL);
@@
-90,7
+91,7
@@
const char *xbt_thread_self_name(void)
void xbt_thread_join(xbt_thread_t thread)
{
xbt_mutex_acquire(thread->mutex);
void xbt_thread_join(xbt_thread_t thread)
{
xbt_mutex_acquire(thread->mutex);
- xbt_assert
1
(thread->joinable,
+ xbt_assert(thread->joinable,
"Cannot join on %p: wasn't created joinable", thread);
if (!thread->done) {
xbt_cond_wait(thread->cond, thread->mutex);
"Cannot join on %p: wasn't created joinable", thread);
if (!thread->done) {
xbt_cond_wait(thread->cond, thread->mutex);
@@
-106,24
+107,24
@@
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)
{
- return SIMIX_process_self_get_data();
+ return SIMIX_process_self_get_data(
SIMIX_process_self()
);
}
void xbt_thread_yield(void)
{
}
void xbt_thread_yield(void)
{
- SIMIX_process_yield();
+ SIMIX_process_yield(
SIMIX_process_self()
);
}
/****** mutex related functions ******/
}
/****** mutex related functions ******/
@@
-133,22
+134,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 *****/
@@
-158,30
+159,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);
}
}