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.371 by root, Thu Sep 13 16:16:01 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 || []};
… …
1353 aio_unlink +(playerdir $login) . "/$login.pl"; 1404 aio_unlink +(playerdir $login) . "/$login.pl";
1354 1405
1355 my $f = new_from_file cf::object::thawer path $login 1406 my $f = new_from_file cf::object::thawer path $login
1356 or return; 1407 or return;
1357 1408
1358 $f->next;
1359 my $pl = cf::player::load_pl $f 1409 my $pl = cf::player::load_pl $f
1360 or return; 1410 or return;
1361 local $cf::PLAYER_LOADING{$login} = $pl; 1411 local $cf::PLAYER_LOADING{$login} = $pl;
1362 $f->resolve_delayed_derefs; 1412 $f->resolve_delayed_derefs;
1363 $cf::PLAYER{$login} = $pl 1413 $cf::PLAYER{$login} = $pl
… …
1515 1565
1516Expand crossfire pod fragments into protocol xml. 1566Expand crossfire pod fragments into protocol xml.
1517 1567
1518=cut 1568=cut
1519 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
1520sub expand_cfpod { 1581sub expand_cfpod {
1521 ((my $self), (local $_)) = @_; 1582 my ($self, $pod) = @_;
1522 1583
1523 # escape & and < 1584 my $xml;
1524 s/&/&amp;/g;
1525 s/(?<![BIUGHT])</&lt;/g;
1526 1585
1527 # this is buggy, it needs to properly take care of nested <'s 1586 while () {
1587 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1588 $group = $1;
1528 1589
1529 1 while 1590 $group =~ s/&/&amp;/g;
1530 # replace B<>, I<>, U<> etc. 1591 $group =~ s/</&lt;/g;
1531 s/B<([^\>]*)>/<b>$1<\/b>/ 1592
1532 || s/I<([^\>]*)>/<i>$1<\/i>/ 1593 $xml .= $group;
1533 || s/U<([^\>]*)>/<u>$1<\/u>/ 1594 } elsif ($pod =~ m%\G
1534 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1595 ([BCGHITU])
1535 # replace G<male|female> tags 1596 <
1536 || s{G<([^>|]*)\|([^>]*)>}{ 1597 (?:
1537 $self->gender ? $2 : $1 1598 ([^<>]*) (?{ $group = $^N })
1538 }ge 1599 | < $interior >
1539 # replace H<hint text> 1600 )
1540 || s{H<([^\>]*)>} 1601 >
1602 %gcsx
1541 { 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") {
1542 ("<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>",
1543 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1622 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1544 "") 1623 "")
1545 [$self->{hintmode}] 1624 [$self->{hintmode}];
1625 } else {
1626 $xml .= "error processing '$code($data)' directive";
1546 }ge; 1627 }
1628 } else {
1629 if ($pod =~ /\G(.+)/) {
1630 warn "parse error while expanding $pod (at $1)";
1631 }
1632 last;
1633 }
1634 }
1547 1635
1636 for ($xml) {
1548 # create single paragraphs (very hackish) 1637 # create single paragraphs (very hackish)
1549 s/(?<=\S)\n(?=\w)/ /g; 1638 s/(?<=\S)\n(?=\w)/ /g;
1550 1639
1551 # compress some whitespace 1640 # compress some whitespace
1552 s/\s+\n/\n/g; # ws line-ends 1641 s/\s+\n/\n/g; # ws line-ends
1553 s/\n\n+/\n/g; # double lines 1642 s/\n\n+/\n/g; # double lines
1554 s/^\n+//; # beginning lines 1643 s/^\n+//; # beginning lines
1555 s/\n+$//; # ending lines 1644 s/\n+$//; # ending lines
1645 }
1556 1646
1557 $_ 1647 $xml
1558} 1648}
1649
1650no re 'eval';
1559 1651
1560sub hintmode { 1652sub hintmode {
1561 $_[0]{hintmode} = $_[1] if @_ > 1; 1653 $_[0]{hintmode} = $_[1] if @_ > 1;
1562 $_[0]{hintmode} 1654 $_[0]{hintmode}
1563} 1655}
… …
2044 } 2136 }
2045 2137
2046 $MAP_PREFETCH{$path} |= $load; 2138 $MAP_PREFETCH{$path} |= $load;
2047 2139
2048 $MAP_PREFETCHER ||= cf::async { 2140 $MAP_PREFETCHER ||= cf::async {
2141 $Coro::current->{desc} = "map prefetcher";
2142
2049 while (%MAP_PREFETCH) { 2143 while (%MAP_PREFETCH) {
2050 while (my ($k, $v) = each %MAP_PREFETCH) { 2144 while (my ($k, $v) = each %MAP_PREFETCH) {
2051 if (my $map = find $k) { 2145 if (my $map = find $k) {
2052 $map->load if $v; 2146 $map->load if $v;
2053 } 2147 }
… …
2079 return if $self->{deny_save}; 2173 return if $self->{deny_save};
2080 2174
2081 local $self->{last_access} = $self->last_access;#d# 2175 local $self->{last_access} = $self->last_access;#d#
2082 2176
2083 cf::async { 2177 cf::async {
2178 $Coro::current->{desc} = "map player save";
2084 $_->contr->save for $self->players; 2179 $_->contr->save for $self->players;
2085 }; 2180 };
2086 2181
2087 if ($uniq) { 2182 if ($uniq) {
2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2275=cut 2370=cut
2276 2371
2277sub deref { 2372sub deref {
2278 my ($ref) = @_; 2373 my ($ref) = @_;
2279 2374
2280 # temporary compatibility#TODO#remove
2281 $ref =~ s{^<}{player/<};
2282
2283 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2375 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2284 my ($uuid, $name) = ($1, $2); 2376 my ($uuid, $name) = ($1, $2);
2285 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2377 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2286 or return; 2378 or return;
2287 $pl->ob->uuid eq $uuid 2379 $pl->ob->uuid eq $uuid
2288 or return; 2380 or return;
… …
2459 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2460 2552
2461 $self->enter_link; 2553 $self->enter_link;
2462 2554
2463 (async { 2555 (async {
2556 $Coro::current->{desc} = "player::goto $path $x $y";
2557
2464 # *tag paths override both path and x|y 2558 # *tag paths override both path and x|y
2465 if ($path =~ /^\*(.*)$/) { 2559 if ($path =~ /^\*(.*)$/) {
2466 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2560 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2467 my $ob = $obs[rand @obs]; 2561 my $ob = $obs[rand @obs];
2468 2562
… …
2548 $rmp->{origin_y} = $exit->y; 2642 $rmp->{origin_y} = $exit->y;
2549 } 2643 }
2550 2644
2551 $rmp->{random_seed} ||= $exit->random_seed; 2645 $rmp->{random_seed} ||= $exit->random_seed;
2552 2646
2553 my $data = cf::to_json $rmp; 2647 my $data = cf::encode_json $rmp;
2554 my $md5 = Digest::MD5::md5_hex $data; 2648 my $md5 = Digest::MD5::md5_hex $data;
2555 my $meta = "$RANDOMDIR/$md5.meta"; 2649 my $meta = "$RANDOMDIR/$md5.meta";
2556 2650
2557 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2558 aio_write $fh, 0, (length $data), $data, 0; 2652 aio_write $fh, 0, (length $data), $data, 0;
… …
2585 # if exit is damned, update players death & WoR home-position 2679 # if exit is damned, update players death & WoR home-position
2586 $self->contr->savebed ($slaying, $hp, $sp) 2680 $self->contr->savebed ($slaying, $hp, $sp)
2587 if $exit->flag (FLAG_DAMNED); 2681 if $exit->flag (FLAG_DAMNED);
2588 2682
2589 (async { 2683 (async {
2684 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2685
2590 $self->deactivate_recursive; # just to be sure 2686 $self->deactivate_recursive; # just to be sure
2591 unless (eval { 2687 unless (eval {
2592 $self->goto ($slaying, $hp, $sp); 2688 $self->goto ($slaying, $hp, $sp);
2593 2689
2594 1; 2690 1;
… …
2629the 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
2630the message unless the client supports the msg packet. 2726the message unless the client supports the msg packet.
2631 2727
2632=cut 2728=cut
2633 2729
2730# non-persistent channels (usually the info channel)
2634our %CHANNEL = ( 2731our %CHANNEL = (
2635 "c/identify" => { 2732 "c/identify" => {
2636 id => "identify", 2733 id => "infobox",
2637 title => "Identify", 2734 title => "Identify",
2638 reply => undef, 2735 reply => undef,
2639 tooltip => "Items recently identified", 2736 tooltip => "Items recently identified",
2640 }, 2737 },
2641 "c/examine" => { 2738 "c/examine" => {
2642 id => "examine", 2739 id => "infobox",
2643 title => "Examine", 2740 title => "Examine",
2644 reply => undef, 2741 reply => undef,
2645 tooltip => "Signs and other items you examined", 2742 tooltip => "Signs and other items you examined",
2646 }, 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 },
2647); 2780);
2648 2781
2649sub cf::client::send_msg { 2782sub cf::client::send_msg {
2650 my ($self, $channel, $msg, $color, @extra) = @_; 2783 my ($self, $channel, $msg, $color, @extra) = @_;
2651 2784
2652 $msg = $self->pl->expand_cfpod ($msg); 2785 $msg = $self->pl->expand_cfpod ($msg);
2653 2786
2654 $color &= cf::NDI_CLIENT_MASK; # just in case... 2787 $color &= cf::NDI_CLIENT_MASK; # just in case...
2655 2788
2656 # check predefined channels, for the benefit of C 2789 # check predefined channels, for the benefit of C
2657 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2790 if ($CHANNEL{$channel}) {
2791 $channel = $CHANNEL{$channel};
2658 2792
2793 $self->ext_msg (channel_info => $channel)
2794 if $self->can_msg;
2795
2796 $channel = $channel->{id};
2797
2659 if (ref $channel) { 2798 } elsif (ref $channel) {
2660 # send meta info to client, if not yet sent 2799 # send meta info to client, if not yet sent
2661 unless (exists $self->{channel}{$channel->{id}}) { 2800 unless (exists $self->{channel}{$channel->{id}}) {
2662 $self->{channel}{$channel->{id}} = $channel; 2801 $self->{channel}{$channel->{id}} = $channel;
2663 $self->ext_msg (channel_info => $channel) 2802 $self->ext_msg (channel_info => $channel)
2664 if $self->can_msg; 2803 if $self->can_msg;
… …
2881=pod 3020=pod
2882 3021
2883The following functions and methods are available within a safe environment: 3022The following functions and methods are available within a safe environment:
2884 3023
2885 cf::object 3024 cf::object
2886 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
2887 insert remove name archname title slaying race decrease_ob_nr 3026 insert remove name archname title slaying race decrease_ob_nr
2888 3027
2889 cf::object::player 3028 cf::object::player
2890 player 3029 player
2891 3030
… …
2898=cut 3037=cut
2899 3038
2900for ( 3039for (
2901 ["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
2902 insert remove inv name archname title slaying race 3041 insert remove inv name archname title slaying race
2903 decrease_ob_nr)], 3042 decrease_ob_nr destroy)],
2904 ["cf::object::player" => qw(player)], 3043 ["cf::object::player" => qw(player)],
2905 ["cf::player" => qw(peaceful)], 3044 ["cf::player" => qw(peaceful)],
2906 ["cf::map" => qw(trigger)], 3045 ["cf::map" => qw(trigger)],
2907) { 3046) {
2908 no strict 'refs'; 3047 no strict 'refs';
… …
3013 { 3152 {
3014 my $faces = $facedata->{faceinfo}; 3153 my $faces = $facedata->{faceinfo};
3015 3154
3016 while (my ($face, $info) = each %$faces) { 3155 while (my ($face, $info) = each %$faces) {
3017 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3156 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3157
3018 cf::face::set_visibility $idx, $info->{visibility}; 3158 cf::face::set_visibility $idx, $info->{visibility};
3019 cf::face::set_magicmap $idx, $info->{magicmap}; 3159 cf::face::set_magicmap $idx, $info->{magicmap};
3020 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};
3021 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};
3022 3162
3023 cf::cede_to_tick; 3163 cf::cede_to_tick;
3024 } 3164 }
3025 3165
3026 while (my ($face, $info) = each %$faces) { 3166 while (my ($face, $info) = each %$faces) {
3027 next unless $info->{smooth}; 3167 next unless $info->{smooth};
3168
3028 my $idx = cf::face::find $face 3169 my $idx = cf::face::find $face
3029 or next; 3170 or next;
3171
3030 if (my $smooth = cf::face::find $info->{smooth}) { 3172 if (my $smooth = cf::face::find $info->{smooth}) {
3031 cf::face::set_smooth $idx, $smooth; 3173 cf::face::set_smooth $idx, $smooth;
3032 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3174 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3033 } else { 3175 } else {
3034 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3176 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3052 { 3194 {
3053 # TODO: for gcfclient pleasure, we should give resources 3195 # TODO: for gcfclient pleasure, we should give resources
3054 # that gcfclient doesn't grok a >10000 face index. 3196 # that gcfclient doesn't grok a >10000 face index.
3055 my $res = $facedata->{resource}; 3197 my $res = $facedata->{resource};
3056 3198
3057 my $soundconf = delete $res->{"res/sound.conf"};
3058
3059 while (my ($name, $info) = each %$res) { 3199 while (my ($name, $info) = each %$res) {
3200 if (defined $info->{type}) {
3060 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3201 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3061 my $data; 3202 my $data;
3062 3203
3063 if ($info->{type} & 1) { 3204 if ($info->{type} & 1) {
3064 # prepend meta info 3205 # prepend meta info
3065 3206
3066 my $meta = $enc->encode ({ 3207 my $meta = $enc->encode ({
3067 name => $name, 3208 name => $name,
3068 %{ $info->{meta} || {} }, 3209 %{ $info->{meta} || {} },
3069 }); 3210 });
3070 3211
3071 $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};
3072 } else { 3219 } else {
3073 $data = $info->{data}; 3220 $RESOURCE{$name} = $info;
3074 } 3221 }
3075 3222
3076 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3077 cf::face::set_type $idx, $info->{type};
3078
3079 cf::cede_to_tick; 3223 cf::cede_to_tick;
3080 } 3224 }
3081
3082 if ($soundconf) {
3083 $soundconf = $enc->decode (delete $soundconf->{data});
3084
3085 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3086 my $sound = $soundconf->{compat}[$_]
3087 or next;
3088
3089 my $face = cf::face::find "sound/$sound->[1]";
3090 cf::sound::set $sound->[0] => $face;
3091 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3092 }
3093
3094 while (my ($k, $v) = each %{$soundconf->{event}}) {
3095 my $face = cf::face::find "sound/$v";
3096 cf::sound::set $k => $face;
3097 }
3098 }
3099 } 3225 }
3226
3227 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3100 3228
3101 1 3229 1
3102} 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});
3103 3251
3104register_exticmd fx_want => sub { 3252register_exticmd fx_want => sub {
3105 my ($ns, $want) = @_; 3253 my ($ns, $want) = @_;
3106 3254
3107 while (my ($k, $v) = each %$want) { 3255 while (my ($k, $v) = each %$want) {
… …
3162sub reload_config { 3310sub reload_config {
3163 open my $fh, "<:utf8", "$CONFDIR/config" 3311 open my $fh, "<:utf8", "$CONFDIR/config"
3164 or return; 3312 or return;
3165 3313
3166 local $/; 3314 local $/;
3167 *CFG = YAML::Syck::Load <$fh>; 3315 *CFG = YAML::Load <$fh>;
3168 3316
3169 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3317 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3170 3318
3171 $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};
3172 $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};
… …
3183sub main { 3331sub main {
3184 # we must not ever block the main coroutine 3332 # we must not ever block the main coroutine
3185 local $Coro::idle = sub { 3333 local $Coro::idle = sub {
3186 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#
3187 (async { 3335 (async {
3188 Event::one_event; 3336 $Coro::current->{desc} = "IDLE BUG HANDLER";
3337 EV::loop EV::LOOP_ONESHOT;
3189 })->prio (Coro::PRIO_MAX); 3338 })->prio (Coro::PRIO_MAX);
3190 }; 3339 };
3191 3340
3192 reload_config; 3341 reload_config;
3193 db_init; 3342 db_init;
3194 load_extensions; 3343 load_extensions;
3195 3344
3196 $TICK_WATCHER->start; 3345 $TICK_WATCHER->start;
3346 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3197 Event::loop; 3347 EV::loop;
3198} 3348}
3199 3349
3200############################################################################# 3350#############################################################################
3201# initialisation and cleanup 3351# initialisation and cleanup
3202 3352
3203# install some emergency cleanup handlers 3353# install some emergency cleanup handlers
3204BEGIN { 3354BEGIN {
3355 our %SIGWATCHER = ();
3205 for my $signal (qw(INT HUP TERM)) { 3356 for my $signal (qw(INT HUP TERM)) {
3206 Event->signal ( 3357 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3207 reentrant => 0,
3208 data => WF_AUTOCANCEL,
3209 signal => $signal,
3210 prio => 0,
3211 cb => sub {
3212 cf::cleanup "SIG$signal"; 3358 cf::cleanup "SIG$signal";
3213 },
3214 ); 3359 };
3215 } 3360 }
3216} 3361}
3217 3362
3218sub write_runtime { 3363sub write_runtime {
3219 my $runtime = "$LOCALDIR/runtime"; 3364 my $runtime = "$LOCALDIR/runtime";
… …
3264 # and maps saved/destroyed asynchronously. 3409 # and maps saved/destroyed asynchronously.
3265 warn "begin emergency player save\n"; 3410 warn "begin emergency player save\n";
3266 for my $login (keys %cf::PLAYER) { 3411 for my $login (keys %cf::PLAYER) {
3267 my $pl = $cf::PLAYER{$login} or next; 3412 my $pl = $cf::PLAYER{$login} or next;
3268 $pl->valid or next; 3413 $pl->valid or next;
3414 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3269 $pl->save; 3415 $pl->save;
3270 } 3416 }
3271 warn "end emergency player save\n"; 3417 warn "end emergency player save\n";
3272 3418
3273 warn "begin emergency map save\n"; 3419 warn "begin emergency map save\n";
… …
3312 warn "syncing database to disk"; 3458 warn "syncing database to disk";
3313 BDB::db_env_txn_checkpoint $DB_ENV; 3459 BDB::db_env_txn_checkpoint $DB_ENV;
3314 3460
3315 # 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
3316 3462
3317 warn "cancelling all WF_AUTOCANCEL watchers";
3318 for (Event::all_watchers) {
3319 $_->cancel if $_->data & WF_AUTOCANCEL;
3320 }
3321
3322 warn "flushing outstanding aio requests"; 3463 warn "flushing outstanding aio requests";
3323 for (;;) { 3464 for (;;) {
3324 BDB::flush; 3465 BDB::flush;
3325 IO::AIO::flush; 3466 IO::AIO::flush;
3326 Coro::cede; 3467 Coro::cede_notself;
3327 last unless IO::AIO::nreqs || BDB::nreqs; 3468 last unless IO::AIO::nreqs || BDB::nreqs;
3328 warn "iterate..."; 3469 warn "iterate...";
3329 } 3470 }
3330 3471
3331 ++$RELOAD; 3472 ++$RELOAD;
… …
3420 3561
3421sub reload_perl() { 3562sub reload_perl() {
3422 # doing reload synchronously and two reloads happen back-to-back, 3563 # doing reload synchronously and two reloads happen back-to-back,
3423 # coro crashes during coro_state_free->destroy here. 3564 # coro crashes during coro_state_free->destroy here.
3424 3565
3425 $RELOAD_WATCHER ||= Event->timer ( 3566 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3426 reentrant => 0,
3427 after => 0,
3428 data => WF_AUTOCANCEL,
3429 cb => sub {
3430 do_reload_perl;
3431 undef $RELOAD_WATCHER; 3567 undef $RELOAD_WATCHER;
3432 }, 3568 do_reload_perl;
3433 ); 3569 };
3434} 3570}
3435 3571
3436register_command "reload" => sub { 3572register_command "reload" => sub {
3437 my ($who, $arg) = @_; 3573 my ($who, $arg) = @_;
3438 3574
3439 if ($who->flag (FLAG_WIZ)) { 3575 if ($who->flag (FLAG_WIZ)) {
3440 $who->message ("reloading server."); 3576 $who->message ("reloading server.");
3577 async {
3578 $Coro::current->{desc} = "perl_reload";
3441 async { reload_perl }; 3579 reload_perl;
3580 };
3442 } 3581 }
3443}; 3582};
3444 3583
3445unshift @INC, $LIBDIR; 3584unshift @INC, $LIBDIR;
3446 3585
… …
3465 my $signal = new Coro::Signal; 3604 my $signal = new Coro::Signal;
3466 push @WAIT_FOR_TICK_BEGIN, $signal; 3605 push @WAIT_FOR_TICK_BEGIN, $signal;
3467 $signal->wait; 3606 $signal->wait;
3468} 3607}
3469 3608
3470$TICK_WATCHER = Event->timer ( 3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3471 reentrant => 0,
3472 parked => 1,
3473 prio => 0,
3474 at => $NEXT_TICK || $TICK,
3475 data => WF_AUTOCANCEL,
3476 cb => sub {
3477 if ($Coro::current != $Coro::main) { 3610 if ($Coro::current != $Coro::main) {
3478 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"
3479 unless ++$bug_warning > 10; 3612 unless ++$bug_warning > 10;
3480 return; 3613 return;
3481 } 3614 }
3482 3615
3483 $NOW = $tick_start = Event::time; 3616 $NOW = $tick_start = EV::now;
3484 3617
3485 cf::server_tick; # one server iteration 3618 cf::server_tick; # one server iteration
3486 3619
3487 $RUNTIME += $TICK; 3620 $RUNTIME += $TICK;
3488 $NEXT_TICK += $TICK; 3621 $NEXT_TICK = $_[0]->at;
3489 3622
3490 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3623 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3491 $NEXT_RUNTIME_WRITE = $NOW + 10; 3624 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3492 Coro::async_pool { 3625 Coro::async_pool {
3626 $Coro::current->{desc} = "runtime saver";
3493 write_runtime 3627 write_runtime
3494 or warn "ERROR: unable to write runtime file: $!"; 3628 or warn "ERROR: unable to write runtime file: $!";
3495 };
3496 } 3629 };
3630 }
3497 3631
3498 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3499 $sig->send; 3633 $sig->send;
3500 } 3634 }
3501 while (my $sig = shift @WAIT_FOR_TICK) { 3635 while (my $sig = shift @WAIT_FOR_TICK) {
3502 $sig->send; 3636 $sig->send;
3503 } 3637 }
3504 3638
3505 $NOW = Event::time;
3506
3507 # if we are delayed by four ticks or more, skip them all
3508 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3509
3510 $TICK_WATCHER->at ($NEXT_TICK);
3511 $TICK_WATCHER->start;
3512
3513 $LOAD = ($NOW - $tick_start) / $TICK; 3639 $LOAD = ($NOW - $tick_start) / $TICK;
3514 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3515 3641
3516 _post_tick; 3642 _post_tick;
3517 }, 3643};
3518); 3644$TICK_WATCHER->priority (EV::MAXPRI);
3519 3645
3520{ 3646{
3647 # configure BDB
3648
3521 BDB::min_parallel 8; 3649 BDB::min_parallel 8;
3522 BDB::max_poll_time $TICK * 0.1; 3650 BDB::max_poll_reqs $TICK * 0.1;
3523 $BDB_POLL_WATCHER = Event->io ( 3651 $Coro::BDB::WATCHER->priority (1);
3524 reentrant => 0,
3525 fd => BDB::poll_fileno,
3526 poll => 'r',
3527 prio => 0,
3528 data => WF_AUTOCANCEL,
3529 cb => \&BDB::poll_cb,
3530 );
3531
3532 BDB::set_sync_prepare {
3533 my $status;
3534 my $current = $Coro::current;
3535 (
3536 sub {
3537 $status = $!;
3538 $current->ready; undef $current;
3539 },
3540 sub {
3541 Coro::schedule while defined $current;
3542 $! = $status;
3543 },
3544 )
3545 };
3546 3652
3547 unless ($DB_ENV) { 3653 unless ($DB_ENV) {
3548 $DB_ENV = BDB::db_env_create; 3654 $DB_ENV = BDB::db_env_create;
3549 $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
3550 | BDB::LOG_AUTOREMOVE, 1); 3656 | BDB::LOG_AUTOREMOVE, 1);
… …
3565 3671
3566 cf::cleanup "db_env_open(db): $@" if $@; 3672 cf::cleanup "db_env_open(db): $@" if $@;
3567 }; 3673 };
3568 } 3674 }
3569 3675
3570 $BDB_DEADLOCK_WATCHER = Event->timer ( 3676 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3571 after => 3,
3572 interval => 1,
3573 hard => 1,
3574 prio => 0,
3575 data => WF_AUTOCANCEL,
3576 cb => sub {
3577 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 { };
3578 },
3579 ); 3678 };
3580 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3679 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3581 after => 11,
3582 interval => 60,
3583 hard => 1,
3584 prio => 0,
3585 data => WF_AUTOCANCEL,
3586 cb => sub {
3587 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3680 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3588 },
3589 ); 3681 };
3590 $BDB_TRICKLE_WATCHER = Event->timer ( 3682 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3591 after => 5,
3592 interval => 10,
3593 hard => 1,
3594 prio => 0,
3595 data => WF_AUTOCANCEL,
3596 cb => sub {
3597 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3598 },
3599 ); 3684 };
3600} 3685}
3601 3686
3602{ 3687{
3688 # configure IO::AIO
3689
3603 IO::AIO::min_parallel 8; 3690 IO::AIO::min_parallel 8;
3604
3605 undef $Coro::AIO::WATCHER;
3606 IO::AIO::max_poll_time $TICK * 0.1; 3691 IO::AIO::max_poll_time $TICK * 0.1;
3607 $AIO_POLL_WATCHER = Event->io ( 3692 $Coro::AIO::WATCHER->priority (1);
3608 reentrant => 0,
3609 data => WF_AUTOCANCEL,
3610 fd => IO::AIO::poll_fileno,
3611 poll => 'r',
3612 prio => 6,
3613 cb => \&IO::AIO::poll_cb,
3614 );
3615} 3693}
3616 3694
3617my $_log_backtrace; 3695my $_log_backtrace;
3618 3696
3619sub _log_backtrace { 3697sub _log_backtrace {
… …
3623 3701
3624 # limit the # of concurrent backtraces 3702 # limit the # of concurrent backtraces
3625 if ($_log_backtrace < 2) { 3703 if ($_log_backtrace < 2) {
3626 ++$_log_backtrace; 3704 ++$_log_backtrace;
3627 async { 3705 async {
3706 $Coro::current->{desc} = "abt $msg";
3707
3628 my @bt = fork_call { 3708 my @bt = fork_call {
3629 @addr = map { sprintf "%x", $_ } @addr; 3709 @addr = map { sprintf "%x", $_ } @addr;
3630 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3710 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3631 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 |"
3632 or die "addr2line: $!"; 3712 or die "addr2line: $!";

Diff Legend

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