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
really make replay case insensitive
[simgrid.git]
/
src
/
xbt
/
xbt_replay.c
diff --git
a/src/xbt/xbt_replay.c
b/src/xbt/xbt_replay.c
index
d4937e8
..
ac163cc
100644
(file)
--- a/
src/xbt/xbt_replay.c
+++ b/
src/xbt/xbt_replay.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2010. The SimGrid Team.
+/* Copyright (c) 2010
, 2012-2013
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-10,6
+10,8
@@
#include "xbt/log.h"
#include "xbt/str.h"
#include "xbt/replay.h"
#include "xbt/log.h"
#include "xbt/str.h"
#include "xbt/replay.h"
+#include <ctype.h>
+#include <wchar.h>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(replay,xbt,"Replay trace reader");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(replay,xbt,"Replay trace reader");
@@
-29,7
+31,17
@@
xbt_dict_t action_queues;
static char *action_line = NULL;
static size_t action_len = 0;
static char *action_line = NULL;
static size_t action_len = 0;
-static const char **action_get_action(char *name);
+static char **action_get_action(char *name);
+
+static char *str_tolower (const char *str)
+{
+ char *ret = xbt_strdup (str);
+ int i, n = strlen (ret);
+ for (i = 0; i < n; i++)
+ ret[i] = tolower (str[i]);
+ return ret;
+}
+
xbt_replay_reader_t xbt_replay_reader_new(const char *filename)
{
xbt_replay_reader_t xbt_replay_reader_new(const char *filename)
{
@@
-96,7
+108,7
@@
void xbt_replay_reader_free(xbt_replay_reader_t *reader)
*/
void xbt_replay_action_register(const char *action_name, action_fun function)
{
*/
void xbt_replay_action_register(const char *action_name, action_fun function)
{
- xbt_dict_set(action_funs,
action_name
, function, NULL);
+ xbt_dict_set(action_funs,
str_tolower (action_name)
, function, NULL);
}
/** \ingroup XBT_replay
}
/** \ingroup XBT_replay
@@
-106,7
+118,7
@@
void xbt_replay_action_register(const char *action_name, action_fun function)
*/
void xbt_replay_action_unregister(const char *action_name)
{
*/
void xbt_replay_action_unregister(const char *action_name)
{
- xbt_dict_remove(action_funs,
action_name
);
+ xbt_dict_remove(action_funs,
str_tolower (action_name)
);
}
void _xbt_replay_action_init(void)
}
void _xbt_replay_action_init(void)
@@
-131,19
+143,19
@@
void _xbt_replay_action_exit(void)
*/
int xbt_replay_action_runner(int argc, char *argv[])
{
*/
int xbt_replay_action_runner(int argc, char *argv[])
{
- const char **evt;
int i;
if (action_fp) { // A unique trace file
int i;
if (action_fp) { // A unique trace file
-
+ char **evt;
while ((evt = action_get_action(argv[0]))) {
action_fun function =
while ((evt = action_get_action(argv[0]))) {
action_fun function =
- (action_fun)xbt_dict_get(action_funs,
evt[1]
);
- function(evt);
+ (action_fun)xbt_dict_get(action_funs,
str_tolower (evt[1])
);
+ function(
(const char **)
evt);
for (i=0;evt[i]!= NULL;i++)
for (i=0;evt[i]!= NULL;i++)
- free(
(char*)
evt[i]);
+ free(evt[i]);
free(evt);
}
} else { // Should have got my trace file in argument
free(evt);
}
} else { // Should have got my trace file in argument
+ const char **evt;
xbt_assert(argc >= 2,
"No '%s' agent function provided, no simulation-wide trace file provided, "
"and no process-wide trace file provided in deployment file. Aborting.",
xbt_assert(argc >= 2,
"No '%s' agent function provided, no simulation-wide trace file provided, "
"and no process-wide trace file provided in deployment file. Aborting.",
@@
-152,7
+164,7
@@
int xbt_replay_action_runner(int argc, char *argv[])
xbt_replay_reader_t reader = xbt_replay_reader_new(argv[1]);
while ((evt=xbt_replay_reader_get(reader))) {
if (!strcmp(argv[0],evt[0])) {
xbt_replay_reader_t reader = xbt_replay_reader_new(argv[1]);
while ((evt=xbt_replay_reader_get(reader))) {
if (!strcmp(argv[0],evt[0])) {
- action_fun function = (action_fun)xbt_dict_get(action_funs,
evt[1]
);
+ action_fun function = (action_fun)xbt_dict_get(action_funs,
str_tolower (evt[1])
);
function(evt);
} else {
XBT_WARN("%s: Ignore trace element not for me",
function(evt);
} else {
XBT_WARN("%s: Ignore trace element not for me",
@@
-166,7
+178,7
@@
int xbt_replay_action_runner(int argc, char *argv[])
}
}
-static c
onst c
har **action_get_action(char *name)
+static char **action_get_action(char *name)
{
xbt_dynar_t evt = NULL;
char *evtname = NULL;
{
xbt_dynar_t evt = NULL;
char *evtname = NULL;
@@
-193,7
+205,7
@@
static const char **action_get_action(char *name)
// if it's for me, I'm done
evtname = xbt_dynar_get_as(evt, 0, char *);
// if it's for me, I'm done
evtname = xbt_dynar_get_as(evt, 0, char *);
- if (!strcmp(name, evtname)) {
+ if (!strc
asec
mp(name, evtname)) {
return xbt_dynar_to_array(evt);
} else {
// Else, I have to store it for the relevant colleague
return xbt_dynar_to_array(evt);
} else {
// Else, I have to store it for the relevant colleague