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.363 by root, Mon Sep 10 17:24:36 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_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 87our $DB_ENV;
86 88
87our %CFG; 89our %CFG;
88 90
89our $UPTIME; $UPTIME ||= time; 91our $UPTIME; $UPTIME ||= time;
… …
187 $msg .= "\n" 189 $msg .= "\n"
188 unless $msg =~ /\n$/; 190 unless $msg =~ /\n$/;
189 191
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 193
192 utf8::encode $msg;
193 LOG llevError, $msg; 194 LOG llevError, $msg;
194 }; 195 };
195} 196}
196 197
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
285Return true if the lock is currently active, i.e. somebody has locked it. 286Return true if the lock is currently active, i.e. somebody has locked it.
286 287
287=cut 288=cut
288 289
289our %LOCK; 290our %LOCK;
291our %LOCKER;#d#
290 292
291sub lock_wait($) { 293sub lock_wait($) {
292 my ($key) = @_; 294 my ($key) = @_;
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
293 300
294 # wait for lock, if any 301 # wait for lock, if any
295 while ($LOCK{$key}) { 302 while ($LOCK{$key}) {
296 push @{ $LOCK{$key} }, $Coro::current; 303 push @{ $LOCK{$key} }, $Coro::current;
297 Coro::schedule; 304 Coro::schedule;
… …
303 310
304 # wait, to be sure we are not locked 311 # wait, to be sure we are not locked
305 lock_wait $key; 312 lock_wait $key;
306 313
307 $LOCK{$key} = []; 314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
308 316
309 Coro::guard { 317 Coro::guard {
318 delete $LOCKER{$key};#d#
310 # wake up all waiters, to be on the safe side 319 # wake up all waiters, to be on the safe side
311 $_->ready for @{ delete $LOCK{$key} }; 320 $_->ready for @{ delete $LOCK{$key} };
312 } 321 }
313} 322}
314 323
… …
500=item cf::db_put $family => $key => $value 509=item cf::db_put $family => $key => $value
501 510
502Stores the given C<$value> in the family. It can currently store binary 511Stores 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). 512data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504 513
514=item $db = cf::db_table "name"
515
516Create and/or open a new database table. The string must not be "db" and must be unique
517within each server.
518
505=cut 519=cut
520
521sub db_table($) {
522 my ($name) = @_;
523 my $db = BDB::db_create $DB_ENV;
524
525 eval {
526 $db->set_flags (BDB::CHKSUM);
527
528 utf8::encode $name;
529 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
530 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
531 cf::cleanup "db_open(db): $!" if $!;
532 };
533 cf::cleanup "db_open(db): $@" if $@;
534
535 $db
536}
506 537
507our $DB; 538our $DB;
508 539
509sub db_init { 540sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job { 541 cf::sync_job {
514 eval { 542 $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 } 543 };
524} 544}
525 545
526sub db_get($$) { 546sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 547 my $key = "$_[0]/$_[1]";
528 548
… …
1009 1029
1010 my $guard = cf::lock_acquire "io"; 1030 my $guard = cf::lock_acquire "io";
1011 1031
1012 sync_job { 1032 sync_job {
1013 if (length $$rdata) { 1033 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename);
1014 warn sprintf "saving %s (%d,%d)\n", 1035 warn sprintf "saving %s (%d,%d)\n",
1015 $filename, length $$rdata, scalar @$objs; 1036 $decname, length $$rdata, scalar @$objs;
1016 1037
1017 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1038 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1018 chmod SAVE_MODE, $fh; 1039 chmod SAVE_MODE, $fh;
1019 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1040 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1020 aio_fsync $fh if $cf::USE_FSYNC; 1041 aio_fsync $fh if $cf::USE_FSYNC;
… …
1070 1091
1071 undef $guard; 1092 undef $guard;
1072 $av = eval { (Storable::thaw $av)->{objs} }; 1093 $av = eval { (Storable::thaw $av)->{objs} };
1073 } 1094 }
1074 1095
1096 utf8::decode (my $decname = $filename);
1075 warn sprintf "loading %s (%d)\n", 1097 warn sprintf "loading %s (%d,%d)\n",
1076 $filename, length $data, scalar @{$av || []}; 1098 $decname, length $data, scalar @{$av || []};
1077 1099
1078 ($data, $av) 1100 ($data, $av)
1079} 1101}
1080 1102
1081=head2 COMMAND CALLBACKS 1103=head2 COMMAND CALLBACKS
… …
1268use Coro::AIO; 1290use Coro::AIO;
1269 1291
1270=head3 cf::player 1292=head3 cf::player
1271 1293
1272=over 4 1294=over 4
1295
1296=item cf::player::num_playing
1297
1298Returns the official number of playing players, as per the Crossfire metaserver rules.
1299
1300=cut
1301
1302sub num_playing {
1303 scalar grep
1304 $_->ob->map
1305 && !$_->hidden
1306 && !$_->ob->flag (cf::FLAG_WIZ),
1307 cf::player::list
1308}
1273 1309
1274=item cf::player::find $login 1310=item cf::player::find $login
1275 1311
1276Returns the given player object, loading it if necessary (might block). 1312Returns the given player object, loading it if necessary (might block).
1277 1313
… …
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
… …
3483 3526
3484 }, 3527 },
3485); 3528);
3486 3529
3487{ 3530{
3531 BDB::min_parallel 8;
3488 BDB::max_poll_time $TICK * 0.1; 3532 BDB::max_poll_time $TICK * 0.1;
3489 $BDB_POLL_WATCHER = Event->io ( 3533 $BDB_POLL_WATCHER = Event->io (
3490 reentrant => 0, 3534 reentrant => 0,
3491 fd => BDB::poll_fileno, 3535 fd => BDB::poll_fileno,
3492 poll => 'r', 3536 poll => 'r',
3493 prio => 0, 3537 prio => 0,
3494 data => WF_AUTOCANCEL, 3538 data => WF_AUTOCANCEL,
3495 cb => \&BDB::poll_cb, 3539 cb => \&BDB::poll_cb,
3496 ); 3540 );
3497 BDB::min_parallel 8;
3498 3541
3499 BDB::set_sync_prepare { 3542 BDB::set_sync_prepare {
3500 my $status; 3543 my $status;
3501 my $current = $Coro::current; 3544 my $current = $Coro::current;
3502 ( 3545 (
… …
3523 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3566 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3524 0666; 3567 0666;
3525 3568
3526 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3569 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3527 3570
3528 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3571 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3572 | BDB::LOG_AUTOREMOVE, 1);
3529 $DB_ENV->set_lk_detect; 3573 $DB_ENV->set_lk_detect;
3530 }; 3574 };
3531 3575
3532 cf::cleanup "db_env_open(db): $@" if $@; 3576 cf::cleanup "db_env_open(db): $@" if $@;
3533 }; 3577 };
3534 } 3578 }
3579
3580 $BDB_CHECKPOINT_WATCHER = Event->timer (
3581 after => 11,
3582 interval => 60,
3583 hard => 1,
3584 prio => 0,
3585 data => WF_AUTOCANCEL,
3586 cb => sub {
3587 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3588 },
3589 );
3590 $BDB_TRICKLE_WATCHER = Event->timer (
3591 after => 5,
3592 interval => 10,
3593 hard => 1,
3594 prio => 0,
3595 data => WF_AUTOCANCEL,
3596 cb => sub {
3597 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3598 },
3599 );
3535} 3600}
3536 3601
3537{ 3602{
3538 IO::AIO::min_parallel 8; 3603 IO::AIO::min_parallel 8;
3539 3604

Diff Legend

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