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.371 by root, Thu Sep 13 16:16:01 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
472Coro::Storable. May, of course, block. Note that the executed sub may 486Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 487never block itself or use any form of Event handling.
474 488
475=cut 489=cut
476 490
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(&@) { 491sub fork_call(&@) {
487 my ($cb, @args) = @_; 492 my ($cb, @args) = @_;
488 493
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 494 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 495 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 496 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 497
494 if (my $pid = fork) { 498 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; 499 reset_signals;
508 local $SIG{__WARN__}; 500 &$cb
509 local $SIG{__DIE__}; 501 }, @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 502
516 eval { 503 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} 504}
529 505
530=item $value = cf::db_get $family => $key 506=item $value = cf::db_get $family => $key
531 507
532Returns a single value from the environment database. 508Returns a single value from the environment database.
534=item cf::db_put $family => $key => $value 510=item cf::db_put $family => $key => $value
535 511
536Stores the given C<$value> in the family. It can currently store binary 512Stores 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). 513data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 514
515=item $db = cf::db_table "name"
516
517Create and/or open a new database table. The string must not be "db" and must be unique
518within each server.
519
539=cut 520=cut
521
522sub db_table($) {
523 my ($name) = @_;
524 my $db = BDB::db_create $DB_ENV;
525
526 eval {
527 $db->set_flags (BDB::CHKSUM);
528
529 utf8::encode $name;
530 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
531 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
532 cf::cleanup "db_open(db): $!" if $!;
533 };
534 cf::cleanup "db_open(db): $@" if $@;
535
536 $db
537}
540 538
541our $DB; 539our $DB;
542 540
543sub db_init { 541sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 542 cf::sync_job {
548 eval { 543 $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 } 544 };
558} 545}
559 546
560sub db_get($$) { 547sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 548 my $key = "$_[0]/$_[1]";
562 549
612 if (1) { 599 if (1) {
613 $md5 = 600 $md5 =
614 join "\x00", 601 join "\x00",
615 $processversion, 602 $processversion,
616 map { 603 map {
617 Coro::cede; 604 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 605 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 606 } 0.. $#$src;
620 607
621 608
622 my $dbmd5 = db_get cache => "$id/md5"; 609 my $dbmd5 = db_get cache => "$id/md5";
1039); 1026);
1040 1027
1041sub object_freezer_save { 1028sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1029 my ($filename, $rdata, $objs) = @_;
1043 1030
1031 my $guard = cf::lock_acquire "io";
1032
1044 sync_job { 1033 sync_job {
1045 if (length $$rdata) { 1034 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1036 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1037 $decname, length $$rdata, scalar @$objs;
1048 1038
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1039 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1040 chmod SAVE_MODE, $fh;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1041 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1042 aio_fsync $fh if $cf::USE_FSYNC;
1071 } 1061 }
1072 } else { 1062 } else {
1073 aio_unlink $filename; 1063 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1064 aio_unlink "$filename.pst";
1075 } 1065 }
1076 } 1066 };
1067
1068 undef $guard;
1077} 1069}
1078 1070
1079sub object_freezer_as_string { 1071sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1072 my ($rdata, $objs) = @_;
1081 1073
1086 1078
1087sub object_thawer_load { 1079sub object_thawer_load {
1088 my ($filename) = @_; 1080 my ($filename) = @_;
1089 1081
1090 my ($data, $av); 1082 my ($data, $av);
1083
1084 my $guard = cf::lock_acquire "io";
1091 1085
1092 (aio_load $filename, $data) >= 0 1086 (aio_load $filename, $data) >= 0
1093 or return; 1087 or return;
1094 1088
1095 unless (aio_stat "$filename.pst") { 1089 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1090 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1091 or return;
1092
1093 undef $guard;
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1094 $av = eval { (Storable::thaw $av)->{objs} };
1099 } 1095 }
1100 1096
1097 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1098 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1099 $decname, length $data, scalar @{$av || []};
1100
1103 return ($data, $av); 1101 ($data, $av)
1104} 1102}
1105 1103
1106=head2 COMMAND CALLBACKS 1104=head2 COMMAND CALLBACKS
1107 1105
1108=over 4 1106=over 4
1181 my ($pl, $buf) = @_; 1179 my ($pl, $buf) = @_;
1182 1180
1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1181 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1184 1182
1185 if (ref $msg) { 1183 if (ref $msg) {
1184 my ($type, $reply, @payload) =
1185 "ARRAY" eq ref $msg
1186 ? @$msg
1187 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1188
1189 my @reply;
1190
1186 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1191 if (my $cb = $EXTCMD{$type}) {
1187 if (my %reply = $cb->($pl, $msg)) { 1192 @reply = $cb->($pl, @payload);
1188 $pl->ext_reply ($msg->{msgid}, %reply);
1189 }
1190 } 1193 }
1194
1195 $pl->ext_reply ($reply, @reply)
1196 if $reply;
1197
1191 } else { 1198 } else {
1192 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1199 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1193 } 1200 }
1194 1201
1195 cf::override; 1202 cf::override;
1285 1292
1286=head3 cf::player 1293=head3 cf::player
1287 1294
1288=over 4 1295=over 4
1289 1296
1297=item cf::player::num_playing
1298
1299Returns the official number of playing players, as per the Crossfire metaserver rules.
1300
1301=cut
1302
1303sub num_playing {
1304 scalar grep
1305 $_->ob->map
1306 && !$_->hidden
1307 && !$_->ob->flag (cf::FLAG_WIZ),
1308 cf::player::list
1309}
1310
1290=item cf::player::find $login 1311=item cf::player::find $login
1291 1312
1292Returns the given player object, loading it if necessary (might block). 1313Returns the given player object, loading it if necessary (might block).
1293 1314
1294=cut 1315=cut
1329 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1350 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1330 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1351 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1331 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1352 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1332 aio_unlink +(playerdir $login) . "/$login.pl"; 1353 aio_unlink +(playerdir $login) . "/$login.pl";
1333 1354
1334 my $pl = load_pl path $login 1355 my $f = new_from_file cf::object::thawer path $login
1335 or return; 1356 or return;
1357
1358 $f->next;
1359 my $pl = cf::player::load_pl $f
1360 or return;
1361 local $cf::PLAYER_LOADING{$login} = $pl;
1362 $f->resolve_delayed_derefs;
1336 $cf::PLAYER{$login} = $pl 1363 $cf::PLAYER{$login} = $pl
1337 } 1364 }
1338 } 1365 }
1339} 1366}
1340 1367
1350 1377
1351 aio_mkdir playerdir $pl, 0770; 1378 aio_mkdir playerdir $pl, 0770;
1352 $pl->{last_save} = $cf::RUNTIME; 1379 $pl->{last_save} = $cf::RUNTIME;
1353 1380
1354 $pl->save_pl ($path); 1381 $pl->save_pl ($path);
1355 Coro::cede; 1382 cf::cede_to_tick;
1356} 1383}
1357 1384
1358sub new($) { 1385sub new($) {
1359 my ($login) = @_; 1386 my ($login) = @_;
1360 1387
1364 $self->{deny_save} = 1; 1391 $self->{deny_save} = 1;
1365 1392
1366 $cf::PLAYER{$login} = $self; 1393 $cf::PLAYER{$login} = $self;
1367 1394
1368 $self 1395 $self
1396}
1397
1398=item $player->send_msg ($channel, $msg, $color, [extra...])
1399
1400=cut
1401
1402sub send_msg {
1403 my $ns = shift->ns
1404 or return;
1405 $ns->send_msg (@_);
1369} 1406}
1370 1407
1371=item $pl->quit_character 1408=item $pl->quit_character
1372 1409
1373Nukes the player without looking back. If logged in, the connection will 1410Nukes the player without looking back. If logged in, the connection will
1428 or return []; 1465 or return [];
1429 1466
1430 my @logins; 1467 my @logins;
1431 1468
1432 for my $login (@$dirs) { 1469 for my $login (@$dirs) {
1470 my $path = path $login;
1471
1472 # a .pst is a dead give-away for a valid player
1473 unless (-e "$path.pst") {
1433 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1474 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1434 aio_read $fh, 0, 512, my $buf, 0 or next; 1475 aio_read $fh, 0, 512, my $buf, 0 or next;
1435 $buf !~ /^password -------------$/m or next; # official not-valid tag 1476 $buf !~ /^password -------------$/m or next; # official not-valid tag
1477 }
1436 1478
1437 utf8::decode $login; 1479 utf8::decode $login;
1438 push @logins, $login; 1480 push @logins, $login;
1439 } 1481 }
1440 1482
1478sub expand_cfpod { 1520sub expand_cfpod {
1479 ((my $self), (local $_)) = @_; 1521 ((my $self), (local $_)) = @_;
1480 1522
1481 # escape & and < 1523 # escape & and <
1482 s/&/&amp;/g; 1524 s/&/&amp;/g;
1483 s/(?<![BIUGH])</&lt;/g; 1525 s/(?<![BIUGHT])</&lt;/g;
1484 1526
1485 # this is buggy, it needs to properly take care of nested <'s 1527 # this is buggy, it needs to properly take care of nested <'s
1486 1528
1487 1 while 1529 1 while
1488 # replace B<>, I<>, U<> etc. 1530 # replace B<>, I<>, U<> etc.
1489 s/B<([^\>]*)>/<b>$1<\/b>/ 1531 s/B<([^\>]*)>/<b>$1<\/b>/
1490 || s/I<([^\>]*)>/<i>$1<\/i>/ 1532 || s/I<([^\>]*)>/<i>$1<\/i>/
1491 || s/U<([^\>]*)>/<u>$1<\/u>/ 1533 || s/U<([^\>]*)>/<u>$1<\/u>/
1534 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1492 # replace G<male|female> tags 1535 # replace G<male|female> tags
1493 || s{G<([^>|]*)\|([^>]*)>}{ 1536 || s{G<([^>|]*)\|([^>]*)>}{
1494 $self->gender ? $2 : $1 1537 $self->gender ? $2 : $1
1495 }ge 1538 }ge
1496 # replace H<hint text> 1539 # replace H<hint text>
1517sub hintmode { 1560sub hintmode {
1518 $_[0]{hintmode} = $_[1] if @_ > 1; 1561 $_[0]{hintmode} = $_[1] if @_ > 1;
1519 $_[0]{hintmode} 1562 $_[0]{hintmode}
1520} 1563}
1521 1564
1522=item $player->ext_reply ($msgid, %msg) 1565=item $player->ext_reply ($msgid, @msg)
1523 1566
1524Sends an ext reply to the player. 1567Sends an ext reply to the player.
1525 1568
1526=cut 1569=cut
1527 1570
1528sub ext_reply($$%) { 1571sub ext_reply($$@) {
1529 my ($self, $id, %msg) = @_; 1572 my ($self, $id, @msg) = @_;
1530 1573
1531 $msg{msgid} = $id; 1574 $self->ns->ext_reply ($id, @msg)
1532 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1533} 1575}
1534 1576
1535=item $player->ext_event ($type, %msg) 1577=item $player->ext_msg ($type, @msg)
1536 1578
1537Sends an ext event to the client. 1579Sends an ext event to the client.
1538 1580
1539=cut 1581=cut
1540 1582
1541sub ext_event($$%) { 1583sub ext_msg($$@) {
1542 my ($self, $type, %msg) = @_; 1584 my ($self, $type, @msg) = @_;
1543 1585
1544 $self->ns->ext_event ($type, %msg); 1586 $self->ns->ext_msg ($type, @msg);
1545} 1587}
1546 1588
1547=head3 cf::region 1589=head3 cf::region
1548 1590
1549=over 4 1591=over 4
1765 1807
1766sub load_header_from($) { 1808sub load_header_from($) {
1767 my ($self, $path) = @_; 1809 my ($self, $path) = @_;
1768 1810
1769 utf8::encode $path; 1811 utf8::encode $path;
1770 #aio_open $path, O_RDONLY, 0 1812 my $f = new_from_file cf::object::thawer $path
1771 # or return;
1772
1773 $self->_load_header ($path)
1774 or return; 1813 or return;
1814
1815 $self->_load_header ($f)
1816 or return;
1817
1818 local $MAP_LOADING{$self->{path}} = $self;
1819 $f->resolve_delayed_derefs;
1775 1820
1776 $self->{load_path} = $path; 1821 $self->{load_path} = $path;
1777 1822
1778 1 1823 1
1779} 1824}
1833sub find { 1878sub find {
1834 my ($path, $origin) = @_; 1879 my ($path, $origin) = @_;
1835 1880
1836 $path = normalise $path, $origin && $origin->path; 1881 $path = normalise $path, $origin && $origin->path;
1837 1882
1883 cf::lock_wait "map_data:$path";#d#remove
1838 cf::lock_wait "map_find:$path"; 1884 cf::lock_wait "map_find:$path";
1839 1885
1840 $cf::MAP{$path} || do { 1886 $cf::MAP{$path} || do {
1841 my $guard = cf::lock_acquire "map_find:$path"; 1887 my $guard1 = cf::lock_acquire "map_find:$path";
1888 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1889
1842 my $map = new_from_path cf::map $path 1890 my $map = new_from_path cf::map $path
1843 or return; 1891 or return;
1844 1892
1845 $map->{last_save} = $cf::RUNTIME; 1893 $map->{last_save} = $cf::RUNTIME;
1846 1894
1848 or return; 1896 or return;
1849 1897
1850 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1898 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1851 # doing this can freeze the server in a sync job, obviously 1899 # doing this can freeze the server in a sync job, obviously
1852 #$cf::WAIT_FOR_TICK->wait; 1900 #$cf::WAIT_FOR_TICK->wait;
1901 undef $guard1;
1902 undef $guard2;
1853 $map->reset; 1903 $map->reset;
1854 undef $guard;
1855 return find $path; 1904 return find $path;
1856 } 1905 }
1857 1906
1858 $cf::MAP{$path} = $map 1907 $cf::MAP{$path} = $map
1859 } 1908 }
1868 local $self->{deny_reset} = 1; # loading can take a long time 1917 local $self->{deny_reset} = 1; # loading can take a long time
1869 1918
1870 my $path = $self->{path}; 1919 my $path = $self->{path};
1871 1920
1872 { 1921 {
1873 my $guard = cf::lock_acquire "map_load:$path"; 1922 my $guard = cf::lock_acquire "map_data:$path";
1874 1923
1924 return unless $self->valid;
1875 return if $self->in_memory != cf::MAP_SWAPPED; 1925 return unless $self->in_memory == cf::MAP_SWAPPED;
1876 1926
1877 $self->in_memory (cf::MAP_LOADING); 1927 $self->in_memory (cf::MAP_LOADING);
1878 1928
1879 $self->alloc; 1929 $self->alloc;
1880 1930
1881 $self->pre_load; 1931 $self->pre_load;
1882 Coro::cede; 1932 cf::cede_to_tick;
1883 1933
1934 my $f = new_from_file cf::object::thawer $self->{load_path};
1935 $f->skip_block;
1884 $self->_load_objects ($self->{load_path}, 1) 1936 $self->_load_objects ($f)
1885 or return; 1937 or return;
1886 1938
1887 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1939 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1888 if delete $self->{load_original}; 1940 if delete $self->{load_original};
1889 1941
1890 if (my $uniq = $self->uniq_path) { 1942 if (my $uniq = $self->uniq_path) {
1891 utf8::encode $uniq; 1943 utf8::encode $uniq;
1892 if (aio_open $uniq, O_RDONLY, 0) { 1944 unless (aio_stat $uniq) {
1945 if (my $f = new_from_file cf::object::thawer $uniq) {
1893 $self->clear_unique_items; 1946 $self->clear_unique_items;
1894 $self->_load_objects ($uniq, 0); 1947 $self->_load_objects ($f);
1948 $f->resolve_delayed_derefs;
1949 }
1895 } 1950 }
1896 } 1951 }
1897 1952
1898 Coro::cede; 1953 $f->resolve_delayed_derefs;
1954
1955 cf::cede_to_tick;
1899 # now do the right thing for maps 1956 # now do the right thing for maps
1900 $self->link_multipart_objects; 1957 $self->link_multipart_objects;
1901 $self->difficulty ($self->estimate_difficulty) 1958 $self->difficulty ($self->estimate_difficulty)
1902 unless $self->difficulty; 1959 unless $self->difficulty;
1903 Coro::cede; 1960 cf::cede_to_tick;
1904 1961
1905 unless ($self->{deny_activate}) { 1962 unless ($self->{deny_activate}) {
1906 $self->decay_objects; 1963 $self->decay_objects;
1907 $self->fix_auto_apply; 1964 $self->fix_auto_apply;
1908 $self->update_buttons; 1965 $self->update_buttons;
1909 Coro::cede; 1966 cf::cede_to_tick;
1910 $self->set_darkness_map; 1967 $self->set_darkness_map;
1911 Coro::cede; 1968 cf::cede_to_tick;
1912 $self->activate; 1969 $self->activate;
1913 } 1970 }
1971
1972 $self->{last_save} = $cf::RUNTIME;
1973 $self->last_access ($cf::RUNTIME);
1914 1974
1915 $self->in_memory (cf::MAP_IN_MEMORY); 1975 $self->in_memory (cf::MAP_IN_MEMORY);
1916 } 1976 }
1917 1977
1918 $self->post_load; 1978 $self->post_load;
1929 1989
1930 $self 1990 $self
1931} 1991}
1932 1992
1933# find and load all maps in the 3x3 area around a map 1993# find and load all maps in the 3x3 area around a map
1934sub load_diag { 1994sub load_neighbours {
1935 my ($map) = @_; 1995 my ($map) = @_;
1936 1996
1937 my @diag; # diagonal neighbours 1997 my @neigh; # diagonal neighbours
1938 1998
1939 for (0 .. 3) { 1999 for (0 .. 3) {
1940 my $neigh = $map->tile_path ($_) 2000 my $neigh = $map->tile_path ($_)
1941 or next; 2001 or next;
1942 $neigh = find $neigh, $map 2002 $neigh = find $neigh, $map
1943 or next; 2003 or next;
1944 $neigh->load; 2004 $neigh->load;
1945 2005
2006 push @neigh,
1946 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2007 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1947 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2008 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1948 } 2009 }
1949 2010
1950 for (@diag) { 2011 for (grep defined $_->[0], @neigh) {
2012 my ($path, $origin) = @$_;
1951 my $neigh = find @$_ 2013 my $neigh = find $path, $origin
1952 or next; 2014 or next;
1953 $neigh->load; 2015 $neigh->load;
1954 } 2016 }
1955} 2017}
1956 2018
1961} 2023}
1962 2024
1963sub do_load_sync { 2025sub do_load_sync {
1964 my ($map) = @_; 2026 my ($map) = @_;
1965 2027
2028 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2029 if $Coro::current == $Coro::main;
2030
1966 cf::sync_job { $map->load }; 2031 cf::sync_job { $map->load };
1967} 2032}
1968 2033
1969our %MAP_PREFETCH; 2034our %MAP_PREFETCH;
1970our $MAP_PREFETCHER = undef; 2035our $MAP_PREFETCHER = undef;
1971 2036
1972sub find_async { 2037sub find_async {
1973 my ($path, $origin) = @_; 2038 my ($path, $origin, $load) = @_;
1974 2039
1975 $path = normalise $path, $origin && $origin->{path}; 2040 $path = normalise $path, $origin && $origin->{path};
1976 2041
1977 if (my $map = $cf::MAP{$path}) { 2042 if (my $map = $cf::MAP{$path}) {
1978 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2043 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1979 } 2044 }
1980 2045
1981 undef $MAP_PREFETCH{$path}; 2046 $MAP_PREFETCH{$path} |= $load;
2047
1982 $MAP_PREFETCHER ||= cf::async { 2048 $MAP_PREFETCHER ||= cf::async {
1983 while (%MAP_PREFETCH) { 2049 while (%MAP_PREFETCH) {
1984 for my $path (keys %MAP_PREFETCH) { 2050 while (my ($k, $v) = each %MAP_PREFETCH) {
1985 if (my $map = find $path) { 2051 if (my $map = find $k) {
1986 $map->load; 2052 $map->load if $v;
1987 } 2053 }
1988 2054
1989 delete $MAP_PREFETCH{$path}; 2055 delete $MAP_PREFETCH{$k};
1990 } 2056 }
1991 } 2057 }
1992 undef $MAP_PREFETCHER; 2058 undef $MAP_PREFETCHER;
1993 }; 2059 };
1994 $MAP_PREFETCHER->prio (6); 2060 $MAP_PREFETCHER->prio (6);
1997} 2063}
1998 2064
1999sub save { 2065sub save {
2000 my ($self) = @_; 2066 my ($self) = @_;
2001 2067
2002 my $lock = cf::lock_acquire "map_data:" . $self->path; 2068 my $lock = cf::lock_acquire "map_data:$self->{path}";
2003 2069
2004 $self->{last_save} = $cf::RUNTIME; 2070 $self->{last_save} = $cf::RUNTIME;
2005 2071
2006 return unless $self->dirty; 2072 return unless $self->dirty;
2007 2073
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 # temporary compatibility#TODO#remove
2281 $ref =~ s{^<}{player/<};
2282
2283 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2284 my ($uuid, $name) = ($1, $2);
2285 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2286 or return;
2287 $pl->ob->uuid eq $uuid
2288 or return;
2289
2290 $pl->ob
2291 } else {
2292 warn "$ref: cannot resolve object reference\n";
2293 undef
2294 }
2295}
2296
2193package cf; 2297package cf;
2194 2298
2195=back 2299=back
2196 2300
2197=head3 cf::object::player 2301=head3 cf::object::player
2219 2323
2220 } else { 2324 } else {
2221 my $pl = $self->contr; 2325 my $pl = $self->contr;
2222 2326
2223 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2327 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2224 my $diag = $pl->{npc_dialog}; 2328 my $dialog = $pl->{npc_dialog};
2225 $diag->{pl}->ext_reply ( 2329 $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 2330
2232 } else { 2331 } else {
2233 $msg = $npc->name . " says: $msg" if $npc; 2332 $msg = $npc->name . " says: $msg" if $npc;
2234 $self->message ($msg, $flags); 2333 $self->message ($msg, $flags);
2235 } 2334 }
2236 } 2335 }
2336}
2337
2338=item $object->send_msg ($channel, $msg, $color, [extra...])
2339
2340=cut
2341
2342sub cf::object::send_msg {
2343 my $pl = shift->contr
2344 or return;
2345 $pl->send_msg (@_);
2237} 2346}
2238 2347
2239=item $player_object->may ("access") 2348=item $player_object->may ("access")
2240 2349
2241Returns wether the given player is authorized to access resource "access" 2350Returns wether the given player is authorized to access resource "access"
2320 # use -1 or undef as default coordinates, not 0, 0 2429 # use -1 or undef as default coordinates, not 0, 0
2321 ($x, $y) = ($map->enter_x, $map->enter_y) 2430 ($x, $y) = ($map->enter_x, $map->enter_y)
2322 if $x <=0 && $y <= 0; 2431 if $x <=0 && $y <= 0;
2323 2432
2324 $map->load; 2433 $map->load;
2325 $map->load_diag; 2434 $map->load_neighbours;
2326 2435
2327 return unless $self->contr->active; 2436 return unless $self->contr->active;
2328 $self->activate_recursive; 2437 $self->activate_recursive;
2329 2438
2330 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2439 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2350 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2459 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2351 2460
2352 $self->enter_link; 2461 $self->enter_link;
2353 2462
2354 (async { 2463 (async {
2464 # *tag paths override both path and x|y
2465 if ($path =~ /^\*(.*)$/) {
2466 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2467 my $ob = $obs[rand @obs];
2468
2469 # see if we actually can go there
2470 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2471 $ob = $obs[rand @obs];
2472 } else {
2473 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2474 }
2475 # else put us there anyways for now #d#
2476
2477 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2478 } else {
2479 ($path, $x, $y) = (undef, undef, undef);
2480 }
2481 }
2482
2355 my $map = eval { 2483 my $map = eval {
2356 my $map = cf::map::find $path; 2484 my $map = defined $path ? cf::map::find $path : undef;
2357 2485
2358 if ($map) { 2486 if ($map) {
2359 $map = $map->customise_for ($self); 2487 $map = $map->customise_for ($self);
2360 $map = $check->($map) if $check && $map; 2488 $map = $check->($map) if $check && $map;
2361 } else { 2489 } else {
2362 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2490 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2363 } 2491 }
2364 2492
2365 $map 2493 $map
2366 }; 2494 };
2367 2495
2501the message, with C<log> being the default. If C<$color> is negative, suppress 2629the message, with C<log> being the default. If C<$color> is negative, suppress
2502the message unless the client supports the msg packet. 2630the message unless the client supports the msg packet.
2503 2631
2504=cut 2632=cut
2505 2633
2634our %CHANNEL = (
2635 "c/identify" => {
2636 id => "identify",
2637 title => "Identify",
2638 reply => undef,
2639 tooltip => "Items recently identified",
2640 },
2641 "c/examine" => {
2642 id => "examine",
2643 title => "Examine",
2644 reply => undef,
2645 tooltip => "Signs and other items you examined",
2646 },
2647);
2648
2506sub cf::client::send_msg { 2649sub cf::client::send_msg {
2507 my ($self, $channel, $msg, $color, @extra) = @_; 2650 my ($self, $channel, $msg, $color, @extra) = @_;
2508 2651
2509 $msg = $self->pl->expand_cfpod ($msg); 2652 $msg = $self->pl->expand_cfpod ($msg);
2510 2653
2511 $color &= ~cf::NDI_UNIQUE; # just in case... 2654 $color &= cf::NDI_CLIENT_MASK; # just in case...
2655
2656 # check predefined channels, for the benefit of C
2657 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2512 2658
2513 if (ref $channel) { 2659 if (ref $channel) {
2514 # send meta info to client, if not yet sent 2660 # send meta info to client, if not yet sent
2515 unless (exists $self->{channel}{$channel->{id}}) { 2661 unless (exists $self->{channel}{$channel->{id}}) {
2516 $self->{channel}{$channel->{id}} = $channel; 2662 $self->{channel}{$channel->{id}} = $channel;
2517 $self->ext_event (channel_info => %$channel); 2663 $self->ext_msg (channel_info => $channel)
2664 if $self->can_msg;
2518 } 2665 }
2519 2666
2520 $channel = $channel->{id}; 2667 $channel = $channel->{id};
2521 } 2668 }
2522 2669
2523 return unless @extra || length $msg; 2670 return unless @extra || length $msg;
2524 2671
2525 if ($self->can_msg) { 2672 if ($self->can_msg) {
2673 # default colour, mask it out
2674 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2675 if $color & cf::NDI_DEF;
2676
2526 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2677 $self->send_packet ("msg " . $self->{json_coder}->encode (
2678 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2527 } else { 2679 } 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) { 2680 if ($color >= 0) {
2681 # replace some tags by gcfclient-compatible ones
2682 for ($msg) {
2683 1 while
2684 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2685 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2686 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2687 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2688 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2689 }
2690
2691 $color &= cf::NDI_COLOR_MASK;
2692
2693 utf8::encode $msg;
2694
2539 if (0 && $msg =~ /\[/) { 2695 if (0 && $msg =~ /\[/) {
2696 # COMMAND/INFO
2540 $self->send_packet ("drawextinfo $color 4 0 $msg") 2697 $self->send_packet ("drawextinfo $color 10 8 $msg")
2541 } else { 2698 } else {
2542 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2699 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2543 $self->send_packet ("drawinfo $color $msg") 2700 $self->send_packet ("drawinfo $color $msg")
2544 } 2701 }
2545 } 2702 }
2546 } 2703 }
2547} 2704}
2548 2705
2549=item $client->ext_event ($type, %msg) 2706=item $client->ext_msg ($type, @msg)
2550 2707
2551Sends an ext event to the client. 2708Sends an ext event to the client.
2552 2709
2553=cut 2710=cut
2554 2711
2555sub cf::client::ext_event($$%) { 2712sub cf::client::ext_msg($$@) {
2556 my ($self, $type, %msg) = @_; 2713 my ($self, $type, @msg) = @_;
2557 2714
2558 return unless $self->extcmd; 2715 if ($self->extcmd == 2) {
2559 2716 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2717 } elsif ($self->extcmd == 1) { # TODO: remove
2560 $msg{msgtype} = "event_$type"; 2718 push @msg, msgtype => "event_$type";
2561 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2719 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2720 }
2721}
2722
2723=item $client->ext_reply ($msgid, @msg)
2724
2725Sends an ext reply to the client.
2726
2727=cut
2728
2729sub cf::client::ext_reply($$@) {
2730 my ($self, $id, @msg) = @_;
2731
2732 if ($self->extcmd == 2) {
2733 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2734 } elsif ($self->extcmd == 1) {
2735 #TODO: version 1, remove
2736 unshift @msg, msgtype => "reply", msgid => $id;
2737 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2738 }
2562} 2739}
2563 2740
2564=item $success = $client->query ($flags, "text", \&cb) 2741=item $success = $client->query ($flags, "text", \&cb)
2565 2742
2566Queues a query to the client, calling the given callback with 2743Queues a query to the client, calling the given callback with
2621 my ($ns, $buf) = @_; 2798 my ($ns, $buf) = @_;
2622 2799
2623 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2800 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2624 2801
2625 if (ref $msg) { 2802 if (ref $msg) {
2803 my ($type, $reply, @payload) =
2804 "ARRAY" eq ref $msg
2805 ? @$msg
2806 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2807
2808 my @reply;
2809
2626 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2810 if (my $cb = $EXTICMD{$type}) {
2627 if (my %reply = $cb->($ns, $msg)) { 2811 @reply = $cb->($ns, @payload);
2628 $reply{msgid} = $msg->{msgid};
2629 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2630 }
2631 } 2812 }
2813
2814 $ns->ext_reply ($reply, @reply)
2815 if $reply;
2816
2632 } else { 2817 } else {
2633 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2818 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2634 } 2819 }
2635 2820
2636 cf::override; 2821 cf::override;
2683our $safe = new Safe "safe"; 2868our $safe = new Safe "safe";
2684our $safe_hole = new Safe::Hole; 2869our $safe_hole = new Safe::Hole;
2685 2870
2686$SIG{FPE} = 'IGNORE'; 2871$SIG{FPE} = 'IGNORE';
2687 2872
2688$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2873$safe->permit_only (Opcode::opset qw(
2874 :base_core :base_mem :base_orig :base_math
2875 grepstart grepwhile mapstart mapwhile
2876 sort time
2877));
2689 2878
2690# here we export the classes and methods available to script code 2879# here we export the classes and methods available to script code
2691 2880
2692=pod 2881=pod
2693 2882
2694The following functions and methods are available within a safe environment: 2883The following functions and methods are available within a safe environment:
2695 2884
2696 cf::object 2885 cf::object
2697 contr pay_amount pay_player map x y force_find force_add 2886 contr pay_amount pay_player map x y force_find force_add
2698 insert remove 2887 insert remove name archname title slaying race decrease_ob_nr
2699 2888
2700 cf::object::player 2889 cf::object::player
2701 player 2890 player
2702 2891
2703 cf::player 2892 cf::player
2708 2897
2709=cut 2898=cut
2710 2899
2711for ( 2900for (
2712 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2901 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2902 insert remove inv name archname title slaying race
2713 insert remove)], 2903 decrease_ob_nr)],
2714 ["cf::object::player" => qw(player)], 2904 ["cf::object::player" => qw(player)],
2715 ["cf::player" => qw(peaceful)], 2905 ["cf::player" => qw(peaceful)],
2716 ["cf::map" => qw(trigger)], 2906 ["cf::map" => qw(trigger)],
2717) { 2907) {
2718 no strict 'refs'; 2908 no strict 'refs';
2794# the server's init and main functions 2984# the server's init and main functions
2795 2985
2796sub load_facedata($) { 2986sub load_facedata($) {
2797 my ($path) = @_; 2987 my ($path) = @_;
2798 2988
2989 # HACK to clear player env face cache, we need some signal framework
2990 # for this (global event?)
2991 %ext::player_env::MUSIC_FACE_CACHE = ();
2992
2993 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2994
2799 warn "loading facedata from $path\n"; 2995 warn "loading facedata from $path\n";
2800 2996
2801 my $facedata; 2997 my $facedata;
2802 0 < aio_load $path, $facedata 2998 0 < aio_load $path, $facedata
2803 or die "$path: $!"; 2999 or die "$path: $!";
2804 3000
2805 $facedata = Coro::Storable::thaw $facedata; 3001 $facedata = Coro::Storable::thaw $facedata;
2806 3002
2807 $facedata->{version} == 2 3003 $facedata->{version} == 2
2808 or cf::cleanup "$path: version mismatch, cannot proceed."; 3004 or cf::cleanup "$path: version mismatch, cannot proceed.";
3005
3006 # patch in the exptable
3007 $facedata->{resource}{"res/exp_table"} = {
3008 type => FT_RSRC,
3009 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3010 };
3011 cf::cede_to_tick;
2809 3012
2810 { 3013 {
2811 my $faces = $facedata->{faceinfo}; 3014 my $faces = $facedata->{faceinfo};
2812 3015
2813 while (my ($face, $info) = each %$faces) { 3016 while (my ($face, $info) = each %$faces) {
2814 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3017 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2815 cf::face::set_visibility $idx, $info->{visibility}; 3018 cf::face::set_visibility $idx, $info->{visibility};
2816 cf::face::set_magicmap $idx, $info->{magicmap}; 3019 cf::face::set_magicmap $idx, $info->{magicmap};
2817 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3020 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2818 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3021 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2819 3022
2820 cf::cede_to_tick; 3023 cf::cede_to_tick;
2821 } 3024 }
2822 3025
2823 while (my ($face, $info) = each %$faces) { 3026 while (my ($face, $info) = each %$faces) {
2848 3051
2849 { 3052 {
2850 # TODO: for gcfclient pleasure, we should give resources 3053 # TODO: for gcfclient pleasure, we should give resources
2851 # that gcfclient doesn't grok a >10000 face index. 3054 # that gcfclient doesn't grok a >10000 face index.
2852 my $res = $facedata->{resource}; 3055 my $res = $facedata->{resource};
2853 my $enc = JSON::XS->new->utf8->canonical; 3056
3057 my $soundconf = delete $res->{"res/sound.conf"};
2854 3058
2855 while (my ($name, $info) = each %$res) { 3059 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; 3060 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3061 my $data;
2863 3062
2864 if ($name =~ /\.jpg$/) { 3063 if ($info->{type} & 1) {
2865 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3064 # prepend meta info
2866 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3065
3066 my $meta = $enc->encode ({
3067 name => $name,
3068 %{ $info->{meta} || {} },
3069 });
3070
3071 $data = pack "(w/a*)*", $meta, $info->{data};
2867 } else { 3072 } else {
2868 my $data = pack "(w/a*)*", $meta, $info->{data}; 3073 $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 } 3074 }
2874 3075
3076 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3077 cf::face::set_type $idx, $info->{type};
3078
2875 cf::cede_to_tick; 3079 cf::cede_to_tick;
2876 } 3080 }
3081
3082 if ($soundconf) {
3083 $soundconf = $enc->decode (delete $soundconf->{data});
3084
3085 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3086 my $sound = $soundconf->{compat}[$_]
3087 or next;
3088
3089 my $face = cf::face::find "sound/$sound->[1]";
3090 cf::sound::set $sound->[0] => $face;
3091 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3092 }
3093
3094 while (my ($k, $v) = each %{$soundconf->{event}}) {
3095 my $face = cf::face::find "sound/$v";
3096 cf::sound::set $k => $face;
3097 }
3098 }
2877 } 3099 }
2878 3100
2879 1 3101 1
2880} 3102}
2881 3103
3104register_exticmd fx_want => sub {
3105 my ($ns, $want) = @_;
3106
3107 while (my ($k, $v) = each %$want) {
3108 $ns->fx_want ($k, $v);
3109 }
3110};
3111
2882sub reload_regions { 3112sub reload_regions {
3113 # HACK to clear player env face cache, we need some signal framework
3114 # for this (global event?)
3115 %ext::player_env::MUSIC_FACE_CACHE = ();
3116
2883 load_resource_file "$MAPDIR/regions" 3117 load_resource_file "$MAPDIR/regions"
2884 or die "unable to load regions file\n"; 3118 or die "unable to load regions file\n";
2885 3119
2886 for (cf::region::list) { 3120 for (cf::region::list) {
2887 $_->{match} = qr/$_->{match}/ 3121 $_->{match} = qr/$_->{match}/
2923 3157
2924sub init { 3158sub init {
2925 reload_resources; 3159 reload_resources;
2926} 3160}
2927 3161
2928sub cfg_load { 3162sub reload_config {
2929 open my $fh, "<:utf8", "$CONFDIR/config" 3163 open my $fh, "<:utf8", "$CONFDIR/config"
2930 or return; 3164 or return;
2931 3165
2932 local $/; 3166 local $/;
2933 *CFG = YAML::Syck::Load <$fh>; 3167 *CFG = YAML::Syck::Load <$fh>;
2953 (async { 3187 (async {
2954 Event::one_event; 3188 Event::one_event;
2955 })->prio (Coro::PRIO_MAX); 3189 })->prio (Coro::PRIO_MAX);
2956 }; 3190 };
2957 3191
2958 cfg_load; 3192 reload_config;
2959 db_init; 3193 db_init;
2960 load_extensions; 3194 load_extensions;
2961 3195
2962 $TICK_WATCHER->start; 3196 $TICK_WATCHER->start;
2963 Event::loop; 3197 Event::loop;
3156 warn "reloading cf.pm"; 3390 warn "reloading cf.pm";
3157 require cf; 3391 require cf;
3158 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3392 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3159 3393
3160 warn "loading config and database again"; 3394 warn "loading config and database again";
3161 cf::cfg_load; 3395 cf::reload_config;
3162 3396
3163 warn "loading extensions"; 3397 warn "loading extensions";
3164 cf::load_extensions; 3398 cf::load_extensions;
3165 3399
3166 warn "reattaching attachments to objects/players"; 3400 warn "reattaching attachments to objects/players";
3231 my $signal = new Coro::Signal; 3465 my $signal = new Coro::Signal;
3232 push @WAIT_FOR_TICK_BEGIN, $signal; 3466 push @WAIT_FOR_TICK_BEGIN, $signal;
3233 $signal->wait; 3467 $signal->wait;
3234} 3468}
3235 3469
3236 my $min = 1e6;#d#
3237 my $avg = 10;
3238$TICK_WATCHER = Event->timer ( 3470$TICK_WATCHER = Event->timer (
3239 reentrant => 0, 3471 reentrant => 0,
3240 parked => 1, 3472 parked => 1,
3241 prio => 0, 3473 prio => 0,
3242 at => $NEXT_TICK || $TICK, 3474 at => $NEXT_TICK || $TICK,
3250 3482
3251 $NOW = $tick_start = Event::time; 3483 $NOW = $tick_start = Event::time;
3252 3484
3253 cf::server_tick; # one server iteration 3485 cf::server_tick; # one server iteration
3254 3486
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; 3487 $RUNTIME += $TICK;
3279 $NEXT_TICK += $TICK; 3488 $NEXT_TICK += $TICK;
3280 3489
3281 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3490 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3282 $NEXT_RUNTIME_WRITE = $NOW + 10; 3491 $NEXT_RUNTIME_WRITE = $NOW + 10;
3284 write_runtime 3493 write_runtime
3285 or warn "ERROR: unable to write runtime file: $!"; 3494 or warn "ERROR: unable to write runtime file: $!";
3286 }; 3495 };
3287 } 3496 }
3288 3497
3289# my $AFTER = Event::time;
3290# warn $AFTER - $NOW;#d#
3291
3292 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3498 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3293 $sig->send; 3499 $sig->send;
3294 } 3500 }
3295 while (my $sig = shift @WAIT_FOR_TICK) { 3501 while (my $sig = shift @WAIT_FOR_TICK) {
3296 $sig->send; 3502 $sig->send;
3306 3512
3307 $LOAD = ($NOW - $tick_start) / $TICK; 3513 $LOAD = ($NOW - $tick_start) / $TICK;
3308 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3514 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3309 3515
3310 _post_tick; 3516 _post_tick;
3311
3312
3313 }, 3517 },
3314); 3518);
3315 3519
3316{ 3520{
3521 BDB::min_parallel 8;
3317 BDB::max_poll_time $TICK * 0.1; 3522 BDB::max_poll_time $TICK * 0.1;
3318 $BDB_POLL_WATCHER = Event->io ( 3523 $BDB_POLL_WATCHER = Event->io (
3319 reentrant => 0, 3524 reentrant => 0,
3320 fd => BDB::poll_fileno, 3525 fd => BDB::poll_fileno,
3321 poll => 'r', 3526 poll => 'r',
3322 prio => 0, 3527 prio => 0,
3323 data => WF_AUTOCANCEL, 3528 data => WF_AUTOCANCEL,
3324 cb => \&BDB::poll_cb, 3529 cb => \&BDB::poll_cb,
3325 ); 3530 );
3326 BDB::min_parallel 8;
3327 3531
3328 BDB::set_sync_prepare { 3532 BDB::set_sync_prepare {
3329 my $status; 3533 my $status;
3330 my $current = $Coro::current; 3534 my $current = $Coro::current;
3331 ( 3535 (
3340 ) 3544 )
3341 }; 3545 };
3342 3546
3343 unless ($DB_ENV) { 3547 unless ($DB_ENV) {
3344 $DB_ENV = BDB::db_env_create; 3548 $DB_ENV = BDB::db_env_create;
3549 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3550 | BDB::LOG_AUTOREMOVE, 1);
3551 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3552 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3345 3553
3346 cf::sync_job { 3554 cf::sync_job {
3347 eval { 3555 eval {
3348 BDB::db_env_open 3556 BDB::db_env_open
3349 $DB_ENV, 3557 $DB_ENV,
3351 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3559 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3352 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3560 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3353 0666; 3561 0666;
3354 3562
3355 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3563 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 }; 3564 };
3360 3565
3361 cf::cleanup "db_env_open(db): $@" if $@; 3566 cf::cleanup "db_env_open(db): $@" if $@;
3362 }; 3567 };
3363 } 3568 }
3569
3570 $BDB_DEADLOCK_WATCHER = Event->timer (
3571 after => 3,
3572 interval => 1,
3573 hard => 1,
3574 prio => 0,
3575 data => WF_AUTOCANCEL,
3576 cb => sub {
3577 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3578 },
3579 );
3580 $BDB_CHECKPOINT_WATCHER = Event->timer (
3581 after => 11,
3582 interval => 60,
3583 hard => 1,
3584 prio => 0,
3585 data => WF_AUTOCANCEL,
3586 cb => sub {
3587 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3588 },
3589 );
3590 $BDB_TRICKLE_WATCHER = Event->timer (
3591 after => 5,
3592 interval => 10,
3593 hard => 1,
3594 prio => 0,
3595 data => WF_AUTOCANCEL,
3596 cb => sub {
3597 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3598 },
3599 );
3364} 3600}
3365 3601
3366{ 3602{
3367 IO::AIO::min_parallel 8; 3603 IO::AIO::min_parallel 8;
3368 3604

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines