--- deliantra/server/ext/map-scheduler.ext	2007/01/05 20:04:02	1.17
+++ deliantra/server/ext/map-scheduler.ext	2007/10/11 00:34:31	1.45
@@ -1,37 +1,71 @@
-#! 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 =   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 $DEACTIVATE_TIMEOUT =   20; # number of seconds after which maps get deactivated to save cpu
+our $SWAP_TIMEOUT       = $cf::CFG{swap_timeout}      || 300; # number of seconds after which inactive maps get swapped out
+our $SCHEDULE_INTERVAL  = $cf::CFG{schedule_interval} ||   2; # time the map scheduler sleeps between runs
+our $SAVE_TIMEOUT       = $cf::CFG{save_timeout}      ||  30; # save maps every n seconds
+our $SWAP_LOAD1         = $cf::CFG{swap_load1}        ||  .1; # start aggressively swapping at this load
+our $SWAP_LOAD2         = $cf::CFG{swap_load2}        ||  .4; # swap as fast as possible at this load
 
 cf::async_ext {
+   $Coro::current->{desc} = "startup map scanner";
    $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;
+   Coro::Timer::sleep 0.25;
 
-   for my $map (@$files) {
-      utf8::decode $map;
-      next if $map =~ /\.(?:pst|meta)$/;
-      $map =~ s/∕/\//g;
-      cf::map::find $map;
-      Coro::Timer::sleep 0.05;
+   for my $path (@{ cf::map::tmp_maps or [] }, @{ cf::map::random_maps or [] }) {
+      cf::cede_to_tick;
+      cf::map::find $path;
    }
 
-   #TODO: should also preload random maps...
+   # now hunt for resettable per-player maps
+   for my $login (@{ cf::player::list_logins or [] }) {
+      for my $path (@{ cf::player::maps $login or [] }) {
+         cf::cede_to_tick;
+
+         $path =~ /^~[^\/]+(\/.*)$/
+            or next; # doh
+
+         my $base = cf::map::find $1;
+
+         # skip maps without base maps on the assumption
+         # that those are old, unresettable maps
+         next unless $base;
+
+         # skip unresettable maps, for speed
+         next if $base->{deny_reset};
+
+         my $map = cf::map::find $path;
+
+         if ($map->{deny_reset}) {
+            warn "found noreset map with resettable base map, resetting: $path\n";
+            delete $map->{deny_reset};
+         }
+      }
+   }
 };
 
 our $SCHEDULER = cf::async_ext {
+   $Coro::current->{desc} = "map scheduler";
+   $Coro::current->prio (Coro::PRIO_MAX);
+   my $timer = Coro::Event->timer (data => cf::WF_AUTOCANCEL);
+
    while () {
-      Coro::Timer::sleep $SCHEDULE_INTERVAL;
+      if ($cf::LOADAVG > $SWAP_LOAD2) {
+         $timer->interval (0.05);
+         $timer->next;
+         cf::wait_for_tick;
+      } else {
+         $timer->interval ($SCHEDULE_INTERVAL);
+         $timer->next;
+      }
 
       # this weird form of iteration over values is used because
       # the hash changes underneath us frequently, and for
@@ -53,50 +87,22 @@
             if ($map->should_reset) {
                $map->reset;
             } elsif ($map->in_memory == cf::MAP_IN_MEMORY) {
-               if ($map->last_access + $SWAP_TIMEOUT <= $cf::RUNTIME && !$map->players) {
+               my $max_idle = cf::clamp +(cf::lerp $cf::LOADAVG, $SWAP_LOAD1, $SWAP_LOAD2, $SWAP_TIMEOUT, $cf::TICK * 1.5),
+                                        $cf::TICK * 1.5, $SWAP_TIMEOUT;
+
+               if ($map->last_access + $max_idle <= $cf::RUNTIME && !$map->players) {
                   $map->swap_out;
-                  Coro::Timer::sleep $SAVE_INTERVAL;
                } elsif ($map->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
                   $map->save;
-                  Coro::Timer::sleep $SAVE_INTERVAL;
+                  $map->{last_save} -= rand; # randomise map save times a bit
                }
             }
          };
          warn $@ if $@;
-         Coro::cede;
+         cf::cede_to_tick;
       };
    }
 };
 
 $SCHEDULER->prio (-2);
 
-# map load prefetch for tiled maps, possibly exits, too
-cf::map->attach (
-   on_enter => sub {
-      my ($map, $pl) = @_;
-
-      (cf::async {
-         my @diag; # diagonal neighbours
-
-         for (0 .. 3) {
-            my $neigh = $map->tile_path ($_)
-               or next;
-            $neigh = cf::map::find $neigh, $map
-               or next;
-            $neigh->load;
-
-            push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
-                        [$neigh->tile_path (($_ + 1) % 4), $neigh];
-         }
-
-         for (@diag) {
-            my $neigh = cf::map::find @$_
-               or next;
-            $neigh->load;
-         }
-      })->prio (2);
-      # higher prio because prefetching is very important
-      # as it prefetches maps that can make the server block
-   },
-);
-