--- deliantra/server/lib/cf.pm	2007/02/12 01:25:55	1.209
+++ deliantra/server/lib/cf.pm	2007/02/17 03:19:44	1.219
@@ -51,7 +51,7 @@
 our $TICK = MAX_TIME * 1e-6;
 our $TICK_WATCHER;
 our $AIO_POLL_WATCHER;
-our $WRITE_RUNTIME_WATCHER;
+our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
 our $NEXT_TICK;
 our $NOW;
 our $USE_FSYNC = 1; # use fsync to write maps - default off
@@ -275,9 +275,7 @@
 
    my $guard = Coro::guard {
       $TICK_WATCHER->start;
-      $WRITE_RUNTIME_WATCHER->start;
    };
-   $WRITE_RUNTIME_WATCHER->stop;
    $TICK_WATCHER->stop;
    $guard
 }
@@ -358,6 +356,8 @@
 }
 
 sub write_runtime {
+   my $guard = cf::lock_acquire "write_runtime";
+
    my $runtime = cf::localdir . "/runtime";
 
    my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
@@ -789,12 +789,6 @@
          aio_unlink $filename;
          aio_unlink "$filename.pst";
       }
-
-      #d##TODO# nuke non .map-files if exist
-      if ($filename =~ s/\.map$//) {
-         aio_unlink $filename;
-         aio_unlink "$filename.pst";
-      }
    }
 }
 
@@ -811,9 +805,6 @@
 
    my ($data, $av);
 
-   #d#TODO remove .map if file does not exist
-   aio_stat $filename and $filename =~ s/\.map$//;
-
    (aio_load $filename, $data) >= 0
       or return;
 
@@ -1309,11 +1300,6 @@
    utf8::encode (my $save = $self->save_path);
    IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
    IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
-
-   #d#TODO remove .map and also nuke
-   $save =~ s/\.map// or return;#d#
-   IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
-   IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
 }
 
 sub load_header_from($) {
@@ -1611,9 +1597,18 @@
 
    warn "resetting map ", $self->path;#d#
 
+   $self->in_memory (cf::MAP_SWAPPED);
+
+   # need to save uniques path
+   unless ($self->{deny_save}) {
+      my $uniq = $self->uniq_path; utf8::encode $uniq;
+
+      $self->_save_objects ($uniq, cf::IO_UNIQUES)
+         if $uniq;
+   }
+
    delete $cf::MAP{$self->path};
 
-   $self->in_memory (cf::MAP_SWAPPED);
    $self->clear;
 
    $_->clear_links_to ($self) for values %cf::MAP;
@@ -1813,6 +1808,8 @@
 
    return unless $self->contr->active;
    $self->activate_recursive;
+
+   local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
    $self->enter_map ($map, $x, $y);
 }
 
@@ -1835,12 +1832,12 @@
       if ($pl->ob->{_link_pos}) {
          $pl->ob->enter_link;
          (async {
-            # we need this sleep as the login has a concurrent enter_exit running
-            # and this sleep increases chances of the player not ending up in scorn
             $pl->ob->reply (undef,
                             "There was an internal problem at your last logout, "
                           . "the server will try to bring you to your intended destination in a second.",
                             cf::NDI_RED);
+            # we need this sleep as the login has a concurrent enter_exit running
+            # and this sleep increases chances of the player not ending up in scorn
             Coro::Timer::sleep 1;
             $pl->ob->leave_link;
          })->prio (2);
@@ -2199,32 +2196,34 @@
 
 our $DB;
 
-unless ($DB) {
-   $DB = BDB::db_create $DB_ENV;
+sub db_init {
+   unless ($DB) {
+      $DB = BDB::db_create $DB_ENV;
 
-   cf::sync_job {
-      eval {
-         $DB->set_flags (BDB::CHKSUM);
+      cf::sync_job {
+         eval {
+            $DB->set_flags (BDB::CHKSUM);
 
-         BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
-                      BDB::CREATE | BDB::AUTO_COMMIT, 0666;
-         cf::cleanup "db_open(db): $!" if $!;
+            BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
+                         BDB::CREATE | BDB::AUTO_COMMIT, 0666;
+            cf::cleanup "db_open(db): $!" if $!;
+         };
+         cf::cleanup "db_open(db): $@" if $@;
       };
-      cf::cleanup "db_open(db): $@" if $@;
-   };
 
-   my $path = cf::localdir . "/database.pst";
-   if (stat $path) {
-      cf::sync_job {
-         my $pst = Storable::retrieve $path;
+      my $path = cf::localdir . "/database.pst";
+      if (stat $path) {
+         cf::sync_job {
+            my $pst = Storable::retrieve $path;
 
-         cf::db_put (board => data      => $pst->{board});
-         cf::db_put (guildrules => data => $pst->{guildrules});
-         cf::db_put (rent => balance    => $pst->{rent}{balance});
-         BDB::db_env_txn_checkpoint $DB_ENV;
+            cf::db_put (board => data      => $pst->{board});
+            cf::db_put (guildrules => data => $pst->{guildrules});
+            cf::db_put (rent => balance    => $pst->{rent}{balance});
+            BDB::db_env_txn_checkpoint $DB_ENV;
 
-         unlink $path;
-      };
+            unlink $path;
+         };
+      }
    }
 }
 
@@ -2247,8 +2246,8 @@
 #############################################################################
 # the server's init and main functions
 
-sub load_resources {
-   load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
+sub init_resources {
+   load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
       or die "unable to load regions file\n";#d#
 }
 
@@ -2274,7 +2273,7 @@
 }
 
 sub init {
-   load_resources;
+   init_resources;
 }
 
 sub main {
@@ -2287,6 +2286,7 @@
    };
 
    cfg_load;
+   db_init;
    load_extensions;
 
    $TICK_WATCHER->start;
@@ -2344,6 +2344,13 @@
    warn "leave emergency perl save\n";
 }
 
+sub post_cleanup {
+   my ($make_core) = @_;
+
+   warn Carp::longmess "post_cleanup backtrace"
+      if $make_core;
+}
+
 sub reload() {
    # can/must only be called in main
    if ($Coro::current != $Coro::main) {
@@ -2353,12 +2360,16 @@
 
    warn "reloading...";
 
-   warn "cancelling server ticker";
-   $TICK_WATCHER->cancel;
+   warn "entering sync_job";
 
-   cf::emergency_save;
+   cf::sync_job {
+      cf::write_runtime; # external watchdog should not bark
+      cf::emergency_save;
+      cf::write_runtime; # external watchdog should not bark
+
+      warn "syncing database to disk";
+      BDB::db_env_txn_checkpoint $DB_ENV;
 
-   eval {
       # if anything goes wrong in here, we should simply crash as we already saved
 
       warn "cancelling all WF_AUTOCANCEL watchers";
@@ -2366,9 +2377,6 @@
          $_->cancel if $_->data & WF_AUTOCANCEL;
       }
 
-      warn "syncing database to disk";
-      BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
-
       warn "flushing outstanding aio requests";
       for (;;) {
          BDB::flush;
@@ -2449,18 +2457,16 @@
       reattach $_ for values %MAP;
 
       warn "loading reloadable resources";
-      load_resources;
+      init_resources;
 
-      warn "restarting server ticker";
-
-      $TICK_WATCHER->start;
-   };
+      warn "leaving sync_job";
 
-   if ($@) {
+      1
+   } or do {
       warn $@;
       warn "error while reloading, exiting.";
       exit 1;
-   }
+   };
 
    warn "reloaded";
 };
@@ -2511,12 +2517,17 @@
       $RUNTIME   += $TICK;
       $NEXT_TICK += $TICK;
 
+      if ($NOW >= $NEXT_RUNTIME_WRITE) {
+         $NEXT_RUNTIME_WRITE = $NOW + 10;
+         Coro::async_pool {
+            write_runtime
+               or warn "ERROR: unable to write runtime file: $!";
+         };
+      }
+
       $WAIT_FOR_TICK->broadcast;
       $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
 
-      Event::sweep;
-      Coro::cede_notself;
-      
 #      my $AFTER = Event::time;
 #      warn $AFTER - $NOW;#d#
 
@@ -2585,26 +2596,14 @@
    IO::AIO::max_poll_time $TICK * 0.1;
    $AIO_POLL_WATCHER = Event->io (
       reentrant => 0,
+      data      => WF_AUTOCANCEL,
       fd        => IO::AIO::poll_fileno,
       poll      => 'r',
       prio      => 6,
-      data      => WF_AUTOCANCEL,
       cb        => \&IO::AIO::poll_cb,
    );
 }
 
-$WRITE_RUNTIME_WATCHER = Event->timer (
-   reentrant => 0,
-   data      => WF_AUTOCANCEL,
-   after     => 1,
-   interval  => 10,
-   prio      => 6,  # keep it lowest so it acts like a watchdog
-   cb        => Coro::unblock_sub {
-      write_runtime
-         or warn "ERROR: unable to write runtime file: $!";
-   },
-);
-
 END { cf::emergency_save }
 
 1