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.374 by root, Wed Sep 19 22:07:16 2007 UTC vs.
Revision 1.430 by root, Sun May 4 14:12:37 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines