make compatible with new version of libkcompat

diff --git a/libust/channels.h b/libust/channels.h
index dedc1f8a7bd72e3950c1210c27c4a82ef9003ed1..4eb512d4e79ab29e5973973f656492dfa90d562b 100644 (file)
--- a/libust/channels.h
+++ b/libust/channels.h
@@ -14,7 +14,6 @@
 
 #include "kernelcompat.h"
 #include "kref.h"
 
 #include "kernelcompat.h"
 #include "kref.h"

-#include "list.h"

 
 #define EVENTS_PER_CHANNEL     65536
 
 
 #define EVENTS_PER_CHANNEL     65536
 

diff --git a/libust/marker-control.c b/libust/marker-control.c
index 29c43b09816e9ccf196b883335756b0999e90faf..3f11c9aab0fcfddd6e75707095c9609158e0a901 100644 (file)
--- a/libust/marker-control.c
+++ b/libust/marker-control.c
@@ -32,7 +32,7 @@
 //ust// #include <linux/seq_file.h>
 //ust// #include <linux/slab.h>
 #include "kernelcompat.h"
 //ust// #include <linux/seq_file.h>
 //ust// #include <linux/slab.h>
 #include "kernelcompat.h"

-#include "list.h"
+//#include "list.h"

 #include "tracer.h"
 #include "localerr.h"
 
 #include "tracer.h"
 #include "localerr.h"
 

diff --git a/libust/marker.c b/libust/marker.c
index ade2d9c1f1edcd3f5a754196f8f1f34a902d677d..0a318ac038f9d3b07c977ce067875bc3bcbe85dc 100644 (file)
--- a/libust/marker.c
+++ b/libust/marker.c
@@ -30,13 +30,16 @@
 //ust// #include <linux/user_marker.h>
 //ust// #include <linux/ltt-tracer.h>
 
 //ust// #include <linux/user_marker.h>
 //ust// #include <linux/ltt-tracer.h>
 

-#include "marker.h"
+#define _LGPL_SOURCE
+#include <urcu.h>
+

 #include "kernelcompat.h"
 #include "kernelcompat.h"

+
+#include "marker.h"

 #include "usterr.h"
 #include "channels.h"
 #include "tracercore.h"
 #include "tracer.h"
 #include "usterr.h"
 #include "channels.h"
 #include "tracercore.h"
 #include "tracer.h"

-#include "urcu.h"

 
 extern struct marker __start___markers[] __attribute__((visibility("hidden")));
 extern struct marker __stop___markers[] __attribute__((visibility("hidden")));
 
 extern struct marker __start___markers[] __attribute__((visibility("hidden")));
 extern struct marker __stop___markers[] __attribute__((visibility("hidden")));

diff --git a/libust/marker.h b/libust/marker.h
index 7c3d8c565a512d082df3fc304882747eab97930e..122fca72993b90f60d9c06e950baeddf909e21c1 100644 (file)
--- a/libust/marker.h
+++ b/libust/marker.h
@@ -19,7 +19,7 @@
 //ust// #include <linux/ltt-channels.h>
 #include "kernelcompat.h"
 #include "compiler.h"
 //ust// #include <linux/ltt-channels.h>
 #include "kernelcompat.h"
 #include "compiler.h"

-#include "list.h"
+#include <kcompat/list.h>

 
 //ust// struct module;
 //ust// struct task_struct;
 
 //ust// struct module;
 //ust// struct task_struct;

diff --git a/libust/relay.c b/libust/relay.c
index 17f63ec0181d84d1515c438319a42c801d6f464e..530a4960fb45dfe945a7e55abbc1116aa7817efc 100644 (file)
--- a/libust/relay.c
+++ b/libust/relay.c
@@ -26,7 +26,7 @@
 #include <sys/mman.h>
 #include <sys/ipc.h>
 #include <sys/shm.h>
 #include <sys/mman.h>
 #include <sys/ipc.h>
 #include <sys/shm.h>

-#include "list.h"
+//#include "list.h"

 #include "relay.h"
 #include "channels.h"
 #include "kref.h"
 #include "relay.h"
 #include "channels.h"
 #include "kref.h"

diff --git a/libust/relay.h b/libust/relay.h
index ddbb81274920835ff3dcc18077e60c5bba617140..7d582a8802e13c70cced7ea3e1bfbbe93e56c005 100644 (file)
--- a/libust/relay.h
+++ b/libust/relay.h
@@ -22,7 +22,7 @@
 //ust// #include <linux/mm.h>
 //ust// #include <linux/ltt-core.h>
 #include "kref.h"
 //ust// #include <linux/mm.h>
 //ust// #include <linux/ltt-core.h>
 #include "kref.h"

