ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.476 by root, Wed Sep 2 16:54:20 2009 UTC vs.
Revision 1.560 by root, Fri Apr 22 02:03:12 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines