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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.332 by root, Sat Aug 18 17:33:53 2007 UTC vs.
Revision 1.378 by root, Thu Oct 4 11:36:54 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
… …
341our @SLOT_QUEUE; 354our @SLOT_QUEUE;
342our $SLOT_QUEUE; 355our $SLOT_QUEUE;
343 356
344$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
346 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
347 362
348 while () { 363 while () {
349 next_job: 364 next_job:
350 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
… …
420 435
421 my $busy = 1; 436 my $busy = 1;
422 my @res; 437 my @res;
423 438
424 (async { 439 (async {
440 $Coro::current->desc ("sync job coro");
425 @res = eval { $job->() }; 441 @res = eval { $job->() };
426 warn $@ if $@; 442 warn $@ if $@;
427 undef $busy; 443 undef $busy;
428 })->prio (Coro::PRIO_MAX); 444 })->prio (Coro::PRIO_MAX);
429 445
… …
478sub fork_call(&@) { 494sub fork_call(&@) {
479 my ($cb, @args) = @_; 495 my ($cb, @args) = @_;
480 496
481 # we seemingly have to make a local copy of the whole thing, 497 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 498 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 499 # TODO: investigate and fix (likely this will be rather laborious)
484 500
485 my @res = Coro::Util::fork_eval { 501 my @res = Coro::Util::fork_eval {
486 reset_signals; 502 reset_signals;
487 &$cb 503 &$cb
488 }, @args; 504 }, @args;
… …
497=item cf::db_put $family => $key => $value 513=item cf::db_put $family => $key => $value
498 514
499Stores the given C<$value> in the family. It can currently store binary 515Stores 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). 516data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501 517
518=item $db = cf::db_table "name"
519
520Create and/or open a new database table. The string must not be "db" and must be unique
521within each server.
522
502=cut 523=cut
524
525sub db_table($) {
526 my ($name) = @_;
527 my $db = BDB::db_create $DB_ENV;
528
529 eval {
530 $db->set_flags (BDB::CHKSUM);
531
532 utf8::encode $name;
533 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
534 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
535 cf::cleanup "db_open(db): $!" if $!;
536 };
537 cf::cleanup "db_open(db): $@" if $@;
538
539 $db
540}
503 541
504our $DB; 542our $DB;
505 543
506sub db_init { 544sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 545 cf::sync_job {
511 eval { 546 $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 } 547 };
521} 548}
522 549
523sub db_get($$) { 550sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 551 my $key = "$_[0]/$_[1]";
525 552
… …
575 if (1) { 602 if (1) {
576 $md5 = 603 $md5 =
577 join "\x00", 604 join "\x00",
578 $processversion, 605 $processversion,
579 map { 606 map {
580 Coro::cede; 607 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 608 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 609 } 0.. $#$src;
583 610
584 611
585 my $dbmd5 = db_get cache => "$id/md5"; 612 my $dbmd5 = db_get cache => "$id/md5";
… …
1004sub object_freezer_save { 1031sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1032 my ($filename, $rdata, $objs) = @_;
1006 1033
1007 sync_job { 1034 sync_job {
1008 if (length $$rdata) { 1035 if (length $$rdata) {
1036 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1037 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1038 $decname, length $$rdata, scalar @$objs;
1011 1039
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1040 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1041 chmod SAVE_MODE, $fh;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1042 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1043 aio_fsync $fh if $cf::USE_FSYNC;
… …
1034 } 1062 }
1035 } else { 1063 } else {
1036 aio_unlink $filename; 1064 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1065 aio_unlink "$filename.pst";
1038 } 1066 }
1039 } 1067 };
1040} 1068}
1041 1069
1042sub object_freezer_as_string { 1070sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1071 my ($rdata, $objs) = @_;
1044 1072
… …
1056 or return; 1084 or return;
1057 1085
1058 unless (aio_stat "$filename.pst") { 1086 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1087 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1088 or return;
1089
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1090 $av = eval { (Storable::thaw $av)->{objs} };
1062 } 1091 }
1063 1092
1093 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1094 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1095 $decname, length $data, scalar @{$av || []};
1096
1066 return ($data, $av); 1097 ($data, $av)
1067} 1098}
1068 1099
1069=head2 COMMAND CALLBACKS 1100=head2 COMMAND CALLBACKS
1070 1101
1071=over 4 1102=over 4
… …
1149 my ($type, $reply, @payload) = 1180 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1181 "ARRAY" eq ref $msg
1151 ? @$msg 1182 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1183 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1184
1185 my @reply;
1186
1154 if (my $cb = $EXTCMD{$type}) { 1187 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1188 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1189 }
1190
1191 $pl->ext_reply ($reply, @reply)
1192 if $reply;
1193
1160 } else { 1194 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1195 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1196 }
1163 1197
1164 cf::override; 1198 cf::override;
… …
1254 1288
1255=head3 cf::player 1289=head3 cf::player
1256 1290
1257=over 4 1291=over 4
1258 1292
1293=item cf::player::num_playing
1294
1295Returns the official number of playing players, as per the Crossfire metaserver rules.
1296
1297=cut
1298
1299sub num_playing {
1300 scalar grep
1301 $_->ob->map
1302 && !$_->hidden
1303 && !$_->ob->flag (cf::FLAG_WIZ),
1304 cf::player::list
1305}
1306
1259=item cf::player::find $login 1307=item cf::player::find $login
1260 1308
1261Returns the given player object, loading it if necessary (might block). 1309Returns the given player object, loading it if necessary (might block).
1262 1310
1263=cut 1311=cut
… …
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1346 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1347 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1348 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl"; 1349 aio_unlink +(playerdir $login) . "/$login.pl";
1302 1350
1303 my $pl = load_pl path $login 1351 my $f = new_from_file cf::object::thawer path $login
1304 or return; 1352 or return;
1353
1354 my $pl = cf::player::load_pl $f
1355 or return;
1356 local $cf::PLAYER_LOADING{$login} = $pl;
1357 $f->resolve_delayed_derefs;
1305 $cf::PLAYER{$login} = $pl 1358 $cf::PLAYER{$login} = $pl
1306 } 1359 }
1307 } 1360 }
1308} 1361}
1309 1362
… …
1319 1372
1320 aio_mkdir playerdir $pl, 0770; 1373 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1374 $pl->{last_save} = $cf::RUNTIME;
1322 1375
1323 $pl->save_pl ($path); 1376 $pl->save_pl ($path);
1324 Coro::cede; 1377 cf::cede_to_tick;
1325} 1378}
1326 1379
1327sub new($) { 1380sub new($) {
1328 my ($login) = @_; 1381 my ($login) = @_;
1329 1382
… …
1407 or return []; 1460 or return [];
1408 1461
1409 my @logins; 1462 my @logins;
1410 1463
1411 for my $login (@$dirs) { 1464 for my $login (@$dirs) {
1465 my $path = path $login;
1466
1467 # a .pst is a dead give-away for a valid player
1468 unless (-e "$path.pst") {
1412 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1469 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413 aio_read $fh, 0, 512, my $buf, 0 or next; 1470 aio_read $fh, 0, 512, my $buf, 0 or next;
1414 $buf !~ /^password -------------$/m or next; # official not-valid tag 1471 $buf !~ /^password -------------$/m or next; # official not-valid tag
1472 }
1415 1473
1416 utf8::decode $login; 1474 utf8::decode $login;
1417 push @logins, $login; 1475 push @logins, $login;
1418 } 1476 }
1419 1477
… …
1457sub expand_cfpod { 1515sub expand_cfpod {
1458 ((my $self), (local $_)) = @_; 1516 ((my $self), (local $_)) = @_;
1459 1517
1460 # escape & and < 1518 # escape & and <
1461 s/&/&amp;/g; 1519 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g; 1520 s/(?<![BIUGHT])</&lt;/g;
1463 1521
1464 # this is buggy, it needs to properly take care of nested <'s 1522 # this is buggy, it needs to properly take care of nested <'s
1465 1523
1466 1 while 1524 1 while
1467 # replace B<>, I<>, U<> etc. 1525 # replace B<>, I<>, U<> etc.
1468 s/B<([^\>]*)>/<b>$1<\/b>/ 1526 s/B<([^\>]*)>/<b>$1<\/b>/
1469 || s/I<([^\>]*)>/<i>$1<\/i>/ 1527 || s/I<([^\>]*)>/<i>$1<\/i>/
1470 || s/U<([^\>]*)>/<u>$1<\/u>/ 1528 || s/U<([^\>]*)>/<u>$1<\/u>/
1529 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1471 # replace G<male|female> tags 1530 # replace G<male|female> tags
1472 || s{G<([^>|]*)\|([^>]*)>}{ 1531 || s{G<([^>|]*)\|([^>]*)>}{
1473 $self->gender ? $2 : $1 1532 $self->gender ? $2 : $1
1474 }ge 1533 }ge
1475 # replace H<hint text> 1534 # replace H<hint text>
… …
1505=cut 1564=cut
1506 1565
1507sub ext_reply($$@) { 1566sub ext_reply($$@) {
1508 my ($self, $id, @msg) = @_; 1567 my ($self, $id, @msg) = @_;
1509 1568
1510 if ($self->ns->extcmd == 2) { 1569 $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} 1570}
1518 1571
1519=item $player->ext_msg ($type, @msg) 1572=item $player->ext_msg ($type, @msg)
1520 1573
1521Sends an ext event to the client. 1574Sends an ext event to the client.
… …
1749 1802
1750sub load_header_from($) { 1803sub load_header_from($) {
1751 my ($self, $path) = @_; 1804 my ($self, $path) = @_;
1752 1805
1753 utf8::encode $path; 1806 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1807 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 1808 or return;
1809
1810 $self->_load_header ($f)
1811 or return;
1812
1813 local $MAP_LOADING{$self->{path}} = $self;
1814 $f->resolve_delayed_derefs;
1759 1815
1760 $self->{load_path} = $path; 1816 $self->{load_path} = $path;
1761 1817
1762 1 1818 1
1763} 1819}
… …
1817sub find { 1873sub find {
1818 my ($path, $origin) = @_; 1874 my ($path, $origin) = @_;
1819 1875
1820 $path = normalise $path, $origin && $origin->path; 1876 $path = normalise $path, $origin && $origin->path;
1821 1877
1878 cf::lock_wait "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 1879 cf::lock_wait "map_find:$path";
1823 1880
1824 $cf::MAP{$path} || do { 1881 $cf::MAP{$path} || do {
1825 my $guard = cf::lock_acquire "map_find:$path"; 1882 my $guard1 = cf::lock_acquire "map_find:$path";
1883 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1884
1826 my $map = new_from_path cf::map $path 1885 my $map = new_from_path cf::map $path
1827 or return; 1886 or return;
1828 1887
1829 $map->{last_save} = $cf::RUNTIME; 1888 $map->{last_save} = $cf::RUNTIME;
1830 1889
… …
1832 or return; 1891 or return;
1833 1892
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1893 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 1894 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 1895 #$cf::WAIT_FOR_TICK->wait;
1896 undef $guard1;
1897 undef $guard2;
1837 $map->reset; 1898 $map->reset;
1838 undef $guard;
1839 return find $path; 1899 return find $path;
1840 } 1900 }
1841 1901
1842 $cf::MAP{$path} = $map 1902 $cf::MAP{$path} = $map
1843 } 1903 }
… …
1852 local $self->{deny_reset} = 1; # loading can take a long time 1912 local $self->{deny_reset} = 1; # loading can take a long time
1853 1913
1854 my $path = $self->{path}; 1914 my $path = $self->{path};
1855 1915
1856 { 1916 {
1857 my $guard = cf::lock_acquire "map_load:$path"; 1917 my $guard = cf::lock_acquire "map_data:$path";
1858 1918
1919 return unless $self->valid;
1859 return if $self->in_memory != cf::MAP_SWAPPED; 1920 return unless $self->in_memory == cf::MAP_SWAPPED;
1860 1921
1861 $self->in_memory (cf::MAP_LOADING); 1922 $self->in_memory (cf::MAP_LOADING);
1862 1923
1863 $self->alloc; 1924 $self->alloc;
1864 1925
1865 $self->pre_load; 1926 $self->pre_load;
1866 Coro::cede; 1927 cf::cede_to_tick;
1867 1928
1929 my $f = new_from_file cf::object::thawer $self->{load_path};
1930 $f->skip_block;
1868 $self->_load_objects ($self->{load_path}, 1) 1931 $self->_load_objects ($f)
1869 or return; 1932 or return;
1870 1933
1871 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1934 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1872 if delete $self->{load_original}; 1935 if delete $self->{load_original};
1873 1936
1874 if (my $uniq = $self->uniq_path) { 1937 if (my $uniq = $self->uniq_path) {
1875 utf8::encode $uniq; 1938 utf8::encode $uniq;
1876 if (aio_open $uniq, O_RDONLY, 0) { 1939 unless (aio_stat $uniq) {
1940 if (my $f = new_from_file cf::object::thawer $uniq) {
1877 $self->clear_unique_items; 1941 $self->clear_unique_items;
1878 $self->_load_objects ($uniq, 0); 1942 $self->_load_objects ($f);
1943 $f->resolve_delayed_derefs;
1944 }
1879 } 1945 }
1880 } 1946 }
1881 1947
1882 Coro::cede; 1948 $f->resolve_delayed_derefs;
1949
1950 cf::cede_to_tick;
1883 # now do the right thing for maps 1951 # now do the right thing for maps
1884 $self->link_multipart_objects; 1952 $self->link_multipart_objects;
1885 $self->difficulty ($self->estimate_difficulty) 1953 $self->difficulty ($self->estimate_difficulty)
1886 unless $self->difficulty; 1954 unless $self->difficulty;
1887 Coro::cede; 1955 cf::cede_to_tick;
1888 1956
1889 unless ($self->{deny_activate}) { 1957 unless ($self->{deny_activate}) {
1890 $self->decay_objects; 1958 $self->decay_objects;
1891 $self->fix_auto_apply; 1959 $self->fix_auto_apply;
1892 $self->update_buttons; 1960 $self->update_buttons;
1893 Coro::cede; 1961 cf::cede_to_tick;
1894 $self->set_darkness_map; 1962 $self->set_darkness_map;
1895 Coro::cede; 1963 cf::cede_to_tick;
1896 $self->activate; 1964 $self->activate;
1897 } 1965 }
1898 1966
1899 $self->{last_save} = $cf::RUNTIME; 1967 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME); 1968 $self->last_access ($cf::RUNTIME);
… …
1916 1984
1917 $self 1985 $self
1918} 1986}
1919 1987
1920# find and load all maps in the 3x3 area around a map 1988# find and load all maps in the 3x3 area around a map
1921sub load_diag { 1989sub load_neighbours {
1922 my ($map) = @_; 1990 my ($map) = @_;
1923 1991
1924 my @diag; # diagonal neighbours 1992 my @neigh; # diagonal neighbours
1925 1993
1926 for (0 .. 3) { 1994 for (0 .. 3) {
1927 my $neigh = $map->tile_path ($_) 1995 my $neigh = $map->tile_path ($_)
1928 or next; 1996 or next;
1929 $neigh = find $neigh, $map 1997 $neigh = find $neigh, $map
1930 or next; 1998 or next;
1931 $neigh->load; 1999 $neigh->load;
1932 2000
2001 push @neigh,
1933 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2002 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1934 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2003 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1935 } 2004 }
1936 2005
1937 for (@diag) { 2006 for (grep defined $_->[0], @neigh) {
2007 my ($path, $origin) = @$_;
1938 my $neigh = find @$_ 2008 my $neigh = find $path, $origin
1939 or next; 2009 or next;
1940 $neigh->load; 2010 $neigh->load;
1941 } 2011 }
1942} 2012}
1943 2013
… …
1948} 2018}
1949 2019
1950sub do_load_sync { 2020sub do_load_sync {
1951 my ($map) = @_; 2021 my ($map) = @_;
1952 2022
2023 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2024 if $Coro::current == $Coro::main;
2025
1953 cf::sync_job { $map->load }; 2026 cf::sync_job { $map->load };
1954} 2027}
1955 2028
1956our %MAP_PREFETCH; 2029our %MAP_PREFETCH;
1957our $MAP_PREFETCHER = undef; 2030our $MAP_PREFETCHER = undef;
1958 2031
1959sub find_async { 2032sub find_async {
1960 my ($path, $origin) = @_; 2033 my ($path, $origin, $load) = @_;
1961 2034
1962 $path = normalise $path, $origin && $origin->{path}; 2035 $path = normalise $path, $origin && $origin->{path};
1963 2036
1964 if (my $map = $cf::MAP{$path}) { 2037 if (my $map = $cf::MAP{$path}) {
1965 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2038 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1966 } 2039 }
1967 2040
1968 undef $MAP_PREFETCH{$path}; 2041 $MAP_PREFETCH{$path} |= $load;
2042
1969 $MAP_PREFETCHER ||= cf::async { 2043 $MAP_PREFETCHER ||= cf::async {
2044 $Coro::current->{desc} = "map prefetcher";
2045
1970 while (%MAP_PREFETCH) { 2046 while (%MAP_PREFETCH) {
1971 for my $path (keys %MAP_PREFETCH) { 2047 while (my ($k, $v) = each %MAP_PREFETCH) {
1972 if (my $map = find $path) { 2048 if (my $map = find $k) {
1973 $map->load; 2049 $map->load if $v;
1974 } 2050 }
1975 2051
1976 delete $MAP_PREFETCH{$path}; 2052 delete $MAP_PREFETCH{$k};
1977 } 2053 }
1978 } 2054 }
1979 undef $MAP_PREFETCHER; 2055 undef $MAP_PREFETCHER;
1980 }; 2056 };
1981 $MAP_PREFETCHER->prio (6); 2057 $MAP_PREFETCHER->prio (6);
… …
1984} 2060}
1985 2061
1986sub save { 2062sub save {
1987 my ($self) = @_; 2063 my ($self) = @_;
1988 2064
1989 my $lock = cf::lock_acquire "map_data:" . $self->path; 2065 my $lock = cf::lock_acquire "map_data:$self->{path}";
1990 2066
1991 $self->{last_save} = $cf::RUNTIME; 2067 $self->{last_save} = $cf::RUNTIME;
1992 2068
1993 return unless $self->dirty; 2069 return unless $self->dirty;
1994 2070
… …
2000 return if $self->{deny_save}; 2076 return if $self->{deny_save};
2001 2077
2002 local $self->{last_access} = $self->last_access;#d# 2078 local $self->{last_access} = $self->last_access;#d#
2003 2079
2004 cf::async { 2080 cf::async {
2081 $Coro::current->{desc} = "map player save";
2005 $_->contr->save for $self->players; 2082 $_->contr->save for $self->players;
2006 }; 2083 };
2007 2084
2008 if ($uniq) { 2085 if ($uniq) {
2009 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2017 my ($self) = @_; 2094 my ($self) = @_;
2018 2095
2019 # save first because save cedes 2096 # save first because save cedes
2020 $self->save; 2097 $self->save;
2021 2098
2022 my $lock = cf::lock_acquire "map_data:" . $self->path; 2099 my $lock = cf::lock_acquire "map_data:$self->{path}";
2023 2100
2024 return if $self->players; 2101 return if $self->players;
2025 return if $self->in_memory != cf::MAP_IN_MEMORY; 2102 return if $self->in_memory != cf::MAP_IN_MEMORY;
2026 return if $self->{deny_save}; 2103 return if $self->{deny_save};
2027 2104
2105 $self->in_memory (cf::MAP_SWAPPED);
2106
2107 $self->deactivate;
2108 $_->clear_links_to ($self) for values %cf::MAP;
2028 $self->clear; 2109 $self->clear;
2029 $self->in_memory (cf::MAP_SWAPPED);
2030} 2110}
2031 2111
2032sub reset_at { 2112sub reset_at {
2033 my ($self) = @_; 2113 my ($self) = @_;
2034 2114
… …
2066 if $uniq; 2146 if $uniq;
2067 } 2147 }
2068 2148
2069 delete $cf::MAP{$self->path}; 2149 delete $cf::MAP{$self->path};
2070 2150
2151 $self->deactivate;
2152 $_->clear_links_to ($self) for values %cf::MAP;
2071 $self->clear; 2153 $self->clear;
2072
2073 $_->clear_links_to ($self) for values %cf::MAP;
2074 2154
2075 $self->unlink_save; 2155 $self->unlink_save;
2076 $self->destroy; 2156 $self->destroy;
2077} 2157}
2078 2158
2079my $nuke_counter = "aaaa"; 2159my $nuke_counter = "aaaa";
2080 2160
2081sub nuke { 2161sub nuke {
2082 my ($self) = @_; 2162 my ($self) = @_;
2083 2163
2164 {
2165 my $lock = cf::lock_acquire "map_data:$self->{path}";
2166
2084 delete $cf::MAP{$self->path}; 2167 delete $cf::MAP{$self->path};
2085 2168
2086 $self->unlink_save; 2169 $self->unlink_save;
2087 2170
2088 bless $self, "cf::map"; 2171 bless $self, "cf::map";
2089 delete $self->{deny_reset}; 2172 delete $self->{deny_reset};
2090 $self->{deny_save} = 1; 2173 $self->{deny_save} = 1;
2091 $self->reset_timeout (1); 2174 $self->reset_timeout (1);
2092 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2175 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2093 2176
2094 $cf::MAP{$self->path} = $self; 2177 $cf::MAP{$self->path} = $self;
2178 }
2095 2179
2096 $self->reset; # polite request, might not happen 2180 $self->reset; # polite request, might not happen
2097} 2181}
2098 2182
2099=item $maps = cf::map::tmp_maps 2183=item $maps = cf::map::tmp_maps
… …
2175 2259
2176sub inv_recursive { 2260sub inv_recursive {
2177 inv_recursive_ inv $_[0] 2261 inv_recursive_ inv $_[0]
2178} 2262}
2179 2263
2264=item $ref = $ob->ref
2265
2266creates and returns a persistent reference to an objetc that can be stored as a string.
2267
2268=item $ob = cf::object::deref ($refstring)
2269
2270returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2271even if the object actually exists. May block.
2272
2273=cut
2274
2275sub deref {
2276 my ($ref) = @_;
2277
2278 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2279 my ($uuid, $name) = ($1, $2);
2280 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2281 or return;
2282 $pl->ob->uuid eq $uuid
2283 or return;
2284
2285 $pl->ob
2286 } else {
2287 warn "$ref: cannot resolve object reference\n";
2288 undef
2289 }
2290}
2291
2180package cf; 2292package cf;
2181 2293
2182=back 2294=back
2183 2295
2184=head3 cf::object::player 2296=head3 cf::object::player
… …
2312 # use -1 or undef as default coordinates, not 0, 0 2424 # use -1 or undef as default coordinates, not 0, 0
2313 ($x, $y) = ($map->enter_x, $map->enter_y) 2425 ($x, $y) = ($map->enter_x, $map->enter_y)
2314 if $x <=0 && $y <= 0; 2426 if $x <=0 && $y <= 0;
2315 2427
2316 $map->load; 2428 $map->load;
2317 $map->load_diag; 2429 $map->load_neighbours;
2318 2430
2319 return unless $self->contr->active; 2431 return unless $self->contr->active;
2320 $self->activate_recursive; 2432 $self->activate_recursive;
2321 2433
2322 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2434 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2342 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2454 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2343 2455
2344 $self->enter_link; 2456 $self->enter_link;
2345 2457
2346 (async { 2458 (async {
2459 $Coro::current->{desc} = "player::goto $path $x $y";
2460
2461 # *tag paths override both path and x|y
2462 if ($path =~ /^\*(.*)$/) {
2463 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2464 my $ob = $obs[rand @obs];
2465
2466 # see if we actually can go there
2467 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2468 $ob = $obs[rand @obs];
2469 } else {
2470 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2471 }
2472 # else put us there anyways for now #d#
2473
2474 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2475 } else {
2476 ($path, $x, $y) = (undef, undef, undef);
2477 }
2478 }
2479
2347 my $map = eval { 2480 my $map = eval {
2348 my $map = cf::map::find $path; 2481 my $map = defined $path ? cf::map::find $path : undef;
2349 2482
2350 if ($map) { 2483 if ($map) {
2351 $map = $map->customise_for ($self); 2484 $map = $map->customise_for ($self);
2352 $map = $check->($map) if $check && $map; 2485 $map = $check->($map) if $check && $map;
2353 } else { 2486 } else {
2354 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2487 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2355 } 2488 }
2356 2489
2357 $map 2490 $map
2358 }; 2491 };
2359 2492
… …
2449 # if exit is damned, update players death & WoR home-position 2582 # if exit is damned, update players death & WoR home-position
2450 $self->contr->savebed ($slaying, $hp, $sp) 2583 $self->contr->savebed ($slaying, $hp, $sp)
2451 if $exit->flag (FLAG_DAMNED); 2584 if $exit->flag (FLAG_DAMNED);
2452 2585
2453 (async { 2586 (async {
2587 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2588
2454 $self->deactivate_recursive; # just to be sure 2589 $self->deactivate_recursive; # just to be sure
2455 unless (eval { 2590 unless (eval {
2456 $self->goto ($slaying, $hp, $sp); 2591 $self->goto ($slaying, $hp, $sp);
2457 2592
2458 1; 2593 1;
… …
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 => "infobox",
2636 title => "Identify",
2637 reply => undef,
2638 tooltip => "Items recently identified",
2639 },
2640 "c/examine" => {
2641 id => "infobox",
2642 title => "Examine",
2643 reply => undef,
2644 tooltip => "Signs and other items you examined",
2645 },
2646 "c/lookat" => {
2647 id => "infobox",
2648 title => "Look",
2649 reply => undef,
2650 tooltip => "What you saw there",
2651 },
2652);
2653
2498sub cf::client::send_msg { 2654sub cf::client::send_msg {
2499 my ($self, $channel, $msg, $color, @extra) = @_; 2655 my ($self, $channel, $msg, $color, @extra) = @_;
2500 2656
2501 $msg = $self->pl->expand_cfpod ($msg); 2657 $msg = $self->pl->expand_cfpod ($msg);
2502 2658
2503 $color &= cf::NDI_CLIENT_MASK; # just in case... 2659 $color &= cf::NDI_CLIENT_MASK; # just in case...
2504 2660
2661 # check predefined channels, for the benefit of C
2662 if ($CHANNEL{$channel}) {
2663 $channel = $CHANNEL{$channel};
2664
2665 $self->ext_msg (channel_info => $channel)
2666 if $self->can_msg;
2667
2668 $channel = $channel->{id};
2669
2505 if (ref $channel) { 2670 } elsif (ref $channel) {
2506 # send meta info to client, if not yet sent 2671 # send meta info to client, if not yet sent
2507 unless (exists $self->{channel}{$channel->{id}}) { 2672 unless (exists $self->{channel}{$channel->{id}}) {
2508 $self->{channel}{$channel->{id}} = $channel; 2673 $self->{channel}{$channel->{id}} = $channel;
2509 $self->ext_msg (channel_info => $channel); 2674 $self->ext_msg (channel_info => $channel)
2675 if $self->can_msg;
2510 } 2676 }
2511 2677
2512 $channel = $channel->{id}; 2678 $channel = $channel->{id};
2513 } 2679 }
2514 2680
… …
2555=cut 2721=cut
2556 2722
2557sub cf::client::ext_msg($$@) { 2723sub cf::client::ext_msg($$@) {
2558 my ($self, $type, @msg) = @_; 2724 my ($self, $type, @msg) = @_;
2559 2725
2560 my $extcmd = $self->extcmd;
2561
2562 if ($extcmd == 2) { 2726 if ($self->extcmd == 2) {
2563 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2727 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2564 } elsif ($extcmd == 1) { # TODO: remove 2728 } elsif ($self->extcmd == 1) { # TODO: remove
2565 push @msg, msgtype => "event_$type"; 2729 push @msg, msgtype => "event_$type";
2730 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2731 }
2732}
2733
2734=item $client->ext_reply ($msgid, @msg)
2735
2736Sends an ext reply to the client.
2737
2738=cut
2739
2740sub cf::client::ext_reply($$@) {
2741 my ($self, $id, @msg) = @_;
2742
2743 if ($self->extcmd == 2) {
2744 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2745 } elsif ($self->extcmd == 1) {
2746 #TODO: version 1, remove
2747 unshift @msg, msgtype => "reply", msgid => $id;
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2748 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2567 } 2749 }
2568} 2750}
2569 2751
2570=item $success = $client->query ($flags, "text", \&cb) 2752=item $success = $client->query ($flags, "text", \&cb)
… …
2632 my ($type, $reply, @payload) = 2814 my ($type, $reply, @payload) =
2633 "ARRAY" eq ref $msg 2815 "ARRAY" eq ref $msg
2634 ? @$msg 2816 ? @$msg
2635 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2817 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2636 2818
2819 my @reply;
2820
2637 if (my $cb = $EXTICMD{$type}) { 2821 if (my $cb = $EXTICMD{$type}) {
2638 my @reply = $cb->($ns, @payload); 2822 @reply = $cb->($ns, @payload);
2639
2640 $ns->ext_reply ($reply, @reply)
2641 if $reply;
2642 } 2823 }
2824
2825 $ns->ext_reply ($reply, @reply)
2826 if $reply;
2827
2643 } else { 2828 } else {
2644 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2829 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2645 } 2830 }
2646 2831
2647 cf::override; 2832 cf::override;
… …
2708 2893
2709The following functions and methods are available within a safe environment: 2894The following functions and methods are available within a safe environment:
2710 2895
2711 cf::object 2896 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 2897 contr pay_amount pay_player map x y force_find force_add
2713 insert remove name archname title slaying race 2898 insert remove name archname title slaying race decrease_ob_nr
2714 2899
2715 cf::object::player 2900 cf::object::player
2716 player 2901 player
2717 2902
2718 cf::player 2903 cf::player
… …
2723 2908
2724=cut 2909=cut
2725 2910
2726for ( 2911for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2912 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2728 insert remove inv name archname title slaying race)], 2913 insert remove inv name archname title slaying race
2914 decrease_ob_nr)],
2729 ["cf::object::player" => qw(player)], 2915 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 2916 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 2917 ["cf::map" => qw(trigger)],
2732) { 2918) {
2733 no strict 'refs'; 2919 no strict 'refs';
… …
2809# the server's init and main functions 2995# the server's init and main functions
2810 2996
2811sub load_facedata($) { 2997sub load_facedata($) {
2812 my ($path) = @_; 2998 my ($path) = @_;
2813 2999
3000 # HACK to clear player env face cache, we need some signal framework
3001 # for this (global event?)
3002 %ext::player_env::MUSIC_FACE_CACHE = ();
3003
3004 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3005
2814 warn "loading facedata from $path\n"; 3006 warn "loading facedata from $path\n";
2815 3007
2816 my $facedata; 3008 my $facedata;
2817 0 < aio_load $path, $facedata 3009 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 3010 or die "$path: $!";
2819 3011
2820 $facedata = Coro::Storable::thaw $facedata; 3012 $facedata = Coro::Storable::thaw $facedata;
2821 3013
2822 $facedata->{version} == 2 3014 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 3015 or cf::cleanup "$path: version mismatch, cannot proceed.";
3016
3017 # patch in the exptable
3018 $facedata->{resource}{"res/exp_table"} = {
3019 type => FT_RSRC,
3020 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3021 };
3022 cf::cede_to_tick;
2824 3023
2825 { 3024 {
2826 my $faces = $facedata->{faceinfo}; 3025 my $faces = $facedata->{faceinfo};
2827 3026
2828 while (my ($face, $info) = each %$faces) { 3027 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3028 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2830 cf::face::set_visibility $idx, $info->{visibility}; 3029 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 3030 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3031 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3032 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 3033
2835 cf::cede_to_tick; 3034 cf::cede_to_tick;
2836 } 3035 }
2837 3036
2838 while (my ($face, $info) = each %$faces) { 3037 while (my ($face, $info) = each %$faces) {
… …
2863 3062
2864 { 3063 {
2865 # TODO: for gcfclient pleasure, we should give resources 3064 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 3065 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3066 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869 3067
2870 my $soundconf = delete $res->{"res/sound.conf"}; 3068 my $soundconf = delete $res->{"res/sound.conf"};
2871 3069
2872 while (my ($name, $info) = each %$res) { 3070 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; 3071 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3072 my $data;
2879 3073
2880 if ($info->{type} & 1) { 3074 if ($info->{type} & 1) {
2881 # prepend meta info 3075 # prepend meta info
2882 3076
3077 my $meta = $enc->encode ({
3078 name => $name,
3079 %{ $info->{meta} || {} },
3080 });
3081
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 3082 $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 { 3083 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3084 $data = $info->{data};
2889 } 3085 }
2890 3086
3087 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2891 cf::face::set_type $idx, $info->{type}; 3088 cf::face::set_type $idx, $info->{type};
2892 3089
2893 cf::cede_to_tick; 3090 cf::cede_to_tick;
2894 } 3091 }
2895 3092
… …
2922 $ns->fx_want ($k, $v); 3119 $ns->fx_want ($k, $v);
2923 } 3120 }
2924}; 3121};
2925 3122
2926sub reload_regions { 3123sub reload_regions {
3124 # HACK to clear player env face cache, we need some signal framework
3125 # for this (global event?)
3126 %ext::player_env::MUSIC_FACE_CACHE = ();
3127
2927 load_resource_file "$MAPDIR/regions" 3128 load_resource_file "$MAPDIR/regions"
2928 or die "unable to load regions file\n"; 3129 or die "unable to load regions file\n";
2929 3130
2930 for (cf::region::list) { 3131 for (cf::region::list) {
2931 $_->{match} = qr/$_->{match}/ 3132 $_->{match} = qr/$_->{match}/
… …
2967 3168
2968sub init { 3169sub init {
2969 reload_resources; 3170 reload_resources;
2970} 3171}
2971 3172
2972sub cfg_load { 3173sub reload_config {
2973 open my $fh, "<:utf8", "$CONFDIR/config" 3174 open my $fh, "<:utf8", "$CONFDIR/config"
2974 or return; 3175 or return;
2975 3176
2976 local $/; 3177 local $/;
2977 *CFG = YAML::Syck::Load <$fh>; 3178 *CFG = YAML::Syck::Load <$fh>;
… …
2993sub main { 3194sub main {
2994 # we must not ever block the main coroutine 3195 # we must not ever block the main coroutine
2995 local $Coro::idle = sub { 3196 local $Coro::idle = sub {
2996 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3197 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2997 (async { 3198 (async {
3199 $Coro::current->{desc} = "IDLE BUG HANDLER";
2998 Event::one_event; 3200 Event::one_event;
2999 })->prio (Coro::PRIO_MAX); 3201 })->prio (Coro::PRIO_MAX);
3000 }; 3202 };
3001 3203
3002 cfg_load; 3204 reload_config;
3003 db_init; 3205 db_init;
3004 load_extensions; 3206 load_extensions;
3005 3207
3006 $TICK_WATCHER->start; 3208 $TICK_WATCHER->start;
3007 Event::loop; 3209 Event::loop;
… …
3200 warn "reloading cf.pm"; 3402 warn "reloading cf.pm";
3201 require cf; 3403 require cf;
3202 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3404 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3203 3405
3204 warn "loading config and database again"; 3406 warn "loading config and database again";
3205 cf::cfg_load; 3407 cf::reload_config;
3206 3408
3207 warn "loading extensions"; 3409 warn "loading extensions";
3208 cf::load_extensions; 3410 cf::load_extensions;
3209 3411
3210 warn "reattaching attachments to objects/players"; 3412 warn "reattaching attachments to objects/players";
… …
3246register_command "reload" => sub { 3448register_command "reload" => sub {
3247 my ($who, $arg) = @_; 3449 my ($who, $arg) = @_;
3248 3450
3249 if ($who->flag (FLAG_WIZ)) { 3451 if ($who->flag (FLAG_WIZ)) {
3250 $who->message ("reloading server."); 3452 $who->message ("reloading server.");
3453 async {
3454 $Coro::current->{desc} = "perl_reload";
3251 async { reload_perl }; 3455 reload_perl;
3456 };
3252 } 3457 }
3253}; 3458};
3254 3459
3255unshift @INC, $LIBDIR; 3460unshift @INC, $LIBDIR;
3256 3461
… …
3275 my $signal = new Coro::Signal; 3480 my $signal = new Coro::Signal;
3276 push @WAIT_FOR_TICK_BEGIN, $signal; 3481 push @WAIT_FOR_TICK_BEGIN, $signal;
3277 $signal->wait; 3482 $signal->wait;
3278} 3483}
3279 3484
3280 my $min = 1e6;#d#
3281 my $avg = 10;
3282$TICK_WATCHER = Event->timer ( 3485$TICK_WATCHER = Event->timer (
3283 reentrant => 0, 3486 reentrant => 0,
3284 parked => 1, 3487 parked => 1,
3285 prio => 0, 3488 prio => 0,
3286 at => $NEXT_TICK || $TICK, 3489 at => $NEXT_TICK || $TICK,
… …
3294 3497
3295 $NOW = $tick_start = Event::time; 3498 $NOW = $tick_start = Event::time;
3296 3499
3297 cf::server_tick; # one server iteration 3500 cf::server_tick; # one server iteration
3298 3501
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; 3502 $RUNTIME += $TICK;
3323 $NEXT_TICK += $TICK; 3503 $NEXT_TICK += $TICK;
3324 3504
3325 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3505 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3326 $NEXT_RUNTIME_WRITE = $NOW + 10; 3506 $NEXT_RUNTIME_WRITE = $NOW + 10;
3327 Coro::async_pool { 3507 Coro::async_pool {
3508 $Coro::current->{desc} = "runtime saver";
3328 write_runtime 3509 write_runtime
3329 or warn "ERROR: unable to write runtime file: $!"; 3510 or warn "ERROR: unable to write runtime file: $!";
3330 }; 3511 };
3331 } 3512 }
3332 3513
3333# my $AFTER = Event::time;
3334# warn $AFTER - $NOW;#d#
3335
3336 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3514 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3337 $sig->send; 3515 $sig->send;
3338 } 3516 }
3339 while (my $sig = shift @WAIT_FOR_TICK) { 3517 while (my $sig = shift @WAIT_FOR_TICK) {
3340 $sig->send; 3518 $sig->send;
… …
3350 3528
3351 $LOAD = ($NOW - $tick_start) / $TICK; 3529 $LOAD = ($NOW - $tick_start) / $TICK;
3352 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3530 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3353 3531
3354 _post_tick; 3532 _post_tick;
3355
3356
3357 }, 3533 },
3358); 3534);
3359 3535
3360{ 3536{
3537 BDB::min_parallel 8;
3361 BDB::max_poll_time $TICK * 0.1; 3538 BDB::max_poll_time $TICK * 0.1;
3362 $BDB_POLL_WATCHER = Event->io ( 3539 $BDB_POLL_WATCHER = Event->io (
3363 reentrant => 0, 3540 reentrant => 0,
3364 fd => BDB::poll_fileno, 3541 fd => BDB::poll_fileno,
3365 poll => 'r', 3542 poll => 'r',
3366 prio => 0, 3543 prio => 0,
3367 data => WF_AUTOCANCEL, 3544 data => WF_AUTOCANCEL,
3368 cb => \&BDB::poll_cb, 3545 cb => \&BDB::poll_cb,
3369 ); 3546 );
3370 BDB::min_parallel 8;
3371 3547
3372 BDB::set_sync_prepare { 3548 BDB::set_sync_prepare {
3373 my $status; 3549 my $status;
3374 my $current = $Coro::current; 3550 my $current = $Coro::current;
3375 ( 3551 (
… …
3384 ) 3560 )
3385 }; 3561 };
3386 3562
3387 unless ($DB_ENV) { 3563 unless ($DB_ENV) {
3388 $DB_ENV = BDB::db_env_create; 3564 $DB_ENV = BDB::db_env_create;
3565 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3566 | BDB::LOG_AUTOREMOVE, 1);
3567 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3568 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3389 3569
3390 cf::sync_job { 3570 cf::sync_job {
3391 eval { 3571 eval {
3392 BDB::db_env_open 3572 BDB::db_env_open
3393 $DB_ENV, 3573 $DB_ENV,
… …
3395 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3575 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3396 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3576 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3397 0666; 3577 0666;
3398 3578
3399 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3579 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 }; 3580 };
3404 3581
3405 cf::cleanup "db_env_open(db): $@" if $@; 3582 cf::cleanup "db_env_open(db): $@" if $@;
3406 }; 3583 };
3407 } 3584 }
3585
3586 $BDB_DEADLOCK_WATCHER = Event->timer (
3587 after => 3,
3588 interval => 1,
3589 hard => 1,
3590 prio => 0,
3591 data => WF_AUTOCANCEL,
3592 cb => sub {
3593 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3594 },
3595 );
3596 $BDB_CHECKPOINT_WATCHER = Event->timer (
3597 after => 11,
3598 interval => 60,
3599 hard => 1,
3600 prio => 0,
3601 data => WF_AUTOCANCEL,
3602 cb => sub {
3603 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3604 },
3605 );
3606 $BDB_TRICKLE_WATCHER = Event->timer (
3607 after => 5,
3608 interval => 10,
3609 hard => 1,
3610 prio => 0,
3611 data => WF_AUTOCANCEL,
3612 cb => sub {
3613 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3614 },
3615 );
3408} 3616}
3409 3617
3410{ 3618{
3411 IO::AIO::min_parallel 8; 3619 IO::AIO::min_parallel 8;
3412 3620
… …
3415 $AIO_POLL_WATCHER = Event->io ( 3623 $AIO_POLL_WATCHER = Event->io (
3416 reentrant => 0, 3624 reentrant => 0,
3417 data => WF_AUTOCANCEL, 3625 data => WF_AUTOCANCEL,
3418 fd => IO::AIO::poll_fileno, 3626 fd => IO::AIO::poll_fileno,
3419 poll => 'r', 3627 poll => 'r',
3420 prio => 6, 3628 prio => 0,
3421 cb => \&IO::AIO::poll_cb, 3629 cb => \&IO::AIO::poll_cb,
3422 ); 3630 );
3423} 3631}
3424 3632
3425my $_log_backtrace; 3633my $_log_backtrace;
… …
3431 3639
3432 # limit the # of concurrent backtraces 3640 # limit the # of concurrent backtraces
3433 if ($_log_backtrace < 2) { 3641 if ($_log_backtrace < 2) {
3434 ++$_log_backtrace; 3642 ++$_log_backtrace;
3435 async { 3643 async {
3644 $Coro::current->{desc} = "abt $msg";
3645
3436 my @bt = fork_call { 3646 my @bt = fork_call {
3437 @addr = map { sprintf "%x", $_ } @addr; 3647 @addr = map { sprintf "%x", $_ } @addr;
3438 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3648 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3439 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3649 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3440 or die "addr2line: $!"; 3650 or die "addr2line: $!";

Diff Legend

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