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.331 by root, Mon Aug 13 13:10:01 2007 UTC vs.
Revision 1.370 by root, Thu Sep 13 10:59:41 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_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 87our $DB_ENV;
85 88
86our %CFG; 89our %CFG;
87 90
88our $UPTIME; $UPTIME ||= time; 91our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 92our $RUNTIME;
90 93
91our %PLAYER; # all users 94our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 95our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 96our $LINK_MAP; # the special {link} map, which is always available
94 97
95# used to convert map paths into valid unix filenames by replacing / by ∕ 98# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 100
… …
186 $msg .= "\n" 189 $msg .= "\n"
187 unless $msg =~ /\n$/; 190 unless $msg =~ /\n$/;
188 191
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 193
191 utf8::encode $msg;
192 LOG llevError, $msg; 194 LOG llevError, $msg;
193 }; 195 };
194} 196}
195 197
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
271Wait until the given lock is available and then acquires it and returns 273Wait 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, 274a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 275for example when the coroutine gets canceled), the lock is automatically
274returned. 276returned.
275 277
278Locks are *not* recursive, locking from the same coro twice results in a
279deadlocked coro.
280
276Lock names should begin with a unique identifier (for example, cf::map::find 281Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 282uses map_find and cf::map::load uses map_load).
278 283
279=item $locked = cf::lock_active $string 284=item $locked = cf::lock_active $string
280 285
281Return true if the lock is currently active, i.e. somebody has locked it. 286Return true if the lock is currently active, i.e. somebody has locked it.
282 287
283=cut 288=cut
284 289
285our %LOCK; 290our %LOCK;
291our %LOCKER;#d#
286 292
287sub lock_wait($) { 293sub lock_wait($) {
288 my ($key) = @_; 294 my ($key) = @_;
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
289 300
290 # wait for lock, if any 301 # wait for lock, if any
291 while ($LOCK{$key}) { 302 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 303 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 304 Coro::schedule;
… …
299 310
300 # wait, to be sure we are not locked 311 # wait, to be sure we are not locked
301 lock_wait $key; 312 lock_wait $key;
302 313
303 $LOCK{$key} = []; 314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
304 316
305 Coro::guard { 317 Coro::guard {
318 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 319 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 320 $_->ready for @{ delete $LOCK{$key} };
308 } 321 }
309} 322}
310 323
… …
472Coro::Storable. May, of course, block. Note that the executed sub may 485Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 486never block itself or use any form of Event handling.
474 487
475=cut 488=cut
476 489
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(&@) { 490sub fork_call(&@) {
487 my ($cb, @args) = @_; 491 my ($cb, @args) = @_;
488 492
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 493 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 494 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 495 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 496
494 if (my $pid = fork) { 497 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; 498 reset_signals;
508 local $SIG{__WARN__}; 499 &$cb
509 local $SIG{__DIE__}; 500 }, @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 501
516 eval { 502 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} 503}
529 504
530=item $value = cf::db_get $family => $key 505=item $value = cf::db_get $family => $key
531 506
532Returns a single value from the environment database. 507Returns a single value from the environment database.
… …
534=item cf::db_put $family => $key => $value 509=item cf::db_put $family => $key => $value
535 510
536Stores the given C<$value> in the family. It can currently store binary 511Stores 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). 512data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 513
514=item $db = cf::db_table "name"
515
516Create and/or open a new database table. The string must not be "db" and must be unique
517within each server.
518
539=cut 519=cut
520
521sub db_table($) {
522 my ($name) = @_;
523 my $db = BDB::db_create $DB_ENV;
524
525 eval {
526 $db->set_flags (BDB::CHKSUM);
527
528 utf8::encode $name;
529 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
530 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
531 cf::cleanup "db_open(db): $!" if $!;
532 };
533 cf::cleanup "db_open(db): $@" if $@;
534
535 $db
536}
540 537
541our $DB; 538our $DB;
542 539
543sub db_init { 540sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 541 cf::sync_job {
548 eval { 542 $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 } 543 };
558} 544}
559 545
560sub db_get($$) { 546sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 547 my $key = "$_[0]/$_[1]";
562 548
… …
612 if (1) { 598 if (1) {
613 $md5 = 599 $md5 =
614 join "\x00", 600 join "\x00",
615 $processversion, 601 $processversion,
616 map { 602 map {
617 Coro::cede; 603 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 604 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 605 } 0.. $#$src;
620 606
621 607
622 my $dbmd5 = db_get cache => "$id/md5"; 608 my $dbmd5 = db_get cache => "$id/md5";
… …
1039); 1025);
1040 1026
1041sub object_freezer_save { 1027sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1028 my ($filename, $rdata, $objs) = @_;
1043 1029
1030 my $guard = cf::lock_acquire "io";
1031
1044 sync_job { 1032 sync_job {
1045 if (length $$rdata) { 1033 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1035 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1036 $decname, length $$rdata, scalar @$objs;
1048 1037
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1038 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1039 chmod SAVE_MODE, $fh;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1040 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1041 aio_fsync $fh if $cf::USE_FSYNC;
… …
1071 } 1060 }
1072 } else { 1061 } else {
1073 aio_unlink $filename; 1062 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1063 aio_unlink "$filename.pst";
1075 } 1064 }
1076 } 1065 };
1066
1067 undef $guard;
1077} 1068}
1078 1069
1079sub object_freezer_as_string { 1070sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1071 my ($rdata, $objs) = @_;
1081 1072
… …
1086 1077
1087sub object_thawer_load { 1078sub object_thawer_load {
1088 my ($filename) = @_; 1079 my ($filename) = @_;
1089 1080
1090 my ($data, $av); 1081 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1091 1084
1092 (aio_load $filename, $data) >= 0 1085 (aio_load $filename, $data) >= 0
1093 or return; 1086 or return;
1094 1087
1095 unless (aio_stat "$filename.pst") { 1088 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1089 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1090 or return;
1091
1092 undef $guard;
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1093 $av = eval { (Storable::thaw $av)->{objs} };
1099 } 1094 }
1100 1095
1096 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1097 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1098 $decname, length $data, scalar @{$av || []};
1099
1103 return ($data, $av); 1100 ($data, $av)
1104} 1101}
1105 1102
1106=head2 COMMAND CALLBACKS 1103=head2 COMMAND CALLBACKS
1107 1104
1108=over 4 1105=over 4
… …
1186 my ($type, $reply, @payload) = 1183 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1184 "ARRAY" eq ref $msg
1188 ? @$msg 1185 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1186 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1187
1188 my @reply;
1189
1191 if (my $cb = $EXTCMD{$type}) { 1190 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1191 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1192 }
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196
1197 } else { 1197 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1199 }
1200 1200
1201 cf::override; 1201 cf::override;
… …
1291 1291
1292=head3 cf::player 1292=head3 cf::player
1293 1293
1294=over 4 1294=over 4
1295 1295
1296=item cf::player::num_playing
1297
1298Returns the official number of playing players, as per the Crossfire metaserver rules.
1299
1300=cut
1301
1302sub num_playing {
1303 scalar grep
1304 $_->ob->map
1305 && !$_->hidden
1306 && !$_->ob->flag (cf::FLAG_WIZ),
1307 cf::player::list
1308}
1309
1296=item cf::player::find $login 1310=item cf::player::find $login
1297 1311
1298Returns the given player object, loading it if necessary (might block). 1312Returns the given player object, loading it if necessary (might block).
1299 1313
1300=cut 1314=cut
… …
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1349 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1350 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1351 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1352 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1353
1340 my $pl = load_pl path $login 1354 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1355 or return;
1356
1357 $f->next;
1358 my $pl = cf::player::load_pl $f
1359 or return;
1360 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs;
1342 $cf::PLAYER{$login} = $pl 1362 $cf::PLAYER{$login} = $pl
1343 } 1363 }
1344 } 1364 }
1345} 1365}
1346 1366
… …
1356 1376
1357 aio_mkdir playerdir $pl, 0770; 1377 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1378 $pl->{last_save} = $cf::RUNTIME;
1359 1379
1360 $pl->save_pl ($path); 1380 $pl->save_pl ($path);
1361 Coro::cede; 1381 cf::cede_to_tick;
1362} 1382}
1363 1383
1364sub new($) { 1384sub new($) {
1365 my ($login) = @_; 1385 my ($login) = @_;
1366 1386
… …
1444 or return []; 1464 or return [];
1445 1465
1446 my @logins; 1466 my @logins;
1447 1467
1448 for my $login (@$dirs) { 1468 for my $login (@$dirs) {
1469 my $path = path $login;
1470
1471 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") {
1449 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1450 aio_read $fh, 0, 512, my $buf, 0 or next; 1474 aio_read $fh, 0, 512, my $buf, 0 or next;
1451 $buf !~ /^password -------------$/m or next; # official not-valid tag 1475 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 }
1452 1477
1453 utf8::decode $login; 1478 utf8::decode $login;
1454 push @logins, $login; 1479 push @logins, $login;
1455 } 1480 }
1456 1481
… …
1494sub expand_cfpod { 1519sub expand_cfpod {
1495 ((my $self), (local $_)) = @_; 1520 ((my $self), (local $_)) = @_;
1496 1521
1497 # escape & and < 1522 # escape & and <
1498 s/&/&amp;/g; 1523 s/&/&amp;/g;
1499 s/(?<![BIUGH])</&lt;/g; 1524 s/(?<![BIUGHT])</&lt;/g;
1500 1525
1501 # this is buggy, it needs to properly take care of nested <'s 1526 # this is buggy, it needs to properly take care of nested <'s
1502 1527
1503 1 while 1528 1 while
1504 # replace B<>, I<>, U<> etc. 1529 # replace B<>, I<>, U<> etc.
1505 s/B<([^\>]*)>/<b>$1<\/b>/ 1530 s/B<([^\>]*)>/<b>$1<\/b>/
1506 || s/I<([^\>]*)>/<i>$1<\/i>/ 1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1507 || s/U<([^\>]*)>/<u>$1<\/u>/ 1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1508 # replace G<male|female> tags 1534 # replace G<male|female> tags
1509 || s{G<([^>|]*)\|([^>]*)>}{ 1535 || s{G<([^>|]*)\|([^>]*)>}{
1510 $self->gender ? $2 : $1 1536 $self->gender ? $2 : $1
1511 }ge 1537 }ge
1512 # replace H<hint text> 1538 # replace H<hint text>
… …
1542=cut 1568=cut
1543 1569
1544sub ext_reply($$@) { 1570sub ext_reply($$@) {
1545 my ($self, $id, @msg) = @_; 1571 my ($self, $id, @msg) = @_;
1546 1572
1547 if ($self->ns->extcmd == 2) { 1573 $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} 1574}
1555 1575
1556=item $player->ext_msg ($type, @msg) 1576=item $player->ext_msg ($type, @msg)
1557 1577
1558Sends an ext event to the client. 1578Sends an ext event to the client.
… …
1786 1806
1787sub load_header_from($) { 1807sub load_header_from($) {
1788 my ($self, $path) = @_; 1808 my ($self, $path) = @_;
1789 1809
1790 utf8::encode $path; 1810 utf8::encode $path;
1791 #aio_open $path, O_RDONLY, 0 1811 my $f = new_from_file cf::object::thawer $path
1792 # or return;
1793
1794 $self->_load_header ($path)
1795 or return; 1812 or return;
1813
1814 $self->_load_header ($f)
1815 or return;
1816
1817 local $MAP_LOADING{$self->{path}} = $self;
1818 $f->resolve_delayed_derefs;
1796 1819
1797 $self->{load_path} = $path; 1820 $self->{load_path} = $path;
1798 1821
1799 1 1822 1
1800} 1823}
… …
1854sub find { 1877sub find {
1855 my ($path, $origin) = @_; 1878 my ($path, $origin) = @_;
1856 1879
1857 $path = normalise $path, $origin && $origin->path; 1880 $path = normalise $path, $origin && $origin->path;
1858 1881
1882 cf::lock_wait "map_data:$path";#d#remove
1859 cf::lock_wait "map_find:$path"; 1883 cf::lock_wait "map_find:$path";
1860 1884
1861 $cf::MAP{$path} || do { 1885 $cf::MAP{$path} || do {
1862 my $guard = cf::lock_acquire "map_find:$path"; 1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1863 my $map = new_from_path cf::map $path 1889 my $map = new_from_path cf::map $path
1864 or return; 1890 or return;
1865 1891
1866 $map->{last_save} = $cf::RUNTIME; 1892 $map->{last_save} = $cf::RUNTIME;
1867 1893
… …
1869 or return; 1895 or return;
1870 1896
1871 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1872 # doing this can freeze the server in a sync job, obviously 1898 # doing this can freeze the server in a sync job, obviously
1873 #$cf::WAIT_FOR_TICK->wait; 1899 #$cf::WAIT_FOR_TICK->wait;
1900 undef $guard1;
1901 undef $guard2;
1874 $map->reset; 1902 $map->reset;
1875 undef $guard;
1876 return find $path; 1903 return find $path;
1877 } 1904 }
1878 1905
1879 $cf::MAP{$path} = $map 1906 $cf::MAP{$path} = $map
1880 } 1907 }
… …
1889 local $self->{deny_reset} = 1; # loading can take a long time 1916 local $self->{deny_reset} = 1; # loading can take a long time
1890 1917
1891 my $path = $self->{path}; 1918 my $path = $self->{path};
1892 1919
1893 { 1920 {
1894 my $guard = cf::lock_acquire "map_load:$path"; 1921 my $guard = cf::lock_acquire "map_data:$path";
1895 1922
1923 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 1924 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 1925
1898 $self->in_memory (cf::MAP_LOADING); 1926 $self->in_memory (cf::MAP_LOADING);
1899 1927
1900 $self->alloc; 1928 $self->alloc;
1901 1929
1902 $self->pre_load; 1930 $self->pre_load;
1903 Coro::cede; 1931 cf::cede_to_tick;
1904 1932
1933 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block;
1905 $self->_load_objects ($self->{load_path}, 1) 1935 $self->_load_objects ($f)
1906 or return; 1936 or return;
1907 1937
1908 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1909 if delete $self->{load_original}; 1939 if delete $self->{load_original};
1910 1940
1911 if (my $uniq = $self->uniq_path) { 1941 if (my $uniq = $self->uniq_path) {
1912 utf8::encode $uniq; 1942 utf8::encode $uniq;
1913 if (aio_open $uniq, O_RDONLY, 0) { 1943 unless (aio_stat $uniq) {
1944 if (my $f = new_from_file cf::object::thawer $uniq) {
1914 $self->clear_unique_items; 1945 $self->clear_unique_items;
1915 $self->_load_objects ($uniq, 0); 1946 $self->_load_objects ($f);
1947 $f->resolve_delayed_derefs;
1948 }
1916 } 1949 }
1917 } 1950 }
1918 1951
1919 Coro::cede; 1952 $f->resolve_delayed_derefs;
1953
1954 cf::cede_to_tick;
1920 # now do the right thing for maps 1955 # now do the right thing for maps
1921 $self->link_multipart_objects; 1956 $self->link_multipart_objects;
1922 $self->difficulty ($self->estimate_difficulty) 1957 $self->difficulty ($self->estimate_difficulty)
1923 unless $self->difficulty; 1958 unless $self->difficulty;
1924 Coro::cede; 1959 cf::cede_to_tick;
1925 1960
1926 unless ($self->{deny_activate}) { 1961 unless ($self->{deny_activate}) {
1927 $self->decay_objects; 1962 $self->decay_objects;
1928 $self->fix_auto_apply; 1963 $self->fix_auto_apply;
1929 $self->update_buttons; 1964 $self->update_buttons;
1930 Coro::cede; 1965 cf::cede_to_tick;
1931 $self->set_darkness_map; 1966 $self->set_darkness_map;
1932 Coro::cede; 1967 cf::cede_to_tick;
1933 $self->activate; 1968 $self->activate;
1934 } 1969 }
1935 1970
1936 $self->{last_save} = $cf::RUNTIME; 1971 $self->{last_save} = $cf::RUNTIME;
1937 $self->last_access ($cf::RUNTIME); 1972 $self->last_access ($cf::RUNTIME);
… …
1953 1988
1954 $self 1989 $self
1955} 1990}
1956 1991
1957# find and load all maps in the 3x3 area around a map 1992# find and load all maps in the 3x3 area around a map
1958sub load_diag { 1993sub load_neighbours {
1959 my ($map) = @_; 1994 my ($map) = @_;
1960 1995
1961 my @diag; # diagonal neighbours 1996 my @neigh; # diagonal neighbours
1962 1997
1963 for (0 .. 3) { 1998 for (0 .. 3) {
1964 my $neigh = $map->tile_path ($_) 1999 my $neigh = $map->tile_path ($_)
1965 or next; 2000 or next;
1966 $neigh = find $neigh, $map 2001 $neigh = find $neigh, $map
1967 or next; 2002 or next;
1968 $neigh->load; 2003 $neigh->load;
1969 2004
2005 push @neigh,
1970 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2006 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1971 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2007 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1972 } 2008 }
1973 2009
1974 for (@diag) { 2010 for (grep defined $_->[0], @neigh) {
2011 my ($path, $origin) = @$_;
1975 my $neigh = find @$_ 2012 my $neigh = find $path, $origin
1976 or next; 2013 or next;
1977 $neigh->load; 2014 $neigh->load;
1978 } 2015 }
1979} 2016}
1980 2017
… …
1985} 2022}
1986 2023
1987sub do_load_sync { 2024sub do_load_sync {
1988 my ($map) = @_; 2025 my ($map) = @_;
1989 2026
2027 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2028 if $Coro::current == $Coro::main;
2029
1990 cf::sync_job { $map->load }; 2030 cf::sync_job { $map->load };
1991} 2031}
1992 2032
1993our %MAP_PREFETCH; 2033our %MAP_PREFETCH;
1994our $MAP_PREFETCHER = undef; 2034our $MAP_PREFETCHER = undef;
1995 2035
1996sub find_async { 2036sub find_async {
1997 my ($path, $origin) = @_; 2037 my ($path, $origin, $load) = @_;
1998 2038
1999 $path = normalise $path, $origin && $origin->{path}; 2039 $path = normalise $path, $origin && $origin->{path};
2000 2040
2001 if (my $map = $cf::MAP{$path}) { 2041 if (my $map = $cf::MAP{$path}) {
2002 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
2003 } 2043 }
2004 2044
2005 undef $MAP_PREFETCH{$path}; 2045 $MAP_PREFETCH{$path} |= $load;
2046
2006 $MAP_PREFETCHER ||= cf::async { 2047 $MAP_PREFETCHER ||= cf::async {
2007 while (%MAP_PREFETCH) { 2048 while (%MAP_PREFETCH) {
2008 for my $path (keys %MAP_PREFETCH) { 2049 while (my ($k, $v) = each %MAP_PREFETCH) {
2009 if (my $map = find $path) { 2050 if (my $map = find $k) {
2010 $map->load; 2051 $map->load if $v;
2011 } 2052 }
2012 2053
2013 delete $MAP_PREFETCH{$path}; 2054 delete $MAP_PREFETCH{$k};
2014 } 2055 }
2015 } 2056 }
2016 undef $MAP_PREFETCHER; 2057 undef $MAP_PREFETCHER;
2017 }; 2058 };
2018 $MAP_PREFETCHER->prio (6); 2059 $MAP_PREFETCHER->prio (6);
… …
2021} 2062}
2022 2063
2023sub save { 2064sub save {
2024 my ($self) = @_; 2065 my ($self) = @_;
2025 2066
2026 my $lock = cf::lock_acquire "map_data:" . $self->path; 2067 my $lock = cf::lock_acquire "map_data:$self->{path}";
2027 2068
2028 $self->{last_save} = $cf::RUNTIME; 2069 $self->{last_save} = $cf::RUNTIME;
2029 2070
2030 return unless $self->dirty; 2071 return unless $self->dirty;
2031 2072
… …
2054 my ($self) = @_; 2095 my ($self) = @_;
2055 2096
2056 # save first because save cedes 2097 # save first because save cedes
2057 $self->save; 2098 $self->save;
2058 2099
2059 my $lock = cf::lock_acquire "map_data:" . $self->path; 2100 my $lock = cf::lock_acquire "map_data:$self->{path}";
2060 2101
2061 return if $self->players; 2102 return if $self->players;
2062 return if $self->in_memory != cf::MAP_IN_MEMORY; 2103 return if $self->in_memory != cf::MAP_IN_MEMORY;
2063 return if $self->{deny_save}; 2104 return if $self->{deny_save};
2064 2105
2106 $self->in_memory (cf::MAP_SWAPPED);
2107
2108 $self->deactivate;
2109 $_->clear_links_to ($self) for values %cf::MAP;
2065 $self->clear; 2110 $self->clear;
2066 $self->in_memory (cf::MAP_SWAPPED);
2067} 2111}
2068 2112
2069sub reset_at { 2113sub reset_at {
2070 my ($self) = @_; 2114 my ($self) = @_;
2071 2115
… …
2103 if $uniq; 2147 if $uniq;
2104 } 2148 }
2105 2149
2106 delete $cf::MAP{$self->path}; 2150 delete $cf::MAP{$self->path};
2107 2151
2152 $self->deactivate;
2153 $_->clear_links_to ($self) for values %cf::MAP;
2108 $self->clear; 2154 $self->clear;
2109
2110 $_->clear_links_to ($self) for values %cf::MAP;
2111 2155
2112 $self->unlink_save; 2156 $self->unlink_save;
2113 $self->destroy; 2157 $self->destroy;
2114} 2158}
2115 2159
2116my $nuke_counter = "aaaa"; 2160my $nuke_counter = "aaaa";
2117 2161
2118sub nuke { 2162sub nuke {
2119 my ($self) = @_; 2163 my ($self) = @_;
2120 2164
2165 {
2166 my $lock = cf::lock_acquire "map_data:$self->{path}";
2167
2121 delete $cf::MAP{$self->path}; 2168 delete $cf::MAP{$self->path};
2122 2169
2123 $self->unlink_save; 2170 $self->unlink_save;
2124 2171
2125 bless $self, "cf::map"; 2172 bless $self, "cf::map";
2126 delete $self->{deny_reset}; 2173 delete $self->{deny_reset};
2127 $self->{deny_save} = 1; 2174 $self->{deny_save} = 1;
2128 $self->reset_timeout (1); 2175 $self->reset_timeout (1);
2129 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2176 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2130 2177
2131 $cf::MAP{$self->path} = $self; 2178 $cf::MAP{$self->path} = $self;
2179 }
2132 2180
2133 $self->reset; # polite request, might not happen 2181 $self->reset; # polite request, might not happen
2134} 2182}
2135 2183
2136=item $maps = cf::map::tmp_maps 2184=item $maps = cf::map::tmp_maps
… …
2212 2260
2213sub inv_recursive { 2261sub inv_recursive {
2214 inv_recursive_ inv $_[0] 2262 inv_recursive_ inv $_[0]
2215} 2263}
2216 2264
2265=item $ref = $ob->ref
2266
2267creates and returns a persistent reference to an objetc that can be stored as a string.
2268
2269=item $ob = cf::object::deref ($refstring)
2270
2271returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272even if the object actually exists. May block.
2273
2274=cut
2275
2276sub deref {
2277 my ($ref) = @_;
2278
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return;
2286 $pl->ob->uuid eq $uuid
2287 or return;
2288
2289 $pl->ob
2290 } else {
2291 warn "$ref: cannot resolve object reference\n";
2292 undef
2293 }
2294}
2295
2217package cf; 2296package cf;
2218 2297
2219=back 2298=back
2220 2299
2221=head3 cf::object::player 2300=head3 cf::object::player
… …
2349 # use -1 or undef as default coordinates, not 0, 0 2428 # use -1 or undef as default coordinates, not 0, 0
2350 ($x, $y) = ($map->enter_x, $map->enter_y) 2429 ($x, $y) = ($map->enter_x, $map->enter_y)
2351 if $x <=0 && $y <= 0; 2430 if $x <=0 && $y <= 0;
2352 2431
2353 $map->load; 2432 $map->load;
2354 $map->load_diag; 2433 $map->load_neighbours;
2355 2434
2356 return unless $self->contr->active; 2435 return unless $self->contr->active;
2357 $self->activate_recursive; 2436 $self->activate_recursive;
2358 2437
2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2379 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2380 2459
2381 $self->enter_link; 2460 $self->enter_link;
2382 2461
2383 (async { 2462 (async {
2463 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs];
2467
2468 # see if we actually can go there
2469 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2470 $ob = $obs[rand @obs];
2471 } else {
2472 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2473 }
2474 # else put us there anyways for now #d#
2475
2476 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2477 } else {
2478 ($path, $x, $y) = (undef, undef, undef);
2479 }
2480 }
2481
2384 my $map = eval { 2482 my $map = eval {
2385 my $map = cf::map::find $path; 2483 my $map = defined $path ? cf::map::find $path : undef;
2386 2484
2387 if ($map) { 2485 if ($map) {
2388 $map = $map->customise_for ($self); 2486 $map = $map->customise_for ($self);
2389 $map = $check->($map) if $check && $map; 2487 $map = $check->($map) if $check && $map;
2390 } else { 2488 } else {
2391 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2489 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2392 } 2490 }
2393 2491
2394 $map 2492 $map
2395 }; 2493 };
2396 2494
… …
2530the message, with C<log> being the default. If C<$color> is negative, suppress 2628the message, with C<log> being the default. If C<$color> is negative, suppress
2531the message unless the client supports the msg packet. 2629the message unless the client supports the msg packet.
2532 2630
2533=cut 2631=cut
2534 2632
2633our %CHANNEL = (
2634 "c/identify" => {
2635 id => "identify",
2636 title => "Identify",
2637 reply => undef,
2638 tooltip => "Items recently identified",
2639 },
2640 "c/examine" => {
2641 id => "examine",
2642 title => "Examine",
2643 reply => undef,
2644 tooltip => "Signs and other items you examined",
2645 },
2646);
2647
2535sub cf::client::send_msg { 2648sub cf::client::send_msg {
2536 my ($self, $channel, $msg, $color, @extra) = @_; 2649 my ($self, $channel, $msg, $color, @extra) = @_;
2537 2650
2538 $msg = $self->pl->expand_cfpod ($msg); 2651 $msg = $self->pl->expand_cfpod ($msg);
2539 2652
2540 $color &= cf::NDI_CLIENT_MASK; # just in case... 2653 $color &= cf::NDI_CLIENT_MASK; # just in case...
2654
2655 # check predefined channels, for the benefit of C
2656 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2541 2657
2542 if (ref $channel) { 2658 if (ref $channel) {
2543 # send meta info to client, if not yet sent 2659 # send meta info to client, if not yet sent
2544 unless (exists $self->{channel}{$channel->{id}}) { 2660 unless (exists $self->{channel}{$channel->{id}}) {
2545 $self->{channel}{$channel->{id}} = $channel; 2661 $self->{channel}{$channel->{id}} = $channel;
2546 $self->ext_msg (channel_info => $channel); 2662 $self->ext_msg (channel_info => $channel)
2663 if $self->can_msg;
2547 } 2664 }
2548 2665
2549 $channel = $channel->{id}; 2666 $channel = $channel->{id};
2550 } 2667 }
2551 2668
… …
2592=cut 2709=cut
2593 2710
2594sub cf::client::ext_msg($$@) { 2711sub cf::client::ext_msg($$@) {
2595 my ($self, $type, @msg) = @_; 2712 my ($self, $type, @msg) = @_;
2596 2713
2597 my $extcmd = $self->extcmd;
2598
2599 if ($extcmd == 2) { 2714 if ($self->extcmd == 2) {
2600 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2715 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2601 } elsif ($extcmd == 1) { # TODO: remove 2716 } elsif ($self->extcmd == 1) { # TODO: remove
2602 push @msg, msgtype => "event_$type"; 2717 push @msg, msgtype => "event_$type";
2718 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2719 }
2720}
2721
2722=item $client->ext_reply ($msgid, @msg)
2723
2724Sends an ext reply to the client.
2725
2726=cut
2727
2728sub cf::client::ext_reply($$@) {
2729 my ($self, $id, @msg) = @_;
2730
2731 if ($self->extcmd == 2) {
2732 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2733 } elsif ($self->extcmd == 1) {
2734 #TODO: version 1, remove
2735 unshift @msg, msgtype => "reply", msgid => $id;
2603 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2736 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2604 } 2737 }
2605} 2738}
2606 2739
2607=item $success = $client->query ($flags, "text", \&cb) 2740=item $success = $client->query ($flags, "text", \&cb)
… …
2669 my ($type, $reply, @payload) = 2802 my ($type, $reply, @payload) =
2670 "ARRAY" eq ref $msg 2803 "ARRAY" eq ref $msg
2671 ? @$msg 2804 ? @$msg
2672 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2805 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2673 2806
2807 my @reply;
2808
2674 if (my $cb = $EXTICMD{$type}) { 2809 if (my $cb = $EXTICMD{$type}) {
2675 my @reply = $cb->($ns, @payload); 2810 @reply = $cb->($ns, @payload);
2676
2677 $ns->ext_reply ($reply, @reply)
2678 if $reply;
2679 } 2811 }
2812
2813 $ns->ext_reply ($reply, @reply)
2814 if $reply;
2815
2680 } else { 2816 } else {
2681 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2817 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2682 } 2818 }
2683 2819
2684 cf::override; 2820 cf::override;
… …
2745 2881
2746The following functions and methods are available within a safe environment: 2882The following functions and methods are available within a safe environment:
2747 2883
2748 cf::object 2884 cf::object
2749 contr pay_amount pay_player map x y force_find force_add 2885 contr pay_amount pay_player map x y force_find force_add
2750 insert remove name archname title slaying race 2886 insert remove name archname title slaying race decrease_ob_nr
2751 2887
2752 cf::object::player 2888 cf::object::player
2753 player 2889 player
2754 2890
2755 cf::player 2891 cf::player
… …
2760 2896
2761=cut 2897=cut
2762 2898
2763for ( 2899for (
2764 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2900 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2765 insert remove inv name archname title slaying race)], 2901 insert remove inv name archname title slaying race
2902 decrease_ob_nr)],
2766 ["cf::object::player" => qw(player)], 2903 ["cf::object::player" => qw(player)],
2767 ["cf::player" => qw(peaceful)], 2904 ["cf::player" => qw(peaceful)],
2768 ["cf::map" => qw(trigger)], 2905 ["cf::map" => qw(trigger)],
2769) { 2906) {
2770 no strict 'refs'; 2907 no strict 'refs';
… …
2846# the server's init and main functions 2983# the server's init and main functions
2847 2984
2848sub load_facedata($) { 2985sub load_facedata($) {
2849 my ($path) = @_; 2986 my ($path) = @_;
2850 2987
2988 # HACK to clear player env face cache, we need some signal framework
2989 # for this (global event?)
2990 %ext::player_env::MUSIC_FACE_CACHE = ();
2991
2992 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2993
2851 warn "loading facedata from $path\n"; 2994 warn "loading facedata from $path\n";
2852 2995
2853 my $facedata; 2996 my $facedata;
2854 0 < aio_load $path, $facedata 2997 0 < aio_load $path, $facedata
2855 or die "$path: $!"; 2998 or die "$path: $!";
2856 2999
2857 $facedata = Coro::Storable::thaw $facedata; 3000 $facedata = Coro::Storable::thaw $facedata;
2858 3001
2859 $facedata->{version} == 2 3002 $facedata->{version} == 2
2860 or cf::cleanup "$path: version mismatch, cannot proceed."; 3003 or cf::cleanup "$path: version mismatch, cannot proceed.";
3004
3005 # patch in the exptable
3006 $facedata->{resource}{"res/exp_table"} = {
3007 type => FT_RSRC,
3008 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3009 };
3010 cf::cede_to_tick;
2861 3011
2862 { 3012 {
2863 my $faces = $facedata->{faceinfo}; 3013 my $faces = $facedata->{faceinfo};
2864 3014
2865 while (my ($face, $info) = each %$faces) { 3015 while (my ($face, $info) = each %$faces) {
2866 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3016 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2867 cf::face::set_visibility $idx, $info->{visibility}; 3017 cf::face::set_visibility $idx, $info->{visibility};
2868 cf::face::set_magicmap $idx, $info->{magicmap}; 3018 cf::face::set_magicmap $idx, $info->{magicmap};
2869 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3019 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2870 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3020 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2871 3021
2872 cf::cede_to_tick; 3022 cf::cede_to_tick;
2873 } 3023 }
2874 3024
2875 while (my ($face, $info) = each %$faces) { 3025 while (my ($face, $info) = each %$faces) {
… …
2900 3050
2901 { 3051 {
2902 # TODO: for gcfclient pleasure, we should give resources 3052 # TODO: for gcfclient pleasure, we should give resources
2903 # that gcfclient doesn't grok a >10000 face index. 3053 # that gcfclient doesn't grok a >10000 face index.
2904 my $res = $facedata->{resource}; 3054 my $res = $facedata->{resource};
2905 my $enc = JSON::XS->new->utf8->canonical;
2906 3055
2907 my $soundconf = delete $res->{"res/sound.conf"}; 3056 my $soundconf = delete $res->{"res/sound.conf"};
2908 3057
2909 while (my ($name, $info) = each %$res) { 3058 while (my ($name, $info) = each %$res) {
2910 my $meta = $enc->encode ({
2911 name => $name,
2912 %{ $info->{meta} || {} },
2913 });
2914
2915 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3059 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3060 my $data;
2916 3061
2917 if ($info->{type} & 1) { 3062 if ($info->{type} & 1) {
2918 # prepend meta info 3063 # prepend meta info
2919 3064
3065 my $meta = $enc->encode ({
3066 name => $name,
3067 %{ $info->{meta} || {} },
3068 });
3069
2920 my $data = pack "(w/a*)*", $meta, $info->{data}; 3070 $data = pack "(w/a*)*", $meta, $info->{data};
2921 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2922
2923 cf::face::set_data $idx, 0, $data, $chk;
2924 } else { 3071 } else {
2925 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3072 $data = $info->{data};
2926 } 3073 }
2927 3074
3075 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2928 cf::face::set_type $idx, $info->{type}; 3076 cf::face::set_type $idx, $info->{type};
2929 3077
2930 cf::cede_to_tick; 3078 cf::cede_to_tick;
2931 } 3079 }
2932 3080
… …
2959 $ns->fx_want ($k, $v); 3107 $ns->fx_want ($k, $v);
2960 } 3108 }
2961}; 3109};
2962 3110
2963sub reload_regions { 3111sub reload_regions {
3112 # HACK to clear player env face cache, we need some signal framework
3113 # for this (global event?)
3114 %ext::player_env::MUSIC_FACE_CACHE = ();
3115
2964 load_resource_file "$MAPDIR/regions" 3116 load_resource_file "$MAPDIR/regions"
2965 or die "unable to load regions file\n"; 3117 or die "unable to load regions file\n";
2966 3118
2967 for (cf::region::list) { 3119 for (cf::region::list) {
2968 $_->{match} = qr/$_->{match}/ 3120 $_->{match} = qr/$_->{match}/
… …
3004 3156
3005sub init { 3157sub init {
3006 reload_resources; 3158 reload_resources;
3007} 3159}
3008 3160
3009sub cfg_load { 3161sub reload_config {
3010 open my $fh, "<:utf8", "$CONFDIR/config" 3162 open my $fh, "<:utf8", "$CONFDIR/config"
3011 or return; 3163 or return;
3012 3164
3013 local $/; 3165 local $/;
3014 *CFG = YAML::Syck::Load <$fh>; 3166 *CFG = YAML::Syck::Load <$fh>;
… …
3034 (async { 3186 (async {
3035 Event::one_event; 3187 Event::one_event;
3036 })->prio (Coro::PRIO_MAX); 3188 })->prio (Coro::PRIO_MAX);
3037 }; 3189 };
3038 3190
3039 cfg_load; 3191 reload_config;
3040 db_init; 3192 db_init;
3041 load_extensions; 3193 load_extensions;
3042 3194
3043 $TICK_WATCHER->start; 3195 $TICK_WATCHER->start;
3044 Event::loop; 3196 Event::loop;
… …
3237 warn "reloading cf.pm"; 3389 warn "reloading cf.pm";
3238 require cf; 3390 require cf;
3239 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3391 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3240 3392
3241 warn "loading config and database again"; 3393 warn "loading config and database again";
3242 cf::cfg_load; 3394 cf::reload_config;
3243 3395
3244 warn "loading extensions"; 3396 warn "loading extensions";
3245 cf::load_extensions; 3397 cf::load_extensions;
3246 3398
3247 warn "reattaching attachments to objects/players"; 3399 warn "reattaching attachments to objects/players";
… …
3312 my $signal = new Coro::Signal; 3464 my $signal = new Coro::Signal;
3313 push @WAIT_FOR_TICK_BEGIN, $signal; 3465 push @WAIT_FOR_TICK_BEGIN, $signal;
3314 $signal->wait; 3466 $signal->wait;
3315} 3467}
3316 3468
3317 my $min = 1e6;#d#
3318 my $avg = 10;
3319$TICK_WATCHER = Event->timer ( 3469$TICK_WATCHER = Event->timer (
3320 reentrant => 0, 3470 reentrant => 0,
3321 parked => 1, 3471 parked => 1,
3322 prio => 0, 3472 prio => 0,
3323 at => $NEXT_TICK || $TICK, 3473 at => $NEXT_TICK || $TICK,
… …
3331 3481
3332 $NOW = $tick_start = Event::time; 3482 $NOW = $tick_start = Event::time;
3333 3483
3334 cf::server_tick; # one server iteration 3484 cf::server_tick; # one server iteration
3335 3485
3336 0 && sync_job {#d#
3337 for(1..10) {
3338 my $t = Event::time;
3339 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3340 or die;
3341
3342 $map->width (50);
3343 $map->height (50);
3344 $map->alloc;
3345 $map->_load_objects ("/tmp/x.map", 1);
3346 my $t = Event::time - $t;
3347
3348 #next unless $t < 0.0013;#d#
3349 if ($t < $min) {
3350 $min = $t;
3351 }
3352 $avg = $avg * 0.99 + $t * 0.01;
3353 }
3354 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3355 exit 0;
3356 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3357 };
3358
3359 $RUNTIME += $TICK; 3486 $RUNTIME += $TICK;
3360 $NEXT_TICK += $TICK; 3487 $NEXT_TICK += $TICK;
3361 3488
3362 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3489 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3363 $NEXT_RUNTIME_WRITE = $NOW + 10; 3490 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
3365 write_runtime 3492 write_runtime
3366 or warn "ERROR: unable to write runtime file: $!"; 3493 or warn "ERROR: unable to write runtime file: $!";
3367 }; 3494 };
3368 } 3495 }
3369 3496
3370# my $AFTER = Event::time;
3371# warn $AFTER - $NOW;#d#
3372
3373 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3497 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3374 $sig->send; 3498 $sig->send;
3375 } 3499 }
3376 while (my $sig = shift @WAIT_FOR_TICK) { 3500 while (my $sig = shift @WAIT_FOR_TICK) {
3377 $sig->send; 3501 $sig->send;
… …
3387 3511
3388 $LOAD = ($NOW - $tick_start) / $TICK; 3512 $LOAD = ($NOW - $tick_start) / $TICK;
3389 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3513 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3390 3514
3391 _post_tick; 3515 _post_tick;
3392
3393
3394 }, 3516 },
3395); 3517);
3396 3518
3397{ 3519{
3520 BDB::min_parallel 8;
3398 BDB::max_poll_time $TICK * 0.1; 3521 BDB::max_poll_time $TICK * 0.1;
3399 $BDB_POLL_WATCHER = Event->io ( 3522 $BDB_POLL_WATCHER = Event->io (
3400 reentrant => 0, 3523 reentrant => 0,
3401 fd => BDB::poll_fileno, 3524 fd => BDB::poll_fileno,
3402 poll => 'r', 3525 poll => 'r',
3403 prio => 0, 3526 prio => 0,
3404 data => WF_AUTOCANCEL, 3527 data => WF_AUTOCANCEL,
3405 cb => \&BDB::poll_cb, 3528 cb => \&BDB::poll_cb,
3406 ); 3529 );
3407 BDB::min_parallel 8;
3408 3530
3409 BDB::set_sync_prepare { 3531 BDB::set_sync_prepare {
3410 my $status; 3532 my $status;
3411 my $current = $Coro::current; 3533 my $current = $Coro::current;
3412 ( 3534 (
… …
3433 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3555 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3434 0666; 3556 0666;
3435 3557
3436 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3558 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3437 3559
3438 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3560 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3561 | BDB::LOG_AUTOREMOVE, 1);
3439 $DB_ENV->set_lk_detect; 3562 $DB_ENV->set_lk_detect;
3440 }; 3563 };
3441 3564
3442 cf::cleanup "db_env_open(db): $@" if $@; 3565 cf::cleanup "db_env_open(db): $@" if $@;
3443 }; 3566 };
3444 } 3567 }
3568
3569 $BDB_CHECKPOINT_WATCHER = Event->timer (
3570 after => 11,
3571 interval => 60,
3572 hard => 1,
3573 prio => 0,
3574 data => WF_AUTOCANCEL,
3575 cb => sub {
3576 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3577 },
3578 );
3579 $BDB_TRICKLE_WATCHER = Event->timer (
3580 after => 5,
3581 interval => 10,
3582 hard => 1,
3583 prio => 0,
3584 data => WF_AUTOCANCEL,
3585 cb => sub {
3586 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3587 },
3588 );
3445} 3589}
3446 3590
3447{ 3591{
3448 IO::AIO::min_parallel 8; 3592 IO::AIO::min_parallel 8;
3449 3593

Diff Legend

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