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.476 by root, Wed Sep 2 16:54:20 2009 UTC vs.
Revision 1.580 by root, Wed Jan 4 03:22:48 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict qw(vars subs);
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard (); 37use Guard ();
38use Coro (); 38use Coro ();
39use Coro::State; 39use Coro::State;
40use Coro::Handle; 40use Coro::Handle;
51use Coro::Util (); 51use Coro::Util ();
52 52
53use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
54use BDB (); 54use BDB ();
55use Data::Dumper; 55use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 56use Fcntl;
58use YAML (); 57use YAML::XS ();
59use IO::AIO (); 58use IO::AIO ();
60use Time::HiRes; 59use Time::HiRes;
61use Compress::LZF; 60use Compress::LZF;
62use Digest::MD5 (); 61use Digest::MD5 ();
63 62
76 75
77# strictly for debugging 76# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
79 78
80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
81 82
82our %COMMAND = (); 83our %COMMAND = ();
83our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
84 85
85our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
88our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
89our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
90 91
91our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
92our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
93 96
94our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
95our $DATADIR = datadir; 99our $DATADIR = datadir;
96our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
97our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
98our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
99our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
100our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
101our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
102our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
103our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
104our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
105our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
107 112
108our %RESOURCE; 113#our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
109 120
110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
112our $NEXT_TICK; 123our $NEXT_TICK;
113our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
115our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
116our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
117our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
118our $DB_ENV; 129our $DB_ENV;
119 130
120our @EXTRA_MODULES = qw(pod mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
121 132
122our %CFG; 133our %CFG;
123 134
124our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
125our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
126our $NOW; 138our $NOW;
127 139
128our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
129our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
130our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
139 151
140our @POST_INIT; 152our @POST_INIT;
141 153
142our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 154our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
143our $REALLY_UNLOOP; # never set to true, please :) 155our $REALLY_UNLOOP; # never set to true, please :)
156
157our $WAIT_FOR_TICK = new Coro::Signal;
158our @WAIT_FOR_TICK_BEGIN;
144 159
145binmode STDOUT; 160binmode STDOUT;
146binmode STDERR; 161binmode STDERR;
147 162
148# read virtual server time, if available 163# read virtual server time, if available
159 174
160our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
161 176
162sub cf::map::normalise; 177sub cf::map::normalise;
163 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
164############################################################################# 183#############################################################################
165 184
185%REFLECT = ();
186for (@REFLECT) {
187 my $reflect = JSON::XS::decode_json $_;
188 $REFLECT{$reflect->{class}} = $reflect;
189}
190
191# this is decidedly evil
192$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
193
194#############################################################################
195
166=head2 GLOBAL VARIABLES 196=head2 GLOBAL VARIABLES
167 197
168=over 4 198=over 4
169 199
170=item $cf::UPTIME 200=item $cf::UPTIME
171 201
172The timestamp of the server start (so not actually an uptime). 202The timestamp of the server start (so not actually an "uptime").
203
204=item $cf::SERVER_TICK
205
206An unsigned integer that starts at zero when the server is started and is
207incremented on every tick.
208
209=item $cf::NOW
210
211The (real) time of the last (current) server tick - updated before and
212after tick processing, so this is useful only as a rough "what time is it
213now" estimate.
214
215=item $cf::TICK
216
217The interval between each server tick, in seconds.
173 218
174=item $cf::RUNTIME 219=item $cf::RUNTIME
175 220
176The time this server has run, starts at 0 and is increased by $cf::TICK on 221The time this server has run, starts at 0 and is increased by $cf::TICK on
177every server tick. 222every server tick.
183Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
184directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
185unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
186database environment. 231database environment.
187 232
188=item $cf::NOW
189
190The time of the last (current) server tick.
191
192=item $cf::TICK
193
194The interval between server ticks, in seconds.
195
196=item $cf::LOADAVG 233=item $cf::LOADAVG
197 234
198The current CPU load on the server (alpha-smoothed), as a value between 0 235The current CPU load on the server (alpha-smoothed), as a value between 0
199(none) and 1 (overloaded), indicating how much time is spent on processing 236(none) and 1 (overloaded), indicating how much time is spent on processing
200objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
209from wherever your confdir points to. 246from wherever your confdir points to.
210 247
211=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
212 249
213These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 250These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
214returns directly I<after> the tick processing (and consequently, can only wake one process 251returns directly I<after> the tick processing (and consequently, can only wake one thread
215per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 252per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
216 253
254Note that cf::Wait_for_tick will immediately return when the server is not
255ticking, making it suitable for small pauses in threads that need to run
256when the server is paused. If that is not applicable (i.e. you I<really>
257want to wait, use C<$cf::WAIT_FOR_TICK>).
258
259=item $cf::WAIT_FOR_TICK
260
261Note that C<cf::wait_for_tick> is probably the correct thing to use. This
262variable contains a L<Coro::Signal> that is broadcats after every server
263tick. Calling C<< ->wait >> on it will suspend the caller until after the
264next server tick.
265
266=cut
267
268sub wait_for_tick();
269sub wait_for_tick_begin();
270
217=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
218 272
219This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
220C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 274C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
221that call. 275that call.
222 276
277=item %cf::REFLECT
278
279Contains, for each (C++) class name, a hash reference with information
280about object members (methods, scalars, arrays and flags) and other
281metadata, which is useful for introspection.
282
223=back 283=back
224 284
225=cut 285=cut
226 286
227BEGIN { 287sub error(@) { LOG llevError, join "", @_ }
228 *CORE::GLOBAL::warn = sub { 288sub warn (@) { LOG llevWarn , join "", @_ }
289sub info (@) { LOG llevInfo , join "", @_ }
290sub debug(@) { LOG llevDebug, join "", @_ }
291sub trace(@) { LOG llevTrace, join "", @_ }
292
293$Coro::State::WARNHOOK = sub {
229 my $msg = join "", @_; 294 my $msg = join "", @_;
230 295
231 $msg .= "\n" 296 $msg .= "\n"
232 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
233 298
234 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 299 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
235 300
236 LOG llevError, $msg; 301 LOG llevWarn, $msg;
237 }; 302};
238}
239 303
240$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
241 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
242 306
243 if ($Coro::current == $Coro::main) {#d# 307 error Carp::longmess $_[0];
308
309 if (in_main) {#d#
244 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
245 return;#d# 311 return;#d#
246 }#d# 312 }#d#
247 313
248 # kill coroutine otherwise 314 # kill coroutine otherwise
249 warn Carp::longmess $_[0];
250 Coro::terminate 315 Coro::terminate
251}; 316};
252
253$SIG{__DIE__} = sub { }; #d#?
254 317
255@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 318@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
256@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 319@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
257@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 320@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
258@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 321@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
272)) { 335)) {
273 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
274} 337}
275 338
276$EV::DIED = sub { 339$EV::DIED = sub {
277 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
278}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
279 347
280############################################################################# 348#############################################################################
281 349
282=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
283 351
304 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 372 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
305 $d 373 $d
306 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
307} 375}
308 376
377=item $scalar = load_file $path
378
379Loads the given file from path and returns its contents. Croaks on error
380and can block.
381
382=cut
383
384sub load_file($) {
385 0 <= aio_load $_[0], my $data
386 or Carp::croak "$_[0]: $!";
387
388 $data
389}
390
309=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
310 392
311Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
312 394
313=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
319our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 401our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
320 402
321sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
322sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
323 405
406=item $ref = cf::decode_storable $scalar
407
408Same as Coro::Storable::thaw, so blocks.
409
410=cut
411
412BEGIN { *decode_storable = \&Coro::Storable::thaw }
413
414=item $ref = cf::decode_yaml $scalar
415
416Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
417
418=cut
419
420sub decode_yaml($) {
421 fork_call { YAML::XS::Load $_[0] } @_
422}
423
424=item $scalar = cf::unlzf $scalar
425
426Same as Compress::LZF::compress, but takes server ticks into account, so
427blocks.
428
429=cut
430
431sub unlzf($) {
432 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
433 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
434 Compress::LZF::decompress $_[0]
435}
436
324=item cf::post_init { BLOCK } 437=item cf::post_init { BLOCK }
325 438
326Execute the given codeblock, I<after> all extensions have been (re-)loaded, 439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
327but I<before> the server starts ticking again. 440but I<before> the server starts ticking again.
328 441
329The cdoeblock will have a single boolean argument to indicate whether this 442The codeblock will have a single boolean argument to indicate whether this
330is a reload or not. 443is a reload or not.
331 444
332=cut 445=cut
333 446
334sub post_init(&) { 447sub post_init(&) {
335 push @POST_INIT, shift; 448 push @POST_INIT, shift;
449}
450
451sub _post_init {
452 trace "running post_init jobs";
453
454 # run them in parallel...
455
456 my @join;
457
458 while () {
459 push @join, map &Coro::async ($_, 0), @POST_INIT;
460 @POST_INIT = ();
461
462 @join or last;
463
464 (pop @join)->join;
465 }
336} 466}
337 467
338=item cf::lock_wait $string 468=item cf::lock_wait $string
339 469
340Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
379} 509}
380 510
381=item cf::periodic $interval, $cb 511=item cf::periodic $interval, $cb
382 512
383Like EV::periodic, but randomly selects a starting point so that the actions 513Like EV::periodic, but randomly selects a starting point so that the actions
384get spread over timer. 514get spread over time.
385 515
386=cut 516=cut
387 517
388sub periodic($$) { 518sub periodic($$) {
389 my ($interval, $cb) = @_; 519 my ($interval, $cb) = @_;
393 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
394} 524}
395 525
396=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
397 527
398Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
399This call blocks and returns only when you have at least C<$time> seconds 529(default: 0): This call blocks and returns only when you have at least
400of cpu time till the next tick. The slot is only valid till the next cede. 530C<$time> seconds of cpu time till the next tick. The slot is only valid
531till the next cede.
532
533Background jobs should use a priority les than zero, interactive jobs
534should use 100 or more.
401 535
402The optional C<$name> can be used to identify the job to run. It might be 536The optional C<$name> can be used to identify the job to run. It might be
403used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
404 538
405Useful for short background jobs. 539Useful for short background jobs.
406 540
407=cut 541=cut
408 542
409our @SLOT_QUEUE; 543our @SLOT_QUEUE;
410our $SLOT_QUEUE; 544our $SLOT_QUEUE;
545our $SLOT_DECAY = 0.9;
411 546
412$SLOT_QUEUE->cancel if $SLOT_QUEUE; 547$SLOT_QUEUE->cancel if $SLOT_QUEUE;
413$SLOT_QUEUE = Coro::async { 548$SLOT_QUEUE = Coro::async {
414 $Coro::current->desc ("timeslot manager"); 549 $Coro::current->desc ("timeslot manager");
415 550
416 my $signal = new Coro::Signal; 551 my $signal = new Coro::Signal;
552 my $busy;
417 553
418 while () { 554 while () {
419 next_job: 555 next_job:
556
420 my $avail = cf::till_tick; 557 my $avail = cf::till_tick;
421 if ($avail > 0.01) { 558
422 for (0 .. $#SLOT_QUEUE) { 559 for (0 .. $#SLOT_QUEUE) {
423 if ($SLOT_QUEUE[$_][0] < $avail) { 560 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0;
424 my $job = splice @SLOT_QUEUE, $_, 1, (); 562 my $job = splice @SLOT_QUEUE, $_, 1, ();
425 $job->[2]->send; 563 $job->[2]->send;
426 Coro::cede; 564 Coro::cede;
427 goto next_job; 565 goto next_job;
428 } 566 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
429 } 568 }
430 } 569 }
431 570
432 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
433 # we do not use wait_for_tick() as it returns immediately when tick is inactive 572 # we do not use wait_for_tick() as it returns immediately when tick is inactive
434 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
435 $signal->wait;
436 } else { 574 } else {
575 $busy = 0;
437 Coro::schedule; 576 Coro::schedule;
438 } 577 }
439 } 578 }
440}; 579};
441 580
442sub get_slot($;$$) { 581sub get_slot($;$$) {
443 return if tick_inhibit || $Coro::current == $Coro::main; 582 return if tick_inhibit || $Coro::current == $Coro::main;
444 583
445 my ($time, $pri, $name) = @_; 584 my ($time, $pri, $name) = @_;
446 585
447 $time = $TICK * .6 if $time > $TICK * .6; 586 $time = clamp $time, 0.01, $TICK * .6;
587
448 my $sig = new Coro::Signal; 588 my $sig = new Coro::Signal;
449 589
450 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
451 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
452 $SLOT_QUEUE->ready; 592 $SLOT_QUEUE->ready;
478=cut 618=cut
479 619
480sub sync_job(&) { 620sub sync_job(&) {
481 my ($job) = @_; 621 my ($job) = @_;
482 622
483 if ($Coro::current == $Coro::main) { 623 if (in_main) {
484 my $time = EV::time; 624 my $time = AE::time;
485 625
486 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
487 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
488 628
489 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
490 630
491 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
492 632
493 my $busy = 1; 633 my $busy = 1;
494 my @res; 634 my @res;
495 635
496 (async { 636 (async {
497 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
498 @res = eval { $job->() }; 638 @res = eval { $job->() };
499 warn $@ if $@; 639 error $@ if $@;
500 undef $busy; 640 undef $busy;
501 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
502 642
503 while ($busy) { 643 while ($busy) {
504 if (Coro::nready) { 644 if (Coro::nready) {
506 } else { 646 } else {
507 EV::loop EV::LOOP_ONESHOT; 647 EV::loop EV::LOOP_ONESHOT;
508 } 648 }
509 } 649 }
510 650
511 my $time = EV::time - $time; 651 my $time = AE::time - $time;
512 652
513 $TICK_START += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
514 654
515 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
516 } else { 656 } else {
538 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
539 679
540 $coro 680 $coro
541} 681}
542 682
543=item fork_call { }, $args 683=item fork_call { }, @args
544 684
545Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
546process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
547Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
548never block itself or use any form of event handling. 688never block itself or use any form of event handling.
549 689
550=cut 690=cut
551 691
692sub post_fork {
693 reset_signals;
694}
695
552sub fork_call(&@) { 696sub fork_call(&@) {
553 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
554 698
555 # we seemingly have to make a local copy of the whole thing, 699 # we seemingly have to make a local copy of the whole thing,
556 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
557 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
558 702
559 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
560 reset_signals; 704 cf::post_fork;
561 &$cb 705 &$cb
562 }, @args; 706 } @args;
563 707
564 wantarray ? @res : $res[-1] 708 wantarray ? @res : $res[-1]
709}
710
711sub objinfo {
712 (
713 "counter value" => cf::object::object_count,
714 "objects created" => cf::object::create_count,
715 "objects destroyed" => cf::object::destroy_count,
716 "freelist size" => cf::object::free_count,
717 "allocated objects" => cf::object::objects_size,
718 "active objects" => cf::object::actives_size,
719 )
565} 720}
566 721
567=item $coin = coin_from_name $name 722=item $coin = coin_from_name $name
568 723
569=cut 724=cut
606within each server. 761within each server.
607 762
608=cut 763=cut
609 764
610sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
611 my ($name) = @_; 769 my ($name) = @_;
612 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
613 771
614 eval { 772 eval {
615 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
625} 783}
626 784
627our $DB; 785our $DB;
628 786
629sub db_init { 787sub db_init {
630 cf::sync_job {
631 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
632 };
633} 789}
634 790
635sub db_get($$) { 791sub db_get($$) {
636 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
637 793
638 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
639 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
640 798
641 $! ? () 799 $! ? ()
642 : $data 800 : $data
643 }
644} 801}
645 802
646sub db_put($$$) { 803sub db_put($$$) {
647 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
648 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
676 833
677 my @data; 834 my @data;
678 my $md5; 835 my $md5;
679 836
680 for (0 .. $#$src) { 837 for (0 .. $#$src) {
681 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
682 or Carp::croak "$src->[$_]: $!";
683 } 839 }
684 840
685 # if processing is expensive, check 841 # if processing is expensive, check
686 # checksum first 842 # checksum first
687 if (1) { 843 if (1) {
704 860
705 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
706 my $data = $process->(\@data); 862 my $data = $process->(\@data);
707 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
708 864
709 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
710 866
711 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
712 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
713 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
714 870
724 880
725=cut 881=cut
726 882
727sub datalog($@) { 883sub datalog($@) {
728 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
729 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
730} 886}
731 887
732=back 888=back
733 889
734=cut 890=cut
929 1085
930 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
931 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
932 1088
933 } elsif (ref $type) { 1089 } elsif (ref $type) {
934 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
935 1091
936 } else { 1092 } else {
937 shift @arg; 1093 shift @arg;
938 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
939 } 1095 }
940 } 1096 }
941} 1097}
942 1098
943sub _object_attach { 1099sub _object_attach {
953 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
954 } 1110 }
955 1111
956 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
957 } else { 1113 } else {
958 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
959 } 1115 }
960 1116
961 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
962} 1118}
963 1119
1022 1178
1023 for (@$callbacks) { 1179 for (@$callbacks) {
1024 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
1025 1181
1026 if ($@) { 1182 if ($@) {
1027 warn "$@";
1028 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1029 override; 1184 override;
1030 } 1185 }
1031 1186
1032 return 1 if $override; 1187 return 1 if $override;
1033 } 1188 }
1112 for (@$attach) { 1267 for (@$attach) {
1113 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1114 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1115 } 1270 }
1116 } else { 1271 } else {
1117 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1118 } 1273 }
1119 } 1274 }
1120} 1275}
1121 1276
1122cf::attachable->attach ( 1277cf::attachable->attach (
1149 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1150 1305
1151 sync_job { 1306 sync_job {
1152 if (length $$rdata) { 1307 if (length $$rdata) {
1153 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1154 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1155 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1156 1312
1157 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1158 aio_chmod $fh, SAVE_MODE; 1314 aio_chmod $fh, SAVE_MODE;
1159 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1160 if ($cf::USE_FSYNC) { 1316 if ($cf::USE_FSYNC) {
1182 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1183 1339
1184 $filename =~ s%/[^/]+$%%; 1340 $filename =~ s%/[^/]+$%%;
1185 aio_pathsync $filename if $cf::USE_FSYNC; 1341 aio_pathsync $filename if $cf::USE_FSYNC;
1186 } else { 1342 } else {
1187 warn "unable to save objects: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1188 } 1344 }
1189 } else { 1345 } else {
1190 aio_unlink $filename; 1346 aio_unlink $filename;
1191 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1192 } 1348 }
1216 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1217 $av = $st->{objs}; 1373 $av = $st->{objs};
1218 } 1374 }
1219 1375
1220 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1221 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1222 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1223 1380
1224 ($data, $av) 1381 ($data, $av)
1225} 1382}
1226 1383
1227=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1286} 1443}
1287 1444
1288use File::Glob (); 1445use File::Glob ();
1289 1446
1290cf::player->attach ( 1447cf::player->attach (
1291 on_command => sub { 1448 on_unknown_command => sub {
1292 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1293 1450
1294 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1295 or return; 1452 or return;
1296 1453
1304 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1305 1462
1306 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1307 1464
1308 if (ref $msg) { 1465 if (ref $msg) {
1309 my ($type, $reply, @payload) = 1466 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1310 "ARRAY" eq ref $msg
1311 ? @$msg
1312 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1313 1467
1314 my @reply; 1468 my @reply;
1315 1469
1316 if (my $cb = $EXTCMD{$type}) { 1470 if (my $cb = $EXTCMD{$type}) {
1317 @reply = $cb->($pl, @payload); 1471 @reply = $cb->($pl, @payload);
1319 1473
1320 $pl->ext_reply ($reply, @reply) 1474 $pl->ext_reply ($reply, @reply)
1321 if $reply; 1475 if $reply;
1322 1476
1323 } else { 1477 } else {
1324 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1478 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1325 } 1479 }
1326 1480
1327 cf::override; 1481 cf::override;
1328 }, 1482 },
1329); 1483);
1340 1494
1341 $grp 1495 $grp
1342} 1496}
1343 1497
1344sub load_extensions { 1498sub load_extensions {
1499 info "loading extensions...";
1500
1345 cf::sync_job { 1501 cf::sync_job {
1346 my %todo; 1502 my %todo;
1347 1503
1348 for my $path (<$LIBDIR/*.ext>) { 1504 for my $path (<$LIBDIR/*.ext>) {
1349 next unless -r $path; 1505 next unless -r $path;
1367 1523
1368 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1524 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1369 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1525 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1370 1526
1371 $ext{source} = 1527 $ext{source} =
1372 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1528 "package $pkg; use common::sense;\n"
1373 . "#line 1 \"$path\"\n{\n" 1529 . "#line 1 \"$path\"\n{\n"
1374 . $source 1530 . $source
1375 . "\n};\n1"; 1531 . "\n};\n1";
1376 1532
1377 $todo{$base} = \%ext; 1533 $todo{$base} = \%ext;
1378 } 1534 }
1379 1535
1536 my $pass = 0;
1380 my %done; 1537 my %done;
1381 while (%todo) { 1538 while (%todo) {
1382 my $progress; 1539 my $progress;
1383 1540
1541 ++$pass;
1542
1543 ext:
1384 while (my ($k, $v) = each %todo) { 1544 while (my ($k, $v) = each %todo) {
1385 for (split /,\s*/, $v->{meta}{depends}) { 1545 for (split /,\s*/, $v->{meta}{depends}) {
1386 goto skip 1546 next ext
1387 unless exists $done{$_}; 1547 unless exists $done{$_};
1388 } 1548 }
1389 1549
1390 warn "... loading '$k' into '$v->{pkg}'\n"; 1550 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1391 1551
1392 unless (eval $v->{source}) { 1552 my $active = eval $v->{source};
1553
1554 if (length $@) {
1393 my $msg = $@ ? "$v->{path}: $@\n" 1555 error "$v->{path}: $@\n";
1394 : "$v->{base}: extension inactive.\n";
1395 1556
1396 if (exists $v->{meta}{mandatory}) {
1397 warn $msg;
1398 cf::cleanup "mandatory extension failed to load, exiting."; 1557 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1399 } 1558 if exists $v->{meta}{mandatory};
1400 1559
1401 warn $msg; 1560 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1561 delete $todo{$k};
1562 } else {
1563 $done{$k} = delete $todo{$k};
1564 push @EXTS, $v->{pkg};
1565 $progress = 1;
1566
1567 info "$v->{base}: extension inactive.\n"
1568 unless $active;
1402 } 1569 }
1403
1404 $done{$k} = delete $todo{$k};
1405 push @EXTS, $v->{pkg};
1406 $progress = 1;
1407 } 1570 }
1408 1571
1409 skip: 1572 unless ($progress) {
1410 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1573 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1411 unless $progress; 1574
1575 while (my ($k, $v) = each %todo) {
1576 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1577 if exists $v->{meta}{mandatory};
1578 }
1579
1580 last;
1581 }
1412 } 1582 }
1413 }; 1583 };
1414} 1584}
1415 1585
1416############################################################################# 1586#############################################################################
1500 $cf::PLAYER{$login} = $pl 1670 $cf::PLAYER{$login} = $pl
1501 } 1671 }
1502 } 1672 }
1503} 1673}
1504 1674
1675cf::player->attach (
1676 on_load => sub {
1677 my ($pl, $path) = @_;
1678
1679 # restore slots saved in save, below
1680 my $slots = delete $pl->{_slots};
1681
1682 $pl->ob->current_weapon ($slots->[0]);
1683 $pl->combat_ob ($slots->[1]);
1684 $pl->ranged_ob ($slots->[2]);
1685 },
1686);
1687
1505sub save($) { 1688sub save($) {
1506 my ($pl) = @_; 1689 my ($pl) = @_;
1507 1690
1508 return if $pl->{deny_save}; 1691 return if $pl->{deny_save};
1509 1692
1514 1697
1515 aio_mkdir playerdir $pl, 0770; 1698 aio_mkdir playerdir $pl, 0770;
1516 $pl->{last_save} = $cf::RUNTIME; 1699 $pl->{last_save} = $cf::RUNTIME;
1517 1700
1518 cf::get_slot 0.01; 1701 cf::get_slot 0.01;
1702
1703 # save slots, to be restored later
1704 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1519 1705
1520 $pl->save_pl ($path); 1706 $pl->save_pl ($path);
1521 cf::cede_to_tick; 1707 cf::cede_to_tick;
1522} 1708}
1523 1709
1557 my $name = $pl->ob->name; 1743 my $name = $pl->ob->name;
1558 1744
1559 $pl->{deny_save} = 1; 1745 $pl->{deny_save} = 1;
1560 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1746 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1561 1747
1562 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1748 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1563 $pl->deactivate; 1749 $pl->deactivate;
1750
1564 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1751 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1565 $pl->ob->check_score;
1566 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1752 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1753 ext::highscore::check ($pl->ob);
1754
1567 $pl->ns->destroy if $pl->ns; 1755 $pl->ns->destroy if $pl->ns;
1568 1756
1569 my $path = playerdir $pl; 1757 my $path = playerdir $pl;
1570 my $temp = "$path~$cf::RUNTIME~deleting~"; 1758 my $temp = "$path~$cf::RUNTIME~deleting~";
1571 aio_rename $path, $temp; 1759 aio_rename $path, $temp;
1625 \@logins 1813 \@logins
1626} 1814}
1627 1815
1628=item $player->maps 1816=item $player->maps
1629 1817
1818=item cf::player::maps $login
1819
1630Returns an arrayref of map paths that are private for this 1820Returns an arrayref of map paths that are private for this
1631player. May block. 1821player. May block.
1632 1822
1633=cut 1823=cut
1634 1824
1696=cut 1886=cut
1697 1887
1698sub find_by_path($) { 1888sub find_by_path($) {
1699 my ($path) = @_; 1889 my ($path) = @_;
1700 1890
1891 $path =~ s/^~[^\/]*//; # skip ~login
1892
1701 my ($match, $specificity); 1893 my ($match, $specificity);
1702 1894
1703 for my $region (list) { 1895 for my $region (list) {
1704 if ($region->{match} && $path =~ $region->{match}) { 1896 if ($region->{match} && $path =~ $region->{match}) {
1705 ($match, $specificity) = ($region, $region->specificity) 1897 ($match, $specificity) = ($region, $region->specificity)
1733sub generate_random_map { 1925sub generate_random_map {
1734 my ($self, $rmp) = @_; 1926 my ($self, $rmp) = @_;
1735 1927
1736 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1928 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1737 1929
1738 # mit "rum" bekleckern, nicht
1739 $self->_create_random_map ( 1930 $self->_create_random_map ($rmp);
1740 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1741 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1742 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1743 $rmp->{exit_on_final_map},
1744 $rmp->{xsize}, $rmp->{ysize},
1745 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1746 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1747 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1748 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1749 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1750 (cf::region::find $rmp->{region}), $rmp->{custom}
1751 )
1752} 1931}
1753 1932
1754=item cf::map->register ($regex, $prio) 1933=item cf::map->register ($regex, $prio)
1755 1934
1756Register a handler for the map path matching the given regex at the 1935Register a handler for the map path matching the given regex at the
1761 1940
1762sub register { 1941sub register {
1763 my (undef, $regex, $prio) = @_; 1942 my (undef, $regex, $prio) = @_;
1764 my $pkg = caller; 1943 my $pkg = caller;
1765 1944
1766 no strict;
1767 push @{"$pkg\::ISA"}, __PACKAGE__; 1945 push @{"$pkg\::ISA"}, __PACKAGE__;
1768 1946
1769 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1947 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1770} 1948}
1771 1949
1772# also paths starting with '/' 1950# also paths starting with '/'
1773$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1951$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1774 1952
1775sub thawer_merge { 1953sub thawer_merge {
1776 my ($self, $merge) = @_; 1954 my ($self, $merge) = @_;
1777 1955
1778 # we have to keep some variables in memory intact 1956 # we have to keep some variables in memory intact
1783} 1961}
1784 1962
1785sub normalise { 1963sub normalise {
1786 my ($path, $base) = @_; 1964 my ($path, $base) = @_;
1787 1965
1788 $path = "$path"; # make sure its a string 1966 $path = "$path"; # make sure it's a string
1789 1967
1790 $path =~ s/\.map$//; 1968 $path =~ s/\.map$//;
1791 1969
1792 # map plan: 1970 # map plan:
1793 # 1971 #
1808 $base =~ s{[^/]+/?$}{}; 1986 $base =~ s{[^/]+/?$}{};
1809 $path = "$base/$path"; 1987 $path = "$base/$path";
1810 } 1988 }
1811 1989
1812 for ($path) { 1990 for ($path) {
1813 redo if s{//}{/};
1814 redo if s{/\.?/}{/}; 1991 redo if s{/\.?/}{/};
1815 redo if s{/[^/]+/\.\./}{/}; 1992 redo if s{/[^/]+/\.\./}{/};
1816 } 1993 }
1817 1994
1818 $path 1995 $path
1832 $self->init; # pass $1 etc. 2009 $self->init; # pass $1 etc.
1833 return $self; 2010 return $self;
1834 } 2011 }
1835 } 2012 }
1836 2013
1837 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2014 Carp::cluck "unable to resolve path '$path' (base '$base')";
1838 () 2015 ()
1839} 2016}
1840 2017
2018# may re-bless or do other evil things
1841sub init { 2019sub init {
1842 my ($self) = @_; 2020 my ($self) = @_;
1843 2021
1844 $self 2022 $self
1845} 2023}
1910 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
1911 2089
1912 1 2090 1
1913} 2091}
1914 2092
2093# used to laod the header of an original map
1915sub load_header_orig { 2094sub load_header_orig {
1916 my ($self) = @_; 2095 my ($self) = @_;
1917 2096
1918 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
1919} 2098}
1920 2099
2100# used to laod the header of an instantiated map
1921sub load_header_temp { 2101sub load_header_temp {
1922 my ($self) = @_; 2102 my ($self) = @_;
1923 2103
1924 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
1925} 2105}
1926 2106
2107# called after loading the header from an instantiated map
1927sub prepare_temp { 2108sub prepare_temp {
1928 my ($self) = @_; 2109 my ($self) = @_;
1929 2110
1930 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
1931 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
1932 # safety 2113 # safety
1933 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
1934 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
1935} 2116}
1936 2117
2118# called after loading the header from an original map
1937sub prepare_orig { 2119sub prepare_orig {
1938 my ($self) = @_; 2120 my ($self) = @_;
1939 2121
1940 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
1941 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
1965 2147
1966sub find; 2148sub find;
1967sub find { 2149sub find {
1968 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
1969 2151
2152 cf::cede_to_tick;
2153
1970 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
1971 2155
1972 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 my $guard2 = cf::lock_acquire "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
1974 2158
1975 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
1992 2176
1993 $cf::MAP{$path} = $map 2177 $cf::MAP{$path} = $map
1994 } 2178 }
1995} 2179}
1996 2180
1997sub pre_load { } 2181sub pre_load { }
1998sub post_load { } 2182#sub post_load { } # XS
1999 2183
2000sub load { 2184sub load {
2001 my ($self) = @_; 2185 my ($self) = @_;
2002 2186
2003 local $self->{deny_reset} = 1; # loading can take a long time 2187 local $self->{deny_reset} = 1; # loading can take a long time
2006 2190
2007 { 2191 {
2008 my $guard = cf::lock_acquire "map_data:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
2009 2193
2010 return unless $self->valid; 2194 return unless $self->valid;
2011 return unless $self->in_memory == cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
2012
2013 $self->in_memory (cf::MAP_LOADING);
2014 2196
2015 $self->alloc; 2197 $self->alloc;
2016 2198
2017 $self->pre_load; 2199 $self->pre_load;
2018 cf::cede_to_tick; 2200 cf::cede_to_tick;
2019 2201
2202 if (exists $self->{load_path}) {
2020 my $f = new_from_file cf::object::thawer $self->{load_path}; 2203 my $f = new_from_file cf::object::thawer $self->{load_path};
2021 $f->skip_block; 2204 $f->skip_block;
2022 $self->_load_objects ($f) 2205 $self->_load_objects ($f)
2023 or return; 2206 or return;
2024 2207
2025 $self->post_load_original 2208 $self->post_load_original
2026 if delete $self->{load_original}; 2209 if delete $self->{load_original};
2027 2210
2028 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
2029 utf8::encode $uniq; 2212 utf8::encode $uniq;
2030 unless (aio_stat $uniq) { 2213 unless (aio_stat $uniq) {
2031 if (my $f = new_from_file cf::object::thawer $uniq) { 2214 if (my $f = new_from_file cf::object::thawer $uniq) {
2032 $self->clear_unique_items; 2215 $self->clear_unique_items;
2033 $self->_load_objects ($f); 2216 $self->_load_objects ($f);
2034 $f->resolve_delayed_derefs; 2217 $f->resolve_delayed_derefs;
2218 }
2035 } 2219 }
2036 } 2220 }
2037 }
2038 2221
2039 $f->resolve_delayed_derefs; 2222 $f->resolve_delayed_derefs;
2223 } else {
2224 $self->post_load_original
2225 if delete $self->{load_original};
2226 }
2227
2228 $self->state (cf::MAP_INACTIVE);
2040 2229
2041 cf::cede_to_tick; 2230 cf::cede_to_tick;
2042 # now do the right thing for maps 2231 # now do the right thing for maps
2043 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
2044 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
2048 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
2049 $self->decay_objects; 2238 $self->decay_objects;
2050 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
2051 $self->update_buttons; 2240 $self->update_buttons;
2052 cf::cede_to_tick; 2241 cf::cede_to_tick;
2053 $self->activate; 2242 #$self->activate; # no longer activate maps automatically
2054 } 2243 }
2055 2244
2056 $self->{last_save} = $cf::RUNTIME; 2245 $self->{last_save} = $cf::RUNTIME;
2057 $self->last_access ($cf::RUNTIME); 2246 $self->last_access ($cf::RUNTIME);
2058
2059 $self->in_memory (cf::MAP_ACTIVE);
2060 } 2247 }
2061 2248
2062 $self->post_load; 2249 $self->post_load;
2063}
2064 2250
2251 1
2252}
2253
2254# customize the map for a given player, i.e.
2255# return the _real_ map. used by e.g. per-player
2256# maps to change the path to ~playername/mappath
2065sub customise_for { 2257sub customise_for {
2066 my ($self, $ob) = @_; 2258 my ($self, $ob) = @_;
2067 2259
2068 return find "~" . $ob->name . "/" . $self->{path} 2260 return find "~" . $ob->name . "/" . $self->{path}
2069 if $self->per_player; 2261 if $self->per_player;
2072# if $self->per_party; 2264# if $self->per_party;
2073 2265
2074 $self 2266 $self
2075} 2267}
2076 2268
2077# find and load all maps in the 3x3 area around a map
2078sub load_neighbours {
2079 my ($map) = @_;
2080
2081 my @neigh; # diagonal neighbours
2082
2083 for (0 .. 3) {
2084 my $neigh = $map->tile_path ($_)
2085 or next;
2086 $neigh = find $neigh, $map
2087 or next;
2088 $neigh->load;
2089
2090 push @neigh,
2091 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2092 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2093 }
2094
2095 for (grep defined $_->[0], @neigh) {
2096 my ($path, $origin) = @$_;
2097 my $neigh = find $path, $origin
2098 or next;
2099 $neigh->load;
2100 }
2101}
2102
2103sub find_sync { 2269sub find_sync {
2104 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
2105 2271
2106 cf::sync_job { find $path, $origin } 2272 # it's a bug to call this from the main context
2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2274 if $Coro::current == $Coro::main;
2275
2276 find $path, $origin
2107} 2277}
2108 2278
2109sub do_load_sync { 2279sub do_load_sync {
2110 my ($map) = @_; 2280 my ($map) = @_;
2111 2281
2282 # it's a bug to call this from the main context
2112 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2113 if $Coro::current == $Coro::main; 2284 if $Coro::current == $Coro::main;
2114 2285
2115 cf::sync_job { $map->load }; 2286 $map->load;
2116} 2287}
2117 2288
2118our %MAP_PREFETCH; 2289our %MAP_PREFETCH;
2119our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
2120 2291
2121sub find_async { 2292sub find_async {
2122 my ($path, $origin, $load) = @_; 2293 my ($path, $origin, $load) = @_;
2123 2294
2124 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
2125 2296
2126 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
2127 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2298 return $map if !$load || $map->linkable;
2128 } 2299 }
2129 2300
2130 $MAP_PREFETCH{$path} |= $load; 2301 $MAP_PREFETCH{$path} |= $load;
2131 2302
2132 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
2146 $MAP_PREFETCHER->prio (6); 2317 $MAP_PREFETCHER->prio (6);
2147 2318
2148 () 2319 ()
2149} 2320}
2150 2321
2322# common code, used by both ->save and ->swapout
2151sub save { 2323sub _save {
2152 my ($self) = @_; 2324 my ($self) = @_;
2153
2154 my $lock = cf::lock_acquire "map_data:$self->{path}";
2155 2325
2156 $self->{last_save} = $cf::RUNTIME; 2326 $self->{last_save} = $cf::RUNTIME;
2157 2327
2158 return unless $self->dirty; 2328 return unless $self->dirty;
2159 2329
2179 } else { 2349 } else {
2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2350 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2181 } 2351 }
2182} 2352}
2183 2353
2354sub save {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 $self->_save;
2360}
2361
2184sub swap_out { 2362sub swap_out {
2185 my ($self) = @_; 2363 my ($self) = @_;
2186 2364
2187 # save first because save cedes
2188 $self->save;
2189
2190 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2191 2366
2367 return if !$self->linkable;
2368 return if $self->{deny_save};
2192 return if $self->players; 2369 return if $self->players;
2193 return if $self->in_memory != cf::MAP_ACTIVE; 2370
2371 # first deactivate the map and "unlink" it from the core
2372 $self->deactivate;
2373 $_->clear_links_to ($self) for values %cf::MAP;
2374 $self->state (cf::MAP_SWAPPED);
2375
2376 # then atomically save
2377 $self->_save;
2378
2379 # then free the map
2380 $self->clear;
2381}
2382
2383sub reset_at {
2384 my ($self) = @_;
2385
2386 # TODO: safety, remove and allow resettable per-player maps
2194 return if $self->{deny_save}; 2387 return 1e99 if $self->{deny_reset};
2195 2388
2389 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2390 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2391
2392 $time + $to
2393}
2394
2395sub should_reset {
2396 my ($self) = @_;
2397
2398 $self->reset_at <= $cf::RUNTIME
2399}
2400
2401sub reset {
2402 my ($self) = @_;
2403
2404 my $lock = cf::lock_acquire "map_data:$self->{path}";
2405
2406 return if $self->players;
2407
2408 cf::trace "resetting map ", $self->path, "\n";
2409
2196 $self->in_memory (cf::MAP_SWAPPED); 2410 $self->state (cf::MAP_SWAPPED);
2411
2412 # need to save uniques path
2413 unless ($self->{deny_save}) {
2414 my $uniq = $self->uniq_path; utf8::encode $uniq;
2415
2416 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2417 if $uniq;
2418 }
2419
2420 delete $cf::MAP{$self->path};
2197 2421
2198 $self->deactivate; 2422 $self->deactivate;
2199 $_->clear_links_to ($self) for values %cf::MAP; 2423 $_->clear_links_to ($self) for values %cf::MAP;
2200 $self->clear; 2424 $self->clear;
2201}
2202
2203sub reset_at {
2204 my ($self) = @_;
2205
2206 # TODO: safety, remove and allow resettable per-player maps
2207 return 1e99 if $self->{deny_reset};
2208
2209 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2210 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2211
2212 $time + $to
2213}
2214
2215sub should_reset {
2216 my ($self) = @_;
2217
2218 $self->reset_at <= $cf::RUNTIME
2219}
2220
2221sub reset {
2222 my ($self) = @_;
2223
2224 my $lock = cf::lock_acquire "map_data:$self->{path}";
2225
2226 return if $self->players;
2227
2228 warn "resetting map ", $self->path;
2229
2230 $self->in_memory (cf::MAP_SWAPPED);
2231
2232 # need to save uniques path
2233 unless ($self->{deny_save}) {
2234 my $uniq = $self->uniq_path; utf8::encode $uniq;
2235
2236 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2237 if $uniq;
2238 }
2239
2240 delete $cf::MAP{$self->path};
2241
2242 $self->deactivate;
2243 $_->clear_links_to ($self) for values %cf::MAP;
2244 $self->clear;
2245 2425
2246 $self->unlink_save; 2426 $self->unlink_save;
2247 $self->destroy; 2427 $self->destroy;
2248} 2428}
2249 2429
2257 2437
2258 delete $cf::MAP{$self->path}; 2438 delete $cf::MAP{$self->path};
2259 2439
2260 $self->unlink_save; 2440 $self->unlink_save;
2261 2441
2262 bless $self, "cf::map"; 2442 bless $self, "cf::map::wrap";
2263 delete $self->{deny_reset}; 2443 delete $self->{deny_reset};
2264 $self->{deny_save} = 1; 2444 $self->{deny_save} = 1;
2265 $self->reset_timeout (1); 2445 $self->reset_timeout (1);
2266 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2446 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2267 2447
2324 : normalise $_ 2504 : normalise $_
2325 } @{ aio_readdir $UNIQUEDIR or [] } 2505 } @{ aio_readdir $UNIQUEDIR or [] }
2326 ] 2506 ]
2327} 2507}
2328 2508
2509=item cf::map::static_maps
2510
2511Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2512file in the shared directory excluding F</styles> and F</editor>). May
2513block.
2514
2515=cut
2516
2517sub static_maps() {
2518 my @dirs = "";
2519 my @maps;
2520
2521 while (@dirs) {
2522 my $dir = shift @dirs;
2523
2524 next if $dir eq "/styles" || $dir eq "/editor";
2525
2526 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2527 or return;
2528
2529 for (@$files) {
2530 s/\.map$// or next;
2531 utf8::decode $_;
2532 push @maps, "$dir/$_";
2533 }
2534
2535 push @dirs, map "$dir/$_", @$dirs;
2536 }
2537
2538 \@maps
2539}
2540
2329=back 2541=back
2330 2542
2331=head3 cf::object 2543=head3 cf::object
2332 2544
2333=cut 2545=cut
2465 2677
2466Freezes the player and moves him/her to a special map (C<{link}>). 2678Freezes the player and moves him/her to a special map (C<{link}>).
2467 2679
2468The player should be reasonably safe there for short amounts of time (e.g. 2680The player should be reasonably safe there for short amounts of time (e.g.
2469for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2681for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2470though, as the palyer cannot control the character while it is on the link 2682though, as the player cannot control the character while it is on the link
2471map. 2683map.
2472 2684
2473Will never block. 2685Will never block.
2474 2686
2475=item $player_object->leave_link ($map, $x, $y) 2687=item $player_object->leave_link ($map, $x, $y)
2496sub cf::object::player::enter_link { 2708sub cf::object::player::enter_link {
2497 my ($self) = @_; 2709 my ($self) = @_;
2498 2710
2499 $self->deactivate_recursive; 2711 $self->deactivate_recursive;
2500 2712
2713 ++$self->{_link_recursion};
2714
2501 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2715 return if UNIVERSAL::isa $self->map, "ext::map_link";
2502 2716
2503 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2504 if $self->map && $self->map->{path} ne "{link}"; 2718 if $self->map && $self->map->{path} ne "{link}";
2505 2719
2506 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2720 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2507} 2721}
2508 2722
2509sub cf::object::player::leave_link { 2723sub cf::object::player::leave_link {
2510 my ($self, $map, $x, $y) = @_; 2724 my ($self, $map, $x, $y) = @_;
2511 2725
2528 ($x, $y) = (-1, -1) 2742 ($x, $y) = (-1, -1)
2529 unless (defined $x) && (defined $y); 2743 unless (defined $x) && (defined $y);
2530 2744
2531 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2532 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2533 if $x <=0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2534 2748
2535 $map->load; 2749 $map->load;
2536 $map->load_neighbours;
2537 2750
2538 return unless $self->contr->active; 2751 return unless $self->contr->active;
2539 2752
2540 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2541 $self->enter_map ($map, $x, $y); 2754 if ($self->enter_map ($map, $x, $y)) {
2542 2755 # entering was successful
2756 delete $self->{_link_recursion};
2543 # only activate afterwards, to support waiting in hooks 2757 # only activate afterwards, to support waiting in hooks
2544 $self->activate_recursive; 2758 $self->activate_recursive;
2545} 2759 }
2546 2760
2761}
2762
2547=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2763=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2548 2764
2549Moves the player to the given map-path and coordinates by first freezing 2765Moves the player to the given map-path and coordinates by first freezing
2550her, loading and preparing them map, calling the provided $check callback 2766her, loading and preparing them map, calling the provided $check callback
2551that has to return the map if sucecssful, and then unfreezes the player on 2767that has to return the map if sucecssful, and then unfreezes the player on
2552the new (success) or old (failed) map position. In either case, $done will 2768the new (success) or old (failed) map position. In either case, $done will
2559 2775
2560our $GOTOGEN; 2776our $GOTOGEN;
2561 2777
2562sub cf::object::player::goto { 2778sub cf::object::player::goto {
2563 my ($self, $path, $x, $y, $check, $done) = @_; 2779 my ($self, $path, $x, $y, $check, $done) = @_;
2780
2781 if ($self->{_link_recursion} >= $MAX_LINKS) {
2782 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2783 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2784 ($path, $x, $y) = @$EMERGENCY_POSITION;
2785 }
2564 2786
2565 # do generation counting so two concurrent goto's will be executed in-order 2787 # do generation counting so two concurrent goto's will be executed in-order
2566 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2567 2789
2568 $self->enter_link; 2790 $self->enter_link;
2588 ($path, $x, $y) = (undef, undef, undef); 2810 ($path, $x, $y) = (undef, undef, undef);
2589 } 2811 }
2590 } 2812 }
2591 2813
2592 my $map = eval { 2814 my $map = eval {
2593 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2594 2816
2595 if ($map) { 2817 if ($map) {
2596 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2597 $map = $check->($map) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2598 } else { 2820 } else {
2599 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2821 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2600 } 2822 }
2601 2823
2602 $map 2824 $map
2610 if ($gen == $self->{_goto_generation}) { 2832 if ($gen == $self->{_goto_generation}) {
2611 delete $self->{_goto_generation}; 2833 delete $self->{_goto_generation};
2612 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2613 } 2835 }
2614 2836
2615 $done->() if $done; 2837 $done->($self) if $done;
2616 })->prio (1); 2838 })->prio (1);
2617} 2839}
2618 2840
2619=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
2620 2842
2688 $Coro::current->{desc} = "enter_exit"; 2910 $Coro::current->{desc} = "enter_exit";
2689 2911
2690 unless (eval { 2912 unless (eval {
2691 $self->deactivate_recursive; # just to be sure 2913 $self->deactivate_recursive; # just to be sure
2692 2914
2693 # random map handling
2694 {
2695 my $guard = cf::lock_acquire "exit_prepare:$exit";
2696
2697 prepare_random_map $exit
2698 if $exit->slaying eq "/!";
2699 }
2700
2701 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2915 my $map = cf::map::normalise $exit->slaying, $exit->map;
2702 my $x = $exit->stats->hp; 2916 my $x = $exit->stats->hp;
2703 my $y = $exit->stats->sp; 2917 my $y = $exit->stats->sp;
2918
2919 # special map handling
2920 my $slaying = $exit->slaying;
2921
2922 # special map handling
2923 if ($slaying eq "/!") {
2924 my $guard = cf::lock_acquire "exit_prepare:$exit";
2925
2926 prepare_random_map $exit
2927 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2928
2929 $map = $exit->slaying;
2930
2931 } elsif ($slaying eq '!up') {
2932 $map = $exit->map->tile_path (cf::TILE_UP);
2933 $x = $exit->x;
2934 $y = $exit->y;
2935
2936 } elsif ($slaying eq '!down') {
2937 $map = $exit->map->tile_path (cf::TILE_DOWN);
2938 $x = $exit->x;
2939 $y = $exit->y;
2940 }
2704 2941
2705 $self->goto ($map, $x, $y); 2942 $self->goto ($map, $x, $y);
2706 2943
2707 # if exit is damned, update players death & WoR home-position 2944 # if exit is damned, update players death & WoR home-position
2708 $self->contr->savebed ($map, $x, $y) 2945 $self->contr->savebed ($map, $x, $y)
2713 $self->message ("Something went wrong deep within the deliantra server. " 2950 $self->message ("Something went wrong deep within the deliantra server. "
2714 . "I'll try to bring you back to the map you were before. " 2951 . "I'll try to bring you back to the map you were before. "
2715 . "Please report this to the dungeon master!", 2952 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 2953 cf::NDI_UNIQUE | cf::NDI_RED);
2717 2954
2718 warn "ERROR in enter_exit: $@"; 2955 error "ERROR in enter_exit: $@";
2719 $self->leave_link; 2956 $self->leave_link;
2720 } 2957 }
2721 })->prio (1); 2958 })->prio (1);
2722} 2959}
2723 2960
2735sub cf::client::send_drawinfo { 2972sub cf::client::send_drawinfo {
2736 my ($self, $text, $flags) = @_; 2973 my ($self, $text, $flags) = @_;
2737 2974
2738 utf8::encode $text; 2975 utf8::encode $text;
2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2976 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2977}
2978
2979=item $client->send_big_packet ($pkt)
2980
2981Like C<send_packet>, but tries to compress large packets, and fragments
2982them as required.
2983
2984=cut
2985
2986our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2987
2988sub cf::client::send_big_packet {
2989 my ($self, $pkt) = @_;
2990
2991 # try lzf for large packets
2992 $pkt = "lzf " . Compress::LZF::compress $pkt
2993 if 1024 <= length $pkt and $self->{can_lzf};
2994
2995 # split very large packets
2996 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2997 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2998 $pkt = "frag";
2999 }
3000
3001 $self->send_packet ($pkt);
2740} 3002}
2741 3003
2742=item $client->send_msg ($channel, $msg, $color, [extra...]) 3004=item $client->send_msg ($channel, $msg, $color, [extra...])
2743 3005
2744Send a drawinfo or msg packet to the client, formatting the msg for the 3006Send a drawinfo or msg packet to the client, formatting the msg for the
2748 3010
2749=cut 3011=cut
2750 3012
2751# non-persistent channels (usually the info channel) 3013# non-persistent channels (usually the info channel)
2752our %CHANNEL = ( 3014our %CHANNEL = (
3015 "c/motd" => {
3016 id => "infobox",
3017 title => "MOTD",
3018 reply => undef,
3019 tooltip => "The message of the day",
3020 },
2753 "c/identify" => { 3021 "c/identify" => {
2754 id => "infobox", 3022 id => "infobox",
2755 title => "Identify", 3023 title => "Identify",
2756 reply => undef, 3024 reply => undef,
2757 tooltip => "Items recently identified", 3025 tooltip => "Items recently identified",
2759 "c/examine" => { 3027 "c/examine" => {
2760 id => "infobox", 3028 id => "infobox",
2761 title => "Examine", 3029 title => "Examine",
2762 reply => undef, 3030 reply => undef,
2763 tooltip => "Signs and other items you examined", 3031 tooltip => "Signs and other items you examined",
3032 },
3033 "c/shopinfo" => {
3034 id => "infobox",
3035 title => "Shop Info",
3036 reply => undef,
3037 tooltip => "What your bargaining skill tells you about the shop",
2764 }, 3038 },
2765 "c/book" => { 3039 "c/book" => {
2766 id => "infobox", 3040 id => "infobox",
2767 title => "Book", 3041 title => "Book",
2768 reply => undef, 3042 reply => undef,
2884 my $pkt = "msg " 3158 my $pkt = "msg "
2885 . $self->{json_coder}->encode ( 3159 . $self->{json_coder}->encode (
2886 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3160 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2887 ); 3161 );
2888 3162
2889 # try lzf for large packets
2890 $pkt = "lzf " . Compress::LZF::compress $pkt
2891 if 1024 <= length $pkt and $self->{can_lzf};
2892
2893 # split very large packets
2894 if (8192 < length $pkt and $self->{can_lzf}) {
2895 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2896 $pkt = "frag";
2897 }
2898
2899 $self->send_packet ($pkt); 3163 $self->send_big_packet ($pkt);
2900} 3164}
2901 3165
2902=item $client->ext_msg ($type, @msg) 3166=item $client->ext_msg ($type, @msg)
2903 3167
2904Sends an ext event to the client. 3168Sends an ext event to the client.
2907 3171
2908sub cf::client::ext_msg($$@) { 3172sub cf::client::ext_msg($$@) {
2909 my ($self, $type, @msg) = @_; 3173 my ($self, $type, @msg) = @_;
2910 3174
2911 if ($self->extcmd == 2) { 3175 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3176 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2913 } elsif ($self->extcmd == 1) { # TODO: remove 3177 } elsif ($self->extcmd == 1) { # TODO: remove
2914 push @msg, msgtype => "event_$type"; 3178 push @msg, msgtype => "event_$type";
2915 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2916 } 3180 }
2917} 3181}
2918 3182
2919=item $client->ext_reply ($msgid, @msg) 3183=item $client->ext_reply ($msgid, @msg)
2920 3184
2923=cut 3187=cut
2924 3188
2925sub cf::client::ext_reply($$@) { 3189sub cf::client::ext_reply($$@) {
2926 my ($self, $id, @msg) = @_; 3190 my ($self, $id, @msg) = @_;
2927 3191
2928 if ($self->extcmd == 2) { 3192 return unless $self->extcmd == 2;
3193
2929 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3194 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2930 } elsif ($self->extcmd == 1) {
2931 #TODO: version 1, remove
2932 unshift @msg, msgtype => "reply", msgid => $id;
2933 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2934 }
2935} 3195}
2936 3196
2937=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
2938 3198
2939Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
2994 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
2995 3255
2996 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2997 3257
2998 if (ref $msg) { 3258 if (ref $msg) {
2999 my ($type, $reply, @payload) = 3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3000 "ARRAY" eq ref $msg
3001 ? @$msg
3002 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3003 3260
3004 my @reply; 3261 my @reply;
3005 3262
3006 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
3007 @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
3009 3266
3010 $ns->ext_reply ($reply, @reply) 3267 $ns->ext_reply ($reply, @reply)
3011 if $reply; 3268 if $reply;
3012 3269
3013 } else { 3270 } else {
3014 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3271 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3015 } 3272 }
3016 3273
3017 cf::override; 3274 cf::override;
3018 }, 3275 },
3019); 3276);
3039 3296
3040 $coro 3297 $coro
3041} 3298}
3042 3299
3043cf::client->attach ( 3300cf::client->attach (
3044 on_destroy => sub { 3301 on_client_destroy => sub {
3045 my ($ns) = @_; 3302 my ($ns) = @_;
3046 3303
3047 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3304 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3048 }, 3305 },
3049); 3306);
3065our $safe_hole = new Safe::Hole; 3322our $safe_hole = new Safe::Hole;
3066 3323
3067$SIG{FPE} = 'IGNORE'; 3324$SIG{FPE} = 'IGNORE';
3068 3325
3069$safe->permit_only (Opcode::opset qw( 3326$safe->permit_only (Opcode::opset qw(
3070 :base_core :base_mem :base_orig :base_math 3327 :base_core :base_mem :base_orig :base_math :base_loop
3071 grepstart grepwhile mapstart mapwhile 3328 grepstart grepwhile mapstart mapwhile
3072 sort time 3329 sort time
3073)); 3330));
3074 3331
3075# here we export the classes and methods available to script code 3332# here we export the classes and methods available to script code
3100 decrease split destroy change_exp value msg lore send_msg)], 3357 decrease split destroy change_exp value msg lore send_msg)],
3101 ["cf::object::player" => qw(player)], 3358 ["cf::object::player" => qw(player)],
3102 ["cf::player" => qw(peaceful send_msg)], 3359 ["cf::player" => qw(peaceful send_msg)],
3103 ["cf::map" => qw(trigger)], 3360 ["cf::map" => qw(trigger)],
3104) { 3361) {
3105 no strict 'refs';
3106 my ($pkg, @funs) = @$_; 3362 my ($pkg, @funs) = @$_;
3107 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3363 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3108 for @funs; 3364 for @funs;
3109} 3365}
3110 3366
3127 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3383 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3128 $qcode =~ s/\n/\\n/g; 3384 $qcode =~ s/\n/\\n/g;
3129 3385
3130 %vars = (_dummy => 0) unless %vars; 3386 %vars = (_dummy => 0) unless %vars;
3131 3387
3388 my @res;
3132 local $_; 3389 local $_;
3133 local @safe::cf::_safe_eval_args = values %vars;
3134 3390
3135 my $eval = 3391 my $eval =
3136 "do {\n" 3392 "do {\n"
3137 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3393 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3138 . "#line 0 \"{$qcode}\"\n" 3394 . "#line 0 \"{$qcode}\"\n"
3139 . $code 3395 . $code
3140 . "\n}" 3396 . "\n}"
3141 ; 3397 ;
3142 3398
3399 if ($CFG{safe_eval}) {
3143 sub_generation_inc; 3400 sub_generation_inc;
3401 local @safe::cf::_safe_eval_args = values %vars;
3144 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3402 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3145 sub_generation_inc; 3403 sub_generation_inc;
3404 } else {
3405 local @cf::_safe_eval_args = values %vars;
3406 @res = wantarray ? eval eval : scalar eval $eval;
3407 }
3146 3408
3147 if ($@) { 3409 if ($@) {
3148 warn "$@"; 3410 warn "$@",
3149 warn "while executing safe code '$code'\n"; 3411 "while executing safe code '$code'\n",
3150 warn "with arguments " . (join " ", %vars) . "\n"; 3412 "with arguments " . (join " ", %vars) . "\n";
3151 } 3413 }
3152 3414
3153 wantarray ? @res : $res[0] 3415 wantarray ? @res : $res[0]
3154} 3416}
3155 3417
3169=cut 3431=cut
3170 3432
3171sub register_script_function { 3433sub register_script_function {
3172 my ($fun, $cb) = @_; 3434 my ($fun, $cb) = @_;
3173 3435
3174 no strict 'refs'; 3436 $fun = "safe::$fun" if $CFG{safe_eval};
3175 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3437 *$fun = $safe_hole->wrap ($cb);
3176} 3438}
3177 3439
3178=back 3440=back
3179 3441
3180=cut 3442=cut
3189 # for this (global event?) 3451 # for this (global event?)
3190 %ext::player_env::MUSIC_FACE_CACHE = (); 3452 %ext::player_env::MUSIC_FACE_CACHE = ();
3191 3453
3192 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3454 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3193 3455
3194 warn "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
3195 3457
3196 my $facedata; 3458 my $facedata = decode_storable load_file $path;
3197 0 < aio_load $path, $facedata
3198 or die "$path: $!";
3199
3200 $facedata = Coro::Storable::thaw $facedata;
3201 3459
3202 $facedata->{version} == 2 3460 $facedata->{version} == 2
3203 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
3204 3462
3205 # patch in the exptable 3463 # patch in the exptable
3464 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3206 $facedata->{resource}{"res/exp_table"} = { 3465 $facedata->{resource}{"res/exp_table"} = {
3207 type => FT_RSRC, 3466 type => FT_RSRC,
3208 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3467 data => $exp_table,
3468 hash => (Digest::MD5::md5 $exp_table),
3209 }; 3469 };
3210 cf::cede_to_tick; 3470 cf::cede_to_tick;
3211 3471
3212 { 3472 {
3213 my $faces = $facedata->{faceinfo}; 3473 my $faces = $facedata->{faceinfo};
3215 while (my ($face, $info) = each %$faces) { 3475 while (my ($face, $info) = each %$faces) {
3216 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3476 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3217 3477
3218 cf::face::set_visibility $idx, $info->{visibility}; 3478 cf::face::set_visibility $idx, $info->{visibility};
3219 cf::face::set_magicmap $idx, $info->{magicmap}; 3479 cf::face::set_magicmap $idx, $info->{magicmap};
3220 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3221 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3481 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3482 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3222 3483
3223 cf::cede_to_tick; 3484 cf::cede_to_tick;
3224 } 3485 }
3225 3486
3226 while (my ($face, $info) = each %$faces) { 3487 while (my ($face, $info) = each %$faces) {
3231 3492
3232 if (my $smooth = cf::face::find $info->{smooth}) { 3493 if (my $smooth = cf::face::find $info->{smooth}) {
3233 cf::face::set_smooth $idx, $smooth; 3494 cf::face::set_smooth $idx, $smooth;
3234 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3495 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3235 } else { 3496 } else {
3236 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3497 error "smooth face '$info->{smooth}' not found for face '$face'";
3237 } 3498 }
3238 3499
3239 cf::cede_to_tick; 3500 cf::cede_to_tick;
3240 } 3501 }
3241 } 3502 }
3250 3511
3251 cf::anim::invalidate_all; # d'oh 3512 cf::anim::invalidate_all; # d'oh
3252 } 3513 }
3253 3514
3254 { 3515 {
3255 # TODO: for gcfclient pleasure, we should give resources
3256 # that gcfclient doesn't grok a >10000 face index.
3257 my $res = $facedata->{resource}; 3516 my $res = $facedata->{resource};
3258 3517
3259 while (my ($name, $info) = each %$res) { 3518 while (my ($name, $info) = each %$res) {
3260 if (defined $info->{type}) { 3519 if (defined (my $type = $info->{type})) {
3520 # TODO: different hash - must free and use new index, or cache ixface data queue
3261 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3521 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3262 my $data;
3263 3522
3264 if ($info->{type} & 1) { 3523 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3265 # prepend meta info
3266
3267 my $meta = $enc->encode ({
3268 name => $name,
3269 %{ $info->{meta} || {} },
3270 });
3271
3272 $data = pack "(w/a*)*", $meta, $info->{data};
3273 } else {
3274 $data = $info->{data};
3275 }
3276
3277 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3278 cf::face::set_type $idx, $info->{type}; 3524 cf::face::set_type $idx, $type;
3525 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3279 } else { 3526 } else {
3280 $RESOURCE{$name} = $info; 3527# $RESOURCE{$name} = $info; # unused
3281 } 3528 }
3282 3529
3283 cf::cede_to_tick; 3530 cf::cede_to_tick;
3284 } 3531 }
3285 } 3532 }
3286 3533
3287 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3534 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3288 3535
3289 1 3536 1
3290} 3537}
3291
3292cf::global->attach (on_resource_update => sub {
3293 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3294 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3295
3296 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3297 my $sound = $soundconf->{compat}[$_]
3298 or next;
3299
3300 my $face = cf::face::find "sound/$sound->[1]";
3301 cf::sound::set $sound->[0] => $face;
3302 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3303 }
3304
3305 while (my ($k, $v) = each %{$soundconf->{event}}) {
3306 my $face = cf::face::find "sound/$v";
3307 cf::sound::set $k => $face;
3308 }
3309 }
3310});
3311 3538
3312register_exticmd fx_want => sub { 3539register_exticmd fx_want => sub {
3313 my ($ns, $want) = @_; 3540 my ($ns, $want) = @_;
3314 3541
3315 while (my ($k, $v) = each %$want) { 3542 while (my ($k, $v) = each %$want) {
3354sub reload_treasures { 3581sub reload_treasures {
3355 load_resource_file "$DATADIR/treasures" 3582 load_resource_file "$DATADIR/treasures"
3356 or die "unable to load treasurelists\n"; 3583 or die "unable to load treasurelists\n";
3357} 3584}
3358 3585
3586sub reload_sound {
3587 trace "loading sound config from $DATADIR/sound\n";
3588
3589 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3590
3591 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3592 my $sound = $soundconf->{compat}[$_]
3593 or next;
3594
3595 my $face = cf::face::find "sound/$sound->[1]";
3596 cf::sound::set $sound->[0] => $face;
3597 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3598 }
3599
3600 while (my ($k, $v) = each %{$soundconf->{event}}) {
3601 my $face = cf::face::find "sound/$v";
3602 cf::sound::set $k => $face;
3603 }
3604}
3605
3359sub reload_resources { 3606sub reload_resources {
3360 warn "reloading resource files...\n"; 3607 trace "reloading resource files...\n";
3361 3608
3609 reload_exp_table;
3610 reload_materials;
3362 reload_facedata; 3611 reload_facedata;
3612 reload_sound;
3363 reload_archetypes; 3613 reload_archetypes;
3364 reload_regions; 3614 reload_regions;
3365 reload_treasures; 3615 reload_treasures;
3366 3616
3367 warn "finished reloading resource files\n"; 3617 trace "finished reloading resource files\n";
3368} 3618}
3369 3619
3370sub reload_config { 3620sub reload_config {
3371 open my $fh, "<:utf8", "$CONFDIR/config" 3621 trace "reloading config file...\n";
3372 or return;
3373 3622
3374 local $/; 3623 my $config = load_file "$CONFDIR/config";
3375 *CFG = YAML::Load <$fh>; 3624 utf8::decode $config;
3625 *CFG = decode_yaml $config;
3376 3626
3377 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3627 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3378 3628
3379 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3629 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3380 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3630 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3381 3631
3382 if (exists $CFG{mlockall}) { 3632 if (exists $CFG{mlockall}) {
3406 seek $fh, 0, 0; 3656 seek $fh, 0, 0;
3407 print $fh $$; 3657 print $fh $$;
3408} 3658}
3409 3659
3410sub main_loop { 3660sub main_loop {
3411 warn "EV::loop starting\n"; 3661 trace "EV::loop starting\n";
3412 if (1) { 3662 if (1) {
3413 EV::loop; 3663 EV::loop;
3414 } 3664 }
3415 warn "EV::loop returned\n"; 3665 trace "EV::loop returned\n";
3416 goto &main_loop unless $REALLY_UNLOOP; 3666 goto &main_loop unless $REALLY_UNLOOP;
3417} 3667}
3418 3668
3419sub main { 3669sub main {
3420 cf::init_globals; # initialise logging 3670 cf::init_globals; # initialise logging
3421 3671
3422 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3672 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3423 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3673 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3424 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3674 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3425 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3675 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3426
3427 cf::init_experience;
3428 cf::init_anim;
3429 cf::init_attackmess;
3430 cf::init_dynamic;
3431 3676
3432 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3677 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3433 3678
3434 # we must not ever block the main coroutine 3679 # we must not ever block the main coroutine
3435 local $Coro::idle = sub { 3680 local $Coro::idle = sub {
3441 }; 3686 };
3442 3687
3443 evthread_start IO::AIO::poll_fileno; 3688 evthread_start IO::AIO::poll_fileno;
3444 3689
3445 cf::sync_job { 3690 cf::sync_job {
3691 cf::incloader::init ();
3692
3693 cf::init_anim;
3694 cf::init_attackmess;
3695 cf::init_dynamic;
3696
3697 cf::load_settings;
3698
3446 reload_resources; 3699 reload_resources;
3447 reload_config; 3700 reload_config;
3448 db_init; 3701 db_init;
3449 3702
3450 cf::load_settings;
3451 cf::load_materials;
3452 cf::init_uuid; 3703 cf::init_uuid;
3453 cf::init_signals; 3704 cf::init_signals;
3454 cf::init_commands;
3455 cf::init_skills; 3705 cf::init_skills;
3456 3706
3457 cf::init_beforeplay; 3707 cf::init_beforeplay;
3458 3708
3459 atomic; 3709 atomic;
3464 3714
3465 # no (long-running) fork's whatsoever before this point(!) 3715 # no (long-running) fork's whatsoever before this point(!)
3466 use POSIX (); 3716 use POSIX ();
3467 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3717 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3468 3718
3469 (pop @POST_INIT)->(0) while @POST_INIT; 3719 cf::_post_init 0;
3470 }; 3720 };
3471 3721
3722 cf::object::thawer::errors_are_fatal 0;
3723 info "parse errors in files are no longer fatal from this point on.\n";
3724
3725 AE::postpone {
3726 undef &main; # free gobs of memory :)
3727 };
3728
3472 main_loop; 3729 goto &main_loop;
3473} 3730}
3474 3731
3475############################################################################# 3732#############################################################################
3476# initialisation and cleanup 3733# initialisation and cleanup
3477 3734
3478# install some emergency cleanup handlers 3735# install some emergency cleanup handlers
3479BEGIN { 3736BEGIN {
3480 our %SIGWATCHER = (); 3737 our %SIGWATCHER = ();
3481 for my $signal (qw(INT HUP TERM)) { 3738 for my $signal (qw(INT HUP TERM)) {
3482 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3739 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3483 cf::cleanup "SIG$signal"; 3740 cf::cleanup "SIG$signal";
3484 }; 3741 };
3485 } 3742 }
3486} 3743}
3487 3744
3488sub write_runtime_sync { 3745sub write_runtime_sync {
3746 my $t0 = AE::time;
3747
3489 # first touch the runtime file to show we are still running: 3748 # first touch the runtime file to show we are still running:
3490 # the fsync below can take a very very long time. 3749 # the fsync below can take a very very long time.
3491 3750
3492 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3751 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3493 3752
3494 my $guard = cf::lock_acquire "write_runtime"; 3753 my $guard = cf::lock_acquire "write_runtime";
3495 3754
3496 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3755 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3497 or return; 3756 or return;
3498 3757
3499 my $value = $cf::RUNTIME + 90 + 10; 3758 my $value = $cf::RUNTIME + 90 + 10;
3500 # 10 is the runtime save interval, for a monotonic clock 3759 # 10 is the runtime save interval, for a monotonic clock
3501 # 60 allows for the watchdog to kill the server. 3760 # 60 allows for the watchdog to kill the server.
3514 or return; 3773 or return;
3515 3774
3516 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3775 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3517 and return; 3776 and return;
3518 3777
3519 warn "runtime file written.\n"; 3778 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3520 3779
3521 1 3780 1
3522} 3781}
3523 3782
3524our $uuid_lock; 3783our $uuid_lock;
3536 or return; 3795 or return;
3537 3796
3538 my $value = uuid_seq uuid_cur; 3797 my $value = uuid_seq uuid_cur;
3539 3798
3540 unless ($value) { 3799 unless ($value) {
3541 warn "cowardly refusing to write zero uuid value!\n"; 3800 info "cowardly refusing to write zero uuid value!\n";
3542 return; 3801 return;
3543 } 3802 }
3544 3803
3545 my $value = uuid_str $value + $uuid_skip; 3804 my $value = uuid_str $value + $uuid_skip;
3546 $uuid_skip = 0; 3805 $uuid_skip = 0;
3556 or return; 3815 or return;
3557 3816
3558 aio_rename "$uuid~", $uuid 3817 aio_rename "$uuid~", $uuid
3559 and return; 3818 and return;
3560 3819
3561 warn "uuid file written ($value).\n"; 3820 trace "uuid file written ($value).\n";
3562 3821
3563 1 3822 1
3564 3823
3565} 3824}
3566 3825
3572} 3831}
3573 3832
3574sub emergency_save() { 3833sub emergency_save() {
3575 my $freeze_guard = cf::freeze_mainloop; 3834 my $freeze_guard = cf::freeze_mainloop;
3576 3835
3577 warn "emergency_perl_save: enter\n"; 3836 info "emergency_perl_save: enter\n";
3837
3838 # this is a trade-off: we want to be very quick here, so
3839 # save all maps without fsync, and later call a global sync
3840 # (which in turn might be very very slow)
3841 local $USE_FSYNC = 0;
3578 3842
3579 cf::sync_job { 3843 cf::sync_job {
3580 # this is a trade-off: we want to be very quick here, so 3844 cf::write_runtime_sync; # external watchdog should not bark
3581 # save all maps without fsync, and later call a global sync
3582 # (which in turn might be very very slow)
3583 local $USE_FSYNC = 0;
3584 3845
3585 # use a peculiar iteration method to avoid tripping on perl 3846 # use a peculiar iteration method to avoid tripping on perl
3586 # refcount bugs in for. also avoids problems with players 3847 # refcount bugs in for. also avoids problems with players
3587 # and maps saved/destroyed asynchronously. 3848 # and maps saved/destroyed asynchronously.
3588 warn "emergency_perl_save: begin player save\n"; 3849 info "emergency_perl_save: begin player save\n";
3589 for my $login (keys %cf::PLAYER) { 3850 for my $login (keys %cf::PLAYER) {
3590 my $pl = $cf::PLAYER{$login} or next; 3851 my $pl = $cf::PLAYER{$login} or next;
3591 $pl->valid or next; 3852 $pl->valid or next;
3592 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3853 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3593 $pl->save; 3854 $pl->save;
3594 } 3855 }
3595 warn "emergency_perl_save: end player save\n"; 3856 info "emergency_perl_save: end player save\n";
3596 3857
3858 cf::write_runtime_sync; # external watchdog should not bark
3859
3597 warn "emergency_perl_save: begin map save\n"; 3860 info "emergency_perl_save: begin map save\n";
3598 for my $path (keys %cf::MAP) { 3861 for my $path (keys %cf::MAP) {
3599 my $map = $cf::MAP{$path} or next; 3862 my $map = $cf::MAP{$path} or next;
3600 $map->valid or next; 3863 $map->valid or next;
3601 $map->save; 3864 $map->save;
3602 } 3865 }
3603 warn "emergency_perl_save: end map save\n"; 3866 info "emergency_perl_save: end map save\n";
3604 3867
3868 cf::write_runtime_sync; # external watchdog should not bark
3869
3605 warn "emergency_perl_save: begin database checkpoint\n"; 3870 info "emergency_perl_save: begin database checkpoint\n";
3606 BDB::db_env_txn_checkpoint $DB_ENV; 3871 BDB::db_env_txn_checkpoint $DB_ENV;
3607 warn "emergency_perl_save: end database checkpoint\n"; 3872 info "emergency_perl_save: end database checkpoint\n";
3608 3873
3609 warn "emergency_perl_save: begin write uuid\n"; 3874 info "emergency_perl_save: begin write uuid\n";
3610 write_uuid_sync 1; 3875 write_uuid_sync 1;
3611 warn "emergency_perl_save: end write uuid\n"; 3876 info "emergency_perl_save: end write uuid\n";
3877
3878 cf::write_runtime_sync; # external watchdog should not bark
3879
3880 trace "emergency_perl_save: syncing database to disk";
3881 BDB::db_env_txn_checkpoint $DB_ENV;
3882
3883 info "emergency_perl_save: starting sync\n";
3884 IO::AIO::aio_sync sub {
3885 info "emergency_perl_save: finished sync\n";
3886 };
3887
3888 cf::write_runtime_sync; # external watchdog should not bark
3889
3890 trace "emergency_perl_save: flushing outstanding aio requests";
3891 while (IO::AIO::nreqs || BDB::nreqs) {
3892 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3893 }
3894
3895 cf::write_runtime_sync; # external watchdog should not bark
3612 }; 3896 };
3613 3897
3614 warn "emergency_perl_save: starting sync()\n";
3615 IO::AIO::aio_sync sub {
3616 warn "emergency_perl_save: finished sync()\n";
3617 };
3618
3619 warn "emergency_perl_save: leave\n"; 3898 info "emergency_perl_save: leave\n";
3620} 3899}
3621 3900
3622sub post_cleanup { 3901sub post_cleanup {
3623 my ($make_core) = @_; 3902 my ($make_core) = @_;
3624 3903
3904 IO::AIO::flush;
3905
3625 warn Carp::longmess "post_cleanup backtrace" 3906 error Carp::longmess "post_cleanup backtrace"
3626 if $make_core; 3907 if $make_core;
3627 3908
3628 my $fh = pidfile; 3909 my $fh = pidfile;
3629 unlink $PIDFILE if <$fh> == $$; 3910 unlink $PIDFILE if <$fh> == $$;
3630} 3911}
3650 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3931 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3651 for my $name (keys %$leaf_symtab) { 3932 for my $name (keys %$leaf_symtab) {
3652 _gv_clear *{"$pkg$name"}; 3933 _gv_clear *{"$pkg$name"};
3653# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3934# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3654 } 3935 }
3655 warn "cleared package $pkg\n";#d#
3656} 3936}
3657 3937
3658sub do_reload_perl() { 3938sub do_reload_perl() {
3659 # can/must only be called in main 3939 # can/must only be called in main
3660 if ($Coro::current != $Coro::main) { 3940 unless (in_main) {
3661 warn "can only reload from main coroutine"; 3941 error "can only reload from main coroutine";
3662 return; 3942 return;
3663 } 3943 }
3664 3944
3665 return if $RELOAD++; 3945 return if $RELOAD++;
3666 3946
3667 my $t1 = EV::time; 3947 my $t1 = AE::time;
3668 3948
3669 while ($RELOAD) { 3949 while ($RELOAD) {
3670 warn "reloading..."; 3950 cf::get_slot 0.1, -1, "reload_perl";
3951 info "perl_reload: reloading...";
3671 3952
3672 warn "entering sync_job"; 3953 trace "perl_reload: entering sync_job";
3673 3954
3674 cf::sync_job { 3955 cf::sync_job {
3675 cf::write_runtime_sync; # external watchdog should not bark
3676 cf::emergency_save; 3956 #cf::emergency_save;
3677 cf::write_runtime_sync; # external watchdog should not bark
3678 3957
3679 warn "syncing database to disk";
3680 BDB::db_env_txn_checkpoint $DB_ENV;
3681
3682 # if anything goes wrong in here, we should simply crash as we already saved
3683
3684 warn "flushing outstanding aio requests";
3685 while (IO::AIO::nreqs || BDB::nreqs) {
3686 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3687 }
3688
3689 warn "cancelling all extension coros"; 3958 trace "perl_reload: cancelling all extension coros";
3690 $_->cancel for values %EXT_CORO; 3959 $_->cancel for values %EXT_CORO;
3691 %EXT_CORO = (); 3960 %EXT_CORO = ();
3692 3961
3693 warn "removing commands"; 3962 trace "perl_reload: removing commands";
3694 %COMMAND = (); 3963 %COMMAND = ();
3695 3964
3696 warn "removing ext/exti commands"; 3965 trace "perl_reload: removing ext/exti commands";
3697 %EXTCMD = (); 3966 %EXTCMD = ();
3698 %EXTICMD = (); 3967 %EXTICMD = ();
3699 3968
3700 warn "unloading/nuking all extensions"; 3969 trace "perl_reload: unloading/nuking all extensions";
3701 for my $pkg (@EXTS) { 3970 for my $pkg (@EXTS) {
3702 warn "... unloading $pkg"; 3971 trace "... unloading $pkg";
3703 3972
3704 if (my $cb = $pkg->can ("unload")) { 3973 if (my $cb = $pkg->can ("unload")) {
3705 eval { 3974 eval {
3706 $cb->($pkg); 3975 $cb->($pkg);
3707 1 3976 1
3708 } or warn "$pkg unloaded, but with errors: $@"; 3977 } or error "$pkg unloaded, but with errors: $@";
3709 } 3978 }
3710 3979
3711 warn "... clearing $pkg"; 3980 trace "... clearing $pkg";
3712 clear_package $pkg; 3981 clear_package $pkg;
3713 } 3982 }
3714 3983
3715 warn "unloading all perl modules loaded from $LIBDIR"; 3984 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3716 while (my ($k, $v) = each %INC) { 3985 while (my ($k, $v) = each %INC) {
3717 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3986 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3718 3987
3719 warn "... unloading $k"; 3988 trace "... unloading $k";
3720 delete $INC{$k}; 3989 delete $INC{$k};
3721 3990
3722 $k =~ s/\.pm$//; 3991 $k =~ s/\.pm$//;
3723 $k =~ s/\//::/g; 3992 $k =~ s/\//::/g;
3724 3993
3727 } 3996 }
3728 3997
3729 clear_package $k; 3998 clear_package $k;
3730 } 3999 }
3731 4000
3732 warn "getting rid of safe::, as good as possible"; 4001 trace "perl_reload: getting rid of safe::, as good as possible";
3733 clear_package "safe::$_" 4002 clear_package "safe::$_"
3734 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4003 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3735 4004
3736 warn "unloading cf.pm \"a bit\""; 4005 trace "perl_reload: unloading cf.pm \"a bit\"";
3737 delete $INC{"cf.pm"}; 4006 delete $INC{"cf.pm"};
3738 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4007 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3739 4008
3740 # don't, removes xs symbols, too, 4009 # don't, removes xs symbols, too,
3741 # and global variables created in xs 4010 # and global variables created in xs
3742 #clear_package __PACKAGE__; 4011 #clear_package __PACKAGE__;
3743 4012
3744 warn "unload completed, starting to reload now"; 4013 info "perl_reload: unload completed, starting to reload now";
3745 4014
3746 warn "reloading cf.pm"; 4015 trace "perl_reload: reloading cf.pm";
3747 require cf; 4016 require cf;
3748 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4017 cf::_connect_to_perl_1;
3749 4018
3750 warn "loading config and database again"; 4019 trace "perl_reload: loading config and database again";
3751 cf::reload_config; 4020 cf::reload_config;
3752 4021
3753 warn "loading extensions"; 4022 trace "perl_reload: loading extensions";
3754 cf::load_extensions; 4023 cf::load_extensions;
3755 4024
3756 if ($REATTACH_ON_RELOAD) { 4025 if ($REATTACH_ON_RELOAD) {
3757 warn "reattaching attachments to objects/players"; 4026 trace "perl_reload: reattaching attachments to objects/players";
3758 _global_reattach; # objects, sockets 4027 _global_reattach; # objects, sockets
3759 warn "reattaching attachments to maps"; 4028 trace "perl_reload: reattaching attachments to maps";
3760 reattach $_ for values %MAP; 4029 reattach $_ for values %MAP;
3761 warn "reattaching attachments to players"; 4030 trace "perl_reload: reattaching attachments to players";
3762 reattach $_ for values %PLAYER; 4031 reattach $_ for values %PLAYER;
3763 } 4032 }
3764 4033
3765 warn "running post_init jobs"; 4034 cf::_post_init 1;
3766 (pop @POST_INIT)->(1) while @POST_INIT;
3767 4035
3768 warn "leaving sync_job"; 4036 trace "perl_reload: leaving sync_job";
3769 4037
3770 1 4038 1
3771 } or do { 4039 } or do {
3772 warn $@; 4040 error $@;
3773 cf::cleanup "error while reloading, exiting."; 4041 cf::cleanup "perl_reload: error, exiting.";
3774 }; 4042 };
3775 4043
3776 warn "reloaded";
3777 --$RELOAD; 4044 --$RELOAD;
3778 } 4045 }
3779 4046
3780 $t1 = EV::time - $t1; 4047 $t1 = AE::time - $t1;
3781 warn "reload completed in ${t1}s\n"; 4048 info "perl_reload: completed in ${t1}s\n";
3782}; 4049};
3783 4050
3784our $RELOAD_WATCHER; # used only during reload 4051our $RELOAD_WATCHER; # used only during reload
3785 4052
3786sub reload_perl() { 4053sub reload_perl() {
3788 # coro crashes during coro_state_free->destroy here. 4055 # coro crashes during coro_state_free->destroy here.
3789 4056
3790 $RELOAD_WATCHER ||= cf::async { 4057 $RELOAD_WATCHER ||= cf::async {
3791 Coro::AIO::aio_wait cache_extensions; 4058 Coro::AIO::aio_wait cache_extensions;
3792 4059
3793 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4060 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3794 do_reload_perl; 4061 do_reload_perl;
3795 undef $RELOAD_WATCHER; 4062 undef $RELOAD_WATCHER;
3796 }; 4063 };
3797 }; 4064 };
3798} 4065}
3807 reload_perl; 4074 reload_perl;
3808 }; 4075 };
3809 } 4076 }
3810}; 4077};
3811 4078
3812unshift @INC, $LIBDIR; 4079#############################################################################
3813 4080
3814my $bug_warning = 0; 4081my $bug_warning = 0;
3815 4082
3816our @WAIT_FOR_TICK;
3817our @WAIT_FOR_TICK_BEGIN;
3818
3819sub wait_for_tick { 4083sub wait_for_tick() {
3820 return if tick_inhibit || $Coro::current == $Coro::main; 4084 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3821 4085
3822 my $signal = new Coro::Signal; 4086 $WAIT_FOR_TICK->wait;
3823 push @WAIT_FOR_TICK, $signal;
3824 $signal->wait;
3825} 4087}
3826 4088
3827sub wait_for_tick_begin { 4089sub wait_for_tick_begin() {
3828 return if tick_inhibit || $Coro::current == $Coro::main; 4090 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3829 4091
3830 my $signal = new Coro::Signal; 4092 my $signal = new Coro::Signal;
3831 push @WAIT_FOR_TICK_BEGIN, $signal; 4093 push @WAIT_FOR_TICK_BEGIN, $signal;
3832 $signal->wait; 4094 $signal->wait;
3833} 4095}
3837 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4099 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3838 unless ++$bug_warning > 10; 4100 unless ++$bug_warning > 10;
3839 return; 4101 return;
3840 } 4102 }
3841 4103
3842 cf::server_tick; # one server iteration 4104 cf::one_tick; # one server iteration
4105
4106 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3843 4107
3844 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4108 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3845 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4109 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3846 Coro::async_pool { 4110 Coro::async_pool {
3847 $Coro::current->{desc} = "runtime saver"; 4111 $Coro::current->{desc} = "runtime saver";
3848 write_runtime_sync 4112 write_runtime_sync
3849 or warn "ERROR: unable to write runtime file: $!"; 4113 or error "ERROR: unable to write runtime file: $!";
3850 }; 4114 };
3851 } 4115 }
3852 4116
3853 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4117 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3854 $sig->send; 4118 $sig->send;
3855 } 4119 }
3856 while (my $sig = shift @WAIT_FOR_TICK) { 4120 $WAIT_FOR_TICK->broadcast;
3857 $sig->send;
3858 }
3859 4121
3860 $LOAD = ($NOW - $TICK_START) / $TICK; 4122 $LOAD = ($NOW - $TICK_START) / $TICK;
3861 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4123 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3862 4124
3863 if (0) { 4125 if (0) {
3864 if ($NEXT_TICK) { 4126 if ($NEXT_TICK) {
3865 my $jitter = $TICK_START - $NEXT_TICK; 4127 my $jitter = $TICK_START - $NEXT_TICK;
3866 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4128 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3867 warn "jitter $JITTER\n";#d# 4129 debug "jitter $JITTER\n";#d#
3868 } 4130 }
3869 } 4131 }
3870} 4132}
3871 4133
3872{ 4134{
3873 # configure BDB 4135 # configure BDB
3874 4136
3875 BDB::min_parallel 8; 4137 BDB::min_parallel 16;
3876 BDB::max_poll_reqs $TICK * 0.1; 4138 BDB::max_poll_reqs $TICK * 0.1;
3877 $AnyEvent::BDB::WATCHER->priority (1); 4139 #$AnyEvent::BDB::WATCHER->priority (1);
3878 4140
3879 unless ($DB_ENV) { 4141 unless ($DB_ENV) {
3880 $DB_ENV = BDB::db_env_create; 4142 $DB_ENV = BDB::db_env_create;
3881 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4143 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3882 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4144 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3917 IO::AIO::min_parallel 8; 4179 IO::AIO::min_parallel 8;
3918 IO::AIO::max_poll_time $TICK * 0.1; 4180 IO::AIO::max_poll_time $TICK * 0.1;
3919 undef $AnyEvent::AIO::WATCHER; 4181 undef $AnyEvent::AIO::WATCHER;
3920} 4182}
3921 4183
3922my $_log_backtrace; 4184our $_log_backtrace;
4185our $_log_backtrace_last;
3923 4186
3924sub _log_backtrace { 4187sub _log_backtrace {
3925 my ($msg, @addr) = @_; 4188 my ($msg, @addr) = @_;
3926 4189
3927 $msg =~ s/\n//; 4190 $msg =~ s/\n$//;
3928 4191
4192 if ($_log_backtrace_last eq $msg) {
4193 LOG llevInfo, "[ABT] $msg\n";
4194 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3929 # limit the # of concurrent backtraces 4195 # limit the # of concurrent backtraces
3930 if ($_log_backtrace < 2) { 4196 } elsif ($_log_backtrace < 2) {
4197 $_log_backtrace_last = $msg;
3931 ++$_log_backtrace; 4198 ++$_log_backtrace;
3932 my $perl_bt = Carp::longmess $msg; 4199 my $perl_bt = Carp::longmess $msg;
3933 async { 4200 async {
3934 $Coro::current->{desc} = "abt $msg"; 4201 $Coro::current->{desc} = "abt $msg";
3935 4202
3955 LOG llevInfo, "[ABT] $_\n" for @bt; 4222 LOG llevInfo, "[ABT] $_\n" for @bt;
3956 --$_log_backtrace; 4223 --$_log_backtrace;
3957 }; 4224 };
3958 } else { 4225 } else {
3959 LOG llevInfo, "[ABT] $msg\n"; 4226 LOG llevInfo, "[ABT] $msg\n";
3960 LOG llevInfo, "[ABT] [suppressed]\n"; 4227 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3961 } 4228 }
3962} 4229}
3963 4230
3964# load additional modules 4231# load additional modules
3965require "cf/$_.pm" for @EXTRA_MODULES; 4232require "cf/$_.pm" for @EXTRA_MODULES;
4233cf::_connect_to_perl_2;
3966 4234
3967END { cf::emergency_save } 4235END { cf::emergency_save }
3968 4236
39691 42371
3970 4238

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines