--- deliantra/server/ext/map-scheduler.ext	2007/07/23 17:53:55	1.38
+++ deliantra/server/ext/map-scheduler.ext	2007/09/19 21:56:30	1.42
@@ -12,6 +12,7 @@
 our $SWAP_LOAD2         = $cf::CFG{swap_load2}        ||  .4; # swap as fast as possible at this load
 
 cf::async_ext {
+   $Coro::current->{desc} = "initial map scanner";
    $Coro::current->prio (Coro::PRIO_MIN);
 
    # load the header of swapped-out maps.
@@ -52,6 +53,7 @@
 };
 
 our $SCHEDULER = cf::async_ext {
+   $Coro::current->{desc} = "map scheduler";
    my $timer = Coro::Event->timer (after => 1);
 
    while () {
@@ -78,12 +80,14 @@
             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;
+               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;
                } elsif ($map->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
                   $map->save;
+                  $map->{last_save} -= rand; # randomise map save times a bit
                }
             }
          };