ltt_vtrace: improve debug message

[ust.git] / libust / serialize.c

diff --git a/libust/serialize.c b/libust/serialize.c
index 7f9ce5ad44f2a4f80cd77c68ca593fe0096120c8..011206afbe94dd7e0cdee20e9d2aae34e72627d6 100644 (file)
--- a/libust/serialize.c
+++ b/libust/serialize.c
@@ -41,6 +41,7 @@
 #include "tracer.h"
 //#include "list.h"
 #include "usterr.h"
+#include "ust_snprintf.h"
 
 enum ltt_type {
        LTT_TYPE_SIGNED_INT,
@@ -537,7 +538,7 @@ notrace size_t ltt_serialize_data(struct ust_buffer *buf, size_t buf_offset,
                        ++fmt;                  /* skip first '%' */
                        if (*fmt == '%')        /* Escaped %% */
                                break;
-                       fmt = parse_c_type(fmt, &c_size, &c_type);
+                       fmt = parse_c_type(fmt, &c_size, &c_type, NULL);
                        /*
                         * Output c types if no trace types has been
                         * specified.
@@ -709,7 +710,7 @@ notrace void ltt_vtrace(const struct marker *mdata, void *probe_data,
                va_end(args_copy);
                /* Out-of-order commit */
                ltt_commit_slot(channel, buf, buf_offset, data_size, slot_size);
-               DBG("just commited event at offset %ld and size %zd", buf_offset, slot_size);
+               DBG("just commited event (%s/%s) at offset %ld and size %zd", mdata->channel, mdata->name, buf_offset, slot_size);
        }
 //ust//        __get_cpu_var(ltt_nesting)--;
        ltt_nesting--;
@@ -808,7 +809,7 @@ int serialize_to_text(char *outbuf, int bufsize, const char *fmt, va_list ap)
                outbuf = &false_buf;
                bufsize = 1;
        }
-       result = vsnprintf(outbuf, bufsize, new_fmt, ap);
+       result = ust_safe_vsnprintf(outbuf, bufsize, new_fmt, ap);
 
        return result;
 }