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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines