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.330 by elmex, Fri Aug 10 10:35:07 2007 UTC vs.
Revision 1.378 by root, Thu Oct 4 11:36:54 2007 UTC

… …
10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
… …
79our $NEXT_TICK; 80our $NEXT_TICK;
80our $NOW; 81our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
82 83
83our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 88our $DB_ENV;
85 89
86our %CFG; 90our %CFG;
87 91
88our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 93our $RUNTIME;
90 94
91our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
94 98
95# 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 ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 101
… …
186 $msg .= "\n" 190 $msg .= "\n"
187 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
188 192
189 $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;
190 194
191 utf8::encode $msg;
192 LOG llevError, $msg; 195 LOG llevError, $msg;
193 }; 196 };
194} 197}
195 198
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
271Wait 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
272a 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,
273for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
274returned. 277returned.
275 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
276Lock 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
277uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
278 284
279=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
280 286
281Return 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.
282 288
283=cut 289=cut
284 290
285our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
286 293
287sub lock_wait($) { 294sub lock_wait($) {
288 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#
289 301
290 # wait for lock, if any 302 # wait for lock, if any
291 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 305 Coro::schedule;
… …
299 311
300 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
301 lock_wait $key; 313 lock_wait $key;
302 314
303 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
304 317
305 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
308 } 322 }
309} 323}
310 324
… …
340our @SLOT_QUEUE; 354our @SLOT_QUEUE;
341our $SLOT_QUEUE; 355our $SLOT_QUEUE;
342 356
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
345 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
346 362
347 while () { 363 while () {
348 next_job: 364 next_job:
349 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
… …
419 435
420 my $busy = 1; 436 my $busy = 1;
421 my @res; 437 my @res;
422 438
423 (async { 439 (async {
440 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 441 @res = eval { $job->() };
425 warn $@ if $@; 442 warn $@ if $@;
426 undef $busy; 443 undef $busy;
427 })->prio (Coro::PRIO_MAX); 444 })->prio (Coro::PRIO_MAX);
428 445
… …
472Coro::Storable. May, of course, block. Note that the executed sub may 489Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 490never block itself or use any form of Event handling.
474 491
475=cut 492=cut
476 493
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485
486sub fork_call(&@) { 494sub fork_call(&@) {
487 my ($cb, @args) = @_; 495 my ($cb, @args) = @_;
488 496
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 497 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 498 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 499 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 500
494 if (my $pid = fork) { 501 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 502 reset_signals;
508 local $SIG{__WARN__}; 503 &$cb
509 local $SIG{__DIE__}; 504 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 505
516 eval { 506 wantarray ? @res : $res[-1]
517 close $fh1;
518
519 my @res = eval { $cb->(@args) };
520
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
523 };
524
525 warn $@ if $@;
526 _exit 0;
527 }
528} 507}
529 508
530=item $value = cf::db_get $family => $key 509=item $value = cf::db_get $family => $key
531 510
532Returns a single value from the environment database. 511Returns a single value from the environment database.
… …
534=item cf::db_put $family => $key => $value 513=item cf::db_put $family => $key => $value
535 514
536Stores 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
537data 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).
538 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
539=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}
540 541
541our $DB; 542our $DB;
542 543
543sub db_init { 544sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 545 cf::sync_job {
548 eval { 546 $DB ||= db_table "db";
549 $DB->set_flags (BDB::CHKSUM);
550
551 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553 cf::cleanup "db_open(db): $!" if $!;
554 };
555 cf::cleanup "db_open(db): $@" if $@;
556 };
557 } 547 };
558} 548}
559 549
560sub db_get($$) { 550sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 551 my $key = "$_[0]/$_[1]";
562 552
… …
612 if (1) { 602 if (1) {
613 $md5 = 603 $md5 =
614 join "\x00", 604 join "\x00",
615 $processversion, 605 $processversion,
616 map { 606 map {
617 Coro::cede; 607 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 608 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 609 } 0.. $#$src;
620 610
621 611
622 my $dbmd5 = db_get cache => "$id/md5"; 612 my $dbmd5 = db_get cache => "$id/md5";
… …
1041sub object_freezer_save { 1031sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1032 my ($filename, $rdata, $objs) = @_;
1043 1033
1044 sync_job { 1034 sync_job {
1045 if (length $$rdata) { 1035 if (length $$rdata) {
1036 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1037 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1038 $decname, length $$rdata, scalar @$objs;
1048 1039
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1040 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1041 chmod SAVE_MODE, $fh;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1042 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1043 aio_fsync $fh if $cf::USE_FSYNC;
… …
1071 } 1062 }
1072 } else { 1063 } else {
1073 aio_unlink $filename; 1064 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1065 aio_unlink "$filename.pst";
1075 } 1066 }
1076 } 1067 };
1077} 1068}
1078 1069
1079sub object_freezer_as_string { 1070sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1071 my ($rdata, $objs) = @_;
1081 1072
… …
1093 or return; 1084 or return;
1094 1085
1095 unless (aio_stat "$filename.pst") { 1086 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1087 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1088 or return;
1089
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1090 $av = eval { (Storable::thaw $av)->{objs} };
1099 } 1091 }
1100 1092
1093 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1094 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1095 $decname, length $data, scalar @{$av || []};
1096
1103 return ($data, $av); 1097 ($data, $av)
1104} 1098}
1105 1099
1106=head2 COMMAND CALLBACKS 1100=head2 COMMAND CALLBACKS
1107 1101
1108=over 4 1102=over 4
… …
1186 my ($type, $reply, @payload) = 1180 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1181 "ARRAY" eq ref $msg
1188 ? @$msg 1182 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1183 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1184
1185 my @reply;
1186
1191 if (my $cb = $EXTCMD{$type}) { 1187 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1188 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1189 }
1190
1191 $pl->ext_reply ($reply, @reply)
1192 if $reply;
1193
1197 } else { 1194 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1195 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1196 }
1200 1197
1201 cf::override; 1198 cf::override;
… …
1291 1288
1292=head3 cf::player 1289=head3 cf::player
1293 1290
1294=over 4 1291=over 4
1295 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
1296=item cf::player::find $login 1307=item cf::player::find $login
1297 1308
1298Returns the given player object, loading it if necessary (might block). 1309Returns the given player object, loading it if necessary (might block).
1299 1310
1300=cut 1311=cut
… …
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1346 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1347 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1348 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1349 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1350
1340 my $pl = load_pl path $login 1351 my $f = new_from_file cf::object::thawer path $login
1341 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;
1342 $cf::PLAYER{$login} = $pl 1358 $cf::PLAYER{$login} = $pl
1343 } 1359 }
1344 } 1360 }
1345} 1361}
1346 1362
… …
1356 1372
1357 aio_mkdir playerdir $pl, 0770; 1373 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1374 $pl->{last_save} = $cf::RUNTIME;
1359 1375
1360 $pl->save_pl ($path); 1376 $pl->save_pl ($path);
1361 Coro::cede; 1377 cf::cede_to_tick;
1362} 1378}
1363 1379
1364sub new($) { 1380sub new($) {
1365 my ($login) = @_; 1381 my ($login) = @_;
1366 1382
… …
1444 or return []; 1460 or return [];
1445 1461
1446 my @logins; 1462 my @logins;
1447 1463
1448 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") {
1449 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1469 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1450 aio_read $fh, 0, 512, my $buf, 0 or next; 1470 aio_read $fh, 0, 512, my $buf, 0 or next;
1451 $buf !~ /^password -------------$/m or next; # official not-valid tag 1471 $buf !~ /^password -------------$/m or next; # official not-valid tag
1472 }
1452 1473
1453 utf8::decode $login; 1474 utf8::decode $login;
1454 push @logins, $login; 1475 push @logins, $login;
1455 } 1476 }
1456 1477
… …
1494sub expand_cfpod { 1515sub expand_cfpod {
1495 ((my $self), (local $_)) = @_; 1516 ((my $self), (local $_)) = @_;
1496 1517
1497 # escape & and < 1518 # escape & and <
1498 s/&/&amp;/g; 1519 s/&/&amp;/g;
1499 s/(?<![BIUGH])</&lt;/g; 1520 s/(?<![BIUGHT])</&lt;/g;
1500 1521
1501 # 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
1502 1523
1503 1 while 1524 1 while
1504 # replace B<>, I<>, U<> etc. 1525 # replace B<>, I<>, U<> etc.
1505 s/B<([^\>]*)>/<b>$1<\/b>/ 1526 s/B<([^\>]*)>/<b>$1<\/b>/
1506 || s/I<([^\>]*)>/<i>$1<\/i>/ 1527 || s/I<([^\>]*)>/<i>$1<\/i>/
1507 || s/U<([^\>]*)>/<u>$1<\/u>/ 1528 || s/U<([^\>]*)>/<u>$1<\/u>/
1529 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1508 # replace G<male|female> tags 1530 # replace G<male|female> tags
1509 || s{G<([^>|]*)\|([^>]*)>}{ 1531 || s{G<([^>|]*)\|([^>]*)>}{
1510 $self->gender ? $2 : $1 1532 $self->gender ? $2 : $1
1511 }ge 1533 }ge
1512 # replace H<hint text> 1534 # replace H<hint text>
… …
1542=cut 1564=cut
1543 1565
1544sub ext_reply($$@) { 1566sub ext_reply($$@) {
1545 my ($self, $id, @msg) = @_; 1567 my ($self, $id, @msg) = @_;
1546 1568
1547 if ($self->ns->extcmd == 2) { 1569 $self->ns->ext_reply ($id, @msg)
1548 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1549 } elsif ($self->ns->extcmd == 1) {
1550 #TODO: version 1, remove
1551 unshift @msg, msgtype => "reply", msgid => $id;
1552 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1553 }
1554} 1570}
1555 1571
1556=item $player->ext_msg ($type, @msg) 1572=item $player->ext_msg ($type, @msg)
1557 1573
1558Sends an ext event to the client. 1574Sends an ext event to the client.
… …
1786 1802
1787sub load_header_from($) { 1803sub load_header_from($) {
1788 my ($self, $path) = @_; 1804 my ($self, $path) = @_;
1789 1805
1790 utf8::encode $path; 1806 utf8::encode $path;
1791 #aio_open $path, O_RDONLY, 0 1807 my $f = new_from_file cf::object::thawer $path
1792 # or return;
1793
1794 $self->_load_header ($path)
1795 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;
1796 1815
1797 $self->{load_path} = $path; 1816 $self->{load_path} = $path;
1798 1817
1799 1 1818 1
1800} 1819}
… …
1854sub find { 1873sub find {
1855 my ($path, $origin) = @_; 1874 my ($path, $origin) = @_;
1856 1875
1857 $path = normalise $path, $origin && $origin->path; 1876 $path = normalise $path, $origin && $origin->path;
1858 1877
1878 cf::lock_wait "map_data:$path";#d#remove
1859 cf::lock_wait "map_find:$path"; 1879 cf::lock_wait "map_find:$path";
1860 1880
1861 $cf::MAP{$path} || do { 1881 $cf::MAP{$path} || do {
1862 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
1863 my $map = new_from_path cf::map $path 1885 my $map = new_from_path cf::map $path
1864 or return; 1886 or return;
1865 1887
1866 $map->{last_save} = $cf::RUNTIME; 1888 $map->{last_save} = $cf::RUNTIME;
1867 1889
… …
1869 or return; 1891 or return;
1870 1892
1871 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1893 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1872 # doing this can freeze the server in a sync job, obviously 1894 # doing this can freeze the server in a sync job, obviously
1873 #$cf::WAIT_FOR_TICK->wait; 1895 #$cf::WAIT_FOR_TICK->wait;
1896 undef $guard1;
1897 undef $guard2;
1874 $map->reset; 1898 $map->reset;
1875 undef $guard;
1876 return find $path; 1899 return find $path;
1877 } 1900 }
1878 1901
1879 $cf::MAP{$path} = $map 1902 $cf::MAP{$path} = $map
1880 } 1903 }
… …
1889 local $self->{deny_reset} = 1; # loading can take a long time 1912 local $self->{deny_reset} = 1; # loading can take a long time
1890 1913
1891 my $path = $self->{path}; 1914 my $path = $self->{path};
1892 1915
1893 { 1916 {
1894 my $guard = cf::lock_acquire "map_load:$path"; 1917 my $guard = cf::lock_acquire "map_data:$path";
1895 1918
1919 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 1920 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 1921
1898 $self->in_memory (cf::MAP_LOADING); 1922 $self->in_memory (cf::MAP_LOADING);
1899 1923
1900 $self->alloc; 1924 $self->alloc;
1901 1925
1902 $self->pre_load; 1926 $self->pre_load;
1903 Coro::cede; 1927 cf::cede_to_tick;
1904 1928
1929 my $f = new_from_file cf::object::thawer $self->{load_path};
1930 $f->skip_block;
1905 $self->_load_objects ($self->{load_path}, 1) 1931 $self->_load_objects ($f)
1906 or return; 1932 or return;
1907 1933
1908 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1934 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1909 if delete $self->{load_original}; 1935 if delete $self->{load_original};
1910 1936
1911 if (my $uniq = $self->uniq_path) { 1937 if (my $uniq = $self->uniq_path) {
1912 utf8::encode $uniq; 1938 utf8::encode $uniq;
1913 if (aio_open $uniq, O_RDONLY, 0) { 1939 unless (aio_stat $uniq) {
1940 if (my $f = new_from_file cf::object::thawer $uniq) {
1914 $self->clear_unique_items; 1941 $self->clear_unique_items;
1915 $self->_load_objects ($uniq, 0); 1942 $self->_load_objects ($f);
1943 $f->resolve_delayed_derefs;
1944 }
1916 } 1945 }
1917 } 1946 }
1918 1947
1919 Coro::cede; 1948 $f->resolve_delayed_derefs;
1949
1950 cf::cede_to_tick;
1920 # now do the right thing for maps 1951 # now do the right thing for maps
1921 $self->link_multipart_objects; 1952 $self->link_multipart_objects;
1922 $self->difficulty ($self->estimate_difficulty) 1953 $self->difficulty ($self->estimate_difficulty)
1923 unless $self->difficulty; 1954 unless $self->difficulty;
1924 Coro::cede; 1955 cf::cede_to_tick;
1925 1956
1926 unless ($self->{deny_activate}) { 1957 unless ($self->{deny_activate}) {
1927 $self->decay_objects; 1958 $self->decay_objects;
1928 $self->fix_auto_apply; 1959 $self->fix_auto_apply;
1929 $self->update_buttons; 1960 $self->update_buttons;
1930 Coro::cede; 1961 cf::cede_to_tick;
1931 $self->set_darkness_map; 1962 $self->set_darkness_map;
1932 Coro::cede; 1963 cf::cede_to_tick;
1933 $self->activate; 1964 $self->activate;
1934 } 1965 }
1935 1966
1936 $self->{last_save} = $cf::RUNTIME; 1967 $self->{last_save} = $cf::RUNTIME;
1937 $self->last_access ($cf::RUNTIME); 1968 $self->last_access ($cf::RUNTIME);
… …
1953 1984
1954 $self 1985 $self
1955} 1986}
1956 1987
1957# 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
1958sub load_diag { 1989sub load_neighbours {
1959 my ($map) = @_; 1990 my ($map) = @_;
1960 1991
1961 my @diag; # diagonal neighbours 1992 my @neigh; # diagonal neighbours
1962 1993
1963 for (0 .. 3) { 1994 for (0 .. 3) {
1964 my $neigh = $map->tile_path ($_) 1995 my $neigh = $map->tile_path ($_)
1965 or next; 1996 or next;
1966 $neigh = find $neigh, $map 1997 $neigh = find $neigh, $map
1967 or next; 1998 or next;
1968 $neigh->load; 1999 $neigh->load;
1969 2000
2001 push @neigh,
1970 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2002 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1971 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2003 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1972 } 2004 }
1973 2005
1974 for (@diag) { 2006 for (grep defined $_->[0], @neigh) {
2007 my ($path, $origin) = @$_;
1975 my $neigh = find @$_ 2008 my $neigh = find $path, $origin
1976 or next; 2009 or next;
1977 $neigh->load; 2010 $neigh->load;
1978 } 2011 }
1979} 2012}
1980 2013
… …
1985} 2018}
1986 2019
1987sub do_load_sync { 2020sub do_load_sync {
1988 my ($map) = @_; 2021 my ($map) = @_;
1989 2022
2023 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2024 if $Coro::current == $Coro::main;
2025
1990 cf::sync_job { $map->load }; 2026 cf::sync_job { $map->load };
1991} 2027}
1992 2028
1993our %MAP_PREFETCH; 2029our %MAP_PREFETCH;
1994our $MAP_PREFETCHER = undef; 2030our $MAP_PREFETCHER = undef;
1995 2031
1996sub find_async { 2032sub find_async {
1997 my ($path, $origin) = @_; 2033 my ($path, $origin, $load) = @_;
1998 2034
1999 $path = normalise $path, $origin && $origin->{path}; 2035 $path = normalise $path, $origin && $origin->{path};
2000 2036
2001 if (my $map = $cf::MAP{$path}) { 2037 if (my $map = $cf::MAP{$path}) {
2002 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2038 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
2003 } 2039 }
2004 2040
2005 undef $MAP_PREFETCH{$path}; 2041 $MAP_PREFETCH{$path} |= $load;
2042
2006 $MAP_PREFETCHER ||= cf::async { 2043 $MAP_PREFETCHER ||= cf::async {
2044 $Coro::current->{desc} = "map prefetcher";
2045
2007 while (%MAP_PREFETCH) { 2046 while (%MAP_PREFETCH) {
2008 for my $path (keys %MAP_PREFETCH) { 2047 while (my ($k, $v) = each %MAP_PREFETCH) {
2009 if (my $map = find $path) { 2048 if (my $map = find $k) {
2010 $map->load; 2049 $map->load if $v;
2011 } 2050 }
2012 2051
2013 delete $MAP_PREFETCH{$path}; 2052 delete $MAP_PREFETCH{$k};
2014 } 2053 }
2015 } 2054 }
2016 undef $MAP_PREFETCHER; 2055 undef $MAP_PREFETCHER;
2017 }; 2056 };
2018 $MAP_PREFETCHER->prio (6); 2057 $MAP_PREFETCHER->prio (6);
… …
2021} 2060}
2022 2061
2023sub save { 2062sub save {
2024 my ($self) = @_; 2063 my ($self) = @_;
2025 2064
2026 my $lock = cf::lock_acquire "map_data:" . $self->path; 2065 my $lock = cf::lock_acquire "map_data:$self->{path}";
2027 2066
2028 $self->{last_save} = $cf::RUNTIME; 2067 $self->{last_save} = $cf::RUNTIME;
2029 2068
2030 return unless $self->dirty; 2069 return unless $self->dirty;
2031 2070
… …
2037 return if $self->{deny_save}; 2076 return if $self->{deny_save};
2038 2077
2039 local $self->{last_access} = $self->last_access;#d# 2078 local $self->{last_access} = $self->last_access;#d#
2040 2079
2041 cf::async { 2080 cf::async {
2081 $Coro::current->{desc} = "map player save";
2042 $_->contr->save for $self->players; 2082 $_->contr->save for $self->players;
2043 }; 2083 };
2044 2084
2045 if ($uniq) { 2085 if ($uniq) {
2046 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2054 my ($self) = @_; 2094 my ($self) = @_;
2055 2095
2056 # save first because save cedes 2096 # save first because save cedes
2057 $self->save; 2097 $self->save;
2058 2098
2059 my $lock = cf::lock_acquire "map_data:" . $self->path; 2099 my $lock = cf::lock_acquire "map_data:$self->{path}";
2060 2100
2061 return if $self->players; 2101 return if $self->players;
2062 return if $self->in_memory != cf::MAP_IN_MEMORY; 2102 return if $self->in_memory != cf::MAP_IN_MEMORY;
2063 return if $self->{deny_save}; 2103 return if $self->{deny_save};
2064 2104
2105 $self->in_memory (cf::MAP_SWAPPED);
2106
2107 $self->deactivate;
2108 $_->clear_links_to ($self) for values %cf::MAP;
2065 $self->clear; 2109 $self->clear;
2066 $self->in_memory (cf::MAP_SWAPPED);
2067} 2110}
2068 2111
2069sub reset_at { 2112sub reset_at {
2070 my ($self) = @_; 2113 my ($self) = @_;
2071 2114
… …
2103 if $uniq; 2146 if $uniq;
2104 } 2147 }
2105 2148
2106 delete $cf::MAP{$self->path}; 2149 delete $cf::MAP{$self->path};
2107 2150
2151 $self->deactivate;
2152 $_->clear_links_to ($self) for values %cf::MAP;
2108 $self->clear; 2153 $self->clear;
2109
2110 $_->clear_links_to ($self) for values %cf::MAP;
2111 2154
2112 $self->unlink_save; 2155 $self->unlink_save;
2113 $self->destroy; 2156 $self->destroy;
2114} 2157}
2115 2158
2116my $nuke_counter = "aaaa"; 2159my $nuke_counter = "aaaa";
2117 2160
2118sub nuke { 2161sub nuke {
2119 my ($self) = @_; 2162 my ($self) = @_;
2120 2163
2164 {
2165 my $lock = cf::lock_acquire "map_data:$self->{path}";
2166
2121 delete $cf::MAP{$self->path}; 2167 delete $cf::MAP{$self->path};
2122 2168
2123 $self->unlink_save; 2169 $self->unlink_save;
2124 2170
2125 bless $self, "cf::map"; 2171 bless $self, "cf::map";
2126 delete $self->{deny_reset}; 2172 delete $self->{deny_reset};
2127 $self->{deny_save} = 1; 2173 $self->{deny_save} = 1;
2128 $self->reset_timeout (1); 2174 $self->reset_timeout (1);
2129 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2175 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2130 2176
2131 $cf::MAP{$self->path} = $self; 2177 $cf::MAP{$self->path} = $self;
2178 }
2132 2179
2133 $self->reset; # polite request, might not happen 2180 $self->reset; # polite request, might not happen
2134} 2181}
2135 2182
2136=item $maps = cf::map::tmp_maps 2183=item $maps = cf::map::tmp_maps
… …
2212 2259
2213sub inv_recursive { 2260sub inv_recursive {
2214 inv_recursive_ inv $_[0] 2261 inv_recursive_ inv $_[0]
2215} 2262}
2216 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
2217package cf; 2292package cf;
2218 2293
2219=back 2294=back
2220 2295
2221=head3 cf::object::player 2296=head3 cf::object::player
… …
2349 # use -1 or undef as default coordinates, not 0, 0 2424 # use -1 or undef as default coordinates, not 0, 0
2350 ($x, $y) = ($map->enter_x, $map->enter_y) 2425 ($x, $y) = ($map->enter_x, $map->enter_y)
2351 if $x <=0 && $y <= 0; 2426 if $x <=0 && $y <= 0;
2352 2427
2353 $map->load; 2428 $map->load;
2354 $map->load_diag; 2429 $map->load_neighbours;
2355 2430
2356 return unless $self->contr->active; 2431 return unless $self->contr->active;
2357 $self->activate_recursive; 2432 $self->activate_recursive;
2358 2433
2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2434 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2379 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2454 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2380 2455
2381 $self->enter_link; 2456 $self->enter_link;
2382 2457
2383 (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
2384 my $map = eval { 2480 my $map = eval {
2385 my $map = cf::map::find $path; 2481 my $map = defined $path ? cf::map::find $path : undef;
2386 2482
2387 if ($map) { 2483 if ($map) {
2388 $map = $map->customise_for ($self); 2484 $map = $map->customise_for ($self);
2389 $map = $check->($map) if $check && $map; 2485 $map = $check->($map) if $check && $map;
2390 } else { 2486 } else {
2391 $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);
2392 } 2488 }
2393 2489
2394 $map 2490 $map
2395 }; 2491 };
2396 2492
… …
2486 # if exit is damned, update players death & WoR home-position 2582 # if exit is damned, update players death & WoR home-position
2487 $self->contr->savebed ($slaying, $hp, $sp) 2583 $self->contr->savebed ($slaying, $hp, $sp)
2488 if $exit->flag (FLAG_DAMNED); 2584 if $exit->flag (FLAG_DAMNED);
2489 2585
2490 (async { 2586 (async {
2587 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2588
2491 $self->deactivate_recursive; # just to be sure 2589 $self->deactivate_recursive; # just to be sure
2492 unless (eval { 2590 unless (eval {
2493 $self->goto ($slaying, $hp, $sp); 2591 $self->goto ($slaying, $hp, $sp);
2494 2592
2495 1; 2593 1;
… …
2530the 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
2531the message unless the client supports the msg packet. 2629the message unless the client supports the msg packet.
2532 2630
2533=cut 2631=cut
2534 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
2535sub cf::client::send_msg { 2654sub cf::client::send_msg {
2536 my ($self, $channel, $msg, $color, @extra) = @_; 2655 my ($self, $channel, $msg, $color, @extra) = @_;
2537 2656
2538 $msg = $self->pl->expand_cfpod ($msg); 2657 $msg = $self->pl->expand_cfpod ($msg);
2539 2658
2540 $color &= cf::NDI_CLIENT_MASK; # just in case... 2659 $color &= cf::NDI_CLIENT_MASK; # just in case...
2541 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
2542 if (ref $channel) { 2670 } elsif (ref $channel) {
2543 # send meta info to client, if not yet sent 2671 # send meta info to client, if not yet sent
2544 unless (exists $self->{channel}{$channel->{id}}) { 2672 unless (exists $self->{channel}{$channel->{id}}) {
2545 $self->{channel}{$channel->{id}} = $channel; 2673 $self->{channel}{$channel->{id}} = $channel;
2546 $self->ext_msg (channel_info => $channel); 2674 $self->ext_msg (channel_info => $channel)
2675 if $self->can_msg;
2547 } 2676 }
2548 2677
2549 $channel = $channel->{id}; 2678 $channel = $channel->{id};
2550 } 2679 }
2551 2680
… …
2573 $color &= cf::NDI_COLOR_MASK; 2702 $color &= cf::NDI_COLOR_MASK;
2574 2703
2575 utf8::encode $msg; 2704 utf8::encode $msg;
2576 2705
2577 if (0 && $msg =~ /\[/) { 2706 if (0 && $msg =~ /\[/) {
2707 # COMMAND/INFO
2578 $self->send_packet ("drawextinfo $color 4 0 $msg") 2708 $self->send_packet ("drawextinfo $color 10 8 $msg")
2579 } else { 2709 } else {
2580 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2710 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2581 $self->send_packet ("drawinfo $color $msg") 2711 $self->send_packet ("drawinfo $color $msg")
2582 } 2712 }
2583 } 2713 }
… …
2591=cut 2721=cut
2592 2722
2593sub cf::client::ext_msg($$@) { 2723sub cf::client::ext_msg($$@) {
2594 my ($self, $type, @msg) = @_; 2724 my ($self, $type, @msg) = @_;
2595 2725
2596 my $extcmd = $self->extcmd;
2597
2598 if ($extcmd == 2) { 2726 if ($self->extcmd == 2) {
2599 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2727 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2600 } elsif ($extcmd == 1) { # TODO: remove 2728 } elsif ($self->extcmd == 1) { # TODO: remove
2601 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;
2602 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2748 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2603 } 2749 }
2604} 2750}
2605 2751
2606=item $success = $client->query ($flags, "text", \&cb) 2752=item $success = $client->query ($flags, "text", \&cb)
… …
2668 my ($type, $reply, @payload) = 2814 my ($type, $reply, @payload) =
2669 "ARRAY" eq ref $msg 2815 "ARRAY" eq ref $msg
2670 ? @$msg 2816 ? @$msg
2671 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2817 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2672 2818
2819 my @reply;
2820
2673 if (my $cb = $EXTICMD{$type}) { 2821 if (my $cb = $EXTICMD{$type}) {
2674 my @reply = $cb->($ns, @payload); 2822 @reply = $cb->($ns, @payload);
2675
2676 $ns->ext_reply ($reply, @reply)
2677 if $reply;
2678 } 2823 }
2824
2825 $ns->ext_reply ($reply, @reply)
2826 if $reply;
2827
2679 } else { 2828 } else {
2680 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";
2681 } 2830 }
2682 2831
2683 cf::override; 2832 cf::override;
… …
2744 2893
2745The following functions and methods are available within a safe environment: 2894The following functions and methods are available within a safe environment:
2746 2895
2747 cf::object 2896 cf::object
2748 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
2749 insert remove name archname title slaying race 2898 insert remove name archname title slaying race decrease_ob_nr
2750 2899
2751 cf::object::player 2900 cf::object::player
2752 player 2901 player
2753 2902
2754 cf::player 2903 cf::player
… …
2759 2908
2760=cut 2909=cut
2761 2910
2762for ( 2911for (
2763 ["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
2764 insert remove inv name archname title slaying race)], 2913 insert remove inv name archname title slaying race
2914 decrease_ob_nr)],
2765 ["cf::object::player" => qw(player)], 2915 ["cf::object::player" => qw(player)],
2766 ["cf::player" => qw(peaceful)], 2916 ["cf::player" => qw(peaceful)],
2767 ["cf::map" => qw(trigger)], 2917 ["cf::map" => qw(trigger)],
2768) { 2918) {
2769 no strict 'refs'; 2919 no strict 'refs';
… …
2845# the server's init and main functions 2995# the server's init and main functions
2846 2996
2847sub load_facedata($) { 2997sub load_facedata($) {
2848 my ($path) = @_; 2998 my ($path) = @_;
2849 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
2850 warn "loading facedata from $path\n"; 3006 warn "loading facedata from $path\n";
2851 3007
2852 my $facedata; 3008 my $facedata;
2853 0 < aio_load $path, $facedata 3009 0 < aio_load $path, $facedata
2854 or die "$path: $!"; 3010 or die "$path: $!";
2855 3011
2856 $facedata = Coro::Storable::thaw $facedata; 3012 $facedata = Coro::Storable::thaw $facedata;
2857 3013
2858 $facedata->{version} == 2 3014 $facedata->{version} == 2
2859 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;
2860 3023
2861 { 3024 {
2862 my $faces = $facedata->{faceinfo}; 3025 my $faces = $facedata->{faceinfo};
2863 3026
2864 while (my ($face, $info) = each %$faces) { 3027 while (my ($face, $info) = each %$faces) {
2865 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3028 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2866 cf::face::set_visibility $idx, $info->{visibility}; 3029 cf::face::set_visibility $idx, $info->{visibility};
2867 cf::face::set_magicmap $idx, $info->{magicmap}; 3030 cf::face::set_magicmap $idx, $info->{magicmap};
2868 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3031 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2869 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3032 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2870 3033
2871 cf::cede_to_tick; 3034 cf::cede_to_tick;
2872 } 3035 }
2873 3036
2874 while (my ($face, $info) = each %$faces) { 3037 while (my ($face, $info) = each %$faces) {
… …
2899 3062
2900 { 3063 {
2901 # TODO: for gcfclient pleasure, we should give resources 3064 # TODO: for gcfclient pleasure, we should give resources
2902 # that gcfclient doesn't grok a >10000 face index. 3065 # that gcfclient doesn't grok a >10000 face index.
2903 my $res = $facedata->{resource}; 3066 my $res = $facedata->{resource};
2904 my $enc = JSON::XS->new->utf8->canonical;
2905 3067
2906 my $soundconf = delete $res->{"res/sound.conf"}; 3068 my $soundconf = delete $res->{"res/sound.conf"};
2907 3069
2908 while (my ($name, $info) = each %$res) { 3070 while (my ($name, $info) = each %$res) {
2909 my $meta = $enc->encode ({
2910 name => $name,
2911 %{ $info->{meta} || {} },
2912 });
2913
2914 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3071 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3072 my $data;
2915 3073
2916 if ($info->{type} & 1) { 3074 if ($info->{type} & 1) {
2917 # prepend meta info 3075 # prepend meta info
2918 3076
3077 my $meta = $enc->encode ({
3078 name => $name,
3079 %{ $info->{meta} || {} },
3080 });
3081
2919 my $data = pack "(w/a*)*", $meta, $info->{data}; 3082 $data = pack "(w/a*)*", $meta, $info->{data};
2920 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2921
2922 cf::face::set_data $idx, 0, $data, $chk;
2923 } else { 3083 } else {
2924 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3084 $data = $info->{data};
2925 } 3085 }
2926 3086
3087 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2927 cf::face::set_type $idx, $info->{type}; 3088 cf::face::set_type $idx, $info->{type};
2928 3089
2929 cf::cede_to_tick; 3090 cf::cede_to_tick;
2930 } 3091 }
2931 3092
… …
2958 $ns->fx_want ($k, $v); 3119 $ns->fx_want ($k, $v);
2959 } 3120 }
2960}; 3121};
2961 3122
2962sub 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
2963 load_resource_file "$MAPDIR/regions" 3128 load_resource_file "$MAPDIR/regions"
2964 or die "unable to load regions file\n"; 3129 or die "unable to load regions file\n";
2965 3130
2966 for (cf::region::list) { 3131 for (cf::region::list) {
2967 $_->{match} = qr/$_->{match}/ 3132 $_->{match} = qr/$_->{match}/
… …
3003 3168
3004sub init { 3169sub init {
3005 reload_resources; 3170 reload_resources;
3006} 3171}
3007 3172
3008sub cfg_load { 3173sub reload_config {
3009 open my $fh, "<:utf8", "$CONFDIR/config" 3174 open my $fh, "<:utf8", "$CONFDIR/config"
3010 or return; 3175 or return;
3011 3176
3012 local $/; 3177 local $/;
3013 *CFG = YAML::Syck::Load <$fh>; 3178 *CFG = YAML::Syck::Load <$fh>;
… …
3029sub main { 3194sub main {
3030 # we must not ever block the main coroutine 3195 # we must not ever block the main coroutine
3031 local $Coro::idle = sub { 3196 local $Coro::idle = sub {
3032 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#
3033 (async { 3198 (async {
3199 $Coro::current->{desc} = "IDLE BUG HANDLER";
3034 Event::one_event; 3200 Event::one_event;
3035 })->prio (Coro::PRIO_MAX); 3201 })->prio (Coro::PRIO_MAX);
3036 }; 3202 };
3037 3203
3038 cfg_load; 3204 reload_config;
3039 db_init; 3205 db_init;
3040 load_extensions; 3206 load_extensions;
3041 3207
3042 $TICK_WATCHER->start; 3208 $TICK_WATCHER->start;
3043 Event::loop; 3209 Event::loop;
… …
3236 warn "reloading cf.pm"; 3402 warn "reloading cf.pm";
3237 require cf; 3403 require cf;
3238 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3404 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3239 3405
3240 warn "loading config and database again"; 3406 warn "loading config and database again";
3241 cf::cfg_load; 3407 cf::reload_config;
3242 3408
3243 warn "loading extensions"; 3409 warn "loading extensions";
3244 cf::load_extensions; 3410 cf::load_extensions;
3245 3411
3246 warn "reattaching attachments to objects/players"; 3412 warn "reattaching attachments to objects/players";
… …
3282register_command "reload" => sub { 3448register_command "reload" => sub {
3283 my ($who, $arg) = @_; 3449 my ($who, $arg) = @_;
3284 3450
3285 if ($who->flag (FLAG_WIZ)) { 3451 if ($who->flag (FLAG_WIZ)) {
3286 $who->message ("reloading server."); 3452 $who->message ("reloading server.");
3453 async {
3454 $Coro::current->{desc} = "perl_reload";
3287 async { reload_perl }; 3455 reload_perl;
3456 };
3288 } 3457 }
3289}; 3458};
3290 3459
3291unshift @INC, $LIBDIR; 3460unshift @INC, $LIBDIR;
3292 3461
… …
3311 my $signal = new Coro::Signal; 3480 my $signal = new Coro::Signal;
3312 push @WAIT_FOR_TICK_BEGIN, $signal; 3481 push @WAIT_FOR_TICK_BEGIN, $signal;
3313 $signal->wait; 3482 $signal->wait;
3314} 3483}
3315 3484
3316 my $min = 1e6;#d#
3317 my $avg = 10;
3318$TICK_WATCHER = Event->timer ( 3485$TICK_WATCHER = Event->timer (
3319 reentrant => 0, 3486 reentrant => 0,
3320 parked => 1, 3487 parked => 1,
3321 prio => 0, 3488 prio => 0,
3322 at => $NEXT_TICK || $TICK, 3489 at => $NEXT_TICK || $TICK,
… …
3330 3497
3331 $NOW = $tick_start = Event::time; 3498 $NOW = $tick_start = Event::time;
3332 3499
3333 cf::server_tick; # one server iteration 3500 cf::server_tick; # one server iteration
3334 3501
3335 0 && sync_job {#d#
3336 for(1..10) {
3337 my $t = Event::time;
3338 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3339 or die;
3340
3341 $map->width (50);
3342 $map->height (50);
3343 $map->alloc;
3344 $map->_load_objects ("/tmp/x.map", 1);
3345 my $t = Event::time - $t;
3346
3347 #next unless $t < 0.0013;#d#
3348 if ($t < $min) {
3349 $min = $t;
3350 }
3351 $avg = $avg * 0.99 + $t * 0.01;
3352 }
3353 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3354 exit 0;
3355 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3356 };
3357
3358 $RUNTIME += $TICK; 3502 $RUNTIME += $TICK;
3359 $NEXT_TICK += $TICK; 3503 $NEXT_TICK += $TICK;
3360 3504
3361 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3505 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3362 $NEXT_RUNTIME_WRITE = $NOW + 10; 3506 $NEXT_RUNTIME_WRITE = $NOW + 10;
3363 Coro::async_pool { 3507 Coro::async_pool {
3508 $Coro::current->{desc} = "runtime saver";
3364 write_runtime 3509 write_runtime
3365 or warn "ERROR: unable to write runtime file: $!"; 3510 or warn "ERROR: unable to write runtime file: $!";
3366 }; 3511 };
3367 } 3512 }
3368 3513
3369# my $AFTER = Event::time;
3370# warn $AFTER - $NOW;#d#
3371
3372 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3514 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3373 $sig->send; 3515 $sig->send;
3374 } 3516 }
3375 while (my $sig = shift @WAIT_FOR_TICK) { 3517 while (my $sig = shift @WAIT_FOR_TICK) {
3376 $sig->send; 3518 $sig->send;
… …
3386 3528
3387 $LOAD = ($NOW - $tick_start) / $TICK; 3529 $LOAD = ($NOW - $tick_start) / $TICK;
3388 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3530 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3389 3531
3390 _post_tick; 3532 _post_tick;
3391
3392
3393 }, 3533 },
3394); 3534);
3395 3535
3396{ 3536{
3537 BDB::min_parallel 8;
3397 BDB::max_poll_time $TICK * 0.1; 3538 BDB::max_poll_time $TICK * 0.1;
3398 $BDB_POLL_WATCHER = Event->io ( 3539 $BDB_POLL_WATCHER = Event->io (
3399 reentrant => 0, 3540 reentrant => 0,
3400 fd => BDB::poll_fileno, 3541 fd => BDB::poll_fileno,
3401 poll => 'r', 3542 poll => 'r',
3402 prio => 0, 3543 prio => 0,
3403 data => WF_AUTOCANCEL, 3544 data => WF_AUTOCANCEL,
3404 cb => \&BDB::poll_cb, 3545 cb => \&BDB::poll_cb,
3405 ); 3546 );
3406 BDB::min_parallel 8;
3407 3547
3408 BDB::set_sync_prepare { 3548 BDB::set_sync_prepare {
3409 my $status; 3549 my $status;
3410 my $current = $Coro::current; 3550 my $current = $Coro::current;
3411 ( 3551 (
… …
3420 ) 3560 )
3421 }; 3561 };
3422 3562
3423 unless ($DB_ENV) { 3563 unless ($DB_ENV) {
3424 $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);
3425 3569
3426 cf::sync_job { 3570 cf::sync_job {
3427 eval { 3571 eval {
3428 BDB::db_env_open 3572 BDB::db_env_open
3429 $DB_ENV, 3573 $DB_ENV,
… …
3431 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
3432 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3576 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3433 0666; 3577 0666;
3434 3578
3435 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3579 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3436
3437 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3438 $DB_ENV->set_lk_detect;
3439 }; 3580 };
3440 3581
3441 cf::cleanup "db_env_open(db): $@" if $@; 3582 cf::cleanup "db_env_open(db): $@" if $@;
3442 }; 3583 };
3443 } 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 );
3444} 3616}
3445 3617
3446{ 3618{
3447 IO::AIO::min_parallel 8; 3619 IO::AIO::min_parallel 8;
3448 3620
… …
3451 $AIO_POLL_WATCHER = Event->io ( 3623 $AIO_POLL_WATCHER = Event->io (
3452 reentrant => 0, 3624 reentrant => 0,
3453 data => WF_AUTOCANCEL, 3625 data => WF_AUTOCANCEL,
3454 fd => IO::AIO::poll_fileno, 3626 fd => IO::AIO::poll_fileno,
3455 poll => 'r', 3627 poll => 'r',
3456 prio => 6, 3628 prio => 0,
3457 cb => \&IO::AIO::poll_cb, 3629 cb => \&IO::AIO::poll_cb,
3458 ); 3630 );
3459} 3631}
3460 3632
3461my $_log_backtrace; 3633my $_log_backtrace;
… …
3467 3639
3468 # limit the # of concurrent backtraces 3640 # limit the # of concurrent backtraces
3469 if ($_log_backtrace < 2) { 3641 if ($_log_backtrace < 2) {
3470 ++$_log_backtrace; 3642 ++$_log_backtrace;
3471 async { 3643 async {
3644 $Coro::current->{desc} = "abt $msg";
3645
3472 my @bt = fork_call { 3646 my @bt = fork_call {
3473 @addr = map { sprintf "%x", $_ } @addr; 3647 @addr = map { sprintf "%x", $_ } @addr;
3474 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3648 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3475 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 |"
3476 or die "addr2line: $!"; 3650 or die "addr2line: $!";

Diff Legend

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