ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/branches/newio/src/ioengine_epoll.c

Comparing branches/newio/src/ioengine_epoll.c (file contents):
Revision 2414 by michael, Sat Jul 13 22:13:28 2013 UTC vs.
Revision 2415 by michael, Sun Jul 21 14:33:22 2013 UTC

#	Line 35 | Line 35
35		#include <errno.h>
36		#include <sys/types.h>
37		#ifdef HAVE_STDINT_H
38	<	#include <stdint.h> /* bah */
38	>	#include <stdint.h>
39		#endif
40		#include <string.h>
41		#include <sys/epoll.h>
#	Line 259 | Line 259 | engine_loop(struct Generators *gen)
259		struct epoll_event *events;
260		struct Socket *sock;
261		socklen_t codesize;
262	<	int events_count, i, wait, nevs, errcode;
262	>	int events_count, i, iwait, nevs, errcode;
263
264		if ((events_count = 64 /* XXX */) < 20)
265		events_count = 20;
#	Line 271 | Line 271 | engine_loop(struct Generators *gen)
271		events_count = i;
272		}
273
274	<	wait = timer_next(gen) ? (timer_next(gen) - CurrentTime) * 1000 : -1;
274	>	iwait = timer_next(gen) ? (timer_next(gen) - CurrentTime) * 1000 : -1;
275		ilog(LOG_TYPE_DEBUG, "epoll: delay: %d (%d) %d", timer_next(gen),
276	<	CurrentTime, wait);
277	<	nevs = epoll_wait(epoll_fd, events, events_count, wait);
278	<	set_time();;
276	>	CurrentTime, iwait);
277	>	nevs = epoll_wait(epoll_fd, events, events_count, iwait);
278	>	set_time();
279
280		if (nevs < 0) {
281		if (errno != EINTR) {

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines