--- deliantra/server/lib/cf.pm	2007/01/09 15:36:19	1.154
+++ deliantra/server/lib/cf.pm	2007/01/09 21:32:42	1.155
@@ -26,13 +26,13 @@
 
 use Event; $Event::Eval = 1; # no idea why this is required, but it is
 
+sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
+
 # work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
 $YAML::Syck::ImplicitUnicode = 1;
 
 $Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
 
-sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
-
 our %COMMAND      = ();
 our %COMMAND_TIME = ();
 our %EXTCMD       = ();
@@ -56,6 +56,9 @@
 our $RANDOM_MAPS = cf::localdir . "/random";
 our %EXT_CORO; # coroutines bound to extensions
 
+our $WAIT_FOR_TICK;     $WAIT_FOR_TICK     ||= new Coro::Signal;
+our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
+
 binmode STDOUT;
 binmode STDERR;
 
@@ -109,6 +112,13 @@
 Configuration for the server, loaded from C</etc/crossfire/config>, or
 from wherever your confdir points to.
 
+=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
+
+These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
+or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
+processing has been done. Call C<< ->wait >> on them to maximise the
+window of cpu time available, or simply to synchronise to the server tick.
+
 =back
 
 =cut
@@ -1071,28 +1081,6 @@
 cf::map->attach (prio => -10000, package => cf::mapsupport::);
 
 #############################################################################
-# load/save perl data associated with player->ob objects
-
-sub all_objects(@) {
-   @_, map all_objects ($_->inv), @_
-}
-
-# TODO: compatibility cruft, remove when no longer needed
-cf::player->attach (
-   on_load => sub {
-      my ($pl, $path) = @_;
-
-      for my $o (all_objects $pl->ob) {
-         if (my $value = $o->get_ob_key_value ("_perl_data")) {
-            $o->set_ob_key_value ("_perl_data");
-
-            %$o = %{ Storable::thaw pack "H*", $value };
-         }
-      }
-   },
-);
-
-#############################################################################
 
 =head2 CORE EXTENSIONS
 
@@ -1227,7 +1215,7 @@
    for my $login (@$dirs) {
       my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
       aio_read $fh, 0, 512, my $buf, 0                  or next;
-      $buf !~ /^password -------------$/                or next; # official not-valid tag
+      $buf !~ /^password -------------$/m               or next; # official not-valid tag
 
       utf8::decode $login;
       push @logins, $login;
@@ -1590,29 +1578,37 @@
    $map
 }
 
-sub emergency_save {
-   my $freeze_guard = cf::freeze_mainloop;
+package cf;
 
-   warn "enter emergency perl save\n";
+=back
 
-   cf::sync_job {
-      warn "begin emergency player save\n";
-      $_->save for values %cf::PLAYER;
-      warn "end emergency player save\n";
+=head3 cf::object
 
-      warn "begin emergency map save\n";
-      $_->save for values %cf::MAP;
-      warn "end emergency map save\n";
-   };
+=cut
 
-   warn "leave emergency perl save\n";
+package cf::object;
+
+=over 4
+
+=item $ob->inv_recursive
+
+Returns the inventory of the object _and_ their inventories, recursively.
+
+=cut
+
+sub inv_recursive_;
+sub inv_recursive_ {
+   map { $_, inv_recursive_ $_->inv } @_
+}
+
+sub inv_recursive {
+   inv_recursive_ inv $_[0]
 }
 
 package cf;
 
 =back
 
-
 =head3 cf::object::player
 
 =over 4
@@ -2209,7 +2205,49 @@
 }
 
 #############################################################################
-# initialisation
+# initialisation and cleanup
+
+# install some emergency cleanup handlers
+BEGIN {
+   for my $signal (qw(INT HUP TERM)) {
+      Event->signal (
+         data   => WF_AUTOCANCEL,
+         signal => $signal,
+         cb     => sub {
+            cf::cleanup "SIG$signal";
+         },
+      );
+   }
+}
+
+sub emergency_save {
+   my $freeze_guard = cf::freeze_mainloop;
+
+   warn "enter emergency perl save\n";
+
+   cf::sync_job {
+      # use a peculiar iteration method to avoid tripping on perl
+      # refcount bugs in for. also avoids problems with players
+      # and maps saved/Destroyed asynchronously.
+      warn "begin emergency player save\n";
+      for my $login (keys %cf::PLAYER) {
+         my $pl = $cf::PLAYER{$login} or next;
+         $pl->valid or next;
+         $pl->save;
+      }
+      warn "end emergency player save\n";
+
+      warn "begin emergency map save\n";
+      for my $path (keys %cf::MAP) {
+         my $map = $cf::MAP{$path} or next;
+         $map->valid or next;
+         $map->save;
+      }
+      warn "end emergency map save\n";
+   };
+
+   warn "leave emergency perl save\n";
+}
 
 sub reload() {
    # can/must only be called in main
@@ -2371,6 +2409,9 @@
       $RUNTIME   += $TICK;
       $NEXT_TICK += $TICK;
 
+      $WAIT_FOR_TICK->broadcast;
+      $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
+
       # if we are delayed by four ticks or more, skip them all
       $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;