X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e4abd3f271729beeff499da36267bfb274dd1f6d..192e6259fa0a0a0b2aa296b0492e63b9785f1fc7:/examples/simdag/properties/sd_prop.c diff --git a/examples/simdag/properties/sd_prop.c b/examples/simdag/properties/sd_prop.c index 67c3951bed..72cbc00c89 100644 --- a/examples/simdag/properties/sd_prop.c +++ b/examples/simdag/properties/sd_prop.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2007-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -6,7 +6,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/ex.h" #include "xbt/log.h" #include "xbt/dynar.h" @@ -16,7 +16,6 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Property test"); int main(int argc, char **argv) { - const SD_workstation_t *workstations; SD_workstation_t w1; SD_workstation_t w2; const char *name1; @@ -28,7 +27,7 @@ int main(int argc, char **argv) const char *value; char exist[] = "Hdd"; - /* initialisation of SD */ + /* SD initialization */ SD_init(&argc, argv); if (argc < 2) { XBT_INFO("Usage: %s platform_file", argv[0]); @@ -38,9 +37,8 @@ int main(int argc, char **argv) SD_create_environment(argv[1]); /* init of platform elements */ - workstations = SD_workstation_get_list(); - w1 = workstations[0]; - w2 = workstations[1]; + w1 = SD_workstation_get_by_name("host1"); + w2 = SD_workstation_get_by_name("host2"); SD_workstation_set_access_mode(w2, SD_WORKSTATION_SEQUENTIAL_ACCESS); name1 = SD_workstation_get_name(w1); name2 = SD_workstation_get_name(w2); @@ -54,7 +52,7 @@ int main(int argc, char **argv) /* Trying to set a new property */ - xbt_dict_set(props, "NewProp", strdup("newValue"), NULL); + xbt_dict_set(props, "NewProp", strdup("newValue"), xbt_free_f); /* Print the properties of the workstation 1 */ xbt_dict_foreach(props, cursor, key, data) { @@ -88,7 +86,7 @@ int main(int argc, char **argv) XBT_INFO("\tProperty: %s is undefined", exist); else { XBT_INFO("\tProperty: %s old value: %s", exist, value); - xbt_dict_set(props, exist, strdup("250"), NULL); + xbt_dict_set(props, exist, strdup("250"), xbt_free_f); } /* Test if we have changed the value */