--- deliantra/server/include/cfperl.h 2006/08/31 18:59:24 1.20 +++ deliantra/server/include/cfperl.h 2006/12/19 04:58:04 1.40 @@ -12,6 +12,10 @@ #include #include +#include + +#include "callback.h" + // optimisations/workaround for functions requiring my_perl in scope (anti-bloat) #undef localtime #undef srand48 @@ -23,22 +27,27 @@ #undef ctime #undef strerror +// same here, massive symbol spamming +#undef do_open +#undef do_close + // perl bug #40256: perl does overwrite those with reentrant versions // but does not initialise their state structures. #undef random #undef crypt void cfperl_init (); -void cfperl_boot (); void cfperl_main (); enum event_klass { KLASS_NONE, KLASS_GLOBAL, + KLASS_CLIENT, KLASS_PLAYER, KLASS_OBJECT, KLASS_MAP, + KLASS_COMMAND, }; enum event_type @@ -54,48 +63,74 @@ #define ARG_INT64(v) DT_INT64 , static_cast (v) #define ARG_DOUBLE(v) DT_DOUBLE, static_cast (v) #define ARG_STRING(v) DT_STRING, static_cast (v) -#define ARG_DATA(s,l) DT_DATA , static_cast (s), (l) -#define ARG_OBJECT(o) DT_OBJECT, (void *)static_cast (o) -#define ARG_MAP(o) DT_MAP , (void *)static_cast (o) -#define ARG_PLAYER(o) DT_PLAYER, (void *)static_cast (o) -#define ARG_ARCH(o) DT_ARCH , (void *)static_cast (o) -#define ARG_PARTY(o) DT_PARTY , (void *)static_cast (o) -#define ARG_REGION(o) DT_REGION, (void *)static_cast (o) +#define ARG_DATA(s,l) DT_DATA , static_cast (s), int (l) +#define ARG_OBJECT(o) DT_OBJECT, (void *)static_cast (o) +#define ARG_MAP(o) DT_MAP , (void *)static_cast (o) +#define ARG_PLAYER(o) DT_PLAYER, (void *)static_cast (o) +#define ARG_ARCH(o) DT_ARCH , (void *)static_cast (o) +#define ARG_PARTY(o) DT_PARTY , (void *)static_cast (o) +#define ARG_REGION(o) DT_REGION, (void *)static_cast (o) +#define ARG_CLIENT(o) DT_CLIENT, (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_(event, ...) cfperl_invoke (event, ## __VA_ARGS__, DT_END) -#define INVOKE(klass, event, ...) INVOKE_(EVENT_ ## klass ## _ ## event, ## __VA_ARGS__) -#define INVOKE_GLOBAL(event, ...) INVOKE_(EVENT_ ## GLOBAL ## _ ## event, ## __VA_ARGS__) -#define INVOKE_OBJECT(event, op, ...) INVOKE_(EVENT_ ## OBJECT ## _ ## event, ARG_OBJECT (op), ## __VA_ARGS__) -#define INVOKE_PLAYER(event, pl, ...) INVOKE_(EVENT_ ## PLAYER ## _ ## event, ARG_PLAYER (pl), ## __VA_ARGS__) -#define INVOKE_MAP(event, map, ...) INVOKE_(EVENT_ ## MAP ## _ ## event, ARG_MAP (map) , ## __VA_ARGS__) +#define INVOKE(klass, event, ...) INVOKE_(EVENT_ ## klass ## _ ## event, ## __VA_ARGS__) +#define INVOKE_GLOBAL(event, ...) INVOKE_(EVENT_ ## GLOBAL ## _ ## event, ## __VA_ARGS__) +#define INVOKE_OBJECT(event, op, ...) INVOKE_(EVENT_ ## OBJECT ## _ ## event, ARG_OBJECT (op), ## __VA_ARGS__) +#define INVOKE_CLIENT(event, ns, ...) INVOKE_(EVENT_ ## CLIENT ## _ ## event, ARG_CLIENT (ns), ## __VA_ARGS__) +#define INVOKE_PLAYER(event, pl, ...) INVOKE_(EVENT_ ## PLAYER ## _ ## event, ARG_PLAYER (pl), ## __VA_ARGS__) +#define INVOKE_MAP(event, map, ...) INVOKE_(EVENT_ ## MAP ## _ ## event, ARG_MAP (map) , ## __VA_ARGS__) //TODO should index into @result #define RESULT(idx,type) cfperl_result_ ## type (idx) -#define RESULT_INT(idx) RESULT(idx, INT) +#define RESULT_DOUBLE(idx) RESULT(idx, DOUBLE) +#define RESULT_INT(idx) RESULT(idx, INT) bool cfperl_invoke (event_type event, ...); +double cfperl_result_DOUBLE (int idx); int cfperl_result_INT (int idx); struct attachable_base { - SV *self; - AV *cb; // CF+ perl self and callback - const char *attach; // generic extension attachment information + SV *self; // CF+ perl self + AV *cb; // CF+ callbacks + shstr attach; // generic extension attachment information void clear (); // called when free'ing objects void optimise (); // possibly save some memory by destroying unneeded data void instantiate (data_type type, void *obj); - void attachable_init () + void attachable_clear () { self = 0; cb = 0; attach = 0; } + + attachable_base () + { + attachable_clear (); + } + + ~attachable_base () + { + clear (); + } + + attachable_base (const attachable_base &src) + : self (0), cb (0), attach (src.attach) + { + } + + attachable_base &operator =(const attachable_base &src) + { + clear (); + attach = src.attach; + return *this; + } }; // objects attachable from perl (or any other extension) should include or @@ -126,20 +161,18 @@ put ((attachable_base *)obj); } - //TODO//temporary - void put (const char *k, const char *v) + // used only for user-defined key-value pairs + void put (const shstr &k, const shstr &v) { add (k); - //if (v) - add (' '); //TODO//cf compatibility always add space if (v) - add (v); + add (' '), add (v); add ('\n'); } - //TODO//temporary + //TODO//temporary, used only for saving body locations void put (const char *k, int v) { add (k); @@ -148,19 +181,35 @@ add ('\n'); } - void put (keyword k, const char *v) + template + void put_string (keyword k, const T &v) { int klen = keyword_len [k]; - int vlen = v ? strlen (v) : 0; + int vlen = v ? strlen (v) + 1 : 0; - char *p = (char *)alloc (klen + 1 + vlen + 1); + char *p = (char *)alloc (klen + vlen + 1); memcpy (p, keyword_str [k], klen); p += klen; - *p++ = ' '; //TODO//cf compatibility always add space - memcpy (p, v, vlen); p += vlen; + + if (v) + { + *p++ = ' '; vlen--; + memcpy (p, v, vlen); p += vlen; + } + *p = '\n'; } + void put (keyword k, const char *v) + { + put_string (k, v); + } + + void put (keyword k, const shstr &v) + { + put_string (k, v); + } + void put (keyword k, double v) { char buf [128]; @@ -186,7 +235,7 @@ add ('\n'); } - void put (keyword kbeg, keyword kend, const char *v) + void put (keyword kbeg, keyword kend, const shstr &v) { add (keyword_str [kbeg], keyword_len [kbeg]); add ('\n'); @@ -212,12 +261,22 @@ void put (keyword k, unsigned long long v) { put_(k, (sint64)v); } template - void put (keyword k, T *v) + void put (keyword k, const T *v) + { + if (v) + put (k, v->name); + else + put (k, (const char *)0); + } + + template + void put (keyword k, const refptr &v) { - put (k, v ? (const char *)v->name : 0); + put (k, (T *)v); } bool save (const char *filename); + char *as_string (); // like strdup operator bool () { return !!av; } }; @@ -226,21 +285,17 @@ int fprintf (object_freezer &freezer, const char *format, ...); int fputs (const char *s, object_freezer &freezer); -// a single key-value line from a file -struct token { - keyword k; - const char *v; - - token (keyword k, const char *v = 0) : k(k), v(v) { } -}; - struct object_thawer { - AV *av; - FILE *fp; - char line[1024]; + SV *text; // text part + AV *av; // perl part + char *line; // current beginning of line + char *last_value; + + operator bool () { return !!text; } object_thawer (const char *filename = 0); + object_thawer (const char *data, AV *perlav); ~object_thawer (); void get (data_type type, void *obj, attachable_base *ext, int oid); @@ -252,9 +307,88 @@ get ((data_type) cftype::dt, (subclass *)obj, obj, oid); } - token get_token (); + keyword get_kv (); // also parse value for later use + + const char *get_str () { return last_value; } // may be 0 + + void get (shstr &sh) const; + void get_ornull (shstr &sh) const { sh = last_value; } + void get_ml (keyword kend, shstr &sh); + + sint32 get_sint32 () const; + sint64 get_sint64 () const; + double get_double () const; + + void get (float &v) { v = get_double (); } + void get (double &v) { v = get_double (); } + + 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 (); } +}; + +char *fgets (char *s, int n, object_thawer &thawer); + +struct watcher_base +{ + static struct EventAPI *GEventAPI; +}; + +template +struct watcher : watcher_base +{ + base *pe; + + void start (bool repeat = false) { GEventAPI->start ((pe_watcher *)pe, repeat); } + void stop (bool cancel_events = false) { GEventAPI->stop ((pe_watcher *)pe, cancel_events); } + void now () { GEventAPI->now ((pe_watcher *)pe); } + void suspend () { GEventAPI->suspend ((pe_watcher *)pe); } + void resume () { GEventAPI->resume ((pe_watcher *)pe); } + + void prio (int new_prio) { ((pe_watcher *)pe)->prio = new_prio; } + + ~watcher () + { + cancel (); + } + +private: + void cancel () { GEventAPI->cancel ((pe_watcher *)pe); } // private +}; + +struct iw : watcher, callback +{ + template + iw (O object, M method) + : callback (object, method) + { + alloc (); + } + +private: + void alloc (); +}; + +struct iow : watcher, callback +{ + template + iow (O object, M method) + : callback (object, method) + { + alloc (); + } + + void fd (int fd); + int poll (); + void poll (int events); - operator FILE *() { return fp; } +private: + void alloc (); }; #endif