--- deliantra/server/include/cfperl.h 2006/12/31 17:17:23 1.45 +++ deliantra/server/include/cfperl.h 2007/05/19 00:08:11 1.64 @@ -4,7 +4,9 @@ #ifndef CFPERL_H__ #define CFPERL_H__ +#include #include +#include using namespace std; @@ -62,6 +64,8 @@ void cfperl_init (); void cfperl_main (); +void cfperl_emergency_save (); +void cfperl_cleanup (int make_core); ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -88,6 +92,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) @@ -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,19 @@ attachable &operator =(const attachable &src); - bool invoke (event_type event, ...); - void instantiate (); + bool vinvoke (event_type event, va_list &ap); + bool invoke (event_type event, ...) + { + if (ev_want_event [event] || cb) + { + va_list ap; + va_start (ap, event); + vinvoke (event, ap); + va_end (ap); + } + } + + MTH void instantiate (); void reattach (); protected: @@ -202,7 +224,7 @@ ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -struct object_freezer : dynbuf +struct object_freezer : dynbuf_text { AV *av; @@ -325,38 +347,51 @@ 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 { SV *text; // text part AV *av; // perl part + int linenum; char *line; // current beginning of line - char *last_keyword, *last_value; + keyword kw; + char *kw_str, *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; + } + + char *get_str () { return value; } // may be 0 void get (shstr &sh) const; - void get_ornull (shstr &sh) const { sh = last_value; } + void get_ornull (shstr &sh) const { sh = value; } void get_ml (keyword kend, shstr &sh); sint32 get_sint32 () const; @@ -375,8 +410,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 +424,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 (++cede_counter >= count) + do_cede_every (); + } + + static void cede_to_tick () + { + if (time () >= next_cede) + do_cede_to_tick (); + } + + static void cede_to_tick_every (int count) + { + if (++cede_counter >= count) + cede_to_tick (); + } + + static void wait_for_tick (); + static void wait_for_tick_begin (); }; struct watcher_base