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.338 by root, Tue Aug 21 01:07:47 2007 UTC vs.
Revision 1.372 by root, Sat Sep 15 13:25:33 2007 UTC

… …
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util (); 24use Coro::Util ();
25 25
26use JSON::XS 1.4 (); 26use JSON::XS ();
27use BDB (); 27use BDB ();
28use Data::Dumper; 28use Data::Dumper;
29use Digest::MD5; 29use Digest::MD5;
30use Fcntl; 30use Fcntl;
31use YAML::Syck (); 31use YAML::Syck ();
… …
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;
90our $RUNTIME; 93our $RUNTIME;
91 94
92our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
95 98
96# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 101
… …
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';
… …
272Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
275returned. 277returned.
276 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
277Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
279 284
280=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
281 286
282Return 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.
283 288
284=cut 289=cut
285 290
286our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
287 293
288sub lock_wait($) { 294sub lock_wait($) {
289 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#
290 301
291 # wait for lock, if any 302 # wait for lock, if any
292 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
293 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule; 305 Coro::schedule;
… …
300 311
301 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
302 lock_wait $key; 313 lock_wait $key;
303 314
304 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
305 317
306 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
307 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
309 } 322 }
310} 323}
311 324
… …
478sub fork_call(&@) { 491sub fork_call(&@) {
479 my ($cb, @args) = @_; 492 my ($cb, @args) = @_;
480 493
481 # we seemingly have to make a local copy of the whole thing, 494 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 495 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 496 # TODO: investigate and fix (likely this will be rather laborious)
484 497
485 my @res = Coro::Util::fork_eval { 498 my @res = Coro::Util::fork_eval {
486 reset_signals; 499 reset_signals;
487 &$cb 500 &$cb
488 }, @args; 501 }, @args;
… …
497=item cf::db_put $family => $key => $value 510=item cf::db_put $family => $key => $value
498 511
499Stores 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
500data 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).
501 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
502=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}
503 538
504our $DB; 539our $DB;
505 540
506sub db_init { 541sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 542 cf::sync_job {
511 eval { 543 $DB ||= db_table "db";
512 $DB->set_flags (BDB::CHKSUM);
513
514 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516 cf::cleanup "db_open(db): $!" if $!;
517 };
518 cf::cleanup "db_open(db): $@" if $@;
519 };
520 } 544 };
521} 545}
522 546
523sub db_get($$) { 547sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 548 my $key = "$_[0]/$_[1]";
525 549
… …
575 if (1) { 599 if (1) {
576 $md5 = 600 $md5 =
577 join "\x00", 601 join "\x00",
578 $processversion, 602 $processversion,
579 map { 603 map {
580 Coro::cede; 604 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 605 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 606 } 0.. $#$src;
583 607
584 608
585 my $dbmd5 = db_get cache => "$id/md5"; 609 my $dbmd5 = db_get cache => "$id/md5";
… …
1002); 1026);
1003 1027
1004sub object_freezer_save { 1028sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1029 my ($filename, $rdata, $objs) = @_;
1006 1030
1031 my $guard = cf::lock_acquire "io";
1032
1007 sync_job { 1033 sync_job {
1008 if (length $$rdata) { 1034 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1036 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1037 $decname, length $$rdata, scalar @$objs;
1011 1038
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1039 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1040 chmod SAVE_MODE, $fh;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1041 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1042 aio_fsync $fh if $cf::USE_FSYNC;
… …
1034 } 1061 }
1035 } else { 1062 } else {
1036 aio_unlink $filename; 1063 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1064 aio_unlink "$filename.pst";
1038 } 1065 }
1039 } 1066 };
1067
1068 undef $guard;
1040} 1069}
1041 1070
1042sub object_freezer_as_string { 1071sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1072 my ($rdata, $objs) = @_;
1044 1073
… …
1049 1078
1050sub object_thawer_load { 1079sub object_thawer_load {
1051 my ($filename) = @_; 1080 my ($filename) = @_;
1052 1081
1053 my ($data, $av); 1082 my ($data, $av);
1083
1084 my $guard = cf::lock_acquire "io";
1054 1085
1055 (aio_load $filename, $data) >= 0 1086 (aio_load $filename, $data) >= 0
1056 or return; 1087 or return;
1057 1088
1058 unless (aio_stat "$filename.pst") { 1089 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1090 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1091 or return;
1092
1093 undef $guard;
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1094 $av = eval { (Storable::thaw $av)->{objs} };
1062 } 1095 }
1063 1096
1097 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1098 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1099 $decname, length $data, scalar @{$av || []};
1100
1066 return ($data, $av); 1101 ($data, $av)
1067} 1102}
1068 1103
1069=head2 COMMAND CALLBACKS 1104=head2 COMMAND CALLBACKS
1070 1105
1071=over 4 1106=over 4
… …
1257 1292
1258=head3 cf::player 1293=head3 cf::player
1259 1294
1260=over 4 1295=over 4
1261 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
1262=item cf::player::find $login 1311=item cf::player::find $login
1263 1312
1264Returns the given player object, loading it if necessary (might block). 1313Returns the given player object, loading it if necessary (might block).
1265 1314
1266=cut 1315=cut
… …
1301 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1350 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1302 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1351 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1303 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1352 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1304 aio_unlink +(playerdir $login) . "/$login.pl"; 1353 aio_unlink +(playerdir $login) . "/$login.pl";
1305 1354
1306 my $pl = load_pl path $login 1355 my $f = new_from_file cf::object::thawer path $login
1307 or return; 1356 or return;
1357
1358 my $pl = cf::player::load_pl $f
1359 or return;
1360 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs;
1308 $cf::PLAYER{$login} = $pl 1362 $cf::PLAYER{$login} = $pl
1309 } 1363 }
1310 } 1364 }
1311} 1365}
1312 1366
… …
1322 1376
1323 aio_mkdir playerdir $pl, 0770; 1377 aio_mkdir playerdir $pl, 0770;
1324 $pl->{last_save} = $cf::RUNTIME; 1378 $pl->{last_save} = $cf::RUNTIME;
1325 1379
1326 $pl->save_pl ($path); 1380 $pl->save_pl ($path);
1327 Coro::cede; 1381 cf::cede_to_tick;
1328} 1382}
1329 1383
1330sub new($) { 1384sub new($) {
1331 my ($login) = @_; 1385 my ($login) = @_;
1332 1386
… …
1410 or return []; 1464 or return [];
1411 1465
1412 my @logins; 1466 my @logins;
1413 1467
1414 for my $login (@$dirs) { 1468 for my $login (@$dirs) {
1469 my $path = path $login;
1470
1471 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") {
1415 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1416 aio_read $fh, 0, 512, my $buf, 0 or next; 1474 aio_read $fh, 0, 512, my $buf, 0 or next;
1417 $buf !~ /^password -------------$/m or next; # official not-valid tag 1475 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 }
1418 1477
1419 utf8::decode $login; 1478 utf8::decode $login;
1420 push @logins, $login; 1479 push @logins, $login;
1421 } 1480 }
1422 1481
… …
1460sub expand_cfpod { 1519sub expand_cfpod {
1461 ((my $self), (local $_)) = @_; 1520 ((my $self), (local $_)) = @_;
1462 1521
1463 # escape & and < 1522 # escape & and <
1464 s/&/&amp;/g; 1523 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g; 1524 s/(?<![BIUGHT])</&lt;/g;
1466 1525
1467 # this is buggy, it needs to properly take care of nested <'s 1526 # this is buggy, it needs to properly take care of nested <'s
1468 1527
1469 1 while 1528 1 while
1470 # replace B<>, I<>, U<> etc. 1529 # replace B<>, I<>, U<> etc.
1471 s/B<([^\>]*)>/<b>$1<\/b>/ 1530 s/B<([^\>]*)>/<b>$1<\/b>/
1472 || s/I<([^\>]*)>/<i>$1<\/i>/ 1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1473 || s/U<([^\>]*)>/<u>$1<\/u>/ 1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1474 # replace G<male|female> tags 1534 # replace G<male|female> tags
1475 || s{G<([^>|]*)\|([^>]*)>}{ 1535 || s{G<([^>|]*)\|([^>]*)>}{
1476 $self->gender ? $2 : $1 1536 $self->gender ? $2 : $1
1477 }ge 1537 }ge
1478 # replace H<hint text> 1538 # replace H<hint text>
… …
1746 1806
1747sub load_header_from($) { 1807sub load_header_from($) {
1748 my ($self, $path) = @_; 1808 my ($self, $path) = @_;
1749 1809
1750 utf8::encode $path; 1810 utf8::encode $path;
1751 #aio_open $path, O_RDONLY, 0 1811 my $f = new_from_file cf::object::thawer $path
1752 # or return;
1753
1754 $self->_load_header ($path)
1755 or return; 1812 or return;
1813
1814 $self->_load_header ($f)
1815 or return;
1816
1817 local $MAP_LOADING{$self->{path}} = $self;
1818 $f->resolve_delayed_derefs;
1756 1819
1757 $self->{load_path} = $path; 1820 $self->{load_path} = $path;
1758 1821
1759 1 1822 1
1760} 1823}
… …
1814sub find { 1877sub find {
1815 my ($path, $origin) = @_; 1878 my ($path, $origin) = @_;
1816 1879
1817 $path = normalise $path, $origin && $origin->path; 1880 $path = normalise $path, $origin && $origin->path;
1818 1881
1882 cf::lock_wait "map_data:$path";#d#remove
1819 cf::lock_wait "map_find:$path"; 1883 cf::lock_wait "map_find:$path";
1820 1884
1821 $cf::MAP{$path} || do { 1885 $cf::MAP{$path} || do {
1822 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
1823 my $map = new_from_path cf::map $path 1889 my $map = new_from_path cf::map $path
1824 or return; 1890 or return;
1825 1891
1826 $map->{last_save} = $cf::RUNTIME; 1892 $map->{last_save} = $cf::RUNTIME;
1827 1893
… …
1829 or return; 1895 or return;
1830 1896
1831 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1832 # doing this can freeze the server in a sync job, obviously 1898 # doing this can freeze the server in a sync job, obviously
1833 #$cf::WAIT_FOR_TICK->wait; 1899 #$cf::WAIT_FOR_TICK->wait;
1900 undef $guard1;
1901 undef $guard2;
1834 $map->reset; 1902 $map->reset;
1835 undef $guard;
1836 return find $path; 1903 return find $path;
1837 } 1904 }
1838 1905
1839 $cf::MAP{$path} = $map 1906 $cf::MAP{$path} = $map
1840 } 1907 }
… …
1849 local $self->{deny_reset} = 1; # loading can take a long time 1916 local $self->{deny_reset} = 1; # loading can take a long time
1850 1917
1851 my $path = $self->{path}; 1918 my $path = $self->{path};
1852 1919
1853 { 1920 {
1854 my $guard = cf::lock_acquire "map_load:$path"; 1921 my $guard = cf::lock_acquire "map_data:$path";
1855 1922
1923 return unless $self->valid;
1856 return if $self->in_memory != cf::MAP_SWAPPED; 1924 return unless $self->in_memory == cf::MAP_SWAPPED;
1857 1925
1858 $self->in_memory (cf::MAP_LOADING); 1926 $self->in_memory (cf::MAP_LOADING);
1859 1927
1860 $self->alloc; 1928 $self->alloc;
1861 1929
1862 $self->pre_load; 1930 $self->pre_load;
1863 Coro::cede; 1931 cf::cede_to_tick;
1864 1932
1933 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block;
1865 $self->_load_objects ($self->{load_path}, 1) 1935 $self->_load_objects ($f)
1866 or return; 1936 or return;
1867 1937
1868 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1869 if delete $self->{load_original}; 1939 if delete $self->{load_original};
1870 1940
1871 if (my $uniq = $self->uniq_path) { 1941 if (my $uniq = $self->uniq_path) {
1872 utf8::encode $uniq; 1942 utf8::encode $uniq;
1873 if (aio_open $uniq, O_RDONLY, 0) { 1943 unless (aio_stat $uniq) {
1944 if (my $f = new_from_file cf::object::thawer $uniq) {
1874 $self->clear_unique_items; 1945 $self->clear_unique_items;
1875 $self->_load_objects ($uniq, 0); 1946 $self->_load_objects ($f);
1947 $f->resolve_delayed_derefs;
1948 }
1876 } 1949 }
1877 } 1950 }
1878 1951
1879 Coro::cede; 1952 $f->resolve_delayed_derefs;
1953
1954 cf::cede_to_tick;
1880 # now do the right thing for maps 1955 # now do the right thing for maps
1881 $self->link_multipart_objects; 1956 $self->link_multipart_objects;
1882 $self->difficulty ($self->estimate_difficulty) 1957 $self->difficulty ($self->estimate_difficulty)
1883 unless $self->difficulty; 1958 unless $self->difficulty;
1884 Coro::cede; 1959 cf::cede_to_tick;
1885 1960
1886 unless ($self->{deny_activate}) { 1961 unless ($self->{deny_activate}) {
1887 $self->decay_objects; 1962 $self->decay_objects;
1888 $self->fix_auto_apply; 1963 $self->fix_auto_apply;
1889 $self->update_buttons; 1964 $self->update_buttons;
1890 Coro::cede; 1965 cf::cede_to_tick;
1891 $self->set_darkness_map; 1966 $self->set_darkness_map;
1892 Coro::cede; 1967 cf::cede_to_tick;
1893 $self->activate; 1968 $self->activate;
1894 } 1969 }
1895 1970
1896 $self->{last_save} = $cf::RUNTIME; 1971 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME); 1972 $self->last_access ($cf::RUNTIME);
… …
1947} 2022}
1948 2023
1949sub do_load_sync { 2024sub do_load_sync {
1950 my ($map) = @_; 2025 my ($map) = @_;
1951 2026
2027 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2028 if $Coro::current == $Coro::main;
2029
1952 cf::sync_job { $map->load }; 2030 cf::sync_job { $map->load };
1953} 2031}
1954 2032
1955our %MAP_PREFETCH; 2033our %MAP_PREFETCH;
1956our $MAP_PREFETCHER = undef; 2034our $MAP_PREFETCHER = undef;
1957 2035
1958sub find_async { 2036sub find_async {
1959 my ($path, $origin) = @_; 2037 my ($path, $origin, $load) = @_;
1960 2038
1961 $path = normalise $path, $origin && $origin->{path}; 2039 $path = normalise $path, $origin && $origin->{path};
1962 2040
1963 if (my $map = $cf::MAP{$path}) { 2041 if (my $map = $cf::MAP{$path}) {
1964 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1965 } 2043 }
1966 2044
1967 undef $MAP_PREFETCH{$path}; 2045 $MAP_PREFETCH{$path} |= $load;
2046
1968 $MAP_PREFETCHER ||= cf::async { 2047 $MAP_PREFETCHER ||= cf::async {
1969 while (%MAP_PREFETCH) { 2048 while (%MAP_PREFETCH) {
1970 for my $path (keys %MAP_PREFETCH) { 2049 while (my ($k, $v) = each %MAP_PREFETCH) {
1971 if (my $map = find $path) { 2050 if (my $map = find $k) {
1972 $map->load; 2051 $map->load if $v;
1973 } 2052 }
1974 2053
1975 delete $MAP_PREFETCH{$path}; 2054 delete $MAP_PREFETCH{$k};
1976 } 2055 }
1977 } 2056 }
1978 undef $MAP_PREFETCHER; 2057 undef $MAP_PREFETCHER;
1979 }; 2058 };
1980 $MAP_PREFETCHER->prio (6); 2059 $MAP_PREFETCHER->prio (6);
… …
1983} 2062}
1984 2063
1985sub save { 2064sub save {
1986 my ($self) = @_; 2065 my ($self) = @_;
1987 2066
1988 my $lock = cf::lock_acquire "map_data:" . $self->path; 2067 my $lock = cf::lock_acquire "map_data:$self->{path}";
1989 2068
1990 $self->{last_save} = $cf::RUNTIME; 2069 $self->{last_save} = $cf::RUNTIME;
1991 2070
1992 return unless $self->dirty; 2071 return unless $self->dirty;
1993 2072
… …
2016 my ($self) = @_; 2095 my ($self) = @_;
2017 2096
2018 # save first because save cedes 2097 # save first because save cedes
2019 $self->save; 2098 $self->save;
2020 2099
2021 my $lock = cf::lock_acquire "map_data:" . $self->path; 2100 my $lock = cf::lock_acquire "map_data:$self->{path}";
2022 2101
2023 return if $self->players; 2102 return if $self->players;
2024 return if $self->in_memory != cf::MAP_IN_MEMORY; 2103 return if $self->in_memory != cf::MAP_IN_MEMORY;
2025 return if $self->{deny_save}; 2104 return if $self->{deny_save};
2026 2105
2106 $self->in_memory (cf::MAP_SWAPPED);
2107
2108 $self->deactivate;
2109 $_->clear_links_to ($self) for values %cf::MAP;
2027 $self->clear; 2110 $self->clear;
2028 $self->in_memory (cf::MAP_SWAPPED);
2029} 2111}
2030 2112
2031sub reset_at { 2113sub reset_at {
2032 my ($self) = @_; 2114 my ($self) = @_;
2033 2115
… …
2065 if $uniq; 2147 if $uniq;
2066 } 2148 }
2067 2149
2068 delete $cf::MAP{$self->path}; 2150 delete $cf::MAP{$self->path};
2069 2151
2152 $self->deactivate;
2153 $_->clear_links_to ($self) for values %cf::MAP;
2070 $self->clear; 2154 $self->clear;
2071
2072 $_->clear_links_to ($self) for values %cf::MAP;
2073 2155
2074 $self->unlink_save; 2156 $self->unlink_save;
2075 $self->destroy; 2157 $self->destroy;
2076} 2158}
2077 2159
2078my $nuke_counter = "aaaa"; 2160my $nuke_counter = "aaaa";
2079 2161
2080sub nuke { 2162sub nuke {
2081 my ($self) = @_; 2163 my ($self) = @_;
2082 2164
2165 {
2166 my $lock = cf::lock_acquire "map_data:$self->{path}";
2167
2083 delete $cf::MAP{$self->path}; 2168 delete $cf::MAP{$self->path};
2084 2169
2085 $self->unlink_save; 2170 $self->unlink_save;
2086 2171
2087 bless $self, "cf::map"; 2172 bless $self, "cf::map";
2088 delete $self->{deny_reset}; 2173 delete $self->{deny_reset};
2089 $self->{deny_save} = 1; 2174 $self->{deny_save} = 1;
2090 $self->reset_timeout (1); 2175 $self->reset_timeout (1);
2091 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2176 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2092 2177
2093 $cf::MAP{$self->path} = $self; 2178 $cf::MAP{$self->path} = $self;
2179 }
2094 2180
2095 $self->reset; # polite request, might not happen 2181 $self->reset; # polite request, might not happen
2096} 2182}
2097 2183
2098=item $maps = cf::map::tmp_maps 2184=item $maps = cf::map::tmp_maps
… …
2174 2260
2175sub inv_recursive { 2261sub inv_recursive {
2176 inv_recursive_ inv $_[0] 2262 inv_recursive_ inv $_[0]
2177} 2263}
2178 2264
2265=item $ref = $ob->ref
2266
2267creates and returns a persistent reference to an objetc that can be stored as a string.
2268
2269=item $ob = cf::object::deref ($refstring)
2270
2271returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272even if the object actually exists. May block.
2273
2274=cut
2275
2276sub deref {
2277 my ($ref) = @_;
2278
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return;
2286 $pl->ob->uuid eq $uuid
2287 or return;
2288
2289 $pl->ob
2290 } else {
2291 warn "$ref: cannot resolve object reference\n";
2292 undef
2293 }
2294}
2295
2179package cf; 2296package cf;
2180 2297
2181=back 2298=back
2182 2299
2183=head3 cf::object::player 2300=head3 cf::object::player
… …
2341 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2342 2459
2343 $self->enter_link; 2460 $self->enter_link;
2344 2461
2345 (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
2346 my $map = eval { 2482 my $map = eval {
2347 my $map = cf::map::find $path; 2483 my $map = defined $path ? cf::map::find $path : undef;
2348 2484
2349 if ($map) { 2485 if ($map) {
2350 $map = $map->customise_for ($self); 2486 $map = $map->customise_for ($self);
2351 $map = $check->($map) if $check && $map; 2487 $map = $check->($map) if $check && $map;
2352 } else { 2488 } else {
2353 $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);
2354 } 2490 }
2355 2491
2356 $map 2492 $map
2357 }; 2493 };
2358 2494
… …
2492the message, with C<log> being the default. If C<$color> is negative, suppress 2628the message, with C<log> being the default. If C<$color> is negative, suppress
2493the message unless the client supports the msg packet. 2629the message unless the client supports the msg packet.
2494 2630
2495=cut 2631=cut
2496 2632
2633our %CHANNEL = (
2634 "c/identify" => {
2635 id => "identify",
2636 title => "Identify",
2637 reply => undef,
2638 tooltip => "Items recently identified",
2639 },
2640 "c/examine" => {
2641 id => "examine",
2642 title => "Examine",
2643 reply => undef,
2644 tooltip => "Signs and other items you examined",
2645 },
2646);
2647
2497sub cf::client::send_msg { 2648sub cf::client::send_msg {
2498 my ($self, $channel, $msg, $color, @extra) = @_; 2649 my ($self, $channel, $msg, $color, @extra) = @_;
2499 2650
2500 $msg = $self->pl->expand_cfpod ($msg); 2651 $msg = $self->pl->expand_cfpod ($msg);
2501 2652
2502 $color &= cf::NDI_CLIENT_MASK; # just in case... 2653 $color &= cf::NDI_CLIENT_MASK; # just in case...
2654
2655 # check predefined channels, for the benefit of C
2656 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2503 2657
2504 if (ref $channel) { 2658 if (ref $channel) {
2505 # send meta info to client, if not yet sent 2659 # send meta info to client, if not yet sent
2506 unless (exists $self->{channel}{$channel->{id}}) { 2660 unless (exists $self->{channel}{$channel->{id}}) {
2507 $self->{channel}{$channel->{id}} = $channel; 2661 $self->{channel}{$channel->{id}} = $channel;
2508 $self->ext_msg (channel_info => $channel); 2662 $self->ext_msg (channel_info => $channel)
2663 if $self->can_msg;
2509 } 2664 }
2510 2665
2511 $channel = $channel->{id}; 2666 $channel = $channel->{id};
2512 } 2667 }
2513 2668
… …
2554=cut 2709=cut
2555 2710
2556sub cf::client::ext_msg($$@) { 2711sub cf::client::ext_msg($$@) {
2557 my ($self, $type, @msg) = @_; 2712 my ($self, $type, @msg) = @_;
2558 2713
2559 my $extcmd = $self->extcmd;
2560
2561 if ($extcmd == 2) { 2714 if ($self->extcmd == 2) {
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2715 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2563 } elsif ($extcmd == 1) { # TODO: remove 2716 } elsif ($self->extcmd == 1) { # TODO: remove
2564 push @msg, msgtype => "event_$type"; 2717 push @msg, msgtype => "event_$type";
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2718 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2566 } 2719 }
2567} 2720}
2568 2721
… …
2575sub cf::client::ext_reply($$@) { 2728sub cf::client::ext_reply($$@) {
2576 my ($self, $id, @msg) = @_; 2729 my ($self, $id, @msg) = @_;
2577 2730
2578 if ($self->extcmd == 2) { 2731 if ($self->extcmd == 2) {
2579 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2732 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2580 } elsif ($self->ns->extcmd == 1) { 2733 } elsif ($self->extcmd == 1) {
2581 #TODO: version 1, remove 2734 #TODO: version 1, remove
2582 unshift @msg, msgtype => "reply", msgid => $id; 2735 unshift @msg, msgtype => "reply", msgid => $id;
2583 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2736 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2584 } 2737 }
2585} 2738}
… …
2728 2881
2729The following functions and methods are available within a safe environment: 2882The following functions and methods are available within a safe environment:
2730 2883
2731 cf::object 2884 cf::object
2732 contr pay_amount pay_player map x y force_find force_add 2885 contr pay_amount pay_player map x y force_find force_add
2733 insert remove name archname title slaying race 2886 insert remove name archname title slaying race decrease_ob_nr
2734 2887
2735 cf::object::player 2888 cf::object::player
2736 player 2889 player
2737 2890
2738 cf::player 2891 cf::player
… …
2743 2896
2744=cut 2897=cut
2745 2898
2746for ( 2899for (
2747 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2900 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2748 insert remove inv name archname title slaying race)], 2901 insert remove inv name archname title slaying race
2902 decrease_ob_nr)],
2749 ["cf::object::player" => qw(player)], 2903 ["cf::object::player" => qw(player)],
2750 ["cf::player" => qw(peaceful)], 2904 ["cf::player" => qw(peaceful)],
2751 ["cf::map" => qw(trigger)], 2905 ["cf::map" => qw(trigger)],
2752) { 2906) {
2753 no strict 'refs'; 2907 no strict 'refs';
… …
2829# the server's init and main functions 2983# the server's init and main functions
2830 2984
2831sub load_facedata($) { 2985sub load_facedata($) {
2832 my ($path) = @_; 2986 my ($path) = @_;
2833 2987
2988 # HACK to clear player env face cache, we need some signal framework
2989 # for this (global event?)
2990 %ext::player_env::MUSIC_FACE_CACHE = ();
2991
2834 my $enc = JSON::XS->new->utf8->canonical; 2992 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2835 2993
2836 warn "loading facedata from $path\n"; 2994 warn "loading facedata from $path\n";
2837 2995
2838 my $facedata; 2996 my $facedata;
2839 0 < aio_load $path, $facedata 2997 0 < aio_load $path, $facedata
… …
2949 $ns->fx_want ($k, $v); 3107 $ns->fx_want ($k, $v);
2950 } 3108 }
2951}; 3109};
2952 3110
2953sub reload_regions { 3111sub reload_regions {
3112 # HACK to clear player env face cache, we need some signal framework
3113 # for this (global event?)
3114 %ext::player_env::MUSIC_FACE_CACHE = ();
3115
2954 load_resource_file "$MAPDIR/regions" 3116 load_resource_file "$MAPDIR/regions"
2955 or die "unable to load regions file\n"; 3117 or die "unable to load regions file\n";
2956 3118
2957 for (cf::region::list) { 3119 for (cf::region::list) {
2958 $_->{match} = qr/$_->{match}/ 3120 $_->{match} = qr/$_->{match}/
… …
2994 3156
2995sub init { 3157sub init {
2996 reload_resources; 3158 reload_resources;
2997} 3159}
2998 3160
2999sub cfg_load { 3161sub reload_config {
3000 open my $fh, "<:utf8", "$CONFDIR/config" 3162 open my $fh, "<:utf8", "$CONFDIR/config"
3001 or return; 3163 or return;
3002 3164
3003 local $/; 3165 local $/;
3004 *CFG = YAML::Syck::Load <$fh>; 3166 *CFG = YAML::Syck::Load <$fh>;
… …
3024 (async { 3186 (async {
3025 Event::one_event; 3187 Event::one_event;
3026 })->prio (Coro::PRIO_MAX); 3188 })->prio (Coro::PRIO_MAX);
3027 }; 3189 };
3028 3190
3029 cfg_load; 3191 reload_config;
3030 db_init; 3192 db_init;
3031 load_extensions; 3193 load_extensions;
3032 3194
3033 $TICK_WATCHER->start; 3195 $TICK_WATCHER->start;
3034 Event::loop; 3196 Event::loop;
… …
3227 warn "reloading cf.pm"; 3389 warn "reloading cf.pm";
3228 require cf; 3390 require cf;
3229 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3391 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3230 3392
3231 warn "loading config and database again"; 3393 warn "loading config and database again";
3232 cf::cfg_load; 3394 cf::reload_config;
3233 3395
3234 warn "loading extensions"; 3396 warn "loading extensions";
3235 cf::load_extensions; 3397 cf::load_extensions;
3236 3398
3237 warn "reattaching attachments to objects/players"; 3399 warn "reattaching attachments to objects/players";
… …
3302 my $signal = new Coro::Signal; 3464 my $signal = new Coro::Signal;
3303 push @WAIT_FOR_TICK_BEGIN, $signal; 3465 push @WAIT_FOR_TICK_BEGIN, $signal;
3304 $signal->wait; 3466 $signal->wait;
3305} 3467}
3306 3468
3307 my $min = 1e6;#d#
3308 my $avg = 10;
3309$TICK_WATCHER = Event->timer ( 3469$TICK_WATCHER = Event->timer (
3310 reentrant => 0, 3470 reentrant => 0,
3311 parked => 1, 3471 parked => 1,
3312 prio => 0, 3472 prio => 0,
3313 at => $NEXT_TICK || $TICK, 3473 at => $NEXT_TICK || $TICK,
… …
3321 3481
3322 $NOW = $tick_start = Event::time; 3482 $NOW = $tick_start = Event::time;
3323 3483
3324 cf::server_tick; # one server iteration 3484 cf::server_tick; # one server iteration
3325 3485
3326 0 && sync_job {#d#
3327 for(1..10) {
3328 my $t = Event::time;
3329 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3330 or die;
3331
3332 $map->width (50);
3333 $map->height (50);
3334 $map->alloc;
3335 $map->_load_objects ("/tmp/x.map", 1);
3336 my $t = Event::time - $t;
3337
3338 #next unless $t < 0.0013;#d#
3339 if ($t < $min) {
3340 $min = $t;
3341 }
3342 $avg = $avg * 0.99 + $t * 0.01;
3343 }
3344 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3345 exit 0;
3346 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3347 };
3348
3349 $RUNTIME += $TICK; 3486 $RUNTIME += $TICK;
3350 $NEXT_TICK += $TICK; 3487 $NEXT_TICK += $TICK;
3351 3488
3352 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3489 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3353 $NEXT_RUNTIME_WRITE = $NOW + 10; 3490 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
3355 write_runtime 3492 write_runtime
3356 or warn "ERROR: unable to write runtime file: $!"; 3493 or warn "ERROR: unable to write runtime file: $!";
3357 }; 3494 };
3358 } 3495 }
3359 3496
3360# my $AFTER = Event::time;
3361# warn $AFTER - $NOW;#d#
3362
3363 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3497 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3364 $sig->send; 3498 $sig->send;
3365 } 3499 }
3366 while (my $sig = shift @WAIT_FOR_TICK) { 3500 while (my $sig = shift @WAIT_FOR_TICK) {
3367 $sig->send; 3501 $sig->send;
… …
3377 3511
3378 $LOAD = ($NOW - $tick_start) / $TICK; 3512 $LOAD = ($NOW - $tick_start) / $TICK;
3379 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3513 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3380 3514
3381 _post_tick; 3515 _post_tick;
3382
3383
3384 }, 3516 },
3385); 3517);
3386 3518
3387{ 3519{
3520 BDB::min_parallel 8;
3388 BDB::max_poll_time $TICK * 0.1; 3521 BDB::max_poll_time $TICK * 0.1;
3389 $BDB_POLL_WATCHER = Event->io ( 3522 $BDB_POLL_WATCHER = Event->io (
3390 reentrant => 0, 3523 reentrant => 0,
3391 fd => BDB::poll_fileno, 3524 fd => BDB::poll_fileno,
3392 poll => 'r', 3525 poll => 'r',
3393 prio => 0, 3526 prio => 0,
3394 data => WF_AUTOCANCEL, 3527 data => WF_AUTOCANCEL,
3395 cb => \&BDB::poll_cb, 3528 cb => \&BDB::poll_cb,
3396 ); 3529 );
3397 BDB::min_parallel 8;
3398 3530
3399 BDB::set_sync_prepare { 3531 BDB::set_sync_prepare {
3400 my $status; 3532 my $status;
3401 my $current = $Coro::current; 3533 my $current = $Coro::current;
3402 ( 3534 (
… …
3411 ) 3543 )
3412 }; 3544 };
3413 3545
3414 unless ($DB_ENV) { 3546 unless ($DB_ENV) {
3415 $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);
3416 3552
3417 cf::sync_job { 3553 cf::sync_job {
3418 eval { 3554 eval {
3419 BDB::db_env_open 3555 BDB::db_env_open
3420 $DB_ENV, 3556 $DB_ENV,
… …
3422 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
3423 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3559 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3424 0666; 3560 0666;
3425 3561
3426 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3562 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3427
3428 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3429 $DB_ENV->set_lk_detect;
3430 }; 3563 };
3431 3564
3432 cf::cleanup "db_env_open(db): $@" if $@; 3565 cf::cleanup "db_env_open(db): $@" if $@;
3433 }; 3566 };
3434 } 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 );
3435} 3599}
3436 3600
3437{ 3601{
3438 IO::AIO::min_parallel 8; 3602 IO::AIO::min_parallel 8;
3439 3603

Diff Legend

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