--- deliantra/server/lib/cf.pm	2008/04/10 15:35:16	1.415
+++ deliantra/server/lib/cf.pm	2008/04/15 14:21:04	1.420
@@ -429,6 +429,8 @@
 };
 
 sub get_slot($;$$) {
+   return if tick_inhibit;
+
    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)
 
@@ -3406,7 +3417,7 @@
    }
 }
 
-sub write_runtime {
+sub write_runtime_sync {
    my $runtime = "$LOCALDIR/runtime";
 
    # first touch the runtime file to show we are still running:
@@ -3444,6 +3455,49 @@
    1
 }
 
+our $uuid_lock;
+our $uuid_skip;
+
+sub write_uuid_sync($) {
+   $uuid_skip ||= $_[0];
+
+   return if $uuid_lock;
+   local $uuid_lock = 1;
+
+   my $uuid = "$LOCALDIR/uuid";
+
+   my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
+      or return;
+
+   my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
+   $uuid_skip = 0;
+
+   (aio_write $fh, 0, (length $value), $value, 0) <= 0
+      and return;
+
+   # always fsync - this file is important
+   aio_fsync $fh
+      and return;
+
+   close $fh
+      or return;
+
+   aio_rename "$uuid~", $uuid
+      and return;
+
+   warn "uuid file written ($value).\n";
+
+   1
+
+}
+
+sub write_uuid($$) {
+   my ($skip, $sync) = @_;
+
+   $sync ? write_uuid_sync $skip
+         : async { write_uuid_sync $skip };
+}
+
 sub emergency_save() {
    my $freeze_guard = cf::freeze_mainloop;
 
@@ -3473,6 +3527,10 @@
       warn "begin emergency database checkpoint\n";
       BDB::db_env_txn_checkpoint $DB_ENV;
       warn "end emergency database checkpoint\n";
+
+      warn "begin write uuid\n";
+      write_uuid_sync 1;
+      warn "end write uuid\n";
    };
 
    warn "leave emergency perl save\n";
@@ -3497,9 +3555,9 @@
    warn "entering sync_job";
 
    cf::sync_job {
-      cf::write_runtime; # external watchdog should not bark
+      cf::write_runtime_sync; # external watchdog should not bark
       cf::emergency_save;
-      cf::write_runtime; # external watchdog should not bark
+      cf::write_runtime_sync; # external watchdog should not bark
 
       warn "syncing database to disk";
       BDB::db_env_txn_checkpoint $DB_ENV;
@@ -3664,7 +3722,7 @@
       $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
       Coro::async_pool {
          $Coro::current->{desc} = "runtime saver";
-         write_runtime
+         write_runtime_sync
             or warn "ERROR: unable to write runtime file: $!";
       };
    }