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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines