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.366 by root, Tue Sep 11 16:05:35 2007 UTC vs.
Revision 1.379 by root, Thu Oct 4 23:59:07 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;
… …
424 my $time = Event::time; 427 my $time = Event::time;
425 428
426 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
427 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
428 431
432 LOG llevError | logBacktrace, Carp::longmess "sync job";#d#
433
429 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
430 # (but this is cancel-safe) 435 # (but this is cancel-safe)
431 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
432 437
433 my $busy = 1; 438 my $busy = 1;
434 my @res; 439 my @res;
435 440
436 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
437 @res = eval { $job->() }; 443 @res = eval { $job->() };
438 warn $@ if $@; 444 warn $@ if $@;
439 undef $busy; 445 undef $busy;
440 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
441 447
… …
1024 }, 1030 },
1025); 1031);
1026 1032
1027sub object_freezer_save { 1033sub object_freezer_save {
1028 my ($filename, $rdata, $objs) = @_; 1034 my ($filename, $rdata, $objs) = @_;
1029
1030 my $guard = cf::lock_acquire "io";
1031 1035
1032 sync_job { 1036 sync_job {
1033 if (length $$rdata) { 1037 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename); 1038 utf8::decode (my $decname = $filename);
1035 warn sprintf "saving %s (%d,%d)\n", 1039 warn sprintf "saving %s (%d,%d)\n",
… …
1061 } else { 1065 } else {
1062 aio_unlink $filename; 1066 aio_unlink $filename;
1063 aio_unlink "$filename.pst"; 1067 aio_unlink "$filename.pst";
1064 } 1068 }
1065 }; 1069 };
1066
1067 undef $guard;
1068} 1070}
1069 1071
1070sub object_freezer_as_string { 1072sub object_freezer_as_string {
1071 my ($rdata, $objs) = @_; 1073 my ($rdata, $objs) = @_;
1072 1074
… …
1077 1079
1078sub object_thawer_load { 1080sub object_thawer_load {
1079 my ($filename) = @_; 1081 my ($filename) = @_;
1080 1082
1081 my ($data, $av); 1083 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1084 1084
1085 (aio_load $filename, $data) >= 0 1085 (aio_load $filename, $data) >= 0
1086 or return; 1086 or return;
1087 1087
1088 unless (aio_stat "$filename.pst") { 1088 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1089 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1090 or return;
1091 1091
1092 undef $guard;
1093 $av = eval { (Storable::thaw $av)->{objs} }; 1092 $av = eval { (Storable::thaw $av)->{objs} };
1094 } 1093 }
1095 1094
1096 utf8::decode (my $decname = $filename); 1095 utf8::decode (my $decname = $filename);
1097 warn sprintf "loading %s (%d,%d)\n", 1096 warn sprintf "loading %s (%d,%d)\n",
… …
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1351 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1352
1354 my $f = new_from_file cf::object::thawer path $login 1353 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1354 or return;
1356 1355
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1356 my $pl = cf::player::load_pl $f
1359 or return; 1357 or return;
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1358 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1359 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1360 $cf::PLAYER{$login} = $pl
… …
2043 } 2041 }
2044 2042
2045 $MAP_PREFETCH{$path} |= $load; 2043 $MAP_PREFETCH{$path} |= $load;
2046 2044
2047 $MAP_PREFETCHER ||= cf::async { 2045 $MAP_PREFETCHER ||= cf::async {
2046 $Coro::current->{desc} = "map prefetcher";
2047
2048 while (%MAP_PREFETCH) { 2048 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2049 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2050 if (my $map = find $k) {
2051 $map->load if $v; 2051 $map->load if $v;
2052 } 2052 }
… …
2078 return if $self->{deny_save}; 2078 return if $self->{deny_save};
2079 2079
2080 local $self->{last_access} = $self->last_access;#d# 2080 local $self->{last_access} = $self->last_access;#d#
2081 2081
2082 cf::async { 2082 cf::async {
2083 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2084 $_->contr->save for $self->players;
2084 }; 2085 };
2085 2086
2086 if ($uniq) { 2087 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2274=cut 2275=cut
2275 2276
2276sub deref { 2277sub deref {
2277 my ($ref) = @_; 2278 my ($ref) = @_;
2278 2279
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2280 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2281 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2282 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2283 or return;
2286 $pl->ob->uuid eq $uuid 2284 $pl->ob->uuid eq $uuid
2287 or return; 2285 or return;
… …
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2456 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2457
2460 $self->enter_link; 2458 $self->enter_link;
2461 2459
2462 (async { 2460 (async {
2461 $Coro::current->{desc} = "player::goto $path $x $y";
2462
2463 # *tag paths override both path and x|y 2463 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2464 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2465 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2466 my $ob = $obs[rand @obs];
2467 2467
2468 # todo: use ob_blocked to check all tiles of the destination "object" 2468 # see if we actually can go there
2469 # for suitability. 2469 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2470 $ob = $obs[rand @obs];
2471 } else {
2472 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2473 }
2474 # else put us there anyways for now #d#
2470 2475
2471 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y); 2476 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2477 } else {
2478 ($path, $x, $y) = (undef, undef, undef);
2472 } 2479 }
2473 } 2480 }
2474 2481
2475 my $map = eval { 2482 my $map = eval {
2476 my $map = cf::map::find $path; 2483 my $map = defined $path ? cf::map::find $path : undef;
2477 2484
2478 if ($map) { 2485 if ($map) {
2479 $map = $map->customise_for ($self); 2486 $map = $map->customise_for ($self);
2480 $map = $check->($map) if $check && $map; 2487 $map = $check->($map) if $check && $map;
2481 } else { 2488 } else {
2482 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2489 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2483 } 2490 }
2484 2491
2485 $map 2492 $map
2486 }; 2493 };
2487 2494
… …
2577 # if exit is damned, update players death & WoR home-position 2584 # if exit is damned, update players death & WoR home-position
2578 $self->contr->savebed ($slaying, $hp, $sp) 2585 $self->contr->savebed ($slaying, $hp, $sp)
2579 if $exit->flag (FLAG_DAMNED); 2586 if $exit->flag (FLAG_DAMNED);
2580 2587
2581 (async { 2588 (async {
2589 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2590
2582 $self->deactivate_recursive; # just to be sure 2591 $self->deactivate_recursive; # just to be sure
2583 unless (eval { 2592 unless (eval {
2584 $self->goto ($slaying, $hp, $sp); 2593 $self->goto ($slaying, $hp, $sp);
2585 2594
2586 1; 2595 1;
… …
2623 2632
2624=cut 2633=cut
2625 2634
2626our %CHANNEL = ( 2635our %CHANNEL = (
2627 "c/identify" => { 2636 "c/identify" => {
2628 id => "identify", 2637 id => "infobox",
2629 title => "Identify", 2638 title => "Identify",
2630 reply => undef, 2639 reply => undef,
2631 tooltip => "Items recently identified", 2640 tooltip => "Items recently identified",
2632 }, 2641 },
2633 "c/examine" => { 2642 "c/examine" => {
2634 id => "examine", 2643 id => "infobox",
2635 title => "Examine", 2644 title => "Examine",
2636 reply => undef, 2645 reply => undef,
2637 tooltip => "Signs and other items you examined", 2646 tooltip => "Signs and other items you examined",
2638 }, 2647 },
2648 "c/lookat" => {
2649 id => "infobox",
2650 title => "Look",
2651 reply => undef,
2652 tooltip => "What you saw there",
2653 },
2639); 2654);
2640 2655
2641sub cf::client::send_msg { 2656sub cf::client::send_msg {
2642 my ($self, $channel, $msg, $color, @extra) = @_; 2657 my ($self, $channel, $msg, $color, @extra) = @_;
2643 2658
2644 $msg = $self->pl->expand_cfpod ($msg); 2659 $msg = $self->pl->expand_cfpod ($msg);
2645 2660
2646 $color &= cf::NDI_CLIENT_MASK; # just in case... 2661 $color &= cf::NDI_CLIENT_MASK; # just in case...
2647 2662
2648 # check predefined channels, for the benefit of C 2663 # check predefined channels, for the benefit of C
2649 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2664 if ($CHANNEL{$channel}) {
2665 $channel = $CHANNEL{$channel};
2650 2666
2667 $self->ext_msg (channel_info => $channel)
2668 if $self->can_msg;
2669
2670 $channel = $channel->{id};
2671
2651 if (ref $channel) { 2672 } elsif (ref $channel) {
2652 # send meta info to client, if not yet sent 2673 # send meta info to client, if not yet sent
2653 unless (exists $self->{channel}{$channel->{id}}) { 2674 unless (exists $self->{channel}{$channel->{id}}) {
2654 $self->{channel}{$channel->{id}} = $channel; 2675 $self->{channel}{$channel->{id}} = $channel;
2655 $self->ext_msg (channel_info => $channel) 2676 $self->ext_msg (channel_info => $channel)
2656 if $self->can_msg; 2677 if $self->can_msg;
… …
3175sub main { 3196sub main {
3176 # we must not ever block the main coroutine 3197 # we must not ever block the main coroutine
3177 local $Coro::idle = sub { 3198 local $Coro::idle = sub {
3178 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#
3179 (async { 3200 (async {
3201 $Coro::current->{desc} = "IDLE BUG HANDLER";
3180 Event::one_event; 3202 Event::one_event;
3181 })->prio (Coro::PRIO_MAX); 3203 })->prio (Coro::PRIO_MAX);
3182 }; 3204 };
3183 3205
3184 reload_config; 3206 reload_config;
… …
3428register_command "reload" => sub { 3450register_command "reload" => sub {
3429 my ($who, $arg) = @_; 3451 my ($who, $arg) = @_;
3430 3452
3431 if ($who->flag (FLAG_WIZ)) { 3453 if ($who->flag (FLAG_WIZ)) {
3432 $who->message ("reloading server."); 3454 $who->message ("reloading server.");
3455 async {
3456 $Coro::current->{desc} = "perl_reload";
3433 async { reload_perl }; 3457 reload_perl;
3458 };
3434 } 3459 }
3435}; 3460};
3436 3461
3437unshift @INC, $LIBDIR; 3462unshift @INC, $LIBDIR;
3438 3463
… …
3456 3481
3457 my $signal = new Coro::Signal; 3482 my $signal = new Coro::Signal;
3458 push @WAIT_FOR_TICK_BEGIN, $signal; 3483 push @WAIT_FOR_TICK_BEGIN, $signal;
3459 $signal->wait; 3484 $signal->wait;
3460} 3485}
3461
3462our $stat_fh;
3463sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3464 3486
3465$TICK_WATCHER = Event->timer ( 3487$TICK_WATCHER = Event->timer (
3466 reentrant => 0, 3488 reentrant => 0,
3467 parked => 1, 3489 parked => 1,
3468 prio => 0, 3490 prio => 0,
… …
3473 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3495 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3474 unless ++$bug_warning > 10; 3496 unless ++$bug_warning > 10;
3475 return; 3497 return;
3476 } 3498 }
3477 3499
3478 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3479
3480 $NOW = $tick_start = Event::time; 3500 $NOW = $tick_start = Event::time;
3481 3501
3482 cf::server_tick; # one server iteration 3502 cf::server_tick; # one server iteration
3483 3503
3484 $RUNTIME += $TICK; 3504 $RUNTIME += $TICK;
3485 $NEXT_TICK += $TICK; 3505 $NEXT_TICK += $TICK;
3486 3506
3487 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3507 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3488 $NEXT_RUNTIME_WRITE = $NOW + 10; 3508 $NEXT_RUNTIME_WRITE = $NOW + 10;
3489 Coro::async_pool { 3509 Coro::async_pool {
3510 $Coro::current->{desc} = "runtime saver";
3490 write_runtime 3511 write_runtime
3491 or warn "ERROR: unable to write runtime file: $!"; 3512 or warn "ERROR: unable to write runtime file: $!";
3492 }; 3513 };
3493 } 3514 }
3494 3515
3495# my $AFTER = Event::time;
3496# warn $AFTER - $NOW;#d#
3497
3498 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3516 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3499 $sig->send; 3517 $sig->send;
3500 } 3518 }
3501 while (my $sig = shift @WAIT_FOR_TICK) { 3519 while (my $sig = shift @WAIT_FOR_TICK) {
3502 $sig->send; 3520 $sig->send;
… …
3512 3530
3513 $LOAD = ($NOW - $tick_start) / $TICK; 3531 $LOAD = ($NOW - $tick_start) / $TICK;
3514 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3532 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3515 3533
3516 _post_tick; 3534 _post_tick;
3517
3518 # gather some statistics#d#
3519 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d#
3520 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d#
3521 }, 3535 },
3522); 3536);
3523 3537
3524{ 3538{
3525 BDB::min_parallel 8; 3539 BDB::min_parallel 8;
… …
3548 ) 3562 )
3549 }; 3563 };
3550 3564
3551 unless ($DB_ENV) { 3565 unless ($DB_ENV) {
3552 $DB_ENV = BDB::db_env_create; 3566 $DB_ENV = BDB::db_env_create;
3567 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3568 | BDB::LOG_AUTOREMOVE, 1);
3569 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3570 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3553 3571
3554 cf::sync_job { 3572 cf::sync_job {
3555 eval { 3573 eval {
3556 BDB::db_env_open 3574 BDB::db_env_open
3557 $DB_ENV, 3575 $DB_ENV,
… …
3559 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3577 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3560 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3578 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3561 0666; 3579 0666;
3562 3580
3563 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3581 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3564
3565 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3566 | BDB::LOG_AUTOREMOVE, 1);
3567 $DB_ENV->set_lk_detect;
3568 }; 3582 };
3569 3583
3570 cf::cleanup "db_env_open(db): $@" if $@; 3584 cf::cleanup "db_env_open(db): $@" if $@;
3571 }; 3585 };
3572 } 3586 }
3573 3587
3588 $BDB_DEADLOCK_WATCHER = Event->timer (
3589 after => 3,
3590 interval => 1,
3591 hard => 1,
3592 prio => 0,
3593 data => WF_AUTOCANCEL,
3594 cb => sub {
3595 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3596 },
3597 );
3574 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3598 $BDB_CHECKPOINT_WATCHER = Event->timer (
3575 after => 11, 3599 after => 11,
3576 interval => 60, 3600 interval => 60,
3577 hard => 1, 3601 hard => 1,
3578 prio => 0, 3602 prio => 0,
… …
3601 $AIO_POLL_WATCHER = Event->io ( 3625 $AIO_POLL_WATCHER = Event->io (
3602 reentrant => 0, 3626 reentrant => 0,
3603 data => WF_AUTOCANCEL, 3627 data => WF_AUTOCANCEL,
3604 fd => IO::AIO::poll_fileno, 3628 fd => IO::AIO::poll_fileno,
3605 poll => 'r', 3629 poll => 'r',
3606 prio => 6, 3630 prio => 0,
3607 cb => \&IO::AIO::poll_cb, 3631 cb => \&IO::AIO::poll_cb,
3608 ); 3632 );
3609} 3633}
3610 3634
3611my $_log_backtrace; 3635my $_log_backtrace;
… …
3617 3641
3618 # limit the # of concurrent backtraces 3642 # limit the # of concurrent backtraces
3619 if ($_log_backtrace < 2) { 3643 if ($_log_backtrace < 2) {
3620 ++$_log_backtrace; 3644 ++$_log_backtrace;
3621 async { 3645 async {
3646 $Coro::current->{desc} = "abt $msg";
3647
3622 my @bt = fork_call { 3648 my @bt = fork_call {
3623 @addr = map { sprintf "%x", $_ } @addr; 3649 @addr = map { sprintf "%x", $_ } @addr;
3624 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3650 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3625 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 |"
3626 or die "addr2line: $!"; 3652 or die "addr2line: $!";

Diff Legend

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