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.313 by root, Sun Jul 22 14:17:58 2007 UTC vs.
Revision 1.383 by root, Thu Oct 11 21:09:29 2007 UTC

10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 4.1 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
31use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
32use Time::HiRes; 33use Time::HiRes;
33use Compress::LZF; 34use Compress::LZF;
34use Digest::MD5 (); 35use Digest::MD5 ();
35 36
36# configure various modules to our taste 37# configure various modules to our taste
79our $NEXT_TICK; 80our $NEXT_TICK;
80our $NOW; 81our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
82 83
83our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 88our $DB_ENV;
85 89
86our %CFG; 90our %CFG;
87 91
88our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 93our $RUNTIME;
90 94
91our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
94 98
95# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 101
186 $msg .= "\n" 190 $msg .= "\n"
187 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
188 192
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 194
191 utf8::encode $msg;
192 LOG llevError, $msg; 195 LOG llevError, $msg;
193 }; 196 };
194} 197}
195 198
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
271Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
274returned. 277returned.
275 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
276Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
278 284
279=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
280 286
281Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
282 288
283=cut 289=cut
284 290
285our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
286 293
287sub lock_wait($) { 294sub lock_wait($) {
288 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
289 301
290 # wait for lock, if any 302 # wait for lock, if any
291 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 305 Coro::schedule;
299 311
300 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
301 lock_wait $key; 313 lock_wait $key;
302 314
303 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
304 317
305 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
308 } 322 }
309} 323}
310 324
322 }; 336 };
323 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
324 $guard 338 $guard
325} 339}
326 340
341=item cf::get_slot $time[, $priority[, $name]]
342
343Allocate $time seconds of blocking CPU time at priority C<$priority>:
344This call blocks and returns only when you have at least C<$time> seconds
345of cpu time till the next tick. The slot is only valid till the next cede.
346
347The optional C<$name> can be used to identify the job to run. It might be
348used for statistical purposes and should identify the same time-class.
349
350Useful for short background jobs.
351
352=cut
353
354our @SLOT_QUEUE;
355our $SLOT_QUEUE;
356
357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
361 my $signal = new Coro::Signal;
362
363 while () {
364 next_job:
365 my $avail = cf::till_tick;
366 if ($avail > 0.01) {
367 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) {
369 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send;
371 Coro::cede;
372 goto next_job;
373 }
374 }
375 }
376
377 if (@SLOT_QUEUE) {
378 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait;
381 } else {
382 Coro::schedule;
383 }
384 }
385};
386
387sub get_slot($;$$) {
388 my ($time, $pri, $name) = @_;
389
390 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal;
392
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready;
396 $sig->wait;
397}
398
327=item cf::async { BLOCK } 399=item cf::async { BLOCK }
328 400
329Currently the same as Coro::async_pool, meaning you cannot use 401Currently the same as Coro::async_pool, meaning you cannot use
330C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 402C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
331thing you are allowed to do is call C<prio> on it. 403thing you are allowed to do is call C<prio> on it.
355 my $time = Event::time; 427 my $time = Event::time;
356 428
357 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
358 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
359 431
432 LOG llevError | logBacktrace, Carp::longmess "sync job";#d#
433
360 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
361 # (but this is cancel-safe) 435 # (but this is cancel-safe)
362 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
363 437
364 my $busy = 1; 438 my $busy = 1;
365 my @res; 439 my @res;
366 440
367 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
368 @res = eval { $job->() }; 443 @res = eval { $job->() };
369 warn $@ if $@; 444 warn $@ if $@;
370 undef $busy; 445 undef $busy;
371 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
372 447
416Coro::Storable. May, of course, block. Note that the executed sub may 491Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling. 492never block itself or use any form of Event handling.
418 493
419=cut 494=cut
420 495
421sub _store_scalar {
422 open my $fh, ">", \my $buf
423 or die "fork_call: cannot open fh-to-buf in child : $!";
424 Storable::store_fd $_[0], $fh;
425 close $fh;
426
427 $buf
428}
429
430sub fork_call(&@) { 496sub fork_call(&@) {
431 my ($cb, @args) = @_; 497 my ($cb, @args) = @_;
432 498
433# 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,
434# or die "socketpair: $!"; 500 # otherwise perl prematurely frees the stuff :/
435 pipe my $fh1, my $fh2 501 # TODO: investigate and fix (likely this will be rather laborious)
436 or die "pipe: $!";
437 502
438 if (my $pid = fork) { 503 my @res = Coro::Util::fork_eval {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals; 504 reset_signals;
452 local $SIG{__WARN__}; 505 &$cb
453 local $SIG{__DIE__}; 506 }, @args;
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459 507
460 eval { 508 wantarray ? @res : $res[-1]
461 close $fh1;
462
463 my @res = eval { $cb->(@args) };
464
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466 close $fh2;
467 };
468
469 warn $@ if $@;
470 _exit 0;
471 }
472} 509}
473 510
474=item $value = cf::db_get $family => $key 511=item $value = cf::db_get $family => $key
475 512
476Returns a single value from the environment database. 513Returns a single value from the environment database.
478=item cf::db_put $family => $key => $value 515=item cf::db_put $family => $key => $value
479 516
480Stores 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
481data 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).
482 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
483=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}
484 543
485our $DB; 544our $DB;
486 545
487sub db_init { 546sub db_init {
488 unless ($DB) {
489 $DB = BDB::db_create $DB_ENV;
490
491 cf::sync_job { 547 cf::sync_job {
492 eval { 548 $DB ||= db_table "db";
493 $DB->set_flags (BDB::CHKSUM);
494
495 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
496 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
497 cf::cleanup "db_open(db): $!" if $!;
498 };
499 cf::cleanup "db_open(db): $@" if $@;
500 };
501 } 549 };
502} 550}
503 551
504sub db_get($$) { 552sub db_get($$) {
505 my $key = "$_[0]/$_[1]"; 553 my $key = "$_[0]/$_[1]";
506 554
556 if (1) { 604 if (1) {
557 $md5 = 605 $md5 =
558 join "\x00", 606 join "\x00",
559 $processversion, 607 $processversion,
560 map { 608 map {
561 Coro::cede; 609 cf::cede_to_tick;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 610 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src; 611 } 0.. $#$src;
564 612
565 613
566 my $dbmd5 = db_get cache => "$id/md5"; 614 my $dbmd5 = db_get cache => "$id/md5";
985sub object_freezer_save { 1033sub object_freezer_save {
986 my ($filename, $rdata, $objs) = @_; 1034 my ($filename, $rdata, $objs) = @_;
987 1035
988 sync_job { 1036 sync_job {
989 if (length $$rdata) { 1037 if (length $$rdata) {
1038 utf8::decode (my $decname = $filename);
990 warn sprintf "saving %s (%d,%d)\n", 1039 warn sprintf "saving %s (%d,%d)\n",
991 $filename, length $$rdata, scalar @$objs; 1040 $decname, length $$rdata, scalar @$objs;
992 1041
993 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1042 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
994 chmod SAVE_MODE, $fh; 1043 chmod SAVE_MODE, $fh;
995 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1044 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
996 aio_fsync $fh if $cf::USE_FSYNC; 1045 aio_fsync $fh if $cf::USE_FSYNC;
997 close $fh; 1046 close $fh;
998 1047
999 if (@$objs) { 1048 if (@$objs) {
1000 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1049 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1001 chmod SAVE_MODE, $fh; 1050 chmod SAVE_MODE, $fh;
1002 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1051 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1003 aio_write $fh, 0, (length $data), $data, 0; 1052 aio_write $fh, 0, (length $data), $data, 0;
1004 aio_fsync $fh if $cf::USE_FSYNC; 1053 aio_fsync $fh if $cf::USE_FSYNC;
1005 close $fh; 1054 close $fh;
1006 aio_rename "$filename.pst~", "$filename.pst"; 1055 aio_rename "$filename.pst~", "$filename.pst";
1007 } 1056 }
1015 } 1064 }
1016 } else { 1065 } else {
1017 aio_unlink $filename; 1066 aio_unlink $filename;
1018 aio_unlink "$filename.pst"; 1067 aio_unlink "$filename.pst";
1019 } 1068 }
1020 } 1069 };
1021} 1070}
1022 1071
1023sub object_freezer_as_string { 1072sub object_freezer_as_string {
1024 my ($rdata, $objs) = @_; 1073 my ($rdata, $objs) = @_;
1025 1074
1037 or return; 1086 or return;
1038 1087
1039 unless (aio_stat "$filename.pst") { 1088 unless (aio_stat "$filename.pst") {
1040 (aio_load "$filename.pst", $av) >= 0 1089 (aio_load "$filename.pst", $av) >= 0
1041 or return; 1090 or return;
1042 $av = eval { (Storable::thaw $av)->{objs} };
1043 }
1044 1091
1092 my $st = eval { Coro::Storable::thaw $av }
1093 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1094 $av = $st->{objs};
1095 }
1096
1097 utf8::decode (my $decname = $filename);
1045 warn sprintf "loading %s (%d)\n", 1098 warn sprintf "loading %s (%d,%d)\n",
1046 $filename, length $data, scalar @{$av || []}; 1099 $decname, length $data, scalar @{$av || []};
1100
1047 return ($data, $av); 1101 ($data, $av)
1048} 1102}
1049 1103
1050=head2 COMMAND CALLBACKS 1104=head2 COMMAND CALLBACKS
1051 1105
1052=over 4 1106=over 4
1125 my ($pl, $buf) = @_; 1179 my ($pl, $buf) = @_;
1126 1180
1127 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1181 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1128 1182
1129 if (ref $msg) { 1183 if (ref $msg) {
1184 my ($type, $reply, @payload) =
1185 "ARRAY" eq ref $msg
1186 ? @$msg
1187 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1188
1189 my @reply;
1190
1130 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1191 if (my $cb = $EXTCMD{$type}) {
1131 if (my %reply = $cb->($pl, $msg)) { 1192 @reply = $cb->($pl, @payload);
1132 $pl->ext_reply ($msg->{msgid}, %reply);
1133 }
1134 } 1193 }
1194
1195 $pl->ext_reply ($reply, @reply)
1196 if $reply;
1197
1135 } else { 1198 } else {
1136 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1199 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1137 } 1200 }
1138 1201
1139 cf::override; 1202 cf::override;
1229 1292
1230=head3 cf::player 1293=head3 cf::player
1231 1294
1232=over 4 1295=over 4
1233 1296
1297=item cf::player::num_playing
1298
1299Returns the official number of playing players, as per the Crossfire metaserver rules.
1300
1301=cut
1302
1303sub num_playing {
1304 scalar grep
1305 $_->ob->map
1306 && !$_->hidden
1307 && !$_->ob->flag (cf::FLAG_WIZ),
1308 cf::player::list
1309}
1310
1234=item cf::player::find $login 1311=item cf::player::find $login
1235 1312
1236Returns the given player object, loading it if necessary (might block). 1313Returns the given player object, loading it if necessary (might block).
1237 1314
1238=cut 1315=cut
1273 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1350 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1274 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1351 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1275 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1352 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1276 aio_unlink +(playerdir $login) . "/$login.pl"; 1353 aio_unlink +(playerdir $login) . "/$login.pl";
1277 1354
1278 my $pl = load_pl path $login 1355 my $f = new_from_file cf::object::thawer path $login
1279 or return; 1356 or return;
1357
1358 my $pl = cf::player::load_pl $f
1359 or return;
1360 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs;
1280 $cf::PLAYER{$login} = $pl 1362 $cf::PLAYER{$login} = $pl
1281 } 1363 }
1282 } 1364 }
1283} 1365}
1284 1366
1294 1376
1295 aio_mkdir playerdir $pl, 0770; 1377 aio_mkdir playerdir $pl, 0770;
1296 $pl->{last_save} = $cf::RUNTIME; 1378 $pl->{last_save} = $cf::RUNTIME;
1297 1379
1298 $pl->save_pl ($path); 1380 $pl->save_pl ($path);
1299 Coro::cede; 1381 cf::cede_to_tick;
1300} 1382}
1301 1383
1302sub new($) { 1384sub new($) {
1303 my ($login) = @_; 1385 my ($login) = @_;
1304 1386
1308 $self->{deny_save} = 1; 1390 $self->{deny_save} = 1;
1309 1391
1310 $cf::PLAYER{$login} = $self; 1392 $cf::PLAYER{$login} = $self;
1311 1393
1312 $self 1394 $self
1395}
1396
1397=item $player->send_msg ($channel, $msg, $color, [extra...])
1398
1399=cut
1400
1401sub send_msg {
1402 my $ns = shift->ns
1403 or return;
1404 $ns->send_msg (@_);
1313} 1405}
1314 1406
1315=item $pl->quit_character 1407=item $pl->quit_character
1316 1408
1317Nukes the player without looking back. If logged in, the connection will 1409Nukes the player without looking back. If logged in, the connection will
1372 or return []; 1464 or return [];
1373 1465
1374 my @logins; 1466 my @logins;
1375 1467
1376 for my $login (@$dirs) { 1468 for my $login (@$dirs) {
1469 my $path = path $login;
1470
1471 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") {
1377 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1378 aio_read $fh, 0, 512, my $buf, 0 or next; 1474 aio_read $fh, 0, 512, my $buf, 0 or next;
1379 $buf !~ /^password -------------$/m or next; # official not-valid tag 1475 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 }
1380 1477
1381 utf8::decode $login; 1478 utf8::decode $login;
1382 push @logins, $login; 1479 push @logins, $login;
1383 } 1480 }
1384 1481
1422sub expand_cfpod { 1519sub expand_cfpod {
1423 ((my $self), (local $_)) = @_; 1520 ((my $self), (local $_)) = @_;
1424 1521
1425 # escape & and < 1522 # escape & and <
1426 s/&/&amp;/g; 1523 s/&/&amp;/g;
1427 s/(?<![BIUGH])</&lt;/g; 1524 s/(?<![BIUGHT])</&lt;/g;
1428 1525
1429 # this is buggy, it needs to properly take care of nested <'s 1526 # this is buggy, it needs to properly take care of nested <'s
1430 1527
1431 1 while 1528 1 while
1432 # replace B<>, I<>, U<> etc. 1529 # replace B<>, I<>, U<> etc.
1433 s/B<([^\>]*)>/<b>$1<\/b>/ 1530 s/B<([^\>]*)>/<b>$1<\/b>/
1434 || s/I<([^\>]*)>/<i>$1<\/i>/ 1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1435 || s/U<([^\>]*)>/<u>$1<\/u>/ 1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1436 # replace G<male|female> tags 1534 # replace G<male|female> tags
1437 || s{G<([^>|]*)\|([^>]*)>}{ 1535 || s{G<([^>|]*)\|([^>]*)>}{
1438 $self->gender ? $2 : $1 1536 $self->gender ? $2 : $1
1439 }ge 1537 }ge
1440 # replace H<hint text> 1538 # replace H<hint text>
1461sub hintmode { 1559sub hintmode {
1462 $_[0]{hintmode} = $_[1] if @_ > 1; 1560 $_[0]{hintmode} = $_[1] if @_ > 1;
1463 $_[0]{hintmode} 1561 $_[0]{hintmode}
1464} 1562}
1465 1563
1466=item $player->ext_reply ($msgid, %msg) 1564=item $player->ext_reply ($msgid, @msg)
1467 1565
1468Sends an ext reply to the player. 1566Sends an ext reply to the player.
1469 1567
1470=cut 1568=cut
1471 1569
1472sub ext_reply($$%) { 1570sub ext_reply($$@) {
1473 my ($self, $id, %msg) = @_; 1571 my ($self, $id, @msg) = @_;
1474 1572
1475 $msg{msgid} = $id; 1573 $self->ns->ext_reply ($id, @msg)
1476 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1477} 1574}
1478 1575
1479=item $player->ext_event ($type, %msg) 1576=item $player->ext_msg ($type, @msg)
1480 1577
1481Sends an ext event to the client. 1578Sends an ext event to the client.
1482 1579
1483=cut 1580=cut
1484 1581
1485sub ext_event($$%) { 1582sub ext_msg($$@) {
1486 my ($self, $type, %msg) = @_; 1583 my ($self, $type, @msg) = @_;
1487 1584
1488 $self->ns->ext_event ($type, %msg); 1585 $self->ns->ext_msg ($type, @msg);
1489} 1586}
1490 1587
1491=head3 cf::region 1588=head3 cf::region
1492 1589
1493=over 4 1590=over 4
1709 1806
1710sub load_header_from($) { 1807sub load_header_from($) {
1711 my ($self, $path) = @_; 1808 my ($self, $path) = @_;
1712 1809
1713 utf8::encode $path; 1810 utf8::encode $path;
1714 #aio_open $path, O_RDONLY, 0 1811 my $f = new_from_file cf::object::thawer $path
1715 # or return;
1716
1717 $self->_load_header ($path)
1718 or return; 1812 or return;
1813
1814 $self->_load_header ($f)
1815 or return;
1816
1817 local $MAP_LOADING{$self->{path}} = $self;
1818 $f->resolve_delayed_derefs;
1719 1819
1720 $self->{load_path} = $path; 1820 $self->{load_path} = $path;
1721 1821
1722 1 1822 1
1723} 1823}
1777sub find { 1877sub find {
1778 my ($path, $origin) = @_; 1878 my ($path, $origin) = @_;
1779 1879
1780 $path = normalise $path, $origin && $origin->path; 1880 $path = normalise $path, $origin && $origin->path;
1781 1881
1882 cf::lock_wait "map_data:$path";#d#remove
1782 cf::lock_wait "map_find:$path"; 1883 cf::lock_wait "map_find:$path";
1783 1884
1784 $cf::MAP{$path} || do { 1885 $cf::MAP{$path} || do {
1785 my $guard = cf::lock_acquire "map_find:$path"; 1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1786 my $map = new_from_path cf::map $path 1889 my $map = new_from_path cf::map $path
1787 or return; 1890 or return;
1788 1891
1789 $map->{last_save} = $cf::RUNTIME; 1892 $map->{last_save} = $cf::RUNTIME;
1790 1893
1792 or return; 1895 or return;
1793 1896
1794 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1795 # doing this can freeze the server in a sync job, obviously 1898 # doing this can freeze the server in a sync job, obviously
1796 #$cf::WAIT_FOR_TICK->wait; 1899 #$cf::WAIT_FOR_TICK->wait;
1900 undef $guard1;
1901 undef $guard2;
1797 $map->reset; 1902 $map->reset;
1798 undef $guard;
1799 return find $path; 1903 return find $path;
1800 } 1904 }
1801 1905
1802 $cf::MAP{$path} = $map 1906 $cf::MAP{$path} = $map
1803 } 1907 }
1812 local $self->{deny_reset} = 1; # loading can take a long time 1916 local $self->{deny_reset} = 1; # loading can take a long time
1813 1917
1814 my $path = $self->{path}; 1918 my $path = $self->{path};
1815 1919
1816 { 1920 {
1817 my $guard = cf::lock_acquire "map_load:$path"; 1921 my $guard = cf::lock_acquire "map_data:$path";
1818 1922
1923 return unless $self->valid;
1819 return if $self->in_memory != cf::MAP_SWAPPED; 1924 return unless $self->in_memory == cf::MAP_SWAPPED;
1820 1925
1821 $self->in_memory (cf::MAP_LOADING); 1926 $self->in_memory (cf::MAP_LOADING);
1822 1927
1823 $self->alloc; 1928 $self->alloc;
1824 1929
1825 $self->pre_load; 1930 $self->pre_load;
1826 Coro::cede; 1931 cf::cede_to_tick;
1827 1932
1933 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block;
1828 $self->_load_objects ($self->{load_path}, 1) 1935 $self->_load_objects ($f)
1829 or return; 1936 or return;
1830 1937
1831 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1832 if delete $self->{load_original}; 1939 if delete $self->{load_original};
1833 1940
1834 if (my $uniq = $self->uniq_path) { 1941 if (my $uniq = $self->uniq_path) {
1835 utf8::encode $uniq; 1942 utf8::encode $uniq;
1836 if (aio_open $uniq, O_RDONLY, 0) { 1943 unless (aio_stat $uniq) {
1944 if (my $f = new_from_file cf::object::thawer $uniq) {
1837 $self->clear_unique_items; 1945 $self->clear_unique_items;
1838 $self->_load_objects ($uniq, 0); 1946 $self->_load_objects ($f);
1947 $f->resolve_delayed_derefs;
1948 }
1839 } 1949 }
1840 } 1950 }
1841 1951
1842 Coro::cede; 1952 $f->resolve_delayed_derefs;
1953
1954 cf::cede_to_tick;
1843 # now do the right thing for maps 1955 # now do the right thing for maps
1844 $self->link_multipart_objects; 1956 $self->link_multipart_objects;
1845 $self->difficulty ($self->estimate_difficulty) 1957 $self->difficulty ($self->estimate_difficulty)
1846 unless $self->difficulty; 1958 unless $self->difficulty;
1847 Coro::cede; 1959 cf::cede_to_tick;
1848 1960
1849 unless ($self->{deny_activate}) { 1961 unless ($self->{deny_activate}) {
1850 $self->decay_objects; 1962 $self->decay_objects;
1851 $self->fix_auto_apply; 1963 $self->fix_auto_apply;
1852 $self->update_buttons; 1964 $self->update_buttons;
1853 Coro::cede; 1965 cf::cede_to_tick;
1854 $self->set_darkness_map; 1966 $self->set_darkness_map;
1855 Coro::cede; 1967 cf::cede_to_tick;
1856 $self->activate; 1968 $self->activate;
1857 } 1969 }
1970
1971 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME);
1858 1973
1859 $self->in_memory (cf::MAP_IN_MEMORY); 1974 $self->in_memory (cf::MAP_IN_MEMORY);
1860 } 1975 }
1861 1976
1862 $self->post_load; 1977 $self->post_load;
1873 1988
1874 $self 1989 $self
1875} 1990}
1876 1991
1877# find and load all maps in the 3x3 area around a map 1992# find and load all maps in the 3x3 area around a map
1878sub load_diag { 1993sub load_neighbours {
1879 my ($map) = @_; 1994 my ($map) = @_;
1880 1995
1881 my @diag; # diagonal neighbours 1996 my @neigh; # diagonal neighbours
1882 1997
1883 for (0 .. 3) { 1998 for (0 .. 3) {
1884 my $neigh = $map->tile_path ($_) 1999 my $neigh = $map->tile_path ($_)
1885 or next; 2000 or next;
1886 $neigh = find $neigh, $map 2001 $neigh = find $neigh, $map
1887 or next; 2002 or next;
1888 $neigh->load; 2003 $neigh->load;
1889 2004
2005 push @neigh,
1890 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2006 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1891 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2007 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1892 } 2008 }
1893 2009
1894 for (@diag) { 2010 for (grep defined $_->[0], @neigh) {
2011 my ($path, $origin) = @$_;
1895 my $neigh = find @$_ 2012 my $neigh = find $path, $origin
1896 or next; 2013 or next;
1897 $neigh->load; 2014 $neigh->load;
1898 } 2015 }
1899} 2016}
1900 2017
1905} 2022}
1906 2023
1907sub do_load_sync { 2024sub do_load_sync {
1908 my ($map) = @_; 2025 my ($map) = @_;
1909 2026
2027 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2028 if $Coro::current == $Coro::main;
2029
1910 cf::sync_job { $map->load }; 2030 cf::sync_job { $map->load };
1911} 2031}
1912 2032
1913our %MAP_PREFETCH; 2033our %MAP_PREFETCH;
1914our $MAP_PREFETCHER = undef; 2034our $MAP_PREFETCHER = undef;
1915 2035
1916sub find_async { 2036sub find_async {
1917 my ($path, $origin) = @_; 2037 my ($path, $origin, $load) = @_;
1918 2038
1919 $path = normalise $path, $origin && $origin->{path}; 2039 $path = normalise $path, $origin && $origin->{path};
1920 2040
1921 if (my $map = $cf::MAP{$path}) { 2041 if (my $map = $cf::MAP{$path}) {
1922 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1923 } 2043 }
1924 2044
1925 undef $MAP_PREFETCH{$path}; 2045 $MAP_PREFETCH{$path} |= $load;
2046
1926 $MAP_PREFETCHER ||= cf::async { 2047 $MAP_PREFETCHER ||= cf::async {
2048 $Coro::current->{desc} = "map prefetcher";
2049
1927 while (%MAP_PREFETCH) { 2050 while (%MAP_PREFETCH) {
1928 for my $path (keys %MAP_PREFETCH) { 2051 while (my ($k, $v) = each %MAP_PREFETCH) {
1929 if (my $map = find $path) { 2052 if (my $map = find $k) {
1930 $map->load; 2053 $map->load if $v;
1931 } 2054 }
1932 2055
1933 delete $MAP_PREFETCH{$path}; 2056 delete $MAP_PREFETCH{$k};
1934 } 2057 }
1935 } 2058 }
1936 undef $MAP_PREFETCHER; 2059 undef $MAP_PREFETCHER;
1937 }; 2060 };
1938 $MAP_PREFETCHER->prio (6); 2061 $MAP_PREFETCHER->prio (6);
1941} 2064}
1942 2065
1943sub save { 2066sub save {
1944 my ($self) = @_; 2067 my ($self) = @_;
1945 2068
1946 my $lock = cf::lock_acquire "map_data:" . $self->path; 2069 my $lock = cf::lock_acquire "map_data:$self->{path}";
1947 2070
1948 $self->{last_save} = $cf::RUNTIME; 2071 $self->{last_save} = $cf::RUNTIME;
1949 2072
1950 return unless $self->dirty; 2073 return unless $self->dirty;
1951 2074
1957 return if $self->{deny_save}; 2080 return if $self->{deny_save};
1958 2081
1959 local $self->{last_access} = $self->last_access;#d# 2082 local $self->{last_access} = $self->last_access;#d#
1960 2083
1961 cf::async { 2084 cf::async {
2085 $Coro::current->{desc} = "map player save";
1962 $_->contr->save for $self->players; 2086 $_->contr->save for $self->players;
1963 }; 2087 };
1964 2088
1965 if ($uniq) { 2089 if ($uniq) {
1966 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2090 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1974 my ($self) = @_; 2098 my ($self) = @_;
1975 2099
1976 # save first because save cedes 2100 # save first because save cedes
1977 $self->save; 2101 $self->save;
1978 2102
1979 my $lock = cf::lock_acquire "map_data:" . $self->path; 2103 my $lock = cf::lock_acquire "map_data:$self->{path}";
1980 2104
1981 return if $self->players; 2105 return if $self->players;
1982 return if $self->in_memory != cf::MAP_IN_MEMORY; 2106 return if $self->in_memory != cf::MAP_IN_MEMORY;
1983 return if $self->{deny_save}; 2107 return if $self->{deny_save};
1984 2108
2109 $self->in_memory (cf::MAP_SWAPPED);
2110
2111 $self->deactivate;
2112 $_->clear_links_to ($self) for values %cf::MAP;
1985 $self->clear; 2113 $self->clear;
1986 $self->in_memory (cf::MAP_SWAPPED);
1987} 2114}
1988 2115
1989sub reset_at { 2116sub reset_at {
1990 my ($self) = @_; 2117 my ($self) = @_;
1991 2118
2023 if $uniq; 2150 if $uniq;
2024 } 2151 }
2025 2152
2026 delete $cf::MAP{$self->path}; 2153 delete $cf::MAP{$self->path};
2027 2154
2155 $self->deactivate;
2156 $_->clear_links_to ($self) for values %cf::MAP;
2028 $self->clear; 2157 $self->clear;
2029
2030 $_->clear_links_to ($self) for values %cf::MAP;
2031 2158
2032 $self->unlink_save; 2159 $self->unlink_save;
2033 $self->destroy; 2160 $self->destroy;
2034} 2161}
2035 2162
2036my $nuke_counter = "aaaa"; 2163my $nuke_counter = "aaaa";
2037 2164
2038sub nuke { 2165sub nuke {
2039 my ($self) = @_; 2166 my ($self) = @_;
2040 2167
2168 {
2169 my $lock = cf::lock_acquire "map_data:$self->{path}";
2170
2041 delete $cf::MAP{$self->path}; 2171 delete $cf::MAP{$self->path};
2042 2172
2043 $self->unlink_save; 2173 $self->unlink_save;
2044 2174
2045 bless $self, "cf::map"; 2175 bless $self, "cf::map";
2046 delete $self->{deny_reset}; 2176 delete $self->{deny_reset};
2047 $self->{deny_save} = 1; 2177 $self->{deny_save} = 1;
2048 $self->reset_timeout (1); 2178 $self->reset_timeout (1);
2049 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2179 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2050 2180
2051 $cf::MAP{$self->path} = $self; 2181 $cf::MAP{$self->path} = $self;
2182 }
2052 2183
2053 $self->reset; # polite request, might not happen 2184 $self->reset; # polite request, might not happen
2054} 2185}
2055 2186
2056=item $maps = cf::map::tmp_maps 2187=item $maps = cf::map::tmp_maps
2132 2263
2133sub inv_recursive { 2264sub inv_recursive {
2134 inv_recursive_ inv $_[0] 2265 inv_recursive_ inv $_[0]
2135} 2266}
2136 2267
2268=item $ref = $ob->ref
2269
2270creates and returns a persistent reference to an objetc that can be stored as a string.
2271
2272=item $ob = cf::object::deref ($refstring)
2273
2274returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2275even if the object actually exists. May block.
2276
2277=cut
2278
2279sub deref {
2280 my ($ref) = @_;
2281
2282 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return;
2286 $pl->ob->uuid eq $uuid
2287 or return;
2288
2289 $pl->ob
2290 } else {
2291 warn "$ref: cannot resolve object reference\n";
2292 undef
2293 }
2294}
2295
2137package cf; 2296package cf;
2138 2297
2139=back 2298=back
2140 2299
2141=head3 cf::object::player 2300=head3 cf::object::player
2163 2322
2164 } else { 2323 } else {
2165 my $pl = $self->contr; 2324 my $pl = $self->contr;
2166 2325
2167 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2326 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2168 my $diag = $pl->{npc_dialog}; 2327 my $dialog = $pl->{npc_dialog};
2169 $diag->{pl}->ext_reply ( 2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2170 $diag->{id},
2171 msgtype => "reply",
2172 msg => $diag->{pl}->expand_cfpod ($msg),
2173 add_topics => []
2174 );
2175 2329
2176 } else { 2330 } else {
2177 $msg = $npc->name . " says: $msg" if $npc; 2331 $msg = $npc->name . " says: $msg" if $npc;
2178 $self->message ($msg, $flags); 2332 $self->message ($msg, $flags);
2179 } 2333 }
2180 } 2334 }
2335}
2336
2337=item $object->send_msg ($channel, $msg, $color, [extra...])
2338
2339=cut
2340
2341sub cf::object::send_msg {
2342 my $pl = shift->contr
2343 or return;
2344 $pl->send_msg (@_);
2181} 2345}
2182 2346
2183=item $player_object->may ("access") 2347=item $player_object->may ("access")
2184 2348
2185Returns wether the given player is authorized to access resource "access" 2349Returns wether the given player is authorized to access resource "access"
2264 # use -1 or undef as default coordinates, not 0, 0 2428 # use -1 or undef as default coordinates, not 0, 0
2265 ($x, $y) = ($map->enter_x, $map->enter_y) 2429 ($x, $y) = ($map->enter_x, $map->enter_y)
2266 if $x <=0 && $y <= 0; 2430 if $x <=0 && $y <= 0;
2267 2431
2268 $map->load; 2432 $map->load;
2269 $map->load_diag; 2433 $map->load_neighbours;
2270 2434
2271 return unless $self->contr->active; 2435 return unless $self->contr->active;
2272 $self->activate_recursive; 2436 $self->activate_recursive;
2273 2437
2274 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2294 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2295 2459
2296 $self->enter_link; 2460 $self->enter_link;
2297 2461
2298 (async { 2462 (async {
2463 $Coro::current->{desc} = "player::goto $path $x $y";
2464
2465 # *tag paths override both path and x|y
2466 if ($path =~ /^\*(.*)$/) {
2467 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2468 my $ob = $obs[rand @obs];
2469
2470 # see if we actually can go there
2471 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2472 $ob = $obs[rand @obs];
2473 } else {
2474 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2475 }
2476 # else put us there anyways for now #d#
2477
2478 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2479 } else {
2480 ($path, $x, $y) = (undef, undef, undef);
2481 }
2482 }
2483
2299 my $map = eval { 2484 my $map = eval {
2300 my $map = cf::map::find $path; 2485 my $map = defined $path ? cf::map::find $path : undef;
2301 2486
2302 if ($map) { 2487 if ($map) {
2303 $map = $map->customise_for ($self); 2488 $map = $map->customise_for ($self);
2304 $map = $check->($map) if $check && $map; 2489 $map = $check->($map) if $check && $map;
2305 } else { 2490 } else {
2306 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2491 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2307 } 2492 }
2308 2493
2309 $map 2494 $map
2310 }; 2495 };
2311 2496
2401 # if exit is damned, update players death & WoR home-position 2586 # if exit is damned, update players death & WoR home-position
2402 $self->contr->savebed ($slaying, $hp, $sp) 2587 $self->contr->savebed ($slaying, $hp, $sp)
2403 if $exit->flag (FLAG_DAMNED); 2588 if $exit->flag (FLAG_DAMNED);
2404 2589
2405 (async { 2590 (async {
2591 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2592
2406 $self->deactivate_recursive; # just to be sure 2593 $self->deactivate_recursive; # just to be sure
2407 unless (eval { 2594 unless (eval {
2408 $self->goto ($slaying, $hp, $sp); 2595 $self->goto ($slaying, $hp, $sp);
2409 2596
2410 1; 2597 1;
2445the message, with C<log> being the default. If C<$color> is negative, suppress 2632the message, with C<log> being the default. If C<$color> is negative, suppress
2446the message unless the client supports the msg packet. 2633the message unless the client supports the msg packet.
2447 2634
2448=cut 2635=cut
2449 2636
2637our %CHANNEL = (
2638 "c/identify" => {
2639 id => "infobox",
2640 title => "Identify",
2641 reply => undef,
2642 tooltip => "Items recently identified",
2643 },
2644 "c/examine" => {
2645 id => "infobox",
2646 title => "Examine",
2647 reply => undef,
2648 tooltip => "Signs and other items you examined",
2649 },
2650 "c/lookat" => {
2651 id => "infobox",
2652 title => "Look",
2653 reply => undef,
2654 tooltip => "What you saw there",
2655 },
2656);
2657
2450sub cf::client::send_msg { 2658sub cf::client::send_msg {
2451 my ($self, $channel, $msg, $color, @extra) = @_; 2659 my ($self, $channel, $msg, $color, @extra) = @_;
2452 2660
2453 $msg = $self->pl->expand_cfpod ($msg); 2661 $msg = $self->pl->expand_cfpod ($msg);
2454 2662
2455 $color &= ~cf::NDI_UNIQUE; # just in case... 2663 $color &= cf::NDI_CLIENT_MASK; # just in case...
2456 2664
2665 # check predefined channels, for the benefit of C
2666 if ($CHANNEL{$channel}) {
2667 $channel = $CHANNEL{$channel};
2668
2669 $self->ext_msg (channel_info => $channel)
2670 if $self->can_msg;
2671
2672 $channel = $channel->{id};
2673
2457 if (ref $channel) { 2674 } elsif (ref $channel) {
2458 # send meta info to client, if not yet sent 2675 # send meta info to client, if not yet sent
2459 unless (exists $self->{channel}{$channel->{id}}) { 2676 unless (exists $self->{channel}{$channel->{id}}) {
2460 $self->{channel}{$channel->{id}} = $channel; 2677 $self->{channel}{$channel->{id}} = $channel;
2461 $self->ext_event (channel_info => %$channel); 2678 $self->ext_msg (channel_info => $channel)
2679 if $self->can_msg;
2462 } 2680 }
2463 2681
2464 $channel = $channel->{id}; 2682 $channel = $channel->{id};
2465 } 2683 }
2466 2684
2467 return unless @extra || length $msg; 2685 return unless @extra || length $msg;
2468 2686
2469 if ($self->can_msg) { 2687 if ($self->can_msg) {
2688 # default colour, mask it out
2689 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2690 if $color & cf::NDI_DEF;
2691
2470 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2692 $self->send_packet ("msg " . $self->{json_coder}->encode (
2693 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2471 } else { 2694 } else {
2472 # replace some tags by gcfclient-compatible ones
2473 for ($msg) {
2474 1 while
2475 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2476 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2477 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2478 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2479 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2480 }
2481
2482 if ($color >= 0) { 2695 if ($color >= 0) {
2696 # replace some tags by gcfclient-compatible ones
2697 for ($msg) {
2698 1 while
2699 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2700 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2701 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2702 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2703 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2704 }
2705
2706 $color &= cf::NDI_COLOR_MASK;
2707
2708 utf8::encode $msg;
2709
2483 if (0 && $msg =~ /\[/) { 2710 if (0 && $msg =~ /\[/) {
2711 # COMMAND/INFO
2484 $self->send_packet ("drawextinfo $color 4 0 $msg") 2712 $self->send_packet ("drawextinfo $color 10 8 $msg")
2485 } else { 2713 } else {
2486 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2714 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2487 $self->send_packet ("drawinfo $color $msg") 2715 $self->send_packet ("drawinfo $color $msg")
2488 } 2716 }
2489 } 2717 }
2490 } 2718 }
2491} 2719}
2492 2720
2493=item $client->ext_event ($type, %msg) 2721=item $client->ext_msg ($type, @msg)
2494 2722
2495Sends an ext event to the client. 2723Sends an ext event to the client.
2496 2724
2497=cut 2725=cut
2498 2726
2499sub cf::client::ext_event($$%) { 2727sub cf::client::ext_msg($$@) {
2500 my ($self, $type, %msg) = @_; 2728 my ($self, $type, @msg) = @_;
2501 2729
2502 return unless $self->extcmd; 2730 if ($self->extcmd == 2) {
2503 2731 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2732 } elsif ($self->extcmd == 1) { # TODO: remove
2504 $msg{msgtype} = "event_$type"; 2733 push @msg, msgtype => "event_$type";
2505 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2734 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2735 }
2736}
2737
2738=item $client->ext_reply ($msgid, @msg)
2739
2740Sends an ext reply to the client.
2741
2742=cut
2743
2744sub cf::client::ext_reply($$@) {
2745 my ($self, $id, @msg) = @_;
2746
2747 if ($self->extcmd == 2) {
2748 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2749 } elsif ($self->extcmd == 1) {
2750 #TODO: version 1, remove
2751 unshift @msg, msgtype => "reply", msgid => $id;
2752 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2753 }
2506} 2754}
2507 2755
2508=item $success = $client->query ($flags, "text", \&cb) 2756=item $success = $client->query ($flags, "text", \&cb)
2509 2757
2510Queues a query to the client, calling the given callback with 2758Queues a query to the client, calling the given callback with
2565 my ($ns, $buf) = @_; 2813 my ($ns, $buf) = @_;
2566 2814
2567 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2815 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2568 2816
2569 if (ref $msg) { 2817 if (ref $msg) {
2818 my ($type, $reply, @payload) =
2819 "ARRAY" eq ref $msg
2820 ? @$msg
2821 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2822
2823 my @reply;
2824
2570 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2825 if (my $cb = $EXTICMD{$type}) {
2571 if (my %reply = $cb->($ns, $msg)) { 2826 @reply = $cb->($ns, @payload);
2572 $reply{msgid} = $msg->{msgid};
2573 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2574 }
2575 } 2827 }
2828
2829 $ns->ext_reply ($reply, @reply)
2830 if $reply;
2831
2576 } else { 2832 } else {
2577 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2833 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2578 } 2834 }
2579 2835
2580 cf::override; 2836 cf::override;
2627our $safe = new Safe "safe"; 2883our $safe = new Safe "safe";
2628our $safe_hole = new Safe::Hole; 2884our $safe_hole = new Safe::Hole;
2629 2885
2630$SIG{FPE} = 'IGNORE'; 2886$SIG{FPE} = 'IGNORE';
2631 2887
2632$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2888$safe->permit_only (Opcode::opset qw(
2889 :base_core :base_mem :base_orig :base_math
2890 grepstart grepwhile mapstart mapwhile
2891 sort time
2892));
2633 2893
2634# here we export the classes and methods available to script code 2894# here we export the classes and methods available to script code
2635 2895
2636=pod 2896=pod
2637 2897
2638The following functions and methods are available within a safe environment: 2898The following functions and methods are available within a safe environment:
2639 2899
2640 cf::object 2900 cf::object
2641 contr pay_amount pay_player map x y force_find force_add 2901 contr pay_amount pay_player map x y force_find force_add destroy
2642 insert remove 2902 insert remove name archname title slaying race decrease_ob_nr
2643 2903
2644 cf::object::player 2904 cf::object::player
2645 player 2905 player
2646 2906
2647 cf::player 2907 cf::player
2652 2912
2653=cut 2913=cut
2654 2914
2655for ( 2915for (
2656 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2916 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2917 insert remove inv name archname title slaying race
2657 insert remove)], 2918 decrease_ob_nr destroy)],
2658 ["cf::object::player" => qw(player)], 2919 ["cf::object::player" => qw(player)],
2659 ["cf::player" => qw(peaceful)], 2920 ["cf::player" => qw(peaceful)],
2660 ["cf::map" => qw(trigger)], 2921 ["cf::map" => qw(trigger)],
2661) { 2922) {
2662 no strict 'refs'; 2923 no strict 'refs';
2738# the server's init and main functions 2999# the server's init and main functions
2739 3000
2740sub load_facedata($) { 3001sub load_facedata($) {
2741 my ($path) = @_; 3002 my ($path) = @_;
2742 3003
3004 # HACK to clear player env face cache, we need some signal framework
3005 # for this (global event?)
3006 %ext::player_env::MUSIC_FACE_CACHE = ();
3007
3008 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3009
2743 warn "loading facedata from $path\n"; 3010 warn "loading facedata from $path\n";
2744 3011
2745 my $facedata; 3012 my $facedata;
2746 0 < aio_load $path, $facedata 3013 0 < aio_load $path, $facedata
2747 or die "$path: $!"; 3014 or die "$path: $!";
2748 3015
2749 $facedata = Coro::Storable::thaw $facedata; 3016 $facedata = Coro::Storable::thaw $facedata;
2750 3017
2751 $facedata->{version} == 2 3018 $facedata->{version} == 2
2752 or cf::cleanup "$path: version mismatch, cannot proceed."; 3019 or cf::cleanup "$path: version mismatch, cannot proceed.";
3020
3021 # patch in the exptable
3022 $facedata->{resource}{"res/exp_table"} = {
3023 type => FT_RSRC,
3024 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3025 };
3026 cf::cede_to_tick;
2753 3027
2754 { 3028 {
2755 my $faces = $facedata->{faceinfo}; 3029 my $faces = $facedata->{faceinfo};
2756 3030
2757 while (my ($face, $info) = each %$faces) { 3031 while (my ($face, $info) = each %$faces) {
2758 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3032 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2759 cf::face::set_visibility $idx, $info->{visibility}; 3033 cf::face::set_visibility $idx, $info->{visibility};
2760 cf::face::set_magicmap $idx, $info->{magicmap}; 3034 cf::face::set_magicmap $idx, $info->{magicmap};
2761 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3035 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2762 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3036 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2763 3037
2764 cf::cede_to_tick; 3038 cf::cede_to_tick;
2765 } 3039 }
2766 3040
2767 while (my ($face, $info) = each %$faces) { 3041 while (my ($face, $info) = each %$faces) {
2792 3066
2793 { 3067 {
2794 # TODO: for gcfclient pleasure, we should give resources 3068 # TODO: for gcfclient pleasure, we should give resources
2795 # that gcfclient doesn't grok a >10000 face index. 3069 # that gcfclient doesn't grok a >10000 face index.
2796 my $res = $facedata->{resource}; 3070 my $res = $facedata->{resource};
2797 my $enc = JSON::XS->new->utf8->canonical; 3071
3072 my $soundconf = delete $res->{"res/sound.conf"};
2798 3073
2799 while (my ($name, $info) = each %$res) { 3074 while (my ($name, $info) = each %$res) {
2800 my $meta = $enc->encode ({
2801 name => $name,
2802 type => $info->{type},
2803 copyright => $info->{copyright}, #TODO#
2804 });
2805
2806 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3075 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3076 my $data;
2807 3077
2808 if ($name =~ /\.jpg$/) { 3078 if ($info->{type} & 1) {
2809 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3079 # prepend meta info
2810 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3080
3081 my $meta = $enc->encode ({
3082 name => $name,
3083 %{ $info->{meta} || {} },
3084 });
3085
3086 $data = pack "(w/a*)*", $meta, $info->{data};
2811 } else { 3087 } else {
2812 my $data = pack "(w/a*)*", $meta, $info->{data}; 3088 $data = $info->{data};
2813 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2814
2815 cf::face::set_type $idx, 1;
2816 cf::face::set_data $idx, 0, $data, $chk;
2817 } 3089 }
2818 3090
3091 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3092 cf::face::set_type $idx, $info->{type};
3093
2819 cf::cede_to_tick; 3094 cf::cede_to_tick;
2820 } 3095 }
3096
3097 if ($soundconf) {
3098 $soundconf = $enc->decode (delete $soundconf->{data});
3099
3100 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3101 my $sound = $soundconf->{compat}[$_]
3102 or next;
3103
3104 my $face = cf::face::find "sound/$sound->[1]";
3105 cf::sound::set $sound->[0] => $face;
3106 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3107 }
3108
3109 while (my ($k, $v) = each %{$soundconf->{event}}) {
3110 my $face = cf::face::find "sound/$v";
3111 cf::sound::set $k => $face;
3112 }
3113 }
2821 } 3114 }
2822 3115
2823 1 3116 1
2824} 3117}
2825 3118
3119register_exticmd fx_want => sub {
3120 my ($ns, $want) = @_;
3121
3122 while (my ($k, $v) = each %$want) {
3123 $ns->fx_want ($k, $v);
3124 }
3125};
3126
2826sub reload_regions { 3127sub reload_regions {
3128 # HACK to clear player env face cache, we need some signal framework
3129 # for this (global event?)
3130 %ext::player_env::MUSIC_FACE_CACHE = ();
3131
2827 load_resource_file "$MAPDIR/regions" 3132 load_resource_file "$MAPDIR/regions"
2828 or die "unable to load regions file\n"; 3133 or die "unable to load regions file\n";
2829 3134
2830 for (cf::region::list) { 3135 for (cf::region::list) {
2831 $_->{match} = qr/$_->{match}/ 3136 $_->{match} = qr/$_->{match}/
2867 3172
2868sub init { 3173sub init {
2869 reload_resources; 3174 reload_resources;
2870} 3175}
2871 3176
2872sub cfg_load { 3177sub reload_config {
2873 open my $fh, "<:utf8", "$CONFDIR/config" 3178 open my $fh, "<:utf8", "$CONFDIR/config"
2874 or return; 3179 or return;
2875 3180
2876 local $/; 3181 local $/;
2877 *CFG = YAML::Syck::Load <$fh>; 3182 *CFG = YAML::Syck::Load <$fh>;
2893sub main { 3198sub main {
2894 # we must not ever block the main coroutine 3199 # we must not ever block the main coroutine
2895 local $Coro::idle = sub { 3200 local $Coro::idle = sub {
2896 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3201 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2897 (async { 3202 (async {
3203 $Coro::current->{desc} = "IDLE BUG HANDLER";
2898 Event::one_event; 3204 Event::one_event;
2899 })->prio (Coro::PRIO_MAX); 3205 })->prio (Coro::PRIO_MAX);
2900 }; 3206 };
2901 3207
2902 cfg_load; 3208 reload_config;
2903 db_init; 3209 db_init;
2904 load_extensions; 3210 load_extensions;
2905 3211
2906 $TICK_WATCHER->start; 3212 $TICK_WATCHER->start;
2907 Event::loop; 3213 Event::loop;
2974 # and maps saved/destroyed asynchronously. 3280 # and maps saved/destroyed asynchronously.
2975 warn "begin emergency player save\n"; 3281 warn "begin emergency player save\n";
2976 for my $login (keys %cf::PLAYER) { 3282 for my $login (keys %cf::PLAYER) {
2977 my $pl = $cf::PLAYER{$login} or next; 3283 my $pl = $cf::PLAYER{$login} or next;
2978 $pl->valid or next; 3284 $pl->valid or next;
3285 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2979 $pl->save; 3286 $pl->save;
2980 } 3287 }
2981 warn "end emergency player save\n"; 3288 warn "end emergency player save\n";
2982 3289
2983 warn "begin emergency map save\n"; 3290 warn "begin emergency map save\n";
3100 warn "reloading cf.pm"; 3407 warn "reloading cf.pm";
3101 require cf; 3408 require cf;
3102 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3409 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3103 3410
3104 warn "loading config and database again"; 3411 warn "loading config and database again";
3105 cf::cfg_load; 3412 cf::reload_config;
3106 3413
3107 warn "loading extensions"; 3414 warn "loading extensions";
3108 cf::load_extensions; 3415 cf::load_extensions;
3109 3416
3110 warn "reattaching attachments to objects/players"; 3417 warn "reattaching attachments to objects/players";
3146register_command "reload" => sub { 3453register_command "reload" => sub {
3147 my ($who, $arg) = @_; 3454 my ($who, $arg) = @_;
3148 3455
3149 if ($who->flag (FLAG_WIZ)) { 3456 if ($who->flag (FLAG_WIZ)) {
3150 $who->message ("reloading server."); 3457 $who->message ("reloading server.");
3458 async {
3459 $Coro::current->{desc} = "perl_reload";
3151 async { reload_perl }; 3460 reload_perl;
3461 };
3152 } 3462 }
3153}; 3463};
3154 3464
3155unshift @INC, $LIBDIR; 3465unshift @INC, $LIBDIR;
3156 3466
3175 my $signal = new Coro::Signal; 3485 my $signal = new Coro::Signal;
3176 push @WAIT_FOR_TICK_BEGIN, $signal; 3486 push @WAIT_FOR_TICK_BEGIN, $signal;
3177 $signal->wait; 3487 $signal->wait;
3178} 3488}
3179 3489
3180 my $min = 1e6;#d#
3181 my $avg = 10;
3182$TICK_WATCHER = Event->timer ( 3490$TICK_WATCHER = Event->timer (
3183 reentrant => 0, 3491 reentrant => 0,
3184 parked => 1, 3492 parked => 1,
3185 prio => 0, 3493 prio => 0,
3186 at => $NEXT_TICK || $TICK, 3494 at => $NEXT_TICK || $TICK,
3194 3502
3195 $NOW = $tick_start = Event::time; 3503 $NOW = $tick_start = Event::time;
3196 3504
3197 cf::server_tick; # one server iteration 3505 cf::server_tick; # one server iteration
3198 3506
3199 0 && sync_job {#d#
3200 for(1..10) {
3201 my $t = Event::time;
3202 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3203 or die;
3204
3205 $map->width (50);
3206 $map->height (50);
3207 $map->alloc;
3208 $map->_load_objects ("/tmp/x.map", 1);
3209 my $t = Event::time - $t;
3210
3211 #next unless $t < 0.0013;#d#
3212 if ($t < $min) {
3213 $min = $t;
3214 }
3215 $avg = $avg * 0.99 + $t * 0.01;
3216 }
3217 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3218 exit 0;
3219 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3220 };
3221
3222 $RUNTIME += $TICK; 3507 $RUNTIME += $TICK;
3223 $NEXT_TICK += $TICK; 3508 $NEXT_TICK += $TICK;
3224 3509
3225 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3510 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3226 $NEXT_RUNTIME_WRITE = $NOW + 10; 3511 $NEXT_RUNTIME_WRITE = $NOW + 10;
3227 Coro::async_pool { 3512 Coro::async_pool {
3513 $Coro::current->{desc} = "runtime saver";
3228 write_runtime 3514 write_runtime
3229 or warn "ERROR: unable to write runtime file: $!"; 3515 or warn "ERROR: unable to write runtime file: $!";
3230 }; 3516 };
3231 } 3517 }
3232 3518
3233# my $AFTER = Event::time;
3234# warn $AFTER - $NOW;#d#
3235
3236 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3519 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3237 $sig->send; 3520 $sig->send;
3238 } 3521 }
3239 while (my $sig = shift @WAIT_FOR_TICK) { 3522 while (my $sig = shift @WAIT_FOR_TICK) {
3240 $sig->send; 3523 $sig->send;
3250 3533
3251 $LOAD = ($NOW - $tick_start) / $TICK; 3534 $LOAD = ($NOW - $tick_start) / $TICK;
3252 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3535 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3253 3536
3254 _post_tick; 3537 _post_tick;
3255
3256
3257 }, 3538 },
3258); 3539);
3259 3540
3260{ 3541{
3542 BDB::min_parallel 8;
3261 BDB::max_poll_time $TICK * 0.1; 3543 BDB::max_poll_time $TICK * 0.1;
3262 $BDB_POLL_WATCHER = Event->io ( 3544 $BDB_POLL_WATCHER = Event->io (
3263 reentrant => 0, 3545 reentrant => 0,
3264 fd => BDB::poll_fileno, 3546 fd => BDB::poll_fileno,
3265 poll => 'r', 3547 poll => 'r',
3266 prio => 0, 3548 prio => 0,
3267 data => WF_AUTOCANCEL, 3549 data => WF_AUTOCANCEL,
3268 cb => \&BDB::poll_cb, 3550 cb => \&BDB::poll_cb,
3269 ); 3551 );
3270 BDB::min_parallel 8;
3271 3552
3272 BDB::set_sync_prepare { 3553 BDB::set_sync_prepare {
3273 my $status; 3554 my $status;
3274 my $current = $Coro::current; 3555 my $current = $Coro::current;
3275 ( 3556 (
3284 ) 3565 )
3285 }; 3566 };
3286 3567
3287 unless ($DB_ENV) { 3568 unless ($DB_ENV) {
3288 $DB_ENV = BDB::db_env_create; 3569 $DB_ENV = BDB::db_env_create;
3570 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3571 | BDB::LOG_AUTOREMOVE, 1);
3572 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3573 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3289 3574
3290 cf::sync_job { 3575 cf::sync_job {
3291 eval { 3576 eval {
3292 BDB::db_env_open 3577 BDB::db_env_open
3293 $DB_ENV, 3578 $DB_ENV,
3295 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3580 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3296 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3581 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3297 0666; 3582 0666;
3298 3583
3299 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3584 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3300
3301 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3302 $DB_ENV->set_lk_detect;
3303 }; 3585 };
3304 3586
3305 cf::cleanup "db_env_open(db): $@" if $@; 3587 cf::cleanup "db_env_open(db): $@" if $@;
3306 }; 3588 };
3307 } 3589 }
3590
3591 $BDB_DEADLOCK_WATCHER = Event->timer (
3592 after => 3,
3593 interval => 1,
3594 hard => 1,
3595 prio => 0,
3596 data => WF_AUTOCANCEL,
3597 cb => sub {
3598 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3599 },
3600 );
3601 $BDB_CHECKPOINT_WATCHER = Event->timer (
3602 after => 11,
3603 interval => 60,
3604 hard => 1,
3605 prio => 0,
3606 data => WF_AUTOCANCEL,
3607 cb => sub {
3608 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3609 },
3610 );
3611 $BDB_TRICKLE_WATCHER = Event->timer (
3612 after => 5,
3613 interval => 10,
3614 hard => 1,
3615 prio => 0,
3616 data => WF_AUTOCANCEL,
3617 cb => sub {
3618 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3619 },
3620 );
3308} 3621}
3309 3622
3310{ 3623{
3311 IO::AIO::min_parallel 8; 3624 IO::AIO::min_parallel 8;
3312 3625
3315 $AIO_POLL_WATCHER = Event->io ( 3628 $AIO_POLL_WATCHER = Event->io (
3316 reentrant => 0, 3629 reentrant => 0,
3317 data => WF_AUTOCANCEL, 3630 data => WF_AUTOCANCEL,
3318 fd => IO::AIO::poll_fileno, 3631 fd => IO::AIO::poll_fileno,
3319 poll => 'r', 3632 poll => 'r',
3320 prio => 6, 3633 prio => 0,
3321 cb => \&IO::AIO::poll_cb, 3634 cb => \&IO::AIO::poll_cb,
3322 ); 3635 );
3323} 3636}
3324 3637
3325my $_log_backtrace; 3638my $_log_backtrace;
3331 3644
3332 # limit the # of concurrent backtraces 3645 # limit the # of concurrent backtraces
3333 if ($_log_backtrace < 2) { 3646 if ($_log_backtrace < 2) {
3334 ++$_log_backtrace; 3647 ++$_log_backtrace;
3335 async { 3648 async {
3649 $Coro::current->{desc} = "abt $msg";
3650
3336 my @bt = fork_call { 3651 my @bt = fork_call {
3337 @addr = map { sprintf "%x", $_ } @addr; 3652 @addr = map { sprintf "%x", $_ } @addr;
3338 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3653 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3339 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3654 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3340 or die "addr2line: $!"; 3655 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines