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.326 by root, Tue Jul 31 17:33:15 2007 UTC vs.
Revision 1.392 by root, Fri Oct 26 04:44:54 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
… …
1370 $self->{deny_save} = 1; 1424 $self->{deny_save} = 1;
1371 1425
1372 $cf::PLAYER{$login} = $self; 1426 $cf::PLAYER{$login} = $self;
1373 1427
1374 $self 1428 $self
1429}
1430
1431=item $player->send_msg ($channel, $msg, $color, [extra...])
1432
1433=cut
1434
1435sub send_msg {
1436 my $ns = shift->ns
1437 or return;
1438 $ns->send_msg (@_);
1375} 1439}
1376 1440
1377=item $pl->quit_character 1441=item $pl->quit_character
1378 1442
1379Nukes the player without looking back. If logged in, the connection will 1443Nukes the player without looking back. If logged in, the connection will
… …
1434 or return []; 1498 or return [];
1435 1499
1436 my @logins; 1500 my @logins;
1437 1501
1438 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") {
1439 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440 aio_read $fh, 0, 512, my $buf, 0 or next; 1508 aio_read $fh, 0, 512, my $buf, 0 or next;
1441 $buf !~ /^password -------------$/m or next; # official not-valid tag 1509 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 }
1442 1511
1443 utf8::decode $login; 1512 utf8::decode $login;
1444 push @logins, $login; 1513 push @logins, $login;
1445 } 1514 }
1446 1515
… …
1479 1548
1480Expand crossfire pod fragments into protocol xml. 1549Expand crossfire pod fragments into protocol xml.
1481 1550
1482=cut 1551=cut
1483 1552
1553 use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 (?:
1558 \ (.*?)\ (?{ $group = $^N })
1559 | < (??{$interior}) >
1560 )
1561}x;
1562
1484sub expand_cfpod { 1563sub expand_cfpod {
1485 ((my $self), (local $_)) = @_; 1564 my ($self, $pod) = @_;
1486 1565
1487 # escape & and < 1566 my $xml;
1488 s/&/&amp;/g;
1489 s/(?<![BIUGH])</&lt;/g;
1490 1567
1491 # this is buggy, it needs to properly take care of nested <'s 1568 while () {
1569 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1570 $group = $1;
1492 1571
1493 1 while 1572 $group =~ s/&/&amp;/g;
1494 # replace B<>, I<>, U<> etc. 1573 $group =~ s/</&lt;/g;
1495 s/B<([^\>]*)>/<b>$1<\/b>/ 1574
1496 || s/I<([^\>]*)>/<i>$1<\/i>/ 1575 $xml .= $group;
1497 || s/U<([^\>]*)>/<u>$1<\/u>/ 1576 } elsif ($pod =~ m%\G
1498 # replace G<male|female> tags 1577 ([BCGHITU])
1499 || s{G<([^>|]*)\|([^>]*)>}{ 1578 <
1500 $self->gender ? $2 : $1 1579 (?:
1501 }ge 1580 ([^<>]*) (?{ $group = $^N })
1502 # replace H<hint text> 1581 | < $interior >
1503 || s{H<([^\>]*)>} 1582 )
1583 >
1584 %gcsx
1504 { 1585 ) {
1586 my ($code, $data) = ($1, $group);
1587
1588 if ($code eq "B") {
1589 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1590 } elsif ($code eq "I") {
1591 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1592 } elsif ($code eq "U") {
1593 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1594 } elsif ($code eq "C") {
1595 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1596 } elsif ($code eq "T") {
1597 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1598 } elsif ($code eq "G") {
1599 my ($male, $female) = split /\|/, $data;
1600 $data = $self->gender ? $female : $male;
1601 $xml .= expand_cfpod ($self, $data);
1602 } elsif ($code eq "H") {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1603 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1604 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "") 1605 "")
1508 [$self->{hintmode}] 1606 [$self->{hintmode}];
1607 } else {
1608 $xml .= "error processing '$code($data)' directive";
1509 }ge; 1609 }
1610 } else {
1611 if ($pod =~ /\G(.+)/) {
1612 warn "parse error while expanding $pod (at $1)";
1613 }
1614 last;
1615 }
1616 }
1510 1617
1618 for ($xml) {
1511 # create single paragraphs (very hackish) 1619 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g; 1620 s/(?<=\S)\n(?=\w)/ /g;
1513 1621
1514 # compress some whitespace 1622 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends 1623 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines 1624 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines 1625 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines 1626 s/\n+$//; # ending lines
1627 }
1519 1628
1520 $_ 1629 $xml
1521} 1630}
1522 1631
1523sub hintmode { 1632sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1; 1633 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode} 1634 $_[0]{hintmode}
… …
1532=cut 1641=cut
1533 1642
1534sub ext_reply($$@) { 1643sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1644 my ($self, $id, @msg) = @_;
1536 1645
1537 if ($self->ns->extcmd == 2) { 1646 $self->ns->ext_reply ($id, @msg)
1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1539 } elsif ($self->ns->extcmd == 1) {
1540 #TODO: version 1, remove
1541 unshift @msg, msgtype => "reply", msgid => $id;
1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1544} 1647}
1545 1648
1546=item $player->ext_msg ($type, @msg) 1649=item $player->ext_msg ($type, @msg)
1547 1650
1548Sends an ext event to the client. 1651Sends an ext event to the client.
… …
1776 1879
1777sub load_header_from($) { 1880sub load_header_from($) {
1778 my ($self, $path) = @_; 1881 my ($self, $path) = @_;
1779 1882
1780 utf8::encode $path; 1883 utf8::encode $path;
1781 #aio_open $path, O_RDONLY, 0 1884 my $f = new_from_file cf::object::thawer $path
1782 # or return;
1783
1784 $self->_load_header ($path)
1785 or return; 1885 or return;
1886
1887 $self->_load_header ($f)
1888 or return;
1889
1890 local $MAP_LOADING{$self->{path}} = $self;
1891 $f->resolve_delayed_derefs;
1786 1892
1787 $self->{load_path} = $path; 1893 $self->{load_path} = $path;
1788 1894
1789 1 1895 1
1790} 1896}
… …
1844sub find { 1950sub find {
1845 my ($path, $origin) = @_; 1951 my ($path, $origin) = @_;
1846 1952
1847 $path = normalise $path, $origin && $origin->path; 1953 $path = normalise $path, $origin && $origin->path;
1848 1954
1955 cf::lock_wait "map_data:$path";#d#remove
1849 cf::lock_wait "map_find:$path"; 1956 cf::lock_wait "map_find:$path";
1850 1957
1851 $cf::MAP{$path} || do { 1958 $cf::MAP{$path} || do {
1852 my $guard = cf::lock_acquire "map_find:$path"; 1959 my $guard1 = cf::lock_acquire "map_find:$path";
1960 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1961
1853 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
1854 or return; 1963 or return;
1855 1964
1856 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
1857 1966
… …
1859 or return; 1968 or return;
1860 1969
1861 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862 # doing this can freeze the server in a sync job, obviously 1971 # doing this can freeze the server in a sync job, obviously
1863 #$cf::WAIT_FOR_TICK->wait; 1972 #$cf::WAIT_FOR_TICK->wait;
1973 undef $guard1;
1974 undef $guard2;
1864 $map->reset; 1975 $map->reset;
1865 undef $guard;
1866 return find $path; 1976 return find $path;
1867 } 1977 }
1868 1978
1869 $cf::MAP{$path} = $map 1979 $cf::MAP{$path} = $map
1870 } 1980 }
… …
1879 local $self->{deny_reset} = 1; # loading can take a long time 1989 local $self->{deny_reset} = 1; # loading can take a long time
1880 1990
1881 my $path = $self->{path}; 1991 my $path = $self->{path};
1882 1992
1883 { 1993 {
1884 my $guard = cf::lock_acquire "map_load:$path"; 1994 my $guard = cf::lock_acquire "map_data:$path";
1885 1995
1996 return unless $self->valid;
1886 return if $self->in_memory != cf::MAP_SWAPPED; 1997 return unless $self->in_memory == cf::MAP_SWAPPED;
1887 1998
1888 $self->in_memory (cf::MAP_LOADING); 1999 $self->in_memory (cf::MAP_LOADING);
1889 2000
1890 $self->alloc; 2001 $self->alloc;
1891 2002
1892 $self->pre_load; 2003 $self->pre_load;
1893 Coro::cede; 2004 cf::cede_to_tick;
1894 2005
2006 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block;
1895 $self->_load_objects ($self->{load_path}, 1) 2008 $self->_load_objects ($f)
1896 or return; 2009 or return;
1897 2010
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1899 if delete $self->{load_original}; 2012 if delete $self->{load_original};
1900 2013
1901 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
1902 utf8::encode $uniq; 2015 utf8::encode $uniq;
1903 if (aio_open $uniq, O_RDONLY, 0) { 2016 unless (aio_stat $uniq) {
2017 if (my $f = new_from_file cf::object::thawer $uniq) {
1904 $self->clear_unique_items; 2018 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 2019 $self->_load_objects ($f);
2020 $f->resolve_delayed_derefs;
2021 }
1906 } 2022 }
1907 } 2023 }
1908 2024
1909 Coro::cede; 2025 $f->resolve_delayed_derefs;
2026
2027 cf::cede_to_tick;
1910 # now do the right thing for maps 2028 # now do the right thing for maps
1911 $self->link_multipart_objects; 2029 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 2030 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 2031 unless $self->difficulty;
1914 Coro::cede; 2032 cf::cede_to_tick;
1915 2033
1916 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 2035 $self->decay_objects;
1918 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
1919 $self->update_buttons; 2037 $self->update_buttons;
1920 Coro::cede; 2038 cf::cede_to_tick;
1921 $self->set_darkness_map; 2039 $self->set_darkness_map;
1922 Coro::cede; 2040 cf::cede_to_tick;
1923 $self->activate; 2041 $self->activate;
1924 } 2042 }
1925 2043
1926 $self->{last_save} = $cf::RUNTIME; 2044 $self->{last_save} = $cf::RUNTIME;
1927 $self->last_access ($cf::RUNTIME); 2045 $self->last_access ($cf::RUNTIME);
… …
1943 2061
1944 $self 2062 $self
1945} 2063}
1946 2064
1947# find and load all maps in the 3x3 area around a map 2065# find and load all maps in the 3x3 area around a map
1948sub load_diag { 2066sub load_neighbours {
1949 my ($map) = @_; 2067 my ($map) = @_;
1950 2068
1951 my @diag; # diagonal neighbours 2069 my @neigh; # diagonal neighbours
1952 2070
1953 for (0 .. 3) { 2071 for (0 .. 3) {
1954 my $neigh = $map->tile_path ($_) 2072 my $neigh = $map->tile_path ($_)
1955 or next; 2073 or next;
1956 $neigh = find $neigh, $map 2074 $neigh = find $neigh, $map
1957 or next; 2075 or next;
1958 $neigh->load; 2076 $neigh->load;
1959 2077
2078 push @neigh,
1960 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2079 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1961 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2080 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1962 } 2081 }
1963 2082
1964 for (@diag) { 2083 for (grep defined $_->[0], @neigh) {
2084 my ($path, $origin) = @$_;
1965 my $neigh = find @$_ 2085 my $neigh = find $path, $origin
1966 or next; 2086 or next;
1967 $neigh->load; 2087 $neigh->load;
1968 } 2088 }
1969} 2089}
1970 2090
… …
1975} 2095}
1976 2096
1977sub do_load_sync { 2097sub do_load_sync {
1978 my ($map) = @_; 2098 my ($map) = @_;
1979 2099
2100 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2101 if $Coro::current == $Coro::main;
2102
1980 cf::sync_job { $map->load }; 2103 cf::sync_job { $map->load };
1981} 2104}
1982 2105
1983our %MAP_PREFETCH; 2106our %MAP_PREFETCH;
1984our $MAP_PREFETCHER = undef; 2107our $MAP_PREFETCHER = undef;
1985 2108
1986sub find_async { 2109sub find_async {
1987 my ($path, $origin) = @_; 2110 my ($path, $origin, $load) = @_;
1988 2111
1989 $path = normalise $path, $origin && $origin->{path}; 2112 $path = normalise $path, $origin && $origin->{path};
1990 2113
1991 if (my $map = $cf::MAP{$path}) { 2114 if (my $map = $cf::MAP{$path}) {
1992 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2115 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1993 } 2116 }
1994 2117
1995 undef $MAP_PREFETCH{$path}; 2118 $MAP_PREFETCH{$path} |= $load;
2119
1996 $MAP_PREFETCHER ||= cf::async { 2120 $MAP_PREFETCHER ||= cf::async {
2121 $Coro::current->{desc} = "map prefetcher";
2122
1997 while (%MAP_PREFETCH) { 2123 while (%MAP_PREFETCH) {
1998 for my $path (keys %MAP_PREFETCH) { 2124 while (my ($k, $v) = each %MAP_PREFETCH) {
1999 if (my $map = find $path) { 2125 if (my $map = find $k) {
2000 $map->load; 2126 $map->load if $v;
2001 } 2127 }
2002 2128
2003 delete $MAP_PREFETCH{$path}; 2129 delete $MAP_PREFETCH{$k};
2004 } 2130 }
2005 } 2131 }
2006 undef $MAP_PREFETCHER; 2132 undef $MAP_PREFETCHER;
2007 }; 2133 };
2008 $MAP_PREFETCHER->prio (6); 2134 $MAP_PREFETCHER->prio (6);
… …
2011} 2137}
2012 2138
2013sub save { 2139sub save {
2014 my ($self) = @_; 2140 my ($self) = @_;
2015 2141
2016 my $lock = cf::lock_acquire "map_data:" . $self->path; 2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
2017 2143
2018 $self->{last_save} = $cf::RUNTIME; 2144 $self->{last_save} = $cf::RUNTIME;
2019 2145
2020 return unless $self->dirty; 2146 return unless $self->dirty;
2021 2147
… …
2027 return if $self->{deny_save}; 2153 return if $self->{deny_save};
2028 2154
2029 local $self->{last_access} = $self->last_access;#d# 2155 local $self->{last_access} = $self->last_access;#d#
2030 2156
2031 cf::async { 2157 cf::async {
2158 $Coro::current->{desc} = "map player save";
2032 $_->contr->save for $self->players; 2159 $_->contr->save for $self->players;
2033 }; 2160 };
2034 2161
2035 if ($uniq) { 2162 if ($uniq) {
2036 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2044 my ($self) = @_; 2171 my ($self) = @_;
2045 2172
2046 # save first because save cedes 2173 # save first because save cedes
2047 $self->save; 2174 $self->save;
2048 2175
2049 my $lock = cf::lock_acquire "map_data:" . $self->path; 2176 my $lock = cf::lock_acquire "map_data:$self->{path}";
2050 2177
2051 return if $self->players; 2178 return if $self->players;
2052 return if $self->in_memory != cf::MAP_IN_MEMORY; 2179 return if $self->in_memory != cf::MAP_IN_MEMORY;
2053 return if $self->{deny_save}; 2180 return if $self->{deny_save};
2054 2181
2182 $self->in_memory (cf::MAP_SWAPPED);
2183
2184 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP;
2055 $self->clear; 2186 $self->clear;
2056 $self->in_memory (cf::MAP_SWAPPED);
2057} 2187}
2058 2188
2059sub reset_at { 2189sub reset_at {
2060 my ($self) = @_; 2190 my ($self) = @_;
2061 2191
… …
2093 if $uniq; 2223 if $uniq;
2094 } 2224 }
2095 2225
2096 delete $cf::MAP{$self->path}; 2226 delete $cf::MAP{$self->path};
2097 2227
2228 $self->deactivate;
2229 $_->clear_links_to ($self) for values %cf::MAP;
2098 $self->clear; 2230 $self->clear;
2099
2100 $_->clear_links_to ($self) for values %cf::MAP;
2101 2231
2102 $self->unlink_save; 2232 $self->unlink_save;
2103 $self->destroy; 2233 $self->destroy;
2104} 2234}
2105 2235
2106my $nuke_counter = "aaaa"; 2236my $nuke_counter = "aaaa";
2107 2237
2108sub nuke { 2238sub nuke {
2109 my ($self) = @_; 2239 my ($self) = @_;
2110 2240
2241 {
2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243
2111 delete $cf::MAP{$self->path}; 2244 delete $cf::MAP{$self->path};
2112 2245
2113 $self->unlink_save; 2246 $self->unlink_save;
2114 2247
2115 bless $self, "cf::map"; 2248 bless $self, "cf::map";
2116 delete $self->{deny_reset}; 2249 delete $self->{deny_reset};
2117 $self->{deny_save} = 1; 2250 $self->{deny_save} = 1;
2118 $self->reset_timeout (1); 2251 $self->reset_timeout (1);
2119 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2252 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2120 2253
2121 $cf::MAP{$self->path} = $self; 2254 $cf::MAP{$self->path} = $self;
2255 }
2122 2256
2123 $self->reset; # polite request, might not happen 2257 $self->reset; # polite request, might not happen
2124} 2258}
2125 2259
2126=item $maps = cf::map::tmp_maps 2260=item $maps = cf::map::tmp_maps
… …
2202 2336
2203sub inv_recursive { 2337sub inv_recursive {
2204 inv_recursive_ inv $_[0] 2338 inv_recursive_ inv $_[0]
2205} 2339}
2206 2340
2341=item $ref = $ob->ref
2342
2343creates and returns a persistent reference to an objetc that can be stored as a string.
2344
2345=item $ob = cf::object::deref ($refstring)
2346
2347returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2348even if the object actually exists. May block.
2349
2350=cut
2351
2352sub deref {
2353 my ($ref) = @_;
2354
2355 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2356 my ($uuid, $name) = ($1, $2);
2357 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2358 or return;
2359 $pl->ob->uuid eq $uuid
2360 or return;
2361
2362 $pl->ob
2363 } else {
2364 warn "$ref: cannot resolve object reference\n";
2365 undef
2366 }
2367}
2368
2207package cf; 2369package cf;
2208 2370
2209=back 2371=back
2210 2372
2211=head3 cf::object::player 2373=head3 cf::object::player
… …
2243 $self->message ($msg, $flags); 2405 $self->message ($msg, $flags);
2244 } 2406 }
2245 } 2407 }
2246} 2408}
2247 2409
2410=item $object->send_msg ($channel, $msg, $color, [extra...])
2411
2412=cut
2413
2414sub cf::object::send_msg {
2415 my $pl = shift->contr
2416 or return;
2417 $pl->send_msg (@_);
2418}
2419
2248=item $player_object->may ("access") 2420=item $player_object->may ("access")
2249 2421
2250Returns wether the given player is authorized to access resource "access" 2422Returns wether the given player is authorized to access resource "access"
2251(e.g. "command_wizcast"). 2423(e.g. "command_wizcast").
2252 2424
… …
2329 # use -1 or undef as default coordinates, not 0, 0 2501 # use -1 or undef as default coordinates, not 0, 0
2330 ($x, $y) = ($map->enter_x, $map->enter_y) 2502 ($x, $y) = ($map->enter_x, $map->enter_y)
2331 if $x <=0 && $y <= 0; 2503 if $x <=0 && $y <= 0;
2332 2504
2333 $map->load; 2505 $map->load;
2334 $map->load_diag; 2506 $map->load_neighbours;
2335 2507
2336 return unless $self->contr->active; 2508 return unless $self->contr->active;
2337 $self->activate_recursive; 2509 $self->activate_recursive;
2338 2510
2339 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2511 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2359 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2531 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2360 2532
2361 $self->enter_link; 2533 $self->enter_link;
2362 2534
2363 (async { 2535 (async {
2536 $Coro::current->{desc} = "player::goto $path $x $y";
2537
2538 # *tag paths override both path and x|y
2539 if ($path =~ /^\*(.*)$/) {
2540 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2541 my $ob = $obs[rand @obs];
2542
2543 # see if we actually can go there
2544 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2545 $ob = $obs[rand @obs];
2546 } else {
2547 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2548 }
2549 # else put us there anyways for now #d#
2550
2551 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2552 } else {
2553 ($path, $x, $y) = (undef, undef, undef);
2554 }
2555 }
2556
2364 my $map = eval { 2557 my $map = eval {
2365 my $map = cf::map::find $path; 2558 my $map = defined $path ? cf::map::find $path : undef;
2366 2559
2367 if ($map) { 2560 if ($map) {
2368 $map = $map->customise_for ($self); 2561 $map = $map->customise_for ($self);
2369 $map = $check->($map) if $check && $map; 2562 $map = $check->($map) if $check && $map;
2370 } else { 2563 } else {
2371 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2564 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2372 } 2565 }
2373 2566
2374 $map 2567 $map
2375 }; 2568 };
2376 2569
… …
2466 # if exit is damned, update players death & WoR home-position 2659 # if exit is damned, update players death & WoR home-position
2467 $self->contr->savebed ($slaying, $hp, $sp) 2660 $self->contr->savebed ($slaying, $hp, $sp)
2468 if $exit->flag (FLAG_DAMNED); 2661 if $exit->flag (FLAG_DAMNED);
2469 2662
2470 (async { 2663 (async {
2664 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2665
2471 $self->deactivate_recursive; # just to be sure 2666 $self->deactivate_recursive; # just to be sure
2472 unless (eval { 2667 unless (eval {
2473 $self->goto ($slaying, $hp, $sp); 2668 $self->goto ($slaying, $hp, $sp);
2474 2669
2475 1; 2670 1;
… …
2510the message, with C<log> being the default. If C<$color> is negative, suppress 2705the message, with C<log> being the default. If C<$color> is negative, suppress
2511the message unless the client supports the msg packet. 2706the message unless the client supports the msg packet.
2512 2707
2513=cut 2708=cut
2514 2709
2710# non-persistent channels (usually the info channel)
2711our %CHANNEL = (
2712 "c/identify" => {
2713 id => "infobox",
2714 title => "Identify",
2715 reply => undef,
2716 tooltip => "Items recently identified",
2717 },
2718 "c/examine" => {
2719 id => "infobox",
2720 title => "Examine",
2721 reply => undef,
2722 tooltip => "Signs and other items you examined",
2723 },
2724 "c/book" => {
2725 id => "infobox",
2726 title => "Book",
2727 reply => undef,
2728 tooltip => "The contents of a note or book",
2729 },
2730 "c/lookat" => {
2731 id => "infobox",
2732 title => "Look",
2733 reply => undef,
2734 tooltip => "What you saw there",
2735 },
2736 "c/who" => {
2737 id => "infobox",
2738 title => "Players",
2739 reply => undef,
2740 tooltip => "Shows players who are currently online",
2741 },
2742 "c/body" => {
2743 id => "infobox",
2744 title => "Body Parts",
2745 reply => undef,
2746 tooltip => "Shows which body parts you posess and are available",
2747 },
2748 "c/uptime" => {
2749 id => "infobox",
2750 title => "Uptime",
2751 reply => undef,
2752 tooltip => "How long the server has been running since last restart",
2753 },
2754 "c/mapinfo" => {
2755 id => "infobox",
2756 title => "Map Info",
2757 reply => undef,
2758 tooltip => "Information related to the maps",
2759 },
2760);
2761
2515sub cf::client::send_msg { 2762sub cf::client::send_msg {
2516 my ($self, $channel, $msg, $color, @extra) = @_; 2763 my ($self, $channel, $msg, $color, @extra) = @_;
2517 2764
2518 $msg = $self->pl->expand_cfpod ($msg); 2765 $msg = $self->pl->expand_cfpod ($msg);
2519 2766
2520 $color &= cf::NDI_CLIENT_MASK; # just in case... 2767 $color &= cf::NDI_CLIENT_MASK; # just in case...
2521 2768
2769 # check predefined channels, for the benefit of C
2770 if ($CHANNEL{$channel}) {
2771 $channel = $CHANNEL{$channel};
2772
2773 $self->ext_msg (channel_info => $channel)
2774 if $self->can_msg;
2775
2776 $channel = $channel->{id};
2777
2522 if (ref $channel) { 2778 } elsif (ref $channel) {
2523 # send meta info to client, if not yet sent 2779 # send meta info to client, if not yet sent
2524 unless (exists $self->{channel}{$channel->{id}}) { 2780 unless (exists $self->{channel}{$channel->{id}}) {
2525 $self->{channel}{$channel->{id}} = $channel; 2781 $self->{channel}{$channel->{id}} = $channel;
2526 $self->ext_msg (channel_info => $channel); 2782 $self->ext_msg (channel_info => $channel)
2783 if $self->can_msg;
2527 } 2784 }
2528 2785
2529 $channel = $channel->{id}; 2786 $channel = $channel->{id};
2530 } 2787 }
2531 2788
… …
2550 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/; 2807 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2551 } 2808 }
2552 2809
2553 $color &= cf::NDI_COLOR_MASK; 2810 $color &= cf::NDI_COLOR_MASK;
2554 2811
2812 utf8::encode $msg;
2813
2555 if (0 && $msg =~ /\[/) { 2814 if (0 && $msg =~ /\[/) {
2815 # COMMAND/INFO
2556 $self->send_packet ("drawextinfo $color 4 0 $msg") 2816 $self->send_packet ("drawextinfo $color 10 8 $msg")
2557 } else { 2817 } else {
2558 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2818 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2559 $self->send_packet ("drawinfo $color $msg") 2819 $self->send_packet ("drawinfo $color $msg")
2560 } 2820 }
2561 } 2821 }
… …
2569=cut 2829=cut
2570 2830
2571sub cf::client::ext_msg($$@) { 2831sub cf::client::ext_msg($$@) {
2572 my ($self, $type, @msg) = @_; 2832 my ($self, $type, @msg) = @_;
2573 2833
2574 my $extcmd = $self->extcmd;
2575
2576 if ($extcmd == 2) { 2834 if ($self->extcmd == 2) {
2577 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2835 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2578 } elsif ($extcmd == 1) { # TODO: remove 2836 } elsif ($self->extcmd == 1) { # TODO: remove
2579 push @msg, msgtype => "event_$type"; 2837 push @msg, msgtype => "event_$type";
2838 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2839 }
2840}
2841
2842=item $client->ext_reply ($msgid, @msg)
2843
2844Sends an ext reply to the client.
2845
2846=cut
2847
2848sub cf::client::ext_reply($$@) {
2849 my ($self, $id, @msg) = @_;
2850
2851 if ($self->extcmd == 2) {
2852 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2853 } elsif ($self->extcmd == 1) {
2854 #TODO: version 1, remove
2855 unshift @msg, msgtype => "reply", msgid => $id;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2856 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 } 2857 }
2582} 2858}
2583 2859
2584=item $success = $client->query ($flags, "text", \&cb) 2860=item $success = $client->query ($flags, "text", \&cb)
… …
2646 my ($type, $reply, @payload) = 2922 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg 2923 "ARRAY" eq ref $msg
2648 ? @$msg 2924 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2925 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650 2926
2927 my @reply;
2928
2651 if (my $cb = $EXTICMD{$type}) { 2929 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload); 2930 @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 } 2931 }
2932
2933 $ns->ext_reply ($reply, @reply)
2934 if $reply;
2935
2657 } else { 2936 } else {
2658 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2937 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2659 } 2938 }
2660 2939
2661 cf::override; 2940 cf::override;
… …
2708our $safe = new Safe "safe"; 2987our $safe = new Safe "safe";
2709our $safe_hole = new Safe::Hole; 2988our $safe_hole = new Safe::Hole;
2710 2989
2711$SIG{FPE} = 'IGNORE'; 2990$SIG{FPE} = 'IGNORE';
2712 2991
2713$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2992$safe->permit_only (Opcode::opset qw(
2993 :base_core :base_mem :base_orig :base_math
2994 grepstart grepwhile mapstart mapwhile
2995 sort time
2996));
2714 2997
2715# here we export the classes and methods available to script code 2998# here we export the classes and methods available to script code
2716 2999
2717=pod 3000=pod
2718 3001
2719The following functions and methods are available within a safe environment: 3002The following functions and methods are available within a safe environment:
2720 3003
2721 cf::object 3004 cf::object
2722 contr pay_amount pay_player map x y force_find force_add 3005 contr pay_amount pay_player map x y force_find force_add destroy
2723 insert remove 3006 insert remove name archname title slaying race decrease_ob_nr
2724 3007
2725 cf::object::player 3008 cf::object::player
2726 player 3009 player
2727 3010
2728 cf::player 3011 cf::player
… …
2733 3016
2734=cut 3017=cut
2735 3018
2736for ( 3019for (
2737 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3020 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3021 insert remove inv name archname title slaying race
2738 insert remove)], 3022 decrease_ob_nr destroy)],
2739 ["cf::object::player" => qw(player)], 3023 ["cf::object::player" => qw(player)],
2740 ["cf::player" => qw(peaceful)], 3024 ["cf::player" => qw(peaceful)],
2741 ["cf::map" => qw(trigger)], 3025 ["cf::map" => qw(trigger)],
2742) { 3026) {
2743 no strict 'refs'; 3027 no strict 'refs';
… …
2819# the server's init and main functions 3103# the server's init and main functions
2820 3104
2821sub load_facedata($) { 3105sub load_facedata($) {
2822 my ($path) = @_; 3106 my ($path) = @_;
2823 3107
3108 # HACK to clear player env face cache, we need some signal framework
3109 # for this (global event?)
3110 %ext::player_env::MUSIC_FACE_CACHE = ();
3111
3112 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3113
2824 warn "loading facedata from $path\n"; 3114 warn "loading facedata from $path\n";
2825 3115
2826 my $facedata; 3116 my $facedata;
2827 0 < aio_load $path, $facedata 3117 0 < aio_load $path, $facedata
2828 or die "$path: $!"; 3118 or die "$path: $!";
2829 3119
2830 $facedata = Coro::Storable::thaw $facedata; 3120 $facedata = Coro::Storable::thaw $facedata;
2831 3121
2832 $facedata->{version} == 2 3122 $facedata->{version} == 2
2833 or cf::cleanup "$path: version mismatch, cannot proceed."; 3123 or cf::cleanup "$path: version mismatch, cannot proceed.";
3124
3125 # patch in the exptable
3126 $facedata->{resource}{"res/exp_table"} = {
3127 type => FT_RSRC,
3128 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3129 };
3130 cf::cede_to_tick;
2834 3131
2835 { 3132 {
2836 my $faces = $facedata->{faceinfo}; 3133 my $faces = $facedata->{faceinfo};
2837 3134
2838 while (my ($face, $info) = each %$faces) { 3135 while (my ($face, $info) = each %$faces) {
2839 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3136 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2840 cf::face::set_visibility $idx, $info->{visibility}; 3137 cf::face::set_visibility $idx, $info->{visibility};
2841 cf::face::set_magicmap $idx, $info->{magicmap}; 3138 cf::face::set_magicmap $idx, $info->{magicmap};
2842 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3139 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2843 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3140 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2844 3141
2845 cf::cede_to_tick; 3142 cf::cede_to_tick;
2846 } 3143 }
2847 3144
2848 while (my ($face, $info) = each %$faces) { 3145 while (my ($face, $info) = each %$faces) {
… …
2873 3170
2874 { 3171 {
2875 # TODO: for gcfclient pleasure, we should give resources 3172 # TODO: for gcfclient pleasure, we should give resources
2876 # that gcfclient doesn't grok a >10000 face index. 3173 # that gcfclient doesn't grok a >10000 face index.
2877 my $res = $facedata->{resource}; 3174 my $res = $facedata->{resource};
2878 my $enc = JSON::XS->new->utf8->canonical;
2879 3175
2880 my $soundconf = delete $res->{"res/sound.conf"}; 3176 my $soundconf = delete $res->{"res/sound.conf"};
2881 3177
2882 while (my ($name, $info) = each %$res) { 3178 while (my ($name, $info) = each %$res) {
2883 my $meta = $enc->encode ({
2884 name => $name,
2885 %{ $info->{meta} || {} },
2886 });
2887
2888 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3179 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3180 my $data;
2889 3181
2890 if ($info->{type} & 1) { 3182 if ($info->{type} & 1) {
2891 # prepend meta info 3183 # prepend meta info
2892 3184
3185 my $meta = $enc->encode ({
3186 name => $name,
3187 %{ $info->{meta} || {} },
3188 });
3189
2893 my $data = pack "(w/a*)*", $meta, $info->{data}; 3190 $data = pack "(w/a*)*", $meta, $info->{data};
2894 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2895
2896 cf::face::set_data $idx, 0, $data, $chk;
2897 } else { 3191 } else {
2898 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3192 $data = $info->{data};
2899 } 3193 }
2900 3194
3195 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2901 cf::face::set_type $idx, $info->{type}; 3196 cf::face::set_type $idx, $info->{type};
2902 3197
2903 cf::cede_to_tick; 3198 cf::cede_to_tick;
2904 } 3199 }
2905 3200
… …
2932 $ns->fx_want ($k, $v); 3227 $ns->fx_want ($k, $v);
2933 } 3228 }
2934}; 3229};
2935 3230
2936sub reload_regions { 3231sub reload_regions {
3232 # HACK to clear player env face cache, we need some signal framework
3233 # for this (global event?)
3234 %ext::player_env::MUSIC_FACE_CACHE = ();
3235
2937 load_resource_file "$MAPDIR/regions" 3236 load_resource_file "$MAPDIR/regions"
2938 or die "unable to load regions file\n"; 3237 or die "unable to load regions file\n";
2939 3238
2940 for (cf::region::list) { 3239 for (cf::region::list) {
2941 $_->{match} = qr/$_->{match}/ 3240 $_->{match} = qr/$_->{match}/
… …
2977 3276
2978sub init { 3277sub init {
2979 reload_resources; 3278 reload_resources;
2980} 3279}
2981 3280
2982sub cfg_load { 3281sub reload_config {
2983 open my $fh, "<:utf8", "$CONFDIR/config" 3282 open my $fh, "<:utf8", "$CONFDIR/config"
2984 or return; 3283 or return;
2985 3284
2986 local $/; 3285 local $/;
2987 *CFG = YAML::Syck::Load <$fh>; 3286 *CFG = YAML::Syck::Load <$fh>;
… …
3003sub main { 3302sub main {
3004 # we must not ever block the main coroutine 3303 # we must not ever block the main coroutine
3005 local $Coro::idle = sub { 3304 local $Coro::idle = sub {
3006 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3305 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3007 (async { 3306 (async {
3307 $Coro::current->{desc} = "IDLE BUG HANDLER";
3008 Event::one_event; 3308 Event::one_event;
3009 })->prio (Coro::PRIO_MAX); 3309 })->prio (Coro::PRIO_MAX);
3010 }; 3310 };
3011 3311
3012 cfg_load; 3312 reload_config;
3013 db_init; 3313 db_init;
3014 load_extensions; 3314 load_extensions;
3015 3315
3016 $TICK_WATCHER->start; 3316 $TICK_WATCHER->start;
3017 Event::loop; 3317 Event::loop;
… …
3084 # and maps saved/destroyed asynchronously. 3384 # and maps saved/destroyed asynchronously.
3085 warn "begin emergency player save\n"; 3385 warn "begin emergency player save\n";
3086 for my $login (keys %cf::PLAYER) { 3386 for my $login (keys %cf::PLAYER) {
3087 my $pl = $cf::PLAYER{$login} or next; 3387 my $pl = $cf::PLAYER{$login} or next;
3088 $pl->valid or next; 3388 $pl->valid or next;
3389 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3089 $pl->save; 3390 $pl->save;
3090 } 3391 }
3091 warn "end emergency player save\n"; 3392 warn "end emergency player save\n";
3092 3393
3093 warn "begin emergency map save\n"; 3394 warn "begin emergency map save\n";
… …
3141 3442
3142 warn "flushing outstanding aio requests"; 3443 warn "flushing outstanding aio requests";
3143 for (;;) { 3444 for (;;) {
3144 BDB::flush; 3445 BDB::flush;
3145 IO::AIO::flush; 3446 IO::AIO::flush;
3146 Coro::cede; 3447 Coro::cede_notself;
3147 last unless IO::AIO::nreqs || BDB::nreqs; 3448 last unless IO::AIO::nreqs || BDB::nreqs;
3148 warn "iterate..."; 3449 warn "iterate...";
3149 } 3450 }
3150 3451
3151 ++$RELOAD; 3452 ++$RELOAD;
… …
3210 warn "reloading cf.pm"; 3511 warn "reloading cf.pm";
3211 require cf; 3512 require cf;
3212 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3513 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3213 3514
3214 warn "loading config and database again"; 3515 warn "loading config and database again";
3215 cf::cfg_load; 3516 cf::reload_config;
3216 3517
3217 warn "loading extensions"; 3518 warn "loading extensions";
3218 cf::load_extensions; 3519 cf::load_extensions;
3219 3520
3220 warn "reattaching attachments to objects/players"; 3521 warn "reattaching attachments to objects/players";
… …
3256register_command "reload" => sub { 3557register_command "reload" => sub {
3257 my ($who, $arg) = @_; 3558 my ($who, $arg) = @_;
3258 3559
3259 if ($who->flag (FLAG_WIZ)) { 3560 if ($who->flag (FLAG_WIZ)) {
3260 $who->message ("reloading server."); 3561 $who->message ("reloading server.");
3562 async {
3563 $Coro::current->{desc} = "perl_reload";
3261 async { reload_perl }; 3564 reload_perl;
3565 };
3262 } 3566 }
3263}; 3567};
3264 3568
3265unshift @INC, $LIBDIR; 3569unshift @INC, $LIBDIR;
3266 3570
… …
3285 my $signal = new Coro::Signal; 3589 my $signal = new Coro::Signal;
3286 push @WAIT_FOR_TICK_BEGIN, $signal; 3590 push @WAIT_FOR_TICK_BEGIN, $signal;
3287 $signal->wait; 3591 $signal->wait;
3288} 3592}
3289 3593
3290 my $min = 1e6;#d#
3291 my $avg = 10;
3292$TICK_WATCHER = Event->timer ( 3594$TICK_WATCHER = Event->timer (
3293 reentrant => 0, 3595 reentrant => 0,
3294 parked => 1, 3596 parked => 1,
3295 prio => 0, 3597 prio => 0,
3296 at => $NEXT_TICK || $TICK, 3598 at => $NEXT_TICK || $TICK,
… …
3304 3606
3305 $NOW = $tick_start = Event::time; 3607 $NOW = $tick_start = Event::time;
3306 3608
3307 cf::server_tick; # one server iteration 3609 cf::server_tick; # one server iteration
3308 3610
3309 0 && sync_job {#d#
3310 for(1..10) {
3311 my $t = Event::time;
3312 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3313 or die;
3314
3315 $map->width (50);
3316 $map->height (50);
3317 $map->alloc;
3318 $map->_load_objects ("/tmp/x.map", 1);
3319 my $t = Event::time - $t;
3320
3321 #next unless $t < 0.0013;#d#
3322 if ($t < $min) {
3323 $min = $t;
3324 }
3325 $avg = $avg * 0.99 + $t * 0.01;
3326 }
3327 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3328 exit 0;
3329 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3330 };
3331
3332 $RUNTIME += $TICK; 3611 $RUNTIME += $TICK;
3333 $NEXT_TICK += $TICK; 3612 $NEXT_TICK += $TICK;
3334 3613
3335 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3614 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3336 $NEXT_RUNTIME_WRITE = $NOW + 10; 3615 $NEXT_RUNTIME_WRITE = $NOW + 10;
3337 Coro::async_pool { 3616 Coro::async_pool {
3617 $Coro::current->{desc} = "runtime saver";
3338 write_runtime 3618 write_runtime
3339 or warn "ERROR: unable to write runtime file: $!"; 3619 or warn "ERROR: unable to write runtime file: $!";
3340 }; 3620 };
3341 } 3621 }
3342 3622
3343# my $AFTER = Event::time;
3344# warn $AFTER - $NOW;#d#
3345
3346 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3623 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3347 $sig->send; 3624 $sig->send;
3348 } 3625 }
3349 while (my $sig = shift @WAIT_FOR_TICK) { 3626 while (my $sig = shift @WAIT_FOR_TICK) {
3350 $sig->send; 3627 $sig->send;
… …
3360 3637
3361 $LOAD = ($NOW - $tick_start) / $TICK; 3638 $LOAD = ($NOW - $tick_start) / $TICK;
3362 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3639 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3363 3640
3364 _post_tick; 3641 _post_tick;
3365
3366
3367 }, 3642 },
3368); 3643);
3369 3644
3370{ 3645{
3646 BDB::min_parallel 8;
3371 BDB::max_poll_time $TICK * 0.1; 3647 BDB::max_poll_time $TICK * 0.1;
3372 $BDB_POLL_WATCHER = Event->io ( 3648 $BDB_POLL_WATCHER = Event->io (
3373 reentrant => 0, 3649 reentrant => 0,
3374 fd => BDB::poll_fileno, 3650 fd => BDB::poll_fileno,
3375 poll => 'r', 3651 poll => 'r',
3376 prio => 0, 3652 prio => 0,
3377 data => WF_AUTOCANCEL, 3653 data => WF_AUTOCANCEL,
3378 cb => \&BDB::poll_cb, 3654 cb => \&BDB::poll_cb,
3379 ); 3655 );
3380 BDB::min_parallel 8;
3381 3656
3382 BDB::set_sync_prepare { 3657 BDB::set_sync_prepare {
3383 my $status; 3658 my $status;
3384 my $current = $Coro::current; 3659 my $current = $Coro::current;
3385 ( 3660 (
… …
3394 ) 3669 )
3395 }; 3670 };
3396 3671
3397 unless ($DB_ENV) { 3672 unless ($DB_ENV) {
3398 $DB_ENV = BDB::db_env_create; 3673 $DB_ENV = BDB::db_env_create;
3674 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3675 | BDB::LOG_AUTOREMOVE, 1);
3676 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3677 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3399 3678
3400 cf::sync_job { 3679 cf::sync_job {
3401 eval { 3680 eval {
3402 BDB::db_env_open 3681 BDB::db_env_open
3403 $DB_ENV, 3682 $DB_ENV,
… …
3405 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3684 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3406 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3685 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3407 0666; 3686 0666;
3408 3687
3409 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3688 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3410
3411 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3412 $DB_ENV->set_lk_detect;
3413 }; 3689 };
3414 3690
3415 cf::cleanup "db_env_open(db): $@" if $@; 3691 cf::cleanup "db_env_open(db): $@" if $@;
3416 }; 3692 };
3417 } 3693 }
3694
3695 $BDB_DEADLOCK_WATCHER = Event->timer (
3696 after => 3,
3697 interval => 1,
3698 hard => 1,
3699 prio => 0,
3700 data => WF_AUTOCANCEL,
3701 cb => sub {
3702 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3703 },
3704 );
3705 $BDB_CHECKPOINT_WATCHER = Event->timer (
3706 after => 11,
3707 interval => 60,
3708 hard => 1,
3709 prio => 0,
3710 data => WF_AUTOCANCEL,
3711 cb => sub {
3712 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3713 },
3714 );
3715 $BDB_TRICKLE_WATCHER = Event->timer (
3716 after => 5,
3717 interval => 10,
3718 hard => 1,
3719 prio => 0,
3720 data => WF_AUTOCANCEL,
3721 cb => sub {
3722 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3723 },
3724 );
3418} 3725}
3419 3726
3420{ 3727{
3421 IO::AIO::min_parallel 8; 3728 IO::AIO::min_parallel 8;
3422 3729
… …
3425 $AIO_POLL_WATCHER = Event->io ( 3732 $AIO_POLL_WATCHER = Event->io (
3426 reentrant => 0, 3733 reentrant => 0,
3427 data => WF_AUTOCANCEL, 3734 data => WF_AUTOCANCEL,
3428 fd => IO::AIO::poll_fileno, 3735 fd => IO::AIO::poll_fileno,
3429 poll => 'r', 3736 poll => 'r',
3430 prio => 6, 3737 prio => 0,
3431 cb => \&IO::AIO::poll_cb, 3738 cb => \&IO::AIO::poll_cb,
3432 ); 3739 );
3433} 3740}
3434 3741
3435my $_log_backtrace; 3742my $_log_backtrace;
… …
3441 3748
3442 # limit the # of concurrent backtraces 3749 # limit the # of concurrent backtraces
3443 if ($_log_backtrace < 2) { 3750 if ($_log_backtrace < 2) {
3444 ++$_log_backtrace; 3751 ++$_log_backtrace;
3445 async { 3752 async {
3753 $Coro::current->{desc} = "abt $msg";
3754
3446 my @bt = fork_call { 3755 my @bt = fork_call {
3447 @addr = map { sprintf "%x", $_ } @addr; 3756 @addr = map { sprintf "%x", $_ } @addr;
3448 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3757 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3449 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3758 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3450 or die "addr2line: $!"; 3759 or die "addr2line: $!";

Diff Legend

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