summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
d34e676)
None of the rest of UST used by applications use file streams (only the
sessiond uses a file streams for metadata). Therefore, use file
descriptors directly for baddr statedump.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
/* Size in bytes of section names string table. */
uint64_t section_names_size;
char *path;
/* Size in bytes of section names string table. */
uint64_t section_names_size;
char *path;
struct lttng_ust_elf_ehdr *ehdr;
uint8_t bitness;
uint8_t endianness;
struct lttng_ust_elf_ehdr *ehdr;
uint8_t bitness;
uint8_t endianness;
void lttng_ust_malloc_wrapper_init(void);
void lttng_ust_malloc_wrapper_init(void);
+ssize_t lttng_ust_read(int fd, void *buf, size_t len);
+
#endif /* _LTTNG_TRACER_CORE_H */
#endif /* _LTTNG_TRACER_CORE_H */
extern void lttng_ring_buffer_client_discard_rt_exit(void);
extern void lttng_ring_buffer_metadata_client_exit(void);
extern void lttng_ring_buffer_client_discard_rt_exit(void);
extern void lttng_ring_buffer_metadata_client_exit(void);
+ssize_t lttng_ust_read(int fd, void *buf, size_t len)
+{
+ ssize_t ret;
+ size_t copied = 0, to_copy = len;
+
+ do {
+ ret = read(fd, buf + copied, to_copy);
+ if (ret > 0) {
+ copied += ret;
+ to_copy -= ret;
+ }
+ } while ((ret > 0 && to_copy > 0)
+ || (ret < 0 && errno == EINTR));
+ if (ret > 0) {
+ ret = copied;
+ }
+ return ret;
+}
/*
* Returns the HOME directory path. Caller MUST NOT free(3) the returned
* pointer.
/*
* Returns the HOME directory path. Caller MUST NOT free(3) the returned
* pointer.
#include <string.h>
#include <lttng/align.h>
#include <lttng/ust-elf.h>
#include <string.h>
#include <lttng/align.h>
#include <lttng/ust-elf.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include "lttng-tracer-core.h"
+
+#define BUF_LEN 4096
/*
* Retrieve the nth (where n is the `index` argument) phdr (program
/*
* Retrieve the nth (where n is the `index` argument) phdr (program
}
offset = elf->ehdr->e_phoff + index * elf->ehdr->e_phentsize;
}
offset = elf->ehdr->e_phoff + index * elf->ehdr->e_phentsize;
- if (fseek(elf->file, offset, SEEK_SET)) {
+ if (lseek(elf->fd, offset, SEEK_SET) < 0) {
goto error;
}
if (is_elf_32_bit(elf)) {
Elf32_Phdr elf_phdr;
goto error;
}
if (is_elf_32_bit(elf)) {
Elf32_Phdr elf_phdr;
- if (!fread(&elf_phdr, sizeof(elf_phdr), 1, elf->file)) {
+ if (lttng_ust_read(elf->fd, &elf_phdr, sizeof(elf_phdr))
+ < sizeof(elf_phdr)) {
goto error;
}
if (!is_elf_native_endian(elf)) {
goto error;
}
if (!is_elf_native_endian(elf)) {
} else {
Elf64_Phdr elf_phdr;
} else {
Elf64_Phdr elf_phdr;
- if (!fread(&elf_phdr, sizeof(elf_phdr), 1, elf->file)) {
+ if (lttng_ust_read(elf->fd, &elf_phdr, sizeof(elf_phdr))
+ < sizeof(elf_phdr)) {
goto error;
}
if (!is_elf_native_endian(elf)) {
goto error;
}
if (!is_elf_native_endian(elf)) {
}
offset = elf->ehdr->e_shoff + index * elf->ehdr->e_shentsize;
}
offset = elf->ehdr->e_shoff + index * elf->ehdr->e_shentsize;
- if (fseek(elf->file, offset, SEEK_SET)) {
+ if (lseek(elf->fd, offset, SEEK_SET) < 0) {
goto error;
}
if (is_elf_32_bit(elf)) {
Elf32_Shdr elf_shdr;
goto error;
}
if (is_elf_32_bit(elf)) {
Elf32_Shdr elf_shdr;
- if (!fread(&elf_shdr, sizeof(elf_shdr), 1, elf->file)) {
+ if (lttng_ust_read(elf->fd, &elf_shdr, sizeof(elf_shdr))
+ < sizeof(elf_shdr)) {
goto error;
}
if (!is_elf_native_endian(elf)) {
goto error;
}
if (!is_elf_native_endian(elf)) {
} else {
Elf64_Shdr elf_shdr;
} else {
Elf64_Shdr elf_shdr;
- if (!fread(&elf_shdr, sizeof(elf_shdr), 1, elf->file)) {
+ if (lttng_ust_read(elf->fd, &elf_shdr, sizeof(elf_shdr))
+ < sizeof(elf_shdr)) {
goto error;
}
if (!is_elf_native_endian(elf)) {
goto error;
}
if (!is_elf_native_endian(elf)) {
char *lttng_ust_elf_get_section_name(struct lttng_ust_elf *elf, uint32_t offset)
{
char *name = NULL;
char *lttng_ust_elf_get_section_name(struct lttng_ust_elf *elf, uint32_t offset)
{
char *name = NULL;
+ size_t len = 0, to_read; /* len does not include \0 */
- if (fseek(elf->file, elf->section_names_offset + offset, SEEK_SET)) {
+ if (lseek(elf->fd, elf->section_names_offset + offset, SEEK_SET) < 0) {
- /* Note that len starts at 1, it is not an index. */
- for (len = 1; offset + len <= elf->section_names_size; ++len) {
- switch (fgetc(elf->file)) {
- case EOF:
+
+ to_read = elf->section_names_size - offset;
+
+ /* Find first \0 after or at current location, remember len. */
+ for (;;) {
+ char buf[BUF_LEN];
+ ssize_t read_len;
+ size_t i;
+
+ if (!to_read) {
- case '\0':
- goto end;
- default:
- break;
+ read_len = lttng_ust_read(elf->fd, buf,
+ min_t(size_t, BUF_LEN, to_read));
+ if (read_len <= 0) {
+ goto error;
+ }
+ for (i = 0; i < read_len; i++) {
+ if (buf[i] == '\0') {
+ len += i;
+ goto end;
+ }
+ }
+ len += read_len;
+ to_read -= read_len;
-
- /* No name was found before the end of the table. */
- goto error;
-
- name = zmalloc(sizeof(char) * len);
+ name = zmalloc(sizeof(char) * (len + 1)); /* + 1 for \0 */
if (!name) {
goto error;
}
if (!name) {
goto error;
}
- if (fseek(elf->file, elf->section_names_offset + offset,
- SEEK_SET)) {
+ if (lseek(elf->fd, elf->section_names_offset + offset,
+ SEEK_SET) < 0) {
- if (!fgets(name, len, elf->file)) {
+ if (lttng_ust_read(elf->fd, name, len + 1) < len + 1) {
{
uint8_t e_ident[EI_NIDENT];
struct lttng_ust_elf_shdr *section_names_shdr;
{
uint8_t e_ident[EI_NIDENT];
struct lttng_ust_elf_shdr *section_names_shdr;
- struct lttng_ust_elf *elf;
+ struct lttng_ust_elf *elf = NULL;
elf = zmalloc(sizeof(struct lttng_ust_elf));
if (!elf) {
elf = zmalloc(sizeof(struct lttng_ust_elf));
if (!elf) {
- elf->file = fopen(elf->path, "rb");
- if (!elf->file) {
+ elf->fd = open(elf->path, O_RDONLY | O_CLOEXEC);
+ if (elf->fd < 0) {
- if (!fread(e_ident, 1, EI_NIDENT, elf->file)) {
+ if (lttng_ust_read(elf->fd, e_ident, EI_NIDENT) < EI_NIDENT) {
goto error;
}
elf->bitness = e_ident[EI_CLASS];
elf->endianness = e_ident[EI_DATA];
goto error;
}
elf->bitness = e_ident[EI_CLASS];
elf->endianness = e_ident[EI_DATA];
+
+ if (lseek(elf->fd, 0, SEEK_SET) < 0) {
+ goto error;
+ }
elf->ehdr = zmalloc(sizeof(struct lttng_ust_elf_ehdr));
if (!elf->ehdr) {
elf->ehdr = zmalloc(sizeof(struct lttng_ust_elf_ehdr));
if (!elf->ehdr) {
if (is_elf_32_bit(elf)) {
Elf32_Ehdr elf_ehdr;
if (is_elf_32_bit(elf)) {
Elf32_Ehdr elf_ehdr;
- if (!fread(&elf_ehdr, sizeof(elf_ehdr), 1, elf->file)) {
+ if (lttng_ust_read(elf->fd, &elf_ehdr, sizeof(elf_ehdr))
+ < sizeof(elf_ehdr)) {
goto error;
}
if (!is_elf_native_endian(elf)) {
goto error;
}
if (!is_elf_native_endian(elf)) {
} else {
Elf64_Ehdr elf_ehdr;
} else {
Elf64_Ehdr elf_ehdr;
- if (!fread(&elf_ehdr, sizeof(elf_ehdr), 1, elf->file)) {
+ if (lttng_ust_read(elf->fd, &elf_ehdr, sizeof(elf_ehdr))
+ < sizeof(elf_ehdr)) {
goto error;
}
if (!is_elf_native_endian(elf)) {
goto error;
}
if (!is_elf_native_endian(elf)) {
elf->section_names_size = section_names_shdr->sh_size;
free(section_names_shdr);
elf->section_names_size = section_names_shdr->sh_size;
free(section_names_shdr);
return elf;
error:
if (elf) {
free(elf->ehdr);
return elf;
error:
if (elf) {
free(elf->ehdr);
+ if (elf->fd >= 0) {
+ if (close(elf->fd)) {
+ abort();
+ }
+ }
+ if (close(elf->fd)) {
+ abort();
+ }
free(elf->path);
free(elf);
}
free(elf->path);
free(elf);
}
while (offset < segment_end) {
struct lttng_ust_elf_nhdr nhdr;
while (offset < segment_end) {
struct lttng_ust_elf_nhdr nhdr;
/* Align start of note entry */
offset += offset_align(offset, ELF_NOTE_ENTRY_ALIGN);
/* Align start of note entry */
offset += offset_align(offset, ELF_NOTE_ENTRY_ALIGN);
* build id the data following the header will not
* have been read.
*/
* build id the data following the header will not
* have been read.
*/
- if (fseek(elf->file, offset, SEEK_SET)) {
+ if (lseek(elf->fd, offset, SEEK_SET) < 0) {
- if (!fread(&nhdr, sizeof(nhdr), 1, elf->file)) {
+ if (lttng_ust_read(elf->fd, &nhdr, sizeof(nhdr))
+ < sizeof(nhdr)) {
- if (fseek(elf->file, offset, SEEK_SET)) {
+ if (lseek(elf->fd, offset, SEEK_SET) < 0) {
- if (!fread(_build_id, sizeof(*_build_id), _length, elf->file)) {
+ read_len = sizeof(*_build_id) * _length;
+ if (lttng_ust_read(elf->fd, _build_id, read_len) < read_len) {
*
* Returns 0 on success, -1 if an error occurred.
*/
*
* Returns 0 on success, -1 if an error occurred.
*/
int lttng_ust_elf_get_debug_link_from_section(struct lttng_ust_elf *elf,
char **filename, uint32_t *crc,
int *found,
int lttng_ust_elf_get_debug_link_from_section(struct lttng_ust_elf *elf,
char **filename, uint32_t *crc,
int *found,
{
int _found = 0;
char *_filename;
{
int _found = 0;
char *_filename;
char *section_name = NULL;
uint32_t _crc;
char *section_name = NULL;
uint32_t _crc;
if (!_filename) {
goto error;
}
if (!_filename) {
goto error;
}
- if (fseek(elf->file, shdr->sh_offset, SEEK_SET)) {
+ if (lseek(elf->fd, shdr->sh_offset, SEEK_SET) < 0) {
- if (!fread(_filename, sizeof(*_filename), shdr->sh_size - ELF_CRC_SIZE,
- elf->file)) {
+ filename_len = sizeof(*_filename) * (shdr->sh_size - ELF_CRC_SIZE);
+ if (lttng_ust_read(elf->fd, _filename, filename_len) < filename_len) {
- if (!fread(&_crc, sizeof(_crc), 1, elf->file)) {
+ if (lttng_ust_read(elf->fd, &_crc, sizeof(_crc)) < sizeof(_crc)) {
goto error;
}
if (!is_elf_native_endian(elf)) {
goto error;
}
if (!is_elf_native_endian(elf)) {