ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.373 by root, Sat Sep 15 15:58:06 2007 UTC vs.
Revision 1.375 by root, Sun Sep 30 20:22:21 2007 UTC

… …
354our @SLOT_QUEUE; 354our @SLOT_QUEUE;
355our $SLOT_QUEUE; 355our $SLOT_QUEUE;
356 356
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
359 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
360 362
361 while () { 363 while () {
362 next_job: 364 next_job:
363 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
… …
433 435
434 my $busy = 1; 436 my $busy = 1;
435 my @res; 437 my @res;
436 438
437 (async { 439 (async {
440 $Coro::current->desc ("sync job coro");
438 @res = eval { $job->() }; 441 @res = eval { $job->() };
439 warn $@ if $@; 442 warn $@ if $@;
440 undef $busy; 443 undef $busy;
441 })->prio (Coro::PRIO_MAX); 444 })->prio (Coro::PRIO_MAX);
442 445
… …
2036 } 2039 }
2037 2040
2038 $MAP_PREFETCH{$path} |= $load; 2041 $MAP_PREFETCH{$path} |= $load;
2039 2042
2040 $MAP_PREFETCHER ||= cf::async { 2043 $MAP_PREFETCHER ||= cf::async {
2044 $Coro::current->{desc} = "map prefetcher";
2045
2041 while (%MAP_PREFETCH) { 2046 while (%MAP_PREFETCH) {
2042 while (my ($k, $v) = each %MAP_PREFETCH) { 2047 while (my ($k, $v) = each %MAP_PREFETCH) {
2043 if (my $map = find $k) { 2048 if (my $map = find $k) {
2044 $map->load if $v; 2049 $map->load if $v;
2045 } 2050 }
… …
2071 return if $self->{deny_save}; 2076 return if $self->{deny_save};
2072 2077
2073 local $self->{last_access} = $self->last_access;#d# 2078 local $self->{last_access} = $self->last_access;#d#
2074 2079
2075 cf::async { 2080 cf::async {
2081 $Coro::current->{desc} = "map player save";
2076 $_->contr->save for $self->players; 2082 $_->contr->save for $self->players;
2077 }; 2083 };
2078 2084
2079 if ($uniq) { 2085 if ($uniq) {
2080 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2451 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2457 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2452 2458
2453 $self->enter_link; 2459 $self->enter_link;
2454 2460
2455 (async { 2461 (async {
2462 $Coro::current->{desc} = "player::goto $path $x $y";
2463
2456 # *tag paths override both path and x|y 2464 # *tag paths override both path and x|y
2457 if ($path =~ /^\*(.*)$/) { 2465 if ($path =~ /^\*(.*)$/) {
2458 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2466 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2459 my $ob = $obs[rand @obs]; 2467 my $ob = $obs[rand @obs];
2460 2468
… …
2577 # if exit is damned, update players death & WoR home-position 2585 # if exit is damned, update players death & WoR home-position
2578 $self->contr->savebed ($slaying, $hp, $sp) 2586 $self->contr->savebed ($slaying, $hp, $sp)
2579 if $exit->flag (FLAG_DAMNED); 2587 if $exit->flag (FLAG_DAMNED);
2580 2588
2581 (async { 2589 (async {
2590 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2591
2582 $self->deactivate_recursive; # just to be sure 2592 $self->deactivate_recursive; # just to be sure
2583 unless (eval { 2593 unless (eval {
2584 $self->goto ($slaying, $hp, $sp); 2594 $self->goto ($slaying, $hp, $sp);
2585 2595
2586 1; 2596 1;
… …
2623 2633
2624=cut 2634=cut
2625 2635
2626our %CHANNEL = ( 2636our %CHANNEL = (
2627 "c/identify" => { 2637 "c/identify" => {
2628 id => "identify", 2638 id => "infobox",
2629 title => "Identify", 2639 title => "Identify",
2630 reply => undef, 2640 reply => undef,
2631 tooltip => "Items recently identified", 2641 tooltip => "Items recently identified",
2632 }, 2642 },
2633 "c/examine" => { 2643 "c/examine" => {
2634 id => "examine", 2644 id => "infobox",
2635 title => "Examine", 2645 title => "Examine",
2636 reply => undef, 2646 reply => undef,
2637 tooltip => "Signs and other items you examined", 2647 tooltip => "Signs and other items you examined",
2638 }, 2648 },
2649 "c/lookat" => {
2650 id => "infobox",
2651 title => "Look",
2652 reply => undef,
2653 tooltip => "What you saw there",
2654 },
2639); 2655);
2640 2656
2641sub cf::client::send_msg { 2657sub cf::client::send_msg {
2642 my ($self, $channel, $msg, $color, @extra) = @_; 2658 my ($self, $channel, $msg, $color, @extra) = @_;
2643 2659
2644 $msg = $self->pl->expand_cfpod ($msg); 2660 $msg = $self->pl->expand_cfpod ($msg);
2645 2661
2646 $color &= cf::NDI_CLIENT_MASK; # just in case... 2662 $color &= cf::NDI_CLIENT_MASK; # just in case...
2647 2663
2648 # check predefined channels, for the benefit of C 2664 # check predefined channels, for the benefit of C
2649 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2665 if ($CHANNEL{$channel}) {
2666 $channel = $CHANNEL{$channel};
2650 2667
2668 $self->ext_msg (channel_info => $channel)
2669 if $self->can_msg;
2670
2671 $channel = $channel->{id};
2672
2651 if (ref $channel) { 2673 } elsif (ref $channel) {
2652 # send meta info to client, if not yet sent 2674 # send meta info to client, if not yet sent
2653 unless (exists $self->{channel}{$channel->{id}}) { 2675 unless (exists $self->{channel}{$channel->{id}}) {
2654 $self->{channel}{$channel->{id}} = $channel; 2676 $self->{channel}{$channel->{id}} = $channel;
2655 $self->ext_msg (channel_info => $channel) 2677 $self->ext_msg (channel_info => $channel)
2656 if $self->can_msg; 2678 if $self->can_msg;
… …
3175sub main { 3197sub main {
3176 # we must not ever block the main coroutine 3198 # we must not ever block the main coroutine
3177 local $Coro::idle = sub { 3199 local $Coro::idle = sub {
3178 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3200 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3179 (async { 3201 (async {
3202 $Coro::current->{desc} = "IDLE BUG HANDLER";
3180 Event::one_event; 3203 Event::one_event;
3181 })->prio (Coro::PRIO_MAX); 3204 })->prio (Coro::PRIO_MAX);
3182 }; 3205 };
3183 3206
3184 reload_config; 3207 reload_config;
… …
3428register_command "reload" => sub { 3451register_command "reload" => sub {
3429 my ($who, $arg) = @_; 3452 my ($who, $arg) = @_;
3430 3453
3431 if ($who->flag (FLAG_WIZ)) { 3454 if ($who->flag (FLAG_WIZ)) {
3432 $who->message ("reloading server."); 3455 $who->message ("reloading server.");
3456 async {
3457 $Coro::current->{desc} = "perl_reload";
3433 async { reload_perl }; 3458 reload_perl;
3459 };
3434 } 3460 }
3435}; 3461};
3436 3462
3437unshift @INC, $LIBDIR; 3463unshift @INC, $LIBDIR;
3438 3464
… …
3480 $NEXT_TICK += $TICK; 3506 $NEXT_TICK += $TICK;
3481 3507
3482 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3508 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3483 $NEXT_RUNTIME_WRITE = $NOW + 10; 3509 $NEXT_RUNTIME_WRITE = $NOW + 10;
3484 Coro::async_pool { 3510 Coro::async_pool {
3511 $Coro::current->{desc} = "runtime saver";
3485 write_runtime 3512 write_runtime
3486 or warn "ERROR: unable to write runtime file: $!"; 3513 or warn "ERROR: unable to write runtime file: $!";
3487 }; 3514 };
3488 } 3515 }
3489 3516
… …
3615 3642
3616 # limit the # of concurrent backtraces 3643 # limit the # of concurrent backtraces
3617 if ($_log_backtrace < 2) { 3644 if ($_log_backtrace < 2) {
3618 ++$_log_backtrace; 3645 ++$_log_backtrace;
3619 async { 3646 async {
3647 $Coro::current->{desc} = "abt $msg";
3648
3620 my @bt = fork_call { 3649 my @bt = fork_call {
3621 @addr = map { sprintf "%x", $_ } @addr; 3650 @addr = map { sprintf "%x", $_ } @addr;
3622 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3651 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3623 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3652 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3624 or die "addr2line: $!"; 3653 or die "addr2line: $!";

Diff Legend

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