kprobe support

[lttngtop.git] / src / lttngtop.c

diff --git a/src/lttngtop.c b/src/lttngtop.c
index 9c8cd17cf45d51491bc22fb30db3035482967e3d..ae10e9fbe3ebd74480f7c6fd8a9eee1c765c462c 100644 (file)
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -181,7 +181,7 @@ void print_fields(struct bt_ctf_event *event)
                        printf("%s", bt_ctf_get_string(list[i]));
                } else if (type == CTF_TYPE_ARRAY) {
                        str = bt_ctf_get_char_array(list[i]);
-                       if (str)
+                       if (!bt_ctf_field_get_error() && str)
                                printf("%s", str);
                }
        }
@@ -223,7 +223,7 @@ enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat
        cpu_id = get_cpu_id(call_data);
        procname = get_context_comm(call_data);
 
-       if (strcmp(bt_ctf_event_name(call_data), "exit_syscall") == 0) {
+       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,
@@ -241,13 +241,12 @@ enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat
                                bt_ctf_event_name(call_data));
                print_fields(call_data);
                printf(") ");
-               /*
-               if (strncmp(bt_ctf_event_name(call_data), "sys_", 4) == 0) {
-               } else {
+               if (strncmp(bt_ctf_event_name(call_data), "sys_", 4) != 0) {
                        printf("\n");
+                       last_textdump_print_newline = 1;
+               } else {
+                       last_textdump_print_newline = 0;
                }
-               */
-               last_textdump_print_newline = 0;
        }
 
 end:
@@ -256,6 +255,22 @@ error:
        return BT_CB_ERROR_STOP;
 }
 
+enum bt_cb_ret handle_kprobes(struct bt_ctf_event *call_data, void *private_data)
+{
+       int i;
+       struct kprobes *kprobe;
+
+       /* for kprobes */
+       for (i = 0; i < lttngtop.kprobes_table->len; i++) {
+               kprobe = g_ptr_array_index(lttngtop.kprobes_table, i);
+               if (strcmp(bt_ctf_event_name(call_data), kprobe->probe_name) == 0) {
+                       kprobe->count++;
+               }
+       }
+
+       return BT_CB_OK;
+}
+
 /*
  * hook on each event to check the timestamp and refresh the display if
  * necessary
@@ -484,6 +499,7 @@ void init_lttngtop()
        lttngtop.process_table = g_ptr_array_new();
        lttngtop.files_table = g_ptr_array_new();
        lttngtop.cpu_table = g_ptr_array_new();
+       lttngtop.kprobes_table = g_ptr_array_new();
 }
 
 void usage(FILE *fp)
@@ -568,7 +584,9 @@ void iter_trace(struct bt_context *bt_ctx)
 {
        struct bt_ctf_iter *iter;
        struct bt_iter_pos begin_pos;
+       struct kprobes *kprobe;
        const struct bt_ctf_event *event;
+       int i;
        int ret = 0;
 
        begin_pos.type = BT_SEEK_BEGIN;
@@ -623,9 +641,19 @@ void iter_trace(struct bt_context *bt_ctx)
                                        "lttng_statedump_file_descriptor"),
                                NULL, 0, handle_statedump_file_descriptor,
                                NULL, NULL, NULL);
+
+               /* for kprobes */
+               for (i = 0; i < lttngtop.kprobes_table->len; i++) {
+                       kprobe = g_ptr_array_index(lttngtop.kprobes_table, i);
+                       bt_ctf_iter_add_callback(iter,
+                                       g_quark_from_static_string(
+                                               kprobe->probe_name),
+                                       NULL, 0, handle_kprobes,
+                                       NULL, NULL, NULL);
+               }
        }
 
-       while ((event = bt_ctf_iter_read_event(iter, NULL)) != NULL) {
+       while ((event = bt_ctf_iter_read_event(iter)) != NULL) {
                if (quit || reload_trace)
                        goto end_iter;
                ret = bt_iter_next(bt_ctf_get_iter(iter));
@@ -986,6 +1014,49 @@ end:
        return ret;
 }
 
+int enable_kprobes(struct lttng_handle *handle, char *channel_name)
+{
+       struct lttng_event ev;
+       struct kprobes *kprobe;
+       int ret = 0;
+       int i;
+
+       /*
+       kprobe = g_new0(struct kprobes, 1);
+       kprobe->probe_addr = 0;
+       kprobe->probe_offset = 0;
+       asprintf(&kprobe->probe_name, "probe_sys_open");
+       asprintf(&kprobe->symbol_name, "sys_open");
+       g_ptr_array_add(lttngtop.kprobes_table, kprobe);
+
+       kprobe = g_new0(struct kprobes, 1);
+       kprobe->probe_addr = 0;
+       kprobe->probe_offset = 0;
+       asprintf(&kprobe->probe_name, "probe_sys_close");
+       asprintf(&kprobe->symbol_name, "sys_close");
+       g_ptr_array_add(lttngtop.kprobes_table, kprobe);
+       */
+
+       for (i = 0; i < lttngtop.kprobes_table->len; i++) {
+               kprobe = g_ptr_array_index(lttngtop.kprobes_table, i);
+
+               memset(&ev, '\0', sizeof(struct lttng_event));
+               ev.type = LTTNG_EVENT_PROBE;
+               sprintf(ev.attr.probe.symbol_name, "%s", kprobe->symbol_name);
+               sprintf(ev.name, "%s", kprobe->probe_name);
+               ev.attr.probe.addr = kprobe->probe_addr;
+               ev.attr.probe.offset = kprobe->probe_offset;
+               if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) {
+                       fprintf(stderr,"error enabling kprobes : %s\n",
+                                       helper_lttcomm_get_readable_code(ret));
+                       goto end;
+               }
+       }
+
+end:
+       return ret;
+}
+
 int setup_live_tracing()
 {
        struct lttng_domain dom;
@@ -1071,6 +1142,7 @@ int setup_live_tracing()
                goto error_session;
        }
 
+       memset(&ev, '\0', sizeof(struct lttng_event));
        ev.type = LTTNG_EVENT_SYSCALL;
        if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) {
                fprintf(stderr,"error enabling syscalls : %s\n",
@@ -1078,6 +1150,11 @@ int setup_live_tracing()
                goto error_session;
        }
 
+       ret = enable_kprobes(handle, channel_name);
+       if (ret < 0) {
+               goto error_session;
+       }
+
        kctxpid.ctx = LTTNG_EVENT_CONTEXT_PID;
        lttng_add_context(handle, &kctxpid, NULL, NULL);
        kctxtid.ctx = LTTNG_EVENT_CONTEXT_TID;
@@ -1133,11 +1210,11 @@ int main(int argc, char **argv)
                        signal(SIGTERM, handle_textdump_sigterm);
                        signal(SIGINT, handle_textdump_sigterm);
                }
+               init_lttngtop();
                ret = setup_live_tracing();
                if (ret < 0) {
                        goto end;
                }
-               init_lttngtop();
                if (!opt_textdump) {
                        pthread_create(&display_thread, NULL, ncurses_display, (void *) NULL);
                        pthread_create(&timer_thread, NULL, refresh_thread, (void *) NULL);