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
have a single Cmake file for tesh-msg
[simgrid.git]
/
teshsuite
/
msg
/
get_sender
/
get_sender.c
diff --git
a/teshsuite/msg/get_sender/get_sender.c
b/teshsuite/msg/get_sender/get_sender.c
index
68bd184
..
8cdab2f
100644
(file)
--- a/
teshsuite/msg/get_sender/get_sender.c
+++ b/
teshsuite/msg/get_sender/get_sender.c
@@
-4,18
+4,15
@@
/* 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. */
-#include <stdio.h>
#include "simgrid/msg.h"
#include <float.h>
#include "simgrid/msg.h"
#include <float.h>
-
XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Messages specific to this example");
XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Messages specific to this example");
-
static int sender_fun(int argc, char *argv[])
{
XBT_INFO("Sending");
MSG_task_send(MSG_task_create("Blah", 0.0, 0.0, NULL), MSG_host_get_name(MSG_host_self()));
static int sender_fun(int argc, char *argv[])
{
XBT_INFO("Sending");
MSG_task_send(MSG_task_create("Blah", 0.0, 0.0, NULL), MSG_host_get_name(MSG_host_self()));
- MSG_process_sleep(1.);
/* FIXME: if the sender exits before the receiver calls get_sender(), bad thing happens */
+ MSG_process_sleep(1.); /* FIXME: if the sender exits before the receiver calls get_sender(), bad thing happens */
XBT_INFO("Exiting");
return 0;
}
XBT_INFO("Exiting");
return 0;
}
@@
-26,29
+23,22
@@
static int receiver_fun(int argc, char *argv[])
msg_task_t task = NULL;
MSG_task_receive_with_timeout(&task, MSG_host_get_name(MSG_host_self()), DBL_MAX);
xbt_assert(MSG_task_get_sender(task), "No sender received");
msg_task_t task = NULL;
MSG_task_receive_with_timeout(&task, MSG_host_get_name(MSG_host_self()), DBL_MAX);
xbt_assert(MSG_task_get_sender(task), "No sender received");
- XBT_INFO("Got a message sent by '%s'",
- MSG_process_get_name(MSG_task_get_sender(task)));
+ XBT_INFO("Got a message sent by '%s'", MSG_process_get_name(MSG_task_get_sender(task)));
MSG_task_destroy(task);
return 0;
}
MSG_task_destroy(task);
return 0;
}
-/** Main function */
int main(int argc, char *argv[])
{
msg_error_t res = MSG_OK;
MSG_init(&argc, argv);
int main(int argc, char *argv[])
{
msg_error_t res = MSG_OK;
MSG_init(&argc, argv);
- /* Application deployment */
- MSG_function_register("send", &sender_fun);
- MSG_function_register("receive", &receiver_fun);
-
MSG_create_environment(argv[1]);
MSG_create_environment(argv[1]);
- MSG_launch_application(argv[2]);
- res = MSG_main();
- if (res == MSG_OK)
- return 0;
- else
- return 1;
+ MSG_process_create("send", sender_fun, NULL, MSG_get_host_by_name("Tremblay"));
+ MSG_process_create("receive", receiver_fun, NULL, MSG_get_host_by_name("Tremblay"));
+
+ res = MSG_main();
+ return res != MSG_OK;
}
}