#include "private.h"
#include <ctype.h>
#include <wchar.h>
+#include <stdarg.h>
+#include <simgrid/sg_config.h>
#ifdef HAVE_TRACING
static xbt_dict_t process_category;
+static void cleanup_extra_data (instr_extra_data extra){
+ if(extra!=NULL){
+ if(extra->sendcounts!=NULL)
+ xbt_free(extra->sendcounts);
+ if(extra->recvcounts!=NULL)
+ xbt_free(extra->recvcounts);
+ xbt_free(extra);
+ }
+}
+
void TRACE_internal_smpi_set_category (const char *category)
{
if (!TRACE_smpi_is_enabled()) return;
PJ_container_free (container);
}
-void TRACE_smpi_collective_in(int rank, int root, const char *operation, int size)
+void TRACE_smpi_collective_in(int rank, int root, const char *operation, instr_extra_data extra)
{
- if (!TRACE_smpi_is_enabled()) return;
+ if (!TRACE_smpi_is_enabled()) {
+ cleanup_extra_data(extra);
+ return;
+ }
char str[INSTR_DEFAULT_STR_SIZE];
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_pajePushStateWithSize (SIMIX_get_clock(), container, type, value, size);
+ new_pajePushStateWithExtra (SIMIX_get_clock(), container, type, value, (void*)extra);
}
+
void TRACE_smpi_collective_out(int rank, int root, const char *operation)
{
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 mpi = PJ_type_get("MPI", PJ_container_get_root()->type);
- type_t type = PJ_type_state_new ("COMPUTATION", mpi);
+ type_t type = PJ_type_get ("MPI_STATE", container->type);
const char *color = instr_find_color ("computing");
val_t value = PJ_value_get_or_new ("computing", color, type);
new_pajePushState (SIMIX_get_clock(), container, type, value);
}
-void TRACE_smpi_computing_in(int rank)
+void TRACE_smpi_computing_in(int rank, instr_extra_data extra)
{
//do not forget to set the color first, otherwise this will explode
- if (!TRACE_smpi_is_enabled()|| !TRACE_smpi_is_computing()) return;
+ if (!TRACE_smpi_is_enabled()|| !TRACE_smpi_is_computing()) {
+ cleanup_extra_data(extra);
+ 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 ("COMPUTATION", container->type);
+ type_t type = PJ_type_get ("MPI_STATE", container->type);
val_t value = PJ_value_get_or_new ("computing", NULL, type);
- new_pajePushState (SIMIX_get_clock(), container, type, value);
+ new_pajePushStateWithExtra (SIMIX_get_clock(), container, type, value, (void*)extra);
}
-void TRACE_smpi_computing_out(int rank, double flops)
+void TRACE_smpi_computing_out(int rank)
{
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 ("COMPUTATION", container->type);
- xbt_dynar_t extra= xbt_dynar_new(sizeof(char*), NULL);
- char* char_duration = bprintf("%g", flops);
- xbt_dynar_push(extra, &char_duration);
- new_pajePopStateWithExtra (SIMIX_get_clock(), container, type, extra);
+ type_t type = PJ_type_get ("MPI_STATE", container->type);
+ new_pajePopState (SIMIX_get_clock(), container, type);
}
-void TRACE_smpi_ptp_in(int rank, int src, int dst, const char *operation, int size)
+void TRACE_smpi_ptp_in(int rank, int src, int dst, const char *operation, instr_extra_data extra)
{
- if (!TRACE_smpi_is_enabled()) return;
-
+ if (!TRACE_smpi_is_enabled()) {
+ cleanup_extra_data(extra);
+ return;
+ }
char str[INSTR_DEFAULT_STR_SIZE];
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_pajePushStateWithSize (SIMIX_get_clock(), container, type, value, size);
+ new_pajePushStateWithExtra (SIMIX_get_clock(), container, type, value, (void*)extra);
}
void TRACE_smpi_ptp_out(int rank, int src, int dst, const char *operation)