X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Flttngtop.c;h=d51302c71b78ac99d0c99c4095adce2a3b3056bd;hp=52bf6e98bf77e7cd9a9d484f442db94e9afbb9ad;hb=3439955e838cd626b61ca36e37f80a104966a8fe;hpb=c263c4eb55ebd2b6caf659a7f524f9543df41544 diff --git a/src/lttngtop.c b/src/lttngtop.c index 52bf6e9..d51302c 100644 --- a/src/lttngtop.c +++ b/src/lttngtop.c @@ -10,10 +10,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA. + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #define _GNU_SOURCE @@ -23,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -113,7 +113,7 @@ void *ncurses_display(void *p) * hook on each event to check the timestamp and refresh the display if * necessary */ -enum bt_cb_ret check_timestamp(struct bt_ctf_event *call_data, void *private_data) +enum bt_cb_ret check_timestamp(struct ctf_event_definition *call_data, void *private_data) { unsigned long timestamp; @@ -195,8 +195,8 @@ void update_perf_value(struct processtop *proc, struct cputime *cpu, } } -void extract_perf_counter_scope(struct bt_ctf_event *event, - struct definition *scope, +void extract_perf_counter_scope(const struct ctf_event_definition *event, + const struct definition *scope, struct processtop *proc, struct cputime *cpu) { @@ -213,7 +213,7 @@ void extract_perf_counter_scope(struct bt_ctf_event *event, for (i = 0; i < count; i++) { const char *name = bt_ctf_field_name(list[i]); - if (strncmp(name, "_perf_", 6) == 0) { + if (strncmp(name, "perf_", 5) == 0) { int value = bt_ctf_get_uint64(list[i]); if (bt_ctf_field_get_error()) continue; @@ -225,19 +225,12 @@ end: return; } -void update_perf_counter(struct processtop *proc, struct bt_ctf_event *event) +void update_perf_counter(struct processtop *proc, const struct ctf_event_definition *event) { - struct definition *scope; - uint64_t cpu_id; struct cputime *cpu; + const struct definition *scope; - scope = bt_ctf_get_top_level_scope(event, BT_STREAM_PACKET_CONTEXT); - cpu_id = bt_ctf_get_uint64(bt_ctf_get_field(event, scope, "cpu_id")); - if (bt_ctf_field_get_error()) { - fprintf(stderr, "[error] get cpu_id\n"); - goto end; - } - cpu = get_cpu(cpu_id); + cpu = get_cpu(get_cpu_id(event)); scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT); extract_perf_counter_scope(event, scope, proc, cpu); @@ -247,18 +240,14 @@ void update_perf_counter(struct processtop *proc, struct bt_ctf_event *event) scope = bt_ctf_get_top_level_scope(event, BT_EVENT_CONTEXT); extract_perf_counter_scope(event, scope, proc, cpu); - -end: - return; } -enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data, +enum bt_cb_ret fix_process_table(struct ctf_event_definition *call_data, void *private_data) { int pid, tid, ppid; char *comm; struct processtop *parent, *child; - struct definition *scope; unsigned long timestamp; /* FIXME : display nice error when missing context pid, tid, ppid and comm */ @@ -267,25 +256,23 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data, if (timestamp == -1ULL) goto error; - scope = bt_ctf_get_top_level_scope(call_data, BT_STREAM_EVENT_CONTEXT); - - pid = bt_ctf_get_int64(bt_ctf_get_field(call_data, scope, "_pid")); - if (bt_ctf_field_get_error()) { + pid = get_context_pid(call_data); + if (pid == -1ULL) { // fprintf(stderr, "Missing pid context info\n"); goto error; } - tid = bt_ctf_get_int64(bt_ctf_get_field(call_data, scope, "_tid")); - if (bt_ctf_field_get_error()) { + tid = get_context_tid(call_data); + if (tid == -1ULL) { // fprintf(stderr, "Missing tid context info\n"); goto error; } - ppid = bt_ctf_get_int64(bt_ctf_get_field(call_data, scope, "_ppid")); - if (bt_ctf_field_get_error()) { + ppid = get_context_ppid(call_data); + if (ppid == -1ULL) { // fprintf(stderr, "Missing ppid context info\n"); goto error; } - comm = bt_ctf_get_char_array(bt_ctf_get_field(call_data, scope, "_procname")); - if (bt_ctf_field_get_error()) { + comm = get_context_comm(call_data); + if (!comm) { // fprintf(stderr, "Missing procname context info\n"); goto error; } @@ -329,6 +316,11 @@ void init_lttngtop() sem_init(&pause_sem, 0, 1); sem_init(&end_trace_sem, 0, 0); + reset_global_counters(); + lttngtop.nbproc = 0; + lttngtop.nbthreads = 0; + lttngtop.nbfiles = 0; + lttngtop.process_table = g_ptr_array_new(); lttngtop.files_table = g_ptr_array_new(); lttngtop.cpu_table = g_ptr_array_new(); @@ -398,7 +390,7 @@ void iter_trace(struct bt_context *bt_ctx) { struct bt_ctf_iter *iter; struct bt_iter_pos begin_pos; - struct bt_ctf_event *event; + const struct ctf_event_definition *event; int ret = 0; begin_pos.type = BT_SEEK_BEGIN; @@ -431,6 +423,18 @@ void iter_trace(struct bt_context *bt_ctx) bt_ctf_iter_add_callback(iter, g_quark_from_static_string("sys_read"), NULL, 0, handle_sys_read, NULL, NULL, NULL); + bt_ctf_iter_add_callback(iter, + g_quark_from_static_string("sys_open"), + NULL, 0, handle_sys_open, NULL, NULL, NULL); + bt_ctf_iter_add_callback(iter, + g_quark_from_static_string("sys_close"), + NULL, 0, handle_sys_close, NULL, NULL, NULL); + bt_ctf_iter_add_callback(iter, + g_quark_from_static_string( + "lttng_statedump_file_descriptor"), + NULL, 0, handle_statedump_file_descriptor, + NULL, NULL, NULL); + while ((event = bt_ctf_iter_read_event(iter)) != NULL) { ret = bt_iter_next(bt_ctf_get_iter(iter)); if (ret < 0) @@ -441,7 +445,7 @@ void iter_trace(struct bt_context *bt_ctx) sem_wait(&end_trace_sem); end_iter: - bt_iter_destroy(bt_ctf_get_iter(iter)); + bt_ctf_iter_destroy(iter); } /*