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.373 by root, Sat Sep 15 15:58:06 2007 UTC

… …
10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
… …
79our $NEXT_TICK; 80our $NEXT_TICK;
80our $NOW; 81our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
82 83
83our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 88our $DB_ENV;
85 89
86our %CFG; 90our %CFG;
87 91
88our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 93our $RUNTIME;
90 94
91our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
94 98
95# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 101
… …
186 $msg .= "\n" 190 $msg .= "\n"
187 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
188 192
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 194
191 utf8::encode $msg;
192 LOG llevError, $msg; 195 LOG llevError, $msg;
193 }; 196 };
194} 197}
195 198
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
271Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
274returned. 277returned.
275 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
276Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
278 284
279=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
280 286
281Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
282 288
283=cut 289=cut
284 290
285our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
286 293
287sub lock_wait($) { 294sub lock_wait($) {
288 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
289 301
290 # wait for lock, if any 302 # wait for lock, if any
291 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 305 Coro::schedule;
… …
299 311
300 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
301 lock_wait $key; 313 lock_wait $key;
302 314
303 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
304 317
305 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
308 } 322 }
309} 323}
310 324
… …
472Coro::Storable. May, of course, block. Note that the executed sub may 486Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 487never block itself or use any form of Event handling.
474 488
475=cut 489=cut
476 490
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485
486sub fork_call(&@) { 491sub fork_call(&@) {
487 my ($cb, @args) = @_; 492 my ($cb, @args) = @_;
488 493
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 494 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 495 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 496 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 497
494 if (my $pid = fork) { 498 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 499 reset_signals;
508 local $SIG{__WARN__}; 500 &$cb
509 local $SIG{__DIE__}; 501 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 502
516 eval { 503 wantarray ? @res : $res[-1]
517 close $fh1;
518
519 my @res = eval { $cb->(@args) };
520
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
523 };
524
525 warn $@ if $@;
526 _exit 0;
527 }
528} 504}
529 505
530=item $value = cf::db_get $family => $key 506=item $value = cf::db_get $family => $key
531 507
532Returns a single value from the environment database. 508Returns a single value from the environment database.
… …
534=item cf::db_put $family => $key => $value 510=item cf::db_put $family => $key => $value
535 511
536Stores the given C<$value> in the family. It can currently store binary 512Stores the given C<$value> in the family. It can currently store binary
537data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 513data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 514
515=item $db = cf::db_table "name"
516
517Create and/or open a new database table. The string must not be "db" and must be unique
518within each server.
519
539=cut 520=cut
521
522sub db_table($) {
523 my ($name) = @_;
524 my $db = BDB::db_create $DB_ENV;
525
526 eval {
527 $db->set_flags (BDB::CHKSUM);
528
529 utf8::encode $name;
530 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
531 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
532 cf::cleanup "db_open(db): $!" if $!;
533 };
534 cf::cleanup "db_open(db): $@" if $@;
535
536 $db
537}
540 538
541our $DB; 539our $DB;
542 540
543sub db_init { 541sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 542 cf::sync_job {
548 eval { 543 $DB ||= db_table "db";
549 $DB->set_flags (BDB::CHKSUM);
550
551 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553 cf::cleanup "db_open(db): $!" if $!;
554 };
555 cf::cleanup "db_open(db): $@" if $@;
556 };
557 } 544 };
558} 545}
559 546
560sub db_get($$) { 547sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 548 my $key = "$_[0]/$_[1]";
562 549
… …
612 if (1) { 599 if (1) {
613 $md5 = 600 $md5 =
614 join "\x00", 601 join "\x00",
615 $processversion, 602 $processversion,
616 map { 603 map {
617 Coro::cede; 604 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 605 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 606 } 0.. $#$src;
620 607
621 608
622 my $dbmd5 = db_get cache => "$id/md5"; 609 my $dbmd5 = db_get cache => "$id/md5";
… …
1041sub object_freezer_save { 1028sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1029 my ($filename, $rdata, $objs) = @_;
1043 1030
1044 sync_job { 1031 sync_job {
1045 if (length $$rdata) { 1032 if (length $$rdata) {
1033 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1034 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1035 $decname, length $$rdata, scalar @$objs;
1048 1036
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1037 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1038 chmod SAVE_MODE, $fh;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1039 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1040 aio_fsync $fh if $cf::USE_FSYNC;
… …
1071 } 1059 }
1072 } else { 1060 } else {
1073 aio_unlink $filename; 1061 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1062 aio_unlink "$filename.pst";
1075 } 1063 }
1076 } 1064 };
1077} 1065}
1078 1066
1079sub object_freezer_as_string { 1067sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1068 my ($rdata, $objs) = @_;
1081 1069
… …
1093 or return; 1081 or return;
1094 1082
1095 unless (aio_stat "$filename.pst") { 1083 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1084 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1085 or return;
1086
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1087 $av = eval { (Storable::thaw $av)->{objs} };
1099 } 1088 }
1100 1089
1090 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1091 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1092 $decname, length $data, scalar @{$av || []};
1093
1103 return ($data, $av); 1094 ($data, $av)
1104} 1095}
1105 1096
1106=head2 COMMAND CALLBACKS 1097=head2 COMMAND CALLBACKS
1107 1098
1108=over 4 1099=over 4
… …
1186 my ($type, $reply, @payload) = 1177 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1178 "ARRAY" eq ref $msg
1188 ? @$msg 1179 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1180 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1181
1182 my @reply;
1183
1191 if (my $cb = $EXTCMD{$type}) { 1184 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1185 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1186 }
1187
1188 $pl->ext_reply ($reply, @reply)
1189 if $reply;
1190
1197 } else { 1191 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1192 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1193 }
1200 1194
1201 cf::override; 1195 cf::override;
… …
1291 1285
1292=head3 cf::player 1286=head3 cf::player
1293 1287
1294=over 4 1288=over 4
1295 1289
1290=item cf::player::num_playing
1291
1292Returns the official number of playing players, as per the Crossfire metaserver rules.
1293
1294=cut
1295
1296sub num_playing {
1297 scalar grep
1298 $_->ob->map
1299 && !$_->hidden
1300 && !$_->ob->flag (cf::FLAG_WIZ),
1301 cf::player::list
1302}
1303
1296=item cf::player::find $login 1304=item cf::player::find $login
1297 1305
1298Returns the given player object, loading it if necessary (might block). 1306Returns the given player object, loading it if necessary (might block).
1299 1307
1300=cut 1308=cut
… …
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1343 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1344 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1345 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1346 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1347
1340 my $pl = load_pl path $login 1348 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1349 or return;
1350
1351 my $pl = cf::player::load_pl $f
1352 or return;
1353 local $cf::PLAYER_LOADING{$login} = $pl;
1354 $f->resolve_delayed_derefs;
1342 $cf::PLAYER{$login} = $pl 1355 $cf::PLAYER{$login} = $pl
1343 } 1356 }
1344 } 1357 }
1345} 1358}
1346 1359
… …
1356 1369
1357 aio_mkdir playerdir $pl, 0770; 1370 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1371 $pl->{last_save} = $cf::RUNTIME;
1359 1372
1360 $pl->save_pl ($path); 1373 $pl->save_pl ($path);
1361 Coro::cede; 1374 cf::cede_to_tick;
1362} 1375}
1363 1376
1364sub new($) { 1377sub new($) {
1365 my ($login) = @_; 1378 my ($login) = @_;
1366 1379
… …
1444 or return []; 1457 or return [];
1445 1458
1446 my @logins; 1459 my @logins;
1447 1460
1448 for my $login (@$dirs) { 1461 for my $login (@$dirs) {
1462 my $path = path $login;
1463
1464 # a .pst is a dead give-away for a valid player
1465 unless (-e "$path.pst") {
1449 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1466 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1450 aio_read $fh, 0, 512, my $buf, 0 or next; 1467 aio_read $fh, 0, 512, my $buf, 0 or next;
1451 $buf !~ /^password -------------$/m or next; # official not-valid tag 1468 $buf !~ /^password -------------$/m or next; # official not-valid tag
1469 }
1452 1470
1453 utf8::decode $login; 1471 utf8::decode $login;
1454 push @logins, $login; 1472 push @logins, $login;
1455 } 1473 }
1456 1474
… …
1494sub expand_cfpod { 1512sub expand_cfpod {
1495 ((my $self), (local $_)) = @_; 1513 ((my $self), (local $_)) = @_;
1496 1514
1497 # escape & and < 1515 # escape & and <
1498 s/&/&amp;/g; 1516 s/&/&amp;/g;
1499 s/(?<![BIUGH])</&lt;/g; 1517 s/(?<![BIUGHT])</&lt;/g;
1500 1518
1501 # this is buggy, it needs to properly take care of nested <'s 1519 # this is buggy, it needs to properly take care of nested <'s
1502 1520
1503 1 while 1521 1 while
1504 # replace B<>, I<>, U<> etc. 1522 # replace B<>, I<>, U<> etc.
1505 s/B<([^\>]*)>/<b>$1<\/b>/ 1523 s/B<([^\>]*)>/<b>$1<\/b>/
1506 || s/I<([^\>]*)>/<i>$1<\/i>/ 1524 || s/I<([^\>]*)>/<i>$1<\/i>/
1507 || s/U<([^\>]*)>/<u>$1<\/u>/ 1525 || s/U<([^\>]*)>/<u>$1<\/u>/
1526 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1508 # replace G<male|female> tags 1527 # replace G<male|female> tags
1509 || s{G<([^>|]*)\|([^>]*)>}{ 1528 || s{G<([^>|]*)\|([^>]*)>}{
1510 $self->gender ? $2 : $1 1529 $self->gender ? $2 : $1
1511 }ge 1530 }ge
1512 # replace H<hint text> 1531 # replace H<hint text>
… …
1542=cut 1561=cut
1543 1562
1544sub ext_reply($$@) { 1563sub ext_reply($$@) {
1545 my ($self, $id, @msg) = @_; 1564 my ($self, $id, @msg) = @_;
1546 1565
1547 if ($self->ns->extcmd == 2) { 1566 $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} 1567}
1555 1568
1556=item $player->ext_msg ($type, @msg) 1569=item $player->ext_msg ($type, @msg)
1557 1570
1558Sends an ext event to the client. 1571Sends an ext event to the client.
… …
1786 1799
1787sub load_header_from($) { 1800sub load_header_from($) {
1788 my ($self, $path) = @_; 1801 my ($self, $path) = @_;
1789 1802
1790 utf8::encode $path; 1803 utf8::encode $path;
1791 #aio_open $path, O_RDONLY, 0 1804 my $f = new_from_file cf::object::thawer $path
1792 # or return;
1793
1794 $self->_load_header ($path)
1795 or return; 1805 or return;
1806
1807 $self->_load_header ($f)
1808 or return;
1809
1810 local $MAP_LOADING{$self->{path}} = $self;
1811 $f->resolve_delayed_derefs;
1796 1812
1797 $self->{load_path} = $path; 1813 $self->{load_path} = $path;
1798 1814
1799 1 1815 1
1800} 1816}
… …
1854sub find { 1870sub find {
1855 my ($path, $origin) = @_; 1871 my ($path, $origin) = @_;
1856 1872
1857 $path = normalise $path, $origin && $origin->path; 1873 $path = normalise $path, $origin && $origin->path;
1858 1874
1875 cf::lock_wait "map_data:$path";#d#remove
1859 cf::lock_wait "map_find:$path"; 1876 cf::lock_wait "map_find:$path";
1860 1877
1861 $cf::MAP{$path} || do { 1878 $cf::MAP{$path} || do {
1862 my $guard = cf::lock_acquire "map_find:$path"; 1879 my $guard1 = cf::lock_acquire "map_find:$path";
1880 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1881
1863 my $map = new_from_path cf::map $path 1882 my $map = new_from_path cf::map $path
1864 or return; 1883 or return;
1865 1884
1866 $map->{last_save} = $cf::RUNTIME; 1885 $map->{last_save} = $cf::RUNTIME;
1867 1886
… …
1869 or return; 1888 or return;
1870 1889
1871 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1890 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1872 # doing this can freeze the server in a sync job, obviously 1891 # doing this can freeze the server in a sync job, obviously
1873 #$cf::WAIT_FOR_TICK->wait; 1892 #$cf::WAIT_FOR_TICK->wait;
1893 undef $guard1;
1894 undef $guard2;
1874 $map->reset; 1895 $map->reset;
1875 undef $guard;
1876 return find $path; 1896 return find $path;
1877 } 1897 }
1878 1898
1879 $cf::MAP{$path} = $map 1899 $cf::MAP{$path} = $map
1880 } 1900 }
… …
1889 local $self->{deny_reset} = 1; # loading can take a long time 1909 local $self->{deny_reset} = 1; # loading can take a long time
1890 1910
1891 my $path = $self->{path}; 1911 my $path = $self->{path};
1892 1912
1893 { 1913 {
1894 my $guard = cf::lock_acquire "map_load:$path"; 1914 my $guard = cf::lock_acquire "map_data:$path";
1895 1915
1916 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 1917 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 1918
1898 $self->in_memory (cf::MAP_LOADING); 1919 $self->in_memory (cf::MAP_LOADING);
1899 1920
1900 $self->alloc; 1921 $self->alloc;
1901 1922
1902 $self->pre_load; 1923 $self->pre_load;
1903 Coro::cede; 1924 cf::cede_to_tick;
1904 1925
1926 my $f = new_from_file cf::object::thawer $self->{load_path};
1927 $f->skip_block;
1905 $self->_load_objects ($self->{load_path}, 1) 1928 $self->_load_objects ($f)
1906 or return; 1929 or return;
1907 1930
1908 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1931 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1909 if delete $self->{load_original}; 1932 if delete $self->{load_original};
1910 1933
1911 if (my $uniq = $self->uniq_path) { 1934 if (my $uniq = $self->uniq_path) {
1912 utf8::encode $uniq; 1935 utf8::encode $uniq;
1913 if (aio_open $uniq, O_RDONLY, 0) { 1936 unless (aio_stat $uniq) {
1937 if (my $f = new_from_file cf::object::thawer $uniq) {
1914 $self->clear_unique_items; 1938 $self->clear_unique_items;
1915 $self->_load_objects ($uniq, 0); 1939 $self->_load_objects ($f);
1940 $f->resolve_delayed_derefs;
1941 }
1916 } 1942 }
1917 } 1943 }
1918 1944
1919 Coro::cede; 1945 $f->resolve_delayed_derefs;
1946
1947 cf::cede_to_tick;
1920 # now do the right thing for maps 1948 # now do the right thing for maps
1921 $self->link_multipart_objects; 1949 $self->link_multipart_objects;
1922 $self->difficulty ($self->estimate_difficulty) 1950 $self->difficulty ($self->estimate_difficulty)
1923 unless $self->difficulty; 1951 unless $self->difficulty;
1924 Coro::cede; 1952 cf::cede_to_tick;
1925 1953
1926 unless ($self->{deny_activate}) { 1954 unless ($self->{deny_activate}) {
1927 $self->decay_objects; 1955 $self->decay_objects;
1928 $self->fix_auto_apply; 1956 $self->fix_auto_apply;
1929 $self->update_buttons; 1957 $self->update_buttons;
1930 Coro::cede; 1958 cf::cede_to_tick;
1931 $self->set_darkness_map; 1959 $self->set_darkness_map;
1932 Coro::cede; 1960 cf::cede_to_tick;
1933 $self->activate; 1961 $self->activate;
1934 } 1962 }
1935 1963
1936 $self->{last_save} = $cf::RUNTIME; 1964 $self->{last_save} = $cf::RUNTIME;
1937 $self->last_access ($cf::RUNTIME); 1965 $self->last_access ($cf::RUNTIME);
… …
1953 1981
1954 $self 1982 $self
1955} 1983}
1956 1984
1957# find and load all maps in the 3x3 area around a map 1985# find and load all maps in the 3x3 area around a map
1958sub load_diag { 1986sub load_neighbours {
1959 my ($map) = @_; 1987 my ($map) = @_;
1960 1988
1961 my @diag; # diagonal neighbours 1989 my @neigh; # diagonal neighbours
1962 1990
1963 for (0 .. 3) { 1991 for (0 .. 3) {
1964 my $neigh = $map->tile_path ($_) 1992 my $neigh = $map->tile_path ($_)
1965 or next; 1993 or next;
1966 $neigh = find $neigh, $map 1994 $neigh = find $neigh, $map
1967 or next; 1995 or next;
1968 $neigh->load; 1996 $neigh->load;
1969 1997
1998 push @neigh,
1970 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1999 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1971 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2000 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1972 } 2001 }
1973 2002
1974 for (@diag) { 2003 for (grep defined $_->[0], @neigh) {
2004 my ($path, $origin) = @$_;
1975 my $neigh = find @$_ 2005 my $neigh = find $path, $origin
1976 or next; 2006 or next;
1977 $neigh->load; 2007 $neigh->load;
1978 } 2008 }
1979} 2009}
1980 2010
… …
1985} 2015}
1986 2016
1987sub do_load_sync { 2017sub do_load_sync {
1988 my ($map) = @_; 2018 my ($map) = @_;
1989 2019
2020 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2021 if $Coro::current == $Coro::main;
2022
1990 cf::sync_job { $map->load }; 2023 cf::sync_job { $map->load };
1991} 2024}
1992 2025
1993our %MAP_PREFETCH; 2026our %MAP_PREFETCH;
1994our $MAP_PREFETCHER = undef; 2027our $MAP_PREFETCHER = undef;
1995 2028
1996sub find_async { 2029sub find_async {
1997 my ($path, $origin) = @_; 2030 my ($path, $origin, $load) = @_;
1998 2031
1999 $path = normalise $path, $origin && $origin->{path}; 2032 $path = normalise $path, $origin && $origin->{path};
2000 2033
2001 if (my $map = $cf::MAP{$path}) { 2034 if (my $map = $cf::MAP{$path}) {
2002 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2035 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
2003 } 2036 }
2004 2037
2005 undef $MAP_PREFETCH{$path}; 2038 $MAP_PREFETCH{$path} |= $load;
2039
2006 $MAP_PREFETCHER ||= cf::async { 2040 $MAP_PREFETCHER ||= cf::async {
2007 while (%MAP_PREFETCH) { 2041 while (%MAP_PREFETCH) {
2008 for my $path (keys %MAP_PREFETCH) { 2042 while (my ($k, $v) = each %MAP_PREFETCH) {
2009 if (my $map = find $path) { 2043 if (my $map = find $k) {
2010 $map->load; 2044 $map->load if $v;
2011 } 2045 }
2012 2046
2013 delete $MAP_PREFETCH{$path}; 2047 delete $MAP_PREFETCH{$k};
2014 } 2048 }
2015 } 2049 }
2016 undef $MAP_PREFETCHER; 2050 undef $MAP_PREFETCHER;
2017 }; 2051 };
2018 $MAP_PREFETCHER->prio (6); 2052 $MAP_PREFETCHER->prio (6);
… …
2021} 2055}
2022 2056
2023sub save { 2057sub save {
2024 my ($self) = @_; 2058 my ($self) = @_;
2025 2059
2026 my $lock = cf::lock_acquire "map_data:" . $self->path; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
2027 2061
2028 $self->{last_save} = $cf::RUNTIME; 2062 $self->{last_save} = $cf::RUNTIME;
2029 2063
2030 return unless $self->dirty; 2064 return unless $self->dirty;
2031 2065
… …
2054 my ($self) = @_; 2088 my ($self) = @_;
2055 2089
2056 # save first because save cedes 2090 # save first because save cedes
2057 $self->save; 2091 $self->save;
2058 2092
2059 my $lock = cf::lock_acquire "map_data:" . $self->path; 2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
2060 2094
2061 return if $self->players; 2095 return if $self->players;
2062 return if $self->in_memory != cf::MAP_IN_MEMORY; 2096 return if $self->in_memory != cf::MAP_IN_MEMORY;
2063 return if $self->{deny_save}; 2097 return if $self->{deny_save};
2064 2098
2099 $self->in_memory (cf::MAP_SWAPPED);
2100
2101 $self->deactivate;
2102 $_->clear_links_to ($self) for values %cf::MAP;
2065 $self->clear; 2103 $self->clear;
2066 $self->in_memory (cf::MAP_SWAPPED);
2067} 2104}
2068 2105
2069sub reset_at { 2106sub reset_at {
2070 my ($self) = @_; 2107 my ($self) = @_;
2071 2108
… …
2103 if $uniq; 2140 if $uniq;
2104 } 2141 }
2105 2142
2106 delete $cf::MAP{$self->path}; 2143 delete $cf::MAP{$self->path};
2107 2144
2145 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP;
2108 $self->clear; 2147 $self->clear;
2109
2110 $_->clear_links_to ($self) for values %cf::MAP;
2111 2148
2112 $self->unlink_save; 2149 $self->unlink_save;
2113 $self->destroy; 2150 $self->destroy;
2114} 2151}
2115 2152
2116my $nuke_counter = "aaaa"; 2153my $nuke_counter = "aaaa";
2117 2154
2118sub nuke { 2155sub nuke {
2119 my ($self) = @_; 2156 my ($self) = @_;
2120 2157
2158 {
2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
2160
2121 delete $cf::MAP{$self->path}; 2161 delete $cf::MAP{$self->path};
2122 2162
2123 $self->unlink_save; 2163 $self->unlink_save;
2124 2164
2125 bless $self, "cf::map"; 2165 bless $self, "cf::map";
2126 delete $self->{deny_reset}; 2166 delete $self->{deny_reset};
2127 $self->{deny_save} = 1; 2167 $self->{deny_save} = 1;
2128 $self->reset_timeout (1); 2168 $self->reset_timeout (1);
2129 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2169 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2130 2170
2131 $cf::MAP{$self->path} = $self; 2171 $cf::MAP{$self->path} = $self;
2172 }
2132 2173
2133 $self->reset; # polite request, might not happen 2174 $self->reset; # polite request, might not happen
2134} 2175}
2135 2176
2136=item $maps = cf::map::tmp_maps 2177=item $maps = cf::map::tmp_maps
… …
2212 2253
2213sub inv_recursive { 2254sub inv_recursive {
2214 inv_recursive_ inv $_[0] 2255 inv_recursive_ inv $_[0]
2215} 2256}
2216 2257
2258=item $ref = $ob->ref
2259
2260creates and returns a persistent reference to an objetc that can be stored as a string.
2261
2262=item $ob = cf::object::deref ($refstring)
2263
2264returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2265even if the object actually exists. May block.
2266
2267=cut
2268
2269sub deref {
2270 my ($ref) = @_;
2271
2272 # temporary compatibility#TODO#remove
2273 $ref =~ s{^<}{player/<};
2274
2275 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2276 my ($uuid, $name) = ($1, $2);
2277 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2278 or return;
2279 $pl->ob->uuid eq $uuid
2280 or return;
2281
2282 $pl->ob
2283 } else {
2284 warn "$ref: cannot resolve object reference\n";
2285 undef
2286 }
2287}
2288
2217package cf; 2289package cf;
2218 2290
2219=back 2291=back
2220 2292
2221=head3 cf::object::player 2293=head3 cf::object::player
… …
2349 # use -1 or undef as default coordinates, not 0, 0 2421 # use -1 or undef as default coordinates, not 0, 0
2350 ($x, $y) = ($map->enter_x, $map->enter_y) 2422 ($x, $y) = ($map->enter_x, $map->enter_y)
2351 if $x <=0 && $y <= 0; 2423 if $x <=0 && $y <= 0;
2352 2424
2353 $map->load; 2425 $map->load;
2354 $map->load_diag; 2426 $map->load_neighbours;
2355 2427
2356 return unless $self->contr->active; 2428 return unless $self->contr->active;
2357 $self->activate_recursive; 2429 $self->activate_recursive;
2358 2430
2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2431 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2379 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2451 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2380 2452
2381 $self->enter_link; 2453 $self->enter_link;
2382 2454
2383 (async { 2455 (async {
2456 # *tag paths override both path and x|y
2457 if ($path =~ /^\*(.*)$/) {
2458 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2459 my $ob = $obs[rand @obs];
2460
2461 # see if we actually can go there
2462 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2463 $ob = $obs[rand @obs];
2464 } else {
2465 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2466 }
2467 # else put us there anyways for now #d#
2468
2469 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2470 } else {
2471 ($path, $x, $y) = (undef, undef, undef);
2472 }
2473 }
2474
2384 my $map = eval { 2475 my $map = eval {
2385 my $map = cf::map::find $path; 2476 my $map = defined $path ? cf::map::find $path : undef;
2386 2477
2387 if ($map) { 2478 if ($map) {
2388 $map = $map->customise_for ($self); 2479 $map = $map->customise_for ($self);
2389 $map = $check->($map) if $check && $map; 2480 $map = $check->($map) if $check && $map;
2390 } else { 2481 } else {
2391 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2482 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2392 } 2483 }
2393 2484
2394 $map 2485 $map
2395 }; 2486 };
2396 2487
… …
2530the message, with C<log> being the default. If C<$color> is negative, suppress 2621the message, with C<log> being the default. If C<$color> is negative, suppress
2531the message unless the client supports the msg packet. 2622the message unless the client supports the msg packet.
2532 2623
2533=cut 2624=cut
2534 2625
2626our %CHANNEL = (
2627 "c/identify" => {
2628 id => "identify",
2629 title => "Identify",
2630 reply => undef,
2631 tooltip => "Items recently identified",
2632 },
2633 "c/examine" => {
2634 id => "examine",
2635 title => "Examine",
2636 reply => undef,
2637 tooltip => "Signs and other items you examined",
2638 },
2639);
2640
2535sub cf::client::send_msg { 2641sub cf::client::send_msg {
2536 my ($self, $channel, $msg, $color, @extra) = @_; 2642 my ($self, $channel, $msg, $color, @extra) = @_;
2537 2643
2538 $msg = $self->pl->expand_cfpod ($msg); 2644 $msg = $self->pl->expand_cfpod ($msg);
2539 2645
2540 $color &= cf::NDI_CLIENT_MASK; # just in case... 2646 $color &= cf::NDI_CLIENT_MASK; # just in case...
2647
2648 # check predefined channels, for the benefit of C
2649 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2541 2650
2542 if (ref $channel) { 2651 if (ref $channel) {
2543 # send meta info to client, if not yet sent 2652 # send meta info to client, if not yet sent
2544 unless (exists $self->{channel}{$channel->{id}}) { 2653 unless (exists $self->{channel}{$channel->{id}}) {
2545 $self->{channel}{$channel->{id}} = $channel; 2654 $self->{channel}{$channel->{id}} = $channel;
2546 $self->ext_msg (channel_info => $channel); 2655 $self->ext_msg (channel_info => $channel)
2656 if $self->can_msg;
2547 } 2657 }
2548 2658
2549 $channel = $channel->{id}; 2659 $channel = $channel->{id};
2550 } 2660 }
2551 2661
… …
2592=cut 2702=cut
2593 2703
2594sub cf::client::ext_msg($$@) { 2704sub cf::client::ext_msg($$@) {
2595 my ($self, $type, @msg) = @_; 2705 my ($self, $type, @msg) = @_;
2596 2706
2597 my $extcmd = $self->extcmd;
2598
2599 if ($extcmd == 2) { 2707 if ($self->extcmd == 2) {
2600 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2708 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2601 } elsif ($extcmd == 1) { # TODO: remove 2709 } elsif ($self->extcmd == 1) { # TODO: remove
2602 push @msg, msgtype => "event_$type"; 2710 push @msg, msgtype => "event_$type";
2711 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2712 }
2713}
2714
2715=item $client->ext_reply ($msgid, @msg)
2716
2717Sends an ext reply to the client.
2718
2719=cut
2720
2721sub cf::client::ext_reply($$@) {
2722 my ($self, $id, @msg) = @_;
2723
2724 if ($self->extcmd == 2) {
2725 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2726 } elsif ($self->extcmd == 1) {
2727 #TODO: version 1, remove
2728 unshift @msg, msgtype => "reply", msgid => $id;
2603 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2729 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2604 } 2730 }
2605} 2731}
2606 2732
2607=item $success = $client->query ($flags, "text", \&cb) 2733=item $success = $client->query ($flags, "text", \&cb)
… …
2669 my ($type, $reply, @payload) = 2795 my ($type, $reply, @payload) =
2670 "ARRAY" eq ref $msg 2796 "ARRAY" eq ref $msg
2671 ? @$msg 2797 ? @$msg
2672 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2798 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2673 2799
2800 my @reply;
2801
2674 if (my $cb = $EXTICMD{$type}) { 2802 if (my $cb = $EXTICMD{$type}) {
2675 my @reply = $cb->($ns, @payload); 2803 @reply = $cb->($ns, @payload);
2676
2677 $ns->ext_reply ($reply, @reply)
2678 if $reply;
2679 } 2804 }
2805
2806 $ns->ext_reply ($reply, @reply)
2807 if $reply;
2808
2680 } else { 2809 } else {
2681 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2810 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2682 } 2811 }
2683 2812
2684 cf::override; 2813 cf::override;
… …
2745 2874
2746The following functions and methods are available within a safe environment: 2875The following functions and methods are available within a safe environment:
2747 2876
2748 cf::object 2877 cf::object
2749 contr pay_amount pay_player map x y force_find force_add 2878 contr pay_amount pay_player map x y force_find force_add
2750 insert remove name archname title slaying race 2879 insert remove name archname title slaying race decrease_ob_nr
2751 2880
2752 cf::object::player 2881 cf::object::player
2753 player 2882 player
2754 2883
2755 cf::player 2884 cf::player
… …
2760 2889
2761=cut 2890=cut
2762 2891
2763for ( 2892for (
2764 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2893 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2765 insert remove inv name archname title slaying race)], 2894 insert remove inv name archname title slaying race
2895 decrease_ob_nr)],
2766 ["cf::object::player" => qw(player)], 2896 ["cf::object::player" => qw(player)],
2767 ["cf::player" => qw(peaceful)], 2897 ["cf::player" => qw(peaceful)],
2768 ["cf::map" => qw(trigger)], 2898 ["cf::map" => qw(trigger)],
2769) { 2899) {
2770 no strict 'refs'; 2900 no strict 'refs';
… …
2846# the server's init and main functions 2976# the server's init and main functions
2847 2977
2848sub load_facedata($) { 2978sub load_facedata($) {
2849 my ($path) = @_; 2979 my ($path) = @_;
2850 2980
2981 # HACK to clear player env face cache, we need some signal framework
2982 # for this (global event?)
2983 %ext::player_env::MUSIC_FACE_CACHE = ();
2984
2985 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2986
2851 warn "loading facedata from $path\n"; 2987 warn "loading facedata from $path\n";
2852 2988
2853 my $facedata; 2989 my $facedata;
2854 0 < aio_load $path, $facedata 2990 0 < aio_load $path, $facedata
2855 or die "$path: $!"; 2991 or die "$path: $!";
2856 2992
2857 $facedata = Coro::Storable::thaw $facedata; 2993 $facedata = Coro::Storable::thaw $facedata;
2858 2994
2859 $facedata->{version} == 2 2995 $facedata->{version} == 2
2860 or cf::cleanup "$path: version mismatch, cannot proceed."; 2996 or cf::cleanup "$path: version mismatch, cannot proceed.";
2997
2998 # patch in the exptable
2999 $facedata->{resource}{"res/exp_table"} = {
3000 type => FT_RSRC,
3001 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3002 };
3003 cf::cede_to_tick;
2861 3004
2862 { 3005 {
2863 my $faces = $facedata->{faceinfo}; 3006 my $faces = $facedata->{faceinfo};
2864 3007
2865 while (my ($face, $info) = each %$faces) { 3008 while (my ($face, $info) = each %$faces) {
2866 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3009 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2867 cf::face::set_visibility $idx, $info->{visibility}; 3010 cf::face::set_visibility $idx, $info->{visibility};
2868 cf::face::set_magicmap $idx, $info->{magicmap}; 3011 cf::face::set_magicmap $idx, $info->{magicmap};
2869 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3012 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2870 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3013 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2871 3014
2872 cf::cede_to_tick; 3015 cf::cede_to_tick;
2873 } 3016 }
2874 3017
2875 while (my ($face, $info) = each %$faces) { 3018 while (my ($face, $info) = each %$faces) {
… …
2900 3043
2901 { 3044 {
2902 # TODO: for gcfclient pleasure, we should give resources 3045 # TODO: for gcfclient pleasure, we should give resources
2903 # that gcfclient doesn't grok a >10000 face index. 3046 # that gcfclient doesn't grok a >10000 face index.
2904 my $res = $facedata->{resource}; 3047 my $res = $facedata->{resource};
2905 my $enc = JSON::XS->new->utf8->canonical;
2906 3048
2907 my $soundconf = delete $res->{"res/sound.conf"}; 3049 my $soundconf = delete $res->{"res/sound.conf"};
2908 3050
2909 while (my ($name, $info) = each %$res) { 3051 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; 3052 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3053 my $data;
2916 3054
2917 if ($info->{type} & 1) { 3055 if ($info->{type} & 1) {
2918 # prepend meta info 3056 # prepend meta info
2919 3057
3058 my $meta = $enc->encode ({
3059 name => $name,
3060 %{ $info->{meta} || {} },
3061 });
3062
2920 my $data = pack "(w/a*)*", $meta, $info->{data}; 3063 $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 { 3064 } else {
2925 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3065 $data = $info->{data};
2926 } 3066 }
2927 3067
3068 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2928 cf::face::set_type $idx, $info->{type}; 3069 cf::face::set_type $idx, $info->{type};
2929 3070
2930 cf::cede_to_tick; 3071 cf::cede_to_tick;
2931 } 3072 }
2932 3073
… …
2959 $ns->fx_want ($k, $v); 3100 $ns->fx_want ($k, $v);
2960 } 3101 }
2961}; 3102};
2962 3103
2963sub reload_regions { 3104sub reload_regions {
3105 # HACK to clear player env face cache, we need some signal framework
3106 # for this (global event?)
3107 %ext::player_env::MUSIC_FACE_CACHE = ();
3108
2964 load_resource_file "$MAPDIR/regions" 3109 load_resource_file "$MAPDIR/regions"
2965 or die "unable to load regions file\n"; 3110 or die "unable to load regions file\n";
2966 3111
2967 for (cf::region::list) { 3112 for (cf::region::list) {
2968 $_->{match} = qr/$_->{match}/ 3113 $_->{match} = qr/$_->{match}/
… …
3004 3149
3005sub init { 3150sub init {
3006 reload_resources; 3151 reload_resources;
3007} 3152}
3008 3153
3009sub cfg_load { 3154sub reload_config {
3010 open my $fh, "<:utf8", "$CONFDIR/config" 3155 open my $fh, "<:utf8", "$CONFDIR/config"
3011 or return; 3156 or return;
3012 3157
3013 local $/; 3158 local $/;
3014 *CFG = YAML::Syck::Load <$fh>; 3159 *CFG = YAML::Syck::Load <$fh>;
… …
3034 (async { 3179 (async {
3035 Event::one_event; 3180 Event::one_event;
3036 })->prio (Coro::PRIO_MAX); 3181 })->prio (Coro::PRIO_MAX);
3037 }; 3182 };
3038 3183
3039 cfg_load; 3184 reload_config;
3040 db_init; 3185 db_init;
3041 load_extensions; 3186 load_extensions;
3042 3187
3043 $TICK_WATCHER->start; 3188 $TICK_WATCHER->start;
3044 Event::loop; 3189 Event::loop;
… …
3237 warn "reloading cf.pm"; 3382 warn "reloading cf.pm";
3238 require cf; 3383 require cf;
3239 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3384 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3240 3385
3241 warn "loading config and database again"; 3386 warn "loading config and database again";
3242 cf::cfg_load; 3387 cf::reload_config;
3243 3388
3244 warn "loading extensions"; 3389 warn "loading extensions";
3245 cf::load_extensions; 3390 cf::load_extensions;
3246 3391
3247 warn "reattaching attachments to objects/players"; 3392 warn "reattaching attachments to objects/players";
… …
3312 my $signal = new Coro::Signal; 3457 my $signal = new Coro::Signal;
3313 push @WAIT_FOR_TICK_BEGIN, $signal; 3458 push @WAIT_FOR_TICK_BEGIN, $signal;
3314 $signal->wait; 3459 $signal->wait;
3315} 3460}
3316 3461
3317 my $min = 1e6;#d#
3318 my $avg = 10;
3319$TICK_WATCHER = Event->timer ( 3462$TICK_WATCHER = Event->timer (
3320 reentrant => 0, 3463 reentrant => 0,
3321 parked => 1, 3464 parked => 1,
3322 prio => 0, 3465 prio => 0,
3323 at => $NEXT_TICK || $TICK, 3466 at => $NEXT_TICK || $TICK,
… …
3331 3474
3332 $NOW = $tick_start = Event::time; 3475 $NOW = $tick_start = Event::time;
3333 3476
3334 cf::server_tick; # one server iteration 3477 cf::server_tick; # one server iteration
3335 3478
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; 3479 $RUNTIME += $TICK;
3360 $NEXT_TICK += $TICK; 3480 $NEXT_TICK += $TICK;
3361 3481
3362 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3482 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3363 $NEXT_RUNTIME_WRITE = $NOW + 10; 3483 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
3365 write_runtime 3485 write_runtime
3366 or warn "ERROR: unable to write runtime file: $!"; 3486 or warn "ERROR: unable to write runtime file: $!";
3367 }; 3487 };
3368 } 3488 }
3369 3489
3370# my $AFTER = Event::time;
3371# warn $AFTER - $NOW;#d#
3372
3373 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3490 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3374 $sig->send; 3491 $sig->send;
3375 } 3492 }
3376 while (my $sig = shift @WAIT_FOR_TICK) { 3493 while (my $sig = shift @WAIT_FOR_TICK) {
3377 $sig->send; 3494 $sig->send;
… …
3387 3504
3388 $LOAD = ($NOW - $tick_start) / $TICK; 3505 $LOAD = ($NOW - $tick_start) / $TICK;
3389 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3506 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3390 3507
3391 _post_tick; 3508 _post_tick;
3392
3393
3394 }, 3509 },
3395); 3510);
3396 3511
3397{ 3512{
3513 BDB::min_parallel 8;
3398 BDB::max_poll_time $TICK * 0.1; 3514 BDB::max_poll_time $TICK * 0.1;
3399 $BDB_POLL_WATCHER = Event->io ( 3515 $BDB_POLL_WATCHER = Event->io (
3400 reentrant => 0, 3516 reentrant => 0,
3401 fd => BDB::poll_fileno, 3517 fd => BDB::poll_fileno,
3402 poll => 'r', 3518 poll => 'r',
3403 prio => 0, 3519 prio => 0,
3404 data => WF_AUTOCANCEL, 3520 data => WF_AUTOCANCEL,
3405 cb => \&BDB::poll_cb, 3521 cb => \&BDB::poll_cb,
3406 ); 3522 );
3407 BDB::min_parallel 8;
3408 3523
3409 BDB::set_sync_prepare { 3524 BDB::set_sync_prepare {
3410 my $status; 3525 my $status;
3411 my $current = $Coro::current; 3526 my $current = $Coro::current;
3412 ( 3527 (
… …
3421 ) 3536 )
3422 }; 3537 };
3423 3538
3424 unless ($DB_ENV) { 3539 unless ($DB_ENV) {
3425 $DB_ENV = BDB::db_env_create; 3540 $DB_ENV = BDB::db_env_create;
3541 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3542 | BDB::LOG_AUTOREMOVE, 1);
3543 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3544 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3426 3545
3427 cf::sync_job { 3546 cf::sync_job {
3428 eval { 3547 eval {
3429 BDB::db_env_open 3548 BDB::db_env_open
3430 $DB_ENV, 3549 $DB_ENV,
… …
3432 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3551 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3433 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3552 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3434 0666; 3553 0666;
3435 3554
3436 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3555 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3437
3438 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3439 $DB_ENV->set_lk_detect;
3440 }; 3556 };
3441 3557
3442 cf::cleanup "db_env_open(db): $@" if $@; 3558 cf::cleanup "db_env_open(db): $@" if $@;
3443 }; 3559 };
3444 } 3560 }
3561
3562 $BDB_DEADLOCK_WATCHER = Event->timer (
3563 after => 3,
3564 interval => 1,
3565 hard => 1,
3566 prio => 0,
3567 data => WF_AUTOCANCEL,
3568 cb => sub {
3569 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3570 },
3571 );
3572 $BDB_CHECKPOINT_WATCHER = Event->timer (
3573 after => 11,
3574 interval => 60,
3575 hard => 1,
3576 prio => 0,
3577 data => WF_AUTOCANCEL,
3578 cb => sub {
3579 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3580 },
3581 );
3582 $BDB_TRICKLE_WATCHER = Event->timer (
3583 after => 5,
3584 interval => 10,
3585 hard => 1,
3586 prio => 0,
3587 data => WF_AUTOCANCEL,
3588 cb => sub {
3589 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3590 },
3591 );
3445} 3592}
3446 3593
3447{ 3594{
3448 IO::AIO::min_parallel 8; 3595 IO::AIO::min_parallel 8;
3449 3596

Diff Legend

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