Move splice wrapper into c file

Don't require a kallsyms lookup each time the wrapper is called.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/lib/Makefile b/lib/Makefile
index 1697b7f56ea5537d669504f9cfffc9ce9006feab..3fc82edc8b8a1ee1443a31cc6778719a19dd5f24 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -8,4 +8,5 @@ lib-ring-buffer-objs := \
        ringbuffer/ring_buffer_splice.o \
        ringbuffer/ring_buffer_mmap.o \
        prio_heap/lttng_prio_heap.o \
-       ../wrapper/poll.o
+       ../wrapper/poll.o \
+       ../wrapper/splice.o

diff --git a/wrapper/splice.c b/wrapper/splice.c
new file mode 100644 (file)
index 0000000..edc499c
--- /dev/null
+++ b/wrapper/splice.c
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2011 Mathieu Desnoyers (mathieu.desnoyers@efficios.com)
+ *
+ * wrapper around vmalloc_sync_all. Using KALLSYMS to get its address when
+ * available, else we need to have a kernel that exports this function to GPL
+ * modules.
+ *
+ * Dual LGPL v2.1/GPL v2 license.
+ */
+
+#ifdef CONFIG_KALLSYMS
+
+#include <linux/kallsyms.h>
+#include <linux/fs.h>
+#include <linux/splice.h>
+
+static
+ssize_t (*splice_to_pipe_sym)(struct pipe_inode_info *pipe,
+                             struct splice_pipe_desc *spd);
+
+ssize_t wrapper_splice_to_pipe(struct pipe_inode_info *pipe,
+                              struct splice_pipe_desc *spd)
+{
+       if (!splice_to_pipe_sym)
+               splice_to_pipe_sym = (void *) kallsyms_lookup_name("splice_to_pipe");
+       if (splice_to_pipe_sym) {
+               return splice_to_pipe_sym(pipe, spd);
+       } else {
+               printk(KERN_WARNING "LTTng: splice_to_pipe symbol lookup failed.\n");
+               return -ENOSYS;
+       }
+}
+
+#else
+
+#include <linux/fs.h>
+#include <linux/splice.h>
+
+ssize_t wrapper_splice_to_pipe(struct pipe_inode_info *pipe,
+                              struct splice_pipe_desc *spd)
+{
+       return splice_to_pipe(pipe, spd);
+}
+
+#endif

diff --git a/wrapper/splice.h b/wrapper/splice.h
index 5f400747cb1bcb5c3c5070884a330b8de3a3fb3b..d419847d92578e031347b5ffc6eaba85f2757cdd 100644 (file)
--- a/wrapper/splice.h
+++ b/wrapper/splice.h
@@ -11,36 +11,9 @@
  * Dual LGPL v2.1/GPL v2 license.
  */
 
-#ifdef CONFIG_KALLSYMS
-
-#include <linux/kallsyms.h>
-#include <linux/splice.h>
-
-static inline
-ssize_t wrapper_splice_to_pipe(struct pipe_inode_info *pipe,
-                              struct splice_pipe_desc *spd)
-{
-       ssize_t (*splice_to_pipe_sym)(struct pipe_inode_info *pipe,
-                                     struct splice_pipe_desc *spd);
-
-       splice_to_pipe_sym = (void *) kallsyms_lookup_name("splice_to_pipe");
-       if (splice_to_pipe_sym) {
-               return splice_to_pipe_sym(pipe, spd);
-       } else {
-               printk(KERN_WARNING "LTTng: splice_to_pipe symbol lookup failed.\n");
-               return -ENOSYS;
-       }
-}
-#else
-
 #include <linux/splice.h>
 
-static inline
 ssize_t wrapper_splice_to_pipe(struct pipe_inode_info *pipe,
-                              struct splice_pipe_desc *spd)
-{
-       return splice_to_pipe(pipe, spd);
-}
-#endif
+                              struct splice_pipe_desc *spd);
 
 #endif /* _LTT_WRAPPER_SPLICE_H */