#include <babeltrace/ctf-text/types.h>
#include <babeltrace/ctf/metadata.h>
#include <babeltrace/babeltrace-internal.h>
+#include <babeltrace/ctf/events-internal.h>
#include <inttypes.h>
-#include <uuid/uuid.h>
#include <sys/mman.h>
#include <errno.h>
#include <sys/types.h>
opt_trace_domain_field,
opt_trace_procname_field,
opt_trace_vpid_field,
+ opt_trace_hostname_field,
opt_loglevel_field,
opt_delta_field = 1;
struct trace_descriptor *ctf_text_open_trace(const char *path, int flags,
- void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+ void (*packet_seek)(struct stream_pos *pos, size_t index,
int whence), FILE *metadata_fp);
void ctf_text_close_trace(struct trace_descriptor *descriptor);
}
static
-int ctf_text_write_event(struct stream_pos *ppos,
- struct ctf_stream *stream)
+int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition *stream)
+
{
struct ctf_text_stream_pos *pos =
container_of(ppos, struct ctf_text_stream_pos, parent);
- struct ctf_stream_class *stream_class = stream->stream_class;
+ struct ctf_stream_declaration *stream_class = stream->stream_class;
int field_nr_saved;
- struct ctf_event *event_class;
- struct ctf_stream_event *event;
+ struct ctf_event_declaration *event_class;
+ struct ctf_event_definition *event;
uint64_t id;
int ret;
int dom_print = 0;
return -EINVAL;
}
event_class = g_ptr_array_index(stream_class->events_by_id, id);
- if (!event) {
- fprintf(stderr, "[error] Event id %" PRIu64 " is unknown.\n", id);
+ if (!event_class) {
+ fprintf(stderr, "[error] Event class id %" PRIu64 " is unknown.\n", id);
return -EINVAL;
}
/* Print events discarded */
if (stream->events_discarded) {
fflush(pos->fp);
- fprintf(stderr, "[warning] Tracer discarded %d events between [",
+ fprintf(stderr, "[warning] Tracer discarded %" PRIu64 " events between [",
stream->events_discarded);
- ctf_print_timestamp(stderr, stream, stream->prev_timestamp);
- fprintf(stderr, "] and [");
- ctf_print_timestamp(stderr, stream, stream->prev_timestamp_end);
- fprintf(stderr, "]. You should consider increasing the buffer size.\n");
+ if (opt_clock_cycles) {
+ ctf_print_timestamp(stderr, stream,
+ stream->prev_cycles_timestamp);
+ fprintf(stderr, "] and [");
+ ctf_print_timestamp(stderr, stream,
+ stream->prev_cycles_timestamp_end);
+ } else {
+ ctf_print_timestamp(stderr, stream,
+ stream->prev_real_timestamp);
+ fprintf(stderr, "] and [");
+ ctf_print_timestamp(stderr, stream,
+ stream->prev_real_timestamp_end);
+ }
+ fprintf(stderr, "]. You should consider recording a new trace with larger buffers or with fewer events enabled.\n");
fflush(stderr);
stream->events_discarded = 0;
}
fprintf(pos->fp, "timestamp = ");
else
fprintf(pos->fp, "[");
- ctf_print_timestamp(pos->fp, stream, stream->timestamp);
+ if (opt_clock_cycles) {
+ ctf_print_timestamp(pos->fp, stream, stream->cycles_timestamp);
+ } else {
+ ctf_print_timestamp(pos->fp, stream, stream->real_timestamp);
+ }
if (!pos->print_names)
fprintf(pos->fp, "]");
fprintf(pos->fp, "delta = ");
else
fprintf(pos->fp, "(");
- if (pos->last_timestamp != -1ULL) {
- delta = stream->timestamp - pos->last_timestamp;
+ if (pos->last_real_timestamp != -1ULL) {
+ delta = stream->real_timestamp - pos->last_real_timestamp;
delta_sec = delta / NSEC_PER_SEC;
delta_nsec = delta % NSEC_PER_SEC;
fprintf(pos->fp, "+%" PRIu64 ".%09" PRIu64,
fprintf(pos->fp, ", ");
else
fprintf(pos->fp, " ");
- pos->last_timestamp = stream->timestamp;
+ pos->last_real_timestamp = stream->real_timestamp;
+ pos->last_cycles_timestamp = stream->cycles_timestamp;
}
if ((opt_trace_field || opt_all_fields) && stream_class->trace->path[0] != '\0') {
else
fprintf(pos->fp, " ");
}
+ if ((opt_trace_hostname_field && !opt_all_fields) && stream_class->trace->env.hostname[0] != '\0') {
+ set_field_names_print(pos, ITEM_HEADER);
+ if (pos->print_names) {
+ fprintf(pos->fp, "trace:hostname = ");
+ }
+ fprintf(pos->fp, "%s", stream_class->trace->env.hostname);
+ if (pos->print_names)
+ fprintf(pos->fp, ", ");
+ dom_print = 1;
+ }
if ((opt_trace_domain_field && !opt_all_fields) && stream_class->trace->env.domain[0] != '\0') {
set_field_names_print(pos, ITEM_HEADER);
if (pos->print_names) {
/* newline */
fprintf(pos->fp, "\n");
pos->field_nr = 0;
- stream->consumed = 1;
return 0;
struct trace_descriptor *ctf_text_open_trace(const char *path, int flags,
- void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+ void (*packet_seek)(struct stream_pos *pos, size_t index,
int whence), FILE *metadata_fp)
{
struct ctf_text_stream_pos *pos;
pos = g_new0(struct ctf_text_stream_pos, 1);
- pos->last_timestamp = -1ULL;
+ pos->last_real_timestamp = -1ULL;
+ pos->last_cycles_timestamp = -1ULL;
switch (flags & O_ACCMODE) {
case O_RDWR:
if (!path)