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.374 by root, Wed Sep 19 22:07:16 2007 UTC vs.
Revision 1.413 by root, Sun Apr 6 16:13:20 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV 3.2;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.64 (); 36use Coro 4.32 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
22use Coro::AIO; 43use Coro::AIO;
44use Coro::BDB;
23use Coro::Storable; 45use Coro::Storable;
24use Coro::Util (); 46use Coro::Util ();
25 47
26use JSON::XS (); 48use JSON::XS 2.01 ();
27use BDB (); 49use BDB ();
28use Data::Dumper; 50use Data::Dumper;
29use Digest::MD5; 51use Digest::MD5;
30use Fcntl; 52use Fcntl;
31use YAML::Syck (); 53use YAML ();
32use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
33use Time::HiRes; 55use Time::HiRes;
34use Compress::LZF; 56use Compress::LZF;
35use Digest::MD5 (); 57use Digest::MD5 ();
36 58
37# configure various modules to our taste 59# configure various modules to our taste
38# 60#
39$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 62Coro::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 63Compress::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 64
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 66
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 68
… …
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
75 93
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 97our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
83 99
84our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 101our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 102our $BDB_CHECKPOINT_WATCHER;
… …
89 105
90our %CFG; 106our %CFG;
91 107
92our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 109our $RUNTIME;
110our $NOW;
94 111
95our (%PLAYER, %PLAYER_LOADING); # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 113our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
98 115
99# used to convert map paths into valid unix filenames by replacing / by ∕ 116# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 118
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
105 123
106binmode STDOUT; 124binmode STDOUT;
107binmode STDERR; 125binmode STDERR;
108 126
109# read virtual server time, if available 127# read virtual server time, if available
… …
162 180
163The raw value load value from the last tick. 181The raw value load value from the last tick.
164 182
165=item %cf::CFG 183=item %cf::CFG
166 184
167Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 186from wherever your confdir points to.
169 187
170=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
171 189
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 190These 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; 211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 212
195 LOG llevError, $msg; 213 LOG llevError, $msg;
196 }; 214 };
197} 215}
216
217$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "=="
219
220 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d#
223 }#d#
224
225 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate
228};
229
230$SIG{__DIE__} = sub { }; #d#?
198 231
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
215)) { 248)) {
216 no strict 'refs'; 249 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 251}
219 252
220$Event::DIED = sub { 253$EV::DIED = sub {
221 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
222}; 255};
223 256
224############################################################################# 257#############################################################################
225 258
… …
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 281 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 282 $d
250 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
251} 284}
252 285
253=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
254 287
255Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
256 289
257=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
258 291
259Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
260 293
261=cut 294=cut
262 295
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 297
265sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
267 300
268=item cf::lock_wait $string 301=item cf::lock_wait $string
269 302
270Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
271 304
… …
327 360
328 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
329} 362}
330 363
331sub freeze_mainloop { 364sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
333 366
334 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start; 368}
336 }; 369
337 $TICK_WATCHER->stop; 370=item cf::periodic $interval, $cb
338 $guard 371
372Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer.
374
375=cut
376
377sub periodic($$) {
378 my ($interval, $cb) = @_;
379
380 my $start = rand List::Util::min 180, $interval;
381
382 EV::periodic $start, $interval, 0, $cb
339} 383}
340 384
341=item cf::get_slot $time[, $priority[, $name]] 385=item cf::get_slot $time[, $priority[, $name]]
342 386
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 387Allocate $time seconds of blocking CPU time at priority C<$priority>:
… …
373 } 417 }
374 } 418 }
375 } 419 }
376 420
377 if (@SLOT_QUEUE) { 421 if (@SLOT_QUEUE) {
378 # we do not use wait_For_tick() as it returns immediately when tick is inactive 422 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal; 423 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 424 $signal->wait;
381 } else { 425 } else {
382 Coro::schedule; 426 Coro::schedule;
383 } 427 }
… …
406 450
407BEGIN { *async = \&Coro::async_pool } 451BEGIN { *async = \&Coro::async_pool }
408 452
409=item cf::sync_job { BLOCK } 453=item cf::sync_job { BLOCK }
410 454
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 455The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 456is always able to handle events or runnable, as Deliantra is only
413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 457partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 458acceptable.
415 459
416If it must be done, put the blocking parts into C<sync_job>. This will run 460If it must be done, put the blocking parts into C<sync_job>. This will run
417the given BLOCK in another coroutine while waiting for the result. The 461the given BLOCK in another coroutine while waiting for the result. The
… …
422 466
423sub sync_job(&) { 467sub sync_job(&) {
424 my ($job) = @_; 468 my ($job) = @_;
425 469
426 if ($Coro::current == $Coro::main) { 470 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 471 my $time = EV::time;
428 472
429 # this is the main coro, too bad, we have to block 473 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 474 # till the operation succeeds, freezing the server :/
431 475
432 # TODO: use suspend/resume instead 476 LOG llevError, Carp::longmess "sync job";#d#
433 # (but this is cancel-safe) 477
434 my $freeze_guard = freeze_mainloop; 478 my $freeze_guard = freeze_mainloop;
435 479
436 my $busy = 1; 480 my $busy = 1;
437 my @res; 481 my @res;
438 482
… …
442 warn $@ if $@; 486 warn $@ if $@;
443 undef $busy; 487 undef $busy;
444 })->prio (Coro::PRIO_MAX); 488 })->prio (Coro::PRIO_MAX);
445 489
446 while ($busy) { 490 while ($busy) {
447 Coro::cede or Event::one_event; 491 if (Coro::nready) {
492 Coro::cede_notself;
493 } else {
494 EV::loop EV::LOOP_ONESHOT;
448 } 495 }
496 }
449 497
450 $time = Event::time - $time; 498 my $time = EV::time - $time;
451 499
452 LOG llevError | logBacktrace, Carp::longmess "long sync job"
453 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
454
455 $tick_start += $time; # do not account sync jobs to server load 500 $TICK_START += $time; # do not account sync jobs to server load
456 501
457 wantarray ? @res : $res[0] 502 wantarray ? @res : $res[0]
458 } else { 503 } else {
459 # we are in another coroutine, how wonderful, everything just works 504 # we are in another coroutine, how wonderful, everything just works
460 505
… …
485=item fork_call { }, $args 530=item fork_call { }, $args
486 531
487Executes the given code block with the given arguments in a seperate 532Executes the given code block with the given arguments in a seperate
488process, returning the results. Everything must be serialisable with 533process, returning the results. Everything must be serialisable with
489Coro::Storable. May, of course, block. Note that the executed sub may 534Coro::Storable. May, of course, block. Note that the executed sub may
490never block itself or use any form of Event handling. 535never block itself or use any form of event handling.
491 536
492=cut 537=cut
493 538
494sub fork_call(&@) { 539sub fork_call(&@) {
495 my ($cb, @args) = @_; 540 my ($cb, @args) = @_;
… …
656attach callbacks/event handlers (a collection of which is called an "attachment") 701attach callbacks/event handlers (a collection of which is called an "attachment")
657to it. All such attachable objects support the following methods. 702to it. All such attachable objects support the following methods.
658 703
659In the following description, CLASS can be any of C<global>, C<object> 704In the following description, CLASS can be any of C<global>, C<object>
660C<player>, C<client> or C<map> (i.e. the attachable objects in 705C<player>, C<client> or C<map> (i.e. the attachable objects in
661Crossfire TRT). 706Deliantra).
662 707
663=over 4 708=over 4
664 709
665=item $attachable->attach ($attachment, key => $value...) 710=item $attachable->attach ($attachment, key => $value...)
666 711
… …
948 } 993 }
949 994
950 0 995 0
951} 996}
952 997
953=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 998=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
954 999
955=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1000=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
956 1001
957Generate an object-specific event with the given arguments. 1002Generate an object-specific event with the given arguments.
958 1003
… …
964 1009
965=cut 1010=cut
966 1011
967############################################################################# 1012#############################################################################
968# object support 1013# object support
969#
970 1014
1015sub _object_equal($$);
1016sub _object_equal($$) {
1017 my ($a, $b) = @_;
1018
1019 return 0 unless (ref $a) eq (ref $b);
1020
1021 if ("HASH" eq ref $a) {
1022 my @ka = keys %$a;
1023 my @kb = keys %$b;
1024
1025 return 0 if @ka != @kb;
1026
1027 for (0 .. $#ka) {
1028 return 0 unless $ka[$_] eq $kb[$_];
1029 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1030 }
1031
1032 } elsif ("ARRAY" eq ref $a) {
1033
1034 return 0 if @$a != @$b;
1035
1036 for (0 .. $#$a) {
1037 return 0 unless _object_equal $a->[$_], $b->[$_];
1038 }
1039
1040 } elsif ($a ne $b) {
1041 return 0;
1042 }
1043
1044 1
1045}
1046
1047our $SLOW_MERGES;#d#
971sub _can_merge { 1048sub _can_merge {
972 my ($ob1, $ob2) = @_; 1049 my ($ob1, $ob2) = @_;
973 1050
974 local $Storable::canonical = 1; 1051 ++$SLOW_MERGES;#d#
975 my $fob1 = Storable::freeze $ob1;
976 my $fob2 = Storable::freeze $ob2;
977 1052
978 $fob1 eq $fob2 1053 # we do the slow way here
1054 return _object_equal $ob1, $ob2
979} 1055}
980 1056
981sub reattach { 1057sub reattach {
982 # basically do the same as instantiate, without calling instantiate 1058 # basically do the same as instantiate, without calling instantiate
983 my ($obj) = @_; 1059 my ($obj) = @_;
… …
1005cf::attachable->attach ( 1081cf::attachable->attach (
1006 prio => -1000000, 1082 prio => -1000000,
1007 on_instantiate => sub { 1083 on_instantiate => sub {
1008 my ($obj, $data) = @_; 1084 my ($obj, $data) = @_;
1009 1085
1010 $data = from_json $data; 1086 $data = decode_json $data;
1011 1087
1012 for (@$data) { 1088 for (@$data) {
1013 my ($name, $args) = @$_; 1089 my ($name, $args) = @$_;
1014 1090
1015 $obj->attach ($name, %{$args || {} }); 1091 $obj->attach ($name, %{$args || {} });
… …
1044 close $fh; 1120 close $fh;
1045 1121
1046 if (@$objs) { 1122 if (@$objs) {
1047 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1123 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1048 chmod SAVE_MODE, $fh; 1124 chmod SAVE_MODE, $fh;
1049 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1050 aio_write $fh, 0, (length $data), $data, 0; 1126 aio_write $fh, 0, (length $data), $data, 0;
1051 aio_fsync $fh if $cf::USE_FSYNC; 1127 aio_fsync $fh if $cf::USE_FSYNC;
1052 close $fh; 1128 close $fh;
1053 aio_rename "$filename.pst~", "$filename.pst"; 1129 aio_rename "$filename.pst~", "$filename.pst";
1054 } 1130 }
… …
1085 1161
1086 unless (aio_stat "$filename.pst") { 1162 unless (aio_stat "$filename.pst") {
1087 (aio_load "$filename.pst", $av) >= 0 1163 (aio_load "$filename.pst", $av) >= 0
1088 or return; 1164 or return;
1089 1165
1090 $av = eval { (Storable::thaw $av)->{objs} }; 1166 my $st = eval { Coro::Storable::thaw $av };
1167 $av = $st->{objs};
1091 } 1168 }
1092 1169
1093 utf8::decode (my $decname = $filename); 1170 utf8::decode (my $decname = $filename);
1094 warn sprintf "loading %s (%d,%d)\n", 1171 warn sprintf "loading %s (%d,%d)\n",
1095 $decname, length $data, scalar @{$av || []}; 1172 $decname, length $data, scalar @{$av || []};
… …
1251 my $msg = $@ ? "$v->{path}: $@\n" 1328 my $msg = $@ ? "$v->{path}: $@\n"
1252 : "$v->{base}: extension inactive.\n"; 1329 : "$v->{base}: extension inactive.\n";
1253 1330
1254 if (exists $v->{meta}{mandatory}) { 1331 if (exists $v->{meta}{mandatory}) {
1255 warn $msg; 1332 warn $msg;
1256 warn "mandatory extension failed to load, exiting.\n"; 1333 cf::cleanup "mandatory extension failed to load, exiting.";
1257 exit 1;
1258 } 1334 }
1259 1335
1260 warn $msg; 1336 warn $msg;
1261 } 1337 }
1262 1338
… …
1510 1586
1511Expand crossfire pod fragments into protocol xml. 1587Expand crossfire pod fragments into protocol xml.
1512 1588
1513=cut 1589=cut
1514 1590
1591use re 'eval';
1592
1593my $group;
1594my $interior; $interior = qr{
1595 # match a pod interior sequence sans C<< >>
1596 (?:
1597 \ (.*?)\ (?{ $group = $^N })
1598 | < (??{$interior}) >
1599 )
1600}x;
1601
1515sub expand_cfpod { 1602sub expand_cfpod {
1516 ((my $self), (local $_)) = @_; 1603 my ($self, $pod) = @_;
1517 1604
1518 # escape & and < 1605 my $xml;
1519 s/&/&amp;/g;
1520 s/(?<![BIUGHT])</&lt;/g;
1521 1606
1522 # this is buggy, it needs to properly take care of nested <'s 1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1523 1610
1524 1 while 1611 $group =~ s/&/&amp;/g;
1525 # replace B<>, I<>, U<> etc. 1612 $group =~ s/</&lt;/g;
1526 s/B<([^\>]*)>/<b>$1<\/b>/ 1613
1527 || s/I<([^\>]*)>/<i>$1<\/i>/ 1614 $xml .= $group;
1528 || s/U<([^\>]*)>/<u>$1<\/u>/ 1615 } elsif ($pod =~ m%\G
1529 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1616 ([BCGHITU])
1530 # replace G<male|female> tags 1617 <
1531 || s{G<([^>|]*)\|([^>]*)>}{ 1618 (?:
1532 $self->gender ? $2 : $1 1619 ([^<>]*) (?{ $group = $^N })
1533 }ge 1620 | < $interior >
1534 # replace H<hint text> 1621 )
1535 || s{H<([^\>]*)>} 1622 >
1623 %gcsx
1536 { 1624 ) {
1625 my ($code, $data) = ($1, $group);
1626
1627 if ($code eq "B") {
1628 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1629 } elsif ($code eq "I") {
1630 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1631 } elsif ($code eq "U") {
1632 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1633 } elsif ($code eq "C") {
1634 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1635 } elsif ($code eq "T") {
1636 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1637 } elsif ($code eq "G") {
1638 my ($male, $female) = split /\|/, $data;
1639 $data = $self->gender ? $female : $male;
1640 $xml .= expand_cfpod ($self, $data);
1641 } elsif ($code eq "H") {
1537 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1642 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1538 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1539 "") 1644 "")
1540 [$self->{hintmode}] 1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1541 }ge; 1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1654 }
1655 }
1542 1656
1657 for ($xml) {
1543 # create single paragraphs (very hackish) 1658 # create single paragraphs (very hackish)
1544 s/(?<=\S)\n(?=\w)/ /g; 1659 s/(?<=\S)\n(?=\w)/ /g;
1545 1660
1546 # compress some whitespace 1661 # compress some whitespace
1547 s/\s+\n/\n/g; # ws line-ends 1662 s/\s+\n/\n/g; # ws line-ends
1548 s/\n\n+/\n/g; # double lines 1663 s/\n\n+/\n/g; # double lines
1549 s/^\n+//; # beginning lines 1664 s/^\n+//; # beginning lines
1550 s/\n+$//; # ending lines 1665 s/\n+$//; # ending lines
1666 }
1551 1667
1552 $_ 1668 $xml
1553} 1669}
1670
1671no re 'eval';
1554 1672
1555sub hintmode { 1673sub hintmode {
1556 $_[0]{hintmode} = $_[1] if @_ > 1; 1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1557 $_[0]{hintmode} 1675 $_[0]{hintmode}
1558} 1676}
… …
2273=cut 2391=cut
2274 2392
2275sub deref { 2393sub deref {
2276 my ($ref) = @_; 2394 my ($ref) = @_;
2277 2395
2278 # temporary compatibility#TODO#remove
2279 $ref =~ s{^<}{player/<};
2280
2281 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2396 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2282 my ($uuid, $name) = ($1, $2); 2397 my ($uuid, $name) = ($1, $2);
2283 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2398 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2284 or return; 2399 or return;
2285 $pl->ob->uuid eq $uuid 2400 $pl->ob->uuid eq $uuid
2286 or return; 2401 or return;
… …
2548 $rmp->{origin_y} = $exit->y; 2663 $rmp->{origin_y} = $exit->y;
2549 } 2664 }
2550 2665
2551 $rmp->{random_seed} ||= $exit->random_seed; 2666 $rmp->{random_seed} ||= $exit->random_seed;
2552 2667
2553 my $data = cf::to_json $rmp; 2668 my $data = cf::encode_json $rmp;
2554 my $md5 = Digest::MD5::md5_hex $data; 2669 my $md5 = Digest::MD5::md5_hex $data;
2555 my $meta = "$RANDOMDIR/$md5.meta"; 2670 my $meta = "$RANDOMDIR/$md5.meta";
2556 2671
2557 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2558 aio_write $fh, 0, (length $data), $data, 0; 2673 aio_write $fh, 0, (length $data), $data, 0;
… …
2631the message, with C<log> being the default. If C<$color> is negative, suppress 2746the message, with C<log> being the default. If C<$color> is negative, suppress
2632the message unless the client supports the msg packet. 2747the message unless the client supports the msg packet.
2633 2748
2634=cut 2749=cut
2635 2750
2751# non-persistent channels (usually the info channel)
2636our %CHANNEL = ( 2752our %CHANNEL = (
2637 "c/identify" => { 2753 "c/identify" => {
2638 id => "identify", 2754 id => "infobox",
2639 title => "Identify", 2755 title => "Identify",
2640 reply => undef, 2756 reply => undef,
2641 tooltip => "Items recently identified", 2757 tooltip => "Items recently identified",
2642 }, 2758 },
2643 "c/examine" => { 2759 "c/examine" => {
2644 id => "examine", 2760 id => "infobox",
2645 title => "Examine", 2761 title => "Examine",
2646 reply => undef, 2762 reply => undef,
2647 tooltip => "Signs and other items you examined", 2763 tooltip => "Signs and other items you examined",
2648 }, 2764 },
2765 "c/book" => {
2766 id => "infobox",
2767 title => "Book",
2768 reply => undef,
2769 tooltip => "The contents of a note or book",
2770 },
2771 "c/lookat" => {
2772 id => "infobox",
2773 title => "Look",
2774 reply => undef,
2775 tooltip => "What you saw there",
2776 },
2777 "c/who" => {
2778 id => "infobox",
2779 title => "Players",
2780 reply => undef,
2781 tooltip => "Shows players who are currently online",
2782 },
2783 "c/body" => {
2784 id => "infobox",
2785 title => "Body Parts",
2786 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available",
2788 },
2789 "c/uptime" => {
2790 id => "infobox",
2791 title => "Uptime",
2792 reply => undef,
2793 tooltip => "How long the server has been running since last restart",
2794 },
2795 "c/mapinfo" => {
2796 id => "infobox",
2797 title => "Map Info",
2798 reply => undef,
2799 tooltip => "Information related to the maps",
2800 },
2649); 2801);
2650 2802
2651sub cf::client::send_msg { 2803sub cf::client::send_msg {
2652 my ($self, $channel, $msg, $color, @extra) = @_; 2804 my ($self, $channel, $msg, $color, @extra) = @_;
2653 2805
2654 $msg = $self->pl->expand_cfpod ($msg); 2806 $msg = $self->pl->expand_cfpod ($msg);
2655 2807
2656 $color &= cf::NDI_CLIENT_MASK; # just in case... 2808 $color &= cf::NDI_CLIENT_MASK; # just in case...
2657 2809
2658 # check predefined channels, for the benefit of C 2810 # check predefined channels, for the benefit of C
2659 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2811 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel};
2660 2813
2814 $self->ext_msg (channel_info => $channel)
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id};
2818
2661 if (ref $channel) { 2819 } elsif (ref $channel) {
2662 # send meta info to client, if not yet sent 2820 # send meta info to client, if not yet sent
2663 unless (exists $self->{channel}{$channel->{id}}) { 2821 unless (exists $self->{channel}{$channel->{id}}) {
2664 $self->{channel}{$channel->{id}} = $channel; 2822 $self->{channel}{$channel->{id}} = $channel;
2665 $self->ext_msg (channel_info => $channel) 2823 $self->ext_msg (channel_info => $channel)
2666 if $self->can_msg; 2824 if $self->can_msg;
… …
2883=pod 3041=pod
2884 3042
2885The following functions and methods are available within a safe environment: 3043The following functions and methods are available within a safe environment:
2886 3044
2887 cf::object 3045 cf::object
2888 contr pay_amount pay_player map x y force_find force_add 3046 contr pay_amount pay_player map x y force_find force_add destroy
2889 insert remove name archname title slaying race decrease_ob_nr 3047 insert remove name archname title slaying race decrease_ob_nr
2890 3048
2891 cf::object::player 3049 cf::object::player
2892 player 3050 player
2893 3051
… …
2900=cut 3058=cut
2901 3059
2902for ( 3060for (
2903 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3061 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2904 insert remove inv name archname title slaying race 3062 insert remove inv name archname title slaying race
2905 decrease_ob_nr)], 3063 decrease_ob_nr destroy)],
2906 ["cf::object::player" => qw(player)], 3064 ["cf::object::player" => qw(player)],
2907 ["cf::player" => qw(peaceful)], 3065 ["cf::player" => qw(peaceful)],
2908 ["cf::map" => qw(trigger)], 3066 ["cf::map" => qw(trigger)],
2909) { 3067) {
2910 no strict 'refs'; 3068 no strict 'refs';
… …
3015 { 3173 {
3016 my $faces = $facedata->{faceinfo}; 3174 my $faces = $facedata->{faceinfo};
3017 3175
3018 while (my ($face, $info) = each %$faces) { 3176 while (my ($face, $info) = each %$faces) {
3019 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3177 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3178
3020 cf::face::set_visibility $idx, $info->{visibility}; 3179 cf::face::set_visibility $idx, $info->{visibility};
3021 cf::face::set_magicmap $idx, $info->{magicmap}; 3180 cf::face::set_magicmap $idx, $info->{magicmap};
3022 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3181 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3023 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3182 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3024 3183
3025 cf::cede_to_tick; 3184 cf::cede_to_tick;
3026 } 3185 }
3027 3186
3028 while (my ($face, $info) = each %$faces) { 3187 while (my ($face, $info) = each %$faces) {
3029 next unless $info->{smooth}; 3188 next unless $info->{smooth};
3189
3030 my $idx = cf::face::find $face 3190 my $idx = cf::face::find $face
3031 or next; 3191 or next;
3192
3032 if (my $smooth = cf::face::find $info->{smooth}) { 3193 if (my $smooth = cf::face::find $info->{smooth}) {
3033 cf::face::set_smooth $idx, $smooth; 3194 cf::face::set_smooth $idx, $smooth;
3034 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3195 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3035 } else { 3196 } else {
3036 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3197 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3054 { 3215 {
3055 # TODO: for gcfclient pleasure, we should give resources 3216 # TODO: for gcfclient pleasure, we should give resources
3056 # that gcfclient doesn't grok a >10000 face index. 3217 # that gcfclient doesn't grok a >10000 face index.
3057 my $res = $facedata->{resource}; 3218 my $res = $facedata->{resource};
3058 3219
3059 my $soundconf = delete $res->{"res/sound.conf"};
3060
3061 while (my ($name, $info) = each %$res) { 3220 while (my ($name, $info) = each %$res) {
3221 if (defined $info->{type}) {
3062 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3222 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3063 my $data; 3223 my $data;
3064 3224
3065 if ($info->{type} & 1) { 3225 if ($info->{type} & 1) {
3066 # prepend meta info 3226 # prepend meta info
3067 3227
3068 my $meta = $enc->encode ({ 3228 my $meta = $enc->encode ({
3069 name => $name, 3229 name => $name,
3070 %{ $info->{meta} || {} }, 3230 %{ $info->{meta} || {} },
3071 }); 3231 });
3072 3232
3073 $data = pack "(w/a*)*", $meta, $info->{data}; 3233 $data = pack "(w/a*)*", $meta, $info->{data};
3234 } else {
3235 $data = $info->{data};
3236 }
3237
3238 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3239 cf::face::set_type $idx, $info->{type};
3074 } else { 3240 } else {
3075 $data = $info->{data}; 3241 $RESOURCE{$name} = $info;
3076 } 3242 }
3077 3243
3078 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3079 cf::face::set_type $idx, $info->{type};
3080
3081 cf::cede_to_tick; 3244 cf::cede_to_tick;
3082 } 3245 }
3083
3084 if ($soundconf) {
3085 $soundconf = $enc->decode (delete $soundconf->{data});
3086
3087 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3088 my $sound = $soundconf->{compat}[$_]
3089 or next;
3090
3091 my $face = cf::face::find "sound/$sound->[1]";
3092 cf::sound::set $sound->[0] => $face;
3093 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3094 }
3095
3096 while (my ($k, $v) = each %{$soundconf->{event}}) {
3097 my $face = cf::face::find "sound/$v";
3098 cf::sound::set $k => $face;
3099 }
3100 }
3101 } 3246 }
3247
3248 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3102 3249
3103 1 3250 1
3104} 3251}
3252
3253cf::global->attach (on_resource_update => sub {
3254 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3255 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3256
3257 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3258 my $sound = $soundconf->{compat}[$_]
3259 or next;
3260
3261 my $face = cf::face::find "sound/$sound->[1]";
3262 cf::sound::set $sound->[0] => $face;
3263 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3264 }
3265
3266 while (my ($k, $v) = each %{$soundconf->{event}}) {
3267 my $face = cf::face::find "sound/$v";
3268 cf::sound::set $k => $face;
3269 }
3270 }
3271});
3105 3272
3106register_exticmd fx_want => sub { 3273register_exticmd fx_want => sub {
3107 my ($ns, $want) = @_; 3274 my ($ns, $want) = @_;
3108 3275
3109 while (my ($k, $v) = each %$want) { 3276 while (my ($k, $v) = each %$want) {
… …
3164sub reload_config { 3331sub reload_config {
3165 open my $fh, "<:utf8", "$CONFDIR/config" 3332 open my $fh, "<:utf8", "$CONFDIR/config"
3166 or return; 3333 or return;
3167 3334
3168 local $/; 3335 local $/;
3169 *CFG = YAML::Syck::Load <$fh>; 3336 *CFG = YAML::Load <$fh>;
3170 3337
3171 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3338 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3172 3339
3173 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3340 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3174 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3341 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3186 # we must not ever block the main coroutine 3353 # we must not ever block the main coroutine
3187 local $Coro::idle = sub { 3354 local $Coro::idle = sub {
3188 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3355 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3189 (async { 3356 (async {
3190 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3357 $Coro::current->{desc} = "IDLE BUG HANDLER";
3191 Event::one_event; 3358 EV::loop EV::LOOP_ONESHOT;
3192 })->prio (Coro::PRIO_MAX); 3359 })->prio (Coro::PRIO_MAX);
3193 }; 3360 };
3194 3361
3195 reload_config; 3362 reload_config;
3196 db_init; 3363 db_init;
3197 load_extensions; 3364 load_extensions;
3198 3365
3199 $TICK_WATCHER->start; 3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start IO::AIO::poll_fileno;
3200 Event::loop; 3368 EV::loop;
3201} 3369}
3202 3370
3203############################################################################# 3371#############################################################################
3204# initialisation and cleanup 3372# initialisation and cleanup
3205 3373
3206# install some emergency cleanup handlers 3374# install some emergency cleanup handlers
3207BEGIN { 3375BEGIN {
3376 our %SIGWATCHER = ();
3208 for my $signal (qw(INT HUP TERM)) { 3377 for my $signal (qw(INT HUP TERM)) {
3209 Event->signal ( 3378 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3210 reentrant => 0,
3211 data => WF_AUTOCANCEL,
3212 signal => $signal,
3213 prio => 0,
3214 cb => sub {
3215 cf::cleanup "SIG$signal"; 3379 cf::cleanup "SIG$signal";
3216 },
3217 ); 3380 };
3218 } 3381 }
3219} 3382}
3220 3383
3221sub write_runtime { 3384sub write_runtime {
3222 my $runtime = "$LOCALDIR/runtime"; 3385 my $runtime = "$LOCALDIR/runtime";
… …
3267 # and maps saved/destroyed asynchronously. 3430 # and maps saved/destroyed asynchronously.
3268 warn "begin emergency player save\n"; 3431 warn "begin emergency player save\n";
3269 for my $login (keys %cf::PLAYER) { 3432 for my $login (keys %cf::PLAYER) {
3270 my $pl = $cf::PLAYER{$login} or next; 3433 my $pl = $cf::PLAYER{$login} or next;
3271 $pl->valid or next; 3434 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3272 $pl->save; 3436 $pl->save;
3273 } 3437 }
3274 warn "end emergency player save\n"; 3438 warn "end emergency player save\n";
3275 3439
3276 warn "begin emergency map save\n"; 3440 warn "begin emergency map save\n";
… …
3315 warn "syncing database to disk"; 3479 warn "syncing database to disk";
3316 BDB::db_env_txn_checkpoint $DB_ENV; 3480 BDB::db_env_txn_checkpoint $DB_ENV;
3317 3481
3318 # if anything goes wrong in here, we should simply crash as we already saved 3482 # if anything goes wrong in here, we should simply crash as we already saved
3319 3483
3320 warn "cancelling all WF_AUTOCANCEL watchers";
3321 for (Event::all_watchers) {
3322 $_->cancel if $_->data & WF_AUTOCANCEL;
3323 }
3324
3325 warn "flushing outstanding aio requests"; 3484 warn "flushing outstanding aio requests";
3326 for (;;) { 3485 for (;;) {
3327 BDB::flush; 3486 BDB::flush;
3328 IO::AIO::flush; 3487 IO::AIO::flush;
3329 Coro::cede; 3488 Coro::cede_notself;
3330 last unless IO::AIO::nreqs || BDB::nreqs; 3489 last unless IO::AIO::nreqs || BDB::nreqs;
3331 warn "iterate..."; 3490 warn "iterate...";
3332 } 3491 }
3333 3492
3334 ++$RELOAD; 3493 ++$RELOAD;
… …
3410 warn "leaving sync_job"; 3569 warn "leaving sync_job";
3411 3570
3412 1 3571 1
3413 } or do { 3572 } or do {
3414 warn $@; 3573 warn $@;
3415 warn "error while reloading, exiting."; 3574 cf::cleanup "error while reloading, exiting.";
3416 exit 1;
3417 }; 3575 };
3418 3576
3419 warn "reloaded"; 3577 warn "reloaded";
3420}; 3578};
3421 3579
… …
3423 3581
3424sub reload_perl() { 3582sub reload_perl() {
3425 # doing reload synchronously and two reloads happen back-to-back, 3583 # doing reload synchronously and two reloads happen back-to-back,
3426 # coro crashes during coro_state_free->destroy here. 3584 # coro crashes during coro_state_free->destroy here.
3427 3585
3428 $RELOAD_WATCHER ||= Event->timer ( 3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3429 reentrant => 0,
3430 after => 0,
3431 data => WF_AUTOCANCEL,
3432 cb => sub {
3433 do_reload_perl; 3587 do_reload_perl;
3434 undef $RELOAD_WATCHER; 3588 undef $RELOAD_WATCHER;
3435 },
3436 ); 3589 };
3437} 3590}
3438 3591
3439register_command "reload" => sub { 3592register_command "reload" => sub {
3440 my ($who, $arg) = @_; 3593 my ($who, $arg) = @_;
3441 3594
… …
3454 3607
3455our @WAIT_FOR_TICK; 3608our @WAIT_FOR_TICK;
3456our @WAIT_FOR_TICK_BEGIN; 3609our @WAIT_FOR_TICK_BEGIN;
3457 3610
3458sub wait_for_tick { 3611sub wait_for_tick {
3459 return unless $TICK_WATCHER->is_active; 3612 return if tick_inhibit;
3460 return if $Coro::current == $Coro::main; 3613 return if $Coro::current == $Coro::main;
3461 3614
3462 my $signal = new Coro::Signal; 3615 my $signal = new Coro::Signal;
3463 push @WAIT_FOR_TICK, $signal; 3616 push @WAIT_FOR_TICK, $signal;
3464 $signal->wait; 3617 $signal->wait;
3465} 3618}
3466 3619
3467sub wait_for_tick_begin { 3620sub wait_for_tick_begin {
3468 return unless $TICK_WATCHER->is_active; 3621 return if tick_inhibit;
3469 return if $Coro::current == $Coro::main; 3622 return if $Coro::current == $Coro::main;
3470 3623
3471 my $signal = new Coro::Signal; 3624 my $signal = new Coro::Signal;
3472 push @WAIT_FOR_TICK_BEGIN, $signal; 3625 push @WAIT_FOR_TICK_BEGIN, $signal;
3473 $signal->wait; 3626 $signal->wait;
3474} 3627}
3475 3628
3476$TICK_WATCHER = Event->timer ( 3629sub tick {
3477 reentrant => 0,
3478 parked => 1,
3479 prio => 0,
3480 at => $NEXT_TICK || $TICK,
3481 data => WF_AUTOCANCEL,
3482 cb => sub {
3483 if ($Coro::current != $Coro::main) { 3630 if ($Coro::current != $Coro::main) {
3484 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3631 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3485 unless ++$bug_warning > 10; 3632 unless ++$bug_warning > 10;
3486 return; 3633 return;
3487 } 3634 }
3488 3635
3489 $NOW = $tick_start = Event::time;
3490
3491 cf::server_tick; # one server iteration 3636 cf::server_tick; # one server iteration
3492 3637
3493 $RUNTIME += $TICK;
3494 $NEXT_TICK += $TICK;
3495
3496 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3638 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3497 $NEXT_RUNTIME_WRITE = $NOW + 10; 3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3498 Coro::async_pool { 3640 Coro::async_pool {
3499 $Coro::current->{desc} = "runtime saver"; 3641 $Coro::current->{desc} = "runtime saver";
3500 write_runtime 3642 write_runtime
3501 or warn "ERROR: unable to write runtime file: $!"; 3643 or warn "ERROR: unable to write runtime file: $!";
3502 };
3503 } 3644 };
3645 }
3504 3646
3505 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3506 $sig->send; 3648 $sig->send;
3507 } 3649 }
3508 while (my $sig = shift @WAIT_FOR_TICK) { 3650 while (my $sig = shift @WAIT_FOR_TICK) {
3509 $sig->send; 3651 $sig->send;
3510 } 3652 }
3511 3653
3512 $NOW = Event::time; 3654 $LOAD = ($NOW - $TICK_START) / $TICK;
3513
3514 # if we are delayed by four ticks or more, skip them all
3515 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3516
3517 $TICK_WATCHER->at ($NEXT_TICK);
3518 $TICK_WATCHER->start;
3519
3520 $LOAD = ($NOW - $tick_start) / $TICK;
3521 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3655 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3522 3656
3523 _post_tick; 3657 if (0) {
3658 if ($NEXT_TICK) {
3659 my $jitter = $TICK_START - $NEXT_TICK;
3660 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3661 warn "jitter $JITTER\n";#d#
3662 }
3524 }, 3663 }
3525); 3664}
3526 3665
3527{ 3666{
3667 # configure BDB
3668
3528 BDB::min_parallel 8; 3669 BDB::min_parallel 8;
3529 BDB::max_poll_time $TICK * 0.1; 3670 BDB::max_poll_reqs $TICK * 0.1;
3530 $BDB_POLL_WATCHER = Event->io ( 3671 $Coro::BDB::WATCHER->priority (1);
3531 reentrant => 0,
3532 fd => BDB::poll_fileno,
3533 poll => 'r',
3534 prio => 0,
3535 data => WF_AUTOCANCEL,
3536 cb => \&BDB::poll_cb,
3537 );
3538
3539 BDB::set_sync_prepare {
3540 my $status;
3541 my $current = $Coro::current;
3542 (
3543 sub {
3544 $status = $!;
3545 $current->ready; undef $current;
3546 },
3547 sub {
3548 Coro::schedule while defined $current;
3549 $! = $status;
3550 },
3551 )
3552 };
3553 3672
3554 unless ($DB_ENV) { 3673 unless ($DB_ENV) {
3555 $DB_ENV = BDB::db_env_create; 3674 $DB_ENV = BDB::db_env_create;
3556 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3557 | BDB::LOG_AUTOREMOVE, 1); 3676 | BDB::LOG_AUTOREMOVE, 1);
… …
3572 3691
3573 cf::cleanup "db_env_open(db): $@" if $@; 3692 cf::cleanup "db_env_open(db): $@" if $@;
3574 }; 3693 };
3575 } 3694 }
3576 3695
3577 $BDB_DEADLOCK_WATCHER = Event->timer ( 3696 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3578 after => 3,
3579 interval => 1,
3580 hard => 1,
3581 prio => 0,
3582 data => WF_AUTOCANCEL,
3583 cb => sub {
3584 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3697 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3585 },
3586 ); 3698 };
3587 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3699 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3588 after => 11,
3589 interval => 60,
3590 hard => 1,
3591 prio => 0,
3592 data => WF_AUTOCANCEL,
3593 cb => sub {
3594 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3700 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3595 },
3596 ); 3701 };
3597 $BDB_TRICKLE_WATCHER = Event->timer ( 3702 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3598 after => 5,
3599 interval => 10,
3600 hard => 1,
3601 prio => 0,
3602 data => WF_AUTOCANCEL,
3603 cb => sub {
3604 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3703 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3605 },
3606 ); 3704 };
3607} 3705}
3608 3706
3609{ 3707{
3708 # configure IO::AIO
3709
3610 IO::AIO::min_parallel 8; 3710 IO::AIO::min_parallel 8;
3611
3612 undef $Coro::AIO::WATCHER;
3613 IO::AIO::max_poll_time $TICK * 0.1; 3711 IO::AIO::max_poll_time $TICK * 0.1;
3614 $AIO_POLL_WATCHER = Event->io ( 3712 $Coro::AIO::WATCHER->priority (1);
3615 reentrant => 0,
3616 data => WF_AUTOCANCEL,
3617 fd => IO::AIO::poll_fileno,
3618 poll => 'r',
3619 prio => 6,
3620 cb => \&IO::AIO::poll_cb,
3621 );
3622} 3713}
3623 3714
3624my $_log_backtrace; 3715my $_log_backtrace;
3625 3716
3626sub _log_backtrace { 3717sub _log_backtrace {

Diff Legend

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