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.379 by root, Thu Oct 4 23:59:07 2007 UTC

… …
10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
… …
79our $NEXT_TICK; 80our $NEXT_TICK;
80our $NOW; 81our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
82 83
83our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 88our $DB_ENV;
85 89
86our %CFG; 90our %CFG;
87 91
88our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 93our $RUNTIME;
90 94
91our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
94 98
95# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 101
… …
186 $msg .= "\n" 190 $msg .= "\n"
187 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
188 192
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 194
191 utf8::encode $msg;
192 LOG llevError, $msg; 195 LOG llevError, $msg;
193 }; 196 };
194} 197}
195 198
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
271Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
274returned. 277returned.
275 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
276Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
278 284
279=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
280 286
281Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
282 288
283=cut 289=cut
284 290
285our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
286 293
287sub lock_wait($) { 294sub lock_wait($) {
288 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
289 301
290 # wait for lock, if any 302 # wait for lock, if any
291 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 305 Coro::schedule;
… …
299 311
300 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
301 lock_wait $key; 313 lock_wait $key;
302 314
303 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
304 317
305 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
308 } 322 }
309} 323}
310 324
… …
340our @SLOT_QUEUE; 354our @SLOT_QUEUE;
341our $SLOT_QUEUE; 355our $SLOT_QUEUE;
342 356
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
345 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
346 362
347 while () { 363 while () {
348 next_job: 364 next_job:
349 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
… …
411 my $time = Event::time; 427 my $time = Event::time;
412 428
413 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
415 431
432 LOG llevError | logBacktrace, Carp::longmess "sync job";#d#
433
416 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
417 # (but this is cancel-safe) 435 # (but this is cancel-safe)
418 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
419 437
420 my $busy = 1; 438 my $busy = 1;
421 my @res; 439 my @res;
422 440
423 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 443 @res = eval { $job->() };
425 warn $@ if $@; 444 warn $@ if $@;
426 undef $busy; 445 undef $busy;
427 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
428 447
… …
472Coro::Storable. May, of course, block. Note that the executed sub may 491Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 492never block itself or use any form of Event handling.
474 493
475=cut 494=cut
476 495
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485
486sub fork_call(&@) { 496sub fork_call(&@) {
487 my ($cb, @args) = @_; 497 my ($cb, @args) = @_;
488 498
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 499 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 500 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 501 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 502
494 if (my $pid = fork) { 503 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 504 reset_signals;
508 local $SIG{__WARN__}; 505 &$cb
509 local $SIG{__DIE__}; 506 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 507
516 eval { 508 wantarray ? @res : $res[-1]
517 close $fh1;
518
519 my @res = eval { $cb->(@args) };
520
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
523 };
524
525 warn $@ if $@;
526 _exit 0;
527 }
528} 509}
529 510
530=item $value = cf::db_get $family => $key 511=item $value = cf::db_get $family => $key
531 512
532Returns a single value from the environment database. 513Returns a single value from the environment database.
… …
534=item cf::db_put $family => $key => $value 515=item cf::db_put $family => $key => $value
535 516
536Stores the given C<$value> in the family. It can currently store binary 517Stores the given C<$value> in the family. It can currently store binary
537data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 518data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 519
520=item $db = cf::db_table "name"
521
522Create and/or open a new database table. The string must not be "db" and must be unique
523within each server.
524
539=cut 525=cut
526
527sub db_table($) {
528 my ($name) = @_;
529 my $db = BDB::db_create $DB_ENV;
530
531 eval {
532 $db->set_flags (BDB::CHKSUM);
533
534 utf8::encode $name;
535 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
536 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
537 cf::cleanup "db_open(db): $!" if $!;
538 };
539 cf::cleanup "db_open(db): $@" if $@;
540
541 $db
542}
540 543
541our $DB; 544our $DB;
542 545
543sub db_init { 546sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 547 cf::sync_job {
548 eval { 548 $DB ||= db_table "db";
549 $DB->set_flags (BDB::CHKSUM);
550
551 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553 cf::cleanup "db_open(db): $!" if $!;
554 };
555 cf::cleanup "db_open(db): $@" if $@;
556 };
557 } 549 };
558} 550}
559 551
560sub db_get($$) { 552sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 553 my $key = "$_[0]/$_[1]";
562 554
… …
612 if (1) { 604 if (1) {
613 $md5 = 605 $md5 =
614 join "\x00", 606 join "\x00",
615 $processversion, 607 $processversion,
616 map { 608 map {
617 Coro::cede; 609 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 610 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 611 } 0.. $#$src;
620 612
621 613
622 my $dbmd5 = db_get cache => "$id/md5"; 614 my $dbmd5 = db_get cache => "$id/md5";
… …
1041sub object_freezer_save { 1033sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1034 my ($filename, $rdata, $objs) = @_;
1043 1035
1044 sync_job { 1036 sync_job {
1045 if (length $$rdata) { 1037 if (length $$rdata) {
1038 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1039 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1040 $decname, length $$rdata, scalar @$objs;
1048 1041
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1042 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1043 chmod SAVE_MODE, $fh;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1044 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1045 aio_fsync $fh if $cf::USE_FSYNC;
… …
1071 } 1064 }
1072 } else { 1065 } else {
1073 aio_unlink $filename; 1066 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1067 aio_unlink "$filename.pst";
1075 } 1068 }
1076 } 1069 };
1077} 1070}
1078 1071
1079sub object_freezer_as_string { 1072sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1073 my ($rdata, $objs) = @_;
1081 1074
… …
1093 or return; 1086 or return;
1094 1087
1095 unless (aio_stat "$filename.pst") { 1088 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1089 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1090 or return;
1091
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1092 $av = eval { (Storable::thaw $av)->{objs} };
1099 } 1093 }
1100 1094
1095 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1096 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1097 $decname, length $data, scalar @{$av || []};
1098
1103 return ($data, $av); 1099 ($data, $av)
1104} 1100}
1105 1101
1106=head2 COMMAND CALLBACKS 1102=head2 COMMAND CALLBACKS
1107 1103
1108=over 4 1104=over 4
… …
1186 my ($type, $reply, @payload) = 1182 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1183 "ARRAY" eq ref $msg
1188 ? @$msg 1184 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1185 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1186
1187 my @reply;
1188
1191 if (my $cb = $EXTCMD{$type}) { 1189 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1190 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1191 }
1192
1193 $pl->ext_reply ($reply, @reply)
1194 if $reply;
1195
1197 } else { 1196 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1197 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1198 }
1200 1199
1201 cf::override; 1200 cf::override;
… …
1291 1290
1292=head3 cf::player 1291=head3 cf::player
1293 1292
1294=over 4 1293=over 4
1295 1294
1295=item cf::player::num_playing
1296
1297Returns the official number of playing players, as per the Crossfire metaserver rules.
1298
1299=cut
1300
1301sub num_playing {
1302 scalar grep
1303 $_->ob->map
1304 && !$_->hidden
1305 && !$_->ob->flag (cf::FLAG_WIZ),
1306 cf::player::list
1307}
1308
1296=item cf::player::find $login 1309=item cf::player::find $login
1297 1310
1298Returns the given player object, loading it if necessary (might block). 1311Returns the given player object, loading it if necessary (might block).
1299 1312
1300=cut 1313=cut
… …
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1348 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1349 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1350 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1351 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1352
1340 my $pl = load_pl path $login 1353 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1354 or return;
1355
1356 my $pl = cf::player::load_pl $f
1357 or return;
1358 local $cf::PLAYER_LOADING{$login} = $pl;
1359 $f->resolve_delayed_derefs;
1342 $cf::PLAYER{$login} = $pl 1360 $cf::PLAYER{$login} = $pl
1343 } 1361 }
1344 } 1362 }
1345} 1363}
1346 1364
… …
1356 1374
1357 aio_mkdir playerdir $pl, 0770; 1375 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1376 $pl->{last_save} = $cf::RUNTIME;
1359 1377
1360 $pl->save_pl ($path); 1378 $pl->save_pl ($path);
1361 Coro::cede; 1379 cf::cede_to_tick;
1362} 1380}
1363 1381
1364sub new($) { 1382sub new($) {
1365 my ($login) = @_; 1383 my ($login) = @_;
1366 1384
… …
1370 $self->{deny_save} = 1; 1388 $self->{deny_save} = 1;
1371 1389
1372 $cf::PLAYER{$login} = $self; 1390 $cf::PLAYER{$login} = $self;
1373 1391
1374 $self 1392 $self
1393}
1394
1395=item $player->send_msg ($channel, $msg, $color, [extra...])
1396
1397=cut
1398
1399sub send_msg {
1400 my $ns = shift->ns
1401 or return;
1402 $ns->send_msg (@_);
1375} 1403}
1376 1404
1377=item $pl->quit_character 1405=item $pl->quit_character
1378 1406
1379Nukes the player without looking back. If logged in, the connection will 1407Nukes the player without looking back. If logged in, the connection will
… …
1434 or return []; 1462 or return [];
1435 1463
1436 my @logins; 1464 my @logins;
1437 1465
1438 for my $login (@$dirs) { 1466 for my $login (@$dirs) {
1467 my $path = path $login;
1468
1469 # a .pst is a dead give-away for a valid player
1470 unless (-e "$path.pst") {
1439 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1471 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440 aio_read $fh, 0, 512, my $buf, 0 or next; 1472 aio_read $fh, 0, 512, my $buf, 0 or next;
1441 $buf !~ /^password -------------$/m or next; # official not-valid tag 1473 $buf !~ /^password -------------$/m or next; # official not-valid tag
1474 }
1442 1475
1443 utf8::decode $login; 1476 utf8::decode $login;
1444 push @logins, $login; 1477 push @logins, $login;
1445 } 1478 }
1446 1479
… …
1484sub expand_cfpod { 1517sub expand_cfpod {
1485 ((my $self), (local $_)) = @_; 1518 ((my $self), (local $_)) = @_;
1486 1519
1487 # escape & and < 1520 # escape & and <
1488 s/&/&amp;/g; 1521 s/&/&amp;/g;
1489 s/(?<![BIUGH])</&lt;/g; 1522 s/(?<![BIUGHT])</&lt;/g;
1490 1523
1491 # this is buggy, it needs to properly take care of nested <'s 1524 # this is buggy, it needs to properly take care of nested <'s
1492 1525
1493 1 while 1526 1 while
1494 # replace B<>, I<>, U<> etc. 1527 # replace B<>, I<>, U<> etc.
1495 s/B<([^\>]*)>/<b>$1<\/b>/ 1528 s/B<([^\>]*)>/<b>$1<\/b>/
1496 || s/I<([^\>]*)>/<i>$1<\/i>/ 1529 || s/I<([^\>]*)>/<i>$1<\/i>/
1497 || s/U<([^\>]*)>/<u>$1<\/u>/ 1530 || s/U<([^\>]*)>/<u>$1<\/u>/
1531 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1498 # replace G<male|female> tags 1532 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{ 1533 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1 1534 $self->gender ? $2 : $1
1501 }ge 1535 }ge
1502 # replace H<hint text> 1536 # replace H<hint text>
… …
1532=cut 1566=cut
1533 1567
1534sub ext_reply($$@) { 1568sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1569 my ($self, $id, @msg) = @_;
1536 1570
1537 if ($self->ns->extcmd == 2) { 1571 $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} 1572}
1545 1573
1546=item $player->ext_msg ($type, @msg) 1574=item $player->ext_msg ($type, @msg)
1547 1575
1548Sends an ext event to the client. 1576Sends an ext event to the client.
… …
1776 1804
1777sub load_header_from($) { 1805sub load_header_from($) {
1778 my ($self, $path) = @_; 1806 my ($self, $path) = @_;
1779 1807
1780 utf8::encode $path; 1808 utf8::encode $path;
1781 #aio_open $path, O_RDONLY, 0 1809 my $f = new_from_file cf::object::thawer $path
1782 # or return;
1783
1784 $self->_load_header ($path)
1785 or return; 1810 or return;
1811
1812 $self->_load_header ($f)
1813 or return;
1814
1815 local $MAP_LOADING{$self->{path}} = $self;
1816 $f->resolve_delayed_derefs;
1786 1817
1787 $self->{load_path} = $path; 1818 $self->{load_path} = $path;
1788 1819
1789 1 1820 1
1790} 1821}
… …
1844sub find { 1875sub find {
1845 my ($path, $origin) = @_; 1876 my ($path, $origin) = @_;
1846 1877
1847 $path = normalise $path, $origin && $origin->path; 1878 $path = normalise $path, $origin && $origin->path;
1848 1879
1880 cf::lock_wait "map_data:$path";#d#remove
1849 cf::lock_wait "map_find:$path"; 1881 cf::lock_wait "map_find:$path";
1850 1882
1851 $cf::MAP{$path} || do { 1883 $cf::MAP{$path} || do {
1852 my $guard = cf::lock_acquire "map_find:$path"; 1884 my $guard1 = cf::lock_acquire "map_find:$path";
1885 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1886
1853 my $map = new_from_path cf::map $path 1887 my $map = new_from_path cf::map $path
1854 or return; 1888 or return;
1855 1889
1856 $map->{last_save} = $cf::RUNTIME; 1890 $map->{last_save} = $cf::RUNTIME;
1857 1891
… …
1859 or return; 1893 or return;
1860 1894
1861 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1895 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862 # doing this can freeze the server in a sync job, obviously 1896 # doing this can freeze the server in a sync job, obviously
1863 #$cf::WAIT_FOR_TICK->wait; 1897 #$cf::WAIT_FOR_TICK->wait;
1898 undef $guard1;
1899 undef $guard2;
1864 $map->reset; 1900 $map->reset;
1865 undef $guard;
1866 return find $path; 1901 return find $path;
1867 } 1902 }
1868 1903
1869 $cf::MAP{$path} = $map 1904 $cf::MAP{$path} = $map
1870 } 1905 }
… …
1879 local $self->{deny_reset} = 1; # loading can take a long time 1914 local $self->{deny_reset} = 1; # loading can take a long time
1880 1915
1881 my $path = $self->{path}; 1916 my $path = $self->{path};
1882 1917
1883 { 1918 {
1884 my $guard = cf::lock_acquire "map_load:$path"; 1919 my $guard = cf::lock_acquire "map_data:$path";
1885 1920
1921 return unless $self->valid;
1886 return if $self->in_memory != cf::MAP_SWAPPED; 1922 return unless $self->in_memory == cf::MAP_SWAPPED;
1887 1923
1888 $self->in_memory (cf::MAP_LOADING); 1924 $self->in_memory (cf::MAP_LOADING);
1889 1925
1890 $self->alloc; 1926 $self->alloc;
1891 1927
1892 $self->pre_load; 1928 $self->pre_load;
1893 Coro::cede; 1929 cf::cede_to_tick;
1894 1930
1931 my $f = new_from_file cf::object::thawer $self->{load_path};
1932 $f->skip_block;
1895 $self->_load_objects ($self->{load_path}, 1) 1933 $self->_load_objects ($f)
1896 or return; 1934 or return;
1897 1935
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1936 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1899 if delete $self->{load_original}; 1937 if delete $self->{load_original};
1900 1938
1901 if (my $uniq = $self->uniq_path) { 1939 if (my $uniq = $self->uniq_path) {
1902 utf8::encode $uniq; 1940 utf8::encode $uniq;
1903 if (aio_open $uniq, O_RDONLY, 0) { 1941 unless (aio_stat $uniq) {
1942 if (my $f = new_from_file cf::object::thawer $uniq) {
1904 $self->clear_unique_items; 1943 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 1944 $self->_load_objects ($f);
1945 $f->resolve_delayed_derefs;
1946 }
1906 } 1947 }
1907 } 1948 }
1908 1949
1909 Coro::cede; 1950 $f->resolve_delayed_derefs;
1951
1952 cf::cede_to_tick;
1910 # now do the right thing for maps 1953 # now do the right thing for maps
1911 $self->link_multipart_objects; 1954 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 1955 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 1956 unless $self->difficulty;
1914 Coro::cede; 1957 cf::cede_to_tick;
1915 1958
1916 unless ($self->{deny_activate}) { 1959 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 1960 $self->decay_objects;
1918 $self->fix_auto_apply; 1961 $self->fix_auto_apply;
1919 $self->update_buttons; 1962 $self->update_buttons;
1920 Coro::cede; 1963 cf::cede_to_tick;
1921 $self->set_darkness_map; 1964 $self->set_darkness_map;
1922 Coro::cede; 1965 cf::cede_to_tick;
1923 $self->activate; 1966 $self->activate;
1924 } 1967 }
1968
1969 $self->{last_save} = $cf::RUNTIME;
1970 $self->last_access ($cf::RUNTIME);
1925 1971
1926 $self->in_memory (cf::MAP_IN_MEMORY); 1972 $self->in_memory (cf::MAP_IN_MEMORY);
1927 } 1973 }
1928 1974
1929 $self->post_load; 1975 $self->post_load;
… …
1940 1986
1941 $self 1987 $self
1942} 1988}
1943 1989
1944# find and load all maps in the 3x3 area around a map 1990# find and load all maps in the 3x3 area around a map
1945sub load_diag { 1991sub load_neighbours {
1946 my ($map) = @_; 1992 my ($map) = @_;
1947 1993
1948 my @diag; # diagonal neighbours 1994 my @neigh; # diagonal neighbours
1949 1995
1950 for (0 .. 3) { 1996 for (0 .. 3) {
1951 my $neigh = $map->tile_path ($_) 1997 my $neigh = $map->tile_path ($_)
1952 or next; 1998 or next;
1953 $neigh = find $neigh, $map 1999 $neigh = find $neigh, $map
1954 or next; 2000 or next;
1955 $neigh->load; 2001 $neigh->load;
1956 2002
2003 push @neigh,
1957 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2004 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1958 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2005 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1959 } 2006 }
1960 2007
1961 for (@diag) { 2008 for (grep defined $_->[0], @neigh) {
2009 my ($path, $origin) = @$_;
1962 my $neigh = find @$_ 2010 my $neigh = find $path, $origin
1963 or next; 2011 or next;
1964 $neigh->load; 2012 $neigh->load;
1965 } 2013 }
1966} 2014}
1967 2015
… …
1972} 2020}
1973 2021
1974sub do_load_sync { 2022sub do_load_sync {
1975 my ($map) = @_; 2023 my ($map) = @_;
1976 2024
2025 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2026 if $Coro::current == $Coro::main;
2027
1977 cf::sync_job { $map->load }; 2028 cf::sync_job { $map->load };
1978} 2029}
1979 2030
1980our %MAP_PREFETCH; 2031our %MAP_PREFETCH;
1981our $MAP_PREFETCHER = undef; 2032our $MAP_PREFETCHER = undef;
1982 2033
1983sub find_async { 2034sub find_async {
1984 my ($path, $origin) = @_; 2035 my ($path, $origin, $load) = @_;
1985 2036
1986 $path = normalise $path, $origin && $origin->{path}; 2037 $path = normalise $path, $origin && $origin->{path};
1987 2038
1988 if (my $map = $cf::MAP{$path}) { 2039 if (my $map = $cf::MAP{$path}) {
1989 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2040 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1990 } 2041 }
1991 2042
1992 undef $MAP_PREFETCH{$path}; 2043 $MAP_PREFETCH{$path} |= $load;
2044
1993 $MAP_PREFETCHER ||= cf::async { 2045 $MAP_PREFETCHER ||= cf::async {
2046 $Coro::current->{desc} = "map prefetcher";
2047
1994 while (%MAP_PREFETCH) { 2048 while (%MAP_PREFETCH) {
1995 for my $path (keys %MAP_PREFETCH) { 2049 while (my ($k, $v) = each %MAP_PREFETCH) {
1996 if (my $map = find $path) { 2050 if (my $map = find $k) {
1997 $map->load; 2051 $map->load if $v;
1998 } 2052 }
1999 2053
2000 delete $MAP_PREFETCH{$path}; 2054 delete $MAP_PREFETCH{$k};
2001 } 2055 }
2002 } 2056 }
2003 undef $MAP_PREFETCHER; 2057 undef $MAP_PREFETCHER;
2004 }; 2058 };
2005 $MAP_PREFETCHER->prio (6); 2059 $MAP_PREFETCHER->prio (6);
… …
2008} 2062}
2009 2063
2010sub save { 2064sub save {
2011 my ($self) = @_; 2065 my ($self) = @_;
2012 2066
2013 my $lock = cf::lock_acquire "map_data:" . $self->path; 2067 my $lock = cf::lock_acquire "map_data:$self->{path}";
2014 2068
2015 $self->{last_save} = $cf::RUNTIME; 2069 $self->{last_save} = $cf::RUNTIME;
2016 2070
2017 return unless $self->dirty; 2071 return unless $self->dirty;
2018 2072
… …
2024 return if $self->{deny_save}; 2078 return if $self->{deny_save};
2025 2079
2026 local $self->{last_access} = $self->last_access;#d# 2080 local $self->{last_access} = $self->last_access;#d#
2027 2081
2028 cf::async { 2082 cf::async {
2083 $Coro::current->{desc} = "map player save";
2029 $_->contr->save for $self->players; 2084 $_->contr->save for $self->players;
2030 }; 2085 };
2031 2086
2032 if ($uniq) { 2087 if ($uniq) {
2033 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2041 my ($self) = @_; 2096 my ($self) = @_;
2042 2097
2043 # save first because save cedes 2098 # save first because save cedes
2044 $self->save; 2099 $self->save;
2045 2100
2046 my $lock = cf::lock_acquire "map_data:" . $self->path; 2101 my $lock = cf::lock_acquire "map_data:$self->{path}";
2047 2102
2048 return if $self->players; 2103 return if $self->players;
2049 return if $self->in_memory != cf::MAP_IN_MEMORY; 2104 return if $self->in_memory != cf::MAP_IN_MEMORY;
2050 return if $self->{deny_save}; 2105 return if $self->{deny_save};
2051 2106
2107 $self->in_memory (cf::MAP_SWAPPED);
2108
2109 $self->deactivate;
2110 $_->clear_links_to ($self) for values %cf::MAP;
2052 $self->clear; 2111 $self->clear;
2053 $self->in_memory (cf::MAP_SWAPPED);
2054} 2112}
2055 2113
2056sub reset_at { 2114sub reset_at {
2057 my ($self) = @_; 2115 my ($self) = @_;
2058 2116
… …
2090 if $uniq; 2148 if $uniq;
2091 } 2149 }
2092 2150
2093 delete $cf::MAP{$self->path}; 2151 delete $cf::MAP{$self->path};
2094 2152
2153 $self->deactivate;
2154 $_->clear_links_to ($self) for values %cf::MAP;
2095 $self->clear; 2155 $self->clear;
2096
2097 $_->clear_links_to ($self) for values %cf::MAP;
2098 2156
2099 $self->unlink_save; 2157 $self->unlink_save;
2100 $self->destroy; 2158 $self->destroy;
2101} 2159}
2102 2160
2103my $nuke_counter = "aaaa"; 2161my $nuke_counter = "aaaa";
2104 2162
2105sub nuke { 2163sub nuke {
2106 my ($self) = @_; 2164 my ($self) = @_;
2107 2165
2166 {
2167 my $lock = cf::lock_acquire "map_data:$self->{path}";
2168
2108 delete $cf::MAP{$self->path}; 2169 delete $cf::MAP{$self->path};
2109 2170
2110 $self->unlink_save; 2171 $self->unlink_save;
2111 2172
2112 bless $self, "cf::map"; 2173 bless $self, "cf::map";
2113 delete $self->{deny_reset}; 2174 delete $self->{deny_reset};
2114 $self->{deny_save} = 1; 2175 $self->{deny_save} = 1;
2115 $self->reset_timeout (1); 2176 $self->reset_timeout (1);
2116 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2177 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2117 2178
2118 $cf::MAP{$self->path} = $self; 2179 $cf::MAP{$self->path} = $self;
2180 }
2119 2181
2120 $self->reset; # polite request, might not happen 2182 $self->reset; # polite request, might not happen
2121} 2183}
2122 2184
2123=item $maps = cf::map::tmp_maps 2185=item $maps = cf::map::tmp_maps
… …
2199 2261
2200sub inv_recursive { 2262sub inv_recursive {
2201 inv_recursive_ inv $_[0] 2263 inv_recursive_ inv $_[0]
2202} 2264}
2203 2265
2266=item $ref = $ob->ref
2267
2268creates and returns a persistent reference to an objetc that can be stored as a string.
2269
2270=item $ob = cf::object::deref ($refstring)
2271
2272returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2273even if the object actually exists. May block.
2274
2275=cut
2276
2277sub deref {
2278 my ($ref) = @_;
2279
2280 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2281 my ($uuid, $name) = ($1, $2);
2282 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2283 or return;
2284 $pl->ob->uuid eq $uuid
2285 or return;
2286
2287 $pl->ob
2288 } else {
2289 warn "$ref: cannot resolve object reference\n";
2290 undef
2291 }
2292}
2293
2204package cf; 2294package cf;
2205 2295
2206=back 2296=back
2207 2297
2208=head3 cf::object::player 2298=head3 cf::object::player
… …
2240 $self->message ($msg, $flags); 2330 $self->message ($msg, $flags);
2241 } 2331 }
2242 } 2332 }
2243} 2333}
2244 2334
2335=item $object->send_msg ($channel, $msg, $color, [extra...])
2336
2337=cut
2338
2339sub cf::object::send_msg {
2340 my $pl = shift->contr
2341 or return;
2342 $pl->send_msg (@_);
2343}
2344
2245=item $player_object->may ("access") 2345=item $player_object->may ("access")
2246 2346
2247Returns wether the given player is authorized to access resource "access" 2347Returns wether the given player is authorized to access resource "access"
2248(e.g. "command_wizcast"). 2348(e.g. "command_wizcast").
2249 2349
… …
2326 # use -1 or undef as default coordinates, not 0, 0 2426 # use -1 or undef as default coordinates, not 0, 0
2327 ($x, $y) = ($map->enter_x, $map->enter_y) 2427 ($x, $y) = ($map->enter_x, $map->enter_y)
2328 if $x <=0 && $y <= 0; 2428 if $x <=0 && $y <= 0;
2329 2429
2330 $map->load; 2430 $map->load;
2331 $map->load_diag; 2431 $map->load_neighbours;
2332 2432
2333 return unless $self->contr->active; 2433 return unless $self->contr->active;
2334 $self->activate_recursive; 2434 $self->activate_recursive;
2335 2435
2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2436 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2356 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2456 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2357 2457
2358 $self->enter_link; 2458 $self->enter_link;
2359 2459
2360 (async { 2460 (async {
2461 $Coro::current->{desc} = "player::goto $path $x $y";
2462
2463 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs];
2467
2468 # see if we actually can go there
2469 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2470 $ob = $obs[rand @obs];
2471 } else {
2472 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2473 }
2474 # else put us there anyways for now #d#
2475
2476 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2477 } else {
2478 ($path, $x, $y) = (undef, undef, undef);
2479 }
2480 }
2481
2361 my $map = eval { 2482 my $map = eval {
2362 my $map = cf::map::find $path; 2483 my $map = defined $path ? cf::map::find $path : undef;
2363 2484
2364 if ($map) { 2485 if ($map) {
2365 $map = $map->customise_for ($self); 2486 $map = $map->customise_for ($self);
2366 $map = $check->($map) if $check && $map; 2487 $map = $check->($map) if $check && $map;
2367 } else { 2488 } else {
2368 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2489 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2369 } 2490 }
2370 2491
2371 $map 2492 $map
2372 }; 2493 };
2373 2494
… …
2463 # if exit is damned, update players death & WoR home-position 2584 # if exit is damned, update players death & WoR home-position
2464 $self->contr->savebed ($slaying, $hp, $sp) 2585 $self->contr->savebed ($slaying, $hp, $sp)
2465 if $exit->flag (FLAG_DAMNED); 2586 if $exit->flag (FLAG_DAMNED);
2466 2587
2467 (async { 2588 (async {
2589 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2590
2468 $self->deactivate_recursive; # just to be sure 2591 $self->deactivate_recursive; # just to be sure
2469 unless (eval { 2592 unless (eval {
2470 $self->goto ($slaying, $hp, $sp); 2593 $self->goto ($slaying, $hp, $sp);
2471 2594
2472 1; 2595 1;
… …
2507the message, with C<log> being the default. If C<$color> is negative, suppress 2630the message, with C<log> being the default. If C<$color> is negative, suppress
2508the message unless the client supports the msg packet. 2631the message unless the client supports the msg packet.
2509 2632
2510=cut 2633=cut
2511 2634
2635our %CHANNEL = (
2636 "c/identify" => {
2637 id => "infobox",
2638 title => "Identify",
2639 reply => undef,
2640 tooltip => "Items recently identified",
2641 },
2642 "c/examine" => {
2643 id => "infobox",
2644 title => "Examine",
2645 reply => undef,
2646 tooltip => "Signs and other items you examined",
2647 },
2648 "c/lookat" => {
2649 id => "infobox",
2650 title => "Look",
2651 reply => undef,
2652 tooltip => "What you saw there",
2653 },
2654);
2655
2512sub cf::client::send_msg { 2656sub cf::client::send_msg {
2513 my ($self, $channel, $msg, $color, @extra) = @_; 2657 my ($self, $channel, $msg, $color, @extra) = @_;
2514 2658
2515 $msg = $self->pl->expand_cfpod ($msg); 2659 $msg = $self->pl->expand_cfpod ($msg);
2516 2660
2517 $color &= ~cf::NDI_UNIQUE; # just in case... 2661 $color &= cf::NDI_CLIENT_MASK; # just in case...
2518 2662
2663 # check predefined channels, for the benefit of C
2664 if ($CHANNEL{$channel}) {
2665 $channel = $CHANNEL{$channel};
2666
2667 $self->ext_msg (channel_info => $channel)
2668 if $self->can_msg;
2669
2670 $channel = $channel->{id};
2671
2519 if (ref $channel) { 2672 } elsif (ref $channel) {
2520 # send meta info to client, if not yet sent 2673 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) { 2674 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel; 2675 $self->{channel}{$channel->{id}} = $channel;
2523 $self->ext_msg (channel_info => $channel); 2676 $self->ext_msg (channel_info => $channel)
2677 if $self->can_msg;
2524 } 2678 }
2525 2679
2526 $channel = $channel->{id}; 2680 $channel = $channel->{id};
2527 } 2681 }
2528 2682
2529 return unless @extra || length $msg; 2683 return unless @extra || length $msg;
2530 2684
2531 if ($self->can_msg) { 2685 if ($self->can_msg) {
2686 # default colour, mask it out
2687 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2688 if $color & cf::NDI_DEF;
2689
2532 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2690 $self->send_packet ("msg " . $self->{json_coder}->encode (
2691 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2533 } else { 2692 } 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) { 2693 if ($color >= 0) {
2694 # replace some tags by gcfclient-compatible ones
2695 for ($msg) {
2696 1 while
2697 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2698 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2699 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2700 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2701 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2702 }
2703
2704 $color &= cf::NDI_COLOR_MASK;
2705
2706 utf8::encode $msg;
2707
2545 if (0 && $msg =~ /\[/) { 2708 if (0 && $msg =~ /\[/) {
2709 # COMMAND/INFO
2546 $self->send_packet ("drawextinfo $color 4 0 $msg") 2710 $self->send_packet ("drawextinfo $color 10 8 $msg")
2547 } else { 2711 } else {
2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2712 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2549 $self->send_packet ("drawinfo $color $msg") 2713 $self->send_packet ("drawinfo $color $msg")
2550 } 2714 }
2551 } 2715 }
… …
2559=cut 2723=cut
2560 2724
2561sub cf::client::ext_msg($$@) { 2725sub cf::client::ext_msg($$@) {
2562 my ($self, $type, @msg) = @_; 2726 my ($self, $type, @msg) = @_;
2563 2727
2564 my $extcmd = $self->extcmd;
2565
2566 if ($extcmd == 2) { 2728 if ($self->extcmd == 2) {
2567 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2729 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2568 } elsif ($extcmd == 1) { # TODO: remove 2730 } elsif ($self->extcmd == 1) { # TODO: remove
2569 push @msg, msgtype => "event_$type"; 2731 push @msg, msgtype => "event_$type";
2732 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2733 }
2734}
2735
2736=item $client->ext_reply ($msgid, @msg)
2737
2738Sends an ext reply to the client.
2739
2740=cut
2741
2742sub cf::client::ext_reply($$@) {
2743 my ($self, $id, @msg) = @_;
2744
2745 if ($self->extcmd == 2) {
2746 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2747 } elsif ($self->extcmd == 1) {
2748 #TODO: version 1, remove
2749 unshift @msg, msgtype => "reply", msgid => $id;
2570 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2750 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2571 } 2751 }
2572} 2752}
2573 2753
2574=item $success = $client->query ($flags, "text", \&cb) 2754=item $success = $client->query ($flags, "text", \&cb)
… …
2636 my ($type, $reply, @payload) = 2816 my ($type, $reply, @payload) =
2637 "ARRAY" eq ref $msg 2817 "ARRAY" eq ref $msg
2638 ? @$msg 2818 ? @$msg
2639 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2819 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2640 2820
2821 my @reply;
2822
2641 if (my $cb = $EXTICMD{$type}) { 2823 if (my $cb = $EXTICMD{$type}) {
2642 my @reply = $cb->($ns, @payload); 2824 @reply = $cb->($ns, @payload);
2643
2644 $ns->ext_reply ($reply, @reply)
2645 if $reply;
2646 } 2825 }
2826
2827 $ns->ext_reply ($reply, @reply)
2828 if $reply;
2829
2647 } else { 2830 } else {
2648 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2831 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2649 } 2832 }
2650 2833
2651 cf::override; 2834 cf::override;
… …
2698our $safe = new Safe "safe"; 2881our $safe = new Safe "safe";
2699our $safe_hole = new Safe::Hole; 2882our $safe_hole = new Safe::Hole;
2700 2883
2701$SIG{FPE} = 'IGNORE'; 2884$SIG{FPE} = 'IGNORE';
2702 2885
2703$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2886$safe->permit_only (Opcode::opset qw(
2887 :base_core :base_mem :base_orig :base_math
2888 grepstart grepwhile mapstart mapwhile
2889 sort time
2890));
2704 2891
2705# here we export the classes and methods available to script code 2892# here we export the classes and methods available to script code
2706 2893
2707=pod 2894=pod
2708 2895
2709The following functions and methods are available within a safe environment: 2896The following functions and methods are available within a safe environment:
2710 2897
2711 cf::object 2898 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 2899 contr pay_amount pay_player map x y force_find force_add
2713 insert remove 2900 insert remove name archname title slaying race decrease_ob_nr
2714 2901
2715 cf::object::player 2902 cf::object::player
2716 player 2903 player
2717 2904
2718 cf::player 2905 cf::player
… …
2723 2910
2724=cut 2911=cut
2725 2912
2726for ( 2913for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2914 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2915 insert remove inv name archname title slaying race
2728 insert remove)], 2916 decrease_ob_nr)],
2729 ["cf::object::player" => qw(player)], 2917 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 2918 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 2919 ["cf::map" => qw(trigger)],
2732) { 2920) {
2733 no strict 'refs'; 2921 no strict 'refs';
… …
2809# the server's init and main functions 2997# the server's init and main functions
2810 2998
2811sub load_facedata($) { 2999sub load_facedata($) {
2812 my ($path) = @_; 3000 my ($path) = @_;
2813 3001
3002 # HACK to clear player env face cache, we need some signal framework
3003 # for this (global event?)
3004 %ext::player_env::MUSIC_FACE_CACHE = ();
3005
3006 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3007
2814 warn "loading facedata from $path\n"; 3008 warn "loading facedata from $path\n";
2815 3009
2816 my $facedata; 3010 my $facedata;
2817 0 < aio_load $path, $facedata 3011 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 3012 or die "$path: $!";
2819 3013
2820 $facedata = Coro::Storable::thaw $facedata; 3014 $facedata = Coro::Storable::thaw $facedata;
2821 3015
2822 $facedata->{version} == 2 3016 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 3017 or cf::cleanup "$path: version mismatch, cannot proceed.";
3018
3019 # patch in the exptable
3020 $facedata->{resource}{"res/exp_table"} = {
3021 type => FT_RSRC,
3022 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3023 };
3024 cf::cede_to_tick;
2824 3025
2825 { 3026 {
2826 my $faces = $facedata->{faceinfo}; 3027 my $faces = $facedata->{faceinfo};
2827 3028
2828 while (my ($face, $info) = each %$faces) { 3029 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3030 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2830 cf::face::set_visibility $idx, $info->{visibility}; 3031 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 3032 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3033 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3034 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 3035
2835 cf::cede_to_tick; 3036 cf::cede_to_tick;
2836 } 3037 }
2837 3038
2838 while (my ($face, $info) = each %$faces) { 3039 while (my ($face, $info) = each %$faces) {
… …
2863 3064
2864 { 3065 {
2865 # TODO: for gcfclient pleasure, we should give resources 3066 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 3067 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3068 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869 3069
2870 my $soundconf = delete $res->{"res/sound.conf"}; 3070 my $soundconf = delete $res->{"res/sound.conf"};
2871 3071
2872 while (my ($name, $info) = each %$res) { 3072 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; 3073 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3074 my $data;
2879 3075
2880 if ($info->{type} & 1) { 3076 if ($info->{type} & 1) {
2881 # prepend meta info 3077 # prepend meta info
2882 3078
3079 my $meta = $enc->encode ({
3080 name => $name,
3081 %{ $info->{meta} || {} },
3082 });
3083
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 3084 $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 { 3085 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3086 $data = $info->{data};
2889 } 3087 }
2890 3088
3089 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2891 cf::face::set_type $idx, $info->{type}; 3090 cf::face::set_type $idx, $info->{type};
2892 3091
2893 cf::cede_to_tick; 3092 cf::cede_to_tick;
2894 } 3093 }
2895 3094
… …
2899 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3098 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2900 my $sound = $soundconf->{compat}[$_] 3099 my $sound = $soundconf->{compat}[$_]
2901 or next; 3100 or next;
2902 3101
2903 my $face = cf::face::find "sound/$sound->[1]"; 3102 my $face = cf::face::find "sound/$sound->[1]";
2904 warn "$sound->[0]: $face\n";#d#
2905
2906 cf::sound::set $sound->[0] => $face; 3103 cf::sound::set $sound->[0] => $face;
2907 cf::sound::old_sound_index $_, $face; # gcfclient-compat 3104 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2908 } 3105 }
2909 3106
3107 while (my ($k, $v) = each %{$soundconf->{event}}) {
3108 my $face = cf::face::find "sound/$v";
3109 cf::sound::set $k => $face;
2910 #TODO 3110 }
2911 } 3111 }
2912 } 3112 }
2913 3113
2914 1 3114 1
2915} 3115}
… …
2921 $ns->fx_want ($k, $v); 3121 $ns->fx_want ($k, $v);
2922 } 3122 }
2923}; 3123};
2924 3124
2925sub reload_regions { 3125sub reload_regions {
3126 # HACK to clear player env face cache, we need some signal framework
3127 # for this (global event?)
3128 %ext::player_env::MUSIC_FACE_CACHE = ();
3129
2926 load_resource_file "$MAPDIR/regions" 3130 load_resource_file "$MAPDIR/regions"
2927 or die "unable to load regions file\n"; 3131 or die "unable to load regions file\n";
2928 3132
2929 for (cf::region::list) { 3133 for (cf::region::list) {
2930 $_->{match} = qr/$_->{match}/ 3134 $_->{match} = qr/$_->{match}/
… …
2966 3170
2967sub init { 3171sub init {
2968 reload_resources; 3172 reload_resources;
2969} 3173}
2970 3174
2971sub cfg_load { 3175sub reload_config {
2972 open my $fh, "<:utf8", "$CONFDIR/config" 3176 open my $fh, "<:utf8", "$CONFDIR/config"
2973 or return; 3177 or return;
2974 3178
2975 local $/; 3179 local $/;
2976 *CFG = YAML::Syck::Load <$fh>; 3180 *CFG = YAML::Syck::Load <$fh>;
… …
2992sub main { 3196sub main {
2993 # we must not ever block the main coroutine 3197 # we must not ever block the main coroutine
2994 local $Coro::idle = sub { 3198 local $Coro::idle = sub {
2995 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3199 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2996 (async { 3200 (async {
3201 $Coro::current->{desc} = "IDLE BUG HANDLER";
2997 Event::one_event; 3202 Event::one_event;
2998 })->prio (Coro::PRIO_MAX); 3203 })->prio (Coro::PRIO_MAX);
2999 }; 3204 };
3000 3205
3001 cfg_load; 3206 reload_config;
3002 db_init; 3207 db_init;
3003 load_extensions; 3208 load_extensions;
3004 3209
3005 $TICK_WATCHER->start; 3210 $TICK_WATCHER->start;
3006 Event::loop; 3211 Event::loop;
… …
3199 warn "reloading cf.pm"; 3404 warn "reloading cf.pm";
3200 require cf; 3405 require cf;
3201 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3406 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3202 3407
3203 warn "loading config and database again"; 3408 warn "loading config and database again";
3204 cf::cfg_load; 3409 cf::reload_config;
3205 3410
3206 warn "loading extensions"; 3411 warn "loading extensions";
3207 cf::load_extensions; 3412 cf::load_extensions;
3208 3413
3209 warn "reattaching attachments to objects/players"; 3414 warn "reattaching attachments to objects/players";
… …
3245register_command "reload" => sub { 3450register_command "reload" => sub {
3246 my ($who, $arg) = @_; 3451 my ($who, $arg) = @_;
3247 3452
3248 if ($who->flag (FLAG_WIZ)) { 3453 if ($who->flag (FLAG_WIZ)) {
3249 $who->message ("reloading server."); 3454 $who->message ("reloading server.");
3455 async {
3456 $Coro::current->{desc} = "perl_reload";
3250 async { reload_perl }; 3457 reload_perl;
3458 };
3251 } 3459 }
3252}; 3460};
3253 3461
3254unshift @INC, $LIBDIR; 3462unshift @INC, $LIBDIR;
3255 3463
… …
3274 my $signal = new Coro::Signal; 3482 my $signal = new Coro::Signal;
3275 push @WAIT_FOR_TICK_BEGIN, $signal; 3483 push @WAIT_FOR_TICK_BEGIN, $signal;
3276 $signal->wait; 3484 $signal->wait;
3277} 3485}
3278 3486
3279 my $min = 1e6;#d#
3280 my $avg = 10;
3281$TICK_WATCHER = Event->timer ( 3487$TICK_WATCHER = Event->timer (
3282 reentrant => 0, 3488 reentrant => 0,
3283 parked => 1, 3489 parked => 1,
3284 prio => 0, 3490 prio => 0,
3285 at => $NEXT_TICK || $TICK, 3491 at => $NEXT_TICK || $TICK,
… …
3293 3499
3294 $NOW = $tick_start = Event::time; 3500 $NOW = $tick_start = Event::time;
3295 3501
3296 cf::server_tick; # one server iteration 3502 cf::server_tick; # one server iteration
3297 3503
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; 3504 $RUNTIME += $TICK;
3322 $NEXT_TICK += $TICK; 3505 $NEXT_TICK += $TICK;
3323 3506
3324 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3507 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3325 $NEXT_RUNTIME_WRITE = $NOW + 10; 3508 $NEXT_RUNTIME_WRITE = $NOW + 10;
3326 Coro::async_pool { 3509 Coro::async_pool {
3510 $Coro::current->{desc} = "runtime saver";
3327 write_runtime 3511 write_runtime
3328 or warn "ERROR: unable to write runtime file: $!"; 3512 or warn "ERROR: unable to write runtime file: $!";
3329 }; 3513 };
3330 } 3514 }
3331 3515
3332# my $AFTER = Event::time;
3333# warn $AFTER - $NOW;#d#
3334
3335 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3516 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3336 $sig->send; 3517 $sig->send;
3337 } 3518 }
3338 while (my $sig = shift @WAIT_FOR_TICK) { 3519 while (my $sig = shift @WAIT_FOR_TICK) {
3339 $sig->send; 3520 $sig->send;
… …
3349 3530
3350 $LOAD = ($NOW - $tick_start) / $TICK; 3531 $LOAD = ($NOW - $tick_start) / $TICK;
3351 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3532 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3352 3533
3353 _post_tick; 3534 _post_tick;
3354
3355
3356 }, 3535 },
3357); 3536);
3358 3537
3359{ 3538{
3539 BDB::min_parallel 8;
3360 BDB::max_poll_time $TICK * 0.1; 3540 BDB::max_poll_time $TICK * 0.1;
3361 $BDB_POLL_WATCHER = Event->io ( 3541 $BDB_POLL_WATCHER = Event->io (
3362 reentrant => 0, 3542 reentrant => 0,
3363 fd => BDB::poll_fileno, 3543 fd => BDB::poll_fileno,
3364 poll => 'r', 3544 poll => 'r',
3365 prio => 0, 3545 prio => 0,
3366 data => WF_AUTOCANCEL, 3546 data => WF_AUTOCANCEL,
3367 cb => \&BDB::poll_cb, 3547 cb => \&BDB::poll_cb,
3368 ); 3548 );
3369 BDB::min_parallel 8;
3370 3549
3371 BDB::set_sync_prepare { 3550 BDB::set_sync_prepare {
3372 my $status; 3551 my $status;
3373 my $current = $Coro::current; 3552 my $current = $Coro::current;
3374 ( 3553 (
… …
3383 ) 3562 )
3384 }; 3563 };
3385 3564
3386 unless ($DB_ENV) { 3565 unless ($DB_ENV) {
3387 $DB_ENV = BDB::db_env_create; 3566 $DB_ENV = BDB::db_env_create;
3567 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3568 | BDB::LOG_AUTOREMOVE, 1);
3569 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3570 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3388 3571
3389 cf::sync_job { 3572 cf::sync_job {
3390 eval { 3573 eval {
3391 BDB::db_env_open 3574 BDB::db_env_open
3392 $DB_ENV, 3575 $DB_ENV,
… …
3394 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3577 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3395 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3578 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3396 0666; 3579 0666;
3397 3580
3398 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3581 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 }; 3582 };
3403 3583
3404 cf::cleanup "db_env_open(db): $@" if $@; 3584 cf::cleanup "db_env_open(db): $@" if $@;
3405 }; 3585 };
3406 } 3586 }
3587
3588 $BDB_DEADLOCK_WATCHER = Event->timer (
3589 after => 3,
3590 interval => 1,
3591 hard => 1,
3592 prio => 0,
3593 data => WF_AUTOCANCEL,
3594 cb => sub {
3595 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3596 },
3597 );
3598 $BDB_CHECKPOINT_WATCHER = Event->timer (
3599 after => 11,
3600 interval => 60,
3601 hard => 1,
3602 prio => 0,
3603 data => WF_AUTOCANCEL,
3604 cb => sub {
3605 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3606 },
3607 );
3608 $BDB_TRICKLE_WATCHER = Event->timer (
3609 after => 5,
3610 interval => 10,
3611 hard => 1,
3612 prio => 0,
3613 data => WF_AUTOCANCEL,
3614 cb => sub {
3615 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3616 },
3617 );
3407} 3618}
3408 3619
3409{ 3620{
3410 IO::AIO::min_parallel 8; 3621 IO::AIO::min_parallel 8;
3411 3622
… …
3414 $AIO_POLL_WATCHER = Event->io ( 3625 $AIO_POLL_WATCHER = Event->io (
3415 reentrant => 0, 3626 reentrant => 0,
3416 data => WF_AUTOCANCEL, 3627 data => WF_AUTOCANCEL,
3417 fd => IO::AIO::poll_fileno, 3628 fd => IO::AIO::poll_fileno,
3418 poll => 'r', 3629 poll => 'r',
3419 prio => 6, 3630 prio => 0,
3420 cb => \&IO::AIO::poll_cb, 3631 cb => \&IO::AIO::poll_cb,
3421 ); 3632 );
3422} 3633}
3423 3634
3424my $_log_backtrace; 3635my $_log_backtrace;
… …
3430 3641
3431 # limit the # of concurrent backtraces 3642 # limit the # of concurrent backtraces
3432 if ($_log_backtrace < 2) { 3643 if ($_log_backtrace < 2) {
3433 ++$_log_backtrace; 3644 ++$_log_backtrace;
3434 async { 3645 async {
3646 $Coro::current->{desc} = "abt $msg";
3647
3435 my @bt = fork_call { 3648 my @bt = fork_call {
3436 @addr = map { sprintf "%x", $_ } @addr; 3649 @addr = map { sprintf "%x", $_ } @addr;
3437 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3650 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3438 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3651 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3439 or die "addr2line: $!"; 3652 or die "addr2line: $!";

Diff Legend

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