… | |
… | |
80 | our $NEXT_TICK; |
80 | our $NEXT_TICK; |
81 | our $NOW; |
81 | our $NOW; |
82 | our $USE_FSYNC = 1; # use fsync to write maps - default off |
82 | our $USE_FSYNC = 1; # use fsync to write maps - default off |
83 | |
83 | |
84 | our $BDB_POLL_WATCHER; |
84 | our $BDB_POLL_WATCHER; |
|
|
85 | our $BDB_DEADLOCK_WATCHER; |
85 | our $BDB_CHECKPOINT_WATCHER; |
86 | our $BDB_CHECKPOINT_WATCHER; |
86 | our $BDB_TRICKLE_WATCHER; |
87 | our $BDB_TRICKLE_WATCHER; |
87 | our $DB_ENV; |
88 | our $DB_ENV; |
88 | |
89 | |
89 | our %CFG; |
90 | our %CFG; |
… | |
… | |
1025 | ); |
1026 | ); |
1026 | |
1027 | |
1027 | sub object_freezer_save { |
1028 | sub 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 | |
1070 | sub object_freezer_as_string { |
1067 | sub object_freezer_as_string { |
1071 | my ($rdata, $objs) = @_; |
1068 | my ($rdata, $objs) = @_; |
1072 | |
1069 | |
… | |
… | |
1077 | |
1074 | |
1078 | sub object_thawer_load { |
1075 | sub 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 |
… | |
… | |
3543 | ) |
3536 | ) |
3544 | }; |
3537 | }; |
3545 | |
3538 | |
3546 | unless ($DB_ENV) { |
3539 | unless ($DB_ENV) { |
3547 | $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); |
3548 | |
3545 | |
3549 | cf::sync_job { |
3546 | cf::sync_job { |
3550 | eval { |
3547 | eval { |
3551 | BDB::db_env_open |
3548 | BDB::db_env_open |
3552 | $DB_ENV, |
3549 | $DB_ENV, |
… | |
… | |
3554 | 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 |
3555 | | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, |
3552 | | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, |
3556 | 0666; |
3553 | 0666; |
3557 | |
3554 | |
3558 | cf::cleanup "db_env_open($BDBDIR): $!" if $!; |
3555 | cf::cleanup "db_env_open($BDBDIR): $!" if $!; |
3559 | |
|
|
3560 | $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC |
|
|
3561 | | BDB::LOG_AUTOREMOVE, 1); |
|
|
3562 | $DB_ENV->set_lk_detect; |
|
|
3563 | }; |
3556 | }; |
3564 | |
3557 | |
3565 | cf::cleanup "db_env_open(db): $@" if $@; |
3558 | cf::cleanup "db_env_open(db): $@" if $@; |
3566 | }; |
3559 | }; |
3567 | } |
3560 | } |
3568 | |
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 | ); |
3569 | $BDB_CHECKPOINT_WATCHER = Event->timer ( |
3572 | $BDB_CHECKPOINT_WATCHER = Event->timer ( |
3570 | after => 11, |
3573 | after => 11, |
3571 | interval => 60, |
3574 | interval => 60, |
3572 | hard => 1, |
3575 | hard => 1, |
3573 | prio => 0, |
3576 | prio => 0, |