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

Comparing libev/event.c (file contents):
Revision 1.46 by root, Sun Oct 24 17:19:47 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,
… …
45# include EV_EVENT_H 45# include EV_EVENT_H
46#else 46#else
47# include "event.h" 47# include "event.h"
48#endif 48#endif
49 49
50/* same definition as in ev.c */
51#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
52
53#if EV_MULTIPLICITY 50#if EV_MULTIPLICITY
54# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base 51# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base
55# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base 52# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base
56#else 53#else
57# define dLOOPev 54# define dLOOPev
… …
79} 76}
80 77
81#define EVENT_STRINGIFY(s) # s 78#define EVENT_STRINGIFY(s) # s
82#define EVENT_VERSION(a,b) EVENT_STRINGIFY (a) "." EVENT_STRINGIFY (b) 79#define EVENT_VERSION(a,b) EVENT_STRINGIFY (a) "." EVENT_STRINGIFY (b)
83 80
81const char *
84const char *event_get_version (void) 82event_get_version (void)
85{ 83{
86 /* returns ABI, not API or library, version */ 84 /* returns ABI, not API or library, version */
87 return EVENT_VERSION (EV_VERSION_MAJOR, EV_VERSION_MINOR); 85 return EVENT_VERSION (EV_VERSION_MAJOR, EV_VERSION_MINOR);
88} 86}
89 87
88const char *
90const char *event_get_method (void) 89event_get_method (void)
91{ 90{
92 return "libev"; 91 return "libev";
93} 92}
94 93
95void *event_init (void) 94void *event_init (void)
… …
106#endif 105#endif
107 106
108 return ev_x_cur; 107 return ev_x_cur;
109} 108}
110 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
111void event_base_free (struct event_base *base) 127void event_base_free (struct event_base *base)
112{ 128{
113 dLOOPbase; 129 dLOOPbase;
114 130
115#if EV_MULTIPLICITY 131#if EV_MULTIPLICITY
116 if (ev_default_loop (EVFLAG_AUTO) != loop) 132 if (!ev_is_default_loop (loop))
117 ev_loop_destroy (loop); 133 ev_loop_destroy (loop);
118#endif 134#endif
119} 135}
120 136
121int event_dispatch (void) 137int event_dispatch (void)
… …
136} 152}
137 153
138int event_loopexit (struct timeval *tv) 154int event_loopexit (struct timeval *tv)
139{ 155{
140 return event_base_loopexit (ev_x_cur, tv); 156 return event_base_loopexit (ev_x_cur, tv);
157}
158
159event_callback_fn event_get_callback
160(const struct event *ev)
161{
162 return ev->ev_callback;
141} 163}
142 164
143static void 165static void
144ev_x_cb (struct event *ev, int revents) 166ev_x_cb (struct event *ev, int revents)
145{ 167{
… …
299 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))
300 { 322 {
301 revents |= EV_TIMEOUT; 323 revents |= EV_TIMEOUT;
302 324
303 if (tv) 325 if (tv)
304 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 }
305 } 332 }
306 333
307 return events & revents; 334 return events & revents;
308} 335}
309 336
… …
328 355
329int event_base_loop (struct event_base *base, int flags) 356int event_base_loop (struct event_base *base, int flags)
330{ 357{
331 dLOOPbase; 358 dLOOPbase;
332 359
333 ev_run (EV_A_ flags); 360 return !ev_run (EV_A_ flags);
334
335 return 0;
336} 361}
337 362
338int event_base_dispatch (struct event_base *base) 363int event_base_dispatch (struct event_base *base)
339{ 364{
340 return event_base_loop (base, 0); 365 return event_base_loop (base, 0);

Diff Legend

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