-#include "list.h"
+//#include "list.h"

 #include "channels.h"
 
 /* Needs a _much_ better name... */
 #include "channels.h"
 
 /* Needs a _much_ better name... */

diff --git a/libust/serialize.c b/libust/serialize.c
index 9b7fcada437c431466376af56068a345c3c46aef..00ba4870821c084476a2f08c735d0aaded30e8d5 100644 (file)
--- a/libust/serialize.c
+++ b/libust/serialize.c
@@ -18,12 +18,15 @@
 //ust// #include <linux/ltt-tracer.h>
 #include <string.h>
 #include <stdint.h>
 //ust// #include <linux/ltt-tracer.h>
 #include <string.h>
 #include <stdint.h>

+

 #include "kernelcompat.h"
 #include "kernelcompat.h"

+#define _LGPL_SOURCE
+#include <urcu.h>
+

 #include "relay.h"
 #include "tracer.h"
 #include "relay.h"
 #include "tracer.h"

-#include "list.h"
+//#include "list.h"

 #include "usterr.h"
 #include "usterr.h"

-#include "urcu.h"

 
 enum ltt_type {
        LTT_TYPE_SIGNED_INT,
 
 enum ltt_type {
        LTT_TYPE_SIGNED_INT,

diff --git a/libust/tracectl.c b/libust/tracectl.c
index b3dd4c207ab731953036f8c2f09518b39e93c40c..3b9d3d39fccbff0d88b839c58238ee19bc7f5962 100644 (file)
--- a/libust/tracectl.c
+++ b/libust/tracectl.c
@@ -166,7 +166,7 @@ void process_blocked_consumers(void)
 
                                close(bc->fd_producer);
 
 
                                close(bc->fd_producer);
 

-                               __list_del(bc->list.prev, bc->list.next);
+                               list_del(&bc->list);

 
                                result = ustcomm_send_reply(&bc->server, "END", &bc->src);
                                if(result < 0) {
 
                                result = ustcomm_send_reply(&bc->server, "END", &bc->src);
                                if(result < 0) {


@@ -194,7 +194,7 @@ void process_blocked_consumers(void)
                        }
                        free(reply);
 
                        }
                        free(reply);
 

-                       __list_del(bc->list.prev, bc->list.next);
+                       list_del(&bc->list);

                }
        }
 
                }
        }
 

diff --git a/libust/tracepoint.c b/libust/tracepoint.c
index 8a9ed0131a8152289261f44892065544459336a8..ebcbe252f1a0eba3d58711d9bb2e3106c5fb66e7 100644 (file)
--- a/libust/tracepoint.c
+++ b/libust/tracepoint.c
@@ -35,8 +35,10 @@
 #include "kernelcompat.h"
 #include "tracepoint.h"
 #include "usterr.h"
 #include "kernelcompat.h"
 #include "tracepoint.h"
 #include "usterr.h"

-#include "list.h"
-#include "urcu.h"
+//#include "list.h"
+
+#define _LGPL_SOURCE
+#include <urcu.h>

 
 //extern struct tracepoint __start___tracepoints[] __attribute__((visibility("hidden")));
 //extern struct tracepoint __stop___tracepoints[] __attribute__((visibility("hidden")));
 
 //extern struct tracepoint __start___tracepoints[] __attribute__((visibility("hidden")));
 //extern struct tracepoint __stop___tracepoints[] __attribute__((visibility("hidden")));

diff --git a/libust/tracepoint.h b/libust/tracepoint.h
index 3b2470138bf882cb938ee977999ac81c2f390921..81eea625e662ebb1e226b1c44a54c02d8e2679e2 100644 (file)
--- a/libust/tracepoint.h
+++ b/libust/tracepoint.h
@@ -28,7 +28,7 @@
 //#include <linux/types.h>
 //#include <linux/rcupdate.h>
 
 //#include <linux/types.h>
 //#include <linux/rcupdate.h>
 

-#include "urcu.h"
+//#include "urcu.h"

 #include "immediate.h"
 #include "kernelcompat.h"
 
 #include "immediate.h"
 #include "kernelcompat.h"
 

