--- deliantra/server/ext/map-scheduler.ext	2007/01/04 17:28:49	1.13
+++ deliantra/server/ext/map-scheduler.ext	2007/01/13 23:06:13	1.22
@@ -1,20 +1,20 @@
-#! 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       =   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
 
-cf::coro {
+cf::async_ext {
    $Coro::current->prio (Coro::PRIO_MIN);
-   # load the header of swapped-out.
+   # 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;
 
@@ -23,13 +23,13 @@
       next if $map =~ /\.(?:pst|meta)$/;
       $map =~ s/∕/\//g;
       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 {
    while () {
       Coro::Timer::sleep $SCHEDULE_INTERVAL;
 
@@ -54,11 +54,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;
                }
             }
          };
@@ -70,12 +70,3 @@
 
 $SCHEDULER->prio (-2);
 
-# map load prefetch
-cf::map->attach (
-   on_enter => sub {
-      my ($map, $pl) = @_;
-
-      # floodfill surrounging maps, asynchronously
-   },
-);
-