* 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>
#include <simgrid/sg_config.h>
+#include <stdarg.h>
+#include <wchar.h>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_smpi, instr, "Tracing SMPI");
"win_wait", "1 0.8 0",
"win_start", "0.8 0 1",
"win_complete", "0.8 1 0",
- NULL, NULL,
+ nullptr, nullptr,
};
static char *str_tolower (const char *str)
static const char *instr_find_color (const char *state)
{
char *target = str_tolower (state);
- const char *ret = NULL;
- const char *current;
+ const char *ret = nullptr;
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 != nullptr)){
+ 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;
}
-static char *TRACE_smpi_get_key(int src, int dst, char *key, int n);
+static char *TRACE_smpi_get_key(int src, int dst, int tag, char *key, int n, int send);
-
-static char *TRACE_smpi_put_key(int src, int dst, char *key, int n)
+static char *TRACE_smpi_put_key(int src, int dst, int tag, char *key, int n, int send)
{
//get the dynar for src#dst
char aux[INSTR_DEFAULT_STR_SIZE];
- snprintf(aux, INSTR_DEFAULT_STR_SIZE, "%d#%d", src, dst);
+ snprintf(aux, INSTR_DEFAULT_STR_SIZE, "%d#%d#%d#%d", src, dst, tag, send);
xbt_dynar_t d = static_cast<xbt_dynar_t>(xbt_dict_get_or_null(keys, aux));
-
- if(!xbt_dynar_is_empty(d)){
- //receive was already pushed, perform a get instead
- TRACE_smpi_get_key(src , dst, key ,n);
- return key;
- }
-
- if (d == NULL) {
+ if (d == nullptr) {
d = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
- xbt_dict_set(keys, aux, d, NULL);
+ xbt_dict_set(keys, aux, d, nullptr);
}
//generate the key
static unsigned long long counter = 0;
-
- snprintf(key, n, "%d_%d_%llu", src, dst, counter++);
+ counter++;
+ snprintf(key, n, "%d_%d_%d_%llu", src, dst, tag, 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;
}
-static char *TRACE_smpi_get_key(int src, int dst, char *key, int n)
+static char *TRACE_smpi_get_key(int src, int dst, int tag, char *key, int n, int send)
{
char aux[INSTR_DEFAULT_STR_SIZE];
- snprintf(aux, INSTR_DEFAULT_STR_SIZE, "%d#%d", src, dst);
+ snprintf(aux, INSTR_DEFAULT_STR_SIZE, "%d#%d#%d#%d", src, dst, tag, send==1?0:1);
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
+ // first posted
if(xbt_dynar_is_empty(d)){
- TRACE_smpi_put_key(src, dst, key, n);
+ TRACE_smpi_put_key(src, dst, tag, key, n, send);
return key;
}
char *s = xbt_dynar_get_as (d, 0, char *);
snprintf (key, n, "%s", s);
- xbt_dynar_remove_at (d, 0, NULL);
+ xbt_dynar_remove_at (d, 0, nullptr);
return key;
}
static xbt_dict_t process_category;
static void cleanup_extra_data (instr_extra_data extra){
- if(extra!=NULL){
- if(extra->sendcounts!=NULL)
+ if(extra!=nullptr){
+ if(extra->sendcounts!=nullptr)
xbt_free(extra->sendcounts);
- if(extra->recvcounts!=NULL)
+ if(extra->recvcounts!=nullptr)
xbt_free(extra->recvcounts);
xbt_free(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);
snprintf (processid, INSTR_DEFAULT_STR_SIZE, "%p", SIMIX_process_self());
if (xbt_dict_get_or_null (process_category, processid))
xbt_dict_remove (process_category, processid);
- if (category != NULL)
- xbt_dict_set (process_category, processid, xbt_strdup(category), NULL);
+ if (category != nullptr)
+ xbt_dict_set (process_category, processid, xbt_strdup(category), nullptr);
}
-const char *TRACE_internal_smpi_get_category (void)
+const char *TRACE_internal_smpi_get_category ()
{
- if (!TRACE_smpi_is_enabled()) return NULL;
+ if (!TRACE_smpi_is_enabled())
+ return nullptr;
char processid[INSTR_DEFAULT_STR_SIZE];
snprintf (processid, INSTR_DEFAULT_STR_SIZE, "%p", SIMIX_process_self());
process_category = xbt_dict_new_homogeneous(xbt_free_f);
}
-void TRACE_smpi_release(void)
+void TRACE_smpi_release()
{
xbt_dict_free(&keys);
xbt_dict_free(&process_category);
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);
}else{
father = PJ_container_get_root ();
}
- xbt_assert(father!=NULL,
+ xbt_assert(father!=nullptr,
"Could not find a parent for mpi rank %s at function %s", str, __FUNCTION__);
- PJ_container_new(str, INSTR_SMPI, father);
+#if HAVE_PAPI
+ container_t container =
+#endif
+ PJ_container_new(str, INSTR_SMPI, father);
+#if HAVE_PAPI
+ papi_counter_t counters = smpi_process_papi_counters();
+
+ for (auto& it : counters) {
+ /**
+ * Check whether this variable already exists or not. Otherwise, it will be created
+ * multiple times but only the last one would be used...
+ */
+ if (PJ_type_get_or_null(it.first.c_str(), container->type) == nullptr) {
+ PJ_type_variable_new(it.first.c_str(), nullptr, container->type);
+ }
+ }
+#endif
}
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);
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);
+ val_t value = PJ_value_get_or_new ("computing", nullptr, type);
+ 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);
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);
+ val_t value = PJ_value_get_or_new ("sleeping", nullptr, type);
+ 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);
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
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 ("test", NULL, type);
- new_pajePushStateWithExtra (SIMIX_get_clock(), container, type, value, (void*)extra);
+ val_t value = PJ_value_get_or_new ("test", nullptr, type);
+ 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);
new_pajePopState (SIMIX_get_clock(), container, type);
}
-void TRACE_smpi_send(int rank, int src, int dst, int size)
+void TRACE_smpi_send(int rank, int src, int dst, int tag, 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);
+ TRACE_smpi_get_key(src, dst, tag, key, INSTR_DEFAULT_STR_SIZE,1);
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(src, str, INSTR_DEFAULT_STR_SIZE);
container_t container = PJ_container_get (str);
type_t type = PJ_type_get ("MPI_LINK", PJ_type_get_root());
-
+ XBT_DEBUG("Send tracing from %d to %d, tag %d, with key %s", src, dst, tag, key);
new_pajeStartLinkWithSize (SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key, size);
}
-void TRACE_smpi_recv(int rank, int src, int dst)
+void TRACE_smpi_recv(int rank, int src, int dst, int tag)
{
- 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);
+ TRACE_smpi_get_key(src, dst, tag, key, INSTR_DEFAULT_STR_SIZE,0);
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(dst, str, INSTR_DEFAULT_STR_SIZE);
container_t container = PJ_container_get (str);
type_t type = PJ_type_get ("MPI_LINK", PJ_type_get_root());
-
+ XBT_DEBUG("Recv tracing from %d to %d, tag %d, with key %s", src, dst, tag, key);
new_pajeEndLink (SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key);
}
