ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/cfperl.h
(Generate patch)

Comparing deliantra/server/include/cfperl.h (file contents):
Revision 1.93 by root, Sun Jan 13 12:14:52 2008 UTC vs.
Revision 1.118 by root, Tue Apr 6 21:11:48 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 5 *
8 * Deliantra is free software: you can redistribute it and/or modify 6 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 7 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 8 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 9 * option) any later version.
12 * 10 *
13 * This program is distributed in the hope that it will be useful, 11 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 14 * GNU General Public License for more details.
17 * 15 *
18 * You should have received a copy of the GNU General Public License 16 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 17 * and the GNU General Public License along with this program. If not, see
18 * <http://www.gnu.org/licenses/>.
20 * 19 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 20 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 21 */
23 22
24// 23//
25// cfperl.h perl interface 24// cfperl.h perl interface
26// 25//
27#ifndef CFPERL_H__ 26#ifndef CFPERL_H__
28#define CFPERL_H__ 27#define CFPERL_H__
29 28
30#include <cstdarg>
31#include <cstdio>
32#include <bitset>
33
34using namespace std; 29using namespace std;
35 30
36#include <EXTERN.h> 31#include <EXTERN.h>
37#include <perl.h> 32#include <perl.h>
38#include <XSUB.h> 33#include <XSUB.h>
… …
50// optimisations/workaround for functions requiring my_perl in scope (anti-bloat) 45// optimisations/workaround for functions requiring my_perl in scope (anti-bloat)
51#undef localtime 46#undef localtime
52#undef srand48 47#undef srand48
53#undef drand48 48#undef drand48
54#undef srandom 49#undef srandom
50#undef opendir
55#undef readdir 51#undef readdir
52#undef closedir
56#undef getprotobyname 53#undef getprotobyname
57#undef gethostbyname 54#undef gethostbyname
58#undef ctime 55#undef ctime
59#undef strerror 56#undef strerror
60#undef _ 57#undef _
… …
79 76
80// some macros to simplify perl in-calls 77// some macros to simplify perl in-calls
81 78
82#define CHECK_ERROR \ 79#define CHECK_ERROR \
83 if (SvTRUE (ERRSV)) \ 80 if (SvTRUE (ERRSV)) \
84 LOG (llevError, "runtime error in %s: %s\n", __func__, SvPVutf8_nolen (ERRSV)); 81 LOG (llevError, "runtime error in %s: %s", __func__, SvPVutf8_nolen (ERRSV));
82
83inline int call_pvsv (const char *ob, I32 flags) { return call_pv (ob, flags); }
84inline int call_pvsv (SV *ob, I32 flags) { return call_sv (ob, flags); }
85 85
86#define CALL_BEGIN(args) dSP; ENTER; SAVETMPS; PUSHMARK (SP); EXTEND (SP, args) 86#define CALL_BEGIN(args) dSP; ENTER; SAVETMPS; PUSHMARK (SP); EXTEND (SP, args)
87#define CALL_ARG_SV(sv) PUSHs (sv_2mortal (sv)) // separate because no refcount inc 87#define CALL_ARG_SV(sv) PUSHs (sv_2mortal (sv)) // separate because no refcount inc
88#define CALL_ARG(expr) PUSHs (sv_2mortal (to_sv (expr))) 88#define CALL_ARG(expr) PUSHs (sv_2mortal (to_sv (expr)))
89#define CALL_CALL(name, flags) PUTBACK; int count = call_pv (name, (flags) | G_EVAL); SPAGAIN; 89#define CALL_CALL(name, flags) PUTBACK; int count = call_pvsv (name, (flags) | G_EVAL); SPAGAIN;
90#define CALL_END CHECK_ERROR; FREETMPS; LEAVE 90#define CALL_END PUTBACK; CHECK_ERROR; FREETMPS; LEAVE
91 91
92////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 92//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
93 93
94void cfperl_init (); 94void cfperl_init ();
95void cfperl_main (); 95void cfperl_main ();
96void cfperl_tick ();
96void cfperl_emergency_save (); 97void cfperl_emergency_save ();
97void cfperl_cleanup (int make_core); 98void cfperl_cleanup (int make_core);
98void cfperl_make_book (object *book, int level); 99void cfperl_make_book (object *book, int level);
99void cfperl_send_msg (client *ns, int color, const char *type, const char *msg); 100void cfperl_send_msg (client *ns, int color, const_utf8_string type, const_utf8_string msg);
100int cfperl_can_merge (object *ob1, object *ob2); 101int cfperl_can_merge (object *ob1, object *ob2);
102void cfperl_mapscript_activate (object *ob, int state, object *activator, object *originator = 0);
101 103
104bool is_match_expr (const_utf8_string expr);
105// applies the match expression and returns true if it matches
106bool match (const_utf8_string expr, object *ob, object *self = 0, object *source = 0, object *originator = 0);
107// same as above, but returns the first object found, or 0
108object *match_one (const_utf8_string expr, object *ob, object *self = 0, object *source = 0, object *originator = 0);
109
102////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 110//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
111
112#if IVSIZE >= 8
113 typedef IV val64;
114 typedef IV uval64;
115# define newSVval64 newSViv
116# define SvVAL64 SvIV
117# define newSVuval64 newSVuv
118# define SvUVAL64 SvUV
119#else
120 typedef double val64;
121 typedef double uval64;
122# define newSVval64 newSVnv
123# define SvVAL64 SvNV
124# define newSVuval64 newSVnv
125# define SvUVAL64 SvNV
126#endif
103 127
104extern tstamp runtime; // virtual server time, excluding time jumps and lag 128extern tstamp runtime; // virtual server time, excluding time jumps and lag
105extern tstamp NOW; // real time of current server tick 129extern tstamp NOW; // real time of current server tick
106 130
107enum event_klass 131enum event_klass
… …
164INTERFACE_CLASS (attachable) 188INTERFACE_CLASS (attachable)
165struct attachable : refcnt_base 189struct attachable : refcnt_base
166{ 190{
167 static MGVTBL vtbl; 191 static MGVTBL vtbl;
168 192
169 static unordered_vector<attachable *> mortals;
170 MTH static void check_mortals ();
171
172 enum { 193 enum {
173 F_DESTROYED = 0x01, 194 F_DESTROYED = 0x01,
174 F_DEBUG_TRACE = 0x02, 195 F_DEBUG_TRACE = 0x02,
175 }; 196 };
176 int ACC (RW, flags); 197 uint8 ACC (RW, attachable_flags);
198
199 static unordered_vector<attachable *> mortals;
200 MTH static void check_mortals ();
177 201
178 // object is delete'd after the refcount reaches 0 202 // object is delete'd after the refcount reaches 0
179 MTH int refcnt_cnt () const; 203 MTH int refcnt_cnt () const;
180 // check wether the object has died and destroy 204 // check wether the object has died and destroy
181 MTH void refcnt_chk () { if (expect_false (refcnt <= 0)) do_check (); } 205 MTH void refcnt_chk () { if (expect_false (refcnt <= 0)) do_check (); }
… …
184 // this politely asks everybody interested the reduce 208 // this politely asks everybody interested the reduce
185 // the refcount to 0 as soon as possible. 209 // the refcount to 0 as soon as possible.
186 MTH void destroy (); 210 MTH void destroy ();
187 211
188 // return wether an object was destroyed already 212 // return wether an object was destroyed already
189 MTH bool destroyed () const { return flags & F_DESTROYED; } 213 MTH bool destroyed () const { return attachable_flags & F_DESTROYED; }
190 214
191 virtual void gather_callbacks (AV *&callbacks, event_type event) const; 215 virtual void gather_callbacks (AV *&callbacks, event_type event) const;
192 216
193#if 0 217#if 0
194private: 218private:
… …
202 226
203 void sever_self (); // sever this object from its self, if it has one. 227 void sever_self (); // sever this object from its self, if it has one.
204 void optimise (); // possibly save some memory by destroying unneeded data 228 void optimise (); // possibly save some memory by destroying unneeded data
205 229
206 attachable () 230 attachable ()
207 : flags (0), self (0), cb (0), attach (0) 231 : attachable_flags (0), self (0), cb (0), attach (0)
208 { 232 {
209 } 233 }
210 234
211 attachable (const attachable &src) 235 attachable (const attachable &src)
212 : flags (0), self (0), cb (0), attach (src.attach) 236 : attachable_flags (0), self (0), cb (0), attach (src.attach)
213 { 237 {
214 } 238 }
215 239
216 // set a custom key to the given value, or delete it if value = 0 240 // set a custom key to the given value, or delete it if value = 0
217 void set_key (const char *key, const char *value = 0, bool is_utf8 = 0); 241 void set_key (const_utf8_string key, const_utf8_string value = 0, bool is_utf8 = 0);
218 242
219 void set_key_text (const char *key, const char *value = 0) 243 void set_key_text (const_utf8_string key, const_utf8_string value = 0)
220 { 244 {
221 set_key (key, value, 1); 245 set_key (key, value, 1);
222 } 246 }
223 247
224 void set_key_data (const char *key, const char *value = 0) 248 void set_key_data (const_utf8_string key, const_utf8_string value = 0)
225 { 249 {
226 set_key (key, value, 0); 250 set_key (key, value, 0);
227 } 251 }
228 252
229 attachable &operator =(const attachable &src); 253 attachable &operator =(const attachable &src);
230 254
231 // used to _quickly_ device wether to shortcut the evaluation 255 // used to _quickly_ decide wether to shortcut the evaluation
232 bool should_invoke (event_type event) 256 bool should_invoke (event_type event)
233 { 257 {
234 return ev_want_event [event] || cb; 258 return ev_want_event [event] || cb;
235 } 259 }
236 260
… …
258 282
259extern struct global gbl_ev; 283extern struct global gbl_ev;
260 284
261////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 285//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
262 286
287// a little dirty hack, maybe unify with something else at a later time
288struct keyword_string
289{
290 const char *s;
291 const int l;
292
293 keyword_string (const char *s, int l)
294 : s(s), l(l)
295 { }
296
297 keyword_string (keyword kw)
298 : s(keyword_str [kw]), l(keyword_len [kw])
299 {
300 }
301
302 keyword_string (shstr_tmp sh)
303 : s(&sh), l(sh.length ())
304 {
305 }
306};
307
308#define CS(keyword) keyword_string (# keyword, sizeof (# keyword) - 1)
309#define KW(keyword) CS(keyword)
310
263INTERFACE_CLASS(object_freezer) 311INTERFACE_CLASS(object_freezer)
264struct object_freezer : dynbuf_text 312struct object_freezer : dynbuf_text
265{ 313{
266 AV *av; 314 AV *av;
267 315
268 object_freezer (); 316 object_freezer ();
269 ~object_freezer (); 317 ~object_freezer ();
270 318
319 // serialise perl part
271 void put (attachable *ext); 320 void put_ (attachable *ext);
272 321 void put (attachable *ext)
273 // used only for user-defined key-value pairs
274 void put (const shstr &k, const shstr &v)
275 { 322 {
276 add (k); 323 if (expect_false (ext->self))
324 put_ (ext);
325 }
277 326
327 // null value (== no space after keyword)
328 void put (const keyword_string k)
329 {
330 char *p = force (k.l + 1);
331 memcpy (p, k.s, k.l); p += k.l; *p++ = '\n';
332 alloc (p);
333 }
334
335 void put (const keyword_string k, const keyword_string v)
336 {
337 char *p = force (k.l + 1 + v.l + 1);
338 memcpy (p, k.s, k.l); p += k.l; *p++ = ' ';
339 memcpy (p, v.s, v.l); p += v.l; *p++ = '\n';
340 alloc (p);
341 }
342
343 void put (const keyword_string k, const_utf8_string v)
344 {
278 if (expect_true (v)) 345 if (expect_true (v))
279 add (' '), add (v); 346 put (k, keyword_string (v, strlen (v)));
280 347 else
281 add ('\n'); 348 put (k);
282 } 349 }
283 350
284 template<typename T> 351 void put (const keyword_string k, shstr_tmp v)
285 void put_kw_string (keyword k, const T &v)
286 { 352 {
287 int klen = keyword_len [k]; 353 put (k, keyword_string (v));
288 int vlen = v ? strlen (v) + 1 : 0;
289
290 char *p = (char *)alloc (klen + vlen + 1);
291
292 memcpy (p, keyword_str [k], klen); p += klen;
293
294 if (expect_true (v))
295 {
296 *p++ = ' '; vlen--;
297 memcpy (p, v, vlen); p += vlen;
298 }
299
300 *p = '\n';
301 } 354 }
302 355
303 void put (keyword k, const char *v = 0)
304 {
305 put_kw_string (k, v);
306 }
307
308 void put (keyword k, const shstr &v)
309 {
310 put_kw_string (k, v);
311 }
312
313 void put (keyword k, double v) 356 void put (const keyword_string k, double v)
314 { 357 {
315 force (MAX_KEYWORD_LEN + 2 + 32); 358 char *p = force (MAX_KEYWORD_LEN + 2 + 32);
316 fadd (keyword_str [k], keyword_len [k]); 359 memcpy (p, k.s, k.l); p += k.l; *p++ = ' ';
317 fadd (' '); 360 p += sprintf (p, "%.7g", v); *p++ = '\n';
318 falloc (sprintf (ptr, "%.7g", v)); 361 alloc (p);
319 fadd ('\n');
320 } 362 }
321 363
322 void put_(keyword k, sint64 v) 364 void put_(const keyword_string k, sint64 v)
323 { 365 {
324 force (MAX_KEYWORD_LEN + 2 + sint64_digits); 366 force (MAX_KEYWORD_LEN + 2 + sint64_digits);
325 fadd (keyword_str [k], keyword_len [k]); 367 fadd (k.s, k.l);
326 fadd (' '); 368 fadd (' ');
327 add (v); 369 add (v);
328 fadd ('\n'); 370 fadd ('\n');
329 } 371 }
330 372
331 void put_(keyword k, sint32 v) 373 void put_(const keyword_string k, sint32 v)
332 { 374 {
333 force (MAX_KEYWORD_LEN + 2 + sint32_digits); 375 force (MAX_KEYWORD_LEN + 2 + sint32_digits);
334 fadd (keyword_str [k], keyword_len [k]); 376 fadd (k.s, k.l);
335 fadd (' '); 377 fadd (' ');
336 add (v); 378 add (v);
337 fadd ('\n'); 379 fadd ('\n');
338 } 380 }
339 381
340 void put (keyword k, float v) { put (k, (double)v); } 382 void put (const keyword_string k, float v) { put (k, (double)v); }
341 void put (keyword k, signed char v) { put_(k, (sint32)v); } 383 void put (const keyword_string k, signed char v) { put_(k, (sint32)v); }
342 void put (keyword k, unsigned char v) { put_(k, (sint32)v); } 384 void put (const keyword_string k, unsigned char v) { put_(k, (sint32)v); }
343 void put (keyword k, signed short v) { put_(k, (sint32)v); } 385 void put (const keyword_string k, signed short v) { put_(k, (sint32)v); }
344 void put (keyword k, unsigned short v) { put_(k, (sint32)v); } 386 void put (const keyword_string k, unsigned short v) { put_(k, (sint32)v); }
345 void put (keyword k, signed int v) { put_(k, (sint32)v); } 387 void put (const keyword_string k, signed int v) { put_(k, (sint32)v); }
346 void put (keyword k, unsigned int v) { put_(k, (sint64)v); } 388 void put (const keyword_string k, unsigned int v) { put_(k, (sint64)v); }
347 void put (keyword k, signed long v) { put_(k, (sint64)v); } 389 void put (const keyword_string k, signed long v) { put_(k, (sint64)v); }
348 void put (keyword k, unsigned long v) { put_(k, (sint64)v); } 390 void put (const keyword_string k, unsigned long v) { put_(k, (sint64)v); }
349 void put (keyword k, signed long long v) { put_(k, (sint64)v); } 391 void put (const keyword_string k, signed long long v) { put_(k, (sint64)v); }
350 void put (keyword k, unsigned long long v) { put_(k, (sint64)v); } 392 void put (const keyword_string k, unsigned long long v) { put_(k, (sint64)v); }
351 393
352 void put (keyword kbeg, keyword kend, const shstr &v) 394 void put (const keyword_string kbeg, const keyword_string kend, shstr_tmp v)
353 { 395 {
354 force (MAX_KEYWORD_LEN + 1); 396 force (MAX_KEYWORD_LEN + 1);
355 fadd (keyword_str [kbeg], keyword_len [kbeg]); fadd ('\n'); 397 fadd (kbeg.s, kbeg.l); fadd ('\n');
356 398
357 if (expect_true (v)) 399 if (expect_true (v))
358 { 400 {
359 add (v); 401 add (v);
360 add ('\n'); 402 add ('\n');
361 } 403 }
362 404
363 force (MAX_KEYWORD_LEN + 1); 405 force (MAX_KEYWORD_LEN + 1);
364 fadd (keyword_str [kend], keyword_len [kend]); fadd ('\n'); 406 fadd (kend.s, kend.l); fadd ('\n');
365 } 407 }
366 408
367 void put (keyword k, archetype *v); 409 void put (const keyword_string k, archetype *v);
368 void put (keyword k, treasurelist *v); 410 void put (const keyword_string k, treasurelist *v);
369 void put (keyword k, faceinfo *v); 411 void put (const keyword_string k, faceinfo *v);
370 412
371 template<typename T> 413 template<typename T>
372 void put (keyword k, const refptr<T> &v) 414 void put (const keyword_string k, const refptr<T> &v)
373 { 415 {
374 put (k, (T *)v); 416 put (k, (T *)v);
375 } 417 }
376 418
377 MTH bool save (const_octet_string path); 419 MTH bool save (const_octet_string path);
378 char *as_string (); // like strdup 420 utf8_string as_string (); // like strdup
379 421
380 operator bool () { return !!av; } 422 operator bool () { return !!av; }
381}; 423};
382 424
383INTERFACE_CLASS(object_thawer) 425INTERFACE_CLASS(object_thawer)
… …
393 const char *value_nn; // the value, or the empty string if no value 435 const char *value_nn; // the value, or the empty string if no value
394 const char *name; 436 const char *name;
395 437
396 operator bool () const { return !!text; } 438 operator bool () const { return !!text; }
397 439
398 object_thawer (const char *path = 0); 440 object_thawer (const_utf8_string path = 0);
399 object_thawer (const char *data, AV *perlav); 441 object_thawer (const_utf8_string data, AV *perlav);
400 ~object_thawer (); 442 ~object_thawer ();
401 443
402 void get (attachable *obj, int oid); 444 void get (attachable *obj, int oid);
403 445
404 // parse next line 446 // parse next line
… …
406 // skip the current key-value (usually fetch next line, for 448 // skip the current key-value (usually fetch next line, for
407 // multiline-fields, skips till the corresponding end-kw 449 // multiline-fields, skips till the corresponding end-kw
408 MTH void skip (); 450 MTH void skip ();
409 MTH void skip_block (); // skips till and over KW_end 451 MTH void skip_block (); // skips till and over KW_end
410 452
411 char *get_str () { return value; } // may be 0 453 bool has_value () { return value; }
454 const_utf8_string get_str () { return value_nn; } // empty string when missing
412 void get_ml (keyword kend, shstr &sh); 455 void get_ml (keyword kend, shstr &sh);
413 456
414 void get_ornull (shstr &sh) const { sh = value; } 457 void get_ornull (shstr &sh) const { sh = value; }
415 void get (shstr &sh) const { sh = value; } // might want to check for non-null here 458 void get (shstr &sh) const { sh = value; } // might want to check for non-null here
416 459
… …
430 void get (sint32 &i) { i = get_sint32 (); } 473 void get (sint32 &i) { i = get_sint32 (); }
431 474
432 void get (uint32 &i) { i = get_sint64 (); } 475 void get (uint32 &i) { i = get_sint64 (); }
433 void get (sint64 &i) { i = get_sint64 (); } 476 void get (sint64 &i) { i = get_sint64 (); }
434 477
435 MTH void parse_warn (const char *msg); 478 MTH void parse_warn (const_utf8_string msg);
436 MTH bool parse_error (const char *type = 0, const char *name = 0, bool skip = true); 479 MTH bool parse_error (const_utf8_string type = 0, const_utf8_string name = 0, bool skip = true);
437 480
438 struct delayed_ref { 481 struct delayed_ref {
439 attachable *op; 482 attachable *op;
440 object_ptr *ptr; 483 object_ptr *ptr;
441 const char *ref; 484 const_utf8_string ref;
442 }; 485 };
443 std::vector<delayed_ref> delrefs; 486 std::vector<delayed_ref> delrefs;
444 487
445 void delayed_deref (attachable *op, object_ptr &ptr, const char *ref); 488 void delayed_deref (attachable *op, object_ptr &ptr, const_utf8_string ref);
446 MTH void resolve_delayed_derefs (bool deref = true); 489 MTH void resolve_delayed_derefs (bool deref = true);
447}; 490};
448 491
449//TODO: remove 492//TODO: remove
450char *fgets (char *s, int n, object_thawer &thawer); 493char *fgets (char *s, int n, object_thawer &thawer);
… …
452////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 495//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
453 496
454struct coroapi { 497struct coroapi {
455 static struct CoroAPI *GCoroAPI; 498 static struct CoroAPI *GCoroAPI;
456 499
500 static EV_ATOMIC_T cede_pending;
501
457 static int nready () { return CORO_NREADY; } 502 static int nready () { return CORO_NREADY; }
458 static int cede () { return CORO_CEDE ; } 503 static int cede () { cede_pending = 0; return CORO_CEDE ; }
459 504
460 static tstamp next_cede;
461 static int cede_counter;
462
463 static void do_cede_every ();
464 static void do_cede_to_tick (); 505 static void do_cede_to_tick ();
465 static void do_cede_to_tick_every ();
466 506
467 static void cede_every (int count) 507 // actually cede's far more often
468 {
469 if (expect_false (++cede_counter >= count))
470 do_cede_every ();
471 }
472
473 static bool cede_to_tick () 508 static bool cede_to_tick ()
474 { 509 {
475 if (expect_true (now () < next_cede)) 510 if (expect_true (!cede_pending))
476 return false; 511 return false;
477 512
478 do_cede_to_tick (); 513 do_cede_to_tick ();
479 return true; 514 return true;
480 }
481
482 static bool cede_to_tick_every (int count)
483 {
484 if (expect_true (++cede_counter < count))
485 return false;
486
487 return cede_to_tick ();
488 } 515 }
489 516
490 static void wait_for_tick (); 517 static void wait_for_tick ();
491 static void wait_for_tick_begin (); 518 static void wait_for_tick_begin ();
492}; 519};
… …
510 : callback<void (iow &, int)> (object, method) 537 : callback<void (iow &, int)> (object, method)
511 { 538 {
512 ev_init ((ev_io *)this, thunk); 539 ev_init ((ev_io *)this, thunk);
513 } 540 }
514 541
542 void prio (int prio)
543 {
544 ev_set_priority ((ev_io *)this, prio);
545 }
546
515 void set (int fd, int events) 547 void set (int fd, int events)
516 { 548 {
517 ev_io_set ((ev_io *)this, fd, events); 549 ev_io_set ((ev_io *)this, fd, events);
518 } 550 }
519 551
… …
535 { 567 {
536 stop (); 568 stop ();
537 } 569 }
538}; 570};
539 571
572struct asyncw : ev_async, evapi, callback<void (ev_async &, int)>
573{
574 static void thunk (EV_P_ struct ev_async *w_, int revents)
575 {
576 asyncw &w = *static_cast<asyncw *>(w_);
577
578 w (w, revents);
579 }
580
581 template<class O, class M>
582 asyncw (O object, M method)
583 : callback<void (asyncw &, int)> (object, method)
584 {
585 ev_init ((ev_async *)this, thunk);
586 }
587
588 void start ()
589 {
590 ev_async_start (EV_DEFAULT, (ev_async *)this);
591 }
592
593 void stop ()
594 {
595 ev_async_stop (EV_DEFAULT, (ev_async *)this);
596 }
597
598 ~asyncw ()
599 {
600 stop ();
601 }
602};
603
540#endif 604#endif
541 605

Diff Legend

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