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.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
1181 my ($pl, $buf) = @_; 1177 my ($pl, $buf) = @_;
1182 1178
1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1179 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1184 1180
1185 if (ref $msg) { 1181 if (ref $msg) {
1182 my ($type, $reply, @payload) =
1183 "ARRAY" eq ref $msg
1184 ? @$msg
1185 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1186
1187 my @reply;
1188
1186 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1189 if (my $cb = $EXTCMD{$type}) {
1187 if (my %reply = $cb->($pl, $msg)) { 1190 @reply = $cb->($pl, @payload);
1188 $pl->ext_reply ($msg->{msgid}, %reply);
1189 }
1190 } 1191 }
1192
1193 $pl->ext_reply ($reply, @reply)
1194 if $reply;
1195
1191 } else { 1196 } else {
1192 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1197 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1193 } 1198 }
1194 1199
1195 cf::override; 1200 cf::override;
1285 1290
1286=head3 cf::player 1291=head3 cf::player
1287 1292
1288=over 4 1293=over 4
1289 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
1290=item cf::player::find $login 1309=item cf::player::find $login
1291 1310
1292Returns the given player object, loading it if necessary (might block). 1311Returns the given player object, loading it if necessary (might block).
1293 1312
1294=cut 1313=cut
1329 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1348 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1330 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1349 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1331 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1350 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1332 aio_unlink +(playerdir $login) . "/$login.pl"; 1351 aio_unlink +(playerdir $login) . "/$login.pl";
1333 1352
1334 my $pl = load_pl path $login 1353 my $f = new_from_file cf::object::thawer path $login
1335 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;
1336 $cf::PLAYER{$login} = $pl 1360 $cf::PLAYER{$login} = $pl
1337 } 1361 }
1338 } 1362 }
1339} 1363}
1340 1364
1350 1374
1351 aio_mkdir playerdir $pl, 0770; 1375 aio_mkdir playerdir $pl, 0770;
1352 $pl->{last_save} = $cf::RUNTIME; 1376 $pl->{last_save} = $cf::RUNTIME;
1353 1377
1354 $pl->save_pl ($path); 1378 $pl->save_pl ($path);
1355 Coro::cede; 1379 cf::cede_to_tick;
1356} 1380}
1357 1381
1358sub new($) { 1382sub new($) {
1359 my ($login) = @_; 1383 my ($login) = @_;
1360 1384
1364 $self->{deny_save} = 1; 1388 $self->{deny_save} = 1;
1365 1389
1366 $cf::PLAYER{$login} = $self; 1390 $cf::PLAYER{$login} = $self;
1367 1391
1368 $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 (@_);
1369} 1403}
1370 1404
1371=item $pl->quit_character 1405=item $pl->quit_character
1372 1406
1373Nukes the player without looking back. If logged in, the connection will 1407Nukes the player without looking back. If logged in, the connection will
1428 or return []; 1462 or return [];
1429 1463
1430 my @logins; 1464 my @logins;
1431 1465
1432 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") {
1433 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1471 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1434 aio_read $fh, 0, 512, my $buf, 0 or next; 1472 aio_read $fh, 0, 512, my $buf, 0 or next;
1435 $buf !~ /^password -------------$/m or next; # official not-valid tag 1473 $buf !~ /^password -------------$/m or next; # official not-valid tag
1474 }
1436 1475
1437 utf8::decode $login; 1476 utf8::decode $login;
1438 push @logins, $login; 1477 push @logins, $login;
1439 } 1478 }
1440 1479
1478sub expand_cfpod { 1517sub expand_cfpod {
1479 ((my $self), (local $_)) = @_; 1518 ((my $self), (local $_)) = @_;
1480 1519
1481 # escape & and < 1520 # escape & and <
1482 s/&/&amp;/g; 1521 s/&/&amp;/g;
1483 s/(?<![BIUGH])</&lt;/g; 1522 s/(?<![BIUGHT])</&lt;/g;
1484 1523
1485 # 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
1486 1525
1487 1 while 1526 1 while
1488 # replace B<>, I<>, U<> etc. 1527 # replace B<>, I<>, U<> etc.
1489 s/B<([^\>]*)>/<b>$1<\/b>/ 1528 s/B<([^\>]*)>/<b>$1<\/b>/
1490 || s/I<([^\>]*)>/<i>$1<\/i>/ 1529 || s/I<([^\>]*)>/<i>$1<\/i>/
1491 || s/U<([^\>]*)>/<u>$1<\/u>/ 1530 || s/U<([^\>]*)>/<u>$1<\/u>/
1531 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1492 # replace G<male|female> tags 1532 # replace G<male|female> tags
1493 || s{G<([^>|]*)\|([^>]*)>}{ 1533 || s{G<([^>|]*)\|([^>]*)>}{
1494 $self->gender ? $2 : $1 1534 $self->gender ? $2 : $1
1495 }ge 1535 }ge
1496 # replace H<hint text> 1536 # replace H<hint text>
1517sub hintmode { 1557sub hintmode {
1518 $_[0]{hintmode} = $_[1] if @_ > 1; 1558 $_[0]{hintmode} = $_[1] if @_ > 1;
1519 $_[0]{hintmode} 1559 $_[0]{hintmode}
1520} 1560}
1521 1561
1522=item $player->ext_reply ($msgid, %msg) 1562=item $player->ext_reply ($msgid, @msg)
1523 1563
1524Sends an ext reply to the player. 1564Sends an ext reply to the player.
1525 1565
1526=cut 1566=cut
1527 1567
1528sub ext_reply($$%) { 1568sub ext_reply($$@) {
1529 my ($self, $id, %msg) = @_; 1569 my ($self, $id, @msg) = @_;
1530 1570
1531 $msg{msgid} = $id; 1571 $self->ns->ext_reply ($id, @msg)
1532 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1533} 1572}
1534 1573
1535=item $player->ext_event ($type, %msg) 1574=item $player->ext_msg ($type, @msg)
1536 1575
1537Sends an ext event to the client. 1576Sends an ext event to the client.
1538 1577
1539=cut 1578=cut
1540 1579
1541sub ext_event($$%) { 1580sub ext_msg($$@) {
1542 my ($self, $type, %msg) = @_; 1581 my ($self, $type, @msg) = @_;
1543 1582
1544 $self->ns->ext_event ($type, %msg); 1583 $self->ns->ext_msg ($type, @msg);
1545} 1584}
1546 1585
1547=head3 cf::region 1586=head3 cf::region
1548 1587
1549=over 4 1588=over 4
1765 1804
1766sub load_header_from($) { 1805sub load_header_from($) {
1767 my ($self, $path) = @_; 1806 my ($self, $path) = @_;
1768 1807
1769 utf8::encode $path; 1808 utf8::encode $path;
1770 #aio_open $path, O_RDONLY, 0 1809 my $f = new_from_file cf::object::thawer $path
1771 # or return;
1772
1773 $self->_load_header ($path)
1774 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;
1775 1817
1776 $self->{load_path} = $path; 1818 $self->{load_path} = $path;
1777 1819
1778 1 1820 1
1779} 1821}
1833sub find { 1875sub find {
1834 my ($path, $origin) = @_; 1876 my ($path, $origin) = @_;
1835 1877
1836 $path = normalise $path, $origin && $origin->path; 1878 $path = normalise $path, $origin && $origin->path;
1837 1879
1880 cf::lock_wait "map_data:$path";#d#remove
1838 cf::lock_wait "map_find:$path"; 1881 cf::lock_wait "map_find:$path";
1839 1882
1840 $cf::MAP{$path} || do { 1883 $cf::MAP{$path} || do {
1841 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
1842 my $map = new_from_path cf::map $path 1887 my $map = new_from_path cf::map $path
1843 or return; 1888 or return;
1844 1889
1845 $map->{last_save} = $cf::RUNTIME; 1890 $map->{last_save} = $cf::RUNTIME;
1846 1891
1848 or return; 1893 or return;
1849 1894
1850 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1895 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1851 # doing this can freeze the server in a sync job, obviously 1896 # doing this can freeze the server in a sync job, obviously
1852 #$cf::WAIT_FOR_TICK->wait; 1897 #$cf::WAIT_FOR_TICK->wait;
1898 undef $guard1;
1899 undef $guard2;
1853 $map->reset; 1900 $map->reset;
1854 undef $guard;
1855 return find $path; 1901 return find $path;
1856 } 1902 }
1857 1903
1858 $cf::MAP{$path} = $map 1904 $cf::MAP{$path} = $map
1859 } 1905 }
1868 local $self->{deny_reset} = 1; # loading can take a long time 1914 local $self->{deny_reset} = 1; # loading can take a long time
1869 1915
1870 my $path = $self->{path}; 1916 my $path = $self->{path};
1871 1917
1872 { 1918 {
1873 my $guard = cf::lock_acquire "map_load:$path"; 1919 my $guard = cf::lock_acquire "map_data:$path";
1874 1920
1921 return unless $self->valid;
1875 return if $self->in_memory != cf::MAP_SWAPPED; 1922 return unless $self->in_memory == cf::MAP_SWAPPED;
1876 1923
1877 $self->in_memory (cf::MAP_LOADING); 1924 $self->in_memory (cf::MAP_LOADING);
1878 1925
1879 $self->alloc; 1926 $self->alloc;
1880 1927
1881 $self->pre_load; 1928 $self->pre_load;
1882 Coro::cede; 1929 cf::cede_to_tick;
1883 1930
1931 my $f = new_from_file cf::object::thawer $self->{load_path};
1932 $f->skip_block;
1884 $self->_load_objects ($self->{load_path}, 1) 1933 $self->_load_objects ($f)
1885 or return; 1934 or return;
1886 1935
1887 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1936 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1888 if delete $self->{load_original}; 1937 if delete $self->{load_original};
1889 1938
1890 if (my $uniq = $self->uniq_path) { 1939 if (my $uniq = $self->uniq_path) {
1891 utf8::encode $uniq; 1940 utf8::encode $uniq;
1892 if (aio_open $uniq, O_RDONLY, 0) { 1941 unless (aio_stat $uniq) {
1942 if (my $f = new_from_file cf::object::thawer $uniq) {
1893 $self->clear_unique_items; 1943 $self->clear_unique_items;
1894 $self->_load_objects ($uniq, 0); 1944 $self->_load_objects ($f);
1945 $f->resolve_delayed_derefs;
1946 }
1895 } 1947 }
1896 } 1948 }
1897 1949
1898 Coro::cede; 1950 $f->resolve_delayed_derefs;
1951
1952 cf::cede_to_tick;
1899 # now do the right thing for maps 1953 # now do the right thing for maps
1900 $self->link_multipart_objects; 1954 $self->link_multipart_objects;
1901 $self->difficulty ($self->estimate_difficulty) 1955 $self->difficulty ($self->estimate_difficulty)
1902 unless $self->difficulty; 1956 unless $self->difficulty;
1903 Coro::cede; 1957 cf::cede_to_tick;
1904 1958
1905 unless ($self->{deny_activate}) { 1959 unless ($self->{deny_activate}) {
1906 $self->decay_objects; 1960 $self->decay_objects;
1907 $self->fix_auto_apply; 1961 $self->fix_auto_apply;
1908 $self->update_buttons; 1962 $self->update_buttons;
1909 Coro::cede; 1963 cf::cede_to_tick;
1910 $self->set_darkness_map; 1964 $self->set_darkness_map;
1911 Coro::cede; 1965 cf::cede_to_tick;
1912 $self->activate; 1966 $self->activate;
1913 } 1967 }
1968
1969 $self->{last_save} = $cf::RUNTIME;
1970 $self->last_access ($cf::RUNTIME);
1914 1971
1915 $self->in_memory (cf::MAP_IN_MEMORY); 1972 $self->in_memory (cf::MAP_IN_MEMORY);
1916 } 1973 }
1917 1974
1918 $self->post_load; 1975 $self->post_load;
1929 1986
1930 $self 1987 $self
1931} 1988}
1932 1989
1933# 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
1934sub load_diag { 1991sub load_neighbours {
1935 my ($map) = @_; 1992 my ($map) = @_;
1936 1993
1937 my @diag; # diagonal neighbours 1994 my @neigh; # diagonal neighbours
1938 1995
1939 for (0 .. 3) { 1996 for (0 .. 3) {
1940 my $neigh = $map->tile_path ($_) 1997 my $neigh = $map->tile_path ($_)
1941 or next; 1998 or next;
1942 $neigh = find $neigh, $map 1999 $neigh = find $neigh, $map
1943 or next; 2000 or next;
1944 $neigh->load; 2001 $neigh->load;
1945 2002
2003 push @neigh,
1946 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2004 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1947 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2005 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1948 } 2006 }
1949 2007
1950 for (@diag) { 2008 for (grep defined $_->[0], @neigh) {
2009 my ($path, $origin) = @$_;
1951 my $neigh = find @$_ 2010 my $neigh = find $path, $origin
1952 or next; 2011 or next;
1953 $neigh->load; 2012 $neigh->load;
1954 } 2013 }
1955} 2014}
1956 2015
1961} 2020}
1962 2021
1963sub do_load_sync { 2022sub do_load_sync {
1964 my ($map) = @_; 2023 my ($map) = @_;
1965 2024
2025 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2026 if $Coro::current == $Coro::main;
2027
1966 cf::sync_job { $map->load }; 2028 cf::sync_job { $map->load };
1967} 2029}
1968 2030
1969our %MAP_PREFETCH; 2031our %MAP_PREFETCH;
1970our $MAP_PREFETCHER = undef; 2032our $MAP_PREFETCHER = undef;
1971 2033
1972sub find_async { 2034sub find_async {
1973 my ($path, $origin) = @_; 2035 my ($path, $origin, $load) = @_;
1974 2036
1975 $path = normalise $path, $origin && $origin->{path}; 2037 $path = normalise $path, $origin && $origin->{path};
1976 2038
1977 if (my $map = $cf::MAP{$path}) { 2039 if (my $map = $cf::MAP{$path}) {
1978 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2040 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1979 } 2041 }
1980 2042
1981 undef $MAP_PREFETCH{$path}; 2043 $MAP_PREFETCH{$path} |= $load;
2044
1982 $MAP_PREFETCHER ||= cf::async { 2045 $MAP_PREFETCHER ||= cf::async {
2046 $Coro::current->{desc} = "map prefetcher";
2047
1983 while (%MAP_PREFETCH) { 2048 while (%MAP_PREFETCH) {
1984 for my $path (keys %MAP_PREFETCH) { 2049 while (my ($k, $v) = each %MAP_PREFETCH) {
1985 if (my $map = find $path) { 2050 if (my $map = find $k) {
1986 $map->load; 2051 $map->load if $v;
1987 } 2052 }
1988 2053
1989 delete $MAP_PREFETCH{$path}; 2054 delete $MAP_PREFETCH{$k};
1990 } 2055 }
1991 } 2056 }
1992 undef $MAP_PREFETCHER; 2057 undef $MAP_PREFETCHER;
1993 }; 2058 };
1994 $MAP_PREFETCHER->prio (6); 2059 $MAP_PREFETCHER->prio (6);
1997} 2062}
1998 2063
1999sub save { 2064sub save {
2000 my ($self) = @_; 2065 my ($self) = @_;
2001 2066
2002 my $lock = cf::lock_acquire "map_data:" . $self->path; 2067 my $lock = cf::lock_acquire "map_data:$self->{path}";
2003 2068
2004 $self->{last_save} = $cf::RUNTIME; 2069 $self->{last_save} = $cf::RUNTIME;
2005 2070
2006 return unless $self->dirty; 2071 return unless $self->dirty;
2007 2072
2013 return if $self->{deny_save}; 2078 return if $self->{deny_save};
2014 2079
2015 local $self->{last_access} = $self->last_access;#d# 2080 local $self->{last_access} = $self->last_access;#d#
2016 2081
2017 cf::async { 2082 cf::async {
2083 $Coro::current->{desc} = "map player save";
2018 $_->contr->save for $self->players; 2084 $_->contr->save for $self->players;
2019 }; 2085 };
2020 2086
2021 if ($uniq) { 2087 if ($uniq) {
2022 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2030 my ($self) = @_; 2096 my ($self) = @_;
2031 2097
2032 # save first because save cedes 2098 # save first because save cedes
2033 $self->save; 2099 $self->save;
2034 2100
2035 my $lock = cf::lock_acquire "map_data:" . $self->path; 2101 my $lock = cf::lock_acquire "map_data:$self->{path}";
2036 2102
2037 return if $self->players; 2103 return if $self->players;
2038 return if $self->in_memory != cf::MAP_IN_MEMORY; 2104 return if $self->in_memory != cf::MAP_IN_MEMORY;
2039 return if $self->{deny_save}; 2105 return if $self->{deny_save};
2040 2106
2107 $self->in_memory (cf::MAP_SWAPPED);
2108
2109 $self->deactivate;
2110 $_->clear_links_to ($self) for values %cf::MAP;
2041 $self->clear; 2111 $self->clear;
2042 $self->in_memory (cf::MAP_SWAPPED);
2043} 2112}
2044 2113
2045sub reset_at { 2114sub reset_at {
2046 my ($self) = @_; 2115 my ($self) = @_;
2047 2116
2079 if $uniq; 2148 if $uniq;
2080 } 2149 }
2081 2150
2082 delete $cf::MAP{$self->path}; 2151 delete $cf::MAP{$self->path};
2083 2152
2153 $self->deactivate;
2154 $_->clear_links_to ($self) for values %cf::MAP;
2084 $self->clear; 2155 $self->clear;
2085
2086 $_->clear_links_to ($self) for values %cf::MAP;
2087 2156
2088 $self->unlink_save; 2157 $self->unlink_save;
2089 $self->destroy; 2158 $self->destroy;
2090} 2159}
2091 2160
2092my $nuke_counter = "aaaa"; 2161my $nuke_counter = "aaaa";
2093 2162
2094sub nuke { 2163sub nuke {
2095 my ($self) = @_; 2164 my ($self) = @_;
2096 2165
2166 {
2167 my $lock = cf::lock_acquire "map_data:$self->{path}";
2168
2097 delete $cf::MAP{$self->path}; 2169 delete $cf::MAP{$self->path};
2098 2170
2099 $self->unlink_save; 2171 $self->unlink_save;
2100 2172
2101 bless $self, "cf::map"; 2173 bless $self, "cf::map";
2102 delete $self->{deny_reset}; 2174 delete $self->{deny_reset};
2103 $self->{deny_save} = 1; 2175 $self->{deny_save} = 1;
2104 $self->reset_timeout (1); 2176 $self->reset_timeout (1);
2105 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2177 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2106 2178
2107 $cf::MAP{$self->path} = $self; 2179 $cf::MAP{$self->path} = $self;
2180 }
2108 2181
2109 $self->reset; # polite request, might not happen 2182 $self->reset; # polite request, might not happen
2110} 2183}
2111 2184
2112=item $maps = cf::map::tmp_maps 2185=item $maps = cf::map::tmp_maps
2188 2261
2189sub inv_recursive { 2262sub inv_recursive {
2190 inv_recursive_ inv $_[0] 2263 inv_recursive_ inv $_[0]
2191} 2264}
2192 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
2193package cf; 2294package cf;
2194 2295
2195=back 2296=back
2196 2297
2197=head3 cf::object::player 2298=head3 cf::object::player
2219 2320
2220 } else { 2321 } else {
2221 my $pl = $self->contr; 2322 my $pl = $self->contr;
2222 2323
2223 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2324 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2224 my $diag = $pl->{npc_dialog}; 2325 my $dialog = $pl->{npc_dialog};
2225 $diag->{pl}->ext_reply ( 2326 $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 2327
2232 } else { 2328 } else {
2233 $msg = $npc->name . " says: $msg" if $npc; 2329 $msg = $npc->name . " says: $msg" if $npc;
2234 $self->message ($msg, $flags); 2330 $self->message ($msg, $flags);
2235 } 2331 }
2236 } 2332 }
2333}
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 (@_);
2237} 2343}
2238 2344
2239=item $player_object->may ("access") 2345=item $player_object->may ("access")
2240 2346
2241Returns wether the given player is authorized to access resource "access" 2347Returns wether the given player is authorized to access resource "access"
2320 # use -1 or undef as default coordinates, not 0, 0 2426 # use -1 or undef as default coordinates, not 0, 0
2321 ($x, $y) = ($map->enter_x, $map->enter_y) 2427 ($x, $y) = ($map->enter_x, $map->enter_y)
2322 if $x <=0 && $y <= 0; 2428 if $x <=0 && $y <= 0;
2323 2429
2324 $map->load; 2430 $map->load;
2325 $map->load_diag; 2431 $map->load_neighbours;
2326 2432
2327 return unless $self->contr->active; 2433 return unless $self->contr->active;
2328 $self->activate_recursive; 2434 $self->activate_recursive;
2329 2435
2330 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2436 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2350 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2456 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2351 2457
2352 $self->enter_link; 2458 $self->enter_link;
2353 2459
2354 (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
2355 my $map = eval { 2482 my $map = eval {
2356 my $map = cf::map::find $path; 2483 my $map = defined $path ? cf::map::find $path : undef;
2357 2484
2358 if ($map) { 2485 if ($map) {
2359 $map = $map->customise_for ($self); 2486 $map = $map->customise_for ($self);
2360 $map = $check->($map) if $check && $map; 2487 $map = $check->($map) if $check && $map;
2361 } else { 2488 } else {
2362 $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);
2363 } 2490 }
2364 2491
2365 $map 2492 $map
2366 }; 2493 };
2367 2494
2457 # if exit is damned, update players death & WoR home-position 2584 # if exit is damned, update players death & WoR home-position
2458 $self->contr->savebed ($slaying, $hp, $sp) 2585 $self->contr->savebed ($slaying, $hp, $sp)
2459 if $exit->flag (FLAG_DAMNED); 2586 if $exit->flag (FLAG_DAMNED);
2460 2587
2461 (async { 2588 (async {
2589 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2590
2462 $self->deactivate_recursive; # just to be sure 2591 $self->deactivate_recursive; # just to be sure
2463 unless (eval { 2592 unless (eval {
2464 $self->goto ($slaying, $hp, $sp); 2593 $self->goto ($slaying, $hp, $sp);
2465 2594
2466 1; 2595 1;
2501the 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
2502the message unless the client supports the msg packet. 2631the message unless the client supports the msg packet.
2503 2632
2504=cut 2633=cut
2505 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
2506sub cf::client::send_msg { 2656sub cf::client::send_msg {
2507 my ($self, $channel, $msg, $color, @extra) = @_; 2657 my ($self, $channel, $msg, $color, @extra) = @_;
2508 2658
2509 $msg = $self->pl->expand_cfpod ($msg); 2659 $msg = $self->pl->expand_cfpod ($msg);
2510 2660
2511 $color &= ~cf::NDI_UNIQUE; # just in case... 2661 $color &= cf::NDI_CLIENT_MASK; # just in case...
2512 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
2513 if (ref $channel) { 2672 } elsif (ref $channel) {
2514 # send meta info to client, if not yet sent 2673 # send meta info to client, if not yet sent
2515 unless (exists $self->{channel}{$channel->{id}}) { 2674 unless (exists $self->{channel}{$channel->{id}}) {
2516 $self->{channel}{$channel->{id}} = $channel; 2675 $self->{channel}{$channel->{id}} = $channel;
2517 $self->ext_event (channel_info => %$channel); 2676 $self->ext_msg (channel_info => $channel)
2677 if $self->can_msg;
2518 } 2678 }
2519 2679
2520 $channel = $channel->{id}; 2680 $channel = $channel->{id};
2521 } 2681 }
2522 2682
2523 return unless @extra || length $msg; 2683 return unless @extra || length $msg;
2524 2684
2525 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
2526 $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]));
2527 } else { 2692 } 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) { 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
2539 if (0 && $msg =~ /\[/) { 2708 if (0 && $msg =~ /\[/) {
2709 # COMMAND/INFO
2540 $self->send_packet ("drawextinfo $color 4 0 $msg") 2710 $self->send_packet ("drawextinfo $color 10 8 $msg")
2541 } else { 2711 } else {
2542 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2712 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2543 $self->send_packet ("drawinfo $color $msg") 2713 $self->send_packet ("drawinfo $color $msg")
2544 } 2714 }
2545 } 2715 }
2546 } 2716 }
2547} 2717}
2548 2718
2549=item $client->ext_event ($type, %msg) 2719=item $client->ext_msg ($type, @msg)
2550 2720
2551Sends an ext event to the client. 2721Sends an ext event to the client.
2552 2722
2553=cut 2723=cut
2554 2724
2555sub cf::client::ext_event($$%) { 2725sub cf::client::ext_msg($$@) {
2556 my ($self, $type, %msg) = @_; 2726 my ($self, $type, @msg) = @_;
2557 2727
2558 return unless $self->extcmd; 2728 if ($self->extcmd == 2) {
2559 2729 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2730 } elsif ($self->extcmd == 1) { # TODO: remove
2560 $msg{msgtype} = "event_$type"; 2731 push @msg, msgtype => "event_$type";
2561 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 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;
2750 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2751 }
2562} 2752}
2563 2753
2564=item $success = $client->query ($flags, "text", \&cb) 2754=item $success = $client->query ($flags, "text", \&cb)
2565 2755
2566Queues a query to the client, calling the given callback with 2756Queues a query to the client, calling the given callback with
2621 my ($ns, $buf) = @_; 2811 my ($ns, $buf) = @_;
2622 2812
2623 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2813 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2624 2814
2625 if (ref $msg) { 2815 if (ref $msg) {
2816 my ($type, $reply, @payload) =
2817 "ARRAY" eq ref $msg
2818 ? @$msg
2819 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2820
2821 my @reply;
2822
2626 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2823 if (my $cb = $EXTICMD{$type}) {
2627 if (my %reply = $cb->($ns, $msg)) { 2824 @reply = $cb->($ns, @payload);
2628 $reply{msgid} = $msg->{msgid};
2629 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2630 }
2631 } 2825 }
2826
2827 $ns->ext_reply ($reply, @reply)
2828 if $reply;
2829
2632 } else { 2830 } else {
2633 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";
2634 } 2832 }
2635 2833
2636 cf::override; 2834 cf::override;
2683our $safe = new Safe "safe"; 2881our $safe = new Safe "safe";
2684our $safe_hole = new Safe::Hole; 2882our $safe_hole = new Safe::Hole;
2685 2883
2686$SIG{FPE} = 'IGNORE'; 2884$SIG{FPE} = 'IGNORE';
2687 2885
2688$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));
2689 2891
2690# here we export the classes and methods available to script code 2892# here we export the classes and methods available to script code
2691 2893
2692=pod 2894=pod
2693 2895
2694The following functions and methods are available within a safe environment: 2896The following functions and methods are available within a safe environment:
2695 2897
2696 cf::object 2898 cf::object
2697 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
2698 insert remove 2900 insert remove name archname title slaying race decrease_ob_nr
2699 2901
2700 cf::object::player 2902 cf::object::player
2701 player 2903 player
2702 2904
2703 cf::player 2905 cf::player
2708 2910
2709=cut 2911=cut
2710 2912
2711for ( 2913for (
2712 ["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
2713 insert remove)], 2916 decrease_ob_nr)],
2714 ["cf::object::player" => qw(player)], 2917 ["cf::object::player" => qw(player)],
2715 ["cf::player" => qw(peaceful)], 2918 ["cf::player" => qw(peaceful)],
2716 ["cf::map" => qw(trigger)], 2919 ["cf::map" => qw(trigger)],
2717) { 2920) {
2718 no strict 'refs'; 2921 no strict 'refs';
2794# the server's init and main functions 2997# the server's init and main functions
2795 2998
2796sub load_facedata($) { 2999sub load_facedata($) {
2797 my ($path) = @_; 3000 my ($path) = @_;
2798 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
2799 warn "loading facedata from $path\n"; 3008 warn "loading facedata from $path\n";
2800 3009
2801 my $facedata; 3010 my $facedata;
2802 0 < aio_load $path, $facedata 3011 0 < aio_load $path, $facedata
2803 or die "$path: $!"; 3012 or die "$path: $!";
2804 3013
2805 $facedata = Coro::Storable::thaw $facedata; 3014 $facedata = Coro::Storable::thaw $facedata;
2806 3015
2807 $facedata->{version} == 2 3016 $facedata->{version} == 2
2808 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;
2809 3025
2810 { 3026 {
2811 my $faces = $facedata->{faceinfo}; 3027 my $faces = $facedata->{faceinfo};
2812 3028
2813 while (my ($face, $info) = each %$faces) { 3029 while (my ($face, $info) = each %$faces) {
2814 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3030 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2815 cf::face::set_visibility $idx, $info->{visibility}; 3031 cf::face::set_visibility $idx, $info->{visibility};
2816 cf::face::set_magicmap $idx, $info->{magicmap}; 3032 cf::face::set_magicmap $idx, $info->{magicmap};
2817 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3033 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2818 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3034 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2819 3035
2820 cf::cede_to_tick; 3036 cf::cede_to_tick;
2821 } 3037 }
2822 3038
2823 while (my ($face, $info) = each %$faces) { 3039 while (my ($face, $info) = each %$faces) {
2848 3064
2849 { 3065 {
2850 # TODO: for gcfclient pleasure, we should give resources 3066 # TODO: for gcfclient pleasure, we should give resources
2851 # that gcfclient doesn't grok a >10000 face index. 3067 # that gcfclient doesn't grok a >10000 face index.
2852 my $res = $facedata->{resource}; 3068 my $res = $facedata->{resource};
2853 my $enc = JSON::XS->new->utf8->canonical; 3069
3070 my $soundconf = delete $res->{"res/sound.conf"};
2854 3071
2855 while (my ($name, $info) = each %$res) { 3072 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; 3073 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3074 my $data;
2863 3075
2864 if ($name =~ /\.jpg$/) { 3076 if ($info->{type} & 1) {
2865 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3077 # prepend meta info
2866 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3078
3079 my $meta = $enc->encode ({
3080 name => $name,
3081 %{ $info->{meta} || {} },
3082 });
3083
3084 $data = pack "(w/a*)*", $meta, $info->{data};
2867 } else { 3085 } else {
2868 my $data = pack "(w/a*)*", $meta, $info->{data}; 3086 $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 } 3087 }
2874 3088
3089 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3090 cf::face::set_type $idx, $info->{type};
3091
2875 cf::cede_to_tick; 3092 cf::cede_to_tick;
2876 } 3093 }
3094
3095 if ($soundconf) {
3096 $soundconf = $enc->decode (delete $soundconf->{data});
3097
3098 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3099 my $sound = $soundconf->{compat}[$_]
3100 or next;
3101
3102 my $face = cf::face::find "sound/$sound->[1]";
3103 cf::sound::set $sound->[0] => $face;
3104 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3105 }
3106
3107 while (my ($k, $v) = each %{$soundconf->{event}}) {
3108 my $face = cf::face::find "sound/$v";
3109 cf::sound::set $k => $face;
3110 }
3111 }
2877 } 3112 }
2878 3113
2879 1 3114 1
2880} 3115}
2881 3116
3117register_exticmd fx_want => sub {
3118 my ($ns, $want) = @_;
3119
3120 while (my ($k, $v) = each %$want) {
3121 $ns->fx_want ($k, $v);
3122 }
3123};
3124
2882sub 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
2883 load_resource_file "$MAPDIR/regions" 3130 load_resource_file "$MAPDIR/regions"
2884 or die "unable to load regions file\n"; 3131 or die "unable to load regions file\n";
2885 3132
2886 for (cf::region::list) { 3133 for (cf::region::list) {
2887 $_->{match} = qr/$_->{match}/ 3134 $_->{match} = qr/$_->{match}/
2923 3170
2924sub init { 3171sub init {
2925 reload_resources; 3172 reload_resources;
2926} 3173}
2927 3174
2928sub cfg_load { 3175sub reload_config {
2929 open my $fh, "<:utf8", "$CONFDIR/config" 3176 open my $fh, "<:utf8", "$CONFDIR/config"
2930 or return; 3177 or return;
2931 3178
2932 local $/; 3179 local $/;
2933 *CFG = YAML::Syck::Load <$fh>; 3180 *CFG = YAML::Syck::Load <$fh>;
2949sub main { 3196sub main {
2950 # we must not ever block the main coroutine 3197 # we must not ever block the main coroutine
2951 local $Coro::idle = sub { 3198 local $Coro::idle = sub {
2952 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#
2953 (async { 3200 (async {
3201 $Coro::current->{desc} = "IDLE BUG HANDLER";
2954 Event::one_event; 3202 Event::one_event;
2955 })->prio (Coro::PRIO_MAX); 3203 })->prio (Coro::PRIO_MAX);
2956 }; 3204 };
2957 3205
2958 cfg_load; 3206 reload_config;
2959 db_init; 3207 db_init;
2960 load_extensions; 3208 load_extensions;
2961 3209
2962 $TICK_WATCHER->start; 3210 $TICK_WATCHER->start;
2963 Event::loop; 3211 Event::loop;
3156 warn "reloading cf.pm"; 3404 warn "reloading cf.pm";
3157 require cf; 3405 require cf;
3158 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3406 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3159 3407
3160 warn "loading config and database again"; 3408 warn "loading config and database again";
3161 cf::cfg_load; 3409 cf::reload_config;
3162 3410
3163 warn "loading extensions"; 3411 warn "loading extensions";
3164 cf::load_extensions; 3412 cf::load_extensions;
3165 3413
3166 warn "reattaching attachments to objects/players"; 3414 warn "reattaching attachments to objects/players";
3202register_command "reload" => sub { 3450register_command "reload" => sub {
3203 my ($who, $arg) = @_; 3451 my ($who, $arg) = @_;
3204 3452
3205 if ($who->flag (FLAG_WIZ)) { 3453 if ($who->flag (FLAG_WIZ)) {
3206 $who->message ("reloading server."); 3454 $who->message ("reloading server.");
3455 async {
3456 $Coro::current->{desc} = "perl_reload";
3207 async { reload_perl }; 3457 reload_perl;
3458 };
3208 } 3459 }
3209}; 3460};
3210 3461
3211unshift @INC, $LIBDIR; 3462unshift @INC, $LIBDIR;
3212 3463
3231 my $signal = new Coro::Signal; 3482 my $signal = new Coro::Signal;
3232 push @WAIT_FOR_TICK_BEGIN, $signal; 3483 push @WAIT_FOR_TICK_BEGIN, $signal;
3233 $signal->wait; 3484 $signal->wait;
3234} 3485}
3235 3486
3236 my $min = 1e6;#d#
3237 my $avg = 10;
3238$TICK_WATCHER = Event->timer ( 3487$TICK_WATCHER = Event->timer (
3239 reentrant => 0, 3488 reentrant => 0,
3240 parked => 1, 3489 parked => 1,
3241 prio => 0, 3490 prio => 0,
3242 at => $NEXT_TICK || $TICK, 3491 at => $NEXT_TICK || $TICK,
3250 3499
3251 $NOW = $tick_start = Event::time; 3500 $NOW = $tick_start = Event::time;
3252 3501
3253 cf::server_tick; # one server iteration 3502 cf::server_tick; # one server iteration
3254 3503
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; 3504 $RUNTIME += $TICK;
3279 $NEXT_TICK += $TICK; 3505 $NEXT_TICK += $TICK;
3280 3506
3281 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3507 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3282 $NEXT_RUNTIME_WRITE = $NOW + 10; 3508 $NEXT_RUNTIME_WRITE = $NOW + 10;
3283 Coro::async_pool { 3509 Coro::async_pool {
3510 $Coro::current->{desc} = "runtime saver";
3284 write_runtime 3511 write_runtime
3285 or warn "ERROR: unable to write runtime file: $!"; 3512 or warn "ERROR: unable to write runtime file: $!";
3286 }; 3513 };
3287 } 3514 }
3288 3515
3289# my $AFTER = Event::time;
3290# warn $AFTER - $NOW;#d#
3291
3292 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3516 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3293 $sig->send; 3517 $sig->send;
3294 } 3518 }
3295 while (my $sig = shift @WAIT_FOR_TICK) { 3519 while (my $sig = shift @WAIT_FOR_TICK) {
3296 $sig->send; 3520 $sig->send;
3306 3530
3307 $LOAD = ($NOW - $tick_start) / $TICK; 3531 $LOAD = ($NOW - $tick_start) / $TICK;
3308 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3532 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3309 3533
3310 _post_tick; 3534 _post_tick;
3311
3312
3313 }, 3535 },
3314); 3536);
3315 3537
3316{ 3538{
3539 BDB::min_parallel 8;
3317 BDB::max_poll_time $TICK * 0.1; 3540 BDB::max_poll_time $TICK * 0.1;
3318 $BDB_POLL_WATCHER = Event->io ( 3541 $BDB_POLL_WATCHER = Event->io (
3319 reentrant => 0, 3542 reentrant => 0,
3320 fd => BDB::poll_fileno, 3543 fd => BDB::poll_fileno,
3321 poll => 'r', 3544 poll => 'r',
3322 prio => 0, 3545 prio => 0,
3323 data => WF_AUTOCANCEL, 3546 data => WF_AUTOCANCEL,
3324 cb => \&BDB::poll_cb, 3547 cb => \&BDB::poll_cb,
3325 ); 3548 );
3326 BDB::min_parallel 8;
3327 3549
3328 BDB::set_sync_prepare { 3550 BDB::set_sync_prepare {
3329 my $status; 3551 my $status;
3330 my $current = $Coro::current; 3552 my $current = $Coro::current;
3331 ( 3553 (
3340 ) 3562 )
3341 }; 3563 };
3342 3564
3343 unless ($DB_ENV) { 3565 unless ($DB_ENV) {
3344 $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);
3345 3571
3346 cf::sync_job { 3572 cf::sync_job {
3347 eval { 3573 eval {
3348 BDB::db_env_open 3574 BDB::db_env_open
3349 $DB_ENV, 3575 $DB_ENV,
3351 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
3352 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3578 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3353 0666; 3579 0666;
3354 3580
3355 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3581 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 }; 3582 };
3360 3583
3361 cf::cleanup "db_env_open(db): $@" if $@; 3584 cf::cleanup "db_env_open(db): $@" if $@;
3362 }; 3585 };
3363 } 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 );
3364} 3618}
3365 3619
3366{ 3620{
3367 IO::AIO::min_parallel 8; 3621 IO::AIO::min_parallel 8;
3368 3622
3371 $AIO_POLL_WATCHER = Event->io ( 3625 $AIO_POLL_WATCHER = Event->io (
3372 reentrant => 0, 3626 reentrant => 0,
3373 data => WF_AUTOCANCEL, 3627 data => WF_AUTOCANCEL,
3374 fd => IO::AIO::poll_fileno, 3628 fd => IO::AIO::poll_fileno,
3375 poll => 'r', 3629 poll => 'r',
3376 prio => 6, 3630 prio => 0,
3377 cb => \&IO::AIO::poll_cb, 3631 cb => \&IO::AIO::poll_cb,
3378 ); 3632 );
3379} 3633}
3380 3634
3381my $_log_backtrace; 3635my $_log_backtrace;
3387 3641
3388 # limit the # of concurrent backtraces 3642 # limit the # of concurrent backtraces
3389 if ($_log_backtrace < 2) { 3643 if ($_log_backtrace < 2) {
3390 ++$_log_backtrace; 3644 ++$_log_backtrace;
3391 async { 3645 async {
3646 $Coro::current->{desc} = "abt $msg";
3647
3392 my @bt = fork_call { 3648 my @bt = fork_call {
3393 @addr = map { sprintf "%x", $_ } @addr; 3649 @addr = map { sprintf "%x", $_ } @addr;
3394 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3650 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3395 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 |"
3396 or die "addr2line: $!"; 3652 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines