+/* Copyright (c) 2012-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 "simgrid/platf_generator.h"
#include "xbt.h"
-#include "msg/msg.h"
+#include "simgrid/msg.h"
#include "xbt/log.h"
XBT_LOG_NEW_DEFAULT_CATEGORY(test_generation,
int master(int argc, char *argv[]);
int slave(int argc, char *argv[]);
-
/** Promoter function
* Just promote each node into a host, with fixed power
*/
s_sg_platf_host_cbarg_t host_parameters;
host_parameters.id = NULL;
- host_parameters.power_peak = 1000000;
-
+ host_parameters.speed_peak = xbt_dynar_new(sizeof(double), NULL);
+ xbt_dynar_push_as(host_parameters.speed_peak, double, 1000000.0);
host_parameters.core_amount = 1;
- host_parameters.power_scale = 1;
- host_parameters.power_trace = NULL;
- host_parameters.initial_state = SURF_RESOURCE_ON;
+ host_parameters.speed_scale = 1;
+ host_parameters.speed_trace = NULL;
+ host_parameters.initiallyOn = 1;
host_parameters.state_trace = NULL;
host_parameters.coord = NULL;
host_parameters.properties = NULL;
link_parameters.bandwidth_trace = NULL;
link_parameters.latency = 0.01;
link_parameters.latency_trace = NULL;
- link_parameters.state = SURF_RESOURCE_ON;
+ link_parameters.initiallyOn = 1;
link_parameters.state_trace = NULL;
link_parameters.policy = SURF_LINK_SHARED;
link_parameters.properties = NULL;
task_comp_size = 2400000*argc;
task_comm_size = 1000000;
- { /* Process organisation */
+ { /* Process organization */
slaves_count = argc;
slaves = xbt_new0(msg_host_t, slaves_count);
for (i = 0; i < argc; i++) {
- slaves[i] = MSG_get_host_by_name(argv[i]);
+ slaves[i] = MSG_host_by_name(argv[i]);
if (slaves[i] == NULL) {
XBT_INFO("Unknown host %s. Stopping Now! ", argv[i]);
abort();
int connected;
int max_tries = 10;
- //MSG initialisation
+ //MSG initialization
MSG_init(&argc, argv);
//Set up the seed for the platform generation
max_tries--;
XBT_INFO("creating links...");
platf_graph_clear_links();
- platf_graph_interconnect_uniform(0.15); //Unrealistic, but simple
- XBT_INFO("done. Check connectivity...");
+ platf_graph_interconnect_uniform(0.07); //Unrealistic, but simple
+ XBT_INFO("done. Check connectedness...");
connected = platf_graph_is_connected();
XBT_INFO("Is it connected : %s", connected ? "yes" : (max_tries ? "no, retrying" : "no"));
} while(!connected && max_tries);
msg_host_t host = NULL;
msg_host_t host_master = NULL;
xbt_dynar_t host_dynar = MSG_hosts_as_dynar();
- char** hostname_list = malloc(sizeof(char*) * xbt_dynar_length(host_dynar));
+ char** hostname_list = xbt_malloc(sizeof(char*) * xbt_dynar_length(host_dynar));
xbt_dynar_foreach(host_dynar, i, host) {
MSG_process_create("slave", slave, NULL, host);