ChangeLog... On Fri, 28 Jan 2011, Enlightenment SVN wrote:
> Log: > From: Mike McCormack <mj.mccorm...@samsung.com> > Subject: [E-devel] [PATCH] ecore main loop "fd_handlers_to_call" list > optimization > Date: Thu, 02 Dec 2010 15:22:13 +0900 > > Hi All, > > Rather than using malloc'ed list entries in the mail loop, use a single > linked in-place list. > > This avoid lots of mallocs and frees as the main loop iterates. > > thanks, > > Mike > > > Author: discomfitor > Date: 2011-01-28 21:34:00 -0800 (Fri, 28 Jan 2011) > New Revision: 56368 > Trac: http://trac.enlightenment.org/e/changeset/56368 > > Modified: > trunk/ecore/src/lib/ecore/ecore_main.c > > Modified: trunk/ecore/src/lib/ecore/ecore_main.c > =================================================================== > --- trunk/ecore/src/lib/ecore/ecore_main.c 2011-01-29 05:25:42 UTC (rev > 56367) > +++ trunk/ecore/src/lib/ecore/ecore_main.c 2011-01-29 05:34:00 UTC (rev > 56368) > @@ -61,6 +61,7 @@ > { > EINA_INLIST; > ECORE_MAGIC; > + Ecore_Fd_Handler *next_ready; > int fd; > Ecore_Fd_Handler_Flags flags; > Ecore_Fd_Cb func; > @@ -119,9 +120,9 @@ > static Eina_List *fd_handlers_with_buffer = NULL; > static Eina_List *fd_handlers_to_delete = NULL; > > -static Eina_List *fd_handlers_to_call = NULL; > -static Eina_List *fd_handlers_to_call_current; > -static Eina_List *fd_handlers_to_call_current_next; > +/* single linked list of ready fdhs, terminated by loop to self */ > +static Ecore_Fd_Handler *fd_handlers_to_call; > +static Ecore_Fd_Handler *fd_handlers_to_call_current; > > #ifdef _WIN32 > static Ecore_Win32_Handler *win32_handlers = NULL; > @@ -166,6 +167,24 @@ > #endif > } > > +static inline void > +_ecore_try_add_to_call_list(Ecore_Fd_Handler *fdh) > +{ > + /* check if this fdh is already in the list */ > + if (fdh->next_ready) > + return; > + if (fdh->read_active || fdh->write_active || fdh->error_active) > + { > + /* > + * make sure next_ready is non-null by pointing to ourselves > + * use that to indicate this fdh is in the ready list > + * insert at the head of the list to avoid trouble > + */ > + fdh->next_ready = fd_handlers_to_call ? fd_handlers_to_call : fdh; > + fd_handlers_to_call = fdh; > + } > +} > + > #ifdef HAVE_EPOLL > static inline int > _ecore_get_epoll_fd(void) > @@ -332,7 +351,6 @@ > for (i = 0; i < ret; i++) > { > Ecore_Fd_Handler *fdh; > - Eina_Bool pst, st; > > fdh = ev[i].data.ptr; > if (!ECORE_MAGIC_CHECK(fdh, ECORE_MAGIC_FD_HANDLER)) > @@ -346,15 +364,15 @@ > ERR("deleted fd in epoll"); > continue; > } > - pst = st = fdh->read_active | fdh->write_active | fdh->error_active; > - if ((ev[i].events & EPOLLIN) && (!fdh->read_active)) > - st = fdh->read_active = EINA_TRUE; > - if ((ev[i].events & EPOLLOUT) && (!fdh->write_active)) > - st = fdh->write_active = EINA_TRUE; > - if ((ev[i].events & EPOLLERR) && (!fdh->error_active)) > - st = fdh->error_active = EINA_TRUE; > - if (pst != st) > - fd_handlers_to_call = eina_list_append(fd_handlers_to_call, fdh); > + > + if (ev[i].events & EPOLLIN) > + fdh->read_active = EINA_TRUE; > + if (ev[i].events & EPOLLOUT) > + fdh->write_active = EINA_TRUE; > + if (ev[i].events & EPOLLERR) > + fdh->error_active = EINA_TRUE; > + > + _ecore_try_add_to_call_list(fdh); > } > > return ret; > @@ -365,7 +383,6 @@ > static inline int _ecore_main_fdh_poll_mark_active(void) > { > Ecore_Fd_Handler *fdh; > - Eina_Bool pst, st; > int ret = 0; > > /* call the prepare callback for all handlers */ > @@ -374,15 +391,15 @@ > if (fdh->delete_me) > continue; > > - pst = st = fdh->read_active | fdh->write_active | fdh->error_active; > - if ((fdh->gfd.revents & G_IO_IN) && (!fdh->read_active)) > - st = fdh->read_active = EINA_TRUE; > - if ((fdh->gfd.revents & G_IO_OUT) && (!fdh->write_active)) > - st = fdh->write_active = EINA_TRUE; > - if ((fdh->gfd.revents & G_IO_ERR) && (!fdh->error_active)) > - st = fdh->error_active = EINA_TRUE; > - if (pst != st) > - fd_handlers_to_call = eina_list_append(fd_handlers_to_call, fdh); > + if (fdh->gfd.revents & G_IO_IN) > + fdh->read_active = EINA_TRUE; > + if (fdh->gfd.revents & G_IO_OUT) > + fdh->write_active = EINA_TRUE; > + if (fdh->gfd.revents & G_IO_ERR) > + fdh->error_active = EINA_TRUE; > + > + _ecore_try_add_to_call_list(fdh); > + > if (fdh->gfd.revents & (G_IO_IN|G_IO_OUT|G_IO_ERR)) ret++; > } > > @@ -763,6 +780,7 @@ > fdh = calloc(1, sizeof(Ecore_Fd_Handler)); > if (!fdh) return NULL; > ECORE_MAGIC_SET(fdh, ECORE_MAGIC_FD_HANDLER); > + fdh->next_ready = NULL; > fdh->fd = fd; > fdh->flags = flags; > if (_ecore_main_fdh_poll_add(fdh) < 0) > @@ -999,9 +1017,8 @@ > fd_handlers_with_prep = eina_list_free(fd_handlers_with_prep); > if (fd_handlers_to_delete) > fd_handlers_to_delete = eina_list_free(fd_handlers_to_delete); > - if (fd_handlers_to_call) > - fd_handlers_to_call = eina_list_free(fd_handlers_to_call); > > + fd_handlers_to_call = NULL; > fd_handlers_to_call_current = NULL; > fd_handlers_to_delete = NULL; > fd_handler_current = NULL; > @@ -1140,16 +1157,13 @@ > { > if (!fdh->delete_me) > { > - Eina_Bool pst, st; > - pst = st = fdh->read_active | fdh->write_active | > fdh->error_active; > - if ((FD_ISSET(fdh->fd, &rfds)) && (!fdh->read_active)) > - st = fdh->read_active = EINA_TRUE; > - if ((FD_ISSET(fdh->fd, &wfds)) && (!fdh->write_active)) > - st = fdh->write_active = EINA_TRUE; > - if ((FD_ISSET(fdh->fd, &exfds)) && (!fdh->error_active)) > - st = fdh->error_active = EINA_TRUE; > - if (pst != st) > - fd_handlers_to_call = > eina_list_append(fd_handlers_to_call, fdh); > + if (FD_ISSET(fdh->fd, &rfds)) > + fdh->read_active = EINA_TRUE; > + if (FD_ISSET(fdh->fd, &wfds)) > + fdh->write_active = EINA_TRUE; > + if (FD_ISSET(fdh->fd, &exfds)) > + fdh->error_active = EINA_TRUE; > + _ecore_try_add_to_call_list(fdh); > } > } > #endif /* HAVE_EPOLL */ > @@ -1286,22 +1300,16 @@ > static void > _ecore_main_fd_handlers_call(void) > { > + /* grab a new list */ > if (!fd_handlers_to_call_current) > { > - /* regular main loop, start from head */ > fd_handlers_to_call_current = fd_handlers_to_call; > - fd_handlers_to_call_current_next = > eina_list_next(fd_handlers_to_call_current); > + fd_handlers_to_call = NULL; > } > - else > - { > - /* recursive main loop, continue from where we were */ > - fd_handlers_to_call_current = fd_handlers_to_call_current_next; > - fd_handlers_to_call_current_next = > eina_list_next(fd_handlers_to_call_current); > - } > > while (fd_handlers_to_call_current) > { > - Ecore_Fd_Handler *fdh = fd_handlers_to_call_current->data; > + Ecore_Fd_Handler *fdh = fd_handlers_to_call_current; > > if (!fdh->delete_me) > { > @@ -1328,9 +1336,16 @@ > } > } > > - fd_handlers_to_call = eina_list_remove_list(fd_handlers_to_call, > fd_handlers_to_call_current); > - fd_handlers_to_call_current = fd_handlers_to_call_current_next; > - fd_handlers_to_call_current_next = > eina_list_next(fd_handlers_to_call_current_next); > + /* stop when we point to ourselves */ > + if (fdh->next_ready == fdh) > + { > + fdh->next_ready = NULL; > + fd_handlers_to_call_current = NULL; > + break; > + } > + > + fd_handlers_to_call_current = fdh->next_ready; > + fdh->next_ready = NULL; > } > } > > @@ -1355,12 +1370,8 @@ > if (fdh->buf_func(fdh->buf_data, fdh)) > { > ret |= fdh->func(fdh->data, fdh); > - if (!fdh->read_active) > - { > - fdh->read_active = EINA_TRUE; > - if ((!fdh->write_active) && (!fdh->error_active)) > - fd_handlers_to_call = > eina_list_append(fd_handlers_to_call, fdh); > - } > + fdh->read_active = EINA_TRUE; > + _ecore_try_add_to_call_list(fdh); > } > fdh->references--; > } > > > ------------------------------------------------------------------------------ > Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! > Finally, a world-class log management solution at an even better price-free! > Download using promo code Free_Logger_4_Dev2Dev. Offer expires > February 28th, so secure your free ArcSight Logger TODAY! > http://p.sf.net/sfu/arcsight-sfd2d > _______________________________________________ > enlightenment-svn mailing list > enlightenment-...@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn > > ------------------------------------------------------------------------------ Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
