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.477 by root, Wed Sep 2 22:52:36 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
286
287sub error(@) { LOG llevError, join "", @_ }
288sub warn (@) { LOG llevWarn , join "", @_ }
289sub info (@) { LOG llevInfo , join "", @_ }
290sub debug(@) { LOG llevDebug, join "", @_ }
291sub trace(@) { LOG llevTrace, join "", @_ }
226 292
227$Coro::State::WARNHOOK = sub { 293$Coro::State::WARNHOOK = sub {
228 my $msg = join "", @_; 294 my $msg = join "", @_;
229 295
230 $msg .= "\n" 296 $msg .= "\n"
231 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
232 298
233 $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;
234 300
235 LOG llevError, $msg; 301 LOG llevWarn, $msg;
236}; 302};
237 303
238$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
239 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
240 306
241 warn Carp::longmess $_[0]; 307 error Carp::longmess $_[0];
242 308
243 if ($Coro::current == $Coro::main) {#d# 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 Coro::terminate 315 Coro::terminate
269)) { 335)) {
270 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
271} 337}
272 338
273$EV::DIED = sub { 339$EV::DIED = sub {
274 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
275}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
276 347
277############################################################################# 348#############################################################################
278 349
279=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
280 351
301 $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;
302 $d 373 $d
303 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
304} 375}
305 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
306=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
307 392
308Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
309 394
310=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
316our $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
317 402
318sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
319sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
320 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
321=item cf::post_init { BLOCK } 437=item cf::post_init { BLOCK }
322 438
323Execute the given codeblock, I<after> all extensions have been (re-)loaded, 439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
324but I<before> the server starts ticking again. 440but I<before> the server starts ticking again.
325 441
326The cdoeblock will have a single boolean argument to indicate whether this 442The codeblock will have a single boolean argument to indicate whether this
327is a reload or not. 443is a reload or not.
328 444
329=cut 445=cut
330 446
331sub post_init(&) { 447sub post_init(&) {
332 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 }
333} 466}
334 467
335=item cf::lock_wait $string 468=item cf::lock_wait $string
336 469
337Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
376} 509}
377 510
378=item cf::periodic $interval, $cb 511=item cf::periodic $interval, $cb
379 512
380Like 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
381get spread over timer. 514get spread over time.
382 515
383=cut 516=cut
384 517
385sub periodic($$) { 518sub periodic($$) {
386 my ($interval, $cb) = @_; 519 my ($interval, $cb) = @_;
390 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
391} 524}
392 525
393=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
394 527
395Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
396This 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
397of 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.
398 535
399The 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
400used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
401 538
402Useful for short background jobs. 539Useful for short background jobs.
403 540
404=cut 541=cut
405 542
406our @SLOT_QUEUE; 543our @SLOT_QUEUE;
407our $SLOT_QUEUE; 544our $SLOT_QUEUE;
545our $SLOT_DECAY = 0.9;
408 546
409$SLOT_QUEUE->cancel if $SLOT_QUEUE; 547$SLOT_QUEUE->cancel if $SLOT_QUEUE;
410$SLOT_QUEUE = Coro::async { 548$SLOT_QUEUE = Coro::async {
411 $Coro::current->desc ("timeslot manager"); 549 $Coro::current->desc ("timeslot manager");
412 550
413 my $signal = new Coro::Signal; 551 my $signal = new Coro::Signal;
552 my $busy;
414 553
415 while () { 554 while () {
416 next_job: 555 next_job:
556
417 my $avail = cf::till_tick; 557 my $avail = cf::till_tick;
418 if ($avail > 0.01) { 558
419 for (0 .. $#SLOT_QUEUE) { 559 for (0 .. $#SLOT_QUEUE) {
420 if ($SLOT_QUEUE[$_][0] < $avail) { 560 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0;
421 my $job = splice @SLOT_QUEUE, $_, 1, (); 562 my $job = splice @SLOT_QUEUE, $_, 1, ();
422 $job->[2]->send; 563 $job->[2]->send;
423 Coro::cede; 564 Coro::cede;
424 goto next_job; 565 goto next_job;
425 } 566 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
426 } 568 }
427 } 569 }
428 570
429 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
430 # 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
431 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
432 $signal->wait;
433 } else { 574 } else {
575 $busy = 0;
434 Coro::schedule; 576 Coro::schedule;
435 } 577 }
436 } 578 }
437}; 579};
438 580
439sub get_slot($;$$) { 581sub get_slot($;$$) {
440 return if tick_inhibit || $Coro::current == $Coro::main; 582 return if tick_inhibit || $Coro::current == $Coro::main;
441 583
442 my ($time, $pri, $name) = @_; 584 my ($time, $pri, $name) = @_;
443 585
444 $time = $TICK * .6 if $time > $TICK * .6; 586 $time = clamp $time, 0.01, $TICK * .6;
587
445 my $sig = new Coro::Signal; 588 my $sig = new Coro::Signal;
446 589
447 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
448 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
449 $SLOT_QUEUE->ready; 592 $SLOT_QUEUE->ready;
475=cut 618=cut
476 619
477sub sync_job(&) { 620sub sync_job(&) {
478 my ($job) = @_; 621 my ($job) = @_;
479 622
480 if ($Coro::current == $Coro::main) { 623 if (in_main) {
481 my $time = EV::time; 624 my $time = AE::time;
482 625
483 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
484 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
485 628
486 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
487 630
488 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
489 632
490 my $busy = 1; 633 my $busy = 1;
491 my @res; 634 my @res;
492 635
493 (async { 636 (async {
494 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
495 @res = eval { $job->() }; 638 @res = eval { $job->() };
496 warn $@ if $@; 639 error $@ if $@;
497 undef $busy; 640 undef $busy;
498 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
499 642
500 while ($busy) { 643 while ($busy) {
501 if (Coro::nready) { 644 if (Coro::nready) {
503 } else { 646 } else {
504 EV::loop EV::LOOP_ONESHOT; 647 EV::loop EV::LOOP_ONESHOT;
505 } 648 }
506 } 649 }
507 650
508 my $time = EV::time - $time; 651 my $time = AE::time - $time;
509 652
510 $TICK_START += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
511 654
512 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
513 } else { 656 } else {
535 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
536 679
537 $coro 680 $coro
538} 681}
539 682
540=item fork_call { }, $args 683=item fork_call { }, @args
541 684
542Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
543process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
544Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
545never block itself or use any form of event handling. 688never block itself or use any form of event handling.
546 689
547=cut 690=cut
548 691
692sub post_fork {
693 reset_signals;
694}
695
549sub fork_call(&@) { 696sub fork_call(&@) {
550 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
551 698
552 # 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,
553 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
554 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
555 702
556 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
557 reset_signals; 704 cf::post_fork;
558 &$cb 705 &$cb
559 }, @args; 706 } @args;
560 707
561 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 )
562} 720}
563 721
564=item $coin = coin_from_name $name 722=item $coin = coin_from_name $name
565 723
566=cut 724=cut
603within each server. 761within each server.
604 762
605=cut 763=cut
606 764
607sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
608 my ($name) = @_; 769 my ($name) = @_;
609 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
610 771
611 eval { 772 eval {
612 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
622} 783}
623 784
624our $DB; 785our $DB;
625 786
626sub db_init { 787sub db_init {
627 cf::sync_job {
628 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
629 };
630} 789}
631 790
632sub db_get($$) { 791sub db_get($$) {
633 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
634 793
635 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
636 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
637 798
638 $! ? () 799 $! ? ()
639 : $data 800 : $data
640 }
641} 801}
642 802
643sub db_put($$$) { 803sub db_put($$$) {
644 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
645 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
673 833
674 my @data; 834 my @data;
675 my $md5; 835 my $md5;
676 836
677 for (0 .. $#$src) { 837 for (0 .. $#$src) {
678 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
679 or Carp::croak "$src->[$_]: $!";
680 } 839 }
681 840
682 # if processing is expensive, check 841 # if processing is expensive, check
683 # checksum first 842 # checksum first
684 if (1) { 843 if (1) {
701 860
702 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
703 my $data = $process->(\@data); 862 my $data = $process->(\@data);
704 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
705 864
706 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
707 866
708 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
709 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
710 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
711 870
721 880
722=cut 881=cut
723 882
724sub datalog($@) { 883sub datalog($@) {
725 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
726 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
727} 886}
728 887
729=back 888=back
730 889
731=cut 890=cut
926 1085
927 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
928 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
929 1088
930 } elsif (ref $type) { 1089 } elsif (ref $type) {
931 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
932 1091
933 } else { 1092 } else {
934 shift @arg; 1093 shift @arg;
935 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
936 } 1095 }
937 } 1096 }
938} 1097}
939 1098
940sub _object_attach { 1099sub _object_attach {
950 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
951 } 1110 }
952 1111
953 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
954 } else { 1113 } else {
955 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
956 } 1115 }
957 1116
958 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
959} 1118}
960 1119
1019 1178
1020 for (@$callbacks) { 1179 for (@$callbacks) {
1021 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
1022 1181
1023 if ($@) { 1182 if ($@) {
1024 warn "$@";
1025 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1026 override; 1184 override;
1027 } 1185 }
1028 1186
1029 return 1 if $override; 1187 return 1 if $override;
1030 } 1188 }
1109 for (@$attach) { 1267 for (@$attach) {
1110 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1111 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1112 } 1270 }
1113 } else { 1271 } else {
1114 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1115 } 1273 }
1116 } 1274 }
1117} 1275}
1118 1276
1119cf::attachable->attach ( 1277cf::attachable->attach (
1146 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1147 1305
1148 sync_job { 1306 sync_job {
1149 if (length $$rdata) { 1307 if (length $$rdata) {
1150 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1151 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1152 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1153 1312
1154 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1155 aio_chmod $fh, SAVE_MODE; 1314 aio_chmod $fh, SAVE_MODE;
1156 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1157 if ($cf::USE_FSYNC) { 1316 if ($cf::USE_FSYNC) {
1179 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1180 1339
1181 $filename =~ s%/[^/]+$%%; 1340 $filename =~ s%/[^/]+$%%;
1182 aio_pathsync $filename if $cf::USE_FSYNC; 1341 aio_pathsync $filename if $cf::USE_FSYNC;
1183 } else { 1342 } else {
1184 warn "unable to save objects: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1185 } 1344 }
1186 } else { 1345 } else {
1187 aio_unlink $filename; 1346 aio_unlink $filename;
1188 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1189 } 1348 }
1213 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1214 $av = $st->{objs}; 1373 $av = $st->{objs};
1215 } 1374 }
1216 1375
1217 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1218 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1219 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1220 1380
1221 ($data, $av) 1381 ($data, $av)
1222} 1382}
1223 1383
1224=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1283} 1443}
1284 1444
1285use File::Glob (); 1445use File::Glob ();
1286 1446
1287cf::player->attach ( 1447cf::player->attach (
1288 on_command => sub { 1448 on_unknown_command => sub {
1289 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1290 1450
1291 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1292 or return; 1452 or return;
1293 1453
1301 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1302 1462
1303 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1304 1464
1305 if (ref $msg) { 1465 if (ref $msg) {
1306 my ($type, $reply, @payload) = 1466 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1307 "ARRAY" eq ref $msg
1308 ? @$msg
1309 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1310 1467
1311 my @reply; 1468 my @reply;
1312 1469
1313 if (my $cb = $EXTCMD{$type}) { 1470 if (my $cb = $EXTCMD{$type}) {
1314 @reply = $cb->($pl, @payload); 1471 @reply = $cb->($pl, @payload);
1316 1473
1317 $pl->ext_reply ($reply, @reply) 1474 $pl->ext_reply ($reply, @reply)
1318 if $reply; 1475 if $reply;
1319 1476
1320 } else { 1477 } else {
1321 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1478 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1322 } 1479 }
1323 1480
1324 cf::override; 1481 cf::override;
1325 }, 1482 },
1326); 1483);
1337 1494
1338 $grp 1495 $grp
1339} 1496}
1340 1497
1341sub load_extensions { 1498sub load_extensions {
1499 info "loading extensions...";
1500
1342 cf::sync_job { 1501 cf::sync_job {
1343 my %todo; 1502 my %todo;
1344 1503
1345 for my $path (<$LIBDIR/*.ext>) { 1504 for my $path (<$LIBDIR/*.ext>) {
1346 next unless -r $path; 1505 next unless -r $path;
1364 1523
1365 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1524 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1366 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1525 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1367 1526
1368 $ext{source} = 1527 $ext{source} =
1369 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1528 "package $pkg; use common::sense;\n"
1370 . "#line 1 \"$path\"\n{\n" 1529 . "#line 1 \"$path\"\n{\n"
1371 . $source 1530 . $source
1372 . "\n};\n1"; 1531 . "\n};\n1";
1373 1532
1374 $todo{$base} = \%ext; 1533 $todo{$base} = \%ext;
1375 } 1534 }
1376 1535
1536 my $pass = 0;
1377 my %done; 1537 my %done;
1378 while (%todo) { 1538 while (%todo) {
1379 my $progress; 1539 my $progress;
1380 1540
1541 ++$pass;
1542
1543 ext:
1381 while (my ($k, $v) = each %todo) { 1544 while (my ($k, $v) = each %todo) {
1382 for (split /,\s*/, $v->{meta}{depends}) { 1545 for (split /,\s*/, $v->{meta}{depends}) {
1383 goto skip 1546 next ext
1384 unless exists $done{$_}; 1547 unless exists $done{$_};
1385 } 1548 }
1386 1549
1387 warn "... loading '$k' into '$v->{pkg}'\n"; 1550 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1388 1551
1389 unless (eval $v->{source}) { 1552 my $active = eval $v->{source};
1553
1554 if (length $@) {
1390 my $msg = $@ ? "$v->{path}: $@\n" 1555 error "$v->{path}: $@\n";
1391 : "$v->{base}: extension inactive.\n";
1392 1556
1393 if (exists $v->{meta}{mandatory}) {
1394 warn $msg;
1395 cf::cleanup "mandatory extension failed to load, exiting."; 1557 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1396 } 1558 if exists $v->{meta}{mandatory};
1397 1559
1398 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;
1399 } 1569 }
1400
1401 $done{$k} = delete $todo{$k};
1402 push @EXTS, $v->{pkg};
1403 $progress = 1;
1404 } 1570 }
1405 1571
1406 skip: 1572 unless ($progress) {
1407 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1573 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1408 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 }
1409 } 1582 }
1410 }; 1583 };
1411} 1584}
1412 1585
1413############################################################################# 1586#############################################################################
1497 $cf::PLAYER{$login} = $pl 1670 $cf::PLAYER{$login} = $pl
1498 } 1671 }
1499 } 1672 }
1500} 1673}
1501 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
1502sub save($) { 1688sub save($) {
1503 my ($pl) = @_; 1689 my ($pl) = @_;
1504 1690
1505 return if $pl->{deny_save}; 1691 return if $pl->{deny_save};
1506 1692
1511 1697
1512 aio_mkdir playerdir $pl, 0770; 1698 aio_mkdir playerdir $pl, 0770;
1513 $pl->{last_save} = $cf::RUNTIME; 1699 $pl->{last_save} = $cf::RUNTIME;
1514 1700
1515 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];
1516 1705
1517 $pl->save_pl ($path); 1706 $pl->save_pl ($path);
1518 cf::cede_to_tick; 1707 cf::cede_to_tick;
1519} 1708}
1520 1709
1554 my $name = $pl->ob->name; 1743 my $name = $pl->ob->name;
1555 1744
1556 $pl->{deny_save} = 1; 1745 $pl->{deny_save} = 1;
1557 $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
1558 1747
1559 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1748 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1560 $pl->deactivate; 1749 $pl->deactivate;
1750
1561 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;
1562 $pl->ob->check_score;
1563 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1752 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1753 ext::highscore::check ($pl->ob);
1754
1564 $pl->ns->destroy if $pl->ns; 1755 $pl->ns->destroy if $pl->ns;
1565 1756
1566 my $path = playerdir $pl; 1757 my $path = playerdir $pl;
1567 my $temp = "$path~$cf::RUNTIME~deleting~"; 1758 my $temp = "$path~$cf::RUNTIME~deleting~";
1568 aio_rename $path, $temp; 1759 aio_rename $path, $temp;
1622 \@logins 1813 \@logins
1623} 1814}
1624 1815
1625=item $player->maps 1816=item $player->maps
1626 1817
1818=item cf::player::maps $login
1819
1627Returns an arrayref of map paths that are private for this 1820Returns an arrayref of map paths that are private for this
1628player. May block. 1821player. May block.
1629 1822
1630=cut 1823=cut
1631 1824
1693=cut 1886=cut
1694 1887
1695sub find_by_path($) { 1888sub find_by_path($) {
1696 my ($path) = @_; 1889 my ($path) = @_;
1697 1890
1891 $path =~ s/^~[^\/]*//; # skip ~login
1892
1698 my ($match, $specificity); 1893 my ($match, $specificity);
1699 1894
1700 for my $region (list) { 1895 for my $region (list) {
1701 if ($region->{match} && $path =~ $region->{match}) { 1896 if ($region->{match} && $path =~ $region->{match}) {
1702 ($match, $specificity) = ($region, $region->specificity) 1897 ($match, $specificity) = ($region, $region->specificity)
1730sub generate_random_map { 1925sub generate_random_map {
1731 my ($self, $rmp) = @_; 1926 my ($self, $rmp) = @_;
1732 1927
1733 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
1734 1929
1735 # mit "rum" bekleckern, nicht
1736 $self->_create_random_map ( 1930 $self->_create_random_map ($rmp);
1737 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1738 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1739 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1740 $rmp->{exit_on_final_map},
1741 $rmp->{xsize}, $rmp->{ysize},
1742 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1743 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1744 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1745 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1746 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1747 (cf::region::find $rmp->{region}), $rmp->{custom}
1748 )
1749} 1931}
1750 1932
1751=item cf::map->register ($regex, $prio) 1933=item cf::map->register ($regex, $prio)
1752 1934
1753Register 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
1758 1940
1759sub register { 1941sub register {
1760 my (undef, $regex, $prio) = @_; 1942 my (undef, $regex, $prio) = @_;
1761 my $pkg = caller; 1943 my $pkg = caller;
1762 1944
1763 no strict;
1764 push @{"$pkg\::ISA"}, __PACKAGE__; 1945 push @{"$pkg\::ISA"}, __PACKAGE__;
1765 1946
1766 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1947 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1767} 1948}
1768 1949
1769# also paths starting with '/' 1950# also paths starting with '/'
1770$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1951$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1771 1952
1772sub thawer_merge { 1953sub thawer_merge {
1773 my ($self, $merge) = @_; 1954 my ($self, $merge) = @_;
1774 1955
1775 # we have to keep some variables in memory intact 1956 # we have to keep some variables in memory intact
1780} 1961}
1781 1962
1782sub normalise { 1963sub normalise {
1783 my ($path, $base) = @_; 1964 my ($path, $base) = @_;
1784 1965
1785 $path = "$path"; # make sure its a string 1966 $path = "$path"; # make sure it's a string
1786 1967
1787 $path =~ s/\.map$//; 1968 $path =~ s/\.map$//;
1788 1969
1789 # map plan: 1970 # map plan:
1790 # 1971 #
1805 $base =~ s{[^/]+/?$}{}; 1986 $base =~ s{[^/]+/?$}{};
1806 $path = "$base/$path"; 1987 $path = "$base/$path";
1807 } 1988 }
1808 1989
1809 for ($path) { 1990 for ($path) {
1810 redo if s{//}{/};
1811 redo if s{/\.?/}{/}; 1991 redo if s{/\.?/}{/};
1812 redo if s{/[^/]+/\.\./}{/}; 1992 redo if s{/[^/]+/\.\./}{/};
1813 } 1993 }
1814 1994
1815 $path 1995 $path
1829 $self->init; # pass $1 etc. 2009 $self->init; # pass $1 etc.
1830 return $self; 2010 return $self;
1831 } 2011 }
1832 } 2012 }
1833 2013
1834 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2014 Carp::cluck "unable to resolve path '$path' (base '$base')";
1835 () 2015 ()
1836} 2016}
1837 2017
2018# may re-bless or do other evil things
1838sub init { 2019sub init {
1839 my ($self) = @_; 2020 my ($self) = @_;
1840 2021
1841 $self 2022 $self
1842} 2023}
1907 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
1908 2089
1909 1 2090 1
1910} 2091}
1911 2092
2093# used to laod the header of an original map
1912sub load_header_orig { 2094sub load_header_orig {
1913 my ($self) = @_; 2095 my ($self) = @_;
1914 2096
1915 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
1916} 2098}
1917 2099
2100# used to laod the header of an instantiated map
1918sub load_header_temp { 2101sub load_header_temp {
1919 my ($self) = @_; 2102 my ($self) = @_;
1920 2103
1921 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
1922} 2105}
1923 2106
2107# called after loading the header from an instantiated map
1924sub prepare_temp { 2108sub prepare_temp {
1925 my ($self) = @_; 2109 my ($self) = @_;
1926 2110
1927 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
1928 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
1929 # safety 2113 # safety
1930 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
1931 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
1932} 2116}
1933 2117
2118# called after loading the header from an original map
1934sub prepare_orig { 2119sub prepare_orig {
1935 my ($self) = @_; 2120 my ($self) = @_;
1936 2121
1937 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
1938 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
1962 2147
1963sub find; 2148sub find;
1964sub find { 2149sub find {
1965 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
1966 2151
2152 cf::cede_to_tick;
2153
1967 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
1968 2155
1969 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1970 my $guard2 = cf::lock_acquire "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
1971 2158
1972 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
1989 2176
1990 $cf::MAP{$path} = $map 2177 $cf::MAP{$path} = $map
1991 } 2178 }
1992} 2179}
1993 2180
1994sub pre_load { } 2181sub pre_load { }
1995sub post_load { } 2182#sub post_load { } # XS
1996 2183
1997sub load { 2184sub load {
1998 my ($self) = @_; 2185 my ($self) = @_;
1999 2186
2000 local $self->{deny_reset} = 1; # loading can take a long time 2187 local $self->{deny_reset} = 1; # loading can take a long time
2003 2190
2004 { 2191 {
2005 my $guard = cf::lock_acquire "map_data:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
2006 2193
2007 return unless $self->valid; 2194 return unless $self->valid;
2008 return unless $self->in_memory == cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
2009
2010 $self->in_memory (cf::MAP_LOADING);
2011 2196
2012 $self->alloc; 2197 $self->alloc;
2013 2198
2014 $self->pre_load; 2199 $self->pre_load;
2015 cf::cede_to_tick; 2200 cf::cede_to_tick;
2016 2201
2202 if (exists $self->{load_path}) {
2017 my $f = new_from_file cf::object::thawer $self->{load_path}; 2203 my $f = new_from_file cf::object::thawer $self->{load_path};
2018 $f->skip_block; 2204 $f->skip_block;
2019 $self->_load_objects ($f) 2205 $self->_load_objects ($f)
2020 or return; 2206 or return;
2021 2207
2022 $self->post_load_original 2208 $self->post_load_original
2023 if delete $self->{load_original}; 2209 if delete $self->{load_original};
2024 2210
2025 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
2026 utf8::encode $uniq; 2212 utf8::encode $uniq;
2027 unless (aio_stat $uniq) { 2213 unless (aio_stat $uniq) {
2028 if (my $f = new_from_file cf::object::thawer $uniq) { 2214 if (my $f = new_from_file cf::object::thawer $uniq) {
2029 $self->clear_unique_items; 2215 $self->clear_unique_items;
2030 $self->_load_objects ($f); 2216 $self->_load_objects ($f);
2031 $f->resolve_delayed_derefs; 2217 $f->resolve_delayed_derefs;
2218 }
2032 } 2219 }
2033 } 2220 }
2034 }
2035 2221
2036 $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);
2037 2229
2038 cf::cede_to_tick; 2230 cf::cede_to_tick;
2039 # now do the right thing for maps 2231 # now do the right thing for maps
2040 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
2041 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
2045 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
2046 $self->decay_objects; 2238 $self->decay_objects;
2047 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
2048 $self->update_buttons; 2240 $self->update_buttons;
2049 cf::cede_to_tick; 2241 cf::cede_to_tick;
2050 $self->activate; 2242 #$self->activate; # no longer activate maps automatically
2051 } 2243 }
2052 2244
2053 $self->{last_save} = $cf::RUNTIME; 2245 $self->{last_save} = $cf::RUNTIME;
2054 $self->last_access ($cf::RUNTIME); 2246 $self->last_access ($cf::RUNTIME);
2055
2056 $self->in_memory (cf::MAP_ACTIVE);
2057 } 2247 }
2058 2248
2059 $self->post_load; 2249 $self->post_load;
2060}
2061 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
2062sub customise_for { 2257sub customise_for {
2063 my ($self, $ob) = @_; 2258 my ($self, $ob) = @_;
2064 2259
2065 return find "~" . $ob->name . "/" . $self->{path} 2260 return find "~" . $ob->name . "/" . $self->{path}
2066 if $self->per_player; 2261 if $self->per_player;
2069# if $self->per_party; 2264# if $self->per_party;
2070 2265
2071 $self 2266 $self
2072} 2267}
2073 2268
2074# find and load all maps in the 3x3 area around a map
2075sub load_neighbours {
2076 my ($map) = @_;
2077
2078 my @neigh; # diagonal neighbours
2079
2080 for (0 .. 3) {
2081 my $neigh = $map->tile_path ($_)
2082 or next;
2083 $neigh = find $neigh, $map
2084 or next;
2085 $neigh->load;
2086
2087 push @neigh,
2088 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2089 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2090 }
2091
2092 for (grep defined $_->[0], @neigh) {
2093 my ($path, $origin) = @$_;
2094 my $neigh = find $path, $origin
2095 or next;
2096 $neigh->load;
2097 }
2098}
2099
2100sub find_sync { 2269sub find_sync {
2101 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
2102 2271
2103 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
2104} 2277}
2105 2278
2106sub do_load_sync { 2279sub do_load_sync {
2107 my ($map) = @_; 2280 my ($map) = @_;
2108 2281
2282 # it's a bug to call this from the main context
2109 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2110 if $Coro::current == $Coro::main; 2284 if $Coro::current == $Coro::main;
2111 2285
2112 cf::sync_job { $map->load }; 2286 $map->load;
2113} 2287}
2114 2288
2115our %MAP_PREFETCH; 2289our %MAP_PREFETCH;
2116our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
2117 2291
2118sub find_async { 2292sub find_async {
2119 my ($path, $origin, $load) = @_; 2293 my ($path, $origin, $load) = @_;
2120 2294
2121 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
2122 2296
2123 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
2124 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2298 return $map if !$load || $map->linkable;
2125 } 2299 }
2126 2300
2127 $MAP_PREFETCH{$path} |= $load; 2301 $MAP_PREFETCH{$path} |= $load;
2128 2302
2129 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
2143 $MAP_PREFETCHER->prio (6); 2317 $MAP_PREFETCHER->prio (6);
2144 2318
2145 () 2319 ()
2146} 2320}
2147 2321
2322# common code, used by both ->save and ->swapout
2148sub save { 2323sub _save {
2149 my ($self) = @_; 2324 my ($self) = @_;
2150
2151 my $lock = cf::lock_acquire "map_data:$self->{path}";
2152 2325
2153 $self->{last_save} = $cf::RUNTIME; 2326 $self->{last_save} = $cf::RUNTIME;
2154 2327
2155 return unless $self->dirty; 2328 return unless $self->dirty;
2156 2329
2176 } else { 2349 } else {
2177 $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);
2178 } 2351 }
2179} 2352}
2180 2353
2354sub save {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 $self->_save;
2360}
2361
2181sub swap_out { 2362sub swap_out {
2182 my ($self) = @_; 2363 my ($self) = @_;
2183 2364
2184 # save first because save cedes
2185 $self->save;
2186
2187 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2188 2366
2367 return if !$self->linkable;
2368 return if $self->{deny_save};
2189 return if $self->players; 2369 return if $self->players;
2190 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
2191 return if $self->{deny_save}; 2387 return 1e99 if $self->{deny_reset};
2192 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
2193 $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};
2194 2421
2195 $self->deactivate; 2422 $self->deactivate;
2196 $_->clear_links_to ($self) for values %cf::MAP; 2423 $_->clear_links_to ($self) for values %cf::MAP;
2197 $self->clear; 2424 $self->clear;
2198}
2199
2200sub reset_at {
2201 my ($self) = @_;
2202
2203 # TODO: safety, remove and allow resettable per-player maps
2204 return 1e99 if $self->{deny_reset};
2205
2206 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2207 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2208
2209 $time + $to
2210}
2211
2212sub should_reset {
2213 my ($self) = @_;
2214
2215 $self->reset_at <= $cf::RUNTIME
2216}
2217
2218sub reset {
2219 my ($self) = @_;
2220
2221 my $lock = cf::lock_acquire "map_data:$self->{path}";
2222
2223 return if $self->players;
2224
2225 warn "resetting map ", $self->path;
2226
2227 $self->in_memory (cf::MAP_SWAPPED);
2228
2229 # need to save uniques path
2230 unless ($self->{deny_save}) {
2231 my $uniq = $self->uniq_path; utf8::encode $uniq;
2232
2233 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2234 if $uniq;
2235 }
2236
2237 delete $cf::MAP{$self->path};
2238
2239 $self->deactivate;
2240 $_->clear_links_to ($self) for values %cf::MAP;
2241 $self->clear;
2242 2425
2243 $self->unlink_save; 2426 $self->unlink_save;
2244 $self->destroy; 2427 $self->destroy;
2245} 2428}
2246 2429
2254 2437
2255 delete $cf::MAP{$self->path}; 2438 delete $cf::MAP{$self->path};
2256 2439
2257 $self->unlink_save; 2440 $self->unlink_save;
2258 2441
2259 bless $self, "cf::map"; 2442 bless $self, "cf::map::wrap";
2260 delete $self->{deny_reset}; 2443 delete $self->{deny_reset};
2261 $self->{deny_save} = 1; 2444 $self->{deny_save} = 1;
2262 $self->reset_timeout (1); 2445 $self->reset_timeout (1);
2263 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2446 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2264 2447
2321 : normalise $_ 2504 : normalise $_
2322 } @{ aio_readdir $UNIQUEDIR or [] } 2505 } @{ aio_readdir $UNIQUEDIR or [] }
2323 ] 2506 ]
2324} 2507}
2325 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
2326=back 2541=back
2327 2542
2328=head3 cf::object 2543=head3 cf::object
2329 2544
2330=cut 2545=cut
2462 2677
2463Freezes 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}>).
2464 2679
2465The 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.
2466for 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,
2467though, 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
2468map. 2683map.
2469 2684
2470Will never block. 2685Will never block.
2471 2686
2472=item $player_object->leave_link ($map, $x, $y) 2687=item $player_object->leave_link ($map, $x, $y)
2493sub cf::object::player::enter_link { 2708sub cf::object::player::enter_link {
2494 my ($self) = @_; 2709 my ($self) = @_;
2495 2710
2496 $self->deactivate_recursive; 2711 $self->deactivate_recursive;
2497 2712
2713 ++$self->{_link_recursion};
2714
2498 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2715 return if UNIVERSAL::isa $self->map, "ext::map_link";
2499 2716
2500 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2501 if $self->map && $self->map->{path} ne "{link}"; 2718 if $self->map && $self->map->{path} ne "{link}";
2502 2719
2503 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2720 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2504} 2721}
2505 2722
2506sub cf::object::player::leave_link { 2723sub cf::object::player::leave_link {
2507 my ($self, $map, $x, $y) = @_; 2724 my ($self, $map, $x, $y) = @_;
2508 2725
2525 ($x, $y) = (-1, -1) 2742 ($x, $y) = (-1, -1)
2526 unless (defined $x) && (defined $y); 2743 unless (defined $x) && (defined $y);
2527 2744
2528 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2529 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2530 if $x <=0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2531 2748
2532 $map->load; 2749 $map->load;
2533 $map->load_neighbours;
2534 2750
2535 return unless $self->contr->active; 2751 return unless $self->contr->active;
2536 2752
2537 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2538 $self->enter_map ($map, $x, $y); 2754 if ($self->enter_map ($map, $x, $y)) {
2539 2755 # entering was successful
2756 delete $self->{_link_recursion};
2540 # only activate afterwards, to support waiting in hooks 2757 # only activate afterwards, to support waiting in hooks
2541 $self->activate_recursive; 2758 $self->activate_recursive;
2542} 2759 }
2543 2760
2761}
2762
2544=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)]])
2545 2764
2546Moves 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
2547her, loading and preparing them map, calling the provided $check callback 2766her, loading and preparing them map, calling the provided $check callback
2548that 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
2549the 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
2556 2775
2557our $GOTOGEN; 2776our $GOTOGEN;
2558 2777
2559sub cf::object::player::goto { 2778sub cf::object::player::goto {
2560 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 }
2561 2786
2562 # 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
2563 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2564 2789
2565 $self->enter_link; 2790 $self->enter_link;
2585 ($path, $x, $y) = (undef, undef, undef); 2810 ($path, $x, $y) = (undef, undef, undef);
2586 } 2811 }
2587 } 2812 }
2588 2813
2589 my $map = eval { 2814 my $map = eval {
2590 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2591 2816
2592 if ($map) { 2817 if ($map) {
2593 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2594 $map = $check->($map) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2595 } else { 2820 } else {
2596 $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);
2597 } 2822 }
2598 2823
2599 $map 2824 $map
2607 if ($gen == $self->{_goto_generation}) { 2832 if ($gen == $self->{_goto_generation}) {
2608 delete $self->{_goto_generation}; 2833 delete $self->{_goto_generation};
2609 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2610 } 2835 }
2611 2836
2612 $done->() if $done; 2837 $done->($self) if $done;
2613 })->prio (1); 2838 })->prio (1);
2614} 2839}
2615 2840
2616=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
2617 2842
2685 $Coro::current->{desc} = "enter_exit"; 2910 $Coro::current->{desc} = "enter_exit";
2686 2911
2687 unless (eval { 2912 unless (eval {
2688 $self->deactivate_recursive; # just to be sure 2913 $self->deactivate_recursive; # just to be sure
2689 2914
2690 # random map handling
2691 {
2692 my $guard = cf::lock_acquire "exit_prepare:$exit";
2693
2694 prepare_random_map $exit
2695 if $exit->slaying eq "/!";
2696 }
2697
2698 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2915 my $map = cf::map::normalise $exit->slaying, $exit->map;
2699 my $x = $exit->stats->hp; 2916 my $x = $exit->stats->hp;
2700 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 }
2701 2941
2702 $self->goto ($map, $x, $y); 2942 $self->goto ($map, $x, $y);
2703 2943
2704 # if exit is damned, update players death & WoR home-position 2944 # if exit is damned, update players death & WoR home-position
2705 $self->contr->savebed ($map, $x, $y) 2945 $self->contr->savebed ($map, $x, $y)
2710 $self->message ("Something went wrong deep within the deliantra server. " 2950 $self->message ("Something went wrong deep within the deliantra server. "
2711 . "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. "
2712 . "Please report this to the dungeon master!", 2952 . "Please report this to the dungeon master!",
2713 cf::NDI_UNIQUE | cf::NDI_RED); 2953 cf::NDI_UNIQUE | cf::NDI_RED);
2714 2954
2715 warn "ERROR in enter_exit: $@"; 2955 error "ERROR in enter_exit: $@";
2716 $self->leave_link; 2956 $self->leave_link;
2717 } 2957 }
2718 })->prio (1); 2958 })->prio (1);
2719} 2959}
2720 2960
2732sub cf::client::send_drawinfo { 2972sub cf::client::send_drawinfo {
2733 my ($self, $text, $flags) = @_; 2973 my ($self, $text, $flags) = @_;
2734 2974
2735 utf8::encode $text; 2975 utf8::encode $text;
2736 $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);
2737} 3002}
2738 3003
2739=item $client->send_msg ($channel, $msg, $color, [extra...]) 3004=item $client->send_msg ($channel, $msg, $color, [extra...])
2740 3005
2741Send 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
2745 3010
2746=cut 3011=cut
2747 3012
2748# non-persistent channels (usually the info channel) 3013# non-persistent channels (usually the info channel)
2749our %CHANNEL = ( 3014our %CHANNEL = (
3015 "c/motd" => {
3016 id => "infobox",
3017 title => "MOTD",
3018 reply => undef,
3019 tooltip => "The message of the day",
3020 },
2750 "c/identify" => { 3021 "c/identify" => {
2751 id => "infobox", 3022 id => "infobox",
2752 title => "Identify", 3023 title => "Identify",
2753 reply => undef, 3024 reply => undef,
2754 tooltip => "Items recently identified", 3025 tooltip => "Items recently identified",
2756 "c/examine" => { 3027 "c/examine" => {
2757 id => "infobox", 3028 id => "infobox",
2758 title => "Examine", 3029 title => "Examine",
2759 reply => undef, 3030 reply => undef,
2760 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",
2761 }, 3038 },
2762 "c/book" => { 3039 "c/book" => {
2763 id => "infobox", 3040 id => "infobox",
2764 title => "Book", 3041 title => "Book",
2765 reply => undef, 3042 reply => undef,
2881 my $pkt = "msg " 3158 my $pkt = "msg "
2882 . $self->{json_coder}->encode ( 3159 . $self->{json_coder}->encode (
2883 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3160 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2884 ); 3161 );
2885 3162
2886 # try lzf for large packets
2887 $pkt = "lzf " . Compress::LZF::compress $pkt
2888 if 1024 <= length $pkt and $self->{can_lzf};
2889
2890 # split very large packets
2891 if (8192 < length $pkt and $self->{can_lzf}) {
2892 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2893 $pkt = "frag";
2894 }
2895
2896 $self->send_packet ($pkt); 3163 $self->send_big_packet ($pkt);
2897} 3164}
2898 3165
2899=item $client->ext_msg ($type, @msg) 3166=item $client->ext_msg ($type, @msg)
2900 3167
2901Sends an ext event to the client. 3168Sends an ext event to the client.
2904 3171
2905sub cf::client::ext_msg($$@) { 3172sub cf::client::ext_msg($$@) {
2906 my ($self, $type, @msg) = @_; 3173 my ($self, $type, @msg) = @_;
2907 3174
2908 if ($self->extcmd == 2) { 3175 if ($self->extcmd == 2) {
2909 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3176 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2910 } elsif ($self->extcmd == 1) { # TODO: remove 3177 } elsif ($self->extcmd == 1) { # TODO: remove
2911 push @msg, msgtype => "event_$type"; 3178 push @msg, msgtype => "event_$type";
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2913 } 3180 }
2914} 3181}
2915 3182
2916=item $client->ext_reply ($msgid, @msg) 3183=item $client->ext_reply ($msgid, @msg)
2917 3184
2920=cut 3187=cut
2921 3188
2922sub cf::client::ext_reply($$@) { 3189sub cf::client::ext_reply($$@) {
2923 my ($self, $id, @msg) = @_; 3190 my ($self, $id, @msg) = @_;
2924 3191
2925 if ($self->extcmd == 2) { 3192 return unless $self->extcmd == 2;
3193
2926 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3194 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2927 } elsif ($self->extcmd == 1) {
2928 #TODO: version 1, remove
2929 unshift @msg, msgtype => "reply", msgid => $id;
2930 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2931 }
2932} 3195}
2933 3196
2934=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
2935 3198
2936Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
2991 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
2992 3255
2993 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2994 3257
2995 if (ref $msg) { 3258 if (ref $msg) {
2996 my ($type, $reply, @payload) = 3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2997 "ARRAY" eq ref $msg
2998 ? @$msg
2999 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3000 3260
3001 my @reply; 3261 my @reply;
3002 3262
3003 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
3004 @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
3006 3266
3007 $ns->ext_reply ($reply, @reply) 3267 $ns->ext_reply ($reply, @reply)
3008 if $reply; 3268 if $reply;
3009 3269
3010 } else { 3270 } else {
3011 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";
3012 } 3272 }
3013 3273
3014 cf::override; 3274 cf::override;
3015 }, 3275 },
3016); 3276);
3036 3296
3037 $coro 3297 $coro
3038} 3298}
3039 3299
3040cf::client->attach ( 3300cf::client->attach (
3041 on_destroy => sub { 3301 on_client_destroy => sub {
3042 my ($ns) = @_; 3302 my ($ns) = @_;
3043 3303
3044 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3304 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3045 }, 3305 },
3046); 3306);
3062our $safe_hole = new Safe::Hole; 3322our $safe_hole = new Safe::Hole;
3063 3323
3064$SIG{FPE} = 'IGNORE'; 3324$SIG{FPE} = 'IGNORE';
3065 3325
3066$safe->permit_only (Opcode::opset qw( 3326$safe->permit_only (Opcode::opset qw(
3067 :base_core :base_mem :base_orig :base_math 3327 :base_core :base_mem :base_orig :base_math :base_loop
3068 grepstart grepwhile mapstart mapwhile 3328 grepstart grepwhile mapstart mapwhile
3069 sort time 3329 sort time
3070)); 3330));
3071 3331
3072# here we export the classes and methods available to script code 3332# here we export the classes and methods available to script code
3097 decrease split destroy change_exp value msg lore send_msg)], 3357 decrease split destroy change_exp value msg lore send_msg)],
3098 ["cf::object::player" => qw(player)], 3358 ["cf::object::player" => qw(player)],
3099 ["cf::player" => qw(peaceful send_msg)], 3359 ["cf::player" => qw(peaceful send_msg)],
3100 ["cf::map" => qw(trigger)], 3360 ["cf::map" => qw(trigger)],
3101) { 3361) {
3102 no strict 'refs';
3103 my ($pkg, @funs) = @$_; 3362 my ($pkg, @funs) = @$_;
3104 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3363 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3105 for @funs; 3364 for @funs;
3106} 3365}
3107 3366
3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3383 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3125 $qcode =~ s/\n/\\n/g; 3384 $qcode =~ s/\n/\\n/g;
3126 3385
3127 %vars = (_dummy => 0) unless %vars; 3386 %vars = (_dummy => 0) unless %vars;
3128 3387
3388 my @res;
3129 local $_; 3389 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars;
3131 3390
3132 my $eval = 3391 my $eval =
3133 "do {\n" 3392 "do {\n"
3134 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3393 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3135 . "#line 0 \"{$qcode}\"\n" 3394 . "#line 0 \"{$qcode}\"\n"
3136 . $code 3395 . $code
3137 . "\n}" 3396 . "\n}"
3138 ; 3397 ;
3139 3398
3399 if ($CFG{safe_eval}) {
3140 sub_generation_inc; 3400 sub_generation_inc;
3401 local @safe::cf::_safe_eval_args = values %vars;
3141 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3402 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3142 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 }
3143 3408
3144 if ($@) { 3409 if ($@) {
3145 warn "$@"; 3410 warn "$@",
3146 warn "while executing safe code '$code'\n"; 3411 "while executing safe code '$code'\n",
3147 warn "with arguments " . (join " ", %vars) . "\n"; 3412 "with arguments " . (join " ", %vars) . "\n";
3148 } 3413 }
3149 3414
3150 wantarray ? @res : $res[0] 3415 wantarray ? @res : $res[0]
3151} 3416}
3152 3417
3166=cut 3431=cut
3167 3432
3168sub register_script_function { 3433sub register_script_function {
3169 my ($fun, $cb) = @_; 3434 my ($fun, $cb) = @_;
3170 3435
3171 no strict 'refs'; 3436 $fun = "safe::$fun" if $CFG{safe_eval};
3172 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3437 *$fun = $safe_hole->wrap ($cb);
3173} 3438}
3174 3439
3175=back 3440=back
3176 3441
3177=cut 3442=cut
3186 # for this (global event?) 3451 # for this (global event?)
3187 %ext::player_env::MUSIC_FACE_CACHE = (); 3452 %ext::player_env::MUSIC_FACE_CACHE = ();
3188 3453
3189 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3454 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3190 3455
3191 warn "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
3192 3457
3193 my $facedata; 3458 my $facedata = decode_storable load_file $path;
3194 0 < aio_load $path, $facedata
3195 or die "$path: $!";
3196
3197 $facedata = Coro::Storable::thaw $facedata;
3198 3459
3199 $facedata->{version} == 2 3460 $facedata->{version} == 2
3200 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
3201 3462
3202 # 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]);
3203 $facedata->{resource}{"res/exp_table"} = { 3465 $facedata->{resource}{"res/exp_table"} = {
3204 type => FT_RSRC, 3466 type => FT_RSRC,
3205 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),
3206 }; 3469 };
3207 cf::cede_to_tick; 3470 cf::cede_to_tick;
3208 3471
3209 { 3472 {
3210 my $faces = $facedata->{faceinfo}; 3473 my $faces = $facedata->{faceinfo};
3212 while (my ($face, $info) = each %$faces) { 3475 while (my ($face, $info) = each %$faces) {
3213 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3476 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214 3477
3215 cf::face::set_visibility $idx, $info->{visibility}; 3478 cf::face::set_visibility $idx, $info->{visibility};
3216 cf::face::set_magicmap $idx, $info->{magicmap}; 3479 cf::face::set_magicmap $idx, $info->{magicmap};
3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3218 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} ;
3219 3483
3220 cf::cede_to_tick; 3484 cf::cede_to_tick;
3221 } 3485 }
3222 3486
3223 while (my ($face, $info) = each %$faces) { 3487 while (my ($face, $info) = each %$faces) {
3228 3492
3229 if (my $smooth = cf::face::find $info->{smooth}) { 3493 if (my $smooth = cf::face::find $info->{smooth}) {
3230 cf::face::set_smooth $idx, $smooth; 3494 cf::face::set_smooth $idx, $smooth;
3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3495 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3232 } else { 3496 } else {
3233 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3497 error "smooth face '$info->{smooth}' not found for face '$face'";
3234 } 3498 }
3235 3499
3236 cf::cede_to_tick; 3500 cf::cede_to_tick;
3237 } 3501 }
3238 } 3502 }
3247 3511
3248 cf::anim::invalidate_all; # d'oh 3512 cf::anim::invalidate_all; # d'oh
3249 } 3513 }
3250 3514
3251 { 3515 {
3252 # TODO: for gcfclient pleasure, we should give resources
3253 # that gcfclient doesn't grok a >10000 face index.
3254 my $res = $facedata->{resource}; 3516 my $res = $facedata->{resource};
3255 3517
3256 while (my ($name, $info) = each %$res) { 3518 while (my ($name, $info) = each %$res) {
3257 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
3258 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3521 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259 my $data;
3260 3522
3261 if ($info->{type} & 1) { 3523 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3262 # prepend meta info
3263
3264 my $meta = $enc->encode ({
3265 name => $name,
3266 %{ $info->{meta} || {} },
3267 });
3268
3269 $data = pack "(w/a*)*", $meta, $info->{data};
3270 } else {
3271 $data = $info->{data};
3272 }
3273
3274 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3275 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
3276 } else { 3526 } else {
3277 $RESOURCE{$name} = $info; 3527# $RESOURCE{$name} = $info; # unused
3278 } 3528 }
3279 3529
3280 cf::cede_to_tick; 3530 cf::cede_to_tick;
3281 } 3531 }
3282 } 3532 }
3283 3533
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3534 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3285 3535
3286 1 3536 1
3287} 3537}
3288
3289cf::global->attach (on_resource_update => sub {
3290 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3291 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3292
3293 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3294 my $sound = $soundconf->{compat}[$_]
3295 or next;
3296
3297 my $face = cf::face::find "sound/$sound->[1]";
3298 cf::sound::set $sound->[0] => $face;
3299 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3300 }
3301
3302 while (my ($k, $v) = each %{$soundconf->{event}}) {
3303 my $face = cf::face::find "sound/$v";
3304 cf::sound::set $k => $face;
3305 }
3306 }
3307});
3308 3538
3309register_exticmd fx_want => sub { 3539register_exticmd fx_want => sub {
3310 my ($ns, $want) = @_; 3540 my ($ns, $want) = @_;
3311 3541
3312 while (my ($k, $v) = each %$want) { 3542 while (my ($k, $v) = each %$want) {
3351sub reload_treasures { 3581sub reload_treasures {
3352 load_resource_file "$DATADIR/treasures" 3582 load_resource_file "$DATADIR/treasures"
3353 or die "unable to load treasurelists\n"; 3583 or die "unable to load treasurelists\n";
3354} 3584}
3355 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
3356sub reload_resources { 3606sub reload_resources {
3357 warn "reloading resource files...\n"; 3607 trace "reloading resource files...\n";
3358 3608
3609 reload_exp_table;
3610 reload_materials;
3359 reload_facedata; 3611 reload_facedata;
3612 reload_sound;
3360 reload_archetypes; 3613 reload_archetypes;
3361 reload_regions; 3614 reload_regions;
3362 reload_treasures; 3615 reload_treasures;
3363 3616
3364 warn "finished reloading resource files\n"; 3617 trace "finished reloading resource files\n";
3365} 3618}
3366 3619
3367sub reload_config { 3620sub reload_config {
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3621 trace "reloading config file...\n";
3369 or return;
3370 3622
3371 local $/; 3623 my $config = load_file "$CONFDIR/config";
3372 *CFG = YAML::Load <$fh>; 3624 utf8::decode $config;
3625 *CFG = decode_yaml $config;
3373 3626
3374 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3627 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3375 3628
3376 $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};
3377 $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};
3378 3631
3379 if (exists $CFG{mlockall}) { 3632 if (exists $CFG{mlockall}) {
3403 seek $fh, 0, 0; 3656 seek $fh, 0, 0;
3404 print $fh $$; 3657 print $fh $$;
3405} 3658}
3406 3659
3407sub main_loop { 3660sub main_loop {
3408 warn "EV::loop starting\n"; 3661 trace "EV::loop starting\n";
3409 if (1) { 3662 if (1) {
3410 EV::loop; 3663 EV::loop;
3411 } 3664 }
3412 warn "EV::loop returned\n"; 3665 trace "EV::loop returned\n";
3413 goto &main_loop unless $REALLY_UNLOOP; 3666 goto &main_loop unless $REALLY_UNLOOP;
3414} 3667}
3415 3668
3416sub main { 3669sub main {
3417 cf::init_globals; # initialise logging 3670 cf::init_globals; # initialise logging
3418 3671
3419 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3672 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3420 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.";
3421 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3674 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3422 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3675 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3423
3424 cf::init_experience;
3425 cf::init_anim;
3426 cf::init_attackmess;
3427 cf::init_dynamic;
3428 3676
3429 $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
3430 3678
3431 # we must not ever block the main coroutine 3679 # we must not ever block the main coroutine
3432 local $Coro::idle = sub { 3680 local $Coro::idle = sub {
3438 }; 3686 };
3439 3687
3440 evthread_start IO::AIO::poll_fileno; 3688 evthread_start IO::AIO::poll_fileno;
3441 3689
3442 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
3443 reload_resources; 3699 reload_resources;
3444 reload_config; 3700 reload_config;
3445 db_init; 3701 db_init;
3446 3702
3447 cf::load_settings;
3448 cf::load_materials;
3449 cf::init_uuid; 3703 cf::init_uuid;
3450 cf::init_signals; 3704 cf::init_signals;
3451 cf::init_commands;
3452 cf::init_skills; 3705 cf::init_skills;
3453 3706
3454 cf::init_beforeplay; 3707 cf::init_beforeplay;
3455 3708
3456 atomic; 3709 atomic;
3461 3714
3462 # no (long-running) fork's whatsoever before this point(!) 3715 # no (long-running) fork's whatsoever before this point(!)
3463 use POSIX (); 3716 use POSIX ();
3464 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};
3465 3718
3466 (pop @POST_INIT)->(0) while @POST_INIT; 3719 cf::_post_init 0;
3467 }; 3720 };
3468 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
3469 main_loop; 3729 goto &main_loop;
3470} 3730}
3471 3731
3472############################################################################# 3732#############################################################################
3473# initialisation and cleanup 3733# initialisation and cleanup
3474 3734
3475# install some emergency cleanup handlers 3735# install some emergency cleanup handlers
3476BEGIN { 3736BEGIN {
3477 our %SIGWATCHER = (); 3737 our %SIGWATCHER = ();
3478 for my $signal (qw(INT HUP TERM)) { 3738 for my $signal (qw(INT HUP TERM)) {
3479 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3739 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3480 cf::cleanup "SIG$signal"; 3740 cf::cleanup "SIG$signal";
3481 }; 3741 };
3482 } 3742 }
3483} 3743}
3484 3744
3485sub write_runtime_sync { 3745sub write_runtime_sync {
3746 my $t0 = AE::time;
3747
3486 # first touch the runtime file to show we are still running: 3748 # first touch the runtime file to show we are still running:
3487 # the fsync below can take a very very long time. 3749 # the fsync below can take a very very long time.
3488 3750
3489 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3751 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3490 3752
3491 my $guard = cf::lock_acquire "write_runtime"; 3753 my $guard = cf::lock_acquire "write_runtime";
3492 3754
3493 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3755 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3494 or return; 3756 or return;
3495 3757
3496 my $value = $cf::RUNTIME + 90 + 10; 3758 my $value = $cf::RUNTIME + 90 + 10;
3497 # 10 is the runtime save interval, for a monotonic clock 3759 # 10 is the runtime save interval, for a monotonic clock
3498 # 60 allows for the watchdog to kill the server. 3760 # 60 allows for the watchdog to kill the server.
3511 or return; 3773 or return;
3512 3774
3513 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3775 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3514 and return; 3776 and return;
3515 3777
3516 warn "runtime file written.\n"; 3778 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3517 3779
3518 1 3780 1
3519} 3781}
3520 3782
3521our $uuid_lock; 3783our $uuid_lock;
3533 or return; 3795 or return;
3534 3796
3535 my $value = uuid_seq uuid_cur; 3797 my $value = uuid_seq uuid_cur;
3536 3798
3537 unless ($value) { 3799 unless ($value) {
3538 warn "cowardly refusing to write zero uuid value!\n"; 3800 info "cowardly refusing to write zero uuid value!\n";
3539 return; 3801 return;
3540 } 3802 }
3541 3803
3542 my $value = uuid_str $value + $uuid_skip; 3804 my $value = uuid_str $value + $uuid_skip;
3543 $uuid_skip = 0; 3805 $uuid_skip = 0;
3553 or return; 3815 or return;
3554 3816
3555 aio_rename "$uuid~", $uuid 3817 aio_rename "$uuid~", $uuid
3556 and return; 3818 and return;
3557 3819
3558 warn "uuid file written ($value).\n"; 3820 trace "uuid file written ($value).\n";
3559 3821
3560 1 3822 1
3561 3823
3562} 3824}
3563 3825
3569} 3831}
3570 3832
3571sub emergency_save() { 3833sub emergency_save() {
3572 my $freeze_guard = cf::freeze_mainloop; 3834 my $freeze_guard = cf::freeze_mainloop;
3573 3835
3574 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;
3575 3842
3576 cf::sync_job { 3843 cf::sync_job {
3577 # this is a trade-off: we want to be very quick here, so 3844 cf::write_runtime_sync; # external watchdog should not bark
3578 # save all maps without fsync, and later call a global sync
3579 # (which in turn might be very very slow)
3580 local $USE_FSYNC = 0;
3581 3845
3582 # use a peculiar iteration method to avoid tripping on perl 3846 # use a peculiar iteration method to avoid tripping on perl
3583 # refcount bugs in for. also avoids problems with players 3847 # refcount bugs in for. also avoids problems with players
3584 # and maps saved/destroyed asynchronously. 3848 # and maps saved/destroyed asynchronously.
3585 warn "emergency_perl_save: begin player save\n"; 3849 info "emergency_perl_save: begin player save\n";
3586 for my $login (keys %cf::PLAYER) { 3850 for my $login (keys %cf::PLAYER) {
3587 my $pl = $cf::PLAYER{$login} or next; 3851 my $pl = $cf::PLAYER{$login} or next;
3588 $pl->valid or next; 3852 $pl->valid or next;
3589 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3853 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3590 $pl->save; 3854 $pl->save;
3591 } 3855 }
3592 warn "emergency_perl_save: end player save\n"; 3856 info "emergency_perl_save: end player save\n";
3593 3857
3858 cf::write_runtime_sync; # external watchdog should not bark
3859
3594 warn "emergency_perl_save: begin map save\n"; 3860 info "emergency_perl_save: begin map save\n";
3595 for my $path (keys %cf::MAP) { 3861 for my $path (keys %cf::MAP) {
3596 my $map = $cf::MAP{$path} or next; 3862 my $map = $cf::MAP{$path} or next;
3597 $map->valid or next; 3863 $map->valid or next;
3598 $map->save; 3864 $map->save;
3599 } 3865 }
3600 warn "emergency_perl_save: end map save\n"; 3866 info "emergency_perl_save: end map save\n";
3601 3867
3868 cf::write_runtime_sync; # external watchdog should not bark
3869
3602 warn "emergency_perl_save: begin database checkpoint\n"; 3870 info "emergency_perl_save: begin database checkpoint\n";
3603 BDB::db_env_txn_checkpoint $DB_ENV; 3871 BDB::db_env_txn_checkpoint $DB_ENV;
3604 warn "emergency_perl_save: end database checkpoint\n"; 3872 info "emergency_perl_save: end database checkpoint\n";
3605 3873
3606 warn "emergency_perl_save: begin write uuid\n"; 3874 info "emergency_perl_save: begin write uuid\n";
3607 write_uuid_sync 1; 3875 write_uuid_sync 1;
3608 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
3609 }; 3896 };
3610 3897
3611 warn "emergency_perl_save: starting sync()\n";
3612 IO::AIO::aio_sync sub {
3613 warn "emergency_perl_save: finished sync()\n";
3614 };
3615
3616 warn "emergency_perl_save: leave\n"; 3898 info "emergency_perl_save: leave\n";
3617} 3899}
3618 3900
3619sub post_cleanup { 3901sub post_cleanup {
3620 my ($make_core) = @_; 3902 my ($make_core) = @_;
3621 3903
3904 IO::AIO::flush;
3905
3622 warn Carp::longmess "post_cleanup backtrace" 3906 error Carp::longmess "post_cleanup backtrace"
3623 if $make_core; 3907 if $make_core;
3624 3908
3625 my $fh = pidfile; 3909 my $fh = pidfile;
3626 unlink $PIDFILE if <$fh> == $$; 3910 unlink $PIDFILE if <$fh> == $$;
3627} 3911}
3647 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3931 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3648 for my $name (keys %$leaf_symtab) { 3932 for my $name (keys %$leaf_symtab) {
3649 _gv_clear *{"$pkg$name"}; 3933 _gv_clear *{"$pkg$name"};
3650# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3934# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3651 } 3935 }
3652 warn "cleared package $pkg\n";#d#
3653} 3936}
3654 3937
3655sub do_reload_perl() { 3938sub do_reload_perl() {
3656 # can/must only be called in main 3939 # can/must only be called in main
3657 if ($Coro::current != $Coro::main) { 3940 unless (in_main) {
3658 warn "can only reload from main coroutine"; 3941 error "can only reload from main coroutine";
3659 return; 3942 return;
3660 } 3943 }
3661 3944
3662 return if $RELOAD++; 3945 return if $RELOAD++;
3663 3946
3664 my $t1 = EV::time; 3947 my $t1 = AE::time;
3665 3948
3666 while ($RELOAD) { 3949 while ($RELOAD) {
3667 warn "reloading..."; 3950 cf::get_slot 0.1, -1, "reload_perl";
3951 info "perl_reload: reloading...";
3668 3952
3669 warn "entering sync_job"; 3953 trace "perl_reload: entering sync_job";
3670 3954
3671 cf::sync_job { 3955 cf::sync_job {
3672 cf::write_runtime_sync; # external watchdog should not bark
3673 cf::emergency_save; 3956 #cf::emergency_save;
3674 cf::write_runtime_sync; # external watchdog should not bark
3675 3957
3676 warn "syncing database to disk";
3677 BDB::db_env_txn_checkpoint $DB_ENV;
3678
3679 # if anything goes wrong in here, we should simply crash as we already saved
3680
3681 warn "flushing outstanding aio requests";
3682 while (IO::AIO::nreqs || BDB::nreqs) {
3683 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3684 }
3685
3686 warn "cancelling all extension coros"; 3958 trace "perl_reload: cancelling all extension coros";
3687 $_->cancel for values %EXT_CORO; 3959 $_->cancel for values %EXT_CORO;
3688 %EXT_CORO = (); 3960 %EXT_CORO = ();
3689 3961
3690 warn "removing commands"; 3962 trace "perl_reload: removing commands";
3691 %COMMAND = (); 3963 %COMMAND = ();
3692 3964
3693 warn "removing ext/exti commands"; 3965 trace "perl_reload: removing ext/exti commands";
3694 %EXTCMD = (); 3966 %EXTCMD = ();
3695 %EXTICMD = (); 3967 %EXTICMD = ();
3696 3968
3697 warn "unloading/nuking all extensions"; 3969 trace "perl_reload: unloading/nuking all extensions";
3698 for my $pkg (@EXTS) { 3970 for my $pkg (@EXTS) {
3699 warn "... unloading $pkg"; 3971 trace "... unloading $pkg";
3700 3972
3701 if (my $cb = $pkg->can ("unload")) { 3973 if (my $cb = $pkg->can ("unload")) {
3702 eval { 3974 eval {
3703 $cb->($pkg); 3975 $cb->($pkg);
3704 1 3976 1
3705 } or warn "$pkg unloaded, but with errors: $@"; 3977 } or error "$pkg unloaded, but with errors: $@";
3706 } 3978 }
3707 3979
3708 warn "... clearing $pkg"; 3980 trace "... clearing $pkg";
3709 clear_package $pkg; 3981 clear_package $pkg;
3710 } 3982 }
3711 3983
3712 warn "unloading all perl modules loaded from $LIBDIR"; 3984 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3713 while (my ($k, $v) = each %INC) { 3985 while (my ($k, $v) = each %INC) {
3714 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3986 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3715 3987
3716 warn "... unloading $k"; 3988 trace "... unloading $k";
3717 delete $INC{$k}; 3989 delete $INC{$k};
3718 3990
3719 $k =~ s/\.pm$//; 3991 $k =~ s/\.pm$//;
3720 $k =~ s/\//::/g; 3992 $k =~ s/\//::/g;
3721 3993
3724 } 3996 }
3725 3997
3726 clear_package $k; 3998 clear_package $k;
3727 } 3999 }
3728 4000
3729 warn "getting rid of safe::, as good as possible"; 4001 trace "perl_reload: getting rid of safe::, as good as possible";
3730 clear_package "safe::$_" 4002 clear_package "safe::$_"
3731 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);
3732 4004
3733 warn "unloading cf.pm \"a bit\""; 4005 trace "perl_reload: unloading cf.pm \"a bit\"";
3734 delete $INC{"cf.pm"}; 4006 delete $INC{"cf.pm"};
3735 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4007 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3736 4008
3737 # don't, removes xs symbols, too, 4009 # don't, removes xs symbols, too,
3738 # and global variables created in xs 4010 # and global variables created in xs
3739 #clear_package __PACKAGE__; 4011 #clear_package __PACKAGE__;
3740 4012
3741 warn "unload completed, starting to reload now"; 4013 info "perl_reload: unload completed, starting to reload now";
3742 4014
3743 warn "reloading cf.pm"; 4015 trace "perl_reload: reloading cf.pm";
3744 require cf; 4016 require cf;
3745 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4017 cf::_connect_to_perl_1;
3746 4018
3747 warn "loading config and database again"; 4019 trace "perl_reload: loading config and database again";
3748 cf::reload_config; 4020 cf::reload_config;
3749 4021
3750 warn "loading extensions"; 4022 trace "perl_reload: loading extensions";
3751 cf::load_extensions; 4023 cf::load_extensions;
3752 4024
3753 if ($REATTACH_ON_RELOAD) { 4025 if ($REATTACH_ON_RELOAD) {
3754 warn "reattaching attachments to objects/players"; 4026 trace "perl_reload: reattaching attachments to objects/players";
3755 _global_reattach; # objects, sockets 4027 _global_reattach; # objects, sockets
3756 warn "reattaching attachments to maps"; 4028 trace "perl_reload: reattaching attachments to maps";
3757 reattach $_ for values %MAP; 4029 reattach $_ for values %MAP;
3758 warn "reattaching attachments to players"; 4030 trace "perl_reload: reattaching attachments to players";
3759 reattach $_ for values %PLAYER; 4031 reattach $_ for values %PLAYER;
3760 } 4032 }
3761 4033
3762 warn "running post_init jobs"; 4034 cf::_post_init 1;
3763 (pop @POST_INIT)->(1) while @POST_INIT;
3764 4035
3765 warn "leaving sync_job"; 4036 trace "perl_reload: leaving sync_job";
3766 4037
3767 1 4038 1
3768 } or do { 4039 } or do {
3769 warn $@; 4040 error $@;
3770 cf::cleanup "error while reloading, exiting."; 4041 cf::cleanup "perl_reload: error, exiting.";
3771 }; 4042 };
3772 4043
3773 warn "reloaded";
3774 --$RELOAD; 4044 --$RELOAD;
3775 } 4045 }
3776 4046
3777 $t1 = EV::time - $t1; 4047 $t1 = AE::time - $t1;
3778 warn "reload completed in ${t1}s\n"; 4048 info "perl_reload: completed in ${t1}s\n";
3779}; 4049};
3780 4050
3781our $RELOAD_WATCHER; # used only during reload 4051our $RELOAD_WATCHER; # used only during reload
3782 4052
3783sub reload_perl() { 4053sub reload_perl() {
3785 # coro crashes during coro_state_free->destroy here. 4055 # coro crashes during coro_state_free->destroy here.
3786 4056
3787 $RELOAD_WATCHER ||= cf::async { 4057 $RELOAD_WATCHER ||= cf::async {
3788 Coro::AIO::aio_wait cache_extensions; 4058 Coro::AIO::aio_wait cache_extensions;
3789 4059
3790 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4060 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3791 do_reload_perl; 4061 do_reload_perl;
3792 undef $RELOAD_WATCHER; 4062 undef $RELOAD_WATCHER;
3793 }; 4063 };
3794 }; 4064 };
3795} 4065}
3804 reload_perl; 4074 reload_perl;
3805 }; 4075 };
3806 } 4076 }
3807}; 4077};
3808 4078
3809unshift @INC, $LIBDIR; 4079#############################################################################
3810 4080
3811my $bug_warning = 0; 4081my $bug_warning = 0;
3812 4082
3813our @WAIT_FOR_TICK;
3814our @WAIT_FOR_TICK_BEGIN;
3815
3816sub wait_for_tick { 4083sub wait_for_tick() {
3817 return if tick_inhibit || $Coro::current == $Coro::main; 4084 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3818 4085
3819 my $signal = new Coro::Signal; 4086 $WAIT_FOR_TICK->wait;
3820 push @WAIT_FOR_TICK, $signal;
3821 $signal->wait;
3822} 4087}
3823 4088
3824sub wait_for_tick_begin { 4089sub wait_for_tick_begin() {
3825 return if tick_inhibit || $Coro::current == $Coro::main; 4090 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3826 4091
3827 my $signal = new Coro::Signal; 4092 my $signal = new Coro::Signal;
3828 push @WAIT_FOR_TICK_BEGIN, $signal; 4093 push @WAIT_FOR_TICK_BEGIN, $signal;
3829 $signal->wait; 4094 $signal->wait;
3830} 4095}
3834 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"
3835 unless ++$bug_warning > 10; 4100 unless ++$bug_warning > 10;
3836 return; 4101 return;
3837 } 4102 }
3838 4103
3839 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#
3840 4107
3841 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4108 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3842 $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.;
3843 Coro::async_pool { 4110 Coro::async_pool {
3844 $Coro::current->{desc} = "runtime saver"; 4111 $Coro::current->{desc} = "runtime saver";
3845 write_runtime_sync 4112 write_runtime_sync
3846 or warn "ERROR: unable to write runtime file: $!"; 4113 or error "ERROR: unable to write runtime file: $!";
3847 }; 4114 };
3848 } 4115 }
3849 4116
3850 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4117 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3851 $sig->send; 4118 $sig->send;
3852 } 4119 }
3853 while (my $sig = shift @WAIT_FOR_TICK) { 4120 $WAIT_FOR_TICK->broadcast;
3854 $sig->send;
3855 }
3856 4121
3857 $LOAD = ($NOW - $TICK_START) / $TICK; 4122 $LOAD = ($NOW - $TICK_START) / $TICK;
3858 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4123 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3859 4124
3860 if (0) { 4125 if (0) {
3861 if ($NEXT_TICK) { 4126 if ($NEXT_TICK) {
3862 my $jitter = $TICK_START - $NEXT_TICK; 4127 my $jitter = $TICK_START - $NEXT_TICK;
3863 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4128 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3864 warn "jitter $JITTER\n";#d# 4129 debug "jitter $JITTER\n";#d#
3865 } 4130 }
3866 } 4131 }
3867} 4132}
3868 4133
3869{ 4134{
3870 # configure BDB 4135 # configure BDB
3871 4136
3872 BDB::min_parallel 8; 4137 BDB::min_parallel 16;
3873 BDB::max_poll_reqs $TICK * 0.1; 4138 BDB::max_poll_reqs $TICK * 0.1;
3874 $AnyEvent::BDB::WATCHER->priority (1); 4139 #$AnyEvent::BDB::WATCHER->priority (1);
3875 4140
3876 unless ($DB_ENV) { 4141 unless ($DB_ENV) {
3877 $DB_ENV = BDB::db_env_create; 4142 $DB_ENV = BDB::db_env_create;
3878 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4143 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3879 $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;
3914 IO::AIO::min_parallel 8; 4179 IO::AIO::min_parallel 8;
3915 IO::AIO::max_poll_time $TICK * 0.1; 4180 IO::AIO::max_poll_time $TICK * 0.1;
3916 undef $AnyEvent::AIO::WATCHER; 4181 undef $AnyEvent::AIO::WATCHER;
3917} 4182}
3918 4183
3919my $_log_backtrace; 4184our $_log_backtrace;
4185our $_log_backtrace_last;
3920 4186
3921sub _log_backtrace { 4187sub _log_backtrace {
3922 my ($msg, @addr) = @_; 4188 my ($msg, @addr) = @_;
3923 4189
3924 $msg =~ s/\n//; 4190 $msg =~ s/\n$//;
3925 4191
4192 if ($_log_backtrace_last eq $msg) {
4193 LOG llevInfo, "[ABT] $msg\n";
4194 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3926 # limit the # of concurrent backtraces 4195 # limit the # of concurrent backtraces
3927 if ($_log_backtrace < 2) { 4196 } elsif ($_log_backtrace < 2) {
4197 $_log_backtrace_last = $msg;
3928 ++$_log_backtrace; 4198 ++$_log_backtrace;
3929 my $perl_bt = Carp::longmess $msg; 4199 my $perl_bt = Carp::longmess $msg;
3930 async { 4200 async {
3931 $Coro::current->{desc} = "abt $msg"; 4201 $Coro::current->{desc} = "abt $msg";
3932 4202
3952 LOG llevInfo, "[ABT] $_\n" for @bt; 4222 LOG llevInfo, "[ABT] $_\n" for @bt;
3953 --$_log_backtrace; 4223 --$_log_backtrace;
3954 }; 4224 };
3955 } else { 4225 } else {
3956 LOG llevInfo, "[ABT] $msg\n"; 4226 LOG llevInfo, "[ABT] $msg\n";
3957 LOG llevInfo, "[ABT] [suppressed]\n"; 4227 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3958 } 4228 }
3959} 4229}
3960 4230
3961# load additional modules 4231# load additional modules
3962require "cf/$_.pm" for @EXTRA_MODULES; 4232require "cf/$_.pm" for @EXTRA_MODULES;
4233cf::_connect_to_perl_2;
3963 4234
3964END { cf::emergency_save } 4235END { cf::emergency_save }
3965 4236
39661 42371
3967 4238

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines