update

[lttv.git] / markers-userspace / marker-lib.c

diff --git a/markers-userspace/marker-lib.c b/markers-userspace/marker-lib.c
index d690e527d5404811ccda104b572d263b6e813622..b2165b8b7ac542a86f4da1399a1be0c0a6bda1b1 100644 (file)
--- a/markers-userspace/marker-lib.c
+++ b/markers-userspace/marker-lib.c
@@ -1,8 +1,12 @@
 
 #include "marker.h"
 #include <stdio.h>
+#include <errno.h>
 
+__attribute__ ((visibility ("protected")))
 extern struct marker __start___markers[];
+
+__attribute__ ((visibility ("protected")))
 extern struct marker __stop___markers[];
 
 /**
@@ -17,6 +21,7 @@ extern struct marker __stop___markers[];
  * though the function pointer change and the marker enabling are two distinct
  * operations that modifies the execution flow of preemptible code.
  */
+__attribute__ ((visibility ("protected")))
 void __mark_empty_function(void *probe_private, void *call_private,
        const char *fmt, va_list *args)
 {
@@ -30,20 +35,58 @@ void __mark_empty_function(void *probe_private, void *call_private,
  * @...:  Variable argument list.
  *
  */
+__attribute__ ((visibility ("protected")))
 void marker_probe_cb(const struct marker *mdata, void *call_private,
        const char *fmt, ...)
 {
+       char buf[PAGE_SIZE];
+       va_list ap;
+
+       va_start(ap, fmt);
+       vsnprintf(buf, PAGE_SIZE-1, fmt, ap);
+       sys_trace(0, 0, buf);
+       va_end(ap);
+}
+
+//FIXME : imv_read won't work with optimized immediate values.
+//will need to issue one sys_marker call for each immediate value.
+__attribute__ ((visibility ("protected")))
+void testip(void)
+{
+       printf("addr : %p\n", __builtin_return_address(0));
+}
 
+__attribute__((constructor, visibility ("protected")))
+void marker_init(void)
+{
+       struct marker *iter;
+       int ret;
 
+       printf("Marker section : from %p to %p (init)\n",
+               __start___markers, __stop___markers);
+       testip();
+       for (iter = __start___markers; iter < __stop___markers; iter++) {
+               printf("Marker : %s\n", iter->name);
+               ret = sys_marker(iter->name, iter->format,
+                       &imv_read(iter->state), 1);
+               if (ret)
+                       perror("Error connecting markers");
+       }
 }
 
-__attribute__((constructor)) void marker_init(void)
+__attribute__((destructor, visibility ("protected")))
+void marker_fini(void)
 {
        struct marker *iter;
+       int ret;
 
-       printf("Marker section : from %p to %p\n",
+       printf("Marker section : from %p to %p (fini)\n",
                __start___markers, __stop___markers);
        for (iter = __start___markers; iter < __stop___markers; iter++) {
                printf("Marker : %s\n", iter->name);
+               ret = sys_marker(iter->name, iter->format,
+                       &imv_read(iter->state), 0);
+               if (ret)
+                       perror("Error disconnecting markers");
        }
 }