ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libev/event.c
(Generate patch)

Comparing libev/event.c (file contents):
Revision 1.44 by root, Sat Oct 16 06:46:55 2010 UTC vs.
Revision 1.52 by root, Mon Apr 2 23:14:41 2012 UTC

1/* 1/*
2 * libevent compatibility layer 2 * libevent compatibility layer
3 * 3 *
4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2012 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
10 * 1. Redistributions of source code must retain the above copyright notice, 10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer. 11 * this list of conditions and the following disclaimer.
12 * 12 *
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution. 15 * documentation and/or other materials provided with the distribution.
16 * 16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- 18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- 20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
… …
76} 76}
77 77
78#define EVENT_STRINGIFY(s) # s 78#define EVENT_STRINGIFY(s) # s
79#define EVENT_VERSION(a,b) EVENT_STRINGIFY (a) "." EVENT_STRINGIFY (b) 79#define EVENT_VERSION(a,b) EVENT_STRINGIFY (a) "." EVENT_STRINGIFY (b)
80 80
81const char *
81const char *event_get_version (void) 82event_get_version (void)
82{ 83{
83 /* returns ABI, not API or library, version */ 84 /* returns ABI, not API or library, version */
84 return EVENT_VERSION (EV_VERSION_MAJOR, EV_VERSION_MINOR); 85 return EVENT_VERSION (EV_VERSION_MAJOR, EV_VERSION_MINOR);
85} 86}
86 87
88const char *
87const char *event_get_method (void) 89event_get_method (void)
88{ 90{
89 return "libev"; 91 return "libev";
90} 92}
91 93
92void *event_init (void) 94void *event_init (void)
… …
103#endif 105#endif
104 106
105 return ev_x_cur; 107 return ev_x_cur;
106} 108}
107 109
110const char *
111event_base_get_method (const struct event_base *base)
112{
113 return "libev";
114}
115
116struct event_base *
117event_base_new (void)
118{
119#if EV_MULTIPLICITY
120 return (struct event_base *)ev_loop_new (EVFLAG_AUTO);
121#else
122 assert (("libev: multiple event bases not supported when not compiled with EV_MULTIPLICITY"));
123 return NULL;
124#endif
125}
126
108void event_base_free (struct event_base *base) 127void event_base_free (struct event_base *base)
109{ 128{
110 dLOOPbase; 129 dLOOPbase;
111 130
112#if EV_MULTIPLICITY 131#if EV_MULTIPLICITY
113 if (ev_default_loop (EVFLAG_AUTO) != loop) 132 if (!ev_is_default_loop (loop))
114 ev_loop_destroy (loop); 133 ev_loop_destroy (loop);
115#endif 134#endif
116} 135}
117 136
118int event_dispatch (void) 137int event_dispatch (void)
… …
135int event_loopexit (struct timeval *tv) 154int event_loopexit (struct timeval *tv)
136{ 155{
137 return event_base_loopexit (ev_x_cur, tv); 156 return event_base_loopexit (ev_x_cur, tv);
138} 157}
139 158
159event_callback_fn event_get_callback
160(const struct event *ev)
161{
162 return ev->ev_callback;
163}
164
140static void 165static void
141ev_x_cb (struct event *ev, int revents) 166ev_x_cb (struct event *ev, int revents)
142{ 167{
143 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; 168 revents &= EV_READ | EV_WRITE | EV_TIMER | EV_SIGNAL;
144 169
145 ev->ev_res = revents; 170 ev->ev_res = revents;
146 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg); 171 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg);
147} 172}
148 173
… …
296 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to)) 321 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
297 { 322 {
298 revents |= EV_TIMEOUT; 323 revents |= EV_TIMEOUT;
299 324
300 if (tv) 325 if (tv)
301 EV_TV_SET (tv, ev_now (EV_A)); /* not sure if this is right :) */ 326 {
327 ev_tstamp at = ev_now (EV_A);
328
329 tv->tv_sec = (long)at;
330 tv->tv_usec = (long)((at - (ev_tstamp)tv->tv_sec) * 1e6);
331 }
302 } 332 }
303 333
304 return events & revents; 334 return events & revents;
305} 335}
306 336
… …
325 355
326int event_base_loop (struct event_base *base, int flags) 356int event_base_loop (struct event_base *base, int flags)
327{ 357{
328 dLOOPbase; 358 dLOOPbase;
329 359
330 ev_loop (EV_A_ flags); 360 return !ev_run (EV_A_ flags);
331
332 return 0;
333} 361}
334 362
335int event_base_dispatch (struct event_base *base) 363int event_base_dispatch (struct event_base *base)
336{ 364{
337 return event_base_loop (base, 0); 365 return event_base_loop (base, 0);
… …
340static void 368static void
341ev_x_loopexit_cb (int revents, void *base) 369ev_x_loopexit_cb (int revents, void *base)
342{ 370{
343 dLOOPbase; 371 dLOOPbase;
344 372
345 ev_unloop (EV_A_ EVUNLOOP_ONE); 373 ev_break (EV_A_ EVBREAK_ONE);
346} 374}
347 375
348int event_base_loopexit (struct event_base *base, struct timeval *tv) 376int event_base_loopexit (struct event_base *base, struct timeval *tv)
349{ 377{
350 ev_tstamp after = ev_tv_get (tv); 378 ev_tstamp after = ev_tv_get (tv);

Diff Legend

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