From: Martin Quinson Date: Fri, 5 Feb 2016 23:27:54 +0000 (+0100) Subject: kill platform generation from the C sources X-Git-Tag: v3_13~972 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/6d29c09ea1d296d6a387aedf84b1c0c7084fbbea kill platform generation from the C sources This should be reimplemented in Lua anyway. It was not tested, and I stumbled upon it during another refactoring and got upset. RIP. --- diff --git a/examples/msg/bittorrent/CMakeLists.txt b/examples/msg/bittorrent/CMakeLists.txt index f4c0b9c334..fdba1af671 100644 --- a/examples/msg/bittorrent/CMakeLists.txt +++ b/examples/msg/bittorrent/CMakeLists.txt @@ -2,12 +2,9 @@ set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(bittorrent "bittorrent.c" "messages.c" "peer.c" "tracker.c" "connection.c") -add_executable(bittorrent_platfgen - "bittorrent_platfgen.c" "messages.c" "peer.c" "tracker.c" "connection.c") ### Add definitions for compile target_link_libraries(bittorrent simgrid ) -target_link_libraries(bittorrent_platfgen simgrid ) set(tesh_files ${tesh_files} @@ -22,7 +19,6 @@ set(xml_files set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/bittorrent.c - ${CMAKE_CURRENT_SOURCE_DIR}/bittorrent_platfgen.c ${CMAKE_CURRENT_SOURCE_DIR}/bittorrent.h ${CMAKE_CURRENT_SOURCE_DIR}/connection.c ${CMAKE_CURRENT_SOURCE_DIR}/connection.h diff --git a/examples/msg/bittorrent/bittorrent_platfgen.c b/examples/msg/bittorrent/bittorrent_platfgen.c deleted file mode 100644 index 16c0e65569..0000000000 --- a/examples/msg/bittorrent/bittorrent_platfgen.c +++ /dev/null @@ -1,154 +0,0 @@ -/* 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 "bittorrent.h" -#include "peer.h" -#include "tracker.h" -#include -#include -/** - * Bittorrent example launcher, using a generated platform - */ - -static RngStream rng_stream; - -void promoter(context_node_t node); -void labeler(context_edge_t edge); -void create_environment(int node_count); -void dispatch_jobs(double tracker_deadline, double peer_deadline, - double seed_percentage); - -void promoter(context_node_t node) -{ - s_sg_platf_host_cbarg_t host_parameters; - - if (node->degree == 1) { - //We promote only the leaf; as we use a star topology, all the nodes - //will be promoted except the first one, which will be a router with - //every hosts connected on. - host_parameters.id = NULL; - - //Power from 3,000,000 to 10,000,000 - host_parameters.speed_peak = xbt_dynar_new(sizeof(double), NULL); - xbt_dynar_push_as(host_parameters.speed_peak, double, - 7000000 * RngStream_RandU01(rng_stream) + 3000000.0); - host_parameters.core_amount = 1; - 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; - - platf_graph_promote_to_host(node, &host_parameters); - } -} - -void labeler(context_edge_t edge) -{ - - s_sg_platf_link_cbarg_t link_parameters; - link_parameters.id = NULL; - - //bandwidth from 3,000,000 to 10,000,000 - link_parameters.bandwidth = 7000000 * RngStream_RandU01(rng_stream) + 3000000; - link_parameters.bandwidth_trace = NULL; - - //Latency from 0ms to 100ms - link_parameters.latency = RngStream_RandU01(rng_stream) / 10.0; - link_parameters.latency_trace = NULL; - link_parameters.initiallyOn = 1; - link_parameters.state_trace = NULL; - link_parameters.policy = SURF_LINK_SHARED; - link_parameters.properties = NULL; - - platf_graph_link_label(edge, &link_parameters); -} - -void create_environment(int node_count) -{ - - platf_graph_uniform(node_count); - - //every nodes are connected to the first one - platf_graph_interconnect_star(); - //No need to check if the graph is connected, the star topology implies it. - - //register promoter and labeler - platf_graph_promoter(promoter); - platf_graph_labeler(labeler); - - //promoting and labeling - platf_do_promote(); - platf_do_label(); - - //Put the platform into the simulator - platf_generate(); -} - -void dispatch_jobs(double tracker_deadline, double peer_deadline, - double seed_percentage) -{ - - xbt_dynar_t available_nodes = MSG_hosts_as_dynar(); - msg_host_t host; - unsigned int i; - - char **arguments_tracker; - char **arguments_peer; - - unsigned int seed_count = - (seed_percentage / 100.0) * xbt_dynar_length(available_nodes); - - xbt_dynar_foreach(available_nodes, i, host) { - if (i == 0) { - //The fisrt node is the tracker - arguments_tracker = xbt_malloc0(sizeof(char *) * 2); - arguments_tracker[0] = xbt_strdup("tracker"); - arguments_tracker[1] = bprintf("%f", tracker_deadline); - MSG_process_create_with_arguments("tracker", tracker, NULL, host, 2, - arguments_tracker); - } else { - //Other nodes are peers - int argument_size; - arguments_peer = xbt_malloc0(sizeof(char *) * 4); - arguments_peer[0] = xbt_strdup("peer"); - arguments_peer[1] = bprintf("%d", i); - arguments_peer[2] = bprintf("%f", peer_deadline); - - //The first peers will be seeders - if (seed_count > 0) { - seed_count--; - arguments_peer[3] = xbt_strdup("1"); - argument_size = 4; - } else { - //Other ars leechers - arguments_peer[3] = NULL; - argument_size = 3; - } - MSG_process_create_with_arguments("peer", peer, NULL, host, - argument_size, arguments_peer); - } - } -} - -int main(int argc, char *argv[]) -{ - MSG_init(&argc, argv); - - rng_stream = RngStream_CreateStream(NULL); - - //Maybe these parameters should be set from the command line... - //create_environment() - create_environment(20); - - //dispatch_jobs(, , ) - dispatch_jobs(2000, 2000, 10); - - MSG_main(); - - return 0; -} diff --git a/include/simgrid/platf_generator.h b/include/simgrid/platf_generator.h deleted file mode 100644 index fbe912c3fa..0000000000 --- a/include/simgrid/platf_generator.h +++ /dev/null @@ -1,83 +0,0 @@ - -/* platf_generator.h - Public interface to the SimGrid platforms generator */ - -/* Copyright (c) 2004-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. */ - -#ifndef SG_PLATF_GEN_H -#define SG_PLATF_GEN_H - -#include "xbt.h" -#include "xbt/graph.h" //Only for platf_graph_get() -#include "platf.h" - -typedef enum { - ROUTER, - HOST, - CLUSTER -} e_platf_node_kind; - -typedef struct s_context_node_t { - unsigned long id; - double x, y; - int degree; - e_platf_node_kind kind; - int connect_checked; - union { - s_sg_platf_host_cbarg_t host_parameters; - s_sg_platf_cluster_cbarg_t cluster_parameters; - char* router_id; - }; -} s_context_node_t, *context_node_t; - -typedef struct s_context_edge_t { - unsigned long id; - double length; - int labeled; - s_sg_platf_link_cbarg_t link_parameters; -} s_context_edge_t, *context_edge_t; - -typedef void (*platf_promoter_cb_t) (context_node_t); -typedef void (*platf_labeler_cb_t) (context_edge_t); - -XBT_PUBLIC(void) platf_random_seed(unsigned long seed[6]); - -XBT_PUBLIC(void) platf_graph_uniform(unsigned long node_count); -XBT_PUBLIC(void) platf_graph_heavytailed(unsigned long node_count); - -XBT_PUBLIC(void) platf_graph_interconnect_star(void); -XBT_PUBLIC(void) platf_graph_interconnect_line(void); -XBT_PUBLIC(void) platf_graph_interconnect_ring(void); -XBT_PUBLIC(void) platf_graph_interconnect_clique(void); -XBT_PUBLIC(void) platf_graph_interconnect_uniform(double alpha); -XBT_PUBLIC(void) platf_graph_interconnect_exponential(double alpha); -XBT_PUBLIC(void) platf_graph_interconnect_zegura(double alpha, double beta, double r); -XBT_PUBLIC(void) platf_graph_interconnect_waxman(double alpha, double beta); -XBT_PUBLIC(void) platf_graph_interconnect_barabasi(void); - -XBT_PUBLIC(int) platf_graph_is_connected(void); - -XBT_PUBLIC(void) platf_graph_clear_links(void); - -XBT_PUBLIC(void) platf_graph_promote_to_host(context_node_t node, sg_platf_host_cbarg_t parameters); -XBT_PUBLIC(void) platf_graph_promote_to_cluster(context_node_t node, sg_platf_cluster_cbarg_t parameters); - -XBT_PUBLIC(void) platf_graph_link_label(context_edge_t edge, sg_platf_link_cbarg_t parameters); - -XBT_PUBLIC(void) platf_graph_promoter(platf_promoter_cb_t promoter_callback); -XBT_PUBLIC(void) platf_graph_labeler(platf_labeler_cb_t labeler_callback); - -XBT_PUBLIC(void) platf_do_promote(void); -XBT_PUBLIC(void) platf_do_label(void); - -XBT_PUBLIC(void) platf_generate(void); - -// WARNING : Only for debbugging ; should be removed when platform -// generation works correctly -XBT_PUBLIC(xbt_graph_t) platf_graph_get(void); - -#endif /* SG_PLATF_GEN_H */ - diff --git a/src/include/surf/random_mgr.h b/src/include/surf/random_mgr.h deleted file mode 100644 index 19b4a15a58..0000000000 --- a/src/include/surf/random_mgr.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright (c) 2007-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. */ - -#ifndef _SURF_RMGR_H -#define _SURF_RMGR_H - -#include "xbt/heap.h" -#include "xbt/dict.h" - -SG_BEGIN_DECL() - -typedef enum { NONE, DRAND48, RAND, RNGSTREAM } e_random_generator_t; - -typedef struct random_data_desc { - long int seed; - double max, min; - double mean, std; /* note: mean and standard deviation are normalized */ - e_random_generator_t generator; -} s_random_data_t, *random_data_t; - -XBT_PUBLIC_DATA(xbt_dict_t) random_data_list; - -XBT_PUBLIC(double) random_generate(random_data_t random); -XBT_PUBLIC(random_data_t) random_new(e_random_generator_t generator, - long int seed, - double min, double max, double mean, - double stdDeviation); - -SG_END_DECL() -#endif /* _SURF_RMGR_H */ diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp index 8ad621d2bc..71ceece2f8 100644 --- a/src/surf/network_constant.cpp +++ b/src/surf/network_constant.cpp @@ -5,7 +5,6 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "network_constant.hpp" -#include "surf/random_mgr.h" #include "host_interface.hpp" #include "src/surf/platform.hpp" diff --git a/src/surf/platf_generator.c b/src/surf/platf_generator.c deleted file mode 100644 index 65c9a3dc81..0000000000 --- a/src/surf/platf_generator.c +++ /dev/null @@ -1,743 +0,0 @@ -/* Copyright (c) 2012, 2014-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 "platf_generator_private.h" -#include "xbt.h" -#include "xbt/RngStream.h" -#include "surf/simgrid_dtd.h" -#include "surf_private.h" -#include - -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(platf_generator, surf, "Platform Generator"); - -static xbt_graph_t platform_graph = NULL; -static xbt_dynar_t promoter_dynar = NULL; -static xbt_dynar_t labeler_dynar = NULL; - -static RngStream rng_stream = NULL; - -static unsigned long last_link_id = 0; - -xbt_graph_t platf_graph_get(void) { - // We need some debug, so let's add this function - // WARNING : should be removed when it becomes useless - return platform_graph; -} - -/** - * \brief Set the seed of the platform generator RngStream - * - * This RngStream is used to generate all the random values needed to - * generate the platform - * - * \param seed A array of six integer; if NULL, the default seed will be used. - */ -void platf_random_seed(unsigned long seed[6]) { - - if(rng_stream == NULL) { - //stream not created yet, we do it now - rng_stream = RngStream_CreateStream(NULL); - } - if(seed != NULL) { - RngStream_SetSeed(rng_stream, seed); - } -} - -/** - * \brief Initialize the platform generator - * - * This function create the graph and add node_count nodes to it - * \param node_count The number of nodes of the platform - */ -void platf_graph_init(unsigned long node_count) { - unsigned long i; - platform_graph = xbt_graph_new_graph(FALSE, NULL); - if(rng_stream == NULL) { - rng_stream = RngStream_CreateStream(NULL); - } - - for(i=0 ; iid = i+1; - node_data->x = 0; - node_data->y = 0; - node_data->degree = 0; - node_data->kind = ROUTER; - node_data->connect_checked = FALSE; - xbt_graph_new_node(platform_graph, (void*) node_data); - } - - last_link_id = 0; - -} - -/** - * \brief Connect two nodes - * \param node1 The first node to connect - * \param node2 The second node to connect - */ -void platf_node_connect(xbt_node_t node1, xbt_node_t node2) { - context_node_t node1_data; - context_node_t node2_data; - node1_data = (context_node_t) xbt_graph_node_get_data(node1); - node2_data = (context_node_t) xbt_graph_node_get_data(node2); - node1_data->degree++; - node2_data->degree++; - - context_edge_t edge_data = NULL; - edge_data = xbt_new0(s_context_edge_t, 1); - edge_data->id = ++last_link_id; - edge_data->length = platf_node_distance(node1, node2); - edge_data->labeled = FALSE; - xbt_graph_new_edge(platform_graph, node1, node2, (void*)edge_data); -} - -/** - * \brief Compute the distance between two nodes - * \param node1 The first node - * \param node2 The second node - * \return The distance between node1 and node2 - */ -double platf_node_distance(xbt_node_t node1, xbt_node_t node2) { - context_node_t node1_data; - context_node_t node2_data; - double delta_x; - double delta_y; - double distance; - node1_data = (context_node_t) xbt_graph_node_get_data(node1); - node2_data = (context_node_t) xbt_graph_node_get_data(node2); - delta_x = node1_data->x - node2_data->x; - delta_y = node1_data->y - node2_data->y; - distance = sqrt(delta_x*delta_x + delta_y*delta_y); - return distance; -} - -/** - * \brief Initialize the platform, placing nodes uniformly on the unit square - * \param node_count The number of node - */ -void platf_graph_uniform(unsigned long node_count) { - xbt_dynar_t dynar_nodes = NULL; - xbt_node_t graph_node = NULL; - context_node_t node_data = NULL; - unsigned int i; - platf_graph_init(node_count); - dynar_nodes = xbt_graph_get_nodes(platform_graph); - xbt_dynar_foreach(dynar_nodes, i, graph_node) { - node_data = (context_node_t) xbt_graph_node_get_data(graph_node); - node_data->x = RngStream_RandU01(rng_stream); - node_data->y = RngStream_RandU01(rng_stream); - } -} - -/** - * \brief Initialize the platform, placing nodes in little clusters on the unit square - * \param node_count The number of node - */ -void platf_graph_heavytailed(unsigned long node_count) { - xbt_dynar_t dynar_nodes = NULL; - xbt_node_t graph_node = NULL; - context_node_t node_data = NULL; - unsigned int i; - platf_graph_init(node_count); - dynar_nodes = xbt_graph_get_nodes(platform_graph); - xbt_dynar_foreach(dynar_nodes, i, graph_node) { - node_data = (context_node_t) xbt_graph_node_get_data(graph_node); - node_data->x = random_pareto(0, 1, 1.0/*K*/, 10e9/*P*/, 1.0/*alpha*/); - node_data->y = random_pareto(0, 1, 1.0/*K*/, 10e9/*P*/, 1.0/*alpha*/); - } -} - -/** - * \brief Creates a simple topology where all nodes are connected to the first one in a star fashion - */ -void platf_graph_interconnect_star(void) { - xbt_dynar_t dynar_nodes = NULL; - xbt_node_t graph_node = NULL; - xbt_node_t first_node = NULL; - unsigned int i; - - dynar_nodes = xbt_graph_get_nodes(platform_graph); - xbt_dynar_foreach(dynar_nodes, i, graph_node) { - if(i==0) { - //Ok, we get the first node, let's keep it somewhere... - first_node = graph_node; - } else { - //All the other nodes are connected to the first one - platf_node_connect(graph_node, first_node); - } - } -} - -/** - * \brief Creates a simple topology where all nodes are connected in line - */ -void platf_graph_interconnect_line(void) { - xbt_dynar_t dynar_nodes = NULL; - xbt_node_t graph_node = NULL; - xbt_node_t old_node = NULL; - unsigned int i; - - dynar_nodes = xbt_graph_get_nodes(platform_graph); - xbt_dynar_foreach(dynar_nodes, i, graph_node) { - if(old_node != NULL) { - platf_node_connect(graph_node, old_node); - } - old_node = graph_node; - } -} - -/** - * \brief Create a simple topology where all nodes are connected along a ring - */ -void platf_graph_interconnect_ring(void) { - xbt_dynar_t dynar_nodes = NULL; - xbt_node_t graph_node = NULL; - xbt_node_t old_node = NULL; - xbt_node_t first_node = NULL; - unsigned int i; - - dynar_nodes = xbt_graph_get_nodes(platform_graph); - xbt_dynar_foreach(dynar_nodes, i, graph_node) { - if(i == 0) { - // this is the first node, let's keep it somewhere - first_node = graph_node; - } else { - //connect each node to the previous one - platf_node_connect(graph_node, old_node); - } - old_node = graph_node; - } - //we still have to connect the first and the last node together - platf_node_connect(first_node, graph_node); -} - -/** - * \brief Create a simple topology where all nodes are connected to each other, in a clique manner - */ -void platf_graph_interconnect_clique(void) { - xbt_dynar_t dynar_nodes = NULL; - xbt_node_t first_node = NULL; - xbt_node_t second_node = NULL; - unsigned int i,j; - - dynar_nodes = xbt_graph_get_nodes(platform_graph); - xbt_dynar_foreach(dynar_nodes, i, first_node) { - xbt_dynar_foreach(dynar_nodes, j, second_node) { - if(j>=i) - break; - platf_node_connect(first_node, second_node); - } - } -} - -/** - * \brief Creates a topology where the probability to connect two nodes is uniform (unrealistic, but simple) - * \param alpha Probability for two nodes to get connected - */ -void platf_graph_interconnect_uniform(double alpha) { - xbt_dynar_t dynar_nodes = NULL; - xbt_node_t first_node = NULL; - xbt_node_t second_node = NULL; - unsigned int i,j; - - dynar_nodes = xbt_graph_get_nodes(platform_graph); - xbt_dynar_foreach(dynar_nodes, i, first_node) { - xbt_dynar_foreach(dynar_nodes, j, second_node) { - if(j>=i) - break; - if(RngStream_RandU01(rng_stream) < alpha) { - platf_node_connect(first_node, second_node); - } - } - } -} - -/** - * \brief Create a topology where the probability follows an exponential law - * \param alpha Number of edges increases with alpha - */ -void platf_graph_interconnect_exponential(double alpha) { - xbt_dynar_t dynar_nodes = NULL; - xbt_node_t first_node = NULL; - xbt_node_t second_node = NULL; - unsigned int i,j; - double L = sqrt(2.0); /* L = c*sqrt(2); c=side of placement square */ - dynar_nodes = xbt_graph_get_nodes(platform_graph); - xbt_dynar_foreach(dynar_nodes, i, first_node) { - xbt_dynar_foreach(dynar_nodes, j, second_node) { - if(j>=i) - break; - double d = platf_node_distance(first_node, second_node); - if(RngStream_RandU01(rng_stream) < alpha*exp(-d/(L-d))) { - platf_node_connect(first_node, second_node); - } - } - } -} - -/** - * \brief Create a topology where the probability follows the model of Waxman - * - * see Waxman, Routing of Multipoint Connections, IEEE J. on Selected Areas in Comm., 1988 - * - * \param alpha Number of edges increases with alpha - * \param beta Edge length heterogeneity increases with beta - */ -void platf_graph_interconnect_waxman(double alpha, double beta) { - xbt_dynar_t dynar_nodes = NULL; - xbt_node_t first_node = NULL; - xbt_node_t second_node = NULL; - unsigned int i,j; - double L = sqrt(2.0); /* L = c*sqrt(2); c=side of placement square */ - dynar_nodes = xbt_graph_get_nodes(platform_graph); - xbt_dynar_foreach(dynar_nodes, i, first_node) { - xbt_dynar_foreach(dynar_nodes, j, second_node) { - if(j>=i) - break; - double d = platf_node_distance(first_node, second_node); - if(RngStream_RandU01(rng_stream) < alpha*exp(-d/(L*beta))) { - platf_node_connect(first_node, second_node); - } - } - } -} - -/** - * \brief Create a topology where the probability follows the model of Zegura - * see Zegura, Calvert, Donahoo, A quantitative comparison of graph-based models - * for Internet topology, IEEE/ACM Transactions on Networking, 1997. - * - * \param alpha Probability of connexion for short edges - * \param beta Probability of connexion for long edges - * \param r Limit between long and short edges (between 0 and sqrt(2) since nodes are placed on the unit square) - */ -void platf_graph_interconnect_zegura(double alpha, double beta, double r) { - xbt_dynar_t dynar_nodes = NULL; - xbt_node_t first_node = NULL; - xbt_node_t second_node = NULL; - unsigned int i,j; - dynar_nodes = xbt_graph_get_nodes(platform_graph); - xbt_dynar_foreach(dynar_nodes, i, first_node) { - xbt_dynar_foreach(dynar_nodes, j, second_node) { - if(j>=i) - break; - double d = platf_node_distance(first_node, second_node); - double proba = d < r ? alpha : beta; - if(RngStream_RandU01(rng_stream) < proba) { - platf_node_connect(first_node, second_node); - } - } - } -} - -/** - * \brief Create a topology constructed according to the Barabasi-Albert algorithm (follows power laws) - * see Barabasi and Albert, Emergence of scaling in random networks, Science 1999, num 59, p509­-512. - */ -void platf_graph_interconnect_barabasi(void) { - xbt_dynar_t dynar_nodes = NULL; - xbt_node_t first_node = NULL; - xbt_node_t second_node = NULL; - context_node_t node_data = NULL; - unsigned int i,j; - unsigned long sum = 0; - dynar_nodes = xbt_graph_get_nodes(platform_graph); - xbt_dynar_foreach(dynar_nodes, i, first_node) { - xbt_dynar_foreach(dynar_nodes, j, second_node) { - if(j>=i) - break; - node_data = xbt_graph_node_get_data(second_node); - if(sum==0 || RngStream_RandU01(rng_stream) < ((double)(node_data->degree)/ (double)sum)) { - platf_node_connect(first_node, second_node); - sum += 2; - } - } - } -} - -/** - * \brief Check if the produced graph is connected - * - * You should check if the produced graph is connected before doing anything - * on it. You probably don't want any isolated node or group of nodes... - * - * \return TRUE if the graph is connected, FALSE otherwise - */ -int platf_graph_is_connected(void) { - xbt_dynar_t dynar_nodes = NULL; - xbt_dynar_t connected_nodes = NULL; - xbt_dynar_t outgoing_edges = NULL; - xbt_node_t graph_node = NULL; - context_node_t node_data = NULL; - xbt_edge_t outedge = NULL; - unsigned long iterator; - unsigned int i; - dynar_nodes = xbt_graph_get_nodes(platform_graph); - connected_nodes = xbt_dynar_new(sizeof(xbt_node_t), NULL); - - //Let's just check if every nodes are connected to something - xbt_dynar_foreach(dynar_nodes, i, graph_node) { - node_data = xbt_graph_node_get_data(graph_node); - if(node_data->degree==0) { - return FALSE; - } - } - - //We still need a real check - //Initialize the connected node array with the first node - xbt_dynar_get_cpy(dynar_nodes, 0, &graph_node); - node_data = xbt_graph_node_get_data(graph_node); - node_data->connect_checked = TRUE; - xbt_dynar_push(connected_nodes, &graph_node); - iterator = 0; - do { - //Get the next node - xbt_dynar_get_cpy(connected_nodes, iterator, &graph_node); - - //add all the linked nodes to the connected node array - outgoing_edges = xbt_graph_node_get_outedges(graph_node); - xbt_dynar_foreach(outgoing_edges, i, outedge) { - xbt_node_t src = xbt_graph_edge_get_source(outedge); - xbt_node_t dst = xbt_graph_edge_get_target(outedge); - node_data = xbt_graph_node_get_data(src); - if(!node_data->connect_checked) { - xbt_dynar_push(connected_nodes, &src); - node_data->connect_checked = TRUE; - } - node_data = xbt_graph_node_get_data(dst); - if(!node_data->connect_checked) { - xbt_dynar_push(connected_nodes, &dst); - node_data->connect_checked = TRUE; - } - } - } while(++iterator < xbt_dynar_length(connected_nodes)); - - // The graph is connected if the connected node array has the same length - // as the graph node array - return xbt_dynar_length(connected_nodes) == xbt_dynar_length(dynar_nodes); -} - - -/** - * \brief Remove the links in the created topology - * - * This is useful when the created topology is not connected, and you want - * to generate a new one. - */ -void platf_graph_clear_links(void) { - xbt_dynar_t dynar_nodes = NULL; - xbt_dynar_t dynar_edges = NULL; - xbt_dynar_t dynar_edges_cpy = NULL; - xbt_node_t graph_node = NULL; - xbt_edge_t graph_edge = NULL; - context_node_t node_data = NULL; - unsigned int i; - - //The graph edge dynar will be modified directly, so we work on a copy of it - dynar_edges = xbt_graph_get_edges(platform_graph); - dynar_edges_cpy = xbt_dynar_new(sizeof(xbt_edge_t), NULL); - xbt_dynar_foreach(dynar_edges, i, graph_edge) { - xbt_dynar_push_as(dynar_edges_cpy, xbt_edge_t, graph_edge); - } - //Delete edges from the graph - xbt_dynar_foreach(dynar_edges_cpy, i, graph_edge) { - xbt_graph_free_edge(platform_graph, graph_edge, xbt_free_f); - } - //remove the dynar copy - xbt_dynar_free(&dynar_edges_cpy); - - //All the nodes will be of degree 0, unchecked from connectedness - dynar_nodes = xbt_graph_get_nodes(platform_graph); - xbt_dynar_foreach(dynar_nodes, i, graph_node) { - node_data = xbt_graph_node_get_data(graph_node); - node_data->degree = 0; - node_data->connect_checked = FALSE; - } -} - -/** - * \brief Promote a node to a host - * - * This function should be called in callbacks registered with the - * platf_graph_promoter function. - * - * \param node The node to promote - * \param parameters The parameters needed to build the host - */ -void platf_graph_promote_to_host(context_node_t node, sg_platf_host_cbarg_t parameters) { - node->kind = HOST; - memcpy(&(node->host_parameters), parameters, sizeof(s_sg_platf_host_cbarg_t)); -} - -/** - * \brief Promote a node to a cluster - * - * This function should be called in callbacks registered with the - * platf_graph_promoter function. - * - * \param node The node to promote - * \param parameters The parameters needed to build the cluster - */ -void platf_graph_promote_to_cluster(context_node_t node, sg_platf_cluster_cbarg_t parameters) { - node->kind = CLUSTER; - memcpy(&(node->cluster_parameters), parameters, sizeof(s_sg_platf_cluster_cbarg_t)); -} - -/** - * \brief Set the parameters of a network link. - * - * This function should be called in callbacks registered with the - * platf_graph_labeler function. - * - * \param edge The edge to modify - * \param parameters The parameters of the network link - */ -void platf_graph_link_label(context_edge_t edge, sg_platf_link_cbarg_t parameters) { - memcpy(&(edge->link_parameters), parameters, sizeof(s_sg_platf_link_cbarg_t)); - edge->labeled = TRUE; -} - -/** - * \brief Register a callback to promote nodes - * - * The best way to promote nodes into host or cluster is to write a function - * which takes one parameter, a #context_node_t, make every needed test on - * it, and call platf_graph_promote_to_host or platf_graph_promote_to_cluster - * if needed. Then, register the function with this one. - * You can register several callbacks: the first registered function will be - * called first. If the node have not been promoted yet, the second function - * will be called, and so on... - * - * \param promoter_callback The callback function - */ -void platf_graph_promoter(platf_promoter_cb_t promoter_callback) { - if(promoter_dynar == NULL) { - promoter_dynar = xbt_dynar_new(sizeof(platf_promoter_cb_t), NULL); - } - xbt_dynar_push(promoter_dynar, &promoter_callback); -} - -/** - * \brief Register a callback to label links - * - * Like the node promotion, it is better, to set links, to write a function - * which take one parameter, a #context_edge_t, make every needed test on - * it, and call platf_graph_link_label if needed. - * You can register several callbacks: the first registered function will be - * called first. If the link have not been labeled yet, the second function - * will be called, and so on... All the links must have been labeled after - * all the calls. - * - * \param labeler_callback The callback function - */ -void platf_graph_labeler(platf_labeler_cb_t labeler_callback) { - if(labeler_dynar == NULL) { - labeler_dynar = xbt_dynar_new(sizeof(void*), NULL); - } - xbt_dynar_push(labeler_dynar, &labeler_callback); -} - -/** - * \brief Call the registered promoters on all nodes - * - * The promoters are called on all nodes, in the order of their registration - * If some nodes are not promoted, they will be routers - */ -void platf_do_promote(void) { - platf_promoter_cb_t promoter_callback; - xbt_node_t graph_node = NULL; - xbt_dynar_t dynar_nodes = NULL; - context_node_t node = NULL; - unsigned int i, j; - dynar_nodes = xbt_graph_get_nodes(platform_graph); - xbt_dynar_foreach(dynar_nodes, i, graph_node) { - node = (context_node_t) xbt_graph_node_get_data(graph_node); - xbt_dynar_foreach(promoter_dynar, j, promoter_callback) { - if(node->kind != ROUTER) - break; - promoter_callback(node); - } - } -} - -/** - * \brief Call the registered labelers on all links - */ -void platf_do_label(void) { - platf_labeler_cb_t labeler_callback; - xbt_edge_t graph_edge = NULL; - xbt_dynar_t dynar_edges = NULL; - context_edge_t edge = NULL; - unsigned int i, j; - dynar_edges = xbt_graph_get_edges(platform_graph); - xbt_dynar_foreach(dynar_edges, i, graph_edge) { - edge = (context_edge_t) xbt_graph_edge_get_data(graph_edge); - xbt_dynar_foreach(labeler_dynar, j, labeler_callback) { - if(edge->labeled) - break; - labeler_callback(edge); - } - if(!edge->labeled) { - XBT_ERROR("All links of the generated platform are not labeled."); - xbt_die("Please check your generation parameters."); - } - } -} - -/** - * \brief putting into SURF the generated platform - * - * This function should be called when the generation is over and the platform - * is ready to be put in place in SURF. All the init function, like MSG_init, - * must have been called before, or this function will not do anything. - * After that function, it should be possible to list all the available hosts - * with the provided functions. - */ -void platf_generate(void) { - - xbt_dynar_t nodes = NULL; - xbt_node_t graph_node = NULL; - context_node_t node_data = NULL; - xbt_dynar_t edges = NULL; - xbt_edge_t graph_edge = NULL; - context_edge_t edge_data = NULL; - unsigned int i; - - unsigned int last_host = 0; - unsigned int last_router = 0; - unsigned int last_cluster = 0; - - sg_platf_host_cbarg_t host_parameters; - sg_platf_cluster_cbarg_t cluster_parameters; - sg_platf_link_cbarg_t link_parameters; - s_sg_platf_router_cbarg_t router_parameters = SG_PLATF_ROUTER_INITIALIZER; /* This one is not a pointer! */ - s_sg_platf_route_cbarg_t route_parameters = SG_PLATF_ROUTE_INITIALIZER; /* neither this one! */ - - router_parameters.coord = NULL; - route_parameters.symmetrical = FALSE; - route_parameters.src = NULL; - route_parameters.dst = NULL; - route_parameters.gw_dst = NULL; - route_parameters.gw_src = NULL; - route_parameters.link_list = NULL; - - nodes = xbt_graph_get_nodes(platform_graph); - edges = xbt_graph_get_edges(platform_graph); - - sg_platf_begin(); - surf_parse_init_callbacks(); - routing_register_callbacks(); - - s_sg_platf_AS_cbarg_t AS = SG_PLATF_AS_INITIALIZER; - AS.id = "random platform"; - AS.routing = A_surfxml_AS_routing_Floyd; - sg_platf_new_AS_begin(&AS); - - //Generate hosts, clusters and routers - xbt_dynar_foreach(nodes, i, graph_node) { - node_data = xbt_graph_node_get_data(graph_node); - switch(node_data->kind) { - case HOST: - host_parameters = &node_data->host_parameters; - last_host++; - if(host_parameters->id == NULL) { - host_parameters->id = bprintf("host-%d", last_host); - } - sg_platf_new_host(host_parameters); - break; - case CLUSTER: - cluster_parameters = &node_data->cluster_parameters; - last_cluster++; - if(cluster_parameters->prefix == NULL) { - cluster_parameters->prefix = "host-"; - } - if(cluster_parameters->suffix == NULL) { - cluster_parameters->suffix = bprintf(".cluster-%d", last_cluster); - } - if(cluster_parameters->id == NULL) { - cluster_parameters->id = bprintf("cluster-%d", last_cluster); - } - sg_platf_new_cluster(cluster_parameters); - break; - case ROUTER: - node_data->router_id = bprintf("router-%d", ++last_router); - router_parameters.id = node_data->router_id; - sg_platf_new_router(&router_parameters); - break; - } - } - - //Generate links and routes - xbt_dynar_foreach(edges, i, graph_edge) { - xbt_node_t src = xbt_graph_edge_get_source(graph_edge); - xbt_node_t dst = xbt_graph_edge_get_target(graph_edge); - context_node_t src_data = xbt_graph_node_get_data(src); - context_node_t dst_data = xbt_graph_node_get_data(dst); - edge_data = xbt_graph_edge_get_data(graph_edge); - const char* temp = NULL; - - //Add a link to the platform - link_parameters = &edge_data->link_parameters; - if(link_parameters->id == NULL) { - link_parameters->id = bprintf("link-%ld", edge_data->id); - } - sg_platf_new_link(link_parameters); - - //Add a route matching this link - switch(src_data->kind) { - case ROUTER: - route_parameters.src = src_data->router_id; - break; - case CLUSTER: - route_parameters.src = src_data->cluster_parameters.id; - break; - case HOST: - route_parameters.src = src_data->host_parameters.id; - break; - } - switch(dst_data->kind) { - case ROUTER: - route_parameters.dst = dst_data->router_id; - break; - case CLUSTER: - route_parameters.dst = dst_data->cluster_parameters.id; - break; - case HOST: - route_parameters.dst = dst_data->host_parameters.id; - break; - } - sg_platf_route_begin(&route_parameters); - sg_platf_route_add_link(link_parameters->id, &route_parameters); - sg_platf_route_end(&route_parameters); - - //Create the symmertical route - temp = route_parameters.dst; - route_parameters.dst = route_parameters.src; - route_parameters.src = temp; - sg_platf_route_begin(&route_parameters); - sg_platf_route_add_link(link_parameters->id, &route_parameters); - sg_platf_route_end(&route_parameters); - } - - sg_platf_new_AS_end(); - sg_platf_end(); -} - -/* Functions used to generate interesting random values */ - -double random_pareto(double min, double max, double K, double P, double ALPHA) { - double x = RngStream_RandU01(rng_stream); - double den = pow(1.0 - x + x*pow(K/P, ALPHA), 1.0/ALPHA); - double res = (1/den); - res += min - 1; // pareto is on [1, infinity) by default - if (res>max) { - return max; - } - return res; -} diff --git a/src/surf/platf_generator_private.h b/src/surf/platf_generator_private.h deleted file mode 100644 index ea57365992..0000000000 --- a/src/surf/platf_generator_private.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright (c) 2012, 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. */ - -#ifndef SG_PLATF_GEN_PRIVATE_H -#define SG_PLATF_GEN_PRIVATE_H - -#include - -#include "xbt/graph.h" -#include "simgrid/platf.h" - -XBT_PRIVATE void platf_graph_init(unsigned long node_count); - -XBT_PRIVATE void platf_node_connect(xbt_node_t node1, xbt_node_t node2); - -XBT_PRIVATE double platf_node_distance(xbt_node_t node1, xbt_node_t node2); - -XBT_PRIVATE double random_pareto(double min, double max, double K, double P, double ALPHA); - -#endif /* SG_PLATF_GEN_PRIVATE_H */ diff --git a/src/surf/random_mgr.c b/src/surf/random_mgr.c deleted file mode 100644 index 39fe6e2499..0000000000 --- a/src/surf/random_mgr.c +++ /dev/null @@ -1,290 +0,0 @@ -/* Copyright (c) 2007-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 "surf/random_mgr.h" -#include "xbt/sysdep.h" -#include "src/internal_config.h" /*_XBT_WIN32*/ -#include -#include - -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(random, surf, "Random part of surf"); - -#ifdef _XBT_WIN32 - -static unsigned int _seed = 2147483647; - -#ifdef __VISUALC__ -typedef unsigned __int64 uint64_t; -typedef unsigned int uint32_t; -#endif - -struct drand48_data { - unsigned short int __x[3]; /* Current state. */ - unsigned short int __old_x[3]; /* Old state. */ - unsigned short int __c; /* Additive const. in congruential formula. */ - unsigned short int __init; /* Flag for initializing. */ - unsigned long long int __a; /* Factor in congruential formula. */ -}; - -static struct drand48_data __libc_drand48_data = { 0 }; - -union ieee754_double { - double d; - - /* This is the IEEE 754 double-precision format. */ - struct { - /* Together these comprise the mantissa. */ - unsigned int mantissa1:32; - unsigned int mantissa0:20; - unsigned int exponent:11; - unsigned int negative:1; - /* Little endian. */ - } ieee; - - /* This format makes it easier to see if a NaN is a signalling NaN. */ - struct { - /* Together these comprise the mantissa. */ - unsigned int mantissa1:32; - unsigned int mantissa0:19; - unsigned int quiet_nan:1; - unsigned int exponent:11; - unsigned int negative:1; - - } ieee_nan; -}; - -#define IEEE754_DOUBLE_BIAS 0x3ff /* Added to exponent. */ - -double drand48(void); - -int -_drand48_iterate(unsigned short int xsubi[3], struct drand48_data *buffer); - -int -_erand48_r(unsigned short int xsubi[3], struct drand48_data *buffer, - double *result); - - -int -_erand48_r(unsigned short int xsubi[3], struct drand48_data *buffer, - double *result) -{ - union ieee754_double temp; - - /* Compute next state. */ - if (_drand48_iterate(xsubi, buffer) < 0) - return -1; - - /* Construct a positive double with the 48 random bits distributed over - its fractional part so the resulting FP number is [0.0,1.0). */ - - temp.ieee.negative = 0; - temp.ieee.exponent = IEEE754_DOUBLE_BIAS; - temp.ieee.mantissa0 = (xsubi[2] << 4) | (xsubi[1] >> 12); - temp.ieee.mantissa1 = ((xsubi[1] & 0xfff) << 20) | (xsubi[0] << 4); - - /* Please note the lower 4 bits of mantissa1 are always 0. */ - *result = temp.d - 1.0; - - return 0; -} - -int _drand48_iterate(unsigned short int xsubi[3], - struct drand48_data *buffer) -{ - uint64_t X; - uint64_t result; - - /* Initialize buffer, if not yet done. */ - - if (buffer->__init == 0) { - buffer->__a = 0x5deece66dull; - buffer->__c = 0xb; - buffer->__init = 1; - } - - /* Do the real work. We choose a data type which contains at least - 48 bits. Because we compute the modulus it does not care how - many bits really are computed. */ - - X = (uint64_t) xsubi[2] << 32 | (uint32_t) xsubi[1] << 16 | xsubi[0]; - - result = X * buffer->__a + buffer->__c; - - - xsubi[0] = result & 0xffff; - xsubi[1] = (result >> 16) & 0xffff; - xsubi[2] = (result >> 32) & 0xffff; - - return 0; -} - -double _drand48(void); -void _srand(unsigned int seed); -int _rand(void); -int _rand_r(unsigned int *pseed); - -double _drand48(void) -{ - double result; - - (void) _erand48_r(__libc_drand48_data.__x, &__libc_drand48_data, - &result); - - return result; -} - -void _srand(unsigned int seed) -{ - _seed = seed; -} - -int _rand(void) -{ - const long a = 16807; - const long m = 2147483647; - const long q = 127773; /* (m/a) */ - const long r = 2836; /* (m%a) */ - - long lo, k, s; - - s = (long) _seed; - - k = (long) (s / q); - - lo = (s - q * k); - - s = a * lo - r * k; - - if (s <= 0) - s += m; - - _seed = (int) (s & RAND_MAX); - - return _seed; -} - -int _rand_r(unsigned int *pseed) -{ - const long a = 16807; - const long m = 2147483647; - const long q = 127773; /* (m/a) */ - const long r = 2836; /* (m%a) */ - - long lo, k, s; - - s = (long) *pseed; - - k = (long) (s / q); - - lo = (s - q * k); - - s = a * lo - r * k; - - if (s <= 0) - s += m; - - return (int) (s & RAND_MAX); - -} - - -#define rand_r _rand_r -#define drand48 _drand48 - -#endif - -static double custom_random(e_random_generator_t generator, long int *seed) -{ - switch (generator) { - - case DRAND48: - return drand48(); - case RAND: - return (double) rand_r((unsigned int *) seed) / RAND_MAX; - case RNGSTREAM : - XBT_INFO("Seen RNGSTREAM"); - return 0.0; - default: - return drand48(); - } -} - -/* Generate numbers between min and max with a given mean and standard deviation */ -double random_generate(random_data_t random) -{ - double a, b; - double alpha, beta, gamma; - double U1, U2, V, W, X; - - if (random == NULL) - return 0.0f; - - if (random->std == 0) - return random->mean * (random->max - random->min) + random->min; - - a = random->mean * (random->mean * (1 - random->mean) / - (random->std * random->std) - 1); - b = (1 - - random->mean) * (random->mean * (1 - - random->mean) / (random->std * - random->std) - 1); - - alpha = a + b; - if (a <= 1. || b <= 1.) - beta = ((1. / a) > (1. / b)) ? (1. / a) : (1. / b); - else - beta = sqrt((alpha - 2.) / (2. * a * b - alpha)); - gamma = a + 1. / beta; - - do { - /* Random generation for the Beta distribution based on - * R. C. H. Cheng (1978). Generating beta variates with nonintegral shape parameters. _Communications of the ACM_, *21*, 317-322. - * It is good for speed because it does not call math functions many times and respect the 4 given constraints - */ - U1 = custom_random(random->generator, &(random->seed)); - U2 = custom_random(random->generator, &(random->seed)); - - V = beta * log(U1 / (1 - U1)); - W = a * exp(V); - } while (alpha * log(alpha / (b + W)) + gamma * V - log(4) < - log(U1 * U1 * U2)); - - X = W / (b + W); - - return X * (random->max - random->min) + random->min; -} - -random_data_t random_new(e_random_generator_t generator, long int seed, - double min, double max, double mean, double std) -{ - random_data_t random = xbt_new0(s_random_data_t, 1); - - random->generator = generator; - random->seed = seed; - random->min = min; - random->max = max; - - /* Check user stupidities */ - if (max < min) - THROWF(arg_error, 0, "random->max < random->min (%f < %f)", max, min); - if (mean < min) - THROWF(arg_error, 0, "random->mean < random->min (%f < %f)", mean, - min); - if (mean > max) - THROWF(arg_error, 0, "random->mean > random->max (%f > %f)", mean, - max); - - /* normalize the mean and standard deviation before storing */ - random->mean = (mean - min) / (max - min); - random->std = std / (max - min); - - if (random->mean * (1 - random->mean) < random->std * random->std) - THROWF(arg_error, 0, "Invalid mean and standard deviation (%f and %f)", - random->mean, random->std); - - return random; -} diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h index aaa141e1e1..b1600e508a 100644 --- a/src/surf/surf_private.h +++ b/src/surf/surf_private.h @@ -13,7 +13,6 @@ #include "surf/maxmin.h" #include "xbt/log.h" #include "surf/surfxml_parse.h" -#include "surf/random_mgr.h" #include "src/surf/trace_mgr.hpp" #include "src/instr/instr_private.h" #include "surf/surfxml_parse_values.h" diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c index 5cc4655c25..596a5b931a 100644 --- a/src/surf/surfxml_parse.c +++ b/src/surf/surfxml_parse.c @@ -14,7 +14,6 @@ #include "xbt/file.h" #include "xbt/dict.h" #include "src/surf/surf_private.h" -#include "surf/random_mgr.h" #include "simgrid/sg_config.h" #include "surfxml_private.h" @@ -1062,32 +1061,10 @@ int_f_void_t surf_parse = _surf_parse; */ double parse_cpu_speed(const char *str_speed) -{ - double speed = 0.0; - const char *p, *q; - char *generator; - random_data_t random = NULL; - /* randomness is inserted like this: power="$rand(my_random)" */ - if (((p = strstr(str_speed, "$rand(")) != NULL) - && ((q = strstr(str_speed, ")")) != NULL)) { - if (p < q) { - generator = xbt_malloc(q - (p + 6) + 1); - memcpy(generator, p + 6, q - (p + 6)); - generator[q - (p + 6)] = '\0'; - random = xbt_dict_get_or_null(random_data_list, generator); - xbt_assert(random, "Random generator %s undefined", generator); - speed = random_generate(random); - } - } else { - speed = surf_parse_get_speed(str_speed); - } - return speed; +{ // FIXME deadcode + return surf_parse_get_speed(str_speed); } -double random_min, random_max, random_mean, random_std_deviation; -e_random_generator_t random_generator; -char *random_id; - xbt_dict_t get_as_router_properties(const char* name) { return xbt_lib_get_or_null(as_router_lib, name, ROUTING_PROP_ASR_LEVEL); diff --git a/src/surf/surfxml_parseplatf.cpp b/src/surf/surfxml_parseplatf.cpp index 6fde67c693..5a9ea0ea3a 100644 --- a/src/surf/surfxml_parseplatf.cpp +++ b/src/surf/surfxml_parseplatf.cpp @@ -199,7 +199,6 @@ void parse_platform_file(const char *file) xbt_dict_free(&trace_connect_list_link_bw); xbt_dict_free(&trace_connect_list_link_lat); xbt_dict_free(&traces_set_list); - xbt_dict_free(&random_data_list); xbt_dynar_free(&surfxml_bufferstack_stack); surf_parse_close(); diff --git a/src/xbt/log.c b/src/xbt/log.c index 6592d41e0e..d1ff4f4047 100644 --- a/src/xbt/log.c +++ b/src/xbt/log.c @@ -695,8 +695,6 @@ static void xbt_log_connect_categories(void) /* surf */ XBT_LOG_CONNECT(surf); - XBT_LOG_CONNECT(platf_generator); - XBT_LOG_CONNECT(random); XBT_LOG_CONNECT(surf_config); XBT_LOG_CONNECT(surf_cpu); XBT_LOG_CONNECT(surf_cpu_cas); diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 8f72c97a5c..9351cf5842 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -13,7 +13,6 @@ set(EXTRA_DIST src/include/smpi/smpi_interface.h src/include/surf/datatypes.h src/include/surf/maxmin.h - src/include/surf/random_mgr.h src/include/surf/surf.h src/include/surf/surfxml_parse_values.h src/include/xbt/win32_ucontext.h @@ -61,7 +60,6 @@ set(EXTRA_DIST src/surf/ns3/ns3_interface.h src/surf/ns3/ns3_simulator.h src/surf/ns3/red-queue.h - src/surf/platf_generator_private.h src/surf/platform.hpp src/surf/plugins/energy.hpp src/surf/simgrid.dtd @@ -322,10 +320,8 @@ set(SURF_SRC src/surf/network_interface.cpp src/surf/network_smpi.cpp src/surf/network_ib.cpp - src/surf/platf_generator.c src/surf/plugins/energy.cpp src/surf/PropertyHolder.cpp - src/surf/random_mgr.c src/surf/sg_platf.cpp src/surf/storage_interface.cpp src/surf/storage_n11.cpp @@ -661,7 +657,6 @@ set(headers_to_install include/simgrid/modelchecker.h include/simgrid/forward.h include/simgrid/platf.h - include/simgrid/platf_generator.h include/simgrid/simix.h include/simgrid/simix.hpp include/simgrid/host.h