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.361 by root, Sun Sep 9 12:52:48 2007 UTC vs.
Revision 1.402 by root, Mon Dec 17 07:03:32 2007 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable; 9use EV;
10use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.64 (); 15use Coro 4.32 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::EV;
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::BDB;
23use Coro::Storable; 24use Coro::Storable;
24use Coro::Util (); 25use Coro::Util ();
25 26
26use JSON::XS (); 27use JSON::XS 2.01 ();
27use BDB (); 28use BDB ();
28use Data::Dumper; 29use Data::Dumper;
29use Digest::MD5; 30use Digest::MD5;
30use Fcntl; 31use Fcntl;
31use YAML::Syck (); 32use YAML::Syck ();
32use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
33use Time::HiRes; 34use Time::HiRes;
34use Compress::LZF; 35use Compress::LZF;
35use Digest::MD5 (); 36use Digest::MD5 ();
36 37
37# configure various modules to our taste 38# configure various modules to our taste
38# 39#
39$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44 43
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1; 45$YAML::Syck::ImplicitUnicode = 1;
47 46
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER; 76our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 77our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 79our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 80our $USE_FSYNC = 1; # use fsync to write maps - default off
83 81
84our $BDB_POLL_WATCHER; 82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 86our $DB_ENV;
86 87
87our %CFG; 88our %CFG;
88 89
89our $UPTIME; $UPTIME ||= time; 90our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 91our $RUNTIME;
92our $NOW;
91 93
92our (%PLAYER, %PLAYER_LOADING); # all users 94our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # all maps 95our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 96our $LINK_MAP; # the special {link} map, which is always available
95 97
159 161
160The raw value load value from the last tick. 162The raw value load value from the last tick.
161 163
162=item %cf::CFG 164=item %cf::CFG
163 165
164Configuration for the server, loaded from C</etc/crossfire/config>, or 166Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 167from wherever your confdir points to.
166 168
167=item cf::wait_for_tick, cf::wait_for_tick_begin 169=item cf::wait_for_tick, cf::wait_for_tick_begin
168 170
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 171These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
187 $msg .= "\n" 189 $msg .= "\n"
188 unless $msg =~ /\n$/; 190 unless $msg =~ /\n$/;
189 191
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 193
192 utf8::encode $msg;
193 LOG llevError, $msg; 194 LOG llevError, $msg;
194 }; 195 };
195} 196}
196 197
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
213)) { 214)) {
214 no strict 'refs'; 215 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 217}
217 218
218$Event::DIED = sub { 219$EV::DIED = sub {
219 warn "error in event callback: @_"; 220 warn "error in event callback: @_";
220}; 221};
221 222
222############################################################################# 223#############################################################################
223 224
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 247 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 248 $d
248 } || "[unable to dump $_[0]: '$@']"; 249 } || "[unable to dump $_[0]: '$@']";
249} 250}
250 251
251=item $ref = cf::from_json $json 252=item $ref = cf::decode_json $json
252 253
253Converts a JSON string into the corresponding perl data structure. 254Converts a JSON string into the corresponding perl data structure.
254 255
255=item $json = cf::to_json $ref 256=item $json = cf::encode_json $ref
256 257
257Converts a perl data structure into its JSON representation. 258Converts a perl data structure into its JSON representation.
258 259
259=cut 260=cut
260 261
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 263
263sub to_json ($) { $json_coder->encode ($_[0]) } 264sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 265sub decode_json($) { $json_coder->decode ($_[0]) }
265 266
266=item cf::lock_wait $string 267=item cf::lock_wait $string
267 268
268Wait until the given lock is available. See cf::lock_acquire. 269Wait until the given lock is available. See cf::lock_acquire.
269 270
334 }; 335 };
335 $TICK_WATCHER->stop; 336 $TICK_WATCHER->stop;
336 $guard 337 $guard
337} 338}
338 339
340=item cf::periodic $interval, $cb
341
342Like EV::periodic, but randomly selects a starting point so that the actions
343get spread over timer.
344
345=cut
346
347sub periodic($$) {
348 my ($interval, $cb) = @_;
349
350 my $start = rand List::Util::min 180, $interval;
351
352 EV::periodic $start, $interval, 0, $cb
353}
354
339=item cf::get_slot $time[, $priority[, $name]] 355=item cf::get_slot $time[, $priority[, $name]]
340 356
341Allocate $time seconds of blocking CPU time at priority C<$priority>: 357Allocate $time seconds of blocking CPU time at priority C<$priority>:
342This call blocks and returns only when you have at least C<$time> seconds 358This call blocks and returns only when you have at least C<$time> seconds
343of cpu time till the next tick. The slot is only valid till the next cede. 359of cpu time till the next tick. The slot is only valid till the next cede.
352our @SLOT_QUEUE; 368our @SLOT_QUEUE;
353our $SLOT_QUEUE; 369our $SLOT_QUEUE;
354 370
355$SLOT_QUEUE->cancel if $SLOT_QUEUE; 371$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async { 372$SLOT_QUEUE = Coro::async {
373 $Coro::current->desc ("timeslot manager");
374
357 my $signal = new Coro::Signal; 375 my $signal = new Coro::Signal;
358 376
359 while () { 377 while () {
360 next_job: 378 next_job:
361 my $avail = cf::till_tick; 379 my $avail = cf::till_tick;
369 } 387 }
370 } 388 }
371 } 389 }
372 390
373 if (@SLOT_QUEUE) { 391 if (@SLOT_QUEUE) {
374 # we do not use wait_For_tick() as it returns immediately when tick is inactive 392 # we do not use wait_for_tick() as it returns immediately when tick is inactive
375 push @cf::WAIT_FOR_TICK, $signal; 393 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait; 394 $signal->wait;
377 } else { 395 } else {
378 Coro::schedule; 396 Coro::schedule;
379 } 397 }
402 420
403BEGIN { *async = \&Coro::async_pool } 421BEGIN { *async = \&Coro::async_pool }
404 422
405=item cf::sync_job { BLOCK } 423=item cf::sync_job { BLOCK }
406 424
407The design of Crossfire TRT requires that the main coroutine ($Coro::main) 425The design of Deliantra requires that the main coroutine ($Coro::main)
408is always able to handle events or runnable, as Crossfire TRT is only 426is always able to handle events or runnable, as Deliantra is only
409partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 427partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
410acceptable. 428acceptable.
411 429
412If it must be done, put the blocking parts into C<sync_job>. This will run 430If it must be done, put the blocking parts into C<sync_job>. This will run
413the given BLOCK in another coroutine while waiting for the result. The 431the given BLOCK in another coroutine while waiting for the result. The
418 436
419sub sync_job(&) { 437sub sync_job(&) {
420 my ($job) = @_; 438 my ($job) = @_;
421 439
422 if ($Coro::current == $Coro::main) { 440 if ($Coro::current == $Coro::main) {
423 my $time = Event::time; 441 my $time = EV::time;
424 442
425 # this is the main coro, too bad, we have to block 443 # this is the main coro, too bad, we have to block
426 # till the operation succeeds, freezing the server :/ 444 # till the operation succeeds, freezing the server :/
427 445
446 LOG llevError, Carp::longmess "sync job";#d#
447
428 # TODO: use suspend/resume instead 448 # TODO: use suspend/resume instead
429 # (but this is cancel-safe) 449 # (but this is cancel-safe)
430 my $freeze_guard = freeze_mainloop; 450 my $freeze_guard = freeze_mainloop;
431 451
432 my $busy = 1; 452 my $busy = 1;
433 my @res; 453 my @res;
434 454
435 (async { 455 (async {
456 $Coro::current->desc ("sync job coro");
436 @res = eval { $job->() }; 457 @res = eval { $job->() };
437 warn $@ if $@; 458 warn $@ if $@;
438 undef $busy; 459 undef $busy;
439 })->prio (Coro::PRIO_MAX); 460 })->prio (Coro::PRIO_MAX);
440 461
441 while ($busy) { 462 while ($busy) {
442 Coro::cede or Event::one_event; 463 if (Coro::nready) {
464 Coro::cede_notself;
465 } else {
466 EV::loop EV::LOOP_ONESHOT;
443 } 467 }
468 }
444 469
445 $time = Event::time - $time; 470 $time = EV::time - $time;
446 471
447 LOG llevError | logBacktrace, Carp::longmess "long sync job" 472 LOG llevError | logBacktrace, Carp::longmess "long sync job"
448 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 473 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
449 474
450 $tick_start += $time; # do not account sync jobs to server load 475 $tick_start += $time; # do not account sync jobs to server load
480=item fork_call { }, $args 505=item fork_call { }, $args
481 506
482Executes the given code block with the given arguments in a seperate 507Executes the given code block with the given arguments in a seperate
483process, returning the results. Everything must be serialisable with 508process, returning the results. Everything must be serialisable with
484Coro::Storable. May, of course, block. Note that the executed sub may 509Coro::Storable. May, of course, block. Note that the executed sub may
485never block itself or use any form of Event handling. 510never block itself or use any form of event handling.
486 511
487=cut 512=cut
488 513
489sub fork_call(&@) { 514sub fork_call(&@) {
490 my ($cb, @args) = @_; 515 my ($cb, @args) = @_;
508=item cf::db_put $family => $key => $value 533=item cf::db_put $family => $key => $value
509 534
510Stores the given C<$value> in the family. It can currently store binary 535Stores the given C<$value> in the family. It can currently store binary
511data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 536data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
512 537
538=item $db = cf::db_table "name"
539
540Create and/or open a new database table. The string must not be "db" and must be unique
541within each server.
542
513=cut 543=cut
544
545sub db_table($) {
546 my ($name) = @_;
547 my $db = BDB::db_create $DB_ENV;
548
549 eval {
550 $db->set_flags (BDB::CHKSUM);
551
552 utf8::encode $name;
553 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
554 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
555 cf::cleanup "db_open(db): $!" if $!;
556 };
557 cf::cleanup "db_open(db): $@" if $@;
558
559 $db
560}
514 561
515our $DB; 562our $DB;
516 563
517sub db_init { 564sub db_init {
518 unless ($DB) {
519 $DB = BDB::db_create $DB_ENV;
520
521 cf::sync_job { 565 cf::sync_job {
522 eval { 566 $DB ||= db_table "db";
523 $DB->set_flags (BDB::CHKSUM);
524
525 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
526 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
527 cf::cleanup "db_open(db): $!" if $!;
528 };
529 cf::cleanup "db_open(db): $@" if $@;
530 };
531 } 567 };
532} 568}
533 569
534sub db_get($$) { 570sub db_get($$) {
535 my $key = "$_[0]/$_[1]"; 571 my $key = "$_[0]/$_[1]";
536 572
640attach callbacks/event handlers (a collection of which is called an "attachment") 676attach callbacks/event handlers (a collection of which is called an "attachment")
641to it. All such attachable objects support the following methods. 677to it. All such attachable objects support the following methods.
642 678
643In the following description, CLASS can be any of C<global>, C<object> 679In the following description, CLASS can be any of C<global>, C<object>
644C<player>, C<client> or C<map> (i.e. the attachable objects in 680C<player>, C<client> or C<map> (i.e. the attachable objects in
645Crossfire TRT). 681Deliantra).
646 682
647=over 4 683=over 4
648 684
649=item $attachable->attach ($attachment, key => $value...) 685=item $attachable->attach ($attachment, key => $value...)
650 686
948 984
949=cut 985=cut
950 986
951############################################################################# 987#############################################################################
952# object support 988# object support
953#
954 989
990sub _object_equal($$);
991sub _object_equal($$) {
992 my ($a, $b) = @_;
993
994 return 0 unless (ref $a) eq (ref $b);
995
996 if ("HASH" eq ref $a) {
997 my @ka = keys %$a;
998 my @kb = keys %$b;
999
1000 return 0 if @ka != @kb;
1001
1002 for (0 .. $#ka) {
1003 return 0 unless $ka[$_] eq $kb[$_];
1004 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1005 }
1006
1007 } elsif ("ARRAY" eq ref $a) {
1008
1009 return 0 if @$a != @$b;
1010
1011 for (0 .. $#$a) {
1012 return 0 unless _object_equal $a->[$_], $b->[$_];
1013 }
1014
1015 } elsif ($a ne $b) {
1016 return 0;
1017 }
1018
1019 1
1020}
1021
1022our $SLOW_MERGES;#d#
955sub _can_merge { 1023sub _can_merge {
956 my ($ob1, $ob2) = @_; 1024 my ($ob1, $ob2) = @_;
957 1025
958 local $Storable::canonical = 1; 1026 ++$SLOW_MERGES;#d#
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961 1027
962 $fob1 eq $fob2 1028 # we do the slow way here
1029 return _object_equal $ob1, $ob2
963} 1030}
964 1031
965sub reattach { 1032sub reattach {
966 # basically do the same as instantiate, without calling instantiate 1033 # basically do the same as instantiate, without calling instantiate
967 my ($obj) = @_; 1034 my ($obj) = @_;
989cf::attachable->attach ( 1056cf::attachable->attach (
990 prio => -1000000, 1057 prio => -1000000,
991 on_instantiate => sub { 1058 on_instantiate => sub {
992 my ($obj, $data) = @_; 1059 my ($obj, $data) = @_;
993 1060
994 $data = from_json $data; 1061 $data = decode_json $data;
995 1062
996 for (@$data) { 1063 for (@$data) {
997 my ($name, $args) = @$_; 1064 my ($name, $args) = @$_;
998 1065
999 $obj->attach ($name, %{$args || {} }); 1066 $obj->attach ($name, %{$args || {} });
1013); 1080);
1014 1081
1015sub object_freezer_save { 1082sub object_freezer_save {
1016 my ($filename, $rdata, $objs) = @_; 1083 my ($filename, $rdata, $objs) = @_;
1017 1084
1018 my $guard = cf::lock_acquire "io";
1019
1020 sync_job { 1085 sync_job {
1021 if (length $$rdata) { 1086 if (length $$rdata) {
1087 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1088 warn sprintf "saving %s (%d,%d)\n",
1023 $filename, length $$rdata, scalar @$objs; 1089 $decname, length $$rdata, scalar @$objs;
1024 1090
1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1091 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1026 chmod SAVE_MODE, $fh; 1092 chmod SAVE_MODE, $fh;
1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1093 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1094 aio_fsync $fh if $cf::USE_FSYNC;
1029 close $fh; 1095 close $fh;
1030 1096
1031 if (@$objs) { 1097 if (@$objs) {
1032 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1098 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1033 chmod SAVE_MODE, $fh; 1099 chmod SAVE_MODE, $fh;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1100 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1101 aio_write $fh, 0, (length $data), $data, 0;
1036 aio_fsync $fh if $cf::USE_FSYNC; 1102 aio_fsync $fh if $cf::USE_FSYNC;
1037 close $fh; 1103 close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1104 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1105 }
1048 } else { 1114 } else {
1049 aio_unlink $filename; 1115 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1116 aio_unlink "$filename.pst";
1051 } 1117 }
1052 }; 1118 };
1053
1054 undef $guard;
1055} 1119}
1056 1120
1057sub object_freezer_as_string { 1121sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1122 my ($rdata, $objs) = @_;
1059 1123
1064 1128
1065sub object_thawer_load { 1129sub object_thawer_load {
1066 my ($filename) = @_; 1130 my ($filename) = @_;
1067 1131
1068 my ($data, $av); 1132 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1133
1072 (aio_load $filename, $data) >= 0 1134 (aio_load $filename, $data) >= 0
1073 or return; 1135 or return;
1074 1136
1075 unless (aio_stat "$filename.pst") { 1137 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1138 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1139 or return;
1078 1140
1079 undef $guard;
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1141 my $st = eval { Coro::Storable::thaw $av };
1142 $av = $st->{objs};
1081 } 1143 }
1082 1144
1145 utf8::decode (my $decname = $filename);
1083 warn sprintf "loading %s (%d)\n", 1146 warn sprintf "loading %s (%d,%d)\n",
1084 $filename, length $data, scalar @{$av || []}; 1147 $decname, length $data, scalar @{$av || []};
1085 1148
1086 ($data, $av) 1149 ($data, $av)
1087} 1150}
1088 1151
1089=head2 COMMAND CALLBACKS 1152=head2 COMMAND CALLBACKS
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1401 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1402
1340 my $f = new_from_file cf::object::thawer path $login 1403 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1404 or return;
1342 1405
1343 $f->next;
1344 my $pl = cf::player::load_pl $f 1406 my $pl = cf::player::load_pl $f
1345 or return; 1407 or return;
1346 local $cf::PLAYER_LOADING{$login} = $pl; 1408 local $cf::PLAYER_LOADING{$login} = $pl;
1347 $f->resolve_delayed_derefs; 1409 $f->resolve_delayed_derefs;
1348 $cf::PLAYER{$login} = $pl 1410 $cf::PLAYER{$login} = $pl
1500 1562
1501Expand crossfire pod fragments into protocol xml. 1563Expand crossfire pod fragments into protocol xml.
1502 1564
1503=cut 1565=cut
1504 1566
1567use re 'eval';
1568
1569my $group;
1570my $interior; $interior = qr{
1571 # match a pod interior sequence sans C<< >>
1572 (?:
1573 \ (.*?)\ (?{ $group = $^N })
1574 | < (??{$interior}) >
1575 )
1576}x;
1577
1505sub expand_cfpod { 1578sub expand_cfpod {
1506 ((my $self), (local $_)) = @_; 1579 my ($self, $pod) = @_;
1507 1580
1508 # escape & and < 1581 my $xml;
1509 s/&/&amp;/g;
1510 s/(?<![BIUGHT])</&lt;/g;
1511 1582
1512 # this is buggy, it needs to properly take care of nested <'s 1583 while () {
1584 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1585 $group = $1;
1513 1586
1514 1 while 1587 $group =~ s/&/&amp;/g;
1515 # replace B<>, I<>, U<> etc. 1588 $group =~ s/</&lt;/g;
1516 s/B<([^\>]*)>/<b>$1<\/b>/ 1589
1517 || s/I<([^\>]*)>/<i>$1<\/i>/ 1590 $xml .= $group;
1518 || s/U<([^\>]*)>/<u>$1<\/u>/ 1591 } elsif ($pod =~ m%\G
1519 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1592 ([BCGHITU])
1520 # replace G<male|female> tags 1593 <
1521 || s{G<([^>|]*)\|([^>]*)>}{ 1594 (?:
1522 $self->gender ? $2 : $1 1595 ([^<>]*) (?{ $group = $^N })
1523 }ge 1596 | < $interior >
1524 # replace H<hint text> 1597 )
1525 || s{H<([^\>]*)>} 1598 >
1599 %gcsx
1526 { 1600 ) {
1601 my ($code, $data) = ($1, $group);
1602
1603 if ($code eq "B") {
1604 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1605 } elsif ($code eq "I") {
1606 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1607 } elsif ($code eq "U") {
1608 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1609 } elsif ($code eq "C") {
1610 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1611 } elsif ($code eq "T") {
1612 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1613 } elsif ($code eq "G") {
1614 my ($male, $female) = split /\|/, $data;
1615 $data = $self->gender ? $female : $male;
1616 $xml .= expand_cfpod ($self, $data);
1617 } elsif ($code eq "H") {
1527 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1618 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1528 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1619 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1529 "") 1620 "")
1530 [$self->{hintmode}] 1621 [$self->{hintmode}];
1622 } else {
1623 $xml .= "error processing '$code($data)' directive";
1531 }ge; 1624 }
1625 } else {
1626 if ($pod =~ /\G(.+)/) {
1627 warn "parse error while expanding $pod (at $1)";
1628 }
1629 last;
1630 }
1631 }
1532 1632
1633 for ($xml) {
1533 # create single paragraphs (very hackish) 1634 # create single paragraphs (very hackish)
1534 s/(?<=\S)\n(?=\w)/ /g; 1635 s/(?<=\S)\n(?=\w)/ /g;
1535 1636
1536 # compress some whitespace 1637 # compress some whitespace
1537 s/\s+\n/\n/g; # ws line-ends 1638 s/\s+\n/\n/g; # ws line-ends
1538 s/\n\n+/\n/g; # double lines 1639 s/\n\n+/\n/g; # double lines
1539 s/^\n+//; # beginning lines 1640 s/^\n+//; # beginning lines
1540 s/\n+$//; # ending lines 1641 s/\n+$//; # ending lines
1642 }
1541 1643
1542 $_ 1644 $xml
1543} 1645}
1646
1647no re 'eval';
1544 1648
1545sub hintmode { 1649sub hintmode {
1546 $_[0]{hintmode} = $_[1] if @_ > 1; 1650 $_[0]{hintmode} = $_[1] if @_ > 1;
1547 $_[0]{hintmode} 1651 $_[0]{hintmode}
1548} 1652}
2029 } 2133 }
2030 2134
2031 $MAP_PREFETCH{$path} |= $load; 2135 $MAP_PREFETCH{$path} |= $load;
2032 2136
2033 $MAP_PREFETCHER ||= cf::async { 2137 $MAP_PREFETCHER ||= cf::async {
2138 $Coro::current->{desc} = "map prefetcher";
2139
2034 while (%MAP_PREFETCH) { 2140 while (%MAP_PREFETCH) {
2035 while (my ($k, $v) = each %MAP_PREFETCH) { 2141 while (my ($k, $v) = each %MAP_PREFETCH) {
2036 if (my $map = find $k) { 2142 if (my $map = find $k) {
2037 $map->load if $v; 2143 $map->load if $v;
2038 } 2144 }
2064 return if $self->{deny_save}; 2170 return if $self->{deny_save};
2065 2171
2066 local $self->{last_access} = $self->last_access;#d# 2172 local $self->{last_access} = $self->last_access;#d#
2067 2173
2068 cf::async { 2174 cf::async {
2175 $Coro::current->{desc} = "map player save";
2069 $_->contr->save for $self->players; 2176 $_->contr->save for $self->players;
2070 }; 2177 };
2071 2178
2072 if ($uniq) { 2179 if ($uniq) {
2073 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2260=cut 2367=cut
2261 2368
2262sub deref { 2369sub deref {
2263 my ($ref) = @_; 2370 my ($ref) = @_;
2264 2371
2265 # temporary compatibility#TODO#remove
2266 $ref =~ s{^<}{player/<};
2267
2268 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2372 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2269 my ($uuid, $name) = ($1, $2); 2373 my ($uuid, $name) = ($1, $2);
2270 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2374 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2271 or return; 2375 or return;
2272 $pl->ob->uuid eq $uuid 2376 $pl->ob->uuid eq $uuid
2273 or return; 2377 or return;
2444 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2548 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2445 2549
2446 $self->enter_link; 2550 $self->enter_link;
2447 2551
2448 (async { 2552 (async {
2553 $Coro::current->{desc} = "player::goto $path $x $y";
2554
2555 # *tag paths override both path and x|y
2556 if ($path =~ /^\*(.*)$/) {
2557 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2558 my $ob = $obs[rand @obs];
2559
2560 # see if we actually can go there
2561 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2562 $ob = $obs[rand @obs];
2563 } else {
2564 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2565 }
2566 # else put us there anyways for now #d#
2567
2568 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2569 } else {
2570 ($path, $x, $y) = (undef, undef, undef);
2571 }
2572 }
2573
2449 my $map = eval { 2574 my $map = eval {
2450 my $map = cf::map::find $path; 2575 my $map = defined $path ? cf::map::find $path : undef;
2451 2576
2452 if ($map) { 2577 if ($map) {
2453 $map = $map->customise_for ($self); 2578 $map = $map->customise_for ($self);
2454 $map = $check->($map) if $check && $map; 2579 $map = $check->($map) if $check && $map;
2455 } else { 2580 } else {
2456 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2581 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2457 } 2582 }
2458 2583
2459 $map 2584 $map
2460 }; 2585 };
2461 2586
2514 $rmp->{origin_y} = $exit->y; 2639 $rmp->{origin_y} = $exit->y;
2515 } 2640 }
2516 2641
2517 $rmp->{random_seed} ||= $exit->random_seed; 2642 $rmp->{random_seed} ||= $exit->random_seed;
2518 2643
2519 my $data = cf::to_json $rmp; 2644 my $data = cf::encode_json $rmp;
2520 my $md5 = Digest::MD5::md5_hex $data; 2645 my $md5 = Digest::MD5::md5_hex $data;
2521 my $meta = "$RANDOMDIR/$md5.meta"; 2646 my $meta = "$RANDOMDIR/$md5.meta";
2522 2647
2523 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2524 aio_write $fh, 0, (length $data), $data, 0; 2649 aio_write $fh, 0, (length $data), $data, 0;
2551 # if exit is damned, update players death & WoR home-position 2676 # if exit is damned, update players death & WoR home-position
2552 $self->contr->savebed ($slaying, $hp, $sp) 2677 $self->contr->savebed ($slaying, $hp, $sp)
2553 if $exit->flag (FLAG_DAMNED); 2678 if $exit->flag (FLAG_DAMNED);
2554 2679
2555 (async { 2680 (async {
2681 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2682
2556 $self->deactivate_recursive; # just to be sure 2683 $self->deactivate_recursive; # just to be sure
2557 unless (eval { 2684 unless (eval {
2558 $self->goto ($slaying, $hp, $sp); 2685 $self->goto ($slaying, $hp, $sp);
2559 2686
2560 1; 2687 1;
2595the message, with C<log> being the default. If C<$color> is negative, suppress 2722the message, with C<log> being the default. If C<$color> is negative, suppress
2596the message unless the client supports the msg packet. 2723the message unless the client supports the msg packet.
2597 2724
2598=cut 2725=cut
2599 2726
2727# non-persistent channels (usually the info channel)
2600our %CHANNEL = ( 2728our %CHANNEL = (
2601 "c/identify" => { 2729 "c/identify" => {
2602 id => "identify", 2730 id => "infobox",
2603 title => "Identify", 2731 title => "Identify",
2604 reply => undef, 2732 reply => undef,
2605 tooltip => "Items recently identified", 2733 tooltip => "Items recently identified",
2606 }, 2734 },
2607 "c/examine" => { 2735 "c/examine" => {
2608 id => "examine", 2736 id => "infobox",
2609 title => "Examine", 2737 title => "Examine",
2610 reply => undef, 2738 reply => undef,
2611 tooltip => "Signs and other items you examined", 2739 tooltip => "Signs and other items you examined",
2612 }, 2740 },
2741 "c/book" => {
2742 id => "infobox",
2743 title => "Book",
2744 reply => undef,
2745 tooltip => "The contents of a note or book",
2746 },
2747 "c/lookat" => {
2748 id => "infobox",
2749 title => "Look",
2750 reply => undef,
2751 tooltip => "What you saw there",
2752 },
2753 "c/who" => {
2754 id => "infobox",
2755 title => "Players",
2756 reply => undef,
2757 tooltip => "Shows players who are currently online",
2758 },
2759 "c/body" => {
2760 id => "infobox",
2761 title => "Body Parts",
2762 reply => undef,
2763 tooltip => "Shows which body parts you posess and are available",
2764 },
2765 "c/uptime" => {
2766 id => "infobox",
2767 title => "Uptime",
2768 reply => undef,
2769 tooltip => "How long the server has been running since last restart",
2770 },
2771 "c/mapinfo" => {
2772 id => "infobox",
2773 title => "Map Info",
2774 reply => undef,
2775 tooltip => "Information related to the maps",
2776 },
2613); 2777);
2614 2778
2615sub cf::client::send_msg { 2779sub cf::client::send_msg {
2616 my ($self, $channel, $msg, $color, @extra) = @_; 2780 my ($self, $channel, $msg, $color, @extra) = @_;
2617 2781
2618 $msg = $self->pl->expand_cfpod ($msg); 2782 $msg = $self->pl->expand_cfpod ($msg);
2619 2783
2620 $color &= cf::NDI_CLIENT_MASK; # just in case... 2784 $color &= cf::NDI_CLIENT_MASK; # just in case...
2621 2785
2622 # check predefined channels, for the benefit of C 2786 # check predefined channels, for the benefit of C
2623 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2787 if ($CHANNEL{$channel}) {
2788 $channel = $CHANNEL{$channel};
2624 2789
2790 $self->ext_msg (channel_info => $channel)
2791 if $self->can_msg;
2792
2793 $channel = $channel->{id};
2794
2625 if (ref $channel) { 2795 } elsif (ref $channel) {
2626 # send meta info to client, if not yet sent 2796 # send meta info to client, if not yet sent
2627 unless (exists $self->{channel}{$channel->{id}}) { 2797 unless (exists $self->{channel}{$channel->{id}}) {
2628 $self->{channel}{$channel->{id}} = $channel; 2798 $self->{channel}{$channel->{id}} = $channel;
2629 $self->ext_msg (channel_info => $channel) 2799 $self->ext_msg (channel_info => $channel)
2630 if $self->can_msg; 2800 if $self->can_msg;
2847=pod 3017=pod
2848 3018
2849The following functions and methods are available within a safe environment: 3019The following functions and methods are available within a safe environment:
2850 3020
2851 cf::object 3021 cf::object
2852 contr pay_amount pay_player map x y force_find force_add 3022 contr pay_amount pay_player map x y force_find force_add destroy
2853 insert remove name archname title slaying race decrease_ob_nr 3023 insert remove name archname title slaying race decrease_ob_nr
2854 3024
2855 cf::object::player 3025 cf::object::player
2856 player 3026 player
2857 3027
2864=cut 3034=cut
2865 3035
2866for ( 3036for (
2867 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3037 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2868 insert remove inv name archname title slaying race 3038 insert remove inv name archname title slaying race
2869 decrease_ob_nr)], 3039 decrease_ob_nr destroy)],
2870 ["cf::object::player" => qw(player)], 3040 ["cf::object::player" => qw(player)],
2871 ["cf::player" => qw(peaceful)], 3041 ["cf::player" => qw(peaceful)],
2872 ["cf::map" => qw(trigger)], 3042 ["cf::map" => qw(trigger)],
2873) { 3043) {
2874 no strict 'refs'; 3044 no strict 'refs';
3149sub main { 3319sub main {
3150 # we must not ever block the main coroutine 3320 # we must not ever block the main coroutine
3151 local $Coro::idle = sub { 3321 local $Coro::idle = sub {
3152 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3322 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3153 (async { 3323 (async {
3154 Event::one_event; 3324 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT;
3155 })->prio (Coro::PRIO_MAX); 3326 })->prio (Coro::PRIO_MAX);
3156 }; 3327 };
3157 3328
3158 reload_config; 3329 reload_config;
3159 db_init; 3330 db_init;
3160 load_extensions; 3331 load_extensions;
3161 3332
3162 $TICK_WATCHER->start; 3333 $TICK_WATCHER->start;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3163 Event::loop; 3335 EV::loop;
3164} 3336}
3165 3337
3166############################################################################# 3338#############################################################################
3167# initialisation and cleanup 3339# initialisation and cleanup
3168 3340
3169# install some emergency cleanup handlers 3341# install some emergency cleanup handlers
3170BEGIN { 3342BEGIN {
3343 our %SIGWATCHER = ();
3171 for my $signal (qw(INT HUP TERM)) { 3344 for my $signal (qw(INT HUP TERM)) {
3172 Event->signal ( 3345 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3173 reentrant => 0,
3174 data => WF_AUTOCANCEL,
3175 signal => $signal,
3176 prio => 0,
3177 cb => sub {
3178 cf::cleanup "SIG$signal"; 3346 cf::cleanup "SIG$signal";
3179 },
3180 ); 3347 };
3181 } 3348 }
3182} 3349}
3183 3350
3184sub write_runtime { 3351sub write_runtime {
3185 my $runtime = "$LOCALDIR/runtime"; 3352 my $runtime = "$LOCALDIR/runtime";
3230 # and maps saved/destroyed asynchronously. 3397 # and maps saved/destroyed asynchronously.
3231 warn "begin emergency player save\n"; 3398 warn "begin emergency player save\n";
3232 for my $login (keys %cf::PLAYER) { 3399 for my $login (keys %cf::PLAYER) {
3233 my $pl = $cf::PLAYER{$login} or next; 3400 my $pl = $cf::PLAYER{$login} or next;
3234 $pl->valid or next; 3401 $pl->valid or next;
3402 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3235 $pl->save; 3403 $pl->save;
3236 } 3404 }
3237 warn "end emergency player save\n"; 3405 warn "end emergency player save\n";
3238 3406
3239 warn "begin emergency map save\n"; 3407 warn "begin emergency map save\n";
3278 warn "syncing database to disk"; 3446 warn "syncing database to disk";
3279 BDB::db_env_txn_checkpoint $DB_ENV; 3447 BDB::db_env_txn_checkpoint $DB_ENV;
3280 3448
3281 # if anything goes wrong in here, we should simply crash as we already saved 3449 # if anything goes wrong in here, we should simply crash as we already saved
3282 3450
3283 warn "cancelling all WF_AUTOCANCEL watchers";
3284 for (Event::all_watchers) {
3285 $_->cancel if $_->data & WF_AUTOCANCEL;
3286 }
3287
3288 warn "flushing outstanding aio requests"; 3451 warn "flushing outstanding aio requests";
3289 for (;;) { 3452 for (;;) {
3290 BDB::flush; 3453 BDB::flush;
3291 IO::AIO::flush; 3454 IO::AIO::flush;
3292 Coro::cede; 3455 Coro::cede_notself;
3293 last unless IO::AIO::nreqs || BDB::nreqs; 3456 last unless IO::AIO::nreqs || BDB::nreqs;
3294 warn "iterate..."; 3457 warn "iterate...";
3295 } 3458 }
3296 3459
3297 ++$RELOAD; 3460 ++$RELOAD;
3386 3549
3387sub reload_perl() { 3550sub reload_perl() {
3388 # doing reload synchronously and two reloads happen back-to-back, 3551 # doing reload synchronously and two reloads happen back-to-back,
3389 # coro crashes during coro_state_free->destroy here. 3552 # coro crashes during coro_state_free->destroy here.
3390 3553
3391 $RELOAD_WATCHER ||= Event->timer ( 3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3392 reentrant => 0,
3393 after => 0,
3394 data => WF_AUTOCANCEL,
3395 cb => sub {
3396 do_reload_perl;
3397 undef $RELOAD_WATCHER; 3555 undef $RELOAD_WATCHER;
3398 }, 3556 do_reload_perl;
3399 ); 3557 };
3400} 3558}
3401 3559
3402register_command "reload" => sub { 3560register_command "reload" => sub {
3403 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
3404 3562
3405 if ($who->flag (FLAG_WIZ)) { 3563 if ($who->flag (FLAG_WIZ)) {
3406 $who->message ("reloading server."); 3564 $who->message ("reloading server.");
3565 async {
3566 $Coro::current->{desc} = "perl_reload";
3407 async { reload_perl }; 3567 reload_perl;
3568 };
3408 } 3569 }
3409}; 3570};
3410 3571
3411unshift @INC, $LIBDIR; 3572unshift @INC, $LIBDIR;
3412 3573
3431 my $signal = new Coro::Signal; 3592 my $signal = new Coro::Signal;
3432 push @WAIT_FOR_TICK_BEGIN, $signal; 3593 push @WAIT_FOR_TICK_BEGIN, $signal;
3433 $signal->wait; 3594 $signal->wait;
3434} 3595}
3435 3596
3436 my $min = 1e6;#d# 3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3437 my $avg = 10;
3438$TICK_WATCHER = Event->timer (
3439 reentrant => 0,
3440 parked => 1,
3441 prio => 0,
3442 at => $NEXT_TICK || $TICK,
3443 data => WF_AUTOCANCEL,
3444 cb => sub {
3445 if ($Coro::current != $Coro::main) { 3598 if ($Coro::current != $Coro::main) {
3446 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3599 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3447 unless ++$bug_warning > 10; 3600 unless ++$bug_warning > 10;
3448 return; 3601 return;
3449 } 3602 }
3450 3603
3451 $NOW = $tick_start = Event::time; 3604 $NOW = $tick_start = EV::now;
3452 3605
3453 cf::server_tick; # one server iteration 3606 cf::server_tick; # one server iteration
3454 3607
3455 0 && sync_job {#d# 3608 $RUNTIME += $TICK;
3456 for(1..10) { 3609 $NEXT_TICK += $TICK;
3457 my $t = Event::time;
3458 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3459 or die;
3460 3610
3461 $map->width (50); 3611 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3462 $map->height (50); 3612 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3463 $map->alloc; 3613 Coro::async_pool {
3464 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work 3614 $Coro::current->{desc} = "runtime saver";
3465 my $t = Event::time - $t; 3615 write_runtime
3466 3616 or warn "ERROR: unable to write runtime file: $!";
3467 #next unless $t < 0.0013;#d#
3468 if ($t < $min) {
3469 $min = $t;
3470 }
3471 $avg = $avg * 0.99 + $t * 0.01;
3472 }
3473 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3474 exit 0;
3475 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3476 }; 3617 };
3618 }
3477 3619
3478 $RUNTIME += $TICK;
3479 $NEXT_TICK += $TICK;
3480
3481 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3482 $NEXT_RUNTIME_WRITE = $NOW + 10;
3483 Coro::async_pool {
3484 write_runtime
3485 or warn "ERROR: unable to write runtime file: $!";
3486 };
3487 }
3488
3489# my $AFTER = Event::time;
3490# warn $AFTER - $NOW;#d#
3491
3492 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3493 $sig->send; 3621 $sig->send;
3494 } 3622 }
3495 while (my $sig = shift @WAIT_FOR_TICK) { 3623 while (my $sig = shift @WAIT_FOR_TICK) {
3496 $sig->send; 3624 $sig->send;
3497 } 3625 }
3498 3626
3499 $NOW = Event::time;
3500
3501 # if we are delayed by four ticks or more, skip them all
3502 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3503
3504 $TICK_WATCHER->at ($NEXT_TICK);
3505 $TICK_WATCHER->start;
3506
3507 $LOAD = ($NOW - $tick_start) / $TICK; 3627 $LOAD = ($NOW - $tick_start) / $TICK;
3508 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3509 3629
3510 _post_tick; 3630 _post_tick;
3511 3631};
3512 3632$TICK_WATCHER->priority (EV::MAXPRI);
3513 },
3514);
3515 3633
3516{ 3634{
3517 BDB::max_poll_time $TICK * 0.1; 3635 # configure BDB
3518 $BDB_POLL_WATCHER = Event->io ( 3636
3519 reentrant => 0,
3520 fd => BDB::poll_fileno,
3521 poll => 'r',
3522 prio => 0,
3523 data => WF_AUTOCANCEL,
3524 cb => \&BDB::poll_cb,
3525 );
3526 BDB::min_parallel 8; 3637 BDB::min_parallel 8;
3527 3638 BDB::max_poll_reqs $TICK * 0.1;
3528 BDB::set_sync_prepare {
3529 my $status;
3530 my $current = $Coro::current;
3531 (
3532 sub {
3533 $status = $!;
3534 $current->ready; undef $current;
3535 },
3536 sub {
3537 Coro::schedule while defined $current;
3538 $! = $status;
3539 },
3540 )
3541 };
3542 3639
3543 unless ($DB_ENV) { 3640 unless ($DB_ENV) {
3544 $DB_ENV = BDB::db_env_create; 3641 $DB_ENV = BDB::db_env_create;
3642 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3643 | BDB::LOG_AUTOREMOVE, 1);
3644 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3645 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3545 3646
3546 cf::sync_job { 3647 cf::sync_job {
3547 eval { 3648 eval {
3548 BDB::db_env_open 3649 BDB::db_env_open
3549 $DB_ENV, 3650 $DB_ENV,
3551 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3652 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3552 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3653 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3553 0666; 3654 0666;
3554 3655
3555 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3656 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3556
3557 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3558 $DB_ENV->set_lk_detect;
3559 }; 3657 };
3560 3658
3561 cf::cleanup "db_env_open(db): $@" if $@; 3659 cf::cleanup "db_env_open(db): $@" if $@;
3562 }; 3660 };
3563 } 3661 }
3662
3663 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3664 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3665 };
3666 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3667 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3668 };
3669 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3670 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3671 };
3564} 3672}
3565 3673
3566{ 3674{
3675 # configure IO::AIO
3676
3567 IO::AIO::min_parallel 8; 3677 IO::AIO::min_parallel 8;
3568
3569 undef $Coro::AIO::WATCHER;
3570 IO::AIO::max_poll_time $TICK * 0.1; 3678 IO::AIO::max_poll_time $TICK * 0.1;
3571 $AIO_POLL_WATCHER = Event->io (
3572 reentrant => 0,
3573 data => WF_AUTOCANCEL,
3574 fd => IO::AIO::poll_fileno,
3575 poll => 'r',
3576 prio => 6,
3577 cb => \&IO::AIO::poll_cb,
3578 );
3579} 3679}
3580 3680
3581my $_log_backtrace; 3681my $_log_backtrace;
3582 3682
3583sub _log_backtrace { 3683sub _log_backtrace {
3587 3687
3588 # limit the # of concurrent backtraces 3688 # limit the # of concurrent backtraces
3589 if ($_log_backtrace < 2) { 3689 if ($_log_backtrace < 2) {
3590 ++$_log_backtrace; 3690 ++$_log_backtrace;
3591 async { 3691 async {
3692 $Coro::current->{desc} = "abt $msg";
3693
3592 my @bt = fork_call { 3694 my @bt = fork_call {
3593 @addr = map { sprintf "%x", $_ } @addr; 3695 @addr = map { sprintf "%x", $_ } @addr;
3594 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3696 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3595 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3697 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3596 or die "addr2line: $!"; 3698 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines