--- deliantra/server/lib/cf.pm	2007/02/13 16:23:32	1.211
+++ deliantra/server/lib/cf.pm	2007/02/15 21:07:49	1.217
@@ -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,8 +356,6 @@
 }
 
 sub write_runtime {
-   $TICK_WATCHER->is_active or cf::cleanup "mainloop frozen but runtime active", 1;
-
    my $runtime = cf::localdir . "/runtime";
 
    my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
@@ -791,12 +787,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";
-      }
    }
 }
 
@@ -813,9 +803,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;
 
@@ -1311,11 +1298,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($) {
@@ -1824,6 +1806,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);
 }
 
@@ -1846,12 +1830,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);
@@ -2260,8 +2244,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#
 }
 
@@ -2287,7 +2271,7 @@
 }
 
 sub init {
-   load_resources;
+   init_resources;
 }
 
 sub main {
@@ -2374,12 +2358,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";
@@ -2387,9 +2375,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;
@@ -2470,18 +2455,16 @@
       reattach $_ for values %MAP;
 
       warn "loading reloadable resources";
-      load_resources;
+      init_resources;
 
-      warn "restarting server ticker";
+      warn "leaving sync_job";
 
-      $TICK_WATCHER->start;
-   };
-
-   if ($@) {
+      1
+   } or do {
       warn $@;
       warn "error while reloading, exiting.";
       exit 1;
-   }
+   };
 
    warn "reloaded";
 };
@@ -2532,12 +2515,18 @@
       $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#
 
@@ -2606,26 +2595,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