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
Sort output on 1st char to distinguish kernel output from application output.
[simgrid.git]
/
src
/
smpi
/
smpi_coll.c
diff --git
a/src/smpi/smpi_coll.c
b/src/smpi/smpi_coll.c
index
172ddb1
..
346408c
100644
(file)
--- a/
src/smpi/smpi_coll.c
+++ b/
src/smpi/smpi_coll.c
@@
-1,6
+1,6
@@
/* smpi_coll.c -- various optimized routing for collectives */
/* smpi_coll.c -- various optimized routing for collectives */
-/* Copyright (c) 2009
, 2010
. The SimGrid Team.
+/* Copyright (c) 2009
-2014
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-143,7
+143,9
@@
int find_coll_description(s_mpi_coll_description_t * table,
return i;
}
}
return i;
}
}
- name_list = strdup(table[0].name);
+ if (!table[0].name)
+ xbt_die("No collective is valid! This is a bug.");
+ name_list = xbt_strdup(table[0].name);
for (i = 1; table[i].name; i++) {
name_list =
xbt_realloc(name_list,
for (i = 1; table[i].name; i++) {
name_list =
xbt_realloc(name_list,
@@
-151,7
+153,7
@@
int find_coll_description(s_mpi_coll_description_t * table,
strcat(name_list, ", ");
strcat(name_list, table[i].name);
}
strcat(name_list, ", ");
strcat(name_list, table[i].name);
}
- xbt_die("
Model '%s' is invalid! Valid model
s are: %s.", name, name_list);
+ xbt_die("
Collective '%s' is invalid! Valid collective
s are: %s.", name, name_list);
return -1;
}
return -1;
}
@@
-243,7
+245,7
@@
static void build_tree(int root, int rank, int size, proc_tree_t * tree)
static void tree_bcast(void *buf, int count, MPI_Datatype datatype,
MPI_Comm comm, proc_tree_t tree)
{
static void tree_bcast(void *buf, int count, MPI_Datatype datatype,
MPI_Comm comm, proc_tree_t tree)
{
- int system_tag =
999; // used negative int but smpi_create_request() declares this illegal (to be checked)
+ int system_tag =
COLL_TAG_BCAST;
int rank, i;
MPI_Request *requests;
int rank, i;
MPI_Request *requests;
@@
-281,7
+283,7
@@
static void tree_bcast(void *buf, int count, MPI_Datatype datatype,
static void tree_antibcast(void *buf, int count, MPI_Datatype datatype,
MPI_Comm comm, proc_tree_t tree)
{
static void tree_antibcast(void *buf, int count, MPI_Datatype datatype,
MPI_Comm comm, proc_tree_t tree)
{
- int system_tag =
999; // used negative int but smpi_create_request() declares this illegal (to be checked)
+ int system_tag =
COLL_TAG_BCAST;
int rank, i;
MPI_Request *requests;
int rank, i;
MPI_Request *requests;