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.499 by root, Sun Jan 10 17:43:46 2010 UTC vs.
Revision 1.566 by root, Sun May 1 16:58:16 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;
… …
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
… …
291} 314}
292 315
293$EV::DIED = sub { 316$EV::DIED = sub {
294 Carp::cluck "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 #
… …
1812 # {... are special paths that are not being touched 1954 # {... are special paths that are not being touched
1813 # ?xxx/... are special absolute paths 1955 # ?xxx/... are special absolute paths
1814 # ?random/... random maps 1956 # ?random/... random maps
1815 # /... normal maps 1957 # /... normal maps
1816 # ~user/... per-player map of a specific user 1958 # ~user/... per-player map of a specific user
1959 # !up !down for quad maps, or other maps with up/down layers
1817 1960
1818 $path =~ s/$PATH_SEP/\//go; 1961 $path =~ s/$PATH_SEP/\//go;
1819 1962
1820 # treat it as relative path if it starts with 1963 # treat it as relative path if it starts with
1821 # something that looks reasonable 1964 # something that looks reasonable
1822 if ($path =~ m{^(?:\./|\.\./|\w)}) { 1965 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1823 $base or Carp::carp "normalise called with relative path and no base: '$path'"; 1966 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1824 1967
1825 $base =~ s{[^/]+/?$}{}; 1968 $base =~ s{[^/]+/?$}{};
1826 $path = "$base/$path"; 1969 $path = "$base/$path";
1970
1971 } elsif ($path eq '!up') {
1972 $base && ref $base
1973 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1974
1975 my $uppth = $base->tile_path (cf::TILE_UP);
1976 $path = $uppth if $uppth;
1977
1978 } elsif ($path eq '!down') {
1979 $base && ref $base
1980 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1981
1982 my $dpth = $base->tile_path (cf::TILE_DOWN);
1983 $path = $dpth if $dpth;
1827 } 1984 }
1828 1985
1829 for ($path) { 1986 for ($path) {
1830 redo if s{//}{/};
1831 redo if s{/\.?/}{/}; 1987 redo if s{/\.?/}{/};
1832 redo if s{/[^/]+/\.\./}{/}; 1988 redo if s{/[^/]+/\.\./}{/};
1833 } 1989 }
1834 1990
1835 $path 1991 $path
… …
1849 $self->init; # pass $1 etc. 2005 $self->init; # pass $1 etc.
1850 return $self; 2006 return $self;
1851 } 2007 }
1852 } 2008 }
1853 2009
1854 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2010 Carp::cluck "unable to resolve path '$path' (base '$base')";
1855 () 2011 ()
1856} 2012}
1857 2013
2014# may re-bless or do other evil things
1858sub init { 2015sub init {
1859 my ($self) = @_; 2016 my ($self) = @_;
1860 2017
1861 $self 2018 $self
1862} 2019}
… …
1927 $self->{load_path} = $path; 2084 $self->{load_path} = $path;
1928 2085
1929 1 2086 1
1930} 2087}
1931 2088
2089# used to laod the header of an original map
1932sub load_header_orig { 2090sub load_header_orig {
1933 my ($self) = @_; 2091 my ($self) = @_;
1934 2092
1935 $self->load_header_from ($self->load_path) 2093 $self->load_header_from ($self->load_path)
1936} 2094}
1937 2095
2096# used to laod the header of an instantiated map
1938sub load_header_temp { 2097sub load_header_temp {
1939 my ($self) = @_; 2098 my ($self) = @_;
1940 2099
1941 $self->load_header_from ($self->save_path) 2100 $self->load_header_from ($self->save_path)
1942} 2101}
1943 2102
2103# called after loading the header from an instantiated map
1944sub prepare_temp { 2104sub prepare_temp {
1945 my ($self) = @_; 2105 my ($self) = @_;
1946 2106
1947 $self->last_access ((delete $self->{last_access}) 2107 $self->last_access ((delete $self->{last_access})
1948 || $cf::RUNTIME); #d# 2108 || $cf::RUNTIME); #d#
1949 # safety 2109 # safety
1950 $self->{instantiate_time} = $cf::RUNTIME 2110 $self->{instantiate_time} = $cf::RUNTIME
1951 if $self->{instantiate_time} > $cf::RUNTIME; 2111 if $self->{instantiate_time} > $cf::RUNTIME;
1952} 2112}
1953 2113
2114# called after loading the header from an original map
1954sub prepare_orig { 2115sub prepare_orig {
1955 my ($self) = @_; 2116 my ($self) = @_;
1956 2117
1957 $self->{load_original} = 1; 2118 $self->{load_original} = 1;
1958 $self->{instantiate_time} = $cf::RUNTIME; 2119 $self->{instantiate_time} = $cf::RUNTIME;
… …
1982 2143
1983sub find; 2144sub find;
1984sub find { 2145sub find {
1985 my ($path, $origin) = @_; 2146 my ($path, $origin) = @_;
1986 2147
2148 cf::cede_to_tick;
2149
1987 $path = normalise $path, $origin && $origin->path; 2150 $path = normalise $path, $origin;
1988 2151
1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2152 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1990 my $guard2 = cf::lock_acquire "map_find:$path"; 2153 my $guard2 = cf::lock_acquire "map_find:$path";
1991 2154
1992 $cf::MAP{$path} || do { 2155 $cf::MAP{$path} || do {
… …
2009 2172
2010 $cf::MAP{$path} = $map 2173 $cf::MAP{$path} = $map
2011 } 2174 }
2012} 2175}
2013 2176
2014sub pre_load { } 2177sub pre_load { }
2015sub post_load { } 2178#sub post_load { } # XS
2016 2179
2017sub load { 2180sub load {
2018 my ($self) = @_; 2181 my ($self) = @_;
2019 2182
2020 local $self->{deny_reset} = 1; # loading can take a long time 2183 local $self->{deny_reset} = 1; # loading can take a long time
… …
2032 $self->alloc; 2195 $self->alloc;
2033 2196
2034 $self->pre_load; 2197 $self->pre_load;
2035 cf::cede_to_tick; 2198 cf::cede_to_tick;
2036 2199
2200 if (exists $self->{load_path}) {
2037 my $f = new_from_file cf::object::thawer $self->{load_path}; 2201 my $f = new_from_file cf::object::thawer $self->{load_path};
2038 $f->skip_block; 2202 $f->skip_block;
2039 $self->_load_objects ($f) 2203 $self->_load_objects ($f)
2040 or return; 2204 or return;
2041 2205
2042 $self->post_load_original 2206 $self->post_load_original
2043 if delete $self->{load_original}; 2207 if delete $self->{load_original};
2044 2208
2045 if (my $uniq = $self->uniq_path) { 2209 if (my $uniq = $self->uniq_path) {
2046 utf8::encode $uniq; 2210 utf8::encode $uniq;
2047 unless (aio_stat $uniq) { 2211 unless (aio_stat $uniq) {
2048 if (my $f = new_from_file cf::object::thawer $uniq) { 2212 if (my $f = new_from_file cf::object::thawer $uniq) {
2049 $self->clear_unique_items; 2213 $self->clear_unique_items;
2050 $self->_load_objects ($f); 2214 $self->_load_objects ($f);
2051 $f->resolve_delayed_derefs; 2215 $f->resolve_delayed_derefs;
2216 }
2052 } 2217 }
2053 } 2218 }
2054 }
2055 2219
2056 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 } else {
2222 $self->post_load_original
2223 if delete $self->{load_original};
2224 }
2057 2225
2058 cf::cede_to_tick; 2226 cf::cede_to_tick;
2059 # now do the right thing for maps 2227 # now do the right thing for maps
2060 $self->link_multipart_objects; 2228 $self->link_multipart_objects;
2061 $self->difficulty ($self->estimate_difficulty) 2229 $self->difficulty ($self->estimate_difficulty)
… …
2075 2243
2076 $self->in_memory (cf::MAP_ACTIVE); 2244 $self->in_memory (cf::MAP_ACTIVE);
2077 } 2245 }
2078 2246
2079 $self->post_load; 2247 $self->post_load;
2080}
2081 2248
2249 1
2250}
2251
2252# customize the map for a given player, i.e.
2253# return the _real_ map. used by e.g. per-player
2254# maps to change the path to ~playername/mappath
2082sub customise_for { 2255sub customise_for {
2083 my ($self, $ob) = @_; 2256 my ($self, $ob) = @_;
2084 2257
2085 return find "~" . $ob->name . "/" . $self->{path} 2258 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2259 if $self->per_player;
… …
2102 or next; 2275 or next;
2103 $neigh = find $neigh, $map 2276 $neigh = find $neigh, $map
2104 or next; 2277 or next;
2105 $neigh->load; 2278 $neigh->load;
2106 2279
2280 # now find the diagonal neighbours
2107 push @neigh, 2281 push @neigh,
2108 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2282 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2109 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2283 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2110 } 2284 }
2111 2285
… …
2118} 2292}
2119 2293
2120sub find_sync { 2294sub find_sync {
2121 my ($path, $origin) = @_; 2295 my ($path, $origin) = @_;
2122 2296
2123 cf::sync_job { find $path, $origin } 2297 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2298 if $Coro::current == $Coro::main;
2299
2300 find $path, $origin
2124} 2301}
2125 2302
2126sub do_load_sync { 2303sub do_load_sync {
2127 my ($map) = @_; 2304 my ($map) = @_;
2128 2305
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2306 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main; 2307 if $Coro::current == $Coro::main;
2131 2308
2132 cf::sync_job { $map->load }; 2309 $map->load;
2133} 2310}
2134 2311
2135our %MAP_PREFETCH; 2312our %MAP_PREFETCH;
2136our $MAP_PREFETCHER = undef; 2313our $MAP_PREFETCHER = undef;
2137 2314
2138sub find_async { 2315sub find_async {
2139 my ($path, $origin, $load) = @_; 2316 my ($path, $origin, $load) = @_;
2140 2317
2141 $path = normalise $path, $origin && $origin->{path}; 2318 $path = normalise $path, $origin;
2142 2319
2143 if (my $map = $cf::MAP{$path}) { 2320 if (my $map = $cf::MAP{$path}) {
2144 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2321 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2145 } 2322 }
2146 2323
… …
2163 $MAP_PREFETCHER->prio (6); 2340 $MAP_PREFETCHER->prio (6);
2164 2341
2165 () 2342 ()
2166} 2343}
2167 2344
2345# common code, used by both ->save and ->swapout
2168sub save { 2346sub _save {
2169 my ($self) = @_; 2347 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172 2348
2173 $self->{last_save} = $cf::RUNTIME; 2349 $self->{last_save} = $cf::RUNTIME;
2174 2350
2175 return unless $self->dirty; 2351 return unless $self->dirty;
2176 2352
… …
2196 } else { 2372 } else {
2197 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2373 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2198 } 2374 }
2199} 2375}
2200 2376
2377sub save {
2378 my ($self) = @_;
2379
2380 my $lock = cf::lock_acquire "map_data:$self->{path}";
2381
2382 $self->_save;
2383}
2384
2201sub swap_out { 2385sub swap_out {
2202 my ($self) = @_; 2386 my ($self) = @_;
2203 2387
2204 # save first because save cedes
2205 $self->save;
2206
2207 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2388 my $lock = cf::lock_acquire "map_data:$self->{path}";
2208 2389
2209 return if $self->players;
2210 return if $self->in_memory != cf::MAP_ACTIVE; 2390 return if $self->in_memory != cf::MAP_ACTIVE;
2211 return if $self->{deny_save}; 2391 return if $self->{deny_save};
2392 return if $self->players;
2212 2393
2394 # first deactivate the map and "unlink" it from the core
2395 $self->deactivate;
2396 $_->clear_links_to ($self) for values %cf::MAP;
2213 $self->in_memory (cf::MAP_SWAPPED); 2397 $self->in_memory (cf::MAP_SWAPPED);
2398
2399 # then atomically save
2400 $self->_save;
2401
2402 # then free the map
2403 $self->clear;
2404}
2405
2406sub reset_at {
2407 my ($self) = @_;
2408
2409 # TODO: safety, remove and allow resettable per-player maps
2410 return 1e99 if $self->{deny_reset};
2411
2412 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2413 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2414
2415 $time + $to
2416}
2417
2418sub should_reset {
2419 my ($self) = @_;
2420
2421 $self->reset_at <= $cf::RUNTIME
2422}
2423
2424sub reset {
2425 my ($self) = @_;
2426
2427 my $lock = cf::lock_acquire "map_data:$self->{path}";
2428
2429 return if $self->players;
2430
2431 cf::trace "resetting map ", $self->path, "\n";
2432
2433 $self->in_memory (cf::MAP_SWAPPED);
2434
2435 # need to save uniques path
2436 unless ($self->{deny_save}) {
2437 my $uniq = $self->uniq_path; utf8::encode $uniq;
2438
2439 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2440 if $uniq;
2441 }
2442
2443 delete $cf::MAP{$self->path};
2214 2444
2215 $self->deactivate; 2445 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP; 2446 $_->clear_links_to ($self) for values %cf::MAP;
2217 $self->clear; 2447 $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 2448
2263 $self->unlink_save; 2449 $self->unlink_save;
2264 $self->destroy; 2450 $self->destroy;
2265} 2451}
2266 2452
… …
2274 2460
2275 delete $cf::MAP{$self->path}; 2461 delete $cf::MAP{$self->path};
2276 2462
2277 $self->unlink_save; 2463 $self->unlink_save;
2278 2464
2279 bless $self, "cf::map"; 2465 bless $self, "cf::map::wrap";
2280 delete $self->{deny_reset}; 2466 delete $self->{deny_reset};
2281 $self->{deny_save} = 1; 2467 $self->{deny_save} = 1;
2282 $self->reset_timeout (1); 2468 $self->reset_timeout (1);
2283 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2469 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2284 2470
… …
2514 2700
2515Freezes the player and moves him/her to a special map (C<{link}>). 2701Freezes the player and moves him/her to a special map (C<{link}>).
2516 2702
2517The player should be reasonably safe there for short amounts of time (e.g. 2703The player should be reasonably safe there for short amounts of time (e.g.
2518for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2704for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2519though, as the palyer cannot control the character while it is on the link 2705though, as the player cannot control the character while it is on the link
2520map. 2706map.
2521 2707
2522Will never block. 2708Will never block.
2523 2709
2524=item $player_object->leave_link ($map, $x, $y) 2710=item $player_object->leave_link ($map, $x, $y)
… …
2545sub cf::object::player::enter_link { 2731sub cf::object::player::enter_link {
2546 my ($self) = @_; 2732 my ($self) = @_;
2547 2733
2548 $self->deactivate_recursive; 2734 $self->deactivate_recursive;
2549 2735
2736 ++$self->{_link_recursion};
2737
2550 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2738 return if UNIVERSAL::isa $self->map, "ext::map_link";
2551 2739
2552 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2740 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2553 if $self->map && $self->map->{path} ne "{link}"; 2741 if $self->map && $self->map->{path} ne "{link}";
2554 2742
2555 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2743 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2556} 2744}
2557 2745
2558sub cf::object::player::leave_link { 2746sub cf::object::player::leave_link {
2559 my ($self, $map, $x, $y) = @_; 2747 my ($self, $map, $x, $y) = @_;
2560 2748
… …
2585 $map->load_neighbours; 2773 $map->load_neighbours;
2586 2774
2587 return unless $self->contr->active; 2775 return unless $self->contr->active;
2588 2776
2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2777 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2590 $self->enter_map ($map, $x, $y); 2778 if ($self->enter_map ($map, $x, $y)) {
2591 2779 # entering was successful
2780 delete $self->{_link_recursion};
2592 # only activate afterwards, to support waiting in hooks 2781 # only activate afterwards, to support waiting in hooks
2593 $self->activate_recursive; 2782 $self->activate_recursive;
2594} 2783 }
2595 2784
2785}
2786
2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2787=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2597 2788
2598Moves the player to the given map-path and coordinates by first freezing 2789Moves the player to the given map-path and coordinates by first freezing
2599her, loading and preparing them map, calling the provided $check callback 2790her, loading and preparing them map, calling the provided $check callback
2600that has to return the map if sucecssful, and then unfreezes the player on 2791that has to return the map if sucecssful, and then unfreezes the player on
2601the new (success) or old (failed) map position. In either case, $done will 2792the new (success) or old (failed) map position. In either case, $done will
… …
2608 2799
2609our $GOTOGEN; 2800our $GOTOGEN;
2610 2801
2611sub cf::object::player::goto { 2802sub cf::object::player::goto {
2612 my ($self, $path, $x, $y, $check, $done) = @_; 2803 my ($self, $path, $x, $y, $check, $done) = @_;
2804
2805 if ($self->{_link_recursion} >= $MAX_LINKS) {
2806 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2807 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2808 ($path, $x, $y) = @$EMERGENCY_POSITION;
2809 }
2613 2810
2614 # do generation counting so two concurrent goto's will be executed in-order 2811 # do generation counting so two concurrent goto's will be executed in-order
2615 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2812 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2616 2813
2617 $self->enter_link; 2814 $self->enter_link;
… …
2637 ($path, $x, $y) = (undef, undef, undef); 2834 ($path, $x, $y) = (undef, undef, undef);
2638 } 2835 }
2639 } 2836 }
2640 2837
2641 my $map = eval { 2838 my $map = eval {
2642 my $map = defined $path ? cf::map::find $path : undef; 2839 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2643 2840
2644 if ($map) { 2841 if ($map) {
2645 $map = $map->customise_for ($self); 2842 $map = $map->customise_for ($self);
2646 $map = $check->($map) if $check && $map; 2843 $map = $check->($map, $x, $y, $self) if $check && $map;
2647 } else { 2844 } else {
2648 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2845 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2649 } 2846 }
2650 2847
2651 $map 2848 $map
… …
2659 if ($gen == $self->{_goto_generation}) { 2856 if ($gen == $self->{_goto_generation}) {
2660 delete $self->{_goto_generation}; 2857 delete $self->{_goto_generation};
2661 $self->leave_link ($map, $x, $y); 2858 $self->leave_link ($map, $x, $y);
2662 } 2859 }
2663 2860
2664 $done->() if $done; 2861 $done->($self) if $done;
2665 })->prio (1); 2862 })->prio (1);
2666} 2863}
2667 2864
2668=item $player_object->enter_exit ($exit_object) 2865=item $player_object->enter_exit ($exit_object)
2669 2866
… …
2745 2942
2746 prepare_random_map $exit 2943 prepare_random_map $exit
2747 if $exit->slaying eq "/!"; 2944 if $exit->slaying eq "/!";
2748 } 2945 }
2749 2946
2750 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2947 my $map = cf::map::normalise $exit->slaying, $exit->map;
2751 my $x = $exit->stats->hp; 2948 my $x = $exit->stats->hp;
2752 my $y = $exit->stats->sp; 2949 my $y = $exit->stats->sp;
2753 2950
2754 $self->goto ($map, $x, $y); 2951 $self->goto ($map, $x, $y);
2755 2952
… …
2762 $self->message ("Something went wrong deep within the deliantra server. " 2959 $self->message ("Something went wrong deep within the deliantra server. "
2763 . "I'll try to bring you back to the map you were before. " 2960 . "I'll try to bring you back to the map you were before. "
2764 . "Please report this to the dungeon master!", 2961 . "Please report this to the dungeon master!",
2765 cf::NDI_UNIQUE | cf::NDI_RED); 2962 cf::NDI_UNIQUE | cf::NDI_RED);
2766 2963
2767 warn "ERROR in enter_exit: $@"; 2964 error "ERROR in enter_exit: $@";
2768 $self->leave_link; 2965 $self->leave_link;
2769 } 2966 }
2770 })->prio (1); 2967 })->prio (1);
2771} 2968}
2772 2969
… …
3085 3282
3086 $ns->ext_reply ($reply, @reply) 3283 $ns->ext_reply ($reply, @reply)
3087 if $reply; 3284 if $reply;
3088 3285
3089 } else { 3286 } else {
3090 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3287 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3091 } 3288 }
3092 3289
3093 cf::override; 3290 cf::override;
3094 }, 3291 },
3095); 3292);
… …
3115 3312
3116 $coro 3313 $coro
3117} 3314}
3118 3315
3119cf::client->attach ( 3316cf::client->attach (
3120 on_destroy => sub { 3317 on_client_destroy => sub {
3121 my ($ns) = @_; 3318 my ($ns) = @_;
3122 3319
3123 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3320 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3124 }, 3321 },
3125); 3322);
… …
3176 decrease split destroy change_exp value msg lore send_msg)], 3373 decrease split destroy change_exp value msg lore send_msg)],
3177 ["cf::object::player" => qw(player)], 3374 ["cf::object::player" => qw(player)],
3178 ["cf::player" => qw(peaceful send_msg)], 3375 ["cf::player" => qw(peaceful send_msg)],
3179 ["cf::map" => qw(trigger)], 3376 ["cf::map" => qw(trigger)],
3180) { 3377) {
3181 no strict 'refs';
3182 my ($pkg, @funs) = @$_; 3378 my ($pkg, @funs) = @$_;
3183 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3379 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3184 for @funs; 3380 for @funs;
3185} 3381}
3186 3382
… …
3225 local @cf::_safe_eval_args = values %vars; 3421 local @cf::_safe_eval_args = values %vars;
3226 @res = wantarray ? eval eval : scalar eval $eval; 3422 @res = wantarray ? eval eval : scalar eval $eval;
3227 } 3423 }
3228 3424
3229 if ($@) { 3425 if ($@) {
3230 warn "$@"; 3426 warn "$@",
3231 warn "while executing safe code '$code'\n"; 3427 "while executing safe code '$code'\n",
3232 warn "with arguments " . (join " ", %vars) . "\n"; 3428 "with arguments " . (join " ", %vars) . "\n";
3233 } 3429 }
3234 3430
3235 wantarray ? @res : $res[0] 3431 wantarray ? @res : $res[0]
3236} 3432}
3237 3433
… …
3251=cut 3447=cut
3252 3448
3253sub register_script_function { 3449sub register_script_function {
3254 my ($fun, $cb) = @_; 3450 my ($fun, $cb) = @_;
3255 3451
3256 no strict 'refs'; 3452 $fun = "safe::$fun" if $CFG{safe_eval};
3257 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3453 *$fun = $safe_hole->wrap ($cb);
3258} 3454}
3259 3455
3260=back 3456=back
3261 3457
3262=cut 3458=cut
… …
3271 # for this (global event?) 3467 # for this (global event?)
3272 %ext::player_env::MUSIC_FACE_CACHE = (); 3468 %ext::player_env::MUSIC_FACE_CACHE = ();
3273 3469
3274 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3470 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3275 3471
3276 warn "loading facedata from $path\n"; 3472 trace "loading facedata from $path\n";
3277 3473
3278 my $facedata; 3474 my $facedata = decode_storable load_file $path;
3279 0 < aio_load $path, $facedata
3280 or die "$path: $!";
3281
3282 $facedata = Coro::Storable::thaw $facedata;
3283 3475
3284 $facedata->{version} == 2 3476 $facedata->{version} == 2
3285 or cf::cleanup "$path: version mismatch, cannot proceed."; 3477 or cf::cleanup "$path: version mismatch, cannot proceed.";
3286 3478
3287 # patch in the exptable 3479 # patch in the exptable
3480 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3288 $facedata->{resource}{"res/exp_table"} = { 3481 $facedata->{resource}{"res/exp_table"} = {
3289 type => FT_RSRC, 3482 type => FT_RSRC,
3290 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3483 data => $exp_table,
3484 hash => (Digest::MD5::md5 $exp_table),
3291 }; 3485 };
3292 cf::cede_to_tick; 3486 cf::cede_to_tick;
3293 3487
3294 { 3488 {
3295 my $faces = $facedata->{faceinfo}; 3489 my $faces = $facedata->{faceinfo};
… …
3299 3493
3300 cf::face::set_visibility $idx, $info->{visibility}; 3494 cf::face::set_visibility $idx, $info->{visibility};
3301 cf::face::set_magicmap $idx, $info->{magicmap}; 3495 cf::face::set_magicmap $idx, $info->{magicmap};
3302 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3496 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3303 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3497 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3498 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3304 3499
3305 cf::cede_to_tick; 3500 cf::cede_to_tick;
3306 } 3501 }
3307 3502
3308 while (my ($face, $info) = each %$faces) { 3503 while (my ($face, $info) = each %$faces) {
… …
3313 3508
3314 if (my $smooth = cf::face::find $info->{smooth}) { 3509 if (my $smooth = cf::face::find $info->{smooth}) {
3315 cf::face::set_smooth $idx, $smooth; 3510 cf::face::set_smooth $idx, $smooth;
3316 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3511 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3317 } else { 3512 } else {
3318 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3513 error "smooth face '$info->{smooth}' not found for face '$face'";
3319 } 3514 }
3320 3515
3321 cf::cede_to_tick; 3516 cf::cede_to_tick;
3322 } 3517 }
3323 } 3518 }
… …
3341 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3536 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3342 3537
3343 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3538 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3344 cf::face::set_type $idx, $info->{type}; 3539 cf::face::set_type $idx, $info->{type};
3345 } else { 3540 } else {
3346 $RESOURCE{$name} = $info; 3541 $RESOURCE{$name} = $info; # unused
3347 } 3542 }
3348 3543
3349 cf::cede_to_tick; 3544 cf::cede_to_tick;
3350 } 3545 }
3351 } 3546 }
3352 3547
3353 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3548 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3354 3549
3355 1 3550 1
3356} 3551}
3357
3358cf::global->attach (on_resource_update => sub {
3359 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3360 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3361
3362 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3363 my $sound = $soundconf->{compat}[$_]
3364 or next;
3365
3366 my $face = cf::face::find "sound/$sound->[1]";
3367 cf::sound::set $sound->[0] => $face;
3368 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3369 }
3370
3371 while (my ($k, $v) = each %{$soundconf->{event}}) {
3372 my $face = cf::face::find "sound/$v";
3373 cf::sound::set $k => $face;
3374 }
3375 }
3376});
3377 3552
3378register_exticmd fx_want => sub { 3553register_exticmd fx_want => sub {
3379 my ($ns, $want) = @_; 3554 my ($ns, $want) = @_;
3380 3555
3381 while (my ($k, $v) = each %$want) { 3556 while (my ($k, $v) = each %$want) {
… …
3420sub reload_treasures { 3595sub reload_treasures {
3421 load_resource_file "$DATADIR/treasures" 3596 load_resource_file "$DATADIR/treasures"
3422 or die "unable to load treasurelists\n"; 3597 or die "unable to load treasurelists\n";
3423} 3598}
3424 3599
3600sub reload_sound {
3601 trace "loading sound config from $DATADIR/sound\n";
3602
3603 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3604
3605 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3606 my $sound = $soundconf->{compat}[$_]
3607 or next;
3608
3609 my $face = cf::face::find "sound/$sound->[1]";
3610 cf::sound::set $sound->[0] => $face;
3611 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3612 }
3613
3614 while (my ($k, $v) = each %{$soundconf->{event}}) {
3615 my $face = cf::face::find "sound/$v";
3616 cf::sound::set $k => $face;
3617 }
3618}
3619
3425sub reload_resources { 3620sub reload_resources {
3426 warn "reloading resource files...\n"; 3621 trace "reloading resource files...\n";
3427 3622
3623 reload_exp_table;
3624 reload_materials;
3428 reload_facedata; 3625 reload_facedata;
3626 reload_sound;
3429 reload_archetypes; 3627 reload_archetypes;
3430 reload_regions; 3628 reload_regions;
3431 reload_treasures; 3629 reload_treasures;
3432 3630
3433 warn "finished reloading resource files\n"; 3631 trace "finished reloading resource files\n";
3434} 3632}
3435 3633
3436sub reload_config { 3634sub reload_config {
3437 warn "reloading config file...\n"; 3635 trace "reloading config file...\n";
3438 3636
3439 open my $fh, "<:utf8", "$CONFDIR/config" 3637 my $config = load_file "$CONFDIR/config";
3440 or return; 3638 utf8::decode $config;
3639 *CFG = decode_yaml $config;
3441 3640
3442 local $/;
3443 *CFG = YAML::XS::Load scalar <$fh>;
3444
3445 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3641 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3446 3642
3447 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3643 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3448 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3644 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3449 3645
3450 if (exists $CFG{mlockall}) { 3646 if (exists $CFG{mlockall}) {
… …
3452 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3648 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3453 and die "WARNING: m(un)lockall failed: $!\n"; 3649 and die "WARNING: m(un)lockall failed: $!\n";
3454 }; 3650 };
3455 warn $@ if $@; 3651 warn $@ if $@;
3456 } 3652 }
3457
3458 warn "finished reloading resource files\n";
3459} 3653}
3460 3654
3461sub pidfile() { 3655sub pidfile() {
3462 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3656 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3463 or die "$PIDFILE: $!"; 3657 or die "$PIDFILE: $!";
… …
3476 seek $fh, 0, 0; 3670 seek $fh, 0, 0;
3477 print $fh $$; 3671 print $fh $$;
3478} 3672}
3479 3673
3480sub main_loop { 3674sub main_loop {
3481 warn "EV::loop starting\n"; 3675 trace "EV::loop starting\n";
3482 if (1) { 3676 if (1) {
3483 EV::loop; 3677 EV::loop;
3484 } 3678 }
3485 warn "EV::loop returned\n"; 3679 trace "EV::loop returned\n";
3486 goto &main_loop unless $REALLY_UNLOOP; 3680 goto &main_loop unless $REALLY_UNLOOP;
3487} 3681}
3488 3682
3489sub main { 3683sub main {
3490 cf::init_globals; # initialise logging 3684 cf::init_globals; # initialise logging
3491 3685
3492 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3686 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3493 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3687 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3494 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3688 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3495 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3689 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3496
3497 cf::init_experience;
3498 cf::init_anim;
3499 cf::init_attackmess;
3500 cf::init_dynamic;
3501 3690
3502 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3691 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3503 3692
3504 # we must not ever block the main coroutine 3693 # we must not ever block the main coroutine
3505 local $Coro::idle = sub { 3694 local $Coro::idle = sub {
… …
3511 }; 3700 };
3512 3701
3513 evthread_start IO::AIO::poll_fileno; 3702 evthread_start IO::AIO::poll_fileno;
3514 3703
3515 cf::sync_job { 3704 cf::sync_job {
3705 cf::incloader::init ();
3706
3707 cf::init_anim;
3708 cf::init_attackmess;
3709 cf::init_dynamic;
3710
3516 cf::load_settings; 3711 cf::load_settings;
3517 cf::load_materials;
3518 3712
3519 reload_resources; 3713 reload_resources;
3520 reload_config; 3714 reload_config;
3521 db_init; 3715 db_init;
3522 3716
3523 cf::init_uuid; 3717 cf::init_uuid;
3524 cf::init_signals; 3718 cf::init_signals;
3525 cf::init_commands;
3526 cf::init_skills; 3719 cf::init_skills;
3527 3720
3528 cf::init_beforeplay; 3721 cf::init_beforeplay;
3529 3722
3530 atomic; 3723 atomic;
… …
3535 3728
3536 # no (long-running) fork's whatsoever before this point(!) 3729 # no (long-running) fork's whatsoever before this point(!)
3537 use POSIX (); 3730 use POSIX ();
3538 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3731 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3539 3732
3540 (pop @POST_INIT)->(0) while @POST_INIT; 3733 cf::_post_init 0;
3541 }; 3734 };
3542 3735
3736 cf::object::thawer::errors_are_fatal 0;
3737 info "parse errors in files are no longer fatal from this point on.\n";
3738
3739 my $free_main; $free_main = EV::idle sub {
3740 undef $free_main;
3741 undef &main; # free gobs of memory :)
3742 };
3743
3543 main_loop; 3744 goto &main_loop;
3544} 3745}
3545 3746
3546############################################################################# 3747#############################################################################
3547# initialisation and cleanup 3748# initialisation and cleanup
3548 3749
3549# install some emergency cleanup handlers 3750# install some emergency cleanup handlers
3550BEGIN { 3751BEGIN {
3551 our %SIGWATCHER = (); 3752 our %SIGWATCHER = ();
3552 for my $signal (qw(INT HUP TERM)) { 3753 for my $signal (qw(INT HUP TERM)) {
3553 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3754 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3554 cf::cleanup "SIG$signal"; 3755 cf::cleanup "SIG$signal";
3555 }; 3756 };
3556 } 3757 }
3557} 3758}
3558 3759
3559sub write_runtime_sync { 3760sub write_runtime_sync {
3761 my $t0 = AE::time;
3762
3560 # first touch the runtime file to show we are still running: 3763 # first touch the runtime file to show we are still running:
3561 # the fsync below can take a very very long time. 3764 # the fsync below can take a very very long time.
3562 3765
3563 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3766 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3564 3767
3565 my $guard = cf::lock_acquire "write_runtime"; 3768 my $guard = cf::lock_acquire "write_runtime";
3566 3769
3567 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3770 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3568 or return; 3771 or return;
3569 3772
3570 my $value = $cf::RUNTIME + 90 + 10; 3773 my $value = $cf::RUNTIME + 90 + 10;
3571 # 10 is the runtime save interval, for a monotonic clock 3774 # 10 is the runtime save interval, for a monotonic clock
3572 # 60 allows for the watchdog to kill the server. 3775 # 60 allows for the watchdog to kill the server.
… …
3585 or return; 3788 or return;
3586 3789
3587 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3790 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3588 and return; 3791 and return;
3589 3792
3590 warn "runtime file written.\n"; 3793 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3591 3794
3592 1 3795 1
3593} 3796}
3594 3797
3595our $uuid_lock; 3798our $uuid_lock;
… …
3607 or return; 3810 or return;
3608 3811
3609 my $value = uuid_seq uuid_cur; 3812 my $value = uuid_seq uuid_cur;
3610 3813
3611 unless ($value) { 3814 unless ($value) {
3612 warn "cowardly refusing to write zero uuid value!\n"; 3815 info "cowardly refusing to write zero uuid value!\n";
3613 return; 3816 return;
3614 } 3817 }
3615 3818
3616 my $value = uuid_str $value + $uuid_skip; 3819 my $value = uuid_str $value + $uuid_skip;
3617 $uuid_skip = 0; 3820 $uuid_skip = 0;
… …
3627 or return; 3830 or return;
3628 3831
3629 aio_rename "$uuid~", $uuid 3832 aio_rename "$uuid~", $uuid
3630 and return; 3833 and return;
3631 3834
3632 warn "uuid file written ($value).\n"; 3835 trace "uuid file written ($value).\n";
3633 3836
3634 1 3837 1
3635 3838
3636} 3839}
3637 3840
… …
3643} 3846}
3644 3847
3645sub emergency_save() { 3848sub emergency_save() {
3646 my $freeze_guard = cf::freeze_mainloop; 3849 my $freeze_guard = cf::freeze_mainloop;
3647 3850
3648 warn "emergency_perl_save: enter\n"; 3851 info "emergency_perl_save: enter\n";
3852
3853 # this is a trade-off: we want to be very quick here, so
3854 # save all maps without fsync, and later call a global sync
3855 # (which in turn might be very very slow)
3856 local $USE_FSYNC = 0;
3649 3857
3650 cf::sync_job { 3858 cf::sync_job {
3651 # this is a trade-off: we want to be very quick here, so 3859 cf::write_runtime_sync; # external watchdog should not bark
3652 # save all maps without fsync, and later call a global sync
3653 # (which in turn might be very very slow)
3654 local $USE_FSYNC = 0;
3655 3860
3656 # use a peculiar iteration method to avoid tripping on perl 3861 # use a peculiar iteration method to avoid tripping on perl
3657 # refcount bugs in for. also avoids problems with players 3862 # refcount bugs in for. also avoids problems with players
3658 # and maps saved/destroyed asynchronously. 3863 # and maps saved/destroyed asynchronously.
3659 warn "emergency_perl_save: begin player save\n"; 3864 info "emergency_perl_save: begin player save\n";
3660 for my $login (keys %cf::PLAYER) { 3865 for my $login (keys %cf::PLAYER) {
3661 my $pl = $cf::PLAYER{$login} or next; 3866 my $pl = $cf::PLAYER{$login} or next;
3662 $pl->valid or next; 3867 $pl->valid or next;
3663 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3868 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3664 $pl->save; 3869 $pl->save;
3665 } 3870 }
3666 warn "emergency_perl_save: end player save\n"; 3871 info "emergency_perl_save: end player save\n";
3667 3872
3873 cf::write_runtime_sync; # external watchdog should not bark
3874
3668 warn "emergency_perl_save: begin map save\n"; 3875 info "emergency_perl_save: begin map save\n";
3669 for my $path (keys %cf::MAP) { 3876 for my $path (keys %cf::MAP) {
3670 my $map = $cf::MAP{$path} or next; 3877 my $map = $cf::MAP{$path} or next;
3671 $map->valid or next; 3878 $map->valid or next;
3672 $map->save; 3879 $map->save;
3673 } 3880 }
3674 warn "emergency_perl_save: end map save\n"; 3881 info "emergency_perl_save: end map save\n";
3675 3882
3883 cf::write_runtime_sync; # external watchdog should not bark
3884
3676 warn "emergency_perl_save: begin database checkpoint\n"; 3885 info "emergency_perl_save: begin database checkpoint\n";
3677 BDB::db_env_txn_checkpoint $DB_ENV; 3886 BDB::db_env_txn_checkpoint $DB_ENV;
3678 warn "emergency_perl_save: end database checkpoint\n"; 3887 info "emergency_perl_save: end database checkpoint\n";
3679 3888
3680 warn "emergency_perl_save: begin write uuid\n"; 3889 info "emergency_perl_save: begin write uuid\n";
3681 write_uuid_sync 1; 3890 write_uuid_sync 1;
3682 warn "emergency_perl_save: end write uuid\n"; 3891 info "emergency_perl_save: end write uuid\n";
3892
3893 cf::write_runtime_sync; # external watchdog should not bark
3894
3895 trace "emergency_perl_save: syncing database to disk";
3896 BDB::db_env_txn_checkpoint $DB_ENV;
3897
3898 info "emergency_perl_save: starting sync\n";
3899 IO::AIO::aio_sync sub {
3900 info "emergency_perl_save: finished sync\n";
3901 };
3902
3903 cf::write_runtime_sync; # external watchdog should not bark
3904
3905 trace "emergency_perl_save: flushing outstanding aio requests";
3906 while (IO::AIO::nreqs || BDB::nreqs) {
3907 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3908 }
3909
3910 cf::write_runtime_sync; # external watchdog should not bark
3683 }; 3911 };
3684 3912
3685 warn "emergency_perl_save: starting sync()\n";
3686 IO::AIO::aio_sync sub {
3687 warn "emergency_perl_save: finished sync()\n";
3688 };
3689
3690 warn "emergency_perl_save: leave\n"; 3913 info "emergency_perl_save: leave\n";
3691} 3914}
3692 3915
3693sub post_cleanup { 3916sub post_cleanup {
3694 my ($make_core) = @_; 3917 my ($make_core) = @_;
3695 3918
3919 IO::AIO::flush;
3920
3696 warn Carp::longmess "post_cleanup backtrace" 3921 error Carp::longmess "post_cleanup backtrace"
3697 if $make_core; 3922 if $make_core;
3698 3923
3699 my $fh = pidfile; 3924 my $fh = pidfile;
3700 unlink $PIDFILE if <$fh> == $$; 3925 unlink $PIDFILE if <$fh> == $$;
3701} 3926}
… …
3721 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3946 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3722 for my $name (keys %$leaf_symtab) { 3947 for my $name (keys %$leaf_symtab) {
3723 _gv_clear *{"$pkg$name"}; 3948 _gv_clear *{"$pkg$name"};
3724# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3949# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3725 } 3950 }
3726 warn "cleared package $pkg\n";#d#
3727} 3951}
3728 3952
3729sub do_reload_perl() { 3953sub do_reload_perl() {
3730 # can/must only be called in main 3954 # can/must only be called in main
3731 if ($Coro::current != $Coro::main) { 3955 unless (in_main) {
3732 warn "can only reload from main coroutine"; 3956 error "can only reload from main coroutine";
3733 return; 3957 return;
3734 } 3958 }
3735 3959
3736 return if $RELOAD++; 3960 return if $RELOAD++;
3737 3961
3738 my $t1 = EV::time; 3962 my $t1 = AE::time;
3739 3963
3740 while ($RELOAD) { 3964 while ($RELOAD) {
3741 warn "reloading..."; 3965 cf::get_slot 0.1, -1, "reload_perl";
3966 info "perl_reload: reloading...";
3742 3967
3743 warn "entering sync_job"; 3968 trace "perl_reload: entering sync_job";
3744 3969
3745 cf::sync_job { 3970 cf::sync_job {
3746 cf::write_runtime_sync; # external watchdog should not bark
3747 cf::emergency_save; 3971 #cf::emergency_save;
3748 cf::write_runtime_sync; # external watchdog should not bark
3749 3972
3750 warn "syncing database to disk";
3751 BDB::db_env_txn_checkpoint $DB_ENV;
3752
3753 # if anything goes wrong in here, we should simply crash as we already saved
3754
3755 warn "flushing outstanding aio requests";
3756 while (IO::AIO::nreqs || BDB::nreqs) {
3757 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3758 }
3759
3760 warn "cancelling all extension coros"; 3973 trace "perl_reload: cancelling all extension coros";
3761 $_->cancel for values %EXT_CORO; 3974 $_->cancel for values %EXT_CORO;
3762 %EXT_CORO = (); 3975 %EXT_CORO = ();
3763 3976
3764 warn "removing commands"; 3977 trace "perl_reload: removing commands";
3765 %COMMAND = (); 3978 %COMMAND = ();
3766 3979
3767 warn "removing ext/exti commands"; 3980 trace "perl_reload: removing ext/exti commands";
3768 %EXTCMD = (); 3981 %EXTCMD = ();
3769 %EXTICMD = (); 3982 %EXTICMD = ();
3770 3983
3771 warn "unloading/nuking all extensions"; 3984 trace "perl_reload: unloading/nuking all extensions";
3772 for my $pkg (@EXTS) { 3985 for my $pkg (@EXTS) {
3773 warn "... unloading $pkg"; 3986 trace "... unloading $pkg";
3774 3987
3775 if (my $cb = $pkg->can ("unload")) { 3988 if (my $cb = $pkg->can ("unload")) {
3776 eval { 3989 eval {
3777 $cb->($pkg); 3990 $cb->($pkg);
3778 1 3991 1
3779 } or warn "$pkg unloaded, but with errors: $@"; 3992 } or error "$pkg unloaded, but with errors: $@";
3780 } 3993 }
3781 3994
3782 warn "... clearing $pkg"; 3995 trace "... clearing $pkg";
3783 clear_package $pkg; 3996 clear_package $pkg;
3784 } 3997 }
3785 3998
3786 warn "unloading all perl modules loaded from $LIBDIR"; 3999 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3787 while (my ($k, $v) = each %INC) { 4000 while (my ($k, $v) = each %INC) {
3788 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4001 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3789 4002
3790 warn "... unloading $k"; 4003 trace "... unloading $k";
3791 delete $INC{$k}; 4004 delete $INC{$k};
3792 4005
3793 $k =~ s/\.pm$//; 4006 $k =~ s/\.pm$//;
3794 $k =~ s/\//::/g; 4007 $k =~ s/\//::/g;
3795 4008
… …
3798 } 4011 }
3799 4012
3800 clear_package $k; 4013 clear_package $k;
3801 } 4014 }
3802 4015
3803 warn "getting rid of safe::, as good as possible"; 4016 trace "perl_reload: getting rid of safe::, as good as possible";
3804 clear_package "safe::$_" 4017 clear_package "safe::$_"
3805 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4018 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3806 4019
3807 warn "unloading cf.pm \"a bit\""; 4020 trace "perl_reload: unloading cf.pm \"a bit\"";
3808 delete $INC{"cf.pm"}; 4021 delete $INC{"cf.pm"};
3809 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4022 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3810 4023
3811 # don't, removes xs symbols, too, 4024 # don't, removes xs symbols, too,
3812 # and global variables created in xs 4025 # and global variables created in xs
3813 #clear_package __PACKAGE__; 4026 #clear_package __PACKAGE__;
3814 4027
3815 warn "unload completed, starting to reload now"; 4028 info "perl_reload: unload completed, starting to reload now";
3816 4029
3817 warn "reloading cf.pm"; 4030 trace "perl_reload: reloading cf.pm";
3818 require cf; 4031 require cf;
3819 cf::_connect_to_perl_1; 4032 cf::_connect_to_perl_1;
3820 4033
3821 warn "loading config and database again"; 4034 trace "perl_reload: loading config and database again";
3822 cf::reload_config; 4035 cf::reload_config;
3823 4036
3824 warn "loading extensions"; 4037 trace "perl_reload: loading extensions";
3825 cf::load_extensions; 4038 cf::load_extensions;
3826 4039
3827 if ($REATTACH_ON_RELOAD) { 4040 if ($REATTACH_ON_RELOAD) {
3828 warn "reattaching attachments to objects/players"; 4041 trace "perl_reload: reattaching attachments to objects/players";
3829 _global_reattach; # objects, sockets 4042 _global_reattach; # objects, sockets
3830 warn "reattaching attachments to maps"; 4043 trace "perl_reload: reattaching attachments to maps";
3831 reattach $_ for values %MAP; 4044 reattach $_ for values %MAP;
3832 warn "reattaching attachments to players"; 4045 trace "perl_reload: reattaching attachments to players";
3833 reattach $_ for values %PLAYER; 4046 reattach $_ for values %PLAYER;
3834 } 4047 }
3835 4048
3836 warn "running post_init jobs"; 4049 cf::_post_init 1;
3837 (pop @POST_INIT)->(1) while @POST_INIT;
3838 4050
3839 warn "leaving sync_job"; 4051 trace "perl_reload: leaving sync_job";
3840 4052
3841 1 4053 1
3842 } or do { 4054 } or do {
3843 warn $@; 4055 error $@;
3844 cf::cleanup "error while reloading, exiting."; 4056 cf::cleanup "perl_reload: error, exiting.";
3845 }; 4057 };
3846 4058
3847 warn "reloaded";
3848 --$RELOAD; 4059 --$RELOAD;
3849 } 4060 }
3850 4061
3851 $t1 = EV::time - $t1; 4062 $t1 = AE::time - $t1;
3852 warn "reload completed in ${t1}s\n"; 4063 info "perl_reload: completed in ${t1}s\n";
3853}; 4064};
3854 4065
3855our $RELOAD_WATCHER; # used only during reload 4066our $RELOAD_WATCHER; # used only during reload
3856 4067
3857sub reload_perl() { 4068sub reload_perl() {
… …
3859 # coro crashes during coro_state_free->destroy here. 4070 # coro crashes during coro_state_free->destroy here.
3860 4071
3861 $RELOAD_WATCHER ||= cf::async { 4072 $RELOAD_WATCHER ||= cf::async {
3862 Coro::AIO::aio_wait cache_extensions; 4073 Coro::AIO::aio_wait cache_extensions;
3863 4074
3864 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4075 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3865 do_reload_perl; 4076 do_reload_perl;
3866 undef $RELOAD_WATCHER; 4077 undef $RELOAD_WATCHER;
3867 }; 4078 };
3868 }; 4079 };
3869} 4080}
… …
3878 reload_perl; 4089 reload_perl;
3879 }; 4090 };
3880 } 4091 }
3881}; 4092};
3882 4093
3883unshift @INC, $LIBDIR; 4094#############################################################################
3884 4095
3885my $bug_warning = 0; 4096my $bug_warning = 0;
3886 4097
3887our @WAIT_FOR_TICK; 4098our @WAIT_FOR_TICK;
3888our @WAIT_FOR_TICK_BEGIN; 4099our @WAIT_FOR_TICK_BEGIN;
3889 4100
3890sub wait_for_tick { 4101sub wait_for_tick() {
3891 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4102 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3892 4103
3893 my $signal = new Coro::Signal; 4104 my $signal = new Coro::Signal;
3894 push @WAIT_FOR_TICK, $signal; 4105 push @WAIT_FOR_TICK, $signal;
3895 $signal->wait; 4106 $signal->wait;
3896} 4107}
3897 4108
3898sub wait_for_tick_begin { 4109sub wait_for_tick_begin() {
3899 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4110 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3900 4111
3901 my $signal = new Coro::Signal; 4112 my $signal = new Coro::Signal;
3902 push @WAIT_FOR_TICK_BEGIN, $signal; 4113 push @WAIT_FOR_TICK_BEGIN, $signal;
3903 $signal->wait; 4114 $signal->wait;
… …
3910 return; 4121 return;
3911 } 4122 }
3912 4123
3913 cf::server_tick; # one server iteration 4124 cf::server_tick; # one server iteration
3914 4125
4126 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4127
3915 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4128 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3916 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4129 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3917 Coro::async_pool { 4130 Coro::async_pool {
3918 $Coro::current->{desc} = "runtime saver"; 4131 $Coro::current->{desc} = "runtime saver";
3919 write_runtime_sync 4132 write_runtime_sync
3920 or warn "ERROR: unable to write runtime file: $!"; 4133 or error "ERROR: unable to write runtime file: $!";
3921 }; 4134 };
3922 } 4135 }
3923 4136
3924 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4137 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3925 $sig->send; 4138 $sig->send;
… …
3933 4146
3934 if (0) { 4147 if (0) {
3935 if ($NEXT_TICK) { 4148 if ($NEXT_TICK) {
3936 my $jitter = $TICK_START - $NEXT_TICK; 4149 my $jitter = $TICK_START - $NEXT_TICK;
3937 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4150 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3938 warn "jitter $JITTER\n";#d# 4151 debug "jitter $JITTER\n";#d#
3939 } 4152 }
3940 } 4153 }
3941} 4154}
3942 4155
3943{ 4156{
3944 # configure BDB 4157 # configure BDB
3945 4158
3946 BDB::min_parallel 8; 4159 BDB::min_parallel 16;
3947 BDB::max_poll_reqs $TICK * 0.1; 4160 BDB::max_poll_reqs $TICK * 0.1;
3948 $AnyEvent::BDB::WATCHER->priority (1); 4161 $AnyEvent::BDB::WATCHER->priority (1);
3949 4162
3950 unless ($DB_ENV) { 4163 unless ($DB_ENV) {
3951 $DB_ENV = BDB::db_env_create; 4164 $DB_ENV = BDB::db_env_create;
… …
3988 IO::AIO::min_parallel 8; 4201 IO::AIO::min_parallel 8;
3989 IO::AIO::max_poll_time $TICK * 0.1; 4202 IO::AIO::max_poll_time $TICK * 0.1;
3990 undef $AnyEvent::AIO::WATCHER; 4203 undef $AnyEvent::AIO::WATCHER;
3991} 4204}
3992 4205
3993my $_log_backtrace; 4206our $_log_backtrace;
4207our $_log_backtrace_last;
3994 4208
3995sub _log_backtrace { 4209sub _log_backtrace {
3996 my ($msg, @addr) = @_; 4210 my ($msg, @addr) = @_;
3997 4211
3998 $msg =~ s/\n//; 4212 $msg =~ s/\n$//;
3999 4213
4214 if ($_log_backtrace_last eq $msg) {
4215 LOG llevInfo, "[ABT] $msg\n";
4216 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4000 # limit the # of concurrent backtraces 4217 # limit the # of concurrent backtraces
4001 if ($_log_backtrace < 2) { 4218 } elsif ($_log_backtrace < 2) {
4219 $_log_backtrace_last = $msg;
4002 ++$_log_backtrace; 4220 ++$_log_backtrace;
4003 my $perl_bt = Carp::longmess $msg; 4221 my $perl_bt = Carp::longmess $msg;
4004 async { 4222 async {
4005 $Coro::current->{desc} = "abt $msg"; 4223 $Coro::current->{desc} = "abt $msg";
4006 4224
… …
4026 LOG llevInfo, "[ABT] $_\n" for @bt; 4244 LOG llevInfo, "[ABT] $_\n" for @bt;
4027 --$_log_backtrace; 4245 --$_log_backtrace;
4028 }; 4246 };
4029 } else { 4247 } else {
4030 LOG llevInfo, "[ABT] $msg\n"; 4248 LOG llevInfo, "[ABT] $msg\n";
4031 LOG llevInfo, "[ABT] [suppressed]\n"; 4249 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4032 } 4250 }
4033} 4251}
4034 4252
4035# load additional modules 4253# load additional modules
4036require "cf/$_.pm" for @EXTRA_MODULES; 4254require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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