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

Diff Legend

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