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.329 by root, Fri Aug 10 05:38:16 2007 UTC vs.
Revision 1.381 by root, Mon Oct 8 18:19:39 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 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 ();
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 ();
31use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
32use Time::HiRes; 33use Time::HiRes;
33use Compress::LZF; 34use Compress::LZF;
34use Digest::MD5 (); 35use Digest::MD5 ();
35 36
36# configure various modules to our taste 37# configure various modules to our taste
… …
79our $NEXT_TICK; 80our $NEXT_TICK;
80our $NOW; 81our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
82 83
83our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 88our $DB_ENV;
85 89
86our %CFG; 90our %CFG;
87 91
88our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 93our $RUNTIME;
90 94
91our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
94 98
95# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 101
… …
186 $msg .= "\n" 190 $msg .= "\n"
187 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
188 192
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 194
191 utf8::encode $msg;
192 LOG llevError, $msg; 195 LOG llevError, $msg;
193 }; 196 };
194} 197}
195 198
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
271Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
274returned. 277returned.
275 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
276Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
278 284
279=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
280 286
281Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
282 288
283=cut 289=cut
284 290
285our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
286 293
287sub lock_wait($) { 294sub lock_wait($) {
288 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
289 301
290 # wait for lock, if any 302 # wait for lock, if any
291 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 305 Coro::schedule;
… …
299 311
300 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
301 lock_wait $key; 313 lock_wait $key;
302 314
303 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
304 317
305 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
308 } 322 }
309} 323}
310 324
… …
340our @SLOT_QUEUE; 354our @SLOT_QUEUE;
341our $SLOT_QUEUE; 355our $SLOT_QUEUE;
342 356
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
345 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
346 362
347 while () { 363 while () {
348 next_job: 364 next_job:
349 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
… …
357 } 373 }
358 } 374 }
359 } 375 }
360 376
361 if (@SLOT_QUEUE) { 377 if (@SLOT_QUEUE) {
362 # 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
363 push @cf::WAIT_FOR_TICK, $signal; 379 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait; 380 $signal->wait;
365 } else { 381 } else {
366 Coro::schedule; 382 Coro::schedule;
367 } 383 }
… …
411 my $time = Event::time; 427 my $time = Event::time;
412 428
413 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
415 431
432 LOG llevError | logBacktrace, Carp::longmess "sync job";#d#
433
416 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
417 # (but this is cancel-safe) 435 # (but this is cancel-safe)
418 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
419 437
420 my $busy = 1; 438 my $busy = 1;
421 my @res; 439 my @res;
422 440
423 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 443 @res = eval { $job->() };
425 warn $@ if $@; 444 warn $@ if $@;
426 undef $busy; 445 undef $busy;
427 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
428 447
… …
472Coro::Storable. May, of course, block. Note that the executed sub may 491Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 492never block itself or use any form of Event handling.
474 493
475=cut 494=cut
476 495
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(&@) { 496sub fork_call(&@) {
487 my ($cb, @args) = @_; 497 my ($cb, @args) = @_;
488 498
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 499 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 500 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 501 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 502
494 if (my $pid = fork) { 503 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; 504 reset_signals;
508 local $SIG{__WARN__}; 505 &$cb
509 local $SIG{__DIE__}; 506 }, @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 507
516 eval { 508 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} 509}
529 510
530=item $value = cf::db_get $family => $key 511=item $value = cf::db_get $family => $key
531 512
532Returns a single value from the environment database. 513Returns a single value from the environment database.
… …
534=item cf::db_put $family => $key => $value 515=item cf::db_put $family => $key => $value
535 516
536Stores 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
537data 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).
538 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
539=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}
540 543
541our $DB; 544our $DB;
542 545
543sub db_init { 546sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 547 cf::sync_job {
548 eval { 548 $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 } 549 };
558} 550}
559 551
560sub db_get($$) { 552sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 553 my $key = "$_[0]/$_[1]";
562 554
… …
612 if (1) { 604 if (1) {
613 $md5 = 605 $md5 =
614 join "\x00", 606 join "\x00",
615 $processversion, 607 $processversion,
616 map { 608 map {
617 Coro::cede; 609 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 610 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 611 } 0.. $#$src;
620 612
621 613
622 my $dbmd5 = db_get cache => "$id/md5"; 614 my $dbmd5 = db_get cache => "$id/md5";
… …
1041sub object_freezer_save { 1033sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1034 my ($filename, $rdata, $objs) = @_;
1043 1035
1044 sync_job { 1036 sync_job {
1045 if (length $$rdata) { 1037 if (length $$rdata) {
1038 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1039 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1040 $decname, length $$rdata, scalar @$objs;
1048 1041
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1042 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1043 chmod SAVE_MODE, $fh;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1044 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1045 aio_fsync $fh if $cf::USE_FSYNC;
1053 close $fh; 1046 close $fh;
1054 1047
1055 if (@$objs) { 1048 if (@$objs) {
1056 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) {
1057 chmod SAVE_MODE, $fh; 1050 chmod SAVE_MODE, $fh;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1051 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1052 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1053 aio_fsync $fh if $cf::USE_FSYNC;
1061 close $fh; 1054 close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1055 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1056 }
… …
1071 } 1064 }
1072 } else { 1065 } else {
1073 aio_unlink $filename; 1066 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1067 aio_unlink "$filename.pst";
1075 } 1068 }
1076 } 1069 };
1077} 1070}
1078 1071
1079sub object_freezer_as_string { 1072sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1073 my ($rdata, $objs) = @_;
1081 1074
… …
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;
1098 $av = eval { (Storable::thaw $av)->{objs} };
1099 }
1100 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);
1101 warn sprintf "loading %s (%d)\n", 1098 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1099 $decname, length $data, scalar @{$av || []};
1100
1103 return ($data, $av); 1101 ($data, $av)
1104} 1102}
1105 1103
1106=head2 COMMAND CALLBACKS 1104=head2 COMMAND CALLBACKS
1107 1105
1108=over 4 1106=over 4
… …
1186 my ($type, $reply, @payload) = 1184 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1185 "ARRAY" eq ref $msg
1188 ? @$msg 1186 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1187 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1188
1189 my @reply;
1190
1191 if (my $cb = $EXTCMD{$type}) { 1191 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1192 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1193 }
1194
1195 $pl->ext_reply ($reply, @reply)
1196 if $reply;
1197
1197 } else { 1198 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1199 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1200 }
1200 1201
1201 cf::override; 1202 cf::override;
… …
1291 1292
1292=head3 cf::player 1293=head3 cf::player
1293 1294
1294=over 4 1295=over 4
1295 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
1296=item cf::player::find $login 1311=item cf::player::find $login
1297 1312
1298Returns the given player object, loading it if necessary (might block). 1313Returns the given player object, loading it if necessary (might block).
1299 1314
1300=cut 1315=cut
… …
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1350 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1351 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1352 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1353 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1354
1340 my $pl = load_pl path $login 1355 my $f = new_from_file cf::object::thawer path $login
1341 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;
1342 $cf::PLAYER{$login} = $pl 1362 $cf::PLAYER{$login} = $pl
1343 } 1363 }
1344 } 1364 }
1345} 1365}
1346 1366
… …
1356 1376
1357 aio_mkdir playerdir $pl, 0770; 1377 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1378 $pl->{last_save} = $cf::RUNTIME;
1359 1379
1360 $pl->save_pl ($path); 1380 $pl->save_pl ($path);
1361 Coro::cede; 1381 cf::cede_to_tick;
1362} 1382}
1363 1383
1364sub new($) { 1384sub new($) {
1365 my ($login) = @_; 1385 my ($login) = @_;
1366 1386
… …
1444 or return []; 1464 or return [];
1445 1465
1446 my @logins; 1466 my @logins;
1447 1467
1448 for my $login (@$dirs) { 1468 for my $login (@$dirs) {
1469 my $path = path $login;
1470
1471 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") {
1449 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1450 aio_read $fh, 0, 512, my $buf, 0 or next; 1474 aio_read $fh, 0, 512, my $buf, 0 or next;
1451 $buf !~ /^password -------------$/m or next; # official not-valid tag 1475 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 }
1452 1477
1453 utf8::decode $login; 1478 utf8::decode $login;
1454 push @logins, $login; 1479 push @logins, $login;
1455 } 1480 }
1456 1481
… …
1494sub expand_cfpod { 1519sub expand_cfpod {
1495 ((my $self), (local $_)) = @_; 1520 ((my $self), (local $_)) = @_;
1496 1521
1497 # escape & and < 1522 # escape & and <
1498 s/&/&amp;/g; 1523 s/&/&amp;/g;
1499 s/(?<![BIUGH])</&lt;/g; 1524 s/(?<![BIUGHT])</&lt;/g;
1500 1525
1501 # this is buggy, it needs to properly take care of nested <'s 1526 # this is buggy, it needs to properly take care of nested <'s
1502 1527
1503 1 while 1528 1 while
1504 # replace B<>, I<>, U<> etc. 1529 # replace B<>, I<>, U<> etc.
1505 s/B<([^\>]*)>/<b>$1<\/b>/ 1530 s/B<([^\>]*)>/<b>$1<\/b>/
1506 || s/I<([^\>]*)>/<i>$1<\/i>/ 1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1507 || s/U<([^\>]*)>/<u>$1<\/u>/ 1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1508 # replace G<male|female> tags 1534 # replace G<male|female> tags
1509 || s{G<([^>|]*)\|([^>]*)>}{ 1535 || s{G<([^>|]*)\|([^>]*)>}{
1510 $self->gender ? $2 : $1 1536 $self->gender ? $2 : $1
1511 }ge 1537 }ge
1512 # replace H<hint text> 1538 # replace H<hint text>
… …
1542=cut 1568=cut
1543 1569
1544sub ext_reply($$@) { 1570sub ext_reply($$@) {
1545 my ($self, $id, @msg) = @_; 1571 my ($self, $id, @msg) = @_;
1546 1572
1547 if ($self->ns->extcmd == 2) { 1573 $self->ns->ext_reply ($id, @msg)
1548 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1549 } elsif ($self->ns->extcmd == 1) {
1550 #TODO: version 1, remove
1551 unshift @msg, msgtype => "reply", msgid => $id;
1552 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1553 }
1554} 1574}
1555 1575
1556=item $player->ext_msg ($type, @msg) 1576=item $player->ext_msg ($type, @msg)
1557 1577
1558Sends an ext event to the client. 1578Sends an ext event to the client.
… …
1786 1806
1787sub load_header_from($) { 1807sub load_header_from($) {
1788 my ($self, $path) = @_; 1808 my ($self, $path) = @_;
1789 1809
1790 utf8::encode $path; 1810 utf8::encode $path;
1791 #aio_open $path, O_RDONLY, 0 1811 my $f = new_from_file cf::object::thawer $path
1792 # or return;
1793
1794 $self->_load_header ($path)
1795 or return; 1812 or return;
1813
1814 $self->_load_header ($f)
1815 or return;
1816
1817 local $MAP_LOADING{$self->{path}} = $self;
1818 $f->resolve_delayed_derefs;
1796 1819
1797 $self->{load_path} = $path; 1820 $self->{load_path} = $path;
1798 1821
1799 1 1822 1
1800} 1823}
… …
1854sub find { 1877sub find {
1855 my ($path, $origin) = @_; 1878 my ($path, $origin) = @_;
1856 1879
1857 $path = normalise $path, $origin && $origin->path; 1880 $path = normalise $path, $origin && $origin->path;
1858 1881
1882 cf::lock_wait "map_data:$path";#d#remove
1859 cf::lock_wait "map_find:$path"; 1883 cf::lock_wait "map_find:$path";
1860 1884
1861 $cf::MAP{$path} || do { 1885 $cf::MAP{$path} || do {
1862 my $guard = cf::lock_acquire "map_find:$path"; 1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1863 my $map = new_from_path cf::map $path 1889 my $map = new_from_path cf::map $path
1864 or return; 1890 or return;
1865 1891
1866 $map->{last_save} = $cf::RUNTIME; 1892 $map->{last_save} = $cf::RUNTIME;
1867 1893
… …
1869 or return; 1895 or return;
1870 1896
1871 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1872 # doing this can freeze the server in a sync job, obviously 1898 # doing this can freeze the server in a sync job, obviously
1873 #$cf::WAIT_FOR_TICK->wait; 1899 #$cf::WAIT_FOR_TICK->wait;
1900 undef $guard1;
1901 undef $guard2;
1874 $map->reset; 1902 $map->reset;
1875 undef $guard;
1876 return find $path; 1903 return find $path;
1877 } 1904 }
1878 1905
1879 $cf::MAP{$path} = $map 1906 $cf::MAP{$path} = $map
1880 } 1907 }
… …
1889 local $self->{deny_reset} = 1; # loading can take a long time 1916 local $self->{deny_reset} = 1; # loading can take a long time
1890 1917
1891 my $path = $self->{path}; 1918 my $path = $self->{path};
1892 1919
1893 { 1920 {
1894 my $guard = cf::lock_acquire "map_load:$path"; 1921 my $guard = cf::lock_acquire "map_data:$path";
1895 1922
1923 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 1924 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 1925
1898 $self->in_memory (cf::MAP_LOADING); 1926 $self->in_memory (cf::MAP_LOADING);
1899 1927
1900 $self->alloc; 1928 $self->alloc;
1901 1929
1902 $self->pre_load; 1930 $self->pre_load;
1903 Coro::cede; 1931 cf::cede_to_tick;
1904 1932
1933 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block;
1905 $self->_load_objects ($self->{load_path}, 1) 1935 $self->_load_objects ($f)
1906 or return; 1936 or return;
1907 1937
1908 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1909 if delete $self->{load_original}; 1939 if delete $self->{load_original};
1910 1940
1911 if (my $uniq = $self->uniq_path) { 1941 if (my $uniq = $self->uniq_path) {
1912 utf8::encode $uniq; 1942 utf8::encode $uniq;
1913 if (aio_open $uniq, O_RDONLY, 0) { 1943 unless (aio_stat $uniq) {
1944 if (my $f = new_from_file cf::object::thawer $uniq) {
1914 $self->clear_unique_items; 1945 $self->clear_unique_items;
1915 $self->_load_objects ($uniq, 0); 1946 $self->_load_objects ($f);
1947 $f->resolve_delayed_derefs;
1948 }
1916 } 1949 }
1917 } 1950 }
1918 1951
1919 Coro::cede; 1952 $f->resolve_delayed_derefs;
1953
1954 cf::cede_to_tick;
1920 # now do the right thing for maps 1955 # now do the right thing for maps
1921 $self->link_multipart_objects; 1956 $self->link_multipart_objects;
1922 $self->difficulty ($self->estimate_difficulty) 1957 $self->difficulty ($self->estimate_difficulty)
1923 unless $self->difficulty; 1958 unless $self->difficulty;
1924 Coro::cede; 1959 cf::cede_to_tick;
1925 1960
1926 unless ($self->{deny_activate}) { 1961 unless ($self->{deny_activate}) {
1927 $self->decay_objects; 1962 $self->decay_objects;
1928 $self->fix_auto_apply; 1963 $self->fix_auto_apply;
1929 $self->update_buttons; 1964 $self->update_buttons;
1930 Coro::cede; 1965 cf::cede_to_tick;
1931 $self->set_darkness_map; 1966 $self->set_darkness_map;
1932 Coro::cede; 1967 cf::cede_to_tick;
1933 $self->activate; 1968 $self->activate;
1934 } 1969 }
1935 1970
1936 $self->{last_save} = $cf::RUNTIME; 1971 $self->{last_save} = $cf::RUNTIME;
1937 $self->last_access ($cf::RUNTIME); 1972 $self->last_access ($cf::RUNTIME);
… …
1953 1988
1954 $self 1989 $self
1955} 1990}
1956 1991
1957# find and load all maps in the 3x3 area around a map 1992# find and load all maps in the 3x3 area around a map
1958sub load_diag { 1993sub load_neighbours {
1959 my ($map) = @_; 1994 my ($map) = @_;
1960 1995
1961 my @diag; # diagonal neighbours 1996 my @neigh; # diagonal neighbours
1962 1997
1963 for (0 .. 3) { 1998 for (0 .. 3) {
1964 my $neigh = $map->tile_path ($_) 1999 my $neigh = $map->tile_path ($_)
1965 or next; 2000 or next;
1966 $neigh = find $neigh, $map 2001 $neigh = find $neigh, $map
1967 or next; 2002 or next;
1968 $neigh->load; 2003 $neigh->load;
1969 2004
2005 push @neigh,
1970 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2006 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1971 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2007 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1972 } 2008 }
1973 2009
1974 for (@diag) { 2010 for (grep defined $_->[0], @neigh) {
2011 my ($path, $origin) = @$_;
1975 my $neigh = find @$_ 2012 my $neigh = find $path, $origin
1976 or next; 2013 or next;
1977 $neigh->load; 2014 $neigh->load;
1978 } 2015 }
1979} 2016}
1980 2017
… …
1985} 2022}
1986 2023
1987sub do_load_sync { 2024sub do_load_sync {
1988 my ($map) = @_; 2025 my ($map) = @_;
1989 2026
2027 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2028 if $Coro::current == $Coro::main;
2029
1990 cf::sync_job { $map->load }; 2030 cf::sync_job { $map->load };
1991} 2031}
1992 2032
1993our %MAP_PREFETCH; 2033our %MAP_PREFETCH;
1994our $MAP_PREFETCHER = undef; 2034our $MAP_PREFETCHER = undef;
1995 2035
1996sub find_async { 2036sub find_async {
1997 my ($path, $origin) = @_; 2037 my ($path, $origin, $load) = @_;
1998 2038
1999 $path = normalise $path, $origin && $origin->{path}; 2039 $path = normalise $path, $origin && $origin->{path};
2000 2040
2001 if (my $map = $cf::MAP{$path}) { 2041 if (my $map = $cf::MAP{$path}) {
2002 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
2003 } 2043 }
2004 2044
2005 undef $MAP_PREFETCH{$path}; 2045 $MAP_PREFETCH{$path} |= $load;
2046
2006 $MAP_PREFETCHER ||= cf::async { 2047 $MAP_PREFETCHER ||= cf::async {
2048 $Coro::current->{desc} = "map prefetcher";
2049
2007 while (%MAP_PREFETCH) { 2050 while (%MAP_PREFETCH) {
2008 for my $path (keys %MAP_PREFETCH) { 2051 while (my ($k, $v) = each %MAP_PREFETCH) {
2009 if (my $map = find $path) { 2052 if (my $map = find $k) {
2010 $map->load; 2053 $map->load if $v;
2011 } 2054 }
2012 2055
2013 delete $MAP_PREFETCH{$path}; 2056 delete $MAP_PREFETCH{$k};
2014 } 2057 }
2015 } 2058 }
2016 undef $MAP_PREFETCHER; 2059 undef $MAP_PREFETCHER;
2017 }; 2060 };
2018 $MAP_PREFETCHER->prio (6); 2061 $MAP_PREFETCHER->prio (6);
… …
2021} 2064}
2022 2065
2023sub save { 2066sub save {
2024 my ($self) = @_; 2067 my ($self) = @_;
2025 2068
2026 my $lock = cf::lock_acquire "map_data:" . $self->path; 2069 my $lock = cf::lock_acquire "map_data:$self->{path}";
2027 2070
2028 $self->{last_save} = $cf::RUNTIME; 2071 $self->{last_save} = $cf::RUNTIME;
2029 2072
2030 return unless $self->dirty; 2073 return unless $self->dirty;
2031 2074
… …
2037 return if $self->{deny_save}; 2080 return if $self->{deny_save};
2038 2081
2039 local $self->{last_access} = $self->last_access;#d# 2082 local $self->{last_access} = $self->last_access;#d#
2040 2083
2041 cf::async { 2084 cf::async {
2085 $Coro::current->{desc} = "map player save";
2042 $_->contr->save for $self->players; 2086 $_->contr->save for $self->players;
2043 }; 2087 };
2044 2088
2045 if ($uniq) { 2089 if ($uniq) {
2046 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2090 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2054 my ($self) = @_; 2098 my ($self) = @_;
2055 2099
2056 # save first because save cedes 2100 # save first because save cedes
2057 $self->save; 2101 $self->save;
2058 2102
2059 my $lock = cf::lock_acquire "map_data:" . $self->path; 2103 my $lock = cf::lock_acquire "map_data:$self->{path}";
2060 2104
2061 return if $self->players; 2105 return if $self->players;
2062 return if $self->in_memory != cf::MAP_IN_MEMORY; 2106 return if $self->in_memory != cf::MAP_IN_MEMORY;
2063 return if $self->{deny_save}; 2107 return if $self->{deny_save};
2064 2108
2109 $self->in_memory (cf::MAP_SWAPPED);
2110
2111 $self->deactivate;
2112 $_->clear_links_to ($self) for values %cf::MAP;
2065 $self->clear; 2113 $self->clear;
2066 $self->in_memory (cf::MAP_SWAPPED);
2067} 2114}
2068 2115
2069sub reset_at { 2116sub reset_at {
2070 my ($self) = @_; 2117 my ($self) = @_;
2071 2118
… …
2103 if $uniq; 2150 if $uniq;
2104 } 2151 }
2105 2152
2106 delete $cf::MAP{$self->path}; 2153 delete $cf::MAP{$self->path};
2107 2154
2155 $self->deactivate;
2156 $_->clear_links_to ($self) for values %cf::MAP;
2108 $self->clear; 2157 $self->clear;
2109
2110 $_->clear_links_to ($self) for values %cf::MAP;
2111 2158
2112 $self->unlink_save; 2159 $self->unlink_save;
2113 $self->destroy; 2160 $self->destroy;
2114} 2161}
2115 2162
2116my $nuke_counter = "aaaa"; 2163my $nuke_counter = "aaaa";
2117 2164
2118sub nuke { 2165sub nuke {
2119 my ($self) = @_; 2166 my ($self) = @_;
2120 2167
2168 {
2169 my $lock = cf::lock_acquire "map_data:$self->{path}";
2170
2121 delete $cf::MAP{$self->path}; 2171 delete $cf::MAP{$self->path};
2122 2172
2123 $self->unlink_save; 2173 $self->unlink_save;
2124 2174
2125 bless $self, "cf::map"; 2175 bless $self, "cf::map";
2126 delete $self->{deny_reset}; 2176 delete $self->{deny_reset};
2127 $self->{deny_save} = 1; 2177 $self->{deny_save} = 1;
2128 $self->reset_timeout (1); 2178 $self->reset_timeout (1);
2129 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2179 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2130 2180
2131 $cf::MAP{$self->path} = $self; 2181 $cf::MAP{$self->path} = $self;
2182 }
2132 2183
2133 $self->reset; # polite request, might not happen 2184 $self->reset; # polite request, might not happen
2134} 2185}
2135 2186
2136=item $maps = cf::map::tmp_maps 2187=item $maps = cf::map::tmp_maps
… …
2212 2263
2213sub inv_recursive { 2264sub inv_recursive {
2214 inv_recursive_ inv $_[0] 2265 inv_recursive_ inv $_[0]
2215} 2266}
2216 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
2217package cf; 2296package cf;
2218 2297
2219=back 2298=back
2220 2299
2221=head3 cf::object::player 2300=head3 cf::object::player
… …
2349 # use -1 or undef as default coordinates, not 0, 0 2428 # use -1 or undef as default coordinates, not 0, 0
2350 ($x, $y) = ($map->enter_x, $map->enter_y) 2429 ($x, $y) = ($map->enter_x, $map->enter_y)
2351 if $x <=0 && $y <= 0; 2430 if $x <=0 && $y <= 0;
2352 2431
2353 $map->load; 2432 $map->load;
2354 $map->load_diag; 2433 $map->load_neighbours;
2355 2434
2356 return unless $self->contr->active; 2435 return unless $self->contr->active;
2357 $self->activate_recursive; 2436 $self->activate_recursive;
2358 2437
2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2379 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2380 2459
2381 $self->enter_link; 2460 $self->enter_link;
2382 2461
2383 (async { 2462 (async {
2463 $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
2384 my $map = eval { 2484 my $map = eval {
2385 my $map = cf::map::find $path; 2485 my $map = defined $path ? cf::map::find $path : undef;
2386 2486
2387 if ($map) { 2487 if ($map) {
2388 $map = $map->customise_for ($self); 2488 $map = $map->customise_for ($self);
2389 $map = $check->($map) if $check && $map; 2489 $map = $check->($map) if $check && $map;
2390 } else { 2490 } else {
2391 $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);
2392 } 2492 }
2393 2493
2394 $map 2494 $map
2395 }; 2495 };
2396 2496
… …
2486 # if exit is damned, update players death & WoR home-position 2586 # if exit is damned, update players death & WoR home-position
2487 $self->contr->savebed ($slaying, $hp, $sp) 2587 $self->contr->savebed ($slaying, $hp, $sp)
2488 if $exit->flag (FLAG_DAMNED); 2588 if $exit->flag (FLAG_DAMNED);
2489 2589
2490 (async { 2590 (async {
2591 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2592
2491 $self->deactivate_recursive; # just to be sure 2593 $self->deactivate_recursive; # just to be sure
2492 unless (eval { 2594 unless (eval {
2493 $self->goto ($slaying, $hp, $sp); 2595 $self->goto ($slaying, $hp, $sp);
2494 2596
2495 1; 2597 1;
… …
2530the 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
2531the message unless the client supports the msg packet. 2633the message unless the client supports the msg packet.
2532 2634
2533=cut 2635=cut
2534 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
2535sub cf::client::send_msg { 2658sub cf::client::send_msg {
2536 my ($self, $channel, $msg, $color, @extra) = @_; 2659 my ($self, $channel, $msg, $color, @extra) = @_;
2537 2660
2538 $msg = $self->pl->expand_cfpod ($msg); 2661 $msg = $self->pl->expand_cfpod ($msg);
2539 2662
2540 $color &= cf::NDI_CLIENT_MASK; # just in case... 2663 $color &= cf::NDI_CLIENT_MASK; # just in case...
2541 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
2542 if (ref $channel) { 2674 } elsif (ref $channel) {
2543 # send meta info to client, if not yet sent 2675 # send meta info to client, if not yet sent
2544 unless (exists $self->{channel}{$channel->{id}}) { 2676 unless (exists $self->{channel}{$channel->{id}}) {
2545 $self->{channel}{$channel->{id}} = $channel; 2677 $self->{channel}{$channel->{id}} = $channel;
2546 $self->ext_msg (channel_info => $channel); 2678 $self->ext_msg (channel_info => $channel)
2679 if $self->can_msg;
2547 } 2680 }
2548 2681
2549 $channel = $channel->{id}; 2682 $channel = $channel->{id};
2550 } 2683 }
2551 2684
… …
2573 $color &= cf::NDI_COLOR_MASK; 2706 $color &= cf::NDI_COLOR_MASK;
2574 2707
2575 utf8::encode $msg; 2708 utf8::encode $msg;
2576 2709
2577 if (0 && $msg =~ /\[/) { 2710 if (0 && $msg =~ /\[/) {
2711 # COMMAND/INFO
2578 $self->send_packet ("drawextinfo $color 4 0 $msg") 2712 $self->send_packet ("drawextinfo $color 10 8 $msg")
2579 } else { 2713 } else {
2580 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2714 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2581 $self->send_packet ("drawinfo $color $msg") 2715 $self->send_packet ("drawinfo $color $msg")
2582 } 2716 }
2583 } 2717 }
… …
2591=cut 2725=cut
2592 2726
2593sub cf::client::ext_msg($$@) { 2727sub cf::client::ext_msg($$@) {
2594 my ($self, $type, @msg) = @_; 2728 my ($self, $type, @msg) = @_;
2595 2729
2596 my $extcmd = $self->extcmd;
2597
2598 if ($extcmd == 2) { 2730 if ($self->extcmd == 2) {
2599 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2731 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2600 } elsif ($extcmd == 1) { # TODO: remove 2732 } elsif ($self->extcmd == 1) { # TODO: remove
2601 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;
2602 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2752 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2603 } 2753 }
2604} 2754}
2605 2755
2606=item $success = $client->query ($flags, "text", \&cb) 2756=item $success = $client->query ($flags, "text", \&cb)
… …
2668 my ($type, $reply, @payload) = 2818 my ($type, $reply, @payload) =
2669 "ARRAY" eq ref $msg 2819 "ARRAY" eq ref $msg
2670 ? @$msg 2820 ? @$msg
2671 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2821 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2672 2822
2823 my @reply;
2824
2673 if (my $cb = $EXTICMD{$type}) { 2825 if (my $cb = $EXTICMD{$type}) {
2674 my @reply = $cb->($ns, @payload); 2826 @reply = $cb->($ns, @payload);
2675
2676 $ns->ext_reply ($reply, @reply)
2677 if $reply;
2678 } 2827 }
2828
2829 $ns->ext_reply ($reply, @reply)
2830 if $reply;
2831
2679 } else { 2832 } else {
2680 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";
2681 } 2834 }
2682 2835
2683 cf::override; 2836 cf::override;
… …
2744 2897
2745The following functions and methods are available within a safe environment: 2898The following functions and methods are available within a safe environment:
2746 2899
2747 cf::object 2900 cf::object
2748 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
2749 insert remove 2902 insert remove name archname title slaying race decrease_ob_nr
2750 2903
2751 cf::object::player 2904 cf::object::player
2752 player 2905 player
2753 2906
2754 cf::player 2907 cf::player
… …
2759 2912
2760=cut 2913=cut
2761 2914
2762for ( 2915for (
2763 ["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
2764 insert remove inv)], 2917 insert remove inv name archname title slaying race
2918 decrease_ob_nr)],
2765 ["cf::object::player" => qw(player)], 2919 ["cf::object::player" => qw(player)],
2766 ["cf::player" => qw(peaceful)], 2920 ["cf::player" => qw(peaceful)],
2767 ["cf::map" => qw(trigger)], 2921 ["cf::map" => qw(trigger)],
2768) { 2922) {
2769 no strict 'refs'; 2923 no strict 'refs';
… …
2845# the server's init and main functions 2999# the server's init and main functions
2846 3000
2847sub load_facedata($) { 3001sub load_facedata($) {
2848 my ($path) = @_; 3002 my ($path) = @_;
2849 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
2850 warn "loading facedata from $path\n"; 3010 warn "loading facedata from $path\n";
2851 3011
2852 my $facedata; 3012 my $facedata;
2853 0 < aio_load $path, $facedata 3013 0 < aio_load $path, $facedata
2854 or die "$path: $!"; 3014 or die "$path: $!";
2855 3015
2856 $facedata = Coro::Storable::thaw $facedata; 3016 $facedata = Coro::Storable::thaw $facedata;
2857 3017
2858 $facedata->{version} == 2 3018 $facedata->{version} == 2
2859 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;
2860 3027
2861 { 3028 {
2862 my $faces = $facedata->{faceinfo}; 3029 my $faces = $facedata->{faceinfo};
2863 3030
2864 while (my ($face, $info) = each %$faces) { 3031 while (my ($face, $info) = each %$faces) {
2865 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3032 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2866 cf::face::set_visibility $idx, $info->{visibility}; 3033 cf::face::set_visibility $idx, $info->{visibility};
2867 cf::face::set_magicmap $idx, $info->{magicmap}; 3034 cf::face::set_magicmap $idx, $info->{magicmap};
2868 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3035 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2869 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3036 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2870 3037
2871 cf::cede_to_tick; 3038 cf::cede_to_tick;
2872 } 3039 }
2873 3040
2874 while (my ($face, $info) = each %$faces) { 3041 while (my ($face, $info) = each %$faces) {
… …
2899 3066
2900 { 3067 {
2901 # TODO: for gcfclient pleasure, we should give resources 3068 # TODO: for gcfclient pleasure, we should give resources
2902 # that gcfclient doesn't grok a >10000 face index. 3069 # that gcfclient doesn't grok a >10000 face index.
2903 my $res = $facedata->{resource}; 3070 my $res = $facedata->{resource};
2904 my $enc = JSON::XS->new->utf8->canonical;
2905 3071
2906 my $soundconf = delete $res->{"res/sound.conf"}; 3072 my $soundconf = delete $res->{"res/sound.conf"};
2907 3073
2908 while (my ($name, $info) = each %$res) { 3074 while (my ($name, $info) = each %$res) {
2909 my $meta = $enc->encode ({
2910 name => $name,
2911 %{ $info->{meta} || {} },
2912 });
2913
2914 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3075 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3076 my $data;
2915 3077
2916 if ($info->{type} & 1) { 3078 if ($info->{type} & 1) {
2917 # prepend meta info 3079 # prepend meta info
2918 3080
3081 my $meta = $enc->encode ({
3082 name => $name,
3083 %{ $info->{meta} || {} },
3084 });
3085
2919 my $data = pack "(w/a*)*", $meta, $info->{data}; 3086 $data = pack "(w/a*)*", $meta, $info->{data};
2920 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2921
2922 cf::face::set_data $idx, 0, $data, $chk;
2923 } else { 3087 } else {
2924 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3088 $data = $info->{data};
2925 } 3089 }
2926 3090
3091 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2927 cf::face::set_type $idx, $info->{type}; 3092 cf::face::set_type $idx, $info->{type};
2928 3093
2929 cf::cede_to_tick; 3094 cf::cede_to_tick;
2930 } 3095 }
2931 3096
… …
2958 $ns->fx_want ($k, $v); 3123 $ns->fx_want ($k, $v);
2959 } 3124 }
2960}; 3125};
2961 3126
2962sub 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
2963 load_resource_file "$MAPDIR/regions" 3132 load_resource_file "$MAPDIR/regions"
2964 or die "unable to load regions file\n"; 3133 or die "unable to load regions file\n";
2965 3134
2966 for (cf::region::list) { 3135 for (cf::region::list) {
2967 $_->{match} = qr/$_->{match}/ 3136 $_->{match} = qr/$_->{match}/
… …
3003 3172
3004sub init { 3173sub init {
3005 reload_resources; 3174 reload_resources;
3006} 3175}
3007 3176
3008sub cfg_load { 3177sub reload_config {
3009 open my $fh, "<:utf8", "$CONFDIR/config" 3178 open my $fh, "<:utf8", "$CONFDIR/config"
3010 or return; 3179 or return;
3011 3180
3012 local $/; 3181 local $/;
3013 *CFG = YAML::Syck::Load <$fh>; 3182 *CFG = YAML::Syck::Load <$fh>;
… …
3029sub main { 3198sub main {
3030 # we must not ever block the main coroutine 3199 # we must not ever block the main coroutine
3031 local $Coro::idle = sub { 3200 local $Coro::idle = sub {
3032 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#
3033 (async { 3202 (async {
3203 $Coro::current->{desc} = "IDLE BUG HANDLER";
3034 Event::one_event; 3204 Event::one_event;
3035 })->prio (Coro::PRIO_MAX); 3205 })->prio (Coro::PRIO_MAX);
3036 }; 3206 };
3037 3207
3038 cfg_load; 3208 reload_config;
3039 db_init; 3209 db_init;
3040 load_extensions; 3210 load_extensions;
3041 3211
3042 $TICK_WATCHER->start; 3212 $TICK_WATCHER->start;
3043 Event::loop; 3213 Event::loop;
… …
3110 # and maps saved/destroyed asynchronously. 3280 # and maps saved/destroyed asynchronously.
3111 warn "begin emergency player save\n"; 3281 warn "begin emergency player save\n";
3112 for my $login (keys %cf::PLAYER) { 3282 for my $login (keys %cf::PLAYER) {
3113 my $pl = $cf::PLAYER{$login} or next; 3283 my $pl = $cf::PLAYER{$login} or next;
3114 $pl->valid or next; 3284 $pl->valid or next;
3285 delete $pl->{unclean_save};
3115 $pl->save; 3286 $pl->save;
3116 } 3287 }
3117 warn "end emergency player save\n"; 3288 warn "end emergency player save\n";
3118 3289
3119 warn "begin emergency map save\n"; 3290 warn "begin emergency map save\n";
… …
3236 warn "reloading cf.pm"; 3407 warn "reloading cf.pm";
3237 require cf; 3408 require cf;
3238 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3409 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3239 3410
3240 warn "loading config and database again"; 3411 warn "loading config and database again";
3241 cf::cfg_load; 3412 cf::reload_config;
3242 3413
3243 warn "loading extensions"; 3414 warn "loading extensions";
3244 cf::load_extensions; 3415 cf::load_extensions;
3245 3416
3246 warn "reattaching attachments to objects/players"; 3417 warn "reattaching attachments to objects/players";
… …
3282register_command "reload" => sub { 3453register_command "reload" => sub {
3283 my ($who, $arg) = @_; 3454 my ($who, $arg) = @_;
3284 3455
3285 if ($who->flag (FLAG_WIZ)) { 3456 if ($who->flag (FLAG_WIZ)) {
3286 $who->message ("reloading server."); 3457 $who->message ("reloading server.");
3458 async {
3459 $Coro::current->{desc} = "perl_reload";
3287 async { reload_perl }; 3460 reload_perl;
3461 };
3288 } 3462 }
3289}; 3463};
3290 3464
3291unshift @INC, $LIBDIR; 3465unshift @INC, $LIBDIR;
3292 3466
… …
3311 my $signal = new Coro::Signal; 3485 my $signal = new Coro::Signal;
3312 push @WAIT_FOR_TICK_BEGIN, $signal; 3486 push @WAIT_FOR_TICK_BEGIN, $signal;
3313 $signal->wait; 3487 $signal->wait;
3314} 3488}
3315 3489
3316 my $min = 1e6;#d#
3317 my $avg = 10;
3318$TICK_WATCHER = Event->timer ( 3490$TICK_WATCHER = Event->timer (
3319 reentrant => 0, 3491 reentrant => 0,
3320 parked => 1, 3492 parked => 1,
3321 prio => 0, 3493 prio => 0,
3322 at => $NEXT_TICK || $TICK, 3494 at => $NEXT_TICK || $TICK,
… …
3330 3502
3331 $NOW = $tick_start = Event::time; 3503 $NOW = $tick_start = Event::time;
3332 3504
3333 cf::server_tick; # one server iteration 3505 cf::server_tick; # one server iteration
3334 3506
3335 0 && sync_job {#d#
3336 for(1..10) {
3337 my $t = Event::time;
3338 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3339 or die;
3340
3341 $map->width (50);
3342 $map->height (50);
3343 $map->alloc;
3344 $map->_load_objects ("/tmp/x.map", 1);
3345 my $t = Event::time - $t;
3346
3347 #next unless $t < 0.0013;#d#
3348 if ($t < $min) {
3349 $min = $t;
3350 }
3351 $avg = $avg * 0.99 + $t * 0.01;
3352 }
3353 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3354 exit 0;
3355 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3356 };
3357
3358 $RUNTIME += $TICK; 3507 $RUNTIME += $TICK;
3359 $NEXT_TICK += $TICK; 3508 $NEXT_TICK += $TICK;
3360 3509
3361 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3510 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3362 $NEXT_RUNTIME_WRITE = $NOW + 10; 3511 $NEXT_RUNTIME_WRITE = $NOW + 10;
3363 Coro::async_pool { 3512 Coro::async_pool {
3513 $Coro::current->{desc} = "runtime saver";
3364 write_runtime 3514 write_runtime
3365 or warn "ERROR: unable to write runtime file: $!"; 3515 or warn "ERROR: unable to write runtime file: $!";
3366 }; 3516 };
3367 } 3517 }
3368 3518
3369# my $AFTER = Event::time;
3370# warn $AFTER - $NOW;#d#
3371
3372 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3519 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3373 $sig->send; 3520 $sig->send;
3374 } 3521 }
3375 while (my $sig = shift @WAIT_FOR_TICK) { 3522 while (my $sig = shift @WAIT_FOR_TICK) {
3376 $sig->send; 3523 $sig->send;
… …
3386 3533
3387 $LOAD = ($NOW - $tick_start) / $TICK; 3534 $LOAD = ($NOW - $tick_start) / $TICK;
3388 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3535 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3389 3536
3390 _post_tick; 3537 _post_tick;
3391
3392
3393 }, 3538 },
3394); 3539);
3395 3540
3396{ 3541{
3542 BDB::min_parallel 8;
3397 BDB::max_poll_time $TICK * 0.1; 3543 BDB::max_poll_time $TICK * 0.1;
3398 $BDB_POLL_WATCHER = Event->io ( 3544 $BDB_POLL_WATCHER = Event->io (
3399 reentrant => 0, 3545 reentrant => 0,
3400 fd => BDB::poll_fileno, 3546 fd => BDB::poll_fileno,
3401 poll => 'r', 3547 poll => 'r',
3402 prio => 0, 3548 prio => 0,
3403 data => WF_AUTOCANCEL, 3549 data => WF_AUTOCANCEL,
3404 cb => \&BDB::poll_cb, 3550 cb => \&BDB::poll_cb,
3405 ); 3551 );
3406 BDB::min_parallel 8;
3407 3552
3408 BDB::set_sync_prepare { 3553 BDB::set_sync_prepare {
3409 my $status; 3554 my $status;
3410 my $current = $Coro::current; 3555 my $current = $Coro::current;
3411 ( 3556 (
… …
3420 ) 3565 )
3421 }; 3566 };
3422 3567
3423 unless ($DB_ENV) { 3568 unless ($DB_ENV) {
3424 $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);
3425 3574
3426 cf::sync_job { 3575 cf::sync_job {
3427 eval { 3576 eval {
3428 BDB::db_env_open 3577 BDB::db_env_open
3429 $DB_ENV, 3578 $DB_ENV,
… …
3431 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
3432 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3581 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3433 0666; 3582 0666;
3434 3583
3435 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3584 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3436
3437 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3438 $DB_ENV->set_lk_detect;
3439 }; 3585 };
3440 3586
3441 cf::cleanup "db_env_open(db): $@" if $@; 3587 cf::cleanup "db_env_open(db): $@" if $@;
3442 }; 3588 };
3443 } 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 );
3444} 3621}
3445 3622
3446{ 3623{
3447 IO::AIO::min_parallel 8; 3624 IO::AIO::min_parallel 8;
3448 3625
… …
3451 $AIO_POLL_WATCHER = Event->io ( 3628 $AIO_POLL_WATCHER = Event->io (
3452 reentrant => 0, 3629 reentrant => 0,
3453 data => WF_AUTOCANCEL, 3630 data => WF_AUTOCANCEL,
3454 fd => IO::AIO::poll_fileno, 3631 fd => IO::AIO::poll_fileno,
3455 poll => 'r', 3632 poll => 'r',
3456 prio => 6, 3633 prio => 0,
3457 cb => \&IO::AIO::poll_cb, 3634 cb => \&IO::AIO::poll_cb,
3458 ); 3635 );
3459} 3636}
3460 3637
3461my $_log_backtrace; 3638my $_log_backtrace;
… …
3467 3644
3468 # limit the # of concurrent backtraces 3645 # limit the # of concurrent backtraces
3469 if ($_log_backtrace < 2) { 3646 if ($_log_backtrace < 2) {
3470 ++$_log_backtrace; 3647 ++$_log_backtrace;
3471 async { 3648 async {
3649 $Coro::current->{desc} = "abt $msg";
3650
3472 my @bt = fork_call { 3651 my @bt = fork_call {
3473 @addr = map { sprintf "%x", $_ } @addr; 3652 @addr = map { sprintf "%x", $_ } @addr;
3474 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3653 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3475 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 |"
3476 or die "addr2line: $!"; 3655 or die "addr2line: $!";

Diff Legend

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