--- deliantra/server/lib/cf.pm	2007/08/26 15:31:02	1.342
+++ deliantra/server/lib/cf.pm	2007/08/30 05:16:09	1.347
@@ -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;
            
@@ -1324,7 +1327,7 @@
    $pl->{last_save} = $cf::RUNTIME;
 
    $pl->save_pl ($path);
-   Coro::cede;
+   cf::cede_to_tick;
 }
 
 sub new($) {
@@ -1851,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;
 
@@ -1860,7 +1864,7 @@
       $self->alloc;
 
       $self->pre_load;
-      Coro::cede;
+      cf::cede_to_tick;
 
       $self->_load_objects ($self->{load_path}, 1)
          or return;
@@ -1876,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;
       }
 
@@ -1989,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;
 
@@ -2022,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;
@@ -2560,11 +2564,9 @@
 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}));
    }
@@ -2581,7 +2583,7 @@
 
    if ($self->extcmd == 2) {
       $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
-   } elsif ($self->ns->extcmd == 1) {
+   } elsif ($self->extcmd == 1) {
       #TODO: version 1, remove
       unshift @msg, msgtype => "reply", msgid => $id;
       $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
@@ -2836,7 +2838,7 @@
 sub load_facedata($) {
    my ($path) = @_;
 
-   my $enc = JSON::XS->new->utf8->canonical;
+   my $enc = JSON::XS->new->utf8->canonical->relaxed;
 
    warn "loading facedata from $path\n";
 
@@ -3001,7 +3003,7 @@
    reload_resources;
 }
 
-sub cfg_load {
+sub reload_config {
    open my $fh, "<:utf8", "$CONFDIR/config"
       or return;
 
@@ -3031,7 +3033,7 @@
       })->prio (Coro::PRIO_MAX);
    };
 
-   cfg_load;
+   reload_config;
    db_init;
    load_extensions;
 
@@ -3234,7 +3236,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;