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.328 by root, Wed Aug 8 06:24:30 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
… …
1370 $self->{deny_save} = 1; 1386 $self->{deny_save} = 1;
1371 1387
1372 $cf::PLAYER{$login} = $self; 1388 $cf::PLAYER{$login} = $self;
1373 1389
1374 $self 1390 $self
1391}
1392
1393=item $player->send_msg ($channel, $msg, $color, [extra...])
1394
1395=cut
1396
1397sub send_msg {
1398 my $ns = shift->ns
1399 or return;
1400 $ns->send_msg (@_);
1375} 1401}
1376 1402
1377=item $pl->quit_character 1403=item $pl->quit_character
1378 1404
1379Nukes the player without looking back. If logged in, the connection will 1405Nukes the player without looking back. If logged in, the connection will
… …
1434 or return []; 1460 or return [];
1435 1461
1436 my @logins; 1462 my @logins;
1437 1463
1438 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") {
1439 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1469 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440 aio_read $fh, 0, 512, my $buf, 0 or next; 1470 aio_read $fh, 0, 512, my $buf, 0 or next;
1441 $buf !~ /^password -------------$/m or next; # official not-valid tag 1471 $buf !~ /^password -------------$/m or next; # official not-valid tag
1472 }
1442 1473
1443 utf8::decode $login; 1474 utf8::decode $login;
1444 push @logins, $login; 1475 push @logins, $login;
1445 } 1476 }
1446 1477
… …
1484sub expand_cfpod { 1515sub expand_cfpod {
1485 ((my $self), (local $_)) = @_; 1516 ((my $self), (local $_)) = @_;
1486 1517
1487 # escape & and < 1518 # escape & and <
1488 s/&/&amp;/g; 1519 s/&/&amp;/g;
1489 s/(?<![BIUGH])</&lt;/g; 1520 s/(?<![BIUGHT])</&lt;/g;
1490 1521
1491 # 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
1492 1523
1493 1 while 1524 1 while
1494 # replace B<>, I<>, U<> etc. 1525 # replace B<>, I<>, U<> etc.
1495 s/B<([^\>]*)>/<b>$1<\/b>/ 1526 s/B<([^\>]*)>/<b>$1<\/b>/
1496 || s/I<([^\>]*)>/<i>$1<\/i>/ 1527 || s/I<([^\>]*)>/<i>$1<\/i>/
1497 || s/U<([^\>]*)>/<u>$1<\/u>/ 1528 || s/U<([^\>]*)>/<u>$1<\/u>/
1529 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1498 # replace G<male|female> tags 1530 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{ 1531 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1 1532 $self->gender ? $2 : $1
1501 }ge 1533 }ge
1502 # replace H<hint text> 1534 # replace H<hint text>
… …
1532=cut 1564=cut
1533 1565
1534sub ext_reply($$@) { 1566sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1567 my ($self, $id, @msg) = @_;
1536 1568
1537 if ($self->ns->extcmd == 2) { 1569 $self->ns->ext_reply ($id, @msg)
1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1539 } elsif ($self->ns->extcmd == 1) {
1540 #TODO: version 1, remove
1541 unshift @msg, msgtype => "reply", msgid => $id;
1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1544} 1570}
1545 1571
1546=item $player->ext_msg ($type, @msg) 1572=item $player->ext_msg ($type, @msg)
1547 1573
1548Sends an ext event to the client. 1574Sends an ext event to the client.
… …
1776 1802
1777sub load_header_from($) { 1803sub load_header_from($) {
1778 my ($self, $path) = @_; 1804 my ($self, $path) = @_;
1779 1805
1780 utf8::encode $path; 1806 utf8::encode $path;
1781 #aio_open $path, O_RDONLY, 0 1807 my $f = new_from_file cf::object::thawer $path
1782 # or return;
1783
1784 $self->_load_header ($path)
1785 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;
1786 1815
1787 $self->{load_path} = $path; 1816 $self->{load_path} = $path;
1788 1817
1789 1 1818 1
1790} 1819}
… …
1844sub find { 1873sub find {
1845 my ($path, $origin) = @_; 1874 my ($path, $origin) = @_;
1846 1875
1847 $path = normalise $path, $origin && $origin->path; 1876 $path = normalise $path, $origin && $origin->path;
1848 1877
1878 cf::lock_wait "map_data:$path";#d#remove
1849 cf::lock_wait "map_find:$path"; 1879 cf::lock_wait "map_find:$path";
1850 1880
1851 $cf::MAP{$path} || do { 1881 $cf::MAP{$path} || do {
1852 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
1853 my $map = new_from_path cf::map $path 1885 my $map = new_from_path cf::map $path
1854 or return; 1886 or return;
1855 1887
1856 $map->{last_save} = $cf::RUNTIME; 1888 $map->{last_save} = $cf::RUNTIME;
1857 1889
… …
1859 or return; 1891 or return;
1860 1892
1861 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1893 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862 # doing this can freeze the server in a sync job, obviously 1894 # doing this can freeze the server in a sync job, obviously
1863 #$cf::WAIT_FOR_TICK->wait; 1895 #$cf::WAIT_FOR_TICK->wait;
1896 undef $guard1;
1897 undef $guard2;
1864 $map->reset; 1898 $map->reset;
1865 undef $guard;
1866 return find $path; 1899 return find $path;
1867 } 1900 }
1868 1901
1869 $cf::MAP{$path} = $map 1902 $cf::MAP{$path} = $map
1870 } 1903 }
… …
1879 local $self->{deny_reset} = 1; # loading can take a long time 1912 local $self->{deny_reset} = 1; # loading can take a long time
1880 1913
1881 my $path = $self->{path}; 1914 my $path = $self->{path};
1882 1915
1883 { 1916 {
1884 my $guard = cf::lock_acquire "map_load:$path"; 1917 my $guard = cf::lock_acquire "map_data:$path";
1885 1918
1919 return unless $self->valid;
1886 return if $self->in_memory != cf::MAP_SWAPPED; 1920 return unless $self->in_memory == cf::MAP_SWAPPED;
1887 1921
1888 $self->in_memory (cf::MAP_LOADING); 1922 $self->in_memory (cf::MAP_LOADING);
1889 1923
1890 $self->alloc; 1924 $self->alloc;
1891 1925
1892 $self->pre_load; 1926 $self->pre_load;
1893 Coro::cede; 1927 cf::cede_to_tick;
1894 1928
1929 my $f = new_from_file cf::object::thawer $self->{load_path};
1930 $f->skip_block;
1895 $self->_load_objects ($self->{load_path}, 1) 1931 $self->_load_objects ($f)
1896 or return; 1932 or return;
1897 1933
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1934 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1899 if delete $self->{load_original}; 1935 if delete $self->{load_original};
1900 1936
1901 if (my $uniq = $self->uniq_path) { 1937 if (my $uniq = $self->uniq_path) {
1902 utf8::encode $uniq; 1938 utf8::encode $uniq;
1903 if (aio_open $uniq, O_RDONLY, 0) { 1939 unless (aio_stat $uniq) {
1940 if (my $f = new_from_file cf::object::thawer $uniq) {
1904 $self->clear_unique_items; 1941 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 1942 $self->_load_objects ($f);
1943 $f->resolve_delayed_derefs;
1944 }
1906 } 1945 }
1907 } 1946 }
1908 1947
1909 Coro::cede; 1948 $f->resolve_delayed_derefs;
1949
1950 cf::cede_to_tick;
1910 # now do the right thing for maps 1951 # now do the right thing for maps
1911 $self->link_multipart_objects; 1952 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 1953 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 1954 unless $self->difficulty;
1914 Coro::cede; 1955 cf::cede_to_tick;
1915 1956
1916 unless ($self->{deny_activate}) { 1957 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 1958 $self->decay_objects;
1918 $self->fix_auto_apply; 1959 $self->fix_auto_apply;
1919 $self->update_buttons; 1960 $self->update_buttons;
1920 Coro::cede; 1961 cf::cede_to_tick;
1921 $self->set_darkness_map; 1962 $self->set_darkness_map;
1922 Coro::cede; 1963 cf::cede_to_tick;
1923 $self->activate; 1964 $self->activate;
1924 } 1965 }
1925 1966
1926 $self->{last_save} = $cf::RUNTIME; 1967 $self->{last_save} = $cf::RUNTIME;
1927 $self->last_access ($cf::RUNTIME); 1968 $self->last_access ($cf::RUNTIME);
… …
1943 1984
1944 $self 1985 $self
1945} 1986}
1946 1987
1947# 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
1948sub load_diag { 1989sub load_neighbours {
1949 my ($map) = @_; 1990 my ($map) = @_;
1950 1991
1951 my @diag; # diagonal neighbours 1992 my @neigh; # diagonal neighbours
1952 1993
1953 for (0 .. 3) { 1994 for (0 .. 3) {
1954 my $neigh = $map->tile_path ($_) 1995 my $neigh = $map->tile_path ($_)
1955 or next; 1996 or next;
1956 $neigh = find $neigh, $map 1997 $neigh = find $neigh, $map
1957 or next; 1998 or next;
1958 $neigh->load; 1999 $neigh->load;
1959 2000
2001 push @neigh,
1960 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2002 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1961 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2003 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1962 } 2004 }
1963 2005
1964 for (@diag) { 2006 for (grep defined $_->[0], @neigh) {
2007 my ($path, $origin) = @$_;
1965 my $neigh = find @$_ 2008 my $neigh = find $path, $origin
1966 or next; 2009 or next;
1967 $neigh->load; 2010 $neigh->load;
1968 } 2011 }
1969} 2012}
1970 2013
… …
1975} 2018}
1976 2019
1977sub do_load_sync { 2020sub do_load_sync {
1978 my ($map) = @_; 2021 my ($map) = @_;
1979 2022
2023 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2024 if $Coro::current == $Coro::main;
2025
1980 cf::sync_job { $map->load }; 2026 cf::sync_job { $map->load };
1981} 2027}
1982 2028
1983our %MAP_PREFETCH; 2029our %MAP_PREFETCH;
1984our $MAP_PREFETCHER = undef; 2030our $MAP_PREFETCHER = undef;
1985 2031
1986sub find_async { 2032sub find_async {
1987 my ($path, $origin) = @_; 2033 my ($path, $origin, $load) = @_;
1988 2034
1989 $path = normalise $path, $origin && $origin->{path}; 2035 $path = normalise $path, $origin && $origin->{path};
1990 2036
1991 if (my $map = $cf::MAP{$path}) { 2037 if (my $map = $cf::MAP{$path}) {
1992 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2038 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1993 } 2039 }
1994 2040
1995 undef $MAP_PREFETCH{$path}; 2041 $MAP_PREFETCH{$path} |= $load;
2042
1996 $MAP_PREFETCHER ||= cf::async { 2043 $MAP_PREFETCHER ||= cf::async {
2044 $Coro::current->{desc} = "map prefetcher";
2045
1997 while (%MAP_PREFETCH) { 2046 while (%MAP_PREFETCH) {
1998 for my $path (keys %MAP_PREFETCH) { 2047 while (my ($k, $v) = each %MAP_PREFETCH) {
1999 if (my $map = find $path) { 2048 if (my $map = find $k) {
2000 $map->load; 2049 $map->load if $v;
2001 } 2050 }
2002 2051
2003 delete $MAP_PREFETCH{$path}; 2052 delete $MAP_PREFETCH{$k};
2004 } 2053 }
2005 } 2054 }
2006 undef $MAP_PREFETCHER; 2055 undef $MAP_PREFETCHER;
2007 }; 2056 };
2008 $MAP_PREFETCHER->prio (6); 2057 $MAP_PREFETCHER->prio (6);
… …
2011} 2060}
2012 2061
2013sub save { 2062sub save {
2014 my ($self) = @_; 2063 my ($self) = @_;
2015 2064
2016 my $lock = cf::lock_acquire "map_data:" . $self->path; 2065 my $lock = cf::lock_acquire "map_data:$self->{path}";
2017 2066
2018 $self->{last_save} = $cf::RUNTIME; 2067 $self->{last_save} = $cf::RUNTIME;
2019 2068
2020 return unless $self->dirty; 2069 return unless $self->dirty;
2021 2070
… …
2027 return if $self->{deny_save}; 2076 return if $self->{deny_save};
2028 2077
2029 local $self->{last_access} = $self->last_access;#d# 2078 local $self->{last_access} = $self->last_access;#d#
2030 2079
2031 cf::async { 2080 cf::async {
2081 $Coro::current->{desc} = "map player save";
2032 $_->contr->save for $self->players; 2082 $_->contr->save for $self->players;
2033 }; 2083 };
2034 2084
2035 if ($uniq) { 2085 if ($uniq) {
2036 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2044 my ($self) = @_; 2094 my ($self) = @_;
2045 2095
2046 # save first because save cedes 2096 # save first because save cedes
2047 $self->save; 2097 $self->save;
2048 2098
2049 my $lock = cf::lock_acquire "map_data:" . $self->path; 2099 my $lock = cf::lock_acquire "map_data:$self->{path}";
2050 2100
2051 return if $self->players; 2101 return if $self->players;
2052 return if $self->in_memory != cf::MAP_IN_MEMORY; 2102 return if $self->in_memory != cf::MAP_IN_MEMORY;
2053 return if $self->{deny_save}; 2103 return if $self->{deny_save};
2054 2104
2105 $self->in_memory (cf::MAP_SWAPPED);
2106
2107 $self->deactivate;
2108 $_->clear_links_to ($self) for values %cf::MAP;
2055 $self->clear; 2109 $self->clear;
2056 $self->in_memory (cf::MAP_SWAPPED);
2057} 2110}
2058 2111
2059sub reset_at { 2112sub reset_at {
2060 my ($self) = @_; 2113 my ($self) = @_;
2061 2114
… …
2093 if $uniq; 2146 if $uniq;
2094 } 2147 }
2095 2148
2096 delete $cf::MAP{$self->path}; 2149 delete $cf::MAP{$self->path};
2097 2150
2151 $self->deactivate;
2152 $_->clear_links_to ($self) for values %cf::MAP;
2098 $self->clear; 2153 $self->clear;
2099
2100 $_->clear_links_to ($self) for values %cf::MAP;
2101 2154
2102 $self->unlink_save; 2155 $self->unlink_save;
2103 $self->destroy; 2156 $self->destroy;
2104} 2157}
2105 2158
2106my $nuke_counter = "aaaa"; 2159my $nuke_counter = "aaaa";
2107 2160
2108sub nuke { 2161sub nuke {
2109 my ($self) = @_; 2162 my ($self) = @_;
2110 2163
2164 {
2165 my $lock = cf::lock_acquire "map_data:$self->{path}";
2166
2111 delete $cf::MAP{$self->path}; 2167 delete $cf::MAP{$self->path};
2112 2168
2113 $self->unlink_save; 2169 $self->unlink_save;
2114 2170
2115 bless $self, "cf::map"; 2171 bless $self, "cf::map";
2116 delete $self->{deny_reset}; 2172 delete $self->{deny_reset};
2117 $self->{deny_save} = 1; 2173 $self->{deny_save} = 1;
2118 $self->reset_timeout (1); 2174 $self->reset_timeout (1);
2119 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2175 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2120 2176
2121 $cf::MAP{$self->path} = $self; 2177 $cf::MAP{$self->path} = $self;
2178 }
2122 2179
2123 $self->reset; # polite request, might not happen 2180 $self->reset; # polite request, might not happen
2124} 2181}
2125 2182
2126=item $maps = cf::map::tmp_maps 2183=item $maps = cf::map::tmp_maps
… …
2202 2259
2203sub inv_recursive { 2260sub inv_recursive {
2204 inv_recursive_ inv $_[0] 2261 inv_recursive_ inv $_[0]
2205} 2262}
2206 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
2207package cf; 2292package cf;
2208 2293
2209=back 2294=back
2210 2295
2211=head3 cf::object::player 2296=head3 cf::object::player
… …
2243 $self->message ($msg, $flags); 2328 $self->message ($msg, $flags);
2244 } 2329 }
2245 } 2330 }
2246} 2331}
2247 2332
2333=item $object->send_msg ($channel, $msg, $color, [extra...])
2334
2335=cut
2336
2337sub cf::object::send_msg {
2338 my $pl = shift->contr
2339 or return;
2340 $pl->send_msg (@_);
2341}
2342
2248=item $player_object->may ("access") 2343=item $player_object->may ("access")
2249 2344
2250Returns wether the given player is authorized to access resource "access" 2345Returns wether the given player is authorized to access resource "access"
2251(e.g. "command_wizcast"). 2346(e.g. "command_wizcast").
2252 2347
… …
2329 # use -1 or undef as default coordinates, not 0, 0 2424 # use -1 or undef as default coordinates, not 0, 0
2330 ($x, $y) = ($map->enter_x, $map->enter_y) 2425 ($x, $y) = ($map->enter_x, $map->enter_y)
2331 if $x <=0 && $y <= 0; 2426 if $x <=0 && $y <= 0;
2332 2427
2333 $map->load; 2428 $map->load;
2334 $map->load_diag; 2429 $map->load_neighbours;
2335 2430
2336 return unless $self->contr->active; 2431 return unless $self->contr->active;
2337 $self->activate_recursive; 2432 $self->activate_recursive;
2338 2433
2339 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2434 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2359 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2454 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2360 2455
2361 $self->enter_link; 2456 $self->enter_link;
2362 2457
2363 (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
2364 my $map = eval { 2480 my $map = eval {
2365 my $map = cf::map::find $path; 2481 my $map = defined $path ? cf::map::find $path : undef;
2366 2482
2367 if ($map) { 2483 if ($map) {
2368 $map = $map->customise_for ($self); 2484 $map = $map->customise_for ($self);
2369 $map = $check->($map) if $check && $map; 2485 $map = $check->($map) if $check && $map;
2370 } else { 2486 } else {
2371 $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);
2372 } 2488 }
2373 2489
2374 $map 2490 $map
2375 }; 2491 };
2376 2492
… …
2466 # if exit is damned, update players death & WoR home-position 2582 # if exit is damned, update players death & WoR home-position
2467 $self->contr->savebed ($slaying, $hp, $sp) 2583 $self->contr->savebed ($slaying, $hp, $sp)
2468 if $exit->flag (FLAG_DAMNED); 2584 if $exit->flag (FLAG_DAMNED);
2469 2585
2470 (async { 2586 (async {
2587 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2588
2471 $self->deactivate_recursive; # just to be sure 2589 $self->deactivate_recursive; # just to be sure
2472 unless (eval { 2590 unless (eval {
2473 $self->goto ($slaying, $hp, $sp); 2591 $self->goto ($slaying, $hp, $sp);
2474 2592
2475 1; 2593 1;
… …
2510the 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
2511the message unless the client supports the msg packet. 2629the message unless the client supports the msg packet.
2512 2630
2513=cut 2631=cut
2514 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
2515sub cf::client::send_msg { 2654sub cf::client::send_msg {
2516 my ($self, $channel, $msg, $color, @extra) = @_; 2655 my ($self, $channel, $msg, $color, @extra) = @_;
2517 2656
2518 $msg = $self->pl->expand_cfpod ($msg); 2657 $msg = $self->pl->expand_cfpod ($msg);
2519 2658
2520 $color &= cf::NDI_CLIENT_MASK; # just in case... 2659 $color &= cf::NDI_CLIENT_MASK; # just in case...
2521 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
2522 if (ref $channel) { 2670 } elsif (ref $channel) {
2523 # send meta info to client, if not yet sent 2671 # send meta info to client, if not yet sent
2524 unless (exists $self->{channel}{$channel->{id}}) { 2672 unless (exists $self->{channel}{$channel->{id}}) {
2525 $self->{channel}{$channel->{id}} = $channel; 2673 $self->{channel}{$channel->{id}} = $channel;
2526 $self->ext_msg (channel_info => $channel); 2674 $self->ext_msg (channel_info => $channel)
2675 if $self->can_msg;
2527 } 2676 }
2528 2677
2529 $channel = $channel->{id}; 2678 $channel = $channel->{id};
2530 } 2679 }
2531 2680
… …
2553 $color &= cf::NDI_COLOR_MASK; 2702 $color &= cf::NDI_COLOR_MASK;
2554 2703
2555 utf8::encode $msg; 2704 utf8::encode $msg;
2556 2705
2557 if (0 && $msg =~ /\[/) { 2706 if (0 && $msg =~ /\[/) {
2707 # COMMAND/INFO
2558 $self->send_packet ("drawextinfo $color 4 0 $msg") 2708 $self->send_packet ("drawextinfo $color 10 8 $msg")
2559 } else { 2709 } else {
2560 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2710 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2561 $self->send_packet ("drawinfo $color $msg") 2711 $self->send_packet ("drawinfo $color $msg")
2562 } 2712 }
2563 } 2713 }
… …
2571=cut 2721=cut
2572 2722
2573sub cf::client::ext_msg($$@) { 2723sub cf::client::ext_msg($$@) {
2574 my ($self, $type, @msg) = @_; 2724 my ($self, $type, @msg) = @_;
2575 2725
2576 my $extcmd = $self->extcmd;
2577
2578 if ($extcmd == 2) { 2726 if ($self->extcmd == 2) {
2579 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2727 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2580 } elsif ($extcmd == 1) { # TODO: remove 2728 } elsif ($self->extcmd == 1) { # TODO: remove
2581 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;
2582 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2748 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2583 } 2749 }
2584} 2750}
2585 2751
2586=item $success = $client->query ($flags, "text", \&cb) 2752=item $success = $client->query ($flags, "text", \&cb)
… …
2648 my ($type, $reply, @payload) = 2814 my ($type, $reply, @payload) =
2649 "ARRAY" eq ref $msg 2815 "ARRAY" eq ref $msg
2650 ? @$msg 2816 ? @$msg
2651 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2817 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2652 2818
2819 my @reply;
2820
2653 if (my $cb = $EXTICMD{$type}) { 2821 if (my $cb = $EXTICMD{$type}) {
2654 my @reply = $cb->($ns, @payload); 2822 @reply = $cb->($ns, @payload);
2655
2656 $ns->ext_reply ($reply, @reply)
2657 if $reply;
2658 } 2823 }
2824
2825 $ns->ext_reply ($reply, @reply)
2826 if $reply;
2827
2659 } else { 2828 } else {
2660 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";
2661 } 2830 }
2662 2831
2663 cf::override; 2832 cf::override;
… …
2724 2893
2725The following functions and methods are available within a safe environment: 2894The following functions and methods are available within a safe environment:
2726 2895
2727 cf::object 2896 cf::object
2728 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
2729 insert remove 2898 insert remove name archname title slaying race decrease_ob_nr
2730 2899
2731 cf::object::player 2900 cf::object::player
2732 player 2901 player
2733 2902
2734 cf::player 2903 cf::player
… …
2739 2908
2740=cut 2909=cut
2741 2910
2742for ( 2911for (
2743 ["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
2744 insert remove inv)], 2913 insert remove inv name archname title slaying race
2914 decrease_ob_nr)],
2745 ["cf::object::player" => qw(player)], 2915 ["cf::object::player" => qw(player)],
2746 ["cf::player" => qw(peaceful)], 2916 ["cf::player" => qw(peaceful)],
2747 ["cf::map" => qw(trigger)], 2917 ["cf::map" => qw(trigger)],
2748) { 2918) {
2749 no strict 'refs'; 2919 no strict 'refs';
… …
2825# the server's init and main functions 2995# the server's init and main functions
2826 2996
2827sub load_facedata($) { 2997sub load_facedata($) {
2828 my ($path) = @_; 2998 my ($path) = @_;
2829 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
2830 warn "loading facedata from $path\n"; 3006 warn "loading facedata from $path\n";
2831 3007
2832 my $facedata; 3008 my $facedata;
2833 0 < aio_load $path, $facedata 3009 0 < aio_load $path, $facedata
2834 or die "$path: $!"; 3010 or die "$path: $!";
2835 3011
2836 $facedata = Coro::Storable::thaw $facedata; 3012 $facedata = Coro::Storable::thaw $facedata;
2837 3013
2838 $facedata->{version} == 2 3014 $facedata->{version} == 2
2839 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;
2840 3023
2841 { 3024 {
2842 my $faces = $facedata->{faceinfo}; 3025 my $faces = $facedata->{faceinfo};
2843 3026
2844 while (my ($face, $info) = each %$faces) { 3027 while (my ($face, $info) = each %$faces) {
2845 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3028 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2846 cf::face::set_visibility $idx, $info->{visibility}; 3029 cf::face::set_visibility $idx, $info->{visibility};
2847 cf::face::set_magicmap $idx, $info->{magicmap}; 3030 cf::face::set_magicmap $idx, $info->{magicmap};
2848 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3031 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2849 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3032 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2850 3033
2851 cf::cede_to_tick; 3034 cf::cede_to_tick;
2852 } 3035 }
2853 3036
2854 while (my ($face, $info) = each %$faces) { 3037 while (my ($face, $info) = each %$faces) {
… …
2879 3062
2880 { 3063 {
2881 # TODO: for gcfclient pleasure, we should give resources 3064 # TODO: for gcfclient pleasure, we should give resources
2882 # that gcfclient doesn't grok a >10000 face index. 3065 # that gcfclient doesn't grok a >10000 face index.
2883 my $res = $facedata->{resource}; 3066 my $res = $facedata->{resource};
2884 my $enc = JSON::XS->new->utf8->canonical;
2885 3067
2886 my $soundconf = delete $res->{"res/sound.conf"}; 3068 my $soundconf = delete $res->{"res/sound.conf"};
2887 3069
2888 while (my ($name, $info) = each %$res) { 3070 while (my ($name, $info) = each %$res) {
2889 my $meta = $enc->encode ({
2890 name => $name,
2891 %{ $info->{meta} || {} },
2892 });
2893
2894 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3071 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3072 my $data;
2895 3073
2896 if ($info->{type} & 1) { 3074 if ($info->{type} & 1) {
2897 # prepend meta info 3075 # prepend meta info
2898 3076
3077 my $meta = $enc->encode ({
3078 name => $name,
3079 %{ $info->{meta} || {} },
3080 });
3081
2899 my $data = pack "(w/a*)*", $meta, $info->{data}; 3082 $data = pack "(w/a*)*", $meta, $info->{data};
2900 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2901
2902 cf::face::set_data $idx, 0, $data, $chk;
2903 } else { 3083 } else {
2904 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3084 $data = $info->{data};
2905 } 3085 }
2906 3086
3087 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2907 cf::face::set_type $idx, $info->{type}; 3088 cf::face::set_type $idx, $info->{type};
2908 3089
2909 cf::cede_to_tick; 3090 cf::cede_to_tick;
2910 } 3091 }
2911 3092
… …
2938 $ns->fx_want ($k, $v); 3119 $ns->fx_want ($k, $v);
2939 } 3120 }
2940}; 3121};
2941 3122
2942sub 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
2943 load_resource_file "$MAPDIR/regions" 3128 load_resource_file "$MAPDIR/regions"
2944 or die "unable to load regions file\n"; 3129 or die "unable to load regions file\n";
2945 3130
2946 for (cf::region::list) { 3131 for (cf::region::list) {
2947 $_->{match} = qr/$_->{match}/ 3132 $_->{match} = qr/$_->{match}/
… …
2983 3168
2984sub init { 3169sub init {
2985 reload_resources; 3170 reload_resources;
2986} 3171}
2987 3172
2988sub cfg_load { 3173sub reload_config {
2989 open my $fh, "<:utf8", "$CONFDIR/config" 3174 open my $fh, "<:utf8", "$CONFDIR/config"
2990 or return; 3175 or return;
2991 3176
2992 local $/; 3177 local $/;
2993 *CFG = YAML::Syck::Load <$fh>; 3178 *CFG = YAML::Syck::Load <$fh>;
… …
3009sub main { 3194sub main {
3010 # we must not ever block the main coroutine 3195 # we must not ever block the main coroutine
3011 local $Coro::idle = sub { 3196 local $Coro::idle = sub {
3012 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#
3013 (async { 3198 (async {
3199 $Coro::current->{desc} = "IDLE BUG HANDLER";
3014 Event::one_event; 3200 Event::one_event;
3015 })->prio (Coro::PRIO_MAX); 3201 })->prio (Coro::PRIO_MAX);
3016 }; 3202 };
3017 3203
3018 cfg_load; 3204 reload_config;
3019 db_init; 3205 db_init;
3020 load_extensions; 3206 load_extensions;
3021 3207
3022 $TICK_WATCHER->start; 3208 $TICK_WATCHER->start;
3023 Event::loop; 3209 Event::loop;
… …
3216 warn "reloading cf.pm"; 3402 warn "reloading cf.pm";
3217 require cf; 3403 require cf;
3218 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3404 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3219 3405
3220 warn "loading config and database again"; 3406 warn "loading config and database again";
3221 cf::cfg_load; 3407 cf::reload_config;
3222 3408
3223 warn "loading extensions"; 3409 warn "loading extensions";
3224 cf::load_extensions; 3410 cf::load_extensions;
3225 3411
3226 warn "reattaching attachments to objects/players"; 3412 warn "reattaching attachments to objects/players";
… …
3262register_command "reload" => sub { 3448register_command "reload" => sub {
3263 my ($who, $arg) = @_; 3449 my ($who, $arg) = @_;
3264 3450
3265 if ($who->flag (FLAG_WIZ)) { 3451 if ($who->flag (FLAG_WIZ)) {
3266 $who->message ("reloading server."); 3452 $who->message ("reloading server.");
3453 async {
3454 $Coro::current->{desc} = "perl_reload";
3267 async { reload_perl }; 3455 reload_perl;
3456 };
3268 } 3457 }
3269}; 3458};
3270 3459
3271unshift @INC, $LIBDIR; 3460unshift @INC, $LIBDIR;
3272 3461
… …
3291 my $signal = new Coro::Signal; 3480 my $signal = new Coro::Signal;
3292 push @WAIT_FOR_TICK_BEGIN, $signal; 3481 push @WAIT_FOR_TICK_BEGIN, $signal;
3293 $signal->wait; 3482 $signal->wait;
3294} 3483}
3295 3484
3296 my $min = 1e6;#d#
3297 my $avg = 10;
3298$TICK_WATCHER = Event->timer ( 3485$TICK_WATCHER = Event->timer (
3299 reentrant => 0, 3486 reentrant => 0,
3300 parked => 1, 3487 parked => 1,
3301 prio => 0, 3488 prio => 0,
3302 at => $NEXT_TICK || $TICK, 3489 at => $NEXT_TICK || $TICK,
… …
3310 3497
3311 $NOW = $tick_start = Event::time; 3498 $NOW = $tick_start = Event::time;
3312 3499
3313 cf::server_tick; # one server iteration 3500 cf::server_tick; # one server iteration
3314 3501
3315 0 && sync_job {#d#
3316 for(1..10) {
3317 my $t = Event::time;
3318 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3319 or die;
3320
3321 $map->width (50);
3322 $map->height (50);
3323 $map->alloc;
3324 $map->_load_objects ("/tmp/x.map", 1);
3325 my $t = Event::time - $t;
3326
3327 #next unless $t < 0.0013;#d#
3328 if ($t < $min) {
3329 $min = $t;
3330 }
3331 $avg = $avg * 0.99 + $t * 0.01;
3332 }
3333 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3334 exit 0;
3335 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3336 };
3337
3338 $RUNTIME += $TICK; 3502 $RUNTIME += $TICK;
3339 $NEXT_TICK += $TICK; 3503 $NEXT_TICK += $TICK;
3340 3504
3341 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3505 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3342 $NEXT_RUNTIME_WRITE = $NOW + 10; 3506 $NEXT_RUNTIME_WRITE = $NOW + 10;
3343 Coro::async_pool { 3507 Coro::async_pool {
3508 $Coro::current->{desc} = "runtime saver";
3344 write_runtime 3509 write_runtime
3345 or warn "ERROR: unable to write runtime file: $!"; 3510 or warn "ERROR: unable to write runtime file: $!";
3346 }; 3511 };
3347 } 3512 }
3348 3513
3349# my $AFTER = Event::time;
3350# warn $AFTER - $NOW;#d#
3351
3352 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3514 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3353 $sig->send; 3515 $sig->send;
3354 } 3516 }
3355 while (my $sig = shift @WAIT_FOR_TICK) { 3517 while (my $sig = shift @WAIT_FOR_TICK) {
3356 $sig->send; 3518 $sig->send;
… …
3366 3528
3367 $LOAD = ($NOW - $tick_start) / $TICK; 3529 $LOAD = ($NOW - $tick_start) / $TICK;
3368 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3530 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3369 3531
3370 _post_tick; 3532 _post_tick;
3371
3372
3373 }, 3533 },
3374); 3534);
3375 3535
3376{ 3536{
3537 BDB::min_parallel 8;
3377 BDB::max_poll_time $TICK * 0.1; 3538 BDB::max_poll_time $TICK * 0.1;
3378 $BDB_POLL_WATCHER = Event->io ( 3539 $BDB_POLL_WATCHER = Event->io (
3379 reentrant => 0, 3540 reentrant => 0,
3380 fd => BDB::poll_fileno, 3541 fd => BDB::poll_fileno,
3381 poll => 'r', 3542 poll => 'r',
3382 prio => 0, 3543 prio => 0,
3383 data => WF_AUTOCANCEL, 3544 data => WF_AUTOCANCEL,
3384 cb => \&BDB::poll_cb, 3545 cb => \&BDB::poll_cb,
3385 ); 3546 );
3386 BDB::min_parallel 8;
3387 3547
3388 BDB::set_sync_prepare { 3548 BDB::set_sync_prepare {
3389 my $status; 3549 my $status;
3390 my $current = $Coro::current; 3550 my $current = $Coro::current;
3391 ( 3551 (
… …
3400 ) 3560 )
3401 }; 3561 };
3402 3562
3403 unless ($DB_ENV) { 3563 unless ($DB_ENV) {
3404 $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);
3405 3569
3406 cf::sync_job { 3570 cf::sync_job {
3407 eval { 3571 eval {
3408 BDB::db_env_open 3572 BDB::db_env_open
3409 $DB_ENV, 3573 $DB_ENV,
… …
3411 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
3412 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3576 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3413 0666; 3577 0666;
3414 3578
3415 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3579 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3416
3417 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3418 $DB_ENV->set_lk_detect;
3419 }; 3580 };
3420 3581
3421 cf::cleanup "db_env_open(db): $@" if $@; 3582 cf::cleanup "db_env_open(db): $@" if $@;
3422 }; 3583 };
3423 } 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 );
3424} 3616}
3425 3617
3426{ 3618{
3427 IO::AIO::min_parallel 8; 3619 IO::AIO::min_parallel 8;
3428 3620
… …
3431 $AIO_POLL_WATCHER = Event->io ( 3623 $AIO_POLL_WATCHER = Event->io (
3432 reentrant => 0, 3624 reentrant => 0,
3433 data => WF_AUTOCANCEL, 3625 data => WF_AUTOCANCEL,
3434 fd => IO::AIO::poll_fileno, 3626 fd => IO::AIO::poll_fileno,
3435 poll => 'r', 3627 poll => 'r',
3436 prio => 6, 3628 prio => 0,
3437 cb => \&IO::AIO::poll_cb, 3629 cb => \&IO::AIO::poll_cb,
3438 ); 3630 );
3439} 3631}
3440 3632
3441my $_log_backtrace; 3633my $_log_backtrace;
… …
3447 3639
3448 # limit the # of concurrent backtraces 3640 # limit the # of concurrent backtraces
3449 if ($_log_backtrace < 2) { 3641 if ($_log_backtrace < 2) {
3450 ++$_log_backtrace; 3642 ++$_log_backtrace;
3451 async { 3643 async {
3644 $Coro::current->{desc} = "abt $msg";
3645
3452 my @bt = fork_call { 3646 my @bt = fork_call {
3453 @addr = map { sprintf "%x", $_ } @addr; 3647 @addr = map { sprintf "%x", $_ } @addr;
3454 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3648 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3455 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 |"
3456 or die "addr2line: $!"; 3650 or die "addr2line: $!";

Diff Legend

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