--- deliantra/server/ext/map-scheduler.ext	2007/01/05 01:06:40	1.14
+++ deliantra/server/ext/map-scheduler.ext	2007/01/05 21:51:41	1.18
@@ -2,6 +2,7 @@
 
 # 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       =   35; # number of seconds after which maps inactive get swapped out
@@ -9,12 +10,12 @@
 our $SAVE_TIMEOUT       =   20; # save maps every n seconds
 our $SAVE_INTERVAL      =  0.1; # save at max. one map every $SAVE_INTERVAL
 
-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 5;
+   Coro::Timer::sleep 1;
 
    my $files = Coro::AIO::aio_readdir cf::localdir . "/" . cf::tmpdir;
 
@@ -29,7 +30,7 @@
    #TODO: should also preload random maps...
 };
 
-our $SCHEDULER = cf::coro {
+our $SCHEDULER = cf::async_ext {
    while () {
       Coro::Timer::sleep $SCHEDULE_INTERVAL;
 
@@ -70,12 +71,33 @@
 
 $SCHEDULER->prio (-2);
 
-# map load prefetch
+# map load prefetch for tiled maps, possibly exits, too
 cf::map->attach (
    on_enter => sub {
       my ($map, $pl) = @_;
 
-      # floodfill surrounging maps, asynchronously
+      (cf::async {
+         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
    },
 );