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
Check for errors from MSG_task_receive.
[simgrid.git]
/
examples
/
msg
/
pmm
/
msg_pmm.c
diff --git
a/examples/msg/pmm/msg_pmm.c
b/examples/msg/pmm/msg_pmm.c
index
243657d
..
eda3b83
100644
(file)
--- a/
examples/msg/pmm/msg_pmm.c
+++ b/
examples/msg/pmm/msg_pmm.c
@@
-47,7
+47,7
@@
typedef struct s_node_job{
xbt_matrix_t B;
} s_node_job_t, *node_job_t;
xbt_matrix_t B;
} s_node_job_t, *node_job_t;
-/*
*
+/*
* Structure for recovering results
*/
typedef struct s_result {
* Structure for recovering results
*/
typedef struct s_result {
@@
-160,7
+160,7
@@
int node(int argc, char **argv)
/* The rest: return the result to node 0 */
}else{
/* The rest: return the result to node 0 */
}else{
- m_task_t task;
+ m
sg
_task_t task;
XBT_VERB("Multiplication done. Send the sub-result.");
XBT_VERB("Multiplication done. Send the sub-result.");
@@
-187,7
+187,7
@@
static void broadcast_jobs(node_job_t *jobs)
{
int node;
char node_mbox[MAILBOX_NAME_SIZE];
{
int node;
char node_mbox[MAILBOX_NAME_SIZE];
- m_task_t task;
+ m
sg
_task_t task;
msg_comm_t comms[GRID_NUM_NODES - 1] = {0};
XBT_VERB("Broadcast Jobs");
msg_comm_t comms[GRID_NUM_NODES - 1] = {0};
XBT_VERB("Broadcast Jobs");
@@
-202,11
+202,14
@@
static void broadcast_jobs(node_job_t *jobs)
static node_job_t wait_job(int selfid)
{
static node_job_t wait_job(int selfid)
{
- m_task_t task = NULL;
+ m
sg
_task_t task = NULL;
char self_mbox[MAILBOX_NAME_SIZE];
node_job_t job;
char self_mbox[MAILBOX_NAME_SIZE];
node_job_t job;
+ msg_error_t err;
snprintf(self_mbox, MAILBOX_NAME_SIZE - 1, "%d", selfid);
snprintf(self_mbox, MAILBOX_NAME_SIZE - 1, "%d", selfid);
- MSG_task_receive(&task, self_mbox);
+ err = MSG_task_receive(&task, self_mbox);
+ if (err != MSG_OK)
+ xbt_die("Error while receiving from %s (%d)", self_mbox, (int)err);
job = (node_job_t)MSG_task_get_data(task);
MSG_task_destroy(task);
XBT_VERB("Got Job (%d,%d)", job->row, job->col);
job = (node_job_t)MSG_task_get_data(task);
MSG_task_destroy(task);
XBT_VERB("Got Job (%d,%d)", job->row, job->col);
@@
-218,7
+221,7
@@
static void broadcast_matrix(xbt_matrix_t M, int num_nodes, int *nodes)
{
int node;
char node_mbox[MAILBOX_NAME_SIZE];
{
int node;
char node_mbox[MAILBOX_NAME_SIZE];
- m_task_t task;
+ m
sg
_task_t task;
xbt_matrix_t sM;
for(node=0; node < num_nodes; node++){
xbt_matrix_t sM;
for(node=0; node < num_nodes; node++){
@@
-233,19
+236,22
@@
static void broadcast_matrix(xbt_matrix_t M, int num_nodes, int *nodes)
static void get_sub_matrix(xbt_matrix_t *sM, int selfid)
{
static void get_sub_matrix(xbt_matrix_t *sM, int selfid)
{
- m_task_t task = NULL;
+ m
sg
_task_t task = NULL;
char node_mbox[MAILBOX_NAME_SIZE];
char node_mbox[MAILBOX_NAME_SIZE];
+ msg_error_t err;
XBT_VERB("Get sub-matrix");
snprintf(node_mbox, MAILBOX_NAME_SIZE - 1, "%d", selfid);
XBT_VERB("Get sub-matrix");
snprintf(node_mbox, MAILBOX_NAME_SIZE - 1, "%d", selfid);
- MSG_task_receive(&task, node_mbox);
+ err = MSG_task_receive(&task, node_mbox);
+ if (err != MSG_OK)
+ xbt_die("Error while receiving from %s (%d)", node_mbox, (int)err);
*sM = (xbt_matrix_t)MSG_task_get_data(task);
MSG_task_destroy(task);
}
static void task_cleanup(void *arg){
*sM = (xbt_matrix_t)MSG_task_get_data(task);
MSG_task_destroy(task);
}
static void task_cleanup(void *arg){
- m
_task_t task = (m
_task_t)arg;
+ m
sg_task_t task = (msg
_task_t)arg;
xbt_matrix_t m = (xbt_matrix_t)MSG_task_get_data(task);
xbt_matrix_free(m);
MSG_task_destroy(task);
xbt_matrix_t m = (xbt_matrix_t)MSG_task_get_data(task);
xbt_matrix_free(m);
MSG_task_destroy(task);
@@
-260,7
+266,7
@@
int main(int argc, char *argv[])
xbt_os_timer_t timer = xbt_os_timer_new();
#endif
xbt_os_timer_t timer = xbt_os_timer_new();
#endif
- MSG_
global_
init(&argc, argv);
+ MSG_init(&argc, argv);
char **options = &argv[1];
const char* platform_file = options[0];
char **options = &argv[1];
const char* platform_file = options[0];
@@
-274,14
+280,12
@@
int main(int argc, char *argv[])
#ifdef BENCH_THIS_CODE
xbt_os_timer_start(timer);
#endif
#ifdef BENCH_THIS_CODE
xbt_os_timer_start(timer);
#endif
-
MSG
_error_t res = MSG_main();
+
msg
_error_t res = MSG_main();
#ifdef BENCH_THIS_CODE
xbt_os_timer_stop(timer);
#endif
XBT_CRITICAL("Simulated time: %g", MSG_get_clock());
#ifdef BENCH_THIS_CODE
xbt_os_timer_stop(timer);
#endif
XBT_CRITICAL("Simulated time: %g", MSG_get_clock());
- MSG_clean();
-
if (res == MSG_OK)
return 0;
else
if (res == MSG_OK)
return 0;
else
@@
-334,7
+338,7
@@
static void create_jobs(xbt_matrix_t A, xbt_matrix_t B, node_job_t *jobs)
static void receive_results(result_t *results){
int node;
msg_comm_t comms[GRID_NUM_NODES-1] = {0};
static void receive_results(result_t *results){
int node;
msg_comm_t comms[GRID_NUM_NODES-1] = {0};
- m_task_t tasks[GRID_NUM_NODES-1] = {0};
+ m
sg
_task_t tasks[GRID_NUM_NODES-1] = {0};
XBT_VERB("Receive Results.");
XBT_VERB("Receive Results.");