--- deliantra/server/include/cfperl.h	2007/09/04 05:43:21	1.89
+++ deliantra/server/include/cfperl.h	2009/01/08 19:23:44	1.105
@@ -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 <http://www.gnu.org/licenses/>.
  * 
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
 //
@@ -37,7 +37,7 @@
 #include <perl.h>
 #include <XSUB.h>
 
-#include <EventAPI.h>
+#include <EVAPI.h>
 #include <CoroAPI.h>
 
 #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,26 +83,44 @@
 
 #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);
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+#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 +186,14 @@
 {
   static MGVTBL vtbl;
 
-  static unordered_vector<attachable *> 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<attachable *> mortals;
+  MTH static void check_mortals ();
 
   // object is delete'd after the refcount reaches 0
   MTH int refcnt_cnt () const;
@@ -271,7 +291,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);
 
@@ -305,7 +325,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);
   }
@@ -349,7 +369,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');
@@ -390,7 +410,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 +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 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<class base>
-struct watcher : watcher_base
+struct iow : ev_io, evapi, callback<void (iow &, int)>
 {
-  base *pe;
+  static void thunk (EV_P_ struct ev_io *w_, int revents)
+  {
+    iow &w = *static_cast<iow *>(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<class O, class M>
+  iow (O object, M method)
+  : callback<void (iow &, int)> (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<pe_idle>, callback<void (iw &)>
-{
-  template<class O, class M>
-  iw (O object, M method)
-  : callback<void (iw &)> (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<pe_io>, callback<void (iow &, int)>
+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>
-  iow (O object, M method)
-  : callback<void (iow &, int)> (object, method)
+  asyncw (O object, M method)
+  : callback<void (asyncw &, int)> (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