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.378 by root, Thu Oct 4 11:36:54 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 Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.64 (); 36use Coro ();
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.32 (); 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>:
373 } 418 }
374 } 419 }
375 } 420 }
376 421
377 if (@SLOT_QUEUE) { 422 if (@SLOT_QUEUE) {
378 # we do not use wait_For_tick() as it returns immediately when tick is inactive 423 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal; 424 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 425 $signal->wait;
381 } else { 426 } else {
382 Coro::schedule; 427 Coro::schedule;
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 # TODO: use suspend/resume instead 479 LOG llevError, Carp::longmess "sync job";#d#
433 # (but this is cancel-safe) 480
434 my $freeze_guard = freeze_mainloop; 481 my $freeze_guard = freeze_mainloop;
435 482
436 my $busy = 1; 483 my $busy = 1;
437 my @res; 484 my @res;
438 485
442 warn $@ if $@; 489 warn $@ if $@;
443 undef $busy; 490 undef $busy;
444 })->prio (Coro::PRIO_MAX); 491 })->prio (Coro::PRIO_MAX);
445 492
446 while ($busy) { 493 while ($busy) {
447 Coro::cede or Event::one_event; 494 if (Coro::nready) {
495 Coro::cede_notself;
496 } else {
497 EV::loop EV::LOOP_ONESHOT;
448 } 498 }
499 }
449 500
450 $time = Event::time - $time; 501 my $time = EV::time - $time;
451 502
452 LOG llevError | logBacktrace, Carp::longmess "long sync job"
453 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
454
455 $tick_start += $time; # do not account sync jobs to server load 503 $TICK_START += $time; # do not account sync jobs to server load
456 504
457 wantarray ? @res : $res[0] 505 wantarray ? @res : $res[0]
458 } else { 506 } else {
459 # we are in another coroutine, how wonderful, everything just works 507 # we are in another coroutine, how wonderful, everything just works
460 508
485=item fork_call { }, $args 533=item fork_call { }, $args
486 534
487Executes the given code block with the given arguments in a seperate 535Executes the given code block with the given arguments in a seperate
488process, returning the results. Everything must be serialisable with 536process, returning the results. Everything must be serialisable with
489Coro::Storable. May, of course, block. Note that the executed sub may 537Coro::Storable. May, of course, block. Note that the executed sub may
490never block itself or use any form of Event handling. 538never block itself or use any form of event handling.
491 539
492=cut 540=cut
493 541
494sub fork_call(&@) { 542sub fork_call(&@) {
495 my ($cb, @args) = @_; 543 my ($cb, @args) = @_;
502 reset_signals; 550 reset_signals;
503 &$cb 551 &$cb
504 }, @args; 552 }, @args;
505 553
506 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
507} 582}
508 583
509=item $value = cf::db_get $family => $key 584=item $value = cf::db_get $family => $key
510 585
511Returns a single value from the environment database. 586Returns a single value from the environment database.
656attach callbacks/event handlers (a collection of which is called an "attachment") 731attach callbacks/event handlers (a collection of which is called an "attachment")
657to it. All such attachable objects support the following methods. 732to it. All such attachable objects support the following methods.
658 733
659In 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>
660C<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
661Crossfire TRT). 736Deliantra).
662 737
663=over 4 738=over 4
664 739
665=item $attachable->attach ($attachment, key => $value...) 740=item $attachable->attach ($attachment, key => $value...)
666 741
948 } 1023 }
949 1024
950 0 1025 0
951} 1026}
952 1027
953=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1028=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
954 1029
955=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
956 1031
957Generate an object-specific event with the given arguments. 1032Generate an object-specific event with the given arguments.
958 1033
964 1039
965=cut 1040=cut
966 1041
967############################################################################# 1042#############################################################################
968# object support 1043# object support
969#
970 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#
971sub _can_merge { 1078sub _can_merge {
972 my ($ob1, $ob2) = @_; 1079 my ($ob1, $ob2) = @_;
973 1080
974 local $Storable::canonical = 1; 1081 ++$SLOW_MERGES;#d#
975 my $fob1 = Storable::freeze $ob1;
976 my $fob2 = Storable::freeze $ob2;
977 1082
978 $fob1 eq $fob2 1083 # we do the slow way here
1084 return _object_equal $ob1, $ob2
979} 1085}
980 1086
981sub reattach { 1087sub reattach {
982 # basically do the same as instantiate, without calling instantiate 1088 # basically do the same as instantiate, without calling instantiate
983 my ($obj) = @_; 1089 my ($obj) = @_;
1005cf::attachable->attach ( 1111cf::attachable->attach (
1006 prio => -1000000, 1112 prio => -1000000,
1007 on_instantiate => sub { 1113 on_instantiate => sub {
1008 my ($obj, $data) = @_; 1114 my ($obj, $data) = @_;
1009 1115
1010 $data = from_json $data; 1116 $data = decode_json $data;
1011 1117
1012 for (@$data) { 1118 for (@$data) {
1013 my ($name, $args) = @$_; 1119 my ($name, $args) = @$_;
1014 1120
1015 $obj->attach ($name, %{$args || {} }); 1121 $obj->attach ($name, %{$args || {} });
1036 utf8::decode (my $decname = $filename); 1142 utf8::decode (my $decname = $filename);
1037 warn sprintf "saving %s (%d,%d)\n", 1143 warn sprintf "saving %s (%d,%d)\n",
1038 $decname, length $$rdata, scalar @$objs; 1144 $decname, length $$rdata, scalar @$objs;
1039 1145
1040 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1041 chmod SAVE_MODE, $fh; 1147 aio_chmod $fh, SAVE_MODE;
1042 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1043 aio_fsync $fh if $cf::USE_FSYNC; 1149 aio_fsync $fh if $cf::USE_FSYNC;
1044 close $fh; 1150 aio_close $fh;
1045 1151
1046 if (@$objs) { 1152 if (@$objs) {
1047 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) {
1048 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
1049 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1050 aio_write $fh, 0, (length $data), $data, 0; 1156 aio_write $fh, 0, (length $data), $data, 0;
1051 aio_fsync $fh if $cf::USE_FSYNC; 1157 aio_fsync $fh if $cf::USE_FSYNC;
1052 close $fh; 1158 aio_close $fh;
1053 aio_rename "$filename.pst~", "$filename.pst"; 1159 aio_rename "$filename.pst~", "$filename.pst";
1054 } 1160 }
1055 } else { 1161 } else {
1056 aio_unlink "$filename.pst"; 1162 aio_unlink "$filename.pst";
1057 } 1163 }
1085 1191
1086 unless (aio_stat "$filename.pst") { 1192 unless (aio_stat "$filename.pst") {
1087 (aio_load "$filename.pst", $av) >= 0 1193 (aio_load "$filename.pst", $av) >= 0
1088 or return; 1194 or return;
1089 1195
1090 $av = eval { (Storable::thaw $av)->{objs} }; 1196 my $st = eval { Coro::Storable::thaw $av };
1197 $av = $st->{objs};
1091 } 1198 }
1092 1199
1093 utf8::decode (my $decname = $filename); 1200 utf8::decode (my $decname = $filename);
1094 warn sprintf "loading %s (%d,%d)\n", 1201 warn sprintf "loading %s (%d,%d)\n",
1095 $decname, length $data, scalar @{$av || []}; 1202 $decname, length $data, scalar @{$av || []};
1251 my $msg = $@ ? "$v->{path}: $@\n" 1358 my $msg = $@ ? "$v->{path}: $@\n"
1252 : "$v->{base}: extension inactive.\n"; 1359 : "$v->{base}: extension inactive.\n";
1253 1360
1254 if (exists $v->{meta}{mandatory}) { 1361 if (exists $v->{meta}{mandatory}) {
1255 warn $msg; 1362 warn $msg;
1256 warn "mandatory extension failed to load, exiting.\n"; 1363 cf::cleanup "mandatory extension failed to load, exiting.";
1257 exit 1;
1258 } 1364 }
1259 1365
1260 warn $msg; 1366 warn $msg;
1261 } 1367 }
1262 1368
1351 my $f = new_from_file cf::object::thawer path $login 1457 my $f = new_from_file cf::object::thawer path $login
1352 or return; 1458 or return;
1353 1459
1354 my $pl = cf::player::load_pl $f 1460 my $pl = cf::player::load_pl $f
1355 or return; 1461 or return;
1462
1356 local $cf::PLAYER_LOADING{$login} = $pl; 1463 local $cf::PLAYER_LOADING{$login} = $pl;
1357 $f->resolve_delayed_derefs; 1464 $f->resolve_delayed_derefs;
1358 $cf::PLAYER{$login} = $pl 1465 $cf::PLAYER{$login} = $pl
1359 } 1466 }
1360 } 1467 }
1370 1477
1371 return if $pl->{deny_save}; 1478 return if $pl->{deny_save};
1372 1479
1373 aio_mkdir playerdir $pl, 0770; 1480 aio_mkdir playerdir $pl, 0770;
1374 $pl->{last_save} = $cf::RUNTIME; 1481 $pl->{last_save} = $cf::RUNTIME;
1482
1483 cf::get_slot 0.01;
1375 1484
1376 $pl->save_pl ($path); 1485 $pl->save_pl ($path);
1377 cf::cede_to_tick; 1486 cf::cede_to_tick;
1378} 1487}
1379 1488
1415 $pl->{deny_save} = 1; 1524 $pl->{deny_save} = 1;
1416 $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
1417 1526
1418 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1419 $pl->deactivate; 1528 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score;
1420 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1531 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1421 $pl->ns->destroy if $pl->ns; 1532 $pl->ns->destroy if $pl->ns;
1422 1533
1423 my $path = playerdir $pl; 1534 my $path = playerdir $pl;
1424 my $temp = "$path~$cf::RUNTIME~deleting~"; 1535 my $temp = "$path~$cf::RUNTIME~deleting~";
1463 1574
1464 for my $login (@$dirs) { 1575 for my $login (@$dirs) {
1465 my $path = path $login; 1576 my $path = path $login;
1466 1577
1467 # a .pst is a dead give-away for a valid player 1578 # a .pst is a dead give-away for a valid player
1468 unless (-e "$path.pst") { 1579 # if no pst file found, open and chekc for blocked users
1580 if (aio_stat "$path.pst") {
1469 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1581 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1470 aio_read $fh, 0, 512, my $buf, 0 or next; 1582 aio_read $fh, 0, 512, my $buf, 0 or next;
1471 $buf !~ /^password -------------$/m or next; # official not-valid tag 1583 $buf !~ /^password -------------$/m or next; # official not-valid tag
1472 } 1584 }
1473 1585
1510 1622
1511Expand crossfire pod fragments into protocol xml. 1623Expand crossfire pod fragments into protocol xml.
1512 1624
1513=cut 1625=cut
1514 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
1515sub expand_cfpod { 1638sub expand_cfpod {
1516 ((my $self), (local $_)) = @_; 1639 my ($self, $pod) = @_;
1517 1640
1518 # escape & and < 1641 my $xml;
1519 s/&/&amp;/g;
1520 s/(?<![BIUGHT])</&lt;/g;
1521 1642
1522 # this is buggy, it needs to properly take care of nested <'s 1643 while () {
1644 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1645 $group = $1;
1523 1646
1524 1 while 1647 $group =~ s/&/&amp;/g;
1525 # replace B<>, I<>, U<> etc. 1648 $group =~ s/</&lt;/g;
1526 s/B<([^\>]*)>/<b>$1<\/b>/ 1649
1527 || s/I<([^\>]*)>/<i>$1<\/i>/ 1650 $xml .= $group;
1528 || s/U<([^\>]*)>/<u>$1<\/u>/ 1651 } elsif ($pod =~ m%\G
1529 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1652 ([BCGHITU])
1530 # replace G<male|female> tags 1653 <
1531 || s{G<([^>|]*)\|([^>]*)>}{ 1654 (?:
1532 $self->gender ? $2 : $1 1655 ([^<>]*) (?{ $group = $^N })
1533 }ge 1656 | < $interior >
1534 # replace H<hint text> 1657 )
1535 || s{H<([^\>]*)>} 1658 >
1659 %gcsx
1536 { 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") {
1537 ("<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>",
1538 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1679 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1539 "") 1680 "")
1540 [$self->{hintmode}] 1681 [$self->{hintmode}];
1682 } else {
1683 $xml .= "error processing '$code($data)' directive";
1541 }ge; 1684 }
1685 } else {
1686 if ($pod =~ /\G(.+)/) {
1687 warn "parse error while expanding $pod (at $1)";
1688 }
1689 last;
1690 }
1691 }
1542 1692
1693 for ($xml) {
1543 # create single paragraphs (very hackish) 1694 # create single paragraphs (very hackish)
1544 s/(?<=\S)\n(?=\w)/ /g; 1695 s/(?<=\S)\n(?=\w)/ /g;
1545 1696
1546 # compress some whitespace 1697 # compress some whitespace
1547 s/\s+\n/\n/g; # ws line-ends 1698 s/\s+\n/\n/g; # ws line-ends
1548 s/\n\n+/\n/g; # double lines 1699 s/\n\n+/\n/g; # double lines
1549 s/^\n+//; # beginning lines 1700 s/^\n+//; # beginning lines
1550 s/\n+$//; # ending lines 1701 s/\n+$//; # ending lines
1702 }
1551 1703
1552 $_ 1704 $xml
1553} 1705}
1706
1707no re 'eval';
1554 1708
1555sub hintmode { 1709sub hintmode {
1556 $_[0]{hintmode} = $_[1] if @_ > 1; 1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1557 $_[0]{hintmode} 1711 $_[0]{hintmode}
1558} 1712}
1630our $MAX_RESET = 3600; 1784our $MAX_RESET = 3600;
1631our $DEFAULT_RESET = 3000; 1785our $DEFAULT_RESET = 3000;
1632 1786
1633sub generate_random_map { 1787sub generate_random_map {
1634 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
1635 # mit "rum" bekleckern, nicht 1792 # mit "rum" bekleckern, nicht
1636 $self->_create_random_map ( 1793 $self->_create_random_map (
1637 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1638 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1639 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1761 1918
1762# the temporary/swap location 1919# the temporary/swap location
1763sub save_path { 1920sub save_path {
1764 my ($self) = @_; 1921 my ($self) = @_;
1765 1922
1766 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1923 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1767 "$TMPDIR/$path.map" 1924 "$TMPDIR/$path.map"
1768} 1925}
1769 1926
1770# the unique path, undef == no special unique path 1927# the unique path, undef == no special unique path
1771sub uniq_path { 1928sub uniq_path {
1772 my ($self) = @_; 1929 my ($self) = @_;
1773 1930
1774 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1775 "$UNIQUEDIR/$path" 1932 "$UNIQUEDIR/$path"
1776} 1933}
1777 1934
1778# and all this just because we cannot iterate over 1935# and all this just because we cannot iterate over
1779# all maps in C++... 1936# all maps in C++...
1877 2034
1878 cf::lock_wait "map_data:$path";#d#remove 2035 cf::lock_wait "map_data:$path";#d#remove
1879 cf::lock_wait "map_find:$path"; 2036 cf::lock_wait "map_find:$path";
1880 2037
1881 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
1882 my $guard1 = cf::lock_acquire "map_find:$path";
1883 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";
1884 2041
1885 my $map = new_from_path cf::map $path 2042 my $map = new_from_path cf::map $path
1886 or return; 2043 or return;
1887 2044
1888 $map->{last_save} = $cf::RUNTIME; 2045 $map->{last_save} = $cf::RUNTIME;
1891 or return; 2048 or return;
1892 2049
1893 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2050 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1894 # doing this can freeze the server in a sync job, obviously 2051 # doing this can freeze the server in a sync job, obviously
1895 #$cf::WAIT_FOR_TICK->wait; 2052 #$cf::WAIT_FOR_TICK->wait;
2053 undef $guard2;
1896 undef $guard1; 2054 undef $guard1;
1897 undef $guard2;
1898 $map->reset; 2055 $map->reset;
1899 return find $path; 2056 return find $path;
1900 } 2057 }
1901 2058
1902 $cf::MAP{$path} = $map 2059 $cf::MAP{$path} = $map
1965 } 2122 }
1966 2123
1967 $self->{last_save} = $cf::RUNTIME; 2124 $self->{last_save} = $cf::RUNTIME;
1968 $self->last_access ($cf::RUNTIME); 2125 $self->last_access ($cf::RUNTIME);
1969 2126
1970 $self->in_memory (cf::MAP_IN_MEMORY); 2127 $self->in_memory (cf::MAP_ACTIVE);
1971 } 2128 }
1972 2129
1973 $self->post_load; 2130 $self->post_load;
1974} 2131}
1975 2132
2033 my ($path, $origin, $load) = @_; 2190 my ($path, $origin, $load) = @_;
2034 2191
2035 $path = normalise $path, $origin && $origin->{path}; 2192 $path = normalise $path, $origin && $origin->{path};
2036 2193
2037 if (my $map = $cf::MAP{$path}) { 2194 if (my $map = $cf::MAP{$path}) {
2038 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2195 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2039 } 2196 }
2040 2197
2041 $MAP_PREFETCH{$path} |= $load; 2198 $MAP_PREFETCH{$path} |= $load;
2042 2199
2043 $MAP_PREFETCHER ||= cf::async { 2200 $MAP_PREFETCHER ||= cf::async {
2080 cf::async { 2237 cf::async {
2081 $Coro::current->{desc} = "map player save"; 2238 $Coro::current->{desc} = "map player save";
2082 $_->contr->save for $self->players; 2239 $_->contr->save for $self->players;
2083 }; 2240 };
2084 2241
2242 cf::get_slot 0.02;
2243
2085 if ($uniq) { 2244 if ($uniq) {
2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2087 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2246 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2088 } else { 2247 } else {
2089 $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);
2097 $self->save; 2256 $self->save;
2098 2257
2099 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2258 my $lock = cf::lock_acquire "map_data:$self->{path}";
2100 2259
2101 return if $self->players; 2260 return if $self->players;
2102 return if $self->in_memory != cf::MAP_IN_MEMORY; 2261 return if $self->in_memory != cf::MAP_ACTIVE;
2103 return if $self->{deny_save}; 2262 return if $self->{deny_save};
2104 2263
2105 $self->in_memory (cf::MAP_SWAPPED); 2264 $self->in_memory (cf::MAP_SWAPPED);
2106 2265
2107 $self->deactivate; 2266 $self->deactivate;
2225 2384
2226sub unique_maps() { 2385sub unique_maps() {
2227 [ 2386 [
2228 map { 2387 map {
2229 utf8::decode $_; 2388 utf8::decode $_;
2230 /\.map$/ 2389 s/\.map$//; # TODO future compatibility hack
2390 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2391 ? ()
2231 ? normalise $_ 2392 : normalise $_
2232 : ()
2233 } @{ aio_readdir $UNIQUEDIR or [] } 2393 } @{ aio_readdir $UNIQUEDIR or [] }
2234 ] 2394 ]
2235} 2395}
2236 2396
2237package cf;
2238
2239=back 2397=back
2240 2398
2241=head3 cf::object 2399=head3 cf::object
2242 2400
2243=cut 2401=cut
2246 2404
2247=over 4 2405=over 4
2248 2406
2249=item $ob->inv_recursive 2407=item $ob->inv_recursive
2250 2408
2251Returns 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.
2252 2411
2253=cut 2412=cut
2254 2413
2255sub inv_recursive_; 2414sub inv_recursive_;
2256sub inv_recursive_ { 2415sub inv_recursive_ {
2261 inv_recursive_ inv $_[0] 2420 inv_recursive_ inv $_[0]
2262} 2421}
2263 2422
2264=item $ref = $ob->ref 2423=item $ref = $ob->ref
2265 2424
2266creates 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.
2267 2426
2268=item $ob = cf::object::deref ($refstring) 2427=item $ob = cf::object::deref ($refstring)
2269 2428
2270returns 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,
2271even if the object actually exists. May block. 2430even if the object actually exists. May block.
2303can 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
2304dialogue with the given NPC character. 2463dialogue with the given NPC character.
2305 2464
2306=cut 2465=cut
2307 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
2308# rough implementation of a future "reply" method that works 2481# rough implementation of a future "reply" method that works
2309# with dialog boxes. 2482# with dialog boxes.
2310#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
2311sub cf::object::player::reply($$$;$) { 2484sub cf::object::player::reply($$$;$) {
2312 my ($self, $npc, $msg, $flags) = @_; 2485 my ($self, $npc, $msg, $flags) = @_;
2323 my $dialog = $pl->{npc_dialog}; 2496 my $dialog = $pl->{npc_dialog};
2324 $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));
2325 2498
2326 } else { 2499 } else {
2327 $msg = $npc->name . " says: $msg" if $npc; 2500 $msg = $npc->name . " says: $msg" if $npc;
2328 $self->message ($msg, $flags); 2501 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2329 } 2502 }
2330 } 2503 }
2331} 2504}
2332 2505
2333=item $object->send_msg ($channel, $msg, $color, [extra...]) 2506=item $object->send_msg ($channel, $msg, $color, [extra...])
2528} 2701}
2529 2702
2530sub prepare_random_map { 2703sub prepare_random_map {
2531 my ($exit) = @_; 2704 my ($exit) = @_;
2532 2705
2533 my $guard = cf::lock_acquire "exit_prepare:$exit";
2534
2535 # all this does is basically replace the /! path by 2706 # all this does is basically replace the /! path by
2536 # a new random map path (?random/...) with a seed 2707 # a new random map path (?random/...) with a seed
2537 # that depends on the exit object 2708 # that depends on the exit object
2538 2709
2539 my $rmp = parse_random_map_params $exit->msg; 2710 my $rmp = parse_random_map_params $exit->msg;
2541 if ($exit->map) { 2712 if ($exit->map) {
2542 $rmp->{region} = $exit->region->name; 2713 $rmp->{region} = $exit->region->name;
2543 $rmp->{origin_map} = $exit->map->path; 2714 $rmp->{origin_map} = $exit->map->path;
2544 $rmp->{origin_x} = $exit->x; 2715 $rmp->{origin_x} = $exit->x;
2545 $rmp->{origin_y} = $exit->y; 2716 $rmp->{origin_y} = $exit->y;
2717
2718 $exit->map->touch;
2546 } 2719 }
2547 2720
2548 $rmp->{random_seed} ||= $exit->random_seed; 2721 $rmp->{random_seed} ||= $exit->random_seed;
2549 2722
2550 my $data = cf::to_json $rmp; 2723 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2551 my $md5 = Digest::MD5::md5_hex $data; 2724 my $md5 = Digest::MD5::md5_hex $data;
2552 my $meta = "$RANDOMDIR/$md5.meta"; 2725 my $meta = "$RANDOMDIR/$md5.meta";
2553 2726
2554 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2727 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2555 aio_write $fh, 0, (length $data), $data, 0; 2728 aio_write $fh, 0, (length $data), $data, 0;
2556 undef $fh; 2729 undef $fh;
2557 aio_rename "$meta~", $meta; 2730 aio_rename "$meta~", $meta;
2558 2731
2732 my $slaying = "?random/$md5";
2733
2734 if ($exit->valid) {
2559 $exit->slaying ("?random/$md5"); 2735 $exit->slaying ("?random/$md5");
2560 $exit->msg (undef); 2736 $exit->msg (undef);
2737 }
2561 } 2738 }
2562} 2739}
2563 2740
2564sub cf::object::player::enter_exit { 2741sub cf::object::player::enter_exit {
2565 my ($self, $exit) = @_; 2742 my ($self, $exit) = @_;
2566 2743
2567 return unless $self->type == cf::PLAYER; 2744 return unless $self->type == cf::PLAYER;
2568 2745
2569 if ($exit->slaying eq "/!") {
2570 #TODO: this should de-fi-ni-te-ly not be a sync-job
2571 # the problem is that $exit might not survive long enough
2572 # so it needs to be done right now, right here
2573 cf::sync_job { prepare_random_map $exit };
2574 }
2575
2576 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2577 my $hp = $exit->stats->hp;
2578 my $sp = $exit->stats->sp;
2579
2580 $self->enter_link; 2746 $self->enter_link;
2581 2747
2582 # if exit is damned, update players death & WoR home-position
2583 $self->contr->savebed ($slaying, $hp, $sp)
2584 if $exit->flag (FLAG_DAMNED);
2585
2586 (async { 2748 (async {
2587 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2749 $Coro::current->{desc} = "enter_exit";
2588 2750
2589 $self->deactivate_recursive; # just to be sure
2590 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
2591 $self->goto ($slaying, $hp, $sp); 2766 $self->goto ($map, $x, $y);
2592 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
2593 1; 2772 1
2594 }) { 2773 }) {
2595 $self->message ("Something went wrong deep within the crossfire server. " 2774 $self->message ("Something went wrong deep within the crossfire server. "
2596 . "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. "
2597 . "Please report this to the dungeon master!", 2776 . "Please report this to the dungeon master!",
2598 cf::NDI_UNIQUE | cf::NDI_RED); 2777 cf::NDI_UNIQUE | cf::NDI_RED);
2628the 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
2629the message unless the client supports the msg packet. 2808the message unless the client supports the msg packet.
2630 2809
2631=cut 2810=cut
2632 2811
2812# non-persistent channels (usually the info channel)
2633our %CHANNEL = ( 2813our %CHANNEL = (
2634 "c/identify" => { 2814 "c/identify" => {
2635 id => "infobox", 2815 id => "infobox",
2636 title => "Identify", 2816 title => "Identify",
2637 reply => undef, 2817 reply => undef,
2641 id => "infobox", 2821 id => "infobox",
2642 title => "Examine", 2822 title => "Examine",
2643 reply => undef, 2823 reply => undef,
2644 tooltip => "Signs and other items you examined", 2824 tooltip => "Signs and other items you examined",
2645 }, 2825 },
2826 "c/book" => {
2827 id => "infobox",
2828 title => "Book",
2829 reply => undef,
2830 tooltip => "The contents of a note or book",
2831 },
2646 "c/lookat" => { 2832 "c/lookat" => {
2647 id => "infobox", 2833 id => "infobox",
2648 title => "Look", 2834 title => "Look",
2649 reply => undef, 2835 reply => undef,
2650 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",
2651 }, 2867 },
2652); 2868);
2653 2869
2654sub cf::client::send_msg { 2870sub cf::client::send_msg {
2655 my ($self, $channel, $msg, $color, @extra) = @_; 2871 my ($self, $channel, $msg, $color, @extra) = @_;
2892=pod 3108=pod
2893 3109
2894The following functions and methods are available within a safe environment: 3110The following functions and methods are available within a safe environment:
2895 3111
2896 cf::object 3112 cf::object
2897 contr pay_amount pay_player map x y force_find force_add 3113 contr pay_amount pay_player map x y force_find force_add destroy
2898 insert remove name archname title slaying race decrease_ob_nr 3114 insert remove name archname title slaying race decrease split
2899 3115
2900 cf::object::player 3116 cf::object::player
2901 player 3117 player
2902 3118
2903 cf::player 3119 cf::player
2908 3124
2909=cut 3125=cut
2910 3126
2911for ( 3127for (
2912 ["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
2913 insert remove inv name archname title slaying race 3129 insert remove inv nrof name archname title slaying race
2914 decrease_ob_nr)], 3130 decrease split destroy)],
2915 ["cf::object::player" => qw(player)], 3131 ["cf::object::player" => qw(player)],
2916 ["cf::player" => qw(peaceful)], 3132 ["cf::player" => qw(peaceful)],
2917 ["cf::map" => qw(trigger)], 3133 ["cf::map" => qw(trigger)],
2918) { 3134) {
2919 no strict 'refs'; 3135 no strict 'refs';
3024 { 3240 {
3025 my $faces = $facedata->{faceinfo}; 3241 my $faces = $facedata->{faceinfo};
3026 3242
3027 while (my ($face, $info) = each %$faces) { 3243 while (my ($face, $info) = each %$faces) {
3028 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3244 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3245
3029 cf::face::set_visibility $idx, $info->{visibility}; 3246 cf::face::set_visibility $idx, $info->{visibility};
3030 cf::face::set_magicmap $idx, $info->{magicmap}; 3247 cf::face::set_magicmap $idx, $info->{magicmap};
3031 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};
3032 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};
3033 3250
3034 cf::cede_to_tick; 3251 cf::cede_to_tick;
3035 } 3252 }
3036 3253
3037 while (my ($face, $info) = each %$faces) { 3254 while (my ($face, $info) = each %$faces) {
3038 next unless $info->{smooth}; 3255 next unless $info->{smooth};
3256
3039 my $idx = cf::face::find $face 3257 my $idx = cf::face::find $face
3040 or next; 3258 or next;
3259
3041 if (my $smooth = cf::face::find $info->{smooth}) { 3260 if (my $smooth = cf::face::find $info->{smooth}) {
3042 cf::face::set_smooth $idx, $smooth; 3261 cf::face::set_smooth $idx, $smooth;
3043 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3262 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3044 } else { 3263 } else {
3045 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3264 warn "smooth face '$info->{smooth}' not found for face '$face'";
3063 { 3282 {
3064 # TODO: for gcfclient pleasure, we should give resources 3283 # TODO: for gcfclient pleasure, we should give resources
3065 # that gcfclient doesn't grok a >10000 face index. 3284 # that gcfclient doesn't grok a >10000 face index.
3066 my $res = $facedata->{resource}; 3285 my $res = $facedata->{resource};
3067 3286
3068 my $soundconf = delete $res->{"res/sound.conf"};
3069
3070 while (my ($name, $info) = each %$res) { 3287 while (my ($name, $info) = each %$res) {
3288 if (defined $info->{type}) {
3071 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3289 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3072 my $data; 3290 my $data;
3073 3291
3074 if ($info->{type} & 1) { 3292 if ($info->{type} & 1) {
3075 # prepend meta info 3293 # prepend meta info
3076 3294
3077 my $meta = $enc->encode ({ 3295 my $meta = $enc->encode ({
3078 name => $name, 3296 name => $name,
3079 %{ $info->{meta} || {} }, 3297 %{ $info->{meta} || {} },
3080 }); 3298 });
3081 3299
3082 $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};
3083 } else { 3307 } else {
3084 $data = $info->{data}; 3308 $RESOURCE{$name} = $info;
3085 } 3309 }
3086 3310
3087 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3088 cf::face::set_type $idx, $info->{type};
3089
3090 cf::cede_to_tick; 3311 cf::cede_to_tick;
3091 } 3312 }
3092
3093 if ($soundconf) {
3094 $soundconf = $enc->decode (delete $soundconf->{data});
3095
3096 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3097 my $sound = $soundconf->{compat}[$_]
3098 or next;
3099
3100 my $face = cf::face::find "sound/$sound->[1]";
3101 cf::sound::set $sound->[0] => $face;
3102 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3103 }
3104
3105 while (my ($k, $v) = each %{$soundconf->{event}}) {
3106 my $face = cf::face::find "sound/$v";
3107 cf::sound::set $k => $face;
3108 }
3109 }
3110 } 3313 }
3314
3315 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3111 3316
3112 1 3317 1
3113} 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});
3114 3339
3115register_exticmd fx_want => sub { 3340register_exticmd fx_want => sub {
3116 my ($ns, $want) = @_; 3341 my ($ns, $want) = @_;
3117 3342
3118 while (my ($k, $v) = each %$want) { 3343 while (my ($k, $v) = each %$want) {
3119 $ns->fx_want ($k, $v); 3344 $ns->fx_want ($k, $v);
3120 } 3345 }
3121}; 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}
3122 3357
3123sub reload_regions { 3358sub reload_regions {
3124 # 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
3125 # for this (global event?) 3360 # for this (global event?)
3126 %ext::player_env::MUSIC_FACE_CACHE = (); 3361 %ext::player_env::MUSIC_FACE_CACHE = ();
3140} 3375}
3141 3376
3142sub reload_archetypes { 3377sub reload_archetypes {
3143 load_resource_file "$DATADIR/archetypes" 3378 load_resource_file "$DATADIR/archetypes"
3144 or die "unable to load archetypes\n"; 3379 or die "unable to load archetypes\n";
3145 #d# NEED to laod twice to resolve forward references
3146 # this really needs to be done in an extra post-pass
3147 # (which needs to be synchronous, so solve it differently)
3148 load_resource_file "$DATADIR/archetypes"
3149 or die "unable to load archetypes\n";
3150} 3380}
3151 3381
3152sub reload_treasures { 3382sub reload_treasures {
3153 load_resource_file "$DATADIR/treasures" 3383 load_resource_file "$DATADIR/treasures"
3154 or die "unable to load treasurelists\n"; 3384 or die "unable to load treasurelists\n";
3155} 3385}
3156 3386
3157sub reload_resources { 3387sub reload_resources {
3158 warn "reloading resource files...\n"; 3388 warn "reloading resource files...\n";
3159 3389
3390 reload_facedata;
3391 reload_archetypes;
3160 reload_regions; 3392 reload_regions;
3161 reload_facedata;
3162 #reload_archetypes;#d#
3163 reload_archetypes;
3164 reload_treasures; 3393 reload_treasures;
3165 3394
3166 warn "finished reloading resource files\n"; 3395 warn "finished reloading resource files\n";
3167} 3396}
3168 3397
3169sub init { 3398sub init {
3399 my $guard = freeze_mainloop;
3400
3401 evthread_start IO::AIO::poll_fileno;
3402
3170 reload_resources; 3403 reload_resources;
3171} 3404}
3172 3405
3173sub reload_config { 3406sub reload_config {
3174 open my $fh, "<:utf8", "$CONFDIR/config" 3407 open my $fh, "<:utf8", "$CONFDIR/config"
3175 or return; 3408 or return;
3176 3409
3177 local $/; 3410 local $/;
3178 *CFG = YAML::Syck::Load <$fh>; 3411 *CFG = YAML::Load <$fh>;
3179 3412
3180 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3413 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3181 3414
3182 $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};
3183 $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};
3195 # we must not ever block the main coroutine 3428 # we must not ever block the main coroutine
3196 local $Coro::idle = sub { 3429 local $Coro::idle = sub {
3197 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#
3198 (async { 3431 (async {
3199 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3432 $Coro::current->{desc} = "IDLE BUG HANDLER";
3200 Event::one_event; 3433 EV::loop EV::LOOP_ONESHOT;
3201 })->prio (Coro::PRIO_MAX); 3434 })->prio (Coro::PRIO_MAX);
3202 }; 3435 };
3203 3436
3437 {
3438 my $guard = freeze_mainloop;
3204 reload_config; 3439 reload_config;
3205 db_init; 3440 db_init;
3206 load_extensions; 3441 load_extensions;
3207 3442
3208 $TICK_WATCHER->start; 3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3444 }
3445
3209 Event::loop; 3446 EV::loop;
3210} 3447}
3211 3448
3212############################################################################# 3449#############################################################################
3213# initialisation and cleanup 3450# initialisation and cleanup
3214 3451
3215# install some emergency cleanup handlers 3452# install some emergency cleanup handlers
3216BEGIN { 3453BEGIN {
3454 our %SIGWATCHER = ();
3217 for my $signal (qw(INT HUP TERM)) { 3455 for my $signal (qw(INT HUP TERM)) {
3218 Event->signal ( 3456 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3219 reentrant => 0,
3220 data => WF_AUTOCANCEL,
3221 signal => $signal,
3222 prio => 0,
3223 cb => sub {
3224 cf::cleanup "SIG$signal"; 3457 cf::cleanup "SIG$signal";
3225 },
3226 ); 3458 };
3227 } 3459 }
3228} 3460}
3229 3461
3230sub write_runtime { 3462sub write_runtime_sync {
3231 my $runtime = "$LOCALDIR/runtime"; 3463 my $runtime = "$LOCALDIR/runtime";
3232 3464
3233 # first touch the runtime file to show we are still running: 3465 # first touch the runtime file to show we are still running:
3234 # the fsync below can take a very very long time. 3466 # the fsync below can take a very very long time.
3235 3467
3261 and return; 3493 and return;
3262 3494
3263 warn "runtime file written.\n"; 3495 warn "runtime file written.\n";
3264 3496
3265 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 };
3266} 3541}
3267 3542
3268sub emergency_save() { 3543sub emergency_save() {
3269 my $freeze_guard = cf::freeze_mainloop; 3544 my $freeze_guard = cf::freeze_mainloop;
3270 3545
3276 # and maps saved/destroyed asynchronously. 3551 # and maps saved/destroyed asynchronously.
3277 warn "begin emergency player save\n"; 3552 warn "begin emergency player save\n";
3278 for my $login (keys %cf::PLAYER) { 3553 for my $login (keys %cf::PLAYER) {
3279 my $pl = $cf::PLAYER{$login} or next; 3554 my $pl = $cf::PLAYER{$login} or next;
3280 $pl->valid or next; 3555 $pl->valid or next;
3556 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3281 $pl->save; 3557 $pl->save;
3282 } 3558 }
3283 warn "end emergency player save\n"; 3559 warn "end emergency player save\n";
3284 3560
3285 warn "begin emergency map save\n"; 3561 warn "begin emergency map save\n";
3291 warn "end emergency map save\n"; 3567 warn "end emergency map save\n";
3292 3568
3293 warn "begin emergency database checkpoint\n"; 3569 warn "begin emergency database checkpoint\n";
3294 BDB::db_env_txn_checkpoint $DB_ENV; 3570 BDB::db_env_txn_checkpoint $DB_ENV;
3295 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";
3296 }; 3576 };
3297 3577
3298 warn "leave emergency perl save\n"; 3578 warn "leave emergency perl save\n";
3299} 3579}
3300 3580
3315 warn "reloading..."; 3595 warn "reloading...";
3316 3596
3317 warn "entering sync_job"; 3597 warn "entering sync_job";
3318 3598
3319 cf::sync_job { 3599 cf::sync_job {
3320 cf::write_runtime; # external watchdog should not bark 3600 cf::write_runtime_sync; # external watchdog should not bark
3321 cf::emergency_save; 3601 cf::emergency_save;
3322 cf::write_runtime; # external watchdog should not bark 3602 cf::write_runtime_sync; # external watchdog should not bark
3323 3603
3324 warn "syncing database to disk"; 3604 warn "syncing database to disk";
3325 BDB::db_env_txn_checkpoint $DB_ENV; 3605 BDB::db_env_txn_checkpoint $DB_ENV;
3326 3606
3327 # 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
3328
3329 warn "cancelling all WF_AUTOCANCEL watchers";
3330 for (Event::all_watchers) {
3331 $_->cancel if $_->data & WF_AUTOCANCEL;
3332 }
3333 3608
3334 warn "flushing outstanding aio requests"; 3609 warn "flushing outstanding aio requests";
3335 for (;;) { 3610 for (;;) {
3336 BDB::flush; 3611 BDB::flush;
3337 IO::AIO::flush; 3612 IO::AIO::flush;
3338 Coro::cede; 3613 Coro::cede_notself;
3339 last unless IO::AIO::nreqs || BDB::nreqs; 3614 last unless IO::AIO::nreqs || BDB::nreqs;
3340 warn "iterate..."; 3615 warn "iterate...";
3341 } 3616 }
3342 3617
3343 ++$RELOAD; 3618 ++$RELOAD;
3419 warn "leaving sync_job"; 3694 warn "leaving sync_job";
3420 3695
3421 1 3696 1
3422 } or do { 3697 } or do {
3423 warn $@; 3698 warn $@;
3424 warn "error while reloading, exiting."; 3699 cf::cleanup "error while reloading, exiting.";
3425 exit 1;
3426 }; 3700 };
3427 3701
3428 warn "reloaded"; 3702 warn "reloaded";
3429}; 3703};
3430 3704
3432 3706
3433sub reload_perl() { 3707sub reload_perl() {
3434 # doing reload synchronously and two reloads happen back-to-back, 3708 # doing reload synchronously and two reloads happen back-to-back,
3435 # coro crashes during coro_state_free->destroy here. 3709 # coro crashes during coro_state_free->destroy here.
3436 3710
3437 $RELOAD_WATCHER ||= Event->timer ( 3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3438 reentrant => 0,
3439 after => 0,
3440 data => WF_AUTOCANCEL,
3441 cb => sub {
3442 do_reload_perl; 3712 do_reload_perl;
3443 undef $RELOAD_WATCHER; 3713 undef $RELOAD_WATCHER;
3444 },
3445 ); 3714 };
3446} 3715}
3447 3716
3448register_command "reload" => sub { 3717register_command "reload" => sub {
3449 my ($who, $arg) = @_; 3718 my ($who, $arg) = @_;
3450 3719
3463 3732
3464our @WAIT_FOR_TICK; 3733our @WAIT_FOR_TICK;
3465our @WAIT_FOR_TICK_BEGIN; 3734our @WAIT_FOR_TICK_BEGIN;
3466 3735
3467sub wait_for_tick { 3736sub wait_for_tick {
3468 return unless $TICK_WATCHER->is_active;
3469 return if $Coro::current == $Coro::main; 3737 return if tick_inhibit || $Coro::current == $Coro::main;
3470 3738
3471 my $signal = new Coro::Signal; 3739 my $signal = new Coro::Signal;
3472 push @WAIT_FOR_TICK, $signal; 3740 push @WAIT_FOR_TICK, $signal;
3473 $signal->wait; 3741 $signal->wait;
3474} 3742}
3475 3743
3476sub wait_for_tick_begin { 3744sub wait_for_tick_begin {
3477 return unless $TICK_WATCHER->is_active;
3478 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
3479 3746
3480 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
3481 push @WAIT_FOR_TICK_BEGIN, $signal; 3748 push @WAIT_FOR_TICK_BEGIN, $signal;
3482 $signal->wait; 3749 $signal->wait;
3483} 3750}
3484 3751
3485$TICK_WATCHER = Event->timer ( 3752sub tick {
3486 reentrant => 0,
3487 parked => 1,
3488 prio => 0,
3489 at => $NEXT_TICK || $TICK,
3490 data => WF_AUTOCANCEL,
3491 cb => sub {
3492 if ($Coro::current != $Coro::main) { 3753 if ($Coro::current != $Coro::main) {
3493 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"
3494 unless ++$bug_warning > 10; 3755 unless ++$bug_warning > 10;
3495 return; 3756 return;
3496 } 3757 }
3497 3758
3498 $NOW = $tick_start = Event::time;
3499
3500 cf::server_tick; # one server iteration 3759 cf::server_tick; # one server iteration
3501 3760
3502 $RUNTIME += $TICK;
3503 $NEXT_TICK += $TICK;
3504
3505 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3761 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3506 $NEXT_RUNTIME_WRITE = $NOW + 10; 3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3507 Coro::async_pool { 3763 Coro::async_pool {
3508 $Coro::current->{desc} = "runtime saver"; 3764 $Coro::current->{desc} = "runtime saver";
3509 write_runtime 3765 write_runtime_sync
3510 or warn "ERROR: unable to write runtime file: $!"; 3766 or warn "ERROR: unable to write runtime file: $!";
3511 };
3512 } 3767 };
3768 }
3513 3769
3514 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3515 $sig->send; 3771 $sig->send;
3516 } 3772 }
3517 while (my $sig = shift @WAIT_FOR_TICK) { 3773 while (my $sig = shift @WAIT_FOR_TICK) {
3518 $sig->send; 3774 $sig->send;
3519 } 3775 }
3520 3776
3521 $NOW = Event::time; 3777 $LOAD = ($NOW - $TICK_START) / $TICK;
3522
3523 # if we are delayed by four ticks or more, skip them all
3524 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3525
3526 $TICK_WATCHER->at ($NEXT_TICK);
3527 $TICK_WATCHER->start;
3528
3529 $LOAD = ($NOW - $tick_start) / $TICK;
3530 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3778 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3531 3779
3532 _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 }
3533 }, 3786 }
3534); 3787}
3535 3788
3536{ 3789{
3790 # configure BDB
3791
3537 BDB::min_parallel 8; 3792 BDB::min_parallel 8;
3538 BDB::max_poll_time $TICK * 0.1; 3793 BDB::max_poll_reqs $TICK * 0.1;
3539 $BDB_POLL_WATCHER = Event->io ( 3794 $AnyEvent::BDB::WATCHER->priority (1);
3540 reentrant => 0,
3541 fd => BDB::poll_fileno,
3542 poll => 'r',
3543 prio => 0,
3544 data => WF_AUTOCANCEL,
3545 cb => \&BDB::poll_cb,
3546 );
3547
3548 BDB::set_sync_prepare {
3549 my $status;
3550 my $current = $Coro::current;
3551 (
3552 sub {
3553 $status = $!;
3554 $current->ready; undef $current;
3555 },
3556 sub {
3557 Coro::schedule while defined $current;
3558 $! = $status;
3559 },
3560 )
3561 };
3562 3795
3563 unless ($DB_ENV) { 3796 unless ($DB_ENV) {
3564 $DB_ENV = BDB::db_env_create; 3797 $DB_ENV = BDB::db_env_create;
3565 $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
3566 | BDB::LOG_AUTOREMOVE, 1); 3799 | BDB::LOG_AUTOREMOVE, 1);
3581 3814
3582 cf::cleanup "db_env_open(db): $@" if $@; 3815 cf::cleanup "db_env_open(db): $@" if $@;
3583 }; 3816 };
3584 } 3817 }
3585 3818
3586 $BDB_DEADLOCK_WATCHER = Event->timer ( 3819 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3587 after => 3,
3588 interval => 1,
3589 hard => 1,
3590 prio => 0,
3591 data => WF_AUTOCANCEL,
3592 cb => sub {
3593 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 { };
3594 },
3595 ); 3821 };
3596 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3822 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3597 after => 11,
3598 interval => 60,
3599 hard => 1,
3600 prio => 0,
3601 data => WF_AUTOCANCEL,
3602 cb => sub {
3603 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3823 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3604 },
3605 ); 3824 };
3606 $BDB_TRICKLE_WATCHER = Event->timer ( 3825 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3607 after => 5,
3608 interval => 10,
3609 hard => 1,
3610 prio => 0,
3611 data => WF_AUTOCANCEL,
3612 cb => sub {
3613 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3826 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3614 },
3615 ); 3827 };
3616} 3828}
3617 3829
3618{ 3830{
3831 # configure IO::AIO
3832
3619 IO::AIO::min_parallel 8; 3833 IO::AIO::min_parallel 8;
3620
3621 undef $Coro::AIO::WATCHER;
3622 IO::AIO::max_poll_time $TICK * 0.1; 3834 IO::AIO::max_poll_time $TICK * 0.1;
3623 $AIO_POLL_WATCHER = Event->io ( 3835 undef $AnyEvent::AIO::WATCHER;
3624 reentrant => 0,
3625 data => WF_AUTOCANCEL,
3626 fd => IO::AIO::poll_fileno,
3627 poll => 'r',
3628 prio => 0,
3629 cb => \&IO::AIO::poll_cb,
3630 );
3631} 3836}
3632 3837
3633my $_log_backtrace; 3838my $_log_backtrace;
3634 3839
3635sub _log_backtrace { 3840sub _log_backtrace {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines