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
Check if p_routingTable is null in AsFull::~AsFull.
[simgrid.git]
/
src
/
xbt
/
xbt_replay.c
diff --git
a/src/xbt/xbt_replay.c
b/src/xbt/xbt_replay.c
index
dfd92c0
..
ffd8002
100644
(file)
--- a/
src/xbt/xbt_replay.c
+++ b/
src/xbt/xbt_replay.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2010, 2012-201
3
. The SimGrid Team.
+/* Copyright (c) 2010, 2012-201
4
. 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,8
+31,23
@@
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;
+int is_replay_active = 0 ;
+
static 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;
+}
+
+int _xbt_replay_is_active(void){
+ return is_replay_active;
+}
+
xbt_replay_reader_t xbt_replay_reader_new(const char *filename)
{
xbt_replay_reader_t res = xbt_new0(s_xbt_replay_reader_t,1);
xbt_replay_reader_t xbt_replay_reader_new(const char *filename)
{
xbt_replay_reader_t res = xbt_new0(s_xbt_replay_reader_t,1);
@@
-96,7
+113,9
@@
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);
+ char* lowername = str_tolower (action_name);
+ xbt_dict_set(action_funs, lowername, function, NULL);
+ xbt_free(lowername);
}
/** \ingroup XBT_replay
}
/** \ingroup XBT_replay
@@
-106,11
+125,14
@@
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);
+ char* lowername = str_tolower (action_name);
+ xbt_dict_remove(action_funs, lowername);
+ xbt_free(lowername);
}
void _xbt_replay_action_init(void)
{
}
void _xbt_replay_action_init(void)
{
+ is_replay_active = 1;
action_funs = xbt_dict_new_homogeneous(NULL);
action_queues = xbt_dict_new_homogeneous(NULL);
}
action_funs = xbt_dict_new_homogeneous(NULL);
action_queues = xbt_dict_new_homogeneous(NULL);
}
@@
-135,8
+157,10
@@
int xbt_replay_action_runner(int argc, char *argv[])
if (action_fp) { // A unique trace file
char **evt;
while ((evt = action_get_action(argv[0]))) {
if (action_fp) { // A unique trace file
char **evt;
while ((evt = action_get_action(argv[0]))) {
+ char* lowername = str_tolower (evt[1]);
action_fun function =
action_fun function =
- (action_fun)xbt_dict_get(action_funs, evt[1]);
+ (action_fun)xbt_dict_get(action_funs, lowername);
+ xbt_free(lowername);
function((const char **)evt);
for (i=0;evt[i]!= NULL;i++)
free(evt[i]);
function((const char **)evt);
for (i=0;evt[i]!= NULL;i++)
free(evt[i]);
@@
-151,8
+175,10
@@
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))) {
);
xbt_replay_reader_t reader = xbt_replay_reader_new(argv[1]);
while ((evt=xbt_replay_reader_get(reader))) {
- if (!strcasecmp(argv[0],evt[0])) {
- action_fun function = (action_fun)xbt_dict_get(action_funs, evt[1]);
+ if (!strcmp(argv[0],evt[0])) {
+ char* lowername = str_tolower (evt[1]);
+ action_fun function = (action_fun)xbt_dict_get(action_funs, lowername);
+ xbt_free(lowername);
function(evt);
} else {
XBT_WARN("%s: Ignore trace element not for me",
function(evt);
} else {
XBT_WARN("%s: Ignore trace element not for me",
@@
-193,7
+219,7
@@
static 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