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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines