--- deliantra/server/ext/map-scheduler.ext	2007/01/05 19:12:01	1.16
+++ deliantra/server/ext/map-scheduler.ext	2007/01/23 01:17:08	1.26
@@ -1,15 +1,16 @@
-#! perl
+#! perl # MANDATORY
 
 # this extension swaps out maps and resets them, in essence managing
 # 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 $SAVE_INTERVAL      =  0.1; # save at max. one map every $SAVE_INTERVAL
+our $MAX_ACTIVES        = $cf::CFG{max_actives} || 200000; # swap aggressively when > this many objects are active
 
-cf::coro {
+cf::async_ext {
    $Coro::current->prio (Coro::PRIO_MIN);
    # load the header of swapped-out maps.
    # this is not a correctness issue, it simply saves diskspace
@@ -22,16 +23,18 @@
       utf8::decode $map;
       next if $map =~ /\.(?:pst|meta)$/;
       $map =~ s/∕/\//g;
+      $map =~ s/\.map$//;
       cf::map::find $map;
-      Coro::Timer::sleep 0.05;
+      $cf::WAIT_FOR_TICK_ONE->wait;
    }
 
    #TODO: should also preload random maps...
 };
 
-our $SCHEDULER = cf::coro {
+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) {
+               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;
-                  Coro::Timer::sleep $SAVE_INTERVAL;
+                  $cf::WAIT_FOR_TICK_ONE->wait;
                } elsif ($map->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
                   $map->save;
-                  Coro::Timer::sleep $SAVE_INTERVAL;
+                  $cf::WAIT_FOR_TICK_ONE->wait;
                }
             }
          };
@@ -70,33 +74,3 @@
 
 $SCHEDULER->prio (-2);
 
-# map load prefetch for tiled maps, possibly exits, too
-cf::map->attach (
-   on_enter => sub {
-      my ($map, $pl) = @_;
-
-      (Coro::async_pool {
-         my @diag; # diagonal neighbours
-
-         for (0 .. 3) {
-            my $neigh = $map->tile_path ($_)
-               or next;
-            $neigh = cf::map::find $neigh, $map
-               or next;
-            $neigh->load;
-
-            push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
-                        [$neigh->tile_path (($_ + 1) % 4), $neigh];
-         }
-
-         for (@diag) {
-            my $neigh = cf::map::find @$_
-               or next;
-            $neigh->load;
-         }
-      })->prio (2);
-      # higher prio because prefetching is very important
-      # as it prefetches maps that can make the server block
-   },
-);
-