--- deliantra/server/ext/map-scheduler.ext	2007/01/03 12:33:33	1.9
+++ deliantra/server/ext/map-scheduler.ext	2007/01/22 03:44:41	1.24
@@ -1,17 +1,39 @@
-#! 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 $SWAP_TIMEOUT       =   50; # number of seconds after which maps inactive get swapped out
+#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       =   30; # save maps every n seconds
-our $SAVE_INTERVAL      =  0.3; # save at max. one map every $SAVE_INTERVAL
+our $SAVE_TIMEOUT       =   20; # save maps every n seconds
 
-our $SCHEDULER = 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
+   # because old files will get cleaned up on reset time
+   Coro::Timer::sleep 1;
+
+   my $files = Coro::AIO::aio_readdir cf::localdir . "/" . cf::tmpdir;
+
+   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;
+   }
+
+   #TODO: should also preload random maps...
+};
+
+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
@@ -34,11 +56,11 @@
                $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;
                   $map->swap_out;
-                  Coro::Timer::sleep $SAVE_INTERVAL;
                } elsif ($map->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
+                  $cf::WAIT_FOR_TICK_ONE->wait;
                   $map->save;
-                  Coro::Timer::sleep $SAVE_INTERVAL;
                }
             }
          };