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
|
---
src/parser/OTF2Parser/ParserDefinitionOTF2.cpp | 8 +++++---
src/parser/OTF2Parser/ParserDefinitionOTF2.hpp | 8 +++++---
2 files changed, 10 insertions(+), 6 deletions(-)
--- a/src/parser/OTF2Parser/ParserDefinitionOTF2.cpp
+++ b/src/parser/OTF2Parser/ParserDefinitionOTF2.cpp
@@ -162,7 +162,7 @@ void ParserDefinitionOTF2::set_handlers(
* All the definition handlers
*/
-OTF2_CallbackCode ParserDefinitionOTF2::handler_DefTimerResolution(void *, uint64_t timer_resolution, uint64_t /*global_offset*/, uint64_t /*trace_length*/)
+OTF2_CallbackCode ParserDefinitionOTF2::handler_DefTimerResolution(void *, uint64_t timer_resolution, uint64_t /*global_offset*/, uint64_t /*trace_length*/, uint64_t /*realtimeTimestamp*/)
{
ParserDefinitionOTF2::_ticks_per_second = timer_resolution;
return OTF2_CALLBACK_SUCCESS;
@@ -218,7 +218,8 @@ OTF2_CallbackCode ParserDefinitionOTF2::
OTF2_LocationGroupRef location_group_identifier,
OTF2_StringRef name,
OTF2_LocationGroupType /*type*/,
- OTF2_SystemTreeNodeRef system_tree_parent) {
+ OTF2_SystemTreeNodeRef system_tree_parent,
+ OTF2_LocationGroupRef locationGroup) {
OTF2_LocationGroup *temp = new OTF2_LocationGroup();
temp->_group_id = location_group_identifier;
temp->_name_id = name;
@@ -354,7 +355,8 @@ OTF2_CallbackCode ParserDefinitionOTF2::
OTF2_CommRef self,
OTF2_StringRef name,
OTF2_GroupRef group,
- OTF2_CommRef parent)
+ OTF2_CommRef parent,
+ OTF2_CommFlag flags)
{
// defines an MPI communicator
struct OTF2_Comm* c = new struct OTF2_Comm();
--- a/src/parser/OTF2Parser/ParserDefinitionOTF2.hpp
+++ b/src/parser/OTF2Parser/ParserDefinitionOTF2.hpp
@@ -222,7 +222,7 @@ private:
*/
static std::vector<Color *> _default_colors;
- static OTF2_CallbackCode handler_DefTimerResolution(void *, uint64_t, uint64_t, uint64_t);
+ static OTF2_CallbackCode handler_DefTimerResolution(void *, uint64_t, uint64_t, uint64_t, uint64_t);
static OTF2_CallbackCode handler_DefString(void *, OTF2_StringRef, const char *);
// System tree callback
@@ -236,7 +236,8 @@ private:
OTF2_LocationGroupRef location_group_identifier,
OTF2_StringRef name,
OTF2_LocationGroupType type,
- OTF2_SystemTreeNodeRef system_tree_parent);
+ OTF2_SystemTreeNodeRef system_tree_parent,
+ OTF2_LocationGroupRef locationGroup);
static OTF2_CallbackCode handler_DefLocation(void *userData,
OTF2_LocationRef locationIdentifier,
OTF2_StringRef name_id,
@@ -261,7 +262,8 @@ private:
OTF2_CommRef self,
OTF2_StringRef name,
OTF2_GroupRef group,
- OTF2_CommRef parent);
+ OTF2_CommRef parent,
+ OTF2_CommFlag flags);
static OTF2_CallbackCode handler_DefMetricMember( void* userData,
|
