X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-elf.c;h=3d6a9379f7a5e44b6837c01fbb5c72a92bd32162;hb=1ac2e79cfa9574fde7b3d09d4c6c2ec368185f7f;hp=663699b7ce91a5d9febf0d9903b64d042a580782;hpb=3fbec7dc3645facd9e809cf161ba3435a377ce56;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-elf.c b/liblttng-ust/lttng-ust-elf.c
index 663699b7..3d6a9379 100644
--- a/liblttng-ust/lttng-ust-elf.c
+++ b/liblttng-ust/lttng-ust-elf.c
@@ -27,10 +27,15 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdbool.h>
+#include <ust-fd.h>
 #include "lttng-tracer-core.h"
 
 #define BUF_LEN	4096
 
+#ifndef NT_GNU_BUILD_ID
+# define NT_GNU_BUILD_ID	3
+#endif
+
 /*
  * Retrieve the nth (where n is the `index` argument) phdr (program
  * header) from the given elf instance.
@@ -238,21 +243,40 @@ struct lttng_ust_elf *lttng_ust_elf_create(const char *path)
 	uint8_t e_ident[EI_NIDENT];
 	struct lttng_ust_elf_shdr *section_names_shdr;
 	struct lttng_ust_elf *elf = NULL;
+	int ret, fd;
 
 	elf = zmalloc(sizeof(struct lttng_ust_elf));
 	if (!elf) {
 		goto error;
 	}
 
+	/* Initialize fd field to -1. 0 is a valid fd number */
+	elf->fd = -1;
+
 	elf->path = strdup(path);
 	if (!elf->path) {
 		goto error;
 	}
 
-	elf->fd = open(elf->path, O_RDONLY | O_CLOEXEC);
-	if (elf->fd < 0) {
+	lttng_ust_lock_fd_tracker();
+	fd = open(elf->path, O_RDONLY | O_CLOEXEC);
+	if (fd < 0) {
+		lttng_ust_unlock_fd_tracker();
+		goto error;
+	}
+
+	ret = lttng_ust_add_fd_to_tracker(fd);
+	if (ret < 0) {
+		ret = close(fd);
+		if (ret) {
+			PERROR("close on elf->fd");
+		}
+		ret = -1;
+		lttng_ust_unlock_fd_tracker();
 		goto error;
 	}
+	elf->fd = ret;
+	lttng_ust_unlock_fd_tracker();
 
 	if (lttng_ust_read(elf->fd, e_ident, EI_NIDENT) < EI_NIDENT) {
 		goto error;
@@ -305,16 +329,7 @@ struct lttng_ust_elf *lttng_ust_elf_create(const char *path)
 	return elf;
 
 error:
-	if (elf) {
-		free(elf->ehdr);
-		if (elf->fd >= 0) {
-			if (close(elf->fd)) {
-				abort();
-			}
-		}
-		free(elf->path);
-		free(elf);
-	}
+	lttng_ust_elf_destroy(elf);
 	return NULL;
 }
 
@@ -335,14 +350,25 @@ uint8_t lttng_ust_elf_is_pic(struct lttng_ust_elf *elf)
  */
 void lttng_ust_elf_destroy(struct lttng_ust_elf *elf)
 {
+	int ret;
+
 	if (!elf) {
 		return;
 	}
 
-	free(elf->ehdr);
-	if (close(elf->fd)) {
-		abort();
+	if (elf->fd >= 0) {
+		lttng_ust_lock_fd_tracker();
+		ret = close(elf->fd);
+		if (!ret) {
+			lttng_ust_delete_fd_from_tracker(elf->fd);
+		} else {
+			PERROR("close");
+			abort();
+		}
+		lttng_ust_unlock_fd_tracker();
 	}
+
+	free(elf->ehdr);
 	free(elf->path);
 	free(elf);
 }