[ViewVC] Diff of: cvs/deliantra/server/include/cfperl.h

Comparing deliantra/server/include/cfperl.h (file contents):
Revision 1.76 by root, Mon Jun 4 12:19:08 2007 UTC vs.
Revision 1.106 by root, Sun Oct 11 18:18:03 2009 UTC

 /*
- * 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
+ * Deliantra is free software: you can redistribute it and/or modify
- * under the terms of the GNU General Public License as published by the Free
+ * it under the terms of the GNU General Public License as published by
- * Software Foundation; either version 2 of the License, or (at your option)
+ * the Free Software Foundation, either version 3 of the License, or
- * any later version.
+ * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful, but
+ * This program is distributed in the hope that it will be useful,
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along
+ * You should have received a copy of the GNU General Public License
- * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 //
 // cfperl.h perl interface
 //
 #include <EXTERN.h>
 #include <perl.h>
 #include <XSUB.h>
-#include <EventAPI.h>
+#include <EVAPI.h>
 #include <CoroAPI.h>
 #include "util.h"
 #include "keyword.h"
 #include "dynbuf.h"
 // optimisations/workaround for functions requiring my_perl in scope (anti-bloat)
 #undef localtime
 #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
 #undef do_close
 #undef ref
 #undef random
 #undef crypt
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#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
 #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);
+void cfperl_send_msg (client *ns, int color, const char *type, const char *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 char *expr);
+/* applies the match expression and returns true if it matches */
+bool match (const char *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
-// virtual server time, excluding time jumps and lag
+extern tstamp runtime; // virtual server time, excluding time jumps and lag
-extern double runtime;
+extern tstamp NOW;     // real time of current server tick
 enum event_klass
 {
   KLASS_NONE,
   KLASS_GLOBAL,
 int cfperl_result_INT (int idx);
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 INTERFACE_CLASS (attachable)
-struct attachable
+struct attachable : refcnt_base
 {
   static MGVTBL vtbl;
-  static unordered_vector<attachable *> mortals;
-  MTH static void check_mortals ();
   enum {
     F_DESTROYED   = 0x01,
     F_DEBUG_TRACE = 0x02,
   };
+  uint8 ACC (RW, flags);
+  static unordered_vector<attachable *> mortals;
+  MTH static void check_mortals ();
   // 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; }
   MTH int refcnt_cnt () const;
   // check wether the object has died and destroy
   MTH void refcnt_chk () { if (expect_false (refcnt <= 0)) do_check (); }
   // destroy the object unless it was already destroyed
   void sever_self (); // sever this object from its self, if it has one.
   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);
   // used to _quickly_ device wether to shortcut the evaluation
   bool should_invoke (event_type event)
   // do the real refcount checking work
   void do_check ();
   // 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
 struct global : attachable
 {
 extern struct global gbl_ev;
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+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)
+  void put (shstr_tmp k, shstr_tmp v)
   {
     add (k);
     if (expect_true (v))
       add (' '), add (v);
     add ('\n');
   }
   template<typename T>
-  void put_string (keyword k, const T &v)
+  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);
     *p = '\n';
   }
   void put (keyword k, const char *v = 0)
   {
-    put_string (k, v);
+    put_kw_string (k, v);
   }
-  void put (keyword k, const shstr &v)
+  void put (keyword k, shstr_tmp v)
   {
-    put_string (k, v);
+    put_kw_string (k, v);
   }
   void put (keyword k, double v)
   {
     force (MAX_KEYWORD_LEN + 2 + 32);
   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)
+  void put (keyword kbeg, keyword kend, shstr_tmp v)
   {
     force (MAX_KEYWORD_LEN + 1);
     fadd (keyword_str [kbeg], keyword_len [kbeg]); fadd ('\n');
     if (expect_true (v))
     force (MAX_KEYWORD_LEN + 1);
     fadd (keyword_str [kend], keyword_len [kend]); fadd ('\n');
   }
