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
Put the different model in the dtd. Permit the xml validation before parsing.
[simgrid.git]
/
examples
/
msg
/
masterslave
/
masterslave_bypass.c
diff --git
a/examples/msg/masterslave/masterslave_bypass.c
b/examples/msg/masterslave/masterslave_bypass.c
index
2a44623
..
3b4f97c
100644
(file)
--- a/
examples/msg/masterslave/masterslave_bypass.c
+++ b/
examples/msg/masterslave/masterslave_bypass.c
@@
-28,8
+28,7
@@
static int surf_parse_bypass_platform(void)
XBT_DEBUG("<AS>");
SURFXML_BUFFER_SET(AS_id, "AS0");
XBT_DEBUG("<AS>");
SURFXML_BUFFER_SET(AS_id, "AS0");
- SURFXML_BUFFER_SET(AS_coordinates, "");
- SURFXML_BUFFER_SET(AS_routing, "Full");
+ A_surfxml_AS_routing = A_surfxml_AS_routing_Full;
SURFXML_START_TAG(AS);
XBT_DEBUG("<host id=\"host A\" power=\"100000000.00\"/>");
SURFXML_START_TAG(AS);
XBT_DEBUG("<host id=\"host A\" power=\"100000000.00\"/>");
@@
-73,7
+72,7
@@
static int surf_parse_bypass_platform(void)
SURFXML_BUFFER_SET(route_dst, "host B");
A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_YES;
SURFXML_START_TAG(route);
SURFXML_BUFFER_SET(route_dst, "host B");
A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_YES;
SURFXML_START_TAG(route);
- XBT_DEBUG(" <link:ctn id=\"LinkA\"/>");
+ XBT_DEBUG(" <link:ctn id=\"LinkA\"/>");
SURFXML_BUFFER_SET(link_ctn_id, "LinkA");
A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
SURFXML_START_TAG(link_ctn);
SURFXML_BUFFER_SET(link_ctn_id, "LinkA");
A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
SURFXML_START_TAG(link_ctn);
@@
-153,11
+152,6
@@
int master(int argc, char *argv[]);
int slave(int argc, char *argv[]);
MSG_error_t test_all(void);
int slave(int argc, char *argv[]);
MSG_error_t test_all(void);
-typedef enum {
- PORT_22 = 0,
- MAX_CHANNEL
-} channel_t;
-
/** Emitter function */
int master(int argc, char *argv[])
{
/** Emitter function */
int master(int argc, char *argv[])
{
@@
-168,14
+162,14
@@
int master(int argc, char *argv[])
double task_comp_size = 0;
double task_comm_size = 0;
int i;
double task_comp_size = 0;
double task_comm_size = 0;
int i;
- int read;
+
_XBT_GNUC_UNUSED
int read;
read = sscanf(argv[1], "%d", &number_of_tasks);
read = sscanf(argv[1], "%d", &number_of_tasks);
- xbt_assert
1
(read, "Invalid argument %s\n", argv[1]);
+ xbt_assert(read, "Invalid argument %s\n", argv[1]);
read = sscanf(argv[2], "%lg", &task_comp_size);
read = sscanf(argv[2], "%lg", &task_comp_size);
- xbt_assert
1
(read, "Invalid argument %s\n", argv[2]);
+ xbt_assert(read, "Invalid argument %s\n", argv[2]);
read = sscanf(argv[3], "%lg", &task_comm_size);
read = sscanf(argv[3], "%lg", &task_comm_size);
- xbt_assert
1
(read, "Invalid argument %s\n", argv[3]);
+ xbt_assert(read, "Invalid argument %s\n", argv[3]);
{ /* Task creation */
char sprintf_buffer[64];
{ /* Task creation */
char sprintf_buffer[64];
@@
-205,7
+199,7
@@
int master(int argc, char *argv[])
XBT_INFO("Got %d slave(s) :", slaves_count);
for (i = 0; i < slaves_count; i++)
XBT_INFO("Got %d slave(s) :", slaves_count);
for (i = 0; i < slaves_count; i++)
- XBT_INFO("\t %s",
slaves[i]->name
);
+ XBT_INFO("\t %s",
MSG_host_get_name(slaves[i])
);
XBT_INFO("Got %d task to process :", number_of_tasks);
XBT_INFO("Got %d task to process :", number_of_tasks);
@@
-214,19
+208,19
@@
int master(int argc, char *argv[])
for (i = 0; i < number_of_tasks; i++) {
XBT_INFO("Sending \"%s\" to \"%s\"",
for (i = 0; i < number_of_tasks; i++) {
XBT_INFO("Sending \"%s\" to \"%s\"",
- todo[i]->name,
slaves[i % slaves_count]->name
);
+ todo[i]->name,
MSG_host_get_name(slaves[i % slaves_count])
);
if (MSG_host_self() == slaves[i % slaves_count]) {
XBT_INFO("Hey ! It's me ! :)");
}
if (MSG_host_self() == slaves[i % slaves_count]) {
XBT_INFO("Hey ! It's me ! :)");
}
- MSG_task_
put(todo[i], slaves[i % slaves_count], PORT_22
);
+ MSG_task_
send(todo[i], MSG_host_get_name(slaves[i % slaves_count])
);
XBT_INFO("Send completed");
}
XBT_INFO
("All tasks have been dispatched. Let's tell everybody the computation is over.");
for (i = 0; i < slaves_count; i++)
XBT_INFO("Send completed");
}
XBT_INFO
("All tasks have been dispatched. Let's tell everybody the computation is over.");
for (i = 0; i < slaves_count; i++)
- MSG_task_
put
(MSG_task_create("finalize", 0, 0, FINALIZE),
-
slaves[i], PORT_22
);
+ MSG_task_
send
(MSG_task_create("finalize", 0, 0, FINALIZE),
+
MSG_host_get_name(slaves[i])
);
XBT_INFO("Goodbye now!");
free(slaves);
XBT_INFO("Goodbye now!");
free(slaves);
@@
-241,7
+235,7
@@
int slave(int argc, char *argv[])
while (1) {
m_task_t task = NULL;
int a;
while (1) {
m_task_t task = NULL;
int a;
- a = MSG_task_
get(&(task), PORT_22
);
+ a = MSG_task_
receive(&task, MSG_host_get_name(MSG_host_self())
);
if (a == MSG_OK) {
XBT_INFO("Received \"%s\" ", MSG_task_get_name(task));
if (MSG_task_get_data(task) == FINALIZE) {
if (a == MSG_OK) {
XBT_INFO("Received \"%s\" ", MSG_task_get_name(task));
if (MSG_task_get_data(task) == FINALIZE) {
@@
-267,7
+261,6
@@
MSG_error_t test_all(void)
MSG_error_t res = MSG_OK;
/* Simulation setting */
MSG_error_t res = MSG_OK;
/* Simulation setting */
- MSG_set_channel_number(MAX_CHANNEL);
surf_parse = surf_parse_bypass_platform;
MSG_create_environment(NULL);
surf_parse = surf_parse_bypass_platform;
MSG_create_environment(NULL);