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.341 by elmex, Sat Aug 25 16:51:38 2007 UTC vs.
Revision 1.373 by root, Sat Sep 15 15:58:06 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";
… …
1004sub object_freezer_save { 1028sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1029 my ($filename, $rdata, $objs) = @_;
1006 1030
1007 sync_job { 1031 sync_job {
1008 if (length $$rdata) { 1032 if (length $$rdata) {
1033 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1034 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1035 $decname, length $$rdata, scalar @$objs;
1011 1036
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1037 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1038 chmod SAVE_MODE, $fh;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1039 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1040 aio_fsync $fh if $cf::USE_FSYNC;
… …
1034 } 1059 }
1035 } else { 1060 } else {
1036 aio_unlink $filename; 1061 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1062 aio_unlink "$filename.pst";
1038 } 1063 }
1039 } 1064 };
1040} 1065}
1041 1066
1042sub object_freezer_as_string { 1067sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1068 my ($rdata, $objs) = @_;
1044 1069
… …
1056 or return; 1081 or return;
1057 1082
1058 unless (aio_stat "$filename.pst") { 1083 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1084 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1085 or return;
1086
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1087 $av = eval { (Storable::thaw $av)->{objs} };
1062 } 1088 }
1063 1089
1090 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1091 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1092 $decname, length $data, scalar @{$av || []};
1093
1066 return ($data, $av); 1094 ($data, $av)
1067} 1095}
1068 1096
1069=head2 COMMAND CALLBACKS 1097=head2 COMMAND CALLBACKS
1070 1098
1071=over 4 1099=over 4
… …
1257 1285
1258=head3 cf::player 1286=head3 cf::player
1259 1287
1260=over 4 1288=over 4
1261 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
1262=item cf::player::find $login 1304=item cf::player::find $login
1263 1305
1264Returns the given player object, loading it if necessary (might block). 1306Returns the given player object, loading it if necessary (might block).
1265 1307
1266=cut 1308=cut
… …
1301 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1343 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1302 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1344 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1303 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1345 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1304 aio_unlink +(playerdir $login) . "/$login.pl"; 1346 aio_unlink +(playerdir $login) . "/$login.pl";
1305 1347
1306 my $pl = load_pl path $login 1348 my $f = new_from_file cf::object::thawer path $login
1307 or return; 1349 or return;
1350
1351 my $pl = cf::player::load_pl $f
1352 or return;
1353 local $cf::PLAYER_LOADING{$login} = $pl;
1354 $f->resolve_delayed_derefs;
1308 $cf::PLAYER{$login} = $pl 1355 $cf::PLAYER{$login} = $pl
1309 } 1356 }
1310 } 1357 }
1311} 1358}
1312 1359
… …
1322 1369
1323 aio_mkdir playerdir $pl, 0770; 1370 aio_mkdir playerdir $pl, 0770;
1324 $pl->{last_save} = $cf::RUNTIME; 1371 $pl->{last_save} = $cf::RUNTIME;
1325 1372
1326 $pl->save_pl ($path); 1373 $pl->save_pl ($path);
1327 Coro::cede; 1374 cf::cede_to_tick;
1328} 1375}
1329 1376
1330sub new($) { 1377sub new($) {
1331 my ($login) = @_; 1378 my ($login) = @_;
1332 1379
… …
1410 or return []; 1457 or return [];
1411 1458
1412 my @logins; 1459 my @logins;
1413 1460
1414 for my $login (@$dirs) { 1461 for my $login (@$dirs) {
1462 my $path = path $login;
1463
1464 # a .pst is a dead give-away for a valid player
1465 unless (-e "$path.pst") {
1415 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1466 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1416 aio_read $fh, 0, 512, my $buf, 0 or next; 1467 aio_read $fh, 0, 512, my $buf, 0 or next;
1417 $buf !~ /^password -------------$/m or next; # official not-valid tag 1468 $buf !~ /^password -------------$/m or next; # official not-valid tag
1469 }
1418 1470
1419 utf8::decode $login; 1471 utf8::decode $login;
1420 push @logins, $login; 1472 push @logins, $login;
1421 } 1473 }
1422 1474
… …
1460sub expand_cfpod { 1512sub expand_cfpod {
1461 ((my $self), (local $_)) = @_; 1513 ((my $self), (local $_)) = @_;
1462 1514
1463 # escape & and < 1515 # escape & and <
1464 s/&/&amp;/g; 1516 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g; 1517 s/(?<![BIUGHT])</&lt;/g;
1466 1518
1467 # this is buggy, it needs to properly take care of nested <'s 1519 # this is buggy, it needs to properly take care of nested <'s
1468 1520
1469 1 while 1521 1 while
1470 # replace B<>, I<>, U<> etc. 1522 # replace B<>, I<>, U<> etc.
1471 s/B<([^\>]*)>/<b>$1<\/b>/ 1523 s/B<([^\>]*)>/<b>$1<\/b>/
1472 || s/I<([^\>]*)>/<i>$1<\/i>/ 1524 || s/I<([^\>]*)>/<i>$1<\/i>/
1473 || s/U<([^\>]*)>/<u>$1<\/u>/ 1525 || s/U<([^\>]*)>/<u>$1<\/u>/
1526 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1474 # replace G<male|female> tags 1527 # replace G<male|female> tags
1475 || s{G<([^>|]*)\|([^>]*)>}{ 1528 || s{G<([^>|]*)\|([^>]*)>}{
1476 $self->gender ? $2 : $1 1529 $self->gender ? $2 : $1
1477 }ge 1530 }ge
1478 # replace H<hint text> 1531 # replace H<hint text>
… …
1746 1799
1747sub load_header_from($) { 1800sub load_header_from($) {
1748 my ($self, $path) = @_; 1801 my ($self, $path) = @_;
1749 1802
1750 utf8::encode $path; 1803 utf8::encode $path;
1751 #aio_open $path, O_RDONLY, 0 1804 my $f = new_from_file cf::object::thawer $path
1752 # or return;
1753
1754 $self->_load_header ($path)
1755 or return; 1805 or return;
1806
1807 $self->_load_header ($f)
1808 or return;
1809
1810 local $MAP_LOADING{$self->{path}} = $self;
1811 $f->resolve_delayed_derefs;
1756 1812
1757 $self->{load_path} = $path; 1813 $self->{load_path} = $path;
1758 1814
1759 1 1815 1
1760} 1816}
… …
1814sub find { 1870sub find {
1815 my ($path, $origin) = @_; 1871 my ($path, $origin) = @_;
1816 1872
1817 $path = normalise $path, $origin && $origin->path; 1873 $path = normalise $path, $origin && $origin->path;
1818 1874
1875 cf::lock_wait "map_data:$path";#d#remove
1819 cf::lock_wait "map_find:$path"; 1876 cf::lock_wait "map_find:$path";
1820 1877
1821 $cf::MAP{$path} || do { 1878 $cf::MAP{$path} || do {
1822 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
1823 my $map = new_from_path cf::map $path 1882 my $map = new_from_path cf::map $path
1824 or return; 1883 or return;
1825 1884
1826 $map->{last_save} = $cf::RUNTIME; 1885 $map->{last_save} = $cf::RUNTIME;
1827 1886
… …
1829 or return; 1888 or return;
1830 1889
1831 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1890 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1832 # doing this can freeze the server in a sync job, obviously 1891 # doing this can freeze the server in a sync job, obviously
1833 #$cf::WAIT_FOR_TICK->wait; 1892 #$cf::WAIT_FOR_TICK->wait;
1893 undef $guard1;
1894 undef $guard2;
1834 $map->reset; 1895 $map->reset;
1835 undef $guard;
1836 return find $path; 1896 return find $path;
1837 } 1897 }
1838 1898
1839 $cf::MAP{$path} = $map 1899 $cf::MAP{$path} = $map
1840 } 1900 }
… …
1849 local $self->{deny_reset} = 1; # loading can take a long time 1909 local $self->{deny_reset} = 1; # loading can take a long time
1850 1910
1851 my $path = $self->{path}; 1911 my $path = $self->{path};
1852 1912
1853 { 1913 {
1854 my $guard = cf::lock_acquire "map_load:$path"; 1914 my $guard = cf::lock_acquire "map_data:$path";
1855 1915
1916 return unless $self->valid;
1856 return if $self->in_memory != cf::MAP_SWAPPED; 1917 return unless $self->in_memory == cf::MAP_SWAPPED;
1857 1918
1858 $self->in_memory (cf::MAP_LOADING); 1919 $self->in_memory (cf::MAP_LOADING);
1859 1920
1860 $self->alloc; 1921 $self->alloc;
1861 1922
1862 $self->pre_load; 1923 $self->pre_load;
1863 Coro::cede; 1924 cf::cede_to_tick;
1864 1925
1926 my $f = new_from_file cf::object::thawer $self->{load_path};
1927 $f->skip_block;
1865 $self->_load_objects ($self->{load_path}, 1) 1928 $self->_load_objects ($f)
1866 or return; 1929 or return;
1867 1930
1868 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1931 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1869 if delete $self->{load_original}; 1932 if delete $self->{load_original};
1870 1933
1871 if (my $uniq = $self->uniq_path) { 1934 if (my $uniq = $self->uniq_path) {
1872 utf8::encode $uniq; 1935 utf8::encode $uniq;
1873 if (aio_open $uniq, O_RDONLY, 0) { 1936 unless (aio_stat $uniq) {
1937 if (my $f = new_from_file cf::object::thawer $uniq) {
1874 $self->clear_unique_items; 1938 $self->clear_unique_items;
1875 $self->_load_objects ($uniq, 0); 1939 $self->_load_objects ($f);
1940 $f->resolve_delayed_derefs;
1941 }
1876 } 1942 }
1877 } 1943 }
1878 1944
1879 Coro::cede; 1945 $f->resolve_delayed_derefs;
1946
1947 cf::cede_to_tick;
1880 # now do the right thing for maps 1948 # now do the right thing for maps
1881 $self->link_multipart_objects; 1949 $self->link_multipart_objects;
1882 $self->difficulty ($self->estimate_difficulty) 1950 $self->difficulty ($self->estimate_difficulty)
1883 unless $self->difficulty; 1951 unless $self->difficulty;
1884 Coro::cede; 1952 cf::cede_to_tick;
1885 1953
1886 unless ($self->{deny_activate}) { 1954 unless ($self->{deny_activate}) {
1887 $self->decay_objects; 1955 $self->decay_objects;
1888 $self->fix_auto_apply; 1956 $self->fix_auto_apply;
1889 $self->update_buttons; 1957 $self->update_buttons;
1890 Coro::cede; 1958 cf::cede_to_tick;
1891 $self->set_darkness_map; 1959 $self->set_darkness_map;
1892 Coro::cede; 1960 cf::cede_to_tick;
1893 $self->activate; 1961 $self->activate;
1894 } 1962 }
1895 1963
1896 $self->{last_save} = $cf::RUNTIME; 1964 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME); 1965 $self->last_access ($cf::RUNTIME);
… …
1948 2016
1949sub do_load_sync { 2017sub do_load_sync {
1950 my ($map) = @_; 2018 my ($map) = @_;
1951 2019
1952 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2020 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1953 if $Coro::current != $Coro::main; 2021 if $Coro::current == $Coro::main;
1954 2022
1955 cf::sync_job { $map->load }; 2023 cf::sync_job { $map->load };
1956} 2024}
1957 2025
1958our %MAP_PREFETCH; 2026our %MAP_PREFETCH;
… …
1987} 2055}
1988 2056
1989sub save { 2057sub save {
1990 my ($self) = @_; 2058 my ($self) = @_;
1991 2059
1992 my $lock = cf::lock_acquire "map_data:" . $self->path; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
1993 2061
1994 $self->{last_save} = $cf::RUNTIME; 2062 $self->{last_save} = $cf::RUNTIME;
1995 2063
1996 return unless $self->dirty; 2064 return unless $self->dirty;
1997 2065
… …
2020 my ($self) = @_; 2088 my ($self) = @_;
2021 2089
2022 # save first because save cedes 2090 # save first because save cedes
2023 $self->save; 2091 $self->save;
2024 2092
2025 my $lock = cf::lock_acquire "map_data:" . $self->path; 2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
2026 2094
2027 return if $self->players; 2095 return if $self->players;
2028 return if $self->in_memory != cf::MAP_IN_MEMORY; 2096 return if $self->in_memory != cf::MAP_IN_MEMORY;
2029 return if $self->{deny_save}; 2097 return if $self->{deny_save};
2030 2098
2099 $self->in_memory (cf::MAP_SWAPPED);
2100
2101 $self->deactivate;
2102 $_->clear_links_to ($self) for values %cf::MAP;
2031 $self->clear; 2103 $self->clear;
2032 $self->in_memory (cf::MAP_SWAPPED);
2033} 2104}
2034 2105
2035sub reset_at { 2106sub reset_at {
2036 my ($self) = @_; 2107 my ($self) = @_;
2037 2108
… …
2069 if $uniq; 2140 if $uniq;
2070 } 2141 }
2071 2142
2072 delete $cf::MAP{$self->path}; 2143 delete $cf::MAP{$self->path};
2073 2144
2145 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP;
2074 $self->clear; 2147 $self->clear;
2075
2076 $_->clear_links_to ($self) for values %cf::MAP;
2077 2148
2078 $self->unlink_save; 2149 $self->unlink_save;
2079 $self->destroy; 2150 $self->destroy;
2080} 2151}
2081 2152
2082my $nuke_counter = "aaaa"; 2153my $nuke_counter = "aaaa";
2083 2154
2084sub nuke { 2155sub nuke {
2085 my ($self) = @_; 2156 my ($self) = @_;
2086 2157
2158 {
2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
2160
2087 delete $cf::MAP{$self->path}; 2161 delete $cf::MAP{$self->path};
2088 2162
2089 $self->unlink_save; 2163 $self->unlink_save;
2090 2164
2091 bless $self, "cf::map"; 2165 bless $self, "cf::map";
2092 delete $self->{deny_reset}; 2166 delete $self->{deny_reset};
2093 $self->{deny_save} = 1; 2167 $self->{deny_save} = 1;
2094 $self->reset_timeout (1); 2168 $self->reset_timeout (1);
2095 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2169 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2096 2170
2097 $cf::MAP{$self->path} = $self; 2171 $cf::MAP{$self->path} = $self;
2172 }
2098 2173
2099 $self->reset; # polite request, might not happen 2174 $self->reset; # polite request, might not happen
2100} 2175}
2101 2176
2102=item $maps = cf::map::tmp_maps 2177=item $maps = cf::map::tmp_maps
… …
2178 2253
2179sub inv_recursive { 2254sub inv_recursive {
2180 inv_recursive_ inv $_[0] 2255 inv_recursive_ inv $_[0]
2181} 2256}
2182 2257
2258=item $ref = $ob->ref
2259
2260creates and returns a persistent reference to an objetc that can be stored as a string.
2261
2262=item $ob = cf::object::deref ($refstring)
2263
2264returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2265even if the object actually exists. May block.
2266
2267=cut
2268
2269sub deref {
2270 my ($ref) = @_;
2271
2272 # temporary compatibility#TODO#remove
2273 $ref =~ s{^<}{player/<};
2274
2275 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2276 my ($uuid, $name) = ($1, $2);
2277 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2278 or return;
2279 $pl->ob->uuid eq $uuid
2280 or return;
2281
2282 $pl->ob
2283 } else {
2284 warn "$ref: cannot resolve object reference\n";
2285 undef
2286 }
2287}
2288
2183package cf; 2289package cf;
2184 2290
2185=back 2291=back
2186 2292
2187=head3 cf::object::player 2293=head3 cf::object::player
… …
2345 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2451 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2346 2452
2347 $self->enter_link; 2453 $self->enter_link;
2348 2454
2349 (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
2350 my $map = eval { 2475 my $map = eval {
2351 my $map = cf::map::find $path; 2476 my $map = defined $path ? cf::map::find $path : undef;
2352 2477
2353 if ($map) { 2478 if ($map) {
2354 $map = $map->customise_for ($self); 2479 $map = $map->customise_for ($self);
2355 $map = $check->($map) if $check && $map; 2480 $map = $check->($map) if $check && $map;
2356 } else { 2481 } else {
2357 $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);
2358 } 2483 }
2359 2484
2360 $map 2485 $map
2361 }; 2486 };
2362 2487
… …
2496the message, with C<log> being the default. If C<$color> is negative, suppress 2621the message, with C<log> being the default. If C<$color> is negative, suppress
2497the message unless the client supports the msg packet. 2622the message unless the client supports the msg packet.
2498 2623
2499=cut 2624=cut
2500 2625
2626our %CHANNEL = (
2627 "c/identify" => {
2628 id => "identify",
2629 title => "Identify",
2630 reply => undef,
2631 tooltip => "Items recently identified",
2632 },
2633 "c/examine" => {
2634 id => "examine",
2635 title => "Examine",
2636 reply => undef,
2637 tooltip => "Signs and other items you examined",
2638 },
2639);
2640
2501sub cf::client::send_msg { 2641sub cf::client::send_msg {
2502 my ($self, $channel, $msg, $color, @extra) = @_; 2642 my ($self, $channel, $msg, $color, @extra) = @_;
2503 2643
2504 $msg = $self->pl->expand_cfpod ($msg); 2644 $msg = $self->pl->expand_cfpod ($msg);
2505 2645
2506 $color &= cf::NDI_CLIENT_MASK; # just in case... 2646 $color &= cf::NDI_CLIENT_MASK; # just in case...
2647
2648 # check predefined channels, for the benefit of C
2649 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2507 2650
2508 if (ref $channel) { 2651 if (ref $channel) {
2509 # send meta info to client, if not yet sent 2652 # send meta info to client, if not yet sent
2510 unless (exists $self->{channel}{$channel->{id}}) { 2653 unless (exists $self->{channel}{$channel->{id}}) {
2511 $self->{channel}{$channel->{id}} = $channel; 2654 $self->{channel}{$channel->{id}} = $channel;
2512 $self->ext_msg (channel_info => $channel); 2655 $self->ext_msg (channel_info => $channel)
2656 if $self->can_msg;
2513 } 2657 }
2514 2658
2515 $channel = $channel->{id}; 2659 $channel = $channel->{id};
2516 } 2660 }
2517 2661
… …
2558=cut 2702=cut
2559 2703
2560sub cf::client::ext_msg($$@) { 2704sub cf::client::ext_msg($$@) {
2561 my ($self, $type, @msg) = @_; 2705 my ($self, $type, @msg) = @_;
2562 2706
2563 my $extcmd = $self->extcmd;
2564
2565 if ($extcmd == 2) { 2707 if ($self->extcmd == 2) {
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2708 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2567 } elsif ($extcmd == 1) { # TODO: remove 2709 } elsif ($self->extcmd == 1) { # TODO: remove
2568 push @msg, msgtype => "event_$type"; 2710 push @msg, msgtype => "event_$type";
2569 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2711 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2570 } 2712 }
2571} 2713}
2572 2714
… …
2579sub cf::client::ext_reply($$@) { 2721sub cf::client::ext_reply($$@) {
2580 my ($self, $id, @msg) = @_; 2722 my ($self, $id, @msg) = @_;
2581 2723
2582 if ($self->extcmd == 2) { 2724 if ($self->extcmd == 2) {
2583 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2725 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2584 } elsif ($self->ns->extcmd == 1) { 2726 } elsif ($self->extcmd == 1) {
2585 #TODO: version 1, remove 2727 #TODO: version 1, remove
2586 unshift @msg, msgtype => "reply", msgid => $id; 2728 unshift @msg, msgtype => "reply", msgid => $id;
2587 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2729 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2588 } 2730 }
2589} 2731}
… …
2834# the server's init and main functions 2976# the server's init and main functions
2835 2977
2836sub load_facedata($) { 2978sub load_facedata($) {
2837 my ($path) = @_; 2979 my ($path) = @_;
2838 2980
2981 # HACK to clear player env face cache, we need some signal framework
2982 # for this (global event?)
2983 %ext::player_env::MUSIC_FACE_CACHE = ();
2984
2839 my $enc = JSON::XS->new->utf8->canonical; 2985 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2840 2986
2841 warn "loading facedata from $path\n"; 2987 warn "loading facedata from $path\n";
2842 2988
2843 my $facedata; 2989 my $facedata;
2844 0 < aio_load $path, $facedata 2990 0 < aio_load $path, $facedata
… …
2954 $ns->fx_want ($k, $v); 3100 $ns->fx_want ($k, $v);
2955 } 3101 }
2956}; 3102};
2957 3103
2958sub reload_regions { 3104sub reload_regions {
3105 # HACK to clear player env face cache, we need some signal framework
3106 # for this (global event?)
3107 %ext::player_env::MUSIC_FACE_CACHE = ();
3108
2959 load_resource_file "$MAPDIR/regions" 3109 load_resource_file "$MAPDIR/regions"
2960 or die "unable to load regions file\n"; 3110 or die "unable to load regions file\n";
2961 3111
2962 for (cf::region::list) { 3112 for (cf::region::list) {
2963 $_->{match} = qr/$_->{match}/ 3113 $_->{match} = qr/$_->{match}/
… …
2999 3149
3000sub init { 3150sub init {
3001 reload_resources; 3151 reload_resources;
3002} 3152}
3003 3153
3004sub cfg_load { 3154sub reload_config {
3005 open my $fh, "<:utf8", "$CONFDIR/config" 3155 open my $fh, "<:utf8", "$CONFDIR/config"
3006 or return; 3156 or return;
3007 3157
3008 local $/; 3158 local $/;
3009 *CFG = YAML::Syck::Load <$fh>; 3159 *CFG = YAML::Syck::Load <$fh>;
… …
3029 (async { 3179 (async {
3030 Event::one_event; 3180 Event::one_event;
3031 })->prio (Coro::PRIO_MAX); 3181 })->prio (Coro::PRIO_MAX);
3032 }; 3182 };
3033 3183
3034 cfg_load; 3184 reload_config;
3035 db_init; 3185 db_init;
3036 load_extensions; 3186 load_extensions;
3037 3187
3038 $TICK_WATCHER->start; 3188 $TICK_WATCHER->start;
3039 Event::loop; 3189 Event::loop;
… …
3232 warn "reloading cf.pm"; 3382 warn "reloading cf.pm";
3233 require cf; 3383 require cf;
3234 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3384 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3235 3385
3236 warn "loading config and database again"; 3386 warn "loading config and database again";
3237 cf::cfg_load; 3387 cf::reload_config;
3238 3388
3239 warn "loading extensions"; 3389 warn "loading extensions";
3240 cf::load_extensions; 3390 cf::load_extensions;
3241 3391
3242 warn "reattaching attachments to objects/players"; 3392 warn "reattaching attachments to objects/players";
… …
3307 my $signal = new Coro::Signal; 3457 my $signal = new Coro::Signal;
3308 push @WAIT_FOR_TICK_BEGIN, $signal; 3458 push @WAIT_FOR_TICK_BEGIN, $signal;
3309 $signal->wait; 3459 $signal->wait;
3310} 3460}
3311 3461
3312 my $min = 1e6;#d#
3313 my $avg = 10;
3314$TICK_WATCHER = Event->timer ( 3462$TICK_WATCHER = Event->timer (
3315 reentrant => 0, 3463 reentrant => 0,
3316 parked => 1, 3464 parked => 1,
3317 prio => 0, 3465 prio => 0,
3318 at => $NEXT_TICK || $TICK, 3466 at => $NEXT_TICK || $TICK,
… …
3326 3474
3327 $NOW = $tick_start = Event::time; 3475 $NOW = $tick_start = Event::time;
3328 3476
3329 cf::server_tick; # one server iteration 3477 cf::server_tick; # one server iteration
3330 3478
3331 0 && sync_job {#d#
3332 for(1..10) {
3333 my $t = Event::time;
3334 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3335 or die;
3336
3337 $map->width (50);
3338 $map->height (50);
3339 $map->alloc;
3340 $map->_load_objects ("/tmp/x.map", 1);
3341 my $t = Event::time - $t;
3342
3343 #next unless $t < 0.0013;#d#
3344 if ($t < $min) {
3345 $min = $t;
3346 }
3347 $avg = $avg * 0.99 + $t * 0.01;
3348 }
3349 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3350 exit 0;
3351 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3352 };
3353
3354 $RUNTIME += $TICK; 3479 $RUNTIME += $TICK;
3355 $NEXT_TICK += $TICK; 3480 $NEXT_TICK += $TICK;
3356 3481
3357 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3482 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3358 $NEXT_RUNTIME_WRITE = $NOW + 10; 3483 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
3360 write_runtime 3485 write_runtime
3361 or warn "ERROR: unable to write runtime file: $!"; 3486 or warn "ERROR: unable to write runtime file: $!";
3362 }; 3487 };
3363 } 3488 }
3364 3489
3365# my $AFTER = Event::time;
3366# warn $AFTER - $NOW;#d#
3367
3368 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3490 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3369 $sig->send; 3491 $sig->send;
3370 } 3492 }
3371 while (my $sig = shift @WAIT_FOR_TICK) { 3493 while (my $sig = shift @WAIT_FOR_TICK) {
3372 $sig->send; 3494 $sig->send;
… …
3382 3504
3383 $LOAD = ($NOW - $tick_start) / $TICK; 3505 $LOAD = ($NOW - $tick_start) / $TICK;
3384 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3506 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3385 3507
3386 _post_tick; 3508 _post_tick;
3387
3388
3389 }, 3509 },
3390); 3510);
3391 3511
3392{ 3512{
3513 BDB::min_parallel 8;
3393 BDB::max_poll_time $TICK * 0.1; 3514 BDB::max_poll_time $TICK * 0.1;
3394 $BDB_POLL_WATCHER = Event->io ( 3515 $BDB_POLL_WATCHER = Event->io (
3395 reentrant => 0, 3516 reentrant => 0,
3396 fd => BDB::poll_fileno, 3517 fd => BDB::poll_fileno,
3397 poll => 'r', 3518 poll => 'r',
3398 prio => 0, 3519 prio => 0,
3399 data => WF_AUTOCANCEL, 3520 data => WF_AUTOCANCEL,
3400 cb => \&BDB::poll_cb, 3521 cb => \&BDB::poll_cb,
3401 ); 3522 );
3402 BDB::min_parallel 8;
3403 3523
3404 BDB::set_sync_prepare { 3524 BDB::set_sync_prepare {
3405 my $status; 3525 my $status;
3406 my $current = $Coro::current; 3526 my $current = $Coro::current;
3407 ( 3527 (
… …
3416 ) 3536 )
3417 }; 3537 };
3418 3538
3419 unless ($DB_ENV) { 3539 unless ($DB_ENV) {
3420 $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);
3421 3545
3422 cf::sync_job { 3546 cf::sync_job {
3423 eval { 3547 eval {
3424 BDB::db_env_open 3548 BDB::db_env_open
3425 $DB_ENV, 3549 $DB_ENV,
… …
3427 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
3428 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3552 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3429 0666; 3553 0666;
3430 3554
3431 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3555 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3432
3433 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3434 $DB_ENV->set_lk_detect;
3435 }; 3556 };
3436 3557
3437 cf::cleanup "db_env_open(db): $@" if $@; 3558 cf::cleanup "db_env_open(db): $@" if $@;
3438 }; 3559 };
3439 } 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 );
3440} 3592}
3441 3593
3442{ 3594{
3443 IO::AIO::min_parallel 8; 3595 IO::AIO::min_parallel 8;
3444 3596

Diff Legend

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