--- deliantra/server/include/cfperl.h 2010/04/06 21:11:48 1.118 +++ deliantra/server/include/cfperl.h 2010/06/26 22:10:18 1.123 @@ -83,11 +83,14 @@ inline int call_pvsv (const char *ob, I32 flags) { return call_pv (ob, flags); } inline int call_pvsv (SV *ob, I32 flags) { return call_sv (ob, flags); } -#define CALL_BEGIN(args) dSP; ENTER; SAVETMPS; PUSHMARK (SP); EXTEND (SP, args) +// TODO: temporarily enabled pushstack/popstack for all calls from the core, to maybe fix object memleak? +#define CALL_PUSH PUSHSTACKi (PERLSI_UNKNOWN) +#define CALL_POP PUTBACK; POPSTACK; SPAGAIN +#define CALL_BEGIN(args) dSP; CALL_PUSH; ENTER; SAVETMPS; PUSHMARK (SP); EXTEND (SP, args) #define CALL_ARG_SV(sv) PUSHs (sv_2mortal (sv)) // separate because no refcount inc #define CALL_ARG(expr) PUSHs (sv_2mortal (to_sv (expr))) #define CALL_CALL(name, flags) PUTBACK; int count = call_pvsv (name, (flags) | G_EVAL); SPAGAIN; -#define CALL_END PUTBACK; CHECK_ERROR; FREETMPS; LEAVE +#define CALL_END PUTBACK; CHECK_ERROR; FREETMPS; LEAVE; CALL_POP ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -128,6 +131,8 @@ extern tstamp runtime; // virtual server time, excluding time jumps and lag extern tstamp NOW; // real time of current server tick +noinline utf8_string cfSvPVutf8_nolen (SV *sv); + enum event_klass { KLASS_NONE, @@ -212,6 +217,9 @@ // return wether an object was destroyed already MTH bool destroyed () const { return attachable_flags & F_DESTROYED; } + // destruct and free the memory for this object + virtual void do_delete (); + virtual void gather_callbacks (AV *&callbacks, event_type event) const; #if 0 @@ -284,213 +292,7 @@ ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -// a little dirty hack, maybe unify with something else at a later time -struct keyword_string -{ - const char *s; - const int l; - - keyword_string (const char *s, int l) - : s(s), l(l) - { } - - keyword_string (keyword kw) - : s(keyword_str [kw]), l(keyword_len [kw]) - { - } - - keyword_string (shstr_tmp sh) - : s(&sh), l(sh.length ()) - { - } -}; - -#define CS(keyword) keyword_string (# keyword, sizeof (# keyword) - 1) -#define KW(keyword) CS(keyword) - -INTERFACE_CLASS(object_freezer) -struct object_freezer : dynbuf_text -{ - AV *av; - - object_freezer (); - ~object_freezer (); - - // serialise perl part - void put_ (attachable *ext); - void put (attachable *ext) - { - if (expect_false (ext->self)) - put_ (ext); - } - - // null value (== no space after keyword) - void put (const keyword_string k) - { - char *p = force (k.l + 1); - memcpy (p, k.s, k.l); p += k.l; *p++ = '\n'; - alloc (p); - } - - void put (const keyword_string k, const keyword_string v) - { - char *p = force (k.l + 1 + v.l + 1); - memcpy (p, k.s, k.l); p += k.l; *p++ = ' '; - memcpy (p, v.s, v.l); p += v.l; *p++ = '\n'; - alloc (p); - } - - void put (const keyword_string k, const_utf8_string v) - { - if (expect_true (v)) - put (k, keyword_string (v, strlen (v))); - else - put (k); - } - - void put (const keyword_string k, shstr_tmp v) - { - put (k, keyword_string (v)); - } - - void put (const keyword_string k, double v) - { - char *p = force (MAX_KEYWORD_LEN + 2 + 32); - memcpy (p, k.s, k.l); p += k.l; *p++ = ' '; - p += sprintf (p, "%.7g", v); *p++ = '\n'; - alloc (p); - } - - void put_(const keyword_string k, sint64 v) - { - force (MAX_KEYWORD_LEN + 2 + sint64_digits); - fadd (k.s, k.l); - fadd (' '); - add (v); - fadd ('\n'); - } - - void put_(const keyword_string k, sint32 v) - { - force (MAX_KEYWORD_LEN + 2 + sint32_digits); - fadd (k.s, k.l); - fadd (' '); - add (v); - fadd ('\n'); - } - - void put (const keyword_string k, float v) { put (k, (double)v); } - void put (const keyword_string k, signed char v) { put_(k, (sint32)v); } - void put (const keyword_string k, unsigned char v) { put_(k, (sint32)v); } - void put (const keyword_string k, signed short v) { put_(k, (sint32)v); } - void put (const keyword_string k, unsigned short v) { put_(k, (sint32)v); } - void put (const keyword_string k, signed int v) { put_(k, (sint32)v); } - void put (const keyword_string k, unsigned int v) { put_(k, (sint64)v); } - void put (const keyword_string k, signed long v) { put_(k, (sint64)v); } - void put (const keyword_string k, unsigned long v) { put_(k, (sint64)v); } - void put (const keyword_string k, signed long long v) { put_(k, (sint64)v); } - void put (const keyword_string k, unsigned long long v) { put_(k, (sint64)v); } - - void put (const keyword_string kbeg, const keyword_string kend, shstr_tmp v) - { - force (MAX_KEYWORD_LEN + 1); - fadd (kbeg.s, kbeg.l); fadd ('\n'); - - if (expect_true (v)) - { - add (v); - add ('\n'); - } - - force (MAX_KEYWORD_LEN + 1); - fadd (kend.s, kend.l); fadd ('\n'); - } - - void put (const keyword_string k, archetype *v); - void put (const keyword_string k, treasurelist *v); - void put (const keyword_string k, faceinfo *v); - - template - void put (const keyword_string k, const refptr &v) - { - put (k, (T *)v); - } - - MTH bool save (const_octet_string path); - utf8_string as_string (); // like strdup - - operator bool () { return !!av; } -}; - -INTERFACE_CLASS(object_thawer) -struct object_thawer -{ - char *line; // current beginning of line - SV *text; // text part - AV *av; // perl part - int linenum; - keyword kw; - char *kw_str; // the keyword parsed, as string - char *value; // the value, or 0 if no value - const char *value_nn; // the value, or the empty string if no value - const char *name; - - operator bool () const { return !!text; } - - object_thawer (const_utf8_string path = 0); - object_thawer (const_utf8_string data, AV *perlav); - ~object_thawer (); - - void get (attachable *obj, int oid); - - // parse next line - MTH void next (); - // skip the current key-value (usually fetch next line, for - // multiline-fields, skips till the corresponding end-kw - MTH void skip (); - MTH void skip_block (); // skips till and over KW_end - - bool has_value () { return value; } - const_utf8_string get_str () { return value_nn; } // empty string when missing - 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 { return strtoll (value_nn, 0, 10); } - double get_double () const { return strtod (value_nn, 0); } - - void get (float &v) { v = get_double (); } - void get (double &v) { v = get_double (); } - - 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 (); } - void get (uint16 &i) { i = get_sint32 (); } - void get (sint32 &i) { i = get_sint32 (); } - - void get (uint32 &i) { i = get_sint64 (); } - void get (sint64 &i) { i = get_sint64 (); } - - MTH void parse_warn (const_utf8_string msg); - MTH bool parse_error (const_utf8_string type = 0, const_utf8_string name = 0, bool skip = true); - - struct delayed_ref { - attachable *op; - object_ptr *ptr; - const_utf8_string ref; - }; - std::vector delrefs; - - void delayed_deref (attachable *op, object_ptr &ptr, const_utf8_string ref); - MTH void resolve_delayed_derefs (bool deref = true); -}; - -//TODO: remove -char *fgets (char *s, int n, object_thawer &thawer); +#include "freezethaw.h" //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////