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.358 by root, Fri Sep 7 18:10:52 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;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 88our $DB_ENV;
86 89
87our %CFG; 90our %CFG;
88 91
89our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
… …
187 $msg .= "\n" 190 $msg .= "\n"
188 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
189 192
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 194
192 utf8::encode $msg;
193 LOG llevError, $msg; 195 LOG llevError, $msg;
194 }; 196 };
195} 197}
196 198
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
508=item cf::db_put $family => $key => $value 510=item cf::db_put $family => $key => $value
509 511
510Stores the given C<$value> in the family. It can currently store binary 512Stores the given C<$value> in the family. It can currently store binary
511data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 513data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
512 514
515=item $db = cf::db_table "name"
516
517Create and/or open a new database table. The string must not be "db" and must be unique
518within each server.
519
513=cut 520=cut
521
522sub db_table($) {
523 my ($name) = @_;
524 my $db = BDB::db_create $DB_ENV;
525
526 eval {
527 $db->set_flags (BDB::CHKSUM);
528
529 utf8::encode $name;
530 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
531 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
532 cf::cleanup "db_open(db): $!" if $!;
533 };
534 cf::cleanup "db_open(db): $@" if $@;
535
536 $db
537}
514 538
515our $DB; 539our $DB;
516 540
517sub db_init { 541sub db_init {
518 unless ($DB) {
519 $DB = BDB::db_create $DB_ENV;
520
521 cf::sync_job { 542 cf::sync_job {
522 eval { 543 $DB ||= db_table "db";
523 $DB->set_flags (BDB::CHKSUM);
524
525 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
526 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
527 cf::cleanup "db_open(db): $!" if $!;
528 };
529 cf::cleanup "db_open(db): $@" if $@;
530 };
531 } 544 };
532} 545}
533 546
534sub db_get($$) { 547sub db_get($$) {
535 my $key = "$_[0]/$_[1]"; 548 my $key = "$_[0]/$_[1]";
536 549
… …
1013); 1026);
1014 1027
1015sub object_freezer_save { 1028sub object_freezer_save {
1016 my ($filename, $rdata, $objs) = @_; 1029 my ($filename, $rdata, $objs) = @_;
1017 1030
1018 my $guard = cf::lock_acquire "io";
1019
1020 sync_job { 1031 sync_job {
1021 if (length $$rdata) { 1032 if (length $$rdata) {
1033 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1034 warn sprintf "saving %s (%d,%d)\n",
1023 $filename, length $$rdata, scalar @$objs; 1035 $decname, length $$rdata, scalar @$objs;
1024 1036
1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1037 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1026 chmod SAVE_MODE, $fh; 1038 chmod SAVE_MODE, $fh;
1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1039 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1040 aio_fsync $fh if $cf::USE_FSYNC;
… …
1048 } else { 1060 } else {
1049 aio_unlink $filename; 1061 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1062 aio_unlink "$filename.pst";
1051 } 1063 }
1052 }; 1064 };
1053
1054 undef $guard;
1055} 1065}
1056 1066
1057sub object_freezer_as_string { 1067sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1068 my ($rdata, $objs) = @_;
1059 1069
… …
1064 1074
1065sub object_thawer_load { 1075sub object_thawer_load {
1066 my ($filename) = @_; 1076 my ($filename) = @_;
1067 1077
1068 my ($data, $av); 1078 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1079
1072 (aio_load $filename, $data) >= 0 1080 (aio_load $filename, $data) >= 0
1073 or return; 1081 or return;
1074 1082
1075 unless (aio_stat "$filename.pst") { 1083 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1084 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1085 or return;
1078 1086
1079 undef $guard;
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1087 $av = eval { (Storable::thaw $av)->{objs} };
1081 } 1088 }
1082 1089
1090 utf8::decode (my $decname = $filename);
1083 warn sprintf "loading %s (%d)\n", 1091 warn sprintf "loading %s (%d,%d)\n",
1084 $filename, length $data, scalar @{$av || []}; 1092 $decname, length $data, scalar @{$av || []};
1085 1093
1086 ($data, $av) 1094 ($data, $av)
1087} 1095}
1088 1096
1089=head2 COMMAND CALLBACKS 1097=head2 COMMAND CALLBACKS
… …
1277 1285
1278=head3 cf::player 1286=head3 cf::player
1279 1287
1280=over 4 1288=over 4
1281 1289
1290=item cf::player::num_playing
1291
1292Returns the official number of playing players, as per the Crossfire metaserver rules.
1293
1294=cut
1295
1296sub num_playing {
1297 scalar grep
1298 $_->ob->map
1299 && !$_->hidden
1300 && !$_->ob->flag (cf::FLAG_WIZ),
1301 cf::player::list
1302}
1303
1282=item cf::player::find $login 1304=item cf::player::find $login
1283 1305
1284Returns the given player object, loading it if necessary (might block). 1306Returns the given player object, loading it if necessary (might block).
1285 1307
1286=cut 1308=cut
… …
1324 aio_unlink +(playerdir $login) . "/$login.pl"; 1346 aio_unlink +(playerdir $login) . "/$login.pl";
1325 1347
1326 my $f = new_from_file cf::object::thawer path $login 1348 my $f = new_from_file cf::object::thawer path $login
1327 or return; 1349 or return;
1328 1350
1329 $f->next;
1330 my $pl = cf::player::load_pl $f 1351 my $pl = cf::player::load_pl $f
1331 or return; 1352 or return;
1332 local $cf::PLAYER_LOADING{$login} = $pl; 1353 local $cf::PLAYER_LOADING{$login} = $pl;
1333 $f->resolve_delayed_derefs; 1354 $f->resolve_delayed_derefs;
1334 $cf::PLAYER{$login} = $pl 1355 $cf::PLAYER{$login} = $pl
… …
1891 1912
1892 { 1913 {
1893 my $guard = cf::lock_acquire "map_data:$path"; 1914 my $guard = cf::lock_acquire "map_data:$path";
1894 1915
1895 return unless $self->valid; 1916 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 1917 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 1918
1898 $self->in_memory (cf::MAP_LOADING); 1919 $self->in_memory (cf::MAP_LOADING);
1899 1920
1900 $self->alloc; 1921 $self->alloc;
1901 1922
… …
2073 2094
2074 return if $self->players; 2095 return if $self->players;
2075 return if $self->in_memory != cf::MAP_IN_MEMORY; 2096 return if $self->in_memory != cf::MAP_IN_MEMORY;
2076 return if $self->{deny_save}; 2097 return if $self->{deny_save};
2077 2098
2099 $self->in_memory (cf::MAP_SWAPPED);
2100
2078 $self->deactivate; 2101 $self->deactivate;
2102 $_->clear_links_to ($self) for values %cf::MAP;
2079 $self->clear; 2103 $self->clear;
2080 $self->in_memory (cf::MAP_SWAPPED);
2081} 2104}
2082 2105
2083sub reset_at { 2106sub reset_at {
2084 my ($self) = @_; 2107 my ($self) = @_;
2085 2108
… …
2118 } 2141 }
2119 2142
2120 delete $cf::MAP{$self->path}; 2143 delete $cf::MAP{$self->path};
2121 2144
2122 $self->deactivate; 2145 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP;
2123 $self->clear; 2147 $self->clear;
2124
2125 $_->clear_links_to ($self) for values %cf::MAP;
2126 2148
2127 $self->unlink_save; 2149 $self->unlink_save;
2128 $self->destroy; 2150 $self->destroy;
2129} 2151}
2130 2152
… …
2429 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2451 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2430 2452
2431 $self->enter_link; 2453 $self->enter_link;
2432 2454
2433 (async { 2455 (async {
2456 # *tag paths override both path and x|y
2457 if ($path =~ /^\*(.*)$/) {
2458 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2459 my $ob = $obs[rand @obs];
2460
2461 # see if we actually can go there
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#
2468
2469 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2470 } else {
2471 ($path, $x, $y) = (undef, undef, undef);
2472 }
2473 }
2474
2434 my $map = eval { 2475 my $map = eval {
2435 my $map = cf::map::find $path; 2476 my $map = defined $path ? cf::map::find $path : undef;
2436 2477
2437 if ($map) { 2478 if ($map) {
2438 $map = $map->customise_for ($self); 2479 $map = $map->customise_for ($self);
2439 $map = $check->($map) if $check && $map; 2480 $map = $check->($map) if $check && $map;
2440 } else { 2481 } else {
2441 $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);
2442 } 2483 }
2443 2484
2444 $map 2485 $map
2445 }; 2486 };
2446 2487
… …
3416 my $signal = new Coro::Signal; 3457 my $signal = new Coro::Signal;
3417 push @WAIT_FOR_TICK_BEGIN, $signal; 3458 push @WAIT_FOR_TICK_BEGIN, $signal;
3418 $signal->wait; 3459 $signal->wait;
3419} 3460}
3420 3461
3421 my $min = 1e6;#d#
3422 my $avg = 10;
3423$TICK_WATCHER = Event->timer ( 3462$TICK_WATCHER = Event->timer (
3424 reentrant => 0, 3463 reentrant => 0,
3425 parked => 1, 3464 parked => 1,
3426 prio => 0, 3465 prio => 0,
3427 at => $NEXT_TICK || $TICK, 3466 at => $NEXT_TICK || $TICK,
… …
3435 3474
3436 $NOW = $tick_start = Event::time; 3475 $NOW = $tick_start = Event::time;
3437 3476
3438 cf::server_tick; # one server iteration 3477 cf::server_tick; # one server iteration
3439 3478
3440 0 && sync_job {#d#
3441 for(1..10) {
3442 my $t = Event::time;
3443 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3444 or die;
3445
3446 $map->width (50);
3447 $map->height (50);
3448 $map->alloc;
3449 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3450 my $t = Event::time - $t;
3451
3452 #next unless $t < 0.0013;#d#
3453 if ($t < $min) {
3454 $min = $t;
3455 }
3456 $avg = $avg * 0.99 + $t * 0.01;
3457 }
3458 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3459 exit 0;
3460 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3461 };
3462
3463 $RUNTIME += $TICK; 3479 $RUNTIME += $TICK;
3464 $NEXT_TICK += $TICK; 3480 $NEXT_TICK += $TICK;
3465 3481
3466 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3482 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3467 $NEXT_RUNTIME_WRITE = $NOW + 10; 3483 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
3469 write_runtime 3485 write_runtime
3470 or warn "ERROR: unable to write runtime file: $!"; 3486 or warn "ERROR: unable to write runtime file: $!";
3471 }; 3487 };
3472 } 3488 }
3473 3489
3474# my $AFTER = Event::time;
3475# warn $AFTER - $NOW;#d#
3476
3477 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3490 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3478 $sig->send; 3491 $sig->send;
3479 } 3492 }
3480 while (my $sig = shift @WAIT_FOR_TICK) { 3493 while (my $sig = shift @WAIT_FOR_TICK) {
3481 $sig->send; 3494 $sig->send;
… …
3491 3504
3492 $LOAD = ($NOW - $tick_start) / $TICK; 3505 $LOAD = ($NOW - $tick_start) / $TICK;
3493 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3506 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3494 3507
3495 _post_tick; 3508 _post_tick;
3496
3497
3498 }, 3509 },
3499); 3510);
3500 3511
3501{ 3512{
3513 BDB::min_parallel 8;
3502 BDB::max_poll_time $TICK * 0.1; 3514 BDB::max_poll_time $TICK * 0.1;
3503 $BDB_POLL_WATCHER = Event->io ( 3515 $BDB_POLL_WATCHER = Event->io (
3504 reentrant => 0, 3516 reentrant => 0,
3505 fd => BDB::poll_fileno, 3517 fd => BDB::poll_fileno,
3506 poll => 'r', 3518 poll => 'r',
3507 prio => 0, 3519 prio => 0,
3508 data => WF_AUTOCANCEL, 3520 data => WF_AUTOCANCEL,
3509 cb => \&BDB::poll_cb, 3521 cb => \&BDB::poll_cb,
3510 ); 3522 );
3511 BDB::min_parallel 8;
3512 3523
3513 BDB::set_sync_prepare { 3524 BDB::set_sync_prepare {
3514 my $status; 3525 my $status;
3515 my $current = $Coro::current; 3526 my $current = $Coro::current;
3516 ( 3527 (
… …
3525 ) 3536 )
3526 }; 3537 };
3527 3538
3528 unless ($DB_ENV) { 3539 unless ($DB_ENV) {
3529 $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);
3530 3545
3531 cf::sync_job { 3546 cf::sync_job {
3532 eval { 3547 eval {
3533 BDB::db_env_open 3548 BDB::db_env_open
3534 $DB_ENV, 3549 $DB_ENV,
… …
3536 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
3537 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3552 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3538 0666; 3553 0666;
3539 3554
3540 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3555 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3541
3542 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3543 $DB_ENV->set_lk_detect;
3544 }; 3556 };
3545 3557
3546 cf::cleanup "db_env_open(db): $@" if $@; 3558 cf::cleanup "db_env_open(db): $@" if $@;
3547 }; 3559 };
3548 } 3560 }
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 );
3572 $BDB_CHECKPOINT_WATCHER = Event->timer (
3573 after => 11,
3574 interval => 60,
3575 hard => 1,
3576 prio => 0,
3577 data => WF_AUTOCANCEL,
3578 cb => sub {
3579 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3580 },
3581 );
3582 $BDB_TRICKLE_WATCHER = Event->timer (
3583 after => 5,
3584 interval => 10,
3585 hard => 1,
3586 prio => 0,
3587 data => WF_AUTOCANCEL,
3588 cb => sub {
3589 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3590 },
3591 );
3549} 3592}
3550 3593
3551{ 3594{
3552 IO::AIO::min_parallel 8; 3595 IO::AIO::min_parallel 8;
3553 3596

Diff Legend

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