--- deliantra/server/ext/map-random.ext	2007/01/14 02:00:36	1.6
+++ deliantra/server/ext/map-random.ext	2007/06/11 21:38:13	1.17
@@ -1,4 +1,4 @@
-#! perl # MANDATORY
+#! perl # mandatory
 
 cf::map->register (qr{^\?random/([0-9a-f]{32})});
 
@@ -7,9 +7,12 @@
 
    $self->{random_id} = $1;
 
-   if (0 < Coro::AIO::aio_load "$cf::RANDOM_MAPS/$self->{random_id}.meta", my $data) {
+   if (0 < Coro::AIO::aio_load "$cf::RANDOMDIR/$self->{random_id}.meta", my $data) {
       $self->{random} = cf::from_json $data;
       $self->{random}{custom} ||= "$self->{random}{origin_map}+$self->{random}{origin_x}+$self->{random}{origin_y}";
+   } else {
+      warn "unable to read meta file for $self->{random_id}\n";
+      return 0;
    }
 
    1
@@ -33,62 +36,71 @@
 sub save_path {
    my ($self) = @_;
 
-   sprintf "%s/%s.map", $cf::RANDOM_MAPS, $self->{random_id}
+   sprintf "%s/%s.map", $cf::RANDOMDIR, $self->{random_id}
 }
 
 sub uniq_path {
    undef
 }
 
-sub load_orig {
+sub load_header_orig {
    my ($self) = @_;
 
    return unless $self->{random};
 
    $self->generate_random_map ($self->{random});
+   $self->activate;
 
    1
 }
 
 sub clean_random_maps {
-   cf::async {
-      my $files = Coro::AIO::aio_readdir $cf::RANDOM_MAPS
-         or return;
+   my $files = Coro::AIO::aio_readdir $cf::RANDOMDIR
+      or return;
+
+   my $META_TIMEOUT = $cf::CFG{map_random_meta_timeout} || 86400 * 7;
+
+   for my $file (@$files) {
+      next unless $file =~ /\.meta$/;
 
-      my $META_TIMEOUT = $cf::CFG{map_random_meta_timeout} || 86400 * 7;
-      my $MAP_TIMEOUT  = $cf::CFG{map_random_map_timeout}  || 3600 * 6;
+      Coro::AIO::aio_stat "$cf::RANDOMDIR/$file"
+         and next;
 
-      for my $file (@$files) {
-         next if $file =~ /\.pst$/;
+      my $age = $cf::NOW - (stat _)[8];
 
-         Coro::AIO::aio_stat "$cf::RANDOM_MAPS/$file"
-            and next;
-
-         my $age = $cf::NOW - (stat _)[8];
-
-         if ($file =~ /\.meta$/) {
-            if ($age > $META_TIMEOUT) {
-               warn "resetting random meta data for $file";
-               IO::AIO::aio_unlink "$cf::RANDOM_MAPS/$file";
-            }
-         } else {
-            if ($age > $MAP_TIMEOUT) {
-               warn "resetting random map $file";
-               IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$cf::RANDOM_MAPS/$file";
-               IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$cf::RANDOM_MAPS/$file.pst";
-            }
-         }
+      if ($age > $META_TIMEOUT) {
+         warn "resetting random meta data for $file";
+         IO::AIO::aio_unlink "$cf::RANDOMDIR/$file";
       }
-   };
+   }
 }
 
 # clean up old temp maps regularly
 Event->timer (
-   data     => cf::WF_AUTOCANCEL,
-   interval => 3600,
-   after    => 600,
-   cb       => \&clean_random_maps,
+   reentrant => 0,
+   data      => cf::WF_AUTOCANCEL,
+   interval  => 3600,
+   after     => 60,
+   cb        => Coro::unblock_sub { clean_random_maps },
 );
 
+# map generator stresstest, never enable under normal circumstances
+if (0) {
+   cf::async {
+      my $seed = 0;
+      while () {
+         my $map = cf::map::new;
+         $map->generate_random_map ({
+            region => "scorn",
+            random_seed => $seed++,
+            xsize => 12,
+            ysize => 12,
+         });
+         warn sprintf "%d: %d %d\n", $seed, $map->width, $map->height;#d#
+         $map->destroy;
+      }
+   };
+}
+
 1