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
Other try at killing that singleton
[simgrid.git]
/
tools
/
tesh
/
run_context.h
diff --git
a/tools/tesh/run_context.h
b/tools/tesh/run_context.h
index
06fc577
..
bc76e3b
100644
(file)
--- a/
tools/tesh/run_context.h
+++ b/
tools/tesh/run_context.h
@@
-33,7
+33,7
@@
typedef struct {
that the child is not dead before the end of timeout */
int interrupted:1; /* Whether we got stopped by an armageddon */
that the child is not dead before the end of timeout */
int interrupted:1; /* Whether we got stopped by an armageddon */
- xbt_mutex_t interruption; /* To allow main thread to kill a runner
+ xbt_
os_
mutex_t interruption; /* To allow main thread to kill a runner
one only at certain points */
e_output_handling_t output;
one only at certain points */
e_output_handling_t output;
@@
-46,13
+46,13
@@
typedef struct {
int expected_return; /* the exepeted return code of following command */
/* buffers */
int expected_return; /* the exepeted return code of following command */
/* buffers */
- buff_t input;
- buff_t output_wanted;
- buff_t output_got;
+
xbt_str
buff_t input;
+
xbt_str
buff_t output_wanted;
+
xbt_str
buff_t output_got;
/* Threads */
/* Threads */
- xbt_thread_t writer, reader; /* IO handlers */
- xbt_thread_t runner; /* Main thread, counting for timeouts */
+ xbt_
os_
thread_t writer, reader; /* IO handlers */
+ xbt_
os_
thread_t runner; /* Main thread, counting for timeouts */
/* Pipes from/to the child */
int child_to, child_from;
/* Pipes from/to the child */
int child_to, child_from;
@@
-68,7
+68,7
@@
void rctx_wait_bg(void);
/* kill forcefully all currently running background jobs */
extern rctx_t armageddon_initiator;
/* kill forcefully all currently running background jobs */
extern rctx_t armageddon_initiator;
-extern xbt_mutex_t armageddon_mutex;
+extern xbt_
os_
mutex_t armageddon_mutex;
void rctx_armageddon(rctx_t initiator, int exitcode);
void rctx_armageddon(rctx_t initiator, int exitcode);