From 1ddceb368197a46bcc7bb40054cf3cd51a72840c Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 25 May 2016 17:15:21 -0400
Subject: [PATCH] Fix: all lttng-ust source files should be tagged _LGPL_SOURCE
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Defining tracepoint call sites and probes as _LGPL_SOURCE allows
inlining RCU code into lttng-ust, which improves performance.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
 liblttng-ust-cyg-profile/lttng-ust-cyg-profile.c    | 2 +-
 liblttng-ust-dl/lttng-ust-dl.c                      | 3 +--
 liblttng-ust-java-agent/jni/jul/lttng_ust_jul.c     | 1 +
 liblttng-ust-java-agent/jni/log4j/lttng_ust_log4j.c | 1 +
 liblttng-ust-java/LTTngUst.c                        | 1 +
 liblttng-ust-libc-wrapper/lttng-ust-malloc.c        | 1 +
 liblttng-ust-libc-wrapper/lttng-ust-pthread.c       | 1 +
 liblttng-ust-python-agent/lttng_ust_python.c        | 1 +
 liblttng-ust/lttng-ust-statedump.c                  | 3 +--
 9 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/liblttng-ust-cyg-profile/lttng-ust-cyg-profile.c b/liblttng-ust-cyg-profile/lttng-ust-cyg-profile.c
index c63b39b0..d19f70a6 100644
--- a/liblttng-ust-cyg-profile/lttng-ust-cyg-profile.c
+++ b/liblttng-ust-cyg-profile/lttng-ust-cyg-profile.c
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define _LGPL_SOURCE
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <dlfcn.h>
 #include <sys/types.h>
 #include <stdio.h>
diff --git a/liblttng-ust-dl/lttng-ust-dl.c b/liblttng-ust-dl/lttng-ust-dl.c
index 8f2faac0..e457e7a3 100644
--- a/liblttng-ust-dl/lttng-ust-dl.c
+++ b/liblttng-ust-dl/lttng-ust-dl.c
@@ -17,9 +17,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define _LGPL_SOURCE
 #define _GNU_SOURCE
-
+#define _LGPL_SOURCE
 #include <limits.h>
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/liblttng-ust-java-agent/jni/jul/lttng_ust_jul.c b/liblttng-ust-java-agent/jni/jul/lttng_ust_jul.c
index 562da6ba..5acff312 100644
--- a/liblttng-ust-java-agent/jni/jul/lttng_ust_jul.c
+++ b/liblttng-ust-java-agent/jni/jul/lttng_ust_jul.c
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#define _LGPL_SOURCE
 #include "org_lttng_ust_agent_jul_LttngJulApi.h"
 
 #define TRACEPOINT_DEFINE
diff --git a/liblttng-ust-java-agent/jni/log4j/lttng_ust_log4j.c b/liblttng-ust-java-agent/jni/log4j/lttng_ust_log4j.c
index 2537922d..72eca1d4 100644
--- a/liblttng-ust-java-agent/jni/log4j/lttng_ust_log4j.c
+++ b/liblttng-ust-java-agent/jni/log4j/lttng_ust_log4j.c
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#define _LGPL_SOURCE
 #include "org_lttng_ust_agent_log4j_LttngLog4jApi.h"
 
 #define TRACEPOINT_DEFINE
diff --git a/liblttng-ust-java/LTTngUst.c b/liblttng-ust-java/LTTngUst.c
index 4549fdea..aab0d162 100644
--- a/liblttng-ust-java/LTTngUst.c
+++ b/liblttng-ust-java/LTTngUst.c
@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#define _LGPL_SOURCE
 #include "org_lttng_ust_LTTngUst.h"
 
 #define TRACEPOINT_DEFINE
diff --git a/liblttng-ust-libc-wrapper/lttng-ust-malloc.c b/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
index d1ad3cf5..4b21c971 100644
--- a/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
+++ b/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
@@ -18,6 +18,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <lttng/ust-dlfcn.h>
 #include <sys/types.h>
 #include <stdio.h>
diff --git a/liblttng-ust-libc-wrapper/lttng-ust-pthread.c b/liblttng-ust-libc-wrapper/lttng-ust-pthread.c
index c6b8ae09..a049d335 100644
--- a/liblttng-ust-libc-wrapper/lttng-ust-pthread.c
+++ b/liblttng-ust-libc-wrapper/lttng-ust-pthread.c
@@ -17,6 +17,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <lttng/ust-dlfcn.h>
 #include <helper.h>
 #include <pthread.h>
diff --git a/liblttng-ust-python-agent/lttng_ust_python.c b/liblttng-ust-python-agent/lttng_ust_python.c
index be534c62..532fd14d 100644
--- a/liblttng-ust-python-agent/lttng_ust_python.c
+++ b/liblttng-ust-python-agent/lttng_ust_python.c
@@ -15,6 +15,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#define _LGPL_SOURCE
 #define TRACEPOINT_DEFINE
 #define TRACEPOINT_CREATE_PROBES
 #include "lttng_ust_python.h"
diff --git a/liblttng-ust/lttng-ust-statedump.c b/liblttng-ust/lttng-ust-statedump.c
index c2926aec..bcb168be 100644
--- a/liblttng-ust/lttng-ust-statedump.c
+++ b/liblttng-ust/lttng-ust-statedump.c
@@ -17,9 +17,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define _LGPL_SOURCE
 #define _GNU_SOURCE
-
+#define _LGPL_SOURCE
 #include <link.h>
 #include <limits.h>
 #include <stdio.h>
-- 
2.34.1