ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libev/ev++.h
(Generate patch)

Comparing libev/ev++.h (file contents):
Revision 1.30 by llucax, Fri Jan 18 18:15:35 2008 UTC vs.
Revision 1.55 by root, Sun Oct 24 17:58:41 2010 UTC

1/* 1/*
2 * libev simple C++ wrapper classes 2 * libev simple C++ wrapper classes
3 * 3 *
4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2010 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 *
… …
44# include EV_H 44# include EV_H
45#else 45#else
46# include "ev.h" 46# include "ev.h"
47#endif 47#endif
48 48
49#ifndef EV_CXX_EXCEPTIONS 49#ifndef EV_USE_STDEXCEPT
50#define EV_CXX_EXCEPTIONS 1 50# define EV_USE_STDEXCEPT 1
51#endif 51#endif
52 52
53#undef EV_THROW 53#if EV_USE_STDEXCEPT
54#if EV_CXX_EXCEPTIONS
55# include <stdexcept> 54# include <stdexcept>
56# define EV_THROW(exception) throw (exception)
57#else
58# define EV_THROW(exception)
59#endif 55#endif
60 56
61namespace ev { 57namespace ev {
62 58
63 typedef ev_tstamp tstamp; 59 typedef ev_tstamp tstamp;
64 60
65 enum { 61 enum
62 {
66 UNDEF = EV_UNDEF, 63 UNDEF = EV_UNDEF,
67 NONE = EV_NONE, 64 NONE = EV_NONE,
68 READ = EV_READ, 65 READ = EV_READ,
69 WRITE = EV_WRITE, 66 WRITE = EV_WRITE,
67#if EV_COMPAT3
70 TIMEOUT = EV_TIMEOUT, 68 TIMEOUT = EV_TIMEOUT,
69#endif
70 TIMER = EV_TIMER,
71 PERIODIC = EV_PERIODIC, 71 PERIODIC = EV_PERIODIC,
72 SIGNAL = EV_SIGNAL, 72 SIGNAL = EV_SIGNAL,
73 CHILD = EV_CHILD, 73 CHILD = EV_CHILD,
74 STAT = EV_STAT, 74 STAT = EV_STAT,
75 IDLE = EV_IDLE, 75 IDLE = EV_IDLE,
76 CHECK = EV_CHECK, 76 CHECK = EV_CHECK,
77 PREPARE = EV_PREPARE, 77 PREPARE = EV_PREPARE,
78 FORK = EV_FORK, 78 FORK = EV_FORK,
79 ASYNC = EV_ASYNC,
79 EMBED = EV_EMBED, 80 EMBED = EV_EMBED,
81# undef ERROR // some systems stupidly #define ERROR
80 ERROR = EV_ERROR, 82 ERROR = EV_ERROR
81 }; 83 };
82 84
83 enum 85 enum
84 { 86 {
85 AUTO = EVFLAG_AUTO, 87 AUTO = EVFLAG_AUTO,
86 NOENV = EVFLAG_NOENV, 88 NOENV = EVFLAG_NOENV,
87 FORKCHECK = EVFLAG_FORKCHECK, 89 FORKCHECK = EVFLAG_FORKCHECK,
90
88 SELECT = EVBACKEND_SELECT, 91 SELECT = EVBACKEND_SELECT,
89 POLL = EVBACKEND_POLL, 92 POLL = EVBACKEND_POLL,
90 EPOLL = EVBACKEND_EPOLL, 93 EPOLL = EVBACKEND_EPOLL,
91 KQUEUE = EVBACKEND_KQUEUE, 94 KQUEUE = EVBACKEND_KQUEUE,
92 DEVPOLL = EVBACKEND_DEVPOLL, 95 DEVPOLL = EVBACKEND_DEVPOLL,
93 PORT = EVBACKEND_PORT 96 PORT = EVBACKEND_PORT
94 }; 97 };
95 98
96 enum 99 enum
97 { 100 {
101#if EV_COMPAT3
98 NONBLOCK = EVLOOP_NONBLOCK, 102 NONBLOCK = EVLOOP_NONBLOCK,
99 ONESHOT = EVLOOP_ONESHOT 103 ONESHOT = EVLOOP_ONESHOT,
104#endif
105 NOWAIT = EVRUN_NOWAIT,
106 ONCE = EVRUN_ONCE
100 }; 107 };
101 108
102 enum how_t 109 enum how_t
103 { 110 {
104 ONE = EVUNLOOP_ONE, 111 ONE = EVBREAK_ONE,
105 ALL = EVUNLOOP_ALL 112 ALL = EVBREAK_ALL
106 }; 113 };
107 114
108#if EV_CXX_EXCEPTIONS 115 struct bad_loop
109 struct bad_loop: std::runtime_error 116#if EV_USE_STDEXCEPT
117 : std::runtime_error
118#endif
110 { 119 {
120#if EV_USE_STDEXCEPT
111 bad_loop() 121 bad_loop ()
112 : std::runtime_error("loop can't be initialized") {} 122 : std::runtime_error ("libev event loop cannot be initialized, bad value of LIBEV_FLAGS?")
113 }; 123 {
124 }
114#endif 125#endif
126 };
115 127
116#ifdef EV_AX 128#ifdef EV_AX
117# undef EV_AX 129# undef EV_AX
118#endif 130#endif
119 131
… …
129# define EV_AX_ 141# define EV_AX_
130#endif 142#endif
131 143
132 struct loop_ref 144 struct loop_ref
133 { 145 {
134
135 loop_ref (EV_P) 146 loop_ref (EV_P) throw ()
136#if EV_MULTIPLICITY 147#if EV_MULTIPLICITY
137 EV_THROW (bad_loop) : EV_AX (EV_A) 148 : EV_AX (EV_A)
138#endif 149#endif
139 {
140#if EV_MULTIPLICIY && EV_CXX_EXCEPTIONS
141 if (!EV_A)
142 throw bad_loop ();
143#endif
144 } 150 {
151 }
145 152
146 bool operator== (const loop_ref &other) const EV_THROW () 153 bool operator == (const loop_ref &other) const throw ()
147 { 154 {
148#if EV_MULTIPLICITY 155#if EV_MULTIPLICITY
149 return this->EV_AX == other.EV_AX; 156 return EV_AX == other.EV_AX;
150#else 157#else
151 return true; 158 return true;
152#endif 159#endif
153 } 160 }
154 161
155 bool operator!= (const loop_ref &other) const EV_THROW () 162 bool operator != (const loop_ref &other) const throw ()
156 { 163 {
157#if EV_MULTIPLICITY 164#if EV_MULTIPLICITY
158 return ! (*this == other); 165 return ! (*this == other);
159#else 166#else
160 return false; 167 return false;
161#endif 168#endif
162 } 169 }
163 170
164#if EV_MULTIPLICITY 171#if EV_MULTIPLICITY
165 bool operator== (struct ev_loop *other) const EV_THROW () 172 bool operator == (const EV_P) const throw ()
166 { 173 {
167 return this->EV_AX == other; 174 return this->EV_AX == EV_A;
168 }
169
170 bool operator!= (struct ev_loop *other) const EV_THROW ()
171 { 175 }
172 return ! (*this == other); 176
177 bool operator != (const EV_P) const throw ()
173 } 178 {
174
175 bool operator== (const struct ev_loop *other) const EV_THROW ()
176 {
177 return this->EV_AX == other;
178 }
179
180 bool operator!= (const struct ev_loop *other) const EV_THROW ()
181 {
182 return (*this == other); 179 return (*this == EV_A);
183 } 180 }
184 181
185 operator struct ev_loop * () const EV_THROW () 182 operator struct ev_loop * () const throw ()
186 { 183 {
187 return EV_AX; 184 return EV_AX;
188 } 185 }
189 186
190 operator const struct ev_loop * () const EV_THROW () 187 operator const struct ev_loop * () const throw ()
191 { 188 {
192 return EV_AX; 189 return EV_AX;
193 } 190 }
194 191
195 bool is_default () const EV_THROW () 192 bool is_default () const throw ()
196 { 193 {
197 return EV_AX == ev_default_loop (0); 194 return EV_AX == ev_default_loop (0);
198 } 195 }
199#endif 196#endif
200 197
198#if EV_COMPAT3
201 void loop (int flags = 0) 199 void loop (int flags = 0)
202 { 200 {
203 ev_loop (EV_AX_ flags); 201 ev_run (EV_AX_ flags);
204 } 202 }
205 203
206 void unloop (how_t how = ONE) EV_THROW () 204 void unloop (how_t how = ONE) throw ()
207 { 205 {
208 ev_unloop (EV_AX_ how); 206 ev_break (EV_AX_ how);
209 }
210
211 void post_fork () EV_THROW ()
212 { 207 }
213#if EV_MULTIPLICITY 208#endif
209
210 void run (int flags = 0)
211 {
212 ev_run (EV_AX_ flags);
213 }
214
215 void break_loop (how_t how = ONE) throw ()
216 {
217 ev_break (EV_AX_ how);
218 }
219
220 void post_fork () throw ()
221 {
214 ev_loop_fork (EV_AX); 222 ev_loop_fork (EV_AX);
215#else
216 ev_default_fork ();
217#endif
218 }
219
220 unsigned int count () const EV_THROW ()
221 { 223 }
222 return ev_loop_count (EV_AX);
223 }
224 224
225 unsigned int backend () const EV_THROW () 225 unsigned int backend () const throw ()
226 { 226 {
227 return ev_backend (EV_AX); 227 return ev_backend (EV_AX);
228 } 228 }
229 229
230 tstamp now () const EV_THROW () 230 tstamp now () const throw ()
231 { 231 {
232 return ev_now (EV_AX); 232 return ev_now (EV_AX);
233 } 233 }
234 234
235 void ref () EV_THROW () 235 void ref () throw ()
236 { 236 {
237 ev_ref (EV_AX); 237 ev_ref (EV_AX);
238 } 238 }
239 239
240 void unref () EV_THROW () 240 void unref () throw ()
241 { 241 {
242 ev_unref (EV_AX); 242 ev_unref (EV_AX);
243 } 243 }
244 244
245#if EV_FEATURE_API
246 unsigned int iteration () const throw ()
247 {
248 return ev_iteration (EV_AX);
249 }
250
251 unsigned int depth () const throw ()
252 {
253 return ev_depth (EV_AX);
254 }
255
245 void set_io_collect_interval (tstamp interval) EV_THROW () 256 void set_io_collect_interval (tstamp interval) throw ()
246 { 257 {
247 ev_set_io_collect_interval (EV_AX_ interval); 258 ev_set_io_collect_interval (EV_AX_ interval);
248 } 259 }
249 260
250 void set_timeout_collect_interval (tstamp interval) EV_THROW () 261 void set_timeout_collect_interval (tstamp interval) throw ()
251 { 262 {
252 ev_set_timeout_collect_interval (EV_AX_ interval); 263 ev_set_timeout_collect_interval (EV_AX_ interval);
253 } 264 }
265#endif
254 266
255 // function callback 267 // function callback
256 void once (int fd, int events, tstamp timeout, void (*cb)(int, void *), void* arg = 0) EV_THROW () 268 void once (int fd, int events, tstamp timeout, void (*cb)(int, void *), void *arg = 0) throw ()
257 { 269 {
258 ev_once (EV_AX_ fd, events, timeout, cb, arg); 270 ev_once (EV_AX_ fd, events, timeout, cb, arg);
259 } 271 }
260 272
261 // method callback 273 // method callback
262 template<class K, void (K::*method)(int)> 274 template<class K, void (K::*method)(int)>
263 void once (int fd, int events, tstamp timeout, K *object) EV_THROW () 275 void once (int fd, int events, tstamp timeout, K *object) throw ()
264 { 276 {
265 once (fd, events, timeout, method_thunk<K, method>, object); 277 once (fd, events, timeout, method_thunk<K, method>, object);
266 } 278 }
267 279
280 // default method == operator ()
281 template<class K>
282 void once (int fd, int events, tstamp timeout, K *object) throw ()
283 {
284 once (fd, events, timeout, method_thunk<K, &K::operator ()>, object);
285 }
286
268 template<class K, void (K::*method)(int)> 287 template<class K, void (K::*method)(int)>
269 static void method_thunk (int revents, void* arg) 288 static void method_thunk (int revents, void *arg)
270 {
271 K *obj = static_cast<K *>(arg);
272 (obj->*method) (revents);
273 } 289 {
290 static_cast<K *>(arg)->*method
291 (revents);
292 }
274 293
275 // const method callback 294 // no-argument method callback
276 template<class K, void (K::*method)(int) const>
277 void once (int fd, int events, tstamp timeout, const K *object) EV_THROW ()
278 {
279 once (fd, events, timeout, const_method_thunk<K, method>, object);
280 }
281
282 template<class K, void (K::*method)(int) const>
283 static void const_method_thunk (int revents, void* arg)
284 {
285 K *obj = static_cast<K *>(arg);
286 (obj->*method) (revents);
287 }
288
289 // simple method callback
290 template<class K, void (K::*method)()> 295 template<class K, void (K::*method)()>
291 void once (int fd, int events, tstamp timeout, K *object) EV_THROW () 296 void once (int fd, int events, tstamp timeout, K *object) throw ()
292 { 297 {
293 once (fd, events, timeout, method_noargs_thunk<K, method>, object); 298 once (fd, events, timeout, method_noargs_thunk<K, method>, object);
294 } 299 }
295 300
296 template<class K, void (K::*method)()> 301 template<class K, void (K::*method)()>
297 static void method_noargs_thunk (int revents, void* arg) 302 static void method_noargs_thunk (int revents, void *arg)
298 { 303 {
299 K *obj = static_cast<K *>(arg); 304 static_cast<K *>(arg)->*method
300 (obj->*method) (); 305 ();
301 } 306 }
302 307
303 // simpler function callback 308 // simpler function callback
304 template<void (*cb)(int)> 309 template<void (*cb)(int)>
305 void once (int fd, int events, tstamp timeout) EV_THROW () 310 void once (int fd, int events, tstamp timeout) throw ()
306 { 311 {
307 once (fd, events, timeout, simpler_func_thunk<cb>); 312 once (fd, events, timeout, simpler_func_thunk<cb>);
308 } 313 }
309 314
310 template<void (*cb)(int)> 315 template<void (*cb)(int)>
311 static void simpler_func_thunk (int revents, void* arg) 316 static void simpler_func_thunk (int revents, void *arg)
312 { 317 {
318 (*cb)
313 (*cb) (revents); 319 (revents);
314 } 320 }
315 321
316 // simplest function callback 322 // simplest function callback
317 template<void (*cb)()> 323 template<void (*cb)()>
318 void once (int fd, int events, tstamp timeout) EV_THROW () 324 void once (int fd, int events, tstamp timeout) throw ()
319 { 325 {
320 once (fd, events, timeout, simplest_func_thunk<cb>); 326 once (fd, events, timeout, simplest_func_thunk<cb>);
321 } 327 }
322 328
323 template<void (*cb)()> 329 template<void (*cb)()>
324 static void simplest_func_thunk (int revents, void* arg) 330 static void simplest_func_thunk (int revents, void *arg)
325 { 331 {
326 (*cb) (); 332 (*cb)
333 ();
327 } 334 }
328 335
329 void feed_fd_event (int fd, int revents) EV_THROW () 336 void feed_fd_event (int fd, int revents) throw ()
330 { 337 {
331 ev_feed_fd_event (EV_AX_ fd, revents); 338 ev_feed_fd_event (EV_AX_ fd, revents);
332 } 339 }
333 340
334 void feed_signal_event (int signum) EV_THROW () 341 void feed_signal_event (int signum) throw ()
335 { 342 {
336 ev_feed_signal_event (EV_AX_ signum); 343 ev_feed_signal_event (EV_AX_ signum);
337 } 344 }
338 345
339#if EV_MULTIPLICITY 346#if EV_MULTIPLICITY
… …
341#endif 348#endif
342 349
343 }; 350 };
344 351
345#if EV_MULTIPLICITY 352#if EV_MULTIPLICITY
346 struct dynamic_loop: loop_ref 353 struct dynamic_loop : loop_ref
347 { 354 {
348 355
349 dynamic_loop (unsigned int flags = AUTO) EV_THROW (bad_loop) 356 dynamic_loop (unsigned int flags = AUTO) throw (bad_loop)
350 : loop_ref (ev_loop_new (flags)) 357 : loop_ref (ev_loop_new (flags))
351 {
352 } 358 {
359 if (!EV_AX)
360 throw bad_loop ();
361 }
353 362
354 ~dynamic_loop () EV_THROW () 363 ~dynamic_loop () throw ()
355 { 364 {
356 ev_loop_destroy (EV_AX); 365 ev_loop_destroy (EV_AX);
357 EV_AX = 0; 366 EV_AX = 0;
358 } 367 }
359 368
… …
364 dynamic_loop & operator= (const dynamic_loop &); 373 dynamic_loop & operator= (const dynamic_loop &);
365 374
366 }; 375 };
367#endif 376#endif
368 377
369 struct default_loop: loop_ref 378 struct default_loop : loop_ref
370 { 379 {
371
372 default_loop (unsigned int flags = AUTO) EV_THROW (bad_loop) 380 default_loop (unsigned int flags = AUTO) throw (bad_loop)
373#if EV_MULTIPLICITY 381#if EV_MULTIPLICITY
374 : loop_ref (ev_default_loop (flags)) 382 : loop_ref (ev_default_loop (flags))
375 { 383#endif
376 } 384 {
385 if (
386#if EV_MULTIPLICITY
387 !EV_AX
377#else 388#else
378 {
379 #if EV_CXX_EXCEPTIONS
380 int r =
381 #endif
382 ev_default_loop (flags); 389 !ev_default_loop (flags)
383 #if EV_CXX_EXCEPTIONS 390#endif
384 if (!r) 391 )
385 throw bad_loop (); 392 throw bad_loop ();
386 #endif
387 }
388#endif
389
390 ~default_loop () EV_THROW ()
391 {
392 ev_default_destroy ();
393#if EV_MULTIPLICITY
394 EV_AX = 0;
395#endif
396 } 393 }
397 394
398 private: 395 private:
399
400 default_loop (const default_loop &); 396 default_loop (const default_loop &);
401
402 default_loop & operator= (const default_loop &); 397 default_loop &operator = (const default_loop &);
403
404 }; 398 };
405 399
406 inline loop_ref get_default_loop () EV_THROW () 400 inline loop_ref get_default_loop () throw ()
407 { 401 {
408#if EV_MULTIPLICITY 402#if EV_MULTIPLICITY
409 return ev_default_loop (0); 403 return ev_default_loop (0);
410#else 404#else
411 return loop_ref (); 405 return loop_ref ();
… …
429 struct base : ev_watcher 423 struct base : ev_watcher
430 { 424 {
431 #if EV_MULTIPLICITY 425 #if EV_MULTIPLICITY
432 EV_PX; 426 EV_PX;
433 427
428 // loop set
434 void set (EV_PX) EV_THROW () 429 void set (EV_P) throw ()
435 { 430 {
436 this->EV_A = EV_A; 431 this->EV_A = EV_A;
437 } 432 }
438 #endif 433 #endif
439 434
440 base (EV_PX) EV_THROW () 435 base (EV_PX) throw ()
441 #if EV_MULTIPLICITY 436 #if EV_MULTIPLICITY
442 : EV_A (EV_A) 437 : EV_A (EV_A)
443 #endif 438 #endif
444 { 439 {
445 ev_init (this, 0); 440 ev_init (this, 0);
446 } 441 }
447 442
448 void set_ (void *data, void (*cb)(EV_P_ ev_watcher *w, int revents)) EV_THROW () 443 void set_ (const void *data, void (*cb)(EV_P_ ev_watcher *w, int revents)) throw ()
449 { 444 {
450 this->data = data; 445 this->data = (void *)data;
451 ev_set_cb (static_cast<ev_watcher *>(this), cb); 446 ev_set_cb (static_cast<ev_watcher *>(this), cb);
447 }
448
449 // function callback
450 template<void (*function)(watcher &w, int)>
451 void set (void *data = 0) throw ()
452 {
453 set_ (data, function_thunk<function>);
454 }
455
456 template<void (*function)(watcher &w, int)>
457 static void function_thunk (EV_P_ ev_watcher *w, int revents)
458 {
459 function
460 (*static_cast<watcher *>(w), revents);
452 } 461 }
453 462
454 // method callback 463 // method callback
455 template<class K, void (K::*method)(watcher &w, int)> 464 template<class K, void (K::*method)(watcher &w, int)>
456 void set (K *object) EV_THROW () 465 void set (K *object) throw ()
457 { 466 {
458 set_ (object, method_thunk<K, method>); 467 set_ (object, method_thunk<K, method>);
468 }
469
470 // default method == operator ()
471 template<class K>
472 void set (K *object) throw ()
473 {
474 set_ (object, method_thunk<K, &K::operator ()>);
459 } 475 }
460 476
461 template<class K, void (K::*method)(watcher &w, int)> 477 template<class K, void (K::*method)(watcher &w, int)>
462 static void method_thunk (EV_P_ ev_watcher *w, int revents) 478 static void method_thunk (EV_P_ ev_watcher *w, int revents)
463 { 479 {
464 K *obj = static_cast<K *>(w->data); 480 (static_cast<K *>(w->data)->*method)
465 (obj->*method) (*static_cast<watcher *>(w), revents);
466 }
467
468 // const method callback
469 template<class K, void (K::*method)(watcher &w, int) const>
470 void set (const K *object) EV_THROW ()
471 {
472 set_ (object, const_method_thunk<K, method>);
473 }
474
475 template<class K, void (K::*method)(watcher &w, int) const>
476 static void const_method_thunk (EV_P_ ev_watcher *w, int revents)
477 {
478 K *obj = static_cast<K *>(w->data);
479 (static_cast<K *>(w->data)->*method) (*static_cast<watcher *>(w), revents);
480 }
481
482 // function callback
483 template<void (*function)(watcher &w, int)>
484 void set (void *data = 0) EV_THROW ()
485 {
486 set_ (data, function_thunk<function>);
487 }
488
489 template<void (*function)(watcher &w, int)>
490 static void function_thunk (EV_P_ ev_watcher *w, int revents)
491 {
492 function (*static_cast<watcher *>(w), revents); 481 (*static_cast<watcher *>(w), revents);
493 } 482 }
494 483
495 // simple callback 484 // no-argument callback
496 template<class K, void (K::*method)()> 485 template<class K, void (K::*method)()>
497 void set (K *object) EV_THROW () 486 void set (K *object) throw ()
498 { 487 {
499 set_ (object, method_noargs_thunk<K, method>); 488 set_ (object, method_noargs_thunk<K, method>);
500 } 489 }
501 490
502 template<class K, void (K::*method)()> 491 template<class K, void (K::*method)()>
503 static void method_noargs_thunk (EV_P_ ev_watcher *w, int revents) 492 static void method_noargs_thunk (EV_P_ ev_watcher *w, int revents)
504 { 493 {
505 K *obj = static_cast<K *>(w->data); 494 (static_cast<K *>(w->data)->*method)
506 (obj->*method) (); 495 ();
507 } 496 }
508 497
509 void operator ()(int events = EV_UNDEF) 498 void operator ()(int events = EV_UNDEF)
510 { 499 {
500 return
511 return ev_cb (static_cast<ev_watcher *>(this)) 501 ev_cb (static_cast<ev_watcher *>(this))
512 (static_cast<ev_watcher *>(this), events); 502 (static_cast<ev_watcher *>(this), events);
513 } 503 }
514 504
515 bool is_active () const EV_THROW () 505 bool is_active () const throw ()
516 { 506 {
517 return ev_is_active (static_cast<const ev_watcher *>(this)); 507 return ev_is_active (static_cast<const ev_watcher *>(this));
518 } 508 }
519 509
520 bool is_pending () const EV_THROW () 510 bool is_pending () const throw ()
521 { 511 {
522 return ev_is_pending (static_cast<const ev_watcher *>(this)); 512 return ev_is_pending (static_cast<const ev_watcher *>(this));
523 } 513 }
524 514
525 void feed_event (int revents) EV_THROW () 515 void feed_event (int revents) throw ()
526 { 516 {
527 ev_feed_event (EV_A_ static_cast<const ev_watcher *>(this), revents); 517 ev_feed_event (EV_A_ static_cast<const ev_watcher *>(this), revents);
528 } 518 }
529 }; 519 };
530 520
531 inline tstamp now () EV_THROW () 521 inline tstamp now () throw ()
532 { 522 {
533 return ev_time (); 523 return ev_time ();
534 } 524 }
535 525
536 inline void delay (tstamp interval) EV_THROW () 526 inline void delay (tstamp interval) throw ()
537 { 527 {
538 ev_sleep (interval); 528 ev_sleep (interval);
539 } 529 }
540 530
541 inline int version_major () EV_THROW () 531 inline int version_major () throw ()
542 { 532 {
543 return ev_version_major (); 533 return ev_version_major ();
544 } 534 }
545 535
546 inline int version_minor () EV_THROW () 536 inline int version_minor () throw ()
547 { 537 {
548 return ev_version_minor (); 538 return ev_version_minor ();
549 } 539 }
550 540
551 inline unsigned int supported_backends () EV_THROW () 541 inline unsigned int supported_backends () throw ()
552 { 542 {
553 return ev_supported_backends (); 543 return ev_supported_backends ();
554 } 544 }
555 545
556 inline unsigned int recommended_backends () EV_THROW () 546 inline unsigned int recommended_backends () throw ()
557 { 547 {
558 return ev_recommended_backends (); 548 return ev_recommended_backends ();
559 } 549 }
560 550
561 inline unsigned int embeddable_backends () EV_THROW () 551 inline unsigned int embeddable_backends () throw ()
562 { 552 {
563 return ev_embeddable_backends (); 553 return ev_embeddable_backends ();
564 } 554 }
565 555
566 inline void set_allocator (void *(*cb)(void *ptr, long size)) EV_THROW () 556 inline void set_allocator (void *(*cb)(void *ptr, long size)) throw ()
567 { 557 {
568 ev_set_allocator (cb); 558 ev_set_allocator (cb);
569 } 559 }
570 560
571 inline void set_syserr_cb (void (*cb)(const char *msg)) EV_THROW () 561 inline void set_syserr_cb (void (*cb)(const char *msg)) throw ()
572 { 562 {
573 ev_set_syserr_cb (cb); 563 ev_set_syserr_cb (cb);
574 } 564 }
575 565
576 #if EV_MULTIPLICITY 566 #if EV_MULTIPLICITY
577 #define EV_CONSTRUCT(cppstem,cstem) \ 567 #define EV_CONSTRUCT(cppstem,cstem) \
578 (EV_PX = get_default_loop ()) EV_THROW () \ 568 (EV_PX = get_default_loop ()) throw () \
579 : base<ev_ ## cstem, cppstem> (EV_A) \ 569 : base<ev_ ## cstem, cppstem> (EV_A) \
580 { \ 570 { \
581 } 571 }
582 #else 572 #else
583 #define EV_CONSTRUCT(cppstem,cstem) \ 573 #define EV_CONSTRUCT(cppstem,cstem) \
584 () EV_THROW () \ 574 () throw () \
585 { \ 575 { \
586 } 576 }
587 #endif 577 #endif
588 578
589 /* using a template here would require quite a bit more lines, 579 /* using a template here would require quite a bit more lines,
590 * so a macro solution was chosen */ 580 * so a macro solution was chosen */
591 #define EV_BEGIN_WATCHER(cppstem,cstem) \ 581 #define EV_BEGIN_WATCHER(cppstem,cstem) \
592 \ 582 \
593 struct cppstem : base<ev_ ## cstem, cppstem> \ 583 struct cppstem : base<ev_ ## cstem, cppstem> \
594 { \ 584 { \
595 void start () EV_THROW () \ 585 void start () throw () \
596 { \ 586 { \
597 ev_ ## cstem ## _start (EV_A_ static_cast<ev_ ## cstem *>(this)); \ 587 ev_ ## cstem ## _start (EV_A_ static_cast<ev_ ## cstem *>(this)); \
598 } \ 588 } \
599 \ 589 \
600 void stop () EV_THROW () \ 590 void stop () throw () \
601 { \ 591 { \
602 ev_ ## cstem ## _stop (EV_A_ static_cast<ev_ ## cstem *>(this)); \ 592 ev_ ## cstem ## _stop (EV_A_ static_cast<ev_ ## cstem *>(this)); \
603 } \ 593 } \
604 \ 594 \
605 cppstem EV_CONSTRUCT(cppstem,cstem) \ 595 cppstem EV_CONSTRUCT(cppstem,cstem) \
606 \ 596 \
607 ~cppstem () EV_THROW () \ 597 ~cppstem () throw () \
608 { \ 598 { \
609 stop (); \ 599 stop (); \
610 } \ 600 } \
611 \ 601 \
612 using base<ev_ ## cstem, cppstem>::set; \ 602 using base<ev_ ## cstem, cppstem>::set; \
613 \ 603 \
614 private: \ 604 private: \
615 \ 605 \
616 cppstem (const cppstem &o); \ 606 cppstem (const cppstem &o); \
617 \ 607 \
618 cppstem & operator =(const cppstem &o); \ 608 cppstem &operator =(const cppstem &o); \
619 \ 609 \
620 public: 610 public:
621 611
622 #define EV_END_WATCHER(cppstem,cstem) \ 612 #define EV_END_WATCHER(cppstem,cstem) \
623 }; 613 };
624 614
625 EV_BEGIN_WATCHER (io, io) 615 EV_BEGIN_WATCHER (io, io)
626 void set (int fd, int events) EV_THROW () 616 void set (int fd, int events) throw ()
627 { 617 {
628 int active = is_active (); 618 int active = is_active ();
629 if (active) stop (); 619 if (active) stop ();
630 ev_io_set (static_cast<ev_io *>(this), fd, events); 620 ev_io_set (static_cast<ev_io *>(this), fd, events);
631 if (active) start (); 621 if (active) start ();
632 } 622 }
633 623
634 void set (int events) EV_THROW () 624 void set (int events) throw ()
635 { 625 {
636 int active = is_active (); 626 int active = is_active ();
637 if (active) stop (); 627 if (active) stop ();
638 ev_io_set (static_cast<ev_io *>(this), fd, events); 628 ev_io_set (static_cast<ev_io *>(this), fd, events);
639 if (active) start (); 629 if (active) start ();
640 } 630 }
641 631
642 void start (int fd, int events) EV_THROW () 632 void start (int fd, int events) throw ()
643 { 633 {
644 set (fd, events); 634 set (fd, events);
645 start (); 635 start ();
646 } 636 }
647 EV_END_WATCHER (io, io) 637 EV_END_WATCHER (io, io)
648 638
649 EV_BEGIN_WATCHER (timer, timer) 639 EV_BEGIN_WATCHER (timer, timer)
650 void set (ev_tstamp after, ev_tstamp repeat = 0.) EV_THROW () 640 void set (ev_tstamp after, ev_tstamp repeat = 0.) throw ()
651 { 641 {
652 int active = is_active (); 642 int active = is_active ();
653 if (active) stop (); 643 if (active) stop ();
654 ev_timer_set (static_cast<ev_timer *>(this), after, repeat); 644 ev_timer_set (static_cast<ev_timer *>(this), after, repeat);
655 if (active) start (); 645 if (active) start ();
656 } 646 }
657 647
658 void start (ev_tstamp after, ev_tstamp repeat = 0.) EV_THROW () 648 void start (ev_tstamp after, ev_tstamp repeat = 0.) throw ()
659 { 649 {
660 set (after, repeat); 650 set (after, repeat);
661 start (); 651 start ();
662 } 652 }
663 653
664 void again () EV_THROW () 654 void again () throw ()
665 { 655 {
666 ev_timer_again (EV_A_ static_cast<ev_timer *>(this)); 656 ev_timer_again (EV_A_ static_cast<ev_timer *>(this));
657 }
658
659 ev_tstamp remaining ()
660 {
661 return ev_timer_remaining (EV_A_ static_cast<ev_timer *>(this));
667 } 662 }
668 EV_END_WATCHER (timer, timer) 663 EV_END_WATCHER (timer, timer)
669 664
670 #if EV_PERIODIC_ENABLE 665 #if EV_PERIODIC_ENABLE
671 EV_BEGIN_WATCHER (periodic, periodic) 666 EV_BEGIN_WATCHER (periodic, periodic)
672 void set (ev_tstamp at, ev_tstamp interval = 0.) EV_THROW () 667 void set (ev_tstamp at, ev_tstamp interval = 0.) throw ()
673 { 668 {
674 int active = is_active (); 669 int active = is_active ();
675 if (active) stop (); 670 if (active) stop ();
676 ev_periodic_set (static_cast<ev_periodic *>(this), at, interval, 0); 671 ev_periodic_set (static_cast<ev_periodic *>(this), at, interval, 0);
677 if (active) start (); 672 if (active) start ();
678 } 673 }
679 674
680 void start (ev_tstamp at, ev_tstamp interval = 0.) EV_THROW () 675 void start (ev_tstamp at, ev_tstamp interval = 0.) throw ()
681 { 676 {
682 set (at, interval); 677 set (at, interval);
683 start (); 678 start ();
684 } 679 }
685 680
686 void again () EV_THROW () 681 void again () throw ()
687 { 682 {
688 ev_periodic_again (EV_A_ static_cast<ev_periodic *>(this)); 683 ev_periodic_again (EV_A_ static_cast<ev_periodic *>(this));
689 } 684 }
690 EV_END_WATCHER (periodic, periodic) 685 EV_END_WATCHER (periodic, periodic)
691 #endif 686 #endif
692 687
688 #if EV_SIGNAL_ENABLE
693 EV_BEGIN_WATCHER (sig, signal) 689 EV_BEGIN_WATCHER (sig, signal)
694 void set (int signum) EV_THROW () 690 void set (int signum) throw ()
695 { 691 {
696 int active = is_active (); 692 int active = is_active ();
697 if (active) stop (); 693 if (active) stop ();
698 ev_signal_set (static_cast<ev_signal *>(this), signum); 694 ev_signal_set (static_cast<ev_signal *>(this), signum);
699 if (active) start (); 695 if (active) start ();
700 } 696 }
701 697
702 void start (int signum) EV_THROW () 698 void start (int signum) throw ()
703 { 699 {
704 set (signum); 700 set (signum);
705 start (); 701 start ();
706 } 702 }
707 EV_END_WATCHER (sig, signal) 703 EV_END_WATCHER (sig, signal)
704 #endif
708 705
706 #if EV_CHILD_ENABLE
709 EV_BEGIN_WATCHER (child, child) 707 EV_BEGIN_WATCHER (child, child)
710 void set (int pid) EV_THROW () 708 void set (int pid, int trace = 0) throw ()
711 { 709 {
712 int active = is_active (); 710 int active = is_active ();
713 if (active) stop (); 711 if (active) stop ();
714 ev_child_set (static_cast<ev_child *>(this), pid); 712 ev_child_set (static_cast<ev_child *>(this), pid, trace);
715 if (active) start (); 713 if (active) start ();
716 } 714 }
717 715
718 void start (int pid) EV_THROW () 716 void start (int pid, int trace = 0) throw ()
719 { 717 {
720 set (pid); 718 set (pid, trace);
721 start (); 719 start ();
722 } 720 }
723 EV_END_WATCHER (child, child) 721 EV_END_WATCHER (child, child)
722 #endif
724 723
725 #if EV_STAT_ENABLE 724 #if EV_STAT_ENABLE
726 EV_BEGIN_WATCHER (stat, stat) 725 EV_BEGIN_WATCHER (stat, stat)
727 void set (const char *path, ev_tstamp interval = 0.) EV_THROW () 726 void set (const char *path, ev_tstamp interval = 0.) throw ()
728 { 727 {
729 int active = is_active (); 728 int active = is_active ();
730 if (active) stop (); 729 if (active) stop ();
731 ev_stat_set (static_cast<ev_stat *>(this), path, interval); 730 ev_stat_set (static_cast<ev_stat *>(this), path, interval);
732 if (active) start (); 731 if (active) start ();
733 } 732 }
734 733
735 void start (const char *path, ev_tstamp interval = 0.) EV_THROW () 734 void start (const char *path, ev_tstamp interval = 0.) throw ()
736 { 735 {
737 stop (); 736 stop ();
738 set (path, interval); 737 set (path, interval);
739 start (); 738 start ();
740 } 739 }
741 740
742 void update () EV_THROW () 741 void update () throw ()
743 { 742 {
744 ev_stat_stat (EV_A_ static_cast<ev_stat *>(this)); 743 ev_stat_stat (EV_A_ static_cast<ev_stat *>(this));
745 } 744 }
746 EV_END_WATCHER (stat, stat) 745 EV_END_WATCHER (stat, stat)
747 #endif 746 #endif
748 747
748 #if EV_IDLE_ENABLE
749 EV_BEGIN_WATCHER (idle, idle) 749 EV_BEGIN_WATCHER (idle, idle)
750 void set () EV_THROW () { } 750 void set () throw () { }
751 EV_END_WATCHER (idle, idle) 751 EV_END_WATCHER (idle, idle)
752 #endif
752 753
754 #if EV_PREPARE_ENABLE
753 EV_BEGIN_WATCHER (prepare, prepare) 755 EV_BEGIN_WATCHER (prepare, prepare)
754 void set () EV_THROW () { } 756 void set () throw () { }
755 EV_END_WATCHER (prepare, prepare) 757 EV_END_WATCHER (prepare, prepare)
758 #endif
756 759
760 #if EV_CHECK_ENABLE
757 EV_BEGIN_WATCHER (check, check) 761 EV_BEGIN_WATCHER (check, check)
758 void set () EV_THROW () { } 762 void set () throw () { }
759 EV_END_WATCHER (check, check) 763 EV_END_WATCHER (check, check)
764 #endif
760 765
761 #if EV_EMBED_ENABLE 766 #if EV_EMBED_ENABLE
762 EV_BEGIN_WATCHER (embed, embed) 767 EV_BEGIN_WATCHER (embed, embed)
763 void start (struct ev_loop *embedded_loop) EV_THROW () 768 void set (struct ev_loop *embedded_loop) throw ()
764 { 769 {
765 stop (); 770 int active = is_active ();
771 if (active) stop ();
766 ev_embed_set (static_cast<ev_embed *>(this), embedded_loop); 772 ev_embed_set (static_cast<ev_embed *>(this), embedded_loop);
773 if (active) start ();
774 }
775
776 void start (struct ev_loop *embedded_loop) throw ()
777 {
778 set (embedded_loop);
767 start (); 779 start ();
768 } 780 }
769 781
770 void sweep () 782 void sweep ()
771 { 783 {
… …
774 EV_END_WATCHER (embed, embed) 786 EV_END_WATCHER (embed, embed)
775 #endif 787 #endif
776 788
777 #if EV_FORK_ENABLE 789 #if EV_FORK_ENABLE
778 EV_BEGIN_WATCHER (fork, fork) 790 EV_BEGIN_WATCHER (fork, fork)
779 void set () EV_THROW () { } 791 void set () throw () { }
780 EV_END_WATCHER (fork, fork) 792 EV_END_WATCHER (fork, fork)
793 #endif
794
795 #if EV_ASYNC_ENABLE
796 EV_BEGIN_WATCHER (async, async)
797 void send () throw ()
798 {
799 ev_async_send (EV_A_ static_cast<ev_async *>(this));
800 }
801
802 bool async_pending () throw ()
803 {
804 return ev_async_pending (static_cast<ev_async *>(this));
805 }
806 EV_END_WATCHER (async, async)
781 #endif 807 #endif
782 808
783 #undef EV_PX 809 #undef EV_PX
784 #undef EV_PX_ 810 #undef EV_PX_
785 #undef EV_CONSTRUCT 811 #undef EV_CONSTRUCT
786 #undef EV_BEGIN_WATCHER 812 #undef EV_BEGIN_WATCHER
787 #undef EV_END_WATCHER 813 #undef EV_END_WATCHER
788
789} 814}
790 815
791#undef EV_THROW
792
793#endif 816#endif
794 817

Diff Legend

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