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.560 by root, Fri Apr 22 02:03:12 2011 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 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 }
1430 } 1561 }
1431 }; 1562 };
1432} 1563}
1433 1564
1434############################################################################# 1565#############################################################################
… …
1518 $cf::PLAYER{$login} = $pl 1649 $cf::PLAYER{$login} = $pl
1519 } 1650 }
1520 } 1651 }
1521} 1652}
1522 1653
1654cf::player->attach (
1655 on_load => sub {
1656 my ($pl, $path) = @_;
1657
1658 # restore slots saved in save, below
1659 my $slots = delete $pl->{_slots};
1660
1661 $pl->ob->current_weapon ($slots->[0]);
1662 $pl->combat_ob ($slots->[1]);
1663 $pl->ranged_ob ($slots->[2]);
1664 },
1665);
1666
1523sub save($) { 1667sub save($) {
1524 my ($pl) = @_; 1668 my ($pl) = @_;
1525 1669
1526 return if $pl->{deny_save}; 1670 return if $pl->{deny_save};
1527 1671
… …
1532 1676
1533 aio_mkdir playerdir $pl, 0770; 1677 aio_mkdir playerdir $pl, 0770;
1534 $pl->{last_save} = $cf::RUNTIME; 1678 $pl->{last_save} = $cf::RUNTIME;
1535 1679
1536 cf::get_slot 0.01; 1680 cf::get_slot 0.01;
1681
1682 # save slots, to be restored later
1683 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1537 1684
1538 $pl->save_pl ($path); 1685 $pl->save_pl ($path);
1539 cf::cede_to_tick; 1686 cf::cede_to_tick;
1540} 1687}
1541 1688
… …
1575 my $name = $pl->ob->name; 1722 my $name = $pl->ob->name;
1576 1723
1577 $pl->{deny_save} = 1; 1724 $pl->{deny_save} = 1;
1578 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1725 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1579 1726
1580 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1727 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1581 $pl->deactivate; 1728 $pl->deactivate;
1729
1582 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1730 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1583 $pl->ob->check_score;
1584 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1731 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1732 ext::highscore::check ($pl->ob);
1733
1585 $pl->ns->destroy if $pl->ns; 1734 $pl->ns->destroy if $pl->ns;
1586 1735
1587 my $path = playerdir $pl; 1736 my $path = playerdir $pl;
1588 my $temp = "$path~$cf::RUNTIME~deleting~"; 1737 my $temp = "$path~$cf::RUNTIME~deleting~";
1589 aio_rename $path, $temp; 1738 aio_rename $path, $temp;
… …
1643 \@logins 1792 \@logins
1644} 1793}
1645 1794
1646=item $player->maps 1795=item $player->maps
1647 1796
1797=item cf::player::maps $login
1798
1648Returns an arrayref of map paths that are private for this 1799Returns an arrayref of map paths that are private for this
1649player. May block. 1800player. May block.
1650 1801
1651=cut 1802=cut
1652 1803
… …
1714=cut 1865=cut
1715 1866
1716sub find_by_path($) { 1867sub find_by_path($) {
1717 my ($path) = @_; 1868 my ($path) = @_;
1718 1869
1870 $path =~ s/^~[^\/]*//; # skip ~login
1871
1719 my ($match, $specificity); 1872 my ($match, $specificity);
1720 1873
1721 for my $region (list) { 1874 for my $region (list) {
1722 if ($region->{match} && $path =~ $region->{match}) { 1875 if ($region->{match} && $path =~ $region->{match}) {
1723 ($match, $specificity) = ($region, $region->specificity) 1876 ($match, $specificity) = ($region, $region->specificity)
… …
1751sub generate_random_map { 1904sub generate_random_map {
1752 my ($self, $rmp) = @_; 1905 my ($self, $rmp) = @_;
1753 1906
1754 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1907 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1755 1908
1756 # mit "rum" bekleckern, nicht
1757 $self->_create_random_map ( 1909 $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} 1910}
1771 1911
1772=item cf::map->register ($regex, $prio) 1912=item cf::map->register ($regex, $prio)
1773 1913
1774Register a handler for the map path matching the given regex at the 1914Register a handler for the map path matching the given regex at the
… …
1779 1919
1780sub register { 1920sub register {
1781 my (undef, $regex, $prio) = @_; 1921 my (undef, $regex, $prio) = @_;
1782 my $pkg = caller; 1922 my $pkg = caller;
1783 1923
1784 no strict;
1785 push @{"$pkg\::ISA"}, __PACKAGE__; 1924 push @{"$pkg\::ISA"}, __PACKAGE__;
1786 1925
1787 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1926 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1788} 1927}
1789 1928
1790# also paths starting with '/' 1929# also paths starting with '/'
1791$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1930$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1792 1931
1793sub thawer_merge { 1932sub thawer_merge {
1794 my ($self, $merge) = @_; 1933 my ($self, $merge) = @_;
1795 1934
1796 # we have to keep some variables in memory intact 1935 # we have to keep some variables in memory intact
… …
1801} 1940}
1802 1941
1803sub normalise { 1942sub normalise {
1804 my ($path, $base) = @_; 1943 my ($path, $base) = @_;
1805 1944
1806 $path = "$path"; # make sure its a string 1945 $path = "$path"; # make sure it's a string
1807 1946
1808 $path =~ s/\.map$//; 1947 $path =~ s/\.map$//;
1809 1948
1810 # map plan: 1949 # map plan:
1811 # 1950 #
… …
1826 $base =~ s{[^/]+/?$}{}; 1965 $base =~ s{[^/]+/?$}{};
1827 $path = "$base/$path"; 1966 $path = "$base/$path";
1828 } 1967 }
1829 1968
1830 for ($path) { 1969 for ($path) {
1831 redo if s{//}{/};
1832 redo if s{/\.?/}{/}; 1970 redo if s{/\.?/}{/};
1833 redo if s{/[^/]+/\.\./}{/}; 1971 redo if s{/[^/]+/\.\./}{/};
1834 } 1972 }
1835 1973
1836 $path 1974 $path
… …
1850 $self->init; # pass $1 etc. 1988 $self->init; # pass $1 etc.
1851 return $self; 1989 return $self;
1852 } 1990 }
1853 } 1991 }
1854 1992
1855 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1993 Carp::cluck "unable to resolve path '$path' (base '$base')";
1856 () 1994 ()
1857} 1995}
1858 1996
1859sub init { 1997sub init {
1860 my ($self) = @_; 1998 my ($self) = @_;
… …
1982} 2120}
1983 2121
1984sub find; 2122sub find;
1985sub find { 2123sub find {
1986 my ($path, $origin) = @_; 2124 my ($path, $origin) = @_;
2125
2126 cf::cede_to_tick;
1987 2127
1988 $path = normalise $path, $origin && $origin->path; 2128 $path = normalise $path, $origin && $origin->path;
1989 2129
1990 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2130 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1991 my $guard2 = cf::lock_acquire "map_find:$path"; 2131 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2010 2150
2011 $cf::MAP{$path} = $map 2151 $cf::MAP{$path} = $map
2012 } 2152 }
2013} 2153}
2014 2154
2015sub pre_load { } 2155sub pre_load { }
2016sub post_load { } 2156#sub post_load { } # XS
2017 2157
2018sub load { 2158sub load {
2019 my ($self) = @_; 2159 my ($self) = @_;
2020 2160
2021 local $self->{deny_reset} = 1; # loading can take a long time 2161 local $self->{deny_reset} = 1; # loading can take a long time
… …
2076 2216
2077 $self->in_memory (cf::MAP_ACTIVE); 2217 $self->in_memory (cf::MAP_ACTIVE);
2078 } 2218 }
2079 2219
2080 $self->post_load; 2220 $self->post_load;
2081}
2082 2221
2222 1
2223}
2224
2225# customize the map for a given player, i.e.
2226# return the _real_ map. used by e.g. per-player
2227# maps to change the path to ~playername/mappath
2083sub customise_for { 2228sub customise_for {
2084 my ($self, $ob) = @_; 2229 my ($self, $ob) = @_;
2085 2230
2086 return find "~" . $ob->name . "/" . $self->{path} 2231 return find "~" . $ob->name . "/" . $self->{path}
2087 if $self->per_player; 2232 if $self->per_player;
… …
2103 or next; 2248 or next;
2104 $neigh = find $neigh, $map 2249 $neigh = find $neigh, $map
2105 or next; 2250 or next;
2106 $neigh->load; 2251 $neigh->load;
2107 2252
2253 # now find the diagonal neighbours
2108 push @neigh, 2254 push @neigh,
2109 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2255 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2110 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2256 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2111 } 2257 }
2112 2258
… …
2119} 2265}
2120 2266
2121sub find_sync { 2267sub find_sync {
2122 my ($path, $origin) = @_; 2268 my ($path, $origin) = @_;
2123 2269
2124 cf::sync_job { find $path, $origin } 2270 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2271 if $Coro::current == $Coro::main;
2272
2273 find $path, $origin
2125} 2274}
2126 2275
2127sub do_load_sync { 2276sub do_load_sync {
2128 my ($map) = @_; 2277 my ($map) = @_;
2129 2278
2130 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2279 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2131 if $Coro::current == $Coro::main; 2280 if $Coro::current == $Coro::main;
2132 2281
2133 cf::sync_job { $map->load }; 2282 $map->load;
2134} 2283}
2135 2284
2136our %MAP_PREFETCH; 2285our %MAP_PREFETCH;
2137our $MAP_PREFETCHER = undef; 2286our $MAP_PREFETCHER = undef;
2138 2287
… …
2164 $MAP_PREFETCHER->prio (6); 2313 $MAP_PREFETCHER->prio (6);
2165 2314
2166 () 2315 ()
2167} 2316}
2168 2317
2318# common code, used by both ->save and ->swapout
2169sub save { 2319sub _save {
2170 my ($self) = @_; 2320 my ($self) = @_;
2171
2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
2173 2321
2174 $self->{last_save} = $cf::RUNTIME; 2322 $self->{last_save} = $cf::RUNTIME;
2175 2323
2176 return unless $self->dirty; 2324 return unless $self->dirty;
2177 2325
… …
2197 } else { 2345 } else {
2198 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2346 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2199 } 2347 }
2200} 2348}
2201 2349
2350sub save {
2351 my ($self) = @_;
2352
2353 my $lock = cf::lock_acquire "map_data:$self->{path}";
2354
2355 $self->_save;
2356}
2357
2202sub swap_out { 2358sub swap_out {
2203 my ($self) = @_; 2359 my ($self) = @_;
2204 2360
2205 # save first because save cedes
2206 $self->save;
2207
2208 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2361 my $lock = cf::lock_acquire "map_data:$self->{path}";
2209 2362
2210 return if $self->players;
2211 return if $self->in_memory != cf::MAP_ACTIVE; 2363 return if $self->in_memory != cf::MAP_ACTIVE;
2212 return if $self->{deny_save}; 2364 return if $self->{deny_save};
2365 return if $self->players;
2213 2366
2367 # first deactivate the map and "unlink" it from the core
2368 $self->deactivate;
2369 $_->clear_links_to ($self) for values %cf::MAP;
2214 $self->in_memory (cf::MAP_SWAPPED); 2370 $self->in_memory (cf::MAP_SWAPPED);
2371
2372 # then atomically save
2373 $self->_save;
2374
2375 # then free the map
2376 $self->clear;
2377}
2378
2379sub reset_at {
2380 my ($self) = @_;
2381
2382 # TODO: safety, remove and allow resettable per-player maps
2383 return 1e99 if $self->{deny_reset};
2384
2385 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2386 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2387
2388 $time + $to
2389}
2390
2391sub should_reset {
2392 my ($self) = @_;
2393
2394 $self->reset_at <= $cf::RUNTIME
2395}
2396
2397sub reset {
2398 my ($self) = @_;
2399
2400 my $lock = cf::lock_acquire "map_data:$self->{path}";
2401
2402 return if $self->players;
2403
2404 cf::trace "resetting map ", $self->path, "\n";
2405
2406 $self->in_memory (cf::MAP_SWAPPED);
2407
2408 # need to save uniques path
2409 unless ($self->{deny_save}) {
2410 my $uniq = $self->uniq_path; utf8::encode $uniq;
2411
2412 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2413 if $uniq;
2414 }
2415
2416 delete $cf::MAP{$self->path};
2215 2417
2216 $self->deactivate; 2418 $self->deactivate;
2217 $_->clear_links_to ($self) for values %cf::MAP; 2419 $_->clear_links_to ($self) for values %cf::MAP;
2218 $self->clear; 2420 $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 2421
2264 $self->unlink_save; 2422 $self->unlink_save;
2265 $self->destroy; 2423 $self->destroy;
2266} 2424}
2267 2425
… …
2275 2433
2276 delete $cf::MAP{$self->path}; 2434 delete $cf::MAP{$self->path};
2277 2435
2278 $self->unlink_save; 2436 $self->unlink_save;
2279 2437
2280 bless $self, "cf::map"; 2438 bless $self, "cf::map::wrap";
2281 delete $self->{deny_reset}; 2439 delete $self->{deny_reset};
2282 $self->{deny_save} = 1; 2440 $self->{deny_save} = 1;
2283 $self->reset_timeout (1); 2441 $self->reset_timeout (1);
2284 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2442 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2285 2443
… …
2515 2673
2516Freezes the player and moves him/her to a special map (C<{link}>). 2674Freezes the player and moves him/her to a special map (C<{link}>).
2517 2675
2518The player should be reasonably safe there for short amounts of time (e.g. 2676The player should be reasonably safe there for short amounts of time (e.g.
2519for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2677for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2520though, as the palyer cannot control the character while it is on the link 2678though, as the player cannot control the character while it is on the link
2521map. 2679map.
2522 2680
2523Will never block. 2681Will never block.
2524 2682
2525=item $player_object->leave_link ($map, $x, $y) 2683=item $player_object->leave_link ($map, $x, $y)
… …
2546sub cf::object::player::enter_link { 2704sub cf::object::player::enter_link {
2547 my ($self) = @_; 2705 my ($self) = @_;
2548 2706
2549 $self->deactivate_recursive; 2707 $self->deactivate_recursive;
2550 2708
2709 ++$self->{_link_recursion};
2710
2551 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2711 return if UNIVERSAL::isa $self->map, "ext::map_link";
2552 2712
2553 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2713 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2554 if $self->map && $self->map->{path} ne "{link}"; 2714 if $self->map && $self->map->{path} ne "{link}";
2555 2715
2556 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2716 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2557} 2717}
2558 2718
2559sub cf::object::player::leave_link { 2719sub cf::object::player::leave_link {
2560 my ($self, $map, $x, $y) = @_; 2720 my ($self, $map, $x, $y) = @_;
2561 2721
… …
2586 $map->load_neighbours; 2746 $map->load_neighbours;
2587 2747
2588 return unless $self->contr->active; 2748 return unless $self->contr->active;
2589 2749
2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2750 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2591 $self->enter_map ($map, $x, $y); 2751 if ($self->enter_map ($map, $x, $y)) {
2592 2752 # entering was successful
2753 delete $self->{_link_recursion};
2593 # only activate afterwards, to support waiting in hooks 2754 # only activate afterwards, to support waiting in hooks
2594 $self->activate_recursive; 2755 $self->activate_recursive;
2595} 2756 }
2596 2757
2758}
2759
2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2760=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2598 2761
2599Moves the player to the given map-path and coordinates by first freezing 2762Moves the player to the given map-path and coordinates by first freezing
2600her, loading and preparing them map, calling the provided $check callback 2763her, loading and preparing them map, calling the provided $check callback
2601that has to return the map if sucecssful, and then unfreezes the player on 2764that has to return the map if sucecssful, and then unfreezes the player on
2602the new (success) or old (failed) map position. In either case, $done will 2765the new (success) or old (failed) map position. In either case, $done will
… …
2609 2772
2610our $GOTOGEN; 2773our $GOTOGEN;
2611 2774
2612sub cf::object::player::goto { 2775sub cf::object::player::goto {
2613 my ($self, $path, $x, $y, $check, $done) = @_; 2776 my ($self, $path, $x, $y, $check, $done) = @_;
2777
2778 if ($self->{_link_recursion} >= $MAX_LINKS) {
2779 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2780 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2781 ($path, $x, $y) = @$EMERGENCY_POSITION;
2782 }
2614 2783
2615 # do generation counting so two concurrent goto's will be executed in-order 2784 # do generation counting so two concurrent goto's will be executed in-order
2616 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2785 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2617 2786
2618 $self->enter_link; 2787 $self->enter_link;
… …
2642 my $map = eval { 2811 my $map = eval {
2643 my $map = defined $path ? cf::map::find $path : undef; 2812 my $map = defined $path ? cf::map::find $path : undef;
2644 2813
2645 if ($map) { 2814 if ($map) {
2646 $map = $map->customise_for ($self); 2815 $map = $map->customise_for ($self);
2647 $map = $check->($map) if $check && $map; 2816 $map = $check->($map, $x, $y, $self) if $check && $map;
2648 } else { 2817 } else {
2649 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2818 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2650 } 2819 }
2651 2820
2652 $map 2821 $map
… …
2660 if ($gen == $self->{_goto_generation}) { 2829 if ($gen == $self->{_goto_generation}) {
2661 delete $self->{_goto_generation}; 2830 delete $self->{_goto_generation};
2662 $self->leave_link ($map, $x, $y); 2831 $self->leave_link ($map, $x, $y);
2663 } 2832 }
2664 2833
2665 $done->() if $done; 2834 $done->($self) if $done;
2666 })->prio (1); 2835 })->prio (1);
2667} 2836}
2668 2837
2669=item $player_object->enter_exit ($exit_object) 2838=item $player_object->enter_exit ($exit_object)
2670 2839
… …
2763 $self->message ("Something went wrong deep within the deliantra server. " 2932 $self->message ("Something went wrong deep within the deliantra server. "
2764 . "I'll try to bring you back to the map you were before. " 2933 . "I'll try to bring you back to the map you were before. "
2765 . "Please report this to the dungeon master!", 2934 . "Please report this to the dungeon master!",
2766 cf::NDI_UNIQUE | cf::NDI_RED); 2935 cf::NDI_UNIQUE | cf::NDI_RED);
2767 2936
2768 warn "ERROR in enter_exit: $@"; 2937 error "ERROR in enter_exit: $@";
2769 $self->leave_link; 2938 $self->leave_link;
2770 } 2939 }
2771 })->prio (1); 2940 })->prio (1);
2772} 2941}
2773 2942
… …
3086 3255
3087 $ns->ext_reply ($reply, @reply) 3256 $ns->ext_reply ($reply, @reply)
3088 if $reply; 3257 if $reply;
3089 3258
3090 } else { 3259 } else {
3091 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3260 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3092 } 3261 }
3093 3262
3094 cf::override; 3263 cf::override;
3095 }, 3264 },
3096); 3265);
… …
3116 3285
3117 $coro 3286 $coro
3118} 3287}
3119 3288
3120cf::client->attach ( 3289cf::client->attach (
3121 on_destroy => sub { 3290 on_client_destroy => sub {
3122 my ($ns) = @_; 3291 my ($ns) = @_;
3123 3292
3124 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3293 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3125 }, 3294 },
3126); 3295);
… …
3142our $safe_hole = new Safe::Hole; 3311our $safe_hole = new Safe::Hole;
3143 3312
3144$SIG{FPE} = 'IGNORE'; 3313$SIG{FPE} = 'IGNORE';
3145 3314
3146$safe->permit_only (Opcode::opset qw( 3315$safe->permit_only (Opcode::opset qw(
3147 :base_core :base_mem :base_orig :base_math 3316 :base_core :base_mem :base_orig :base_math :base_loop
3148 grepstart grepwhile mapstart mapwhile 3317 grepstart grepwhile mapstart mapwhile
3149 sort time 3318 sort time
3150)); 3319));
3151 3320
3152# here we export the classes and methods available to script code 3321# here we export the classes and methods available to script code
… …
3177 decrease split destroy change_exp value msg lore send_msg)], 3346 decrease split destroy change_exp value msg lore send_msg)],
3178 ["cf::object::player" => qw(player)], 3347 ["cf::object::player" => qw(player)],
3179 ["cf::player" => qw(peaceful send_msg)], 3348 ["cf::player" => qw(peaceful send_msg)],
3180 ["cf::map" => qw(trigger)], 3349 ["cf::map" => qw(trigger)],
3181) { 3350) {
3182 no strict 'refs';
3183 my ($pkg, @funs) = @$_; 3351 my ($pkg, @funs) = @$_;
3184 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3352 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3185 for @funs; 3353 for @funs;
3186} 3354}
3187 3355
… …
3204 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3372 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3205 $qcode =~ s/\n/\\n/g; 3373 $qcode =~ s/\n/\\n/g;
3206 3374
3207 %vars = (_dummy => 0) unless %vars; 3375 %vars = (_dummy => 0) unless %vars;
3208 3376
3377 my @res;
3209 local $_; 3378 local $_;
3210 local @safe::cf::_safe_eval_args = values %vars;
3211 3379
3212 my $eval = 3380 my $eval =
3213 "do {\n" 3381 "do {\n"
3214 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3382 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3215 . "#line 0 \"{$qcode}\"\n" 3383 . "#line 0 \"{$qcode}\"\n"
3216 . $code 3384 . $code
3217 . "\n}" 3385 . "\n}"
3218 ; 3386 ;
3219 3387
3388 if ($CFG{safe_eval}) {
3220 sub_generation_inc; 3389 sub_generation_inc;
3390 local @safe::cf::_safe_eval_args = values %vars;
3221 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3391 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3222 sub_generation_inc; 3392 sub_generation_inc;
3393 } else {
3394 local @cf::_safe_eval_args = values %vars;
3395 @res = wantarray ? eval eval : scalar eval $eval;
3396 }
3223 3397
3224 if ($@) { 3398 if ($@) {
3225 warn "$@"; 3399 warn "$@",
3226 warn "while executing safe code '$code'\n"; 3400 "while executing safe code '$code'\n",
3227 warn "with arguments " . (join " ", %vars) . "\n"; 3401 "with arguments " . (join " ", %vars) . "\n";
3228 } 3402 }
3229 3403
3230 wantarray ? @res : $res[0] 3404 wantarray ? @res : $res[0]
3231} 3405}
3232 3406
… …
3246=cut 3420=cut
3247 3421
3248sub register_script_function { 3422sub register_script_function {
3249 my ($fun, $cb) = @_; 3423 my ($fun, $cb) = @_;
3250 3424
3251 no strict 'refs'; 3425 $fun = "safe::$fun" if $CFG{safe_eval};
3252 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3426 *$fun = $safe_hole->wrap ($cb);
3253} 3427}
3254 3428
3255=back 3429=back
3256 3430
3257=cut 3431=cut
… …
3266 # for this (global event?) 3440 # for this (global event?)
3267 %ext::player_env::MUSIC_FACE_CACHE = (); 3441 %ext::player_env::MUSIC_FACE_CACHE = ();
3268 3442
3269 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3443 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3270 3444
3271 warn "loading facedata from $path\n"; 3445 trace "loading facedata from $path\n";
3272 3446
3273 my $facedata; 3447 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 3448
3279 $facedata->{version} == 2 3449 $facedata->{version} == 2
3280 or cf::cleanup "$path: version mismatch, cannot proceed."; 3450 or cf::cleanup "$path: version mismatch, cannot proceed.";
3281 3451
3282 # patch in the exptable 3452 # patch in the exptable
3453 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3283 $facedata->{resource}{"res/exp_table"} = { 3454 $facedata->{resource}{"res/exp_table"} = {
3284 type => FT_RSRC, 3455 type => FT_RSRC,
3285 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3456 data => $exp_table,
3457 hash => (Digest::MD5::md5 $exp_table),
3286 }; 3458 };
3287 cf::cede_to_tick; 3459 cf::cede_to_tick;
3288 3460
3289 { 3461 {
3290 my $faces = $facedata->{faceinfo}; 3462 my $faces = $facedata->{faceinfo};
… …
3292 while (my ($face, $info) = each %$faces) { 3464 while (my ($face, $info) = each %$faces) {
3293 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3465 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3294 3466
3295 cf::face::set_visibility $idx, $info->{visibility}; 3467 cf::face::set_visibility $idx, $info->{visibility};
3296 cf::face::set_magicmap $idx, $info->{magicmap}; 3468 cf::face::set_magicmap $idx, $info->{magicmap};
3297 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3469 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3298 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3470 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3471 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3299 3472
3300 cf::cede_to_tick; 3473 cf::cede_to_tick;
3301 } 3474 }
3302 3475
3303 while (my ($face, $info) = each %$faces) { 3476 while (my ($face, $info) = each %$faces) {
… …
3308 3481
3309 if (my $smooth = cf::face::find $info->{smooth}) { 3482 if (my $smooth = cf::face::find $info->{smooth}) {
3310 cf::face::set_smooth $idx, $smooth; 3483 cf::face::set_smooth $idx, $smooth;
3311 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3484 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3312 } else { 3485 } else {
3313 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3486 error "smooth face '$info->{smooth}' not found for face '$face'";
3314 } 3487 }
3315 3488
3316 cf::cede_to_tick; 3489 cf::cede_to_tick;
3317 } 3490 }
3318 } 3491 }
… …
3327 3500
3328 cf::anim::invalidate_all; # d'oh 3501 cf::anim::invalidate_all; # d'oh
3329 } 3502 }
3330 3503
3331 { 3504 {
3332 # TODO: for gcfclient pleasure, we should give resources
3333 # that gcfclient doesn't grok a >10000 face index.
3334 my $res = $facedata->{resource}; 3505 my $res = $facedata->{resource};
3335 3506
3336 while (my ($name, $info) = each %$res) { 3507 while (my ($name, $info) = each %$res) {
3337 if (defined $info->{type}) { 3508 if (defined $info->{type}) {
3338 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3509 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3339 my $data;
3340 3510
3341 if ($info->{type} & 1) { 3511 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}; 3512 cf::face::set_type $idx, $info->{type};
3356 } else { 3513 } else {
3357 $RESOURCE{$name} = $info; 3514 $RESOURCE{$name} = $info; # unused
3358 } 3515 }
3359 3516
3360 cf::cede_to_tick; 3517 cf::cede_to_tick;
3361 } 3518 }
3362 } 3519 }
3363 3520
3364 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3521 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3365 3522
3366 1 3523 1
3367} 3524}
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 3525
3389register_exticmd fx_want => sub { 3526register_exticmd fx_want => sub {
3390 my ($ns, $want) = @_; 3527 my ($ns, $want) = @_;
3391 3528
3392 while (my ($k, $v) = each %$want) { 3529 while (my ($k, $v) = each %$want) {
… …
3431sub reload_treasures { 3568sub reload_treasures {
3432 load_resource_file "$DATADIR/treasures" 3569 load_resource_file "$DATADIR/treasures"
3433 or die "unable to load treasurelists\n"; 3570 or die "unable to load treasurelists\n";
3434} 3571}
3435 3572
3573sub reload_sound {
3574 trace "loading sound config from $DATADIR/sound\n";
3575
3576 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3577
3578 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3579 my $sound = $soundconf->{compat}[$_]
3580 or next;
3581
3582 my $face = cf::face::find "sound/$sound->[1]";
3583 cf::sound::set $sound->[0] => $face;
3584 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3585 }
3586
3587 while (my ($k, $v) = each %{$soundconf->{event}}) {
3588 my $face = cf::face::find "sound/$v";
3589 cf::sound::set $k => $face;
3590 }
3591}
3592
3436sub reload_resources { 3593sub reload_resources {
3437 warn "reloading resource files...\n"; 3594 trace "reloading resource files...\n";
3438 3595
3596 reload_exp_table;
3597 reload_materials;
3439 reload_facedata; 3598 reload_facedata;
3599 reload_sound;
3440 reload_archetypes; 3600 reload_archetypes;
3441 reload_regions; 3601 reload_regions;
3442 reload_treasures; 3602 reload_treasures;
3443 3603
3444 warn "finished reloading resource files\n"; 3604 trace "finished reloading resource files\n";
3445} 3605}
3446 3606
3447sub reload_config { 3607sub reload_config {
3448 warn "reloading config file...\n"; 3608 trace "reloading config file...\n";
3449 3609
3450 open my $fh, "<:utf8", "$CONFDIR/config" 3610 my $config = load_file "$CONFDIR/config";
3451 or return; 3611 utf8::decode $config;
3612 *CFG = decode_yaml $config;
3452 3613
3453 local $/;
3454 *CFG = YAML::XS::Load scalar <$fh>;
3455
3456 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3614 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3457 3615
3458 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3616 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3459 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3617 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3460 3618
3461 if (exists $CFG{mlockall}) { 3619 if (exists $CFG{mlockall}) {
… …
3463 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3621 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3464 and die "WARNING: m(un)lockall failed: $!\n"; 3622 and die "WARNING: m(un)lockall failed: $!\n";
3465 }; 3623 };
3466 warn $@ if $@; 3624 warn $@ if $@;
3467 } 3625 }
3468
3469 warn "finished reloading resource files\n";
3470} 3626}
3471 3627
3472sub pidfile() { 3628sub pidfile() {
3473 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3629 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3474 or die "$PIDFILE: $!"; 3630 or die "$PIDFILE: $!";
… …
3487 seek $fh, 0, 0; 3643 seek $fh, 0, 0;
3488 print $fh $$; 3644 print $fh $$;
3489} 3645}
3490 3646
3491sub main_loop { 3647sub main_loop {
3492 warn "EV::loop starting\n"; 3648 trace "EV::loop starting\n";
3493 if (1) { 3649 if (1) {
3494 EV::loop; 3650 EV::loop;
3495 } 3651 }
3496 warn "EV::loop returned\n"; 3652 trace "EV::loop returned\n";
3497 goto &main_loop unless $REALLY_UNLOOP; 3653 goto &main_loop unless $REALLY_UNLOOP;
3498} 3654}
3499 3655
3500sub main { 3656sub main {
3501 cf::init_globals; # initialise logging 3657 cf::init_globals; # initialise logging
3502 3658
3503 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3659 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3504 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3660 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3505 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3661 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3506 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3662 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 3663
3513 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3664 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3514 3665
3515 # we must not ever block the main coroutine 3666 # we must not ever block the main coroutine
3516 local $Coro::idle = sub { 3667 local $Coro::idle = sub {
… …
3522 }; 3673 };
3523 3674
3524 evthread_start IO::AIO::poll_fileno; 3675 evthread_start IO::AIO::poll_fileno;
3525 3676
3526 cf::sync_job { 3677 cf::sync_job {
3678 cf::incloader::init ();
3679
3680 cf::init_anim;
3681 cf::init_attackmess;
3682 cf::init_dynamic;
3683
3527 cf::load_settings; 3684 cf::load_settings;
3528 cf::load_materials;
3529 3685
3530 reload_resources; 3686 reload_resources;
3531 reload_config; 3687 reload_config;
3532 db_init; 3688 db_init;
3533 3689
3534 cf::init_uuid; 3690 cf::init_uuid;
3535 cf::init_signals; 3691 cf::init_signals;
3536 cf::init_commands;
3537 cf::init_skills; 3692 cf::init_skills;
3538 3693
3539 cf::init_beforeplay; 3694 cf::init_beforeplay;
3540 3695
3541 atomic; 3696 atomic;
… …
3546 3701
3547 # no (long-running) fork's whatsoever before this point(!) 3702 # no (long-running) fork's whatsoever before this point(!)
3548 use POSIX (); 3703 use POSIX ();
3549 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3704 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3550 3705
3551 (pop @POST_INIT)->(0) while @POST_INIT; 3706 cf::_post_init 0;
3552 }; 3707 };
3553 3708
3709 cf::object::thawer::errors_are_fatal 0;
3710 info "parse errors in files are no longer fatal from this point on.\n";
3711
3712 my $free_main; $free_main = EV::idle sub {
3713 undef $free_main;
3714 undef &main; # free gobs of memory :)
3715 };
3716
3554 main_loop; 3717 goto &main_loop;
3555} 3718}
3556 3719
3557############################################################################# 3720#############################################################################
3558# initialisation and cleanup 3721# initialisation and cleanup
3559 3722
3560# install some emergency cleanup handlers 3723# install some emergency cleanup handlers
3561BEGIN { 3724BEGIN {
3562 our %SIGWATCHER = (); 3725 our %SIGWATCHER = ();
3563 for my $signal (qw(INT HUP TERM)) { 3726 for my $signal (qw(INT HUP TERM)) {
3564 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3727 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3565 cf::cleanup "SIG$signal"; 3728 cf::cleanup "SIG$signal";
3566 }; 3729 };
3567 } 3730 }
3568} 3731}
3569 3732
3570sub write_runtime_sync { 3733sub write_runtime_sync {
3734 my $t0 = AE::time;
3735
3571 # first touch the runtime file to show we are still running: 3736 # first touch the runtime file to show we are still running:
3572 # the fsync below can take a very very long time. 3737 # the fsync below can take a very very long time.
3573 3738
3574 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3739 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3575 3740
3576 my $guard = cf::lock_acquire "write_runtime"; 3741 my $guard = cf::lock_acquire "write_runtime";
3577 3742
3578 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3743 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3579 or return; 3744 or return;
3580 3745
3581 my $value = $cf::RUNTIME + 90 + 10; 3746 my $value = $cf::RUNTIME + 90 + 10;
3582 # 10 is the runtime save interval, for a monotonic clock 3747 # 10 is the runtime save interval, for a monotonic clock
3583 # 60 allows for the watchdog to kill the server. 3748 # 60 allows for the watchdog to kill the server.
… …
3596 or return; 3761 or return;
3597 3762
3598 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3763 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3599 and return; 3764 and return;
3600 3765
3601 warn "runtime file written.\n"; 3766 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3602 3767
3603 1 3768 1
3604} 3769}
3605 3770
3606our $uuid_lock; 3771our $uuid_lock;
… …
3618 or return; 3783 or return;
3619 3784
3620 my $value = uuid_seq uuid_cur; 3785 my $value = uuid_seq uuid_cur;
3621 3786
3622 unless ($value) { 3787 unless ($value) {
3623 warn "cowardly refusing to write zero uuid value!\n"; 3788 info "cowardly refusing to write zero uuid value!\n";
3624 return; 3789 return;
3625 } 3790 }
3626 3791
3627 my $value = uuid_str $value + $uuid_skip; 3792 my $value = uuid_str $value + $uuid_skip;
3628 $uuid_skip = 0; 3793 $uuid_skip = 0;
… …
3638 or return; 3803 or return;
3639 3804
3640 aio_rename "$uuid~", $uuid 3805 aio_rename "$uuid~", $uuid
3641 and return; 3806 and return;
3642 3807
3643 warn "uuid file written ($value).\n"; 3808 trace "uuid file written ($value).\n";
3644 3809
3645 1 3810 1
3646 3811
3647} 3812}
3648 3813
… …
3654} 3819}
3655 3820
3656sub emergency_save() { 3821sub emergency_save() {
3657 my $freeze_guard = cf::freeze_mainloop; 3822 my $freeze_guard = cf::freeze_mainloop;
3658 3823
3659 warn "emergency_perl_save: enter\n"; 3824 info "emergency_perl_save: enter\n";
3825
3826 # this is a trade-off: we want to be very quick here, so
3827 # save all maps without fsync, and later call a global sync
3828 # (which in turn might be very very slow)
3829 local $USE_FSYNC = 0;
3660 3830
3661 cf::sync_job { 3831 cf::sync_job {
3662 # this is a trade-off: we want to be very quick here, so 3832 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 3833
3667 # use a peculiar iteration method to avoid tripping on perl 3834 # use a peculiar iteration method to avoid tripping on perl
3668 # refcount bugs in for. also avoids problems with players 3835 # refcount bugs in for. also avoids problems with players
3669 # and maps saved/destroyed asynchronously. 3836 # and maps saved/destroyed asynchronously.
3670 warn "emergency_perl_save: begin player save\n"; 3837 info "emergency_perl_save: begin player save\n";
3671 for my $login (keys %cf::PLAYER) { 3838 for my $login (keys %cf::PLAYER) {
3672 my $pl = $cf::PLAYER{$login} or next; 3839 my $pl = $cf::PLAYER{$login} or next;
3673 $pl->valid or next; 3840 $pl->valid or next;
3674 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3841 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3675 $pl->save; 3842 $pl->save;
3676 } 3843 }
3677 warn "emergency_perl_save: end player save\n"; 3844 info "emergency_perl_save: end player save\n";
3678 3845
3846 cf::write_runtime_sync; # external watchdog should not bark
3847
3679 warn "emergency_perl_save: begin map save\n"; 3848 info "emergency_perl_save: begin map save\n";
3680 for my $path (keys %cf::MAP) { 3849 for my $path (keys %cf::MAP) {
3681 my $map = $cf::MAP{$path} or next; 3850 my $map = $cf::MAP{$path} or next;
3682 $map->valid or next; 3851 $map->valid or next;
3683 $map->save; 3852 $map->save;
3684 } 3853 }
3685 warn "emergency_perl_save: end map save\n"; 3854 info "emergency_perl_save: end map save\n";
3686 3855
3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3687 warn "emergency_perl_save: begin database checkpoint\n"; 3858 info "emergency_perl_save: begin database checkpoint\n";
3688 BDB::db_env_txn_checkpoint $DB_ENV; 3859 BDB::db_env_txn_checkpoint $DB_ENV;
3689 warn "emergency_perl_save: end database checkpoint\n"; 3860 info "emergency_perl_save: end database checkpoint\n";
3690 3861
3691 warn "emergency_perl_save: begin write uuid\n"; 3862 info "emergency_perl_save: begin write uuid\n";
3692 write_uuid_sync 1; 3863 write_uuid_sync 1;
3693 warn "emergency_perl_save: end write uuid\n"; 3864 info "emergency_perl_save: end write uuid\n";
3865
3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3868 trace "emergency_perl_save: syncing database to disk";
3869 BDB::db_env_txn_checkpoint $DB_ENV;
3870
3871 info "emergency_perl_save: starting sync\n";
3872 IO::AIO::aio_sync sub {
3873 info "emergency_perl_save: finished sync\n";
3874 };
3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 trace "emergency_perl_save: flushing outstanding aio requests";
3879 while (IO::AIO::nreqs || BDB::nreqs) {
3880 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3881 }
3882
3883 cf::write_runtime_sync; # external watchdog should not bark
3694 }; 3884 };
3695 3885
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"; 3886 info "emergency_perl_save: leave\n";
3702} 3887}
3703 3888
3704sub post_cleanup { 3889sub post_cleanup {
3705 my ($make_core) = @_; 3890 my ($make_core) = @_;
3706 3891
3892 IO::AIO::flush;
3893
3707 warn Carp::longmess "post_cleanup backtrace" 3894 error Carp::longmess "post_cleanup backtrace"
3708 if $make_core; 3895 if $make_core;
3709 3896
3710 my $fh = pidfile; 3897 my $fh = pidfile;
3711 unlink $PIDFILE if <$fh> == $$; 3898 unlink $PIDFILE if <$fh> == $$;
3712} 3899}
… …
3732 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3919 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3733 for my $name (keys %$leaf_symtab) { 3920 for my $name (keys %$leaf_symtab) {
3734 _gv_clear *{"$pkg$name"}; 3921 _gv_clear *{"$pkg$name"};
3735# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3922# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3736 } 3923 }
3737 warn "cleared package $pkg\n";#d#
3738} 3924}
3739 3925
3740sub do_reload_perl() { 3926sub do_reload_perl() {
3741 # can/must only be called in main 3927 # can/must only be called in main
3742 if ($Coro::current != $Coro::main) { 3928 unless (in_main) {
3743 warn "can only reload from main coroutine"; 3929 error "can only reload from main coroutine";
3744 return; 3930 return;
3745 } 3931 }
3746 3932
3747 return if $RELOAD++; 3933 return if $RELOAD++;
3748 3934
3749 my $t1 = EV::time; 3935 my $t1 = AE::time;
3750 3936
3751 while ($RELOAD) { 3937 while ($RELOAD) {
3752 warn "reloading..."; 3938 cf::get_slot 0.1, -1, "reload_perl";
3939 info "perl_reload: reloading...";
3753 3940
3754 warn "entering sync_job"; 3941 trace "perl_reload: entering sync_job";
3755 3942
3756 cf::sync_job { 3943 cf::sync_job {
3757 cf::write_runtime_sync; # external watchdog should not bark
3758 cf::emergency_save; 3944 #cf::emergency_save;
3759 cf::write_runtime_sync; # external watchdog should not bark
3760 3945
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"; 3946 trace "perl_reload: cancelling all extension coros";
3772 $_->cancel for values %EXT_CORO; 3947 $_->cancel for values %EXT_CORO;
3773 %EXT_CORO = (); 3948 %EXT_CORO = ();
3774 3949
3775 warn "removing commands"; 3950 trace "perl_reload: removing commands";
3776 %COMMAND = (); 3951 %COMMAND = ();
3777 3952
3778 warn "removing ext/exti commands"; 3953 trace "perl_reload: removing ext/exti commands";
3779 %EXTCMD = (); 3954 %EXTCMD = ();
3780 %EXTICMD = (); 3955 %EXTICMD = ();
3781 3956
3782 warn "unloading/nuking all extensions"; 3957 trace "perl_reload: unloading/nuking all extensions";
3783 for my $pkg (@EXTS) { 3958 for my $pkg (@EXTS) {
3784 warn "... unloading $pkg"; 3959 trace "... unloading $pkg";
3785 3960
3786 if (my $cb = $pkg->can ("unload")) { 3961 if (my $cb = $pkg->can ("unload")) {
3787 eval { 3962 eval {
3788 $cb->($pkg); 3963 $cb->($pkg);
3789 1 3964 1
3790 } or warn "$pkg unloaded, but with errors: $@"; 3965 } or error "$pkg unloaded, but with errors: $@";
3791 } 3966 }
3792 3967
3793 warn "... clearing $pkg"; 3968 trace "... clearing $pkg";
3794 clear_package $pkg; 3969 clear_package $pkg;
3795 } 3970 }
3796 3971
3797 warn "unloading all perl modules loaded from $LIBDIR"; 3972 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3798 while (my ($k, $v) = each %INC) { 3973 while (my ($k, $v) = each %INC) {
3799 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3974 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3800 3975
3801 warn "... unloading $k"; 3976 trace "... unloading $k";
3802 delete $INC{$k}; 3977 delete $INC{$k};
3803 3978
3804 $k =~ s/\.pm$//; 3979 $k =~ s/\.pm$//;
3805 $k =~ s/\//::/g; 3980 $k =~ s/\//::/g;
3806 3981
… …
3809 } 3984 }
3810 3985
3811 clear_package $k; 3986 clear_package $k;
3812 } 3987 }
3813 3988
3814 warn "getting rid of safe::, as good as possible"; 3989 trace "perl_reload: getting rid of safe::, as good as possible";
3815 clear_package "safe::$_" 3990 clear_package "safe::$_"
3816 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3991 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3817 3992
3818 warn "unloading cf.pm \"a bit\""; 3993 trace "perl_reload: unloading cf.pm \"a bit\"";
3819 delete $INC{"cf.pm"}; 3994 delete $INC{"cf.pm"};
3820 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3995 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3821 3996
3822 # don't, removes xs symbols, too, 3997 # don't, removes xs symbols, too,
3823 # and global variables created in xs 3998 # and global variables created in xs
3824 #clear_package __PACKAGE__; 3999 #clear_package __PACKAGE__;
3825 4000
3826 warn "unload completed, starting to reload now"; 4001 info "perl_reload: unload completed, starting to reload now";
3827 4002
3828 warn "reloading cf.pm"; 4003 trace "perl_reload: reloading cf.pm";
3829 require cf; 4004 require cf;
3830 cf::_connect_to_perl_1; 4005 cf::_connect_to_perl_1;
3831 4006
3832 warn "loading config and database again"; 4007 trace "perl_reload: loading config and database again";
3833 cf::reload_config; 4008 cf::reload_config;
3834 4009
3835 warn "loading extensions"; 4010 trace "perl_reload: loading extensions";
3836 cf::load_extensions; 4011 cf::load_extensions;
3837 4012
3838 if ($REATTACH_ON_RELOAD) { 4013 if ($REATTACH_ON_RELOAD) {
3839 warn "reattaching attachments to objects/players"; 4014 trace "perl_reload: reattaching attachments to objects/players";
3840 _global_reattach; # objects, sockets 4015 _global_reattach; # objects, sockets
3841 warn "reattaching attachments to maps"; 4016 trace "perl_reload: reattaching attachments to maps";
3842 reattach $_ for values %MAP; 4017 reattach $_ for values %MAP;
3843 warn "reattaching attachments to players"; 4018 trace "perl_reload: reattaching attachments to players";
3844 reattach $_ for values %PLAYER; 4019 reattach $_ for values %PLAYER;
3845 } 4020 }
3846 4021
3847 warn "running post_init jobs"; 4022 cf::_post_init 1;
3848 (pop @POST_INIT)->(1) while @POST_INIT;
3849 4023
3850 warn "leaving sync_job"; 4024 trace "perl_reload: leaving sync_job";
3851 4025
3852 1 4026 1
3853 } or do { 4027 } or do {
3854 warn $@; 4028 error $@;
3855 cf::cleanup "error while reloading, exiting."; 4029 cf::cleanup "perl_reload: error, exiting.";
3856 }; 4030 };
3857 4031
3858 warn "reloaded";
3859 --$RELOAD; 4032 --$RELOAD;
3860 } 4033 }
3861 4034
3862 $t1 = EV::time - $t1; 4035 $t1 = AE::time - $t1;
3863 warn "reload completed in ${t1}s\n"; 4036 info "perl_reload: completed in ${t1}s\n";
3864}; 4037};
3865 4038
3866our $RELOAD_WATCHER; # used only during reload 4039our $RELOAD_WATCHER; # used only during reload
3867 4040
3868sub reload_perl() { 4041sub reload_perl() {
… …
3870 # coro crashes during coro_state_free->destroy here. 4043 # coro crashes during coro_state_free->destroy here.
3871 4044
3872 $RELOAD_WATCHER ||= cf::async { 4045 $RELOAD_WATCHER ||= cf::async {
3873 Coro::AIO::aio_wait cache_extensions; 4046 Coro::AIO::aio_wait cache_extensions;
3874 4047
3875 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4048 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3876 do_reload_perl; 4049 do_reload_perl;
3877 undef $RELOAD_WATCHER; 4050 undef $RELOAD_WATCHER;
3878 }; 4051 };
3879 }; 4052 };
3880} 4053}
… …
3889 reload_perl; 4062 reload_perl;
3890 }; 4063 };
3891 } 4064 }
3892}; 4065};
3893 4066
3894unshift @INC, $LIBDIR; 4067#############################################################################
3895 4068
3896my $bug_warning = 0; 4069my $bug_warning = 0;
3897 4070
3898our @WAIT_FOR_TICK; 4071our @WAIT_FOR_TICK;
3899our @WAIT_FOR_TICK_BEGIN; 4072our @WAIT_FOR_TICK_BEGIN;
3900 4073
3901sub wait_for_tick { 4074sub wait_for_tick() {
3902 return if tick_inhibit || $Coro::current == $Coro::main; 4075 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3903 4076
3904 my $signal = new Coro::Signal; 4077 my $signal = new Coro::Signal;
3905 push @WAIT_FOR_TICK, $signal; 4078 push @WAIT_FOR_TICK, $signal;
3906 $signal->wait; 4079 $signal->wait;
3907} 4080}
3908 4081
3909sub wait_for_tick_begin { 4082sub wait_for_tick_begin() {
3910 return if tick_inhibit || $Coro::current == $Coro::main; 4083 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3911 4084
3912 my $signal = new Coro::Signal; 4085 my $signal = new Coro::Signal;
3913 push @WAIT_FOR_TICK_BEGIN, $signal; 4086 push @WAIT_FOR_TICK_BEGIN, $signal;
3914 $signal->wait; 4087 $signal->wait;
3915} 4088}
… …
3921 return; 4094 return;
3922 } 4095 }
3923 4096
3924 cf::server_tick; # one server iteration 4097 cf::server_tick; # one server iteration
3925 4098
4099 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4100
3926 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4101 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3927 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4102 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3928 Coro::async_pool { 4103 Coro::async_pool {
3929 $Coro::current->{desc} = "runtime saver"; 4104 $Coro::current->{desc} = "runtime saver";
3930 write_runtime_sync 4105 write_runtime_sync
3931 or warn "ERROR: unable to write runtime file: $!"; 4106 or error "ERROR: unable to write runtime file: $!";
3932 }; 4107 };
3933 } 4108 }
3934 4109
3935 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4110 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3936 $sig->send; 4111 $sig->send;
… …
3944 4119
3945 if (0) { 4120 if (0) {
3946 if ($NEXT_TICK) { 4121 if ($NEXT_TICK) {
3947 my $jitter = $TICK_START - $NEXT_TICK; 4122 my $jitter = $TICK_START - $NEXT_TICK;
3948 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4123 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3949 warn "jitter $JITTER\n";#d# 4124 debug "jitter $JITTER\n";#d#
3950 } 4125 }
3951 } 4126 }
3952} 4127}
3953 4128
3954{ 4129{
3955 # configure BDB 4130 # configure BDB
3956 4131
3957 BDB::min_parallel 8; 4132 BDB::min_parallel 16;
3958 BDB::max_poll_reqs $TICK * 0.1; 4133 BDB::max_poll_reqs $TICK * 0.1;
3959 $AnyEvent::BDB::WATCHER->priority (1); 4134 $AnyEvent::BDB::WATCHER->priority (1);
3960 4135
3961 unless ($DB_ENV) { 4136 unless ($DB_ENV) {
3962 $DB_ENV = BDB::db_env_create; 4137 $DB_ENV = BDB::db_env_create;
… …
3999 IO::AIO::min_parallel 8; 4174 IO::AIO::min_parallel 8;
4000 IO::AIO::max_poll_time $TICK * 0.1; 4175 IO::AIO::max_poll_time $TICK * 0.1;
4001 undef $AnyEvent::AIO::WATCHER; 4176 undef $AnyEvent::AIO::WATCHER;
4002} 4177}
4003 4178
4004my $_log_backtrace; 4179our $_log_backtrace;
4180our $_log_backtrace_last;
4005 4181
4006sub _log_backtrace { 4182sub _log_backtrace {
4007 my ($msg, @addr) = @_; 4183 my ($msg, @addr) = @_;
4008 4184
4009 $msg =~ s/\n//; 4185 $msg =~ s/\n$//;
4010 4186
4187 if ($_log_backtrace_last eq $msg) {
4188 LOG llevInfo, "[ABT] $msg\n";
4189 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4011 # limit the # of concurrent backtraces 4190 # limit the # of concurrent backtraces
4012 if ($_log_backtrace < 2) { 4191 } elsif ($_log_backtrace < 2) {
4192 $_log_backtrace_last = $msg;
4013 ++$_log_backtrace; 4193 ++$_log_backtrace;
4014 my $perl_bt = Carp::longmess $msg; 4194 my $perl_bt = Carp::longmess $msg;
4015 async { 4195 async {
4016 $Coro::current->{desc} = "abt $msg"; 4196 $Coro::current->{desc} = "abt $msg";
4017 4197
… …
4037 LOG llevInfo, "[ABT] $_\n" for @bt; 4217 LOG llevInfo, "[ABT] $_\n" for @bt;
4038 --$_log_backtrace; 4218 --$_log_backtrace;
4039 }; 4219 };
4040 } else { 4220 } else {
4041 LOG llevInfo, "[ABT] $msg\n"; 4221 LOG llevInfo, "[ABT] $msg\n";
4042 LOG llevInfo, "[ABT] [suppressed]\n"; 4222 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4043 } 4223 }
4044} 4224}
4045 4225
4046# load additional modules 4226# load additional modules
4047require "cf/$_.pm" for @EXTRA_MODULES; 4227require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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