Rewrite last GPL bits in relay.c and relay.h

[ust.git] / libust / tracer.c

diff --git a/libust/tracer.c b/libust/tracer.c
index bb8c7697f38d8c9b4bb7f31a9936b41a0790e01a..e3538e0d5706e86368e03136fdaf98255525b86d 100644 (file)
--- a/libust/tracer.c
+++ b/libust/tracer.c
@@ -52,9 +52,10 @@
 //ust// #include <linux/delay.h>
 //ust// #include <linux/vmalloc.h>
 //ust// #include <asm/atomic.h>
-#include <kcompat/rculist.h>
+#include <urcu-bp.h>
+#include <urcu/rculist.h>
 
-#include "kernelcompat.h"
+#include <ust/kernelcompat.h>
 #include "tracercore.h"
 #include "tracer.h"
 #include "usterr.h"
@@ -295,7 +296,7 @@ void notrace ltt_write_trace_header(struct ltt_trace_struct *trace,
 static void trace_async_wakeup(struct ltt_trace_struct *trace)
 {
        int i;
-       struct ltt_channel_struct *chan;
+       struct ust_channel *chan;
 
        /* Must check each channel for pending read wakeup */
        for (i = 0; i < trace->nr_channels; i++) {
@@ -737,7 +738,6 @@ int ltt_trace_alloc(const char *trace_name)
                subbuf_cnt = trace->channels[chan].subbuf_cnt;
                prepare_chan_size_num(&subbuf_size, &subbuf_cnt);
                err = trace->ops->create_channel(trace_name, trace,
-                               trace->dentry.trace_root,
                                channel_name,
                                &trace->channels[chan],
                                subbuf_size,
@@ -807,7 +807,7 @@ traces_error:
 //ust// }
 
 /* Must be called while sure that trace is in the list. */
-static int _ltt_trace_destroy(struct ltt_trace_struct  *trace)
+static int _ltt_trace_destroy(struct ltt_trace_struct *trace)
 {
        int err = -EPERM;
 
@@ -823,8 +823,8 @@ static int _ltt_trace_destroy(struct ltt_trace_struct       *trace)
                goto active_error;
        }
        /* Everything went fine */
-//ust//        list_del_rcu(&trace->list);
-//ust//        synchronize_sched();
+       list_del_rcu(&trace->list);
+       synchronize_rcu();
        if (list_empty(&ltt_traces.head)) {
 //ust//                clear_kernel_trace_flag_all_tasks();
                /*
@@ -846,7 +846,7 @@ traces_error:
 static void __ltt_trace_destroy(struct ltt_trace_struct        *trace)
 {
        int i;
-       struct ltt_channel_struct *chan;
+       struct ust_channel *chan;
 
        for (i = 0; i < trace->nr_channels; i++) {
                chan = &trace->channels[i];