[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.341 by elmex, Sat Aug 25 16:51:38 2007 UTC vs.
Revision 1.353 by root, Sun Sep 2 08:43:46 2007 UTC

 use Coro::Semaphore;
 use Coro::AIO;
 use Coro::Storable;
 use Coro::Util ();
-use JSON::XS 1.4 ();
+use JSON::XS ();
 use BDB ();
 use Data::Dumper;
 use Digest::MD5;
 use Fcntl;
 use YAML::Syck ();
 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.
+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).
 =item $locked = cf::lock_active $string
       if (1) {
          $md5 =
             join "\x00",
                $processversion,
                map {
-                  Coro::cede;
+                  cf::cede_to_tick;
                   ($src->[$_], Digest::MD5::md5_hex $data[$_])
                } 0.. $#$src;
          my $dbmd5 = db_get cache => "$id/md5";
    aio_mkdir playerdir $pl, 0770;
    $pl->{last_save} = $cf::RUNTIME;
    $pl->save_pl ($path);
-   Coro::cede;
+   cf::cede_to_tick;
 }
 sub new($) {
    my ($login) = @_;
 sub expand_cfpod {
    ((my $self), (local $_)) = @_;
    # escape & and <
    s/&/&amp;/g;
-   s/(?<![BIUGH])</&lt;/g;
+   s/(?<![BIUGHT])</&lt;/g;
    # this is buggy, it needs to properly take care of nested <'s
    1 while
       # replace B<>, I<>, U<> etc.
       s/B<([^\>]*)>/<b>$1<\/b>/
       || s/I<([^\>]*)>/<i>$1<\/i>/
       || s/U<([^\>]*)>/<u>$1<\/u>/
+      || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
       # replace G<male|female> tags
       || s{G<([^>|]*)\|([^>]*)>}{
          $self->gender ? $2 : $1
       }ge
       # replace H<hint text>
    local $self->{deny_reset} = 1; # loading can take a long time
    my $path = $self->{path};
    {
+      my $guard1 = cf::lock_acquire "map_data:$path";
-      my $guard = cf::lock_acquire "map_load:$path";
+      my $guard2 = cf::lock_acquire "map_load:$path";
       return if $self->in_memory != cf::MAP_SWAPPED;
       $self->in_memory (cf::MAP_LOADING);
       $self->alloc;
       $self->pre_load;
-      Coro::cede;
+      cf::cede_to_tick;
       $self->_load_objects ($self->{load_path}, 1)
          or return;
       $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
             $self->clear_unique_items;
             $self->_load_objects ($uniq, 0);
          }
       }
-      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;
       }
       $self->{last_save} = $cf::RUNTIME;
       $self->last_access ($cf::RUNTIME);
 sub do_load_sync {
    my ($map) = @_;
    cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
-      if $Coro::current != $Coro::main;
+      if $Coro::current == $Coro::main;
    cf::sync_job { $map->load };
 }
 our %MAP_PREFETCH;
 }
 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;
    return unless $self->dirty;
    my ($self) = @_;
    # 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;
    return if $self->{deny_save};
 my $nuke_counter = "aaaa";
 sub nuke {
    my ($self) = @_;
+   {
+      my $lock = cf::lock_acquire "map_data:$self->{path}";
-   delete $cf::MAP{$self->path};
+      delete $cf::MAP{$self->path};
-   $self->unlink_save;
+      $self->unlink_save;
-   bless $self, "cf::map";
+      bless $self, "cf::map";
-   delete $self->{deny_reset};
+      delete $self->{deny_reset};
-   $self->{deny_save} = 1;
+      $self->{deny_save} = 1;
-   $self->reset_timeout (1);
+      $self->reset_timeout (1);
-   $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
+      $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
-   $cf::MAP{$self->path} = $self;
+      $cf::MAP{$self->path} = $self;
+   }
    $self->reset; # polite request, might not happen
 }
 =item $maps = cf::map::tmp_maps
 the message, with C<log> being the default. If C<$color> is negative, suppress
 the message unless the client supports the msg packet.
 =cut
+our %CHANNEL = (
+   "c/identify" => {
+      id      => "identify",
+      title   => "Identify",
+      reply   => undef,
+      tooltip => "Items recently identified",
+   },
+   "c/examine" => {
+      id      => "examine",
+      title   => "Examine",
+      reply   => undef,
+      tooltip => "Signs and other items you examined",
+   },
+);
 sub cf::client::send_msg {
    my ($self, $channel, $msg, $color, @extra) = @_;
    $msg = $self->pl->expand_cfpod ($msg);
    $color &= cf::NDI_CLIENT_MASK; # just in case...
+   # check predefined channels, for the benefit of C
+   $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
    if (ref $channel) {
       # send meta info to client, if not yet sent
       unless (exists $self->{channel}{$channel->{id}}) {
          $self->{channel}{$channel->{id}} = $channel;
-         $self->ext_msg (channel_info => $channel);
+         $self->ext_msg (channel_info => $channel)
+            if $self->can_msg;
       }
       $channel = $channel->{id};
    }
 =cut
 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}));
    }
 }
 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->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}));
    }
 }
 # the server's init and main functions
 sub load_facedata($) {
    my ($path) = @_;
+   # 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;
+   my $enc = JSON::XS->new->utf8->canonical->relaxed;
    warn "loading facedata from $path\n";
    my $facedata;
    0 < aio_load $path, $facedata
       $ns->fx_want ($k, $v);
    }
 };
 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";
    for (cf::region::list) {
       $_->{match} = qr/$_->{match}/
 sub init {
    reload_resources;
 }
-sub cfg_load {
+sub reload_config {
    open my $fh, "<:utf8", "$CONFDIR/config"
       or return;
    local $/;
    *CFG = YAML::Syck::Load <$fh>;
       (async {
          Event::one_event;
       })->prio (Coro::PRIO_MAX);
    };
-   cfg_load;
+   reload_config;
    db_init;
    load_extensions;
    $TICK_WATCHER->start;
    Event::loop;
       warn "reloading cf.pm";
       require cf;
       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;
       warn "reattaching attachments to objects/players";

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.341 by elmex, Sat Aug 25 16:51:38 2007 UTC vs. Revision 1.353 by root, Sun Sep 2 08:43:46 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.341 by elmex, Sat Aug 25 16:51:38 2007 UTC vs.
Revision 1.353 by root, Sun Sep 2 08:43:46 2007 UTC