A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This hack is not needed since gras is killed.
[simgrid.git]
/
examples
/
simdag
/
properties
/
sd_prop.c
diff --git
a/examples/simdag/properties/sd_prop.c
b/examples/simdag/properties/sd_prop.c
old mode 100755
(executable)
new mode 100644
(file)
index
9b7d424
..
67c3951
--- a/
examples/simdag/properties/sd_prop.c
+++ b/
examples/simdag/properties/sd_prop.c
@@
-1,4
+1,8
@@
-/* $Id$ */
+/* Copyright (c) 2007, 2008, 2009, 2010. 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 <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
@@
-22,13
+26,13
@@
int main(int argc, char **argv)
char *key, *data;
char noexist[] = "NoProp";
const char *value;
char *key, *data;
char noexist[] = "NoProp";
const char *value;
- char exist[] = "
SG_TEST_
Hdd";
+ char exist[] = "Hdd";
/* initialisation of SD */
SD_init(&argc, argv);
if (argc < 2) {
/* initialisation of SD */
SD_init(&argc, argv);
if (argc < 2) {
-
INFO1
("Usage: %s platform_file", argv[0]);
-
INFO1
("example: %s sd_platform.xml", argv[0]);
+
XBT_INFO
("Usage: %s platform_file", argv[0]);
+
XBT_INFO
("example: %s sd_platform.xml", argv[0]);
exit(1);
}
SD_create_environment(argv[1]);
exit(1);
}
SD_create_environment(argv[1]);
@@
-44,55
+48,58
@@
int main(int argc, char **argv)
/* The host properties can be retrived from all interfaces */
/* The host properties can be retrived from all interfaces */
-
INFO1
("Property list for workstation %s", name1);
+
XBT_INFO
("Property list for workstation %s", name1);
/* Get the property list of the workstation 1 */
props = SD_workstation_get_properties(w1);
/* Trying to set a new property */
/* Get the property list of the workstation 1 */
props = SD_workstation_get_properties(w1);
/* Trying to set a new property */
- xbt_dict_set(props,
xbt_strdup("NewProp"), strdup("newValue"), free
);
+ xbt_dict_set(props,
"NewProp", strdup("newValue"), NULL
);
/* Print the properties of the workstation 1 */
xbt_dict_foreach(props, cursor, key, data) {
/* Print the properties of the workstation 1 */
xbt_dict_foreach(props, cursor, key, data) {
-
INFO2
("\tProperty: %s has value: %s", key, data);
+
XBT_INFO
("\tProperty: %s has value: %s", key, data);
}
/* Try to get a property that does not exist */
value = SD_workstation_get_property_value(w1, noexist);
if (value == NULL)
}
/* Try to get a property that does not exist */
value = SD_workstation_get_property_value(w1, noexist);
if (value == NULL)
-
INFO1
("\tProperty: %s is undefined", noexist);
+
XBT_INFO
("\tProperty: %s is undefined", noexist);
else
else
-
INFO2
("\tProperty: %s has value: %s", noexist, value);
+
XBT_INFO
("\tProperty: %s has value: %s", noexist, value);
-
INFO1
("Property list for workstation %s", name2);
+
XBT_INFO
("Property list for workstation %s", name2);
/* Get the property list of the workstation 2 */
props = SD_workstation_get_properties(w2);
cursor = NULL;
/* Print the properties of the workstation 2 */
xbt_dict_foreach(props, cursor, key, data) {
/* Get the property list of the workstation 2 */
props = SD_workstation_get_properties(w2);
cursor = NULL;
/* Print the properties of the workstation 2 */
xbt_dict_foreach(props, cursor, key, data) {
-
INFO2
("\tProperty: %s on host: %s", key, data);
+
XBT_INFO
("\tProperty: %s on host: %s", key, data);
}
/* Modify an existing property test. First check it exists */
}
/* Modify an existing property test. First check it exists */
-
INFO0
("Modify an existing property");
+
XBT_INFO
("Modify an existing property");
value = SD_workstation_get_property_value(w2, exist);
if (value == NULL)
value = SD_workstation_get_property_value(w2, exist);
if (value == NULL)
-
INFO1
("\tProperty: %s is undefined", exist);
+
XBT_INFO
("\tProperty: %s is undefined", exist);
else {
else {
-
INFO2
("\tProperty: %s old value: %s", exist, value);
- xbt_dict_set(props, exist, strdup("250"),
free
);
+
XBT_INFO
("\tProperty: %s old value: %s", exist, value);
+ xbt_dict_set(props, exist, strdup("250"),
NULL
);
}
/* Test if we have changed the value */
value = SD_workstation_get_property_value(w2, exist);
if (value == NULL)
}
/* Test if we have changed the value */
value = SD_workstation_get_property_value(w2, exist);
if (value == NULL)
-
INFO1
("\tProperty: %s is undefined", exist);
+
XBT_INFO
("\tProperty: %s is undefined", exist);
else
else
- INFO2("\tProperty: %s new value: %s", exist, value);
+ XBT_INFO("\tProperty: %s new value: %s", exist, value);
+
+ /* Test if properties are displayed by SD_workstation_dump */
+ SD_workstation_dump(w2);
SD_exit();
return 0;
SD_exit();
return 0;