diff --git a/libust/tracer.h b/libust/tracer.h
index 70d1c10d7851a2988bb3c7a465668e29b6efc2cc..079e467b63525d37bda689eeed0056ca1c6e1c3f 100644 (file)
--- a/libust/tracer.h
+++ b/libust/tracer.h
@@ -14,9 +14,9 @@
 
 #include <sys/types.h>
 #include <stdarg.h>
 
 #include <sys/types.h>
 #include <stdarg.h>

-#include "relay.h"
-#include "list.h"
+//#include "list.h"

 #include "kernelcompat.h"
 #include "kernelcompat.h"

+#include "relay.h"

 #include "channels.h"
 #include "tracercore.h"
 #include "marker.h"
 #include "channels.h"
 #include "tracercore.h"
 #include "marker.h"

diff --git a/libust/tracercore.h b/libust/tracercore.h
index e5ff00f78edc8c0aa4264a2d79b1f2ae7398707d..dd16de3ff78616f17acdb2cc9d67293109493d50 100644 (file)
--- a/libust/tracercore.h
+++ b/libust/tracercore.h
@@ -7,7 +7,6 @@
 #ifndef LTT_CORE_H
 #define LTT_CORE_H
 
 #ifndef LTT_CORE_H
 #define LTT_CORE_H
 

-#include "list.h"

 #include "kernelcompat.h"
 //ust// #include <linux/percpu.h>
 
 #include "kernelcompat.h"
 //ust// #include <linux/percpu.h>
 

diff --git a/share/kernelcompat.h b/share/kernelcompat.h
index 63964888e6de5f93850e230ea899d047d0c75d6b..c03b4086880c8ff2cd9a9f1dde973b4935c350a9 100644 (file)
--- a/share/kernelcompat.h
+++ b/share/kernelcompat.h
@@ -1,10 +1,9 @@
 #ifndef KERNELCOMPAT_H
 #define KERNELCOMPAT_H
 
 #ifndef KERNELCOMPAT_H
 #define KERNELCOMPAT_H
 

+#include <compiler.h>

 #include <kcompat.h>
 
 #include <kcompat.h>
 

-#include "compiler.h"
-

 #include <string.h>
 #include <sys/time.h>
 
 #include <string.h>
 #include <sys/time.h>
 

diff --git a/ust/Makefile.am b/ust/Makefile.am
index e26a1213d5f9dc0bba0a8fc9502c87743ce5bbbc..9f5a94bdd6f2d47f07467cb36eb75f1b018eff08 100644 (file)
--- a/ust/Makefile.am
+++ b/ust/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS = ust
 ust_SOURCES = ust.c $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/libustcomm/ustcomm.h
 
 #INCLUDES = -I$(top_builddir)/share
 ust_SOURCES = ust.c $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/libustcomm/ustcomm.h
 
 #INCLUDES = -I$(top_builddir)/share

-#INCLUDES += -I@URCU_PATH@
-INCLUDES = -I@KCOMPAT_PATH@
+INCLUDES = -I@URCU_PATH@
+INCLUDES += -I@KCOMPAT_PATH@

 #INCLUDES += -I$(top_builddir)/libust
 INCLUDES += -I$(top_builddir)/libustcomm
 #INCLUDES += -I$(top_builddir)/libust
 INCLUDES += -I$(top_builddir)/libustcomm

diff --git a/ustd/Makefile.am b/ustd/Makefile.am
index f2cb9597c319c0170bd2253eace0dbf29b572066..723b9dfe40843e06926baf9b55acdfd1efc57438 100644 (file)
--- a/ustd/Makefile.am
+++ b/ustd/Makefile.am
@@ -3,7 +3,7 @@ ustd_SOURCES = lowlevel.c localerr.h ustd.c ustd.h $(top_builddir)/libustcomm/us
 ustd_LDFLAGS = -lpthread
 
 INCLUDES = -I$(top_builddir)/share
 ustd_LDFLAGS = -lpthread
 
 INCLUDES = -I$(top_builddir)/share

-#INCLUDES += -I@URCU_PATH@
+INCLUDES += -I@URCU_PATH@

 INCLUDES += -I@KCOMPAT_PATH@
 INCLUDES += -I$(top_builddir)/libust
 INCLUDES += -I$(top_builddir)/libustcomm
 INCLUDES += -I@KCOMPAT_PATH@
 INCLUDES += -I$(top_builddir)/libust
 INCLUDES += -I$(top_builddir)/libustcomm