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.340 by root, Fri Aug 24 00:40:31 2007 UTC vs.
Revision 1.366 by root, Tue Sep 11 16:05:35 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_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;
90our $RUNTIME; 92our $RUNTIME;
91 93
92our %PLAYER; # all users 94our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 95our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 96our $LINK_MAP; # the special {link} map, which is always available
95 97
96# used to convert map paths into valid unix filenames by replacing / by ∕ 98# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 100
… …
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';
… …
272Wait until the given lock is available and then acquires it and returns 273Wait 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, 274a Coro::guard object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 275for example when the coroutine gets canceled), the lock is automatically
275returned. 276returned.
276 277
278Locks are *not* recursive, locking from the same coro twice results in a
279deadlocked coro.
280
277Lock names should begin with a unique identifier (for example, cf::map::find 281Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 282uses map_find and cf::map::load uses map_load).
279 283
280=item $locked = cf::lock_active $string 284=item $locked = cf::lock_active $string
281 285
282Return 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.
283 287
284=cut 288=cut
285 289
286our %LOCK; 290our %LOCK;
291our %LOCKER;#d#
287 292
288sub lock_wait($) { 293sub lock_wait($) {
289 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#
290 300
291 # wait for lock, if any 301 # wait for lock, if any
292 while ($LOCK{$key}) { 302 while ($LOCK{$key}) {
293 push @{ $LOCK{$key} }, $Coro::current; 303 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule; 304 Coro::schedule;
… …
300 310
301 # wait, to be sure we are not locked 311 # wait, to be sure we are not locked
302 lock_wait $key; 312 lock_wait $key;
303 313
304 $LOCK{$key} = []; 314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
305 316
306 Coro::guard { 317 Coro::guard {
318 delete $LOCKER{$key};#d#
307 # wake up all waiters, to be on the safe side 319 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} }; 320 $_->ready for @{ delete $LOCK{$key} };
309 } 321 }
310} 322}
311 323
… …
478sub fork_call(&@) { 490sub fork_call(&@) {
479 my ($cb, @args) = @_; 491 my ($cb, @args) = @_;
480 492
481 # we seemingly have to make a local copy of the whole thing, 493 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 494 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 495 # TODO: investigate and fix (likely this will be rather laborious)
484 496
485 my @res = Coro::Util::fork_eval { 497 my @res = Coro::Util::fork_eval {
486 reset_signals; 498 reset_signals;
487 &$cb 499 &$cb
488 }, @args; 500 }, @args;
… …
497=item cf::db_put $family => $key => $value 509=item cf::db_put $family => $key => $value
498 510
499Stores 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
500data 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).
501 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
502=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}
503 537
504our $DB; 538our $DB;
505 539
506sub db_init { 540sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 541 cf::sync_job {
511 eval { 542 $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 } 543 };
521} 544}
522 545
523sub db_get($$) { 546sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 547 my $key = "$_[0]/$_[1]";
525 548
… …
575 if (1) { 598 if (1) {
576 $md5 = 599 $md5 =
577 join "\x00", 600 join "\x00",
578 $processversion, 601 $processversion,
579 map { 602 map {
580 Coro::cede; 603 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 604 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 605 } 0.. $#$src;
583 606
584 607
585 my $dbmd5 = db_get cache => "$id/md5"; 608 my $dbmd5 = db_get cache => "$id/md5";
… …
1002); 1025);
1003 1026
1004sub object_freezer_save { 1027sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1028 my ($filename, $rdata, $objs) = @_;
1006 1029
1030 my $guard = cf::lock_acquire "io";
1031
1007 sync_job { 1032 sync_job {
1008 if (length $$rdata) { 1033 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1035 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1036 $decname, length $$rdata, scalar @$objs;
1011 1037
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1038 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1039 chmod SAVE_MODE, $fh;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1040 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1041 aio_fsync $fh if $cf::USE_FSYNC;
… …
1034 } 1060 }
1035 } else { 1061 } else {
1036 aio_unlink $filename; 1062 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1063 aio_unlink "$filename.pst";
1038 } 1064 }
1039 } 1065 };
1066
1067 undef $guard;
1040} 1068}
1041 1069
1042sub object_freezer_as_string { 1070sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1071 my ($rdata, $objs) = @_;
1044 1072
… …
1049 1077
1050sub object_thawer_load { 1078sub object_thawer_load {
1051 my ($filename) = @_; 1079 my ($filename) = @_;
1052 1080
1053 my ($data, $av); 1081 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1054 1084
1055 (aio_load $filename, $data) >= 0 1085 (aio_load $filename, $data) >= 0
1056 or return; 1086 or return;
1057 1087
1058 unless (aio_stat "$filename.pst") { 1088 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1089 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1090 or return;
1091
1092 undef $guard;
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1093 $av = eval { (Storable::thaw $av)->{objs} };
1062 } 1094 }
1063 1095
1096 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1097 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1098 $decname, length $data, scalar @{$av || []};
1099
1066 return ($data, $av); 1100 ($data, $av)
1067} 1101}
1068 1102
1069=head2 COMMAND CALLBACKS 1103=head2 COMMAND CALLBACKS
1070 1104
1071=over 4 1105=over 4
… …
1257 1291
1258=head3 cf::player 1292=head3 cf::player
1259 1293
1260=over 4 1294=over 4
1261 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}
1309
1262=item cf::player::find $login 1310=item cf::player::find $login
1263 1311
1264Returns the given player object, loading it if necessary (might block). 1312Returns the given player object, loading it if necessary (might block).
1265 1313
1266=cut 1314=cut
… …
1301 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1349 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1302 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1350 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1303 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1351 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1304 aio_unlink +(playerdir $login) . "/$login.pl"; 1352 aio_unlink +(playerdir $login) . "/$login.pl";
1305 1353
1306 my $pl = load_pl path $login 1354 my $f = new_from_file cf::object::thawer path $login
1307 or return; 1355 or return;
1356
1357 $f->next;
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);
… …
1948 2023
1949sub do_load_sync { 2024sub do_load_sync {
1950 my ($map) = @_; 2025 my ($map) = @_;
1951 2026
1952 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2027 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1953 if $Coro::current != $Coro::main; 2028 if $Coro::current == $Coro::main;
1954 2029
1955 cf::sync_job { $map->load }; 2030 cf::sync_job { $map->load };
1956} 2031}
1957 2032
1958our %MAP_PREFETCH; 2033our %MAP_PREFETCH;
… …
1987} 2062}
1988 2063
1989sub save { 2064sub save {
1990 my ($self) = @_; 2065 my ($self) = @_;
1991 2066
1992 my $lock = cf::lock_acquire "map_data:" . $self->path; 2067 my $lock = cf::lock_acquire "map_data:$self->{path}";
1993 2068
1994 $self->{last_save} = $cf::RUNTIME; 2069 $self->{last_save} = $cf::RUNTIME;
1995 2070
1996 return unless $self->dirty; 2071 return unless $self->dirty;
1997 2072
… …
2020 my ($self) = @_; 2095 my ($self) = @_;
2021 2096
2022 # save first because save cedes 2097 # save first because save cedes
2023 $self->save; 2098 $self->save;
2024 2099
2025 my $lock = cf::lock_acquire "map_data:" . $self->path; 2100 my $lock = cf::lock_acquire "map_data:$self->{path}";
2026 2101
2027 return if $self->players; 2102 return if $self->players;
2028 return if $self->in_memory != cf::MAP_IN_MEMORY; 2103 return if $self->in_memory != cf::MAP_IN_MEMORY;
2029 return if $self->{deny_save}; 2104 return if $self->{deny_save};
2030 2105
2106 $self->in_memory (cf::MAP_SWAPPED);
2107
2108 $self->deactivate;
2109 $_->clear_links_to ($self) for values %cf::MAP;
2031 $self->clear; 2110 $self->clear;
2032 $self->in_memory (cf::MAP_SWAPPED);
2033} 2111}
2034 2112
2035sub reset_at { 2113sub reset_at {
2036 my ($self) = @_; 2114 my ($self) = @_;
2037 2115
… …
2069 if $uniq; 2147 if $uniq;
2070 } 2148 }
2071 2149
2072 delete $cf::MAP{$self->path}; 2150 delete $cf::MAP{$self->path};
2073 2151
2152 $self->deactivate;
2153 $_->clear_links_to ($self) for values %cf::MAP;
2074 $self->clear; 2154 $self->clear;
2075
2076 $_->clear_links_to ($self) for values %cf::MAP;
2077 2155
2078 $self->unlink_save; 2156 $self->unlink_save;
2079 $self->destroy; 2157 $self->destroy;
2080} 2158}
2081 2159
2082my $nuke_counter = "aaaa"; 2160my $nuke_counter = "aaaa";
2083 2161
2084sub nuke { 2162sub nuke {
2085 my ($self) = @_; 2163 my ($self) = @_;
2086 2164
2165 {
2166 my $lock = cf::lock_acquire "map_data:$self->{path}";
2167
2087 delete $cf::MAP{$self->path}; 2168 delete $cf::MAP{$self->path};
2088 2169
2089 $self->unlink_save; 2170 $self->unlink_save;
2090 2171
2091 bless $self, "cf::map"; 2172 bless $self, "cf::map";
2092 delete $self->{deny_reset}; 2173 delete $self->{deny_reset};
2093 $self->{deny_save} = 1; 2174 $self->{deny_save} = 1;
2094 $self->reset_timeout (1); 2175 $self->reset_timeout (1);
2095 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2176 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2096 2177
2097 $cf::MAP{$self->path} = $self; 2178 $cf::MAP{$self->path} = $self;
2179 }
2098 2180
2099 $self->reset; # polite request, might not happen 2181 $self->reset; # polite request, might not happen
2100} 2182}
2101 2183
2102=item $maps = cf::map::tmp_maps 2184=item $maps = cf::map::tmp_maps
… …
2178 2260
2179sub inv_recursive { 2261sub inv_recursive {
2180 inv_recursive_ inv $_[0] 2262 inv_recursive_ inv $_[0]
2181} 2263}
2182 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
2183package cf; 2296package cf;
2184 2297
2185=back 2298=back
2186 2299
2187=head3 cf::object::player 2300=head3 cf::object::player
… …
2345 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2346 2459
2347 $self->enter_link; 2460 $self->enter_link;
2348 2461
2349 (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 # todo: use ob_blocked to check all tiles of the destination "object"
2469 # for suitability.
2470
2471 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2472 }
2473 }
2474
2350 my $map = eval { 2475 my $map = eval {
2351 my $map = cf::map::find $path; 2476 my $map = cf::map::find $path;
2352 2477
2353 if ($map) { 2478 if ($map) {
2354 $map = $map->customise_for ($self); 2479 $map = $map->customise_for ($self);
… …
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}
… …
2732 2874
2733The following functions and methods are available within a safe environment: 2875The following functions and methods are available within a safe environment:
2734 2876
2735 cf::object 2877 cf::object
2736 contr pay_amount pay_player map x y force_find force_add 2878 contr pay_amount pay_player map x y force_find force_add
2737 insert remove name archname title slaying race 2879 insert remove name archname title slaying race decrease_ob_nr
2738 2880
2739 cf::object::player 2881 cf::object::player
2740 player 2882 player
2741 2883
2742 cf::player 2884 cf::player
… …
2747 2889
2748=cut 2890=cut
2749 2891
2750for ( 2892for (
2751 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2893 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2752 insert remove inv name archname title slaying race)], 2894 insert remove inv name archname title slaying race
2895 decrease_ob_nr)],
2753 ["cf::object::player" => qw(player)], 2896 ["cf::object::player" => qw(player)],
2754 ["cf::player" => qw(peaceful)], 2897 ["cf::player" => qw(peaceful)],
2755 ["cf::map" => qw(trigger)], 2898 ["cf::map" => qw(trigger)],
2756) { 2899) {
2757 no strict 'refs'; 2900 no strict 'refs';
… …
2833# the server's init and main functions 2976# the server's init and main functions
2834 2977
2835sub load_facedata($) { 2978sub load_facedata($) {
2836 my ($path) = @_; 2979 my ($path) = @_;
2837 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
2838 my $enc = JSON::XS->new->utf8->canonical; 2985 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2839 2986
2840 warn "loading facedata from $path\n"; 2987 warn "loading facedata from $path\n";
2841 2988
2842 my $facedata; 2989 my $facedata;
2843 0 < aio_load $path, $facedata 2990 0 < aio_load $path, $facedata
… …
2953 $ns->fx_want ($k, $v); 3100 $ns->fx_want ($k, $v);
2954 } 3101 }
2955}; 3102};
2956 3103
2957sub 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
2958 load_resource_file "$MAPDIR/regions" 3109 load_resource_file "$MAPDIR/regions"
2959 or die "unable to load regions file\n"; 3110 or die "unable to load regions file\n";
2960 3111
2961 for (cf::region::list) { 3112 for (cf::region::list) {
2962 $_->{match} = qr/$_->{match}/ 3113 $_->{match} = qr/$_->{match}/
… …
2998 3149
2999sub init { 3150sub init {
3000 reload_resources; 3151 reload_resources;
3001} 3152}
3002 3153
3003sub cfg_load { 3154sub reload_config {
3004 open my $fh, "<:utf8", "$CONFDIR/config" 3155 open my $fh, "<:utf8", "$CONFDIR/config"
3005 or return; 3156 or return;
3006 3157
3007 local $/; 3158 local $/;
3008 *CFG = YAML::Syck::Load <$fh>; 3159 *CFG = YAML::Syck::Load <$fh>;
… …
3028 (async { 3179 (async {
3029 Event::one_event; 3180 Event::one_event;
3030 })->prio (Coro::PRIO_MAX); 3181 })->prio (Coro::PRIO_MAX);
3031 }; 3182 };
3032 3183
3033 cfg_load; 3184 reload_config;
3034 db_init; 3185 db_init;
3035 load_extensions; 3186 load_extensions;
3036 3187
3037 $TICK_WATCHER->start; 3188 $TICK_WATCHER->start;
3038 Event::loop; 3189 Event::loop;
… …
3231 warn "reloading cf.pm"; 3382 warn "reloading cf.pm";
3232 require cf; 3383 require cf;
3233 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3384 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3234 3385
3235 warn "loading config and database again"; 3386 warn "loading config and database again";
3236 cf::cfg_load; 3387 cf::reload_config;
3237 3388
3238 warn "loading extensions"; 3389 warn "loading extensions";
3239 cf::load_extensions; 3390 cf::load_extensions;
3240 3391
3241 warn "reattaching attachments to objects/players"; 3392 warn "reattaching attachments to objects/players";
… …
3306 my $signal = new Coro::Signal; 3457 my $signal = new Coro::Signal;
3307 push @WAIT_FOR_TICK_BEGIN, $signal; 3458 push @WAIT_FOR_TICK_BEGIN, $signal;
3308 $signal->wait; 3459 $signal->wait;
3309} 3460}
3310 3461
3311 my $min = 1e6;#d# 3462our $stat_fh;
3312 my $avg = 10; 3463sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3464
3313$TICK_WATCHER = Event->timer ( 3465$TICK_WATCHER = Event->timer (
3314 reentrant => 0, 3466 reentrant => 0,
3315 parked => 1, 3467 parked => 1,
3316 prio => 0, 3468 prio => 0,
3317 at => $NEXT_TICK || $TICK, 3469 at => $NEXT_TICK || $TICK,
… …
3321 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3473 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3322 unless ++$bug_warning > 10; 3474 unless ++$bug_warning > 10;
3323 return; 3475 return;
3324 } 3476 }
3325 3477
3478 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3479
3326 $NOW = $tick_start = Event::time; 3480 $NOW = $tick_start = Event::time;
3327 3481
3328 cf::server_tick; # one server iteration 3482 cf::server_tick; # one server iteration
3329
3330 0 && sync_job {#d#
3331 for(1..10) {
3332 my $t = Event::time;
3333 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3334 or die;
3335
3336 $map->width (50);
3337 $map->height (50);
3338 $map->alloc;
3339 $map->_load_objects ("/tmp/x.map", 1);
3340 my $t = Event::time - $t;
3341
3342 #next unless $t < 0.0013;#d#
3343 if ($t < $min) {
3344 $min = $t;
3345 }
3346 $avg = $avg * 0.99 + $t * 0.01;
3347 }
3348 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3349 exit 0;
3350 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3351 };
3352 3483
3353 $RUNTIME += $TICK; 3484 $RUNTIME += $TICK;
3354 $NEXT_TICK += $TICK; 3485 $NEXT_TICK += $TICK;
3355 3486
3356 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3487 if ($NOW >= $NEXT_RUNTIME_WRITE) {
… …
3382 $LOAD = ($NOW - $tick_start) / $TICK; 3513 $LOAD = ($NOW - $tick_start) / $TICK;
3383 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3514 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3384 3515
3385 _post_tick; 3516 _post_tick;
3386 3517
3387 3518 # gather some statistics#d#
3519 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d#
3520 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d#
3388 }, 3521 },
3389); 3522);
3390 3523
3391{ 3524{
3525 BDB::min_parallel 8;
3392 BDB::max_poll_time $TICK * 0.1; 3526 BDB::max_poll_time $TICK * 0.1;
3393 $BDB_POLL_WATCHER = Event->io ( 3527 $BDB_POLL_WATCHER = Event->io (
3394 reentrant => 0, 3528 reentrant => 0,
3395 fd => BDB::poll_fileno, 3529 fd => BDB::poll_fileno,
3396 poll => 'r', 3530 poll => 'r',
3397 prio => 0, 3531 prio => 0,
3398 data => WF_AUTOCANCEL, 3532 data => WF_AUTOCANCEL,
3399 cb => \&BDB::poll_cb, 3533 cb => \&BDB::poll_cb,
3400 ); 3534 );
3401 BDB::min_parallel 8;
3402 3535
3403 BDB::set_sync_prepare { 3536 BDB::set_sync_prepare {
3404 my $status; 3537 my $status;
3405 my $current = $Coro::current; 3538 my $current = $Coro::current;
3406 ( 3539 (
… …
3427 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3560 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3428 0666; 3561 0666;
3429 3562
3430 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3563 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3431 3564
3432 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3565 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3566 | BDB::LOG_AUTOREMOVE, 1);
3433 $DB_ENV->set_lk_detect; 3567 $DB_ENV->set_lk_detect;
3434 }; 3568 };
3435 3569
3436 cf::cleanup "db_env_open(db): $@" if $@; 3570 cf::cleanup "db_env_open(db): $@" if $@;
3437 }; 3571 };
3438 } 3572 }
3573
3574 $BDB_CHECKPOINT_WATCHER = Event->timer (
3575 after => 11,
3576 interval => 60,
3577 hard => 1,
3578 prio => 0,
3579 data => WF_AUTOCANCEL,
3580 cb => sub {
3581 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3582 },
3583 );
3584 $BDB_TRICKLE_WATCHER = Event->timer (
3585 after => 5,
3586 interval => 10,
3587 hard => 1,
3588 prio => 0,
3589 data => WF_AUTOCANCEL,
3590 cb => sub {
3591 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3592 },
3593 );
3439} 3594}
3440 3595
3441{ 3596{
3442 IO::AIO::min_parallel 8; 3597 IO::AIO::min_parallel 8;
3443 3598

Diff Legend

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