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.371 by root, Thu Sep 13 16:16:01 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;
… …
3464 my $signal = new Coro::Signal; 3465 my $signal = new Coro::Signal;
3465 push @WAIT_FOR_TICK_BEGIN, $signal; 3466 push @WAIT_FOR_TICK_BEGIN, $signal;
3466 $signal->wait; 3467 $signal->wait;
3467} 3468}
3468 3469
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 ( 3470$TICK_WATCHER = Event->timer (
3473 reentrant => 0, 3471 reentrant => 0,
3474 parked => 1, 3472 parked => 1,
3475 prio => 0, 3473 prio => 0,
3476 at => $NEXT_TICK || $TICK, 3474 at => $NEXT_TICK || $TICK,
… …
3480 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3478 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3481 unless ++$bug_warning > 10; 3479 unless ++$bug_warning > 10;
3482 return; 3480 return;
3483 } 3481 }
3484 3482
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; 3483 $NOW = $tick_start = Event::time;
3488 3484
3489 cf::server_tick; # one server iteration 3485 cf::server_tick; # one server iteration
3490 3486
3491 $RUNTIME += $TICK; 3487 $RUNTIME += $TICK;
… …
3497 write_runtime 3493 write_runtime
3498 or warn "ERROR: unable to write runtime file: $!"; 3494 or warn "ERROR: unable to write runtime file: $!";
3499 }; 3495 };
3500 } 3496 }
3501 3497
3502# my $AFTER = Event::time;
3503# warn $AFTER - $NOW;#d#
3504
3505 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3498 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3506 $sig->send; 3499 $sig->send;
3507 } 3500 }
3508 while (my $sig = shift @WAIT_FOR_TICK) { 3501 while (my $sig = shift @WAIT_FOR_TICK) {
3509 $sig->send; 3502 $sig->send;
… …
3519 3512
3520 $LOAD = ($NOW - $tick_start) / $TICK; 3513 $LOAD = ($NOW - $tick_start) / $TICK;
3521 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3514 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3522 3515
3523 _post_tick; 3516 _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 }, 3517 },
3529); 3518);
3530 3519
3531{ 3520{
3532 BDB::min_parallel 8; 3521 BDB::min_parallel 8;
… …
3555 ) 3544 )
3556 }; 3545 };
3557 3546
3558 unless ($DB_ENV) { 3547 unless ($DB_ENV) {
3559 $DB_ENV = BDB::db_env_create; 3548 $DB_ENV = BDB::db_env_create;
3549 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3550 | BDB::LOG_AUTOREMOVE, 1);
3551 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3552 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3560 3553
3561 cf::sync_job { 3554 cf::sync_job {
3562 eval { 3555 eval {
3563 BDB::db_env_open 3556 BDB::db_env_open
3564 $DB_ENV, 3557 $DB_ENV,
… …
3566 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3559 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3567 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3560 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3568 0666; 3561 0666;
3569 3562
3570 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3563 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 }; 3564 };
3576 3565
3577 cf::cleanup "db_env_open(db): $@" if $@; 3566 cf::cleanup "db_env_open(db): $@" if $@;
3578 }; 3567 };
3579 } 3568 }
3580 3569
3570 $BDB_DEADLOCK_WATCHER = Event->timer (
3571 after => 3,
3572 interval => 1,
3573 hard => 1,
3574 prio => 0,
3575 data => WF_AUTOCANCEL,
3576 cb => sub {
3577 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3578 },
3579 );
3581 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3580 $BDB_CHECKPOINT_WATCHER = Event->timer (
3582 after => 11, 3581 after => 11,
3583 interval => 60, 3582 interval => 60,
3584 hard => 1, 3583 hard => 1,
3585 prio => 0, 3584 prio => 0,

Diff Legend

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