--- deliantra/server/lib/cf.pm	2007/09/15 13:25:33	1.372
+++ deliantra/server/lib/cf.pm	2007/10/01 00:44:44	1.376
@@ -356,6 +356,8 @@
 
 $SLOT_QUEUE->cancel if $SLOT_QUEUE;
 $SLOT_QUEUE = Coro::async {
+   $Coro::current->desc ("timeslot manager");
+
    my $signal = new Coro::Signal;
 
    while () {
@@ -435,6 +437,7 @@
       my @res;
 
       (async {
+         $Coro::current->desc ("sync job coro");
          @res = eval { $job->() };
          warn $@ if $@;
          undef $busy;
@@ -1028,8 +1031,6 @@
 sub object_freezer_save {
    my ($filename, $rdata, $objs) = @_;
 
-   my $guard = cf::lock_acquire "io";
-
    sync_job {
       if (length $$rdata) {
          utf8::decode (my $decname = $filename);
@@ -1064,8 +1065,6 @@
          aio_unlink "$filename.pst";
       }
    };
-
-   undef $guard;
 }
 
 sub object_freezer_as_string {
@@ -1081,8 +1080,6 @@
 
    my ($data, $av);
 
-   my $guard = cf::lock_acquire "io";
-
    (aio_load $filename, $data) >= 0
       or return;
 
@@ -1090,7 +1087,6 @@
       (aio_load "$filename.pst", $av) >= 0
          or return;
 
-      undef $guard;
       $av = eval { (Storable::thaw $av)->{objs} };
    }
 
@@ -2045,6 +2041,8 @@
    $MAP_PREFETCH{$path} |= $load;
 
    $MAP_PREFETCHER ||= cf::async {
+      $Coro::current->{desc} = "map prefetcher";
+
       while (%MAP_PREFETCH) {
          while (my ($k, $v) = each %MAP_PREFETCH) {
             if (my $map = find $k) {
@@ -2080,6 +2078,7 @@
    local $self->{last_access} = $self->last_access;#d#
 
    cf::async {
+      $Coro::current->{desc} = "map player save";
       $_->contr->save for $self->players;
    };
 
@@ -2460,6 +2459,8 @@
    $self->enter_link;
 
    (async {
+      $Coro::current->{desc} = "player::goto $path $x $y";
+
       # *tag paths override both path and x|y
       if ($path =~ /^\*(.*)$/) {
          if (my @obs = grep $_->map, ext::map_tags::find $1) {
@@ -2586,6 +2587,8 @@
       if $exit->flag (FLAG_DAMNED);
 
    (async {
+      $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
+
       $self->deactivate_recursive; # just to be sure
       unless (eval {
          $self->goto ($slaying, $hp, $sp);
@@ -2632,17 +2635,23 @@
 
 our %CHANNEL = (
    "c/identify" => {
-      id      => "identify",
+      id      => "infobox",
       title   => "Identify",
       reply   => undef,
       tooltip => "Items recently identified",
    },
    "c/examine" => {
-      id      => "examine",
+      id      => "infobox",
       title   => "Examine",
       reply   => undef,
       tooltip => "Signs and other items you examined",
    },
+   "c/lookat" => {
+      id      => "infobox",
+      title   => "Look",
+      reply   => undef,
+      tooltip => "What you saw there",
+   },
 );
 
 sub cf::client::send_msg {
@@ -2653,9 +2662,15 @@
    $color &= cf::NDI_CLIENT_MASK; # just in case...
 
    # check predefined channels, for the benefit of C
-   $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
+   if ($CHANNEL{$channel}) {
+      $channel = $CHANNEL{$channel};
+
+      $self->ext_msg (channel_info => $channel)
+         if $self->can_msg;
+
+      $channel = $channel->{id};
 
-   if (ref $channel) {
+   } elsif (ref $channel) {
       # send meta info to client, if not yet sent
       unless (exists $self->{channel}{$channel->{id}}) {
          $self->{channel}{$channel->{id}} = $channel;
@@ -3184,6 +3199,7 @@
    local $Coro::idle = sub {
       Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
       (async {
+         $Coro::current->{desc} = "IDLE BUG HANDLER";
          Event::one_event;
       })->prio (Coro::PRIO_MAX);
    };
@@ -3437,7 +3453,10 @@
 
    if ($who->flag (FLAG_WIZ)) {
       $who->message ("reloading server.");
-      async { reload_perl };
+      async {
+         $Coro::current->{desc} = "perl_reload";
+         reload_perl;
+      };
    }
 };
 
@@ -3489,6 +3508,7 @@
       if ($NOW >= $NEXT_RUNTIME_WRITE) {
          $NEXT_RUNTIME_WRITE = $NOW + 10;
          Coro::async_pool {
+            $Coro::current->{desc} = "runtime saver";
             write_runtime
                or warn "ERROR: unable to write runtime file: $!";
          };
@@ -3608,7 +3628,7 @@
       data      => WF_AUTOCANCEL,
       fd        => IO::AIO::poll_fileno,
       poll      => 'r',
-      prio      => 6,
+      prio      => 0,
       cb        => \&IO::AIO::poll_cb,
    );
 }
@@ -3624,6 +3644,8 @@
    if ($_log_backtrace < 2) {
       ++$_log_backtrace;
       async {
+         $Coro::current->{desc} = "abt $msg";
+
          my @bt = fork_call {
             @addr = map { sprintf "%x", $_ } @addr;
             my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;