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.369 by root, Thu Sep 13 08:35:25 2007 UTC vs.
Revision 1.372 by root, Sat Sep 15 13:25:33 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;
… …
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1353 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1354
1354 my $f = new_from_file cf::object::thawer path $login 1355 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1356 or return;
1356 1357
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1358 my $pl = cf::player::load_pl $f
1359 or return; 1359 or return;
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1360 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1361 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1362 $cf::PLAYER{$login} = $pl
… …
3464 my $signal = new Coro::Signal; 3464 my $signal = new Coro::Signal;
3465 push @WAIT_FOR_TICK_BEGIN, $signal; 3465 push @WAIT_FOR_TICK_BEGIN, $signal;
3466 $signal->wait; 3466 $signal->wait;
3467} 3467}
3468 3468
3469our $stat_fh;
3470sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3471
3472$TICK_WATCHER = Event->timer ( 3469$TICK_WATCHER = Event->timer (
3473 reentrant => 0, 3470 reentrant => 0,
3474 parked => 1, 3471 parked => 1,
3475 prio => 0, 3472 prio => 0,
3476 at => $NEXT_TICK || $TICK, 3473 at => $NEXT_TICK || $TICK,
… …
3480 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3477 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3481 unless ++$bug_warning > 10; 3478 unless ++$bug_warning > 10;
3482 return; 3479 return;
3483 } 3480 }
3484 3481
3485 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3486
3487 $NOW = $tick_start = Event::time; 3482 $NOW = $tick_start = Event::time;
3488 3483
3489 cf::server_tick; # one server iteration 3484 cf::server_tick; # one server iteration
3490 3485
3491 $RUNTIME += $TICK; 3486 $RUNTIME += $TICK;
… …
3497 write_runtime 3492 write_runtime
3498 or warn "ERROR: unable to write runtime file: $!"; 3493 or warn "ERROR: unable to write runtime file: $!";
3499 }; 3494 };
3500 } 3495 }
3501 3496
3502# my $AFTER = Event::time;
3503# warn $AFTER - $NOW;#d#
3504
3505 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3497 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3506 $sig->send; 3498 $sig->send;
3507 } 3499 }
3508 while (my $sig = shift @WAIT_FOR_TICK) { 3500 while (my $sig = shift @WAIT_FOR_TICK) {
3509 $sig->send; 3501 $sig->send;
… …
3519 3511
3520 $LOAD = ($NOW - $tick_start) / $TICK; 3512 $LOAD = ($NOW - $tick_start) / $TICK;
3521 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3513 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3522 3514
3523 _post_tick; 3515 _post_tick;
3524
3525 # gather some statistics#d#
3526 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d#
3527 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d#
3528 }, 3516 },
3529); 3517);
3530 3518
3531{ 3519{
3532 BDB::min_parallel 8; 3520 BDB::min_parallel 8;
… …
3555 ) 3543 )
3556 }; 3544 };
3557 3545
3558 unless ($DB_ENV) { 3546 unless ($DB_ENV) {
3559 $DB_ENV = BDB::db_env_create; 3547 $DB_ENV = BDB::db_env_create;
3548 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3549 | BDB::LOG_AUTOREMOVE, 1);
3550 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3551 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3560 3552
3561 cf::sync_job { 3553 cf::sync_job {
3562 eval { 3554 eval {
3563 BDB::db_env_open 3555 BDB::db_env_open
3564 $DB_ENV, 3556 $DB_ENV,
… …
3566 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3558 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3567 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3559 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3568 0666; 3560 0666;
3569 3561
3570 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3562 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3571
3572 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3573 | BDB::LOG_AUTOREMOVE, 1);
3574 $DB_ENV->set_lk_detect;
3575 }; 3563 };
3576 3564
3577 cf::cleanup "db_env_open(db): $@" if $@; 3565 cf::cleanup "db_env_open(db): $@" if $@;
3578 }; 3566 };
3579 } 3567 }
3580 3568
3569 $BDB_DEADLOCK_WATCHER = Event->timer (
3570 after => 3,
3571 interval => 1,
3572 hard => 1,
3573 prio => 0,
3574 data => WF_AUTOCANCEL,
3575 cb => sub {
3576 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3577 },
3578 );
3581 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3579 $BDB_CHECKPOINT_WATCHER = Event->timer (
3582 after => 11, 3580 after => 11,
3583 interval => 60, 3581 interval => 60,
3584 hard => 1, 3582 hard => 1,
3585 prio => 0, 3583 prio => 0,

Diff Legend

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