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.329 by root, Fri Aug 10 05:38:16 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
… …
1444 or return []; 1465 or return [];
1445 1466
1446 my @logins; 1467 my @logins;
1447 1468
1448 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") {
1449 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1474 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1450 aio_read $fh, 0, 512, my $buf, 0 or next; 1475 aio_read $fh, 0, 512, my $buf, 0 or next;
1451 $buf !~ /^password -------------$/m or next; # official not-valid tag 1476 $buf !~ /^password -------------$/m or next; # official not-valid tag
1477 }
1452 1478
1453 utf8::decode $login; 1479 utf8::decode $login;
1454 push @logins, $login; 1480 push @logins, $login;
1455 } 1481 }
1456 1482
… …
1494sub expand_cfpod { 1520sub expand_cfpod {
1495 ((my $self), (local $_)) = @_; 1521 ((my $self), (local $_)) = @_;
1496 1522
1497 # escape & and < 1523 # escape & and <
1498 s/&/&amp;/g; 1524 s/&/&amp;/g;
1499 s/(?<![BIUGH])</&lt;/g; 1525 s/(?<![BIUGHT])</&lt;/g;
1500 1526
1501 # 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
1502 1528
1503 1 while 1529 1 while
1504 # replace B<>, I<>, U<> etc. 1530 # replace B<>, I<>, U<> etc.
1505 s/B<([^\>]*)>/<b>$1<\/b>/ 1531 s/B<([^\>]*)>/<b>$1<\/b>/
1506 || s/I<([^\>]*)>/<i>$1<\/i>/ 1532 || s/I<([^\>]*)>/<i>$1<\/i>/
1507 || s/U<([^\>]*)>/<u>$1<\/u>/ 1533 || s/U<([^\>]*)>/<u>$1<\/u>/
1534 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1508 # replace G<male|female> tags 1535 # replace G<male|female> tags
1509 || s{G<([^>|]*)\|([^>]*)>}{ 1536 || s{G<([^>|]*)\|([^>]*)>}{
1510 $self->gender ? $2 : $1 1537 $self->gender ? $2 : $1
1511 }ge 1538 }ge
1512 # replace H<hint text> 1539 # replace H<hint text>
… …
1542=cut 1569=cut
1543 1570
1544sub ext_reply($$@) { 1571sub ext_reply($$@) {
1545 my ($self, $id, @msg) = @_; 1572 my ($self, $id, @msg) = @_;
1546 1573
1547 if ($self->ns->extcmd == 2) { 1574 $self->ns->ext_reply ($id, @msg)
1548 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1549 } elsif ($self->ns->extcmd == 1) {
1550 #TODO: version 1, remove
1551 unshift @msg, msgtype => "reply", msgid => $id;
1552 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1553 }
1554} 1575}
1555 1576
1556=item $player->ext_msg ($type, @msg) 1577=item $player->ext_msg ($type, @msg)
1557 1578
1558Sends an ext event to the client. 1579Sends an ext event to the client.
… …
1786 1807
1787sub load_header_from($) { 1808sub load_header_from($) {
1788 my ($self, $path) = @_; 1809 my ($self, $path) = @_;
1789 1810
1790 utf8::encode $path; 1811 utf8::encode $path;
1791 #aio_open $path, O_RDONLY, 0 1812 my $f = new_from_file cf::object::thawer $path
1792 # or return;
1793
1794 $self->_load_header ($path)
1795 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;
1796 1820
1797 $self->{load_path} = $path; 1821 $self->{load_path} = $path;
1798 1822
1799 1 1823 1
1800} 1824}
… …
1854sub find { 1878sub find {
1855 my ($path, $origin) = @_; 1879 my ($path, $origin) = @_;
1856 1880
1857 $path = normalise $path, $origin && $origin->path; 1881 $path = normalise $path, $origin && $origin->path;
1858 1882
1883 cf::lock_wait "map_data:$path";#d#remove
1859 cf::lock_wait "map_find:$path"; 1884 cf::lock_wait "map_find:$path";
1860 1885
1861 $cf::MAP{$path} || do { 1886 $cf::MAP{$path} || do {
1862 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
1863 my $map = new_from_path cf::map $path 1890 my $map = new_from_path cf::map $path
1864 or return; 1891 or return;
1865 1892
1866 $map->{last_save} = $cf::RUNTIME; 1893 $map->{last_save} = $cf::RUNTIME;
1867 1894
… …
1869 or return; 1896 or return;
1870 1897
1871 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1898 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1872 # doing this can freeze the server in a sync job, obviously 1899 # doing this can freeze the server in a sync job, obviously
1873 #$cf::WAIT_FOR_TICK->wait; 1900 #$cf::WAIT_FOR_TICK->wait;
1901 undef $guard1;
1902 undef $guard2;
1874 $map->reset; 1903 $map->reset;
1875 undef $guard;
1876 return find $path; 1904 return find $path;
1877 } 1905 }
1878 1906
1879 $cf::MAP{$path} = $map 1907 $cf::MAP{$path} = $map
1880 } 1908 }
… …
1889 local $self->{deny_reset} = 1; # loading can take a long time 1917 local $self->{deny_reset} = 1; # loading can take a long time
1890 1918
1891 my $path = $self->{path}; 1919 my $path = $self->{path};
1892 1920
1893 { 1921 {
1894 my $guard = cf::lock_acquire "map_load:$path"; 1922 my $guard = cf::lock_acquire "map_data:$path";
1895 1923
1924 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 1925 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 1926
1898 $self->in_memory (cf::MAP_LOADING); 1927 $self->in_memory (cf::MAP_LOADING);
1899 1928
1900 $self->alloc; 1929 $self->alloc;
1901 1930
1902 $self->pre_load; 1931 $self->pre_load;
1903 Coro::cede; 1932 cf::cede_to_tick;
1904 1933
1934 my $f = new_from_file cf::object::thawer $self->{load_path};
1935 $f->skip_block;
1905 $self->_load_objects ($self->{load_path}, 1) 1936 $self->_load_objects ($f)
1906 or return; 1937 or return;
1907 1938
1908 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1939 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1909 if delete $self->{load_original}; 1940 if delete $self->{load_original};
1910 1941
1911 if (my $uniq = $self->uniq_path) { 1942 if (my $uniq = $self->uniq_path) {
1912 utf8::encode $uniq; 1943 utf8::encode $uniq;
1913 if (aio_open $uniq, O_RDONLY, 0) { 1944 unless (aio_stat $uniq) {
1945 if (my $f = new_from_file cf::object::thawer $uniq) {
1914 $self->clear_unique_items; 1946 $self->clear_unique_items;
1915 $self->_load_objects ($uniq, 0); 1947 $self->_load_objects ($f);
1948 $f->resolve_delayed_derefs;
1949 }
1916 } 1950 }
1917 } 1951 }
1918 1952
1919 Coro::cede; 1953 $f->resolve_delayed_derefs;
1954
1955 cf::cede_to_tick;
1920 # now do the right thing for maps 1956 # now do the right thing for maps
1921 $self->link_multipart_objects; 1957 $self->link_multipart_objects;
1922 $self->difficulty ($self->estimate_difficulty) 1958 $self->difficulty ($self->estimate_difficulty)
1923 unless $self->difficulty; 1959 unless $self->difficulty;
1924 Coro::cede; 1960 cf::cede_to_tick;
1925 1961
1926 unless ($self->{deny_activate}) { 1962 unless ($self->{deny_activate}) {
1927 $self->decay_objects; 1963 $self->decay_objects;
1928 $self->fix_auto_apply; 1964 $self->fix_auto_apply;
1929 $self->update_buttons; 1965 $self->update_buttons;
1930 Coro::cede; 1966 cf::cede_to_tick;
1931 $self->set_darkness_map; 1967 $self->set_darkness_map;
1932 Coro::cede; 1968 cf::cede_to_tick;
1933 $self->activate; 1969 $self->activate;
1934 } 1970 }
1935 1971
1936 $self->{last_save} = $cf::RUNTIME; 1972 $self->{last_save} = $cf::RUNTIME;
1937 $self->last_access ($cf::RUNTIME); 1973 $self->last_access ($cf::RUNTIME);
… …
1953 1989
1954 $self 1990 $self
1955} 1991}
1956 1992
1957# 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
1958sub load_diag { 1994sub load_neighbours {
1959 my ($map) = @_; 1995 my ($map) = @_;
1960 1996
1961 my @diag; # diagonal neighbours 1997 my @neigh; # diagonal neighbours
1962 1998
1963 for (0 .. 3) { 1999 for (0 .. 3) {
1964 my $neigh = $map->tile_path ($_) 2000 my $neigh = $map->tile_path ($_)
1965 or next; 2001 or next;
1966 $neigh = find $neigh, $map 2002 $neigh = find $neigh, $map
1967 or next; 2003 or next;
1968 $neigh->load; 2004 $neigh->load;
1969 2005
2006 push @neigh,
1970 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2007 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1971 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2008 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1972 } 2009 }
1973 2010
1974 for (@diag) { 2011 for (grep defined $_->[0], @neigh) {
2012 my ($path, $origin) = @$_;
1975 my $neigh = find @$_ 2013 my $neigh = find $path, $origin
1976 or next; 2014 or next;
1977 $neigh->load; 2015 $neigh->load;
1978 } 2016 }
1979} 2017}
1980 2018
… …
1985} 2023}
1986 2024
1987sub do_load_sync { 2025sub do_load_sync {
1988 my ($map) = @_; 2026 my ($map) = @_;
1989 2027
2028 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2029 if $Coro::current == $Coro::main;
2030
1990 cf::sync_job { $map->load }; 2031 cf::sync_job { $map->load };
1991} 2032}
1992 2033
1993our %MAP_PREFETCH; 2034our %MAP_PREFETCH;
1994our $MAP_PREFETCHER = undef; 2035our $MAP_PREFETCHER = undef;
1995 2036
1996sub find_async { 2037sub find_async {
1997 my ($path, $origin) = @_; 2038 my ($path, $origin, $load) = @_;
1998 2039
1999 $path = normalise $path, $origin && $origin->{path}; 2040 $path = normalise $path, $origin && $origin->{path};
2000 2041
2001 if (my $map = $cf::MAP{$path}) { 2042 if (my $map = $cf::MAP{$path}) {
2002 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2043 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
2003 } 2044 }
2004 2045
2005 undef $MAP_PREFETCH{$path}; 2046 $MAP_PREFETCH{$path} |= $load;
2047
2006 $MAP_PREFETCHER ||= cf::async { 2048 $MAP_PREFETCHER ||= cf::async {
2007 while (%MAP_PREFETCH) { 2049 while (%MAP_PREFETCH) {
2008 for my $path (keys %MAP_PREFETCH) { 2050 while (my ($k, $v) = each %MAP_PREFETCH) {
2009 if (my $map = find $path) { 2051 if (my $map = find $k) {
2010 $map->load; 2052 $map->load if $v;
2011 } 2053 }
2012 2054
2013 delete $MAP_PREFETCH{$path}; 2055 delete $MAP_PREFETCH{$k};
2014 } 2056 }
2015 } 2057 }
2016 undef $MAP_PREFETCHER; 2058 undef $MAP_PREFETCHER;
2017 }; 2059 };
2018 $MAP_PREFETCHER->prio (6); 2060 $MAP_PREFETCHER->prio (6);
… …
2021} 2063}
2022 2064
2023sub save { 2065sub save {
2024 my ($self) = @_; 2066 my ($self) = @_;
2025 2067
2026 my $lock = cf::lock_acquire "map_data:" . $self->path; 2068 my $lock = cf::lock_acquire "map_data:$self->{path}";
2027 2069
2028 $self->{last_save} = $cf::RUNTIME; 2070 $self->{last_save} = $cf::RUNTIME;
2029 2071
2030 return unless $self->dirty; 2072 return unless $self->dirty;
2031 2073
… …
2054 my ($self) = @_; 2096 my ($self) = @_;
2055 2097
2056 # save first because save cedes 2098 # save first because save cedes
2057 $self->save; 2099 $self->save;
2058 2100
2059 my $lock = cf::lock_acquire "map_data:" . $self->path; 2101 my $lock = cf::lock_acquire "map_data:$self->{path}";
2060 2102
2061 return if $self->players; 2103 return if $self->players;
2062 return if $self->in_memory != cf::MAP_IN_MEMORY; 2104 return if $self->in_memory != cf::MAP_IN_MEMORY;
2063 return if $self->{deny_save}; 2105 return if $self->{deny_save};
2064 2106
2107 $self->in_memory (cf::MAP_SWAPPED);
2108
2109 $self->deactivate;
2110 $_->clear_links_to ($self) for values %cf::MAP;
2065 $self->clear; 2111 $self->clear;
2066 $self->in_memory (cf::MAP_SWAPPED);
2067} 2112}
2068 2113
2069sub reset_at { 2114sub reset_at {
2070 my ($self) = @_; 2115 my ($self) = @_;
2071 2116
… …
2103 if $uniq; 2148 if $uniq;
2104 } 2149 }
2105 2150
2106 delete $cf::MAP{$self->path}; 2151 delete $cf::MAP{$self->path};
2107 2152
2153 $self->deactivate;
2154 $_->clear_links_to ($self) for values %cf::MAP;
2108 $self->clear; 2155 $self->clear;
2109
2110 $_->clear_links_to ($self) for values %cf::MAP;
2111 2156
2112 $self->unlink_save; 2157 $self->unlink_save;
2113 $self->destroy; 2158 $self->destroy;
2114} 2159}
2115 2160
2116my $nuke_counter = "aaaa"; 2161my $nuke_counter = "aaaa";
2117 2162
2118sub nuke { 2163sub nuke {
2119 my ($self) = @_; 2164 my ($self) = @_;
2120 2165
2166 {
2167 my $lock = cf::lock_acquire "map_data:$self->{path}";
2168
2121 delete $cf::MAP{$self->path}; 2169 delete $cf::MAP{$self->path};
2122 2170
2123 $self->unlink_save; 2171 $self->unlink_save;
2124 2172
2125 bless $self, "cf::map"; 2173 bless $self, "cf::map";
2126 delete $self->{deny_reset}; 2174 delete $self->{deny_reset};
2127 $self->{deny_save} = 1; 2175 $self->{deny_save} = 1;
2128 $self->reset_timeout (1); 2176 $self->reset_timeout (1);
2129 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2177 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2130 2178
2131 $cf::MAP{$self->path} = $self; 2179 $cf::MAP{$self->path} = $self;
2180 }
2132 2181
2133 $self->reset; # polite request, might not happen 2182 $self->reset; # polite request, might not happen
2134} 2183}
2135 2184
2136=item $maps = cf::map::tmp_maps 2185=item $maps = cf::map::tmp_maps
… …
2212 2261
2213sub inv_recursive { 2262sub inv_recursive {
2214 inv_recursive_ inv $_[0] 2263 inv_recursive_ inv $_[0]
2215} 2264}
2216 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
2217package cf; 2297package cf;
2218 2298
2219=back 2299=back
2220 2300
2221=head3 cf::object::player 2301=head3 cf::object::player
… …
2349 # use -1 or undef as default coordinates, not 0, 0 2429 # use -1 or undef as default coordinates, not 0, 0
2350 ($x, $y) = ($map->enter_x, $map->enter_y) 2430 ($x, $y) = ($map->enter_x, $map->enter_y)
2351 if $x <=0 && $y <= 0; 2431 if $x <=0 && $y <= 0;
2352 2432
2353 $map->load; 2433 $map->load;
2354 $map->load_diag; 2434 $map->load_neighbours;
2355 2435
2356 return unless $self->contr->active; 2436 return unless $self->contr->active;
2357 $self->activate_recursive; 2437 $self->activate_recursive;
2358 2438
2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2439 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2379 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2459 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2380 2460
2381 $self->enter_link; 2461 $self->enter_link;
2382 2462
2383 (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
2384 my $map = eval { 2483 my $map = eval {
2385 my $map = cf::map::find $path; 2484 my $map = defined $path ? cf::map::find $path : undef;
2386 2485
2387 if ($map) { 2486 if ($map) {
2388 $map = $map->customise_for ($self); 2487 $map = $map->customise_for ($self);
2389 $map = $check->($map) if $check && $map; 2488 $map = $check->($map) if $check && $map;
2390 } else { 2489 } else {
2391 $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);
2392 } 2491 }
2393 2492
2394 $map 2493 $map
2395 }; 2494 };
2396 2495
… …
2530the 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
2531the message unless the client supports the msg packet. 2630the message unless the client supports the msg packet.
2532 2631
2533=cut 2632=cut
2534 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
2535sub cf::client::send_msg { 2649sub cf::client::send_msg {
2536 my ($self, $channel, $msg, $color, @extra) = @_; 2650 my ($self, $channel, $msg, $color, @extra) = @_;
2537 2651
2538 $msg = $self->pl->expand_cfpod ($msg); 2652 $msg = $self->pl->expand_cfpod ($msg);
2539 2653
2540 $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};
2541 2658
2542 if (ref $channel) { 2659 if (ref $channel) {
2543 # send meta info to client, if not yet sent 2660 # send meta info to client, if not yet sent
2544 unless (exists $self->{channel}{$channel->{id}}) { 2661 unless (exists $self->{channel}{$channel->{id}}) {
2545 $self->{channel}{$channel->{id}} = $channel; 2662 $self->{channel}{$channel->{id}} = $channel;
2546 $self->ext_msg (channel_info => $channel); 2663 $self->ext_msg (channel_info => $channel)
2664 if $self->can_msg;
2547 } 2665 }
2548 2666
2549 $channel = $channel->{id}; 2667 $channel = $channel->{id};
2550 } 2668 }
2551 2669
… …
2573 $color &= cf::NDI_COLOR_MASK; 2691 $color &= cf::NDI_COLOR_MASK;
2574 2692
2575 utf8::encode $msg; 2693 utf8::encode $msg;
2576 2694
2577 if (0 && $msg =~ /\[/) { 2695 if (0 && $msg =~ /\[/) {
2696 # COMMAND/INFO
2578 $self->send_packet ("drawextinfo $color 4 0 $msg") 2697 $self->send_packet ("drawextinfo $color 10 8 $msg")
2579 } else { 2698 } else {
2580 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2699 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2581 $self->send_packet ("drawinfo $color $msg") 2700 $self->send_packet ("drawinfo $color $msg")
2582 } 2701 }
2583 } 2702 }
… …
2591=cut 2710=cut
2592 2711
2593sub cf::client::ext_msg($$@) { 2712sub cf::client::ext_msg($$@) {
2594 my ($self, $type, @msg) = @_; 2713 my ($self, $type, @msg) = @_;
2595 2714
2596 my $extcmd = $self->extcmd;
2597
2598 if ($extcmd == 2) { 2715 if ($self->extcmd == 2) {
2599 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2716 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2600 } elsif ($extcmd == 1) { # TODO: remove 2717 } elsif ($self->extcmd == 1) { # TODO: remove
2601 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;
2602 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2737 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2603 } 2738 }
2604} 2739}
2605 2740
2606=item $success = $client->query ($flags, "text", \&cb) 2741=item $success = $client->query ($flags, "text", \&cb)
… …
2668 my ($type, $reply, @payload) = 2803 my ($type, $reply, @payload) =
2669 "ARRAY" eq ref $msg 2804 "ARRAY" eq ref $msg
2670 ? @$msg 2805 ? @$msg
2671 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2806 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2672 2807
2808 my @reply;
2809
2673 if (my $cb = $EXTICMD{$type}) { 2810 if (my $cb = $EXTICMD{$type}) {
2674 my @reply = $cb->($ns, @payload); 2811 @reply = $cb->($ns, @payload);
2675
2676 $ns->ext_reply ($reply, @reply)
2677 if $reply;
2678 } 2812 }
2813
2814 $ns->ext_reply ($reply, @reply)
2815 if $reply;
2816
2679 } else { 2817 } else {
2680 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";
2681 } 2819 }
2682 2820
2683 cf::override; 2821 cf::override;
… …
2744 2882
2745The following functions and methods are available within a safe environment: 2883The following functions and methods are available within a safe environment:
2746 2884
2747 cf::object 2885 cf::object
2748 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
2749 insert remove 2887 insert remove name archname title slaying race decrease_ob_nr
2750 2888
2751 cf::object::player 2889 cf::object::player
2752 player 2890 player
2753 2891
2754 cf::player 2892 cf::player
… …
2759 2897
2760=cut 2898=cut
2761 2899
2762for ( 2900for (
2763 ["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
2764 insert remove inv)], 2902 insert remove inv name archname title slaying race
2903 decrease_ob_nr)],
2765 ["cf::object::player" => qw(player)], 2904 ["cf::object::player" => qw(player)],
2766 ["cf::player" => qw(peaceful)], 2905 ["cf::player" => qw(peaceful)],
2767 ["cf::map" => qw(trigger)], 2906 ["cf::map" => qw(trigger)],
2768) { 2907) {
2769 no strict 'refs'; 2908 no strict 'refs';
… …
2845# the server's init and main functions 2984# the server's init and main functions
2846 2985
2847sub load_facedata($) { 2986sub load_facedata($) {
2848 my ($path) = @_; 2987 my ($path) = @_;
2849 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
2850 warn "loading facedata from $path\n"; 2995 warn "loading facedata from $path\n";
2851 2996
2852 my $facedata; 2997 my $facedata;
2853 0 < aio_load $path, $facedata 2998 0 < aio_load $path, $facedata
2854 or die "$path: $!"; 2999 or die "$path: $!";
2855 3000
2856 $facedata = Coro::Storable::thaw $facedata; 3001 $facedata = Coro::Storable::thaw $facedata;
2857 3002
2858 $facedata->{version} == 2 3003 $facedata->{version} == 2
2859 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;
2860 3012
2861 { 3013 {
2862 my $faces = $facedata->{faceinfo}; 3014 my $faces = $facedata->{faceinfo};
2863 3015
2864 while (my ($face, $info) = each %$faces) { 3016 while (my ($face, $info) = each %$faces) {
2865 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3017 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2866 cf::face::set_visibility $idx, $info->{visibility}; 3018 cf::face::set_visibility $idx, $info->{visibility};
2867 cf::face::set_magicmap $idx, $info->{magicmap}; 3019 cf::face::set_magicmap $idx, $info->{magicmap};
2868 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3020 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2869 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3021 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2870 3022
2871 cf::cede_to_tick; 3023 cf::cede_to_tick;
2872 } 3024 }
2873 3025
2874 while (my ($face, $info) = each %$faces) { 3026 while (my ($face, $info) = each %$faces) {
… …
2899 3051
2900 { 3052 {
2901 # TODO: for gcfclient pleasure, we should give resources 3053 # TODO: for gcfclient pleasure, we should give resources
2902 # that gcfclient doesn't grok a >10000 face index. 3054 # that gcfclient doesn't grok a >10000 face index.
2903 my $res = $facedata->{resource}; 3055 my $res = $facedata->{resource};
2904 my $enc = JSON::XS->new->utf8->canonical;
2905 3056
2906 my $soundconf = delete $res->{"res/sound.conf"}; 3057 my $soundconf = delete $res->{"res/sound.conf"};
2907 3058
2908 while (my ($name, $info) = each %$res) { 3059 while (my ($name, $info) = each %$res) {
2909 my $meta = $enc->encode ({
2910 name => $name,
2911 %{ $info->{meta} || {} },
2912 });
2913
2914 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3060 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3061 my $data;
2915 3062
2916 if ($info->{type} & 1) { 3063 if ($info->{type} & 1) {
2917 # prepend meta info 3064 # prepend meta info
2918 3065
3066 my $meta = $enc->encode ({
3067 name => $name,
3068 %{ $info->{meta} || {} },
3069 });
3070
2919 my $data = pack "(w/a*)*", $meta, $info->{data}; 3071 $data = pack "(w/a*)*", $meta, $info->{data};
2920 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2921
2922 cf::face::set_data $idx, 0, $data, $chk;
2923 } else { 3072 } else {
2924 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3073 $data = $info->{data};
2925 } 3074 }
2926 3075
3076 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2927 cf::face::set_type $idx, $info->{type}; 3077 cf::face::set_type $idx, $info->{type};
2928 3078
2929 cf::cede_to_tick; 3079 cf::cede_to_tick;
2930 } 3080 }
2931 3081
… …
2958 $ns->fx_want ($k, $v); 3108 $ns->fx_want ($k, $v);
2959 } 3109 }
2960}; 3110};
2961 3111
2962sub 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
2963 load_resource_file "$MAPDIR/regions" 3117 load_resource_file "$MAPDIR/regions"
2964 or die "unable to load regions file\n"; 3118 or die "unable to load regions file\n";
2965 3119
2966 for (cf::region::list) { 3120 for (cf::region::list) {
2967 $_->{match} = qr/$_->{match}/ 3121 $_->{match} = qr/$_->{match}/
… …
3003 3157
3004sub init { 3158sub init {
3005 reload_resources; 3159 reload_resources;
3006} 3160}
3007 3161
3008sub cfg_load { 3162sub reload_config {
3009 open my $fh, "<:utf8", "$CONFDIR/config" 3163 open my $fh, "<:utf8", "$CONFDIR/config"
3010 or return; 3164 or return;
3011 3165
3012 local $/; 3166 local $/;
3013 *CFG = YAML::Syck::Load <$fh>; 3167 *CFG = YAML::Syck::Load <$fh>;
… …
3033 (async { 3187 (async {
3034 Event::one_event; 3188 Event::one_event;
3035 })->prio (Coro::PRIO_MAX); 3189 })->prio (Coro::PRIO_MAX);
3036 }; 3190 };
3037 3191
3038 cfg_load; 3192 reload_config;
3039 db_init; 3193 db_init;
3040 load_extensions; 3194 load_extensions;
3041 3195
3042 $TICK_WATCHER->start; 3196 $TICK_WATCHER->start;
3043 Event::loop; 3197 Event::loop;
… …
3236 warn "reloading cf.pm"; 3390 warn "reloading cf.pm";
3237 require cf; 3391 require cf;
3238 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3392 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3239 3393
3240 warn "loading config and database again"; 3394 warn "loading config and database again";
3241 cf::cfg_load; 3395 cf::reload_config;
3242 3396
3243 warn "loading extensions"; 3397 warn "loading extensions";
3244 cf::load_extensions; 3398 cf::load_extensions;
3245 3399
3246 warn "reattaching attachments to objects/players"; 3400 warn "reattaching attachments to objects/players";
… …
3311 my $signal = new Coro::Signal; 3465 my $signal = new Coro::Signal;
3312 push @WAIT_FOR_TICK_BEGIN, $signal; 3466 push @WAIT_FOR_TICK_BEGIN, $signal;
3313 $signal->wait; 3467 $signal->wait;
3314} 3468}
3315 3469
3316 my $min = 1e6;#d#
3317 my $avg = 10;
3318$TICK_WATCHER = Event->timer ( 3470$TICK_WATCHER = Event->timer (
3319 reentrant => 0, 3471 reentrant => 0,
3320 parked => 1, 3472 parked => 1,
3321 prio => 0, 3473 prio => 0,
3322 at => $NEXT_TICK || $TICK, 3474 at => $NEXT_TICK || $TICK,
… …
3330 3482
3331 $NOW = $tick_start = Event::time; 3483 $NOW = $tick_start = Event::time;
3332 3484
3333 cf::server_tick; # one server iteration 3485 cf::server_tick; # one server iteration
3334 3486
3335 0 && sync_job {#d#
3336 for(1..10) {
3337 my $t = Event::time;
3338 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3339 or die;
3340
3341 $map->width (50);
3342 $map->height (50);
3343 $map->alloc;
3344 $map->_load_objects ("/tmp/x.map", 1);
3345 my $t = Event::time - $t;
3346
3347 #next unless $t < 0.0013;#d#
3348 if ($t < $min) {
3349 $min = $t;
3350 }
3351 $avg = $avg * 0.99 + $t * 0.01;
3352 }
3353 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3354 exit 0;
3355 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3356 };
3357
3358 $RUNTIME += $TICK; 3487 $RUNTIME += $TICK;
3359 $NEXT_TICK += $TICK; 3488 $NEXT_TICK += $TICK;
3360 3489
3361 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3490 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3362 $NEXT_RUNTIME_WRITE = $NOW + 10; 3491 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
3364 write_runtime 3493 write_runtime
3365 or warn "ERROR: unable to write runtime file: $!"; 3494 or warn "ERROR: unable to write runtime file: $!";
3366 }; 3495 };
3367 } 3496 }
3368 3497
3369# my $AFTER = Event::time;
3370# warn $AFTER - $NOW;#d#
3371
3372 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3498 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3373 $sig->send; 3499 $sig->send;
3374 } 3500 }
3375 while (my $sig = shift @WAIT_FOR_TICK) { 3501 while (my $sig = shift @WAIT_FOR_TICK) {
3376 $sig->send; 3502 $sig->send;
… …
3386 3512
3387 $LOAD = ($NOW - $tick_start) / $TICK; 3513 $LOAD = ($NOW - $tick_start) / $TICK;
3388 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3514 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3389 3515
3390 _post_tick; 3516 _post_tick;
3391
3392
3393 }, 3517 },
3394); 3518);
3395 3519
3396{ 3520{
3521 BDB::min_parallel 8;
3397 BDB::max_poll_time $TICK * 0.1; 3522 BDB::max_poll_time $TICK * 0.1;
3398 $BDB_POLL_WATCHER = Event->io ( 3523 $BDB_POLL_WATCHER = Event->io (
3399 reentrant => 0, 3524 reentrant => 0,
3400 fd => BDB::poll_fileno, 3525 fd => BDB::poll_fileno,
3401 poll => 'r', 3526 poll => 'r',
3402 prio => 0, 3527 prio => 0,
3403 data => WF_AUTOCANCEL, 3528 data => WF_AUTOCANCEL,
3404 cb => \&BDB::poll_cb, 3529 cb => \&BDB::poll_cb,
3405 ); 3530 );
3406 BDB::min_parallel 8;
3407 3531
3408 BDB::set_sync_prepare { 3532 BDB::set_sync_prepare {
3409 my $status; 3533 my $status;
3410 my $current = $Coro::current; 3534 my $current = $Coro::current;
3411 ( 3535 (
… …
3420 ) 3544 )
3421 }; 3545 };
3422 3546
3423 unless ($DB_ENV) { 3547 unless ($DB_ENV) {
3424 $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);
3425 3553
3426 cf::sync_job { 3554 cf::sync_job {
3427 eval { 3555 eval {
3428 BDB::db_env_open 3556 BDB::db_env_open
3429 $DB_ENV, 3557 $DB_ENV,
… …
3431 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
3432 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3560 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3433 0666; 3561 0666;
3434 3562
3435 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3563 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3436
3437 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3438 $DB_ENV->set_lk_detect;
3439 }; 3564 };
3440 3565
3441 cf::cleanup "db_env_open(db): $@" if $@; 3566 cf::cleanup "db_env_open(db): $@" if $@;
3442 }; 3567 };
3443 } 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 );
3444} 3600}
3445 3601
3446{ 3602{
3447 IO::AIO::min_parallel 8; 3603 IO::AIO::min_parallel 8;
3448 3604

Diff Legend

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