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
start filling the NEWS file
[simgrid.git]
/
examples
/
smpi
/
smpi_msg_masterslave
/
masterslave_mailbox_smpi.c
diff --git
a/examples/smpi/smpi_msg_masterslave/masterslave_mailbox_smpi.c
b/examples/smpi/smpi_msg_masterslave/masterslave_mailbox_smpi.c
index
7180271
..
b3ccbfb
100644
(file)
--- a/
examples/smpi/smpi_msg_masterslave/masterslave_mailbox_smpi.c
+++ b/
examples/smpi/smpi_msg_masterslave/masterslave_mailbox_smpi.c
@@
-1,11
+1,13
@@
-/* Copyright (c) 2010-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2010-2018. 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. */
#include "simgrid/msg.h"
#include "mpi.h"
/* 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 "simgrid/msg.h"
#include "mpi.h"
+
+#include <stdio.h> /* snprintf */
+
XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
static int master(int argc, char *argv[])
XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
static int master(int argc, char *argv[])
@@
-15,18
+17,15
@@
static int master(int argc, char *argv[])
double task_comm_size = xbt_str_parse_double(argv[3], "Invalid communication size: %s");
long slaves_count = xbt_str_parse_int(argv[4], "Invalid amount of slaves: %s");
double task_comm_size = xbt_str_parse_double(argv[3], "Invalid communication size: %s");
long slaves_count = xbt_str_parse_int(argv[4], "Invalid amount of slaves: %s");
- int i;
-
XBT_INFO("Got %ld slaves and %ld tasks to process", slaves_count, number_of_tasks);
XBT_INFO("Got %ld slaves and %ld tasks to process", slaves_count, number_of_tasks);
- for (i = 0; i < number_of_tasks; i++) {
+ for (i
nt i
= 0; i < number_of_tasks; i++) {
char mailbox[256];
char sprintf_buffer[256];
char mailbox[256];
char sprintf_buffer[256];
- msg_task_t task = NULL;
snprintf(mailbox,256, "slave-%ld", i % slaves_count);
snprintf(sprintf_buffer,256, "Task_%d", i);
snprintf(mailbox,256, "slave-%ld", i % slaves_count);
snprintf(sprintf_buffer,256, "Task_%d", i);
- task = MSG_task_create(sprintf_buffer, task_comp_size, task_comm_size, NULL);
+
msg_task_t
task = MSG_task_create(sprintf_buffer, task_comp_size, task_comm_size, NULL);
if (number_of_tasks < 10000 || i % 10000 == 0)
XBT_INFO("Sending \"%s\" (of %ld) to mailbox \"%s\"", task->name, number_of_tasks, mailbox);
if (number_of_tasks < 10000 || i % 10000 == 0)
XBT_INFO("Sending \"%s\" (of %ld) to mailbox \"%s\"", task->name, number_of_tasks, mailbox);
@@
-34,7
+33,7
@@
static int master(int argc, char *argv[])
}
XBT_INFO("All tasks have been dispatched. Let's tell everybody the computation is over.");
}
XBT_INFO("All tasks have been dispatched. Let's tell everybody the computation is over.");
- for (i = 0; i < slaves_count; i++) {
+ for (i
nt i
= 0; i < slaves_count; i++) {
char mailbox[80];
snprintf(mailbox,80, "slave-%ld", i % slaves_count);
char mailbox[80];
snprintf(mailbox,80, "slave-%ld", i % slaves_count);
@@
-76,7
+75,7
@@
static int alltoall_mpi(int argc, char *argv[])
XBT_INFO("alltoall for rank %d", rank);
int* out=malloc(1000*size*sizeof(int));
int* in=malloc(1000*size*sizeof(int));
XBT_INFO("alltoall for rank %d", rank);
int* out=malloc(1000*size*sizeof(int));
int* in=malloc(1000*size*sizeof(int));
- MPI_Alltoall(out, 1000, MPI_INT,in, 1000, MPI_INT, MPI_COMM_WORLD);
+ MPI_Alltoall(out, 1000, MPI_INT,in, 1000, MPI_INT, MPI_COMM_WORLD);
XBT_INFO("after alltoall %d", rank);
free(out);
XBT_INFO("after alltoall %d", rank);
free(out);
@@
-120,6
+119,7
@@
int main(int argc, char *argv[])
msg_error_t res;
MSG_init(&argc, argv);
msg_error_t res;
MSG_init(&argc, argv);
+ SMPI_init();
xbt_assert(argc > 2,"Usage: %s platform_file deployment_file\n"
"\nexample: %s msg_platform.xml msg_deployment.xml\n", argv[0], argv[0]);
xbt_assert(argc > 2,"Usage: %s platform_file deployment_file\n"
"\nexample: %s msg_platform.xml msg_deployment.xml\n", argv[0], argv[0]);
@@
-133,7
+133,6
@@
int main(int argc, char *argv[])
// the second performing an alltoall on 4 nodes
SMPI_app_instance_register("alltoall_mpi", alltoall_mpi,4);
MSG_launch_application(argv[2]);
// the second performing an alltoall on 4 nodes
SMPI_app_instance_register("alltoall_mpi", alltoall_mpi,4);
MSG_launch_application(argv[2]);
- SMPI_init();
res = MSG_main();
res = MSG_main();