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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
tools
/
tesh
/
run_context.c
diff --git
a/tools/tesh/run_context.c
b/tools/tesh/run_context.c
index
e06b9f6
..
2622126
100644
(file)
--- a/
tools/tesh/run_context.c
+++ b/
tools/tesh/run_context.c
@@
-115,7
+115,7
@@
void rctx_wait_bg(void)
{
/* Do not use xbt_dynar_free or it will lock the dynar, preventing armageddon
* from working */
- while (
xbt_dynar_length
(bg_jobs)) {
+ while (
!xbt_dynar_is_empty
(bg_jobs)) {
rctx_t rctx = xbt_dynar_getlast_as(bg_jobs, rctx_t);
wait_it(rctx);
xbt_dynar_pop(bg_jobs, &rctx);
@@
-298,8
+298,10
@@
void rctx_pushline(const char *filepos, char kind, char *line)
rctx->cmd = xbt_strdup(line);
rctx->filepos = xbt_strdup(filepos);
- if(option){
- rctx->cmd = bprintf("%s %s",rctx->cmd,option);
+ if (option){
+ char *newcmd = bprintf("%s %s", rctx->cmd, option);
+ free(rctx->cmd);
+ rctx->cmd = newcmd;
}
XBT_INFO("[%s] %s%s", filepos, rctx->cmd,
((rctx->is_background) ? " (background command)" : ""));
@@
-359,7
+361,7
@@
void rctx_pushline(const char *filepos, char kind, char *line)
int len = strlen("setenv ");
char *eq = strchr(line + len, '=');
char *key = bprintf("%.*s", (int) (eq - line - len), line + len);
- xbt_dict_set(env, key, xbt_strdup(eq + 1),
xbt_free_f
);
+ xbt_dict_set(env, key, xbt_strdup(eq + 1),
NULL
);
free(key);
rctx->env = realloc(rctx->env, ++(rctx->env_size) * sizeof(char *));
@@
-560,7
+562,9
@@
void rctx_start(void)
int child_out[2];
XBT_DEBUG("Cmd before rewriting %s", rctx->cmd);
- rctx->cmd = xbt_str_varsubst(rctx->cmd, env);
+ char *newcmd = xbt_str_varsubst(rctx->cmd, env);
+ free(rctx->cmd);
+ rctx->cmd = newcmd;
XBT_VERB("Start %s %s", rctx->cmd,
(rctx->is_background ? "(background job)" : ""));
xbt_os_mutex_acquire(armageddon_mutex);
@@
-643,20
+647,35
@@
void rctx_start(void)
/* Helper function to sort the output */
static int cmpstringp(const void *p1, const void *p2) {
- /* Sort only using the 19 first chars (date+pid)
- * If the dates are the same, then, sort using pointer address (be stable wrt output of each process)
+ /* Sort only using the sort_len first chars
+ * If they are the same, then, sort using pointer address
+ * (be stable wrt output of each process)
*/
- const char *
s1 = *((const char**) p1)
;
- const char *
s2 = *((const char**) p2)
;
+ const char *
*s1 = *(const char***)p1
;
+ const char *
*s2 = *(const char***)p2
;
- XBT_DEBUG("Compare strings '%s' and '%s'",
s1,
s2);
+ XBT_DEBUG("Compare strings '%s' and '%s'",
*s1, *
s2);
- int res = strncmp(
s1,
s2, sort_len);
+ int res = strncmp(
*s1, *
s2, sort_len);
if (res == 0)
- re
turn p1>p2
;
+ re
s = s1 > s2 ? 1 : (s1 < s2 ? -1 : 0)
;
return res;
}
+static void stable_sort(xbt_dynar_t a)
+{
+ unsigned long len = xbt_dynar_length(a);
+ void **b = xbt_new(void*, len);
+ unsigned long i;
+ for (i = 0 ; i < len ; i++) /* fill the array b with pointers to strings */
+ b[i] = xbt_dynar_get_ptr(a, i);
+ qsort(b, len, sizeof *b, cmpstringp); /* sort it */
+ for (i = 0 ; i < len ; i++) /* dereference the pointers to get the strings */
+ b[i] = *(char**)b[i];
+ for (i = 0 ; i < len ; i++) /* put everything in place */
+ xbt_dynar_set_as(a, i, char*, b[i]);
+ xbt_free(b);
+}
/* Waits for the child to end (or to timeout), and check its
ending conditions. This is launched from rctx_start but either in main
@@
-720,7
+739,7
@@
void *rctx_wait(void *r)
}
if (rctx->output_sort) {
-
xbt_dynar_sort(b, cmpstringp
);
+
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);