Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
remove deprecated simdag/properties example
authorFrederic Suter <frederic.suter@cc.in2p3.fr>
Tue, 10 Mar 2020 13:29:14 +0000 (14:29 +0100)
committerFrederic Suter <frederic.suter@cc.in2p3.fr>
Tue, 10 Mar 2020 13:32:41 +0000 (14:32 +0100)
superseded by examples/s4u/platform-properties

MANIFEST.in
examples/deprecated/simdag/CMakeLists.txt
examples/deprecated/simdag/properties/sd_properties.c [deleted file]
examples/deprecated/simdag/properties/sd_properties.tesh [deleted file]

index 031b369..4a00f6a 100644 (file)
@@ -288,8 +288,6 @@ include examples/deprecated/simdag/daxload/simple_dax_with_cycle.xml
 include examples/deprecated/simdag/daxload/smalldax.xml
 include examples/deprecated/simdag/fail/sd_fail.c
 include examples/deprecated/simdag/fail/sd_fail.tesh
-include examples/deprecated/simdag/properties/sd_properties.c
-include examples/deprecated/simdag/properties/sd_properties.tesh
 include examples/deprecated/simdag/ptg-dotload/ptg.dot
 include examples/deprecated/simdag/ptg-dotload/sd_ptg-dotload.c
 include examples/deprecated/simdag/ptg-dotload/sd_ptg-dotload.tesh
index 089d2da..7c47790 100644 (file)
@@ -1,4 +1,4 @@
-foreach(x daxload fail typed_tasks properties throttling scheduling)
+foreach(x daxload fail typed_tasks throttling scheduling)
   add_executable       (sd_${x}  EXCLUDE_FROM_ALL  ${x}/sd_${x}.c)
   target_link_libraries(sd_${x}     simgrid)
   set_target_properties(sd_${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
@@ -39,7 +39,7 @@ set(txt_files    ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/dag-dotload/dag_wi
                                   ${CMAKE_CURRENT_SOURCE_DIR}/schedule-dotload/dag_with_good_schedule.dot
                                   ${CMAKE_CURRENT_SOURCE_DIR}/scheduling/expected_output.jed               PARENT_SCOPE)
 
-foreach(x daxload fail typed_tasks properties throttling scheduling test)
+foreach(x daxload fail typed_tasks throttling scheduling test)
   ADD_TESH(simdag-${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/deprecated/simdag --cd ${CMAKE_BINARY_DIR}/examples/deprecated/simdag ${CMAKE_HOME_DIRECTORY}/examples/deprecated/simdag/${x}/sd_${x}.tesh)
 endforeach()
 
diff --git a/examples/deprecated/simdag/properties/sd_properties.c b/examples/deprecated/simdag/properties/sd_properties.c
deleted file mode 100644 (file)
index f6f7545..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Copyright (c) 2007-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. */
-
-#include "simgrid/simdag.h"
-
-XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Property test");
-
-int main(int argc, char **argv)
-{
-  xbt_dict_cursor_t cursor = NULL;
-  char *key;
-  char *data;
-  char noexist[] = "NoProp";
-  const char *value;
-  char exist[] = "Hdd";
-
-  /* SD initialization */
-  SD_init(&argc, argv);
-  xbt_assert(argc > 1, "Usage: %s platform_file\n\tExample: %s ../../platforms/prop.xml", argv[0], argv[0]);
-
-  SD_create_environment(argv[1]);
-
-  /* init of platform elements */
-  sg_host_t h1 = sg_host_by_name("host1");
-  sg_host_t h2 = sg_host_by_name("host2");
-  const char *name1 = sg_host_get_name(h1);
-  const char *name2 = sg_host_get_name(h2);
-
-  /* Trying to set a new property */
-  sg_host_set_property_value(h1, "NewProp", "newValue");
-
-  /* Get the property list of 'host1'. This is only a copy of the internal data structure.*/
-  XBT_INFO("Property list for host %s", name1);
-  xbt_dict_t props = sg_host_get_properties(h1);
-
-
-  /* Print the properties of 'host1' */
-  xbt_dict_foreach (props, cursor, key, data)
-    XBT_INFO("\tProperty: %s has value: %s", key, data);
-
-  /* Try to get a property that does not exist */
-  value = sg_host_get_property_value(h1, noexist);
-  XBT_INFO("\tProperty: %s has value: %s", noexist, value?value:"Undefined (NULL)");
-
-  xbt_dict_free(&props);
-
-  /* Get the property list of 'host2' */
-  XBT_INFO("Property list for host %s", name2);
-  props = sg_host_get_properties(h2);
-
-  /* Print the properties of 'host2' */
-  xbt_dict_foreach (props, cursor, key, data)
-    XBT_INFO("\tProperty: %s on host: %s", key, data);
-
-  xbt_dict_free(&props);
-
-  /* Modify an existing property test. First check it exists */
-  XBT_INFO("Modify an existing property");
-
-  value = sg_host_get_property_value(h2, exist);
-  if (value == NULL)
-    XBT_INFO("\tProperty: %s is undefined", exist);
-  else {
-    XBT_INFO("\tProperty: %s old value: %s", exist, value);
-    sg_host_set_property_value(h2, exist, "250");
-  }
-
-  /* Test if we have changed the value */
-  value = sg_host_get_property_value(h2, exist);
-  XBT_INFO("\tProperty: %s new value: %s", exist, value?value:"Undefined (NULL)");
-
-  /* Test if properties are displayed by sg_host_dump */
-  sg_host_dump(h2);
-
-  return 0;
-}
diff --git a/examples/deprecated/simdag/properties/sd_properties.tesh b/examples/deprecated/simdag/properties/sd_properties.tesh
deleted file mode 100644 (file)
index cf3d6a4..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env tesh
-
-p Simple test of simdag with properties
-
-$ properties/sd_properties ${srcdir:=.}/../../platforms/prop.xml
-> [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
-> [0.000000] [test/INFO] Property list for host host1
-> [0.000000] [test/INFO]       Property: mem has value: 4
-> [0.000000] [test/INFO]       Property: NewProp has value: newValue
-> [0.000000] [test/INFO]       Property: Hdd has value: 180
-> [0.000000] [test/INFO]       Property: NoProp has value: Undefined (NULL)
-> [0.000000] [test/INFO] Property list for host host2
-> [0.000000] [test/INFO]       Property: Hdd on host: 120
-> [0.000000] [test/INFO] Modify an existing property
-> [0.000000] [test/INFO]       Property: Hdd old value: 120
-> [0.000000] [test/INFO]       Property: Hdd new value: 250
-> [0.000000] [s4u_host/INFO] Displaying host host2
-> [0.000000] [s4u_host/INFO]   - speed: 1000000000
-> [0.000000] [s4u_host/INFO]   - available speed: 1.00
-> [0.000000] [s4u_host/INFO]   - properties:
-> [0.000000] [s4u_host/INFO]     Hdd->250