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.377 by root, Thu Oct 4 11:36:38 2007 UTC vs.
Revision 1.417 by root, Fri Apr 11 14:09:57 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 # 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) = @_;
502 reset_signals; 547 reset_signals;
503 &$cb 548 &$cb
504 }, @args; 549 }, @args;
505 550
506 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
507} 579}
508 580
509=item $value = cf::db_get $family => $key 581=item $value = cf::db_get $family => $key
510 582
511Returns a single value from the environment database. 583Returns a single value from the environment database.
656attach callbacks/event handlers (a collection of which is called an "attachment") 728attach callbacks/event handlers (a collection of which is called an "attachment")
657to it. All such attachable objects support the following methods. 729to it. All such attachable objects support the following methods.
658 730
659In 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>
660C<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
661Crossfire TRT). 733Deliantra).
662 734
663=over 4 735=over 4
664 736
665=item $attachable->attach ($attachment, key => $value...) 737=item $attachable->attach ($attachment, key => $value...)
666 738
948 } 1020 }
949 1021
950 0 1022 0
951} 1023}
952 1024
953=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1025=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
954 1026
955=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
956 1028
957Generate an object-specific event with the given arguments. 1029Generate an object-specific event with the given arguments.
958 1030
964 1036
965=cut 1037=cut
966 1038
967############################################################################# 1039#############################################################################
968# object support 1040# object support
969#
970 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#
971sub _can_merge { 1075sub _can_merge {
972 my ($ob1, $ob2) = @_; 1076 my ($ob1, $ob2) = @_;
973 1077
974 local $Storable::canonical = 1; 1078 ++$SLOW_MERGES;#d#
975 my $fob1 = Storable::freeze $ob1;
976 my $fob2 = Storable::freeze $ob2;
977 1079
978 $fob1 eq $fob2 1080 # we do the slow way here
1081 return _object_equal $ob1, $ob2
979} 1082}
980 1083
981sub reattach { 1084sub reattach {
982 # basically do the same as instantiate, without calling instantiate 1085 # basically do the same as instantiate, without calling instantiate
983 my ($obj) = @_; 1086 my ($obj) = @_;
1005cf::attachable->attach ( 1108cf::attachable->attach (
1006 prio => -1000000, 1109 prio => -1000000,
1007 on_instantiate => sub { 1110 on_instantiate => sub {
1008 my ($obj, $data) = @_; 1111 my ($obj, $data) = @_;
1009 1112
1010 $data = from_json $data; 1113 $data = decode_json $data;
1011 1114
1012 for (@$data) { 1115 for (@$data) {
1013 my ($name, $args) = @$_; 1116 my ($name, $args) = @$_;
1014 1117
1015 $obj->attach ($name, %{$args || {} }); 1118 $obj->attach ($name, %{$args || {} });
1044 close $fh; 1147 close $fh;
1045 1148
1046 if (@$objs) { 1149 if (@$objs) {
1047 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) {
1048 chmod SAVE_MODE, $fh; 1151 chmod SAVE_MODE, $fh;
1049 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1050 aio_write $fh, 0, (length $data), $data, 0; 1153 aio_write $fh, 0, (length $data), $data, 0;
1051 aio_fsync $fh if $cf::USE_FSYNC; 1154 aio_fsync $fh if $cf::USE_FSYNC;
1052 close $fh; 1155 close $fh;
1053 aio_rename "$filename.pst~", "$filename.pst"; 1156 aio_rename "$filename.pst~", "$filename.pst";
1054 } 1157 }
1085 1188
1086 unless (aio_stat "$filename.pst") { 1189 unless (aio_stat "$filename.pst") {
1087 (aio_load "$filename.pst", $av) >= 0 1190 (aio_load "$filename.pst", $av) >= 0
1088 or return; 1191 or return;
1089 1192
1090 $av = eval { (Storable::thaw $av)->{objs} }; 1193 my $st = eval { Coro::Storable::thaw $av };
1194 $av = $st->{objs};
1091 } 1195 }
1092 1196
1093 utf8::decode (my $decname = $filename); 1197 utf8::decode (my $decname = $filename);
1094 warn sprintf "loading %s (%d,%d)\n", 1198 warn sprintf "loading %s (%d,%d)\n",
1095 $decname, length $data, scalar @{$av || []}; 1199 $decname, length $data, scalar @{$av || []};
1251 my $msg = $@ ? "$v->{path}: $@\n" 1355 my $msg = $@ ? "$v->{path}: $@\n"
1252 : "$v->{base}: extension inactive.\n"; 1356 : "$v->{base}: extension inactive.\n";
1253 1357
1254 if (exists $v->{meta}{mandatory}) { 1358 if (exists $v->{meta}{mandatory}) {
1255 warn $msg; 1359 warn $msg;
1256 warn "mandatory extension failed to load, exiting.\n"; 1360 cf::cleanup "mandatory extension failed to load, exiting.";
1257 exit 1;
1258 } 1361 }
1259 1362
1260 warn $msg; 1363 warn $msg;
1261 } 1364 }
1262 1365
1510 1613
1511Expand crossfire pod fragments into protocol xml. 1614Expand crossfire pod fragments into protocol xml.
1512 1615
1513=cut 1616=cut
1514 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
1515sub expand_cfpod { 1629sub expand_cfpod {
1516 ((my $self), (local $_)) = @_; 1630 my ($self, $pod) = @_;
1517 1631
1518 # escape & and < 1632 my $xml;
1519 s/&/&amp;/g;
1520 s/(?<![BIUGHT])</&lt;/g;
1521 1633
1522 # this is buggy, it needs to properly take care of nested <'s 1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1523 1637
1524 1 while 1638 $group =~ s/&/&amp;/g;
1525 # replace B<>, I<>, U<> etc. 1639 $group =~ s/</&lt;/g;
1526 s/B<([^\>]*)>/<b>$1<\/b>/ 1640
1527 || s/I<([^\>]*)>/<i>$1<\/i>/ 1641 $xml .= $group;
1528 || s/U<([^\>]*)>/<u>$1<\/u>/ 1642 } elsif ($pod =~ m%\G
1529 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1643 ([BCGHITU])
1530 # replace G<male|female> tags 1644 <
1531 || s{G<([^>|]*)\|([^>]*)>}{ 1645 (?:
1532 $self->gender ? $2 : $1 1646 ([^<>]*) (?{ $group = $^N })
1533 }ge 1647 | < $interior >
1534 # replace H<hint text> 1648 )
1535 || s{H<([^\>]*)>} 1649 >
1650 %gcsx
1536 { 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") {
1537 ("<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>",
1538 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1539 "") 1671 "")
1540 [$self->{hintmode}] 1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1541 }ge; 1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1542 1683
1684 for ($xml) {
1543 # create single paragraphs (very hackish) 1685 # create single paragraphs (very hackish)
1544 s/(?<=\S)\n(?=\w)/ /g; 1686 s/(?<=\S)\n(?=\w)/ /g;
1545 1687
1546 # compress some whitespace 1688 # compress some whitespace
1547 s/\s+\n/\n/g; # ws line-ends 1689 s/\s+\n/\n/g; # ws line-ends
1548 s/\n\n+/\n/g; # double lines 1690 s/\n\n+/\n/g; # double lines
1549 s/^\n+//; # beginning lines 1691 s/^\n+//; # beginning lines
1550 s/\n+$//; # ending lines 1692 s/\n+$//; # ending lines
1693 }
1551 1694
1552 $_ 1695 $xml
1553} 1696}
1697
1698no re 'eval';
1554 1699
1555sub hintmode { 1700sub hintmode {
1556 $_[0]{hintmode} = $_[1] if @_ > 1; 1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1557 $_[0]{hintmode} 1702 $_[0]{hintmode}
1558} 1703}
2232 : () 2377 : ()
2233 } @{ aio_readdir $UNIQUEDIR or [] } 2378 } @{ aio_readdir $UNIQUEDIR or [] }
2234 ] 2379 ]
2235} 2380}
2236 2381
2237package cf;
2238
2239=back 2382=back
2240 2383
2241=head3 cf::object 2384=head3 cf::object
2242 2385
2243=cut 2386=cut
2272 2415
2273=cut 2416=cut
2274 2417
2275sub deref { 2418sub deref {
2276 my ($ref) = @_; 2419 my ($ref) = @_;
2277
2278 # temporary compatibility#TODO#remove
2279 $ref =~ s{^<}{player/<};
2280 2420
2281 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) { 2421 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2282 my ($uuid, $name) = ($1, $2); 2422 my ($uuid, $name) = ($1, $2);
2283 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2423 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2284 or return; 2424 or return;
2548 $rmp->{origin_y} = $exit->y; 2688 $rmp->{origin_y} = $exit->y;
2549 } 2689 }
2550 2690
2551 $rmp->{random_seed} ||= $exit->random_seed; 2691 $rmp->{random_seed} ||= $exit->random_seed;
2552 2692
2553 my $data = cf::to_json $rmp; 2693 my $data = cf::encode_json $rmp;
2554 my $md5 = Digest::MD5::md5_hex $data; 2694 my $md5 = Digest::MD5::md5_hex $data;
2555 my $meta = "$RANDOMDIR/$md5.meta"; 2695 my $meta = "$RANDOMDIR/$md5.meta";
2556 2696
2557 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2697 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2558 aio_write $fh, 0, (length $data), $data, 0; 2698 aio_write $fh, 0, (length $data), $data, 0;
2631the 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
2632the message unless the client supports the msg packet. 2772the message unless the client supports the msg packet.
2633 2773
2634=cut 2774=cut
2635 2775
2776# non-persistent channels (usually the info channel)
2636our %CHANNEL = ( 2777our %CHANNEL = (
2637 "c/identify" => { 2778 "c/identify" => {
2638 id => "infobox", 2779 id => "infobox",
2639 title => "Identify", 2780 title => "Identify",
2640 reply => undef, 2781 reply => undef,
2644 id => "infobox", 2785 id => "infobox",
2645 title => "Examine", 2786 title => "Examine",
2646 reply => undef, 2787 reply => undef,
2647 tooltip => "Signs and other items you examined", 2788 tooltip => "Signs and other items you examined",
2648 }, 2789 },
2790 "c/book" => {
2791 id => "infobox",
2792 title => "Book",
2793 reply => undef,
2794 tooltip => "The contents of a note or book",
2795 },
2649 "c/lookat" => { 2796 "c/lookat" => {
2650 id => "infobox", 2797 id => "infobox",
2651 title => "Look", 2798 title => "Look",
2652 reply => undef, 2799 reply => undef,
2653 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",
2654 }, 2825 },
2655); 2826);
2656 2827
2657sub cf::client::send_msg { 2828sub cf::client::send_msg {
2658 my ($self, $channel, $msg, $color, @extra) = @_; 2829 my ($self, $channel, $msg, $color, @extra) = @_;
2895=pod 3066=pod
2896 3067
2897The following functions and methods are available within a safe environment: 3068The following functions and methods are available within a safe environment:
2898 3069
2899 cf::object 3070 cf::object
2900 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
2901 insert remove name archname title slaying race decrease_ob_nr 3072 insert remove name archname title slaying race decrease_ob_nr
2902 3073
2903 cf::object::player 3074 cf::object::player
2904 player 3075 player
2905 3076
2912=cut 3083=cut
2913 3084
2914for ( 3085for (
2915 ["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
2916 insert remove inv name archname title slaying race 3087 insert remove inv name archname title slaying race
2917 decrease_ob_nr)], 3088 decrease_ob_nr destroy)],
2918 ["cf::object::player" => qw(player)], 3089 ["cf::object::player" => qw(player)],
2919 ["cf::player" => qw(peaceful)], 3090 ["cf::player" => qw(peaceful)],
2920 ["cf::map" => qw(trigger)], 3091 ["cf::map" => qw(trigger)],
2921) { 3092) {
2922 no strict 'refs'; 3093 no strict 'refs';
3027 { 3198 {
3028 my $faces = $facedata->{faceinfo}; 3199 my $faces = $facedata->{faceinfo};
3029 3200
3030 while (my ($face, $info) = each %$faces) { 3201 while (my ($face, $info) = each %$faces) {
3031 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3202 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3203
3032 cf::face::set_visibility $idx, $info->{visibility}; 3204 cf::face::set_visibility $idx, $info->{visibility};
3033 cf::face::set_magicmap $idx, $info->{magicmap}; 3205 cf::face::set_magicmap $idx, $info->{magicmap};
3034 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};
3035 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};
3036 3208
3037 cf::cede_to_tick; 3209 cf::cede_to_tick;
3038 } 3210 }
3039 3211
3040 while (my ($face, $info) = each %$faces) { 3212 while (my ($face, $info) = each %$faces) {
3041 next unless $info->{smooth}; 3213 next unless $info->{smooth};
3214
3042 my $idx = cf::face::find $face 3215 my $idx = cf::face::find $face
3043 or next; 3216 or next;
3217
3044 if (my $smooth = cf::face::find $info->{smooth}) { 3218 if (my $smooth = cf::face::find $info->{smooth}) {
3045 cf::face::set_smooth $idx, $smooth; 3219 cf::face::set_smooth $idx, $smooth;
3046 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3220 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3047 } else { 3221 } else {
3048 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3222 warn "smooth face '$info->{smooth}' not found for face '$face'";
3066 { 3240 {
3067 # TODO: for gcfclient pleasure, we should give resources 3241 # TODO: for gcfclient pleasure, we should give resources
3068 # that gcfclient doesn't grok a >10000 face index. 3242 # that gcfclient doesn't grok a >10000 face index.
3069 my $res = $facedata->{resource}; 3243 my $res = $facedata->{resource};
3070 3244
3071 my $soundconf = delete $res->{"res/sound.conf"};
3072
3073 while (my ($name, $info) = each %$res) { 3245 while (my ($name, $info) = each %$res) {
3246 if (defined $info->{type}) {
3074 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3247 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3075 my $data; 3248 my $data;
3076 3249
3077 if ($info->{type} & 1) { 3250 if ($info->{type} & 1) {
3078 # prepend meta info 3251 # prepend meta info
3079 3252
3080 my $meta = $enc->encode ({ 3253 my $meta = $enc->encode ({
3081 name => $name, 3254 name => $name,
3082 %{ $info->{meta} || {} }, 3255 %{ $info->{meta} || {} },
3083 }); 3256 });
3084 3257
3085 $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};
3086 } else { 3265 } else {
3087 $data = $info->{data}; 3266 $RESOURCE{$name} = $info;
3088 } 3267 }
3089 3268
3090 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3091 cf::face::set_type $idx, $info->{type};
3092
3093 cf::cede_to_tick; 3269 cf::cede_to_tick;
3094 } 3270 }
3095
3096 if ($soundconf) {
3097 $soundconf = $enc->decode (delete $soundconf->{data});
3098
3099 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3100 my $sound = $soundconf->{compat}[$_]
3101 or next;
3102
3103 my $face = cf::face::find "sound/$sound->[1]";
3104 cf::sound::set $sound->[0] => $face;
3105 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3106 }
3107
3108 while (my ($k, $v) = each %{$soundconf->{event}}) {
3109 my $face = cf::face::find "sound/$v";
3110 cf::sound::set $k => $face;
3111 }
3112 }
3113 } 3271 }
3272
3273 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3114 3274
3115 1 3275 1
3116} 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});
3117 3297
3118register_exticmd fx_want => sub { 3298register_exticmd fx_want => sub {
3119 my ($ns, $want) = @_; 3299 my ($ns, $want) = @_;
3120 3300
3121 while (my ($k, $v) = each %$want) { 3301 while (my ($k, $v) = each %$want) {
3176sub reload_config { 3356sub reload_config {
3177 open my $fh, "<:utf8", "$CONFDIR/config" 3357 open my $fh, "<:utf8", "$CONFDIR/config"
3178 or return; 3358 or return;
3179 3359
3180 local $/; 3360 local $/;
3181 *CFG = YAML::Syck::Load <$fh>; 3361 *CFG = YAML::Load <$fh>;
3182 3362
3183 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3363 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3184 3364
3185 $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};
3186 $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};
3198 # we must not ever block the main coroutine 3378 # we must not ever block the main coroutine
3199 local $Coro::idle = sub { 3379 local $Coro::idle = sub {
3200 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#
3201 (async { 3381 (async {
3202 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3382 $Coro::current->{desc} = "IDLE BUG HANDLER";
3203 Event::one_event; 3383 EV::loop EV::LOOP_ONESHOT;
3204 })->prio (Coro::PRIO_MAX); 3384 })->prio (Coro::PRIO_MAX);
3205 }; 3385 };
3206 3386
3207 reload_config; 3387 reload_config;
3208 db_init; 3388 db_init;
3209 load_extensions; 3389 load_extensions;
3210 3390
3211 $TICK_WATCHER->start; 3391 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3392 evthread_start IO::AIO::poll_fileno;
3212 Event::loop; 3393 EV::loop;
3213} 3394}
3214 3395
3215############################################################################# 3396#############################################################################
3216# initialisation and cleanup 3397# initialisation and cleanup
3217 3398
3218# install some emergency cleanup handlers 3399# install some emergency cleanup handlers
3219BEGIN { 3400BEGIN {
3401 our %SIGWATCHER = ();
3220 for my $signal (qw(INT HUP TERM)) { 3402 for my $signal (qw(INT HUP TERM)) {
3221 Event->signal ( 3403 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3222 reentrant => 0,
3223 data => WF_AUTOCANCEL,
3224 signal => $signal,
3225 prio => 0,
3226 cb => sub {
3227 cf::cleanup "SIG$signal"; 3404 cf::cleanup "SIG$signal";
3228 },
3229 ); 3405 };
3230 } 3406 }
3231} 3407}
3232 3408
3233sub write_runtime { 3409sub write_runtime_sync {
3234 my $runtime = "$LOCALDIR/runtime"; 3410 my $runtime = "$LOCALDIR/runtime";
3235 3411
3236 # first touch the runtime file to show we are still running: 3412 # first touch the runtime file to show we are still running:
3237 # the fsync below can take a very very long time. 3413 # the fsync below can take a very very long time.
3238 3414
3264 and return; 3440 and return;
3265 3441
3266 warn "runtime file written.\n"; 3442 warn "runtime file written.\n";
3267 3443
3268 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 };
3269} 3488}
3270 3489
3271sub emergency_save() { 3490sub emergency_save() {
3272 my $freeze_guard = cf::freeze_mainloop; 3491 my $freeze_guard = cf::freeze_mainloop;
3273 3492
3279 # and maps saved/destroyed asynchronously. 3498 # and maps saved/destroyed asynchronously.
3280 warn "begin emergency player save\n"; 3499 warn "begin emergency player save\n";
3281 for my $login (keys %cf::PLAYER) { 3500 for my $login (keys %cf::PLAYER) {
3282 my $pl = $cf::PLAYER{$login} or next; 3501 my $pl = $cf::PLAYER{$login} or next;
3283 $pl->valid or next; 3502 $pl->valid or next;
3503 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3284 $pl->save; 3504 $pl->save;
3285 } 3505 }
3286 warn "end emergency player save\n"; 3506 warn "end emergency player save\n";
3287 3507
3288 warn "begin emergency map save\n"; 3508 warn "begin emergency map save\n";
3294 warn "end emergency map save\n"; 3514 warn "end emergency map save\n";
3295 3515
3296 warn "begin emergency database checkpoint\n"; 3516 warn "begin emergency database checkpoint\n";
3297 BDB::db_env_txn_checkpoint $DB_ENV; 3517 BDB::db_env_txn_checkpoint $DB_ENV;
3298 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";
3299 }; 3523 };
3300 3524
3301 warn "leave emergency perl save\n"; 3525 warn "leave emergency perl save\n";
3302} 3526}
3303 3527
3318 warn "reloading..."; 3542 warn "reloading...";
3319 3543
3320 warn "entering sync_job"; 3544 warn "entering sync_job";
3321 3545
3322 cf::sync_job { 3546 cf::sync_job {
3323 cf::write_runtime; # external watchdog should not bark 3547 cf::write_runtime_sync; # external watchdog should not bark
3324 cf::emergency_save; 3548 cf::emergency_save;
3325 cf::write_runtime; # external watchdog should not bark 3549 cf::write_runtime_sync; # external watchdog should not bark
3326 3550
3327 warn "syncing database to disk"; 3551 warn "syncing database to disk";
3328 BDB::db_env_txn_checkpoint $DB_ENV; 3552 BDB::db_env_txn_checkpoint $DB_ENV;
3329 3553
3330 # 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
3331
3332 warn "cancelling all WF_AUTOCANCEL watchers";
3333 for (Event::all_watchers) {
3334 $_->cancel if $_->data & WF_AUTOCANCEL;
3335 }
3336 3555
3337 warn "flushing outstanding aio requests"; 3556 warn "flushing outstanding aio requests";
3338 for (;;) { 3557 for (;;) {
3339 BDB::flush; 3558 BDB::flush;
3340 IO::AIO::flush; 3559 IO::AIO::flush;
3341 Coro::cede; 3560 Coro::cede_notself;
3342 last unless IO::AIO::nreqs || BDB::nreqs; 3561 last unless IO::AIO::nreqs || BDB::nreqs;
3343 warn "iterate..."; 3562 warn "iterate...";
3344 } 3563 }
3345 3564
3346 ++$RELOAD; 3565 ++$RELOAD;
3422 warn "leaving sync_job"; 3641 warn "leaving sync_job";
3423 3642
3424 1 3643 1
3425 } or do { 3644 } or do {
3426 warn $@; 3645 warn $@;
3427 warn "error while reloading, exiting."; 3646 cf::cleanup "error while reloading, exiting.";
3428 exit 1;
3429 }; 3647 };
3430 3648
3431 warn "reloaded"; 3649 warn "reloaded";
3432}; 3650};
3433 3651
3435 3653
3436sub reload_perl() { 3654sub reload_perl() {
3437 # doing reload synchronously and two reloads happen back-to-back, 3655 # doing reload synchronously and two reloads happen back-to-back,
3438 # coro crashes during coro_state_free->destroy here. 3656 # coro crashes during coro_state_free->destroy here.
3439 3657
3440 $RELOAD_WATCHER ||= Event->timer ( 3658 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3441 reentrant => 0,
3442 after => 0,
3443 data => WF_AUTOCANCEL,
3444 cb => sub {
3445 do_reload_perl; 3659 do_reload_perl;
3446 undef $RELOAD_WATCHER; 3660 undef $RELOAD_WATCHER;
3447 },
3448 ); 3661 };
3449} 3662}
3450 3663
3451register_command "reload" => sub { 3664register_command "reload" => sub {
3452 my ($who, $arg) = @_; 3665 my ($who, $arg) = @_;
3453 3666
3466 3679
3467our @WAIT_FOR_TICK; 3680our @WAIT_FOR_TICK;
3468our @WAIT_FOR_TICK_BEGIN; 3681our @WAIT_FOR_TICK_BEGIN;
3469 3682
3470sub wait_for_tick { 3683sub wait_for_tick {
3471 return unless $TICK_WATCHER->is_active; 3684 return if tick_inhibit;
3472 return if $Coro::current == $Coro::main; 3685 return if $Coro::current == $Coro::main;
3473 3686
3474 my $signal = new Coro::Signal; 3687 my $signal = new Coro::Signal;
3475 push @WAIT_FOR_TICK, $signal; 3688 push @WAIT_FOR_TICK, $signal;
3476 $signal->wait; 3689 $signal->wait;
3477} 3690}
3478 3691
3479sub wait_for_tick_begin { 3692sub wait_for_tick_begin {
3480 return unless $TICK_WATCHER->is_active; 3693 return if tick_inhibit;
3481 return if $Coro::current == $Coro::main; 3694 return if $Coro::current == $Coro::main;
3482 3695
3483 my $signal = new Coro::Signal; 3696 my $signal = new Coro::Signal;
3484 push @WAIT_FOR_TICK_BEGIN, $signal; 3697 push @WAIT_FOR_TICK_BEGIN, $signal;
3485 $signal->wait; 3698 $signal->wait;
3486} 3699}
3487 3700
3488$TICK_WATCHER = Event->timer ( 3701sub tick {
3489 reentrant => 0,
3490 parked => 1,
3491 prio => 0,
3492 at => $NEXT_TICK || $TICK,
3493 data => WF_AUTOCANCEL,
3494 cb => sub {
3495 if ($Coro::current != $Coro::main) { 3702 if ($Coro::current != $Coro::main) {
3496 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"
3497 unless ++$bug_warning > 10; 3704 unless ++$bug_warning > 10;
3498 return; 3705 return;
3499 } 3706 }
3500 3707
3501 $NOW = $tick_start = Event::time;
3502
3503 cf::server_tick; # one server iteration 3708 cf::server_tick; # one server iteration
3504 3709
3505 $RUNTIME += $TICK;
3506 $NEXT_TICK += $TICK;
3507
3508 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3710 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3509 $NEXT_RUNTIME_WRITE = $NOW + 10; 3711 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3510 Coro::async_pool { 3712 Coro::async_pool {
3511 $Coro::current->{desc} = "runtime saver"; 3713 $Coro::current->{desc} = "runtime saver";
3512 write_runtime 3714 write_runtime_sync
3513 or warn "ERROR: unable to write runtime file: $!"; 3715 or warn "ERROR: unable to write runtime file: $!";
3514 };
3515 } 3716 };
3717 }
3516 3718
3517 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3719 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3518 $sig->send; 3720 $sig->send;
3519 } 3721 }
3520 while (my $sig = shift @WAIT_FOR_TICK) { 3722 while (my $sig = shift @WAIT_FOR_TICK) {
3521 $sig->send; 3723 $sig->send;
3522 } 3724 }
3523 3725
3524 $NOW = Event::time; 3726 $LOAD = ($NOW - $TICK_START) / $TICK;
3525
3526 # if we are delayed by four ticks or more, skip them all
3527 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3528
3529 $TICK_WATCHER->at ($NEXT_TICK);
3530 $TICK_WATCHER->start;
3531
3532 $LOAD = ($NOW - $tick_start) / $TICK;
3533 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3727 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3534 3728
3535 _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 }
3536 }, 3735 }
3537); 3736}
3538 3737
3539{ 3738{
3739 # configure BDB
3740
3540 BDB::min_parallel 8; 3741 BDB::min_parallel 8;
3541 BDB::max_poll_time $TICK * 0.1; 3742 BDB::max_poll_reqs $TICK * 0.1;
3542 $BDB_POLL_WATCHER = Event->io ( 3743 $Coro::BDB::WATCHER->priority (1);
3543 reentrant => 0,
3544 fd => BDB::poll_fileno,
3545 poll => 'r',
3546 prio => 0,
3547 data => WF_AUTOCANCEL,
3548 cb => \&BDB::poll_cb,
3549 );
3550
3551 BDB::set_sync_prepare {
3552 my $status;
3553 my $current = $Coro::current;
3554 (
3555 sub {
3556 $status = $!;
3557 $current->ready; undef $current;
3558 },
3559 sub {
3560 Coro::schedule while defined $current;
3561 $! = $status;
3562 },
3563 )
3564 };
3565 3744
3566 unless ($DB_ENV) { 3745 unless ($DB_ENV) {
3567 $DB_ENV = BDB::db_env_create; 3746 $DB_ENV = BDB::db_env_create;
3568 $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
3569 | BDB::LOG_AUTOREMOVE, 1); 3748 | BDB::LOG_AUTOREMOVE, 1);
3584 3763
3585 cf::cleanup "db_env_open(db): $@" if $@; 3764 cf::cleanup "db_env_open(db): $@" if $@;
3586 }; 3765 };
3587 } 3766 }
3588 3767
3589 $BDB_DEADLOCK_WATCHER = Event->timer ( 3768 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3590 after => 3,
3591 interval => 1,
3592 hard => 1,
3593 prio => 0,
3594 data => WF_AUTOCANCEL,
3595 cb => sub {
3596 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 { };
3597 },
3598 ); 3770 };
3599 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3771 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3600 after => 11,
3601 interval => 60,
3602 hard => 1,
3603 prio => 0,
3604 data => WF_AUTOCANCEL,
3605 cb => sub {
3606 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3772 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3607 },
3608 ); 3773 };
3609 $BDB_TRICKLE_WATCHER = Event->timer ( 3774 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3610 after => 5,
3611 interval => 10,
3612 hard => 1,
3613 prio => 0,
3614 data => WF_AUTOCANCEL,
3615 cb => sub {
3616 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3775 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3617 },
3618 ); 3776 };
3619} 3777}
3620 3778
3621{ 3779{
3780 # configure IO::AIO
3781
3622 IO::AIO::min_parallel 8; 3782 IO::AIO::min_parallel 8;
3623
3624 undef $Coro::AIO::WATCHER;
3625 IO::AIO::max_poll_time $TICK * 0.1; 3783 IO::AIO::max_poll_time $TICK * 0.1;
3626 $AIO_POLL_WATCHER = Event->io ( 3784 $Coro::AIO::WATCHER->priority (1);
3627 reentrant => 0,
3628 data => WF_AUTOCANCEL,
3629 fd => IO::AIO::poll_fileno,
3630 poll => 'r',
3631 prio => 0,
3632 cb => \&IO::AIO::poll_cb,
3633 );
3634} 3785}
3635 3786
3636my $_log_backtrace; 3787my $_log_backtrace;
3637 3788
3638sub _log_backtrace { 3789sub _log_backtrace {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines