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

Comparing libev/event.c (file contents):
Revision 1.41 by root, Wed Jan 7 20:45:52 2009 UTC vs.
Revision 1.51 by root, Mon Apr 2 20:12:16 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)
70 {
77 return tv->tv_sec + tv->tv_usec * 1e-6; 71 ev_tstamp after = tv->tv_sec + tv->tv_usec * 1e-6;
72 return after ? after : 1e-6;
73 }
78 else 74 else
79 return -1.; 75 return -1.;
80} 76}
81 77
82#define EVENT_STRINGIFY(s) # s 78#define EVENT_STRINGIFY(s) # s
… …
112void event_base_free (struct event_base *base) 108void event_base_free (struct event_base *base)
113{ 109{
114 dLOOPbase; 110 dLOOPbase;
115 111
116#if EV_MULTIPLICITY 112#if EV_MULTIPLICITY
117 if (ev_default_loop (EVFLAG_AUTO) != loop) 113 if (!ev_is_default_loop (loop))
118 ev_loop_destroy (loop); 114 ev_loop_destroy (loop);
119#endif 115#endif
120} 116}
121 117
122int event_dispatch (void) 118int event_dispatch (void)
… …
142} 138}
143 139
144static void 140static void
145ev_x_cb (struct event *ev, int revents) 141ev_x_cb (struct event *ev, int revents)
146{ 142{
147 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; 143 revents &= EV_READ | EV_WRITE | EV_TIMER | EV_SIGNAL;
148 144
149 ev->ev_res = revents; 145 ev->ev_res = revents;
150 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg); 146 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg);
151} 147}
152 148
… …
300 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to)) 296 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
301 { 297 {
302 revents |= EV_TIMEOUT; 298 revents |= EV_TIMEOUT;
303 299
304 if (tv) 300 if (tv)
305 ev_tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */ 301 {
302 ev_tstamp at = ev_now (EV_A);
303
304 tv->tv_sec = (long)at;
305 tv->tv_usec = (long)((at - (ev_tstamp)tv->tv_sec) * 1e6);
306 }
306 } 307 }
307 308
308 return events & revents; 309 return events & revents;
309} 310}
310 311
… …
329 330
330int event_base_loop (struct event_base *base, int flags) 331int event_base_loop (struct event_base *base, int flags)
331{ 332{
332 dLOOPbase; 333 dLOOPbase;
333 334
334 ev_loop (EV_A_ flags); 335 ev_run (EV_A_ flags);
335 336
336 return 0; 337 return 0;
337} 338}
338 339
339int event_base_dispatch (struct event_base *base) 340int event_base_dispatch (struct event_base *base)
… …
344static void 345static void
345ev_x_loopexit_cb (int revents, void *base) 346ev_x_loopexit_cb (int revents, void *base)
346{ 347{
347 dLOOPbase; 348 dLOOPbase;
348 349
349 ev_unloop (EV_A_ EVUNLOOP_ONE); 350 ev_break (EV_A_ EVBREAK_ONE);
350} 351}
351 352
352int event_base_loopexit (struct event_base *base, struct timeval *tv) 353int event_base_loopexit (struct event_base *base, struct timeval *tv)
353{ 354{
354 ev_tstamp after = ev_tv_get (tv); 355 ev_tstamp after = ev_tv_get (tv);

Diff Legend

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