revert installation of tracer.h, but keep ust.h

[ust.git] / libust / serialize.c

diff --git a/libust/serialize.c b/libust/serialize.c
index 2fe6db779e106d59aa21c50969a7d7bc75766ed2..b1859ed9a8095f63bda857a72dd14ac1d492a52c 100644 (file)
--- a/libust/serialize.c
+++ b/libust/serialize.c
@@ -31,11 +31,12 @@
 //ust// #include <linux/ltt-tracer.h>
 #include <string.h>
 #include <stdint.h>
+#include <stdio.h>
 
-#include "kernelcompat.h"
+#include <ust/kernelcompat.h>
 #define _LGPL_SOURCE
-#include <urcu.h>
-#include <kcompat/rculist.h>
+#include <urcu-bp.h>
+#include <urcu/rculist.h>
 
 #include "relay.h"
 #include "tracer.h"
@@ -500,6 +501,92 @@ copydone:
        return buf_offset;
 }
 
+static notrace void skip_space(const char **ps)
+{
+       while(**ps == ' ')
+               (*ps)++;
+}
+
+static notrace void copy_token(char **out, const char **in)
+{
+       while(**in != ' ' && **in != '\0') {
+               **out = **in;
+               (*out)++;
+               (*in)++;
+       }
+}
+
+/* serialize_to_text
+ *
+ * Given a format string and a va_list of arguments, convert them to a
+ * human-readable string.
+ *
+ * @outbuf: the buffer to output the string to
+ * @bufsize: the max size that can be used in outbuf
+ * @fmt: the marker format string
+ * @ap: a va_list that contains the arguments corresponding to fmt
+ *
+ * Return value: the number of chars that have been put in outbuf, excluding
+ * the final \0, or, if the buffer was too small, the number of chars that
+ * would have been written in outbuf if it had been large enough.
+ *
+ * outbuf may be NULL. The return value may then be used be allocate an
+ * appropriate outbuf.
+ *
+ */
+
+notrace
+int serialize_to_text(char *outbuf, int bufsize, const char *fmt, va_list ap)
+{
+       int fmt_len = strlen(fmt);
+       char *new_fmt = alloca(fmt_len + 1);
+       const char *orig_fmt_p = fmt;
+       char *new_fmt_p = new_fmt;
+       char false_buf;
+       int result;
+       enum { none, cfmt, tracefmt, argname } prev_token = none;
+
+       while(*orig_fmt_p != '\0') {
+               if(*orig_fmt_p == '%') {
+                       prev_token = cfmt;
+                       copy_token(&new_fmt_p, &orig_fmt_p);
+               }
+               else if(*orig_fmt_p == '#') {
+                       prev_token = tracefmt;
+                       do {
+                               orig_fmt_p++;
+                       } while(*orig_fmt_p != ' ' && *orig_fmt_p != '\0');
+               }
+               else if(*orig_fmt_p == ' ') {
+                       if(prev_token == argname) {
+                               *new_fmt_p = '=';
+                               new_fmt_p++;
+                       }
+                       else if(prev_token == cfmt) {
+                               *new_fmt_p = ' ';
+                               new_fmt_p++;
+                       }
+
+                       skip_space(&orig_fmt_p);
+               }
+               else {
+                       prev_token = argname;
+                       copy_token(&new_fmt_p, &orig_fmt_p);
+               }
+       }
+
+       *new_fmt_p = '\0';
+
+       if(outbuf == NULL) {
+               /* use this false_buffer for compatibility with pre-C99 */
+               outbuf = &false_buf;
+               bufsize = 1;
+       }
+       result = vsnprintf(outbuf, bufsize, new_fmt, ap);
+
+       return result;
+}
+
 notrace size_t ltt_serialize_data(struct rchan_buf *buf, size_t buf_offset,
                        struct ltt_serialize_closure *closure,
                        void *serialize_private, int *largest_align,
@@ -583,7 +670,8 @@ void ltt_write_event_data(struct rchan_buf *buf, size_t buf_offset,
 
 
 notrace void ltt_vtrace(const struct marker *mdata, void *probe_data,
-                       void *call_data, const char *fmt, va_list *args)
+                       struct registers *regs, void *call_data,
+                       const char *fmt, va_list *args)
 {
        int largest_align, ret;
        struct ltt_active_marker *pdata;
@@ -697,12 +785,13 @@ notrace void ltt_vtrace(const struct marker *mdata, void *probe_data,
 }
 
 notrace void ltt_trace(const struct marker *mdata, void *probe_data,
-                      void *call_data, const char *fmt, ...)
+                      struct registers *regs, void *call_data,
+                      const char *fmt, ...)
 {
        va_list args;
 
        va_start(args, fmt);
-       ltt_vtrace(mdata, probe_data, call_data, fmt, &args);
+       ltt_vtrace(mdata, probe_data, regs, call_data, fmt, &args);
        va_end(args);
 }