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.323 by root, Sat Jul 28 12:02:58 2007 UTC vs.
Revision 1.368 by root, Wed Sep 12 11:18:25 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
… …
1370 $self->{deny_save} = 1; 1390 $self->{deny_save} = 1;
1371 1391
1372 $cf::PLAYER{$login} = $self; 1392 $cf::PLAYER{$login} = $self;
1373 1393
1374 $self 1394 $self
1395}
1396
1397=item $player->send_msg ($channel, $msg, $color, [extra...])
1398
1399=cut
1400
1401sub send_msg {
1402 my $ns = shift->ns
1403 or return;
1404 $ns->send_msg (@_);
1375} 1405}
1376 1406
1377=item $pl->quit_character 1407=item $pl->quit_character
1378 1408
1379Nukes the player without looking back. If logged in, the connection will 1409Nukes the player without looking back. If logged in, the connection will
… …
1434 or return []; 1464 or return [];
1435 1465
1436 my @logins; 1466 my @logins;
1437 1467
1438 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") {
1439 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440 aio_read $fh, 0, 512, my $buf, 0 or next; 1474 aio_read $fh, 0, 512, my $buf, 0 or next;
1441 $buf !~ /^password -------------$/m or next; # official not-valid tag 1475 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 }
1442 1477
1443 utf8::decode $login; 1478 utf8::decode $login;
1444 push @logins, $login; 1479 push @logins, $login;
1445 } 1480 }
1446 1481
… …
1484sub expand_cfpod { 1519sub expand_cfpod {
1485 ((my $self), (local $_)) = @_; 1520 ((my $self), (local $_)) = @_;
1486 1521
1487 # escape & and < 1522 # escape & and <
1488 s/&/&amp;/g; 1523 s/&/&amp;/g;
1489 s/(?<![BIUGH])</&lt;/g; 1524 s/(?<![BIUGHT])</&lt;/g;
1490 1525
1491 # 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
1492 1527
1493 1 while 1528 1 while
1494 # replace B<>, I<>, U<> etc. 1529 # replace B<>, I<>, U<> etc.
1495 s/B<([^\>]*)>/<b>$1<\/b>/ 1530 s/B<([^\>]*)>/<b>$1<\/b>/
1496 || s/I<([^\>]*)>/<i>$1<\/i>/ 1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1497 || s/U<([^\>]*)>/<u>$1<\/u>/ 1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1498 # replace G<male|female> tags 1534 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{ 1535 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1 1536 $self->gender ? $2 : $1
1501 }ge 1537 }ge
1502 # replace H<hint text> 1538 # replace H<hint text>
… …
1532=cut 1568=cut
1533 1569
1534sub ext_reply($$@) { 1570sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1571 my ($self, $id, @msg) = @_;
1536 1572
1537 if ($self->ns->extcmd == 2) { 1573 $self->ns->ext_reply ($id, @msg)
1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1539 } elsif ($self->ns->extcmd == 1) {
1540 #TODO: version 1, remove
1541 unshift @msg, msgtype => "reply", msgid => $id;
1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1544} 1574}
1545 1575
1546=item $player->ext_msg ($type, @msg) 1576=item $player->ext_msg ($type, @msg)
1547 1577
1548Sends an ext event to the client. 1578Sends an ext event to the client.
… …
1776 1806
1777sub load_header_from($) { 1807sub load_header_from($) {
1778 my ($self, $path) = @_; 1808 my ($self, $path) = @_;
1779 1809
1780 utf8::encode $path; 1810 utf8::encode $path;
1781 #aio_open $path, O_RDONLY, 0 1811 my $f = new_from_file cf::object::thawer $path
1782 # or return;
1783
1784 $self->_load_header ($path)
1785 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;
1786 1819
1787 $self->{load_path} = $path; 1820 $self->{load_path} = $path;
1788 1821
1789 1 1822 1
1790} 1823}
… …
1844sub find { 1877sub find {
1845 my ($path, $origin) = @_; 1878 my ($path, $origin) = @_;
1846 1879
1847 $path = normalise $path, $origin && $origin->path; 1880 $path = normalise $path, $origin && $origin->path;
1848 1881
1882 cf::lock_wait "map_data:$path";#d#remove
1849 cf::lock_wait "map_find:$path"; 1883 cf::lock_wait "map_find:$path";
1850 1884
1851 $cf::MAP{$path} || do { 1885 $cf::MAP{$path} || do {
1852 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
1853 my $map = new_from_path cf::map $path 1889 my $map = new_from_path cf::map $path
1854 or return; 1890 or return;
1855 1891
1856 $map->{last_save} = $cf::RUNTIME; 1892 $map->{last_save} = $cf::RUNTIME;
1857 1893
… …
1859 or return; 1895 or return;
1860 1896
1861 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862 # doing this can freeze the server in a sync job, obviously 1898 # doing this can freeze the server in a sync job, obviously
1863 #$cf::WAIT_FOR_TICK->wait; 1899 #$cf::WAIT_FOR_TICK->wait;
1900 undef $guard1;
1901 undef $guard2;
1864 $map->reset; 1902 $map->reset;
1865 undef $guard;
1866 return find $path; 1903 return find $path;
1867 } 1904 }
1868 1905
1869 $cf::MAP{$path} = $map 1906 $cf::MAP{$path} = $map
1870 } 1907 }
… …
1879 local $self->{deny_reset} = 1; # loading can take a long time 1916 local $self->{deny_reset} = 1; # loading can take a long time
1880 1917
1881 my $path = $self->{path}; 1918 my $path = $self->{path};
1882 1919
1883 { 1920 {
1884 my $guard = cf::lock_acquire "map_load:$path"; 1921 my $guard = cf::lock_acquire "map_data:$path";
1885 1922
1923 return unless $self->valid;
1886 return if $self->in_memory != cf::MAP_SWAPPED; 1924 return unless $self->in_memory == cf::MAP_SWAPPED;
1887 1925
1888 $self->in_memory (cf::MAP_LOADING); 1926 $self->in_memory (cf::MAP_LOADING);
1889 1927
1890 $self->alloc; 1928 $self->alloc;
1891 1929
1892 $self->pre_load; 1930 $self->pre_load;
1893 Coro::cede; 1931 cf::cede_to_tick;
1894 1932
1933 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block;
1895 $self->_load_objects ($self->{load_path}, 1) 1935 $self->_load_objects ($f)
1896 or return; 1936 or return;
1897 1937
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1899 if delete $self->{load_original}; 1939 if delete $self->{load_original};
1900 1940
1901 if (my $uniq = $self->uniq_path) { 1941 if (my $uniq = $self->uniq_path) {
1902 utf8::encode $uniq; 1942 utf8::encode $uniq;
1903 if (aio_open $uniq, O_RDONLY, 0) { 1943 unless (aio_stat $uniq) {
1944 if (my $f = new_from_file cf::object::thawer $uniq) {
1904 $self->clear_unique_items; 1945 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 1946 $self->_load_objects ($f);
1947 $f->resolve_delayed_derefs;
1948 }
1906 } 1949 }
1907 } 1950 }
1908 1951
1909 Coro::cede; 1952 $f->resolve_delayed_derefs;
1953
1954 cf::cede_to_tick;
1910 # now do the right thing for maps 1955 # now do the right thing for maps
1911 $self->link_multipart_objects; 1956 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 1957 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 1958 unless $self->difficulty;
1914 Coro::cede; 1959 cf::cede_to_tick;
1915 1960
1916 unless ($self->{deny_activate}) { 1961 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 1962 $self->decay_objects;
1918 $self->fix_auto_apply; 1963 $self->fix_auto_apply;
1919 $self->update_buttons; 1964 $self->update_buttons;
1920 Coro::cede; 1965 cf::cede_to_tick;
1921 $self->set_darkness_map; 1966 $self->set_darkness_map;
1922 Coro::cede; 1967 cf::cede_to_tick;
1923 $self->activate; 1968 $self->activate;
1924 } 1969 }
1970
1971 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME);
1925 1973
1926 $self->in_memory (cf::MAP_IN_MEMORY); 1974 $self->in_memory (cf::MAP_IN_MEMORY);
1927 } 1975 }
1928 1976
1929 $self->post_load; 1977 $self->post_load;
… …
1940 1988
1941 $self 1989 $self
1942} 1990}
1943 1991
1944# 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
1945sub load_diag { 1993sub load_neighbours {
1946 my ($map) = @_; 1994 my ($map) = @_;
1947 1995
1948 my @diag; # diagonal neighbours 1996 my @neigh; # diagonal neighbours
1949 1997
1950 for (0 .. 3) { 1998 for (0 .. 3) {
1951 my $neigh = $map->tile_path ($_) 1999 my $neigh = $map->tile_path ($_)
1952 or next; 2000 or next;
1953 $neigh = find $neigh, $map 2001 $neigh = find $neigh, $map
1954 or next; 2002 or next;
1955 $neigh->load; 2003 $neigh->load;
1956 2004
2005 push @neigh,
1957 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2006 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1958 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2007 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1959 } 2008 }
1960 2009
1961 for (@diag) { 2010 for (grep defined $_->[0], @neigh) {
2011 my ($path, $origin) = @$_;
1962 my $neigh = find @$_ 2012 my $neigh = find $path, $origin
1963 or next; 2013 or next;
1964 $neigh->load; 2014 $neigh->load;
1965 } 2015 }
1966} 2016}
1967 2017
… …
1972} 2022}
1973 2023
1974sub do_load_sync { 2024sub do_load_sync {
1975 my ($map) = @_; 2025 my ($map) = @_;
1976 2026
2027 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2028 if $Coro::current == $Coro::main;
2029
1977 cf::sync_job { $map->load }; 2030 cf::sync_job { $map->load };
1978} 2031}
1979 2032
1980our %MAP_PREFETCH; 2033our %MAP_PREFETCH;
1981our $MAP_PREFETCHER = undef; 2034our $MAP_PREFETCHER = undef;
1982 2035
1983sub find_async { 2036sub find_async {
1984 my ($path, $origin) = @_; 2037 my ($path, $origin, $load) = @_;
1985 2038
1986 $path = normalise $path, $origin && $origin->{path}; 2039 $path = normalise $path, $origin && $origin->{path};
1987 2040
1988 if (my $map = $cf::MAP{$path}) { 2041 if (my $map = $cf::MAP{$path}) {
1989 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1990 } 2043 }
1991 2044
1992 undef $MAP_PREFETCH{$path}; 2045 $MAP_PREFETCH{$path} |= $load;
2046
1993 $MAP_PREFETCHER ||= cf::async { 2047 $MAP_PREFETCHER ||= cf::async {
1994 while (%MAP_PREFETCH) { 2048 while (%MAP_PREFETCH) {
1995 for my $path (keys %MAP_PREFETCH) { 2049 while (my ($k, $v) = each %MAP_PREFETCH) {
1996 if (my $map = find $path) { 2050 if (my $map = find $k) {
1997 $map->load; 2051 $map->load if $v;
1998 } 2052 }
1999 2053
2000 delete $MAP_PREFETCH{$path}; 2054 delete $MAP_PREFETCH{$k};
2001 } 2055 }
2002 } 2056 }
2003 undef $MAP_PREFETCHER; 2057 undef $MAP_PREFETCHER;
2004 }; 2058 };
2005 $MAP_PREFETCHER->prio (6); 2059 $MAP_PREFETCHER->prio (6);
… …
2008} 2062}
2009 2063
2010sub save { 2064sub save {
2011 my ($self) = @_; 2065 my ($self) = @_;
2012 2066
2013 my $lock = cf::lock_acquire "map_data:" . $self->path; 2067 my $lock = cf::lock_acquire "map_data:$self->{path}";
2014 2068
2015 $self->{last_save} = $cf::RUNTIME; 2069 $self->{last_save} = $cf::RUNTIME;
2016 2070
2017 return unless $self->dirty; 2071 return unless $self->dirty;
2018 2072
… …
2041 my ($self) = @_; 2095 my ($self) = @_;
2042 2096
2043 # save first because save cedes 2097 # save first because save cedes
2044 $self->save; 2098 $self->save;
2045 2099
2046 my $lock = cf::lock_acquire "map_data:" . $self->path; 2100 my $lock = cf::lock_acquire "map_data:$self->{path}";
2047 2101
2048 return if $self->players; 2102 return if $self->players;
2049 return if $self->in_memory != cf::MAP_IN_MEMORY; 2103 return if $self->in_memory != cf::MAP_IN_MEMORY;
2050 return if $self->{deny_save}; 2104 return if $self->{deny_save};
2051 2105
2106 $self->in_memory (cf::MAP_SWAPPED);
2107
2108 $self->deactivate;
2109 $_->clear_links_to ($self) for values %cf::MAP;
2052 $self->clear; 2110 $self->clear;
2053 $self->in_memory (cf::MAP_SWAPPED);
2054} 2111}
2055 2112
2056sub reset_at { 2113sub reset_at {
2057 my ($self) = @_; 2114 my ($self) = @_;
2058 2115
… …
2090 if $uniq; 2147 if $uniq;
2091 } 2148 }
2092 2149
2093 delete $cf::MAP{$self->path}; 2150 delete $cf::MAP{$self->path};
2094 2151
2152 $self->deactivate;
2153 $_->clear_links_to ($self) for values %cf::MAP;
2095 $self->clear; 2154 $self->clear;
2096
2097 $_->clear_links_to ($self) for values %cf::MAP;
2098 2155
2099 $self->unlink_save; 2156 $self->unlink_save;
2100 $self->destroy; 2157 $self->destroy;
2101} 2158}
2102 2159
2103my $nuke_counter = "aaaa"; 2160my $nuke_counter = "aaaa";
2104 2161
2105sub nuke { 2162sub nuke {
2106 my ($self) = @_; 2163 my ($self) = @_;
2107 2164
2165 {
2166 my $lock = cf::lock_acquire "map_data:$self->{path}";
2167
2108 delete $cf::MAP{$self->path}; 2168 delete $cf::MAP{$self->path};
2109 2169
2110 $self->unlink_save; 2170 $self->unlink_save;
2111 2171
2112 bless $self, "cf::map"; 2172 bless $self, "cf::map";
2113 delete $self->{deny_reset}; 2173 delete $self->{deny_reset};
2114 $self->{deny_save} = 1; 2174 $self->{deny_save} = 1;
2115 $self->reset_timeout (1); 2175 $self->reset_timeout (1);
2116 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2176 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2117 2177
2118 $cf::MAP{$self->path} = $self; 2178 $cf::MAP{$self->path} = $self;
2179 }
2119 2180
2120 $self->reset; # polite request, might not happen 2181 $self->reset; # polite request, might not happen
2121} 2182}
2122 2183
2123=item $maps = cf::map::tmp_maps 2184=item $maps = cf::map::tmp_maps
… …
2199 2260
2200sub inv_recursive { 2261sub inv_recursive {
2201 inv_recursive_ inv $_[0] 2262 inv_recursive_ inv $_[0]
2202} 2263}
2203 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
2204package cf; 2296package cf;
2205 2297
2206=back 2298=back
2207 2299
2208=head3 cf::object::player 2300=head3 cf::object::player
… …
2240 $self->message ($msg, $flags); 2332 $self->message ($msg, $flags);
2241 } 2333 }
2242 } 2334 }
2243} 2335}
2244 2336
2337=item $object->send_msg ($channel, $msg, $color, [extra...])
2338
2339=cut
2340
2341sub cf::object::send_msg {
2342 my $pl = shift->contr
2343 or return;
2344 $pl->send_msg (@_);
2345}
2346
2245=item $player_object->may ("access") 2347=item $player_object->may ("access")
2246 2348
2247Returns wether the given player is authorized to access resource "access" 2349Returns wether the given player is authorized to access resource "access"
2248(e.g. "command_wizcast"). 2350(e.g. "command_wizcast").
2249 2351
… …
2326 # use -1 or undef as default coordinates, not 0, 0 2428 # use -1 or undef as default coordinates, not 0, 0
2327 ($x, $y) = ($map->enter_x, $map->enter_y) 2429 ($x, $y) = ($map->enter_x, $map->enter_y)
2328 if $x <=0 && $y <= 0; 2430 if $x <=0 && $y <= 0;
2329 2431
2330 $map->load; 2432 $map->load;
2331 $map->load_diag; 2433 $map->load_neighbours;
2332 2434
2333 return unless $self->contr->active; 2435 return unless $self->contr->active;
2334 $self->activate_recursive; 2436 $self->activate_recursive;
2335 2437
2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2356 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2357 2459
2358 $self->enter_link; 2460 $self->enter_link;
2359 2461
2360 (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 }
2472 # else put him there anyways for now #d#
2473
2474 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2475 }
2476 }
2477
2361 my $map = eval { 2478 my $map = eval {
2362 my $map = cf::map::find $path; 2479 my $map = cf::map::find $path;
2363 2480
2364 if ($map) { 2481 if ($map) {
2365 $map = $map->customise_for ($self); 2482 $map = $map->customise_for ($self);
… …
2507the message, with C<log> being the default. If C<$color> is negative, suppress 2624the message, with C<log> being the default. If C<$color> is negative, suppress
2508the message unless the client supports the msg packet. 2625the message unless the client supports the msg packet.
2509 2626
2510=cut 2627=cut
2511 2628
2629our %CHANNEL = (
2630 "c/identify" => {
2631 id => "identify",
2632 title => "Identify",
2633 reply => undef,
2634 tooltip => "Items recently identified",
2635 },
2636 "c/examine" => {
2637 id => "examine",
2638 title => "Examine",
2639 reply => undef,
2640 tooltip => "Signs and other items you examined",
2641 },
2642);
2643
2512sub cf::client::send_msg { 2644sub cf::client::send_msg {
2513 my ($self, $channel, $msg, $color, @extra) = @_; 2645 my ($self, $channel, $msg, $color, @extra) = @_;
2514 2646
2515 $msg = $self->pl->expand_cfpod ($msg); 2647 $msg = $self->pl->expand_cfpod ($msg);
2516 2648
2517 $color &= cf::NDI_CLIENT_MASK; # just in case... 2649 $color &= cf::NDI_CLIENT_MASK; # just in case...
2650
2651 # check predefined channels, for the benefit of C
2652 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2518 2653
2519 if (ref $channel) { 2654 if (ref $channel) {
2520 # send meta info to client, if not yet sent 2655 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) { 2656 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel; 2657 $self->{channel}{$channel->{id}} = $channel;
2523 $self->ext_msg (channel_info => $channel); 2658 $self->ext_msg (channel_info => $channel)
2659 if $self->can_msg;
2524 } 2660 }
2525 2661
2526 $channel = $channel->{id}; 2662 $channel = $channel->{id};
2527 } 2663 }
2528 2664
… …
2547 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/; 2683 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2548 } 2684 }
2549 2685
2550 $color &= cf::NDI_COLOR_MASK; 2686 $color &= cf::NDI_COLOR_MASK;
2551 2687
2688 utf8::encode $msg;
2689
2552 if (0 && $msg =~ /\[/) { 2690 if (0 && $msg =~ /\[/) {
2691 # COMMAND/INFO
2553 $self->send_packet ("drawextinfo $color 4 0 $msg") 2692 $self->send_packet ("drawextinfo $color 10 8 $msg")
2554 } else { 2693 } else {
2555 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2694 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2556 $self->send_packet ("drawinfo $color $msg") 2695 $self->send_packet ("drawinfo $color $msg")
2557 } 2696 }
2558 } 2697 }
… …
2566=cut 2705=cut
2567 2706
2568sub cf::client::ext_msg($$@) { 2707sub cf::client::ext_msg($$@) {
2569 my ($self, $type, @msg) = @_; 2708 my ($self, $type, @msg) = @_;
2570 2709
2571 my $extcmd = $self->extcmd;
2572
2573 if ($extcmd == 2) { 2710 if ($self->extcmd == 2) {
2574 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2711 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2575 } elsif ($extcmd == 1) { # TODO: remove 2712 } elsif ($self->extcmd == 1) { # TODO: remove
2576 push @msg, msgtype => "event_$type"; 2713 push @msg, msgtype => "event_$type";
2714 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2715 }
2716}
2717
2718=item $client->ext_reply ($msgid, @msg)
2719
2720Sends an ext reply to the client.
2721
2722=cut
2723
2724sub cf::client::ext_reply($$@) {
2725 my ($self, $id, @msg) = @_;
2726
2727 if ($self->extcmd == 2) {
2728 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2729 } elsif ($self->extcmd == 1) {
2730 #TODO: version 1, remove
2731 unshift @msg, msgtype => "reply", msgid => $id;
2577 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2732 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2578 } 2733 }
2579} 2734}
2580 2735
2581=item $success = $client->query ($flags, "text", \&cb) 2736=item $success = $client->query ($flags, "text", \&cb)
… …
2643 my ($type, $reply, @payload) = 2798 my ($type, $reply, @payload) =
2644 "ARRAY" eq ref $msg 2799 "ARRAY" eq ref $msg
2645 ? @$msg 2800 ? @$msg
2646 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2801 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2647 2802
2803 my @reply;
2804
2648 if (my $cb = $EXTICMD{$type}) { 2805 if (my $cb = $EXTICMD{$type}) {
2649 my @reply = $cb->($ns, @payload); 2806 @reply = $cb->($ns, @payload);
2650
2651 $ns->ext_reply ($reply, @reply)
2652 if $reply;
2653 } 2807 }
2808
2809 $ns->ext_reply ($reply, @reply)
2810 if $reply;
2811
2654 } else { 2812 } else {
2655 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2813 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2656 } 2814 }
2657 2815
2658 cf::override; 2816 cf::override;
… …
2705our $safe = new Safe "safe"; 2863our $safe = new Safe "safe";
2706our $safe_hole = new Safe::Hole; 2864our $safe_hole = new Safe::Hole;
2707 2865
2708$SIG{FPE} = 'IGNORE'; 2866$SIG{FPE} = 'IGNORE';
2709 2867
2710$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2868$safe->permit_only (Opcode::opset qw(
2869 :base_core :base_mem :base_orig :base_math
2870 grepstart grepwhile mapstart mapwhile
2871 sort time
2872));
2711 2873
2712# here we export the classes and methods available to script code 2874# here we export the classes and methods available to script code
2713 2875
2714=pod 2876=pod
2715 2877
2716The following functions and methods are available within a safe environment: 2878The following functions and methods are available within a safe environment:
2717 2879
2718 cf::object 2880 cf::object
2719 contr pay_amount pay_player map x y force_find force_add 2881 contr pay_amount pay_player map x y force_find force_add
2720 insert remove 2882 insert remove name archname title slaying race decrease_ob_nr
2721 2883
2722 cf::object::player 2884 cf::object::player
2723 player 2885 player
2724 2886
2725 cf::player 2887 cf::player
… …
2730 2892
2731=cut 2893=cut
2732 2894
2733for ( 2895for (
2734 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2896 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2897 insert remove inv name archname title slaying race
2735 insert remove)], 2898 decrease_ob_nr)],
2736 ["cf::object::player" => qw(player)], 2899 ["cf::object::player" => qw(player)],
2737 ["cf::player" => qw(peaceful)], 2900 ["cf::player" => qw(peaceful)],
2738 ["cf::map" => qw(trigger)], 2901 ["cf::map" => qw(trigger)],
2739) { 2902) {
2740 no strict 'refs'; 2903 no strict 'refs';
… …
2816# the server's init and main functions 2979# the server's init and main functions
2817 2980
2818sub load_facedata($) { 2981sub load_facedata($) {
2819 my ($path) = @_; 2982 my ($path) = @_;
2820 2983
2984 # HACK to clear player env face cache, we need some signal framework
2985 # for this (global event?)
2986 %ext::player_env::MUSIC_FACE_CACHE = ();
2987
2988 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2989
2821 warn "loading facedata from $path\n"; 2990 warn "loading facedata from $path\n";
2822 2991
2823 my $facedata; 2992 my $facedata;
2824 0 < aio_load $path, $facedata 2993 0 < aio_load $path, $facedata
2825 or die "$path: $!"; 2994 or die "$path: $!";
2826 2995
2827 $facedata = Coro::Storable::thaw $facedata; 2996 $facedata = Coro::Storable::thaw $facedata;
2828 2997
2829 $facedata->{version} == 2 2998 $facedata->{version} == 2
2830 or cf::cleanup "$path: version mismatch, cannot proceed."; 2999 or cf::cleanup "$path: version mismatch, cannot proceed.";
3000
3001 # patch in the exptable
3002 $facedata->{resource}{"res/exp_table"} = {
3003 type => FT_RSRC,
3004 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3005 };
3006 cf::cede_to_tick;
2831 3007
2832 { 3008 {
2833 my $faces = $facedata->{faceinfo}; 3009 my $faces = $facedata->{faceinfo};
2834 3010
2835 while (my ($face, $info) = each %$faces) { 3011 while (my ($face, $info) = each %$faces) {
2836 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3012 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2837 cf::face::set_visibility $idx, $info->{visibility}; 3013 cf::face::set_visibility $idx, $info->{visibility};
2838 cf::face::set_magicmap $idx, $info->{magicmap}; 3014 cf::face::set_magicmap $idx, $info->{magicmap};
2839 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3015 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2840 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3016 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2841 3017
2842 cf::cede_to_tick; 3018 cf::cede_to_tick;
2843 } 3019 }
2844 3020
2845 while (my ($face, $info) = each %$faces) { 3021 while (my ($face, $info) = each %$faces) {
… …
2870 3046
2871 { 3047 {
2872 # TODO: for gcfclient pleasure, we should give resources 3048 # TODO: for gcfclient pleasure, we should give resources
2873 # that gcfclient doesn't grok a >10000 face index. 3049 # that gcfclient doesn't grok a >10000 face index.
2874 my $res = $facedata->{resource}; 3050 my $res = $facedata->{resource};
2875 my $enc = JSON::XS->new->utf8->canonical;
2876 3051
2877 my $soundconf = delete $res->{"res/sound.conf"}; 3052 my $soundconf = delete $res->{"res/sound.conf"};
2878 3053
2879 while (my ($name, $info) = each %$res) { 3054 while (my ($name, $info) = each %$res) {
2880 my $meta = $enc->encode ({
2881 name => $name,
2882 %{ $info->{meta} || {} },
2883 });
2884
2885 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3055 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3056 my $data;
2886 3057
2887 if ($info->{type} & 1) { 3058 if ($info->{type} & 1) {
2888 # prepend meta info 3059 # prepend meta info
2889 3060
3061 my $meta = $enc->encode ({
3062 name => $name,
3063 %{ $info->{meta} || {} },
3064 });
3065
2890 my $data = pack "(w/a*)*", $meta, $info->{data}; 3066 $data = pack "(w/a*)*", $meta, $info->{data};
2891 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2892
2893 cf::face::set_data $idx, 0, $data, $chk;
2894 } else { 3067 } else {
2895 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3068 $data = $info->{data};
2896 } 3069 }
2897 3070
3071 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2898 cf::face::set_type $idx, $info->{type}; 3072 cf::face::set_type $idx, $info->{type};
2899 3073
2900 cf::cede_to_tick; 3074 cf::cede_to_tick;
2901 } 3075 }
2902 3076
… …
2906 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3080 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2907 my $sound = $soundconf->{compat}[$_] 3081 my $sound = $soundconf->{compat}[$_]
2908 or next; 3082 or next;
2909 3083
2910 my $face = cf::face::find "sound/$sound->[1]"; 3084 my $face = cf::face::find "sound/$sound->[1]";
2911
2912 cf::sound::set $sound->[0] => $face; 3085 cf::sound::set $sound->[0] => $face;
2913 cf::sound::old_sound_index $_, $face; # gcfclient-compat 3086 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2914 } 3087 }
2915 3088
3089 while (my ($k, $v) = each %{$soundconf->{event}}) {
3090 my $face = cf::face::find "sound/$v";
3091 cf::sound::set $k => $face;
2916 #TODO 3092 }
2917 } 3093 }
2918 } 3094 }
2919 3095
2920 1 3096 1
2921} 3097}
… …
2927 $ns->fx_want ($k, $v); 3103 $ns->fx_want ($k, $v);
2928 } 3104 }
2929}; 3105};
2930 3106
2931sub reload_regions { 3107sub reload_regions {
3108 # HACK to clear player env face cache, we need some signal framework
3109 # for this (global event?)
3110 %ext::player_env::MUSIC_FACE_CACHE = ();
3111
2932 load_resource_file "$MAPDIR/regions" 3112 load_resource_file "$MAPDIR/regions"
2933 or die "unable to load regions file\n"; 3113 or die "unable to load regions file\n";
2934 3114
2935 for (cf::region::list) { 3115 for (cf::region::list) {
2936 $_->{match} = qr/$_->{match}/ 3116 $_->{match} = qr/$_->{match}/
… …
2972 3152
2973sub init { 3153sub init {
2974 reload_resources; 3154 reload_resources;
2975} 3155}
2976 3156
2977sub cfg_load { 3157sub reload_config {
2978 open my $fh, "<:utf8", "$CONFDIR/config" 3158 open my $fh, "<:utf8", "$CONFDIR/config"
2979 or return; 3159 or return;
2980 3160
2981 local $/; 3161 local $/;
2982 *CFG = YAML::Syck::Load <$fh>; 3162 *CFG = YAML::Syck::Load <$fh>;
… …
3002 (async { 3182 (async {
3003 Event::one_event; 3183 Event::one_event;
3004 })->prio (Coro::PRIO_MAX); 3184 })->prio (Coro::PRIO_MAX);
3005 }; 3185 };
3006 3186
3007 cfg_load; 3187 reload_config;
3008 db_init; 3188 db_init;
3009 load_extensions; 3189 load_extensions;
3010 3190
3011 $TICK_WATCHER->start; 3191 $TICK_WATCHER->start;
3012 Event::loop; 3192 Event::loop;
… …
3205 warn "reloading cf.pm"; 3385 warn "reloading cf.pm";
3206 require cf; 3386 require cf;
3207 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3387 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3208 3388
3209 warn "loading config and database again"; 3389 warn "loading config and database again";
3210 cf::cfg_load; 3390 cf::reload_config;
3211 3391
3212 warn "loading extensions"; 3392 warn "loading extensions";
3213 cf::load_extensions; 3393 cf::load_extensions;
3214 3394
3215 warn "reattaching attachments to objects/players"; 3395 warn "reattaching attachments to objects/players";
… …
3280 my $signal = new Coro::Signal; 3460 my $signal = new Coro::Signal;
3281 push @WAIT_FOR_TICK_BEGIN, $signal; 3461 push @WAIT_FOR_TICK_BEGIN, $signal;
3282 $signal->wait; 3462 $signal->wait;
3283} 3463}
3284 3464
3285 my $min = 1e6;#d# 3465our $stat_fh;
3286 my $avg = 10; 3466sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3467
3287$TICK_WATCHER = Event->timer ( 3468$TICK_WATCHER = Event->timer (
3288 reentrant => 0, 3469 reentrant => 0,
3289 parked => 1, 3470 parked => 1,
3290 prio => 0, 3471 prio => 0,
3291 at => $NEXT_TICK || $TICK, 3472 at => $NEXT_TICK || $TICK,
… …
3295 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3476 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3296 unless ++$bug_warning > 10; 3477 unless ++$bug_warning > 10;
3297 return; 3478 return;
3298 } 3479 }
3299 3480
3481 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3482
3300 $NOW = $tick_start = Event::time; 3483 $NOW = $tick_start = Event::time;
3301 3484
3302 cf::server_tick; # one server iteration 3485 cf::server_tick; # one server iteration
3303
3304 0 && sync_job {#d#
3305 for(1..10) {
3306 my $t = Event::time;
3307 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3308 or die;
3309
3310 $map->width (50);
3311 $map->height (50);
3312 $map->alloc;
3313 $map->_load_objects ("/tmp/x.map", 1);
3314 my $t = Event::time - $t;
3315
3316 #next unless $t < 0.0013;#d#
3317 if ($t < $min) {
3318 $min = $t;
3319 }
3320 $avg = $avg * 0.99 + $t * 0.01;
3321 }
3322 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3323 exit 0;
3324 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3325 };
3326 3486
3327 $RUNTIME += $TICK; 3487 $RUNTIME += $TICK;
3328 $NEXT_TICK += $TICK; 3488 $NEXT_TICK += $TICK;
3329 3489
3330 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3490 if ($NOW >= $NEXT_RUNTIME_WRITE) {
… …
3356 $LOAD = ($NOW - $tick_start) / $TICK; 3516 $LOAD = ($NOW - $tick_start) / $TICK;
3357 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3517 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3358 3518
3359 _post_tick; 3519 _post_tick;
3360 3520
3361 3521 # gather some statistics#d#
3522 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d#
3523 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d#
3362 }, 3524 },
3363); 3525);
3364 3526
3365{ 3527{
3528 BDB::min_parallel 8;
3366 BDB::max_poll_time $TICK * 0.1; 3529 BDB::max_poll_time $TICK * 0.1;
3367 $BDB_POLL_WATCHER = Event->io ( 3530 $BDB_POLL_WATCHER = Event->io (
3368 reentrant => 0, 3531 reentrant => 0,
3369 fd => BDB::poll_fileno, 3532 fd => BDB::poll_fileno,
3370 poll => 'r', 3533 poll => 'r',
3371 prio => 0, 3534 prio => 0,
3372 data => WF_AUTOCANCEL, 3535 data => WF_AUTOCANCEL,
3373 cb => \&BDB::poll_cb, 3536 cb => \&BDB::poll_cb,
3374 ); 3537 );
3375 BDB::min_parallel 8;
3376 3538
3377 BDB::set_sync_prepare { 3539 BDB::set_sync_prepare {
3378 my $status; 3540 my $status;
3379 my $current = $Coro::current; 3541 my $current = $Coro::current;
3380 ( 3542 (
… …
3401 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3563 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3402 0666; 3564 0666;
3403 3565
3404 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3566 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3405 3567
3406 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3568 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3569 | BDB::LOG_AUTOREMOVE, 1);
3407 $DB_ENV->set_lk_detect; 3570 $DB_ENV->set_lk_detect;
3408 }; 3571 };
3409 3572
3410 cf::cleanup "db_env_open(db): $@" if $@; 3573 cf::cleanup "db_env_open(db): $@" if $@;
3411 }; 3574 };
3412 } 3575 }
3576
3577 $BDB_CHECKPOINT_WATCHER = Event->timer (
3578 after => 11,
3579 interval => 60,
3580 hard => 1,
3581 prio => 0,
3582 data => WF_AUTOCANCEL,
3583 cb => sub {
3584 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3585 },
3586 );
3587 $BDB_TRICKLE_WATCHER = Event->timer (
3588 after => 5,
3589 interval => 10,
3590 hard => 1,
3591 prio => 0,
3592 data => WF_AUTOCANCEL,
3593 cb => sub {
3594 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3595 },
3596 );
3413} 3597}
3414 3598
3415{ 3599{
3416 IO::AIO::min_parallel 8; 3600 IO::AIO::min_parallel 8;
3417 3601

Diff Legend

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