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.379 by root, Thu Oct 4 23:59:07 2007 UTC vs.
Revision 1.432 by root, Mon May 5 22:38:47 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines