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.330 by elmex, Fri Aug 10 10:35:07 2007 UTC vs.
Revision 1.393 by root, Fri Oct 26 04:47:00 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable;
10use Event; 9use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
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, 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
429 while ($busy) { 448 while ($busy) {
449 if (Coro::nready) {
450 Coro::cede_notself;
451 } else {
430 Coro::cede or Event::one_event; 452 Event::one_event;
453 }
431 } 454 }
432 455
433 $time = Event::time - $time; 456 $time = Event::time - $time;
434 457
435 LOG llevError | logBacktrace, Carp::longmess "long sync job" 458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
… …
472Coro::Storable. May, of course, block. Note that the executed sub may 495Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 496never block itself or use any form of Event handling.
474 497
475=cut 498=cut
476 499
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(&@) { 500sub fork_call(&@) {
487 my ($cb, @args) = @_; 501 my ($cb, @args) = @_;
488 502
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 503 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 504 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 505 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 506
494 if (my $pid = fork) { 507 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; 508 reset_signals;
508 local $SIG{__WARN__}; 509 &$cb
509 local $SIG{__DIE__}; 510 }, @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 511
516 eval { 512 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} 513}
529 514
530=item $value = cf::db_get $family => $key 515=item $value = cf::db_get $family => $key
531 516
532Returns a single value from the environment database. 517Returns a single value from the environment database.
… …
534=item cf::db_put $family => $key => $value 519=item cf::db_put $family => $key => $value
535 520
536Stores the given C<$value> in the family. It can currently store binary 521Stores 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). 522data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 523
524=item $db = cf::db_table "name"
525
526Create and/or open a new database table. The string must not be "db" and must be unique
527within each server.
528
539=cut 529=cut
530
531sub db_table($) {
532 my ($name) = @_;
533 my $db = BDB::db_create $DB_ENV;
534
535 eval {
536 $db->set_flags (BDB::CHKSUM);
537
538 utf8::encode $name;
539 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
540 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
541 cf::cleanup "db_open(db): $!" if $!;
542 };
543 cf::cleanup "db_open(db): $@" if $@;
544
545 $db
546}
540 547
541our $DB; 548our $DB;
542 549
543sub db_init { 550sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 551 cf::sync_job {
548 eval { 552 $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 } 553 };
558} 554}
559 555
560sub db_get($$) { 556sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 557 my $key = "$_[0]/$_[1]";
562 558
… …
612 if (1) { 608 if (1) {
613 $md5 = 609 $md5 =
614 join "\x00", 610 join "\x00",
615 $processversion, 611 $processversion,
616 map { 612 map {
617 Coro::cede; 613 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 614 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 615 } 0.. $#$src;
620 616
621 617
622 my $dbmd5 = db_get cache => "$id/md5"; 618 my $dbmd5 = db_get cache => "$id/md5";
… …
974 970
975=cut 971=cut
976 972
977############################################################################# 973#############################################################################
978# object support 974# object support
979#
980 975
976sub _object_equal($$);
977sub _object_equal($$) {
978 my ($a, $b) = @_;
979
980 return 0 unless (ref $a) eq (ref $b);
981
982 if ("HASH" eq ref $a) {
983 my @ka = keys %$a;
984 my @kb = keys %$b;
985
986 return 0 if @ka != @kb;
987
988 for (0 .. $#ka) {
989 return 0 unless $ka[$_] eq $kb[$_];
990 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
991 }
992
993 } elsif ("ARRAY" eq ref $a) {
994
995 return 0 if @$a != @$b;
996
997 for (0 .. $#$a) {
998 return 0 unless _object_equal $a->[$_], $b->[$_];
999 }
1000
1001 } elsif ($a ne $b) {
1002 return 0;
1003 }
1004
1005 1
1006}
1007
1008our $SLOW_MERGES;#d#
981sub _can_merge { 1009sub _can_merge {
982 my ($ob1, $ob2) = @_; 1010 my ($ob1, $ob2) = @_;
983 1011
984 local $Storable::canonical = 1; 1012 ++$SLOW_MERGES;#d#
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987 1013
988 $fob1 eq $fob2 1014 # we do the slow way here
1015 return _object_equal $ob1, $ob2
989} 1016}
990 1017
991sub reattach { 1018sub reattach {
992 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 1020 my ($obj) = @_;
… …
1041sub object_freezer_save { 1068sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
1043 1070
1044 sync_job { 1071 sync_job {
1045 if (length $$rdata) { 1072 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
1048 1076
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1078 chmod SAVE_MODE, $fh;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1080 aio_fsync $fh if $cf::USE_FSYNC;
1053 close $fh; 1081 close $fh;
1054 1082
1055 if (@$objs) { 1083 if (@$objs) {
1056 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1057 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
1061 close $fh; 1089 close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1091 }
… …
1071 } 1099 }
1072 } else { 1100 } else {
1073 aio_unlink $filename; 1101 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
1075 } 1103 }
1076 } 1104 };
1077} 1105}
1078 1106
1079sub object_freezer_as_string { 1107sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
1081 1109
… …
1093 or return; 1121 or return;
1094 1122
1095 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1125 or return;
1126
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1127 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs};
1099 } 1129 }
1100 1130
1131 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1133 $decname, length $data, scalar @{$av || []};
1134
1103 return ($data, $av); 1135 ($data, $av)
1104} 1136}
1105 1137
1106=head2 COMMAND CALLBACKS 1138=head2 COMMAND CALLBACKS
1107 1139
1108=over 4 1140=over 4
… …
1186 my ($type, $reply, @payload) = 1218 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1219 "ARRAY" eq ref $msg
1188 ? @$msg 1220 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1221 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1222
1223 my @reply;
1224
1191 if (my $cb = $EXTCMD{$type}) { 1225 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1226 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1227 }
1228
1229 $pl->ext_reply ($reply, @reply)
1230 if $reply;
1231
1197 } else { 1232 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1233 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1234 }
1200 1235
1201 cf::override; 1236 cf::override;
… …
1291 1326
1292=head3 cf::player 1327=head3 cf::player
1293 1328
1294=over 4 1329=over 4
1295 1330
1331=item cf::player::num_playing
1332
1333Returns the official number of playing players, as per the Crossfire metaserver rules.
1334
1335=cut
1336
1337sub num_playing {
1338 scalar grep
1339 $_->ob->map
1340 && !$_->hidden
1341 && !$_->ob->flag (cf::FLAG_WIZ),
1342 cf::player::list
1343}
1344
1296=item cf::player::find $login 1345=item cf::player::find $login
1297 1346
1298Returns the given player object, loading it if necessary (might block). 1347Returns the given player object, loading it if necessary (might block).
1299 1348
1300=cut 1349=cut
… …
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1384 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1385 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1386 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1387 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1388
1340 my $pl = load_pl path $login 1389 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1390 or return;
1391
1392 my $pl = cf::player::load_pl $f
1393 or return;
1394 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs;
1342 $cf::PLAYER{$login} = $pl 1396 $cf::PLAYER{$login} = $pl
1343 } 1397 }
1344 } 1398 }
1345} 1399}
1346 1400
… …
1356 1410
1357 aio_mkdir playerdir $pl, 0770; 1411 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1412 $pl->{last_save} = $cf::RUNTIME;
1359 1413
1360 $pl->save_pl ($path); 1414 $pl->save_pl ($path);
1361 Coro::cede; 1415 cf::cede_to_tick;
1362} 1416}
1363 1417
1364sub new($) { 1418sub new($) {
1365 my ($login) = @_; 1419 my ($login) = @_;
1366 1420
… …
1444 or return []; 1498 or return [];
1445 1499
1446 my @logins; 1500 my @logins;
1447 1501
1448 for my $login (@$dirs) { 1502 for my $login (@$dirs) {
1503 my $path = path $login;
1504
1505 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") {
1449 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1450 aio_read $fh, 0, 512, my $buf, 0 or next; 1508 aio_read $fh, 0, 512, my $buf, 0 or next;
1451 $buf !~ /^password -------------$/m or next; # official not-valid tag 1509 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 }
1452 1511
1453 utf8::decode $login; 1512 utf8::decode $login;
1454 push @logins, $login; 1513 push @logins, $login;
1455 } 1514 }
1456 1515
… …
1489 1548
1490Expand crossfire pod fragments into protocol xml. 1549Expand crossfire pod fragments into protocol xml.
1491 1550
1492=cut 1551=cut
1493 1552
1553use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 # match a pod interior sequence sans C<< >>
1558 (?:
1559 \ (.*?)\ (?{ $group = $^N })
1560 | < (??{$interior}) >
1561 )
1562}x;
1563
1494sub expand_cfpod { 1564sub expand_cfpod {
1495 ((my $self), (local $_)) = @_; 1565 my ($self, $pod) = @_;
1496 1566
1497 # escape & and < 1567 my $xml;
1498 s/&/&amp;/g;
1499 s/(?<![BIUGH])</&lt;/g;
1500 1568
1501 # this is buggy, it needs to properly take care of nested <'s 1569 while () {
1570 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1571 $group = $1;
1502 1572
1503 1 while 1573 $group =~ s/&/&amp;/g;
1504 # replace B<>, I<>, U<> etc. 1574 $group =~ s/</&lt;/g;
1505 s/B<([^\>]*)>/<b>$1<\/b>/ 1575
1506 || s/I<([^\>]*)>/<i>$1<\/i>/ 1576 $xml .= $group;
1507 || s/U<([^\>]*)>/<u>$1<\/u>/ 1577 } elsif ($pod =~ m%\G
1508 # replace G<male|female> tags 1578 ([BCGHITU])
1509 || s{G<([^>|]*)\|([^>]*)>}{ 1579 <
1510 $self->gender ? $2 : $1 1580 (?:
1511 }ge 1581 ([^<>]*) (?{ $group = $^N })
1512 # replace H<hint text> 1582 | < $interior >
1513 || s{H<([^\>]*)>} 1583 )
1584 >
1585 %gcsx
1514 { 1586 ) {
1587 my ($code, $data) = ($1, $group);
1588
1589 if ($code eq "B") {
1590 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1591 } elsif ($code eq "I") {
1592 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1593 } elsif ($code eq "U") {
1594 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1595 } elsif ($code eq "C") {
1596 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1597 } elsif ($code eq "T") {
1598 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1599 } elsif ($code eq "G") {
1600 my ($male, $female) = split /\|/, $data;
1601 $data = $self->gender ? $female : $male;
1602 $xml .= expand_cfpod ($self, $data);
1603 } elsif ($code eq "H") {
1515 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1604 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1516 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1605 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1517 "") 1606 "")
1518 [$self->{hintmode}] 1607 [$self->{hintmode}];
1608 } else {
1609 $xml .= "error processing '$code($data)' directive";
1519 }ge; 1610 }
1611 } else {
1612 if ($pod =~ /\G(.+)/) {
1613 warn "parse error while expanding $pod (at $1)";
1614 }
1615 last;
1616 }
1617 }
1520 1618
1619 for ($xml) {
1521 # create single paragraphs (very hackish) 1620 # create single paragraphs (very hackish)
1522 s/(?<=\S)\n(?=\w)/ /g; 1621 s/(?<=\S)\n(?=\w)/ /g;
1523 1622
1524 # compress some whitespace 1623 # compress some whitespace
1525 s/\s+\n/\n/g; # ws line-ends 1624 s/\s+\n/\n/g; # ws line-ends
1526 s/\n\n+/\n/g; # double lines 1625 s/\n\n+/\n/g; # double lines
1527 s/^\n+//; # beginning lines 1626 s/^\n+//; # beginning lines
1528 s/\n+$//; # ending lines 1627 s/\n+$//; # ending lines
1628 }
1529 1629
1530 $_ 1630 $xml
1531} 1631}
1632
1633no re 'eval';
1532 1634
1533sub hintmode { 1635sub hintmode {
1534 $_[0]{hintmode} = $_[1] if @_ > 1; 1636 $_[0]{hintmode} = $_[1] if @_ > 1;
1535 $_[0]{hintmode} 1637 $_[0]{hintmode}
1536} 1638}
… …
1542=cut 1644=cut
1543 1645
1544sub ext_reply($$@) { 1646sub ext_reply($$@) {
1545 my ($self, $id, @msg) = @_; 1647 my ($self, $id, @msg) = @_;
1546 1648
1547 if ($self->ns->extcmd == 2) { 1649 $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} 1650}
1555 1651
1556=item $player->ext_msg ($type, @msg) 1652=item $player->ext_msg ($type, @msg)
1557 1653
1558Sends an ext event to the client. 1654Sends an ext event to the client.
… …
1786 1882
1787sub load_header_from($) { 1883sub load_header_from($) {
1788 my ($self, $path) = @_; 1884 my ($self, $path) = @_;
1789 1885
1790 utf8::encode $path; 1886 utf8::encode $path;
1791 #aio_open $path, O_RDONLY, 0 1887 my $f = new_from_file cf::object::thawer $path
1792 # or return;
1793
1794 $self->_load_header ($path)
1795 or return; 1888 or return;
1889
1890 $self->_load_header ($f)
1891 or return;
1892
1893 local $MAP_LOADING{$self->{path}} = $self;
1894 $f->resolve_delayed_derefs;
1796 1895
1797 $self->{load_path} = $path; 1896 $self->{load_path} = $path;
1798 1897
1799 1 1898 1
1800} 1899}
… …
1854sub find { 1953sub find {
1855 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
1856 1955
1857 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
1858 1957
1958 cf::lock_wait "map_data:$path";#d#remove
1859 cf::lock_wait "map_find:$path"; 1959 cf::lock_wait "map_find:$path";
1860 1960
1861 $cf::MAP{$path} || do { 1961 $cf::MAP{$path} || do {
1862 my $guard = cf::lock_acquire "map_find:$path"; 1962 my $guard1 = cf::lock_acquire "map_find:$path";
1963 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1964
1863 my $map = new_from_path cf::map $path 1965 my $map = new_from_path cf::map $path
1864 or return; 1966 or return;
1865 1967
1866 $map->{last_save} = $cf::RUNTIME; 1968 $map->{last_save} = $cf::RUNTIME;
1867 1969
… …
1869 or return; 1971 or return;
1870 1972
1871 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1973 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1872 # doing this can freeze the server in a sync job, obviously 1974 # doing this can freeze the server in a sync job, obviously
1873 #$cf::WAIT_FOR_TICK->wait; 1975 #$cf::WAIT_FOR_TICK->wait;
1976 undef $guard1;
1977 undef $guard2;
1874 $map->reset; 1978 $map->reset;
1875 undef $guard;
1876 return find $path; 1979 return find $path;
1877 } 1980 }
1878 1981
1879 $cf::MAP{$path} = $map 1982 $cf::MAP{$path} = $map
1880 } 1983 }
… …
1889 local $self->{deny_reset} = 1; # loading can take a long time 1992 local $self->{deny_reset} = 1; # loading can take a long time
1890 1993
1891 my $path = $self->{path}; 1994 my $path = $self->{path};
1892 1995
1893 { 1996 {
1894 my $guard = cf::lock_acquire "map_load:$path"; 1997 my $guard = cf::lock_acquire "map_data:$path";
1895 1998
1999 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 2000 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 2001
1898 $self->in_memory (cf::MAP_LOADING); 2002 $self->in_memory (cf::MAP_LOADING);
1899 2003
1900 $self->alloc; 2004 $self->alloc;
1901 2005
1902 $self->pre_load; 2006 $self->pre_load;
1903 Coro::cede; 2007 cf::cede_to_tick;
1904 2008
2009 my $f = new_from_file cf::object::thawer $self->{load_path};
2010 $f->skip_block;
1905 $self->_load_objects ($self->{load_path}, 1) 2011 $self->_load_objects ($f)
1906 or return; 2012 or return;
1907 2013
1908 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2014 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1909 if delete $self->{load_original}; 2015 if delete $self->{load_original};
1910 2016
1911 if (my $uniq = $self->uniq_path) { 2017 if (my $uniq = $self->uniq_path) {
1912 utf8::encode $uniq; 2018 utf8::encode $uniq;
1913 if (aio_open $uniq, O_RDONLY, 0) { 2019 unless (aio_stat $uniq) {
2020 if (my $f = new_from_file cf::object::thawer $uniq) {
1914 $self->clear_unique_items; 2021 $self->clear_unique_items;
1915 $self->_load_objects ($uniq, 0); 2022 $self->_load_objects ($f);
2023 $f->resolve_delayed_derefs;
2024 }
1916 } 2025 }
1917 } 2026 }
1918 2027
1919 Coro::cede; 2028 $f->resolve_delayed_derefs;
2029
2030 cf::cede_to_tick;
1920 # now do the right thing for maps 2031 # now do the right thing for maps
1921 $self->link_multipart_objects; 2032 $self->link_multipart_objects;
1922 $self->difficulty ($self->estimate_difficulty) 2033 $self->difficulty ($self->estimate_difficulty)
1923 unless $self->difficulty; 2034 unless $self->difficulty;
1924 Coro::cede; 2035 cf::cede_to_tick;
1925 2036
1926 unless ($self->{deny_activate}) { 2037 unless ($self->{deny_activate}) {
1927 $self->decay_objects; 2038 $self->decay_objects;
1928 $self->fix_auto_apply; 2039 $self->fix_auto_apply;
1929 $self->update_buttons; 2040 $self->update_buttons;
1930 Coro::cede; 2041 cf::cede_to_tick;
1931 $self->set_darkness_map; 2042 $self->set_darkness_map;
1932 Coro::cede; 2043 cf::cede_to_tick;
1933 $self->activate; 2044 $self->activate;
1934 } 2045 }
1935 2046
1936 $self->{last_save} = $cf::RUNTIME; 2047 $self->{last_save} = $cf::RUNTIME;
1937 $self->last_access ($cf::RUNTIME); 2048 $self->last_access ($cf::RUNTIME);
… …
1953 2064
1954 $self 2065 $self
1955} 2066}
1956 2067
1957# find and load all maps in the 3x3 area around a map 2068# find and load all maps in the 3x3 area around a map
1958sub load_diag { 2069sub load_neighbours {
1959 my ($map) = @_; 2070 my ($map) = @_;
1960 2071
1961 my @diag; # diagonal neighbours 2072 my @neigh; # diagonal neighbours
1962 2073
1963 for (0 .. 3) { 2074 for (0 .. 3) {
1964 my $neigh = $map->tile_path ($_) 2075 my $neigh = $map->tile_path ($_)
1965 or next; 2076 or next;
1966 $neigh = find $neigh, $map 2077 $neigh = find $neigh, $map
1967 or next; 2078 or next;
1968 $neigh->load; 2079 $neigh->load;
1969 2080
2081 push @neigh,
1970 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2082 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1971 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2083 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1972 } 2084 }
1973 2085
1974 for (@diag) { 2086 for (grep defined $_->[0], @neigh) {
2087 my ($path, $origin) = @$_;
1975 my $neigh = find @$_ 2088 my $neigh = find $path, $origin
1976 or next; 2089 or next;
1977 $neigh->load; 2090 $neigh->load;
1978 } 2091 }
1979} 2092}
1980 2093
… …
1985} 2098}
1986 2099
1987sub do_load_sync { 2100sub do_load_sync {
1988 my ($map) = @_; 2101 my ($map) = @_;
1989 2102
2103 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2104 if $Coro::current == $Coro::main;
2105
1990 cf::sync_job { $map->load }; 2106 cf::sync_job { $map->load };
1991} 2107}
1992 2108
1993our %MAP_PREFETCH; 2109our %MAP_PREFETCH;
1994our $MAP_PREFETCHER = undef; 2110our $MAP_PREFETCHER = undef;
1995 2111
1996sub find_async { 2112sub find_async {
1997 my ($path, $origin) = @_; 2113 my ($path, $origin, $load) = @_;
1998 2114
1999 $path = normalise $path, $origin && $origin->{path}; 2115 $path = normalise $path, $origin && $origin->{path};
2000 2116
2001 if (my $map = $cf::MAP{$path}) { 2117 if (my $map = $cf::MAP{$path}) {
2002 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2118 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
2003 } 2119 }
2004 2120
2005 undef $MAP_PREFETCH{$path}; 2121 $MAP_PREFETCH{$path} |= $load;
2122
2006 $MAP_PREFETCHER ||= cf::async { 2123 $MAP_PREFETCHER ||= cf::async {
2124 $Coro::current->{desc} = "map prefetcher";
2125
2007 while (%MAP_PREFETCH) { 2126 while (%MAP_PREFETCH) {
2008 for my $path (keys %MAP_PREFETCH) { 2127 while (my ($k, $v) = each %MAP_PREFETCH) {
2009 if (my $map = find $path) { 2128 if (my $map = find $k) {
2010 $map->load; 2129 $map->load if $v;
2011 } 2130 }
2012 2131
2013 delete $MAP_PREFETCH{$path}; 2132 delete $MAP_PREFETCH{$k};
2014 } 2133 }
2015 } 2134 }
2016 undef $MAP_PREFETCHER; 2135 undef $MAP_PREFETCHER;
2017 }; 2136 };
2018 $MAP_PREFETCHER->prio (6); 2137 $MAP_PREFETCHER->prio (6);
… …
2021} 2140}
2022 2141
2023sub save { 2142sub save {
2024 my ($self) = @_; 2143 my ($self) = @_;
2025 2144
2026 my $lock = cf::lock_acquire "map_data:" . $self->path; 2145 my $lock = cf::lock_acquire "map_data:$self->{path}";
2027 2146
2028 $self->{last_save} = $cf::RUNTIME; 2147 $self->{last_save} = $cf::RUNTIME;
2029 2148
2030 return unless $self->dirty; 2149 return unless $self->dirty;
2031 2150
… …
2037 return if $self->{deny_save}; 2156 return if $self->{deny_save};
2038 2157
2039 local $self->{last_access} = $self->last_access;#d# 2158 local $self->{last_access} = $self->last_access;#d#
2040 2159
2041 cf::async { 2160 cf::async {
2161 $Coro::current->{desc} = "map player save";
2042 $_->contr->save for $self->players; 2162 $_->contr->save for $self->players;
2043 }; 2163 };
2044 2164
2045 if ($uniq) { 2165 if ($uniq) {
2046 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2054 my ($self) = @_; 2174 my ($self) = @_;
2055 2175
2056 # save first because save cedes 2176 # save first because save cedes
2057 $self->save; 2177 $self->save;
2058 2178
2059 my $lock = cf::lock_acquire "map_data:" . $self->path; 2179 my $lock = cf::lock_acquire "map_data:$self->{path}";
2060 2180
2061 return if $self->players; 2181 return if $self->players;
2062 return if $self->in_memory != cf::MAP_IN_MEMORY; 2182 return if $self->in_memory != cf::MAP_IN_MEMORY;
2063 return if $self->{deny_save}; 2183 return if $self->{deny_save};
2064 2184
2185 $self->in_memory (cf::MAP_SWAPPED);
2186
2187 $self->deactivate;
2188 $_->clear_links_to ($self) for values %cf::MAP;
2065 $self->clear; 2189 $self->clear;
2066 $self->in_memory (cf::MAP_SWAPPED);
2067} 2190}
2068 2191
2069sub reset_at { 2192sub reset_at {
2070 my ($self) = @_; 2193 my ($self) = @_;
2071 2194
… …
2103 if $uniq; 2226 if $uniq;
2104 } 2227 }
2105 2228
2106 delete $cf::MAP{$self->path}; 2229 delete $cf::MAP{$self->path};
2107 2230
2231 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP;
2108 $self->clear; 2233 $self->clear;
2109
2110 $_->clear_links_to ($self) for values %cf::MAP;
2111 2234
2112 $self->unlink_save; 2235 $self->unlink_save;
2113 $self->destroy; 2236 $self->destroy;
2114} 2237}
2115 2238
2116my $nuke_counter = "aaaa"; 2239my $nuke_counter = "aaaa";
2117 2240
2118sub nuke { 2241sub nuke {
2119 my ($self) = @_; 2242 my ($self) = @_;
2120 2243
2244 {
2245 my $lock = cf::lock_acquire "map_data:$self->{path}";
2246
2121 delete $cf::MAP{$self->path}; 2247 delete $cf::MAP{$self->path};
2122 2248
2123 $self->unlink_save; 2249 $self->unlink_save;
2124 2250
2125 bless $self, "cf::map"; 2251 bless $self, "cf::map";
2126 delete $self->{deny_reset}; 2252 delete $self->{deny_reset};
2127 $self->{deny_save} = 1; 2253 $self->{deny_save} = 1;
2128 $self->reset_timeout (1); 2254 $self->reset_timeout (1);
2129 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2255 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2130 2256
2131 $cf::MAP{$self->path} = $self; 2257 $cf::MAP{$self->path} = $self;
2258 }
2132 2259
2133 $self->reset; # polite request, might not happen 2260 $self->reset; # polite request, might not happen
2134} 2261}
2135 2262
2136=item $maps = cf::map::tmp_maps 2263=item $maps = cf::map::tmp_maps
… …
2212 2339
2213sub inv_recursive { 2340sub inv_recursive {
2214 inv_recursive_ inv $_[0] 2341 inv_recursive_ inv $_[0]
2215} 2342}
2216 2343
2344=item $ref = $ob->ref
2345
2346creates and returns a persistent reference to an objetc that can be stored as a string.
2347
2348=item $ob = cf::object::deref ($refstring)
2349
2350returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2351even if the object actually exists. May block.
2352
2353=cut
2354
2355sub deref {
2356 my ($ref) = @_;
2357
2358 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2359 my ($uuid, $name) = ($1, $2);
2360 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2361 or return;
2362 $pl->ob->uuid eq $uuid
2363 or return;
2364
2365 $pl->ob
2366 } else {
2367 warn "$ref: cannot resolve object reference\n";
2368 undef
2369 }
2370}
2371
2217package cf; 2372package cf;
2218 2373
2219=back 2374=back
2220 2375
2221=head3 cf::object::player 2376=head3 cf::object::player
… …
2349 # use -1 or undef as default coordinates, not 0, 0 2504 # use -1 or undef as default coordinates, not 0, 0
2350 ($x, $y) = ($map->enter_x, $map->enter_y) 2505 ($x, $y) = ($map->enter_x, $map->enter_y)
2351 if $x <=0 && $y <= 0; 2506 if $x <=0 && $y <= 0;
2352 2507
2353 $map->load; 2508 $map->load;
2354 $map->load_diag; 2509 $map->load_neighbours;
2355 2510
2356 return unless $self->contr->active; 2511 return unless $self->contr->active;
2357 $self->activate_recursive; 2512 $self->activate_recursive;
2358 2513
2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2514 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2379 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2534 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2380 2535
2381 $self->enter_link; 2536 $self->enter_link;
2382 2537
2383 (async { 2538 (async {
2539 $Coro::current->{desc} = "player::goto $path $x $y";
2540
2541 # *tag paths override both path and x|y
2542 if ($path =~ /^\*(.*)$/) {
2543 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2544 my $ob = $obs[rand @obs];
2545
2546 # see if we actually can go there
2547 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2548 $ob = $obs[rand @obs];
2549 } else {
2550 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2551 }
2552 # else put us there anyways for now #d#
2553
2554 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2555 } else {
2556 ($path, $x, $y) = (undef, undef, undef);
2557 }
2558 }
2559
2384 my $map = eval { 2560 my $map = eval {
2385 my $map = cf::map::find $path; 2561 my $map = defined $path ? cf::map::find $path : undef;
2386 2562
2387 if ($map) { 2563 if ($map) {
2388 $map = $map->customise_for ($self); 2564 $map = $map->customise_for ($self);
2389 $map = $check->($map) if $check && $map; 2565 $map = $check->($map) if $check && $map;
2390 } else { 2566 } else {
2391 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2567 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2392 } 2568 }
2393 2569
2394 $map 2570 $map
2395 }; 2571 };
2396 2572
… …
2486 # if exit is damned, update players death & WoR home-position 2662 # if exit is damned, update players death & WoR home-position
2487 $self->contr->savebed ($slaying, $hp, $sp) 2663 $self->contr->savebed ($slaying, $hp, $sp)
2488 if $exit->flag (FLAG_DAMNED); 2664 if $exit->flag (FLAG_DAMNED);
2489 2665
2490 (async { 2666 (async {
2667 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2668
2491 $self->deactivate_recursive; # just to be sure 2669 $self->deactivate_recursive; # just to be sure
2492 unless (eval { 2670 unless (eval {
2493 $self->goto ($slaying, $hp, $sp); 2671 $self->goto ($slaying, $hp, $sp);
2494 2672
2495 1; 2673 1;
… …
2530the message, with C<log> being the default. If C<$color> is negative, suppress 2708the message, with C<log> being the default. If C<$color> is negative, suppress
2531the message unless the client supports the msg packet. 2709the message unless the client supports the msg packet.
2532 2710
2533=cut 2711=cut
2534 2712
2713# non-persistent channels (usually the info channel)
2714our %CHANNEL = (
2715 "c/identify" => {
2716 id => "infobox",
2717 title => "Identify",
2718 reply => undef,
2719 tooltip => "Items recently identified",
2720 },
2721 "c/examine" => {
2722 id => "infobox",
2723 title => "Examine",
2724 reply => undef,
2725 tooltip => "Signs and other items you examined",
2726 },
2727 "c/book" => {
2728 id => "infobox",
2729 title => "Book",
2730 reply => undef,
2731 tooltip => "The contents of a note or book",
2732 },
2733 "c/lookat" => {
2734 id => "infobox",
2735 title => "Look",
2736 reply => undef,
2737 tooltip => "What you saw there",
2738 },
2739 "c/who" => {
2740 id => "infobox",
2741 title => "Players",
2742 reply => undef,
2743 tooltip => "Shows players who are currently online",
2744 },
2745 "c/body" => {
2746 id => "infobox",
2747 title => "Body Parts",
2748 reply => undef,
2749 tooltip => "Shows which body parts you posess and are available",
2750 },
2751 "c/uptime" => {
2752 id => "infobox",
2753 title => "Uptime",
2754 reply => undef,
2755 tooltip => "How long the server has been running since last restart",
2756 },
2757 "c/mapinfo" => {
2758 id => "infobox",
2759 title => "Map Info",
2760 reply => undef,
2761 tooltip => "Information related to the maps",
2762 },
2763);
2764
2535sub cf::client::send_msg { 2765sub cf::client::send_msg {
2536 my ($self, $channel, $msg, $color, @extra) = @_; 2766 my ($self, $channel, $msg, $color, @extra) = @_;
2537 2767
2538 $msg = $self->pl->expand_cfpod ($msg); 2768 $msg = $self->pl->expand_cfpod ($msg);
2539 2769
2540 $color &= cf::NDI_CLIENT_MASK; # just in case... 2770 $color &= cf::NDI_CLIENT_MASK; # just in case...
2541 2771
2772 # check predefined channels, for the benefit of C
2773 if ($CHANNEL{$channel}) {
2774 $channel = $CHANNEL{$channel};
2775
2776 $self->ext_msg (channel_info => $channel)
2777 if $self->can_msg;
2778
2779 $channel = $channel->{id};
2780
2542 if (ref $channel) { 2781 } elsif (ref $channel) {
2543 # send meta info to client, if not yet sent 2782 # send meta info to client, if not yet sent
2544 unless (exists $self->{channel}{$channel->{id}}) { 2783 unless (exists $self->{channel}{$channel->{id}}) {
2545 $self->{channel}{$channel->{id}} = $channel; 2784 $self->{channel}{$channel->{id}} = $channel;
2546 $self->ext_msg (channel_info => $channel); 2785 $self->ext_msg (channel_info => $channel)
2786 if $self->can_msg;
2547 } 2787 }
2548 2788
2549 $channel = $channel->{id}; 2789 $channel = $channel->{id};
2550 } 2790 }
2551 2791
… …
2573 $color &= cf::NDI_COLOR_MASK; 2813 $color &= cf::NDI_COLOR_MASK;
2574 2814
2575 utf8::encode $msg; 2815 utf8::encode $msg;
2576 2816
2577 if (0 && $msg =~ /\[/) { 2817 if (0 && $msg =~ /\[/) {
2818 # COMMAND/INFO
2578 $self->send_packet ("drawextinfo $color 4 0 $msg") 2819 $self->send_packet ("drawextinfo $color 10 8 $msg")
2579 } else { 2820 } else {
2580 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2821 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2581 $self->send_packet ("drawinfo $color $msg") 2822 $self->send_packet ("drawinfo $color $msg")
2582 } 2823 }
2583 } 2824 }
… …
2591=cut 2832=cut
2592 2833
2593sub cf::client::ext_msg($$@) { 2834sub cf::client::ext_msg($$@) {
2594 my ($self, $type, @msg) = @_; 2835 my ($self, $type, @msg) = @_;
2595 2836
2596 my $extcmd = $self->extcmd;
2597
2598 if ($extcmd == 2) { 2837 if ($self->extcmd == 2) {
2599 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2838 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2600 } elsif ($extcmd == 1) { # TODO: remove 2839 } elsif ($self->extcmd == 1) { # TODO: remove
2601 push @msg, msgtype => "event_$type"; 2840 push @msg, msgtype => "event_$type";
2841 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2842 }
2843}
2844
2845=item $client->ext_reply ($msgid, @msg)
2846
2847Sends an ext reply to the client.
2848
2849=cut
2850
2851sub cf::client::ext_reply($$@) {
2852 my ($self, $id, @msg) = @_;
2853
2854 if ($self->extcmd == 2) {
2855 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2856 } elsif ($self->extcmd == 1) {
2857 #TODO: version 1, remove
2858 unshift @msg, msgtype => "reply", msgid => $id;
2602 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2859 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2603 } 2860 }
2604} 2861}
2605 2862
2606=item $success = $client->query ($flags, "text", \&cb) 2863=item $success = $client->query ($flags, "text", \&cb)
… …
2668 my ($type, $reply, @payload) = 2925 my ($type, $reply, @payload) =
2669 "ARRAY" eq ref $msg 2926 "ARRAY" eq ref $msg
2670 ? @$msg 2927 ? @$msg
2671 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2928 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2672 2929
2930 my @reply;
2931
2673 if (my $cb = $EXTICMD{$type}) { 2932 if (my $cb = $EXTICMD{$type}) {
2674 my @reply = $cb->($ns, @payload); 2933 @reply = $cb->($ns, @payload);
2675
2676 $ns->ext_reply ($reply, @reply)
2677 if $reply;
2678 } 2934 }
2935
2936 $ns->ext_reply ($reply, @reply)
2937 if $reply;
2938
2679 } else { 2939 } else {
2680 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2940 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2681 } 2941 }
2682 2942
2683 cf::override; 2943 cf::override;
… …
2743=pod 3003=pod
2744 3004
2745The following functions and methods are available within a safe environment: 3005The following functions and methods are available within a safe environment:
2746 3006
2747 cf::object 3007 cf::object
2748 contr pay_amount pay_player map x y force_find force_add 3008 contr pay_amount pay_player map x y force_find force_add destroy
2749 insert remove name archname title slaying race 3009 insert remove name archname title slaying race decrease_ob_nr
2750 3010
2751 cf::object::player 3011 cf::object::player
2752 player 3012 player
2753 3013
2754 cf::player 3014 cf::player
… …
2759 3019
2760=cut 3020=cut
2761 3021
2762for ( 3022for (
2763 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3023 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2764 insert remove inv name archname title slaying race)], 3024 insert remove inv name archname title slaying race
3025 decrease_ob_nr destroy)],
2765 ["cf::object::player" => qw(player)], 3026 ["cf::object::player" => qw(player)],
2766 ["cf::player" => qw(peaceful)], 3027 ["cf::player" => qw(peaceful)],
2767 ["cf::map" => qw(trigger)], 3028 ["cf::map" => qw(trigger)],
2768) { 3029) {
2769 no strict 'refs'; 3030 no strict 'refs';
… …
2845# the server's init and main functions 3106# the server's init and main functions
2846 3107
2847sub load_facedata($) { 3108sub load_facedata($) {
2848 my ($path) = @_; 3109 my ($path) = @_;
2849 3110
3111 # HACK to clear player env face cache, we need some signal framework
3112 # for this (global event?)
3113 %ext::player_env::MUSIC_FACE_CACHE = ();
3114
3115 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3116
2850 warn "loading facedata from $path\n"; 3117 warn "loading facedata from $path\n";
2851 3118
2852 my $facedata; 3119 my $facedata;
2853 0 < aio_load $path, $facedata 3120 0 < aio_load $path, $facedata
2854 or die "$path: $!"; 3121 or die "$path: $!";
2855 3122
2856 $facedata = Coro::Storable::thaw $facedata; 3123 $facedata = Coro::Storable::thaw $facedata;
2857 3124
2858 $facedata->{version} == 2 3125 $facedata->{version} == 2
2859 or cf::cleanup "$path: version mismatch, cannot proceed."; 3126 or cf::cleanup "$path: version mismatch, cannot proceed.";
3127
3128 # patch in the exptable
3129 $facedata->{resource}{"res/exp_table"} = {
3130 type => FT_RSRC,
3131 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3132 };
3133 cf::cede_to_tick;
2860 3134
2861 { 3135 {
2862 my $faces = $facedata->{faceinfo}; 3136 my $faces = $facedata->{faceinfo};
2863 3137
2864 while (my ($face, $info) = each %$faces) { 3138 while (my ($face, $info) = each %$faces) {
2865 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3139 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2866 cf::face::set_visibility $idx, $info->{visibility}; 3140 cf::face::set_visibility $idx, $info->{visibility};
2867 cf::face::set_magicmap $idx, $info->{magicmap}; 3141 cf::face::set_magicmap $idx, $info->{magicmap};
2868 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3142 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2869 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3143 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2870 3144
2871 cf::cede_to_tick; 3145 cf::cede_to_tick;
2872 } 3146 }
2873 3147
2874 while (my ($face, $info) = each %$faces) { 3148 while (my ($face, $info) = each %$faces) {
… …
2899 3173
2900 { 3174 {
2901 # TODO: for gcfclient pleasure, we should give resources 3175 # TODO: for gcfclient pleasure, we should give resources
2902 # that gcfclient doesn't grok a >10000 face index. 3176 # that gcfclient doesn't grok a >10000 face index.
2903 my $res = $facedata->{resource}; 3177 my $res = $facedata->{resource};
2904 my $enc = JSON::XS->new->utf8->canonical;
2905 3178
2906 my $soundconf = delete $res->{"res/sound.conf"}; 3179 my $soundconf = delete $res->{"res/sound.conf"};
2907 3180
2908 while (my ($name, $info) = each %$res) { 3181 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; 3182 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3183 my $data;
2915 3184
2916 if ($info->{type} & 1) { 3185 if ($info->{type} & 1) {
2917 # prepend meta info 3186 # prepend meta info
2918 3187
3188 my $meta = $enc->encode ({
3189 name => $name,
3190 %{ $info->{meta} || {} },
3191 });
3192
2919 my $data = pack "(w/a*)*", $meta, $info->{data}; 3193 $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 { 3194 } else {
2924 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3195 $data = $info->{data};
2925 } 3196 }
2926 3197
3198 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2927 cf::face::set_type $idx, $info->{type}; 3199 cf::face::set_type $idx, $info->{type};
2928 3200
2929 cf::cede_to_tick; 3201 cf::cede_to_tick;
2930 } 3202 }
2931 3203
… …
2958 $ns->fx_want ($k, $v); 3230 $ns->fx_want ($k, $v);
2959 } 3231 }
2960}; 3232};
2961 3233
2962sub reload_regions { 3234sub reload_regions {
3235 # HACK to clear player env face cache, we need some signal framework
3236 # for this (global event?)
3237 %ext::player_env::MUSIC_FACE_CACHE = ();
3238
2963 load_resource_file "$MAPDIR/regions" 3239 load_resource_file "$MAPDIR/regions"
2964 or die "unable to load regions file\n"; 3240 or die "unable to load regions file\n";
2965 3241
2966 for (cf::region::list) { 3242 for (cf::region::list) {
2967 $_->{match} = qr/$_->{match}/ 3243 $_->{match} = qr/$_->{match}/
… …
3003 3279
3004sub init { 3280sub init {
3005 reload_resources; 3281 reload_resources;
3006} 3282}
3007 3283
3008sub cfg_load { 3284sub reload_config {
3009 open my $fh, "<:utf8", "$CONFDIR/config" 3285 open my $fh, "<:utf8", "$CONFDIR/config"
3010 or return; 3286 or return;
3011 3287
3012 local $/; 3288 local $/;
3013 *CFG = YAML::Syck::Load <$fh>; 3289 *CFG = YAML::Syck::Load <$fh>;
… …
3029sub main { 3305sub main {
3030 # we must not ever block the main coroutine 3306 # we must not ever block the main coroutine
3031 local $Coro::idle = sub { 3307 local $Coro::idle = sub {
3032 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3308 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3033 (async { 3309 (async {
3310 $Coro::current->{desc} = "IDLE BUG HANDLER";
3034 Event::one_event; 3311 Event::one_event;
3035 })->prio (Coro::PRIO_MAX); 3312 })->prio (Coro::PRIO_MAX);
3036 }; 3313 };
3037 3314
3038 cfg_load; 3315 reload_config;
3039 db_init; 3316 db_init;
3040 load_extensions; 3317 load_extensions;
3041 3318
3042 $TICK_WATCHER->start; 3319 $TICK_WATCHER->start;
3043 Event::loop; 3320 Event::loop;
… …
3110 # and maps saved/destroyed asynchronously. 3387 # and maps saved/destroyed asynchronously.
3111 warn "begin emergency player save\n"; 3388 warn "begin emergency player save\n";
3112 for my $login (keys %cf::PLAYER) { 3389 for my $login (keys %cf::PLAYER) {
3113 my $pl = $cf::PLAYER{$login} or next; 3390 my $pl = $cf::PLAYER{$login} or next;
3114 $pl->valid or next; 3391 $pl->valid or next;
3392 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3115 $pl->save; 3393 $pl->save;
3116 } 3394 }
3117 warn "end emergency player save\n"; 3395 warn "end emergency player save\n";
3118 3396
3119 warn "begin emergency map save\n"; 3397 warn "begin emergency map save\n";
… …
3167 3445
3168 warn "flushing outstanding aio requests"; 3446 warn "flushing outstanding aio requests";
3169 for (;;) { 3447 for (;;) {
3170 BDB::flush; 3448 BDB::flush;
3171 IO::AIO::flush; 3449 IO::AIO::flush;
3172 Coro::cede; 3450 Coro::cede_notself;
3173 last unless IO::AIO::nreqs || BDB::nreqs; 3451 last unless IO::AIO::nreqs || BDB::nreqs;
3174 warn "iterate..."; 3452 warn "iterate...";
3175 } 3453 }
3176 3454
3177 ++$RELOAD; 3455 ++$RELOAD;
… …
3236 warn "reloading cf.pm"; 3514 warn "reloading cf.pm";
3237 require cf; 3515 require cf;
3238 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3516 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3239 3517
3240 warn "loading config and database again"; 3518 warn "loading config and database again";
3241 cf::cfg_load; 3519 cf::reload_config;
3242 3520
3243 warn "loading extensions"; 3521 warn "loading extensions";
3244 cf::load_extensions; 3522 cf::load_extensions;
3245 3523
3246 warn "reattaching attachments to objects/players"; 3524 warn "reattaching attachments to objects/players";
… …
3282register_command "reload" => sub { 3560register_command "reload" => sub {
3283 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
3284 3562
3285 if ($who->flag (FLAG_WIZ)) { 3563 if ($who->flag (FLAG_WIZ)) {
3286 $who->message ("reloading server."); 3564 $who->message ("reloading server.");
3565 async {
3566 $Coro::current->{desc} = "perl_reload";
3287 async { reload_perl }; 3567 reload_perl;
3568 };
3288 } 3569 }
3289}; 3570};
3290 3571
3291unshift @INC, $LIBDIR; 3572unshift @INC, $LIBDIR;
3292 3573
… …
3311 my $signal = new Coro::Signal; 3592 my $signal = new Coro::Signal;
3312 push @WAIT_FOR_TICK_BEGIN, $signal; 3593 push @WAIT_FOR_TICK_BEGIN, $signal;
3313 $signal->wait; 3594 $signal->wait;
3314} 3595}
3315 3596
3316 my $min = 1e6;#d#
3317 my $avg = 10;
3318$TICK_WATCHER = Event->timer ( 3597$TICK_WATCHER = Event->timer (
3319 reentrant => 0, 3598 reentrant => 0,
3320 parked => 1, 3599 parked => 1,
3321 prio => 0, 3600 prio => 0,
3322 at => $NEXT_TICK || $TICK, 3601 at => $NEXT_TICK || $TICK,
… …
3330 3609
3331 $NOW = $tick_start = Event::time; 3610 $NOW = $tick_start = Event::time;
3332 3611
3333 cf::server_tick; # one server iteration 3612 cf::server_tick; # one server iteration
3334 3613
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; 3614 $RUNTIME += $TICK;
3359 $NEXT_TICK += $TICK; 3615 $NEXT_TICK += $TICK;
3360 3616
3361 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3617 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3362 $NEXT_RUNTIME_WRITE = $NOW + 10; 3618 $NEXT_RUNTIME_WRITE = $NOW + 10;
3363 Coro::async_pool { 3619 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver";
3364 write_runtime 3621 write_runtime
3365 or warn "ERROR: unable to write runtime file: $!"; 3622 or warn "ERROR: unable to write runtime file: $!";
3366 }; 3623 };
3367 } 3624 }
3368 3625
3369# my $AFTER = Event::time;
3370# warn $AFTER - $NOW;#d#
3371
3372 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3373 $sig->send; 3627 $sig->send;
3374 } 3628 }
3375 while (my $sig = shift @WAIT_FOR_TICK) { 3629 while (my $sig = shift @WAIT_FOR_TICK) {
3376 $sig->send; 3630 $sig->send;
… …
3386 3640
3387 $LOAD = ($NOW - $tick_start) / $TICK; 3641 $LOAD = ($NOW - $tick_start) / $TICK;
3388 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3642 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3389 3643
3390 _post_tick; 3644 _post_tick;
3391
3392
3393 }, 3645 },
3394); 3646);
3395 3647
3396{ 3648{
3649 BDB::min_parallel 8;
3397 BDB::max_poll_time $TICK * 0.1; 3650 BDB::max_poll_time $TICK * 0.1;
3398 $BDB_POLL_WATCHER = Event->io ( 3651 $BDB_POLL_WATCHER = Event->io (
3399 reentrant => 0, 3652 reentrant => 0,
3400 fd => BDB::poll_fileno, 3653 fd => BDB::poll_fileno,
3401 poll => 'r', 3654 poll => 'r',
3402 prio => 0, 3655 prio => 0,
3403 data => WF_AUTOCANCEL, 3656 data => WF_AUTOCANCEL,
3404 cb => \&BDB::poll_cb, 3657 cb => \&BDB::poll_cb,
3405 ); 3658 );
3406 BDB::min_parallel 8;
3407 3659
3408 BDB::set_sync_prepare { 3660 BDB::set_sync_prepare {
3409 my $status; 3661 my $status;
3410 my $current = $Coro::current; 3662 my $current = $Coro::current;
3411 ( 3663 (
… …
3420 ) 3672 )
3421 }; 3673 };
3422 3674
3423 unless ($DB_ENV) { 3675 unless ($DB_ENV) {
3424 $DB_ENV = BDB::db_env_create; 3676 $DB_ENV = BDB::db_env_create;
3677 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3678 | BDB::LOG_AUTOREMOVE, 1);
3679 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3680 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3425 3681
3426 cf::sync_job { 3682 cf::sync_job {
3427 eval { 3683 eval {
3428 BDB::db_env_open 3684 BDB::db_env_open
3429 $DB_ENV, 3685 $DB_ENV,
… …
3431 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3687 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3432 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3688 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3433 0666; 3689 0666;
3434 3690
3435 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3691 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 }; 3692 };
3440 3693
3441 cf::cleanup "db_env_open(db): $@" if $@; 3694 cf::cleanup "db_env_open(db): $@" if $@;
3442 }; 3695 };
3443 } 3696 }
3697
3698 $BDB_DEADLOCK_WATCHER = Event->timer (
3699 after => 3,
3700 interval => 1,
3701 hard => 1,
3702 prio => 0,
3703 data => WF_AUTOCANCEL,
3704 cb => sub {
3705 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3706 },
3707 );
3708 $BDB_CHECKPOINT_WATCHER = Event->timer (
3709 after => 11,
3710 interval => 60,
3711 hard => 1,
3712 prio => 0,
3713 data => WF_AUTOCANCEL,
3714 cb => sub {
3715 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3716 },
3717 );
3718 $BDB_TRICKLE_WATCHER = Event->timer (
3719 after => 5,
3720 interval => 10,
3721 hard => 1,
3722 prio => 0,
3723 data => WF_AUTOCANCEL,
3724 cb => sub {
3725 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3726 },
3727 );
3444} 3728}
3445 3729
3446{ 3730{
3447 IO::AIO::min_parallel 8; 3731 IO::AIO::min_parallel 8;
3448 3732
… …
3451 $AIO_POLL_WATCHER = Event->io ( 3735 $AIO_POLL_WATCHER = Event->io (
3452 reentrant => 0, 3736 reentrant => 0,
3453 data => WF_AUTOCANCEL, 3737 data => WF_AUTOCANCEL,
3454 fd => IO::AIO::poll_fileno, 3738 fd => IO::AIO::poll_fileno,
3455 poll => 'r', 3739 poll => 'r',
3456 prio => 6, 3740 prio => 0,
3457 cb => \&IO::AIO::poll_cb, 3741 cb => \&IO::AIO::poll_cb,
3458 ); 3742 );
3459} 3743}
3460 3744
3461my $_log_backtrace; 3745my $_log_backtrace;
… …
3467 3751
3468 # limit the # of concurrent backtraces 3752 # limit the # of concurrent backtraces
3469 if ($_log_backtrace < 2) { 3753 if ($_log_backtrace < 2) {
3470 ++$_log_backtrace; 3754 ++$_log_backtrace;
3471 async { 3755 async {
3756 $Coro::current->{desc} = "abt $msg";
3757
3472 my @bt = fork_call { 3758 my @bt = fork_call {
3473 @addr = map { sprintf "%x", $_ } @addr; 3759 @addr = map { sprintf "%x", $_ } @addr;
3474 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3760 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3475 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3761 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3476 or die "addr2line: $!"; 3762 or die "addr2line: $!";

Diff Legend

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