X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/40dc499e35463c28c4572e077206864092452e6a..e9b0dc96439383147b02491962e8ccf8cfdeff6b:/tools/tesh/run_context.h

diff --git a/tools/tesh/run_context.h b/tools/tesh/run_context.h
index 06fc5777f2..bc76e3bf6c 100644
--- 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 */
-  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;
@@ -46,13 +46,13 @@ typedef struct {
   int expected_return; /* the exepeted return code of following command */
 
   /* buffers */
-  buff_t input;
-  buff_t output_wanted;
-  buff_t output_got;
+  xbt_strbuff_t input;
+  xbt_strbuff_t output_wanted;
+  xbt_strbuff_t output_got;
 
   /* 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;
@@ -68,7 +68,7 @@ void rctx_wait_bg(void);
 
 /* 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);