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.490 by root, Sat Oct 24 06:16:40 2009 UTC vs.
Revision 1.581 by root, Fri Feb 3 02:04:11 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
20# 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>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
33use Opcode; 31use Opcode;
34use Safe; 32use Safe;
35use Safe::Hole; 33use Safe::Hole;
36use Storable (); 34use Storable ();
35use Carp ();
37 36
38use Guard (); 37use Guard ();
39use Coro (); 38use Coro ();
40use Coro::State; 39use Coro::State;
41use Coro::Handle; 40use Coro::Handle;
52use Coro::Util (); 51use Coro::Util ();
53 52
54use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
55use BDB (); 54use BDB ();
56use Data::Dumper; 55use Data::Dumper;
57use Digest::MD5;
58use Fcntl; 56use Fcntl;
59use YAML::XS (); 57use YAML::XS ();
60use IO::AIO (); 58use IO::AIO ();
61use Time::HiRes; 59use Time::HiRes;
62use Compress::LZF; 60use Compress::LZF;
78# strictly for debugging 76# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 78
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 80
81our @ORIG_INC;
82
83our %COMMAND = (); 83our %COMMAND = ();
84our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
85 85
86our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 87our %EXTCMD = ();
93our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS 94our @REFLECT; # set by XS
95our %REFLECT; # set by us 95our %REFLECT; # set by us
96 96
97our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
98our $DATADIR = datadir; 99our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
102our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 112
111our %RESOURCE; 113#our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
112 120
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 123our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
118our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
120our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
121our $DB_ENV; 129our $DB_ENV;
122 130
123our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
124 132
125our %CFG; 133our %CFG;
126 134
127our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
128our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
129our $NOW; 138our $NOW;
130 139
131our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
132our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
133our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
142 151
143our @POST_INIT; 152our @POST_INIT;
144 153
145our $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)
146our $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;
147 159
148binmode STDOUT; 160binmode STDOUT;
149binmode STDERR; 161binmode STDERR;
150 162
151# read virtual server time, if available 163# read virtual server time, if available
162 174
163our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
164 176
165sub cf::map::normalise; 177sub cf::map::normalise;
166 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
167############################################################################# 183#############################################################################
168 184
169%REFLECT = (); 185%REFLECT = ();
170for (@REFLECT) { 186for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 187 my $reflect = JSON::XS::decode_json $_;
181 197
182=over 4 198=over 4
183 199
184=item $cf::UPTIME 200=item $cf::UPTIME
185 201
186The 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.
187 218
188=item $cf::RUNTIME 219=item $cf::RUNTIME
189 220
190The 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
191every server tick. 222every server tick.
197Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
198directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
199unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
200database environment. 231database environment.
201 232
202=item $cf::NOW
203
204The time of the last (current) server tick.
205
206=item $cf::TICK
207
208The interval between server ticks, in seconds.
209
210=item $cf::LOADAVG 233=item $cf::LOADAVG
211 234
212The 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
213(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
214objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
223from wherever your confdir points to. 246from wherever your confdir points to.
224 247
225=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
226 249
227These 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
228returns 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
229per 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.
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();
230 270
231=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
232 272
233This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
234C<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
242 282
243=back 283=back
244 284
245=cut 285=cut
246 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
247$Coro::State::WARNHOOK = sub { 293$Coro::State::WARNHOOK = sub {
248 my $msg = join "", @_; 294 my $msg = join "", @_;
249 295
250 $msg .= "\n" 296 $msg .= "\n"
251 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
252 298
253 $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;
254 300
255 LOG llevError, $msg; 301 LOG llevWarn, $msg;
256}; 302};
257 303
258$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
260 306
261 warn Carp::longmess $_[0]; 307 error Carp::longmess $_[0];
262 308
263 if ($Coro::current == $Coro::main) {#d# 309 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 311 return;#d#
266 }#d# 312 }#d#
267 313
268 # kill coroutine otherwise 314 # kill coroutine otherwise
269 Coro::terminate 315 Coro::terminate
289)) { 335)) {
290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
291} 337}
292 338
293$EV::DIED = sub { 339$EV::DIED = sub {
294 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
295}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
296 347
297############################################################################# 348#############################################################################
298 349
299=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
300 351
321 $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;
322 $d 373 $d
323 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
324} 375}
325 376
377=item $scalar = cf::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
391=item $success = cf::replace_file $path, $data, $sync
392
393Atomically replaces the file at the given $path with new $data, and
394optionally $sync the data to disk before replacing the file.
395
396=cut
397
398sub replace_file($$;$) {
399 my ($path, $data, $sync) = @_;
400
401 my $lock = cf::lock_acquire ("replace_file:$path");
402
403 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
404 or return;
405
406 $data = $data->() if ref $data;
407
408 length $data == aio_write $fh, 0, (length $data), $data, 0
409 or return;
410
411 !$sync
412 or !aio_fsync $fh
413 or return;
414
415 aio_close $fh
416 and return;
417
418 aio_rename "$path~", $path
419 and return;
420
421 if ($sync) {
422 $path =~ s%/[^/]*$%%;
423 aio_pathsync $path;
424 }
425
426 1
427}
428
326=item $ref = cf::decode_json $json 429=item $ref = cf::decode_json $json
327 430
328Converts a JSON string into the corresponding perl data structure. 431Converts a JSON string into the corresponding perl data structure.
329 432
330=item $json = cf::encode_json $ref 433=item $json = cf::encode_json $ref
336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 439our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
337 440
338sub encode_json($) { $json_coder->encode ($_[0]) } 441sub encode_json($) { $json_coder->encode ($_[0]) }
339sub decode_json($) { $json_coder->decode ($_[0]) } 442sub decode_json($) { $json_coder->decode ($_[0]) }
340 443
444=item $ref = cf::decode_storable $scalar
445
446Same as Coro::Storable::thaw, so blocks.
447
448=cut
449
450BEGIN { *decode_storable = \&Coro::Storable::thaw }
451
452=item $ref = cf::decode_yaml $scalar
453
454Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
455
456=cut
457
458sub decode_yaml($) {
459 fork_call { YAML::XS::Load $_[0] } @_
460}
461
462=item $scalar = cf::unlzf $scalar
463
464Same as Compress::LZF::compress, but takes server ticks into account, so
465blocks.
466
467=cut
468
469sub unlzf($) {
470 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
471 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
472 Compress::LZF::decompress $_[0]
473}
474
341=item cf::post_init { BLOCK } 475=item cf::post_init { BLOCK }
342 476
343Execute the given codeblock, I<after> all extensions have been (re-)loaded, 477Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again. 478but I<before> the server starts ticking again.
345 479
346The cdoeblock will have a single boolean argument to indicate whether this 480The codeblock will have a single boolean argument to indicate whether this
347is a reload or not. 481is a reload or not.
348 482
349=cut 483=cut
350 484
351sub post_init(&) { 485sub post_init(&) {
352 push @POST_INIT, shift; 486 push @POST_INIT, shift;
487}
488
489sub _post_init {
490 trace "running post_init jobs";
491
492 # run them in parallel...
493
494 my @join;
495
496 while () {
497 push @join, map &Coro::async ($_, 0), @POST_INIT;
498 @POST_INIT = ();
499
500 @join or last;
501
502 (pop @join)->join;
503 }
353} 504}
354 505
355=item cf::lock_wait $string 506=item cf::lock_wait $string
356 507
357Wait until the given lock is available. See cf::lock_acquire. 508Wait until the given lock is available. See cf::lock_acquire.
396} 547}
397 548
398=item cf::periodic $interval, $cb 549=item cf::periodic $interval, $cb
399 550
400Like EV::periodic, but randomly selects a starting point so that the actions 551Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 552get spread over time.
402 553
403=cut 554=cut
404 555
405sub periodic($$) { 556sub periodic($$) {
406 my ($interval, $cb) = @_; 557 my ($interval, $cb) = @_;
410 EV::periodic $start, $interval, 0, $cb 561 EV::periodic $start, $interval, 0, $cb
411} 562}
412 563
413=item cf::get_slot $time[, $priority[, $name]] 564=item cf::get_slot $time[, $priority[, $name]]
414 565
415Allocate $time seconds of blocking CPU time at priority C<$priority>: 566Allocate $time seconds of blocking CPU time at priority C<$priority>
416This call blocks and returns only when you have at least C<$time> seconds 567(default: 0): This call blocks and returns only when you have at least
417of cpu time till the next tick. The slot is only valid till the next cede. 568C<$time> seconds of cpu time till the next tick. The slot is only valid
569till the next cede.
570
571Background jobs should use a priority les than zero, interactive jobs
572should use 100 or more.
418 573
419The optional C<$name> can be used to identify the job to run. It might be 574The optional C<$name> can be used to identify the job to run. It might be
420used for statistical purposes and should identify the same time-class. 575used for statistical purposes and should identify the same time-class.
421 576
422Useful for short background jobs. 577Useful for short background jobs.
423 578
424=cut 579=cut
425 580
426our @SLOT_QUEUE; 581our @SLOT_QUEUE;
427our $SLOT_QUEUE; 582our $SLOT_QUEUE;
583our $SLOT_DECAY = 0.9;
428 584
429$SLOT_QUEUE->cancel if $SLOT_QUEUE; 585$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async { 586$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager"); 587 $Coro::current->desc ("timeslot manager");
432 588
433 my $signal = new Coro::Signal; 589 my $signal = new Coro::Signal;
590 my $busy;
434 591
435 while () { 592 while () {
436 next_job: 593 next_job:
594
437 my $avail = cf::till_tick; 595 my $avail = cf::till_tick;
438 if ($avail > 0.01) { 596
439 for (0 .. $#SLOT_QUEUE) { 597 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) { 598 if ($SLOT_QUEUE[$_][0] <= $avail) {
599 $busy = 0;
441 my $job = splice @SLOT_QUEUE, $_, 1, (); 600 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send; 601 $job->[2]->send;
443 Coro::cede; 602 Coro::cede;
444 goto next_job; 603 goto next_job;
445 } 604 } else {
605 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446 } 606 }
447 } 607 }
448 608
449 if (@SLOT_QUEUE) { 609 if (@SLOT_QUEUE) {
450 # we do not use wait_for_tick() as it returns immediately when tick is inactive 610 # we do not use wait_for_tick() as it returns immediately when tick is inactive
451 push @cf::WAIT_FOR_TICK, $signal; 611 $WAIT_FOR_TICK->wait;
452 $signal->wait;
453 } else { 612 } else {
613 $busy = 0;
454 Coro::schedule; 614 Coro::schedule;
455 } 615 }
456 } 616 }
457}; 617};
458 618
459sub get_slot($;$$) { 619sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main; 620 return if tick_inhibit || $Coro::current == $Coro::main;
461 621
462 my ($time, $pri, $name) = @_; 622 my ($time, $pri, $name) = @_;
463 623
464 $time = $TICK * .6 if $time > $TICK * .6; 624 $time = clamp $time, 0.01, $TICK * .6;
625
465 my $sig = new Coro::Signal; 626 my $sig = new Coro::Signal;
466 627
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 628 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 629 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready; 630 $SLOT_QUEUE->ready;
495=cut 656=cut
496 657
497sub sync_job(&) { 658sub sync_job(&) {
498 my ($job) = @_; 659 my ($job) = @_;
499 660
500 if ($Coro::current == $Coro::main) { 661 if (in_main) {
501 my $time = EV::time; 662 my $time = AE::time;
502 663
503 # this is the main coro, too bad, we have to block 664 # this is the main coro, too bad, we have to block
504 # till the operation succeeds, freezing the server :/ 665 # till the operation succeeds, freezing the server :/
505 666
506 LOG llevError, Carp::longmess "sync job";#d# 667 #LOG llevError, Carp::longmess "sync job";#d#
507 668
508 my $freeze_guard = freeze_mainloop; 669 my $freeze_guard = freeze_mainloop;
509 670
510 my $busy = 1; 671 my $busy = 1;
511 my @res; 672 my @res;
512 673
513 (async { 674 (async {
514 $Coro::current->desc ("sync job coro"); 675 $Coro::current->desc ("sync job coro");
515 @res = eval { $job->() }; 676 @res = eval { $job->() };
516 warn $@ if $@; 677 error $@ if $@;
517 undef $busy; 678 undef $busy;
518 })->prio (Coro::PRIO_MAX); 679 })->prio (Coro::PRIO_MAX);
519 680
520 while ($busy) { 681 while ($busy) {
521 if (Coro::nready) { 682 if (Coro::nready) {
523 } else { 684 } else {
524 EV::loop EV::LOOP_ONESHOT; 685 EV::loop EV::LOOP_ONESHOT;
525 } 686 }
526 } 687 }
527 688
528 my $time = EV::time - $time; 689 my $time = AE::time - $time;
529 690
530 $TICK_START += $time; # do not account sync jobs to server load 691 $TICK_START += $time; # do not account sync jobs to server load
531 692
532 wantarray ? @res : $res[0] 693 wantarray ? @res : $res[0]
533 } else { 694 } else {
555 $EXT_CORO{$coro+0} = $coro; 716 $EXT_CORO{$coro+0} = $coro;
556 717
557 $coro 718 $coro
558} 719}
559 720
560=item fork_call { }, $args 721=item fork_call { }, @args
561 722
562Executes the given code block with the given arguments in a seperate 723Executes the given code block with the given arguments in a seperate
563process, returning the results. Everything must be serialisable with 724process, returning the results. Everything must be serialisable with
564Coro::Storable. May, of course, block. Note that the executed sub may 725Coro::Storable. May, of course, block. Note that the executed sub may
565never block itself or use any form of event handling. 726never block itself or use any form of event handling.
566 727
567=cut 728=cut
568 729
730sub post_fork {
731 reset_signals;
732}
733
569sub fork_call(&@) { 734sub fork_call(&@) {
570 my ($cb, @args) = @_; 735 my ($cb, @args) = @_;
571 736
572 # we seemingly have to make a local copy of the whole thing, 737 # we seemingly have to make a local copy of the whole thing,
573 # otherwise perl prematurely frees the stuff :/ 738 # otherwise perl prematurely frees the stuff :/
574 # TODO: investigate and fix (likely this will be rather laborious) 739 # TODO: investigate and fix (likely this will be rather laborious)
575 740
576 my @res = Coro::Util::fork_eval { 741 my @res = Coro::Util::fork_eval {
577 reset_signals; 742 cf::post_fork;
578 &$cb 743 &$cb
579 }, @args; 744 } @args;
580 745
581 wantarray ? @res : $res[-1] 746 wantarray ? @res : $res[-1]
747}
748
749sub objinfo {
750 (
751 "counter value" => cf::object::object_count,
752 "objects created" => cf::object::create_count,
753 "objects destroyed" => cf::object::destroy_count,
754 "freelist size" => cf::object::free_count,
755 "allocated objects" => cf::object::objects_size,
756 "active objects" => cf::object::actives_size,
757 )
582} 758}
583 759
584=item $coin = coin_from_name $name 760=item $coin = coin_from_name $name
585 761
586=cut 762=cut
623within each server. 799within each server.
624 800
625=cut 801=cut
626 802
627sub db_table($) { 803sub db_table($) {
804 cf::error "db_get called from main context"
805 if $Coro::current == $Coro::main;
806
628 my ($name) = @_; 807 my ($name) = @_;
629 my $db = BDB::db_create $DB_ENV; 808 my $db = BDB::db_create $DB_ENV;
630 809
631 eval { 810 eval {
632 $db->set_flags (BDB::CHKSUM); 811 $db->set_flags (BDB::CHKSUM);
642} 821}
643 822
644our $DB; 823our $DB;
645 824
646sub db_init { 825sub db_init {
647 cf::sync_job {
648 $DB ||= db_table "db"; 826 $DB ||= db_table "db";
649 };
650} 827}
651 828
652sub db_get($$) { 829sub db_get($$) {
653 my $key = "$_[0]/$_[1]"; 830 my $key = "$_[0]/$_[1]";
654 831
655 cf::sync_job { 832 cf::error "db_get called from main context"
833 if $Coro::current == $Coro::main;
834
656 BDB::db_get $DB, undef, $key, my $data; 835 BDB::db_get $DB, undef, $key, my $data;
657 836
658 $! ? () 837 $! ? ()
659 : $data 838 : $data
660 }
661} 839}
662 840
663sub db_put($$$) { 841sub db_put($$$) {
664 BDB::dbreq_pri 4; 842 BDB::dbreq_pri 4;
665 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 843 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
693 871
694 my @data; 872 my @data;
695 my $md5; 873 my $md5;
696 874
697 for (0 .. $#$src) { 875 for (0 .. $#$src) {
698 0 <= aio_load $src->[$_], $data[$_] 876 $data[$_] = load_file $src->[$_];
699 or Carp::croak "$src->[$_]: $!";
700 } 877 }
701 878
702 # if processing is expensive, check 879 # if processing is expensive, check
703 # checksum first 880 # checksum first
704 if (1) { 881 if (1) {
721 898
722 my $t1 = Time::HiRes::time; 899 my $t1 = Time::HiRes::time;
723 my $data = $process->(\@data); 900 my $data = $process->(\@data);
724 my $t2 = Time::HiRes::time; 901 my $t2 = Time::HiRes::time;
725 902
726 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 903 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
727 904
728 db_put cache => "$id/data", $data; 905 db_put cache => "$id/data", $data;
729 db_put cache => "$id/md5" , $md5; 906 db_put cache => "$id/md5" , $md5;
730 db_put cache => "$id/meta", $meta; 907 db_put cache => "$id/meta", $meta;
731 908
741 918
742=cut 919=cut
743 920
744sub datalog($@) { 921sub datalog($@) {
745 my ($type, %kv) = @_; 922 my ($type, %kv) = @_;
746 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 923 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
747} 924}
748 925
749=back 926=back
750 927
751=cut 928=cut
946 1123
947 } elsif (exists $cb_id{$type}) { 1124 } elsif (exists $cb_id{$type}) {
948 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1125 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
949 1126
950 } elsif (ref $type) { 1127 } elsif (ref $type) {
951 warn "attaching objects not supported, ignoring.\n"; 1128 error "attaching objects not supported, ignoring.\n";
952 1129
953 } else { 1130 } else {
954 shift @arg; 1131 shift @arg;
955 warn "attach argument '$type' not supported, ignoring.\n"; 1132 error "attach argument '$type' not supported, ignoring.\n";
956 } 1133 }
957 } 1134 }
958} 1135}
959 1136
960sub _object_attach { 1137sub _object_attach {
970 _attach $registry, $klass, @attach; 1147 _attach $registry, $klass, @attach;
971 } 1148 }
972 1149
973 $obj->{$name} = \%arg; 1150 $obj->{$name} = \%arg;
974 } else { 1151 } else {
975 warn "object uses attachment '$name' which is not available, postponing.\n"; 1152 info "object uses attachment '$name' which is not available, postponing.\n";
976 } 1153 }
977 1154
978 $obj->{_attachment}{$name} = undef; 1155 $obj->{_attachment}{$name} = undef;
979} 1156}
980 1157
1039 1216
1040 for (@$callbacks) { 1217 for (@$callbacks) {
1041 eval { &{$_->[1]} }; 1218 eval { &{$_->[1]} };
1042 1219
1043 if ($@) { 1220 if ($@) {
1044 warn "$@";
1045 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1221 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1046 override; 1222 override;
1047 } 1223 }
1048 1224
1049 return 1 if $override; 1225 return 1 if $override;
1050 } 1226 }
1129 for (@$attach) { 1305 for (@$attach) {
1130 my ($klass, @attach) = @$_; 1306 my ($klass, @attach) = @$_;
1131 _attach $registry, $klass, @attach; 1307 _attach $registry, $klass, @attach;
1132 } 1308 }
1133 } else { 1309 } else {
1134 warn "object uses attachment '$name' that is not available, postponing.\n"; 1310 info "object uses attachment '$name' that is not available, postponing.\n";
1135 } 1311 }
1136 } 1312 }
1137} 1313}
1138 1314
1139cf::attachable->attach ( 1315cf::attachable->attach (
1166 my ($filename, $rdata, $objs) = @_; 1342 my ($filename, $rdata, $objs) = @_;
1167 1343
1168 sync_job { 1344 sync_job {
1169 if (length $$rdata) { 1345 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename); 1346 utf8::decode (my $decname = $filename);
1171 warn sprintf "saving %s (%d,%d)\n", 1347 trace sprintf "saving %s (%d,%d)\n",
1172 $decname, length $$rdata, scalar @$objs; 1348 $decname, length $$rdata, scalar @$objs
1349 if $VERBOSE_IO;
1173 1350
1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1351 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175 aio_chmod $fh, SAVE_MODE; 1352 aio_chmod $fh, SAVE_MODE;
1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1353 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177 if ($cf::USE_FSYNC) { 1354 if ($cf::USE_FSYNC) {
1199 aio_rename "$filename~", $filename; 1376 aio_rename "$filename~", $filename;
1200 1377
1201 $filename =~ s%/[^/]+$%%; 1378 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC; 1379 aio_pathsync $filename if $cf::USE_FSYNC;
1203 } else { 1380 } else {
1204 warn "unable to save objects: $filename~: $!\n"; 1381 error "unable to save objects: $filename~: $!\n";
1205 } 1382 }
1206 } else { 1383 } else {
1207 aio_unlink $filename; 1384 aio_unlink $filename;
1208 aio_unlink "$filename.pst"; 1385 aio_unlink "$filename.pst";
1209 } 1386 }
1233 my $st = eval { Coro::Storable::thaw $av }; 1410 my $st = eval { Coro::Storable::thaw $av };
1234 $av = $st->{objs}; 1411 $av = $st->{objs};
1235 } 1412 }
1236 1413
1237 utf8::decode (my $decname = $filename); 1414 utf8::decode (my $decname = $filename);
1238 warn sprintf "loading %s (%d,%d)\n", 1415 trace sprintf "loading %s (%d,%d)\n",
1239 $decname, length $data, scalar @{$av || []}; 1416 $decname, length $data, scalar @{$av || []}
1417 if $VERBOSE_IO;
1240 1418
1241 ($data, $av) 1419 ($data, $av)
1242} 1420}
1243 1421
1244=head2 COMMAND CALLBACKS 1422=head2 COMMAND CALLBACKS
1303} 1481}
1304 1482
1305use File::Glob (); 1483use File::Glob ();
1306 1484
1307cf::player->attach ( 1485cf::player->attach (
1308 on_command => sub { 1486 on_unknown_command => sub {
1309 my ($pl, $name, $params) = @_; 1487 my ($pl, $name, $params) = @_;
1310 1488
1311 my $cb = $COMMAND{$name} 1489 my $cb = $COMMAND{$name}
1312 or return; 1490 or return;
1313 1491
1321 my ($pl, $buf) = @_; 1499 my ($pl, $buf) = @_;
1322 1500
1323 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1501 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1324 1502
1325 if (ref $msg) { 1503 if (ref $msg) {
1326 my ($type, $reply, @payload) = 1504 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1327 "ARRAY" eq ref $msg
1328 ? @$msg
1329 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1330 1505
1331 my @reply; 1506 my @reply;
1332 1507
1333 if (my $cb = $EXTCMD{$type}) { 1508 if (my $cb = $EXTCMD{$type}) {
1334 @reply = $cb->($pl, @payload); 1509 @reply = $cb->($pl, @payload);
1336 1511
1337 $pl->ext_reply ($reply, @reply) 1512 $pl->ext_reply ($reply, @reply)
1338 if $reply; 1513 if $reply;
1339 1514
1340 } else { 1515 } else {
1341 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1516 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1342 } 1517 }
1343 1518
1344 cf::override; 1519 cf::override;
1345 }, 1520 },
1346); 1521);
1357 1532
1358 $grp 1533 $grp
1359} 1534}
1360 1535
1361sub load_extensions { 1536sub load_extensions {
1537 info "loading extensions...";
1538
1362 cf::sync_job { 1539 cf::sync_job {
1363 my %todo; 1540 my %todo;
1364 1541
1365 for my $path (<$LIBDIR/*.ext>) { 1542 for my $path (<$LIBDIR/*.ext>) {
1366 next unless -r $path; 1543 next unless -r $path;
1384 1561
1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1562 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1563 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1387 1564
1388 $ext{source} = 1565 $ext{source} =
1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1566 "package $pkg; use common::sense;\n"
1390 . "#line 1 \"$path\"\n{\n" 1567 . "#line 1 \"$path\"\n{\n"
1391 . $source 1568 . $source
1392 . "\n};\n1"; 1569 . "\n};\n1";
1393 1570
1394 $todo{$base} = \%ext; 1571 $todo{$base} = \%ext;
1395 } 1572 }
1396 1573
1574 my $pass = 0;
1397 my %done; 1575 my %done;
1398 while (%todo) { 1576 while (%todo) {
1399 my $progress; 1577 my $progress;
1400 1578
1579 ++$pass;
1580
1581 ext:
1401 while (my ($k, $v) = each %todo) { 1582 while (my ($k, $v) = each %todo) {
1402 for (split /,\s*/, $v->{meta}{depends}) { 1583 for (split /,\s*/, $v->{meta}{depends}) {
1403 goto skip 1584 next ext
1404 unless exists $done{$_}; 1585 unless exists $done{$_};
1405 } 1586 }
1406 1587
1407 warn "... loading '$k' into '$v->{pkg}'\n"; 1588 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1408 1589
1409 unless (eval $v->{source}) { 1590 my $active = eval $v->{source};
1591
1592 if (length $@) {
1410 my $msg = $@ ? "$v->{path}: $@\n" 1593 error "$v->{path}: $@\n";
1411 : "$v->{base}: extension inactive.\n";
1412 1594
1413 if (exists $v->{meta}{mandatory}) {
1414 warn $msg;
1415 cf::cleanup "mandatory extension failed to load, exiting."; 1595 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1416 } 1596 if exists $v->{meta}{mandatory};
1417 1597
1418 warn $msg; 1598 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1599 delete $todo{$k};
1600 } else {
1601 $done{$k} = delete $todo{$k};
1602 push @EXTS, $v->{pkg};
1603 $progress = 1;
1604
1605 info "$v->{base}: extension inactive.\n"
1606 unless $active;
1419 } 1607 }
1420
1421 $done{$k} = delete $todo{$k};
1422 push @EXTS, $v->{pkg};
1423 $progress = 1;
1424 } 1608 }
1425 1609
1426 skip: 1610 unless ($progress) {
1427 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1611 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1428 unless $progress; 1612
1613 while (my ($k, $v) = each %todo) {
1614 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1615 if exists $v->{meta}{mandatory};
1616 }
1617
1618 last;
1619 }
1429 } 1620 }
1430 }; 1621 };
1431} 1622}
1432 1623
1433############################################################################# 1624#############################################################################
1517 $cf::PLAYER{$login} = $pl 1708 $cf::PLAYER{$login} = $pl
1518 } 1709 }
1519 } 1710 }
1520} 1711}
1521 1712
1713cf::player->attach (
1714 on_load => sub {
1715 my ($pl, $path) = @_;
1716
1717 # restore slots saved in save, below
1718 my $slots = delete $pl->{_slots};
1719
1720 $pl->ob->current_weapon ($slots->[0]);
1721 $pl->combat_ob ($slots->[1]);
1722 $pl->ranged_ob ($slots->[2]);
1723 },
1724);
1725
1522sub save($) { 1726sub save($) {
1523 my ($pl) = @_; 1727 my ($pl) = @_;
1524 1728
1525 return if $pl->{deny_save}; 1729 return if $pl->{deny_save};
1526 1730
1531 1735
1532 aio_mkdir playerdir $pl, 0770; 1736 aio_mkdir playerdir $pl, 0770;
1533 $pl->{last_save} = $cf::RUNTIME; 1737 $pl->{last_save} = $cf::RUNTIME;
1534 1738
1535 cf::get_slot 0.01; 1739 cf::get_slot 0.01;
1740
1741 # save slots, to be restored later
1742 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1536 1743
1537 $pl->save_pl ($path); 1744 $pl->save_pl ($path);
1538 cf::cede_to_tick; 1745 cf::cede_to_tick;
1539} 1746}
1540 1747
1574 my $name = $pl->ob->name; 1781 my $name = $pl->ob->name;
1575 1782
1576 $pl->{deny_save} = 1; 1783 $pl->{deny_save} = 1;
1577 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1784 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1578 1785
1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1786 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1580 $pl->deactivate; 1787 $pl->deactivate;
1788
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1789 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1583 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1790 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1791 ext::highscore::check ($pl->ob);
1792
1584 $pl->ns->destroy if $pl->ns; 1793 $pl->ns->destroy if $pl->ns;
1585 1794
1586 my $path = playerdir $pl; 1795 my $path = playerdir $pl;
1587 my $temp = "$path~$cf::RUNTIME~deleting~"; 1796 my $temp = "$path~$cf::RUNTIME~deleting~";
1588 aio_rename $path, $temp; 1797 aio_rename $path, $temp;
1642 \@logins 1851 \@logins
1643} 1852}
1644 1853
1645=item $player->maps 1854=item $player->maps
1646 1855
1856=item cf::player::maps $login
1857
1647Returns an arrayref of map paths that are private for this 1858Returns an arrayref of map paths that are private for this
1648player. May block. 1859player. May block.
1649 1860
1650=cut 1861=cut
1651 1862
1713=cut 1924=cut
1714 1925
1715sub find_by_path($) { 1926sub find_by_path($) {
1716 my ($path) = @_; 1927 my ($path) = @_;
1717 1928
1929 $path =~ s/^~[^\/]*//; # skip ~login
1930
1718 my ($match, $specificity); 1931 my ($match, $specificity);
1719 1932
1720 for my $region (list) { 1933 for my $region (list) {
1721 if ($region->{match} && $path =~ $region->{match}) { 1934 if ($region->{match} && $path =~ $region->{match}) {
1722 ($match, $specificity) = ($region, $region->specificity) 1935 ($match, $specificity) = ($region, $region->specificity)
1750sub generate_random_map { 1963sub generate_random_map {
1751 my ($self, $rmp) = @_; 1964 my ($self, $rmp) = @_;
1752 1965
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1966 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754 1967
1755 # mit "rum" bekleckern, nicht
1756 $self->_create_random_map ( 1968 $self->_create_random_map ($rmp);
1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1760 $rmp->{exit_on_final_map},
1761 $rmp->{xsize}, $rmp->{ysize},
1762 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1763 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1764 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1765 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1766 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1767 (cf::region::find $rmp->{region}), $rmp->{custom}
1768 )
1769} 1969}
1770 1970
1771=item cf::map->register ($regex, $prio) 1971=item cf::map->register ($regex, $prio)
1772 1972
1773Register a handler for the map path matching the given regex at the 1973Register a handler for the map path matching the given regex at the
1778 1978
1779sub register { 1979sub register {
1780 my (undef, $regex, $prio) = @_; 1980 my (undef, $regex, $prio) = @_;
1781 my $pkg = caller; 1981 my $pkg = caller;
1782 1982
1783 no strict;
1784 push @{"$pkg\::ISA"}, __PACKAGE__; 1983 push @{"$pkg\::ISA"}, __PACKAGE__;
1785 1984
1786 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1985 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1787} 1986}
1788 1987
1789# also paths starting with '/' 1988# also paths starting with '/'
1790$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1989$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1791 1990
1792sub thawer_merge { 1991sub thawer_merge {
1793 my ($self, $merge) = @_; 1992 my ($self, $merge) = @_;
1794 1993
1795 # we have to keep some variables in memory intact 1994 # we have to keep some variables in memory intact
1800} 1999}
1801 2000
1802sub normalise { 2001sub normalise {
1803 my ($path, $base) = @_; 2002 my ($path, $base) = @_;
1804 2003
1805 $path = "$path"; # make sure its a string 2004 $path = "$path"; # make sure it's a string
1806 2005
1807 $path =~ s/\.map$//; 2006 $path =~ s/\.map$//;
1808 2007
1809 # map plan: 2008 # map plan:
1810 # 2009 #
1825 $base =~ s{[^/]+/?$}{}; 2024 $base =~ s{[^/]+/?$}{};
1826 $path = "$base/$path"; 2025 $path = "$base/$path";
1827 } 2026 }
1828 2027
1829 for ($path) { 2028 for ($path) {
1830 redo if s{//}{/};
1831 redo if s{/\.?/}{/}; 2029 redo if s{/\.?/}{/};
1832 redo if s{/[^/]+/\.\./}{/}; 2030 redo if s{/[^/]+/\.\./}{/};
1833 } 2031 }
1834 2032
1835 $path 2033 $path
1849 $self->init; # pass $1 etc. 2047 $self->init; # pass $1 etc.
1850 return $self; 2048 return $self;
1851 } 2049 }
1852 } 2050 }
1853 2051
1854 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2052 Carp::cluck "unable to resolve path '$path' (base '$base')";
1855 () 2053 ()
1856} 2054}
1857 2055
2056# may re-bless or do other evil things
1858sub init { 2057sub init {
1859 my ($self) = @_; 2058 my ($self) = @_;
1860 2059
1861 $self 2060 $self
1862} 2061}
1927 $self->{load_path} = $path; 2126 $self->{load_path} = $path;
1928 2127
1929 1 2128 1
1930} 2129}
1931 2130
2131# used to laod the header of an original map
1932sub load_header_orig { 2132sub load_header_orig {
1933 my ($self) = @_; 2133 my ($self) = @_;
1934 2134
1935 $self->load_header_from ($self->load_path) 2135 $self->load_header_from ($self->load_path)
1936} 2136}
1937 2137
2138# used to laod the header of an instantiated map
1938sub load_header_temp { 2139sub load_header_temp {
1939 my ($self) = @_; 2140 my ($self) = @_;
1940 2141
1941 $self->load_header_from ($self->save_path) 2142 $self->load_header_from ($self->save_path)
1942} 2143}
1943 2144
2145# called after loading the header from an instantiated map
1944sub prepare_temp { 2146sub prepare_temp {
1945 my ($self) = @_; 2147 my ($self) = @_;
1946 2148
1947 $self->last_access ((delete $self->{last_access}) 2149 $self->last_access ((delete $self->{last_access})
1948 || $cf::RUNTIME); #d# 2150 || $cf::RUNTIME); #d#
1949 # safety 2151 # safety
1950 $self->{instantiate_time} = $cf::RUNTIME 2152 $self->{instantiate_time} = $cf::RUNTIME
1951 if $self->{instantiate_time} > $cf::RUNTIME; 2153 if $self->{instantiate_time} > $cf::RUNTIME;
1952} 2154}
1953 2155
2156# called after loading the header from an original map
1954sub prepare_orig { 2157sub prepare_orig {
1955 my ($self) = @_; 2158 my ($self) = @_;
1956 2159
1957 $self->{load_original} = 1; 2160 $self->{load_original} = 1;
1958 $self->{instantiate_time} = $cf::RUNTIME; 2161 $self->{instantiate_time} = $cf::RUNTIME;
1982 2185
1983sub find; 2186sub find;
1984sub find { 2187sub find {
1985 my ($path, $origin) = @_; 2188 my ($path, $origin) = @_;
1986 2189
2190 cf::cede_to_tick;
2191
1987 $path = normalise $path, $origin && $origin->path; 2192 $path = normalise $path, $origin;
1988 2193
1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2194 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1990 my $guard2 = cf::lock_acquire "map_find:$path"; 2195 my $guard2 = cf::lock_acquire "map_find:$path";
1991 2196
1992 $cf::MAP{$path} || do { 2197 $cf::MAP{$path} || do {
2009 2214
2010 $cf::MAP{$path} = $map 2215 $cf::MAP{$path} = $map
2011 } 2216 }
2012} 2217}
2013 2218
2014sub pre_load { } 2219sub pre_load { }
2015sub post_load { } 2220#sub post_load { } # XS
2016 2221
2017sub load { 2222sub load {
2018 my ($self) = @_; 2223 my ($self) = @_;
2019 2224
2020 local $self->{deny_reset} = 1; # loading can take a long time 2225 local $self->{deny_reset} = 1; # loading can take a long time
2023 2228
2024 { 2229 {
2025 my $guard = cf::lock_acquire "map_data:$path"; 2230 my $guard = cf::lock_acquire "map_data:$path";
2026 2231
2027 return unless $self->valid; 2232 return unless $self->valid;
2028 return unless $self->in_memory == cf::MAP_SWAPPED; 2233 return unless $self->state == cf::MAP_SWAPPED;
2029
2030 $self->in_memory (cf::MAP_LOADING);
2031 2234
2032 $self->alloc; 2235 $self->alloc;
2033 2236
2034 $self->pre_load; 2237 $self->pre_load;
2035 cf::cede_to_tick; 2238 cf::cede_to_tick;
2036 2239
2240 if (exists $self->{load_path}) {
2037 my $f = new_from_file cf::object::thawer $self->{load_path}; 2241 my $f = new_from_file cf::object::thawer $self->{load_path};
2038 $f->skip_block; 2242 $f->skip_block;
2039 $self->_load_objects ($f) 2243 $self->_load_objects ($f)
2040 or return; 2244 or return;
2041 2245
2042 $self->post_load_original 2246 $self->post_load_original
2043 if delete $self->{load_original}; 2247 if delete $self->{load_original};
2044 2248
2045 if (my $uniq = $self->uniq_path) { 2249 if (my $uniq = $self->uniq_path) {
2046 utf8::encode $uniq; 2250 utf8::encode $uniq;
2047 unless (aio_stat $uniq) { 2251 unless (aio_stat $uniq) {
2048 if (my $f = new_from_file cf::object::thawer $uniq) { 2252 if (my $f = new_from_file cf::object::thawer $uniq) {
2049 $self->clear_unique_items; 2253 $self->clear_unique_items;
2050 $self->_load_objects ($f); 2254 $self->_load_objects ($f);
2051 $f->resolve_delayed_derefs; 2255 $f->resolve_delayed_derefs;
2256 }
2052 } 2257 }
2053 } 2258 }
2054 }
2055 2259
2056 $f->resolve_delayed_derefs; 2260 $f->resolve_delayed_derefs;
2261 } else {
2262 $self->post_load_original
2263 if delete $self->{load_original};
2264 }
2265
2266 $self->state (cf::MAP_INACTIVE);
2057 2267
2058 cf::cede_to_tick; 2268 cf::cede_to_tick;
2059 # now do the right thing for maps 2269 # now do the right thing for maps
2060 $self->link_multipart_objects; 2270 $self->link_multipart_objects;
2061 $self->difficulty ($self->estimate_difficulty) 2271 $self->difficulty ($self->estimate_difficulty)
2065 unless ($self->{deny_activate}) { 2275 unless ($self->{deny_activate}) {
2066 $self->decay_objects; 2276 $self->decay_objects;
2067 $self->fix_auto_apply; 2277 $self->fix_auto_apply;
2068 $self->update_buttons; 2278 $self->update_buttons;
2069 cf::cede_to_tick; 2279 cf::cede_to_tick;
2070 $self->activate; 2280 #$self->activate; # no longer activate maps automatically
2071 } 2281 }
2072 2282
2073 $self->{last_save} = $cf::RUNTIME; 2283 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME); 2284 $self->last_access ($cf::RUNTIME);
2075
2076 $self->in_memory (cf::MAP_ACTIVE);
2077 } 2285 }
2078 2286
2079 $self->post_load; 2287 $self->post_load;
2080}
2081 2288
2289 1
2290}
2291
2292# customize the map for a given player, i.e.
2293# return the _real_ map. used by e.g. per-player
2294# maps to change the path to ~playername/mappath
2082sub customise_for { 2295sub customise_for {
2083 my ($self, $ob) = @_; 2296 my ($self, $ob) = @_;
2084 2297
2085 return find "~" . $ob->name . "/" . $self->{path} 2298 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2299 if $self->per_player;
2089# if $self->per_party; 2302# if $self->per_party;
2090 2303
2091 $self 2304 $self
2092} 2305}
2093 2306
2094# find and load all maps in the 3x3 area around a map
2095sub load_neighbours {
2096 my ($map) = @_;
2097
2098 my @neigh; # diagonal neighbours
2099
2100 for (0 .. 3) {
2101 my $neigh = $map->tile_path ($_)
2102 or next;
2103 $neigh = find $neigh, $map
2104 or next;
2105 $neigh->load;
2106
2107 push @neigh,
2108 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2109 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2110 }
2111
2112 for (grep defined $_->[0], @neigh) {
2113 my ($path, $origin) = @$_;
2114 my $neigh = find $path, $origin
2115 or next;
2116 $neigh->load;
2117 }
2118}
2119
2120sub find_sync { 2307sub find_sync {
2121 my ($path, $origin) = @_; 2308 my ($path, $origin) = @_;
2122 2309
2123 cf::sync_job { find $path, $origin } 2310 # it's a bug to call this from the main context
2311 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2312 if $Coro::current == $Coro::main;
2313
2314 find $path, $origin
2124} 2315}
2125 2316
2126sub do_load_sync { 2317sub do_load_sync {
2127 my ($map) = @_; 2318 my ($map) = @_;
2128 2319
2320 # it's a bug to call this from the main context
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2321 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main; 2322 if $Coro::current == $Coro::main;
2131 2323
2132 cf::sync_job { $map->load }; 2324 $map->load;
2133} 2325}
2134 2326
2135our %MAP_PREFETCH; 2327our %MAP_PREFETCH;
2136our $MAP_PREFETCHER = undef; 2328our $MAP_PREFETCHER = undef;
2137 2329
2138sub find_async { 2330sub find_async {
2139 my ($path, $origin, $load) = @_; 2331 my ($path, $origin, $load) = @_;
2140 2332
2141 $path = normalise $path, $origin && $origin->{path}; 2333 $path = normalise $path, $origin;
2142 2334
2143 if (my $map = $cf::MAP{$path}) { 2335 if (my $map = $cf::MAP{$path}) {
2144 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2336 return $map if !$load || $map->linkable;
2145 } 2337 }
2146 2338
2147 $MAP_PREFETCH{$path} |= $load; 2339 $MAP_PREFETCH{$path} |= $load;
2148 2340
2149 $MAP_PREFETCHER ||= cf::async { 2341 $MAP_PREFETCHER ||= cf::async {
2163 $MAP_PREFETCHER->prio (6); 2355 $MAP_PREFETCHER->prio (6);
2164 2356
2165 () 2357 ()
2166} 2358}
2167 2359
2360# common code, used by both ->save and ->swapout
2168sub save { 2361sub _save {
2169 my ($self) = @_; 2362 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172 2363
2173 $self->{last_save} = $cf::RUNTIME; 2364 $self->{last_save} = $cf::RUNTIME;
2174 2365
2175 return unless $self->dirty; 2366 return unless $self->dirty;
2176 2367
2196 } else { 2387 } else {
2197 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2388 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2198 } 2389 }
2199} 2390}
2200 2391
2392sub save {
2393 my ($self) = @_;
2394
2395 my $lock = cf::lock_acquire "map_data:$self->{path}";
2396
2397 $self->_save;
2398}
2399
2201sub swap_out { 2400sub swap_out {
2202 my ($self) = @_; 2401 my ($self) = @_;
2203 2402
2204 # save first because save cedes
2205 $self->save;
2206
2207 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2403 my $lock = cf::lock_acquire "map_data:$self->{path}";
2208 2404
2405 return if !$self->linkable;
2406 return if $self->{deny_save};
2209 return if $self->players; 2407 return if $self->players;
2210 return if $self->in_memory != cf::MAP_ACTIVE; 2408
2409 # first deactivate the map and "unlink" it from the core
2410 $self->deactivate;
2411 $_->clear_links_to ($self) for values %cf::MAP;
2412 $self->state (cf::MAP_SWAPPED);
2413
2414 # then atomically save
2415 $self->_save;
2416
2417 # then free the map
2418 $self->clear;
2419}
2420
2421sub reset_at {
2422 my ($self) = @_;
2423
2424 # TODO: safety, remove and allow resettable per-player maps
2211 return if $self->{deny_save}; 2425 return 1e99 if $self->{deny_reset};
2212 2426
2427 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2428 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2429
2430 $time + $to
2431}
2432
2433sub should_reset {
2434 my ($self) = @_;
2435
2436 $self->reset_at <= $cf::RUNTIME
2437}
2438
2439sub reset {
2440 my ($self) = @_;
2441
2442 my $lock = cf::lock_acquire "map_data:$self->{path}";
2443
2444 return if $self->players;
2445
2446 cf::trace "resetting map ", $self->path, "\n";
2447
2213 $self->in_memory (cf::MAP_SWAPPED); 2448 $self->state (cf::MAP_SWAPPED);
2449
2450 # need to save uniques path
2451 unless ($self->{deny_save}) {
2452 my $uniq = $self->uniq_path; utf8::encode $uniq;
2453
2454 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2455 if $uniq;
2456 }
2457
2458 delete $cf::MAP{$self->path};
2214 2459
2215 $self->deactivate; 2460 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP; 2461 $_->clear_links_to ($self) for values %cf::MAP;
2217 $self->clear; 2462 $self->clear;
2218}
2219
2220sub reset_at {
2221 my ($self) = @_;
2222
2223 # TODO: safety, remove and allow resettable per-player maps
2224 return 1e99 if $self->{deny_reset};
2225
2226 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2227 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2228
2229 $time + $to
2230}
2231
2232sub should_reset {
2233 my ($self) = @_;
2234
2235 $self->reset_at <= $cf::RUNTIME
2236}
2237
2238sub reset {
2239 my ($self) = @_;
2240
2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2242
2243 return if $self->players;
2244
2245 warn "resetting map ", $self->path, "\n";
2246
2247 $self->in_memory (cf::MAP_SWAPPED);
2248
2249 # need to save uniques path
2250 unless ($self->{deny_save}) {
2251 my $uniq = $self->uniq_path; utf8::encode $uniq;
2252
2253 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2254 if $uniq;
2255 }
2256
2257 delete $cf::MAP{$self->path};
2258
2259 $self->deactivate;
2260 $_->clear_links_to ($self) for values %cf::MAP;
2261 $self->clear;
2262 2463
2263 $self->unlink_save; 2464 $self->unlink_save;
2264 $self->destroy; 2465 $self->destroy;
2265} 2466}
2266 2467
2274 2475
2275 delete $cf::MAP{$self->path}; 2476 delete $cf::MAP{$self->path};
2276 2477
2277 $self->unlink_save; 2478 $self->unlink_save;
2278 2479
2279 bless $self, "cf::map"; 2480 bless $self, "cf::map::wrap";
2280 delete $self->{deny_reset}; 2481 delete $self->{deny_reset};
2281 $self->{deny_save} = 1; 2482 $self->{deny_save} = 1;
2282 $self->reset_timeout (1); 2483 $self->reset_timeout (1);
2283 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2484 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2284 2485
2344} 2545}
2345 2546
2346=item cf::map::static_maps 2547=item cf::map::static_maps
2347 2548
2348Returns an arrayref if paths of all static maps (all preinstalled F<.map> 2549Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2349file in the shared directory excluding F</styles>). May block. 2550file in the shared directory excluding F</styles> and F</editor>). May
2551block.
2350 2552
2351=cut 2553=cut
2352 2554
2353sub static_maps() { 2555sub static_maps() {
2354 my @dirs = ""; 2556 my @dirs = "";
2355 my @maps; 2557 my @maps;
2356 2558
2357 while (@dirs) { 2559 while (@dirs) {
2358 my $dir = shift @dirs; 2560 my $dir = shift @dirs;
2359 2561
2360 next if $dir eq "/styles"; 2562 next if $dir eq "/styles" || $dir eq "/editor";
2361 2563
2362 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2 2564 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2363 or return; 2565 or return;
2364 2566
2365 for (@$files) { 2567 for (@$files) {
2513 2715
2514Freezes the player and moves him/her to a special map (C<{link}>). 2716Freezes the player and moves him/her to a special map (C<{link}>).
2515 2717
2516The player should be reasonably safe there for short amounts of time (e.g. 2718The player should be reasonably safe there for short amounts of time (e.g.
2517for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2719for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2518though, as the palyer cannot control the character while it is on the link 2720though, as the player cannot control the character while it is on the link
2519map. 2721map.
2520 2722
2521Will never block. 2723Will never block.
2522 2724
2523=item $player_object->leave_link ($map, $x, $y) 2725=item $player_object->leave_link ($map, $x, $y)
2544sub cf::object::player::enter_link { 2746sub cf::object::player::enter_link {
2545 my ($self) = @_; 2747 my ($self) = @_;
2546 2748
2547 $self->deactivate_recursive; 2749 $self->deactivate_recursive;
2548 2750
2751 ++$self->{_link_recursion};
2752
2549 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2753 return if UNIVERSAL::isa $self->map, "ext::map_link";
2550 2754
2551 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2755 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2552 if $self->map && $self->map->{path} ne "{link}"; 2756 if $self->map && $self->map->{path} ne "{link}";
2553 2757
2554 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2758 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2555} 2759}
2556 2760
2557sub cf::object::player::leave_link { 2761sub cf::object::player::leave_link {
2558 my ($self, $map, $x, $y) = @_; 2762 my ($self, $map, $x, $y) = @_;
2559 2763
2576 ($x, $y) = (-1, -1) 2780 ($x, $y) = (-1, -1)
2577 unless (defined $x) && (defined $y); 2781 unless (defined $x) && (defined $y);
2578 2782
2579 # use -1 or undef as default coordinates, not 0, 0 2783 # use -1 or undef as default coordinates, not 0, 0
2580 ($x, $y) = ($map->enter_x, $map->enter_y) 2784 ($x, $y) = ($map->enter_x, $map->enter_y)
2581 if $x <=0 && $y <= 0; 2785 if $x <= 0 && $y <= 0;
2582 2786
2583 $map->load; 2787 $map->load;
2584 $map->load_neighbours;
2585 2788
2586 return unless $self->contr->active; 2789 return unless $self->contr->active;
2587 2790
2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2791 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589 $self->enter_map ($map, $x, $y); 2792 if ($self->enter_map ($map, $x, $y)) {
2590 2793 # entering was successful
2794 delete $self->{_link_recursion};
2591 # only activate afterwards, to support waiting in hooks 2795 # only activate afterwards, to support waiting in hooks
2592 $self->activate_recursive; 2796 $self->activate_recursive;
2593} 2797 }
2594 2798
2799}
2800
2595=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2801=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2596 2802
2597Moves the player to the given map-path and coordinates by first freezing 2803Moves the player to the given map-path and coordinates by first freezing
2598her, loading and preparing them map, calling the provided $check callback 2804her, loading and preparing them map, calling the provided $check callback
2599that has to return the map if sucecssful, and then unfreezes the player on 2805that has to return the map if sucecssful, and then unfreezes the player on
2600the new (success) or old (failed) map position. In either case, $done will 2806the new (success) or old (failed) map position. In either case, $done will
2607 2813
2608our $GOTOGEN; 2814our $GOTOGEN;
2609 2815
2610sub cf::object::player::goto { 2816sub cf::object::player::goto {
2611 my ($self, $path, $x, $y, $check, $done) = @_; 2817 my ($self, $path, $x, $y, $check, $done) = @_;
2818
2819 if ($self->{_link_recursion} >= $MAX_LINKS) {
2820 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2821 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2822 ($path, $x, $y) = @$EMERGENCY_POSITION;
2823 }
2612 2824
2613 # do generation counting so two concurrent goto's will be executed in-order 2825 # do generation counting so two concurrent goto's will be executed in-order
2614 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2826 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2615 2827
2616 $self->enter_link; 2828 $self->enter_link;
2636 ($path, $x, $y) = (undef, undef, undef); 2848 ($path, $x, $y) = (undef, undef, undef);
2637 } 2849 }
2638 } 2850 }
2639 2851
2640 my $map = eval { 2852 my $map = eval {
2641 my $map = defined $path ? cf::map::find $path : undef; 2853 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2642 2854
2643 if ($map) { 2855 if ($map) {
2644 $map = $map->customise_for ($self); 2856 $map = $map->customise_for ($self);
2645 $map = $check->($map) if $check && $map; 2857 $map = $check->($map, $x, $y, $self) if $check && $map;
2646 } else { 2858 } else {
2647 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2859 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2648 } 2860 }
2649 2861
2650 $map 2862 $map
2658 if ($gen == $self->{_goto_generation}) { 2870 if ($gen == $self->{_goto_generation}) {
2659 delete $self->{_goto_generation}; 2871 delete $self->{_goto_generation};
2660 $self->leave_link ($map, $x, $y); 2872 $self->leave_link ($map, $x, $y);
2661 } 2873 }
2662 2874
2663 $done->() if $done; 2875 $done->($self) if $done;
2664 })->prio (1); 2876 })->prio (1);
2665} 2877}
2666 2878
2667=item $player_object->enter_exit ($exit_object) 2879=item $player_object->enter_exit ($exit_object)
2668 2880
2736 $Coro::current->{desc} = "enter_exit"; 2948 $Coro::current->{desc} = "enter_exit";
2737 2949
2738 unless (eval { 2950 unless (eval {
2739 $self->deactivate_recursive; # just to be sure 2951 $self->deactivate_recursive; # just to be sure
2740 2952
2741 # random map handling
2742 {
2743 my $guard = cf::lock_acquire "exit_prepare:$exit";
2744
2745 prepare_random_map $exit
2746 if $exit->slaying eq "/!";
2747 }
2748
2749 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2953 my $map = cf::map::normalise $exit->slaying, $exit->map;
2750 my $x = $exit->stats->hp; 2954 my $x = $exit->stats->hp;
2751 my $y = $exit->stats->sp; 2955 my $y = $exit->stats->sp;
2956
2957 # special map handling
2958 my $slaying = $exit->slaying;
2959
2960 # special map handling
2961 if ($slaying eq "/!") {
2962 my $guard = cf::lock_acquire "exit_prepare:$exit";
2963
2964 prepare_random_map $exit
2965 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2966
2967 $map = $exit->slaying;
2968
2969 } elsif ($slaying eq '!up') {
2970 $map = $exit->map->tile_path (cf::TILE_UP);
2971 $x = $exit->x;
2972 $y = $exit->y;
2973
2974 } elsif ($slaying eq '!down') {
2975 $map = $exit->map->tile_path (cf::TILE_DOWN);
2976 $x = $exit->x;
2977 $y = $exit->y;
2978 }
2752 2979
2753 $self->goto ($map, $x, $y); 2980 $self->goto ($map, $x, $y);
2754 2981
2755 # if exit is damned, update players death & WoR home-position 2982 # if exit is damned, update players death & WoR home-position
2756 $self->contr->savebed ($map, $x, $y) 2983 $self->contr->savebed ($map, $x, $y)
2761 $self->message ("Something went wrong deep within the deliantra server. " 2988 $self->message ("Something went wrong deep within the deliantra server. "
2762 . "I'll try to bring you back to the map you were before. " 2989 . "I'll try to bring you back to the map you were before. "
2763 . "Please report this to the dungeon master!", 2990 . "Please report this to the dungeon master!",
2764 cf::NDI_UNIQUE | cf::NDI_RED); 2991 cf::NDI_UNIQUE | cf::NDI_RED);
2765 2992
2766 warn "ERROR in enter_exit: $@"; 2993 error "ERROR in enter_exit: $@";
2767 $self->leave_link; 2994 $self->leave_link;
2768 } 2995 }
2769 })->prio (1); 2996 })->prio (1);
2770} 2997}
2771 2998
2783sub cf::client::send_drawinfo { 3010sub cf::client::send_drawinfo {
2784 my ($self, $text, $flags) = @_; 3011 my ($self, $text, $flags) = @_;
2785 3012
2786 utf8::encode $text; 3013 utf8::encode $text;
2787 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3014 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3015}
3016
3017=item $client->send_big_packet ($pkt)
3018
3019Like C<send_packet>, but tries to compress large packets, and fragments
3020them as required.
3021
3022=cut
3023
3024our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3025
3026sub cf::client::send_big_packet {
3027 my ($self, $pkt) = @_;
3028
3029 # try lzf for large packets
3030 $pkt = "lzf " . Compress::LZF::compress $pkt
3031 if 1024 <= length $pkt and $self->{can_lzf};
3032
3033 # split very large packets
3034 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3035 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3036 $pkt = "frag";
3037 }
3038
3039 $self->send_packet ($pkt);
2788} 3040}
2789 3041
2790=item $client->send_msg ($channel, $msg, $color, [extra...]) 3042=item $client->send_msg ($channel, $msg, $color, [extra...])
2791 3043
2792Send a drawinfo or msg packet to the client, formatting the msg for the 3044Send a drawinfo or msg packet to the client, formatting the msg for the
2944 my $pkt = "msg " 3196 my $pkt = "msg "
2945 . $self->{json_coder}->encode ( 3197 . $self->{json_coder}->encode (
2946 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3198 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2947 ); 3199 );
2948 3200
2949 # try lzf for large packets
2950 $pkt = "lzf " . Compress::LZF::compress $pkt
2951 if 1024 <= length $pkt and $self->{can_lzf};
2952
2953 # split very large packets
2954 if (8192 < length $pkt and $self->{can_lzf}) {
2955 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2956 $pkt = "frag";
2957 }
2958
2959 $self->send_packet ($pkt); 3201 $self->send_big_packet ($pkt);
2960} 3202}
2961 3203
2962=item $client->ext_msg ($type, @msg) 3204=item $client->ext_msg ($type, @msg)
2963 3205
2964Sends an ext event to the client. 3206Sends an ext event to the client.
2967 3209
2968sub cf::client::ext_msg($$@) { 3210sub cf::client::ext_msg($$@) {
2969 my ($self, $type, @msg) = @_; 3211 my ($self, $type, @msg) = @_;
2970 3212
2971 if ($self->extcmd == 2) { 3213 if ($self->extcmd == 2) {
2972 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3214 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2973 } elsif ($self->extcmd == 1) { # TODO: remove 3215 } elsif ($self->extcmd == 1) { # TODO: remove
2974 push @msg, msgtype => "event_$type"; 3216 push @msg, msgtype => "event_$type";
2975 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3217 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2976 } 3218 }
2977} 3219}
2978 3220
2979=item $client->ext_reply ($msgid, @msg) 3221=item $client->ext_reply ($msgid, @msg)
2980 3222
2983=cut 3225=cut
2984 3226
2985sub cf::client::ext_reply($$@) { 3227sub cf::client::ext_reply($$@) {
2986 my ($self, $id, @msg) = @_; 3228 my ($self, $id, @msg) = @_;
2987 3229
2988 if ($self->extcmd == 2) { 3230 return unless $self->extcmd == 2;
3231
2989 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3232 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2990 } elsif ($self->extcmd == 1) {
2991 #TODO: version 1, remove
2992 unshift @msg, msgtype => "reply", msgid => $id;
2993 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2994 }
2995} 3233}
2996 3234
2997=item $success = $client->query ($flags, "text", \&cb) 3235=item $success = $client->query ($flags, "text", \&cb)
2998 3236
2999Queues a query to the client, calling the given callback with 3237Queues a query to the client, calling the given callback with
3054 my ($ns, $buf) = @_; 3292 my ($ns, $buf) = @_;
3055 3293
3056 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3294 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3057 3295
3058 if (ref $msg) { 3296 if (ref $msg) {
3059 my ($type, $reply, @payload) = 3297 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3060 "ARRAY" eq ref $msg
3061 ? @$msg
3062 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3063 3298
3064 my @reply; 3299 my @reply;
3065 3300
3066 if (my $cb = $EXTICMD{$type}) { 3301 if (my $cb = $EXTICMD{$type}) {
3067 @reply = $cb->($ns, @payload); 3302 @reply = $cb->($ns, @payload);
3069 3304
3070 $ns->ext_reply ($reply, @reply) 3305 $ns->ext_reply ($reply, @reply)
3071 if $reply; 3306 if $reply;
3072 3307
3073 } else { 3308 } else {
3074 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3309 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3075 } 3310 }
3076 3311
3077 cf::override; 3312 cf::override;
3078 }, 3313 },
3079); 3314);
3099 3334
3100 $coro 3335 $coro
3101} 3336}
3102 3337
3103cf::client->attach ( 3338cf::client->attach (
3104 on_destroy => sub { 3339 on_client_destroy => sub {
3105 my ($ns) = @_; 3340 my ($ns) = @_;
3106 3341
3107 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3342 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3108 }, 3343 },
3109); 3344);
3125our $safe_hole = new Safe::Hole; 3360our $safe_hole = new Safe::Hole;
3126 3361
3127$SIG{FPE} = 'IGNORE'; 3362$SIG{FPE} = 'IGNORE';
3128 3363
3129$safe->permit_only (Opcode::opset qw( 3364$safe->permit_only (Opcode::opset qw(
3130 :base_core :base_mem :base_orig :base_math 3365 :base_core :base_mem :base_orig :base_math :base_loop
3131 grepstart grepwhile mapstart mapwhile 3366 grepstart grepwhile mapstart mapwhile
3132 sort time 3367 sort time
3133)); 3368));
3134 3369
3135# here we export the classes and methods available to script code 3370# here we export the classes and methods available to script code
3160 decrease split destroy change_exp value msg lore send_msg)], 3395 decrease split destroy change_exp value msg lore send_msg)],
3161 ["cf::object::player" => qw(player)], 3396 ["cf::object::player" => qw(player)],
3162 ["cf::player" => qw(peaceful send_msg)], 3397 ["cf::player" => qw(peaceful send_msg)],
3163 ["cf::map" => qw(trigger)], 3398 ["cf::map" => qw(trigger)],
3164) { 3399) {
3165 no strict 'refs';
3166 my ($pkg, @funs) = @$_; 3400 my ($pkg, @funs) = @$_;
3167 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3401 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3168 for @funs; 3402 for @funs;
3169} 3403}
3170 3404
3187 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3421 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3188 $qcode =~ s/\n/\\n/g; 3422 $qcode =~ s/\n/\\n/g;
3189 3423
3190 %vars = (_dummy => 0) unless %vars; 3424 %vars = (_dummy => 0) unless %vars;
3191 3425
3426 my @res;
3192 local $_; 3427 local $_;
3193 local @safe::cf::_safe_eval_args = values %vars;
3194 3428
3195 my $eval = 3429 my $eval =
3196 "do {\n" 3430 "do {\n"
3197 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3431 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3198 . "#line 0 \"{$qcode}\"\n" 3432 . "#line 0 \"{$qcode}\"\n"
3199 . $code 3433 . $code
3200 . "\n}" 3434 . "\n}"
3201 ; 3435 ;
3202 3436
3437 if ($CFG{safe_eval}) {
3203 sub_generation_inc; 3438 sub_generation_inc;
3439 local @safe::cf::_safe_eval_args = values %vars;
3204 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3440 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3205 sub_generation_inc; 3441 sub_generation_inc;
3442 } else {
3443 local @cf::_safe_eval_args = values %vars;
3444 @res = wantarray ? eval eval : scalar eval $eval;
3445 }
3206 3446
3207 if ($@) { 3447 if ($@) {
3208 warn "$@"; 3448 warn "$@",
3209 warn "while executing safe code '$code'\n"; 3449 "while executing safe code '$code'\n",
3210 warn "with arguments " . (join " ", %vars) . "\n"; 3450 "with arguments " . (join " ", %vars) . "\n";
3211 } 3451 }
3212 3452
3213 wantarray ? @res : $res[0] 3453 wantarray ? @res : $res[0]
3214} 3454}
3215 3455
3229=cut 3469=cut
3230 3470
3231sub register_script_function { 3471sub register_script_function {
3232 my ($fun, $cb) = @_; 3472 my ($fun, $cb) = @_;
3233 3473
3234 no strict 'refs'; 3474 $fun = "safe::$fun" if $CFG{safe_eval};
3235 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3475 *$fun = $safe_hole->wrap ($cb);
3236} 3476}
3237 3477
3238=back 3478=back
3239 3479
3240=cut 3480=cut
3249 # for this (global event?) 3489 # for this (global event?)
3250 %ext::player_env::MUSIC_FACE_CACHE = (); 3490 %ext::player_env::MUSIC_FACE_CACHE = ();
3251 3491
3252 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3492 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3253 3493
3254 warn "loading facedata from $path\n"; 3494 trace "loading facedata from $path\n";
3255 3495
3256 my $facedata; 3496 my $facedata = decode_storable load_file $path;
3257 0 < aio_load $path, $facedata
3258 or die "$path: $!";
3259
3260 $facedata = Coro::Storable::thaw $facedata;
3261 3497
3262 $facedata->{version} == 2 3498 $facedata->{version} == 2
3263 or cf::cleanup "$path: version mismatch, cannot proceed."; 3499 or cf::cleanup "$path: version mismatch, cannot proceed.";
3264 3500
3265 # patch in the exptable 3501 # patch in the exptable
3502 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3266 $facedata->{resource}{"res/exp_table"} = { 3503 $facedata->{resource}{"res/exp_table"} = {
3267 type => FT_RSRC, 3504 type => FT_RSRC,
3268 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3505 data => $exp_table,
3506 hash => (Digest::MD5::md5 $exp_table),
3269 }; 3507 };
3270 cf::cede_to_tick; 3508 cf::cede_to_tick;
3271 3509
3272 { 3510 {
3273 my $faces = $facedata->{faceinfo}; 3511 my $faces = $facedata->{faceinfo};
3275 while (my ($face, $info) = each %$faces) { 3513 while (my ($face, $info) = each %$faces) {
3276 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3514 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3277 3515
3278 cf::face::set_visibility $idx, $info->{visibility}; 3516 cf::face::set_visibility $idx, $info->{visibility};
3279 cf::face::set_magicmap $idx, $info->{magicmap}; 3517 cf::face::set_magicmap $idx, $info->{magicmap};
3280 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3518 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3281 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3519 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3520 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3282 3521
3283 cf::cede_to_tick; 3522 cf::cede_to_tick;
3284 } 3523 }
3285 3524
3286 while (my ($face, $info) = each %$faces) { 3525 while (my ($face, $info) = each %$faces) {
3291 3530
3292 if (my $smooth = cf::face::find $info->{smooth}) { 3531 if (my $smooth = cf::face::find $info->{smooth}) {
3293 cf::face::set_smooth $idx, $smooth; 3532 cf::face::set_smooth $idx, $smooth;
3294 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3533 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3295 } else { 3534 } else {
3296 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3535 error "smooth face '$info->{smooth}' not found for face '$face'";
3297 } 3536 }
3298 3537
3299 cf::cede_to_tick; 3538 cf::cede_to_tick;
3300 } 3539 }
3301 } 3540 }
3310 3549
3311 cf::anim::invalidate_all; # d'oh 3550 cf::anim::invalidate_all; # d'oh
3312 } 3551 }
3313 3552
3314 { 3553 {
3315 # TODO: for gcfclient pleasure, we should give resources
3316 # that gcfclient doesn't grok a >10000 face index.
3317 my $res = $facedata->{resource}; 3554 my $res = $facedata->{resource};
3318 3555
3319 while (my ($name, $info) = each %$res) { 3556 while (my ($name, $info) = each %$res) {
3320 if (defined $info->{type}) { 3557 if (defined (my $type = $info->{type})) {
3558 # TODO: different hash - must free and use new index, or cache ixface data queue
3321 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3559 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3322 my $data;
3323 3560
3324 if ($info->{type} & 1) { 3561 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3325 # prepend meta info
3326
3327 my $meta = $enc->encode ({
3328 name => $name,
3329 %{ $info->{meta} || {} },
3330 });
3331
3332 $data = pack "(w/a*)*", $meta, $info->{data};
3333 } else {
3334 $data = $info->{data};
3335 }
3336
3337 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3338 cf::face::set_type $idx, $info->{type}; 3562 cf::face::set_type $idx, $type;
3563 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3339 } else { 3564 } else {
3340 $RESOURCE{$name} = $info; 3565# $RESOURCE{$name} = $info; # unused
3341 } 3566 }
3342 3567
3343 cf::cede_to_tick; 3568 cf::cede_to_tick;
3344 } 3569 }
3345 } 3570 }
3346 3571
3347 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3572 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3348 3573
3349 1 3574 1
3350} 3575}
3351
3352cf::global->attach (on_resource_update => sub {
3353 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3354 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3355
3356 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3357 my $sound = $soundconf->{compat}[$_]
3358 or next;
3359
3360 my $face = cf::face::find "sound/$sound->[1]";
3361 cf::sound::set $sound->[0] => $face;
3362 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3363 }
3364
3365 while (my ($k, $v) = each %{$soundconf->{event}}) {
3366 my $face = cf::face::find "sound/$v";
3367 cf::sound::set $k => $face;
3368 }
3369 }
3370});
3371 3576
3372register_exticmd fx_want => sub { 3577register_exticmd fx_want => sub {
3373 my ($ns, $want) = @_; 3578 my ($ns, $want) = @_;
3374 3579
3375 while (my ($k, $v) = each %$want) { 3580 while (my ($k, $v) = each %$want) {
3414sub reload_treasures { 3619sub reload_treasures {
3415 load_resource_file "$DATADIR/treasures" 3620 load_resource_file "$DATADIR/treasures"
3416 or die "unable to load treasurelists\n"; 3621 or die "unable to load treasurelists\n";
3417} 3622}
3418 3623
3624sub reload_sound {
3625 trace "loading sound config from $DATADIR/sound\n";
3626
3627 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3628
3629 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3630 my $sound = $soundconf->{compat}[$_]
3631 or next;
3632
3633 my $face = cf::face::find "sound/$sound->[1]";
3634 cf::sound::set $sound->[0] => $face;
3635 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3636 }
3637
3638 while (my ($k, $v) = each %{$soundconf->{event}}) {
3639 my $face = cf::face::find "sound/$v";
3640 cf::sound::set $k => $face;
3641 }
3642}
3643
3419sub reload_resources { 3644sub reload_resources {
3420 warn "reloading resource files...\n"; 3645 trace "reloading resource files...\n";
3421 3646
3647 reload_exp_table;
3648 reload_materials;
3422 reload_facedata; 3649 reload_facedata;
3650 reload_sound;
3423 reload_archetypes; 3651 reload_archetypes;
3424 reload_regions; 3652 reload_regions;
3425 reload_treasures; 3653 reload_treasures;
3426 3654
3427 warn "finished reloading resource files\n"; 3655 trace "finished reloading resource files\n";
3428} 3656}
3429 3657
3430sub reload_config { 3658sub reload_config {
3431 warn "reloading config file...\n"; 3659 trace "reloading config file...\n";
3432 3660
3433 open my $fh, "<:utf8", "$CONFDIR/config" 3661 my $config = load_file "$CONFDIR/config";
3434 or return; 3662 utf8::decode $config;
3663 *CFG = decode_yaml $config;
3435 3664
3436 local $/;
3437 *CFG = YAML::XS::Load scalar <$fh>;
3438
3439 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3665 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3440 3666
3441 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3667 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3442 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3668 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3443 3669
3444 if (exists $CFG{mlockall}) { 3670 if (exists $CFG{mlockall}) {
3446 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3672 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3447 and die "WARNING: m(un)lockall failed: $!\n"; 3673 and die "WARNING: m(un)lockall failed: $!\n";
3448 }; 3674 };
3449 warn $@ if $@; 3675 warn $@ if $@;
3450 } 3676 }
3451
3452 warn "finished reloading resource files\n";
3453} 3677}
3454 3678
3455sub pidfile() { 3679sub pidfile() {
3456 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3680 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3457 or die "$PIDFILE: $!"; 3681 or die "$PIDFILE: $!";
3470 seek $fh, 0, 0; 3694 seek $fh, 0, 0;
3471 print $fh $$; 3695 print $fh $$;
3472} 3696}
3473 3697
3474sub main_loop { 3698sub main_loop {
3475 warn "EV::loop starting\n"; 3699 trace "EV::loop starting\n";
3476 if (1) { 3700 if (1) {
3477 EV::loop; 3701 EV::loop;
3478 } 3702 }
3479 warn "EV::loop returned\n"; 3703 trace "EV::loop returned\n";
3480 goto &main_loop unless $REALLY_UNLOOP; 3704 goto &main_loop unless $REALLY_UNLOOP;
3481} 3705}
3482 3706
3483sub main { 3707sub main {
3484 cf::init_globals; # initialise logging 3708 cf::init_globals; # initialise logging
3485 3709
3486 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3710 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3487 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3711 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3488 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3712 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3489 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3713 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3490
3491 cf::init_experience;
3492 cf::init_anim;
3493 cf::init_attackmess;
3494 cf::init_dynamic;
3495 3714
3496 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3715 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3497 3716
3498 # we must not ever block the main coroutine 3717 # we must not ever block the main coroutine
3499 local $Coro::idle = sub { 3718 local $Coro::idle = sub {
3505 }; 3724 };
3506 3725
3507 evthread_start IO::AIO::poll_fileno; 3726 evthread_start IO::AIO::poll_fileno;
3508 3727
3509 cf::sync_job { 3728 cf::sync_job {
3729 cf::incloader::init ();
3730
3731 cf::init_anim;
3732 cf::init_attackmess;
3733 cf::init_dynamic;
3734
3735 cf::load_settings;
3736
3510 reload_resources; 3737 reload_resources;
3511 reload_config; 3738 reload_config;
3512 db_init; 3739 db_init;
3513 3740
3514 cf::load_settings;
3515 cf::load_materials;
3516 cf::init_uuid; 3741 cf::init_uuid;
3517 cf::init_signals; 3742 cf::init_signals;
3518 cf::init_commands;
3519 cf::init_skills; 3743 cf::init_skills;
3520 3744
3521 cf::init_beforeplay; 3745 cf::init_beforeplay;
3522 3746
3523 atomic; 3747 atomic;
3528 3752
3529 # no (long-running) fork's whatsoever before this point(!) 3753 # no (long-running) fork's whatsoever before this point(!)
3530 use POSIX (); 3754 use POSIX ();
3531 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3755 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3532 3756
3533 (pop @POST_INIT)->(0) while @POST_INIT; 3757 cf::_post_init 0;
3534 }; 3758 };
3535 3759
3760 cf::object::thawer::errors_are_fatal 0;
3761 info "parse errors in files are no longer fatal from this point on.\n";
3762
3763 AE::postpone {
3764 undef &main; # free gobs of memory :)
3765 };
3766
3536 main_loop; 3767 goto &main_loop;
3537} 3768}
3538 3769
3539############################################################################# 3770#############################################################################
3540# initialisation and cleanup 3771# initialisation and cleanup
3541 3772
3542# install some emergency cleanup handlers 3773# install some emergency cleanup handlers
3543BEGIN { 3774BEGIN {
3544 our %SIGWATCHER = (); 3775 our %SIGWATCHER = ();
3545 for my $signal (qw(INT HUP TERM)) { 3776 for my $signal (qw(INT HUP TERM)) {
3546 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3777 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3547 cf::cleanup "SIG$signal"; 3778 cf::cleanup "SIG$signal";
3548 }; 3779 };
3549 } 3780 }
3550} 3781}
3551 3782
3552sub write_runtime_sync { 3783sub write_runtime_sync {
3784 my $t0 = AE::time;
3785
3553 # first touch the runtime file to show we are still running: 3786 # first touch the runtime file to show we are still running:
3554 # the fsync below can take a very very long time. 3787 # the fsync below can take a very very long time.
3555 3788
3556 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3789 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3557 3790
3558 my $guard = cf::lock_acquire "write_runtime"; 3791 my $guard = cf::lock_acquire "write_runtime";
3559 3792
3560 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3793 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3561 or return; 3794 or return;
3562 3795
3563 my $value = $cf::RUNTIME + 90 + 10; 3796 my $value = $cf::RUNTIME + 90 + 10;
3564 # 10 is the runtime save interval, for a monotonic clock 3797 # 10 is the runtime save interval, for a monotonic clock
3565 # 60 allows for the watchdog to kill the server. 3798 # 60 allows for the watchdog to kill the server.
3578 or return; 3811 or return;
3579 3812
3580 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3813 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3581 and return; 3814 and return;
3582 3815
3583 warn "runtime file written.\n"; 3816 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3584 3817
3585 1 3818 1
3586} 3819}
3587 3820
3588our $uuid_lock; 3821our $uuid_lock;
3600 or return; 3833 or return;
3601 3834
3602 my $value = uuid_seq uuid_cur; 3835 my $value = uuid_seq uuid_cur;
3603 3836
3604 unless ($value) { 3837 unless ($value) {
3605 warn "cowardly refusing to write zero uuid value!\n"; 3838 info "cowardly refusing to write zero uuid value!\n";
3606 return; 3839 return;
3607 } 3840 }
3608 3841
3609 my $value = uuid_str $value + $uuid_skip; 3842 my $value = uuid_str $value + $uuid_skip;
3610 $uuid_skip = 0; 3843 $uuid_skip = 0;
3620 or return; 3853 or return;
3621 3854
3622 aio_rename "$uuid~", $uuid 3855 aio_rename "$uuid~", $uuid
3623 and return; 3856 and return;
3624 3857
3625 warn "uuid file written ($value).\n"; 3858 trace "uuid file written ($value).\n";
3626 3859
3627 1 3860 1
3628 3861
3629} 3862}
3630 3863
3636} 3869}
3637 3870
3638sub emergency_save() { 3871sub emergency_save() {
3639 my $freeze_guard = cf::freeze_mainloop; 3872 my $freeze_guard = cf::freeze_mainloop;
3640 3873
3641 warn "emergency_perl_save: enter\n"; 3874 info "emergency_perl_save: enter\n";
3875
3876 # this is a trade-off: we want to be very quick here, so
3877 # save all maps without fsync, and later call a global sync
3878 # (which in turn might be very very slow)
3879 local $USE_FSYNC = 0;
3642 3880
3643 cf::sync_job { 3881 cf::sync_job {
3644 # this is a trade-off: we want to be very quick here, so 3882 cf::write_runtime_sync; # external watchdog should not bark
3645 # save all maps without fsync, and later call a global sync
3646 # (which in turn might be very very slow)
3647 local $USE_FSYNC = 0;
3648 3883
3649 # use a peculiar iteration method to avoid tripping on perl 3884 # use a peculiar iteration method to avoid tripping on perl
3650 # refcount bugs in for. also avoids problems with players 3885 # refcount bugs in for. also avoids problems with players
3651 # and maps saved/destroyed asynchronously. 3886 # and maps saved/destroyed asynchronously.
3652 warn "emergency_perl_save: begin player save\n"; 3887 info "emergency_perl_save: begin player save\n";
3653 for my $login (keys %cf::PLAYER) { 3888 for my $login (keys %cf::PLAYER) {
3654 my $pl = $cf::PLAYER{$login} or next; 3889 my $pl = $cf::PLAYER{$login} or next;
3655 $pl->valid or next; 3890 $pl->valid or next;
3656 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3891 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3657 $pl->save; 3892 $pl->save;
3658 } 3893 }
3659 warn "emergency_perl_save: end player save\n"; 3894 info "emergency_perl_save: end player save\n";
3660 3895
3896 cf::write_runtime_sync; # external watchdog should not bark
3897
3661 warn "emergency_perl_save: begin map save\n"; 3898 info "emergency_perl_save: begin map save\n";
3662 for my $path (keys %cf::MAP) { 3899 for my $path (keys %cf::MAP) {
3663 my $map = $cf::MAP{$path} or next; 3900 my $map = $cf::MAP{$path} or next;
3664 $map->valid or next; 3901 $map->valid or next;
3665 $map->save; 3902 $map->save;
3666 } 3903 }
3667 warn "emergency_perl_save: end map save\n"; 3904 info "emergency_perl_save: end map save\n";
3668 3905
3906 cf::write_runtime_sync; # external watchdog should not bark
3907
3669 warn "emergency_perl_save: begin database checkpoint\n"; 3908 info "emergency_perl_save: begin database checkpoint\n";
3670 BDB::db_env_txn_checkpoint $DB_ENV; 3909 BDB::db_env_txn_checkpoint $DB_ENV;
3671 warn "emergency_perl_save: end database checkpoint\n"; 3910 info "emergency_perl_save: end database checkpoint\n";
3672 3911
3673 warn "emergency_perl_save: begin write uuid\n"; 3912 info "emergency_perl_save: begin write uuid\n";
3674 write_uuid_sync 1; 3913 write_uuid_sync 1;
3675 warn "emergency_perl_save: end write uuid\n"; 3914 info "emergency_perl_save: end write uuid\n";
3915
3916 cf::write_runtime_sync; # external watchdog should not bark
3917
3918 trace "emergency_perl_save: syncing database to disk";
3919 BDB::db_env_txn_checkpoint $DB_ENV;
3920
3921 info "emergency_perl_save: starting sync\n";
3922 IO::AIO::aio_sync sub {
3923 info "emergency_perl_save: finished sync\n";
3924 };
3925
3926 cf::write_runtime_sync; # external watchdog should not bark
3927
3928 trace "emergency_perl_save: flushing outstanding aio requests";
3929 while (IO::AIO::nreqs || BDB::nreqs) {
3930 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3931 }
3932
3933 cf::write_runtime_sync; # external watchdog should not bark
3676 }; 3934 };
3677 3935
3678 warn "emergency_perl_save: starting sync()\n";
3679 IO::AIO::aio_sync sub {
3680 warn "emergency_perl_save: finished sync()\n";
3681 };
3682
3683 warn "emergency_perl_save: leave\n"; 3936 info "emergency_perl_save: leave\n";
3684} 3937}
3685 3938
3686sub post_cleanup { 3939sub post_cleanup {
3687 my ($make_core) = @_; 3940 my ($make_core) = @_;
3688 3941
3942 IO::AIO::flush;
3943
3689 warn Carp::longmess "post_cleanup backtrace" 3944 error Carp::longmess "post_cleanup backtrace"
3690 if $make_core; 3945 if $make_core;
3691 3946
3692 my $fh = pidfile; 3947 my $fh = pidfile;
3693 unlink $PIDFILE if <$fh> == $$; 3948 unlink $PIDFILE if <$fh> == $$;
3694} 3949}
3714 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3969 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3715 for my $name (keys %$leaf_symtab) { 3970 for my $name (keys %$leaf_symtab) {
3716 _gv_clear *{"$pkg$name"}; 3971 _gv_clear *{"$pkg$name"};
3717# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3972# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3718 } 3973 }
3719 warn "cleared package $pkg\n";#d#
3720} 3974}
3721 3975
3722sub do_reload_perl() { 3976sub do_reload_perl() {
3723 # can/must only be called in main 3977 # can/must only be called in main
3724 if ($Coro::current != $Coro::main) { 3978 unless (in_main) {
3725 warn "can only reload from main coroutine"; 3979 error "can only reload from main coroutine";
3726 return; 3980 return;
3727 } 3981 }
3728 3982
3729 return if $RELOAD++; 3983 return if $RELOAD++;
3730 3984
3731 my $t1 = EV::time; 3985 my $t1 = AE::time;
3732 3986
3733 while ($RELOAD) { 3987 while ($RELOAD) {
3734 warn "reloading..."; 3988 cf::get_slot 0.1, -1, "reload_perl";
3989 info "perl_reload: reloading...";
3735 3990
3736 warn "entering sync_job"; 3991 trace "perl_reload: entering sync_job";
3737 3992
3738 cf::sync_job { 3993 cf::sync_job {
3739 cf::write_runtime_sync; # external watchdog should not bark
3740 cf::emergency_save; 3994 #cf::emergency_save;
3741 cf::write_runtime_sync; # external watchdog should not bark
3742 3995
3743 warn "syncing database to disk";
3744 BDB::db_env_txn_checkpoint $DB_ENV;
3745
3746 # if anything goes wrong in here, we should simply crash as we already saved
3747
3748 warn "flushing outstanding aio requests";
3749 while (IO::AIO::nreqs || BDB::nreqs) {
3750 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3751 }
3752
3753 warn "cancelling all extension coros"; 3996 trace "perl_reload: cancelling all extension coros";
3754 $_->cancel for values %EXT_CORO; 3997 $_->cancel for values %EXT_CORO;
3755 %EXT_CORO = (); 3998 %EXT_CORO = ();
3756 3999
3757 warn "removing commands"; 4000 trace "perl_reload: removing commands";
3758 %COMMAND = (); 4001 %COMMAND = ();
3759 4002
3760 warn "removing ext/exti commands"; 4003 trace "perl_reload: removing ext/exti commands";
3761 %EXTCMD = (); 4004 %EXTCMD = ();
3762 %EXTICMD = (); 4005 %EXTICMD = ();
3763 4006
3764 warn "unloading/nuking all extensions"; 4007 trace "perl_reload: unloading/nuking all extensions";
3765 for my $pkg (@EXTS) { 4008 for my $pkg (@EXTS) {
3766 warn "... unloading $pkg"; 4009 trace "... unloading $pkg";
3767 4010
3768 if (my $cb = $pkg->can ("unload")) { 4011 if (my $cb = $pkg->can ("unload")) {
3769 eval { 4012 eval {
3770 $cb->($pkg); 4013 $cb->($pkg);
3771 1 4014 1
3772 } or warn "$pkg unloaded, but with errors: $@"; 4015 } or error "$pkg unloaded, but with errors: $@";
3773 } 4016 }
3774 4017
3775 warn "... clearing $pkg"; 4018 trace "... clearing $pkg";
3776 clear_package $pkg; 4019 clear_package $pkg;
3777 } 4020 }
3778 4021
3779 warn "unloading all perl modules loaded from $LIBDIR"; 4022 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3780 while (my ($k, $v) = each %INC) { 4023 while (my ($k, $v) = each %INC) {
3781 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4024 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3782 4025
3783 warn "... unloading $k"; 4026 trace "... unloading $k";
3784 delete $INC{$k}; 4027 delete $INC{$k};
3785 4028
3786 $k =~ s/\.pm$//; 4029 $k =~ s/\.pm$//;
3787 $k =~ s/\//::/g; 4030 $k =~ s/\//::/g;
3788 4031
3791 } 4034 }
3792 4035
3793 clear_package $k; 4036 clear_package $k;
3794 } 4037 }
3795 4038
3796 warn "getting rid of safe::, as good as possible"; 4039 trace "perl_reload: getting rid of safe::, as good as possible";
3797 clear_package "safe::$_" 4040 clear_package "safe::$_"
3798 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4041 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3799 4042
3800 warn "unloading cf.pm \"a bit\""; 4043 trace "perl_reload: unloading cf.pm \"a bit\"";
3801 delete $INC{"cf.pm"}; 4044 delete $INC{"cf.pm"};
3802 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4045 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3803 4046
3804 # don't, removes xs symbols, too, 4047 # don't, removes xs symbols, too,
3805 # and global variables created in xs 4048 # and global variables created in xs
3806 #clear_package __PACKAGE__; 4049 #clear_package __PACKAGE__;
3807 4050
3808 warn "unload completed, starting to reload now"; 4051 info "perl_reload: unload completed, starting to reload now";
3809 4052
3810 warn "reloading cf.pm"; 4053 trace "perl_reload: reloading cf.pm";
3811 require cf; 4054 require cf;
3812 cf::_connect_to_perl_1; 4055 cf::_connect_to_perl_1;
3813 4056
3814 warn "loading config and database again"; 4057 trace "perl_reload: loading config and database again";
3815 cf::reload_config; 4058 cf::reload_config;
3816 4059
3817 warn "loading extensions"; 4060 trace "perl_reload: loading extensions";
3818 cf::load_extensions; 4061 cf::load_extensions;
3819 4062
3820 if ($REATTACH_ON_RELOAD) { 4063 if ($REATTACH_ON_RELOAD) {
3821 warn "reattaching attachments to objects/players"; 4064 trace "perl_reload: reattaching attachments to objects/players";
3822 _global_reattach; # objects, sockets 4065 _global_reattach; # objects, sockets
3823 warn "reattaching attachments to maps"; 4066 trace "perl_reload: reattaching attachments to maps";
3824 reattach $_ for values %MAP; 4067 reattach $_ for values %MAP;
3825 warn "reattaching attachments to players"; 4068 trace "perl_reload: reattaching attachments to players";
3826 reattach $_ for values %PLAYER; 4069 reattach $_ for values %PLAYER;
3827 } 4070 }
3828 4071
3829 warn "running post_init jobs"; 4072 cf::_post_init 1;
3830 (pop @POST_INIT)->(1) while @POST_INIT;
3831 4073
3832 warn "leaving sync_job"; 4074 trace "perl_reload: leaving sync_job";
3833 4075
3834 1 4076 1
3835 } or do { 4077 } or do {
3836 warn $@; 4078 error $@;
3837 cf::cleanup "error while reloading, exiting."; 4079 cf::cleanup "perl_reload: error, exiting.";
3838 }; 4080 };
3839 4081
3840 warn "reloaded";
3841 --$RELOAD; 4082 --$RELOAD;
3842 } 4083 }
3843 4084
3844 $t1 = EV::time - $t1; 4085 $t1 = AE::time - $t1;
3845 warn "reload completed in ${t1}s\n"; 4086 info "perl_reload: completed in ${t1}s\n";
3846}; 4087};
3847 4088
3848our $RELOAD_WATCHER; # used only during reload 4089our $RELOAD_WATCHER; # used only during reload
3849 4090
3850sub reload_perl() { 4091sub reload_perl() {
3852 # coro crashes during coro_state_free->destroy here. 4093 # coro crashes during coro_state_free->destroy here.
3853 4094
3854 $RELOAD_WATCHER ||= cf::async { 4095 $RELOAD_WATCHER ||= cf::async {
3855 Coro::AIO::aio_wait cache_extensions; 4096 Coro::AIO::aio_wait cache_extensions;
3856 4097
3857 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4098 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3858 do_reload_perl; 4099 do_reload_perl;
3859 undef $RELOAD_WATCHER; 4100 undef $RELOAD_WATCHER;
3860 }; 4101 };
3861 }; 4102 };
3862} 4103}
3871 reload_perl; 4112 reload_perl;
3872 }; 4113 };
3873 } 4114 }
3874}; 4115};
3875 4116
3876unshift @INC, $LIBDIR; 4117#############################################################################
3877 4118
3878my $bug_warning = 0; 4119my $bug_warning = 0;
3879 4120
3880our @WAIT_FOR_TICK;
3881our @WAIT_FOR_TICK_BEGIN;
3882
3883sub wait_for_tick { 4121sub wait_for_tick() {
3884 return if tick_inhibit || $Coro::current == $Coro::main; 4122 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3885 4123
3886 my $signal = new Coro::Signal; 4124 $WAIT_FOR_TICK->wait;
3887 push @WAIT_FOR_TICK, $signal;
3888 $signal->wait;
3889} 4125}
3890 4126
3891sub wait_for_tick_begin { 4127sub wait_for_tick_begin() {
3892 return if tick_inhibit || $Coro::current == $Coro::main; 4128 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3893 4129
3894 my $signal = new Coro::Signal; 4130 my $signal = new Coro::Signal;
3895 push @WAIT_FOR_TICK_BEGIN, $signal; 4131 push @WAIT_FOR_TICK_BEGIN, $signal;
3896 $signal->wait; 4132 $signal->wait;
3897} 4133}
3901 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4137 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3902 unless ++$bug_warning > 10; 4138 unless ++$bug_warning > 10;
3903 return; 4139 return;
3904 } 4140 }
3905 4141
3906 cf::server_tick; # one server iteration 4142 cf::one_tick; # one server iteration
4143
4144 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3907 4145
3908 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4146 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3909 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4147 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3910 Coro::async_pool { 4148 Coro::async_pool {
3911 $Coro::current->{desc} = "runtime saver"; 4149 $Coro::current->{desc} = "runtime saver";
3912 write_runtime_sync 4150 write_runtime_sync
3913 or warn "ERROR: unable to write runtime file: $!"; 4151 or error "ERROR: unable to write runtime file: $!";
3914 }; 4152 };
3915 } 4153 }
3916 4154
3917 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4155 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3918 $sig->send; 4156 $sig->send;
3919 } 4157 }
3920 while (my $sig = shift @WAIT_FOR_TICK) { 4158 $WAIT_FOR_TICK->broadcast;
3921 $sig->send;
3922 }
3923 4159
3924 $LOAD = ($NOW - $TICK_START) / $TICK; 4160 $LOAD = ($NOW - $TICK_START) / $TICK;
3925 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4161 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3926 4162
3927 if (0) { 4163 if (0) {
3928 if ($NEXT_TICK) { 4164 if ($NEXT_TICK) {
3929 my $jitter = $TICK_START - $NEXT_TICK; 4165 my $jitter = $TICK_START - $NEXT_TICK;
3930 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4166 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3931 warn "jitter $JITTER\n";#d# 4167 debug "jitter $JITTER\n";#d#
3932 } 4168 }
3933 } 4169 }
3934} 4170}
3935 4171
3936{ 4172{
3937 # configure BDB 4173 # configure BDB
3938 4174
3939 BDB::min_parallel 8; 4175 BDB::min_parallel 16;
3940 BDB::max_poll_reqs $TICK * 0.1; 4176 BDB::max_poll_reqs $TICK * 0.1;
3941 $AnyEvent::BDB::WATCHER->priority (1); 4177 #$AnyEvent::BDB::WATCHER->priority (1);
3942 4178
3943 unless ($DB_ENV) { 4179 unless ($DB_ENV) {
3944 $DB_ENV = BDB::db_env_create; 4180 $DB_ENV = BDB::db_env_create;
3945 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4181 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3946 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4182 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3981 IO::AIO::min_parallel 8; 4217 IO::AIO::min_parallel 8;
3982 IO::AIO::max_poll_time $TICK * 0.1; 4218 IO::AIO::max_poll_time $TICK * 0.1;
3983 undef $AnyEvent::AIO::WATCHER; 4219 undef $AnyEvent::AIO::WATCHER;
3984} 4220}
3985 4221
3986my $_log_backtrace; 4222our $_log_backtrace;
4223our $_log_backtrace_last;
3987 4224
3988sub _log_backtrace { 4225sub _log_backtrace {
3989 my ($msg, @addr) = @_; 4226 my ($msg, @addr) = @_;
3990 4227
3991 $msg =~ s/\n//; 4228 $msg =~ s/\n$//;
3992 4229
4230 if ($_log_backtrace_last eq $msg) {
4231 LOG llevInfo, "[ABT] $msg\n";
4232 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3993 # limit the # of concurrent backtraces 4233 # limit the # of concurrent backtraces
3994 if ($_log_backtrace < 2) { 4234 } elsif ($_log_backtrace < 2) {
4235 $_log_backtrace_last = $msg;
3995 ++$_log_backtrace; 4236 ++$_log_backtrace;
3996 my $perl_bt = Carp::longmess $msg; 4237 my $perl_bt = Carp::longmess $msg;
3997 async { 4238 async {
3998 $Coro::current->{desc} = "abt $msg"; 4239 $Coro::current->{desc} = "abt $msg";
3999 4240
4019 LOG llevInfo, "[ABT] $_\n" for @bt; 4260 LOG llevInfo, "[ABT] $_\n" for @bt;
4020 --$_log_backtrace; 4261 --$_log_backtrace;
4021 }; 4262 };
4022 } else { 4263 } else {
4023 LOG llevInfo, "[ABT] $msg\n"; 4264 LOG llevInfo, "[ABT] $msg\n";
4024 LOG llevInfo, "[ABT] [suppressed]\n"; 4265 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4025 } 4266 }
4026} 4267}
4027 4268
4028# load additional modules 4269# load additional modules
4029require "cf/$_.pm" for @EXTRA_MODULES; 4270require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines