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.486 by root, Thu Oct 15 21:56:50 2009 UTC vs.
Revision 1.559 by root, Sat Feb 26 12:50:27 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;
33use Opcode; 31use Opcode;
34use Safe; 32use Safe;
35use Safe::Hole; 33use Safe::Hole;
36use Storable (); 34use Storable ();
35use Carp ();
37 36
38use Guard (); 37use Guard ();
39use Coro (); 38use Coro ();
40use Coro::State; 39use Coro::State;
41use Coro::Handle; 40use Coro::Handle;
… …
52use Coro::Util (); 51use Coro::Util ();
53 52
54use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
55use BDB (); 54use BDB ();
56use Data::Dumper; 55use Data::Dumper;
57use Digest::MD5;
58use Fcntl; 56use Fcntl;
59use YAML::XS (); 57use YAML::XS ();
60use IO::AIO (); 58use IO::AIO ();
61use Time::HiRes; 59use Time::HiRes;
62use Compress::LZF; 60use Compress::LZF;
… …
78# strictly for debugging 76# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 78
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 80
81our @ORIG_INC;
82
83our %COMMAND = (); 83our %COMMAND = ();
84our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
85 85
86our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 87our %EXTCMD = ();
… …
93our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS 94our @REFLECT; # set by XS
95our %REFLECT; # set by us 95our %REFLECT; # set by us
96 96
97our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
98our $DATADIR = datadir; 99our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
102our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 112
111our %RESOURCE; 113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
112 120
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 123our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
118our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
120our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
121our $DB_ENV; 129our $DB_ENV;
122 130
123our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
124 132
125our %CFG; 133our %CFG;
126 134
127our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
128our $RUNTIME; 136our $RUNTIME;
… …
162 170
163our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
164 172
165sub cf::map::normalise; 173sub cf::map::normalise;
166 174
175sub in_main() {
176 $Coro::current == $Coro::main
177}
178
167############################################################################# 179#############################################################################
168 180
169%REFLECT = (); 181%REFLECT = ();
170for (@REFLECT) { 182for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 183 my $reflect = JSON::XS::decode_json $_;
… …
223from wherever your confdir points to. 235from wherever your confdir points to.
224 236
225=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
226 238
227These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
228returns directly I<after> the tick processing (and consequently, can only wake one process 240returns directly I<after> the tick processing (and consequently, can only wake one thread
229per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 241per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
230 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
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
235that call. 252that call.
236 253
237=item %cf::REFLECT 254=item %cf::REFLECT
238 255
… …
242 259
243=back 260=back
244 261
245=cut 262=cut
246 263
264sub error(@) { LOG llevError, join "", @_ }
265sub warn (@) { LOG llevWarn , join "", @_ }
266sub info (@) { LOG llevInfo , join "", @_ }
267sub debug(@) { LOG llevDebug, join "", @_ }
268sub trace(@) { LOG llevTrace, join "", @_ }
269
247$Coro::State::WARNHOOK = sub { 270$Coro::State::WARNHOOK = sub {
248 my $msg = join "", @_; 271 my $msg = join "", @_;
249 272
250 $msg .= "\n" 273 $msg .= "\n"
251 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
252 275
253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 276 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
254 277
255 LOG llevError, $msg; 278 LOG llevWarn, $msg;
256}; 279};
257 280
258$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
260 283
261 warn Carp::longmess $_[0]; 284 error Carp::longmess $_[0];
262 285
263 if ($Coro::current == $Coro::main) {#d# 286 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 288 return;#d#
266 }#d# 289 }#d#
267 290
268 # kill coroutine otherwise 291 # kill coroutine otherwise
269 Coro::terminate 292 Coro::terminate
… …
289)) { 312)) {
290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
291} 314}
292 315
293$EV::DIED = sub { 316$EV::DIED = sub {
294 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
295}; 318};
296 319
297############################################################################# 320#############################################################################
298 321
299=head2 UTILITY FUNCTIONS 322=head2 UTILITY FUNCTIONS
… …
336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 359our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
337 360
338sub encode_json($) { $json_coder->encode ($_[0]) } 361sub encode_json($) { $json_coder->encode ($_[0]) }
339sub decode_json($) { $json_coder->decode ($_[0]) } 362sub decode_json($) { $json_coder->decode ($_[0]) }
340 363
364=item $ref = cf::yaml_load $scalar
365
366Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
367
368=cut
369
370sub fork_call(&@);
371
372sub yaml_load($) {
373 fork_call { YAML::XS::Load $_[0] } @_
374}
375
341=item cf::post_init { BLOCK } 376=item cf::post_init { BLOCK }
342 377
343Execute the given codeblock, I<after> all extensions have been (re-)loaded, 378Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again. 379but I<before> the server starts ticking again.
345 380
346The cdoeblock will have a single boolean argument to indicate whether this 381The codeblock will have a single boolean argument to indicate whether this
347is a reload or not. 382is a reload or not.
348 383
349=cut 384=cut
350 385
351sub post_init(&) { 386sub post_init(&) {
352 push @POST_INIT, shift; 387 push @POST_INIT, shift;
388}
389
390sub _post_init {
391 trace "running post_init jobs";
392
393 # run them in parallel...
394
395 my @join;
396
397 while () {
398 push @join, map &Coro::async ($_, 0), @POST_INIT;
399 @POST_INIT = ();
400
401 @join or last;
402
403 (pop @join)->join;
404 }
353} 405}
354 406
355=item cf::lock_wait $string 407=item cf::lock_wait $string
356 408
357Wait until the given lock is available. See cf::lock_acquire. 409Wait until the given lock is available. See cf::lock_acquire.
… …
396} 448}
397 449
398=item cf::periodic $interval, $cb 450=item cf::periodic $interval, $cb
399 451
400Like EV::periodic, but randomly selects a starting point so that the actions 452Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 453get spread over time.
402 454
403=cut 455=cut
404 456
405sub periodic($$) { 457sub periodic($$) {
406 my ($interval, $cb) = @_; 458 my ($interval, $cb) = @_;
… …
423 475
424=cut 476=cut
425 477
426our @SLOT_QUEUE; 478our @SLOT_QUEUE;
427our $SLOT_QUEUE; 479our $SLOT_QUEUE;
480our $SLOT_DECAY = 0.9;
428 481
429$SLOT_QUEUE->cancel if $SLOT_QUEUE; 482$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async { 483$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager"); 484 $Coro::current->desc ("timeslot manager");
432 485
433 my $signal = new Coro::Signal; 486 my $signal = new Coro::Signal;
487 my $busy;
434 488
435 while () { 489 while () {
436 next_job: 490 next_job:
491
437 my $avail = cf::till_tick; 492 my $avail = cf::till_tick;
438 if ($avail > 0.01) { 493
439 for (0 .. $#SLOT_QUEUE) { 494 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) { 495 if ($SLOT_QUEUE[$_][0] <= $avail) {
496 $busy = 0;
441 my $job = splice @SLOT_QUEUE, $_, 1, (); 497 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send; 498 $job->[2]->send;
443 Coro::cede; 499 Coro::cede;
444 goto next_job; 500 goto next_job;
445 } 501 } else {
502 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446 } 503 }
447 } 504 }
448 505
449 if (@SLOT_QUEUE) { 506 if (@SLOT_QUEUE) {
450 # we do not use wait_for_tick() as it returns immediately when tick is inactive 507 # we do not use wait_for_tick() as it returns immediately when tick is inactive
451 push @cf::WAIT_FOR_TICK, $signal; 508 push @cf::WAIT_FOR_TICK, $signal;
452 $signal->wait; 509 $signal->wait;
453 } else { 510 } else {
511 $busy = 0;
454 Coro::schedule; 512 Coro::schedule;
455 } 513 }
456 } 514 }
457}; 515};
458 516
459sub get_slot($;$$) { 517sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main; 518 return if tick_inhibit || $Coro::current == $Coro::main;
461 519
462 my ($time, $pri, $name) = @_; 520 my ($time, $pri, $name) = @_;
463 521
464 $time = $TICK * .6 if $time > $TICK * .6; 522 $time = clamp $time, 0.01, $TICK * .6;
523
465 my $sig = new Coro::Signal; 524 my $sig = new Coro::Signal;
466 525
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 526 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 527 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready; 528 $SLOT_QUEUE->ready;
… …
495=cut 554=cut
496 555
497sub sync_job(&) { 556sub sync_job(&) {
498 my ($job) = @_; 557 my ($job) = @_;
499 558
500 if ($Coro::current == $Coro::main) { 559 if (in_main) {
501 my $time = EV::time; 560 my $time = AE::time;
502 561
503 # this is the main coro, too bad, we have to block 562 # this is the main coro, too bad, we have to block
504 # till the operation succeeds, freezing the server :/ 563 # till the operation succeeds, freezing the server :/
505 564
506 LOG llevError, Carp::longmess "sync job";#d# 565 #LOG llevError, Carp::longmess "sync job";#d#
507 566
508 my $freeze_guard = freeze_mainloop; 567 my $freeze_guard = freeze_mainloop;
509 568
510 my $busy = 1; 569 my $busy = 1;
511 my @res; 570 my @res;
512 571
513 (async { 572 (async {
514 $Coro::current->desc ("sync job coro"); 573 $Coro::current->desc ("sync job coro");
515 @res = eval { $job->() }; 574 @res = eval { $job->() };
516 warn $@ if $@; 575 error $@ if $@;
517 undef $busy; 576 undef $busy;
518 })->prio (Coro::PRIO_MAX); 577 })->prio (Coro::PRIO_MAX);
519 578
520 while ($busy) { 579 while ($busy) {
521 if (Coro::nready) { 580 if (Coro::nready) {
… …
523 } else { 582 } else {
524 EV::loop EV::LOOP_ONESHOT; 583 EV::loop EV::LOOP_ONESHOT;
525 } 584 }
526 } 585 }
527 586
528 my $time = EV::time - $time; 587 my $time = AE::time - $time;
529 588
530 $TICK_START += $time; # do not account sync jobs to server load 589 $TICK_START += $time; # do not account sync jobs to server load
531 590
532 wantarray ? @res : $res[0] 591 wantarray ? @res : $res[0]
533 } else { 592 } else {
… …
555 $EXT_CORO{$coro+0} = $coro; 614 $EXT_CORO{$coro+0} = $coro;
556 615
557 $coro 616 $coro
558} 617}
559 618
560=item fork_call { }, $args 619=item fork_call { }, @args
561 620
562Executes the given code block with the given arguments in a seperate 621Executes the given code block with the given arguments in a seperate
563process, returning the results. Everything must be serialisable with 622process, returning the results. Everything must be serialisable with
564Coro::Storable. May, of course, block. Note that the executed sub may 623Coro::Storable. May, of course, block. Note that the executed sub may
565never block itself or use any form of event handling. 624never block itself or use any form of event handling.
566 625
567=cut 626=cut
568 627
628sub post_fork {
629 reset_signals;
630}
631
569sub fork_call(&@) { 632sub fork_call(&@) {
570 my ($cb, @args) = @_; 633 my ($cb, @args) = @_;
571 634
572 # we seemingly have to make a local copy of the whole thing, 635 # we seemingly have to make a local copy of the whole thing,
573 # otherwise perl prematurely frees the stuff :/ 636 # otherwise perl prematurely frees the stuff :/
574 # TODO: investigate and fix (likely this will be rather laborious) 637 # TODO: investigate and fix (likely this will be rather laborious)
575 638
576 my @res = Coro::Util::fork_eval { 639 my @res = Coro::Util::fork_eval {
577 reset_signals; 640 cf::post_fork;
578 &$cb 641 &$cb
579 }, @args; 642 } @args;
580 643
581 wantarray ? @res : $res[-1] 644 wantarray ? @res : $res[-1]
645}
646
647sub objinfo {
648 (
649 "counter value" => cf::object::object_count,
650 "objects created" => cf::object::create_count,
651 "objects destroyed" => cf::object::destroy_count,
652 "freelist size" => cf::object::free_count,
653 "allocated objects" => cf::object::objects_size,
654 "active objects" => cf::object::actives_size,
655 )
582} 656}
583 657
584=item $coin = coin_from_name $name 658=item $coin = coin_from_name $name
585 659
586=cut 660=cut
… …
623within each server. 697within each server.
624 698
625=cut 699=cut
626 700
627sub db_table($) { 701sub db_table($) {
702 cf::error "db_get called from main context"
703 if $Coro::current == $Coro::main;
704
628 my ($name) = @_; 705 my ($name) = @_;
629 my $db = BDB::db_create $DB_ENV; 706 my $db = BDB::db_create $DB_ENV;
630 707
631 eval { 708 eval {
632 $db->set_flags (BDB::CHKSUM); 709 $db->set_flags (BDB::CHKSUM);
… …
642} 719}
643 720
644our $DB; 721our $DB;
645 722
646sub db_init { 723sub db_init {
647 cf::sync_job {
648 $DB ||= db_table "db"; 724 $DB ||= db_table "db";
649 };
650} 725}
651 726
652sub db_get($$) { 727sub db_get($$) {
653 my $key = "$_[0]/$_[1]"; 728 my $key = "$_[0]/$_[1]";
654 729
655 cf::sync_job { 730 cf::error "db_get called from main context"
731 if $Coro::current == $Coro::main;
732
656 BDB::db_get $DB, undef, $key, my $data; 733 BDB::db_get $DB, undef, $key, my $data;
657 734
658 $! ? () 735 $! ? ()
659 : $data 736 : $data
660 }
661} 737}
662 738
663sub db_put($$$) { 739sub db_put($$$) {
664 BDB::dbreq_pri 4; 740 BDB::dbreq_pri 4;
665 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 741 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
721 797
722 my $t1 = Time::HiRes::time; 798 my $t1 = Time::HiRes::time;
723 my $data = $process->(\@data); 799 my $data = $process->(\@data);
724 my $t2 = Time::HiRes::time; 800 my $t2 = Time::HiRes::time;
725 801
726 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 802 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
727 803
728 db_put cache => "$id/data", $data; 804 db_put cache => "$id/data", $data;
729 db_put cache => "$id/md5" , $md5; 805 db_put cache => "$id/md5" , $md5;
730 db_put cache => "$id/meta", $meta; 806 db_put cache => "$id/meta", $meta;
731 807
… …
741 817
742=cut 818=cut
743 819
744sub datalog($@) { 820sub datalog($@) {
745 my ($type, %kv) = @_; 821 my ($type, %kv) = @_;
746 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 822 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
747} 823}
748 824
749=back 825=back
750 826
751=cut 827=cut
… …
946 1022
947 } elsif (exists $cb_id{$type}) { 1023 } elsif (exists $cb_id{$type}) {
948 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1024 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
949 1025
950 } elsif (ref $type) { 1026 } elsif (ref $type) {
951 warn "attaching objects not supported, ignoring.\n"; 1027 error "attaching objects not supported, ignoring.\n";
952 1028
953 } else { 1029 } else {
954 shift @arg; 1030 shift @arg;
955 warn "attach argument '$type' not supported, ignoring.\n"; 1031 error "attach argument '$type' not supported, ignoring.\n";
956 } 1032 }
957 } 1033 }
958} 1034}
959 1035
960sub _object_attach { 1036sub _object_attach {
… …
970 _attach $registry, $klass, @attach; 1046 _attach $registry, $klass, @attach;
971 } 1047 }
972 1048
973 $obj->{$name} = \%arg; 1049 $obj->{$name} = \%arg;
974 } else { 1050 } else {
975 warn "object uses attachment '$name' which is not available, postponing.\n"; 1051 info "object uses attachment '$name' which is not available, postponing.\n";
976 } 1052 }
977 1053
978 $obj->{_attachment}{$name} = undef; 1054 $obj->{_attachment}{$name} = undef;
979} 1055}
980 1056
… …
1039 1115
1040 for (@$callbacks) { 1116 for (@$callbacks) {
1041 eval { &{$_->[1]} }; 1117 eval { &{$_->[1]} };
1042 1118
1043 if ($@) { 1119 if ($@) {
1044 warn "$@";
1045 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1120 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1046 override; 1121 override;
1047 } 1122 }
1048 1123
1049 return 1 if $override; 1124 return 1 if $override;
1050 } 1125 }
… …
1129 for (@$attach) { 1204 for (@$attach) {
1130 my ($klass, @attach) = @$_; 1205 my ($klass, @attach) = @$_;
1131 _attach $registry, $klass, @attach; 1206 _attach $registry, $klass, @attach;
1132 } 1207 }
1133 } else { 1208 } else {
1134 warn "object uses attachment '$name' that is not available, postponing.\n"; 1209 info "object uses attachment '$name' that is not available, postponing.\n";
1135 } 1210 }
1136 } 1211 }
1137} 1212}
1138 1213
1139cf::attachable->attach ( 1214cf::attachable->attach (
… …
1166 my ($filename, $rdata, $objs) = @_; 1241 my ($filename, $rdata, $objs) = @_;
1167 1242
1168 sync_job { 1243 sync_job {
1169 if (length $$rdata) { 1244 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename); 1245 utf8::decode (my $decname = $filename);
1171 warn sprintf "saving %s (%d,%d)\n", 1246 trace sprintf "saving %s (%d,%d)\n",
1172 $decname, length $$rdata, scalar @$objs; 1247 $decname, length $$rdata, scalar @$objs
1248 if $VERBOSE_IO;
1173 1249
1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1250 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175 aio_chmod $fh, SAVE_MODE; 1251 aio_chmod $fh, SAVE_MODE;
1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1252 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177 if ($cf::USE_FSYNC) { 1253 if ($cf::USE_FSYNC) {
… …
1199 aio_rename "$filename~", $filename; 1275 aio_rename "$filename~", $filename;
1200 1276
1201 $filename =~ s%/[^/]+$%%; 1277 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC; 1278 aio_pathsync $filename if $cf::USE_FSYNC;
1203 } else { 1279 } else {
1204 warn "unable to save objects: $filename~: $!\n"; 1280 error "unable to save objects: $filename~: $!\n";
1205 } 1281 }
1206 } else { 1282 } else {
1207 aio_unlink $filename; 1283 aio_unlink $filename;
1208 aio_unlink "$filename.pst"; 1284 aio_unlink "$filename.pst";
1209 } 1285 }
… …
1233 my $st = eval { Coro::Storable::thaw $av }; 1309 my $st = eval { Coro::Storable::thaw $av };
1234 $av = $st->{objs}; 1310 $av = $st->{objs};
1235 } 1311 }
1236 1312
1237 utf8::decode (my $decname = $filename); 1313 utf8::decode (my $decname = $filename);
1238 warn sprintf "loading %s (%d,%d)\n", 1314 trace sprintf "loading %s (%d,%d)\n",
1239 $decname, length $data, scalar @{$av || []}; 1315 $decname, length $data, scalar @{$av || []}
1316 if $VERBOSE_IO;
1240 1317
1241 ($data, $av) 1318 ($data, $av)
1242} 1319}
1243 1320
1244=head2 COMMAND CALLBACKS 1321=head2 COMMAND CALLBACKS
… …
1303} 1380}
1304 1381
1305use File::Glob (); 1382use File::Glob ();
1306 1383
1307cf::player->attach ( 1384cf::player->attach (
1308 on_command => sub { 1385 on_unknown_command => sub {
1309 my ($pl, $name, $params) = @_; 1386 my ($pl, $name, $params) = @_;
1310 1387
1311 my $cb = $COMMAND{$name} 1388 my $cb = $COMMAND{$name}
1312 or return; 1389 or return;
1313 1390
… …
1336 1413
1337 $pl->ext_reply ($reply, @reply) 1414 $pl->ext_reply ($reply, @reply)
1338 if $reply; 1415 if $reply;
1339 1416
1340 } else { 1417 } else {
1341 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1418 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1342 } 1419 }
1343 1420
1344 cf::override; 1421 cf::override;
1345 }, 1422 },
1346); 1423);
… …
1357 1434
1358 $grp 1435 $grp
1359} 1436}
1360 1437
1361sub load_extensions { 1438sub load_extensions {
1439 info "loading extensions...";
1440
1362 cf::sync_job { 1441 cf::sync_job {
1363 my %todo; 1442 my %todo;
1364 1443
1365 for my $path (<$LIBDIR/*.ext>) { 1444 for my $path (<$LIBDIR/*.ext>) {
1366 next unless -r $path; 1445 next unless -r $path;
… …
1384 1463
1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1464 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1465 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1387 1466
1388 $ext{source} = 1467 $ext{source} =
1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1468 "package $pkg; use common::sense;\n"
1390 . "#line 1 \"$path\"\n{\n" 1469 . "#line 1 \"$path\"\n{\n"
1391 . $source 1470 . $source
1392 . "\n};\n1"; 1471 . "\n};\n1";
1393 1472
1394 $todo{$base} = \%ext; 1473 $todo{$base} = \%ext;
1395 } 1474 }
1396 1475
1476 my $pass = 0;
1397 my %done; 1477 my %done;
1398 while (%todo) { 1478 while (%todo) {
1399 my $progress; 1479 my $progress;
1400 1480
1481 ++$pass;
1482
1483 ext:
1401 while (my ($k, $v) = each %todo) { 1484 while (my ($k, $v) = each %todo) {
1402 for (split /,\s*/, $v->{meta}{depends}) { 1485 for (split /,\s*/, $v->{meta}{depends}) {
1403 goto skip 1486 next ext
1404 unless exists $done{$_}; 1487 unless exists $done{$_};
1405 } 1488 }
1406 1489
1407 warn "... loading '$k' into '$v->{pkg}'\n"; 1490 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1408 1491
1409 unless (eval $v->{source}) { 1492 my $active = eval $v->{source};
1493
1494 if (length $@) {
1410 my $msg = $@ ? "$v->{path}: $@\n" 1495 error "$v->{path}: $@\n";
1411 : "$v->{base}: extension inactive.\n";
1412 1496
1413 if (exists $v->{meta}{mandatory}) {
1414 warn $msg;
1415 cf::cleanup "mandatory extension failed to load, exiting."; 1497 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1416 } 1498 if exists $v->{meta}{mandatory};
1417 1499
1418 warn $msg; 1500 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1501 delete $todo{$k};
1502 } else {
1503 $done{$k} = delete $todo{$k};
1504 push @EXTS, $v->{pkg};
1505 $progress = 1;
1506
1507 info "$v->{base}: extension inactive.\n"
1508 unless $active;
1419 } 1509 }
1420
1421 $done{$k} = delete $todo{$k};
1422 push @EXTS, $v->{pkg};
1423 $progress = 1;
1424 } 1510 }
1425 1511
1426 skip: 1512 unless ($progress) {
1427 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1513 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1428 unless $progress; 1514
1515 while (my ($k, $v) = each %todo) {
1516 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1517 if exists $v->{meta}{mandatory};
1518 }
1519 }
1429 } 1520 }
1430 }; 1521 };
1431} 1522}
1432 1523
1433############################################################################# 1524#############################################################################
… …
1517 $cf::PLAYER{$login} = $pl 1608 $cf::PLAYER{$login} = $pl
1518 } 1609 }
1519 } 1610 }
1520} 1611}
1521 1612
1613cf::player->attach (
1614 on_load => sub {
1615 my ($pl, $path) = @_;
1616
1617 # restore slots saved in save, below
1618 my $slots = delete $pl->{_slots};
1619
1620 $pl->ob->current_weapon ($slots->[0]);
1621 $pl->combat_ob ($slots->[1]);
1622 $pl->ranged_ob ($slots->[2]);
1623 },
1624);
1625
1522sub save($) { 1626sub save($) {
1523 my ($pl) = @_; 1627 my ($pl) = @_;
1524 1628
1525 return if $pl->{deny_save}; 1629 return if $pl->{deny_save};
1526 1630
… …
1531 1635
1532 aio_mkdir playerdir $pl, 0770; 1636 aio_mkdir playerdir $pl, 0770;
1533 $pl->{last_save} = $cf::RUNTIME; 1637 $pl->{last_save} = $cf::RUNTIME;
1534 1638
1535 cf::get_slot 0.01; 1639 cf::get_slot 0.01;
1640
1641 # save slots, to be restored later
1642 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1536 1643
1537 $pl->save_pl ($path); 1644 $pl->save_pl ($path);
1538 cf::cede_to_tick; 1645 cf::cede_to_tick;
1539} 1646}
1540 1647
… …
1574 my $name = $pl->ob->name; 1681 my $name = $pl->ob->name;
1575 1682
1576 $pl->{deny_save} = 1; 1683 $pl->{deny_save} = 1;
1577 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1684 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1578 1685
1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1686 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1580 $pl->deactivate; 1687 $pl->deactivate;
1688
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1689 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1583 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1690 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1691 ext::highscore::check ($pl->ob);
1692
1584 $pl->ns->destroy if $pl->ns; 1693 $pl->ns->destroy if $pl->ns;
1585 1694
1586 my $path = playerdir $pl; 1695 my $path = playerdir $pl;
1587 my $temp = "$path~$cf::RUNTIME~deleting~"; 1696 my $temp = "$path~$cf::RUNTIME~deleting~";
1588 aio_rename $path, $temp; 1697 aio_rename $path, $temp;
… …
1642 \@logins 1751 \@logins
1643} 1752}
1644 1753
1645=item $player->maps 1754=item $player->maps
1646 1755
1756=item cf::player::maps $login
1757
1647Returns an arrayref of map paths that are private for this 1758Returns an arrayref of map paths that are private for this
1648player. May block. 1759player. May block.
1649 1760
1650=cut 1761=cut
1651 1762
… …
1713=cut 1824=cut
1714 1825
1715sub find_by_path($) { 1826sub find_by_path($) {
1716 my ($path) = @_; 1827 my ($path) = @_;
1717 1828
1829 $path =~ s/^~[^\/]*//; # skip ~login
1830
1718 my ($match, $specificity); 1831 my ($match, $specificity);
1719 1832
1720 for my $region (list) { 1833 for my $region (list) {
1721 if ($region->{match} && $path =~ $region->{match}) { 1834 if ($region->{match} && $path =~ $region->{match}) {
1722 ($match, $specificity) = ($region, $region->specificity) 1835 ($match, $specificity) = ($region, $region->specificity)
… …
1750sub generate_random_map { 1863sub generate_random_map {
1751 my ($self, $rmp) = @_; 1864 my ($self, $rmp) = @_;
1752 1865
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1866 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754 1867
1755 # mit "rum" bekleckern, nicht
1756 $self->_create_random_map ( 1868 $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} 1869}
1770 1870
1771=item cf::map->register ($regex, $prio) 1871=item cf::map->register ($regex, $prio)
1772 1872
1773Register a handler for the map path matching the given regex at the 1873Register a handler for the map path matching the given regex at the
… …
1778 1878
1779sub register { 1879sub register {
1780 my (undef, $regex, $prio) = @_; 1880 my (undef, $regex, $prio) = @_;
1781 my $pkg = caller; 1881 my $pkg = caller;
1782 1882
1783 no strict;
1784 push @{"$pkg\::ISA"}, __PACKAGE__; 1883 push @{"$pkg\::ISA"}, __PACKAGE__;
1785 1884
1786 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1885 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1787} 1886}
1788 1887
1789# also paths starting with '/' 1888# also paths starting with '/'
1790$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1889$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1791 1890
1792sub thawer_merge { 1891sub thawer_merge {
1793 my ($self, $merge) = @_; 1892 my ($self, $merge) = @_;
1794 1893
1795 # we have to keep some variables in memory intact 1894 # we have to keep some variables in memory intact
… …
1800} 1899}
1801 1900
1802sub normalise { 1901sub normalise {
1803 my ($path, $base) = @_; 1902 my ($path, $base) = @_;
1804 1903
1805 $path = "$path"; # make sure its a string 1904 $path = "$path"; # make sure it's a string
1806 1905
1807 $path =~ s/\.map$//; 1906 $path =~ s/\.map$//;
1808 1907
1809 # map plan: 1908 # map plan:
1810 # 1909 #
… …
1825 $base =~ s{[^/]+/?$}{}; 1924 $base =~ s{[^/]+/?$}{};
1826 $path = "$base/$path"; 1925 $path = "$base/$path";
1827 } 1926 }
1828 1927
1829 for ($path) { 1928 for ($path) {
1830 redo if s{//}{/};
1831 redo if s{/\.?/}{/}; 1929 redo if s{/\.?/}{/};
1832 redo if s{/[^/]+/\.\./}{/}; 1930 redo if s{/[^/]+/\.\./}{/};
1833 } 1931 }
1834 1932
1835 $path 1933 $path
… …
1849 $self->init; # pass $1 etc. 1947 $self->init; # pass $1 etc.
1850 return $self; 1948 return $self;
1851 } 1949 }
1852 } 1950 }
1853 1951
1854 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1952 Carp::cluck "unable to resolve path '$path' (base '$base')";
1855 () 1953 ()
1856} 1954}
1857 1955
1858sub init { 1956sub init {
1859 my ($self) = @_; 1957 my ($self) = @_;
… …
1981} 2079}
1982 2080
1983sub find; 2081sub find;
1984sub find { 2082sub find {
1985 my ($path, $origin) = @_; 2083 my ($path, $origin) = @_;
2084
2085 cf::cede_to_tick;
1986 2086
1987 $path = normalise $path, $origin && $origin->path; 2087 $path = normalise $path, $origin && $origin->path;
1988 2088
1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2089 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1990 my $guard2 = cf::lock_acquire "map_find:$path"; 2090 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2009 2109
2010 $cf::MAP{$path} = $map 2110 $cf::MAP{$path} = $map
2011 } 2111 }
2012} 2112}
2013 2113
2014sub pre_load { } 2114sub pre_load { }
2015sub post_load { } 2115#sub post_load { } # XS
2016 2116
2017sub load { 2117sub load {
2018 my ($self) = @_; 2118 my ($self) = @_;
2019 2119
2020 local $self->{deny_reset} = 1; # loading can take a long time 2120 local $self->{deny_reset} = 1; # loading can take a long time
… …
2075 2175
2076 $self->in_memory (cf::MAP_ACTIVE); 2176 $self->in_memory (cf::MAP_ACTIVE);
2077 } 2177 }
2078 2178
2079 $self->post_load; 2179 $self->post_load;
2080}
2081 2180
2181 1
2182}
2183
2184# customize the map for a given player, i.e.
2185# return the _real_ map. used by e.g. per-player
2186# maps to change the path to ~playername/mappath
2082sub customise_for { 2187sub customise_for {
2083 my ($self, $ob) = @_; 2188 my ($self, $ob) = @_;
2084 2189
2085 return find "~" . $ob->name . "/" . $self->{path} 2190 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2191 if $self->per_player;
… …
2102 or next; 2207 or next;
2103 $neigh = find $neigh, $map 2208 $neigh = find $neigh, $map
2104 or next; 2209 or next;
2105 $neigh->load; 2210 $neigh->load;
2106 2211
2212 # now find the diagonal neighbours
2107 push @neigh, 2213 push @neigh,
2108 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2214 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2109 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2215 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2110 } 2216 }
2111 2217
… …
2118} 2224}
2119 2225
2120sub find_sync { 2226sub find_sync {
2121 my ($path, $origin) = @_; 2227 my ($path, $origin) = @_;
2122 2228
2123 cf::sync_job { find $path, $origin } 2229 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2230 if $Coro::current == $Coro::main;
2231
2232 find $path, $origin
2124} 2233}
2125 2234
2126sub do_load_sync { 2235sub do_load_sync {
2127 my ($map) = @_; 2236 my ($map) = @_;
2128 2237
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2238 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main; 2239 if $Coro::current == $Coro::main;
2131 2240
2132 cf::sync_job { $map->load }; 2241 $map->load;
2133} 2242}
2134 2243
2135our %MAP_PREFETCH; 2244our %MAP_PREFETCH;
2136our $MAP_PREFETCHER = undef; 2245our $MAP_PREFETCHER = undef;
2137 2246
… …
2163 $MAP_PREFETCHER->prio (6); 2272 $MAP_PREFETCHER->prio (6);
2164 2273
2165 () 2274 ()
2166} 2275}
2167 2276
2277# common code, used by both ->save and ->swapout
2168sub save { 2278sub _save {
2169 my ($self) = @_; 2279 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172 2280
2173 $self->{last_save} = $cf::RUNTIME; 2281 $self->{last_save} = $cf::RUNTIME;
2174 2282
2175 return unless $self->dirty; 2283 return unless $self->dirty;
2176 2284
… …
2196 } else { 2304 } else {
2197 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2305 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2198 } 2306 }
2199} 2307}
2200 2308
2309sub save {
2310 my ($self) = @_;
2311
2312 my $lock = cf::lock_acquire "map_data:$self->{path}";
2313
2314 $self->_save;
2315}
2316
2201sub swap_out { 2317sub swap_out {
2202 my ($self) = @_; 2318 my ($self) = @_;
2203 2319
2204 # save first because save cedes
2205 $self->save;
2206
2207 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2320 my $lock = cf::lock_acquire "map_data:$self->{path}";
2208 2321
2209 return if $self->players;
2210 return if $self->in_memory != cf::MAP_ACTIVE; 2322 return if $self->in_memory != cf::MAP_ACTIVE;
2211 return if $self->{deny_save}; 2323 return if $self->{deny_save};
2324 return if $self->players;
2212 2325
2326 # first deactivate the map and "unlink" it from the core
2327 $self->deactivate;
2328 $_->clear_links_to ($self) for values %cf::MAP;
2213 $self->in_memory (cf::MAP_SWAPPED); 2329 $self->in_memory (cf::MAP_SWAPPED);
2330
2331 # then atomically save
2332 $self->_save;
2333
2334 # then free the map
2335 $self->clear;
2336}
2337
2338sub reset_at {
2339 my ($self) = @_;
2340
2341 # TODO: safety, remove and allow resettable per-player maps
2342 return 1e99 if $self->{deny_reset};
2343
2344 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2345 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2346
2347 $time + $to
2348}
2349
2350sub should_reset {
2351 my ($self) = @_;
2352
2353 $self->reset_at <= $cf::RUNTIME
2354}
2355
2356sub reset {
2357 my ($self) = @_;
2358
2359 my $lock = cf::lock_acquire "map_data:$self->{path}";
2360
2361 return if $self->players;
2362
2363 cf::trace "resetting map ", $self->path, "\n";
2364
2365 $self->in_memory (cf::MAP_SWAPPED);
2366
2367 # need to save uniques path
2368 unless ($self->{deny_save}) {
2369 my $uniq = $self->uniq_path; utf8::encode $uniq;
2370
2371 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2372 if $uniq;
2373 }
2374
2375 delete $cf::MAP{$self->path};
2214 2376
2215 $self->deactivate; 2377 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP; 2378 $_->clear_links_to ($self) for values %cf::MAP;
2217 $self->clear; 2379 $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 2380
2263 $self->unlink_save; 2381 $self->unlink_save;
2264 $self->destroy; 2382 $self->destroy;
2265} 2383}
2266 2384
… …
2274 2392
2275 delete $cf::MAP{$self->path}; 2393 delete $cf::MAP{$self->path};
2276 2394
2277 $self->unlink_save; 2395 $self->unlink_save;
2278 2396
2279 bless $self, "cf::map"; 2397 bless $self, "cf::map::wrap";
2280 delete $self->{deny_reset}; 2398 delete $self->{deny_reset};
2281 $self->{deny_save} = 1; 2399 $self->{deny_save} = 1;
2282 $self->reset_timeout (1); 2400 $self->reset_timeout (1);
2283 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2401 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2284 2402
… …
2341 : normalise $_ 2459 : normalise $_
2342 } @{ aio_readdir $UNIQUEDIR or [] } 2460 } @{ aio_readdir $UNIQUEDIR or [] }
2343 ] 2461 ]
2344} 2462}
2345 2463
2464=item cf::map::static_maps
2465
2466Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2467file in the shared directory excluding F</styles> and F</editor>). May
2468block.
2469
2470=cut
2471
2472sub static_maps() {
2473 my @dirs = "";
2474 my @maps;
2475
2476 while (@dirs) {
2477 my $dir = shift @dirs;
2478
2479 next if $dir eq "/styles" || $dir eq "/editor";
2480
2481 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2482 or return;
2483
2484 for (@$files) {
2485 s/\.map$// or next;
2486 utf8::decode $_;
2487 push @maps, "$dir/$_";
2488 }
2489
2490 push @dirs, map "$dir/$_", @$dirs;
2491 }
2492
2493 \@maps
2494}
2495
2346=back 2496=back
2347 2497
2348=head3 cf::object 2498=head3 cf::object
2349 2499
2350=cut 2500=cut
… …
2482 2632
2483Freezes the player and moves him/her to a special map (C<{link}>). 2633Freezes the player and moves him/her to a special map (C<{link}>).
2484 2634
2485The player should be reasonably safe there for short amounts of time (e.g. 2635The player should be reasonably safe there for short amounts of time (e.g.
2486for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2636for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2487though, as the palyer cannot control the character while it is on the link 2637though, as the player cannot control the character while it is on the link
2488map. 2638map.
2489 2639
2490Will never block. 2640Will never block.
2491 2641
2492=item $player_object->leave_link ($map, $x, $y) 2642=item $player_object->leave_link ($map, $x, $y)
… …
2513sub cf::object::player::enter_link { 2663sub cf::object::player::enter_link {
2514 my ($self) = @_; 2664 my ($self) = @_;
2515 2665
2516 $self->deactivate_recursive; 2666 $self->deactivate_recursive;
2517 2667
2668 ++$self->{_link_recursion};
2669
2518 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2670 return if UNIVERSAL::isa $self->map, "ext::map_link";
2519 2671
2520 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2672 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2521 if $self->map && $self->map->{path} ne "{link}"; 2673 if $self->map && $self->map->{path} ne "{link}";
2522 2674
2523 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2675 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2524} 2676}
2525 2677
2526sub cf::object::player::leave_link { 2678sub cf::object::player::leave_link {
2527 my ($self, $map, $x, $y) = @_; 2679 my ($self, $map, $x, $y) = @_;
2528 2680
… …
2545 ($x, $y) = (-1, -1) 2697 ($x, $y) = (-1, -1)
2546 unless (defined $x) && (defined $y); 2698 unless (defined $x) && (defined $y);
2547 2699
2548 # use -1 or undef as default coordinates, not 0, 0 2700 # use -1 or undef as default coordinates, not 0, 0
2549 ($x, $y) = ($map->enter_x, $map->enter_y) 2701 ($x, $y) = ($map->enter_x, $map->enter_y)
2550 if $x <=0 && $y <= 0; 2702 if $x <= 0 && $y <= 0;
2551 2703
2552 $map->load; 2704 $map->load;
2553 $map->load_neighbours; 2705 $map->load_neighbours;
2554 2706
2555 return unless $self->contr->active; 2707 return unless $self->contr->active;
2556 2708
2557 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2709 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2558 $self->enter_map ($map, $x, $y); 2710 if ($self->enter_map ($map, $x, $y)) {
2559 2711 # entering was successful
2712 delete $self->{_link_recursion};
2560 # only activate afterwards, to support waiting in hooks 2713 # only activate afterwards, to support waiting in hooks
2561 $self->activate_recursive; 2714 $self->activate_recursive;
2562} 2715 }
2563 2716
2717}
2718
2564=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2719=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2565 2720
2566Moves the player to the given map-path and coordinates by first freezing 2721Moves the player to the given map-path and coordinates by first freezing
2567her, loading and preparing them map, calling the provided $check callback 2722her, loading and preparing them map, calling the provided $check callback
2568that has to return the map if sucecssful, and then unfreezes the player on 2723that has to return the map if sucecssful, and then unfreezes the player on
2569the new (success) or old (failed) map position. In either case, $done will 2724the new (success) or old (failed) map position. In either case, $done will
… …
2576 2731
2577our $GOTOGEN; 2732our $GOTOGEN;
2578 2733
2579sub cf::object::player::goto { 2734sub cf::object::player::goto {
2580 my ($self, $path, $x, $y, $check, $done) = @_; 2735 my ($self, $path, $x, $y, $check, $done) = @_;
2736
2737 if ($self->{_link_recursion} >= $MAX_LINKS) {
2738 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2739 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2740 ($path, $x, $y) = @$EMERGENCY_POSITION;
2741 }
2581 2742
2582 # do generation counting so two concurrent goto's will be executed in-order 2743 # do generation counting so two concurrent goto's will be executed in-order
2583 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2744 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2584 2745
2585 $self->enter_link; 2746 $self->enter_link;
… …
2609 my $map = eval { 2770 my $map = eval {
2610 my $map = defined $path ? cf::map::find $path : undef; 2771 my $map = defined $path ? cf::map::find $path : undef;
2611 2772
2612 if ($map) { 2773 if ($map) {
2613 $map = $map->customise_for ($self); 2774 $map = $map->customise_for ($self);
2614 $map = $check->($map) if $check && $map; 2775 $map = $check->($map, $x, $y, $self) if $check && $map;
2615 } else { 2776 } else {
2616 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2777 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2617 } 2778 }
2618 2779
2619 $map 2780 $map
… …
2627 if ($gen == $self->{_goto_generation}) { 2788 if ($gen == $self->{_goto_generation}) {
2628 delete $self->{_goto_generation}; 2789 delete $self->{_goto_generation};
2629 $self->leave_link ($map, $x, $y); 2790 $self->leave_link ($map, $x, $y);
2630 } 2791 }
2631 2792
2632 $done->() if $done; 2793 $done->($self) if $done;
2633 })->prio (1); 2794 })->prio (1);
2634} 2795}
2635 2796
2636=item $player_object->enter_exit ($exit_object) 2797=item $player_object->enter_exit ($exit_object)
2637 2798
… …
2730 $self->message ("Something went wrong deep within the deliantra server. " 2891 $self->message ("Something went wrong deep within the deliantra server. "
2731 . "I'll try to bring you back to the map you were before. " 2892 . "I'll try to bring you back to the map you were before. "
2732 . "Please report this to the dungeon master!", 2893 . "Please report this to the dungeon master!",
2733 cf::NDI_UNIQUE | cf::NDI_RED); 2894 cf::NDI_UNIQUE | cf::NDI_RED);
2734 2895
2735 warn "ERROR in enter_exit: $@"; 2896 error "ERROR in enter_exit: $@";
2736 $self->leave_link; 2897 $self->leave_link;
2737 } 2898 }
2738 })->prio (1); 2899 })->prio (1);
2739} 2900}
2740 2901
… …
2752sub cf::client::send_drawinfo { 2913sub cf::client::send_drawinfo {
2753 my ($self, $text, $flags) = @_; 2914 my ($self, $text, $flags) = @_;
2754 2915
2755 utf8::encode $text; 2916 utf8::encode $text;
2756 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2917 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2918}
2919
2920=item $client->send_big_packet ($pkt)
2921
2922Like C<send_packet>, but tries to compress large packets, and fragments
2923them as required.
2924
2925=cut
2926
2927our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2928
2929sub cf::client::send_big_packet {
2930 my ($self, $pkt) = @_;
2931
2932 # try lzf for large packets
2933 $pkt = "lzf " . Compress::LZF::compress $pkt
2934 if 1024 <= length $pkt and $self->{can_lzf};
2935
2936 # split very large packets
2937 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2938 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2939 $pkt = "frag";
2940 }
2941
2942 $self->send_packet ($pkt);
2757} 2943}
2758 2944
2759=item $client->send_msg ($channel, $msg, $color, [extra...]) 2945=item $client->send_msg ($channel, $msg, $color, [extra...])
2760 2946
2761Send a drawinfo or msg packet to the client, formatting the msg for the 2947Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2782 "c/examine" => { 2968 "c/examine" => {
2783 id => "infobox", 2969 id => "infobox",
2784 title => "Examine", 2970 title => "Examine",
2785 reply => undef, 2971 reply => undef,
2786 tooltip => "Signs and other items you examined", 2972 tooltip => "Signs and other items you examined",
2973 },
2974 "c/shopinfo" => {
2975 id => "infobox",
2976 title => "Shop Info",
2977 reply => undef,
2978 tooltip => "What your bargaining skill tells you about the shop",
2787 }, 2979 },
2788 "c/book" => { 2980 "c/book" => {
2789 id => "infobox", 2981 id => "infobox",
2790 title => "Book", 2982 title => "Book",
2791 reply => undef, 2983 reply => undef,
… …
2907 my $pkt = "msg " 3099 my $pkt = "msg "
2908 . $self->{json_coder}->encode ( 3100 . $self->{json_coder}->encode (
2909 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3101 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2910 ); 3102 );
2911 3103
2912 # try lzf for large packets
2913 $pkt = "lzf " . Compress::LZF::compress $pkt
2914 if 1024 <= length $pkt and $self->{can_lzf};
2915
2916 # split very large packets
2917 if (8192 < length $pkt and $self->{can_lzf}) {
2918 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2919 $pkt = "frag";
2920 }
2921
2922 $self->send_packet ($pkt); 3104 $self->send_big_packet ($pkt);
2923} 3105}
2924 3106
2925=item $client->ext_msg ($type, @msg) 3107=item $client->ext_msg ($type, @msg)
2926 3108
2927Sends an ext event to the client. 3109Sends an ext event to the client.
… …
2930 3112
2931sub cf::client::ext_msg($$@) { 3113sub cf::client::ext_msg($$@) {
2932 my ($self, $type, @msg) = @_; 3114 my ($self, $type, @msg) = @_;
2933 3115
2934 if ($self->extcmd == 2) { 3116 if ($self->extcmd == 2) {
2935 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3117 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2936 } elsif ($self->extcmd == 1) { # TODO: remove 3118 } elsif ($self->extcmd == 1) { # TODO: remove
2937 push @msg, msgtype => "event_$type"; 3119 push @msg, msgtype => "event_$type";
2938 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3120 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2939 } 3121 }
2940} 3122}
2941 3123
2942=item $client->ext_reply ($msgid, @msg) 3124=item $client->ext_reply ($msgid, @msg)
2943 3125
… …
2947 3129
2948sub cf::client::ext_reply($$@) { 3130sub cf::client::ext_reply($$@) {
2949 my ($self, $id, @msg) = @_; 3131 my ($self, $id, @msg) = @_;
2950 3132
2951 if ($self->extcmd == 2) { 3133 if ($self->extcmd == 2) {
2952 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3134 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2953 } elsif ($self->extcmd == 1) { 3135 } elsif ($self->extcmd == 1) {
2954 #TODO: version 1, remove 3136 #TODO: version 1, remove
2955 unshift @msg, msgtype => "reply", msgid => $id; 3137 unshift @msg, msgtype => "reply", msgid => $id;
2956 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3138 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2957 } 3139 }
2958} 3140}
2959 3141
2960=item $success = $client->query ($flags, "text", \&cb) 3142=item $success = $client->query ($flags, "text", \&cb)
2961 3143
… …
3032 3214
3033 $ns->ext_reply ($reply, @reply) 3215 $ns->ext_reply ($reply, @reply)
3034 if $reply; 3216 if $reply;
3035 3217
3036 } else { 3218 } else {
3037 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3219 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3038 } 3220 }
3039 3221
3040 cf::override; 3222 cf::override;
3041 }, 3223 },
3042); 3224);
… …
3062 3244
3063 $coro 3245 $coro
3064} 3246}
3065 3247
3066cf::client->attach ( 3248cf::client->attach (
3067 on_destroy => sub { 3249 on_client_destroy => sub {
3068 my ($ns) = @_; 3250 my ($ns) = @_;
3069 3251
3070 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3252 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3071 }, 3253 },
3072); 3254);
… …
3088our $safe_hole = new Safe::Hole; 3270our $safe_hole = new Safe::Hole;
3089 3271
3090$SIG{FPE} = 'IGNORE'; 3272$SIG{FPE} = 'IGNORE';
3091 3273
3092$safe->permit_only (Opcode::opset qw( 3274$safe->permit_only (Opcode::opset qw(
3093 :base_core :base_mem :base_orig :base_math 3275 :base_core :base_mem :base_orig :base_math :base_loop
3094 grepstart grepwhile mapstart mapwhile 3276 grepstart grepwhile mapstart mapwhile
3095 sort time 3277 sort time
3096)); 3278));
3097 3279
3098# here we export the classes and methods available to script code 3280# here we export the classes and methods available to script code
… …
3123 decrease split destroy change_exp value msg lore send_msg)], 3305 decrease split destroy change_exp value msg lore send_msg)],
3124 ["cf::object::player" => qw(player)], 3306 ["cf::object::player" => qw(player)],
3125 ["cf::player" => qw(peaceful send_msg)], 3307 ["cf::player" => qw(peaceful send_msg)],
3126 ["cf::map" => qw(trigger)], 3308 ["cf::map" => qw(trigger)],
3127) { 3309) {
3128 no strict 'refs';
3129 my ($pkg, @funs) = @$_; 3310 my ($pkg, @funs) = @$_;
3130 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3311 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3131 for @funs; 3312 for @funs;
3132} 3313}
3133 3314
… …
3150 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3331 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3151 $qcode =~ s/\n/\\n/g; 3332 $qcode =~ s/\n/\\n/g;
3152 3333
3153 %vars = (_dummy => 0) unless %vars; 3334 %vars = (_dummy => 0) unless %vars;
3154 3335
3336 my @res;
3155 local $_; 3337 local $_;
3156 local @safe::cf::_safe_eval_args = values %vars;
3157 3338
3158 my $eval = 3339 my $eval =
3159 "do {\n" 3340 "do {\n"
3160 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3341 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3161 . "#line 0 \"{$qcode}\"\n" 3342 . "#line 0 \"{$qcode}\"\n"
3162 . $code 3343 . $code
3163 . "\n}" 3344 . "\n}"
3164 ; 3345 ;
3165 3346
3347 if ($CFG{safe_eval}) {
3166 sub_generation_inc; 3348 sub_generation_inc;
3349 local @safe::cf::_safe_eval_args = values %vars;
3167 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3350 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3168 sub_generation_inc; 3351 sub_generation_inc;
3352 } else {
3353 local @cf::_safe_eval_args = values %vars;
3354 @res = wantarray ? eval eval : scalar eval $eval;
3355 }
3169 3356
3170 if ($@) { 3357 if ($@) {
3171 warn "$@"; 3358 warn "$@",
3172 warn "while executing safe code '$code'\n"; 3359 "while executing safe code '$code'\n",
3173 warn "with arguments " . (join " ", %vars) . "\n"; 3360 "with arguments " . (join " ", %vars) . "\n";
3174 } 3361 }
3175 3362
3176 wantarray ? @res : $res[0] 3363 wantarray ? @res : $res[0]
3177} 3364}
3178 3365
… …
3192=cut 3379=cut
3193 3380
3194sub register_script_function { 3381sub register_script_function {
3195 my ($fun, $cb) = @_; 3382 my ($fun, $cb) = @_;
3196 3383
3197 no strict 'refs'; 3384 $fun = "safe::$fun" if $CFG{safe_eval};
3198 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3385 *$fun = $safe_hole->wrap ($cb);
3199} 3386}
3200 3387
3201=back 3388=back
3202 3389
3203=cut 3390=cut
… …
3212 # for this (global event?) 3399 # for this (global event?)
3213 %ext::player_env::MUSIC_FACE_CACHE = (); 3400 %ext::player_env::MUSIC_FACE_CACHE = ();
3214 3401
3215 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3402 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3216 3403
3217 warn "loading facedata from $path\n"; 3404 trace "loading facedata from $path\n";
3218 3405
3219 my $facedata;
3220 0 < aio_load $path, $facedata 3406 0 < aio_load $path, my $facedata
3221 or die "$path: $!"; 3407 or die "$path: $!";
3222 3408
3223 $facedata = Coro::Storable::thaw $facedata; 3409 $facedata = Coro::Storable::thaw $facedata;
3224 3410
3225 $facedata->{version} == 2 3411 $facedata->{version} == 2
3226 or cf::cleanup "$path: version mismatch, cannot proceed."; 3412 or cf::cleanup "$path: version mismatch, cannot proceed.";
3227 3413
3228 # patch in the exptable 3414 # patch in the exptable
3415 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3229 $facedata->{resource}{"res/exp_table"} = { 3416 $facedata->{resource}{"res/exp_table"} = {
3230 type => FT_RSRC, 3417 type => FT_RSRC,
3231 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3418 data => $exp_table,
3419 hash => (Digest::MD5::md5 $exp_table),
3232 }; 3420 };
3233 cf::cede_to_tick; 3421 cf::cede_to_tick;
3234 3422
3235 { 3423 {
3236 my $faces = $facedata->{faceinfo}; 3424 my $faces = $facedata->{faceinfo};
… …
3238 while (my ($face, $info) = each %$faces) { 3426 while (my ($face, $info) = each %$faces) {
3239 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3427 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3240 3428
3241 cf::face::set_visibility $idx, $info->{visibility}; 3429 cf::face::set_visibility $idx, $info->{visibility};
3242 cf::face::set_magicmap $idx, $info->{magicmap}; 3430 cf::face::set_magicmap $idx, $info->{magicmap};
3243 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3431 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3244 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3432 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3433 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3245 3434
3246 cf::cede_to_tick; 3435 cf::cede_to_tick;
3247 } 3436 }
3248 3437
3249 while (my ($face, $info) = each %$faces) { 3438 while (my ($face, $info) = each %$faces) {
… …
3254 3443
3255 if (my $smooth = cf::face::find $info->{smooth}) { 3444 if (my $smooth = cf::face::find $info->{smooth}) {
3256 cf::face::set_smooth $idx, $smooth; 3445 cf::face::set_smooth $idx, $smooth;
3257 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3446 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3258 } else { 3447 } else {
3259 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3448 error "smooth face '$info->{smooth}' not found for face '$face'";
3260 } 3449 }
3261 3450
3262 cf::cede_to_tick; 3451 cf::cede_to_tick;
3263 } 3452 }
3264 } 3453 }
… …
3273 3462
3274 cf::anim::invalidate_all; # d'oh 3463 cf::anim::invalidate_all; # d'oh
3275 } 3464 }
3276 3465
3277 { 3466 {
3278 # TODO: for gcfclient pleasure, we should give resources
3279 # that gcfclient doesn't grok a >10000 face index.
3280 my $res = $facedata->{resource}; 3467 my $res = $facedata->{resource};
3281 3468
3282 while (my ($name, $info) = each %$res) { 3469 while (my ($name, $info) = each %$res) {
3283 if (defined $info->{type}) { 3470 if (defined $info->{type}) {
3284 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3471 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3285 my $data;
3286 3472
3287 if ($info->{type} & 1) { 3473 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3288 # prepend meta info
3289
3290 my $meta = $enc->encode ({
3291 name => $name,
3292 %{ $info->{meta} || {} },
3293 });
3294
3295 $data = pack "(w/a*)*", $meta, $info->{data};
3296 } else {
3297 $data = $info->{data};
3298 }
3299
3300 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3301 cf::face::set_type $idx, $info->{type}; 3474 cf::face::set_type $idx, $info->{type};
3302 } else { 3475 } else {
3303 $RESOURCE{$name} = $info; 3476 $RESOURCE{$name} = $info; # unused
3304 } 3477 }
3305 3478
3306 cf::cede_to_tick; 3479 cf::cede_to_tick;
3307 } 3480 }
3308 } 3481 }
3309 3482
3310 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3483 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3311 3484
3312 1 3485 1
3313} 3486}
3314
3315cf::global->attach (on_resource_update => sub {
3316 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3317 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3318
3319 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3320 my $sound = $soundconf->{compat}[$_]
3321 or next;
3322
3323 my $face = cf::face::find "sound/$sound->[1]";
3324 cf::sound::set $sound->[0] => $face;
3325 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3326 }
3327
3328 while (my ($k, $v) = each %{$soundconf->{event}}) {
3329 my $face = cf::face::find "sound/$v";
3330 cf::sound::set $k => $face;
3331 }
3332 }
3333});
3334 3487
3335register_exticmd fx_want => sub { 3488register_exticmd fx_want => sub {
3336 my ($ns, $want) = @_; 3489 my ($ns, $want) = @_;
3337 3490
3338 while (my ($k, $v) = each %$want) { 3491 while (my ($k, $v) = each %$want) {
… …
3377sub reload_treasures { 3530sub reload_treasures {
3378 load_resource_file "$DATADIR/treasures" 3531 load_resource_file "$DATADIR/treasures"
3379 or die "unable to load treasurelists\n"; 3532 or die "unable to load treasurelists\n";
3380} 3533}
3381 3534
3535sub reload_sound {
3536 trace "loading sound config from $DATADIR/sound\n";
3537
3538 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3539 or die "$DATADIR/sound $!";
3540
3541 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3542
3543 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3544 my $sound = $soundconf->{compat}[$_]
3545 or next;
3546
3547 my $face = cf::face::find "sound/$sound->[1]";
3548 cf::sound::set $sound->[0] => $face;
3549 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3550 }
3551
3552 while (my ($k, $v) = each %{$soundconf->{event}}) {
3553 my $face = cf::face::find "sound/$v";
3554 cf::sound::set $k => $face;
3555 }
3556}
3557
3382sub reload_resources { 3558sub reload_resources {
3383 warn "reloading resource files...\n"; 3559 trace "reloading resource files...\n";
3384 3560
3561 reload_exp_table;
3562 reload_materials;
3385 reload_facedata; 3563 reload_facedata;
3564 reload_sound;
3386 reload_archetypes; 3565 reload_archetypes;
3387 reload_regions; 3566 reload_regions;
3388 reload_treasures; 3567 reload_treasures;
3389 3568
3390 warn "finished reloading resource files\n"; 3569 trace "finished reloading resource files\n";
3391} 3570}
3392 3571
3393sub reload_config { 3572sub reload_config {
3394 warn "reloading config file...\n"; 3573 trace "reloading config file...\n";
3395 3574
3396 open my $fh, "<:utf8", "$CONFDIR/config" 3575 0 < aio_load "$CONFDIR/config", my $config
3397 or return; 3576 or die "$CONFDIR/config: $!";
3398 3577
3399 local $/; 3578 utf8::decode $config;
3400 *CFG = YAML::XS::Load scalar <$fh>; 3579 *CFG = yaml_load $config;
3401 3580
3402 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3581 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3403 3582
3404 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3583 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3405 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3584 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3406 3585
3407 if (exists $CFG{mlockall}) { 3586 if (exists $CFG{mlockall}) {
… …
3409 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3588 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3410 and die "WARNING: m(un)lockall failed: $!\n"; 3589 and die "WARNING: m(un)lockall failed: $!\n";
3411 }; 3590 };
3412 warn $@ if $@; 3591 warn $@ if $@;
3413 } 3592 }
3414
3415 warn "finished reloading resource files\n";
3416} 3593}
3417 3594
3418sub pidfile() { 3595sub pidfile() {
3419 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3596 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3420 or die "$PIDFILE: $!"; 3597 or die "$PIDFILE: $!";
… …
3433 seek $fh, 0, 0; 3610 seek $fh, 0, 0;
3434 print $fh $$; 3611 print $fh $$;
3435} 3612}
3436 3613
3437sub main_loop { 3614sub main_loop {
3438 warn "EV::loop starting\n"; 3615 trace "EV::loop starting\n";
3439 if (1) { 3616 if (1) {
3440 EV::loop; 3617 EV::loop;
3441 } 3618 }
3442 warn "EV::loop returned\n"; 3619 trace "EV::loop returned\n";
3443 goto &main_loop unless $REALLY_UNLOOP; 3620 goto &main_loop unless $REALLY_UNLOOP;
3444} 3621}
3445 3622
3446sub main { 3623sub main {
3447 cf::init_globals; # initialise logging 3624 cf::init_globals; # initialise logging
3448 3625
3449 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3626 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3450 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3627 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3451 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3628 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3452 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3629 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3453
3454 cf::init_experience;
3455 cf::init_anim;
3456 cf::init_attackmess;
3457 cf::init_dynamic;
3458 3630
3459 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3631 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3460 3632
3461 # we must not ever block the main coroutine 3633 # we must not ever block the main coroutine
3462 local $Coro::idle = sub { 3634 local $Coro::idle = sub {
… …
3468 }; 3640 };
3469 3641
3470 evthread_start IO::AIO::poll_fileno; 3642 evthread_start IO::AIO::poll_fileno;
3471 3643
3472 cf::sync_job { 3644 cf::sync_job {
3645 cf::incloader::init ();
3646
3647 cf::init_anim;
3648 cf::init_attackmess;
3649 cf::init_dynamic;
3650
3651 cf::load_settings;
3652
3473 reload_resources; 3653 reload_resources;
3474 reload_config; 3654 reload_config;
3475 db_init; 3655 db_init;
3476 3656
3477 cf::load_settings;
3478 cf::load_materials;
3479 cf::init_uuid; 3657 cf::init_uuid;
3480 cf::init_signals; 3658 cf::init_signals;
3481 cf::init_commands;
3482 cf::init_skills; 3659 cf::init_skills;
3483 3660
3484 cf::init_beforeplay; 3661 cf::init_beforeplay;
3485 3662
3486 atomic; 3663 atomic;
… …
3491 3668
3492 # no (long-running) fork's whatsoever before this point(!) 3669 # no (long-running) fork's whatsoever before this point(!)
3493 use POSIX (); 3670 use POSIX ();
3494 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3671 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3495 3672
3496 (pop @POST_INIT)->(0) while @POST_INIT; 3673 cf::_post_init 0;
3497 }; 3674 };
3498 3675
3676 cf::object::thawer::errors_are_fatal 0;
3677 info "parse errors in files are no longer fatal from this point on.\n";
3678
3679 my $free_main; $free_main = EV::idle sub {
3680 undef $free_main;
3681 undef &main; # free gobs of memory :)
3682 };
3683
3499 main_loop; 3684 goto &main_loop;
3500} 3685}
3501 3686
3502############################################################################# 3687#############################################################################
3503# initialisation and cleanup 3688# initialisation and cleanup
3504 3689
3505# install some emergency cleanup handlers 3690# install some emergency cleanup handlers
3506BEGIN { 3691BEGIN {
3507 our %SIGWATCHER = (); 3692 our %SIGWATCHER = ();
3508 for my $signal (qw(INT HUP TERM)) { 3693 for my $signal (qw(INT HUP TERM)) {
3509 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3694 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3510 cf::cleanup "SIG$signal"; 3695 cf::cleanup "SIG$signal";
3511 }; 3696 };
3512 } 3697 }
3513} 3698}
3514 3699
3515sub write_runtime_sync { 3700sub write_runtime_sync {
3701 my $t0 = AE::time;
3702
3516 # first touch the runtime file to show we are still running: 3703 # first touch the runtime file to show we are still running:
3517 # the fsync below can take a very very long time. 3704 # the fsync below can take a very very long time.
3518 3705
3519 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3706 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3520 3707
3521 my $guard = cf::lock_acquire "write_runtime"; 3708 my $guard = cf::lock_acquire "write_runtime";
3522 3709
3523 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3710 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3524 or return; 3711 or return;
3525 3712
3526 my $value = $cf::RUNTIME + 90 + 10; 3713 my $value = $cf::RUNTIME + 90 + 10;
3527 # 10 is the runtime save interval, for a monotonic clock 3714 # 10 is the runtime save interval, for a monotonic clock
3528 # 60 allows for the watchdog to kill the server. 3715 # 60 allows for the watchdog to kill the server.
… …
3541 or return; 3728 or return;
3542 3729
3543 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3730 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3544 and return; 3731 and return;
3545 3732
3546 warn "runtime file written.\n"; 3733 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3547 3734
3548 1 3735 1
3549} 3736}
3550 3737
3551our $uuid_lock; 3738our $uuid_lock;
… …
3563 or return; 3750 or return;
3564 3751
3565 my $value = uuid_seq uuid_cur; 3752 my $value = uuid_seq uuid_cur;
3566 3753
3567 unless ($value) { 3754 unless ($value) {
3568 warn "cowardly refusing to write zero uuid value!\n"; 3755 info "cowardly refusing to write zero uuid value!\n";
3569 return; 3756 return;
3570 } 3757 }
3571 3758
3572 my $value = uuid_str $value + $uuid_skip; 3759 my $value = uuid_str $value + $uuid_skip;
3573 $uuid_skip = 0; 3760 $uuid_skip = 0;
… …
3583 or return; 3770 or return;
3584 3771
3585 aio_rename "$uuid~", $uuid 3772 aio_rename "$uuid~", $uuid
3586 and return; 3773 and return;
3587 3774
3588 warn "uuid file written ($value).\n"; 3775 trace "uuid file written ($value).\n";
3589 3776
3590 1 3777 1
3591 3778
3592} 3779}
3593 3780
… …
3599} 3786}
3600 3787
3601sub emergency_save() { 3788sub emergency_save() {
3602 my $freeze_guard = cf::freeze_mainloop; 3789 my $freeze_guard = cf::freeze_mainloop;
3603 3790
3604 warn "emergency_perl_save: enter\n"; 3791 info "emergency_perl_save: enter\n";
3792
3793 # this is a trade-off: we want to be very quick here, so
3794 # save all maps without fsync, and later call a global sync
3795 # (which in turn might be very very slow)
3796 local $USE_FSYNC = 0;
3605 3797
3606 cf::sync_job { 3798 cf::sync_job {
3607 # this is a trade-off: we want to be very quick here, so 3799 cf::write_runtime_sync; # external watchdog should not bark
3608 # save all maps without fsync, and later call a global sync
3609 # (which in turn might be very very slow)
3610 local $USE_FSYNC = 0;
3611 3800
3612 # use a peculiar iteration method to avoid tripping on perl 3801 # use a peculiar iteration method to avoid tripping on perl
3613 # refcount bugs in for. also avoids problems with players 3802 # refcount bugs in for. also avoids problems with players
3614 # and maps saved/destroyed asynchronously. 3803 # and maps saved/destroyed asynchronously.
3615 warn "emergency_perl_save: begin player save\n"; 3804 info "emergency_perl_save: begin player save\n";
3616 for my $login (keys %cf::PLAYER) { 3805 for my $login (keys %cf::PLAYER) {
3617 my $pl = $cf::PLAYER{$login} or next; 3806 my $pl = $cf::PLAYER{$login} or next;
3618 $pl->valid or next; 3807 $pl->valid or next;
3619 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3808 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3620 $pl->save; 3809 $pl->save;
3621 } 3810 }
3622 warn "emergency_perl_save: end player save\n"; 3811 info "emergency_perl_save: end player save\n";
3623 3812
3813 cf::write_runtime_sync; # external watchdog should not bark
3814
3624 warn "emergency_perl_save: begin map save\n"; 3815 info "emergency_perl_save: begin map save\n";
3625 for my $path (keys %cf::MAP) { 3816 for my $path (keys %cf::MAP) {
3626 my $map = $cf::MAP{$path} or next; 3817 my $map = $cf::MAP{$path} or next;
3627 $map->valid or next; 3818 $map->valid or next;
3628 $map->save; 3819 $map->save;
3629 } 3820 }
3630 warn "emergency_perl_save: end map save\n"; 3821 info "emergency_perl_save: end map save\n";
3631 3822
3823 cf::write_runtime_sync; # external watchdog should not bark
3824
3632 warn "emergency_perl_save: begin database checkpoint\n"; 3825 info "emergency_perl_save: begin database checkpoint\n";
3633 BDB::db_env_txn_checkpoint $DB_ENV; 3826 BDB::db_env_txn_checkpoint $DB_ENV;
3634 warn "emergency_perl_save: end database checkpoint\n"; 3827 info "emergency_perl_save: end database checkpoint\n";
3635 3828
3636 warn "emergency_perl_save: begin write uuid\n"; 3829 info "emergency_perl_save: begin write uuid\n";
3637 write_uuid_sync 1; 3830 write_uuid_sync 1;
3638 warn "emergency_perl_save: end write uuid\n"; 3831 info "emergency_perl_save: end write uuid\n";
3832
3833 cf::write_runtime_sync; # external watchdog should not bark
3834
3835 trace "emergency_perl_save: syncing database to disk";
3836 BDB::db_env_txn_checkpoint $DB_ENV;
3837
3838 info "emergency_perl_save: starting sync\n";
3839 IO::AIO::aio_sync sub {
3840 info "emergency_perl_save: finished sync\n";
3841 };
3842
3843 cf::write_runtime_sync; # external watchdog should not bark
3844
3845 trace "emergency_perl_save: flushing outstanding aio requests";
3846 while (IO::AIO::nreqs || BDB::nreqs) {
3847 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3848 }
3849
3850 cf::write_runtime_sync; # external watchdog should not bark
3639 }; 3851 };
3640 3852
3641 warn "emergency_perl_save: starting sync()\n";
3642 IO::AIO::aio_sync sub {
3643 warn "emergency_perl_save: finished sync()\n";
3644 };
3645
3646 warn "emergency_perl_save: leave\n"; 3853 info "emergency_perl_save: leave\n";
3647} 3854}
3648 3855
3649sub post_cleanup { 3856sub post_cleanup {
3650 my ($make_core) = @_; 3857 my ($make_core) = @_;
3651 3858
3859 IO::AIO::flush;
3860
3652 warn Carp::longmess "post_cleanup backtrace" 3861 error Carp::longmess "post_cleanup backtrace"
3653 if $make_core; 3862 if $make_core;
3654 3863
3655 my $fh = pidfile; 3864 my $fh = pidfile;
3656 unlink $PIDFILE if <$fh> == $$; 3865 unlink $PIDFILE if <$fh> == $$;
3657} 3866}
… …
3677 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3886 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3678 for my $name (keys %$leaf_symtab) { 3887 for my $name (keys %$leaf_symtab) {
3679 _gv_clear *{"$pkg$name"}; 3888 _gv_clear *{"$pkg$name"};
3680# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3889# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3681 } 3890 }
3682 warn "cleared package $pkg\n";#d#
3683} 3891}
3684 3892
3685sub do_reload_perl() { 3893sub do_reload_perl() {
3686 # can/must only be called in main 3894 # can/must only be called in main
3687 if ($Coro::current != $Coro::main) { 3895 unless (in_main) {
3688 warn "can only reload from main coroutine"; 3896 error "can only reload from main coroutine";
3689 return; 3897 return;
3690 } 3898 }
3691 3899
3692 return if $RELOAD++; 3900 return if $RELOAD++;
3693 3901
3694 my $t1 = EV::time; 3902 my $t1 = AE::time;
3695 3903
3696 while ($RELOAD) { 3904 while ($RELOAD) {
3697 warn "reloading..."; 3905 cf::get_slot 0.1, -1, "reload_perl";
3906 info "perl_reload: reloading...";
3698 3907
3699 warn "entering sync_job"; 3908 trace "perl_reload: entering sync_job";
3700 3909
3701 cf::sync_job { 3910 cf::sync_job {
3702 cf::write_runtime_sync; # external watchdog should not bark
3703 cf::emergency_save; 3911 #cf::emergency_save;
3704 cf::write_runtime_sync; # external watchdog should not bark
3705 3912
3706 warn "syncing database to disk";
3707 BDB::db_env_txn_checkpoint $DB_ENV;
3708
3709 # if anything goes wrong in here, we should simply crash as we already saved
3710
3711 warn "flushing outstanding aio requests";
3712 while (IO::AIO::nreqs || BDB::nreqs) {
3713 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3714 }
3715
3716 warn "cancelling all extension coros"; 3913 trace "perl_reload: cancelling all extension coros";
3717 $_->cancel for values %EXT_CORO; 3914 $_->cancel for values %EXT_CORO;
3718 %EXT_CORO = (); 3915 %EXT_CORO = ();
3719 3916
3720 warn "removing commands"; 3917 trace "perl_reload: removing commands";
3721 %COMMAND = (); 3918 %COMMAND = ();
3722 3919
3723 warn "removing ext/exti commands"; 3920 trace "perl_reload: removing ext/exti commands";
3724 %EXTCMD = (); 3921 %EXTCMD = ();
3725 %EXTICMD = (); 3922 %EXTICMD = ();
3726 3923
3727 warn "unloading/nuking all extensions"; 3924 trace "perl_reload: unloading/nuking all extensions";
3728 for my $pkg (@EXTS) { 3925 for my $pkg (@EXTS) {
3729 warn "... unloading $pkg"; 3926 trace "... unloading $pkg";
3730 3927
3731 if (my $cb = $pkg->can ("unload")) { 3928 if (my $cb = $pkg->can ("unload")) {
3732 eval { 3929 eval {
3733 $cb->($pkg); 3930 $cb->($pkg);
3734 1 3931 1
3735 } or warn "$pkg unloaded, but with errors: $@"; 3932 } or error "$pkg unloaded, but with errors: $@";
3736 } 3933 }
3737 3934
3738 warn "... clearing $pkg"; 3935 trace "... clearing $pkg";
3739 clear_package $pkg; 3936 clear_package $pkg;
3740 } 3937 }
3741 3938
3742 warn "unloading all perl modules loaded from $LIBDIR"; 3939 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3743 while (my ($k, $v) = each %INC) { 3940 while (my ($k, $v) = each %INC) {
3744 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3941 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3745 3942
3746 warn "... unloading $k"; 3943 trace "... unloading $k";
3747 delete $INC{$k}; 3944 delete $INC{$k};
3748 3945
3749 $k =~ s/\.pm$//; 3946 $k =~ s/\.pm$//;
3750 $k =~ s/\//::/g; 3947 $k =~ s/\//::/g;
3751 3948
… …
3754 } 3951 }
3755 3952
3756 clear_package $k; 3953 clear_package $k;
3757 } 3954 }
3758 3955
3759 warn "getting rid of safe::, as good as possible"; 3956 trace "perl_reload: getting rid of safe::, as good as possible";
3760 clear_package "safe::$_" 3957 clear_package "safe::$_"
3761 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3958 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3762 3959
3763 warn "unloading cf.pm \"a bit\""; 3960 trace "perl_reload: unloading cf.pm \"a bit\"";
3764 delete $INC{"cf.pm"}; 3961 delete $INC{"cf.pm"};
3765 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3962 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3766 3963
3767 # don't, removes xs symbols, too, 3964 # don't, removes xs symbols, too,
3768 # and global variables created in xs 3965 # and global variables created in xs
3769 #clear_package __PACKAGE__; 3966 #clear_package __PACKAGE__;
3770 3967
3771 warn "unload completed, starting to reload now"; 3968 info "perl_reload: unload completed, starting to reload now";
3772 3969
3773 warn "reloading cf.pm"; 3970 trace "perl_reload: reloading cf.pm";
3774 require cf; 3971 require cf;
3775 cf::_connect_to_perl_1; 3972 cf::_connect_to_perl_1;
3776 3973
3777 warn "loading config and database again"; 3974 trace "perl_reload: loading config and database again";
3778 cf::reload_config; 3975 cf::reload_config;
3779 3976
3780 warn "loading extensions"; 3977 trace "perl_reload: loading extensions";
3781 cf::load_extensions; 3978 cf::load_extensions;
3782 3979
3783 if ($REATTACH_ON_RELOAD) { 3980 if ($REATTACH_ON_RELOAD) {
3784 warn "reattaching attachments to objects/players"; 3981 trace "perl_reload: reattaching attachments to objects/players";
3785 _global_reattach; # objects, sockets 3982 _global_reattach; # objects, sockets
3786 warn "reattaching attachments to maps"; 3983 trace "perl_reload: reattaching attachments to maps";
3787 reattach $_ for values %MAP; 3984 reattach $_ for values %MAP;
3788 warn "reattaching attachments to players"; 3985 trace "perl_reload: reattaching attachments to players";
3789 reattach $_ for values %PLAYER; 3986 reattach $_ for values %PLAYER;
3790 } 3987 }
3791 3988
3792 warn "running post_init jobs"; 3989 cf::_post_init 1;
3793 (pop @POST_INIT)->(1) while @POST_INIT;
3794 3990
3795 warn "leaving sync_job"; 3991 trace "perl_reload: leaving sync_job";
3796 3992
3797 1 3993 1
3798 } or do { 3994 } or do {
3799 warn $@; 3995 error $@;
3800 cf::cleanup "error while reloading, exiting."; 3996 cf::cleanup "perl_reload: error, exiting.";
3801 }; 3997 };
3802 3998
3803 warn "reloaded";
3804 --$RELOAD; 3999 --$RELOAD;
3805 } 4000 }
3806 4001
3807 $t1 = EV::time - $t1; 4002 $t1 = AE::time - $t1;
3808 warn "reload completed in ${t1}s\n"; 4003 info "perl_reload: completed in ${t1}s\n";
3809}; 4004};
3810 4005
3811our $RELOAD_WATCHER; # used only during reload 4006our $RELOAD_WATCHER; # used only during reload
3812 4007
3813sub reload_perl() { 4008sub reload_perl() {
… …
3815 # coro crashes during coro_state_free->destroy here. 4010 # coro crashes during coro_state_free->destroy here.
3816 4011
3817 $RELOAD_WATCHER ||= cf::async { 4012 $RELOAD_WATCHER ||= cf::async {
3818 Coro::AIO::aio_wait cache_extensions; 4013 Coro::AIO::aio_wait cache_extensions;
3819 4014
3820 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4015 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3821 do_reload_perl; 4016 do_reload_perl;
3822 undef $RELOAD_WATCHER; 4017 undef $RELOAD_WATCHER;
3823 }; 4018 };
3824 }; 4019 };
3825} 4020}
… …
3834 reload_perl; 4029 reload_perl;
3835 }; 4030 };
3836 } 4031 }
3837}; 4032};
3838 4033
3839unshift @INC, $LIBDIR; 4034#############################################################################
3840 4035
3841my $bug_warning = 0; 4036my $bug_warning = 0;
3842 4037
3843our @WAIT_FOR_TICK; 4038our @WAIT_FOR_TICK;
3844our @WAIT_FOR_TICK_BEGIN; 4039our @WAIT_FOR_TICK_BEGIN;
3845 4040
3846sub wait_for_tick { 4041sub wait_for_tick() {
3847 return if tick_inhibit || $Coro::current == $Coro::main; 4042 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3848 4043
3849 my $signal = new Coro::Signal; 4044 my $signal = new Coro::Signal;
3850 push @WAIT_FOR_TICK, $signal; 4045 push @WAIT_FOR_TICK, $signal;
3851 $signal->wait; 4046 $signal->wait;
3852} 4047}
3853 4048
3854sub wait_for_tick_begin { 4049sub wait_for_tick_begin() {
3855 return if tick_inhibit || $Coro::current == $Coro::main; 4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3856 4051
3857 my $signal = new Coro::Signal; 4052 my $signal = new Coro::Signal;
3858 push @WAIT_FOR_TICK_BEGIN, $signal; 4053 push @WAIT_FOR_TICK_BEGIN, $signal;
3859 $signal->wait; 4054 $signal->wait;
3860} 4055}
… …
3866 return; 4061 return;
3867 } 4062 }
3868 4063
3869 cf::server_tick; # one server iteration 4064 cf::server_tick; # one server iteration
3870 4065
4066 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4067
3871 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4068 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3872 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4069 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3873 Coro::async_pool { 4070 Coro::async_pool {
3874 $Coro::current->{desc} = "runtime saver"; 4071 $Coro::current->{desc} = "runtime saver";
3875 write_runtime_sync 4072 write_runtime_sync
3876 or warn "ERROR: unable to write runtime file: $!"; 4073 or error "ERROR: unable to write runtime file: $!";
3877 }; 4074 };
3878 } 4075 }
3879 4076
3880 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4077 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3881 $sig->send; 4078 $sig->send;
… …
3889 4086
3890 if (0) { 4087 if (0) {
3891 if ($NEXT_TICK) { 4088 if ($NEXT_TICK) {
3892 my $jitter = $TICK_START - $NEXT_TICK; 4089 my $jitter = $TICK_START - $NEXT_TICK;
3893 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4090 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3894 warn "jitter $JITTER\n";#d# 4091 debug "jitter $JITTER\n";#d#
3895 } 4092 }
3896 } 4093 }
3897} 4094}
3898 4095
3899{ 4096{
3900 # configure BDB 4097 # configure BDB
3901 4098
3902 BDB::min_parallel 8; 4099 BDB::min_parallel 16;
3903 BDB::max_poll_reqs $TICK * 0.1; 4100 BDB::max_poll_reqs $TICK * 0.1;
3904 $AnyEvent::BDB::WATCHER->priority (1); 4101 $AnyEvent::BDB::WATCHER->priority (1);
3905 4102
3906 unless ($DB_ENV) { 4103 unless ($DB_ENV) {
3907 $DB_ENV = BDB::db_env_create; 4104 $DB_ENV = BDB::db_env_create;
… …
3944 IO::AIO::min_parallel 8; 4141 IO::AIO::min_parallel 8;
3945 IO::AIO::max_poll_time $TICK * 0.1; 4142 IO::AIO::max_poll_time $TICK * 0.1;
3946 undef $AnyEvent::AIO::WATCHER; 4143 undef $AnyEvent::AIO::WATCHER;
3947} 4144}
3948 4145
3949my $_log_backtrace; 4146our $_log_backtrace;
4147our $_log_backtrace_last;
3950 4148
3951sub _log_backtrace { 4149sub _log_backtrace {
3952 my ($msg, @addr) = @_; 4150 my ($msg, @addr) = @_;
3953 4151
3954 $msg =~ s/\n//; 4152 $msg =~ s/\n$//;
3955 4153
4154 if ($_log_backtrace_last eq $msg) {
4155 LOG llevInfo, "[ABT] $msg\n";
4156 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3956 # limit the # of concurrent backtraces 4157 # limit the # of concurrent backtraces
3957 if ($_log_backtrace < 2) { 4158 } elsif ($_log_backtrace < 2) {
4159 $_log_backtrace_last = $msg;
3958 ++$_log_backtrace; 4160 ++$_log_backtrace;
3959 my $perl_bt = Carp::longmess $msg; 4161 my $perl_bt = Carp::longmess $msg;
3960 async { 4162 async {
3961 $Coro::current->{desc} = "abt $msg"; 4163 $Coro::current->{desc} = "abt $msg";
3962 4164
… …
3982 LOG llevInfo, "[ABT] $_\n" for @bt; 4184 LOG llevInfo, "[ABT] $_\n" for @bt;
3983 --$_log_backtrace; 4185 --$_log_backtrace;
3984 }; 4186 };
3985 } else { 4187 } else {
3986 LOG llevInfo, "[ABT] $msg\n"; 4188 LOG llevInfo, "[ABT] $msg\n";
3987 LOG llevInfo, "[ABT] [suppressed]\n"; 4189 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3988 } 4190 }
3989} 4191}
3990 4192
3991# load additional modules 4193# load additional modules
3992require "cf/$_.pm" for @EXTRA_MODULES; 4194require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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