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.321 by root, Thu Jul 26 21:44:43 2007 UTC vs.
Revision 1.374 by root, Wed Sep 19 22:07:16 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 }
1966
1967 $self->{last_save} = $cf::RUNTIME;
1968 $self->last_access ($cf::RUNTIME);
1925 1969
1926 $self->in_memory (cf::MAP_IN_MEMORY); 1970 $self->in_memory (cf::MAP_IN_MEMORY);
1927 } 1971 }
1928 1972
1929 $self->post_load; 1973 $self->post_load;
… …
1940 1984
1941 $self 1985 $self
1942} 1986}
1943 1987
1944# 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
1945sub load_diag { 1989sub load_neighbours {
1946 my ($map) = @_; 1990 my ($map) = @_;
1947 1991
1948 my @diag; # diagonal neighbours 1992 my @neigh; # diagonal neighbours
1949 1993
1950 for (0 .. 3) { 1994 for (0 .. 3) {
1951 my $neigh = $map->tile_path ($_) 1995 my $neigh = $map->tile_path ($_)
1952 or next; 1996 or next;
1953 $neigh = find $neigh, $map 1997 $neigh = find $neigh, $map
1954 or next; 1998 or next;
1955 $neigh->load; 1999 $neigh->load;
1956 2000
2001 push @neigh,
1957 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2002 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1958 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2003 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1959 } 2004 }
1960 2005
1961 for (@diag) { 2006 for (grep defined $_->[0], @neigh) {
2007 my ($path, $origin) = @$_;
1962 my $neigh = find @$_ 2008 my $neigh = find $path, $origin
1963 or next; 2009 or next;
1964 $neigh->load; 2010 $neigh->load;
1965 } 2011 }
1966} 2012}
1967 2013
… …
1972} 2018}
1973 2019
1974sub do_load_sync { 2020sub do_load_sync {
1975 my ($map) = @_; 2021 my ($map) = @_;
1976 2022
2023 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2024 if $Coro::current == $Coro::main;
2025
1977 cf::sync_job { $map->load }; 2026 cf::sync_job { $map->load };
1978} 2027}
1979 2028
1980our %MAP_PREFETCH; 2029our %MAP_PREFETCH;
1981our $MAP_PREFETCHER = undef; 2030our $MAP_PREFETCHER = undef;
1982 2031
1983sub find_async { 2032sub find_async {
1984 my ($path, $origin) = @_; 2033 my ($path, $origin, $load) = @_;
1985 2034
1986 $path = normalise $path, $origin && $origin->{path}; 2035 $path = normalise $path, $origin && $origin->{path};
1987 2036
1988 if (my $map = $cf::MAP{$path}) { 2037 if (my $map = $cf::MAP{$path}) {
1989 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2038 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1990 } 2039 }
1991 2040
1992 undef $MAP_PREFETCH{$path}; 2041 $MAP_PREFETCH{$path} |= $load;
2042
1993 $MAP_PREFETCHER ||= cf::async { 2043 $MAP_PREFETCHER ||= cf::async {
2044 $Coro::current->{desc} = "map prefetcher";
2045
1994 while (%MAP_PREFETCH) { 2046 while (%MAP_PREFETCH) {
1995 for my $path (keys %MAP_PREFETCH) { 2047 while (my ($k, $v) = each %MAP_PREFETCH) {
1996 if (my $map = find $path) { 2048 if (my $map = find $k) {
1997 $map->load; 2049 $map->load if $v;
1998 } 2050 }
1999 2051
2000 delete $MAP_PREFETCH{$path}; 2052 delete $MAP_PREFETCH{$k};
2001 } 2053 }
2002 } 2054 }
2003 undef $MAP_PREFETCHER; 2055 undef $MAP_PREFETCHER;
2004 }; 2056 };
2005 $MAP_PREFETCHER->prio (6); 2057 $MAP_PREFETCHER->prio (6);
… …
2008} 2060}
2009 2061
2010sub save { 2062sub save {
2011 my ($self) = @_; 2063 my ($self) = @_;
2012 2064
2013 my $lock = cf::lock_acquire "map_data:" . $self->path; 2065 my $lock = cf::lock_acquire "map_data:$self->{path}";
2014 2066
2015 $self->{last_save} = $cf::RUNTIME; 2067 $self->{last_save} = $cf::RUNTIME;
2016 2068
2017 return unless $self->dirty; 2069 return unless $self->dirty;
2018 2070
… …
2024 return if $self->{deny_save}; 2076 return if $self->{deny_save};
2025 2077
2026 local $self->{last_access} = $self->last_access;#d# 2078 local $self->{last_access} = $self->last_access;#d#
2027 2079
2028 cf::async { 2080 cf::async {
2081 $Coro::current->{desc} = "map player save";
2029 $_->contr->save for $self->players; 2082 $_->contr->save for $self->players;
2030 }; 2083 };
2031 2084
2032 if ($uniq) { 2085 if ($uniq) {
2033 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2041 my ($self) = @_; 2094 my ($self) = @_;
2042 2095
2043 # save first because save cedes 2096 # save first because save cedes
2044 $self->save; 2097 $self->save;
2045 2098
2046 my $lock = cf::lock_acquire "map_data:" . $self->path; 2099 my $lock = cf::lock_acquire "map_data:$self->{path}";
2047 2100
2048 return if $self->players; 2101 return if $self->players;
2049 return if $self->in_memory != cf::MAP_IN_MEMORY; 2102 return if $self->in_memory != cf::MAP_IN_MEMORY;
2050 return if $self->{deny_save}; 2103 return if $self->{deny_save};
2051 2104
2105 $self->in_memory (cf::MAP_SWAPPED);
2106
2107 $self->deactivate;
2108 $_->clear_links_to ($self) for values %cf::MAP;
2052 $self->clear; 2109 $self->clear;
2053 $self->in_memory (cf::MAP_SWAPPED);
2054} 2110}
2055 2111
2056sub reset_at { 2112sub reset_at {
2057 my ($self) = @_; 2113 my ($self) = @_;
2058 2114
… …
2090 if $uniq; 2146 if $uniq;
2091 } 2147 }
2092 2148
2093 delete $cf::MAP{$self->path}; 2149 delete $cf::MAP{$self->path};
2094 2150
2151 $self->deactivate;
2152 $_->clear_links_to ($self) for values %cf::MAP;
2095 $self->clear; 2153 $self->clear;
2096
2097 $_->clear_links_to ($self) for values %cf::MAP;
2098 2154
2099 $self->unlink_save; 2155 $self->unlink_save;
2100 $self->destroy; 2156 $self->destroy;
2101} 2157}
2102 2158
2103my $nuke_counter = "aaaa"; 2159my $nuke_counter = "aaaa";
2104 2160
2105sub nuke { 2161sub nuke {
2106 my ($self) = @_; 2162 my ($self) = @_;
2107 2163
2164 {
2165 my $lock = cf::lock_acquire "map_data:$self->{path}";
2166
2108 delete $cf::MAP{$self->path}; 2167 delete $cf::MAP{$self->path};
2109 2168
2110 $self->unlink_save; 2169 $self->unlink_save;
2111 2170
2112 bless $self, "cf::map"; 2171 bless $self, "cf::map";
2113 delete $self->{deny_reset}; 2172 delete $self->{deny_reset};
2114 $self->{deny_save} = 1; 2173 $self->{deny_save} = 1;
2115 $self->reset_timeout (1); 2174 $self->reset_timeout (1);
2116 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2175 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2117 2176
2118 $cf::MAP{$self->path} = $self; 2177 $cf::MAP{$self->path} = $self;
2178 }
2119 2179
2120 $self->reset; # polite request, might not happen 2180 $self->reset; # polite request, might not happen
2121} 2181}
2122 2182
2123=item $maps = cf::map::tmp_maps 2183=item $maps = cf::map::tmp_maps
… …
2199 2259
2200sub inv_recursive { 2260sub inv_recursive {
2201 inv_recursive_ inv $_[0] 2261 inv_recursive_ inv $_[0]
2202} 2262}
2203 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 # temporary compatibility#TODO#remove
2279 $ref =~ s{^<}{player/<};
2280
2281 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2282 my ($uuid, $name) = ($1, $2);
2283 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2284 or return;
2285 $pl->ob->uuid eq $uuid
2286 or return;
2287
2288 $pl->ob
2289 } else {
2290 warn "$ref: cannot resolve object reference\n";
2291 undef
2292 }
2293}
2294
2204package cf; 2295package cf;
2205 2296
2206=back 2297=back
2207 2298
2208=head3 cf::object::player 2299=head3 cf::object::player
… …
2240 $self->message ($msg, $flags); 2331 $self->message ($msg, $flags);
2241 } 2332 }
2242 } 2333 }
2243} 2334}
2244 2335
2336=item $object->send_msg ($channel, $msg, $color, [extra...])
2337
2338=cut
2339
2340sub cf::object::send_msg {
2341 my $pl = shift->contr
2342 or return;
2343 $pl->send_msg (@_);
2344}
2345
2245=item $player_object->may ("access") 2346=item $player_object->may ("access")
2246 2347
2247Returns wether the given player is authorized to access resource "access" 2348Returns wether the given player is authorized to access resource "access"
2248(e.g. "command_wizcast"). 2349(e.g. "command_wizcast").
2249 2350
… …
2326 # use -1 or undef as default coordinates, not 0, 0 2427 # use -1 or undef as default coordinates, not 0, 0
2327 ($x, $y) = ($map->enter_x, $map->enter_y) 2428 ($x, $y) = ($map->enter_x, $map->enter_y)
2328 if $x <=0 && $y <= 0; 2429 if $x <=0 && $y <= 0;
2329 2430
2330 $map->load; 2431 $map->load;
2331 $map->load_diag; 2432 $map->load_neighbours;
2332 2433
2333 return unless $self->contr->active; 2434 return unless $self->contr->active;
2334 $self->activate_recursive; 2435 $self->activate_recursive;
2335 2436
2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2437 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2356 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2457 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2357 2458
2358 $self->enter_link; 2459 $self->enter_link;
2359 2460
2360 (async { 2461 (async {
2462 $Coro::current->{desc} = "player::goto $path $x $y";
2463
2464 # *tag paths override both path and x|y
2465 if ($path =~ /^\*(.*)$/) {
2466 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2467 my $ob = $obs[rand @obs];
2468
2469 # see if we actually can go there
2470 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2471 $ob = $obs[rand @obs];
2472 } else {
2473 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2474 }
2475 # else put us there anyways for now #d#
2476
2477 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2478 } else {
2479 ($path, $x, $y) = (undef, undef, undef);
2480 }
2481 }
2482
2361 my $map = eval { 2483 my $map = eval {
2362 my $map = cf::map::find $path; 2484 my $map = defined $path ? cf::map::find $path : undef;
2363 2485
2364 if ($map) { 2486 if ($map) {
2365 $map = $map->customise_for ($self); 2487 $map = $map->customise_for ($self);
2366 $map = $check->($map) if $check && $map; 2488 $map = $check->($map) if $check && $map;
2367 } else { 2489 } else {
2368 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2490 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2369 } 2491 }
2370 2492
2371 $map 2493 $map
2372 }; 2494 };
2373 2495
… …
2463 # if exit is damned, update players death & WoR home-position 2585 # if exit is damned, update players death & WoR home-position
2464 $self->contr->savebed ($slaying, $hp, $sp) 2586 $self->contr->savebed ($slaying, $hp, $sp)
2465 if $exit->flag (FLAG_DAMNED); 2587 if $exit->flag (FLAG_DAMNED);
2466 2588
2467 (async { 2589 (async {
2590 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2591
2468 $self->deactivate_recursive; # just to be sure 2592 $self->deactivate_recursive; # just to be sure
2469 unless (eval { 2593 unless (eval {
2470 $self->goto ($slaying, $hp, $sp); 2594 $self->goto ($slaying, $hp, $sp);
2471 2595
2472 1; 2596 1;
… …
2507the message, with C<log> being the default. If C<$color> is negative, suppress 2631the message, with C<log> being the default. If C<$color> is negative, suppress
2508the message unless the client supports the msg packet. 2632the message unless the client supports the msg packet.
2509 2633
2510=cut 2634=cut
2511 2635
2636our %CHANNEL = (
2637 "c/identify" => {
2638 id => "identify",
2639 title => "Identify",
2640 reply => undef,
2641 tooltip => "Items recently identified",
2642 },
2643 "c/examine" => {
2644 id => "examine",
2645 title => "Examine",
2646 reply => undef,
2647 tooltip => "Signs and other items you examined",
2648 },
2649);
2650
2512sub cf::client::send_msg { 2651sub cf::client::send_msg {
2513 my ($self, $channel, $msg, $color, @extra) = @_; 2652 my ($self, $channel, $msg, $color, @extra) = @_;
2514 2653
2515 $msg = $self->pl->expand_cfpod ($msg); 2654 $msg = $self->pl->expand_cfpod ($msg);
2516 2655
2517 $color &= ~cf::NDI_UNIQUE; # just in case... 2656 $color &= cf::NDI_CLIENT_MASK; # just in case...
2657
2658 # check predefined channels, for the benefit of C
2659 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2518 2660
2519 if (ref $channel) { 2661 if (ref $channel) {
2520 # send meta info to client, if not yet sent 2662 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) { 2663 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel; 2664 $self->{channel}{$channel->{id}} = $channel;
2523 $self->ext_msg (channel_info => $channel); 2665 $self->ext_msg (channel_info => $channel)
2666 if $self->can_msg;
2524 } 2667 }
2525 2668
2526 $channel = $channel->{id}; 2669 $channel = $channel->{id};
2527 } 2670 }
2528 2671
2529 return unless @extra || length $msg; 2672 return unless @extra || length $msg;
2530 2673
2531 if ($self->can_msg) { 2674 if ($self->can_msg) {
2675 # default colour, mask it out
2676 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2677 if $color & cf::NDI_DEF;
2678
2532 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2679 $self->send_packet ("msg " . $self->{json_coder}->encode (
2680 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2533 } else { 2681 } else {
2534 # replace some tags by gcfclient-compatible ones
2535 for ($msg) {
2536 1 while
2537 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2538 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2539 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2540 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2541 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2542 }
2543
2544 if ($color >= 0) { 2682 if ($color >= 0) {
2683 # replace some tags by gcfclient-compatible ones
2684 for ($msg) {
2685 1 while
2686 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2687 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2688 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2689 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2690 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2691 }
2692
2693 $color &= cf::NDI_COLOR_MASK;
2694
2695 utf8::encode $msg;
2696
2545 if (0 && $msg =~ /\[/) { 2697 if (0 && $msg =~ /\[/) {
2698 # COMMAND/INFO
2546 $self->send_packet ("drawextinfo $color 4 0 $msg") 2699 $self->send_packet ("drawextinfo $color 10 8 $msg")
2547 } else { 2700 } else {
2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2701 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2549 $self->send_packet ("drawinfo $color $msg") 2702 $self->send_packet ("drawinfo $color $msg")
2550 } 2703 }
2551 } 2704 }
… …
2559=cut 2712=cut
2560 2713
2561sub cf::client::ext_msg($$@) { 2714sub cf::client::ext_msg($$@) {
2562 my ($self, $type, @msg) = @_; 2715 my ($self, $type, @msg) = @_;
2563 2716
2564 my $extcmd = $self->extcmd;
2565
2566 if ($extcmd == 2) { 2717 if ($self->extcmd == 2) {
2567 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2718 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2568 } elsif ($extcmd == 1) { # TODO: remove 2719 } elsif ($self->extcmd == 1) { # TODO: remove
2569 push @msg, msgtype => "event_$type"; 2720 push @msg, msgtype => "event_$type";
2721 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2722 }
2723}
2724
2725=item $client->ext_reply ($msgid, @msg)
2726
2727Sends an ext reply to the client.
2728
2729=cut
2730
2731sub cf::client::ext_reply($$@) {
2732 my ($self, $id, @msg) = @_;
2733
2734 if ($self->extcmd == 2) {
2735 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2736 } elsif ($self->extcmd == 1) {
2737 #TODO: version 1, remove
2738 unshift @msg, msgtype => "reply", msgid => $id;
2570 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2739 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2571 } 2740 }
2572} 2741}
2573 2742
2574=item $success = $client->query ($flags, "text", \&cb) 2743=item $success = $client->query ($flags, "text", \&cb)
… …
2636 my ($type, $reply, @payload) = 2805 my ($type, $reply, @payload) =
2637 "ARRAY" eq ref $msg 2806 "ARRAY" eq ref $msg
2638 ? @$msg 2807 ? @$msg
2639 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2808 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2640 2809
2810 my @reply;
2811
2641 if (my $cb = $EXTICMD{$type}) { 2812 if (my $cb = $EXTICMD{$type}) {
2642 my @reply = $cb->($ns, @payload); 2813 @reply = $cb->($ns, @payload);
2643
2644 $ns->ext_reply ($reply, @reply)
2645 if $reply;
2646 } 2814 }
2815
2816 $ns->ext_reply ($reply, @reply)
2817 if $reply;
2818
2647 } else { 2819 } else {
2648 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2820 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2649 } 2821 }
2650 2822
2651 cf::override; 2823 cf::override;
… …
2698our $safe = new Safe "safe"; 2870our $safe = new Safe "safe";
2699our $safe_hole = new Safe::Hole; 2871our $safe_hole = new Safe::Hole;
2700 2872
2701$SIG{FPE} = 'IGNORE'; 2873$SIG{FPE} = 'IGNORE';
2702 2874
2703$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2875$safe->permit_only (Opcode::opset qw(
2876 :base_core :base_mem :base_orig :base_math
2877 grepstart grepwhile mapstart mapwhile
2878 sort time
2879));
2704 2880
2705# here we export the classes and methods available to script code 2881# here we export the classes and methods available to script code
2706 2882
2707=pod 2883=pod
2708 2884
2709The following functions and methods are available within a safe environment: 2885The following functions and methods are available within a safe environment:
2710 2886
2711 cf::object 2887 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 2888 contr pay_amount pay_player map x y force_find force_add
2713 insert remove 2889 insert remove name archname title slaying race decrease_ob_nr
2714 2890
2715 cf::object::player 2891 cf::object::player
2716 player 2892 player
2717 2893
2718 cf::player 2894 cf::player
… …
2723 2899
2724=cut 2900=cut
2725 2901
2726for ( 2902for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2903 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2904 insert remove inv name archname title slaying race
2728 insert remove)], 2905 decrease_ob_nr)],
2729 ["cf::object::player" => qw(player)], 2906 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 2907 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 2908 ["cf::map" => qw(trigger)],
2732) { 2909) {
2733 no strict 'refs'; 2910 no strict 'refs';
… …
2809# the server's init and main functions 2986# the server's init and main functions
2810 2987
2811sub load_facedata($) { 2988sub load_facedata($) {
2812 my ($path) = @_; 2989 my ($path) = @_;
2813 2990
2991 # HACK to clear player env face cache, we need some signal framework
2992 # for this (global event?)
2993 %ext::player_env::MUSIC_FACE_CACHE = ();
2994
2995 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2996
2814 warn "loading facedata from $path\n"; 2997 warn "loading facedata from $path\n";
2815 2998
2816 my $facedata; 2999 my $facedata;
2817 0 < aio_load $path, $facedata 3000 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 3001 or die "$path: $!";
2819 3002
2820 $facedata = Coro::Storable::thaw $facedata; 3003 $facedata = Coro::Storable::thaw $facedata;
2821 3004
2822 $facedata->{version} == 2 3005 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 3006 or cf::cleanup "$path: version mismatch, cannot proceed.";
3007
3008 # patch in the exptable
3009 $facedata->{resource}{"res/exp_table"} = {
3010 type => FT_RSRC,
3011 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3012 };
3013 cf::cede_to_tick;
2824 3014
2825 { 3015 {
2826 my $faces = $facedata->{faceinfo}; 3016 my $faces = $facedata->{faceinfo};
2827 3017
2828 while (my ($face, $info) = each %$faces) { 3018 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3019 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2830 cf::face::set_visibility $idx, $info->{visibility}; 3020 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 3021 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3022 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3023 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 3024
2835 cf::cede_to_tick; 3025 cf::cede_to_tick;
2836 } 3026 }
2837 3027
2838 while (my ($face, $info) = each %$faces) { 3028 while (my ($face, $info) = each %$faces) {
… …
2863 3053
2864 { 3054 {
2865 # TODO: for gcfclient pleasure, we should give resources 3055 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 3056 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3057 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869 3058
2870 my $soundconf = delete $res->{"res/sound.conf"}; 3059 my $soundconf = delete $res->{"res/sound.conf"};
2871 3060
2872 while (my ($name, $info) = each %$res) { 3061 while (my ($name, $info) = each %$res) {
2873 my $meta = $enc->encode ({
2874 name => $name,
2875 %{ $info->{meta} || {} },
2876 });
2877
2878 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3062 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3063 my $data;
2879 3064
2880 if ($info->{type} & 1) { 3065 if ($info->{type} & 1) {
2881 # prepend meta info 3066 # prepend meta info
2882 3067
3068 my $meta = $enc->encode ({
3069 name => $name,
3070 %{ $info->{meta} || {} },
3071 });
3072
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 3073 $data = pack "(w/a*)*", $meta, $info->{data};
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2885
2886 cf::face::set_data $idx, 0, $data, $chk;
2887 } else { 3074 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3075 $data = $info->{data};
2889 } 3076 }
2890 3077
3078 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2891 cf::face::set_type $idx, $info->{type}; 3079 cf::face::set_type $idx, $info->{type};
2892 3080
2893 cf::cede_to_tick; 3081 cf::cede_to_tick;
2894 } 3082 }
2895 3083
… …
2899 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3087 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2900 my $sound = $soundconf->{compat}[$_] 3088 my $sound = $soundconf->{compat}[$_]
2901 or next; 3089 or next;
2902 3090
2903 my $face = cf::face::find "sound/$sound->[1]"; 3091 my $face = cf::face::find "sound/$sound->[1]";
2904 warn "$sound->[0]: $face\n";#d#
2905
2906 cf::sound::set $sound->[0] => $face; 3092 cf::sound::set $sound->[0] => $face;
2907 cf::sound::old_sound_index $_, $face; # gcfclient-compat 3093 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2908 } 3094 }
2909 3095
3096 while (my ($k, $v) = each %{$soundconf->{event}}) {
3097 my $face = cf::face::find "sound/$v";
3098 cf::sound::set $k => $face;
2910 #TODO 3099 }
2911 } 3100 }
2912 } 3101 }
2913 3102
2914 1 3103 1
2915} 3104}
… …
2921 $ns->fx_want ($k, $v); 3110 $ns->fx_want ($k, $v);
2922 } 3111 }
2923}; 3112};
2924 3113
2925sub reload_regions { 3114sub reload_regions {
3115 # HACK to clear player env face cache, we need some signal framework
3116 # for this (global event?)
3117 %ext::player_env::MUSIC_FACE_CACHE = ();
3118
2926 load_resource_file "$MAPDIR/regions" 3119 load_resource_file "$MAPDIR/regions"
2927 or die "unable to load regions file\n"; 3120 or die "unable to load regions file\n";
2928 3121
2929 for (cf::region::list) { 3122 for (cf::region::list) {
2930 $_->{match} = qr/$_->{match}/ 3123 $_->{match} = qr/$_->{match}/
… …
2966 3159
2967sub init { 3160sub init {
2968 reload_resources; 3161 reload_resources;
2969} 3162}
2970 3163
2971sub cfg_load { 3164sub reload_config {
2972 open my $fh, "<:utf8", "$CONFDIR/config" 3165 open my $fh, "<:utf8", "$CONFDIR/config"
2973 or return; 3166 or return;
2974 3167
2975 local $/; 3168 local $/;
2976 *CFG = YAML::Syck::Load <$fh>; 3169 *CFG = YAML::Syck::Load <$fh>;
… …
2992sub main { 3185sub main {
2993 # we must not ever block the main coroutine 3186 # we must not ever block the main coroutine
2994 local $Coro::idle = sub { 3187 local $Coro::idle = sub {
2995 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3188 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2996 (async { 3189 (async {
3190 $Coro::current->{desc} = "IDLE BUG HANDLER";
2997 Event::one_event; 3191 Event::one_event;
2998 })->prio (Coro::PRIO_MAX); 3192 })->prio (Coro::PRIO_MAX);
2999 }; 3193 };
3000 3194
3001 cfg_load; 3195 reload_config;
3002 db_init; 3196 db_init;
3003 load_extensions; 3197 load_extensions;
3004 3198
3005 $TICK_WATCHER->start; 3199 $TICK_WATCHER->start;
3006 Event::loop; 3200 Event::loop;
… …
3199 warn "reloading cf.pm"; 3393 warn "reloading cf.pm";
3200 require cf; 3394 require cf;
3201 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3395 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3202 3396
3203 warn "loading config and database again"; 3397 warn "loading config and database again";
3204 cf::cfg_load; 3398 cf::reload_config;
3205 3399
3206 warn "loading extensions"; 3400 warn "loading extensions";
3207 cf::load_extensions; 3401 cf::load_extensions;
3208 3402
3209 warn "reattaching attachments to objects/players"; 3403 warn "reattaching attachments to objects/players";
… …
3245register_command "reload" => sub { 3439register_command "reload" => sub {
3246 my ($who, $arg) = @_; 3440 my ($who, $arg) = @_;
3247 3441
3248 if ($who->flag (FLAG_WIZ)) { 3442 if ($who->flag (FLAG_WIZ)) {
3249 $who->message ("reloading server."); 3443 $who->message ("reloading server.");
3444 async {
3445 $Coro::current->{desc} = "perl_reload";
3250 async { reload_perl }; 3446 reload_perl;
3447 };
3251 } 3448 }
3252}; 3449};
3253 3450
3254unshift @INC, $LIBDIR; 3451unshift @INC, $LIBDIR;
3255 3452
… …
3274 my $signal = new Coro::Signal; 3471 my $signal = new Coro::Signal;
3275 push @WAIT_FOR_TICK_BEGIN, $signal; 3472 push @WAIT_FOR_TICK_BEGIN, $signal;
3276 $signal->wait; 3473 $signal->wait;
3277} 3474}
3278 3475
3279 my $min = 1e6;#d#
3280 my $avg = 10;
3281$TICK_WATCHER = Event->timer ( 3476$TICK_WATCHER = Event->timer (
3282 reentrant => 0, 3477 reentrant => 0,
3283 parked => 1, 3478 parked => 1,
3284 prio => 0, 3479 prio => 0,
3285 at => $NEXT_TICK || $TICK, 3480 at => $NEXT_TICK || $TICK,
… …
3293 3488
3294 $NOW = $tick_start = Event::time; 3489 $NOW = $tick_start = Event::time;
3295 3490
3296 cf::server_tick; # one server iteration 3491 cf::server_tick; # one server iteration
3297 3492
3298 0 && sync_job {#d#
3299 for(1..10) {
3300 my $t = Event::time;
3301 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3302 or die;
3303
3304 $map->width (50);
3305 $map->height (50);
3306 $map->alloc;
3307 $map->_load_objects ("/tmp/x.map", 1);
3308 my $t = Event::time - $t;
3309
3310 #next unless $t < 0.0013;#d#
3311 if ($t < $min) {
3312 $min = $t;
3313 }
3314 $avg = $avg * 0.99 + $t * 0.01;
3315 }
3316 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3317 exit 0;
3318 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3319 };
3320
3321 $RUNTIME += $TICK; 3493 $RUNTIME += $TICK;
3322 $NEXT_TICK += $TICK; 3494 $NEXT_TICK += $TICK;
3323 3495
3324 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3496 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3325 $NEXT_RUNTIME_WRITE = $NOW + 10; 3497 $NEXT_RUNTIME_WRITE = $NOW + 10;
3326 Coro::async_pool { 3498 Coro::async_pool {
3499 $Coro::current->{desc} = "runtime saver";
3327 write_runtime 3500 write_runtime
3328 or warn "ERROR: unable to write runtime file: $!"; 3501 or warn "ERROR: unable to write runtime file: $!";
3329 }; 3502 };
3330 } 3503 }
3331 3504
3332# my $AFTER = Event::time;
3333# warn $AFTER - $NOW;#d#
3334
3335 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3505 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3336 $sig->send; 3506 $sig->send;
3337 } 3507 }
3338 while (my $sig = shift @WAIT_FOR_TICK) { 3508 while (my $sig = shift @WAIT_FOR_TICK) {
3339 $sig->send; 3509 $sig->send;
… …
3349 3519
3350 $LOAD = ($NOW - $tick_start) / $TICK; 3520 $LOAD = ($NOW - $tick_start) / $TICK;
3351 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3521 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3352 3522
3353 _post_tick; 3523 _post_tick;
3354
3355
3356 }, 3524 },
3357); 3525);
3358 3526
3359{ 3527{
3528 BDB::min_parallel 8;
3360 BDB::max_poll_time $TICK * 0.1; 3529 BDB::max_poll_time $TICK * 0.1;
3361 $BDB_POLL_WATCHER = Event->io ( 3530 $BDB_POLL_WATCHER = Event->io (
3362 reentrant => 0, 3531 reentrant => 0,
3363 fd => BDB::poll_fileno, 3532 fd => BDB::poll_fileno,
3364 poll => 'r', 3533 poll => 'r',
3365 prio => 0, 3534 prio => 0,
3366 data => WF_AUTOCANCEL, 3535 data => WF_AUTOCANCEL,
3367 cb => \&BDB::poll_cb, 3536 cb => \&BDB::poll_cb,
3368 ); 3537 );
3369 BDB::min_parallel 8;
3370 3538
3371 BDB::set_sync_prepare { 3539 BDB::set_sync_prepare {
3372 my $status; 3540 my $status;
3373 my $current = $Coro::current; 3541 my $current = $Coro::current;
3374 ( 3542 (
… …
3383 ) 3551 )
3384 }; 3552 };
3385 3553
3386 unless ($DB_ENV) { 3554 unless ($DB_ENV) {
3387 $DB_ENV = BDB::db_env_create; 3555 $DB_ENV = BDB::db_env_create;
3556 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3557 | BDB::LOG_AUTOREMOVE, 1);
3558 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3559 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3388 3560
3389 cf::sync_job { 3561 cf::sync_job {
3390 eval { 3562 eval {
3391 BDB::db_env_open 3563 BDB::db_env_open
3392 $DB_ENV, 3564 $DB_ENV,
… …
3394 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3566 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3395 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3567 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3396 0666; 3568 0666;
3397 3569
3398 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3570 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3399
3400 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3401 $DB_ENV->set_lk_detect;
3402 }; 3571 };
3403 3572
3404 cf::cleanup "db_env_open(db): $@" if $@; 3573 cf::cleanup "db_env_open(db): $@" if $@;
3405 }; 3574 };
3406 } 3575 }
3576
3577 $BDB_DEADLOCK_WATCHER = Event->timer (
3578 after => 3,
3579 interval => 1,
3580 hard => 1,
3581 prio => 0,
3582 data => WF_AUTOCANCEL,
3583 cb => sub {
3584 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3585 },
3586 );
3587 $BDB_CHECKPOINT_WATCHER = Event->timer (
3588 after => 11,
3589 interval => 60,
3590 hard => 1,
3591 prio => 0,
3592 data => WF_AUTOCANCEL,
3593 cb => sub {
3594 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3595 },
3596 );
3597 $BDB_TRICKLE_WATCHER = Event->timer (
3598 after => 5,
3599 interval => 10,
3600 hard => 1,
3601 prio => 0,
3602 data => WF_AUTOCANCEL,
3603 cb => sub {
3604 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3605 },
3606 );
3407} 3607}
3408 3608
3409{ 3609{
3410 IO::AIO::min_parallel 8; 3610 IO::AIO::min_parallel 8;
3411 3611
… …
3430 3630
3431 # limit the # of concurrent backtraces 3631 # limit the # of concurrent backtraces
3432 if ($_log_backtrace < 2) { 3632 if ($_log_backtrace < 2) {
3433 ++$_log_backtrace; 3633 ++$_log_backtrace;
3434 async { 3634 async {
3635 $Coro::current->{desc} = "abt $msg";
3636
3435 my @bt = fork_call { 3637 my @bt = fork_call {
3436 @addr = map { sprintf "%x", $_ } @addr; 3638 @addr = map { sprintf "%x", $_ } @addr;
3437 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3639 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3438 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3640 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3439 or die "addr2line: $!"; 3641 or die "addr2line: $!";

Diff Legend

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