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.374 by root, Wed Sep 19 22:07:16 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;
… …
3175sub main { 3185sub main {
3176 # we must not ever block the main coroutine 3186 # we must not ever block the main coroutine
3177 local $Coro::idle = sub { 3187 local $Coro::idle = sub {
3178 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3188 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3179 (async { 3189 (async {
3190 $Coro::current->{desc} = "IDLE BUG HANDLER";
3180 Event::one_event; 3191 Event::one_event;
3181 })->prio (Coro::PRIO_MAX); 3192 })->prio (Coro::PRIO_MAX);
3182 }; 3193 };
3183 3194
3184 reload_config; 3195 reload_config;
… …
3428register_command "reload" => sub { 3439register_command "reload" => sub {
3429 my ($who, $arg) = @_; 3440 my ($who, $arg) = @_;
3430 3441
3431 if ($who->flag (FLAG_WIZ)) { 3442 if ($who->flag (FLAG_WIZ)) {
3432 $who->message ("reloading server."); 3443 $who->message ("reloading server.");
3444 async {
3445 $Coro::current->{desc} = "perl_reload";
3433 async { reload_perl }; 3446 reload_perl;
3447 };
3434 } 3448 }
3435}; 3449};
3436 3450
3437unshift @INC, $LIBDIR; 3451unshift @INC, $LIBDIR;
3438 3452
… …
3480 $NEXT_TICK += $TICK; 3494 $NEXT_TICK += $TICK;
3481 3495
3482 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3496 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3483 $NEXT_RUNTIME_WRITE = $NOW + 10; 3497 $NEXT_RUNTIME_WRITE = $NOW + 10;
3484 Coro::async_pool { 3498 Coro::async_pool {
3499 $Coro::current->{desc} = "runtime saver";
3485 write_runtime 3500 write_runtime
3486 or warn "ERROR: unable to write runtime file: $!"; 3501 or warn "ERROR: unable to write runtime file: $!";
3487 }; 3502 };
3488 } 3503 }
3489 3504
… …
3615 3630
3616 # limit the # of concurrent backtraces 3631 # limit the # of concurrent backtraces
3617 if ($_log_backtrace < 2) { 3632 if ($_log_backtrace < 2) {
3618 ++$_log_backtrace; 3633 ++$_log_backtrace;
3619 async { 3634 async {
3635 $Coro::current->{desc} = "abt $msg";
3636
3620 my @bt = fork_call { 3637 my @bt = fork_call {
3621 @addr = map { sprintf "%x", $_ } @addr; 3638 @addr = map { sprintf "%x", $_ } @addr;
3622 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3639 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3623 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3640 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3624 or die "addr2line: $!"; 3641 or die "addr2line: $!";

Diff Legend

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