--- deliantra/server/ext/map-scheduler.ext	2007/02/12 01:33:41	1.29
+++ deliantra/server/ext/map-scheduler.ext	2007/10/01 00:55:51	1.44
@@ -1,38 +1,65 @@
-#! perl # MANDATORY
+#! 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       = $cf::CFG{swap_timeout}      || 40; # number of seconds after which maps inactive get swapped out
-our $SCHEDULE_INTERVAL  = $cf::CFG{schedule_interval} ||  5; # time the map scheduler sleeps between runs
-our $SAVE_TIMEOUT       = $cf::CFG{save_timeout}      || 20; # save maps every n seconds
-our $MAX_ACTIVES        = $cf::CFG{max_actives}       || 200000; # swap aggressively when > this many objects are active
+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} ||  .8; # 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)$/;
-      cf::map::find $map;
-      $cf::WAIT_FOR_TICK_ONE->wait;
+   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 {
-   my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL);
+   $Coro::current->{desc} = "map scheduler";
+   $Coro::current->prio (Coro::PRIO_MAX);
+   my $timer = Coro::Event->timer (after => 1, data => cf::WF_AUTOCANCEL);
+
    while () {
-      $schedule_interval->next unless cf::object::actives_size > $MAX_ACTIVES;
+      $timer->interval ($SCHEDULE_INTERVAL);
+      $timer->next unless $cf::LOADAVG > $SWAP_LOAD2;
 
       # this weird form of iteration over values is used because
       # the hash changes underneath us frequently, and for
@@ -54,18 +81,19 @@
             if ($map->should_reset) {
                $map->reset;
             } elsif ($map->in_memory == cf::MAP_IN_MEMORY) {
-               my $max_idle = cf::object::actives_size > $MAX_ACTIVES ? 1 : $SWAP_TIMEOUT;
+               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;
-                  $cf::WAIT_FOR_TICK_ONE->wait unless $max_idle == 1;
                } elsif ($map->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
                   $map->save;
-                  $cf::WAIT_FOR_TICK_ONE->wait unless $max_idle == 1;
+                  $map->{last_save} -= rand; # randomise map save times a bit
                }
             }
          };
          warn $@ if $@;
-         Coro::cede;
+         cf::cede_to_tick;
       };
    }
 };