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
Merge branch 'master' into MC_LTL
[simgrid.git]
/
examples
/
msg
/
properties
/
msg_prop.c
diff --git
a/examples/msg/properties/msg_prop.c
b/examples/msg/properties/msg_prop.c
index
0e26b45
..
5b36d02
100644
(file)
--- a/
examples/msg/properties/msg_prop.c
+++ b/
examples/msg/properties/msg_prop.c
@@
-1,6
+1,5
@@
-/* $Id$ */
-
-/* Copyright (c) 2007. SimGrid Team. All rights reserved. */
+/* 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. */
/* 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. */
@@
-20,7
+19,8
@@
XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Property test");
int alice(int argc, char *argv[]);
int bob(int argc, char *argv[]);
int forwarder(int argc, char *argv[]);
int alice(int argc, char *argv[]);
int bob(int argc, char *argv[]);
int forwarder(int argc, char *argv[]);
-MSG_error_t test_all(const char *platform_file, const char *application_file);
+MSG_error_t test_all(const char *platform_file,
+ const char *application_file);
int alice(int argc, char *argv[])
{
int alice(int argc, char *argv[])
{
@@
-32,32
+32,33
@@
int alice(int argc, char *argv[])
const char *value;
char exist[] = "SG_TEST_Hdd";
const char *value;
char exist[] = "SG_TEST_Hdd";
-
INFO0
("== Print the properties of the host");
+
XBT_INFO
("== Print the properties of the host");
xbt_dict_foreach(props, cursor, key, data)
xbt_dict_foreach(props, cursor, key, data)
-
INFO2
(" Host property: '%s' -> '%s'", key, data);
+
XBT_INFO
(" Host property: '%s' -> '%s'", key, data);
-
INFO0
("== Try to get a host property that does not exist");
+
XBT_INFO
("== Try to get a host property that does not exist");
value = MSG_host_get_property_value(host1, noexist);
value = MSG_host_get_property_value(host1, noexist);
- xbt_assert
0
(!value, "The key exists (it's not supposed to)");
+ xbt_assert(!value, "The key exists (it's not supposed to)");
-
INFO0
("== Try to get a host property that does exist");
+
XBT_INFO
("== Try to get a host property that does exist");
value = MSG_host_get_property_value(host1, exist);
value = MSG_host_get_property_value(host1, exist);
- xbt_assert1(value, "\tProperty %s is undefined (where it should)", exist);
- xbt_assert2(!strcmp(value, "180"),
+ xbt_assert(value, "\tProperty %s is undefined (where it should)",
+ exist);
+ xbt_assert(!strcmp(value, "180"),
"\tValue of property %s is defined to %s (where it should be 180)",
exist, value);
"\tValue of property %s is defined to %s (where it should be 180)",
exist, value);
-
INFO2
(" Property: %s old value: %s", exist, value);
+
XBT_INFO
(" Property: %s old value: %s", exist, value);
-
INFO0
("== Trying to modify a host property");
- xbt_dict_set(props, exist, xbt_strdup("250"),
xbt_free_f
);
+
XBT_INFO
("== Trying to modify a host property");
+ xbt_dict_set(props, exist, xbt_strdup("250"),
NULL
);
/* Test if we have changed the value */
value = MSG_host_get_property_value(host1, exist);
/* Test if we have changed the value */
value = MSG_host_get_property_value(host1, exist);
- xbt_assert
1
(value, "Property %s is undefined (where it should)", exist);
- xbt_assert
2
(!strcmp(value, "250"),
+ xbt_assert(value, "Property %s is undefined (where it should)", exist);
+ xbt_assert(!strcmp(value, "250"),
"Value of property %s is defined to %s (where it should be 250)",
exist, value);
"Value of property %s is defined to %s (where it should be 250)",
exist, value);
-
INFO2
(" Property: %s old value: %s", exist, value);
+
XBT_INFO
(" Property: %s old value: %s", exist, value);
return 0;
}
return 0;
}
@@
-69,22
+70,23
@@
int bob(int argc, char *argv[])
xbt_dict_cursor_t cursor = NULL;
char *key, *data;
const char *noexist = "UnknownProcessProp";
xbt_dict_cursor_t cursor = NULL;
char *key, *data;
const char *noexist = "UnknownProcessProp";
- const char *value;
+
_XBT_GNUC_UNUSED
const char *value;
-
INFO0
("== Print the properties of the process");
+
XBT_INFO
("== Print the properties of the process");
xbt_dict_foreach(props, cursor, key, data)
xbt_dict_foreach(props, cursor, key, data)
-
INFO2
(" Process property: %s -> %s", key, data);
+
XBT_INFO
(" Process property: %s -> %s", key, data);
-
INFO0
("== Try to get a process property that does not exist");
+
XBT_INFO
("== Try to get a process property that does not exist");
value = MSG_process_get_property_value(MSG_process_self(), noexist);
value = MSG_process_get_property_value(MSG_process_self(), noexist);
- xbt_assert
0
(!value, "The property is defined (it shouldnt)");
+ xbt_assert(!value, "The property is defined (it shouldnt)");
return 0;
}
/** Test function */
return 0;
}
/** Test function */
-MSG_error_t test_all(const char *platform_file, const char *application_file)
+MSG_error_t test_all(const char *platform_file,
+ const char *application_file)
{
MSG_function_register("alice", alice);
MSG_function_register("bob", bob);
{
MSG_function_register("alice", alice);
MSG_function_register("bob", bob);