From a159c519b56ed21c2c47d47f98eedfd7a038a397 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Fri, 25 Mar 2016 11:46:20 +0100 Subject: [PATCH] kill this obscure version of masterslave --- examples/msg/masterslave/CMakeLists.txt | 5 +- examples/msg/masterslave/masterslave_arg.c | 112 --------------------- 2 files changed, 1 insertion(+), 116 deletions(-) delete mode 100644 examples/msg/masterslave/masterslave_arg.c diff --git a/examples/msg/masterslave/CMakeLists.txt b/examples/msg/masterslave/CMakeLists.txt index 1b8b586b6c..2e5c09c1f7 100644 --- a/examples/msg/masterslave/CMakeLists.txt +++ b/examples/msg/masterslave/CMakeLists.txt @@ -9,16 +9,13 @@ foreach (example masterslave_forwarder masterslave_mailbox) ADD_TESH_FACTORIES(msg-${example}-no-crosstraffic "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/${example}.tesh) endforeach() -add_executable (masterslave_arg masterslave_arg.c) -target_link_libraries(masterslave_arg simgrid) - ADD_TESH_FACTORIES(msg-masterslave "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_crosstraffic.tesh) ADD_TESH_FACTORIES(msg-masterslave-multicore "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_multicore.tesh) ADD_TESH_FACTORIES(msg-masterslave-cpu-ti "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/masterslave --cd ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_cpu_ti_crosstraffic.tesh) ADD_TESH_FACTORIES(msg-masterslave-vivaldi "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_vivaldi.tesh) ADD_TESH_FACTORIES(msg-masterslave-no-crosstraffic "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave.tesh) -set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_arg.c PARENT_SCOPE) +set(examples_src ${examples_src} PARENT_SCOPE) set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/masterslave.tesh ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_crosstraffic.tesh ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_cpu_ti.tesh diff --git a/examples/msg/masterslave/masterslave_arg.c b/examples/msg/masterslave/masterslave_arg.c deleted file mode 100644 index b859965ed1..0000000000 --- a/examples/msg/masterslave/masterslave_arg.c +++ /dev/null @@ -1,112 +0,0 @@ -/* Copyright (c) 2010-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/msg.h" - -XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example"); - -#define task_comp_size 50000000 -#define task_comm_size 1000000 - -long number_of_jobs; -long number_of_slaves; - -static long my_random(long n) -{ - return n * (rand() / ((double)RAND_MAX + 1)); -} - -static int master(int argc, char *argv[]) -{ - int i; - - for (i = 1; i <= number_of_jobs; i++) { - char mailbox[256]; - char sprintf_buffer[256]; - msg_task_t task = NULL; - - sprintf(mailbox, "slave-%ld", i % number_of_slaves); - sprintf(sprintf_buffer, "Task_%d", i); - task = MSG_task_create(sprintf_buffer, task_comp_size, task_comm_size, NULL); - XBT_DEBUG("Sending \"%s\" (of %ld) to mailbox \"%s\"", task->name, number_of_jobs, mailbox); - - MSG_task_send(task, mailbox); - } - - XBT_DEBUG("All tasks have been dispatched. Let's tell everybody the computation is over."); - for (i = 0; i < number_of_slaves; i++) { - char mailbox[80]; - - sprintf(mailbox, "slave-%ld", i % number_of_slaves); - msg_task_t finalize = MSG_task_create("finalize", 0, 0, 0); - MSG_task_send(finalize, mailbox); - } - - XBT_DEBUG("Goodbye now!"); - return 0; -} - -static int slave(int argc, char *argv[]) -{ - msg_task_t task = NULL; - XBT_ATTRIB_UNUSED int res; - - XBT_DEBUG("mailbox: %s",MSG_process_get_name(MSG_process_self())); - while (1) { - res = MSG_task_receive(&(task), MSG_process_get_name(MSG_process_self())); - xbt_assert(res == MSG_OK, "MSG_task_get failed"); - - XBT_DEBUG("Received \"%s\"", MSG_task_get_name(task)); - if (!strcmp(MSG_task_get_name(task), "finalize")) { - MSG_task_destroy(task); - break; - } - XBT_DEBUG("Processing \"%s\"", MSG_task_get_name(task)); - MSG_task_execute(task); - XBT_DEBUG("\"%s\" done", MSG_task_get_name(task)); - MSG_task_destroy(task); - task = NULL; - } - return 0; -} - -int main(int argc, char *argv[]) -{ - msg_error_t res = MSG_OK; - long i; - - MSG_init(&argc, argv); - xbt_assert(argc > 3, "Usage: %s platform_file number_of_jobs number_of_slaves\n" - "\tExample: %s msg_platform.xml 10 5\n", argv[0], argv[0]); - - MSG_function_register("master", master); - MSG_function_register("slave", slave); - - MSG_create_environment(argv[1]); - - number_of_jobs = xbt_str_parse_int(argv[2], "Invalid amount of jobs: %s"); - number_of_slaves = xbt_str_parse_int(argv[3], "Invalid amount of slaves: %s"); - xbt_dynar_t host_dynar = MSG_hosts_as_dynar(); - long number_max = xbt_dynar_length(host_dynar); - XBT_INFO("Got %ld slaves, %ld tasks to process, and %ld hosts", number_of_slaves, number_of_jobs,number_max); - - msg_host_t *host_table = xbt_dynar_to_array(host_dynar); - - MSG_process_create("master", master, NULL, host_table[my_random(number_max)]); - - for(i = 0 ; i