--- deliantra/server/include/cfperl.h 2007/06/06 05:41:26 1.78 +++ deliantra/server/include/cfperl.h 2008/06/19 09:08:22 1.98 @@ -1,25 +1,24 @@ /* - * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. + * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team + * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team * Copyright (©) 1992,2007 Frank Tore Johansen * - * Crossfire TRT is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. + * Deliantra is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along - * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 - * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . * - * The authors can be reached via e-mail to + * The authors can be reached via e-mail to */ // @@ -38,7 +37,7 @@ #include #include -#include +#include #include #include "util.h" @@ -53,11 +52,14 @@ #undef srand48 #undef drand48 #undef srandom +#undef opendir #undef readdir +#undef closedir #undef getprotobyname #undef gethostbyname #undef ctime #undef strerror +#undef _ // same here, massive symbol spamming #undef do_open @@ -72,11 +74,16 @@ ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +#define _(msg) (msg) +#define N_(msg) (msg) + +////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + // some macros to simplify perl in-calls #define CHECK_ERROR \ if (SvTRUE (ERRSV)) \ - LOG (llevError, "runtime error in %s: %s\n", __func__, SvPVutf8_nolen (ERRSV)); + LOG (llevError, "runtime error in %s: %s", __func__, SvPVutf8_nolen (ERRSV)); #define CALL_BEGIN(args) dSP; ENTER; SAVETMPS; PUSHMARK (SP); EXTEND (SP, args) #define CALL_ARG_SV(sv) PUSHs (sv_2mortal (sv)) // separate because no refcount inc @@ -88,14 +95,34 @@ void cfperl_init (); void cfperl_main (); +void cfperl_tick (); void cfperl_emergency_save (); void cfperl_cleanup (int make_core); void cfperl_make_book (object *book, int level); +void cfperl_expand_cfpod (player *pl, std::string &msg); +void cfperl_send_msg (client *ns, int color, const char *type, const char *msg); +int cfperl_can_merge (object *ob1, object *ob2); ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -// virtual server time, excluding time jumps and lag -extern double runtime; +#if IVSIZE >= 8 + typedef IV val64; + typedef IV uval64; +# define newSVval64 newSViv +# define SvVAL64 SvIV +# define newSVuval64 newSVuv +# define SvUVAL64 SvUV +#else + typedef double val64; + typedef double uval64; +# define newSVval64 newSVnv +# define SvVAL64 SvNV +# define newSVuval64 newSVnv +# define SvUVAL64 SvNV +#endif + +extern tstamp runtime; // virtual server time, excluding time jumps and lag +extern tstamp NOW; // real time of current server tick enum event_klass { @@ -155,7 +182,7 @@ ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// INTERFACE_CLASS (attachable) -struct attachable +struct attachable : refcnt_base { static MGVTBL vtbl; @@ -166,14 +193,9 @@ F_DESTROYED = 0x01, F_DEBUG_TRACE = 0x02, }; - - // object is delete'd after the refcount reaches 0 int ACC (RW, flags); - mutable int ACC (RW, refcnt); - - MTH void refcnt_inc () const { ++refcnt; } - MTH void refcnt_dec () const { --refcnt; } + // object is delete'd after the refcount reaches 0 MTH int refcnt_cnt () const; // check wether the object has died and destroy MTH void refcnt_chk () { if (expect_false (refcnt <= 0)) do_check (); } @@ -202,16 +224,27 @@ void optimise (); // possibly save some memory by destroying unneeded data attachable () - : flags (0), refcnt (0), self (0), cb (0), attach (0) + : flags (0), self (0), cb (0), attach (0) { } attachable (const attachable &src) - : flags (0), refcnt (0), self (0), cb (0), attach (src.attach) + : flags (0), self (0), cb (0), attach (src.attach) { } - virtual ~attachable (); + // 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_text (const char *key, const char *value = 0) + { + set_key (key, value, 1); + } + + void set_key_data (const char *key, const char *value = 0) + { + set_key (key, value, 0); + } attachable &operator =(const attachable &src); @@ -232,6 +265,9 @@ // the method that does the real destroy work virtual void do_destroy (); + + // destructor is protected, should not be called by anybody + virtual ~attachable (); }; // the global object is a pseudo object that cares for the global events @@ -244,6 +280,7 @@ ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +INTERFACE_CLASS(object_freezer) struct object_freezer : dynbuf_text { AV *av; @@ -357,12 +394,13 @@ put (k, (T *)v); } - bool save (const char *path); + 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 @@ -372,10 +410,10 @@ 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 *value_nn; // the value, or the empty string if no value const char *name; - operator bool () { return !!text; } + operator bool () const { return !!text; } object_thawer (const char *path = 0); object_thawer (const char *data, AV *perlav); @@ -384,10 +422,11 @@ void get (attachable *obj, int oid); // parse next line - void next (); + MTH void next (); // skip the current key-value (usually fetch next line, for // multiline-fields, skips till the corresponding end-kw - void skip (); + 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); @@ -413,7 +452,18 @@ 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); + 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 @@ -424,99 +474,108 @@ struct coroapi { static struct CoroAPI *GCoroAPI; - static int nready () { return CORO_NREADY; } - static int cede () { return CORO_CEDE ; } + static EV_ATOMIC_T cede_pending; - static double (*time)(); - static double next_cede; - static int cede_counter; + static int nready () { return CORO_NREADY; } + static int cede () { cede_pending = 0; return CORO_CEDE ; } - 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 (); - } + // actually cede's far more often static bool cede_to_tick () { - if (expect_true (time () < next_cede)) + if (expect_true (!cede_pending)) return false; do_cede_to_tick (); return true; } - static bool cede_to_tick_every (int count) - { - if (expect_true (++cede_counter < count)) - return false; - - return cede_to_tick (); - } - static void wait_for_tick (); static void wait_for_tick_begin (); }; -struct watcher_base +struct evapi { - static struct EventAPI *GEventAPI; + static struct EVAPI *GEVAPI; }; -template -struct watcher : watcher_base +struct iow : ev_io, evapi, callback { - base *pe; + static void thunk (EV_P_ struct ev_io *w_, int revents) + { + iow &w = *static_cast(w_); + + w (w, revents); + } - 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); } + template + iow (O object, M method) + : callback (object, method) + { + ev_init ((ev_io *)this, thunk); + } - void prio (int new_prio) { ((pe_watcher *)pe)->prio = new_prio; } + void prio (int prio) + { + ev_set_priority ((ev_io *)this, prio); + } - ~watcher () + void set (int fd, int events) { - cancel (); + ev_io_set ((ev_io *)this, fd, events); } -private: - void cancel () { GEventAPI->cancel ((pe_watcher *)pe); } // private -}; + int poll () const { return events; } -struct iw : watcher, callback -{ - template - iw (O object, M method) - : callback (object, method) + void poll (int events); + + void start () { - alloc (); + ev_io_start (EV_DEFAULT, (ev_io *)this); } -private: - void alloc (); + void stop () + { + ev_io_stop (EV_DEFAULT, (ev_io *)this); + } + + ~iow () + { + stop (); + } }; -struct iow : watcher, callback +struct asyncw : ev_async, evapi, callback { + static void thunk (EV_P_ struct ev_async *w_, int revents) + { + asyncw &w = *static_cast(w_); + + w (w, revents); + } + template - iow (O object, M method) - : callback (object, method) + asyncw (O object, M method) + : callback (object, method) { - alloc (); + ev_init ((ev_async *)this, thunk); } - void fd (int fd); - int poll (); - void poll (int events); + void start () + { + ev_async_start (EV_DEFAULT, (ev_async *)this); + } -private: - void alloc (); + void stop () + { + ev_async_stop (EV_DEFAULT, (ev_async *)this); + } + + ~asyncw () + { + stop (); + } }; #endif