File: git-otf2-3

package info (click to toggle)
eztrace 2.0%2Brepack-12
  • links: PTS, VCS
  • area: main
  • in suites: bookworm
  • size: 4,132 kB
  • sloc: ansic: 23,501; perl: 910; sh: 857; cpp: 771; makefile: 696; fortran: 327; f90: 320; python: 57
file content (94 lines) | stat: -rw-r--r-- 3,666 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
https://gitlab.com/eztrace/eztrace/-/merge_requests/11

---
 src/eztrace-lib/eztrace_otf2.c          |   15 ++++++++++-----
 src/modules/iotracer/iotracer_to_otf2.c |    6 ++++--
 src/modules/posixio/posix_io_otf2.c     |    3 ++-
 3 files changed, 16 insertions(+), 8 deletions(-)

--- a/src/eztrace-lib/eztrace_otf2.c
+++ b/src/eztrace-lib/eztrace_otf2.c
@@ -342,7 +342,8 @@ static int _register_thread_team_member(
 					      team->id,
 					      team->string_id,
 					      team->id,
-					      team->parent_id);
+					      team->parent_id,
+					      OTF2_COMM_FLAG_NONE);
 	if(err != OTF2_SUCCESS) {
 	  eztrace_error("OTF2_GlobalDefWriter_WriteComm failed: %s\n",
 			OTF2_Error_GetDescription(err));
@@ -395,7 +396,8 @@ static int _register_mpi_comm(int comm_i
 				  comm_id,
 				  comm_str,
 				  comm_id,
-				  comm_world_ref);
+				  comm_world_ref,
+				  OTF2_COMM_FLAG_NONE);
   if (err != OTF2_SUCCESS) {
     eztrace_warn("OTF2_GlobalDefWriter_WriteComm failed: %s (%s)\n",
 		 OTF2_Error_GetName(err), OTF2_Error_GetDescription(err));
@@ -935,7 +937,8 @@ void ezt_otf2_init() {
 						i /* id */,
 						process_string /* name */,
 						OTF2_LOCATION_GROUP_TYPE_PROCESS,
-						0 /* system tree */ );
+						0 /* system tree */,
+						OTF2_UNDEFINED_LOCATION_GROUP );
       int thread_id = MPI2OTF(i);
       locations[i] = thread_id;
       members[i] = i;
@@ -987,7 +990,8 @@ void ezt_otf2_init() {
 				    comm_world_ref,
 				    comm_world_str,
 				    comm_world_group,
-				    OTF2_UNDEFINED_COMM);
+				    OTF2_UNDEFINED_COMM,
+				    OTF2_COMM_FLAG_NONE);
     if (err != OTF2_SUCCESS) {
       eztrace_warn("OTF2_GlobalDefWriter_WriteComm failed: %s (%s)\n",
 		  OTF2_Error_GetName(err), OTF2_Error_GetDescription(err));
@@ -1030,7 +1034,8 @@ static void _synchronize_epochs() {
     OTF2_ErrorCode err = OTF2_GlobalDefWriter_WriteClockProperties( _ezt_trace.global_def_writer,
 								    1e9 /* 1 tick per second */,
 								    global_epoch_start,
-								    global_epoch_stop - global_epoch_start + 1);
+								    global_epoch_stop - global_epoch_start + 1,
+                                                                    OTF2_UNDEFINED_TIMESTAMP);
     if( err != OTF2_SUCCESS) {
       eztrace_error("OTF2_GlobalDefWriter_WriteClockProperties failed\n");
     }
--- a/src/modules/posixio/posix_io_otf2.c
+++ b/src/modules/posixio/posix_io_otf2.c
@@ -201,7 +201,8 @@ void init_otf2_posixio() {
 				    comm_ref,
 				    comm_string_ref,
 				    group_ref,
-				    OTF2_UNDEFINED_COMM);
+				    OTF2_UNDEFINED_COMM,
+				    OTF2_COMM_FLAG_NONE);
   }
 }
 
--- a/src/modules/iotracer/iotracer_to_otf2.c
+++ b/src/modules/iotracer/iotracer_to_otf2.c
@@ -384,7 +384,8 @@ void convert_iotracer_log_to_otf2(){
     OTF2_GlobalDefWriter_WriteClockProperties( global_def_writer,
                                                1e9 /* 1 tick per nanosecond */,
                                                0 /* epoch */,
-                                               2 /* length */ );
+                                               2 /* length */,
+                                               OTF2_UNDEFINED_TIMESTAMP /* realtimeTimestamp */ );
 
     //////////////////////////////////////////////////////
 
@@ -532,7 +533,8 @@ void convert_iotracer_log_to_otf2(){
 					     process_id /* id */,
 					     process_string /* name */,
 					     OTF2_LOCATION_GROUP_TYPE_PROCESS,
-					     program_id /* system tree */ );
+					     program_id /* system tree */,
+					     OTF2_UNDEFINED_LOCATION_GROUP );
 
 
     eztrace_log(dbg_lvl_normal, "registering %d threads\n", nb_registered_threads);