-  template<typename T>
+  void put (keyword k, archetype *v);
+  void put (keyword k, treasurelist *v);
-  void put (keyword k, const T *v)
+  void put (keyword k, faceinfo *v);
-  {
-    put (k, v ? &v->name : (const char *)0);
-  }
   template<typename T>
   void put (keyword k, const refptr<T> &v)
   {
     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
   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
-  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);
   ~object_thawer ();
   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);
   void get_ornull (shstr &sh) const { sh = value; }
   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);
-  bool parse_error (const char *type = 0, const char *name = 0, bool skip = true);
+  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<delayed_ref> 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);
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 struct coroapi {
   static struct CoroAPI *GCoroAPI;
+  static EV_ATOMIC_T cede_pending;
-  static int nready () { return CORO_NREADY; }
+  static int nready () {                   return CORO_NREADY; }
-  static int cede   () { return CORO_CEDE  ; }
+  static int cede   () { cede_pending = 0; return CORO_CEDE  ; }
-  static double (*time)();
-  static double next_cede;
-  static int cede_counter;
-  static void do_cede_every ();
   static void do_cede_to_tick ();
-  static void do_cede_to_tick_every ();
-  static void cede_every (int count)
+  // actually cede's far more often
-  {
-    if (expect_false (++cede_counter >= count))
-      do_cede_every ();
-  }
-  static void cede_to_tick ()
+  static bool cede_to_tick ()
   {
-    if (expect_false (time () >= next_cede))
+    if (expect_true (!cede_pending))
+      return false;
-      do_cede_to_tick ();
+    do_cede_to_tick ();
-  }
+    return true;
-  static void cede_to_tick_every (int count)
-  {
-    if (expect_false (++cede_counter >= count))
-      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<class base>
-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<pe_idle>, callback<void (iw &)>
-{
-  template<class O, class M>
-  iw (O object, M method)
-  : callback<void (iw &)> (object, method)
-  {
-    alloc ();
-  }
-private:
-  void alloc ();
-};
-struct iow : watcher<pe_io>, callback<void (iow &, int)>
+struct iow : ev_io, evapi, callback<void (iow &, int)>
 {
+  static void thunk (EV_P_ struct ev_io *w_, int revents)
+  {
+    iow &w = *static_cast<iow *>(w_);
+    w (w, revents);
+  }
   template<class O, class M>
   iow (O object, M method)
   : callback<void (iow &, int)> (object, method)
   {
-    alloc ();
+    ev_init ((ev_io *)this, thunk);
   }
-  void fd (int fd);
+  void prio (int prio)
-  int poll ();
+  {
+    ev_set_priority ((ev_io *)this, prio);
+  }
+  void set (int fd, int events)
+  {
+    ev_io_set ((ev_io *)this, fd, events);
+  }
+  int poll () const { return events; }
   void poll (int events);
-private:
+  void start ()
-  void alloc ();
+  {
+    ev_io_start (EV_DEFAULT, (ev_io *)this);
+  }
+  void stop ()
+  {
+    ev_io_stop (EV_DEFAULT, (ev_io *)this);
+  }
+  ~iow ()
+  {
+    stop ();
+  }
+};
+struct asyncw : ev_async, evapi, callback<void (ev_async &, int)>
+{
+  static void thunk (EV_P_ struct ev_async *w_, int revents)
+  {
+    asyncw &w = *static_cast<asyncw *>(w_);
+    w (w, revents);
+  }
+  template<class O, class M>
+  asyncw (O object, M method)
+  : callback<void (asyncw &, int)> (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

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/include/cfperl.h (file contents): Revision 1.76 by root, Mon Jun 4 12:19:08 2007 UTC vs. Revision 1.106 by root, Sun Oct 11 18:18:03 2009 UTC

Diff Legend

Comparing deliantra/server/include/cfperl.h (file contents):
Revision 1.76 by root, Mon Jun 4 12:19:08 2007 UTC vs.
Revision 1.106 by root, Sun Oct 11 18:18:03 2009 UTC