--- deliantra/server/ext/map-scheduler.ext	2007/06/10 04:05:47	1.35
+++ deliantra/server/ext/map-scheduler.ext	2008/04/15 14:21:04	1.47
@@ -1,4 +1,4 @@
-#! perl # MANDATORY
+#! perl # mandatory
 
 # this extension swaps out maps and resets them, in essence managing
 # the reset/swap policy of the server.
@@ -6,12 +6,13 @@
 
 #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} ||  .8; # time the map scheduler sleeps between runs
+our $SCHEDULE_INTERVAL  = $cf::CFG{schedule_interval} ||   5; # 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
+our $SWAP_LOAD2         = $cf::CFG{swap_load2}        ||  .6; # 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.
@@ -19,17 +20,15 @@
    # because old files will get cleaned up on reset time
    Coro::Timer::sleep 0.25;
 
-   for my $map (@{ cf::map::tmp_maps or [] }) {
-      cf::map::find $map;
-      cf::wait_for_tick; Coro::cede;
+   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 [] }) {
-         Coro::cede;
+         cf::cede_to_tick;
 
          $path =~ /^~[^\/]+(\/.*)$/
             or next; # doh
@@ -44,7 +43,6 @@
          next if $base->{deny_reset};
 
          my $map = cf::map::find $path;
-         cf::wait_for_tick;
 
          if ($map->{deny_reset}) {
             warn "found noreset map with resettable base map, resetting: $path\n";
@@ -55,9 +53,15 @@
 };
 
 our $SCHEDULER = cf::async_ext {
+   $Coro::current->{desc} = "map scheduler";
+   $Coro::current->prio (Coro::PRIO_MAX);
+
    while () {
-      Coro::Event::do_timer (after => $SCHEDULE_INTERVAL)
-         unless $cf::LOADAVG > $SWAP_LOAD2;
+      if ($cf::LOADAVG > $SWAP_LOAD2) {
+         cf::wait_for_tick;
+      } else {
+         Coro::EV::timer_once $SCHEDULE_INTERVAL;
+      }
 
       # this weird form of iteration over values is used because
       # the hash changes underneath us frequently, and for
@@ -78,15 +82,15 @@
 #         }
             if ($map->should_reset) {
                $map->reset;
-            } elsif ($map->in_memory == cf::MAP_IN_MEMORY) {
-               my $max_idle = cf::clamp +(cf::lerp $cf::LOADAVG, $SWAP_LOAD1, $SWAP_LOAD2, $SWAP_TIMEOUT, 0), 0, $SWAP_TIMEOUT;
+            } elsif ($map->in_memory == cf::MAP_ACTIVE) {
+               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 unless $cf::LOADAVG > $SWAP_LOAD2;
                } elsif ($map->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
                   $map->save;
-                  cf::wait_for_tick unless $cf::LOADAVG > $SWAP_LOAD2;
+                  $map->{last_save} -= rand; # randomise map save times a bit
                }
             }
          };