p
/
ponymap
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the optimization 

It wasn't all that easy.
This commit is contained in:
Přemysl Eric Janouch 2014-09-25 22:38:52 +02:00
parent 9f6a98d540
commit 88d92c87ce
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
utils.c
View File

@ -1056,6 +1056,7 @@ struct poller
{ {
int epoll_fd; ///< The epoll FD int epoll_fd; ///< The epoll FD
struct poller_fd **fds; ///< Information associated with each FD struct poller_fd **fds; ///< Information associated with each FD
int *dummy; ///< For poller_remove_from_dispatch()
struct epoll_event *revents; ///< Output array for epoll_wait() struct epoll_event *revents; ///< Output array for epoll_wait()
size_t len; ///< Number of polled descriptors size_t len; ///< Number of polled descriptors
size_t alloc; ///< Number of entries allocated size_t alloc; ///< Number of entries allocated
@ -1076,6 +1077,7 @@ poller_init (struct poller *self)
self->len = 0; self->len = 0;
self->alloc = POLLER_MIN_ALLOC; self->alloc = POLLER_MIN_ALLOC;
self->fds = xcalloc (self->alloc, sizeof *self->fds); self->fds = xcalloc (self->alloc, sizeof *self->fds);
self->dummy = xcalloc (self->alloc, sizeof *self->dummy);
self->revents = xcalloc (self->alloc, sizeof *self->revents); self->revents = xcalloc (self->alloc, sizeof *self->revents);
self->revents_len = 0; self->revents_len = 0;
@ -1096,6 +1098,7 @@ poller_free (struct poller *self)
xclose (self->epoll_fd); xclose (self->epoll_fd);
free (self->fds); free (self->fds);
free (self->dummy);
free (self->revents); free (self->revents);
} }
@ -1112,6 +1115,8 @@ poller_ensure_space (struct poller *self)
(self->revents, sizeof *self->revents, self->alloc); (self->revents, sizeof *self->revents, self->alloc);
self->fds = xreallocarray self->fds = xreallocarray
(self->fds, sizeof *self->fds, self->alloc); (self->fds, sizeof *self->fds, self->alloc);
self->dummy = xreallocarray
(self->dummy, sizeof *self->dummy, self->alloc);
} }
static short static short
@ -1174,7 +1179,15 @@ poller_remove_from_dispatch (struct poller *self, const struct poller_fd *fd)
struct epoll_event key = { .data.ptr = (void *) fd }, *fd_event; struct epoll_event key = { .data.ptr = (void *) fd }, *fd_event;
if ((fd_event = bsearch (&key, self->revents, if ((fd_event = bsearch (&key, self->revents,
self->revents_len, sizeof *self->revents, poller_compare_fds))) self->revents_len, sizeof *self->revents, poller_compare_fds)))
{
fd_event->events = -1; fd_event->events = -1;
// Don't let any further bsearch()'s touch possibly freed memory
int *dummy = self->dummy + (fd_event - self->revents);
*dummy = fd->fd;
fd_event->data.ptr =
(uint8_t *) dummy - offsetof (struct poller_fd, fd);
}
} }
static void static void