--- deliantra/server/ext/map-scheduler.ext	2007/01/22 03:44:41	1.24
+++ deliantra/server/ext/map-scheduler.ext	2007/04/16 06:23:41	1.32
@@ -5,9 +5,10 @@
 # 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       =   35; # number of seconds after which maps inactive get swapped out
-our $SCHEDULE_INTERVAL  =    2; # time the map scheduler sleeps between runs
-our $SAVE_TIMEOUT       =   20; # save maps every n seconds
+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
 
 cf::async_ext {
    $Coro::current->prio (Coro::PRIO_MIN);
@@ -21,19 +22,16 @@
    for my $map (@$files) {
       utf8::decode $map;
       next if $map =~ /\.(?:pst|meta)$/;
-      $map =~ s/∕/\//g;
-      $map =~ s/\.map$//;
       cf::map::find $map;
-      $cf::WAIT_FOR_TICK_ONE->wait;
+      cf::wait_for_tick;
    }
 
    #TODO: should also preload random maps...
 };
 
 our $SCHEDULER = cf::async_ext {
-   my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL);
    while () {
-      $schedule_interval->next;
+      Coro::Event::do_timer (after => $SCHEDULE_INTERVAL);
 
       # this weird form of iteration over values is used because
       # the hash changes underneath us frequently, and for
@@ -55,12 +53,13 @@
             if ($map->should_reset) {
                $map->reset;
             } elsif ($map->in_memory == cf::MAP_IN_MEMORY) {
-               if ($map->last_access + $SWAP_TIMEOUT <= $cf::RUNTIME && !$map->players) {
-                  $cf::WAIT_FOR_TICK_ONE->wait;
+               my $max_idle = cf::object::actives_size > $MAX_ACTIVES ? 1 : $SWAP_TIMEOUT;
+               if ($map->last_access + $max_idle <= $cf::RUNTIME && !$map->players) {
                   $map->swap_out;
+                  cf::wait_for_tick unless $max_idle == 1;
                } elsif ($map->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
-                  $cf::WAIT_FOR_TICK_ONE->wait;
                   $map->save;
+                  cf::wait_for_tick unless $max_idle == 1;
                }
             }
          };