projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add compile time assertion that array and sequence have integer elements
[lttng-ust.git]
/
liblttng-ust
/
lttng-ust-elf.c
diff --git
a/liblttng-ust/lttng-ust-elf.c
b/liblttng-ust/lttng-ust-elf.c
index a496841adb8804d6182ce901f52e9835828c5744..5de3561fbeefcc71a56522f8763fb628dbdcede3 100644
(file)
--- a/
liblttng-ust/lttng-ust-elf.c
+++ b/
liblttng-ust/lttng-ust-elf.c
@@
-18,15
+18,19
@@
#define _GNU_SOURCE
#define _LGPL_SOURCE
#define _GNU_SOURCE
#define _LGPL_SOURCE
+#include <fcntl.h>
#include <helper.h>
#include <helper.h>
-#include <string.h>
#include <lttng/align.h>
#include <lttng/ust-elf.h>
#include <lttng/align.h>
#include <lttng/ust-elf.h>
-#include <sys/types.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <string.h>
#include <sys/stat.h>
#include <sys/stat.h>
-#include <
fcntl
.h>
+#include <
sys/types
.h>
#include <unistd.h>
#include <unistd.h>
-#include <stdbool.h>
+
+#include <ust-fd.h>
+
#include "lttng-tracer-core.h"
#define BUF_LEN 4096
#include "lttng-tracer-core.h"
#define BUF_LEN 4096
@@
-242,22
+246,41
@@
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;
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;
}
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->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;
}
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;
}
if (lttng_ust_read(elf->fd, e_ident, EI_NIDENT) < EI_NIDENT) {
goto error;
}
@@
-309,16
+332,7
@@
struct lttng_ust_elf *lttng_ust_elf_create(const char *path)
return elf;
error:
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;
}
return NULL;
}
@@
-339,14
+353,25
@@
uint8_t lttng_ust_elf_is_pic(struct lttng_ust_elf *elf)
*/
void lttng_ust_elf_destroy(struct lttng_ust_elf *elf)
{
*/
void lttng_ust_elf_destroy(struct lttng_ust_elf *elf)
{
+ int ret;
+
if (!elf) {
return;
}
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);
}
free(elf->path);
free(elf);
}
This page took
0.025815 seconds
and
4
git commands to generate.