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.435 by root, Thu May 29 03:33:20 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Event; 30use EV;
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 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::AnyEvent;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
43use Coro::AnyEvent;
22use Coro::AIO; 44use Coro::AIO;
45use Coro::BDB;
23use Coro::Storable; 46use Coro::Storable;
24use Coro::Util (); 47use Coro::Util ();
25 48
26use JSON::XS (); 49use JSON::XS 2.01 ();
27use BDB (); 50use BDB ();
28use Data::Dumper; 51use Data::Dumper;
29use Digest::MD5; 52use Digest::MD5;
30use Fcntl; 53use Fcntl;
31use YAML::Syck (); 54use YAML ();
32use IO::AIO 2.51 (); 55use IO::AIO ();
33use Time::HiRes; 56use Time::HiRes;
34use Compress::LZF; 57use Compress::LZF;
35use Digest::MD5 (); 58use Digest::MD5 ();
59
60AnyEvent::detect;
36 61
37# configure various modules to our taste 62# configure various modules to our taste
38# 63#
39$Storable::canonical = 1; # reduce rsync transfers 64$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 65Coro::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 66Compress::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 67
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 68$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 69
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 71
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 90our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 92our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 93our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 94our $BDBDIR = "$LOCALDIR/db";
95our %RESOURCE;
75 96
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 99our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 100our $USE_FSYNC = 1; # use fsync to write maps - default off
83 101
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 102our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 103our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 104our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 105our $DB_ENV;
89 106
90our %CFG; 107our %CFG;
91 108
92our $UPTIME; $UPTIME ||= time; 109our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 110our $RUNTIME;
111our $NOW;
94 112
95our (%PLAYER, %PLAYER_LOADING); # all users 113our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 114our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 115our $LINK_MAP; # the special {link} map, which is always available
98 116
99# used to convert map paths into valid unix filenames by replacing / by ∕ 117# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 118our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 119
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 120our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 121our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 123our $TICK_START; # for load detecting purposes
105 124
106binmode STDOUT; 125binmode STDOUT;
107binmode STDERR; 126binmode STDERR;
108 127
109# read virtual server time, if available 128# read virtual server time, if available
162 181
163The raw value load value from the last tick. 182The raw value load value from the last tick.
164 183
165=item %cf::CFG 184=item %cf::CFG
166 185
167Configuration for the server, loaded from C</etc/crossfire/config>, or 186Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 187from wherever your confdir points to.
169 188
170=item cf::wait_for_tick, cf::wait_for_tick_begin 189=item cf::wait_for_tick, cf::wait_for_tick_begin
171 190
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 191These 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; 212 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 213
195 LOG llevError, $msg; 214 LOG llevError, $msg;
196 }; 215 };
197} 216}
217
218$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "=="
220
221 if ($Coro::current == $Coro::main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d#
224 }#d#
225
226 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate
229};
230
231$SIG{__DIE__} = sub { }; #d#?
198 232
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
215)) { 249)) {
216 no strict 'refs'; 250 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 252}
219 253
220$Event::DIED = sub { 254$EV::DIED = sub {
221 warn "error in event callback: @_"; 255 warn "error in event callback: @_";
222}; 256};
223 257
224############################################################################# 258#############################################################################
225 259
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 282 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 283 $d
250 } || "[unable to dump $_[0]: '$@']"; 284 } || "[unable to dump $_[0]: '$@']";
251} 285}
252 286
253=item $ref = cf::from_json $json 287=item $ref = cf::decode_json $json
254 288
255Converts a JSON string into the corresponding perl data structure. 289Converts a JSON string into the corresponding perl data structure.
256 290
257=item $json = cf::to_json $ref 291=item $json = cf::encode_json $ref
258 292
259Converts a perl data structure into its JSON representation. 293Converts a perl data structure into its JSON representation.
260 294
261=cut 295=cut
262 296
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 297our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 298
265sub to_json ($) { $json_coder->encode ($_[0]) } 299sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 300sub decode_json($) { $json_coder->decode ($_[0]) }
267 301
268=item cf::lock_wait $string 302=item cf::lock_wait $string
269 303
270Wait until the given lock is available. See cf::lock_acquire. 304Wait until the given lock is available. See cf::lock_acquire.
271 305
327 361
328 ! ! $LOCK{$key} 362 ! ! $LOCK{$key}
329} 363}
330 364
331sub freeze_mainloop { 365sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 366 tick_inhibit_inc;
333 367
334 my $guard = Coro::guard { 368 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start; 369}
336 }; 370
337 $TICK_WATCHER->stop; 371=item cf::periodic $interval, $cb
338 $guard 372
373Like EV::periodic, but randomly selects a starting point so that the actions
374get spread over timer.
375
376=cut
377
378sub periodic($$) {
379 my ($interval, $cb) = @_;
380
381 my $start = rand List::Util::min 180, $interval;
382
383 EV::periodic $start, $interval, 0, $cb
339} 384}
340 385
341=item cf::get_slot $time[, $priority[, $name]] 386=item cf::get_slot $time[, $priority[, $name]]
342 387
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 388Allocate $time seconds of blocking CPU time at priority C<$priority>:
383 } 428 }
384 } 429 }
385}; 430};
386 431
387sub get_slot($;$$) { 432sub get_slot($;$$) {
433 return if tick_inhibit || $Coro::current == $Coro::main;
434
388 my ($time, $pri, $name) = @_; 435 my ($time, $pri, $name) = @_;
389 436
390 $time = $TICK * .6 if $time > $TICK * .6; 437 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 438 my $sig = new Coro::Signal;
392 439
406 453
407BEGIN { *async = \&Coro::async_pool } 454BEGIN { *async = \&Coro::async_pool }
408 455
409=item cf::sync_job { BLOCK } 456=item cf::sync_job { BLOCK }
410 457
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 458The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 459is 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 460partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 461acceptable.
415 462
416If it must be done, put the blocking parts into C<sync_job>. This will run 463If 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 464the given BLOCK in another coroutine while waiting for the result. The
422 469
423sub sync_job(&) { 470sub sync_job(&) {
424 my ($job) = @_; 471 my ($job) = @_;
425 472
426 if ($Coro::current == $Coro::main) { 473 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 474 my $time = EV::time;
428 475
429 # this is the main coro, too bad, we have to block 476 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 477 # till the operation succeeds, freezing the server :/
431 478
432 LOG llevError, Carp::longmess "sync job";#d# 479 LOG llevError, Carp::longmess "sync job";#d#
433 480
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 481 my $freeze_guard = freeze_mainloop;
437 482
438 my $busy = 1; 483 my $busy = 1;
439 my @res; 484 my @res;
440 485
444 warn $@ if $@; 489 warn $@ if $@;
445 undef $busy; 490 undef $busy;
446 })->prio (Coro::PRIO_MAX); 491 })->prio (Coro::PRIO_MAX);
447 492
448 while ($busy) { 493 while ($busy) {
449 Coro::cede or Event::one_event; 494 if (Coro::nready) {
495 Coro::cede_notself;
496 } else {
497 EV::loop EV::LOOP_ONESHOT;
450 } 498 }
499 }
451 500
452 $time = Event::time - $time; 501 my $time = EV::time - $time;
453 502
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 503 $TICK_START += $time; # do not account sync jobs to server load
458 504
459 wantarray ? @res : $res[0] 505 wantarray ? @res : $res[0]
460 } else { 506 } else {
461 # we are in another coroutine, how wonderful, everything just works 507 # we are in another coroutine, how wonderful, everything just works
462 508
487=item fork_call { }, $args 533=item fork_call { }, $args
488 534
489Executes the given code block with the given arguments in a seperate 535Executes the given code block with the given arguments in a seperate
490process, returning the results. Everything must be serialisable with 536process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may 537Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling. 538never block itself or use any form of event handling.
493 539
494=cut 540=cut
495 541
496sub fork_call(&@) { 542sub fork_call(&@) {
497 my ($cb, @args) = @_; 543 my ($cb, @args) = @_;
504 reset_signals; 550 reset_signals;
505 &$cb 551 &$cb
506 }, @args; 552 }, @args;
507 553
508 wantarray ? @res : $res[-1] 554 wantarray ? @res : $res[-1]
555}
556
557=item $coin = coin_from_name $name
558
559=cut
560
561our %coin_alias = (
562 "silver" => "silvercoin",
563 "silvercoin" => "silvercoin",
564 "silvercoins" => "silvercoin",
565 "gold" => "goldcoin",
566 "goldcoin" => "goldcoin",
567 "goldcoins" => "goldcoin",
568 "platinum" => "platinacoin",
569 "platinumcoin" => "platinacoin",
570 "platinumcoins" => "platinacoin",
571 "platina" => "platinacoin",
572 "platinacoin" => "platinacoin",
573 "platinacoins" => "platinacoin",
574 "royalty" => "royalty",
575 "royalties" => "royalty",
576);
577
578sub coin_from_name($) {
579 $coin_alias{$_[0]}
580 ? cf::arch::find $coin_alias{$_[0]}
581 : undef
509} 582}
510 583
511=item $value = cf::db_get $family => $key 584=item $value = cf::db_get $family => $key
512 585
513Returns a single value from the environment database. 586Returns a single value from the environment database.
658attach callbacks/event handlers (a collection of which is called an "attachment") 731attach callbacks/event handlers (a collection of which is called an "attachment")
659to it. All such attachable objects support the following methods. 732to it. All such attachable objects support the following methods.
660 733
661In the following description, CLASS can be any of C<global>, C<object> 734In 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 735C<player>, C<client> or C<map> (i.e. the attachable objects in
663Crossfire TRT). 736Deliantra).
664 737
665=over 4 738=over 4
666 739
667=item $attachable->attach ($attachment, key => $value...) 740=item $attachable->attach ($attachment, key => $value...)
668 741
950 } 1023 }
951 1024
952 0 1025 0
953} 1026}
954 1027
955=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1028=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
956 1029
957=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
958 1031
959Generate an object-specific event with the given arguments. 1032Generate an object-specific event with the given arguments.
960 1033
966 1039
967=cut 1040=cut
968 1041
969############################################################################# 1042#############################################################################
970# object support 1043# object support
971#
972 1044
1045sub _object_equal($$);
1046sub _object_equal($$) {
1047 my ($a, $b) = @_;
1048
1049 return 0 unless (ref $a) eq (ref $b);
1050
1051 if ("HASH" eq ref $a) {
1052 my @ka = keys %$a;
1053 my @kb = keys %$b;
1054
1055 return 0 if @ka != @kb;
1056
1057 for (0 .. $#ka) {
1058 return 0 unless $ka[$_] eq $kb[$_];
1059 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1060 }
1061
1062 } elsif ("ARRAY" eq ref $a) {
1063
1064 return 0 if @$a != @$b;
1065
1066 for (0 .. $#$a) {
1067 return 0 unless _object_equal $a->[$_], $b->[$_];
1068 }
1069
1070 } elsif ($a ne $b) {
1071 return 0;
1072 }
1073
1074 1
1075}
1076
1077our $SLOW_MERGES;#d#
973sub _can_merge { 1078sub _can_merge {
974 my ($ob1, $ob2) = @_; 1079 my ($ob1, $ob2) = @_;
975 1080
976 return 1;#d# 1081 ++$SLOW_MERGES;#d#
977 1082
978 #todo#d# kill yourself and do some recursive checking manually without storable 1083 # we do the slow way here
979 sync_job { 1084 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} 1085}
987 1086
988sub reattach { 1087sub reattach {
989 # basically do the same as instantiate, without calling instantiate 1088 # basically do the same as instantiate, without calling instantiate
990 my ($obj) = @_; 1089 my ($obj) = @_;
1012cf::attachable->attach ( 1111cf::attachable->attach (
1013 prio => -1000000, 1112 prio => -1000000,
1014 on_instantiate => sub { 1113 on_instantiate => sub {
1015 my ($obj, $data) = @_; 1114 my ($obj, $data) = @_;
1016 1115
1017 $data = from_json $data; 1116 $data = decode_json $data;
1018 1117
1019 for (@$data) { 1118 for (@$data) {
1020 my ($name, $args) = @$_; 1119 my ($name, $args) = @$_;
1021 1120
1022 $obj->attach ($name, %{$args || {} }); 1121 $obj->attach ($name, %{$args || {} });
1043 utf8::decode (my $decname = $filename); 1142 utf8::decode (my $decname = $filename);
1044 warn sprintf "saving %s (%d,%d)\n", 1143 warn sprintf "saving %s (%d,%d)\n",
1045 $decname, length $$rdata, scalar @$objs; 1144 $decname, length $$rdata, scalar @$objs;
1046 1145
1047 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1048 chmod SAVE_MODE, $fh; 1147 aio_chmod $fh, SAVE_MODE;
1049 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1050 aio_fsync $fh if $cf::USE_FSYNC; 1149 aio_fsync $fh if $cf::USE_FSYNC;
1051 close $fh; 1150 aio_close $fh;
1052 1151
1053 if (@$objs) { 1152 if (@$objs) {
1054 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1153 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1055 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
1056 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs }; 1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1057 aio_write $fh, 0, (length $data), $data, 0; 1156 aio_write $fh, 0, (length $data), $data, 0;
1058 aio_fsync $fh if $cf::USE_FSYNC; 1157 aio_fsync $fh if $cf::USE_FSYNC;
1059 close $fh; 1158 aio_close $fh;
1060 aio_rename "$filename.pst~", "$filename.pst"; 1159 aio_rename "$filename.pst~", "$filename.pst";
1061 } 1160 }
1062 } else { 1161 } else {
1063 aio_unlink "$filename.pst"; 1162 aio_unlink "$filename.pst";
1064 } 1163 }
1092 1191
1093 unless (aio_stat "$filename.pst") { 1192 unless (aio_stat "$filename.pst") {
1094 (aio_load "$filename.pst", $av) >= 0 1193 (aio_load "$filename.pst", $av) >= 0
1095 or return; 1194 or return;
1096 1195
1097 my $st = eval { Coro::Storable::thaw $av } 1196 my $st = eval { Coro::Storable::thaw $av };
1098 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1099 $av = $st->{objs}; 1197 $av = $st->{objs};
1100 } 1198 }
1101 1199
1102 utf8::decode (my $decname = $filename); 1200 utf8::decode (my $decname = $filename);
1103 warn sprintf "loading %s (%d,%d)\n", 1201 warn sprintf "loading %s (%d,%d)\n",
1260 my $msg = $@ ? "$v->{path}: $@\n" 1358 my $msg = $@ ? "$v->{path}: $@\n"
1261 : "$v->{base}: extension inactive.\n"; 1359 : "$v->{base}: extension inactive.\n";
1262 1360
1263 if (exists $v->{meta}{mandatory}) { 1361 if (exists $v->{meta}{mandatory}) {
1264 warn $msg; 1362 warn $msg;
1265 warn "mandatory extension failed to load, exiting.\n"; 1363 cf::cleanup "mandatory extension failed to load, exiting.";
1266 exit 1;
1267 } 1364 }
1268 1365
1269 warn $msg; 1366 warn $msg;
1270 } 1367 }
1271 1368
1360 my $f = new_from_file cf::object::thawer path $login 1457 my $f = new_from_file cf::object::thawer path $login
1361 or return; 1458 or return;
1362 1459
1363 my $pl = cf::player::load_pl $f 1460 my $pl = cf::player::load_pl $f
1364 or return; 1461 or return;
1462
1365 local $cf::PLAYER_LOADING{$login} = $pl; 1463 local $cf::PLAYER_LOADING{$login} = $pl;
1366 $f->resolve_delayed_derefs; 1464 $f->resolve_delayed_derefs;
1367 $cf::PLAYER{$login} = $pl 1465 $cf::PLAYER{$login} = $pl
1368 } 1466 }
1369 } 1467 }
1379 1477
1380 return if $pl->{deny_save}; 1478 return if $pl->{deny_save};
1381 1479
1382 aio_mkdir playerdir $pl, 0770; 1480 aio_mkdir playerdir $pl, 0770;
1383 $pl->{last_save} = $cf::RUNTIME; 1481 $pl->{last_save} = $cf::RUNTIME;
1482
1483 cf::get_slot 0.01;
1384 1484
1385 $pl->save_pl ($path); 1485 $pl->save_pl ($path);
1386 cf::cede_to_tick; 1486 cf::cede_to_tick;
1387} 1487}
1388 1488
1424 $pl->{deny_save} = 1; 1524 $pl->{deny_save} = 1;
1425 $pl->password ("*"); # this should lock out the player until we nuked the dir 1525 $pl->password ("*"); # this should lock out the player until we nuked the dir
1426 1526
1427 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1428 $pl->deactivate; 1528 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score;
1429 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1531 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1430 $pl->ns->destroy if $pl->ns; 1532 $pl->ns->destroy if $pl->ns;
1431 1533
1432 my $path = playerdir $pl; 1534 my $path = playerdir $pl;
1433 my $temp = "$path~$cf::RUNTIME~deleting~"; 1535 my $temp = "$path~$cf::RUNTIME~deleting~";
1472 1574
1473 for my $login (@$dirs) { 1575 for my $login (@$dirs) {
1474 my $path = path $login; 1576 my $path = path $login;
1475 1577
1476 # a .pst is a dead give-away for a valid player 1578 # a .pst is a dead give-away for a valid player
1477 unless (-e "$path.pst") { 1579 # if no pst file found, open and chekc for blocked users
1580 if (aio_stat "$path.pst") {
1478 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1581 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1479 aio_read $fh, 0, 512, my $buf, 0 or next; 1582 aio_read $fh, 0, 512, my $buf, 0 or next;
1480 $buf !~ /^password -------------$/m or next; # official not-valid tag 1583 $buf !~ /^password -------------$/m or next; # official not-valid tag
1481 } 1584 }
1482 1585
1519 1622
1520Expand crossfire pod fragments into protocol xml. 1623Expand crossfire pod fragments into protocol xml.
1521 1624
1522=cut 1625=cut
1523 1626
1627use re 'eval';
1628
1629my $group;
1630my $interior; $interior = qr{
1631 # match a pod interior sequence sans C<< >>
1632 (?:
1633 \ (.*?)\ (?{ $group = $^N })
1634 | < (??{$interior}) >
1635 )
1636}x;
1637
1524sub expand_cfpod { 1638sub expand_cfpod {
1525 ((my $self), (local $_)) = @_; 1639 my ($self, $pod) = @_;
1526 1640
1527 # escape & and < 1641 my $xml;
1528 s/&/&amp;/g;
1529 s/(?<![BIUGHT])</&lt;/g;
1530 1642
1531 # this is buggy, it needs to properly take care of nested <'s 1643 while () {
1644 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1645 $group = $1;
1532 1646
1533 1 while 1647 $group =~ s/&/&amp;/g;
1534 # replace B<>, I<>, U<> etc. 1648 $group =~ s/</&lt;/g;
1535 s/B<([^\>]*)>/<b>$1<\/b>/ 1649
1536 || s/I<([^\>]*)>/<i>$1<\/i>/ 1650 $xml .= $group;
1537 || s/U<([^\>]*)>/<u>$1<\/u>/ 1651 } elsif ($pod =~ m%\G
1538 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1652 ([BCGHITU])
1539 # replace G<male|female> tags 1653 <
1540 || s{G<([^>|]*)\|([^>]*)>}{ 1654 (?:
1541 $self->gender ? $2 : $1 1655 ([^<>]*) (?{ $group = $^N })
1542 }ge 1656 | < $interior >
1543 # replace H<hint text> 1657 )
1544 || s{H<([^\>]*)>} 1658 >
1659 %gcsx
1545 { 1660 ) {
1661 my ($code, $data) = ($1, $group);
1662
1663 if ($code eq "B") {
1664 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1665 } elsif ($code eq "I") {
1666 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1667 } elsif ($code eq "U") {
1668 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1669 } elsif ($code eq "C") {
1670 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1671 } elsif ($code eq "T") {
1672 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1673 } elsif ($code eq "G") {
1674 my ($male, $female) = split /\|/, $data;
1675 $data = $self->gender ? $female : $male;
1676 $xml .= expand_cfpod ($self, $data);
1677 } elsif ($code eq "H") {
1546 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1678 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1547 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1679 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1548 "") 1680 "")
1549 [$self->{hintmode}] 1681 [$self->{hintmode}];
1682 } else {
1683 $xml .= "error processing '$code($data)' directive";
1550 }ge; 1684 }
1685 } else {
1686 if ($pod =~ /\G(.+)/) {
1687 warn "parse error while expanding $pod (at $1)";
1688 }
1689 last;
1690 }
1691 }
1551 1692
1693 for ($xml) {
1552 # create single paragraphs (very hackish) 1694 # create single paragraphs (very hackish)
1553 s/(?<=\S)\n(?=\w)/ /g; 1695 s/(?<=\S)\n(?=\w)/ /g;
1554 1696
1555 # compress some whitespace 1697 # compress some whitespace
1556 s/\s+\n/\n/g; # ws line-ends 1698 s/\s+\n/\n/g; # ws line-ends
1557 s/\n\n+/\n/g; # double lines 1699 s/\n\n+/\n/g; # double lines
1558 s/^\n+//; # beginning lines 1700 s/^\n+//; # beginning lines
1559 s/\n+$//; # ending lines 1701 s/\n+$//; # ending lines
1702 }
1560 1703
1561 $_ 1704 $xml
1562} 1705}
1706
1707no re 'eval';
1563 1708
1564sub hintmode { 1709sub hintmode {
1565 $_[0]{hintmode} = $_[1] if @_ > 1; 1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1566 $_[0]{hintmode} 1711 $_[0]{hintmode}
1567} 1712}
1639our $MAX_RESET = 3600; 1784our $MAX_RESET = 3600;
1640our $DEFAULT_RESET = 3000; 1785our $DEFAULT_RESET = 3000;
1641 1786
1642sub generate_random_map { 1787sub generate_random_map {
1643 my ($self, $rmp) = @_; 1788 my ($self, $rmp) = @_;
1789
1790 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1791
1644 # mit "rum" bekleckern, nicht 1792 # mit "rum" bekleckern, nicht
1645 $self->_create_random_map ( 1793 $self->_create_random_map (
1646 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1647 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1648 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1770 1918
1771# the temporary/swap location 1919# the temporary/swap location
1772sub save_path { 1920sub save_path {
1773 my ($self) = @_; 1921 my ($self) = @_;
1774 1922
1775 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1923 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1776 "$TMPDIR/$path.map" 1924 "$TMPDIR/$path.map"
1777} 1925}
1778 1926
1779# the unique path, undef == no special unique path 1927# the unique path, undef == no special unique path
1780sub uniq_path { 1928sub uniq_path {
1781 my ($self) = @_; 1929 my ($self) = @_;
1782 1930
1783 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1784 "$UNIQUEDIR/$path" 1932 "$UNIQUEDIR/$path"
1785} 1933}
1786 1934
1787# and all this just because we cannot iterate over 1935# and all this just because we cannot iterate over
1788# all maps in C++... 1936# all maps in C++...
1886 2034
1887 cf::lock_wait "map_data:$path";#d#remove 2035 cf::lock_wait "map_data:$path";#d#remove
1888 cf::lock_wait "map_find:$path"; 2036 cf::lock_wait "map_find:$path";
1889 2037
1890 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
1891 my $guard1 = cf::lock_acquire "map_find:$path";
1892 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 2039 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2040 my $guard2 = cf::lock_acquire "map_find:$path";
1893 2041
1894 my $map = new_from_path cf::map $path 2042 my $map = new_from_path cf::map $path
1895 or return; 2043 or return;
1896 2044
1897 $map->{last_save} = $cf::RUNTIME; 2045 $map->{last_save} = $cf::RUNTIME;
1900 or return; 2048 or return;
1901 2049
1902 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2050 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1903 # doing this can freeze the server in a sync job, obviously 2051 # doing this can freeze the server in a sync job, obviously
1904 #$cf::WAIT_FOR_TICK->wait; 2052 #$cf::WAIT_FOR_TICK->wait;
2053 undef $guard2;
1905 undef $guard1; 2054 undef $guard1;
1906 undef $guard2;
1907 $map->reset; 2055 $map->reset;
1908 return find $path; 2056 return find $path;
1909 } 2057 }
1910 2058
1911 $cf::MAP{$path} = $map 2059 $cf::MAP{$path} = $map
1974 } 2122 }
1975 2123
1976 $self->{last_save} = $cf::RUNTIME; 2124 $self->{last_save} = $cf::RUNTIME;
1977 $self->last_access ($cf::RUNTIME); 2125 $self->last_access ($cf::RUNTIME);
1978 2126
1979 $self->in_memory (cf::MAP_IN_MEMORY); 2127 $self->in_memory (cf::MAP_ACTIVE);
1980 } 2128 }
1981 2129
1982 $self->post_load; 2130 $self->post_load;
1983} 2131}
1984 2132
2042 my ($path, $origin, $load) = @_; 2190 my ($path, $origin, $load) = @_;
2043 2191
2044 $path = normalise $path, $origin && $origin->{path}; 2192 $path = normalise $path, $origin && $origin->{path};
2045 2193
2046 if (my $map = $cf::MAP{$path}) { 2194 if (my $map = $cf::MAP{$path}) {
2047 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2195 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2048 } 2196 }
2049 2197
2050 $MAP_PREFETCH{$path} |= $load; 2198 $MAP_PREFETCH{$path} |= $load;
2051 2199
2052 $MAP_PREFETCHER ||= cf::async { 2200 $MAP_PREFETCHER ||= cf::async {
2089 cf::async { 2237 cf::async {
2090 $Coro::current->{desc} = "map player save"; 2238 $Coro::current->{desc} = "map player save";
2091 $_->contr->save for $self->players; 2239 $_->contr->save for $self->players;
2092 }; 2240 };
2093 2241
2242 cf::get_slot 0.02;
2243
2094 if ($uniq) { 2244 if ($uniq) {
2095 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2096 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2246 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2097 } else { 2247 } else {
2098 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2106 $self->save; 2256 $self->save;
2107 2257
2108 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2258 my $lock = cf::lock_acquire "map_data:$self->{path}";
2109 2259
2110 return if $self->players; 2260 return if $self->players;
2111 return if $self->in_memory != cf::MAP_IN_MEMORY; 2261 return if $self->in_memory != cf::MAP_ACTIVE;
2112 return if $self->{deny_save}; 2262 return if $self->{deny_save};
2113 2263
2114 $self->in_memory (cf::MAP_SWAPPED); 2264 $self->in_memory (cf::MAP_SWAPPED);
2115 2265
2116 $self->deactivate; 2266 $self->deactivate;
2234 2384
2235sub unique_maps() { 2385sub unique_maps() {
2236 [ 2386 [
2237 map { 2387 map {
2238 utf8::decode $_; 2388 utf8::decode $_;
2239 /\.map$/ 2389 s/\.map$//; # TODO future compatibility hack
2390 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2391 ? ()
2240 ? normalise $_ 2392 : normalise $_
2241 : ()
2242 } @{ aio_readdir $UNIQUEDIR or [] } 2393 } @{ aio_readdir $UNIQUEDIR or [] }
2243 ] 2394 ]
2244} 2395}
2245 2396
2246package cf;
2247
2248=back 2397=back
2249 2398
2250=head3 cf::object 2399=head3 cf::object
2251 2400
2252=cut 2401=cut
2255 2404
2256=over 4 2405=over 4
2257 2406
2258=item $ob->inv_recursive 2407=item $ob->inv_recursive
2259 2408
2260Returns the inventory of the object _and_ their inventories, recursively. 2409Returns the inventory of the object I<and> their inventories, recursively,
2410but I<not> the object itself.
2261 2411
2262=cut 2412=cut
2263 2413
2264sub inv_recursive_; 2414sub inv_recursive_;
2265sub inv_recursive_ { 2415sub inv_recursive_ {
2270 inv_recursive_ inv $_[0] 2420 inv_recursive_ inv $_[0]
2271} 2421}
2272 2422
2273=item $ref = $ob->ref 2423=item $ref = $ob->ref
2274 2424
2275creates and returns a persistent reference to an objetc that can be stored as a string. 2425Creates and returns a persistent reference to an object that can be stored as a string.
2276 2426
2277=item $ob = cf::object::deref ($refstring) 2427=item $ob = cf::object::deref ($refstring)
2278 2428
2279returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2429returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2280even if the object actually exists. May block. 2430even if the object actually exists. May block.
2312can be C<undef>. Does the right thing when the player is currently in a 2462can be C<undef>. Does the right thing when the player is currently in a
2313dialogue with the given NPC character. 2463dialogue with the given NPC character.
2314 2464
2315=cut 2465=cut
2316 2466
2467our $SAY_CHANNEL = {
2468 id => "say",
2469 title => "Map",
2470 reply => "say ",
2471 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2472};
2473
2474our $CHAT_CHANNEL = {
2475 id => "chat",
2476 title => "Chat",
2477 reply => "chat ",
2478 tooltip => "Player chat and shouts, global to the server.",
2479};
2480
2317# rough implementation of a future "reply" method that works 2481# rough implementation of a future "reply" method that works
2318# with dialog boxes. 2482# with dialog boxes.
2319#TODO: the first argument must go, split into a $npc->reply_to ( method 2483#TODO: the first argument must go, split into a $npc->reply_to ( method
2320sub cf::object::player::reply($$$;$) { 2484sub cf::object::player::reply($$$;$) {
2321 my ($self, $npc, $msg, $flags) = @_; 2485 my ($self, $npc, $msg, $flags) = @_;
2332 my $dialog = $pl->{npc_dialog}; 2496 my $dialog = $pl->{npc_dialog};
2333 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2497 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2334 2498
2335 } else { 2499 } else {
2336 $msg = $npc->name . " says: $msg" if $npc; 2500 $msg = $npc->name . " says: $msg" if $npc;
2337 $self->message ($msg, $flags); 2501 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2338 } 2502 }
2339 } 2503 }
2340} 2504}
2341 2505
2342=item $object->send_msg ($channel, $msg, $color, [extra...]) 2506=item $object->send_msg ($channel, $msg, $color, [extra...])
2537} 2701}
2538 2702
2539sub prepare_random_map { 2703sub prepare_random_map {
2540 my ($exit) = @_; 2704 my ($exit) = @_;
2541 2705
2542 my $guard = cf::lock_acquire "exit_prepare:$exit";
2543
2544 # all this does is basically replace the /! path by 2706 # all this does is basically replace the /! path by
2545 # a new random map path (?random/...) with a seed 2707 # a new random map path (?random/...) with a seed
2546 # that depends on the exit object 2708 # that depends on the exit object
2547 2709
2548 my $rmp = parse_random_map_params $exit->msg; 2710 my $rmp = parse_random_map_params $exit->msg;
2550 if ($exit->map) { 2712 if ($exit->map) {
2551 $rmp->{region} = $exit->region->name; 2713 $rmp->{region} = $exit->region->name;
2552 $rmp->{origin_map} = $exit->map->path; 2714 $rmp->{origin_map} = $exit->map->path;
2553 $rmp->{origin_x} = $exit->x; 2715 $rmp->{origin_x} = $exit->x;
2554 $rmp->{origin_y} = $exit->y; 2716 $rmp->{origin_y} = $exit->y;
2717
2718 $exit->map->touch;
2555 } 2719 }
2556 2720
2557 $rmp->{random_seed} ||= $exit->random_seed; 2721 $rmp->{random_seed} ||= $exit->random_seed;
2558 2722
2559 my $data = cf::to_json $rmp; 2723 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2560 my $md5 = Digest::MD5::md5_hex $data; 2724 my $md5 = Digest::MD5::md5_hex $data;
2561 my $meta = "$RANDOMDIR/$md5.meta"; 2725 my $meta = "$RANDOMDIR/$md5.meta";
2562 2726
2563 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2727 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2564 aio_write $fh, 0, (length $data), $data, 0; 2728 aio_write $fh, 0, (length $data), $data, 0;
2565 undef $fh; 2729 undef $fh;
2566 aio_rename "$meta~", $meta; 2730 aio_rename "$meta~", $meta;
2567 2731
2732 my $slaying = "?random/$md5";
2733
2734 if ($exit->valid) {
2568 $exit->slaying ("?random/$md5"); 2735 $exit->slaying ("?random/$md5");
2569 $exit->msg (undef); 2736 $exit->msg (undef);
2737 }
2570 } 2738 }
2571} 2739}
2572 2740
2573sub cf::object::player::enter_exit { 2741sub cf::object::player::enter_exit {
2574 my ($self, $exit) = @_; 2742 my ($self, $exit) = @_;
2575 2743
2576 return unless $self->type == cf::PLAYER; 2744 return unless $self->type == cf::PLAYER;
2577 2745
2578 if ($exit->slaying eq "/!") {
2579 #TODO: this should de-fi-ni-te-ly not be a sync-job
2580 # the problem is that $exit might not survive long enough
2581 # so it needs to be done right now, right here
2582 cf::sync_job { prepare_random_map $exit };
2583 }
2584
2585 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2586 my $hp = $exit->stats->hp;
2587 my $sp = $exit->stats->sp;
2588
2589 $self->enter_link; 2746 $self->enter_link;
2590 2747
2591 # if exit is damned, update players death & WoR home-position
2592 $self->contr->savebed ($slaying, $hp, $sp)
2593 if $exit->flag (FLAG_DAMNED);
2594
2595 (async { 2748 (async {
2596 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2749 $Coro::current->{desc} = "enter_exit";
2597 2750
2598 $self->deactivate_recursive; # just to be sure
2599 unless (eval { 2751 unless (eval {
2752 $self->deactivate_recursive; # just to be sure
2753
2754 # random map handling
2755 {
2756 my $guard = cf::lock_acquire "exit_prepare:$exit";
2757
2758 prepare_random_map $exit
2759 if $exit->slaying eq "/!";
2760 }
2761
2762 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2763 my $x = $exit->stats->hp;
2764 my $y = $exit->stats->sp;
2765
2600 $self->goto ($slaying, $hp, $sp); 2766 $self->goto ($map, $x, $y);
2601 2767
2768 # if exit is damned, update players death & WoR home-position
2769 $self->contr->savebed ($map, $x, $y)
2770 if $exit->flag (cf::FLAG_DAMNED);
2771
2602 1; 2772 1
2603 }) { 2773 }) {
2604 $self->message ("Something went wrong deep within the crossfire server. " 2774 $self->message ("Something went wrong deep within the crossfire server. "
2605 . "I'll try to bring you back to the map you were before. " 2775 . "I'll try to bring you back to the map you were before. "
2606 . "Please report this to the dungeon master!", 2776 . "Please report this to the dungeon master!",
2607 cf::NDI_UNIQUE | cf::NDI_RED); 2777 cf::NDI_UNIQUE | cf::NDI_RED);
2637the message, with C<log> being the default. If C<$color> is negative, suppress 2807the message, with C<log> being the default. If C<$color> is negative, suppress
2638the message unless the client supports the msg packet. 2808the message unless the client supports the msg packet.
2639 2809
2640=cut 2810=cut
2641 2811
2812# non-persistent channels (usually the info channel)
2642our %CHANNEL = ( 2813our %CHANNEL = (
2643 "c/identify" => { 2814 "c/identify" => {
2644 id => "infobox", 2815 id => "infobox",
2645 title => "Identify", 2816 title => "Identify",
2646 reply => undef, 2817 reply => undef,
2650 id => "infobox", 2821 id => "infobox",
2651 title => "Examine", 2822 title => "Examine",
2652 reply => undef, 2823 reply => undef,
2653 tooltip => "Signs and other items you examined", 2824 tooltip => "Signs and other items you examined",
2654 }, 2825 },
2826 "c/book" => {
2827 id => "infobox",
2828 title => "Book",
2829 reply => undef,
2830 tooltip => "The contents of a note or book",
2831 },
2655 "c/lookat" => { 2832 "c/lookat" => {
2656 id => "infobox", 2833 id => "infobox",
2657 title => "Look", 2834 title => "Look",
2658 reply => undef, 2835 reply => undef,
2659 tooltip => "What you saw there", 2836 tooltip => "What you saw there",
2837 },
2838 "c/who" => {
2839 id => "infobox",
2840 title => "Players",
2841 reply => undef,
2842 tooltip => "Shows players who are currently online",
2843 },
2844 "c/body" => {
2845 id => "infobox",
2846 title => "Body Parts",
2847 reply => undef,
2848 tooltip => "Shows which body parts you posess and are available",
2849 },
2850 "c/uptime" => {
2851 id => "infobox",
2852 title => "Uptime",
2853 reply => undef,
2854 tooltip => "How long the server has been running since last restart",
2855 },
2856 "c/mapinfo" => {
2857 id => "infobox",
2858 title => "Map Info",
2859 reply => undef,
2860 tooltip => "Information related to the maps",
2861 },
2862 "c/party" => {
2863 id => "party",
2864 title => "Party",
2865 reply => "gsay ",
2866 tooltip => "Messages and chat related to your party",
2660 }, 2867 },
2661); 2868);
2662 2869
2663sub cf::client::send_msg { 2870sub cf::client::send_msg {
2664 my ($self, $channel, $msg, $color, @extra) = @_; 2871 my ($self, $channel, $msg, $color, @extra) = @_;
2902 3109
2903The following functions and methods are available within a safe environment: 3110The following functions and methods are available within a safe environment:
2904 3111
2905 cf::object 3112 cf::object
2906 contr pay_amount pay_player map x y force_find force_add destroy 3113 contr pay_amount pay_player map x y force_find force_add destroy
2907 insert remove name archname title slaying race decrease_ob_nr 3114 insert remove name archname title slaying race decrease split
2908 3115
2909 cf::object::player 3116 cf::object::player
2910 player 3117 player
2911 3118
2912 cf::player 3119 cf::player
2917 3124
2918=cut 3125=cut
2919 3126
2920for ( 3127for (
2921 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3128 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2922 insert remove inv name archname title slaying race 3129 insert remove inv nrof name archname title slaying race
2923 decrease_ob_nr destroy)], 3130 decrease split destroy)],
2924 ["cf::object::player" => qw(player)], 3131 ["cf::object::player" => qw(player)],
2925 ["cf::player" => qw(peaceful)], 3132 ["cf::player" => qw(peaceful)],
2926 ["cf::map" => qw(trigger)], 3133 ["cf::map" => qw(trigger)],
2927) { 3134) {
2928 no strict 'refs'; 3135 no strict 'refs';
3033 { 3240 {
3034 my $faces = $facedata->{faceinfo}; 3241 my $faces = $facedata->{faceinfo};
3035 3242
3036 while (my ($face, $info) = each %$faces) { 3243 while (my ($face, $info) = each %$faces) {
3037 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3244 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3245
3038 cf::face::set_visibility $idx, $info->{visibility}; 3246 cf::face::set_visibility $idx, $info->{visibility};
3039 cf::face::set_magicmap $idx, $info->{magicmap}; 3247 cf::face::set_magicmap $idx, $info->{magicmap};
3040 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3248 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}; 3249 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3042 3250
3043 cf::cede_to_tick; 3251 cf::cede_to_tick;
3044 } 3252 }
3045 3253
3046 while (my ($face, $info) = each %$faces) { 3254 while (my ($face, $info) = each %$faces) {
3047 next unless $info->{smooth}; 3255 next unless $info->{smooth};
3256
3048 my $idx = cf::face::find $face 3257 my $idx = cf::face::find $face
3049 or next; 3258 or next;
3259
3050 if (my $smooth = cf::face::find $info->{smooth}) { 3260 if (my $smooth = cf::face::find $info->{smooth}) {
3051 cf::face::set_smooth $idx, $smooth; 3261 cf::face::set_smooth $idx, $smooth;
3052 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3262 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3053 } else { 3263 } else {
3054 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3264 warn "smooth face '$info->{smooth}' not found for face '$face'";
3072 { 3282 {
3073 # TODO: for gcfclient pleasure, we should give resources 3283 # TODO: for gcfclient pleasure, we should give resources
3074 # that gcfclient doesn't grok a >10000 face index. 3284 # that gcfclient doesn't grok a >10000 face index.
3075 my $res = $facedata->{resource}; 3285 my $res = $facedata->{resource};
3076 3286
3077 my $soundconf = delete $res->{"res/sound.conf"};
3078
3079 while (my ($name, $info) = each %$res) { 3287 while (my ($name, $info) = each %$res) {
3288 if (defined $info->{type}) {
3080 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3289 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3081 my $data; 3290 my $data;
3082 3291
3083 if ($info->{type} & 1) { 3292 if ($info->{type} & 1) {
3084 # prepend meta info 3293 # prepend meta info
3085 3294
3086 my $meta = $enc->encode ({ 3295 my $meta = $enc->encode ({
3087 name => $name, 3296 name => $name,
3088 %{ $info->{meta} || {} }, 3297 %{ $info->{meta} || {} },
3089 }); 3298 });
3090 3299
3091 $data = pack "(w/a*)*", $meta, $info->{data}; 3300 $data = pack "(w/a*)*", $meta, $info->{data};
3301 } else {
3302 $data = $info->{data};
3303 }
3304
3305 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3306 cf::face::set_type $idx, $info->{type};
3092 } else { 3307 } else {
3093 $data = $info->{data}; 3308 $RESOURCE{$name} = $info;
3094 } 3309 }
3095 3310
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; 3311 cf::cede_to_tick;
3100 } 3312 }
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 } 3313 }
3314
3315 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3120 3316
3121 1 3317 1
3122} 3318}
3319
3320cf::global->attach (on_resource_update => sub {
3321 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3322 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3323
3324 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3325 my $sound = $soundconf->{compat}[$_]
3326 or next;
3327
3328 my $face = cf::face::find "sound/$sound->[1]";
3329 cf::sound::set $sound->[0] => $face;
3330 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3331 }
3332
3333 while (my ($k, $v) = each %{$soundconf->{event}}) {
3334 my $face = cf::face::find "sound/$v";
3335 cf::sound::set $k => $face;
3336 }
3337 }
3338});
3123 3339
3124register_exticmd fx_want => sub { 3340register_exticmd fx_want => sub {
3125 my ($ns, $want) = @_; 3341 my ($ns, $want) = @_;
3126 3342
3127 while (my ($k, $v) = each %$want) { 3343 while (my ($k, $v) = each %$want) {
3128 $ns->fx_want ($k, $v); 3344 $ns->fx_want ($k, $v);
3129 } 3345 }
3130}; 3346};
3347
3348sub load_resource_file($) {
3349 my $guard = lock_acquire "load_resource_file";
3350
3351 my $status = load_resource_file_ $_[0];
3352 get_slot 0.1, 100;
3353 cf::arch::commit_load;
3354
3355 $status
3356}
3131 3357
3132sub reload_regions { 3358sub reload_regions {
3133 # HACK to clear player env face cache, we need some signal framework 3359 # HACK to clear player env face cache, we need some signal framework
3134 # for this (global event?) 3360 # for this (global event?)
3135 %ext::player_env::MUSIC_FACE_CACHE = (); 3361 %ext::player_env::MUSIC_FACE_CACHE = ();
3149} 3375}
3150 3376
3151sub reload_archetypes { 3377sub reload_archetypes {
3152 load_resource_file "$DATADIR/archetypes" 3378 load_resource_file "$DATADIR/archetypes"
3153 or die "unable to load archetypes\n"; 3379 or die "unable to load archetypes\n";
3154 #d# NEED to laod twice to resolve forward references
3155 # this really needs to be done in an extra post-pass
3156 # (which needs to be synchronous, so solve it differently)
3157 load_resource_file "$DATADIR/archetypes"
3158 or die "unable to load archetypes\n";
3159} 3380}
3160 3381
3161sub reload_treasures { 3382sub reload_treasures {
3162 load_resource_file "$DATADIR/treasures" 3383 load_resource_file "$DATADIR/treasures"
3163 or die "unable to load treasurelists\n"; 3384 or die "unable to load treasurelists\n";
3164} 3385}
3165 3386
3166sub reload_resources { 3387sub reload_resources {
3167 warn "reloading resource files...\n"; 3388 warn "reloading resource files...\n";
3168 3389
3390 reload_facedata;
3391 reload_archetypes;
3169 reload_regions; 3392 reload_regions;
3170 reload_facedata;
3171 #reload_archetypes;#d#
3172 reload_archetypes;
3173 reload_treasures; 3393 reload_treasures;
3174 3394
3175 warn "finished reloading resource files\n"; 3395 warn "finished reloading resource files\n";
3176} 3396}
3177 3397
3178sub init { 3398sub init {
3399 my $guard = freeze_mainloop;
3400
3401 evthread_start IO::AIO::poll_fileno;
3402
3179 reload_resources; 3403 reload_resources;
3180} 3404}
3181 3405
3182sub reload_config { 3406sub reload_config {
3183 open my $fh, "<:utf8", "$CONFDIR/config" 3407 open my $fh, "<:utf8", "$CONFDIR/config"
3184 or return; 3408 or return;
3185 3409
3186 local $/; 3410 local $/;
3187 *CFG = YAML::Syck::Load <$fh>; 3411 *CFG = YAML::Load <$fh>;
3188 3412
3189 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3413 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3190 3414
3191 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3415 $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}; 3416 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3204 # we must not ever block the main coroutine 3428 # we must not ever block the main coroutine
3205 local $Coro::idle = sub { 3429 local $Coro::idle = sub {
3206 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3430 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3207 (async { 3431 (async {
3208 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3432 $Coro::current->{desc} = "IDLE BUG HANDLER";
3209 Event::one_event; 3433 EV::loop EV::LOOP_ONESHOT;
3210 })->prio (Coro::PRIO_MAX); 3434 })->prio (Coro::PRIO_MAX);
3211 }; 3435 };
3212 3436
3437 {
3438 my $guard = freeze_mainloop;
3213 reload_config; 3439 reload_config;
3214 db_init; 3440 db_init;
3215 load_extensions; 3441 load_extensions;
3216 3442
3217 $TICK_WATCHER->start; 3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3444 }
3445
3218 Event::loop; 3446 EV::loop;
3219} 3447}
3220 3448
3221############################################################################# 3449#############################################################################
3222# initialisation and cleanup 3450# initialisation and cleanup
3223 3451
3224# install some emergency cleanup handlers 3452# install some emergency cleanup handlers
3225BEGIN { 3453BEGIN {
3454 our %SIGWATCHER = ();
3226 for my $signal (qw(INT HUP TERM)) { 3455 for my $signal (qw(INT HUP TERM)) {
3227 Event->signal ( 3456 $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"; 3457 cf::cleanup "SIG$signal";
3234 },
3235 ); 3458 };
3236 } 3459 }
3237} 3460}
3238 3461
3239sub write_runtime { 3462sub write_runtime_sync {
3240 my $runtime = "$LOCALDIR/runtime"; 3463 my $runtime = "$LOCALDIR/runtime";
3241 3464
3242 # first touch the runtime file to show we are still running: 3465 # first touch the runtime file to show we are still running:
3243 # the fsync below can take a very very long time. 3466 # the fsync below can take a very very long time.
3244 3467
3270 and return; 3493 and return;
3271 3494
3272 warn "runtime file written.\n"; 3495 warn "runtime file written.\n";
3273 3496
3274 1 3497 1
3498}
3499
3500our $uuid_lock;
3501our $uuid_skip;
3502
3503sub write_uuid_sync($) {
3504 $uuid_skip ||= $_[0];
3505
3506 return if $uuid_lock;
3507 local $uuid_lock = 1;
3508
3509 my $uuid = "$LOCALDIR/uuid";
3510
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return;
3513
3514 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3515 $uuid_skip = 0;
3516
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return;
3519
3520 # always fsync - this file is important
3521 aio_fsync $fh
3522 and return;
3523
3524 close $fh
3525 or return;
3526
3527 aio_rename "$uuid~", $uuid
3528 and return;
3529
3530 warn "uuid file written ($value).\n";
3531
3532 1
3533
3534}
3535
3536sub write_uuid($$) {
3537 my ($skip, $sync) = @_;
3538
3539 $sync ? write_uuid_sync $skip
3540 : async { write_uuid_sync $skip };
3275} 3541}
3276 3542
3277sub emergency_save() { 3543sub emergency_save() {
3278 my $freeze_guard = cf::freeze_mainloop; 3544 my $freeze_guard = cf::freeze_mainloop;
3279 3545
3301 warn "end emergency map save\n"; 3567 warn "end emergency map save\n";
3302 3568
3303 warn "begin emergency database checkpoint\n"; 3569 warn "begin emergency database checkpoint\n";
3304 BDB::db_env_txn_checkpoint $DB_ENV; 3570 BDB::db_env_txn_checkpoint $DB_ENV;
3305 warn "end emergency database checkpoint\n"; 3571 warn "end emergency database checkpoint\n";
3572
3573 warn "begin write uuid\n";
3574 write_uuid_sync 1;
3575 warn "end write uuid\n";
3306 }; 3576 };
3307 3577
3308 warn "leave emergency perl save\n"; 3578 warn "leave emergency perl save\n";
3309} 3579}
3310 3580
3325 warn "reloading..."; 3595 warn "reloading...";
3326 3596
3327 warn "entering sync_job"; 3597 warn "entering sync_job";
3328 3598
3329 cf::sync_job { 3599 cf::sync_job {
3330 cf::write_runtime; # external watchdog should not bark 3600 cf::write_runtime_sync; # external watchdog should not bark
3331 cf::emergency_save; 3601 cf::emergency_save;
3332 cf::write_runtime; # external watchdog should not bark 3602 cf::write_runtime_sync; # external watchdog should not bark
3333 3603
3334 warn "syncing database to disk"; 3604 warn "syncing database to disk";
3335 BDB::db_env_txn_checkpoint $DB_ENV; 3605 BDB::db_env_txn_checkpoint $DB_ENV;
3336 3606
3337 # if anything goes wrong in here, we should simply crash as we already saved 3607 # 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 3608
3344 warn "flushing outstanding aio requests"; 3609 warn "flushing outstanding aio requests";
3345 for (;;) { 3610 for (;;) {
3346 BDB::flush; 3611 BDB::flush;
3347 IO::AIO::flush; 3612 IO::AIO::flush;
3348 Coro::cede; 3613 Coro::cede_notself;
3349 last unless IO::AIO::nreqs || BDB::nreqs; 3614 last unless IO::AIO::nreqs || BDB::nreqs;
3350 warn "iterate..."; 3615 warn "iterate...";
3351 } 3616 }
3352 3617
3353 ++$RELOAD; 3618 ++$RELOAD;
3429 warn "leaving sync_job"; 3694 warn "leaving sync_job";
3430 3695
3431 1 3696 1
3432 } or do { 3697 } or do {
3433 warn $@; 3698 warn $@;
3434 warn "error while reloading, exiting."; 3699 cf::cleanup "error while reloading, exiting.";
3435 exit 1;
3436 }; 3700 };
3437 3701
3438 warn "reloaded"; 3702 warn "reloaded";
3439}; 3703};
3440 3704
3442 3706
3443sub reload_perl() { 3707sub reload_perl() {
3444 # doing reload synchronously and two reloads happen back-to-back, 3708 # doing reload synchronously and two reloads happen back-to-back,
3445 # coro crashes during coro_state_free->destroy here. 3709 # coro crashes during coro_state_free->destroy here.
3446 3710
3447 $RELOAD_WATCHER ||= Event->timer ( 3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3448 reentrant => 0,
3449 after => 0,
3450 data => WF_AUTOCANCEL,
3451 cb => sub {
3452 do_reload_perl; 3712 do_reload_perl;
3453 undef $RELOAD_WATCHER; 3713 undef $RELOAD_WATCHER;
3454 },
3455 ); 3714 };
3456} 3715}
3457 3716
3458register_command "reload" => sub { 3717register_command "reload" => sub {
3459 my ($who, $arg) = @_; 3718 my ($who, $arg) = @_;
3460 3719
3473 3732
3474our @WAIT_FOR_TICK; 3733our @WAIT_FOR_TICK;
3475our @WAIT_FOR_TICK_BEGIN; 3734our @WAIT_FOR_TICK_BEGIN;
3476 3735
3477sub wait_for_tick { 3736sub wait_for_tick {
3478 return unless $TICK_WATCHER->is_active;
3479 return if $Coro::current == $Coro::main; 3737 return if tick_inhibit || $Coro::current == $Coro::main;
3480 3738
3481 my $signal = new Coro::Signal; 3739 my $signal = new Coro::Signal;
3482 push @WAIT_FOR_TICK, $signal; 3740 push @WAIT_FOR_TICK, $signal;
3483 $signal->wait; 3741 $signal->wait;
3484} 3742}
3485 3743
3486sub wait_for_tick_begin { 3744sub wait_for_tick_begin {
3487 return unless $TICK_WATCHER->is_active;
3488 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
3489 3746
3490 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
3491 push @WAIT_FOR_TICK_BEGIN, $signal; 3748 push @WAIT_FOR_TICK_BEGIN, $signal;
3492 $signal->wait; 3749 $signal->wait;
3493} 3750}
3494 3751
3495$TICK_WATCHER = Event->timer ( 3752sub 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) { 3753 if ($Coro::current != $Coro::main) {
3503 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3754 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3504 unless ++$bug_warning > 10; 3755 unless ++$bug_warning > 10;
3505 return; 3756 return;
3506 } 3757 }
3507 3758
3508 $NOW = $tick_start = Event::time;
3509
3510 cf::server_tick; # one server iteration 3759 cf::server_tick; # one server iteration
3511 3760
3512 $RUNTIME += $TICK;
3513 $NEXT_TICK += $TICK;
3514
3515 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3761 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3516 $NEXT_RUNTIME_WRITE = $NOW + 10; 3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3517 Coro::async_pool { 3763 Coro::async_pool {
3518 $Coro::current->{desc} = "runtime saver"; 3764 $Coro::current->{desc} = "runtime saver";
3519 write_runtime 3765 write_runtime_sync
3520 or warn "ERROR: unable to write runtime file: $!"; 3766 or warn "ERROR: unable to write runtime file: $!";
3521 };
3522 } 3767 };
3768 }
3523 3769
3524 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3525 $sig->send; 3771 $sig->send;
3526 } 3772 }
3527 while (my $sig = shift @WAIT_FOR_TICK) { 3773 while (my $sig = shift @WAIT_FOR_TICK) {
3528 $sig->send; 3774 $sig->send;
3529 } 3775 }
3530 3776
3531 $NOW = Event::time; 3777 $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; 3778 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3541 3779
3542 _post_tick; 3780 if (0) {
3781 if ($NEXT_TICK) {
3782 my $jitter = $TICK_START - $NEXT_TICK;
3783 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3784 warn "jitter $JITTER\n";#d#
3785 }
3543 }, 3786 }
3544); 3787}
3545 3788
3546{ 3789{
3790 # configure BDB
3791
3547 BDB::min_parallel 8; 3792 BDB::min_parallel 8;
3548 BDB::max_poll_time $TICK * 0.1; 3793 BDB::max_poll_reqs $TICK * 0.1;
3549 $BDB_POLL_WATCHER = Event->io ( 3794 $AnyEvent::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 3795
3573 unless ($DB_ENV) { 3796 unless ($DB_ENV) {
3574 $DB_ENV = BDB::db_env_create; 3797 $DB_ENV = BDB::db_env_create;
3575 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3576 | BDB::LOG_AUTOREMOVE, 1); 3799 | BDB::LOG_AUTOREMOVE, 1);
3591 3814
3592 cf::cleanup "db_env_open(db): $@" if $@; 3815 cf::cleanup "db_env_open(db): $@" if $@;
3593 }; 3816 };
3594 } 3817 }
3595 3818
3596 $BDB_DEADLOCK_WATCHER = Event->timer ( 3819 $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 { }; 3820 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3604 },
3605 ); 3821 };
3606 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3822 $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 { }; 3823 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3614 },
3615 ); 3824 };
3616 $BDB_TRICKLE_WATCHER = Event->timer ( 3825 $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 { }; 3826 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3624 },
3625 ); 3827 };
3626} 3828}
3627 3829
3628{ 3830{
3831 # configure IO::AIO
3832
3629 IO::AIO::min_parallel 8; 3833 IO::AIO::min_parallel 8;
3630
3631 undef $Coro::AIO::WATCHER;
3632 IO::AIO::max_poll_time $TICK * 0.1; 3834 IO::AIO::max_poll_time $TICK * 0.1;
3633 $AIO_POLL_WATCHER = Event->io ( 3835 undef $AnyEvent::AIO::WATCHER;
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} 3836}
3642 3837
3643my $_log_backtrace; 3838my $_log_backtrace;
3644 3839
3645sub _log_backtrace { 3840sub _log_backtrace {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines