--- deliantra/server/lib/cf.pm	2007/08/20 22:09:04	1.334
+++ deliantra/server/lib/cf.pm	2007/08/31 04:10:43	1.349
@@ -23,7 +23,7 @@
 use Coro::Storable;
 use Coro::Util ();
 
-use JSON::XS 1.4 ();
+use JSON::XS ();
 use BDB ();
 use Data::Dumper;
 use Digest::MD5;
@@ -274,6 +274,9 @@
 for example when the coroutine gets canceled), the lock is automatically
 returned.
 
+Locks are *not* recursive, locking from the same coro twice results in a
+deadlocked coro.
+
 Lock names should begin with a unique identifier (for example, cf::map::find
 uses map_find and cf::map::load uses map_load).
 
@@ -577,7 +580,7 @@
             join "\x00",
                $processversion,
                map {
-                  Coro::cede;
+                  cf::cede_to_tick;
                   ($src->[$_], Digest::MD5::md5_hex $data[$_])
                } 0.. $#$src;
            
@@ -1151,12 +1154,15 @@
                ? @$msg
                : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
 
-         if (my $cb = $EXTCMD{$type}) {
-            my @reply = $cb->($pl, @payload);
+         my @reply;
 
-            $pl->ext_reply ($reply, @reply)
-               if $reply;
+         if (my $cb = $EXTCMD{$type}) {
+            @reply = $cb->($pl, @payload);
          }
+
+         $pl->ext_reply ($reply, @reply)
+            if $reply;
+
       } else {
          warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
       }
@@ -1321,7 +1327,7 @@
    $pl->{last_save} = $cf::RUNTIME;
 
    $pl->save_pl ($path);
-   Coro::cede;
+   cf::cede_to_tick;
 }
 
 sub new($) {
@@ -1507,13 +1513,7 @@
 sub ext_reply($$@) {
    my ($self, $id, @msg) = @_;
 
-   if ($self->ns->extcmd == 2) {
-      $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
-   } elsif ($self->ns->extcmd == 1) {
-      #TODO: version 1, remove
-      unshift @msg, msgtype => "reply", msgid => $id;
-      $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
-   }
+   $self->ns->ext_reply ($id, @msg)
 }
 
 =item $player->ext_msg ($type, @msg)
@@ -1854,7 +1854,8 @@
    my $path = $self->{path};
 
    {
-      my $guard = cf::lock_acquire "map_load:$path";
+      my $guard1 = cf::lock_acquire "map_data:$path";
+      my $guard2 = cf::lock_acquire "map_load:$path";
 
       return if $self->in_memory != cf::MAP_SWAPPED;
 
@@ -1863,7 +1864,7 @@
       $self->alloc;
 
       $self->pre_load;
-      Coro::cede;
+      cf::cede_to_tick;
 
       $self->_load_objects ($self->{load_path}, 1)
          or return;
@@ -1879,20 +1880,20 @@
          }
       }
 
-      Coro::cede;
+      cf::cede_to_tick;
       # now do the right thing for maps
       $self->link_multipart_objects;
       $self->difficulty ($self->estimate_difficulty)
          unless $self->difficulty;
-      Coro::cede;
+      cf::cede_to_tick;
 
       unless ($self->{deny_activate}) {
          $self->decay_objects;
          $self->fix_auto_apply;
          $self->update_buttons;
-         Coro::cede;
+         cf::cede_to_tick;
          $self->set_darkness_map;
-         Coro::cede;
+         cf::cede_to_tick;
          $self->activate;
       }
 
@@ -1952,6 +1953,9 @@
 sub do_load_sync {
    my ($map) = @_;
 
+   cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
+      if $Coro::current == $Coro::main;
+
    cf::sync_job { $map->load };
 }
 
@@ -1959,23 +1963,24 @@
 our $MAP_PREFETCHER = undef;
 
 sub find_async {
-   my ($path, $origin) = @_;
+   my ($path, $origin, $load) = @_;
 
    $path = normalise $path, $origin && $origin->{path};
 
    if (my $map = $cf::MAP{$path}) {
-      return $map if $map->in_memory == cf::MAP_IN_MEMORY;
+      return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
    }
 
-   undef $MAP_PREFETCH{$path};
+   $MAP_PREFETCH{$path} |= $load;
+
    $MAP_PREFETCHER ||= cf::async {
       while (%MAP_PREFETCH) {
-         for my $path (keys %MAP_PREFETCH) {
-            if (my $map = find $path) {
-               $map->load;
+         while (my ($k, $v) = each %MAP_PREFETCH) {
+            if (my $map = find $k) {
+               $map->load if $v;
             }
 
-            delete $MAP_PREFETCH{$path};
+            delete $MAP_PREFETCH{$k};
          }
       }
       undef $MAP_PREFETCHER;
@@ -1988,7 +1993,7 @@
 sub save {
    my ($self) = @_;
 
-   my $lock = cf::lock_acquire "map_data:" . $self->path;
+   my $lock = cf::lock_acquire "map_data:$self->{path}";
 
    $self->{last_save} = $cf::RUNTIME;
 
@@ -2021,7 +2026,7 @@
    # save first because save cedes
    $self->save;
 
-   my $lock = cf::lock_acquire "map_data:" . $self->path;
+   my $lock = cf::lock_acquire "map_data:$self->{path}";
 
    return if $self->players;
    return if $self->in_memory != cf::MAP_IN_MEMORY;
@@ -2083,17 +2088,21 @@
 sub nuke {
    my ($self) = @_;
 
-   delete $cf::MAP{$self->path};
+   {
+      my $lock = cf::lock_acquire "map_data:$self->{path}";
 
-   $self->unlink_save;
+      delete $cf::MAP{$self->path};
 
-   bless $self, "cf::map";
-   delete $self->{deny_reset};
-   $self->{deny_save} = 1;
-   $self->reset_timeout (1);
-   $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
+      bless $self, "cf::map";
+      delete $self->{deny_reset};
+      $self->{deny_save} = 1;
+      $self->reset_timeout (1);
+      $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
 
-   $cf::MAP{$self->path} = $self;
+      $self->unlink_save;
+
+      $cf::MAP{$self->path} = $self;
+   }
 
    $self->reset; # polite request, might not happen
 }
@@ -2559,16 +2568,32 @@
 sub cf::client::ext_msg($$@) {
    my ($self, $type, @msg) = @_;
 
-   my $extcmd = $self->extcmd;
-
-   if ($extcmd == 2) {
+   if ($self->extcmd == 2) {
       $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
-   } elsif ($extcmd == 1) { # TODO: remove
+   } elsif ($self->extcmd == 1) { # TODO: remove
       push @msg, msgtype => "event_$type";
       $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
    }
 }
 
+=item $client->ext_reply ($msgid, @msg)
+
+Sends an ext reply to the client.
+
+=cut
+
+sub cf::client::ext_reply($$@) {
+   my ($self, $id, @msg) = @_;
+
+   if ($self->extcmd == 2) {
+      $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
+   } elsif ($self->extcmd == 1) {
+      #TODO: version 1, remove
+      unshift @msg, msgtype => "reply", msgid => $id;
+      $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
+   }
+}
+
 =item $success = $client->query ($flags, "text", \&cb)
 
 Queues a query to the client, calling the given callback with
@@ -2636,12 +2661,15 @@
                ? @$msg
                : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
 
-         if (my $cb = $EXTICMD{$type}) {
-            my @reply = $cb->($ns, @payload);
+         my @reply;
 
-            $ns->ext_reply ($reply, @reply)
-               if $reply;
+         if (my $cb = $EXTICMD{$type}) {
+            @reply = $cb->($ns, @payload);
          }
+
+         $ns->ext_reply ($reply, @reply)
+            if $reply;
+
       } else {
          warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
       }
@@ -2712,7 +2740,7 @@
 
   cf::object
      contr pay_amount pay_player map x y force_find force_add
-     insert remove name archname title slaying race
+     insert remove name archname title slaying race decrease_ob_nr
 
   cf::object::player
      player
@@ -2727,7 +2755,8 @@
 
 for (
    ["cf::object"         => qw(contr pay_amount pay_player map force_find force_add x y
-                               insert remove inv name archname title slaying race)],
+                               insert remove inv name archname title slaying race
+                               decrease_ob_nr)],
    ["cf::object::player" => qw(player)],
    ["cf::player"         => qw(peaceful)],
    ["cf::map"            => qw(trigger)],
@@ -2813,7 +2842,11 @@
 sub load_facedata($) {
    my ($path) = @_;
 
-   my $enc = JSON::XS->new->utf8->canonical;
+   # HACK to clear player env face cache, we need some signal framework
+   # for this (global event?)
+   %ext::player_env::MUSIC_FACE_CACHE = ();
+
+   my $enc = JSON::XS->new->utf8->canonical->relaxed;
 
    warn "loading facedata from $path\n";
 
@@ -2827,10 +2860,9 @@
       or cf::cleanup "$path: version mismatch, cannot proceed.";
 
    # patch in the exptable
-   cf::cede_to_tick;
    $facedata->{resource}{"res/exp_table"} = {
       type => FT_RSRC,
-      data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]),
+      data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
    };
    cf::cede_to_tick;
 
@@ -2893,6 +2925,8 @@
             });
 
             $data = pack "(w/a*)*", $meta, $info->{data};
+         } else {
+            $data = $info->{data};
          }
 
          cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
@@ -2932,6 +2966,10 @@
 };
 
 sub reload_regions {
+   # HACK to clear player env face cache, we need some signal framework
+   # for this (global event?)
+   %ext::player_env::MUSIC_FACE_CACHE = ();
+
    load_resource_file "$MAPDIR/regions"
       or die "unable to load regions file\n";
 
@@ -2977,7 +3015,7 @@
    reload_resources;
 }
 
-sub cfg_load {
+sub reload_config {
    open my $fh, "<:utf8", "$CONFDIR/config"
       or return;
 
@@ -3007,7 +3045,7 @@
       })->prio (Coro::PRIO_MAX);
    };
 
-   cfg_load;
+   reload_config;
    db_init;
    load_extensions;
 
@@ -3210,7 +3248,7 @@
       cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
 
       warn "loading config and database again";
-      cf::cfg_load;
+      cf::reload_config;
 
       warn "loading extensions";
       cf::load_extensions;