projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lib: rename "clock value" -> "clock snapshot"
[babeltrace.git]
/
plugins
/
ctf
/
common
/
msg-iter
/
msg-iter.c
diff --git
a/plugins/ctf/common/msg-iter/msg-iter.c
b/plugins/ctf/common/msg-iter/msg-iter.c
index 4843f275e516a5a9db5df8da00da54562c8c5ab7..8bed03784ce3503c25c61627066efda7c79219a3 100644
(file)
--- a/
plugins/ctf/common/msg-iter/msg-iter.c
+++ b/
plugins/ctf/common/msg-iter/msg-iter.c
@@
-213,7
+213,7
@@
struct bt_msg_iter {
off_t cur_packet_offset;
/* Default clock's current value */
off_t cur_packet_offset;
/* Default clock's current value */
- uint64_t default_clock_
val
;
+ uint64_t default_clock_
snapshot
;
/* End of packet snapshots */
struct {
/* End of packet snapshots */
struct {
@@
-1731,12
+1731,12
@@
void update_default_clock(struct bt_msg_iter *notit, uint64_t new_val,
* current value directly.
*/
if (new_val_size == 64) {
* current value directly.
*/
if (new_val_size == 64) {
- notit->default_clock_
val
= new_val;
+ notit->default_clock_
snapshot
= new_val;
goto end;
}
new_val_mask = (1ULL << new_val_size) - 1;
goto end;
}
new_val_mask = (1ULL << new_val_size) - 1;
- cur_value_masked = notit->default_clock_
val
& new_val_mask;
+ cur_value_masked = notit->default_clock_
snapshot
& new_val_mask;
if (new_val < cur_value_masked) {
/*
if (new_val < cur_value_masked) {
/*
@@
-1744,18
+1744,18
@@
void update_default_clock(struct bt_msg_iter *notit, uint64_t new_val,
* of the requested new value. Assume that the clock
* value wrapped only one time.
*/
* of the requested new value. Assume that the clock
* value wrapped only one time.
*/
- notit->default_clock_
val
+= new_val_mask + 1;
+ notit->default_clock_
snapshot
+= new_val_mask + 1;
}
/* Clear the low bits of the current clock value. */
}
/* Clear the low bits of the current clock value. */
- notit->default_clock_
val
&= ~new_val_mask;
+ notit->default_clock_
snapshot
&= ~new_val_mask;
/* Set the low bits of the current clock value. */
/* Set the low bits of the current clock value. */
- notit->default_clock_
val
|= new_val;
+ notit->default_clock_
snapshot
|= new_val;
end:
BT_LOGV("Updated default clock's value from integer field's value: "
end:
BT_LOGV("Updated default clock's value from integer field's value: "
- "value=%" PRIu64, notit->default_clock_
val
);
+ "value=%" PRIu64, notit->default_clock_
snapshot
);
}
static
}
static
@@
-2244,7
+2244,7
@@
end:
}
static
}
static
-void set_event_default_clock_
value
(struct bt_msg_iter *notit)
+void set_event_default_clock_
snapshot
(struct bt_msg_iter *notit)
{
bt_event *event =
bt_message_event_borrow_event(
{
bt_event *event =
bt_message_event_borrow_event(
@@
-2254,8
+2254,8
@@
void set_event_default_clock_value(struct bt_msg_iter *notit)
BT_ASSERT(event);
if (bt_stream_class_borrow_default_clock_class(sc)) {
BT_ASSERT(event);
if (bt_stream_class_borrow_default_clock_class(sc)) {
- bt_event_set_default_clock_
value
(event,
- notit->default_clock_
val
);
+ bt_event_set_default_clock_
snapshot
(event,
+ notit->default_clock_
snapshot
);
}
}
}
}
@@
-2341,15
+2341,15
@@
void notify_new_packet(struct bt_msg_iter *notit,
notit->packet, notit->snapshots.packets);
}
notit->packet, notit->snapshots.packets);
}
- if (bt_stream_class_packets_have_default_beginning_clock_
value
(sc)) {
+ if (bt_stream_class_packets_have_default_beginning_clock_
snapshot
(sc)) {
BT_ASSERT(notit->snapshots.beginning_clock != UINT64_C(-1));
BT_ASSERT(notit->snapshots.beginning_clock != UINT64_C(-1));
- bt_packet_set_default_beginning_clock_
value
(
+ bt_packet_set_default_beginning_clock_
snapshot
(
notit->packet, notit->snapshots.beginning_clock);
}
notit->packet, notit->snapshots.beginning_clock);
}
- if (bt_stream_class_packets_have_default_end_clock_
value
(sc)) {
+ if (bt_stream_class_packets_have_default_end_clock_
snapshot
(sc)) {
BT_ASSERT(notit->snapshots.end_clock != UINT64_C(-1));
BT_ASSERT(notit->snapshots.end_clock != UINT64_C(-1));
- bt_packet_set_default_end_clock_
value
(
+ bt_packet_set_default_end_clock_
snapshot
(
notit->packet, notit->snapshots.end_clock);
}
notit->packet, notit->snapshots.end_clock);
}
@@
-2419,7
+2419,7
@@
void notify_end_of_packet(struct bt_msg_iter *notit,
/* Update default clock from packet's end time */
if (notit->snapshots.end_clock != UINT64_C(-1)) {
/* Update default clock from packet's end time */
if (notit->snapshots.end_clock != UINT64_C(-1)) {
- notit->default_clock_
val
= notit->snapshots.end_clock;
+ notit->default_clock_
snapshot
= notit->snapshots.end_clock;
}
BT_ASSERT(notit->msg_iter);
}
BT_ASSERT(notit->msg_iter);
@@
-2610,7
+2610,7
@@
enum bt_msg_iter_status bt_msg_iter_get_next_message(
goto end;
case STATE_EMIT_MSG_EVENT:
BT_ASSERT(notit->event_msg);
goto end;
case STATE_EMIT_MSG_EVENT:
BT_ASSERT(notit->event_msg);
- set_event_default_clock_
value
(notit);
+ set_event_default_clock_
snapshot
(notit);
*message = notit->event_msg;
notit->event_msg = NULL;
goto end;
*message = notit->event_msg;
notit->event_msg = NULL;
goto end;
This page took
0.056555 seconds
and
4
git commands to generate.