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.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
… …
1149 my ($type, $reply, @payload) = 1177 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1178 "ARRAY" eq ref $msg
1151 ? @$msg 1179 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1180 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1181
1182 my @reply;
1183
1154 if (my $cb = $EXTCMD{$type}) { 1184 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1185 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1186 }
1187
1188 $pl->ext_reply ($reply, @reply)
1189 if $reply;
1190
1160 } else { 1191 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1192 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1193 }
1163 1194
1164 cf::override; 1195 cf::override;
… …
1254 1285
1255=head3 cf::player 1286=head3 cf::player
1256 1287
1257=over 4 1288=over 4
1258 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
1259=item cf::player::find $login 1304=item cf::player::find $login
1260 1305
1261Returns the given player object, loading it if necessary (might block). 1306Returns the given player object, loading it if necessary (might block).
1262 1307
1263=cut 1308=cut
… …
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1343 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1344 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1345 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl"; 1346 aio_unlink +(playerdir $login) . "/$login.pl";
1302 1347
1303 my $pl = load_pl path $login 1348 my $f = new_from_file cf::object::thawer path $login
1304 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;
1305 $cf::PLAYER{$login} = $pl 1355 $cf::PLAYER{$login} = $pl
1306 } 1356 }
1307 } 1357 }
1308} 1358}
1309 1359
… …
1319 1369
1320 aio_mkdir playerdir $pl, 0770; 1370 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1371 $pl->{last_save} = $cf::RUNTIME;
1322 1372
1323 $pl->save_pl ($path); 1373 $pl->save_pl ($path);
1324 Coro::cede; 1374 cf::cede_to_tick;
1325} 1375}
1326 1376
1327sub new($) { 1377sub new($) {
1328 my ($login) = @_; 1378 my ($login) = @_;
1329 1379
… …
1407 or return []; 1457 or return [];
1408 1458
1409 my @logins; 1459 my @logins;
1410 1460
1411 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") {
1412 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1466 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413 aio_read $fh, 0, 512, my $buf, 0 or next; 1467 aio_read $fh, 0, 512, my $buf, 0 or next;
1414 $buf !~ /^password -------------$/m or next; # official not-valid tag 1468 $buf !~ /^password -------------$/m or next; # official not-valid tag
1469 }
1415 1470
1416 utf8::decode $login; 1471 utf8::decode $login;
1417 push @logins, $login; 1472 push @logins, $login;
1418 } 1473 }
1419 1474
… …
1457sub expand_cfpod { 1512sub expand_cfpod {
1458 ((my $self), (local $_)) = @_; 1513 ((my $self), (local $_)) = @_;
1459 1514
1460 # escape & and < 1515 # escape & and <
1461 s/&/&amp;/g; 1516 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g; 1517 s/(?<![BIUGHT])</&lt;/g;
1463 1518
1464 # 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
1465 1520
1466 1 while 1521 1 while
1467 # replace B<>, I<>, U<> etc. 1522 # replace B<>, I<>, U<> etc.
1468 s/B<([^\>]*)>/<b>$1<\/b>/ 1523 s/B<([^\>]*)>/<b>$1<\/b>/
1469 || s/I<([^\>]*)>/<i>$1<\/i>/ 1524 || s/I<([^\>]*)>/<i>$1<\/i>/
1470 || s/U<([^\>]*)>/<u>$1<\/u>/ 1525 || s/U<([^\>]*)>/<u>$1<\/u>/
1526 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1471 # replace G<male|female> tags 1527 # replace G<male|female> tags
1472 || s{G<([^>|]*)\|([^>]*)>}{ 1528 || s{G<([^>|]*)\|([^>]*)>}{
1473 $self->gender ? $2 : $1 1529 $self->gender ? $2 : $1
1474 }ge 1530 }ge
1475 # replace H<hint text> 1531 # replace H<hint text>
… …
1505=cut 1561=cut
1506 1562
1507sub ext_reply($$@) { 1563sub ext_reply($$@) {
1508 my ($self, $id, @msg) = @_; 1564 my ($self, $id, @msg) = @_;
1509 1565
1510 if ($self->ns->extcmd == 2) { 1566 $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} 1567}
1518 1568
1519=item $player->ext_msg ($type, @msg) 1569=item $player->ext_msg ($type, @msg)
1520 1570
1521Sends an ext event to the client. 1571Sends an ext event to the client.
… …
1749 1799
1750sub load_header_from($) { 1800sub load_header_from($) {
1751 my ($self, $path) = @_; 1801 my ($self, $path) = @_;
1752 1802
1753 utf8::encode $path; 1803 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1804 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 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;
1759 1812
1760 $self->{load_path} = $path; 1813 $self->{load_path} = $path;
1761 1814
1762 1 1815 1
1763} 1816}
… …
1817sub find { 1870sub find {
1818 my ($path, $origin) = @_; 1871 my ($path, $origin) = @_;
1819 1872
1820 $path = normalise $path, $origin && $origin->path; 1873 $path = normalise $path, $origin && $origin->path;
1821 1874
1875 cf::lock_wait "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 1876 cf::lock_wait "map_find:$path";
1823 1877
1824 $cf::MAP{$path} || do { 1878 $cf::MAP{$path} || do {
1825 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
1826 my $map = new_from_path cf::map $path 1882 my $map = new_from_path cf::map $path
1827 or return; 1883 or return;
1828 1884
1829 $map->{last_save} = $cf::RUNTIME; 1885 $map->{last_save} = $cf::RUNTIME;
1830 1886
… …
1832 or return; 1888 or return;
1833 1889
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1890 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 1891 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 1892 #$cf::WAIT_FOR_TICK->wait;
1893 undef $guard1;
1894 undef $guard2;
1837 $map->reset; 1895 $map->reset;
1838 undef $guard;
1839 return find $path; 1896 return find $path;
1840 } 1897 }
1841 1898
1842 $cf::MAP{$path} = $map 1899 $cf::MAP{$path} = $map
1843 } 1900 }
… …
1852 local $self->{deny_reset} = 1; # loading can take a long time 1909 local $self->{deny_reset} = 1; # loading can take a long time
1853 1910
1854 my $path = $self->{path}; 1911 my $path = $self->{path};
1855 1912
1856 { 1913 {
1857 my $guard = cf::lock_acquire "map_load:$path"; 1914 my $guard = cf::lock_acquire "map_data:$path";
1858 1915
1916 return unless $self->valid;
1859 return if $self->in_memory != cf::MAP_SWAPPED; 1917 return unless $self->in_memory == cf::MAP_SWAPPED;
1860 1918
1861 $self->in_memory (cf::MAP_LOADING); 1919 $self->in_memory (cf::MAP_LOADING);
1862 1920
1863 $self->alloc; 1921 $self->alloc;
1864 1922
1865 $self->pre_load; 1923 $self->pre_load;
1866 Coro::cede; 1924 cf::cede_to_tick;
1867 1925
1926 my $f = new_from_file cf::object::thawer $self->{load_path};
1927 $f->skip_block;
1868 $self->_load_objects ($self->{load_path}, 1) 1928 $self->_load_objects ($f)
1869 or return; 1929 or return;
1870 1930
1871 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1931 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1872 if delete $self->{load_original}; 1932 if delete $self->{load_original};
1873 1933
1874 if (my $uniq = $self->uniq_path) { 1934 if (my $uniq = $self->uniq_path) {
1875 utf8::encode $uniq; 1935 utf8::encode $uniq;
1876 if (aio_open $uniq, O_RDONLY, 0) { 1936 unless (aio_stat $uniq) {
1937 if (my $f = new_from_file cf::object::thawer $uniq) {
1877 $self->clear_unique_items; 1938 $self->clear_unique_items;
1878 $self->_load_objects ($uniq, 0); 1939 $self->_load_objects ($f);
1940 $f->resolve_delayed_derefs;
1941 }
1879 } 1942 }
1880 } 1943 }
1881 1944
1882 Coro::cede; 1945 $f->resolve_delayed_derefs;
1946
1947 cf::cede_to_tick;
1883 # now do the right thing for maps 1948 # now do the right thing for maps
1884 $self->link_multipart_objects; 1949 $self->link_multipart_objects;
1885 $self->difficulty ($self->estimate_difficulty) 1950 $self->difficulty ($self->estimate_difficulty)
1886 unless $self->difficulty; 1951 unless $self->difficulty;
1887 Coro::cede; 1952 cf::cede_to_tick;
1888 1953
1889 unless ($self->{deny_activate}) { 1954 unless ($self->{deny_activate}) {
1890 $self->decay_objects; 1955 $self->decay_objects;
1891 $self->fix_auto_apply; 1956 $self->fix_auto_apply;
1892 $self->update_buttons; 1957 $self->update_buttons;
1893 Coro::cede; 1958 cf::cede_to_tick;
1894 $self->set_darkness_map; 1959 $self->set_darkness_map;
1895 Coro::cede; 1960 cf::cede_to_tick;
1896 $self->activate; 1961 $self->activate;
1897 } 1962 }
1898 1963
1899 $self->{last_save} = $cf::RUNTIME; 1964 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME); 1965 $self->last_access ($cf::RUNTIME);
… …
1916 1981
1917 $self 1982 $self
1918} 1983}
1919 1984
1920# find and load all maps in the 3x3 area around a map 1985# find and load all maps in the 3x3 area around a map
1921sub load_diag { 1986sub load_neighbours {
1922 my ($map) = @_; 1987 my ($map) = @_;
1923 1988
1924 my @diag; # diagonal neighbours 1989 my @neigh; # diagonal neighbours
1925 1990
1926 for (0 .. 3) { 1991 for (0 .. 3) {
1927 my $neigh = $map->tile_path ($_) 1992 my $neigh = $map->tile_path ($_)
1928 or next; 1993 or next;
1929 $neigh = find $neigh, $map 1994 $neigh = find $neigh, $map
1930 or next; 1995 or next;
1931 $neigh->load; 1996 $neigh->load;
1932 1997
1998 push @neigh,
1933 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1999 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1934 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2000 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1935 } 2001 }
1936 2002
1937 for (@diag) { 2003 for (grep defined $_->[0], @neigh) {
2004 my ($path, $origin) = @$_;
1938 my $neigh = find @$_ 2005 my $neigh = find $path, $origin
1939 or next; 2006 or next;
1940 $neigh->load; 2007 $neigh->load;
1941 } 2008 }
1942} 2009}
1943 2010
… …
1948} 2015}
1949 2016
1950sub do_load_sync { 2017sub do_load_sync {
1951 my ($map) = @_; 2018 my ($map) = @_;
1952 2019
2020 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2021 if $Coro::current == $Coro::main;
2022
1953 cf::sync_job { $map->load }; 2023 cf::sync_job { $map->load };
1954} 2024}
1955 2025
1956our %MAP_PREFETCH; 2026our %MAP_PREFETCH;
1957our $MAP_PREFETCHER = undef; 2027our $MAP_PREFETCHER = undef;
1958 2028
1959sub find_async { 2029sub find_async {
1960 my ($path, $origin) = @_; 2030 my ($path, $origin, $load) = @_;
1961 2031
1962 $path = normalise $path, $origin && $origin->{path}; 2032 $path = normalise $path, $origin && $origin->{path};
1963 2033
1964 if (my $map = $cf::MAP{$path}) { 2034 if (my $map = $cf::MAP{$path}) {
1965 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2035 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1966 } 2036 }
1967 2037
1968 undef $MAP_PREFETCH{$path}; 2038 $MAP_PREFETCH{$path} |= $load;
2039
1969 $MAP_PREFETCHER ||= cf::async { 2040 $MAP_PREFETCHER ||= cf::async {
1970 while (%MAP_PREFETCH) { 2041 while (%MAP_PREFETCH) {
1971 for my $path (keys %MAP_PREFETCH) { 2042 while (my ($k, $v) = each %MAP_PREFETCH) {
1972 if (my $map = find $path) { 2043 if (my $map = find $k) {
1973 $map->load; 2044 $map->load if $v;
1974 } 2045 }
1975 2046
1976 delete $MAP_PREFETCH{$path}; 2047 delete $MAP_PREFETCH{$k};
1977 } 2048 }
1978 } 2049 }
1979 undef $MAP_PREFETCHER; 2050 undef $MAP_PREFETCHER;
1980 }; 2051 };
1981 $MAP_PREFETCHER->prio (6); 2052 $MAP_PREFETCHER->prio (6);
… …
1984} 2055}
1985 2056
1986sub save { 2057sub save {
1987 my ($self) = @_; 2058 my ($self) = @_;
1988 2059
1989 my $lock = cf::lock_acquire "map_data:" . $self->path; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
1990 2061
1991 $self->{last_save} = $cf::RUNTIME; 2062 $self->{last_save} = $cf::RUNTIME;
1992 2063
1993 return unless $self->dirty; 2064 return unless $self->dirty;
1994 2065
… …
2017 my ($self) = @_; 2088 my ($self) = @_;
2018 2089
2019 # save first because save cedes 2090 # save first because save cedes
2020 $self->save; 2091 $self->save;
2021 2092
2022 my $lock = cf::lock_acquire "map_data:" . $self->path; 2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
2023 2094
2024 return if $self->players; 2095 return if $self->players;
2025 return if $self->in_memory != cf::MAP_IN_MEMORY; 2096 return if $self->in_memory != cf::MAP_IN_MEMORY;
2026 return if $self->{deny_save}; 2097 return if $self->{deny_save};
2027 2098
2099 $self->in_memory (cf::MAP_SWAPPED);
2100
2101 $self->deactivate;
2102 $_->clear_links_to ($self) for values %cf::MAP;
2028 $self->clear; 2103 $self->clear;
2029 $self->in_memory (cf::MAP_SWAPPED);
2030} 2104}
2031 2105
2032sub reset_at { 2106sub reset_at {
2033 my ($self) = @_; 2107 my ($self) = @_;
2034 2108
… …
2066 if $uniq; 2140 if $uniq;
2067 } 2141 }
2068 2142
2069 delete $cf::MAP{$self->path}; 2143 delete $cf::MAP{$self->path};
2070 2144
2145 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP;
2071 $self->clear; 2147 $self->clear;
2072
2073 $_->clear_links_to ($self) for values %cf::MAP;
2074 2148
2075 $self->unlink_save; 2149 $self->unlink_save;
2076 $self->destroy; 2150 $self->destroy;
2077} 2151}
2078 2152
2079my $nuke_counter = "aaaa"; 2153my $nuke_counter = "aaaa";
2080 2154
2081sub nuke { 2155sub nuke {
2082 my ($self) = @_; 2156 my ($self) = @_;
2083 2157
2158 {
2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
2160
2084 delete $cf::MAP{$self->path}; 2161 delete $cf::MAP{$self->path};
2085 2162
2086 $self->unlink_save; 2163 $self->unlink_save;
2087 2164
2088 bless $self, "cf::map"; 2165 bless $self, "cf::map";
2089 delete $self->{deny_reset}; 2166 delete $self->{deny_reset};
2090 $self->{deny_save} = 1; 2167 $self->{deny_save} = 1;
2091 $self->reset_timeout (1); 2168 $self->reset_timeout (1);
2092 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2169 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2093 2170
2094 $cf::MAP{$self->path} = $self; 2171 $cf::MAP{$self->path} = $self;
2172 }
2095 2173
2096 $self->reset; # polite request, might not happen 2174 $self->reset; # polite request, might not happen
2097} 2175}
2098 2176
2099=item $maps = cf::map::tmp_maps 2177=item $maps = cf::map::tmp_maps
… …
2175 2253
2176sub inv_recursive { 2254sub inv_recursive {
2177 inv_recursive_ inv $_[0] 2255 inv_recursive_ inv $_[0]
2178} 2256}
2179 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
2180package cf; 2289package cf;
2181 2290
2182=back 2291=back
2183 2292
2184=head3 cf::object::player 2293=head3 cf::object::player
… …
2312 # use -1 or undef as default coordinates, not 0, 0 2421 # use -1 or undef as default coordinates, not 0, 0
2313 ($x, $y) = ($map->enter_x, $map->enter_y) 2422 ($x, $y) = ($map->enter_x, $map->enter_y)
2314 if $x <=0 && $y <= 0; 2423 if $x <=0 && $y <= 0;
2315 2424
2316 $map->load; 2425 $map->load;
2317 $map->load_diag; 2426 $map->load_neighbours;
2318 2427
2319 return unless $self->contr->active; 2428 return unless $self->contr->active;
2320 $self->activate_recursive; 2429 $self->activate_recursive;
2321 2430
2322 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2431 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2342 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2451 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2343 2452
2344 $self->enter_link; 2453 $self->enter_link;
2345 2454
2346 (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
2347 my $map = eval { 2475 my $map = eval {
2348 my $map = cf::map::find $path; 2476 my $map = defined $path ? cf::map::find $path : undef;
2349 2477
2350 if ($map) { 2478 if ($map) {
2351 $map = $map->customise_for ($self); 2479 $map = $map->customise_for ($self);
2352 $map = $check->($map) if $check && $map; 2480 $map = $check->($map) if $check && $map;
2353 } else { 2481 } else {
2354 $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);
2355 } 2483 }
2356 2484
2357 $map 2485 $map
2358 }; 2486 };
2359 2487
… …
2493the 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
2494the message unless the client supports the msg packet. 2622the message unless the client supports the msg packet.
2495 2623
2496=cut 2624=cut
2497 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
2498sub cf::client::send_msg { 2641sub cf::client::send_msg {
2499 my ($self, $channel, $msg, $color, @extra) = @_; 2642 my ($self, $channel, $msg, $color, @extra) = @_;
2500 2643
2501 $msg = $self->pl->expand_cfpod ($msg); 2644 $msg = $self->pl->expand_cfpod ($msg);
2502 2645
2503 $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};
2504 2650
2505 if (ref $channel) { 2651 if (ref $channel) {
2506 # send meta info to client, if not yet sent 2652 # send meta info to client, if not yet sent
2507 unless (exists $self->{channel}{$channel->{id}}) { 2653 unless (exists $self->{channel}{$channel->{id}}) {
2508 $self->{channel}{$channel->{id}} = $channel; 2654 $self->{channel}{$channel->{id}} = $channel;
2509 $self->ext_msg (channel_info => $channel); 2655 $self->ext_msg (channel_info => $channel)
2656 if $self->can_msg;
2510 } 2657 }
2511 2658
2512 $channel = $channel->{id}; 2659 $channel = $channel->{id};
2513 } 2660 }
2514 2661
… …
2555=cut 2702=cut
2556 2703
2557sub cf::client::ext_msg($$@) { 2704sub cf::client::ext_msg($$@) {
2558 my ($self, $type, @msg) = @_; 2705 my ($self, $type, @msg) = @_;
2559 2706
2560 my $extcmd = $self->extcmd;
2561
2562 if ($extcmd == 2) { 2707 if ($self->extcmd == 2) {
2563 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2708 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2564 } elsif ($extcmd == 1) { # TODO: remove 2709 } elsif ($self->extcmd == 1) { # TODO: remove
2565 push @msg, msgtype => "event_$type"; 2710 push @msg, msgtype => "event_$type";
2711 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2712 }
2713}
2714
2715=item $client->ext_reply ($msgid, @msg)
2716
2717Sends an ext reply to the client.
2718
2719=cut
2720
2721sub cf::client::ext_reply($$@) {
2722 my ($self, $id, @msg) = @_;
2723
2724 if ($self->extcmd == 2) {
2725 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2726 } elsif ($self->extcmd == 1) {
2727 #TODO: version 1, remove
2728 unshift @msg, msgtype => "reply", msgid => $id;
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2729 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2567 } 2730 }
2568} 2731}
2569 2732
2570=item $success = $client->query ($flags, "text", \&cb) 2733=item $success = $client->query ($flags, "text", \&cb)
… …
2632 my ($type, $reply, @payload) = 2795 my ($type, $reply, @payload) =
2633 "ARRAY" eq ref $msg 2796 "ARRAY" eq ref $msg
2634 ? @$msg 2797 ? @$msg
2635 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2798 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2636 2799
2800 my @reply;
2801
2637 if (my $cb = $EXTICMD{$type}) { 2802 if (my $cb = $EXTICMD{$type}) {
2638 my @reply = $cb->($ns, @payload); 2803 @reply = $cb->($ns, @payload);
2639
2640 $ns->ext_reply ($reply, @reply)
2641 if $reply;
2642 } 2804 }
2805
2806 $ns->ext_reply ($reply, @reply)
2807 if $reply;
2808
2643 } else { 2809 } else {
2644 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2810 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2645 } 2811 }
2646 2812
2647 cf::override; 2813 cf::override;
… …
2708 2874
2709The following functions and methods are available within a safe environment: 2875The following functions and methods are available within a safe environment:
2710 2876
2711 cf::object 2877 cf::object
2712 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
2713 insert remove name archname title slaying race 2879 insert remove name archname title slaying race decrease_ob_nr
2714 2880
2715 cf::object::player 2881 cf::object::player
2716 player 2882 player
2717 2883
2718 cf::player 2884 cf::player
… …
2723 2889
2724=cut 2890=cut
2725 2891
2726for ( 2892for (
2727 ["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
2728 insert remove inv name archname title slaying race)], 2894 insert remove inv name archname title slaying race
2895 decrease_ob_nr)],
2729 ["cf::object::player" => qw(player)], 2896 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 2897 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 2898 ["cf::map" => qw(trigger)],
2732) { 2899) {
2733 no strict 'refs'; 2900 no strict 'refs';
… …
2809# the server's init and main functions 2976# the server's init and main functions
2810 2977
2811sub load_facedata($) { 2978sub load_facedata($) {
2812 my ($path) = @_; 2979 my ($path) = @_;
2813 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
2985 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2986
2814 warn "loading facedata from $path\n"; 2987 warn "loading facedata from $path\n";
2815 2988
2816 my $facedata; 2989 my $facedata;
2817 0 < aio_load $path, $facedata 2990 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 2991 or die "$path: $!";
2819 2992
2820 $facedata = Coro::Storable::thaw $facedata; 2993 $facedata = Coro::Storable::thaw $facedata;
2821 2994
2822 $facedata->{version} == 2 2995 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 2996 or cf::cleanup "$path: version mismatch, cannot proceed.";
2997
2998 # patch in the exptable
2999 $facedata->{resource}{"res/exp_table"} = {
3000 type => FT_RSRC,
3001 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3002 };
3003 cf::cede_to_tick;
2824 3004
2825 { 3005 {
2826 my $faces = $facedata->{faceinfo}; 3006 my $faces = $facedata->{faceinfo};
2827 3007
2828 while (my ($face, $info) = each %$faces) { 3008 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3009 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2830 cf::face::set_visibility $idx, $info->{visibility}; 3010 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 3011 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3012 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3013 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 3014
2835 cf::cede_to_tick; 3015 cf::cede_to_tick;
2836 } 3016 }
2837 3017
2838 while (my ($face, $info) = each %$faces) { 3018 while (my ($face, $info) = each %$faces) {
… …
2863 3043
2864 { 3044 {
2865 # TODO: for gcfclient pleasure, we should give resources 3045 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 3046 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3047 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869 3048
2870 my $soundconf = delete $res->{"res/sound.conf"}; 3049 my $soundconf = delete $res->{"res/sound.conf"};
2871 3050
2872 while (my ($name, $info) = each %$res) { 3051 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; 3052 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3053 my $data;
2879 3054
2880 if ($info->{type} & 1) { 3055 if ($info->{type} & 1) {
2881 # prepend meta info 3056 # prepend meta info
2882 3057
3058 my $meta = $enc->encode ({
3059 name => $name,
3060 %{ $info->{meta} || {} },
3061 });
3062
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 3063 $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 { 3064 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3065 $data = $info->{data};
2889 } 3066 }
2890 3067
3068 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2891 cf::face::set_type $idx, $info->{type}; 3069 cf::face::set_type $idx, $info->{type};
2892 3070
2893 cf::cede_to_tick; 3071 cf::cede_to_tick;
2894 } 3072 }
2895 3073
… …
2922 $ns->fx_want ($k, $v); 3100 $ns->fx_want ($k, $v);
2923 } 3101 }
2924}; 3102};
2925 3103
2926sub 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
2927 load_resource_file "$MAPDIR/regions" 3109 load_resource_file "$MAPDIR/regions"
2928 or die "unable to load regions file\n"; 3110 or die "unable to load regions file\n";
2929 3111
2930 for (cf::region::list) { 3112 for (cf::region::list) {
2931 $_->{match} = qr/$_->{match}/ 3113 $_->{match} = qr/$_->{match}/
… …
2967 3149
2968sub init { 3150sub init {
2969 reload_resources; 3151 reload_resources;
2970} 3152}
2971 3153
2972sub cfg_load { 3154sub reload_config {
2973 open my $fh, "<:utf8", "$CONFDIR/config" 3155 open my $fh, "<:utf8", "$CONFDIR/config"
2974 or return; 3156 or return;
2975 3157
2976 local $/; 3158 local $/;
2977 *CFG = YAML::Syck::Load <$fh>; 3159 *CFG = YAML::Syck::Load <$fh>;
… …
2997 (async { 3179 (async {
2998 Event::one_event; 3180 Event::one_event;
2999 })->prio (Coro::PRIO_MAX); 3181 })->prio (Coro::PRIO_MAX);
3000 }; 3182 };
3001 3183
3002 cfg_load; 3184 reload_config;
3003 db_init; 3185 db_init;
3004 load_extensions; 3186 load_extensions;
3005 3187
3006 $TICK_WATCHER->start; 3188 $TICK_WATCHER->start;
3007 Event::loop; 3189 Event::loop;
… …
3200 warn "reloading cf.pm"; 3382 warn "reloading cf.pm";
3201 require cf; 3383 require cf;
3202 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3384 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3203 3385
3204 warn "loading config and database again"; 3386 warn "loading config and database again";
3205 cf::cfg_load; 3387 cf::reload_config;
3206 3388
3207 warn "loading extensions"; 3389 warn "loading extensions";
3208 cf::load_extensions; 3390 cf::load_extensions;
3209 3391
3210 warn "reattaching attachments to objects/players"; 3392 warn "reattaching attachments to objects/players";
… …
3275 my $signal = new Coro::Signal; 3457 my $signal = new Coro::Signal;
3276 push @WAIT_FOR_TICK_BEGIN, $signal; 3458 push @WAIT_FOR_TICK_BEGIN, $signal;
3277 $signal->wait; 3459 $signal->wait;
3278} 3460}
3279 3461
3280 my $min = 1e6;#d#
3281 my $avg = 10;
3282$TICK_WATCHER = Event->timer ( 3462$TICK_WATCHER = Event->timer (
3283 reentrant => 0, 3463 reentrant => 0,
3284 parked => 1, 3464 parked => 1,
3285 prio => 0, 3465 prio => 0,
3286 at => $NEXT_TICK || $TICK, 3466 at => $NEXT_TICK || $TICK,
… …
3294 3474
3295 $NOW = $tick_start = Event::time; 3475 $NOW = $tick_start = Event::time;
3296 3476
3297 cf::server_tick; # one server iteration 3477 cf::server_tick; # one server iteration
3298 3478
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; 3479 $RUNTIME += $TICK;
3323 $NEXT_TICK += $TICK; 3480 $NEXT_TICK += $TICK;
3324 3481
3325 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3482 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3326 $NEXT_RUNTIME_WRITE = $NOW + 10; 3483 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
3328 write_runtime 3485 write_runtime
3329 or warn "ERROR: unable to write runtime file: $!"; 3486 or warn "ERROR: unable to write runtime file: $!";
3330 }; 3487 };
3331 } 3488 }
3332 3489
3333# my $AFTER = Event::time;
3334# warn $AFTER - $NOW;#d#
3335
3336 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3490 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3337 $sig->send; 3491 $sig->send;
3338 } 3492 }
3339 while (my $sig = shift @WAIT_FOR_TICK) { 3493 while (my $sig = shift @WAIT_FOR_TICK) {
3340 $sig->send; 3494 $sig->send;
… …
3350 3504
3351 $LOAD = ($NOW - $tick_start) / $TICK; 3505 $LOAD = ($NOW - $tick_start) / $TICK;
3352 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3506 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3353 3507
3354 _post_tick; 3508 _post_tick;
3355
3356
3357 }, 3509 },
3358); 3510);
3359 3511
3360{ 3512{
3513 BDB::min_parallel 8;
3361 BDB::max_poll_time $TICK * 0.1; 3514 BDB::max_poll_time $TICK * 0.1;
3362 $BDB_POLL_WATCHER = Event->io ( 3515 $BDB_POLL_WATCHER = Event->io (
3363 reentrant => 0, 3516 reentrant => 0,
3364 fd => BDB::poll_fileno, 3517 fd => BDB::poll_fileno,
3365 poll => 'r', 3518 poll => 'r',
3366 prio => 0, 3519 prio => 0,
3367 data => WF_AUTOCANCEL, 3520 data => WF_AUTOCANCEL,
3368 cb => \&BDB::poll_cb, 3521 cb => \&BDB::poll_cb,
3369 ); 3522 );
3370 BDB::min_parallel 8;
3371 3523
3372 BDB::set_sync_prepare { 3524 BDB::set_sync_prepare {
3373 my $status; 3525 my $status;
3374 my $current = $Coro::current; 3526 my $current = $Coro::current;
3375 ( 3527 (
… …
3384 ) 3536 )
3385 }; 3537 };
3386 3538
3387 unless ($DB_ENV) { 3539 unless ($DB_ENV) {
3388 $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);
3389 3545
3390 cf::sync_job { 3546 cf::sync_job {
3391 eval { 3547 eval {
3392 BDB::db_env_open 3548 BDB::db_env_open
3393 $DB_ENV, 3549 $DB_ENV,
… …
3395 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
3396 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3552 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3397 0666; 3553 0666;
3398 3554
3399 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3555 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 }; 3556 };
3404 3557
3405 cf::cleanup "db_env_open(db): $@" if $@; 3558 cf::cleanup "db_env_open(db): $@" if $@;
3406 }; 3559 };
3407 } 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 );
3408} 3592}
3409 3593
3410{ 3594{
3411 IO::AIO::min_parallel 8; 3595 IO::AIO::min_parallel 8;
3412 3596

Diff Legend

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