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.373 by root, Sat Sep 15 15:58:06 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";
… …
1041sub object_freezer_save { 1028sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1029 my ($filename, $rdata, $objs) = @_;
1043 1030
1044 sync_job { 1031 sync_job {
1045 if (length $$rdata) { 1032 if (length $$rdata) {
1033 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1034 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1035 $decname, length $$rdata, scalar @$objs;
1048 1036
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1037 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1038 chmod SAVE_MODE, $fh;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1039 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1040 aio_fsync $fh if $cf::USE_FSYNC;
… …
1071 } 1059 }
1072 } else { 1060 } else {
1073 aio_unlink $filename; 1061 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1062 aio_unlink "$filename.pst";
1075 } 1063 }
1076 } 1064 };
1077} 1065}
1078 1066
1079sub object_freezer_as_string { 1067sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1068 my ($rdata, $objs) = @_;
1081 1069
… …
1093 or return; 1081 or return;
1094 1082
1095 unless (aio_stat "$filename.pst") { 1083 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1084 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1085 or return;
1086
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1087 $av = eval { (Storable::thaw $av)->{objs} };
1099 } 1088 }
1100 1089
1090 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1091 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1092 $decname, length $data, scalar @{$av || []};
1093
1103 return ($data, $av); 1094 ($data, $av)
1104} 1095}
1105 1096
1106=head2 COMMAND CALLBACKS 1097=head2 COMMAND CALLBACKS
1107 1098
1108=over 4 1099=over 4
… …
1181 my ($pl, $buf) = @_; 1172 my ($pl, $buf) = @_;
1182 1173
1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1174 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1184 1175
1185 if (ref $msg) { 1176 if (ref $msg) {
1177 my ($type, $reply, @payload) =
1178 "ARRAY" eq ref $msg
1179 ? @$msg
1180 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1181
1182 my @reply;
1183
1186 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1184 if (my $cb = $EXTCMD{$type}) {
1187 if (my %reply = $cb->($pl, $msg)) { 1185 @reply = $cb->($pl, @payload);
1188 $pl->ext_reply ($msg->{msgid}, %reply);
1189 }
1190 } 1186 }
1187
1188 $pl->ext_reply ($reply, @reply)
1189 if $reply;
1190
1191 } else { 1191 } else {
1192 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1192 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1193 } 1193 }
1194 1194
1195 cf::override; 1195 cf::override;
… …
1285 1285
1286=head3 cf::player 1286=head3 cf::player
1287 1287
1288=over 4 1288=over 4
1289 1289
1290=item cf::player::num_playing
1291
1292Returns the official number of playing players, as per the Crossfire metaserver rules.
1293
1294=cut
1295
1296sub num_playing {
1297 scalar grep
1298 $_->ob->map
1299 && !$_->hidden
1300 && !$_->ob->flag (cf::FLAG_WIZ),
1301 cf::player::list
1302}
1303
1290=item cf::player::find $login 1304=item cf::player::find $login
1291 1305
1292Returns the given player object, loading it if necessary (might block). 1306Returns the given player object, loading it if necessary (might block).
1293 1307
1294=cut 1308=cut
… …
1329 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1343 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1330 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1344 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1331 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1345 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1332 aio_unlink +(playerdir $login) . "/$login.pl"; 1346 aio_unlink +(playerdir $login) . "/$login.pl";
1333 1347
1334 my $pl = load_pl path $login 1348 my $f = new_from_file cf::object::thawer path $login
1335 or return; 1349 or return;
1350
1351 my $pl = cf::player::load_pl $f
1352 or return;
1353 local $cf::PLAYER_LOADING{$login} = $pl;
1354 $f->resolve_delayed_derefs;
1336 $cf::PLAYER{$login} = $pl 1355 $cf::PLAYER{$login} = $pl
1337 } 1356 }
1338 } 1357 }
1339} 1358}
1340 1359
… …
1350 1369
1351 aio_mkdir playerdir $pl, 0770; 1370 aio_mkdir playerdir $pl, 0770;
1352 $pl->{last_save} = $cf::RUNTIME; 1371 $pl->{last_save} = $cf::RUNTIME;
1353 1372
1354 $pl->save_pl ($path); 1373 $pl->save_pl ($path);
1355 Coro::cede; 1374 cf::cede_to_tick;
1356} 1375}
1357 1376
1358sub new($) { 1377sub new($) {
1359 my ($login) = @_; 1378 my ($login) = @_;
1360 1379
… …
1364 $self->{deny_save} = 1; 1383 $self->{deny_save} = 1;
1365 1384
1366 $cf::PLAYER{$login} = $self; 1385 $cf::PLAYER{$login} = $self;
1367 1386
1368 $self 1387 $self
1388}
1389
1390=item $player->send_msg ($channel, $msg, $color, [extra...])
1391
1392=cut
1393
1394sub send_msg {
1395 my $ns = shift->ns
1396 or return;
1397 $ns->send_msg (@_);
1369} 1398}
1370 1399
1371=item $pl->quit_character 1400=item $pl->quit_character
1372 1401
1373Nukes the player without looking back. If logged in, the connection will 1402Nukes the player without looking back. If logged in, the connection will
… …
1428 or return []; 1457 or return [];
1429 1458
1430 my @logins; 1459 my @logins;
1431 1460
1432 for my $login (@$dirs) { 1461 for my $login (@$dirs) {
1462 my $path = path $login;
1463
1464 # a .pst is a dead give-away for a valid player
1465 unless (-e "$path.pst") {
1433 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1466 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1434 aio_read $fh, 0, 512, my $buf, 0 or next; 1467 aio_read $fh, 0, 512, my $buf, 0 or next;
1435 $buf !~ /^password -------------$/m or next; # official not-valid tag 1468 $buf !~ /^password -------------$/m or next; # official not-valid tag
1469 }
1436 1470
1437 utf8::decode $login; 1471 utf8::decode $login;
1438 push @logins, $login; 1472 push @logins, $login;
1439 } 1473 }
1440 1474
… …
1478sub expand_cfpod { 1512sub expand_cfpod {
1479 ((my $self), (local $_)) = @_; 1513 ((my $self), (local $_)) = @_;
1480 1514
1481 # escape & and < 1515 # escape & and <
1482 s/&/&amp;/g; 1516 s/&/&amp;/g;
1483 s/(?<![BIUGH])</&lt;/g; 1517 s/(?<![BIUGHT])</&lt;/g;
1484 1518
1485 # this is buggy, it needs to properly take care of nested <'s 1519 # this is buggy, it needs to properly take care of nested <'s
1486 1520
1487 1 while 1521 1 while
1488 # replace B<>, I<>, U<> etc. 1522 # replace B<>, I<>, U<> etc.
1489 s/B<([^\>]*)>/<b>$1<\/b>/ 1523 s/B<([^\>]*)>/<b>$1<\/b>/
1490 || s/I<([^\>]*)>/<i>$1<\/i>/ 1524 || s/I<([^\>]*)>/<i>$1<\/i>/
1491 || s/U<([^\>]*)>/<u>$1<\/u>/ 1525 || s/U<([^\>]*)>/<u>$1<\/u>/
1526 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1492 # replace G<male|female> tags 1527 # replace G<male|female> tags
1493 || s{G<([^>|]*)\|([^>]*)>}{ 1528 || s{G<([^>|]*)\|([^>]*)>}{
1494 $self->gender ? $2 : $1 1529 $self->gender ? $2 : $1
1495 }ge 1530 }ge
1496 # replace H<hint text> 1531 # replace H<hint text>
… …
1517sub hintmode { 1552sub hintmode {
1518 $_[0]{hintmode} = $_[1] if @_ > 1; 1553 $_[0]{hintmode} = $_[1] if @_ > 1;
1519 $_[0]{hintmode} 1554 $_[0]{hintmode}
1520} 1555}
1521 1556
1522=item $player->ext_reply ($msgid, %msg) 1557=item $player->ext_reply ($msgid, @msg)
1523 1558
1524Sends an ext reply to the player. 1559Sends an ext reply to the player.
1525 1560
1526=cut 1561=cut
1527 1562
1528sub ext_reply($$%) { 1563sub ext_reply($$@) {
1529 my ($self, $id, %msg) = @_; 1564 my ($self, $id, @msg) = @_;
1530 1565
1531 $msg{msgid} = $id; 1566 $self->ns->ext_reply ($id, @msg)
1532 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1533} 1567}
1534 1568
1535=item $player->ext_event ($type, %msg) 1569=item $player->ext_msg ($type, @msg)
1536 1570
1537Sends an ext event to the client. 1571Sends an ext event to the client.
1538 1572
1539=cut 1573=cut
1540 1574
1541sub ext_event($$%) { 1575sub ext_msg($$@) {
1542 my ($self, $type, %msg) = @_; 1576 my ($self, $type, @msg) = @_;
1543 1577
1544 $self->ns->ext_event ($type, %msg); 1578 $self->ns->ext_msg ($type, @msg);
1545} 1579}
1546 1580
1547=head3 cf::region 1581=head3 cf::region
1548 1582
1549=over 4 1583=over 4
… …
1765 1799
1766sub load_header_from($) { 1800sub load_header_from($) {
1767 my ($self, $path) = @_; 1801 my ($self, $path) = @_;
1768 1802
1769 utf8::encode $path; 1803 utf8::encode $path;
1770 #aio_open $path, O_RDONLY, 0 1804 my $f = new_from_file cf::object::thawer $path
1771 # or return;
1772
1773 $self->_load_header ($path)
1774 or return; 1805 or return;
1806
1807 $self->_load_header ($f)
1808 or return;
1809
1810 local $MAP_LOADING{$self->{path}} = $self;
1811 $f->resolve_delayed_derefs;
1775 1812
1776 $self->{load_path} = $path; 1813 $self->{load_path} = $path;
1777 1814
1778 1 1815 1
1779} 1816}
… …
1833sub find { 1870sub find {
1834 my ($path, $origin) = @_; 1871 my ($path, $origin) = @_;
1835 1872
1836 $path = normalise $path, $origin && $origin->path; 1873 $path = normalise $path, $origin && $origin->path;
1837 1874
1875 cf::lock_wait "map_data:$path";#d#remove
1838 cf::lock_wait "map_find:$path"; 1876 cf::lock_wait "map_find:$path";
1839 1877
1840 $cf::MAP{$path} || do { 1878 $cf::MAP{$path} || do {
1841 my $guard = cf::lock_acquire "map_find:$path"; 1879 my $guard1 = cf::lock_acquire "map_find:$path";
1880 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1881
1842 my $map = new_from_path cf::map $path 1882 my $map = new_from_path cf::map $path
1843 or return; 1883 or return;
1844 1884
1845 $map->{last_save} = $cf::RUNTIME; 1885 $map->{last_save} = $cf::RUNTIME;
1846 1886
… …
1848 or return; 1888 or return;
1849 1889
1850 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1890 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1851 # doing this can freeze the server in a sync job, obviously 1891 # doing this can freeze the server in a sync job, obviously
1852 #$cf::WAIT_FOR_TICK->wait; 1892 #$cf::WAIT_FOR_TICK->wait;
1893 undef $guard1;
1894 undef $guard2;
1853 $map->reset; 1895 $map->reset;
1854 undef $guard;
1855 return find $path; 1896 return find $path;
1856 } 1897 }
1857 1898
1858 $cf::MAP{$path} = $map 1899 $cf::MAP{$path} = $map
1859 } 1900 }
… …
1868 local $self->{deny_reset} = 1; # loading can take a long time 1909 local $self->{deny_reset} = 1; # loading can take a long time
1869 1910
1870 my $path = $self->{path}; 1911 my $path = $self->{path};
1871 1912
1872 { 1913 {
1873 my $guard = cf::lock_acquire "map_load:$path"; 1914 my $guard = cf::lock_acquire "map_data:$path";
1874 1915
1916 return unless $self->valid;
1875 return if $self->in_memory != cf::MAP_SWAPPED; 1917 return unless $self->in_memory == cf::MAP_SWAPPED;
1876 1918
1877 $self->in_memory (cf::MAP_LOADING); 1919 $self->in_memory (cf::MAP_LOADING);
1878 1920
1879 $self->alloc; 1921 $self->alloc;
1880 1922
1881 $self->pre_load; 1923 $self->pre_load;
1882 Coro::cede; 1924 cf::cede_to_tick;
1883 1925
1926 my $f = new_from_file cf::object::thawer $self->{load_path};
1927 $f->skip_block;
1884 $self->_load_objects ($self->{load_path}, 1) 1928 $self->_load_objects ($f)
1885 or return; 1929 or return;
1886 1930
1887 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1931 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1888 if delete $self->{load_original}; 1932 if delete $self->{load_original};
1889 1933
1890 if (my $uniq = $self->uniq_path) { 1934 if (my $uniq = $self->uniq_path) {
1891 utf8::encode $uniq; 1935 utf8::encode $uniq;
1892 if (aio_open $uniq, O_RDONLY, 0) { 1936 unless (aio_stat $uniq) {
1937 if (my $f = new_from_file cf::object::thawer $uniq) {
1893 $self->clear_unique_items; 1938 $self->clear_unique_items;
1894 $self->_load_objects ($uniq, 0); 1939 $self->_load_objects ($f);
1940 $f->resolve_delayed_derefs;
1941 }
1895 } 1942 }
1896 } 1943 }
1897 1944
1898 Coro::cede; 1945 $f->resolve_delayed_derefs;
1946
1947 cf::cede_to_tick;
1899 # now do the right thing for maps 1948 # now do the right thing for maps
1900 $self->link_multipart_objects; 1949 $self->link_multipart_objects;
1901 $self->difficulty ($self->estimate_difficulty) 1950 $self->difficulty ($self->estimate_difficulty)
1902 unless $self->difficulty; 1951 unless $self->difficulty;
1903 Coro::cede; 1952 cf::cede_to_tick;
1904 1953
1905 unless ($self->{deny_activate}) { 1954 unless ($self->{deny_activate}) {
1906 $self->decay_objects; 1955 $self->decay_objects;
1907 $self->fix_auto_apply; 1956 $self->fix_auto_apply;
1908 $self->update_buttons; 1957 $self->update_buttons;
1909 Coro::cede; 1958 cf::cede_to_tick;
1910 $self->set_darkness_map; 1959 $self->set_darkness_map;
1911 Coro::cede; 1960 cf::cede_to_tick;
1912 $self->activate; 1961 $self->activate;
1913 } 1962 }
1963
1964 $self->{last_save} = $cf::RUNTIME;
1965 $self->last_access ($cf::RUNTIME);
1914 1966
1915 $self->in_memory (cf::MAP_IN_MEMORY); 1967 $self->in_memory (cf::MAP_IN_MEMORY);
1916 } 1968 }
1917 1969
1918 $self->post_load; 1970 $self->post_load;
… …
1929 1981
1930 $self 1982 $self
1931} 1983}
1932 1984
1933# find and load all maps in the 3x3 area around a map 1985# find and load all maps in the 3x3 area around a map
1934sub load_diag { 1986sub load_neighbours {
1935 my ($map) = @_; 1987 my ($map) = @_;
1936 1988
1937 my @diag; # diagonal neighbours 1989 my @neigh; # diagonal neighbours
1938 1990
1939 for (0 .. 3) { 1991 for (0 .. 3) {
1940 my $neigh = $map->tile_path ($_) 1992 my $neigh = $map->tile_path ($_)
1941 or next; 1993 or next;
1942 $neigh = find $neigh, $map 1994 $neigh = find $neigh, $map
1943 or next; 1995 or next;
1944 $neigh->load; 1996 $neigh->load;
1945 1997
1998 push @neigh,
1946 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1999 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1947 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2000 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1948 } 2001 }
1949 2002
1950 for (@diag) { 2003 for (grep defined $_->[0], @neigh) {
2004 my ($path, $origin) = @$_;
1951 my $neigh = find @$_ 2005 my $neigh = find $path, $origin
1952 or next; 2006 or next;
1953 $neigh->load; 2007 $neigh->load;
1954 } 2008 }
1955} 2009}
1956 2010
… …
1961} 2015}
1962 2016
1963sub do_load_sync { 2017sub do_load_sync {
1964 my ($map) = @_; 2018 my ($map) = @_;
1965 2019
2020 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2021 if $Coro::current == $Coro::main;
2022
1966 cf::sync_job { $map->load }; 2023 cf::sync_job { $map->load };
1967} 2024}
1968 2025
1969our %MAP_PREFETCH; 2026our %MAP_PREFETCH;
1970our $MAP_PREFETCHER = undef; 2027our $MAP_PREFETCHER = undef;
1971 2028
1972sub find_async { 2029sub find_async {
1973 my ($path, $origin) = @_; 2030 my ($path, $origin, $load) = @_;
1974 2031
1975 $path = normalise $path, $origin && $origin->{path}; 2032 $path = normalise $path, $origin && $origin->{path};
1976 2033
1977 if (my $map = $cf::MAP{$path}) { 2034 if (my $map = $cf::MAP{$path}) {
1978 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2035 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1979 } 2036 }
1980 2037
1981 undef $MAP_PREFETCH{$path}; 2038 $MAP_PREFETCH{$path} |= $load;
2039
1982 $MAP_PREFETCHER ||= cf::async { 2040 $MAP_PREFETCHER ||= cf::async {
1983 while (%MAP_PREFETCH) { 2041 while (%MAP_PREFETCH) {
1984 for my $path (keys %MAP_PREFETCH) { 2042 while (my ($k, $v) = each %MAP_PREFETCH) {
1985 if (my $map = find $path) { 2043 if (my $map = find $k) {
1986 $map->load; 2044 $map->load if $v;
1987 } 2045 }
1988 2046
1989 delete $MAP_PREFETCH{$path}; 2047 delete $MAP_PREFETCH{$k};
1990 } 2048 }
1991 } 2049 }
1992 undef $MAP_PREFETCHER; 2050 undef $MAP_PREFETCHER;
1993 }; 2051 };
1994 $MAP_PREFETCHER->prio (6); 2052 $MAP_PREFETCHER->prio (6);
… …
1997} 2055}
1998 2056
1999sub save { 2057sub save {
2000 my ($self) = @_; 2058 my ($self) = @_;
2001 2059
2002 my $lock = cf::lock_acquire "map_data:" . $self->path; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
2003 2061
2004 $self->{last_save} = $cf::RUNTIME; 2062 $self->{last_save} = $cf::RUNTIME;
2005 2063
2006 return unless $self->dirty; 2064 return unless $self->dirty;
2007 2065
… …
2030 my ($self) = @_; 2088 my ($self) = @_;
2031 2089
2032 # save first because save cedes 2090 # save first because save cedes
2033 $self->save; 2091 $self->save;
2034 2092
2035 my $lock = cf::lock_acquire "map_data:" . $self->path; 2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
2036 2094
2037 return if $self->players; 2095 return if $self->players;
2038 return if $self->in_memory != cf::MAP_IN_MEMORY; 2096 return if $self->in_memory != cf::MAP_IN_MEMORY;
2039 return if $self->{deny_save}; 2097 return if $self->{deny_save};
2040 2098
2099 $self->in_memory (cf::MAP_SWAPPED);
2100
2101 $self->deactivate;
2102 $_->clear_links_to ($self) for values %cf::MAP;
2041 $self->clear; 2103 $self->clear;
2042 $self->in_memory (cf::MAP_SWAPPED);
2043} 2104}
2044 2105
2045sub reset_at { 2106sub reset_at {
2046 my ($self) = @_; 2107 my ($self) = @_;
2047 2108
… …
2079 if $uniq; 2140 if $uniq;
2080 } 2141 }
2081 2142
2082 delete $cf::MAP{$self->path}; 2143 delete $cf::MAP{$self->path};
2083 2144
2145 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP;
2084 $self->clear; 2147 $self->clear;
2085
2086 $_->clear_links_to ($self) for values %cf::MAP;
2087 2148
2088 $self->unlink_save; 2149 $self->unlink_save;
2089 $self->destroy; 2150 $self->destroy;
2090} 2151}
2091 2152
2092my $nuke_counter = "aaaa"; 2153my $nuke_counter = "aaaa";
2093 2154
2094sub nuke { 2155sub nuke {
2095 my ($self) = @_; 2156 my ($self) = @_;
2096 2157
2158 {
2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
2160
2097 delete $cf::MAP{$self->path}; 2161 delete $cf::MAP{$self->path};
2098 2162
2099 $self->unlink_save; 2163 $self->unlink_save;
2100 2164
2101 bless $self, "cf::map"; 2165 bless $self, "cf::map";
2102 delete $self->{deny_reset}; 2166 delete $self->{deny_reset};
2103 $self->{deny_save} = 1; 2167 $self->{deny_save} = 1;
2104 $self->reset_timeout (1); 2168 $self->reset_timeout (1);
2105 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2169 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2106 2170
2107 $cf::MAP{$self->path} = $self; 2171 $cf::MAP{$self->path} = $self;
2172 }
2108 2173
2109 $self->reset; # polite request, might not happen 2174 $self->reset; # polite request, might not happen
2110} 2175}
2111 2176
2112=item $maps = cf::map::tmp_maps 2177=item $maps = cf::map::tmp_maps
… …
2188 2253
2189sub inv_recursive { 2254sub inv_recursive {
2190 inv_recursive_ inv $_[0] 2255 inv_recursive_ inv $_[0]
2191} 2256}
2192 2257
2258=item $ref = $ob->ref
2259
2260creates and returns a persistent reference to an objetc that can be stored as a string.
2261
2262=item $ob = cf::object::deref ($refstring)
2263
2264returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2265even if the object actually exists. May block.
2266
2267=cut
2268
2269sub deref {
2270 my ($ref) = @_;
2271
2272 # temporary compatibility#TODO#remove
2273 $ref =~ s{^<}{player/<};
2274
2275 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2276 my ($uuid, $name) = ($1, $2);
2277 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2278 or return;
2279 $pl->ob->uuid eq $uuid
2280 or return;
2281
2282 $pl->ob
2283 } else {
2284 warn "$ref: cannot resolve object reference\n";
2285 undef
2286 }
2287}
2288
2193package cf; 2289package cf;
2194 2290
2195=back 2291=back
2196 2292
2197=head3 cf::object::player 2293=head3 cf::object::player
… …
2219 2315
2220 } else { 2316 } else {
2221 my $pl = $self->contr; 2317 my $pl = $self->contr;
2222 2318
2223 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2319 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2224 my $diag = $pl->{npc_dialog}; 2320 my $dialog = $pl->{npc_dialog};
2225 $diag->{pl}->ext_reply ( 2321 $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 2322
2232 } else { 2323 } else {
2233 $msg = $npc->name . " says: $msg" if $npc; 2324 $msg = $npc->name . " says: $msg" if $npc;
2234 $self->message ($msg, $flags); 2325 $self->message ($msg, $flags);
2235 } 2326 }
2236 } 2327 }
2328}
2329
2330=item $object->send_msg ($channel, $msg, $color, [extra...])
2331
2332=cut
2333
2334sub cf::object::send_msg {
2335 my $pl = shift->contr
2336 or return;
2337 $pl->send_msg (@_);
2237} 2338}
2238 2339
2239=item $player_object->may ("access") 2340=item $player_object->may ("access")
2240 2341
2241Returns wether the given player is authorized to access resource "access" 2342Returns wether the given player is authorized to access resource "access"
… …
2320 # use -1 or undef as default coordinates, not 0, 0 2421 # use -1 or undef as default coordinates, not 0, 0
2321 ($x, $y) = ($map->enter_x, $map->enter_y) 2422 ($x, $y) = ($map->enter_x, $map->enter_y)
2322 if $x <=0 && $y <= 0; 2423 if $x <=0 && $y <= 0;
2323 2424
2324 $map->load; 2425 $map->load;
2325 $map->load_diag; 2426 $map->load_neighbours;
2326 2427
2327 return unless $self->contr->active; 2428 return unless $self->contr->active;
2328 $self->activate_recursive; 2429 $self->activate_recursive;
2329 2430
2330 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2431 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2350 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2451 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2351 2452
2352 $self->enter_link; 2453 $self->enter_link;
2353 2454
2354 (async { 2455 (async {
2456 # *tag paths override both path and x|y
2457 if ($path =~ /^\*(.*)$/) {
2458 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2459 my $ob = $obs[rand @obs];
2460
2461 # see if we actually can go there
2462 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2463 $ob = $obs[rand @obs];
2464 } else {
2465 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2466 }
2467 # else put us there anyways for now #d#
2468
2469 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2470 } else {
2471 ($path, $x, $y) = (undef, undef, undef);
2472 }
2473 }
2474
2355 my $map = eval { 2475 my $map = eval {
2356 my $map = cf::map::find $path; 2476 my $map = defined $path ? cf::map::find $path : undef;
2357 2477
2358 if ($map) { 2478 if ($map) {
2359 $map = $map->customise_for ($self); 2479 $map = $map->customise_for ($self);
2360 $map = $check->($map) if $check && $map; 2480 $map = $check->($map) if $check && $map;
2361 } else { 2481 } else {
2362 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2482 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2363 } 2483 }
2364 2484
2365 $map 2485 $map
2366 }; 2486 };
2367 2487
… …
2501the message, with C<log> being the default. If C<$color> is negative, suppress 2621the message, with C<log> being the default. If C<$color> is negative, suppress
2502the message unless the client supports the msg packet. 2622the message unless the client supports the msg packet.
2503 2623
2504=cut 2624=cut
2505 2625
2626our %CHANNEL = (
2627 "c/identify" => {
2628 id => "identify",
2629 title => "Identify",
2630 reply => undef,
2631 tooltip => "Items recently identified",
2632 },
2633 "c/examine" => {
2634 id => "examine",
2635 title => "Examine",
2636 reply => undef,
2637 tooltip => "Signs and other items you examined",
2638 },
2639);
2640
2506sub cf::client::send_msg { 2641sub cf::client::send_msg {
2507 my ($self, $channel, $msg, $color, @extra) = @_; 2642 my ($self, $channel, $msg, $color, @extra) = @_;
2508 2643
2509 $msg = $self->pl->expand_cfpod ($msg); 2644 $msg = $self->pl->expand_cfpod ($msg);
2510 2645
2511 $color &= ~cf::NDI_UNIQUE; # just in case... 2646 $color &= cf::NDI_CLIENT_MASK; # just in case...
2647
2648 # check predefined channels, for the benefit of C
2649 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2512 2650
2513 if (ref $channel) { 2651 if (ref $channel) {
2514 # send meta info to client, if not yet sent 2652 # send meta info to client, if not yet sent
2515 unless (exists $self->{channel}{$channel->{id}}) { 2653 unless (exists $self->{channel}{$channel->{id}}) {
2516 $self->{channel}{$channel->{id}} = $channel; 2654 $self->{channel}{$channel->{id}} = $channel;
2517 $self->ext_event (channel_info => %$channel); 2655 $self->ext_msg (channel_info => $channel)
2656 if $self->can_msg;
2518 } 2657 }
2519 2658
2520 $channel = $channel->{id}; 2659 $channel = $channel->{id};
2521 } 2660 }
2522 2661
2523 return unless @extra || length $msg; 2662 return unless @extra || length $msg;
2524 2663
2525 if ($self->can_msg) { 2664 if ($self->can_msg) {
2665 # default colour, mask it out
2666 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2667 if $color & cf::NDI_DEF;
2668
2526 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2669 $self->send_packet ("msg " . $self->{json_coder}->encode (
2670 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2527 } else { 2671 } 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) { 2672 if ($color >= 0) {
2673 # replace some tags by gcfclient-compatible ones
2674 for ($msg) {
2675 1 while
2676 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2677 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2678 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2679 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2680 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2681 }
2682
2683 $color &= cf::NDI_COLOR_MASK;
2684
2685 utf8::encode $msg;
2686
2539 if (0 && $msg =~ /\[/) { 2687 if (0 && $msg =~ /\[/) {
2688 # COMMAND/INFO
2540 $self->send_packet ("drawextinfo $color 4 0 $msg") 2689 $self->send_packet ("drawextinfo $color 10 8 $msg")
2541 } else { 2690 } else {
2542 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2691 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2543 $self->send_packet ("drawinfo $color $msg") 2692 $self->send_packet ("drawinfo $color $msg")
2544 } 2693 }
2545 } 2694 }
2546 } 2695 }
2547} 2696}
2548 2697
2549=item $client->ext_event ($type, %msg) 2698=item $client->ext_msg ($type, @msg)
2550 2699
2551Sends an ext event to the client. 2700Sends an ext event to the client.
2552 2701
2553=cut 2702=cut
2554 2703
2555sub cf::client::ext_event($$%) { 2704sub cf::client::ext_msg($$@) {
2556 my ($self, $type, %msg) = @_; 2705 my ($self, $type, @msg) = @_;
2557 2706
2558 return unless $self->extcmd; 2707 if ($self->extcmd == 2) {
2559 2708 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2709 } elsif ($self->extcmd == 1) { # TODO: remove
2560 $msg{msgtype} = "event_$type"; 2710 push @msg, msgtype => "event_$type";
2561 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2711 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2712 }
2713}
2714
2715=item $client->ext_reply ($msgid, @msg)
2716
2717Sends an ext reply to the client.
2718
2719=cut
2720
2721sub cf::client::ext_reply($$@) {
2722 my ($self, $id, @msg) = @_;
2723
2724 if ($self->extcmd == 2) {
2725 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2726 } elsif ($self->extcmd == 1) {
2727 #TODO: version 1, remove
2728 unshift @msg, msgtype => "reply", msgid => $id;
2729 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2730 }
2562} 2731}
2563 2732
2564=item $success = $client->query ($flags, "text", \&cb) 2733=item $success = $client->query ($flags, "text", \&cb)
2565 2734
2566Queues a query to the client, calling the given callback with 2735Queues a query to the client, calling the given callback with
… …
2621 my ($ns, $buf) = @_; 2790 my ($ns, $buf) = @_;
2622 2791
2623 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2792 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2624 2793
2625 if (ref $msg) { 2794 if (ref $msg) {
2795 my ($type, $reply, @payload) =
2796 "ARRAY" eq ref $msg
2797 ? @$msg
2798 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2799
2800 my @reply;
2801
2626 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2802 if (my $cb = $EXTICMD{$type}) {
2627 if (my %reply = $cb->($ns, $msg)) { 2803 @reply = $cb->($ns, @payload);
2628 $reply{msgid} = $msg->{msgid};
2629 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2630 }
2631 } 2804 }
2805
2806 $ns->ext_reply ($reply, @reply)
2807 if $reply;
2808
2632 } else { 2809 } else {
2633 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2810 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2634 } 2811 }
2635 2812
2636 cf::override; 2813 cf::override;
… …
2683our $safe = new Safe "safe"; 2860our $safe = new Safe "safe";
2684our $safe_hole = new Safe::Hole; 2861our $safe_hole = new Safe::Hole;
2685 2862
2686$SIG{FPE} = 'IGNORE'; 2863$SIG{FPE} = 'IGNORE';
2687 2864
2688$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2865$safe->permit_only (Opcode::opset qw(
2866 :base_core :base_mem :base_orig :base_math
2867 grepstart grepwhile mapstart mapwhile
2868 sort time
2869));
2689 2870
2690# here we export the classes and methods available to script code 2871# here we export the classes and methods available to script code
2691 2872
2692=pod 2873=pod
2693 2874
2694The following functions and methods are available within a safe environment: 2875The following functions and methods are available within a safe environment:
2695 2876
2696 cf::object 2877 cf::object
2697 contr pay_amount pay_player map x y force_find force_add 2878 contr pay_amount pay_player map x y force_find force_add
2698 insert remove 2879 insert remove name archname title slaying race decrease_ob_nr
2699 2880
2700 cf::object::player 2881 cf::object::player
2701 player 2882 player
2702 2883
2703 cf::player 2884 cf::player
… …
2708 2889
2709=cut 2890=cut
2710 2891
2711for ( 2892for (
2712 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2893 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2894 insert remove inv name archname title slaying race
2713 insert remove)], 2895 decrease_ob_nr)],
2714 ["cf::object::player" => qw(player)], 2896 ["cf::object::player" => qw(player)],
2715 ["cf::player" => qw(peaceful)], 2897 ["cf::player" => qw(peaceful)],
2716 ["cf::map" => qw(trigger)], 2898 ["cf::map" => qw(trigger)],
2717) { 2899) {
2718 no strict 'refs'; 2900 no strict 'refs';
… …
2794# the server's init and main functions 2976# the server's init and main functions
2795 2977
2796sub load_facedata($) { 2978sub load_facedata($) {
2797 my ($path) = @_; 2979 my ($path) = @_;
2798 2980
2981 # HACK to clear player env face cache, we need some signal framework
2982 # for this (global event?)
2983 %ext::player_env::MUSIC_FACE_CACHE = ();
2984
2985 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2986
2799 warn "loading facedata from $path\n"; 2987 warn "loading facedata from $path\n";
2800 2988
2801 my $facedata; 2989 my $facedata;
2802 0 < aio_load $path, $facedata 2990 0 < aio_load $path, $facedata
2803 or die "$path: $!"; 2991 or die "$path: $!";
2804 2992
2805 $facedata = Coro::Storable::thaw $facedata; 2993 $facedata = Coro::Storable::thaw $facedata;
2806 2994
2807 $facedata->{version} == 2 2995 $facedata->{version} == 2
2808 or cf::cleanup "$path: version mismatch, cannot proceed."; 2996 or cf::cleanup "$path: version mismatch, cannot proceed.";
2997
2998 # patch in the exptable
2999 $facedata->{resource}{"res/exp_table"} = {
3000 type => FT_RSRC,
3001 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3002 };
3003 cf::cede_to_tick;
2809 3004
2810 { 3005 {
2811 my $faces = $facedata->{faceinfo}; 3006 my $faces = $facedata->{faceinfo};
2812 3007
2813 while (my ($face, $info) = each %$faces) { 3008 while (my ($face, $info) = each %$faces) {
2814 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3009 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2815 cf::face::set_visibility $idx, $info->{visibility}; 3010 cf::face::set_visibility $idx, $info->{visibility};
2816 cf::face::set_magicmap $idx, $info->{magicmap}; 3011 cf::face::set_magicmap $idx, $info->{magicmap};
2817 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3012 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2818 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3013 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2819 3014
2820 cf::cede_to_tick; 3015 cf::cede_to_tick;
2821 } 3016 }
2822 3017
2823 while (my ($face, $info) = each %$faces) { 3018 while (my ($face, $info) = each %$faces) {
… …
2848 3043
2849 { 3044 {
2850 # TODO: for gcfclient pleasure, we should give resources 3045 # TODO: for gcfclient pleasure, we should give resources
2851 # that gcfclient doesn't grok a >10000 face index. 3046 # that gcfclient doesn't grok a >10000 face index.
2852 my $res = $facedata->{resource}; 3047 my $res = $facedata->{resource};
2853 my $enc = JSON::XS->new->utf8->canonical; 3048
3049 my $soundconf = delete $res->{"res/sound.conf"};
2854 3050
2855 while (my ($name, $info) = each %$res) { 3051 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; 3052 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3053 my $data;
2863 3054
2864 if ($name =~ /\.jpg$/) { 3055 if ($info->{type} & 1) {
2865 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3056 # prepend meta info
2866 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3057
3058 my $meta = $enc->encode ({
3059 name => $name,
3060 %{ $info->{meta} || {} },
3061 });
3062
3063 $data = pack "(w/a*)*", $meta, $info->{data};
2867 } else { 3064 } else {
2868 my $data = pack "(w/a*)*", $meta, $info->{data}; 3065 $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 } 3066 }
2874 3067
3068 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3069 cf::face::set_type $idx, $info->{type};
3070
2875 cf::cede_to_tick; 3071 cf::cede_to_tick;
2876 } 3072 }
3073
3074 if ($soundconf) {
3075 $soundconf = $enc->decode (delete $soundconf->{data});
3076
3077 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3078 my $sound = $soundconf->{compat}[$_]
3079 or next;
3080
3081 my $face = cf::face::find "sound/$sound->[1]";
3082 cf::sound::set $sound->[0] => $face;
3083 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3084 }
3085
3086 while (my ($k, $v) = each %{$soundconf->{event}}) {
3087 my $face = cf::face::find "sound/$v";
3088 cf::sound::set $k => $face;
3089 }
3090 }
2877 } 3091 }
2878 3092
2879 1 3093 1
2880} 3094}
2881 3095
3096register_exticmd fx_want => sub {
3097 my ($ns, $want) = @_;
3098
3099 while (my ($k, $v) = each %$want) {
3100 $ns->fx_want ($k, $v);
3101 }
3102};
3103
2882sub reload_regions { 3104sub reload_regions {
3105 # HACK to clear player env face cache, we need some signal framework
3106 # for this (global event?)
3107 %ext::player_env::MUSIC_FACE_CACHE = ();
3108
2883 load_resource_file "$MAPDIR/regions" 3109 load_resource_file "$MAPDIR/regions"
2884 or die "unable to load regions file\n"; 3110 or die "unable to load regions file\n";
2885 3111
2886 for (cf::region::list) { 3112 for (cf::region::list) {
2887 $_->{match} = qr/$_->{match}/ 3113 $_->{match} = qr/$_->{match}/
… …
2923 3149
2924sub init { 3150sub init {
2925 reload_resources; 3151 reload_resources;
2926} 3152}
2927 3153
2928sub cfg_load { 3154sub reload_config {
2929 open my $fh, "<:utf8", "$CONFDIR/config" 3155 open my $fh, "<:utf8", "$CONFDIR/config"
2930 or return; 3156 or return;
2931 3157
2932 local $/; 3158 local $/;
2933 *CFG = YAML::Syck::Load <$fh>; 3159 *CFG = YAML::Syck::Load <$fh>;
… …
2953 (async { 3179 (async {
2954 Event::one_event; 3180 Event::one_event;
2955 })->prio (Coro::PRIO_MAX); 3181 })->prio (Coro::PRIO_MAX);
2956 }; 3182 };
2957 3183
2958 cfg_load; 3184 reload_config;
2959 db_init; 3185 db_init;
2960 load_extensions; 3186 load_extensions;
2961 3187
2962 $TICK_WATCHER->start; 3188 $TICK_WATCHER->start;
2963 Event::loop; 3189 Event::loop;
… …
3156 warn "reloading cf.pm"; 3382 warn "reloading cf.pm";
3157 require cf; 3383 require cf;
3158 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3384 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3159 3385
3160 warn "loading config and database again"; 3386 warn "loading config and database again";
3161 cf::cfg_load; 3387 cf::reload_config;
3162 3388
3163 warn "loading extensions"; 3389 warn "loading extensions";
3164 cf::load_extensions; 3390 cf::load_extensions;
3165 3391
3166 warn "reattaching attachments to objects/players"; 3392 warn "reattaching attachments to objects/players";
… …
3231 my $signal = new Coro::Signal; 3457 my $signal = new Coro::Signal;
3232 push @WAIT_FOR_TICK_BEGIN, $signal; 3458 push @WAIT_FOR_TICK_BEGIN, $signal;
3233 $signal->wait; 3459 $signal->wait;
3234} 3460}
3235 3461
3236 my $min = 1e6;#d#
3237 my $avg = 10;
3238$TICK_WATCHER = Event->timer ( 3462$TICK_WATCHER = Event->timer (
3239 reentrant => 0, 3463 reentrant => 0,
3240 parked => 1, 3464 parked => 1,
3241 prio => 0, 3465 prio => 0,
3242 at => $NEXT_TICK || $TICK, 3466 at => $NEXT_TICK || $TICK,
… …
3250 3474
3251 $NOW = $tick_start = Event::time; 3475 $NOW = $tick_start = Event::time;
3252 3476
3253 cf::server_tick; # one server iteration 3477 cf::server_tick; # one server iteration
3254 3478
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; 3479 $RUNTIME += $TICK;
3279 $NEXT_TICK += $TICK; 3480 $NEXT_TICK += $TICK;
3280 3481
3281 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3482 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3282 $NEXT_RUNTIME_WRITE = $NOW + 10; 3483 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
3284 write_runtime 3485 write_runtime
3285 or warn "ERROR: unable to write runtime file: $!"; 3486 or warn "ERROR: unable to write runtime file: $!";
3286 }; 3487 };
3287 } 3488 }
3288 3489
3289# my $AFTER = Event::time;
3290# warn $AFTER - $NOW;#d#
3291
3292 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3490 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3293 $sig->send; 3491 $sig->send;
3294 } 3492 }
3295 while (my $sig = shift @WAIT_FOR_TICK) { 3493 while (my $sig = shift @WAIT_FOR_TICK) {
3296 $sig->send; 3494 $sig->send;
… …
3306 3504
3307 $LOAD = ($NOW - $tick_start) / $TICK; 3505 $LOAD = ($NOW - $tick_start) / $TICK;
3308 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3506 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3309 3507
3310 _post_tick; 3508 _post_tick;
3311
3312
3313 }, 3509 },
3314); 3510);
3315 3511
3316{ 3512{
3513 BDB::min_parallel 8;
3317 BDB::max_poll_time $TICK * 0.1; 3514 BDB::max_poll_time $TICK * 0.1;
3318 $BDB_POLL_WATCHER = Event->io ( 3515 $BDB_POLL_WATCHER = Event->io (
3319 reentrant => 0, 3516 reentrant => 0,
3320 fd => BDB::poll_fileno, 3517 fd => BDB::poll_fileno,
3321 poll => 'r', 3518 poll => 'r',
3322 prio => 0, 3519 prio => 0,
3323 data => WF_AUTOCANCEL, 3520 data => WF_AUTOCANCEL,
3324 cb => \&BDB::poll_cb, 3521 cb => \&BDB::poll_cb,
3325 ); 3522 );
3326 BDB::min_parallel 8;
3327 3523
3328 BDB::set_sync_prepare { 3524 BDB::set_sync_prepare {
3329 my $status; 3525 my $status;
3330 my $current = $Coro::current; 3526 my $current = $Coro::current;
3331 ( 3527 (
… …
3340 ) 3536 )
3341 }; 3537 };
3342 3538
3343 unless ($DB_ENV) { 3539 unless ($DB_ENV) {
3344 $DB_ENV = BDB::db_env_create; 3540 $DB_ENV = BDB::db_env_create;
3541 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3542 | BDB::LOG_AUTOREMOVE, 1);
3543 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3544 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3345 3545
3346 cf::sync_job { 3546 cf::sync_job {
3347 eval { 3547 eval {
3348 BDB::db_env_open 3548 BDB::db_env_open
3349 $DB_ENV, 3549 $DB_ENV,
… …
3351 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3551 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3352 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3552 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3353 0666; 3553 0666;
3354 3554
3355 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3555 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 }; 3556 };
3360 3557
3361 cf::cleanup "db_env_open(db): $@" if $@; 3558 cf::cleanup "db_env_open(db): $@" if $@;
3362 }; 3559 };
3363 } 3560 }
3561
3562 $BDB_DEADLOCK_WATCHER = Event->timer (
3563 after => 3,
3564 interval => 1,
3565 hard => 1,
3566 prio => 0,
3567 data => WF_AUTOCANCEL,
3568 cb => sub {
3569 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3570 },
3571 );
3572 $BDB_CHECKPOINT_WATCHER = Event->timer (
3573 after => 11,
3574 interval => 60,
3575 hard => 1,
3576 prio => 0,
3577 data => WF_AUTOCANCEL,
3578 cb => sub {
3579 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3580 },
3581 );
3582 $BDB_TRICKLE_WATCHER = Event->timer (
3583 after => 5,
3584 interval => 10,
3585 hard => 1,
3586 prio => 0,
3587 data => WF_AUTOCANCEL,
3588 cb => sub {
3589 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3590 },
3591 );
3364} 3592}
3365 3593
3366{ 3594{
3367 IO::AIO::min_parallel 8; 3595 IO::AIO::min_parallel 8;
3368 3596

Diff Legend

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