* under the terms of the license (GNU LGPL) which comes with this package. */
#include "private.h"
-#include "private.hpp"
#include <ctype.h>
#include <wchar.h>
#include <stdarg.h>
{
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;
}
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;
//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;
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);
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);
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());
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);
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));
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);
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);
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);
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);
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);
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);
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);
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);
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);