--- deliantra/server/ext/map-scheduler.ext	2007/04/18 17:32:06	1.33
+++ deliantra/server/ext/map-scheduler.ext	2007/05/11 07:59:59	1.34
@@ -5,10 +5,11 @@
 # 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->prio (Coro::PRIO_MIN);
@@ -31,7 +32,8 @@
 
 our $SCHEDULER = cf::async_ext {
    while () {
-      Coro::Event::do_timer (after => $SCHEDULE_INTERVAL);
+      Coro::Event::do_timer (after => $SCHEDULE_INTERVAL)
+         unless $cf::LOADAVG > $SWAP_LOAD2;
 
       # this weird form of iteration over values is used because
       # the hash changes underneath us frequently, and for
@@ -53,18 +55,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, 0), 0, $SWAP_TIMEOUT;
+
                if ($map->last_access + $max_idle <= $cf::RUNTIME && !$map->players) {
                   $map->swap_out;
-                  cf::wait_for_tick unless $max_idle == 1;
+                  cf::wait_for_tick unless $cf::LOADAVG > $SWAP_LOAD2;
                } elsif ($map->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
                   $map->save;
-                  cf::wait_for_tick unless $max_idle == 1;
+                  cf::wait_for_tick unless $cf::LOADAVG > $SWAP_LOAD2;
                }
             }
          };
          warn $@ if $@;
-         Coro::cede;
+         cf::cede_to_tick;
       };
    }
 };