--- deliantra/server/include/cfperl.h	2006/12/25 11:25:49	1.41
+++ deliantra/server/include/cfperl.h	2007/04/16 11:09:31	1.61
@@ -13,9 +13,15 @@
 #include <XSUB.h>
 
 #include <EventAPI.h>
+#include <CoroAPI.h>
 
+#include "util.h"
+#include "keyword.h"
+#include "dynbuf.h"
 #include "callback.h"
 
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
 // optimisations/workaround for functions requiring my_perl in scope (anti-bloat)
 #undef localtime
 #undef srand48
@@ -30,14 +36,39 @@
 // same here, massive symbol spamming
 #undef do_open
 #undef do_close
+#undef ref
+#undef seed
 
 // perl bug #40256: perl does overwrite those with reentrant versions
 // but does not initialise their state structures.
 #undef random
 #undef crypt
 
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+// 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));
+
+#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
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
 void cfperl_init ();
 void cfperl_main ();
+void cfperl_emergency_save ();
+void cfperl_cleanup (int make_core);
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+// virtual server time, excluding time jumps and lag
+extern double runtime;
 
 enum event_klass
 {
@@ -91,33 +122,39 @@
 double cfperl_result_DOUBLE (int idx);
 int cfperl_result_INT (int idx);
 
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+INTERFACE_CLASS (attachable)
 struct attachable
 {
+  static MGVTBL vtbl;
+
   static unordered_vector<attachable *> mortals;
-  static void check_mortals ();
+  MTH static void check_mortals ();
 
   enum {
-    F_DESTROYED = 0x01,
-    F_BORROWED  = 0x02,
+    F_DESTROYED   = 0x01,
+    F_DEBUG_TRACE = 0x02,
   };
 
   // object is delete'd after the refcount reaches 0
-  mutable int refcnt;
-  int flags;
+  int ACC (RW, flags);
+  mutable int ACC (RW, refcnt);
 
-  void refcnt_inc () const { ++refcnt; }
-  void refcnt_dec () const { --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
-  void refcnt_chk () { if (refcnt <= 0) do_check (); }
+  MTH void refcnt_chk () { if (refcnt <= 0) do_check (); }
 
   // destroy the object unless it was already destroyed
   // this politely asks everybody interested the reduce
   // the refcount to 0 as soon as possible.
-  void destroy ();
+  MTH void destroy ();
 
   // return wether an object was destroyed already
-  bool destroyed () const { return flags & F_DESTROYED; }
+  MTH bool destroyed () const { return flags & F_DESTROYED; }
 
   virtual void gather_callbacks (AV *&callbacks, event_type event) const;
 
@@ -131,7 +168,8 @@
   AV *cb;       // CF+ callbacks
   shstr attach; // generic extension attachment information
 
-  void optimise ();  // possibly save some memory by destroying unneeded data
+  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)
@@ -148,7 +186,7 @@
   attachable &operator =(const attachable &src);
 
   bool invoke (event_type event, ...);
-  void instantiate ();
+  MTH void instantiate ();
   void reattach ();
 
 protected:
@@ -167,6 +205,8 @@
 
 extern struct global gbl_ev;
 
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
 struct object_freezer : dynbuf
 {
   AV *av;
@@ -215,7 +255,7 @@
     *p = '\n';
   }
 
-  void put (keyword k, const char *v)
+  void put (keyword k, const char *v = 0)
   {
     put_string (k, v);
   }
@@ -290,46 +330,61 @@
     put (k, (T *)v);
   }
 
-  bool save (const char *filename);
+  bool save (const char *path);
   char *as_string (); // like strdup
 
   operator bool () { return !!av; }
 };
 
 // compatibility support, should be removed when no longer needed
-int fprintf (object_freezer &freezer, const char *format, ...);
-int fputs (const char *s, object_freezer &freezer);
+void fprintf (object_freezer &freezer, const char *format, ...);
+void fputs (const char *s, object_freezer &freezer);
 
 struct object_thawer
 {
   SV *text; // text part
   AV *av;   // perl part
+  int linenum;
   char *line; // current beginning of line
-  char *last_value;
+  keyword kw;
+  char *kw_str, *value;
+  const char *name;
 
   operator bool () { return !!text; }
 
-  object_thawer (const char *filename = 0);
+  object_thawer (const char *path = 0);
   object_thawer (const char *data, AV *perlav);
   ~object_thawer ();
 
   void get (attachable *obj, int oid);
 
-  keyword get_kv (); // also parse value for later use
+  // parse next line
+  void next ();
+  // skip the current key-value (usually fetch next line, for
+  // multiline-fields, skips untilt he corresponding end-kw
+  void skip ();
+
+  //TODO: remove, deprecated
+  keyword get_kv ()
+  {
+    next ();
+    return kw;
+  }
 
-  const char *get_str () { return last_value; } // may be 0
+  char *get_str () { return value; } // may be 0
 
   void get (shstr &sh) const;
-  void get_ornull (shstr &sh) const { sh = last_value; }
+  void get_ornull (shstr &sh) const { sh = value; }
   void get_ml (keyword kend, shstr &sh);
 
   sint32 get_sint32 () const;
   sint64 get_sint64 () const;
   double get_double () const;
 
-  void get (float &v)  { v = get_double (); }
+  void get (float  &v) { v = get_double (); }
   void get (double &v) { v = get_double (); }
 
+  void get (bool   &i) { i = get_sint32 (); }
   void get (sint8  &i) { i = get_sint32 (); }
   void get (uint8  &i) { i = get_sint32 (); }
   void get (sint16 &i) { i = get_sint32 (); }
@@ -338,10 +393,38 @@
 
   void get (uint32 &i) { i = get_sint64 (); }
   void get (sint64 &i) { i = get_sint64 (); }
+
+  bool parse_error (const char *type = 0, const char *name = 0, bool skip = true);
 };
 
+//TODO: remove
 char *fgets (char *s, int n, object_thawer &thawer);
 
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+struct coroapi {
+  static struct CoroAPI *GCoroAPI;
+
+  static int nready () { return CORO_NREADY; }
+  static int cede   () { return CORO_CEDE  ; }
+
+  static int cede_counter;
+
+  static void cede_every (int count)
+  {
+    if (++cede_counter >= count)
+      {
+        cede_counter = 0;
+
+        if (coroapi::nready ())
+          coroapi::cede ();
+      }
+  }
+
+  static void wait_for_tick ();
+  static void wait_for_tick_begin ();
+};
+
 struct watcher_base
 {
   static struct EventAPI *GEventAPI;