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.367 by root, Wed Sep 12 11:10:11 2007 UTC vs.
Revision 1.375 by root, Sun Sep 30 20:22:21 2007 UTC

… …
80our $NEXT_TICK; 80our $NEXT_TICK;
81our $NOW; 81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
83 83
84our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 86our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 87our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 88our $DB_ENV;
88 89
89our %CFG; 90our %CFG;
… …
353our @SLOT_QUEUE; 354our @SLOT_QUEUE;
354our $SLOT_QUEUE; 355our $SLOT_QUEUE;
355 356
356$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
358 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
359 362
360 while () { 363 while () {
361 next_job: 364 next_job:
362 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
… …
432 435
433 my $busy = 1; 436 my $busy = 1;
434 my @res; 437 my @res;
435 438
436 (async { 439 (async {
440 $Coro::current->desc ("sync job coro");
437 @res = eval { $job->() }; 441 @res = eval { $job->() };
438 warn $@ if $@; 442 warn $@ if $@;
439 undef $busy; 443 undef $busy;
440 })->prio (Coro::PRIO_MAX); 444 })->prio (Coro::PRIO_MAX);
441 445
… …
1024 }, 1028 },
1025); 1029);
1026 1030
1027sub object_freezer_save { 1031sub object_freezer_save {
1028 my ($filename, $rdata, $objs) = @_; 1032 my ($filename, $rdata, $objs) = @_;
1029
1030 my $guard = cf::lock_acquire "io";
1031 1033
1032 sync_job { 1034 sync_job {
1033 if (length $$rdata) { 1035 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename); 1036 utf8::decode (my $decname = $filename);
1035 warn sprintf "saving %s (%d,%d)\n", 1037 warn sprintf "saving %s (%d,%d)\n",
… …
1061 } else { 1063 } else {
1062 aio_unlink $filename; 1064 aio_unlink $filename;
1063 aio_unlink "$filename.pst"; 1065 aio_unlink "$filename.pst";
1064 } 1066 }
1065 }; 1067 };
1066
1067 undef $guard;
1068} 1068}
1069 1069
1070sub object_freezer_as_string { 1070sub object_freezer_as_string {
1071 my ($rdata, $objs) = @_; 1071 my ($rdata, $objs) = @_;
1072 1072
… …
1077 1077
1078sub object_thawer_load { 1078sub object_thawer_load {
1079 my ($filename) = @_; 1079 my ($filename) = @_;
1080 1080
1081 my ($data, $av); 1081 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1084 1082
1085 (aio_load $filename, $data) >= 0 1083 (aio_load $filename, $data) >= 0
1086 or return; 1084 or return;
1087 1085
1088 unless (aio_stat "$filename.pst") { 1086 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1087 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1088 or return;
1091 1089
1092 undef $guard;
1093 $av = eval { (Storable::thaw $av)->{objs} }; 1090 $av = eval { (Storable::thaw $av)->{objs} };
1094 } 1091 }
1095 1092
1096 utf8::decode (my $decname = $filename); 1093 utf8::decode (my $decname = $filename);
1097 warn sprintf "loading %s (%d,%d)\n", 1094 warn sprintf "loading %s (%d,%d)\n",
… …
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1349 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1350
1354 my $f = new_from_file cf::object::thawer path $login 1351 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1352 or return;
1356 1353
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1354 my $pl = cf::player::load_pl $f
1359 or return; 1355 or return;
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1356 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1357 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1358 $cf::PLAYER{$login} = $pl
… …
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);
… …
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2457 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2458
2460 $self->enter_link; 2459 $self->enter_link;
2461 2460
2462 (async { 2461 (async {
2462 $Coro::current->{desc} = "player::goto $path $x $y";
2463
2463 # *tag paths override both path and x|y 2464 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2465 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2466 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2467 my $ob = $obs[rand @obs];
2467 2468
2468 # see if we actually can go there 2469 # see if we actually can go there
2469 # todo: use ob_blocked to check all tiles of the destination "object" 2470 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2470 # for suitability. 2471 $ob = $obs[rand @obs];
2472 } else {
2473 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2474 }
2475 # else put us there anyways for now #d#
2471 2476
2472 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y); 2477 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2478 } else {
2479 ($path, $x, $y) = (undef, undef, undef);
2473 } 2480 }
2474 } 2481 }
2475 2482
2476 my $map = eval { 2483 my $map = eval {
2477 my $map = cf::map::find $path; 2484 my $map = defined $path ? cf::map::find $path : undef;
2478 2485
2479 if ($map) { 2486 if ($map) {
2480 $map = $map->customise_for ($self); 2487 $map = $map->customise_for ($self);
2481 $map = $check->($map) if $check && $map; 2488 $map = $check->($map) if $check && $map;
2482 } else { 2489 } else {
2483 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2490 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2484 } 2491 }
2485 2492
2486 $map 2493 $map
2487 }; 2494 };
2488 2495
… …
2578 # if exit is damned, update players death & WoR home-position 2585 # if exit is damned, update players death & WoR home-position
2579 $self->contr->savebed ($slaying, $hp, $sp) 2586 $self->contr->savebed ($slaying, $hp, $sp)
2580 if $exit->flag (FLAG_DAMNED); 2587 if $exit->flag (FLAG_DAMNED);
2581 2588
2582 (async { 2589 (async {
2590 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2591
2583 $self->deactivate_recursive; # just to be sure 2592 $self->deactivate_recursive; # just to be sure
2584 unless (eval { 2593 unless (eval {
2585 $self->goto ($slaying, $hp, $sp); 2594 $self->goto ($slaying, $hp, $sp);
2586 2595
2587 1; 2596 1;
… …
2624 2633
2625=cut 2634=cut
2626 2635
2627our %CHANNEL = ( 2636our %CHANNEL = (
2628 "c/identify" => { 2637 "c/identify" => {
2629 id => "identify", 2638 id => "infobox",
2630 title => "Identify", 2639 title => "Identify",
2631 reply => undef, 2640 reply => undef,
2632 tooltip => "Items recently identified", 2641 tooltip => "Items recently identified",
2633 }, 2642 },
2634 "c/examine" => { 2643 "c/examine" => {
2635 id => "examine", 2644 id => "infobox",
2636 title => "Examine", 2645 title => "Examine",
2637 reply => undef, 2646 reply => undef,
2638 tooltip => "Signs and other items you examined", 2647 tooltip => "Signs and other items you examined",
2639 }, 2648 },
2649 "c/lookat" => {
2650 id => "infobox",
2651 title => "Look",
2652 reply => undef,
2653 tooltip => "What you saw there",
2654 },
2640); 2655);
2641 2656
2642sub cf::client::send_msg { 2657sub cf::client::send_msg {
2643 my ($self, $channel, $msg, $color, @extra) = @_; 2658 my ($self, $channel, $msg, $color, @extra) = @_;
2644 2659
2645 $msg = $self->pl->expand_cfpod ($msg); 2660 $msg = $self->pl->expand_cfpod ($msg);
2646 2661
2647 $color &= cf::NDI_CLIENT_MASK; # just in case... 2662 $color &= cf::NDI_CLIENT_MASK; # just in case...
2648 2663
2649 # check predefined channels, for the benefit of C 2664 # check predefined channels, for the benefit of C
2650 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2665 if ($CHANNEL{$channel}) {
2666 $channel = $CHANNEL{$channel};
2651 2667
2668 $self->ext_msg (channel_info => $channel)
2669 if $self->can_msg;
2670
2671 $channel = $channel->{id};
2672
2652 if (ref $channel) { 2673 } elsif (ref $channel) {
2653 # send meta info to client, if not yet sent 2674 # send meta info to client, if not yet sent
2654 unless (exists $self->{channel}{$channel->{id}}) { 2675 unless (exists $self->{channel}{$channel->{id}}) {
2655 $self->{channel}{$channel->{id}} = $channel; 2676 $self->{channel}{$channel->{id}} = $channel;
2656 $self->ext_msg (channel_info => $channel) 2677 $self->ext_msg (channel_info => $channel)
2657 if $self->can_msg; 2678 if $self->can_msg;
… …
3176sub main { 3197sub main {
3177 # we must not ever block the main coroutine 3198 # we must not ever block the main coroutine
3178 local $Coro::idle = sub { 3199 local $Coro::idle = sub {
3179 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#
3180 (async { 3201 (async {
3202 $Coro::current->{desc} = "IDLE BUG HANDLER";
3181 Event::one_event; 3203 Event::one_event;
3182 })->prio (Coro::PRIO_MAX); 3204 })->prio (Coro::PRIO_MAX);
3183 }; 3205 };
3184 3206
3185 reload_config; 3207 reload_config;
… …
3429register_command "reload" => sub { 3451register_command "reload" => sub {
3430 my ($who, $arg) = @_; 3452 my ($who, $arg) = @_;
3431 3453
3432 if ($who->flag (FLAG_WIZ)) { 3454 if ($who->flag (FLAG_WIZ)) {
3433 $who->message ("reloading server."); 3455 $who->message ("reloading server.");
3456 async {
3457 $Coro::current->{desc} = "perl_reload";
3434 async { reload_perl }; 3458 reload_perl;
3459 };
3435 } 3460 }
3436}; 3461};
3437 3462
3438unshift @INC, $LIBDIR; 3463unshift @INC, $LIBDIR;
3439 3464
… …
3457 3482
3458 my $signal = new Coro::Signal; 3483 my $signal = new Coro::Signal;
3459 push @WAIT_FOR_TICK_BEGIN, $signal; 3484 push @WAIT_FOR_TICK_BEGIN, $signal;
3460 $signal->wait; 3485 $signal->wait;
3461} 3486}
3462
3463our $stat_fh;
3464sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3465 3487
3466$TICK_WATCHER = Event->timer ( 3488$TICK_WATCHER = Event->timer (
3467 reentrant => 0, 3489 reentrant => 0,
3468 parked => 1, 3490 parked => 1,
3469 prio => 0, 3491 prio => 0,
… …
3474 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3496 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3475 unless ++$bug_warning > 10; 3497 unless ++$bug_warning > 10;
3476 return; 3498 return;
3477 } 3499 }
3478 3500
3479 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3480
3481 $NOW = $tick_start = Event::time; 3501 $NOW = $tick_start = Event::time;
3482 3502
3483 cf::server_tick; # one server iteration 3503 cf::server_tick; # one server iteration
3484 3504
3485 $RUNTIME += $TICK; 3505 $RUNTIME += $TICK;
3486 $NEXT_TICK += $TICK; 3506 $NEXT_TICK += $TICK;
3487 3507
3488 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3508 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3489 $NEXT_RUNTIME_WRITE = $NOW + 10; 3509 $NEXT_RUNTIME_WRITE = $NOW + 10;
3490 Coro::async_pool { 3510 Coro::async_pool {
3511 $Coro::current->{desc} = "runtime saver";
3491 write_runtime 3512 write_runtime
3492 or warn "ERROR: unable to write runtime file: $!"; 3513 or warn "ERROR: unable to write runtime file: $!";
3493 }; 3514 };
3494 } 3515 }
3495 3516
3496# my $AFTER = Event::time;
3497# warn $AFTER - $NOW;#d#
3498
3499 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3517 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3500 $sig->send; 3518 $sig->send;
3501 } 3519 }
3502 while (my $sig = shift @WAIT_FOR_TICK) { 3520 while (my $sig = shift @WAIT_FOR_TICK) {
3503 $sig->send; 3521 $sig->send;
… …
3513 3531
3514 $LOAD = ($NOW - $tick_start) / $TICK; 3532 $LOAD = ($NOW - $tick_start) / $TICK;
3515 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3533 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3516 3534
3517 _post_tick; 3535 _post_tick;
3518
3519 # gather some statistics#d#
3520 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d#
3521 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d#
3522 }, 3536 },
3523); 3537);
3524 3538
3525{ 3539{
3526 BDB::min_parallel 8; 3540 BDB::min_parallel 8;
… …
3549 ) 3563 )
3550 }; 3564 };
3551 3565
3552 unless ($DB_ENV) { 3566 unless ($DB_ENV) {
3553 $DB_ENV = BDB::db_env_create; 3567 $DB_ENV = BDB::db_env_create;
3568 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3569 | BDB::LOG_AUTOREMOVE, 1);
3570 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3571 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3554 3572
3555 cf::sync_job { 3573 cf::sync_job {
3556 eval { 3574 eval {
3557 BDB::db_env_open 3575 BDB::db_env_open
3558 $DB_ENV, 3576 $DB_ENV,
… …
3560 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3578 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3561 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3579 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3562 0666; 3580 0666;
3563 3581
3564 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3582 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3565
3566 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3567 | BDB::LOG_AUTOREMOVE, 1);
3568 $DB_ENV->set_lk_detect;
3569 }; 3583 };
3570 3584
3571 cf::cleanup "db_env_open(db): $@" if $@; 3585 cf::cleanup "db_env_open(db): $@" if $@;
3572 }; 3586 };
3573 } 3587 }
3574 3588
3589 $BDB_DEADLOCK_WATCHER = Event->timer (
3590 after => 3,
3591 interval => 1,
3592 hard => 1,
3593 prio => 0,
3594 data => WF_AUTOCANCEL,
3595 cb => sub {
3596 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3597 },
3598 );
3575 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3599 $BDB_CHECKPOINT_WATCHER = Event->timer (
3576 after => 11, 3600 after => 11,
3577 interval => 60, 3601 interval => 60,
3578 hard => 1, 3602 hard => 1,
3579 prio => 0, 3603 prio => 0,
… …
3618 3642
3619 # limit the # of concurrent backtraces 3643 # limit the # of concurrent backtraces
3620 if ($_log_backtrace < 2) { 3644 if ($_log_backtrace < 2) {
3621 ++$_log_backtrace; 3645 ++$_log_backtrace;
3622 async { 3646 async {
3647 $Coro::current->{desc} = "abt $msg";
3648
3623 my @bt = fork_call { 3649 my @bt = fork_call {
3624 @addr = map { sprintf "%x", $_ } @addr; 3650 @addr = map { sprintf "%x", $_ } @addr;
3625 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3651 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3626 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 |"
3627 or die "addr2line: $!"; 3653 or die "addr2line: $!";

Diff Legend

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