--- deliantra/server/ext/map-scheduler.ext	2007/01/29 17:57:22	1.28
+++ deliantra/server/ext/map-scheduler.ext	2007/04/18 17:32:06	1.33
@@ -5,8 +5,8 @@
 # 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}      || 35; # number of seconds after which maps inactive get swapped out
-our $SCHEDULE_INTERVAL  = $cf::CFG{schedule_interval} || 10; # time the map scheduler sleeps between runs
+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
 
@@ -17,22 +17,21 @@
    # because old files will get cleaned up on reset time
    Coro::Timer::sleep 1;
 
-   my $files = Coro::AIO::aio_readdir cf::localdir . "/" . cf::tmpdir;
+   my $files = Coro::AIO::aio_readdir $cf::TMPDIR;
 
    for my $map (@$files) {
       utf8::decode $map;
       next if $map =~ /\.(?:pst|meta)$/;
       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 unless cf::object::actives_size > $MAX_ACTIVES;
+      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
@@ -57,10 +56,10 @@
                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_ONE->wait unless $max_idle == 1;
+                  cf::wait_for_tick unless $max_idle == 1;
                } elsif ($map->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
                   $map->save;
-                  $cf::WAIT_FOR_TICK_ONE->wait unless $max_idle == 1;
+                  cf::wait_for_tick unless $max_idle == 1;
                }
             }
          };