ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cf.schmorp.de/server/lib/cf.pm
(Generate patch)

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.332 by root, Sat Aug 18 17:33:53 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
… …
1149 my ($type, $reply, @payload) = 1184 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1185 "ARRAY" eq ref $msg
1151 ? @$msg 1186 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1187 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1188
1189 my @reply;
1190
1154 if (my $cb = $EXTCMD{$type}) { 1191 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1192 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1193 }
1194
1195 $pl->ext_reply ($reply, @reply)
1196 if $reply;
1197
1160 } else { 1198 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1199 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1200 }
1163 1201
1164 cf::override; 1202 cf::override;
… …
1254 1292
1255=head3 cf::player 1293=head3 cf::player
1256 1294
1257=over 4 1295=over 4
1258 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
1259=item cf::player::find $login 1311=item cf::player::find $login
1260 1312
1261Returns the given player object, loading it if necessary (might block). 1313Returns the given player object, loading it if necessary (might block).
1262 1314
1263=cut 1315=cut
… …
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1350 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1351 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1352 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl"; 1353 aio_unlink +(playerdir $login) . "/$login.pl";
1302 1354
1303 my $pl = load_pl path $login 1355 my $f = new_from_file cf::object::thawer path $login
1304 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;
1305 $cf::PLAYER{$login} = $pl 1362 $cf::PLAYER{$login} = $pl
1306 } 1363 }
1307 } 1364 }
1308} 1365}
1309 1366
… …
1319 1376
1320 aio_mkdir playerdir $pl, 0770; 1377 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1378 $pl->{last_save} = $cf::RUNTIME;
1322 1379
1323 $pl->save_pl ($path); 1380 $pl->save_pl ($path);
1324 Coro::cede; 1381 cf::cede_to_tick;
1325} 1382}
1326 1383
1327sub new($) { 1384sub new($) {
1328 my ($login) = @_; 1385 my ($login) = @_;
1329 1386
… …
1407 or return []; 1464 or return [];
1408 1465
1409 my @logins; 1466 my @logins;
1410 1467
1411 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") {
1412 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413 aio_read $fh, 0, 512, my $buf, 0 or next; 1474 aio_read $fh, 0, 512, my $buf, 0 or next;
1414 $buf !~ /^password -------------$/m or next; # official not-valid tag 1475 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 }
1415 1477
1416 utf8::decode $login; 1478 utf8::decode $login;
1417 push @logins, $login; 1479 push @logins, $login;
1418 } 1480 }
1419 1481
… …
1457sub expand_cfpod { 1519sub expand_cfpod {
1458 ((my $self), (local $_)) = @_; 1520 ((my $self), (local $_)) = @_;
1459 1521
1460 # escape & and < 1522 # escape & and <
1461 s/&/&amp;/g; 1523 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g; 1524 s/(?<![BIUGHT])</&lt;/g;
1463 1525
1464 # 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
1465 1527
1466 1 while 1528 1 while
1467 # replace B<>, I<>, U<> etc. 1529 # replace B<>, I<>, U<> etc.
1468 s/B<([^\>]*)>/<b>$1<\/b>/ 1530 s/B<([^\>]*)>/<b>$1<\/b>/
1469 || s/I<([^\>]*)>/<i>$1<\/i>/ 1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1470 || s/U<([^\>]*)>/<u>$1<\/u>/ 1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1471 # replace G<male|female> tags 1534 # replace G<male|female> tags
1472 || s{G<([^>|]*)\|([^>]*)>}{ 1535 || s{G<([^>|]*)\|([^>]*)>}{
1473 $self->gender ? $2 : $1 1536 $self->gender ? $2 : $1
1474 }ge 1537 }ge
1475 # replace H<hint text> 1538 # replace H<hint text>
… …
1505=cut 1568=cut
1506 1569
1507sub ext_reply($$@) { 1570sub ext_reply($$@) {
1508 my ($self, $id, @msg) = @_; 1571 my ($self, $id, @msg) = @_;
1509 1572
1510 if ($self->ns->extcmd == 2) { 1573 $self->ns->ext_reply ($id, @msg)
1511 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1512 } elsif ($self->ns->extcmd == 1) {
1513 #TODO: version 1, remove
1514 unshift @msg, msgtype => "reply", msgid => $id;
1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1517} 1574}
1518 1575
1519=item $player->ext_msg ($type, @msg) 1576=item $player->ext_msg ($type, @msg)
1520 1577
1521Sends an ext event to the client. 1578Sends an ext event to the client.
… …
1749 1806
1750sub load_header_from($) { 1807sub load_header_from($) {
1751 my ($self, $path) = @_; 1808 my ($self, $path) = @_;
1752 1809
1753 utf8::encode $path; 1810 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1811 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 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;
1759 1819
1760 $self->{load_path} = $path; 1820 $self->{load_path} = $path;
1761 1821
1762 1 1822 1
1763} 1823}
… …
1817sub find { 1877sub find {
1818 my ($path, $origin) = @_; 1878 my ($path, $origin) = @_;
1819 1879
1820 $path = normalise $path, $origin && $origin->path; 1880 $path = normalise $path, $origin && $origin->path;
1821 1881
1882 cf::lock_wait "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 1883 cf::lock_wait "map_find:$path";
1823 1884
1824 $cf::MAP{$path} || do { 1885 $cf::MAP{$path} || do {
1825 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
1826 my $map = new_from_path cf::map $path 1889 my $map = new_from_path cf::map $path
1827 or return; 1890 or return;
1828 1891
1829 $map->{last_save} = $cf::RUNTIME; 1892 $map->{last_save} = $cf::RUNTIME;
1830 1893
… …
1832 or return; 1895 or return;
1833 1896
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 1898 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 1899 #$cf::WAIT_FOR_TICK->wait;
1900 undef $guard1;
1901 undef $guard2;
1837 $map->reset; 1902 $map->reset;
1838 undef $guard;
1839 return find $path; 1903 return find $path;
1840 } 1904 }
1841 1905
1842 $cf::MAP{$path} = $map 1906 $cf::MAP{$path} = $map
1843 } 1907 }
… …
1852 local $self->{deny_reset} = 1; # loading can take a long time 1916 local $self->{deny_reset} = 1; # loading can take a long time
1853 1917
1854 my $path = $self->{path}; 1918 my $path = $self->{path};
1855 1919
1856 { 1920 {
1857 my $guard = cf::lock_acquire "map_load:$path"; 1921 my $guard = cf::lock_acquire "map_data:$path";
1858 1922
1923 return unless $self->valid;
1859 return if $self->in_memory != cf::MAP_SWAPPED; 1924 return unless $self->in_memory == cf::MAP_SWAPPED;
1860 1925
1861 $self->in_memory (cf::MAP_LOADING); 1926 $self->in_memory (cf::MAP_LOADING);
1862 1927
1863 $self->alloc; 1928 $self->alloc;
1864 1929
1865 $self->pre_load; 1930 $self->pre_load;
1866 Coro::cede; 1931 cf::cede_to_tick;
1867 1932
1933 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block;
1868 $self->_load_objects ($self->{load_path}, 1) 1935 $self->_load_objects ($f)
1869 or return; 1936 or return;
1870 1937
1871 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1872 if delete $self->{load_original}; 1939 if delete $self->{load_original};
1873 1940
1874 if (my $uniq = $self->uniq_path) { 1941 if (my $uniq = $self->uniq_path) {
1875 utf8::encode $uniq; 1942 utf8::encode $uniq;
1876 if (aio_open $uniq, O_RDONLY, 0) { 1943 unless (aio_stat $uniq) {
1944 if (my $f = new_from_file cf::object::thawer $uniq) {
1877 $self->clear_unique_items; 1945 $self->clear_unique_items;
1878 $self->_load_objects ($uniq, 0); 1946 $self->_load_objects ($f);
1947 $f->resolve_delayed_derefs;
1948 }
1879 } 1949 }
1880 } 1950 }
1881 1951
1882 Coro::cede; 1952 $f->resolve_delayed_derefs;
1953
1954 cf::cede_to_tick;
1883 # now do the right thing for maps 1955 # now do the right thing for maps
1884 $self->link_multipart_objects; 1956 $self->link_multipart_objects;
1885 $self->difficulty ($self->estimate_difficulty) 1957 $self->difficulty ($self->estimate_difficulty)
1886 unless $self->difficulty; 1958 unless $self->difficulty;
1887 Coro::cede; 1959 cf::cede_to_tick;
1888 1960
1889 unless ($self->{deny_activate}) { 1961 unless ($self->{deny_activate}) {
1890 $self->decay_objects; 1962 $self->decay_objects;
1891 $self->fix_auto_apply; 1963 $self->fix_auto_apply;
1892 $self->update_buttons; 1964 $self->update_buttons;
1893 Coro::cede; 1965 cf::cede_to_tick;
1894 $self->set_darkness_map; 1966 $self->set_darkness_map;
1895 Coro::cede; 1967 cf::cede_to_tick;
1896 $self->activate; 1968 $self->activate;
1897 } 1969 }
1898 1970
1899 $self->{last_save} = $cf::RUNTIME; 1971 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME); 1972 $self->last_access ($cf::RUNTIME);
… …
1916 1988
1917 $self 1989 $self
1918} 1990}
1919 1991
1920# find and load all maps in the 3x3 area around a map 1992# find and load all maps in the 3x3 area around a map
1921sub load_diag { 1993sub load_neighbours {
1922 my ($map) = @_; 1994 my ($map) = @_;
1923 1995
1924 my @diag; # diagonal neighbours 1996 my @neigh; # diagonal neighbours
1925 1997
1926 for (0 .. 3) { 1998 for (0 .. 3) {
1927 my $neigh = $map->tile_path ($_) 1999 my $neigh = $map->tile_path ($_)
1928 or next; 2000 or next;
1929 $neigh = find $neigh, $map 2001 $neigh = find $neigh, $map
1930 or next; 2002 or next;
1931 $neigh->load; 2003 $neigh->load;
1932 2004
2005 push @neigh,
1933 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2006 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1934 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2007 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1935 } 2008 }
1936 2009
1937 for (@diag) { 2010 for (grep defined $_->[0], @neigh) {
2011 my ($path, $origin) = @$_;
1938 my $neigh = find @$_ 2012 my $neigh = find $path, $origin
1939 or next; 2013 or next;
1940 $neigh->load; 2014 $neigh->load;
1941 } 2015 }
1942} 2016}
1943 2017
… …
1948} 2022}
1949 2023
1950sub do_load_sync { 2024sub do_load_sync {
1951 my ($map) = @_; 2025 my ($map) = @_;
1952 2026
2027 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2028 if $Coro::current == $Coro::main;
2029
1953 cf::sync_job { $map->load }; 2030 cf::sync_job { $map->load };
1954} 2031}
1955 2032
1956our %MAP_PREFETCH; 2033our %MAP_PREFETCH;
1957our $MAP_PREFETCHER = undef; 2034our $MAP_PREFETCHER = undef;
1958 2035
1959sub find_async { 2036sub find_async {
1960 my ($path, $origin) = @_; 2037 my ($path, $origin, $load) = @_;
1961 2038
1962 $path = normalise $path, $origin && $origin->{path}; 2039 $path = normalise $path, $origin && $origin->{path};
1963 2040
1964 if (my $map = $cf::MAP{$path}) { 2041 if (my $map = $cf::MAP{$path}) {
1965 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1966 } 2043 }
1967 2044
1968 undef $MAP_PREFETCH{$path}; 2045 $MAP_PREFETCH{$path} |= $load;
2046
1969 $MAP_PREFETCHER ||= cf::async { 2047 $MAP_PREFETCHER ||= cf::async {
1970 while (%MAP_PREFETCH) { 2048 while (%MAP_PREFETCH) {
1971 for my $path (keys %MAP_PREFETCH) { 2049 while (my ($k, $v) = each %MAP_PREFETCH) {
1972 if (my $map = find $path) { 2050 if (my $map = find $k) {
1973 $map->load; 2051 $map->load if $v;
1974 } 2052 }
1975 2053
1976 delete $MAP_PREFETCH{$path}; 2054 delete $MAP_PREFETCH{$k};
1977 } 2055 }
1978 } 2056 }
1979 undef $MAP_PREFETCHER; 2057 undef $MAP_PREFETCHER;
1980 }; 2058 };
1981 $MAP_PREFETCHER->prio (6); 2059 $MAP_PREFETCHER->prio (6);
… …
1984} 2062}
1985 2063
1986sub save { 2064sub save {
1987 my ($self) = @_; 2065 my ($self) = @_;
1988 2066
1989 my $lock = cf::lock_acquire "map_data:" . $self->path; 2067 my $lock = cf::lock_acquire "map_data:$self->{path}";
1990 2068
1991 $self->{last_save} = $cf::RUNTIME; 2069 $self->{last_save} = $cf::RUNTIME;
1992 2070
1993 return unless $self->dirty; 2071 return unless $self->dirty;
1994 2072
… …
2017 my ($self) = @_; 2095 my ($self) = @_;
2018 2096
2019 # save first because save cedes 2097 # save first because save cedes
2020 $self->save; 2098 $self->save;
2021 2099
2022 my $lock = cf::lock_acquire "map_data:" . $self->path; 2100 my $lock = cf::lock_acquire "map_data:$self->{path}";
2023 2101
2024 return if $self->players; 2102 return if $self->players;
2025 return if $self->in_memory != cf::MAP_IN_MEMORY; 2103 return if $self->in_memory != cf::MAP_IN_MEMORY;
2026 return if $self->{deny_save}; 2104 return if $self->{deny_save};
2027 2105
2106 $self->in_memory (cf::MAP_SWAPPED);
2107
2108 $self->deactivate;
2109 $_->clear_links_to ($self) for values %cf::MAP;
2028 $self->clear; 2110 $self->clear;
2029 $self->in_memory (cf::MAP_SWAPPED);
2030} 2111}
2031 2112
2032sub reset_at { 2113sub reset_at {
2033 my ($self) = @_; 2114 my ($self) = @_;
2034 2115
… …
2066 if $uniq; 2147 if $uniq;
2067 } 2148 }
2068 2149
2069 delete $cf::MAP{$self->path}; 2150 delete $cf::MAP{$self->path};
2070 2151
2152 $self->deactivate;
2153 $_->clear_links_to ($self) for values %cf::MAP;
2071 $self->clear; 2154 $self->clear;
2072
2073 $_->clear_links_to ($self) for values %cf::MAP;
2074 2155
2075 $self->unlink_save; 2156 $self->unlink_save;
2076 $self->destroy; 2157 $self->destroy;
2077} 2158}
2078 2159
2079my $nuke_counter = "aaaa"; 2160my $nuke_counter = "aaaa";
2080 2161
2081sub nuke { 2162sub nuke {
2082 my ($self) = @_; 2163 my ($self) = @_;
2083 2164
2165 {
2166 my $lock = cf::lock_acquire "map_data:$self->{path}";
2167
2084 delete $cf::MAP{$self->path}; 2168 delete $cf::MAP{$self->path};
2085 2169
2086 $self->unlink_save; 2170 $self->unlink_save;
2087 2171
2088 bless $self, "cf::map"; 2172 bless $self, "cf::map";
2089 delete $self->{deny_reset}; 2173 delete $self->{deny_reset};
2090 $self->{deny_save} = 1; 2174 $self->{deny_save} = 1;
2091 $self->reset_timeout (1); 2175 $self->reset_timeout (1);
2092 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2176 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2093 2177
2094 $cf::MAP{$self->path} = $self; 2178 $cf::MAP{$self->path} = $self;
2179 }
2095 2180
2096 $self->reset; # polite request, might not happen 2181 $self->reset; # polite request, might not happen
2097} 2182}
2098 2183
2099=item $maps = cf::map::tmp_maps 2184=item $maps = cf::map::tmp_maps
… …
2175 2260
2176sub inv_recursive { 2261sub inv_recursive {
2177 inv_recursive_ inv $_[0] 2262 inv_recursive_ inv $_[0]
2178} 2263}
2179 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
2180package cf; 2296package cf;
2181 2297
2182=back 2298=back
2183 2299
2184=head3 cf::object::player 2300=head3 cf::object::player
… …
2312 # use -1 or undef as default coordinates, not 0, 0 2428 # use -1 or undef as default coordinates, not 0, 0
2313 ($x, $y) = ($map->enter_x, $map->enter_y) 2429 ($x, $y) = ($map->enter_x, $map->enter_y)
2314 if $x <=0 && $y <= 0; 2430 if $x <=0 && $y <= 0;
2315 2431
2316 $map->load; 2432 $map->load;
2317 $map->load_diag; 2433 $map->load_neighbours;
2318 2434
2319 return unless $self->contr->active; 2435 return unless $self->contr->active;
2320 $self->activate_recursive; 2436 $self->activate_recursive;
2321 2437
2322 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2342 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2343 2459
2344 $self->enter_link; 2460 $self->enter_link;
2345 2461
2346 (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
2347 my $map = eval { 2482 my $map = eval {
2348 my $map = cf::map::find $path; 2483 my $map = defined $path ? cf::map::find $path : undef;
2349 2484
2350 if ($map) { 2485 if ($map) {
2351 $map = $map->customise_for ($self); 2486 $map = $map->customise_for ($self);
2352 $map = $check->($map) if $check && $map; 2487 $map = $check->($map) if $check && $map;
2353 } else { 2488 } else {
2354 $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);
2355 } 2490 }
2356 2491
2357 $map 2492 $map
2358 }; 2493 };
2359 2494
… …
2493the 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
2494the message unless the client supports the msg packet. 2629the message unless the client supports the msg packet.
2495 2630
2496=cut 2631=cut
2497 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
2498sub cf::client::send_msg { 2648sub cf::client::send_msg {
2499 my ($self, $channel, $msg, $color, @extra) = @_; 2649 my ($self, $channel, $msg, $color, @extra) = @_;
2500 2650
2501 $msg = $self->pl->expand_cfpod ($msg); 2651 $msg = $self->pl->expand_cfpod ($msg);
2502 2652
2503 $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};
2504 2657
2505 if (ref $channel) { 2658 if (ref $channel) {
2506 # send meta info to client, if not yet sent 2659 # send meta info to client, if not yet sent
2507 unless (exists $self->{channel}{$channel->{id}}) { 2660 unless (exists $self->{channel}{$channel->{id}}) {
2508 $self->{channel}{$channel->{id}} = $channel; 2661 $self->{channel}{$channel->{id}} = $channel;
2509 $self->ext_msg (channel_info => $channel); 2662 $self->ext_msg (channel_info => $channel)
2663 if $self->can_msg;
2510 } 2664 }
2511 2665
2512 $channel = $channel->{id}; 2666 $channel = $channel->{id};
2513 } 2667 }
2514 2668
… …
2555=cut 2709=cut
2556 2710
2557sub cf::client::ext_msg($$@) { 2711sub cf::client::ext_msg($$@) {
2558 my ($self, $type, @msg) = @_; 2712 my ($self, $type, @msg) = @_;
2559 2713
2560 my $extcmd = $self->extcmd;
2561
2562 if ($extcmd == 2) { 2714 if ($self->extcmd == 2) {
2563 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2715 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2564 } elsif ($extcmd == 1) { # TODO: remove 2716 } elsif ($self->extcmd == 1) { # TODO: remove
2565 push @msg, msgtype => "event_$type"; 2717 push @msg, msgtype => "event_$type";
2718 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2719 }
2720}
2721
2722=item $client->ext_reply ($msgid, @msg)
2723
2724Sends an ext reply to the client.
2725
2726=cut
2727
2728sub cf::client::ext_reply($$@) {
2729 my ($self, $id, @msg) = @_;
2730
2731 if ($self->extcmd == 2) {
2732 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2733 } elsif ($self->extcmd == 1) {
2734 #TODO: version 1, remove
2735 unshift @msg, msgtype => "reply", msgid => $id;
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2736 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2567 } 2737 }
2568} 2738}
2569 2739
2570=item $success = $client->query ($flags, "text", \&cb) 2740=item $success = $client->query ($flags, "text", \&cb)
… …
2632 my ($type, $reply, @payload) = 2802 my ($type, $reply, @payload) =
2633 "ARRAY" eq ref $msg 2803 "ARRAY" eq ref $msg
2634 ? @$msg 2804 ? @$msg
2635 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2805 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2636 2806
2807 my @reply;
2808
2637 if (my $cb = $EXTICMD{$type}) { 2809 if (my $cb = $EXTICMD{$type}) {
2638 my @reply = $cb->($ns, @payload); 2810 @reply = $cb->($ns, @payload);
2639
2640 $ns->ext_reply ($reply, @reply)
2641 if $reply;
2642 } 2811 }
2812
2813 $ns->ext_reply ($reply, @reply)
2814 if $reply;
2815
2643 } else { 2816 } else {
2644 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2817 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2645 } 2818 }
2646 2819
2647 cf::override; 2820 cf::override;
… …
2708 2881
2709The following functions and methods are available within a safe environment: 2882The following functions and methods are available within a safe environment:
2710 2883
2711 cf::object 2884 cf::object
2712 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
2713 insert remove name archname title slaying race 2886 insert remove name archname title slaying race decrease_ob_nr
2714 2887
2715 cf::object::player 2888 cf::object::player
2716 player 2889 player
2717 2890
2718 cf::player 2891 cf::player
… …
2723 2896
2724=cut 2897=cut
2725 2898
2726for ( 2899for (
2727 ["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
2728 insert remove inv name archname title slaying race)], 2901 insert remove inv name archname title slaying race
2902 decrease_ob_nr)],
2729 ["cf::object::player" => qw(player)], 2903 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 2904 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 2905 ["cf::map" => qw(trigger)],
2732) { 2906) {
2733 no strict 'refs'; 2907 no strict 'refs';
… …
2809# the server's init and main functions 2983# the server's init and main functions
2810 2984
2811sub load_facedata($) { 2985sub load_facedata($) {
2812 my ($path) = @_; 2986 my ($path) = @_;
2813 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
2992 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2993
2814 warn "loading facedata from $path\n"; 2994 warn "loading facedata from $path\n";
2815 2995
2816 my $facedata; 2996 my $facedata;
2817 0 < aio_load $path, $facedata 2997 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 2998 or die "$path: $!";
2819 2999
2820 $facedata = Coro::Storable::thaw $facedata; 3000 $facedata = Coro::Storable::thaw $facedata;
2821 3001
2822 $facedata->{version} == 2 3002 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 3003 or cf::cleanup "$path: version mismatch, cannot proceed.";
3004
3005 # patch in the exptable
3006 $facedata->{resource}{"res/exp_table"} = {
3007 type => FT_RSRC,
3008 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3009 };
3010 cf::cede_to_tick;
2824 3011
2825 { 3012 {
2826 my $faces = $facedata->{faceinfo}; 3013 my $faces = $facedata->{faceinfo};
2827 3014
2828 while (my ($face, $info) = each %$faces) { 3015 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3016 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2830 cf::face::set_visibility $idx, $info->{visibility}; 3017 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 3018 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3019 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3020 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 3021
2835 cf::cede_to_tick; 3022 cf::cede_to_tick;
2836 } 3023 }
2837 3024
2838 while (my ($face, $info) = each %$faces) { 3025 while (my ($face, $info) = each %$faces) {
… …
2863 3050
2864 { 3051 {
2865 # TODO: for gcfclient pleasure, we should give resources 3052 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 3053 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3054 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869 3055
2870 my $soundconf = delete $res->{"res/sound.conf"}; 3056 my $soundconf = delete $res->{"res/sound.conf"};
2871 3057
2872 while (my ($name, $info) = each %$res) { 3058 while (my ($name, $info) = each %$res) {
2873 my $meta = $enc->encode ({
2874 name => $name,
2875 %{ $info->{meta} || {} },
2876 });
2877
2878 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3059 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3060 my $data;
2879 3061
2880 if ($info->{type} & 1) { 3062 if ($info->{type} & 1) {
2881 # prepend meta info 3063 # prepend meta info
2882 3064
3065 my $meta = $enc->encode ({
3066 name => $name,
3067 %{ $info->{meta} || {} },
3068 });
3069
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 3070 $data = pack "(w/a*)*", $meta, $info->{data};
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2885
2886 cf::face::set_data $idx, 0, $data, $chk;
2887 } else { 3071 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3072 $data = $info->{data};
2889 } 3073 }
2890 3074
3075 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2891 cf::face::set_type $idx, $info->{type}; 3076 cf::face::set_type $idx, $info->{type};
2892 3077
2893 cf::cede_to_tick; 3078 cf::cede_to_tick;
2894 } 3079 }
2895 3080
… …
2922 $ns->fx_want ($k, $v); 3107 $ns->fx_want ($k, $v);
2923 } 3108 }
2924}; 3109};
2925 3110
2926sub 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
2927 load_resource_file "$MAPDIR/regions" 3116 load_resource_file "$MAPDIR/regions"
2928 or die "unable to load regions file\n"; 3117 or die "unable to load regions file\n";
2929 3118
2930 for (cf::region::list) { 3119 for (cf::region::list) {
2931 $_->{match} = qr/$_->{match}/ 3120 $_->{match} = qr/$_->{match}/
… …
2967 3156
2968sub init { 3157sub init {
2969 reload_resources; 3158 reload_resources;
2970} 3159}
2971 3160
2972sub cfg_load { 3161sub reload_config {
2973 open my $fh, "<:utf8", "$CONFDIR/config" 3162 open my $fh, "<:utf8", "$CONFDIR/config"
2974 or return; 3163 or return;
2975 3164
2976 local $/; 3165 local $/;
2977 *CFG = YAML::Syck::Load <$fh>; 3166 *CFG = YAML::Syck::Load <$fh>;
… …
2997 (async { 3186 (async {
2998 Event::one_event; 3187 Event::one_event;
2999 })->prio (Coro::PRIO_MAX); 3188 })->prio (Coro::PRIO_MAX);
3000 }; 3189 };
3001 3190
3002 cfg_load; 3191 reload_config;
3003 db_init; 3192 db_init;
3004 load_extensions; 3193 load_extensions;
3005 3194
3006 $TICK_WATCHER->start; 3195 $TICK_WATCHER->start;
3007 Event::loop; 3196 Event::loop;
… …
3200 warn "reloading cf.pm"; 3389 warn "reloading cf.pm";
3201 require cf; 3390 require cf;
3202 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3391 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3203 3392
3204 warn "loading config and database again"; 3393 warn "loading config and database again";
3205 cf::cfg_load; 3394 cf::reload_config;
3206 3395
3207 warn "loading extensions"; 3396 warn "loading extensions";
3208 cf::load_extensions; 3397 cf::load_extensions;
3209 3398
3210 warn "reattaching attachments to objects/players"; 3399 warn "reattaching attachments to objects/players";
… …
3275 my $signal = new Coro::Signal; 3464 my $signal = new Coro::Signal;
3276 push @WAIT_FOR_TICK_BEGIN, $signal; 3465 push @WAIT_FOR_TICK_BEGIN, $signal;
3277 $signal->wait; 3466 $signal->wait;
3278} 3467}
3279 3468
3280 my $min = 1e6;#d#
3281 my $avg = 10;
3282$TICK_WATCHER = Event->timer ( 3469$TICK_WATCHER = Event->timer (
3283 reentrant => 0, 3470 reentrant => 0,
3284 parked => 1, 3471 parked => 1,
3285 prio => 0, 3472 prio => 0,
3286 at => $NEXT_TICK || $TICK, 3473 at => $NEXT_TICK || $TICK,
… …
3294 3481
3295 $NOW = $tick_start = Event::time; 3482 $NOW = $tick_start = Event::time;
3296 3483
3297 cf::server_tick; # one server iteration 3484 cf::server_tick; # one server iteration
3298 3485
3299 0 && sync_job {#d#
3300 for(1..10) {
3301 my $t = Event::time;
3302 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3303 or die;
3304
3305 $map->width (50);
3306 $map->height (50);
3307 $map->alloc;
3308 $map->_load_objects ("/tmp/x.map", 1);
3309 my $t = Event::time - $t;
3310
3311 #next unless $t < 0.0013;#d#
3312 if ($t < $min) {
3313 $min = $t;
3314 }
3315 $avg = $avg * 0.99 + $t * 0.01;
3316 }
3317 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3318 exit 0;
3319 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3320 };
3321
3322 $RUNTIME += $TICK; 3486 $RUNTIME += $TICK;
3323 $NEXT_TICK += $TICK; 3487 $NEXT_TICK += $TICK;
3324 3488
3325 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3489 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3326 $NEXT_RUNTIME_WRITE = $NOW + 10; 3490 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
3328 write_runtime 3492 write_runtime
3329 or warn "ERROR: unable to write runtime file: $!"; 3493 or warn "ERROR: unable to write runtime file: $!";
3330 }; 3494 };
3331 } 3495 }
3332 3496
3333# my $AFTER = Event::time;
3334# warn $AFTER - $NOW;#d#
3335
3336 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3497 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3337 $sig->send; 3498 $sig->send;
3338 } 3499 }
3339 while (my $sig = shift @WAIT_FOR_TICK) { 3500 while (my $sig = shift @WAIT_FOR_TICK) {
3340 $sig->send; 3501 $sig->send;
… …
3350 3511
3351 $LOAD = ($NOW - $tick_start) / $TICK; 3512 $LOAD = ($NOW - $tick_start) / $TICK;
3352 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3513 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3353 3514
3354 _post_tick; 3515 _post_tick;
3355
3356
3357 }, 3516 },
3358); 3517);
3359 3518
3360{ 3519{
3520 BDB::min_parallel 8;
3361 BDB::max_poll_time $TICK * 0.1; 3521 BDB::max_poll_time $TICK * 0.1;
3362 $BDB_POLL_WATCHER = Event->io ( 3522 $BDB_POLL_WATCHER = Event->io (
3363 reentrant => 0, 3523 reentrant => 0,
3364 fd => BDB::poll_fileno, 3524 fd => BDB::poll_fileno,
3365 poll => 'r', 3525 poll => 'r',
3366 prio => 0, 3526 prio => 0,
3367 data => WF_AUTOCANCEL, 3527 data => WF_AUTOCANCEL,
3368 cb => \&BDB::poll_cb, 3528 cb => \&BDB::poll_cb,
3369 ); 3529 );
3370 BDB::min_parallel 8;
3371 3530
3372 BDB::set_sync_prepare { 3531 BDB::set_sync_prepare {
3373 my $status; 3532 my $status;
3374 my $current = $Coro::current; 3533 my $current = $Coro::current;
3375 ( 3534 (
… …
3384 ) 3543 )
3385 }; 3544 };
3386 3545
3387 unless ($DB_ENV) { 3546 unless ($DB_ENV) {
3388 $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);
3389 3552
3390 cf::sync_job { 3553 cf::sync_job {
3391 eval { 3554 eval {
3392 BDB::db_env_open 3555 BDB::db_env_open
3393 $DB_ENV, 3556 $DB_ENV,
… …
3395 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
3396 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3559 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3397 0666; 3560 0666;
3398 3561
3399 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3562 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3400
3401 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3402 $DB_ENV->set_lk_detect;
3403 }; 3563 };
3404 3564
3405 cf::cleanup "db_env_open(db): $@" if $@; 3565 cf::cleanup "db_env_open(db): $@" if $@;
3406 }; 3566 };
3407 } 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 );
3408} 3599}
3409 3600
3410{ 3601{
3411 IO::AIO::min_parallel 8; 3602 IO::AIO::min_parallel 8;
3412 3603

Diff Legend

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