--- deliantra/server/include/cfperl.h 2008/01/13 12:14:52 1.93
+++ deliantra/server/include/cfperl.h 2012/01/03 11:25:31 1.125
@@ -1,22 +1,21 @@
/*
* This file is part of Deliantra, the Roguelike Realtime MMORPG.
*
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 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 GNU General Public License as published by
- * the Free Software Foundation, either version 3 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 Affero 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.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * .
*
* The authors can be reached via e-mail to
*/
@@ -27,10 +26,6 @@
#ifndef CFPERL_H__
#define CFPERL_H__
-#include
-#include
-#include
-
using namespace std;
#include
@@ -52,7 +47,9 @@
#undef srand48
#undef drand48
#undef srandom
+#undef opendir
#undef readdir
+#undef closedir
#undef getprotobyname
#undef gethostbyname
#undef ctime
@@ -81,29 +78,61 @@
#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));
+
+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_pv (name, (flags) | G_EVAL); SPAGAIN;
-#define CALL_END CHECK_ERROR; FREETMPS; LEAVE
+#define CALL_CALL(name, flags) PUTBACK; int count = call_pvsv (name, (flags) | G_EVAL); SPAGAIN;
+#define CALL_END PUTBACK; CHECK_ERROR; FREETMPS; LEAVE; CALL_POP
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
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_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_utf8_string expr);
+// applies the match expression and returns true if it matches
+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_utf8_string expr, object *ob, object *self = 0, object *source = 0, object *originator = 0);
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#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
+noinline utf8_string cfSvPVutf8_nolen (SV *sv);
+
enum event_klass
{
KLASS_NONE,
@@ -166,14 +195,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, attachable_flags);
+
+ static unordered_vector mortals;
+ MTH static void check_mortals ();
// object is delete'd after the refcount reaches 0
MTH int refcnt_cnt () const;
@@ -186,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;
@@ -204,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;
@@ -260,233 +292,30 @@
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-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 (const shstr &k, const shstr &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, const shstr &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, const shstr &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"
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
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 ();
};
@@ -512,6 +341,11 @@
ev_init ((ev_io *)this, thunk);
}
+ void prio (int prio)
+ {
+ ev_set_priority ((ev_io *)this, prio);
+ }
+
void set (int fd, int events)
{
ev_io_set ((ev_io *)this, fd, events);
@@ -535,6 +369,38 @@
{
stop ();
}
+};
+
+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
+ asyncw (O object, M method)
+ : callback (object, method)
+ {
+ ev_init ((ev_async *)this, thunk);
+ }
+
+ void start ()
+ {
+ ev_async_start (EV_DEFAULT, (ev_async *)this);
+ }
+
+ void stop ()
+ {
+ ev_async_stop (EV_DEFAULT, (ev_async *)this);
+ }
+
+ ~asyncw ()
+ {
+ stop ();
+ }
};
#endif