From 769d015768372ce7f68ff12bbc55aa339c3a6bcd Mon Sep 17 00:00:00 2001 From: Jan Blunck Date: Mon, 8 Jun 2009 13:19:08 -0400 Subject: [PATCH] make compatible with new version of libkcompat --- libust/channels.h | 1 - libust/marker-control.c | 2 +- libust/marker.c | 7 +++++-- libust/marker.h | 2 +- libust/relay.c | 2 +- libust/relay.h | 2 +- libust/serialize.c | 7 +++++-- libust/tracectl.c | 4 ++-- libust/tracepoint.c | 6 ++++-- libust/tracepoint.h | 2 +- libust/tracer.h | 4 ++-- libust/tracercore.h | 1 - share/kernelcompat.h | 3 +-- ust/Makefile.am | 4 ++-- ustd/Makefile.am | 2 +- 15 files changed, 27 insertions(+), 22 deletions(-) diff --git a/libust/channels.h b/libust/channels.h index dedc1f8..4eb512d 100644 --- a/libust/channels.h +++ b/libust/channels.h @@ -14,7 +14,6 @@ #include "kernelcompat.h" #include "kref.h" -#include "list.h" #define EVENTS_PER_CHANNEL 65536 diff --git a/libust/marker-control.c b/libust/marker-control.c index 29c43b0..3f11c9a 100644 --- a/libust/marker-control.c +++ b/libust/marker-control.c @@ -32,7 +32,7 @@ //ust// #include //ust// #include #include "kernelcompat.h" -#include "list.h" +//#include "list.h" #include "tracer.h" #include "localerr.h" diff --git a/libust/marker.c b/libust/marker.c index ade2d9c..0a318ac 100644 --- a/libust/marker.c +++ b/libust/marker.c @@ -30,13 +30,16 @@ //ust// #include //ust// #include -#include "marker.h" +#define _LGPL_SOURCE +#include + #include "kernelcompat.h" + +#include "marker.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"))); diff --git a/libust/marker.h b/libust/marker.h index 7c3d8c5..122fca7 100644 --- a/libust/marker.h +++ b/libust/marker.h @@ -19,7 +19,7 @@ //ust// #include #include "kernelcompat.h" #include "compiler.h" -#include "list.h" +#include //ust// struct module; //ust// struct task_struct; diff --git a/libust/relay.c b/libust/relay.c index 17f63ec..530a496 100644 --- a/libust/relay.c +++ b/libust/relay.c @@ -26,7 +26,7 @@ #include #include #include -#include "list.h" +//#include "list.h" #include "relay.h" #include "channels.h" #include "kref.h" diff --git a/libust/relay.h b/libust/relay.h index ddbb812..7d582a8 100644 --- a/libust/relay.h +++ b/libust/relay.h @@ -22,7 +22,7 @@ //ust// #include //ust// #include #include "kref.h" -#include "list.h" +//#include "list.h" #include "channels.h" /* Needs a _much_ better name... */ diff --git a/libust/serialize.c b/libust/serialize.c index 9b7fcad..00ba487 100644 --- a/libust/serialize.c +++ b/libust/serialize.c @@ -18,12 +18,15 @@ //ust// #include #include #include + #include "kernelcompat.h" +#define _LGPL_SOURCE +#include + #include "relay.h" #include "tracer.h" -#include "list.h" +//#include "list.h" #include "usterr.h" -#include "urcu.h" enum ltt_type { LTT_TYPE_SIGNED_INT, diff --git a/libust/tracectl.c b/libust/tracectl.c index b3dd4c2..3b9d3d3 100644 --- a/libust/tracectl.c +++ b/libust/tracectl.c @@ -166,7 +166,7 @@ void process_blocked_consumers(void) 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) { @@ -194,7 +194,7 @@ void process_blocked_consumers(void) } 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 8a9ed01..ebcbe25 100644 --- a/libust/tracepoint.c +++ b/libust/tracepoint.c @@ -35,8 +35,10 @@ #include "kernelcompat.h" #include "tracepoint.h" #include "usterr.h" -#include "list.h" -#include "urcu.h" +//#include "list.h" + +#define _LGPL_SOURCE +#include //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 3b24701..81eea62 100644 --- a/libust/tracepoint.h +++ b/libust/tracepoint.h @@ -28,7 +28,7 @@ //#include //#include -#include "urcu.h" +//#include "urcu.h" #include "immediate.h" #include "kernelcompat.h" diff --git a/libust/tracer.h b/libust/tracer.h index 70d1c10..079e467 100644 --- a/libust/tracer.h +++ b/libust/tracer.h @@ -14,9 +14,9 @@ #include #include -#include "relay.h" -#include "list.h" +//#include "list.h" #include "kernelcompat.h" +#include "relay.h" #include "channels.h" #include "tracercore.h" #include "marker.h" diff --git a/libust/tracercore.h b/libust/tracercore.h index e5ff00f..dd16de3 100644 --- a/libust/tracercore.h +++ b/libust/tracercore.h @@ -7,7 +7,6 @@ #ifndef LTT_CORE_H #define LTT_CORE_H -#include "list.h" #include "kernelcompat.h" //ust// #include diff --git a/share/kernelcompat.h b/share/kernelcompat.h index 6396488..c03b408 100644 --- a/share/kernelcompat.h +++ b/share/kernelcompat.h @@ -1,10 +1,9 @@ #ifndef KERNELCOMPAT_H #define KERNELCOMPAT_H +#include #include -#include "compiler.h" - #include #include diff --git a/ust/Makefile.am b/ust/Makefile.am index e26a121..9f5a94b 100644 --- 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 -#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 diff --git a/ustd/Makefile.am b/ustd/Makefile.am index f2cb959..723b9df 100644 --- 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 -#INCLUDES += -I@URCU_PATH@ +INCLUDES += -I@URCU_PATH@ INCLUDES += -I@KCOMPAT_PATH@ INCLUDES += -I$(top_builddir)/libust INCLUDES += -I$(top_builddir)/libustcomm -- 2.34.1