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.373 by root, Sat Sep 15 15:58:06 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;
… …
1025); 1026);
1026 1027
1027sub object_freezer_save { 1028sub object_freezer_save {
1028 my ($filename, $rdata, $objs) = @_; 1029 my ($filename, $rdata, $objs) = @_;
1029 1030
1030 my $guard = cf::lock_acquire "io";
1031
1032 sync_job { 1031 sync_job {
1033 if (length $$rdata) { 1032 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename); 1033 utf8::decode (my $decname = $filename);
1035 warn sprintf "saving %s (%d,%d)\n", 1034 warn sprintf "saving %s (%d,%d)\n",
1036 $decname, length $$rdata, scalar @$objs; 1035 $decname, length $$rdata, scalar @$objs;
… …
1061 } else { 1060 } else {
1062 aio_unlink $filename; 1061 aio_unlink $filename;
1063 aio_unlink "$filename.pst"; 1062 aio_unlink "$filename.pst";
1064 } 1063 }
1065 }; 1064 };
1066
1067 undef $guard;
1068} 1065}
1069 1066
1070sub object_freezer_as_string { 1067sub object_freezer_as_string {
1071 my ($rdata, $objs) = @_; 1068 my ($rdata, $objs) = @_;
1072 1069
… …
1077 1074
1078sub object_thawer_load { 1075sub object_thawer_load {
1079 my ($filename) = @_; 1076 my ($filename) = @_;
1080 1077
1081 my ($data, $av); 1078 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1084 1079
1085 (aio_load $filename, $data) >= 0 1080 (aio_load $filename, $data) >= 0
1086 or return; 1081 or return;
1087 1082
1088 unless (aio_stat "$filename.pst") { 1083 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1084 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1085 or return;
1091 1086
1092 undef $guard;
1093 $av = eval { (Storable::thaw $av)->{objs} }; 1087 $av = eval { (Storable::thaw $av)->{objs} };
1094 } 1088 }
1095 1089
1096 utf8::decode (my $decname = $filename); 1090 utf8::decode (my $decname = $filename);
1097 warn sprintf "loading %s (%d,%d)\n", 1091 warn sprintf "loading %s (%d,%d)\n",
… …
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1346 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1347
1354 my $f = new_from_file cf::object::thawer path $login 1348 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1349 or return;
1356 1350
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1351 my $pl = cf::player::load_pl $f
1359 or return; 1352 or return;
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1353 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1354 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1355 $cf::PLAYER{$login} = $pl
… …
3464 my $signal = new Coro::Signal; 3457 my $signal = new Coro::Signal;
3465 push @WAIT_FOR_TICK_BEGIN, $signal; 3458 push @WAIT_FOR_TICK_BEGIN, $signal;
3466 $signal->wait; 3459 $signal->wait;
3467} 3460}
3468 3461
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 ( 3462$TICK_WATCHER = Event->timer (
3473 reentrant => 0, 3463 reentrant => 0,
3474 parked => 1, 3464 parked => 1,
3475 prio => 0, 3465 prio => 0,
3476 at => $NEXT_TICK || $TICK, 3466 at => $NEXT_TICK || $TICK,
… …
3480 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3470 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3481 unless ++$bug_warning > 10; 3471 unless ++$bug_warning > 10;
3482 return; 3472 return;
3483 } 3473 }
3484 3474
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; 3475 $NOW = $tick_start = Event::time;
3488 3476
3489 cf::server_tick; # one server iteration 3477 cf::server_tick; # one server iteration
3490 3478
3491 $RUNTIME += $TICK; 3479 $RUNTIME += $TICK;
… …
3497 write_runtime 3485 write_runtime
3498 or warn "ERROR: unable to write runtime file: $!"; 3486 or warn "ERROR: unable to write runtime file: $!";
3499 }; 3487 };
3500 } 3488 }
3501 3489
3502# my $AFTER = Event::time;
3503# warn $AFTER - $NOW;#d#
3504
3505 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3490 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3506 $sig->send; 3491 $sig->send;
3507 } 3492 }
3508 while (my $sig = shift @WAIT_FOR_TICK) { 3493 while (my $sig = shift @WAIT_FOR_TICK) {
3509 $sig->send; 3494 $sig->send;
… …
3519 3504
3520 $LOAD = ($NOW - $tick_start) / $TICK; 3505 $LOAD = ($NOW - $tick_start) / $TICK;
3521 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3506 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3522 3507
3523 _post_tick; 3508 _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 }, 3509 },
3529); 3510);
3530 3511
3531{ 3512{
3532 BDB::min_parallel 8; 3513 BDB::min_parallel 8;
… …
3555 ) 3536 )
3556 }; 3537 };
3557 3538
3558 unless ($DB_ENV) { 3539 unless ($DB_ENV) {
3559 $DB_ENV = BDB::db_env_create; 3540 $DB_ENV = BDB::db_env_create;
3541 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3542 | BDB::LOG_AUTOREMOVE, 1);
3543 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3544 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3560 3545
3561 cf::sync_job { 3546 cf::sync_job {
3562 eval { 3547 eval {
3563 BDB::db_env_open 3548 BDB::db_env_open
3564 $DB_ENV, 3549 $DB_ENV,
… …
3566 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3551 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3567 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3552 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3568 0666; 3553 0666;
3569 3554
3570 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3555 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 }; 3556 };
3576 3557
3577 cf::cleanup "db_env_open(db): $@" if $@; 3558 cf::cleanup "db_env_open(db): $@" if $@;
3578 }; 3559 };
3579 } 3560 }
3580 3561
3562 $BDB_DEADLOCK_WATCHER = Event->timer (
3563 after => 3,
3564 interval => 1,
3565 hard => 1,
3566 prio => 0,
3567 data => WF_AUTOCANCEL,
3568 cb => sub {
3569 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3570 },
3571 );
3581 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3572 $BDB_CHECKPOINT_WATCHER = Event->timer (
3582 after => 11, 3573 after => 11,
3583 interval => 60, 3574 interval => 60,
3584 hard => 1, 3575 hard => 1,
3585 prio => 0, 3576 prio => 0,

Diff Legend

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