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

Diff Legend

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