Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
kill gtnets examples
authorFrederic Suter <frederic.suter@cc.in2p3.fr>
Thu, 24 Mar 2016 17:06:18 +0000 (18:06 +0100)
committerFrederic Suter <frederic.suter@cc.in2p3.fr>
Thu, 24 Mar 2016 17:08:10 +0000 (18:08 +0100)
  WARNING new ns3 tests are broken. It's normal

21 files changed:
examples/msg/CMakeLists.txt
examples/msg/gtnets/CMakeLists.txt [deleted file]
examples/msg/gtnets/dogbone-d.xml [deleted file]
examples/msg/gtnets/gtnets-crosstraffic.tesh [deleted file]
examples/msg/gtnets/gtnets-dogbone-gtnets.tesh [deleted file]
examples/msg/gtnets/gtnets-dogbone-lv08.tesh [deleted file]
examples/msg/gtnets/gtnets-onelink-gtnets.tesh [deleted file]
examples/msg/gtnets/gtnets-onelink-lv08.tesh [deleted file]
examples/msg/gtnets/gtnets.c [deleted file]
examples/msg/ns3/3links-timer_d.xml [moved from examples/msg/ns3/3links-d-timer.xml with 100% similarity]
examples/msg/ns3/3links_d.xml [moved from examples/msg/ns3/3links-d.xml with 100% similarity]
examples/msg/ns3/CMakeLists.txt
examples/msg/ns3/crosstraffic_d.xml [moved from examples/msg/gtnets/crosstraffic-d.xml with 100% similarity]
examples/msg/ns3/dogbone_d.xml [moved from examples/msg/ns3/dogbone-d.xml with 100% similarity]
examples/msg/ns3/ns3.tesh
examples/msg/ns3/one_cluster_d.xml [moved from examples/msg/ns3/One_cluster-d.xml with 100% similarity]
examples/msg/ns3/onelink_d.xml [moved from examples/msg/gtnets/onelink-d.xml with 100% similarity]
examples/msg/ns3/two_clusters_d.xml [moved from examples/msg/ns3/Two_clusters-d.xml with 100% similarity]
examples/platforms/dogbone.xml [moved from examples/msg/gtnets/dogbone-p.xml with 100% similarity]
examples/platforms/onelink.xml [moved from examples/msg/gtnets/onelink-p.xml with 100% similarity]
tools/cmake/DefinePackages.cmake

