X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7595678501d8cee18b1b6f1e203c5a2a47ba4e51..a0816cd508b0beceb6361a66fcf43512e18d3753:/src/instr/instr_TI_trace.cpp

diff --git a/src/instr/instr_TI_trace.cpp b/src/instr/instr_TI_trace.cpp
index dfbb6a06b5..3dbb4e5444 100644
--- a/src/instr/instr_TI_trace.cpp
+++ b/src/instr/instr_TI_trace.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2010-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2010-2015. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -26,14 +25,14 @@ xbt_dict_t tracing_files = nullptr;
 
 extern s_instr_trace_writer_t active_writer;
 
-void TRACE_TI_init(void)
+void TRACE_TI_init()
 {
-  active_writer.print_PushState = print_TIPushState;
-  active_writer.print_CreateContainer=print_TICreateContainer;
-  active_writer.print_DestroyContainer=print_TIDestroyContainer;
+  active_writer.print_PushState        = &print_TIPushState;
+  active_writer.print_CreateContainer  = &print_TICreateContainer;
+  active_writer.print_DestroyContainer = &print_TIDestroyContainer;
 }
 
-void TRACE_TI_start(void)
+void TRACE_TI_start()
 {
   char *filename = TRACE_get_filename();
   tracing_file = fopen(filename, "w");
@@ -50,7 +49,7 @@ void TRACE_TI_start(void)
   dump_comment_file(TRACE_get_comment_file());
 }
 
-void TRACE_TI_end(void)
+void TRACE_TI_end()
 {
   xbt_dict_free(&tracing_files);
   fclose(tracing_file);
@@ -126,13 +125,13 @@ void print_TIPushState(paje_event_t event)
     fprintf(trace_file, "%s send %d %d %s\n", process_id, extra->dst, extra->send_size, extra->datatype1);
     break;
   case TRACING_ISEND:
-    fprintf(trace_file, "%s isend %d %d %s\n", process_id, extra->dst, extra->send_size, extra->datatype1);
+    fprintf(trace_file, "%s Isend %d %d %s\n", process_id, extra->dst, extra->send_size, extra->datatype1);
     break;
   case TRACING_RECV:
     fprintf(trace_file, "%s recv %d %d %s\n", process_id, extra->src, extra->send_size, extra->datatype1);
     break;
   case TRACING_IRECV:
-    fprintf(trace_file, "%s irecv %d %d %s\n", process_id, extra->src, extra->send_size, extra->datatype1);
+    fprintf(trace_file, "%s Irecv %d %d %s\n", process_id, extra->src, extra->send_size, extra->datatype1);
     break;
   case TRACING_TEST:
     fprintf(trace_file, "%s test\n", process_id);
@@ -141,7 +140,7 @@ void print_TIPushState(paje_event_t event)
     fprintf(trace_file, "%s wait\n", process_id);
     break;
   case TRACING_WAITALL:
-    fprintf(trace_file, "%s waitall\n", process_id);
+    fprintf(trace_file, "%s waitAll\n", process_id);
     break;
   case TRACING_BARRIER:
     fprintf(trace_file, "%s barrier\n", process_id);
@@ -159,14 +158,14 @@ void print_TIPushState(paje_event_t event)
     fprintf(trace_file, "\n");
     break;
   case TRACING_ALLREDUCE:      // rank allreduce comm_size comp_size (datatype)
-    fprintf(trace_file, "%s allreduce %d %f %s\n", process_id, extra->send_size, extra->comp_size, extra->datatype1);
+    fprintf(trace_file, "%s allReduce %d %f %s\n", process_id, extra->send_size, extra->comp_size, extra->datatype1);
     break;
   case TRACING_ALLTOALL:       // rank alltoall send_size recv_size (sendtype) (recvtype)
-    fprintf(trace_file, "%s alltoall %d %d %s %s\n", process_id, extra->send_size, extra->recv_size, extra->datatype1,
+    fprintf(trace_file, "%s allToAll %d %d %s %s\n", process_id, extra->send_size, extra->recv_size, extra->datatype1,
             extra->datatype2);
     break;
   case TRACING_ALLTOALLV:      // rank alltoallv send_size [sendcounts] recv_size [recvcounts] (sendtype) (recvtype)
-    fprintf(trace_file, "%s alltoallv %d ", process_id, extra->send_size);
+    fprintf(trace_file, "%s allToAllV %d ", process_id, extra->send_size);
     for (i = 0; i < extra->num_processes; i++)
       fprintf(trace_file, "%d ", extra->sendcounts[i]);
     fprintf(trace_file, "%d ", extra->recv_size);
@@ -179,13 +178,13 @@ void print_TIPushState(paje_event_t event)
             extra->datatype1, extra->datatype2);
     break;
   case TRACING_ALLGATHERV:     // rank allgatherv send_size [recvcounts] (sendtype) (recvtype)
-    fprintf(trace_file, "%s allgatherv %d ", process_id, extra->send_size);
+    fprintf(trace_file, "%s allGatherV %d ", process_id, extra->send_size);
     for (i = 0; i < extra->num_processes; i++)
       fprintf(trace_file, "%d ", extra->recvcounts[i]);
     fprintf(trace_file, "%s %s \n", extra->datatype1, extra->datatype2);
     break;
   case TRACING_REDUCE_SCATTER: // rank reducescatter [recvcounts] comp_size (sendtype)
-    fprintf(trace_file, "%s reducescatter ", process_id);
+    fprintf(trace_file, "%s reduceScatter ", process_id);
     for (i = 0; i < extra->num_processes; i++)
       fprintf(trace_file, "%d ", extra->recvcounts[i]);
     fprintf(trace_file, "%f %s\n", extra->comp_size, extra->datatype1);
@@ -197,7 +196,7 @@ void print_TIPushState(paje_event_t event)
     fprintf(trace_file, "%s sleep %f\n", process_id, extra->sleep_duration);
     break;
   case TRACING_GATHERV: // rank gatherv send_size [recvcounts] root (sendtype) (recvtype)
-    fprintf(trace_file, "%s gatherv %d ", process_id, extra->send_size);
+    fprintf(trace_file, "%s gatherV %d ", process_id, extra->send_size);
     for (i = 0; i < extra->num_processes; i++)
       fprintf(trace_file, "%d ", extra->recvcounts[i]);
     fprintf(trace_file, "%d %s %s\n", extra->root, extra->datatype1, extra->datatype2);