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
Fix bug, MPI_Recv timings for small messages were actually ignored
[simgrid.git]
/
src
/
smpi
/
instr_smpi.cpp
diff --git
a/src/smpi/instr_smpi.cpp
b/src/smpi/instr_smpi.cpp
index
9c8448d
..
36ee8d5
100644
(file)
--- a/
src/smpi/instr_smpi.cpp
+++ b/
src/smpi/instr_smpi.cpp
@@
-71,19
+71,22
@@
static const char *instr_find_color (const char *state)
{
char *target = str_tolower (state);
const char *ret = NULL;
- const char *current;
unsigned int i = 0;
- while ((current = smpi_colors[i])){
- if (strcmp (state, current) == 0){ ret = smpi_colors[i+1]; break; } //exact match
- if (strstr(target, current)) { ret = smpi_colors[i+1]; break; }; //as substring
+ const char *current = smpi_colors[i];
+ while ((current != NULL)){
+ if (strcmp (state, current) == 0 //exact match
+ || strstr(target, current) != 0 ){//as substring
+ ret = smpi_colors[i+1];
+ break;
+ }
i+=2;
+ current = smpi_colors[i];
}
-
free
(target);
+
xbt_free
(target);
return ret;
}
-
-static char *smpi_container(int rank, char *container, int n)
+XBT_PRIVATE char *smpi_container(int rank, char *container, int n)
{
snprintf(container, n, "rank-%d", rank);
return container;
@@
-91,7
+94,6
@@
static char *smpi_container(int rank, char *container, int n)
static char *TRACE_smpi_get_key(int src, int dst, char *key, int n);
-
static char *TRACE_smpi_put_key(int src, int dst, char *key, int n)
{
//get the dynar for src#dst
@@
-99,8
+101,7
@@
static char *TRACE_smpi_put_key(int src, int dst, char *key, int n)
snprintf(aux, INSTR_DEFAULT_STR_SIZE, "%d#%d", src, dst);
xbt_dynar_t d = static_cast<xbt_dynar_t>(xbt_dict_get_or_null(keys, aux));
-
- if(!xbt_dynar_is_empty(d)){
+ if(xbt_dynar_is_empty(d) == 0){
//receive was already pushed, perform a get instead
TRACE_smpi_get_key(src , dst, key ,n);
return key;
@@
-113,11
+114,11
@@
static char *TRACE_smpi_put_key(int src, int dst, char *key, int n)
//generate the key
static unsigned long long counter = 0;
-
- snprintf(key, n, "%d_%d_%llu", src, dst, counter
++
);
+ counter++;
+ snprintf(key, n, "%d_%d_%llu", src, dst, counter);
//push it
- char *a =
(char*)xbt_strdup(key
);
+ char *a =
static_cast<char*> (xbt_strdup(key)
);
xbt_dynar_push_as(d, char *, a);
return key;
@@
-129,9
+130,6
@@
static char *TRACE_smpi_get_key(int src, int dst, char *key, int n)
snprintf(aux, INSTR_DEFAULT_STR_SIZE, "%d#%d", src, dst);
xbt_dynar_t d = static_cast<xbt_dynar_t>(xbt_dict_get_or_null(keys, aux));
- // xbt_assert(!xbt_dynar_is_empty(d),
- // "Trying to get a link key (for message reception) that has no corresponding send (%s).", __FUNCTION__);
-
// sometimes the receive may be posted before the send
if(xbt_dynar_is_empty(d)){
TRACE_smpi_put_key(src, dst, key, n);
@@
-158,7
+156,8
@@
static void cleanup_extra_data (instr_extra_data extra){
void TRACE_internal_smpi_set_category (const char *category)
{
- if (!TRACE_smpi_is_enabled()) return;
+ if (!TRACE_smpi_is_enabled())
+ return;
//declare category
TRACE_category (category);
@@
-173,7
+172,8
@@
void TRACE_internal_smpi_set_category (const char *category)
const char *TRACE_internal_smpi_get_category (void)
{
- if (!TRACE_smpi_is_enabled()) return NULL;
+ if (!TRACE_smpi_is_enabled())
+ return NULL;
char processid[INSTR_DEFAULT_STR_SIZE];
snprintf (processid, INSTR_DEFAULT_STR_SIZE, "%p", SIMIX_process_self());
@@
-194,7
+194,8
@@
void TRACE_smpi_release(void)
void TRACE_smpi_init(int rank)
{
- if (!TRACE_smpi_is_enabled()) return;
+ if (!TRACE_smpi_is_enabled())
+ return;
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
@@
-212,7
+213,8
@@
void TRACE_smpi_init(int rank)
void TRACE_smpi_finalize(int rank)
{
- if (!TRACE_smpi_is_enabled()) return;
+ if (!TRACE_smpi_is_enabled())
+ return;
char str[INSTR_DEFAULT_STR_SIZE];
container_t container = PJ_container_get(smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE));
@@
-233,13
+235,13
@@
void TRACE_smpi_collective_in(int rank, int root, const char *operation, instr_e
type_t type = PJ_type_get ("MPI_STATE", container->type);
const char *color = instr_find_color (operation);
val_t value = PJ_value_get_or_new (operation, color, type);
- new_pajePushStateWithExtra (SIMIX_get_clock(), container, type, value,
(void*)extra
);
+ new_pajePushStateWithExtra (SIMIX_get_clock(), container, type, value,
static_cast<void*>(extra)
);
}
-
void TRACE_smpi_collective_out(int rank, int root, const char *operation)
{
- if (!TRACE_smpi_is_enabled()) return;
+ if (!TRACE_smpi_is_enabled())
+ return;
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
@@
-252,9
+254,8
@@
void TRACE_smpi_collective_out(int rank, int root, const char *operation)
void TRACE_smpi_computing_init(int rank)
{
//first use, initialize the color in the trace
- //TODO : check with lucas and Pierre how to generalize this approach
- //to avoid unnecessary access to the color array
- if (!TRACE_smpi_is_enabled() || !TRACE_smpi_is_computing()) return;
+ if (!TRACE_smpi_is_enabled() || !TRACE_smpi_is_computing())
+ return;
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
@@
-278,12
+279,13
@@
void TRACE_smpi_computing_in(int rank, instr_extra_data extra)
container_t container = PJ_container_get (str);
type_t type = PJ_type_get ("MPI_STATE", container->type);
val_t value = PJ_value_get_or_new ("computing", NULL, type);
- new_pajePushStateWithExtra (SIMIX_get_clock(), container, type, value,
(void*)extra
);
+ new_pajePushStateWithExtra (SIMIX_get_clock(), container, type, value,
static_cast<void*>(extra)
);
}
void TRACE_smpi_computing_out(int rank)
{
- if (!TRACE_smpi_is_enabled()|| !TRACE_smpi_is_computing()) return;
+ if (!TRACE_smpi_is_enabled()|| !TRACE_smpi_is_computing())
+ return;
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
container_t container = PJ_container_get (str);
@@
-293,10
+295,9
@@
void TRACE_smpi_computing_out(int rank)
void TRACE_smpi_sleeping_init(int rank)
{
- //first use, initialize the color in the trace
- //TODO : check with lucas and Pierre how to generalize this approach
- //to avoid unnecessary access to the color array
- if (!TRACE_smpi_is_enabled() || !TRACE_smpi_is_sleeping()) return;
+ //first use, initialize the color in the trace
+ if (!TRACE_smpi_is_enabled() || !TRACE_smpi_is_sleeping())
+ return;
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
@@
-320,12
+321,13
@@
void TRACE_smpi_sleeping_in(int rank, instr_extra_data extra)
container_t container = PJ_container_get (str);
type_t type = PJ_type_get ("MPI_STATE", container->type);
val_t value = PJ_value_get_or_new ("sleeping", NULL, type);
- new_pajePushStateWithExtra (SIMIX_get_clock(), container, type, value,
(void*)extra
);
+ new_pajePushStateWithExtra (SIMIX_get_clock(), container, type, value,
static_cast<void*>(extra)
);
}
void TRACE_smpi_sleeping_out(int rank)
{
- if (!TRACE_smpi_is_enabled()|| !TRACE_smpi_is_sleeping()) return;
+ if (!TRACE_smpi_is_enabled()|| !TRACE_smpi_is_sleeping())
+ return;
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
container_t container = PJ_container_get (str);
@@
-333,7
+335,6
@@
void TRACE_smpi_sleeping_out(int rank)
new_pajePopState (SIMIX_get_clock(), container, type);
}
-
void TRACE_smpi_testing_in(int rank, instr_extra_data extra)
{
//do not forget to set the color first, otherwise this will explode
@@
-347,12
+348,13
@@
void TRACE_smpi_testing_in(int rank, instr_extra_data extra)
container_t container = PJ_container_get (str);
type_t type = PJ_type_get ("MPI_STATE", container->type);
val_t value = PJ_value_get_or_new ("test", NULL, type);
- new_pajePushStateWithExtra (SIMIX_get_clock(), container, type, value,
(void*)extra
);
+ new_pajePushStateWithExtra (SIMIX_get_clock(), container, type, value,
static_cast<void*>(extra)
);
}
void TRACE_smpi_testing_out(int rank)
{
- if (!TRACE_smpi_is_enabled()) return;
+ if (!TRACE_smpi_is_enabled())
+ return;
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
container_t container = PJ_container_get (str);
@@
-373,12
+375,13
@@
void TRACE_smpi_ptp_in(int rank, int src, int dst, const char *operation, instr_
type_t type = PJ_type_get ("MPI_STATE", container->type);
const char *color = instr_find_color (operation);
val_t value = PJ_value_get_or_new (operation, color, type);
- new_pajePushStateWithExtra (SIMIX_get_clock(), container, type, value,
(void*)extra
);
+ new_pajePushStateWithExtra (SIMIX_get_clock(), container, type, value,
static_cast<void*>(extra)
);
}
void TRACE_smpi_ptp_out(int rank, int src, int dst, const char *operation)
{
- if (!TRACE_smpi_is_enabled()) return;
+ if (!TRACE_smpi_is_enabled())
+ return;
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
@@
-390,7
+393,8
@@
void TRACE_smpi_ptp_out(int rank, int src, int dst, const char *operation)
void TRACE_smpi_send(int rank, int src, int dst, int size)
{
- if (!TRACE_smpi_is_enabled()) return;
+ if (!TRACE_smpi_is_enabled())
+ return;
char key[INSTR_DEFAULT_STR_SIZE] = {0};
TRACE_smpi_put_key(src, dst, key, INSTR_DEFAULT_STR_SIZE);
@@
-405,7
+409,8
@@
void TRACE_smpi_send(int rank, int src, int dst, int size)
void TRACE_smpi_recv(int rank, int src, int dst)
{
- if (!TRACE_smpi_is_enabled()) return;
+ if (!TRACE_smpi_is_enabled())
+ return;
char key[INSTR_DEFAULT_STR_SIZE] = {0};
TRACE_smpi_get_key(src, dst, key, INSTR_DEFAULT_STR_SIZE);