--- deliantra/server/lib/cf.pm	2008/04/10 15:35:16	1.415
+++ deliantra/server/lib/cf.pm	2008/04/11 14:09:57	1.417
@@ -3406,7 +3406,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 +3444,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 +3516,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 +3544,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 +3711,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: $!";
       };
    }