--- deliantra/server/include/cfperl.h 2007/08/16 06:36:56 1.87
+++ deliantra/server/include/cfperl.h 2009/01/01 19:42:43 1.102
@@ -1,11 +1,11 @@
/*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * 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
+ * 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.
@@ -18,7 +18,7 @@
* 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
*/
//
@@ -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;
@@ -214,7 +233,17 @@
}
// set a custom key to the given value, or delete it if value = 0
- void set_key (const char *key, const char *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);
@@ -250,6 +279,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+INTERFACE_CLASS(object_freezer)
struct object_freezer : dynbuf_text
{
AV *av;
@@ -260,7 +290,7 @@
void put (attachable *ext);
// used only for user-defined key-value pairs
- void put (const shstr &k, const shstr &v)
+ void put (shstr_tmp k, shstr_tmp v)
{
add (k);
@@ -294,7 +324,7 @@
put_kw_string (k, v);
}
- void put (keyword k, const shstr &v)
+ void put (keyword k, shstr_tmp v)
{
put_kw_string (k, v);
}
@@ -338,7 +368,7 @@
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, const shstr &v)
+ void put (keyword kbeg, keyword kend, shstr_tmp v)
{
force (MAX_KEYWORD_LEN + 1);
fadd (keyword_str [kbeg], keyword_len [kbeg]); fadd ('\n');
@@ -363,12 +393,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
@@ -378,10 +409,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);
@@ -390,10 +421,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);
@@ -419,8 +451,18 @@
void get (uint32 &i) { i = get_sint64 (); }
void get (sint64 &i) { i = get_sint64 (); }
- void parse_warn (const char *msg);
- 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
@@ -431,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