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.385 by root, Fri Oct 12 19:13:26 2007 UTC vs.
Revision 1.419 by root, Sun Apr 13 01:34:09 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 Event; 30use EV 3.2;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
14 35
15use Coro 4.1 (); 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.51 (); 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>:
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, 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 return 1;#d# 1078 ++$SLOW_MERGES;#d#
977 1079
978 #todo#d# kill yourself and do some recursive checking manually without storable 1080 # we do the slow way here
979 sync_job { 1081 return _object_equal $ob1, $ob2
980 my $guard = Coro::Storable::guard;
981 local $Storable::canonical = 1;
982 my $fob1 = Storable::freeze $ob1;
983 my $fob2 = Storable::freeze $ob2;
984 $fob1 eq $fob2
985 }
986} 1082}
987 1083
988sub reattach { 1084sub reattach {
989 # basically do the same as instantiate, without calling instantiate 1085 # basically do the same as instantiate, without calling instantiate
990 my ($obj) = @_; 1086 my ($obj) = @_;
1012cf::attachable->attach ( 1108cf::attachable->attach (
1013 prio => -1000000, 1109 prio => -1000000,
1014 on_instantiate => sub { 1110 on_instantiate => sub {
1015 my ($obj, $data) = @_; 1111 my ($obj, $data) = @_;
1016 1112
1017 $data = from_json $data; 1113 $data = decode_json $data;
1018 1114
1019 for (@$data) { 1115 for (@$data) {
1020 my ($name, $args) = @$_; 1116 my ($name, $args) = @$_;
1021 1117
1022 $obj->attach ($name, %{$args || {} }); 1118 $obj->attach ($name, %{$args || {} });
1051 close $fh; 1147 close $fh;
1052 1148
1053 if (@$objs) { 1149 if (@$objs) {
1054 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) {
1055 chmod SAVE_MODE, $fh; 1151 chmod SAVE_MODE, $fh;
1056 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs }; 1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1057 aio_write $fh, 0, (length $data), $data, 0; 1153 aio_write $fh, 0, (length $data), $data, 0;
1058 aio_fsync $fh if $cf::USE_FSYNC; 1154 aio_fsync $fh if $cf::USE_FSYNC;
1059 close $fh; 1155 close $fh;
1060 aio_rename "$filename.pst~", "$filename.pst"; 1156 aio_rename "$filename.pst~", "$filename.pst";
1061 } 1157 }
1092 1188
1093 unless (aio_stat "$filename.pst") { 1189 unless (aio_stat "$filename.pst") {
1094 (aio_load "$filename.pst", $av) >= 0 1190 (aio_load "$filename.pst", $av) >= 0
1095 or return; 1191 or return;
1096 1192
1097 my $st = eval { Coro::Storable::thaw $av } 1193 my $st = eval { Coro::Storable::thaw $av };
1098 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1099 $av = $st->{objs}; 1194 $av = $st->{objs};
1100 } 1195 }
1101 1196
1102 utf8::decode (my $decname = $filename); 1197 utf8::decode (my $decname = $filename);
1103 warn sprintf "loading %s (%d,%d)\n", 1198 warn sprintf "loading %s (%d,%d)\n",
1260 my $msg = $@ ? "$v->{path}: $@\n" 1355 my $msg = $@ ? "$v->{path}: $@\n"
1261 : "$v->{base}: extension inactive.\n"; 1356 : "$v->{base}: extension inactive.\n";
1262 1357
1263 if (exists $v->{meta}{mandatory}) { 1358 if (exists $v->{meta}{mandatory}) {
1264 warn $msg; 1359 warn $msg;
1265 warn "mandatory extension failed to load, exiting.\n"; 1360 cf::cleanup "mandatory extension failed to load, exiting.";
1266 exit 1;
1267 } 1361 }
1268 1362
1269 warn $msg; 1363 warn $msg;
1270 } 1364 }
1271 1365
1519 1613
1520Expand crossfire pod fragments into protocol xml. 1614Expand crossfire pod fragments into protocol xml.
1521 1615
1522=cut 1616=cut
1523 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
1524sub expand_cfpod { 1629sub expand_cfpod {
1525 ((my $self), (local $_)) = @_; 1630 my ($self, $pod) = @_;
1526 1631
1527 # escape & and < 1632 my $xml;
1528 s/&/&amp;/g;
1529 s/(?<![BIUGHT])</&lt;/g;
1530 1633
1531 # this is buggy, it needs to properly take care of nested <'s 1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1532 1637
1533 1 while 1638 $group =~ s/&/&amp;/g;
1534 # replace B<>, I<>, U<> etc. 1639 $group =~ s/</&lt;/g;
1535 s/B<([^\>]*)>/<b>$1<\/b>/ 1640
1536 || s/I<([^\>]*)>/<i>$1<\/i>/ 1641 $xml .= $group;
1537 || s/U<([^\>]*)>/<u>$1<\/u>/ 1642 } elsif ($pod =~ m%\G
1538 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1643 ([BCGHITU])
1539 # replace G<male|female> tags 1644 <
1540 || s{G<([^>|]*)\|([^>]*)>}{ 1645 (?:
1541 $self->gender ? $2 : $1 1646 ([^<>]*) (?{ $group = $^N })
1542 }ge 1647 | < $interior >
1543 # replace H<hint text> 1648 )
1544 || s{H<([^\>]*)>} 1649 >
1650 %gcsx
1545 { 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") {
1546 ("<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>",
1547 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1548 "") 1671 "")
1549 [$self->{hintmode}] 1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1550 }ge; 1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1551 1683
1684 for ($xml) {
1552 # create single paragraphs (very hackish) 1685 # create single paragraphs (very hackish)
1553 s/(?<=\S)\n(?=\w)/ /g; 1686 s/(?<=\S)\n(?=\w)/ /g;
1554 1687
1555 # compress some whitespace 1688 # compress some whitespace
1556 s/\s+\n/\n/g; # ws line-ends 1689 s/\s+\n/\n/g; # ws line-ends
1557 s/\n\n+/\n/g; # double lines 1690 s/\n\n+/\n/g; # double lines
1558 s/^\n+//; # beginning lines 1691 s/^\n+//; # beginning lines
1559 s/\n+$//; # ending lines 1692 s/\n+$//; # ending lines
1693 }
1560 1694
1561 $_ 1695 $xml
1562} 1696}
1697
1698no re 'eval';
1563 1699
1564sub hintmode { 1700sub hintmode {
1565 $_[0]{hintmode} = $_[1] if @_ > 1; 1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1566 $_[0]{hintmode} 1702 $_[0]{hintmode}
1567} 1703}
1639our $MAX_RESET = 3600; 1775our $MAX_RESET = 3600;
1640our $DEFAULT_RESET = 3000; 1776our $DEFAULT_RESET = 3000;
1641 1777
1642sub generate_random_map { 1778sub generate_random_map {
1643 my ($self, $rmp) = @_; 1779 my ($self, $rmp) = @_;
1780
1781 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1782
1644 # mit "rum" bekleckern, nicht 1783 # mit "rum" bekleckern, nicht
1645 $self->_create_random_map ( 1784 $self->_create_random_map (
1646 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1785 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1647 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1786 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1648 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1787 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1770 1909
1771# the temporary/swap location 1910# the temporary/swap location
1772sub save_path { 1911sub save_path {
1773 my ($self) = @_; 1912 my ($self) = @_;
1774 1913
1775 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1914 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1776 "$TMPDIR/$path.map" 1915 "$TMPDIR/$path.map"
1777} 1916}
1778 1917
1779# the unique path, undef == no special unique path 1918# the unique path, undef == no special unique path
1780sub uniq_path { 1919sub uniq_path {
1781 my ($self) = @_; 1920 my ($self) = @_;
1782 1921
1783 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1784 "$UNIQUEDIR/$path" 1923 "$UNIQUEDIR/$path"
1785} 1924}
1786 1925
1787# and all this just because we cannot iterate over 1926# and all this just because we cannot iterate over
1788# all maps in C++... 1927# all maps in C++...
2234 2373
2235sub unique_maps() { 2374sub unique_maps() {
2236 [ 2375 [
2237 map { 2376 map {
2238 utf8::decode $_; 2377 utf8::decode $_;
2239 /\.map$/ 2378 s/\.map$//; # TODO future compatibility hack
2379 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2380 ? ()
2240 ? normalise $_ 2381 : normalise $_
2241 : ()
2242 } @{ aio_readdir $UNIQUEDIR or [] } 2382 } @{ aio_readdir $UNIQUEDIR or [] }
2243 ] 2383 ]
2244} 2384}
2245 2385
2246package cf;
2247
2248=back 2386=back
2249 2387
2250=head3 cf::object 2388=head3 cf::object
2251 2389
2252=cut 2390=cut
2255 2393
2256=over 4 2394=over 4
2257 2395
2258=item $ob->inv_recursive 2396=item $ob->inv_recursive
2259 2397
2260Returns the inventory of the object _and_ their inventories, recursively. 2398Returns the inventory of the object I<and> their inventories, recursively,
2399but I<not> the object itself.
2261 2400
2262=cut 2401=cut
2263 2402
2264sub inv_recursive_; 2403sub inv_recursive_;
2265sub inv_recursive_ { 2404sub inv_recursive_ {
2270 inv_recursive_ inv $_[0] 2409 inv_recursive_ inv $_[0]
2271} 2410}
2272 2411
2273=item $ref = $ob->ref 2412=item $ref = $ob->ref
2274 2413
2275creates and returns a persistent reference to an objetc that can be stored as a string. 2414Creates and returns a persistent reference to an object that can be stored as a string.
2276 2415
2277=item $ob = cf::object::deref ($refstring) 2416=item $ob = cf::object::deref ($refstring)
2278 2417
2279returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2418returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2280even if the object actually exists. May block. 2419even if the object actually exists. May block.
2554 $rmp->{origin_y} = $exit->y; 2693 $rmp->{origin_y} = $exit->y;
2555 } 2694 }
2556 2695
2557 $rmp->{random_seed} ||= $exit->random_seed; 2696 $rmp->{random_seed} ||= $exit->random_seed;
2558 2697
2559 my $data = cf::to_json $rmp; 2698 my $data = cf::encode_json $rmp;
2560 my $md5 = Digest::MD5::md5_hex $data; 2699 my $md5 = Digest::MD5::md5_hex $data;
2561 my $meta = "$RANDOMDIR/$md5.meta"; 2700 my $meta = "$RANDOMDIR/$md5.meta";
2562 2701
2563 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2702 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2564 aio_write $fh, 0, (length $data), $data, 0; 2703 aio_write $fh, 0, (length $data), $data, 0;
2637the message, with C<log> being the default. If C<$color> is negative, suppress 2776the message, with C<log> being the default. If C<$color> is negative, suppress
2638the message unless the client supports the msg packet. 2777the message unless the client supports the msg packet.
2639 2778
2640=cut 2779=cut
2641 2780
2781# non-persistent channels (usually the info channel)
2642our %CHANNEL = ( 2782our %CHANNEL = (
2643 "c/identify" => { 2783 "c/identify" => {
2644 id => "infobox", 2784 id => "infobox",
2645 title => "Identify", 2785 title => "Identify",
2646 reply => undef, 2786 reply => undef,
2650 id => "infobox", 2790 id => "infobox",
2651 title => "Examine", 2791 title => "Examine",
2652 reply => undef, 2792 reply => undef,
2653 tooltip => "Signs and other items you examined", 2793 tooltip => "Signs and other items you examined",
2654 }, 2794 },
2795 "c/book" => {
2796 id => "infobox",
2797 title => "Book",
2798 reply => undef,
2799 tooltip => "The contents of a note or book",
2800 },
2655 "c/lookat" => { 2801 "c/lookat" => {
2656 id => "infobox", 2802 id => "infobox",
2657 title => "Look", 2803 title => "Look",
2658 reply => undef, 2804 reply => undef,
2659 tooltip => "What you saw there", 2805 tooltip => "What you saw there",
2806 },
2807 "c/who" => {
2808 id => "infobox",
2809 title => "Players",
2810 reply => undef,
2811 tooltip => "Shows players who are currently online",
2812 },
2813 "c/body" => {
2814 id => "infobox",
2815 title => "Body Parts",
2816 reply => undef,
2817 tooltip => "Shows which body parts you posess and are available",
2818 },
2819 "c/uptime" => {
2820 id => "infobox",
2821 title => "Uptime",
2822 reply => undef,
2823 tooltip => "How long the server has been running since last restart",
2824 },
2825 "c/mapinfo" => {
2826 id => "infobox",
2827 title => "Map Info",
2828 reply => undef,
2829 tooltip => "Information related to the maps",
2660 }, 2830 },
2661); 2831);
2662 2832
2663sub cf::client::send_msg { 2833sub cf::client::send_msg {
2664 my ($self, $channel, $msg, $color, @extra) = @_; 2834 my ($self, $channel, $msg, $color, @extra) = @_;
3033 { 3203 {
3034 my $faces = $facedata->{faceinfo}; 3204 my $faces = $facedata->{faceinfo};
3035 3205
3036 while (my ($face, $info) = each %$faces) { 3206 while (my ($face, $info) = each %$faces) {
3037 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3207 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3208
3038 cf::face::set_visibility $idx, $info->{visibility}; 3209 cf::face::set_visibility $idx, $info->{visibility};
3039 cf::face::set_magicmap $idx, $info->{magicmap}; 3210 cf::face::set_magicmap $idx, $info->{magicmap};
3040 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3211 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3041 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3212 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3042 3213
3043 cf::cede_to_tick; 3214 cf::cede_to_tick;
3044 } 3215 }
3045 3216
3046 while (my ($face, $info) = each %$faces) { 3217 while (my ($face, $info) = each %$faces) {
3047 next unless $info->{smooth}; 3218 next unless $info->{smooth};
3219
3048 my $idx = cf::face::find $face 3220 my $idx = cf::face::find $face
3049 or next; 3221 or next;
3222
3050 if (my $smooth = cf::face::find $info->{smooth}) { 3223 if (my $smooth = cf::face::find $info->{smooth}) {
3051 cf::face::set_smooth $idx, $smooth; 3224 cf::face::set_smooth $idx, $smooth;
3052 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3225 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3053 } else { 3226 } else {
3054 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3227 warn "smooth face '$info->{smooth}' not found for face '$face'";
3072 { 3245 {
3073 # TODO: for gcfclient pleasure, we should give resources 3246 # TODO: for gcfclient pleasure, we should give resources
3074 # that gcfclient doesn't grok a >10000 face index. 3247 # that gcfclient doesn't grok a >10000 face index.
3075 my $res = $facedata->{resource}; 3248 my $res = $facedata->{resource};
3076 3249
3077 my $soundconf = delete $res->{"res/sound.conf"};
3078
3079 while (my ($name, $info) = each %$res) { 3250 while (my ($name, $info) = each %$res) {
3251 if (defined $info->{type}) {
3080 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3252 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3081 my $data; 3253 my $data;
3082 3254
3083 if ($info->{type} & 1) { 3255 if ($info->{type} & 1) {
3084 # prepend meta info 3256 # prepend meta info
3085 3257
3086 my $meta = $enc->encode ({ 3258 my $meta = $enc->encode ({
3087 name => $name, 3259 name => $name,
3088 %{ $info->{meta} || {} }, 3260 %{ $info->{meta} || {} },
3089 }); 3261 });
3090 3262
3091 $data = pack "(w/a*)*", $meta, $info->{data}; 3263 $data = pack "(w/a*)*", $meta, $info->{data};
3264 } else {
3265 $data = $info->{data};
3266 }
3267
3268 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3269 cf::face::set_type $idx, $info->{type};
3092 } else { 3270 } else {
3093 $data = $info->{data}; 3271 $RESOURCE{$name} = $info;
3094 } 3272 }
3095 3273
3096 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3097 cf::face::set_type $idx, $info->{type};
3098
3099 cf::cede_to_tick; 3274 cf::cede_to_tick;
3100 } 3275 }
3101
3102 if ($soundconf) {
3103 $soundconf = $enc->decode (delete $soundconf->{data});
3104
3105 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3106 my $sound = $soundconf->{compat}[$_]
3107 or next;
3108
3109 my $face = cf::face::find "sound/$sound->[1]";
3110 cf::sound::set $sound->[0] => $face;
3111 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3112 }
3113
3114 while (my ($k, $v) = each %{$soundconf->{event}}) {
3115 my $face = cf::face::find "sound/$v";
3116 cf::sound::set $k => $face;
3117 }
3118 }
3119 } 3276 }
3277
3278 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3120 3279
3121 1 3280 1
3122} 3281}
3282
3283cf::global->attach (on_resource_update => sub {
3284 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3285 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3286
3287 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3288 my $sound = $soundconf->{compat}[$_]
3289 or next;
3290
3291 my $face = cf::face::find "sound/$sound->[1]";
3292 cf::sound::set $sound->[0] => $face;
3293 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3294 }
3295
3296 while (my ($k, $v) = each %{$soundconf->{event}}) {
3297 my $face = cf::face::find "sound/$v";
3298 cf::sound::set $k => $face;
3299 }
3300 }
3301});
3123 3302
3124register_exticmd fx_want => sub { 3303register_exticmd fx_want => sub {
3125 my ($ns, $want) = @_; 3304 my ($ns, $want) = @_;
3126 3305
3127 while (my ($k, $v) = each %$want) { 3306 while (my ($k, $v) = each %$want) {
3182sub reload_config { 3361sub reload_config {
3183 open my $fh, "<:utf8", "$CONFDIR/config" 3362 open my $fh, "<:utf8", "$CONFDIR/config"
3184 or return; 3363 or return;
3185 3364
3186 local $/; 3365 local $/;
3187 *CFG = YAML::Syck::Load <$fh>; 3366 *CFG = YAML::Load <$fh>;
3188 3367
3189 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3368 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3190 3369
3191 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3370 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3192 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3371 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3204 # we must not ever block the main coroutine 3383 # we must not ever block the main coroutine
3205 local $Coro::idle = sub { 3384 local $Coro::idle = sub {
3206 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3385 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3207 (async { 3386 (async {
3208 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3387 $Coro::current->{desc} = "IDLE BUG HANDLER";
3209 Event::one_event; 3388 EV::loop EV::LOOP_ONESHOT;
3210 })->prio (Coro::PRIO_MAX); 3389 })->prio (Coro::PRIO_MAX);
3211 }; 3390 };
3212 3391
3213 reload_config; 3392 reload_config;
3214 db_init; 3393 db_init;
3215 load_extensions; 3394 load_extensions;
3216 3395
3217 $TICK_WATCHER->start; 3396 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3397 evthread_start IO::AIO::poll_fileno;
3218 Event::loop; 3398 EV::loop;
3219} 3399}
3220 3400
3221############################################################################# 3401#############################################################################
3222# initialisation and cleanup 3402# initialisation and cleanup
3223 3403
3224# install some emergency cleanup handlers 3404# install some emergency cleanup handlers
3225BEGIN { 3405BEGIN {
3406 our %SIGWATCHER = ();
3226 for my $signal (qw(INT HUP TERM)) { 3407 for my $signal (qw(INT HUP TERM)) {
3227 Event->signal ( 3408 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3228 reentrant => 0,
3229 data => WF_AUTOCANCEL,
3230 signal => $signal,
3231 prio => 0,
3232 cb => sub {
3233 cf::cleanup "SIG$signal"; 3409 cf::cleanup "SIG$signal";
3234 },
3235 ); 3410 };
3236 } 3411 }
3237} 3412}
3238 3413
3239sub write_runtime { 3414sub write_runtime_sync {
3240 my $runtime = "$LOCALDIR/runtime"; 3415 my $runtime = "$LOCALDIR/runtime";
3241 3416
3242 # first touch the runtime file to show we are still running: 3417 # first touch the runtime file to show we are still running:
3243 # the fsync below can take a very very long time. 3418 # the fsync below can take a very very long time.
3244 3419
3270 and return; 3445 and return;
3271 3446
3272 warn "runtime file written.\n"; 3447 warn "runtime file written.\n";
3273 3448
3274 1 3449 1
3450}
3451
3452our $uuid_lock;
3453our $uuid_skip;
3454
3455sub write_uuid_sync($) {
3456 $uuid_skip ||= $_[0];
3457
3458 return if $uuid_lock;
3459 local $uuid_lock = 1;
3460
3461 my $uuid = "$LOCALDIR/uuid";
3462
3463 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3464 or return;
3465
3466 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3467 $uuid_skip = 0;
3468
3469 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3470 and return;
3471
3472 # always fsync - this file is important
3473 aio_fsync $fh
3474 and return;
3475
3476 close $fh
3477 or return;
3478
3479 aio_rename "$uuid~", $uuid
3480 and return;
3481
3482 warn "uuid file written ($value).\n";
3483
3484 1
3485
3486}
3487
3488sub write_uuid($$) {
3489 my ($skip, $sync) = @_;
3490
3491 $sync ? write_uuid_sync $skip
3492 : async { write_uuid_sync $skip };
3275} 3493}
3276 3494
3277sub emergency_save() { 3495sub emergency_save() {
3278 my $freeze_guard = cf::freeze_mainloop; 3496 my $freeze_guard = cf::freeze_mainloop;
3279 3497
3301 warn "end emergency map save\n"; 3519 warn "end emergency map save\n";
3302 3520
3303 warn "begin emergency database checkpoint\n"; 3521 warn "begin emergency database checkpoint\n";
3304 BDB::db_env_txn_checkpoint $DB_ENV; 3522 BDB::db_env_txn_checkpoint $DB_ENV;
3305 warn "end emergency database checkpoint\n"; 3523 warn "end emergency database checkpoint\n";
3524
3525 warn "begin write uuid\n";
3526 write_uuid_sync 1;
3527 warn "end write uuid\n";
3306 }; 3528 };
3307 3529
3308 warn "leave emergency perl save\n"; 3530 warn "leave emergency perl save\n";
3309} 3531}
3310 3532
3325 warn "reloading..."; 3547 warn "reloading...";
3326 3548
3327 warn "entering sync_job"; 3549 warn "entering sync_job";
3328 3550
3329 cf::sync_job { 3551 cf::sync_job {
3330 cf::write_runtime; # external watchdog should not bark 3552 cf::write_runtime_sync; # external watchdog should not bark
3331 cf::emergency_save; 3553 cf::emergency_save;
3332 cf::write_runtime; # external watchdog should not bark 3554 cf::write_runtime_sync; # external watchdog should not bark
3333 3555
3334 warn "syncing database to disk"; 3556 warn "syncing database to disk";
3335 BDB::db_env_txn_checkpoint $DB_ENV; 3557 BDB::db_env_txn_checkpoint $DB_ENV;
3336 3558
3337 # if anything goes wrong in here, we should simply crash as we already saved 3559 # if anything goes wrong in here, we should simply crash as we already saved
3338
3339 warn "cancelling all WF_AUTOCANCEL watchers";
3340 for (Event::all_watchers) {
3341 $_->cancel if $_->data & WF_AUTOCANCEL;
3342 }
3343 3560
3344 warn "flushing outstanding aio requests"; 3561 warn "flushing outstanding aio requests";
3345 for (;;) { 3562 for (;;) {
3346 BDB::flush; 3563 BDB::flush;
3347 IO::AIO::flush; 3564 IO::AIO::flush;
3348 Coro::cede; 3565 Coro::cede_notself;
3349 last unless IO::AIO::nreqs || BDB::nreqs; 3566 last unless IO::AIO::nreqs || BDB::nreqs;
3350 warn "iterate..."; 3567 warn "iterate...";
3351 } 3568 }
3352 3569
3353 ++$RELOAD; 3570 ++$RELOAD;
3429 warn "leaving sync_job"; 3646 warn "leaving sync_job";
3430 3647
3431 1 3648 1
3432 } or do { 3649 } or do {
3433 warn $@; 3650 warn $@;
3434 warn "error while reloading, exiting."; 3651 cf::cleanup "error while reloading, exiting.";
3435 exit 1;
3436 }; 3652 };
3437 3653
3438 warn "reloaded"; 3654 warn "reloaded";
3439}; 3655};
3440 3656
3442 3658
3443sub reload_perl() { 3659sub reload_perl() {
3444 # doing reload synchronously and two reloads happen back-to-back, 3660 # doing reload synchronously and two reloads happen back-to-back,
3445 # coro crashes during coro_state_free->destroy here. 3661 # coro crashes during coro_state_free->destroy here.
3446 3662
3447 $RELOAD_WATCHER ||= Event->timer ( 3663 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3448 reentrant => 0,
3449 after => 0,
3450 data => WF_AUTOCANCEL,
3451 cb => sub {
3452 do_reload_perl; 3664 do_reload_perl;
3453 undef $RELOAD_WATCHER; 3665 undef $RELOAD_WATCHER;
3454 },
3455 ); 3666 };
3456} 3667}
3457 3668
3458register_command "reload" => sub { 3669register_command "reload" => sub {
3459 my ($who, $arg) = @_; 3670 my ($who, $arg) = @_;
3460 3671
3473 3684
3474our @WAIT_FOR_TICK; 3685our @WAIT_FOR_TICK;
3475our @WAIT_FOR_TICK_BEGIN; 3686our @WAIT_FOR_TICK_BEGIN;
3476 3687
3477sub wait_for_tick { 3688sub wait_for_tick {
3478 return unless $TICK_WATCHER->is_active; 3689 return if tick_inhibit;
3479 return if $Coro::current == $Coro::main; 3690 return if $Coro::current == $Coro::main;
3480 3691
3481 my $signal = new Coro::Signal; 3692 my $signal = new Coro::Signal;
3482 push @WAIT_FOR_TICK, $signal; 3693 push @WAIT_FOR_TICK, $signal;
3483 $signal->wait; 3694 $signal->wait;
3484} 3695}
3485 3696
3486sub wait_for_tick_begin { 3697sub wait_for_tick_begin {
3487 return unless $TICK_WATCHER->is_active; 3698 return if tick_inhibit;
3488 return if $Coro::current == $Coro::main; 3699 return if $Coro::current == $Coro::main;
3489 3700
3490 my $signal = new Coro::Signal; 3701 my $signal = new Coro::Signal;
3491 push @WAIT_FOR_TICK_BEGIN, $signal; 3702 push @WAIT_FOR_TICK_BEGIN, $signal;
3492 $signal->wait; 3703 $signal->wait;
3493} 3704}
3494 3705
3495$TICK_WATCHER = Event->timer ( 3706sub tick {
3496 reentrant => 0,
3497 parked => 1,
3498 prio => 0,
3499 at => $NEXT_TICK || $TICK,
3500 data => WF_AUTOCANCEL,
3501 cb => sub {
3502 if ($Coro::current != $Coro::main) { 3707 if ($Coro::current != $Coro::main) {
3503 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3708 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3504 unless ++$bug_warning > 10; 3709 unless ++$bug_warning > 10;
3505 return; 3710 return;
3506 } 3711 }
3507 3712
3508 $NOW = $tick_start = Event::time;
3509
3510 cf::server_tick; # one server iteration 3713 cf::server_tick; # one server iteration
3511 3714
3512 $RUNTIME += $TICK;
3513 $NEXT_TICK += $TICK;
3514
3515 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3715 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3516 $NEXT_RUNTIME_WRITE = $NOW + 10; 3716 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3517 Coro::async_pool { 3717 Coro::async_pool {
3518 $Coro::current->{desc} = "runtime saver"; 3718 $Coro::current->{desc} = "runtime saver";
3519 write_runtime 3719 write_runtime_sync
3520 or warn "ERROR: unable to write runtime file: $!"; 3720 or warn "ERROR: unable to write runtime file: $!";
3521 };
3522 } 3721 };
3722 }
3523 3723
3524 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3724 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3525 $sig->send; 3725 $sig->send;
3526 } 3726 }
3527 while (my $sig = shift @WAIT_FOR_TICK) { 3727 while (my $sig = shift @WAIT_FOR_TICK) {
3528 $sig->send; 3728 $sig->send;
3529 } 3729 }
3530 3730
3531 $NOW = Event::time; 3731 $LOAD = ($NOW - $TICK_START) / $TICK;
3532
3533 # if we are delayed by four ticks or more, skip them all
3534 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3535
3536 $TICK_WATCHER->at ($NEXT_TICK);
3537 $TICK_WATCHER->start;
3538
3539 $LOAD = ($NOW - $tick_start) / $TICK;
3540 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3732 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3541 3733
3542 _post_tick; 3734 if (0) {
3735 if ($NEXT_TICK) {
3736 my $jitter = $TICK_START - $NEXT_TICK;
3737 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3738 warn "jitter $JITTER\n";#d#
3739 }
3543 }, 3740 }
3544); 3741}
3545 3742
3546{ 3743{
3744 # configure BDB
3745
3547 BDB::min_parallel 8; 3746 BDB::min_parallel 8;
3548 BDB::max_poll_time $TICK * 0.1; 3747 BDB::max_poll_reqs $TICK * 0.1;
3549 $BDB_POLL_WATCHER = Event->io ( 3748 $Coro::BDB::WATCHER->priority (1);
3550 reentrant => 0,
3551 fd => BDB::poll_fileno,
3552 poll => 'r',
3553 prio => 0,
3554 data => WF_AUTOCANCEL,
3555 cb => \&BDB::poll_cb,
3556 );
3557
3558 BDB::set_sync_prepare {
3559 my $status;
3560 my $current = $Coro::current;
3561 (
3562 sub {
3563 $status = $!;
3564 $current->ready; undef $current;
3565 },
3566 sub {
3567 Coro::schedule while defined $current;
3568 $! = $status;
3569 },
3570 )
3571 };
3572 3749
3573 unless ($DB_ENV) { 3750 unless ($DB_ENV) {
3574 $DB_ENV = BDB::db_env_create; 3751 $DB_ENV = BDB::db_env_create;
3575 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3752 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3576 | BDB::LOG_AUTOREMOVE, 1); 3753 | BDB::LOG_AUTOREMOVE, 1);
3591 3768
3592 cf::cleanup "db_env_open(db): $@" if $@; 3769 cf::cleanup "db_env_open(db): $@" if $@;
3593 }; 3770 };
3594 } 3771 }
3595 3772
3596 $BDB_DEADLOCK_WATCHER = Event->timer ( 3773 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3597 after => 3,
3598 interval => 1,
3599 hard => 1,
3600 prio => 0,
3601 data => WF_AUTOCANCEL,
3602 cb => sub {
3603 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3774 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3604 },
3605 ); 3775 };
3606 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3776 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3607 after => 11,
3608 interval => 60,
3609 hard => 1,
3610 prio => 0,
3611 data => WF_AUTOCANCEL,
3612 cb => sub {
3613 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3777 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3614 },
3615 ); 3778 };
3616 $BDB_TRICKLE_WATCHER = Event->timer ( 3779 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3617 after => 5,
3618 interval => 10,
3619 hard => 1,
3620 prio => 0,
3621 data => WF_AUTOCANCEL,
3622 cb => sub {
3623 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3780 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3624 },
3625 ); 3781 };
3626} 3782}
3627 3783
3628{ 3784{
3785 # configure IO::AIO
3786
3629 IO::AIO::min_parallel 8; 3787 IO::AIO::min_parallel 8;
3630
3631 undef $Coro::AIO::WATCHER;
3632 IO::AIO::max_poll_time $TICK * 0.1; 3788 IO::AIO::max_poll_time $TICK * 0.1;
3633 $AIO_POLL_WATCHER = Event->io ( 3789 $Coro::AIO::WATCHER->priority (1);
3634 reentrant => 0,
3635 data => WF_AUTOCANCEL,
3636 fd => IO::AIO::poll_fileno,
3637 poll => 'r',
3638 prio => 0,
3639 cb => \&IO::AIO::poll_cb,
3640 );
3641} 3790}
3642 3791
3643my $_log_backtrace; 3792my $_log_backtrace;
3644 3793
3645sub _log_backtrace { 3794sub _log_backtrace {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines