--- deliantra/server/ext/map-scheduler.ext	2007/01/13 23:06:13	1.22
+++ deliantra/server/ext/map-scheduler.ext	2007/01/23 01:05:17	1.25
@@ -4,10 +4,11 @@
 # the reset/swap policy of the server.
 # it also contains the map prefetching logic
 
-our $DEACTIVATE_TIMEOUT =   20; # number of seconds after which maps get deactivated to save cpu
+#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 $MAX_ACTIVES        = $cf::CFG{max_actives} || 200000; # swap aggressively when > this many objects are active
 
 cf::async_ext {
    $Coro::current->prio (Coro::PRIO_MIN);
@@ -22,6 +23,7 @@
       utf8::decode $map;
       next if $map =~ /\.(?:pst|meta)$/;
       $map =~ s/∕/\//g;
+      $map =~ s/\.map$//;
       cf::map::find $map;
       $cf::WAIT_FOR_TICK_ONE->wait;
    }
@@ -30,8 +32,9 @@
 };
 
 our $SCHEDULER = cf::async_ext {
+   my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL);
    while () {
-      Coro::Timer::sleep $SCHEDULE_INTERVAL;
+      $schedule_interval->next;
 
       # this weird form of iteration over values is used because
       # the hash changes underneath us frequently, and for
@@ -53,12 +56,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;
+               if ((cf::object::actives_size > $MAX_ACTIVES || $map->last_access + $SWAP_TIMEOUT <= $cf::RUNTIME)
+                   && !$map->players) {
                   $map->swap_out;
-               } elsif ($map->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
                   $cf::WAIT_FOR_TICK_ONE->wait;
+               } elsif ($map->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
                   $map->save;
+                  $cf::WAIT_FOR_TICK_ONE->wait;
                }
             }
          };