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.371 by root, Thu Sep 13 16:16:01 2007 UTC vs.
Revision 1.379 by root, Thu Oct 4 23:59:07 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;
… …
425 my $time = Event::time; 427 my $time = Event::time;
426 428
427 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
428 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
429 431
432 LOG llevError | logBacktrace, Carp::longmess "sync job";#d#
433
430 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
431 # (but this is cancel-safe) 435 # (but this is cancel-safe)
432 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
433 437
434 my $busy = 1; 438 my $busy = 1;
435 my @res; 439 my @res;
436 440
437 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
438 @res = eval { $job->() }; 443 @res = eval { $job->() };
439 warn $@ if $@; 444 warn $@ if $@;
440 undef $busy; 445 undef $busy;
441 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
442 447
… …
1025 }, 1030 },
1026); 1031);
1027 1032
1028sub object_freezer_save { 1033sub object_freezer_save {
1029 my ($filename, $rdata, $objs) = @_; 1034 my ($filename, $rdata, $objs) = @_;
1030
1031 my $guard = cf::lock_acquire "io";
1032 1035
1033 sync_job { 1036 sync_job {
1034 if (length $$rdata) { 1037 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename); 1038 utf8::decode (my $decname = $filename);
1036 warn sprintf "saving %s (%d,%d)\n", 1039 warn sprintf "saving %s (%d,%d)\n",
… …
1062 } else { 1065 } else {
1063 aio_unlink $filename; 1066 aio_unlink $filename;
1064 aio_unlink "$filename.pst"; 1067 aio_unlink "$filename.pst";
1065 } 1068 }
1066 }; 1069 };
1067
1068 undef $guard;
1069} 1070}
1070 1071
1071sub object_freezer_as_string { 1072sub object_freezer_as_string {
1072 my ($rdata, $objs) = @_; 1073 my ($rdata, $objs) = @_;
1073 1074
… …
1078 1079
1079sub object_thawer_load { 1080sub object_thawer_load {
1080 my ($filename) = @_; 1081 my ($filename) = @_;
1081 1082
1082 my ($data, $av); 1083 my ($data, $av);
1083
1084 my $guard = cf::lock_acquire "io";
1085 1084
1086 (aio_load $filename, $data) >= 0 1085 (aio_load $filename, $data) >= 0
1087 or return; 1086 or return;
1088 1087
1089 unless (aio_stat "$filename.pst") { 1088 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1089 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1090 or return;
1092 1091
1093 undef $guard;
1094 $av = eval { (Storable::thaw $av)->{objs} }; 1092 $av = eval { (Storable::thaw $av)->{objs} };
1095 } 1093 }
1096 1094
1097 utf8::decode (my $decname = $filename); 1095 utf8::decode (my $decname = $filename);
1098 warn sprintf "loading %s (%d,%d)\n", 1096 warn sprintf "loading %s (%d,%d)\n",
… …
1353 aio_unlink +(playerdir $login) . "/$login.pl"; 1351 aio_unlink +(playerdir $login) . "/$login.pl";
1354 1352
1355 my $f = new_from_file cf::object::thawer path $login 1353 my $f = new_from_file cf::object::thawer path $login
1356 or return; 1354 or return;
1357 1355
1358 $f->next;
1359 my $pl = cf::player::load_pl $f 1356 my $pl = cf::player::load_pl $f
1360 or return; 1357 or return;
1361 local $cf::PLAYER_LOADING{$login} = $pl; 1358 local $cf::PLAYER_LOADING{$login} = $pl;
1362 $f->resolve_delayed_derefs; 1359 $f->resolve_delayed_derefs;
1363 $cf::PLAYER{$login} = $pl 1360 $cf::PLAYER{$login} = $pl
… …
2044 } 2041 }
2045 2042
2046 $MAP_PREFETCH{$path} |= $load; 2043 $MAP_PREFETCH{$path} |= $load;
2047 2044
2048 $MAP_PREFETCHER ||= cf::async { 2045 $MAP_PREFETCHER ||= cf::async {
2046 $Coro::current->{desc} = "map prefetcher";
2047
2049 while (%MAP_PREFETCH) { 2048 while (%MAP_PREFETCH) {
2050 while (my ($k, $v) = each %MAP_PREFETCH) { 2049 while (my ($k, $v) = each %MAP_PREFETCH) {
2051 if (my $map = find $k) { 2050 if (my $map = find $k) {
2052 $map->load if $v; 2051 $map->load if $v;
2053 } 2052 }
… …
2079 return if $self->{deny_save}; 2078 return if $self->{deny_save};
2080 2079
2081 local $self->{last_access} = $self->last_access;#d# 2080 local $self->{last_access} = $self->last_access;#d#
2082 2081
2083 cf::async { 2082 cf::async {
2083 $Coro::current->{desc} = "map player save";
2084 $_->contr->save for $self->players; 2084 $_->contr->save for $self->players;
2085 }; 2085 };
2086 2086
2087 if ($uniq) { 2087 if ($uniq) {
2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2275=cut 2275=cut
2276 2276
2277sub deref { 2277sub deref {
2278 my ($ref) = @_; 2278 my ($ref) = @_;
2279 2279
2280 # temporary compatibility#TODO#remove
2281 $ref =~ s{^<}{player/<};
2282
2283 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2280 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2284 my ($uuid, $name) = ($1, $2); 2281 my ($uuid, $name) = ($1, $2);
2285 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2282 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2286 or return; 2283 or return;
2287 $pl->ob->uuid eq $uuid 2284 $pl->ob->uuid eq $uuid
2288 or return; 2285 or return;
… …
2459 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2456 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2460 2457
2461 $self->enter_link; 2458 $self->enter_link;
2462 2459
2463 (async { 2460 (async {
2461 $Coro::current->{desc} = "player::goto $path $x $y";
2462
2464 # *tag paths override both path and x|y 2463 # *tag paths override both path and x|y
2465 if ($path =~ /^\*(.*)$/) { 2464 if ($path =~ /^\*(.*)$/) {
2466 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2465 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2467 my $ob = $obs[rand @obs]; 2466 my $ob = $obs[rand @obs];
2468 2467
… …
2585 # if exit is damned, update players death & WoR home-position 2584 # if exit is damned, update players death & WoR home-position
2586 $self->contr->savebed ($slaying, $hp, $sp) 2585 $self->contr->savebed ($slaying, $hp, $sp)
2587 if $exit->flag (FLAG_DAMNED); 2586 if $exit->flag (FLAG_DAMNED);
2588 2587
2589 (async { 2588 (async {
2589 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2590
2590 $self->deactivate_recursive; # just to be sure 2591 $self->deactivate_recursive; # just to be sure
2591 unless (eval { 2592 unless (eval {
2592 $self->goto ($slaying, $hp, $sp); 2593 $self->goto ($slaying, $hp, $sp);
2593 2594
2594 1; 2595 1;
… …
2631 2632
2632=cut 2633=cut
2633 2634
2634our %CHANNEL = ( 2635our %CHANNEL = (
2635 "c/identify" => { 2636 "c/identify" => {
2636 id => "identify", 2637 id => "infobox",
2637 title => "Identify", 2638 title => "Identify",
2638 reply => undef, 2639 reply => undef,
2639 tooltip => "Items recently identified", 2640 tooltip => "Items recently identified",
2640 }, 2641 },
2641 "c/examine" => { 2642 "c/examine" => {
2642 id => "examine", 2643 id => "infobox",
2643 title => "Examine", 2644 title => "Examine",
2644 reply => undef, 2645 reply => undef,
2645 tooltip => "Signs and other items you examined", 2646 tooltip => "Signs and other items you examined",
2646 }, 2647 },
2648 "c/lookat" => {
2649 id => "infobox",
2650 title => "Look",
2651 reply => undef,
2652 tooltip => "What you saw there",
2653 },
2647); 2654);
2648 2655
2649sub cf::client::send_msg { 2656sub cf::client::send_msg {
2650 my ($self, $channel, $msg, $color, @extra) = @_; 2657 my ($self, $channel, $msg, $color, @extra) = @_;
2651 2658
2652 $msg = $self->pl->expand_cfpod ($msg); 2659 $msg = $self->pl->expand_cfpod ($msg);
2653 2660
2654 $color &= cf::NDI_CLIENT_MASK; # just in case... 2661 $color &= cf::NDI_CLIENT_MASK; # just in case...
2655 2662
2656 # check predefined channels, for the benefit of C 2663 # check predefined channels, for the benefit of C
2657 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2664 if ($CHANNEL{$channel}) {
2665 $channel = $CHANNEL{$channel};
2658 2666
2667 $self->ext_msg (channel_info => $channel)
2668 if $self->can_msg;
2669
2670 $channel = $channel->{id};
2671
2659 if (ref $channel) { 2672 } elsif (ref $channel) {
2660 # send meta info to client, if not yet sent 2673 # send meta info to client, if not yet sent
2661 unless (exists $self->{channel}{$channel->{id}}) { 2674 unless (exists $self->{channel}{$channel->{id}}) {
2662 $self->{channel}{$channel->{id}} = $channel; 2675 $self->{channel}{$channel->{id}} = $channel;
2663 $self->ext_msg (channel_info => $channel) 2676 $self->ext_msg (channel_info => $channel)
2664 if $self->can_msg; 2677 if $self->can_msg;
… …
3183sub main { 3196sub main {
3184 # we must not ever block the main coroutine 3197 # we must not ever block the main coroutine
3185 local $Coro::idle = sub { 3198 local $Coro::idle = sub {
3186 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3199 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3187 (async { 3200 (async {
3201 $Coro::current->{desc} = "IDLE BUG HANDLER";
3188 Event::one_event; 3202 Event::one_event;
3189 })->prio (Coro::PRIO_MAX); 3203 })->prio (Coro::PRIO_MAX);
3190 }; 3204 };
3191 3205
3192 reload_config; 3206 reload_config;
… …
3436register_command "reload" => sub { 3450register_command "reload" => sub {
3437 my ($who, $arg) = @_; 3451 my ($who, $arg) = @_;
3438 3452
3439 if ($who->flag (FLAG_WIZ)) { 3453 if ($who->flag (FLAG_WIZ)) {
3440 $who->message ("reloading server."); 3454 $who->message ("reloading server.");
3455 async {
3456 $Coro::current->{desc} = "perl_reload";
3441 async { reload_perl }; 3457 reload_perl;
3458 };
3442 } 3459 }
3443}; 3460};
3444 3461
3445unshift @INC, $LIBDIR; 3462unshift @INC, $LIBDIR;
3446 3463
… …
3488 $NEXT_TICK += $TICK; 3505 $NEXT_TICK += $TICK;
3489 3506
3490 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3507 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3491 $NEXT_RUNTIME_WRITE = $NOW + 10; 3508 $NEXT_RUNTIME_WRITE = $NOW + 10;
3492 Coro::async_pool { 3509 Coro::async_pool {
3510 $Coro::current->{desc} = "runtime saver";
3493 write_runtime 3511 write_runtime
3494 or warn "ERROR: unable to write runtime file: $!"; 3512 or warn "ERROR: unable to write runtime file: $!";
3495 }; 3513 };
3496 } 3514 }
3497 3515
… …
3607 $AIO_POLL_WATCHER = Event->io ( 3625 $AIO_POLL_WATCHER = Event->io (
3608 reentrant => 0, 3626 reentrant => 0,
3609 data => WF_AUTOCANCEL, 3627 data => WF_AUTOCANCEL,
3610 fd => IO::AIO::poll_fileno, 3628 fd => IO::AIO::poll_fileno,
3611 poll => 'r', 3629 poll => 'r',
3612 prio => 6, 3630 prio => 0,
3613 cb => \&IO::AIO::poll_cb, 3631 cb => \&IO::AIO::poll_cb,
3614 ); 3632 );
3615} 3633}
3616 3634
3617my $_log_backtrace; 3635my $_log_backtrace;
… …
3623 3641
3624 # limit the # of concurrent backtraces 3642 # limit the # of concurrent backtraces
3625 if ($_log_backtrace < 2) { 3643 if ($_log_backtrace < 2) {
3626 ++$_log_backtrace; 3644 ++$_log_backtrace;
3627 async { 3645 async {
3646 $Coro::current->{desc} = "abt $msg";
3647
3628 my @bt = fork_call { 3648 my @bt = fork_call {
3629 @addr = map { sprintf "%x", $_ } @addr; 3649 @addr = map { sprintf "%x", $_ } @addr;
3630 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3650 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3631 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3651 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3632 or die "addr2line: $!"; 3652 or die "addr2line: $!";

Diff Legend

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