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.480 by root, Thu Oct 8 05:09:43 2009 UTC vs.
Revision 1.574 by root, Sun May 8 21:51:27 2011 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 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
92our @EVENT; 93our @EVENT;
93our @REFLECT; # set by XS 94our @REFLECT; # set by XS
94our %REFLECT; # set by us 95our %REFLECT; # set by us
95 96
96our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
97our $DATADIR = datadir; 99our $DATADIR = datadir;
98our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
99our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
100our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
101our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
102our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
103our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
104our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
105our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
106our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
107our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
108our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
109 112
110our %RESOURCE; 113our %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;
111 120
112our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
114our $NEXT_TICK; 123our $NEXT_TICK;
115our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
117our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
118our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
119our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
120our $DB_ENV; 129our $DB_ENV;
121 130
122our @EXTRA_MODULES = qw(pod mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
123 132
124our %CFG; 133our %CFG;
125 134
126our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
127our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
128our $NOW; 138our $NOW;
129 139
130our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
131our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
132our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
141 151
142our @POST_INIT; 152our @POST_INIT;
143 153
144our $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)
145our $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;
146 159
147binmode STDOUT; 160binmode STDOUT;
148binmode STDERR; 161binmode STDERR;
149 162
150# read virtual server time, if available 163# read virtual server time, if available
161 174
162our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
163 176
164sub cf::map::normalise; 177sub cf::map::normalise;
165 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
166############################################################################# 183#############################################################################
167 184
168%REFLECT = (); 185%REFLECT = ();
169for (@REFLECT) { 186for (@REFLECT) {
170 my $reflect = JSON::XS::decode_json $_; 187 my $reflect = JSON::XS::decode_json $_;
171 $REFLECT{$reflect->{class}} = $reflect; 188 $REFLECT{$reflect->{class}} = $reflect;
172} 189}
173 190
174# this is decidedly evil 191# this is decidedly evil
175$REFLECT{object}{flags} = [grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"}]; 192$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
176 193
177############################################################################# 194#############################################################################
178 195
179=head2 GLOBAL VARIABLES 196=head2 GLOBAL VARIABLES
180 197
181=over 4 198=over 4
182 199
183=item $cf::UPTIME 200=item $cf::UPTIME
184 201
185The 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.
186 218
187=item $cf::RUNTIME 219=item $cf::RUNTIME
188 220
189The 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
190every server tick. 222every server tick.
196Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
197directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
198unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
199database environment. 231database environment.
200 232
201=item $cf::NOW
202
203The time of the last (current) server tick.
204
205=item $cf::TICK
206
207The interval between server ticks, in seconds.
208
209=item $cf::LOADAVG 233=item $cf::LOADAVG
210 234
211The 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
212(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
213objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
222from wherever your confdir points to. 246from wherever your confdir points to.
223 247
224=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
225 249
226These 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
227returns 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
228per 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.
229 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
230=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
231 272
232This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
233C<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
234that call. 275that call.
235 276
236=item %cf::REFLECT 277=item %cf::REFLECT
237 278
241 282
242=back 283=back
243 284
244=cut 285=cut
245 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 "", @_ }
292
246$Coro::State::WARNHOOK = sub { 293$Coro::State::WARNHOOK = sub {
247 my $msg = join "", @_; 294 my $msg = join "", @_;
248 295
249 $msg .= "\n" 296 $msg .= "\n"
250 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
251 298
252 $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;
253 300
254 LOG llevError, $msg; 301 LOG llevWarn, $msg;
255}; 302};
256 303
257$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
258 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
259 306
260 warn Carp::longmess $_[0]; 307 error Carp::longmess $_[0];
261 308
262 if ($Coro::current == $Coro::main) {#d# 309 if (in_main) {#d#
263 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
264 return;#d# 311 return;#d#
265 }#d# 312 }#d#
266 313
267 # kill coroutine otherwise 314 # kill coroutine otherwise
268 Coro::terminate 315 Coro::terminate
288)) { 335)) {
289 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
290} 337}
291 338
292$EV::DIED = sub { 339$EV::DIED = sub {
293 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
294}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
295 347
296############################################################################# 348#############################################################################
297 349
298=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
299 351
320 $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;
321 $d 373 $d
322 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
323} 375}
324 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
325=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
326 392
327Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
328 394
329=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
335our $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
336 402
337sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
338sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
339 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
340=item cf::post_init { BLOCK } 437=item cf::post_init { BLOCK }
341 438
342Execute the given codeblock, I<after> all extensions have been (re-)loaded, 439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
343but I<before> the server starts ticking again. 440but I<before> the server starts ticking again.
344 441
345The cdoeblock will have a single boolean argument to indicate whether this 442The codeblock will have a single boolean argument to indicate whether this
346is a reload or not. 443is a reload or not.
347 444
348=cut 445=cut
349 446
350sub post_init(&) { 447sub post_init(&) {
351 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 }
352} 466}
353 467
354=item cf::lock_wait $string 468=item cf::lock_wait $string
355 469
356Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
395} 509}
396 510
397=item cf::periodic $interval, $cb 511=item cf::periodic $interval, $cb
398 512
399Like 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
400get spread over timer. 514get spread over time.
401 515
402=cut 516=cut
403 517
404sub periodic($$) { 518sub periodic($$) {
405 my ($interval, $cb) = @_; 519 my ($interval, $cb) = @_;
409 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
410} 524}
411 525
412=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
413 527
414Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
415This 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
416of 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.
417 535
418The 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
419used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
420 538
421Useful for short background jobs. 539Useful for short background jobs.
422 540
423=cut 541=cut
424 542
425our @SLOT_QUEUE; 543our @SLOT_QUEUE;
426our $SLOT_QUEUE; 544our $SLOT_QUEUE;
545our $SLOT_DECAY = 0.9;
427 546
428$SLOT_QUEUE->cancel if $SLOT_QUEUE; 547$SLOT_QUEUE->cancel if $SLOT_QUEUE;
429$SLOT_QUEUE = Coro::async { 548$SLOT_QUEUE = Coro::async {
430 $Coro::current->desc ("timeslot manager"); 549 $Coro::current->desc ("timeslot manager");
431 550
432 my $signal = new Coro::Signal; 551 my $signal = new Coro::Signal;
552 my $busy;
433 553
434 while () { 554 while () {
435 next_job: 555 next_job:
556
436 my $avail = cf::till_tick; 557 my $avail = cf::till_tick;
437 if ($avail > 0.01) { 558
438 for (0 .. $#SLOT_QUEUE) { 559 for (0 .. $#SLOT_QUEUE) {
439 if ($SLOT_QUEUE[$_][0] < $avail) { 560 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0;
440 my $job = splice @SLOT_QUEUE, $_, 1, (); 562 my $job = splice @SLOT_QUEUE, $_, 1, ();
441 $job->[2]->send; 563 $job->[2]->send;
442 Coro::cede; 564 Coro::cede;
443 goto next_job; 565 goto next_job;
444 } 566 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
445 } 568 }
446 } 569 }
447 570
448 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
449 # 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
450 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
451 $signal->wait;
452 } else { 574 } else {
575 $busy = 0;
453 Coro::schedule; 576 Coro::schedule;
454 } 577 }
455 } 578 }
456}; 579};
457 580
458sub get_slot($;$$) { 581sub get_slot($;$$) {
459 return if tick_inhibit || $Coro::current == $Coro::main; 582 return if tick_inhibit || $Coro::current == $Coro::main;
460 583
461 my ($time, $pri, $name) = @_; 584 my ($time, $pri, $name) = @_;
462 585
463 $time = $TICK * .6 if $time > $TICK * .6; 586 $time = clamp $time, 0.01, $TICK * .6;
587
464 my $sig = new Coro::Signal; 588 my $sig = new Coro::Signal;
465 589
466 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
467 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
468 $SLOT_QUEUE->ready; 592 $SLOT_QUEUE->ready;
494=cut 618=cut
495 619
496sub sync_job(&) { 620sub sync_job(&) {
497 my ($job) = @_; 621 my ($job) = @_;
498 622
499 if ($Coro::current == $Coro::main) { 623 if (in_main) {
500 my $time = EV::time; 624 my $time = AE::time;
501 625
502 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
503 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
504 628
505 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
506 630
507 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
508 632
509 my $busy = 1; 633 my $busy = 1;
510 my @res; 634 my @res;
511 635
512 (async { 636 (async {
513 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
514 @res = eval { $job->() }; 638 @res = eval { $job->() };
515 warn $@ if $@; 639 error $@ if $@;
516 undef $busy; 640 undef $busy;
517 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
518 642
519 while ($busy) { 643 while ($busy) {
520 if (Coro::nready) { 644 if (Coro::nready) {
522 } else { 646 } else {
523 EV::loop EV::LOOP_ONESHOT; 647 EV::loop EV::LOOP_ONESHOT;
524 } 648 }
525 } 649 }
526 650
527 my $time = EV::time - $time; 651 my $time = AE::time - $time;
528 652
529 $TICK_START += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
530 654
531 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
532 } else { 656 } else {
554 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
555 679
556 $coro 680 $coro
557} 681}
558 682
559=item fork_call { }, $args 683=item fork_call { }, @args
560 684
561Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
562process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
563Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
564never block itself or use any form of event handling. 688never block itself or use any form of event handling.
565 689
566=cut 690=cut
567 691
692sub post_fork {
693 reset_signals;
694}
695
568sub fork_call(&@) { 696sub fork_call(&@) {
569 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
570 698
571 # 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,
572 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
573 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
574 702
575 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
576 reset_signals; 704 cf::post_fork;
577 &$cb 705 &$cb
578 }, @args; 706 } @args;
579 707
580 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 )
581} 720}
582 721
583=item $coin = coin_from_name $name 722=item $coin = coin_from_name $name
584 723
585=cut 724=cut
622within each server. 761within each server.
623 762
624=cut 763=cut
625 764
626sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
627 my ($name) = @_; 769 my ($name) = @_;
628 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
629 771
630 eval { 772 eval {
631 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
641} 783}
642 784
643our $DB; 785our $DB;
644 786
645sub db_init { 787sub db_init {
646 cf::sync_job {
647 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
648 };
649} 789}
650 790
651sub db_get($$) { 791sub db_get($$) {
652 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
653 793
654 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
655 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
656 798
657 $! ? () 799 $! ? ()
658 : $data 800 : $data
659 }
660} 801}
661 802
662sub db_put($$$) { 803sub db_put($$$) {
663 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
664 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
692 833
693 my @data; 834 my @data;
694 my $md5; 835 my $md5;
695 836
696 for (0 .. $#$src) { 837 for (0 .. $#$src) {
697 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
698 or Carp::croak "$src->[$_]: $!";
699 } 839 }
700 840
701 # if processing is expensive, check 841 # if processing is expensive, check
702 # checksum first 842 # checksum first
703 if (1) { 843 if (1) {
720 860
721 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
722 my $data = $process->(\@data); 862 my $data = $process->(\@data);
723 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
724 864
725 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
726 866
727 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
728 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
729 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
730 870
740 880
741=cut 881=cut
742 882
743sub datalog($@) { 883sub datalog($@) {
744 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
745 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
746} 886}
747 887
748=back 888=back
749 889
750=cut 890=cut
945 1085
946 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
947 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
948 1088
949 } elsif (ref $type) { 1089 } elsif (ref $type) {
950 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
951 1091
952 } else { 1092 } else {
953 shift @arg; 1093 shift @arg;
954 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
955 } 1095 }
956 } 1096 }
957} 1097}
958 1098
959sub _object_attach { 1099sub _object_attach {
969 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
970 } 1110 }
971 1111
972 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
973 } else { 1113 } else {
974 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
975 } 1115 }
976 1116
977 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
978} 1118}
979 1119
1038 1178
1039 for (@$callbacks) { 1179 for (@$callbacks) {
1040 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
1041 1181
1042 if ($@) { 1182 if ($@) {
1043 warn "$@";
1044 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1045 override; 1184 override;
1046 } 1185 }
1047 1186
1048 return 1 if $override; 1187 return 1 if $override;
1049 } 1188 }
1128 for (@$attach) { 1267 for (@$attach) {
1129 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1130 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1131 } 1270 }
1132 } else { 1271 } else {
1133 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1134 } 1273 }
1135 } 1274 }
1136} 1275}
1137 1276
1138cf::attachable->attach ( 1277cf::attachable->attach (
1165 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1166 1305
1167 sync_job { 1306 sync_job {
1168 if (length $$rdata) { 1307 if (length $$rdata) {
1169 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1170 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1171 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1172 1312
1173 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1174 aio_chmod $fh, SAVE_MODE; 1314 aio_chmod $fh, SAVE_MODE;
1175 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1176 if ($cf::USE_FSYNC) { 1316 if ($cf::USE_FSYNC) {
1198 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1199 1339
1200 $filename =~ s%/[^/]+$%%; 1340 $filename =~ s%/[^/]+$%%;
1201 aio_pathsync $filename if $cf::USE_FSYNC; 1341 aio_pathsync $filename if $cf::USE_FSYNC;
1202 } else { 1342 } else {
1203 warn "unable to save objects: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1204 } 1344 }
1205 } else { 1345 } else {
1206 aio_unlink $filename; 1346 aio_unlink $filename;
1207 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1208 } 1348 }
1232 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1233 $av = $st->{objs}; 1373 $av = $st->{objs};
1234 } 1374 }
1235 1375
1236 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1237 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1238 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1239 1380
1240 ($data, $av) 1381 ($data, $av)
1241} 1382}
1242 1383
1243=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1302} 1443}
1303 1444
1304use File::Glob (); 1445use File::Glob ();
1305 1446
1306cf::player->attach ( 1447cf::player->attach (
1307 on_command => sub { 1448 on_unknown_command => sub {
1308 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1309 1450
1310 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1311 or return; 1452 or return;
1312 1453
1335 1476
1336 $pl->ext_reply ($reply, @reply) 1477 $pl->ext_reply ($reply, @reply)
1337 if $reply; 1478 if $reply;
1338 1479
1339 } else { 1480 } else {
1340 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1481 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1341 } 1482 }
1342 1483
1343 cf::override; 1484 cf::override;
1344 }, 1485 },
1345); 1486);
1356 1497
1357 $grp 1498 $grp
1358} 1499}
1359 1500
1360sub load_extensions { 1501sub load_extensions {
1502 info "loading extensions...";
1503
1361 cf::sync_job { 1504 cf::sync_job {
1362 my %todo; 1505 my %todo;
1363 1506
1364 for my $path (<$LIBDIR/*.ext>) { 1507 for my $path (<$LIBDIR/*.ext>) {
1365 next unless -r $path; 1508 next unless -r $path;
1383 1526
1384 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1527 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1385 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1528 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1386 1529
1387 $ext{source} = 1530 $ext{source} =
1388 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1531 "package $pkg; use common::sense;\n"
1389 . "#line 1 \"$path\"\n{\n" 1532 . "#line 1 \"$path\"\n{\n"
1390 . $source 1533 . $source
1391 . "\n};\n1"; 1534 . "\n};\n1";
1392 1535
1393 $todo{$base} = \%ext; 1536 $todo{$base} = \%ext;
1394 } 1537 }
1395 1538
1539 my $pass = 0;
1396 my %done; 1540 my %done;
1397 while (%todo) { 1541 while (%todo) {
1398 my $progress; 1542 my $progress;
1399 1543
1544 ++$pass;
1545
1546 ext:
1400 while (my ($k, $v) = each %todo) { 1547 while (my ($k, $v) = each %todo) {
1401 for (split /,\s*/, $v->{meta}{depends}) { 1548 for (split /,\s*/, $v->{meta}{depends}) {
1402 goto skip 1549 next ext
1403 unless exists $done{$_}; 1550 unless exists $done{$_};
1404 } 1551 }
1405 1552
1406 warn "... loading '$k' into '$v->{pkg}'\n"; 1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1407 1554
1408 unless (eval $v->{source}) { 1555 my $active = eval $v->{source};
1556
1557 if (length $@) {
1409 my $msg = $@ ? "$v->{path}: $@\n" 1558 error "$v->{path}: $@\n";
1410 : "$v->{base}: extension inactive.\n";
1411 1559
1412 if (exists $v->{meta}{mandatory}) {
1413 warn $msg;
1414 cf::cleanup "mandatory extension failed to load, exiting."; 1560 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1415 } 1561 if exists $v->{meta}{mandatory};
1416 1562
1417 warn $msg; 1563 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1564 delete $todo{$k};
1565 } else {
1566 $done{$k} = delete $todo{$k};
1567 push @EXTS, $v->{pkg};
1568 $progress = 1;
1569
1570 info "$v->{base}: extension inactive.\n"
1571 unless $active;
1418 } 1572 }
1419
1420 $done{$k} = delete $todo{$k};
1421 push @EXTS, $v->{pkg};
1422 $progress = 1;
1423 } 1573 }
1424 1574
1425 skip: 1575 unless ($progress) {
1426 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1576 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1427 unless $progress; 1577
1578 while (my ($k, $v) = each %todo) {
1579 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1580 if exists $v->{meta}{mandatory};
1581 }
1582
1583 last;
1584 }
1428 } 1585 }
1429 }; 1586 };
1430} 1587}
1431 1588
1432############################################################################# 1589#############################################################################
1516 $cf::PLAYER{$login} = $pl 1673 $cf::PLAYER{$login} = $pl
1517 } 1674 }
1518 } 1675 }
1519} 1676}
1520 1677
1678cf::player->attach (
1679 on_load => sub {
1680 my ($pl, $path) = @_;
1681
1682 # restore slots saved in save, below
1683 my $slots = delete $pl->{_slots};
1684
1685 $pl->ob->current_weapon ($slots->[0]);
1686 $pl->combat_ob ($slots->[1]);
1687 $pl->ranged_ob ($slots->[2]);
1688 },
1689);
1690
1521sub save($) { 1691sub save($) {
1522 my ($pl) = @_; 1692 my ($pl) = @_;
1523 1693
1524 return if $pl->{deny_save}; 1694 return if $pl->{deny_save};
1525 1695
1530 1700
1531 aio_mkdir playerdir $pl, 0770; 1701 aio_mkdir playerdir $pl, 0770;
1532 $pl->{last_save} = $cf::RUNTIME; 1702 $pl->{last_save} = $cf::RUNTIME;
1533 1703
1534 cf::get_slot 0.01; 1704 cf::get_slot 0.01;
1705
1706 # save slots, to be restored later
1707 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1535 1708
1536 $pl->save_pl ($path); 1709 $pl->save_pl ($path);
1537 cf::cede_to_tick; 1710 cf::cede_to_tick;
1538} 1711}
1539 1712
1573 my $name = $pl->ob->name; 1746 my $name = $pl->ob->name;
1574 1747
1575 $pl->{deny_save} = 1; 1748 $pl->{deny_save} = 1;
1576 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1749 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1577 1750
1578 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1751 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1579 $pl->deactivate; 1752 $pl->deactivate;
1753
1580 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1754 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1581 $pl->ob->check_score;
1582 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1755 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1756 ext::highscore::check ($pl->ob);
1757
1583 $pl->ns->destroy if $pl->ns; 1758 $pl->ns->destroy if $pl->ns;
1584 1759
1585 my $path = playerdir $pl; 1760 my $path = playerdir $pl;
1586 my $temp = "$path~$cf::RUNTIME~deleting~"; 1761 my $temp = "$path~$cf::RUNTIME~deleting~";
1587 aio_rename $path, $temp; 1762 aio_rename $path, $temp;
1641 \@logins 1816 \@logins
1642} 1817}
1643 1818
1644=item $player->maps 1819=item $player->maps
1645 1820
1821=item cf::player::maps $login
1822
1646Returns an arrayref of map paths that are private for this 1823Returns an arrayref of map paths that are private for this
1647player. May block. 1824player. May block.
1648 1825
1649=cut 1826=cut
1650 1827
1712=cut 1889=cut
1713 1890
1714sub find_by_path($) { 1891sub find_by_path($) {
1715 my ($path) = @_; 1892 my ($path) = @_;
1716 1893
1894 $path =~ s/^~[^\/]*//; # skip ~login
1895
1717 my ($match, $specificity); 1896 my ($match, $specificity);
1718 1897
1719 for my $region (list) { 1898 for my $region (list) {
1720 if ($region->{match} && $path =~ $region->{match}) { 1899 if ($region->{match} && $path =~ $region->{match}) {
1721 ($match, $specificity) = ($region, $region->specificity) 1900 ($match, $specificity) = ($region, $region->specificity)
1749sub generate_random_map { 1928sub generate_random_map {
1750 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1751 1930
1752 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1931 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1753 1932
1754 # mit "rum" bekleckern, nicht
1755 $self->_create_random_map ( 1933 $self->_create_random_map ($rmp);
1756 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1757 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1758 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1759 $rmp->{exit_on_final_map},
1760 $rmp->{xsize}, $rmp->{ysize},
1761 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1762 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1763 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1764 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1765 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1766 (cf::region::find $rmp->{region}), $rmp->{custom}
1767 )
1768} 1934}
1769 1935
1770=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1771 1937
1772Register a handler for the map path matching the given regex at the 1938Register a handler for the map path matching the given regex at the
1777 1943
1778sub register { 1944sub register {
1779 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1780 my $pkg = caller; 1946 my $pkg = caller;
1781 1947
1782 no strict;
1783 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1784 1949
1785 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1786} 1951}
1787 1952
1788# also paths starting with '/' 1953# also paths starting with '/'
1789$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1954$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1790 1955
1791sub thawer_merge { 1956sub thawer_merge {
1792 my ($self, $merge) = @_; 1957 my ($self, $merge) = @_;
1793 1958
1794 # we have to keep some variables in memory intact 1959 # we have to keep some variables in memory intact
1799} 1964}
1800 1965
1801sub normalise { 1966sub normalise {
1802 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1803 1968
1804 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1805 1970
1806 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1807 1972
1808 # map plan: 1973 # map plan:
1809 # 1974 #
1824 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1825 $path = "$base/$path"; 1990 $path = "$base/$path";
1826 } 1991 }
1827 1992
1828 for ($path) { 1993 for ($path) {
1829 redo if s{//}{/};
1830 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1831 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1832 } 1996 }
1833 1997
1834 $path 1998 $path
1848 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1849 return $self; 2013 return $self;
1850 } 2014 }
1851 } 2015 }
1852 2016
1853 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1854 () 2018 ()
1855} 2019}
1856 2020
2021# may re-bless or do other evil things
1857sub init { 2022sub init {
1858 my ($self) = @_; 2023 my ($self) = @_;
1859 2024
1860 $self 2025 $self
1861} 2026}
1926 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1927 2092
1928 1 2093 1
1929} 2094}
1930 2095
2096# used to laod the header of an original map
1931sub load_header_orig { 2097sub load_header_orig {
1932 my ($self) = @_; 2098 my ($self) = @_;
1933 2099
1934 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
1935} 2101}
1936 2102
2103# used to laod the header of an instantiated map
1937sub load_header_temp { 2104sub load_header_temp {
1938 my ($self) = @_; 2105 my ($self) = @_;
1939 2106
1940 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
1941} 2108}
1942 2109
2110# called after loading the header from an instantiated map
1943sub prepare_temp { 2111sub prepare_temp {
1944 my ($self) = @_; 2112 my ($self) = @_;
1945 2113
1946 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
1947 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
1948 # safety 2116 # safety
1949 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
1950 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
1951} 2119}
1952 2120
2121# called after loading the header from an original map
1953sub prepare_orig { 2122sub prepare_orig {
1954 my ($self) = @_; 2123 my ($self) = @_;
1955 2124
1956 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
1957 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
1981 2150
1982sub find; 2151sub find;
1983sub find { 2152sub find {
1984 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
1985 2154
2155 cf::cede_to_tick;
2156
1986 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
1987 2158
1988 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1989 my $guard2 = cf::lock_acquire "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
1990 2161
1991 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
2008 2179
2009 $cf::MAP{$path} = $map 2180 $cf::MAP{$path} = $map
2010 } 2181 }
2011} 2182}
2012 2183
2013sub pre_load { } 2184sub pre_load { }
2014sub post_load { } 2185#sub post_load { } # XS
2015 2186
2016sub load { 2187sub load {
2017 my ($self) = @_; 2188 my ($self) = @_;
2018 2189
2019 local $self->{deny_reset} = 1; # loading can take a long time 2190 local $self->{deny_reset} = 1; # loading can take a long time
2022 2193
2023 { 2194 {
2024 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2025 2196
2026 return unless $self->valid; 2197 return unless $self->valid;
2027 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2028
2029 $self->in_memory (cf::MAP_LOADING);
2030 2199
2031 $self->alloc; 2200 $self->alloc;
2032 2201
2033 $self->pre_load; 2202 $self->pre_load;
2034 cf::cede_to_tick; 2203 cf::cede_to_tick;
2035 2204
2205 if (exists $self->{load_path}) {
2036 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2037 $f->skip_block; 2207 $f->skip_block;
2038 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2039 or return; 2209 or return;
2040 2210
2041 $self->post_load_original 2211 $self->post_load_original
2042 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2043 2213
2044 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2045 utf8::encode $uniq; 2215 utf8::encode $uniq;
2046 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2047 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2048 $self->clear_unique_items; 2218 $self->clear_unique_items;
2049 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2050 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2051 } 2222 }
2052 } 2223 }
2053 }
2054 2224
2055 $f->resolve_delayed_derefs; 2225 $f->resolve_delayed_derefs;
2226 } else {
2227 $self->post_load_original
2228 if delete $self->{load_original};
2229 }
2230
2231 $self->state (cf::MAP_INACTIVE);
2056 2232
2057 cf::cede_to_tick; 2233 cf::cede_to_tick;
2058 # now do the right thing for maps 2234 # now do the right thing for maps
2059 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2060 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
2064 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2065 $self->decay_objects; 2241 $self->decay_objects;
2066 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2067 $self->update_buttons; 2243 $self->update_buttons;
2068 cf::cede_to_tick; 2244 cf::cede_to_tick;
2069 $self->activate; 2245 #$self->activate; # no longer activate maps automatically
2070 } 2246 }
2071 2247
2072 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2073 $self->last_access ($cf::RUNTIME); 2249 $self->last_access ($cf::RUNTIME);
2074
2075 $self->in_memory (cf::MAP_ACTIVE);
2076 } 2250 }
2077 2251
2078 $self->post_load; 2252 $self->post_load;
2079}
2080 2253
2254 1
2255}
2256
2257# customize the map for a given player, i.e.
2258# return the _real_ map. used by e.g. per-player
2259# maps to change the path to ~playername/mappath
2081sub customise_for { 2260sub customise_for {
2082 my ($self, $ob) = @_; 2261 my ($self, $ob) = @_;
2083 2262
2084 return find "~" . $ob->name . "/" . $self->{path} 2263 return find "~" . $ob->name . "/" . $self->{path}
2085 if $self->per_player; 2264 if $self->per_player;
2088# if $self->per_party; 2267# if $self->per_party;
2089 2268
2090 $self 2269 $self
2091} 2270}
2092 2271
2093# find and load all maps in the 3x3 area around a map
2094sub load_neighbours {
2095 my ($map) = @_;
2096
2097 my @neigh; # diagonal neighbours
2098
2099 for (0 .. 3) {
2100 my $neigh = $map->tile_path ($_)
2101 or next;
2102 $neigh = find $neigh, $map
2103 or next;
2104 $neigh->load;
2105
2106 push @neigh,
2107 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2108 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2109 }
2110
2111 for (grep defined $_->[0], @neigh) {
2112 my ($path, $origin) = @$_;
2113 my $neigh = find $path, $origin
2114 or next;
2115 $neigh->load;
2116 }
2117}
2118
2119sub find_sync { 2272sub find_sync {
2120 my ($path, $origin) = @_; 2273 my ($path, $origin) = @_;
2121 2274
2122 cf::sync_job { find $path, $origin } 2275 # it's a bug to call this from the main context
2276 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2277 if $Coro::current == $Coro::main;
2278
2279 find $path, $origin
2123} 2280}
2124 2281
2125sub do_load_sync { 2282sub do_load_sync {
2126 my ($map) = @_; 2283 my ($map) = @_;
2127 2284
2285 # it's a bug to call this from the main context
2128 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2286 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2129 if $Coro::current == $Coro::main; 2287 if $Coro::current == $Coro::main;
2130 2288
2131 cf::sync_job { $map->load }; 2289 $map->load;
2132} 2290}
2133 2291
2134our %MAP_PREFETCH; 2292our %MAP_PREFETCH;
2135our $MAP_PREFETCHER = undef; 2293our $MAP_PREFETCHER = undef;
2136 2294
2137sub find_async { 2295sub find_async {
2138 my ($path, $origin, $load) = @_; 2296 my ($path, $origin, $load) = @_;
2139 2297
2140 $path = normalise $path, $origin && $origin->{path}; 2298 $path = normalise $path, $origin;
2141 2299
2142 if (my $map = $cf::MAP{$path}) { 2300 if (my $map = $cf::MAP{$path}) {
2143 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2301 return $map if !$load || $map->linkable;
2144 } 2302 }
2145 2303
2146 $MAP_PREFETCH{$path} |= $load; 2304 $MAP_PREFETCH{$path} |= $load;
2147 2305
2148 $MAP_PREFETCHER ||= cf::async { 2306 $MAP_PREFETCHER ||= cf::async {
2162 $MAP_PREFETCHER->prio (6); 2320 $MAP_PREFETCHER->prio (6);
2163 2321
2164 () 2322 ()
2165} 2323}
2166 2324
2325# common code, used by both ->save and ->swapout
2167sub save { 2326sub _save {
2168 my ($self) = @_; 2327 my ($self) = @_;
2169
2170 my $lock = cf::lock_acquire "map_data:$self->{path}";
2171 2328
2172 $self->{last_save} = $cf::RUNTIME; 2329 $self->{last_save} = $cf::RUNTIME;
2173 2330
2174 return unless $self->dirty; 2331 return unless $self->dirty;
2175 2332
2195 } else { 2352 } else {
2196 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2353 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2197 } 2354 }
2198} 2355}
2199 2356
2357sub save {
2358 my ($self) = @_;
2359
2360 my $lock = cf::lock_acquire "map_data:$self->{path}";
2361
2362 $self->_save;
2363}
2364
2200sub swap_out { 2365sub swap_out {
2201 my ($self) = @_; 2366 my ($self) = @_;
2202 2367
2203 # save first because save cedes
2204 $self->save;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2368 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2369
2370 return if !$self->linkable;
2371 return if $self->{deny_save};
2208 return if $self->players; 2372 return if $self->players;
2209 return if $self->in_memory != cf::MAP_ACTIVE; 2373
2374 # first deactivate the map and "unlink" it from the core
2375 $self->deactivate;
2376 $_->clear_links_to ($self) for values %cf::MAP;
2377 $self->state (cf::MAP_SWAPPED);
2378
2379 # then atomically save
2380 $self->_save;
2381
2382 # then free the map
2383 $self->clear;
2384}
2385
2386sub reset_at {
2387 my ($self) = @_;
2388
2389 # TODO: safety, remove and allow resettable per-player maps
2210 return if $self->{deny_save}; 2390 return 1e99 if $self->{deny_reset};
2211 2391
2392 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2393 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2394
2395 $time + $to
2396}
2397
2398sub should_reset {
2399 my ($self) = @_;
2400
2401 $self->reset_at <= $cf::RUNTIME
2402}
2403
2404sub reset {
2405 my ($self) = @_;
2406
2407 my $lock = cf::lock_acquire "map_data:$self->{path}";
2408
2409 return if $self->players;
2410
2411 cf::trace "resetting map ", $self->path, "\n";
2412
2212 $self->in_memory (cf::MAP_SWAPPED); 2413 $self->state (cf::MAP_SWAPPED);
2414
2415 # need to save uniques path
2416 unless ($self->{deny_save}) {
2417 my $uniq = $self->uniq_path; utf8::encode $uniq;
2418
2419 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2420 if $uniq;
2421 }
2422
2423 delete $cf::MAP{$self->path};
2213 2424
2214 $self->deactivate; 2425 $self->deactivate;
2215 $_->clear_links_to ($self) for values %cf::MAP; 2426 $_->clear_links_to ($self) for values %cf::MAP;
2216 $self->clear; 2427 $self->clear;
2217}
2218
2219sub reset_at {
2220 my ($self) = @_;
2221
2222 # TODO: safety, remove and allow resettable per-player maps
2223 return 1e99 if $self->{deny_reset};
2224
2225 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2226 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2227
2228 $time + $to
2229}
2230
2231sub should_reset {
2232 my ($self) = @_;
2233
2234 $self->reset_at <= $cf::RUNTIME
2235}
2236
2237sub reset {
2238 my ($self) = @_;
2239
2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
2241
2242 return if $self->players;
2243
2244 warn "resetting map ", $self->path, "\n";
2245
2246 $self->in_memory (cf::MAP_SWAPPED);
2247
2248 # need to save uniques path
2249 unless ($self->{deny_save}) {
2250 my $uniq = $self->uniq_path; utf8::encode $uniq;
2251
2252 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2253 if $uniq;
2254 }
2255
2256 delete $cf::MAP{$self->path};
2257
2258 $self->deactivate;
2259 $_->clear_links_to ($self) for values %cf::MAP;
2260 $self->clear;
2261 2428
2262 $self->unlink_save; 2429 $self->unlink_save;
2263 $self->destroy; 2430 $self->destroy;
2264} 2431}
2265 2432
2273 2440
2274 delete $cf::MAP{$self->path}; 2441 delete $cf::MAP{$self->path};
2275 2442
2276 $self->unlink_save; 2443 $self->unlink_save;
2277 2444
2278 bless $self, "cf::map"; 2445 bless $self, "cf::map::wrap";
2279 delete $self->{deny_reset}; 2446 delete $self->{deny_reset};
2280 $self->{deny_save} = 1; 2447 $self->{deny_save} = 1;
2281 $self->reset_timeout (1); 2448 $self->reset_timeout (1);
2282 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2449 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2283 2450
2340 : normalise $_ 2507 : normalise $_
2341 } @{ aio_readdir $UNIQUEDIR or [] } 2508 } @{ aio_readdir $UNIQUEDIR or [] }
2342 ] 2509 ]
2343} 2510}
2344 2511
2512=item cf::map::static_maps
2513
2514Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2515file in the shared directory excluding F</styles> and F</editor>). May
2516block.
2517
2518=cut
2519
2520sub static_maps() {
2521 my @dirs = "";
2522 my @maps;
2523
2524 while (@dirs) {
2525 my $dir = shift @dirs;
2526
2527 next if $dir eq "/styles" || $dir eq "/editor";
2528
2529 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2530 or return;
2531
2532 for (@$files) {
2533 s/\.map$// or next;
2534 utf8::decode $_;
2535 push @maps, "$dir/$_";
2536 }
2537
2538 push @dirs, map "$dir/$_", @$dirs;
2539 }
2540
2541 \@maps
2542}
2543
2345=back 2544=back
2346 2545
2347=head3 cf::object 2546=head3 cf::object
2348 2547
2349=cut 2548=cut
2481 2680
2482Freezes the player and moves him/her to a special map (C<{link}>). 2681Freezes the player and moves him/her to a special map (C<{link}>).
2483 2682
2484The player should be reasonably safe there for short amounts of time (e.g. 2683The player should be reasonably safe there for short amounts of time (e.g.
2485for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2684for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2486though, as the palyer cannot control the character while it is on the link 2685though, as the player cannot control the character while it is on the link
2487map. 2686map.
2488 2687
2489Will never block. 2688Will never block.
2490 2689
2491=item $player_object->leave_link ($map, $x, $y) 2690=item $player_object->leave_link ($map, $x, $y)
2512sub cf::object::player::enter_link { 2711sub cf::object::player::enter_link {
2513 my ($self) = @_; 2712 my ($self) = @_;
2514 2713
2515 $self->deactivate_recursive; 2714 $self->deactivate_recursive;
2516 2715
2716 ++$self->{_link_recursion};
2717
2517 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2718 return if UNIVERSAL::isa $self->map, "ext::map_link";
2518 2719
2519 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2720 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2520 if $self->map && $self->map->{path} ne "{link}"; 2721 if $self->map && $self->map->{path} ne "{link}";
2521 2722
2522 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2723 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2523} 2724}
2524 2725
2525sub cf::object::player::leave_link { 2726sub cf::object::player::leave_link {
2526 my ($self, $map, $x, $y) = @_; 2727 my ($self, $map, $x, $y) = @_;
2527 2728
2544 ($x, $y) = (-1, -1) 2745 ($x, $y) = (-1, -1)
2545 unless (defined $x) && (defined $y); 2746 unless (defined $x) && (defined $y);
2546 2747
2547 # use -1 or undef as default coordinates, not 0, 0 2748 # use -1 or undef as default coordinates, not 0, 0
2548 ($x, $y) = ($map->enter_x, $map->enter_y) 2749 ($x, $y) = ($map->enter_x, $map->enter_y)
2549 if $x <=0 && $y <= 0; 2750 if $x <= 0 && $y <= 0;
2550 2751
2551 $map->load; 2752 $map->load;
2552 $map->load_neighbours;
2553 2753
2554 return unless $self->contr->active; 2754 return unless $self->contr->active;
2555 2755
2556 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2756 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2557 $self->enter_map ($map, $x, $y); 2757 if ($self->enter_map ($map, $x, $y)) {
2558 2758 # entering was successful
2759 delete $self->{_link_recursion};
2559 # only activate afterwards, to support waiting in hooks 2760 # only activate afterwards, to support waiting in hooks
2560 $self->activate_recursive; 2761 $self->activate_recursive;
2561} 2762 }
2562 2763
2764}
2765
2563=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2766=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2564 2767
2565Moves the player to the given map-path and coordinates by first freezing 2768Moves the player to the given map-path and coordinates by first freezing
2566her, loading and preparing them map, calling the provided $check callback 2769her, loading and preparing them map, calling the provided $check callback
2567that has to return the map if sucecssful, and then unfreezes the player on 2770that has to return the map if sucecssful, and then unfreezes the player on
2568the new (success) or old (failed) map position. In either case, $done will 2771the new (success) or old (failed) map position. In either case, $done will
2575 2778
2576our $GOTOGEN; 2779our $GOTOGEN;
2577 2780
2578sub cf::object::player::goto { 2781sub cf::object::player::goto {
2579 my ($self, $path, $x, $y, $check, $done) = @_; 2782 my ($self, $path, $x, $y, $check, $done) = @_;
2783
2784 if ($self->{_link_recursion} >= $MAX_LINKS) {
2785 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2786 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2787 ($path, $x, $y) = @$EMERGENCY_POSITION;
2788 }
2580 2789
2581 # do generation counting so two concurrent goto's will be executed in-order 2790 # do generation counting so two concurrent goto's will be executed in-order
2582 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2791 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2583 2792
2584 $self->enter_link; 2793 $self->enter_link;
2604 ($path, $x, $y) = (undef, undef, undef); 2813 ($path, $x, $y) = (undef, undef, undef);
2605 } 2814 }
2606 } 2815 }
2607 2816
2608 my $map = eval { 2817 my $map = eval {
2609 my $map = defined $path ? cf::map::find $path : undef; 2818 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2610 2819
2611 if ($map) { 2820 if ($map) {
2612 $map = $map->customise_for ($self); 2821 $map = $map->customise_for ($self);
2613 $map = $check->($map) if $check && $map; 2822 $map = $check->($map, $x, $y, $self) if $check && $map;
2614 } else { 2823 } else {
2615 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2824 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2616 } 2825 }
2617 2826
2618 $map 2827 $map
2626 if ($gen == $self->{_goto_generation}) { 2835 if ($gen == $self->{_goto_generation}) {
2627 delete $self->{_goto_generation}; 2836 delete $self->{_goto_generation};
2628 $self->leave_link ($map, $x, $y); 2837 $self->leave_link ($map, $x, $y);
2629 } 2838 }
2630 2839
2631 $done->() if $done; 2840 $done->($self) if $done;
2632 })->prio (1); 2841 })->prio (1);
2633} 2842}
2634 2843
2635=item $player_object->enter_exit ($exit_object) 2844=item $player_object->enter_exit ($exit_object)
2636 2845
2704 $Coro::current->{desc} = "enter_exit"; 2913 $Coro::current->{desc} = "enter_exit";
2705 2914
2706 unless (eval { 2915 unless (eval {
2707 $self->deactivate_recursive; # just to be sure 2916 $self->deactivate_recursive; # just to be sure
2708 2917
2709 # random map handling
2710 {
2711 my $guard = cf::lock_acquire "exit_prepare:$exit";
2712
2713 prepare_random_map $exit
2714 if $exit->slaying eq "/!";
2715 }
2716
2717 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2918 my $map = cf::map::normalise $exit->slaying, $exit->map;
2718 my $x = $exit->stats->hp; 2919 my $x = $exit->stats->hp;
2719 my $y = $exit->stats->sp; 2920 my $y = $exit->stats->sp;
2921
2922 # special map handling
2923 my $slaying = $exit->slaying;
2924
2925 # special map handling
2926 if ($slaying eq "/!") {
2927 my $guard = cf::lock_acquire "exit_prepare:$exit";
2928
2929 prepare_random_map $exit
2930 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2931
2932 $map = $exit->slaying;
2933
2934 } elsif ($slaying eq '!up') {
2935 $map = $exit->map->tile_path (cf::TILE_UP);
2936 $x = $exit->x;
2937 $y = $exit->y;
2938
2939 } elsif ($slaying eq '!down') {
2940 $map = $exit->map->tile_path (cf::TILE_DOWN);
2941 $x = $exit->x;
2942 $y = $exit->y;
2943 }
2720 2944
2721 $self->goto ($map, $x, $y); 2945 $self->goto ($map, $x, $y);
2722 2946
2723 # if exit is damned, update players death & WoR home-position 2947 # if exit is damned, update players death & WoR home-position
2724 $self->contr->savebed ($map, $x, $y) 2948 $self->contr->savebed ($map, $x, $y)
2729 $self->message ("Something went wrong deep within the deliantra server. " 2953 $self->message ("Something went wrong deep within the deliantra server. "
2730 . "I'll try to bring you back to the map you were before. " 2954 . "I'll try to bring you back to the map you were before. "
2731 . "Please report this to the dungeon master!", 2955 . "Please report this to the dungeon master!",
2732 cf::NDI_UNIQUE | cf::NDI_RED); 2956 cf::NDI_UNIQUE | cf::NDI_RED);
2733 2957
2734 warn "ERROR in enter_exit: $@"; 2958 error "ERROR in enter_exit: $@";
2735 $self->leave_link; 2959 $self->leave_link;
2736 } 2960 }
2737 })->prio (1); 2961 })->prio (1);
2738} 2962}
2739 2963
2751sub cf::client::send_drawinfo { 2975sub cf::client::send_drawinfo {
2752 my ($self, $text, $flags) = @_; 2976 my ($self, $text, $flags) = @_;
2753 2977
2754 utf8::encode $text; 2978 utf8::encode $text;
2755 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2979 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2980}
2981
2982=item $client->send_big_packet ($pkt)
2983
2984Like C<send_packet>, but tries to compress large packets, and fragments
2985them as required.
2986
2987=cut
2988
2989our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2990
2991sub cf::client::send_big_packet {
2992 my ($self, $pkt) = @_;
2993
2994 # try lzf for large packets
2995 $pkt = "lzf " . Compress::LZF::compress $pkt
2996 if 1024 <= length $pkt and $self->{can_lzf};
2997
2998 # split very large packets
2999 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3000 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3001 $pkt = "frag";
3002 }
3003
3004 $self->send_packet ($pkt);
2756} 3005}
2757 3006
2758=item $client->send_msg ($channel, $msg, $color, [extra...]) 3007=item $client->send_msg ($channel, $msg, $color, [extra...])
2759 3008
2760Send a drawinfo or msg packet to the client, formatting the msg for the 3009Send a drawinfo or msg packet to the client, formatting the msg for the
2764 3013
2765=cut 3014=cut
2766 3015
2767# non-persistent channels (usually the info channel) 3016# non-persistent channels (usually the info channel)
2768our %CHANNEL = ( 3017our %CHANNEL = (
3018 "c/motd" => {
3019 id => "infobox",
3020 title => "MOTD",
3021 reply => undef,
3022 tooltip => "The message of the day",
3023 },
2769 "c/identify" => { 3024 "c/identify" => {
2770 id => "infobox", 3025 id => "infobox",
2771 title => "Identify", 3026 title => "Identify",
2772 reply => undef, 3027 reply => undef,
2773 tooltip => "Items recently identified", 3028 tooltip => "Items recently identified",
2775 "c/examine" => { 3030 "c/examine" => {
2776 id => "infobox", 3031 id => "infobox",
2777 title => "Examine", 3032 title => "Examine",
2778 reply => undef, 3033 reply => undef,
2779 tooltip => "Signs and other items you examined", 3034 tooltip => "Signs and other items you examined",
3035 },
3036 "c/shopinfo" => {
3037 id => "infobox",
3038 title => "Shop Info",
3039 reply => undef,
3040 tooltip => "What your bargaining skill tells you about the shop",
2780 }, 3041 },
2781 "c/book" => { 3042 "c/book" => {
2782 id => "infobox", 3043 id => "infobox",
2783 title => "Book", 3044 title => "Book",
2784 reply => undef, 3045 reply => undef,
2900 my $pkt = "msg " 3161 my $pkt = "msg "
2901 . $self->{json_coder}->encode ( 3162 . $self->{json_coder}->encode (
2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3163 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2903 ); 3164 );
2904 3165
2905 # try lzf for large packets
2906 $pkt = "lzf " . Compress::LZF::compress $pkt
2907 if 1024 <= length $pkt and $self->{can_lzf};
2908
2909 # split very large packets
2910 if (8192 < length $pkt and $self->{can_lzf}) {
2911 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2912 $pkt = "frag";
2913 }
2914
2915 $self->send_packet ($pkt); 3166 $self->send_big_packet ($pkt);
2916} 3167}
2917 3168
2918=item $client->ext_msg ($type, @msg) 3169=item $client->ext_msg ($type, @msg)
2919 3170
2920Sends an ext event to the client. 3171Sends an ext event to the client.
2923 3174
2924sub cf::client::ext_msg($$@) { 3175sub cf::client::ext_msg($$@) {
2925 my ($self, $type, @msg) = @_; 3176 my ($self, $type, @msg) = @_;
2926 3177
2927 if ($self->extcmd == 2) { 3178 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2929 } elsif ($self->extcmd == 1) { # TODO: remove 3180 } elsif ($self->extcmd == 1) { # TODO: remove
2930 push @msg, msgtype => "event_$type"; 3181 push @msg, msgtype => "event_$type";
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3182 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 } 3183 }
2933} 3184}
2934 3185
2935=item $client->ext_reply ($msgid, @msg) 3186=item $client->ext_reply ($msgid, @msg)
2936 3187
2940 3191
2941sub cf::client::ext_reply($$@) { 3192sub cf::client::ext_reply($$@) {
2942 my ($self, $id, @msg) = @_; 3193 my ($self, $id, @msg) = @_;
2943 3194
2944 if ($self->extcmd == 2) { 3195 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3196 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2946 } elsif ($self->extcmd == 1) { 3197 } elsif ($self->extcmd == 1) {
2947 #TODO: version 1, remove 3198 #TODO: version 1, remove
2948 unshift @msg, msgtype => "reply", msgid => $id; 3199 unshift @msg, msgtype => "reply", msgid => $id;
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3200 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 } 3201 }
2951} 3202}
2952 3203
2953=item $success = $client->query ($flags, "text", \&cb) 3204=item $success = $client->query ($flags, "text", \&cb)
2954 3205
3025 3276
3026 $ns->ext_reply ($reply, @reply) 3277 $ns->ext_reply ($reply, @reply)
3027 if $reply; 3278 if $reply;
3028 3279
3029 } else { 3280 } else {
3030 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3281 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3031 } 3282 }
3032 3283
3033 cf::override; 3284 cf::override;
3034 }, 3285 },
3035); 3286);
3055 3306
3056 $coro 3307 $coro
3057} 3308}
3058 3309
3059cf::client->attach ( 3310cf::client->attach (
3060 on_destroy => sub { 3311 on_client_destroy => sub {
3061 my ($ns) = @_; 3312 my ($ns) = @_;
3062 3313
3063 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3314 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3064 }, 3315 },
3065); 3316);
3081our $safe_hole = new Safe::Hole; 3332our $safe_hole = new Safe::Hole;
3082 3333
3083$SIG{FPE} = 'IGNORE'; 3334$SIG{FPE} = 'IGNORE';
3084 3335
3085$safe->permit_only (Opcode::opset qw( 3336$safe->permit_only (Opcode::opset qw(
3086 :base_core :base_mem :base_orig :base_math 3337 :base_core :base_mem :base_orig :base_math :base_loop
3087 grepstart grepwhile mapstart mapwhile 3338 grepstart grepwhile mapstart mapwhile
3088 sort time 3339 sort time
3089)); 3340));
3090 3341
3091# here we export the classes and methods available to script code 3342# here we export the classes and methods available to script code
3116 decrease split destroy change_exp value msg lore send_msg)], 3367 decrease split destroy change_exp value msg lore send_msg)],
3117 ["cf::object::player" => qw(player)], 3368 ["cf::object::player" => qw(player)],
3118 ["cf::player" => qw(peaceful send_msg)], 3369 ["cf::player" => qw(peaceful send_msg)],
3119 ["cf::map" => qw(trigger)], 3370 ["cf::map" => qw(trigger)],
3120) { 3371) {
3121 no strict 'refs';
3122 my ($pkg, @funs) = @$_; 3372 my ($pkg, @funs) = @$_;
3123 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3373 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3124 for @funs; 3374 for @funs;
3125} 3375}
3126 3376
3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3393 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3144 $qcode =~ s/\n/\\n/g; 3394 $qcode =~ s/\n/\\n/g;
3145 3395
3146 %vars = (_dummy => 0) unless %vars; 3396 %vars = (_dummy => 0) unless %vars;
3147 3397
3398 my @res;
3148 local $_; 3399 local $_;
3149 local @safe::cf::_safe_eval_args = values %vars;
3150 3400
3151 my $eval = 3401 my $eval =
3152 "do {\n" 3402 "do {\n"
3153 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3403 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3154 . "#line 0 \"{$qcode}\"\n" 3404 . "#line 0 \"{$qcode}\"\n"
3155 . $code 3405 . $code
3156 . "\n}" 3406 . "\n}"
3157 ; 3407 ;
3158 3408
3409 if ($CFG{safe_eval}) {
3159 sub_generation_inc; 3410 sub_generation_inc;
3411 local @safe::cf::_safe_eval_args = values %vars;
3160 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3412 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3161 sub_generation_inc; 3413 sub_generation_inc;
3414 } else {
3415 local @cf::_safe_eval_args = values %vars;
3416 @res = wantarray ? eval eval : scalar eval $eval;
3417 }
3162 3418
3163 if ($@) { 3419 if ($@) {
3164 warn "$@"; 3420 warn "$@",
3165 warn "while executing safe code '$code'\n"; 3421 "while executing safe code '$code'\n",
3166 warn "with arguments " . (join " ", %vars) . "\n"; 3422 "with arguments " . (join " ", %vars) . "\n";
3167 } 3423 }
3168 3424
3169 wantarray ? @res : $res[0] 3425 wantarray ? @res : $res[0]
3170} 3426}
3171 3427
3185=cut 3441=cut
3186 3442
3187sub register_script_function { 3443sub register_script_function {
3188 my ($fun, $cb) = @_; 3444 my ($fun, $cb) = @_;
3189 3445
3190 no strict 'refs'; 3446 $fun = "safe::$fun" if $CFG{safe_eval};
3191 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3447 *$fun = $safe_hole->wrap ($cb);
3192} 3448}
3193 3449
3194=back 3450=back
3195 3451
3196=cut 3452=cut
3205 # for this (global event?) 3461 # for this (global event?)
3206 %ext::player_env::MUSIC_FACE_CACHE = (); 3462 %ext::player_env::MUSIC_FACE_CACHE = ();
3207 3463
3208 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3464 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3209 3465
3210 warn "loading facedata from $path\n"; 3466 trace "loading facedata from $path\n";
3211 3467
3212 my $facedata; 3468 my $facedata = decode_storable load_file $path;
3213 0 < aio_load $path, $facedata
3214 or die "$path: $!";
3215
3216 $facedata = Coro::Storable::thaw $facedata;
3217 3469
3218 $facedata->{version} == 2 3470 $facedata->{version} == 2
3219 or cf::cleanup "$path: version mismatch, cannot proceed."; 3471 or cf::cleanup "$path: version mismatch, cannot proceed.";
3220 3472
3221 # patch in the exptable 3473 # patch in the exptable
3474 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3222 $facedata->{resource}{"res/exp_table"} = { 3475 $facedata->{resource}{"res/exp_table"} = {
3223 type => FT_RSRC, 3476 type => FT_RSRC,
3224 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3477 data => $exp_table,
3478 hash => (Digest::MD5::md5 $exp_table),
3225 }; 3479 };
3226 cf::cede_to_tick; 3480 cf::cede_to_tick;
3227 3481
3228 { 3482 {
3229 my $faces = $facedata->{faceinfo}; 3483 my $faces = $facedata->{faceinfo};
3231 while (my ($face, $info) = each %$faces) { 3485 while (my ($face, $info) = each %$faces) {
3232 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3486 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3233 3487
3234 cf::face::set_visibility $idx, $info->{visibility}; 3488 cf::face::set_visibility $idx, $info->{visibility};
3235 cf::face::set_magicmap $idx, $info->{magicmap}; 3489 cf::face::set_magicmap $idx, $info->{magicmap};
3236 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3490 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3237 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3491 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3492 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3238 3493
3239 cf::cede_to_tick; 3494 cf::cede_to_tick;
3240 } 3495 }
3241 3496
3242 while (my ($face, $info) = each %$faces) { 3497 while (my ($face, $info) = each %$faces) {
3247 3502
3248 if (my $smooth = cf::face::find $info->{smooth}) { 3503 if (my $smooth = cf::face::find $info->{smooth}) {
3249 cf::face::set_smooth $idx, $smooth; 3504 cf::face::set_smooth $idx, $smooth;
3250 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3505 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3251 } else { 3506 } else {
3252 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3507 error "smooth face '$info->{smooth}' not found for face '$face'";
3253 } 3508 }
3254 3509
3255 cf::cede_to_tick; 3510 cf::cede_to_tick;
3256 } 3511 }
3257 } 3512 }
3266 3521
3267 cf::anim::invalidate_all; # d'oh 3522 cf::anim::invalidate_all; # d'oh
3268 } 3523 }
3269 3524
3270 { 3525 {
3271 # TODO: for gcfclient pleasure, we should give resources
3272 # that gcfclient doesn't grok a >10000 face index.
3273 my $res = $facedata->{resource}; 3526 my $res = $facedata->{resource};
3274 3527
3275 while (my ($name, $info) = each %$res) { 3528 while (my ($name, $info) = each %$res) {
3276 if (defined $info->{type}) { 3529 if (defined $info->{type}) {
3277 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3530 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3278 my $data;
3279 3531
3280 if ($info->{type} & 1) { 3532 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3281 # prepend meta info
3282
3283 my $meta = $enc->encode ({
3284 name => $name,
3285 %{ $info->{meta} || {} },
3286 });
3287
3288 $data = pack "(w/a*)*", $meta, $info->{data};
3289 } else {
3290 $data = $info->{data};
3291 }
3292
3293 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3294 cf::face::set_type $idx, $info->{type}; 3533 cf::face::set_type $idx, $info->{type};
3295 } else { 3534 } else {
3296 $RESOURCE{$name} = $info; 3535 $RESOURCE{$name} = $info; # unused
3297 } 3536 }
3298 3537
3299 cf::cede_to_tick; 3538 cf::cede_to_tick;
3300 } 3539 }
3301 } 3540 }
3302 3541
3303 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3542 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3304 3543
3305 1 3544 1
3306} 3545}
3307
3308cf::global->attach (on_resource_update => sub {
3309 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3310 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3311
3312 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3313 my $sound = $soundconf->{compat}[$_]
3314 or next;
3315
3316 my $face = cf::face::find "sound/$sound->[1]";
3317 cf::sound::set $sound->[0] => $face;
3318 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3319 }
3320
3321 while (my ($k, $v) = each %{$soundconf->{event}}) {
3322 my $face = cf::face::find "sound/$v";
3323 cf::sound::set $k => $face;
3324 }
3325 }
3326});
3327 3546
3328register_exticmd fx_want => sub { 3547register_exticmd fx_want => sub {
3329 my ($ns, $want) = @_; 3548 my ($ns, $want) = @_;
3330 3549
3331 while (my ($k, $v) = each %$want) { 3550 while (my ($k, $v) = each %$want) {
3370sub reload_treasures { 3589sub reload_treasures {
3371 load_resource_file "$DATADIR/treasures" 3590 load_resource_file "$DATADIR/treasures"
3372 or die "unable to load treasurelists\n"; 3591 or die "unable to load treasurelists\n";
3373} 3592}
3374 3593
3594sub reload_sound {
3595 trace "loading sound config from $DATADIR/sound\n";
3596
3597 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3598
3599 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3600 my $sound = $soundconf->{compat}[$_]
3601 or next;
3602
3603 my $face = cf::face::find "sound/$sound->[1]";
3604 cf::sound::set $sound->[0] => $face;
3605 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3606 }
3607
3608 while (my ($k, $v) = each %{$soundconf->{event}}) {
3609 my $face = cf::face::find "sound/$v";
3610 cf::sound::set $k => $face;
3611 }
3612}
3613
3375sub reload_resources { 3614sub reload_resources {
3376 warn "reloading resource files...\n"; 3615 trace "reloading resource files...\n";
3377 3616
3617 reload_exp_table;
3618 reload_materials;
3378 reload_facedata; 3619 reload_facedata;
3620 reload_sound;
3379 reload_archetypes; 3621 reload_archetypes;
3380 reload_regions; 3622 reload_regions;
3381 reload_treasures; 3623 reload_treasures;
3382 3624
3383 warn "finished reloading resource files\n"; 3625 trace "finished reloading resource files\n";
3384} 3626}
3385 3627
3386sub reload_config { 3628sub reload_config {
3387 open my $fh, "<:utf8", "$CONFDIR/config" 3629 trace "reloading config file...\n";
3388 or return;
3389 3630
3390 local $/; 3631 my $config = load_file "$CONFDIR/config";
3391 *CFG = YAML::Load <$fh>; 3632 utf8::decode $config;
3633 *CFG = decode_yaml $config;
3392 3634
3393 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3635 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3394 3636
3395 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3637 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3396 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3638 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3397 3639
3398 if (exists $CFG{mlockall}) { 3640 if (exists $CFG{mlockall}) {
3422 seek $fh, 0, 0; 3664 seek $fh, 0, 0;
3423 print $fh $$; 3665 print $fh $$;
3424} 3666}
3425 3667
3426sub main_loop { 3668sub main_loop {
3427 warn "EV::loop starting\n"; 3669 trace "EV::loop starting\n";
3428 if (1) { 3670 if (1) {
3429 EV::loop; 3671 EV::loop;
3430 } 3672 }
3431 warn "EV::loop returned\n"; 3673 trace "EV::loop returned\n";
3432 goto &main_loop unless $REALLY_UNLOOP; 3674 goto &main_loop unless $REALLY_UNLOOP;
3433} 3675}
3434 3676
3435sub main { 3677sub main {
3436 cf::init_globals; # initialise logging 3678 cf::init_globals; # initialise logging
3437 3679
3438 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3680 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3439 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3681 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3440 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3682 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3441 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3683 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3442
3443 cf::init_experience;
3444 cf::init_anim;
3445 cf::init_attackmess;
3446 cf::init_dynamic;
3447 3684
3448 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3685 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3449 3686
3450 # we must not ever block the main coroutine 3687 # we must not ever block the main coroutine
3451 local $Coro::idle = sub { 3688 local $Coro::idle = sub {
3457 }; 3694 };
3458 3695
3459 evthread_start IO::AIO::poll_fileno; 3696 evthread_start IO::AIO::poll_fileno;
3460 3697
3461 cf::sync_job { 3698 cf::sync_job {
3699 cf::incloader::init ();
3700
3701 cf::init_anim;
3702 cf::init_attackmess;
3703 cf::init_dynamic;
3704
3705 cf::load_settings;
3706
3462 reload_resources; 3707 reload_resources;
3463 reload_config; 3708 reload_config;
3464 db_init; 3709 db_init;
3465 3710
3466 cf::load_settings;
3467 cf::load_materials;
3468 cf::init_uuid; 3711 cf::init_uuid;
3469 cf::init_signals; 3712 cf::init_signals;
3470 cf::init_commands;
3471 cf::init_skills; 3713 cf::init_skills;
3472 3714
3473 cf::init_beforeplay; 3715 cf::init_beforeplay;
3474 3716
3475 atomic; 3717 atomic;
3480 3722
3481 # no (long-running) fork's whatsoever before this point(!) 3723 # no (long-running) fork's whatsoever before this point(!)
3482 use POSIX (); 3724 use POSIX ();
3483 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3725 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3484 3726
3485 (pop @POST_INIT)->(0) while @POST_INIT; 3727 cf::_post_init 0;
3486 }; 3728 };
3487 3729
3730 cf::object::thawer::errors_are_fatal 0;
3731 info "parse errors in files are no longer fatal from this point on.\n";
3732
3733 my $free_main; $free_main = EV::idle sub {
3734 undef $free_main;
3735 undef &main; # free gobs of memory :)
3736 };
3737
3488 main_loop; 3738 goto &main_loop;
3489} 3739}
3490 3740
3491############################################################################# 3741#############################################################################
3492# initialisation and cleanup 3742# initialisation and cleanup
3493 3743
3494# install some emergency cleanup handlers 3744# install some emergency cleanup handlers
3495BEGIN { 3745BEGIN {
3496 our %SIGWATCHER = (); 3746 our %SIGWATCHER = ();
3497 for my $signal (qw(INT HUP TERM)) { 3747 for my $signal (qw(INT HUP TERM)) {
3498 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3748 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3499 cf::cleanup "SIG$signal"; 3749 cf::cleanup "SIG$signal";
3500 }; 3750 };
3501 } 3751 }
3502} 3752}
3503 3753
3504sub write_runtime_sync { 3754sub write_runtime_sync {
3755 my $t0 = AE::time;
3756
3505 # first touch the runtime file to show we are still running: 3757 # first touch the runtime file to show we are still running:
3506 # the fsync below can take a very very long time. 3758 # the fsync below can take a very very long time.
3507 3759
3508 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3760 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3509 3761
3510 my $guard = cf::lock_acquire "write_runtime"; 3762 my $guard = cf::lock_acquire "write_runtime";
3511 3763
3512 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3764 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3513 or return; 3765 or return;
3514 3766
3515 my $value = $cf::RUNTIME + 90 + 10; 3767 my $value = $cf::RUNTIME + 90 + 10;
3516 # 10 is the runtime save interval, for a monotonic clock 3768 # 10 is the runtime save interval, for a monotonic clock
3517 # 60 allows for the watchdog to kill the server. 3769 # 60 allows for the watchdog to kill the server.
3530 or return; 3782 or return;
3531 3783
3532 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3784 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3533 and return; 3785 and return;
3534 3786
3535 warn "runtime file written.\n"; 3787 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3536 3788
3537 1 3789 1
3538} 3790}
3539 3791
3540our $uuid_lock; 3792our $uuid_lock;
3552 or return; 3804 or return;
3553 3805
3554 my $value = uuid_seq uuid_cur; 3806 my $value = uuid_seq uuid_cur;
3555 3807
3556 unless ($value) { 3808 unless ($value) {
3557 warn "cowardly refusing to write zero uuid value!\n"; 3809 info "cowardly refusing to write zero uuid value!\n";
3558 return; 3810 return;
3559 } 3811 }
3560 3812
3561 my $value = uuid_str $value + $uuid_skip; 3813 my $value = uuid_str $value + $uuid_skip;
3562 $uuid_skip = 0; 3814 $uuid_skip = 0;
3572 or return; 3824 or return;
3573 3825
3574 aio_rename "$uuid~", $uuid 3826 aio_rename "$uuid~", $uuid
3575 and return; 3827 and return;
3576 3828
3577 warn "uuid file written ($value).\n"; 3829 trace "uuid file written ($value).\n";
3578 3830
3579 1 3831 1
3580 3832
3581} 3833}
3582 3834
3588} 3840}
3589 3841
3590sub emergency_save() { 3842sub emergency_save() {
3591 my $freeze_guard = cf::freeze_mainloop; 3843 my $freeze_guard = cf::freeze_mainloop;
3592 3844
3593 warn "emergency_perl_save: enter\n"; 3845 info "emergency_perl_save: enter\n";
3846
3847 # this is a trade-off: we want to be very quick here, so
3848 # save all maps without fsync, and later call a global sync
3849 # (which in turn might be very very slow)
3850 local $USE_FSYNC = 0;
3594 3851
3595 cf::sync_job { 3852 cf::sync_job {
3596 # this is a trade-off: we want to be very quick here, so 3853 cf::write_runtime_sync; # external watchdog should not bark
3597 # save all maps without fsync, and later call a global sync
3598 # (which in turn might be very very slow)
3599 local $USE_FSYNC = 0;
3600 3854
3601 # use a peculiar iteration method to avoid tripping on perl 3855 # use a peculiar iteration method to avoid tripping on perl
3602 # refcount bugs in for. also avoids problems with players 3856 # refcount bugs in for. also avoids problems with players
3603 # and maps saved/destroyed asynchronously. 3857 # and maps saved/destroyed asynchronously.
3604 warn "emergency_perl_save: begin player save\n"; 3858 info "emergency_perl_save: begin player save\n";
3605 for my $login (keys %cf::PLAYER) { 3859 for my $login (keys %cf::PLAYER) {
3606 my $pl = $cf::PLAYER{$login} or next; 3860 my $pl = $cf::PLAYER{$login} or next;
3607 $pl->valid or next; 3861 $pl->valid or next;
3608 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3862 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3609 $pl->save; 3863 $pl->save;
3610 } 3864 }
3611 warn "emergency_perl_save: end player save\n"; 3865 info "emergency_perl_save: end player save\n";
3612 3866
3867 cf::write_runtime_sync; # external watchdog should not bark
3868
3613 warn "emergency_perl_save: begin map save\n"; 3869 info "emergency_perl_save: begin map save\n";
3614 for my $path (keys %cf::MAP) { 3870 for my $path (keys %cf::MAP) {
3615 my $map = $cf::MAP{$path} or next; 3871 my $map = $cf::MAP{$path} or next;
3616 $map->valid or next; 3872 $map->valid or next;
3617 $map->save; 3873 $map->save;
3618 } 3874 }
3619 warn "emergency_perl_save: end map save\n"; 3875 info "emergency_perl_save: end map save\n";
3620 3876
3877 cf::write_runtime_sync; # external watchdog should not bark
3878
3621 warn "emergency_perl_save: begin database checkpoint\n"; 3879 info "emergency_perl_save: begin database checkpoint\n";
3622 BDB::db_env_txn_checkpoint $DB_ENV; 3880 BDB::db_env_txn_checkpoint $DB_ENV;
3623 warn "emergency_perl_save: end database checkpoint\n"; 3881 info "emergency_perl_save: end database checkpoint\n";
3624 3882
3625 warn "emergency_perl_save: begin write uuid\n"; 3883 info "emergency_perl_save: begin write uuid\n";
3626 write_uuid_sync 1; 3884 write_uuid_sync 1;
3627 warn "emergency_perl_save: end write uuid\n"; 3885 info "emergency_perl_save: end write uuid\n";
3886
3887 cf::write_runtime_sync; # external watchdog should not bark
3888
3889 trace "emergency_perl_save: syncing database to disk";
3890 BDB::db_env_txn_checkpoint $DB_ENV;
3891
3892 info "emergency_perl_save: starting sync\n";
3893 IO::AIO::aio_sync sub {
3894 info "emergency_perl_save: finished sync\n";
3895 };
3896
3897 cf::write_runtime_sync; # external watchdog should not bark
3898
3899 trace "emergency_perl_save: flushing outstanding aio requests";
3900 while (IO::AIO::nreqs || BDB::nreqs) {
3901 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3902 }
3903
3904 cf::write_runtime_sync; # external watchdog should not bark
3628 }; 3905 };
3629 3906
3630 warn "emergency_perl_save: starting sync()\n";
3631 IO::AIO::aio_sync sub {
3632 warn "emergency_perl_save: finished sync()\n";
3633 };
3634
3635 warn "emergency_perl_save: leave\n"; 3907 info "emergency_perl_save: leave\n";
3636} 3908}
3637 3909
3638sub post_cleanup { 3910sub post_cleanup {
3639 my ($make_core) = @_; 3911 my ($make_core) = @_;
3640 3912
3913 IO::AIO::flush;
3914
3641 warn Carp::longmess "post_cleanup backtrace" 3915 error Carp::longmess "post_cleanup backtrace"
3642 if $make_core; 3916 if $make_core;
3643 3917
3644 my $fh = pidfile; 3918 my $fh = pidfile;
3645 unlink $PIDFILE if <$fh> == $$; 3919 unlink $PIDFILE if <$fh> == $$;
3646} 3920}
3666 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3940 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3667 for my $name (keys %$leaf_symtab) { 3941 for my $name (keys %$leaf_symtab) {
3668 _gv_clear *{"$pkg$name"}; 3942 _gv_clear *{"$pkg$name"};
3669# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3943# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3670 } 3944 }
3671 warn "cleared package $pkg\n";#d#
3672} 3945}
3673 3946
3674sub do_reload_perl() { 3947sub do_reload_perl() {
3675 # can/must only be called in main 3948 # can/must only be called in main
3676 if ($Coro::current != $Coro::main) { 3949 unless (in_main) {
3677 warn "can only reload from main coroutine"; 3950 error "can only reload from main coroutine";
3678 return; 3951 return;
3679 } 3952 }
3680 3953
3681 return if $RELOAD++; 3954 return if $RELOAD++;
3682 3955
3683 my $t1 = EV::time; 3956 my $t1 = AE::time;
3684 3957
3685 while ($RELOAD) { 3958 while ($RELOAD) {
3686 warn "reloading..."; 3959 cf::get_slot 0.1, -1, "reload_perl";
3960 info "perl_reload: reloading...";
3687 3961
3688 warn "entering sync_job"; 3962 trace "perl_reload: entering sync_job";
3689 3963
3690 cf::sync_job { 3964 cf::sync_job {
3691 cf::write_runtime_sync; # external watchdog should not bark
3692 cf::emergency_save; 3965 #cf::emergency_save;
3693 cf::write_runtime_sync; # external watchdog should not bark
3694 3966
3695 warn "syncing database to disk";
3696 BDB::db_env_txn_checkpoint $DB_ENV;
3697
3698 # if anything goes wrong in here, we should simply crash as we already saved
3699
3700 warn "flushing outstanding aio requests";
3701 while (IO::AIO::nreqs || BDB::nreqs) {
3702 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3703 }
3704
3705 warn "cancelling all extension coros"; 3967 trace "perl_reload: cancelling all extension coros";
3706 $_->cancel for values %EXT_CORO; 3968 $_->cancel for values %EXT_CORO;
3707 %EXT_CORO = (); 3969 %EXT_CORO = ();
3708 3970
3709 warn "removing commands"; 3971 trace "perl_reload: removing commands";
3710 %COMMAND = (); 3972 %COMMAND = ();
3711 3973
3712 warn "removing ext/exti commands"; 3974 trace "perl_reload: removing ext/exti commands";
3713 %EXTCMD = (); 3975 %EXTCMD = ();
3714 %EXTICMD = (); 3976 %EXTICMD = ();
3715 3977
3716 warn "unloading/nuking all extensions"; 3978 trace "perl_reload: unloading/nuking all extensions";
3717 for my $pkg (@EXTS) { 3979 for my $pkg (@EXTS) {
3718 warn "... unloading $pkg"; 3980 trace "... unloading $pkg";
3719 3981
3720 if (my $cb = $pkg->can ("unload")) { 3982 if (my $cb = $pkg->can ("unload")) {
3721 eval { 3983 eval {
3722 $cb->($pkg); 3984 $cb->($pkg);
3723 1 3985 1
3724 } or warn "$pkg unloaded, but with errors: $@"; 3986 } or error "$pkg unloaded, but with errors: $@";
3725 } 3987 }
3726 3988
3727 warn "... clearing $pkg"; 3989 trace "... clearing $pkg";
3728 clear_package $pkg; 3990 clear_package $pkg;
3729 } 3991 }
3730 3992
3731 warn "unloading all perl modules loaded from $LIBDIR"; 3993 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3732 while (my ($k, $v) = each %INC) { 3994 while (my ($k, $v) = each %INC) {
3733 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3995 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3734 3996
3735 warn "... unloading $k"; 3997 trace "... unloading $k";
3736 delete $INC{$k}; 3998 delete $INC{$k};
3737 3999
3738 $k =~ s/\.pm$//; 4000 $k =~ s/\.pm$//;
3739 $k =~ s/\//::/g; 4001 $k =~ s/\//::/g;
3740 4002
3743 } 4005 }
3744 4006
3745 clear_package $k; 4007 clear_package $k;
3746 } 4008 }
3747 4009
3748 warn "getting rid of safe::, as good as possible"; 4010 trace "perl_reload: getting rid of safe::, as good as possible";
3749 clear_package "safe::$_" 4011 clear_package "safe::$_"
3750 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4012 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3751 4013
3752 warn "unloading cf.pm \"a bit\""; 4014 trace "perl_reload: unloading cf.pm \"a bit\"";
3753 delete $INC{"cf.pm"}; 4015 delete $INC{"cf.pm"};
3754 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4016 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3755 4017
3756 # don't, removes xs symbols, too, 4018 # don't, removes xs symbols, too,
3757 # and global variables created in xs 4019 # and global variables created in xs
3758 #clear_package __PACKAGE__; 4020 #clear_package __PACKAGE__;
3759 4021
3760 warn "unload completed, starting to reload now"; 4022 info "perl_reload: unload completed, starting to reload now";
3761 4023
3762 warn "reloading cf.pm"; 4024 trace "perl_reload: reloading cf.pm";
3763 require cf; 4025 require cf;
3764 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4026 cf::_connect_to_perl_1;
3765 4027
3766 warn "loading config and database again"; 4028 trace "perl_reload: loading config and database again";
3767 cf::reload_config; 4029 cf::reload_config;
3768 4030
3769 warn "loading extensions"; 4031 trace "perl_reload: loading extensions";
3770 cf::load_extensions; 4032 cf::load_extensions;
3771 4033
3772 if ($REATTACH_ON_RELOAD) { 4034 if ($REATTACH_ON_RELOAD) {
3773 warn "reattaching attachments to objects/players"; 4035 trace "perl_reload: reattaching attachments to objects/players";
3774 _global_reattach; # objects, sockets 4036 _global_reattach; # objects, sockets
3775 warn "reattaching attachments to maps"; 4037 trace "perl_reload: reattaching attachments to maps";
3776 reattach $_ for values %MAP; 4038 reattach $_ for values %MAP;
3777 warn "reattaching attachments to players"; 4039 trace "perl_reload: reattaching attachments to players";
3778 reattach $_ for values %PLAYER; 4040 reattach $_ for values %PLAYER;
3779 } 4041 }
3780 4042
3781 warn "running post_init jobs"; 4043 cf::_post_init 1;
3782 (pop @POST_INIT)->(1) while @POST_INIT;
3783 4044
3784 warn "leaving sync_job"; 4045 trace "perl_reload: leaving sync_job";
3785 4046
3786 1 4047 1
3787 } or do { 4048 } or do {
3788 warn $@; 4049 error $@;
3789 cf::cleanup "error while reloading, exiting."; 4050 cf::cleanup "perl_reload: error, exiting.";
3790 }; 4051 };
3791 4052
3792 warn "reloaded";
3793 --$RELOAD; 4053 --$RELOAD;
3794 } 4054 }
3795 4055
3796 $t1 = EV::time - $t1; 4056 $t1 = AE::time - $t1;
3797 warn "reload completed in ${t1}s\n"; 4057 info "perl_reload: completed in ${t1}s\n";
3798}; 4058};
3799 4059
3800our $RELOAD_WATCHER; # used only during reload 4060our $RELOAD_WATCHER; # used only during reload
3801 4061
3802sub reload_perl() { 4062sub reload_perl() {
3804 # coro crashes during coro_state_free->destroy here. 4064 # coro crashes during coro_state_free->destroy here.
3805 4065
3806 $RELOAD_WATCHER ||= cf::async { 4066 $RELOAD_WATCHER ||= cf::async {
3807 Coro::AIO::aio_wait cache_extensions; 4067 Coro::AIO::aio_wait cache_extensions;
3808 4068
3809 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4069 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3810 do_reload_perl; 4070 do_reload_perl;
3811 undef $RELOAD_WATCHER; 4071 undef $RELOAD_WATCHER;
3812 }; 4072 };
3813 }; 4073 };
3814} 4074}
3823 reload_perl; 4083 reload_perl;
3824 }; 4084 };
3825 } 4085 }
3826}; 4086};
3827 4087
3828unshift @INC, $LIBDIR; 4088#############################################################################
3829 4089
3830my $bug_warning = 0; 4090my $bug_warning = 0;
3831 4091
3832our @WAIT_FOR_TICK;
3833our @WAIT_FOR_TICK_BEGIN;
3834
3835sub wait_for_tick { 4092sub wait_for_tick() {
3836 return if tick_inhibit || $Coro::current == $Coro::main; 4093 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3837 4094
3838 my $signal = new Coro::Signal; 4095 $WAIT_FOR_TICK->wait;
3839 push @WAIT_FOR_TICK, $signal;
3840 $signal->wait;
3841} 4096}
3842 4097
3843sub wait_for_tick_begin { 4098sub wait_for_tick_begin() {
3844 return if tick_inhibit || $Coro::current == $Coro::main; 4099 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3845 4100
3846 my $signal = new Coro::Signal; 4101 my $signal = new Coro::Signal;
3847 push @WAIT_FOR_TICK_BEGIN, $signal; 4102 push @WAIT_FOR_TICK_BEGIN, $signal;
3848 $signal->wait; 4103 $signal->wait;
3849} 4104}
3853 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4108 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3854 unless ++$bug_warning > 10; 4109 unless ++$bug_warning > 10;
3855 return; 4110 return;
3856 } 4111 }
3857 4112
3858 cf::server_tick; # one server iteration 4113 cf::one_tick; # one server iteration
4114
4115 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3859 4116
3860 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4117 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3861 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4118 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3862 Coro::async_pool { 4119 Coro::async_pool {
3863 $Coro::current->{desc} = "runtime saver"; 4120 $Coro::current->{desc} = "runtime saver";
3864 write_runtime_sync 4121 write_runtime_sync
3865 or warn "ERROR: unable to write runtime file: $!"; 4122 or error "ERROR: unable to write runtime file: $!";
3866 }; 4123 };
3867 } 4124 }
3868 4125
3869 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4126 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3870 $sig->send; 4127 $sig->send;
3871 } 4128 }
3872 while (my $sig = shift @WAIT_FOR_TICK) { 4129 $WAIT_FOR_TICK->broadcast;
3873 $sig->send;
3874 }
3875 4130
3876 $LOAD = ($NOW - $TICK_START) / $TICK; 4131 $LOAD = ($NOW - $TICK_START) / $TICK;
3877 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4132 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3878 4133
3879 if (0) { 4134 if (0) {
3880 if ($NEXT_TICK) { 4135 if ($NEXT_TICK) {
3881 my $jitter = $TICK_START - $NEXT_TICK; 4136 my $jitter = $TICK_START - $NEXT_TICK;
3882 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4137 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3883 warn "jitter $JITTER\n";#d# 4138 debug "jitter $JITTER\n";#d#
3884 } 4139 }
3885 } 4140 }
3886} 4141}
3887 4142
3888{ 4143{
3889 # configure BDB 4144 # configure BDB
3890 4145
3891 BDB::min_parallel 8; 4146 BDB::min_parallel 16;
3892 BDB::max_poll_reqs $TICK * 0.1; 4147 BDB::max_poll_reqs $TICK * 0.1;
3893 $AnyEvent::BDB::WATCHER->priority (1); 4148 $AnyEvent::BDB::WATCHER->priority (1);
3894 4149
3895 unless ($DB_ENV) { 4150 unless ($DB_ENV) {
3896 $DB_ENV = BDB::db_env_create; 4151 $DB_ENV = BDB::db_env_create;
3933 IO::AIO::min_parallel 8; 4188 IO::AIO::min_parallel 8;
3934 IO::AIO::max_poll_time $TICK * 0.1; 4189 IO::AIO::max_poll_time $TICK * 0.1;
3935 undef $AnyEvent::AIO::WATCHER; 4190 undef $AnyEvent::AIO::WATCHER;
3936} 4191}
3937 4192
3938my $_log_backtrace; 4193our $_log_backtrace;
4194our $_log_backtrace_last;
3939 4195
3940sub _log_backtrace { 4196sub _log_backtrace {
3941 my ($msg, @addr) = @_; 4197 my ($msg, @addr) = @_;
3942 4198
3943 $msg =~ s/\n//; 4199 $msg =~ s/\n$//;
3944 4200
4201 if ($_log_backtrace_last eq $msg) {
4202 LOG llevInfo, "[ABT] $msg\n";
4203 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3945 # limit the # of concurrent backtraces 4204 # limit the # of concurrent backtraces
3946 if ($_log_backtrace < 2) { 4205 } elsif ($_log_backtrace < 2) {
4206 $_log_backtrace_last = $msg;
3947 ++$_log_backtrace; 4207 ++$_log_backtrace;
3948 my $perl_bt = Carp::longmess $msg; 4208 my $perl_bt = Carp::longmess $msg;
3949 async { 4209 async {
3950 $Coro::current->{desc} = "abt $msg"; 4210 $Coro::current->{desc} = "abt $msg";
3951 4211
3971 LOG llevInfo, "[ABT] $_\n" for @bt; 4231 LOG llevInfo, "[ABT] $_\n" for @bt;
3972 --$_log_backtrace; 4232 --$_log_backtrace;
3973 }; 4233 };
3974 } else { 4234 } else {
3975 LOG llevInfo, "[ABT] $msg\n"; 4235 LOG llevInfo, "[ABT] $msg\n";
3976 LOG llevInfo, "[ABT] [suppressed]\n"; 4236 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3977 } 4237 }
3978} 4238}
3979 4239
3980# load additional modules 4240# load additional modules
3981require "cf/$_.pm" for @EXTRA_MODULES; 4241require "cf/$_.pm" for @EXTRA_MODULES;
4242cf::_connect_to_perl_2;
3982 4243
3983END { cf::emergency_save } 4244END { cf::emergency_save }
3984 4245
39851 42461
3986 4247

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines