--- deliantra/server/ext/map-scheduler.ext	2007/01/01 11:21:54	1.1
+++ deliantra/server/ext/map-scheduler.ext	2007/01/23 01:05:17	1.25
@@ -1,47 +1,76 @@
-#! perl
+#! perl # MANDATORY
 
 # this extension swaps out maps and resets them, in essence managing
 # the reset/swap policy of the server.
+# it also contains the map prefetching logic
 
-our $DEACTIVATE_TIMEOUT =   60; # number of seconds after which maps get deactivated to save cpu
-our $SWAP_TIMEOUT       =  600; # number of seconds after which maps inactive get swapped out
-our $SCHEDULE_INTERVAL  =    8; # time the map scheduler sleeps between runs
-our $SAVE_TIMEOUT       =   60; # save maps every n seconds
-our $SAVE_INTERVAL      =  0.4; # save at max. one map every $SAVE_HOLD
-
-$DEACTIVATE_TIMEOUT = 3;#d#
-$SWAP_TIMEOUT = 5;#d#
-$SCHEDULE_INTERVAL = 1;
+#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 $MAX_ACTIVES        = $cf::CFG{max_actives} || 200000; # swap aggressively when > this many objects are active
+
+cf::async_ext {
+   $Coro::current->prio (Coro::PRIO_MIN);
+   # load the header of swapped-out maps.
+   # this is not a correctness issue, it simply saves diskspace
+   # because old files will get cleaned up on reset time
+   Coro::Timer::sleep 1;
+
+   my $files = Coro::AIO::aio_readdir cf::localdir . "/" . cf::tmpdir;
+
+   for my $map (@$files) {
+      utf8::decode $map;
+      next if $map =~ /\.(?:pst|meta)$/;
+      $map =~ s/∕/\//g;
+      $map =~ s/\.map$//;
+      cf::map::find $map;
+      $cf::WAIT_FOR_TICK_ONE->wait;
+   }
+
+   #TODO: should also preload random maps...
+};
 
-our $SCHEDULER = cf::coro {
+our $SCHEDULER = cf::async_ext {
+   my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL);
    while () {
-      Coro::Timer::sleep $SCHEDULE_INTERVAL;
+      $schedule_interval->next;
+
+      # 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;
 
-      for my $map (values %cf::MAP) {
          eval {
-            next if $map->in_memory != cf::MAP_IN_MEMORY;
-            next if $map->players;
-            my $last_access = $map->last_access;
             # not yet, because maps might become visible to players nearby
-            # we need a tiled meta map for this to work
+            # we need to remove the map from %cf::MAP and all tiled map links
 #         if ($last_access + $DEACTIVATE_TIMEOUT <= $cf::RUNTIME) {
 #            $map->deactivate;
 #            delete $map->{active};
 #         }
             if ($map->should_reset) {
                $map->reset;
-            } elsif ($last_access + $SWAP_TIMEOUT <= $cf::RUNTIME) {
-               $map->swap_out;
-               Coro::Timer::sleep $SAVE_INTERVAL;
-            } elsif ($map->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
-               $map->save;
-               Coro::Timer::sleep $SAVE_INTERVAL;
+            } elsif ($map->in_memory == cf::MAP_IN_MEMORY) {
+               if ((cf::object::actives_size > $MAX_ACTIVES || $map->last_access + $SWAP_TIMEOUT <= $cf::RUNTIME)
+                   && !$map->players) {
+                  $map->swap_out;
+                  $cf::WAIT_FOR_TICK_ONE->wait;
+               } elsif ($map->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
+                  $map->save;
+                  $cf::WAIT_FOR_TICK_ONE->wait;
+               }
             }
          };
          warn $@ if $@;
          Coro::cede;
-      }
+      };
    }
 };
+
 $SCHEDULER->prio (-2);