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.372 by root, Sat Sep 15 13:25:33 2007 UTC vs.
Revision 1.378 by root, Thu Oct 4 11:36:54 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
… …
1025 }, 1028 },
1026); 1029);
1027 1030
1028sub object_freezer_save { 1031sub object_freezer_save {
1029 my ($filename, $rdata, $objs) = @_; 1032 my ($filename, $rdata, $objs) = @_;
1030
1031 my $guard = cf::lock_acquire "io";
1032 1033
1033 sync_job { 1034 sync_job {
1034 if (length $$rdata) { 1035 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename); 1036 utf8::decode (my $decname = $filename);
1036 warn sprintf "saving %s (%d,%d)\n", 1037 warn sprintf "saving %s (%d,%d)\n",
… …
1062 } else { 1063 } else {
1063 aio_unlink $filename; 1064 aio_unlink $filename;
1064 aio_unlink "$filename.pst"; 1065 aio_unlink "$filename.pst";
1065 } 1066 }
1066 }; 1067 };
1067
1068 undef $guard;
1069} 1068}
1070 1069
1071sub object_freezer_as_string { 1070sub object_freezer_as_string {
1072 my ($rdata, $objs) = @_; 1071 my ($rdata, $objs) = @_;
1073 1072
… …
1078 1077
1079sub object_thawer_load { 1078sub object_thawer_load {
1080 my ($filename) = @_; 1079 my ($filename) = @_;
1081 1080
1082 my ($data, $av); 1081 my ($data, $av);
1083
1084 my $guard = cf::lock_acquire "io";
1085 1082
1086 (aio_load $filename, $data) >= 0 1083 (aio_load $filename, $data) >= 0
1087 or return; 1084 or return;
1088 1085
1089 unless (aio_stat "$filename.pst") { 1086 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1087 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1088 or return;
1092 1089
1093 undef $guard;
1094 $av = eval { (Storable::thaw $av)->{objs} }; 1090 $av = eval { (Storable::thaw $av)->{objs} };
1095 } 1091 }
1096 1092
1097 utf8::decode (my $decname = $filename); 1093 utf8::decode (my $decname = $filename);
1098 warn sprintf "loading %s (%d,%d)\n", 1094 warn sprintf "loading %s (%d,%d)\n",
… …
2043 } 2039 }
2044 2040
2045 $MAP_PREFETCH{$path} |= $load; 2041 $MAP_PREFETCH{$path} |= $load;
2046 2042
2047 $MAP_PREFETCHER ||= cf::async { 2043 $MAP_PREFETCHER ||= cf::async {
2044 $Coro::current->{desc} = "map prefetcher";
2045
2048 while (%MAP_PREFETCH) { 2046 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2047 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2048 if (my $map = find $k) {
2051 $map->load if $v; 2049 $map->load if $v;
2052 } 2050 }
… …
2078 return if $self->{deny_save}; 2076 return if $self->{deny_save};
2079 2077
2080 local $self->{last_access} = $self->last_access;#d# 2078 local $self->{last_access} = $self->last_access;#d#
2081 2079
2082 cf::async { 2080 cf::async {
2081 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2082 $_->contr->save for $self->players;
2084 }; 2083 };
2085 2084
2086 if ($uniq) { 2085 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2274=cut 2273=cut
2275 2274
2276sub deref { 2275sub deref {
2277 my ($ref) = @_; 2276 my ($ref) = @_;
2278 2277
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2278 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2279 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2280 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2281 or return;
2286 $pl->ob->uuid eq $uuid 2282 $pl->ob->uuid eq $uuid
2287 or return; 2283 or return;
… …
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2454 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2455
2460 $self->enter_link; 2456 $self->enter_link;
2461 2457
2462 (async { 2458 (async {
2459 $Coro::current->{desc} = "player::goto $path $x $y";
2460
2463 # *tag paths override both path and x|y 2461 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2462 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2463 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2464 my $ob = $obs[rand @obs];
2467 2465
… …
2584 # if exit is damned, update players death & WoR home-position 2582 # if exit is damned, update players death & WoR home-position
2585 $self->contr->savebed ($slaying, $hp, $sp) 2583 $self->contr->savebed ($slaying, $hp, $sp)
2586 if $exit->flag (FLAG_DAMNED); 2584 if $exit->flag (FLAG_DAMNED);
2587 2585
2588 (async { 2586 (async {
2587 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2588
2589 $self->deactivate_recursive; # just to be sure 2589 $self->deactivate_recursive; # just to be sure
2590 unless (eval { 2590 unless (eval {
2591 $self->goto ($slaying, $hp, $sp); 2591 $self->goto ($slaying, $hp, $sp);
2592 2592
2593 1; 2593 1;
… …
2630 2630
2631=cut 2631=cut
2632 2632
2633our %CHANNEL = ( 2633our %CHANNEL = (
2634 "c/identify" => { 2634 "c/identify" => {
2635 id => "identify", 2635 id => "infobox",
2636 title => "Identify", 2636 title => "Identify",
2637 reply => undef, 2637 reply => undef,
2638 tooltip => "Items recently identified", 2638 tooltip => "Items recently identified",
2639 }, 2639 },
2640 "c/examine" => { 2640 "c/examine" => {
2641 id => "examine", 2641 id => "infobox",
2642 title => "Examine", 2642 title => "Examine",
2643 reply => undef, 2643 reply => undef,
2644 tooltip => "Signs and other items you examined", 2644 tooltip => "Signs and other items you examined",
2645 }, 2645 },
2646 "c/lookat" => {
2647 id => "infobox",
2648 title => "Look",
2649 reply => undef,
2650 tooltip => "What you saw there",
2651 },
2646); 2652);
2647 2653
2648sub cf::client::send_msg { 2654sub cf::client::send_msg {
2649 my ($self, $channel, $msg, $color, @extra) = @_; 2655 my ($self, $channel, $msg, $color, @extra) = @_;
2650 2656
2651 $msg = $self->pl->expand_cfpod ($msg); 2657 $msg = $self->pl->expand_cfpod ($msg);
2652 2658
2653 $color &= cf::NDI_CLIENT_MASK; # just in case... 2659 $color &= cf::NDI_CLIENT_MASK; # just in case...
2654 2660
2655 # check predefined channels, for the benefit of C 2661 # check predefined channels, for the benefit of C
2656 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2662 if ($CHANNEL{$channel}) {
2663 $channel = $CHANNEL{$channel};
2657 2664
2665 $self->ext_msg (channel_info => $channel)
2666 if $self->can_msg;
2667
2668 $channel = $channel->{id};
2669
2658 if (ref $channel) { 2670 } elsif (ref $channel) {
2659 # send meta info to client, if not yet sent 2671 # send meta info to client, if not yet sent
2660 unless (exists $self->{channel}{$channel->{id}}) { 2672 unless (exists $self->{channel}{$channel->{id}}) {
2661 $self->{channel}{$channel->{id}} = $channel; 2673 $self->{channel}{$channel->{id}} = $channel;
2662 $self->ext_msg (channel_info => $channel) 2674 $self->ext_msg (channel_info => $channel)
2663 if $self->can_msg; 2675 if $self->can_msg;
… …
3182sub main { 3194sub main {
3183 # we must not ever block the main coroutine 3195 # we must not ever block the main coroutine
3184 local $Coro::idle = sub { 3196 local $Coro::idle = sub {
3185 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3197 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3186 (async { 3198 (async {
3199 $Coro::current->{desc} = "IDLE BUG HANDLER";
3187 Event::one_event; 3200 Event::one_event;
3188 })->prio (Coro::PRIO_MAX); 3201 })->prio (Coro::PRIO_MAX);
3189 }; 3202 };
3190 3203
3191 reload_config; 3204 reload_config;
… …
3435register_command "reload" => sub { 3448register_command "reload" => sub {
3436 my ($who, $arg) = @_; 3449 my ($who, $arg) = @_;
3437 3450
3438 if ($who->flag (FLAG_WIZ)) { 3451 if ($who->flag (FLAG_WIZ)) {
3439 $who->message ("reloading server."); 3452 $who->message ("reloading server.");
3453 async {
3454 $Coro::current->{desc} = "perl_reload";
3440 async { reload_perl }; 3455 reload_perl;
3456 };
3441 } 3457 }
3442}; 3458};
3443 3459
3444unshift @INC, $LIBDIR; 3460unshift @INC, $LIBDIR;
3445 3461
… …
3487 $NEXT_TICK += $TICK; 3503 $NEXT_TICK += $TICK;
3488 3504
3489 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3505 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3490 $NEXT_RUNTIME_WRITE = $NOW + 10; 3506 $NEXT_RUNTIME_WRITE = $NOW + 10;
3491 Coro::async_pool { 3507 Coro::async_pool {
3508 $Coro::current->{desc} = "runtime saver";
3492 write_runtime 3509 write_runtime
3493 or warn "ERROR: unable to write runtime file: $!"; 3510 or warn "ERROR: unable to write runtime file: $!";
3494 }; 3511 };
3495 } 3512 }
3496 3513
… …
3606 $AIO_POLL_WATCHER = Event->io ( 3623 $AIO_POLL_WATCHER = Event->io (
3607 reentrant => 0, 3624 reentrant => 0,
3608 data => WF_AUTOCANCEL, 3625 data => WF_AUTOCANCEL,
3609 fd => IO::AIO::poll_fileno, 3626 fd => IO::AIO::poll_fileno,
3610 poll => 'r', 3627 poll => 'r',
3611 prio => 6, 3628 prio => 0,
3612 cb => \&IO::AIO::poll_cb, 3629 cb => \&IO::AIO::poll_cb,
3613 ); 3630 );
3614} 3631}
3615 3632
3616my $_log_backtrace; 3633my $_log_backtrace;
… …
3622 3639
3623 # limit the # of concurrent backtraces 3640 # limit the # of concurrent backtraces
3624 if ($_log_backtrace < 2) { 3641 if ($_log_backtrace < 2) {
3625 ++$_log_backtrace; 3642 ++$_log_backtrace;
3626 async { 3643 async {
3644 $Coro::current->{desc} = "abt $msg";
3645
3627 my @bt = fork_call { 3646 my @bt = fork_call {
3628 @addr = map { sprintf "%x", $_ } @addr; 3647 @addr = map { sprintf "%x", $_ } @addr;
3629 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3648 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3630 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3649 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3631 or die "addr2line: $!"; 3650 or die "addr2line: $!";

Diff Legend

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