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.483 by root, Mon Oct 12 04:02:17 2009 UTC vs.
Revision 1.565 by root, Sat Apr 30 05:41:17 2011 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict qw(vars subs);
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard (); 37use Guard ();
38use Coro (); 38use Coro ();
39use Coro::State; 39use Coro::State;
40use Coro::Handle; 40use Coro::Handle;
51use Coro::Util (); 51use Coro::Util ();
52 52
53use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
54use BDB (); 54use BDB ();
55use Data::Dumper; 55use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 56use Fcntl;
58use YAML (); 57use YAML::XS ();
59use IO::AIO (); 58use IO::AIO ();
60use Time::HiRes; 59use Time::HiRes;
61use Compress::LZF; 60use Compress::LZF;
62use Digest::MD5 (); 61use Digest::MD5 ();
63 62
76 75
77# strictly for debugging 76# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
79 78
80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
81 82
82our %COMMAND = (); 83our %COMMAND = ();
83our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
84 85
85our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
92our @EVENT; 93our @EVENT;
93our @REFLECT; # set by XS 94our @REFLECT; # set by XS
94our %REFLECT; # set by us 95our %REFLECT; # set by us
95 96
96our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
97our $DATADIR = datadir; 99our $DATADIR = datadir;
98our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
99our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
100our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
101our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
102our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
103our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
104our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
105our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
106our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
107our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
108our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
109 112
110our %RESOURCE; 113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
111 120
112our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
114our $NEXT_TICK; 123our $NEXT_TICK;
115our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
117our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
118our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
119our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
120our $DB_ENV; 129our $DB_ENV;
121 130
122our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
123 132
124our %CFG; 133our %CFG;
125 134
126our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
127our $RUNTIME; 136our $RUNTIME;
161 170
162our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
163 172
164sub cf::map::normalise; 173sub cf::map::normalise;
165 174
175sub in_main() {
176 $Coro::current == $Coro::main
177}
178
166############################################################################# 179#############################################################################
167 180
168%REFLECT = (); 181%REFLECT = ();
169for (@REFLECT) { 182for (@REFLECT) {
170 my $reflect = JSON::XS::decode_json $_; 183 my $reflect = JSON::XS::decode_json $_;
222from wherever your confdir points to. 235from wherever your confdir points to.
223 236
224=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
225 238
226These 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
227returns 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
228per 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.
229 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
230=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
231 249
232This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
233C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
234that call. 252that call.
235 253
236=item %cf::REFLECT 254=item %cf::REFLECT
237 255
241 259
242=back 260=back
243 261
244=cut 262=cut
245 263
264sub error(@) { LOG llevError, join "", @_ }
265sub warn (@) { LOG llevWarn , join "", @_ }
266sub info (@) { LOG llevInfo , join "", @_ }
267sub debug(@) { LOG llevDebug, join "", @_ }
268sub trace(@) { LOG llevTrace, join "", @_ }
269
246$Coro::State::WARNHOOK = sub { 270$Coro::State::WARNHOOK = sub {
247 my $msg = join "", @_; 271 my $msg = join "", @_;
248 272
249 $msg .= "\n" 273 $msg .= "\n"
250 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
251 275
252 $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;
253 277
254 LOG llevError, $msg; 278 LOG llevWarn, $msg;
255}; 279};
256 280
257$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
258 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
259 283
260 warn Carp::longmess $_[0]; 284 error Carp::longmess $_[0];
261 285
262 if ($Coro::current == $Coro::main) {#d# 286 if (in_main) {#d#
263 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
264 return;#d# 288 return;#d#
265 }#d# 289 }#d#
266 290
267 # kill coroutine otherwise 291 # kill coroutine otherwise
268 Coro::terminate 292 Coro::terminate
288)) { 312)) {
289 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
290} 314}
291 315
292$EV::DIED = sub { 316$EV::DIED = sub {
293 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
294}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
295 324
296############################################################################# 325#############################################################################
297 326
298=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
299 328
320 $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;
321 $d 350 $d
322 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
323} 352}
324 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
325=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
326 369
327Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
328 371
329=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
335our $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
336 379
337sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
338sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
339 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
340=item cf::post_init { BLOCK } 414=item cf::post_init { BLOCK }
341 415
342Execute the given codeblock, I<after> all extensions have been (re-)loaded, 416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
343but I<before> the server starts ticking again. 417but I<before> the server starts ticking again.
344 418
345The cdoeblock will have a single boolean argument to indicate whether this 419The codeblock will have a single boolean argument to indicate whether this
346is a reload or not. 420is a reload or not.
347 421
348=cut 422=cut
349 423
350sub post_init(&) { 424sub post_init(&) {
351 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 }
352} 443}
353 444
354=item cf::lock_wait $string 445=item cf::lock_wait $string
355 446
356Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
395} 486}
396 487
397=item cf::periodic $interval, $cb 488=item cf::periodic $interval, $cb
398 489
399Like 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
400get spread over timer. 491get spread over time.
401 492
402=cut 493=cut
403 494
404sub periodic($$) { 495sub periodic($$) {
405 my ($interval, $cb) = @_; 496 my ($interval, $cb) = @_;
409 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
410} 501}
411 502
412=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
413 504
414Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
415This 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
416of 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.
417 512
418The 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
419used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
420 515
421Useful for short background jobs. 516Useful for short background jobs.
422 517
423=cut 518=cut
424 519
425our @SLOT_QUEUE; 520our @SLOT_QUEUE;
426our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
427 523
428$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
429$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
430 $Coro::current->desc ("timeslot manager"); 526 $Coro::current->desc ("timeslot manager");
431 527
432 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
433 530
434 while () { 531 while () {
435 next_job: 532 next_job:
533
436 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
437 if ($avail > 0.01) { 535
438 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
439 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
440 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
441 $job->[2]->send; 540 $job->[2]->send;
442 Coro::cede; 541 Coro::cede;
443 goto next_job; 542 goto next_job;
444 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
445 } 545 }
446 } 546 }
447 547
448 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
449 # 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
450 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
451 $signal->wait; 551 $signal->wait;
452 } else { 552 } else {
553 $busy = 0;
453 Coro::schedule; 554 Coro::schedule;
454 } 555 }
455 } 556 }
456}; 557};
457 558
458sub get_slot($;$$) { 559sub get_slot($;$$) {
459 return if tick_inhibit || $Coro::current == $Coro::main; 560 return if tick_inhibit || $Coro::current == $Coro::main;
460 561
461 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
462 563
463 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
464 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
465 567
466 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
467 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
468 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
494=cut 596=cut
495 597
496sub sync_job(&) { 598sub sync_job(&) {
497 my ($job) = @_; 599 my ($job) = @_;
498 600
499 if ($Coro::current == $Coro::main) { 601 if (in_main) {
500 my $time = EV::time; 602 my $time = AE::time;
501 603
502 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
503 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
504 606
505 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
506 608
507 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
508 610
509 my $busy = 1; 611 my $busy = 1;
510 my @res; 612 my @res;
511 613
512 (async { 614 (async {
513 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
514 @res = eval { $job->() }; 616 @res = eval { $job->() };
515 warn $@ if $@; 617 error $@ if $@;
516 undef $busy; 618 undef $busy;
517 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
518 620
519 while ($busy) { 621 while ($busy) {
520 if (Coro::nready) { 622 if (Coro::nready) {
522 } else { 624 } else {
523 EV::loop EV::LOOP_ONESHOT; 625 EV::loop EV::LOOP_ONESHOT;
524 } 626 }
525 } 627 }
526 628
527 my $time = EV::time - $time; 629 my $time = AE::time - $time;
528 630
529 $TICK_START += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
530 632
531 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
532 } else { 634 } else {
554 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
555 657
556 $coro 658 $coro
557} 659}
558 660
559=item fork_call { }, $args 661=item fork_call { }, @args
560 662
561Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
562process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
563Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
564never block itself or use any form of event handling. 666never block itself or use any form of event handling.
565 667
566=cut 668=cut
567 669
670sub post_fork {
671 reset_signals;
672}
673
568sub fork_call(&@) { 674sub fork_call(&@) {
569 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
570 676
571 # 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,
572 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
573 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
574 680
575 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
576 reset_signals; 682 cf::post_fork;
577 &$cb 683 &$cb
578 }, @args; 684 } @args;
579 685
580 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 )
581} 698}
582 699
583=item $coin = coin_from_name $name 700=item $coin = coin_from_name $name
584 701
585=cut 702=cut
622within each server. 739within each server.
623 740
624=cut 741=cut
625 742
626sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
627 my ($name) = @_; 747 my ($name) = @_;
628 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
629 749
630 eval { 750 eval {
631 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
641} 761}
642 762
643our $DB; 763our $DB;
644 764
645sub db_init { 765sub db_init {
646 cf::sync_job {
647 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
648 };
649} 767}
650 768
651sub db_get($$) { 769sub db_get($$) {
652 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
653 771
654 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
655 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
656 776
657 $! ? () 777 $! ? ()
658 : $data 778 : $data
659 }
660} 779}
661 780
662sub db_put($$$) { 781sub db_put($$$) {
663 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
664 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
692 811
693 my @data; 812 my @data;
694 my $md5; 813 my $md5;
695 814
696 for (0 .. $#$src) { 815 for (0 .. $#$src) {
697 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
698 or Carp::croak "$src->[$_]: $!";
699 } 817 }
700 818
701 # if processing is expensive, check 819 # if processing is expensive, check
702 # checksum first 820 # checksum first
703 if (1) { 821 if (1) {
720 838
721 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
722 my $data = $process->(\@data); 840 my $data = $process->(\@data);
723 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
724 842
725 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
726 844
727 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
728 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
729 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
730 848
740 858
741=cut 859=cut
742 860
743sub datalog($@) { 861sub datalog($@) {
744 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
745 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
746} 864}
747 865
748=back 866=back
749 867
750=cut 868=cut
945 1063
946 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
947 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
948 1066
949 } elsif (ref $type) { 1067 } elsif (ref $type) {
950 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
951 1069
952 } else { 1070 } else {
953 shift @arg; 1071 shift @arg;
954 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
955 } 1073 }
956 } 1074 }
957} 1075}
958 1076
959sub _object_attach { 1077sub _object_attach {
969 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
970 } 1088 }
971 1089
972 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
973 } else { 1091 } else {
974 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
975 } 1093 }
976 1094
977 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
978} 1096}
979 1097
1038 1156
1039 for (@$callbacks) { 1157 for (@$callbacks) {
1040 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1041 1159
1042 if ($@) { 1160 if ($@) {
1043 warn "$@";
1044 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1045 override; 1162 override;
1046 } 1163 }
1047 1164
1048 return 1 if $override; 1165 return 1 if $override;
1049 } 1166 }
1128 for (@$attach) { 1245 for (@$attach) {
1129 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1130 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1131 } 1248 }
1132 } else { 1249 } else {
1133 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1134 } 1251 }
1135 } 1252 }
1136} 1253}
1137 1254
1138cf::attachable->attach ( 1255cf::attachable->attach (
1165 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1166 1283
1167 sync_job { 1284 sync_job {
1168 if (length $$rdata) { 1285 if (length $$rdata) {
1169 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1170 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1171 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1172 1290
1173 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1174 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1175 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1176 if ($cf::USE_FSYNC) { 1294 if ($cf::USE_FSYNC) {
1198 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1199 1317
1200 $filename =~ s%/[^/]+$%%; 1318 $filename =~ s%/[^/]+$%%;
1201 aio_pathsync $filename if $cf::USE_FSYNC; 1319 aio_pathsync $filename if $cf::USE_FSYNC;
1202 } else { 1320 } else {
1203 warn "unable to save objects: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1204 } 1322 }
1205 } else { 1323 } else {
1206 aio_unlink $filename; 1324 aio_unlink $filename;
1207 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1208 } 1326 }
1232 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1233 $av = $st->{objs}; 1351 $av = $st->{objs};
1234 } 1352 }
1235 1353
1236 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1237 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1238 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1239 1358
1240 ($data, $av) 1359 ($data, $av)
1241} 1360}
1242 1361
1243=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1302} 1421}
1303 1422
1304use File::Glob (); 1423use File::Glob ();
1305 1424
1306cf::player->attach ( 1425cf::player->attach (
1307 on_command => sub { 1426 on_unknown_command => sub {
1308 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1309 1428
1310 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1311 or return; 1430 or return;
1312 1431
1335 1454
1336 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1337 if $reply; 1456 if $reply;
1338 1457
1339 } else { 1458 } else {
1340 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1341 } 1460 }
1342 1461
1343 cf::override; 1462 cf::override;
1344 }, 1463 },
1345); 1464);
1356 1475
1357 $grp 1476 $grp
1358} 1477}
1359 1478
1360sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1361 cf::sync_job { 1482 cf::sync_job {
1362 my %todo; 1483 my %todo;
1363 1484
1364 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1365 next unless -r $path; 1486 next unless -r $path;
1383 1504
1384 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1385 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1386 1507
1387 $ext{source} = 1508 $ext{source} =
1388 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1389 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1390 . $source 1511 . $source
1391 . "\n};\n1"; 1512 . "\n};\n1";
1392 1513
1393 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1394 } 1515 }
1395 1516
1517 my $pass = 0;
1396 my %done; 1518 my %done;
1397 while (%todo) { 1519 while (%todo) {
1398 my $progress; 1520 my $progress;
1399 1521
1522 ++$pass;
1523
1524 ext:
1400 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1401 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1402 goto skip 1527 next ext
1403 unless exists $done{$_}; 1528 unless exists $done{$_};
1404 } 1529 }
1405 1530
1406 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1407 1532
1408 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1409 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1410 : "$v->{base}: extension inactive.\n";
1411 1537
1412 if (exists $v->{meta}{mandatory}) {
1413 warn $msg;
1414 cf::cleanup "mandatory extension failed to load, exiting."; 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1415 } 1539 if exists $v->{meta}{mandatory};
1416 1540
1417 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;
1418 } 1550 }
1419
1420 $done{$k} = delete $todo{$k};
1421 push @EXTS, $v->{pkg};
1422 $progress = 1;
1423 } 1551 }
1424 1552
1425 skip: 1553 unless ($progress) {
1426 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1427 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
1561 last;
1562 }
1428 } 1563 }
1429 }; 1564 };
1430} 1565}
1431 1566
1432############################################################################# 1567#############################################################################
1516 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1517 } 1652 }
1518 } 1653 }
1519} 1654}
1520 1655
1656cf::player->attach (
1657 on_load => sub {
1658 my ($pl, $path) = @_;
1659
1660 # restore slots saved in save, below
1661 my $slots = delete $pl->{_slots};
1662
1663 $pl->ob->current_weapon ($slots->[0]);
1664 $pl->combat_ob ($slots->[1]);
1665 $pl->ranged_ob ($slots->[2]);
1666 },
1667);
1668
1521sub save($) { 1669sub save($) {
1522 my ($pl) = @_; 1670 my ($pl) = @_;
1523 1671
1524 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1525 1673
1530 1678
1531 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1532 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1533 1681
1534 cf::get_slot 0.01; 1682 cf::get_slot 0.01;
1683
1684 # save slots, to be restored later
1685 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1535 1686
1536 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1537 cf::cede_to_tick; 1688 cf::cede_to_tick;
1538} 1689}
1539 1690
1573 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1574 1725
1575 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1576 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1727 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1577 1728
1578 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1579 $pl->deactivate; 1730 $pl->deactivate;
1731
1580 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1581 $pl->ob->check_score;
1582 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1583 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1584 1737
1585 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1586 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1587 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1641 \@logins 1794 \@logins
1642} 1795}
1643 1796
1644=item $player->maps 1797=item $player->maps
1645 1798
1799=item cf::player::maps $login
1800
1646Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1647player. May block. 1802player. May block.
1648 1803
1649=cut 1804=cut
1650 1805
1712=cut 1867=cut
1713 1868
1714sub find_by_path($) { 1869sub find_by_path($) {
1715 my ($path) = @_; 1870 my ($path) = @_;
1716 1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1873
1717 my ($match, $specificity); 1874 my ($match, $specificity);
1718 1875
1719 for my $region (list) { 1876 for my $region (list) {
1720 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1721 ($match, $specificity) = ($region, $region->specificity) 1878 ($match, $specificity) = ($region, $region->specificity)
1749sub generate_random_map { 1906sub generate_random_map {
1750 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1751 1908
1752 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1753 1910
1754 # mit "rum" bekleckern, nicht
1755 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1756 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1757 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1758 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1759 $rmp->{exit_on_final_map},
1760 $rmp->{xsize}, $rmp->{ysize},
1761 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1762 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1763 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1764 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1765 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1766 (cf::region::find $rmp->{region}), $rmp->{custom}
1767 )
1768} 1912}
1769 1913
1770=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1771 1915
1772Register a handler for the map path matching the given regex at the 1916Register a handler for the map path matching the given regex at the
1777 1921
1778sub register { 1922sub register {
1779 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1780 my $pkg = caller; 1924 my $pkg = caller;
1781 1925
1782 no strict;
1783 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1784 1927
1785 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1786} 1929}
1787 1930
1788# also paths starting with '/' 1931# also paths starting with '/'
1789$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1790 1933
1791sub thawer_merge { 1934sub thawer_merge {
1792 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1793 1936
1794 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1799} 1942}
1800 1943
1801sub normalise { 1944sub normalise {
1802 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1803 1946
1804 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1805 1948
1806 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1807 1950
1808 # map plan: 1951 # map plan:
1809 # 1952 #
1811 # {... are special paths that are not being touched 1954 # {... are special paths that are not being touched
1812 # ?xxx/... are special absolute paths 1955 # ?xxx/... are special absolute paths
1813 # ?random/... random maps 1956 # ?random/... random maps
1814 # /... normal maps 1957 # /... normal maps
1815 # ~user/... per-player map of a specific user 1958 # ~user/... per-player map of a specific user
1959 # !up !down for quad maps, or other maps with up/down layers
1816 1960
1817 $path =~ s/$PATH_SEP/\//go; 1961 $path =~ s/$PATH_SEP/\//go;
1818 1962
1819 # treat it as relative path if it starts with 1963 # treat it as relative path if it starts with
1820 # something that looks reasonable 1964 # something that looks reasonable
1821 if ($path =~ m{^(?:\./|\.\./|\w)}) { 1965 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1822 $base or Carp::carp "normalise called with relative path and no base: '$path'"; 1966 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1823 1967
1824 $base =~ s{[^/]+/?$}{}; 1968 $base =~ s{[^/]+/?$}{};
1825 $path = "$base/$path"; 1969 $path = "$base/$path";
1970
1971 } elsif ($path eq '!up') {
1972 $base && ref $base
1973 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1974
1975 my $uppth = $base->tile_path (cf::TILE_UP);
1976 $path = $uppth if $uppth;
1977
1978 } elsif ($path eq '!down') {
1979 $base && ref $base
1980 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1981
1982 my $dpth = $base->tile_path (cf::TILE_DOWN);
1983 $path = $dpth if $dpth;
1826 } 1984 }
1827 1985
1828 for ($path) { 1986 for ($path) {
1829 redo if s{//}{/};
1830 redo if s{/\.?/}{/}; 1987 redo if s{/\.?/}{/};
1831 redo if s{/[^/]+/\.\./}{/}; 1988 redo if s{/[^/]+/\.\./}{/};
1832 } 1989 }
1833 1990
1834 $path 1991 $path
1848 $self->init; # pass $1 etc. 2005 $self->init; # pass $1 etc.
1849 return $self; 2006 return $self;
1850 } 2007 }
1851 } 2008 }
1852 2009
1853 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2010 Carp::cluck "unable to resolve path '$path' (base '$base')";
1854 () 2011 ()
1855} 2012}
1856 2013
2014# may re-bless or do other evil things
1857sub init { 2015sub init {
1858 my ($self) = @_; 2016 my ($self) = @_;
1859 2017
1860 $self 2018 $self
1861} 2019}
1981 2139
1982sub find; 2140sub find;
1983sub find { 2141sub find {
1984 my ($path, $origin) = @_; 2142 my ($path, $origin) = @_;
1985 2143
2144 cf::cede_to_tick;
2145
1986 $path = normalise $path, $origin && $origin->path; 2146 $path = normalise $path, $origin;
1987 2147
1988 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2148 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1989 my $guard2 = cf::lock_acquire "map_find:$path"; 2149 my $guard2 = cf::lock_acquire "map_find:$path";
1990 2150
1991 $cf::MAP{$path} || do { 2151 $cf::MAP{$path} || do {
2008 2168
2009 $cf::MAP{$path} = $map 2169 $cf::MAP{$path} = $map
2010 } 2170 }
2011} 2171}
2012 2172
2013sub pre_load { } 2173sub pre_load { }
2014sub post_load { } 2174#sub post_load { } # XS
2015 2175
2016sub load { 2176sub load {
2017 my ($self) = @_; 2177 my ($self) = @_;
2018 2178
2019 local $self->{deny_reset} = 1; # loading can take a long time 2179 local $self->{deny_reset} = 1; # loading can take a long time
2031 $self->alloc; 2191 $self->alloc;
2032 2192
2033 $self->pre_load; 2193 $self->pre_load;
2034 cf::cede_to_tick; 2194 cf::cede_to_tick;
2035 2195
2196 if (exists $self->{load_path}) {
2036 my $f = new_from_file cf::object::thawer $self->{load_path}; 2197 my $f = new_from_file cf::object::thawer $self->{load_path};
2037 $f->skip_block; 2198 $f->skip_block;
2038 $self->_load_objects ($f) 2199 $self->_load_objects ($f)
2039 or return; 2200 or return;
2040 2201
2041 $self->post_load_original 2202 $self->post_load_original
2042 if delete $self->{load_original}; 2203 if delete $self->{load_original};
2043 2204
2044 if (my $uniq = $self->uniq_path) { 2205 if (my $uniq = $self->uniq_path) {
2045 utf8::encode $uniq; 2206 utf8::encode $uniq;
2046 unless (aio_stat $uniq) { 2207 unless (aio_stat $uniq) {
2047 if (my $f = new_from_file cf::object::thawer $uniq) { 2208 if (my $f = new_from_file cf::object::thawer $uniq) {
2048 $self->clear_unique_items; 2209 $self->clear_unique_items;
2049 $self->_load_objects ($f); 2210 $self->_load_objects ($f);
2050 $f->resolve_delayed_derefs; 2211 $f->resolve_delayed_derefs;
2212 }
2051 } 2213 }
2052 } 2214 }
2053 }
2054 2215
2055 $f->resolve_delayed_derefs; 2216 $f->resolve_delayed_derefs;
2217 }
2056 2218
2057 cf::cede_to_tick; 2219 cf::cede_to_tick;
2058 # now do the right thing for maps 2220 # now do the right thing for maps
2059 $self->link_multipart_objects; 2221 $self->link_multipart_objects;
2060 $self->difficulty ($self->estimate_difficulty) 2222 $self->difficulty ($self->estimate_difficulty)
2074 2236
2075 $self->in_memory (cf::MAP_ACTIVE); 2237 $self->in_memory (cf::MAP_ACTIVE);
2076 } 2238 }
2077 2239
2078 $self->post_load; 2240 $self->post_load;
2079}
2080 2241
2242 1
2243}
2244
2245# customize the map for a given player, i.e.
2246# return the _real_ map. used by e.g. per-player
2247# maps to change the path to ~playername/mappath
2081sub customise_for { 2248sub customise_for {
2082 my ($self, $ob) = @_; 2249 my ($self, $ob) = @_;
2083 2250
2084 return find "~" . $ob->name . "/" . $self->{path} 2251 return find "~" . $ob->name . "/" . $self->{path}
2085 if $self->per_player; 2252 if $self->per_player;
2101 or next; 2268 or next;
2102 $neigh = find $neigh, $map 2269 $neigh = find $neigh, $map
2103 or next; 2270 or next;
2104 $neigh->load; 2271 $neigh->load;
2105 2272
2273 # now find the diagonal neighbours
2106 push @neigh, 2274 push @neigh,
2107 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2275 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2108 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2276 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2109 } 2277 }
2110 2278
2117} 2285}
2118 2286
2119sub find_sync { 2287sub find_sync {
2120 my ($path, $origin) = @_; 2288 my ($path, $origin) = @_;
2121 2289
2122 cf::sync_job { find $path, $origin } 2290 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2291 if $Coro::current == $Coro::main;
2292
2293 find $path, $origin
2123} 2294}
2124 2295
2125sub do_load_sync { 2296sub do_load_sync {
2126 my ($map) = @_; 2297 my ($map) = @_;
2127 2298
2128 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2299 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2129 if $Coro::current == $Coro::main; 2300 if $Coro::current == $Coro::main;
2130 2301
2131 cf::sync_job { $map->load }; 2302 $map->load;
2132} 2303}
2133 2304
2134our %MAP_PREFETCH; 2305our %MAP_PREFETCH;
2135our $MAP_PREFETCHER = undef; 2306our $MAP_PREFETCHER = undef;
2136 2307
2137sub find_async { 2308sub find_async {
2138 my ($path, $origin, $load) = @_; 2309 my ($path, $origin, $load) = @_;
2139 2310
2140 $path = normalise $path, $origin && $origin->{path}; 2311 $path = normalise $path, $origin;
2141 2312
2142 if (my $map = $cf::MAP{$path}) { 2313 if (my $map = $cf::MAP{$path}) {
2143 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2314 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2144 } 2315 }
2145 2316
2162 $MAP_PREFETCHER->prio (6); 2333 $MAP_PREFETCHER->prio (6);
2163 2334
2164 () 2335 ()
2165} 2336}
2166 2337
2338# common code, used by both ->save and ->swapout
2167sub save { 2339sub _save {
2168 my ($self) = @_; 2340 my ($self) = @_;
2169
2170 my $lock = cf::lock_acquire "map_data:$self->{path}";
2171 2341
2172 $self->{last_save} = $cf::RUNTIME; 2342 $self->{last_save} = $cf::RUNTIME;
2173 2343
2174 return unless $self->dirty; 2344 return unless $self->dirty;
2175 2345
2195 } else { 2365 } else {
2196 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2366 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2197 } 2367 }
2198} 2368}
2199 2369
2370sub save {
2371 my ($self) = @_;
2372
2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
2374
2375 $self->_save;
2376}
2377
2200sub swap_out { 2378sub swap_out {
2201 my ($self) = @_; 2379 my ($self) = @_;
2202 2380
2203 # save first because save cedes
2204 $self->save;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2381 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2382
2208 return if $self->players;
2209 return if $self->in_memory != cf::MAP_ACTIVE; 2383 return if $self->in_memory != cf::MAP_ACTIVE;
2210 return if $self->{deny_save}; 2384 return if $self->{deny_save};
2385 return if $self->players;
2211 2386
2387 # first deactivate the map and "unlink" it from the core
2388 $self->deactivate;
2389 $_->clear_links_to ($self) for values %cf::MAP;
2212 $self->in_memory (cf::MAP_SWAPPED); 2390 $self->in_memory (cf::MAP_SWAPPED);
2391
2392 # then atomically save
2393 $self->_save;
2394
2395 # then free the map
2396 $self->clear;
2397}
2398
2399sub reset_at {
2400 my ($self) = @_;
2401
2402 # TODO: safety, remove and allow resettable per-player maps
2403 return 1e99 if $self->{deny_reset};
2404
2405 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2406 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2407
2408 $time + $to
2409}
2410
2411sub should_reset {
2412 my ($self) = @_;
2413
2414 $self->reset_at <= $cf::RUNTIME
2415}
2416
2417sub reset {
2418 my ($self) = @_;
2419
2420 my $lock = cf::lock_acquire "map_data:$self->{path}";
2421
2422 return if $self->players;
2423
2424 cf::trace "resetting map ", $self->path, "\n";
2425
2426 $self->in_memory (cf::MAP_SWAPPED);
2427
2428 # need to save uniques path
2429 unless ($self->{deny_save}) {
2430 my $uniq = $self->uniq_path; utf8::encode $uniq;
2431
2432 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2433 if $uniq;
2434 }
2435
2436 delete $cf::MAP{$self->path};
2213 2437
2214 $self->deactivate; 2438 $self->deactivate;
2215 $_->clear_links_to ($self) for values %cf::MAP; 2439 $_->clear_links_to ($self) for values %cf::MAP;
2216 $self->clear; 2440 $self->clear;
2217}
2218
2219sub reset_at {
2220 my ($self) = @_;
2221
2222 # TODO: safety, remove and allow resettable per-player maps
2223 return 1e99 if $self->{deny_reset};
2224
2225 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2226 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2227
2228 $time + $to
2229}
2230
2231sub should_reset {
2232 my ($self) = @_;
2233
2234 $self->reset_at <= $cf::RUNTIME
2235}
2236
2237sub reset {
2238 my ($self) = @_;
2239
2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
2241
2242 return if $self->players;
2243
2244 warn "resetting map ", $self->path, "\n";
2245
2246 $self->in_memory (cf::MAP_SWAPPED);
2247
2248 # need to save uniques path
2249 unless ($self->{deny_save}) {
2250 my $uniq = $self->uniq_path; utf8::encode $uniq;
2251
2252 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2253 if $uniq;
2254 }
2255
2256 delete $cf::MAP{$self->path};
2257
2258 $self->deactivate;
2259 $_->clear_links_to ($self) for values %cf::MAP;
2260 $self->clear;
2261 2441
2262 $self->unlink_save; 2442 $self->unlink_save;
2263 $self->destroy; 2443 $self->destroy;
2264} 2444}
2265 2445
2273 2453
2274 delete $cf::MAP{$self->path}; 2454 delete $cf::MAP{$self->path};
2275 2455
2276 $self->unlink_save; 2456 $self->unlink_save;
2277 2457
2278 bless $self, "cf::map"; 2458 bless $self, "cf::map::wrap";
2279 delete $self->{deny_reset}; 2459 delete $self->{deny_reset};
2280 $self->{deny_save} = 1; 2460 $self->{deny_save} = 1;
2281 $self->reset_timeout (1); 2461 $self->reset_timeout (1);
2282 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2462 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2283 2463
2340 : normalise $_ 2520 : normalise $_
2341 } @{ aio_readdir $UNIQUEDIR or [] } 2521 } @{ aio_readdir $UNIQUEDIR or [] }
2342 ] 2522 ]
2343} 2523}
2344 2524
2525=item cf::map::static_maps
2526
2527Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2528file in the shared directory excluding F</styles> and F</editor>). May
2529block.
2530
2531=cut
2532
2533sub static_maps() {
2534 my @dirs = "";
2535 my @maps;
2536
2537 while (@dirs) {
2538 my $dir = shift @dirs;
2539
2540 next if $dir eq "/styles" || $dir eq "/editor";
2541
2542 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2543 or return;
2544
2545 for (@$files) {
2546 s/\.map$// or next;
2547 utf8::decode $_;
2548 push @maps, "$dir/$_";
2549 }
2550
2551 push @dirs, map "$dir/$_", @$dirs;
2552 }
2553
2554 \@maps
2555}
2556
2345=back 2557=back
2346 2558
2347=head3 cf::object 2559=head3 cf::object
2348 2560
2349=cut 2561=cut
2481 2693
2482Freezes the player and moves him/her to a special map (C<{link}>). 2694Freezes the player and moves him/her to a special map (C<{link}>).
2483 2695
2484The player should be reasonably safe there for short amounts of time (e.g. 2696The player should be reasonably safe there for short amounts of time (e.g.
2485for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2697for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2486though, as the palyer cannot control the character while it is on the link 2698though, as the player cannot control the character while it is on the link
2487map. 2699map.
2488 2700
2489Will never block. 2701Will never block.
2490 2702
2491=item $player_object->leave_link ($map, $x, $y) 2703=item $player_object->leave_link ($map, $x, $y)
2512sub cf::object::player::enter_link { 2724sub cf::object::player::enter_link {
2513 my ($self) = @_; 2725 my ($self) = @_;
2514 2726
2515 $self->deactivate_recursive; 2727 $self->deactivate_recursive;
2516 2728
2729 ++$self->{_link_recursion};
2730
2517 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2731 return if UNIVERSAL::isa $self->map, "ext::map_link";
2518 2732
2519 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2733 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2520 if $self->map && $self->map->{path} ne "{link}"; 2734 if $self->map && $self->map->{path} ne "{link}";
2521 2735
2522 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2736 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2523} 2737}
2524 2738
2525sub cf::object::player::leave_link { 2739sub cf::object::player::leave_link {
2526 my ($self, $map, $x, $y) = @_; 2740 my ($self, $map, $x, $y) = @_;
2527 2741
2544 ($x, $y) = (-1, -1) 2758 ($x, $y) = (-1, -1)
2545 unless (defined $x) && (defined $y); 2759 unless (defined $x) && (defined $y);
2546 2760
2547 # use -1 or undef as default coordinates, not 0, 0 2761 # use -1 or undef as default coordinates, not 0, 0
2548 ($x, $y) = ($map->enter_x, $map->enter_y) 2762 ($x, $y) = ($map->enter_x, $map->enter_y)
2549 if $x <=0 && $y <= 0; 2763 if $x <= 0 && $y <= 0;
2550 2764
2551 $map->load; 2765 $map->load;
2552 $map->load_neighbours; 2766 $map->load_neighbours;
2553 2767
2554 return unless $self->contr->active; 2768 return unless $self->contr->active;
2555 2769
2556 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2770 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2557 $self->enter_map ($map, $x, $y); 2771 if ($self->enter_map ($map, $x, $y)) {
2558 2772 # entering was successful
2773 delete $self->{_link_recursion};
2559 # only activate afterwards, to support waiting in hooks 2774 # only activate afterwards, to support waiting in hooks
2560 $self->activate_recursive; 2775 $self->activate_recursive;
2561} 2776 }
2562 2777
2778}
2779
2563=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2780=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2564 2781
2565Moves the player to the given map-path and coordinates by first freezing 2782Moves the player to the given map-path and coordinates by first freezing
2566her, loading and preparing them map, calling the provided $check callback 2783her, loading and preparing them map, calling the provided $check callback
2567that has to return the map if sucecssful, and then unfreezes the player on 2784that has to return the map if sucecssful, and then unfreezes the player on
2568the new (success) or old (failed) map position. In either case, $done will 2785the new (success) or old (failed) map position. In either case, $done will
2575 2792
2576our $GOTOGEN; 2793our $GOTOGEN;
2577 2794
2578sub cf::object::player::goto { 2795sub cf::object::player::goto {
2579 my ($self, $path, $x, $y, $check, $done) = @_; 2796 my ($self, $path, $x, $y, $check, $done) = @_;
2797
2798 if ($self->{_link_recursion} >= $MAX_LINKS) {
2799 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2800 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2801 ($path, $x, $y) = @$EMERGENCY_POSITION;
2802 }
2580 2803
2581 # do generation counting so two concurrent goto's will be executed in-order 2804 # do generation counting so two concurrent goto's will be executed in-order
2582 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2805 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2583 2806
2584 $self->enter_link; 2807 $self->enter_link;
2604 ($path, $x, $y) = (undef, undef, undef); 2827 ($path, $x, $y) = (undef, undef, undef);
2605 } 2828 }
2606 } 2829 }
2607 2830
2608 my $map = eval { 2831 my $map = eval {
2609 my $map = defined $path ? cf::map::find $path : undef; 2832 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2610 2833
2611 if ($map) { 2834 if ($map) {
2612 $map = $map->customise_for ($self); 2835 $map = $map->customise_for ($self);
2613 $map = $check->($map) if $check && $map; 2836 $map = $check->($map, $x, $y, $self) if $check && $map;
2614 } else { 2837 } else {
2615 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2838 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2616 } 2839 }
2617 2840
2618 $map 2841 $map
2626 if ($gen == $self->{_goto_generation}) { 2849 if ($gen == $self->{_goto_generation}) {
2627 delete $self->{_goto_generation}; 2850 delete $self->{_goto_generation};
2628 $self->leave_link ($map, $x, $y); 2851 $self->leave_link ($map, $x, $y);
2629 } 2852 }
2630 2853
2631 $done->() if $done; 2854 $done->($self) if $done;
2632 })->prio (1); 2855 })->prio (1);
2633} 2856}
2634 2857
2635=item $player_object->enter_exit ($exit_object) 2858=item $player_object->enter_exit ($exit_object)
2636 2859
2712 2935
2713 prepare_random_map $exit 2936 prepare_random_map $exit
2714 if $exit->slaying eq "/!"; 2937 if $exit->slaying eq "/!";
2715 } 2938 }
2716 2939
2717 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2940 my $map = cf::map::normalise $exit->slaying, $exit->map;
2718 my $x = $exit->stats->hp; 2941 my $x = $exit->stats->hp;
2719 my $y = $exit->stats->sp; 2942 my $y = $exit->stats->sp;
2720 2943
2721 $self->goto ($map, $x, $y); 2944 $self->goto ($map, $x, $y);
2722 2945
2729 $self->message ("Something went wrong deep within the deliantra server. " 2952 $self->message ("Something went wrong deep within the deliantra server. "
2730 . "I'll try to bring you back to the map you were before. " 2953 . "I'll try to bring you back to the map you were before. "
2731 . "Please report this to the dungeon master!", 2954 . "Please report this to the dungeon master!",
2732 cf::NDI_UNIQUE | cf::NDI_RED); 2955 cf::NDI_UNIQUE | cf::NDI_RED);
2733 2956
2734 warn "ERROR in enter_exit: $@"; 2957 error "ERROR in enter_exit: $@";
2735 $self->leave_link; 2958 $self->leave_link;
2736 } 2959 }
2737 })->prio (1); 2960 })->prio (1);
2738} 2961}
2739 2962
2751sub cf::client::send_drawinfo { 2974sub cf::client::send_drawinfo {
2752 my ($self, $text, $flags) = @_; 2975 my ($self, $text, $flags) = @_;
2753 2976
2754 utf8::encode $text; 2977 utf8::encode $text;
2755 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2978 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2979}
2980
2981=item $client->send_big_packet ($pkt)
2982
2983Like C<send_packet>, but tries to compress large packets, and fragments
2984them as required.
2985
2986=cut
2987
2988our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2989
2990sub cf::client::send_big_packet {
2991 my ($self, $pkt) = @_;
2992
2993 # try lzf for large packets
2994 $pkt = "lzf " . Compress::LZF::compress $pkt
2995 if 1024 <= length $pkt and $self->{can_lzf};
2996
2997 # split very large packets
2998 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2999 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3000 $pkt = "frag";
3001 }
3002
3003 $self->send_packet ($pkt);
2756} 3004}
2757 3005
2758=item $client->send_msg ($channel, $msg, $color, [extra...]) 3006=item $client->send_msg ($channel, $msg, $color, [extra...])
2759 3007
2760Send a drawinfo or msg packet to the client, formatting the msg for the 3008Send a drawinfo or msg packet to the client, formatting the msg for the
2764 3012
2765=cut 3013=cut
2766 3014
2767# non-persistent channels (usually the info channel) 3015# non-persistent channels (usually the info channel)
2768our %CHANNEL = ( 3016our %CHANNEL = (
3017 "c/motd" => {
3018 id => "infobox",
3019 title => "MOTD",
3020 reply => undef,
3021 tooltip => "The message of the day",
3022 },
2769 "c/identify" => { 3023 "c/identify" => {
2770 id => "infobox", 3024 id => "infobox",
2771 title => "Identify", 3025 title => "Identify",
2772 reply => undef, 3026 reply => undef,
2773 tooltip => "Items recently identified", 3027 tooltip => "Items recently identified",
2775 "c/examine" => { 3029 "c/examine" => {
2776 id => "infobox", 3030 id => "infobox",
2777 title => "Examine", 3031 title => "Examine",
2778 reply => undef, 3032 reply => undef,
2779 tooltip => "Signs and other items you examined", 3033 tooltip => "Signs and other items you examined",
3034 },
3035 "c/shopinfo" => {
3036 id => "infobox",
3037 title => "Shop Info",
3038 reply => undef,
3039 tooltip => "What your bargaining skill tells you about the shop",
2780 }, 3040 },
2781 "c/book" => { 3041 "c/book" => {
2782 id => "infobox", 3042 id => "infobox",
2783 title => "Book", 3043 title => "Book",
2784 reply => undef, 3044 reply => undef,
2900 my $pkt = "msg " 3160 my $pkt = "msg "
2901 . $self->{json_coder}->encode ( 3161 . $self->{json_coder}->encode (
2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3162 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2903 ); 3163 );
2904 3164
2905 # try lzf for large packets
2906 $pkt = "lzf " . Compress::LZF::compress $pkt
2907 if 1024 <= length $pkt and $self->{can_lzf};
2908
2909 # split very large packets
2910 if (8192 < length $pkt and $self->{can_lzf}) {
2911 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2912 $pkt = "frag";
2913 }
2914
2915 $self->send_packet ($pkt); 3165 $self->send_big_packet ($pkt);
2916} 3166}
2917 3167
2918=item $client->ext_msg ($type, @msg) 3168=item $client->ext_msg ($type, @msg)
2919 3169
2920Sends an ext event to the client. 3170Sends an ext event to the client.
2923 3173
2924sub cf::client::ext_msg($$@) { 3174sub cf::client::ext_msg($$@) {
2925 my ($self, $type, @msg) = @_; 3175 my ($self, $type, @msg) = @_;
2926 3176
2927 if ($self->extcmd == 2) { 3177 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3178 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2929 } elsif ($self->extcmd == 1) { # TODO: remove 3179 } elsif ($self->extcmd == 1) { # TODO: remove
2930 push @msg, msgtype => "event_$type"; 3180 push @msg, msgtype => "event_$type";
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3181 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 } 3182 }
2933} 3183}
2934 3184
2935=item $client->ext_reply ($msgid, @msg) 3185=item $client->ext_reply ($msgid, @msg)
2936 3186
2940 3190
2941sub cf::client::ext_reply($$@) { 3191sub cf::client::ext_reply($$@) {
2942 my ($self, $id, @msg) = @_; 3192 my ($self, $id, @msg) = @_;
2943 3193
2944 if ($self->extcmd == 2) { 3194 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3195 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2946 } elsif ($self->extcmd == 1) { 3196 } elsif ($self->extcmd == 1) {
2947 #TODO: version 1, remove 3197 #TODO: version 1, remove
2948 unshift @msg, msgtype => "reply", msgid => $id; 3198 unshift @msg, msgtype => "reply", msgid => $id;
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3199 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 } 3200 }
2951} 3201}
2952 3202
2953=item $success = $client->query ($flags, "text", \&cb) 3203=item $success = $client->query ($flags, "text", \&cb)
2954 3204
3025 3275
3026 $ns->ext_reply ($reply, @reply) 3276 $ns->ext_reply ($reply, @reply)
3027 if $reply; 3277 if $reply;
3028 3278
3029 } else { 3279 } else {
3030 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3280 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3031 } 3281 }
3032 3282
3033 cf::override; 3283 cf::override;
3034 }, 3284 },
3035); 3285);
3055 3305
3056 $coro 3306 $coro
3057} 3307}
3058 3308
3059cf::client->attach ( 3309cf::client->attach (
3060 on_destroy => sub { 3310 on_client_destroy => sub {
3061 my ($ns) = @_; 3311 my ($ns) = @_;
3062 3312
3063 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3313 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3064 }, 3314 },
3065); 3315);
3081our $safe_hole = new Safe::Hole; 3331our $safe_hole = new Safe::Hole;
3082 3332
3083$SIG{FPE} = 'IGNORE'; 3333$SIG{FPE} = 'IGNORE';
3084 3334
3085$safe->permit_only (Opcode::opset qw( 3335$safe->permit_only (Opcode::opset qw(
3086 :base_core :base_mem :base_orig :base_math 3336 :base_core :base_mem :base_orig :base_math :base_loop
3087 grepstart grepwhile mapstart mapwhile 3337 grepstart grepwhile mapstart mapwhile
3088 sort time 3338 sort time
3089)); 3339));
3090 3340
3091# here we export the classes and methods available to script code 3341# here we export the classes and methods available to script code
3116 decrease split destroy change_exp value msg lore send_msg)], 3366 decrease split destroy change_exp value msg lore send_msg)],
3117 ["cf::object::player" => qw(player)], 3367 ["cf::object::player" => qw(player)],
3118 ["cf::player" => qw(peaceful send_msg)], 3368 ["cf::player" => qw(peaceful send_msg)],
3119 ["cf::map" => qw(trigger)], 3369 ["cf::map" => qw(trigger)],
3120) { 3370) {
3121 no strict 'refs';
3122 my ($pkg, @funs) = @$_; 3371 my ($pkg, @funs) = @$_;
3123 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3372 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3124 for @funs; 3373 for @funs;
3125} 3374}
3126 3375
3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3392 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3144 $qcode =~ s/\n/\\n/g; 3393 $qcode =~ s/\n/\\n/g;
3145 3394
3146 %vars = (_dummy => 0) unless %vars; 3395 %vars = (_dummy => 0) unless %vars;
3147 3396
3397 my @res;
3148 local $_; 3398 local $_;
3149 local @safe::cf::_safe_eval_args = values %vars;
3150 3399
3151 my $eval = 3400 my $eval =
3152 "do {\n" 3401 "do {\n"
3153 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3402 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3154 . "#line 0 \"{$qcode}\"\n" 3403 . "#line 0 \"{$qcode}\"\n"
3155 . $code 3404 . $code
3156 . "\n}" 3405 . "\n}"
3157 ; 3406 ;
3158 3407
3408 if ($CFG{safe_eval}) {
3159 sub_generation_inc; 3409 sub_generation_inc;
3410 local @safe::cf::_safe_eval_args = values %vars;
3160 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3411 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3161 sub_generation_inc; 3412 sub_generation_inc;
3413 } else {
3414 local @cf::_safe_eval_args = values %vars;
3415 @res = wantarray ? eval eval : scalar eval $eval;
3416 }
3162 3417
3163 if ($@) { 3418 if ($@) {
3164 warn "$@"; 3419 warn "$@",
3165 warn "while executing safe code '$code'\n"; 3420 "while executing safe code '$code'\n",
3166 warn "with arguments " . (join " ", %vars) . "\n"; 3421 "with arguments " . (join " ", %vars) . "\n";
3167 } 3422 }
3168 3423
3169 wantarray ? @res : $res[0] 3424 wantarray ? @res : $res[0]
3170} 3425}
3171 3426
3185=cut 3440=cut
3186 3441
3187sub register_script_function { 3442sub register_script_function {
3188 my ($fun, $cb) = @_; 3443 my ($fun, $cb) = @_;
3189 3444
3190 no strict 'refs'; 3445 $fun = "safe::$fun" if $CFG{safe_eval};
3191 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3446 *$fun = $safe_hole->wrap ($cb);
3192} 3447}
3193 3448
3194=back 3449=back
3195 3450
3196=cut 3451=cut
3205 # for this (global event?) 3460 # for this (global event?)
3206 %ext::player_env::MUSIC_FACE_CACHE = (); 3461 %ext::player_env::MUSIC_FACE_CACHE = ();
3207 3462
3208 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3463 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3209 3464
3210 warn "loading facedata from $path\n"; 3465 trace "loading facedata from $path\n";
3211 3466
3212 my $facedata; 3467 my $facedata = decode_storable load_file $path;
3213 0 < aio_load $path, $facedata
3214 or die "$path: $!";
3215
3216 $facedata = Coro::Storable::thaw $facedata;
3217 3468
3218 $facedata->{version} == 2 3469 $facedata->{version} == 2
3219 or cf::cleanup "$path: version mismatch, cannot proceed."; 3470 or cf::cleanup "$path: version mismatch, cannot proceed.";
3220 3471
3221 # patch in the exptable 3472 # patch in the exptable
3473 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3222 $facedata->{resource}{"res/exp_table"} = { 3474 $facedata->{resource}{"res/exp_table"} = {
3223 type => FT_RSRC, 3475 type => FT_RSRC,
3224 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3476 data => $exp_table,
3477 hash => (Digest::MD5::md5 $exp_table),
3225 }; 3478 };
3226 cf::cede_to_tick; 3479 cf::cede_to_tick;
3227 3480
3228 { 3481 {
3229 my $faces = $facedata->{faceinfo}; 3482 my $faces = $facedata->{faceinfo};
3231 while (my ($face, $info) = each %$faces) { 3484 while (my ($face, $info) = each %$faces) {
3232 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3485 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3233 3486
3234 cf::face::set_visibility $idx, $info->{visibility}; 3487 cf::face::set_visibility $idx, $info->{visibility};
3235 cf::face::set_magicmap $idx, $info->{magicmap}; 3488 cf::face::set_magicmap $idx, $info->{magicmap};
3236 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3489 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3237 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3490 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3491 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3238 3492
3239 cf::cede_to_tick; 3493 cf::cede_to_tick;
3240 } 3494 }
3241 3495
3242 while (my ($face, $info) = each %$faces) { 3496 while (my ($face, $info) = each %$faces) {
3247 3501
3248 if (my $smooth = cf::face::find $info->{smooth}) { 3502 if (my $smooth = cf::face::find $info->{smooth}) {
3249 cf::face::set_smooth $idx, $smooth; 3503 cf::face::set_smooth $idx, $smooth;
3250 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3504 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3251 } else { 3505 } else {
3252 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3506 error "smooth face '$info->{smooth}' not found for face '$face'";
3253 } 3507 }
3254 3508
3255 cf::cede_to_tick; 3509 cf::cede_to_tick;
3256 } 3510 }
3257 } 3511 }
3266 3520
3267 cf::anim::invalidate_all; # d'oh 3521 cf::anim::invalidate_all; # d'oh
3268 } 3522 }
3269 3523
3270 { 3524 {
3271 # TODO: for gcfclient pleasure, we should give resources
3272 # that gcfclient doesn't grok a >10000 face index.
3273 my $res = $facedata->{resource}; 3525 my $res = $facedata->{resource};
3274 3526
3275 while (my ($name, $info) = each %$res) { 3527 while (my ($name, $info) = each %$res) {
3276 if (defined $info->{type}) { 3528 if (defined $info->{type}) {
3277 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3529 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3278 my $data;
3279 3530
3280 if ($info->{type} & 1) { 3531 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3281 # prepend meta info
3282
3283 my $meta = $enc->encode ({
3284 name => $name,
3285 %{ $info->{meta} || {} },
3286 });
3287
3288 $data = pack "(w/a*)*", $meta, $info->{data};
3289 } else {
3290 $data = $info->{data};
3291 }
3292
3293 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3294 cf::face::set_type $idx, $info->{type}; 3532 cf::face::set_type $idx, $info->{type};
3295 } else { 3533 } else {
3296 $RESOURCE{$name} = $info; 3534 $RESOURCE{$name} = $info; # unused
3297 } 3535 }
3298 3536
3299 cf::cede_to_tick; 3537 cf::cede_to_tick;
3300 } 3538 }
3301 } 3539 }
3302 3540
3303 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3541 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3304 3542
3305 1 3543 1
3306} 3544}
3307
3308cf::global->attach (on_resource_update => sub {
3309 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3310 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3311
3312 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3313 my $sound = $soundconf->{compat}[$_]
3314 or next;
3315
3316 my $face = cf::face::find "sound/$sound->[1]";
3317 cf::sound::set $sound->[0] => $face;
3318 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3319 }
3320
3321 while (my ($k, $v) = each %{$soundconf->{event}}) {
3322 my $face = cf::face::find "sound/$v";
3323 cf::sound::set $k => $face;
3324 }
3325 }
3326});
3327 3545
3328register_exticmd fx_want => sub { 3546register_exticmd fx_want => sub {
3329 my ($ns, $want) = @_; 3547 my ($ns, $want) = @_;
3330 3548
3331 while (my ($k, $v) = each %$want) { 3549 while (my ($k, $v) = each %$want) {
3370sub reload_treasures { 3588sub reload_treasures {
3371 load_resource_file "$DATADIR/treasures" 3589 load_resource_file "$DATADIR/treasures"
3372 or die "unable to load treasurelists\n"; 3590 or die "unable to load treasurelists\n";
3373} 3591}
3374 3592
3593sub reload_sound {
3594 trace "loading sound config from $DATADIR/sound\n";
3595
3596 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3597
3598 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3599 my $sound = $soundconf->{compat}[$_]
3600 or next;
3601
3602 my $face = cf::face::find "sound/$sound->[1]";
3603 cf::sound::set $sound->[0] => $face;
3604 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3605 }
3606
3607 while (my ($k, $v) = each %{$soundconf->{event}}) {
3608 my $face = cf::face::find "sound/$v";
3609 cf::sound::set $k => $face;
3610 }
3611}
3612
3375sub reload_resources { 3613sub reload_resources {
3376 warn "reloading resource files...\n"; 3614 trace "reloading resource files...\n";
3377 3615
3616 reload_exp_table;
3617 reload_materials;
3378 reload_facedata; 3618 reload_facedata;
3619 reload_sound;
3379 reload_archetypes; 3620 reload_archetypes;
3380 reload_regions; 3621 reload_regions;
3381 reload_treasures; 3622 reload_treasures;
3382 3623
3383 warn "finished reloading resource files\n"; 3624 trace "finished reloading resource files\n";
3384} 3625}
3385 3626
3386sub reload_config { 3627sub reload_config {
3387 open my $fh, "<:utf8", "$CONFDIR/config" 3628 trace "reloading config file...\n";
3388 or return;
3389 3629
3390 local $/; 3630 my $config = load_file "$CONFDIR/config";
3391 *CFG = YAML::Load <$fh>; 3631 utf8::decode $config;
3632 *CFG = decode_yaml $config;
3392 3633
3393 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3634 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3394 3635
3395 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3636 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3396 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3637 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3397 3638
3398 if (exists $CFG{mlockall}) { 3639 if (exists $CFG{mlockall}) {
3422 seek $fh, 0, 0; 3663 seek $fh, 0, 0;
3423 print $fh $$; 3664 print $fh $$;
3424} 3665}
3425 3666
3426sub main_loop { 3667sub main_loop {
3427 warn "EV::loop starting\n"; 3668 trace "EV::loop starting\n";
3428 if (1) { 3669 if (1) {
3429 EV::loop; 3670 EV::loop;
3430 } 3671 }
3431 warn "EV::loop returned\n"; 3672 trace "EV::loop returned\n";
3432 goto &main_loop unless $REALLY_UNLOOP; 3673 goto &main_loop unless $REALLY_UNLOOP;
3433} 3674}
3434 3675
3435sub main { 3676sub main {
3436 cf::init_globals; # initialise logging 3677 cf::init_globals; # initialise logging
3437 3678
3438 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3679 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3439 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3680 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3440 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3681 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3441 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3682 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3442
3443 cf::init_experience;
3444 cf::init_anim;
3445 cf::init_attackmess;
3446 cf::init_dynamic;
3447 3683
3448 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3684 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3449 3685
3450 # we must not ever block the main coroutine 3686 # we must not ever block the main coroutine
3451 local $Coro::idle = sub { 3687 local $Coro::idle = sub {
3457 }; 3693 };
3458 3694
3459 evthread_start IO::AIO::poll_fileno; 3695 evthread_start IO::AIO::poll_fileno;
3460 3696
3461 cf::sync_job { 3697 cf::sync_job {
3698 cf::incloader::init ();
3699
3700 cf::init_anim;
3701 cf::init_attackmess;
3702 cf::init_dynamic;
3703
3704 cf::load_settings;
3705
3462 reload_resources; 3706 reload_resources;
3463 reload_config; 3707 reload_config;
3464 db_init; 3708 db_init;
3465 3709
3466 cf::load_settings;
3467 cf::load_materials;
3468 cf::init_uuid; 3710 cf::init_uuid;
3469 cf::init_signals; 3711 cf::init_signals;
3470 cf::init_commands;
3471 cf::init_skills; 3712 cf::init_skills;
3472 3713
3473 cf::init_beforeplay; 3714 cf::init_beforeplay;
3474 3715
3475 atomic; 3716 atomic;
3480 3721
3481 # no (long-running) fork's whatsoever before this point(!) 3722 # no (long-running) fork's whatsoever before this point(!)
3482 use POSIX (); 3723 use POSIX ();
3483 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3724 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3484 3725
3485 (pop @POST_INIT)->(0) while @POST_INIT; 3726 cf::_post_init 0;
3486 }; 3727 };
3487 3728
3729 cf::object::thawer::errors_are_fatal 0;
3730 info "parse errors in files are no longer fatal from this point on.\n";
3731
3732 my $free_main; $free_main = EV::idle sub {
3733 undef $free_main;
3734 undef &main; # free gobs of memory :)
3735 };
3736
3488 main_loop; 3737 goto &main_loop;
3489} 3738}
3490 3739
3491############################################################################# 3740#############################################################################
3492# initialisation and cleanup 3741# initialisation and cleanup
3493 3742
3494# install some emergency cleanup handlers 3743# install some emergency cleanup handlers
3495BEGIN { 3744BEGIN {
3496 our %SIGWATCHER = (); 3745 our %SIGWATCHER = ();
3497 for my $signal (qw(INT HUP TERM)) { 3746 for my $signal (qw(INT HUP TERM)) {
3498 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3747 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3499 cf::cleanup "SIG$signal"; 3748 cf::cleanup "SIG$signal";
3500 }; 3749 };
3501 } 3750 }
3502} 3751}
3503 3752
3504sub write_runtime_sync { 3753sub write_runtime_sync {
3754 my $t0 = AE::time;
3755
3505 # first touch the runtime file to show we are still running: 3756 # first touch the runtime file to show we are still running:
3506 # the fsync below can take a very very long time. 3757 # the fsync below can take a very very long time.
3507 3758
3508 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3759 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3509 3760
3510 my $guard = cf::lock_acquire "write_runtime"; 3761 my $guard = cf::lock_acquire "write_runtime";
3511 3762
3512 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3763 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3513 or return; 3764 or return;
3514 3765
3515 my $value = $cf::RUNTIME + 90 + 10; 3766 my $value = $cf::RUNTIME + 90 + 10;
3516 # 10 is the runtime save interval, for a monotonic clock 3767 # 10 is the runtime save interval, for a monotonic clock
3517 # 60 allows for the watchdog to kill the server. 3768 # 60 allows for the watchdog to kill the server.
3530 or return; 3781 or return;
3531 3782
3532 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3783 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3533 and return; 3784 and return;
3534 3785
3535 warn "runtime file written.\n"; 3786 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3536 3787
3537 1 3788 1
3538} 3789}
3539 3790
3540our $uuid_lock; 3791our $uuid_lock;
3552 or return; 3803 or return;
3553 3804
3554 my $value = uuid_seq uuid_cur; 3805 my $value = uuid_seq uuid_cur;
3555 3806
3556 unless ($value) { 3807 unless ($value) {
3557 warn "cowardly refusing to write zero uuid value!\n"; 3808 info "cowardly refusing to write zero uuid value!\n";
3558 return; 3809 return;
3559 } 3810 }
3560 3811
3561 my $value = uuid_str $value + $uuid_skip; 3812 my $value = uuid_str $value + $uuid_skip;
3562 $uuid_skip = 0; 3813 $uuid_skip = 0;
3572 or return; 3823 or return;
3573 3824
3574 aio_rename "$uuid~", $uuid 3825 aio_rename "$uuid~", $uuid
3575 and return; 3826 and return;
3576 3827
3577 warn "uuid file written ($value).\n"; 3828 trace "uuid file written ($value).\n";
3578 3829
3579 1 3830 1
3580 3831
3581} 3832}
3582 3833
3588} 3839}
3589 3840
3590sub emergency_save() { 3841sub emergency_save() {
3591 my $freeze_guard = cf::freeze_mainloop; 3842 my $freeze_guard = cf::freeze_mainloop;
3592 3843
3593 warn "emergency_perl_save: enter\n"; 3844 info "emergency_perl_save: enter\n";
3845
3846 # this is a trade-off: we want to be very quick here, so
3847 # save all maps without fsync, and later call a global sync
3848 # (which in turn might be very very slow)
3849 local $USE_FSYNC = 0;
3594 3850
3595 cf::sync_job { 3851 cf::sync_job {
3596 # this is a trade-off: we want to be very quick here, so 3852 cf::write_runtime_sync; # external watchdog should not bark
3597 # save all maps without fsync, and later call a global sync
3598 # (which in turn might be very very slow)
3599 local $USE_FSYNC = 0;
3600 3853
3601 # use a peculiar iteration method to avoid tripping on perl 3854 # use a peculiar iteration method to avoid tripping on perl
3602 # refcount bugs in for. also avoids problems with players 3855 # refcount bugs in for. also avoids problems with players
3603 # and maps saved/destroyed asynchronously. 3856 # and maps saved/destroyed asynchronously.
3604 warn "emergency_perl_save: begin player save\n"; 3857 info "emergency_perl_save: begin player save\n";
3605 for my $login (keys %cf::PLAYER) { 3858 for my $login (keys %cf::PLAYER) {
3606 my $pl = $cf::PLAYER{$login} or next; 3859 my $pl = $cf::PLAYER{$login} or next;
3607 $pl->valid or next; 3860 $pl->valid or next;
3608 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3861 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3609 $pl->save; 3862 $pl->save;
3610 } 3863 }
3611 warn "emergency_perl_save: end player save\n"; 3864 info "emergency_perl_save: end player save\n";
3612 3865
3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3613 warn "emergency_perl_save: begin map save\n"; 3868 info "emergency_perl_save: begin map save\n";
3614 for my $path (keys %cf::MAP) { 3869 for my $path (keys %cf::MAP) {
3615 my $map = $cf::MAP{$path} or next; 3870 my $map = $cf::MAP{$path} or next;
3616 $map->valid or next; 3871 $map->valid or next;
3617 $map->save; 3872 $map->save;
3618 } 3873 }
3619 warn "emergency_perl_save: end map save\n"; 3874 info "emergency_perl_save: end map save\n";
3620 3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3621 warn "emergency_perl_save: begin database checkpoint\n"; 3878 info "emergency_perl_save: begin database checkpoint\n";
3622 BDB::db_env_txn_checkpoint $DB_ENV; 3879 BDB::db_env_txn_checkpoint $DB_ENV;
3623 warn "emergency_perl_save: end database checkpoint\n"; 3880 info "emergency_perl_save: end database checkpoint\n";
3624 3881
3625 warn "emergency_perl_save: begin write uuid\n"; 3882 info "emergency_perl_save: begin write uuid\n";
3626 write_uuid_sync 1; 3883 write_uuid_sync 1;
3627 warn "emergency_perl_save: end write uuid\n"; 3884 info "emergency_perl_save: end write uuid\n";
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3887
3888 trace "emergency_perl_save: syncing database to disk";
3889 BDB::db_env_txn_checkpoint $DB_ENV;
3890
3891 info "emergency_perl_save: starting sync\n";
3892 IO::AIO::aio_sync sub {
3893 info "emergency_perl_save: finished sync\n";
3894 };
3895
3896 cf::write_runtime_sync; # external watchdog should not bark
3897
3898 trace "emergency_perl_save: flushing outstanding aio requests";
3899 while (IO::AIO::nreqs || BDB::nreqs) {
3900 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3901 }
3902
3903 cf::write_runtime_sync; # external watchdog should not bark
3628 }; 3904 };
3629 3905
3630 warn "emergency_perl_save: starting sync()\n";
3631 IO::AIO::aio_sync sub {
3632 warn "emergency_perl_save: finished sync()\n";
3633 };
3634
3635 warn "emergency_perl_save: leave\n"; 3906 info "emergency_perl_save: leave\n";
3636} 3907}
3637 3908
3638sub post_cleanup { 3909sub post_cleanup {
3639 my ($make_core) = @_; 3910 my ($make_core) = @_;
3640 3911
3912 IO::AIO::flush;
3913
3641 warn Carp::longmess "post_cleanup backtrace" 3914 error Carp::longmess "post_cleanup backtrace"
3642 if $make_core; 3915 if $make_core;
3643 3916
3644 my $fh = pidfile; 3917 my $fh = pidfile;
3645 unlink $PIDFILE if <$fh> == $$; 3918 unlink $PIDFILE if <$fh> == $$;
3646} 3919}
3666 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3939 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3667 for my $name (keys %$leaf_symtab) { 3940 for my $name (keys %$leaf_symtab) {
3668 _gv_clear *{"$pkg$name"}; 3941 _gv_clear *{"$pkg$name"};
3669# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3942# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3670 } 3943 }
3671 warn "cleared package $pkg\n";#d#
3672} 3944}
3673 3945
3674sub do_reload_perl() { 3946sub do_reload_perl() {
3675 # can/must only be called in main 3947 # can/must only be called in main
3676 if ($Coro::current != $Coro::main) { 3948 unless (in_main) {
3677 warn "can only reload from main coroutine"; 3949 error "can only reload from main coroutine";
3678 return; 3950 return;
3679 } 3951 }
3680 3952
3681 return if $RELOAD++; 3953 return if $RELOAD++;
3682 3954
3683 my $t1 = EV::time; 3955 my $t1 = AE::time;
3684 3956
3685 while ($RELOAD) { 3957 while ($RELOAD) {
3686 warn "reloading..."; 3958 cf::get_slot 0.1, -1, "reload_perl";
3959 info "perl_reload: reloading...";
3687 3960
3688 warn "entering sync_job"; 3961 trace "perl_reload: entering sync_job";
3689 3962
3690 cf::sync_job { 3963 cf::sync_job {
3691 cf::write_runtime_sync; # external watchdog should not bark
3692 cf::emergency_save; 3964 #cf::emergency_save;
3693 cf::write_runtime_sync; # external watchdog should not bark
3694 3965
3695 warn "syncing database to disk";
3696 BDB::db_env_txn_checkpoint $DB_ENV;
3697
3698 # if anything goes wrong in here, we should simply crash as we already saved
3699
3700 warn "flushing outstanding aio requests";
3701 while (IO::AIO::nreqs || BDB::nreqs) {
3702 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3703 }
3704
3705 warn "cancelling all extension coros"; 3966 trace "perl_reload: cancelling all extension coros";
3706 $_->cancel for values %EXT_CORO; 3967 $_->cancel for values %EXT_CORO;
3707 %EXT_CORO = (); 3968 %EXT_CORO = ();
3708 3969
3709 warn "removing commands"; 3970 trace "perl_reload: removing commands";
3710 %COMMAND = (); 3971 %COMMAND = ();
3711 3972
3712 warn "removing ext/exti commands"; 3973 trace "perl_reload: removing ext/exti commands";
3713 %EXTCMD = (); 3974 %EXTCMD = ();
3714 %EXTICMD = (); 3975 %EXTICMD = ();
3715 3976
3716 warn "unloading/nuking all extensions"; 3977 trace "perl_reload: unloading/nuking all extensions";
3717 for my $pkg (@EXTS) { 3978 for my $pkg (@EXTS) {
3718 warn "... unloading $pkg"; 3979 trace "... unloading $pkg";
3719 3980
3720 if (my $cb = $pkg->can ("unload")) { 3981 if (my $cb = $pkg->can ("unload")) {
3721 eval { 3982 eval {
3722 $cb->($pkg); 3983 $cb->($pkg);
3723 1 3984 1
3724 } or warn "$pkg unloaded, but with errors: $@"; 3985 } or error "$pkg unloaded, but with errors: $@";
3725 } 3986 }
3726 3987
3727 warn "... clearing $pkg"; 3988 trace "... clearing $pkg";
3728 clear_package $pkg; 3989 clear_package $pkg;
3729 } 3990 }
3730 3991
3731 warn "unloading all perl modules loaded from $LIBDIR"; 3992 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3732 while (my ($k, $v) = each %INC) { 3993 while (my ($k, $v) = each %INC) {
3733 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3994 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3734 3995
3735 warn "... unloading $k"; 3996 trace "... unloading $k";
3736 delete $INC{$k}; 3997 delete $INC{$k};
3737 3998
3738 $k =~ s/\.pm$//; 3999 $k =~ s/\.pm$//;
3739 $k =~ s/\//::/g; 4000 $k =~ s/\//::/g;
3740 4001
3743 } 4004 }
3744 4005
3745 clear_package $k; 4006 clear_package $k;
3746 } 4007 }
3747 4008
3748 warn "getting rid of safe::, as good as possible"; 4009 trace "perl_reload: getting rid of safe::, as good as possible";
3749 clear_package "safe::$_" 4010 clear_package "safe::$_"
3750 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4011 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3751 4012
3752 warn "unloading cf.pm \"a bit\""; 4013 trace "perl_reload: unloading cf.pm \"a bit\"";
3753 delete $INC{"cf.pm"}; 4014 delete $INC{"cf.pm"};
3754 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4015 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3755 4016
3756 # don't, removes xs symbols, too, 4017 # don't, removes xs symbols, too,
3757 # and global variables created in xs 4018 # and global variables created in xs
3758 #clear_package __PACKAGE__; 4019 #clear_package __PACKAGE__;
3759 4020
3760 warn "unload completed, starting to reload now"; 4021 info "perl_reload: unload completed, starting to reload now";
3761 4022
3762 warn "reloading cf.pm"; 4023 trace "perl_reload: reloading cf.pm";
3763 require cf; 4024 require cf;
3764 cf::_connect_to_perl_1; 4025 cf::_connect_to_perl_1;
3765 4026
3766 warn "loading config and database again"; 4027 trace "perl_reload: loading config and database again";
3767 cf::reload_config; 4028 cf::reload_config;
3768 4029
3769 warn "loading extensions"; 4030 trace "perl_reload: loading extensions";
3770 cf::load_extensions; 4031 cf::load_extensions;
3771 4032
3772 if ($REATTACH_ON_RELOAD) { 4033 if ($REATTACH_ON_RELOAD) {
3773 warn "reattaching attachments to objects/players"; 4034 trace "perl_reload: reattaching attachments to objects/players";
3774 _global_reattach; # objects, sockets 4035 _global_reattach; # objects, sockets
3775 warn "reattaching attachments to maps"; 4036 trace "perl_reload: reattaching attachments to maps";
3776 reattach $_ for values %MAP; 4037 reattach $_ for values %MAP;
3777 warn "reattaching attachments to players"; 4038 trace "perl_reload: reattaching attachments to players";
3778 reattach $_ for values %PLAYER; 4039 reattach $_ for values %PLAYER;
3779 } 4040 }
3780 4041
3781 warn "running post_init jobs"; 4042 cf::_post_init 1;
3782 (pop @POST_INIT)->(1) while @POST_INIT;
3783 4043
3784 warn "leaving sync_job"; 4044 trace "perl_reload: leaving sync_job";
3785 4045
3786 1 4046 1
3787 } or do { 4047 } or do {
3788 warn $@; 4048 error $@;
3789 cf::cleanup "error while reloading, exiting."; 4049 cf::cleanup "perl_reload: error, exiting.";
3790 }; 4050 };
3791 4051
3792 warn "reloaded";
3793 --$RELOAD; 4052 --$RELOAD;
3794 } 4053 }
3795 4054
3796 $t1 = EV::time - $t1; 4055 $t1 = AE::time - $t1;
3797 warn "reload completed in ${t1}s\n"; 4056 info "perl_reload: completed in ${t1}s\n";
3798}; 4057};
3799 4058
3800our $RELOAD_WATCHER; # used only during reload 4059our $RELOAD_WATCHER; # used only during reload
3801 4060
3802sub reload_perl() { 4061sub reload_perl() {
3804 # coro crashes during coro_state_free->destroy here. 4063 # coro crashes during coro_state_free->destroy here.
3805 4064
3806 $RELOAD_WATCHER ||= cf::async { 4065 $RELOAD_WATCHER ||= cf::async {
3807 Coro::AIO::aio_wait cache_extensions; 4066 Coro::AIO::aio_wait cache_extensions;
3808 4067
3809 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4068 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3810 do_reload_perl; 4069 do_reload_perl;
3811 undef $RELOAD_WATCHER; 4070 undef $RELOAD_WATCHER;
3812 }; 4071 };
3813 }; 4072 };
3814} 4073}
3823 reload_perl; 4082 reload_perl;
3824 }; 4083 };
3825 } 4084 }
3826}; 4085};
3827 4086
3828unshift @INC, $LIBDIR; 4087#############################################################################
3829 4088
3830my $bug_warning = 0; 4089my $bug_warning = 0;
3831 4090
3832our @WAIT_FOR_TICK; 4091our @WAIT_FOR_TICK;
3833our @WAIT_FOR_TICK_BEGIN; 4092our @WAIT_FOR_TICK_BEGIN;
3834 4093
3835sub wait_for_tick { 4094sub wait_for_tick() {
3836 return if tick_inhibit || $Coro::current == $Coro::main; 4095 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3837 4096
3838 my $signal = new Coro::Signal; 4097 my $signal = new Coro::Signal;
3839 push @WAIT_FOR_TICK, $signal; 4098 push @WAIT_FOR_TICK, $signal;
3840 $signal->wait; 4099 $signal->wait;
3841} 4100}
3842 4101
3843sub wait_for_tick_begin { 4102sub wait_for_tick_begin() {
3844 return if tick_inhibit || $Coro::current == $Coro::main; 4103 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3845 4104
3846 my $signal = new Coro::Signal; 4105 my $signal = new Coro::Signal;
3847 push @WAIT_FOR_TICK_BEGIN, $signal; 4106 push @WAIT_FOR_TICK_BEGIN, $signal;
3848 $signal->wait; 4107 $signal->wait;
3849} 4108}
3855 return; 4114 return;
3856 } 4115 }
3857 4116
3858 cf::server_tick; # one server iteration 4117 cf::server_tick; # one server iteration
3859 4118
4119 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4120
3860 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4121 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3861 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4122 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3862 Coro::async_pool { 4123 Coro::async_pool {
3863 $Coro::current->{desc} = "runtime saver"; 4124 $Coro::current->{desc} = "runtime saver";
3864 write_runtime_sync 4125 write_runtime_sync
3865 or warn "ERROR: unable to write runtime file: $!"; 4126 or error "ERROR: unable to write runtime file: $!";
3866 }; 4127 };
3867 } 4128 }
3868 4129
3869 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4130 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3870 $sig->send; 4131 $sig->send;
3878 4139
3879 if (0) { 4140 if (0) {
3880 if ($NEXT_TICK) { 4141 if ($NEXT_TICK) {
3881 my $jitter = $TICK_START - $NEXT_TICK; 4142 my $jitter = $TICK_START - $NEXT_TICK;
3882 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4143 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3883 warn "jitter $JITTER\n";#d# 4144 debug "jitter $JITTER\n";#d#
3884 } 4145 }
3885 } 4146 }
3886} 4147}
3887 4148
3888{ 4149{
3889 # configure BDB 4150 # configure BDB
3890 4151
3891 BDB::min_parallel 8; 4152 BDB::min_parallel 16;
3892 BDB::max_poll_reqs $TICK * 0.1; 4153 BDB::max_poll_reqs $TICK * 0.1;
3893 $AnyEvent::BDB::WATCHER->priority (1); 4154 $AnyEvent::BDB::WATCHER->priority (1);
3894 4155
3895 unless ($DB_ENV) { 4156 unless ($DB_ENV) {
3896 $DB_ENV = BDB::db_env_create; 4157 $DB_ENV = BDB::db_env_create;
3933 IO::AIO::min_parallel 8; 4194 IO::AIO::min_parallel 8;
3934 IO::AIO::max_poll_time $TICK * 0.1; 4195 IO::AIO::max_poll_time $TICK * 0.1;
3935 undef $AnyEvent::AIO::WATCHER; 4196 undef $AnyEvent::AIO::WATCHER;
3936} 4197}
3937 4198
3938my $_log_backtrace; 4199our $_log_backtrace;
4200our $_log_backtrace_last;
3939 4201
3940sub _log_backtrace { 4202sub _log_backtrace {
3941 my ($msg, @addr) = @_; 4203 my ($msg, @addr) = @_;
3942 4204
3943 $msg =~ s/\n//; 4205 $msg =~ s/\n$//;
3944 4206
4207 if ($_log_backtrace_last eq $msg) {
4208 LOG llevInfo, "[ABT] $msg\n";
4209 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3945 # limit the # of concurrent backtraces 4210 # limit the # of concurrent backtraces
3946 if ($_log_backtrace < 2) { 4211 } elsif ($_log_backtrace < 2) {
4212 $_log_backtrace_last = $msg;
3947 ++$_log_backtrace; 4213 ++$_log_backtrace;
3948 my $perl_bt = Carp::longmess $msg; 4214 my $perl_bt = Carp::longmess $msg;
3949 async { 4215 async {
3950 $Coro::current->{desc} = "abt $msg"; 4216 $Coro::current->{desc} = "abt $msg";
3951 4217
3971 LOG llevInfo, "[ABT] $_\n" for @bt; 4237 LOG llevInfo, "[ABT] $_\n" for @bt;
3972 --$_log_backtrace; 4238 --$_log_backtrace;
3973 }; 4239 };
3974 } else { 4240 } else {
3975 LOG llevInfo, "[ABT] $msg\n"; 4241 LOG llevInfo, "[ABT] $msg\n";
3976 LOG llevInfo, "[ABT] [suppressed]\n"; 4242 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3977 } 4243 }
3978} 4244}
3979 4245
3980# load additional modules 4246# load additional modules
3981require "cf/$_.pm" for @EXTRA_MODULES; 4247require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines