… | |
… | |
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 |
… | |
… | |
2463 | # *tag paths override both path and x|y |
2456 | # *tag paths override both path and x|y |
2464 | if ($path =~ /^\*(.*)$/) { |
2457 | if ($path =~ /^\*(.*)$/) { |
2465 | if (my @obs = grep $_->map, ext::map_tags::find $1) { |
2458 | if (my @obs = grep $_->map, ext::map_tags::find $1) { |
2466 | my $ob = $obs[rand @obs]; |
2459 | my $ob = $obs[rand @obs]; |
2467 | |
2460 | |
2468 | # todo: use ob_blocked to check all tiles of the destination "object" |
2461 | # see if we actually can go there |
2469 | # for suitability. |
2462 | if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) { |
|
|
2463 | $ob = $obs[rand @obs]; |
|
|
2464 | } else { |
|
|
2465 | $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED); |
|
|
2466 | } |
|
|
2467 | # else put us there anyways for now #d# |
2470 | |
2468 | |
2471 | ($path, $x, $y) = ($ob->map, $ob->x, $ob->y); |
2469 | ($path, $x, $y) = ($ob->map, $ob->x, $ob->y); |
|
|
2470 | } else { |
|
|
2471 | ($path, $x, $y) = (undef, undef, undef); |
2472 | } |
2472 | } |
2473 | } |
2473 | } |
2474 | |
2474 | |
2475 | my $map = eval { |
2475 | my $map = eval { |
2476 | my $map = cf::map::find $path; |
2476 | my $map = defined $path ? cf::map::find $path : undef; |
2477 | |
2477 | |
2478 | if ($map) { |
2478 | if ($map) { |
2479 | $map = $map->customise_for ($self); |
2479 | $map = $map->customise_for ($self); |
2480 | $map = $check->($map) if $check && $map; |
2480 | $map = $check->($map) if $check && $map; |
2481 | } else { |
2481 | } else { |
2482 | $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); |
2482 | $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); |
2483 | } |
2483 | } |
2484 | |
2484 | |
2485 | $map |
2485 | $map |
2486 | }; |
2486 | }; |
2487 | |
2487 | |
… | |
… | |
3457 | my $signal = new Coro::Signal; |
3457 | my $signal = new Coro::Signal; |
3458 | push @WAIT_FOR_TICK_BEGIN, $signal; |
3458 | push @WAIT_FOR_TICK_BEGIN, $signal; |
3459 | $signal->wait; |
3459 | $signal->wait; |
3460 | } |
3460 | } |
3461 | |
3461 | |
3462 | our $stat_fh; |
|
|
3463 | sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d# |
|
|
3464 | |
|
|
3465 | $TICK_WATCHER = Event->timer ( |
3462 | $TICK_WATCHER = Event->timer ( |
3466 | reentrant => 0, |
3463 | reentrant => 0, |
3467 | parked => 1, |
3464 | parked => 1, |
3468 | prio => 0, |
3465 | prio => 0, |
3469 | at => $NEXT_TICK || $TICK, |
3466 | at => $NEXT_TICK || $TICK, |
… | |
… | |
3473 | 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" |
3474 | unless ++$bug_warning > 10; |
3471 | unless ++$bug_warning > 10; |
3475 | return; |
3472 | return; |
3476 | } |
3473 | } |
3477 | |
3474 | |
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; |
3475 | $NOW = $tick_start = Event::time; |
3481 | |
3476 | |
3482 | cf::server_tick; # one server iteration |
3477 | cf::server_tick; # one server iteration |
3483 | |
3478 | |
3484 | $RUNTIME += $TICK; |
3479 | $RUNTIME += $TICK; |
… | |
… | |
3490 | write_runtime |
3485 | write_runtime |
3491 | or warn "ERROR: unable to write runtime file: $!"; |
3486 | or warn "ERROR: unable to write runtime file: $!"; |
3492 | }; |
3487 | }; |
3493 | } |
3488 | } |
3494 | |
3489 | |
3495 | # my $AFTER = Event::time; |
|
|
3496 | # warn $AFTER - $NOW;#d# |
|
|
3497 | |
|
|
3498 | if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { |
3490 | if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { |
3499 | $sig->send; |
3491 | $sig->send; |
3500 | } |
3492 | } |
3501 | while (my $sig = shift @WAIT_FOR_TICK) { |
3493 | while (my $sig = shift @WAIT_FOR_TICK) { |
3502 | $sig->send; |
3494 | $sig->send; |
… | |
… | |
3512 | |
3504 | |
3513 | $LOAD = ($NOW - $tick_start) / $TICK; |
3505 | $LOAD = ($NOW - $tick_start) / $TICK; |
3514 | $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; |
3506 | $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; |
3515 | |
3507 | |
3516 | _post_tick; |
3508 | _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 | }, |
3509 | }, |
3522 | ); |
3510 | ); |
3523 | |
3511 | |
3524 | { |
3512 | { |
3525 | BDB::min_parallel 8; |
3513 | BDB::min_parallel 8; |
… | |
… | |
3548 | ) |
3536 | ) |
3549 | }; |
3537 | }; |
3550 | |
3538 | |
3551 | unless ($DB_ENV) { |
3539 | unless ($DB_ENV) { |
3552 | $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); |
3553 | |
3545 | |
3554 | cf::sync_job { |
3546 | cf::sync_job { |
3555 | eval { |
3547 | eval { |
3556 | BDB::db_env_open |
3548 | BDB::db_env_open |
3557 | $DB_ENV, |
3549 | $DB_ENV, |
… | |
… | |
3559 | 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 |
3560 | | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, |
3552 | | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, |
3561 | 0666; |
3553 | 0666; |
3562 | |
3554 | |
3563 | cf::cleanup "db_env_open($BDBDIR): $!" if $!; |
3555 | 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 | }; |
3556 | }; |
3569 | |
3557 | |
3570 | cf::cleanup "db_env_open(db): $@" if $@; |
3558 | cf::cleanup "db_env_open(db): $@" if $@; |
3571 | }; |
3559 | }; |
3572 | } |
3560 | } |
3573 | |
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 | ); |
3574 | $BDB_CHECKPOINT_WATCHER = Event->timer ( |
3572 | $BDB_CHECKPOINT_WATCHER = Event->timer ( |
3575 | after => 11, |
3573 | after => 11, |
3576 | interval => 60, |
3574 | interval => 60, |
3577 | hard => 1, |
3575 | hard => 1, |
3578 | prio => 0, |
3576 | prio => 0, |