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.372 by root, Sat Sep 15 13:25:33 2007 UTC vs.
Revision 1.408 by root, Mon Jan 14 10:12:12 2008 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 1.86;
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 ();
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
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47 43
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 45
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 47
… …
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 66our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 69our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 70our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE;
75 72
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER; 74our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 75our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 77our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 78our $USE_FSYNC = 1; # use fsync to write maps - default off
83 79
84our $BDB_POLL_WATCHER; 80our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 81our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 82our $BDB_CHECKPOINT_WATCHER;
… …
89 85
90our %CFG; 86our %CFG;
91 87
92our $UPTIME; $UPTIME ||= time; 88our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 89our $RUNTIME;
90our $NOW;
94 91
95our (%PLAYER, %PLAYER_LOADING); # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 93our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
98 95
… …
162 159
163The raw value load value from the last tick. 160The raw value load value from the last tick.
164 161
165=item %cf::CFG 162=item %cf::CFG
166 163
167Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 165from wherever your confdir points to.
169 166
170=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
171 168
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
… …
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 191
195 LOG llevError, $msg; 192 LOG llevError, $msg;
196 }; 193 };
197} 194}
195
196$Coro::State::DIEHOOK = sub {
197 warn Carp::longmess $_[0];
198 Coro::terminate;
199};
198 200
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 201@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 202@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 203@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 204@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
215)) { 217)) {
216 no strict 'refs'; 218 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 219 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 220}
219 221
220$Event::DIED = sub { 222$EV::DIED = sub {
221 warn "error in event callback: @_"; 223 warn "error in event callback: @_";
222}; 224};
223 225
224############################################################################# 226#############################################################################
225 227
… …
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 250 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 251 $d
250 } || "[unable to dump $_[0]: '$@']"; 252 } || "[unable to dump $_[0]: '$@']";
251} 253}
252 254
253=item $ref = cf::from_json $json 255=item $ref = cf::decode_json $json
254 256
255Converts a JSON string into the corresponding perl data structure. 257Converts a JSON string into the corresponding perl data structure.
256 258
257=item $json = cf::to_json $ref 259=item $json = cf::encode_json $ref
258 260
259Converts a perl data structure into its JSON representation. 261Converts a perl data structure into its JSON representation.
260 262
261=cut 263=cut
262 264
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 265our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 266
265sub to_json ($) { $json_coder->encode ($_[0]) } 267sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 268sub decode_json($) { $json_coder->decode ($_[0]) }
267 269
268=item cf::lock_wait $string 270=item cf::lock_wait $string
269 271
270Wait until the given lock is available. See cf::lock_acquire. 272Wait until the given lock is available. See cf::lock_acquire.
271 273
… …
336 }; 338 };
337 $TICK_WATCHER->stop; 339 $TICK_WATCHER->stop;
338 $guard 340 $guard
339} 341}
340 342
343=item cf::periodic $interval, $cb
344
345Like EV::periodic, but randomly selects a starting point so that the actions
346get spread over timer.
347
348=cut
349
350sub periodic($$) {
351 my ($interval, $cb) = @_;
352
353 my $start = rand List::Util::min 180, $interval;
354
355 EV::periodic $start, $interval, 0, $cb
356}
357
341=item cf::get_slot $time[, $priority[, $name]] 358=item cf::get_slot $time[, $priority[, $name]]
342 359
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 360Allocate $time seconds of blocking CPU time at priority C<$priority>:
344This call blocks and returns only when you have at least C<$time> seconds 361This call blocks and returns only when you have at least C<$time> seconds
345of cpu time till the next tick. The slot is only valid till the next cede. 362of cpu time till the next tick. The slot is only valid till the next cede.
… …
354our @SLOT_QUEUE; 371our @SLOT_QUEUE;
355our $SLOT_QUEUE; 372our $SLOT_QUEUE;
356 373
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 374$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 375$SLOT_QUEUE = Coro::async {
376 $Coro::current->desc ("timeslot manager");
377
359 my $signal = new Coro::Signal; 378 my $signal = new Coro::Signal;
360 379
361 while () { 380 while () {
362 next_job: 381 next_job:
363 my $avail = cf::till_tick; 382 my $avail = cf::till_tick;
… …
371 } 390 }
372 } 391 }
373 } 392 }
374 393
375 if (@SLOT_QUEUE) { 394 if (@SLOT_QUEUE) {
376 # we do not use wait_For_tick() as it returns immediately when tick is inactive 395 # we do not use wait_for_tick() as it returns immediately when tick is inactive
377 push @cf::WAIT_FOR_TICK, $signal; 396 push @cf::WAIT_FOR_TICK, $signal;
378 $signal->wait; 397 $signal->wait;
379 } else { 398 } else {
380 Coro::schedule; 399 Coro::schedule;
381 } 400 }
… …
404 423
405BEGIN { *async = \&Coro::async_pool } 424BEGIN { *async = \&Coro::async_pool }
406 425
407=item cf::sync_job { BLOCK } 426=item cf::sync_job { BLOCK }
408 427
409The design of Crossfire TRT requires that the main coroutine ($Coro::main) 428The design of Deliantra requires that the main coroutine ($Coro::main)
410is always able to handle events or runnable, as Crossfire TRT is only 429is always able to handle events or runnable, as Deliantra is only
411partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 430partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
412acceptable. 431acceptable.
413 432
414If it must be done, put the blocking parts into C<sync_job>. This will run 433If it must be done, put the blocking parts into C<sync_job>. This will run
415the given BLOCK in another coroutine while waiting for the result. The 434the given BLOCK in another coroutine while waiting for the result. The
… …
420 439
421sub sync_job(&) { 440sub sync_job(&) {
422 my ($job) = @_; 441 my ($job) = @_;
423 442
424 if ($Coro::current == $Coro::main) { 443 if ($Coro::current == $Coro::main) {
425 my $time = Event::time; 444 my $time = EV::time;
426 445
427 # this is the main coro, too bad, we have to block 446 # this is the main coro, too bad, we have to block
428 # till the operation succeeds, freezing the server :/ 447 # till the operation succeeds, freezing the server :/
429 448
449 LOG llevError, Carp::longmess "sync job";#d#
450
430 # TODO: use suspend/resume instead 451 # TODO: use suspend/resume instead
431 # (but this is cancel-safe) 452 # (but this is cancel-safe)
432 my $freeze_guard = freeze_mainloop; 453 my $freeze_guard = freeze_mainloop;
433 454
434 my $busy = 1; 455 my $busy = 1;
435 my @res; 456 my @res;
436 457
437 (async { 458 (async {
459 $Coro::current->desc ("sync job coro");
438 @res = eval { $job->() }; 460 @res = eval { $job->() };
439 warn $@ if $@; 461 warn $@ if $@;
440 undef $busy; 462 undef $busy;
441 })->prio (Coro::PRIO_MAX); 463 })->prio (Coro::PRIO_MAX);
442 464
443 while ($busy) { 465 while ($busy) {
444 Coro::cede or Event::one_event; 466 if (Coro::nready) {
467 Coro::cede_notself;
468 } else {
469 EV::loop EV::LOOP_ONESHOT;
445 } 470 }
471 }
446 472
447 $time = Event::time - $time; 473 $time = EV::time - $time;
448 474
449 LOG llevError | logBacktrace, Carp::longmess "long sync job" 475 LOG llevError | logBacktrace, Carp::longmess "long sync job"
450 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 476 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
451 477
452 $tick_start += $time; # do not account sync jobs to server load 478 $tick_start += $time; # do not account sync jobs to server load
… …
482=item fork_call { }, $args 508=item fork_call { }, $args
483 509
484Executes the given code block with the given arguments in a seperate 510Executes the given code block with the given arguments in a seperate
485process, returning the results. Everything must be serialisable with 511process, returning the results. Everything must be serialisable with
486Coro::Storable. May, of course, block. Note that the executed sub may 512Coro::Storable. May, of course, block. Note that the executed sub may
487never block itself or use any form of Event handling. 513never block itself or use any form of event handling.
488 514
489=cut 515=cut
490 516
491sub fork_call(&@) { 517sub fork_call(&@) {
492 my ($cb, @args) = @_; 518 my ($cb, @args) = @_;
… …
653attach callbacks/event handlers (a collection of which is called an "attachment") 679attach callbacks/event handlers (a collection of which is called an "attachment")
654to it. All such attachable objects support the following methods. 680to it. All such attachable objects support the following methods.
655 681
656In the following description, CLASS can be any of C<global>, C<object> 682In the following description, CLASS can be any of C<global>, C<object>
657C<player>, C<client> or C<map> (i.e. the attachable objects in 683C<player>, C<client> or C<map> (i.e. the attachable objects in
658Crossfire TRT). 684Deliantra).
659 685
660=over 4 686=over 4
661 687
662=item $attachable->attach ($attachment, key => $value...) 688=item $attachable->attach ($attachment, key => $value...)
663 689
… …
945 } 971 }
946 972
947 0 973 0
948} 974}
949 975
950=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 976=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
951 977
952=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 978=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
953 979
954Generate an object-specific event with the given arguments. 980Generate an object-specific event with the given arguments.
955 981
… …
961 987
962=cut 988=cut
963 989
964############################################################################# 990#############################################################################
965# object support 991# object support
966#
967 992
993sub _object_equal($$);
994sub _object_equal($$) {
995 my ($a, $b) = @_;
996
997 return 0 unless (ref $a) eq (ref $b);
998
999 if ("HASH" eq ref $a) {
1000 my @ka = keys %$a;
1001 my @kb = keys %$b;
1002
1003 return 0 if @ka != @kb;
1004
1005 for (0 .. $#ka) {
1006 return 0 unless $ka[$_] eq $kb[$_];
1007 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1008 }
1009
1010 } elsif ("ARRAY" eq ref $a) {
1011
1012 return 0 if @$a != @$b;
1013
1014 for (0 .. $#$a) {
1015 return 0 unless _object_equal $a->[$_], $b->[$_];
1016 }
1017
1018 } elsif ($a ne $b) {
1019 return 0;
1020 }
1021
1022 1
1023}
1024
1025our $SLOW_MERGES;#d#
968sub _can_merge { 1026sub _can_merge {
969 my ($ob1, $ob2) = @_; 1027 my ($ob1, $ob2) = @_;
970 1028
971 local $Storable::canonical = 1; 1029 ++$SLOW_MERGES;#d#
972 my $fob1 = Storable::freeze $ob1;
973 my $fob2 = Storable::freeze $ob2;
974 1030
975 $fob1 eq $fob2 1031 # we do the slow way here
1032 return _object_equal $ob1, $ob2
976} 1033}
977 1034
978sub reattach { 1035sub reattach {
979 # basically do the same as instantiate, without calling instantiate 1036 # basically do the same as instantiate, without calling instantiate
980 my ($obj) = @_; 1037 my ($obj) = @_;
… …
1002cf::attachable->attach ( 1059cf::attachable->attach (
1003 prio => -1000000, 1060 prio => -1000000,
1004 on_instantiate => sub { 1061 on_instantiate => sub {
1005 my ($obj, $data) = @_; 1062 my ($obj, $data) = @_;
1006 1063
1007 $data = from_json $data; 1064 $data = decode_json $data;
1008 1065
1009 for (@$data) { 1066 for (@$data) {
1010 my ($name, $args) = @$_; 1067 my ($name, $args) = @$_;
1011 1068
1012 $obj->attach ($name, %{$args || {} }); 1069 $obj->attach ($name, %{$args || {} });
… …
1025 }, 1082 },
1026); 1083);
1027 1084
1028sub object_freezer_save { 1085sub object_freezer_save {
1029 my ($filename, $rdata, $objs) = @_; 1086 my ($filename, $rdata, $objs) = @_;
1030
1031 my $guard = cf::lock_acquire "io";
1032 1087
1033 sync_job { 1088 sync_job {
1034 if (length $$rdata) { 1089 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename); 1090 utf8::decode (my $decname = $filename);
1036 warn sprintf "saving %s (%d,%d)\n", 1091 warn sprintf "saving %s (%d,%d)\n",
… …
1043 close $fh; 1098 close $fh;
1044 1099
1045 if (@$objs) { 1100 if (@$objs) {
1046 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1101 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1047 chmod SAVE_MODE, $fh; 1102 chmod SAVE_MODE, $fh;
1048 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1103 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1049 aio_write $fh, 0, (length $data), $data, 0; 1104 aio_write $fh, 0, (length $data), $data, 0;
1050 aio_fsync $fh if $cf::USE_FSYNC; 1105 aio_fsync $fh if $cf::USE_FSYNC;
1051 close $fh; 1106 close $fh;
1052 aio_rename "$filename.pst~", "$filename.pst"; 1107 aio_rename "$filename.pst~", "$filename.pst";
1053 } 1108 }
… …
1062 } else { 1117 } else {
1063 aio_unlink $filename; 1118 aio_unlink $filename;
1064 aio_unlink "$filename.pst"; 1119 aio_unlink "$filename.pst";
1065 } 1120 }
1066 }; 1121 };
1067
1068 undef $guard;
1069} 1122}
1070 1123
1071sub object_freezer_as_string { 1124sub object_freezer_as_string {
1072 my ($rdata, $objs) = @_; 1125 my ($rdata, $objs) = @_;
1073 1126
… …
1078 1131
1079sub object_thawer_load { 1132sub object_thawer_load {
1080 my ($filename) = @_; 1133 my ($filename) = @_;
1081 1134
1082 my ($data, $av); 1135 my ($data, $av);
1083
1084 my $guard = cf::lock_acquire "io";
1085 1136
1086 (aio_load $filename, $data) >= 0 1137 (aio_load $filename, $data) >= 0
1087 or return; 1138 or return;
1088 1139
1089 unless (aio_stat "$filename.pst") { 1140 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1141 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1142 or return;
1092 1143
1093 undef $guard;
1094 $av = eval { (Storable::thaw $av)->{objs} }; 1144 my $st = eval { Coro::Storable::thaw $av };
1145 $av = $st->{objs};
1095 } 1146 }
1096 1147
1097 utf8::decode (my $decname = $filename); 1148 utf8::decode (my $decname = $filename);
1098 warn sprintf "loading %s (%d,%d)\n", 1149 warn sprintf "loading %s (%d,%d)\n",
1099 $decname, length $data, scalar @{$av || []}; 1150 $decname, length $data, scalar @{$av || []};
… …
1514 1565
1515Expand crossfire pod fragments into protocol xml. 1566Expand crossfire pod fragments into protocol xml.
1516 1567
1517=cut 1568=cut
1518 1569
1570use re 'eval';
1571
1572my $group;
1573my $interior; $interior = qr{
1574 # match a pod interior sequence sans C<< >>
1575 (?:
1576 \ (.*?)\ (?{ $group = $^N })
1577 | < (??{$interior}) >
1578 )
1579}x;
1580
1519sub expand_cfpod { 1581sub expand_cfpod {
1520 ((my $self), (local $_)) = @_; 1582 my ($self, $pod) = @_;
1521 1583
1522 # escape & and < 1584 my $xml;
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525 1585
1526 # this is buggy, it needs to properly take care of nested <'s 1586 while () {
1587 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1588 $group = $1;
1527 1589
1528 1 while 1590 $group =~ s/&/&amp;/g;
1529 # replace B<>, I<>, U<> etc. 1591 $group =~ s/</&lt;/g;
1530 s/B<([^\>]*)>/<b>$1<\/b>/ 1592
1531 || s/I<([^\>]*)>/<i>$1<\/i>/ 1593 $xml .= $group;
1532 || s/U<([^\>]*)>/<u>$1<\/u>/ 1594 } elsif ($pod =~ m%\G
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1595 ([BCGHITU])
1534 # replace G<male|female> tags 1596 <
1535 || s{G<([^>|]*)\|([^>]*)>}{ 1597 (?:
1536 $self->gender ? $2 : $1 1598 ([^<>]*) (?{ $group = $^N })
1537 }ge 1599 | < $interior >
1538 # replace H<hint text> 1600 )
1539 || s{H<([^\>]*)>} 1601 >
1602 %gcsx
1540 { 1603 ) {
1604 my ($code, $data) = ($1, $group);
1605
1606 if ($code eq "B") {
1607 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1608 } elsif ($code eq "I") {
1609 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1610 } elsif ($code eq "U") {
1611 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1612 } elsif ($code eq "C") {
1613 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1614 } elsif ($code eq "T") {
1615 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1616 } elsif ($code eq "G") {
1617 my ($male, $female) = split /\|/, $data;
1618 $data = $self->gender ? $female : $male;
1619 $xml .= expand_cfpod ($self, $data);
1620 } elsif ($code eq "H") {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1621 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1622 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "") 1623 "")
1544 [$self->{hintmode}] 1624 [$self->{hintmode}];
1625 } else {
1626 $xml .= "error processing '$code($data)' directive";
1545 }ge; 1627 }
1628 } else {
1629 if ($pod =~ /\G(.+)/) {
1630 warn "parse error while expanding $pod (at $1)";
1631 }
1632 last;
1633 }
1634 }
1546 1635
1636 for ($xml) {
1547 # create single paragraphs (very hackish) 1637 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g; 1638 s/(?<=\S)\n(?=\w)/ /g;
1549 1639
1550 # compress some whitespace 1640 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends 1641 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines 1642 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines 1643 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines 1644 s/\n+$//; # ending lines
1645 }
1555 1646
1556 $_ 1647 $xml
1557} 1648}
1649
1650no re 'eval';
1558 1651
1559sub hintmode { 1652sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1; 1653 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode} 1654 $_[0]{hintmode}
1562} 1655}
… …
2043 } 2136 }
2044 2137
2045 $MAP_PREFETCH{$path} |= $load; 2138 $MAP_PREFETCH{$path} |= $load;
2046 2139
2047 $MAP_PREFETCHER ||= cf::async { 2140 $MAP_PREFETCHER ||= cf::async {
2141 $Coro::current->{desc} = "map prefetcher";
2142
2048 while (%MAP_PREFETCH) { 2143 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2144 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2145 if (my $map = find $k) {
2051 $map->load if $v; 2146 $map->load if $v;
2052 } 2147 }
… …
2078 return if $self->{deny_save}; 2173 return if $self->{deny_save};
2079 2174
2080 local $self->{last_access} = $self->last_access;#d# 2175 local $self->{last_access} = $self->last_access;#d#
2081 2176
2082 cf::async { 2177 cf::async {
2178 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2179 $_->contr->save for $self->players;
2084 }; 2180 };
2085 2181
2086 if ($uniq) { 2182 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2274=cut 2370=cut
2275 2371
2276sub deref { 2372sub deref {
2277 my ($ref) = @_; 2373 my ($ref) = @_;
2278 2374
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2375 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2376 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2377 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2378 or return;
2286 $pl->ob->uuid eq $uuid 2379 $pl->ob->uuid eq $uuid
2287 or return; 2380 or return;
… …
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2552
2460 $self->enter_link; 2553 $self->enter_link;
2461 2554
2462 (async { 2555 (async {
2556 $Coro::current->{desc} = "player::goto $path $x $y";
2557
2463 # *tag paths override both path and x|y 2558 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2559 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2560 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2561 my $ob = $obs[rand @obs];
2467 2562
… …
2547 $rmp->{origin_y} = $exit->y; 2642 $rmp->{origin_y} = $exit->y;
2548 } 2643 }
2549 2644
2550 $rmp->{random_seed} ||= $exit->random_seed; 2645 $rmp->{random_seed} ||= $exit->random_seed;
2551 2646
2552 my $data = cf::to_json $rmp; 2647 my $data = cf::encode_json $rmp;
2553 my $md5 = Digest::MD5::md5_hex $data; 2648 my $md5 = Digest::MD5::md5_hex $data;
2554 my $meta = "$RANDOMDIR/$md5.meta"; 2649 my $meta = "$RANDOMDIR/$md5.meta";
2555 2650
2556 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2557 aio_write $fh, 0, (length $data), $data, 0; 2652 aio_write $fh, 0, (length $data), $data, 0;
… …
2584 # if exit is damned, update players death & WoR home-position 2679 # if exit is damned, update players death & WoR home-position
2585 $self->contr->savebed ($slaying, $hp, $sp) 2680 $self->contr->savebed ($slaying, $hp, $sp)
2586 if $exit->flag (FLAG_DAMNED); 2681 if $exit->flag (FLAG_DAMNED);
2587 2682
2588 (async { 2683 (async {
2684 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2685
2589 $self->deactivate_recursive; # just to be sure 2686 $self->deactivate_recursive; # just to be sure
2590 unless (eval { 2687 unless (eval {
2591 $self->goto ($slaying, $hp, $sp); 2688 $self->goto ($slaying, $hp, $sp);
2592 2689
2593 1; 2690 1;
… …
2628the message, with C<log> being the default. If C<$color> is negative, suppress 2725the message, with C<log> being the default. If C<$color> is negative, suppress
2629the message unless the client supports the msg packet. 2726the message unless the client supports the msg packet.
2630 2727
2631=cut 2728=cut
2632 2729
2730# non-persistent channels (usually the info channel)
2633our %CHANNEL = ( 2731our %CHANNEL = (
2634 "c/identify" => { 2732 "c/identify" => {
2635 id => "identify", 2733 id => "infobox",
2636 title => "Identify", 2734 title => "Identify",
2637 reply => undef, 2735 reply => undef,
2638 tooltip => "Items recently identified", 2736 tooltip => "Items recently identified",
2639 }, 2737 },
2640 "c/examine" => { 2738 "c/examine" => {
2641 id => "examine", 2739 id => "infobox",
2642 title => "Examine", 2740 title => "Examine",
2643 reply => undef, 2741 reply => undef,
2644 tooltip => "Signs and other items you examined", 2742 tooltip => "Signs and other items you examined",
2645 }, 2743 },
2744 "c/book" => {
2745 id => "infobox",
2746 title => "Book",
2747 reply => undef,
2748 tooltip => "The contents of a note or book",
2749 },
2750 "c/lookat" => {
2751 id => "infobox",
2752 title => "Look",
2753 reply => undef,
2754 tooltip => "What you saw there",
2755 },
2756 "c/who" => {
2757 id => "infobox",
2758 title => "Players",
2759 reply => undef,
2760 tooltip => "Shows players who are currently online",
2761 },
2762 "c/body" => {
2763 id => "infobox",
2764 title => "Body Parts",
2765 reply => undef,
2766 tooltip => "Shows which body parts you posess and are available",
2767 },
2768 "c/uptime" => {
2769 id => "infobox",
2770 title => "Uptime",
2771 reply => undef,
2772 tooltip => "How long the server has been running since last restart",
2773 },
2774 "c/mapinfo" => {
2775 id => "infobox",
2776 title => "Map Info",
2777 reply => undef,
2778 tooltip => "Information related to the maps",
2779 },
2646); 2780);
2647 2781
2648sub cf::client::send_msg { 2782sub cf::client::send_msg {
2649 my ($self, $channel, $msg, $color, @extra) = @_; 2783 my ($self, $channel, $msg, $color, @extra) = @_;
2650 2784
2651 $msg = $self->pl->expand_cfpod ($msg); 2785 $msg = $self->pl->expand_cfpod ($msg);
2652 2786
2653 $color &= cf::NDI_CLIENT_MASK; # just in case... 2787 $color &= cf::NDI_CLIENT_MASK; # just in case...
2654 2788
2655 # check predefined channels, for the benefit of C 2789 # check predefined channels, for the benefit of C
2656 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2790 if ($CHANNEL{$channel}) {
2791 $channel = $CHANNEL{$channel};
2657 2792
2793 $self->ext_msg (channel_info => $channel)
2794 if $self->can_msg;
2795
2796 $channel = $channel->{id};
2797
2658 if (ref $channel) { 2798 } elsif (ref $channel) {
2659 # send meta info to client, if not yet sent 2799 # send meta info to client, if not yet sent
2660 unless (exists $self->{channel}{$channel->{id}}) { 2800 unless (exists $self->{channel}{$channel->{id}}) {
2661 $self->{channel}{$channel->{id}} = $channel; 2801 $self->{channel}{$channel->{id}} = $channel;
2662 $self->ext_msg (channel_info => $channel) 2802 $self->ext_msg (channel_info => $channel)
2663 if $self->can_msg; 2803 if $self->can_msg;
… …
2880=pod 3020=pod
2881 3021
2882The following functions and methods are available within a safe environment: 3022The following functions and methods are available within a safe environment:
2883 3023
2884 cf::object 3024 cf::object
2885 contr pay_amount pay_player map x y force_find force_add 3025 contr pay_amount pay_player map x y force_find force_add destroy
2886 insert remove name archname title slaying race decrease_ob_nr 3026 insert remove name archname title slaying race decrease_ob_nr
2887 3027
2888 cf::object::player 3028 cf::object::player
2889 player 3029 player
2890 3030
… …
2897=cut 3037=cut
2898 3038
2899for ( 3039for (
2900 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3040 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2901 insert remove inv name archname title slaying race 3041 insert remove inv name archname title slaying race
2902 decrease_ob_nr)], 3042 decrease_ob_nr destroy)],
2903 ["cf::object::player" => qw(player)], 3043 ["cf::object::player" => qw(player)],
2904 ["cf::player" => qw(peaceful)], 3044 ["cf::player" => qw(peaceful)],
2905 ["cf::map" => qw(trigger)], 3045 ["cf::map" => qw(trigger)],
2906) { 3046) {
2907 no strict 'refs'; 3047 no strict 'refs';
… …
3012 { 3152 {
3013 my $faces = $facedata->{faceinfo}; 3153 my $faces = $facedata->{faceinfo};
3014 3154
3015 while (my ($face, $info) = each %$faces) { 3155 while (my ($face, $info) = each %$faces) {
3016 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3156 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3157
3017 cf::face::set_visibility $idx, $info->{visibility}; 3158 cf::face::set_visibility $idx, $info->{visibility};
3018 cf::face::set_magicmap $idx, $info->{magicmap}; 3159 cf::face::set_magicmap $idx, $info->{magicmap};
3019 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3160 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3020 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3161 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3021 3162
3022 cf::cede_to_tick; 3163 cf::cede_to_tick;
3023 } 3164 }
3024 3165
3025 while (my ($face, $info) = each %$faces) { 3166 while (my ($face, $info) = each %$faces) {
3026 next unless $info->{smooth}; 3167 next unless $info->{smooth};
3168
3027 my $idx = cf::face::find $face 3169 my $idx = cf::face::find $face
3028 or next; 3170 or next;
3171
3029 if (my $smooth = cf::face::find $info->{smooth}) { 3172 if (my $smooth = cf::face::find $info->{smooth}) {
3030 cf::face::set_smooth $idx, $smooth; 3173 cf::face::set_smooth $idx, $smooth;
3031 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3174 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3032 } else { 3175 } else {
3033 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3176 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3051 { 3194 {
3052 # TODO: for gcfclient pleasure, we should give resources 3195 # TODO: for gcfclient pleasure, we should give resources
3053 # that gcfclient doesn't grok a >10000 face index. 3196 # that gcfclient doesn't grok a >10000 face index.
3054 my $res = $facedata->{resource}; 3197 my $res = $facedata->{resource};
3055 3198
3056 my $soundconf = delete $res->{"res/sound.conf"};
3057
3058 while (my ($name, $info) = each %$res) { 3199 while (my ($name, $info) = each %$res) {
3200 if (defined $info->{type}) {
3059 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3201 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3060 my $data; 3202 my $data;
3061 3203
3062 if ($info->{type} & 1) { 3204 if ($info->{type} & 1) {
3063 # prepend meta info 3205 # prepend meta info
3064 3206
3065 my $meta = $enc->encode ({ 3207 my $meta = $enc->encode ({
3066 name => $name, 3208 name => $name,
3067 %{ $info->{meta} || {} }, 3209 %{ $info->{meta} || {} },
3068 }); 3210 });
3069 3211
3070 $data = pack "(w/a*)*", $meta, $info->{data}; 3212 $data = pack "(w/a*)*", $meta, $info->{data};
3213 } else {
3214 $data = $info->{data};
3215 }
3216
3217 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3218 cf::face::set_type $idx, $info->{type};
3071 } else { 3219 } else {
3072 $data = $info->{data}; 3220 $RESOURCE{$name} = $info;
3073 } 3221 }
3074 3222
3075 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3076 cf::face::set_type $idx, $info->{type};
3077
3078 cf::cede_to_tick; 3223 cf::cede_to_tick;
3079 } 3224 }
3080
3081 if ($soundconf) {
3082 $soundconf = $enc->decode (delete $soundconf->{data});
3083
3084 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3085 my $sound = $soundconf->{compat}[$_]
3086 or next;
3087
3088 my $face = cf::face::find "sound/$sound->[1]";
3089 cf::sound::set $sound->[0] => $face;
3090 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3091 }
3092
3093 while (my ($k, $v) = each %{$soundconf->{event}}) {
3094 my $face = cf::face::find "sound/$v";
3095 cf::sound::set $k => $face;
3096 }
3097 }
3098 } 3225 }
3226
3227 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3099 3228
3100 1 3229 1
3101} 3230}
3231
3232cf::global->attach (on_resource_update => sub {
3233 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3234 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3235
3236 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3237 my $sound = $soundconf->{compat}[$_]
3238 or next;
3239
3240 my $face = cf::face::find "sound/$sound->[1]";
3241 cf::sound::set $sound->[0] => $face;
3242 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3243 }
3244
3245 while (my ($k, $v) = each %{$soundconf->{event}}) {
3246 my $face = cf::face::find "sound/$v";
3247 cf::sound::set $k => $face;
3248 }
3249 }
3250});
3102 3251
3103register_exticmd fx_want => sub { 3252register_exticmd fx_want => sub {
3104 my ($ns, $want) = @_; 3253 my ($ns, $want) = @_;
3105 3254
3106 while (my ($k, $v) = each %$want) { 3255 while (my ($k, $v) = each %$want) {
… …
3161sub reload_config { 3310sub reload_config {
3162 open my $fh, "<:utf8", "$CONFDIR/config" 3311 open my $fh, "<:utf8", "$CONFDIR/config"
3163 or return; 3312 or return;
3164 3313
3165 local $/; 3314 local $/;
3166 *CFG = YAML::Syck::Load <$fh>; 3315 *CFG = YAML::Load <$fh>;
3167 3316
3168 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3317 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3169 3318
3170 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3319 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3171 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3320 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3182sub main { 3331sub main {
3183 # we must not ever block the main coroutine 3332 # we must not ever block the main coroutine
3184 local $Coro::idle = sub { 3333 local $Coro::idle = sub {
3185 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3334 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3186 (async { 3335 (async {
3187 Event::one_event; 3336 $Coro::current->{desc} = "IDLE BUG HANDLER";
3337 EV::loop EV::LOOP_ONESHOT;
3188 })->prio (Coro::PRIO_MAX); 3338 })->prio (Coro::PRIO_MAX);
3189 }; 3339 };
3190 3340
3191 reload_config; 3341 reload_config;
3192 db_init; 3342 db_init;
3193 load_extensions; 3343 load_extensions;
3194 3344
3195 $TICK_WATCHER->start; 3345 $TICK_WATCHER->start;
3346 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3196 Event::loop; 3347 EV::loop;
3197} 3348}
3198 3349
3199############################################################################# 3350#############################################################################
3200# initialisation and cleanup 3351# initialisation and cleanup
3201 3352
3202# install some emergency cleanup handlers 3353# install some emergency cleanup handlers
3203BEGIN { 3354BEGIN {
3355 our %SIGWATCHER = ();
3204 for my $signal (qw(INT HUP TERM)) { 3356 for my $signal (qw(INT HUP TERM)) {
3205 Event->signal ( 3357 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3206 reentrant => 0,
3207 data => WF_AUTOCANCEL,
3208 signal => $signal,
3209 prio => 0,
3210 cb => sub {
3211 cf::cleanup "SIG$signal"; 3358 cf::cleanup "SIG$signal";
3212 },
3213 ); 3359 };
3214 } 3360 }
3215} 3361}
3216 3362
3217sub write_runtime { 3363sub write_runtime {
3218 my $runtime = "$LOCALDIR/runtime"; 3364 my $runtime = "$LOCALDIR/runtime";
… …
3263 # and maps saved/destroyed asynchronously. 3409 # and maps saved/destroyed asynchronously.
3264 warn "begin emergency player save\n"; 3410 warn "begin emergency player save\n";
3265 for my $login (keys %cf::PLAYER) { 3411 for my $login (keys %cf::PLAYER) {
3266 my $pl = $cf::PLAYER{$login} or next; 3412 my $pl = $cf::PLAYER{$login} or next;
3267 $pl->valid or next; 3413 $pl->valid or next;
3414 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3268 $pl->save; 3415 $pl->save;
3269 } 3416 }
3270 warn "end emergency player save\n"; 3417 warn "end emergency player save\n";
3271 3418
3272 warn "begin emergency map save\n"; 3419 warn "begin emergency map save\n";
… …
3311 warn "syncing database to disk"; 3458 warn "syncing database to disk";
3312 BDB::db_env_txn_checkpoint $DB_ENV; 3459 BDB::db_env_txn_checkpoint $DB_ENV;
3313 3460
3314 # if anything goes wrong in here, we should simply crash as we already saved 3461 # if anything goes wrong in here, we should simply crash as we already saved
3315 3462
3316 warn "cancelling all WF_AUTOCANCEL watchers";
3317 for (Event::all_watchers) {
3318 $_->cancel if $_->data & WF_AUTOCANCEL;
3319 }
3320
3321 warn "flushing outstanding aio requests"; 3463 warn "flushing outstanding aio requests";
3322 for (;;) { 3464 for (;;) {
3323 BDB::flush; 3465 BDB::flush;
3324 IO::AIO::flush; 3466 IO::AIO::flush;
3325 Coro::cede; 3467 Coro::cede_notself;
3326 last unless IO::AIO::nreqs || BDB::nreqs; 3468 last unless IO::AIO::nreqs || BDB::nreqs;
3327 warn "iterate..."; 3469 warn "iterate...";
3328 } 3470 }
3329 3471
3330 ++$RELOAD; 3472 ++$RELOAD;
… …
3419 3561
3420sub reload_perl() { 3562sub reload_perl() {
3421 # doing reload synchronously and two reloads happen back-to-back, 3563 # doing reload synchronously and two reloads happen back-to-back,
3422 # coro crashes during coro_state_free->destroy here. 3564 # coro crashes during coro_state_free->destroy here.
3423 3565
3424 $RELOAD_WATCHER ||= Event->timer ( 3566 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3425 reentrant => 0,
3426 after => 0,
3427 data => WF_AUTOCANCEL,
3428 cb => sub {
3429 do_reload_perl;
3430 undef $RELOAD_WATCHER; 3567 undef $RELOAD_WATCHER;
3431 }, 3568 do_reload_perl;
3432 ); 3569 };
3433} 3570}
3434 3571
3435register_command "reload" => sub { 3572register_command "reload" => sub {
3436 my ($who, $arg) = @_; 3573 my ($who, $arg) = @_;
3437 3574
3438 if ($who->flag (FLAG_WIZ)) { 3575 if ($who->flag (FLAG_WIZ)) {
3439 $who->message ("reloading server."); 3576 $who->message ("reloading server.");
3577 async {
3578 $Coro::current->{desc} = "perl_reload";
3440 async { reload_perl }; 3579 reload_perl;
3580 };
3441 } 3581 }
3442}; 3582};
3443 3583
3444unshift @INC, $LIBDIR; 3584unshift @INC, $LIBDIR;
3445 3585
… …
3464 my $signal = new Coro::Signal; 3604 my $signal = new Coro::Signal;
3465 push @WAIT_FOR_TICK_BEGIN, $signal; 3605 push @WAIT_FOR_TICK_BEGIN, $signal;
3466 $signal->wait; 3606 $signal->wait;
3467} 3607}
3468 3608
3469$TICK_WATCHER = Event->timer ( 3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3470 reentrant => 0,
3471 parked => 1,
3472 prio => 0,
3473 at => $NEXT_TICK || $TICK,
3474 data => WF_AUTOCANCEL,
3475 cb => sub {
3476 if ($Coro::current != $Coro::main) { 3610 if ($Coro::current != $Coro::main) {
3477 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3611 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3478 unless ++$bug_warning > 10; 3612 unless ++$bug_warning > 10;
3479 return; 3613 return;
3480 } 3614 }
3481 3615
3482 $NOW = $tick_start = Event::time; 3616 $NOW = $tick_start = EV::now;
3483 3617
3484 cf::server_tick; # one server iteration 3618 cf::server_tick; # one server iteration
3485 3619
3486 $RUNTIME += $TICK; 3620 $RUNTIME += $TICK;
3487 $NEXT_TICK += $TICK; 3621 $NEXT_TICK = $_[0]->at;
3488 3622
3489 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3623 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3490 $NEXT_RUNTIME_WRITE = $NOW + 10; 3624 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3491 Coro::async_pool { 3625 Coro::async_pool {
3626 $Coro::current->{desc} = "runtime saver";
3492 write_runtime 3627 write_runtime
3493 or warn "ERROR: unable to write runtime file: $!"; 3628 or warn "ERROR: unable to write runtime file: $!";
3494 };
3495 } 3629 };
3630 }
3496 3631
3497 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3498 $sig->send; 3633 $sig->send;
3499 } 3634 }
3500 while (my $sig = shift @WAIT_FOR_TICK) { 3635 while (my $sig = shift @WAIT_FOR_TICK) {
3501 $sig->send; 3636 $sig->send;
3502 } 3637 }
3503 3638
3504 $NOW = Event::time;
3505
3506 # if we are delayed by four ticks or more, skip them all
3507 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3508
3509 $TICK_WATCHER->at ($NEXT_TICK);
3510 $TICK_WATCHER->start;
3511
3512 $LOAD = ($NOW - $tick_start) / $TICK; 3639 $LOAD = ($NOW - $tick_start) / $TICK;
3513 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3514 3641
3515 _post_tick; 3642 _post_tick;
3516 }, 3643};
3517); 3644$TICK_WATCHER->priority (EV::MAXPRI);
3518 3645
3519{ 3646{
3647 # configure BDB
3648
3520 BDB::min_parallel 8; 3649 BDB::min_parallel 8;
3521 BDB::max_poll_time $TICK * 0.1; 3650 BDB::max_poll_reqs $TICK * 0.1;
3522 $BDB_POLL_WATCHER = Event->io ( 3651 $Coro::BDB::WATCHER->priority (1);
3523 reentrant => 0,
3524 fd => BDB::poll_fileno,
3525 poll => 'r',
3526 prio => 0,
3527 data => WF_AUTOCANCEL,
3528 cb => \&BDB::poll_cb,
3529 );
3530
3531 BDB::set_sync_prepare {
3532 my $status;
3533 my $current = $Coro::current;
3534 (
3535 sub {
3536 $status = $!;
3537 $current->ready; undef $current;
3538 },
3539 sub {
3540 Coro::schedule while defined $current;
3541 $! = $status;
3542 },
3543 )
3544 };
3545 3652
3546 unless ($DB_ENV) { 3653 unless ($DB_ENV) {
3547 $DB_ENV = BDB::db_env_create; 3654 $DB_ENV = BDB::db_env_create;
3548 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3549 | BDB::LOG_AUTOREMOVE, 1); 3656 | BDB::LOG_AUTOREMOVE, 1);
… …
3564 3671
3565 cf::cleanup "db_env_open(db): $@" if $@; 3672 cf::cleanup "db_env_open(db): $@" if $@;
3566 }; 3673 };
3567 } 3674 }
3568 3675
3569 $BDB_DEADLOCK_WATCHER = Event->timer ( 3676 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3570 after => 3,
3571 interval => 1,
3572 hard => 1,
3573 prio => 0,
3574 data => WF_AUTOCANCEL,
3575 cb => sub {
3576 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3677 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3577 },
3578 ); 3678 };
3579 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3679 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3580 after => 11,
3581 interval => 60,
3582 hard => 1,
3583 prio => 0,
3584 data => WF_AUTOCANCEL,
3585 cb => sub {
3586 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3680 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3587 },
3588 ); 3681 };
3589 $BDB_TRICKLE_WATCHER = Event->timer ( 3682 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3590 after => 5,
3591 interval => 10,
3592 hard => 1,
3593 prio => 0,
3594 data => WF_AUTOCANCEL,
3595 cb => sub {
3596 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3597 },
3598 ); 3684 };
3599} 3685}
3600 3686
3601{ 3687{
3688 # configure IO::AIO
3689
3602 IO::AIO::min_parallel 8; 3690 IO::AIO::min_parallel 8;
3603
3604 undef $Coro::AIO::WATCHER;
3605 IO::AIO::max_poll_time $TICK * 0.1; 3691 IO::AIO::max_poll_time $TICK * 0.1;
3606 $AIO_POLL_WATCHER = Event->io ( 3692 $Coro::AIO::WATCHER->priority (1);
3607 reentrant => 0,
3608 data => WF_AUTOCANCEL,
3609 fd => IO::AIO::poll_fileno,
3610 poll => 'r',
3611 prio => 6,
3612 cb => \&IO::AIO::poll_cb,
3613 );
3614} 3693}
3615 3694
3616my $_log_backtrace; 3695my $_log_backtrace;
3617 3696
3618sub _log_backtrace { 3697sub _log_backtrace {
… …
3622 3701
3623 # limit the # of concurrent backtraces 3702 # limit the # of concurrent backtraces
3624 if ($_log_backtrace < 2) { 3703 if ($_log_backtrace < 2) {
3625 ++$_log_backtrace; 3704 ++$_log_backtrace;
3626 async { 3705 async {
3706 $Coro::current->{desc} = "abt $msg";
3707
3627 my @bt = fork_call { 3708 my @bt = fork_call {
3628 @addr = map { sprintf "%x", $_ } @addr; 3709 @addr = map { sprintf "%x", $_ } @addr;
3629 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3710 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3630 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3711 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3631 or die "addr2line: $!"; 3712 or die "addr2line: $!";

Diff Legend

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