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.315 by root, Mon Jul 23 17:53:55 2007 UTC vs.
Revision 1.378 by root, Thu Oct 4 11:36:54 2007 UTC

10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
79our $NEXT_TICK; 80our $NEXT_TICK;
80our $NOW; 81our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
82 83
83our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 88our $DB_ENV;
85 89
86our %CFG; 90our %CFG;
87 91
88our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 93our $RUNTIME;
90 94
91our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
94 98
95# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 101
186 $msg .= "\n" 190 $msg .= "\n"
187 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
188 192
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 194
191 utf8::encode $msg;
192 LOG llevError, $msg; 195 LOG llevError, $msg;
193 }; 196 };
194} 197}
195 198
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
271Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
274returned. 277returned.
275 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
276Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
278 284
279=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
280 286
281Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
282 288
283=cut 289=cut
284 290
285our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
286 293
287sub lock_wait($) { 294sub lock_wait($) {
288 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
289 301
290 # wait for lock, if any 302 # wait for lock, if any
291 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 305 Coro::schedule;
299 311
300 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
301 lock_wait $key; 313 lock_wait $key;
302 314
303 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
304 317
305 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
308 } 322 }
309} 323}
310 324
340our @SLOT_QUEUE; 354our @SLOT_QUEUE;
341our $SLOT_QUEUE; 355our $SLOT_QUEUE;
342 356
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
345 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
346 362
347 while () { 363 while () {
348 next_job: 364 next_job:
349 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
419 435
420 my $busy = 1; 436 my $busy = 1;
421 my @res; 437 my @res;
422 438
423 (async { 439 (async {
440 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 441 @res = eval { $job->() };
425 warn $@ if $@; 442 warn $@ if $@;
426 undef $busy; 443 undef $busy;
427 })->prio (Coro::PRIO_MAX); 444 })->prio (Coro::PRIO_MAX);
428 445
472Coro::Storable. May, of course, block. Note that the executed sub may 489Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 490never block itself or use any form of Event handling.
474 491
475=cut 492=cut
476 493
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485
486sub fork_call(&@) { 494sub fork_call(&@) {
487 my ($cb, @args) = @_; 495 my ($cb, @args) = @_;
488 496
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 497 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 498 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 499 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 500
494 if (my $pid = fork) { 501 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 502 reset_signals;
508 local $SIG{__WARN__}; 503 &$cb
509 local $SIG{__DIE__}; 504 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 505
516 eval { 506 wantarray ? @res : $res[-1]
517 close $fh1;
518
519 my @res = eval { $cb->(@args) };
520
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
523 };
524
525 warn $@ if $@;
526 _exit 0;
527 }
528} 507}
529 508
530=item $value = cf::db_get $family => $key 509=item $value = cf::db_get $family => $key
531 510
532Returns a single value from the environment database. 511Returns a single value from the environment database.
534=item cf::db_put $family => $key => $value 513=item cf::db_put $family => $key => $value
535 514
536Stores the given C<$value> in the family. It can currently store binary 515Stores the given C<$value> in the family. It can currently store binary
537data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 516data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 517
518=item $db = cf::db_table "name"
519
520Create and/or open a new database table. The string must not be "db" and must be unique
521within each server.
522
539=cut 523=cut
524
525sub db_table($) {
526 my ($name) = @_;
527 my $db = BDB::db_create $DB_ENV;
528
529 eval {
530 $db->set_flags (BDB::CHKSUM);
531
532 utf8::encode $name;
533 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
534 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
535 cf::cleanup "db_open(db): $!" if $!;
536 };
537 cf::cleanup "db_open(db): $@" if $@;
538
539 $db
540}
540 541
541our $DB; 542our $DB;
542 543
543sub db_init { 544sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 545 cf::sync_job {
548 eval { 546 $DB ||= db_table "db";
549 $DB->set_flags (BDB::CHKSUM);
550
551 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553 cf::cleanup "db_open(db): $!" if $!;
554 };
555 cf::cleanup "db_open(db): $@" if $@;
556 };
557 } 547 };
558} 548}
559 549
560sub db_get($$) { 550sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 551 my $key = "$_[0]/$_[1]";
562 552
612 if (1) { 602 if (1) {
613 $md5 = 603 $md5 =
614 join "\x00", 604 join "\x00",
615 $processversion, 605 $processversion,
616 map { 606 map {
617 Coro::cede; 607 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 608 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 609 } 0.. $#$src;
620 610
621 611
622 my $dbmd5 = db_get cache => "$id/md5"; 612 my $dbmd5 = db_get cache => "$id/md5";
1041sub object_freezer_save { 1031sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1032 my ($filename, $rdata, $objs) = @_;
1043 1033
1044 sync_job { 1034 sync_job {
1045 if (length $$rdata) { 1035 if (length $$rdata) {
1036 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1037 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1038 $decname, length $$rdata, scalar @$objs;
1048 1039
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1040 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1041 chmod SAVE_MODE, $fh;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1042 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1043 aio_fsync $fh if $cf::USE_FSYNC;
1071 } 1062 }
1072 } else { 1063 } else {
1073 aio_unlink $filename; 1064 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1065 aio_unlink "$filename.pst";
1075 } 1066 }
1076 } 1067 };
1077} 1068}
1078 1069
1079sub object_freezer_as_string { 1070sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1071 my ($rdata, $objs) = @_;
1081 1072
1093 or return; 1084 or return;
1094 1085
1095 unless (aio_stat "$filename.pst") { 1086 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1087 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1088 or return;
1089
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1090 $av = eval { (Storable::thaw $av)->{objs} };
1099 } 1091 }
1100 1092
1093 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1094 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1095 $decname, length $data, scalar @{$av || []};
1096
1103 return ($data, $av); 1097 ($data, $av)
1104} 1098}
1105 1099
1106=head2 COMMAND CALLBACKS 1100=head2 COMMAND CALLBACKS
1107 1101
1108=over 4 1102=over 4
1181 my ($pl, $buf) = @_; 1175 my ($pl, $buf) = @_;
1182 1176
1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1184 1178
1185 if (ref $msg) { 1179 if (ref $msg) {
1180 my ($type, $reply, @payload) =
1181 "ARRAY" eq ref $msg
1182 ? @$msg
1183 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1184
1185 my @reply;
1186
1186 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1187 if (my $cb = $EXTCMD{$type}) {
1187 if (my %reply = $cb->($pl, $msg)) { 1188 @reply = $cb->($pl, @payload);
1188 $pl->ext_reply ($msg->{msgid}, %reply);
1189 }
1190 } 1189 }
1190
1191 $pl->ext_reply ($reply, @reply)
1192 if $reply;
1193
1191 } else { 1194 } else {
1192 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1195 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1193 } 1196 }
1194 1197
1195 cf::override; 1198 cf::override;
1285 1288
1286=head3 cf::player 1289=head3 cf::player
1287 1290
1288=over 4 1291=over 4
1289 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
1290=item cf::player::find $login 1307=item cf::player::find $login
1291 1308
1292Returns the given player object, loading it if necessary (might block). 1309Returns the given player object, loading it if necessary (might block).
1293 1310
1294=cut 1311=cut
1329 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1346 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1330 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1347 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1331 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1348 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1332 aio_unlink +(playerdir $login) . "/$login.pl"; 1349 aio_unlink +(playerdir $login) . "/$login.pl";
1333 1350
1334 my $pl = load_pl path $login 1351 my $f = new_from_file cf::object::thawer path $login
1335 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;
1336 $cf::PLAYER{$login} = $pl 1358 $cf::PLAYER{$login} = $pl
1337 } 1359 }
1338 } 1360 }
1339} 1361}
1340 1362
1350 1372
1351 aio_mkdir playerdir $pl, 0770; 1373 aio_mkdir playerdir $pl, 0770;
1352 $pl->{last_save} = $cf::RUNTIME; 1374 $pl->{last_save} = $cf::RUNTIME;
1353 1375
1354 $pl->save_pl ($path); 1376 $pl->save_pl ($path);
1355 Coro::cede; 1377 cf::cede_to_tick;
1356} 1378}
1357 1379
1358sub new($) { 1380sub new($) {
1359 my ($login) = @_; 1381 my ($login) = @_;
1360 1382
1364 $self->{deny_save} = 1; 1386 $self->{deny_save} = 1;
1365 1387
1366 $cf::PLAYER{$login} = $self; 1388 $cf::PLAYER{$login} = $self;
1367 1389
1368 $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 (@_);
1369} 1401}
1370 1402
1371=item $pl->quit_character 1403=item $pl->quit_character
1372 1404
1373Nukes the player without looking back. If logged in, the connection will 1405Nukes the player without looking back. If logged in, the connection will
1428 or return []; 1460 or return [];
1429 1461
1430 my @logins; 1462 my @logins;
1431 1463
1432 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") {
1433 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1469 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1434 aio_read $fh, 0, 512, my $buf, 0 or next; 1470 aio_read $fh, 0, 512, my $buf, 0 or next;
1435 $buf !~ /^password -------------$/m or next; # official not-valid tag 1471 $buf !~ /^password -------------$/m or next; # official not-valid tag
1472 }
1436 1473
1437 utf8::decode $login; 1474 utf8::decode $login;
1438 push @logins, $login; 1475 push @logins, $login;
1439 } 1476 }
1440 1477
1478sub expand_cfpod { 1515sub expand_cfpod {
1479 ((my $self), (local $_)) = @_; 1516 ((my $self), (local $_)) = @_;
1480 1517
1481 # escape & and < 1518 # escape & and <
1482 s/&/&amp;/g; 1519 s/&/&amp;/g;
1483 s/(?<![BIUGH])</&lt;/g; 1520 s/(?<![BIUGHT])</&lt;/g;
1484 1521
1485 # 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
1486 1523
1487 1 while 1524 1 while
1488 # replace B<>, I<>, U<> etc. 1525 # replace B<>, I<>, U<> etc.
1489 s/B<([^\>]*)>/<b>$1<\/b>/ 1526 s/B<([^\>]*)>/<b>$1<\/b>/
1490 || s/I<([^\>]*)>/<i>$1<\/i>/ 1527 || s/I<([^\>]*)>/<i>$1<\/i>/
1491 || s/U<([^\>]*)>/<u>$1<\/u>/ 1528 || s/U<([^\>]*)>/<u>$1<\/u>/
1529 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1492 # replace G<male|female> tags 1530 # replace G<male|female> tags
1493 || s{G<([^>|]*)\|([^>]*)>}{ 1531 || s{G<([^>|]*)\|([^>]*)>}{
1494 $self->gender ? $2 : $1 1532 $self->gender ? $2 : $1
1495 }ge 1533 }ge
1496 # replace H<hint text> 1534 # replace H<hint text>
1517sub hintmode { 1555sub hintmode {
1518 $_[0]{hintmode} = $_[1] if @_ > 1; 1556 $_[0]{hintmode} = $_[1] if @_ > 1;
1519 $_[0]{hintmode} 1557 $_[0]{hintmode}
1520} 1558}
1521 1559
1522=item $player->ext_reply ($msgid, %msg) 1560=item $player->ext_reply ($msgid, @msg)
1523 1561
1524Sends an ext reply to the player. 1562Sends an ext reply to the player.
1525 1563
1526=cut 1564=cut
1527 1565
1528sub ext_reply($$%) { 1566sub ext_reply($$@) {
1529 my ($self, $id, %msg) = @_; 1567 my ($self, $id, @msg) = @_;
1530 1568
1531 $msg{msgid} = $id; 1569 $self->ns->ext_reply ($id, @msg)
1532 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1533} 1570}
1534 1571
1535=item $player->ext_event ($type, %msg) 1572=item $player->ext_msg ($type, @msg)
1536 1573
1537Sends an ext event to the client. 1574Sends an ext event to the client.
1538 1575
1539=cut 1576=cut
1540 1577
1541sub ext_event($$%) { 1578sub ext_msg($$@) {
1542 my ($self, $type, %msg) = @_; 1579 my ($self, $type, @msg) = @_;
1543 1580
1544 $self->ns->ext_event ($type, %msg); 1581 $self->ns->ext_msg ($type, @msg);
1545} 1582}
1546 1583
1547=head3 cf::region 1584=head3 cf::region
1548 1585
1549=over 4 1586=over 4
1765 1802
1766sub load_header_from($) { 1803sub load_header_from($) {
1767 my ($self, $path) = @_; 1804 my ($self, $path) = @_;
1768 1805
1769 utf8::encode $path; 1806 utf8::encode $path;
1770 #aio_open $path, O_RDONLY, 0 1807 my $f = new_from_file cf::object::thawer $path
1771 # or return;
1772
1773 $self->_load_header ($path)
1774 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;
1775 1815
1776 $self->{load_path} = $path; 1816 $self->{load_path} = $path;
1777 1817
1778 1 1818 1
1779} 1819}
1833sub find { 1873sub find {
1834 my ($path, $origin) = @_; 1874 my ($path, $origin) = @_;
1835 1875
1836 $path = normalise $path, $origin && $origin->path; 1876 $path = normalise $path, $origin && $origin->path;
1837 1877
1878 cf::lock_wait "map_data:$path";#d#remove
1838 cf::lock_wait "map_find:$path"; 1879 cf::lock_wait "map_find:$path";
1839 1880
1840 $cf::MAP{$path} || do { 1881 $cf::MAP{$path} || do {
1841 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
1842 my $map = new_from_path cf::map $path 1885 my $map = new_from_path cf::map $path
1843 or return; 1886 or return;
1844 1887
1845 $map->{last_save} = $cf::RUNTIME; 1888 $map->{last_save} = $cf::RUNTIME;
1846 1889
1848 or return; 1891 or return;
1849 1892
1850 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1893 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1851 # doing this can freeze the server in a sync job, obviously 1894 # doing this can freeze the server in a sync job, obviously
1852 #$cf::WAIT_FOR_TICK->wait; 1895 #$cf::WAIT_FOR_TICK->wait;
1896 undef $guard1;
1897 undef $guard2;
1853 $map->reset; 1898 $map->reset;
1854 undef $guard;
1855 return find $path; 1899 return find $path;
1856 } 1900 }
1857 1901
1858 $cf::MAP{$path} = $map 1902 $cf::MAP{$path} = $map
1859 } 1903 }
1868 local $self->{deny_reset} = 1; # loading can take a long time 1912 local $self->{deny_reset} = 1; # loading can take a long time
1869 1913
1870 my $path = $self->{path}; 1914 my $path = $self->{path};
1871 1915
1872 { 1916 {
1873 my $guard = cf::lock_acquire "map_load:$path"; 1917 my $guard = cf::lock_acquire "map_data:$path";
1874 1918
1919 return unless $self->valid;
1875 return if $self->in_memory != cf::MAP_SWAPPED; 1920 return unless $self->in_memory == cf::MAP_SWAPPED;
1876 1921
1877 $self->in_memory (cf::MAP_LOADING); 1922 $self->in_memory (cf::MAP_LOADING);
1878 1923
1879 $self->alloc; 1924 $self->alloc;
1880 1925
1881 $self->pre_load; 1926 $self->pre_load;
1882 Coro::cede; 1927 cf::cede_to_tick;
1883 1928
1929 my $f = new_from_file cf::object::thawer $self->{load_path};
1930 $f->skip_block;
1884 $self->_load_objects ($self->{load_path}, 1) 1931 $self->_load_objects ($f)
1885 or return; 1932 or return;
1886 1933
1887 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1934 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1888 if delete $self->{load_original}; 1935 if delete $self->{load_original};
1889 1936
1890 if (my $uniq = $self->uniq_path) { 1937 if (my $uniq = $self->uniq_path) {
1891 utf8::encode $uniq; 1938 utf8::encode $uniq;
1892 if (aio_open $uniq, O_RDONLY, 0) { 1939 unless (aio_stat $uniq) {
1940 if (my $f = new_from_file cf::object::thawer $uniq) {
1893 $self->clear_unique_items; 1941 $self->clear_unique_items;
1894 $self->_load_objects ($uniq, 0); 1942 $self->_load_objects ($f);
1943 $f->resolve_delayed_derefs;
1944 }
1895 } 1945 }
1896 } 1946 }
1897 1947
1898 Coro::cede; 1948 $f->resolve_delayed_derefs;
1949
1950 cf::cede_to_tick;
1899 # now do the right thing for maps 1951 # now do the right thing for maps
1900 $self->link_multipart_objects; 1952 $self->link_multipart_objects;
1901 $self->difficulty ($self->estimate_difficulty) 1953 $self->difficulty ($self->estimate_difficulty)
1902 unless $self->difficulty; 1954 unless $self->difficulty;
1903 Coro::cede; 1955 cf::cede_to_tick;
1904 1956
1905 unless ($self->{deny_activate}) { 1957 unless ($self->{deny_activate}) {
1906 $self->decay_objects; 1958 $self->decay_objects;
1907 $self->fix_auto_apply; 1959 $self->fix_auto_apply;
1908 $self->update_buttons; 1960 $self->update_buttons;
1909 Coro::cede; 1961 cf::cede_to_tick;
1910 $self->set_darkness_map; 1962 $self->set_darkness_map;
1911 Coro::cede; 1963 cf::cede_to_tick;
1912 $self->activate; 1964 $self->activate;
1913 } 1965 }
1966
1967 $self->{last_save} = $cf::RUNTIME;
1968 $self->last_access ($cf::RUNTIME);
1914 1969
1915 $self->in_memory (cf::MAP_IN_MEMORY); 1970 $self->in_memory (cf::MAP_IN_MEMORY);
1916 } 1971 }
1917 1972
1918 $self->post_load; 1973 $self->post_load;
1929 1984
1930 $self 1985 $self
1931} 1986}
1932 1987
1933# 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
1934sub load_diag { 1989sub load_neighbours {
1935 my ($map) = @_; 1990 my ($map) = @_;
1936 1991
1937 my @diag; # diagonal neighbours 1992 my @neigh; # diagonal neighbours
1938 1993
1939 for (0 .. 3) { 1994 for (0 .. 3) {
1940 my $neigh = $map->tile_path ($_) 1995 my $neigh = $map->tile_path ($_)
1941 or next; 1996 or next;
1942 $neigh = find $neigh, $map 1997 $neigh = find $neigh, $map
1943 or next; 1998 or next;
1944 $neigh->load; 1999 $neigh->load;
1945 2000
2001 push @neigh,
1946 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2002 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1947 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2003 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1948 } 2004 }
1949 2005
1950 for (@diag) { 2006 for (grep defined $_->[0], @neigh) {
2007 my ($path, $origin) = @$_;
1951 my $neigh = find @$_ 2008 my $neigh = find $path, $origin
1952 or next; 2009 or next;
1953 $neigh->load; 2010 $neigh->load;
1954 } 2011 }
1955} 2012}
1956 2013
1961} 2018}
1962 2019
1963sub do_load_sync { 2020sub do_load_sync {
1964 my ($map) = @_; 2021 my ($map) = @_;
1965 2022
2023 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2024 if $Coro::current == $Coro::main;
2025
1966 cf::sync_job { $map->load }; 2026 cf::sync_job { $map->load };
1967} 2027}
1968 2028
1969our %MAP_PREFETCH; 2029our %MAP_PREFETCH;
1970our $MAP_PREFETCHER = undef; 2030our $MAP_PREFETCHER = undef;
1971 2031
1972sub find_async { 2032sub find_async {
1973 my ($path, $origin) = @_; 2033 my ($path, $origin, $load) = @_;
1974 2034
1975 $path = normalise $path, $origin && $origin->{path}; 2035 $path = normalise $path, $origin && $origin->{path};
1976 2036
1977 if (my $map = $cf::MAP{$path}) { 2037 if (my $map = $cf::MAP{$path}) {
1978 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2038 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1979 } 2039 }
1980 2040
1981 undef $MAP_PREFETCH{$path}; 2041 $MAP_PREFETCH{$path} |= $load;
2042
1982 $MAP_PREFETCHER ||= cf::async { 2043 $MAP_PREFETCHER ||= cf::async {
2044 $Coro::current->{desc} = "map prefetcher";
2045
1983 while (%MAP_PREFETCH) { 2046 while (%MAP_PREFETCH) {
1984 for my $path (keys %MAP_PREFETCH) { 2047 while (my ($k, $v) = each %MAP_PREFETCH) {
1985 if (my $map = find $path) { 2048 if (my $map = find $k) {
1986 $map->load; 2049 $map->load if $v;
1987 } 2050 }
1988 2051
1989 delete $MAP_PREFETCH{$path}; 2052 delete $MAP_PREFETCH{$k};
1990 } 2053 }
1991 } 2054 }
1992 undef $MAP_PREFETCHER; 2055 undef $MAP_PREFETCHER;
1993 }; 2056 };
1994 $MAP_PREFETCHER->prio (6); 2057 $MAP_PREFETCHER->prio (6);
1997} 2060}
1998 2061
1999sub save { 2062sub save {
2000 my ($self) = @_; 2063 my ($self) = @_;
2001 2064
2002 my $lock = cf::lock_acquire "map_data:" . $self->path; 2065 my $lock = cf::lock_acquire "map_data:$self->{path}";
2003 2066
2004 $self->{last_save} = $cf::RUNTIME; 2067 $self->{last_save} = $cf::RUNTIME;
2005 2068
2006 return unless $self->dirty; 2069 return unless $self->dirty;
2007 2070
2013 return if $self->{deny_save}; 2076 return if $self->{deny_save};
2014 2077
2015 local $self->{last_access} = $self->last_access;#d# 2078 local $self->{last_access} = $self->last_access;#d#
2016 2079
2017 cf::async { 2080 cf::async {
2081 $Coro::current->{desc} = "map player save";
2018 $_->contr->save for $self->players; 2082 $_->contr->save for $self->players;
2019 }; 2083 };
2020 2084
2021 if ($uniq) { 2085 if ($uniq) {
2022 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2030 my ($self) = @_; 2094 my ($self) = @_;
2031 2095
2032 # save first because save cedes 2096 # save first because save cedes
2033 $self->save; 2097 $self->save;
2034 2098
2035 my $lock = cf::lock_acquire "map_data:" . $self->path; 2099 my $lock = cf::lock_acquire "map_data:$self->{path}";
2036 2100
2037 return if $self->players; 2101 return if $self->players;
2038 return if $self->in_memory != cf::MAP_IN_MEMORY; 2102 return if $self->in_memory != cf::MAP_IN_MEMORY;
2039 return if $self->{deny_save}; 2103 return if $self->{deny_save};
2040 2104
2105 $self->in_memory (cf::MAP_SWAPPED);
2106
2107 $self->deactivate;
2108 $_->clear_links_to ($self) for values %cf::MAP;
2041 $self->clear; 2109 $self->clear;
2042 $self->in_memory (cf::MAP_SWAPPED);
2043} 2110}
2044 2111
2045sub reset_at { 2112sub reset_at {
2046 my ($self) = @_; 2113 my ($self) = @_;
2047 2114
2079 if $uniq; 2146 if $uniq;
2080 } 2147 }
2081 2148
2082 delete $cf::MAP{$self->path}; 2149 delete $cf::MAP{$self->path};
2083 2150
2151 $self->deactivate;
2152 $_->clear_links_to ($self) for values %cf::MAP;
2084 $self->clear; 2153 $self->clear;
2085
2086 $_->clear_links_to ($self) for values %cf::MAP;
2087 2154
2088 $self->unlink_save; 2155 $self->unlink_save;
2089 $self->destroy; 2156 $self->destroy;
2090} 2157}
2091 2158
2092my $nuke_counter = "aaaa"; 2159my $nuke_counter = "aaaa";
2093 2160
2094sub nuke { 2161sub nuke {
2095 my ($self) = @_; 2162 my ($self) = @_;
2096 2163
2164 {
2165 my $lock = cf::lock_acquire "map_data:$self->{path}";
2166
2097 delete $cf::MAP{$self->path}; 2167 delete $cf::MAP{$self->path};
2098 2168
2099 $self->unlink_save; 2169 $self->unlink_save;
2100 2170
2101 bless $self, "cf::map"; 2171 bless $self, "cf::map";
2102 delete $self->{deny_reset}; 2172 delete $self->{deny_reset};
2103 $self->{deny_save} = 1; 2173 $self->{deny_save} = 1;
2104 $self->reset_timeout (1); 2174 $self->reset_timeout (1);
2105 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2175 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2106 2176
2107 $cf::MAP{$self->path} = $self; 2177 $cf::MAP{$self->path} = $self;
2178 }
2108 2179
2109 $self->reset; # polite request, might not happen 2180 $self->reset; # polite request, might not happen
2110} 2181}
2111 2182
2112=item $maps = cf::map::tmp_maps 2183=item $maps = cf::map::tmp_maps
2188 2259
2189sub inv_recursive { 2260sub inv_recursive {
2190 inv_recursive_ inv $_[0] 2261 inv_recursive_ inv $_[0]
2191} 2262}
2192 2263
2264=item $ref = $ob->ref
2265
2266creates and returns a persistent reference to an objetc that can be stored as a string.
2267
2268=item $ob = cf::object::deref ($refstring)
2269
2270returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2271even if the object actually exists. May block.
2272
2273=cut
2274
2275sub deref {
2276 my ($ref) = @_;
2277
2278 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2279 my ($uuid, $name) = ($1, $2);
2280 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2281 or return;
2282 $pl->ob->uuid eq $uuid
2283 or return;
2284
2285 $pl->ob
2286 } else {
2287 warn "$ref: cannot resolve object reference\n";
2288 undef
2289 }
2290}
2291
2193package cf; 2292package cf;
2194 2293
2195=back 2294=back
2196 2295
2197=head3 cf::object::player 2296=head3 cf::object::player
2219 2318
2220 } else { 2319 } else {
2221 my $pl = $self->contr; 2320 my $pl = $self->contr;
2222 2321
2223 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2322 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2224 my $diag = $pl->{npc_dialog}; 2323 my $dialog = $pl->{npc_dialog};
2225 $diag->{pl}->ext_reply ( 2324 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2226 $diag->{id},
2227 msgtype => "reply",
2228 msg => $diag->{pl}->expand_cfpod ($msg),
2229 add_topics => []
2230 );
2231 2325
2232 } else { 2326 } else {
2233 $msg = $npc->name . " says: $msg" if $npc; 2327 $msg = $npc->name . " says: $msg" if $npc;
2234 $self->message ($msg, $flags); 2328 $self->message ($msg, $flags);
2235 } 2329 }
2236 } 2330 }
2331}
2332
2333=item $object->send_msg ($channel, $msg, $color, [extra...])
2334
2335=cut
2336
2337sub cf::object::send_msg {
2338 my $pl = shift->contr
2339 or return;
2340 $pl->send_msg (@_);
2237} 2341}
2238 2342
2239=item $player_object->may ("access") 2343=item $player_object->may ("access")
2240 2344
2241Returns wether the given player is authorized to access resource "access" 2345Returns wether the given player is authorized to access resource "access"
2320 # use -1 or undef as default coordinates, not 0, 0 2424 # use -1 or undef as default coordinates, not 0, 0
2321 ($x, $y) = ($map->enter_x, $map->enter_y) 2425 ($x, $y) = ($map->enter_x, $map->enter_y)
2322 if $x <=0 && $y <= 0; 2426 if $x <=0 && $y <= 0;
2323 2427
2324 $map->load; 2428 $map->load;
2325 $map->load_diag; 2429 $map->load_neighbours;
2326 2430
2327 return unless $self->contr->active; 2431 return unless $self->contr->active;
2328 $self->activate_recursive; 2432 $self->activate_recursive;
2329 2433
2330 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2434 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2350 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2454 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2351 2455
2352 $self->enter_link; 2456 $self->enter_link;
2353 2457
2354 (async { 2458 (async {
2459 $Coro::current->{desc} = "player::goto $path $x $y";
2460
2461 # *tag paths override both path and x|y
2462 if ($path =~ /^\*(.*)$/) {
2463 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2464 my $ob = $obs[rand @obs];
2465
2466 # see if we actually can go there
2467 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2468 $ob = $obs[rand @obs];
2469 } else {
2470 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2471 }
2472 # else put us there anyways for now #d#
2473
2474 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2475 } else {
2476 ($path, $x, $y) = (undef, undef, undef);
2477 }
2478 }
2479
2355 my $map = eval { 2480 my $map = eval {
2356 my $map = cf::map::find $path; 2481 my $map = defined $path ? cf::map::find $path : undef;
2357 2482
2358 if ($map) { 2483 if ($map) {
2359 $map = $map->customise_for ($self); 2484 $map = $map->customise_for ($self);
2360 $map = $check->($map) if $check && $map; 2485 $map = $check->($map) if $check && $map;
2361 } else { 2486 } else {
2362 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2487 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2363 } 2488 }
2364 2489
2365 $map 2490 $map
2366 }; 2491 };
2367 2492
2457 # if exit is damned, update players death & WoR home-position 2582 # if exit is damned, update players death & WoR home-position
2458 $self->contr->savebed ($slaying, $hp, $sp) 2583 $self->contr->savebed ($slaying, $hp, $sp)
2459 if $exit->flag (FLAG_DAMNED); 2584 if $exit->flag (FLAG_DAMNED);
2460 2585
2461 (async { 2586 (async {
2587 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2588
2462 $self->deactivate_recursive; # just to be sure 2589 $self->deactivate_recursive; # just to be sure
2463 unless (eval { 2590 unless (eval {
2464 $self->goto ($slaying, $hp, $sp); 2591 $self->goto ($slaying, $hp, $sp);
2465 2592
2466 1; 2593 1;
2501the message, with C<log> being the default. If C<$color> is negative, suppress 2628the message, with C<log> being the default. If C<$color> is negative, suppress
2502the message unless the client supports the msg packet. 2629the message unless the client supports the msg packet.
2503 2630
2504=cut 2631=cut
2505 2632
2633our %CHANNEL = (
2634 "c/identify" => {
2635 id => "infobox",
2636 title => "Identify",
2637 reply => undef,
2638 tooltip => "Items recently identified",
2639 },
2640 "c/examine" => {
2641 id => "infobox",
2642 title => "Examine",
2643 reply => undef,
2644 tooltip => "Signs and other items you examined",
2645 },
2646 "c/lookat" => {
2647 id => "infobox",
2648 title => "Look",
2649 reply => undef,
2650 tooltip => "What you saw there",
2651 },
2652);
2653
2506sub cf::client::send_msg { 2654sub cf::client::send_msg {
2507 my ($self, $channel, $msg, $color, @extra) = @_; 2655 my ($self, $channel, $msg, $color, @extra) = @_;
2508 2656
2509 $msg = $self->pl->expand_cfpod ($msg); 2657 $msg = $self->pl->expand_cfpod ($msg);
2510 2658
2511 $color &= ~cf::NDI_UNIQUE; # just in case... 2659 $color &= cf::NDI_CLIENT_MASK; # just in case...
2512 2660
2661 # check predefined channels, for the benefit of C
2662 if ($CHANNEL{$channel}) {
2663 $channel = $CHANNEL{$channel};
2664
2665 $self->ext_msg (channel_info => $channel)
2666 if $self->can_msg;
2667
2668 $channel = $channel->{id};
2669
2513 if (ref $channel) { 2670 } elsif (ref $channel) {
2514 # send meta info to client, if not yet sent 2671 # send meta info to client, if not yet sent
2515 unless (exists $self->{channel}{$channel->{id}}) { 2672 unless (exists $self->{channel}{$channel->{id}}) {
2516 $self->{channel}{$channel->{id}} = $channel; 2673 $self->{channel}{$channel->{id}} = $channel;
2517 $self->ext_event (channel_info => %$channel); 2674 $self->ext_msg (channel_info => $channel)
2675 if $self->can_msg;
2518 } 2676 }
2519 2677
2520 $channel = $channel->{id}; 2678 $channel = $channel->{id};
2521 } 2679 }
2522 2680
2523 return unless @extra || length $msg; 2681 return unless @extra || length $msg;
2524 2682
2525 if ($self->can_msg) { 2683 if ($self->can_msg) {
2684 # default colour, mask it out
2685 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2686 if $color & cf::NDI_DEF;
2687
2526 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2688 $self->send_packet ("msg " . $self->{json_coder}->encode (
2689 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2527 } else { 2690 } else {
2528 # replace some tags by gcfclient-compatible ones
2529 for ($msg) {
2530 1 while
2531 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2532 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2533 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2534 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2535 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2536 }
2537
2538 if ($color >= 0) { 2691 if ($color >= 0) {
2692 # replace some tags by gcfclient-compatible ones
2693 for ($msg) {
2694 1 while
2695 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2696 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2697 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2698 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2699 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2700 }
2701
2702 $color &= cf::NDI_COLOR_MASK;
2703
2704 utf8::encode $msg;
2705
2539 if (0 && $msg =~ /\[/) { 2706 if (0 && $msg =~ /\[/) {
2707 # COMMAND/INFO
2540 $self->send_packet ("drawextinfo $color 4 0 $msg") 2708 $self->send_packet ("drawextinfo $color 10 8 $msg")
2541 } else { 2709 } else {
2542 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2710 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2543 $self->send_packet ("drawinfo $color $msg") 2711 $self->send_packet ("drawinfo $color $msg")
2544 } 2712 }
2545 } 2713 }
2546 } 2714 }
2547} 2715}
2548 2716
2549=item $client->ext_event ($type, %msg) 2717=item $client->ext_msg ($type, @msg)
2550 2718
2551Sends an ext event to the client. 2719Sends an ext event to the client.
2552 2720
2553=cut 2721=cut
2554 2722
2555sub cf::client::ext_event($$%) { 2723sub cf::client::ext_msg($$@) {
2556 my ($self, $type, %msg) = @_; 2724 my ($self, $type, @msg) = @_;
2557 2725
2558 return unless $self->extcmd; 2726 if ($self->extcmd == 2) {
2559 2727 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2728 } elsif ($self->extcmd == 1) { # TODO: remove
2560 $msg{msgtype} = "event_$type"; 2729 push @msg, msgtype => "event_$type";
2561 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2730 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2731 }
2732}
2733
2734=item $client->ext_reply ($msgid, @msg)
2735
2736Sends an ext reply to the client.
2737
2738=cut
2739
2740sub cf::client::ext_reply($$@) {
2741 my ($self, $id, @msg) = @_;
2742
2743 if ($self->extcmd == 2) {
2744 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2745 } elsif ($self->extcmd == 1) {
2746 #TODO: version 1, remove
2747 unshift @msg, msgtype => "reply", msgid => $id;
2748 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2749 }
2562} 2750}
2563 2751
2564=item $success = $client->query ($flags, "text", \&cb) 2752=item $success = $client->query ($flags, "text", \&cb)
2565 2753
2566Queues a query to the client, calling the given callback with 2754Queues a query to the client, calling the given callback with
2621 my ($ns, $buf) = @_; 2809 my ($ns, $buf) = @_;
2622 2810
2623 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2811 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2624 2812
2625 if (ref $msg) { 2813 if (ref $msg) {
2814 my ($type, $reply, @payload) =
2815 "ARRAY" eq ref $msg
2816 ? @$msg
2817 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2818
2819 my @reply;
2820
2626 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2821 if (my $cb = $EXTICMD{$type}) {
2627 if (my %reply = $cb->($ns, $msg)) { 2822 @reply = $cb->($ns, @payload);
2628 $reply{msgid} = $msg->{msgid};
2629 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2630 }
2631 } 2823 }
2824
2825 $ns->ext_reply ($reply, @reply)
2826 if $reply;
2827
2632 } else { 2828 } else {
2633 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2829 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2634 } 2830 }
2635 2831
2636 cf::override; 2832 cf::override;
2683our $safe = new Safe "safe"; 2879our $safe = new Safe "safe";
2684our $safe_hole = new Safe::Hole; 2880our $safe_hole = new Safe::Hole;
2685 2881
2686$SIG{FPE} = 'IGNORE'; 2882$SIG{FPE} = 'IGNORE';
2687 2883
2688$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2884$safe->permit_only (Opcode::opset qw(
2885 :base_core :base_mem :base_orig :base_math
2886 grepstart grepwhile mapstart mapwhile
2887 sort time
2888));
2689 2889
2690# here we export the classes and methods available to script code 2890# here we export the classes and methods available to script code
2691 2891
2692=pod 2892=pod
2693 2893
2694The following functions and methods are available within a safe environment: 2894The following functions and methods are available within a safe environment:
2695 2895
2696 cf::object 2896 cf::object
2697 contr pay_amount pay_player map x y force_find force_add 2897 contr pay_amount pay_player map x y force_find force_add
2698 insert remove 2898 insert remove name archname title slaying race decrease_ob_nr
2699 2899
2700 cf::object::player 2900 cf::object::player
2701 player 2901 player
2702 2902
2703 cf::player 2903 cf::player
2708 2908
2709=cut 2909=cut
2710 2910
2711for ( 2911for (
2712 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2912 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2913 insert remove inv name archname title slaying race
2713 insert remove)], 2914 decrease_ob_nr)],
2714 ["cf::object::player" => qw(player)], 2915 ["cf::object::player" => qw(player)],
2715 ["cf::player" => qw(peaceful)], 2916 ["cf::player" => qw(peaceful)],
2716 ["cf::map" => qw(trigger)], 2917 ["cf::map" => qw(trigger)],
2717) { 2918) {
2718 no strict 'refs'; 2919 no strict 'refs';
2794# the server's init and main functions 2995# the server's init and main functions
2795 2996
2796sub load_facedata($) { 2997sub load_facedata($) {
2797 my ($path) = @_; 2998 my ($path) = @_;
2798 2999
3000 # HACK to clear player env face cache, we need some signal framework
3001 # for this (global event?)
3002 %ext::player_env::MUSIC_FACE_CACHE = ();
3003
3004 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3005
2799 warn "loading facedata from $path\n"; 3006 warn "loading facedata from $path\n";
2800 3007
2801 my $facedata; 3008 my $facedata;
2802 0 < aio_load $path, $facedata 3009 0 < aio_load $path, $facedata
2803 or die "$path: $!"; 3010 or die "$path: $!";
2804 3011
2805 $facedata = Coro::Storable::thaw $facedata; 3012 $facedata = Coro::Storable::thaw $facedata;
2806 3013
2807 $facedata->{version} == 2 3014 $facedata->{version} == 2
2808 or cf::cleanup "$path: version mismatch, cannot proceed."; 3015 or cf::cleanup "$path: version mismatch, cannot proceed.";
3016
3017 # patch in the exptable
3018 $facedata->{resource}{"res/exp_table"} = {
3019 type => FT_RSRC,
3020 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3021 };
3022 cf::cede_to_tick;
2809 3023
2810 { 3024 {
2811 my $faces = $facedata->{faceinfo}; 3025 my $faces = $facedata->{faceinfo};
2812 3026
2813 while (my ($face, $info) = each %$faces) { 3027 while (my ($face, $info) = each %$faces) {
2814 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3028 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2815 cf::face::set_visibility $idx, $info->{visibility}; 3029 cf::face::set_visibility $idx, $info->{visibility};
2816 cf::face::set_magicmap $idx, $info->{magicmap}; 3030 cf::face::set_magicmap $idx, $info->{magicmap};
2817 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3031 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2818 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3032 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2819 3033
2820 cf::cede_to_tick; 3034 cf::cede_to_tick;
2821 } 3035 }
2822 3036
2823 while (my ($face, $info) = each %$faces) { 3037 while (my ($face, $info) = each %$faces) {
2848 3062
2849 { 3063 {
2850 # TODO: for gcfclient pleasure, we should give resources 3064 # TODO: for gcfclient pleasure, we should give resources
2851 # that gcfclient doesn't grok a >10000 face index. 3065 # that gcfclient doesn't grok a >10000 face index.
2852 my $res = $facedata->{resource}; 3066 my $res = $facedata->{resource};
2853 my $enc = JSON::XS->new->utf8->canonical; 3067
3068 my $soundconf = delete $res->{"res/sound.conf"};
2854 3069
2855 while (my ($name, $info) = each %$res) { 3070 while (my ($name, $info) = each %$res) {
2856 my $meta = $enc->encode ({
2857 name => $name,
2858 type => $info->{type},
2859 copyright => $info->{copyright}, #TODO#
2860 });
2861
2862 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3071 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3072 my $data;
2863 3073
2864 if ($name =~ /\.jpg$/) { 3074 if ($info->{type} & 1) {
2865 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3075 # prepend meta info
2866 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3076
3077 my $meta = $enc->encode ({
3078 name => $name,
3079 %{ $info->{meta} || {} },
3080 });
3081
3082 $data = pack "(w/a*)*", $meta, $info->{data};
2867 } else { 3083 } else {
2868 my $data = pack "(w/a*)*", $meta, $info->{data}; 3084 $data = $info->{data};
2869 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2870
2871 cf::face::set_type $idx, 1;
2872 cf::face::set_data $idx, 0, $data, $chk;
2873 } 3085 }
2874 3086
3087 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3088 cf::face::set_type $idx, $info->{type};
3089
2875 cf::cede_to_tick; 3090 cf::cede_to_tick;
2876 } 3091 }
3092
3093 if ($soundconf) {
3094 $soundconf = $enc->decode (delete $soundconf->{data});
3095
3096 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3097 my $sound = $soundconf->{compat}[$_]
3098 or next;
3099
3100 my $face = cf::face::find "sound/$sound->[1]";
3101 cf::sound::set $sound->[0] => $face;
3102 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3103 }
3104
3105 while (my ($k, $v) = each %{$soundconf->{event}}) {
3106 my $face = cf::face::find "sound/$v";
3107 cf::sound::set $k => $face;
3108 }
3109 }
2877 } 3110 }
2878 3111
2879 1 3112 1
2880} 3113}
2881 3114
3115register_exticmd fx_want => sub {
3116 my ($ns, $want) = @_;
3117
3118 while (my ($k, $v) = each %$want) {
3119 $ns->fx_want ($k, $v);
3120 }
3121};
3122
2882sub reload_regions { 3123sub reload_regions {
3124 # HACK to clear player env face cache, we need some signal framework
3125 # for this (global event?)
3126 %ext::player_env::MUSIC_FACE_CACHE = ();
3127
2883 load_resource_file "$MAPDIR/regions" 3128 load_resource_file "$MAPDIR/regions"
2884 or die "unable to load regions file\n"; 3129 or die "unable to load regions file\n";
2885 3130
2886 for (cf::region::list) { 3131 for (cf::region::list) {
2887 $_->{match} = qr/$_->{match}/ 3132 $_->{match} = qr/$_->{match}/
2923 3168
2924sub init { 3169sub init {
2925 reload_resources; 3170 reload_resources;
2926} 3171}
2927 3172
2928sub cfg_load { 3173sub reload_config {
2929 open my $fh, "<:utf8", "$CONFDIR/config" 3174 open my $fh, "<:utf8", "$CONFDIR/config"
2930 or return; 3175 or return;
2931 3176
2932 local $/; 3177 local $/;
2933 *CFG = YAML::Syck::Load <$fh>; 3178 *CFG = YAML::Syck::Load <$fh>;
2949sub main { 3194sub main {
2950 # we must not ever block the main coroutine 3195 # we must not ever block the main coroutine
2951 local $Coro::idle = sub { 3196 local $Coro::idle = sub {
2952 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3197 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2953 (async { 3198 (async {
3199 $Coro::current->{desc} = "IDLE BUG HANDLER";
2954 Event::one_event; 3200 Event::one_event;
2955 })->prio (Coro::PRIO_MAX); 3201 })->prio (Coro::PRIO_MAX);
2956 }; 3202 };
2957 3203
2958 cfg_load; 3204 reload_config;
2959 db_init; 3205 db_init;
2960 load_extensions; 3206 load_extensions;
2961 3207
2962 $TICK_WATCHER->start; 3208 $TICK_WATCHER->start;
2963 Event::loop; 3209 Event::loop;
3156 warn "reloading cf.pm"; 3402 warn "reloading cf.pm";
3157 require cf; 3403 require cf;
3158 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3404 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3159 3405
3160 warn "loading config and database again"; 3406 warn "loading config and database again";
3161 cf::cfg_load; 3407 cf::reload_config;
3162 3408
3163 warn "loading extensions"; 3409 warn "loading extensions";
3164 cf::load_extensions; 3410 cf::load_extensions;
3165 3411
3166 warn "reattaching attachments to objects/players"; 3412 warn "reattaching attachments to objects/players";
3202register_command "reload" => sub { 3448register_command "reload" => sub {
3203 my ($who, $arg) = @_; 3449 my ($who, $arg) = @_;
3204 3450
3205 if ($who->flag (FLAG_WIZ)) { 3451 if ($who->flag (FLAG_WIZ)) {
3206 $who->message ("reloading server."); 3452 $who->message ("reloading server.");
3453 async {
3454 $Coro::current->{desc} = "perl_reload";
3207 async { reload_perl }; 3455 reload_perl;
3456 };
3208 } 3457 }
3209}; 3458};
3210 3459
3211unshift @INC, $LIBDIR; 3460unshift @INC, $LIBDIR;
3212 3461
3231 my $signal = new Coro::Signal; 3480 my $signal = new Coro::Signal;
3232 push @WAIT_FOR_TICK_BEGIN, $signal; 3481 push @WAIT_FOR_TICK_BEGIN, $signal;
3233 $signal->wait; 3482 $signal->wait;
3234} 3483}
3235 3484
3236 my $min = 1e6;#d#
3237 my $avg = 10;
3238$TICK_WATCHER = Event->timer ( 3485$TICK_WATCHER = Event->timer (
3239 reentrant => 0, 3486 reentrant => 0,
3240 parked => 1, 3487 parked => 1,
3241 prio => 0, 3488 prio => 0,
3242 at => $NEXT_TICK || $TICK, 3489 at => $NEXT_TICK || $TICK,
3250 3497
3251 $NOW = $tick_start = Event::time; 3498 $NOW = $tick_start = Event::time;
3252 3499
3253 cf::server_tick; # one server iteration 3500 cf::server_tick; # one server iteration
3254 3501
3255 0 && sync_job {#d#
3256 for(1..10) {
3257 my $t = Event::time;
3258 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3259 or die;
3260
3261 $map->width (50);
3262 $map->height (50);
3263 $map->alloc;
3264 $map->_load_objects ("/tmp/x.map", 1);
3265 my $t = Event::time - $t;
3266
3267 #next unless $t < 0.0013;#d#
3268 if ($t < $min) {
3269 $min = $t;
3270 }
3271 $avg = $avg * 0.99 + $t * 0.01;
3272 }
3273 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3274 exit 0;
3275 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3276 };
3277
3278 $RUNTIME += $TICK; 3502 $RUNTIME += $TICK;
3279 $NEXT_TICK += $TICK; 3503 $NEXT_TICK += $TICK;
3280 3504
3281 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3505 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3282 $NEXT_RUNTIME_WRITE = $NOW + 10; 3506 $NEXT_RUNTIME_WRITE = $NOW + 10;
3283 Coro::async_pool { 3507 Coro::async_pool {
3508 $Coro::current->{desc} = "runtime saver";
3284 write_runtime 3509 write_runtime
3285 or warn "ERROR: unable to write runtime file: $!"; 3510 or warn "ERROR: unable to write runtime file: $!";
3286 }; 3511 };
3287 } 3512 }
3288 3513
3289# my $AFTER = Event::time;
3290# warn $AFTER - $NOW;#d#
3291
3292 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3514 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3293 $sig->send; 3515 $sig->send;
3294 } 3516 }
3295 while (my $sig = shift @WAIT_FOR_TICK) { 3517 while (my $sig = shift @WAIT_FOR_TICK) {
3296 $sig->send; 3518 $sig->send;
3306 3528
3307 $LOAD = ($NOW - $tick_start) / $TICK; 3529 $LOAD = ($NOW - $tick_start) / $TICK;
3308 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3530 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3309 3531
3310 _post_tick; 3532 _post_tick;
3311
3312
3313 }, 3533 },
3314); 3534);
3315 3535
3316{ 3536{
3537 BDB::min_parallel 8;
3317 BDB::max_poll_time $TICK * 0.1; 3538 BDB::max_poll_time $TICK * 0.1;
3318 $BDB_POLL_WATCHER = Event->io ( 3539 $BDB_POLL_WATCHER = Event->io (
3319 reentrant => 0, 3540 reentrant => 0,
3320 fd => BDB::poll_fileno, 3541 fd => BDB::poll_fileno,
3321 poll => 'r', 3542 poll => 'r',
3322 prio => 0, 3543 prio => 0,
3323 data => WF_AUTOCANCEL, 3544 data => WF_AUTOCANCEL,
3324 cb => \&BDB::poll_cb, 3545 cb => \&BDB::poll_cb,
3325 ); 3546 );
3326 BDB::min_parallel 8;
3327 3547
3328 BDB::set_sync_prepare { 3548 BDB::set_sync_prepare {
3329 my $status; 3549 my $status;
3330 my $current = $Coro::current; 3550 my $current = $Coro::current;
3331 ( 3551 (
3340 ) 3560 )
3341 }; 3561 };
3342 3562
3343 unless ($DB_ENV) { 3563 unless ($DB_ENV) {
3344 $DB_ENV = BDB::db_env_create; 3564 $DB_ENV = BDB::db_env_create;
3565 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3566 | BDB::LOG_AUTOREMOVE, 1);
3567 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3568 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3345 3569
3346 cf::sync_job { 3570 cf::sync_job {
3347 eval { 3571 eval {
3348 BDB::db_env_open 3572 BDB::db_env_open
3349 $DB_ENV, 3573 $DB_ENV,
3351 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3575 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3352 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3576 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3353 0666; 3577 0666;
3354 3578
3355 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3579 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3356
3357 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3358 $DB_ENV->set_lk_detect;
3359 }; 3580 };
3360 3581
3361 cf::cleanup "db_env_open(db): $@" if $@; 3582 cf::cleanup "db_env_open(db): $@" if $@;
3362 }; 3583 };
3363 } 3584 }
3585
3586 $BDB_DEADLOCK_WATCHER = Event->timer (
3587 after => 3,
3588 interval => 1,
3589 hard => 1,
3590 prio => 0,
3591 data => WF_AUTOCANCEL,
3592 cb => sub {
3593 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3594 },
3595 );
3596 $BDB_CHECKPOINT_WATCHER = Event->timer (
3597 after => 11,
3598 interval => 60,
3599 hard => 1,
3600 prio => 0,
3601 data => WF_AUTOCANCEL,
3602 cb => sub {
3603 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3604 },
3605 );
3606 $BDB_TRICKLE_WATCHER = Event->timer (
3607 after => 5,
3608 interval => 10,
3609 hard => 1,
3610 prio => 0,
3611 data => WF_AUTOCANCEL,
3612 cb => sub {
3613 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3614 },
3615 );
3364} 3616}
3365 3617
3366{ 3618{
3367 IO::AIO::min_parallel 8; 3619 IO::AIO::min_parallel 8;
3368 3620
3371 $AIO_POLL_WATCHER = Event->io ( 3623 $AIO_POLL_WATCHER = Event->io (
3372 reentrant => 0, 3624 reentrant => 0,
3373 data => WF_AUTOCANCEL, 3625 data => WF_AUTOCANCEL,
3374 fd => IO::AIO::poll_fileno, 3626 fd => IO::AIO::poll_fileno,
3375 poll => 'r', 3627 poll => 'r',
3376 prio => 6, 3628 prio => 0,
3377 cb => \&IO::AIO::poll_cb, 3629 cb => \&IO::AIO::poll_cb,
3378 ); 3630 );
3379} 3631}
3380 3632
3381my $_log_backtrace; 3633my $_log_backtrace;
3387 3639
3388 # limit the # of concurrent backtraces 3640 # limit the # of concurrent backtraces
3389 if ($_log_backtrace < 2) { 3641 if ($_log_backtrace < 2) {
3390 ++$_log_backtrace; 3642 ++$_log_backtrace;
3391 async { 3643 async {
3644 $Coro::current->{desc} = "abt $msg";
3645
3392 my @bt = fork_call { 3646 my @bt = fork_call {
3393 @addr = map { sprintf "%x", $_ } @addr; 3647 @addr = map { sprintf "%x", $_ } @addr;
3394 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3648 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3395 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3649 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3396 or die "addr2line: $!"; 3650 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines