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.331 by root, Mon Aug 13 13:10:01 2007 UTC vs.
Revision 1.379 by root, Thu Oct 4 23:59:07 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;
… …
411 my $time = Event::time; 427 my $time = Event::time;
412 428
413 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
415 431
432 LOG llevError | logBacktrace, Carp::longmess "sync job";#d#
433
416 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
417 # (but this is cancel-safe) 435 # (but this is cancel-safe)
418 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
419 437
420 my $busy = 1; 438 my $busy = 1;
421 my @res; 439 my @res;
422 440
423 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 443 @res = eval { $job->() };
425 warn $@ if $@; 444 warn $@ if $@;
426 undef $busy; 445 undef $busy;
427 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
428 447
… …
472Coro::Storable. May, of course, block. Note that the executed sub may 491Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 492never block itself or use any form of Event handling.
474 493
475=cut 494=cut
476 495
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(&@) { 496sub fork_call(&@) {
487 my ($cb, @args) = @_; 497 my ($cb, @args) = @_;
488 498
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 499 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 500 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 501 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 502
494 if (my $pid = fork) { 503 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; 504 reset_signals;
508 local $SIG{__WARN__}; 505 &$cb
509 local $SIG{__DIE__}; 506 }, @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 507
516 eval { 508 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} 509}
529 510
530=item $value = cf::db_get $family => $key 511=item $value = cf::db_get $family => $key
531 512
532Returns a single value from the environment database. 513Returns a single value from the environment database.
… …
534=item cf::db_put $family => $key => $value 515=item cf::db_put $family => $key => $value
535 516
536Stores the given C<$value> in the family. It can currently store binary 517Stores 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). 518data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 519
520=item $db = cf::db_table "name"
521
522Create and/or open a new database table. The string must not be "db" and must be unique
523within each server.
524
539=cut 525=cut
526
527sub db_table($) {
528 my ($name) = @_;
529 my $db = BDB::db_create $DB_ENV;
530
531 eval {
532 $db->set_flags (BDB::CHKSUM);
533
534 utf8::encode $name;
535 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
536 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
537 cf::cleanup "db_open(db): $!" if $!;
538 };
539 cf::cleanup "db_open(db): $@" if $@;
540
541 $db
542}
540 543
541our $DB; 544our $DB;
542 545
543sub db_init { 546sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 547 cf::sync_job {
548 eval { 548 $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 } 549 };
558} 550}
559 551
560sub db_get($$) { 552sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 553 my $key = "$_[0]/$_[1]";
562 554
… …
612 if (1) { 604 if (1) {
613 $md5 = 605 $md5 =
614 join "\x00", 606 join "\x00",
615 $processversion, 607 $processversion,
616 map { 608 map {
617 Coro::cede; 609 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 610 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 611 } 0.. $#$src;
620 612
621 613
622 my $dbmd5 = db_get cache => "$id/md5"; 614 my $dbmd5 = db_get cache => "$id/md5";
… …
1041sub object_freezer_save { 1033sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1034 my ($filename, $rdata, $objs) = @_;
1043 1035
1044 sync_job { 1036 sync_job {
1045 if (length $$rdata) { 1037 if (length $$rdata) {
1038 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1039 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1040 $decname, length $$rdata, scalar @$objs;
1048 1041
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1042 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1043 chmod SAVE_MODE, $fh;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1044 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1045 aio_fsync $fh if $cf::USE_FSYNC;
… …
1071 } 1064 }
1072 } else { 1065 } else {
1073 aio_unlink $filename; 1066 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1067 aio_unlink "$filename.pst";
1075 } 1068 }
1076 } 1069 };
1077} 1070}
1078 1071
1079sub object_freezer_as_string { 1072sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1073 my ($rdata, $objs) = @_;
1081 1074
… …
1093 or return; 1086 or return;
1094 1087
1095 unless (aio_stat "$filename.pst") { 1088 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1089 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1090 or return;
1091
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1092 $av = eval { (Storable::thaw $av)->{objs} };
1099 } 1093 }
1100 1094
1095 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1096 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1097 $decname, length $data, scalar @{$av || []};
1098
1103 return ($data, $av); 1099 ($data, $av)
1104} 1100}
1105 1101
1106=head2 COMMAND CALLBACKS 1102=head2 COMMAND CALLBACKS
1107 1103
1108=over 4 1104=over 4
… …
1186 my ($type, $reply, @payload) = 1182 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1183 "ARRAY" eq ref $msg
1188 ? @$msg 1184 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1185 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1186
1187 my @reply;
1188
1191 if (my $cb = $EXTCMD{$type}) { 1189 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1190 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1191 }
1192
1193 $pl->ext_reply ($reply, @reply)
1194 if $reply;
1195
1197 } else { 1196 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1197 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1198 }
1200 1199
1201 cf::override; 1200 cf::override;
… …
1291 1290
1292=head3 cf::player 1291=head3 cf::player
1293 1292
1294=over 4 1293=over 4
1295 1294
1295=item cf::player::num_playing
1296
1297Returns the official number of playing players, as per the Crossfire metaserver rules.
1298
1299=cut
1300
1301sub num_playing {
1302 scalar grep
1303 $_->ob->map
1304 && !$_->hidden
1305 && !$_->ob->flag (cf::FLAG_WIZ),
1306 cf::player::list
1307}
1308
1296=item cf::player::find $login 1309=item cf::player::find $login
1297 1310
1298Returns the given player object, loading it if necessary (might block). 1311Returns the given player object, loading it if necessary (might block).
1299 1312
1300=cut 1313=cut
… …
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1348 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1349 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1350 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1351 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1352
1340 my $pl = load_pl path $login 1353 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1354 or return;
1355
1356 my $pl = cf::player::load_pl $f
1357 or return;
1358 local $cf::PLAYER_LOADING{$login} = $pl;
1359 $f->resolve_delayed_derefs;
1342 $cf::PLAYER{$login} = $pl 1360 $cf::PLAYER{$login} = $pl
1343 } 1361 }
1344 } 1362 }
1345} 1363}
1346 1364
… …
1356 1374
1357 aio_mkdir playerdir $pl, 0770; 1375 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1376 $pl->{last_save} = $cf::RUNTIME;
1359 1377
1360 $pl->save_pl ($path); 1378 $pl->save_pl ($path);
1361 Coro::cede; 1379 cf::cede_to_tick;
1362} 1380}
1363 1381
1364sub new($) { 1382sub new($) {
1365 my ($login) = @_; 1383 my ($login) = @_;
1366 1384
… …
1444 or return []; 1462 or return [];
1445 1463
1446 my @logins; 1464 my @logins;
1447 1465
1448 for my $login (@$dirs) { 1466 for my $login (@$dirs) {
1467 my $path = path $login;
1468
1469 # a .pst is a dead give-away for a valid player
1470 unless (-e "$path.pst") {
1449 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1471 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1450 aio_read $fh, 0, 512, my $buf, 0 or next; 1472 aio_read $fh, 0, 512, my $buf, 0 or next;
1451 $buf !~ /^password -------------$/m or next; # official not-valid tag 1473 $buf !~ /^password -------------$/m or next; # official not-valid tag
1474 }
1452 1475
1453 utf8::decode $login; 1476 utf8::decode $login;
1454 push @logins, $login; 1477 push @logins, $login;
1455 } 1478 }
1456 1479
… …
1494sub expand_cfpod { 1517sub expand_cfpod {
1495 ((my $self), (local $_)) = @_; 1518 ((my $self), (local $_)) = @_;
1496 1519
1497 # escape & and < 1520 # escape & and <
1498 s/&/&amp;/g; 1521 s/&/&amp;/g;
1499 s/(?<![BIUGH])</&lt;/g; 1522 s/(?<![BIUGHT])</&lt;/g;
1500 1523
1501 # this is buggy, it needs to properly take care of nested <'s 1524 # this is buggy, it needs to properly take care of nested <'s
1502 1525
1503 1 while 1526 1 while
1504 # replace B<>, I<>, U<> etc. 1527 # replace B<>, I<>, U<> etc.
1505 s/B<([^\>]*)>/<b>$1<\/b>/ 1528 s/B<([^\>]*)>/<b>$1<\/b>/
1506 || s/I<([^\>]*)>/<i>$1<\/i>/ 1529 || s/I<([^\>]*)>/<i>$1<\/i>/
1507 || s/U<([^\>]*)>/<u>$1<\/u>/ 1530 || s/U<([^\>]*)>/<u>$1<\/u>/
1531 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1508 # replace G<male|female> tags 1532 # replace G<male|female> tags
1509 || s{G<([^>|]*)\|([^>]*)>}{ 1533 || s{G<([^>|]*)\|([^>]*)>}{
1510 $self->gender ? $2 : $1 1534 $self->gender ? $2 : $1
1511 }ge 1535 }ge
1512 # replace H<hint text> 1536 # replace H<hint text>
… …
1542=cut 1566=cut
1543 1567
1544sub ext_reply($$@) { 1568sub ext_reply($$@) {
1545 my ($self, $id, @msg) = @_; 1569 my ($self, $id, @msg) = @_;
1546 1570
1547 if ($self->ns->extcmd == 2) { 1571 $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} 1572}
1555 1573
1556=item $player->ext_msg ($type, @msg) 1574=item $player->ext_msg ($type, @msg)
1557 1575
1558Sends an ext event to the client. 1576Sends an ext event to the client.
… …
1786 1804
1787sub load_header_from($) { 1805sub load_header_from($) {
1788 my ($self, $path) = @_; 1806 my ($self, $path) = @_;
1789 1807
1790 utf8::encode $path; 1808 utf8::encode $path;
1791 #aio_open $path, O_RDONLY, 0 1809 my $f = new_from_file cf::object::thawer $path
1792 # or return;
1793
1794 $self->_load_header ($path)
1795 or return; 1810 or return;
1811
1812 $self->_load_header ($f)
1813 or return;
1814
1815 local $MAP_LOADING{$self->{path}} = $self;
1816 $f->resolve_delayed_derefs;
1796 1817
1797 $self->{load_path} = $path; 1818 $self->{load_path} = $path;
1798 1819
1799 1 1820 1
1800} 1821}
… …
1854sub find { 1875sub find {
1855 my ($path, $origin) = @_; 1876 my ($path, $origin) = @_;
1856 1877
1857 $path = normalise $path, $origin && $origin->path; 1878 $path = normalise $path, $origin && $origin->path;
1858 1879
1880 cf::lock_wait "map_data:$path";#d#remove
1859 cf::lock_wait "map_find:$path"; 1881 cf::lock_wait "map_find:$path";
1860 1882
1861 $cf::MAP{$path} || do { 1883 $cf::MAP{$path} || do {
1862 my $guard = cf::lock_acquire "map_find:$path"; 1884 my $guard1 = cf::lock_acquire "map_find:$path";
1885 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1886
1863 my $map = new_from_path cf::map $path 1887 my $map = new_from_path cf::map $path
1864 or return; 1888 or return;
1865 1889
1866 $map->{last_save} = $cf::RUNTIME; 1890 $map->{last_save} = $cf::RUNTIME;
1867 1891
… …
1869 or return; 1893 or return;
1870 1894
1871 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1895 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1872 # doing this can freeze the server in a sync job, obviously 1896 # doing this can freeze the server in a sync job, obviously
1873 #$cf::WAIT_FOR_TICK->wait; 1897 #$cf::WAIT_FOR_TICK->wait;
1898 undef $guard1;
1899 undef $guard2;
1874 $map->reset; 1900 $map->reset;
1875 undef $guard;
1876 return find $path; 1901 return find $path;
1877 } 1902 }
1878 1903
1879 $cf::MAP{$path} = $map 1904 $cf::MAP{$path} = $map
1880 } 1905 }
… …
1889 local $self->{deny_reset} = 1; # loading can take a long time 1914 local $self->{deny_reset} = 1; # loading can take a long time
1890 1915
1891 my $path = $self->{path}; 1916 my $path = $self->{path};
1892 1917
1893 { 1918 {
1894 my $guard = cf::lock_acquire "map_load:$path"; 1919 my $guard = cf::lock_acquire "map_data:$path";
1895 1920
1921 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 1922 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 1923
1898 $self->in_memory (cf::MAP_LOADING); 1924 $self->in_memory (cf::MAP_LOADING);
1899 1925
1900 $self->alloc; 1926 $self->alloc;
1901 1927
1902 $self->pre_load; 1928 $self->pre_load;
1903 Coro::cede; 1929 cf::cede_to_tick;
1904 1930
1931 my $f = new_from_file cf::object::thawer $self->{load_path};
1932 $f->skip_block;
1905 $self->_load_objects ($self->{load_path}, 1) 1933 $self->_load_objects ($f)
1906 or return; 1934 or return;
1907 1935
1908 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1936 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1909 if delete $self->{load_original}; 1937 if delete $self->{load_original};
1910 1938
1911 if (my $uniq = $self->uniq_path) { 1939 if (my $uniq = $self->uniq_path) {
1912 utf8::encode $uniq; 1940 utf8::encode $uniq;
1913 if (aio_open $uniq, O_RDONLY, 0) { 1941 unless (aio_stat $uniq) {
1942 if (my $f = new_from_file cf::object::thawer $uniq) {
1914 $self->clear_unique_items; 1943 $self->clear_unique_items;
1915 $self->_load_objects ($uniq, 0); 1944 $self->_load_objects ($f);
1945 $f->resolve_delayed_derefs;
1946 }
1916 } 1947 }
1917 } 1948 }
1918 1949
1919 Coro::cede; 1950 $f->resolve_delayed_derefs;
1951
1952 cf::cede_to_tick;
1920 # now do the right thing for maps 1953 # now do the right thing for maps
1921 $self->link_multipart_objects; 1954 $self->link_multipart_objects;
1922 $self->difficulty ($self->estimate_difficulty) 1955 $self->difficulty ($self->estimate_difficulty)
1923 unless $self->difficulty; 1956 unless $self->difficulty;
1924 Coro::cede; 1957 cf::cede_to_tick;
1925 1958
1926 unless ($self->{deny_activate}) { 1959 unless ($self->{deny_activate}) {
1927 $self->decay_objects; 1960 $self->decay_objects;
1928 $self->fix_auto_apply; 1961 $self->fix_auto_apply;
1929 $self->update_buttons; 1962 $self->update_buttons;
1930 Coro::cede; 1963 cf::cede_to_tick;
1931 $self->set_darkness_map; 1964 $self->set_darkness_map;
1932 Coro::cede; 1965 cf::cede_to_tick;
1933 $self->activate; 1966 $self->activate;
1934 } 1967 }
1935 1968
1936 $self->{last_save} = $cf::RUNTIME; 1969 $self->{last_save} = $cf::RUNTIME;
1937 $self->last_access ($cf::RUNTIME); 1970 $self->last_access ($cf::RUNTIME);
… …
1953 1986
1954 $self 1987 $self
1955} 1988}
1956 1989
1957# find and load all maps in the 3x3 area around a map 1990# find and load all maps in the 3x3 area around a map
1958sub load_diag { 1991sub load_neighbours {
1959 my ($map) = @_; 1992 my ($map) = @_;
1960 1993
1961 my @diag; # diagonal neighbours 1994 my @neigh; # diagonal neighbours
1962 1995
1963 for (0 .. 3) { 1996 for (0 .. 3) {
1964 my $neigh = $map->tile_path ($_) 1997 my $neigh = $map->tile_path ($_)
1965 or next; 1998 or next;
1966 $neigh = find $neigh, $map 1999 $neigh = find $neigh, $map
1967 or next; 2000 or next;
1968 $neigh->load; 2001 $neigh->load;
1969 2002
2003 push @neigh,
1970 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2004 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1971 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2005 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1972 } 2006 }
1973 2007
1974 for (@diag) { 2008 for (grep defined $_->[0], @neigh) {
2009 my ($path, $origin) = @$_;
1975 my $neigh = find @$_ 2010 my $neigh = find $path, $origin
1976 or next; 2011 or next;
1977 $neigh->load; 2012 $neigh->load;
1978 } 2013 }
1979} 2014}
1980 2015
… …
1985} 2020}
1986 2021
1987sub do_load_sync { 2022sub do_load_sync {
1988 my ($map) = @_; 2023 my ($map) = @_;
1989 2024
2025 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2026 if $Coro::current == $Coro::main;
2027
1990 cf::sync_job { $map->load }; 2028 cf::sync_job { $map->load };
1991} 2029}
1992 2030
1993our %MAP_PREFETCH; 2031our %MAP_PREFETCH;
1994our $MAP_PREFETCHER = undef; 2032our $MAP_PREFETCHER = undef;
1995 2033
1996sub find_async { 2034sub find_async {
1997 my ($path, $origin) = @_; 2035 my ($path, $origin, $load) = @_;
1998 2036
1999 $path = normalise $path, $origin && $origin->{path}; 2037 $path = normalise $path, $origin && $origin->{path};
2000 2038
2001 if (my $map = $cf::MAP{$path}) { 2039 if (my $map = $cf::MAP{$path}) {
2002 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2040 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
2003 } 2041 }
2004 2042
2005 undef $MAP_PREFETCH{$path}; 2043 $MAP_PREFETCH{$path} |= $load;
2044
2006 $MAP_PREFETCHER ||= cf::async { 2045 $MAP_PREFETCHER ||= cf::async {
2046 $Coro::current->{desc} = "map prefetcher";
2047
2007 while (%MAP_PREFETCH) { 2048 while (%MAP_PREFETCH) {
2008 for my $path (keys %MAP_PREFETCH) { 2049 while (my ($k, $v) = each %MAP_PREFETCH) {
2009 if (my $map = find $path) { 2050 if (my $map = find $k) {
2010 $map->load; 2051 $map->load if $v;
2011 } 2052 }
2012 2053
2013 delete $MAP_PREFETCH{$path}; 2054 delete $MAP_PREFETCH{$k};
2014 } 2055 }
2015 } 2056 }
2016 undef $MAP_PREFETCHER; 2057 undef $MAP_PREFETCHER;
2017 }; 2058 };
2018 $MAP_PREFETCHER->prio (6); 2059 $MAP_PREFETCHER->prio (6);
… …
2021} 2062}
2022 2063
2023sub save { 2064sub save {
2024 my ($self) = @_; 2065 my ($self) = @_;
2025 2066
2026 my $lock = cf::lock_acquire "map_data:" . $self->path; 2067 my $lock = cf::lock_acquire "map_data:$self->{path}";
2027 2068
2028 $self->{last_save} = $cf::RUNTIME; 2069 $self->{last_save} = $cf::RUNTIME;
2029 2070
2030 return unless $self->dirty; 2071 return unless $self->dirty;
2031 2072
… …
2037 return if $self->{deny_save}; 2078 return if $self->{deny_save};
2038 2079
2039 local $self->{last_access} = $self->last_access;#d# 2080 local $self->{last_access} = $self->last_access;#d#
2040 2081
2041 cf::async { 2082 cf::async {
2083 $Coro::current->{desc} = "map player save";
2042 $_->contr->save for $self->players; 2084 $_->contr->save for $self->players;
2043 }; 2085 };
2044 2086
2045 if ($uniq) { 2087 if ($uniq) {
2046 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2054 my ($self) = @_; 2096 my ($self) = @_;
2055 2097
2056 # save first because save cedes 2098 # save first because save cedes
2057 $self->save; 2099 $self->save;
2058 2100
2059 my $lock = cf::lock_acquire "map_data:" . $self->path; 2101 my $lock = cf::lock_acquire "map_data:$self->{path}";
2060 2102
2061 return if $self->players; 2103 return if $self->players;
2062 return if $self->in_memory != cf::MAP_IN_MEMORY; 2104 return if $self->in_memory != cf::MAP_IN_MEMORY;
2063 return if $self->{deny_save}; 2105 return if $self->{deny_save};
2064 2106
2107 $self->in_memory (cf::MAP_SWAPPED);
2108
2109 $self->deactivate;
2110 $_->clear_links_to ($self) for values %cf::MAP;
2065 $self->clear; 2111 $self->clear;
2066 $self->in_memory (cf::MAP_SWAPPED);
2067} 2112}
2068 2113
2069sub reset_at { 2114sub reset_at {
2070 my ($self) = @_; 2115 my ($self) = @_;
2071 2116
… …
2103 if $uniq; 2148 if $uniq;
2104 } 2149 }
2105 2150
2106 delete $cf::MAP{$self->path}; 2151 delete $cf::MAP{$self->path};
2107 2152
2153 $self->deactivate;
2154 $_->clear_links_to ($self) for values %cf::MAP;
2108 $self->clear; 2155 $self->clear;
2109
2110 $_->clear_links_to ($self) for values %cf::MAP;
2111 2156
2112 $self->unlink_save; 2157 $self->unlink_save;
2113 $self->destroy; 2158 $self->destroy;
2114} 2159}
2115 2160
2116my $nuke_counter = "aaaa"; 2161my $nuke_counter = "aaaa";
2117 2162
2118sub nuke { 2163sub nuke {
2119 my ($self) = @_; 2164 my ($self) = @_;
2120 2165
2166 {
2167 my $lock = cf::lock_acquire "map_data:$self->{path}";
2168
2121 delete $cf::MAP{$self->path}; 2169 delete $cf::MAP{$self->path};
2122 2170
2123 $self->unlink_save; 2171 $self->unlink_save;
2124 2172
2125 bless $self, "cf::map"; 2173 bless $self, "cf::map";
2126 delete $self->{deny_reset}; 2174 delete $self->{deny_reset};
2127 $self->{deny_save} = 1; 2175 $self->{deny_save} = 1;
2128 $self->reset_timeout (1); 2176 $self->reset_timeout (1);
2129 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2177 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2130 2178
2131 $cf::MAP{$self->path} = $self; 2179 $cf::MAP{$self->path} = $self;
2180 }
2132 2181
2133 $self->reset; # polite request, might not happen 2182 $self->reset; # polite request, might not happen
2134} 2183}
2135 2184
2136=item $maps = cf::map::tmp_maps 2185=item $maps = cf::map::tmp_maps
… …
2212 2261
2213sub inv_recursive { 2262sub inv_recursive {
2214 inv_recursive_ inv $_[0] 2263 inv_recursive_ inv $_[0]
2215} 2264}
2216 2265
2266=item $ref = $ob->ref
2267
2268creates and returns a persistent reference to an objetc that can be stored as a string.
2269
2270=item $ob = cf::object::deref ($refstring)
2271
2272returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2273even if the object actually exists. May block.
2274
2275=cut
2276
2277sub deref {
2278 my ($ref) = @_;
2279
2280 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2281 my ($uuid, $name) = ($1, $2);
2282 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2283 or return;
2284 $pl->ob->uuid eq $uuid
2285 or return;
2286
2287 $pl->ob
2288 } else {
2289 warn "$ref: cannot resolve object reference\n";
2290 undef
2291 }
2292}
2293
2217package cf; 2294package cf;
2218 2295
2219=back 2296=back
2220 2297
2221=head3 cf::object::player 2298=head3 cf::object::player
… …
2349 # use -1 or undef as default coordinates, not 0, 0 2426 # use -1 or undef as default coordinates, not 0, 0
2350 ($x, $y) = ($map->enter_x, $map->enter_y) 2427 ($x, $y) = ($map->enter_x, $map->enter_y)
2351 if $x <=0 && $y <= 0; 2428 if $x <=0 && $y <= 0;
2352 2429
2353 $map->load; 2430 $map->load;
2354 $map->load_diag; 2431 $map->load_neighbours;
2355 2432
2356 return unless $self->contr->active; 2433 return unless $self->contr->active;
2357 $self->activate_recursive; 2434 $self->activate_recursive;
2358 2435
2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2436 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2379 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2456 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2380 2457
2381 $self->enter_link; 2458 $self->enter_link;
2382 2459
2383 (async { 2460 (async {
2461 $Coro::current->{desc} = "player::goto $path $x $y";
2462
2463 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs];
2467
2468 # see if we actually can go there
2469 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2470 $ob = $obs[rand @obs];
2471 } else {
2472 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2473 }
2474 # else put us there anyways for now #d#
2475
2476 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2477 } else {
2478 ($path, $x, $y) = (undef, undef, undef);
2479 }
2480 }
2481
2384 my $map = eval { 2482 my $map = eval {
2385 my $map = cf::map::find $path; 2483 my $map = defined $path ? cf::map::find $path : undef;
2386 2484
2387 if ($map) { 2485 if ($map) {
2388 $map = $map->customise_for ($self); 2486 $map = $map->customise_for ($self);
2389 $map = $check->($map) if $check && $map; 2487 $map = $check->($map) if $check && $map;
2390 } else { 2488 } else {
2391 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2489 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2392 } 2490 }
2393 2491
2394 $map 2492 $map
2395 }; 2493 };
2396 2494
… …
2486 # if exit is damned, update players death & WoR home-position 2584 # if exit is damned, update players death & WoR home-position
2487 $self->contr->savebed ($slaying, $hp, $sp) 2585 $self->contr->savebed ($slaying, $hp, $sp)
2488 if $exit->flag (FLAG_DAMNED); 2586 if $exit->flag (FLAG_DAMNED);
2489 2587
2490 (async { 2588 (async {
2589 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2590
2491 $self->deactivate_recursive; # just to be sure 2591 $self->deactivate_recursive; # just to be sure
2492 unless (eval { 2592 unless (eval {
2493 $self->goto ($slaying, $hp, $sp); 2593 $self->goto ($slaying, $hp, $sp);
2494 2594
2495 1; 2595 1;
… …
2530the message, with C<log> being the default. If C<$color> is negative, suppress 2630the message, with C<log> being the default. If C<$color> is negative, suppress
2531the message unless the client supports the msg packet. 2631the message unless the client supports the msg packet.
2532 2632
2533=cut 2633=cut
2534 2634
2635our %CHANNEL = (
2636 "c/identify" => {
2637 id => "infobox",
2638 title => "Identify",
2639 reply => undef,
2640 tooltip => "Items recently identified",
2641 },
2642 "c/examine" => {
2643 id => "infobox",
2644 title => "Examine",
2645 reply => undef,
2646 tooltip => "Signs and other items you examined",
2647 },
2648 "c/lookat" => {
2649 id => "infobox",
2650 title => "Look",
2651 reply => undef,
2652 tooltip => "What you saw there",
2653 },
2654);
2655
2535sub cf::client::send_msg { 2656sub cf::client::send_msg {
2536 my ($self, $channel, $msg, $color, @extra) = @_; 2657 my ($self, $channel, $msg, $color, @extra) = @_;
2537 2658
2538 $msg = $self->pl->expand_cfpod ($msg); 2659 $msg = $self->pl->expand_cfpod ($msg);
2539 2660
2540 $color &= cf::NDI_CLIENT_MASK; # just in case... 2661 $color &= cf::NDI_CLIENT_MASK; # just in case...
2541 2662
2663 # check predefined channels, for the benefit of C
2664 if ($CHANNEL{$channel}) {
2665 $channel = $CHANNEL{$channel};
2666
2667 $self->ext_msg (channel_info => $channel)
2668 if $self->can_msg;
2669
2670 $channel = $channel->{id};
2671
2542 if (ref $channel) { 2672 } elsif (ref $channel) {
2543 # send meta info to client, if not yet sent 2673 # send meta info to client, if not yet sent
2544 unless (exists $self->{channel}{$channel->{id}}) { 2674 unless (exists $self->{channel}{$channel->{id}}) {
2545 $self->{channel}{$channel->{id}} = $channel; 2675 $self->{channel}{$channel->{id}} = $channel;
2546 $self->ext_msg (channel_info => $channel); 2676 $self->ext_msg (channel_info => $channel)
2677 if $self->can_msg;
2547 } 2678 }
2548 2679
2549 $channel = $channel->{id}; 2680 $channel = $channel->{id};
2550 } 2681 }
2551 2682
… …
2592=cut 2723=cut
2593 2724
2594sub cf::client::ext_msg($$@) { 2725sub cf::client::ext_msg($$@) {
2595 my ($self, $type, @msg) = @_; 2726 my ($self, $type, @msg) = @_;
2596 2727
2597 my $extcmd = $self->extcmd;
2598
2599 if ($extcmd == 2) { 2728 if ($self->extcmd == 2) {
2600 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2729 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2601 } elsif ($extcmd == 1) { # TODO: remove 2730 } elsif ($self->extcmd == 1) { # TODO: remove
2602 push @msg, msgtype => "event_$type"; 2731 push @msg, msgtype => "event_$type";
2732 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2733 }
2734}
2735
2736=item $client->ext_reply ($msgid, @msg)
2737
2738Sends an ext reply to the client.
2739
2740=cut
2741
2742sub cf::client::ext_reply($$@) {
2743 my ($self, $id, @msg) = @_;
2744
2745 if ($self->extcmd == 2) {
2746 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2747 } elsif ($self->extcmd == 1) {
2748 #TODO: version 1, remove
2749 unshift @msg, msgtype => "reply", msgid => $id;
2603 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2750 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2604 } 2751 }
2605} 2752}
2606 2753
2607=item $success = $client->query ($flags, "text", \&cb) 2754=item $success = $client->query ($flags, "text", \&cb)
… …
2669 my ($type, $reply, @payload) = 2816 my ($type, $reply, @payload) =
2670 "ARRAY" eq ref $msg 2817 "ARRAY" eq ref $msg
2671 ? @$msg 2818 ? @$msg
2672 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2819 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2673 2820
2821 my @reply;
2822
2674 if (my $cb = $EXTICMD{$type}) { 2823 if (my $cb = $EXTICMD{$type}) {
2675 my @reply = $cb->($ns, @payload); 2824 @reply = $cb->($ns, @payload);
2676
2677 $ns->ext_reply ($reply, @reply)
2678 if $reply;
2679 } 2825 }
2826
2827 $ns->ext_reply ($reply, @reply)
2828 if $reply;
2829
2680 } else { 2830 } else {
2681 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2831 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2682 } 2832 }
2683 2833
2684 cf::override; 2834 cf::override;
… …
2745 2895
2746The following functions and methods are available within a safe environment: 2896The following functions and methods are available within a safe environment:
2747 2897
2748 cf::object 2898 cf::object
2749 contr pay_amount pay_player map x y force_find force_add 2899 contr pay_amount pay_player map x y force_find force_add
2750 insert remove name archname title slaying race 2900 insert remove name archname title slaying race decrease_ob_nr
2751 2901
2752 cf::object::player 2902 cf::object::player
2753 player 2903 player
2754 2904
2755 cf::player 2905 cf::player
… …
2760 2910
2761=cut 2911=cut
2762 2912
2763for ( 2913for (
2764 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2914 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2765 insert remove inv name archname title slaying race)], 2915 insert remove inv name archname title slaying race
2916 decrease_ob_nr)],
2766 ["cf::object::player" => qw(player)], 2917 ["cf::object::player" => qw(player)],
2767 ["cf::player" => qw(peaceful)], 2918 ["cf::player" => qw(peaceful)],
2768 ["cf::map" => qw(trigger)], 2919 ["cf::map" => qw(trigger)],
2769) { 2920) {
2770 no strict 'refs'; 2921 no strict 'refs';
… …
2846# the server's init and main functions 2997# the server's init and main functions
2847 2998
2848sub load_facedata($) { 2999sub load_facedata($) {
2849 my ($path) = @_; 3000 my ($path) = @_;
2850 3001
3002 # HACK to clear player env face cache, we need some signal framework
3003 # for this (global event?)
3004 %ext::player_env::MUSIC_FACE_CACHE = ();
3005
3006 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3007
2851 warn "loading facedata from $path\n"; 3008 warn "loading facedata from $path\n";
2852 3009
2853 my $facedata; 3010 my $facedata;
2854 0 < aio_load $path, $facedata 3011 0 < aio_load $path, $facedata
2855 or die "$path: $!"; 3012 or die "$path: $!";
2856 3013
2857 $facedata = Coro::Storable::thaw $facedata; 3014 $facedata = Coro::Storable::thaw $facedata;
2858 3015
2859 $facedata->{version} == 2 3016 $facedata->{version} == 2
2860 or cf::cleanup "$path: version mismatch, cannot proceed."; 3017 or cf::cleanup "$path: version mismatch, cannot proceed.";
3018
3019 # patch in the exptable
3020 $facedata->{resource}{"res/exp_table"} = {
3021 type => FT_RSRC,
3022 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3023 };
3024 cf::cede_to_tick;
2861 3025
2862 { 3026 {
2863 my $faces = $facedata->{faceinfo}; 3027 my $faces = $facedata->{faceinfo};
2864 3028
2865 while (my ($face, $info) = each %$faces) { 3029 while (my ($face, $info) = each %$faces) {
2866 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3030 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2867 cf::face::set_visibility $idx, $info->{visibility}; 3031 cf::face::set_visibility $idx, $info->{visibility};
2868 cf::face::set_magicmap $idx, $info->{magicmap}; 3032 cf::face::set_magicmap $idx, $info->{magicmap};
2869 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3033 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2870 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3034 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2871 3035
2872 cf::cede_to_tick; 3036 cf::cede_to_tick;
2873 } 3037 }
2874 3038
2875 while (my ($face, $info) = each %$faces) { 3039 while (my ($face, $info) = each %$faces) {
… …
2900 3064
2901 { 3065 {
2902 # TODO: for gcfclient pleasure, we should give resources 3066 # TODO: for gcfclient pleasure, we should give resources
2903 # that gcfclient doesn't grok a >10000 face index. 3067 # that gcfclient doesn't grok a >10000 face index.
2904 my $res = $facedata->{resource}; 3068 my $res = $facedata->{resource};
2905 my $enc = JSON::XS->new->utf8->canonical;
2906 3069
2907 my $soundconf = delete $res->{"res/sound.conf"}; 3070 my $soundconf = delete $res->{"res/sound.conf"};
2908 3071
2909 while (my ($name, $info) = each %$res) { 3072 while (my ($name, $info) = each %$res) {
2910 my $meta = $enc->encode ({
2911 name => $name,
2912 %{ $info->{meta} || {} },
2913 });
2914
2915 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3073 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3074 my $data;
2916 3075
2917 if ($info->{type} & 1) { 3076 if ($info->{type} & 1) {
2918 # prepend meta info 3077 # prepend meta info
2919 3078
3079 my $meta = $enc->encode ({
3080 name => $name,
3081 %{ $info->{meta} || {} },
3082 });
3083
2920 my $data = pack "(w/a*)*", $meta, $info->{data}; 3084 $data = pack "(w/a*)*", $meta, $info->{data};
2921 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2922
2923 cf::face::set_data $idx, 0, $data, $chk;
2924 } else { 3085 } else {
2925 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3086 $data = $info->{data};
2926 } 3087 }
2927 3088
3089 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2928 cf::face::set_type $idx, $info->{type}; 3090 cf::face::set_type $idx, $info->{type};
2929 3091
2930 cf::cede_to_tick; 3092 cf::cede_to_tick;
2931 } 3093 }
2932 3094
… …
2959 $ns->fx_want ($k, $v); 3121 $ns->fx_want ($k, $v);
2960 } 3122 }
2961}; 3123};
2962 3124
2963sub reload_regions { 3125sub reload_regions {
3126 # HACK to clear player env face cache, we need some signal framework
3127 # for this (global event?)
3128 %ext::player_env::MUSIC_FACE_CACHE = ();
3129
2964 load_resource_file "$MAPDIR/regions" 3130 load_resource_file "$MAPDIR/regions"
2965 or die "unable to load regions file\n"; 3131 or die "unable to load regions file\n";
2966 3132
2967 for (cf::region::list) { 3133 for (cf::region::list) {
2968 $_->{match} = qr/$_->{match}/ 3134 $_->{match} = qr/$_->{match}/
… …
3004 3170
3005sub init { 3171sub init {
3006 reload_resources; 3172 reload_resources;
3007} 3173}
3008 3174
3009sub cfg_load { 3175sub reload_config {
3010 open my $fh, "<:utf8", "$CONFDIR/config" 3176 open my $fh, "<:utf8", "$CONFDIR/config"
3011 or return; 3177 or return;
3012 3178
3013 local $/; 3179 local $/;
3014 *CFG = YAML::Syck::Load <$fh>; 3180 *CFG = YAML::Syck::Load <$fh>;
… …
3030sub main { 3196sub main {
3031 # we must not ever block the main coroutine 3197 # we must not ever block the main coroutine
3032 local $Coro::idle = sub { 3198 local $Coro::idle = sub {
3033 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3199 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3034 (async { 3200 (async {
3201 $Coro::current->{desc} = "IDLE BUG HANDLER";
3035 Event::one_event; 3202 Event::one_event;
3036 })->prio (Coro::PRIO_MAX); 3203 })->prio (Coro::PRIO_MAX);
3037 }; 3204 };
3038 3205
3039 cfg_load; 3206 reload_config;
3040 db_init; 3207 db_init;
3041 load_extensions; 3208 load_extensions;
3042 3209
3043 $TICK_WATCHER->start; 3210 $TICK_WATCHER->start;
3044 Event::loop; 3211 Event::loop;
… …
3237 warn "reloading cf.pm"; 3404 warn "reloading cf.pm";
3238 require cf; 3405 require cf;
3239 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3406 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3240 3407
3241 warn "loading config and database again"; 3408 warn "loading config and database again";
3242 cf::cfg_load; 3409 cf::reload_config;
3243 3410
3244 warn "loading extensions"; 3411 warn "loading extensions";
3245 cf::load_extensions; 3412 cf::load_extensions;
3246 3413
3247 warn "reattaching attachments to objects/players"; 3414 warn "reattaching attachments to objects/players";
… …
3283register_command "reload" => sub { 3450register_command "reload" => sub {
3284 my ($who, $arg) = @_; 3451 my ($who, $arg) = @_;
3285 3452
3286 if ($who->flag (FLAG_WIZ)) { 3453 if ($who->flag (FLAG_WIZ)) {
3287 $who->message ("reloading server."); 3454 $who->message ("reloading server.");
3455 async {
3456 $Coro::current->{desc} = "perl_reload";
3288 async { reload_perl }; 3457 reload_perl;
3458 };
3289 } 3459 }
3290}; 3460};
3291 3461
3292unshift @INC, $LIBDIR; 3462unshift @INC, $LIBDIR;
3293 3463
… …
3312 my $signal = new Coro::Signal; 3482 my $signal = new Coro::Signal;
3313 push @WAIT_FOR_TICK_BEGIN, $signal; 3483 push @WAIT_FOR_TICK_BEGIN, $signal;
3314 $signal->wait; 3484 $signal->wait;
3315} 3485}
3316 3486
3317 my $min = 1e6;#d#
3318 my $avg = 10;
3319$TICK_WATCHER = Event->timer ( 3487$TICK_WATCHER = Event->timer (
3320 reentrant => 0, 3488 reentrant => 0,
3321 parked => 1, 3489 parked => 1,
3322 prio => 0, 3490 prio => 0,
3323 at => $NEXT_TICK || $TICK, 3491 at => $NEXT_TICK || $TICK,
… …
3331 3499
3332 $NOW = $tick_start = Event::time; 3500 $NOW = $tick_start = Event::time;
3333 3501
3334 cf::server_tick; # one server iteration 3502 cf::server_tick; # one server iteration
3335 3503
3336 0 && sync_job {#d#
3337 for(1..10) {
3338 my $t = Event::time;
3339 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3340 or die;
3341
3342 $map->width (50);
3343 $map->height (50);
3344 $map->alloc;
3345 $map->_load_objects ("/tmp/x.map", 1);
3346 my $t = Event::time - $t;
3347
3348 #next unless $t < 0.0013;#d#
3349 if ($t < $min) {
3350 $min = $t;
3351 }
3352 $avg = $avg * 0.99 + $t * 0.01;
3353 }
3354 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3355 exit 0;
3356 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3357 };
3358
3359 $RUNTIME += $TICK; 3504 $RUNTIME += $TICK;
3360 $NEXT_TICK += $TICK; 3505 $NEXT_TICK += $TICK;
3361 3506
3362 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3507 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3363 $NEXT_RUNTIME_WRITE = $NOW + 10; 3508 $NEXT_RUNTIME_WRITE = $NOW + 10;
3364 Coro::async_pool { 3509 Coro::async_pool {
3510 $Coro::current->{desc} = "runtime saver";
3365 write_runtime 3511 write_runtime
3366 or warn "ERROR: unable to write runtime file: $!"; 3512 or warn "ERROR: unable to write runtime file: $!";
3367 }; 3513 };
3368 } 3514 }
3369 3515
3370# my $AFTER = Event::time;
3371# warn $AFTER - $NOW;#d#
3372
3373 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3516 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3374 $sig->send; 3517 $sig->send;
3375 } 3518 }
3376 while (my $sig = shift @WAIT_FOR_TICK) { 3519 while (my $sig = shift @WAIT_FOR_TICK) {
3377 $sig->send; 3520 $sig->send;
… …
3387 3530
3388 $LOAD = ($NOW - $tick_start) / $TICK; 3531 $LOAD = ($NOW - $tick_start) / $TICK;
3389 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3532 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3390 3533
3391 _post_tick; 3534 _post_tick;
3392
3393
3394 }, 3535 },
3395); 3536);
3396 3537
3397{ 3538{
3539 BDB::min_parallel 8;
3398 BDB::max_poll_time $TICK * 0.1; 3540 BDB::max_poll_time $TICK * 0.1;
3399 $BDB_POLL_WATCHER = Event->io ( 3541 $BDB_POLL_WATCHER = Event->io (
3400 reentrant => 0, 3542 reentrant => 0,
3401 fd => BDB::poll_fileno, 3543 fd => BDB::poll_fileno,
3402 poll => 'r', 3544 poll => 'r',
3403 prio => 0, 3545 prio => 0,
3404 data => WF_AUTOCANCEL, 3546 data => WF_AUTOCANCEL,
3405 cb => \&BDB::poll_cb, 3547 cb => \&BDB::poll_cb,
3406 ); 3548 );
3407 BDB::min_parallel 8;
3408 3549
3409 BDB::set_sync_prepare { 3550 BDB::set_sync_prepare {
3410 my $status; 3551 my $status;
3411 my $current = $Coro::current; 3552 my $current = $Coro::current;
3412 ( 3553 (
… …
3421 ) 3562 )
3422 }; 3563 };
3423 3564
3424 unless ($DB_ENV) { 3565 unless ($DB_ENV) {
3425 $DB_ENV = BDB::db_env_create; 3566 $DB_ENV = BDB::db_env_create;
3567 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3568 | BDB::LOG_AUTOREMOVE, 1);
3569 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3570 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3426 3571
3427 cf::sync_job { 3572 cf::sync_job {
3428 eval { 3573 eval {
3429 BDB::db_env_open 3574 BDB::db_env_open
3430 $DB_ENV, 3575 $DB_ENV,
… …
3432 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3577 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3433 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3578 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3434 0666; 3579 0666;
3435 3580
3436 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3581 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3437
3438 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3439 $DB_ENV->set_lk_detect;
3440 }; 3582 };
3441 3583
3442 cf::cleanup "db_env_open(db): $@" if $@; 3584 cf::cleanup "db_env_open(db): $@" if $@;
3443 }; 3585 };
3444 } 3586 }
3587
3588 $BDB_DEADLOCK_WATCHER = Event->timer (
3589 after => 3,
3590 interval => 1,
3591 hard => 1,
3592 prio => 0,
3593 data => WF_AUTOCANCEL,
3594 cb => sub {
3595 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3596 },
3597 );
3598 $BDB_CHECKPOINT_WATCHER = Event->timer (
3599 after => 11,
3600 interval => 60,
3601 hard => 1,
3602 prio => 0,
3603 data => WF_AUTOCANCEL,
3604 cb => sub {
3605 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3606 },
3607 );
3608 $BDB_TRICKLE_WATCHER = Event->timer (
3609 after => 5,
3610 interval => 10,
3611 hard => 1,
3612 prio => 0,
3613 data => WF_AUTOCANCEL,
3614 cb => sub {
3615 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3616 },
3617 );
3445} 3618}
3446 3619
3447{ 3620{
3448 IO::AIO::min_parallel 8; 3621 IO::AIO::min_parallel 8;
3449 3622
… …
3452 $AIO_POLL_WATCHER = Event->io ( 3625 $AIO_POLL_WATCHER = Event->io (
3453 reentrant => 0, 3626 reentrant => 0,
3454 data => WF_AUTOCANCEL, 3627 data => WF_AUTOCANCEL,
3455 fd => IO::AIO::poll_fileno, 3628 fd => IO::AIO::poll_fileno,
3456 poll => 'r', 3629 poll => 'r',
3457 prio => 6, 3630 prio => 0,
3458 cb => \&IO::AIO::poll_cb, 3631 cb => \&IO::AIO::poll_cb,
3459 ); 3632 );
3460} 3633}
3461 3634
3462my $_log_backtrace; 3635my $_log_backtrace;
… …
3468 3641
3469 # limit the # of concurrent backtraces 3642 # limit the # of concurrent backtraces
3470 if ($_log_backtrace < 2) { 3643 if ($_log_backtrace < 2) {
3471 ++$_log_backtrace; 3644 ++$_log_backtrace;
3472 async { 3645 async {
3646 $Coro::current->{desc} = "abt $msg";
3647
3473 my @bt = fork_call { 3648 my @bt = fork_call {
3474 @addr = map { sprintf "%x", $_ } @addr; 3649 @addr = map { sprintf "%x", $_ } @addr;
3475 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3650 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3476 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3651 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3477 or die "addr2line: $!"; 3652 or die "addr2line: $!";

Diff Legend

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