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
use sensible process names (their rank) in SMPI, and get simix ignore that
[simgrid.git]
/
src
/
smpi
/
smpi_global.c
diff --git
a/src/smpi/smpi_global.c
b/src/smpi/smpi_global.c
index
86b1a09
..
6fa73d2
100644
(file)
--- a/
src/smpi/smpi_global.c
+++ b/
src/smpi/smpi_global.c
@@
-5,6
+5,7
@@
* under the terms of the license (GNU LGPL) which comes with this package. */
#include <stdint.h>
* under the terms of the license (GNU LGPL) which comes with this package. */
#include <stdint.h>
+#include <stdio.h>
#include <stdlib.h>
#include "private.h"
#include <stdlib.h>
#include "private.h"
@@
-58,7
+59,7
@@
void smpi_process_init(int *argc, char ***argv)
(*argc)--;
data->argc = argc;
data->argv = argv;
(*argc)--;
data->argc = argc;
data->argv = argv;
-
DEBUG2
("<%d> New process in the game: %p", index, proc);
+
XBT_DEBUG
("<%d> New process in the game: %p", index, proc);
}
}
}
}
@@
-66,7
+67,7
@@
void smpi_process_destroy(void)
{
int index = smpi_process_index();
{
int index = smpi_process_index();
-
DEBUG1
("<%d> Process left the game", index);
+
XBT_DEBUG
("<%d> Process left the game", index);
}
int smpi_process_argc(void) {
}
int smpi_process_argc(void) {
@@
-75,10
+76,10
@@
int smpi_process_argc(void) {
return data->argc ? *(data->argc) - 1 : 0;
}
return data->argc ? *(data->argc) - 1 : 0;
}
-int smpi_process_getarg(int
* index, char* dst, size_t
len) {
+int smpi_process_getarg(int
eger* index, char* dst, ftnlen
len) {
smpi_process_data_t data = smpi_process_data();
char* arg;
smpi_process_data_t data = smpi_process_data();
char* arg;
-
size_t
i;
+
ftnlen
i;
if(!data->argc || !data->argv
|| *index < 1 || *index >= *(data->argc)) {
if(!data->argc || !data->argv
|| *index < 1 || *index >= *(data->argc)) {
@@
-94,14
+95,11
@@
int smpi_process_getarg(int* index, char* dst, size_t len) {
return 0;
}
return 0;
}
-int smpi_global_rank(void) {
- return smpi_process_index();
-}
-
int smpi_global_size(void) {
char* value = getenv("SMPI_GLOBAL_SIZE");
if(!value) {
int smpi_global_size(void) {
char* value = getenv("SMPI_GLOBAL_SIZE");
if(!value) {
+ fprintf(stderr, "Please set env var SMPI_GLOBAL_SIZE to expected number of processes.\n");
abort();
}
return atoi(value);
abort();
}
return atoi(value);
@@
-109,7
+107,7
@@
int smpi_global_size(void) {
smpi_process_data_t smpi_process_data(void)
{
smpi_process_data_t smpi_process_data(void)
{
- return SIMIX_
req_process
_get_data(SIMIX_process_self());
+ return SIMIX_
process_self
_get_data(SIMIX_process_self());
}
smpi_process_data_t smpi_process_remote_data(int index)
}
smpi_process_data_t smpi_process_remote_data(int index)
@@
-171,7
+169,7
@@
MPI_Comm smpi_process_comm_self(void)
void print_request(const char *message, MPI_Request request)
{
void print_request(const char *message, MPI_Request request)
{
-
DEBUG8
("%s request %p [buf = %p, size = %zu, src = %d, dst = %d, tag = %d, flags = %x]",
+
XBT_DEBUG
("%s request %p [buf = %p, size = %zu, src = %d, dst = %d, tag = %d, flags = %x]",
message, request, request->buf, request->size,
request->src, request->dst, request->tag, request->flags);
}
message, request, request->buf, request->size,
request->src, request->dst, request->tag, request->flags);
}
@@
-182,8
+180,7
@@
void smpi_global_init(void)
MPI_Group group;
char name[MAILBOX_NAME_MAXLEN];
MPI_Group group;
char name[MAILBOX_NAME_MAXLEN];
- SIMIX_comm_set_copy_data_callback
- (&SIMIX_comm_copy_buffer_callback);
+ SIMIX_comm_set_copy_data_callback(&smpi_comm_copy_data_callback);
process_count = SIMIX_process_count();
process_data = xbt_new(smpi_process_data_t, process_count);
for (i = 0; i < process_count; i++) {
process_count = SIMIX_process_count();
process_data = xbt_new(smpi_process_data_t, process_count);
for (i = 0; i < process_count; i++) {
@@
-256,6
+253,11
@@
int MAIN__(void)
xbt_cfgelm_double, &default_threshold, 1, 1, NULL,
NULL);
xbt_cfgelm_double, &default_threshold, 1, 1, NULL,
NULL);
+ if(getenv("SMPI_PRETEND_CC") != NULL) {
+ /* Hack to ensure that smpicc can pretend to be a simple compiler. Particularly handy to pass it to the configuration tools */
+ return 0;
+ }
+
#ifdef HAVE_TRACING
TRACE_global_init(&xargc, xargv);
#endif
#ifdef HAVE_TRACING
TRACE_global_init(&xargc, xargv);
#endif
@@
-269,7
+271,7
@@
int MAIN__(void)
// parse the platform file: get the host list
SIMIX_create_environment(xargv[1]);
// parse the platform file: get the host list
SIMIX_create_environment(xargv[1]);
- SIMIX_function_register
("smpi_simulated_main",
smpi_simulated_main);
+ SIMIX_function_register
_default(
smpi_simulated_main);
SIMIX_launch_application(xargv[2]);
smpi_global_init();
SIMIX_launch_application(xargv[2]);
smpi_global_init();
@@
-284,7
+286,7
@@
int MAIN__(void)
SIMIX_run();
if (xbt_cfg_get_int(_surf_cfg_set, "smpi/display_timing"))
SIMIX_run();
if (xbt_cfg_get_int(_surf_cfg_set, "smpi/display_timing"))
-
INFO1("simulation time %g
", SIMIX_get_clock());
+
XBT_INFO("Simulation time: %g seconds.
", SIMIX_get_clock());
smpi_global_destroy();
smpi_global_destroy();