From: Arnaud Giersch Date: Wed, 16 Jan 2019 20:58:48 +0000 (+0100) Subject: Kill unused example simdag/goal_test. X-Git-Tag: v3_22~539 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/5d6a7b5bde2fb966fb8a9f0943c67483e8d17361?hp=471df2094847811ec0860dc8b7d5a4125b19dae7 Kill unused example simdag/goal_test. --- diff --git a/.gitignore b/.gitignore index 24ce588454..03461ca5d3 100644 --- a/.gitignore +++ b/.gitignore @@ -197,7 +197,6 @@ examples/s4u/trace-platform/s4u-trace-platform examples/deprecated/simdag/dag-dotload/sd_dag-dotload examples/deprecated/simdag/daxload/sd_daxload examples/deprecated/simdag/fail/sd_fail -examples/deprecated/simdag/goal/goal_test examples/deprecated/simdag/properties/sd_properties examples/deprecated/simdag/ptg-dotload/sd_ptg-dotload examples/deprecated/simdag/schedule-dotload/sd_schedule-dotload diff --git a/examples/deprecated/simdag/CMakeLists.txt b/examples/deprecated/simdag/CMakeLists.txt index e18499670f..089d2da0a6 100644 --- a/examples/deprecated/simdag/CMakeLists.txt +++ b/examples/deprecated/simdag/CMakeLists.txt @@ -27,13 +27,8 @@ foreach(x dag-dotload ptg-dotload schedule-dotload) set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/sd_${x}.tesh) endforeach() -add_executable (goal_test EXCLUDE_FROM_ALL goal/goal_test.c) -target_link_libraries(goal_test simgrid) -set_target_properties(goal_test PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/goal) -add_dependencies(tests goal_test) - set(tesh_files ${tesh_files} PARENT_SCOPE) -set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/goal/goal_test.c PARENT_SCOPE) +set(examples_src ${examples_src} PARENT_SCOPE) set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/scheduling/Montage_25.xml ${CMAKE_CURRENT_SOURCE_DIR}/daxload/simple_dax_with_cycle.xml ${CMAKE_CURRENT_SOURCE_DIR}/daxload/smalldax.xml PARENT_SCOPE) diff --git a/examples/deprecated/simdag/goal/goal_test.c b/examples/deprecated/simdag/goal/goal_test.c deleted file mode 100644 index 2c858011f8..0000000000 --- a/examples/deprecated/simdag/goal/goal_test.c +++ /dev/null @@ -1,104 +0,0 @@ -/* Example of scatter communication, accepting a large amount of processes. - * This based the experiment of Fig. 4 in http://hal.inria.fr/hal-00650233/ - * That experiment is a comparison to the LogOPSim simulator, that takes - * GOAL files as an input, thus the file name. But there is no actual link - * to the GOAL formalism beside of this. - */ - -/* Copyright (c) 2011-2019. 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 -#include "simgrid/simdag.h" -#include "xbt/xbt_os_time.h" - -XBT_LOG_NEW_DEFAULT_CATEGORY(goal, "The GOAL loader into SimDag"); - -typedef struct { - int i; - int j; - int k; -} s_bcast_task_t; -typedef s_bcast_task_t *bcast_task_t; -const sg_host_t* ws_list; -int count = 0; - -xbt_dynar_t reclaimed; - -static void send_one(int from, int to) { - - if (count %100000 == 0) - XBT_INFO("Sending task #%d",count); - count++; - - bcast_task_t bt; - if (!xbt_dynar_is_empty(reclaimed)) { - bt = xbt_dynar_pop_as(reclaimed,bcast_task_t); - } else { - bt = xbt_new(s_bcast_task_t,1); - } - bt->i=from; - bt->j=(from+to)/2; - bt->k=to; - - SD_task_t task = SD_task_create_comm_e2e(NULL,bt,424242); - - XBT_DEBUG("Schedule task between %d and %d",bt->i,bt->j); - SD_task_schedulel(task,2,ws_list[bt->i],ws_list[bt->j]); - SD_task_watch(task,SD_DONE); -} - -int main(int argc, char **argv) { - xbt_os_timer_t timer = xbt_os_timer_new(); - - /* initialization of SD */ - SD_init(&argc, argv); - - if (argc > 1) { - SD_create_environment(argv[1]); - } else { - SD_create_environment("../../platforms/One_cluster_no_backbone.xml"); - } - - ws_list = sg_host_list(); - reclaimed = xbt_dynar_new(sizeof(bcast_task_t),xbt_free_ref); - xbt_dynar_t done = xbt_dynar_new(sizeof(SD_task_t), NULL); - - xbt_os_cputimer_start(timer); - send_one(0,sg_host_count()); - do { - if (!xbt_dynar_is_empty(done)) { - unsigned int cursor; - SD_task_t task; - - xbt_dynar_foreach(done, cursor, task) { - bcast_task_t bt = SD_task_get_data(task); - - if (bt->i != bt->j -1) - send_one(bt->i,bt->j); - if (bt->j != bt->k -1) - send_one(bt->j,bt->k); - - if (xbt_dynar_length(reclaimed)<100) { - xbt_dynar_push_as(reclaimed,bcast_task_t,bt); - } else { - free(bt); - } - SD_task_destroy(task); - } - xbt_dynar_free_container(&done); - } - SD_simulate_with_update(-1, done); - } while(!xbt_dynar_is_empty(done)); - xbt_os_cputimer_stop(timer); - printf("exec_time:%f\n", xbt_os_timer_elapsed(timer) ); - - xbt_dynar_free(&done); - xbt_dynar_free(&reclaimed); - - XBT_INFO("Done. Bailing out"); - return 0; -}