index ad8a77f..e74bc9d 100644 (file)
@@ -57,7 +57,6 @@ endforeach()
 ADD_TESH_FACTORIES(msg-dht-chord-crosstraffic          "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/dht-chord --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/dht-chord dht-chord_crosstraffic.tesh)
 ADD_TESH_FACTORIES(msg-dht-chord-crosstraffic-parallel "thread;ucontext;raw" --cfg contexts/nthreads:4 ${CONTEXTS_SYNCHRO} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/dht-chord --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/dht-chord dht-chord_crosstraffic.tesh)
 ADD_TESH_FACTORIES(msg-dht-chord-parallel              "thread;ucontext;raw" --cfg contexts/nthreads:4 ${CONTEXTS_SYNCHRO} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/dht-chord --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/dht-chord dht-chord.tesh)
 ADD_TESH_FACTORIES(msg-dht-chord-crosstraffic          "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/dht-chord --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/dht-chord dht-chord_crosstraffic.tesh)
 ADD_TESH_FACTORIES(msg-dht-chord-crosstraffic-parallel "thread;ucontext;raw" --cfg contexts/nthreads:4 ${CONTEXTS_SYNCHRO} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/dht-chord --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/dht-chord dht-chord_crosstraffic.tesh)
 ADD_TESH_FACTORIES(msg-dht-chord-parallel              "thread;ucontext;raw" --cfg contexts/nthreads:4 ${CONTEXTS_SYNCHRO} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/dht-chord --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/dht-chord dht-chord.tesh)
-# ADD_TESH_FACTORIES(msg-dht-pastry                    "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/dht-pastry --cd ${CMAKE_BINARY_DIR}/examples/msg/dht-pastry dht-pastry.tesh)
 ADD_TESH_FACTORIES(msg-energy-pstate-ptask             "thread;ucontext;raw;boost" --cfg host/model:ptask_L07 --log xbt_cfg.threshold:critical --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-pstate/energy-pstate.tesh)
 ADD_TESH_FACTORIES(msg-energy-consumption-ptask        "thread;ucontext;raw;boost" --cfg host/model:ptask_L07 --log xbt_cfg.threshold:critical --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-consumption/energy-consumption.tesh)
 ADD_TESH_FACTORIES(msg-energy-ptask                    "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-ptask/energy-ptask.tesh)
 ADD_TESH_FACTORIES(msg-energy-pstate-ptask             "thread;ucontext;raw;boost" --cfg host/model:ptask_L07 --log xbt_cfg.threshold:critical --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-pstate/energy-pstate.tesh)
 ADD_TESH_FACTORIES(msg-energy-consumption-ptask        "thread;ucontext;raw;boost" --cfg host/model:ptask_L07 --log xbt_cfg.threshold:critical --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-consumption/energy-consumption.tesh)
 ADD_TESH_FACTORIES(msg-energy-ptask                    "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-ptask/energy-ptask.tesh)
@@ -65,5 +64,6 @@ ADD_TESH_FACTORIES(msg-set-maestro                     "thread" --setenv srcdir=
 
 ADD_TESH(msg-pmm  --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/pmm/pmm.tesh)
 
 
 ADD_TESH(msg-pmm  --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/pmm/pmm.tesh)
 
-# This one is not usable:
+# These one are not usable:
 # ADD_TESH_FACTORIES(msg-exception "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/exception/exception.tesh)
 # ADD_TESH_FACTORIES(msg-exception "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/exception/exception.tesh)
+# ADD_TESH_FACTORIES(msg-dht-pastry                    "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/dht-pastry --cd ${CMAKE_BINARY_DIR}/examples/msg/dht-pastry dht-pastry.tesh)
diff --git a/examples/msg/gtnets/CMakeLists.txt b/examples/msg/gtnets/CMakeLists.txt
deleted file mode 100644 (file)
index 42be813..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-add_executable       (gtnets gtnets.c)
-target_link_libraries(gtnets simgrid)
-
-set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/gtnets-crosstraffic.tesh
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/gtnets-onelink-gtnets.tesh
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/gtnets-dogbone-gtnets.tesh
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/gtnets-onelink-lv08.tesh
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/gtnets-dogbone-lv08.tesh            PARENT_SCOPE)
-set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/crosstraffic-d.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/dogbone-d.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/dogbone-p.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/onelink-d.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/onelink-p.xml                       PARENT_SCOPE)
-set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/gtnets.c                            PARENT_SCOPE)
-
-IF(HAVE_GTNETS)
-  ADD_TESH_FACTORIES(msg-gtnets-dogbone        "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh)
-  ADD_TESH_FACTORIES(msg-gtnets-onelink        "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-onelink-gtnets.tesh)
-  ADD_TESH_FACTORIES(msg-gtnets-dogbone-lv08   "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-dogbone-lv08.tesh)
-  ADD_TESH_FACTORIES(msg-gtnets-onelink-lv08   "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-onelink-lv08.tesh)
-  ADD_TESH_FACTORIES(msg-gtnets-crosstraffic   "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-crosstraffic.tesh)
-ENDIF()
diff --git a/examples/msg/gtnets/dogbone-d.xml b/examples/msg/gtnets/dogbone-d.xml
deleted file mode 100644 (file)
index a0cffd8..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="S1" function="master">
-      <argument value="10000"/>
-      <argument value="C1"/>
-      <argument value="0"/>
-  </process>
-  <process host="S2" function="master">
-      <argument value="10000"/>
-      <argument value="C2"/>
-      <argument value="1"/>
-  </process>
-  <process host="C1" function="slave">
-      <argument value="0"/>
-  </process>
-  <process host="C2" function="slave">
-      <argument value="1"/>
-  </process>
-</platform>
diff --git a/examples/msg/gtnets/gtnets-crosstraffic.tesh b/examples/msg/gtnets/gtnets-crosstraffic.tesh
deleted file mode 100644 (file)
index 33d74a3..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-#! ./tesh
-
-p Testing crosstraffic TCP option DISABLED
-
-$ gtnets/gtnets ${srcdir:=.}/../platforms/crosstraffic.xml ${srcdir:=.}/gtnets/crosstraffic-d.xml --cfg=network/crosstraffic:0
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/crosstraffic' to '0'
-> [S1:slave:(8) 103.222884] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 3229.258106 ;  message from S1 to C1  with remaining : 666666.666667
-> [S1:slave:(8) 103.222884] [msg_test/INFO] ===> Estimated Bw of FLOW[2] : 3229.258106 ;  message from S1 to C1  with remaining : 666666.666667
-> [S1:slave:(8) 103.222884] [msg_test/INFO] ===> Estimated Bw of FLOW[3] : 3229.258106 ;  message from S1 to C1  with remaining : 666666.666667
-> [S1:slave:(8) 103.222884] [msg_test/INFO] ===> Estimated Bw of FLOW[4] : 9687.774319 ;  message from C1 to S1  with remaining : 0.000000
-
-p Testing crosstraffic TCP option ENABLED
-
-$ gtnets/gtnets ${srcdir:=.}/../platforms/crosstraffic.xml ${srcdir:=.}/gtnets/crosstraffic-d.xml --cfg=network/crosstraffic:1
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/crosstraffic' to '1'
-> [C1:slave:(4) 314.563090] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 3179.012519 ;  message from S1 to C1  with remaining : 0.000000
-> [C1:slave:(4) 314.563090] [msg_test/INFO] ===> Estimated Bw of FLOW[2] : 3179.012519 ;  message from S1 to C1  with remaining : 0.000000
-> [C1:slave:(4) 314.563090] [msg_test/INFO] ===> Estimated Bw of FLOW[3] : 3179.012519 ;  message from S1 to C1  with remaining : 0.000000
-> [C1:slave:(4) 314.563090] [msg_test/INFO] ===> Estimated Bw of FLOW[4] : 3179.012519 ;  message from C1 to S1  with remaining : 0.000000
\ No newline at end of file
diff --git a/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh b/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh
deleted file mode 100644 (file)
index 9bcb300..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#! ./tesh
-
-p Testing dogbone communication pattern with GTNets model
-
-$ gtnets/gtnets ${srcdir:=.}/gtnets/dogbone-p.xml ${srcdir:=.}/gtnets/dogbone-d.xml --cfg=host/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'host/model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'GTNets'
-> [0.000000] [surf_network_gtnets_interface/INFO] TCP window maximum size : 20000
-> [C1:slave:(3) 0.300171] [msg_test/INFO] ===> Estimated Bw of FLOW[0] : 33314.335278 ;  message from S1 to C1  with remaining : 0.000000
-> [C1:slave:(3) 0.300171] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 33314.335278 ;  message from S2 to C2  with remaining : 0.000000
diff --git a/examples/msg/gtnets/gtnets-dogbone-lv08.tesh b/examples/msg/gtnets/gtnets-dogbone-lv08.tesh
deleted file mode 100644 (file)
index d8995ec..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-#! ./tesh
-
-p Testing dogbone communication pattern with LV08 model
-
-$ gtnets/gtnets ${srcdir:=.}/gtnets/dogbone-p.xml ${srcdir:=.}/gtnets/dogbone-d.xml --cfg=host/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:LV08
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'host/model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'LV08'
-> [C1:slave:(3) 0.342000] [msg_test/INFO] WARNING FLOW[0] is limited by latency!!
-> [C1:slave:(3) 0.342000] [msg_test/INFO] ===> Estimated Bw of FLOW[0] : 29239.766082 ;  message from S1 to C1  with remaining : 0.000000
-> [C1:slave:(3) 0.342000] [msg_test/INFO] WARNING FLOW[1] is limited by latency!!
-> [C1:slave:(3) 0.342000] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 29239.766082 ;  message from S2 to C2  with remaining : 0.000000
diff --git a/examples/msg/gtnets/gtnets-onelink-gtnets.tesh b/examples/msg/gtnets/gtnets-onelink-gtnets.tesh
deleted file mode 100644 (file)
index e66c746..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#! ./tesh
-
-p Testing onelink communication pattern with GTNets model
-
-$ gtnets/gtnets ${srcdir:=.}/gtnets/onelink-p.xml ${srcdir:=.}/gtnets/onelink-d.xml --cfg=host/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'host/model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'GTNets'
-> [0.000000] [surf_network_gtnets_interface/INFO] TCP window maximum size : 20000
-> [C1:slave:(2) 106.291000] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 9408.134273 ;  message from S1 to C1  with remaining : 0.000000
diff --git a/examples/msg/gtnets/gtnets-onelink-lv08.tesh b/examples/msg/gtnets/gtnets-onelink-lv08.tesh
deleted file mode 100644 (file)
index 1c431b4..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#! ./tesh
-
-p Testing onelink communication pattern with LV08 model
-
-$ gtnets/gtnets ${srcdir:=.}/gtnets/onelink-p.xml ${srcdir:=.}/gtnets/onelink-d.xml --cfg=host/model:compound --cfg=cpu/model:Cas01  --cfg=network/model:LV08 2>&1 | grep --color=auto -v root/INFO | grep -v simix_network/INFO
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'host/model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'LV08'
-> [C1:slave:(2) 108.799652] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 9191.205854 ;  message from S1 to C1  with remaining : 0.000000
diff --git a/examples/msg/gtnets/gtnets.c b/examples/msg/gtnets/gtnets.c
deleted file mode 100644 (file)
index 59884be..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-/* Copyright (c) 2007-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");
-
-/** @addtogroup MSG_examples
- * 
- * - <b>gtnets</b> Simple ping-pong using GTNeTs instead of the SimGrid network models.
- */
-
-int timer_start = 1;
-
-//keep a pointer to all surf running tasks.
-#define NTASKS 1500
-int bool_printed = 0;
-double start_time, end_time, elapsed_time;
-double gl_data_size[NTASKS];
-msg_task_t gl_task_array[NTASKS];
-const char *slavenames[NTASKS];
-const char *masternames[NTASKS];
-int gl_task_array_id = 0;
-int count_finished = 0;
-
-static int master(int argc, char *argv[])
-{
-  msg_task_t todo;
-
-  xbt_assert(argc == 4, "Strange number of arguments expected 3 got %d", argc - 1);
-
-  /* data size */
-  double task_comm_size = xbt_str_parse_double(argv[1], "Invalid task communication size: %s");
-
-  /* slave name */
-  char *slavename = argv[2];
-  int id = xbt_str_parse_int(argv[3], "Invalid ID as argument 3: %s");   //unique id to control statistics
-  char *id_alias = bprintf("flow_%d", id);
-  slavenames[id] = slavename;
-  TRACE_category(id_alias);
-
-  masternames[id] = MSG_host_get_name(MSG_host_self());
-
-  {                             /*  Task creation.  */
-    todo = MSG_task_create("Task_0", 0, task_comm_size, NULL);
-    MSG_task_set_category(todo, id_alias);
-    //keep track of running tasks
-    gl_task_array[id] = todo;
-    gl_data_size[id] = task_comm_size;
-  }
-
-  count_finished++;
-
-  /* time measurement */
-  sprintf(id_alias, "%d", id);
-  start_time = MSG_get_clock();
-  MSG_task_send(todo, id_alias);
-  end_time = MSG_get_clock();
-
-  xbt_free(id_alias);
-  return 0;
-}
-
-static int slave(int argc, char *argv[])
-{
-  msg_task_t task = NULL;
-  double remaining = 0;
-  char id_alias[10];
-
-  xbt_assert(argc == 2, "Strange number of arguments expected 1 got %d", argc - 1);
-
-  int id = xbt_str_parse_int(argv[1], "Invalid id: %s");
-  sprintf(id_alias, "%d", id);
-  int trace_id = id;
-
-  msg_error_t a = MSG_task_receive(&(task), id_alias);
-
-  count_finished--;
-  if(count_finished == 0){
-      timer_start = 0;
-  }
-
-  xbt_assert(a == MSG_OK,"Hey?! What's up? Unexpected behavior");
-
-  elapsed_time = MSG_get_clock() - start_time;
-
-  if (!bool_printed) {
-    bool_printed = 1;
-
-    for (id = 0; id < NTASKS; id++) {
-      if (gl_task_array[id] == NULL) continue;
-      if (gl_task_array[id] == task) {
-        XBT_INFO ("===> Estimated Bw of FLOW[%d] : %f ;  message from %s to %s  with remaining : %f",
-             id, gl_data_size[id] / elapsed_time, masternames[id], slavenames[id], 0.0);
-        MSG_task_destroy(gl_task_array[id]);
-        gl_task_array[id]=NULL;
-      } else {
-        remaining = MSG_task_get_remaining_communication(gl_task_array[id]);
-        XBT_INFO ("===> Estimated Bw of FLOW[%d] : %f ;  message from %s to %s  with remaining : %f",
-             id, (gl_data_size[id] - remaining) / elapsed_time, masternames[id], slavenames[id], remaining);
-        if(remaining==0) {
-          MSG_task_destroy(gl_task_array[id]);
-          gl_task_array[id]=NULL;
-        }
-      }
-    }
-    bool_printed = 2;
-  }
-  char mark[100];
-  snprintf(mark, 100, "flow_%d_finished", trace_id);
-  TRACE_mark("endmark", mark);
-
-  if(bool_printed==2 && gl_task_array[trace_id]) MSG_task_destroy(gl_task_array[trace_id]);
-
-  return 0;
-}
-
-int main(int argc, char *argv[])
-{
-  msg_error_t res = MSG_OK;
-  bool_printed = 0;
-
-  MSG_init(&argc, argv);
-  xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
-             "\tExample: %s platform.xml deployment.xml\n", argv[0], argv[0]);
-
-  MSG_create_environment(argv[1]);
-  TRACE_declare_mark("endmark");
-
-  MSG_function_register("master", master);
-  MSG_function_register("slave", slave);
-  MSG_launch_application(argv[2]);
-
-  res = MSG_main();
-
-  return res != MSG_OK;
-}
index 06ff772..630f4e3 100644 (file)
@@ -8,8 +8,10 @@ endif()
 set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/ns3.c                   PARENT_SCOPE)
 set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/ns3.tesh                PARENT_SCOPE)
 set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/3hosts_2links_d.xml
 set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/ns3.c                   PARENT_SCOPE)
 set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/ns3.tesh                PARENT_SCOPE)
 set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/3hosts_2links_d.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/3links-d-timer.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/3links-d.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/dogbone-d.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/One_cluster-d.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/Two_clusters-d.xml      PARENT_SCOPE)
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/3links-timer_d.xml
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/3links_d.xml
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/crosstraffic_d.xml
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/dogbone_d.xml
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/onelink_d.xml
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_d.xml
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/two_clusters_d.xml      PARENT_SCOPE)
index c2bf593..ff7e953 100644 (file)
@@ -11,13 +11,13 @@ $ ns3/ns3 ${srcdir:=.}/examples/platforms/small_platform_one_link_routes.xml ${s
 
 p 6hosts 3links
 
 
 p 6hosts 3links
 
-$ ns3/ns3 ${srcdir:=.}/examples/platforms/small_platform_one_link_routes.xml ${srcdir:=.}/examples/msg/ns3/3links-d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
+$ ns3/ns3 ${srcdir:=.}/examples/platforms/small_platform_one_link_routes.xml ${srcdir:=.}/examples/msg/ns3/3links_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 > [Jupiter:slave(2)] [msg_test/INFO] FLOW[1] : Receive 100000 bytes from Tremblay to Jupiter
 > [Ginette:slave(4)] [msg_test/INFO] FLOW[2] : Receive 1000000 bytes from Fafard to Ginette
 > [Lovelace:slave(6)] [msg_test/INFO] FLOW[3] : Receive 2000000 bytes from Bourassa to Lovelace
 
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 > [Jupiter:slave(2)] [msg_test/INFO] FLOW[1] : Receive 100000 bytes from Tremblay to Jupiter
 > [Ginette:slave(4)] [msg_test/INFO] FLOW[2] : Receive 1000000 bytes from Fafard to Ginette
 > [Lovelace:slave(6)] [msg_test/INFO] FLOW[3] : Receive 2000000 bytes from Bourassa to Lovelace
 
-$ ns3/ns3 ${srcdir:=.}/examples/platforms/small_platform_one_link_routes.xml ${srcdir:=.}/examples/msg/ns3/3links-d-timer.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
+$ ns3/ns3 ${srcdir:=.}/examples/platforms/small_platform_one_link_routes.xml ${srcdir:=.}/examples/msg/ns3/3links-timer_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 > [Jupiter:slave(2)] [msg_test/INFO] FLOW[1] : Receive 100000 bytes from Tremblay to Jupiter
 > [Ginette:slave(4)] [msg_test/INFO] FLOW[2] : Receive 1000000 bytes from Fafard to Ginette
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 > [Jupiter:slave(2)] [msg_test/INFO] FLOW[1] : Receive 100000 bytes from Tremblay to Jupiter
 > [Ginette:slave(4)] [msg_test/INFO] FLOW[2] : Receive 1000000 bytes from Fafard to Ginette
@@ -26,12 +26,34 @@ $ ns3/ns3 ${srcdir:=.}/examples/platforms/small_platform_one_link_routes.xml ${s
 
 p One cluster
 
 
 p One cluster
 
-$ ns3/ns3 ${srcdir:=.}/examples/platforms/cluster.xml ${srcdir:=.}/examples/msg/ns3/One_cluster-d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
+$ ns3/ns3 ${srcdir:=.}/examples/platforms/cluster.xml ${srcdir:=.}/examples/msg/ns3/one_cluster_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 > [node-6.acme.org:slave(2)] [msg_test/INFO] FLOW[1] : Receive 100 bytes from node-2.acme.org to node-6.acme.org
 
 p Two clusters
 
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 > [node-6.acme.org:slave(2)] [msg_test/INFO] FLOW[1] : Receive 100 bytes from node-2.acme.org to node-6.acme.org
 
 p Two clusters
 
-$ ns3/ns3 ${srcdir:=.}/examples/platforms/clusters_routing_full.xml ${srcdir:=.}/examples/msg/ns3/Two_clusters-d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
+$ ns3/ns3 ${srcdir:=.}/examples/platforms/clusters_routing_full.xml ${srcdir:=.}/examples/msg/ns3/two_clusters_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 > [node-16.acme.org:slave(2)] [msg_test/INFO] FLOW[1] : Receive 100 bytes from node-3.acme.org to node-16.acme.org
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 > [node-16.acme.org:slave(2)] [msg_test/INFO] FLOW[1] : Receive 100 bytes from node-3.acme.org to node-16.acme.org
+
+p Dogbone
+
+$ ns3/ns3 ${srcdir:=.}/examples/platforms/dogbone.xml ${srcdir:=.}/examples/msg/ns3/dogbone_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
+> [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
+
+p 2hosts 1link
+
+$ ns3/ns3 ${srcdir:=.}/examples/platforms/onelink.xml ${srcdir:=.}/examples/msg/ns3/onelink_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
+> [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
+
+p Crosstraffic TCP option DISABLED
+
+$ ns3/ns3 ${srcdir:=.}/examples/platforms/crosstraffic.xml ${srcdir:=.}/examples/msg/ns3/crosstraffic_d.xml --cfg=network/model:NS3 --cfg=network/crosstraffic:0 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
+> [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
+> [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/crosstraffic' to '0'
+
+p Crosstraffic TCP option ENABLED
+
+$ ns3/ns3 ${srcdir:=.}/examples/platforms/crosstraffic.xml ${srcdir:=.}/examples/msg/ns3/crosstraffic_d.xml --cfg=network/model:NS3 --cfg=network/crosstraffic:1 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
+> [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
+> [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/crosstraffic' to '1'
index 62d64f4..1e92343 100644 (file)
@@ -953,7 +953,6 @@ set(CMAKEFILES_TXT
     examples/msg/chainsend/CMakeLists.txt
     examples/msg/cloud/CMakeLists.txt
     examples/msg/dht-kademlia/CMakeLists.txt
     examples/msg/chainsend/CMakeLists.txt
     examples/msg/cloud/CMakeLists.txt
     examples/msg/dht-kademlia/CMakeLists.txt
-    examples/msg/gtnets/CMakeLists.txt 
     examples/msg/masterslave/CMakeLists.txt
     examples/msg/mc/CMakeLists.txt
     examples/msg/ns3/CMakeLists.txt
     examples/msg/masterslave/CMakeLists.txt
     examples/msg/mc/CMakeLists.txt
     examples/msg/ns3/CMakeLists.txt
@@ -1096,6 +1095,7 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/trace/trace_A.txt
   examples/platforms/trace/trace_B.txt
   examples/platforms/data_center.xml
   examples/platforms/trace/trace_A.txt
   examples/platforms/trace/trace_B.txt
   examples/platforms/data_center.xml
+  examples/platforms/dogbone.xml
   examples/platforms/energy_platform.xml
   examples/platforms/faulty_host.xml
   examples/platforms/fat_tree_cluster.xml
   examples/platforms/energy_platform.xml
   examples/platforms/faulty_host.xml
   examples/platforms/fat_tree_cluster.xml
@@ -1103,6 +1103,7 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/griffon.xml
   examples/platforms/meta_cluster.xml
   examples/platforms/multicore_machine.xml
   examples/platforms/griffon.xml
   examples/platforms/meta_cluster.xml
   examples/platforms/multicore_machine.xml
+  examples/platforms/onelink.xml
   examples/platforms/platform.xml
   examples/platforms/prop.xml
   examples/platforms/routing_cluster.xml
   examples/platforms/platform.xml
   examples/platforms/prop.xml
   examples/platforms/routing_cluster.xml