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

Diff Legend

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