X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2f810149832a2d855c33d0df5b02d736c2081e41..97205f69c3ff45b271a439e9feedd372c587656e:/tools/tesh/run_context.c

diff --git a/tools/tesh/run_context.c b/tools/tesh/run_context.c
index 26221267f8..747976806c 100644
--- a/tools/tesh/run_context.c
+++ b/tools/tesh/run_context.c
@@ -13,6 +13,7 @@
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <math.h>               /* floor */
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(tesh);
 
@@ -78,7 +79,7 @@ void rctx_init(void)
   struct sigaction newact;
   int i;
   fg_job = 0;
-  bg_jobs = xbt_dynar_new_sync(sizeof(rctx_t), kill_it);
+  bg_jobs = xbt_dynar_new(sizeof(rctx_t), kill_it);
   armageddon_mutex = xbt_os_mutex_init();
   armageddon_initiator = NULL;
   sigwaiter_mutex = xbt_os_mutex_init();
@@ -133,7 +134,10 @@ static void rctx_armageddon_kill_one(rctx_t initiator, const char *filepos,
     if (!rctx->reader_done) {
       rctx->interrupted = 1;
       kill(rctx->pid, SIGTERM);
-      usleep(100);
+      struct timespec ts;
+      ts.tv_sec = 0;
+      ts.tv_nsec = (100e-6 - floor(100e-6)) * 1e9;
+      nanosleep (&ts, NULL);
       kill(rctx->pid, SIGKILL);
     }
     xbt_os_mutex_release(rctx->interruption);
@@ -169,7 +173,10 @@ void rctx_armageddon(rctx_t initiator, int exitcode)
   }
 
   /* Give runner threads a chance to acknowledge the processes deaths */
-  usleep(10000);
+  struct timespec ts;
+  ts.tv_sec = 0;
+  ts.tv_nsec = (10000e-6 - floor(10000e-6)) * 1e9;
+  nanosleep (&ts, NULL);
   /* Ensure that nobody is running rctx_wait on exit */
   if (fg_job)
     xbt_os_mutex_acquire(rctx->interruption);
@@ -318,6 +325,7 @@ void rctx_pushline(const char *filepos, char kind, char *line)
     rctx->is_empty = 0;
     xbt_strbuff_append(rctx->output_wanted, line);
     xbt_strbuff_append(rctx->output_wanted, "\n");
+    XBT_DEBUG("wanted:%s",rctx->output_wanted->data);
     break;
 
   case '!':
@@ -410,8 +418,12 @@ static void *thread_writer(void *r)
     }
     XBT_DEBUG("written %d chars so far", posw);
 
-    if (got <= 0)
-      usleep(100);
+    if (got <= 0){
+      struct timespec ts;
+      ts.tv_sec = 0;
+      ts.tv_nsec = (100e-6 - floor(100e-6)) * 1e9;
+      nanosleep (&ts, NULL);
+    }
   }
   rctx->input->data[0] = '\0';
   rctx->input->used = 0;
@@ -438,7 +450,10 @@ static void *thread_reader(void *r)
       buffout[posr] = '\0';
       xbt_strbuff_append(rctx->output_got, buffout);
     } else {
-      usleep(100);
+      struct timespec ts;
+      ts.tv_sec = 0;
+      ts.tv_nsec = (100e-6 - floor(100e-6)) * 1e9;
+      nanosleep (&ts, NULL);
     }
   } while (!rctx->timeout && posr != 0);
   free(buffout);
@@ -697,7 +712,10 @@ void *rctx_wait(void *r)
   /* Wait for the child to die or the timeout to happen (or an armageddon to happen) */
   while (!rctx->reader_done
          && (rctx->end_time < 0 || rctx->end_time >= now)) {
-    usleep(100);
+    struct timespec ts;
+    ts.tv_sec = 0;
+    ts.tv_nsec = (100e-6 - floor(100e-6)) * 1e9;
+    nanosleep (&ts, NULL);
     now = time(NULL);
   }
 
@@ -706,7 +724,10 @@ void *rctx_wait(void *r)
     XBT_INFO("<%s> timeouted. Kill the process.", rctx->filepos);
     rctx->timeout = 1;
     kill(rctx->pid, SIGTERM);
-    usleep(100);
+    struct timespec ts;
+    ts.tv_sec = 0;
+    ts.tv_nsec = (100e-6 - floor(100e-6)) * 1e9;
+    nanosleep (&ts, NULL);
     kill(rctx->pid, SIGKILL);
   }
 
@@ -721,7 +742,7 @@ void *rctx_wait(void *r)
      return NULL;
      xbt_os_mutex_acquire(rctx->interruption); */
 
-  {
+  { // Sorting output got
     xbt_dynar_t a = xbt_str_split(rctx->output_got->data, "\n");
     xbt_dynar_t b = xbt_dynar_new(sizeof(char *), NULL);
     unsigned cpt;
@@ -756,6 +777,40 @@ void *rctx_wait(void *r)
     xbt_dynar_free(&a);
   }
 
+  { // Sorting output wanted
+    xbt_dynar_t a = xbt_str_split(rctx->output_wanted->data, "\n");
+    xbt_dynar_t b = xbt_dynar_new(sizeof(char *), NULL);
+    unsigned cpt;
+    char *str;
+    xbt_dynar_foreach(a, cpt, str) {
+      if (strncmp(str, "TESH_ERROR ", (sizeof "TESH_ERROR ") - 1) == 0) {
+        XBT_CRITICAL("%s", str);
+        errcode = 1;
+      } else if (coverage &&
+                 strncmp(str, "profiling:", (sizeof "profiling:") - 1) == 0) {
+        XBT_DEBUG("Remove line [%u]: '%s'", cpt, str);
+      } else {
+        xbt_dynar_push_as(b, char *, str);
+      }
+    }
+
+    if (rctx->output_sort) {
+      stable_sort(b);
+      /* If empty lines moved in first position, remove them */
+      while (!xbt_dynar_is_empty(b) && *xbt_dynar_getfirst_as(b, char*) == '\0')
+        xbt_dynar_shift(b, NULL);
+    }
+
+    if (rctx->output_sort || xbt_dynar_length(b) != xbt_dynar_length(a)) {
+      char *newbuf = xbt_str_join(b, "\n");
+      strcpy(rctx->output_wanted->data, newbuf);
+      rctx->output_wanted->used = strlen(newbuf);
+      xbt_free(newbuf);
+    }
+
+    xbt_dynar_free(&b);
+    xbt_dynar_free(&a);
+  }
   xbt_strbuff_chomp(rctx->output_got);
   xbt_strbuff_chomp(rctx->output_wanted);
   xbt_strbuff_trim(rctx->output_got);
@@ -775,7 +830,7 @@ void *rctx_wait(void *r)
       XBT_INFO("<%s> No output before timeout", rctx->filepos);
     XBT_ERROR("Test suite `%s': NOK (<%s> timeout after %d sec)",
            testsuite_name, rctx->filepos, timeout_value);
-    XBT_DEBUG("<%s> Interrupted = %d", rctx->filepos, rctx->interrupted);
+    XBT_DEBUG("<%s> Interrupted = %d", rctx->filepos, (int)rctx->interrupted);
     if (!rctx->interrupted) {
       xbt_os_mutex_release(rctx->interruption);
       rctx_armageddon(rctx, 3);