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
kill dead code
[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
6cced3c
..
c77494e
100644
(file)
--- a/
examples/msg/properties/msg_prop.c
+++ b/
examples/msg/properties/msg_prop.c
@@
-1,10
+1,10
@@
-/* 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
* under the terms of the license (GNU LGPL) which comes with this package. */
* 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 "
msg/msg.h" /* Yeah! If you want to use msg, you need to include msg
/msg.h */
+#include "
simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid
/msg.h */
#include "xbt/sysdep.h" /* calloc, printf */
/* Create a log channel to have nice outputs. */
#include "xbt/sysdep.h" /* calloc, printf */
/* Create a log channel to have nice outputs. */
@@
-31,12
+31,13
@@
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 david(int argc, char *argv[]);
msg_error_t test_all(const char *platform_file,
const char *application_file);
static void test_host(const char*hostname)
{
msg_error_t test_all(const char *platform_file,
const char *application_file);
static void test_host(const char*hostname)
{
- msg_host_t thehost = MSG_
get_
host_by_name(hostname);
+ msg_host_t thehost = MSG_host_by_name(hostname);
xbt_dict_t props = MSG_host_get_properties(thehost);
xbt_dict_cursor_t cursor = NULL;
char *key, *data;
xbt_dict_t props = MSG_host_get_properties(thehost);
xbt_dict_cursor_t cursor = NULL;
char *key, *data;
@@
-44,7
+45,7
@@
static void test_host(const char*hostname)
const char *value;
char exist[] = "Hdd";
const char *value;
char exist[] = "Hdd";
- XBT_INFO("== Print the properties of the host
"
);
+ XBT_INFO("== Print the properties of the host
'%s'", hostname
);
xbt_dict_foreach(props, cursor, key, data)
XBT_INFO(" Host property: '%s' -> '%s'", key, data);
xbt_dict_foreach(props, cursor, key, data)
XBT_INFO(" Host property: '%s' -> '%s'", key, data);
@@
-62,7
+63,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);
@@
-73,7
+74,7
@@
static void test_host(const char*hostname)
XBT_INFO(" Property: %s old value: %s", exist, value);
/* Restore the value for the next test */
XBT_INFO(" Property: %s old value: %s", exist, value);
/* 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 */
@@
-85,6
+86,11
@@
int carole(int argc, char *argv[]) {/* Dump what we have on a remote host */
test_host("host1");
return 0;
}
test_host("host1");
return 0;
}
+int david(int argc, char *argv[]) {/* Dump what we have on a remote host */
+ MSG_process_sleep(2); // Wait for alice and carole to be done with its experiment
+ test_host("node-0.acme.org");
+ return 0;
+}
int bob(int argc, char *argv[])
{
int bob(int argc, char *argv[])
{
@@
-93,7
+99,7
@@
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";
-
_XBT_GNUC
_UNUSED const char *value;
+
XBT_ATTRIB
_UNUSED const char *value;
XBT_INFO("== Print the properties of the process");
xbt_dict_foreach(props, cursor, key, data)
XBT_INFO("== Print the properties of the process");
xbt_dict_foreach(props, cursor, key, data)
@@
-120,6
+126,7
@@
msg_error_t test_all(const char *platform_file,
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);
+ MSG_function_register("david", david);
MSG_create_environment(platform_file);
MSG_create_environment(platform_file);