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.314 by root, Mon Jul 23 16:53:15 2007 UTC vs.
Revision 1.381 by root, Mon Oct 8 18:19:39 2007 UTC

10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 4.1 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
31use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
32use Time::HiRes; 33use Time::HiRes;
33use Compress::LZF; 34use Compress::LZF;
34use Digest::MD5 (); 35use Digest::MD5 ();
35 36
36# configure various modules to our taste 37# configure various modules to our taste
79our $NEXT_TICK; 80our $NEXT_TICK;
80our $NOW; 81our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
82 83
83our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 88our $DB_ENV;
85 89
86our %CFG; 90our %CFG;
87 91
88our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 93our $RUNTIME;
90 94
91our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
94 98
95# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 101
186 $msg .= "\n" 190 $msg .= "\n"
187 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
188 192
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 194
191 utf8::encode $msg;
192 LOG llevError, $msg; 195 LOG llevError, $msg;
193 }; 196 };
194} 197}
195 198
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
271Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
274returned. 277returned.
275 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
276Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
278 284
279=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
280 286
281Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
282 288
283=cut 289=cut
284 290
285our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
286 293
287sub lock_wait($) { 294sub lock_wait($) {
288 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
289 301
290 # wait for lock, if any 302 # wait for lock, if any
291 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 305 Coro::schedule;
299 311
300 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
301 lock_wait $key; 313 lock_wait $key;
302 314
303 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
304 317
305 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
308 } 322 }
309} 323}
310 324
322 }; 336 };
323 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
324 $guard 338 $guard
325} 339}
326 340
327=item cf::get_slot $time[, $priority] 341=item cf::get_slot $time[, $priority[, $name]]
328 342
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 343Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds 344This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede. 345of cpu time till the next tick. The slot is only valid till the next cede.
332 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
333Useful for short background jobs. 350Useful for short background jobs.
334 351
335=cut 352=cut
336 353
337our @SLOT_QUEUE; 354our @SLOT_QUEUE;
338our $SLOT_QUEUE; 355our $SLOT_QUEUE;
339 356
340$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
341$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
342 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
343 362
344 while () { 363 while () {
345 next_job: 364 next_job:
346 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
354 } 373 }
355 } 374 }
356 } 375 }
357 376
358 if (@SLOT_QUEUE) { 377 if (@SLOT_QUEUE) {
359 # 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
360 push @cf::WAIT_FOR_TICK, $signal; 379 push @cf::WAIT_FOR_TICK, $signal;
361 $signal->wait; 380 $signal->wait;
362 } else { 381 } else {
363 Coro::schedule; 382 Coro::schedule;
364 } 383 }
365 } 384 }
366}; 385};
367 386
368sub get_slot($;$) { 387sub get_slot($;$$) {
369 my ($time, $pri) = @_; 388 my ($time, $pri, $name) = @_;
370 389
390 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal;
392
371 push @SLOT_QUEUE, [$time, $pri, my $sig = new Coro::Signal]; 393 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
372 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
373 $SLOT_QUEUE->ready; 395 $SLOT_QUEUE->ready;
374 $sig->wait; 396 $sig->wait;
375} 397}
376 398
405 my $time = Event::time; 427 my $time = Event::time;
406 428
407 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
408 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
409 431
432 LOG llevError | logBacktrace, Carp::longmess "sync job";#d#
433
410 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
411 # (but this is cancel-safe) 435 # (but this is cancel-safe)
412 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
413 437
414 my $busy = 1; 438 my $busy = 1;
415 my @res; 439 my @res;
416 440
417 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
418 @res = eval { $job->() }; 443 @res = eval { $job->() };
419 warn $@ if $@; 444 warn $@ if $@;
420 undef $busy; 445 undef $busy;
421 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
422 447
466Coro::Storable. May, of course, block. Note that the executed sub may 491Coro::Storable. May, of course, block. Note that the executed sub may
467never block itself or use any form of Event handling. 492never block itself or use any form of Event handling.
468 493
469=cut 494=cut
470 495
471sub _store_scalar {
472 open my $fh, ">", \my $buf
473 or die "fork_call: cannot open fh-to-buf in child : $!";
474 Storable::store_fd $_[0], $fh;
475 close $fh;
476
477 $buf
478}
479
480sub fork_call(&@) { 496sub fork_call(&@) {
481 my ($cb, @args) = @_; 497 my ($cb, @args) = @_;
482 498
483# 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,
484# or die "socketpair: $!"; 500 # otherwise perl prematurely frees the stuff :/
485 pipe my $fh1, my $fh2 501 # TODO: investigate and fix (likely this will be rather laborious)
486 or die "pipe: $!";
487 502
488 if (my $pid = fork) { 503 my @res = Coro::Util::fork_eval {
489 close $fh2;
490
491 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
492 warn "pst<$res>" unless $res =~ /^pst/;
493 $res = Coro::Storable::thaw $res;
494
495 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
496
497 Carp::confess $$res unless "ARRAY" eq ref $res;
498
499 return wantarray ? @$res : $res->[-1];
500 } else {
501 reset_signals; 504 reset_signals;
502 local $SIG{__WARN__}; 505 &$cb
503 local $SIG{__DIE__}; 506 }, @args;
504 # just in case, this hack effectively disables event
505 # in the child. cleaner and slower would be canceling all watchers,
506 # but this works for the time being.
507 local $Coro::idle;
508 $Coro::current->prio (Coro::PRIO_MAX);
509 507
510 eval { 508 wantarray ? @res : $res[-1]
511 close $fh1;
512
513 my @res = eval { $cb->(@args) };
514
515 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
516 close $fh2;
517 };
518
519 warn $@ if $@;
520 _exit 0;
521 }
522} 509}
523 510
524=item $value = cf::db_get $family => $key 511=item $value = cf::db_get $family => $key
525 512
526Returns a single value from the environment database. 513Returns a single value from the environment database.
528=item cf::db_put $family => $key => $value 515=item cf::db_put $family => $key => $value
529 516
530Stores 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
531data 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).
532 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
533=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}
534 543
535our $DB; 544our $DB;
536 545
537sub db_init { 546sub db_init {
538 unless ($DB) {
539 $DB = BDB::db_create $DB_ENV;
540
541 cf::sync_job { 547 cf::sync_job {
542 eval { 548 $DB ||= db_table "db";
543 $DB->set_flags (BDB::CHKSUM);
544
545 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
546 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
547 cf::cleanup "db_open(db): $!" if $!;
548 };
549 cf::cleanup "db_open(db): $@" if $@;
550 };
551 } 549 };
552} 550}
553 551
554sub db_get($$) { 552sub db_get($$) {
555 my $key = "$_[0]/$_[1]"; 553 my $key = "$_[0]/$_[1]";
556 554
606 if (1) { 604 if (1) {
607 $md5 = 605 $md5 =
608 join "\x00", 606 join "\x00",
609 $processversion, 607 $processversion,
610 map { 608 map {
611 Coro::cede; 609 cf::cede_to_tick;
612 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 610 ($src->[$_], Digest::MD5::md5_hex $data[$_])
613 } 0.. $#$src; 611 } 0.. $#$src;
614 612
615 613
616 my $dbmd5 = db_get cache => "$id/md5"; 614 my $dbmd5 = db_get cache => "$id/md5";
1035sub object_freezer_save { 1033sub object_freezer_save {
1036 my ($filename, $rdata, $objs) = @_; 1034 my ($filename, $rdata, $objs) = @_;
1037 1035
1038 sync_job { 1036 sync_job {
1039 if (length $$rdata) { 1037 if (length $$rdata) {
1038 utf8::decode (my $decname = $filename);
1040 warn sprintf "saving %s (%d,%d)\n", 1039 warn sprintf "saving %s (%d,%d)\n",
1041 $filename, length $$rdata, scalar @$objs; 1040 $decname, length $$rdata, scalar @$objs;
1042 1041
1043 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1042 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1044 chmod SAVE_MODE, $fh; 1043 chmod SAVE_MODE, $fh;
1045 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1044 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1046 aio_fsync $fh if $cf::USE_FSYNC; 1045 aio_fsync $fh if $cf::USE_FSYNC;
1047 close $fh; 1046 close $fh;
1048 1047
1049 if (@$objs) { 1048 if (@$objs) {
1050 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) {
1051 chmod SAVE_MODE, $fh; 1050 chmod SAVE_MODE, $fh;
1052 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1051 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1053 aio_write $fh, 0, (length $data), $data, 0; 1052 aio_write $fh, 0, (length $data), $data, 0;
1054 aio_fsync $fh if $cf::USE_FSYNC; 1053 aio_fsync $fh if $cf::USE_FSYNC;
1055 close $fh; 1054 close $fh;
1056 aio_rename "$filename.pst~", "$filename.pst"; 1055 aio_rename "$filename.pst~", "$filename.pst";
1057 } 1056 }
1065 } 1064 }
1066 } else { 1065 } else {
1067 aio_unlink $filename; 1066 aio_unlink $filename;
1068 aio_unlink "$filename.pst"; 1067 aio_unlink "$filename.pst";
1069 } 1068 }
1070 } 1069 };
1071} 1070}
1072 1071
1073sub object_freezer_as_string { 1072sub object_freezer_as_string {
1074 my ($rdata, $objs) = @_; 1073 my ($rdata, $objs) = @_;
1075 1074
1087 or return; 1086 or return;
1088 1087
1089 unless (aio_stat "$filename.pst") { 1088 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1089 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1090 or return;
1092 $av = eval { (Storable::thaw $av)->{objs} };
1093 }
1094 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);
1095 warn sprintf "loading %s (%d)\n", 1098 warn sprintf "loading %s (%d,%d)\n",
1096 $filename, length $data, scalar @{$av || []}; 1099 $decname, length $data, scalar @{$av || []};
1100
1097 return ($data, $av); 1101 ($data, $av)
1098} 1102}
1099 1103
1100=head2 COMMAND CALLBACKS 1104=head2 COMMAND CALLBACKS
1101 1105
1102=over 4 1106=over 4
1175 my ($pl, $buf) = @_; 1179 my ($pl, $buf) = @_;
1176 1180
1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1181 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1178 1182
1179 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
1180 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1191 if (my $cb = $EXTCMD{$type}) {
1181 if (my %reply = $cb->($pl, $msg)) { 1192 @reply = $cb->($pl, @payload);
1182 $pl->ext_reply ($msg->{msgid}, %reply);
1183 }
1184 } 1193 }
1194
1195 $pl->ext_reply ($reply, @reply)
1196 if $reply;
1197
1185 } else { 1198 } else {
1186 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1199 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1187 } 1200 }
1188 1201
1189 cf::override; 1202 cf::override;
1279 1292
1280=head3 cf::player 1293=head3 cf::player
1281 1294
1282=over 4 1295=over 4
1283 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
1284=item cf::player::find $login 1311=item cf::player::find $login
1285 1312
1286Returns the given player object, loading it if necessary (might block). 1313Returns the given player object, loading it if necessary (might block).
1287 1314
1288=cut 1315=cut
1323 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1350 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1324 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1351 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1325 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1352 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1326 aio_unlink +(playerdir $login) . "/$login.pl"; 1353 aio_unlink +(playerdir $login) . "/$login.pl";
1327 1354
1328 my $pl = load_pl path $login 1355 my $f = new_from_file cf::object::thawer path $login
1329 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;
1330 $cf::PLAYER{$login} = $pl 1362 $cf::PLAYER{$login} = $pl
1331 } 1363 }
1332 } 1364 }
1333} 1365}
1334 1366
1344 1376
1345 aio_mkdir playerdir $pl, 0770; 1377 aio_mkdir playerdir $pl, 0770;
1346 $pl->{last_save} = $cf::RUNTIME; 1378 $pl->{last_save} = $cf::RUNTIME;
1347 1379
1348 $pl->save_pl ($path); 1380 $pl->save_pl ($path);
1349 Coro::cede; 1381 cf::cede_to_tick;
1350} 1382}
1351 1383
1352sub new($) { 1384sub new($) {
1353 my ($login) = @_; 1385 my ($login) = @_;
1354 1386
1358 $self->{deny_save} = 1; 1390 $self->{deny_save} = 1;
1359 1391
1360 $cf::PLAYER{$login} = $self; 1392 $cf::PLAYER{$login} = $self;
1361 1393
1362 $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 (@_);
1363} 1405}
1364 1406
1365=item $pl->quit_character 1407=item $pl->quit_character
1366 1408
1367Nukes the player without looking back. If logged in, the connection will 1409Nukes the player without looking back. If logged in, the connection will
1422 or return []; 1464 or return [];
1423 1465
1424 my @logins; 1466 my @logins;
1425 1467
1426 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") {
1427 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1428 aio_read $fh, 0, 512, my $buf, 0 or next; 1474 aio_read $fh, 0, 512, my $buf, 0 or next;
1429 $buf !~ /^password -------------$/m or next; # official not-valid tag 1475 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 }
1430 1477
1431 utf8::decode $login; 1478 utf8::decode $login;
1432 push @logins, $login; 1479 push @logins, $login;
1433 } 1480 }
1434 1481
1472sub expand_cfpod { 1519sub expand_cfpod {
1473 ((my $self), (local $_)) = @_; 1520 ((my $self), (local $_)) = @_;
1474 1521
1475 # escape & and < 1522 # escape & and <
1476 s/&/&amp;/g; 1523 s/&/&amp;/g;
1477 s/(?<![BIUGH])</&lt;/g; 1524 s/(?<![BIUGHT])</&lt;/g;
1478 1525
1479 # 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
1480 1527
1481 1 while 1528 1 while
1482 # replace B<>, I<>, U<> etc. 1529 # replace B<>, I<>, U<> etc.
1483 s/B<([^\>]*)>/<b>$1<\/b>/ 1530 s/B<([^\>]*)>/<b>$1<\/b>/
1484 || s/I<([^\>]*)>/<i>$1<\/i>/ 1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1485 || s/U<([^\>]*)>/<u>$1<\/u>/ 1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1486 # replace G<male|female> tags 1534 # replace G<male|female> tags
1487 || s{G<([^>|]*)\|([^>]*)>}{ 1535 || s{G<([^>|]*)\|([^>]*)>}{
1488 $self->gender ? $2 : $1 1536 $self->gender ? $2 : $1
1489 }ge 1537 }ge
1490 # replace H<hint text> 1538 # replace H<hint text>
1511sub hintmode { 1559sub hintmode {
1512 $_[0]{hintmode} = $_[1] if @_ > 1; 1560 $_[0]{hintmode} = $_[1] if @_ > 1;
1513 $_[0]{hintmode} 1561 $_[0]{hintmode}
1514} 1562}
1515 1563
1516=item $player->ext_reply ($msgid, %msg) 1564=item $player->ext_reply ($msgid, @msg)
1517 1565
1518Sends an ext reply to the player. 1566Sends an ext reply to the player.
1519 1567
1520=cut 1568=cut
1521 1569
1522sub ext_reply($$%) { 1570sub ext_reply($$@) {
1523 my ($self, $id, %msg) = @_; 1571 my ($self, $id, @msg) = @_;
1524 1572
1525 $msg{msgid} = $id; 1573 $self->ns->ext_reply ($id, @msg)
1526 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1527} 1574}
1528 1575
1529=item $player->ext_event ($type, %msg) 1576=item $player->ext_msg ($type, @msg)
1530 1577
1531Sends an ext event to the client. 1578Sends an ext event to the client.
1532 1579
1533=cut 1580=cut
1534 1581
1535sub ext_event($$%) { 1582sub ext_msg($$@) {
1536 my ($self, $type, %msg) = @_; 1583 my ($self, $type, @msg) = @_;
1537 1584
1538 $self->ns->ext_event ($type, %msg); 1585 $self->ns->ext_msg ($type, @msg);
1539} 1586}
1540 1587
1541=head3 cf::region 1588=head3 cf::region
1542 1589
1543=over 4 1590=over 4
1759 1806
1760sub load_header_from($) { 1807sub load_header_from($) {
1761 my ($self, $path) = @_; 1808 my ($self, $path) = @_;
1762 1809
1763 utf8::encode $path; 1810 utf8::encode $path;
1764 #aio_open $path, O_RDONLY, 0 1811 my $f = new_from_file cf::object::thawer $path
1765 # or return;
1766
1767 $self->_load_header ($path)
1768 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;
1769 1819
1770 $self->{load_path} = $path; 1820 $self->{load_path} = $path;
1771 1821
1772 1 1822 1
1773} 1823}
1827sub find { 1877sub find {
1828 my ($path, $origin) = @_; 1878 my ($path, $origin) = @_;
1829 1879
1830 $path = normalise $path, $origin && $origin->path; 1880 $path = normalise $path, $origin && $origin->path;
1831 1881
1882 cf::lock_wait "map_data:$path";#d#remove
1832 cf::lock_wait "map_find:$path"; 1883 cf::lock_wait "map_find:$path";
1833 1884
1834 $cf::MAP{$path} || do { 1885 $cf::MAP{$path} || do {
1835 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
1836 my $map = new_from_path cf::map $path 1889 my $map = new_from_path cf::map $path
1837 or return; 1890 or return;
1838 1891
1839 $map->{last_save} = $cf::RUNTIME; 1892 $map->{last_save} = $cf::RUNTIME;
1840 1893
1842 or return; 1895 or return;
1843 1896
1844 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1845 # doing this can freeze the server in a sync job, obviously 1898 # doing this can freeze the server in a sync job, obviously
1846 #$cf::WAIT_FOR_TICK->wait; 1899 #$cf::WAIT_FOR_TICK->wait;
1900 undef $guard1;
1901 undef $guard2;
1847 $map->reset; 1902 $map->reset;
1848 undef $guard;
1849 return find $path; 1903 return find $path;
1850 } 1904 }
1851 1905
1852 $cf::MAP{$path} = $map 1906 $cf::MAP{$path} = $map
1853 } 1907 }
1862 local $self->{deny_reset} = 1; # loading can take a long time 1916 local $self->{deny_reset} = 1; # loading can take a long time
1863 1917
1864 my $path = $self->{path}; 1918 my $path = $self->{path};
1865 1919
1866 { 1920 {
1867 my $guard = cf::lock_acquire "map_load:$path"; 1921 my $guard = cf::lock_acquire "map_data:$path";
1868 1922
1923 return unless $self->valid;
1869 return if $self->in_memory != cf::MAP_SWAPPED; 1924 return unless $self->in_memory == cf::MAP_SWAPPED;
1870 1925
1871 $self->in_memory (cf::MAP_LOADING); 1926 $self->in_memory (cf::MAP_LOADING);
1872 1927
1873 $self->alloc; 1928 $self->alloc;
1874 1929
1875 $self->pre_load; 1930 $self->pre_load;
1876 Coro::cede; 1931 cf::cede_to_tick;
1877 1932
1933 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block;
1878 $self->_load_objects ($self->{load_path}, 1) 1935 $self->_load_objects ($f)
1879 or return; 1936 or return;
1880 1937
1881 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1882 if delete $self->{load_original}; 1939 if delete $self->{load_original};
1883 1940
1884 if (my $uniq = $self->uniq_path) { 1941 if (my $uniq = $self->uniq_path) {
1885 utf8::encode $uniq; 1942 utf8::encode $uniq;
1886 if (aio_open $uniq, O_RDONLY, 0) { 1943 unless (aio_stat $uniq) {
1944 if (my $f = new_from_file cf::object::thawer $uniq) {
1887 $self->clear_unique_items; 1945 $self->clear_unique_items;
1888 $self->_load_objects ($uniq, 0); 1946 $self->_load_objects ($f);
1947 $f->resolve_delayed_derefs;
1948 }
1889 } 1949 }
1890 } 1950 }
1891 1951
1892 Coro::cede; 1952 $f->resolve_delayed_derefs;
1953
1954 cf::cede_to_tick;
1893 # now do the right thing for maps 1955 # now do the right thing for maps
1894 $self->link_multipart_objects; 1956 $self->link_multipart_objects;
1895 $self->difficulty ($self->estimate_difficulty) 1957 $self->difficulty ($self->estimate_difficulty)
1896 unless $self->difficulty; 1958 unless $self->difficulty;
1897 Coro::cede; 1959 cf::cede_to_tick;
1898 1960
1899 unless ($self->{deny_activate}) { 1961 unless ($self->{deny_activate}) {
1900 $self->decay_objects; 1962 $self->decay_objects;
1901 $self->fix_auto_apply; 1963 $self->fix_auto_apply;
1902 $self->update_buttons; 1964 $self->update_buttons;
1903 Coro::cede; 1965 cf::cede_to_tick;
1904 $self->set_darkness_map; 1966 $self->set_darkness_map;
1905 Coro::cede; 1967 cf::cede_to_tick;
1906 $self->activate; 1968 $self->activate;
1907 } 1969 }
1970
1971 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME);
1908 1973
1909 $self->in_memory (cf::MAP_IN_MEMORY); 1974 $self->in_memory (cf::MAP_IN_MEMORY);
1910 } 1975 }
1911 1976
1912 $self->post_load; 1977 $self->post_load;
1923 1988
1924 $self 1989 $self
1925} 1990}
1926 1991
1927# 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
1928sub load_diag { 1993sub load_neighbours {
1929 my ($map) = @_; 1994 my ($map) = @_;
1930 1995
1931 my @diag; # diagonal neighbours 1996 my @neigh; # diagonal neighbours
1932 1997
1933 for (0 .. 3) { 1998 for (0 .. 3) {
1934 my $neigh = $map->tile_path ($_) 1999 my $neigh = $map->tile_path ($_)
1935 or next; 2000 or next;
1936 $neigh = find $neigh, $map 2001 $neigh = find $neigh, $map
1937 or next; 2002 or next;
1938 $neigh->load; 2003 $neigh->load;
1939 2004
2005 push @neigh,
1940 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2006 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1941 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2007 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1942 } 2008 }
1943 2009
1944 for (@diag) { 2010 for (grep defined $_->[0], @neigh) {
2011 my ($path, $origin) = @$_;
1945 my $neigh = find @$_ 2012 my $neigh = find $path, $origin
1946 or next; 2013 or next;
1947 $neigh->load; 2014 $neigh->load;
1948 } 2015 }
1949} 2016}
1950 2017
1955} 2022}
1956 2023
1957sub do_load_sync { 2024sub do_load_sync {
1958 my ($map) = @_; 2025 my ($map) = @_;
1959 2026
2027 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2028 if $Coro::current == $Coro::main;
2029
1960 cf::sync_job { $map->load }; 2030 cf::sync_job { $map->load };
1961} 2031}
1962 2032
1963our %MAP_PREFETCH; 2033our %MAP_PREFETCH;
1964our $MAP_PREFETCHER = undef; 2034our $MAP_PREFETCHER = undef;
1965 2035
1966sub find_async { 2036sub find_async {
1967 my ($path, $origin) = @_; 2037 my ($path, $origin, $load) = @_;
1968 2038
1969 $path = normalise $path, $origin && $origin->{path}; 2039 $path = normalise $path, $origin && $origin->{path};
1970 2040
1971 if (my $map = $cf::MAP{$path}) { 2041 if (my $map = $cf::MAP{$path}) {
1972 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1973 } 2043 }
1974 2044
1975 undef $MAP_PREFETCH{$path}; 2045 $MAP_PREFETCH{$path} |= $load;
2046
1976 $MAP_PREFETCHER ||= cf::async { 2047 $MAP_PREFETCHER ||= cf::async {
2048 $Coro::current->{desc} = "map prefetcher";
2049
1977 while (%MAP_PREFETCH) { 2050 while (%MAP_PREFETCH) {
1978 for my $path (keys %MAP_PREFETCH) { 2051 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $path) { 2052 if (my $map = find $k) {
1980 $map->load; 2053 $map->load if $v;
1981 } 2054 }
1982 2055
1983 delete $MAP_PREFETCH{$path}; 2056 delete $MAP_PREFETCH{$k};
1984 } 2057 }
1985 } 2058 }
1986 undef $MAP_PREFETCHER; 2059 undef $MAP_PREFETCHER;
1987 }; 2060 };
1988 $MAP_PREFETCHER->prio (6); 2061 $MAP_PREFETCHER->prio (6);
1991} 2064}
1992 2065
1993sub save { 2066sub save {
1994 my ($self) = @_; 2067 my ($self) = @_;
1995 2068
1996 my $lock = cf::lock_acquire "map_data:" . $self->path; 2069 my $lock = cf::lock_acquire "map_data:$self->{path}";
1997 2070
1998 $self->{last_save} = $cf::RUNTIME; 2071 $self->{last_save} = $cf::RUNTIME;
1999 2072
2000 return unless $self->dirty; 2073 return unless $self->dirty;
2001 2074
2007 return if $self->{deny_save}; 2080 return if $self->{deny_save};
2008 2081
2009 local $self->{last_access} = $self->last_access;#d# 2082 local $self->{last_access} = $self->last_access;#d#
2010 2083
2011 cf::async { 2084 cf::async {
2085 $Coro::current->{desc} = "map player save";
2012 $_->contr->save for $self->players; 2086 $_->contr->save for $self->players;
2013 }; 2087 };
2014 2088
2015 if ($uniq) { 2089 if ($uniq) {
2016 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2090 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2024 my ($self) = @_; 2098 my ($self) = @_;
2025 2099
2026 # save first because save cedes 2100 # save first because save cedes
2027 $self->save; 2101 $self->save;
2028 2102
2029 my $lock = cf::lock_acquire "map_data:" . $self->path; 2103 my $lock = cf::lock_acquire "map_data:$self->{path}";
2030 2104
2031 return if $self->players; 2105 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2106 return if $self->in_memory != cf::MAP_IN_MEMORY;
2033 return if $self->{deny_save}; 2107 return if $self->{deny_save};
2034 2108
2109 $self->in_memory (cf::MAP_SWAPPED);
2110
2111 $self->deactivate;
2112 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2113 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2114}
2038 2115
2039sub reset_at { 2116sub reset_at {
2040 my ($self) = @_; 2117 my ($self) = @_;
2041 2118
2073 if $uniq; 2150 if $uniq;
2074 } 2151 }
2075 2152
2076 delete $cf::MAP{$self->path}; 2153 delete $cf::MAP{$self->path};
2077 2154
2155 $self->deactivate;
2156 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2157 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2158
2082 $self->unlink_save; 2159 $self->unlink_save;
2083 $self->destroy; 2160 $self->destroy;
2084} 2161}
2085 2162
2086my $nuke_counter = "aaaa"; 2163my $nuke_counter = "aaaa";
2087 2164
2088sub nuke { 2165sub nuke {
2089 my ($self) = @_; 2166 my ($self) = @_;
2090 2167
2168 {
2169 my $lock = cf::lock_acquire "map_data:$self->{path}";
2170
2091 delete $cf::MAP{$self->path}; 2171 delete $cf::MAP{$self->path};
2092 2172
2093 $self->unlink_save; 2173 $self->unlink_save;
2094 2174
2095 bless $self, "cf::map"; 2175 bless $self, "cf::map";
2096 delete $self->{deny_reset}; 2176 delete $self->{deny_reset};
2097 $self->{deny_save} = 1; 2177 $self->{deny_save} = 1;
2098 $self->reset_timeout (1); 2178 $self->reset_timeout (1);
2099 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2179 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100 2180
2101 $cf::MAP{$self->path} = $self; 2181 $cf::MAP{$self->path} = $self;
2182 }
2102 2183
2103 $self->reset; # polite request, might not happen 2184 $self->reset; # polite request, might not happen
2104} 2185}
2105 2186
2106=item $maps = cf::map::tmp_maps 2187=item $maps = cf::map::tmp_maps
2182 2263
2183sub inv_recursive { 2264sub inv_recursive {
2184 inv_recursive_ inv $_[0] 2265 inv_recursive_ inv $_[0]
2185} 2266}
2186 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
2187package cf; 2296package cf;
2188 2297
2189=back 2298=back
2190 2299
2191=head3 cf::object::player 2300=head3 cf::object::player
2213 2322
2214 } else { 2323 } else {
2215 my $pl = $self->contr; 2324 my $pl = $self->contr;
2216 2325
2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2326 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218 my $diag = $pl->{npc_dialog}; 2327 my $dialog = $pl->{npc_dialog};
2219 $diag->{pl}->ext_reply ( 2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220 $diag->{id},
2221 msgtype => "reply",
2222 msg => $diag->{pl}->expand_cfpod ($msg),
2223 add_topics => []
2224 );
2225 2329
2226 } else { 2330 } else {
2227 $msg = $npc->name . " says: $msg" if $npc; 2331 $msg = $npc->name . " says: $msg" if $npc;
2228 $self->message ($msg, $flags); 2332 $self->message ($msg, $flags);
2229 } 2333 }
2230 } 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 (@_);
2231} 2345}
2232 2346
2233=item $player_object->may ("access") 2347=item $player_object->may ("access")
2234 2348
2235Returns wether the given player is authorized to access resource "access" 2349Returns wether the given player is authorized to access resource "access"
2314 # use -1 or undef as default coordinates, not 0, 0 2428 # use -1 or undef as default coordinates, not 0, 0
2315 ($x, $y) = ($map->enter_x, $map->enter_y) 2429 ($x, $y) = ($map->enter_x, $map->enter_y)
2316 if $x <=0 && $y <= 0; 2430 if $x <=0 && $y <= 0;
2317 2431
2318 $map->load; 2432 $map->load;
2319 $map->load_diag; 2433 $map->load_neighbours;
2320 2434
2321 return unless $self->contr->active; 2435 return unless $self->contr->active;
2322 $self->activate_recursive; 2436 $self->activate_recursive;
2323 2437
2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2345 2459
2346 $self->enter_link; 2460 $self->enter_link;
2347 2461
2348 (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
2349 my $map = eval { 2484 my $map = eval {
2350 my $map = cf::map::find $path; 2485 my $map = defined $path ? cf::map::find $path : undef;
2351 2486
2352 if ($map) { 2487 if ($map) {
2353 $map = $map->customise_for ($self); 2488 $map = $map->customise_for ($self);
2354 $map = $check->($map) if $check && $map; 2489 $map = $check->($map) if $check && $map;
2355 } else { 2490 } else {
2356 $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);
2357 } 2492 }
2358 2493
2359 $map 2494 $map
2360 }; 2495 };
2361 2496
2451 # if exit is damned, update players death & WoR home-position 2586 # if exit is damned, update players death & WoR home-position
2452 $self->contr->savebed ($slaying, $hp, $sp) 2587 $self->contr->savebed ($slaying, $hp, $sp)
2453 if $exit->flag (FLAG_DAMNED); 2588 if $exit->flag (FLAG_DAMNED);
2454 2589
2455 (async { 2590 (async {
2591 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2592
2456 $self->deactivate_recursive; # just to be sure 2593 $self->deactivate_recursive; # just to be sure
2457 unless (eval { 2594 unless (eval {
2458 $self->goto ($slaying, $hp, $sp); 2595 $self->goto ($slaying, $hp, $sp);
2459 2596
2460 1; 2597 1;
2495the 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
2496the message unless the client supports the msg packet. 2633the message unless the client supports the msg packet.
2497 2634
2498=cut 2635=cut
2499 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
2500sub cf::client::send_msg { 2658sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_; 2659 my ($self, $channel, $msg, $color, @extra) = @_;
2502 2660
2503 $msg = $self->pl->expand_cfpod ($msg); 2661 $msg = $self->pl->expand_cfpod ($msg);
2504 2662
2505 $color &= ~cf::NDI_UNIQUE; # just in case... 2663 $color &= cf::NDI_CLIENT_MASK; # just in case...
2506 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
2507 if (ref $channel) { 2674 } elsif (ref $channel) {
2508 # send meta info to client, if not yet sent 2675 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) { 2676 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel; 2677 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_event (channel_info => %$channel); 2678 $self->ext_msg (channel_info => $channel)
2679 if $self->can_msg;
2512 } 2680 }
2513 2681
2514 $channel = $channel->{id}; 2682 $channel = $channel->{id};
2515 } 2683 }
2516 2684
2517 return unless @extra || length $msg; 2685 return unless @extra || length $msg;
2518 2686
2519 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
2520 $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]));
2521 } else { 2694 } else {
2522 # replace some tags by gcfclient-compatible ones
2523 for ($msg) {
2524 1 while
2525 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2526 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2527 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2528 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2529 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2530 }
2531
2532 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
2533 if (0 && $msg =~ /\[/) { 2710 if (0 && $msg =~ /\[/) {
2711 # COMMAND/INFO
2534 $self->send_packet ("drawextinfo $color 4 0 $msg") 2712 $self->send_packet ("drawextinfo $color 10 8 $msg")
2535 } else { 2713 } else {
2536 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2714 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2537 $self->send_packet ("drawinfo $color $msg") 2715 $self->send_packet ("drawinfo $color $msg")
2538 } 2716 }
2539 } 2717 }
2540 } 2718 }
2541} 2719}
2542 2720
2543=item $client->ext_event ($type, %msg) 2721=item $client->ext_msg ($type, @msg)
2544 2722
2545Sends an ext event to the client. 2723Sends an ext event to the client.
2546 2724
2547=cut 2725=cut
2548 2726
2549sub cf::client::ext_event($$%) { 2727sub cf::client::ext_msg($$@) {
2550 my ($self, $type, %msg) = @_; 2728 my ($self, $type, @msg) = @_;
2551 2729
2552 return unless $self->extcmd; 2730 if ($self->extcmd == 2) {
2553 2731 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2732 } elsif ($self->extcmd == 1) { # TODO: remove
2554 $msg{msgtype} = "event_$type"; 2733 push @msg, msgtype => "event_$type";
2555 $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 }
2556} 2754}
2557 2755
2558=item $success = $client->query ($flags, "text", \&cb) 2756=item $success = $client->query ($flags, "text", \&cb)
2559 2757
2560Queues a query to the client, calling the given callback with 2758Queues a query to the client, calling the given callback with
2615 my ($ns, $buf) = @_; 2813 my ($ns, $buf) = @_;
2616 2814
2617 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2815 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2618 2816
2619 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
2620 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2825 if (my $cb = $EXTICMD{$type}) {
2621 if (my %reply = $cb->($ns, $msg)) { 2826 @reply = $cb->($ns, @payload);
2622 $reply{msgid} = $msg->{msgid};
2623 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2624 }
2625 } 2827 }
2828
2829 $ns->ext_reply ($reply, @reply)
2830 if $reply;
2831
2626 } else { 2832 } else {
2627 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";
2628 } 2834 }
2629 2835
2630 cf::override; 2836 cf::override;
2677our $safe = new Safe "safe"; 2883our $safe = new Safe "safe";
2678our $safe_hole = new Safe::Hole; 2884our $safe_hole = new Safe::Hole;
2679 2885
2680$SIG{FPE} = 'IGNORE'; 2886$SIG{FPE} = 'IGNORE';
2681 2887
2682$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));
2683 2893
2684# here we export the classes and methods available to script code 2894# here we export the classes and methods available to script code
2685 2895
2686=pod 2896=pod
2687 2897
2688The following functions and methods are available within a safe environment: 2898The following functions and methods are available within a safe environment:
2689 2899
2690 cf::object 2900 cf::object
2691 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
2692 insert remove 2902 insert remove name archname title slaying race decrease_ob_nr
2693 2903
2694 cf::object::player 2904 cf::object::player
2695 player 2905 player
2696 2906
2697 cf::player 2907 cf::player
2702 2912
2703=cut 2913=cut
2704 2914
2705for ( 2915for (
2706 ["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
2707 insert remove)], 2918 decrease_ob_nr)],
2708 ["cf::object::player" => qw(player)], 2919 ["cf::object::player" => qw(player)],
2709 ["cf::player" => qw(peaceful)], 2920 ["cf::player" => qw(peaceful)],
2710 ["cf::map" => qw(trigger)], 2921 ["cf::map" => qw(trigger)],
2711) { 2922) {
2712 no strict 'refs'; 2923 no strict 'refs';
2788# the server's init and main functions 2999# the server's init and main functions
2789 3000
2790sub load_facedata($) { 3001sub load_facedata($) {
2791 my ($path) = @_; 3002 my ($path) = @_;
2792 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
2793 warn "loading facedata from $path\n"; 3010 warn "loading facedata from $path\n";
2794 3011
2795 my $facedata; 3012 my $facedata;
2796 0 < aio_load $path, $facedata 3013 0 < aio_load $path, $facedata
2797 or die "$path: $!"; 3014 or die "$path: $!";
2798 3015
2799 $facedata = Coro::Storable::thaw $facedata; 3016 $facedata = Coro::Storable::thaw $facedata;
2800 3017
2801 $facedata->{version} == 2 3018 $facedata->{version} == 2
2802 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;
2803 3027
2804 { 3028 {
2805 my $faces = $facedata->{faceinfo}; 3029 my $faces = $facedata->{faceinfo};
2806 3030
2807 while (my ($face, $info) = each %$faces) { 3031 while (my ($face, $info) = each %$faces) {
2808 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3032 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2809 cf::face::set_visibility $idx, $info->{visibility}; 3033 cf::face::set_visibility $idx, $info->{visibility};
2810 cf::face::set_magicmap $idx, $info->{magicmap}; 3034 cf::face::set_magicmap $idx, $info->{magicmap};
2811 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3035 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2812 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3036 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2813 3037
2814 cf::cede_to_tick; 3038 cf::cede_to_tick;
2815 } 3039 }
2816 3040
2817 while (my ($face, $info) = each %$faces) { 3041 while (my ($face, $info) = each %$faces) {
2842 3066
2843 { 3067 {
2844 # TODO: for gcfclient pleasure, we should give resources 3068 # TODO: for gcfclient pleasure, we should give resources
2845 # that gcfclient doesn't grok a >10000 face index. 3069 # that gcfclient doesn't grok a >10000 face index.
2846 my $res = $facedata->{resource}; 3070 my $res = $facedata->{resource};
2847 my $enc = JSON::XS->new->utf8->canonical; 3071
3072 my $soundconf = delete $res->{"res/sound.conf"};
2848 3073
2849 while (my ($name, $info) = each %$res) { 3074 while (my ($name, $info) = each %$res) {
2850 my $meta = $enc->encode ({
2851 name => $name,
2852 type => $info->{type},
2853 copyright => $info->{copyright}, #TODO#
2854 });
2855
2856 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3075 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3076 my $data;
2857 3077
2858 if ($name =~ /\.jpg$/) { 3078 if ($info->{type} & 1) {
2859 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3079 # prepend meta info
2860 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};
2861 } else { 3087 } else {
2862 my $data = pack "(w/a*)*", $meta, $info->{data}; 3088 $data = $info->{data};
2863 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2864
2865 cf::face::set_type $idx, 1;
2866 cf::face::set_data $idx, 0, $data, $chk;
2867 } 3089 }
2868 3090
3091 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3092 cf::face::set_type $idx, $info->{type};
3093
2869 cf::cede_to_tick; 3094 cf::cede_to_tick;
2870 } 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 }
2871 } 3114 }
2872 3115
2873 1 3116 1
2874} 3117}
2875 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
2876sub 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
2877 load_resource_file "$MAPDIR/regions" 3132 load_resource_file "$MAPDIR/regions"
2878 or die "unable to load regions file\n"; 3133 or die "unable to load regions file\n";
2879 3134
2880 for (cf::region::list) { 3135 for (cf::region::list) {
2881 $_->{match} = qr/$_->{match}/ 3136 $_->{match} = qr/$_->{match}/
2917 3172
2918sub init { 3173sub init {
2919 reload_resources; 3174 reload_resources;
2920} 3175}
2921 3176
2922sub cfg_load { 3177sub reload_config {
2923 open my $fh, "<:utf8", "$CONFDIR/config" 3178 open my $fh, "<:utf8", "$CONFDIR/config"
2924 or return; 3179 or return;
2925 3180
2926 local $/; 3181 local $/;
2927 *CFG = YAML::Syck::Load <$fh>; 3182 *CFG = YAML::Syck::Load <$fh>;
2943sub main { 3198sub main {
2944 # we must not ever block the main coroutine 3199 # we must not ever block the main coroutine
2945 local $Coro::idle = sub { 3200 local $Coro::idle = sub {
2946 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#
2947 (async { 3202 (async {
3203 $Coro::current->{desc} = "IDLE BUG HANDLER";
2948 Event::one_event; 3204 Event::one_event;
2949 })->prio (Coro::PRIO_MAX); 3205 })->prio (Coro::PRIO_MAX);
2950 }; 3206 };
2951 3207
2952 cfg_load; 3208 reload_config;
2953 db_init; 3209 db_init;
2954 load_extensions; 3210 load_extensions;
2955 3211
2956 $TICK_WATCHER->start; 3212 $TICK_WATCHER->start;
2957 Event::loop; 3213 Event::loop;
3024 # and maps saved/destroyed asynchronously. 3280 # and maps saved/destroyed asynchronously.
3025 warn "begin emergency player save\n"; 3281 warn "begin emergency player save\n";
3026 for my $login (keys %cf::PLAYER) { 3282 for my $login (keys %cf::PLAYER) {
3027 my $pl = $cf::PLAYER{$login} or next; 3283 my $pl = $cf::PLAYER{$login} or next;
3028 $pl->valid or next; 3284 $pl->valid or next;
3285 delete $pl->{unclean_save};
3029 $pl->save; 3286 $pl->save;
3030 } 3287 }
3031 warn "end emergency player save\n"; 3288 warn "end emergency player save\n";
3032 3289
3033 warn "begin emergency map save\n"; 3290 warn "begin emergency map save\n";
3150 warn "reloading cf.pm"; 3407 warn "reloading cf.pm";
3151 require cf; 3408 require cf;
3152 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3409 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3153 3410
3154 warn "loading config and database again"; 3411 warn "loading config and database again";
3155 cf::cfg_load; 3412 cf::reload_config;
3156 3413
3157 warn "loading extensions"; 3414 warn "loading extensions";
3158 cf::load_extensions; 3415 cf::load_extensions;
3159 3416
3160 warn "reattaching attachments to objects/players"; 3417 warn "reattaching attachments to objects/players";
3196register_command "reload" => sub { 3453register_command "reload" => sub {
3197 my ($who, $arg) = @_; 3454 my ($who, $arg) = @_;
3198 3455
3199 if ($who->flag (FLAG_WIZ)) { 3456 if ($who->flag (FLAG_WIZ)) {
3200 $who->message ("reloading server."); 3457 $who->message ("reloading server.");
3458 async {
3459 $Coro::current->{desc} = "perl_reload";
3201 async { reload_perl }; 3460 reload_perl;
3461 };
3202 } 3462 }
3203}; 3463};
3204 3464
3205unshift @INC, $LIBDIR; 3465unshift @INC, $LIBDIR;
3206 3466
3225 my $signal = new Coro::Signal; 3485 my $signal = new Coro::Signal;
3226 push @WAIT_FOR_TICK_BEGIN, $signal; 3486 push @WAIT_FOR_TICK_BEGIN, $signal;
3227 $signal->wait; 3487 $signal->wait;
3228} 3488}
3229 3489
3230 my $min = 1e6;#d#
3231 my $avg = 10;
3232$TICK_WATCHER = Event->timer ( 3490$TICK_WATCHER = Event->timer (
3233 reentrant => 0, 3491 reentrant => 0,
3234 parked => 1, 3492 parked => 1,
3235 prio => 0, 3493 prio => 0,
3236 at => $NEXT_TICK || $TICK, 3494 at => $NEXT_TICK || $TICK,
3244 3502
3245 $NOW = $tick_start = Event::time; 3503 $NOW = $tick_start = Event::time;
3246 3504
3247 cf::server_tick; # one server iteration 3505 cf::server_tick; # one server iteration
3248 3506
3249 0 && sync_job {#d#
3250 for(1..10) {
3251 my $t = Event::time;
3252 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3253 or die;
3254
3255 $map->width (50);
3256 $map->height (50);
3257 $map->alloc;
3258 $map->_load_objects ("/tmp/x.map", 1);
3259 my $t = Event::time - $t;
3260
3261 #next unless $t < 0.0013;#d#
3262 if ($t < $min) {
3263 $min = $t;
3264 }
3265 $avg = $avg * 0.99 + $t * 0.01;
3266 }
3267 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3268 exit 0;
3269 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3270 };
3271
3272 $RUNTIME += $TICK; 3507 $RUNTIME += $TICK;
3273 $NEXT_TICK += $TICK; 3508 $NEXT_TICK += $TICK;
3274 3509
3275 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3510 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3276 $NEXT_RUNTIME_WRITE = $NOW + 10; 3511 $NEXT_RUNTIME_WRITE = $NOW + 10;
3277 Coro::async_pool { 3512 Coro::async_pool {
3513 $Coro::current->{desc} = "runtime saver";
3278 write_runtime 3514 write_runtime
3279 or warn "ERROR: unable to write runtime file: $!"; 3515 or warn "ERROR: unable to write runtime file: $!";
3280 }; 3516 };
3281 } 3517 }
3282 3518
3283# my $AFTER = Event::time;
3284# warn $AFTER - $NOW;#d#
3285
3286 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3519 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3287 $sig->send; 3520 $sig->send;
3288 } 3521 }
3289 while (my $sig = shift @WAIT_FOR_TICK) { 3522 while (my $sig = shift @WAIT_FOR_TICK) {
3290 $sig->send; 3523 $sig->send;
3300 3533
3301 $LOAD = ($NOW - $tick_start) / $TICK; 3534 $LOAD = ($NOW - $tick_start) / $TICK;
3302 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3535 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3303 3536
3304 _post_tick; 3537 _post_tick;
3305
3306
3307 }, 3538 },
3308); 3539);
3309 3540
3310{ 3541{
3542 BDB::min_parallel 8;
3311 BDB::max_poll_time $TICK * 0.1; 3543 BDB::max_poll_time $TICK * 0.1;
3312 $BDB_POLL_WATCHER = Event->io ( 3544 $BDB_POLL_WATCHER = Event->io (
3313 reentrant => 0, 3545 reentrant => 0,
3314 fd => BDB::poll_fileno, 3546 fd => BDB::poll_fileno,
3315 poll => 'r', 3547 poll => 'r',
3316 prio => 0, 3548 prio => 0,
3317 data => WF_AUTOCANCEL, 3549 data => WF_AUTOCANCEL,
3318 cb => \&BDB::poll_cb, 3550 cb => \&BDB::poll_cb,
3319 ); 3551 );
3320 BDB::min_parallel 8;
3321 3552
3322 BDB::set_sync_prepare { 3553 BDB::set_sync_prepare {
3323 my $status; 3554 my $status;
3324 my $current = $Coro::current; 3555 my $current = $Coro::current;
3325 ( 3556 (
3334 ) 3565 )
3335 }; 3566 };
3336 3567
3337 unless ($DB_ENV) { 3568 unless ($DB_ENV) {
3338 $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);
3339 3574
3340 cf::sync_job { 3575 cf::sync_job {
3341 eval { 3576 eval {
3342 BDB::db_env_open 3577 BDB::db_env_open
3343 $DB_ENV, 3578 $DB_ENV,
3345 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
3346 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3581 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3347 0666; 3582 0666;
3348 3583
3349 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3584 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3350
3351 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3352 $DB_ENV->set_lk_detect;
3353 }; 3585 };
3354 3586
3355 cf::cleanup "db_env_open(db): $@" if $@; 3587 cf::cleanup "db_env_open(db): $@" if $@;
3356 }; 3588 };
3357 } 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 );
3358} 3621}
3359 3622
3360{ 3623{
3361 IO::AIO::min_parallel 8; 3624 IO::AIO::min_parallel 8;
3362 3625
3365 $AIO_POLL_WATCHER = Event->io ( 3628 $AIO_POLL_WATCHER = Event->io (
3366 reentrant => 0, 3629 reentrant => 0,
3367 data => WF_AUTOCANCEL, 3630 data => WF_AUTOCANCEL,
3368 fd => IO::AIO::poll_fileno, 3631 fd => IO::AIO::poll_fileno,
3369 poll => 'r', 3632 poll => 'r',
3370 prio => 6, 3633 prio => 0,
3371 cb => \&IO::AIO::poll_cb, 3634 cb => \&IO::AIO::poll_cb,
3372 ); 3635 );
3373} 3636}
3374 3637
3375my $_log_backtrace; 3638my $_log_backtrace;
3381 3644
3382 # limit the # of concurrent backtraces 3645 # limit the # of concurrent backtraces
3383 if ($_log_backtrace < 2) { 3646 if ($_log_backtrace < 2) {
3384 ++$_log_backtrace; 3647 ++$_log_backtrace;
3385 async { 3648 async {
3649 $Coro::current->{desc} = "abt $msg";
3650
3386 my @bt = fork_call { 3651 my @bt = fork_call {
3387 @addr = map { sprintf "%x", $_ } @addr; 3652 @addr = map { sprintf "%x", $_ } @addr;
3388 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3653 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3389 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 |"
3390 or die "addr2line: $!"; 3655 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines