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.356 by root, Tue Sep 4 05:43:21 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';
… …
285Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
286 288
287=cut 289=cut
288 290
289our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
290 293
291sub lock_wait($) { 294sub lock_wait($) {
292 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
293 301
294 # wait for lock, if any 302 # wait for lock, if any
295 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
296 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
297 Coro::schedule; 305 Coro::schedule;
… …
303 311
304 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
305 lock_wait $key; 313 lock_wait $key;
306 314
307 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
308 317
309 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
310 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
311 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
312 } 322 }
313} 323}
314 324
… …
500=item cf::db_put $family => $key => $value 510=item cf::db_put $family => $key => $value
501 511
502Stores 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
503data 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).
504 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
505=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}
506 538
507our $DB; 539our $DB;
508 540
509sub db_init { 541sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job { 542 cf::sync_job {
514 eval { 543 $DB ||= db_table "db";
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
523 } 544 };
524} 545}
525 546
526sub db_get($$) { 547sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 548 my $key = "$_[0]/$_[1]";
528 549
… …
1005); 1026);
1006 1027
1007sub object_freezer_save { 1028sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1029 my ($filename, $rdata, $objs) = @_;
1009 1030
1010 my $guard = cf::lock_acquire "io";
1011
1012 sync_job { 1031 sync_job {
1013 if (length $$rdata) { 1032 if (length $$rdata) {
1033 utf8::decode (my $decname = $filename);
1014 warn sprintf "saving %s (%d,%d)\n", 1034 warn sprintf "saving %s (%d,%d)\n",
1015 $filename, length $$rdata, scalar @$objs; 1035 $decname, length $$rdata, scalar @$objs;
1016 1036
1017 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1037 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1018 chmod SAVE_MODE, $fh; 1038 chmod SAVE_MODE, $fh;
1019 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1039 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1020 aio_fsync $fh if $cf::USE_FSYNC; 1040 aio_fsync $fh if $cf::USE_FSYNC;
… …
1040 } else { 1060 } else {
1041 aio_unlink $filename; 1061 aio_unlink $filename;
1042 aio_unlink "$filename.pst"; 1062 aio_unlink "$filename.pst";
1043 } 1063 }
1044 }; 1064 };
1045
1046 undef $guard;
1047} 1065}
1048 1066
1049sub object_freezer_as_string { 1067sub object_freezer_as_string {
1050 my ($rdata, $objs) = @_; 1068 my ($rdata, $objs) = @_;
1051 1069
… …
1056 1074
1057sub object_thawer_load { 1075sub object_thawer_load {
1058 my ($filename) = @_; 1076 my ($filename) = @_;
1059 1077
1060 my ($data, $av); 1078 my ($data, $av);
1061
1062 my $guard = cf::lock_acquire "io";
1063 1079
1064 (aio_load $filename, $data) >= 0 1080 (aio_load $filename, $data) >= 0
1065 or return; 1081 or return;
1066 1082
1067 unless (aio_stat "$filename.pst") { 1083 unless (aio_stat "$filename.pst") {
1068 (aio_load "$filename.pst", $av) >= 0 1084 (aio_load "$filename.pst", $av) >= 0
1069 or return; 1085 or return;
1070 1086
1071 undef $guard;
1072 $av = eval { (Storable::thaw $av)->{objs} }; 1087 $av = eval { (Storable::thaw $av)->{objs} };
1073 } 1088 }
1074 1089
1090 utf8::decode (my $decname = $filename);
1075 warn sprintf "loading %s (%d)\n", 1091 warn sprintf "loading %s (%d,%d)\n",
1076 $filename, length $data, scalar @{$av || []}; 1092 $decname, length $data, scalar @{$av || []};
1077 1093
1078 ($data, $av) 1094 ($data, $av)
1079} 1095}
1080 1096
1081=head2 COMMAND CALLBACKS 1097=head2 COMMAND CALLBACKS
… …
1269 1285
1270=head3 cf::player 1286=head3 cf::player
1271 1287
1272=over 4 1288=over 4
1273 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
1274=item cf::player::find $login 1304=item cf::player::find $login
1275 1305
1276Returns the given player object, loading it if necessary (might block). 1306Returns the given player object, loading it if necessary (might block).
1277 1307
1278=cut 1308=cut
… …
1316 aio_unlink +(playerdir $login) . "/$login.pl"; 1346 aio_unlink +(playerdir $login) . "/$login.pl";
1317 1347
1318 my $f = new_from_file cf::object::thawer path $login 1348 my $f = new_from_file cf::object::thawer path $login
1319 or return; 1349 or return;
1320 1350
1321 $f->next;
1322 my $pl = cf::player::load_pl $f 1351 my $pl = cf::player::load_pl $f
1323 or return; 1352 or return;
1324 local $cf::PLAYER_LOADING{$login} = $pl; 1353 local $cf::PLAYER_LOADING{$login} = $pl;
1325 $f->resolve_delayed_derefs; 1354 $f->resolve_delayed_derefs;
1326 $cf::PLAYER{$login} = $pl 1355 $cf::PLAYER{$login} = $pl
… …
1841sub find { 1870sub find {
1842 my ($path, $origin) = @_; 1871 my ($path, $origin) = @_;
1843 1872
1844 $path = normalise $path, $origin && $origin->path; 1873 $path = normalise $path, $origin && $origin->path;
1845 1874
1875 cf::lock_wait "map_data:$path";#d#remove
1846 cf::lock_wait "map_find:$path"; 1876 cf::lock_wait "map_find:$path";
1847 1877
1848 $cf::MAP{$path} || do { 1878 $cf::MAP{$path} || do {
1849 my $guard = cf::lock_acquire "map_find:$path"; 1879 my $guard1 = cf::lock_acquire "map_find:$path";
1880 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1881
1850 my $map = new_from_path cf::map $path 1882 my $map = new_from_path cf::map $path
1851 or return; 1883 or return;
1852 1884
1853 $map->{last_save} = $cf::RUNTIME; 1885 $map->{last_save} = $cf::RUNTIME;
1854 1886
… …
1856 or return; 1888 or return;
1857 1889
1858 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1890 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1859 # doing this can freeze the server in a sync job, obviously 1891 # doing this can freeze the server in a sync job, obviously
1860 #$cf::WAIT_FOR_TICK->wait; 1892 #$cf::WAIT_FOR_TICK->wait;
1893 undef $guard1;
1894 undef $guard2;
1861 $map->reset; 1895 $map->reset;
1862 undef $guard;
1863 return find $path; 1896 return find $path;
1864 } 1897 }
1865 1898
1866 $cf::MAP{$path} = $map 1899 $cf::MAP{$path} = $map
1867 } 1900 }
… …
1876 local $self->{deny_reset} = 1; # loading can take a long time 1909 local $self->{deny_reset} = 1; # loading can take a long time
1877 1910
1878 my $path = $self->{path}; 1911 my $path = $self->{path};
1879 1912
1880 { 1913 {
1881 my $guard1 = cf::lock_acquire "map_data:$path"; 1914 my $guard = cf::lock_acquire "map_data:$path";
1882 my $guard2 = cf::lock_acquire "map_load:$path";
1883 1915
1916 return unless $self->valid;
1884 return if $self->in_memory != cf::MAP_SWAPPED; 1917 return unless $self->in_memory == cf::MAP_SWAPPED;
1885 1918
1886 $self->in_memory (cf::MAP_LOADING); 1919 $self->in_memory (cf::MAP_LOADING);
1887 1920
1888 $self->alloc; 1921 $self->alloc;
1889 1922
… …
2061 2094
2062 return if $self->players; 2095 return if $self->players;
2063 return if $self->in_memory != cf::MAP_IN_MEMORY; 2096 return if $self->in_memory != cf::MAP_IN_MEMORY;
2064 return if $self->{deny_save}; 2097 return if $self->{deny_save};
2065 2098
2099 $self->in_memory (cf::MAP_SWAPPED);
2100
2101 $self->deactivate;
2102 $_->clear_links_to ($self) for values %cf::MAP;
2066 $self->clear; 2103 $self->clear;
2067 $self->in_memory (cf::MAP_SWAPPED);
2068} 2104}
2069 2105
2070sub reset_at { 2106sub reset_at {
2071 my ($self) = @_; 2107 my ($self) = @_;
2072 2108
… …
2104 if $uniq; 2140 if $uniq;
2105 } 2141 }
2106 2142
2107 delete $cf::MAP{$self->path}; 2143 delete $cf::MAP{$self->path};
2108 2144
2145 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP;
2109 $self->clear; 2147 $self->clear;
2110
2111 $_->clear_links_to ($self) for values %cf::MAP;
2112 2148
2113 $self->unlink_save; 2149 $self->unlink_save;
2114 $self->destroy; 2150 $self->destroy;
2115} 2151}
2116 2152
… …
2415 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2451 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2416 2452
2417 $self->enter_link; 2453 $self->enter_link;
2418 2454
2419 (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
2420 my $map = eval { 2475 my $map = eval {
2421 my $map = cf::map::find $path; 2476 my $map = defined $path ? cf::map::find $path : undef;
2422 2477
2423 if ($map) { 2478 if ($map) {
2424 $map = $map->customise_for ($self); 2479 $map = $map->customise_for ($self);
2425 $map = $check->($map) if $check && $map; 2480 $map = $check->($map) if $check && $map;
2426 } else { 2481 } else {
2427 $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);
2428 } 2483 }
2429 2484
2430 $map 2485 $map
2431 }; 2486 };
2432 2487
… …
3402 my $signal = new Coro::Signal; 3457 my $signal = new Coro::Signal;
3403 push @WAIT_FOR_TICK_BEGIN, $signal; 3458 push @WAIT_FOR_TICK_BEGIN, $signal;
3404 $signal->wait; 3459 $signal->wait;
3405} 3460}
3406 3461
3407 my $min = 1e6;#d#
3408 my $avg = 10;
3409$TICK_WATCHER = Event->timer ( 3462$TICK_WATCHER = Event->timer (
3410 reentrant => 0, 3463 reentrant => 0,
3411 parked => 1, 3464 parked => 1,
3412 prio => 0, 3465 prio => 0,
3413 at => $NEXT_TICK || $TICK, 3466 at => $NEXT_TICK || $TICK,
… …
3421 3474
3422 $NOW = $tick_start = Event::time; 3475 $NOW = $tick_start = Event::time;
3423 3476
3424 cf::server_tick; # one server iteration 3477 cf::server_tick; # one server iteration
3425 3478
3426 0 && sync_job {#d#
3427 for(1..10) {
3428 my $t = Event::time;
3429 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3430 or die;
3431
3432 $map->width (50);
3433 $map->height (50);
3434 $map->alloc;
3435 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3436 my $t = Event::time - $t;
3437
3438 #next unless $t < 0.0013;#d#
3439 if ($t < $min) {
3440 $min = $t;
3441 }
3442 $avg = $avg * 0.99 + $t * 0.01;
3443 }
3444 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3445 exit 0;
3446 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3447 };
3448
3449 $RUNTIME += $TICK; 3479 $RUNTIME += $TICK;
3450 $NEXT_TICK += $TICK; 3480 $NEXT_TICK += $TICK;
3451 3481
3452 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3482 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3453 $NEXT_RUNTIME_WRITE = $NOW + 10; 3483 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
3455 write_runtime 3485 write_runtime
3456 or warn "ERROR: unable to write runtime file: $!"; 3486 or warn "ERROR: unable to write runtime file: $!";
3457 }; 3487 };
3458 } 3488 }
3459 3489
3460# my $AFTER = Event::time;
3461# warn $AFTER - $NOW;#d#
3462
3463 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3490 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3464 $sig->send; 3491 $sig->send;
3465 } 3492 }
3466 while (my $sig = shift @WAIT_FOR_TICK) { 3493 while (my $sig = shift @WAIT_FOR_TICK) {
3467 $sig->send; 3494 $sig->send;
… …
3477 3504
3478 $LOAD = ($NOW - $tick_start) / $TICK; 3505 $LOAD = ($NOW - $tick_start) / $TICK;
3479 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3506 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3480 3507
3481 _post_tick; 3508 _post_tick;
3482
3483
3484 }, 3509 },
3485); 3510);
3486 3511
3487{ 3512{
3513 BDB::min_parallel 8;
3488 BDB::max_poll_time $TICK * 0.1; 3514 BDB::max_poll_time $TICK * 0.1;
3489 $BDB_POLL_WATCHER = Event->io ( 3515 $BDB_POLL_WATCHER = Event->io (
3490 reentrant => 0, 3516 reentrant => 0,
3491 fd => BDB::poll_fileno, 3517 fd => BDB::poll_fileno,
3492 poll => 'r', 3518 poll => 'r',
3493 prio => 0, 3519 prio => 0,
3494 data => WF_AUTOCANCEL, 3520 data => WF_AUTOCANCEL,
3495 cb => \&BDB::poll_cb, 3521 cb => \&BDB::poll_cb,
3496 ); 3522 );
3497 BDB::min_parallel 8;
3498 3523
3499 BDB::set_sync_prepare { 3524 BDB::set_sync_prepare {
3500 my $status; 3525 my $status;
3501 my $current = $Coro::current; 3526 my $current = $Coro::current;
3502 ( 3527 (
… …
3511 ) 3536 )
3512 }; 3537 };
3513 3538
3514 unless ($DB_ENV) { 3539 unless ($DB_ENV) {
3515 $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);
3516 3545
3517 cf::sync_job { 3546 cf::sync_job {
3518 eval { 3547 eval {
3519 BDB::db_env_open 3548 BDB::db_env_open
3520 $DB_ENV, 3549 $DB_ENV,
… …
3522 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
3523 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3552 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3524 0666; 3553 0666;
3525 3554
3526 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3555 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3527
3528 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3529 $DB_ENV->set_lk_detect;
3530 }; 3556 };
3531 3557
3532 cf::cleanup "db_env_open(db): $@" if $@; 3558 cf::cleanup "db_env_open(db): $@" if $@;
3533 }; 3559 };
3534 } 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 );
3535} 3592}
3536 3593
3537{ 3594{
3538 IO::AIO::min_parallel 8; 3595 IO::AIO::min_parallel 8;
3539 3596

Diff Legend

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