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.88 by root, Thu Aug 30 07:28:25 2007 UTC vs.
Revision 1.120 by root, Mon Apr 12 05:22:38 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));
85 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
86// TODO: temporarily enabled pushstack/popstack for all calls from the core, to maybe fix object memleak?
87#define CALL_PUSH PUSHSTACKi (PERLSI_UNKNOWN)
88#define CALL_POP PUTBACK; POPSTACK; SPAGAIN
86#define CALL_BEGIN(args) dSP; ENTER; SAVETMPS; PUSHMARK (SP); EXTEND (SP, args) 89#define CALL_BEGIN(args) dSP; CALL_PUSH; ENTER; SAVETMPS; PUSHMARK (SP); EXTEND (SP, args)
87#define CALL_ARG_SV(sv) PUSHs (sv_2mortal (sv)) // separate because no refcount inc 90#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))) 91#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; 92#define CALL_CALL(name, flags) PUTBACK; int count = call_pvsv (name, (flags) | G_EVAL); SPAGAIN;
90#define CALL_END CHECK_ERROR; FREETMPS; LEAVE 93#define CALL_END PUTBACK; CHECK_ERROR; FREETMPS; LEAVE; CALL_POP
91 94
92////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 95//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
93 96
94void cfperl_init (); 97void cfperl_init ();
95void cfperl_main (); 98void cfperl_main ();
99void cfperl_tick ();
96void cfperl_emergency_save (); 100void cfperl_emergency_save ();
97void cfperl_cleanup (int make_core); 101void cfperl_cleanup (int make_core);
98void cfperl_make_book (object *book, int level); 102void cfperl_make_book (object *book, int level);
99void cfperl_send_msg (client *ns, int color, const char *type, const char *msg); 103void cfperl_send_msg (client *ns, int color, const_utf8_string type, const_utf8_string msg);
100int cfperl_can_merge (object *ob1, object *ob2); 104int cfperl_can_merge (object *ob1, object *ob2);
105void cfperl_mapscript_activate (object *ob, int state, object *activator, object *originator = 0);
101 106
107bool is_match_expr (const_utf8_string expr);
108// applies the match expression and returns true if it matches
109bool match (const_utf8_string expr, object *ob, object *self = 0, object *source = 0, object *originator = 0);
110// same as above, but returns the first object found, or 0
111object *match_one (const_utf8_string expr, object *ob, object *self = 0, object *source = 0, object *originator = 0);
112
102////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 113//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
114
115#if IVSIZE >= 8
116 typedef IV val64;
117 typedef IV uval64;
118# define newSVval64 newSViv
119# define SvVAL64 SvIV
120# define newSVuval64 newSVuv
121# define SvUVAL64 SvUV
122#else
123 typedef double val64;
124 typedef double uval64;
125# define newSVval64 newSVnv
126# define SvVAL64 SvNV
127# define newSVuval64 newSVnv
128# define SvUVAL64 SvNV
129#endif
103 130
104extern tstamp runtime; // virtual server time, excluding time jumps and lag 131extern tstamp runtime; // virtual server time, excluding time jumps and lag
105extern tstamp NOW; // real time of current server tick 132extern tstamp NOW; // real time of current server tick
106 133
107enum event_klass 134enum event_klass
… …
164INTERFACE_CLASS (attachable) 191INTERFACE_CLASS (attachable)
165struct attachable : refcnt_base 192struct attachable : refcnt_base
166{ 193{
167 static MGVTBL vtbl; 194 static MGVTBL vtbl;
168 195
169 static unordered_vector<attachable *> mortals;
170 MTH static void check_mortals ();
171
172 enum { 196 enum {
173 F_DESTROYED = 0x01, 197 F_DESTROYED = 0x01,
174 F_DEBUG_TRACE = 0x02, 198 F_DEBUG_TRACE = 0x02,
175 }; 199 };
176 int ACC (RW, flags); 200 uint8 ACC (RW, attachable_flags);
201
202 static unordered_vector<attachable *> mortals;
203 MTH static void check_mortals ();
177 204
178 // object is delete'd after the refcount reaches 0 205 // object is delete'd after the refcount reaches 0
179 MTH int refcnt_cnt () const; 206 MTH int refcnt_cnt () const;
180 // check wether the object has died and destroy 207 // check wether the object has died and destroy
181 MTH void refcnt_chk () { if (expect_false (refcnt <= 0)) do_check (); } 208 MTH void refcnt_chk () { if (expect_false (refcnt <= 0)) do_check (); }
… …
184 // this politely asks everybody interested the reduce 211 // this politely asks everybody interested the reduce
185 // the refcount to 0 as soon as possible. 212 // the refcount to 0 as soon as possible.
186 MTH void destroy (); 213 MTH void destroy ();
187 214
188 // return wether an object was destroyed already 215 // return wether an object was destroyed already
189 MTH bool destroyed () const { return flags & F_DESTROYED; } 216 MTH bool destroyed () const { return attachable_flags & F_DESTROYED; }
217
218 // destruct and free the memory for this object
219 virtual void do_delete ();
190 220
191 virtual void gather_callbacks (AV *&callbacks, event_type event) const; 221 virtual void gather_callbacks (AV *&callbacks, event_type event) const;
192 222
193#if 0 223#if 0
194private: 224private:
… …
202 232
203 void sever_self (); // sever this object from its self, if it has one. 233 void sever_self (); // sever this object from its self, if it has one.
204 void optimise (); // possibly save some memory by destroying unneeded data 234 void optimise (); // possibly save some memory by destroying unneeded data
205 235
206 attachable () 236 attachable ()
207 : flags (0), self (0), cb (0), attach (0) 237 : attachable_flags (0), self (0), cb (0), attach (0)
208 { 238 {
209 } 239 }
210 240
211 attachable (const attachable &src) 241 attachable (const attachable &src)
212 : flags (0), self (0), cb (0), attach (src.attach) 242 : attachable_flags (0), self (0), cb (0), attach (src.attach)
213 { 243 {
214 } 244 }
215 245
216 // set a custom key to the given value, or delete it if value = 0 246 // 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); 247 void set_key (const_utf8_string key, const_utf8_string value = 0, bool is_utf8 = 0);
218 248
219 void set_key_text (const char *key, const char *value = 0) 249 void set_key_text (const_utf8_string key, const_utf8_string value = 0)
220 { 250 {
221 set_key (key, value, 1); 251 set_key (key, value, 1);
222 } 252 }
223 253
224 void set_key_data (const char *key, const char *value = 0) 254 void set_key_data (const_utf8_string key, const_utf8_string value = 0)
225 { 255 {
226 set_key (key, value, 0); 256 set_key (key, value, 0);
227 } 257 }
228 258
229 attachable &operator =(const attachable &src); 259 attachable &operator =(const attachable &src);
230 260
231 // used to _quickly_ device wether to shortcut the evaluation 261 // used to _quickly_ decide wether to shortcut the evaluation
232 bool should_invoke (event_type event) 262 bool should_invoke (event_type event)
233 { 263 {
234 return ev_want_event [event] || cb; 264 return ev_want_event [event] || cb;
235 } 265 }
236 266
… …
258 288
259extern struct global gbl_ev; 289extern struct global gbl_ev;
260 290
261////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 291//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
262 292
293// a little dirty hack, maybe unify with something else at a later time
294struct keyword_string
295{
296 const char *s;
297 const int l;
298
299 keyword_string (const char *s, int l)
300 : s(s), l(l)
301 { }
302
303 keyword_string (keyword kw)
304 : s(keyword_str [kw]), l(keyword_len [kw])
305 {
306 }
307
308 keyword_string (shstr_tmp sh)
309 : s(&sh), l(sh.length ())
310 {
311 }
312};
313
314#define CS(keyword) keyword_string (# keyword, sizeof (# keyword) - 1)
315#define KW(keyword) CS(keyword)
316
317INTERFACE_CLASS(object_freezer)
263struct object_freezer : dynbuf_text 318struct object_freezer : dynbuf_text
264{ 319{
265 AV *av; 320 AV *av;
266 321
267 object_freezer (); 322 object_freezer ();
268 ~object_freezer (); 323 ~object_freezer ();
269 324
325 // serialise perl part
270 void put (attachable *ext); 326 void put_ (attachable *ext);
271 327 void put (attachable *ext)
272 // used only for user-defined key-value pairs
273 void put (const shstr &k, const shstr &v)
274 { 328 {
275 add (k); 329 if (expect_false (ext->self))
330 put_ (ext);
331 }
276 332
333 // null value (== no space after keyword)
334 void put (const keyword_string k)
335 {
336 char *p = force (k.l + 1);
337 memcpy (p, k.s, k.l); p += k.l; *p++ = '\n';
338 alloc (p);
339 }
340
341 void put (const keyword_string k, const keyword_string v)
342 {
343 char *p = force (k.l + 1 + v.l + 1);
344 memcpy (p, k.s, k.l); p += k.l; *p++ = ' ';
345 memcpy (p, v.s, v.l); p += v.l; *p++ = '\n';
346 alloc (p);
347 }
348
349 void put (const keyword_string k, const_utf8_string v)
350 {
277 if (expect_true (v)) 351 if (expect_true (v))
278 add (' '), add (v); 352 put (k, keyword_string (v, strlen (v)));
279 353 else
280 add ('\n'); 354 put (k);
281 } 355 }
282 356
283 template<typename T> 357 void put (const keyword_string k, shstr_tmp v)
284 void put_kw_string (keyword k, const T &v)
285 { 358 {
286 int klen = keyword_len [k]; 359 put (k, keyword_string (v));
287 int vlen = v ? strlen (v) + 1 : 0;
288
289 char *p = (char *)alloc (klen + vlen + 1);
290
291 memcpy (p, keyword_str [k], klen); p += klen;
292
293 if (expect_true (v))
294 {
295 *p++ = ' '; vlen--;
296 memcpy (p, v, vlen); p += vlen;
297 }
298
299 *p = '\n';
300 } 360 }
301 361
302 void put (keyword k, const char *v = 0)
303 {
304 put_kw_string (k, v);
305 }
306
307 void put (keyword k, const shstr &v)
308 {
309 put_kw_string (k, v);
310 }
311
312 void put (keyword k, double v) 362 void put (const keyword_string k, double v)
313 { 363 {
314 force (MAX_KEYWORD_LEN + 2 + 32); 364 char *p = force (MAX_KEYWORD_LEN + 2 + 32);
315 fadd (keyword_str [k], keyword_len [k]); 365 memcpy (p, k.s, k.l); p += k.l; *p++ = ' ';
316 fadd (' '); 366 p += sprintf (p, "%.7g", v); *p++ = '\n';
317 falloc (sprintf (ptr, "%.7g", v)); 367 alloc (p);
318 fadd ('\n');
319 } 368 }
320 369
321 void put_(keyword k, sint64 v) 370 void put_(const keyword_string k, sint64 v)
322 { 371 {
323 force (MAX_KEYWORD_LEN + 2 + sint64_digits); 372 force (MAX_KEYWORD_LEN + 2 + sint64_digits);
324 fadd (keyword_str [k], keyword_len [k]); 373 fadd (k.s, k.l);
325 fadd (' '); 374 fadd (' ');
326 add (v); 375 add (v);
327 fadd ('\n'); 376 fadd ('\n');
328 } 377 }
329 378
330 void put_(keyword k, sint32 v) 379 void put_(const keyword_string k, sint32 v)
331 { 380 {
332 force (MAX_KEYWORD_LEN + 2 + sint32_digits); 381 force (MAX_KEYWORD_LEN + 2 + sint32_digits);
333 fadd (keyword_str [k], keyword_len [k]); 382 fadd (k.s, k.l);
334 fadd (' '); 383 fadd (' ');
335 add (v); 384 add (v);
336 fadd ('\n'); 385 fadd ('\n');
337 } 386 }
338 387
339 void put (keyword k, float v) { put (k, (double)v); } 388 void put (const keyword_string k, float v) { put (k, (double)v); }
340 void put (keyword k, signed char v) { put_(k, (sint32)v); } 389 void put (const keyword_string k, signed char v) { put_(k, (sint32)v); }
341 void put (keyword k, unsigned char v) { put_(k, (sint32)v); } 390 void put (const keyword_string k, unsigned char v) { put_(k, (sint32)v); }
342 void put (keyword k, signed short v) { put_(k, (sint32)v); } 391 void put (const keyword_string k, signed short v) { put_(k, (sint32)v); }
343 void put (keyword k, unsigned short v) { put_(k, (sint32)v); } 392 void put (const keyword_string k, unsigned short v) { put_(k, (sint32)v); }
344 void put (keyword k, signed int v) { put_(k, (sint32)v); } 393 void put (const keyword_string k, signed int v) { put_(k, (sint32)v); }
345 void put (keyword k, unsigned int v) { put_(k, (sint64)v); } 394 void put (const keyword_string k, unsigned int v) { put_(k, (sint64)v); }
346 void put (keyword k, signed long v) { put_(k, (sint64)v); } 395 void put (const keyword_string k, signed long v) { put_(k, (sint64)v); }
347 void put (keyword k, unsigned long v) { put_(k, (sint64)v); } 396 void put (const keyword_string k, unsigned long v) { put_(k, (sint64)v); }
348 void put (keyword k, signed long long v) { put_(k, (sint64)v); } 397 void put (const keyword_string k, signed long long v) { put_(k, (sint64)v); }
349 void put (keyword k, unsigned long long v) { put_(k, (sint64)v); } 398 void put (const keyword_string k, unsigned long long v) { put_(k, (sint64)v); }
350 399
351 void put (keyword kbeg, keyword kend, const shstr &v) 400 void put (const keyword_string kbeg, const keyword_string kend, shstr_tmp v)
352 { 401 {
353 force (MAX_KEYWORD_LEN + 1); 402 force (MAX_KEYWORD_LEN + 1);
354 fadd (keyword_str [kbeg], keyword_len [kbeg]); fadd ('\n'); 403 fadd (kbeg.s, kbeg.l); fadd ('\n');
355 404
356 if (expect_true (v)) 405 if (expect_true (v))
357 { 406 {
358 add (v); 407 add (v);
359 add ('\n'); 408 add ('\n');
360 } 409 }
361 410
362 force (MAX_KEYWORD_LEN + 1); 411 force (MAX_KEYWORD_LEN + 1);
363 fadd (keyword_str [kend], keyword_len [kend]); fadd ('\n'); 412 fadd (kend.s, kend.l); fadd ('\n');
364 } 413 }
365 414
366 void put (keyword k, archetype *v); 415 void put (const keyword_string k, archetype *v);
367 void put (keyword k, treasurelist *v); 416 void put (const keyword_string k, treasurelist *v);
368 void put (keyword k, faceinfo *v); 417 void put (const keyword_string k, faceinfo *v);
369 418
370 template<typename T> 419 template<typename T>
371 void put (keyword k, const refptr<T> &v) 420 void put (const keyword_string k, const refptr<T> &v)
372 { 421 {
373 put (k, (T *)v); 422 put (k, (T *)v);
374 } 423 }
375 424
376 bool save (const char *path); 425 MTH bool save (const_octet_string path);
377 char *as_string (); // like strdup 426 utf8_string as_string (); // like strdup
378 427
379 operator bool () { return !!av; } 428 operator bool () { return !!av; }
380}; 429};
381 430
431INTERFACE_CLASS(object_thawer)
382struct object_thawer 432struct object_thawer
383{ 433{
384 char *line; // current beginning of line 434 char *line; // current beginning of line
385 SV *text; // text part 435 SV *text; // text part
386 AV *av; // perl part 436 AV *av; // perl part
387 int linenum; 437 int linenum;
388 keyword kw; 438 keyword kw;
389 char *kw_str; // the keyword parsed, as string 439 char *kw_str; // the keyword parsed, as string
390 char *value; // the value, or 0 if no value 440 char *value; // the value, or 0 if no value
391 char *value_nn; // the value, or the empty string if no value 441 const char *value_nn; // the value, or the empty string if no value
392 const char *name; 442 const char *name;
393 443
394 operator bool () { return !!text; } 444 operator bool () const { return !!text; }
395 445
396 object_thawer (const char *path = 0); 446 object_thawer (const_utf8_string path = 0);
397 object_thawer (const char *data, AV *perlav); 447 object_thawer (const_utf8_string data, AV *perlav);
398 ~object_thawer (); 448 ~object_thawer ();
399 449
400 void get (attachable *obj, int oid); 450 void get (attachable *obj, int oid);
401 451
402 // parse next line 452 // parse next line
403 void next (); 453 MTH void next ();
404 // skip the current key-value (usually fetch next line, for 454 // skip the current key-value (usually fetch next line, for
405 // multiline-fields, skips till the corresponding end-kw 455 // multiline-fields, skips till the corresponding end-kw
406 void skip (); 456 MTH void skip ();
457 MTH void skip_block (); // skips till and over KW_end
407 458
408 char *get_str () { return value; } // may be 0 459 bool has_value () { return value; }
460 const_utf8_string get_str () { return value_nn; } // empty string when missing
409 void get_ml (keyword kend, shstr &sh); 461 void get_ml (keyword kend, shstr &sh);
410 462
411 void get_ornull (shstr &sh) const { sh = value; } 463 void get_ornull (shstr &sh) const { sh = value; }
412 void get (shstr &sh) const { sh = value; } // might want to check for non-null here 464 void get (shstr &sh) const { sh = value; } // might want to check for non-null here
413 465
… …
427 void get (sint32 &i) { i = get_sint32 (); } 479 void get (sint32 &i) { i = get_sint32 (); }
428 480
429 void get (uint32 &i) { i = get_sint64 (); } 481 void get (uint32 &i) { i = get_sint64 (); }
430 void get (sint64 &i) { i = get_sint64 (); } 482 void get (sint64 &i) { i = get_sint64 (); }
431 483
432 void parse_warn (const char *msg); 484 MTH void parse_warn (const_utf8_string msg);
433 bool parse_error (const char *type = 0, const char *name = 0, bool skip = true); 485 MTH bool parse_error (const_utf8_string type = 0, const_utf8_string name = 0, bool skip = true);
486
487 struct delayed_ref {
488 attachable *op;
489 object_ptr *ptr;
490 const_utf8_string ref;
491 };
492 std::vector<delayed_ref> delrefs;
493
494 void delayed_deref (attachable *op, object_ptr &ptr, const_utf8_string ref);
495 MTH void resolve_delayed_derefs (bool deref = true);
434}; 496};
435 497
436//TODO: remove 498//TODO: remove
437char *fgets (char *s, int n, object_thawer &thawer); 499char *fgets (char *s, int n, object_thawer &thawer);
438 500
439////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 501//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
440 502
441struct coroapi { 503struct coroapi {
442 static struct CoroAPI *GCoroAPI; 504 static struct CoroAPI *GCoroAPI;
443 505
506 static EV_ATOMIC_T cede_pending;
507
444 static int nready () { return CORO_NREADY; } 508 static int nready () { return CORO_NREADY; }
445 static int cede () { return CORO_CEDE ; } 509 static int cede () { cede_pending = 0; return CORO_CEDE ; }
446 510
447 static tstamp next_cede;
448 static int cede_counter;
449
450 static void do_cede_every ();
451 static void do_cede_to_tick (); 511 static void do_cede_to_tick ();
452 static void do_cede_to_tick_every ();
453 512
454 static void cede_every (int count) 513 // actually cede's far more often
455 {
456 if (expect_false (++cede_counter >= count))
457 do_cede_every ();
458 }
459
460 static bool cede_to_tick () 514 static bool cede_to_tick ()
461 { 515 {
462 if (expect_true (now () < next_cede)) 516 if (expect_true (!cede_pending))
463 return false; 517 return false;
464 518
465 do_cede_to_tick (); 519 do_cede_to_tick ();
466 return true; 520 return true;
467 } 521 }
468 522
469 static bool cede_to_tick_every (int count)
470 {
471 if (expect_true (++cede_counter < count))
472 return false;
473
474 return cede_to_tick ();
475 }
476
477 static void wait_for_tick (); 523 static void wait_for_tick ();
478 static void wait_for_tick_begin (); 524 static void wait_for_tick_begin ();
479}; 525};
480 526
481struct watcher_base 527struct evapi
482{ 528{
483 static struct EventAPI *GEventAPI; 529 static struct EVAPI *GEVAPI;
484}; 530};
485 531
486template<class base>
487struct watcher : watcher_base
488{
489 base *pe;
490
491 void start (bool repeat = false) { GEventAPI->start ((pe_watcher *)pe, repeat); }
492 void stop (bool cancel_events = false) { GEventAPI->stop ((pe_watcher *)pe, cancel_events); }
493 void now () { GEventAPI->now ((pe_watcher *)pe); }
494 void suspend () { GEventAPI->suspend ((pe_watcher *)pe); }
495 void resume () { GEventAPI->resume ((pe_watcher *)pe); }
496
497 void prio (int new_prio) { ((pe_watcher *)pe)->prio = new_prio; }
498
499 ~watcher ()
500 {
501 cancel ();
502 }
503
504private:
505 void cancel () { GEventAPI->cancel ((pe_watcher *)pe); } // private
506};
507
508struct iw : watcher<pe_idle>, callback<void (iw &)>
509{
510 template<class O, class M>
511 iw (O object, M method)
512 : callback<void (iw &)> (object, method)
513 {
514 alloc ();
515 }
516
517private:
518 void alloc ();
519};
520
521struct iow : watcher<pe_io>, callback<void (iow &, int)> 532struct iow : ev_io, evapi, callback<void (iow &, int)>
522{ 533{
534 static void thunk (EV_P_ struct ev_io *w_, int revents)
535 {
536 iow &w = *static_cast<iow *>(w_);
537
538 w (w, revents);
539 }
540
523 template<class O, class M> 541 template<class O, class M>
524 iow (O object, M method) 542 iow (O object, M method)
525 : callback<void (iow &, int)> (object, method) 543 : callback<void (iow &, int)> (object, method)
526 { 544 {
527 alloc (); 545 ev_init ((ev_io *)this, thunk);
528 } 546 }
529 547
530 void fd (int fd); 548 void prio (int prio)
531 int poll (); 549 {
550 ev_set_priority ((ev_io *)this, prio);
551 }
552
553 void set (int fd, int events)
554 {
555 ev_io_set ((ev_io *)this, fd, events);
556 }
557
558 int poll () const { return events; }
559
532 void poll (int events); 560 void poll (int events);
533 561
534private: 562 void start ()
535 void alloc (); 563 {
564 ev_io_start (EV_DEFAULT, (ev_io *)this);
565 }
566
567 void stop ()
568 {
569 ev_io_stop (EV_DEFAULT, (ev_io *)this);
570 }
571
572 ~iow ()
573 {
574 stop ();
575 }
576};
577
578struct asyncw : ev_async, evapi, callback<void (ev_async &, int)>
579{
580 static void thunk (EV_P_ struct ev_async *w_, int revents)
581 {
582 asyncw &w = *static_cast<asyncw *>(w_);
583
584 w (w, revents);
585 }
586
587 template<class O, class M>
588 asyncw (O object, M method)
589 : callback<void (asyncw &, int)> (object, method)
590 {
591 ev_init ((ev_async *)this, thunk);
592 }
593
594 void start ()
595 {
596 ev_async_start (EV_DEFAULT, (ev_async *)this);
597 }
598
599 void stop ()
600 {
601 ev_async_stop (EV_DEFAULT, (ev_async *)this);
602 }
603
604 ~asyncw ()
605 {
606 stop ();
607 }
536}; 608};
537 609
538#endif 610#endif
539 611

Diff Legend

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