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.373 by root, Sat Sep 15 15:58:06 2007 UTC vs.
Revision 1.411 by root, Fri Feb 1 15:54:07 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 return unless $^S eq 0; # "eq", not "=="
198
199 if ($Coro::current == $Coro::main) {#d#
200 warn "DIEHOOK called in main context, Coro bug?\n";#d#
201 return;#d#
202 }#d#
203
204 # kill coroutine otherwise
205 warn Carp::longmess $_[0];
206 Coro::terminate
207};
208
209$SIG{__DIE__} = sub { }; #d#?
198 210
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 211@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 212@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 213@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 214@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
215)) { 227)) {
216 no strict 'refs'; 228 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 230}
219 231
220$Event::DIED = sub { 232$EV::DIED = sub {
221 warn "error in event callback: @_"; 233 warn "error in event callback: @_";
222}; 234};
223 235
224############################################################################# 236#############################################################################
225 237
… …
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 260 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 261 $d
250 } || "[unable to dump $_[0]: '$@']"; 262 } || "[unable to dump $_[0]: '$@']";
251} 263}
252 264
253=item $ref = cf::from_json $json 265=item $ref = cf::decode_json $json
254 266
255Converts a JSON string into the corresponding perl data structure. 267Converts a JSON string into the corresponding perl data structure.
256 268
257=item $json = cf::to_json $ref 269=item $json = cf::encode_json $ref
258 270
259Converts a perl data structure into its JSON representation. 271Converts a perl data structure into its JSON representation.
260 272
261=cut 273=cut
262 274
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 275our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 276
265sub to_json ($) { $json_coder->encode ($_[0]) } 277sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 278sub decode_json($) { $json_coder->decode ($_[0]) }
267 279
268=item cf::lock_wait $string 280=item cf::lock_wait $string
269 281
270Wait until the given lock is available. See cf::lock_acquire. 282Wait until the given lock is available. See cf::lock_acquire.
271 283
… …
336 }; 348 };
337 $TICK_WATCHER->stop; 349 $TICK_WATCHER->stop;
338 $guard 350 $guard
339} 351}
340 352
353=item cf::periodic $interval, $cb
354
355Like EV::periodic, but randomly selects a starting point so that the actions
356get spread over timer.
357
358=cut
359
360sub periodic($$) {
361 my ($interval, $cb) = @_;
362
363 my $start = rand List::Util::min 180, $interval;
364
365 EV::periodic $start, $interval, 0, $cb
366}
367
341=item cf::get_slot $time[, $priority[, $name]] 368=item cf::get_slot $time[, $priority[, $name]]
342 369
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 370Allocate $time seconds of blocking CPU time at priority C<$priority>:
344This call blocks and returns only when you have at least C<$time> seconds 371This 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. 372of cpu time till the next tick. The slot is only valid till the next cede.
… …
354our @SLOT_QUEUE; 381our @SLOT_QUEUE;
355our $SLOT_QUEUE; 382our $SLOT_QUEUE;
356 383
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 384$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 385$SLOT_QUEUE = Coro::async {
386 $Coro::current->desc ("timeslot manager");
387
359 my $signal = new Coro::Signal; 388 my $signal = new Coro::Signal;
360 389
361 while () { 390 while () {
362 next_job: 391 next_job:
363 my $avail = cf::till_tick; 392 my $avail = cf::till_tick;
… …
371 } 400 }
372 } 401 }
373 } 402 }
374 403
375 if (@SLOT_QUEUE) { 404 if (@SLOT_QUEUE) {
376 # we do not use wait_For_tick() as it returns immediately when tick is inactive 405 # we do not use wait_for_tick() as it returns immediately when tick is inactive
377 push @cf::WAIT_FOR_TICK, $signal; 406 push @cf::WAIT_FOR_TICK, $signal;
378 $signal->wait; 407 $signal->wait;
379 } else { 408 } else {
380 Coro::schedule; 409 Coro::schedule;
381 } 410 }
… …
404 433
405BEGIN { *async = \&Coro::async_pool } 434BEGIN { *async = \&Coro::async_pool }
406 435
407=item cf::sync_job { BLOCK } 436=item cf::sync_job { BLOCK }
408 437
409The design of Crossfire TRT requires that the main coroutine ($Coro::main) 438The design of Deliantra requires that the main coroutine ($Coro::main)
410is always able to handle events or runnable, as Crossfire TRT is only 439is 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 440partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
412acceptable. 441acceptable.
413 442
414If it must be done, put the blocking parts into C<sync_job>. This will run 443If 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 444the given BLOCK in another coroutine while waiting for the result. The
… …
420 449
421sub sync_job(&) { 450sub sync_job(&) {
422 my ($job) = @_; 451 my ($job) = @_;
423 452
424 if ($Coro::current == $Coro::main) { 453 if ($Coro::current == $Coro::main) {
425 my $time = Event::time; 454 my $time = EV::time;
426 455
427 # this is the main coro, too bad, we have to block 456 # this is the main coro, too bad, we have to block
428 # till the operation succeeds, freezing the server :/ 457 # till the operation succeeds, freezing the server :/
429 458
459 LOG llevError, Carp::longmess "sync job";#d#
460
430 # TODO: use suspend/resume instead 461 # TODO: use suspend/resume instead
431 # (but this is cancel-safe) 462 # (but this is cancel-safe)
432 my $freeze_guard = freeze_mainloop; 463 my $freeze_guard = freeze_mainloop;
433 464
434 my $busy = 1; 465 my $busy = 1;
435 my @res; 466 my @res;
436 467
437 (async { 468 (async {
469 $Coro::current->desc ("sync job coro");
438 @res = eval { $job->() }; 470 @res = eval { $job->() };
439 warn $@ if $@; 471 warn $@ if $@;
440 undef $busy; 472 undef $busy;
441 })->prio (Coro::PRIO_MAX); 473 })->prio (Coro::PRIO_MAX);
442 474
443 while ($busy) { 475 while ($busy) {
444 Coro::cede or Event::one_event; 476 if (Coro::nready) {
477 Coro::cede_notself;
478 } else {
479 EV::loop EV::LOOP_ONESHOT;
445 } 480 }
481 }
446 482
447 $time = Event::time - $time; 483 $time = EV::time - $time;
448 484
449 LOG llevError | logBacktrace, Carp::longmess "long sync job" 485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
450 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
451 487
452 $tick_start += $time; # do not account sync jobs to server load 488 $tick_start += $time; # do not account sync jobs to server load
… …
482=item fork_call { }, $args 518=item fork_call { }, $args
483 519
484Executes the given code block with the given arguments in a seperate 520Executes the given code block with the given arguments in a seperate
485process, returning the results. Everything must be serialisable with 521process, returning the results. Everything must be serialisable with
486Coro::Storable. May, of course, block. Note that the executed sub may 522Coro::Storable. May, of course, block. Note that the executed sub may
487never block itself or use any form of Event handling. 523never block itself or use any form of event handling.
488 524
489=cut 525=cut
490 526
491sub fork_call(&@) { 527sub fork_call(&@) {
492 my ($cb, @args) = @_; 528 my ($cb, @args) = @_;
… …
653attach callbacks/event handlers (a collection of which is called an "attachment") 689attach callbacks/event handlers (a collection of which is called an "attachment")
654to it. All such attachable objects support the following methods. 690to it. All such attachable objects support the following methods.
655 691
656In the following description, CLASS can be any of C<global>, C<object> 692In 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 693C<player>, C<client> or C<map> (i.e. the attachable objects in
658Crossfire TRT). 694Deliantra).
659 695
660=over 4 696=over 4
661 697
662=item $attachable->attach ($attachment, key => $value...) 698=item $attachable->attach ($attachment, key => $value...)
663 699
… …
945 } 981 }
946 982
947 0 983 0
948} 984}
949 985
950=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 986=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
951 987
952=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 988=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
953 989
954Generate an object-specific event with the given arguments. 990Generate an object-specific event with the given arguments.
955 991
… …
961 997
962=cut 998=cut
963 999
964############################################################################# 1000#############################################################################
965# object support 1001# object support
966#
967 1002
1003sub _object_equal($$);
1004sub _object_equal($$) {
1005 my ($a, $b) = @_;
1006
1007 return 0 unless (ref $a) eq (ref $b);
1008
1009 if ("HASH" eq ref $a) {
1010 my @ka = keys %$a;
1011 my @kb = keys %$b;
1012
1013 return 0 if @ka != @kb;
1014
1015 for (0 .. $#ka) {
1016 return 0 unless $ka[$_] eq $kb[$_];
1017 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1018 }
1019
1020 } elsif ("ARRAY" eq ref $a) {
1021
1022 return 0 if @$a != @$b;
1023
1024 for (0 .. $#$a) {
1025 return 0 unless _object_equal $a->[$_], $b->[$_];
1026 }
1027
1028 } elsif ($a ne $b) {
1029 return 0;
1030 }
1031
1032 1
1033}
1034
1035our $SLOW_MERGES;#d#
968sub _can_merge { 1036sub _can_merge {
969 my ($ob1, $ob2) = @_; 1037 my ($ob1, $ob2) = @_;
970 1038
971 local $Storable::canonical = 1; 1039 ++$SLOW_MERGES;#d#
972 my $fob1 = Storable::freeze $ob1;
973 my $fob2 = Storable::freeze $ob2;
974 1040
975 $fob1 eq $fob2 1041 # we do the slow way here
1042 return _object_equal $ob1, $ob2
976} 1043}
977 1044
978sub reattach { 1045sub reattach {
979 # basically do the same as instantiate, without calling instantiate 1046 # basically do the same as instantiate, without calling instantiate
980 my ($obj) = @_; 1047 my ($obj) = @_;
… …
1002cf::attachable->attach ( 1069cf::attachable->attach (
1003 prio => -1000000, 1070 prio => -1000000,
1004 on_instantiate => sub { 1071 on_instantiate => sub {
1005 my ($obj, $data) = @_; 1072 my ($obj, $data) = @_;
1006 1073
1007 $data = from_json $data; 1074 $data = decode_json $data;
1008 1075
1009 for (@$data) { 1076 for (@$data) {
1010 my ($name, $args) = @$_; 1077 my ($name, $args) = @$_;
1011 1078
1012 $obj->attach ($name, %{$args || {} }); 1079 $obj->attach ($name, %{$args || {} });
… …
1041 close $fh; 1108 close $fh;
1042 1109
1043 if (@$objs) { 1110 if (@$objs) {
1044 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1111 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1045 chmod SAVE_MODE, $fh; 1112 chmod SAVE_MODE, $fh;
1046 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1047 aio_write $fh, 0, (length $data), $data, 0; 1114 aio_write $fh, 0, (length $data), $data, 0;
1048 aio_fsync $fh if $cf::USE_FSYNC; 1115 aio_fsync $fh if $cf::USE_FSYNC;
1049 close $fh; 1116 close $fh;
1050 aio_rename "$filename.pst~", "$filename.pst"; 1117 aio_rename "$filename.pst~", "$filename.pst";
1051 } 1118 }
… …
1082 1149
1083 unless (aio_stat "$filename.pst") { 1150 unless (aio_stat "$filename.pst") {
1084 (aio_load "$filename.pst", $av) >= 0 1151 (aio_load "$filename.pst", $av) >= 0
1085 or return; 1152 or return;
1086 1153
1087 $av = eval { (Storable::thaw $av)->{objs} }; 1154 my $st = eval { Coro::Storable::thaw $av };
1155 $av = $st->{objs};
1088 } 1156 }
1089 1157
1090 utf8::decode (my $decname = $filename); 1158 utf8::decode (my $decname = $filename);
1091 warn sprintf "loading %s (%d,%d)\n", 1159 warn sprintf "loading %s (%d,%d)\n",
1092 $decname, length $data, scalar @{$av || []}; 1160 $decname, length $data, scalar @{$av || []};
… …
1248 my $msg = $@ ? "$v->{path}: $@\n" 1316 my $msg = $@ ? "$v->{path}: $@\n"
1249 : "$v->{base}: extension inactive.\n"; 1317 : "$v->{base}: extension inactive.\n";
1250 1318
1251 if (exists $v->{meta}{mandatory}) { 1319 if (exists $v->{meta}{mandatory}) {
1252 warn $msg; 1320 warn $msg;
1253 warn "mandatory extension failed to load, exiting.\n"; 1321 cf::cleanup "mandatory extension failed to load, exiting.";
1254 exit 1;
1255 } 1322 }
1256 1323
1257 warn $msg; 1324 warn $msg;
1258 } 1325 }
1259 1326
… …
1507 1574
1508Expand crossfire pod fragments into protocol xml. 1575Expand crossfire pod fragments into protocol xml.
1509 1576
1510=cut 1577=cut
1511 1578
1579use re 'eval';
1580
1581my $group;
1582my $interior; $interior = qr{
1583 # match a pod interior sequence sans C<< >>
1584 (?:
1585 \ (.*?)\ (?{ $group = $^N })
1586 | < (??{$interior}) >
1587 )
1588}x;
1589
1512sub expand_cfpod { 1590sub expand_cfpod {
1513 ((my $self), (local $_)) = @_; 1591 my ($self, $pod) = @_;
1514 1592
1515 # escape & and < 1593 my $xml;
1516 s/&/&amp;/g;
1517 s/(?<![BIUGHT])</&lt;/g;
1518 1594
1519 # this is buggy, it needs to properly take care of nested <'s 1595 while () {
1596 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1597 $group = $1;
1520 1598
1521 1 while 1599 $group =~ s/&/&amp;/g;
1522 # replace B<>, I<>, U<> etc. 1600 $group =~ s/</&lt;/g;
1523 s/B<([^\>]*)>/<b>$1<\/b>/ 1601
1524 || s/I<([^\>]*)>/<i>$1<\/i>/ 1602 $xml .= $group;
1525 || s/U<([^\>]*)>/<u>$1<\/u>/ 1603 } elsif ($pod =~ m%\G
1526 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1604 ([BCGHITU])
1527 # replace G<male|female> tags 1605 <
1528 || s{G<([^>|]*)\|([^>]*)>}{ 1606 (?:
1529 $self->gender ? $2 : $1 1607 ([^<>]*) (?{ $group = $^N })
1530 }ge 1608 | < $interior >
1531 # replace H<hint text> 1609 )
1532 || s{H<([^\>]*)>} 1610 >
1611 %gcsx
1533 { 1612 ) {
1613 my ($code, $data) = ($1, $group);
1614
1615 if ($code eq "B") {
1616 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1617 } elsif ($code eq "I") {
1618 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1619 } elsif ($code eq "U") {
1620 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1621 } elsif ($code eq "C") {
1622 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1623 } elsif ($code eq "T") {
1624 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1625 } elsif ($code eq "G") {
1626 my ($male, $female) = split /\|/, $data;
1627 $data = $self->gender ? $female : $male;
1628 $xml .= expand_cfpod ($self, $data);
1629 } elsif ($code eq "H") {
1534 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1630 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1535 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1631 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1536 "") 1632 "")
1537 [$self->{hintmode}] 1633 [$self->{hintmode}];
1634 } else {
1635 $xml .= "error processing '$code($data)' directive";
1538 }ge; 1636 }
1637 } else {
1638 if ($pod =~ /\G(.+)/) {
1639 warn "parse error while expanding $pod (at $1)";
1640 }
1641 last;
1642 }
1643 }
1539 1644
1645 for ($xml) {
1540 # create single paragraphs (very hackish) 1646 # create single paragraphs (very hackish)
1541 s/(?<=\S)\n(?=\w)/ /g; 1647 s/(?<=\S)\n(?=\w)/ /g;
1542 1648
1543 # compress some whitespace 1649 # compress some whitespace
1544 s/\s+\n/\n/g; # ws line-ends 1650 s/\s+\n/\n/g; # ws line-ends
1545 s/\n\n+/\n/g; # double lines 1651 s/\n\n+/\n/g; # double lines
1546 s/^\n+//; # beginning lines 1652 s/^\n+//; # beginning lines
1547 s/\n+$//; # ending lines 1653 s/\n+$//; # ending lines
1654 }
1548 1655
1549 $_ 1656 $xml
1550} 1657}
1658
1659no re 'eval';
1551 1660
1552sub hintmode { 1661sub hintmode {
1553 $_[0]{hintmode} = $_[1] if @_ > 1; 1662 $_[0]{hintmode} = $_[1] if @_ > 1;
1554 $_[0]{hintmode} 1663 $_[0]{hintmode}
1555} 1664}
… …
2036 } 2145 }
2037 2146
2038 $MAP_PREFETCH{$path} |= $load; 2147 $MAP_PREFETCH{$path} |= $load;
2039 2148
2040 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2150 $Coro::current->{desc} = "map prefetcher";
2151
2041 while (%MAP_PREFETCH) { 2152 while (%MAP_PREFETCH) {
2042 while (my ($k, $v) = each %MAP_PREFETCH) { 2153 while (my ($k, $v) = each %MAP_PREFETCH) {
2043 if (my $map = find $k) { 2154 if (my $map = find $k) {
2044 $map->load if $v; 2155 $map->load if $v;
2045 } 2156 }
… …
2071 return if $self->{deny_save}; 2182 return if $self->{deny_save};
2072 2183
2073 local $self->{last_access} = $self->last_access;#d# 2184 local $self->{last_access} = $self->last_access;#d#
2074 2185
2075 cf::async { 2186 cf::async {
2187 $Coro::current->{desc} = "map player save";
2076 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
2077 }; 2189 };
2078 2190
2079 if ($uniq) { 2191 if ($uniq) {
2080 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2192 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2267=cut 2379=cut
2268 2380
2269sub deref { 2381sub deref {
2270 my ($ref) = @_; 2382 my ($ref) = @_;
2271 2383
2272 # temporary compatibility#TODO#remove
2273 $ref =~ s{^<}{player/<};
2274
2275 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2384 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2276 my ($uuid, $name) = ($1, $2); 2385 my ($uuid, $name) = ($1, $2);
2277 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2386 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2278 or return; 2387 or return;
2279 $pl->ob->uuid eq $uuid 2388 $pl->ob->uuid eq $uuid
2280 or return; 2389 or return;
… …
2451 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2560 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2452 2561
2453 $self->enter_link; 2562 $self->enter_link;
2454 2563
2455 (async { 2564 (async {
2565 $Coro::current->{desc} = "player::goto $path $x $y";
2566
2456 # *tag paths override both path and x|y 2567 # *tag paths override both path and x|y
2457 if ($path =~ /^\*(.*)$/) { 2568 if ($path =~ /^\*(.*)$/) {
2458 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2569 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2459 my $ob = $obs[rand @obs]; 2570 my $ob = $obs[rand @obs];
2460 2571
… …
2540 $rmp->{origin_y} = $exit->y; 2651 $rmp->{origin_y} = $exit->y;
2541 } 2652 }
2542 2653
2543 $rmp->{random_seed} ||= $exit->random_seed; 2654 $rmp->{random_seed} ||= $exit->random_seed;
2544 2655
2545 my $data = cf::to_json $rmp; 2656 my $data = cf::encode_json $rmp;
2546 my $md5 = Digest::MD5::md5_hex $data; 2657 my $md5 = Digest::MD5::md5_hex $data;
2547 my $meta = "$RANDOMDIR/$md5.meta"; 2658 my $meta = "$RANDOMDIR/$md5.meta";
2548 2659
2549 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2660 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2550 aio_write $fh, 0, (length $data), $data, 0; 2661 aio_write $fh, 0, (length $data), $data, 0;
… …
2577 # if exit is damned, update players death & WoR home-position 2688 # if exit is damned, update players death & WoR home-position
2578 $self->contr->savebed ($slaying, $hp, $sp) 2689 $self->contr->savebed ($slaying, $hp, $sp)
2579 if $exit->flag (FLAG_DAMNED); 2690 if $exit->flag (FLAG_DAMNED);
2580 2691
2581 (async { 2692 (async {
2693 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2694
2582 $self->deactivate_recursive; # just to be sure 2695 $self->deactivate_recursive; # just to be sure
2583 unless (eval { 2696 unless (eval {
2584 $self->goto ($slaying, $hp, $sp); 2697 $self->goto ($slaying, $hp, $sp);
2585 2698
2586 1; 2699 1;
… …
2621the message, with C<log> being the default. If C<$color> is negative, suppress 2734the message, with C<log> being the default. If C<$color> is negative, suppress
2622the message unless the client supports the msg packet. 2735the message unless the client supports the msg packet.
2623 2736
2624=cut 2737=cut
2625 2738
2739# non-persistent channels (usually the info channel)
2626our %CHANNEL = ( 2740our %CHANNEL = (
2627 "c/identify" => { 2741 "c/identify" => {
2628 id => "identify", 2742 id => "infobox",
2629 title => "Identify", 2743 title => "Identify",
2630 reply => undef, 2744 reply => undef,
2631 tooltip => "Items recently identified", 2745 tooltip => "Items recently identified",
2632 }, 2746 },
2633 "c/examine" => { 2747 "c/examine" => {
2634 id => "examine", 2748 id => "infobox",
2635 title => "Examine", 2749 title => "Examine",
2636 reply => undef, 2750 reply => undef,
2637 tooltip => "Signs and other items you examined", 2751 tooltip => "Signs and other items you examined",
2638 }, 2752 },
2753 "c/book" => {
2754 id => "infobox",
2755 title => "Book",
2756 reply => undef,
2757 tooltip => "The contents of a note or book",
2758 },
2759 "c/lookat" => {
2760 id => "infobox",
2761 title => "Look",
2762 reply => undef,
2763 tooltip => "What you saw there",
2764 },
2765 "c/who" => {
2766 id => "infobox",
2767 title => "Players",
2768 reply => undef,
2769 tooltip => "Shows players who are currently online",
2770 },
2771 "c/body" => {
2772 id => "infobox",
2773 title => "Body Parts",
2774 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available",
2776 },
2777 "c/uptime" => {
2778 id => "infobox",
2779 title => "Uptime",
2780 reply => undef,
2781 tooltip => "How long the server has been running since last restart",
2782 },
2783 "c/mapinfo" => {
2784 id => "infobox",
2785 title => "Map Info",
2786 reply => undef,
2787 tooltip => "Information related to the maps",
2788 },
2639); 2789);
2640 2790
2641sub cf::client::send_msg { 2791sub cf::client::send_msg {
2642 my ($self, $channel, $msg, $color, @extra) = @_; 2792 my ($self, $channel, $msg, $color, @extra) = @_;
2643 2793
2644 $msg = $self->pl->expand_cfpod ($msg); 2794 $msg = $self->pl->expand_cfpod ($msg);
2645 2795
2646 $color &= cf::NDI_CLIENT_MASK; # just in case... 2796 $color &= cf::NDI_CLIENT_MASK; # just in case...
2647 2797
2648 # check predefined channels, for the benefit of C 2798 # check predefined channels, for the benefit of C
2649 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2799 if ($CHANNEL{$channel}) {
2800 $channel = $CHANNEL{$channel};
2650 2801
2802 $self->ext_msg (channel_info => $channel)
2803 if $self->can_msg;
2804
2805 $channel = $channel->{id};
2806
2651 if (ref $channel) { 2807 } elsif (ref $channel) {
2652 # send meta info to client, if not yet sent 2808 # send meta info to client, if not yet sent
2653 unless (exists $self->{channel}{$channel->{id}}) { 2809 unless (exists $self->{channel}{$channel->{id}}) {
2654 $self->{channel}{$channel->{id}} = $channel; 2810 $self->{channel}{$channel->{id}} = $channel;
2655 $self->ext_msg (channel_info => $channel) 2811 $self->ext_msg (channel_info => $channel)
2656 if $self->can_msg; 2812 if $self->can_msg;
… …
2873=pod 3029=pod
2874 3030
2875The following functions and methods are available within a safe environment: 3031The following functions and methods are available within a safe environment:
2876 3032
2877 cf::object 3033 cf::object
2878 contr pay_amount pay_player map x y force_find force_add 3034 contr pay_amount pay_player map x y force_find force_add destroy
2879 insert remove name archname title slaying race decrease_ob_nr 3035 insert remove name archname title slaying race decrease_ob_nr
2880 3036
2881 cf::object::player 3037 cf::object::player
2882 player 3038 player
2883 3039
… …
2890=cut 3046=cut
2891 3047
2892for ( 3048for (
2893 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3049 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2894 insert remove inv name archname title slaying race 3050 insert remove inv name archname title slaying race
2895 decrease_ob_nr)], 3051 decrease_ob_nr destroy)],
2896 ["cf::object::player" => qw(player)], 3052 ["cf::object::player" => qw(player)],
2897 ["cf::player" => qw(peaceful)], 3053 ["cf::player" => qw(peaceful)],
2898 ["cf::map" => qw(trigger)], 3054 ["cf::map" => qw(trigger)],
2899) { 3055) {
2900 no strict 'refs'; 3056 no strict 'refs';
… …
3005 { 3161 {
3006 my $faces = $facedata->{faceinfo}; 3162 my $faces = $facedata->{faceinfo};
3007 3163
3008 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
3009 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3165 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3166
3010 cf::face::set_visibility $idx, $info->{visibility}; 3167 cf::face::set_visibility $idx, $info->{visibility};
3011 cf::face::set_magicmap $idx, $info->{magicmap}; 3168 cf::face::set_magicmap $idx, $info->{magicmap};
3012 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3169 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3013 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3170 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3014 3171
3015 cf::cede_to_tick; 3172 cf::cede_to_tick;
3016 } 3173 }
3017 3174
3018 while (my ($face, $info) = each %$faces) { 3175 while (my ($face, $info) = each %$faces) {
3019 next unless $info->{smooth}; 3176 next unless $info->{smooth};
3177
3020 my $idx = cf::face::find $face 3178 my $idx = cf::face::find $face
3021 or next; 3179 or next;
3180
3022 if (my $smooth = cf::face::find $info->{smooth}) { 3181 if (my $smooth = cf::face::find $info->{smooth}) {
3023 cf::face::set_smooth $idx, $smooth; 3182 cf::face::set_smooth $idx, $smooth;
3024 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3183 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3025 } else { 3184 } else {
3026 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3185 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3044 { 3203 {
3045 # TODO: for gcfclient pleasure, we should give resources 3204 # TODO: for gcfclient pleasure, we should give resources
3046 # that gcfclient doesn't grok a >10000 face index. 3205 # that gcfclient doesn't grok a >10000 face index.
3047 my $res = $facedata->{resource}; 3206 my $res = $facedata->{resource};
3048 3207
3049 my $soundconf = delete $res->{"res/sound.conf"};
3050
3051 while (my ($name, $info) = each %$res) { 3208 while (my ($name, $info) = each %$res) {
3209 if (defined $info->{type}) {
3052 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3210 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3053 my $data; 3211 my $data;
3054 3212
3055 if ($info->{type} & 1) { 3213 if ($info->{type} & 1) {
3056 # prepend meta info 3214 # prepend meta info
3057 3215
3058 my $meta = $enc->encode ({ 3216 my $meta = $enc->encode ({
3059 name => $name, 3217 name => $name,
3060 %{ $info->{meta} || {} }, 3218 %{ $info->{meta} || {} },
3061 }); 3219 });
3062 3220
3063 $data = pack "(w/a*)*", $meta, $info->{data}; 3221 $data = pack "(w/a*)*", $meta, $info->{data};
3222 } else {
3223 $data = $info->{data};
3224 }
3225
3226 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3227 cf::face::set_type $idx, $info->{type};
3064 } else { 3228 } else {
3065 $data = $info->{data}; 3229 $RESOURCE{$name} = $info;
3066 } 3230 }
3067 3231
3068 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3069 cf::face::set_type $idx, $info->{type};
3070
3071 cf::cede_to_tick; 3232 cf::cede_to_tick;
3072 } 3233 }
3073
3074 if ($soundconf) {
3075 $soundconf = $enc->decode (delete $soundconf->{data});
3076
3077 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3078 my $sound = $soundconf->{compat}[$_]
3079 or next;
3080
3081 my $face = cf::face::find "sound/$sound->[1]";
3082 cf::sound::set $sound->[0] => $face;
3083 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3084 }
3085
3086 while (my ($k, $v) = each %{$soundconf->{event}}) {
3087 my $face = cf::face::find "sound/$v";
3088 cf::sound::set $k => $face;
3089 }
3090 }
3091 } 3234 }
3235
3236 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3092 3237
3093 1 3238 1
3094} 3239}
3240
3241cf::global->attach (on_resource_update => sub {
3242 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3243 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3244
3245 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3246 my $sound = $soundconf->{compat}[$_]
3247 or next;
3248
3249 my $face = cf::face::find "sound/$sound->[1]";
3250 cf::sound::set $sound->[0] => $face;
3251 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3252 }
3253
3254 while (my ($k, $v) = each %{$soundconf->{event}}) {
3255 my $face = cf::face::find "sound/$v";
3256 cf::sound::set $k => $face;
3257 }
3258 }
3259});
3095 3260
3096register_exticmd fx_want => sub { 3261register_exticmd fx_want => sub {
3097 my ($ns, $want) = @_; 3262 my ($ns, $want) = @_;
3098 3263
3099 while (my ($k, $v) = each %$want) { 3264 while (my ($k, $v) = each %$want) {
… …
3154sub reload_config { 3319sub reload_config {
3155 open my $fh, "<:utf8", "$CONFDIR/config" 3320 open my $fh, "<:utf8", "$CONFDIR/config"
3156 or return; 3321 or return;
3157 3322
3158 local $/; 3323 local $/;
3159 *CFG = YAML::Syck::Load <$fh>; 3324 *CFG = YAML::Load <$fh>;
3160 3325
3161 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3326 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3162 3327
3163 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3328 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3164 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3329 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3175sub main { 3340sub main {
3176 # we must not ever block the main coroutine 3341 # we must not ever block the main coroutine
3177 local $Coro::idle = sub { 3342 local $Coro::idle = sub {
3178 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3343 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3179 (async { 3344 (async {
3180 Event::one_event; 3345 $Coro::current->{desc} = "IDLE BUG HANDLER";
3346 EV::loop EV::LOOP_ONESHOT;
3181 })->prio (Coro::PRIO_MAX); 3347 })->prio (Coro::PRIO_MAX);
3182 }; 3348 };
3183 3349
3184 reload_config; 3350 reload_config;
3185 db_init; 3351 db_init;
3186 load_extensions; 3352 load_extensions;
3187 3353
3188 $TICK_WATCHER->start; 3354 $TICK_WATCHER->start;
3355 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3189 Event::loop; 3356 EV::loop;
3190} 3357}
3191 3358
3192############################################################################# 3359#############################################################################
3193# initialisation and cleanup 3360# initialisation and cleanup
3194 3361
3195# install some emergency cleanup handlers 3362# install some emergency cleanup handlers
3196BEGIN { 3363BEGIN {
3364 our %SIGWATCHER = ();
3197 for my $signal (qw(INT HUP TERM)) { 3365 for my $signal (qw(INT HUP TERM)) {
3198 Event->signal ( 3366 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3199 reentrant => 0,
3200 data => WF_AUTOCANCEL,
3201 signal => $signal,
3202 prio => 0,
3203 cb => sub {
3204 cf::cleanup "SIG$signal"; 3367 cf::cleanup "SIG$signal";
3205 },
3206 ); 3368 };
3207 } 3369 }
3208} 3370}
3209 3371
3210sub write_runtime { 3372sub write_runtime {
3211 my $runtime = "$LOCALDIR/runtime"; 3373 my $runtime = "$LOCALDIR/runtime";
… …
3256 # and maps saved/destroyed asynchronously. 3418 # and maps saved/destroyed asynchronously.
3257 warn "begin emergency player save\n"; 3419 warn "begin emergency player save\n";
3258 for my $login (keys %cf::PLAYER) { 3420 for my $login (keys %cf::PLAYER) {
3259 my $pl = $cf::PLAYER{$login} or next; 3421 my $pl = $cf::PLAYER{$login} or next;
3260 $pl->valid or next; 3422 $pl->valid or next;
3423 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3261 $pl->save; 3424 $pl->save;
3262 } 3425 }
3263 warn "end emergency player save\n"; 3426 warn "end emergency player save\n";
3264 3427
3265 warn "begin emergency map save\n"; 3428 warn "begin emergency map save\n";
… …
3304 warn "syncing database to disk"; 3467 warn "syncing database to disk";
3305 BDB::db_env_txn_checkpoint $DB_ENV; 3468 BDB::db_env_txn_checkpoint $DB_ENV;
3306 3469
3307 # if anything goes wrong in here, we should simply crash as we already saved 3470 # if anything goes wrong in here, we should simply crash as we already saved
3308 3471
3309 warn "cancelling all WF_AUTOCANCEL watchers";
3310 for (Event::all_watchers) {
3311 $_->cancel if $_->data & WF_AUTOCANCEL;
3312 }
3313
3314 warn "flushing outstanding aio requests"; 3472 warn "flushing outstanding aio requests";
3315 for (;;) { 3473 for (;;) {
3316 BDB::flush; 3474 BDB::flush;
3317 IO::AIO::flush; 3475 IO::AIO::flush;
3318 Coro::cede; 3476 Coro::cede_notself;
3319 last unless IO::AIO::nreqs || BDB::nreqs; 3477 last unless IO::AIO::nreqs || BDB::nreqs;
3320 warn "iterate..."; 3478 warn "iterate...";
3321 } 3479 }
3322 3480
3323 ++$RELOAD; 3481 ++$RELOAD;
… …
3399 warn "leaving sync_job"; 3557 warn "leaving sync_job";
3400 3558
3401 1 3559 1
3402 } or do { 3560 } or do {
3403 warn $@; 3561 warn $@;
3404 warn "error while reloading, exiting."; 3562 cf::cleanup "error while reloading, exiting.";
3405 exit 1;
3406 }; 3563 };
3407 3564
3408 warn "reloaded"; 3565 warn "reloaded";
3409}; 3566};
3410 3567
… …
3412 3569
3413sub reload_perl() { 3570sub reload_perl() {
3414 # doing reload synchronously and two reloads happen back-to-back, 3571 # doing reload synchronously and two reloads happen back-to-back,
3415 # coro crashes during coro_state_free->destroy here. 3572 # coro crashes during coro_state_free->destroy here.
3416 3573
3417 $RELOAD_WATCHER ||= Event->timer ( 3574 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3418 reentrant => 0,
3419 after => 0,
3420 data => WF_AUTOCANCEL,
3421 cb => sub {
3422 do_reload_perl; 3575 do_reload_perl;
3423 undef $RELOAD_WATCHER; 3576 undef $RELOAD_WATCHER;
3424 },
3425 ); 3577 };
3426} 3578}
3427 3579
3428register_command "reload" => sub { 3580register_command "reload" => sub {
3429 my ($who, $arg) = @_; 3581 my ($who, $arg) = @_;
3430 3582
3431 if ($who->flag (FLAG_WIZ)) { 3583 if ($who->flag (FLAG_WIZ)) {
3432 $who->message ("reloading server."); 3584 $who->message ("reloading server.");
3585 async {
3586 $Coro::current->{desc} = "perl_reload";
3433 async { reload_perl }; 3587 reload_perl;
3588 };
3434 } 3589 }
3435}; 3590};
3436 3591
3437unshift @INC, $LIBDIR; 3592unshift @INC, $LIBDIR;
3438 3593
… …
3457 my $signal = new Coro::Signal; 3612 my $signal = new Coro::Signal;
3458 push @WAIT_FOR_TICK_BEGIN, $signal; 3613 push @WAIT_FOR_TICK_BEGIN, $signal;
3459 $signal->wait; 3614 $signal->wait;
3460} 3615}
3461 3616
3462$TICK_WATCHER = Event->timer ( 3617$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3463 reentrant => 0,
3464 parked => 1,
3465 prio => 0,
3466 at => $NEXT_TICK || $TICK,
3467 data => WF_AUTOCANCEL,
3468 cb => sub {
3469 if ($Coro::current != $Coro::main) { 3618 if ($Coro::current != $Coro::main) {
3470 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3619 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3471 unless ++$bug_warning > 10; 3620 unless ++$bug_warning > 10;
3472 return; 3621 return;
3473 } 3622 }
3474 3623
3475 $NOW = $tick_start = Event::time; 3624 $NOW = $tick_start = EV::now;
3476 3625
3477 cf::server_tick; # one server iteration 3626 cf::server_tick; # one server iteration
3478 3627
3479 $RUNTIME += $TICK; 3628 $RUNTIME += $TICK;
3480 $NEXT_TICK += $TICK; 3629 $NEXT_TICK = $_[0]->at;
3481 3630
3482 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3631 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3483 $NEXT_RUNTIME_WRITE = $NOW + 10; 3632 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3484 Coro::async_pool { 3633 Coro::async_pool {
3634 $Coro::current->{desc} = "runtime saver";
3485 write_runtime 3635 write_runtime
3486 or warn "ERROR: unable to write runtime file: $!"; 3636 or warn "ERROR: unable to write runtime file: $!";
3487 };
3488 } 3637 };
3638 }
3489 3639
3490 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3640 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3491 $sig->send; 3641 $sig->send;
3492 } 3642 }
3493 while (my $sig = shift @WAIT_FOR_TICK) { 3643 while (my $sig = shift @WAIT_FOR_TICK) {
3494 $sig->send; 3644 $sig->send;
3495 } 3645 }
3496 3646
3497 $NOW = Event::time;
3498
3499 # if we are delayed by four ticks or more, skip them all
3500 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3501
3502 $TICK_WATCHER->at ($NEXT_TICK);
3503 $TICK_WATCHER->start;
3504
3505 $LOAD = ($NOW - $tick_start) / $TICK; 3647 $LOAD = ($NOW - $tick_start) / $TICK;
3506 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3648 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3507 3649
3508 _post_tick; 3650 _post_tick;
3509 }, 3651};
3510); 3652$TICK_WATCHER->priority (EV::MAXPRI);
3511 3653
3512{ 3654{
3655 # configure BDB
3656
3513 BDB::min_parallel 8; 3657 BDB::min_parallel 8;
3514 BDB::max_poll_time $TICK * 0.1; 3658 BDB::max_poll_reqs $TICK * 0.1;
3515 $BDB_POLL_WATCHER = Event->io ( 3659 $Coro::BDB::WATCHER->priority (1);
3516 reentrant => 0,
3517 fd => BDB::poll_fileno,
3518 poll => 'r',
3519 prio => 0,
3520 data => WF_AUTOCANCEL,
3521 cb => \&BDB::poll_cb,
3522 );
3523
3524 BDB::set_sync_prepare {
3525 my $status;
3526 my $current = $Coro::current;
3527 (
3528 sub {
3529 $status = $!;
3530 $current->ready; undef $current;
3531 },
3532 sub {
3533 Coro::schedule while defined $current;
3534 $! = $status;
3535 },
3536 )
3537 };
3538 3660
3539 unless ($DB_ENV) { 3661 unless ($DB_ENV) {
3540 $DB_ENV = BDB::db_env_create; 3662 $DB_ENV = BDB::db_env_create;
3541 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3663 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3542 | BDB::LOG_AUTOREMOVE, 1); 3664 | BDB::LOG_AUTOREMOVE, 1);
… …
3557 3679
3558 cf::cleanup "db_env_open(db): $@" if $@; 3680 cf::cleanup "db_env_open(db): $@" if $@;
3559 }; 3681 };
3560 } 3682 }
3561 3683
3562 $BDB_DEADLOCK_WATCHER = Event->timer ( 3684 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3563 after => 3,
3564 interval => 1,
3565 hard => 1,
3566 prio => 0,
3567 data => WF_AUTOCANCEL,
3568 cb => sub {
3569 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3685 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3570 },
3571 ); 3686 };
3572 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3687 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3573 after => 11,
3574 interval => 60,
3575 hard => 1,
3576 prio => 0,
3577 data => WF_AUTOCANCEL,
3578 cb => sub {
3579 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3688 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3580 },
3581 ); 3689 };
3582 $BDB_TRICKLE_WATCHER = Event->timer ( 3690 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3583 after => 5,
3584 interval => 10,
3585 hard => 1,
3586 prio => 0,
3587 data => WF_AUTOCANCEL,
3588 cb => sub {
3589 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3691 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3590 },
3591 ); 3692 };
3592} 3693}
3593 3694
3594{ 3695{
3696 # configure IO::AIO
3697
3595 IO::AIO::min_parallel 8; 3698 IO::AIO::min_parallel 8;
3596
3597 undef $Coro::AIO::WATCHER;
3598 IO::AIO::max_poll_time $TICK * 0.1; 3699 IO::AIO::max_poll_time $TICK * 0.1;
3599 $AIO_POLL_WATCHER = Event->io ( 3700 $Coro::AIO::WATCHER->priority (1);
3600 reentrant => 0,
3601 data => WF_AUTOCANCEL,
3602 fd => IO::AIO::poll_fileno,
3603 poll => 'r',
3604 prio => 6,
3605 cb => \&IO::AIO::poll_cb,
3606 );
3607} 3701}
3608 3702
3609my $_log_backtrace; 3703my $_log_backtrace;
3610 3704
3611sub _log_backtrace { 3705sub _log_backtrace {
… …
3615 3709
3616 # limit the # of concurrent backtraces 3710 # limit the # of concurrent backtraces
3617 if ($_log_backtrace < 2) { 3711 if ($_log_backtrace < 2) {
3618 ++$_log_backtrace; 3712 ++$_log_backtrace;
3619 async { 3713 async {
3714 $Coro::current->{desc} = "abt $msg";
3715
3620 my @bt = fork_call { 3716 my @bt = fork_call {
3621 @addr = map { sprintf "%x", $_ } @addr; 3717 @addr = map { sprintf "%x", $_ } @addr;
3622 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3718 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3623 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3719 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3624 or die "addr2line: $!"; 3720 or die "addr2line: $!";

Diff Legend

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