--- deliantra/server/ext/map-scheduler.ext	2007/07/28 13:13:36	1.39
+++ deliantra/server/ext/map-scheduler.ext	2007/10/01 00:55:51	1.44
@@ -11,10 +11,8 @@
 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
 
-warn "load1 ", $SWAP_LOAD1;#d#
-warn "load2 ", $SWAP_LOAD2;#d#
-
 cf::async_ext {
+   $Coro::current->{desc} = "startup map scanner";
    $Coro::current->prio (Coro::PRIO_MIN);
 
    # load the header of swapped-out maps.
@@ -55,7 +53,9 @@
 };
 
 our $SCHEDULER = cf::async_ext {
-   my $timer = Coro::Event->timer (after => 1);
+   $Coro::current->{desc} = "map scheduler";
+   $Coro::current->prio (Coro::PRIO_MAX);
+   my $timer = Coro::Event->timer (after => 1, data => cf::WF_AUTOCANCEL);
 
    while () {
       $timer->interval ($SCHEDULE_INTERVAL);
@@ -81,7 +81,8 @@
             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;