--- deliantra/server/include/cfperl.h 2007/11/08 19:43:24 1.90 +++ deliantra/server/include/cfperl.h 2008/11/20 12:18:07 1.101 @@ -1,7 +1,7 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include "util.h" @@ -52,7 +52,9 @@ #undef srand48 #undef drand48 #undef srandom +#undef opendir #undef readdir +#undef closedir #undef getprotobyname #undef gethostbyname #undef ctime @@ -81,18 +83,19 @@ #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 #define CALL_ARG(expr) PUSHs (sv_2mortal (to_sv (expr))) #define CALL_CALL(name, flags) PUTBACK; int count = call_pv (name, (flags) | G_EVAL); SPAGAIN; -#define CALL_END CHECK_ERROR; FREETMPS; LEAVE +#define CALL_END PUTBACK; CHECK_ERROR; FREETMPS; LEAVE ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 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); @@ -101,6 +104,22 @@ ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +#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 @@ -166,14 +185,14 @@ { static MGVTBL vtbl; - static unordered_vector mortals; - MTH static void check_mortals (); - enum { F_DESTROYED = 0x01, F_DEBUG_TRACE = 0x02, }; - int ACC (RW, flags); + uint8 ACC (RW, flags); + + static unordered_vector mortals; + MTH static void check_mortals (); // object is delete'd after the refcount reaches 0 MTH int refcnt_cnt () const; @@ -390,7 +409,7 @@ 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 () const { return !!text; } @@ -454,98 +473,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 tstamp 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 (now () < 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