projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clarify limitations of the --syscall flag with enable-event command
[lttng-tools.git]
/
src
/
common
/
compat
/
compat-epoll.c
diff --git
a/src/common/compat/compat-epoll.c
b/src/common/compat/compat-epoll.c
index 40451b3d21286106430c1322209b21d9fef9579f..ecd09a0924a43f3aef6dbcd0fdb2055a45d44bb9 100644
(file)
--- a/
src/common/compat/compat-epoll.c
+++ b/
src/common/compat/compat-epoll.c
@@
-27,6
+27,8
@@
#include <common/error.h>
#include <common/defaults.h>
#include <common/error.h>
#include <common/defaults.h>
+#include <common/macros.h>
+#include <common/utils.h>
#include "poll.h"
#include "poll.h"
@@
-49,6
+51,11
@@
static int resize_poll_event(struct lttng_poll_event *events,
PERROR("realloc epoll add");
goto error;
}
PERROR("realloc epoll add");
goto error;
}
+ if (new_size > events->alloc_size) {
+ /* Zero newly allocated memory */
+ memset(ptr + events->alloc_size, 0,
+ (new_size - events->alloc_size) * sizeof(*ptr));
+ }
events->events = ptr;
events->alloc_size = new_size;
events->events = ptr;
events->alloc_size = new_size;
@@
-117,6
+124,11
@@
int compat_epoll_add(struct lttng_poll_event *events, int fd, uint32_t req_event
goto error;
}
goto error;
}
+ /*
+ * Zero struct epoll_event to ensure all representations of its
+ * union are zeroed.
+ */
+ memset(&ev, 0, sizeof(ev));
ev.events = req_events;
ev.data.fd = fd;
ev.events = req_events;
ev.data.fd = fd;
@@
-169,8
+181,6
@@
int compat_epoll_del(struct lttng_poll_event *events, int fd)
PERROR("epoll_ctl DEL fatal");
goto error;
}
PERROR("epoll_ctl DEL fatal");
goto error;
}
- PERROR("epoll_ctl del");
- goto error;
}
events->nb_fd--;
}
events->nb_fd--;
@@
-203,11
+213,15
@@
int compat_epoll_wait(struct lttng_poll_event *events, int timeout)
*/
if (events->nb_fd > events->alloc_size) {
/* Expand if the nb_fd is higher than the actual size. */
*/
if (events->nb_fd > events->alloc_size) {
/* Expand if the nb_fd is higher than the actual size. */
- new_size = events->alloc_size << 1UL;
+ new_size = max_t(uint32_t,
+ 1U << utils_get_count_order_u32(events->nb_fd),
+ events->alloc_size << 1UL);
} else if ((events->nb_fd << 1UL) <= events->alloc_size &&
events->nb_fd >= events->init_size) {
/* Shrink if nb_fd multiplied by two is <= than the actual size. */
} else if ((events->nb_fd << 1UL) <= events->alloc_size &&
events->nb_fd >= events->init_size) {
/* Shrink if nb_fd multiplied by two is <= than the actual size. */
- new_size = events->alloc_size >> 1UL;
+ new_size = max_t(uint32_t,
+ utils_get_count_order_u32(events->nb_fd) >> 1U,
+ events->alloc_size >> 1U);
} else {
/* Indicate that we don't want to resize. */
new_size = 0;
} else {
/* Indicate that we don't want to resize. */
new_size = 0;
@@
-246,6
+260,7
@@
error:
void compat_epoll_set_max_size(void)
{
int ret, fd;
void compat_epoll_set_max_size(void)
{
int ret, fd;
+ ssize_t size_ret;
char buf[64];
poll_max_size = DEFAULT_POLL_SIZE;
char buf[64];
poll_max_size = DEFAULT_POLL_SIZE;
@@
-255,11
+270,16
@@
void compat_epoll_set_max_size(void)
return;
}
return;
}
- ret = read(fd, buf, sizeof(buf));
- if (ret < 0) {
+ size_ret = lttng_read(fd, buf, sizeof(buf));
+ /*
+ * Allow reading a file smaller than buf, but keep space for
+ * final \0.
+ */
+ if (size_ret < 0 || size_ret >= sizeof(buf)) {
PERROR("read set max size");
goto error;
}
PERROR("read set max size");
goto error;
}
+ buf[size_ret] = '\0';
poll_max_size = atoi(buf);
if (poll_max_size == 0) {
poll_max_size = atoi(buf);
if (poll_max_size == 0) {
This page took
0.02818 seconds
and
4
git commands to generate.