X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Flttng-utils%2Fdebug-info%2Fbin-info.h;h=cd9b9d61c658625291c4fbcaebed0f2a0eee3bbb;hb=1353b066072e6c389ff35853bac83f65597e7a6a;hp=bf4736909b61e50c1bf30610fd87d157929486e7;hpb=578e048b5debf169e286e5b5cc747b5d6c16886d;p=babeltrace.git

diff --git a/src/plugins/lttng-utils/debug-info/bin-info.h b/src/plugins/lttng-utils/debug-info/bin-info.h
index bf473690..cd9b9d61 100644
--- a/src/plugins/lttng-utils/debug-info/bin-info.h
+++ b/src/plugins/lttng-utils/debug-info/bin-info.h
@@ -1,37 +1,20 @@
-#ifndef _BABELTRACE_BIN_INFO_H
-#define _BABELTRACE_BIN_INFO_H
-
 /*
- * Babeltrace - Executable and Shared Object Debug Info Reader
+ * SPDX-License-Identifier: MIT
  *
  * Copyright 2015 Antoine Busque <abusque@efficios.com>
  *
- * Author: Antoine Busque <abusque@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Babeltrace - Executable and Shared Object Debug Info Reader
  */
 
+#ifndef _BABELTRACE_BIN_INFO_H
+#define _BABELTRACE_BIN_INFO_H
+
+#include <babeltrace2/babeltrace.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <gelf.h>
 #include <elfutils/libdw.h>
-#include "common/babeltrace.h"
+#include "common/macros.h"
 #include "fd-cache/fd-cache.h"
 
 #define DEFAULT_DEBUG_DIR "/usr/lib/debug"
@@ -41,6 +24,11 @@
 #define BUILD_ID_PREFIX_DIR_LEN 2
 
 struct bin_info {
+	bt_logging_level log_level;
+
+	/* Used for logging; can be `NULL` */
+	bt_self_component *self_comp;
+
 	/* Base virtual memory address. */
 	uint64_t low_addr;
 	/* Upper bound of exec address space. */
@@ -89,8 +77,8 @@ struct source_location {
  *
  * @returns		0 on success, -1 on failure
  */
-BT_HIDDEN
-int bin_info_init(void);
+int bin_info_init(bt_logging_level log_level,
+		bt_self_component *self_comp);
 
 /**
  * Instantiate a structure representing an ELF executable, possibly
@@ -107,17 +95,16 @@ int bin_info_init(void);
  * @returns		Pointer to the new bin_info on success,
  *			NULL on failure.
  */
-BT_HIDDEN
 struct bin_info *bin_info_create(struct bt_fd_cache *fdc, const char *path,
 		uint64_t low_addr, uint64_t memsz, bool is_pic,
-		const char *debug_info_dir, const char *target_prefix);
+		const char *debug_info_dir, const char *target_prefix,
+		bt_logging_level log_level, bt_self_component *self_comp);
 
 /**
  * Destroy the given bin_info instance
  *
  * @param bin	bin_info instance to destroy
  */
-BT_HIDDEN
 void bin_info_destroy(struct bin_info *bin);
 
 /**
@@ -129,7 +116,6 @@ void bin_info_destroy(struct bin_info *bin);
  * @param build_id_len	Length in bytes of the build_id
  * @returns		0 on success, -1 on failure
  */
-BT_HIDDEN
 int bin_info_set_build_id(struct bin_info *bin, uint8_t *build_id,
 		size_t build_id_len);
 
@@ -142,7 +128,6 @@ int bin_info_set_build_id(struct bin_info *bin, uint8_t *build_id,
  * @param crc		Checksum for the debug info file
  * @returns		0 on success, -1 on failure
  */
-BT_HIDDEN
 int bin_info_set_debug_link(struct bin_info *bin, const char *filename,
 		uint32_t crc);
 
@@ -184,7 +169,6 @@ int bin_info_has_address(struct bin_info *bin, uint64_t addr)
  * @param func_name	Out parameter, the function name.
  * @returns		0 on success, -1 on failure
  */
-BT_HIDDEN
 int bin_info_lookup_function_name(struct bin_info *bin, uint64_t addr,
 		char **func_name);
 
@@ -206,7 +190,6 @@ int bin_info_lookup_function_name(struct bin_info *bin, uint64_t addr,
  * @param src_loc	Out parameter, the source location
  * @returns		0 on success, -1 on failure
  */
-BT_HIDDEN
 int bin_info_lookup_source_location(struct bin_info *bin, uint64_t addr,
 		struct source_location **src_loc);
 /**
@@ -226,7 +209,6 @@ int bin_info_lookup_source_location(struct bin_info *bin, uint64_t addr,
  * @param bin_loc	Out parameter, the binary location
  * @returns		0 on success, -1 on failure
  */
-BT_HIDDEN
 int bin_info_get_bin_loc(struct bin_info *bin, uint64_t addr, char **bin_loc);
 
 /**
@@ -234,7 +216,6 @@ int bin_info_get_bin_loc(struct bin_info *bin, uint64_t addr, char **bin_loc);
  *
  * @param src_loc	source_location instance to destroy
  */
-BT_HIDDEN
 void source_location_destroy(struct source_location *src_loc);
 
 #endif	/* _BABELTRACE_BIN_INFO_H */