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.372 by root, Sat Sep 15 13:25:33 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
… …
1009 1030
1010 my $guard = cf::lock_acquire "io"; 1031 my $guard = cf::lock_acquire "io";
1011 1032
1012 sync_job { 1033 sync_job {
1013 if (length $$rdata) { 1034 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename);
1014 warn sprintf "saving %s (%d,%d)\n", 1036 warn sprintf "saving %s (%d,%d)\n",
1015 $filename, length $$rdata, scalar @$objs; 1037 $decname, length $$rdata, scalar @$objs;
1016 1038
1017 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1039 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1018 chmod SAVE_MODE, $fh; 1040 chmod SAVE_MODE, $fh;
1019 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1041 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1020 aio_fsync $fh if $cf::USE_FSYNC; 1042 aio_fsync $fh if $cf::USE_FSYNC;
… …
1070 1092
1071 undef $guard; 1093 undef $guard;
1072 $av = eval { (Storable::thaw $av)->{objs} }; 1094 $av = eval { (Storable::thaw $av)->{objs} };
1073 } 1095 }
1074 1096
1097 utf8::decode (my $decname = $filename);
1075 warn sprintf "loading %s (%d)\n", 1098 warn sprintf "loading %s (%d,%d)\n",
1076 $filename, length $data, scalar @{$av || []}; 1099 $decname, length $data, scalar @{$av || []};
1077 1100
1078 ($data, $av) 1101 ($data, $av)
1079} 1102}
1080 1103
1081=head2 COMMAND CALLBACKS 1104=head2 COMMAND CALLBACKS
… …
1269 1292
1270=head3 cf::player 1293=head3 cf::player
1271 1294
1272=over 4 1295=over 4
1273 1296
1297=item cf::player::num_playing
1298
1299Returns the official number of playing players, as per the Crossfire metaserver rules.
1300
1301=cut
1302
1303sub num_playing {
1304 scalar grep
1305 $_->ob->map
1306 && !$_->hidden
1307 && !$_->ob->flag (cf::FLAG_WIZ),
1308 cf::player::list
1309}
1310
1274=item cf::player::find $login 1311=item cf::player::find $login
1275 1312
1276Returns the given player object, loading it if necessary (might block). 1313Returns the given player object, loading it if necessary (might block).
1277 1314
1278=cut 1315=cut
… …
1316 aio_unlink +(playerdir $login) . "/$login.pl"; 1353 aio_unlink +(playerdir $login) . "/$login.pl";
1317 1354
1318 my $f = new_from_file cf::object::thawer path $login 1355 my $f = new_from_file cf::object::thawer path $login
1319 or return; 1356 or return;
1320 1357
1321 $f->next;
1322 my $pl = cf::player::load_pl $f 1358 my $pl = cf::player::load_pl $f
1323 or return; 1359 or return;
1324 local $cf::PLAYER_LOADING{$login} = $pl; 1360 local $cf::PLAYER_LOADING{$login} = $pl;
1325 $f->resolve_delayed_derefs; 1361 $f->resolve_delayed_derefs;
1326 $cf::PLAYER{$login} = $pl 1362 $cf::PLAYER{$login} = $pl
… …
1841sub find { 1877sub find {
1842 my ($path, $origin) = @_; 1878 my ($path, $origin) = @_;
1843 1879
1844 $path = normalise $path, $origin && $origin->path; 1880 $path = normalise $path, $origin && $origin->path;
1845 1881
1882 cf::lock_wait "map_data:$path";#d#remove
1846 cf::lock_wait "map_find:$path"; 1883 cf::lock_wait "map_find:$path";
1847 1884
1848 $cf::MAP{$path} || do { 1885 $cf::MAP{$path} || do {
1849 my $guard = cf::lock_acquire "map_find:$path"; 1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1850 my $map = new_from_path cf::map $path 1889 my $map = new_from_path cf::map $path
1851 or return; 1890 or return;
1852 1891
1853 $map->{last_save} = $cf::RUNTIME; 1892 $map->{last_save} = $cf::RUNTIME;
1854 1893
… …
1856 or return; 1895 or return;
1857 1896
1858 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1859 # doing this can freeze the server in a sync job, obviously 1898 # doing this can freeze the server in a sync job, obviously
1860 #$cf::WAIT_FOR_TICK->wait; 1899 #$cf::WAIT_FOR_TICK->wait;
1900 undef $guard1;
1901 undef $guard2;
1861 $map->reset; 1902 $map->reset;
1862 undef $guard;
1863 return find $path; 1903 return find $path;
1864 } 1904 }
1865 1905
1866 $cf::MAP{$path} = $map 1906 $cf::MAP{$path} = $map
1867 } 1907 }
… …
1876 local $self->{deny_reset} = 1; # loading can take a long time 1916 local $self->{deny_reset} = 1; # loading can take a long time
1877 1917
1878 my $path = $self->{path}; 1918 my $path = $self->{path};
1879 1919
1880 { 1920 {
1881 my $guard1 = cf::lock_acquire "map_data:$path"; 1921 my $guard = cf::lock_acquire "map_data:$path";
1882 my $guard2 = cf::lock_acquire "map_load:$path";
1883 1922
1923 return unless $self->valid;
1884 return if $self->in_memory != cf::MAP_SWAPPED; 1924 return unless $self->in_memory == cf::MAP_SWAPPED;
1885 1925
1886 $self->in_memory (cf::MAP_LOADING); 1926 $self->in_memory (cf::MAP_LOADING);
1887 1927
1888 $self->alloc; 1928 $self->alloc;
1889 1929
… …
2061 2101
2062 return if $self->players; 2102 return if $self->players;
2063 return if $self->in_memory != cf::MAP_IN_MEMORY; 2103 return if $self->in_memory != cf::MAP_IN_MEMORY;
2064 return if $self->{deny_save}; 2104 return if $self->{deny_save};
2065 2105
2106 $self->in_memory (cf::MAP_SWAPPED);
2107
2108 $self->deactivate;
2109 $_->clear_links_to ($self) for values %cf::MAP;
2066 $self->clear; 2110 $self->clear;
2067 $self->in_memory (cf::MAP_SWAPPED);
2068} 2111}
2069 2112
2070sub reset_at { 2113sub reset_at {
2071 my ($self) = @_; 2114 my ($self) = @_;
2072 2115
… …
2104 if $uniq; 2147 if $uniq;
2105 } 2148 }
2106 2149
2107 delete $cf::MAP{$self->path}; 2150 delete $cf::MAP{$self->path};
2108 2151
2152 $self->deactivate;
2153 $_->clear_links_to ($self) for values %cf::MAP;
2109 $self->clear; 2154 $self->clear;
2110
2111 $_->clear_links_to ($self) for values %cf::MAP;
2112 2155
2113 $self->unlink_save; 2156 $self->unlink_save;
2114 $self->destroy; 2157 $self->destroy;
2115} 2158}
2116 2159
… …
2415 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2416 2459
2417 $self->enter_link; 2460 $self->enter_link;
2418 2461
2419 (async { 2462 (async {
2463 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs];
2467
2468 # see if we actually can go there
2469 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2470 $ob = $obs[rand @obs];
2471 } else {
2472 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2473 }
2474 # else put us there anyways for now #d#
2475
2476 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2477 } else {
2478 ($path, $x, $y) = (undef, undef, undef);
2479 }
2480 }
2481
2420 my $map = eval { 2482 my $map = eval {
2421 my $map = cf::map::find $path; 2483 my $map = defined $path ? cf::map::find $path : undef;
2422 2484
2423 if ($map) { 2485 if ($map) {
2424 $map = $map->customise_for ($self); 2486 $map = $map->customise_for ($self);
2425 $map = $check->($map) if $check && $map; 2487 $map = $check->($map) if $check && $map;
2426 } else { 2488 } else {
2427 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2489 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2428 } 2490 }
2429 2491
2430 $map 2492 $map
2431 }; 2493 };
2432 2494
… …
3402 my $signal = new Coro::Signal; 3464 my $signal = new Coro::Signal;
3403 push @WAIT_FOR_TICK_BEGIN, $signal; 3465 push @WAIT_FOR_TICK_BEGIN, $signal;
3404 $signal->wait; 3466 $signal->wait;
3405} 3467}
3406 3468
3407 my $min = 1e6;#d#
3408 my $avg = 10;
3409$TICK_WATCHER = Event->timer ( 3469$TICK_WATCHER = Event->timer (
3410 reentrant => 0, 3470 reentrant => 0,
3411 parked => 1, 3471 parked => 1,
3412 prio => 0, 3472 prio => 0,
3413 at => $NEXT_TICK || $TICK, 3473 at => $NEXT_TICK || $TICK,
… …
3421 3481
3422 $NOW = $tick_start = Event::time; 3482 $NOW = $tick_start = Event::time;
3423 3483
3424 cf::server_tick; # one server iteration 3484 cf::server_tick; # one server iteration
3425 3485
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; 3486 $RUNTIME += $TICK;
3450 $NEXT_TICK += $TICK; 3487 $NEXT_TICK += $TICK;
3451 3488
3452 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3489 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3453 $NEXT_RUNTIME_WRITE = $NOW + 10; 3490 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
3455 write_runtime 3492 write_runtime
3456 or warn "ERROR: unable to write runtime file: $!"; 3493 or warn "ERROR: unable to write runtime file: $!";
3457 }; 3494 };
3458 } 3495 }
3459 3496
3460# my $AFTER = Event::time;
3461# warn $AFTER - $NOW;#d#
3462
3463 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3497 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3464 $sig->send; 3498 $sig->send;
3465 } 3499 }
3466 while (my $sig = shift @WAIT_FOR_TICK) { 3500 while (my $sig = shift @WAIT_FOR_TICK) {
3467 $sig->send; 3501 $sig->send;
… …
3477 3511
3478 $LOAD = ($NOW - $tick_start) / $TICK; 3512 $LOAD = ($NOW - $tick_start) / $TICK;
3479 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3513 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3480 3514
3481 _post_tick; 3515 _post_tick;
3482
3483
3484 }, 3516 },
3485); 3517);
3486 3518
3487{ 3519{
3520 BDB::min_parallel 8;
3488 BDB::max_poll_time $TICK * 0.1; 3521 BDB::max_poll_time $TICK * 0.1;
3489 $BDB_POLL_WATCHER = Event->io ( 3522 $BDB_POLL_WATCHER = Event->io (
3490 reentrant => 0, 3523 reentrant => 0,
3491 fd => BDB::poll_fileno, 3524 fd => BDB::poll_fileno,
3492 poll => 'r', 3525 poll => 'r',
3493 prio => 0, 3526 prio => 0,
3494 data => WF_AUTOCANCEL, 3527 data => WF_AUTOCANCEL,
3495 cb => \&BDB::poll_cb, 3528 cb => \&BDB::poll_cb,
3496 ); 3529 );
3497 BDB::min_parallel 8;
3498 3530
3499 BDB::set_sync_prepare { 3531 BDB::set_sync_prepare {
3500 my $status; 3532 my $status;
3501 my $current = $Coro::current; 3533 my $current = $Coro::current;
3502 ( 3534 (
… …
3511 ) 3543 )
3512 }; 3544 };
3513 3545
3514 unless ($DB_ENV) { 3546 unless ($DB_ENV) {
3515 $DB_ENV = BDB::db_env_create; 3547 $DB_ENV = BDB::db_env_create;
3548 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3549 | BDB::LOG_AUTOREMOVE, 1);
3550 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3551 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3516 3552
3517 cf::sync_job { 3553 cf::sync_job {
3518 eval { 3554 eval {
3519 BDB::db_env_open 3555 BDB::db_env_open
3520 $DB_ENV, 3556 $DB_ENV,
… …
3522 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3558 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3523 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3559 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3524 0666; 3560 0666;
3525 3561
3526 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3562 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 }; 3563 };
3531 3564
3532 cf::cleanup "db_env_open(db): $@" if $@; 3565 cf::cleanup "db_env_open(db): $@" if $@;
3533 }; 3566 };
3534 } 3567 }
3568
3569 $BDB_DEADLOCK_WATCHER = Event->timer (
3570 after => 3,
3571 interval => 1,
3572 hard => 1,
3573 prio => 0,
3574 data => WF_AUTOCANCEL,
3575 cb => sub {
3576 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3577 },
3578 );
3579 $BDB_CHECKPOINT_WATCHER = Event->timer (
3580 after => 11,
3581 interval => 60,
3582 hard => 1,
3583 prio => 0,
3584 data => WF_AUTOCANCEL,
3585 cb => sub {
3586 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3587 },
3588 );
3589 $BDB_TRICKLE_WATCHER = Event->timer (
3590 after => 5,
3591 interval => 10,
3592 hard => 1,
3593 prio => 0,
3594 data => WF_AUTOCANCEL,
3595 cb => sub {
3596 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3597 },
3598 );
3535} 3599}
3536 3600
3537{ 3601{
3538 IO::AIO::min_parallel 8; 3602 IO::AIO::min_parallel 8;
3539 3603

Diff Legend

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