--- deliantra/server/include/cfperl.h 2006/12/31 10:28:36 1.44 +++ deliantra/server/include/cfperl.h 2007/05/26 15:44:03 1.66 @@ -4,7 +4,9 @@ #ifndef CFPERL_H__ #define CFPERL_H__ +#include #include +#include using namespace std; @@ -62,6 +64,9 @@ void cfperl_init (); void cfperl_main (); +void cfperl_emergency_save (); +void cfperl_cleanup (int make_core); +void cfperl_make_book (object *book, int level); ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -88,6 +93,10 @@ NUM_EVENT_TYPES }; +// in which global events or per-type events are we interested +extern bitset ev_want_event; +extern bitset ev_want_type; + #define ARG_AV(o) DT_AV , static_cast (o) #define ARG_INT(v) DT_INT , static_cast (v) #define ARG_INT64(v) DT_INT64 , static_cast (v) @@ -103,14 +112,13 @@ #define ARG_REGION(o) DT_REGION, (void *)(static_cast (o)) // the ", ## __VA_ARGS" is, unfortunately, a gnu-cpp extension - -// all these return true when the normal event processing should be skipped (if any) -#define INVOKE_GLOBAL(event, ...) gbl_ev.invoke (EVENT_ ## GLOBAL ## _ ## event, ## __VA_ARGS__, DT_END) -#define INVOKE_ATTACHABLE(event, obj, ...) (obj)->invoke (EVENT_ ## ATTACHABLE ## _ ## event, ## __VA_ARGS__, DT_END) -#define INVOKE_OBJECT(event, obj, ...) (obj)->invoke (EVENT_ ## OBJECT ## _ ## event, ## __VA_ARGS__, DT_END) -#define INVOKE_CLIENT(event, obj, ...) (obj)->invoke (EVENT_ ## CLIENT ## _ ## event, ## __VA_ARGS__, DT_END) -#define INVOKE_PLAYER(event, obj, ...) (obj)->invoke (EVENT_ ## PLAYER ## _ ## event, ## __VA_ARGS__, DT_END) -#define INVOKE_MAP(event, obj, ...) (obj)->invoke (EVENT_ ## MAP ## _ ## event, ## __VA_ARGS__, DT_END) +#define INVOKE(obj,event, ...) (expect_false ((obj)->should_invoke (event)) ? (obj)->invoke (event, ## __VA_ARGS__, DT_END) : 0) +#define INVOKE_GLOBAL(event, ...) INVOKE (&gbl_ev, EVENT_ ## GLOBAL ## _ ## event, ## __VA_ARGS__) +#define INVOKE_ATTACHABLE(event, obj, ...) INVOKE (obj , EVENT_ ## ATTACHABLE ## _ ## event, ## __VA_ARGS__) +#define INVOKE_OBJECT(event, obj, ...) INVOKE (obj , EVENT_ ## OBJECT ## _ ## event, ## __VA_ARGS__) +#define INVOKE_CLIENT(event, obj, ...) INVOKE (obj , EVENT_ ## CLIENT ## _ ## event, ## __VA_ARGS__) +#define INVOKE_PLAYER(event, obj, ...) INVOKE (obj , EVENT_ ## PLAYER ## _ ## event, ## __VA_ARGS__) +#define INVOKE_MAP(event, obj, ...) INVOKE (obj , EVENT_ ## MAP ## _ ## event, ## __VA_ARGS__) //TODO should index into @result #define RESULT(idx,type) cfperl_result_ ## type (idx) @@ -122,35 +130,37 @@ ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +INTERFACE_CLASS (attachable) struct attachable { static MGVTBL vtbl; static unordered_vector mortals; - static void check_mortals (); + MTH static void check_mortals (); enum { - F_DESTROYED = 0x01, - F_BORROWED = 0x02, + F_DESTROYED = 0x01, + F_DEBUG_TRACE = 0x02, }; // object is delete'd after the refcount reaches 0 - mutable int refcnt; - int flags; + int ACC (RW, flags); + mutable int ACC (RW, refcnt); - void refcnt_inc () const { ++refcnt; } - void refcnt_dec () const { --refcnt; } + MTH void refcnt_inc () const { ++refcnt; } + MTH void refcnt_dec () const { --refcnt; } + MTH int refcnt_cnt () const; // check wether the object has died and destroy - void refcnt_chk () { if (refcnt <= 0) do_check (); } + MTH void refcnt_chk () { if (refcnt <= 0) do_check (); } // destroy the object unless it was already destroyed // this politely asks everybody interested the reduce // the refcount to 0 as soon as possible. - void destroy (); + MTH void destroy (); // return wether an object was destroyed already - bool destroyed () const { return flags & F_DESTROYED; } + MTH bool destroyed () const { return flags & F_DESTROYED; } virtual void gather_callbacks (AV *&callbacks, event_type event) const; @@ -164,7 +174,8 @@ AV *cb; // CF+ callbacks shstr attach; // generic extension attachment information - void optimise (); // possibly save some memory by destroying unneeded data + void sever_self (); // sever this object from its self, if it has one. + void optimise (); // possibly save some memory by destroying unneeded data attachable () : flags (0), refcnt (0), self (0), cb (0), attach (0) @@ -180,8 +191,15 @@ attachable &operator =(const attachable &src); + // used to _quickly_ device wether to shortcut the evaluation + bool should_invoke (event_type event) + { + return ev_want_event [event] || cb; + } + bool invoke (event_type event, ...); - void instantiate (); + + MTH void instantiate (); void reattach (); protected: @@ -202,7 +220,7 @@ ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -struct object_freezer : dynbuf +struct object_freezer : dynbuf_text { AV *av; @@ -216,7 +234,7 @@ { add (k); - if (v) + if (expect_true (v)) add (' '), add (v); add ('\n'); @@ -241,7 +259,7 @@ memcpy (p, keyword_str [k], klen); p += klen; - if (v) + if (expect_true (v)) { *p++ = ' '; vlen--; memcpy (p, v, vlen); p += vlen; @@ -250,7 +268,7 @@ *p = '\n'; } - void put (keyword k, const char *v) + void put (keyword k, const char *v = 0) { put_string (k, v); } @@ -289,7 +307,7 @@ { add (keyword_str [kbeg], keyword_len [kbeg]); add ('\n'); - if (v) + if (expect_true (v)) { add (v); add ('\n'); @@ -313,7 +331,7 @@ template void put (keyword k, const T *v) { - if (v) + if (expect_true (v)) put (k, v->name); else put (k, (const char *)0); @@ -325,48 +343,64 @@ put (k, (T *)v); } - bool save (const char *filename); + bool save (const char *path); char *as_string (); // like strdup operator bool () { return !!av; } }; // compatibility support, should be removed when no longer needed -int fprintf (object_freezer &freezer, const char *format, ...); -int fputs (const char *s, object_freezer &freezer); +void fprintf (object_freezer &freezer, const char *format, ...); +void fputs (const char *s, object_freezer &freezer); struct object_thawer { + char *line; // current beginning of line SV *text; // text part AV *av; // perl part - char *line; // current beginning of line - char *last_keyword, *last_value; + int linenum; + keyword kw; + char *kw_str; // the keyword parsed, as string + char *value; // the value, or 0 if no value + char *value_nn; // the value, or the empty string if no value + const char *name; operator bool () { return !!text; } - object_thawer (const char *filename = 0); + object_thawer (const char *path = 0); object_thawer (const char *data, AV *perlav); ~object_thawer (); void get (attachable *obj, int oid); - keyword get_kv (); // also parse value for later use - void skip_kv (keyword kw); + // parse next line + void next (); + // skip the current key-value (usually fetch next line, for + // multiline-fields, skips untilt he corresponding end-kw + void skip (); - const char *get_str () { return last_value; } // may be 0 + //TODO: remove, deprecated + keyword get_kv () + { + next (); + return kw; + } - void get (shstr &sh) const; - void get_ornull (shstr &sh) const { sh = last_value; } + char *get_str () { return value; } // may be 0 void get_ml (keyword kend, shstr &sh); + void get_ornull (shstr &sh) const { sh = value; } + void get (shstr &sh) const { sh = value; } // might want to check for non-null here + + bool get_bool () const { return *value_nn == '1'; } sint32 get_sint32 () const; - sint64 get_sint64 () const; - double get_double () const; + sint64 get_sint64 () const { return atoll (value_nn); } + double get_double () const { return atof (value_nn); } void get (float &v) { v = get_double (); } void get (double &v) { v = get_double (); } - void get (bool &i) { i = get_sint32 (); } + void get (bool &i) { i = get_bool (); } void get (sint8 &i) { i = get_sint32 (); } void get (uint8 &i) { i = get_sint32 (); } void get (sint16 &i) { i = get_sint32 (); } @@ -375,8 +409,11 @@ void get (uint32 &i) { i = get_sint64 (); } void get (sint64 &i) { i = get_sint64 (); } + + bool parse_error (const char *type = 0, const char *name = 0, bool skip = true); }; +//TODO: remove char *fgets (char *s, int n, object_thawer &thawer); ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -386,6 +423,35 @@ static int nready () { return CORO_NREADY; } static int cede () { return CORO_CEDE ; } + + static double (*time)(); + static double next_cede; + static int cede_counter; + + static void do_cede_every (); + static void do_cede_to_tick (); + static void do_cede_to_tick_every (); + + static void cede_every (int count) + { + if (expect_false (++cede_counter >= count)) + do_cede_every (); + } + + static void cede_to_tick () + { + if (expect_false (time () >= next_cede)) + do_cede_to_tick (); + } + + static void cede_to_tick_every (int count) + { + if (expect_false (++cede_counter >= count)) + cede_to_tick (); + } + + static void wait_for_tick (); + static void wait_for_tick_begin (); }; struct watcher_base