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.474 by root, Thu Jul 16 21:42:56 2009 UTC vs.
Revision 1.547 by root, Sun May 9 22:51:13 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 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# 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>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict qw(vars subs);
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard (); 37use Guard ();
38use Coro (); 38use Coro ();
39use Coro::State; 39use Coro::State;
40use Coro::Handle; 40use Coro::Handle;
51use Coro::Util (); 51use Coro::Util ();
52 52
53use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
54use BDB (); 54use BDB ();
55use Data::Dumper; 55use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 56use Fcntl;
58use YAML (); 57use YAML::XS ();
59use IO::AIO (); 58use IO::AIO ();
60use Time::HiRes; 59use Time::HiRes;
61use Compress::LZF; 60use Compress::LZF;
62use Digest::MD5 (); 61use Digest::MD5 ();
63 62
76 75
77# strictly for debugging 76# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
79 78
80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
81 82
82our %COMMAND = (); 83our %COMMAND = ();
83our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
84 85
85our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
88our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
89our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
90 91
91our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
92our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
93 96
94our $CONFDIR = confdir; 97our $CONFDIR = confdir;
95our $DATADIR = datadir; 98our $DATADIR = datadir;
96our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
97our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
103our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
104our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
105our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
107 110
108our %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;
109 118
110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
112our $NEXT_TICK; 121our $NEXT_TICK;
113our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
115our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
116our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
117our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
118our $DB_ENV; 127our $DB_ENV;
119 128
120our @EXTRA_MODULES = qw(pod mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript incloader);
121 130
122our %CFG; 131our %CFG;
123 132
124our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
125our $RUNTIME; 134our $RUNTIME;
159 168
160our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
161 170
162sub cf::map::normalise; 171sub cf::map::normalise;
163 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
187
164############################################################################# 188#############################################################################
165 189
166=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
167 191
168=over 4 192=over 4
209from wherever your confdir points to. 233from wherever your confdir points to.
210 234
211=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
212 236
213These 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
214returns 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
215per 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.
216 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
217=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
218 247
219This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
220C<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
221that call. 250that call.
222 251
252=item %cf::REFLECT
253
254Contains, for each (C++) class name, a hash reference with information
255about object members (methods, scalars, arrays and flags) and other
256metadata, which is useful for introspection.
257
223=back 258=back
224 259
225=cut 260=cut
226 261
227BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
228 *CORE::GLOBAL::warn = sub { 263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
268$Coro::State::WARNHOOK = sub {
229 my $msg = join "", @_; 269 my $msg = join "", @_;
230 270
231 $msg .= "\n" 271 $msg .= "\n"
232 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
233 273
234 $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;
235 275
236 LOG llevError, $msg; 276 LOG llevWarn, $msg;
237 }; 277};
238}
239 278
240$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
241 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
242 281
243 if ($Coro::current == $Coro::main) {#d# 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
244 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
245 return;#d# 286 return;#d#
246 }#d# 287 }#d#
247 288
248 # kill coroutine otherwise 289 # kill coroutine otherwise
249 warn Carp::longmess $_[0];
250 Coro::terminate 290 Coro::terminate
251}; 291};
252
253$SIG{__DIE__} = sub { }; #d#?
254 292
255@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
256@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
257@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
258@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
272)) { 310)) {
273 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
274} 312}
275 313
276$EV::DIED = sub { 314$EV::DIED = sub {
277 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
278}; 316};
279 317
280############################################################################# 318#############################################################################
281 319
282=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
379} 417}
380 418
381=item cf::periodic $interval, $cb 419=item cf::periodic $interval, $cb
382 420
383Like EV::periodic, but randomly selects a starting point so that the actions 421Like EV::periodic, but randomly selects a starting point so that the actions
384get spread over timer. 422get spread over time.
385 423
386=cut 424=cut
387 425
388sub periodic($$) { 426sub periodic($$) {
389 my ($interval, $cb) = @_; 427 my ($interval, $cb) = @_;
406 444
407=cut 445=cut
408 446
409our @SLOT_QUEUE; 447our @SLOT_QUEUE;
410our $SLOT_QUEUE; 448our $SLOT_QUEUE;
449our $SLOT_DECAY = 0.9;
411 450
412$SLOT_QUEUE->cancel if $SLOT_QUEUE; 451$SLOT_QUEUE->cancel if $SLOT_QUEUE;
413$SLOT_QUEUE = Coro::async { 452$SLOT_QUEUE = Coro::async {
414 $Coro::current->desc ("timeslot manager"); 453 $Coro::current->desc ("timeslot manager");
415 454
416 my $signal = new Coro::Signal; 455 my $signal = new Coro::Signal;
456 my $busy;
417 457
418 while () { 458 while () {
419 next_job: 459 next_job:
460
420 my $avail = cf::till_tick; 461 my $avail = cf::till_tick;
421 if ($avail > 0.01) { 462
422 for (0 .. $#SLOT_QUEUE) { 463 for (0 .. $#SLOT_QUEUE) {
423 if ($SLOT_QUEUE[$_][0] < $avail) { 464 if ($SLOT_QUEUE[$_][0] <= $avail) {
465 $busy = 0;
424 my $job = splice @SLOT_QUEUE, $_, 1, (); 466 my $job = splice @SLOT_QUEUE, $_, 1, ();
425 $job->[2]->send; 467 $job->[2]->send;
426 Coro::cede; 468 Coro::cede;
427 goto next_job; 469 goto next_job;
428 } 470 } else {
471 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
429 } 472 }
430 } 473 }
431 474
432 if (@SLOT_QUEUE) { 475 if (@SLOT_QUEUE) {
433 # we do not use wait_for_tick() as it returns immediately when tick is inactive 476 # we do not use wait_for_tick() as it returns immediately when tick is inactive
434 push @cf::WAIT_FOR_TICK, $signal; 477 push @cf::WAIT_FOR_TICK, $signal;
435 $signal->wait; 478 $signal->wait;
436 } else { 479 } else {
480 $busy = 0;
437 Coro::schedule; 481 Coro::schedule;
438 } 482 }
439 } 483 }
440}; 484};
441 485
442sub get_slot($;$$) { 486sub get_slot($;$$) {
443 return if tick_inhibit || $Coro::current == $Coro::main; 487 return if tick_inhibit || $Coro::current == $Coro::main;
444 488
445 my ($time, $pri, $name) = @_; 489 my ($time, $pri, $name) = @_;
446 490
447 $time = $TICK * .6 if $time > $TICK * .6; 491 $time = clamp $time, 0.01, $TICK * .6;
492
448 my $sig = new Coro::Signal; 493 my $sig = new Coro::Signal;
449 494
450 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 495 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
451 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 496 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
452 $SLOT_QUEUE->ready; 497 $SLOT_QUEUE->ready;
478=cut 523=cut
479 524
480sub sync_job(&) { 525sub sync_job(&) {
481 my ($job) = @_; 526 my ($job) = @_;
482 527
483 if ($Coro::current == $Coro::main) { 528 if (in_main) {
484 my $time = EV::time; 529 my $time = AE::time;
485 530
486 # this is the main coro, too bad, we have to block 531 # this is the main coro, too bad, we have to block
487 # till the operation succeeds, freezing the server :/ 532 # till the operation succeeds, freezing the server :/
488 533
489 LOG llevError, Carp::longmess "sync job";#d# 534 #LOG llevError, Carp::longmess "sync job";#d#
490 535
491 my $freeze_guard = freeze_mainloop; 536 my $freeze_guard = freeze_mainloop;
492 537
493 my $busy = 1; 538 my $busy = 1;
494 my @res; 539 my @res;
495 540
496 (async { 541 (async {
497 $Coro::current->desc ("sync job coro"); 542 $Coro::current->desc ("sync job coro");
498 @res = eval { $job->() }; 543 @res = eval { $job->() };
499 warn $@ if $@; 544 error $@ if $@;
500 undef $busy; 545 undef $busy;
501 })->prio (Coro::PRIO_MAX); 546 })->prio (Coro::PRIO_MAX);
502 547
503 while ($busy) { 548 while ($busy) {
504 if (Coro::nready) { 549 if (Coro::nready) {
506 } else { 551 } else {
507 EV::loop EV::LOOP_ONESHOT; 552 EV::loop EV::LOOP_ONESHOT;
508 } 553 }
509 } 554 }
510 555
511 my $time = EV::time - $time; 556 my $time = AE::time - $time;
512 557
513 $TICK_START += $time; # do not account sync jobs to server load 558 $TICK_START += $time; # do not account sync jobs to server load
514 559
515 wantarray ? @res : $res[0] 560 wantarray ? @res : $res[0]
516 } else { 561 } else {
547Coro::Storable. May, of course, block. Note that the executed sub may 592Coro::Storable. May, of course, block. Note that the executed sub may
548never block itself or use any form of event handling. 593never block itself or use any form of event handling.
549 594
550=cut 595=cut
551 596
597sub post_fork {
598 reset_signals;
599}
600
552sub fork_call(&@) { 601sub fork_call(&@) {
553 my ($cb, @args) = @_; 602 my ($cb, @args) = @_;
554 603
555 # we seemingly have to make a local copy of the whole thing, 604 # we seemingly have to make a local copy of the whole thing,
556 # otherwise perl prematurely frees the stuff :/ 605 # otherwise perl prematurely frees the stuff :/
557 # TODO: investigate and fix (likely this will be rather laborious) 606 # TODO: investigate and fix (likely this will be rather laborious)
558 607
559 my @res = Coro::Util::fork_eval { 608 my @res = Coro::Util::fork_eval {
560 reset_signals; 609 cf::post_fork;
561 &$cb 610 &$cb
562 }, @args; 611 }, @args;
563 612
564 wantarray ? @res : $res[-1] 613 wantarray ? @res : $res[-1]
614}
615
616sub objinfo {
617 (
618 "counter value" => cf::object::object_count,
619 "objects created" => cf::object::create_count,
620 "objects destroyed" => cf::object::destroy_count,
621 "freelist size" => cf::object::free_count,
622 "allocated objects" => cf::object::objects_size,
623 "active objects" => cf::object::actives_size,
624 )
565} 625}
566 626
567=item $coin = coin_from_name $name 627=item $coin = coin_from_name $name
568 628
569=cut 629=cut
606within each server. 666within each server.
607 667
608=cut 668=cut
609 669
610sub db_table($) { 670sub db_table($) {
671 cf::error "db_get called from main context"
672 if $Coro::current == $Coro::main;
673
611 my ($name) = @_; 674 my ($name) = @_;
612 my $db = BDB::db_create $DB_ENV; 675 my $db = BDB::db_create $DB_ENV;
613 676
614 eval { 677 eval {
615 $db->set_flags (BDB::CHKSUM); 678 $db->set_flags (BDB::CHKSUM);
625} 688}
626 689
627our $DB; 690our $DB;
628 691
629sub db_init { 692sub db_init {
630 cf::sync_job {
631 $DB ||= db_table "db"; 693 $DB ||= db_table "db";
632 };
633} 694}
634 695
635sub db_get($$) { 696sub db_get($$) {
636 my $key = "$_[0]/$_[1]"; 697 my $key = "$_[0]/$_[1]";
637 698
638 cf::sync_job { 699 cf::error "db_get called from main context"
700 if $Coro::current == $Coro::main;
701
639 BDB::db_get $DB, undef, $key, my $data; 702 BDB::db_get $DB, undef, $key, my $data;
640 703
641 $! ? () 704 $! ? ()
642 : $data 705 : $data
643 }
644} 706}
645 707
646sub db_put($$$) { 708sub db_put($$$) {
647 BDB::dbreq_pri 4; 709 BDB::dbreq_pri 4;
648 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 710 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
704 766
705 my $t1 = Time::HiRes::time; 767 my $t1 = Time::HiRes::time;
706 my $data = $process->(\@data); 768 my $data = $process->(\@data);
707 my $t2 = Time::HiRes::time; 769 my $t2 = Time::HiRes::time;
708 770
709 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 771 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
710 772
711 db_put cache => "$id/data", $data; 773 db_put cache => "$id/data", $data;
712 db_put cache => "$id/md5" , $md5; 774 db_put cache => "$id/md5" , $md5;
713 db_put cache => "$id/meta", $meta; 775 db_put cache => "$id/meta", $meta;
714 776
724 786
725=cut 787=cut
726 788
727sub datalog($@) { 789sub datalog($@) {
728 my ($type, %kv) = @_; 790 my ($type, %kv) = @_;
729 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 791 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
730} 792}
731 793
732=back 794=back
733 795
734=cut 796=cut
929 991
930 } elsif (exists $cb_id{$type}) { 992 } elsif (exists $cb_id{$type}) {
931 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 993 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
932 994
933 } elsif (ref $type) { 995 } elsif (ref $type) {
934 warn "attaching objects not supported, ignoring.\n"; 996 error "attaching objects not supported, ignoring.\n";
935 997
936 } else { 998 } else {
937 shift @arg; 999 shift @arg;
938 warn "attach argument '$type' not supported, ignoring.\n"; 1000 error "attach argument '$type' not supported, ignoring.\n";
939 } 1001 }
940 } 1002 }
941} 1003}
942 1004
943sub _object_attach { 1005sub _object_attach {
953 _attach $registry, $klass, @attach; 1015 _attach $registry, $klass, @attach;
954 } 1016 }
955 1017
956 $obj->{$name} = \%arg; 1018 $obj->{$name} = \%arg;
957 } else { 1019 } else {
958 warn "object uses attachment '$name' which is not available, postponing.\n"; 1020 info "object uses attachment '$name' which is not available, postponing.\n";
959 } 1021 }
960 1022
961 $obj->{_attachment}{$name} = undef; 1023 $obj->{_attachment}{$name} = undef;
962} 1024}
963 1025
1022 1084
1023 for (@$callbacks) { 1085 for (@$callbacks) {
1024 eval { &{$_->[1]} }; 1086 eval { &{$_->[1]} };
1025 1087
1026 if ($@) { 1088 if ($@) {
1027 warn "$@";
1028 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1089 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1029 override; 1090 override;
1030 } 1091 }
1031 1092
1032 return 1 if $override; 1093 return 1 if $override;
1033 } 1094 }
1112 for (@$attach) { 1173 for (@$attach) {
1113 my ($klass, @attach) = @$_; 1174 my ($klass, @attach) = @$_;
1114 _attach $registry, $klass, @attach; 1175 _attach $registry, $klass, @attach;
1115 } 1176 }
1116 } else { 1177 } else {
1117 warn "object uses attachment '$name' that is not available, postponing.\n"; 1178 info "object uses attachment '$name' that is not available, postponing.\n";
1118 } 1179 }
1119 } 1180 }
1120} 1181}
1121 1182
1122cf::attachable->attach ( 1183cf::attachable->attach (
1149 my ($filename, $rdata, $objs) = @_; 1210 my ($filename, $rdata, $objs) = @_;
1150 1211
1151 sync_job { 1212 sync_job {
1152 if (length $$rdata) { 1213 if (length $$rdata) {
1153 utf8::decode (my $decname = $filename); 1214 utf8::decode (my $decname = $filename);
1154 warn sprintf "saving %s (%d,%d)\n", 1215 trace sprintf "saving %s (%d,%d)\n",
1155 $decname, length $$rdata, scalar @$objs; 1216 $decname, length $$rdata, scalar @$objs
1217 if $VERBOSE_IO;
1156 1218
1157 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1219 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1158 aio_chmod $fh, SAVE_MODE; 1220 aio_chmod $fh, SAVE_MODE;
1159 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1221 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1160 if ($cf::USE_FSYNC) { 1222 if ($cf::USE_FSYNC) {
1182 aio_rename "$filename~", $filename; 1244 aio_rename "$filename~", $filename;
1183 1245
1184 $filename =~ s%/[^/]+$%%; 1246 $filename =~ s%/[^/]+$%%;
1185 aio_pathsync $filename if $cf::USE_FSYNC; 1247 aio_pathsync $filename if $cf::USE_FSYNC;
1186 } else { 1248 } else {
1187 warn "unable to save objects: $filename~: $!\n"; 1249 error "unable to save objects: $filename~: $!\n";
1188 } 1250 }
1189 } else { 1251 } else {
1190 aio_unlink $filename; 1252 aio_unlink $filename;
1191 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1192 } 1254 }
1216 my $st = eval { Coro::Storable::thaw $av }; 1278 my $st = eval { Coro::Storable::thaw $av };
1217 $av = $st->{objs}; 1279 $av = $st->{objs};
1218 } 1280 }
1219 1281
1220 utf8::decode (my $decname = $filename); 1282 utf8::decode (my $decname = $filename);
1221 warn sprintf "loading %s (%d,%d)\n", 1283 trace sprintf "loading %s (%d,%d)\n",
1222 $decname, length $data, scalar @{$av || []}; 1284 $decname, length $data, scalar @{$av || []}
1285 if $VERBOSE_IO;
1223 1286
1224 ($data, $av) 1287 ($data, $av)
1225} 1288}
1226 1289
1227=head2 COMMAND CALLBACKS 1290=head2 COMMAND CALLBACKS
1286} 1349}
1287 1350
1288use File::Glob (); 1351use File::Glob ();
1289 1352
1290cf::player->attach ( 1353cf::player->attach (
1291 on_command => sub { 1354 on_unknown_command => sub {
1292 my ($pl, $name, $params) = @_; 1355 my ($pl, $name, $params) = @_;
1293 1356
1294 my $cb = $COMMAND{$name} 1357 my $cb = $COMMAND{$name}
1295 or return; 1358 or return;
1296 1359
1319 1382
1320 $pl->ext_reply ($reply, @reply) 1383 $pl->ext_reply ($reply, @reply)
1321 if $reply; 1384 if $reply;
1322 1385
1323 } else { 1386 } else {
1324 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1387 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1325 } 1388 }
1326 1389
1327 cf::override; 1390 cf::override;
1328 }, 1391 },
1329); 1392);
1340 1403
1341 $grp 1404 $grp
1342} 1405}
1343 1406
1344sub load_extensions { 1407sub load_extensions {
1408 info "loading extensions...";
1409
1345 cf::sync_job { 1410 cf::sync_job {
1346 my %todo; 1411 my %todo;
1347 1412
1348 for my $path (<$LIBDIR/*.ext>) { 1413 for my $path (<$LIBDIR/*.ext>) {
1349 next unless -r $path; 1414 next unless -r $path;
1367 1432
1368 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1433 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1369 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1434 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1370 1435
1371 $ext{source} = 1436 $ext{source} =
1372 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1437 "package $pkg; use common::sense;\n"
1373 . "#line 1 \"$path\"\n{\n" 1438 . "#line 1 \"$path\"\n{\n"
1374 . $source 1439 . $source
1375 . "\n};\n1"; 1440 . "\n};\n1";
1376 1441
1377 $todo{$base} = \%ext; 1442 $todo{$base} = \%ext;
1378 } 1443 }
1379 1444
1445 my $pass = 0;
1380 my %done; 1446 my %done;
1381 while (%todo) { 1447 while (%todo) {
1382 my $progress; 1448 my $progress;
1383 1449
1450 ++$pass;
1451
1452 ext:
1384 while (my ($k, $v) = each %todo) { 1453 while (my ($k, $v) = each %todo) {
1385 for (split /,\s*/, $v->{meta}{depends}) { 1454 for (split /,\s*/, $v->{meta}{depends}) {
1386 goto skip 1455 next ext
1387 unless exists $done{$_}; 1456 unless exists $done{$_};
1388 } 1457 }
1389 1458
1390 warn "... loading '$k' into '$v->{pkg}'\n"; 1459 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1391 1460
1392 unless (eval $v->{source}) { 1461 my $active = eval $v->{source};
1462
1463 if (length $@) {
1393 my $msg = $@ ? "$v->{path}: $@\n" 1464 error "$v->{path}: $@\n";
1394 : "$v->{base}: extension inactive.\n";
1395 1465
1396 if (exists $v->{meta}{mandatory}) {
1397 warn $msg;
1398 cf::cleanup "mandatory extension failed to load, exiting."; 1466 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1399 } 1467 if exists $v->{meta}{mandatory};
1400 1468
1401 warn $msg; 1469 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1470 delete $todo{$k};
1471 } else {
1472 $done{$k} = delete $todo{$k};
1473 push @EXTS, $v->{pkg};
1474 $progress = 1;
1475
1476 info "$v->{base}: extension inactive.\n"
1477 unless $active;
1402 } 1478 }
1403
1404 $done{$k} = delete $todo{$k};
1405 push @EXTS, $v->{pkg};
1406 $progress = 1;
1407 } 1479 }
1408 1480
1409 skip: 1481 unless ($progress) {
1410 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1482 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1411 unless $progress; 1483
1484 while (my ($k, $v) = each %todo) {
1485 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1486 if exists $v->{meta}{mandatory};
1487 }
1488 }
1412 } 1489 }
1413 }; 1490 };
1414} 1491}
1415 1492
1416############################################################################# 1493#############################################################################
1500 $cf::PLAYER{$login} = $pl 1577 $cf::PLAYER{$login} = $pl
1501 } 1578 }
1502 } 1579 }
1503} 1580}
1504 1581
1582cf::player->attach (
1583 on_load => sub {
1584 my ($pl, $path) = @_;
1585
1586 # restore slots saved in save, below
1587 my $slots = delete $pl->{_slots};
1588
1589 $pl->ob->current_weapon ($slots->[0]);
1590 $pl->combat_ob ($slots->[1]);
1591 $pl->ranged_ob ($slots->[2]);
1592 },
1593);
1594
1505sub save($) { 1595sub save($) {
1506 my ($pl) = @_; 1596 my ($pl) = @_;
1507 1597
1508 return if $pl->{deny_save}; 1598 return if $pl->{deny_save};
1509 1599
1514 1604
1515 aio_mkdir playerdir $pl, 0770; 1605 aio_mkdir playerdir $pl, 0770;
1516 $pl->{last_save} = $cf::RUNTIME; 1606 $pl->{last_save} = $cf::RUNTIME;
1517 1607
1518 cf::get_slot 0.01; 1608 cf::get_slot 0.01;
1609
1610 # save slots, to be restored later
1611 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1519 1612
1520 $pl->save_pl ($path); 1613 $pl->save_pl ($path);
1521 cf::cede_to_tick; 1614 cf::cede_to_tick;
1522} 1615}
1523 1616
1559 $pl->{deny_save} = 1; 1652 $pl->{deny_save} = 1;
1560 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1653 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1561 1654
1562 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1655 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1563 $pl->deactivate; 1656 $pl->deactivate;
1657
1564 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1658 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1565 $pl->ob->check_score; 1659 ext::highscore::check ($pl->ob);
1660
1566 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1661 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1567 $pl->ns->destroy if $pl->ns; 1662 $pl->ns->destroy if $pl->ns;
1568 1663
1569 my $path = playerdir $pl; 1664 my $path = playerdir $pl;
1570 my $temp = "$path~$cf::RUNTIME~deleting~"; 1665 my $temp = "$path~$cf::RUNTIME~deleting~";
1625 \@logins 1720 \@logins
1626} 1721}
1627 1722
1628=item $player->maps 1723=item $player->maps
1629 1724
1725=item cf::player::maps $login
1726
1630Returns an arrayref of map paths that are private for this 1727Returns an arrayref of map paths that are private for this
1631player. May block. 1728player. May block.
1632 1729
1633=cut 1730=cut
1634 1731
1696=cut 1793=cut
1697 1794
1698sub find_by_path($) { 1795sub find_by_path($) {
1699 my ($path) = @_; 1796 my ($path) = @_;
1700 1797
1798 $path =~ s/^~[^\/]*//; # skip ~login
1799
1701 my ($match, $specificity); 1800 my ($match, $specificity);
1702 1801
1703 for my $region (list) { 1802 for my $region (list) {
1704 if ($region->{match} && $path =~ $region->{match}) { 1803 if ($region->{match} && $path =~ $region->{match}) {
1705 ($match, $specificity) = ($region, $region->specificity) 1804 ($match, $specificity) = ($region, $region->specificity)
1736 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1835 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1737 1836
1738 # mit "rum" bekleckern, nicht 1837 # mit "rum" bekleckern, nicht
1739 $self->_create_random_map ( 1838 $self->_create_random_map (
1740 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1839 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1741 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1840 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1742 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1841 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1743 $rmp->{exit_on_final_map}, 1842 $rmp->{exit_on_final_map},
1744 $rmp->{xsize}, $rmp->{ysize}, 1843 $rmp->{xsize}, $rmp->{ysize},
1745 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1844 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1746 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1845 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1761 1860
1762sub register { 1861sub register {
1763 my (undef, $regex, $prio) = @_; 1862 my (undef, $regex, $prio) = @_;
1764 my $pkg = caller; 1863 my $pkg = caller;
1765 1864
1766 no strict;
1767 push @{"$pkg\::ISA"}, __PACKAGE__; 1865 push @{"$pkg\::ISA"}, __PACKAGE__;
1768 1866
1769 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1867 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1770} 1868}
1771 1869
1772# also paths starting with '/' 1870# also paths starting with '/'
1773$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1871$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1774 1872
1775sub thawer_merge { 1873sub thawer_merge {
1776 my ($self, $merge) = @_; 1874 my ($self, $merge) = @_;
1777 1875
1778 # we have to keep some variables in memory intact 1876 # we have to keep some variables in memory intact
1783} 1881}
1784 1882
1785sub normalise { 1883sub normalise {
1786 my ($path, $base) = @_; 1884 my ($path, $base) = @_;
1787 1885
1788 $path = "$path"; # make sure its a string 1886 $path = "$path"; # make sure it's a string
1789 1887
1790 $path =~ s/\.map$//; 1888 $path =~ s/\.map$//;
1791 1889
1792 # map plan: 1890 # map plan:
1793 # 1891 #
1832 $self->init; # pass $1 etc. 1930 $self->init; # pass $1 etc.
1833 return $self; 1931 return $self;
1834 } 1932 }
1835 } 1933 }
1836 1934
1837 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1935 Carp::cluck "unable to resolve path '$path' (base '$base')";
1838 () 1936 ()
1839} 1937}
1840 1938
1841sub init { 1939sub init {
1842 my ($self) = @_; 1940 my ($self) = @_;
1964} 2062}
1965 2063
1966sub find; 2064sub find;
1967sub find { 2065sub find {
1968 my ($path, $origin) = @_; 2066 my ($path, $origin) = @_;
2067
2068 cf::cede_to_tick;
1969 2069
1970 $path = normalise $path, $origin && $origin->path; 2070 $path = normalise $path, $origin && $origin->path;
1971 2071
1972 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2072 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 my $guard2 = cf::lock_acquire "map_find:$path"; 2073 my $guard2 = cf::lock_acquire "map_find:$path";
1992 2092
1993 $cf::MAP{$path} = $map 2093 $cf::MAP{$path} = $map
1994 } 2094 }
1995} 2095}
1996 2096
1997sub pre_load { } 2097sub pre_load { }
1998sub post_load { } 2098#sub post_load { } # XS
1999 2099
2000sub load { 2100sub load {
2001 my ($self) = @_; 2101 my ($self) = @_;
2002 2102
2003 local $self->{deny_reset} = 1; # loading can take a long time 2103 local $self->{deny_reset} = 1; # loading can take a long time
2060 } 2160 }
2061 2161
2062 $self->post_load; 2162 $self->post_load;
2063} 2163}
2064 2164
2165# customize the map for a given player, i.e.
2166# return the _real_ map. used by e.g. per-player
2167# maps to change the path to ~playername/mappath
2065sub customise_for { 2168sub customise_for {
2066 my ($self, $ob) = @_; 2169 my ($self, $ob) = @_;
2067 2170
2068 return find "~" . $ob->name . "/" . $self->{path} 2171 return find "~" . $ob->name . "/" . $self->{path}
2069 if $self->per_player; 2172 if $self->per_player;
2085 or next; 2188 or next;
2086 $neigh = find $neigh, $map 2189 $neigh = find $neigh, $map
2087 or next; 2190 or next;
2088 $neigh->load; 2191 $neigh->load;
2089 2192
2193 # now find the diagonal neighbours
2090 push @neigh, 2194 push @neigh,
2091 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2195 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2092 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2196 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2093 } 2197 }
2094 2198
2101} 2205}
2102 2206
2103sub find_sync { 2207sub find_sync {
2104 my ($path, $origin) = @_; 2208 my ($path, $origin) = @_;
2105 2209
2106 cf::sync_job { find $path, $origin } 2210 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2211 if $Coro::current == $Coro::main;
2212
2213 find $path, $origin
2107} 2214}
2108 2215
2109sub do_load_sync { 2216sub do_load_sync {
2110 my ($map) = @_; 2217 my ($map) = @_;
2111 2218
2112 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2219 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2113 if $Coro::current == $Coro::main; 2220 if $Coro::current == $Coro::main;
2114 2221
2115 cf::sync_job { $map->load }; 2222 $map->load;
2116} 2223}
2117 2224
2118our %MAP_PREFETCH; 2225our %MAP_PREFETCH;
2119our $MAP_PREFETCHER = undef; 2226our $MAP_PREFETCHER = undef;
2120 2227
2146 $MAP_PREFETCHER->prio (6); 2253 $MAP_PREFETCHER->prio (6);
2147 2254
2148 () 2255 ()
2149} 2256}
2150 2257
2258# common code, used by both ->save and ->swapout
2151sub save { 2259sub _save {
2152 my ($self) = @_; 2260 my ($self) = @_;
2153
2154 my $lock = cf::lock_acquire "map_data:$self->{path}";
2155 2261
2156 $self->{last_save} = $cf::RUNTIME; 2262 $self->{last_save} = $cf::RUNTIME;
2157 2263
2158 return unless $self->dirty; 2264 return unless $self->dirty;
2159 2265
2179 } else { 2285 } else {
2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2286 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2181 } 2287 }
2182} 2288}
2183 2289
2290sub save {
2291 my ($self) = @_;
2292
2293 my $lock = cf::lock_acquire "map_data:$self->{path}";
2294
2295 $self->_save;
2296}
2297
2184sub swap_out { 2298sub swap_out {
2185 my ($self) = @_; 2299 my ($self) = @_;
2186 2300
2187 # save first because save cedes
2188 $self->save;
2189
2190 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2301 my $lock = cf::lock_acquire "map_data:$self->{path}";
2191 2302
2192 return if $self->players;
2193 return if $self->in_memory != cf::MAP_ACTIVE; 2303 return if $self->in_memory != cf::MAP_ACTIVE;
2194 return if $self->{deny_save}; 2304 return if $self->{deny_save};
2305 return if $self->players;
2195 2306
2307 # first deactivate the map and "unlink" it from the core
2308 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP;
2196 $self->in_memory (cf::MAP_SWAPPED); 2310 $self->in_memory (cf::MAP_SWAPPED);
2311
2312 # then atomically save
2313 $self->_save;
2314
2315 # then free the map
2316 $self->clear;
2317}
2318
2319sub reset_at {
2320 my ($self) = @_;
2321
2322 # TODO: safety, remove and allow resettable per-player maps
2323 return 1e99 if $self->{deny_reset};
2324
2325 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2326 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2327
2328 $time + $to
2329}
2330
2331sub should_reset {
2332 my ($self) = @_;
2333
2334 $self->reset_at <= $cf::RUNTIME
2335}
2336
2337sub reset {
2338 my ($self) = @_;
2339
2340 my $lock = cf::lock_acquire "map_data:$self->{path}";
2341
2342 return if $self->players;
2343
2344 cf::trace "resetting map ", $self->path, "\n";
2345
2346 $self->in_memory (cf::MAP_SWAPPED);
2347
2348 # need to save uniques path
2349 unless ($self->{deny_save}) {
2350 my $uniq = $self->uniq_path; utf8::encode $uniq;
2351
2352 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2353 if $uniq;
2354 }
2355
2356 delete $cf::MAP{$self->path};
2197 2357
2198 $self->deactivate; 2358 $self->deactivate;
2199 $_->clear_links_to ($self) for values %cf::MAP; 2359 $_->clear_links_to ($self) for values %cf::MAP;
2200 $self->clear; 2360 $self->clear;
2201}
2202
2203sub reset_at {
2204 my ($self) = @_;
2205
2206 # TODO: safety, remove and allow resettable per-player maps
2207 return 1e99 if $self->{deny_reset};
2208
2209 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2210 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2211
2212 $time + $to
2213}
2214
2215sub should_reset {
2216 my ($self) = @_;
2217
2218 $self->reset_at <= $cf::RUNTIME
2219}
2220
2221sub reset {
2222 my ($self) = @_;
2223
2224 my $lock = cf::lock_acquire "map_data:$self->{path}";
2225
2226 return if $self->players;
2227
2228 warn "resetting map ", $self->path;
2229
2230 $self->in_memory (cf::MAP_SWAPPED);
2231
2232 # need to save uniques path
2233 unless ($self->{deny_save}) {
2234 my $uniq = $self->uniq_path; utf8::encode $uniq;
2235
2236 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2237 if $uniq;
2238 }
2239
2240 delete $cf::MAP{$self->path};
2241
2242 $self->deactivate;
2243 $_->clear_links_to ($self) for values %cf::MAP;
2244 $self->clear;
2245 2361
2246 $self->unlink_save; 2362 $self->unlink_save;
2247 $self->destroy; 2363 $self->destroy;
2248} 2364}
2249 2365
2257 2373
2258 delete $cf::MAP{$self->path}; 2374 delete $cf::MAP{$self->path};
2259 2375
2260 $self->unlink_save; 2376 $self->unlink_save;
2261 2377
2262 bless $self, "cf::map"; 2378 bless $self, "cf::map::wrap";
2263 delete $self->{deny_reset}; 2379 delete $self->{deny_reset};
2264 $self->{deny_save} = 1; 2380 $self->{deny_save} = 1;
2265 $self->reset_timeout (1); 2381 $self->reset_timeout (1);
2266 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2382 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2267 2383
2324 : normalise $_ 2440 : normalise $_
2325 } @{ aio_readdir $UNIQUEDIR or [] } 2441 } @{ aio_readdir $UNIQUEDIR or [] }
2326 ] 2442 ]
2327} 2443}
2328 2444
2445=item cf::map::static_maps
2446
2447Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2448file in the shared directory excluding F</styles> and F</editor>). May
2449block.
2450
2451=cut
2452
2453sub static_maps() {
2454 my @dirs = "";
2455 my @maps;
2456
2457 while (@dirs) {
2458 my $dir = shift @dirs;
2459
2460 next if $dir eq "/styles" || $dir eq "/editor";
2461
2462 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2463 or return;
2464
2465 for (@$files) {
2466 s/\.map$// or next;
2467 utf8::decode $_;
2468 push @maps, "$dir/$_";
2469 }
2470
2471 push @dirs, map "$dir/$_", @$dirs;
2472 }
2473
2474 \@maps
2475}
2476
2329=back 2477=back
2330 2478
2331=head3 cf::object 2479=head3 cf::object
2332 2480
2333=cut 2481=cut
2465 2613
2466Freezes the player and moves him/her to a special map (C<{link}>). 2614Freezes the player and moves him/her to a special map (C<{link}>).
2467 2615
2468The player should be reasonably safe there for short amounts of time (e.g. 2616The player should be reasonably safe there for short amounts of time (e.g.
2469for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2617for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2470though, as the palyer cannot control the character while it is on the link 2618though, as the player cannot control the character while it is on the link
2471map. 2619map.
2472 2620
2473Will never block. 2621Will never block.
2474 2622
2475=item $player_object->leave_link ($map, $x, $y) 2623=item $player_object->leave_link ($map, $x, $y)
2496sub cf::object::player::enter_link { 2644sub cf::object::player::enter_link {
2497 my ($self) = @_; 2645 my ($self) = @_;
2498 2646
2499 $self->deactivate_recursive; 2647 $self->deactivate_recursive;
2500 2648
2649 ++$self->{_link_recursion};
2650
2501 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2651 return if UNIVERSAL::isa $self->map, "ext::map_link";
2502 2652
2503 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2653 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2504 if $self->map && $self->map->{path} ne "{link}"; 2654 if $self->map && $self->map->{path} ne "{link}";
2505 2655
2506 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2656 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2507} 2657}
2508 2658
2509sub cf::object::player::leave_link { 2659sub cf::object::player::leave_link {
2510 my ($self, $map, $x, $y) = @_; 2660 my ($self, $map, $x, $y) = @_;
2511 2661
2528 ($x, $y) = (-1, -1) 2678 ($x, $y) = (-1, -1)
2529 unless (defined $x) && (defined $y); 2679 unless (defined $x) && (defined $y);
2530 2680
2531 # use -1 or undef as default coordinates, not 0, 0 2681 # use -1 or undef as default coordinates, not 0, 0
2532 ($x, $y) = ($map->enter_x, $map->enter_y) 2682 ($x, $y) = ($map->enter_x, $map->enter_y)
2533 if $x <=0 && $y <= 0; 2683 if $x <= 0 && $y <= 0;
2534 2684
2535 $map->load; 2685 $map->load;
2536 $map->load_neighbours; 2686 $map->load_neighbours;
2537 2687
2538 return unless $self->contr->active; 2688 return unless $self->contr->active;
2539 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2540 $self->activate_recursive;
2541 2689
2542 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2690 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2543 $self->enter_map ($map, $x, $y); 2691 if ($self->enter_map ($map, $x, $y)) {
2544} 2692 # entering was successful
2693 delete $self->{_link_recursion};
2694 # only activate afterwards, to support waiting in hooks
2695 $self->activate_recursive;
2696 }
2545 2697
2698}
2699
2546=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2700=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2547 2701
2548Moves the player to the given map-path and coordinates by first freezing 2702Moves the player to the given map-path and coordinates by first freezing
2549her, loading and preparing them map, calling the provided $check callback 2703her, loading and preparing them map, calling the provided $check callback
2550that has to return the map if sucecssful, and then unfreezes the player on 2704that has to return the map if sucecssful, and then unfreezes the player on
2551the new (success) or old (failed) map position. In either case, $done will 2705the new (success) or old (failed) map position. In either case, $done will
2558 2712
2559our $GOTOGEN; 2713our $GOTOGEN;
2560 2714
2561sub cf::object::player::goto { 2715sub cf::object::player::goto {
2562 my ($self, $path, $x, $y, $check, $done) = @_; 2716 my ($self, $path, $x, $y, $check, $done) = @_;
2717
2718 if ($self->{_link_recursion} >= $MAX_LINKS) {
2719 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2720 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2721 ($path, $x, $y) = @$EMERGENCY_POSITION;
2722 }
2563 2723
2564 # do generation counting so two concurrent goto's will be executed in-order 2724 # do generation counting so two concurrent goto's will be executed in-order
2565 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2725 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2566 2726
2567 $self->enter_link; 2727 $self->enter_link;
2591 my $map = eval { 2751 my $map = eval {
2592 my $map = defined $path ? cf::map::find $path : undef; 2752 my $map = defined $path ? cf::map::find $path : undef;
2593 2753
2594 if ($map) { 2754 if ($map) {
2595 $map = $map->customise_for ($self); 2755 $map = $map->customise_for ($self);
2596 $map = $check->($map) if $check && $map; 2756 $map = $check->($map, $x, $y, $self) if $check && $map;
2597 } else { 2757 } else {
2598 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2758 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2599 } 2759 }
2600 2760
2601 $map 2761 $map
2609 if ($gen == $self->{_goto_generation}) { 2769 if ($gen == $self->{_goto_generation}) {
2610 delete $self->{_goto_generation}; 2770 delete $self->{_goto_generation};
2611 $self->leave_link ($map, $x, $y); 2771 $self->leave_link ($map, $x, $y);
2612 } 2772 }
2613 2773
2614 $done->() if $done; 2774 $done->($self) if $done;
2615 })->prio (1); 2775 })->prio (1);
2616} 2776}
2617 2777
2618=item $player_object->enter_exit ($exit_object) 2778=item $player_object->enter_exit ($exit_object)
2619 2779
2712 $self->message ("Something went wrong deep within the deliantra server. " 2872 $self->message ("Something went wrong deep within the deliantra server. "
2713 . "I'll try to bring you back to the map you were before. " 2873 . "I'll try to bring you back to the map you were before. "
2714 . "Please report this to the dungeon master!", 2874 . "Please report this to the dungeon master!",
2715 cf::NDI_UNIQUE | cf::NDI_RED); 2875 cf::NDI_UNIQUE | cf::NDI_RED);
2716 2876
2717 warn "ERROR in enter_exit: $@"; 2877 error "ERROR in enter_exit: $@";
2718 $self->leave_link; 2878 $self->leave_link;
2719 } 2879 }
2720 })->prio (1); 2880 })->prio (1);
2721} 2881}
2722 2882
2734sub cf::client::send_drawinfo { 2894sub cf::client::send_drawinfo {
2735 my ($self, $text, $flags) = @_; 2895 my ($self, $text, $flags) = @_;
2736 2896
2737 utf8::encode $text; 2897 utf8::encode $text;
2738 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2898 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2899}
2900
2901=item $client->send_big_packet ($pkt)
2902
2903Like C<send_packet>, but tries to compress large packets, and fragments
2904them as required.
2905
2906=cut
2907
2908our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2909
2910sub cf::client::send_big_packet {
2911 my ($self, $pkt) = @_;
2912
2913 # try lzf for large packets
2914 $pkt = "lzf " . Compress::LZF::compress $pkt
2915 if 1024 <= length $pkt and $self->{can_lzf};
2916
2917 # split very large packets
2918 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2919 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2920 $pkt = "frag";
2921 }
2922
2923 $self->send_packet ($pkt);
2739} 2924}
2740 2925
2741=item $client->send_msg ($channel, $msg, $color, [extra...]) 2926=item $client->send_msg ($channel, $msg, $color, [extra...])
2742 2927
2743Send a drawinfo or msg packet to the client, formatting the msg for the 2928Send a drawinfo or msg packet to the client, formatting the msg for the
2747 2932
2748=cut 2933=cut
2749 2934
2750# non-persistent channels (usually the info channel) 2935# non-persistent channels (usually the info channel)
2751our %CHANNEL = ( 2936our %CHANNEL = (
2937 "c/motd" => {
2938 id => "infobox",
2939 title => "MOTD",
2940 reply => undef,
2941 tooltip => "The message of the day",
2942 },
2752 "c/identify" => { 2943 "c/identify" => {
2753 id => "infobox", 2944 id => "infobox",
2754 title => "Identify", 2945 title => "Identify",
2755 reply => undef, 2946 reply => undef,
2756 tooltip => "Items recently identified", 2947 tooltip => "Items recently identified",
2758 "c/examine" => { 2949 "c/examine" => {
2759 id => "infobox", 2950 id => "infobox",
2760 title => "Examine", 2951 title => "Examine",
2761 reply => undef, 2952 reply => undef,
2762 tooltip => "Signs and other items you examined", 2953 tooltip => "Signs and other items you examined",
2954 },
2955 "c/shopinfo" => {
2956 id => "infobox",
2957 title => "Shop Info",
2958 reply => undef,
2959 tooltip => "What your bargaining skill tells you about the shop",
2763 }, 2960 },
2764 "c/book" => { 2961 "c/book" => {
2765 id => "infobox", 2962 id => "infobox",
2766 title => "Book", 2963 title => "Book",
2767 reply => undef, 2964 reply => undef,
2883 my $pkt = "msg " 3080 my $pkt = "msg "
2884 . $self->{json_coder}->encode ( 3081 . $self->{json_coder}->encode (
2885 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3082 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2886 ); 3083 );
2887 3084
2888 # try lzf for large packets
2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2890 if 1024 <= length $pkt and $self->{can_lzf};
2891
2892 # split very large packets
2893 if (8192 < length $pkt and $self->{can_lzf}) {
2894 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2895 $pkt = "frag";
2896 }
2897
2898 $self->send_packet ($pkt); 3085 $self->send_big_packet ($pkt);
2899} 3086}
2900 3087
2901=item $client->ext_msg ($type, @msg) 3088=item $client->ext_msg ($type, @msg)
2902 3089
2903Sends an ext event to the client. 3090Sends an ext event to the client.
2906 3093
2907sub cf::client::ext_msg($$@) { 3094sub cf::client::ext_msg($$@) {
2908 my ($self, $type, @msg) = @_; 3095 my ($self, $type, @msg) = @_;
2909 3096
2910 if ($self->extcmd == 2) { 3097 if ($self->extcmd == 2) {
2911 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3098 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2912 } elsif ($self->extcmd == 1) { # TODO: remove 3099 } elsif ($self->extcmd == 1) { # TODO: remove
2913 push @msg, msgtype => "event_$type"; 3100 push @msg, msgtype => "event_$type";
2914 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2915 } 3102 }
2916} 3103}
2917 3104
2918=item $client->ext_reply ($msgid, @msg) 3105=item $client->ext_reply ($msgid, @msg)
2919 3106
2923 3110
2924sub cf::client::ext_reply($$@) { 3111sub cf::client::ext_reply($$@) {
2925 my ($self, $id, @msg) = @_; 3112 my ($self, $id, @msg) = @_;
2926 3113
2927 if ($self->extcmd == 2) { 3114 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2929 } elsif ($self->extcmd == 1) { 3116 } elsif ($self->extcmd == 1) {
2930 #TODO: version 1, remove 3117 #TODO: version 1, remove
2931 unshift @msg, msgtype => "reply", msgid => $id; 3118 unshift @msg, msgtype => "reply", msgid => $id;
2932 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3119 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2933 } 3120 }
2934} 3121}
2935 3122
2936=item $success = $client->query ($flags, "text", \&cb) 3123=item $success = $client->query ($flags, "text", \&cb)
2937 3124
3008 3195
3009 $ns->ext_reply ($reply, @reply) 3196 $ns->ext_reply ($reply, @reply)
3010 if $reply; 3197 if $reply;
3011 3198
3012 } else { 3199 } else {
3013 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3200 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3014 } 3201 }
3015 3202
3016 cf::override; 3203 cf::override;
3017 }, 3204 },
3018); 3205);
3038 3225
3039 $coro 3226 $coro
3040} 3227}
3041 3228
3042cf::client->attach ( 3229cf::client->attach (
3043 on_destroy => sub { 3230 on_client_destroy => sub {
3044 my ($ns) = @_; 3231 my ($ns) = @_;
3045 3232
3046 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3233 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3047 }, 3234 },
3048); 3235);
3064our $safe_hole = new Safe::Hole; 3251our $safe_hole = new Safe::Hole;
3065 3252
3066$SIG{FPE} = 'IGNORE'; 3253$SIG{FPE} = 'IGNORE';
3067 3254
3068$safe->permit_only (Opcode::opset qw( 3255$safe->permit_only (Opcode::opset qw(
3069 :base_core :base_mem :base_orig :base_math 3256 :base_core :base_mem :base_orig :base_math :base_loop
3070 grepstart grepwhile mapstart mapwhile 3257 grepstart grepwhile mapstart mapwhile
3071 sort time 3258 sort time
3072)); 3259));
3073 3260
3074# here we export the classes and methods available to script code 3261# here we export the classes and methods available to script code
3099 decrease split destroy change_exp value msg lore send_msg)], 3286 decrease split destroy change_exp value msg lore send_msg)],
3100 ["cf::object::player" => qw(player)], 3287 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful send_msg)], 3288 ["cf::player" => qw(peaceful send_msg)],
3102 ["cf::map" => qw(trigger)], 3289 ["cf::map" => qw(trigger)],
3103) { 3290) {
3104 no strict 'refs';
3105 my ($pkg, @funs) = @$_; 3291 my ($pkg, @funs) = @$_;
3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3292 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3107 for @funs; 3293 for @funs;
3108} 3294}
3109 3295
3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3312 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3127 $qcode =~ s/\n/\\n/g; 3313 $qcode =~ s/\n/\\n/g;
3128 3314
3129 %vars = (_dummy => 0) unless %vars; 3315 %vars = (_dummy => 0) unless %vars;
3130 3316
3317 my @res;
3131 local $_; 3318 local $_;
3132 local @safe::cf::_safe_eval_args = values %vars;
3133 3319
3134 my $eval = 3320 my $eval =
3135 "do {\n" 3321 "do {\n"
3136 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3322 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3137 . "#line 0 \"{$qcode}\"\n" 3323 . "#line 0 \"{$qcode}\"\n"
3138 . $code 3324 . $code
3139 . "\n}" 3325 . "\n}"
3140 ; 3326 ;
3141 3327
3328 if ($CFG{safe_eval}) {
3142 sub_generation_inc; 3329 sub_generation_inc;
3330 local @safe::cf::_safe_eval_args = values %vars;
3143 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3331 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3144 sub_generation_inc; 3332 sub_generation_inc;
3333 } else {
3334 local @cf::_safe_eval_args = values %vars;
3335 @res = wantarray ? eval eval : scalar eval $eval;
3336 }
3145 3337
3146 if ($@) { 3338 if ($@) {
3147 warn "$@"; 3339 warn "$@",
3148 warn "while executing safe code '$code'\n"; 3340 "while executing safe code '$code'\n",
3149 warn "with arguments " . (join " ", %vars) . "\n"; 3341 "with arguments " . (join " ", %vars) . "\n";
3150 } 3342 }
3151 3343
3152 wantarray ? @res : $res[0] 3344 wantarray ? @res : $res[0]
3153} 3345}
3154 3346
3168=cut 3360=cut
3169 3361
3170sub register_script_function { 3362sub register_script_function {
3171 my ($fun, $cb) = @_; 3363 my ($fun, $cb) = @_;
3172 3364
3173 no strict 'refs'; 3365 $fun = "safe::$fun" if $CFG{safe_eval};
3174 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3366 *$fun = $safe_hole->wrap ($cb);
3175} 3367}
3176 3368
3177=back 3369=back
3178 3370
3179=cut 3371=cut
3188 # for this (global event?) 3380 # for this (global event?)
3189 %ext::player_env::MUSIC_FACE_CACHE = (); 3381 %ext::player_env::MUSIC_FACE_CACHE = ();
3190 3382
3191 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3383 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3192 3384
3193 warn "loading facedata from $path\n"; 3385 trace "loading facedata from $path\n";
3194 3386
3195 my $facedata;
3196 0 < aio_load $path, $facedata 3387 0 < aio_load $path, my $facedata
3197 or die "$path: $!"; 3388 or die "$path: $!";
3198 3389
3199 $facedata = Coro::Storable::thaw $facedata; 3390 $facedata = Coro::Storable::thaw $facedata;
3200 3391
3201 $facedata->{version} == 2 3392 $facedata->{version} == 2
3202 or cf::cleanup "$path: version mismatch, cannot proceed."; 3393 or cf::cleanup "$path: version mismatch, cannot proceed.";
3203 3394
3204 # patch in the exptable 3395 # patch in the exptable
3396 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3205 $facedata->{resource}{"res/exp_table"} = { 3397 $facedata->{resource}{"res/exp_table"} = {
3206 type => FT_RSRC, 3398 type => FT_RSRC,
3207 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3399 data => $exp_table,
3400 hash => (Digest::MD5::md5 $exp_table),
3208 }; 3401 };
3209 cf::cede_to_tick; 3402 cf::cede_to_tick;
3210 3403
3211 { 3404 {
3212 my $faces = $facedata->{faceinfo}; 3405 my $faces = $facedata->{faceinfo};
3214 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
3215 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3408 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3216 3409
3217 cf::face::set_visibility $idx, $info->{visibility}; 3410 cf::face::set_visibility $idx, $info->{visibility};
3218 cf::face::set_magicmap $idx, $info->{magicmap}; 3411 cf::face::set_magicmap $idx, $info->{magicmap};
3219 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3412 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3220 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3413 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3221 3414
3222 cf::cede_to_tick; 3415 cf::cede_to_tick;
3223 } 3416 }
3224 3417
3225 while (my ($face, $info) = each %$faces) { 3418 while (my ($face, $info) = each %$faces) {
3230 3423
3231 if (my $smooth = cf::face::find $info->{smooth}) { 3424 if (my $smooth = cf::face::find $info->{smooth}) {
3232 cf::face::set_smooth $idx, $smooth; 3425 cf::face::set_smooth $idx, $smooth;
3233 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3426 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3234 } else { 3427 } else {
3235 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3428 error "smooth face '$info->{smooth}' not found for face '$face'";
3236 } 3429 }
3237 3430
3238 cf::cede_to_tick; 3431 cf::cede_to_tick;
3239 } 3432 }
3240 } 3433 }
3249 3442
3250 cf::anim::invalidate_all; # d'oh 3443 cf::anim::invalidate_all; # d'oh
3251 } 3444 }
3252 3445
3253 { 3446 {
3254 # TODO: for gcfclient pleasure, we should give resources
3255 # that gcfclient doesn't grok a >10000 face index.
3256 my $res = $facedata->{resource}; 3447 my $res = $facedata->{resource};
3257 3448
3258 while (my ($name, $info) = each %$res) { 3449 while (my ($name, $info) = each %$res) {
3259 if (defined $info->{type}) { 3450 if (defined $info->{type}) {
3260 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3451 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3261 my $data;
3262 3452
3263 if ($info->{type} & 1) { 3453 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3264 # prepend meta info
3265
3266 my $meta = $enc->encode ({
3267 name => $name,
3268 %{ $info->{meta} || {} },
3269 });
3270
3271 $data = pack "(w/a*)*", $meta, $info->{data};
3272 } else {
3273 $data = $info->{data};
3274 }
3275
3276 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3277 cf::face::set_type $idx, $info->{type}; 3454 cf::face::set_type $idx, $info->{type};
3278 } else { 3455 } else {
3279 $RESOURCE{$name} = $info; 3456 $RESOURCE{$name} = $info; # unused
3280 } 3457 }
3281 3458
3282 cf::cede_to_tick; 3459 cf::cede_to_tick;
3283 } 3460 }
3284 } 3461 }
3285 3462
3286 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3463 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3287 3464
3288 1 3465 1
3289} 3466}
3290
3291cf::global->attach (on_resource_update => sub {
3292 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3293 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3294
3295 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3296 my $sound = $soundconf->{compat}[$_]
3297 or next;
3298
3299 my $face = cf::face::find "sound/$sound->[1]";
3300 cf::sound::set $sound->[0] => $face;
3301 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3302 }
3303
3304 while (my ($k, $v) = each %{$soundconf->{event}}) {
3305 my $face = cf::face::find "sound/$v";
3306 cf::sound::set $k => $face;
3307 }
3308 }
3309});
3310 3467
3311register_exticmd fx_want => sub { 3468register_exticmd fx_want => sub {
3312 my ($ns, $want) = @_; 3469 my ($ns, $want) = @_;
3313 3470
3314 while (my ($k, $v) = each %$want) { 3471 while (my ($k, $v) = each %$want) {
3353sub reload_treasures { 3510sub reload_treasures {
3354 load_resource_file "$DATADIR/treasures" 3511 load_resource_file "$DATADIR/treasures"
3355 or die "unable to load treasurelists\n"; 3512 or die "unable to load treasurelists\n";
3356} 3513}
3357 3514
3515sub reload_sound {
3516 trace "loading sound config from $DATADIR/sound\n";
3517
3518 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3519 or die "$DATADIR/sound $!";
3520
3521 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3522
3523 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3524 my $sound = $soundconf->{compat}[$_]
3525 or next;
3526
3527 my $face = cf::face::find "sound/$sound->[1]";
3528 cf::sound::set $sound->[0] => $face;
3529 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3530 }
3531
3532 while (my ($k, $v) = each %{$soundconf->{event}}) {
3533 my $face = cf::face::find "sound/$v";
3534 cf::sound::set $k => $face;
3535 }
3536}
3537
3358sub reload_resources { 3538sub reload_resources {
3359 warn "reloading resource files...\n"; 3539 trace "reloading resource files...\n";
3360 3540
3541 reload_exp_table;
3542 reload_materials;
3361 reload_facedata; 3543 reload_facedata;
3544 reload_sound;
3362 reload_archetypes; 3545 reload_archetypes;
3363 reload_regions; 3546 reload_regions;
3364 reload_treasures; 3547 reload_treasures;
3365 3548
3366 warn "finished reloading resource files\n"; 3549 trace "finished reloading resource files\n";
3367} 3550}
3368 3551
3369sub reload_config { 3552sub reload_config {
3370 open my $fh, "<:utf8", "$CONFDIR/config" 3553 trace "reloading config file...\n";
3371 or return;
3372 3554
3373 local $/; 3555 0 < aio_load "$CONFDIR/config", my $config
3556 or die "$CONFDIR/config: $!";
3557
3558 utf8::decode $config;
3559
3560 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3374 *CFG = YAML::Load <$fh>; 3561 *CFG = YAML::XS::Load $config;
3375 3562
3376 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3563 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3377 3564
3378 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3565 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3379 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3566 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3380 3567
3381 if (exists $CFG{mlockall}) { 3568 if (exists $CFG{mlockall}) {
3405 seek $fh, 0, 0; 3592 seek $fh, 0, 0;
3406 print $fh $$; 3593 print $fh $$;
3407} 3594}
3408 3595
3409sub main_loop { 3596sub main_loop {
3410 warn "EV::loop starting\n"; 3597 trace "EV::loop starting\n";
3411 if (1) { 3598 if (1) {
3412 EV::loop; 3599 EV::loop;
3413 } 3600 }
3414 warn "EV::loop returned\n"; 3601 trace "EV::loop returned\n";
3415 goto &main_loop unless $REALLY_UNLOOP; 3602 goto &main_loop unless $REALLY_UNLOOP;
3416} 3603}
3417 3604
3418sub main { 3605sub main {
3419 cf::init_globals; # initialise logging 3606 cf::init_globals; # initialise logging
3420 3607
3421 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3608 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3422 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3609 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3423 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3610 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3424 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3611 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3425
3426 cf::init_experience;
3427 cf::init_anim;
3428 cf::init_attackmess;
3429 cf::init_dynamic;
3430 3612
3431 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3613 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3432 3614
3433 # we must not ever block the main coroutine 3615 # we must not ever block the main coroutine
3434 local $Coro::idle = sub { 3616 local $Coro::idle = sub {
3440 }; 3622 };
3441 3623
3442 evthread_start IO::AIO::poll_fileno; 3624 evthread_start IO::AIO::poll_fileno;
3443 3625
3444 cf::sync_job { 3626 cf::sync_job {
3627 cf::incloader::init ();
3628
3629 cf::init_anim;
3630 cf::init_attackmess;
3631 cf::init_dynamic;
3632
3633 cf::load_settings;
3634
3445 reload_resources; 3635 reload_resources;
3446 reload_config; 3636 reload_config;
3447 db_init; 3637 db_init;
3448 3638
3449 cf::load_settings;
3450 cf::load_materials;
3451 cf::init_uuid; 3639 cf::init_uuid;
3452 cf::init_signals; 3640 cf::init_signals;
3453 cf::init_commands;
3454 cf::init_skills; 3641 cf::init_skills;
3455 3642
3456 cf::init_beforeplay; 3643 cf::init_beforeplay;
3457 3644
3458 atomic; 3645 atomic;
3460 load_extensions; 3647 load_extensions;
3461 3648
3462 utime time, time, $RUNTIMEFILE; 3649 utime time, time, $RUNTIMEFILE;
3463 3650
3464 # no (long-running) fork's whatsoever before this point(!) 3651 # no (long-running) fork's whatsoever before this point(!)
3652 use POSIX ();
3465 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3653 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3466 3654
3467 (pop @POST_INIT)->(0) while @POST_INIT; 3655 (pop @POST_INIT)->(0) while @POST_INIT;
3468 }; 3656 };
3469 3657
3658 cf::object::thawer::errors_are_fatal 0;
3659 info "parse errors in files are no longer fatal from this point on.\n";
3660
3661 my $free_main; $free_main = EV::idle sub {
3662 undef $free_main;
3663 undef &main; # free gobs of memory :)
3664 };
3665
3470 main_loop; 3666 goto &main_loop;
3471} 3667}
3472 3668
3473############################################################################# 3669#############################################################################
3474# initialisation and cleanup 3670# initialisation and cleanup
3475 3671
3476# install some emergency cleanup handlers 3672# install some emergency cleanup handlers
3477BEGIN { 3673BEGIN {
3478 our %SIGWATCHER = (); 3674 our %SIGWATCHER = ();
3479 for my $signal (qw(INT HUP TERM)) { 3675 for my $signal (qw(INT HUP TERM)) {
3480 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3676 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3481 cf::cleanup "SIG$signal"; 3677 cf::cleanup "SIG$signal";
3482 }; 3678 };
3483 } 3679 }
3484} 3680}
3485 3681
3486sub write_runtime_sync { 3682sub write_runtime_sync {
3683 my $t0 = AE::time;
3684
3487 # first touch the runtime file to show we are still running: 3685 # first touch the runtime file to show we are still running:
3488 # the fsync below can take a very very long time. 3686 # the fsync below can take a very very long time.
3489 3687
3490 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3688 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3491 3689
3492 my $guard = cf::lock_acquire "write_runtime"; 3690 my $guard = cf::lock_acquire "write_runtime";
3493 3691
3494 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3692 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3495 or return; 3693 or return;
3496 3694
3497 my $value = $cf::RUNTIME + 90 + 10; 3695 my $value = $cf::RUNTIME + 90 + 10;
3498 # 10 is the runtime save interval, for a monotonic clock 3696 # 10 is the runtime save interval, for a monotonic clock
3499 # 60 allows for the watchdog to kill the server. 3697 # 60 allows for the watchdog to kill the server.
3512 or return; 3710 or return;
3513 3711
3514 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3712 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3515 and return; 3713 and return;
3516 3714
3517 warn "runtime file written.\n"; 3715 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3518 3716
3519 1 3717 1
3520} 3718}
3521 3719
3522our $uuid_lock; 3720our $uuid_lock;
3534 or return; 3732 or return;
3535 3733
3536 my $value = uuid_seq uuid_cur; 3734 my $value = uuid_seq uuid_cur;
3537 3735
3538 unless ($value) { 3736 unless ($value) {
3539 warn "cowardly refusing to write zero uuid value!\n"; 3737 info "cowardly refusing to write zero uuid value!\n";
3540 return; 3738 return;
3541 } 3739 }
3542 3740
3543 my $value = uuid_str $value + $uuid_skip; 3741 my $value = uuid_str $value + $uuid_skip;
3544 $uuid_skip = 0; 3742 $uuid_skip = 0;
3554 or return; 3752 or return;
3555 3753
3556 aio_rename "$uuid~", $uuid 3754 aio_rename "$uuid~", $uuid
3557 and return; 3755 and return;
3558 3756
3559 warn "uuid file written ($value).\n"; 3757 trace "uuid file written ($value).\n";
3560 3758
3561 1 3759 1
3562 3760
3563} 3761}
3564 3762
3570} 3768}
3571 3769
3572sub emergency_save() { 3770sub emergency_save() {
3573 my $freeze_guard = cf::freeze_mainloop; 3771 my $freeze_guard = cf::freeze_mainloop;
3574 3772
3575 warn "emergency_perl_save: enter\n"; 3773 info "emergency_perl_save: enter\n";
3774
3775 # this is a trade-off: we want to be very quick here, so
3776 # save all maps without fsync, and later call a global sync
3777 # (which in turn might be very very slow)
3778 local $USE_FSYNC = 0;
3576 3779
3577 cf::sync_job { 3780 cf::sync_job {
3578 # this is a trade-off: we want to be very quick here, so 3781 cf::write_runtime_sync; # external watchdog should not bark
3579 # save all maps without fsync, and later call a global sync
3580 # (which in turn might be very very slow)
3581 local $USE_FSYNC = 0;
3582 3782
3583 # use a peculiar iteration method to avoid tripping on perl 3783 # use a peculiar iteration method to avoid tripping on perl
3584 # refcount bugs in for. also avoids problems with players 3784 # refcount bugs in for. also avoids problems with players
3585 # and maps saved/destroyed asynchronously. 3785 # and maps saved/destroyed asynchronously.
3586 warn "emergency_perl_save: begin player save\n"; 3786 info "emergency_perl_save: begin player save\n";
3587 for my $login (keys %cf::PLAYER) { 3787 for my $login (keys %cf::PLAYER) {
3588 my $pl = $cf::PLAYER{$login} or next; 3788 my $pl = $cf::PLAYER{$login} or next;
3589 $pl->valid or next; 3789 $pl->valid or next;
3590 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3790 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3591 $pl->save; 3791 $pl->save;
3592 } 3792 }
3593 warn "emergency_perl_save: end player save\n"; 3793 info "emergency_perl_save: end player save\n";
3594 3794
3795 cf::write_runtime_sync; # external watchdog should not bark
3796
3595 warn "emergency_perl_save: begin map save\n"; 3797 info "emergency_perl_save: begin map save\n";
3596 for my $path (keys %cf::MAP) { 3798 for my $path (keys %cf::MAP) {
3597 my $map = $cf::MAP{$path} or next; 3799 my $map = $cf::MAP{$path} or next;
3598 $map->valid or next; 3800 $map->valid or next;
3599 $map->save; 3801 $map->save;
3600 } 3802 }
3601 warn "emergency_perl_save: end map save\n"; 3803 info "emergency_perl_save: end map save\n";
3602 3804
3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3603 warn "emergency_perl_save: begin database checkpoint\n"; 3807 info "emergency_perl_save: begin database checkpoint\n";
3604 BDB::db_env_txn_checkpoint $DB_ENV; 3808 BDB::db_env_txn_checkpoint $DB_ENV;
3605 warn "emergency_perl_save: end database checkpoint\n"; 3809 info "emergency_perl_save: end database checkpoint\n";
3606 3810
3607 warn "emergency_perl_save: begin write uuid\n"; 3811 info "emergency_perl_save: begin write uuid\n";
3608 write_uuid_sync 1; 3812 write_uuid_sync 1;
3609 warn "emergency_perl_save: end write uuid\n"; 3813 info "emergency_perl_save: end write uuid\n";
3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3817 trace "emergency_perl_save: syncing database to disk";
3818 BDB::db_env_txn_checkpoint $DB_ENV;
3819
3820 info "emergency_perl_save: starting sync\n";
3821 IO::AIO::aio_sync sub {
3822 info "emergency_perl_save: finished sync\n";
3823 };
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: flushing outstanding aio requests";
3828 while (IO::AIO::nreqs || BDB::nreqs) {
3829 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3830 }
3831
3832 cf::write_runtime_sync; # external watchdog should not bark
3610 }; 3833 };
3611 3834
3612 warn "emergency_perl_save: starting sync()\n";
3613 IO::AIO::aio_sync sub {
3614 warn "emergency_perl_save: finished sync()\n";
3615 };
3616
3617 warn "emergency_perl_save: leave\n"; 3835 info "emergency_perl_save: leave\n";
3618} 3836}
3619 3837
3620sub post_cleanup { 3838sub post_cleanup {
3621 my ($make_core) = @_; 3839 my ($make_core) = @_;
3622 3840
3841 IO::AIO::flush;
3842
3623 warn Carp::longmess "post_cleanup backtrace" 3843 error Carp::longmess "post_cleanup backtrace"
3624 if $make_core; 3844 if $make_core;
3625 3845
3626 my $fh = pidfile; 3846 my $fh = pidfile;
3627 unlink $PIDFILE if <$fh> == $$; 3847 unlink $PIDFILE if <$fh> == $$;
3628} 3848}
3648 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3868 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3649 for my $name (keys %$leaf_symtab) { 3869 for my $name (keys %$leaf_symtab) {
3650 _gv_clear *{"$pkg$name"}; 3870 _gv_clear *{"$pkg$name"};
3651# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3871# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3652 } 3872 }
3653 warn "cleared package $pkg\n";#d#
3654} 3873}
3655 3874
3656sub do_reload_perl() { 3875sub do_reload_perl() {
3657 # can/must only be called in main 3876 # can/must only be called in main
3658 if ($Coro::current != $Coro::main) { 3877 unless (in_main) {
3659 warn "can only reload from main coroutine"; 3878 error "can only reload from main coroutine";
3660 return; 3879 return;
3661 } 3880 }
3662 3881
3663 return if $RELOAD++; 3882 return if $RELOAD++;
3664 3883
3665 my $t1 = EV::time; 3884 my $t1 = AE::time;
3666 3885
3667 while ($RELOAD) { 3886 while ($RELOAD) {
3887 cf::get_slot 0.1, -1, "reload_perl";
3668 warn "reloading..."; 3888 info "reloading...";
3669 3889
3670 warn "entering sync_job"; 3890 trace "entering sync_job";
3671 3891
3672 cf::sync_job { 3892 cf::sync_job {
3673 cf::write_runtime_sync; # external watchdog should not bark
3674 cf::emergency_save; 3893 #cf::emergency_save;
3675 cf::write_runtime_sync; # external watchdog should not bark
3676 3894
3677 warn "syncing database to disk";
3678 BDB::db_env_txn_checkpoint $DB_ENV;
3679
3680 # if anything goes wrong in here, we should simply crash as we already saved
3681
3682 warn "flushing outstanding aio requests";
3683 while (IO::AIO::nreqs || BDB::nreqs) {
3684 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3685 }
3686
3687 warn "cancelling all extension coros"; 3895 trace "cancelling all extension coros";
3688 $_->cancel for values %EXT_CORO; 3896 $_->cancel for values %EXT_CORO;
3689 %EXT_CORO = (); 3897 %EXT_CORO = ();
3690 3898
3691 warn "removing commands"; 3899 trace "removing commands";
3692 %COMMAND = (); 3900 %COMMAND = ();
3693 3901
3694 warn "removing ext/exti commands"; 3902 trace "removing ext/exti commands";
3695 %EXTCMD = (); 3903 %EXTCMD = ();
3696 %EXTICMD = (); 3904 %EXTICMD = ();
3697 3905
3698 warn "unloading/nuking all extensions"; 3906 trace "unloading/nuking all extensions";
3699 for my $pkg (@EXTS) { 3907 for my $pkg (@EXTS) {
3700 warn "... unloading $pkg"; 3908 trace "... unloading $pkg";
3701 3909
3702 if (my $cb = $pkg->can ("unload")) { 3910 if (my $cb = $pkg->can ("unload")) {
3703 eval { 3911 eval {
3704 $cb->($pkg); 3912 $cb->($pkg);
3705 1 3913 1
3706 } or warn "$pkg unloaded, but with errors: $@"; 3914 } or error "$pkg unloaded, but with errors: $@";
3707 } 3915 }
3708 3916
3709 warn "... clearing $pkg"; 3917 trace "... clearing $pkg";
3710 clear_package $pkg; 3918 clear_package $pkg;
3711 } 3919 }
3712 3920
3713 warn "unloading all perl modules loaded from $LIBDIR"; 3921 trace "unloading all perl modules loaded from $LIBDIR";
3714 while (my ($k, $v) = each %INC) { 3922 while (my ($k, $v) = each %INC) {
3715 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3923 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3716 3924
3717 warn "... unloading $k"; 3925 trace "... unloading $k";
3718 delete $INC{$k}; 3926 delete $INC{$k};
3719 3927
3720 $k =~ s/\.pm$//; 3928 $k =~ s/\.pm$//;
3721 $k =~ s/\//::/g; 3929 $k =~ s/\//::/g;
3722 3930
3725 } 3933 }
3726 3934
3727 clear_package $k; 3935 clear_package $k;
3728 } 3936 }
3729 3937
3730 warn "getting rid of safe::, as good as possible"; 3938 trace "getting rid of safe::, as good as possible";
3731 clear_package "safe::$_" 3939 clear_package "safe::$_"
3732 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3940 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3733 3941
3734 warn "unloading cf.pm \"a bit\""; 3942 trace "unloading cf.pm \"a bit\"";
3735 delete $INC{"cf.pm"}; 3943 delete $INC{"cf.pm"};
3736 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3944 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3737 3945
3738 # don't, removes xs symbols, too, 3946 # don't, removes xs symbols, too,
3739 # and global variables created in xs 3947 # and global variables created in xs
3740 #clear_package __PACKAGE__; 3948 #clear_package __PACKAGE__;
3741 3949
3742 warn "unload completed, starting to reload now"; 3950 info "unload completed, starting to reload now";
3743 3951
3744 warn "reloading cf.pm"; 3952 trace "reloading cf.pm";
3745 require cf; 3953 require cf;
3746 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3954 cf::_connect_to_perl_1;
3747 3955
3748 warn "loading config and database again"; 3956 trace "loading config and database again";
3749 cf::reload_config; 3957 cf::reload_config;
3750 3958
3751 warn "loading extensions"; 3959 trace "loading extensions";
3752 cf::load_extensions; 3960 cf::load_extensions;
3753 3961
3754 if ($REATTACH_ON_RELOAD) { 3962 if ($REATTACH_ON_RELOAD) {
3755 warn "reattaching attachments to objects/players"; 3963 trace "reattaching attachments to objects/players";
3756 _global_reattach; # objects, sockets 3964 _global_reattach; # objects, sockets
3757 warn "reattaching attachments to maps"; 3965 trace "reattaching attachments to maps";
3758 reattach $_ for values %MAP; 3966 reattach $_ for values %MAP;
3759 warn "reattaching attachments to players"; 3967 trace "reattaching attachments to players";
3760 reattach $_ for values %PLAYER; 3968 reattach $_ for values %PLAYER;
3761 } 3969 }
3762 3970
3763 warn "running post_init jobs"; 3971 trace "running post_init jobs";
3764 (pop @POST_INIT)->(1) while @POST_INIT; 3972 (pop @POST_INIT)->(1) while @POST_INIT;
3765 3973
3766 warn "leaving sync_job"; 3974 trace "leaving sync_job";
3767 3975
3768 1 3976 1
3769 } or do { 3977 } or do {
3770 warn $@; 3978 error $@;
3771 cf::cleanup "error while reloading, exiting."; 3979 cf::cleanup "error while reloading, exiting.";
3772 }; 3980 };
3773 3981
3774 warn "reloaded"; 3982 info "reloaded";
3775 --$RELOAD; 3983 --$RELOAD;
3776 } 3984 }
3777 3985
3778 $t1 = EV::time - $t1; 3986 $t1 = AE::time - $t1;
3779 warn "reload completed in ${t1}s\n"; 3987 info "reload completed in ${t1}s\n";
3780}; 3988};
3781 3989
3782our $RELOAD_WATCHER; # used only during reload 3990our $RELOAD_WATCHER; # used only during reload
3783 3991
3784sub reload_perl() { 3992sub reload_perl() {
3786 # coro crashes during coro_state_free->destroy here. 3994 # coro crashes during coro_state_free->destroy here.
3787 3995
3788 $RELOAD_WATCHER ||= cf::async { 3996 $RELOAD_WATCHER ||= cf::async {
3789 Coro::AIO::aio_wait cache_extensions; 3997 Coro::AIO::aio_wait cache_extensions;
3790 3998
3791 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3999 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3792 do_reload_perl; 4000 do_reload_perl;
3793 undef $RELOAD_WATCHER; 4001 undef $RELOAD_WATCHER;
3794 }; 4002 };
3795 }; 4003 };
3796} 4004}
3805 reload_perl; 4013 reload_perl;
3806 }; 4014 };
3807 } 4015 }
3808}; 4016};
3809 4017
3810unshift @INC, $LIBDIR; 4018#############################################################################
3811 4019
3812my $bug_warning = 0; 4020my $bug_warning = 0;
3813 4021
3814our @WAIT_FOR_TICK; 4022our @WAIT_FOR_TICK;
3815our @WAIT_FOR_TICK_BEGIN; 4023our @WAIT_FOR_TICK_BEGIN;
3816 4024
3817sub wait_for_tick { 4025sub wait_for_tick() {
3818 return if tick_inhibit || $Coro::current == $Coro::main; 4026 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3819 4027
3820 my $signal = new Coro::Signal; 4028 my $signal = new Coro::Signal;
3821 push @WAIT_FOR_TICK, $signal; 4029 push @WAIT_FOR_TICK, $signal;
3822 $signal->wait; 4030 $signal->wait;
3823} 4031}
3824 4032
3825sub wait_for_tick_begin { 4033sub wait_for_tick_begin() {
3826 return if tick_inhibit || $Coro::current == $Coro::main; 4034 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3827 4035
3828 my $signal = new Coro::Signal; 4036 my $signal = new Coro::Signal;
3829 push @WAIT_FOR_TICK_BEGIN, $signal; 4037 push @WAIT_FOR_TICK_BEGIN, $signal;
3830 $signal->wait; 4038 $signal->wait;
3831} 4039}
3837 return; 4045 return;
3838 } 4046 }
3839 4047
3840 cf::server_tick; # one server iteration 4048 cf::server_tick; # one server iteration
3841 4049
4050 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4051
3842 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4052 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3843 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4053 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3844 Coro::async_pool { 4054 Coro::async_pool {
3845 $Coro::current->{desc} = "runtime saver"; 4055 $Coro::current->{desc} = "runtime saver";
3846 write_runtime_sync 4056 write_runtime_sync
3847 or warn "ERROR: unable to write runtime file: $!"; 4057 or error "ERROR: unable to write runtime file: $!";
3848 }; 4058 };
3849 } 4059 }
3850 4060
3851 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4061 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3852 $sig->send; 4062 $sig->send;
3860 4070
3861 if (0) { 4071 if (0) {
3862 if ($NEXT_TICK) { 4072 if ($NEXT_TICK) {
3863 my $jitter = $TICK_START - $NEXT_TICK; 4073 my $jitter = $TICK_START - $NEXT_TICK;
3864 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4074 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3865 warn "jitter $JITTER\n";#d# 4075 debug "jitter $JITTER\n";#d#
3866 } 4076 }
3867 } 4077 }
3868} 4078}
3869 4079
3870{ 4080{
3871 # configure BDB 4081 # configure BDB
3872 4082
3873 BDB::min_parallel 8; 4083 BDB::min_parallel 16;
3874 BDB::max_poll_reqs $TICK * 0.1; 4084 BDB::max_poll_reqs $TICK * 0.1;
3875 $AnyEvent::BDB::WATCHER->priority (1); 4085 $AnyEvent::BDB::WATCHER->priority (1);
3876 4086
3877 unless ($DB_ENV) { 4087 unless ($DB_ENV) {
3878 $DB_ENV = BDB::db_env_create; 4088 $DB_ENV = BDB::db_env_create;
3959 } 4169 }
3960} 4170}
3961 4171
3962# load additional modules 4172# load additional modules
3963require "cf/$_.pm" for @EXTRA_MODULES; 4173require "cf/$_.pm" for @EXTRA_MODULES;
4174cf::_connect_to_perl_2;
3964 4175
3965END { cf::emergency_save } 4176END { cf::emergency_save }
3966 4177
39671 41781
3968 4179

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines