X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a34aa584ccd2bdb81659d0e5df22864cf999c0f4..49ae6e61753b41f28accc4c0890097286d660e9f:/src/msg/msg_actions.c diff --git a/src/msg/msg_actions.c b/src/msg/msg_actions.c index 75ea78e8d8..434b254cdb 100644 --- a/src/msg/msg_actions.c +++ b/src/msg/msg_actions.c @@ -1,27 +1,27 @@ -/* Copyright (c) 2009, 2010. The SimGrid Team. +/* Copyright (c) 2009-2014. 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. */ -#include "simgrid_config.h" //For getline, keep that include first - #include "msg_private.h" #include "xbt/str.h" #include "xbt/dynar.h" #include "xbt/replay.h" +#include + XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_action, msg, "MSG actions for trace driven simulation"); -void _MSG_action_init() +void MSG_action_init() { _xbt_replay_action_init(); MSG_function_register_default(xbt_replay_action_runner); } -void _MSG_action_exit() +void MSG_action_exit() { _xbt_replay_action_exit(); } @@ -44,8 +44,8 @@ msg_error_t MSG_action_trace_run(char *path) action_fp=NULL; if (path) { action_fp = fopen(path, "r"); - xbt_assert(action_fp != NULL, "Cannot open %s: %s", path, - strerror(errno)); + if (action_fp == NULL) + xbt_die("Cannot open %s: %s", path, strerror(errno)); } res = MSG_main();