--- deliantra/server/ext/map-scheduler.ext	2007/05/11 07:59:59	1.34
+++ deliantra/server/ext/map-scheduler.ext	2007/07/28 13:13:36	1.39
@@ -1,4 +1,4 @@
-#! perl # MANDATORY
+#! perl # mandatory
 
 # this extension swaps out maps and resets them, in essence managing
 # the reset/swap policy of the server.
@@ -11,29 +11,55 @@
 our $SWAP_LOAD1         = $cf::CFG{swap_load1}        ||  .1; # start aggressively swapping at this load
 our $SWAP_LOAD2         = $cf::CFG{swap_load2}        ||  .4; # swap as fast as possible at this load
 
+warn "load1 ", $SWAP_LOAD1;#d#
+warn "load2 ", $SWAP_LOAD2;#d#
+
 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::TMPDIR;
+   Coro::Timer::sleep 0.25;
 
-   for my $map (@$files) {
-      utf8::decode $map;
-      next if $map =~ /\.(?:pst|meta)$/;
-      cf::map::find $map;
-      cf::wait_for_tick;
+   for my $path (@{ cf::map::tmp_maps or [] }, @{ cf::map::random_maps or [] }) {
+      cf::cede_to_tick;
+      cf::map::find $path;
    }
 
-   #TODO: should also preload random maps...
+   # now hunt for resettable per-player maps
+   for my $login (@{ cf::player::list_logins or [] }) {
+      for my $path (@{ cf::player::maps $login or [] }) {
+         cf::cede_to_tick;
+
+         $path =~ /^~[^\/]+(\/.*)$/
+            or next; # doh
+
+         my $base = cf::map::find $1;
+
+         # skip maps without base maps on the assumption
+         # that those are old, unresettable maps
+         next unless $base;
+
+         # skip unresettable maps, for speed
+         next if $base->{deny_reset};
+
+         my $map = cf::map::find $path;
+
+         if ($map->{deny_reset}) {
+            warn "found noreset map with resettable base map, resetting: $path\n";
+            delete $map->{deny_reset};
+         }
+      }
+   }
 };
 
 our $SCHEDULER = cf::async_ext {
+   my $timer = Coro::Event->timer (after => 1);
+
    while () {
-      Coro::Event::do_timer (after => $SCHEDULE_INTERVAL)
-         unless $cf::LOADAVG > $SWAP_LOAD2;
+      $timer->interval ($SCHEDULE_INTERVAL);
+      $timer->next unless $cf::LOADAVG > $SWAP_LOAD2;
 
       # this weird form of iteration over values is used because
       # the hash changes underneath us frequently, and for
@@ -59,10 +85,9 @@
 
                if ($map->last_access + $max_idle <= $cf::RUNTIME && !$map->players) {
                   $map->swap_out;
-                  cf::wait_for_tick unless $cf::LOADAVG > $SWAP_LOAD2;
                } elsif ($map->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
                   $map->save;
-                  cf::wait_for_tick unless $cf::LOADAVG > $SWAP_LOAD2;
+                  $map->{last_save} -= rand; # randomise map save times a bit
                }
             }
          };