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
A distraction, the SIMIX_process_create() function takes only six parameters.
[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
ee39fd4
..
bc80b82
100644
(file)
--- a/
src/xbt/xbt_sg_synchro.c
+++ b/
src/xbt/xbt_sg_synchro.c
@@
-21,10
+21,11
@@
/* the implementation would be cleaner (and faster) with ELF symbol aliasing */
typedef struct s_xbt_thread_ {
/* the implementation would be cleaner (and faster) with ELF symbol aliasing */
typedef struct s_xbt_thread_ {
+ char *name;
smx_process_t s_process;
smx_process_t s_process;
- void_f_pvoid_t
*
code;
+ void_f_pvoid_t code;
void *userparam;
void *userparam;
-
void *father_data;
+ void *father_data;
} s_xbt_thread_t;
static int xbt_thread_create_wrapper(int argc, char *argv[]) {
} s_xbt_thread_t;
static int xbt_thread_create_wrapper(int argc, char *argv[]) {
@@
-34,20
+35,31
@@
static int xbt_thread_create_wrapper(int argc, char *argv[]) {
return 0;
}
return 0;
}
-xbt_thread_t xbt_thread_create(
void_f_pvoid_t*
code, void* param) {
+xbt_thread_t xbt_thread_create(
const char*name,void_f_pvoid_t
code, void* param) {
xbt_thread_t res = xbt_new0(s_xbt_thread_t,1);
xbt_thread_t res = xbt_new0(s_xbt_thread_t,1);
+ res->name = xbt_strdup(name);
res->userparam = param;
res->code = code;
res->father_data = SIMIX_process_get_data(SIMIX_process_self());
res->userparam = param;
res->code = code;
res->father_data = SIMIX_process_get_data(SIMIX_process_self());
- char*name = bprintf("%s#%p",SIMIX_process_get_name(SIMIX_process_self()), param);
+
//
char*name = bprintf("%s#%p",SIMIX_process_get_name(SIMIX_process_self()), param);
res->s_process = SIMIX_process_create(name,
xbt_thread_create_wrapper, res,
SIMIX_host_get_name(SIMIX_host_self()),
res->s_process = SIMIX_process_create(name,
xbt_thread_create_wrapper, res,
SIMIX_host_get_name(SIMIX_host_self()),
- 0,
NULL);
- free(name);
+ 0,
/*props*/
NULL);
+
//
free(name);
return res;
}
return res;
}
+const char* xbt_thread_name(xbt_thread_t t) {
+ return t->name;
+}
+
+const char* xbt_thread_self_name(void) {
+ xbt_thread_t me = xbt_thread_self();
+ return me ? me->name : "maestro";
+}
+
+
void
xbt_thread_join(xbt_thread_t thread) {
THROW_UNIMPLEMENTED; /* FIXME */
void
xbt_thread_join(xbt_thread_t thread) {
THROW_UNIMPLEMENTED; /* FIXME */
@@
-66,7
+78,8
@@
void xbt_thread_exit() {
}
xbt_thread_t xbt_thread_self(void) {
}
xbt_thread_t xbt_thread_self(void) {
- return SIMIX_process_get_data(SIMIX_process_self());
+ smx_process_t p = SIMIX_process_self();
+ return p ? SIMIX_process_get_data(p) : NULL;
}
void xbt_thread_yield(void) {
}
void xbt_thread_yield(void) {
@@
-87,11
+100,11
@@
xbt_mutex_t xbt_mutex_init(void) {
return (xbt_mutex_t)SIMIX_mutex_init();
}
return (xbt_mutex_t)SIMIX_mutex_init();
}
-void xbt_mutex_
lock
(xbt_mutex_t mutex) {
+void xbt_mutex_
acquire
(xbt_mutex_t mutex) {
SIMIX_mutex_lock( (smx_mutex_t)mutex) ;
}
SIMIX_mutex_lock( (smx_mutex_t)mutex) ;
}
-void xbt_mutex_
unlock
(xbt_mutex_t mutex) {
+void xbt_mutex_
release
(xbt_mutex_t mutex) {
SIMIX_mutex_unlock( (smx_mutex_t)mutex );
}
SIMIX_mutex_unlock( (smx_mutex_t)mutex );
}