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.54 by root, Sun Feb 11 01:38:48 2007 UTC vs.
Revision 1.109 by root, Tue Nov 3 23:44:20 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines