ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.315 by root, Mon Jul 23 17:53:55 2007 UTC vs.
Revision 1.385 by root, Fri Oct 12 19:13:26 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
472Coro::Storable. May, of course, block. Note that the executed sub may 491Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 492never block itself or use any form of Event handling.
474 493
475=cut 494=cut
476 495
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485
486sub fork_call(&@) { 496sub fork_call(&@) {
487 my ($cb, @args) = @_; 497 my ($cb, @args) = @_;
488 498
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 499 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 500 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 501 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 502
494 if (my $pid = fork) { 503 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 504 reset_signals;
508 local $SIG{__WARN__}; 505 &$cb
509 local $SIG{__DIE__}; 506 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 507
516 eval { 508 wantarray ? @res : $res[-1]
517 close $fh1;
518
519 my @res = eval { $cb->(@args) };
520
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
523 };
524
525 warn $@ if $@;
526 _exit 0;
527 }
528} 509}
529 510
530=item $value = cf::db_get $family => $key 511=item $value = cf::db_get $family => $key
531 512
532Returns a single value from the environment database. 513Returns a single value from the environment database.
534=item cf::db_put $family => $key => $value 515=item cf::db_put $family => $key => $value
535 516
536Stores the given C<$value> in the family. It can currently store binary 517Stores the given C<$value> in the family. It can currently store binary
537data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 518data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 519
520=item $db = cf::db_table "name"
521
522Create and/or open a new database table. The string must not be "db" and must be unique
523within each server.
524
539=cut 525=cut
526
527sub db_table($) {
528 my ($name) = @_;
529 my $db = BDB::db_create $DB_ENV;
530
531 eval {
532 $db->set_flags (BDB::CHKSUM);
533
534 utf8::encode $name;
535 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
536 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
537 cf::cleanup "db_open(db): $!" if $!;
538 };
539 cf::cleanup "db_open(db): $@" if $@;
540
541 $db
542}
540 543
541our $DB; 544our $DB;
542 545
543sub db_init { 546sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 547 cf::sync_job {
548 eval { 548 $DB ||= db_table "db";
549 $DB->set_flags (BDB::CHKSUM);
550
551 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553 cf::cleanup "db_open(db): $!" if $!;
554 };
555 cf::cleanup "db_open(db): $@" if $@;
556 };
557 } 549 };
558} 550}
559 551
560sub db_get($$) { 552sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 553 my $key = "$_[0]/$_[1]";
562 554
612 if (1) { 604 if (1) {
613 $md5 = 605 $md5 =
614 join "\x00", 606 join "\x00",
615 $processversion, 607 $processversion,
616 map { 608 map {
617 Coro::cede; 609 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 610 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 611 } 0.. $#$src;
620 612
621 613
622 my $dbmd5 = db_get cache => "$id/md5"; 614 my $dbmd5 = db_get cache => "$id/md5";
979# 971#
980 972
981sub _can_merge { 973sub _can_merge {
982 my ($ob1, $ob2) = @_; 974 my ($ob1, $ob2) = @_;
983 975
976 return 1;#d#
977
978 #todo#d# kill yourself and do some recursive checking manually without storable
979 sync_job {
980 my $guard = Coro::Storable::guard;
984 local $Storable::canonical = 1; 981 local $Storable::canonical = 1;
985 my $fob1 = Storable::freeze $ob1; 982 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2; 983 my $fob2 = Storable::freeze $ob2;
987
988 $fob1 eq $fob2 984 $fob1 eq $fob2
985 }
989} 986}
990 987
991sub reattach { 988sub reattach {
992 # basically do the same as instantiate, without calling instantiate 989 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 990 my ($obj) = @_;
1041sub object_freezer_save { 1038sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1039 my ($filename, $rdata, $objs) = @_;
1043 1040
1044 sync_job { 1041 sync_job {
1045 if (length $$rdata) { 1042 if (length $$rdata) {
1043 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1044 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1045 $decname, length $$rdata, scalar @$objs;
1048 1046
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1047 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1048 chmod SAVE_MODE, $fh;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1049 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1050 aio_fsync $fh if $cf::USE_FSYNC;
1053 close $fh; 1051 close $fh;
1054 1052
1055 if (@$objs) { 1053 if (@$objs) {
1056 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1054 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1057 chmod SAVE_MODE, $fh; 1055 chmod SAVE_MODE, $fh;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1056 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1057 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1058 aio_fsync $fh if $cf::USE_FSYNC;
1061 close $fh; 1059 close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1060 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1061 }
1071 } 1069 }
1072 } else { 1070 } else {
1073 aio_unlink $filename; 1071 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1072 aio_unlink "$filename.pst";
1075 } 1073 }
1076 } 1074 };
1077} 1075}
1078 1076
1079sub object_freezer_as_string { 1077sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1078 my ($rdata, $objs) = @_;
1081 1079
1093 or return; 1091 or return;
1094 1092
1095 unless (aio_stat "$filename.pst") { 1093 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1094 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1095 or return;
1098 $av = eval { (Storable::thaw $av)->{objs} };
1099 }
1100 1096
1097 my $st = eval { Coro::Storable::thaw $av }
1098 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1099 $av = $st->{objs};
1100 }
1101
1102 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1103 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1104 $decname, length $data, scalar @{$av || []};
1105
1103 return ($data, $av); 1106 ($data, $av)
1104} 1107}
1105 1108
1106=head2 COMMAND CALLBACKS 1109=head2 COMMAND CALLBACKS
1107 1110
1108=over 4 1111=over 4
1181 my ($pl, $buf) = @_; 1184 my ($pl, $buf) = @_;
1182 1185
1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1186 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1184 1187
1185 if (ref $msg) { 1188 if (ref $msg) {
1189 my ($type, $reply, @payload) =
1190 "ARRAY" eq ref $msg
1191 ? @$msg
1192 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1193
1194 my @reply;
1195
1186 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1196 if (my $cb = $EXTCMD{$type}) {
1187 if (my %reply = $cb->($pl, $msg)) { 1197 @reply = $cb->($pl, @payload);
1188 $pl->ext_reply ($msg->{msgid}, %reply);
1189 }
1190 } 1198 }
1199
1200 $pl->ext_reply ($reply, @reply)
1201 if $reply;
1202
1191 } else { 1203 } else {
1192 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1204 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1193 } 1205 }
1194 1206
1195 cf::override; 1207 cf::override;
1285 1297
1286=head3 cf::player 1298=head3 cf::player
1287 1299
1288=over 4 1300=over 4
1289 1301
1302=item cf::player::num_playing
1303
1304Returns the official number of playing players, as per the Crossfire metaserver rules.
1305
1306=cut
1307
1308sub num_playing {
1309 scalar grep
1310 $_->ob->map
1311 && !$_->hidden
1312 && !$_->ob->flag (cf::FLAG_WIZ),
1313 cf::player::list
1314}
1315
1290=item cf::player::find $login 1316=item cf::player::find $login
1291 1317
1292Returns the given player object, loading it if necessary (might block). 1318Returns the given player object, loading it if necessary (might block).
1293 1319
1294=cut 1320=cut
1329 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1355 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1330 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1356 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1331 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1357 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1332 aio_unlink +(playerdir $login) . "/$login.pl"; 1358 aio_unlink +(playerdir $login) . "/$login.pl";
1333 1359
1334 my $pl = load_pl path $login 1360 my $f = new_from_file cf::object::thawer path $login
1335 or return; 1361 or return;
1362
1363 my $pl = cf::player::load_pl $f
1364 or return;
1365 local $cf::PLAYER_LOADING{$login} = $pl;
1366 $f->resolve_delayed_derefs;
1336 $cf::PLAYER{$login} = $pl 1367 $cf::PLAYER{$login} = $pl
1337 } 1368 }
1338 } 1369 }
1339} 1370}
1340 1371
1350 1381
1351 aio_mkdir playerdir $pl, 0770; 1382 aio_mkdir playerdir $pl, 0770;
1352 $pl->{last_save} = $cf::RUNTIME; 1383 $pl->{last_save} = $cf::RUNTIME;
1353 1384
1354 $pl->save_pl ($path); 1385 $pl->save_pl ($path);
1355 Coro::cede; 1386 cf::cede_to_tick;
1356} 1387}
1357 1388
1358sub new($) { 1389sub new($) {
1359 my ($login) = @_; 1390 my ($login) = @_;
1360 1391
1364 $self->{deny_save} = 1; 1395 $self->{deny_save} = 1;
1365 1396
1366 $cf::PLAYER{$login} = $self; 1397 $cf::PLAYER{$login} = $self;
1367 1398
1368 $self 1399 $self
1400}
1401
1402=item $player->send_msg ($channel, $msg, $color, [extra...])
1403
1404=cut
1405
1406sub send_msg {
1407 my $ns = shift->ns
1408 or return;
1409 $ns->send_msg (@_);
1369} 1410}
1370 1411
1371=item $pl->quit_character 1412=item $pl->quit_character
1372 1413
1373Nukes the player without looking back. If logged in, the connection will 1414Nukes the player without looking back. If logged in, the connection will
1428 or return []; 1469 or return [];
1429 1470
1430 my @logins; 1471 my @logins;
1431 1472
1432 for my $login (@$dirs) { 1473 for my $login (@$dirs) {
1474 my $path = path $login;
1475
1476 # a .pst is a dead give-away for a valid player
1477 unless (-e "$path.pst") {
1433 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1478 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1434 aio_read $fh, 0, 512, my $buf, 0 or next; 1479 aio_read $fh, 0, 512, my $buf, 0 or next;
1435 $buf !~ /^password -------------$/m or next; # official not-valid tag 1480 $buf !~ /^password -------------$/m or next; # official not-valid tag
1481 }
1436 1482
1437 utf8::decode $login; 1483 utf8::decode $login;
1438 push @logins, $login; 1484 push @logins, $login;
1439 } 1485 }
1440 1486
1478sub expand_cfpod { 1524sub expand_cfpod {
1479 ((my $self), (local $_)) = @_; 1525 ((my $self), (local $_)) = @_;
1480 1526
1481 # escape & and < 1527 # escape & and <
1482 s/&/&amp;/g; 1528 s/&/&amp;/g;
1483 s/(?<![BIUGH])</&lt;/g; 1529 s/(?<![BIUGHT])</&lt;/g;
1484 1530
1485 # this is buggy, it needs to properly take care of nested <'s 1531 # this is buggy, it needs to properly take care of nested <'s
1486 1532
1487 1 while 1533 1 while
1488 # replace B<>, I<>, U<> etc. 1534 # replace B<>, I<>, U<> etc.
1489 s/B<([^\>]*)>/<b>$1<\/b>/ 1535 s/B<([^\>]*)>/<b>$1<\/b>/
1490 || s/I<([^\>]*)>/<i>$1<\/i>/ 1536 || s/I<([^\>]*)>/<i>$1<\/i>/
1491 || s/U<([^\>]*)>/<u>$1<\/u>/ 1537 || s/U<([^\>]*)>/<u>$1<\/u>/
1538 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1492 # replace G<male|female> tags 1539 # replace G<male|female> tags
1493 || s{G<([^>|]*)\|([^>]*)>}{ 1540 || s{G<([^>|]*)\|([^>]*)>}{
1494 $self->gender ? $2 : $1 1541 $self->gender ? $2 : $1
1495 }ge 1542 }ge
1496 # replace H<hint text> 1543 # replace H<hint text>
1517sub hintmode { 1564sub hintmode {
1518 $_[0]{hintmode} = $_[1] if @_ > 1; 1565 $_[0]{hintmode} = $_[1] if @_ > 1;
1519 $_[0]{hintmode} 1566 $_[0]{hintmode}
1520} 1567}
1521 1568
1522=item $player->ext_reply ($msgid, %msg) 1569=item $player->ext_reply ($msgid, @msg)
1523 1570
1524Sends an ext reply to the player. 1571Sends an ext reply to the player.
1525 1572
1526=cut 1573=cut
1527 1574
1528sub ext_reply($$%) { 1575sub ext_reply($$@) {
1529 my ($self, $id, %msg) = @_; 1576 my ($self, $id, @msg) = @_;
1530 1577
1531 $msg{msgid} = $id; 1578 $self->ns->ext_reply ($id, @msg)
1532 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1533} 1579}
1534 1580
1535=item $player->ext_event ($type, %msg) 1581=item $player->ext_msg ($type, @msg)
1536 1582
1537Sends an ext event to the client. 1583Sends an ext event to the client.
1538 1584
1539=cut 1585=cut
1540 1586
1541sub ext_event($$%) { 1587sub ext_msg($$@) {
1542 my ($self, $type, %msg) = @_; 1588 my ($self, $type, @msg) = @_;
1543 1589
1544 $self->ns->ext_event ($type, %msg); 1590 $self->ns->ext_msg ($type, @msg);
1545} 1591}
1546 1592
1547=head3 cf::region 1593=head3 cf::region
1548 1594
1549=over 4 1595=over 4
1765 1811
1766sub load_header_from($) { 1812sub load_header_from($) {
1767 my ($self, $path) = @_; 1813 my ($self, $path) = @_;
1768 1814
1769 utf8::encode $path; 1815 utf8::encode $path;
1770 #aio_open $path, O_RDONLY, 0 1816 my $f = new_from_file cf::object::thawer $path
1771 # or return;
1772
1773 $self->_load_header ($path)
1774 or return; 1817 or return;
1818
1819 $self->_load_header ($f)
1820 or return;
1821
1822 local $MAP_LOADING{$self->{path}} = $self;
1823 $f->resolve_delayed_derefs;
1775 1824
1776 $self->{load_path} = $path; 1825 $self->{load_path} = $path;
1777 1826
1778 1 1827 1
1779} 1828}
1833sub find { 1882sub find {
1834 my ($path, $origin) = @_; 1883 my ($path, $origin) = @_;
1835 1884
1836 $path = normalise $path, $origin && $origin->path; 1885 $path = normalise $path, $origin && $origin->path;
1837 1886
1887 cf::lock_wait "map_data:$path";#d#remove
1838 cf::lock_wait "map_find:$path"; 1888 cf::lock_wait "map_find:$path";
1839 1889
1840 $cf::MAP{$path} || do { 1890 $cf::MAP{$path} || do {
1841 my $guard = cf::lock_acquire "map_find:$path"; 1891 my $guard1 = cf::lock_acquire "map_find:$path";
1892 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1893
1842 my $map = new_from_path cf::map $path 1894 my $map = new_from_path cf::map $path
1843 or return; 1895 or return;
1844 1896
1845 $map->{last_save} = $cf::RUNTIME; 1897 $map->{last_save} = $cf::RUNTIME;
1846 1898
1848 or return; 1900 or return;
1849 1901
1850 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1902 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1851 # doing this can freeze the server in a sync job, obviously 1903 # doing this can freeze the server in a sync job, obviously
1852 #$cf::WAIT_FOR_TICK->wait; 1904 #$cf::WAIT_FOR_TICK->wait;
1905 undef $guard1;
1906 undef $guard2;
1853 $map->reset; 1907 $map->reset;
1854 undef $guard;
1855 return find $path; 1908 return find $path;
1856 } 1909 }
1857 1910
1858 $cf::MAP{$path} = $map 1911 $cf::MAP{$path} = $map
1859 } 1912 }
1868 local $self->{deny_reset} = 1; # loading can take a long time 1921 local $self->{deny_reset} = 1; # loading can take a long time
1869 1922
1870 my $path = $self->{path}; 1923 my $path = $self->{path};
1871 1924
1872 { 1925 {
1873 my $guard = cf::lock_acquire "map_load:$path"; 1926 my $guard = cf::lock_acquire "map_data:$path";
1874 1927
1928 return unless $self->valid;
1875 return if $self->in_memory != cf::MAP_SWAPPED; 1929 return unless $self->in_memory == cf::MAP_SWAPPED;
1876 1930
1877 $self->in_memory (cf::MAP_LOADING); 1931 $self->in_memory (cf::MAP_LOADING);
1878 1932
1879 $self->alloc; 1933 $self->alloc;
1880 1934
1881 $self->pre_load; 1935 $self->pre_load;
1882 Coro::cede; 1936 cf::cede_to_tick;
1883 1937
1938 my $f = new_from_file cf::object::thawer $self->{load_path};
1939 $f->skip_block;
1884 $self->_load_objects ($self->{load_path}, 1) 1940 $self->_load_objects ($f)
1885 or return; 1941 or return;
1886 1942
1887 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1943 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1888 if delete $self->{load_original}; 1944 if delete $self->{load_original};
1889 1945
1890 if (my $uniq = $self->uniq_path) { 1946 if (my $uniq = $self->uniq_path) {
1891 utf8::encode $uniq; 1947 utf8::encode $uniq;
1892 if (aio_open $uniq, O_RDONLY, 0) { 1948 unless (aio_stat $uniq) {
1949 if (my $f = new_from_file cf::object::thawer $uniq) {
1893 $self->clear_unique_items; 1950 $self->clear_unique_items;
1894 $self->_load_objects ($uniq, 0); 1951 $self->_load_objects ($f);
1952 $f->resolve_delayed_derefs;
1953 }
1895 } 1954 }
1896 } 1955 }
1897 1956
1898 Coro::cede; 1957 $f->resolve_delayed_derefs;
1958
1959 cf::cede_to_tick;
1899 # now do the right thing for maps 1960 # now do the right thing for maps
1900 $self->link_multipart_objects; 1961 $self->link_multipart_objects;
1901 $self->difficulty ($self->estimate_difficulty) 1962 $self->difficulty ($self->estimate_difficulty)
1902 unless $self->difficulty; 1963 unless $self->difficulty;
1903 Coro::cede; 1964 cf::cede_to_tick;
1904 1965
1905 unless ($self->{deny_activate}) { 1966 unless ($self->{deny_activate}) {
1906 $self->decay_objects; 1967 $self->decay_objects;
1907 $self->fix_auto_apply; 1968 $self->fix_auto_apply;
1908 $self->update_buttons; 1969 $self->update_buttons;
1909 Coro::cede; 1970 cf::cede_to_tick;
1910 $self->set_darkness_map; 1971 $self->set_darkness_map;
1911 Coro::cede; 1972 cf::cede_to_tick;
1912 $self->activate; 1973 $self->activate;
1913 } 1974 }
1975
1976 $self->{last_save} = $cf::RUNTIME;
1977 $self->last_access ($cf::RUNTIME);
1914 1978
1915 $self->in_memory (cf::MAP_IN_MEMORY); 1979 $self->in_memory (cf::MAP_IN_MEMORY);
1916 } 1980 }
1917 1981
1918 $self->post_load; 1982 $self->post_load;
1929 1993
1930 $self 1994 $self
1931} 1995}
1932 1996
1933# find and load all maps in the 3x3 area around a map 1997# find and load all maps in the 3x3 area around a map
1934sub load_diag { 1998sub load_neighbours {
1935 my ($map) = @_; 1999 my ($map) = @_;
1936 2000
1937 my @diag; # diagonal neighbours 2001 my @neigh; # diagonal neighbours
1938 2002
1939 for (0 .. 3) { 2003 for (0 .. 3) {
1940 my $neigh = $map->tile_path ($_) 2004 my $neigh = $map->tile_path ($_)
1941 or next; 2005 or next;
1942 $neigh = find $neigh, $map 2006 $neigh = find $neigh, $map
1943 or next; 2007 or next;
1944 $neigh->load; 2008 $neigh->load;
1945 2009
2010 push @neigh,
1946 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2011 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1947 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2012 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1948 } 2013 }
1949 2014
1950 for (@diag) { 2015 for (grep defined $_->[0], @neigh) {
2016 my ($path, $origin) = @$_;
1951 my $neigh = find @$_ 2017 my $neigh = find $path, $origin
1952 or next; 2018 or next;
1953 $neigh->load; 2019 $neigh->load;
1954 } 2020 }
1955} 2021}
1956 2022
1961} 2027}
1962 2028
1963sub do_load_sync { 2029sub do_load_sync {
1964 my ($map) = @_; 2030 my ($map) = @_;
1965 2031
2032 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2033 if $Coro::current == $Coro::main;
2034
1966 cf::sync_job { $map->load }; 2035 cf::sync_job { $map->load };
1967} 2036}
1968 2037
1969our %MAP_PREFETCH; 2038our %MAP_PREFETCH;
1970our $MAP_PREFETCHER = undef; 2039our $MAP_PREFETCHER = undef;
1971 2040
1972sub find_async { 2041sub find_async {
1973 my ($path, $origin) = @_; 2042 my ($path, $origin, $load) = @_;
1974 2043
1975 $path = normalise $path, $origin && $origin->{path}; 2044 $path = normalise $path, $origin && $origin->{path};
1976 2045
1977 if (my $map = $cf::MAP{$path}) { 2046 if (my $map = $cf::MAP{$path}) {
1978 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2047 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1979 } 2048 }
1980 2049
1981 undef $MAP_PREFETCH{$path}; 2050 $MAP_PREFETCH{$path} |= $load;
2051
1982 $MAP_PREFETCHER ||= cf::async { 2052 $MAP_PREFETCHER ||= cf::async {
2053 $Coro::current->{desc} = "map prefetcher";
2054
1983 while (%MAP_PREFETCH) { 2055 while (%MAP_PREFETCH) {
1984 for my $path (keys %MAP_PREFETCH) { 2056 while (my ($k, $v) = each %MAP_PREFETCH) {
1985 if (my $map = find $path) { 2057 if (my $map = find $k) {
1986 $map->load; 2058 $map->load if $v;
1987 } 2059 }
1988 2060
1989 delete $MAP_PREFETCH{$path}; 2061 delete $MAP_PREFETCH{$k};
1990 } 2062 }
1991 } 2063 }
1992 undef $MAP_PREFETCHER; 2064 undef $MAP_PREFETCHER;
1993 }; 2065 };
1994 $MAP_PREFETCHER->prio (6); 2066 $MAP_PREFETCHER->prio (6);
1997} 2069}
1998 2070
1999sub save { 2071sub save {
2000 my ($self) = @_; 2072 my ($self) = @_;
2001 2073
2002 my $lock = cf::lock_acquire "map_data:" . $self->path; 2074 my $lock = cf::lock_acquire "map_data:$self->{path}";
2003 2075
2004 $self->{last_save} = $cf::RUNTIME; 2076 $self->{last_save} = $cf::RUNTIME;
2005 2077
2006 return unless $self->dirty; 2078 return unless $self->dirty;
2007 2079
2013 return if $self->{deny_save}; 2085 return if $self->{deny_save};
2014 2086
2015 local $self->{last_access} = $self->last_access;#d# 2087 local $self->{last_access} = $self->last_access;#d#
2016 2088
2017 cf::async { 2089 cf::async {
2090 $Coro::current->{desc} = "map player save";
2018 $_->contr->save for $self->players; 2091 $_->contr->save for $self->players;
2019 }; 2092 };
2020 2093
2021 if ($uniq) { 2094 if ($uniq) {
2022 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2095 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2030 my ($self) = @_; 2103 my ($self) = @_;
2031 2104
2032 # save first because save cedes 2105 # save first because save cedes
2033 $self->save; 2106 $self->save;
2034 2107
2035 my $lock = cf::lock_acquire "map_data:" . $self->path; 2108 my $lock = cf::lock_acquire "map_data:$self->{path}";
2036 2109
2037 return if $self->players; 2110 return if $self->players;
2038 return if $self->in_memory != cf::MAP_IN_MEMORY; 2111 return if $self->in_memory != cf::MAP_IN_MEMORY;
2039 return if $self->{deny_save}; 2112 return if $self->{deny_save};
2040 2113
2114 $self->in_memory (cf::MAP_SWAPPED);
2115
2116 $self->deactivate;
2117 $_->clear_links_to ($self) for values %cf::MAP;
2041 $self->clear; 2118 $self->clear;
2042 $self->in_memory (cf::MAP_SWAPPED);
2043} 2119}
2044 2120
2045sub reset_at { 2121sub reset_at {
2046 my ($self) = @_; 2122 my ($self) = @_;
2047 2123
2079 if $uniq; 2155 if $uniq;
2080 } 2156 }
2081 2157
2082 delete $cf::MAP{$self->path}; 2158 delete $cf::MAP{$self->path};
2083 2159
2160 $self->deactivate;
2161 $_->clear_links_to ($self) for values %cf::MAP;
2084 $self->clear; 2162 $self->clear;
2085
2086 $_->clear_links_to ($self) for values %cf::MAP;
2087 2163
2088 $self->unlink_save; 2164 $self->unlink_save;
2089 $self->destroy; 2165 $self->destroy;
2090} 2166}
2091 2167
2092my $nuke_counter = "aaaa"; 2168my $nuke_counter = "aaaa";
2093 2169
2094sub nuke { 2170sub nuke {
2095 my ($self) = @_; 2171 my ($self) = @_;
2096 2172
2173 {
2174 my $lock = cf::lock_acquire "map_data:$self->{path}";
2175
2097 delete $cf::MAP{$self->path}; 2176 delete $cf::MAP{$self->path};
2098 2177
2099 $self->unlink_save; 2178 $self->unlink_save;
2100 2179
2101 bless $self, "cf::map"; 2180 bless $self, "cf::map";
2102 delete $self->{deny_reset}; 2181 delete $self->{deny_reset};
2103 $self->{deny_save} = 1; 2182 $self->{deny_save} = 1;
2104 $self->reset_timeout (1); 2183 $self->reset_timeout (1);
2105 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2184 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2106 2185
2107 $cf::MAP{$self->path} = $self; 2186 $cf::MAP{$self->path} = $self;
2187 }
2108 2188
2109 $self->reset; # polite request, might not happen 2189 $self->reset; # polite request, might not happen
2110} 2190}
2111 2191
2112=item $maps = cf::map::tmp_maps 2192=item $maps = cf::map::tmp_maps
2188 2268
2189sub inv_recursive { 2269sub inv_recursive {
2190 inv_recursive_ inv $_[0] 2270 inv_recursive_ inv $_[0]
2191} 2271}
2192 2272
2273=item $ref = $ob->ref
2274
2275creates and returns a persistent reference to an objetc that can be stored as a string.
2276
2277=item $ob = cf::object::deref ($refstring)
2278
2279returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2280even if the object actually exists. May block.
2281
2282=cut
2283
2284sub deref {
2285 my ($ref) = @_;
2286
2287 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2288 my ($uuid, $name) = ($1, $2);
2289 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2290 or return;
2291 $pl->ob->uuid eq $uuid
2292 or return;
2293
2294 $pl->ob
2295 } else {
2296 warn "$ref: cannot resolve object reference\n";
2297 undef
2298 }
2299}
2300
2193package cf; 2301package cf;
2194 2302
2195=back 2303=back
2196 2304
2197=head3 cf::object::player 2305=head3 cf::object::player
2219 2327
2220 } else { 2328 } else {
2221 my $pl = $self->contr; 2329 my $pl = $self->contr;
2222 2330
2223 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2331 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2224 my $diag = $pl->{npc_dialog}; 2332 my $dialog = $pl->{npc_dialog};
2225 $diag->{pl}->ext_reply ( 2333 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2226 $diag->{id},
2227 msgtype => "reply",
2228 msg => $diag->{pl}->expand_cfpod ($msg),
2229 add_topics => []
2230 );
2231 2334
2232 } else { 2335 } else {
2233 $msg = $npc->name . " says: $msg" if $npc; 2336 $msg = $npc->name . " says: $msg" if $npc;
2234 $self->message ($msg, $flags); 2337 $self->message ($msg, $flags);
2235 } 2338 }
2236 } 2339 }
2340}
2341
2342=item $object->send_msg ($channel, $msg, $color, [extra...])
2343
2344=cut
2345
2346sub cf::object::send_msg {
2347 my $pl = shift->contr
2348 or return;
2349 $pl->send_msg (@_);
2237} 2350}
2238 2351
2239=item $player_object->may ("access") 2352=item $player_object->may ("access")
2240 2353
2241Returns wether the given player is authorized to access resource "access" 2354Returns wether the given player is authorized to access resource "access"
2320 # use -1 or undef as default coordinates, not 0, 0 2433 # use -1 or undef as default coordinates, not 0, 0
2321 ($x, $y) = ($map->enter_x, $map->enter_y) 2434 ($x, $y) = ($map->enter_x, $map->enter_y)
2322 if $x <=0 && $y <= 0; 2435 if $x <=0 && $y <= 0;
2323 2436
2324 $map->load; 2437 $map->load;
2325 $map->load_diag; 2438 $map->load_neighbours;
2326 2439
2327 return unless $self->contr->active; 2440 return unless $self->contr->active;
2328 $self->activate_recursive; 2441 $self->activate_recursive;
2329 2442
2330 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2443 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2350 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2463 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2351 2464
2352 $self->enter_link; 2465 $self->enter_link;
2353 2466
2354 (async { 2467 (async {
2468 $Coro::current->{desc} = "player::goto $path $x $y";
2469
2470 # *tag paths override both path and x|y
2471 if ($path =~ /^\*(.*)$/) {
2472 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2473 my $ob = $obs[rand @obs];
2474
2475 # see if we actually can go there
2476 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2477 $ob = $obs[rand @obs];
2478 } else {
2479 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2480 }
2481 # else put us there anyways for now #d#
2482
2483 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2484 } else {
2485 ($path, $x, $y) = (undef, undef, undef);
2486 }
2487 }
2488
2355 my $map = eval { 2489 my $map = eval {
2356 my $map = cf::map::find $path; 2490 my $map = defined $path ? cf::map::find $path : undef;
2357 2491
2358 if ($map) { 2492 if ($map) {
2359 $map = $map->customise_for ($self); 2493 $map = $map->customise_for ($self);
2360 $map = $check->($map) if $check && $map; 2494 $map = $check->($map) if $check && $map;
2361 } else { 2495 } else {
2362 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2496 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2363 } 2497 }
2364 2498
2365 $map 2499 $map
2366 }; 2500 };
2367 2501
2457 # if exit is damned, update players death & WoR home-position 2591 # if exit is damned, update players death & WoR home-position
2458 $self->contr->savebed ($slaying, $hp, $sp) 2592 $self->contr->savebed ($slaying, $hp, $sp)
2459 if $exit->flag (FLAG_DAMNED); 2593 if $exit->flag (FLAG_DAMNED);
2460 2594
2461 (async { 2595 (async {
2596 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2597
2462 $self->deactivate_recursive; # just to be sure 2598 $self->deactivate_recursive; # just to be sure
2463 unless (eval { 2599 unless (eval {
2464 $self->goto ($slaying, $hp, $sp); 2600 $self->goto ($slaying, $hp, $sp);
2465 2601
2466 1; 2602 1;
2501the message, with C<log> being the default. If C<$color> is negative, suppress 2637the message, with C<log> being the default. If C<$color> is negative, suppress
2502the message unless the client supports the msg packet. 2638the message unless the client supports the msg packet.
2503 2639
2504=cut 2640=cut
2505 2641
2642our %CHANNEL = (
2643 "c/identify" => {
2644 id => "infobox",
2645 title => "Identify",
2646 reply => undef,
2647 tooltip => "Items recently identified",
2648 },
2649 "c/examine" => {
2650 id => "infobox",
2651 title => "Examine",
2652 reply => undef,
2653 tooltip => "Signs and other items you examined",
2654 },
2655 "c/lookat" => {
2656 id => "infobox",
2657 title => "Look",
2658 reply => undef,
2659 tooltip => "What you saw there",
2660 },
2661);
2662
2506sub cf::client::send_msg { 2663sub cf::client::send_msg {
2507 my ($self, $channel, $msg, $color, @extra) = @_; 2664 my ($self, $channel, $msg, $color, @extra) = @_;
2508 2665
2509 $msg = $self->pl->expand_cfpod ($msg); 2666 $msg = $self->pl->expand_cfpod ($msg);
2510 2667
2511 $color &= ~cf::NDI_UNIQUE; # just in case... 2668 $color &= cf::NDI_CLIENT_MASK; # just in case...
2512 2669
2670 # check predefined channels, for the benefit of C
2671 if ($CHANNEL{$channel}) {
2672 $channel = $CHANNEL{$channel};
2673
2674 $self->ext_msg (channel_info => $channel)
2675 if $self->can_msg;
2676
2677 $channel = $channel->{id};
2678
2513 if (ref $channel) { 2679 } elsif (ref $channel) {
2514 # send meta info to client, if not yet sent 2680 # send meta info to client, if not yet sent
2515 unless (exists $self->{channel}{$channel->{id}}) { 2681 unless (exists $self->{channel}{$channel->{id}}) {
2516 $self->{channel}{$channel->{id}} = $channel; 2682 $self->{channel}{$channel->{id}} = $channel;
2517 $self->ext_event (channel_info => %$channel); 2683 $self->ext_msg (channel_info => $channel)
2684 if $self->can_msg;
2518 } 2685 }
2519 2686
2520 $channel = $channel->{id}; 2687 $channel = $channel->{id};
2521 } 2688 }
2522 2689
2523 return unless @extra || length $msg; 2690 return unless @extra || length $msg;
2524 2691
2525 if ($self->can_msg) { 2692 if ($self->can_msg) {
2693 # default colour, mask it out
2694 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2695 if $color & cf::NDI_DEF;
2696
2526 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2697 $self->send_packet ("msg " . $self->{json_coder}->encode (
2698 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2527 } else { 2699 } else {
2528 # replace some tags by gcfclient-compatible ones
2529 for ($msg) {
2530 1 while
2531 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2532 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2533 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2534 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2535 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2536 }
2537
2538 if ($color >= 0) { 2700 if ($color >= 0) {
2701 # replace some tags by gcfclient-compatible ones
2702 for ($msg) {
2703 1 while
2704 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2705 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2706 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2707 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2708 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2709 }
2710
2711 $color &= cf::NDI_COLOR_MASK;
2712
2713 utf8::encode $msg;
2714
2539 if (0 && $msg =~ /\[/) { 2715 if (0 && $msg =~ /\[/) {
2716 # COMMAND/INFO
2540 $self->send_packet ("drawextinfo $color 4 0 $msg") 2717 $self->send_packet ("drawextinfo $color 10 8 $msg")
2541 } else { 2718 } else {
2542 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2719 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2543 $self->send_packet ("drawinfo $color $msg") 2720 $self->send_packet ("drawinfo $color $msg")
2544 } 2721 }
2545 } 2722 }
2546 } 2723 }
2547} 2724}
2548 2725
2549=item $client->ext_event ($type, %msg) 2726=item $client->ext_msg ($type, @msg)
2550 2727
2551Sends an ext event to the client. 2728Sends an ext event to the client.
2552 2729
2553=cut 2730=cut
2554 2731
2555sub cf::client::ext_event($$%) { 2732sub cf::client::ext_msg($$@) {
2556 my ($self, $type, %msg) = @_; 2733 my ($self, $type, @msg) = @_;
2557 2734
2558 return unless $self->extcmd; 2735 if ($self->extcmd == 2) {
2559 2736 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2737 } elsif ($self->extcmd == 1) { # TODO: remove
2560 $msg{msgtype} = "event_$type"; 2738 push @msg, msgtype => "event_$type";
2561 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2739 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2740 }
2741}
2742
2743=item $client->ext_reply ($msgid, @msg)
2744
2745Sends an ext reply to the client.
2746
2747=cut
2748
2749sub cf::client::ext_reply($$@) {
2750 my ($self, $id, @msg) = @_;
2751
2752 if ($self->extcmd == 2) {
2753 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2754 } elsif ($self->extcmd == 1) {
2755 #TODO: version 1, remove
2756 unshift @msg, msgtype => "reply", msgid => $id;
2757 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2758 }
2562} 2759}
2563 2760
2564=item $success = $client->query ($flags, "text", \&cb) 2761=item $success = $client->query ($flags, "text", \&cb)
2565 2762
2566Queues a query to the client, calling the given callback with 2763Queues a query to the client, calling the given callback with
2621 my ($ns, $buf) = @_; 2818 my ($ns, $buf) = @_;
2622 2819
2623 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2820 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2624 2821
2625 if (ref $msg) { 2822 if (ref $msg) {
2823 my ($type, $reply, @payload) =
2824 "ARRAY" eq ref $msg
2825 ? @$msg
2826 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2827
2828 my @reply;
2829
2626 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2830 if (my $cb = $EXTICMD{$type}) {
2627 if (my %reply = $cb->($ns, $msg)) { 2831 @reply = $cb->($ns, @payload);
2628 $reply{msgid} = $msg->{msgid};
2629 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2630 }
2631 } 2832 }
2833
2834 $ns->ext_reply ($reply, @reply)
2835 if $reply;
2836
2632 } else { 2837 } else {
2633 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2838 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2634 } 2839 }
2635 2840
2636 cf::override; 2841 cf::override;
2683our $safe = new Safe "safe"; 2888our $safe = new Safe "safe";
2684our $safe_hole = new Safe::Hole; 2889our $safe_hole = new Safe::Hole;
2685 2890
2686$SIG{FPE} = 'IGNORE'; 2891$SIG{FPE} = 'IGNORE';
2687 2892
2688$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2893$safe->permit_only (Opcode::opset qw(
2894 :base_core :base_mem :base_orig :base_math
2895 grepstart grepwhile mapstart mapwhile
2896 sort time
2897));
2689 2898
2690# here we export the classes and methods available to script code 2899# here we export the classes and methods available to script code
2691 2900
2692=pod 2901=pod
2693 2902
2694The following functions and methods are available within a safe environment: 2903The following functions and methods are available within a safe environment:
2695 2904
2696 cf::object 2905 cf::object
2697 contr pay_amount pay_player map x y force_find force_add 2906 contr pay_amount pay_player map x y force_find force_add destroy
2698 insert remove 2907 insert remove name archname title slaying race decrease_ob_nr
2699 2908
2700 cf::object::player 2909 cf::object::player
2701 player 2910 player
2702 2911
2703 cf::player 2912 cf::player
2708 2917
2709=cut 2918=cut
2710 2919
2711for ( 2920for (
2712 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2921 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2922 insert remove inv name archname title slaying race
2713 insert remove)], 2923 decrease_ob_nr destroy)],
2714 ["cf::object::player" => qw(player)], 2924 ["cf::object::player" => qw(player)],
2715 ["cf::player" => qw(peaceful)], 2925 ["cf::player" => qw(peaceful)],
2716 ["cf::map" => qw(trigger)], 2926 ["cf::map" => qw(trigger)],
2717) { 2927) {
2718 no strict 'refs'; 2928 no strict 'refs';
2794# the server's init and main functions 3004# the server's init and main functions
2795 3005
2796sub load_facedata($) { 3006sub load_facedata($) {
2797 my ($path) = @_; 3007 my ($path) = @_;
2798 3008
3009 # HACK to clear player env face cache, we need some signal framework
3010 # for this (global event?)
3011 %ext::player_env::MUSIC_FACE_CACHE = ();
3012
3013 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3014
2799 warn "loading facedata from $path\n"; 3015 warn "loading facedata from $path\n";
2800 3016
2801 my $facedata; 3017 my $facedata;
2802 0 < aio_load $path, $facedata 3018 0 < aio_load $path, $facedata
2803 or die "$path: $!"; 3019 or die "$path: $!";
2804 3020
2805 $facedata = Coro::Storable::thaw $facedata; 3021 $facedata = Coro::Storable::thaw $facedata;
2806 3022
2807 $facedata->{version} == 2 3023 $facedata->{version} == 2
2808 or cf::cleanup "$path: version mismatch, cannot proceed."; 3024 or cf::cleanup "$path: version mismatch, cannot proceed.";
3025
3026 # patch in the exptable
3027 $facedata->{resource}{"res/exp_table"} = {
3028 type => FT_RSRC,
3029 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3030 };
3031 cf::cede_to_tick;
2809 3032
2810 { 3033 {
2811 my $faces = $facedata->{faceinfo}; 3034 my $faces = $facedata->{faceinfo};
2812 3035
2813 while (my ($face, $info) = each %$faces) { 3036 while (my ($face, $info) = each %$faces) {
2814 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3037 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2815 cf::face::set_visibility $idx, $info->{visibility}; 3038 cf::face::set_visibility $idx, $info->{visibility};
2816 cf::face::set_magicmap $idx, $info->{magicmap}; 3039 cf::face::set_magicmap $idx, $info->{magicmap};
2817 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3040 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2818 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3041 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2819 3042
2820 cf::cede_to_tick; 3043 cf::cede_to_tick;
2821 } 3044 }
2822 3045
2823 while (my ($face, $info) = each %$faces) { 3046 while (my ($face, $info) = each %$faces) {
2848 3071
2849 { 3072 {
2850 # TODO: for gcfclient pleasure, we should give resources 3073 # TODO: for gcfclient pleasure, we should give resources
2851 # that gcfclient doesn't grok a >10000 face index. 3074 # that gcfclient doesn't grok a >10000 face index.
2852 my $res = $facedata->{resource}; 3075 my $res = $facedata->{resource};
2853 my $enc = JSON::XS->new->utf8->canonical; 3076
3077 my $soundconf = delete $res->{"res/sound.conf"};
2854 3078
2855 while (my ($name, $info) = each %$res) { 3079 while (my ($name, $info) = each %$res) {
2856 my $meta = $enc->encode ({
2857 name => $name,
2858 type => $info->{type},
2859 copyright => $info->{copyright}, #TODO#
2860 });
2861
2862 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3080 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3081 my $data;
2863 3082
2864 if ($name =~ /\.jpg$/) { 3083 if ($info->{type} & 1) {
2865 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3084 # prepend meta info
2866 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3085
3086 my $meta = $enc->encode ({
3087 name => $name,
3088 %{ $info->{meta} || {} },
3089 });
3090
3091 $data = pack "(w/a*)*", $meta, $info->{data};
2867 } else { 3092 } else {
2868 my $data = pack "(w/a*)*", $meta, $info->{data}; 3093 $data = $info->{data};
2869 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2870
2871 cf::face::set_type $idx, 1;
2872 cf::face::set_data $idx, 0, $data, $chk;
2873 } 3094 }
2874 3095
3096 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3097 cf::face::set_type $idx, $info->{type};
3098
2875 cf::cede_to_tick; 3099 cf::cede_to_tick;
2876 } 3100 }
3101
3102 if ($soundconf) {
3103 $soundconf = $enc->decode (delete $soundconf->{data});
3104
3105 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3106 my $sound = $soundconf->{compat}[$_]
3107 or next;
3108
3109 my $face = cf::face::find "sound/$sound->[1]";
3110 cf::sound::set $sound->[0] => $face;
3111 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3112 }
3113
3114 while (my ($k, $v) = each %{$soundconf->{event}}) {
3115 my $face = cf::face::find "sound/$v";
3116 cf::sound::set $k => $face;
3117 }
3118 }
2877 } 3119 }
2878 3120
2879 1 3121 1
2880} 3122}
2881 3123
3124register_exticmd fx_want => sub {
3125 my ($ns, $want) = @_;
3126
3127 while (my ($k, $v) = each %$want) {
3128 $ns->fx_want ($k, $v);
3129 }
3130};
3131
2882sub reload_regions { 3132sub reload_regions {
3133 # HACK to clear player env face cache, we need some signal framework
3134 # for this (global event?)
3135 %ext::player_env::MUSIC_FACE_CACHE = ();
3136
2883 load_resource_file "$MAPDIR/regions" 3137 load_resource_file "$MAPDIR/regions"
2884 or die "unable to load regions file\n"; 3138 or die "unable to load regions file\n";
2885 3139
2886 for (cf::region::list) { 3140 for (cf::region::list) {
2887 $_->{match} = qr/$_->{match}/ 3141 $_->{match} = qr/$_->{match}/
2923 3177
2924sub init { 3178sub init {
2925 reload_resources; 3179 reload_resources;
2926} 3180}
2927 3181
2928sub cfg_load { 3182sub reload_config {
2929 open my $fh, "<:utf8", "$CONFDIR/config" 3183 open my $fh, "<:utf8", "$CONFDIR/config"
2930 or return; 3184 or return;
2931 3185
2932 local $/; 3186 local $/;
2933 *CFG = YAML::Syck::Load <$fh>; 3187 *CFG = YAML::Syck::Load <$fh>;
2949sub main { 3203sub main {
2950 # we must not ever block the main coroutine 3204 # we must not ever block the main coroutine
2951 local $Coro::idle = sub { 3205 local $Coro::idle = sub {
2952 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3206 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2953 (async { 3207 (async {
3208 $Coro::current->{desc} = "IDLE BUG HANDLER";
2954 Event::one_event; 3209 Event::one_event;
2955 })->prio (Coro::PRIO_MAX); 3210 })->prio (Coro::PRIO_MAX);
2956 }; 3211 };
2957 3212
2958 cfg_load; 3213 reload_config;
2959 db_init; 3214 db_init;
2960 load_extensions; 3215 load_extensions;
2961 3216
2962 $TICK_WATCHER->start; 3217 $TICK_WATCHER->start;
2963 Event::loop; 3218 Event::loop;
3030 # and maps saved/destroyed asynchronously. 3285 # and maps saved/destroyed asynchronously.
3031 warn "begin emergency player save\n"; 3286 warn "begin emergency player save\n";
3032 for my $login (keys %cf::PLAYER) { 3287 for my $login (keys %cf::PLAYER) {
3033 my $pl = $cf::PLAYER{$login} or next; 3288 my $pl = $cf::PLAYER{$login} or next;
3034 $pl->valid or next; 3289 $pl->valid or next;
3290 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3035 $pl->save; 3291 $pl->save;
3036 } 3292 }
3037 warn "end emergency player save\n"; 3293 warn "end emergency player save\n";
3038 3294
3039 warn "begin emergency map save\n"; 3295 warn "begin emergency map save\n";
3156 warn "reloading cf.pm"; 3412 warn "reloading cf.pm";
3157 require cf; 3413 require cf;
3158 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3414 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3159 3415
3160 warn "loading config and database again"; 3416 warn "loading config and database again";
3161 cf::cfg_load; 3417 cf::reload_config;
3162 3418
3163 warn "loading extensions"; 3419 warn "loading extensions";
3164 cf::load_extensions; 3420 cf::load_extensions;
3165 3421
3166 warn "reattaching attachments to objects/players"; 3422 warn "reattaching attachments to objects/players";
3202register_command "reload" => sub { 3458register_command "reload" => sub {
3203 my ($who, $arg) = @_; 3459 my ($who, $arg) = @_;
3204 3460
3205 if ($who->flag (FLAG_WIZ)) { 3461 if ($who->flag (FLAG_WIZ)) {
3206 $who->message ("reloading server."); 3462 $who->message ("reloading server.");
3463 async {
3464 $Coro::current->{desc} = "perl_reload";
3207 async { reload_perl }; 3465 reload_perl;
3466 };
3208 } 3467 }
3209}; 3468};
3210 3469
3211unshift @INC, $LIBDIR; 3470unshift @INC, $LIBDIR;
3212 3471
3231 my $signal = new Coro::Signal; 3490 my $signal = new Coro::Signal;
3232 push @WAIT_FOR_TICK_BEGIN, $signal; 3491 push @WAIT_FOR_TICK_BEGIN, $signal;
3233 $signal->wait; 3492 $signal->wait;
3234} 3493}
3235 3494
3236 my $min = 1e6;#d#
3237 my $avg = 10;
3238$TICK_WATCHER = Event->timer ( 3495$TICK_WATCHER = Event->timer (
3239 reentrant => 0, 3496 reentrant => 0,
3240 parked => 1, 3497 parked => 1,
3241 prio => 0, 3498 prio => 0,
3242 at => $NEXT_TICK || $TICK, 3499 at => $NEXT_TICK || $TICK,
3250 3507
3251 $NOW = $tick_start = Event::time; 3508 $NOW = $tick_start = Event::time;
3252 3509
3253 cf::server_tick; # one server iteration 3510 cf::server_tick; # one server iteration
3254 3511
3255 0 && sync_job {#d#
3256 for(1..10) {
3257 my $t = Event::time;
3258 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3259 or die;
3260
3261 $map->width (50);
3262 $map->height (50);
3263 $map->alloc;
3264 $map->_load_objects ("/tmp/x.map", 1);
3265 my $t = Event::time - $t;
3266
3267 #next unless $t < 0.0013;#d#
3268 if ($t < $min) {
3269 $min = $t;
3270 }
3271 $avg = $avg * 0.99 + $t * 0.01;
3272 }
3273 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3274 exit 0;
3275 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3276 };
3277
3278 $RUNTIME += $TICK; 3512 $RUNTIME += $TICK;
3279 $NEXT_TICK += $TICK; 3513 $NEXT_TICK += $TICK;
3280 3514
3281 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3515 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3282 $NEXT_RUNTIME_WRITE = $NOW + 10; 3516 $NEXT_RUNTIME_WRITE = $NOW + 10;
3283 Coro::async_pool { 3517 Coro::async_pool {
3518 $Coro::current->{desc} = "runtime saver";
3284 write_runtime 3519 write_runtime
3285 or warn "ERROR: unable to write runtime file: $!"; 3520 or warn "ERROR: unable to write runtime file: $!";
3286 }; 3521 };
3287 } 3522 }
3288 3523
3289# my $AFTER = Event::time;
3290# warn $AFTER - $NOW;#d#
3291
3292 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3524 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3293 $sig->send; 3525 $sig->send;
3294 } 3526 }
3295 while (my $sig = shift @WAIT_FOR_TICK) { 3527 while (my $sig = shift @WAIT_FOR_TICK) {
3296 $sig->send; 3528 $sig->send;
3306 3538
3307 $LOAD = ($NOW - $tick_start) / $TICK; 3539 $LOAD = ($NOW - $tick_start) / $TICK;
3308 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3540 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3309 3541
3310 _post_tick; 3542 _post_tick;
3311
3312
3313 }, 3543 },
3314); 3544);
3315 3545
3316{ 3546{
3547 BDB::min_parallel 8;
3317 BDB::max_poll_time $TICK * 0.1; 3548 BDB::max_poll_time $TICK * 0.1;
3318 $BDB_POLL_WATCHER = Event->io ( 3549 $BDB_POLL_WATCHER = Event->io (
3319 reentrant => 0, 3550 reentrant => 0,
3320 fd => BDB::poll_fileno, 3551 fd => BDB::poll_fileno,
3321 poll => 'r', 3552 poll => 'r',
3322 prio => 0, 3553 prio => 0,
3323 data => WF_AUTOCANCEL, 3554 data => WF_AUTOCANCEL,
3324 cb => \&BDB::poll_cb, 3555 cb => \&BDB::poll_cb,
3325 ); 3556 );
3326 BDB::min_parallel 8;
3327 3557
3328 BDB::set_sync_prepare { 3558 BDB::set_sync_prepare {
3329 my $status; 3559 my $status;
3330 my $current = $Coro::current; 3560 my $current = $Coro::current;
3331 ( 3561 (
3340 ) 3570 )
3341 }; 3571 };
3342 3572
3343 unless ($DB_ENV) { 3573 unless ($DB_ENV) {
3344 $DB_ENV = BDB::db_env_create; 3574 $DB_ENV = BDB::db_env_create;
3575 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3576 | BDB::LOG_AUTOREMOVE, 1);
3577 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3578 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3345 3579
3346 cf::sync_job { 3580 cf::sync_job {
3347 eval { 3581 eval {
3348 BDB::db_env_open 3582 BDB::db_env_open
3349 $DB_ENV, 3583 $DB_ENV,
3351 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3585 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3352 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3586 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3353 0666; 3587 0666;
3354 3588
3355 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3589 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3356
3357 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3358 $DB_ENV->set_lk_detect;
3359 }; 3590 };
3360 3591
3361 cf::cleanup "db_env_open(db): $@" if $@; 3592 cf::cleanup "db_env_open(db): $@" if $@;
3362 }; 3593 };
3363 } 3594 }
3595
3596 $BDB_DEADLOCK_WATCHER = Event->timer (
3597 after => 3,
3598 interval => 1,
3599 hard => 1,
3600 prio => 0,
3601 data => WF_AUTOCANCEL,
3602 cb => sub {
3603 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3604 },
3605 );
3606 $BDB_CHECKPOINT_WATCHER = Event->timer (
3607 after => 11,
3608 interval => 60,
3609 hard => 1,
3610 prio => 0,
3611 data => WF_AUTOCANCEL,
3612 cb => sub {
3613 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3614 },
3615 );
3616 $BDB_TRICKLE_WATCHER = Event->timer (
3617 after => 5,
3618 interval => 10,
3619 hard => 1,
3620 prio => 0,
3621 data => WF_AUTOCANCEL,
3622 cb => sub {
3623 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3624 },
3625 );
3364} 3626}
3365 3627
3366{ 3628{
3367 IO::AIO::min_parallel 8; 3629 IO::AIO::min_parallel 8;
3368 3630
3371 $AIO_POLL_WATCHER = Event->io ( 3633 $AIO_POLL_WATCHER = Event->io (
3372 reentrant => 0, 3634 reentrant => 0,
3373 data => WF_AUTOCANCEL, 3635 data => WF_AUTOCANCEL,
3374 fd => IO::AIO::poll_fileno, 3636 fd => IO::AIO::poll_fileno,
3375 poll => 'r', 3637 poll => 'r',
3376 prio => 6, 3638 prio => 0,
3377 cb => \&IO::AIO::poll_cb, 3639 cb => \&IO::AIO::poll_cb,
3378 ); 3640 );
3379} 3641}
3380 3642
3381my $_log_backtrace; 3643my $_log_backtrace;
3387 3649
3388 # limit the # of concurrent backtraces 3650 # limit the # of concurrent backtraces
3389 if ($_log_backtrace < 2) { 3651 if ($_log_backtrace < 2) {
3390 ++$_log_backtrace; 3652 ++$_log_backtrace;
3391 async { 3653 async {
3654 $Coro::current->{desc} = "abt $msg";
3655
3392 my @bt = fork_call { 3656 my @bt = fork_call {
3393 @addr = map { sprintf "%x", $_ } @addr; 3657 @addr = map { sprintf "%x", $_ } @addr;
3394 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3658 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3395 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3659 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3396 or die "addr2line: $!"; 3660 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines