--- deliantra/server/lib/cf.pm	2008/04/11 14:09:57	1.417
+++ deliantra/server/lib/cf.pm	2008/04/20 00:44:13	1.423
@@ -429,6 +429,8 @@
 };
 
 sub get_slot($;$$) {
+   return if tick_inhibit || $Coro::current == $Coro::main;
+
    my ($time, $pri, $name) = @_;
 
    $time = $TICK * .6 if $time > $TICK * .6;
@@ -1476,6 +1478,8 @@
    aio_mkdir playerdir $pl, 0770;
    $pl->{last_save} = $cf::RUNTIME;
 
+   cf::get_slot 0.01;
+
    $pl->save_pl ($path);
    cf::cede_to_tick;
 }
@@ -1777,6 +1781,9 @@
 
 sub generate_random_map {
    my ($self, $rmp) = @_;
+
+   my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
+
    # mit "rum" bekleckern, nicht
    $self->_create_random_map (
       $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
@@ -1908,7 +1915,7 @@
 sub save_path {
    my ($self) = @_;
 
-   (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
+   (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
    "$TMPDIR/$path.map"
 }
 
@@ -1916,7 +1923,7 @@
 sub uniq_path {
    my ($self) = @_;
 
-   (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
+   (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
    "$UNIQUEDIR/$path"
 }
 
@@ -2112,7 +2119,7 @@
       $self->{last_save} = $cf::RUNTIME;
       $self->last_access ($cf::RUNTIME);
 
-      $self->in_memory (cf::MAP_IN_MEMORY);
+      $self->in_memory (cf::MAP_ACTIVE);
    }
 
    $self->post_load;
@@ -2180,7 +2187,7 @@
    $path = normalise $path, $origin && $origin->{path};
 
    if (my $map = $cf::MAP{$path}) {
-      return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
+      return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
    }
 
    $MAP_PREFETCH{$path} |= $load;
@@ -2227,6 +2234,8 @@
       $_->contr->save for $self->players;
    };
 
+   cf::get_slot 0.02;
+
    if ($uniq) {
       $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
       $self->_save_objects ($uniq, cf::IO_UNIQUES);
@@ -2244,7 +2253,7 @@
    my $lock = cf::lock_acquire "map_data:$self->{path}";
 
    return if $self->players;
-   return if $self->in_memory != cf::MAP_IN_MEMORY;
+   return if $self->in_memory != cf::MAP_ACTIVE;
    return if $self->{deny_save};
 
    $self->in_memory (cf::MAP_SWAPPED);
@@ -2372,9 +2381,10 @@
    [
       map {
          utf8::decode $_;
-         /\.map$/
-            ? normalise $_
-            : ()
+         s/\.map$//; # TODO future compatibility hack
+         /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
+            ? ()
+            : normalise $_
       } @{ aio_readdir $UNIQUEDIR or [] }
    ]
 }
@@ -2391,7 +2401,8 @@
 
 =item $ob->inv_recursive
 
-Returns the inventory of the object _and_ their inventories, recursively.
+Returns the inventory of the object I<and> their inventories, recursively,
+but I<not> the object itself.
 
 =cut
 
@@ -2406,7 +2417,7 @@
 
 =item $ref = $ob->ref
 
-creates and returns a persistent reference to an objetc that can be stored as a string.
+Creates and returns a persistent reference to an object that can be stored as a string.
 
 =item $ob = cf::object::deref ($refstring)
 
@@ -2690,7 +2701,7 @@
 
    $rmp->{random_seed} ||= $exit->random_seed;
 
-   my $data = cf::encode_json $rmp;
+   my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
    my $md5 = Digest::MD5::md5_hex $data;
    my $meta = "$RANDOMDIR/$md5.meta";
 
@@ -3303,6 +3314,13 @@
    }
 };
 
+sub load_resource_file($) {
+   my $status = load_resource_file_ $_[0];
+   get_slot 0.1, 100;
+   cf::arch::commit_load;
+   $status
+}
+
 sub reload_regions {
    # HACK to clear player env face cache, we need some signal framework
    # for this (global event?)
@@ -3325,11 +3343,6 @@
 sub reload_archetypes {
    load_resource_file "$DATADIR/archetypes"
       or die "unable to load archetypes\n";
-   #d# NEED to laod twice to resolve forward references
-   # this really needs to be done in an extra post-pass
-   # (which needs to be synchronous, so solve it differently)
-   load_resource_file "$DATADIR/archetypes"
-      or die "unable to load archetypes\n";
 }
 
 sub reload_treasures {
@@ -3340,16 +3353,17 @@
 sub reload_resources {
    warn "reloading resource files...\n";
 
-   reload_regions;
    reload_facedata;
-   #reload_archetypes;#d#
    reload_archetypes;
+   reload_regions;
    reload_treasures;
 
    warn "finished reloading resource files\n";
 }
 
 sub init {
+   my $guard = freeze_mainloop;
+
    reload_resources;
 }
 
@@ -3384,12 +3398,16 @@
       })->prio (Coro::PRIO_MAX);
    };
 
-   reload_config;
-   db_init;
-   load_extensions;
+   {
+      my $guard = freeze_mainloop;
+      reload_config;
+      db_init;
+      load_extensions;
+
+      $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
+      evthread_start IO::AIO::poll_fileno;
+   }
 
-   $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
-   evthread_start IO::AIO::poll_fileno;
    EV::loop;
 }
 
@@ -3681,8 +3699,7 @@
 our @WAIT_FOR_TICK_BEGIN;
 
 sub wait_for_tick {
-   return if tick_inhibit;
-   return if $Coro::current == $Coro::main;
+   return if tick_inhibit || $Coro::current == $Coro::main;
 
    my $signal = new Coro::Signal;
    push @WAIT_FOR_TICK, $signal;
@@ -3690,8 +3707,7 @@
 }
 
 sub wait_for_tick_begin {
-   return if tick_inhibit;
-   return if $Coro::current == $Coro::main;
+   return if tick_inhibit || $Coro::current == $Coro::main;
 
    my $signal = new Coro::Signal;
    push @WAIT_FOR_TICK_BEGIN, $signal;