Use signals for platform callbacks

[simgrid.git] / src / surf / trace_mgr.c

diff --git a/src/surf/trace_mgr.c b/src/surf/trace_mgr.c
index db28597..47f1b29 100644 (file)
--- a/src/surf/trace_mgr.c
+++ b/src/surf/trace_mgr.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2005, 2007, 2009-2013. The SimGrid Team.
+/* Copyright (c) 2004-2005, 2007, 2009-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -81,7 +81,7 @@ tmgr_trace_t tmgr_trace_generator_value(const char *id,
  */
 tmgr_trace_t tmgr_trace_generator_state(const char *id,
                                   probabilist_event_generator_t date_generator,
-                                  e_surf_resource_state_t first_event_value)
+                                  int first_event_hostIsOn)
 {
   tmgr_trace_t trace = NULL;
 
@@ -91,7 +91,7 @@ tmgr_trace_t tmgr_trace_generator_state(const char *id,
   trace->s_probabilist.event_generator[0] = date_generator;
   trace->s_probabilist.event_generator[1] = date_generator;
   trace->s_probabilist.is_state_trace = 1;
-  trace->s_probabilist.next_event = (first_event_value==SURF_RESOURCE_ON ? 1 : 0);
+  trace->s_probabilist.next_event = first_event_hostIsOn;
 
   return trace;
 }
@@ -113,7 +113,7 @@ tmgr_trace_t tmgr_trace_generator_state(const char *id,
 tmgr_trace_t tmgr_trace_generator_avail_unavail(const char *id,
                                 probabilist_event_generator_t avail_duration_generator,
                                 probabilist_event_generator_t unavail_duration_generator,
-                                e_surf_resource_state_t first_event_value)
+                                int first_event_hostIsOn)
 {
   tmgr_trace_t trace = NULL;
 
@@ -123,7 +123,7 @@ tmgr_trace_t tmgr_trace_generator_avail_unavail(const char *id,
   trace->s_probabilist.event_generator[0] = unavail_duration_generator;
   trace->s_probabilist.event_generator[1] = avail_duration_generator;
   trace->s_probabilist.is_state_trace = 1;
-  trace->s_probabilist.next_event = (first_event_value==SURF_RESOURCE_ON ? 1 : 0);
+  trace->s_probabilist.next_event = first_event_hostIsOn;
 
   return trace;
 }
@@ -339,8 +339,9 @@ tmgr_trace_t tmgr_trace_new_from_file(const char *filename)
   }
 
   f = surf_fopen(filename, "r");
-  xbt_assert(f != NULL, "Cannot open file '%s' (path=%s)", filename,
-              xbt_str_join(surf_path, ":"));
+  if (f == NULL)
+    xbt_die("Cannot open file '%s' (path=%s)", filename,
+            xbt_str_join(surf_path, ":"));
 
   tstr = xbt_str_from_file(f);
   fclose(f);