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

Comparing libev/event.c (file contents):
Revision 1.42 by root, Mon May 10 20:01:45 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 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,
… …
61 int dummy; 61 int dummy;
62}; 62};
63 63
64static struct event_base *ev_x_cur; 64static struct event_base *ev_x_cur;
65 65
66static void
67ev_tv_set (struct timeval *tv, ev_tstamp at)
68{
69 tv->tv_sec = (long)at;
70 tv->tv_usec = (long)((at - (ev_tstamp)tv->tv_sec) * 1e6);
71}
72
73static ev_tstamp 66static ev_tstamp
74ev_tv_get (struct timeval *tv) 67ev_tv_get (struct timeval *tv)
75{ 68{
76 if (tv) 69 if (tv)
77 { 70 {
… …
83} 76}
84 77
85#define EVENT_STRINGIFY(s) # s 78#define EVENT_STRINGIFY(s) # s
86#define EVENT_VERSION(a,b) EVENT_STRINGIFY (a) "." EVENT_STRINGIFY (b) 79#define EVENT_VERSION(a,b) EVENT_STRINGIFY (a) "." EVENT_STRINGIFY (b)
87 80
81const char *
88const char *event_get_version (void) 82event_get_version (void)
89{ 83{
90 /* returns ABI, not API or library, version */ 84 /* returns ABI, not API or library, version */
91 return EVENT_VERSION (EV_VERSION_MAJOR, EV_VERSION_MINOR); 85 return EVENT_VERSION (EV_VERSION_MAJOR, EV_VERSION_MINOR);
92} 86}
93 87
88const char *
94const char *event_get_method (void) 89event_get_method (void)
95{ 90{
96 return "libev"; 91 return "libev";
97} 92}
98 93
99void *event_init (void) 94void *event_init (void)
… …
110#endif 105#endif
111 106
112 return ev_x_cur; 107 return ev_x_cur;
113} 108}
114 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
115void event_base_free (struct event_base *base) 127void event_base_free (struct event_base *base)
116{ 128{
117 dLOOPbase; 129 dLOOPbase;
118 130
119#if EV_MULTIPLICITY 131#if EV_MULTIPLICITY
120 if (ev_default_loop (EVFLAG_AUTO) != loop) 132 if (!ev_is_default_loop (loop))
121 ev_loop_destroy (loop); 133 ev_loop_destroy (loop);
122#endif 134#endif
123} 135}
124 136
125int event_dispatch (void) 137int event_dispatch (void)
… …
142int event_loopexit (struct timeval *tv) 154int event_loopexit (struct timeval *tv)
143{ 155{
144 return event_base_loopexit (ev_x_cur, tv); 156 return event_base_loopexit (ev_x_cur, tv);
145} 157}
146 158
159event_callback_fn event_get_callback
160(const struct event *ev)
161{
162 return ev->ev_callback;
163}
164
147static void 165static void
148ev_x_cb (struct event *ev, int revents) 166ev_x_cb (struct event *ev, int revents)
149{ 167{
150 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; 168 revents &= EV_READ | EV_WRITE | EV_TIMER | EV_SIGNAL;
151 169
152 ev->ev_res = revents; 170 ev->ev_res = revents;
153 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg); 171 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg);
154} 172}
155 173
… …
303 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))
304 { 322 {
305 revents |= EV_TIMEOUT; 323 revents |= EV_TIMEOUT;
306 324
307 if (tv) 325 if (tv)
308 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 }
309 } 332 }
310 333
311 return events & revents; 334 return events & revents;
312} 335}
313 336
… …
332 355
333int event_base_loop (struct event_base *base, int flags) 356int event_base_loop (struct event_base *base, int flags)
334{ 357{
335 dLOOPbase; 358 dLOOPbase;
336 359
337 ev_loop (EV_A_ flags); 360 return !ev_run (EV_A_ flags);
338
339 return 0;
340} 361}
341 362
342int event_base_dispatch (struct event_base *base) 363int event_base_dispatch (struct event_base *base)
343{ 364{
344 return event_base_loop (base, 0); 365 return event_base_loop (base, 0);
… …
347static void 368static void
348ev_x_loopexit_cb (int revents, void *base) 369ev_x_loopexit_cb (int revents, void *base)
349{ 370{
350 dLOOPbase; 371 dLOOPbase;
351 372
352 ev_unloop (EV_A_ EVUNLOOP_ONE); 373 ev_break (EV_A_ EVBREAK_ONE);
353} 374}
354 375
355int event_base_loopexit (struct event_base *base, struct timeval *tv) 376int event_base_loopexit (struct event_base *base, struct timeval *tv)
356{ 377{
357 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