--- deliantra/server/ext/map-random.ext	2007/04/21 17:34:24	1.15
+++ deliantra/server/ext/map-random.ext	2009/11/08 22:28:10	1.35
@@ -1,4 +1,6 @@
-#! perl # MANDATORY
+#! perl # mandatory
+
+use Coro::AIO;
 
 cf::map->register (qr{^\?random/([0-9a-f]{32})});
 
@@ -8,7 +10,7 @@
    $self->{random_id} = $1;
 
    if (0 < Coro::AIO::aio_load "$cf::RANDOMDIR/$self->{random_id}.meta", my $data) {
-      $self->{random} = cf::from_json $data;
+      $self->{random} = cf::decode_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";
@@ -55,46 +57,96 @@
 }
 
 sub clean_random_maps {
-   my $files = Coro::AIO::aio_readdir $cf::RANDOMDIR
+   my $files = Coro::AIO::aio_readdirx $cf::RANDOMDIR, IO::AIO::READDIR_STAT_ORDER
       or return;
 
    my $META_TIMEOUT = $cf::CFG{map_random_meta_timeout} || 86400 * 7;
-   my $MAP_TIMEOUT  = $cf::CFG{map_random_map_timeout}  || 3600 * 6;
 
    for my $file (@$files) {
-      next if $file =~ /\.pst$/;
+      next unless $file =~ /\.meta$/;
 
       Coro::AIO::aio_stat "$cf::RANDOMDIR/$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::RANDOMDIR/$file";
-         }
-      } else {
-         if ($age > $MAP_TIMEOUT) {
-            warn "resetting random map $file";
-            IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$cf::RANDOMDIR/$file";
-            IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$cf::RANDOMDIR/$file.pst";
+      if ($age > $META_TIMEOUT) {
+         warn "resetting random meta data for $file";
+         IO::AIO::aio_unlink "$cf::RANDOMDIR/$file";
+      }
+   }
+}
+
+# called by the random map generator
+sub find_style_;
+sub find_style_($$) {
+   my ($path, $difficulty) = @_;
+
+   my $map;
+
+   $map = cf::map::find $path
+      unless aio_stat "$cf::MAPDIR/$path.map";
+
+   unless ($map) {
+      # search files and/or dirs
+      if (my ($dirs, $nondirs) = aio_scandir "$cf::MAPDIR/$path/", 1) {
+         my @entries = sort grep s/\.map$//, @$nondirs;
+
+         if ($difficulty < 0) {
+            # pick a fully random map, but only a map, do not recurse
+            $map = cf::map::find "$path/$entries[cf::rmg_rndm scalar @entries]"
+               if @entries;
+         } else {
+            # pick a map with nearest difficulty value ("mapname_<difficulty>.map")
+            @entries = sort @$dirs
+               unless @entries;
+
+            my $min_diff = 1e99;
+
+            for my $name (@entries) {
+               if ($name =~ /_(\d+)$/) {
+                  my $diff = abs $difficulty - $1 + 0.5; # prefer the more difficult version
+                  ($map, $min_diff) = ($name, $diff) if $diff < $min_diff;
+               }
+            }
+
+            unless ($map) {
+               # no map with given pattern found, choose a random map
+               $map = $entries[cf::rmg_rndm scalar @entries];
+            }
+
+            $map = find_style_ "$path/$map", $difficulty
+               if $map;
          }
       }
    }
+
+   $map
+}
+
+sub find_style($$$) {
+   my ($dir, $name, $difficulty) = @_;
+   
+   cf::cede_to_tick;
+
+   my $map = find_style_ $name ? "$dir/$name" : $dir, $difficulty;
+
+   if ($map) {
+      $map->load;
+      $map->deactivate;
+   }
+
+   #warn "return $dir,$name,$difficulty => $map\n" if $difficulty >= 0;#d#
+   $map
 }
 
 # clean up old temp maps regularly
-Event->timer (
-   reentrant => 0,
-   data      => cf::WF_AUTOCANCEL,
-   interval  => 3600,
-   after     => 60,
-   cb        => Coro::unblock_sub { clean_random_maps },
-);
+our $CLEAN_RANDOM_MAPS = cf::periodic 3600, Coro::unblock_sub {
+   clean_random_maps;
+};
 
-# map generator stresstest, never enable under normal circumstances
-if (0) {
+# map generator stresstest, NEVER enable under normal circumstances
+if ($ENV{STRESSTEST}) {
    cf::async {
       my $seed = 0;
       while () {
@@ -102,14 +154,47 @@
          $map->generate_random_map ({
             region => "scorn",
             random_seed => $seed++,
-            xsize => 12,
-            ysize => 12,
+            xsize => (int rand 100) + 1,
+            ysize => (int rand 100) + 1,
          });
-         warn sprintf "%d: %d %d\n", $seed, $map->width, $map->height;#d#
+         warn sprintf "%d: %dx%d o# %d\n", $seed, $map->width, $map->height, &cf::object::objects_size;#d#
          $map->destroy;
       }
    };
 }
+
+# prefetch test, load some ocean-maps
+if (0) {
+   cf::async {
+      # 0.58
+      Coro::Timer::sleep 2;
+      for my $x (200..219) {
+         for my $y (200..219) {
+            (cf::map::find "/world/world_$x\_$y")->load;
+         }
+      }
+   };
+}
+
+# save test
+if (0) {
+   cf::async {
+      # 0.58
+      Coro::Timer::sleep 2;
+      my $map = cf::map::find "/mlab/citydeclouds2";
+      $map->load_header;
+      $map->load;
+      $map->post_load_original;
+      my $m=100;
+      for (1..50) {
+         my $t=EV::time;
+         $map->_save_objects ("/tmp/x", cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
+         $t = EV::time-$t;
+         $m=$t if $m>$t;
+         warn $m;
+      }
+   };
+}
 
 1