--- deliantra/server/lib/cf.pm	2007/01/02 08:26:42	1.119
+++ deliantra/server/lib/cf.pm	2007/01/05 21:51:42	1.142
@@ -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;
@@ -28,7 +28,7 @@
 # work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
 $YAML::Syck::ImplicitUnicode = 1;
 
-$Coro::main->prio (2); # run main coroutine ("the server") with very high priority
+$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
 
 sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
 
@@ -51,7 +51,6 @@
 
 our %MAP; # all maps
 our $LINK_MAP; # the special {link} map
-our $FREEZE;
 our $RANDOM_MAPS = cf::localdir . "/random";
 our %EXT_CORO;
 
@@ -73,8 +72,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;
 
 #############################################################################
 
@@ -183,6 +181,66 @@
    JSON::Syck::Dump $_[0]
 }
 
+=item cf::lock_wait $string
+
+Wait until the given lock is available. See cf::lock_acquire. 
+
+=item my $lock = cf::lock_acquire $string
+
+Wait until the given lock is available and then acquires it and returns
+a Coro::guard object. If the guard object gets destroyed (goes out of scope,
+for example when the coroutine gets canceled), the lock is automatically
+returned.
+
+Lock names should begin with a unique identifier (for example, cf::map::find
+uses map_find and cf::map::load uses map_load).
+
+=cut
+
+our %LOCK;
+
+sub lock_wait($) {
+   my ($key) = @_;
+
+   # wait for lock, if any
+   while ($LOCK{$key}) {
+      push @{ $LOCK{$key} }, $Coro::current;
+      Coro::schedule;
+   }
+}
+
+sub lock_acquire($) {
+   my ($key) = @_;
+
+   # wait, to be sure we are not locked
+   lock_wait $key;
+
+   $LOCK{$key} = [];
+
+   Coro::guard {
+      # wake up all waiters, to be on the safe side
+      $_->ready for @{ delete $LOCK{$key} };
+   }
+}
+
+sub freeze_mainloop {
+   return unless $TICK_WATCHER->is_active;
+
+   my $guard = Coro::guard { $TICK_WATCHER->start };
+   $TICK_WATCHER->stop;
+   $guard
+}
+
+=item cf::async { BLOCK }
+
+Currently the same as Coro::async_pool, meaning you cannot use
+C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
+thing you are allowed to do is call C<prio> on it.
+
+=cut
+
+BEGIN { *async = \&Coro::async_pool }
+
 =item cf::sync_job { BLOCK }
 
 The design of crossfire+ requires that the main coro ($Coro::main) is
@@ -205,20 +263,19 @@
       
       # TODO: use suspend/resume instead
       # (but this is cancel-safe)
-      local $FREEZE = 1;
+      my $freeze_guard = freeze_mainloop;
 
       my $busy = 1;
       my @res;
 
-      (Coro::async {
+      (async {
          @res = eval { $job->() };
          warn $@ if $@;
          undef $busy;
       })->prio (Coro::PRIO_MAX);
 
       while ($busy) {
-         Coro::cede_notself;
-         Event::one_event unless Coro::nready;
+         Coro::cede or Event::one_event;
       }
 
       wantarray ? @res : $res[0]
@@ -229,22 +286,17 @@
    }
 }
 
-=item $coro = cf::coro { BLOCK }
+=item $coro = cf::async_ext { BLOCK }
 
-Creates and returns a new coro. This coro is automcatially being canceled
-when the extension calling this is being unloaded.
+Like async, but this coro is automcatially being canceled when the
+extension calling this is being unloaded.
 
 =cut
 
