*/
event->event_class = bt_get(event_class);
event->clock_values = g_hash_table_new_full(g_direct_hash,
- g_direct_equal, NULL, g_free);
+ g_direct_equal, bt_put, bt_put);
event_header =
bt_ctf_field_create(validation_output.event_header_type);
if (!event_header) {
return stream;
}
-struct bt_ctf_clock *bt_ctf_event_get_clock(struct bt_ctf_event *event)
-{
- struct bt_ctf_clock *clock = NULL;
- struct bt_ctf_event_class *event_class;
- struct bt_ctf_stream_class *stream_class;
-
- if (!event) {
- goto end;
- }
-
- event_class = bt_ctf_event_get_class(event);
- if (!event_class) {
- goto end;
- }
-
- stream_class = bt_ctf_event_class_get_stream_class(event_class);
- if (!stream_class) {
- goto error_put_event_class;
- }
-
- clock = bt_ctf_stream_class_get_clock(stream_class);
- if (!clock) {
- goto error_put_stream_class;
- }
-
-error_put_stream_class:
- bt_put(stream_class);
-error_put_event_class:
- bt_put(event_class);
-end:
- return clock;
-}
-
int bt_ctf_event_set_payload(struct bt_ctf_event *event,
const char *name,
struct bt_ctf_field *payload)
g_free(event);
}
-uint64_t bt_ctf_event_get_clock_value(struct bt_ctf_event *event,
- struct bt_ctf_clock *clock)
+struct bt_ctf_clock_value *bt_ctf_event_get_clock_value(
+ struct bt_ctf_event *event, struct bt_ctf_clock *clock)
{
- uint64_t ret = -1ULL;
- uint64_t *clock_value;
+ struct bt_ctf_clock_value *clock_value = NULL;
if (!event || !clock) {
goto end;
goto end;
}
- ret = *clock_value;
+ bt_get(clock_value);
+end:
+ return clock_value;
+}
+
+int bt_ctf_event_set_clock_value(struct bt_ctf_event *event,
+ struct bt_ctf_clock *clock, struct bt_ctf_clock_value *value)
+{
+ int ret = 0;
+
+ if (!event || !clock || !value || event->frozen) {
+ ret = -1;
+ goto end;
+ }
+ g_hash_table_insert(event->clock_values, bt_get(clock), bt_get(value));
end:
return ret;
}
extern "C" {
#endif
+struct bt_ctf_clock;
+struct bt_ctf_clock_value;
struct bt_ctf_event_class;
struct bt_ctf_event;
struct bt_ctf_field;
extern struct bt_ctf_stream *bt_ctf_event_get_stream(
struct bt_ctf_event *event);
-/*
- * bt_ctf_event_get_clock: get an event's associated clock.
- *
- * @param event Event.
- *
- * Returns the event's clock, NULL on error.
- */
-extern struct bt_ctf_clock *bt_ctf_event_get_clock(
- struct bt_ctf_event *event);
-
/*
* bt_ctf_event_get_payload_field: get an event's payload.
*
extern int bt_ctf_event_set_packet(struct bt_ctf_event *event,
struct bt_ctf_packet *packet);
-extern uint64_t bt_ctf_event_get_clock_value(struct bt_ctf_event *event,
- struct bt_ctf_clock *clock);
+extern struct bt_ctf_clock_value *bt_ctf_event_get_clock_value(
+ struct bt_ctf_event *event, struct bt_ctf_clock *clock);
+
+extern int bt_ctf_event_set_clock_value(
+ struct bt_ctf_event *event, struct bt_ctf_clock *clock,
+ struct bt_ctf_clock_value *value);
#ifdef __cplusplus
}
#include <babeltrace/ctf-ir/clock.h>
#include <babeltrace/ctf-ir/field-types.h>
#include <babeltrace/ctf-ir/fields.h>
+#include <babeltrace/ctf-ir/trace.h>
#include <babeltrace/bitfield.h>
#include <inttypes.h>
#include "text.h"
+#define NSEC_PER_SEC 1000000000LL
+
static inline
const char *rem_(const char *str)
{
struct bt_ctf_clock *clock,
struct bt_ctf_event *event)
{
- fputs("00000000000000000000", text->out);
+ int ret;
+ struct bt_ctf_clock_value *clock_value;
+ uint64_t cycles;
+
+ clock_value = bt_ctf_event_get_clock_value(event, clock);
+ if (!clock_value) {
+ fputs("????????????????????", text->out);
+ return;
+ }
+
+ ret = bt_ctf_clock_value_get_value(clock_value, &cycles);
+ bt_put(clock_value);
+ if (ret) {
+ fprintf(text->out, "Error");
+ return;
+ }
+ fprintf(text->out, "%020" PRIu64, cycles);
}
static
struct bt_ctf_clock *clock,
struct bt_ctf_event *event)
{
- fputs("??:??:??.?????????", text->out);
-}
+ int ret;
+ struct bt_ctf_clock_value *clock_value;
+ int64_t ts_nsec = 0; /* add configurable offset */
+ int64_t ts_sec = 0; /* add configurable offset */
+ uint64_t ts_sec_abs, ts_nsec_abs;
+ bool is_negative;
+
+ clock_value = bt_ctf_event_get_clock_value(event, clock);
+ if (!clock_value) {
+ fputs("??:??:??.?????????", text->out);
+ return;
+ }
+
+ ret = bt_ctf_clock_value_get_value_ns_from_epoch(clock_value, &ts_nsec);
+ bt_put(clock_value);
+ if (ret) {
+ fprintf(text->out, "Error");
+ return;
+ }
+
+ ts_sec += ts_nsec / NSEC_PER_SEC;
+ ts_nsec = ts_nsec % NSEC_PER_SEC;
+ if (ts_sec >= 0 && ts_nsec >= 0) {
+ is_negative = false;
+ ts_sec_abs = ts_sec;
+ ts_nsec_abs = ts_nsec;
+ } else if (ts_sec > 0 && ts_nsec < 0) {
+ is_negative = false;
+ ts_sec_abs = ts_sec - 1;
+ ts_nsec_abs = NSEC_PER_SEC + ts_nsec;
+ } else if (ts_sec == 0 && ts_nsec < 0) {
+ is_negative = true;
+ ts_sec_abs = ts_sec;
+ ts_nsec_abs = -ts_nsec;
+ } else if (ts_sec < 0 && ts_nsec > 0) {
+ is_negative = true;
+ ts_sec_abs = -(ts_sec + 1);
+ ts_nsec_abs = NSEC_PER_SEC - ts_nsec;
+ } else if (ts_sec < 0 && ts_nsec == 0) {
+ is_negative = true;
+ ts_sec_abs = -ts_sec;
+ ts_nsec_abs = ts_nsec;
+ } else { /* (ts_sec < 0 && ts_nsec < 0) */
+ is_negative = true;
+ ts_sec_abs = -ts_sec;
+ ts_nsec_abs = -ts_nsec;
+ }
+
+ if (/*!opt_clock_seconds*/true) {
+ struct tm tm;
+ time_t time_s = (time_t) ts_sec_abs;
+
+ if (is_negative) {
+ fprintf(stderr, "[warning] Fallback to [sec.ns] to print negative time value. Use --clock-seconds.\n");
+ goto seconds;
+ }
-static
-enum bt_component_status get_event_timestamp(struct bt_ctf_event *event)
-{
-/* int ret;
- uint64_t value, frequency;
- int64_t offset_s, offset;
-*/
- return BT_COMPONENT_STATUS_OK;
+ if (/*!opt_clock_gmt*/true) {
+ struct tm *res;
+
+ res = localtime_r(&time_s, &tm);
+ if (!res) {
+ fprintf(stderr, "[warning] Unable to get localtime.\n");
+ goto seconds;
+ }
+ } else {
+ struct tm *res;
+
+ res = gmtime_r(&time_s, &tm);
+ if (!res) {
+ fprintf(stderr, "[warning] Unable to get gmtime.\n");
+ goto seconds;
+ }
+ }
+ if (/*opt_clock_date*/false) {
+ char timestr[26];
+ size_t res;
+
+ /* Print date and time */
+ res = strftime(timestr, sizeof(timestr),
+ "%F ", &tm);
+ if (!res) {
+ fprintf(stderr, "[warning] Unable to print ascii time.\n");
+ goto seconds;
+ }
+ fprintf(text->out, "%s", timestr);
+ }
+ /* Print time in HH:MM:SS.ns */
+ fprintf(text->out, "%02d:%02d:%02d.%09" PRIu64,
+ tm.tm_hour, tm.tm_min, tm.tm_sec, ts_nsec_abs);
+ goto end;
+ }
+seconds:
+ fprintf(text->out, "%s%" PRId64 ".%09" PRIu64,
+ is_negative ? "-" : "", ts_sec_abs, ts_nsec_abs);
+end:
+ return;
}
static
bool print_names = text->options.print_header_field_names;
enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
struct bt_ctf_stream *stream = NULL;
+ struct bt_ctf_stream_class *stream_class = NULL;
+ struct bt_ctf_trace *trace = NULL;
struct bt_ctf_clock *clock = NULL;
FILE *out = text->out;
FILE *err = text->err;
goto end;
}
- clock = bt_ctf_event_get_clock(event);
- if (!clock) {
- /* Stream has no timestamp. */
- //puts("no_timestamp!");
- //goto end;
- }
+ /* FIXME - error checking */
+ stream_class = bt_ctf_stream_get_class(stream);
+ trace = bt_ctf_stream_class_get_trace(stream_class);
+ clock = bt_ctf_trace_get_clock(trace, 0);
fputs(print_names ? "timestamp = " : "[", out);
if (text->options.print_timestamp_cycles) {
end:
bt_put(stream);
bt_put(clock);
+ bt_put(stream_class);
+ bt_put(trace);
return ret;
}
projects / babeltrace.git / commitdiff
