From c9120b61ec798b29e09f03c9fad3cea6704e0435 Mon Sep 17 00:00:00 2001 From: Navarrop Date: Mon, 12 Dec 2011 14:40:32 +0100 Subject: [PATCH] Rename misleading "fullduplex" keyword to "crosstraffic". --- buildtools/Cmake/AddTests.cmake | 7 ++++--- buildtools/Cmake/MakeExe.cmake | 4 +--- .../gtnets/{fullduplex-d.xml => crosstraffic-d.xml} | 0 .../gtnets/{fullduplex-p.xml => crosstraffic-p.xml} | 0 ...nets-fullduplex.tesh => gtnets-crosstraffic.tesh} | 12 ++++++------ src/surf/network.c | 6 +++--- src/surf/network_im.c | 6 +++--- src/surf/surf_config.c | 10 +++++----- src/surf/surf_private.h | 2 +- src/surf/workstation.c | 1 + 10 files changed, 24 insertions(+), 24 deletions(-) rename examples/msg/gtnets/{fullduplex-d.xml => crosstraffic-d.xml} (100%) rename examples/msg/gtnets/{fullduplex-p.xml => crosstraffic-p.xml} (100%) rename examples/msg/gtnets/{gtnets-fullduplex.tesh => gtnets-crosstraffic.tesh} (69%) diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake index d5d96de82c..b0df9c32a6 100644 --- a/buildtools/Cmake/AddTests.cmake +++ b/buildtools/Cmake/AddTests.cmake @@ -325,20 +325,22 @@ ADD_TEST(simdag-test-simdag-seq-access ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTI ADD_TEST(simdag-test-prop ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/properties/test_prop.tesh) ADD_TEST(simdag-minmin-test ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/examples/simdag/scheduling --cd ${CMAKE_HOME_DIRECTORY}/examples/simdag/scheduling test_minmin.tesh) +ADD_TEST(msg-gtnets-crosstraffic-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-crosstraffic.tesh) +ADD_TEST(msg-gtnets-crosstraffic-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-crosstraffic.tesh) +ADD_TEST(msg-gtnets-crosstraffic-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-crosstraffic.tesh) + if(HAVE_GTNETS) ADD_TEST(msg-gtnets-waxman-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-waxman.tesh) ADD_TEST(msg-gtnets-dogbone-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh) ADD_TEST(msg-gtnets-onelink-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-onelink-gtnets.tesh) ADD_TEST(msg-gtnets-dogbone-lv08-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-dogbone-lv08.tesh) ADD_TEST(msg-gtnets-onelink-lv08-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-onelink-lv08.tesh) -ADD_TEST(msg-gtnets-fullduplex-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-fullduplex.tesh) if(HAVE_UCONTEXT_H) ADD_TEST(msg-gtnets-waxman-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-waxman.tesh) ADD_TEST(msg-gtnets-dogbone-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh) ADD_TEST(msg-gtnets-onelink-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-onelink-gtnets.tesh) ADD_TEST(msg-gtnets-dogbone-lv08-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-dogbone-lv08.tesh) ADD_TEST(msg-gtnets-onelink-lv08-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-onelink-lv08.tesh) - ADD_TEST(msg-gtnets-fullduplex-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-fullduplex.tesh) endif(HAVE_UCONTEXT_H) if(HAVE_RAWCTX) ADD_TEST(msg-gtnets-waxman-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-waxman.tesh) @@ -346,7 +348,6 @@ if(HAVE_RAWCTX) ADD_TEST(msg-gtnets-onelink-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-onelink-gtnets.tesh) ADD_TEST(msg-gtnets-dogbone-lv08-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-dogbone-lv08.tesh) ADD_TEST(msg-gtnets-onelink-lv08-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-onelink-lv08.tesh) - ADD_TEST(msg-gtnets-fullduplex-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-fullduplex.tesh) endif(HAVE_RAWCTX) if(HAVE_TRACING) diff --git a/buildtools/Cmake/MakeExe.cmake b/buildtools/Cmake/MakeExe.cmake index da26f94bba..3974506b6f 100644 --- a/buildtools/Cmake/MakeExe.cmake +++ b/buildtools/Cmake/MakeExe.cmake @@ -65,9 +65,7 @@ if(HAVE_MC) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/mc) endif(HAVE_MC) -if(HAVE_GTNETS) - add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets) -endif(HAVE_GTNETS) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets) if(HAVE_NS3) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/ns3) diff --git a/examples/msg/gtnets/fullduplex-d.xml b/examples/msg/gtnets/crosstraffic-d.xml similarity index 100% rename from examples/msg/gtnets/fullduplex-d.xml rename to examples/msg/gtnets/crosstraffic-d.xml diff --git a/examples/msg/gtnets/fullduplex-p.xml b/examples/msg/gtnets/crosstraffic-p.xml similarity index 100% rename from examples/msg/gtnets/fullduplex-p.xml rename to examples/msg/gtnets/crosstraffic-p.xml diff --git a/examples/msg/gtnets/gtnets-fullduplex.tesh b/examples/msg/gtnets/gtnets-crosstraffic.tesh similarity index 69% rename from examples/msg/gtnets/gtnets-fullduplex.tesh rename to examples/msg/gtnets/gtnets-crosstraffic.tesh index 133d841513..6f04937079 100644 --- a/examples/msg/gtnets/gtnets-fullduplex.tesh +++ b/examples/msg/gtnets/gtnets-crosstraffic.tesh @@ -1,19 +1,19 @@ #! ./tesh -p Testing fullduplex TCP option DISABLED +p Testing crosstraffic TCP option DISABLED -$ gtnets/gtnets ${srcdir:=.}/gtnets/fullduplex-p.xml ${srcdir:=.}/gtnets/fullduplex-d.xml --cfg=fullduplex:0 -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'fullduplex' to '0' +$ gtnets/gtnets ${srcdir:=.}/gtnets/crosstraffic-p.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) 108.799652] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 3063.735285 ; message from S1 to C1 with remaining : 666666.666667 > [S1:slave:(8) 108.799652] [msg_test/INFO] ===> Estimated Bw of FLOW[2] : 3063.735285 ; message from S1 to C1 with remaining : 666666.666667 > [S1:slave:(8) 108.799652] [msg_test/INFO] ===> Estimated Bw of FLOW[3] : 3063.735285 ; message from S1 to C1 with remaining : 666666.666667 > [S1:slave:(8) 108.799652] [msg_test/INFO] ===> Estimated Bw of FLOW[4] : 9191.205854 ; message from C1 to S1 with remaining : 0.000000 -p Testing fullduplex TCP option ENABLED +p Testing crosstraffic TCP option ENABLED -$ gtnets/gtnets ${srcdir:=.}/gtnets/fullduplex-p.xml ${srcdir:=.}/gtnets/fullduplex-d.xml --cfg=fullduplex:1 -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'fullduplex' to '1' +$ gtnets/gtnets ${srcdir:=.}/gtnets/crosstraffic-p.xml ${srcdir:=.}/gtnets/crosstraffic-d.xml --cfg=network/crosstraffic:1 +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/crosstraffic' to '1' > [C1:slave:(2) 331.625739] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 3015.447482 ; message from S1 to C1 with remaining : 0.000000 > [C1:slave:(2) 331.625739] [msg_test/INFO] ===> Estimated Bw of FLOW[2] : 3015.447482 ; message from S1 to C1 with remaining : 0.000000 > [C1:slave:(2) 331.625739] [msg_test/INFO] ===> Estimated Bw of FLOW[3] : 3015.447482 ; message from S1 to C1 with remaining : 0.000000 diff --git a/src/surf/network.c b/src/surf/network.c index 0a2aff0e8a..d9afd7be6e 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -26,7 +26,7 @@ double sg_bandwidth_factor = 1.0; /* default value; can be set by model or double sg_weight_S_parameter = 0.0; /* default value; can be set by model or from command line */ double sg_tcp_gamma = 0.0; -int sg_network_fullduplex = 0; +int sg_network_crosstraffic = 0; xbt_dict_t gap_lookup = NULL; @@ -589,7 +589,7 @@ static surf_action_t net_communicate(const char *src_name, // I need to have the forward and backward routes at the same time, so allocate "route". That way, the routing wont clean it up routing_get_route_and_latency(src_name, dst_name, &route, &latency); - if (sg_network_fullduplex == 1) { + if (sg_network_crosstraffic == 1) { // FIXME: fill route directly routing_get_route_and_latency(dst_name, src_name, &back_route,NULL); } @@ -698,7 +698,7 @@ static surf_action_t net_communicate(const char *src_name, action->variable, 1.0); } - if (sg_network_fullduplex == 1) { + if (sg_network_crosstraffic == 1) { XBT_DEBUG("Fullduplex active adding backward flow using 5%c", '%'); xbt_dynar_foreach(back_route, i, link) { lmm_expand(network_maxmin_system, link->lmm_resource.constraint, diff --git a/src/surf/network_im.c b/src/surf/network_im.c index 8c33ec3f6f..b5fc462016 100644 --- a/src/surf/network_im.c +++ b/src/surf/network_im.c @@ -41,7 +41,7 @@ double sg_bandwidth_factor = 1.0; /* default value; can be set by model or double sg_weight_S_parameter = 0.0; /* default value; can be set by model or from command line */ double sg_tcp_gamma = 0.0; -int sg_network_fullduplex = 0; +int sg_network_crosstraffic = 0; xbt_dict_t gap_lookup = NULL; @@ -783,7 +783,7 @@ static surf_action_t im_net_communicate(const char *src_name, xbt_dynar_t route=xbt_dynar_new(global_routing->size_of_link,NULL); routing_get_route_and_latency(src_name, dst_name, &route, &latency); - if (sg_network_fullduplex == 1) { + if (sg_network_crosstraffic == 1) { // FIXME: fill route directly (unclear: check with blame who put the FIXME) routing_get_route_and_latency(dst_name, src_name, &back_route,NULL); } @@ -906,7 +906,7 @@ static surf_action_t im_net_communicate(const char *src_name, action->variable, 1.0); } - if (sg_network_fullduplex == 1) { + if (sg_network_crosstraffic == 1) { XBT_DEBUG("Fullduplex active adding backward flow using 5%c", '%'); xbt_dynar_foreach(back_route, i, link) { lmm_expand(network_im_maxmin_system, link->lmm_resource.constraint, diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c index dc156cb08d..02ab8a8067 100644 --- a/src/surf/surf_config.c +++ b/src/surf/surf_config.c @@ -269,10 +269,10 @@ static void _surf_cfg_cb__surf_network_coordinates(const char *name, } } -static void _surf_cfg_cb__surf_network_fullduplex(const char *name, +static void _surf_cfg_cb__surf_network_crosstraffic(const char *name, int pos) { - sg_network_fullduplex = xbt_cfg_get_int(_surf_cfg_set, name); + sg_network_crosstraffic = xbt_cfg_get_int(_surf_cfg_set, name); } #ifdef HAVE_GTNETS @@ -489,11 +489,11 @@ void surf_config_init(int *argc, char **argv) xbt_cfg_setdefault_string(_surf_cfg_set, "coordinates", default_value); default_value_int = 0; - xbt_cfg_register(&_surf_cfg_set, "fullduplex", + xbt_cfg_register(&_surf_cfg_set, "network/crosstraffic", "Activate the interferences between uploads and downloads for fluid max-min models (LV08, CM02)", xbt_cfgelm_int, &default_value_int, 0, 1, - _surf_cfg_cb__surf_network_fullduplex, NULL); - xbt_cfg_setdefault_int(_surf_cfg_set, "fullduplex", default_value_int); + _surf_cfg_cb__surf_network_crosstraffic, NULL); + xbt_cfg_setdefault_int(_surf_cfg_set, "network/crosstraffic", default_value_int); #ifdef HAVE_GTNETS xbt_cfg_register(&_surf_cfg_set, "gtnets_jitter", diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h index 4a322d05b6..c1ba50657e 100644 --- a/src/surf/surf_private.h +++ b/src/surf/surf_private.h @@ -30,7 +30,7 @@ extern double sg_latency_factor; extern double sg_bandwidth_factor; extern double sg_weight_S_parameter; extern int sg_maxmin_selective_update; -extern int sg_network_fullduplex; +extern int sg_network_crosstraffic; #ifdef HAVE_GTNETS extern double sg_gtnets_jitter; extern int sg_gtnets_jitter_seed; diff --git a/src/surf/workstation.c b/src/surf/workstation.c index 843ea3b868..2361121fca 100644 --- a/src/surf/workstation.c +++ b/src/surf/workstation.c @@ -342,6 +342,7 @@ static void surf_workstation_model_init_internal(void) void surf_workstation_model_init_current_default(void) { surf_workstation_model_init_internal(); + xbt_cfg_setdefault_int(_surf_cfg_set, "network/crosstraffic", 1); surf_cpu_model_init_Cas01(); im_surf_network_model_init_LegrandVelho(); -- 2.20.1