--- deliantra/server/include/cfperl.h 2007/03/01 12:28:16 1.58 +++ deliantra/server/include/cfperl.h 2007/04/23 18:09:57 1.63 @@ -207,7 +207,7 @@ ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -struct object_freezer : dynbuf +struct object_freezer : dynbuf_text { AV *av; @@ -337,8 +337,8 @@ }; // 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 { @@ -371,7 +371,6 @@ return kw; } - char *get_str () { return value; } // may be 0 void get (shstr &sh) const; @@ -409,18 +408,34 @@ static int nready () { return CORO_NREADY; } static int cede () { 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) { if (++cede_counter >= count) - { - cede_counter = 0; + do_cede_every (); + } - if (coroapi::nready ()) - coroapi::cede (); - } + static void cede_to_tick () + { + if (time () >= next_cede) + do_cede_to_tick (); } + + static void cede_to_tick_every (int count) + { + if (++cede_counter >= count) + cede_to_tick (); + } + + static void wait_for_tick (); + static void wait_for_tick_begin (); }; struct watcher_base