-sub coro(&) {
+sub async_ext(&) {
    my $cb = shift;
 
-   my $coro; $coro = async {
-      eval {
-         $cb->();
-      };
-      warn $@ if $@;
-   };
+   my $coro = &Coro::async ($cb);
 
    $coro->on_destroy (sub {
       delete $EXT_CORO{$coro+0};
@@ -1064,8 +1116,8 @@
 use Fcntl;
 use Coro::AIO;
 
-our $MAX_RESET     = 7200;
-our $DEFAULT_RESET = 3600;
+our $MAX_RESET     = 3600;
+our $DEFAULT_RESET = 3000;
 
 sub generate_random_map {
    my ($path, $rmp) = @_;
@@ -1091,7 +1143,8 @@
 sub change_all_map_light {
    my ($change) = @_;
 
-   $_->change_map_light ($change) for values %cf::MAP;
+   $_->change_map_light ($change)
+      for grep $_->outdoor, values %cf::MAP;
 }
 
 sub try_load_header($) {
@@ -1104,6 +1157,9 @@
    my $map = cf::map::new
       or return;
 
+   # for better error messages only, will be overwritten
+   $map->path ($path);
+
    $map->load_header ($path)
      or return;
 
@@ -1112,19 +1168,28 @@
    $map
 }
 
-sub find_map {
+sub find;
+sub find {
    my ($path, $origin) = @_;
 
-   #warn "find_map<$path,$origin>\n";#d#
+   #warn "find<$path,$origin>\n";#d#
 
    $path = new cf::path $path, $origin && $origin->path;
    my $key = $path->as_string;
 
+   cf::lock_wait "map_find:$key";
+
    $cf::MAP{$key} || do {
+      my $guard = cf::lock_acquire "map_find:$key";
+
       # do it the slow way
       my $map = try_load_header $path->save_path;
 
+      Coro::cede;
+
       if ($map) {
+         $map->last_access ((delete $map->{last_access})
+                            || $cf::RUNTIME); #d#
          # safety
          $map->{instantiate_time} = $cf::RUNTIME
             if $map->{instantiate_time} > $cf::RUNTIME;
@@ -1139,21 +1204,24 @@
 
          $map->{load_original} = 1;
          $map->{instantiate_time} = $cf::RUNTIME;
+         $map->last_access ($cf::RUNTIME);
          $map->instantiate;
 
          # per-player maps become, after loading, normal maps
          $map->per_player (0) if $path->{user_rel};
       }
-      #Coro::Timer::sleep 1;#d#
 
       $map->path ($key);
       $map->{path} = $path;
       $map->{last_save} = $cf::RUNTIME;
-      $map->last_access ($cf::RUNTIME);
+
+      Coro::cede;
 
       if ($map->should_reset) {
          $map->reset;
-         $map = find_map $path;
+         undef $guard;
+         $map = find $path
+            or return;
       }
 
       $cf::MAP{$key} = $map
@@ -1163,12 +1231,13 @@
 sub load {
    my ($self) = @_;
 
+   my $path = $self->{path};
+   my $guard = cf::lock_acquire "map_load:" . $path->as_string;
+
    return if $self->in_memory != cf::MAP_SWAPPED;
 
    $self->in_memory (cf::MAP_LOADING);
 
-   my $path = $self->{path};
-
    $self->alloc;
    $self->load_objects ($self->{load_path}, 1)
       or return;
@@ -1184,6 +1253,8 @@
       }
    }
 
+   Coro::cede;
+
    # now do the right thing for maps
    $self->link_multipart_objects;
 
@@ -1200,25 +1271,28 @@
       $self->activate;
    }
 
+   Coro::cede;
+
    $self->in_memory (cf::MAP_IN_MEMORY);
 }
 
-sub load_map_sync {
+sub find_sync {
    my ($path, $origin) = @_;
 
-   #warn "load_map_sync<$path, $origin>\n";#d#
+   cf::sync_job { cf::map::find $path, $origin }
+}
 
-   cf::sync_job {
-      my $map = cf::map::find_map $path, $origin
-         or return;
-      $map->load;
-      $map
-   }
+sub do_load_sync {
+   my ($map) = @_;
+
+   cf::sync_job { $map->load };
 }
 
 sub save {
    my ($self) = @_;
 
+   my $lock = cf::lock_acquire "map_data:" . $self->path;
+
    $self->{last_save} = $cf::RUNTIME;
 
    return unless $self->dirty;
@@ -1230,6 +1304,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);
@@ -1241,11 +1317,15 @@
 sub swap_out {
    my ($self) = @_;
 
+   # save first because save cedes
+   $self->save;
+
+   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->{deny_save};
 
-   $self->save;
    $self->clear;
    $self->in_memory (cf::MAP_SWAPPED);
 }
@@ -1293,6 +1373,8 @@
 sub reset {
    my ($self) = @_;
 
+   my $lock = cf::lock_acquire "map_data:" . $self->path;
+
    return if $self->players;
    return if $self->{path}{user_rel};#d#
 
@@ -1321,14 +1403,14 @@
    my ($map, $ob) = @_;
 
    if ($map->per_player) {
-      return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path};
+      return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
    }
 
    $map
 }
 
 sub emergency_save {
-   local $cf::FREEZE = 1;
+   my $freeze_guard = cf::freeze_mainloop;
 
    warn "enter emergency map save\n";
 
@@ -1410,13 +1492,14 @@
 sub cf::object::player::enter_link {
    my ($self) = @_;
 
+   $self->deactivate_recursive;
+
    return if $self->map == $LINK_MAP;
 
-   $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y]
+   $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
       if $self->map;
 
    $self->enter_map ($LINK_MAP, 20, 20);
-   $self->deactivate_recursive;
 }
 
 sub cf::object::player::leave_link {
@@ -1427,11 +1510,11 @@
    unless ($map) {
       # restore original map position
       ($map, $x, $y) = @{ $link_pos || [] };
-      $map = cf::map::find_map $map;
+      $map = cf::map::find $map;
 
       unless ($map) {
          ($map, $x, $y) = @$EMERGENCY_POSITION;
-         $map = cf::map::find_map $map
+         $map = cf::map::find $map
             or die "FATAL: cannot load emergency map\n";
       }
    }
@@ -1449,19 +1532,52 @@
    $self->enter_map ($map, $x, $y);
 }
 
-=item $player_object->goto_map ($path, $x, $y)
+cf::player->attach (
+   on_logout => sub {
+      my ($pl) = @_;
+
+      # abort map switching before logout
+      if ($pl->ob->{_link_pos}) {
+         cf::sync_job {
+            $pl->ob->leave_link
+         };
+      }
+   },
+   on_login => sub {
+      my ($pl) = @_;
+
+      # try to abort aborted map switching on player login :)
+      # should happen only on crashes
+      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);
+            Coro::Timer::sleep 1;
+            $pl->ob->leave_link;
+         })->prio (2);
+      }
+   },
+);
+
+=item $player_object->goto ($path, $x, $y)
 
 =cut
 
-sub cf::object::player::goto_map {
+sub cf::object::player::goto {
    my ($self, $path, $x, $y) = @_;
 
    $self->enter_link;
 
-   (Coro::async {
+   (async {
       $path = new cf::path $path;
 
-      my $map = cf::map::find_map $path->as_string;
+      my $map = cf::map::find $path->as_string;
       $map = $map->customise_for ($self) if $map;
 
 #      warn "entering ", $map->path, " at ($x, $y)\n"
@@ -1530,14 +1646,14 @@
 
    $self->enter_link;
 
-   (Coro::async {
+   (async {
+      $self->deactivate_recursive; # just to be sure
       unless (eval {
-
          prepare_random_map $exit
             if $exit->slaying eq "/!";
 
          my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
-         $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp);
+         $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
 
          1;
       }) {
@@ -1604,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);
 
@@ -1620,7 +1737,7 @@
    },
 );
 
-=item $client->coro (\&cb)
+=item $client->async (\&cb)
 
 Create a new coroutine, running the specified callback. The coroutine will
 be automatically cancelled when the client gets destroyed (e.g. on logout,
@@ -1628,15 +1745,10 @@
 
 =cut
 
-sub cf::client::coro {
+sub cf::client::async {
    my ($self, $cb) = @_;
 
-   my $coro; $coro = async {
-      eval {
-         $cb->();
-      };
-      warn $@ if $@;
-   };
+   my $coro = &Coro::async ($cb);
 
    $coro->on_destroy (sub {
       delete $self->{_coro}{$coro+0};
@@ -1818,14 +1930,12 @@
    my $path = cf::localdir . "/database.pst";
 
    sub db_load() {
-      warn "loading database $path\n";#d# remove later
       $DB = stat $path ? Storable::retrieve $path : { };
    }
 
    my $pid;
 
    sub db_save() {
-      warn "saving database $path\n";#d# remove later
       waitpid $pid, 0 if $pid;
       if (0 == ($pid = fork)) {
          $DB->{_meta}{version} = 1;
@@ -1883,15 +1993,26 @@
 
    local $/;
    *CFG = YAML::Syck::Load <$fh>;
+
+   $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
+
+   $cf::map::MAX_RESET     = $CFG{map_max_reset}     if exists $CFG{map_max_reset};
+   $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
+
+   if (exists $CFG{mlockall}) {
+      eval {
+         $CFG{mlockall} ? &mlockall : &munlockall
+            and die "WARNING: m(un)lockall failed: $!\n";
+      };
+      warn $@ if $@;
+   }
 }
 
 sub main {
    # we must not ever block the main coroutine
    local $Coro::idle = sub {
       Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
-      (Coro::unblock_sub {
-         Event::one_event;
-      })->();
+      async { Event::one_event };
    };
 
    cfg_load;
@@ -1912,7 +2033,7 @@
 
    warn "reloading...";
 
-   local $FREEZE = 1;
+   my $guard = freeze_mainloop;
    cf::emergency_save;
 
    eval {
@@ -2009,7 +2130,7 @@
 
    # dirty hack because... archetypes are not yet loaded
    Event->timer (
-      after => 2,
+      after => 10,
       cb    => sub {
          $_[0]->w->cancel;
 
@@ -2058,11 +2179,8 @@
    at        => $NEXT_TICK || $TICK,
    data      => WF_AUTOCANCEL,
    cb        => sub {
-      unless ($FREEZE) {
-         cf::server_tick; # one server iteration
-         $RUNTIME += $TICK;
-      }
-
+      cf::server_tick; # one server iteration
+      $RUNTIME   += $TICK;
       $NEXT_TICK += $TICK;
 
       # if we are delayed by four ticks or more, skip them all
@@ -2095,5 +2213,7 @@
    },
 );
 
+END { cf::emergency_save }
+
 1