X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libust%2Fmarker.c;h=47b6d11fc0c65f29873c951049d33a4ddbf7ccd9;hb=636ca5d6fed61d16178a2e29038a6ffea26677fa;hp=8b120195677690186839884ab5cfbb940546bef7;hpb=3ea1e2fc7178db75f09e3d5630516858c8a783d5;p=ust.git

diff --git a/libust/marker.c b/libust/marker.c
index 8b12019..47b6d11 100644
--- a/libust/marker.c
+++ b/libust/marker.c
@@ -33,14 +33,17 @@
 #define _LGPL_SOURCE
 #include <urcu-bp.h>
 
-#include "kernelcompat.h"
+#include <ust/kernelcompat.h>
 
-#include "marker.h"
+#include <ust/marker.h>
 #include "usterr.h"
 #include "channels.h"
 #include "tracercore.h"
 #include "tracer.h"
 
+__thread long ust_reg_stack[500];
+volatile __thread long *ust_reg_stack_ptr = (long *) 0;
+
 extern struct marker __start___markers[] __attribute__((visibility("hidden")));
 extern struct marker __stop___markers[] __attribute__((visibility("hidden")));
 extern struct marker_addr __start___marker_addr[] __attribute__((visibility("hidden")));
@@ -89,7 +92,7 @@ struct marker_entry {
 	char *format;
 	char *name;
 			/* Probe wrapper */
-	void (*call)(const struct marker *mdata, void *call_private, ...);
+	void (*call)(const struct marker *mdata, void *call_private, struct registers *regs, ...);
 	struct marker_probe_closure single;
 	struct marker_probe_closure *multi;
 	int refcount;	/* Number of times armed. 0 if disarmed. */
@@ -125,7 +128,7 @@ static void marker_update_processes(void)
  * operations that modifies the execution flow of preemptible code.
  */
 notrace void __mark_empty_function(const struct marker *mdata,
-	void *probe_private, void *call_private, const char *fmt, va_list *args)
+	void *probe_private, struct registers *regs, void *call_private, const char *fmt, va_list *args)
 {
 }
 //ust// EXPORT_SYMBOL_GPL(__mark_empty_function);
@@ -141,7 +144,7 @@ notrace void __mark_empty_function(const struct marker *mdata,
  * rcu_dereference() for the pointer read.
  */
 notrace void marker_probe_cb(const struct marker *mdata,
-		void *call_private, ...)
+		void *call_private, struct registers *regs, ...)
 {
 	va_list args;
 	char ptype;
@@ -162,8 +165,8 @@ notrace void marker_probe_cb(const struct marker *mdata,
 		/* Must read the ptr before private data. They are not data
 		 * dependant, so we put an explicit smp_rmb() here. */
 		smp_rmb();
-		va_start(args, call_private);
-		func(mdata, mdata->single.probe_private, call_private,
+		va_start(args, regs);
+		func(mdata, mdata->single.probe_private, regs, call_private,
 			mdata->format, &args);
 		va_end(args);
 	} else {
@@ -183,9 +186,9 @@ notrace void marker_probe_cb(const struct marker *mdata,
 		 */
 		smp_read_barrier_depends();
 		for (i = 0; multi[i].func; i++) {
-			va_start(args, call_private);
+			va_start(args, regs);
 			multi[i].func(mdata, multi[i].probe_private,
-				call_private, mdata->format, &args);
+				regs, call_private, mdata->format, &args);
 			va_end(args);
 		}
 	}
@@ -202,7 +205,7 @@ notrace void marker_probe_cb(const struct marker *mdata,
  * Should be connected to markers "MARK_NOARGS".
  */
 static notrace void marker_probe_cb_noarg(const struct marker *mdata,
-		void *call_private, ...)
+		void *call_private, struct registers *regs, ...)
 {
 	va_list args;	/* not initialized */
 	char ptype;
@@ -218,7 +221,7 @@ static notrace void marker_probe_cb_noarg(const struct marker *mdata,
 		/* Must read the ptr before private data. They are not data
 		 * dependant, so we put an explicit smp_rmb() here. */
 		smp_rmb();
-		func(mdata, mdata->single.probe_private, call_private,
+		func(mdata, mdata->single.probe_private, regs, call_private,
 			mdata->format, &args);
 	} else {
 		struct marker_probe_closure *multi;
@@ -237,7 +240,7 @@ static notrace void marker_probe_cb_noarg(const struct marker *mdata,
 		 */
 		smp_read_barrier_depends();
 		for (i = 0; multi[i].func; i++)
-			multi[i].func(mdata, multi[i].probe_private,
+			multi[i].func(mdata, multi[i].probe_private, regs,
 				call_private, mdata->format, &args);
 	}
 //ust//	rcu_read_unlock_sched_notrace();