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

Diff Legend

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