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
[mc] Remove MC code in sigsegvhandler
[simgrid.git]
/
src
/
xbt
/
xbt_replay.c
diff --git
a/src/xbt/xbt_replay.c
b/src/xbt/xbt_replay.c
index
39bd952
..
b9eef79
100644
(file)
--- a/
src/xbt/xbt_replay.c
+++ b/
src/xbt/xbt_replay.c
@@
-1,15
+1,17
@@
-/* Copyright (c) 2010, 2012-201
4
. The SimGrid Team.
+/* Copyright (c) 2010, 2012-201
5
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "internal_config.h"
-#include <errno.h>
+#include "src/internal_config.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/str.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/str.h"
+#include "xbt/file.h"
#include "xbt/replay.h"
#include "xbt/replay.h"
+
+#include <errno.h>
#include <ctype.h>
#include <wchar.h>
#include <ctype.h>
#include <wchar.h>
@@
-24,10
+26,10
@@
typedef struct s_replay_reader {
int linenum;
} s_xbt_replay_reader_t;
int linenum;
} s_xbt_replay_reader_t;
-FILE *action_fp;
+FILE *
xbt_
action_fp;
-xbt_dict_t
action_funs
;
-xbt_dict_t
action_queues
;
+xbt_dict_t
xbt_action_funs = NULL
;
+xbt_dict_t
xbt_action_queues = NULL
;
static char *action_line = NULL;
static size_t action_len = 0;
static char *action_line = NULL;
static size_t action_len = 0;
@@
-115,7
+117,7
@@
void xbt_replay_reader_free(xbt_replay_reader_t *reader)
void xbt_replay_action_register(const char *action_name, action_fun function)
{
char* lowername = str_tolower (action_name);
void xbt_replay_action_register(const char *action_name, action_fun function)
{
char* lowername = str_tolower (action_name);
- xbt_dict_set(action_funs, lowername, function, NULL);
+ xbt_dict_set(
xbt_
action_funs, lowername, function, NULL);
xbt_free(lowername);
}
xbt_free(lowername);
}
@@
-127,22
+129,32
@@
void xbt_replay_action_register(const char *action_name, action_fun function)
void xbt_replay_action_unregister(const char *action_name)
{
char* lowername = str_tolower (action_name);
void xbt_replay_action_unregister(const char *action_name)
{
char* lowername = str_tolower (action_name);
- xbt_dict_remove(action_funs, lowername);
+ xbt_dict_remove(
xbt_
action_funs, lowername);
xbt_free(lowername);
}
xbt_free(lowername);
}
-void _xbt_replay_action_init(void)
+/** @brief Initializes the replay mechanism, and returns true if (and only if) it was necessary
+ *
+ * It returns false if it was already done by another process.
+ */
+int _xbt_replay_action_init(void)
{
{
+ if (xbt_action_funs)
+ return 0;
is_replay_active = 1;
is_replay_active = 1;
- action_funs = xbt_dict_new_homogeneous(NULL);
- action_queues = xbt_dict_new_homogeneous(NULL);
+ xbt_action_funs = xbt_dict_new_homogeneous(NULL);
+ xbt_action_queues = xbt_dict_new_homogeneous(NULL);
+ return 1;
}
void _xbt_replay_action_exit(void)
{
}
void _xbt_replay_action_exit(void)
{
- xbt_dict_free(&action_queues);
- xbt_dict_free(&action_funs);
+ xbt_dict_free(&
xbt_
action_queues);
+ xbt_dict_free(&
xbt_
action_funs);
free(action_line);
free(action_line);
+ xbt_action_queues = NULL;
+ xbt_action_funs = NULL;
+ action_line = NULL;
}
/**
}
/**
@@
-156,21
+168,20
@@
int xbt_replay_action_runner(int argc, char *argv[])
{
int i;
xbt_ex_t e;
{
int i;
xbt_ex_t e;
- if (action_fp) { // A unique trace file
+ if (
xbt_
action_fp) { // A unique trace file
char **evt;
while ((evt = action_get_action(argv[0]))) {
char* lowername = str_tolower (evt[1]);
action_fun function =
char **evt;
while ((evt = action_get_action(argv[0]))) {
char* lowername = str_tolower (evt[1]);
action_fun function =
- (action_fun)xbt_dict_get(action_funs, lowername);
+ (action_fun)xbt_dict_get(
xbt_
action_funs, lowername);
xbt_free(lowername);
TRY{
function((const char **)evt);
}
CATCH(e) {
xbt_free(lowername);
TRY{
function((const char **)evt);
}
CATCH(e) {
- XBT_ERROR("Replay error :\n %s"
+ free(evt);
+ xbt_die("Replay error :\n %s"
, e.msg);
, e.msg);
- xbt_ex_free(e);
- RETHROW;
}
for (i=0;evt[i]!= NULL;i++)
free(evt[i]);
}
for (i=0;evt[i]!= NULL;i++)
free(evt[i]);
@@
-187,7
+198,7
@@
int xbt_replay_action_runner(int argc, char *argv[])
while ((evt=xbt_replay_reader_get(reader))) {
if (!strcmp(argv[0],evt[0])) {
char* lowername = str_tolower (evt[1]);
while ((evt=xbt_replay_reader_get(reader))) {
if (!strcmp(argv[0],evt[0])) {
char* lowername = str_tolower (evt[1]);
- action_fun function = (action_fun)xbt_dict_get(action_funs, lowername);
+ action_fun function = (action_fun)xbt_dict_get(
xbt_
action_funs, lowername);
xbt_free(lowername);
TRY{
function(evt);
xbt_free(lowername);
TRY{
function(evt);
@@
-214,15
+225,15
@@
static char **action_get_action(char *name)
xbt_dynar_t evt = NULL;
char *evtname = NULL;
xbt_dynar_t evt = NULL;
char *evtname = NULL;
- xbt_dynar_t myqueue = xbt_dict_get_or_null(action_queues, name);
+ xbt_dynar_t myqueue = xbt_dict_get_or_null(
xbt_
action_queues, name);
if (myqueue == NULL || xbt_dynar_is_empty(myqueue)) { // nothing stored for me. Read the file further
if (myqueue == NULL || xbt_dynar_is_empty(myqueue)) { // nothing stored for me. Read the file further
- if (action_fp == NULL) { // File closed now. There's nothing more to read. I'm out of here
+ if (
xbt_
action_fp == NULL) { // File closed now. There's nothing more to read. I'm out of here
goto todo_done;
}
// Read lines until I reach something for me (which breaks in loop body)
// or end of file reached
goto todo_done;
}
// Read lines until I reach something for me (which breaks in loop body)
// or end of file reached
- while (xbt_getline(&action_line, &action_len, action_fp) != -1) {
+ while (xbt_getline(&action_line, &action_len,
xbt_
action_fp) != -1) {
// cleanup and split the string I just read
char *comment = strchr(action_line, '#');
if (comment != NULL)
// cleanup and split the string I just read
char *comment = strchr(action_line, '#');
if (comment != NULL)
@@
-241,11
+252,11
@@
static char **action_get_action(char *name)
} else {
// Else, I have to store it for the relevant colleague
xbt_dynar_t otherqueue =
} else {
// Else, I have to store it for the relevant colleague
xbt_dynar_t otherqueue =
- xbt_dict_get_or_null(action_queues, evtname);
+ xbt_dict_get_or_null(
xbt_
action_queues, evtname);
if (otherqueue == NULL) { // Damn. Create the queue of that guy
otherqueue =
xbt_dynar_new(sizeof(xbt_dynar_t), xbt_dynar_free_voidp);
if (otherqueue == NULL) { // Damn. Create the queue of that guy
otherqueue =
xbt_dynar_new(sizeof(xbt_dynar_t), xbt_dynar_free_voidp);
- xbt_dict_set(action_queues, evtname, otherqueue, NULL);
+ xbt_dict_set(
xbt_
action_queues, evtname, otherqueue, NULL);
}
xbt_dynar_push(otherqueue, &evt);
}
}
xbt_dynar_push(otherqueue, &evt);
}
@@
-263,7
+274,7
@@
static char **action_get_action(char *name)
todo_done:
if (myqueue != NULL) {
xbt_dynar_free(&myqueue);
todo_done:
if (myqueue != NULL) {
xbt_dynar_free(&myqueue);
- xbt_dict_remove(action_queues, name);
+ xbt_dict_remove(
xbt_
action_queues, name);
}
return NULL;
}
}
return NULL;
}