From 7ce9ce145cb9ba0782242b937c4ff50b172fbead Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Wed, 1 Apr 2020 16:58:48 +0200 Subject: [PATCH] this was never tested and neither a bug finder --- MANIFEST.in | 2 - examples/deprecated/msg/mc/CMakeLists.txt | 3 +- examples/deprecated/msg/mc/bugged3.c | 67 ------------------- examples/deprecated/msg/mc/deploy_bugged3.xml | 13 ---- 4 files changed, 2 insertions(+), 83 deletions(-) delete mode 100644 examples/deprecated/msg/mc/bugged3.c delete mode 100644 examples/deprecated/msg/mc/deploy_bugged3.xml diff --git a/MANIFEST.in b/MANIFEST.in index 27a47543e6..080654d4e4 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -256,11 +256,9 @@ include examples/deprecated/java/trace/pingpong/Sender.java include examples/deprecated/java/trace/pingpong/trace-pingpong.tesh include examples/deprecated/msg/README.doc include examples/deprecated/msg/mc/bugged2_liveness.c -include examples/deprecated/msg/mc/bugged3.c include examples/deprecated/msg/mc/centralized_mutex.c include examples/deprecated/msg/mc/centralized_mutex.tesh include examples/deprecated/msg/mc/deploy_bugged2_liveness.xml -include examples/deprecated/msg/mc/deploy_bugged3.xml include examples/deprecated/msg/mc/deploy_centralized_mutex.xml include examples/deprecated/msg/mc/promela_bugged2_liveness include examples/deprecated/msg/trace-categories/trace-categories.c diff --git a/examples/deprecated/msg/mc/CMakeLists.txt b/examples/deprecated/msg/mc/CMakeLists.txt index f020b32120..fc6e6d3988 100644 --- a/examples/deprecated/msg/mc/CMakeLists.txt +++ b/examples/deprecated/msg/mc/CMakeLists.txt @@ -1,4 +1,4 @@ -foreach (x bugged3 centralized_mutex bugged2_liveness) +foreach (x centralized_mutex bugged2_liveness) if(SIMGRID_HAVE_MC AND SIMGRID_HAVE_MSG) add_executable (${x} EXCLUDE_FROM_ALL ${x}.c) target_link_libraries(${x} simgrid) @@ -12,3 +12,4 @@ set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/centralized_mutex. set(xml_files ${xml_files} PARENT_SCOPE) set(examples_src ${examples_src} PARENT_SCOPE) set(bin_files ${bin_files} ${CMAKE_CURRENT_SOURCE_DIR}/promela_bugged2_liveness PARENT_SCOPE) + \ No newline at end of file diff --git a/examples/deprecated/msg/mc/bugged3.c b/examples/deprecated/msg/mc/bugged3.c deleted file mode 100644 index 3e326e3ac5..0000000000 --- a/examples/deprecated/msg/mc/bugged3.c +++ /dev/null @@ -1,67 +0,0 @@ -/* Copyright (c) 2010-2020. 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. */ - -/**************** Shared buffer between asynchronous receives *****************/ -/* Server process assumes that the data from the second communication comm2 */ -/* will overwrite the one from the first communication, because of the order */ -/* of the wait calls. This is not true because data copy can be triggered by */ -/* a call to wait on the other end of the communication (client). */ -/* NOTE that the communications use different mailboxes, but they share the */ -/* same buffer for reception (task1). */ -/******************************************************************************/ - -#include -#include - -XBT_LOG_NEW_DEFAULT_CATEGORY(bugged3, "this example"); - -static int server(XBT_ATTRIB_UNUSED int argc, XBT_ATTRIB_UNUSED char* argv[]) -{ - msg_task_t task1 = NULL; - msg_task_t task2 = NULL; - - msg_comm_t comm1 = MSG_task_irecv(&task1, "mymailbox1"); - msg_comm_t comm2 = MSG_task_irecv(&task2, "mymailbox2"); - MSG_comm_wait(comm1, -1); - MSG_comm_wait(comm2, -1); - - long val1 = xbt_str_parse_int(MSG_task_get_name(task1), "Task name is not a numerical ID: %s"); - XBT_INFO("Received %ld", val1); - - MC_assert(val1 == 2); - - XBT_INFO("OK"); - return 0; -} - -static int client(int argc, char *argv[]) -{ - xbt_assert(argc == 2); - msg_task_t task1 = MSG_task_create(argv[1], 0, 10000, NULL); - - char *mbox = bprintf("mymailbox%s", argv[1]); - - XBT_INFO("Send %s!", argv[1]); - msg_comm_t comm = MSG_task_isend(task1, mbox); - MSG_comm_wait(comm, -1); - - xbt_free(mbox); - - return 0; -} - -int main(int argc, char *argv[]) -{ - MSG_init(&argc, argv); - - MSG_create_environment(argv[1]); - - MSG_function_register("server", server); - MSG_function_register("client", client); - MSG_launch_application("deploy_bugged3.xml"); - - MSG_main(); - return 0; -} diff --git a/examples/deprecated/msg/mc/deploy_bugged3.xml b/examples/deprecated/msg/mc/deploy_bugged3.xml deleted file mode 100644 index 08653275c2..0000000000 --- a/examples/deprecated/msg/mc/deploy_bugged3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - -- 2.20.1