--- deliantra/server/include/cfperl.h 2009/11/05 14:38:48 1.110 +++ deliantra/server/include/cfperl.h 2010/06/26 22:10:18 1.123 @@ -1,7 +1,7 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team * * Deliantra is free software: you can redistribute it and/or modify it under * the terms of the Affero GNU General Public License as published by the @@ -26,10 +26,6 @@ #ifndef CFPERL_H__ #define CFPERL_H__ -#include -#include -#include - using namespace std; #include @@ -87,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 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -101,15 +100,15 @@ void cfperl_emergency_save (); void cfperl_cleanup (int make_core); void cfperl_make_book (object *book, int level); -void cfperl_send_msg (client *ns, int color, const char *type, const char *msg); +void cfperl_send_msg (client *ns, int color, const_utf8_string type, const_utf8_string msg); int cfperl_can_merge (object *ob1, object *ob2); void cfperl_mapscript_activate (object *ob, int state, object *activator, object *originator = 0); -bool is_match_expr (const char *expr); +bool is_match_expr (const_utf8_string expr); // applies the match expression and returns true if it matches -bool match (const char *expr, object *ob, object *self = 0, object *source = 0, object *originator = 0); +bool match (const_utf8_string expr, object *ob, object *self = 0, object *source = 0, object *originator = 0); // same as above, but returns the first object found, or 0 -object *match_one (const char *expr, object *ob, object *self = 0, object *source = 0, object *originator = 0); +object *match_one (const_utf8_string expr, object *ob, object *self = 0, object *source = 0, object *originator = 0); ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -132,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, @@ -198,7 +199,7 @@ F_DESTROYED = 0x01, F_DEBUG_TRACE = 0x02, }; - uint8 ACC (RW, flags); + uint8 ACC (RW, attachable_flags); static unordered_vector mortals; MTH static void check_mortals (); @@ -214,7 +215,10 @@ MTH void destroy (); // return wether an object was destroyed already - MTH bool destroyed () const { return flags & F_DESTROYED; } + 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; @@ -232,31 +236,31 @@ void optimise (); // possibly save some memory by destroying unneeded data attachable () - : flags (0), self (0), cb (0), attach (0) + : attachable_flags (0), self (0), cb (0), attach (0) { } attachable (const attachable &src) - : flags (0), self (0), cb (0), attach (src.attach) + : attachable_flags (0), self (0), cb (0), attach (src.attach) { } // set a custom key to the given value, or delete it if value = 0 - void set_key (const char *key, const char *value = 0, bool is_utf8 = 0); + void set_key (const_utf8_string key, const_utf8_string value = 0, bool is_utf8 = 0); - void set_key_text (const char *key, const char *value = 0) + void set_key_text (const_utf8_string key, const_utf8_string value = 0) { set_key (key, value, 1); } - void set_key_data (const char *key, const char *value = 0) + void set_key_data (const_utf8_string key, const_utf8_string value = 0) { set_key (key, value, 0); } attachable &operator =(const attachable &src); - // used to _quickly_ device wether to shortcut the evaluation + // used to _quickly_ decide wether to shortcut the evaluation bool should_invoke (event_type event) { return ev_want_event [event] || cb; @@ -288,194 +292,7 @@ ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -INTERFACE_CLASS(object_freezer) -struct object_freezer : dynbuf_text -{ - AV *av; - - object_freezer (); - ~object_freezer (); - - void put (attachable *ext); - - // used only for user-defined key-value pairs - void put (shstr_tmp k, shstr_tmp v) - { - add (k); - - if (expect_true (v)) - add (' '), add (v); - - add ('\n'); - } - - template - void put_kw_string (keyword k, const T &v) - { - int klen = keyword_len [k]; - int vlen = v ? strlen (v) + 1 : 0; - - char *p = (char *)alloc (klen + vlen + 1); - - memcpy (p, keyword_str [k], klen); p += klen; - - if (expect_true (v)) - { - *p++ = ' '; vlen--; - memcpy (p, v, vlen); p += vlen; - } - - *p = '\n'; - } - - void put (keyword k, const char *v = 0) - { - put_kw_string (k, v); - } - - void put (keyword k, shstr_tmp v) - { - put_kw_string (k, v); - } - - void put (keyword k, double v) - { - force (MAX_KEYWORD_LEN + 2 + 32); - fadd (keyword_str [k], keyword_len [k]); - fadd (' '); - falloc (sprintf (ptr, "%.7g", v)); - fadd ('\n'); - } - - void put_(keyword k, sint64 v) - { - force (MAX_KEYWORD_LEN + 2 + sint64_digits); - fadd (keyword_str [k], keyword_len [k]); - fadd (' '); - add (v); - fadd ('\n'); - } - - void put_(keyword k, sint32 v) - { - force (MAX_KEYWORD_LEN + 2 + sint32_digits); - fadd (keyword_str [k], keyword_len [k]); - fadd (' '); - add (v); - fadd ('\n'); - } - - void put (keyword k, float v) { put (k, (double)v); } - void put (keyword k, signed char v) { put_(k, (sint32)v); } - void put (keyword k, unsigned char v) { put_(k, (sint32)v); } - void put (keyword k, signed short v) { put_(k, (sint32)v); } - void put (keyword k, unsigned short v) { put_(k, (sint32)v); } - void put (keyword k, signed int v) { put_(k, (sint32)v); } - void put (keyword k, unsigned int v) { put_(k, (sint64)v); } - void put (keyword k, signed long v) { put_(k, (sint64)v); } - void put (keyword k, unsigned long v) { put_(k, (sint64)v); } - void put (keyword k, signed long long v) { put_(k, (sint64)v); } - void put (keyword k, unsigned long long v) { put_(k, (sint64)v); } - - void put (keyword kbeg, keyword kend, shstr_tmp v) - { - force (MAX_KEYWORD_LEN + 1); - fadd (keyword_str [kbeg], keyword_len [kbeg]); fadd ('\n'); - - if (expect_true (v)) - { - add (v); - add ('\n'); - } - - force (MAX_KEYWORD_LEN + 1); - fadd (keyword_str [kend], keyword_len [kend]); fadd ('\n'); - } - - void put (keyword k, archetype *v); - void put (keyword k, treasurelist *v); - void put (keyword k, faceinfo *v); - - template - void put (keyword k, const refptr &v) - { - put (k, (T *)v); - } - - MTH bool save (const_octet_string path); - char *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 char *path = 0); - object_thawer (const char *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 - - 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 { 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 char *msg); - MTH bool parse_error (const char *type = 0, const char *name = 0, bool skip = true); - - struct delayed_ref { - attachable *op; - object_ptr *ptr; - const char *ref; - }; - std::vector delrefs; - - void delayed_deref (attachable *op, object_ptr &ptr, const char *ref); - MTH void resolve_delayed_derefs (bool deref = true); -}; - -//TODO: remove -char *fgets (char *s, int n, object_thawer &thawer); +#include "freezethaw.h" //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////