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.381 by root, Mon Oct 8 18:19:39 2007 UTC vs.
Revision 1.430 by root, Sun May 4 14:12:37 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 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>:
383 } 427 }
384 } 428 }
385}; 429};
386 430
387sub get_slot($;$$) { 431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
388 my ($time, $pri, $name) = @_; 434 my ($time, $pri, $name) = @_;
389 435
390 $time = $TICK * .6 if $time > $TICK * .6; 436 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 437 my $sig = new Coro::Signal;
392 438
406 452
407BEGIN { *async = \&Coro::async_pool } 453BEGIN { *async = \&Coro::async_pool }
408 454
409=item cf::sync_job { BLOCK } 455=item cf::sync_job { BLOCK }
410 456
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 457The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 458is 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 459partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 460acceptable.
415 461
416If it must be done, put the blocking parts into C<sync_job>. This will run 462If 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 463the given BLOCK in another coroutine while waiting for the result. The
422 468
423sub sync_job(&) { 469sub sync_job(&) {
424 my ($job) = @_; 470 my ($job) = @_;
425 471
426 if ($Coro::current == $Coro::main) { 472 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 473 my $time = EV::time;
428 474
429 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
431 477
432 LOG llevError | logBacktrace, Carp::longmess "sync job";#d# 478 LOG llevError, Carp::longmess "sync job";#d#
433 479
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
437 481
438 my $busy = 1; 482 my $busy = 1;
439 my @res; 483 my @res;
440 484
444 warn $@ if $@; 488 warn $@ if $@;
445 undef $busy; 489 undef $busy;
446 })->prio (Coro::PRIO_MAX); 490 })->prio (Coro::PRIO_MAX);
447 491
448 while ($busy) { 492 while ($busy) {
449 Coro::cede or Event::one_event; 493 if (Coro::nready) {
494 Coro::cede_notself;
495 } else {
496 EV::loop EV::LOOP_ONESHOT;
450 } 497 }
498 }
451 499
452 $time = Event::time - $time; 500 my $time = EV::time - $time;
453 501
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 502 $TICK_START += $time; # do not account sync jobs to server load
458 503
459 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
460 } else { 505 } else {
461 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
462 507
487=item fork_call { }, $args 532=item fork_call { }, $args
488 533
489Executes the given code block with the given arguments in a seperate 534Executes the given code block with the given arguments in a seperate
490process, returning the results. Everything must be serialisable with 535process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may 536Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling. 537never block itself or use any form of event handling.
493 538
494=cut 539=cut
495 540
496sub fork_call(&@) { 541sub fork_call(&@) {
497 my ($cb, @args) = @_; 542 my ($cb, @args) = @_;
504 reset_signals; 549 reset_signals;
505 &$cb 550 &$cb
506 }, @args; 551 }, @args;
507 552
508 wantarray ? @res : $res[-1] 553 wantarray ? @res : $res[-1]
554}
555
556=item $coin = coin_from_name $name
557
558=cut
559
560our %coin_alias = (
561 "silver" => "silvercoin",
562 "silvercoin" => "silvercoin",
563 "silvercoins" => "silvercoin",
564 "gold" => "goldcoin",
565 "goldcoin" => "goldcoin",
566 "goldcoins" => "goldcoin",
567 "platinum" => "platinacoin",
568 "platinumcoin" => "platinacoin",
569 "platinumcoins" => "platinacoin",
570 "platina" => "platinacoin",
571 "platinacoin" => "platinacoin",
572 "platinacoins" => "platinacoin",
573 "royalty" => "royalty",
574 "royalties" => "royalty",
575);
576
577sub coin_from_name($) {
578 $coin_alias{$_[0]}
579 ? cf::arch::find $coin_alias{$_[0]}
580 : undef
509} 581}
510 582
511=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
512 584
513Returns a single value from the environment database. 585Returns a single value from the environment database.
658attach callbacks/event handlers (a collection of which is called an "attachment") 730attach callbacks/event handlers (a collection of which is called an "attachment")
659to it. All such attachable objects support the following methods. 731to it. All such attachable objects support the following methods.
660 732
661In the following description, CLASS can be any of C<global>, C<object> 733In 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 734C<player>, C<client> or C<map> (i.e. the attachable objects in
663Crossfire TRT). 735Deliantra).
664 736
665=over 4 737=over 4
666 738
667=item $attachable->attach ($attachment, key => $value...) 739=item $attachable->attach ($attachment, key => $value...)
668 740
950 } 1022 }
951 1023
952 0 1024 0
953} 1025}
954 1026
955=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
956 1028
957=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
958 1030
959Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
960 1032
966 1038
967=cut 1039=cut
968 1040
969############################################################################# 1041#############################################################################
970# object support 1042# object support
971#
972 1043
1044sub _object_equal($$);
1045sub _object_equal($$) {
1046 my ($a, $b) = @_;
1047
1048 return 0 unless (ref $a) eq (ref $b);
1049
1050 if ("HASH" eq ref $a) {
1051 my @ka = keys %$a;
1052 my @kb = keys %$b;
1053
1054 return 0 if @ka != @kb;
1055
1056 for (0 .. $#ka) {
1057 return 0 unless $ka[$_] eq $kb[$_];
1058 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1059 }
1060
1061 } elsif ("ARRAY" eq ref $a) {
1062
1063 return 0 if @$a != @$b;
1064
1065 for (0 .. $#$a) {
1066 return 0 unless _object_equal $a->[$_], $b->[$_];
1067 }
1068
1069 } elsif ($a ne $b) {
1070 return 0;
1071 }
1072
1073 1
1074}
1075
1076our $SLOW_MERGES;#d#
973sub _can_merge { 1077sub _can_merge {
974 my ($ob1, $ob2) = @_; 1078 my ($ob1, $ob2) = @_;
975 1079
976 local $Storable::canonical = 1; 1080 ++$SLOW_MERGES;#d#
977 my $fob1 = Storable::freeze $ob1;
978 my $fob2 = Storable::freeze $ob2;
979 1081
980 $fob1 eq $fob2 1082 # we do the slow way here
1083 return _object_equal $ob1, $ob2
981} 1084}
982 1085
983sub reattach { 1086sub reattach {
984 # basically do the same as instantiate, without calling instantiate 1087 # basically do the same as instantiate, without calling instantiate
985 my ($obj) = @_; 1088 my ($obj) = @_;
1007cf::attachable->attach ( 1110cf::attachable->attach (
1008 prio => -1000000, 1111 prio => -1000000,
1009 on_instantiate => sub { 1112 on_instantiate => sub {
1010 my ($obj, $data) = @_; 1113 my ($obj, $data) = @_;
1011 1114
1012 $data = from_json $data; 1115 $data = decode_json $data;
1013 1116
1014 for (@$data) { 1117 for (@$data) {
1015 my ($name, $args) = @$_; 1118 my ($name, $args) = @$_;
1016 1119
1017 $obj->attach ($name, %{$args || {} }); 1120 $obj->attach ($name, %{$args || {} });
1038 utf8::decode (my $decname = $filename); 1141 utf8::decode (my $decname = $filename);
1039 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
1040 $decname, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
1041 1144
1042 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1043 chmod SAVE_MODE, $fh; 1146 aio_chmod $fh, SAVE_MODE;
1044 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1045 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
1046 close $fh; 1149 aio_close $fh;
1047 1150
1048 if (@$objs) { 1151 if (@$objs) {
1049 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
1051 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1052 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
1053 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1054 close $fh; 1157 aio_close $fh;
1055 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
1056 } 1159 }
1057 } else { 1160 } else {
1058 aio_unlink "$filename.pst"; 1161 aio_unlink "$filename.pst";
1059 } 1162 }
1087 1190
1088 unless (aio_stat "$filename.pst") { 1191 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1192 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1193 or return;
1091 1194
1092 my $st = eval { Coro::Storable::thaw $av } 1195 my $st = eval { Coro::Storable::thaw $av };
1093 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1094 $av = $st->{objs}; 1196 $av = $st->{objs};
1095 } 1197 }
1096 1198
1097 utf8::decode (my $decname = $filename); 1199 utf8::decode (my $decname = $filename);
1098 warn sprintf "loading %s (%d,%d)\n", 1200 warn sprintf "loading %s (%d,%d)\n",
1255 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1256 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1257 1359
1258 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1259 warn $msg; 1361 warn $msg;
1260 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1261 exit 1;
1262 } 1363 }
1263 1364
1264 warn $msg; 1365 warn $msg;
1265 } 1366 }
1266 1367
1355 my $f = new_from_file cf::object::thawer path $login 1456 my $f = new_from_file cf::object::thawer path $login
1356 or return; 1457 or return;
1357 1458
1358 my $pl = cf::player::load_pl $f 1459 my $pl = cf::player::load_pl $f
1359 or return; 1460 or return;
1461
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1462 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1463 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1363 } 1465 }
1364 } 1466 }
1374 1476
1375 return if $pl->{deny_save}; 1477 return if $pl->{deny_save};
1376 1478
1377 aio_mkdir playerdir $pl, 0770; 1479 aio_mkdir playerdir $pl, 0770;
1378 $pl->{last_save} = $cf::RUNTIME; 1480 $pl->{last_save} = $cf::RUNTIME;
1481
1482 cf::get_slot 0.01;
1379 1483
1380 $pl->save_pl ($path); 1484 $pl->save_pl ($path);
1381 cf::cede_to_tick; 1485 cf::cede_to_tick;
1382} 1486}
1383 1487
1467 1571
1468 for my $login (@$dirs) { 1572 for my $login (@$dirs) {
1469 my $path = path $login; 1573 my $path = path $login;
1470 1574
1471 # a .pst is a dead give-away for a valid player 1575 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") { 1576 # if no pst file found, open and chekc for blocked users
1577 if (aio_stat "$path.pst") {
1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1578 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1474 aio_read $fh, 0, 512, my $buf, 0 or next; 1579 aio_read $fh, 0, 512, my $buf, 0 or next;
1475 $buf !~ /^password -------------$/m or next; # official not-valid tag 1580 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 } 1581 }
1477 1582
1514 1619
1515Expand crossfire pod fragments into protocol xml. 1620Expand crossfire pod fragments into protocol xml.
1516 1621
1517=cut 1622=cut
1518 1623
1624use re 'eval';
1625
1626my $group;
1627my $interior; $interior = qr{
1628 # match a pod interior sequence sans C<< >>
1629 (?:
1630 \ (.*?)\ (?{ $group = $^N })
1631 | < (??{$interior}) >
1632 )
1633}x;
1634
1519sub expand_cfpod { 1635sub expand_cfpod {
1520 ((my $self), (local $_)) = @_; 1636 my ($self, $pod) = @_;
1521 1637
1522 # escape & and < 1638 my $xml;
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525 1639
1526 # this is buggy, it needs to properly take care of nested <'s 1640 while () {
1641 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1642 $group = $1;
1527 1643
1528 1 while 1644 $group =~ s/&/&amp;/g;
1529 # replace B<>, I<>, U<> etc. 1645 $group =~ s/</&lt;/g;
1530 s/B<([^\>]*)>/<b>$1<\/b>/ 1646
1531 || s/I<([^\>]*)>/<i>$1<\/i>/ 1647 $xml .= $group;
1532 || s/U<([^\>]*)>/<u>$1<\/u>/ 1648 } elsif ($pod =~ m%\G
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1649 ([BCGHITU])
1534 # replace G<male|female> tags 1650 <
1535 || s{G<([^>|]*)\|([^>]*)>}{ 1651 (?:
1536 $self->gender ? $2 : $1 1652 ([^<>]*) (?{ $group = $^N })
1537 }ge 1653 | < $interior >
1538 # replace H<hint text> 1654 )
1539 || s{H<([^\>]*)>} 1655 >
1656 %gcsx
1540 { 1657 ) {
1658 my ($code, $data) = ($1, $group);
1659
1660 if ($code eq "B") {
1661 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1662 } elsif ($code eq "I") {
1663 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1664 } elsif ($code eq "U") {
1665 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1666 } elsif ($code eq "C") {
1667 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1668 } elsif ($code eq "T") {
1669 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1670 } elsif ($code eq "G") {
1671 my ($male, $female) = split /\|/, $data;
1672 $data = $self->gender ? $female : $male;
1673 $xml .= expand_cfpod ($self, $data);
1674 } elsif ($code eq "H") {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1675 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1676 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "") 1677 "")
1544 [$self->{hintmode}] 1678 [$self->{hintmode}];
1679 } else {
1680 $xml .= "error processing '$code($data)' directive";
1545 }ge; 1681 }
1682 } else {
1683 if ($pod =~ /\G(.+)/) {
1684 warn "parse error while expanding $pod (at $1)";
1685 }
1686 last;
1687 }
1688 }
1546 1689
1690 for ($xml) {
1547 # create single paragraphs (very hackish) 1691 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g; 1692 s/(?<=\S)\n(?=\w)/ /g;
1549 1693
1550 # compress some whitespace 1694 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends 1695 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines 1696 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines 1697 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines 1698 s/\n+$//; # ending lines
1699 }
1555 1700
1556 $_ 1701 $xml
1557} 1702}
1703
1704no re 'eval';
1558 1705
1559sub hintmode { 1706sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1; 1707 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode} 1708 $_[0]{hintmode}
1562} 1709}
1634our $MAX_RESET = 3600; 1781our $MAX_RESET = 3600;
1635our $DEFAULT_RESET = 3000; 1782our $DEFAULT_RESET = 3000;
1636 1783
1637sub generate_random_map { 1784sub generate_random_map {
1638 my ($self, $rmp) = @_; 1785 my ($self, $rmp) = @_;
1786
1787 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1788
1639 # mit "rum" bekleckern, nicht 1789 # mit "rum" bekleckern, nicht
1640 $self->_create_random_map ( 1790 $self->_create_random_map (
1641 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1643 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1765 1915
1766# the temporary/swap location 1916# the temporary/swap location
1767sub save_path { 1917sub save_path {
1768 my ($self) = @_; 1918 my ($self) = @_;
1769 1919
1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1920 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771 "$TMPDIR/$path.map" 1921 "$TMPDIR/$path.map"
1772} 1922}
1773 1923
1774# the unique path, undef == no special unique path 1924# the unique path, undef == no special unique path
1775sub uniq_path { 1925sub uniq_path {
1776 my ($self) = @_; 1926 my ($self) = @_;
1777 1927
1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779 "$UNIQUEDIR/$path" 1929 "$UNIQUEDIR/$path"
1780} 1930}
1781 1931
1782# and all this just because we cannot iterate over 1932# and all this just because we cannot iterate over
1783# all maps in C++... 1933# all maps in C++...
1881 2031
1882 cf::lock_wait "map_data:$path";#d#remove 2032 cf::lock_wait "map_data:$path";#d#remove
1883 cf::lock_wait "map_find:$path"; 2033 cf::lock_wait "map_find:$path";
1884 2034
1885 $cf::MAP{$path} || do { 2035 $cf::MAP{$path} || do {
1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 2036 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2037 my $guard2 = cf::lock_acquire "map_find:$path";
1888 2038
1889 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
1890 or return; 2040 or return;
1891 2041
1892 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
1895 or return; 2045 or return;
1896 2046
1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898 # doing this can freeze the server in a sync job, obviously 2048 # doing this can freeze the server in a sync job, obviously
1899 #$cf::WAIT_FOR_TICK->wait; 2049 #$cf::WAIT_FOR_TICK->wait;
2050 undef $guard2;
1900 undef $guard1; 2051 undef $guard1;
1901 undef $guard2;
1902 $map->reset; 2052 $map->reset;
1903 return find $path; 2053 return find $path;
1904 } 2054 }
1905 2055
1906 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
1969 } 2119 }
1970 2120
1971 $self->{last_save} = $cf::RUNTIME; 2121 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME); 2122 $self->last_access ($cf::RUNTIME);
1973 2123
1974 $self->in_memory (cf::MAP_IN_MEMORY); 2124 $self->in_memory (cf::MAP_ACTIVE);
1975 } 2125 }
1976 2126
1977 $self->post_load; 2127 $self->post_load;
1978} 2128}
1979 2129
2037 my ($path, $origin, $load) = @_; 2187 my ($path, $origin, $load) = @_;
2038 2188
2039 $path = normalise $path, $origin && $origin->{path}; 2189 $path = normalise $path, $origin && $origin->{path};
2040 2190
2041 if (my $map = $cf::MAP{$path}) { 2191 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2192 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043 } 2193 }
2044 2194
2045 $MAP_PREFETCH{$path} |= $load; 2195 $MAP_PREFETCH{$path} |= $load;
2046 2196
2047 $MAP_PREFETCHER ||= cf::async { 2197 $MAP_PREFETCHER ||= cf::async {
2084 cf::async { 2234 cf::async {
2085 $Coro::current->{desc} = "map player save"; 2235 $Coro::current->{desc} = "map player save";
2086 $_->contr->save for $self->players; 2236 $_->contr->save for $self->players;
2087 }; 2237 };
2088 2238
2239 cf::get_slot 0.02;
2240
2089 if ($uniq) { 2241 if ($uniq) {
2090 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2242 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2091 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2243 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2092 } else { 2244 } else {
2093 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2101 $self->save; 2253 $self->save;
2102 2254
2103 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2255 my $lock = cf::lock_acquire "map_data:$self->{path}";
2104 2256
2105 return if $self->players; 2257 return if $self->players;
2106 return if $self->in_memory != cf::MAP_IN_MEMORY; 2258 return if $self->in_memory != cf::MAP_ACTIVE;
2107 return if $self->{deny_save}; 2259 return if $self->{deny_save};
2108 2260
2109 $self->in_memory (cf::MAP_SWAPPED); 2261 $self->in_memory (cf::MAP_SWAPPED);
2110 2262
2111 $self->deactivate; 2263 $self->deactivate;
2229 2381
2230sub unique_maps() { 2382sub unique_maps() {
2231 [ 2383 [
2232 map { 2384 map {
2233 utf8::decode $_; 2385 utf8::decode $_;
2234 /\.map$/ 2386 s/\.map$//; # TODO future compatibility hack
2387 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2388 ? ()
2235 ? normalise $_ 2389 : normalise $_
2236 : ()
2237 } @{ aio_readdir $UNIQUEDIR or [] } 2390 } @{ aio_readdir $UNIQUEDIR or [] }
2238 ] 2391 ]
2239} 2392}
2240 2393
2241package cf;
2242
2243=back 2394=back
2244 2395
2245=head3 cf::object 2396=head3 cf::object
2246 2397
2247=cut 2398=cut
2250 2401
2251=over 4 2402=over 4
2252 2403
2253=item $ob->inv_recursive 2404=item $ob->inv_recursive
2254 2405
2255Returns the inventory of the object _and_ their inventories, recursively. 2406Returns the inventory of the object I<and> their inventories, recursively,
2407but I<not> the object itself.
2256 2408
2257=cut 2409=cut
2258 2410
2259sub inv_recursive_; 2411sub inv_recursive_;
2260sub inv_recursive_ { 2412sub inv_recursive_ {
2265 inv_recursive_ inv $_[0] 2417 inv_recursive_ inv $_[0]
2266} 2418}
2267 2419
2268=item $ref = $ob->ref 2420=item $ref = $ob->ref
2269 2421
2270creates and returns a persistent reference to an objetc that can be stored as a string. 2422Creates and returns a persistent reference to an object that can be stored as a string.
2271 2423
2272=item $ob = cf::object::deref ($refstring) 2424=item $ob = cf::object::deref ($refstring)
2273 2425
2274returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2426returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2275even if the object actually exists. May block. 2427even if the object actually exists. May block.
2307can be C<undef>. Does the right thing when the player is currently in a 2459can be C<undef>. Does the right thing when the player is currently in a
2308dialogue with the given NPC character. 2460dialogue with the given NPC character.
2309 2461
2310=cut 2462=cut
2311 2463
2464our $SAY_CHANNEL = {
2465 id => "say",
2466 title => "Map",
2467 reply => "say ",
2468 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2469};
2470
2471our $CHAT_CHANNEL = {
2472 id => "chat",
2473 title => "Chat",
2474 reply => "chat ",
2475 tooltip => "Player chat and shouts, global to the server.",
2476};
2477
2312# rough implementation of a future "reply" method that works 2478# rough implementation of a future "reply" method that works
2313# with dialog boxes. 2479# with dialog boxes.
2314#TODO: the first argument must go, split into a $npc->reply_to ( method 2480#TODO: the first argument must go, split into a $npc->reply_to ( method
2315sub cf::object::player::reply($$$;$) { 2481sub cf::object::player::reply($$$;$) {
2316 my ($self, $npc, $msg, $flags) = @_; 2482 my ($self, $npc, $msg, $flags) = @_;
2327 my $dialog = $pl->{npc_dialog}; 2493 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2494 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329 2495
2330 } else { 2496 } else {
2331 $msg = $npc->name . " says: $msg" if $npc; 2497 $msg = $npc->name . " says: $msg" if $npc;
2332 $self->message ($msg, $flags); 2498 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333 } 2499 }
2334 } 2500 }
2335} 2501}
2336 2502
2337=item $object->send_msg ($channel, $msg, $color, [extra...]) 2503=item $object->send_msg ($channel, $msg, $color, [extra...])
2532} 2698}
2533 2699
2534sub prepare_random_map { 2700sub prepare_random_map {
2535 my ($exit) = @_; 2701 my ($exit) = @_;
2536 2702
2537 my $guard = cf::lock_acquire "exit_prepare:$exit";
2538
2539 # all this does is basically replace the /! path by 2703 # all this does is basically replace the /! path by
2540 # a new random map path (?random/...) with a seed 2704 # a new random map path (?random/...) with a seed
2541 # that depends on the exit object 2705 # that depends on the exit object
2542 2706
2543 my $rmp = parse_random_map_params $exit->msg; 2707 my $rmp = parse_random_map_params $exit->msg;
2545 if ($exit->map) { 2709 if ($exit->map) {
2546 $rmp->{region} = $exit->region->name; 2710 $rmp->{region} = $exit->region->name;
2547 $rmp->{origin_map} = $exit->map->path; 2711 $rmp->{origin_map} = $exit->map->path;
2548 $rmp->{origin_x} = $exit->x; 2712 $rmp->{origin_x} = $exit->x;
2549 $rmp->{origin_y} = $exit->y; 2713 $rmp->{origin_y} = $exit->y;
2714
2715 $exit->map->touch;
2550 } 2716 }
2551 2717
2552 $rmp->{random_seed} ||= $exit->random_seed; 2718 $rmp->{random_seed} ||= $exit->random_seed;
2553 2719
2554 my $data = cf::to_json $rmp; 2720 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2555 my $md5 = Digest::MD5::md5_hex $data; 2721 my $md5 = Digest::MD5::md5_hex $data;
2556 my $meta = "$RANDOMDIR/$md5.meta"; 2722 my $meta = "$RANDOMDIR/$md5.meta";
2557 2723
2558 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2724 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2559 aio_write $fh, 0, (length $data), $data, 0; 2725 aio_write $fh, 0, (length $data), $data, 0;
2560 undef $fh; 2726 undef $fh;
2561 aio_rename "$meta~", $meta; 2727 aio_rename "$meta~", $meta;
2562 2728
2729 my $slaying = "?random/$md5";
2730
2731 if ($exit->valid) {
2563 $exit->slaying ("?random/$md5"); 2732 $exit->slaying ("?random/$md5");
2564 $exit->msg (undef); 2733 $exit->msg (undef);
2734 }
2565 } 2735 }
2566} 2736}
2567 2737
2568sub cf::object::player::enter_exit { 2738sub cf::object::player::enter_exit {
2569 my ($self, $exit) = @_; 2739 my ($self, $exit) = @_;
2570 2740
2571 return unless $self->type == cf::PLAYER; 2741 return unless $self->type == cf::PLAYER;
2572 2742
2573 if ($exit->slaying eq "/!") {
2574 #TODO: this should de-fi-ni-te-ly not be a sync-job
2575 # the problem is that $exit might not survive long enough
2576 # so it needs to be done right now, right here
2577 cf::sync_job { prepare_random_map $exit };
2578 }
2579
2580 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2581 my $hp = $exit->stats->hp;
2582 my $sp = $exit->stats->sp;
2583
2584 $self->enter_link; 2743 $self->enter_link;
2585 2744
2586 # if exit is damned, update players death & WoR home-position
2587 $self->contr->savebed ($slaying, $hp, $sp)
2588 if $exit->flag (FLAG_DAMNED);
2589
2590 (async { 2745 (async {
2591 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2746 $Coro::current->{desc} = "enter_exit";
2592 2747
2593 $self->deactivate_recursive; # just to be sure
2594 unless (eval { 2748 unless (eval {
2749 $self->deactivate_recursive; # just to be sure
2750
2751 # random map handling
2752 {
2753 my $guard = cf::lock_acquire "exit_prepare:$exit";
2754
2755 prepare_random_map $exit
2756 if $exit->slaying eq "/!";
2757 }
2758
2759 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2760 my $x = $exit->stats->hp;
2761 my $y = $exit->stats->sp;
2762
2595 $self->goto ($slaying, $hp, $sp); 2763 $self->goto ($map, $x, $y);
2596 2764
2765 # if exit is damned, update players death & WoR home-position
2766 $self->contr->savebed ($map, $x, $y)
2767 if $exit->flag (cf::FLAG_DAMNED);
2768
2597 1; 2769 1
2598 }) { 2770 }) {
2599 $self->message ("Something went wrong deep within the crossfire server. " 2771 $self->message ("Something went wrong deep within the crossfire server. "
2600 . "I'll try to bring you back to the map you were before. " 2772 . "I'll try to bring you back to the map you were before. "
2601 . "Please report this to the dungeon master!", 2773 . "Please report this to the dungeon master!",
2602 cf::NDI_UNIQUE | cf::NDI_RED); 2774 cf::NDI_UNIQUE | cf::NDI_RED);
2632the message, with C<log> being the default. If C<$color> is negative, suppress 2804the message, with C<log> being the default. If C<$color> is negative, suppress
2633the message unless the client supports the msg packet. 2805the message unless the client supports the msg packet.
2634 2806
2635=cut 2807=cut
2636 2808
2809# non-persistent channels (usually the info channel)
2637our %CHANNEL = ( 2810our %CHANNEL = (
2638 "c/identify" => { 2811 "c/identify" => {
2639 id => "infobox", 2812 id => "infobox",
2640 title => "Identify", 2813 title => "Identify",
2641 reply => undef, 2814 reply => undef,
2645 id => "infobox", 2818 id => "infobox",
2646 title => "Examine", 2819 title => "Examine",
2647 reply => undef, 2820 reply => undef,
2648 tooltip => "Signs and other items you examined", 2821 tooltip => "Signs and other items you examined",
2649 }, 2822 },
2823 "c/book" => {
2824 id => "infobox",
2825 title => "Book",
2826 reply => undef,
2827 tooltip => "The contents of a note or book",
2828 },
2650 "c/lookat" => { 2829 "c/lookat" => {
2651 id => "infobox", 2830 id => "infobox",
2652 title => "Look", 2831 title => "Look",
2653 reply => undef, 2832 reply => undef,
2654 tooltip => "What you saw there", 2833 tooltip => "What you saw there",
2834 },
2835 "c/who" => {
2836 id => "infobox",
2837 title => "Players",
2838 reply => undef,
2839 tooltip => "Shows players who are currently online",
2840 },
2841 "c/body" => {
2842 id => "infobox",
2843 title => "Body Parts",
2844 reply => undef,
2845 tooltip => "Shows which body parts you posess and are available",
2846 },
2847 "c/uptime" => {
2848 id => "infobox",
2849 title => "Uptime",
2850 reply => undef,
2851 tooltip => "How long the server has been running since last restart",
2852 },
2853 "c/mapinfo" => {
2854 id => "infobox",
2855 title => "Map Info",
2856 reply => undef,
2857 tooltip => "Information related to the maps",
2858 },
2859 "c/party" => {
2860 id => "party",
2861 title => "Party",
2862 reply => "gsay ",
2863 tooltip => "Messages and chat related to your party",
2655 }, 2864 },
2656); 2865);
2657 2866
2658sub cf::client::send_msg { 2867sub cf::client::send_msg {
2659 my ($self, $channel, $msg, $color, @extra) = @_; 2868 my ($self, $channel, $msg, $color, @extra) = @_;
2896=pod 3105=pod
2897 3106
2898The following functions and methods are available within a safe environment: 3107The following functions and methods are available within a safe environment:
2899 3108
2900 cf::object 3109 cf::object
2901 contr pay_amount pay_player map x y force_find force_add 3110 contr pay_amount pay_player map x y force_find force_add destroy
2902 insert remove name archname title slaying race decrease_ob_nr 3111 insert remove name archname title slaying race decrease split
2903 3112
2904 cf::object::player 3113 cf::object::player
2905 player 3114 player
2906 3115
2907 cf::player 3116 cf::player
2913=cut 3122=cut
2914 3123
2915for ( 3124for (
2916 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3125 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2917 insert remove inv name archname title slaying race 3126 insert remove inv name archname title slaying race
2918 decrease_ob_nr)], 3127 decrease split destroy)],
2919 ["cf::object::player" => qw(player)], 3128 ["cf::object::player" => qw(player)],
2920 ["cf::player" => qw(peaceful)], 3129 ["cf::player" => qw(peaceful)],
2921 ["cf::map" => qw(trigger)], 3130 ["cf::map" => qw(trigger)],
2922) { 3131) {
2923 no strict 'refs'; 3132 no strict 'refs';
3028 { 3237 {
3029 my $faces = $facedata->{faceinfo}; 3238 my $faces = $facedata->{faceinfo};
3030 3239
3031 while (my ($face, $info) = each %$faces) { 3240 while (my ($face, $info) = each %$faces) {
3032 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3241 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3242
3033 cf::face::set_visibility $idx, $info->{visibility}; 3243 cf::face::set_visibility $idx, $info->{visibility};
3034 cf::face::set_magicmap $idx, $info->{magicmap}; 3244 cf::face::set_magicmap $idx, $info->{magicmap};
3035 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3245 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3036 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3246 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3037 3247
3038 cf::cede_to_tick; 3248 cf::cede_to_tick;
3039 } 3249 }
3040 3250
3041 while (my ($face, $info) = each %$faces) { 3251 while (my ($face, $info) = each %$faces) {
3042 next unless $info->{smooth}; 3252 next unless $info->{smooth};
3253
3043 my $idx = cf::face::find $face 3254 my $idx = cf::face::find $face
3044 or next; 3255 or next;
3256
3045 if (my $smooth = cf::face::find $info->{smooth}) { 3257 if (my $smooth = cf::face::find $info->{smooth}) {
3046 cf::face::set_smooth $idx, $smooth; 3258 cf::face::set_smooth $idx, $smooth;
3047 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3259 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3048 } else { 3260 } else {
3049 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3261 warn "smooth face '$info->{smooth}' not found for face '$face'";
3067 { 3279 {
3068 # TODO: for gcfclient pleasure, we should give resources 3280 # TODO: for gcfclient pleasure, we should give resources
3069 # that gcfclient doesn't grok a >10000 face index. 3281 # that gcfclient doesn't grok a >10000 face index.
3070 my $res = $facedata->{resource}; 3282 my $res = $facedata->{resource};
3071 3283
3072 my $soundconf = delete $res->{"res/sound.conf"};
3073
3074 while (my ($name, $info) = each %$res) { 3284 while (my ($name, $info) = each %$res) {
3285 if (defined $info->{type}) {
3075 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3286 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3076 my $data; 3287 my $data;
3077 3288
3078 if ($info->{type} & 1) { 3289 if ($info->{type} & 1) {
3079 # prepend meta info 3290 # prepend meta info
3080 3291
3081 my $meta = $enc->encode ({ 3292 my $meta = $enc->encode ({
3082 name => $name, 3293 name => $name,
3083 %{ $info->{meta} || {} }, 3294 %{ $info->{meta} || {} },
3084 }); 3295 });
3085 3296
3086 $data = pack "(w/a*)*", $meta, $info->{data}; 3297 $data = pack "(w/a*)*", $meta, $info->{data};
3298 } else {
3299 $data = $info->{data};
3300 }
3301
3302 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3303 cf::face::set_type $idx, $info->{type};
3087 } else { 3304 } else {
3088 $data = $info->{data}; 3305 $RESOURCE{$name} = $info;
3089 } 3306 }
3090 3307
3091 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3092 cf::face::set_type $idx, $info->{type};
3093
3094 cf::cede_to_tick; 3308 cf::cede_to_tick;
3095 } 3309 }
3096
3097 if ($soundconf) {
3098 $soundconf = $enc->decode (delete $soundconf->{data});
3099
3100 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3101 my $sound = $soundconf->{compat}[$_]
3102 or next;
3103
3104 my $face = cf::face::find "sound/$sound->[1]";
3105 cf::sound::set $sound->[0] => $face;
3106 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3107 }
3108
3109 while (my ($k, $v) = each %{$soundconf->{event}}) {
3110 my $face = cf::face::find "sound/$v";
3111 cf::sound::set $k => $face;
3112 }
3113 }
3114 } 3310 }
3311
3312 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3115 3313
3116 1 3314 1
3117} 3315}
3316
3317cf::global->attach (on_resource_update => sub {
3318 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3319 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3320
3321 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3322 my $sound = $soundconf->{compat}[$_]
3323 or next;
3324
3325 my $face = cf::face::find "sound/$sound->[1]";
3326 cf::sound::set $sound->[0] => $face;
3327 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3328 }
3329
3330 while (my ($k, $v) = each %{$soundconf->{event}}) {
3331 my $face = cf::face::find "sound/$v";
3332 cf::sound::set $k => $face;
3333 }
3334 }
3335});
3118 3336
3119register_exticmd fx_want => sub { 3337register_exticmd fx_want => sub {
3120 my ($ns, $want) = @_; 3338 my ($ns, $want) = @_;
3121 3339
3122 while (my ($k, $v) = each %$want) { 3340 while (my ($k, $v) = each %$want) {
3123 $ns->fx_want ($k, $v); 3341 $ns->fx_want ($k, $v);
3124 } 3342 }
3125}; 3343};
3344
3345sub load_resource_file($) {
3346 my $guard = lock_acquire "load_resource_file";
3347
3348 my $status = load_resource_file_ $_[0];
3349 get_slot 0.1, 100;
3350 cf::arch::commit_load;
3351
3352 $status
3353}
3126 3354
3127sub reload_regions { 3355sub reload_regions {
3128 # HACK to clear player env face cache, we need some signal framework 3356 # HACK to clear player env face cache, we need some signal framework
3129 # for this (global event?) 3357 # for this (global event?)
3130 %ext::player_env::MUSIC_FACE_CACHE = (); 3358 %ext::player_env::MUSIC_FACE_CACHE = ();
3144} 3372}
3145 3373
3146sub reload_archetypes { 3374sub reload_archetypes {
3147 load_resource_file "$DATADIR/archetypes" 3375 load_resource_file "$DATADIR/archetypes"
3148 or die "unable to load archetypes\n"; 3376 or die "unable to load archetypes\n";
3149 #d# NEED to laod twice to resolve forward references
3150 # this really needs to be done in an extra post-pass
3151 # (which needs to be synchronous, so solve it differently)
3152 load_resource_file "$DATADIR/archetypes"
3153 or die "unable to load archetypes\n";
3154} 3377}
3155 3378
3156sub reload_treasures { 3379sub reload_treasures {
3157 load_resource_file "$DATADIR/treasures" 3380 load_resource_file "$DATADIR/treasures"
3158 or die "unable to load treasurelists\n"; 3381 or die "unable to load treasurelists\n";
3159} 3382}
3160 3383
3161sub reload_resources { 3384sub reload_resources {
3162 warn "reloading resource files...\n"; 3385 warn "reloading resource files...\n";
3163 3386
3387 reload_facedata;
3388 reload_archetypes;
3164 reload_regions; 3389 reload_regions;
3165 reload_facedata;
3166 #reload_archetypes;#d#
3167 reload_archetypes;
3168 reload_treasures; 3390 reload_treasures;
3169 3391
3170 warn "finished reloading resource files\n"; 3392 warn "finished reloading resource files\n";
3171} 3393}
3172 3394
3173sub init { 3395sub init {
3396 my $guard = freeze_mainloop;
3397
3174 reload_resources; 3398 reload_resources;
3175} 3399}
3176 3400
3177sub reload_config { 3401sub reload_config {
3178 open my $fh, "<:utf8", "$CONFDIR/config" 3402 open my $fh, "<:utf8", "$CONFDIR/config"
3179 or return; 3403 or return;
3180 3404
3181 local $/; 3405 local $/;
3182 *CFG = YAML::Syck::Load <$fh>; 3406 *CFG = YAML::Load <$fh>;
3183 3407
3184 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3408 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3185 3409
3186 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3410 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3187 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3411 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3199 # we must not ever block the main coroutine 3423 # we must not ever block the main coroutine
3200 local $Coro::idle = sub { 3424 local $Coro::idle = sub {
3201 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3425 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3202 (async { 3426 (async {
3203 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3427 $Coro::current->{desc} = "IDLE BUG HANDLER";
3204 Event::one_event; 3428 EV::loop EV::LOOP_ONESHOT;
3205 })->prio (Coro::PRIO_MAX); 3429 })->prio (Coro::PRIO_MAX);
3206 }; 3430 };
3207 3431
3432 {
3433 my $guard = freeze_mainloop;
3208 reload_config; 3434 reload_config;
3209 db_init; 3435 db_init;
3210 load_extensions; 3436 load_extensions;
3211 3437
3212 $TICK_WATCHER->start; 3438 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3439 evthread_start IO::AIO::poll_fileno;
3440 }
3441
3213 Event::loop; 3442 EV::loop;
3214} 3443}
3215 3444
3216############################################################################# 3445#############################################################################
3217# initialisation and cleanup 3446# initialisation and cleanup
3218 3447
3219# install some emergency cleanup handlers 3448# install some emergency cleanup handlers
3220BEGIN { 3449BEGIN {
3450 our %SIGWATCHER = ();
3221 for my $signal (qw(INT HUP TERM)) { 3451 for my $signal (qw(INT HUP TERM)) {
3222 Event->signal ( 3452 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3223 reentrant => 0,
3224 data => WF_AUTOCANCEL,
3225 signal => $signal,
3226 prio => 0,
3227 cb => sub {
3228 cf::cleanup "SIG$signal"; 3453 cf::cleanup "SIG$signal";
3229 },
3230 ); 3454 };
3231 } 3455 }
3232} 3456}
3233 3457
3234sub write_runtime { 3458sub write_runtime_sync {
3235 my $runtime = "$LOCALDIR/runtime"; 3459 my $runtime = "$LOCALDIR/runtime";
3236 3460
3237 # first touch the runtime file to show we are still running: 3461 # first touch the runtime file to show we are still running:
3238 # the fsync below can take a very very long time. 3462 # the fsync below can take a very very long time.
3239 3463
3265 and return; 3489 and return;
3266 3490
3267 warn "runtime file written.\n"; 3491 warn "runtime file written.\n";
3268 3492
3269 1 3493 1
3494}
3495
3496our $uuid_lock;
3497our $uuid_skip;
3498
3499sub write_uuid_sync($) {
3500 $uuid_skip ||= $_[0];
3501
3502 return if $uuid_lock;
3503 local $uuid_lock = 1;
3504
3505 my $uuid = "$LOCALDIR/uuid";
3506
3507 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3508 or return;
3509
3510 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3511 $uuid_skip = 0;
3512
3513 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3514 and return;
3515
3516 # always fsync - this file is important
3517 aio_fsync $fh
3518 and return;
3519
3520 close $fh
3521 or return;
3522
3523 aio_rename "$uuid~", $uuid
3524 and return;
3525
3526 warn "uuid file written ($value).\n";
3527
3528 1
3529
3530}
3531
3532sub write_uuid($$) {
3533 my ($skip, $sync) = @_;
3534
3535 $sync ? write_uuid_sync $skip
3536 : async { write_uuid_sync $skip };
3270} 3537}
3271 3538
3272sub emergency_save() { 3539sub emergency_save() {
3273 my $freeze_guard = cf::freeze_mainloop; 3540 my $freeze_guard = cf::freeze_mainloop;
3274 3541
3280 # and maps saved/destroyed asynchronously. 3547 # and maps saved/destroyed asynchronously.
3281 warn "begin emergency player save\n"; 3548 warn "begin emergency player save\n";
3282 for my $login (keys %cf::PLAYER) { 3549 for my $login (keys %cf::PLAYER) {
3283 my $pl = $cf::PLAYER{$login} or next; 3550 my $pl = $cf::PLAYER{$login} or next;
3284 $pl->valid or next; 3551 $pl->valid or next;
3285 delete $pl->{unclean_save}; 3552 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3286 $pl->save; 3553 $pl->save;
3287 } 3554 }
3288 warn "end emergency player save\n"; 3555 warn "end emergency player save\n";
3289 3556
3290 warn "begin emergency map save\n"; 3557 warn "begin emergency map save\n";
3296 warn "end emergency map save\n"; 3563 warn "end emergency map save\n";
3297 3564
3298 warn "begin emergency database checkpoint\n"; 3565 warn "begin emergency database checkpoint\n";
3299 BDB::db_env_txn_checkpoint $DB_ENV; 3566 BDB::db_env_txn_checkpoint $DB_ENV;
3300 warn "end emergency database checkpoint\n"; 3567 warn "end emergency database checkpoint\n";
3568
3569 warn "begin write uuid\n";
3570 write_uuid_sync 1;
3571 warn "end write uuid\n";
3301 }; 3572 };
3302 3573
3303 warn "leave emergency perl save\n"; 3574 warn "leave emergency perl save\n";
3304} 3575}
3305 3576
3320 warn "reloading..."; 3591 warn "reloading...";
3321 3592
3322 warn "entering sync_job"; 3593 warn "entering sync_job";
3323 3594
3324 cf::sync_job { 3595 cf::sync_job {
3325 cf::write_runtime; # external watchdog should not bark 3596 cf::write_runtime_sync; # external watchdog should not bark
3326 cf::emergency_save; 3597 cf::emergency_save;
3327 cf::write_runtime; # external watchdog should not bark 3598 cf::write_runtime_sync; # external watchdog should not bark
3328 3599
3329 warn "syncing database to disk"; 3600 warn "syncing database to disk";
3330 BDB::db_env_txn_checkpoint $DB_ENV; 3601 BDB::db_env_txn_checkpoint $DB_ENV;
3331 3602
3332 # if anything goes wrong in here, we should simply crash as we already saved 3603 # if anything goes wrong in here, we should simply crash as we already saved
3333
3334 warn "cancelling all WF_AUTOCANCEL watchers";
3335 for (Event::all_watchers) {
3336 $_->cancel if $_->data & WF_AUTOCANCEL;
3337 }
3338 3604
3339 warn "flushing outstanding aio requests"; 3605 warn "flushing outstanding aio requests";
3340 for (;;) { 3606 for (;;) {
3341 BDB::flush; 3607 BDB::flush;
3342 IO::AIO::flush; 3608 IO::AIO::flush;
3343 Coro::cede; 3609 Coro::cede_notself;
3344 last unless IO::AIO::nreqs || BDB::nreqs; 3610 last unless IO::AIO::nreqs || BDB::nreqs;
3345 warn "iterate..."; 3611 warn "iterate...";
3346 } 3612 }
3347 3613
3348 ++$RELOAD; 3614 ++$RELOAD;
3424 warn "leaving sync_job"; 3690 warn "leaving sync_job";
3425 3691
3426 1 3692 1
3427 } or do { 3693 } or do {
3428 warn $@; 3694 warn $@;
3429 warn "error while reloading, exiting."; 3695 cf::cleanup "error while reloading, exiting.";
3430 exit 1;
3431 }; 3696 };
3432 3697
3433 warn "reloaded"; 3698 warn "reloaded";
3434}; 3699};
3435 3700
3437 3702
3438sub reload_perl() { 3703sub reload_perl() {
3439 # doing reload synchronously and two reloads happen back-to-back, 3704 # doing reload synchronously and two reloads happen back-to-back,
3440 # coro crashes during coro_state_free->destroy here. 3705 # coro crashes during coro_state_free->destroy here.
3441 3706
3442 $RELOAD_WATCHER ||= Event->timer ( 3707 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3443 reentrant => 0,
3444 after => 0,
3445 data => WF_AUTOCANCEL,
3446 cb => sub {
3447 do_reload_perl; 3708 do_reload_perl;
3448 undef $RELOAD_WATCHER; 3709 undef $RELOAD_WATCHER;
3449 },
3450 ); 3710 };
3451} 3711}
3452 3712
3453register_command "reload" => sub { 3713register_command "reload" => sub {
3454 my ($who, $arg) = @_; 3714 my ($who, $arg) = @_;
3455 3715
3468 3728
3469our @WAIT_FOR_TICK; 3729our @WAIT_FOR_TICK;
3470our @WAIT_FOR_TICK_BEGIN; 3730our @WAIT_FOR_TICK_BEGIN;
3471 3731
3472sub wait_for_tick { 3732sub wait_for_tick {
3473 return unless $TICK_WATCHER->is_active;
3474 return if $Coro::current == $Coro::main; 3733 return if tick_inhibit || $Coro::current == $Coro::main;
3475 3734
3476 my $signal = new Coro::Signal; 3735 my $signal = new Coro::Signal;
3477 push @WAIT_FOR_TICK, $signal; 3736 push @WAIT_FOR_TICK, $signal;
3478 $signal->wait; 3737 $signal->wait;
3479} 3738}
3480 3739
3481sub wait_for_tick_begin { 3740sub wait_for_tick_begin {
3482 return unless $TICK_WATCHER->is_active;
3483 return if $Coro::current == $Coro::main; 3741 return if tick_inhibit || $Coro::current == $Coro::main;
3484 3742
3485 my $signal = new Coro::Signal; 3743 my $signal = new Coro::Signal;
3486 push @WAIT_FOR_TICK_BEGIN, $signal; 3744 push @WAIT_FOR_TICK_BEGIN, $signal;
3487 $signal->wait; 3745 $signal->wait;
3488} 3746}
3489 3747
3490$TICK_WATCHER = Event->timer ( 3748sub tick {
3491 reentrant => 0,
3492 parked => 1,
3493 prio => 0,
3494 at => $NEXT_TICK || $TICK,
3495 data => WF_AUTOCANCEL,
3496 cb => sub {
3497 if ($Coro::current != $Coro::main) { 3749 if ($Coro::current != $Coro::main) {
3498 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3750 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3499 unless ++$bug_warning > 10; 3751 unless ++$bug_warning > 10;
3500 return; 3752 return;
3501 } 3753 }
3502 3754
3503 $NOW = $tick_start = Event::time;
3504
3505 cf::server_tick; # one server iteration 3755 cf::server_tick; # one server iteration
3506 3756
3507 $RUNTIME += $TICK;
3508 $NEXT_TICK += $TICK;
3509
3510 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3757 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3511 $NEXT_RUNTIME_WRITE = $NOW + 10; 3758 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3512 Coro::async_pool { 3759 Coro::async_pool {
3513 $Coro::current->{desc} = "runtime saver"; 3760 $Coro::current->{desc} = "runtime saver";
3514 write_runtime 3761 write_runtime_sync
3515 or warn "ERROR: unable to write runtime file: $!"; 3762 or warn "ERROR: unable to write runtime file: $!";
3516 };
3517 } 3763 };
3764 }
3518 3765
3519 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3766 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3520 $sig->send; 3767 $sig->send;
3521 } 3768 }
3522 while (my $sig = shift @WAIT_FOR_TICK) { 3769 while (my $sig = shift @WAIT_FOR_TICK) {
3523 $sig->send; 3770 $sig->send;
3524 } 3771 }
3525 3772
3526 $NOW = Event::time; 3773 $LOAD = ($NOW - $TICK_START) / $TICK;
3527
3528 # if we are delayed by four ticks or more, skip them all
3529 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3530
3531 $TICK_WATCHER->at ($NEXT_TICK);
3532 $TICK_WATCHER->start;
3533
3534 $LOAD = ($NOW - $tick_start) / $TICK;
3535 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3774 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3536 3775
3537 _post_tick; 3776 if (0) {
3777 if ($NEXT_TICK) {
3778 my $jitter = $TICK_START - $NEXT_TICK;
3779 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3780 warn "jitter $JITTER\n";#d#
3781 }
3538 }, 3782 }
3539); 3783}
3540 3784
3541{ 3785{
3786 # configure BDB
3787
3542 BDB::min_parallel 8; 3788 BDB::min_parallel 8;
3543 BDB::max_poll_time $TICK * 0.1; 3789 BDB::max_poll_reqs $TICK * 0.1;
3544 $BDB_POLL_WATCHER = Event->io ( 3790 $Coro::BDB::WATCHER->priority (1);
3545 reentrant => 0,
3546 fd => BDB::poll_fileno,
3547 poll => 'r',
3548 prio => 0,
3549 data => WF_AUTOCANCEL,
3550 cb => \&BDB::poll_cb,
3551 );
3552
3553 BDB::set_sync_prepare {
3554 my $status;
3555 my $current = $Coro::current;
3556 (
3557 sub {
3558 $status = $!;
3559 $current->ready; undef $current;
3560 },
3561 sub {
3562 Coro::schedule while defined $current;
3563 $! = $status;
3564 },
3565 )
3566 };
3567 3791
3568 unless ($DB_ENV) { 3792 unless ($DB_ENV) {
3569 $DB_ENV = BDB::db_env_create; 3793 $DB_ENV = BDB::db_env_create;
3570 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3794 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3571 | BDB::LOG_AUTOREMOVE, 1); 3795 | BDB::LOG_AUTOREMOVE, 1);
3586 3810
3587 cf::cleanup "db_env_open(db): $@" if $@; 3811 cf::cleanup "db_env_open(db): $@" if $@;
3588 }; 3812 };
3589 } 3813 }
3590 3814
3591 $BDB_DEADLOCK_WATCHER = Event->timer ( 3815 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3592 after => 3,
3593 interval => 1,
3594 hard => 1,
3595 prio => 0,
3596 data => WF_AUTOCANCEL,
3597 cb => sub {
3598 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3816 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3599 },
3600 ); 3817 };
3601 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3818 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3602 after => 11,
3603 interval => 60,
3604 hard => 1,
3605 prio => 0,
3606 data => WF_AUTOCANCEL,
3607 cb => sub {
3608 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3819 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3609 },
3610 ); 3820 };
3611 $BDB_TRICKLE_WATCHER = Event->timer ( 3821 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3612 after => 5,
3613 interval => 10,
3614 hard => 1,
3615 prio => 0,
3616 data => WF_AUTOCANCEL,
3617 cb => sub {
3618 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3822 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3619 },
3620 ); 3823 };
3621} 3824}
3622 3825
3623{ 3826{
3827 # configure IO::AIO
3828
3624 IO::AIO::min_parallel 8; 3829 IO::AIO::min_parallel 8;
3625
3626 undef $Coro::AIO::WATCHER;
3627 IO::AIO::max_poll_time $TICK * 0.1; 3830 IO::AIO::max_poll_time $TICK * 0.1;
3628 $AIO_POLL_WATCHER = Event->io ( 3831 $Coro::AIO::WATCHER->priority (1);
3629 reentrant => 0,
3630 data => WF_AUTOCANCEL,
3631 fd => IO::AIO::poll_fileno,
3632 poll => 'r',
3633 prio => 0,
3634 cb => \&IO::AIO::poll_cb,
3635 );
3636} 3832}
3637 3833
3638my $_log_backtrace; 3834my $_log_backtrace;
3639 3835
3640sub _log_backtrace { 3836sub _log_backtrace {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines