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.315 by root, Mon Jul 23 17:53:55 2007 UTC vs.
Revision 1.364 by root, Tue Sep 11 08:41:11 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
… …
1181 my ($pl, $buf) = @_; 1178 my ($pl, $buf) = @_;
1182 1179
1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1180 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1184 1181
1185 if (ref $msg) { 1182 if (ref $msg) {
1183 my ($type, $reply, @payload) =
1184 "ARRAY" eq ref $msg
1185 ? @$msg
1186 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1187
1188 my @reply;
1189
1186 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1190 if (my $cb = $EXTCMD{$type}) {
1187 if (my %reply = $cb->($pl, $msg)) { 1191 @reply = $cb->($pl, @payload);
1188 $pl->ext_reply ($msg->{msgid}, %reply);
1189 }
1190 } 1192 }
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196
1191 } else { 1197 } else {
1192 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1193 } 1199 }
1194 1200
1195 cf::override; 1201 cf::override;
… …
1285 1291
1286=head3 cf::player 1292=head3 cf::player
1287 1293
1288=over 4 1294=over 4
1289 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
1290=item cf::player::find $login 1310=item cf::player::find $login
1291 1311
1292Returns the given player object, loading it if necessary (might block). 1312Returns the given player object, loading it if necessary (might block).
1293 1313
1294=cut 1314=cut
… …
1329 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1349 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1330 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1350 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1331 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1351 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1332 aio_unlink +(playerdir $login) . "/$login.pl"; 1352 aio_unlink +(playerdir $login) . "/$login.pl";
1333 1353
1334 my $pl = load_pl path $login 1354 my $f = new_from_file cf::object::thawer path $login
1335 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;
1336 $cf::PLAYER{$login} = $pl 1362 $cf::PLAYER{$login} = $pl
1337 } 1363 }
1338 } 1364 }
1339} 1365}
1340 1366
… …
1350 1376
1351 aio_mkdir playerdir $pl, 0770; 1377 aio_mkdir playerdir $pl, 0770;
1352 $pl->{last_save} = $cf::RUNTIME; 1378 $pl->{last_save} = $cf::RUNTIME;
1353 1379
1354 $pl->save_pl ($path); 1380 $pl->save_pl ($path);
1355 Coro::cede; 1381 cf::cede_to_tick;
1356} 1382}
1357 1383
1358sub new($) { 1384sub new($) {
1359 my ($login) = @_; 1385 my ($login) = @_;
1360 1386
… …
1364 $self->{deny_save} = 1; 1390 $self->{deny_save} = 1;
1365 1391
1366 $cf::PLAYER{$login} = $self; 1392 $cf::PLAYER{$login} = $self;
1367 1393
1368 $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 (@_);
1369} 1405}
1370 1406
1371=item $pl->quit_character 1407=item $pl->quit_character
1372 1408
1373Nukes the player without looking back. If logged in, the connection will 1409Nukes the player without looking back. If logged in, the connection will
… …
1428 or return []; 1464 or return [];
1429 1465
1430 my @logins; 1466 my @logins;
1431 1467
1432 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") {
1433 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1434 aio_read $fh, 0, 512, my $buf, 0 or next; 1474 aio_read $fh, 0, 512, my $buf, 0 or next;
1435 $buf !~ /^password -------------$/m or next; # official not-valid tag 1475 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 }
1436 1477
1437 utf8::decode $login; 1478 utf8::decode $login;
1438 push @logins, $login; 1479 push @logins, $login;
1439 } 1480 }
1440 1481
… …
1478sub expand_cfpod { 1519sub expand_cfpod {
1479 ((my $self), (local $_)) = @_; 1520 ((my $self), (local $_)) = @_;
1480 1521
1481 # escape & and < 1522 # escape & and <
1482 s/&/&amp;/g; 1523 s/&/&amp;/g;
1483 s/(?<![BIUGH])</&lt;/g; 1524 s/(?<![BIUGHT])</&lt;/g;
1484 1525
1485 # 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
1486 1527
1487 1 while 1528 1 while
1488 # replace B<>, I<>, U<> etc. 1529 # replace B<>, I<>, U<> etc.
1489 s/B<([^\>]*)>/<b>$1<\/b>/ 1530 s/B<([^\>]*)>/<b>$1<\/b>/
1490 || s/I<([^\>]*)>/<i>$1<\/i>/ 1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1491 || s/U<([^\>]*)>/<u>$1<\/u>/ 1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1492 # replace G<male|female> tags 1534 # replace G<male|female> tags
1493 || s{G<([^>|]*)\|([^>]*)>}{ 1535 || s{G<([^>|]*)\|([^>]*)>}{
1494 $self->gender ? $2 : $1 1536 $self->gender ? $2 : $1
1495 }ge 1537 }ge
1496 # replace H<hint text> 1538 # replace H<hint text>
… …
1517sub hintmode { 1559sub hintmode {
1518 $_[0]{hintmode} = $_[1] if @_ > 1; 1560 $_[0]{hintmode} = $_[1] if @_ > 1;
1519 $_[0]{hintmode} 1561 $_[0]{hintmode}
1520} 1562}
1521 1563
1522=item $player->ext_reply ($msgid, %msg) 1564=item $player->ext_reply ($msgid, @msg)
1523 1565
1524Sends an ext reply to the player. 1566Sends an ext reply to the player.
1525 1567
1526=cut 1568=cut
1527 1569
1528sub ext_reply($$%) { 1570sub ext_reply($$@) {
1529 my ($self, $id, %msg) = @_; 1571 my ($self, $id, @msg) = @_;
1530 1572
1531 $msg{msgid} = $id; 1573 $self->ns->ext_reply ($id, @msg)
1532 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1533} 1574}
1534 1575
1535=item $player->ext_event ($type, %msg) 1576=item $player->ext_msg ($type, @msg)
1536 1577
1537Sends an ext event to the client. 1578Sends an ext event to the client.
1538 1579
1539=cut 1580=cut
1540 1581
1541sub ext_event($$%) { 1582sub ext_msg($$@) {
1542 my ($self, $type, %msg) = @_; 1583 my ($self, $type, @msg) = @_;
1543 1584
1544 $self->ns->ext_event ($type, %msg); 1585 $self->ns->ext_msg ($type, @msg);
1545} 1586}
1546 1587
1547=head3 cf::region 1588=head3 cf::region
1548 1589
1549=over 4 1590=over 4
… …
1765 1806
1766sub load_header_from($) { 1807sub load_header_from($) {
1767 my ($self, $path) = @_; 1808 my ($self, $path) = @_;
1768 1809
1769 utf8::encode $path; 1810 utf8::encode $path;
1770 #aio_open $path, O_RDONLY, 0 1811 my $f = new_from_file cf::object::thawer $path
1771 # or return;
1772
1773 $self->_load_header ($path)
1774 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;
1775 1819
1776 $self->{load_path} = $path; 1820 $self->{load_path} = $path;
1777 1821
1778 1 1822 1
1779} 1823}
… …
1833sub find { 1877sub find {
1834 my ($path, $origin) = @_; 1878 my ($path, $origin) = @_;
1835 1879
1836 $path = normalise $path, $origin && $origin->path; 1880 $path = normalise $path, $origin && $origin->path;
1837 1881
1882 cf::lock_wait "map_data:$path";#d#remove
1838 cf::lock_wait "map_find:$path"; 1883 cf::lock_wait "map_find:$path";
1839 1884
1840 $cf::MAP{$path} || do { 1885 $cf::MAP{$path} || do {
1841 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
1842 my $map = new_from_path cf::map $path 1889 my $map = new_from_path cf::map $path
1843 or return; 1890 or return;
1844 1891
1845 $map->{last_save} = $cf::RUNTIME; 1892 $map->{last_save} = $cf::RUNTIME;
1846 1893
… …
1848 or return; 1895 or return;
1849 1896
1850 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1851 # doing this can freeze the server in a sync job, obviously 1898 # doing this can freeze the server in a sync job, obviously
1852 #$cf::WAIT_FOR_TICK->wait; 1899 #$cf::WAIT_FOR_TICK->wait;
1900 undef $guard1;
1901 undef $guard2;
1853 $map->reset; 1902 $map->reset;
1854 undef $guard;
1855 return find $path; 1903 return find $path;
1856 } 1904 }
1857 1905
1858 $cf::MAP{$path} = $map 1906 $cf::MAP{$path} = $map
1859 } 1907 }
… …
1868 local $self->{deny_reset} = 1; # loading can take a long time 1916 local $self->{deny_reset} = 1; # loading can take a long time
1869 1917
1870 my $path = $self->{path}; 1918 my $path = $self->{path};
1871 1919
1872 { 1920 {
1873 my $guard = cf::lock_acquire "map_load:$path"; 1921 my $guard = cf::lock_acquire "map_data:$path";
1874 1922
1923 return unless $self->valid;
1875 return if $self->in_memory != cf::MAP_SWAPPED; 1924 return unless $self->in_memory == cf::MAP_SWAPPED;
1876 1925
1877 $self->in_memory (cf::MAP_LOADING); 1926 $self->in_memory (cf::MAP_LOADING);
1878 1927
1879 $self->alloc; 1928 $self->alloc;
1880 1929
1881 $self->pre_load; 1930 $self->pre_load;
1882 Coro::cede; 1931 cf::cede_to_tick;
1883 1932
1933 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block;
1884 $self->_load_objects ($self->{load_path}, 1) 1935 $self->_load_objects ($f)
1885 or return; 1936 or return;
1886 1937
1887 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1888 if delete $self->{load_original}; 1939 if delete $self->{load_original};
1889 1940
1890 if (my $uniq = $self->uniq_path) { 1941 if (my $uniq = $self->uniq_path) {
1891 utf8::encode $uniq; 1942 utf8::encode $uniq;
1892 if (aio_open $uniq, O_RDONLY, 0) { 1943 unless (aio_stat $uniq) {
1944 if (my $f = new_from_file cf::object::thawer $uniq) {
1893 $self->clear_unique_items; 1945 $self->clear_unique_items;
1894 $self->_load_objects ($uniq, 0); 1946 $self->_load_objects ($f);
1947 $f->resolve_delayed_derefs;
1948 }
1895 } 1949 }
1896 } 1950 }
1897 1951
1898 Coro::cede; 1952 $f->resolve_delayed_derefs;
1953
1954 cf::cede_to_tick;
1899 # now do the right thing for maps 1955 # now do the right thing for maps
1900 $self->link_multipart_objects; 1956 $self->link_multipart_objects;
1901 $self->difficulty ($self->estimate_difficulty) 1957 $self->difficulty ($self->estimate_difficulty)
1902 unless $self->difficulty; 1958 unless $self->difficulty;
1903 Coro::cede; 1959 cf::cede_to_tick;
1904 1960
1905 unless ($self->{deny_activate}) { 1961 unless ($self->{deny_activate}) {
1906 $self->decay_objects; 1962 $self->decay_objects;
1907 $self->fix_auto_apply; 1963 $self->fix_auto_apply;
1908 $self->update_buttons; 1964 $self->update_buttons;
1909 Coro::cede; 1965 cf::cede_to_tick;
1910 $self->set_darkness_map; 1966 $self->set_darkness_map;
1911 Coro::cede; 1967 cf::cede_to_tick;
1912 $self->activate; 1968 $self->activate;
1913 } 1969 }
1970
1971 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME);
1914 1973
1915 $self->in_memory (cf::MAP_IN_MEMORY); 1974 $self->in_memory (cf::MAP_IN_MEMORY);
1916 } 1975 }
1917 1976
1918 $self->post_load; 1977 $self->post_load;
… …
1929 1988
1930 $self 1989 $self
1931} 1990}
1932 1991
1933# 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
1934sub load_diag { 1993sub load_neighbours {
1935 my ($map) = @_; 1994 my ($map) = @_;
1936 1995
1937 my @diag; # diagonal neighbours 1996 my @neigh; # diagonal neighbours
1938 1997
1939 for (0 .. 3) { 1998 for (0 .. 3) {
1940 my $neigh = $map->tile_path ($_) 1999 my $neigh = $map->tile_path ($_)
1941 or next; 2000 or next;
1942 $neigh = find $neigh, $map 2001 $neigh = find $neigh, $map
1943 or next; 2002 or next;
1944 $neigh->load; 2003 $neigh->load;
1945 2004
2005 push @neigh,
1946 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2006 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1947 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2007 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1948 } 2008 }
1949 2009
1950 for (@diag) { 2010 for (grep defined $_->[0], @neigh) {
2011 my ($path, $origin) = @$_;
1951 my $neigh = find @$_ 2012 my $neigh = find $path, $origin
1952 or next; 2013 or next;
1953 $neigh->load; 2014 $neigh->load;
1954 } 2015 }
1955} 2016}
1956 2017
… …
1961} 2022}
1962 2023
1963sub do_load_sync { 2024sub do_load_sync {
1964 my ($map) = @_; 2025 my ($map) = @_;
1965 2026
2027 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2028 if $Coro::current == $Coro::main;
2029
1966 cf::sync_job { $map->load }; 2030 cf::sync_job { $map->load };
1967} 2031}
1968 2032
1969our %MAP_PREFETCH; 2033our %MAP_PREFETCH;
1970our $MAP_PREFETCHER = undef; 2034our $MAP_PREFETCHER = undef;
1971 2035
1972sub find_async { 2036sub find_async {
1973 my ($path, $origin) = @_; 2037 my ($path, $origin, $load) = @_;
1974 2038
1975 $path = normalise $path, $origin && $origin->{path}; 2039 $path = normalise $path, $origin && $origin->{path};
1976 2040
1977 if (my $map = $cf::MAP{$path}) { 2041 if (my $map = $cf::MAP{$path}) {
1978 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1979 } 2043 }
1980 2044
1981 undef $MAP_PREFETCH{$path}; 2045 $MAP_PREFETCH{$path} |= $load;
2046
1982 $MAP_PREFETCHER ||= cf::async { 2047 $MAP_PREFETCHER ||= cf::async {
1983 while (%MAP_PREFETCH) { 2048 while (%MAP_PREFETCH) {
1984 for my $path (keys %MAP_PREFETCH) { 2049 while (my ($k, $v) = each %MAP_PREFETCH) {
1985 if (my $map = find $path) { 2050 if (my $map = find $k) {
1986 $map->load; 2051 $map->load if $v;
1987 } 2052 }
1988 2053
1989 delete $MAP_PREFETCH{$path}; 2054 delete $MAP_PREFETCH{$k};
1990 } 2055 }
1991 } 2056 }
1992 undef $MAP_PREFETCHER; 2057 undef $MAP_PREFETCHER;
1993 }; 2058 };
1994 $MAP_PREFETCHER->prio (6); 2059 $MAP_PREFETCHER->prio (6);
… …
1997} 2062}
1998 2063
1999sub save { 2064sub save {
2000 my ($self) = @_; 2065 my ($self) = @_;
2001 2066
2002 my $lock = cf::lock_acquire "map_data:" . $self->path; 2067 my $lock = cf::lock_acquire "map_data:$self->{path}";
2003 2068
2004 $self->{last_save} = $cf::RUNTIME; 2069 $self->{last_save} = $cf::RUNTIME;
2005 2070
2006 return unless $self->dirty; 2071 return unless $self->dirty;
2007 2072
… …
2030 my ($self) = @_; 2095 my ($self) = @_;
2031 2096
2032 # save first because save cedes 2097 # save first because save cedes
2033 $self->save; 2098 $self->save;
2034 2099
2035 my $lock = cf::lock_acquire "map_data:" . $self->path; 2100 my $lock = cf::lock_acquire "map_data:$self->{path}";
2036 2101
2037 return if $self->players; 2102 return if $self->players;
2038 return if $self->in_memory != cf::MAP_IN_MEMORY; 2103 return if $self->in_memory != cf::MAP_IN_MEMORY;
2039 return if $self->{deny_save}; 2104 return if $self->{deny_save};
2040 2105
2106 $self->in_memory (cf::MAP_SWAPPED);
2107
2108 $self->deactivate;
2109 $_->clear_links_to ($self) for values %cf::MAP;
2041 $self->clear; 2110 $self->clear;
2042 $self->in_memory (cf::MAP_SWAPPED);
2043} 2111}
2044 2112
2045sub reset_at { 2113sub reset_at {
2046 my ($self) = @_; 2114 my ($self) = @_;
2047 2115
… …
2079 if $uniq; 2147 if $uniq;
2080 } 2148 }
2081 2149
2082 delete $cf::MAP{$self->path}; 2150 delete $cf::MAP{$self->path};
2083 2151
2152 $self->deactivate;
2153 $_->clear_links_to ($self) for values %cf::MAP;
2084 $self->clear; 2154 $self->clear;
2085
2086 $_->clear_links_to ($self) for values %cf::MAP;
2087 2155
2088 $self->unlink_save; 2156 $self->unlink_save;
2089 $self->destroy; 2157 $self->destroy;
2090} 2158}
2091 2159
2092my $nuke_counter = "aaaa"; 2160my $nuke_counter = "aaaa";
2093 2161
2094sub nuke { 2162sub nuke {
2095 my ($self) = @_; 2163 my ($self) = @_;
2096 2164
2165 {
2166 my $lock = cf::lock_acquire "map_data:$self->{path}";
2167
2097 delete $cf::MAP{$self->path}; 2168 delete $cf::MAP{$self->path};
2098 2169
2099 $self->unlink_save; 2170 $self->unlink_save;
2100 2171
2101 bless $self, "cf::map"; 2172 bless $self, "cf::map";
2102 delete $self->{deny_reset}; 2173 delete $self->{deny_reset};
2103 $self->{deny_save} = 1; 2174 $self->{deny_save} = 1;
2104 $self->reset_timeout (1); 2175 $self->reset_timeout (1);
2105 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2176 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2106 2177
2107 $cf::MAP{$self->path} = $self; 2178 $cf::MAP{$self->path} = $self;
2179 }
2108 2180
2109 $self->reset; # polite request, might not happen 2181 $self->reset; # polite request, might not happen
2110} 2182}
2111 2183
2112=item $maps = cf::map::tmp_maps 2184=item $maps = cf::map::tmp_maps
… …
2188 2260
2189sub inv_recursive { 2261sub inv_recursive {
2190 inv_recursive_ inv $_[0] 2262 inv_recursive_ inv $_[0]
2191} 2263}
2192 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
2193package cf; 2296package cf;
2194 2297
2195=back 2298=back
2196 2299
2197=head3 cf::object::player 2300=head3 cf::object::player
… …
2219 2322
2220 } else { 2323 } else {
2221 my $pl = $self->contr; 2324 my $pl = $self->contr;
2222 2325
2223 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2326 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2224 my $diag = $pl->{npc_dialog}; 2327 my $dialog = $pl->{npc_dialog};
2225 $diag->{pl}->ext_reply ( 2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2226 $diag->{id},
2227 msgtype => "reply",
2228 msg => $diag->{pl}->expand_cfpod ($msg),
2229 add_topics => []
2230 );
2231 2329
2232 } else { 2330 } else {
2233 $msg = $npc->name . " says: $msg" if $npc; 2331 $msg = $npc->name . " says: $msg" if $npc;
2234 $self->message ($msg, $flags); 2332 $self->message ($msg, $flags);
2235 } 2333 }
2236 } 2334 }
2335}
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 (@_);
2237} 2345}
2238 2346
2239=item $player_object->may ("access") 2347=item $player_object->may ("access")
2240 2348
2241Returns wether the given player is authorized to access resource "access" 2349Returns wether the given player is authorized to access resource "access"
… …
2320 # use -1 or undef as default coordinates, not 0, 0 2428 # use -1 or undef as default coordinates, not 0, 0
2321 ($x, $y) = ($map->enter_x, $map->enter_y) 2429 ($x, $y) = ($map->enter_x, $map->enter_y)
2322 if $x <=0 && $y <= 0; 2430 if $x <=0 && $y <= 0;
2323 2431
2324 $map->load; 2432 $map->load;
2325 $map->load_diag; 2433 $map->load_neighbours;
2326 2434
2327 return unless $self->contr->active; 2435 return unless $self->contr->active;
2328 $self->activate_recursive; 2436 $self->activate_recursive;
2329 2437
2330 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2501the message, with C<log> being the default. If C<$color> is negative, suppress 2609the message, with C<log> being the default. If C<$color> is negative, suppress
2502the message unless the client supports the msg packet. 2610the message unless the client supports the msg packet.
2503 2611
2504=cut 2612=cut
2505 2613
2614our %CHANNEL = (
2615 "c/identify" => {
2616 id => "identify",
2617 title => "Identify",
2618 reply => undef,
2619 tooltip => "Items recently identified",
2620 },
2621 "c/examine" => {
2622 id => "examine",
2623 title => "Examine",
2624 reply => undef,
2625 tooltip => "Signs and other items you examined",
2626 },
2627);
2628
2506sub cf::client::send_msg { 2629sub cf::client::send_msg {
2507 my ($self, $channel, $msg, $color, @extra) = @_; 2630 my ($self, $channel, $msg, $color, @extra) = @_;
2508 2631
2509 $msg = $self->pl->expand_cfpod ($msg); 2632 $msg = $self->pl->expand_cfpod ($msg);
2510 2633
2511 $color &= ~cf::NDI_UNIQUE; # just in case... 2634 $color &= cf::NDI_CLIENT_MASK; # just in case...
2635
2636 # check predefined channels, for the benefit of C
2637 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2512 2638
2513 if (ref $channel) { 2639 if (ref $channel) {
2514 # send meta info to client, if not yet sent 2640 # send meta info to client, if not yet sent
2515 unless (exists $self->{channel}{$channel->{id}}) { 2641 unless (exists $self->{channel}{$channel->{id}}) {
2516 $self->{channel}{$channel->{id}} = $channel; 2642 $self->{channel}{$channel->{id}} = $channel;
2517 $self->ext_event (channel_info => %$channel); 2643 $self->ext_msg (channel_info => $channel)
2644 if $self->can_msg;
2518 } 2645 }
2519 2646
2520 $channel = $channel->{id}; 2647 $channel = $channel->{id};
2521 } 2648 }
2522 2649
2523 return unless @extra || length $msg; 2650 return unless @extra || length $msg;
2524 2651
2525 if ($self->can_msg) { 2652 if ($self->can_msg) {
2653 # default colour, mask it out
2654 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2655 if $color & cf::NDI_DEF;
2656
2526 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2657 $self->send_packet ("msg " . $self->{json_coder}->encode (
2658 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2527 } else { 2659 } else {
2528 # replace some tags by gcfclient-compatible ones
2529 for ($msg) {
2530 1 while
2531 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2532 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2533 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2534 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2535 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2536 }
2537
2538 if ($color >= 0) { 2660 if ($color >= 0) {
2661 # replace some tags by gcfclient-compatible ones
2662 for ($msg) {
2663 1 while
2664 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2665 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2666 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2667 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2668 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2669 }
2670
2671 $color &= cf::NDI_COLOR_MASK;
2672
2673 utf8::encode $msg;
2674
2539 if (0 && $msg =~ /\[/) { 2675 if (0 && $msg =~ /\[/) {
2676 # COMMAND/INFO
2540 $self->send_packet ("drawextinfo $color 4 0 $msg") 2677 $self->send_packet ("drawextinfo $color 10 8 $msg")
2541 } else { 2678 } else {
2542 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2679 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2543 $self->send_packet ("drawinfo $color $msg") 2680 $self->send_packet ("drawinfo $color $msg")
2544 } 2681 }
2545 } 2682 }
2546 } 2683 }
2547} 2684}
2548 2685
2549=item $client->ext_event ($type, %msg) 2686=item $client->ext_msg ($type, @msg)
2550 2687
2551Sends an ext event to the client. 2688Sends an ext event to the client.
2552 2689
2553=cut 2690=cut
2554 2691
2555sub cf::client::ext_event($$%) { 2692sub cf::client::ext_msg($$@) {
2556 my ($self, $type, %msg) = @_; 2693 my ($self, $type, @msg) = @_;
2557 2694
2558 return unless $self->extcmd; 2695 if ($self->extcmd == 2) {
2559 2696 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2697 } elsif ($self->extcmd == 1) { # TODO: remove
2560 $msg{msgtype} = "event_$type"; 2698 push @msg, msgtype => "event_$type";
2561 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2699 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2700 }
2701}
2702
2703=item $client->ext_reply ($msgid, @msg)
2704
2705Sends an ext reply to the client.
2706
2707=cut
2708
2709sub cf::client::ext_reply($$@) {
2710 my ($self, $id, @msg) = @_;
2711
2712 if ($self->extcmd == 2) {
2713 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2714 } elsif ($self->extcmd == 1) {
2715 #TODO: version 1, remove
2716 unshift @msg, msgtype => "reply", msgid => $id;
2717 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2718 }
2562} 2719}
2563 2720
2564=item $success = $client->query ($flags, "text", \&cb) 2721=item $success = $client->query ($flags, "text", \&cb)
2565 2722
2566Queues a query to the client, calling the given callback with 2723Queues a query to the client, calling the given callback with
… …
2621 my ($ns, $buf) = @_; 2778 my ($ns, $buf) = @_;
2622 2779
2623 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2780 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2624 2781
2625 if (ref $msg) { 2782 if (ref $msg) {
2783 my ($type, $reply, @payload) =
2784 "ARRAY" eq ref $msg
2785 ? @$msg
2786 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2787
2788 my @reply;
2789
2626 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2790 if (my $cb = $EXTICMD{$type}) {
2627 if (my %reply = $cb->($ns, $msg)) { 2791 @reply = $cb->($ns, @payload);
2628 $reply{msgid} = $msg->{msgid};
2629 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2630 }
2631 } 2792 }
2793
2794 $ns->ext_reply ($reply, @reply)
2795 if $reply;
2796
2632 } else { 2797 } else {
2633 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2798 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2634 } 2799 }
2635 2800
2636 cf::override; 2801 cf::override;
… …
2683our $safe = new Safe "safe"; 2848our $safe = new Safe "safe";
2684our $safe_hole = new Safe::Hole; 2849our $safe_hole = new Safe::Hole;
2685 2850
2686$SIG{FPE} = 'IGNORE'; 2851$SIG{FPE} = 'IGNORE';
2687 2852
2688$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2853$safe->permit_only (Opcode::opset qw(
2854 :base_core :base_mem :base_orig :base_math
2855 grepstart grepwhile mapstart mapwhile
2856 sort time
2857));
2689 2858
2690# here we export the classes and methods available to script code 2859# here we export the classes and methods available to script code
2691 2860
2692=pod 2861=pod
2693 2862
2694The following functions and methods are available within a safe environment: 2863The following functions and methods are available within a safe environment:
2695 2864
2696 cf::object 2865 cf::object
2697 contr pay_amount pay_player map x y force_find force_add 2866 contr pay_amount pay_player map x y force_find force_add
2698 insert remove 2867 insert remove name archname title slaying race decrease_ob_nr
2699 2868
2700 cf::object::player 2869 cf::object::player
2701 player 2870 player
2702 2871
2703 cf::player 2872 cf::player
… …
2708 2877
2709=cut 2878=cut
2710 2879
2711for ( 2880for (
2712 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2881 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2882 insert remove inv name archname title slaying race
2713 insert remove)], 2883 decrease_ob_nr)],
2714 ["cf::object::player" => qw(player)], 2884 ["cf::object::player" => qw(player)],
2715 ["cf::player" => qw(peaceful)], 2885 ["cf::player" => qw(peaceful)],
2716 ["cf::map" => qw(trigger)], 2886 ["cf::map" => qw(trigger)],
2717) { 2887) {
2718 no strict 'refs'; 2888 no strict 'refs';
… …
2794# the server's init and main functions 2964# the server's init and main functions
2795 2965
2796sub load_facedata($) { 2966sub load_facedata($) {
2797 my ($path) = @_; 2967 my ($path) = @_;
2798 2968
2969 # HACK to clear player env face cache, we need some signal framework
2970 # for this (global event?)
2971 %ext::player_env::MUSIC_FACE_CACHE = ();
2972
2973 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2974
2799 warn "loading facedata from $path\n"; 2975 warn "loading facedata from $path\n";
2800 2976
2801 my $facedata; 2977 my $facedata;
2802 0 < aio_load $path, $facedata 2978 0 < aio_load $path, $facedata
2803 or die "$path: $!"; 2979 or die "$path: $!";
2804 2980
2805 $facedata = Coro::Storable::thaw $facedata; 2981 $facedata = Coro::Storable::thaw $facedata;
2806 2982
2807 $facedata->{version} == 2 2983 $facedata->{version} == 2
2808 or cf::cleanup "$path: version mismatch, cannot proceed."; 2984 or cf::cleanup "$path: version mismatch, cannot proceed.";
2985
2986 # patch in the exptable
2987 $facedata->{resource}{"res/exp_table"} = {
2988 type => FT_RSRC,
2989 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2990 };
2991 cf::cede_to_tick;
2809 2992
2810 { 2993 {
2811 my $faces = $facedata->{faceinfo}; 2994 my $faces = $facedata->{faceinfo};
2812 2995
2813 while (my ($face, $info) = each %$faces) { 2996 while (my ($face, $info) = each %$faces) {
2814 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2997 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2815 cf::face::set_visibility $idx, $info->{visibility}; 2998 cf::face::set_visibility $idx, $info->{visibility};
2816 cf::face::set_magicmap $idx, $info->{magicmap}; 2999 cf::face::set_magicmap $idx, $info->{magicmap};
2817 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3000 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2818 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3001 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2819 3002
2820 cf::cede_to_tick; 3003 cf::cede_to_tick;
2821 } 3004 }
2822 3005
2823 while (my ($face, $info) = each %$faces) { 3006 while (my ($face, $info) = each %$faces) {
… …
2848 3031
2849 { 3032 {
2850 # TODO: for gcfclient pleasure, we should give resources 3033 # TODO: for gcfclient pleasure, we should give resources
2851 # that gcfclient doesn't grok a >10000 face index. 3034 # that gcfclient doesn't grok a >10000 face index.
2852 my $res = $facedata->{resource}; 3035 my $res = $facedata->{resource};
2853 my $enc = JSON::XS->new->utf8->canonical; 3036
3037 my $soundconf = delete $res->{"res/sound.conf"};
2854 3038
2855 while (my ($name, $info) = each %$res) { 3039 while (my ($name, $info) = each %$res) {
2856 my $meta = $enc->encode ({
2857 name => $name,
2858 type => $info->{type},
2859 copyright => $info->{copyright}, #TODO#
2860 });
2861
2862 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3040 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3041 my $data;
2863 3042
2864 if ($name =~ /\.jpg$/) { 3043 if ($info->{type} & 1) {
2865 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3044 # prepend meta info
2866 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3045
3046 my $meta = $enc->encode ({
3047 name => $name,
3048 %{ $info->{meta} || {} },
3049 });
3050
3051 $data = pack "(w/a*)*", $meta, $info->{data};
2867 } else { 3052 } else {
2868 my $data = pack "(w/a*)*", $meta, $info->{data}; 3053 $data = $info->{data};
2869 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2870
2871 cf::face::set_type $idx, 1;
2872 cf::face::set_data $idx, 0, $data, $chk;
2873 } 3054 }
2874 3055
3056 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3057 cf::face::set_type $idx, $info->{type};
3058
2875 cf::cede_to_tick; 3059 cf::cede_to_tick;
2876 } 3060 }
3061
3062 if ($soundconf) {
3063 $soundconf = $enc->decode (delete $soundconf->{data});
3064
3065 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3066 my $sound = $soundconf->{compat}[$_]
3067 or next;
3068
3069 my $face = cf::face::find "sound/$sound->[1]";
3070 cf::sound::set $sound->[0] => $face;
3071 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3072 }
3073
3074 while (my ($k, $v) = each %{$soundconf->{event}}) {
3075 my $face = cf::face::find "sound/$v";
3076 cf::sound::set $k => $face;
3077 }
3078 }
2877 } 3079 }
2878 3080
2879 1 3081 1
2880} 3082}
2881 3083
3084register_exticmd fx_want => sub {
3085 my ($ns, $want) = @_;
3086
3087 while (my ($k, $v) = each %$want) {
3088 $ns->fx_want ($k, $v);
3089 }
3090};
3091
2882sub reload_regions { 3092sub reload_regions {
3093 # HACK to clear player env face cache, we need some signal framework
3094 # for this (global event?)
3095 %ext::player_env::MUSIC_FACE_CACHE = ();
3096
2883 load_resource_file "$MAPDIR/regions" 3097 load_resource_file "$MAPDIR/regions"
2884 or die "unable to load regions file\n"; 3098 or die "unable to load regions file\n";
2885 3099
2886 for (cf::region::list) { 3100 for (cf::region::list) {
2887 $_->{match} = qr/$_->{match}/ 3101 $_->{match} = qr/$_->{match}/
… …
2923 3137
2924sub init { 3138sub init {
2925 reload_resources; 3139 reload_resources;
2926} 3140}
2927 3141
2928sub cfg_load { 3142sub reload_config {
2929 open my $fh, "<:utf8", "$CONFDIR/config" 3143 open my $fh, "<:utf8", "$CONFDIR/config"
2930 or return; 3144 or return;
2931 3145
2932 local $/; 3146 local $/;
2933 *CFG = YAML::Syck::Load <$fh>; 3147 *CFG = YAML::Syck::Load <$fh>;
… …
2953 (async { 3167 (async {
2954 Event::one_event; 3168 Event::one_event;
2955 })->prio (Coro::PRIO_MAX); 3169 })->prio (Coro::PRIO_MAX);
2956 }; 3170 };
2957 3171
2958 cfg_load; 3172 reload_config;
2959 db_init; 3173 db_init;
2960 load_extensions; 3174 load_extensions;
2961 3175
2962 $TICK_WATCHER->start; 3176 $TICK_WATCHER->start;
2963 Event::loop; 3177 Event::loop;
… …
3156 warn "reloading cf.pm"; 3370 warn "reloading cf.pm";
3157 require cf; 3371 require cf;
3158 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3372 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3159 3373
3160 warn "loading config and database again"; 3374 warn "loading config and database again";
3161 cf::cfg_load; 3375 cf::reload_config;
3162 3376
3163 warn "loading extensions"; 3377 warn "loading extensions";
3164 cf::load_extensions; 3378 cf::load_extensions;
3165 3379
3166 warn "reattaching attachments to objects/players"; 3380 warn "reattaching attachments to objects/players";
… …
3231 my $signal = new Coro::Signal; 3445 my $signal = new Coro::Signal;
3232 push @WAIT_FOR_TICK_BEGIN, $signal; 3446 push @WAIT_FOR_TICK_BEGIN, $signal;
3233 $signal->wait; 3447 $signal->wait;
3234} 3448}
3235 3449
3236 my $min = 1e6;#d# 3450our $stat_fh;
3237 my $avg = 10; 3451sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3452
3238$TICK_WATCHER = Event->timer ( 3453$TICK_WATCHER = Event->timer (
3239 reentrant => 0, 3454 reentrant => 0,
3240 parked => 1, 3455 parked => 1,
3241 prio => 0, 3456 prio => 0,
3242 at => $NEXT_TICK || $TICK, 3457 at => $NEXT_TICK || $TICK,
… …
3246 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3461 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3247 unless ++$bug_warning > 10; 3462 unless ++$bug_warning > 10;
3248 return; 3463 return;
3249 } 3464 }
3250 3465
3466 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3467
3251 $NOW = $tick_start = Event::time; 3468 $NOW = $tick_start = Event::time;
3252 3469
3253 cf::server_tick; # one server iteration 3470 cf::server_tick; # one server iteration
3254
3255 0 && sync_job {#d#
3256 for(1..10) {
3257 my $t = Event::time;
3258 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3259 or die;
3260
3261 $map->width (50);
3262 $map->height (50);
3263 $map->alloc;
3264 $map->_load_objects ("/tmp/x.map", 1);
3265 my $t = Event::time - $t;
3266
3267 #next unless $t < 0.0013;#d#
3268 if ($t < $min) {
3269 $min = $t;
3270 }
3271 $avg = $avg * 0.99 + $t * 0.01;
3272 }
3273 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3274 exit 0;
3275 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3276 };
3277 3471
3278 $RUNTIME += $TICK; 3472 $RUNTIME += $TICK;
3279 $NEXT_TICK += $TICK; 3473 $NEXT_TICK += $TICK;
3280 3474
3281 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3475 if ($NOW >= $NEXT_RUNTIME_WRITE) {
… …
3307 $LOAD = ($NOW - $tick_start) / $TICK; 3501 $LOAD = ($NOW - $tick_start) / $TICK;
3308 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3502 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3309 3503
3310 _post_tick; 3504 _post_tick;
3311 3505
3312 3506 # gather some statistics#d#
3507 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d#
3508 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d#
3313 }, 3509 },
3314); 3510);
3315 3511
3316{ 3512{
3513 BDB::min_parallel 8;
3317 BDB::max_poll_time $TICK * 0.1; 3514 BDB::max_poll_time $TICK * 0.1;
3318 $BDB_POLL_WATCHER = Event->io ( 3515 $BDB_POLL_WATCHER = Event->io (
3319 reentrant => 0, 3516 reentrant => 0,
3320 fd => BDB::poll_fileno, 3517 fd => BDB::poll_fileno,
3321 poll => 'r', 3518 poll => 'r',
3322 prio => 0, 3519 prio => 0,
3323 data => WF_AUTOCANCEL, 3520 data => WF_AUTOCANCEL,
3324 cb => \&BDB::poll_cb, 3521 cb => \&BDB::poll_cb,
3325 ); 3522 );
3326 BDB::min_parallel 8;
3327 3523
3328 BDB::set_sync_prepare { 3524 BDB::set_sync_prepare {
3329 my $status; 3525 my $status;
3330 my $current = $Coro::current; 3526 my $current = $Coro::current;
3331 ( 3527 (
… …
3352 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3548 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3353 0666; 3549 0666;
3354 3550
3355 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3551 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3356 3552
3357 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3553 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3554 | BDB::LOG_AUTOREMOVE, 1);
3358 $DB_ENV->set_lk_detect; 3555 $DB_ENV->set_lk_detect;
3359 }; 3556 };
3360 3557
3361 cf::cleanup "db_env_open(db): $@" if $@; 3558 cf::cleanup "db_env_open(db): $@" if $@;
3362 }; 3559 };
3363 } 3560 }
3561
3562 $BDB_CHECKPOINT_WATCHER = Event->timer (
3563 after => 11,
3564 interval => 60,
3565 hard => 1,
3566 prio => 0,
3567 data => WF_AUTOCANCEL,
3568 cb => sub {
3569 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3570 },
3571 );
3572 $BDB_TRICKLE_WATCHER = Event->timer (
3573 after => 5,
3574 interval => 10,
3575 hard => 1,
3576 prio => 0,
3577 data => WF_AUTOCANCEL,
3578 cb => sub {
3579 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3580 },
3581 );
3364} 3582}
3365 3583
3366{ 3584{
3367 IO::AIO::min_parallel 8; 3585 IO::AIO::min_parallel 8;
3368 3586

Diff Legend

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