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.332 by root, Sat Aug 18 17:33:53 2007 UTC vs.
Revision 1.382 by root, Thu Oct 11 00:34:31 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.64 (); 15use Coro 4.1 ();
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 (); 24use Coro::Util ();
25 25
26use JSON::XS 1.4 (); 26use JSON::XS ();
27use BDB (); 27use BDB ();
28use Data::Dumper; 28use Data::Dumper;
29use Digest::MD5; 29use Digest::MD5;
30use Fcntl; 30use Fcntl;
31use YAML::Syck (); 31use YAML::Syck ();
32use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
33use Time::HiRes; 33use Time::HiRes;
34use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 (); 35use Digest::MD5 ();
36 36
37# configure various modules to our taste 37# configure various modules to our taste
… …
80our $NEXT_TICK; 80our $NEXT_TICK;
81our $NOW; 81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
83 83
84our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 88our $DB_ENV;
86 89
87our %CFG; 90our %CFG;
88 91
89our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 93our $RUNTIME;
91 94
92our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
95 98
96# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 101
… …
187 $msg .= "\n" 190 $msg .= "\n"
188 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
189 192
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 194
192 utf8::encode $msg;
193 LOG llevError, $msg; 195 LOG llevError, $msg;
194 }; 196 };
195} 197}
196 198
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
272Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
275returned. 277returned.
276 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
277Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
279 284
280=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
281 286
282Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
283 288
284=cut 289=cut
285 290
286our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
287 293
288sub lock_wait($) { 294sub lock_wait($) {
289 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
290 301
291 # wait for lock, if any 302 # wait for lock, if any
292 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
293 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule; 305 Coro::schedule;
… …
300 311
301 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
302 lock_wait $key; 313 lock_wait $key;
303 314
304 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
305 317
306 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
307 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
309 } 322 }
310} 323}
311 324
… …
341our @SLOT_QUEUE; 354our @SLOT_QUEUE;
342our $SLOT_QUEUE; 355our $SLOT_QUEUE;
343 356
344$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
346 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
347 362
348 while () { 363 while () {
349 next_job: 364 next_job:
350 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
… …
358 } 373 }
359 } 374 }
360 } 375 }
361 376
362 if (@SLOT_QUEUE) { 377 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive 378 # we do not use wait_for_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal; 379 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait; 380 $signal->wait;
366 } else { 381 } else {
367 Coro::schedule; 382 Coro::schedule;
368 } 383 }
… …
412 my $time = Event::time; 427 my $time = Event::time;
413 428
414 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
415 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
416 431
432 LOG llevError | logBacktrace, Carp::longmess "sync job";#d#
433
417 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
418 # (but this is cancel-safe) 435 # (but this is cancel-safe)
419 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
420 437
421 my $busy = 1; 438 my $busy = 1;
422 my @res; 439 my @res;
423 440
424 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
425 @res = eval { $job->() }; 443 @res = eval { $job->() };
426 warn $@ if $@; 444 warn $@ if $@;
427 undef $busy; 445 undef $busy;
428 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
429 447
… …
478sub fork_call(&@) { 496sub fork_call(&@) {
479 my ($cb, @args) = @_; 497 my ($cb, @args) = @_;
480 498
481 # we seemingly have to make a local copy of the whole thing, 499 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 500 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 501 # TODO: investigate and fix (likely this will be rather laborious)
484 502
485 my @res = Coro::Util::fork_eval { 503 my @res = Coro::Util::fork_eval {
486 reset_signals; 504 reset_signals;
487 &$cb 505 &$cb
488 }, @args; 506 }, @args;
… …
497=item cf::db_put $family => $key => $value 515=item cf::db_put $family => $key => $value
498 516
499Stores the given C<$value> in the family. It can currently store binary 517Stores the given C<$value> in the family. It can currently store binary
500data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 518data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501 519
520=item $db = cf::db_table "name"
521
522Create and/or open a new database table. The string must not be "db" and must be unique
523within each server.
524
502=cut 525=cut
526
527sub db_table($) {
528 my ($name) = @_;
529 my $db = BDB::db_create $DB_ENV;
530
531 eval {
532 $db->set_flags (BDB::CHKSUM);
533
534 utf8::encode $name;
535 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
536 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
537 cf::cleanup "db_open(db): $!" if $!;
538 };
539 cf::cleanup "db_open(db): $@" if $@;
540
541 $db
542}
503 543
504our $DB; 544our $DB;
505 545
506sub db_init { 546sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 547 cf::sync_job {
511 eval { 548 $DB ||= db_table "db";
512 $DB->set_flags (BDB::CHKSUM);
513
514 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516 cf::cleanup "db_open(db): $!" if $!;
517 };
518 cf::cleanup "db_open(db): $@" if $@;
519 };
520 } 549 };
521} 550}
522 551
523sub db_get($$) { 552sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 553 my $key = "$_[0]/$_[1]";
525 554
… …
575 if (1) { 604 if (1) {
576 $md5 = 605 $md5 =
577 join "\x00", 606 join "\x00",
578 $processversion, 607 $processversion,
579 map { 608 map {
580 Coro::cede; 609 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 610 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 611 } 0.. $#$src;
583 612
584 613
585 my $dbmd5 = db_get cache => "$id/md5"; 614 my $dbmd5 = db_get cache => "$id/md5";
… …
1004sub object_freezer_save { 1033sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1034 my ($filename, $rdata, $objs) = @_;
1006 1035
1007 sync_job { 1036 sync_job {
1008 if (length $$rdata) { 1037 if (length $$rdata) {
1038 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1039 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1040 $decname, length $$rdata, scalar @$objs;
1011 1041
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1042 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1043 chmod SAVE_MODE, $fh;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1044 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1045 aio_fsync $fh if $cf::USE_FSYNC;
1016 close $fh; 1046 close $fh;
1017 1047
1018 if (@$objs) { 1048 if (@$objs) {
1019 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1049 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1020 chmod SAVE_MODE, $fh; 1050 chmod SAVE_MODE, $fh;
1021 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1051 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1022 aio_write $fh, 0, (length $data), $data, 0; 1052 aio_write $fh, 0, (length $data), $data, 0;
1023 aio_fsync $fh if $cf::USE_FSYNC; 1053 aio_fsync $fh if $cf::USE_FSYNC;
1024 close $fh; 1054 close $fh;
1025 aio_rename "$filename.pst~", "$filename.pst"; 1055 aio_rename "$filename.pst~", "$filename.pst";
1026 } 1056 }
… …
1034 } 1064 }
1035 } else { 1065 } else {
1036 aio_unlink $filename; 1066 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1067 aio_unlink "$filename.pst";
1038 } 1068 }
1039 } 1069 };
1040} 1070}
1041 1071
1042sub object_freezer_as_string { 1072sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1073 my ($rdata, $objs) = @_;
1044 1074
… …
1056 or return; 1086 or return;
1057 1087
1058 unless (aio_stat "$filename.pst") { 1088 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1089 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1090 or return;
1061 $av = eval { (Storable::thaw $av)->{objs} };
1062 }
1063 1091
1092 my $st = eval { Coro::Storable::thaw $av }
1093 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1094 $av = $st->{objs};
1095 }
1096
1097 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1098 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1099 $decname, length $data, scalar @{$av || []};
1100
1066 return ($data, $av); 1101 ($data, $av)
1067} 1102}
1068 1103
1069=head2 COMMAND CALLBACKS 1104=head2 COMMAND CALLBACKS
1070 1105
1071=over 4 1106=over 4
… …
1149 my ($type, $reply, @payload) = 1184 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1185 "ARRAY" eq ref $msg
1151 ? @$msg 1186 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1187 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1188
1189 my @reply;
1190
1154 if (my $cb = $EXTCMD{$type}) { 1191 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1192 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1193 }
1194
1195 $pl->ext_reply ($reply, @reply)
1196 if $reply;
1197
1160 } else { 1198 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1199 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1200 }
1163 1201
1164 cf::override; 1202 cf::override;
… …
1254 1292
1255=head3 cf::player 1293=head3 cf::player
1256 1294
1257=over 4 1295=over 4
1258 1296
1297=item cf::player::num_playing
1298
1299Returns the official number of playing players, as per the Crossfire metaserver rules.
1300
1301=cut
1302
1303sub num_playing {
1304 scalar grep
1305 $_->ob->map
1306 && !$_->hidden
1307 && !$_->ob->flag (cf::FLAG_WIZ),
1308 cf::player::list
1309}
1310
1259=item cf::player::find $login 1311=item cf::player::find $login
1260 1312
1261Returns the given player object, loading it if necessary (might block). 1313Returns the given player object, loading it if necessary (might block).
1262 1314
1263=cut 1315=cut
… …
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1350 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1351 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1352 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl"; 1353 aio_unlink +(playerdir $login) . "/$login.pl";
1302 1354
1303 my $pl = load_pl path $login 1355 my $f = new_from_file cf::object::thawer path $login
1304 or return; 1356 or return;
1357
1358 my $pl = cf::player::load_pl $f
1359 or return;
1360 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs;
1305 $cf::PLAYER{$login} = $pl 1362 $cf::PLAYER{$login} = $pl
1306 } 1363 }
1307 } 1364 }
1308} 1365}
1309 1366
… …
1319 1376
1320 aio_mkdir playerdir $pl, 0770; 1377 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1378 $pl->{last_save} = $cf::RUNTIME;
1322 1379
1323 $pl->save_pl ($path); 1380 $pl->save_pl ($path);
1324 Coro::cede; 1381 cf::cede_to_tick;
1325} 1382}
1326 1383
1327sub new($) { 1384sub new($) {
1328 my ($login) = @_; 1385 my ($login) = @_;
1329 1386
… …
1407 or return []; 1464 or return [];
1408 1465
1409 my @logins; 1466 my @logins;
1410 1467
1411 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") {
1412 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413 aio_read $fh, 0, 512, my $buf, 0 or next; 1474 aio_read $fh, 0, 512, my $buf, 0 or next;
1414 $buf !~ /^password -------------$/m or next; # official not-valid tag 1475 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 }
1415 1477
1416 utf8::decode $login; 1478 utf8::decode $login;
1417 push @logins, $login; 1479 push @logins, $login;
1418 } 1480 }
1419 1481
… …
1457sub expand_cfpod { 1519sub expand_cfpod {
1458 ((my $self), (local $_)) = @_; 1520 ((my $self), (local $_)) = @_;
1459 1521
1460 # escape & and < 1522 # escape & and <
1461 s/&/&amp;/g; 1523 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g; 1524 s/(?<![BIUGHT])</&lt;/g;
1463 1525
1464 # 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
1465 1527
1466 1 while 1528 1 while
1467 # replace B<>, I<>, U<> etc. 1529 # replace B<>, I<>, U<> etc.
1468 s/B<([^\>]*)>/<b>$1<\/b>/ 1530 s/B<([^\>]*)>/<b>$1<\/b>/
1469 || s/I<([^\>]*)>/<i>$1<\/i>/ 1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1470 || s/U<([^\>]*)>/<u>$1<\/u>/ 1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1471 # replace G<male|female> tags 1534 # replace G<male|female> tags
1472 || s{G<([^>|]*)\|([^>]*)>}{ 1535 || s{G<([^>|]*)\|([^>]*)>}{
1473 $self->gender ? $2 : $1 1536 $self->gender ? $2 : $1
1474 }ge 1537 }ge
1475 # replace H<hint text> 1538 # replace H<hint text>
… …
1505=cut 1568=cut
1506 1569
1507sub ext_reply($$@) { 1570sub ext_reply($$@) {
1508 my ($self, $id, @msg) = @_; 1571 my ($self, $id, @msg) = @_;
1509 1572
1510 if ($self->ns->extcmd == 2) { 1573 $self->ns->ext_reply ($id, @msg)
1511 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1512 } elsif ($self->ns->extcmd == 1) {
1513 #TODO: version 1, remove
1514 unshift @msg, msgtype => "reply", msgid => $id;
1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1517} 1574}
1518 1575
1519=item $player->ext_msg ($type, @msg) 1576=item $player->ext_msg ($type, @msg)
1520 1577
1521Sends an ext event to the client. 1578Sends an ext event to the client.
… …
1749 1806
1750sub load_header_from($) { 1807sub load_header_from($) {
1751 my ($self, $path) = @_; 1808 my ($self, $path) = @_;
1752 1809
1753 utf8::encode $path; 1810 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1811 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 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;
1759 1819
1760 $self->{load_path} = $path; 1820 $self->{load_path} = $path;
1761 1821
1762 1 1822 1
1763} 1823}
… …
1817sub find { 1877sub find {
1818 my ($path, $origin) = @_; 1878 my ($path, $origin) = @_;
1819 1879
1820 $path = normalise $path, $origin && $origin->path; 1880 $path = normalise $path, $origin && $origin->path;
1821 1881
1882 cf::lock_wait "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 1883 cf::lock_wait "map_find:$path";
1823 1884
1824 $cf::MAP{$path} || do { 1885 $cf::MAP{$path} || do {
1825 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
1826 my $map = new_from_path cf::map $path 1889 my $map = new_from_path cf::map $path
1827 or return; 1890 or return;
1828 1891
1829 $map->{last_save} = $cf::RUNTIME; 1892 $map->{last_save} = $cf::RUNTIME;
1830 1893
… …
1832 or return; 1895 or return;
1833 1896
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 1898 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 1899 #$cf::WAIT_FOR_TICK->wait;
1900 undef $guard1;
1901 undef $guard2;
1837 $map->reset; 1902 $map->reset;
1838 undef $guard;
1839 return find $path; 1903 return find $path;
1840 } 1904 }
1841 1905
1842 $cf::MAP{$path} = $map 1906 $cf::MAP{$path} = $map
1843 } 1907 }
… …
1852 local $self->{deny_reset} = 1; # loading can take a long time 1916 local $self->{deny_reset} = 1; # loading can take a long time
1853 1917
1854 my $path = $self->{path}; 1918 my $path = $self->{path};
1855 1919
1856 { 1920 {
1857 my $guard = cf::lock_acquire "map_load:$path"; 1921 my $guard = cf::lock_acquire "map_data:$path";
1858 1922
1923 return unless $self->valid;
1859 return if $self->in_memory != cf::MAP_SWAPPED; 1924 return unless $self->in_memory == cf::MAP_SWAPPED;
1860 1925
1861 $self->in_memory (cf::MAP_LOADING); 1926 $self->in_memory (cf::MAP_LOADING);
1862 1927
1863 $self->alloc; 1928 $self->alloc;
1864 1929
1865 $self->pre_load; 1930 $self->pre_load;
1866 Coro::cede; 1931 cf::cede_to_tick;
1867 1932
1933 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block;
1868 $self->_load_objects ($self->{load_path}, 1) 1935 $self->_load_objects ($f)
1869 or return; 1936 or return;
1870 1937
1871 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1872 if delete $self->{load_original}; 1939 if delete $self->{load_original};
1873 1940
1874 if (my $uniq = $self->uniq_path) { 1941 if (my $uniq = $self->uniq_path) {
1875 utf8::encode $uniq; 1942 utf8::encode $uniq;
1876 if (aio_open $uniq, O_RDONLY, 0) { 1943 unless (aio_stat $uniq) {
1944 if (my $f = new_from_file cf::object::thawer $uniq) {
1877 $self->clear_unique_items; 1945 $self->clear_unique_items;
1878 $self->_load_objects ($uniq, 0); 1946 $self->_load_objects ($f);
1947 $f->resolve_delayed_derefs;
1948 }
1879 } 1949 }
1880 } 1950 }
1881 1951
1882 Coro::cede; 1952 $f->resolve_delayed_derefs;
1953
1954 cf::cede_to_tick;
1883 # now do the right thing for maps 1955 # now do the right thing for maps
1884 $self->link_multipart_objects; 1956 $self->link_multipart_objects;
1885 $self->difficulty ($self->estimate_difficulty) 1957 $self->difficulty ($self->estimate_difficulty)
1886 unless $self->difficulty; 1958 unless $self->difficulty;
1887 Coro::cede; 1959 cf::cede_to_tick;
1888 1960
1889 unless ($self->{deny_activate}) { 1961 unless ($self->{deny_activate}) {
1890 $self->decay_objects; 1962 $self->decay_objects;
1891 $self->fix_auto_apply; 1963 $self->fix_auto_apply;
1892 $self->update_buttons; 1964 $self->update_buttons;
1893 Coro::cede; 1965 cf::cede_to_tick;
1894 $self->set_darkness_map; 1966 $self->set_darkness_map;
1895 Coro::cede; 1967 cf::cede_to_tick;
1896 $self->activate; 1968 $self->activate;
1897 } 1969 }
1898 1970
1899 $self->{last_save} = $cf::RUNTIME; 1971 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME); 1972 $self->last_access ($cf::RUNTIME);
… …
1916 1988
1917 $self 1989 $self
1918} 1990}
1919 1991
1920# 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
1921sub load_diag { 1993sub load_neighbours {
1922 my ($map) = @_; 1994 my ($map) = @_;
1923 1995
1924 my @diag; # diagonal neighbours 1996 my @neigh; # diagonal neighbours
1925 1997
1926 for (0 .. 3) { 1998 for (0 .. 3) {
1927 my $neigh = $map->tile_path ($_) 1999 my $neigh = $map->tile_path ($_)
1928 or next; 2000 or next;
1929 $neigh = find $neigh, $map 2001 $neigh = find $neigh, $map
1930 or next; 2002 or next;
1931 $neigh->load; 2003 $neigh->load;
1932 2004
2005 push @neigh,
1933 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2006 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1934 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2007 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1935 } 2008 }
1936 2009
1937 for (@diag) { 2010 for (grep defined $_->[0], @neigh) {
2011 my ($path, $origin) = @$_;
1938 my $neigh = find @$_ 2012 my $neigh = find $path, $origin
1939 or next; 2013 or next;
1940 $neigh->load; 2014 $neigh->load;
1941 } 2015 }
1942} 2016}
1943 2017
… …
1948} 2022}
1949 2023
1950sub do_load_sync { 2024sub do_load_sync {
1951 my ($map) = @_; 2025 my ($map) = @_;
1952 2026
2027 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2028 if $Coro::current == $Coro::main;
2029
1953 cf::sync_job { $map->load }; 2030 cf::sync_job { $map->load };
1954} 2031}
1955 2032
1956our %MAP_PREFETCH; 2033our %MAP_PREFETCH;
1957our $MAP_PREFETCHER = undef; 2034our $MAP_PREFETCHER = undef;
1958 2035
1959sub find_async { 2036sub find_async {
1960 my ($path, $origin) = @_; 2037 my ($path, $origin, $load) = @_;
1961 2038
1962 $path = normalise $path, $origin && $origin->{path}; 2039 $path = normalise $path, $origin && $origin->{path};
1963 2040
1964 if (my $map = $cf::MAP{$path}) { 2041 if (my $map = $cf::MAP{$path}) {
1965 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1966 } 2043 }
1967 2044
1968 undef $MAP_PREFETCH{$path}; 2045 $MAP_PREFETCH{$path} |= $load;
2046
1969 $MAP_PREFETCHER ||= cf::async { 2047 $MAP_PREFETCHER ||= cf::async {
2048 $Coro::current->{desc} = "map prefetcher";
2049
1970 while (%MAP_PREFETCH) { 2050 while (%MAP_PREFETCH) {
1971 for my $path (keys %MAP_PREFETCH) { 2051 while (my ($k, $v) = each %MAP_PREFETCH) {
1972 if (my $map = find $path) { 2052 if (my $map = find $k) {
1973 $map->load; 2053 $map->load if $v;
1974 } 2054 }
1975 2055
1976 delete $MAP_PREFETCH{$path}; 2056 delete $MAP_PREFETCH{$k};
1977 } 2057 }
1978 } 2058 }
1979 undef $MAP_PREFETCHER; 2059 undef $MAP_PREFETCHER;
1980 }; 2060 };
1981 $MAP_PREFETCHER->prio (6); 2061 $MAP_PREFETCHER->prio (6);
… …
1984} 2064}
1985 2065
1986sub save { 2066sub save {
1987 my ($self) = @_; 2067 my ($self) = @_;
1988 2068
1989 my $lock = cf::lock_acquire "map_data:" . $self->path; 2069 my $lock = cf::lock_acquire "map_data:$self->{path}";
1990 2070
1991 $self->{last_save} = $cf::RUNTIME; 2071 $self->{last_save} = $cf::RUNTIME;
1992 2072
1993 return unless $self->dirty; 2073 return unless $self->dirty;
1994 2074
… …
2000 return if $self->{deny_save}; 2080 return if $self->{deny_save};
2001 2081
2002 local $self->{last_access} = $self->last_access;#d# 2082 local $self->{last_access} = $self->last_access;#d#
2003 2083
2004 cf::async { 2084 cf::async {
2085 $Coro::current->{desc} = "map player save";
2005 $_->contr->save for $self->players; 2086 $_->contr->save for $self->players;
2006 }; 2087 };
2007 2088
2008 if ($uniq) { 2089 if ($uniq) {
2009 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2090 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2017 my ($self) = @_; 2098 my ($self) = @_;
2018 2099
2019 # save first because save cedes 2100 # save first because save cedes
2020 $self->save; 2101 $self->save;
2021 2102
2022 my $lock = cf::lock_acquire "map_data:" . $self->path; 2103 my $lock = cf::lock_acquire "map_data:$self->{path}";
2023 2104
2024 return if $self->players; 2105 return if $self->players;
2025 return if $self->in_memory != cf::MAP_IN_MEMORY; 2106 return if $self->in_memory != cf::MAP_IN_MEMORY;
2026 return if $self->{deny_save}; 2107 return if $self->{deny_save};
2027 2108
2109 $self->in_memory (cf::MAP_SWAPPED);
2110
2111 $self->deactivate;
2112 $_->clear_links_to ($self) for values %cf::MAP;
2028 $self->clear; 2113 $self->clear;
2029 $self->in_memory (cf::MAP_SWAPPED);
2030} 2114}
2031 2115
2032sub reset_at { 2116sub reset_at {
2033 my ($self) = @_; 2117 my ($self) = @_;
2034 2118
… …
2066 if $uniq; 2150 if $uniq;
2067 } 2151 }
2068 2152
2069 delete $cf::MAP{$self->path}; 2153 delete $cf::MAP{$self->path};
2070 2154
2155 $self->deactivate;
2156 $_->clear_links_to ($self) for values %cf::MAP;
2071 $self->clear; 2157 $self->clear;
2072
2073 $_->clear_links_to ($self) for values %cf::MAP;
2074 2158
2075 $self->unlink_save; 2159 $self->unlink_save;
2076 $self->destroy; 2160 $self->destroy;
2077} 2161}
2078 2162
2079my $nuke_counter = "aaaa"; 2163my $nuke_counter = "aaaa";
2080 2164
2081sub nuke { 2165sub nuke {
2082 my ($self) = @_; 2166 my ($self) = @_;
2083 2167
2168 {
2169 my $lock = cf::lock_acquire "map_data:$self->{path}";
2170
2084 delete $cf::MAP{$self->path}; 2171 delete $cf::MAP{$self->path};
2085 2172
2086 $self->unlink_save; 2173 $self->unlink_save;
2087 2174
2088 bless $self, "cf::map"; 2175 bless $self, "cf::map";
2089 delete $self->{deny_reset}; 2176 delete $self->{deny_reset};
2090 $self->{deny_save} = 1; 2177 $self->{deny_save} = 1;
2091 $self->reset_timeout (1); 2178 $self->reset_timeout (1);
2092 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2179 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2093 2180
2094 $cf::MAP{$self->path} = $self; 2181 $cf::MAP{$self->path} = $self;
2182 }
2095 2183
2096 $self->reset; # polite request, might not happen 2184 $self->reset; # polite request, might not happen
2097} 2185}
2098 2186
2099=item $maps = cf::map::tmp_maps 2187=item $maps = cf::map::tmp_maps
… …
2175 2263
2176sub inv_recursive { 2264sub inv_recursive {
2177 inv_recursive_ inv $_[0] 2265 inv_recursive_ inv $_[0]
2178} 2266}
2179 2267
2268=item $ref = $ob->ref
2269
2270creates and returns a persistent reference to an objetc that can be stored as a string.
2271
2272=item $ob = cf::object::deref ($refstring)
2273
2274returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2275even if the object actually exists. May block.
2276
2277=cut
2278
2279sub deref {
2280 my ($ref) = @_;
2281
2282 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
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
2180package cf; 2296package cf;
2181 2297
2182=back 2298=back
2183 2299
2184=head3 cf::object::player 2300=head3 cf::object::player
… …
2312 # use -1 or undef as default coordinates, not 0, 0 2428 # use -1 or undef as default coordinates, not 0, 0
2313 ($x, $y) = ($map->enter_x, $map->enter_y) 2429 ($x, $y) = ($map->enter_x, $map->enter_y)
2314 if $x <=0 && $y <= 0; 2430 if $x <=0 && $y <= 0;
2315 2431
2316 $map->load; 2432 $map->load;
2317 $map->load_diag; 2433 $map->load_neighbours;
2318 2434
2319 return unless $self->contr->active; 2435 return unless $self->contr->active;
2320 $self->activate_recursive; 2436 $self->activate_recursive;
2321 2437
2322 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2342 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2343 2459
2344 $self->enter_link; 2460 $self->enter_link;
2345 2461
2346 (async { 2462 (async {
2463 $Coro::current->{desc} = "player::goto $path $x $y";
2464
2465 # *tag paths override both path and x|y
2466 if ($path =~ /^\*(.*)$/) {
2467 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2468 my $ob = $obs[rand @obs];
2469
2470 # see if we actually can go there
2471 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2472 $ob = $obs[rand @obs];
2473 } else {
2474 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2475 }
2476 # else put us there anyways for now #d#
2477
2478 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2479 } else {
2480 ($path, $x, $y) = (undef, undef, undef);
2481 }
2482 }
2483
2347 my $map = eval { 2484 my $map = eval {
2348 my $map = cf::map::find $path; 2485 my $map = defined $path ? cf::map::find $path : undef;
2349 2486
2350 if ($map) { 2487 if ($map) {
2351 $map = $map->customise_for ($self); 2488 $map = $map->customise_for ($self);
2352 $map = $check->($map) if $check && $map; 2489 $map = $check->($map) if $check && $map;
2353 } else { 2490 } else {
2354 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2491 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2355 } 2492 }
2356 2493
2357 $map 2494 $map
2358 }; 2495 };
2359 2496
… …
2449 # if exit is damned, update players death & WoR home-position 2586 # if exit is damned, update players death & WoR home-position
2450 $self->contr->savebed ($slaying, $hp, $sp) 2587 $self->contr->savebed ($slaying, $hp, $sp)
2451 if $exit->flag (FLAG_DAMNED); 2588 if $exit->flag (FLAG_DAMNED);
2452 2589
2453 (async { 2590 (async {
2591 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2592
2454 $self->deactivate_recursive; # just to be sure 2593 $self->deactivate_recursive; # just to be sure
2455 unless (eval { 2594 unless (eval {
2456 $self->goto ($slaying, $hp, $sp); 2595 $self->goto ($slaying, $hp, $sp);
2457 2596
2458 1; 2597 1;
… …
2493the message, with C<log> being the default. If C<$color> is negative, suppress 2632the message, with C<log> being the default. If C<$color> is negative, suppress
2494the message unless the client supports the msg packet. 2633the message unless the client supports the msg packet.
2495 2634
2496=cut 2635=cut
2497 2636
2637our %CHANNEL = (
2638 "c/identify" => {
2639 id => "infobox",
2640 title => "Identify",
2641 reply => undef,
2642 tooltip => "Items recently identified",
2643 },
2644 "c/examine" => {
2645 id => "infobox",
2646 title => "Examine",
2647 reply => undef,
2648 tooltip => "Signs and other items you examined",
2649 },
2650 "c/lookat" => {
2651 id => "infobox",
2652 title => "Look",
2653 reply => undef,
2654 tooltip => "What you saw there",
2655 },
2656);
2657
2498sub cf::client::send_msg { 2658sub cf::client::send_msg {
2499 my ($self, $channel, $msg, $color, @extra) = @_; 2659 my ($self, $channel, $msg, $color, @extra) = @_;
2500 2660
2501 $msg = $self->pl->expand_cfpod ($msg); 2661 $msg = $self->pl->expand_cfpod ($msg);
2502 2662
2503 $color &= cf::NDI_CLIENT_MASK; # just in case... 2663 $color &= cf::NDI_CLIENT_MASK; # just in case...
2504 2664
2665 # check predefined channels, for the benefit of C
2666 if ($CHANNEL{$channel}) {
2667 $channel = $CHANNEL{$channel};
2668
2669 $self->ext_msg (channel_info => $channel)
2670 if $self->can_msg;
2671
2672 $channel = $channel->{id};
2673
2505 if (ref $channel) { 2674 } elsif (ref $channel) {
2506 # send meta info to client, if not yet sent 2675 # send meta info to client, if not yet sent
2507 unless (exists $self->{channel}{$channel->{id}}) { 2676 unless (exists $self->{channel}{$channel->{id}}) {
2508 $self->{channel}{$channel->{id}} = $channel; 2677 $self->{channel}{$channel->{id}} = $channel;
2509 $self->ext_msg (channel_info => $channel); 2678 $self->ext_msg (channel_info => $channel)
2679 if $self->can_msg;
2510 } 2680 }
2511 2681
2512 $channel = $channel->{id}; 2682 $channel = $channel->{id};
2513 } 2683 }
2514 2684
… …
2555=cut 2725=cut
2556 2726
2557sub cf::client::ext_msg($$@) { 2727sub cf::client::ext_msg($$@) {
2558 my ($self, $type, @msg) = @_; 2728 my ($self, $type, @msg) = @_;
2559 2729
2560 my $extcmd = $self->extcmd;
2561
2562 if ($extcmd == 2) { 2730 if ($self->extcmd == 2) {
2563 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2731 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2564 } elsif ($extcmd == 1) { # TODO: remove 2732 } elsif ($self->extcmd == 1) { # TODO: remove
2565 push @msg, msgtype => "event_$type"; 2733 push @msg, msgtype => "event_$type";
2734 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2735 }
2736}
2737
2738=item $client->ext_reply ($msgid, @msg)
2739
2740Sends an ext reply to the client.
2741
2742=cut
2743
2744sub cf::client::ext_reply($$@) {
2745 my ($self, $id, @msg) = @_;
2746
2747 if ($self->extcmd == 2) {
2748 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2749 } elsif ($self->extcmd == 1) {
2750 #TODO: version 1, remove
2751 unshift @msg, msgtype => "reply", msgid => $id;
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2752 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2567 } 2753 }
2568} 2754}
2569 2755
2570=item $success = $client->query ($flags, "text", \&cb) 2756=item $success = $client->query ($flags, "text", \&cb)
… …
2632 my ($type, $reply, @payload) = 2818 my ($type, $reply, @payload) =
2633 "ARRAY" eq ref $msg 2819 "ARRAY" eq ref $msg
2634 ? @$msg 2820 ? @$msg
2635 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2821 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2636 2822
2823 my @reply;
2824
2637 if (my $cb = $EXTICMD{$type}) { 2825 if (my $cb = $EXTICMD{$type}) {
2638 my @reply = $cb->($ns, @payload); 2826 @reply = $cb->($ns, @payload);
2639
2640 $ns->ext_reply ($reply, @reply)
2641 if $reply;
2642 } 2827 }
2828
2829 $ns->ext_reply ($reply, @reply)
2830 if $reply;
2831
2643 } else { 2832 } else {
2644 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2833 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2645 } 2834 }
2646 2835
2647 cf::override; 2836 cf::override;
… …
2708 2897
2709The following functions and methods are available within a safe environment: 2898The following functions and methods are available within a safe environment:
2710 2899
2711 cf::object 2900 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 2901 contr pay_amount pay_player map x y force_find force_add
2713 insert remove name archname title slaying race 2902 insert remove name archname title slaying race decrease_ob_nr
2714 2903
2715 cf::object::player 2904 cf::object::player
2716 player 2905 player
2717 2906
2718 cf::player 2907 cf::player
… …
2723 2912
2724=cut 2913=cut
2725 2914
2726for ( 2915for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2916 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2728 insert remove inv name archname title slaying race)], 2917 insert remove inv name archname title slaying race
2918 decrease_ob_nr)],
2729 ["cf::object::player" => qw(player)], 2919 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 2920 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 2921 ["cf::map" => qw(trigger)],
2732) { 2922) {
2733 no strict 'refs'; 2923 no strict 'refs';
… …
2809# the server's init and main functions 2999# the server's init and main functions
2810 3000
2811sub load_facedata($) { 3001sub load_facedata($) {
2812 my ($path) = @_; 3002 my ($path) = @_;
2813 3003
3004 # HACK to clear player env face cache, we need some signal framework
3005 # for this (global event?)
3006 %ext::player_env::MUSIC_FACE_CACHE = ();
3007
3008 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3009
2814 warn "loading facedata from $path\n"; 3010 warn "loading facedata from $path\n";
2815 3011
2816 my $facedata; 3012 my $facedata;
2817 0 < aio_load $path, $facedata 3013 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 3014 or die "$path: $!";
2819 3015
2820 $facedata = Coro::Storable::thaw $facedata; 3016 $facedata = Coro::Storable::thaw $facedata;
2821 3017
2822 $facedata->{version} == 2 3018 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 3019 or cf::cleanup "$path: version mismatch, cannot proceed.";
3020
3021 # patch in the exptable
3022 $facedata->{resource}{"res/exp_table"} = {
3023 type => FT_RSRC,
3024 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3025 };
3026 cf::cede_to_tick;
2824 3027
2825 { 3028 {
2826 my $faces = $facedata->{faceinfo}; 3029 my $faces = $facedata->{faceinfo};
2827 3030
2828 while (my ($face, $info) = each %$faces) { 3031 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3032 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2830 cf::face::set_visibility $idx, $info->{visibility}; 3033 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 3034 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3035 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3036 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 3037
2835 cf::cede_to_tick; 3038 cf::cede_to_tick;
2836 } 3039 }
2837 3040
2838 while (my ($face, $info) = each %$faces) { 3041 while (my ($face, $info) = each %$faces) {
… …
2863 3066
2864 { 3067 {
2865 # TODO: for gcfclient pleasure, we should give resources 3068 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 3069 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3070 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869 3071
2870 my $soundconf = delete $res->{"res/sound.conf"}; 3072 my $soundconf = delete $res->{"res/sound.conf"};
2871 3073
2872 while (my ($name, $info) = each %$res) { 3074 while (my ($name, $info) = each %$res) {
2873 my $meta = $enc->encode ({
2874 name => $name,
2875 %{ $info->{meta} || {} },
2876 });
2877
2878 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3075 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3076 my $data;
2879 3077
2880 if ($info->{type} & 1) { 3078 if ($info->{type} & 1) {
2881 # prepend meta info 3079 # prepend meta info
2882 3080
3081 my $meta = $enc->encode ({
3082 name => $name,
3083 %{ $info->{meta} || {} },
3084 });
3085
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 3086 $data = pack "(w/a*)*", $meta, $info->{data};
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2885
2886 cf::face::set_data $idx, 0, $data, $chk;
2887 } else { 3087 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3088 $data = $info->{data};
2889 } 3089 }
2890 3090
3091 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2891 cf::face::set_type $idx, $info->{type}; 3092 cf::face::set_type $idx, $info->{type};
2892 3093
2893 cf::cede_to_tick; 3094 cf::cede_to_tick;
2894 } 3095 }
2895 3096
… …
2922 $ns->fx_want ($k, $v); 3123 $ns->fx_want ($k, $v);
2923 } 3124 }
2924}; 3125};
2925 3126
2926sub reload_regions { 3127sub reload_regions {
3128 # HACK to clear player env face cache, we need some signal framework
3129 # for this (global event?)
3130 %ext::player_env::MUSIC_FACE_CACHE = ();
3131
2927 load_resource_file "$MAPDIR/regions" 3132 load_resource_file "$MAPDIR/regions"
2928 or die "unable to load regions file\n"; 3133 or die "unable to load regions file\n";
2929 3134
2930 for (cf::region::list) { 3135 for (cf::region::list) {
2931 $_->{match} = qr/$_->{match}/ 3136 $_->{match} = qr/$_->{match}/
… …
2967 3172
2968sub init { 3173sub init {
2969 reload_resources; 3174 reload_resources;
2970} 3175}
2971 3176
2972sub cfg_load { 3177sub reload_config {
2973 open my $fh, "<:utf8", "$CONFDIR/config" 3178 open my $fh, "<:utf8", "$CONFDIR/config"
2974 or return; 3179 or return;
2975 3180
2976 local $/; 3181 local $/;
2977 *CFG = YAML::Syck::Load <$fh>; 3182 *CFG = YAML::Syck::Load <$fh>;
… …
2993sub main { 3198sub main {
2994 # we must not ever block the main coroutine 3199 # we must not ever block the main coroutine
2995 local $Coro::idle = sub { 3200 local $Coro::idle = sub {
2996 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3201 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2997 (async { 3202 (async {
3203 $Coro::current->{desc} = "IDLE BUG HANDLER";
2998 Event::one_event; 3204 Event::one_event;
2999 })->prio (Coro::PRIO_MAX); 3205 })->prio (Coro::PRIO_MAX);
3000 }; 3206 };
3001 3207
3002 cfg_load; 3208 reload_config;
3003 db_init; 3209 db_init;
3004 load_extensions; 3210 load_extensions;
3005 3211
3006 $TICK_WATCHER->start; 3212 $TICK_WATCHER->start;
3007 Event::loop; 3213 Event::loop;
… …
3074 # and maps saved/destroyed asynchronously. 3280 # and maps saved/destroyed asynchronously.
3075 warn "begin emergency player save\n"; 3281 warn "begin emergency player save\n";
3076 for my $login (keys %cf::PLAYER) { 3282 for my $login (keys %cf::PLAYER) {
3077 my $pl = $cf::PLAYER{$login} or next; 3283 my $pl = $cf::PLAYER{$login} or next;
3078 $pl->valid or next; 3284 $pl->valid or next;
3285 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3079 $pl->save; 3286 $pl->save;
3080 } 3287 }
3081 warn "end emergency player save\n"; 3288 warn "end emergency player save\n";
3082 3289
3083 warn "begin emergency map save\n"; 3290 warn "begin emergency map save\n";
… …
3200 warn "reloading cf.pm"; 3407 warn "reloading cf.pm";
3201 require cf; 3408 require cf;
3202 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3409 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3203 3410
3204 warn "loading config and database again"; 3411 warn "loading config and database again";
3205 cf::cfg_load; 3412 cf::reload_config;
3206 3413
3207 warn "loading extensions"; 3414 warn "loading extensions";
3208 cf::load_extensions; 3415 cf::load_extensions;
3209 3416
3210 warn "reattaching attachments to objects/players"; 3417 warn "reattaching attachments to objects/players";
… …
3246register_command "reload" => sub { 3453register_command "reload" => sub {
3247 my ($who, $arg) = @_; 3454 my ($who, $arg) = @_;
3248 3455
3249 if ($who->flag (FLAG_WIZ)) { 3456 if ($who->flag (FLAG_WIZ)) {
3250 $who->message ("reloading server."); 3457 $who->message ("reloading server.");
3458 async {
3459 $Coro::current->{desc} = "perl_reload";
3251 async { reload_perl }; 3460 reload_perl;
3461 };
3252 } 3462 }
3253}; 3463};
3254 3464
3255unshift @INC, $LIBDIR; 3465unshift @INC, $LIBDIR;
3256 3466
… …
3275 my $signal = new Coro::Signal; 3485 my $signal = new Coro::Signal;
3276 push @WAIT_FOR_TICK_BEGIN, $signal; 3486 push @WAIT_FOR_TICK_BEGIN, $signal;
3277 $signal->wait; 3487 $signal->wait;
3278} 3488}
3279 3489
3280 my $min = 1e6;#d#
3281 my $avg = 10;
3282$TICK_WATCHER = Event->timer ( 3490$TICK_WATCHER = Event->timer (
3283 reentrant => 0, 3491 reentrant => 0,
3284 parked => 1, 3492 parked => 1,
3285 prio => 0, 3493 prio => 0,
3286 at => $NEXT_TICK || $TICK, 3494 at => $NEXT_TICK || $TICK,
… …
3294 3502
3295 $NOW = $tick_start = Event::time; 3503 $NOW = $tick_start = Event::time;
3296 3504
3297 cf::server_tick; # one server iteration 3505 cf::server_tick; # one server iteration
3298 3506
3299 0 && sync_job {#d#
3300 for(1..10) {
3301 my $t = Event::time;
3302 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3303 or die;
3304
3305 $map->width (50);
3306 $map->height (50);
3307 $map->alloc;
3308 $map->_load_objects ("/tmp/x.map", 1);
3309 my $t = Event::time - $t;
3310
3311 #next unless $t < 0.0013;#d#
3312 if ($t < $min) {
3313 $min = $t;
3314 }
3315 $avg = $avg * 0.99 + $t * 0.01;
3316 }
3317 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3318 exit 0;
3319 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3320 };
3321
3322 $RUNTIME += $TICK; 3507 $RUNTIME += $TICK;
3323 $NEXT_TICK += $TICK; 3508 $NEXT_TICK += $TICK;
3324 3509
3325 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3510 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3326 $NEXT_RUNTIME_WRITE = $NOW + 10; 3511 $NEXT_RUNTIME_WRITE = $NOW + 10;
3327 Coro::async_pool { 3512 Coro::async_pool {
3513 $Coro::current->{desc} = "runtime saver";
3328 write_runtime 3514 write_runtime
3329 or warn "ERROR: unable to write runtime file: $!"; 3515 or warn "ERROR: unable to write runtime file: $!";
3330 }; 3516 };
3331 } 3517 }
3332 3518
3333# my $AFTER = Event::time;
3334# warn $AFTER - $NOW;#d#
3335
3336 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3519 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3337 $sig->send; 3520 $sig->send;
3338 } 3521 }
3339 while (my $sig = shift @WAIT_FOR_TICK) { 3522 while (my $sig = shift @WAIT_FOR_TICK) {
3340 $sig->send; 3523 $sig->send;
… …
3350 3533
3351 $LOAD = ($NOW - $tick_start) / $TICK; 3534 $LOAD = ($NOW - $tick_start) / $TICK;
3352 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3535 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3353 3536
3354 _post_tick; 3537 _post_tick;
3355
3356
3357 }, 3538 },
3358); 3539);
3359 3540
3360{ 3541{
3542 BDB::min_parallel 8;
3361 BDB::max_poll_time $TICK * 0.1; 3543 BDB::max_poll_time $TICK * 0.1;
3362 $BDB_POLL_WATCHER = Event->io ( 3544 $BDB_POLL_WATCHER = Event->io (
3363 reentrant => 0, 3545 reentrant => 0,
3364 fd => BDB::poll_fileno, 3546 fd => BDB::poll_fileno,
3365 poll => 'r', 3547 poll => 'r',
3366 prio => 0, 3548 prio => 0,
3367 data => WF_AUTOCANCEL, 3549 data => WF_AUTOCANCEL,
3368 cb => \&BDB::poll_cb, 3550 cb => \&BDB::poll_cb,
3369 ); 3551 );
3370 BDB::min_parallel 8;
3371 3552
3372 BDB::set_sync_prepare { 3553 BDB::set_sync_prepare {
3373 my $status; 3554 my $status;
3374 my $current = $Coro::current; 3555 my $current = $Coro::current;
3375 ( 3556 (
… …
3384 ) 3565 )
3385 }; 3566 };
3386 3567
3387 unless ($DB_ENV) { 3568 unless ($DB_ENV) {
3388 $DB_ENV = BDB::db_env_create; 3569 $DB_ENV = BDB::db_env_create;
3570 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3571 | BDB::LOG_AUTOREMOVE, 1);
3572 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3573 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3389 3574
3390 cf::sync_job { 3575 cf::sync_job {
3391 eval { 3576 eval {
3392 BDB::db_env_open 3577 BDB::db_env_open
3393 $DB_ENV, 3578 $DB_ENV,
… …
3395 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3580 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3396 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3581 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3397 0666; 3582 0666;
3398 3583
3399 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3584 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3400
3401 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3402 $DB_ENV->set_lk_detect;
3403 }; 3585 };
3404 3586
3405 cf::cleanup "db_env_open(db): $@" if $@; 3587 cf::cleanup "db_env_open(db): $@" if $@;
3406 }; 3588 };
3407 } 3589 }
3590
3591 $BDB_DEADLOCK_WATCHER = Event->timer (
3592 after => 3,
3593 interval => 1,
3594 hard => 1,
3595 prio => 0,
3596 data => WF_AUTOCANCEL,
3597 cb => sub {
3598 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3599 },
3600 );
3601 $BDB_CHECKPOINT_WATCHER = Event->timer (
3602 after => 11,
3603 interval => 60,
3604 hard => 1,
3605 prio => 0,
3606 data => WF_AUTOCANCEL,
3607 cb => sub {
3608 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3609 },
3610 );
3611 $BDB_TRICKLE_WATCHER = Event->timer (
3612 after => 5,
3613 interval => 10,
3614 hard => 1,
3615 prio => 0,
3616 data => WF_AUTOCANCEL,
3617 cb => sub {
3618 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3619 },
3620 );
3408} 3621}
3409 3622
3410{ 3623{
3411 IO::AIO::min_parallel 8; 3624 IO::AIO::min_parallel 8;
3412 3625
… …
3415 $AIO_POLL_WATCHER = Event->io ( 3628 $AIO_POLL_WATCHER = Event->io (
3416 reentrant => 0, 3629 reentrant => 0,
3417 data => WF_AUTOCANCEL, 3630 data => WF_AUTOCANCEL,
3418 fd => IO::AIO::poll_fileno, 3631 fd => IO::AIO::poll_fileno,
3419 poll => 'r', 3632 poll => 'r',
3420 prio => 6, 3633 prio => 0,
3421 cb => \&IO::AIO::poll_cb, 3634 cb => \&IO::AIO::poll_cb,
3422 ); 3635 );
3423} 3636}
3424 3637
3425my $_log_backtrace; 3638my $_log_backtrace;
… …
3431 3644
3432 # limit the # of concurrent backtraces 3645 # limit the # of concurrent backtraces
3433 if ($_log_backtrace < 2) { 3646 if ($_log_backtrace < 2) {
3434 ++$_log_backtrace; 3647 ++$_log_backtrace;
3435 async { 3648 async {
3649 $Coro::current->{desc} = "abt $msg";
3650
3436 my @bt = fork_call { 3651 my @bt = fork_call {
3437 @addr = map { sprintf "%x", $_ } @addr; 3652 @addr = map { sprintf "%x", $_ } @addr;
3438 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3653 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3439 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3654 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3440 or die "addr2line: $!"; 3655 or die "addr2line: $!";

Diff Legend

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