sem_t metadata_available;
int reload_trace = 0;
-int last_textdump_print_newline = 1;
-
enum {
OPT_NONE = 0,
OPT_HELP,
unsigned long timestamp;
struct tm start;
uint64_t ts_nsec_start;
- int pid, cpu_id;
- int64_t syscall_ret;
+ int pid, cpu_id, tid;
const struct bt_definition *scope;
const char *hostname, *procname;
if (pid == -1ULL && opt_tid) {
goto error;
}
+
+ tid = get_context_tid(call_data);
hostname = get_context_hostname(call_data);
- if (opt_tid || opt_hostname)
- if (!lookup_filter_tid_list(pid))
- goto end;
+ if (opt_tid || opt_hostname) {
+ if (!lookup_filter_tid_list(pid)) {
+ /* To display when a process of ours in getting scheduled in */
+ if (strcmp(bt_ctf_event_name(call_data), "sched_switch") == 0) {
+ int next_tid;
+
+ scope = bt_ctf_get_top_level_scope(call_data,
+ BT_EVENT_FIELDS);
+ next_tid = bt_ctf_get_int64(bt_ctf_get_field(call_data,
+ scope, "_next_tid"));
+ if (bt_ctf_field_get_error()) {
+ fprintf(stderr, "Missing next_tid field\n");
+ goto error;
+ }
+ if (!lookup_filter_tid_list(next_tid)) {
+ goto end;
+ }
+ } else {
+ goto end;
+ }
+ }
+ }
cpu_id = get_cpu_id(call_data);
procname = get_context_comm(call_data);
- if ((strcmp(bt_ctf_event_name(call_data), "exit_syscall") == 0) &&
- !last_textdump_print_newline) {
- scope = bt_ctf_get_top_level_scope(call_data,
- BT_EVENT_FIELDS);
- syscall_ret = bt_ctf_get_int64(bt_ctf_get_field(call_data,
- scope, "_ret"));
- printf("= %ld\n", syscall_ret);
- last_textdump_print_newline = 1;
+ if (hostname) {
+ printf("%02d:%02d:%02d.%09" PRIu64 " (%s) (cpu %d) [%s (%d/%d)] %s (",
+ start.tm_hour, start.tm_min, start.tm_sec,
+ ts_nsec_start, hostname, cpu_id, procname, pid,
+ tid, bt_ctf_event_name(call_data));
} else {
- /* we might have lost the exit_syscall event, so need to
- * print the newline in this case */
- if (last_textdump_print_newline == 0)
- printf("\n");
- if (hostname) {
- printf("%02d:%02d:%02d.%09" PRIu64 " (%s) (cpu %d) [%s (%d)] %s (",
- start.tm_hour, start.tm_min, start.tm_sec,
- ts_nsec_start, hostname, cpu_id, procname, pid,
- bt_ctf_event_name(call_data));
- } else {
- printf("%02d:%02d:%02d.%09" PRIu64 " (cpu %d) [%s (%d)] %s (",
- start.tm_hour, start.tm_min, start.tm_sec,
- ts_nsec_start, cpu_id, procname, pid,
- bt_ctf_event_name(call_data));
- }
- print_fields(call_data);
- printf(") ");
- if (strncmp(bt_ctf_event_name(call_data), "sys_", 4) != 0) {
- printf("\n");
- last_textdump_print_newline = 1;
- } else {
- last_textdump_print_newline = 0;
- }
+ printf("%02d:%02d:%02d.%09" PRIu64 " (cpu %d) [%s (%d/%d)] %s (",
+ start.tm_hour, start.tm_min, start.tm_sec,
+ ts_nsec_start, cpu_id, procname, pid, tid,
+ bt_ctf_event_name(call_data));
}
+ print_fields(call_data);
+ printf(")\n");
end:
return BT_CB_OK;