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.464 by root, Thu Jan 1 18:35:48 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 "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
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
130
117our %CFG; 131our %CFG;
118 132
119our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
120our $RUNTIME; 134our $RUNTIME;
121our $NOW; 135our $NOW;
132our $JITTER; # average jitter 146our $JITTER; # average jitter
133our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
134 148
135our @POST_INIT; 149our @POST_INIT;
136 150
137our $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 :)
138 153
139binmode STDOUT; 154binmode STDOUT;
140binmode STDERR; 155binmode STDERR;
141 156
142# read virtual server time, if available 157# read virtual server time, if available
144 open my $fh, "<", $RUNTIMEFILE 159 open my $fh, "<", $RUNTIMEFILE
145 or die "unable to read $RUNTIMEFILE file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
146 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
147} 162}
148 163
164eval "sub TICK() { $TICK } 1" or die;
165
149mkdir $_ 166mkdir $_
150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
151 168
152our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
153 170
154sub 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::"} };
155 187
156############################################################################# 188#############################################################################
157 189
158=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
159 191
201from wherever your confdir points to. 233from wherever your confdir points to.
202 234
203=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
204 236
205These 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
206returns 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
207per 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.
208 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
209=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
210 247
211This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
212C<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
213that call. 250that call.
214 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
215=back 258=back
216 259
217=cut 260=cut
218 261
219BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
220 *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 {
221 my $msg = join "", @_; 269 my $msg = join "", @_;
222 270
223 $msg .= "\n" 271 $msg .= "\n"
224 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
225 273
226 $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;
227 275
228 LOG llevError, $msg; 276 LOG llevWarn, $msg;
229 }; 277};
230}
231 278
232$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
234 281
235 if ($Coro::current == $Coro::main) {#d# 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d# 286 return;#d#
238 }#d# 287 }#d#
239 288
240 # kill coroutine otherwise 289 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate 290 Coro::terminate
243}; 291};
244
245$SIG{__DIE__} = sub { }; #d#?
246 292
247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
264)) { 310)) {
265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
266} 312}
267 313
268$EV::DIED = sub { 314$EV::DIED = sub {
269 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
270}; 316};
271 317
272############################################################################# 318#############################################################################
273 319
274=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
371} 417}
372 418
373=item cf::periodic $interval, $cb 419=item cf::periodic $interval, $cb
374 420
375Like 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
376get spread over timer. 422get spread over time.
377 423
378=cut 424=cut
379 425
380sub periodic($$) { 426sub periodic($$) {
381 my ($interval, $cb) = @_; 427 my ($interval, $cb) = @_;
398 444
399=cut 445=cut
400 446
401our @SLOT_QUEUE; 447our @SLOT_QUEUE;
402our $SLOT_QUEUE; 448our $SLOT_QUEUE;
449our $SLOT_DECAY = 0.9;
403 450
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 451$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 452$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 453 $Coro::current->desc ("timeslot manager");
407 454
408 my $signal = new Coro::Signal; 455 my $signal = new Coro::Signal;
456 my $busy;
409 457
410 while () { 458 while () {
411 next_job: 459 next_job:
460
412 my $avail = cf::till_tick; 461 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 462
414 for (0 .. $#SLOT_QUEUE) { 463 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 464 if ($SLOT_QUEUE[$_][0] <= $avail) {
465 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 466 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 467 $job->[2]->send;
418 Coro::cede; 468 Coro::cede;
419 goto next_job; 469 goto next_job;
420 } 470 } else {
471 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 472 }
422 } 473 }
423 474
424 if (@SLOT_QUEUE) { 475 if (@SLOT_QUEUE) {
425 # 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
426 push @cf::WAIT_FOR_TICK, $signal; 477 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait; 478 $signal->wait;
428 } else { 479 } else {
480 $busy = 0;
429 Coro::schedule; 481 Coro::schedule;
430 } 482 }
431 } 483 }
432}; 484};
433 485
434sub get_slot($;$$) { 486sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 487 return if tick_inhibit || $Coro::current == $Coro::main;
436 488
437 my ($time, $pri, $name) = @_; 489 my ($time, $pri, $name) = @_;
438 490
439 $time = $TICK * .6 if $time > $TICK * .6; 491 $time = clamp $time, 0.01, $TICK * .6;
492
440 my $sig = new Coro::Signal; 493 my $sig = new Coro::Signal;
441 494
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 495 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 496 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 497 $SLOT_QUEUE->ready;
470=cut 523=cut
471 524
472sub sync_job(&) { 525sub sync_job(&) {
473 my ($job) = @_; 526 my ($job) = @_;
474 527
475 if ($Coro::current == $Coro::main) { 528 if (in_main) {
476 my $time = EV::time; 529 my $time = AE::time;
477 530
478 # this is the main coro, too bad, we have to block 531 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 532 # till the operation succeeds, freezing the server :/
480 533
481 LOG llevError, Carp::longmess "sync job";#d# 534 #LOG llevError, Carp::longmess "sync job";#d#
482 535
483 my $freeze_guard = freeze_mainloop; 536 my $freeze_guard = freeze_mainloop;
484 537
485 my $busy = 1; 538 my $busy = 1;
486 my @res; 539 my @res;
487 540
488 (async { 541 (async {
489 $Coro::current->desc ("sync job coro"); 542 $Coro::current->desc ("sync job coro");
490 @res = eval { $job->() }; 543 @res = eval { $job->() };
491 warn $@ if $@; 544 error $@ if $@;
492 undef $busy; 545 undef $busy;
493 })->prio (Coro::PRIO_MAX); 546 })->prio (Coro::PRIO_MAX);
494 547
495 while ($busy) { 548 while ($busy) {
496 if (Coro::nready) { 549 if (Coro::nready) {
498 } else { 551 } else {
499 EV::loop EV::LOOP_ONESHOT; 552 EV::loop EV::LOOP_ONESHOT;
500 } 553 }
501 } 554 }
502 555
503 my $time = EV::time - $time; 556 my $time = AE::time - $time;
504 557
505 $TICK_START += $time; # do not account sync jobs to server load 558 $TICK_START += $time; # do not account sync jobs to server load
506 559
507 wantarray ? @res : $res[0] 560 wantarray ? @res : $res[0]
508 } else { 561 } else {
539Coro::Storable. May, of course, block. Note that the executed sub may 592Coro::Storable. May, of course, block. Note that the executed sub may
540never block itself or use any form of event handling. 593never block itself or use any form of event handling.
541 594
542=cut 595=cut
543 596
597sub post_fork {
598 reset_signals;
599}
600
544sub fork_call(&@) { 601sub fork_call(&@) {
545 my ($cb, @args) = @_; 602 my ($cb, @args) = @_;
546 603
547 # 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,
548 # otherwise perl prematurely frees the stuff :/ 605 # otherwise perl prematurely frees the stuff :/
549 # TODO: investigate and fix (likely this will be rather laborious) 606 # TODO: investigate and fix (likely this will be rather laborious)
550 607
551 my @res = Coro::Util::fork_eval { 608 my @res = Coro::Util::fork_eval {
552 reset_signals; 609 cf::post_fork;
553 &$cb 610 &$cb
554 }, @args; 611 }, @args;
555 612
556 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 )
557} 625}
558 626
559=item $coin = coin_from_name $name 627=item $coin = coin_from_name $name
560 628
561=cut 629=cut
598within each server. 666within each server.
599 667
600=cut 668=cut
601 669
602sub db_table($) { 670sub db_table($) {
671 cf::error "db_get called from main context"
672 if $Coro::current == $Coro::main;
673
603 my ($name) = @_; 674 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV; 675 my $db = BDB::db_create $DB_ENV;
605 676
606 eval { 677 eval {
607 $db->set_flags (BDB::CHKSUM); 678 $db->set_flags (BDB::CHKSUM);
617} 688}
618 689
619our $DB; 690our $DB;
620 691
621sub db_init { 692sub db_init {
622 cf::sync_job {
623 $DB ||= db_table "db"; 693 $DB ||= db_table "db";
624 };
625} 694}
626 695
627sub db_get($$) { 696sub db_get($$) {
628 my $key = "$_[0]/$_[1]"; 697 my $key = "$_[0]/$_[1]";
629 698
630 cf::sync_job { 699 cf::error "db_get called from main context"
700 if $Coro::current == $Coro::main;
701
631 BDB::db_get $DB, undef, $key, my $data; 702 BDB::db_get $DB, undef, $key, my $data;
632 703
633 $! ? () 704 $! ? ()
634 : $data 705 : $data
635 }
636} 706}
637 707
638sub db_put($$$) { 708sub db_put($$$) {
639 BDB::dbreq_pri 4; 709 BDB::dbreq_pri 4;
640 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 710 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
696 766
697 my $t1 = Time::HiRes::time; 767 my $t1 = Time::HiRes::time;
698 my $data = $process->(\@data); 768 my $data = $process->(\@data);
699 my $t2 = Time::HiRes::time; 769 my $t2 = Time::HiRes::time;
700 770
701 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 771 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
702 772
703 db_put cache => "$id/data", $data; 773 db_put cache => "$id/data", $data;
704 db_put cache => "$id/md5" , $md5; 774 db_put cache => "$id/md5" , $md5;
705 db_put cache => "$id/meta", $meta; 775 db_put cache => "$id/meta", $meta;
706 776
716 786
717=cut 787=cut
718 788
719sub datalog($@) { 789sub datalog($@) {
720 my ($type, %kv) = @_; 790 my ($type, %kv) = @_;
721 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 791 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
722} 792}
723 793
724=back 794=back
725 795
726=cut 796=cut
921 991
922 } elsif (exists $cb_id{$type}) { 992 } elsif (exists $cb_id{$type}) {
923 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 993 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
924 994
925 } elsif (ref $type) { 995 } elsif (ref $type) {
926 warn "attaching objects not supported, ignoring.\n"; 996 error "attaching objects not supported, ignoring.\n";
927 997
928 } else { 998 } else {
929 shift @arg; 999 shift @arg;
930 warn "attach argument '$type' not supported, ignoring.\n"; 1000 error "attach argument '$type' not supported, ignoring.\n";
931 } 1001 }
932 } 1002 }
933} 1003}
934 1004
935sub _object_attach { 1005sub _object_attach {
945 _attach $registry, $klass, @attach; 1015 _attach $registry, $klass, @attach;
946 } 1016 }
947 1017
948 $obj->{$name} = \%arg; 1018 $obj->{$name} = \%arg;
949 } else { 1019 } else {
950 warn "object uses attachment '$name' which is not available, postponing.\n"; 1020 info "object uses attachment '$name' which is not available, postponing.\n";
951 } 1021 }
952 1022
953 $obj->{_attachment}{$name} = undef; 1023 $obj->{_attachment}{$name} = undef;
954} 1024}
955 1025
1014 1084
1015 for (@$callbacks) { 1085 for (@$callbacks) {
1016 eval { &{$_->[1]} }; 1086 eval { &{$_->[1]} };
1017 1087
1018 if ($@) { 1088 if ($@) {
1019 warn "$@";
1020 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1089 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1021 override; 1090 override;
1022 } 1091 }
1023 1092
1024 return 1 if $override; 1093 return 1 if $override;
1025 } 1094 }
1104 for (@$attach) { 1173 for (@$attach) {
1105 my ($klass, @attach) = @$_; 1174 my ($klass, @attach) = @$_;
1106 _attach $registry, $klass, @attach; 1175 _attach $registry, $klass, @attach;
1107 } 1176 }
1108 } else { 1177 } else {
1109 warn "object uses attachment '$name' that is not available, postponing.\n"; 1178 info "object uses attachment '$name' that is not available, postponing.\n";
1110 } 1179 }
1111 } 1180 }
1112} 1181}
1113 1182
1114cf::attachable->attach ( 1183cf::attachable->attach (
1141 my ($filename, $rdata, $objs) = @_; 1210 my ($filename, $rdata, $objs) = @_;
1142 1211
1143 sync_job { 1212 sync_job {
1144 if (length $$rdata) { 1213 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename); 1214 utf8::decode (my $decname = $filename);
1146 warn sprintf "saving %s (%d,%d)\n", 1215 trace sprintf "saving %s (%d,%d)\n",
1147 $decname, length $$rdata, scalar @$objs; 1216 $decname, length $$rdata, scalar @$objs
1217 if $VERBOSE_IO;
1148 1218
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1219 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1220 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1221 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1222 if ($cf::USE_FSYNC) {
1223 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;
1224 aio_fsync $fh;
1225 }
1153 aio_close $fh; 1226 aio_close $fh;
1154 1227
1155 if (@$objs) { 1228 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1229 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1230 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1231 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1232 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1233 if ($cf::USE_FSYNC) {
1234 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;
1235 aio_fsync $fh;
1236 }
1161 aio_close $fh; 1237 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1238 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1239 }
1164 } else { 1240 } else {
1165 aio_unlink "$filename.pst"; 1241 aio_unlink "$filename.pst";
1168 aio_rename "$filename~", $filename; 1244 aio_rename "$filename~", $filename;
1169 1245
1170 $filename =~ s%/[^/]+$%%; 1246 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC; 1247 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1248 } else {
1173 warn "unable to save objects: $filename~: $!\n"; 1249 error "unable to save objects: $filename~: $!\n";
1174 } 1250 }
1175 } else { 1251 } else {
1176 aio_unlink $filename; 1252 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1178 } 1254 }
1202 my $st = eval { Coro::Storable::thaw $av }; 1278 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs}; 1279 $av = $st->{objs};
1204 } 1280 }
1205 1281
1206 utf8::decode (my $decname = $filename); 1282 utf8::decode (my $decname = $filename);
1207 warn sprintf "loading %s (%d,%d)\n", 1283 trace sprintf "loading %s (%d,%d)\n",
1208 $decname, length $data, scalar @{$av || []}; 1284 $decname, length $data, scalar @{$av || []}
1285 if $VERBOSE_IO;
1209 1286
1210 ($data, $av) 1287 ($data, $av)
1211} 1288}
1212 1289
1213=head2 COMMAND CALLBACKS 1290=head2 COMMAND CALLBACKS
1272} 1349}
1273 1350
1274use File::Glob (); 1351use File::Glob ();
1275 1352
1276cf::player->attach ( 1353cf::player->attach (
1277 on_command => sub { 1354 on_unknown_command => sub {
1278 my ($pl, $name, $params) = @_; 1355 my ($pl, $name, $params) = @_;
1279 1356
1280 my $cb = $COMMAND{$name} 1357 my $cb = $COMMAND{$name}
1281 or return; 1358 or return;
1282 1359
1305 1382
1306 $pl->ext_reply ($reply, @reply) 1383 $pl->ext_reply ($reply, @reply)
1307 if $reply; 1384 if $reply;
1308 1385
1309 } else { 1386 } else {
1310 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1387 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1311 } 1388 }
1312 1389
1313 cf::override; 1390 cf::override;
1314 }, 1391 },
1315); 1392);
1316 1393
1317# "readahead" all extensions 1394# "readahead" all extensions
1318sub cache_extensions { 1395sub cache_extensions {
1319 my $grp = IO::AIO::aio_group; 1396 my $grp = IO::AIO::aio_group;
1320 1397
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1398 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322 for (grep /\.ext$/, @{$_[0]}) { 1399 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1400 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 } 1401 }
1325 }; 1402 };
1326 1403
1327 $grp 1404 $grp
1328} 1405}
1329 1406
1330sub load_extensions { 1407sub load_extensions {
1408 info "loading extensions...";
1409
1331 cf::sync_job { 1410 cf::sync_job {
1332 my %todo; 1411 my %todo;
1333 1412
1334 for my $path (<$LIBDIR/*.ext>) { 1413 for my $path (<$LIBDIR/*.ext>) {
1335 next unless -r $path; 1414 next unless -r $path;
1353 1432
1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1433 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1434 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1356 1435
1357 $ext{source} = 1436 $ext{source} =
1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1437 "package $pkg; use common::sense;\n"
1359 . "#line 1 \"$path\"\n{\n" 1438 . "#line 1 \"$path\"\n{\n"
1360 . $source 1439 . $source
1361 . "\n};\n1"; 1440 . "\n};\n1";
1362 1441
1363 $todo{$base} = \%ext; 1442 $todo{$base} = \%ext;
1364 } 1443 }
1365 1444
1445 my $pass = 0;
1366 my %done; 1446 my %done;
1367 while (%todo) { 1447 while (%todo) {
1368 my $progress; 1448 my $progress;
1369 1449
1450 ++$pass;
1451
1452 ext:
1370 while (my ($k, $v) = each %todo) { 1453 while (my ($k, $v) = each %todo) {
1371 for (split /,\s*/, $v->{meta}{depends}) { 1454 for (split /,\s*/, $v->{meta}{depends}) {
1372 goto skip 1455 next ext
1373 unless exists $done{$_}; 1456 unless exists $done{$_};
1374 } 1457 }
1375 1458
1376 warn "... loading '$k' into '$v->{pkg}'\n"; 1459 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1377 1460
1378 unless (eval $v->{source}) { 1461 my $active = eval $v->{source};
1462
1463 if (length $@) {
1379 my $msg = $@ ? "$v->{path}: $@\n" 1464 error "$v->{path}: $@\n";
1380 : "$v->{base}: extension inactive.\n";
1381 1465
1382 if (exists $v->{meta}{mandatory}) {
1383 warn $msg;
1384 cf::cleanup "mandatory extension failed to load, exiting."; 1466 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1385 } 1467 if exists $v->{meta}{mandatory};
1386 1468
1387 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;
1388 } 1478 }
1389
1390 $done{$k} = delete $todo{$k};
1391 push @EXTS, $v->{pkg};
1392 $progress = 1;
1393 } 1479 }
1394 1480
1395 skip: 1481 unless ($progress) {
1396 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1482 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1397 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 }
1398 } 1489 }
1399 }; 1490 };
1400} 1491}
1401 1492
1402############################################################################# 1493#############################################################################
1486 $cf::PLAYER{$login} = $pl 1577 $cf::PLAYER{$login} = $pl
1487 } 1578 }
1488 } 1579 }
1489} 1580}
1490 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
1491sub save($) { 1595sub save($) {
1492 my ($pl) = @_; 1596 my ($pl) = @_;
1493 1597
1494 return if $pl->{deny_save}; 1598 return if $pl->{deny_save};
1495 1599
1500 1604
1501 aio_mkdir playerdir $pl, 0770; 1605 aio_mkdir playerdir $pl, 0770;
1502 $pl->{last_save} = $cf::RUNTIME; 1606 $pl->{last_save} = $cf::RUNTIME;
1503 1607
1504 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];
1505 1612
1506 $pl->save_pl ($path); 1613 $pl->save_pl ($path);
1507 cf::cede_to_tick; 1614 cf::cede_to_tick;
1508} 1615}
1509 1616
1545 $pl->{deny_save} = 1; 1652 $pl->{deny_save} = 1;
1546 $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
1547 1654
1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1655 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1549 $pl->deactivate; 1656 $pl->deactivate;
1657
1550 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;
1551 $pl->ob->check_score; 1659 ext::highscore::check ($pl->ob);
1660
1552 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1661 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1553 $pl->ns->destroy if $pl->ns; 1662 $pl->ns->destroy if $pl->ns;
1554 1663
1555 my $path = playerdir $pl; 1664 my $path = playerdir $pl;
1556 my $temp = "$path~$cf::RUNTIME~deleting~"; 1665 my $temp = "$path~$cf::RUNTIME~deleting~";
1611 \@logins 1720 \@logins
1612} 1721}
1613 1722
1614=item $player->maps 1723=item $player->maps
1615 1724
1725=item cf::player::maps $login
1726
1616Returns an arrayref of map paths that are private for this 1727Returns an arrayref of map paths that are private for this
1617player. May block. 1728player. May block.
1618 1729
1619=cut 1730=cut
1620 1731
1682=cut 1793=cut
1683 1794
1684sub find_by_path($) { 1795sub find_by_path($) {
1685 my ($path) = @_; 1796 my ($path) = @_;
1686 1797
1798 $path =~ s/^~[^\/]*//; # skip ~login
1799
1687 my ($match, $specificity); 1800 my ($match, $specificity);
1688 1801
1689 for my $region (list) { 1802 for my $region (list) {
1690 if ($region->{match} && $path =~ $region->{match}) { 1803 if ($region->{match} && $path =~ $region->{match}) {
1691 ($match, $specificity) = ($region, $region->specificity) 1804 ($match, $specificity) = ($region, $region->specificity)
1722 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
1723 1836
1724 # mit "rum" bekleckern, nicht 1837 # mit "rum" bekleckern, nicht
1725 $self->_create_random_map ( 1838 $self->_create_random_map (
1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1839 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1840 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1841 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1729 $rmp->{exit_on_final_map}, 1842 $rmp->{exit_on_final_map},
1730 $rmp->{xsize}, $rmp->{ysize}, 1843 $rmp->{xsize}, $rmp->{ysize},
1731 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1844 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1732 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1845 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1747 1860
1748sub register { 1861sub register {
1749 my (undef, $regex, $prio) = @_; 1862 my (undef, $regex, $prio) = @_;
1750 my $pkg = caller; 1863 my $pkg = caller;
1751 1864
1752 no strict;
1753 push @{"$pkg\::ISA"}, __PACKAGE__; 1865 push @{"$pkg\::ISA"}, __PACKAGE__;
1754 1866
1755 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1867 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1756} 1868}
1757 1869
1758# also paths starting with '/' 1870# also paths starting with '/'
1759$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1871$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1760 1872
1761sub thawer_merge { 1873sub thawer_merge {
1762 my ($self, $merge) = @_; 1874 my ($self, $merge) = @_;
1763 1875
1764 # we have to keep some variables in memory intact 1876 # we have to keep some variables in memory intact
1769} 1881}
1770 1882
1771sub normalise { 1883sub normalise {
1772 my ($path, $base) = @_; 1884 my ($path, $base) = @_;
1773 1885
1774 $path = "$path"; # make sure its a string 1886 $path = "$path"; # make sure it's a string
1775 1887
1776 $path =~ s/\.map$//; 1888 $path =~ s/\.map$//;
1777 1889
1778 # map plan: 1890 # map plan:
1779 # 1891 #
1818 $self->init; # pass $1 etc. 1930 $self->init; # pass $1 etc.
1819 return $self; 1931 return $self;
1820 } 1932 }
1821 } 1933 }
1822 1934
1823 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1935 Carp::cluck "unable to resolve path '$path' (base '$base')";
1824 () 1936 ()
1825} 1937}
1826 1938
1827sub init { 1939sub init {
1828 my ($self) = @_; 1940 my ($self) = @_;
1950} 2062}
1951 2063
1952sub find; 2064sub find;
1953sub find { 2065sub find {
1954 my ($path, $origin) = @_; 2066 my ($path, $origin) = @_;
2067
2068 cf::cede_to_tick;
1955 2069
1956 $path = normalise $path, $origin && $origin->path; 2070 $path = normalise $path, $origin && $origin->path;
1957 2071
1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2072 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1959 my $guard2 = cf::lock_acquire "map_find:$path"; 2073 my $guard2 = cf::lock_acquire "map_find:$path";
1978 2092
1979 $cf::MAP{$path} = $map 2093 $cf::MAP{$path} = $map
1980 } 2094 }
1981} 2095}
1982 2096
1983sub pre_load { } 2097sub pre_load { }
1984sub post_load { } 2098#sub post_load { } # XS
1985 2099
1986sub load { 2100sub load {
1987 my ($self) = @_; 2101 my ($self) = @_;
1988 2102
1989 local $self->{deny_reset} = 1; # loading can take a long time 2103 local $self->{deny_reset} = 1; # loading can take a long time
2046 } 2160 }
2047 2161
2048 $self->post_load; 2162 $self->post_load;
2049} 2163}
2050 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
2051sub customise_for { 2168sub customise_for {
2052 my ($self, $ob) = @_; 2169 my ($self, $ob) = @_;
2053 2170
2054 return find "~" . $ob->name . "/" . $self->{path} 2171 return find "~" . $ob->name . "/" . $self->{path}
2055 if $self->per_player; 2172 if $self->per_player;
2071 or next; 2188 or next;
2072 $neigh = find $neigh, $map 2189 $neigh = find $neigh, $map
2073 or next; 2190 or next;
2074 $neigh->load; 2191 $neigh->load;
2075 2192
2193 # now find the diagonal neighbours
2076 push @neigh, 2194 push @neigh,
2077 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2195 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2078 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2196 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2079 } 2197 }
2080 2198
2087} 2205}
2088 2206
2089sub find_sync { 2207sub find_sync {
2090 my ($path, $origin) = @_; 2208 my ($path, $origin) = @_;
2091 2209
2092 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
2093} 2214}
2094 2215
2095sub do_load_sync { 2216sub do_load_sync {
2096 my ($map) = @_; 2217 my ($map) = @_;
2097 2218
2098 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2219 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2099 if $Coro::current == $Coro::main; 2220 if $Coro::current == $Coro::main;
2100 2221
2101 cf::sync_job { $map->load }; 2222 $map->load;
2102} 2223}
2103 2224
2104our %MAP_PREFETCH; 2225our %MAP_PREFETCH;
2105our $MAP_PREFETCHER = undef; 2226our $MAP_PREFETCHER = undef;
2106 2227
2132 $MAP_PREFETCHER->prio (6); 2253 $MAP_PREFETCHER->prio (6);
2133 2254
2134 () 2255 ()
2135} 2256}
2136 2257
2258# common code, used by both ->save and ->swapout
2137sub save { 2259sub _save {
2138 my ($self) = @_; 2260 my ($self) = @_;
2139
2140 my $lock = cf::lock_acquire "map_data:$self->{path}";
2141 2261
2142 $self->{last_save} = $cf::RUNTIME; 2262 $self->{last_save} = $cf::RUNTIME;
2143 2263
2144 return unless $self->dirty; 2264 return unless $self->dirty;
2145 2265
2165 } else { 2285 } else {
2166 $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);
2167 } 2287 }
2168} 2288}
2169 2289
2290sub save {
2291 my ($self) = @_;
2292
2293 my $lock = cf::lock_acquire "map_data:$self->{path}";
2294
2295 $self->_save;
2296}
2297
2170sub swap_out { 2298sub swap_out {
2171 my ($self) = @_; 2299 my ($self) = @_;
2172 2300
2173 # save first because save cedes
2174 $self->save;
2175
2176 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2301 my $lock = cf::lock_acquire "map_data:$self->{path}";
2177 2302
2178 return if $self->players;
2179 return if $self->in_memory != cf::MAP_ACTIVE; 2303 return if $self->in_memory != cf::MAP_ACTIVE;
2180 return if $self->{deny_save}; 2304 return if $self->{deny_save};
2305 return if $self->players;
2181 2306
2307 # first deactivate the map and "unlink" it from the core
2308 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP;
2182 $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};
2183 2357
2184 $self->deactivate; 2358 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP; 2359 $_->clear_links_to ($self) for values %cf::MAP;
2186 $self->clear; 2360 $self->clear;
2187}
2188
2189sub reset_at {
2190 my ($self) = @_;
2191
2192 # TODO: safety, remove and allow resettable per-player maps
2193 return 1e99 if $self->{deny_reset};
2194
2195 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2196 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2197
2198 $time + $to
2199}
2200
2201sub should_reset {
2202 my ($self) = @_;
2203
2204 $self->reset_at <= $cf::RUNTIME
2205}
2206
2207sub reset {
2208 my ($self) = @_;
2209
2210 my $lock = cf::lock_acquire "map_data:$self->{path}";
2211
2212 return if $self->players;
2213
2214 warn "resetting map ", $self->path;
2215
2216 $self->in_memory (cf::MAP_SWAPPED);
2217
2218 # need to save uniques path
2219 unless ($self->{deny_save}) {
2220 my $uniq = $self->uniq_path; utf8::encode $uniq;
2221
2222 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2223 if $uniq;
2224 }
2225
2226 delete $cf::MAP{$self->path};
2227
2228 $self->deactivate;
2229 $_->clear_links_to ($self) for values %cf::MAP;
2230 $self->clear;
2231 2361
2232 $self->unlink_save; 2362 $self->unlink_save;
2233 $self->destroy; 2363 $self->destroy;
2234} 2364}
2235 2365
2243 2373
2244 delete $cf::MAP{$self->path}; 2374 delete $cf::MAP{$self->path};
2245 2375
2246 $self->unlink_save; 2376 $self->unlink_save;
2247 2377
2248 bless $self, "cf::map"; 2378 bless $self, "cf::map::wrap";
2249 delete $self->{deny_reset}; 2379 delete $self->{deny_reset};
2250 $self->{deny_save} = 1; 2380 $self->{deny_save} = 1;
2251 $self->reset_timeout (1); 2381 $self->reset_timeout (1);
2252 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2382 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2253 2383
2310 : normalise $_ 2440 : normalise $_
2311 } @{ aio_readdir $UNIQUEDIR or [] } 2441 } @{ aio_readdir $UNIQUEDIR or [] }
2312 ] 2442 ]
2313} 2443}
2314 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
2315=back 2477=back
2316 2478
2317=head3 cf::object 2479=head3 cf::object
2318 2480
2319=cut 2481=cut
2384 2546
2385our $SAY_CHANNEL = { 2547our $SAY_CHANNEL = {
2386 id => "say", 2548 id => "say",
2387 title => "Map", 2549 title => "Map",
2388 reply => "say ", 2550 reply => "say ",
2389 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2551 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2390}; 2552};
2391 2553
2392our $CHAT_CHANNEL = { 2554our $CHAT_CHANNEL = {
2393 id => "chat", 2555 id => "chat",
2394 title => "Chat", 2556 title => "Chat",
2451 2613
2452Freezes 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}>).
2453 2615
2454The 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.
2455for 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,
2456though, 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
2457map. 2619map.
2458 2620
2459Will never block. 2621Will never block.
2460 2622
2461=item $player_object->leave_link ($map, $x, $y) 2623=item $player_object->leave_link ($map, $x, $y)
2482sub cf::object::player::enter_link { 2644sub cf::object::player::enter_link {
2483 my ($self) = @_; 2645 my ($self) = @_;
2484 2646
2485 $self->deactivate_recursive; 2647 $self->deactivate_recursive;
2486 2648
2649 ++$self->{_link_recursion};
2650
2487 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2651 return if UNIVERSAL::isa $self->map, "ext::map_link";
2488 2652
2489 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2653 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2490 if $self->map && $self->map->{path} ne "{link}"; 2654 if $self->map && $self->map->{path} ne "{link}";
2491 2655
2492 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2656 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2493} 2657}
2494 2658
2495sub cf::object::player::leave_link { 2659sub cf::object::player::leave_link {
2496 my ($self, $map, $x, $y) = @_; 2660 my ($self, $map, $x, $y) = @_;
2497 2661
2514 ($x, $y) = (-1, -1) 2678 ($x, $y) = (-1, -1)
2515 unless (defined $x) && (defined $y); 2679 unless (defined $x) && (defined $y);
2516 2680
2517 # use -1 or undef as default coordinates, not 0, 0 2681 # use -1 or undef as default coordinates, not 0, 0
2518 ($x, $y) = ($map->enter_x, $map->enter_y) 2682 ($x, $y) = ($map->enter_x, $map->enter_y)
2519 if $x <=0 && $y <= 0; 2683 if $x <= 0 && $y <= 0;
2520 2684
2521 $map->load; 2685 $map->load;
2522 $map->load_neighbours; 2686 $map->load_neighbours;
2523 2687
2524 return unless $self->contr->active; 2688 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2526 $self->activate_recursive;
2527 2689
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2690 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $self->enter_map ($map, $x, $y); 2691 if ($self->enter_map ($map, $x, $y)) {
2530} 2692 # entering was successful
2693 delete $self->{_link_recursion};
2694 # only activate afterwards, to support waiting in hooks
2695 $self->activate_recursive;
2696 }
2531 2697
2698}
2699
2532=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)]])
2533 2701
2534Moves 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
2535her, loading and preparing them map, calling the provided $check callback 2703her, loading and preparing them map, calling the provided $check callback
2536that 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
2537the 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
2544 2712
2545our $GOTOGEN; 2713our $GOTOGEN;
2546 2714
2547sub cf::object::player::goto { 2715sub cf::object::player::goto {
2548 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 }
2549 2723
2550 # 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
2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2725 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2552 2726
2553 $self->enter_link; 2727 $self->enter_link;
2577 my $map = eval { 2751 my $map = eval {
2578 my $map = defined $path ? cf::map::find $path : undef; 2752 my $map = defined $path ? cf::map::find $path : undef;
2579 2753
2580 if ($map) { 2754 if ($map) {
2581 $map = $map->customise_for ($self); 2755 $map = $map->customise_for ($self);
2582 $map = $check->($map) if $check && $map; 2756 $map = $check->($map, $x, $y, $self) if $check && $map;
2583 } else { 2757 } else {
2584 $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);
2585 } 2759 }
2586 2760
2587 $map 2761 $map
2595 if ($gen == $self->{_goto_generation}) { 2769 if ($gen == $self->{_goto_generation}) {
2596 delete $self->{_goto_generation}; 2770 delete $self->{_goto_generation};
2597 $self->leave_link ($map, $x, $y); 2771 $self->leave_link ($map, $x, $y);
2598 } 2772 }
2599 2773
2600 $done->() if $done; 2774 $done->($self) if $done;
2601 })->prio (1); 2775 })->prio (1);
2602} 2776}
2603 2777
2604=item $player_object->enter_exit ($exit_object) 2778=item $player_object->enter_exit ($exit_object)
2605 2779
2698 $self->message ("Something went wrong deep within the deliantra server. " 2872 $self->message ("Something went wrong deep within the deliantra server. "
2699 . "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. "
2700 . "Please report this to the dungeon master!", 2874 . "Please report this to the dungeon master!",
2701 cf::NDI_UNIQUE | cf::NDI_RED); 2875 cf::NDI_UNIQUE | cf::NDI_RED);
2702 2876
2703 warn "ERROR in enter_exit: $@"; 2877 error "ERROR in enter_exit: $@";
2704 $self->leave_link; 2878 $self->leave_link;
2705 } 2879 }
2706 })->prio (1); 2880 })->prio (1);
2707} 2881}
2708 2882
2720sub cf::client::send_drawinfo { 2894sub cf::client::send_drawinfo {
2721 my ($self, $text, $flags) = @_; 2895 my ($self, $text, $flags) = @_;
2722 2896
2723 utf8::encode $text; 2897 utf8::encode $text;
2724 $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);
2725} 2924}
2726 2925
2727=item $client->send_msg ($channel, $msg, $color, [extra...]) 2926=item $client->send_msg ($channel, $msg, $color, [extra...])
2728 2927
2729Send 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
2733 2932
2734=cut 2933=cut
2735 2934
2736# non-persistent channels (usually the info channel) 2935# non-persistent channels (usually the info channel)
2737our %CHANNEL = ( 2936our %CHANNEL = (
2937 "c/motd" => {
2938 id => "infobox",
2939 title => "MOTD",
2940 reply => undef,
2941 tooltip => "The message of the day",
2942 },
2738 "c/identify" => { 2943 "c/identify" => {
2739 id => "infobox", 2944 id => "infobox",
2740 title => "Identify", 2945 title => "Identify",
2741 reply => undef, 2946 reply => undef,
2742 tooltip => "Items recently identified", 2947 tooltip => "Items recently identified",
2744 "c/examine" => { 2949 "c/examine" => {
2745 id => "infobox", 2950 id => "infobox",
2746 title => "Examine", 2951 title => "Examine",
2747 reply => undef, 2952 reply => undef,
2748 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",
2749 }, 2960 },
2750 "c/book" => { 2961 "c/book" => {
2751 id => "infobox", 2962 id => "infobox",
2752 title => "Book", 2963 title => "Book",
2753 reply => undef, 2964 reply => undef,
2769 id => "infobox", 2980 id => "infobox",
2770 title => "Body Parts", 2981 title => "Body Parts",
2771 reply => undef, 2982 reply => undef,
2772 tooltip => "Shows which body parts you posess and are available", 2983 tooltip => "Shows which body parts you posess and are available",
2773 }, 2984 },
2985 "c/statistics" => {
2986 id => "infobox",
2987 title => "Statistics",
2988 reply => undef,
2989 tooltip => "Shows your primary statistics",
2990 },
2774 "c/skills" => { 2991 "c/skills" => {
2775 id => "infobox", 2992 id => "infobox",
2776 title => "Skills", 2993 title => "Skills",
2777 reply => undef, 2994 reply => undef,
2778 tooltip => "Shows your experience per skill and item power", 2995 tooltip => "Shows your experience per skill and item power",
2996 },
2997 "c/shopitems" => {
2998 id => "infobox",
2999 title => "Shop Items",
3000 reply => undef,
3001 tooltip => "Shows the items currently for sale in this shop",
3002 },
3003 "c/resistances" => {
3004 id => "infobox",
3005 title => "Resistances",
3006 reply => undef,
3007 tooltip => "Shows your resistances",
3008 },
3009 "c/pets" => {
3010 id => "infobox",
3011 title => "Pets",
3012 reply => undef,
3013 tooltip => "Shows information abotu your pets/a specific pet",
3014 },
3015 "c/perceiveself" => {
3016 id => "infobox",
3017 title => "Perceive Self",
3018 reply => undef,
3019 tooltip => "You gained detailed knowledge about yourself",
2779 }, 3020 },
2780 "c/uptime" => { 3021 "c/uptime" => {
2781 id => "infobox", 3022 id => "infobox",
2782 title => "Uptime", 3023 title => "Uptime",
2783 reply => undef, 3024 reply => undef,
2839 my $pkt = "msg " 3080 my $pkt = "msg "
2840 . $self->{json_coder}->encode ( 3081 . $self->{json_coder}->encode (
2841 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3082 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2842 ); 3083 );
2843 3084
2844 # try lzf for large packets
2845 $pkt = "lzf " . Compress::LZF::compress $pkt
2846 if 1024 <= length $pkt and $self->{can_lzf};
2847
2848 # split very large packets
2849 if (8192 < length $pkt and $self->{can_lzf}) {
2850 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2851 $pkt = "frag";
2852 }
2853
2854 $self->send_packet ($pkt); 3085 $self->send_big_packet ($pkt);
2855} 3086}
2856 3087
2857=item $client->ext_msg ($type, @msg) 3088=item $client->ext_msg ($type, @msg)
2858 3089
2859Sends an ext event to the client. 3090Sends an ext event to the client.
2862 3093
2863sub cf::client::ext_msg($$@) { 3094sub cf::client::ext_msg($$@) {
2864 my ($self, $type, @msg) = @_; 3095 my ($self, $type, @msg) = @_;
2865 3096
2866 if ($self->extcmd == 2) { 3097 if ($self->extcmd == 2) {
2867 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3098 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2868 } elsif ($self->extcmd == 1) { # TODO: remove 3099 } elsif ($self->extcmd == 1) { # TODO: remove
2869 push @msg, msgtype => "event_$type"; 3100 push @msg, msgtype => "event_$type";
2870 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2871 } 3102 }
2872} 3103}
2873 3104
2874=item $client->ext_reply ($msgid, @msg) 3105=item $client->ext_reply ($msgid, @msg)
2875 3106
2879 3110
2880sub cf::client::ext_reply($$@) { 3111sub cf::client::ext_reply($$@) {
2881 my ($self, $id, @msg) = @_; 3112 my ($self, $id, @msg) = @_;
2882 3113
2883 if ($self->extcmd == 2) { 3114 if ($self->extcmd == 2) {
2884 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2885 } elsif ($self->extcmd == 1) { 3116 } elsif ($self->extcmd == 1) {
2886 #TODO: version 1, remove 3117 #TODO: version 1, remove
2887 unshift @msg, msgtype => "reply", msgid => $id; 3118 unshift @msg, msgtype => "reply", msgid => $id;
2888 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3119 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2889 } 3120 }
2890} 3121}
2891 3122
2892=item $success = $client->query ($flags, "text", \&cb) 3123=item $success = $client->query ($flags, "text", \&cb)
2893 3124
2964 3195
2965 $ns->ext_reply ($reply, @reply) 3196 $ns->ext_reply ($reply, @reply)
2966 if $reply; 3197 if $reply;
2967 3198
2968 } else { 3199 } else {
2969 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";
2970 } 3201 }
2971 3202
2972 cf::override; 3203 cf::override;
2973 }, 3204 },
2974); 3205);
2994 3225
2995 $coro 3226 $coro
2996} 3227}
2997 3228
2998cf::client->attach ( 3229cf::client->attach (
2999 on_destroy => sub { 3230 on_client_destroy => sub {
3000 my ($ns) = @_; 3231 my ($ns) = @_;
3001 3232
3002 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3233 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3003 }, 3234 },
3004); 3235);
3020our $safe_hole = new Safe::Hole; 3251our $safe_hole = new Safe::Hole;
3021 3252
3022$SIG{FPE} = 'IGNORE'; 3253$SIG{FPE} = 'IGNORE';
3023 3254
3024$safe->permit_only (Opcode::opset qw( 3255$safe->permit_only (Opcode::opset qw(
3025 :base_core :base_mem :base_orig :base_math 3256 :base_core :base_mem :base_orig :base_math :base_loop
3026 grepstart grepwhile mapstart mapwhile 3257 grepstart grepwhile mapstart mapwhile
3027 sort time 3258 sort time
3028)); 3259));
3029 3260
3030# here we export the classes and methods available to script code 3261# here we export the classes and methods available to script code
3034The following functions and methods are available within a safe environment: 3265The following functions and methods are available within a safe environment:
3035 3266
3036 cf::object 3267 cf::object
3037 contr pay_amount pay_player map x y force_find force_add destroy 3268 contr pay_amount pay_player map x y force_find force_add destroy
3038 insert remove name archname title slaying race decrease split 3269 insert remove name archname title slaying race decrease split
3270 value
3039 3271
3040 cf::object::player 3272 cf::object::player
3041 player 3273 player
3042 3274
3043 cf::player 3275 cf::player
3049=cut 3281=cut
3050 3282
3051for ( 3283for (
3052 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3284 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3053 insert remove inv nrof name archname title slaying race 3285 insert remove inv nrof name archname title slaying race
3054 decrease split destroy change_exp)], 3286 decrease split destroy change_exp value msg lore send_msg)],
3055 ["cf::object::player" => qw(player)], 3287 ["cf::object::player" => qw(player)],
3056 ["cf::player" => qw(peaceful)], 3288 ["cf::player" => qw(peaceful send_msg)],
3057 ["cf::map" => qw(trigger)], 3289 ["cf::map" => qw(trigger)],
3058) { 3290) {
3059 no strict 'refs';
3060 my ($pkg, @funs) = @$_; 3291 my ($pkg, @funs) = @$_;
3061 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3292 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3062 for @funs; 3293 for @funs;
3063} 3294}
3064 3295
3079 3310
3080 my $qcode = $code; 3311 my $qcode = $code;
3081 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3312 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3082 $qcode =~ s/\n/\\n/g; 3313 $qcode =~ s/\n/\\n/g;
3083 3314
3315 %vars = (_dummy => 0) unless %vars;
3316
3317 my @res;
3084 local $_; 3318 local $_;
3085 local @safe::cf::_safe_eval_args = values %vars;
3086 3319
3087 my $eval = 3320 my $eval =
3088 "do {\n" 3321 "do {\n"
3089 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3322 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3090 . "#line 0 \"{$qcode}\"\n" 3323 . "#line 0 \"{$qcode}\"\n"
3091 . $code 3324 . $code
3092 . "\n}" 3325 . "\n}"
3093 ; 3326 ;
3094 3327
3328 if ($CFG{safe_eval}) {
3095 sub_generation_inc; 3329 sub_generation_inc;
3330 local @safe::cf::_safe_eval_args = values %vars;
3096 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3331 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3097 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 }
3098 3337
3099 if ($@) { 3338 if ($@) {
3100 warn "$@"; 3339 warn "$@",
3101 warn "while executing safe code '$code'\n"; 3340 "while executing safe code '$code'\n",
3102 warn "with arguments " . (join " ", %vars) . "\n"; 3341 "with arguments " . (join " ", %vars) . "\n";
3103 } 3342 }
3104 3343
3105 wantarray ? @res : $res[0] 3344 wantarray ? @res : $res[0]
3106} 3345}
3107 3346
3121=cut 3360=cut
3122 3361
3123sub register_script_function { 3362sub register_script_function {
3124 my ($fun, $cb) = @_; 3363 my ($fun, $cb) = @_;
3125 3364
3126 no strict 'refs'; 3365 $fun = "safe::$fun" if $CFG{safe_eval};
3127 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3366 *$fun = $safe_hole->wrap ($cb);
3128} 3367}
3129 3368
3130=back 3369=back
3131 3370
3132=cut 3371=cut
3141 # for this (global event?) 3380 # for this (global event?)
3142 %ext::player_env::MUSIC_FACE_CACHE = (); 3381 %ext::player_env::MUSIC_FACE_CACHE = ();
3143 3382
3144 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3383 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3145 3384
3146 warn "loading facedata from $path\n"; 3385 trace "loading facedata from $path\n";
3147 3386
3148 my $facedata;
3149 0 < aio_load $path, $facedata 3387 0 < aio_load $path, my $facedata
3150 or die "$path: $!"; 3388 or die "$path: $!";
3151 3389
3152 $facedata = Coro::Storable::thaw $facedata; 3390 $facedata = Coro::Storable::thaw $facedata;
3153 3391
3154 $facedata->{version} == 2 3392 $facedata->{version} == 2
3155 or cf::cleanup "$path: version mismatch, cannot proceed."; 3393 or cf::cleanup "$path: version mismatch, cannot proceed.";
3156 3394
3157 # 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]);
3158 $facedata->{resource}{"res/exp_table"} = { 3397 $facedata->{resource}{"res/exp_table"} = {
3159 type => FT_RSRC, 3398 type => FT_RSRC,
3160 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),
3161 }; 3401 };
3162 cf::cede_to_tick; 3402 cf::cede_to_tick;
3163 3403
3164 { 3404 {
3165 my $faces = $facedata->{faceinfo}; 3405 my $faces = $facedata->{faceinfo};
3167 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
3168 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3408 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3169 3409
3170 cf::face::set_visibility $idx, $info->{visibility}; 3410 cf::face::set_visibility $idx, $info->{visibility};
3171 cf::face::set_magicmap $idx, $info->{magicmap}; 3411 cf::face::set_magicmap $idx, $info->{magicmap};
3172 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3412 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3173 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3413 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3174 3414
3175 cf::cede_to_tick; 3415 cf::cede_to_tick;
3176 } 3416 }
3177 3417
3178 while (my ($face, $info) = each %$faces) { 3418 while (my ($face, $info) = each %$faces) {
3183 3423
3184 if (my $smooth = cf::face::find $info->{smooth}) { 3424 if (my $smooth = cf::face::find $info->{smooth}) {
3185 cf::face::set_smooth $idx, $smooth; 3425 cf::face::set_smooth $idx, $smooth;
3186 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3426 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3187 } else { 3427 } else {
3188 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3428 error "smooth face '$info->{smooth}' not found for face '$face'";
3189 } 3429 }
3190 3430
3191 cf::cede_to_tick; 3431 cf::cede_to_tick;
3192 } 3432 }
3193 } 3433 }
3202 3442
3203 cf::anim::invalidate_all; # d'oh 3443 cf::anim::invalidate_all; # d'oh
3204 } 3444 }
3205 3445
3206 { 3446 {
3207 # TODO: for gcfclient pleasure, we should give resources
3208 # that gcfclient doesn't grok a >10000 face index.
3209 my $res = $facedata->{resource}; 3447 my $res = $facedata->{resource};
3210 3448
3211 while (my ($name, $info) = each %$res) { 3449 while (my ($name, $info) = each %$res) {
3212 if (defined $info->{type}) { 3450 if (defined $info->{type}) {
3213 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3451 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3214 my $data;
3215 3452
3216 if ($info->{type} & 1) { 3453 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3217 # prepend meta info
3218
3219 my $meta = $enc->encode ({
3220 name => $name,
3221 %{ $info->{meta} || {} },
3222 });
3223
3224 $data = pack "(w/a*)*", $meta, $info->{data};
3225 } else {
3226 $data = $info->{data};
3227 }
3228
3229 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3230 cf::face::set_type $idx, $info->{type}; 3454 cf::face::set_type $idx, $info->{type};
3231 } else { 3455 } else {
3232 $RESOURCE{$name} = $info; 3456 $RESOURCE{$name} = $info; # unused
3233 } 3457 }
3234 3458
3235 cf::cede_to_tick; 3459 cf::cede_to_tick;
3236 } 3460 }
3237 } 3461 }
3238 3462
3239 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3463 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3240 3464
3241 1 3465 1
3242} 3466}
3243
3244cf::global->attach (on_resource_update => sub {
3245 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3246 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3247
3248 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3249 my $sound = $soundconf->{compat}[$_]
3250 or next;
3251
3252 my $face = cf::face::find "sound/$sound->[1]";
3253 cf::sound::set $sound->[0] => $face;
3254 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3255 }
3256
3257 while (my ($k, $v) = each %{$soundconf->{event}}) {
3258 my $face = cf::face::find "sound/$v";
3259 cf::sound::set $k => $face;
3260 }
3261 }
3262});
3263 3467
3264register_exticmd fx_want => sub { 3468register_exticmd fx_want => sub {
3265 my ($ns, $want) = @_; 3469 my ($ns, $want) = @_;
3266 3470
3267 while (my ($k, $v) = each %$want) { 3471 while (my ($k, $v) = each %$want) {
3306sub reload_treasures { 3510sub reload_treasures {
3307 load_resource_file "$DATADIR/treasures" 3511 load_resource_file "$DATADIR/treasures"
3308 or die "unable to load treasurelists\n"; 3512 or die "unable to load treasurelists\n";
3309} 3513}
3310 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
3311sub reload_resources { 3538sub reload_resources {
3312 warn "reloading resource files...\n"; 3539 trace "reloading resource files...\n";
3313 3540
3541 reload_exp_table;
3542 reload_materials;
3314 reload_facedata; 3543 reload_facedata;
3544 reload_sound;
3315 reload_archetypes; 3545 reload_archetypes;
3316 reload_regions; 3546 reload_regions;
3317 reload_treasures; 3547 reload_treasures;
3318 3548
3319 warn "finished reloading resource files\n"; 3549 trace "finished reloading resource files\n";
3320} 3550}
3321 3551
3322sub reload_config { 3552sub reload_config {
3323 open my $fh, "<:utf8", "$CONFDIR/config" 3553 trace "reloading config file...\n";
3324 or return;
3325 3554
3326 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...
3327 *CFG = YAML::Load <$fh>; 3561 *CFG = YAML::XS::Load $config;
3328 3562
3329 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3563 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3330 3564
3331 $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};
3332 $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};
3333 3567
3334 if (exists $CFG{mlockall}) { 3568 if (exists $CFG{mlockall}) {
3357 3591
3358 seek $fh, 0, 0; 3592 seek $fh, 0, 0;
3359 print $fh $$; 3593 print $fh $$;
3360} 3594}
3361 3595
3596sub main_loop {
3597 trace "EV::loop starting\n";
3598 if (1) {
3599 EV::loop;
3600 }
3601 trace "EV::loop returned\n";
3602 goto &main_loop unless $REALLY_UNLOOP;
3603}
3604
3362sub main { 3605sub main {
3363 cf::init_globals; # initialise logging 3606 cf::init_globals; # initialise logging
3364 3607
3365 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3608 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3366 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.";
3367 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3610 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3368 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3611 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3369
3370 cf::init_experience;
3371 cf::init_anim;
3372 cf::init_attackmess;
3373 cf::init_dynamic;
3374 3612
3375 $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
3376 3614
3377 # we must not ever block the main coroutine 3615 # we must not ever block the main coroutine
3378 local $Coro::idle = sub { 3616 local $Coro::idle = sub {
3384 }; 3622 };
3385 3623
3386 evthread_start IO::AIO::poll_fileno; 3624 evthread_start IO::AIO::poll_fileno;
3387 3625
3388 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
3389 reload_resources; 3635 reload_resources;
3390 reload_config; 3636 reload_config;
3391 db_init; 3637 db_init;
3392 3638
3393 cf::load_settings;
3394 cf::load_materials;
3395 cf::init_uuid; 3639 cf::init_uuid;
3396 cf::init_signals; 3640 cf::init_signals;
3397 cf::init_commands;
3398 cf::init_skills; 3641 cf::init_skills;
3399 3642
3400 cf::init_beforeplay; 3643 cf::init_beforeplay;
3401 3644
3402 atomic; 3645 atomic;
3404 load_extensions; 3647 load_extensions;
3405 3648
3406 utime time, time, $RUNTIMEFILE; 3649 utime time, time, $RUNTIMEFILE;
3407 3650
3408 # no (long-running) fork's whatsoever before this point(!) 3651 # no (long-running) fork's whatsoever before this point(!)
3652 use POSIX ();
3409 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};
3410 3654
3411 (pop @POST_INIT)->(0) while @POST_INIT; 3655 (pop @POST_INIT)->(0) while @POST_INIT;
3412 }; 3656 };
3413 3657
3414 EV::loop; 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
3666 goto &main_loop;
3415} 3667}
3416 3668
3417############################################################################# 3669#############################################################################
3418# initialisation and cleanup 3670# initialisation and cleanup
3419 3671
3420# install some emergency cleanup handlers 3672# install some emergency cleanup handlers
3421BEGIN { 3673BEGIN {
3422 our %SIGWATCHER = (); 3674 our %SIGWATCHER = ();
3423 for my $signal (qw(INT HUP TERM)) { 3675 for my $signal (qw(INT HUP TERM)) {
3424 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3676 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3425 cf::cleanup "SIG$signal"; 3677 cf::cleanup "SIG$signal";
3426 }; 3678 };
3427 } 3679 }
3428} 3680}
3429 3681
3430sub write_runtime_sync { 3682sub write_runtime_sync {
3683 my $t0 = AE::time;
3684
3431 # first touch the runtime file to show we are still running: 3685 # first touch the runtime file to show we are still running:
3432 # the fsync below can take a very very long time. 3686 # the fsync below can take a very very long time.
3433 3687
3434 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3688 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3435 3689
3436 my $guard = cf::lock_acquire "write_runtime"; 3690 my $guard = cf::lock_acquire "write_runtime";
3437 3691
3438 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3692 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3439 or return; 3693 or return;
3440 3694
3441 my $value = $cf::RUNTIME + 90 + 10; 3695 my $value = $cf::RUNTIME + 90 + 10;
3442 # 10 is the runtime save interval, for a monotonic clock 3696 # 10 is the runtime save interval, for a monotonic clock
3443 # 60 allows for the watchdog to kill the server. 3697 # 60 allows for the watchdog to kill the server.
3456 or return; 3710 or return;
3457 3711
3458 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3712 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3459 and return; 3713 and return;
3460 3714
3461 warn "runtime file written.\n"; 3715 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3462 3716
3463 1 3717 1
3464} 3718}
3465 3719
3466our $uuid_lock; 3720our $uuid_lock;
3478 or return; 3732 or return;
3479 3733
3480 my $value = uuid_seq uuid_cur; 3734 my $value = uuid_seq uuid_cur;
3481 3735
3482 unless ($value) { 3736 unless ($value) {
3483 warn "cowardly refusing to write zero uuid value!\n"; 3737 info "cowardly refusing to write zero uuid value!\n";
3484 return; 3738 return;
3485 } 3739 }
3486 3740
3487 my $value = uuid_str $value + $uuid_skip; 3741 my $value = uuid_str $value + $uuid_skip;
3488 $uuid_skip = 0; 3742 $uuid_skip = 0;
3498 or return; 3752 or return;
3499 3753
3500 aio_rename "$uuid~", $uuid 3754 aio_rename "$uuid~", $uuid
3501 and return; 3755 and return;
3502 3756
3503 warn "uuid file written ($value).\n"; 3757 trace "uuid file written ($value).\n";
3504 3758
3505 1 3759 1
3506 3760
3507} 3761}
3508 3762
3514} 3768}
3515 3769
3516sub emergency_save() { 3770sub emergency_save() {
3517 my $freeze_guard = cf::freeze_mainloop; 3771 my $freeze_guard = cf::freeze_mainloop;
3518 3772
3519 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;
3520 3779
3521 cf::sync_job { 3780 cf::sync_job {
3522 # this is a trade-off: we want to be very quick here, so 3781 cf::write_runtime_sync; # external watchdog should not bark
3523 # save all maps without fsync, and later call a global sync
3524 # (which in turn might be very very slow)
3525 local $USE_FSYNC = 0;
3526 3782
3527 # use a peculiar iteration method to avoid tripping on perl 3783 # use a peculiar iteration method to avoid tripping on perl
3528 # refcount bugs in for. also avoids problems with players 3784 # refcount bugs in for. also avoids problems with players
3529 # and maps saved/destroyed asynchronously. 3785 # and maps saved/destroyed asynchronously.
3530 warn "emergency_perl_save: begin player save\n"; 3786 info "emergency_perl_save: begin player save\n";
3531 for my $login (keys %cf::PLAYER) { 3787 for my $login (keys %cf::PLAYER) {
3532 my $pl = $cf::PLAYER{$login} or next; 3788 my $pl = $cf::PLAYER{$login} or next;
3533 $pl->valid or next; 3789 $pl->valid or next;
3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3790 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3535 $pl->save; 3791 $pl->save;
3536 } 3792 }
3537 warn "emergency_perl_save: end player save\n"; 3793 info "emergency_perl_save: end player save\n";
3538 3794
3795 cf::write_runtime_sync; # external watchdog should not bark
3796
3539 warn "emergency_perl_save: begin map save\n"; 3797 info "emergency_perl_save: begin map save\n";
3540 for my $path (keys %cf::MAP) { 3798 for my $path (keys %cf::MAP) {
3541 my $map = $cf::MAP{$path} or next; 3799 my $map = $cf::MAP{$path} or next;
3542 $map->valid or next; 3800 $map->valid or next;
3543 $map->save; 3801 $map->save;
3544 } 3802 }
3545 warn "emergency_perl_save: end map save\n"; 3803 info "emergency_perl_save: end map save\n";
3546 3804
3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3547 warn "emergency_perl_save: begin database checkpoint\n"; 3807 info "emergency_perl_save: begin database checkpoint\n";
3548 BDB::db_env_txn_checkpoint $DB_ENV; 3808 BDB::db_env_txn_checkpoint $DB_ENV;
3549 warn "emergency_perl_save: end database checkpoint\n"; 3809 info "emergency_perl_save: end database checkpoint\n";
3550 3810
3551 warn "emergency_perl_save: begin write uuid\n"; 3811 info "emergency_perl_save: begin write uuid\n";
3552 write_uuid_sync 1; 3812 write_uuid_sync 1;
3553 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
3554 }; 3833 };
3555 3834
3556 warn "emergency_perl_save: starting sync()\n";
3557 IO::AIO::aio_sync sub {
3558 warn "emergency_perl_save: finished sync()\n";
3559 };
3560
3561 warn "emergency_perl_save: leave\n"; 3835 info "emergency_perl_save: leave\n";
3562} 3836}
3563 3837
3564sub post_cleanup { 3838sub post_cleanup {
3565 my ($make_core) = @_; 3839 my ($make_core) = @_;
3566 3840
3841 IO::AIO::flush;
3842
3567 warn Carp::longmess "post_cleanup backtrace" 3843 error Carp::longmess "post_cleanup backtrace"
3568 if $make_core; 3844 if $make_core;
3569 3845
3570 my $fh = pidfile; 3846 my $fh = pidfile;
3571 unlink $PIDFILE if <$fh> == $$; 3847 unlink $PIDFILE if <$fh> == $$;
3572} 3848}
3592 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3868 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3593 for my $name (keys %$leaf_symtab) { 3869 for my $name (keys %$leaf_symtab) {
3594 _gv_clear *{"$pkg$name"}; 3870 _gv_clear *{"$pkg$name"};
3595# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3871# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3596 } 3872 }
3597 warn "cleared package $pkg\n";#d#
3598} 3873}
3599 3874
3600sub do_reload_perl() { 3875sub do_reload_perl() {
3601 # can/must only be called in main 3876 # can/must only be called in main
3602 if ($Coro::current != $Coro::main) { 3877 unless (in_main) {
3603 warn "can only reload from main coroutine"; 3878 error "can only reload from main coroutine";
3604 return; 3879 return;
3605 } 3880 }
3606 3881
3607 return if $RELOAD++; 3882 return if $RELOAD++;
3608 3883
3609 my $t1 = EV::time; 3884 my $t1 = AE::time;
3610 3885
3611 while ($RELOAD) { 3886 while ($RELOAD) {
3887 cf::get_slot 0.1, -1, "reload_perl";
3612 warn "reloading..."; 3888 info "reloading...";
3613 3889
3614 warn "entering sync_job"; 3890 trace "entering sync_job";
3615 3891
3616 cf::sync_job { 3892 cf::sync_job {
3617 cf::write_runtime_sync; # external watchdog should not bark
3618 cf::emergency_save; 3893 #cf::emergency_save;
3619 cf::write_runtime_sync; # external watchdog should not bark
3620 3894
3621 warn "syncing database to disk";
3622 BDB::db_env_txn_checkpoint $DB_ENV;
3623
3624 # if anything goes wrong in here, we should simply crash as we already saved
3625
3626 warn "flushing outstanding aio requests";
3627 while (IO::AIO::nreqs || BDB::nreqs) {
3628 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3629 }
3630
3631 warn "cancelling all extension coros"; 3895 trace "cancelling all extension coros";
3632 $_->cancel for values %EXT_CORO; 3896 $_->cancel for values %EXT_CORO;
3633 %EXT_CORO = (); 3897 %EXT_CORO = ();
3634 3898
3635 warn "removing commands"; 3899 trace "removing commands";
3636 %COMMAND = (); 3900 %COMMAND = ();
3637 3901
3638 warn "removing ext/exti commands"; 3902 trace "removing ext/exti commands";
3639 %EXTCMD = (); 3903 %EXTCMD = ();
3640 %EXTICMD = (); 3904 %EXTICMD = ();
3641 3905
3642 warn "unloading/nuking all extensions"; 3906 trace "unloading/nuking all extensions";
3643 for my $pkg (@EXTS) { 3907 for my $pkg (@EXTS) {
3644 warn "... unloading $pkg"; 3908 trace "... unloading $pkg";
3645 3909
3646 if (my $cb = $pkg->can ("unload")) { 3910 if (my $cb = $pkg->can ("unload")) {
3647 eval { 3911 eval {
3648 $cb->($pkg); 3912 $cb->($pkg);
3649 1 3913 1
3650 } or warn "$pkg unloaded, but with errors: $@"; 3914 } or error "$pkg unloaded, but with errors: $@";
3651 } 3915 }
3652 3916
3653 warn "... clearing $pkg"; 3917 trace "... clearing $pkg";
3654 clear_package $pkg; 3918 clear_package $pkg;
3655 } 3919 }
3656 3920
3657 warn "unloading all perl modules loaded from $LIBDIR"; 3921 trace "unloading all perl modules loaded from $LIBDIR";
3658 while (my ($k, $v) = each %INC) { 3922 while (my ($k, $v) = each %INC) {
3659 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3923 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3660 3924
3661 warn "... unloading $k"; 3925 trace "... unloading $k";
3662 delete $INC{$k}; 3926 delete $INC{$k};
3663 3927
3664 $k =~ s/\.pm$//; 3928 $k =~ s/\.pm$//;
3665 $k =~ s/\//::/g; 3929 $k =~ s/\//::/g;
3666 3930
3669 } 3933 }
3670 3934
3671 clear_package $k; 3935 clear_package $k;
3672 } 3936 }
3673 3937
3674 warn "getting rid of safe::, as good as possible"; 3938 trace "getting rid of safe::, as good as possible";
3675 clear_package "safe::$_" 3939 clear_package "safe::$_"
3676 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);
3677 3941
3678 warn "unloading cf.pm \"a bit\""; 3942 trace "unloading cf.pm \"a bit\"";
3679 delete $INC{"cf.pm"}; 3943 delete $INC{"cf.pm"};
3680 delete $INC{"cf/pod.pm"}; 3944 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3681 3945
3682 # don't, removes xs symbols, too, 3946 # don't, removes xs symbols, too,
3683 # and global variables created in xs 3947 # and global variables created in xs
3684 #clear_package __PACKAGE__; 3948 #clear_package __PACKAGE__;
3685 3949
3686 warn "unload completed, starting to reload now"; 3950 info "unload completed, starting to reload now";
3687 3951
3688 warn "reloading cf.pm"; 3952 trace "reloading cf.pm";
3689 require cf; 3953 require cf;
3690 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3954 cf::_connect_to_perl_1;
3691 3955
3692 warn "loading config and database again"; 3956 trace "loading config and database again";
3693 cf::reload_config; 3957 cf::reload_config;
3694 3958
3695 warn "loading extensions"; 3959 trace "loading extensions";
3696 cf::load_extensions; 3960 cf::load_extensions;
3697 3961
3698 if ($REATTACH_ON_RELOAD) { 3962 if ($REATTACH_ON_RELOAD) {
3699 warn "reattaching attachments to objects/players"; 3963 trace "reattaching attachments to objects/players";
3700 _global_reattach; # objects, sockets 3964 _global_reattach; # objects, sockets
3701 warn "reattaching attachments to maps"; 3965 trace "reattaching attachments to maps";
3702 reattach $_ for values %MAP; 3966 reattach $_ for values %MAP;
3703 warn "reattaching attachments to players"; 3967 trace "reattaching attachments to players";
3704 reattach $_ for values %PLAYER; 3968 reattach $_ for values %PLAYER;
3705 } 3969 }
3706 3970
3707 warn "running post_init jobs"; 3971 trace "running post_init jobs";
3708 (pop @POST_INIT)->(1) while @POST_INIT; 3972 (pop @POST_INIT)->(1) while @POST_INIT;
3709 3973
3710 warn "leaving sync_job"; 3974 trace "leaving sync_job";
3711 3975
3712 1 3976 1
3713 } or do { 3977 } or do {
3714 warn $@; 3978 error $@;
3715 cf::cleanup "error while reloading, exiting."; 3979 cf::cleanup "error while reloading, exiting.";
3716 }; 3980 };
3717 3981
3718 warn "reloaded"; 3982 info "reloaded";
3719 --$RELOAD; 3983 --$RELOAD;
3720 } 3984 }
3721 3985
3722 $t1 = EV::time - $t1; 3986 $t1 = AE::time - $t1;
3723 warn "reload completed in ${t1}s\n"; 3987 info "reload completed in ${t1}s\n";
3724}; 3988};
3725 3989
3726our $RELOAD_WATCHER; # used only during reload 3990our $RELOAD_WATCHER; # used only during reload
3727 3991
3728sub reload_perl() { 3992sub reload_perl() {
3730 # coro crashes during coro_state_free->destroy here. 3994 # coro crashes during coro_state_free->destroy here.
3731 3995
3732 $RELOAD_WATCHER ||= cf::async { 3996 $RELOAD_WATCHER ||= cf::async {
3733 Coro::AIO::aio_wait cache_extensions; 3997 Coro::AIO::aio_wait cache_extensions;
3734 3998
3735 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3999 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3736 do_reload_perl; 4000 do_reload_perl;
3737 undef $RELOAD_WATCHER; 4001 undef $RELOAD_WATCHER;
3738 }; 4002 };
3739 }; 4003 };
3740} 4004}
3749 reload_perl; 4013 reload_perl;
3750 }; 4014 };
3751 } 4015 }
3752}; 4016};
3753 4017
3754unshift @INC, $LIBDIR; 4018#############################################################################
3755 4019
3756my $bug_warning = 0; 4020my $bug_warning = 0;
3757 4021
3758our @WAIT_FOR_TICK; 4022our @WAIT_FOR_TICK;
3759our @WAIT_FOR_TICK_BEGIN; 4023our @WAIT_FOR_TICK_BEGIN;
3760 4024
3761sub wait_for_tick { 4025sub wait_for_tick() {
3762 return if tick_inhibit || $Coro::current == $Coro::main; 4026 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3763 4027
3764 my $signal = new Coro::Signal; 4028 my $signal = new Coro::Signal;
3765 push @WAIT_FOR_TICK, $signal; 4029 push @WAIT_FOR_TICK, $signal;
3766 $signal->wait; 4030 $signal->wait;
3767} 4031}
3768 4032
3769sub wait_for_tick_begin { 4033sub wait_for_tick_begin() {
3770 return if tick_inhibit || $Coro::current == $Coro::main; 4034 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3771 4035
3772 my $signal = new Coro::Signal; 4036 my $signal = new Coro::Signal;
3773 push @WAIT_FOR_TICK_BEGIN, $signal; 4037 push @WAIT_FOR_TICK_BEGIN, $signal;
3774 $signal->wait; 4038 $signal->wait;
3775} 4039}
3781 return; 4045 return;
3782 } 4046 }
3783 4047
3784 cf::server_tick; # one server iteration 4048 cf::server_tick; # one server iteration
3785 4049
4050 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4051
3786 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4052 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3787 $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.;
3788 Coro::async_pool { 4054 Coro::async_pool {
3789 $Coro::current->{desc} = "runtime saver"; 4055 $Coro::current->{desc} = "runtime saver";
3790 write_runtime_sync 4056 write_runtime_sync
3791 or warn "ERROR: unable to write runtime file: $!"; 4057 or error "ERROR: unable to write runtime file: $!";
3792 }; 4058 };
3793 } 4059 }
3794 4060
3795 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4061 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3796 $sig->send; 4062 $sig->send;
3804 4070
3805 if (0) { 4071 if (0) {
3806 if ($NEXT_TICK) { 4072 if ($NEXT_TICK) {
3807 my $jitter = $TICK_START - $NEXT_TICK; 4073 my $jitter = $TICK_START - $NEXT_TICK;
3808 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4074 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3809 warn "jitter $JITTER\n";#d# 4075 debug "jitter $JITTER\n";#d#
3810 } 4076 }
3811 } 4077 }
3812} 4078}
3813 4079
3814{ 4080{
3815 # configure BDB 4081 # configure BDB
3816 4082
3817 BDB::min_parallel 8; 4083 BDB::min_parallel 16;
3818 BDB::max_poll_reqs $TICK * 0.1; 4084 BDB::max_poll_reqs $TICK * 0.1;
3819 $AnyEvent::BDB::WATCHER->priority (1); 4085 $AnyEvent::BDB::WATCHER->priority (1);
3820 4086
3821 unless ($DB_ENV) { 4087 unless ($DB_ENV) {
3822 $DB_ENV = BDB::db_env_create; 4088 $DB_ENV = BDB::db_env_create;
3902 LOG llevInfo, "[ABT] [suppressed]\n"; 4168 LOG llevInfo, "[ABT] [suppressed]\n";
3903 } 4169 }
3904} 4170}
3905 4171
3906# load additional modules 4172# load additional modules
3907use cf::pod; 4173require "cf/$_.pm" for @EXTRA_MODULES;
4174cf::_connect_to_perl_2;
3908 4175
3909END { cf::emergency_save } 4176END { cf::emergency_save }
3910 4177
39111 41781
3912 4179

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines