opt_trace_procname_field,
opt_trace_vpid_field,
opt_loglevel_field,
- opt_delta_field = 1,
- opt_clock_raw,
- opt_clock_seconds,
- opt_clock_date,
- opt_clock_gmt;
-
-uint64_t opt_clock_offset;
+ opt_delta_field = 1;
enum field_item {
ITEM_SCOPE,
ITEM_PAYLOAD,
};
-struct trace_descriptor *ctf_text_open_trace(const char *collection_path,
- const char *path, int flags,
- void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+enum bt_loglevel {
+ BT_LOGLEVEL_EMERG = 0,
+ BT_LOGLEVEL_ALERT = 1,
+ BT_LOGLEVEL_CRIT = 2,
+ BT_LOGLEVEL_ERR = 3,
+ BT_LOGLEVEL_WARNING = 4,
+ BT_LOGLEVEL_NOTICE = 5,
+ BT_LOGLEVEL_INFO = 6,
+ BT_LOGLEVEL_DEBUG_SYSTEM = 7,
+ BT_LOGLEVEL_DEBUG_PROGRAM = 8,
+ BT_LOGLEVEL_DEBUG_PROCESS = 9,
+ BT_LOGLEVEL_DEBUG_MODULE = 10,
+ BT_LOGLEVEL_DEBUG_UNIT = 11,
+ BT_LOGLEVEL_DEBUG_FUNCTION = 12,
+ BT_LOGLEVEL_DEBUG_LINE = 13,
+ BT_LOGLEVEL_DEBUG = 14,
+};
+
+
+struct trace_descriptor *ctf_text_open_trace(const char *path, int flags,
+ 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
-void ctf_text_print_timestamp(struct ctf_text_stream_pos *pos,
- struct ctf_stream *stream)
+const char *print_loglevel(int value)
{
- uint64_t ts_sec = 0, ts_nsec;
- //need to get the clock offset at trace collection level. TODO
- //struct ctf_trace *trace = stream->stream_class->trace;
-
- ts_nsec = stream->timestamp;
-
- /* Add offsets */
- if (!opt_clock_raw) {
- //ts_sec += pos->clock_offset_s;
- //ts_nsec += pos->clock_offset;
- }
- ts_sec += opt_clock_offset;
-
- ts_sec += ts_nsec / NSEC_PER_SEC;
- ts_nsec = ts_nsec % NSEC_PER_SEC;
-
- if (!opt_clock_seconds) {
- struct tm tm;
- time_t time_s = (time_t) ts_sec;
-
- if (!opt_clock_gmt) {
- 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) {
- 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(pos->fp, "%s", timestr);
- }
- /* Print time in HH:MM:SS.ns */
- fprintf(pos->fp, "%02d:%02d:%02d.%09" PRIu64,
- tm.tm_hour, tm.tm_min, tm.tm_sec, ts_nsec);
- goto end;
+ switch (value) {
+ case -1:
+ return "";
+ case BT_LOGLEVEL_EMERG:
+ return "TRACE_EMERG";
+ case BT_LOGLEVEL_ALERT:
+ return "TRACE_ALERT";
+ case BT_LOGLEVEL_CRIT:
+ return "TRACE_CRIT";
+ case BT_LOGLEVEL_ERR:
+ return "TRACE_ERR";
+ case BT_LOGLEVEL_WARNING:
+ return "TRACE_WARNING";
+ case BT_LOGLEVEL_NOTICE:
+ return "TRACE_NOTICE";
+ case BT_LOGLEVEL_INFO:
+ return "TRACE_INFO";
+ case BT_LOGLEVEL_DEBUG_SYSTEM:
+ return "TRACE_DEBUG_SYSTEM";
+ case BT_LOGLEVEL_DEBUG_PROGRAM:
+ return "TRACE_DEBUG_PROGRAM";
+ case BT_LOGLEVEL_DEBUG_PROCESS:
+ return "TRACE_DEBUG_PROCESS";
+ case BT_LOGLEVEL_DEBUG_MODULE:
+ return "TRACE_DEBUG_MODULE";
+ case BT_LOGLEVEL_DEBUG_UNIT:
+ return "TRACE_DEBUG_UNIT";
+ case BT_LOGLEVEL_DEBUG_FUNCTION:
+ return "TRACE_DEBUG_FUNCTION";
+ case BT_LOGLEVEL_DEBUG_LINE:
+ return "TRACE_DEBUG_LINE";
+ case BT_LOGLEVEL_DEBUG:
+ return "TRACE_DEBUG";
+ default:
+ return "<<UNKNOWN>>";
}
-seconds:
- fprintf(pos->fp, "%3" PRIu64 ".%09" PRIu64,
- ts_sec, ts_nsec);
-
-end:
- return;
}
static
return -EINVAL;
}
+ /* Print events discarded */
+ if (stream->events_discarded) {
+ fflush(pos->fp);
+ fprintf(stderr, "[warning] Tracer discarded %d 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");
+ fflush(stderr);
+ stream->events_discarded = 0;
+ }
+
if (stream->has_timestamp) {
set_field_names_print(pos, ITEM_HEADER);
if (pos->print_names)
fprintf(pos->fp, "timestamp = ");
else
fprintf(pos->fp, "[");
- ctf_text_print_timestamp(pos, stream);
+ ctf_print_timestamp(pos->fp, stream, stream->timestamp);
if (!pos->print_names)
fprintf(pos->fp, "]");
else
fprintf(pos->fp, " ");
}
- if ((opt_trace_domain_field && !opt_all_fields) && stream_class->trace->domain[0] != '\0') {
+ 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) {
fprintf(pos->fp, "trace:domain = ");
}
- fprintf(pos->fp, "%s", stream_class->trace->domain);
+ fprintf(pos->fp, "%s", stream_class->trace->env.domain);
if (pos->print_names)
fprintf(pos->fp, ", ");
dom_print = 1;
}
- if ((opt_trace_procname_field && !opt_all_fields) && stream_class->trace->procname[0] != '\0') {
+ if ((opt_trace_procname_field && !opt_all_fields) && stream_class->trace->env.procname[0] != '\0') {
set_field_names_print(pos, ITEM_HEADER);
if (pos->print_names) {
fprintf(pos->fp, "trace:procname = ");
} else if (dom_print) {
fprintf(pos->fp, ":");
}
- fprintf(pos->fp, "%s", stream_class->trace->procname);
+ fprintf(pos->fp, "%s", stream_class->trace->env.procname);
if (pos->print_names)
fprintf(pos->fp, ", ");
dom_print = 1;
}
- if ((opt_trace_vpid_field && !opt_all_fields) && stream_class->trace->vpid[0] != '\0') {
+ if ((opt_trace_vpid_field && !opt_all_fields) && stream_class->trace->env.vpid != -1) {
set_field_names_print(pos, ITEM_HEADER);
if (pos->print_names) {
fprintf(pos->fp, "trace:vpid = ");
} else if (dom_print) {
fprintf(pos->fp, ":");
}
- fprintf(pos->fp, "%s", stream_class->trace->vpid);
+ fprintf(pos->fp, "%d", stream_class->trace->env.vpid);
if (pos->print_names)
fprintf(pos->fp, ", ");
dom_print = 1;
}
- if ((opt_loglevel_field || opt_all_fields) && event_class->loglevel_identifier != 0) {
+ if ((opt_loglevel_field || opt_all_fields) && event_class->loglevel != -1) {
set_field_names_print(pos, ITEM_HEADER);
if (pos->print_names) {
fprintf(pos->fp, "loglevel = ");
} else if (dom_print) {
fprintf(pos->fp, ":");
}
- fprintf(pos->fp, "%s (%lld)",
- g_quark_to_string(event_class->loglevel_identifier),
- (long long) event_class->loglevel_value);
+ fprintf(pos->fp, "%s (%d)",
+ print_loglevel(event_class->loglevel),
+ event_class->loglevel);
if (pos->print_names)
fprintf(pos->fp, ", ");
dom_print = 1;
/* newline */
fprintf(pos->fp, "\n");
pos->field_nr = 0;
+ stream->consumed = 1;
return 0;
}
-struct trace_descriptor *ctf_text_open_trace(const char *collection_path,
- const char *path, int flags,
- void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+struct trace_descriptor *ctf_text_open_trace(const char *path, int flags,
+ void (*packet_seek)(struct stream_pos *pos, size_t index,
int whence), FILE *metadata_fp)
{
struct ctf_text_stream_pos *pos;
projects / babeltrace.git / blobdiff