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.324 by root, Sat Jul 28 14:23:17 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
… …
1186 my ($type, $reply, @payload) = 1177 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1178 "ARRAY" eq ref $msg
1188 ? @$msg 1179 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1180 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1181
1182 my @reply;
1183
1191 if (my $cb = $EXTCMD{$type}) { 1184 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1185 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1186 }
1187
1188 $pl->ext_reply ($reply, @reply)
1189 if $reply;
1190
1197 } else { 1191 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1192 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1193 }
1200 1194
1201 cf::override; 1195 cf::override;
… …
1291 1285
1292=head3 cf::player 1286=head3 cf::player
1293 1287
1294=over 4 1288=over 4
1295 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
1296=item cf::player::find $login 1304=item cf::player::find $login
1297 1305
1298Returns the given player object, loading it if necessary (might block). 1306Returns the given player object, loading it if necessary (might block).
1299 1307
1300=cut 1308=cut
… …
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1343 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1344 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1345 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1346 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1347
1340 my $pl = load_pl path $login 1348 my $f = new_from_file cf::object::thawer path $login
1341 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;
1342 $cf::PLAYER{$login} = $pl 1355 $cf::PLAYER{$login} = $pl
1343 } 1356 }
1344 } 1357 }
1345} 1358}
1346 1359
… …
1356 1369
1357 aio_mkdir playerdir $pl, 0770; 1370 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1371 $pl->{last_save} = $cf::RUNTIME;
1359 1372
1360 $pl->save_pl ($path); 1373 $pl->save_pl ($path);
1361 Coro::cede; 1374 cf::cede_to_tick;
1362} 1375}
1363 1376
1364sub new($) { 1377sub new($) {
1365 my ($login) = @_; 1378 my ($login) = @_;
1366 1379
… …
1370 $self->{deny_save} = 1; 1383 $self->{deny_save} = 1;
1371 1384
1372 $cf::PLAYER{$login} = $self; 1385 $cf::PLAYER{$login} = $self;
1373 1386
1374 $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 (@_);
1375} 1398}
1376 1399
1377=item $pl->quit_character 1400=item $pl->quit_character
1378 1401
1379Nukes the player without looking back. If logged in, the connection will 1402Nukes the player without looking back. If logged in, the connection will
… …
1434 or return []; 1457 or return [];
1435 1458
1436 my @logins; 1459 my @logins;
1437 1460
1438 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") {
1439 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1466 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440 aio_read $fh, 0, 512, my $buf, 0 or next; 1467 aio_read $fh, 0, 512, my $buf, 0 or next;
1441 $buf !~ /^password -------------$/m or next; # official not-valid tag 1468 $buf !~ /^password -------------$/m or next; # official not-valid tag
1469 }
1442 1470
1443 utf8::decode $login; 1471 utf8::decode $login;
1444 push @logins, $login; 1472 push @logins, $login;
1445 } 1473 }
1446 1474
… …
1484sub expand_cfpod { 1512sub expand_cfpod {
1485 ((my $self), (local $_)) = @_; 1513 ((my $self), (local $_)) = @_;
1486 1514
1487 # escape & and < 1515 # escape & and <
1488 s/&/&amp;/g; 1516 s/&/&amp;/g;
1489 s/(?<![BIUGH])</&lt;/g; 1517 s/(?<![BIUGHT])</&lt;/g;
1490 1518
1491 # 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
1492 1520
1493 1 while 1521 1 while
1494 # replace B<>, I<>, U<> etc. 1522 # replace B<>, I<>, U<> etc.
1495 s/B<([^\>]*)>/<b>$1<\/b>/ 1523 s/B<([^\>]*)>/<b>$1<\/b>/
1496 || s/I<([^\>]*)>/<i>$1<\/i>/ 1524 || s/I<([^\>]*)>/<i>$1<\/i>/
1497 || s/U<([^\>]*)>/<u>$1<\/u>/ 1525 || s/U<([^\>]*)>/<u>$1<\/u>/
1526 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1498 # replace G<male|female> tags 1527 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{ 1528 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1 1529 $self->gender ? $2 : $1
1501 }ge 1530 }ge
1502 # replace H<hint text> 1531 # replace H<hint text>
… …
1532=cut 1561=cut
1533 1562
1534sub ext_reply($$@) { 1563sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1564 my ($self, $id, @msg) = @_;
1536 1565
1537 if ($self->ns->extcmd == 2) { 1566 $self->ns->ext_reply ($id, @msg)
1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1539 } elsif ($self->ns->extcmd == 1) {
1540 #TODO: version 1, remove
1541 unshift @msg, msgtype => "reply", msgid => $id;
1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1544} 1567}
1545 1568
1546=item $player->ext_msg ($type, @msg) 1569=item $player->ext_msg ($type, @msg)
1547 1570
1548Sends an ext event to the client. 1571Sends an ext event to the client.
… …
1776 1799
1777sub load_header_from($) { 1800sub load_header_from($) {
1778 my ($self, $path) = @_; 1801 my ($self, $path) = @_;
1779 1802
1780 utf8::encode $path; 1803 utf8::encode $path;
1781 #aio_open $path, O_RDONLY, 0 1804 my $f = new_from_file cf::object::thawer $path
1782 # or return;
1783
1784 $self->_load_header ($path)
1785 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;
1786 1812
1787 $self->{load_path} = $path; 1813 $self->{load_path} = $path;
1788 1814
1789 1 1815 1
1790} 1816}
… …
1844sub find { 1870sub find {
1845 my ($path, $origin) = @_; 1871 my ($path, $origin) = @_;
1846 1872
1847 $path = normalise $path, $origin && $origin->path; 1873 $path = normalise $path, $origin && $origin->path;
1848 1874
1875 cf::lock_wait "map_data:$path";#d#remove
1849 cf::lock_wait "map_find:$path"; 1876 cf::lock_wait "map_find:$path";
1850 1877
1851 $cf::MAP{$path} || do { 1878 $cf::MAP{$path} || do {
1852 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
1853 my $map = new_from_path cf::map $path 1882 my $map = new_from_path cf::map $path
1854 or return; 1883 or return;
1855 1884
1856 $map->{last_save} = $cf::RUNTIME; 1885 $map->{last_save} = $cf::RUNTIME;
1857 1886
… …
1859 or return; 1888 or return;
1860 1889
1861 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1890 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862 # doing this can freeze the server in a sync job, obviously 1891 # doing this can freeze the server in a sync job, obviously
1863 #$cf::WAIT_FOR_TICK->wait; 1892 #$cf::WAIT_FOR_TICK->wait;
1893 undef $guard1;
1894 undef $guard2;
1864 $map->reset; 1895 $map->reset;
1865 undef $guard;
1866 return find $path; 1896 return find $path;
1867 } 1897 }
1868 1898
1869 $cf::MAP{$path} = $map 1899 $cf::MAP{$path} = $map
1870 } 1900 }
… …
1879 local $self->{deny_reset} = 1; # loading can take a long time 1909 local $self->{deny_reset} = 1; # loading can take a long time
1880 1910
1881 my $path = $self->{path}; 1911 my $path = $self->{path};
1882 1912
1883 { 1913 {
1884 my $guard = cf::lock_acquire "map_load:$path"; 1914 my $guard = cf::lock_acquire "map_data:$path";
1885 1915
1916 return unless $self->valid;
1886 return if $self->in_memory != cf::MAP_SWAPPED; 1917 return unless $self->in_memory == cf::MAP_SWAPPED;
1887 1918
1888 $self->in_memory (cf::MAP_LOADING); 1919 $self->in_memory (cf::MAP_LOADING);
1889 1920
1890 $self->alloc; 1921 $self->alloc;
1891 1922
1892 $self->pre_load; 1923 $self->pre_load;
1893 Coro::cede; 1924 cf::cede_to_tick;
1894 1925
1926 my $f = new_from_file cf::object::thawer $self->{load_path};
1927 $f->skip_block;
1895 $self->_load_objects ($self->{load_path}, 1) 1928 $self->_load_objects ($f)
1896 or return; 1929 or return;
1897 1930
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1931 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1899 if delete $self->{load_original}; 1932 if delete $self->{load_original};
1900 1933
1901 if (my $uniq = $self->uniq_path) { 1934 if (my $uniq = $self->uniq_path) {
1902 utf8::encode $uniq; 1935 utf8::encode $uniq;
1903 if (aio_open $uniq, O_RDONLY, 0) { 1936 unless (aio_stat $uniq) {
1937 if (my $f = new_from_file cf::object::thawer $uniq) {
1904 $self->clear_unique_items; 1938 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 1939 $self->_load_objects ($f);
1940 $f->resolve_delayed_derefs;
1941 }
1906 } 1942 }
1907 } 1943 }
1908 1944
1909 Coro::cede; 1945 $f->resolve_delayed_derefs;
1946
1947 cf::cede_to_tick;
1910 # now do the right thing for maps 1948 # now do the right thing for maps
1911 $self->link_multipart_objects; 1949 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 1950 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 1951 unless $self->difficulty;
1914 Coro::cede; 1952 cf::cede_to_tick;
1915 1953
1916 unless ($self->{deny_activate}) { 1954 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 1955 $self->decay_objects;
1918 $self->fix_auto_apply; 1956 $self->fix_auto_apply;
1919 $self->update_buttons; 1957 $self->update_buttons;
1920 Coro::cede; 1958 cf::cede_to_tick;
1921 $self->set_darkness_map; 1959 $self->set_darkness_map;
1922 Coro::cede; 1960 cf::cede_to_tick;
1923 $self->activate; 1961 $self->activate;
1924 } 1962 }
1925 1963
1926 $map->{last_save} = $cf::RUNTIME; 1964 $self->{last_save} = $cf::RUNTIME;
1927 $map->last_access ($cf::RUNTIME); 1965 $self->last_access ($cf::RUNTIME);
1928 1966
1929 $self->in_memory (cf::MAP_IN_MEMORY); 1967 $self->in_memory (cf::MAP_IN_MEMORY);
1930 } 1968 }
1931 1969
1932 $self->post_load; 1970 $self->post_load;
… …
1943 1981
1944 $self 1982 $self
1945} 1983}
1946 1984
1947# 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
1948sub load_diag { 1986sub load_neighbours {
1949 my ($map) = @_; 1987 my ($map) = @_;
1950 1988
1951 my @diag; # diagonal neighbours 1989 my @neigh; # diagonal neighbours
1952 1990
1953 for (0 .. 3) { 1991 for (0 .. 3) {
1954 my $neigh = $map->tile_path ($_) 1992 my $neigh = $map->tile_path ($_)
1955 or next; 1993 or next;
1956 $neigh = find $neigh, $map 1994 $neigh = find $neigh, $map
1957 or next; 1995 or next;
1958 $neigh->load; 1996 $neigh->load;
1959 1997
1998 push @neigh,
1960 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1999 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1961 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2000 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1962 } 2001 }
1963 2002
1964 for (@diag) { 2003 for (grep defined $_->[0], @neigh) {
2004 my ($path, $origin) = @$_;
1965 my $neigh = find @$_ 2005 my $neigh = find $path, $origin
1966 or next; 2006 or next;
1967 $neigh->load; 2007 $neigh->load;
1968 } 2008 }
1969} 2009}
1970 2010
… …
1975} 2015}
1976 2016
1977sub do_load_sync { 2017sub do_load_sync {
1978 my ($map) = @_; 2018 my ($map) = @_;
1979 2019
2020 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2021 if $Coro::current == $Coro::main;
2022
1980 cf::sync_job { $map->load }; 2023 cf::sync_job { $map->load };
1981} 2024}
1982 2025
1983our %MAP_PREFETCH; 2026our %MAP_PREFETCH;
1984our $MAP_PREFETCHER = undef; 2027our $MAP_PREFETCHER = undef;
1985 2028
1986sub find_async { 2029sub find_async {
1987 my ($path, $origin) = @_; 2030 my ($path, $origin, $load) = @_;
1988 2031
1989 $path = normalise $path, $origin && $origin->{path}; 2032 $path = normalise $path, $origin && $origin->{path};
1990 2033
1991 if (my $map = $cf::MAP{$path}) { 2034 if (my $map = $cf::MAP{$path}) {
1992 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2035 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1993 } 2036 }
1994 2037
1995 undef $MAP_PREFETCH{$path}; 2038 $MAP_PREFETCH{$path} |= $load;
2039
1996 $MAP_PREFETCHER ||= cf::async { 2040 $MAP_PREFETCHER ||= cf::async {
1997 while (%MAP_PREFETCH) { 2041 while (%MAP_PREFETCH) {
1998 for my $path (keys %MAP_PREFETCH) { 2042 while (my ($k, $v) = each %MAP_PREFETCH) {
1999 if (my $map = find $path) { 2043 if (my $map = find $k) {
2000 $map->load; 2044 $map->load if $v;
2001 } 2045 }
2002 2046
2003 delete $MAP_PREFETCH{$path}; 2047 delete $MAP_PREFETCH{$k};
2004 } 2048 }
2005 } 2049 }
2006 undef $MAP_PREFETCHER; 2050 undef $MAP_PREFETCHER;
2007 }; 2051 };
2008 $MAP_PREFETCHER->prio (6); 2052 $MAP_PREFETCHER->prio (6);
… …
2011} 2055}
2012 2056
2013sub save { 2057sub save {
2014 my ($self) = @_; 2058 my ($self) = @_;
2015 2059
2016 my $lock = cf::lock_acquire "map_data:" . $self->path; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
2017 2061
2018 $self->{last_save} = $cf::RUNTIME; 2062 $self->{last_save} = $cf::RUNTIME;
2019 2063
2020 return unless $self->dirty; 2064 return unless $self->dirty;
2021 2065
… …
2044 my ($self) = @_; 2088 my ($self) = @_;
2045 2089
2046 # save first because save cedes 2090 # save first because save cedes
2047 $self->save; 2091 $self->save;
2048 2092
2049 my $lock = cf::lock_acquire "map_data:" . $self->path; 2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
2050 2094
2051 return if $self->players; 2095 return if $self->players;
2052 return if $self->in_memory != cf::MAP_IN_MEMORY; 2096 return if $self->in_memory != cf::MAP_IN_MEMORY;
2053 return if $self->{deny_save}; 2097 return if $self->{deny_save};
2054 2098
2099 $self->in_memory (cf::MAP_SWAPPED);
2100
2101 $self->deactivate;
2102 $_->clear_links_to ($self) for values %cf::MAP;
2055 $self->clear; 2103 $self->clear;
2056 $self->in_memory (cf::MAP_SWAPPED);
2057} 2104}
2058 2105
2059sub reset_at { 2106sub reset_at {
2060 my ($self) = @_; 2107 my ($self) = @_;
2061 2108
… …
2093 if $uniq; 2140 if $uniq;
2094 } 2141 }
2095 2142
2096 delete $cf::MAP{$self->path}; 2143 delete $cf::MAP{$self->path};
2097 2144
2145 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP;
2098 $self->clear; 2147 $self->clear;
2099
2100 $_->clear_links_to ($self) for values %cf::MAP;
2101 2148
2102 $self->unlink_save; 2149 $self->unlink_save;
2103 $self->destroy; 2150 $self->destroy;
2104} 2151}
2105 2152
2106my $nuke_counter = "aaaa"; 2153my $nuke_counter = "aaaa";
2107 2154
2108sub nuke { 2155sub nuke {
2109 my ($self) = @_; 2156 my ($self) = @_;
2110 2157
2158 {
2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
2160
2111 delete $cf::MAP{$self->path}; 2161 delete $cf::MAP{$self->path};
2112 2162
2113 $self->unlink_save; 2163 $self->unlink_save;
2114 2164
2115 bless $self, "cf::map"; 2165 bless $self, "cf::map";
2116 delete $self->{deny_reset}; 2166 delete $self->{deny_reset};
2117 $self->{deny_save} = 1; 2167 $self->{deny_save} = 1;
2118 $self->reset_timeout (1); 2168 $self->reset_timeout (1);
2119 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2169 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2120 2170
2121 $cf::MAP{$self->path} = $self; 2171 $cf::MAP{$self->path} = $self;
2172 }
2122 2173
2123 $self->reset; # polite request, might not happen 2174 $self->reset; # polite request, might not happen
2124} 2175}
2125 2176
2126=item $maps = cf::map::tmp_maps 2177=item $maps = cf::map::tmp_maps
… …
2202 2253
2203sub inv_recursive { 2254sub inv_recursive {
2204 inv_recursive_ inv $_[0] 2255 inv_recursive_ inv $_[0]
2205} 2256}
2206 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
2207package cf; 2289package cf;
2208 2290
2209=back 2291=back
2210 2292
2211=head3 cf::object::player 2293=head3 cf::object::player
… …
2243 $self->message ($msg, $flags); 2325 $self->message ($msg, $flags);
2244 } 2326 }
2245 } 2327 }
2246} 2328}
2247 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 (@_);
2338}
2339
2248=item $player_object->may ("access") 2340=item $player_object->may ("access")
2249 2341
2250Returns wether the given player is authorized to access resource "access" 2342Returns wether the given player is authorized to access resource "access"
2251(e.g. "command_wizcast"). 2343(e.g. "command_wizcast").
2252 2344
… …
2329 # use -1 or undef as default coordinates, not 0, 0 2421 # use -1 or undef as default coordinates, not 0, 0
2330 ($x, $y) = ($map->enter_x, $map->enter_y) 2422 ($x, $y) = ($map->enter_x, $map->enter_y)
2331 if $x <=0 && $y <= 0; 2423 if $x <=0 && $y <= 0;
2332 2424
2333 $map->load; 2425 $map->load;
2334 $map->load_diag; 2426 $map->load_neighbours;
2335 2427
2336 return unless $self->contr->active; 2428 return unless $self->contr->active;
2337 $self->activate_recursive; 2429 $self->activate_recursive;
2338 2430
2339 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2431 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2359 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2451 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2360 2452
2361 $self->enter_link; 2453 $self->enter_link;
2362 2454
2363 (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
2364 my $map = eval { 2475 my $map = eval {
2365 my $map = cf::map::find $path; 2476 my $map = defined $path ? cf::map::find $path : undef;
2366 2477
2367 if ($map) { 2478 if ($map) {
2368 $map = $map->customise_for ($self); 2479 $map = $map->customise_for ($self);
2369 $map = $check->($map) if $check && $map; 2480 $map = $check->($map) if $check && $map;
2370 } else { 2481 } else {
2371 $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);
2372 } 2483 }
2373 2484
2374 $map 2485 $map
2375 }; 2486 };
2376 2487
… …
2510the 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
2511the message unless the client supports the msg packet. 2622the message unless the client supports the msg packet.
2512 2623
2513=cut 2624=cut
2514 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
2515sub cf::client::send_msg { 2641sub cf::client::send_msg {
2516 my ($self, $channel, $msg, $color, @extra) = @_; 2642 my ($self, $channel, $msg, $color, @extra) = @_;
2517 2643
2518 $msg = $self->pl->expand_cfpod ($msg); 2644 $msg = $self->pl->expand_cfpod ($msg);
2519 2645
2520 $color &= cf::NDI_CLIENT_MASK; # 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};
2521 2650
2522 if (ref $channel) { 2651 if (ref $channel) {
2523 # send meta info to client, if not yet sent 2652 # send meta info to client, if not yet sent
2524 unless (exists $self->{channel}{$channel->{id}}) { 2653 unless (exists $self->{channel}{$channel->{id}}) {
2525 $self->{channel}{$channel->{id}} = $channel; 2654 $self->{channel}{$channel->{id}} = $channel;
2526 $self->ext_msg (channel_info => $channel); 2655 $self->ext_msg (channel_info => $channel)
2656 if $self->can_msg;
2527 } 2657 }
2528 2658
2529 $channel = $channel->{id}; 2659 $channel = $channel->{id};
2530 } 2660 }
2531 2661
… …
2550 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/; 2680 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2551 } 2681 }
2552 2682
2553 $color &= cf::NDI_COLOR_MASK; 2683 $color &= cf::NDI_COLOR_MASK;
2554 2684
2685 utf8::encode $msg;
2686
2555 if (0 && $msg =~ /\[/) { 2687 if (0 && $msg =~ /\[/) {
2688 # COMMAND/INFO
2556 $self->send_packet ("drawextinfo $color 4 0 $msg") 2689 $self->send_packet ("drawextinfo $color 10 8 $msg")
2557 } else { 2690 } else {
2558 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2691 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2559 $self->send_packet ("drawinfo $color $msg") 2692 $self->send_packet ("drawinfo $color $msg")
2560 } 2693 }
2561 } 2694 }
… …
2569=cut 2702=cut
2570 2703
2571sub cf::client::ext_msg($$@) { 2704sub cf::client::ext_msg($$@) {
2572 my ($self, $type, @msg) = @_; 2705 my ($self, $type, @msg) = @_;
2573 2706
2574 my $extcmd = $self->extcmd;
2575
2576 if ($extcmd == 2) { 2707 if ($self->extcmd == 2) {
2577 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2708 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2578 } elsif ($extcmd == 1) { # TODO: remove 2709 } elsif ($self->extcmd == 1) { # TODO: remove
2579 push @msg, msgtype => "event_$type"; 2710 push @msg, msgtype => "event_$type";
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;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2729 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 } 2730 }
2582} 2731}
2583 2732
2584=item $success = $client->query ($flags, "text", \&cb) 2733=item $success = $client->query ($flags, "text", \&cb)
… …
2646 my ($type, $reply, @payload) = 2795 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg 2796 "ARRAY" eq ref $msg
2648 ? @$msg 2797 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2798 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650 2799
2800 my @reply;
2801
2651 if (my $cb = $EXTICMD{$type}) { 2802 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload); 2803 @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 } 2804 }
2805
2806 $ns->ext_reply ($reply, @reply)
2807 if $reply;
2808
2657 } else { 2809 } else {
2658 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";
2659 } 2811 }
2660 2812
2661 cf::override; 2813 cf::override;
… …
2708our $safe = new Safe "safe"; 2860our $safe = new Safe "safe";
2709our $safe_hole = new Safe::Hole; 2861our $safe_hole = new Safe::Hole;
2710 2862
2711$SIG{FPE} = 'IGNORE'; 2863$SIG{FPE} = 'IGNORE';
2712 2864
2713$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));
2714 2870
2715# here we export the classes and methods available to script code 2871# here we export the classes and methods available to script code
2716 2872
2717=pod 2873=pod
2718 2874
2719The following functions and methods are available within a safe environment: 2875The following functions and methods are available within a safe environment:
2720 2876
2721 cf::object 2877 cf::object
2722 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
2723 insert remove 2879 insert remove name archname title slaying race decrease_ob_nr
2724 2880
2725 cf::object::player 2881 cf::object::player
2726 player 2882 player
2727 2883
2728 cf::player 2884 cf::player
… …
2733 2889
2734=cut 2890=cut
2735 2891
2736for ( 2892for (
2737 ["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
2738 insert remove)], 2895 decrease_ob_nr)],
2739 ["cf::object::player" => qw(player)], 2896 ["cf::object::player" => qw(player)],
2740 ["cf::player" => qw(peaceful)], 2897 ["cf::player" => qw(peaceful)],
2741 ["cf::map" => qw(trigger)], 2898 ["cf::map" => qw(trigger)],
2742) { 2899) {
2743 no strict 'refs'; 2900 no strict 'refs';
… …
2819# the server's init and main functions 2976# the server's init and main functions
2820 2977
2821sub load_facedata($) { 2978sub load_facedata($) {
2822 my ($path) = @_; 2979 my ($path) = @_;
2823 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
2824 warn "loading facedata from $path\n"; 2987 warn "loading facedata from $path\n";
2825 2988
2826 my $facedata; 2989 my $facedata;
2827 0 < aio_load $path, $facedata 2990 0 < aio_load $path, $facedata
2828 or die "$path: $!"; 2991 or die "$path: $!";
2829 2992
2830 $facedata = Coro::Storable::thaw $facedata; 2993 $facedata = Coro::Storable::thaw $facedata;
2831 2994
2832 $facedata->{version} == 2 2995 $facedata->{version} == 2
2833 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;
2834 3004
2835 { 3005 {
2836 my $faces = $facedata->{faceinfo}; 3006 my $faces = $facedata->{faceinfo};
2837 3007
2838 while (my ($face, $info) = each %$faces) { 3008 while (my ($face, $info) = each %$faces) {
2839 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3009 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2840 cf::face::set_visibility $idx, $info->{visibility}; 3010 cf::face::set_visibility $idx, $info->{visibility};
2841 cf::face::set_magicmap $idx, $info->{magicmap}; 3011 cf::face::set_magicmap $idx, $info->{magicmap};
2842 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3012 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2843 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3013 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2844 3014
2845 cf::cede_to_tick; 3015 cf::cede_to_tick;
2846 } 3016 }
2847 3017
2848 while (my ($face, $info) = each %$faces) { 3018 while (my ($face, $info) = each %$faces) {
… …
2873 3043
2874 { 3044 {
2875 # TODO: for gcfclient pleasure, we should give resources 3045 # TODO: for gcfclient pleasure, we should give resources
2876 # that gcfclient doesn't grok a >10000 face index. 3046 # that gcfclient doesn't grok a >10000 face index.
2877 my $res = $facedata->{resource}; 3047 my $res = $facedata->{resource};
2878 my $enc = JSON::XS->new->utf8->canonical;
2879 3048
2880 my $soundconf = delete $res->{"res/sound.conf"}; 3049 my $soundconf = delete $res->{"res/sound.conf"};
2881 3050
2882 while (my ($name, $info) = each %$res) { 3051 while (my ($name, $info) = each %$res) {
2883 my $meta = $enc->encode ({
2884 name => $name,
2885 %{ $info->{meta} || {} },
2886 });
2887
2888 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3052 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3053 my $data;
2889 3054
2890 if ($info->{type} & 1) { 3055 if ($info->{type} & 1) {
2891 # prepend meta info 3056 # prepend meta info
2892 3057
3058 my $meta = $enc->encode ({
3059 name => $name,
3060 %{ $info->{meta} || {} },
3061 });
3062
2893 my $data = pack "(w/a*)*", $meta, $info->{data}; 3063 $data = pack "(w/a*)*", $meta, $info->{data};
2894 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2895
2896 cf::face::set_data $idx, 0, $data, $chk;
2897 } else { 3064 } else {
2898 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3065 $data = $info->{data};
2899 } 3066 }
2900 3067
3068 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2901 cf::face::set_type $idx, $info->{type}; 3069 cf::face::set_type $idx, $info->{type};
2902 3070
2903 cf::cede_to_tick; 3071 cf::cede_to_tick;
2904 } 3072 }
2905 3073
… …
2909 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3077 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2910 my $sound = $soundconf->{compat}[$_] 3078 my $sound = $soundconf->{compat}[$_]
2911 or next; 3079 or next;
2912 3080
2913 my $face = cf::face::find "sound/$sound->[1]"; 3081 my $face = cf::face::find "sound/$sound->[1]";
2914
2915 cf::sound::set $sound->[0] => $face; 3082 cf::sound::set $sound->[0] => $face;
2916 cf::sound::old_sound_index $_, $face; # gcfclient-compat 3083 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2917 } 3084 }
2918 3085
3086 while (my ($k, $v) = each %{$soundconf->{event}}) {
3087 my $face = cf::face::find "sound/$v";
3088 cf::sound::set $k => $face;
2919 #TODO 3089 }
2920 } 3090 }
2921 } 3091 }
2922 3092
2923 1 3093 1
2924} 3094}
… …
2930 $ns->fx_want ($k, $v); 3100 $ns->fx_want ($k, $v);
2931 } 3101 }
2932}; 3102};
2933 3103
2934sub 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
2935 load_resource_file "$MAPDIR/regions" 3109 load_resource_file "$MAPDIR/regions"
2936 or die "unable to load regions file\n"; 3110 or die "unable to load regions file\n";
2937 3111
2938 for (cf::region::list) { 3112 for (cf::region::list) {
2939 $_->{match} = qr/$_->{match}/ 3113 $_->{match} = qr/$_->{match}/
… …
2975 3149
2976sub init { 3150sub init {
2977 reload_resources; 3151 reload_resources;
2978} 3152}
2979 3153
2980sub cfg_load { 3154sub reload_config {
2981 open my $fh, "<:utf8", "$CONFDIR/config" 3155 open my $fh, "<:utf8", "$CONFDIR/config"
2982 or return; 3156 or return;
2983 3157
2984 local $/; 3158 local $/;
2985 *CFG = YAML::Syck::Load <$fh>; 3159 *CFG = YAML::Syck::Load <$fh>;
… …
3005 (async { 3179 (async {
3006 Event::one_event; 3180 Event::one_event;
3007 })->prio (Coro::PRIO_MAX); 3181 })->prio (Coro::PRIO_MAX);
3008 }; 3182 };
3009 3183
3010 cfg_load; 3184 reload_config;
3011 db_init; 3185 db_init;
3012 load_extensions; 3186 load_extensions;
3013 3187
3014 $TICK_WATCHER->start; 3188 $TICK_WATCHER->start;
3015 Event::loop; 3189 Event::loop;
… …
3208 warn "reloading cf.pm"; 3382 warn "reloading cf.pm";
3209 require cf; 3383 require cf;
3210 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3384 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3211 3385
3212 warn "loading config and database again"; 3386 warn "loading config and database again";
3213 cf::cfg_load; 3387 cf::reload_config;
3214 3388
3215 warn "loading extensions"; 3389 warn "loading extensions";
3216 cf::load_extensions; 3390 cf::load_extensions;
3217 3391
3218 warn "reattaching attachments to objects/players"; 3392 warn "reattaching attachments to objects/players";
… …
3283 my $signal = new Coro::Signal; 3457 my $signal = new Coro::Signal;
3284 push @WAIT_FOR_TICK_BEGIN, $signal; 3458 push @WAIT_FOR_TICK_BEGIN, $signal;
3285 $signal->wait; 3459 $signal->wait;
3286} 3460}
3287 3461
3288 my $min = 1e6;#d#
3289 my $avg = 10;
3290$TICK_WATCHER = Event->timer ( 3462$TICK_WATCHER = Event->timer (
3291 reentrant => 0, 3463 reentrant => 0,
3292 parked => 1, 3464 parked => 1,
3293 prio => 0, 3465 prio => 0,
3294 at => $NEXT_TICK || $TICK, 3466 at => $NEXT_TICK || $TICK,
… …
3302 3474
3303 $NOW = $tick_start = Event::time; 3475 $NOW = $tick_start = Event::time;
3304 3476
3305 cf::server_tick; # one server iteration 3477 cf::server_tick; # one server iteration
3306 3478
3307 0 && sync_job {#d#
3308 for(1..10) {
3309 my $t = Event::time;
3310 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3311 or die;
3312
3313 $map->width (50);
3314 $map->height (50);
3315 $map->alloc;
3316 $map->_load_objects ("/tmp/x.map", 1);
3317 my $t = Event::time - $t;
3318
3319 #next unless $t < 0.0013;#d#
3320 if ($t < $min) {
3321 $min = $t;
3322 }
3323 $avg = $avg * 0.99 + $t * 0.01;
3324 }
3325 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3326 exit 0;
3327 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3328 };
3329
3330 $RUNTIME += $TICK; 3479 $RUNTIME += $TICK;
3331 $NEXT_TICK += $TICK; 3480 $NEXT_TICK += $TICK;
3332 3481
3333 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3482 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3334 $NEXT_RUNTIME_WRITE = $NOW + 10; 3483 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
3336 write_runtime 3485 write_runtime
3337 or warn "ERROR: unable to write runtime file: $!"; 3486 or warn "ERROR: unable to write runtime file: $!";
3338 }; 3487 };
3339 } 3488 }
3340 3489
3341# my $AFTER = Event::time;
3342# warn $AFTER - $NOW;#d#
3343
3344 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3490 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3345 $sig->send; 3491 $sig->send;
3346 } 3492 }
3347 while (my $sig = shift @WAIT_FOR_TICK) { 3493 while (my $sig = shift @WAIT_FOR_TICK) {
3348 $sig->send; 3494 $sig->send;
… …
3358 3504
3359 $LOAD = ($NOW - $tick_start) / $TICK; 3505 $LOAD = ($NOW - $tick_start) / $TICK;
3360 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3506 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3361 3507
3362 _post_tick; 3508 _post_tick;
3363
3364
3365 }, 3509 },
3366); 3510);
3367 3511
3368{ 3512{
3513 BDB::min_parallel 8;
3369 BDB::max_poll_time $TICK * 0.1; 3514 BDB::max_poll_time $TICK * 0.1;
3370 $BDB_POLL_WATCHER = Event->io ( 3515 $BDB_POLL_WATCHER = Event->io (
3371 reentrant => 0, 3516 reentrant => 0,
3372 fd => BDB::poll_fileno, 3517 fd => BDB::poll_fileno,
3373 poll => 'r', 3518 poll => 'r',
3374 prio => 0, 3519 prio => 0,
3375 data => WF_AUTOCANCEL, 3520 data => WF_AUTOCANCEL,
3376 cb => \&BDB::poll_cb, 3521 cb => \&BDB::poll_cb,
3377 ); 3522 );
3378 BDB::min_parallel 8;
3379 3523
3380 BDB::set_sync_prepare { 3524 BDB::set_sync_prepare {
3381 my $status; 3525 my $status;
3382 my $current = $Coro::current; 3526 my $current = $Coro::current;
3383 ( 3527 (
… …
3392 ) 3536 )
3393 }; 3537 };
3394 3538
3395 unless ($DB_ENV) { 3539 unless ($DB_ENV) {
3396 $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);
3397 3545
3398 cf::sync_job { 3546 cf::sync_job {
3399 eval { 3547 eval {
3400 BDB::db_env_open 3548 BDB::db_env_open
3401 $DB_ENV, 3549 $DB_ENV,
… …
3403 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
3404 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3552 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3405 0666; 3553 0666;
3406 3554
3407 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3555 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3408
3409 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3410 $DB_ENV->set_lk_detect;
3411 }; 3556 };
3412 3557
3413 cf::cleanup "db_env_open(db): $@" if $@; 3558 cf::cleanup "db_env_open(db): $@" if $@;
3414 }; 3559 };
3415 } 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 );
3416} 3592}
3417 3593
3418{ 3594{
3419 IO::AIO::min_parallel 8; 3595 IO::AIO::min_parallel 8;
3420 3596

Diff Legend

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