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.379 by root, Thu Oct 4 23:59:07 2007 UTC vs.
Revision 1.416 by root, Fri Apr 11 13:59:06 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.50 ();
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 LOG llevError | logBacktrace, Carp::longmess "sync job";#d# 476 LOG llevError, Carp::longmess "sync job";#d#
433 477
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 478 my $freeze_guard = freeze_mainloop;
437 479
438 my $busy = 1; 480 my $busy = 1;
439 my @res; 481 my @res;
440 482
444 warn $@ if $@; 486 warn $@ if $@;
445 undef $busy; 487 undef $busy;
446 })->prio (Coro::PRIO_MAX); 488 })->prio (Coro::PRIO_MAX);
447 489
448 while ($busy) { 490 while ($busy) {
449 Coro::cede or Event::one_event; 491 if (Coro::nready) {
492 Coro::cede_notself;
493 } else {
494 EV::loop EV::LOOP_ONESHOT;
450 } 495 }
496 }
451 497
452 $time = Event::time - $time; 498 my $time = EV::time - $time;
453 499
454 LOG llevError | logBacktrace, Carp::longmess "long sync job"
455 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
456
457 $tick_start += $time; # do not account sync jobs to server load 500 $TICK_START += $time; # do not account sync jobs to server load
458 501
459 wantarray ? @res : $res[0] 502 wantarray ? @res : $res[0]
460 } else { 503 } else {
461 # we are in another coroutine, how wonderful, everything just works 504 # we are in another coroutine, how wonderful, everything just works
462 505
487=item fork_call { }, $args 530=item fork_call { }, $args
488 531
489Executes the given code block with the given arguments in a seperate 532Executes the given code block with the given arguments in a seperate
490process, returning the results. Everything must be serialisable with 533process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may 534Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling. 535never block itself or use any form of event handling.
493 536
494=cut 537=cut
495 538
496sub fork_call(&@) { 539sub fork_call(&@) {
497 my ($cb, @args) = @_; 540 my ($cb, @args) = @_;
504 reset_signals; 547 reset_signals;
505 &$cb 548 &$cb
506 }, @args; 549 }, @args;
507 550
508 wantarray ? @res : $res[-1] 551 wantarray ? @res : $res[-1]
552}
553
554=item $coin = coin_from_name $name
555
556=cut
557
558our %coin_alias = (
559 "silver" => "silvercoin",
560 "silvercoin" => "silvercoin",
561 "silvercoins" => "silvercoin",
562 "gold" => "goldcoin",
563 "goldcoin" => "goldcoin",
564 "goldcoins" => "goldcoin",
565 "platinum" => "platinacoin",
566 "platinumcoin" => "platinacoin",
567 "platinumcoins" => "platinacoin",
568 "platina" => "platinacoin",
569 "platinacoin" => "platinacoin",
570 "platinacoins" => "platinacoin",
571 "royalty" => "royalty",
572 "royalties" => "royalty",
573);
574
575sub coin_from_name($) {
576 $coin_alias{$_[0]}
577 ? cf::arch::find $coin_alias{$_[0]}
578 : undef
509} 579}
510 580
511=item $value = cf::db_get $family => $key 581=item $value = cf::db_get $family => $key
512 582
513Returns a single value from the environment database. 583Returns a single value from the environment database.
658attach callbacks/event handlers (a collection of which is called an "attachment") 728attach callbacks/event handlers (a collection of which is called an "attachment")
659to it. All such attachable objects support the following methods. 729to it. All such attachable objects support the following methods.
660 730
661In the following description, CLASS can be any of C<global>, C<object> 731In the following description, CLASS can be any of C<global>, C<object>
662C<player>, C<client> or C<map> (i.e. the attachable objects in 732C<player>, C<client> or C<map> (i.e. the attachable objects in
663Crossfire TRT). 733Deliantra).
664 734
665=over 4 735=over 4
666 736
667=item $attachable->attach ($attachment, key => $value...) 737=item $attachable->attach ($attachment, key => $value...)
668 738
950 } 1020 }
951 1021
952 0 1022 0
953} 1023}
954 1024
955=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1025=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
956 1026
957=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
958 1028
959Generate an object-specific event with the given arguments. 1029Generate an object-specific event with the given arguments.
960 1030
966 1036
967=cut 1037=cut
968 1038
969############################################################################# 1039#############################################################################
970# object support 1040# object support
971#
972 1041
1042sub _object_equal($$);
1043sub _object_equal($$) {
1044 my ($a, $b) = @_;
1045
1046 return 0 unless (ref $a) eq (ref $b);
1047
1048 if ("HASH" eq ref $a) {
1049 my @ka = keys %$a;
1050 my @kb = keys %$b;
1051
1052 return 0 if @ka != @kb;
1053
1054 for (0 .. $#ka) {
1055 return 0 unless $ka[$_] eq $kb[$_];
1056 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1057 }
1058
1059 } elsif ("ARRAY" eq ref $a) {
1060
1061 return 0 if @$a != @$b;
1062
1063 for (0 .. $#$a) {
1064 return 0 unless _object_equal $a->[$_], $b->[$_];
1065 }
1066
1067 } elsif ($a ne $b) {
1068 return 0;
1069 }
1070
1071 1
1072}
1073
1074our $SLOW_MERGES;#d#
973sub _can_merge { 1075sub _can_merge {
974 my ($ob1, $ob2) = @_; 1076 my ($ob1, $ob2) = @_;
975 1077
976 local $Storable::canonical = 1; 1078 ++$SLOW_MERGES;#d#
977 my $fob1 = Storable::freeze $ob1;
978 my $fob2 = Storable::freeze $ob2;
979 1079
980 $fob1 eq $fob2 1080 # we do the slow way here
1081 return _object_equal $ob1, $ob2
981} 1082}
982 1083
983sub reattach { 1084sub reattach {
984 # basically do the same as instantiate, without calling instantiate 1085 # basically do the same as instantiate, without calling instantiate
985 my ($obj) = @_; 1086 my ($obj) = @_;
1007cf::attachable->attach ( 1108cf::attachable->attach (
1008 prio => -1000000, 1109 prio => -1000000,
1009 on_instantiate => sub { 1110 on_instantiate => sub {
1010 my ($obj, $data) = @_; 1111 my ($obj, $data) = @_;
1011 1112
1012 $data = from_json $data; 1113 $data = decode_json $data;
1013 1114
1014 for (@$data) { 1115 for (@$data) {
1015 my ($name, $args) = @$_; 1116 my ($name, $args) = @$_;
1016 1117
1017 $obj->attach ($name, %{$args || {} }); 1118 $obj->attach ($name, %{$args || {} });
1046 close $fh; 1147 close $fh;
1047 1148
1048 if (@$objs) { 1149 if (@$objs) {
1049 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1150 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1151 chmod SAVE_MODE, $fh;
1051 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1052 aio_write $fh, 0, (length $data), $data, 0; 1153 aio_write $fh, 0, (length $data), $data, 0;
1053 aio_fsync $fh if $cf::USE_FSYNC; 1154 aio_fsync $fh if $cf::USE_FSYNC;
1054 close $fh; 1155 close $fh;
1055 aio_rename "$filename.pst~", "$filename.pst"; 1156 aio_rename "$filename.pst~", "$filename.pst";
1056 } 1157 }
1087 1188
1088 unless (aio_stat "$filename.pst") { 1189 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1190 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1191 or return;
1091 1192
1092 $av = eval { (Storable::thaw $av)->{objs} }; 1193 my $st = eval { Coro::Storable::thaw $av };
1194 $av = $st->{objs};
1093 } 1195 }
1094 1196
1095 utf8::decode (my $decname = $filename); 1197 utf8::decode (my $decname = $filename);
1096 warn sprintf "loading %s (%d,%d)\n", 1198 warn sprintf "loading %s (%d,%d)\n",
1097 $decname, length $data, scalar @{$av || []}; 1199 $decname, length $data, scalar @{$av || []};
1253 my $msg = $@ ? "$v->{path}: $@\n" 1355 my $msg = $@ ? "$v->{path}: $@\n"
1254 : "$v->{base}: extension inactive.\n"; 1356 : "$v->{base}: extension inactive.\n";
1255 1357
1256 if (exists $v->{meta}{mandatory}) { 1358 if (exists $v->{meta}{mandatory}) {
1257 warn $msg; 1359 warn $msg;
1258 warn "mandatory extension failed to load, exiting.\n"; 1360 cf::cleanup "mandatory extension failed to load, exiting.";
1259 exit 1;
1260 } 1361 }
1261 1362
1262 warn $msg; 1363 warn $msg;
1263 } 1364 }
1264 1365
1512 1613
1513Expand crossfire pod fragments into protocol xml. 1614Expand crossfire pod fragments into protocol xml.
1514 1615
1515=cut 1616=cut
1516 1617
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1517sub expand_cfpod { 1629sub expand_cfpod {
1518 ((my $self), (local $_)) = @_; 1630 my ($self, $pod) = @_;
1519 1631
1520 # escape & and < 1632 my $xml;
1521 s/&/&amp;/g;
1522 s/(?<![BIUGHT])</&lt;/g;
1523 1633
1524 # this is buggy, it needs to properly take care of nested <'s 1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1525 1637
1526 1 while 1638 $group =~ s/&/&amp;/g;
1527 # replace B<>, I<>, U<> etc. 1639 $group =~ s/</&lt;/g;
1528 s/B<([^\>]*)>/<b>$1<\/b>/ 1640
1529 || s/I<([^\>]*)>/<i>$1<\/i>/ 1641 $xml .= $group;
1530 || s/U<([^\>]*)>/<u>$1<\/u>/ 1642 } elsif ($pod =~ m%\G
1531 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1643 ([BCGHITU])
1532 # replace G<male|female> tags 1644 <
1533 || s{G<([^>|]*)\|([^>]*)>}{ 1645 (?:
1534 $self->gender ? $2 : $1 1646 ([^<>]*) (?{ $group = $^N })
1535 }ge 1647 | < $interior >
1536 # replace H<hint text> 1648 )
1537 || s{H<([^\>]*)>} 1649 >
1650 %gcsx
1538 { 1651 ) {
1652 my ($code, $data) = ($1, $group);
1653
1654 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662 } elsif ($code eq "T") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664 } elsif ($code eq "G") {
1665 my ($male, $female) = split /\|/, $data;
1666 $data = $self->gender ? $female : $male;
1667 $xml .= expand_cfpod ($self, $data);
1668 } elsif ($code eq "H") {
1539 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1540 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1541 "") 1671 "")
1542 [$self->{hintmode}] 1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1543 }ge; 1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1544 1683
1684 for ($xml) {
1545 # create single paragraphs (very hackish) 1685 # create single paragraphs (very hackish)
1546 s/(?<=\S)\n(?=\w)/ /g; 1686 s/(?<=\S)\n(?=\w)/ /g;
1547 1687
1548 # compress some whitespace 1688 # compress some whitespace
1549 s/\s+\n/\n/g; # ws line-ends 1689 s/\s+\n/\n/g; # ws line-ends
1550 s/\n\n+/\n/g; # double lines 1690 s/\n\n+/\n/g; # double lines
1551 s/^\n+//; # beginning lines 1691 s/^\n+//; # beginning lines
1552 s/\n+$//; # ending lines 1692 s/\n+$//; # ending lines
1693 }
1553 1694
1554 $_ 1695 $xml
1555} 1696}
1697
1698no re 'eval';
1556 1699
1557sub hintmode { 1700sub hintmode {
1558 $_[0]{hintmode} = $_[1] if @_ > 1; 1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1559 $_[0]{hintmode} 1702 $_[0]{hintmode}
1560} 1703}
2234 : () 2377 : ()
2235 } @{ aio_readdir $UNIQUEDIR or [] } 2378 } @{ aio_readdir $UNIQUEDIR or [] }
2236 ] 2379 ]
2237} 2380}
2238 2381
2239package cf;
2240
2241=back 2382=back
2242 2383
2243=head3 cf::object 2384=head3 cf::object
2244 2385
2245=cut 2386=cut
2547 $rmp->{origin_y} = $exit->y; 2688 $rmp->{origin_y} = $exit->y;
2548 } 2689 }
2549 2690
2550 $rmp->{random_seed} ||= $exit->random_seed; 2691 $rmp->{random_seed} ||= $exit->random_seed;
2551 2692
2552 my $data = cf::to_json $rmp; 2693 my $data = cf::encode_json $rmp;
2553 my $md5 = Digest::MD5::md5_hex $data; 2694 my $md5 = Digest::MD5::md5_hex $data;
2554 my $meta = "$RANDOMDIR/$md5.meta"; 2695 my $meta = "$RANDOMDIR/$md5.meta";
2555 2696
2556 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2697 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2557 aio_write $fh, 0, (length $data), $data, 0; 2698 aio_write $fh, 0, (length $data), $data, 0;
2630the message, with C<log> being the default. If C<$color> is negative, suppress 2771the message, with C<log> being the default. If C<$color> is negative, suppress
2631the message unless the client supports the msg packet. 2772the message unless the client supports the msg packet.
2632 2773
2633=cut 2774=cut
2634 2775
2776# non-persistent channels (usually the info channel)
2635our %CHANNEL = ( 2777our %CHANNEL = (
2636 "c/identify" => { 2778 "c/identify" => {
2637 id => "infobox", 2779 id => "infobox",
2638 title => "Identify", 2780 title => "Identify",
2639 reply => undef, 2781 reply => undef,
2643 id => "infobox", 2785 id => "infobox",
2644 title => "Examine", 2786 title => "Examine",
2645 reply => undef, 2787 reply => undef,
2646 tooltip => "Signs and other items you examined", 2788 tooltip => "Signs and other items you examined",
2647 }, 2789 },
2790 "c/book" => {
2791 id => "infobox",
2792 title => "Book",
2793 reply => undef,
2794 tooltip => "The contents of a note or book",
2795 },
2648 "c/lookat" => { 2796 "c/lookat" => {
2649 id => "infobox", 2797 id => "infobox",
2650 title => "Look", 2798 title => "Look",
2651 reply => undef, 2799 reply => undef,
2652 tooltip => "What you saw there", 2800 tooltip => "What you saw there",
2801 },
2802 "c/who" => {
2803 id => "infobox",
2804 title => "Players",
2805 reply => undef,
2806 tooltip => "Shows players who are currently online",
2807 },
2808 "c/body" => {
2809 id => "infobox",
2810 title => "Body Parts",
2811 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available",
2813 },
2814 "c/uptime" => {
2815 id => "infobox",
2816 title => "Uptime",
2817 reply => undef,
2818 tooltip => "How long the server has been running since last restart",
2819 },
2820 "c/mapinfo" => {
2821 id => "infobox",
2822 title => "Map Info",
2823 reply => undef,
2824 tooltip => "Information related to the maps",
2653 }, 2825 },
2654); 2826);
2655 2827
2656sub cf::client::send_msg { 2828sub cf::client::send_msg {
2657 my ($self, $channel, $msg, $color, @extra) = @_; 2829 my ($self, $channel, $msg, $color, @extra) = @_;
2894=pod 3066=pod
2895 3067
2896The following functions and methods are available within a safe environment: 3068The following functions and methods are available within a safe environment:
2897 3069
2898 cf::object 3070 cf::object
2899 contr pay_amount pay_player map x y force_find force_add 3071 contr pay_amount pay_player map x y force_find force_add destroy
2900 insert remove name archname title slaying race decrease_ob_nr 3072 insert remove name archname title slaying race decrease_ob_nr
2901 3073
2902 cf::object::player 3074 cf::object::player
2903 player 3075 player
2904 3076
2911=cut 3083=cut
2912 3084
2913for ( 3085for (
2914 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3086 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2915 insert remove inv name archname title slaying race 3087 insert remove inv name archname title slaying race
2916 decrease_ob_nr)], 3088 decrease_ob_nr destroy)],
2917 ["cf::object::player" => qw(player)], 3089 ["cf::object::player" => qw(player)],
2918 ["cf::player" => qw(peaceful)], 3090 ["cf::player" => qw(peaceful)],
2919 ["cf::map" => qw(trigger)], 3091 ["cf::map" => qw(trigger)],
2920) { 3092) {
2921 no strict 'refs'; 3093 no strict 'refs';
3026 { 3198 {
3027 my $faces = $facedata->{faceinfo}; 3199 my $faces = $facedata->{faceinfo};
3028 3200
3029 while (my ($face, $info) = each %$faces) { 3201 while (my ($face, $info) = each %$faces) {
3030 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3202 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3203
3031 cf::face::set_visibility $idx, $info->{visibility}; 3204 cf::face::set_visibility $idx, $info->{visibility};
3032 cf::face::set_magicmap $idx, $info->{magicmap}; 3205 cf::face::set_magicmap $idx, $info->{magicmap};
3033 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3206 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3034 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3207 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3035 3208
3036 cf::cede_to_tick; 3209 cf::cede_to_tick;
3037 } 3210 }
3038 3211
3039 while (my ($face, $info) = each %$faces) { 3212 while (my ($face, $info) = each %$faces) {
3040 next unless $info->{smooth}; 3213 next unless $info->{smooth};
3214
3041 my $idx = cf::face::find $face 3215 my $idx = cf::face::find $face
3042 or next; 3216 or next;
3217
3043 if (my $smooth = cf::face::find $info->{smooth}) { 3218 if (my $smooth = cf::face::find $info->{smooth}) {
3044 cf::face::set_smooth $idx, $smooth; 3219 cf::face::set_smooth $idx, $smooth;
3045 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3220 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3046 } else { 3221 } else {
3047 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3222 warn "smooth face '$info->{smooth}' not found for face '$face'";
3065 { 3240 {
3066 # TODO: for gcfclient pleasure, we should give resources 3241 # TODO: for gcfclient pleasure, we should give resources
3067 # that gcfclient doesn't grok a >10000 face index. 3242 # that gcfclient doesn't grok a >10000 face index.
3068 my $res = $facedata->{resource}; 3243 my $res = $facedata->{resource};
3069 3244
3070 my $soundconf = delete $res->{"res/sound.conf"};
3071
3072 while (my ($name, $info) = each %$res) { 3245 while (my ($name, $info) = each %$res) {
3246 if (defined $info->{type}) {
3073 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3247 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3074 my $data; 3248 my $data;
3075 3249
3076 if ($info->{type} & 1) { 3250 if ($info->{type} & 1) {
3077 # prepend meta info 3251 # prepend meta info
3078 3252
3079 my $meta = $enc->encode ({ 3253 my $meta = $enc->encode ({
3080 name => $name, 3254 name => $name,
3081 %{ $info->{meta} || {} }, 3255 %{ $info->{meta} || {} },
3082 }); 3256 });
3083 3257
3084 $data = pack "(w/a*)*", $meta, $info->{data}; 3258 $data = pack "(w/a*)*", $meta, $info->{data};
3259 } else {
3260 $data = $info->{data};
3261 }
3262
3263 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3264 cf::face::set_type $idx, $info->{type};
3085 } else { 3265 } else {
3086 $data = $info->{data}; 3266 $RESOURCE{$name} = $info;
3087 } 3267 }
3088 3268
3089 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3090 cf::face::set_type $idx, $info->{type};
3091
3092 cf::cede_to_tick; 3269 cf::cede_to_tick;
3093 } 3270 }
3094
3095 if ($soundconf) {
3096 $soundconf = $enc->decode (delete $soundconf->{data});
3097
3098 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3099 my $sound = $soundconf->{compat}[$_]
3100 or next;
3101
3102 my $face = cf::face::find "sound/$sound->[1]";
3103 cf::sound::set $sound->[0] => $face;
3104 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3105 }
3106
3107 while (my ($k, $v) = each %{$soundconf->{event}}) {
3108 my $face = cf::face::find "sound/$v";
3109 cf::sound::set $k => $face;
3110 }
3111 }
3112 } 3271 }
3272
3273 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3113 3274
3114 1 3275 1
3115} 3276}
3277
3278cf::global->attach (on_resource_update => sub {
3279 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3280 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3281
3282 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3283 my $sound = $soundconf->{compat}[$_]
3284 or next;
3285
3286 my $face = cf::face::find "sound/$sound->[1]";
3287 cf::sound::set $sound->[0] => $face;
3288 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3289 }
3290
3291 while (my ($k, $v) = each %{$soundconf->{event}}) {
3292 my $face = cf::face::find "sound/$v";
3293 cf::sound::set $k => $face;
3294 }
3295 }
3296});
3116 3297
3117register_exticmd fx_want => sub { 3298register_exticmd fx_want => sub {
3118 my ($ns, $want) = @_; 3299 my ($ns, $want) = @_;
3119 3300
3120 while (my ($k, $v) = each %$want) { 3301 while (my ($k, $v) = each %$want) {
3175sub reload_config { 3356sub reload_config {
3176 open my $fh, "<:utf8", "$CONFDIR/config" 3357 open my $fh, "<:utf8", "$CONFDIR/config"
3177 or return; 3358 or return;
3178 3359
3179 local $/; 3360 local $/;
3180 *CFG = YAML::Syck::Load <$fh>; 3361 *CFG = YAML::Load <$fh>;
3181 3362
3182 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3363 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3183 3364
3184 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3365 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3185 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3366 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3197 # we must not ever block the main coroutine 3378 # we must not ever block the main coroutine
3198 local $Coro::idle = sub { 3379 local $Coro::idle = sub {
3199 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3380 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3200 (async { 3381 (async {
3201 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3382 $Coro::current->{desc} = "IDLE BUG HANDLER";
3202 Event::one_event; 3383 EV::loop EV::LOOP_ONESHOT;
3203 })->prio (Coro::PRIO_MAX); 3384 })->prio (Coro::PRIO_MAX);
3204 }; 3385 };
3205 3386
3206 reload_config; 3387 reload_config;
3207 db_init; 3388 db_init;
3208 load_extensions; 3389 load_extensions;
3209 3390
3210 $TICK_WATCHER->start; 3391 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3392 evthread_start IO::AIO::poll_fileno;
3211 Event::loop; 3393 EV::loop;
3212} 3394}
3213 3395
3214############################################################################# 3396#############################################################################
3215# initialisation and cleanup 3397# initialisation and cleanup
3216 3398
3217# install some emergency cleanup handlers 3399# install some emergency cleanup handlers
3218BEGIN { 3400BEGIN {
3401 our %SIGWATCHER = ();
3219 for my $signal (qw(INT HUP TERM)) { 3402 for my $signal (qw(INT HUP TERM)) {
3220 Event->signal ( 3403 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3221 reentrant => 0,
3222 data => WF_AUTOCANCEL,
3223 signal => $signal,
3224 prio => 0,
3225 cb => sub {
3226 cf::cleanup "SIG$signal"; 3404 cf::cleanup "SIG$signal";
3227 },
3228 ); 3405 };
3229 } 3406 }
3230} 3407}
3231 3408
3232sub write_runtime { 3409sub write_runtime {
3233 my $runtime = "$LOCALDIR/runtime"; 3410 my $runtime = "$LOCALDIR/runtime";
3263 and return; 3440 and return;
3264 3441
3265 warn "runtime file written.\n"; 3442 warn "runtime file written.\n";
3266 3443
3267 1 3444 1
3445}
3446
3447our $uuid_lock;
3448our $uuid_skip;
3449
3450sub write_uuid_sync($) {
3451 $uuid_skip ||= $_[0];
3452
3453 return if $uuid_lock;
3454 local $uuid_lock = 1;
3455
3456 my $uuid = "$LOCALDIR/uuid";
3457
3458 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3459 or return;
3460
3461 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3462 $uuid_skip = 0;
3463
3464 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3465 and return;
3466
3467 # always fsync - this file is important
3468 aio_fsync $fh
3469 and return;
3470
3471 close $fh
3472 or return;
3473
3474 aio_rename "$uuid~", $uuid
3475 and return;
3476
3477 warn "uuid file written ($value).\n";
3478
3479 1
3480
3481}
3482
3483sub write_uuid($$) {
3484 my ($skip, $sync) = @_;
3485
3486 $sync ? write_uuid_sync $skip
3487 : async { write_uuid_sync $skip };
3268} 3488}
3269 3489
3270sub emergency_save() { 3490sub emergency_save() {
3271 my $freeze_guard = cf::freeze_mainloop; 3491 my $freeze_guard = cf::freeze_mainloop;
3272 3492
3278 # and maps saved/destroyed asynchronously. 3498 # and maps saved/destroyed asynchronously.
3279 warn "begin emergency player save\n"; 3499 warn "begin emergency player save\n";
3280 for my $login (keys %cf::PLAYER) { 3500 for my $login (keys %cf::PLAYER) {
3281 my $pl = $cf::PLAYER{$login} or next; 3501 my $pl = $cf::PLAYER{$login} or next;
3282 $pl->valid or next; 3502 $pl->valid or next;
3503 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3283 $pl->save; 3504 $pl->save;
3284 } 3505 }
3285 warn "end emergency player save\n"; 3506 warn "end emergency player save\n";
3286 3507
3287 warn "begin emergency map save\n"; 3508 warn "begin emergency map save\n";
3293 warn "end emergency map save\n"; 3514 warn "end emergency map save\n";
3294 3515
3295 warn "begin emergency database checkpoint\n"; 3516 warn "begin emergency database checkpoint\n";
3296 BDB::db_env_txn_checkpoint $DB_ENV; 3517 BDB::db_env_txn_checkpoint $DB_ENV;
3297 warn "end emergency database checkpoint\n"; 3518 warn "end emergency database checkpoint\n";
3519
3520 warn "begin write uuid\n";
3521 write_uuid_sync 1;
3522 warn "end write uuid\n";
3298 }; 3523 };
3299 3524
3300 warn "leave emergency perl save\n"; 3525 warn "leave emergency perl save\n";
3301} 3526}
3302 3527
3326 warn "syncing database to disk"; 3551 warn "syncing database to disk";
3327 BDB::db_env_txn_checkpoint $DB_ENV; 3552 BDB::db_env_txn_checkpoint $DB_ENV;
3328 3553
3329 # if anything goes wrong in here, we should simply crash as we already saved 3554 # if anything goes wrong in here, we should simply crash as we already saved
3330 3555
3331 warn "cancelling all WF_AUTOCANCEL watchers";
3332 for (Event::all_watchers) {
3333 $_->cancel if $_->data & WF_AUTOCANCEL;
3334 }
3335
3336 warn "flushing outstanding aio requests"; 3556 warn "flushing outstanding aio requests";
3337 for (;;) { 3557 for (;;) {
3338 BDB::flush; 3558 BDB::flush;
3339 IO::AIO::flush; 3559 IO::AIO::flush;
3340 Coro::cede; 3560 Coro::cede_notself;
3341 last unless IO::AIO::nreqs || BDB::nreqs; 3561 last unless IO::AIO::nreqs || BDB::nreqs;
3342 warn "iterate..."; 3562 warn "iterate...";
3343 } 3563 }
3344 3564
3345 ++$RELOAD; 3565 ++$RELOAD;
3421 warn "leaving sync_job"; 3641 warn "leaving sync_job";
3422 3642
3423 1 3643 1
3424 } or do { 3644 } or do {
3425 warn $@; 3645 warn $@;
3426 warn "error while reloading, exiting."; 3646 cf::cleanup "error while reloading, exiting.";
3427 exit 1;
3428 }; 3647 };
3429 3648
3430 warn "reloaded"; 3649 warn "reloaded";
3431}; 3650};
3432 3651
3434 3653
3435sub reload_perl() { 3654sub reload_perl() {
3436 # doing reload synchronously and two reloads happen back-to-back, 3655 # doing reload synchronously and two reloads happen back-to-back,
3437 # coro crashes during coro_state_free->destroy here. 3656 # coro crashes during coro_state_free->destroy here.
3438 3657
3439 $RELOAD_WATCHER ||= Event->timer ( 3658 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3440 reentrant => 0,
3441 after => 0,
3442 data => WF_AUTOCANCEL,
3443 cb => sub {
3444 do_reload_perl; 3659 do_reload_perl;
3445 undef $RELOAD_WATCHER; 3660 undef $RELOAD_WATCHER;
3446 },
3447 ); 3661 };
3448} 3662}
3449 3663
3450register_command "reload" => sub { 3664register_command "reload" => sub {
3451 my ($who, $arg) = @_; 3665 my ($who, $arg) = @_;
3452 3666
3465 3679
3466our @WAIT_FOR_TICK; 3680our @WAIT_FOR_TICK;
3467our @WAIT_FOR_TICK_BEGIN; 3681our @WAIT_FOR_TICK_BEGIN;
3468 3682
3469sub wait_for_tick { 3683sub wait_for_tick {
3470 return unless $TICK_WATCHER->is_active; 3684 return if tick_inhibit;
3471 return if $Coro::current == $Coro::main; 3685 return if $Coro::current == $Coro::main;
3472 3686
3473 my $signal = new Coro::Signal; 3687 my $signal = new Coro::Signal;
3474 push @WAIT_FOR_TICK, $signal; 3688 push @WAIT_FOR_TICK, $signal;
3475 $signal->wait; 3689 $signal->wait;
3476} 3690}
3477 3691
3478sub wait_for_tick_begin { 3692sub wait_for_tick_begin {
3479 return unless $TICK_WATCHER->is_active; 3693 return if tick_inhibit;
3480 return if $Coro::current == $Coro::main; 3694 return if $Coro::current == $Coro::main;
3481 3695
3482 my $signal = new Coro::Signal; 3696 my $signal = new Coro::Signal;
3483 push @WAIT_FOR_TICK_BEGIN, $signal; 3697 push @WAIT_FOR_TICK_BEGIN, $signal;
3484 $signal->wait; 3698 $signal->wait;
3485} 3699}
3486 3700
3487$TICK_WATCHER = Event->timer ( 3701sub tick {
3488 reentrant => 0,
3489 parked => 1,
3490 prio => 0,
3491 at => $NEXT_TICK || $TICK,
3492 data => WF_AUTOCANCEL,
3493 cb => sub {
3494 if ($Coro::current != $Coro::main) { 3702 if ($Coro::current != $Coro::main) {
3495 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3703 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3496 unless ++$bug_warning > 10; 3704 unless ++$bug_warning > 10;
3497 return; 3705 return;
3498 } 3706 }
3499 3707
3500 $NOW = $tick_start = Event::time;
3501
3502 cf::server_tick; # one server iteration 3708 cf::server_tick; # one server iteration
3503 3709
3504 $RUNTIME += $TICK;
3505 $NEXT_TICK += $TICK;
3506
3507 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3710 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3508 $NEXT_RUNTIME_WRITE = $NOW + 10; 3711 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3509 Coro::async_pool { 3712 Coro::async_pool {
3510 $Coro::current->{desc} = "runtime saver"; 3713 $Coro::current->{desc} = "runtime saver";
3511 write_runtime 3714 write_runtime
3512 or warn "ERROR: unable to write runtime file: $!"; 3715 or warn "ERROR: unable to write runtime file: $!";
3513 };
3514 } 3716 };
3717 }
3515 3718
3516 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3719 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3517 $sig->send; 3720 $sig->send;
3518 } 3721 }
3519 while (my $sig = shift @WAIT_FOR_TICK) { 3722 while (my $sig = shift @WAIT_FOR_TICK) {
3520 $sig->send; 3723 $sig->send;
3521 } 3724 }
3522 3725
3523 $NOW = Event::time; 3726 $LOAD = ($NOW - $TICK_START) / $TICK;
3524
3525 # if we are delayed by four ticks or more, skip them all
3526 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3527
3528 $TICK_WATCHER->at ($NEXT_TICK);
3529 $TICK_WATCHER->start;
3530
3531 $LOAD = ($NOW - $tick_start) / $TICK;
3532 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3727 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3533 3728
3534 _post_tick; 3729 if (0) {
3730 if ($NEXT_TICK) {
3731 my $jitter = $TICK_START - $NEXT_TICK;
3732 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3733 warn "jitter $JITTER\n";#d#
3734 }
3535 }, 3735 }
3536); 3736}
3537 3737
3538{ 3738{
3739 # configure BDB
3740
3539 BDB::min_parallel 8; 3741 BDB::min_parallel 8;
3540 BDB::max_poll_time $TICK * 0.1; 3742 BDB::max_poll_reqs $TICK * 0.1;
3541 $BDB_POLL_WATCHER = Event->io ( 3743 $Coro::BDB::WATCHER->priority (1);
3542 reentrant => 0,
3543 fd => BDB::poll_fileno,
3544 poll => 'r',
3545 prio => 0,
3546 data => WF_AUTOCANCEL,
3547 cb => \&BDB::poll_cb,
3548 );
3549
3550 BDB::set_sync_prepare {
3551 my $status;
3552 my $current = $Coro::current;
3553 (
3554 sub {
3555 $status = $!;
3556 $current->ready; undef $current;
3557 },
3558 sub {
3559 Coro::schedule while defined $current;
3560 $! = $status;
3561 },
3562 )
3563 };
3564 3744
3565 unless ($DB_ENV) { 3745 unless ($DB_ENV) {
3566 $DB_ENV = BDB::db_env_create; 3746 $DB_ENV = BDB::db_env_create;
3567 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3747 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3568 | BDB::LOG_AUTOREMOVE, 1); 3748 | BDB::LOG_AUTOREMOVE, 1);
3583 3763
3584 cf::cleanup "db_env_open(db): $@" if $@; 3764 cf::cleanup "db_env_open(db): $@" if $@;
3585 }; 3765 };
3586 } 3766 }
3587 3767
3588 $BDB_DEADLOCK_WATCHER = Event->timer ( 3768 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3589 after => 3,
3590 interval => 1,
3591 hard => 1,
3592 prio => 0,
3593 data => WF_AUTOCANCEL,
3594 cb => sub {
3595 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3769 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3596 },
3597 ); 3770 };
3598 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3771 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3599 after => 11,
3600 interval => 60,
3601 hard => 1,
3602 prio => 0,
3603 data => WF_AUTOCANCEL,
3604 cb => sub {
3605 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3772 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3606 },
3607 ); 3773 };
3608 $BDB_TRICKLE_WATCHER = Event->timer ( 3774 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3609 after => 5,
3610 interval => 10,
3611 hard => 1,
3612 prio => 0,
3613 data => WF_AUTOCANCEL,
3614 cb => sub {
3615 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3775 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3616 },
3617 ); 3776 };
3618} 3777}
3619 3778
3620{ 3779{
3780 # configure IO::AIO
3781
3621 IO::AIO::min_parallel 8; 3782 IO::AIO::min_parallel 8;
3622
3623 undef $Coro::AIO::WATCHER;
3624 IO::AIO::max_poll_time $TICK * 0.1; 3783 IO::AIO::max_poll_time $TICK * 0.1;
3625 $AIO_POLL_WATCHER = Event->io ( 3784 $Coro::AIO::WATCHER->priority (1);
3626 reentrant => 0,
3627 data => WF_AUTOCANCEL,
3628 fd => IO::AIO::poll_fileno,
3629 poll => 'r',
3630 prio => 0,
3631 cb => \&IO::AIO::poll_cb,
3632 );
3633} 3785}
3634 3786
3635my $_log_backtrace; 3787my $_log_backtrace;
3636 3788
3637sub _log_backtrace { 3789sub _log_backtrace {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines