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.466 by root, Thu Jan 8 03:03:24 2009 UTC vs.
Revision 1.546 by root, Thu May 6 22:57:49 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
72 71
73# make sure c-lzf reinitialises itself 72# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
76 75
76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
78
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
78 82
79our %COMMAND = (); 83our %COMMAND = ();
80our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
81 85
82our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
85our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
87 91
88our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
90 96
91our $CONFDIR = confdir; 97our $CONFDIR = confdir;
92our $DATADIR = datadir; 98our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
100our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
101our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 110
105our %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;
106 118
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 121our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
111 123
112our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 127our $DB_ENV;
116 128
117our @EXTRA_MODULES = qw(pod mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript incloader);
118 130
119our %CFG; 131our %CFG;
120 132
121our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
122our $RUNTIME; 134our $RUNTIME;
134our $JITTER; # average jitter 146our $JITTER; # average jitter
135our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
136 148
137our @POST_INIT; 149our @POST_INIT;
138 150
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
140 153
141binmode STDOUT; 154binmode STDOUT;
142binmode STDERR; 155binmode STDERR;
143 156
144# read virtual server time, if available 157# read virtual server time, if available
146 open my $fh, "<", $RUNTIMEFILE 159 open my $fh, "<", $RUNTIMEFILE
147 or die "unable to read $RUNTIMEFILE file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
148 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
149} 162}
150 163
164eval "sub TICK() { $TICK } 1" or die;
165
151mkdir $_ 166mkdir $_
152 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
153 168
154our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
155 170
156sub cf::map::normalise; 171sub cf::map::normalise;
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::"} };
157 187
158############################################################################# 188#############################################################################
159 189
160=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
161 191
203from wherever your confdir points to. 233from wherever your confdir points to.
204 234
205=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
206 236
207These 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
208returns 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
209per 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.
210 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
211=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
212 247
213This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
214C<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
215that call. 250that call.
216 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
217=back 258=back
218 259
219=cut 260=cut
220 261
221BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
222 *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 {
223 my $msg = join "", @_; 269 my $msg = join "", @_;
224 270
225 $msg .= "\n" 271 $msg .= "\n"
226 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
227 273
228 $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;
229 275
230 LOG llevError, $msg; 276 LOG llevWarn, $msg;
231 }; 277};
232}
233 278
234$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
235 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
236 281
237 if ($Coro::current == $Coro::main) {#d# 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
238 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
239 return;#d# 286 return;#d#
240 }#d# 287 }#d#
241 288
242 # kill coroutine otherwise 289 # kill coroutine otherwise
243 warn Carp::longmess $_[0];
244 Coro::terminate 290 Coro::terminate
245}; 291};
246
247$SIG{__DIE__} = sub { }; #d#?
248 292
249@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
250@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
251@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
252@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
266)) { 310)) {
267 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
268} 312}
269 313
270$EV::DIED = sub { 314$EV::DIED = sub {
271 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
272}; 316};
273 317
274############################################################################# 318#############################################################################
275 319
276=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
373} 417}
374 418
375=item cf::periodic $interval, $cb 419=item cf::periodic $interval, $cb
376 420
377Like 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
378get spread over timer. 422get spread over time.
379 423
380=cut 424=cut
381 425
382sub periodic($$) { 426sub periodic($$) {
383 my ($interval, $cb) = @_; 427 my ($interval, $cb) = @_;
400 444
401=cut 445=cut
402 446
403our @SLOT_QUEUE; 447our @SLOT_QUEUE;
404our $SLOT_QUEUE; 448our $SLOT_QUEUE;
449our $SLOT_DECAY = 0.9;
405 450
406$SLOT_QUEUE->cancel if $SLOT_QUEUE; 451$SLOT_QUEUE->cancel if $SLOT_QUEUE;
407$SLOT_QUEUE = Coro::async { 452$SLOT_QUEUE = Coro::async {
408 $Coro::current->desc ("timeslot manager"); 453 $Coro::current->desc ("timeslot manager");
409 454
410 my $signal = new Coro::Signal; 455 my $signal = new Coro::Signal;
456 my $busy;
411 457
412 while () { 458 while () {
413 next_job: 459 next_job:
460
414 my $avail = cf::till_tick; 461 my $avail = cf::till_tick;
415 if ($avail > 0.01) { 462
416 for (0 .. $#SLOT_QUEUE) { 463 for (0 .. $#SLOT_QUEUE) {
417 if ($SLOT_QUEUE[$_][0] < $avail) { 464 if ($SLOT_QUEUE[$_][0] <= $avail) {
465 $busy = 0;
418 my $job = splice @SLOT_QUEUE, $_, 1, (); 466 my $job = splice @SLOT_QUEUE, $_, 1, ();
419 $job->[2]->send; 467 $job->[2]->send;
420 Coro::cede; 468 Coro::cede;
421 goto next_job; 469 goto next_job;
422 } 470 } else {
471 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
423 } 472 }
424 } 473 }
425 474
426 if (@SLOT_QUEUE) { 475 if (@SLOT_QUEUE) {
427 # 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
428 push @cf::WAIT_FOR_TICK, $signal; 477 push @cf::WAIT_FOR_TICK, $signal;
429 $signal->wait; 478 $signal->wait;
430 } else { 479 } else {
480 $busy = 0;
431 Coro::schedule; 481 Coro::schedule;
432 } 482 }
433 } 483 }
434}; 484};
435 485
436sub get_slot($;$$) { 486sub get_slot($;$$) {
437 return if tick_inhibit || $Coro::current == $Coro::main; 487 return if tick_inhibit || $Coro::current == $Coro::main;
438 488
439 my ($time, $pri, $name) = @_; 489 my ($time, $pri, $name) = @_;
440 490
441 $time = $TICK * .6 if $time > $TICK * .6; 491 $time = clamp $time, 0.01, $TICK * .6;
492
442 my $sig = new Coro::Signal; 493 my $sig = new Coro::Signal;
443 494
444 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 495 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
445 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 496 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
446 $SLOT_QUEUE->ready; 497 $SLOT_QUEUE->ready;
472=cut 523=cut
473 524
474sub sync_job(&) { 525sub sync_job(&) {
475 my ($job) = @_; 526 my ($job) = @_;
476 527
477 if ($Coro::current == $Coro::main) { 528 if (in_main) {
478 my $time = EV::time; 529 my $time = AE::time;
479 530
480 # this is the main coro, too bad, we have to block 531 # this is the main coro, too bad, we have to block
481 # till the operation succeeds, freezing the server :/ 532 # till the operation succeeds, freezing the server :/
482 533
483 LOG llevError, Carp::longmess "sync job";#d# 534 #LOG llevError, Carp::longmess "sync job";#d#
484 535
485 my $freeze_guard = freeze_mainloop; 536 my $freeze_guard = freeze_mainloop;
486 537
487 my $busy = 1; 538 my $busy = 1;
488 my @res; 539 my @res;
489 540
490 (async { 541 (async {
491 $Coro::current->desc ("sync job coro"); 542 $Coro::current->desc ("sync job coro");
492 @res = eval { $job->() }; 543 @res = eval { $job->() };
493 warn $@ if $@; 544 error $@ if $@;
494 undef $busy; 545 undef $busy;
495 })->prio (Coro::PRIO_MAX); 546 })->prio (Coro::PRIO_MAX);
496 547
497 while ($busy) { 548 while ($busy) {
498 if (Coro::nready) { 549 if (Coro::nready) {
500 } else { 551 } else {
501 EV::loop EV::LOOP_ONESHOT; 552 EV::loop EV::LOOP_ONESHOT;
502 } 553 }
503 } 554 }
504 555
505 my $time = EV::time - $time; 556 my $time = AE::time - $time;
506 557
507 $TICK_START += $time; # do not account sync jobs to server load 558 $TICK_START += $time; # do not account sync jobs to server load
508 559
509 wantarray ? @res : $res[0] 560 wantarray ? @res : $res[0]
510 } else { 561 } else {
554 reset_signals; 605 reset_signals;
555 &$cb 606 &$cb
556 }, @args; 607 }, @args;
557 608
558 wantarray ? @res : $res[-1] 609 wantarray ? @res : $res[-1]
610}
611
612sub objinfo {
613 (
614 "counter value" => cf::object::object_count,
615 "objects created" => cf::object::create_count,
616 "objects destroyed" => cf::object::destroy_count,
617 "freelist size" => cf::object::free_count,
618 "allocated objects" => cf::object::objects_size,
619 "active objects" => cf::object::actives_size,
620 )
559} 621}
560 622
561=item $coin = coin_from_name $name 623=item $coin = coin_from_name $name
562 624
563=cut 625=cut
600within each server. 662within each server.
601 663
602=cut 664=cut
603 665
604sub db_table($) { 666sub db_table($) {
667 cf::error "db_get called from main context"
668 if $Coro::current == $Coro::main;
669
605 my ($name) = @_; 670 my ($name) = @_;
606 my $db = BDB::db_create $DB_ENV; 671 my $db = BDB::db_create $DB_ENV;
607 672
608 eval { 673 eval {
609 $db->set_flags (BDB::CHKSUM); 674 $db->set_flags (BDB::CHKSUM);
619} 684}
620 685
621our $DB; 686our $DB;
622 687
623sub db_init { 688sub db_init {
624 cf::sync_job {
625 $DB ||= db_table "db"; 689 $DB ||= db_table "db";
626 };
627} 690}
628 691
629sub db_get($$) { 692sub db_get($$) {
630 my $key = "$_[0]/$_[1]"; 693 my $key = "$_[0]/$_[1]";
631 694
632 cf::sync_job { 695 cf::error "db_get called from main context"
696 if $Coro::current == $Coro::main;
697
633 BDB::db_get $DB, undef, $key, my $data; 698 BDB::db_get $DB, undef, $key, my $data;
634 699
635 $! ? () 700 $! ? ()
636 : $data 701 : $data
637 }
638} 702}
639 703
640sub db_put($$$) { 704sub db_put($$$) {
641 BDB::dbreq_pri 4; 705 BDB::dbreq_pri 4;
642 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 706 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
698 762
699 my $t1 = Time::HiRes::time; 763 my $t1 = Time::HiRes::time;
700 my $data = $process->(\@data); 764 my $data = $process->(\@data);
701 my $t2 = Time::HiRes::time; 765 my $t2 = Time::HiRes::time;
702 766
703 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 767 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
704 768
705 db_put cache => "$id/data", $data; 769 db_put cache => "$id/data", $data;
706 db_put cache => "$id/md5" , $md5; 770 db_put cache => "$id/md5" , $md5;
707 db_put cache => "$id/meta", $meta; 771 db_put cache => "$id/meta", $meta;
708 772
718 782
719=cut 783=cut
720 784
721sub datalog($@) { 785sub datalog($@) {
722 my ($type, %kv) = @_; 786 my ($type, %kv) = @_;
723 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 787 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
724} 788}
725 789
726=back 790=back
727 791
728=cut 792=cut
923 987
924 } elsif (exists $cb_id{$type}) { 988 } elsif (exists $cb_id{$type}) {
925 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 989 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
926 990
927 } elsif (ref $type) { 991 } elsif (ref $type) {
928 warn "attaching objects not supported, ignoring.\n"; 992 error "attaching objects not supported, ignoring.\n";
929 993
930 } else { 994 } else {
931 shift @arg; 995 shift @arg;
932 warn "attach argument '$type' not supported, ignoring.\n"; 996 error "attach argument '$type' not supported, ignoring.\n";
933 } 997 }
934 } 998 }
935} 999}
936 1000
937sub _object_attach { 1001sub _object_attach {
947 _attach $registry, $klass, @attach; 1011 _attach $registry, $klass, @attach;
948 } 1012 }
949 1013
950 $obj->{$name} = \%arg; 1014 $obj->{$name} = \%arg;
951 } else { 1015 } else {
952 warn "object uses attachment '$name' which is not available, postponing.\n"; 1016 info "object uses attachment '$name' which is not available, postponing.\n";
953 } 1017 }
954 1018
955 $obj->{_attachment}{$name} = undef; 1019 $obj->{_attachment}{$name} = undef;
956} 1020}
957 1021
1016 1080
1017 for (@$callbacks) { 1081 for (@$callbacks) {
1018 eval { &{$_->[1]} }; 1082 eval { &{$_->[1]} };
1019 1083
1020 if ($@) { 1084 if ($@) {
1021 warn "$@";
1022 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1085 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1023 override; 1086 override;
1024 } 1087 }
1025 1088
1026 return 1 if $override; 1089 return 1 if $override;
1027 } 1090 }
1106 for (@$attach) { 1169 for (@$attach) {
1107 my ($klass, @attach) = @$_; 1170 my ($klass, @attach) = @$_;
1108 _attach $registry, $klass, @attach; 1171 _attach $registry, $klass, @attach;
1109 } 1172 }
1110 } else { 1173 } else {
1111 warn "object uses attachment '$name' that is not available, postponing.\n"; 1174 info "object uses attachment '$name' that is not available, postponing.\n";
1112 } 1175 }
1113 } 1176 }
1114} 1177}
1115 1178
1116cf::attachable->attach ( 1179cf::attachable->attach (
1143 my ($filename, $rdata, $objs) = @_; 1206 my ($filename, $rdata, $objs) = @_;
1144 1207
1145 sync_job { 1208 sync_job {
1146 if (length $$rdata) { 1209 if (length $$rdata) {
1147 utf8::decode (my $decname = $filename); 1210 utf8::decode (my $decname = $filename);
1148 warn sprintf "saving %s (%d,%d)\n", 1211 trace sprintf "saving %s (%d,%d)\n",
1149 $decname, length $$rdata, scalar @$objs; 1212 $decname, length $$rdata, scalar @$objs
1213 if $VERBOSE_IO;
1150 1214
1151 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1215 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1152 aio_chmod $fh, SAVE_MODE; 1216 aio_chmod $fh, SAVE_MODE;
1153 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1217 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1218 if ($cf::USE_FSYNC) {
1219 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1220 aio_fsync $fh;
1221 }
1155 aio_close $fh; 1222 aio_close $fh;
1156 1223
1157 if (@$objs) { 1224 if (@$objs) {
1158 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1225 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1159 aio_chmod $fh, SAVE_MODE; 1226 aio_chmod $fh, SAVE_MODE;
1160 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1227 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1161 aio_write $fh, 0, (length $data), $data, 0; 1228 aio_write $fh, 0, (length $data), $data, 0;
1162 aio_fsync $fh if $cf::USE_FSYNC; 1229 if ($cf::USE_FSYNC) {
1230 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1231 aio_fsync $fh;
1232 }
1163 aio_close $fh; 1233 aio_close $fh;
1164 aio_rename "$filename.pst~", "$filename.pst"; 1234 aio_rename "$filename.pst~", "$filename.pst";
1165 } 1235 }
1166 } else { 1236 } else {
1167 aio_unlink "$filename.pst"; 1237 aio_unlink "$filename.pst";
1170 aio_rename "$filename~", $filename; 1240 aio_rename "$filename~", $filename;
1171 1241
1172 $filename =~ s%/[^/]+$%%; 1242 $filename =~ s%/[^/]+$%%;
1173 aio_pathsync $filename if $cf::USE_FSYNC; 1243 aio_pathsync $filename if $cf::USE_FSYNC;
1174 } else { 1244 } else {
1175 warn "unable to save objects: $filename~: $!\n"; 1245 error "unable to save objects: $filename~: $!\n";
1176 } 1246 }
1177 } else { 1247 } else {
1178 aio_unlink $filename; 1248 aio_unlink $filename;
1179 aio_unlink "$filename.pst"; 1249 aio_unlink "$filename.pst";
1180 } 1250 }
1204 my $st = eval { Coro::Storable::thaw $av }; 1274 my $st = eval { Coro::Storable::thaw $av };
1205 $av = $st->{objs}; 1275 $av = $st->{objs};
1206 } 1276 }
1207 1277
1208 utf8::decode (my $decname = $filename); 1278 utf8::decode (my $decname = $filename);
1209 warn sprintf "loading %s (%d,%d)\n", 1279 trace sprintf "loading %s (%d,%d)\n",
1210 $decname, length $data, scalar @{$av || []}; 1280 $decname, length $data, scalar @{$av || []}
1281 if $VERBOSE_IO;
1211 1282
1212 ($data, $av) 1283 ($data, $av)
1213} 1284}
1214 1285
1215=head2 COMMAND CALLBACKS 1286=head2 COMMAND CALLBACKS
1274} 1345}
1275 1346
1276use File::Glob (); 1347use File::Glob ();
1277 1348
1278cf::player->attach ( 1349cf::player->attach (
1279 on_command => sub { 1350 on_unknown_command => sub {
1280 my ($pl, $name, $params) = @_; 1351 my ($pl, $name, $params) = @_;
1281 1352
1282 my $cb = $COMMAND{$name} 1353 my $cb = $COMMAND{$name}
1283 or return; 1354 or return;
1284 1355
1307 1378
1308 $pl->ext_reply ($reply, @reply) 1379 $pl->ext_reply ($reply, @reply)
1309 if $reply; 1380 if $reply;
1310 1381
1311 } else { 1382 } else {
1312 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1383 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1313 } 1384 }
1314 1385
1315 cf::override; 1386 cf::override;
1316 }, 1387 },
1317); 1388);
1318 1389
1319# "readahead" all extensions 1390# "readahead" all extensions
1320sub cache_extensions { 1391sub cache_extensions {
1321 my $grp = IO::AIO::aio_group; 1392 my $grp = IO::AIO::aio_group;
1322 1393
1323 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1394 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1324 for (grep /\.ext$/, @{$_[0]}) { 1395 for (grep /\.ext$/, @{$_[0]}) {
1325 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1396 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1326 } 1397 }
1327 }; 1398 };
1328 1399
1329 $grp 1400 $grp
1330} 1401}
1331 1402
1332sub load_extensions { 1403sub load_extensions {
1404 info "loading extensions...";
1405
1333 cf::sync_job { 1406 cf::sync_job {
1334 my %todo; 1407 my %todo;
1335 1408
1336 for my $path (<$LIBDIR/*.ext>) { 1409 for my $path (<$LIBDIR/*.ext>) {
1337 next unless -r $path; 1410 next unless -r $path;
1355 1428
1356 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1429 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1357 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1430 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1358 1431
1359 $ext{source} = 1432 $ext{source} =
1360 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1433 "package $pkg; use common::sense;\n"
1361 . "#line 1 \"$path\"\n{\n" 1434 . "#line 1 \"$path\"\n{\n"
1362 . $source 1435 . $source
1363 . "\n};\n1"; 1436 . "\n};\n1";
1364 1437
1365 $todo{$base} = \%ext; 1438 $todo{$base} = \%ext;
1366 } 1439 }
1367 1440
1441 my $pass = 0;
1368 my %done; 1442 my %done;
1369 while (%todo) { 1443 while (%todo) {
1370 my $progress; 1444 my $progress;
1371 1445
1446 ++$pass;
1447
1448 ext:
1372 while (my ($k, $v) = each %todo) { 1449 while (my ($k, $v) = each %todo) {
1373 for (split /,\s*/, $v->{meta}{depends}) { 1450 for (split /,\s*/, $v->{meta}{depends}) {
1374 goto skip 1451 next ext
1375 unless exists $done{$_}; 1452 unless exists $done{$_};
1376 } 1453 }
1377 1454
1378 warn "... loading '$k' into '$v->{pkg}'\n"; 1455 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1379 1456
1380 unless (eval $v->{source}) { 1457 my $active = eval $v->{source};
1458
1459 if (length $@) {
1381 my $msg = $@ ? "$v->{path}: $@\n" 1460 error "$v->{path}: $@\n";
1382 : "$v->{base}: extension inactive.\n";
1383 1461
1384 if (exists $v->{meta}{mandatory}) {
1385 warn $msg;
1386 cf::cleanup "mandatory extension failed to load, exiting."; 1462 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1387 } 1463 if exists $v->{meta}{mandatory};
1388 1464
1389 warn $msg; 1465 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1466 delete $todo{$k};
1467 } else {
1468 $done{$k} = delete $todo{$k};
1469 push @EXTS, $v->{pkg};
1470 $progress = 1;
1471
1472 info "$v->{base}: extension inactive.\n"
1473 unless $active;
1390 } 1474 }
1391
1392 $done{$k} = delete $todo{$k};
1393 push @EXTS, $v->{pkg};
1394 $progress = 1;
1395 } 1475 }
1396 1476
1397 skip: 1477 unless ($progress) {
1398 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1478 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1399 unless $progress; 1479
1480 while (my ($k, $v) = each %todo) {
1481 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1482 if exists $v->{meta}{mandatory};
1483 }
1484 }
1400 } 1485 }
1401 }; 1486 };
1402} 1487}
1403 1488
1404############################################################################# 1489#############################################################################
1488 $cf::PLAYER{$login} = $pl 1573 $cf::PLAYER{$login} = $pl
1489 } 1574 }
1490 } 1575 }
1491} 1576}
1492 1577
1578cf::player->attach (
1579 on_load => sub {
1580 my ($pl, $path) = @_;
1581
1582 # restore slots saved in save, below
1583 my $slots = delete $pl->{_slots};
1584
1585 $pl->ob->current_weapon ($slots->[0]);
1586 $pl->combat_ob ($slots->[1]);
1587 $pl->ranged_ob ($slots->[2]);
1588 },
1589);
1590
1493sub save($) { 1591sub save($) {
1494 my ($pl) = @_; 1592 my ($pl) = @_;
1495 1593
1496 return if $pl->{deny_save}; 1594 return if $pl->{deny_save};
1497 1595
1502 1600
1503 aio_mkdir playerdir $pl, 0770; 1601 aio_mkdir playerdir $pl, 0770;
1504 $pl->{last_save} = $cf::RUNTIME; 1602 $pl->{last_save} = $cf::RUNTIME;
1505 1603
1506 cf::get_slot 0.01; 1604 cf::get_slot 0.01;
1605
1606 # save slots, to be restored later
1607 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1507 1608
1508 $pl->save_pl ($path); 1609 $pl->save_pl ($path);
1509 cf::cede_to_tick; 1610 cf::cede_to_tick;
1510} 1611}
1511 1612
1548 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1649 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1549 1650
1550 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1651 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1551 $pl->deactivate; 1652 $pl->deactivate;
1552 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1653 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1553 $pl->ob->check_score;
1554 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1654 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1555 $pl->ns->destroy if $pl->ns; 1655 $pl->ns->destroy if $pl->ns;
1556 1656
1557 my $path = playerdir $pl; 1657 my $path = playerdir $pl;
1558 my $temp = "$path~$cf::RUNTIME~deleting~"; 1658 my $temp = "$path~$cf::RUNTIME~deleting~";
1613 \@logins 1713 \@logins
1614} 1714}
1615 1715
1616=item $player->maps 1716=item $player->maps
1617 1717
1718=item cf::player::maps $login
1719
1618Returns an arrayref of map paths that are private for this 1720Returns an arrayref of map paths that are private for this
1619player. May block. 1721player. May block.
1620 1722
1621=cut 1723=cut
1622 1724
1684=cut 1786=cut
1685 1787
1686sub find_by_path($) { 1788sub find_by_path($) {
1687 my ($path) = @_; 1789 my ($path) = @_;
1688 1790
1791 $path =~ s/^~[^\/]*//; # skip ~login
1792
1689 my ($match, $specificity); 1793 my ($match, $specificity);
1690 1794
1691 for my $region (list) { 1795 for my $region (list) {
1692 if ($region->{match} && $path =~ $region->{match}) { 1796 if ($region->{match} && $path =~ $region->{match}) {
1693 ($match, $specificity) = ($region, $region->specificity) 1797 ($match, $specificity) = ($region, $region->specificity)
1724 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1828 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1725 1829
1726 # mit "rum" bekleckern, nicht 1830 # mit "rum" bekleckern, nicht
1727 $self->_create_random_map ( 1831 $self->_create_random_map (
1728 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1832 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1729 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1833 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1730 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1834 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1731 $rmp->{exit_on_final_map}, 1835 $rmp->{exit_on_final_map},
1732 $rmp->{xsize}, $rmp->{ysize}, 1836 $rmp->{xsize}, $rmp->{ysize},
1733 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1837 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1734 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1838 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1749 1853
1750sub register { 1854sub register {
1751 my (undef, $regex, $prio) = @_; 1855 my (undef, $regex, $prio) = @_;
1752 my $pkg = caller; 1856 my $pkg = caller;
1753 1857
1754 no strict;
1755 push @{"$pkg\::ISA"}, __PACKAGE__; 1858 push @{"$pkg\::ISA"}, __PACKAGE__;
1756 1859
1757 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1860 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1758} 1861}
1759 1862
1760# also paths starting with '/' 1863# also paths starting with '/'
1761$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1864$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1762 1865
1763sub thawer_merge { 1866sub thawer_merge {
1764 my ($self, $merge) = @_; 1867 my ($self, $merge) = @_;
1765 1868
1766 # we have to keep some variables in memory intact 1869 # we have to keep some variables in memory intact
1771} 1874}
1772 1875
1773sub normalise { 1876sub normalise {
1774 my ($path, $base) = @_; 1877 my ($path, $base) = @_;
1775 1878
1776 $path = "$path"; # make sure its a string 1879 $path = "$path"; # make sure it's a string
1777 1880
1778 $path =~ s/\.map$//; 1881 $path =~ s/\.map$//;
1779 1882
1780 # map plan: 1883 # map plan:
1781 # 1884 #
1820 $self->init; # pass $1 etc. 1923 $self->init; # pass $1 etc.
1821 return $self; 1924 return $self;
1822 } 1925 }
1823 } 1926 }
1824 1927
1825 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1928 Carp::cluck "unable to resolve path '$path' (base '$base')";
1826 () 1929 ()
1827} 1930}
1828 1931
1829sub init { 1932sub init {
1830 my ($self) = @_; 1933 my ($self) = @_;
1952} 2055}
1953 2056
1954sub find; 2057sub find;
1955sub find { 2058sub find {
1956 my ($path, $origin) = @_; 2059 my ($path, $origin) = @_;
2060
2061 cf::cede_to_tick;
1957 2062
1958 $path = normalise $path, $origin && $origin->path; 2063 $path = normalise $path, $origin && $origin->path;
1959 2064
1960 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2065 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1961 my $guard2 = cf::lock_acquire "map_find:$path"; 2066 my $guard2 = cf::lock_acquire "map_find:$path";
1980 2085
1981 $cf::MAP{$path} = $map 2086 $cf::MAP{$path} = $map
1982 } 2087 }
1983} 2088}
1984 2089
1985sub pre_load { } 2090sub pre_load { }
1986sub post_load { } 2091#sub post_load { } # XS
1987 2092
1988sub load { 2093sub load {
1989 my ($self) = @_; 2094 my ($self) = @_;
1990 2095
1991 local $self->{deny_reset} = 1; # loading can take a long time 2096 local $self->{deny_reset} = 1; # loading can take a long time
2048 } 2153 }
2049 2154
2050 $self->post_load; 2155 $self->post_load;
2051} 2156}
2052 2157
2158# customize the map for a given player, i.e.
2159# return the _real_ map. used by e.g. per-player
2160# maps to change the path to ~playername/mappath
2053sub customise_for { 2161sub customise_for {
2054 my ($self, $ob) = @_; 2162 my ($self, $ob) = @_;
2055 2163
2056 return find "~" . $ob->name . "/" . $self->{path} 2164 return find "~" . $ob->name . "/" . $self->{path}
2057 if $self->per_player; 2165 if $self->per_player;
2073 or next; 2181 or next;
2074 $neigh = find $neigh, $map 2182 $neigh = find $neigh, $map
2075 or next; 2183 or next;
2076 $neigh->load; 2184 $neigh->load;
2077 2185
2186 # now find the diagonal neighbours
2078 push @neigh, 2187 push @neigh,
2079 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2188 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2080 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2189 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2081 } 2190 }
2082 2191
2089} 2198}
2090 2199
2091sub find_sync { 2200sub find_sync {
2092 my ($path, $origin) = @_; 2201 my ($path, $origin) = @_;
2093 2202
2094 cf::sync_job { find $path, $origin } 2203 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2204 if $Coro::current == $Coro::main;
2205
2206 find $path, $origin
2095} 2207}
2096 2208
2097sub do_load_sync { 2209sub do_load_sync {
2098 my ($map) = @_; 2210 my ($map) = @_;
2099 2211
2100 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2212 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2101 if $Coro::current == $Coro::main; 2213 if $Coro::current == $Coro::main;
2102 2214
2103 cf::sync_job { $map->load }; 2215 $map->load;
2104} 2216}
2105 2217
2106our %MAP_PREFETCH; 2218our %MAP_PREFETCH;
2107our $MAP_PREFETCHER = undef; 2219our $MAP_PREFETCHER = undef;
2108 2220
2134 $MAP_PREFETCHER->prio (6); 2246 $MAP_PREFETCHER->prio (6);
2135 2247
2136 () 2248 ()
2137} 2249}
2138 2250
2251# common code, used by both ->save and ->swapout
2139sub save { 2252sub _save {
2140 my ($self) = @_; 2253 my ($self) = @_;
2141
2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
2143 2254
2144 $self->{last_save} = $cf::RUNTIME; 2255 $self->{last_save} = $cf::RUNTIME;
2145 2256
2146 return unless $self->dirty; 2257 return unless $self->dirty;
2147 2258
2167 } else { 2278 } else {
2168 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2279 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2169 } 2280 }
2170} 2281}
2171 2282
2283sub save {
2284 my ($self) = @_;
2285
2286 my $lock = cf::lock_acquire "map_data:$self->{path}";
2287
2288 $self->_save;
2289}
2290
2172sub swap_out { 2291sub swap_out {
2173 my ($self) = @_; 2292 my ($self) = @_;
2174 2293
2175 # save first because save cedes
2176 $self->save;
2177
2178 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2294 my $lock = cf::lock_acquire "map_data:$self->{path}";
2179 2295
2180 return if $self->players;
2181 return if $self->in_memory != cf::MAP_ACTIVE; 2296 return if $self->in_memory != cf::MAP_ACTIVE;
2182 return if $self->{deny_save}; 2297 return if $self->{deny_save};
2298 return if $self->players;
2183 2299
2300 # first deactivate the map and "unlink" it from the core
2301 $self->deactivate;
2302 $_->clear_links_to ($self) for values %cf::MAP;
2184 $self->in_memory (cf::MAP_SWAPPED); 2303 $self->in_memory (cf::MAP_SWAPPED);
2304
2305 # then atomically save
2306 $self->_save;
2307
2308 # then free the map
2309 $self->clear;
2310}
2311
2312sub reset_at {
2313 my ($self) = @_;
2314
2315 # TODO: safety, remove and allow resettable per-player maps
2316 return 1e99 if $self->{deny_reset};
2317
2318 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2319 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2320
2321 $time + $to
2322}
2323
2324sub should_reset {
2325 my ($self) = @_;
2326
2327 $self->reset_at <= $cf::RUNTIME
2328}
2329
2330sub reset {
2331 my ($self) = @_;
2332
2333 my $lock = cf::lock_acquire "map_data:$self->{path}";
2334
2335 return if $self->players;
2336
2337 cf::trace "resetting map ", $self->path, "\n";
2338
2339 $self->in_memory (cf::MAP_SWAPPED);
2340
2341 # need to save uniques path
2342 unless ($self->{deny_save}) {
2343 my $uniq = $self->uniq_path; utf8::encode $uniq;
2344
2345 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2346 if $uniq;
2347 }
2348
2349 delete $cf::MAP{$self->path};
2185 2350
2186 $self->deactivate; 2351 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP; 2352 $_->clear_links_to ($self) for values %cf::MAP;
2188 $self->clear; 2353 $self->clear;
2189}
2190
2191sub reset_at {
2192 my ($self) = @_;
2193
2194 # TODO: safety, remove and allow resettable per-player maps
2195 return 1e99 if $self->{deny_reset};
2196
2197 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2198 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2199
2200 $time + $to
2201}
2202
2203sub should_reset {
2204 my ($self) = @_;
2205
2206 $self->reset_at <= $cf::RUNTIME
2207}
2208
2209sub reset {
2210 my ($self) = @_;
2211
2212 my $lock = cf::lock_acquire "map_data:$self->{path}";
2213
2214 return if $self->players;
2215
2216 warn "resetting map ", $self->path;
2217
2218 $self->in_memory (cf::MAP_SWAPPED);
2219
2220 # need to save uniques path
2221 unless ($self->{deny_save}) {
2222 my $uniq = $self->uniq_path; utf8::encode $uniq;
2223
2224 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2225 if $uniq;
2226 }
2227
2228 delete $cf::MAP{$self->path};
2229
2230 $self->deactivate;
2231 $_->clear_links_to ($self) for values %cf::MAP;
2232 $self->clear;
2233 2354
2234 $self->unlink_save; 2355 $self->unlink_save;
2235 $self->destroy; 2356 $self->destroy;
2236} 2357}
2237 2358
2245 2366
2246 delete $cf::MAP{$self->path}; 2367 delete $cf::MAP{$self->path};
2247 2368
2248 $self->unlink_save; 2369 $self->unlink_save;
2249 2370
2250 bless $self, "cf::map"; 2371 bless $self, "cf::map::wrap";
2251 delete $self->{deny_reset}; 2372 delete $self->{deny_reset};
2252 $self->{deny_save} = 1; 2373 $self->{deny_save} = 1;
2253 $self->reset_timeout (1); 2374 $self->reset_timeout (1);
2254 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2375 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2255 2376
2312 : normalise $_ 2433 : normalise $_
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2434 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2435 ]
2315} 2436}
2316 2437
2438=item cf::map::static_maps
2439
2440Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2441file in the shared directory excluding F</styles> and F</editor>). May
2442block.
2443
2444=cut
2445
2446sub static_maps() {
2447 my @dirs = "";
2448 my @maps;
2449
2450 while (@dirs) {
2451 my $dir = shift @dirs;
2452
2453 next if $dir eq "/styles" || $dir eq "/editor";
2454
2455 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2456 or return;
2457
2458 for (@$files) {
2459 s/\.map$// or next;
2460 utf8::decode $_;
2461 push @maps, "$dir/$_";
2462 }
2463
2464 push @dirs, map "$dir/$_", @$dirs;
2465 }
2466
2467 \@maps
2468}
2469
2317=back 2470=back
2318 2471
2319=head3 cf::object 2472=head3 cf::object
2320 2473
2321=cut 2474=cut
2386 2539
2387our $SAY_CHANNEL = { 2540our $SAY_CHANNEL = {
2388 id => "say", 2541 id => "say",
2389 title => "Map", 2542 title => "Map",
2390 reply => "say ", 2543 reply => "say ",
2391 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2544 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2392}; 2545};
2393 2546
2394our $CHAT_CHANNEL = { 2547our $CHAT_CHANNEL = {
2395 id => "chat", 2548 id => "chat",
2396 title => "Chat", 2549 title => "Chat",
2453 2606
2454Freezes the player and moves him/her to a special map (C<{link}>). 2607Freezes the player and moves him/her to a special map (C<{link}>).
2455 2608
2456The player should be reasonably safe there for short amounts of time (e.g. 2609The player should be reasonably safe there for short amounts of time (e.g.
2457for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2610for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2458though, as the palyer cannot control the character while it is on the link 2611though, as the player cannot control the character while it is on the link
2459map. 2612map.
2460 2613
2461Will never block. 2614Will never block.
2462 2615
2463=item $player_object->leave_link ($map, $x, $y) 2616=item $player_object->leave_link ($map, $x, $y)
2484sub cf::object::player::enter_link { 2637sub cf::object::player::enter_link {
2485 my ($self) = @_; 2638 my ($self) = @_;
2486 2639
2487 $self->deactivate_recursive; 2640 $self->deactivate_recursive;
2488 2641
2642 ++$self->{_link_recursion};
2643
2489 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2644 return if UNIVERSAL::isa $self->map, "ext::map_link";
2490 2645
2491 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2646 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2492 if $self->map && $self->map->{path} ne "{link}"; 2647 if $self->map && $self->map->{path} ne "{link}";
2493 2648
2494 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2649 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2495} 2650}
2496 2651
2497sub cf::object::player::leave_link { 2652sub cf::object::player::leave_link {
2498 my ($self, $map, $x, $y) = @_; 2653 my ($self, $map, $x, $y) = @_;
2499 2654
2516 ($x, $y) = (-1, -1) 2671 ($x, $y) = (-1, -1)
2517 unless (defined $x) && (defined $y); 2672 unless (defined $x) && (defined $y);
2518 2673
2519 # use -1 or undef as default coordinates, not 0, 0 2674 # use -1 or undef as default coordinates, not 0, 0
2520 ($x, $y) = ($map->enter_x, $map->enter_y) 2675 ($x, $y) = ($map->enter_x, $map->enter_y)
2521 if $x <=0 && $y <= 0; 2676 if $x <= 0 && $y <= 0;
2522 2677
2523 $map->load; 2678 $map->load;
2524 $map->load_neighbours; 2679 $map->load_neighbours;
2525 2680
2526 return unless $self->contr->active; 2681 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2528 $self->activate_recursive;
2529 2682
2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2683 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2531 $self->enter_map ($map, $x, $y); 2684 if ($self->enter_map ($map, $x, $y)) {
2532} 2685 # entering was successful
2686 delete $self->{_link_recursion};
2687 # only activate afterwards, to support waiting in hooks
2688 $self->activate_recursive;
2689 }
2533 2690
2691}
2692
2534=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2693=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2535 2694
2536Moves the player to the given map-path and coordinates by first freezing 2695Moves the player to the given map-path and coordinates by first freezing
2537her, loading and preparing them map, calling the provided $check callback 2696her, loading and preparing them map, calling the provided $check callback
2538that has to return the map if sucecssful, and then unfreezes the player on 2697that has to return the map if sucecssful, and then unfreezes the player on
2539the new (success) or old (failed) map position. In either case, $done will 2698the new (success) or old (failed) map position. In either case, $done will
2546 2705
2547our $GOTOGEN; 2706our $GOTOGEN;
2548 2707
2549sub cf::object::player::goto { 2708sub cf::object::player::goto {
2550 my ($self, $path, $x, $y, $check, $done) = @_; 2709 my ($self, $path, $x, $y, $check, $done) = @_;
2710
2711 if ($self->{_link_recursion} >= $MAX_LINKS) {
2712 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2713 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2714 ($path, $x, $y) = @$EMERGENCY_POSITION;
2715 }
2551 2716
2552 # do generation counting so two concurrent goto's will be executed in-order 2717 # do generation counting so two concurrent goto's will be executed in-order
2553 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2718 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2554 2719
2555 $self->enter_link; 2720 $self->enter_link;
2579 my $map = eval { 2744 my $map = eval {
2580 my $map = defined $path ? cf::map::find $path : undef; 2745 my $map = defined $path ? cf::map::find $path : undef;
2581 2746
2582 if ($map) { 2747 if ($map) {
2583 $map = $map->customise_for ($self); 2748 $map = $map->customise_for ($self);
2584 $map = $check->($map) if $check && $map; 2749 $map = $check->($map, $x, $y, $self) if $check && $map;
2585 } else { 2750 } else {
2586 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2751 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2587 } 2752 }
2588 2753
2589 $map 2754 $map
2597 if ($gen == $self->{_goto_generation}) { 2762 if ($gen == $self->{_goto_generation}) {
2598 delete $self->{_goto_generation}; 2763 delete $self->{_goto_generation};
2599 $self->leave_link ($map, $x, $y); 2764 $self->leave_link ($map, $x, $y);
2600 } 2765 }
2601 2766
2602 $done->() if $done; 2767 $done->($self) if $done;
2603 })->prio (1); 2768 })->prio (1);
2604} 2769}
2605 2770
2606=item $player_object->enter_exit ($exit_object) 2771=item $player_object->enter_exit ($exit_object)
2607 2772
2700 $self->message ("Something went wrong deep within the deliantra server. " 2865 $self->message ("Something went wrong deep within the deliantra server. "
2701 . "I'll try to bring you back to the map you were before. " 2866 . "I'll try to bring you back to the map you were before. "
2702 . "Please report this to the dungeon master!", 2867 . "Please report this to the dungeon master!",
2703 cf::NDI_UNIQUE | cf::NDI_RED); 2868 cf::NDI_UNIQUE | cf::NDI_RED);
2704 2869
2705 warn "ERROR in enter_exit: $@"; 2870 error "ERROR in enter_exit: $@";
2706 $self->leave_link; 2871 $self->leave_link;
2707 } 2872 }
2708 })->prio (1); 2873 })->prio (1);
2709} 2874}
2710 2875
2722sub cf::client::send_drawinfo { 2887sub cf::client::send_drawinfo {
2723 my ($self, $text, $flags) = @_; 2888 my ($self, $text, $flags) = @_;
2724 2889
2725 utf8::encode $text; 2890 utf8::encode $text;
2726 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2891 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2892}
2893
2894=item $client->send_big_packet ($pkt)
2895
2896Like C<send_packet>, but tries to compress large packets, and fragments
2897them as required.
2898
2899=cut
2900
2901our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2902
2903sub cf::client::send_big_packet {
2904 my ($self, $pkt) = @_;
2905
2906 # try lzf for large packets
2907 $pkt = "lzf " . Compress::LZF::compress $pkt
2908 if 1024 <= length $pkt and $self->{can_lzf};
2909
2910 # split very large packets
2911 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2912 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2913 $pkt = "frag";
2914 }
2915
2916 $self->send_packet ($pkt);
2727} 2917}
2728 2918
2729=item $client->send_msg ($channel, $msg, $color, [extra...]) 2919=item $client->send_msg ($channel, $msg, $color, [extra...])
2730 2920
2731Send a drawinfo or msg packet to the client, formatting the msg for the 2921Send a drawinfo or msg packet to the client, formatting the msg for the
2735 2925
2736=cut 2926=cut
2737 2927
2738# non-persistent channels (usually the info channel) 2928# non-persistent channels (usually the info channel)
2739our %CHANNEL = ( 2929our %CHANNEL = (
2930 "c/motd" => {
2931 id => "infobox",
2932 title => "MOTD",
2933 reply => undef,
2934 tooltip => "The message of the day",
2935 },
2740 "c/identify" => { 2936 "c/identify" => {
2741 id => "infobox", 2937 id => "infobox",
2742 title => "Identify", 2938 title => "Identify",
2743 reply => undef, 2939 reply => undef,
2744 tooltip => "Items recently identified", 2940 tooltip => "Items recently identified",
2746 "c/examine" => { 2942 "c/examine" => {
2747 id => "infobox", 2943 id => "infobox",
2748 title => "Examine", 2944 title => "Examine",
2749 reply => undef, 2945 reply => undef,
2750 tooltip => "Signs and other items you examined", 2946 tooltip => "Signs and other items you examined",
2947 },
2948 "c/shopinfo" => {
2949 id => "infobox",
2950 title => "Shop Info",
2951 reply => undef,
2952 tooltip => "What your bargaining skill tells you about the shop",
2751 }, 2953 },
2752 "c/book" => { 2954 "c/book" => {
2753 id => "infobox", 2955 id => "infobox",
2754 title => "Book", 2956 title => "Book",
2755 reply => undef, 2957 reply => undef,
2783 id => "infobox", 2985 id => "infobox",
2784 title => "Skills", 2986 title => "Skills",
2785 reply => undef, 2987 reply => undef,
2786 tooltip => "Shows your experience per skill and item power", 2988 tooltip => "Shows your experience per skill and item power",
2787 }, 2989 },
2990 "c/shopitems" => {
2991 id => "infobox",
2992 title => "Shop Items",
2993 reply => undef,
2994 tooltip => "Shows the items currently for sale in this shop",
2995 },
2788 "c/resistances" => { 2996 "c/resistances" => {
2789 id => "infobox", 2997 id => "infobox",
2790 title => "Resistances", 2998 title => "Resistances",
2791 reply => undef, 2999 reply => undef,
2792 tooltip => "Shows your resistances", 3000 tooltip => "Shows your resistances",
2794 "c/pets" => { 3002 "c/pets" => {
2795 id => "infobox", 3003 id => "infobox",
2796 title => "Pets", 3004 title => "Pets",
2797 reply => undef, 3005 reply => undef,
2798 tooltip => "Shows information abotu your pets/a specific pet", 3006 tooltip => "Shows information abotu your pets/a specific pet",
3007 },
3008 "c/perceiveself" => {
3009 id => "infobox",
3010 title => "Perceive Self",
3011 reply => undef,
3012 tooltip => "You gained detailed knowledge about yourself",
2799 }, 3013 },
2800 "c/uptime" => { 3014 "c/uptime" => {
2801 id => "infobox", 3015 id => "infobox",
2802 title => "Uptime", 3016 title => "Uptime",
2803 reply => undef, 3017 reply => undef,
2859 my $pkt = "msg " 3073 my $pkt = "msg "
2860 . $self->{json_coder}->encode ( 3074 . $self->{json_coder}->encode (
2861 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3075 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2862 ); 3076 );
2863 3077
2864 # try lzf for large packets
2865 $pkt = "lzf " . Compress::LZF::compress $pkt
2866 if 1024 <= length $pkt and $self->{can_lzf};
2867
2868 # split very large packets
2869 if (8192 < length $pkt and $self->{can_lzf}) {
2870 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2871 $pkt = "frag";
2872 }
2873
2874 $self->send_packet ($pkt); 3078 $self->send_big_packet ($pkt);
2875} 3079}
2876 3080
2877=item $client->ext_msg ($type, @msg) 3081=item $client->ext_msg ($type, @msg)
2878 3082
2879Sends an ext event to the client. 3083Sends an ext event to the client.
2882 3086
2883sub cf::client::ext_msg($$@) { 3087sub cf::client::ext_msg($$@) {
2884 my ($self, $type, @msg) = @_; 3088 my ($self, $type, @msg) = @_;
2885 3089
2886 if ($self->extcmd == 2) { 3090 if ($self->extcmd == 2) {
2887 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3091 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2888 } elsif ($self->extcmd == 1) { # TODO: remove 3092 } elsif ($self->extcmd == 1) { # TODO: remove
2889 push @msg, msgtype => "event_$type"; 3093 push @msg, msgtype => "event_$type";
2890 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3094 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2891 } 3095 }
2892} 3096}
2893 3097
2894=item $client->ext_reply ($msgid, @msg) 3098=item $client->ext_reply ($msgid, @msg)
2895 3099
2899 3103
2900sub cf::client::ext_reply($$@) { 3104sub cf::client::ext_reply($$@) {
2901 my ($self, $id, @msg) = @_; 3105 my ($self, $id, @msg) = @_;
2902 3106
2903 if ($self->extcmd == 2) { 3107 if ($self->extcmd == 2) {
2904 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3108 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2905 } elsif ($self->extcmd == 1) { 3109 } elsif ($self->extcmd == 1) {
2906 #TODO: version 1, remove 3110 #TODO: version 1, remove
2907 unshift @msg, msgtype => "reply", msgid => $id; 3111 unshift @msg, msgtype => "reply", msgid => $id;
2908 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3112 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2909 } 3113 }
2910} 3114}
2911 3115
2912=item $success = $client->query ($flags, "text", \&cb) 3116=item $success = $client->query ($flags, "text", \&cb)
2913 3117
2984 3188
2985 $ns->ext_reply ($reply, @reply) 3189 $ns->ext_reply ($reply, @reply)
2986 if $reply; 3190 if $reply;
2987 3191
2988 } else { 3192 } else {
2989 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3193 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2990 } 3194 }
2991 3195
2992 cf::override; 3196 cf::override;
2993 }, 3197 },
2994); 3198);
3014 3218
3015 $coro 3219 $coro
3016} 3220}
3017 3221
3018cf::client->attach ( 3222cf::client->attach (
3019 on_destroy => sub { 3223 on_client_destroy => sub {
3020 my ($ns) = @_; 3224 my ($ns) = @_;
3021 3225
3022 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3226 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3023 }, 3227 },
3024); 3228);
3040our $safe_hole = new Safe::Hole; 3244our $safe_hole = new Safe::Hole;
3041 3245
3042$SIG{FPE} = 'IGNORE'; 3246$SIG{FPE} = 'IGNORE';
3043 3247
3044$safe->permit_only (Opcode::opset qw( 3248$safe->permit_only (Opcode::opset qw(
3045 :base_core :base_mem :base_orig :base_math 3249 :base_core :base_mem :base_orig :base_math :base_loop
3046 grepstart grepwhile mapstart mapwhile 3250 grepstart grepwhile mapstart mapwhile
3047 sort time 3251 sort time
3048)); 3252));
3049 3253
3050# here we export the classes and methods available to script code 3254# here we export the classes and methods available to script code
3075 decrease split destroy change_exp value msg lore send_msg)], 3279 decrease split destroy change_exp value msg lore send_msg)],
3076 ["cf::object::player" => qw(player)], 3280 ["cf::object::player" => qw(player)],
3077 ["cf::player" => qw(peaceful send_msg)], 3281 ["cf::player" => qw(peaceful send_msg)],
3078 ["cf::map" => qw(trigger)], 3282 ["cf::map" => qw(trigger)],
3079) { 3283) {
3080 no strict 'refs';
3081 my ($pkg, @funs) = @$_; 3284 my ($pkg, @funs) = @$_;
3082 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3285 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3083 for @funs; 3286 for @funs;
3084} 3287}
3085 3288
3102 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3305 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3103 $qcode =~ s/\n/\\n/g; 3306 $qcode =~ s/\n/\\n/g;
3104 3307
3105 %vars = (_dummy => 0) unless %vars; 3308 %vars = (_dummy => 0) unless %vars;
3106 3309
3310 my @res;
3107 local $_; 3311 local $_;
3108 local @safe::cf::_safe_eval_args = values %vars;
3109 3312
3110 my $eval = 3313 my $eval =
3111 "do {\n" 3314 "do {\n"
3112 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3315 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3113 . "#line 0 \"{$qcode}\"\n" 3316 . "#line 0 \"{$qcode}\"\n"
3114 . $code 3317 . $code
3115 . "\n}" 3318 . "\n}"
3116 ; 3319 ;
3117 3320
3321 if ($CFG{safe_eval}) {
3118 sub_generation_inc; 3322 sub_generation_inc;
3323 local @safe::cf::_safe_eval_args = values %vars;
3119 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3324 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3120 sub_generation_inc; 3325 sub_generation_inc;
3326 } else {
3327 local @cf::_safe_eval_args = values %vars;
3328 @res = wantarray ? eval eval : scalar eval $eval;
3329 }
3121 3330
3122 if ($@) { 3331 if ($@) {
3123 warn "$@"; 3332 warn "$@",
3124 warn "while executing safe code '$code'\n"; 3333 "while executing safe code '$code'\n",
3125 warn "with arguments " . (join " ", %vars) . "\n"; 3334 "with arguments " . (join " ", %vars) . "\n";
3126 } 3335 }
3127 3336
3128 wantarray ? @res : $res[0] 3337 wantarray ? @res : $res[0]
3129} 3338}
3130 3339
3144=cut 3353=cut
3145 3354
3146sub register_script_function { 3355sub register_script_function {
3147 my ($fun, $cb) = @_; 3356 my ($fun, $cb) = @_;
3148 3357
3149 no strict 'refs'; 3358 $fun = "safe::$fun" if $CFG{safe_eval};
3150 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3359 *$fun = $safe_hole->wrap ($cb);
3151} 3360}
3152 3361
3153=back 3362=back
3154 3363
3155=cut 3364=cut
3164 # for this (global event?) 3373 # for this (global event?)
3165 %ext::player_env::MUSIC_FACE_CACHE = (); 3374 %ext::player_env::MUSIC_FACE_CACHE = ();
3166 3375
3167 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3376 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3168 3377
3169 warn "loading facedata from $path\n"; 3378 trace "loading facedata from $path\n";
3170 3379
3171 my $facedata;
3172 0 < aio_load $path, $facedata 3380 0 < aio_load $path, my $facedata
3173 or die "$path: $!"; 3381 or die "$path: $!";
3174 3382
3175 $facedata = Coro::Storable::thaw $facedata; 3383 $facedata = Coro::Storable::thaw $facedata;
3176 3384
3177 $facedata->{version} == 2 3385 $facedata->{version} == 2
3178 or cf::cleanup "$path: version mismatch, cannot proceed."; 3386 or cf::cleanup "$path: version mismatch, cannot proceed.";
3179 3387
3180 # patch in the exptable 3388 # patch in the exptable
3389 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3181 $facedata->{resource}{"res/exp_table"} = { 3390 $facedata->{resource}{"res/exp_table"} = {
3182 type => FT_RSRC, 3391 type => FT_RSRC,
3183 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3392 data => $exp_table,
3393 hash => (Digest::MD5::md5 $exp_table),
3184 }; 3394 };
3185 cf::cede_to_tick; 3395 cf::cede_to_tick;
3186 3396
3187 { 3397 {
3188 my $faces = $facedata->{faceinfo}; 3398 my $faces = $facedata->{faceinfo};
3190 while (my ($face, $info) = each %$faces) { 3400 while (my ($face, $info) = each %$faces) {
3191 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3401 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3192 3402
3193 cf::face::set_visibility $idx, $info->{visibility}; 3403 cf::face::set_visibility $idx, $info->{visibility};
3194 cf::face::set_magicmap $idx, $info->{magicmap}; 3404 cf::face::set_magicmap $idx, $info->{magicmap};
3195 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3405 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3196 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3406 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3197 3407
3198 cf::cede_to_tick; 3408 cf::cede_to_tick;
3199 } 3409 }
3200 3410
3201 while (my ($face, $info) = each %$faces) { 3411 while (my ($face, $info) = each %$faces) {
3206 3416
3207 if (my $smooth = cf::face::find $info->{smooth}) { 3417 if (my $smooth = cf::face::find $info->{smooth}) {
3208 cf::face::set_smooth $idx, $smooth; 3418 cf::face::set_smooth $idx, $smooth;
3209 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3419 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3210 } else { 3420 } else {
3211 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3421 error "smooth face '$info->{smooth}' not found for face '$face'";
3212 } 3422 }
3213 3423
3214 cf::cede_to_tick; 3424 cf::cede_to_tick;
3215 } 3425 }
3216 } 3426 }
3225 3435
3226 cf::anim::invalidate_all; # d'oh 3436 cf::anim::invalidate_all; # d'oh
3227 } 3437 }
3228 3438
3229 { 3439 {
3230 # TODO: for gcfclient pleasure, we should give resources
3231 # that gcfclient doesn't grok a >10000 face index.
3232 my $res = $facedata->{resource}; 3440 my $res = $facedata->{resource};
3233 3441
3234 while (my ($name, $info) = each %$res) { 3442 while (my ($name, $info) = each %$res) {
3235 if (defined $info->{type}) { 3443 if (defined $info->{type}) {
3236 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3444 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3237 my $data;
3238 3445
3239 if ($info->{type} & 1) { 3446 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3240 # prepend meta info
3241
3242 my $meta = $enc->encode ({
3243 name => $name,
3244 %{ $info->{meta} || {} },
3245 });
3246
3247 $data = pack "(w/a*)*", $meta, $info->{data};
3248 } else {
3249 $data = $info->{data};
3250 }
3251
3252 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3253 cf::face::set_type $idx, $info->{type}; 3447 cf::face::set_type $idx, $info->{type};
3254 } else { 3448 } else {
3255 $RESOURCE{$name} = $info; 3449 $RESOURCE{$name} = $info; # unused
3256 } 3450 }
3257 3451
3258 cf::cede_to_tick; 3452 cf::cede_to_tick;
3259 } 3453 }
3260 } 3454 }
3261 3455
3262 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3456 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3263 3457
3264 1 3458 1
3265} 3459}
3266
3267cf::global->attach (on_resource_update => sub {
3268 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3269 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3270
3271 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3272 my $sound = $soundconf->{compat}[$_]
3273 or next;
3274
3275 my $face = cf::face::find "sound/$sound->[1]";
3276 cf::sound::set $sound->[0] => $face;
3277 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3278 }
3279
3280 while (my ($k, $v) = each %{$soundconf->{event}}) {
3281 my $face = cf::face::find "sound/$v";
3282 cf::sound::set $k => $face;
3283 }
3284 }
3285});
3286 3460
3287register_exticmd fx_want => sub { 3461register_exticmd fx_want => sub {
3288 my ($ns, $want) = @_; 3462 my ($ns, $want) = @_;
3289 3463
3290 while (my ($k, $v) = each %$want) { 3464 while (my ($k, $v) = each %$want) {
3329sub reload_treasures { 3503sub reload_treasures {
3330 load_resource_file "$DATADIR/treasures" 3504 load_resource_file "$DATADIR/treasures"
3331 or die "unable to load treasurelists\n"; 3505 or die "unable to load treasurelists\n";
3332} 3506}
3333 3507
3508sub reload_sound {
3509 trace "loading sound config from $DATADIR/sound\n";
3510
3511 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3512 or die "$DATADIR/sound $!";
3513
3514 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3515
3516 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3517 my $sound = $soundconf->{compat}[$_]
3518 or next;
3519
3520 my $face = cf::face::find "sound/$sound->[1]";
3521 cf::sound::set $sound->[0] => $face;
3522 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3523 }
3524
3525 while (my ($k, $v) = each %{$soundconf->{event}}) {
3526 my $face = cf::face::find "sound/$v";
3527 cf::sound::set $k => $face;
3528 }
3529}
3530
3334sub reload_resources { 3531sub reload_resources {
3335 warn "reloading resource files...\n"; 3532 trace "reloading resource files...\n";
3336 3533
3534 reload_exp_table;
3535 reload_materials;
3337 reload_facedata; 3536 reload_facedata;
3537 reload_sound;
3338 reload_archetypes; 3538 reload_archetypes;
3339 reload_regions; 3539 reload_regions;
3340 reload_treasures; 3540 reload_treasures;
3341 3541
3342 warn "finished reloading resource files\n"; 3542 trace "finished reloading resource files\n";
3343} 3543}
3344 3544
3345sub reload_config { 3545sub reload_config {
3346 open my $fh, "<:utf8", "$CONFDIR/config" 3546 trace "reloading config file...\n";
3347 or return;
3348 3547
3349 local $/; 3548 0 < aio_load "$CONFDIR/config", my $config
3549 or die "$CONFDIR/config: $!";
3550
3551 utf8::decode $config;
3552
3553 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3350 *CFG = YAML::Load <$fh>; 3554 *CFG = YAML::XS::Load $config;
3351 3555
3352 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3556 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3353 3557
3354 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3558 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3355 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3559 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3356 3560
3357 if (exists $CFG{mlockall}) { 3561 if (exists $CFG{mlockall}) {
3380 3584
3381 seek $fh, 0, 0; 3585 seek $fh, 0, 0;
3382 print $fh $$; 3586 print $fh $$;
3383} 3587}
3384 3588
3589sub main_loop {
3590 trace "EV::loop starting\n";
3591 if (1) {
3592 EV::loop;
3593 }
3594 trace "EV::loop returned\n";
3595 goto &main_loop unless $REALLY_UNLOOP;
3596}
3597
3385sub main { 3598sub main {
3386 cf::init_globals; # initialise logging 3599 cf::init_globals; # initialise logging
3387 3600
3388 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3601 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3389 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3602 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3390 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3603 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3391 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3604 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3392
3393 cf::init_experience;
3394 cf::init_anim;
3395 cf::init_attackmess;
3396 cf::init_dynamic;
3397 3605
3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3606 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399 3607
3400 # we must not ever block the main coroutine 3608 # we must not ever block the main coroutine
3401 local $Coro::idle = sub { 3609 local $Coro::idle = sub {
3407 }; 3615 };
3408 3616
3409 evthread_start IO::AIO::poll_fileno; 3617 evthread_start IO::AIO::poll_fileno;
3410 3618
3411 cf::sync_job { 3619 cf::sync_job {
3620 cf::incloader::init ();
3621
3622 cf::init_anim;
3623 cf::init_attackmess;
3624 cf::init_dynamic;
3625
3626 cf::load_settings;
3627
3412 reload_resources; 3628 reload_resources;
3413 reload_config; 3629 reload_config;
3414 db_init; 3630 db_init;
3415 3631
3416 cf::load_settings;
3417 cf::load_materials;
3418 cf::init_uuid; 3632 cf::init_uuid;
3419 cf::init_signals; 3633 cf::init_signals;
3420 cf::init_commands;
3421 cf::init_skills; 3634 cf::init_skills;
3422 3635
3423 cf::init_beforeplay; 3636 cf::init_beforeplay;
3424 3637
3425 atomic; 3638 atomic;
3427 load_extensions; 3640 load_extensions;
3428 3641
3429 utime time, time, $RUNTIMEFILE; 3642 utime time, time, $RUNTIMEFILE;
3430 3643
3431 # no (long-running) fork's whatsoever before this point(!) 3644 # no (long-running) fork's whatsoever before this point(!)
3645 use POSIX ();
3432 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3646 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3433 3647
3434 (pop @POST_INIT)->(0) while @POST_INIT; 3648 (pop @POST_INIT)->(0) while @POST_INIT;
3435 }; 3649 };
3436 3650
3437 EV::loop; 3651 cf::object::thawer::errors_are_fatal 0;
3652 info "parse errors in files are no longer fatal from this point on.\n";
3653
3654 my $free_main; $free_main = EV::idle sub {
3655 undef $free_main;
3656 undef &main; # free gobs of memory :)
3657 };
3658
3659 goto &main_loop;
3438} 3660}
3439 3661
3440############################################################################# 3662#############################################################################
3441# initialisation and cleanup 3663# initialisation and cleanup
3442 3664
3443# install some emergency cleanup handlers 3665# install some emergency cleanup handlers
3444BEGIN { 3666BEGIN {
3445 our %SIGWATCHER = (); 3667 our %SIGWATCHER = ();
3446 for my $signal (qw(INT HUP TERM)) { 3668 for my $signal (qw(INT HUP TERM)) {
3447 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3669 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3448 cf::cleanup "SIG$signal"; 3670 cf::cleanup "SIG$signal";
3449 }; 3671 };
3450 } 3672 }
3451} 3673}
3452 3674
3453sub write_runtime_sync { 3675sub write_runtime_sync {
3676 my $t0 = AE::time;
3677
3454 # first touch the runtime file to show we are still running: 3678 # first touch the runtime file to show we are still running:
3455 # the fsync below can take a very very long time. 3679 # the fsync below can take a very very long time.
3456 3680
3457 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3681 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3458 3682
3459 my $guard = cf::lock_acquire "write_runtime"; 3683 my $guard = cf::lock_acquire "write_runtime";
3460 3684
3461 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3685 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3462 or return; 3686 or return;
3463 3687
3464 my $value = $cf::RUNTIME + 90 + 10; 3688 my $value = $cf::RUNTIME + 90 + 10;
3465 # 10 is the runtime save interval, for a monotonic clock 3689 # 10 is the runtime save interval, for a monotonic clock
3466 # 60 allows for the watchdog to kill the server. 3690 # 60 allows for the watchdog to kill the server.
3479 or return; 3703 or return;
3480 3704
3481 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3705 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3482 and return; 3706 and return;
3483 3707
3484 warn "runtime file written.\n"; 3708 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3485 3709
3486 1 3710 1
3487} 3711}
3488 3712
3489our $uuid_lock; 3713our $uuid_lock;
3501 or return; 3725 or return;
3502 3726
3503 my $value = uuid_seq uuid_cur; 3727 my $value = uuid_seq uuid_cur;
3504 3728
3505 unless ($value) { 3729 unless ($value) {
3506 warn "cowardly refusing to write zero uuid value!\n"; 3730 info "cowardly refusing to write zero uuid value!\n";
3507 return; 3731 return;
3508 } 3732 }
3509 3733
3510 my $value = uuid_str $value + $uuid_skip; 3734 my $value = uuid_str $value + $uuid_skip;
3511 $uuid_skip = 0; 3735 $uuid_skip = 0;
3521 or return; 3745 or return;
3522 3746
3523 aio_rename "$uuid~", $uuid 3747 aio_rename "$uuid~", $uuid
3524 and return; 3748 and return;
3525 3749
3526 warn "uuid file written ($value).\n"; 3750 trace "uuid file written ($value).\n";
3527 3751
3528 1 3752 1
3529 3753
3530} 3754}
3531 3755
3537} 3761}
3538 3762
3539sub emergency_save() { 3763sub emergency_save() {
3540 my $freeze_guard = cf::freeze_mainloop; 3764 my $freeze_guard = cf::freeze_mainloop;
3541 3765
3542 warn "emergency_perl_save: enter\n"; 3766 info "emergency_perl_save: enter\n";
3767
3768 # this is a trade-off: we want to be very quick here, so
3769 # save all maps without fsync, and later call a global sync
3770 # (which in turn might be very very slow)
3771 local $USE_FSYNC = 0;
3543 3772
3544 cf::sync_job { 3773 cf::sync_job {
3545 # this is a trade-off: we want to be very quick here, so 3774 cf::write_runtime_sync; # external watchdog should not bark
3546 # save all maps without fsync, and later call a global sync
3547 # (which in turn might be very very slow)
3548 local $USE_FSYNC = 0;
3549 3775
3550 # use a peculiar iteration method to avoid tripping on perl 3776 # use a peculiar iteration method to avoid tripping on perl
3551 # refcount bugs in for. also avoids problems with players 3777 # refcount bugs in for. also avoids problems with players
3552 # and maps saved/destroyed asynchronously. 3778 # and maps saved/destroyed asynchronously.
3553 warn "emergency_perl_save: begin player save\n"; 3779 info "emergency_perl_save: begin player save\n";
3554 for my $login (keys %cf::PLAYER) { 3780 for my $login (keys %cf::PLAYER) {
3555 my $pl = $cf::PLAYER{$login} or next; 3781 my $pl = $cf::PLAYER{$login} or next;
3556 $pl->valid or next; 3782 $pl->valid or next;
3557 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3783 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3558 $pl->save; 3784 $pl->save;
3559 } 3785 }
3560 warn "emergency_perl_save: end player save\n"; 3786 info "emergency_perl_save: end player save\n";
3561 3787
3788 cf::write_runtime_sync; # external watchdog should not bark
3789
3562 warn "emergency_perl_save: begin map save\n"; 3790 info "emergency_perl_save: begin map save\n";
3563 for my $path (keys %cf::MAP) { 3791 for my $path (keys %cf::MAP) {
3564 my $map = $cf::MAP{$path} or next; 3792 my $map = $cf::MAP{$path} or next;
3565 $map->valid or next; 3793 $map->valid or next;
3566 $map->save; 3794 $map->save;
3567 } 3795 }
3568 warn "emergency_perl_save: end map save\n"; 3796 info "emergency_perl_save: end map save\n";
3569 3797
3798 cf::write_runtime_sync; # external watchdog should not bark
3799
3570 warn "emergency_perl_save: begin database checkpoint\n"; 3800 info "emergency_perl_save: begin database checkpoint\n";
3571 BDB::db_env_txn_checkpoint $DB_ENV; 3801 BDB::db_env_txn_checkpoint $DB_ENV;
3572 warn "emergency_perl_save: end database checkpoint\n"; 3802 info "emergency_perl_save: end database checkpoint\n";
3573 3803
3574 warn "emergency_perl_save: begin write uuid\n"; 3804 info "emergency_perl_save: begin write uuid\n";
3575 write_uuid_sync 1; 3805 write_uuid_sync 1;
3576 warn "emergency_perl_save: end write uuid\n"; 3806 info "emergency_perl_save: end write uuid\n";
3807
3808 cf::write_runtime_sync; # external watchdog should not bark
3809
3810 trace "emergency_perl_save: syncing database to disk";
3811 BDB::db_env_txn_checkpoint $DB_ENV;
3812
3813 info "emergency_perl_save: starting sync\n";
3814 IO::AIO::aio_sync sub {
3815 info "emergency_perl_save: finished sync\n";
3816 };
3817
3818 cf::write_runtime_sync; # external watchdog should not bark
3819
3820 trace "emergency_perl_save: flushing outstanding aio requests";
3821 while (IO::AIO::nreqs || BDB::nreqs) {
3822 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3823 }
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3577 }; 3826 };
3578 3827
3579 warn "emergency_perl_save: starting sync()\n";
3580 IO::AIO::aio_sync sub {
3581 warn "emergency_perl_save: finished sync()\n";
3582 };
3583
3584 warn "emergency_perl_save: leave\n"; 3828 info "emergency_perl_save: leave\n";
3585} 3829}
3586 3830
3587sub post_cleanup { 3831sub post_cleanup {
3588 my ($make_core) = @_; 3832 my ($make_core) = @_;
3589 3833
3834 IO::AIO::flush;
3835
3590 warn Carp::longmess "post_cleanup backtrace" 3836 error Carp::longmess "post_cleanup backtrace"
3591 if $make_core; 3837 if $make_core;
3592 3838
3593 my $fh = pidfile; 3839 my $fh = pidfile;
3594 unlink $PIDFILE if <$fh> == $$; 3840 unlink $PIDFILE if <$fh> == $$;
3595} 3841}
3615 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3861 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3616 for my $name (keys %$leaf_symtab) { 3862 for my $name (keys %$leaf_symtab) {
3617 _gv_clear *{"$pkg$name"}; 3863 _gv_clear *{"$pkg$name"};
3618# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3864# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3619 } 3865 }
3620 warn "cleared package $pkg\n";#d#
3621} 3866}
3622 3867
3623sub do_reload_perl() { 3868sub do_reload_perl() {
3624 # can/must only be called in main 3869 # can/must only be called in main
3625 if ($Coro::current != $Coro::main) { 3870 unless (in_main) {
3626 warn "can only reload from main coroutine"; 3871 error "can only reload from main coroutine";
3627 return; 3872 return;
3628 } 3873 }
3629 3874
3630 return if $RELOAD++; 3875 return if $RELOAD++;
3631 3876
3632 my $t1 = EV::time; 3877 my $t1 = AE::time;
3633 3878
3634 while ($RELOAD) { 3879 while ($RELOAD) {
3880 cf::get_slot 0.1, -1, "reload_perl";
3635 warn "reloading..."; 3881 info "reloading...";
3636 3882
3637 warn "entering sync_job"; 3883 trace "entering sync_job";
3638 3884
3639 cf::sync_job { 3885 cf::sync_job {
3640 cf::write_runtime_sync; # external watchdog should not bark
3641 cf::emergency_save; 3886 #cf::emergency_save;
3642 cf::write_runtime_sync; # external watchdog should not bark
3643 3887
3644 warn "syncing database to disk";
3645 BDB::db_env_txn_checkpoint $DB_ENV;
3646
3647 # if anything goes wrong in here, we should simply crash as we already saved
3648
3649 warn "flushing outstanding aio requests";
3650 while (IO::AIO::nreqs || BDB::nreqs) {
3651 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3652 }
3653
3654 warn "cancelling all extension coros"; 3888 trace "cancelling all extension coros";
3655 $_->cancel for values %EXT_CORO; 3889 $_->cancel for values %EXT_CORO;
3656 %EXT_CORO = (); 3890 %EXT_CORO = ();
3657 3891
3658 warn "removing commands"; 3892 trace "removing commands";
3659 %COMMAND = (); 3893 %COMMAND = ();
3660 3894
3661 warn "removing ext/exti commands"; 3895 trace "removing ext/exti commands";
3662 %EXTCMD = (); 3896 %EXTCMD = ();
3663 %EXTICMD = (); 3897 %EXTICMD = ();
3664 3898
3665 warn "unloading/nuking all extensions"; 3899 trace "unloading/nuking all extensions";
3666 for my $pkg (@EXTS) { 3900 for my $pkg (@EXTS) {
3667 warn "... unloading $pkg"; 3901 trace "... unloading $pkg";
3668 3902
3669 if (my $cb = $pkg->can ("unload")) { 3903 if (my $cb = $pkg->can ("unload")) {
3670 eval { 3904 eval {
3671 $cb->($pkg); 3905 $cb->($pkg);
3672 1 3906 1
3673 } or warn "$pkg unloaded, but with errors: $@"; 3907 } or error "$pkg unloaded, but with errors: $@";
3674 } 3908 }
3675 3909
3676 warn "... clearing $pkg"; 3910 trace "... clearing $pkg";
3677 clear_package $pkg; 3911 clear_package $pkg;
3678 } 3912 }
3679 3913
3680 warn "unloading all perl modules loaded from $LIBDIR"; 3914 trace "unloading all perl modules loaded from $LIBDIR";
3681 while (my ($k, $v) = each %INC) { 3915 while (my ($k, $v) = each %INC) {
3682 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3916 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3683 3917
3684 warn "... unloading $k"; 3918 trace "... unloading $k";
3685 delete $INC{$k}; 3919 delete $INC{$k};
3686 3920
3687 $k =~ s/\.pm$//; 3921 $k =~ s/\.pm$//;
3688 $k =~ s/\//::/g; 3922 $k =~ s/\//::/g;
3689 3923
3692 } 3926 }
3693 3927
3694 clear_package $k; 3928 clear_package $k;
3695 } 3929 }
3696 3930
3697 warn "getting rid of safe::, as good as possible"; 3931 trace "getting rid of safe::, as good as possible";
3698 clear_package "safe::$_" 3932 clear_package "safe::$_"
3699 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3933 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3700 3934
3701 warn "unloading cf.pm \"a bit\""; 3935 trace "unloading cf.pm \"a bit\"";
3702 delete $INC{"cf.pm"}; 3936 delete $INC{"cf.pm"};
3703 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3937 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3704 3938
3705 # don't, removes xs symbols, too, 3939 # don't, removes xs symbols, too,
3706 # and global variables created in xs 3940 # and global variables created in xs
3707 #clear_package __PACKAGE__; 3941 #clear_package __PACKAGE__;
3708 3942
3709 warn "unload completed, starting to reload now"; 3943 info "unload completed, starting to reload now";
3710 3944
3711 warn "reloading cf.pm"; 3945 trace "reloading cf.pm";
3712 require cf; 3946 require cf;
3713 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3947 cf::_connect_to_perl_1;
3714 3948
3715 warn "loading config and database again"; 3949 trace "loading config and database again";
3716 cf::reload_config; 3950 cf::reload_config;
3717 3951
3718 warn "loading extensions"; 3952 trace "loading extensions";
3719 cf::load_extensions; 3953 cf::load_extensions;
3720 3954
3721 if ($REATTACH_ON_RELOAD) { 3955 if ($REATTACH_ON_RELOAD) {
3722 warn "reattaching attachments to objects/players"; 3956 trace "reattaching attachments to objects/players";
3723 _global_reattach; # objects, sockets 3957 _global_reattach; # objects, sockets
3724 warn "reattaching attachments to maps"; 3958 trace "reattaching attachments to maps";
3725 reattach $_ for values %MAP; 3959 reattach $_ for values %MAP;
3726 warn "reattaching attachments to players"; 3960 trace "reattaching attachments to players";
3727 reattach $_ for values %PLAYER; 3961 reattach $_ for values %PLAYER;
3728 } 3962 }
3729 3963
3730 warn "running post_init jobs"; 3964 trace "running post_init jobs";
3731 (pop @POST_INIT)->(1) while @POST_INIT; 3965 (pop @POST_INIT)->(1) while @POST_INIT;
3732 3966
3733 warn "leaving sync_job"; 3967 trace "leaving sync_job";
3734 3968
3735 1 3969 1
3736 } or do { 3970 } or do {
3737 warn $@; 3971 error $@;
3738 cf::cleanup "error while reloading, exiting."; 3972 cf::cleanup "error while reloading, exiting.";
3739 }; 3973 };
3740 3974
3741 warn "reloaded"; 3975 info "reloaded";
3742 --$RELOAD; 3976 --$RELOAD;
3743 } 3977 }
3744 3978
3745 $t1 = EV::time - $t1; 3979 $t1 = AE::time - $t1;
3746 warn "reload completed in ${t1}s\n"; 3980 info "reload completed in ${t1}s\n";
3747}; 3981};
3748 3982
3749our $RELOAD_WATCHER; # used only during reload 3983our $RELOAD_WATCHER; # used only during reload
3750 3984
3751sub reload_perl() { 3985sub reload_perl() {
3753 # coro crashes during coro_state_free->destroy here. 3987 # coro crashes during coro_state_free->destroy here.
3754 3988
3755 $RELOAD_WATCHER ||= cf::async { 3989 $RELOAD_WATCHER ||= cf::async {
3756 Coro::AIO::aio_wait cache_extensions; 3990 Coro::AIO::aio_wait cache_extensions;
3757 3991
3758 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3992 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3759 do_reload_perl; 3993 do_reload_perl;
3760 undef $RELOAD_WATCHER; 3994 undef $RELOAD_WATCHER;
3761 }; 3995 };
3762 }; 3996 };
3763} 3997}
3772 reload_perl; 4006 reload_perl;
3773 }; 4007 };
3774 } 4008 }
3775}; 4009};
3776 4010
3777unshift @INC, $LIBDIR; 4011#############################################################################
3778 4012
3779my $bug_warning = 0; 4013my $bug_warning = 0;
3780 4014
3781our @WAIT_FOR_TICK; 4015our @WAIT_FOR_TICK;
3782our @WAIT_FOR_TICK_BEGIN; 4016our @WAIT_FOR_TICK_BEGIN;
3783 4017
3784sub wait_for_tick { 4018sub wait_for_tick() {
3785 return if tick_inhibit || $Coro::current == $Coro::main; 4019 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3786 4020
3787 my $signal = new Coro::Signal; 4021 my $signal = new Coro::Signal;
3788 push @WAIT_FOR_TICK, $signal; 4022 push @WAIT_FOR_TICK, $signal;
3789 $signal->wait; 4023 $signal->wait;
3790} 4024}
3791 4025
3792sub wait_for_tick_begin { 4026sub wait_for_tick_begin() {
3793 return if tick_inhibit || $Coro::current == $Coro::main; 4027 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3794 4028
3795 my $signal = new Coro::Signal; 4029 my $signal = new Coro::Signal;
3796 push @WAIT_FOR_TICK_BEGIN, $signal; 4030 push @WAIT_FOR_TICK_BEGIN, $signal;
3797 $signal->wait; 4031 $signal->wait;
3798} 4032}
3804 return; 4038 return;
3805 } 4039 }
3806 4040
3807 cf::server_tick; # one server iteration 4041 cf::server_tick; # one server iteration
3808 4042
4043 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4044
3809 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4045 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4046 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3811 Coro::async_pool { 4047 Coro::async_pool {
3812 $Coro::current->{desc} = "runtime saver"; 4048 $Coro::current->{desc} = "runtime saver";
3813 write_runtime_sync 4049 write_runtime_sync
3814 or warn "ERROR: unable to write runtime file: $!"; 4050 or error "ERROR: unable to write runtime file: $!";
3815 }; 4051 };
3816 } 4052 }
3817 4053
3818 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3819 $sig->send; 4055 $sig->send;
3827 4063
3828 if (0) { 4064 if (0) {
3829 if ($NEXT_TICK) { 4065 if ($NEXT_TICK) {
3830 my $jitter = $TICK_START - $NEXT_TICK; 4066 my $jitter = $TICK_START - $NEXT_TICK;
3831 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4067 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3832 warn "jitter $JITTER\n";#d# 4068 debug "jitter $JITTER\n";#d#
3833 } 4069 }
3834 } 4070 }
3835} 4071}
3836 4072
3837{ 4073{
3838 # configure BDB 4074 # configure BDB
3839 4075
3840 BDB::min_parallel 8; 4076 BDB::min_parallel 16;
3841 BDB::max_poll_reqs $TICK * 0.1; 4077 BDB::max_poll_reqs $TICK * 0.1;
3842 $AnyEvent::BDB::WATCHER->priority (1); 4078 $AnyEvent::BDB::WATCHER->priority (1);
3843 4079
3844 unless ($DB_ENV) { 4080 unless ($DB_ENV) {
3845 $DB_ENV = BDB::db_env_create; 4081 $DB_ENV = BDB::db_env_create;
3925 LOG llevInfo, "[ABT] [suppressed]\n"; 4161 LOG llevInfo, "[ABT] [suppressed]\n";
3926 } 4162 }
3927} 4163}
3928 4164
3929# load additional modules 4165# load additional modules
3930eval "use cf::$_" for @EXTRA_MODULES; 4166require "cf/$_.pm" for @EXTRA_MODULES;
4167cf::_connect_to_perl_2;
3931 4168
3932END { cf::emergency_save } 4169END { cf::emergency_save }
3933 4170
39341 41711
3935 4172

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines