--- deliantra/server/ext/map-scheduler.ext	2007/01/01 17:50:26	1.6
+++ deliantra/server/ext/map-scheduler.ext	2007/01/04 16:19:32	1.11
@@ -3,17 +3,26 @@
 # this extension swaps out maps and resets them, in essence managing
 # the reset/swap policy of the server.
 
-our $DEACTIVATE_TIMEOUT =   60; # number of seconds after which maps get deactivated to save cpu
-our $SWAP_TIMEOUT       =   70; # number of seconds after which maps inactive get swapped out
-our $SCHEDULE_INTERVAL  =    5; # time the map scheduler sleeps between runs
-our $SAVE_TIMEOUT       =   40; # save maps every n seconds
-our $SAVE_INTERVAL      =  0.4; # save at max. one map every $SAVE_INTERVAL
+our $DEACTIVATE_TIMEOUT =   20; # number of seconds after which maps get deactivated to save cpu
+our $SWAP_TIMEOUT       =   35; # number of seconds after which maps inactive get swapped out
+our $SCHEDULE_INTERVAL  =    2; # time the map scheduler sleeps between runs
+our $SAVE_TIMEOUT       =   20; # save maps every n seconds
+our $SAVE_INTERVAL      =  0.1; # save at max. one map every $SAVE_INTERVAL
 
 our $SCHEDULER = cf::coro {
    while () {
       Coro::Timer::sleep $SCHEDULE_INTERVAL;
 
-      for my $map (values %cf::MAP) {
+      # this weird form of iteration over values is used because
+      # the hash changes underneath us frequently, and for
+      # keeps a direct reference to the value without (in 5.8 perls)
+      # keeping a reference, so this is prone to crashes or worse.
+      my @maps = keys %cf::MAP;
+      for (@maps) {
+         my $map = $cf::MAP{$_}
+            or next;
+         $map->valid or next;
+
          eval {
             # not yet, because maps might become visible to players nearby
             # we need to remove the map from %cf::MAP and all tiled map links
@@ -35,9 +44,18 @@
          };
          warn $@ if $@;
          Coro::cede;
-      }
+      };
    }
 };
 
 $SCHEDULER->prio (-2);
 
+# map load prefetch
+cf::map->attach (
+   on_enter => sub {
+      my ($map, $pl) = @_;
+
+      # floodfill surrounging maps, asynchronously
+   },
+);
+