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
various fixes to hopefully compile under win32
[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
bd81da8
..
a7ab122
100644
(file)
--- a/
examples/msg/masterslave/masterslave_bypass.c
+++ b/
examples/msg/masterslave/masterslave_bypass.c
@@
-18,7
+18,8
@@
static int surf_parse_bypass_platform(void)
{
static int AX_ptr = 0;
static int surfxml_bufferstack_size = 2048;
-
+ static int surfxml_buffer_stack_stack_ptr = 0;
+ static int surfxml_buffer_stack_stack[1024];
/* allocating memory for the buffer, I think 2kB should be enough */
surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size);
@@
-28,17
+29,18
@@
static int surf_parse_bypass_platform(void)
XBT_DEBUG("<AS>");
SURFXML_BUFFER_SET(AS_id, "AS0");
-
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_BUFFER_SET(host_id, "host A");
SURFXML_BUFFER_SET(host_power, "100000000.00");
SURFXML_BUFFER_SET(host_availability, "1.0");
- SURFXML_BUFFER_SET(host_availability_file, "");
+ SURFXML_BUFFER_SET(host_availability_
__
file, "");
SURFXML_BUFFER_SET(host_core, "1");
A_surfxml_host_state = A_surfxml_host_state_ON;
- SURFXML_BUFFER_SET(host_state_file, "");
+ SURFXML_BUFFER_SET(host_state___file, "");
+ SURFXML_BUFFER_SET(host_coordinates, "");
SURFXML_START_TAG(host);
SURFXML_END_TAG(host);
@@
-46,22
+48,23
@@
static int surf_parse_bypass_platform(void)
SURFXML_BUFFER_SET(host_id, "host B");
SURFXML_BUFFER_SET(host_power, "100000000.00");
SURFXML_BUFFER_SET(host_availability, "1.0");
- SURFXML_BUFFER_SET(host_availability_file, "");
+ SURFXML_BUFFER_SET(host_availability_
__
file, "");
SURFXML_BUFFER_SET(host_core, "1");
A_surfxml_host_state = A_surfxml_host_state_ON;
- SURFXML_BUFFER_SET(host_state_file, "");
+ SURFXML_BUFFER_SET(host_state___file, "");
+ SURFXML_BUFFER_SET(host_coordinates, "");
SURFXML_START_TAG(host);
SURFXML_END_TAG(host);
XBT_DEBUG("<link id=\"LinkA\" bandwidth=\"10000000.0\" latency=\"0.2\"/>");
SURFXML_BUFFER_SET(link_id, "LinkA");
SURFXML_BUFFER_SET(link_bandwidth, "10000000.0");
- SURFXML_BUFFER_SET(link_bandwidth_file, "");
+ SURFXML_BUFFER_SET(link_bandwidth_
__
file, "");
SURFXML_BUFFER_SET(link_latency, "0.2");
- SURFXML_BUFFER_SET(link_latency_file, "");
+ SURFXML_BUFFER_SET(link_latency_
__
file, "");
A_surfxml_link_state = A_surfxml_link_state_ON;
- SURFXML_BUFFER_SET(link_state_file, "");
- A_surfxml_link_sharing_
policy = A_surfxml_link_sharing
_policy_SHARED;
+ SURFXML_BUFFER_SET(link_state_
__
file, "");
+ A_surfxml_link_sharing_
__policy = A_surfxml_link_sharing__
_policy_SHARED;
SURFXML_START_TAG(link);
SURFXML_END_TAG(link);
@@
-70,11
+73,11
@@
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);
- 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_END_TAG(link_ctn);
+ 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_END_TAG(link_
__
ctn);
XBT_DEBUG("</route>");
SURFXML_END_TAG(route);
@@
-104,8
+107,8
@@
static int surf_parse_bypass_application(void)
/* <process host="host A" function="master"> */
SURFXML_BUFFER_SET(process_host, "host A");
SURFXML_BUFFER_SET(process_function, "master");
- SURFXML_BUFFER_SET(process_start_time, "-1.0");
- SURFXML_BUFFER_SET(process_kill_time, "-1.0");
+ SURFXML_BUFFER_SET(process_start_
__
time, "-1.0");
+ SURFXML_BUFFER_SET(process_kill_
__
time, "-1.0");
SURFXML_START_TAG(process);
/* <argument value="20"/> */
@@
-134,8
+137,8
@@
static int surf_parse_bypass_application(void)
/* <process host="host B" function="slave"/> */
SURFXML_BUFFER_SET(process_host, "host B");
SURFXML_BUFFER_SET(process_function, "slave");
- SURFXML_BUFFER_SET(process_start_time, "-1.0");
- SURFXML_BUFFER_SET(process_kill_time, "-1.0");
+ SURFXML_BUFFER_SET(process_start_
__
time, "-1.0");
+ SURFXML_BUFFER_SET(process_kill_
__
time, "-1.0");
SURFXML_START_TAG(process);
SURFXML_END_TAG(process);
@@
-148,37
+151,31
@@
static int surf_parse_bypass_application(void)
int master(int argc, char *argv[]);
int slave(int argc, char *argv[]);
-MSG_error_t test_all(void);
-
-typedef enum {
- PORT_22 = 0,
- MAX_CHANNEL
-} channel_t;
+msg_error_t test_all(void);
/** Emitter function */
int master(int argc, char *argv[])
{
int slaves_count = 0;
- m_host_t *slaves = NULL;
- m_task_t *todo = NULL;
+ m
sg
_host_t *slaves = NULL;
+ m
sg
_task_t *todo = NULL;
int number_of_tasks = 0;
double task_comp_size = 0;
double task_comm_size = 0;
-
-
int i;
+ _XBT_GNUC_UNUSED int read;
- xbt_assert1(sscanf(argv[1], "%d", &number_of_tasks),
-
"Invalid argument %s\n", argv[1]);
- xbt_assert1(sscanf(argv[2], "%lg", &task_comp_size),
-
"Invalid argument %s\n", argv[2]);
- xbt_assert1(sscanf(argv[3], "%lg", &task_comm_size),
-
"Invalid argument %s\n", argv[3]);
+ read = sscanf(argv[1], "%d", &number_of_tasks);
+
xbt_assert(read,
"Invalid argument %s\n", argv[1]);
+ read = sscanf(argv[2], "%lg", &task_comp_size);
+
xbt_assert(read,
"Invalid argument %s\n", argv[2]);
+ read = sscanf(argv[3], "%lg", &task_comm_size);
+
xbt_assert(read,
"Invalid argument %s\n", argv[3]);
{ /* Task creation */
char sprintf_buffer[64];
- todo = xbt_new0(m_task_t, number_of_tasks);
+ todo = xbt_new0(m
sg
_task_t, number_of_tasks);
for (i = 0; i < number_of_tasks; i++) {
sprintf(sprintf_buffer, "Task_%d", i);
@@
-190,7
+187,7
@@
int master(int argc, char *argv[])
{ /* Process organisation */
slaves_count = argc - 4;
- slaves = xbt_new0(m_host_t, slaves_count);
+ slaves = xbt_new0(m
sg
_host_t, slaves_count);
for (i = 4; i < argc; i++) {
slaves[i - 4] = MSG_get_host_by_name(argv[i]);
@@
-203,7
+200,7
@@
int master(int argc, char *argv[])
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);
@@
-212,19
+209,19
@@
int master(int argc, char *argv[])
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 ! :)");
}
- 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++)
- 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);
@@
-237,9
+234,9
@@
int slave(int argc, char *argv[])
{
XBT_INFO("I'm a slave");
while (1) {
- m_task_t task = NULL;
+ m
sg
_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) {
@@
-252,7
+249,7
@@
int slave(int argc, char *argv[])
MSG_task_destroy(task);
} else {
XBT_INFO("Hey ?! What's up ? ");
- xbt_
assert0(0,
"Unexpected behavior");
+ xbt_
die(
"Unexpected behavior");
}
}
XBT_INFO("I'm done. See you!");
@@
-260,12
+257,11
@@
int slave(int argc, char *argv[])
} /* end_of_slave */
/** Test function */
-
MSG
_error_t test_all(void)
+
msg
_error_t test_all(void)
{
-
MSG
_error_t res = MSG_OK;
+
msg
_error_t res = MSG_OK;
/* Simulation setting */
- MSG_set_channel_number(MAX_CHANNEL);
surf_parse = surf_parse_bypass_platform;
MSG_create_environment(NULL);
@@
-284,11
+280,10
@@
MSG_error_t test_all(void)
/** Main function */
int main(int argc, char *argv[])
{
-
MSG
_error_t res = MSG_OK;
+
msg
_error_t res = MSG_OK;
- MSG_
global_
init(&argc, argv);
+ MSG_init(&argc, argv);
res = test_all();
- MSG_clean();
if (res == MSG_OK)
return 0;