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
Make xbt_free a function-like macro.
[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
242a8fa
..
6ea54d8
100644
(file)
--- a/
examples/msg/properties/msg_prop.c
+++ b/
examples/msg/properties/msg_prop.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007
, 2008, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2007
-2014
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-31,7
+31,6
@@
XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Property test");
int alice(int argc, char *argv[]);
int bob(int argc, char *argv[]);
int carole(int argc, char *argv[]);
int alice(int argc, char *argv[]);
int bob(int argc, char *argv[]);
int carole(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);
@@
-63,7
+62,7
@@
static void test_host(const char*hostname)
XBT_INFO(" Property: %s old value: %s", exist, value);
XBT_INFO("== Trying to modify a host property");
XBT_INFO(" Property: %s old value: %s", exist, value);
XBT_INFO("== Trying to modify a host property");
- MSG_host_set_property_value(thehost, exist, xbt_strdup("250"),
NULL
);
+ MSG_host_set_property_value(thehost, exist, xbt_strdup("250"),
xbt_free_f
);
/* Test if we have changed the value */
value = MSG_host_get_property_value(thehost, exist);
/* Test if we have changed the value */
value = MSG_host_get_property_value(thehost, exist);
@@
-72,9
+71,9
@@
static void test_host(const char*hostname)
"Value of property %s is defined to %s (where it should be 250)",
exist, value);
XBT_INFO(" Property: %s old value: %s", exist, value);
"Value of property %s is defined to %s (where it should be 250)",
exist, value);
XBT_INFO(" Property: %s old value: %s", exist, value);
-
+
/* Restore the value for the next test */
/* Restore the value for the next test */
- MSG_host_set_property_value(thehost, exist, xbt_strdup("180"),
NULL
);
+ MSG_host_set_property_value(thehost, exist, xbt_strdup("180"),
xbt_free_f
);
}
int alice(int argc, char *argv[]) { /* Dump what we have on the current host */
}
int alice(int argc, char *argv[]) { /* Dump what we have on the current host */
@@
-116,6
+115,8
@@
msg_error_t test_all(const char *platform_file,
unsigned int i;
xbt_dynar_t hosts;
msg_host_t host;
unsigned int i;
xbt_dynar_t hosts;
msg_host_t host;
+ msg_error_t ret;
+
MSG_function_register("alice", alice);
MSG_function_register("bob", bob);
MSG_function_register("carole", carole);
MSG_function_register("alice", alice);
MSG_function_register("bob", bob);
MSG_function_register("carole", carole);
@@
-134,7
+135,11
@@
msg_error_t test_all(const char *platform_file,
MSG_launch_application(application_file);
MSG_launch_application(application_file);
- return MSG_main();
+ ret = MSG_main();
+
+ xbt_dynar_free(&hosts);
+
+ return ret;
} /* end_of_test_all */
} /* end_of_test_all */