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.368 by root, Wed Sep 12 11:18:25 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
… …
1149 my ($type, $reply, @payload) = 1183 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1184 "ARRAY" eq ref $msg
1151 ? @$msg 1185 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1186 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1187
1188 my @reply;
1189
1154 if (my $cb = $EXTCMD{$type}) { 1190 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1191 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1192 }
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196
1160 } else { 1197 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1199 }
1163 1200
1164 cf::override; 1201 cf::override;
… …
1254 1291
1255=head3 cf::player 1292=head3 cf::player
1256 1293
1257=over 4 1294=over 4
1258 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
1259=item cf::player::find $login 1310=item cf::player::find $login
1260 1311
1261Returns the given player object, loading it if necessary (might block). 1312Returns the given player object, loading it if necessary (might block).
1262 1313
1263=cut 1314=cut
… …
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1349 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1350 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1351 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl"; 1352 aio_unlink +(playerdir $login) . "/$login.pl";
1302 1353
1303 my $pl = load_pl path $login 1354 my $f = new_from_file cf::object::thawer path $login
1304 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;
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 }
2472 # else put him there anyways for now #d#
2473
2474 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2475 }
2476 }
2477
2347 my $map = eval { 2478 my $map = eval {
2348 my $map = cf::map::find $path; 2479 my $map = cf::map::find $path;
2349 2480
2350 if ($map) { 2481 if ($map) {
2351 $map = $map->customise_for ($self); 2482 $map = $map->customise_for ($self);
… …
2493the message, with C<log> being the default. If C<$color> is negative, suppress 2624the message, with C<log> being the default. If C<$color> is negative, suppress
2494the message unless the client supports the msg packet. 2625the message unless the client supports the msg packet.
2495 2626
2496=cut 2627=cut
2497 2628
2629our %CHANNEL = (
2630 "c/identify" => {
2631 id => "identify",
2632 title => "Identify",
2633 reply => undef,
2634 tooltip => "Items recently identified",
2635 },
2636 "c/examine" => {
2637 id => "examine",
2638 title => "Examine",
2639 reply => undef,
2640 tooltip => "Signs and other items you examined",
2641 },
2642);
2643
2498sub cf::client::send_msg { 2644sub cf::client::send_msg {
2499 my ($self, $channel, $msg, $color, @extra) = @_; 2645 my ($self, $channel, $msg, $color, @extra) = @_;
2500 2646
2501 $msg = $self->pl->expand_cfpod ($msg); 2647 $msg = $self->pl->expand_cfpod ($msg);
2502 2648
2503 $color &= cf::NDI_CLIENT_MASK; # just in case... 2649 $color &= cf::NDI_CLIENT_MASK; # just in case...
2650
2651 # check predefined channels, for the benefit of C
2652 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2504 2653
2505 if (ref $channel) { 2654 if (ref $channel) {
2506 # send meta info to client, if not yet sent 2655 # send meta info to client, if not yet sent
2507 unless (exists $self->{channel}{$channel->{id}}) { 2656 unless (exists $self->{channel}{$channel->{id}}) {
2508 $self->{channel}{$channel->{id}} = $channel; 2657 $self->{channel}{$channel->{id}} = $channel;
2509 $self->ext_msg (channel_info => $channel); 2658 $self->ext_msg (channel_info => $channel)
2659 if $self->can_msg;
2510 } 2660 }
2511 2661
2512 $channel = $channel->{id}; 2662 $channel = $channel->{id};
2513 } 2663 }
2514 2664
… …
2555=cut 2705=cut
2556 2706
2557sub cf::client::ext_msg($$@) { 2707sub cf::client::ext_msg($$@) {
2558 my ($self, $type, @msg) = @_; 2708 my ($self, $type, @msg) = @_;
2559 2709
2560 my $extcmd = $self->extcmd;
2561
2562 if ($extcmd == 2) { 2710 if ($self->extcmd == 2) {
2563 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2711 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2564 } elsif ($extcmd == 1) { # TODO: remove 2712 } elsif ($self->extcmd == 1) { # TODO: remove
2565 push @msg, msgtype => "event_$type"; 2713 push @msg, msgtype => "event_$type";
2714 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2715 }
2716}
2717
2718=item $client->ext_reply ($msgid, @msg)
2719
2720Sends an ext reply to the client.
2721
2722=cut
2723
2724sub cf::client::ext_reply($$@) {
2725 my ($self, $id, @msg) = @_;
2726
2727 if ($self->extcmd == 2) {
2728 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2729 } elsif ($self->extcmd == 1) {
2730 #TODO: version 1, remove
2731 unshift @msg, msgtype => "reply", msgid => $id;
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2732 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2567 } 2733 }
2568} 2734}
2569 2735
2570=item $success = $client->query ($flags, "text", \&cb) 2736=item $success = $client->query ($flags, "text", \&cb)
… …
2632 my ($type, $reply, @payload) = 2798 my ($type, $reply, @payload) =
2633 "ARRAY" eq ref $msg 2799 "ARRAY" eq ref $msg
2634 ? @$msg 2800 ? @$msg
2635 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2801 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2636 2802
2803 my @reply;
2804
2637 if (my $cb = $EXTICMD{$type}) { 2805 if (my $cb = $EXTICMD{$type}) {
2638 my @reply = $cb->($ns, @payload); 2806 @reply = $cb->($ns, @payload);
2639
2640 $ns->ext_reply ($reply, @reply)
2641 if $reply;
2642 } 2807 }
2808
2809 $ns->ext_reply ($reply, @reply)
2810 if $reply;
2811
2643 } else { 2812 } else {
2644 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2813 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2645 } 2814 }
2646 2815
2647 cf::override; 2816 cf::override;
… …
2708 2877
2709The following functions and methods are available within a safe environment: 2878The following functions and methods are available within a safe environment:
2710 2879
2711 cf::object 2880 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 2881 contr pay_amount pay_player map x y force_find force_add
2713 insert remove name archname title slaying race 2882 insert remove name archname title slaying race decrease_ob_nr
2714 2883
2715 cf::object::player 2884 cf::object::player
2716 player 2885 player
2717 2886
2718 cf::player 2887 cf::player
… …
2723 2892
2724=cut 2893=cut
2725 2894
2726for ( 2895for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2896 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2728 insert remove inv name archname title slaying race)], 2897 insert remove inv name archname title slaying race
2898 decrease_ob_nr)],
2729 ["cf::object::player" => qw(player)], 2899 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 2900 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 2901 ["cf::map" => qw(trigger)],
2732) { 2902) {
2733 no strict 'refs'; 2903 no strict 'refs';
… …
2809# the server's init and main functions 2979# the server's init and main functions
2810 2980
2811sub load_facedata($) { 2981sub load_facedata($) {
2812 my ($path) = @_; 2982 my ($path) = @_;
2813 2983
2984 # HACK to clear player env face cache, we need some signal framework
2985 # for this (global event?)
2986 %ext::player_env::MUSIC_FACE_CACHE = ();
2987
2988 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2989
2814 warn "loading facedata from $path\n"; 2990 warn "loading facedata from $path\n";
2815 2991
2816 my $facedata; 2992 my $facedata;
2817 0 < aio_load $path, $facedata 2993 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 2994 or die "$path: $!";
2819 2995
2820 $facedata = Coro::Storable::thaw $facedata; 2996 $facedata = Coro::Storable::thaw $facedata;
2821 2997
2822 $facedata->{version} == 2 2998 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 2999 or cf::cleanup "$path: version mismatch, cannot proceed.";
3000
3001 # patch in the exptable
3002 $facedata->{resource}{"res/exp_table"} = {
3003 type => FT_RSRC,
3004 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3005 };
3006 cf::cede_to_tick;
2824 3007
2825 { 3008 {
2826 my $faces = $facedata->{faceinfo}; 3009 my $faces = $facedata->{faceinfo};
2827 3010
2828 while (my ($face, $info) = each %$faces) { 3011 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3012 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2830 cf::face::set_visibility $idx, $info->{visibility}; 3013 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 3014 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3015 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3016 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 3017
2835 cf::cede_to_tick; 3018 cf::cede_to_tick;
2836 } 3019 }
2837 3020
2838 while (my ($face, $info) = each %$faces) { 3021 while (my ($face, $info) = each %$faces) {
… …
2863 3046
2864 { 3047 {
2865 # TODO: for gcfclient pleasure, we should give resources 3048 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 3049 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3050 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869 3051
2870 my $soundconf = delete $res->{"res/sound.conf"}; 3052 my $soundconf = delete $res->{"res/sound.conf"};
2871 3053
2872 while (my ($name, $info) = each %$res) { 3054 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; 3055 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3056 my $data;
2879 3057
2880 if ($info->{type} & 1) { 3058 if ($info->{type} & 1) {
2881 # prepend meta info 3059 # prepend meta info
2882 3060
3061 my $meta = $enc->encode ({
3062 name => $name,
3063 %{ $info->{meta} || {} },
3064 });
3065
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 3066 $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 { 3067 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3068 $data = $info->{data};
2889 } 3069 }
2890 3070
3071 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2891 cf::face::set_type $idx, $info->{type}; 3072 cf::face::set_type $idx, $info->{type};
2892 3073
2893 cf::cede_to_tick; 3074 cf::cede_to_tick;
2894 } 3075 }
2895 3076
… …
2922 $ns->fx_want ($k, $v); 3103 $ns->fx_want ($k, $v);
2923 } 3104 }
2924}; 3105};
2925 3106
2926sub reload_regions { 3107sub reload_regions {
3108 # HACK to clear player env face cache, we need some signal framework
3109 # for this (global event?)
3110 %ext::player_env::MUSIC_FACE_CACHE = ();
3111
2927 load_resource_file "$MAPDIR/regions" 3112 load_resource_file "$MAPDIR/regions"
2928 or die "unable to load regions file\n"; 3113 or die "unable to load regions file\n";
2929 3114
2930 for (cf::region::list) { 3115 for (cf::region::list) {
2931 $_->{match} = qr/$_->{match}/ 3116 $_->{match} = qr/$_->{match}/
… …
2967 3152
2968sub init { 3153sub init {
2969 reload_resources; 3154 reload_resources;
2970} 3155}
2971 3156
2972sub cfg_load { 3157sub reload_config {
2973 open my $fh, "<:utf8", "$CONFDIR/config" 3158 open my $fh, "<:utf8", "$CONFDIR/config"
2974 or return; 3159 or return;
2975 3160
2976 local $/; 3161 local $/;
2977 *CFG = YAML::Syck::Load <$fh>; 3162 *CFG = YAML::Syck::Load <$fh>;
… …
2997 (async { 3182 (async {
2998 Event::one_event; 3183 Event::one_event;
2999 })->prio (Coro::PRIO_MAX); 3184 })->prio (Coro::PRIO_MAX);
3000 }; 3185 };
3001 3186
3002 cfg_load; 3187 reload_config;
3003 db_init; 3188 db_init;
3004 load_extensions; 3189 load_extensions;
3005 3190
3006 $TICK_WATCHER->start; 3191 $TICK_WATCHER->start;
3007 Event::loop; 3192 Event::loop;
… …
3200 warn "reloading cf.pm"; 3385 warn "reloading cf.pm";
3201 require cf; 3386 require cf;
3202 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3387 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3203 3388
3204 warn "loading config and database again"; 3389 warn "loading config and database again";
3205 cf::cfg_load; 3390 cf::reload_config;
3206 3391
3207 warn "loading extensions"; 3392 warn "loading extensions";
3208 cf::load_extensions; 3393 cf::load_extensions;
3209 3394
3210 warn "reattaching attachments to objects/players"; 3395 warn "reattaching attachments to objects/players";
… …
3275 my $signal = new Coro::Signal; 3460 my $signal = new Coro::Signal;
3276 push @WAIT_FOR_TICK_BEGIN, $signal; 3461 push @WAIT_FOR_TICK_BEGIN, $signal;
3277 $signal->wait; 3462 $signal->wait;
3278} 3463}
3279 3464
3280 my $min = 1e6;#d# 3465our $stat_fh;
3281 my $avg = 10; 3466sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3467
3282$TICK_WATCHER = Event->timer ( 3468$TICK_WATCHER = Event->timer (
3283 reentrant => 0, 3469 reentrant => 0,
3284 parked => 1, 3470 parked => 1,
3285 prio => 0, 3471 prio => 0,
3286 at => $NEXT_TICK || $TICK, 3472 at => $NEXT_TICK || $TICK,
… …
3290 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3476 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3291 unless ++$bug_warning > 10; 3477 unless ++$bug_warning > 10;
3292 return; 3478 return;
3293 } 3479 }
3294 3480
3481 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3482
3295 $NOW = $tick_start = Event::time; 3483 $NOW = $tick_start = Event::time;
3296 3484
3297 cf::server_tick; # one server iteration 3485 cf::server_tick; # one server iteration
3298
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 3486
3322 $RUNTIME += $TICK; 3487 $RUNTIME += $TICK;
3323 $NEXT_TICK += $TICK; 3488 $NEXT_TICK += $TICK;
3324 3489
3325 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3490 if ($NOW >= $NEXT_RUNTIME_WRITE) {
… …
3351 $LOAD = ($NOW - $tick_start) / $TICK; 3516 $LOAD = ($NOW - $tick_start) / $TICK;
3352 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3517 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3353 3518
3354 _post_tick; 3519 _post_tick;
3355 3520
3356 3521 # gather some statistics#d#
3522 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d#
3523 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d#
3357 }, 3524 },
3358); 3525);
3359 3526
3360{ 3527{
3528 BDB::min_parallel 8;
3361 BDB::max_poll_time $TICK * 0.1; 3529 BDB::max_poll_time $TICK * 0.1;
3362 $BDB_POLL_WATCHER = Event->io ( 3530 $BDB_POLL_WATCHER = Event->io (
3363 reentrant => 0, 3531 reentrant => 0,
3364 fd => BDB::poll_fileno, 3532 fd => BDB::poll_fileno,
3365 poll => 'r', 3533 poll => 'r',
3366 prio => 0, 3534 prio => 0,
3367 data => WF_AUTOCANCEL, 3535 data => WF_AUTOCANCEL,
3368 cb => \&BDB::poll_cb, 3536 cb => \&BDB::poll_cb,
3369 ); 3537 );
3370 BDB::min_parallel 8;
3371 3538
3372 BDB::set_sync_prepare { 3539 BDB::set_sync_prepare {
3373 my $status; 3540 my $status;
3374 my $current = $Coro::current; 3541 my $current = $Coro::current;
3375 ( 3542 (
… …
3396 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3563 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3397 0666; 3564 0666;
3398 3565
3399 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3566 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3400 3567
3401 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3568 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3569 | BDB::LOG_AUTOREMOVE, 1);
3402 $DB_ENV->set_lk_detect; 3570 $DB_ENV->set_lk_detect;
3403 }; 3571 };
3404 3572
3405 cf::cleanup "db_env_open(db): $@" if $@; 3573 cf::cleanup "db_env_open(db): $@" if $@;
3406 }; 3574 };
3407 } 3575 }
3576
3577 $BDB_CHECKPOINT_WATCHER = Event->timer (
3578 after => 11,
3579 interval => 60,
3580 hard => 1,
3581 prio => 0,
3582 data => WF_AUTOCANCEL,
3583 cb => sub {
3584 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3585 },
3586 );
3587 $BDB_TRICKLE_WATCHER = Event->timer (
3588 after => 5,
3589 interval => 10,
3590 hard => 1,
3591 prio => 0,
3592 data => WF_AUTOCANCEL,
3593 cb => sub {
3594 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3595 },
3596 );
3408} 3597}
3409 3598
3410{ 3599{
3411 IO::AIO::min_parallel 8; 3600 IO::AIO::min_parallel 8;
3412 3601

Diff Legend

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