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
Misc cleanups.
[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
d485ba3
..
d9e3d59
100644
(file)
--- a/
src/xbt/xbt_sg_synchro.c
+++ b/
src/xbt/xbt_sg_synchro.c
@@
-3,15
+3,14
@@
/* This is the simulation implementation, using simix. */
/* This is the simulation implementation, using simix. */
-/* Copyright (c) 2007
, 2008, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2007
-2013
. 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.h"
* 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.h"
-
-#include "xbt/synchro.h" /* This module */
+#include "xbt/synchro_core.h"
#include "simgrid/simix.h" /* used implementation */
#include "../simix/smx_private.h" /* FIXME */
#include "simgrid/simix.h" /* used implementation */
#include "../simix/smx_private.h" /* FIXME */
@@
-28,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;
@@
-66,7
+65,7
@@
xbt_thread_t xbt_thread_create(const char *name, void_f_pvoid_t code,
simcall_process_create(&res->s_process, name,
xbt_thread_create_wrapper, res,
SIMIX_host_self_get_name(), -1.0, 0, NULL,
simcall_process_create(&res->s_process, name,
xbt_thread_create_wrapper, res,
SIMIX_host_self_get_name(), -1.0, 0, NULL,
- /*props */ 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();