X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust-dl%2Flttng-ust-dl.c;h=657c27ccc9afab4ada4373bc76c10c3c012a31fe;hb=60864af02c63fdaaf9264b4f14bfbc9f9fba64bd;hp=b0737b65f9f4222d6beef931b7ce3a07eef0ea1c;hpb=7b0fdd83c137bea1d7302df1a45252dfdccd8172;p=lttng-ust.git

diff --git a/liblttng-ust-dl/lttng-ust-dl.c b/liblttng-ust-dl/lttng-ust-dl.c
index b0737b65..657c27cc 100644
--- a/liblttng-ust-dl/lttng-ust-dl.c
+++ b/liblttng-ust-dl/lttng-ust-dl.c
@@ -1,36 +1,26 @@
 /*
- * Copyright (C) 2013  Paul Woegerer <paul.woegerer@mentor.com>
- * Copyright (C) 2015  Antoine Busque <abusque@efficios.com>
- * Copyright (C) 2016  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; version 2.1 of
- * the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ * Copyright (C) 2013 Paul Woegerer <paul.woegerer@mentor.com>
+ * Copyright (C) 2015 Antoine Busque <abusque@efficios.com>
+ * Copyright (C) 2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <limits.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <lttng/ust-dlfcn.h>
-#include <lttng/ust-elf.h>
+#include <ust-dlfcn.h>
+#include <ust-elf.h>
 #include <lttng/ust-events.h>
-#include <helper.h>
+#include <ust-helper.h>
 #include "usterr-signal-safe.h"
 
+#include "../liblttng-ust/ust-events-internal.h"
+
 /* Include link.h last else it conflicts with ust-dlfcn. */
 #include <link.h>
 
@@ -38,10 +28,18 @@
 #include "ust_dl.h"
 
 static void *(*__lttng_ust_plibc_dlopen)(const char *filename, int flags);
+#ifdef HAVE_DLMOPEN
 static void *(*__lttng_ust_plibc_dlmopen)(Lmid_t nsid, const char *filename,
 		int flags);
+#endif
 static int (*__lttng_ust_plibc_dlclose)(void *handle);
 
+static __attribute__((constructor))
+void _lttng_ust_dl_init(void)
+{
+	ust_err_init();
+}
+
 static
 void *_lttng_ust_dl_libc_dlopen(const char *filename, int flags)
 {
@@ -55,6 +53,7 @@ void *_lttng_ust_dl_libc_dlopen(const char *filename, int flags)
 	return __lttng_ust_plibc_dlopen(filename, flags);
 }
 
+#ifdef HAVE_DLMOPEN
 static
 void *_lttng_ust_dl_libc_dlmopen(Lmid_t nsid, const char *filename,
 		int flags)
@@ -68,6 +67,7 @@ void *_lttng_ust_dl_libc_dlmopen(Lmid_t nsid, const char *filename,
 	}
 	return __lttng_ust_plibc_dlmopen(nsid, filename, flags);
 }
+#endif
 
 static
 int _lttng_ust_dl_libc_dlclose(void *handle)
@@ -103,7 +103,7 @@ void lttng_ust_dl_dlopen(void *so_base, const char *so_name,
 
 	elf = lttng_ust_elf_create(resolved_path);
 	if (!elf) {
-		ERR("could not acces file %s", resolved_path);
+		ERR("could not access file %s", resolved_path);
 		return;
 	}
 
@@ -143,6 +143,7 @@ end:
 	return;
 }
 
+#ifdef HAVE_DLMOPEN
 static
 void lttng_ust_dl_dlmopen(void *so_base, Lmid_t nsid, const char *so_name,
 		int flags, void *ip)
@@ -164,7 +165,7 @@ void lttng_ust_dl_dlmopen(void *so_base, Lmid_t nsid, const char *so_name,
 
 	elf = lttng_ust_elf_create(resolved_path);
 	if (!elf) {
-		ERR("could not acces file %s", resolved_path);
+		ERR("could not access file %s", resolved_path);
 		return;
 	}
 
@@ -203,6 +204,7 @@ end:
 	lttng_ust_elf_destroy(elf);
 	return;
 }
+#endif
 
 void *dlopen(const char *filename, int flags)
 {
@@ -223,6 +225,7 @@ void *dlopen(const char *filename, int flags)
 	return handle;
 }
 
+#ifdef HAVE_DLMOPEN
 void *dlmopen(Lmid_t nsid, const char *filename, int flags)
 {
 	void *handle;
@@ -243,6 +246,7 @@ void *dlmopen(Lmid_t nsid, const char *filename, int flags)
 	return handle;
 
 }
+#endif
 
 int dlclose(void *handle)
 {