… | |
… | |
89 | |
89 | |
90 | void *event_init (void) |
90 | void *event_init (void) |
91 | { |
91 | { |
92 | #if EV_MULTIPLICITY |
92 | #if EV_MULTIPLICITY |
93 | if (x_cur) |
93 | if (x_cur) |
94 | x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO); |
94 | x_cur = (struct event_base *)ev_loop_new (EVFLAG_AUTO); |
95 | else |
95 | else |
96 | x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO); |
96 | x_cur = (struct event_base *)ev_default_loop (EVFLAG_AUTO); |
97 | #else |
97 | #else |
98 | assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur)); |
98 | assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur)); |
99 | |
99 | |
100 | x_cur = (struct event_base *)(long)ev_default_loop (EVMETHOD_AUTO); |
100 | x_cur = (struct event_base *)(long)ev_default_loop (EVFLAG_AUTO); |
101 | #endif |
101 | #endif |
102 | |
102 | |
103 | return x_cur; |
103 | return x_cur; |
104 | } |
104 | } |
105 | |
105 | |
106 | void event_base_free (struct event_base *base) |
106 | void event_base_free (struct event_base *base) |
107 | { |
107 | { |
108 | dLOOPbase; |
108 | dLOOPbase; |
109 | |
109 | |
110 | #if EV_MULTIPLICITY |
110 | #if EV_MULTIPLICITY |
111 | if (ev_default_loop (EVMETHOD_AUTO) != loop) |
111 | if (ev_default_loop (EVFLAG_AUTO) != loop) |
112 | ev_loop_destroy (loop); |
112 | ev_loop_destroy (loop); |
113 | #endif |
113 | #endif |
114 | } |
114 | } |
115 | |
115 | |
116 | int event_dispatch (void) |
116 | int event_dispatch (void) |
… | |
… | |
345 | static void |
345 | static void |
346 | x_loopexit_cb (int revents, void *base) |
346 | x_loopexit_cb (int revents, void *base) |
347 | { |
347 | { |
348 | dLOOPbase; |
348 | dLOOPbase; |
349 | |
349 | |
350 | ev_unloop (EV_A_ EVUNLOOP_ONCE); |
350 | ev_unloop (EV_A_ EVUNLOOP_ONE); |
351 | } |
351 | } |
352 | |
352 | |
353 | int event_base_loopexit (struct event_base *base, struct timeval *tv) |
353 | int event_base_loopexit (struct event_base *base, struct timeval *tv) |
354 | { |
354 | { |
355 | ev_tstamp after = tv_get (tv); |
355 | ev_tstamp after = tv_get (tv); |