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.56 by root, Thu Feb 15 21:07:49 2007 UTC vs.
Revision 1.96 by root, Wed Apr 16 21:14:13 2008 UTC

1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 *
4 * Copyright (©) 2005,2006,2007,2008 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 *
8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version.
12 *
13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details.
17 *
18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 *
21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */
23
1// 24//
2// cfperl.h perl interface 25// cfperl.h perl interface
3// 26//
4#ifndef CFPERL_H__ 27#ifndef CFPERL_H__
5#define CFPERL_H__ 28#define CFPERL_H__
6 29
30#include <cstdarg>
7#include <cstdio> 31#include <cstdio>
32#include <bitset>
8 33
9using namespace std; 34using namespace std;
10 35
11#include <EXTERN.h> 36#include <EXTERN.h>
12#include <perl.h> 37#include <perl.h>
13#include <XSUB.h> 38#include <XSUB.h>
14 39
15#include <EventAPI.h> 40#include <EVAPI.h>
16#include <CoroAPI.h> 41#include <CoroAPI.h>
17 42
18#include "util.h" 43#include "util.h"
19#include "keyword.h" 44#include "keyword.h"
20#include "dynbuf.h" 45#include "dynbuf.h"
… …
30#undef readdir 55#undef readdir
31#undef getprotobyname 56#undef getprotobyname
32#undef gethostbyname 57#undef gethostbyname
33#undef ctime 58#undef ctime
34#undef strerror 59#undef strerror
60#undef _
35 61
36// same here, massive symbol spamming 62// same here, massive symbol spamming
37#undef do_open 63#undef do_open
38#undef do_close 64#undef do_close
39#undef ref 65#undef ref
… …
44#undef random 70#undef random
45#undef crypt 71#undef crypt
46 72
47////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 73//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
48 74
75#define _(msg) (msg)
76#define N_(msg) (msg)
77
78//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
79
49// some macros to simplify perl in-calls 80// some macros to simplify perl in-calls
50 81
51#define CHECK_ERROR \ 82#define CHECK_ERROR \
52 if (SvTRUE (ERRSV)) \ 83 if (SvTRUE (ERRSV)) \
53 LOG (llevError, "runtime error in %s: %s\n", __func__, SvPVutf8_nolen (ERRSV)); 84 LOG (llevError, "runtime error in %s: %s", __func__, SvPVutf8_nolen (ERRSV));
54 85
55#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)
56#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
57#define CALL_ARG(expr) PUSHs (sv_2mortal (to_sv (expr))) 88#define CALL_ARG(expr) PUSHs (sv_2mortal (to_sv (expr)))
58#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_pv (name, (flags) | G_EVAL); SPAGAIN;
… …
60 91
61////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 92//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
62 93
63void cfperl_init (); 94void cfperl_init ();
64void cfperl_main (); 95void cfperl_main ();
96void cfperl_tick ();
65void cfperl_emergency_save (); 97void cfperl_emergency_save ();
66void cfperl_cleanup (int make_core); 98void cfperl_cleanup (int make_core);
99void cfperl_make_book (object *book, int level);
100void cfperl_send_msg (client *ns, int color, const char *type, const char *msg);
101int cfperl_can_merge (object *ob1, object *ob2);
67 102
68////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 103//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
69 104
105#if IVSIZE >= 8
106 typedef IV val64;
107 typedef IV uval64;
108# define newSVval64 newSViv
109# define SvVAL64 SvIV
110# define newSVuval64 newSVuv
111# define SvUVAL64 SvUV
112#else
113 typedef double val64;
114 typedef double uval64;
115# define newSVval64 newSVnv
116# define SvVAL64 SvNV
117# define newSVuval64 newSVnv
118# define SvUVAL64 SvNV
119#endif
120
70// virtual server time, excluding time jumps and lag 121extern tstamp runtime; // virtual server time, excluding time jumps and lag
71extern double runtime; 122extern tstamp NOW; // real time of current server tick
72 123
73enum event_klass 124enum event_klass
74{ 125{
75 KLASS_NONE, 126 KLASS_NONE,
76 KLASS_GLOBAL, 127 KLASS_GLOBAL,
… …
87# define def(klass,name) EVENT_ ## klass ## _ ## name, 138# define def(klass,name) EVENT_ ## klass ## _ ## name,
88# include "eventinc.h" 139# include "eventinc.h"
89# undef def 140# undef def
90 NUM_EVENT_TYPES 141 NUM_EVENT_TYPES
91}; 142};
143
144// in which global events or per-type events are we interested
145extern bitset<NUM_EVENT_TYPES> ev_want_event;
146extern bitset<NUM_TYPES> ev_want_type;
92 147
93#define ARG_AV(o) DT_AV , static_cast<AV *> (o) 148#define ARG_AV(o) DT_AV , static_cast<AV *> (o)
94#define ARG_INT(v) DT_INT , static_cast<int> (v) 149#define ARG_INT(v) DT_INT , static_cast<int> (v)
95#define ARG_INT64(v) DT_INT64 , static_cast<sint64> (v) 150#define ARG_INT64(v) DT_INT64 , static_cast<sint64> (v)
96#define ARG_DOUBLE(v) DT_DOUBLE, static_cast<double> (v) 151#define ARG_DOUBLE(v) DT_DOUBLE, static_cast<double> (v)
… …
103#define ARG_CLIENT(o) DT_CLIENT, (void *)(static_cast<client *> (o)) 158#define ARG_CLIENT(o) DT_CLIENT, (void *)(static_cast<client *> (o))
104#define ARG_PARTY(o) DT_PARTY , (void *)(static_cast<party *> (o)) 159#define ARG_PARTY(o) DT_PARTY , (void *)(static_cast<party *> (o))
105#define ARG_REGION(o) DT_REGION, (void *)(static_cast<region *> (o)) 160#define ARG_REGION(o) DT_REGION, (void *)(static_cast<region *> (o))
106 161
107// the ", ## __VA_ARGS" is, unfortunately, a gnu-cpp extension 162// the ", ## __VA_ARGS" is, unfortunately, a gnu-cpp extension
108 163#define INVOKE(obj,event, ...) (expect_false ((obj)->should_invoke (event)) ? (obj)->invoke (event, ## __VA_ARGS__, DT_END) : 0)
109// all these return true when the normal event processing should be skipped (if any)
110#define INVOKE_GLOBAL(event, ...) gbl_ev.invoke (EVENT_ ## GLOBAL ## _ ## event, ## __VA_ARGS__, DT_END) 164#define INVOKE_GLOBAL(event, ...) INVOKE (&gbl_ev, EVENT_ ## GLOBAL ## _ ## event, ## __VA_ARGS__)
111#define INVOKE_ATTACHABLE(event, obj, ...) (obj)->invoke (EVENT_ ## ATTACHABLE ## _ ## event, ## __VA_ARGS__, DT_END) 165#define INVOKE_ATTACHABLE(event, obj, ...) INVOKE (obj , EVENT_ ## ATTACHABLE ## _ ## event, ## __VA_ARGS__)
112#define INVOKE_OBJECT(event, obj, ...) (obj)->invoke (EVENT_ ## OBJECT ## _ ## event, ## __VA_ARGS__, DT_END) 166#define INVOKE_OBJECT(event, obj, ...) INVOKE (obj , EVENT_ ## OBJECT ## _ ## event, ## __VA_ARGS__)
113#define INVOKE_CLIENT(event, obj, ...) (obj)->invoke (EVENT_ ## CLIENT ## _ ## event, ## __VA_ARGS__, DT_END) 167#define INVOKE_CLIENT(event, obj, ...) INVOKE (obj , EVENT_ ## CLIENT ## _ ## event, ## __VA_ARGS__)
114#define INVOKE_PLAYER(event, obj, ...) (obj)->invoke (EVENT_ ## PLAYER ## _ ## event, ## __VA_ARGS__, DT_END) 168#define INVOKE_PLAYER(event, obj, ...) INVOKE (obj , EVENT_ ## PLAYER ## _ ## event, ## __VA_ARGS__)
115#define INVOKE_MAP(event, obj, ...) (obj)->invoke (EVENT_ ## MAP ## _ ## event, ## __VA_ARGS__, DT_END) 169#define INVOKE_MAP(event, obj, ...) INVOKE (obj , EVENT_ ## MAP ## _ ## event, ## __VA_ARGS__)
116 170
117//TODO should index into @result 171//TODO should index into @result
118#define RESULT(idx,type) cfperl_result_ ## type (idx) 172#define RESULT(idx,type) cfperl_result_ ## type (idx)
119#define RESULT_DOUBLE(idx) RESULT(idx, DOUBLE) 173#define RESULT_DOUBLE(idx) RESULT(idx, DOUBLE)
120#define RESULT_INT(idx) RESULT(idx, INT) 174#define RESULT_INT(idx) RESULT(idx, INT)
… …
123int cfperl_result_INT (int idx); 177int cfperl_result_INT (int idx);
124 178
125////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 179//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
126 180
127INTERFACE_CLASS (attachable) 181INTERFACE_CLASS (attachable)
128struct attachable 182struct attachable : refcnt_base
129{ 183{
130 static MGVTBL vtbl; 184 static MGVTBL vtbl;
131 185
132 static unordered_vector<attachable *> mortals; 186 static unordered_vector<attachable *> mortals;
133 MTH static void check_mortals (); 187 MTH static void check_mortals ();
134 188
135 enum { 189 enum {
136 F_DESTROYED = 0x01, 190 F_DESTROYED = 0x01,
137 F_DEBUG_TRACE = 0x02, 191 F_DEBUG_TRACE = 0x02,
138 }; 192 };
193 int ACC (RW, flags);
139 194
140 // object is delete'd after the refcount reaches 0 195 // object is delete'd after the refcount reaches 0
141 mutable int ACC (RW, refcnt);
142 int ACC (RW, flags);
143
144 MTH void refcnt_inc () const { ++refcnt; }
145 MTH void refcnt_dec () const { --refcnt; }
146
147 MTH int refcnt_cnt () const; 196 MTH int refcnt_cnt () const;
148 // check wether the object has died and destroy 197 // check wether the object has died and destroy
149 MTH void refcnt_chk () { if (refcnt <= 0) do_check (); } 198 MTH void refcnt_chk () { if (expect_false (refcnt <= 0)) do_check (); }
150 199
151 // destroy the object unless it was already destroyed 200 // destroy the object unless it was already destroyed
152 // this politely asks everybody interested the reduce 201 // this politely asks everybody interested the reduce
153 // the refcount to 0 as soon as possible. 202 // the refcount to 0 as soon as possible.
154 MTH void destroy (); 203 MTH void destroy ();
… …
170 219
171 void sever_self (); // sever this object from its self, if it has one. 220 void sever_self (); // sever this object from its self, if it has one.
172 void optimise (); // possibly save some memory by destroying unneeded data 221 void optimise (); // possibly save some memory by destroying unneeded data
173 222
174 attachable () 223 attachable ()
175 : flags (0), refcnt (0), self (0), cb (0), attach (0) 224 : flags (0), self (0), cb (0), attach (0)
176 { 225 {
177 } 226 }
178 227
179 attachable (const attachable &src) 228 attachable (const attachable &src)
180 : flags (0), refcnt (0), self (0), cb (0), attach (src.attach) 229 : flags (0), self (0), cb (0), attach (src.attach)
181 { 230 {
182 } 231 }
183 232
184 virtual ~attachable (); 233 // set a custom key to the given value, or delete it if value = 0
234 void set_key (const char *key, const char *value = 0, bool is_utf8 = 0);
235
236 void set_key_text (const char *key, const char *value = 0)
237 {
238 set_key (key, value, 1);
239 }
240
241 void set_key_data (const char *key, const char *value = 0)
242 {
243 set_key (key, value, 0);
244 }
185 245
186 attachable &operator =(const attachable &src); 246 attachable &operator =(const attachable &src);
187 247
248 // used to _quickly_ device wether to shortcut the evaluation
249 bool should_invoke (event_type event)
250 {
251 return ev_want_event [event] || cb;
252 }
253
188 bool invoke (event_type event, ...); 254 bool invoke (event_type event, ...);
255
189 MTH void instantiate (); 256 MTH void instantiate ();
190 void reattach (); 257 void reattach ();
191 258
192protected: 259protected:
193 // do the real refcount checking work 260 // do the real refcount checking work
194 void do_check (); 261 void do_check ();
195 262
196 // the method that does the real destroy work 263 // the method that does the real destroy work
197 virtual void do_destroy (); 264 virtual void do_destroy ();
265
266 // destructor is protected, should not be called by anybody
267 virtual ~attachable ();
198}; 268};
199 269
200// the global object is a pseudo object that cares for the global events 270// the global object is a pseudo object that cares for the global events
201struct global : attachable 271struct global : attachable
202{ 272{
… …
205 275
206extern struct global gbl_ev; 276extern struct global gbl_ev;
207 277
208////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 278//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
209 279
280INTERFACE_CLASS(object_freezer)
210struct object_freezer : dynbuf 281struct object_freezer : dynbuf_text
211{ 282{
212 AV *av; 283 AV *av;
213 284
214 object_freezer (); 285 object_freezer ();
215 ~object_freezer (); 286 ~object_freezer ();
… …
219 // used only for user-defined key-value pairs 290 // used only for user-defined key-value pairs
220 void put (const shstr &k, const shstr &v) 291 void put (const shstr &k, const shstr &v)
221 { 292 {
222 add (k); 293 add (k);
223 294
224 if (v) 295 if (expect_true (v))
225 add (' '), add (v); 296 add (' '), add (v);
226 297
227 add ('\n'); 298 add ('\n');
228 } 299 }
229 300
230 //TODO//temporary, used only for saving body locations
231 void put (const char *k, int v)
232 {
233 add (k);
234 add (' ');
235 add (sint32 (v));
236 add ('\n');
237 }
238
239 template<typename T> 301 template<typename T>
240 void put_string (keyword k, const T &v) 302 void put_kw_string (keyword k, const T &v)
241 { 303 {
242 int klen = keyword_len [k]; 304 int klen = keyword_len [k];
243 int vlen = v ? strlen (v) + 1 : 0; 305 int vlen = v ? strlen (v) + 1 : 0;
244 306
245 char *p = (char *)alloc (klen + vlen + 1); 307 char *p = (char *)alloc (klen + vlen + 1);
246 308
247 memcpy (p, keyword_str [k], klen); p += klen; 309 memcpy (p, keyword_str [k], klen); p += klen;
248 310
249 if (v) 311 if (expect_true (v))
250 { 312 {
251 *p++ = ' '; vlen--; 313 *p++ = ' '; vlen--;
252 memcpy (p, v, vlen); p += vlen; 314 memcpy (p, v, vlen); p += vlen;
253 } 315 }
254 316
255 *p = '\n'; 317 *p = '\n';
256 } 318 }
257 319
258 void put (keyword k, const char *v = 0) 320 void put (keyword k, const char *v = 0)
259 { 321 {
260 put_string (k, v); 322 put_kw_string (k, v);
261 } 323 }
262 324
263 void put (keyword k, const shstr &v) 325 void put (keyword k, const shstr &v)
264 { 326 {
265 put_string (k, v); 327 put_kw_string (k, v);
266 } 328 }
267 329
268 void put (keyword k, double v) 330 void put (keyword k, double v)
269 { 331 {
270 char buf [128]; 332 force (MAX_KEYWORD_LEN + 2 + 32);
271 333 fadd (keyword_str [k], keyword_len [k]);
272 snprintf (buf, 128, "%.7g", v); 334 fadd (' ');
273 335 falloc (sprintf (ptr, "%.7g", v));
274 put (k, (const char *)buf); 336 fadd ('\n');
275 } 337 }
276 338
277 void put_(keyword k, sint64 v) 339 void put_(keyword k, sint64 v)
278 { 340 {
341 force (MAX_KEYWORD_LEN + 2 + sint64_digits);
279 add (keyword_str [k], keyword_len [k]); 342 fadd (keyword_str [k], keyword_len [k]);
280 add (' '); 343 fadd (' ');
281 add (v); 344 add (v);
282 add ('\n'); 345 fadd ('\n');
283 } 346 }
284 347
285 void put_(keyword k, sint32 v) 348 void put_(keyword k, sint32 v)
286 { 349 {
350 force (MAX_KEYWORD_LEN + 2 + sint32_digits);
287 add (keyword_str [k], keyword_len [k]); 351 fadd (keyword_str [k], keyword_len [k]);
288 add (' '); 352 fadd (' ');
289 add (v); 353 add (v);
290 add ('\n'); 354 fadd ('\n');
291 }
292
293 void put (keyword kbeg, keyword kend, const shstr &v)
294 {
295 add (keyword_str [kbeg], keyword_len [kbeg]); add ('\n');
296
297 if (v)
298 {
299 add (v);
300 add ('\n');
301 }
302
303 add (keyword_str [kend], keyword_len [kend]); add ('\n');
304 } 355 }
305 356
306 void put (keyword k, float v) { put (k, (double)v); } 357 void put (keyword k, float v) { put (k, (double)v); }
307 void put (keyword k, signed char v) { put_(k, (sint32)v); } 358 void put (keyword k, signed char v) { put_(k, (sint32)v); }
308 void put (keyword k, unsigned char v) { put_(k, (sint32)v); } 359 void put (keyword k, unsigned char v) { put_(k, (sint32)v); }
… …
313 void put (keyword k, signed long v) { put_(k, (sint64)v); } 364 void put (keyword k, signed long v) { put_(k, (sint64)v); }
314 void put (keyword k, unsigned long v) { put_(k, (sint64)v); } 365 void put (keyword k, unsigned long v) { put_(k, (sint64)v); }
315 void put (keyword k, signed long long v) { put_(k, (sint64)v); } 366 void put (keyword k, signed long long v) { put_(k, (sint64)v); }
316 void put (keyword k, unsigned long long v) { put_(k, (sint64)v); } 367 void put (keyword k, unsigned long long v) { put_(k, (sint64)v); }
317 368
318 template<typename T> 369 void put (keyword kbeg, keyword kend, const shstr &v)
370 {
371 force (MAX_KEYWORD_LEN + 1);
372 fadd (keyword_str [kbeg], keyword_len [kbeg]); fadd ('\n');
373
374 if (expect_true (v))
375 {
376 add (v);
377 add ('\n');
378 }
379
380 force (MAX_KEYWORD_LEN + 1);
381 fadd (keyword_str [kend], keyword_len [kend]); fadd ('\n');
382 }
383
384 void put (keyword k, archetype *v);
385 void put (keyword k, treasurelist *v);
319 void put (keyword k, const T *v) 386 void put (keyword k, faceinfo *v);
320 {
321 if (v)
322 put (k, v->name);
323 else
324 put (k, (const char *)0);
325 }
326 387
327 template<typename T> 388 template<typename T>
328 void put (keyword k, const refptr<T> &v) 389 void put (keyword k, const refptr<T> &v)
329 { 390 {
330 put (k, (T *)v); 391 put (k, (T *)v);
331 } 392 }
332 393
333 bool save (const char *path); 394 MTH bool save (const_octet_string path);
334 char *as_string (); // like strdup 395 char *as_string (); // like strdup
335 396
336 operator bool () { return !!av; } 397 operator bool () { return !!av; }
337}; 398};
338 399
339// compatibility support, should be removed when no longer needed 400INTERFACE_CLASS(object_thawer)
340int fprintf (object_freezer &freezer, const char *format, ...);
341int fputs (const char *s, object_freezer &freezer);
342
343struct object_thawer 401struct object_thawer
344{ 402{
403 char *line; // current beginning of line
345 SV *text; // text part 404 SV *text; // text part
346 AV *av; // perl part 405 AV *av; // perl part
347 int linenum; 406 int linenum;
348 char *line; // current beginning of line
349 keyword kw; 407 keyword kw;
350 char *kw_str, *value; 408 char *kw_str; // the keyword parsed, as string
409 char *value; // the value, or 0 if no value
410 const char *value_nn; // the value, or the empty string if no value
351 const char *name; 411 const char *name;
352 412
353 operator bool () { return !!text; } 413 operator bool () const { return !!text; }
354 414
355 object_thawer (const char *path = 0); 415 object_thawer (const char *path = 0);
356 object_thawer (const char *data, AV *perlav); 416 object_thawer (const char *data, AV *perlav);
357 ~object_thawer (); 417 ~object_thawer ();
358 418
359 void get (attachable *obj, int oid); 419 void get (attachable *obj, int oid);
360 420
361 // parse next line 421 // parse next line
362 void next_kv (); 422 MTH void next ();
363 //TODO: remove
364 keyword get_kv ()
365 {
366 next_kv ();
367 return kw;
368 }
369
370 // skip the current key-value (usually fetch next line, for 423 // skip the current key-value (usually fetch next line, for
371 // multiline-fields, skips untilt he corresponding end-kw 424 // multiline-fields, skips till the corresponding end-kw
372 void skip_kv (); 425 MTH void skip ();
426 MTH void skip_block (); // skips till and over KW_end
373 427
374 const char *get_str () { return value; } // may be 0 428 char *get_str () { return value; } // may be 0
429 void get_ml (keyword kend, shstr &sh);
375 430
376 void get (shstr &sh) const;
377 void get_ornull (shstr &sh) const { sh = value; } 431 void get_ornull (shstr &sh) const { sh = value; }
378 void get_ml (keyword kend, shstr &sh); 432 void get (shstr &sh) const { sh = value; } // might want to check for non-null here
379 433
434 bool get_bool () const { return *value_nn == '1'; }
380 sint32 get_sint32 () const; 435 sint32 get_sint32 () const;
381 sint64 get_sint64 () const; 436 sint64 get_sint64 () const { return strtoll (value_nn, 0, 10); }
382 double get_double () const; 437 double get_double () const { return strtod (value_nn, 0); }
383 438
384 void get (float &v) { v = get_double (); } 439 void get (float &v) { v = get_double (); }
385 void get (double &v) { v = get_double (); } 440 void get (double &v) { v = get_double (); }
386 441
387 void get (bool &i) { i = get_sint32 (); } 442 void get (bool &i) { i = get_bool (); }
388 void get (sint8 &i) { i = get_sint32 (); } 443 void get (sint8 &i) { i = get_sint32 (); }
389 void get (uint8 &i) { i = get_sint32 (); } 444 void get (uint8 &i) { i = get_sint32 (); }
390 void get (sint16 &i) { i = get_sint32 (); } 445 void get (sint16 &i) { i = get_sint32 (); }
391 void get (uint16 &i) { i = get_sint32 (); } 446 void get (uint16 &i) { i = get_sint32 (); }
392 void get (sint32 &i) { i = get_sint32 (); } 447 void get (sint32 &i) { i = get_sint32 (); }
393 448
394 void get (uint32 &i) { i = get_sint64 (); } 449 void get (uint32 &i) { i = get_sint64 (); }
395 void get (sint64 &i) { i = get_sint64 (); } 450 void get (sint64 &i) { i = get_sint64 (); }
396 451
452 MTH void parse_warn (const char *msg);
397 bool parse_error (const char *type = 0, const char *name = 0, bool skip = true); 453 MTH bool parse_error (const char *type = 0, const char *name = 0, bool skip = true);
454
455 struct delayed_ref {
456 attachable *op;
457 object_ptr *ptr;
458 const char *ref;
459 };
460 std::vector<delayed_ref> delrefs;
461
462 void delayed_deref (attachable *op, object_ptr &ptr, const char *ref);
463 MTH void resolve_delayed_derefs (bool deref = true);
398}; 464};
399 465
400//TODO: remove 466//TODO: remove
401char *fgets (char *s, int n, object_thawer &thawer); 467char *fgets (char *s, int n, object_thawer &thawer);
402 468
403////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 469//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
404 470
405struct coroapi { 471struct coroapi {
406 static struct CoroAPI *GCoroAPI; 472 static struct CoroAPI *GCoroAPI;
407 473
474 static EV_ATOMIC_T cede_pending;
475
408 static int nready () { return CORO_NREADY; } 476 static int nready () { return CORO_NREADY; }
409 static int cede () { return CORO_CEDE ; } 477 static int cede () { cede_pending = 0; return CORO_CEDE ; }
410 478
411 static int cede_counter; 479 static void do_cede_to_tick ();
412 480
413 static void cede_every (int count) 481 // actually cede's far more often
482 static bool cede_to_tick ()
414 { 483 {
415 if (++cede_counter >= count) 484 if (expect_true (!cede_pending))
416 { 485 return false;
417 cede_counter = 0;
418 486
419 if (coroapi::nready ()) 487 do_cede_to_tick ();
420 coroapi::cede (); 488 return true;
421 }
422 } 489 }
423};
424 490
425struct watcher_base 491 static void wait_for_tick ();
492 static void wait_for_tick_begin ();
493};
494
495struct evapi
426{ 496{
427 static struct EventAPI *GEventAPI; 497 static struct EVAPI *GEVAPI;
428}; 498};
429 499
430template<class base>
431struct watcher : watcher_base
432{
433 base *pe;
434
435 void start (bool repeat = false) { GEventAPI->start ((pe_watcher *)pe, repeat); }
436 void stop (bool cancel_events = false) { GEventAPI->stop ((pe_watcher *)pe, cancel_events); }
437 void now () { GEventAPI->now ((pe_watcher *)pe); }
438 void suspend () { GEventAPI->suspend ((pe_watcher *)pe); }
439 void resume () { GEventAPI->resume ((pe_watcher *)pe); }
440
441 void prio (int new_prio) { ((pe_watcher *)pe)->prio = new_prio; }
442
443 ~watcher ()
444 {
445 cancel ();
446 }
447
448private:
449 void cancel () { GEventAPI->cancel ((pe_watcher *)pe); } // private
450};
451
452struct iw : watcher<pe_idle>, callback<void (iw &)>
453{
454 template<class O, class M>
455 iw (O object, M method)
456 : callback<void (iw &)> (object, method)
457 {
458 alloc ();
459 }
460
461private:
462 void alloc ();
463};
464
465struct iow : watcher<pe_io>, callback<void (iow &, int)> 500struct iow : ev_io, evapi, callback<void (iow &, int)>
466{ 501{
502 static void thunk (EV_P_ struct ev_io *w_, int revents)
503 {
504 iow &w = *static_cast<iow *>(w_);
505
506 w (w, revents);
507 }
508
467 template<class O, class M> 509 template<class O, class M>
468 iow (O object, M method) 510 iow (O object, M method)
469 : callback<void (iow &, int)> (object, method) 511 : callback<void (iow &, int)> (object, method)
470 { 512 {
471 alloc (); 513 ev_init ((ev_io *)this, thunk);
472 } 514 }
473 515
474 void fd (int fd); 516 void prio (int prio)
475 int poll (); 517 {
518 ev_set_priority ((ev_io *)this, prio);
519 }
520
521 void set (int fd, int events)
522 {
523 ev_io_set ((ev_io *)this, fd, events);
524 }
525
526 int poll () const { return events; }
527
476 void poll (int events); 528 void poll (int events);
477 529
478private: 530 void start ()
479 void alloc (); 531 {
532 ev_io_start (EV_DEFAULT, (ev_io *)this);
533 }
534
535 void stop ()
536 {
537 ev_io_stop (EV_DEFAULT, (ev_io *)this);
538 }
539
540 ~iow ()
541 {
542 stop ();
543 }
544};
545
546struct asyncw : ev_async, evapi, callback<void (ev_async &, int)>
547{
548 static void thunk (EV_P_ struct ev_async *w_, int revents)
549 {
550 asyncw &w = *static_cast<asyncw *>(w_);
551
552 w (w, revents);
553 }
554
555 template<class O, class M>
556 asyncw (O object, M method)
557 : callback<void (asyncw &, int)> (object, method)
558 {
559 ev_init ((ev_async *)this, thunk);
560 }
561
562 void start ()
563 {
564 ev_async_start (EV_DEFAULT, (ev_async *)this);
565 }
566
567 void stop ()
568 {
569 ev_async_stop (EV_DEFAULT, (ev_async *)this);
570 }
571
572 ~asyncw ()
573 {
574 stop ();
575 }
480}; 576};
481 577
482#endif 578#endif
483 579

Diff Legend

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