--- deliantra/server/lib/cf.pm	2007/01/02 22:55:05	1.124
+++ deliantra/server/lib/cf.pm	2007/01/04 01:35:56	1.132
@@ -10,7 +10,7 @@
 use Safe;
 use Safe::Hole;
 
-use Coro 3.3;
+use Coro 3.3 ();
 use Coro::Event;
 use Coro::Timer;
 use Coro::Signal;
@@ -73,8 +73,7 @@
 
 # a special map that is always available
 our $LINK_MAP;
-
-our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
+our $EMERGENCY_POSITION;
 
 #############################################################################
 
@@ -247,6 +246,22 @@
    }
 }
 
+=item cf::async { BLOCK }
+
+Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the
+error instead of exiting the server in case of a problem.
+
+=cut
+
+sub async(&) {
+   my ($cb) = @_;
+
+   Coro::async {
+      eval { $cb->() };
+      warn $@ if $@;
+   }
+}
+
 =item cf::sync_job { BLOCK }
 
 The design of crossfire+ requires that the main coro ($Coro::main) is
@@ -303,12 +318,7 @@
 sub coro(&) {
    my $cb = shift;
 
-   my $coro; $coro = async {
-      eval {
-         $cb->();
-      };
-      warn $@ if $@;
-   };
+   my $coro = &cf::async ($cb);
 
    $coro->on_destroy (sub {
       delete $EXT_CORO{$coro+0};
@@ -1177,6 +1187,7 @@
    $map
 }
 
+sub find_map;
 sub find_map {
    my ($path, $origin) = @_;
 
@@ -1194,6 +1205,8 @@
       my $map = try_load_header $path->save_path;
 
       if ($map) {
+         $map->last_access ((delete $map->{last_access})
+                            || $cf::RUNTIME); #d#
          # safety
          $map->{instantiate_time} = $cf::RUNTIME
             if $map->{instantiate_time} > $cf::RUNTIME;
@@ -1208,6 +1221,7 @@
 
          $map->{load_original} = 1;
          $map->{instantiate_time} = $cf::RUNTIME;
+         $map->last_access ($cf::RUNTIME);
          $map->instantiate;
 
          # per-player maps become, after loading, normal maps
@@ -1217,12 +1231,11 @@
       $map->path ($key);
       $map->{path} = $path;
       $map->{last_save} = $cf::RUNTIME;
-      $map->last_access ($cf::RUNTIME);
 
       if ($map->should_reset) {
          $map->reset;
          undef $guard;
-         $map = cf::map::find_map ($path)
+         $map = find_map $path
             or return;
       }
 
@@ -1301,6 +1314,8 @@
 
    return if $self->{deny_save};
 
+   local $self->{last_access} = $self->last_access;#d#
+
    if ($uniq) {
       $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
       $self->save_objects ($uniq, cf::IO_UNIQUES);
@@ -1312,11 +1327,13 @@
 sub swap_out {
    my ($self) = @_;
 
+   # save first because save cedes
+   $self->save;
+
    return if $self->players;
    return if $self->in_memory != cf::MAP_IN_MEMORY;
    return if $self->{deny_save};
 
-   $self->save;
    $self->clear;
    $self->in_memory (cf::MAP_SWAPPED);
 }
@@ -1539,7 +1556,7 @@
       # should happen only on crashes
       if ($pl->ob->{_link_pos}) {
          $pl->ob->enter_link;
-         Coro::async {
+         cf::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
             Coro::Timer::sleep 1;
@@ -1558,7 +1575,7 @@
 
    $self->enter_link;
 
-   (Coro::async {
+   (cf::async {
       $path = new cf::path $path;
 
       my $map = cf::map::find_map $path->as_string;
@@ -1630,9 +1647,8 @@
 
    $self->enter_link;
 
-   (Coro::async {
+   (cf::async {
       unless (eval {
-
          prepare_random_map $exit
             if $exit->slaying eq "/!";
 
@@ -1704,7 +1720,8 @@
 
       # this weird shuffling is so that direct followup queries
       # get handled first
-      my $queue = delete $ns->{query_queue};
+      my $queue = delete $ns->{query_queue}
+         or return; # be conservative, not sure how that can happen, but we saw a crash here
 
       (shift @$queue)->[1]->($msg);
 
@@ -1731,12 +1748,7 @@
 sub cf::client::coro {
    my ($self, $cb) = @_;
 
-   my $coro; $coro = async {
-      eval {
-         $cb->();
-      };
-      warn $@ if $@;
-   };
+   my $coro = &cf::async ($cb);
 
    $coro->on_destroy (sub {
       delete $self->{_coro}{$coro+0};
@@ -1981,6 +1993,16 @@
 
    local $/;
    *CFG = YAML::Syck::Load <$fh>;
+
+   $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
+
+   if (exists $CFG{mlockall}) {
+      eval {
+         $CFG{mlockall} ? &mlockall : &munlockall
+            and die "WARNING: m(un)lockall failed: $!\n";
+      };
+      warn $@ if $@;
+   }
 }
 
 sub main {
@@ -2193,5 +2215,7 @@
    },
 );
 
+END { cf::emergency_save }
+
 1