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.87 by root, Thu Aug 16 06:36:56 2007 UTC vs.
Revision 1.118 by root, Tue Apr 6 21:11:48 2010 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT 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 <crossfire@schmorp.de> 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>
39 34
40#include <EventAPI.h> 35#include <EVAPI.h>
41#include <CoroAPI.h> 36#include <CoroAPI.h>
42 37
43#include "util.h" 38#include "util.h"
44#include "keyword.h" 39#include "keyword.h"
45#include "dynbuf.h" 40#include "dynbuf.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); 241 void set_key (const_utf8_string key, const_utf8_string value = 0, bool is_utf8 = 0);
242
243 void set_key_text (const_utf8_string key, const_utf8_string value = 0)
244 {
245 set_key (key, value, 1);
246 }
247
248 void set_key_data (const_utf8_string key, const_utf8_string value = 0)
249 {
250 set_key (key, value, 0);
251 }
218 252
219 attachable &operator =(const attachable &src); 253 attachable &operator =(const attachable &src);
220 254
221 // used to _quickly_ device wether to shortcut the evaluation 255 // used to _quickly_ decide wether to shortcut the evaluation
222 bool should_invoke (event_type event) 256 bool should_invoke (event_type event)
223 { 257 {
224 return ev_want_event [event] || cb; 258 return ev_want_event [event] || cb;
225 } 259 }
226 260
… …
248 282
249extern struct global gbl_ev; 283extern struct global gbl_ev;
250 284
251////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 285//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
252 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
311INTERFACE_CLASS(object_freezer)
253struct object_freezer : dynbuf_text 312struct object_freezer : dynbuf_text
254{ 313{
255 AV *av; 314 AV *av;
256 315
257 object_freezer (); 316 object_freezer ();
258 ~object_freezer (); 317 ~object_freezer ();
259 318
319 // serialise perl part
260 void put (attachable *ext); 320 void put_ (attachable *ext);
261 321 void put (attachable *ext)
262 // used only for user-defined key-value pairs
263 void put (const shstr &k, const shstr &v)
264 { 322 {
265 add (k); 323 if (expect_false (ext->self))
324 put_ (ext);
325 }
266 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 {
267 if (expect_true (v)) 345 if (expect_true (v))
268 add (' '), add (v); 346 put (k, keyword_string (v, strlen (v)));
269 347 else
270 add ('\n'); 348 put (k);
271 } 349 }
272 350
273 template<typename T> 351 void put (const keyword_string k, shstr_tmp v)
274 void put_kw_string (keyword k, const T &v)
275 { 352 {
276 int klen = keyword_len [k]; 353 put (k, keyword_string (v));
277 int vlen = v ? strlen (v) + 1 : 0;
278
279 char *p = (char *)alloc (klen + vlen + 1);
280
281 memcpy (p, keyword_str [k], klen); p += klen;
282
283 if (expect_true (v))
284 {
285 *p++ = ' '; vlen--;
286 memcpy (p, v, vlen); p += vlen;
287 }
288
289 *p = '\n';
290 } 354 }
291 355
292 void put (keyword k, const char *v = 0)
293 {
294 put_kw_string (k, v);
295 }
296
297 void put (keyword k, const shstr &v)
298 {
299 put_kw_string (k, v);
300 }
301
302 void put (keyword k, double v) 356 void put (const keyword_string k, double v)
303 { 357 {
304 force (MAX_KEYWORD_LEN + 2 + 32); 358 char *p = force (MAX_KEYWORD_LEN + 2 + 32);
305 fadd (keyword_str [k], keyword_len [k]); 359 memcpy (p, k.s, k.l); p += k.l; *p++ = ' ';
306 fadd (' '); 360 p += sprintf (p, "%.7g", v); *p++ = '\n';
307 falloc (sprintf (ptr, "%.7g", v)); 361 alloc (p);
308 fadd ('\n');
309 } 362 }
310 363
311 void put_(keyword k, sint64 v) 364 void put_(const keyword_string k, sint64 v)
312 { 365 {
313 force (MAX_KEYWORD_LEN + 2 + sint64_digits); 366 force (MAX_KEYWORD_LEN + 2 + sint64_digits);
314 fadd (keyword_str [k], keyword_len [k]); 367 fadd (k.s, k.l);
315 fadd (' '); 368 fadd (' ');
316 add (v); 369 add (v);
317 fadd ('\n'); 370 fadd ('\n');
318 } 371 }
319 372
320 void put_(keyword k, sint32 v) 373 void put_(const keyword_string k, sint32 v)
321 { 374 {
322 force (MAX_KEYWORD_LEN + 2 + sint32_digits); 375 force (MAX_KEYWORD_LEN + 2 + sint32_digits);
323 fadd (keyword_str [k], keyword_len [k]); 376 fadd (k.s, k.l);
324 fadd (' '); 377 fadd (' ');
325 add (v); 378 add (v);
326 fadd ('\n'); 379 fadd ('\n');
327 } 380 }
328 381
329 void put (keyword k, float v) { put (k, (double)v); } 382 void put (const keyword_string k, float v) { put (k, (double)v); }
330 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); }
331 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); }
332 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); }
333 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); }
334 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); }
335 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); }
336 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); }
337 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); }
338 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); }
339 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); }
340 393
341 void put (keyword kbeg, keyword kend, const shstr &v) 394 void put (const keyword_string kbeg, const keyword_string kend, shstr_tmp v)
342 { 395 {
343 force (MAX_KEYWORD_LEN + 1); 396 force (MAX_KEYWORD_LEN + 1);
344 fadd (keyword_str [kbeg], keyword_len [kbeg]); fadd ('\n'); 397 fadd (kbeg.s, kbeg.l); fadd ('\n');
345 398
346 if (expect_true (v)) 399 if (expect_true (v))
347 { 400 {
348 add (v); 401 add (v);
349 add ('\n'); 402 add ('\n');
350 } 403 }
351 404
352 force (MAX_KEYWORD_LEN + 1); 405 force (MAX_KEYWORD_LEN + 1);
353 fadd (keyword_str [kend], keyword_len [kend]); fadd ('\n'); 406 fadd (kend.s, kend.l); fadd ('\n');
354 } 407 }
355 408
356 void put (keyword k, archetype *v); 409 void put (const keyword_string k, archetype *v);
357 void put (keyword k, treasurelist *v); 410 void put (const keyword_string k, treasurelist *v);
358 void put (keyword k, faceinfo *v); 411 void put (const keyword_string k, faceinfo *v);
359 412
360 template<typename T> 413 template<typename T>
361 void put (keyword k, const refptr<T> &v) 414 void put (const keyword_string k, const refptr<T> &v)
362 { 415 {
363 put (k, (T *)v); 416 put (k, (T *)v);
364 } 417 }
365 418
366 bool save (const char *path); 419 MTH bool save (const_octet_string path);
367 char *as_string (); // like strdup 420 utf8_string as_string (); // like strdup
368 421
369 operator bool () { return !!av; } 422 operator bool () { return !!av; }
370}; 423};
371 424
425INTERFACE_CLASS(object_thawer)
372struct object_thawer 426struct object_thawer
373{ 427{
374 char *line; // current beginning of line 428 char *line; // current beginning of line
375 SV *text; // text part 429 SV *text; // text part
376 AV *av; // perl part 430 AV *av; // perl part
377 int linenum; 431 int linenum;
378 keyword kw; 432 keyword kw;
379 char *kw_str; // the keyword parsed, as string 433 char *kw_str; // the keyword parsed, as string
380 char *value; // the value, or 0 if no value 434 char *value; // the value, or 0 if no value
381 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
382 const char *name; 436 const char *name;
383 437
384 operator bool () { return !!text; } 438 operator bool () const { return !!text; }
385 439
386 object_thawer (const char *path = 0); 440 object_thawer (const_utf8_string path = 0);
387 object_thawer (const char *data, AV *perlav); 441 object_thawer (const_utf8_string data, AV *perlav);
388 ~object_thawer (); 442 ~object_thawer ();
389 443
390 void get (attachable *obj, int oid); 444 void get (attachable *obj, int oid);
391 445
392 // parse next line 446 // parse next line
393 void next (); 447 MTH void next ();
394 // skip the current key-value (usually fetch next line, for 448 // skip the current key-value (usually fetch next line, for
395 // multiline-fields, skips till the corresponding end-kw 449 // multiline-fields, skips till the corresponding end-kw
396 void skip (); 450 MTH void skip ();
451 MTH void skip_block (); // skips till and over KW_end
397 452
398 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
399 void get_ml (keyword kend, shstr &sh); 455 void get_ml (keyword kend, shstr &sh);
400 456
401 void get_ornull (shstr &sh) const { sh = value; } 457 void get_ornull (shstr &sh) const { sh = value; }
402 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
403 459
… …
417 void get (sint32 &i) { i = get_sint32 (); } 473 void get (sint32 &i) { i = get_sint32 (); }
418 474
419 void get (uint32 &i) { i = get_sint64 (); } 475 void get (uint32 &i) { i = get_sint64 (); }
420 void get (sint64 &i) { i = get_sint64 (); } 476 void get (sint64 &i) { i = get_sint64 (); }
421 477
422 void parse_warn (const char *msg); 478 MTH void parse_warn (const_utf8_string msg);
423 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);
480
481 struct delayed_ref {
482 attachable *op;
483 object_ptr *ptr;
484 const_utf8_string ref;
485 };
486 std::vector<delayed_ref> delrefs;
487
488 void delayed_deref (attachable *op, object_ptr &ptr, const_utf8_string ref);
489 MTH void resolve_delayed_derefs (bool deref = true);
424}; 490};
425 491
426//TODO: remove 492//TODO: remove
427char *fgets (char *s, int n, object_thawer &thawer); 493char *fgets (char *s, int n, object_thawer &thawer);
428 494
429////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 495//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
430 496
431struct coroapi { 497struct coroapi {
432 static struct CoroAPI *GCoroAPI; 498 static struct CoroAPI *GCoroAPI;
433 499
500 static EV_ATOMIC_T cede_pending;
501
434 static int nready () { return CORO_NREADY; } 502 static int nready () { return CORO_NREADY; }
435 static int cede () { return CORO_CEDE ; } 503 static int cede () { cede_pending = 0; return CORO_CEDE ; }
436 504
437 static tstamp next_cede;
438 static int cede_counter;
439
440 static void do_cede_every ();
441 static void do_cede_to_tick (); 505 static void do_cede_to_tick ();
442 static void do_cede_to_tick_every ();
443 506
444 static void cede_every (int count) 507 // actually cede's far more often
445 {
446 if (expect_false (++cede_counter >= count))
447 do_cede_every ();
448 }
449
450 static bool cede_to_tick () 508 static bool cede_to_tick ()
451 { 509 {
452 if (expect_true (now () < next_cede)) 510 if (expect_true (!cede_pending))
453 return false; 511 return false;
454 512
455 do_cede_to_tick (); 513 do_cede_to_tick ();
456 return true; 514 return true;
457 } 515 }
458 516
459 static bool cede_to_tick_every (int count)
460 {
461 if (expect_true (++cede_counter < count))
462 return false;
463
464 return cede_to_tick ();
465 }
466
467 static void wait_for_tick (); 517 static void wait_for_tick ();
468 static void wait_for_tick_begin (); 518 static void wait_for_tick_begin ();
469}; 519};
470 520
471struct watcher_base 521struct evapi
472{ 522{
473 static struct EventAPI *GEventAPI; 523 static struct EVAPI *GEVAPI;
474}; 524};
475 525
476template<class base>
477struct watcher : watcher_base
478{
479 base *pe;
480
481 void start (bool repeat = false) { GEventAPI->start ((pe_watcher *)pe, repeat); }
482 void stop (bool cancel_events = false) { GEventAPI->stop ((pe_watcher *)pe, cancel_events); }
483 void now () { GEventAPI->now ((pe_watcher *)pe); }
484 void suspend () { GEventAPI->suspend ((pe_watcher *)pe); }
485 void resume () { GEventAPI->resume ((pe_watcher *)pe); }
486
487 void prio (int new_prio) { ((pe_watcher *)pe)->prio = new_prio; }
488
489 ~watcher ()
490 {
491 cancel ();
492 }
493
494private:
495 void cancel () { GEventAPI->cancel ((pe_watcher *)pe); } // private
496};
497
498struct iw : watcher<pe_idle>, callback<void (iw &)>
499{
500 template<class O, class M>
501 iw (O object, M method)
502 : callback<void (iw &)> (object, method)
503 {
504 alloc ();
505 }
506
507private:
508 void alloc ();
509};
510
511struct iow : watcher<pe_io>, callback<void (iow &, int)> 526struct iow : ev_io, evapi, callback<void (iow &, int)>
512{ 527{
528 static void thunk (EV_P_ struct ev_io *w_, int revents)
529 {
530 iow &w = *static_cast<iow *>(w_);
531
532 w (w, revents);
533 }
534
513 template<class O, class M> 535 template<class O, class M>
514 iow (O object, M method) 536 iow (O object, M method)
515 : callback<void (iow &, int)> (object, method) 537 : callback<void (iow &, int)> (object, method)
516 { 538 {
517 alloc (); 539 ev_init ((ev_io *)this, thunk);
518 } 540 }
519 541
520 void fd (int fd); 542 void prio (int prio)
521 int poll (); 543 {
544 ev_set_priority ((ev_io *)this, prio);
545 }
546
547 void set (int fd, int events)
548 {
549 ev_io_set ((ev_io *)this, fd, events);
550 }
551
552 int poll () const { return events; }
553
522 void poll (int events); 554 void poll (int events);
523 555
524private: 556 void start ()
525 void alloc (); 557 {
558 ev_io_start (EV_DEFAULT, (ev_io *)this);
559 }
560
561 void stop ()
562 {
563 ev_io_stop (EV_DEFAULT, (ev_io *)this);
564 }
565
566 ~iow ()
567 {
568 stop ();
569 }
570};
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 }
526}; 602};
527 603
528#endif 604#endif
529 605

Diff Legend

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