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.328 by root, Wed Aug 8 06:24:30 2007 UTC vs.
Revision 1.371 by root, Thu Sep 13 16:16:01 2007 UTC

… …
10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
… …
79our $NEXT_TICK; 80our $NEXT_TICK;
80our $NOW; 81our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
82 83
83our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 88our $DB_ENV;
85 89
86our %CFG; 90our %CFG;
87 91
88our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 93our $RUNTIME;
90 94
91our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
94 98
95# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 101
… …
186 $msg .= "\n" 190 $msg .= "\n"
187 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
188 192
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 194
191 utf8::encode $msg;
192 LOG llevError, $msg; 195 LOG llevError, $msg;
193 }; 196 };
194} 197}
195 198
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
271Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
274returned. 277returned.
275 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
276Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
278 284
279=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
280 286
281Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
282 288
283=cut 289=cut
284 290
285our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
286 293
287sub lock_wait($) { 294sub lock_wait($) {
288 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
289 301
290 # wait for lock, if any 302 # wait for lock, if any
291 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 305 Coro::schedule;
… …
299 311
300 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
301 lock_wait $key; 313 lock_wait $key;
302 314
303 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
304 317
305 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
308 } 322 }
309} 323}
310 324
… …
472Coro::Storable. May, of course, block. Note that the executed sub may 486Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 487never block itself or use any form of Event handling.
474 488
475=cut 489=cut
476 490
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485
486sub fork_call(&@) { 491sub fork_call(&@) {
487 my ($cb, @args) = @_; 492 my ($cb, @args) = @_;
488 493
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 494 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 495 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 496 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 497
494 if (my $pid = fork) { 498 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 499 reset_signals;
508 local $SIG{__WARN__}; 500 &$cb
509 local $SIG{__DIE__}; 501 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 502
516 eval { 503 wantarray ? @res : $res[-1]
517 close $fh1;
518
519 my @res = eval { $cb->(@args) };
520
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
523 };
524
525 warn $@ if $@;
526 _exit 0;
527 }
528} 504}
529 505
530=item $value = cf::db_get $family => $key 506=item $value = cf::db_get $family => $key
531 507
532Returns a single value from the environment database. 508Returns a single value from the environment database.
… …
534=item cf::db_put $family => $key => $value 510=item cf::db_put $family => $key => $value
535 511
536Stores the given C<$value> in the family. It can currently store binary 512Stores the given C<$value> in the family. It can currently store binary
537data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 513data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 514
515=item $db = cf::db_table "name"
516
517Create and/or open a new database table. The string must not be "db" and must be unique
518within each server.
519
539=cut 520=cut
521
522sub db_table($) {
523 my ($name) = @_;
524 my $db = BDB::db_create $DB_ENV;
525
526 eval {
527 $db->set_flags (BDB::CHKSUM);
528
529 utf8::encode $name;
530 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
531 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
532 cf::cleanup "db_open(db): $!" if $!;
533 };
534 cf::cleanup "db_open(db): $@" if $@;
535
536 $db
537}
540 538
541our $DB; 539our $DB;
542 540
543sub db_init { 541sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 542 cf::sync_job {
548 eval { 543 $DB ||= db_table "db";
549 $DB->set_flags (BDB::CHKSUM);
550
551 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553 cf::cleanup "db_open(db): $!" if $!;
554 };
555 cf::cleanup "db_open(db): $@" if $@;
556 };
557 } 544 };
558} 545}
559 546
560sub db_get($$) { 547sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 548 my $key = "$_[0]/$_[1]";
562 549
… …
612 if (1) { 599 if (1) {
613 $md5 = 600 $md5 =
614 join "\x00", 601 join "\x00",
615 $processversion, 602 $processversion,
616 map { 603 map {
617 Coro::cede; 604 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 605 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 606 } 0.. $#$src;
620 607
621 608
622 my $dbmd5 = db_get cache => "$id/md5"; 609 my $dbmd5 = db_get cache => "$id/md5";
… …
1039); 1026);
1040 1027
1041sub object_freezer_save { 1028sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1029 my ($filename, $rdata, $objs) = @_;
1043 1030
1031 my $guard = cf::lock_acquire "io";
1032
1044 sync_job { 1033 sync_job {
1045 if (length $$rdata) { 1034 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1036 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1037 $decname, length $$rdata, scalar @$objs;
1048 1038
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1039 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1040 chmod SAVE_MODE, $fh;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1041 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1042 aio_fsync $fh if $cf::USE_FSYNC;
… …
1071 } 1061 }
1072 } else { 1062 } else {
1073 aio_unlink $filename; 1063 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1064 aio_unlink "$filename.pst";
1075 } 1065 }
1076 } 1066 };
1067
1068 undef $guard;
1077} 1069}
1078 1070
1079sub object_freezer_as_string { 1071sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1072 my ($rdata, $objs) = @_;
1081 1073
… …
1086 1078
1087sub object_thawer_load { 1079sub object_thawer_load {
1088 my ($filename) = @_; 1080 my ($filename) = @_;
1089 1081
1090 my ($data, $av); 1082 my ($data, $av);
1083
1084 my $guard = cf::lock_acquire "io";
1091 1085
1092 (aio_load $filename, $data) >= 0 1086 (aio_load $filename, $data) >= 0
1093 or return; 1087 or return;
1094 1088
1095 unless (aio_stat "$filename.pst") { 1089 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1090 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1091 or return;
1092
1093 undef $guard;
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1094 $av = eval { (Storable::thaw $av)->{objs} };
1099 } 1095 }
1100 1096
1097 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1098 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1099 $decname, length $data, scalar @{$av || []};
1100
1103 return ($data, $av); 1101 ($data, $av)
1104} 1102}
1105 1103
1106=head2 COMMAND CALLBACKS 1104=head2 COMMAND CALLBACKS
1107 1105
1108=over 4 1106=over 4
… …
1186 my ($type, $reply, @payload) = 1184 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1185 "ARRAY" eq ref $msg
1188 ? @$msg 1186 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1187 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1188
1189 my @reply;
1190
1191 if (my $cb = $EXTCMD{$type}) { 1191 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1192 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1193 }
1194
1195 $pl->ext_reply ($reply, @reply)
1196 if $reply;
1197
1197 } else { 1198 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1199 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1200 }
1200 1201
1201 cf::override; 1202 cf::override;
… …
1291 1292
1292=head3 cf::player 1293=head3 cf::player
1293 1294
1294=over 4 1295=over 4
1295 1296
1297=item cf::player::num_playing
1298
1299Returns the official number of playing players, as per the Crossfire metaserver rules.
1300
1301=cut
1302
1303sub num_playing {
1304 scalar grep
1305 $_->ob->map
1306 && !$_->hidden
1307 && !$_->ob->flag (cf::FLAG_WIZ),
1308 cf::player::list
1309}
1310
1296=item cf::player::find $login 1311=item cf::player::find $login
1297 1312
1298Returns the given player object, loading it if necessary (might block). 1313Returns the given player object, loading it if necessary (might block).
1299 1314
1300=cut 1315=cut
… …
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1350 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1351 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1352 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1353 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1354
1340 my $pl = load_pl path $login 1355 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1356 or return;
1357
1358 $f->next;
1359 my $pl = cf::player::load_pl $f
1360 or return;
1361 local $cf::PLAYER_LOADING{$login} = $pl;
1362 $f->resolve_delayed_derefs;
1342 $cf::PLAYER{$login} = $pl 1363 $cf::PLAYER{$login} = $pl
1343 } 1364 }
1344 } 1365 }
1345} 1366}
1346 1367
… …
1356 1377
1357 aio_mkdir playerdir $pl, 0770; 1378 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1379 $pl->{last_save} = $cf::RUNTIME;
1359 1380
1360 $pl->save_pl ($path); 1381 $pl->save_pl ($path);
1361 Coro::cede; 1382 cf::cede_to_tick;
1362} 1383}
1363 1384
1364sub new($) { 1385sub new($) {
1365 my ($login) = @_; 1386 my ($login) = @_;
1366 1387
… …
1370 $self->{deny_save} = 1; 1391 $self->{deny_save} = 1;
1371 1392
1372 $cf::PLAYER{$login} = $self; 1393 $cf::PLAYER{$login} = $self;
1373 1394
1374 $self 1395 $self
1396}
1397
1398=item $player->send_msg ($channel, $msg, $color, [extra...])
1399
1400=cut
1401
1402sub send_msg {
1403 my $ns = shift->ns
1404 or return;
1405 $ns->send_msg (@_);
1375} 1406}
1376 1407
1377=item $pl->quit_character 1408=item $pl->quit_character
1378 1409
1379Nukes the player without looking back. If logged in, the connection will 1410Nukes the player without looking back. If logged in, the connection will
… …
1434 or return []; 1465 or return [];
1435 1466
1436 my @logins; 1467 my @logins;
1437 1468
1438 for my $login (@$dirs) { 1469 for my $login (@$dirs) {
1470 my $path = path $login;
1471
1472 # a .pst is a dead give-away for a valid player
1473 unless (-e "$path.pst") {
1439 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1474 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440 aio_read $fh, 0, 512, my $buf, 0 or next; 1475 aio_read $fh, 0, 512, my $buf, 0 or next;
1441 $buf !~ /^password -------------$/m or next; # official not-valid tag 1476 $buf !~ /^password -------------$/m or next; # official not-valid tag
1477 }
1442 1478
1443 utf8::decode $login; 1479 utf8::decode $login;
1444 push @logins, $login; 1480 push @logins, $login;
1445 } 1481 }
1446 1482
… …
1484sub expand_cfpod { 1520sub expand_cfpod {
1485 ((my $self), (local $_)) = @_; 1521 ((my $self), (local $_)) = @_;
1486 1522
1487 # escape & and < 1523 # escape & and <
1488 s/&/&amp;/g; 1524 s/&/&amp;/g;
1489 s/(?<![BIUGH])</&lt;/g; 1525 s/(?<![BIUGHT])</&lt;/g;
1490 1526
1491 # this is buggy, it needs to properly take care of nested <'s 1527 # this is buggy, it needs to properly take care of nested <'s
1492 1528
1493 1 while 1529 1 while
1494 # replace B<>, I<>, U<> etc. 1530 # replace B<>, I<>, U<> etc.
1495 s/B<([^\>]*)>/<b>$1<\/b>/ 1531 s/B<([^\>]*)>/<b>$1<\/b>/
1496 || s/I<([^\>]*)>/<i>$1<\/i>/ 1532 || s/I<([^\>]*)>/<i>$1<\/i>/
1497 || s/U<([^\>]*)>/<u>$1<\/u>/ 1533 || s/U<([^\>]*)>/<u>$1<\/u>/
1534 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1498 # replace G<male|female> tags 1535 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{ 1536 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1 1537 $self->gender ? $2 : $1
1501 }ge 1538 }ge
1502 # replace H<hint text> 1539 # replace H<hint text>
… …
1532=cut 1569=cut
1533 1570
1534sub ext_reply($$@) { 1571sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1572 my ($self, $id, @msg) = @_;
1536 1573
1537 if ($self->ns->extcmd == 2) { 1574 $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} 1575}
1545 1576
1546=item $player->ext_msg ($type, @msg) 1577=item $player->ext_msg ($type, @msg)
1547 1578
1548Sends an ext event to the client. 1579Sends an ext event to the client.
… …
1776 1807
1777sub load_header_from($) { 1808sub load_header_from($) {
1778 my ($self, $path) = @_; 1809 my ($self, $path) = @_;
1779 1810
1780 utf8::encode $path; 1811 utf8::encode $path;
1781 #aio_open $path, O_RDONLY, 0 1812 my $f = new_from_file cf::object::thawer $path
1782 # or return;
1783
1784 $self->_load_header ($path)
1785 or return; 1813 or return;
1814
1815 $self->_load_header ($f)
1816 or return;
1817
1818 local $MAP_LOADING{$self->{path}} = $self;
1819 $f->resolve_delayed_derefs;
1786 1820
1787 $self->{load_path} = $path; 1821 $self->{load_path} = $path;
1788 1822
1789 1 1823 1
1790} 1824}
… …
1844sub find { 1878sub find {
1845 my ($path, $origin) = @_; 1879 my ($path, $origin) = @_;
1846 1880
1847 $path = normalise $path, $origin && $origin->path; 1881 $path = normalise $path, $origin && $origin->path;
1848 1882
1883 cf::lock_wait "map_data:$path";#d#remove
1849 cf::lock_wait "map_find:$path"; 1884 cf::lock_wait "map_find:$path";
1850 1885
1851 $cf::MAP{$path} || do { 1886 $cf::MAP{$path} || do {
1852 my $guard = cf::lock_acquire "map_find:$path"; 1887 my $guard1 = cf::lock_acquire "map_find:$path";
1888 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1889
1853 my $map = new_from_path cf::map $path 1890 my $map = new_from_path cf::map $path
1854 or return; 1891 or return;
1855 1892
1856 $map->{last_save} = $cf::RUNTIME; 1893 $map->{last_save} = $cf::RUNTIME;
1857 1894
… …
1859 or return; 1896 or return;
1860 1897
1861 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1898 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862 # doing this can freeze the server in a sync job, obviously 1899 # doing this can freeze the server in a sync job, obviously
1863 #$cf::WAIT_FOR_TICK->wait; 1900 #$cf::WAIT_FOR_TICK->wait;
1901 undef $guard1;
1902 undef $guard2;
1864 $map->reset; 1903 $map->reset;
1865 undef $guard;
1866 return find $path; 1904 return find $path;
1867 } 1905 }
1868 1906
1869 $cf::MAP{$path} = $map 1907 $cf::MAP{$path} = $map
1870 } 1908 }
… …
1879 local $self->{deny_reset} = 1; # loading can take a long time 1917 local $self->{deny_reset} = 1; # loading can take a long time
1880 1918
1881 my $path = $self->{path}; 1919 my $path = $self->{path};
1882 1920
1883 { 1921 {
1884 my $guard = cf::lock_acquire "map_load:$path"; 1922 my $guard = cf::lock_acquire "map_data:$path";
1885 1923
1924 return unless $self->valid;
1886 return if $self->in_memory != cf::MAP_SWAPPED; 1925 return unless $self->in_memory == cf::MAP_SWAPPED;
1887 1926
1888 $self->in_memory (cf::MAP_LOADING); 1927 $self->in_memory (cf::MAP_LOADING);
1889 1928
1890 $self->alloc; 1929 $self->alloc;
1891 1930
1892 $self->pre_load; 1931 $self->pre_load;
1893 Coro::cede; 1932 cf::cede_to_tick;
1894 1933
1934 my $f = new_from_file cf::object::thawer $self->{load_path};
1935 $f->skip_block;
1895 $self->_load_objects ($self->{load_path}, 1) 1936 $self->_load_objects ($f)
1896 or return; 1937 or return;
1897 1938
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1939 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1899 if delete $self->{load_original}; 1940 if delete $self->{load_original};
1900 1941
1901 if (my $uniq = $self->uniq_path) { 1942 if (my $uniq = $self->uniq_path) {
1902 utf8::encode $uniq; 1943 utf8::encode $uniq;
1903 if (aio_open $uniq, O_RDONLY, 0) { 1944 unless (aio_stat $uniq) {
1945 if (my $f = new_from_file cf::object::thawer $uniq) {
1904 $self->clear_unique_items; 1946 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 1947 $self->_load_objects ($f);
1948 $f->resolve_delayed_derefs;
1949 }
1906 } 1950 }
1907 } 1951 }
1908 1952
1909 Coro::cede; 1953 $f->resolve_delayed_derefs;
1954
1955 cf::cede_to_tick;
1910 # now do the right thing for maps 1956 # now do the right thing for maps
1911 $self->link_multipart_objects; 1957 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 1958 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 1959 unless $self->difficulty;
1914 Coro::cede; 1960 cf::cede_to_tick;
1915 1961
1916 unless ($self->{deny_activate}) { 1962 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 1963 $self->decay_objects;
1918 $self->fix_auto_apply; 1964 $self->fix_auto_apply;
1919 $self->update_buttons; 1965 $self->update_buttons;
1920 Coro::cede; 1966 cf::cede_to_tick;
1921 $self->set_darkness_map; 1967 $self->set_darkness_map;
1922 Coro::cede; 1968 cf::cede_to_tick;
1923 $self->activate; 1969 $self->activate;
1924 } 1970 }
1925 1971
1926 $self->{last_save} = $cf::RUNTIME; 1972 $self->{last_save} = $cf::RUNTIME;
1927 $self->last_access ($cf::RUNTIME); 1973 $self->last_access ($cf::RUNTIME);
… …
1943 1989
1944 $self 1990 $self
1945} 1991}
1946 1992
1947# find and load all maps in the 3x3 area around a map 1993# find and load all maps in the 3x3 area around a map
1948sub load_diag { 1994sub load_neighbours {
1949 my ($map) = @_; 1995 my ($map) = @_;
1950 1996
1951 my @diag; # diagonal neighbours 1997 my @neigh; # diagonal neighbours
1952 1998
1953 for (0 .. 3) { 1999 for (0 .. 3) {
1954 my $neigh = $map->tile_path ($_) 2000 my $neigh = $map->tile_path ($_)
1955 or next; 2001 or next;
1956 $neigh = find $neigh, $map 2002 $neigh = find $neigh, $map
1957 or next; 2003 or next;
1958 $neigh->load; 2004 $neigh->load;
1959 2005
2006 push @neigh,
1960 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2007 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1961 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2008 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1962 } 2009 }
1963 2010
1964 for (@diag) { 2011 for (grep defined $_->[0], @neigh) {
2012 my ($path, $origin) = @$_;
1965 my $neigh = find @$_ 2013 my $neigh = find $path, $origin
1966 or next; 2014 or next;
1967 $neigh->load; 2015 $neigh->load;
1968 } 2016 }
1969} 2017}
1970 2018
… …
1975} 2023}
1976 2024
1977sub do_load_sync { 2025sub do_load_sync {
1978 my ($map) = @_; 2026 my ($map) = @_;
1979 2027
2028 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2029 if $Coro::current == $Coro::main;
2030
1980 cf::sync_job { $map->load }; 2031 cf::sync_job { $map->load };
1981} 2032}
1982 2033
1983our %MAP_PREFETCH; 2034our %MAP_PREFETCH;
1984our $MAP_PREFETCHER = undef; 2035our $MAP_PREFETCHER = undef;
1985 2036
1986sub find_async { 2037sub find_async {
1987 my ($path, $origin) = @_; 2038 my ($path, $origin, $load) = @_;
1988 2039
1989 $path = normalise $path, $origin && $origin->{path}; 2040 $path = normalise $path, $origin && $origin->{path};
1990 2041
1991 if (my $map = $cf::MAP{$path}) { 2042 if (my $map = $cf::MAP{$path}) {
1992 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2043 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1993 } 2044 }
1994 2045
1995 undef $MAP_PREFETCH{$path}; 2046 $MAP_PREFETCH{$path} |= $load;
2047
1996 $MAP_PREFETCHER ||= cf::async { 2048 $MAP_PREFETCHER ||= cf::async {
1997 while (%MAP_PREFETCH) { 2049 while (%MAP_PREFETCH) {
1998 for my $path (keys %MAP_PREFETCH) { 2050 while (my ($k, $v) = each %MAP_PREFETCH) {
1999 if (my $map = find $path) { 2051 if (my $map = find $k) {
2000 $map->load; 2052 $map->load if $v;
2001 } 2053 }
2002 2054
2003 delete $MAP_PREFETCH{$path}; 2055 delete $MAP_PREFETCH{$k};
2004 } 2056 }
2005 } 2057 }
2006 undef $MAP_PREFETCHER; 2058 undef $MAP_PREFETCHER;
2007 }; 2059 };
2008 $MAP_PREFETCHER->prio (6); 2060 $MAP_PREFETCHER->prio (6);
… …
2011} 2063}
2012 2064
2013sub save { 2065sub save {
2014 my ($self) = @_; 2066 my ($self) = @_;
2015 2067
2016 my $lock = cf::lock_acquire "map_data:" . $self->path; 2068 my $lock = cf::lock_acquire "map_data:$self->{path}";
2017 2069
2018 $self->{last_save} = $cf::RUNTIME; 2070 $self->{last_save} = $cf::RUNTIME;
2019 2071
2020 return unless $self->dirty; 2072 return unless $self->dirty;
2021 2073
… …
2044 my ($self) = @_; 2096 my ($self) = @_;
2045 2097
2046 # save first because save cedes 2098 # save first because save cedes
2047 $self->save; 2099 $self->save;
2048 2100
2049 my $lock = cf::lock_acquire "map_data:" . $self->path; 2101 my $lock = cf::lock_acquire "map_data:$self->{path}";
2050 2102
2051 return if $self->players; 2103 return if $self->players;
2052 return if $self->in_memory != cf::MAP_IN_MEMORY; 2104 return if $self->in_memory != cf::MAP_IN_MEMORY;
2053 return if $self->{deny_save}; 2105 return if $self->{deny_save};
2054 2106
2107 $self->in_memory (cf::MAP_SWAPPED);
2108
2109 $self->deactivate;
2110 $_->clear_links_to ($self) for values %cf::MAP;
2055 $self->clear; 2111 $self->clear;
2056 $self->in_memory (cf::MAP_SWAPPED);
2057} 2112}
2058 2113
2059sub reset_at { 2114sub reset_at {
2060 my ($self) = @_; 2115 my ($self) = @_;
2061 2116
… …
2093 if $uniq; 2148 if $uniq;
2094 } 2149 }
2095 2150
2096 delete $cf::MAP{$self->path}; 2151 delete $cf::MAP{$self->path};
2097 2152
2153 $self->deactivate;
2154 $_->clear_links_to ($self) for values %cf::MAP;
2098 $self->clear; 2155 $self->clear;
2099
2100 $_->clear_links_to ($self) for values %cf::MAP;
2101 2156
2102 $self->unlink_save; 2157 $self->unlink_save;
2103 $self->destroy; 2158 $self->destroy;
2104} 2159}
2105 2160
2106my $nuke_counter = "aaaa"; 2161my $nuke_counter = "aaaa";
2107 2162
2108sub nuke { 2163sub nuke {
2109 my ($self) = @_; 2164 my ($self) = @_;
2110 2165
2166 {
2167 my $lock = cf::lock_acquire "map_data:$self->{path}";
2168
2111 delete $cf::MAP{$self->path}; 2169 delete $cf::MAP{$self->path};
2112 2170
2113 $self->unlink_save; 2171 $self->unlink_save;
2114 2172
2115 bless $self, "cf::map"; 2173 bless $self, "cf::map";
2116 delete $self->{deny_reset}; 2174 delete $self->{deny_reset};
2117 $self->{deny_save} = 1; 2175 $self->{deny_save} = 1;
2118 $self->reset_timeout (1); 2176 $self->reset_timeout (1);
2119 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2177 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2120 2178
2121 $cf::MAP{$self->path} = $self; 2179 $cf::MAP{$self->path} = $self;
2180 }
2122 2181
2123 $self->reset; # polite request, might not happen 2182 $self->reset; # polite request, might not happen
2124} 2183}
2125 2184
2126=item $maps = cf::map::tmp_maps 2185=item $maps = cf::map::tmp_maps
… …
2202 2261
2203sub inv_recursive { 2262sub inv_recursive {
2204 inv_recursive_ inv $_[0] 2263 inv_recursive_ inv $_[0]
2205} 2264}
2206 2265
2266=item $ref = $ob->ref
2267
2268creates and returns a persistent reference to an objetc that can be stored as a string.
2269
2270=item $ob = cf::object::deref ($refstring)
2271
2272returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2273even if the object actually exists. May block.
2274
2275=cut
2276
2277sub deref {
2278 my ($ref) = @_;
2279
2280 # temporary compatibility#TODO#remove
2281 $ref =~ s{^<}{player/<};
2282
2283 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2284 my ($uuid, $name) = ($1, $2);
2285 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2286 or return;
2287 $pl->ob->uuid eq $uuid
2288 or return;
2289
2290 $pl->ob
2291 } else {
2292 warn "$ref: cannot resolve object reference\n";
2293 undef
2294 }
2295}
2296
2207package cf; 2297package cf;
2208 2298
2209=back 2299=back
2210 2300
2211=head3 cf::object::player 2301=head3 cf::object::player
… …
2243 $self->message ($msg, $flags); 2333 $self->message ($msg, $flags);
2244 } 2334 }
2245 } 2335 }
2246} 2336}
2247 2337
2338=item $object->send_msg ($channel, $msg, $color, [extra...])
2339
2340=cut
2341
2342sub cf::object::send_msg {
2343 my $pl = shift->contr
2344 or return;
2345 $pl->send_msg (@_);
2346}
2347
2248=item $player_object->may ("access") 2348=item $player_object->may ("access")
2249 2349
2250Returns wether the given player is authorized to access resource "access" 2350Returns wether the given player is authorized to access resource "access"
2251(e.g. "command_wizcast"). 2351(e.g. "command_wizcast").
2252 2352
… …
2329 # use -1 or undef as default coordinates, not 0, 0 2429 # use -1 or undef as default coordinates, not 0, 0
2330 ($x, $y) = ($map->enter_x, $map->enter_y) 2430 ($x, $y) = ($map->enter_x, $map->enter_y)
2331 if $x <=0 && $y <= 0; 2431 if $x <=0 && $y <= 0;
2332 2432
2333 $map->load; 2433 $map->load;
2334 $map->load_diag; 2434 $map->load_neighbours;
2335 2435
2336 return unless $self->contr->active; 2436 return unless $self->contr->active;
2337 $self->activate_recursive; 2437 $self->activate_recursive;
2338 2438
2339 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2439 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2359 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2459 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2360 2460
2361 $self->enter_link; 2461 $self->enter_link;
2362 2462
2363 (async { 2463 (async {
2464 # *tag paths override both path and x|y
2465 if ($path =~ /^\*(.*)$/) {
2466 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2467 my $ob = $obs[rand @obs];
2468
2469 # see if we actually can go there
2470 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2471 $ob = $obs[rand @obs];
2472 } else {
2473 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2474 }
2475 # else put us there anyways for now #d#
2476
2477 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2478 } else {
2479 ($path, $x, $y) = (undef, undef, undef);
2480 }
2481 }
2482
2364 my $map = eval { 2483 my $map = eval {
2365 my $map = cf::map::find $path; 2484 my $map = defined $path ? cf::map::find $path : undef;
2366 2485
2367 if ($map) { 2486 if ($map) {
2368 $map = $map->customise_for ($self); 2487 $map = $map->customise_for ($self);
2369 $map = $check->($map) if $check && $map; 2488 $map = $check->($map) if $check && $map;
2370 } else { 2489 } else {
2371 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2490 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2372 } 2491 }
2373 2492
2374 $map 2493 $map
2375 }; 2494 };
2376 2495
… …
2510the message, with C<log> being the default. If C<$color> is negative, suppress 2629the message, with C<log> being the default. If C<$color> is negative, suppress
2511the message unless the client supports the msg packet. 2630the message unless the client supports the msg packet.
2512 2631
2513=cut 2632=cut
2514 2633
2634our %CHANNEL = (
2635 "c/identify" => {
2636 id => "identify",
2637 title => "Identify",
2638 reply => undef,
2639 tooltip => "Items recently identified",
2640 },
2641 "c/examine" => {
2642 id => "examine",
2643 title => "Examine",
2644 reply => undef,
2645 tooltip => "Signs and other items you examined",
2646 },
2647);
2648
2515sub cf::client::send_msg { 2649sub cf::client::send_msg {
2516 my ($self, $channel, $msg, $color, @extra) = @_; 2650 my ($self, $channel, $msg, $color, @extra) = @_;
2517 2651
2518 $msg = $self->pl->expand_cfpod ($msg); 2652 $msg = $self->pl->expand_cfpod ($msg);
2519 2653
2520 $color &= cf::NDI_CLIENT_MASK; # just in case... 2654 $color &= cf::NDI_CLIENT_MASK; # just in case...
2655
2656 # check predefined channels, for the benefit of C
2657 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2521 2658
2522 if (ref $channel) { 2659 if (ref $channel) {
2523 # send meta info to client, if not yet sent 2660 # send meta info to client, if not yet sent
2524 unless (exists $self->{channel}{$channel->{id}}) { 2661 unless (exists $self->{channel}{$channel->{id}}) {
2525 $self->{channel}{$channel->{id}} = $channel; 2662 $self->{channel}{$channel->{id}} = $channel;
2526 $self->ext_msg (channel_info => $channel); 2663 $self->ext_msg (channel_info => $channel)
2664 if $self->can_msg;
2527 } 2665 }
2528 2666
2529 $channel = $channel->{id}; 2667 $channel = $channel->{id};
2530 } 2668 }
2531 2669
… …
2553 $color &= cf::NDI_COLOR_MASK; 2691 $color &= cf::NDI_COLOR_MASK;
2554 2692
2555 utf8::encode $msg; 2693 utf8::encode $msg;
2556 2694
2557 if (0 && $msg =~ /\[/) { 2695 if (0 && $msg =~ /\[/) {
2696 # COMMAND/INFO
2558 $self->send_packet ("drawextinfo $color 4 0 $msg") 2697 $self->send_packet ("drawextinfo $color 10 8 $msg")
2559 } else { 2698 } else {
2560 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2699 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2561 $self->send_packet ("drawinfo $color $msg") 2700 $self->send_packet ("drawinfo $color $msg")
2562 } 2701 }
2563 } 2702 }
… …
2571=cut 2710=cut
2572 2711
2573sub cf::client::ext_msg($$@) { 2712sub cf::client::ext_msg($$@) {
2574 my ($self, $type, @msg) = @_; 2713 my ($self, $type, @msg) = @_;
2575 2714
2576 my $extcmd = $self->extcmd;
2577
2578 if ($extcmd == 2) { 2715 if ($self->extcmd == 2) {
2579 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2716 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2580 } elsif ($extcmd == 1) { # TODO: remove 2717 } elsif ($self->extcmd == 1) { # TODO: remove
2581 push @msg, msgtype => "event_$type"; 2718 push @msg, msgtype => "event_$type";
2719 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2720 }
2721}
2722
2723=item $client->ext_reply ($msgid, @msg)
2724
2725Sends an ext reply to the client.
2726
2727=cut
2728
2729sub cf::client::ext_reply($$@) {
2730 my ($self, $id, @msg) = @_;
2731
2732 if ($self->extcmd == 2) {
2733 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2734 } elsif ($self->extcmd == 1) {
2735 #TODO: version 1, remove
2736 unshift @msg, msgtype => "reply", msgid => $id;
2582 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2737 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2583 } 2738 }
2584} 2739}
2585 2740
2586=item $success = $client->query ($flags, "text", \&cb) 2741=item $success = $client->query ($flags, "text", \&cb)
… …
2648 my ($type, $reply, @payload) = 2803 my ($type, $reply, @payload) =
2649 "ARRAY" eq ref $msg 2804 "ARRAY" eq ref $msg
2650 ? @$msg 2805 ? @$msg
2651 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2806 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2652 2807
2808 my @reply;
2809
2653 if (my $cb = $EXTICMD{$type}) { 2810 if (my $cb = $EXTICMD{$type}) {
2654 my @reply = $cb->($ns, @payload); 2811 @reply = $cb->($ns, @payload);
2655
2656 $ns->ext_reply ($reply, @reply)
2657 if $reply;
2658 } 2812 }
2813
2814 $ns->ext_reply ($reply, @reply)
2815 if $reply;
2816
2659 } else { 2817 } else {
2660 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2818 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2661 } 2819 }
2662 2820
2663 cf::override; 2821 cf::override;
… …
2724 2882
2725The following functions and methods are available within a safe environment: 2883The following functions and methods are available within a safe environment:
2726 2884
2727 cf::object 2885 cf::object
2728 contr pay_amount pay_player map x y force_find force_add 2886 contr pay_amount pay_player map x y force_find force_add
2729 insert remove 2887 insert remove name archname title slaying race decrease_ob_nr
2730 2888
2731 cf::object::player 2889 cf::object::player
2732 player 2890 player
2733 2891
2734 cf::player 2892 cf::player
… …
2739 2897
2740=cut 2898=cut
2741 2899
2742for ( 2900for (
2743 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2901 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2744 insert remove inv)], 2902 insert remove inv name archname title slaying race
2903 decrease_ob_nr)],
2745 ["cf::object::player" => qw(player)], 2904 ["cf::object::player" => qw(player)],
2746 ["cf::player" => qw(peaceful)], 2905 ["cf::player" => qw(peaceful)],
2747 ["cf::map" => qw(trigger)], 2906 ["cf::map" => qw(trigger)],
2748) { 2907) {
2749 no strict 'refs'; 2908 no strict 'refs';
… …
2825# the server's init and main functions 2984# the server's init and main functions
2826 2985
2827sub load_facedata($) { 2986sub load_facedata($) {
2828 my ($path) = @_; 2987 my ($path) = @_;
2829 2988
2989 # HACK to clear player env face cache, we need some signal framework
2990 # for this (global event?)
2991 %ext::player_env::MUSIC_FACE_CACHE = ();
2992
2993 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2994
2830 warn "loading facedata from $path\n"; 2995 warn "loading facedata from $path\n";
2831 2996
2832 my $facedata; 2997 my $facedata;
2833 0 < aio_load $path, $facedata 2998 0 < aio_load $path, $facedata
2834 or die "$path: $!"; 2999 or die "$path: $!";
2835 3000
2836 $facedata = Coro::Storable::thaw $facedata; 3001 $facedata = Coro::Storable::thaw $facedata;
2837 3002
2838 $facedata->{version} == 2 3003 $facedata->{version} == 2
2839 or cf::cleanup "$path: version mismatch, cannot proceed."; 3004 or cf::cleanup "$path: version mismatch, cannot proceed.";
3005
3006 # patch in the exptable
3007 $facedata->{resource}{"res/exp_table"} = {
3008 type => FT_RSRC,
3009 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3010 };
3011 cf::cede_to_tick;
2840 3012
2841 { 3013 {
2842 my $faces = $facedata->{faceinfo}; 3014 my $faces = $facedata->{faceinfo};
2843 3015
2844 while (my ($face, $info) = each %$faces) { 3016 while (my ($face, $info) = each %$faces) {
2845 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3017 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2846 cf::face::set_visibility $idx, $info->{visibility}; 3018 cf::face::set_visibility $idx, $info->{visibility};
2847 cf::face::set_magicmap $idx, $info->{magicmap}; 3019 cf::face::set_magicmap $idx, $info->{magicmap};
2848 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3020 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2849 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3021 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2850 3022
2851 cf::cede_to_tick; 3023 cf::cede_to_tick;
2852 } 3024 }
2853 3025
2854 while (my ($face, $info) = each %$faces) { 3026 while (my ($face, $info) = each %$faces) {
… …
2879 3051
2880 { 3052 {
2881 # TODO: for gcfclient pleasure, we should give resources 3053 # TODO: for gcfclient pleasure, we should give resources
2882 # that gcfclient doesn't grok a >10000 face index. 3054 # that gcfclient doesn't grok a >10000 face index.
2883 my $res = $facedata->{resource}; 3055 my $res = $facedata->{resource};
2884 my $enc = JSON::XS->new->utf8->canonical;
2885 3056
2886 my $soundconf = delete $res->{"res/sound.conf"}; 3057 my $soundconf = delete $res->{"res/sound.conf"};
2887 3058
2888 while (my ($name, $info) = each %$res) { 3059 while (my ($name, $info) = each %$res) {
2889 my $meta = $enc->encode ({
2890 name => $name,
2891 %{ $info->{meta} || {} },
2892 });
2893
2894 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3060 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3061 my $data;
2895 3062
2896 if ($info->{type} & 1) { 3063 if ($info->{type} & 1) {
2897 # prepend meta info 3064 # prepend meta info
2898 3065
3066 my $meta = $enc->encode ({
3067 name => $name,
3068 %{ $info->{meta} || {} },
3069 });
3070
2899 my $data = pack "(w/a*)*", $meta, $info->{data}; 3071 $data = pack "(w/a*)*", $meta, $info->{data};
2900 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2901
2902 cf::face::set_data $idx, 0, $data, $chk;
2903 } else { 3072 } else {
2904 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3073 $data = $info->{data};
2905 } 3074 }
2906 3075
3076 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2907 cf::face::set_type $idx, $info->{type}; 3077 cf::face::set_type $idx, $info->{type};
2908 3078
2909 cf::cede_to_tick; 3079 cf::cede_to_tick;
2910 } 3080 }
2911 3081
… …
2938 $ns->fx_want ($k, $v); 3108 $ns->fx_want ($k, $v);
2939 } 3109 }
2940}; 3110};
2941 3111
2942sub reload_regions { 3112sub reload_regions {
3113 # HACK to clear player env face cache, we need some signal framework
3114 # for this (global event?)
3115 %ext::player_env::MUSIC_FACE_CACHE = ();
3116
2943 load_resource_file "$MAPDIR/regions" 3117 load_resource_file "$MAPDIR/regions"
2944 or die "unable to load regions file\n"; 3118 or die "unable to load regions file\n";
2945 3119
2946 for (cf::region::list) { 3120 for (cf::region::list) {
2947 $_->{match} = qr/$_->{match}/ 3121 $_->{match} = qr/$_->{match}/
… …
2983 3157
2984sub init { 3158sub init {
2985 reload_resources; 3159 reload_resources;
2986} 3160}
2987 3161
2988sub cfg_load { 3162sub reload_config {
2989 open my $fh, "<:utf8", "$CONFDIR/config" 3163 open my $fh, "<:utf8", "$CONFDIR/config"
2990 or return; 3164 or return;
2991 3165
2992 local $/; 3166 local $/;
2993 *CFG = YAML::Syck::Load <$fh>; 3167 *CFG = YAML::Syck::Load <$fh>;
… …
3013 (async { 3187 (async {
3014 Event::one_event; 3188 Event::one_event;
3015 })->prio (Coro::PRIO_MAX); 3189 })->prio (Coro::PRIO_MAX);
3016 }; 3190 };
3017 3191
3018 cfg_load; 3192 reload_config;
3019 db_init; 3193 db_init;
3020 load_extensions; 3194 load_extensions;
3021 3195
3022 $TICK_WATCHER->start; 3196 $TICK_WATCHER->start;
3023 Event::loop; 3197 Event::loop;
… …
3216 warn "reloading cf.pm"; 3390 warn "reloading cf.pm";
3217 require cf; 3391 require cf;
3218 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3392 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3219 3393
3220 warn "loading config and database again"; 3394 warn "loading config and database again";
3221 cf::cfg_load; 3395 cf::reload_config;
3222 3396
3223 warn "loading extensions"; 3397 warn "loading extensions";
3224 cf::load_extensions; 3398 cf::load_extensions;
3225 3399
3226 warn "reattaching attachments to objects/players"; 3400 warn "reattaching attachments to objects/players";
… …
3291 my $signal = new Coro::Signal; 3465 my $signal = new Coro::Signal;
3292 push @WAIT_FOR_TICK_BEGIN, $signal; 3466 push @WAIT_FOR_TICK_BEGIN, $signal;
3293 $signal->wait; 3467 $signal->wait;
3294} 3468}
3295 3469
3296 my $min = 1e6;#d#
3297 my $avg = 10;
3298$TICK_WATCHER = Event->timer ( 3470$TICK_WATCHER = Event->timer (
3299 reentrant => 0, 3471 reentrant => 0,
3300 parked => 1, 3472 parked => 1,
3301 prio => 0, 3473 prio => 0,
3302 at => $NEXT_TICK || $TICK, 3474 at => $NEXT_TICK || $TICK,
… …
3310 3482
3311 $NOW = $tick_start = Event::time; 3483 $NOW = $tick_start = Event::time;
3312 3484
3313 cf::server_tick; # one server iteration 3485 cf::server_tick; # one server iteration
3314 3486
3315 0 && sync_job {#d#
3316 for(1..10) {
3317 my $t = Event::time;
3318 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3319 or die;
3320
3321 $map->width (50);
3322 $map->height (50);
3323 $map->alloc;
3324 $map->_load_objects ("/tmp/x.map", 1);
3325 my $t = Event::time - $t;
3326
3327 #next unless $t < 0.0013;#d#
3328 if ($t < $min) {
3329 $min = $t;
3330 }
3331 $avg = $avg * 0.99 + $t * 0.01;
3332 }
3333 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3334 exit 0;
3335 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3336 };
3337
3338 $RUNTIME += $TICK; 3487 $RUNTIME += $TICK;
3339 $NEXT_TICK += $TICK; 3488 $NEXT_TICK += $TICK;
3340 3489
3341 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3490 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3342 $NEXT_RUNTIME_WRITE = $NOW + 10; 3491 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
3344 write_runtime 3493 write_runtime
3345 or warn "ERROR: unable to write runtime file: $!"; 3494 or warn "ERROR: unable to write runtime file: $!";
3346 }; 3495 };
3347 } 3496 }
3348 3497
3349# my $AFTER = Event::time;
3350# warn $AFTER - $NOW;#d#
3351
3352 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3498 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3353 $sig->send; 3499 $sig->send;
3354 } 3500 }
3355 while (my $sig = shift @WAIT_FOR_TICK) { 3501 while (my $sig = shift @WAIT_FOR_TICK) {
3356 $sig->send; 3502 $sig->send;
… …
3366 3512
3367 $LOAD = ($NOW - $tick_start) / $TICK; 3513 $LOAD = ($NOW - $tick_start) / $TICK;
3368 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3514 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3369 3515
3370 _post_tick; 3516 _post_tick;
3371
3372
3373 }, 3517 },
3374); 3518);
3375 3519
3376{ 3520{
3521 BDB::min_parallel 8;
3377 BDB::max_poll_time $TICK * 0.1; 3522 BDB::max_poll_time $TICK * 0.1;
3378 $BDB_POLL_WATCHER = Event->io ( 3523 $BDB_POLL_WATCHER = Event->io (
3379 reentrant => 0, 3524 reentrant => 0,
3380 fd => BDB::poll_fileno, 3525 fd => BDB::poll_fileno,
3381 poll => 'r', 3526 poll => 'r',
3382 prio => 0, 3527 prio => 0,
3383 data => WF_AUTOCANCEL, 3528 data => WF_AUTOCANCEL,
3384 cb => \&BDB::poll_cb, 3529 cb => \&BDB::poll_cb,
3385 ); 3530 );
3386 BDB::min_parallel 8;
3387 3531
3388 BDB::set_sync_prepare { 3532 BDB::set_sync_prepare {
3389 my $status; 3533 my $status;
3390 my $current = $Coro::current; 3534 my $current = $Coro::current;
3391 ( 3535 (
… …
3400 ) 3544 )
3401 }; 3545 };
3402 3546
3403 unless ($DB_ENV) { 3547 unless ($DB_ENV) {
3404 $DB_ENV = BDB::db_env_create; 3548 $DB_ENV = BDB::db_env_create;
3549 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3550 | BDB::LOG_AUTOREMOVE, 1);
3551 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3552 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3405 3553
3406 cf::sync_job { 3554 cf::sync_job {
3407 eval { 3555 eval {
3408 BDB::db_env_open 3556 BDB::db_env_open
3409 $DB_ENV, 3557 $DB_ENV,
… …
3411 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3559 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3412 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3560 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3413 0666; 3561 0666;
3414 3562
3415 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3563 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3416
3417 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3418 $DB_ENV->set_lk_detect;
3419 }; 3564 };
3420 3565
3421 cf::cleanup "db_env_open(db): $@" if $@; 3566 cf::cleanup "db_env_open(db): $@" if $@;
3422 }; 3567 };
3423 } 3568 }
3569
3570 $BDB_DEADLOCK_WATCHER = Event->timer (
3571 after => 3,
3572 interval => 1,
3573 hard => 1,
3574 prio => 0,
3575 data => WF_AUTOCANCEL,
3576 cb => sub {
3577 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3578 },
3579 );
3580 $BDB_CHECKPOINT_WATCHER = Event->timer (
3581 after => 11,
3582 interval => 60,
3583 hard => 1,
3584 prio => 0,
3585 data => WF_AUTOCANCEL,
3586 cb => sub {
3587 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3588 },
3589 );
3590 $BDB_TRICKLE_WATCHER = Event->timer (
3591 after => 5,
3592 interval => 10,
3593 hard => 1,
3594 prio => 0,
3595 data => WF_AUTOCANCEL,
3596 cb => sub {
3597 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3598 },
3599 );
3424} 3600}
3425 3601
3426{ 3602{
3427 IO::AIO::min_parallel 8; 3603 IO::AIO::min_parallel 8;
3428 3604

Diff Legend

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