#pragma hdrstop
#endif
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
#include "surf/trace_mgr.h"
#include "surf/surf.h"
#include "xbt/log.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test,
"Messages specific for surf example");
void test(void)
{
tmgr_history_t history = tmgr_history_new();
- tmgr_trace_t trace_A = tmgr_trace_new("trace_A.txt");
- tmgr_trace_t trace_B = tmgr_trace_new("trace_B.txt");
+ tmgr_trace_t trace_A = tmgr_trace_new_from_file("trace_A.txt");
+ tmgr_trace_t trace_B = tmgr_trace_new_from_file("trace_B.txt");
double next_event_date = -1.0;
double value = -1.0;
char *resource = NULL;
tmgr_history_add_trace(history, trace_B, 0.0, 0, host_B);
while ((next_event_date = tmgr_history_next_date(history)) != -1.0) {
- DEBUG1("%g" " : \n", next_event_date);
+ XBT_DEBUG("%g" " : \n", next_event_date);
while (tmgr_history_get_next_event_leq(history, next_event_date,
&value, (void **) &resource)) {
- DEBUG2("\t %s : " "%g" "\n", resource, value);
+ XBT_DEBUG("\t %s : " "%g" "\n", resource, value);
}
if (next_event_date > 1000)
break;