projects
/
lttv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use the in development bt_iter_equals_pos
[lttv.git]
/
lttv
/
lttv
/
traceset.c
diff --git
a/lttv/lttv/traceset.c
b/lttv/lttv/traceset.c
index 8743d70825d54a51549a2f783373f78fca33ff68..765e3cf5552243e90e6e0bec608d0c6f9c196ba2 100644
(file)
--- a/
lttv/lttv/traceset.c
+++ b/
lttv/lttv/traceset.c
@@
-486,7
+486,7
@@
guint lttv_traceset_get_cpuid_from_event(LttvEvent *event)
if (timestamp == -1ULL) {
return 0;
}
if (timestamp == -1ULL) {
return 0;
}
- const struct definition *scope = bt_ctf_get_top_level_scope(ctf_event, BT_STREAM_PACKET_CONTEXT);
+ const struct
bt_
definition *scope = bt_ctf_get_top_level_scope(ctf_event, BT_STREAM_PACKET_CONTEXT);
if (bt_ctf_field_get_error()) {
return 0;
}
if (bt_ctf_field_get_error()) {
return 0;
}
@@
-698,8
+698,12
@@
int lttv_traceset_position_compare(const LttvTracesetPosition *pos1, const LttvT
return -1;
}
return -1;
}
- int res = bt_iter_equals_pos(pos1->bt_pos, pos2->bt_pos);
-
+ int res = -1;
+#ifdef HAVE_BT_ITER_EQUALS_POS
+ if(pos1->timestamp == G_MAXUINT64 || pos2->timestamp == G_MAXUINT64) {
+ res = bt_iter_equals_pos(pos1->bt_pos, pos2->bt_pos);
+ }
+#endif
if (res < 0) {
guint64 timeStampPos1,timeStampPos2;
if (res < 0) {
guint64 timeStampPos1,timeStampPos2;
@@
-708,16
+712,16
@@
int lttv_traceset_position_compare(const LttvTracesetPosition *pos1, const LttvT
timeStampPos1 = lttv_traceset_position_get_timestamp(pos1);
timeStampPos2 = lttv_traceset_position_get_timestamp(pos2);
timeStampPos1 = lttv_traceset_position_get_timestamp(pos1);
timeStampPos2 = lttv_traceset_position_get_timestamp(pos2);
+ if (timeStampPos1 == timeStampPos2) {
+
+ cpuId1 = lttv_traceset_position_get_cpuid(pos1);
+ cpuId2 = lttv_traceset_position_get_cpuid(pos2);
- cpuId1 = lttv_traceset_position_get_cpuid(pos1);
- cpuId2 = lttv_traceset_position_get_cpuid(pos2);
-
- if(timeStampPos1 == timeStampPos2 && cpuId1 == cpuId2){
- return 0;
- }
- else{
- return 1;
+ if(cpuId1 == cpuId2){
+ return 0;
+ }
}
}
+ return 1;
} else {
return !res;
} else {
return !res;
This page took
0.024278 seconds
and
4
git commands to generate.