callsite: add "ip" context

[lttng-ust.git] / liblttng-ust / ltt-events.c

diff --git a/liblttng-ust/ltt-events.c b/liblttng-ust/ltt-events.c
index 0b6e61c41a44f855f26a3724d174b101477b1fcb..6b9170a03ed63b0feb5f680c41cedd2b728d4345 100644 (file)
--- a/liblttng-ust/ltt-events.c
+++ b/liblttng-ust/ltt-events.c
@@ -258,9 +258,10 @@ int pending_probe_fix_events(const struct lttng_event_desc *desc)
 
                                memcpy(&event_param, &sw->event_param,
                                                sizeof(event_param));
-                               memcpy(event_param.name,
+                               strncpy(event_param.name,
                                        desc->name,
                                        sizeof(event_param.name));
+                               event_param.name[sizeof(event_param.name) - 1] = '\0';
                                /* create event */
                                ret = ltt_event_create(sw->chan,
                                        &event_param, &ev);
@@ -1015,11 +1016,13 @@ int _ltt_callsite_metadata_statedump(struct ltt_session *session,
                "callsite {\n"
                "       name = \"%s\";\n"
                "       func = \"%s\";\n"
+               "       ip = %p;\n"
                "       file = \"%s\";\n"
                "       line = %u;\n"
                "};\n\n",
-               callsite->tp_cs->tp->name,
+               callsite->tp_cs->name,
                callsite->tp_cs->func,
+               callsite->tp_cs->ip,
                callsite->tp_cs->file,
                callsite->tp_cs->lineno);
        if (ret)