-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007-2015. 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 <stdio.h>
-#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */
+#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */
#include "surf/surfxml_parse.h" /* to override surf_parse and bypass the parser */
/* Create a log channel to have nice outputs. */
{
static int AX_ptr = 0;
static int surfxml_bufferstack_size = 2048;
-
+ static int surfxml_buffer_stack_stack_ptr = 0;
+ static int surfxml_buffer_stack_stack[1024];
/* allocating memory for the buffer, I think 2kB should be enough */
surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size);
XBT_DEBUG("<host id=\"host A\" power=\"100000000.00\"/>");
SURFXML_BUFFER_SET(host_id, "host A");
SURFXML_BUFFER_SET(host_power, "100000000.00");
+ SURFXML_BUFFER_SET(host_pstate, "0");
SURFXML_BUFFER_SET(host_availability, "1.0");
SURFXML_BUFFER_SET(host_availability___file, "");
SURFXML_BUFFER_SET(host_core, "1");
XBT_DEBUG("<host id=\"host B\" power=\"100000000.00\"/>");
SURFXML_BUFFER_SET(host_id, "host B");
SURFXML_BUFFER_SET(host_power, "100000000.00");
+ SURFXML_BUFFER_SET(host_pstate, "0");
SURFXML_BUFFER_SET(host_availability, "1.0");
SURFXML_BUFFER_SET(host_availability___file, "");
SURFXML_BUFFER_SET(host_core, "1");
double task_comp_size = 0;
double task_comm_size = 0;
int i;
- _XBT_GNUC_UNUSED int read;
+ XBT_ATTRIB_UNUSED int read;
read = sscanf(argv[1], "%d", &number_of_tasks);
xbt_assert(read, "Invalid argument %s\n", argv[1]);
}
}
- { /* Process organisation */
+ { /* Process organization */
slaves_count = argc - 4;
slaves = xbt_new0(msg_host_t, slaves_count);
for (i = 4; i < argc; i++) {
- slaves[i - 4] = MSG_get_host_by_name(argv[i]);
+ slaves[i - 4] = MSG_host_by_name(argv[i]);
if (slaves[i - 4] == NULL) {
- XBT_INFO("Unknown host %s. Stopping Now! ", argv[i]);
+ XBT_INFO("Unknown host %s. Stopping Now!", argv[i]);
abort();
}
}
int a;
a = MSG_task_receive(&task, MSG_host_get_name(MSG_host_self()));
if (a == MSG_OK) {
- XBT_INFO("Received \"%s\" ", MSG_task_get_name(task));
+ XBT_INFO("Received \"%s\"" , MSG_task_get_name(task));
if (MSG_task_get_data(task) == FINALIZE) {
MSG_task_destroy(task);
break;
}
- XBT_INFO("Processing \"%s\" ", MSG_task_get_name(task));
+ XBT_INFO("Processing \"%s\"", MSG_task_get_name(task));
MSG_task_execute(task);
- XBT_INFO("\"%s\" done ", MSG_task_get_name(task));
+ XBT_INFO("\"%s\" done", MSG_task_get_name(task));
MSG_task_destroy(task);
} else {
- XBT_INFO("Hey ?! What's up ? ");
+ XBT_INFO("Hey ?! What's up ?");
xbt_die( "Unexpected behavior");
}
}