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.462 by root, Tue Dec 23 06:58:23 2008 UTC vs.
Revision 1.542 by root, Wed May 5 09:05:03 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);
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
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 process
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
209=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
210 242
211This array contains the results of the last C<invoke ()> call. When 243This 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 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
213that call. 245that call.
214 246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
215=back 253=back
216 254
217=cut 255=cut
218 256
219BEGIN { 257sub error(@) { LOG llevError, join "", @_ }
220 *CORE::GLOBAL::warn = sub { 258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
262
263$Coro::State::WARNHOOK = sub {
221 my $msg = join "", @_; 264 my $msg = join "", @_;
222 265
223 $msg .= "\n" 266 $msg .= "\n"
224 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
225 268
226 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 269 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
227 270
228 LOG llevError, $msg; 271 LOG llevWarn, $msg;
229 }; 272};
230}
231 273
232$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
234 276
235 if ($Coro::current == $Coro::main) {#d# 277 error Carp::longmess $_[0];
278
279 if (in_main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d# 281 return;#d#
238 }#d# 282 }#d#
239 283
240 # kill coroutine otherwise 284 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate 285 Coro::terminate
243}; 286};
244
245$SIG{__DIE__} = sub { }; #d#?
246 287
247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 288@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 289@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 290@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 291@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
264)) { 305)) {
265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
266} 307}
267 308
268$EV::DIED = sub { 309$EV::DIED = sub {
269 warn "error in event callback: @_"; 310 Carp::cluck "error in event callback: @_";
270}; 311};
271 312
272############################################################################# 313#############################################################################
273 314
274=head2 UTILITY FUNCTIONS 315=head2 UTILITY FUNCTIONS
371} 412}
372 413
373=item cf::periodic $interval, $cb 414=item cf::periodic $interval, $cb
374 415
375Like EV::periodic, but randomly selects a starting point so that the actions 416Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer. 417get spread over time.
377 418
378=cut 419=cut
379 420
380sub periodic($$) { 421sub periodic($$) {
381 my ($interval, $cb) = @_; 422 my ($interval, $cb) = @_;
398 439
399=cut 440=cut
400 441
401our @SLOT_QUEUE; 442our @SLOT_QUEUE;
402our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
403 445
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 448 $Coro::current->desc ("timeslot manager");
407 449
408 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
409 452
410 while () { 453 while () {
411 next_job: 454 next_job:
455
412 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 457
414 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 462 $job->[2]->send;
418 Coro::cede; 463 Coro::cede;
419 goto next_job; 464 goto next_job;
420 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 467 }
422 } 468 }
423 469
424 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive 471 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait; 473 $signal->wait;
428 } else { 474 } else {
475 $busy = 0;
429 Coro::schedule; 476 Coro::schedule;
430 } 477 }
431 } 478 }
432}; 479};
433 480
434sub get_slot($;$$) { 481sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 482 return if tick_inhibit || $Coro::current == $Coro::main;
436 483
437 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
438 485
439 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
440 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
441 489
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
470=cut 518=cut
471 519
472sub sync_job(&) { 520sub sync_job(&) {
473 my ($job) = @_; 521 my ($job) = @_;
474 522
475 if ($Coro::current == $Coro::main) { 523 if (in_main) {
476 my $time = EV::time; 524 my $time = AE::time;
477 525
478 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
480 528
481 LOG llevError, Carp::longmess "sync job";#d# 529 #LOG llevError, Carp::longmess "sync job";#d#
482 530
483 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
484 532
485 my $busy = 1; 533 my $busy = 1;
486 my @res; 534 my @res;
487 535
488 (async { 536 (async {
489 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
490 @res = eval { $job->() }; 538 @res = eval { $job->() };
491 warn $@ if $@; 539 error $@ if $@;
492 undef $busy; 540 undef $busy;
493 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
494 542
495 while ($busy) { 543 while ($busy) {
496 if (Coro::nready) { 544 if (Coro::nready) {
498 } else { 546 } else {
499 EV::loop EV::LOOP_ONESHOT; 547 EV::loop EV::LOOP_ONESHOT;
500 } 548 }
501 } 549 }
502 550
503 my $time = EV::time - $time; 551 my $time = AE::time - $time;
504 552
505 $TICK_START += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
506 554
507 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
508 } else { 556 } else {
552 reset_signals; 600 reset_signals;
553 &$cb 601 &$cb
554 }, @args; 602 }, @args;
555 603
556 wantarray ? @res : $res[-1] 604 wantarray ? @res : $res[-1]
605}
606
607sub objinfo {
608 (
609 "counter value" => cf::object::object_count,
610 "objects created" => cf::object::create_count,
611 "objects destroyed" => cf::object::destroy_count,
612 "freelist size" => cf::object::free_count,
613 "allocated objects" => cf::object::objects_size,
614 "active objects" => cf::object::actives_size,
615 )
557} 616}
558 617
559=item $coin = coin_from_name $name 618=item $coin = coin_from_name $name
560 619
561=cut 620=cut
598within each server. 657within each server.
599 658
600=cut 659=cut
601 660
602sub db_table($) { 661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
603 my ($name) = @_; 665 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV; 666 my $db = BDB::db_create $DB_ENV;
605 667
606 eval { 668 eval {
607 $db->set_flags (BDB::CHKSUM); 669 $db->set_flags (BDB::CHKSUM);
617} 679}
618 680
619our $DB; 681our $DB;
620 682
621sub db_init { 683sub db_init {
622 cf::sync_job {
623 $DB ||= db_table "db"; 684 $DB ||= db_table "db";
624 };
625} 685}
626 686
627sub db_get($$) { 687sub db_get($$) {
628 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
629 689
630 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
631 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
632 694
633 $! ? () 695 $! ? ()
634 : $data 696 : $data
635 }
636} 697}
637 698
638sub db_put($$$) { 699sub db_put($$$) {
639 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
640 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
696 757
697 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
698 my $data = $process->(\@data); 759 my $data = $process->(\@data);
699 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
700 761
701 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
702 763
703 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
704 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
705 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
706 767
716 777
717=cut 778=cut
718 779
719sub datalog($@) { 780sub datalog($@) {
720 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
721 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
722} 783}
723 784
724=back 785=back
725 786
726=cut 787=cut
921 982
922 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
923 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
924 985
925 } elsif (ref $type) { 986 } elsif (ref $type) {
926 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
927 988
928 } else { 989 } else {
929 shift @arg; 990 shift @arg;
930 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
931 } 992 }
932 } 993 }
933} 994}
934 995
935sub _object_attach { 996sub _object_attach {
945 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
946 } 1007 }
947 1008
948 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
949 } else { 1010 } else {
950 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
951 } 1012 }
952 1013
953 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
954} 1015}
955 1016
1014 1075
1015 for (@$callbacks) { 1076 for (@$callbacks) {
1016 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
1017 1078
1018 if ($@) { 1079 if ($@) {
1019 warn "$@";
1020 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1021 override; 1081 override;
1022 } 1082 }
1023 1083
1024 return 1 if $override; 1084 return 1 if $override;
1025 } 1085 }
1104 for (@$attach) { 1164 for (@$attach) {
1105 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
1106 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
1107 } 1167 }
1108 } else { 1168 } else {
1109 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
1110 } 1170 }
1111 } 1171 }
1112} 1172}
1113 1173
1114cf::attachable->attach ( 1174cf::attachable->attach (
1141 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1142 1202
1143 sync_job { 1203 sync_job {
1144 if (length $$rdata) { 1204 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1146 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1147 $decname, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1148 1209
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1211 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 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;
1215 aio_fsync $fh;
1216 }
1153 aio_close $fh; 1217 aio_close $fh;
1154 1218
1155 if (@$objs) { 1219 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1220 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1221 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1222 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1223 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1224 if ($cf::USE_FSYNC) {
1225 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;
1226 aio_fsync $fh;
1227 }
1161 aio_close $fh; 1228 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1229 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1230 }
1164 } else { 1231 } else {
1165 aio_unlink "$filename.pst"; 1232 aio_unlink "$filename.pst";
1168 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1169 1236
1170 $filename =~ s%/[^/]+$%%; 1237 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC; 1238 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1239 } else {
1173 warn "unable to save objects: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1174 } 1241 }
1175 } else { 1242 } else {
1176 aio_unlink $filename; 1243 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1178 } 1245 }
1202 my $st = eval { Coro::Storable::thaw $av }; 1269 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs}; 1270 $av = $st->{objs};
1204 } 1271 }
1205 1272
1206 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1207 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1208 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1209 1277
1210 ($data, $av) 1278 ($data, $av)
1211} 1279}
1212 1280
1213=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
1272} 1340}
1273 1341
1274use File::Glob (); 1342use File::Glob ();
1275 1343
1276cf::player->attach ( 1344cf::player->attach (
1277 on_command => sub { 1345 on_unknown_command => sub {
1278 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
1279 1347
1280 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
1281 or return; 1349 or return;
1282 1350
1305 1373
1306 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1307 if $reply; 1375 if $reply;
1308 1376
1309 } else { 1377 } else {
1310 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1311 } 1379 }
1312 1380
1313 cf::override; 1381 cf::override;
1314 }, 1382 },
1315); 1383);
1316 1384
1317# "readahead" all extensions 1385# "readahead" all extensions
1318sub cache_extensions { 1386sub cache_extensions {
1319 my $grp = IO::AIO::aio_group; 1387 my $grp = IO::AIO::aio_group;
1320 1388
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1389 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322 for (grep /\.ext$/, @{$_[0]}) { 1390 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1391 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 } 1392 }
1325 }; 1393 };
1326 1394
1327 $grp 1395 $grp
1328} 1396}
1329 1397
1330sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1331 cf::sync_job { 1401 cf::sync_job {
1332 my %todo; 1402 my %todo;
1333 1403
1334 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1335 next unless -r $path; 1405 next unless -r $path;
1353 1423
1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1356 1426
1357 $ext{source} = 1427 $ext{source} =
1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1359 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1360 . $source 1430 . $source
1361 . "\n};\n1"; 1431 . "\n};\n1";
1362 1432
1363 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
1364 } 1434 }
1365 1435
1436 my $pass = 0;
1366 my %done; 1437 my %done;
1367 while (%todo) { 1438 while (%todo) {
1368 my $progress; 1439 my $progress;
1369 1440
1441 ++$pass;
1442
1443 ext:
1370 while (my ($k, $v) = each %todo) { 1444 while (my ($k, $v) = each %todo) {
1371 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1372 goto skip 1446 next ext
1373 unless exists $done{$_}; 1447 unless exists $done{$_};
1374 } 1448 }
1375 1449
1376 warn "... loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1377 1451
1378 unless (eval $v->{source}) { 1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1379 my $msg = $@ ? "$v->{path}: $@\n" 1455 error "$v->{path}: $@\n";
1380 : "$v->{base}: extension inactive.\n";
1381 1456
1382 if (exists $v->{meta}{mandatory}) {
1383 warn $msg;
1384 cf::cleanup "mandatory extension failed to load, exiting."; 1457 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1385 } 1458 if exists $v->{meta}{mandatory};
1386 1459
1387 warn $msg; 1460 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1461 delete $todo{$k};
1462 } else {
1463 $done{$k} = delete $todo{$k};
1464 push @EXTS, $v->{pkg};
1465 $progress = 1;
1466
1467 info "$v->{base}: extension inactive.\n"
1468 unless $active;
1388 } 1469 }
1389
1390 $done{$k} = delete $todo{$k};
1391 push @EXTS, $v->{pkg};
1392 $progress = 1;
1393 } 1470 }
1394 1471
1395 skip: 1472 unless ($progress) {
1396 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1473 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1397 unless $progress; 1474
1475 while (my ($k, $v) = each %todo) {
1476 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477 if exists $v->{meta}{mandatory};
1478 }
1479 }
1398 } 1480 }
1399 }; 1481 };
1400} 1482}
1401 1483
1402############################################################################# 1484#############################################################################
1486 $cf::PLAYER{$login} = $pl 1568 $cf::PLAYER{$login} = $pl
1487 } 1569 }
1488 } 1570 }
1489} 1571}
1490 1572
1573cf::player->attach (
1574 on_load => sub {
1575 my ($pl, $path) = @_;
1576
1577 # restore slots saved in save, below
1578 my $slots = delete $pl->{_slots};
1579
1580 $pl->ob->current_weapon ($slots->[0]);
1581 $pl->combat_ob ($slots->[1]);
1582 $pl->ranged_ob ($slots->[2]);
1583 },
1584);
1585
1491sub save($) { 1586sub save($) {
1492 my ($pl) = @_; 1587 my ($pl) = @_;
1493 1588
1494 return if $pl->{deny_save}; 1589 return if $pl->{deny_save};
1495 1590
1500 1595
1501 aio_mkdir playerdir $pl, 0770; 1596 aio_mkdir playerdir $pl, 0770;
1502 $pl->{last_save} = $cf::RUNTIME; 1597 $pl->{last_save} = $cf::RUNTIME;
1503 1598
1504 cf::get_slot 0.01; 1599 cf::get_slot 0.01;
1600
1601 # save slots, to be restored later
1602 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1505 1603
1506 $pl->save_pl ($path); 1604 $pl->save_pl ($path);
1507 cf::cede_to_tick; 1605 cf::cede_to_tick;
1508} 1606}
1509 1607
1546 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1644 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1547 1645
1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1549 $pl->deactivate; 1647 $pl->deactivate;
1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1648 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551 $pl->ob->check_score;
1552 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1649 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1553 $pl->ns->destroy if $pl->ns; 1650 $pl->ns->destroy if $pl->ns;
1554 1651
1555 my $path = playerdir $pl; 1652 my $path = playerdir $pl;
1556 my $temp = "$path~$cf::RUNTIME~deleting~"; 1653 my $temp = "$path~$cf::RUNTIME~deleting~";
1611 \@logins 1708 \@logins
1612} 1709}
1613 1710
1614=item $player->maps 1711=item $player->maps
1615 1712
1713=item cf::player::maps $login
1714
1616Returns an arrayref of map paths that are private for this 1715Returns an arrayref of map paths that are private for this
1617player. May block. 1716player. May block.
1618 1717
1619=cut 1718=cut
1620 1719
1682=cut 1781=cut
1683 1782
1684sub find_by_path($) { 1783sub find_by_path($) {
1685 my ($path) = @_; 1784 my ($path) = @_;
1686 1785
1786 $path =~ s/^~[^\/]*//; # skip ~login
1787
1687 my ($match, $specificity); 1788 my ($match, $specificity);
1688 1789
1689 for my $region (list) { 1790 for my $region (list) {
1690 if ($region->{match} && $path =~ $region->{match}) { 1791 if ($region->{match} && $path =~ $region->{match}) {
1691 ($match, $specificity) = ($region, $region->specificity) 1792 ($match, $specificity) = ($region, $region->specificity)
1722 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1823 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1723 1824
1724 # mit "rum" bekleckern, nicht 1825 # mit "rum" bekleckern, nicht
1725 $self->_create_random_map ( 1826 $self->_create_random_map (
1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1729 $rmp->{exit_on_final_map}, 1830 $rmp->{exit_on_final_map},
1730 $rmp->{xsize}, $rmp->{ysize}, 1831 $rmp->{xsize}, $rmp->{ysize},
1731 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1732 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1747 1848
1748sub register { 1849sub register {
1749 my (undef, $regex, $prio) = @_; 1850 my (undef, $regex, $prio) = @_;
1750 my $pkg = caller; 1851 my $pkg = caller;
1751 1852
1752 no strict;
1753 push @{"$pkg\::ISA"}, __PACKAGE__; 1853 push @{"$pkg\::ISA"}, __PACKAGE__;
1754 1854
1755 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1855 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1756} 1856}
1757 1857
1758# also paths starting with '/' 1858# also paths starting with '/'
1759$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1859$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1760 1860
1761sub thawer_merge { 1861sub thawer_merge {
1762 my ($self, $merge) = @_; 1862 my ($self, $merge) = @_;
1763 1863
1764 # we have to keep some variables in memory intact 1864 # we have to keep some variables in memory intact
1978 2078
1979 $cf::MAP{$path} = $map 2079 $cf::MAP{$path} = $map
1980 } 2080 }
1981} 2081}
1982 2082
1983sub pre_load { } 2083sub pre_load { }
1984sub post_load { } 2084#sub post_load { } # XS
1985 2085
1986sub load { 2086sub load {
1987 my ($self) = @_; 2087 my ($self) = @_;
1988 2088
1989 local $self->{deny_reset} = 1; # loading can take a long time 2089 local $self->{deny_reset} = 1; # loading can take a long time
2046 } 2146 }
2047 2147
2048 $self->post_load; 2148 $self->post_load;
2049} 2149}
2050 2150
2151# customize the map for a given player, i.e.
2152# return the _real_ map. used by e.g. per-player
2153# maps to change the path to ~playername/mappath
2051sub customise_for { 2154sub customise_for {
2052 my ($self, $ob) = @_; 2155 my ($self, $ob) = @_;
2053 2156
2054 return find "~" . $ob->name . "/" . $self->{path} 2157 return find "~" . $ob->name . "/" . $self->{path}
2055 if $self->per_player; 2158 if $self->per_player;
2071 or next; 2174 or next;
2072 $neigh = find $neigh, $map 2175 $neigh = find $neigh, $map
2073 or next; 2176 or next;
2074 $neigh->load; 2177 $neigh->load;
2075 2178
2179 # now find the diagonal neighbours
2076 push @neigh, 2180 push @neigh,
2077 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2181 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2078 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2182 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2079 } 2183 }
2080 2184
2087} 2191}
2088 2192
2089sub find_sync { 2193sub find_sync {
2090 my ($path, $origin) = @_; 2194 my ($path, $origin) = @_;
2091 2195
2092 cf::sync_job { find $path, $origin } 2196 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2197 if $Coro::current == $Coro::main;
2198
2199 find $path, $origin
2093} 2200}
2094 2201
2095sub do_load_sync { 2202sub do_load_sync {
2096 my ($map) = @_; 2203 my ($map) = @_;
2097 2204
2098 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2205 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2099 if $Coro::current == $Coro::main; 2206 if $Coro::current == $Coro::main;
2100 2207
2101 cf::sync_job { $map->load }; 2208 $map->load;
2102} 2209}
2103 2210
2104our %MAP_PREFETCH; 2211our %MAP_PREFETCH;
2105our $MAP_PREFETCHER = undef; 2212our $MAP_PREFETCHER = undef;
2106 2213
2132 $MAP_PREFETCHER->prio (6); 2239 $MAP_PREFETCHER->prio (6);
2133 2240
2134 () 2241 ()
2135} 2242}
2136 2243
2244# common code, used by both ->save and ->swapout
2137sub save { 2245sub _save {
2138 my ($self) = @_; 2246 my ($self) = @_;
2139
2140 my $lock = cf::lock_acquire "map_data:$self->{path}";
2141 2247
2142 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2143 2249
2144 return unless $self->dirty; 2250 return unless $self->dirty;
2145 2251
2165 } else { 2271 } else {
2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2272 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2167 } 2273 }
2168} 2274}
2169 2275
2276sub save {
2277 my ($self) = @_;
2278
2279 my $lock = cf::lock_acquire "map_data:$self->{path}";
2280
2281 $self->_save;
2282}
2283
2170sub swap_out { 2284sub swap_out {
2171 my ($self) = @_; 2285 my ($self) = @_;
2172 2286
2173 # save first because save cedes
2174 $self->save;
2175
2176 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2287 my $lock = cf::lock_acquire "map_data:$self->{path}";
2177 2288
2178 return if $self->players;
2179 return if $self->in_memory != cf::MAP_ACTIVE; 2289 return if $self->in_memory != cf::MAP_ACTIVE;
2180 return if $self->{deny_save}; 2290 return if $self->{deny_save};
2291 return if $self->players;
2181 2292
2293 # first deactivate the map and "unlink" it from the core
2294 $self->deactivate;
2295 $_->clear_links_to ($self) for values %cf::MAP;
2182 $self->in_memory (cf::MAP_SWAPPED); 2296 $self->in_memory (cf::MAP_SWAPPED);
2297
2298 # then atomically save
2299 $self->_save;
2300
2301 # then free the map
2302 $self->clear;
2303}
2304
2305sub reset_at {
2306 my ($self) = @_;
2307
2308 # TODO: safety, remove and allow resettable per-player maps
2309 return 1e99 if $self->{deny_reset};
2310
2311 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2312 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2313
2314 $time + $to
2315}
2316
2317sub should_reset {
2318 my ($self) = @_;
2319
2320 $self->reset_at <= $cf::RUNTIME
2321}
2322
2323sub reset {
2324 my ($self) = @_;
2325
2326 my $lock = cf::lock_acquire "map_data:$self->{path}";
2327
2328 return if $self->players;
2329
2330 cf::trace "resetting map ", $self->path, "\n";
2331
2332 $self->in_memory (cf::MAP_SWAPPED);
2333
2334 # need to save uniques path
2335 unless ($self->{deny_save}) {
2336 my $uniq = $self->uniq_path; utf8::encode $uniq;
2337
2338 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2339 if $uniq;
2340 }
2341
2342 delete $cf::MAP{$self->path};
2183 2343
2184 $self->deactivate; 2344 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP; 2345 $_->clear_links_to ($self) for values %cf::MAP;
2186 $self->clear; 2346 $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 2347
2232 $self->unlink_save; 2348 $self->unlink_save;
2233 $self->destroy; 2349 $self->destroy;
2234} 2350}
2235 2351
2243 2359
2244 delete $cf::MAP{$self->path}; 2360 delete $cf::MAP{$self->path};
2245 2361
2246 $self->unlink_save; 2362 $self->unlink_save;
2247 2363
2248 bless $self, "cf::map"; 2364 bless $self, "cf::map::wrap";
2249 delete $self->{deny_reset}; 2365 delete $self->{deny_reset};
2250 $self->{deny_save} = 1; 2366 $self->{deny_save} = 1;
2251 $self->reset_timeout (1); 2367 $self->reset_timeout (1);
2252 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2368 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2253 2369
2310 : normalise $_ 2426 : normalise $_
2311 } @{ aio_readdir $UNIQUEDIR or [] } 2427 } @{ aio_readdir $UNIQUEDIR or [] }
2312 ] 2428 ]
2313} 2429}
2314 2430
2431=item cf::map::static_maps
2432
2433Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2434file in the shared directory excluding F</styles> and F</editor>). May
2435block.
2436
2437=cut
2438
2439sub static_maps() {
2440 my @dirs = "";
2441 my @maps;
2442
2443 while (@dirs) {
2444 my $dir = shift @dirs;
2445
2446 next if $dir eq "/styles" || $dir eq "/editor";
2447
2448 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2449 or return;
2450
2451 for (@$files) {
2452 s/\.map$// or next;
2453 utf8::decode $_;
2454 push @maps, "$dir/$_";
2455 }
2456
2457 push @dirs, map "$dir/$_", @$dirs;
2458 }
2459
2460 \@maps
2461}
2462
2315=back 2463=back
2316 2464
2317=head3 cf::object 2465=head3 cf::object
2318 2466
2319=cut 2467=cut
2384 2532
2385our $SAY_CHANNEL = { 2533our $SAY_CHANNEL = {
2386 id => "say", 2534 id => "say",
2387 title => "Map", 2535 title => "Map",
2388 reply => "say ", 2536 reply => "say ",
2389 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2537 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2390}; 2538};
2391 2539
2392our $CHAT_CHANNEL = { 2540our $CHAT_CHANNEL = {
2393 id => "chat", 2541 id => "chat",
2394 title => "Chat", 2542 title => "Chat",
2451 2599
2452Freezes the player and moves him/her to a special map (C<{link}>). 2600Freezes the player and moves him/her to a special map (C<{link}>).
2453 2601
2454The player should be reasonably safe there for short amounts of time (e.g. 2602The 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, 2603for 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 2604though, as the player cannot control the character while it is on the link
2457map. 2605map.
2458 2606
2459Will never block. 2607Will never block.
2460 2608
2461=item $player_object->leave_link ($map, $x, $y) 2609=item $player_object->leave_link ($map, $x, $y)
2482sub cf::object::player::enter_link { 2630sub cf::object::player::enter_link {
2483 my ($self) = @_; 2631 my ($self) = @_;
2484 2632
2485 $self->deactivate_recursive; 2633 $self->deactivate_recursive;
2486 2634
2635 ++$self->{_link_recursion};
2636
2487 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2637 return if UNIVERSAL::isa $self->map, "ext::map_link";
2488 2638
2489 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2639 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2490 if $self->map && $self->map->{path} ne "{link}"; 2640 if $self->map && $self->map->{path} ne "{link}";
2491 2641
2492 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2642 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2493} 2643}
2494 2644
2495sub cf::object::player::leave_link { 2645sub cf::object::player::leave_link {
2496 my ($self, $map, $x, $y) = @_; 2646 my ($self, $map, $x, $y) = @_;
2497 2647
2514 ($x, $y) = (-1, -1) 2664 ($x, $y) = (-1, -1)
2515 unless (defined $x) && (defined $y); 2665 unless (defined $x) && (defined $y);
2516 2666
2517 # use -1 or undef as default coordinates, not 0, 0 2667 # use -1 or undef as default coordinates, not 0, 0
2518 ($x, $y) = ($map->enter_x, $map->enter_y) 2668 ($x, $y) = ($map->enter_x, $map->enter_y)
2519 if $x <=0 && $y <= 0; 2669 if $x <= 0 && $y <= 0;
2520 2670
2521 $map->load; 2671 $map->load;
2522 $map->load_neighbours; 2672 $map->load_neighbours;
2523 2673
2524 return unless $self->contr->active; 2674 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2526 $self->activate_recursive;
2527 2675
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2676 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $self->enter_map ($map, $x, $y); 2677 if ($self->enter_map ($map, $x, $y)) {
2530} 2678 # entering was successful
2679 delete $self->{_link_recursion};
2680 # only activate afterwards, to support waiting in hooks
2681 $self->activate_recursive;
2682 }
2531 2683
2684}
2685
2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2686=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2533 2687
2534Moves the player to the given map-path and coordinates by first freezing 2688Moves the player to the given map-path and coordinates by first freezing
2535her, loading and preparing them map, calling the provided $check callback 2689her, loading and preparing them map, calling the provided $check callback
2536that has to return the map if sucecssful, and then unfreezes the player on 2690that 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 2691the new (success) or old (failed) map position. In either case, $done will
2544 2698
2545our $GOTOGEN; 2699our $GOTOGEN;
2546 2700
2547sub cf::object::player::goto { 2701sub cf::object::player::goto {
2548 my ($self, $path, $x, $y, $check, $done) = @_; 2702 my ($self, $path, $x, $y, $check, $done) = @_;
2703
2704 if ($self->{_link_recursion} >= $MAX_LINKS) {
2705 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2706 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2707 ($path, $x, $y) = @$EMERGENCY_POSITION;
2708 }
2549 2709
2550 # do generation counting so two concurrent goto's will be executed in-order 2710 # do generation counting so two concurrent goto's will be executed in-order
2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2711 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2552 2712
2553 $self->enter_link; 2713 $self->enter_link;
2577 my $map = eval { 2737 my $map = eval {
2578 my $map = defined $path ? cf::map::find $path : undef; 2738 my $map = defined $path ? cf::map::find $path : undef;
2579 2739
2580 if ($map) { 2740 if ($map) {
2581 $map = $map->customise_for ($self); 2741 $map = $map->customise_for ($self);
2582 $map = $check->($map) if $check && $map; 2742 $map = $check->($map, $x, $y, $self) if $check && $map;
2583 } else { 2743 } else {
2584 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2744 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2585 } 2745 }
2586 2746
2587 $map 2747 $map
2595 if ($gen == $self->{_goto_generation}) { 2755 if ($gen == $self->{_goto_generation}) {
2596 delete $self->{_goto_generation}; 2756 delete $self->{_goto_generation};
2597 $self->leave_link ($map, $x, $y); 2757 $self->leave_link ($map, $x, $y);
2598 } 2758 }
2599 2759
2600 $done->() if $done; 2760 $done->($self) if $done;
2601 })->prio (1); 2761 })->prio (1);
2602} 2762}
2603 2763
2604=item $player_object->enter_exit ($exit_object) 2764=item $player_object->enter_exit ($exit_object)
2605 2765
2698 $self->message ("Something went wrong deep within the deliantra server. " 2858 $self->message ("Something went wrong deep within the deliantra server. "
2699 . "I'll try to bring you back to the map you were before. " 2859 . "I'll try to bring you back to the map you were before. "
2700 . "Please report this to the dungeon master!", 2860 . "Please report this to the dungeon master!",
2701 cf::NDI_UNIQUE | cf::NDI_RED); 2861 cf::NDI_UNIQUE | cf::NDI_RED);
2702 2862
2703 warn "ERROR in enter_exit: $@"; 2863 error "ERROR in enter_exit: $@";
2704 $self->leave_link; 2864 $self->leave_link;
2705 } 2865 }
2706 })->prio (1); 2866 })->prio (1);
2707} 2867}
2708 2868
2720sub cf::client::send_drawinfo { 2880sub cf::client::send_drawinfo {
2721 my ($self, $text, $flags) = @_; 2881 my ($self, $text, $flags) = @_;
2722 2882
2723 utf8::encode $text; 2883 utf8::encode $text;
2724 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2884 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2885}
2886
2887=item $client->send_big_packet ($pkt)
2888
2889Like C<send_packet>, but tries to compress large packets, and fragments
2890them as required.
2891
2892=cut
2893
2894our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2895
2896sub cf::client::send_big_packet {
2897 my ($self, $pkt) = @_;
2898
2899 # try lzf for large packets
2900 $pkt = "lzf " . Compress::LZF::compress $pkt
2901 if 1024 <= length $pkt and $self->{can_lzf};
2902
2903 # split very large packets
2904 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2905 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2906 $pkt = "frag";
2907 }
2908
2909 $self->send_packet ($pkt);
2725} 2910}
2726 2911
2727=item $client->send_msg ($channel, $msg, $color, [extra...]) 2912=item $client->send_msg ($channel, $msg, $color, [extra...])
2728 2913
2729Send a drawinfo or msg packet to the client, formatting the msg for the 2914Send a drawinfo or msg packet to the client, formatting the msg for the
2733 2918
2734=cut 2919=cut
2735 2920
2736# non-persistent channels (usually the info channel) 2921# non-persistent channels (usually the info channel)
2737our %CHANNEL = ( 2922our %CHANNEL = (
2923 "c/motd" => {
2924 id => "infobox",
2925 title => "MOTD",
2926 reply => undef,
2927 tooltip => "The message of the day",
2928 },
2738 "c/identify" => { 2929 "c/identify" => {
2739 id => "infobox", 2930 id => "infobox",
2740 title => "Identify", 2931 title => "Identify",
2741 reply => undef, 2932 reply => undef,
2742 tooltip => "Items recently identified", 2933 tooltip => "Items recently identified",
2744 "c/examine" => { 2935 "c/examine" => {
2745 id => "infobox", 2936 id => "infobox",
2746 title => "Examine", 2937 title => "Examine",
2747 reply => undef, 2938 reply => undef,
2748 tooltip => "Signs and other items you examined", 2939 tooltip => "Signs and other items you examined",
2940 },
2941 "c/shopinfo" => {
2942 id => "infobox",
2943 title => "Shop Info",
2944 reply => undef,
2945 tooltip => "What your bargaining skill tells you about the shop",
2749 }, 2946 },
2750 "c/book" => { 2947 "c/book" => {
2751 id => "infobox", 2948 id => "infobox",
2752 title => "Book", 2949 title => "Book",
2753 reply => undef, 2950 reply => undef,
2769 id => "infobox", 2966 id => "infobox",
2770 title => "Body Parts", 2967 title => "Body Parts",
2771 reply => undef, 2968 reply => undef,
2772 tooltip => "Shows which body parts you posess and are available", 2969 tooltip => "Shows which body parts you posess and are available",
2773 }, 2970 },
2971 "c/statistics" => {
2972 id => "infobox",
2973 title => "Statistics",
2974 reply => undef,
2975 tooltip => "Shows your primary statistics",
2976 },
2774 "c/skills" => { 2977 "c/skills" => {
2775 id => "infobox", 2978 id => "infobox",
2776 title => "Skills", 2979 title => "Skills",
2777 reply => undef, 2980 reply => undef,
2778 tooltip => "Shows your experience per skill and item power", 2981 tooltip => "Shows your experience per skill and item power",
2982 },
2983 "c/shopitems" => {
2984 id => "infobox",
2985 title => "Shop Items",
2986 reply => undef,
2987 tooltip => "Shows the items currently for sale in this shop",
2988 },
2989 "c/resistances" => {
2990 id => "infobox",
2991 title => "Resistances",
2992 reply => undef,
2993 tooltip => "Shows your resistances",
2994 },
2995 "c/pets" => {
2996 id => "infobox",
2997 title => "Pets",
2998 reply => undef,
2999 tooltip => "Shows information abotu your pets/a specific pet",
3000 },
3001 "c/perceiveself" => {
3002 id => "infobox",
3003 title => "Perceive Self",
3004 reply => undef,
3005 tooltip => "You gained detailed knowledge about yourself",
2779 }, 3006 },
2780 "c/uptime" => { 3007 "c/uptime" => {
2781 id => "infobox", 3008 id => "infobox",
2782 title => "Uptime", 3009 title => "Uptime",
2783 reply => undef, 3010 reply => undef,
2793 id => "party", 3020 id => "party",
2794 title => "Party", 3021 title => "Party",
2795 reply => "gsay ", 3022 reply => "gsay ",
2796 tooltip => "Messages and chat related to your party", 3023 tooltip => "Messages and chat related to your party",
2797 }, 3024 },
3025 "c/death" => {
3026 id => "death",
3027 title => "Death",
3028 reply => undef,
3029 tooltip => "Reason for and more info about your most recent death",
3030 },
2798 "c/say" => $SAY_CHANNEL, 3031 "c/say" => $SAY_CHANNEL,
2799 "c/chat" => $CHAT_CHANNEL, 3032 "c/chat" => $CHAT_CHANNEL,
2800); 3033);
2801 3034
2802sub cf::client::send_msg { 3035sub cf::client::send_msg {
2809 3042
2810 # check predefined channels, for the benefit of C 3043 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 3044 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 3045 $channel = $CHANNEL{$channel};
2813 3046
2814 $self->ext_msg (channel_info => $channel) 3047 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 3048 $channel = $channel->{id};
2818 3049
2819 } elsif (ref $channel) { 3050 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 3051 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 3052 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 3053 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 3054 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 3055 }
2826 3056
2827 $channel = $channel->{id}; 3057 $channel = $channel->{id};
2828 } 3058 }
2829 3059
2830 return unless @extra || length $msg; 3060 return unless @extra || length $msg;
2831 3061
2832 if ($self->can_msg) {
2833 # default colour, mask it out 3062 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3063 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 3064 if $color & cf::NDI_DEF;
2836 3065
2837 my $pkt = "msg " 3066 my $pkt = "msg "
2838 . $self->{json_coder}->encode ( 3067 . $self->{json_coder}->encode (
2839 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3068 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2840 ); 3069 );
2841 3070
2842 # try lzf for large packets
2843 $pkt = "lzf " . Compress::LZF::compress $pkt
2844 if 1024 <= length $pkt and $self->{can_lzf};
2845
2846 # split very large packets
2847 if (8192 < length $pkt and $self->{can_lzf}) {
2848 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2849 $pkt = "frag";
2850 }
2851
2852 $self->send_packet ($pkt); 3071 $self->send_big_packet ($pkt);
2853 } else {
2854 if ($color >= 0) {
2855 # replace some tags by gcfclient-compatible ones
2856 for ($msg) {
2857 1 while
2858 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2859 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2860 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2861 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2862 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2863 }
2864
2865 $color &= cf::NDI_COLOR_MASK;
2866
2867 utf8::encode $msg;
2868
2869 if (0 && $msg =~ /\[/) {
2870 # COMMAND/INFO
2871 $self->send_packet ("drawextinfo $color 10 8 $msg")
2872 } else {
2873 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2874 $self->send_packet ("drawinfo $color $msg")
2875 }
2876 }
2877 }
2878} 3072}
2879 3073
2880=item $client->ext_msg ($type, @msg) 3074=item $client->ext_msg ($type, @msg)
2881 3075
2882Sends an ext event to the client. 3076Sends an ext event to the client.
2885 3079
2886sub cf::client::ext_msg($$@) { 3080sub cf::client::ext_msg($$@) {
2887 my ($self, $type, @msg) = @_; 3081 my ($self, $type, @msg) = @_;
2888 3082
2889 if ($self->extcmd == 2) { 3083 if ($self->extcmd == 2) {
2890 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3084 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2891 } elsif ($self->extcmd == 1) { # TODO: remove 3085 } elsif ($self->extcmd == 1) { # TODO: remove
2892 push @msg, msgtype => "event_$type"; 3086 push @msg, msgtype => "event_$type";
2893 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3087 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2894 } 3088 }
2895} 3089}
2896 3090
2897=item $client->ext_reply ($msgid, @msg) 3091=item $client->ext_reply ($msgid, @msg)
2898 3092
2902 3096
2903sub cf::client::ext_reply($$@) { 3097sub cf::client::ext_reply($$@) {
2904 my ($self, $id, @msg) = @_; 3098 my ($self, $id, @msg) = @_;
2905 3099
2906 if ($self->extcmd == 2) { 3100 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2908 } elsif ($self->extcmd == 1) { 3102 } elsif ($self->extcmd == 1) {
2909 #TODO: version 1, remove 3103 #TODO: version 1, remove
2910 unshift @msg, msgtype => "reply", msgid => $id; 3104 unshift @msg, msgtype => "reply", msgid => $id;
2911 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3105 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2912 } 3106 }
2913} 3107}
2914 3108
2915=item $success = $client->query ($flags, "text", \&cb) 3109=item $success = $client->query ($flags, "text", \&cb)
2916 3110
2987 3181
2988 $ns->ext_reply ($reply, @reply) 3182 $ns->ext_reply ($reply, @reply)
2989 if $reply; 3183 if $reply;
2990 3184
2991 } else { 3185 } else {
2992 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3186 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2993 } 3187 }
2994 3188
2995 cf::override; 3189 cf::override;
2996 }, 3190 },
2997); 3191);
3017 3211
3018 $coro 3212 $coro
3019} 3213}
3020 3214
3021cf::client->attach ( 3215cf::client->attach (
3022 on_destroy => sub { 3216 on_client_destroy => sub {
3023 my ($ns) = @_; 3217 my ($ns) = @_;
3024 3218
3025 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3219 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3026 }, 3220 },
3027); 3221);
3043our $safe_hole = new Safe::Hole; 3237our $safe_hole = new Safe::Hole;
3044 3238
3045$SIG{FPE} = 'IGNORE'; 3239$SIG{FPE} = 'IGNORE';
3046 3240
3047$safe->permit_only (Opcode::opset qw( 3241$safe->permit_only (Opcode::opset qw(
3048 :base_core :base_mem :base_orig :base_math 3242 :base_core :base_mem :base_orig :base_math :base_loop
3049 grepstart grepwhile mapstart mapwhile 3243 grepstart grepwhile mapstart mapwhile
3050 sort time 3244 sort time
3051)); 3245));
3052 3246
3053# here we export the classes and methods available to script code 3247# here we export the classes and methods available to script code
3057The following functions and methods are available within a safe environment: 3251The following functions and methods are available within a safe environment:
3058 3252
3059 cf::object 3253 cf::object
3060 contr pay_amount pay_player map x y force_find force_add destroy 3254 contr pay_amount pay_player map x y force_find force_add destroy
3061 insert remove name archname title slaying race decrease split 3255 insert remove name archname title slaying race decrease split
3256 value
3062 3257
3063 cf::object::player 3258 cf::object::player
3064 player 3259 player
3065 3260
3066 cf::player 3261 cf::player
3072=cut 3267=cut
3073 3268
3074for ( 3269for (
3075 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3270 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3076 insert remove inv nrof name archname title slaying race 3271 insert remove inv nrof name archname title slaying race
3077 decrease split destroy change_exp)], 3272 decrease split destroy change_exp value msg lore send_msg)],
3078 ["cf::object::player" => qw(player)], 3273 ["cf::object::player" => qw(player)],
3079 ["cf::player" => qw(peaceful)], 3274 ["cf::player" => qw(peaceful send_msg)],
3080 ["cf::map" => qw(trigger)], 3275 ["cf::map" => qw(trigger)],
3081) { 3276) {
3082 no strict 'refs';
3083 my ($pkg, @funs) = @$_; 3277 my ($pkg, @funs) = @$_;
3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3278 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3085 for @funs; 3279 for @funs;
3086} 3280}
3087 3281
3102 3296
3103 my $qcode = $code; 3297 my $qcode = $code;
3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3298 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3105 $qcode =~ s/\n/\\n/g; 3299 $qcode =~ s/\n/\\n/g;
3106 3300
3301 %vars = (_dummy => 0) unless %vars;
3302
3303 my @res;
3107 local $_; 3304 local $_;
3108 local @safe::cf::_safe_eval_args = values %vars;
3109 3305
3110 my $eval = 3306 my $eval =
3111 "do {\n" 3307 "do {\n"
3112 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3308 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3113 . "#line 0 \"{$qcode}\"\n" 3309 . "#line 0 \"{$qcode}\"\n"
3114 . $code 3310 . $code
3115 . "\n}" 3311 . "\n}"
3116 ; 3312 ;
3117 3313
3314 if ($CFG{safe_eval}) {
3118 sub_generation_inc; 3315 sub_generation_inc;
3316 local @safe::cf::_safe_eval_args = values %vars;
3119 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3317 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3120 sub_generation_inc; 3318 sub_generation_inc;
3319 } else {
3320 local @cf::_safe_eval_args = values %vars;
3321 @res = wantarray ? eval eval : scalar eval $eval;
3322 }
3121 3323
3122 if ($@) { 3324 if ($@) {
3123 warn "$@"; 3325 warn "$@",
3124 warn "while executing safe code '$code'\n"; 3326 "while executing safe code '$code'\n",
3125 warn "with arguments " . (join " ", %vars) . "\n"; 3327 "with arguments " . (join " ", %vars) . "\n";
3126 } 3328 }
3127 3329
3128 wantarray ? @res : $res[0] 3330 wantarray ? @res : $res[0]
3129} 3331}
3130 3332
3144=cut 3346=cut
3145 3347
3146sub register_script_function { 3348sub register_script_function {
3147 my ($fun, $cb) = @_; 3349 my ($fun, $cb) = @_;
3148 3350
3149 no strict 'refs'; 3351 $fun = "safe::$fun" if $CFG{safe_eval};
3150 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3352 *$fun = $safe_hole->wrap ($cb);
3151} 3353}
3152 3354
3153=back 3355=back
3154 3356
3155=cut 3357=cut
3156 3358
3157############################################################################# 3359#############################################################################
3158# the server's init and main functions 3360# the server's init and main functions
3361
3362# async inc loader. yay.
3363sub inc_loader {
3364 my $mod = $_[1];
3365
3366 if (in_main && !tick_inhibit) {
3367 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3368 } else {
3369 debug "loading perl module $mod\n";
3370 }
3371
3372 # 1. find real file
3373 for my $dir (@ORIG_INC) {
3374 ref $dir and next;
3375 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3376 or next;
3377
3378 $data = "#line 1 $dir/$mod\n$data";
3379
3380 open my $fh, "<", \$data or die;
3381
3382 return $fh;
3383 }
3384
3385 ()
3386}
3387
3388sub init_inc {
3389 # save original @INC
3390 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3391
3392 # make sure we can do scalar-opens
3393 open my $dummy, "<", \my $dummy2;
3394
3395 # execute some stuff so perl load's some of the core modules
3396 /Ü/ =~ /ü/i;
3397 eval { &Storable::nstore_fd };
3398
3399 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3400
3401 debug "module loading will be asynchronous from this point on.";
3402}
3159 3403
3160sub load_facedata($) { 3404sub load_facedata($) {
3161 my ($path) = @_; 3405 my ($path) = @_;
3162 3406
3163 # HACK to clear player env face cache, we need some signal framework 3407 # HACK to clear player env face cache, we need some signal framework
3164 # for this (global event?) 3408 # for this (global event?)
3165 %ext::player_env::MUSIC_FACE_CACHE = (); 3409 %ext::player_env::MUSIC_FACE_CACHE = ();
3166 3410
3167 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3411 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3168 3412
3169 warn "loading facedata from $path\n"; 3413 trace "loading facedata from $path\n";
3170 3414
3171 my $facedata; 3415 my $facedata;
3172 0 < aio_load $path, $facedata 3416 0 < aio_load $path, $facedata
3173 or die "$path: $!"; 3417 or die "$path: $!";
3174 3418
3176 3420
3177 $facedata->{version} == 2 3421 $facedata->{version} == 2
3178 or cf::cleanup "$path: version mismatch, cannot proceed."; 3422 or cf::cleanup "$path: version mismatch, cannot proceed.";
3179 3423
3180 # patch in the exptable 3424 # patch in the exptable
3425 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3181 $facedata->{resource}{"res/exp_table"} = { 3426 $facedata->{resource}{"res/exp_table"} = {
3182 type => FT_RSRC, 3427 type => FT_RSRC,
3183 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3428 data => $exp_table,
3429 hash => (Digest::MD5::md5 $exp_table),
3184 }; 3430 };
3185 cf::cede_to_tick; 3431 cf::cede_to_tick;
3186 3432
3187 { 3433 {
3188 my $faces = $facedata->{faceinfo}; 3434 my $faces = $facedata->{faceinfo};
3190 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
3191 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3437 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3192 3438
3193 cf::face::set_visibility $idx, $info->{visibility}; 3439 cf::face::set_visibility $idx, $info->{visibility};
3194 cf::face::set_magicmap $idx, $info->{magicmap}; 3440 cf::face::set_magicmap $idx, $info->{magicmap};
3195 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3441 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3196 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3442 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3197 3443
3198 cf::cede_to_tick; 3444 cf::cede_to_tick;
3199 } 3445 }
3200 3446
3201 while (my ($face, $info) = each %$faces) { 3447 while (my ($face, $info) = each %$faces) {
3206 3452
3207 if (my $smooth = cf::face::find $info->{smooth}) { 3453 if (my $smooth = cf::face::find $info->{smooth}) {
3208 cf::face::set_smooth $idx, $smooth; 3454 cf::face::set_smooth $idx, $smooth;
3209 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3455 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3210 } else { 3456 } else {
3211 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3457 error "smooth face '$info->{smooth}' not found for face '$face'";
3212 } 3458 }
3213 3459
3214 cf::cede_to_tick; 3460 cf::cede_to_tick;
3215 } 3461 }
3216 } 3462 }
3225 3471
3226 cf::anim::invalidate_all; # d'oh 3472 cf::anim::invalidate_all; # d'oh
3227 } 3473 }
3228 3474
3229 { 3475 {
3230 # TODO: for gcfclient pleasure, we should give resources
3231 # that gcfclient doesn't grok a >10000 face index.
3232 my $res = $facedata->{resource}; 3476 my $res = $facedata->{resource};
3233 3477
3234 while (my ($name, $info) = each %$res) { 3478 while (my ($name, $info) = each %$res) {
3235 if (defined $info->{type}) { 3479 if (defined $info->{type}) {
3236 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3480 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3237 my $data;
3238 3481
3239 if ($info->{type} & 1) { 3482 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}; 3483 cf::face::set_type $idx, $info->{type};
3254 } else { 3484 } else {
3255 $RESOURCE{$name} = $info; 3485 $RESOURCE{$name} = $info; # unused
3256 } 3486 }
3257 3487
3258 cf::cede_to_tick; 3488 cf::cede_to_tick;
3259 } 3489 }
3260 } 3490 }
3261 3491
3262 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3492 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3263 3493
3264 1 3494 1
3265} 3495}
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 3496
3287register_exticmd fx_want => sub { 3497register_exticmd fx_want => sub {
3288 my ($ns, $want) = @_; 3498 my ($ns, $want) = @_;
3289 3499
3290 while (my ($k, $v) = each %$want) { 3500 while (my ($k, $v) = each %$want) {
3329sub reload_treasures { 3539sub reload_treasures {
3330 load_resource_file "$DATADIR/treasures" 3540 load_resource_file "$DATADIR/treasures"
3331 or die "unable to load treasurelists\n"; 3541 or die "unable to load treasurelists\n";
3332} 3542}
3333 3543
3544sub reload_sound {
3545 trace "loading sound config from $DATADIR/sound\n";
3546
3547 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3548 or die "$DATADIR/sound $!";
3549
3550 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3551
3552 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3553 my $sound = $soundconf->{compat}[$_]
3554 or next;
3555
3556 my $face = cf::face::find "sound/$sound->[1]";
3557 cf::sound::set $sound->[0] => $face;
3558 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3559 }
3560
3561 while (my ($k, $v) = each %{$soundconf->{event}}) {
3562 my $face = cf::face::find "sound/$v";
3563 cf::sound::set $k => $face;
3564 }
3565}
3566
3334sub reload_resources { 3567sub reload_resources {
3335 warn "reloading resource files...\n"; 3568 trace "reloading resource files...\n";
3336 3569
3337 reload_facedata; 3570 reload_facedata;
3571 reload_sound;
3338 reload_archetypes; 3572 reload_archetypes;
3339 reload_regions; 3573 reload_regions;
3340 reload_treasures; 3574 reload_treasures;
3341 3575
3342 warn "finished reloading resource files\n"; 3576 trace "finished reloading resource files\n";
3343} 3577}
3344 3578
3345sub reload_config { 3579sub reload_config {
3580 trace "reloading config file...\n";
3581
3346 open my $fh, "<:utf8", "$CONFDIR/config" 3582 open my $fh, "<:utf8", "$CONFDIR/config"
3347 or return; 3583 or return;
3348 3584
3349 local $/; 3585 local $/;
3350 *CFG = YAML::Load <$fh>; 3586 *CFG = YAML::XS::Load scalar <$fh>;
3351 3587
3352 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3588 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3353 3589
3354 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3590 $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}; 3591 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3356 3592
3357 if (exists $CFG{mlockall}) { 3593 if (exists $CFG{mlockall}) {
3359 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3595 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3360 and die "WARNING: m(un)lockall failed: $!\n"; 3596 and die "WARNING: m(un)lockall failed: $!\n";
3361 }; 3597 };
3362 warn $@ if $@; 3598 warn $@ if $@;
3363 } 3599 }
3600
3601 trace "finished reloading resource files\n";
3364} 3602}
3365 3603
3366sub pidfile() { 3604sub pidfile() {
3367 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3605 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3368 or die "$PIDFILE: $!"; 3606 or die "$PIDFILE: $!";
3380 3618
3381 seek $fh, 0, 0; 3619 seek $fh, 0, 0;
3382 print $fh $$; 3620 print $fh $$;
3383} 3621}
3384 3622
3623sub main_loop {
3624 trace "EV::loop starting\n";
3625 if (1) {
3626 EV::loop;
3627 }
3628 trace "EV::loop returned\n";
3629 goto &main_loop unless $REALLY_UNLOOP;
3630}
3631
3385sub main { 3632sub main {
3386 cf::init_globals; # initialise logging 3633 cf::init_globals; # initialise logging
3387 3634
3388 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3635 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3389 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3636 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3390 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3637 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3391 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3638 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 3639
3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3640 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399 3641
3400 # we must not ever block the main coroutine 3642 # we must not ever block the main coroutine
3401 local $Coro::idle = sub { 3643 local $Coro::idle = sub {
3407 }; 3649 };
3408 3650
3409 evthread_start IO::AIO::poll_fileno; 3651 evthread_start IO::AIO::poll_fileno;
3410 3652
3411 cf::sync_job { 3653 cf::sync_job {
3654 init_inc;
3655
3656 cf::init_experience;
3657 cf::init_anim;
3658 cf::init_attackmess;
3659 cf::init_dynamic;
3660
3661 cf::load_settings;
3662 cf::load_materials;
3663
3412 reload_resources; 3664 reload_resources;
3413 reload_config; 3665 reload_config;
3414 db_init; 3666 db_init;
3415 3667
3416 cf::load_settings;
3417 cf::load_materials;
3418 cf::init_uuid; 3668 cf::init_uuid;
3419 cf::init_signals; 3669 cf::init_signals;
3420 cf::init_commands;
3421 cf::init_skills; 3670 cf::init_skills;
3422 3671
3423 cf::init_beforeplay; 3672 cf::init_beforeplay;
3424 3673
3425 atomic; 3674 atomic;
3427 load_extensions; 3676 load_extensions;
3428 3677
3429 utime time, time, $RUNTIMEFILE; 3678 utime time, time, $RUNTIMEFILE;
3430 3679
3431 # no (long-running) fork's whatsoever before this point(!) 3680 # no (long-running) fork's whatsoever before this point(!)
3681 use POSIX ();
3432 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3682 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3433 3683
3434 (pop @POST_INIT)->(0) while @POST_INIT; 3684 (pop @POST_INIT)->(0) while @POST_INIT;
3435 }; 3685 };
3436 3686
3437 EV::loop; 3687 cf::object::thawer::errors_are_fatal 0;
3688 info "parse errors in files are no longer fatal from this point on.\n";
3689
3690 my $free_main; $free_main = EV::idle sub {
3691 undef $free_main;
3692 undef &main; # free gobs of memory :)
3693 };
3694
3695 goto &main_loop;
3438} 3696}
3439 3697
3440############################################################################# 3698#############################################################################
3441# initialisation and cleanup 3699# initialisation and cleanup
3442 3700
3443# install some emergency cleanup handlers 3701# install some emergency cleanup handlers
3444BEGIN { 3702BEGIN {
3445 our %SIGWATCHER = (); 3703 our %SIGWATCHER = ();
3446 for my $signal (qw(INT HUP TERM)) { 3704 for my $signal (qw(INT HUP TERM)) {
3447 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3705 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3448 cf::cleanup "SIG$signal"; 3706 cf::cleanup "SIG$signal";
3449 }; 3707 };
3450 } 3708 }
3451} 3709}
3452 3710
3453sub write_runtime_sync { 3711sub write_runtime_sync {
3712 my $t0 = AE::time;
3713
3454 # first touch the runtime file to show we are still running: 3714 # first touch the runtime file to show we are still running:
3455 # the fsync below can take a very very long time. 3715 # the fsync below can take a very very long time.
3456 3716
3457 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3717 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3458 3718
3459 my $guard = cf::lock_acquire "write_runtime"; 3719 my $guard = cf::lock_acquire "write_runtime";
3460 3720
3461 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3721 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3462 or return; 3722 or return;
3463 3723
3464 my $value = $cf::RUNTIME + 90 + 10; 3724 my $value = $cf::RUNTIME + 90 + 10;
3465 # 10 is the runtime save interval, for a monotonic clock 3725 # 10 is the runtime save interval, for a monotonic clock
3466 # 60 allows for the watchdog to kill the server. 3726 # 60 allows for the watchdog to kill the server.
3479 or return; 3739 or return;
3480 3740
3481 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3741 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3482 and return; 3742 and return;
3483 3743
3484 warn "runtime file written.\n"; 3744 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3485 3745
3486 1 3746 1
3487} 3747}
3488 3748
3489our $uuid_lock; 3749our $uuid_lock;
3501 or return; 3761 or return;
3502 3762
3503 my $value = uuid_seq uuid_cur; 3763 my $value = uuid_seq uuid_cur;
3504 3764
3505 unless ($value) { 3765 unless ($value) {
3506 warn "cowardly refusing to write zero uuid value!\n"; 3766 info "cowardly refusing to write zero uuid value!\n";
3507 return; 3767 return;
3508 } 3768 }
3509 3769
3510 my $value = uuid_str $value + $uuid_skip; 3770 my $value = uuid_str $value + $uuid_skip;
3511 $uuid_skip = 0; 3771 $uuid_skip = 0;
3521 or return; 3781 or return;
3522 3782
3523 aio_rename "$uuid~", $uuid 3783 aio_rename "$uuid~", $uuid
3524 and return; 3784 and return;
3525 3785
3526 warn "uuid file written ($value).\n"; 3786 trace "uuid file written ($value).\n";
3527 3787
3528 1 3788 1
3529 3789
3530} 3790}
3531 3791
3537} 3797}
3538 3798
3539sub emergency_save() { 3799sub emergency_save() {
3540 my $freeze_guard = cf::freeze_mainloop; 3800 my $freeze_guard = cf::freeze_mainloop;
3541 3801
3542 warn "emergency_perl_save: enter\n"; 3802 info "emergency_perl_save: enter\n";
3803
3804 # this is a trade-off: we want to be very quick here, so
3805 # save all maps without fsync, and later call a global sync
3806 # (which in turn might be very very slow)
3807 local $USE_FSYNC = 0;
3543 3808
3544 cf::sync_job { 3809 cf::sync_job {
3545 # this is a trade-off: we want to be very quick here, so 3810 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 3811
3550 # use a peculiar iteration method to avoid tripping on perl 3812 # use a peculiar iteration method to avoid tripping on perl
3551 # refcount bugs in for. also avoids problems with players 3813 # refcount bugs in for. also avoids problems with players
3552 # and maps saved/destroyed asynchronously. 3814 # and maps saved/destroyed asynchronously.
3553 warn "emergency_perl_save: begin player save\n"; 3815 info "emergency_perl_save: begin player save\n";
3554 for my $login (keys %cf::PLAYER) { 3816 for my $login (keys %cf::PLAYER) {
3555 my $pl = $cf::PLAYER{$login} or next; 3817 my $pl = $cf::PLAYER{$login} or next;
3556 $pl->valid or next; 3818 $pl->valid or next;
3557 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3819 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3558 $pl->save; 3820 $pl->save;
3559 } 3821 }
3560 warn "emergency_perl_save: end player save\n"; 3822 info "emergency_perl_save: end player save\n";
3561 3823
3824 cf::write_runtime_sync; # external watchdog should not bark
3825
3562 warn "emergency_perl_save: begin map save\n"; 3826 info "emergency_perl_save: begin map save\n";
3563 for my $path (keys %cf::MAP) { 3827 for my $path (keys %cf::MAP) {
3564 my $map = $cf::MAP{$path} or next; 3828 my $map = $cf::MAP{$path} or next;
3565 $map->valid or next; 3829 $map->valid or next;
3566 $map->save; 3830 $map->save;
3567 } 3831 }
3568 warn "emergency_perl_save: end map save\n"; 3832 info "emergency_perl_save: end map save\n";
3569 3833
3834 cf::write_runtime_sync; # external watchdog should not bark
3835
3570 warn "emergency_perl_save: begin database checkpoint\n"; 3836 info "emergency_perl_save: begin database checkpoint\n";
3571 BDB::db_env_txn_checkpoint $DB_ENV; 3837 BDB::db_env_txn_checkpoint $DB_ENV;
3572 warn "emergency_perl_save: end database checkpoint\n"; 3838 info "emergency_perl_save: end database checkpoint\n";
3573 3839
3574 warn "emergency_perl_save: begin write uuid\n"; 3840 info "emergency_perl_save: begin write uuid\n";
3575 write_uuid_sync 1; 3841 write_uuid_sync 1;
3576 warn "emergency_perl_save: end write uuid\n"; 3842 info "emergency_perl_save: end write uuid\n";
3843
3844 cf::write_runtime_sync; # external watchdog should not bark
3845
3846 trace "emergency_perl_save: syncing database to disk";
3847 BDB::db_env_txn_checkpoint $DB_ENV;
3848
3849 info "emergency_perl_save: starting sync\n";
3850 IO::AIO::aio_sync sub {
3851 info "emergency_perl_save: finished sync\n";
3852 };
3853
3854 cf::write_runtime_sync; # external watchdog should not bark
3855
3856 trace "emergency_perl_save: flushing outstanding aio requests";
3857 while (IO::AIO::nreqs || BDB::nreqs) {
3858 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3859 }
3860
3861 cf::write_runtime_sync; # external watchdog should not bark
3577 }; 3862 };
3578 3863
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"; 3864 info "emergency_perl_save: leave\n";
3585} 3865}
3586 3866
3587sub post_cleanup { 3867sub post_cleanup {
3588 my ($make_core) = @_; 3868 my ($make_core) = @_;
3589 3869
3870 IO::AIO::flush;
3871
3590 warn Carp::longmess "post_cleanup backtrace" 3872 error Carp::longmess "post_cleanup backtrace"
3591 if $make_core; 3873 if $make_core;
3592 3874
3593 my $fh = pidfile; 3875 my $fh = pidfile;
3594 unlink $PIDFILE if <$fh> == $$; 3876 unlink $PIDFILE if <$fh> == $$;
3595} 3877}
3615 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3897 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3616 for my $name (keys %$leaf_symtab) { 3898 for my $name (keys %$leaf_symtab) {
3617 _gv_clear *{"$pkg$name"}; 3899 _gv_clear *{"$pkg$name"};
3618# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3900# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3619 } 3901 }
3620 warn "cleared package $pkg\n";#d#
3621} 3902}
3622 3903
3623sub do_reload_perl() { 3904sub do_reload_perl() {
3624 # can/must only be called in main 3905 # can/must only be called in main
3625 if ($Coro::current != $Coro::main) { 3906 if (in_main) {
3626 warn "can only reload from main coroutine"; 3907 error "can only reload from main coroutine";
3627 return; 3908 return;
3628 } 3909 }
3629 3910
3630 return if $RELOAD++; 3911 return if $RELOAD++;
3631 3912
3632 my $t1 = EV::time; 3913 my $t1 = AE::time;
3633 3914
3634 while ($RELOAD) { 3915 while ($RELOAD) {
3635 warn "reloading..."; 3916 info "reloading...";
3636 3917
3637 warn "entering sync_job"; 3918 trace "entering sync_job";
3638 3919
3639 cf::sync_job { 3920 cf::sync_job {
3640 cf::write_runtime_sync; # external watchdog should not bark
3641 cf::emergency_save; 3921 cf::emergency_save;
3642 cf::write_runtime_sync; # external watchdog should not bark
3643 3922
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"; 3923 trace "cancelling all extension coros";
3655 $_->cancel for values %EXT_CORO; 3924 $_->cancel for values %EXT_CORO;
3656 %EXT_CORO = (); 3925 %EXT_CORO = ();
3657 3926
3658 warn "removing commands"; 3927 trace "removing commands";
3659 %COMMAND = (); 3928 %COMMAND = ();
3660 3929
3661 warn "removing ext/exti commands"; 3930 trace "removing ext/exti commands";
3662 %EXTCMD = (); 3931 %EXTCMD = ();
3663 %EXTICMD = (); 3932 %EXTICMD = ();
3664 3933
3665 warn "unloading/nuking all extensions"; 3934 trace "unloading/nuking all extensions";
3666 for my $pkg (@EXTS) { 3935 for my $pkg (@EXTS) {
3667 warn "... unloading $pkg"; 3936 trace "... unloading $pkg";
3668 3937
3669 if (my $cb = $pkg->can ("unload")) { 3938 if (my $cb = $pkg->can ("unload")) {
3670 eval { 3939 eval {
3671 $cb->($pkg); 3940 $cb->($pkg);
3672 1 3941 1
3673 } or warn "$pkg unloaded, but with errors: $@"; 3942 } or error "$pkg unloaded, but with errors: $@";
3674 } 3943 }
3675 3944
3676 warn "... clearing $pkg"; 3945 trace "... clearing $pkg";
3677 clear_package $pkg; 3946 clear_package $pkg;
3678 } 3947 }
3679 3948
3680 warn "unloading all perl modules loaded from $LIBDIR"; 3949 trace "unloading all perl modules loaded from $LIBDIR";
3681 while (my ($k, $v) = each %INC) { 3950 while (my ($k, $v) = each %INC) {
3682 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3951 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3683 3952
3684 warn "... unloading $k"; 3953 trace "... unloading $k";
3685 delete $INC{$k}; 3954 delete $INC{$k};
3686 3955
3687 $k =~ s/\.pm$//; 3956 $k =~ s/\.pm$//;
3688 $k =~ s/\//::/g; 3957 $k =~ s/\//::/g;
3689 3958
3692 } 3961 }
3693 3962
3694 clear_package $k; 3963 clear_package $k;
3695 } 3964 }
3696 3965
3697 warn "getting rid of safe::, as good as possible"; 3966 trace "getting rid of safe::, as good as possible";
3698 clear_package "safe::$_" 3967 clear_package "safe::$_"
3699 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3968 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3700 3969
3701 warn "unloading cf.pm \"a bit\""; 3970 trace "unloading cf.pm \"a bit\"";
3702 delete $INC{"cf.pm"}; 3971 delete $INC{"cf.pm"};
3703 delete $INC{"cf/pod.pm"}; 3972 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3704 3973
3705 # don't, removes xs symbols, too, 3974 # don't, removes xs symbols, too,
3706 # and global variables created in xs 3975 # and global variables created in xs
3707 #clear_package __PACKAGE__; 3976 #clear_package __PACKAGE__;
3708 3977
3709 warn "unload completed, starting to reload now"; 3978 info "unload completed, starting to reload now";
3710 3979
3711 warn "reloading cf.pm"; 3980 trace "reloading cf.pm";
3712 require cf; 3981 require cf;
3713 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3982 cf::_connect_to_perl_1;
3714 3983
3715 warn "loading config and database again"; 3984 trace "loading config and database again";
3716 cf::reload_config; 3985 cf::reload_config;
3717 3986
3718 warn "loading extensions"; 3987 trace "loading extensions";
3719 cf::load_extensions; 3988 cf::load_extensions;
3720 3989
3721 if ($REATTACH_ON_RELOAD) { 3990 if ($REATTACH_ON_RELOAD) {
3722 warn "reattaching attachments to objects/players"; 3991 trace "reattaching attachments to objects/players";
3723 _global_reattach; # objects, sockets 3992 _global_reattach; # objects, sockets
3724 warn "reattaching attachments to maps"; 3993 trace "reattaching attachments to maps";
3725 reattach $_ for values %MAP; 3994 reattach $_ for values %MAP;
3726 warn "reattaching attachments to players"; 3995 trace "reattaching attachments to players";
3727 reattach $_ for values %PLAYER; 3996 reattach $_ for values %PLAYER;
3728 } 3997 }
3729 3998
3730 warn "running post_init jobs"; 3999 trace "running post_init jobs";
3731 (pop @POST_INIT)->(1) while @POST_INIT; 4000 (pop @POST_INIT)->(1) while @POST_INIT;
3732 4001
3733 warn "leaving sync_job"; 4002 trace "leaving sync_job";
3734 4003
3735 1 4004 1
3736 } or do { 4005 } or do {
3737 warn $@; 4006 error $@;
3738 cf::cleanup "error while reloading, exiting."; 4007 cf::cleanup "error while reloading, exiting.";
3739 }; 4008 };
3740 4009
3741 warn "reloaded"; 4010 info "reloaded";
3742 --$RELOAD; 4011 --$RELOAD;
3743 } 4012 }
3744 4013
3745 $t1 = EV::time - $t1; 4014 $t1 = AE::time - $t1;
3746 warn "reload completed in ${t1}s\n"; 4015 info "reload completed in ${t1}s\n";
3747}; 4016};
3748 4017
3749our $RELOAD_WATCHER; # used only during reload 4018our $RELOAD_WATCHER; # used only during reload
3750 4019
3751sub reload_perl() { 4020sub reload_perl() {
3753 # coro crashes during coro_state_free->destroy here. 4022 # coro crashes during coro_state_free->destroy here.
3754 4023
3755 $RELOAD_WATCHER ||= cf::async { 4024 $RELOAD_WATCHER ||= cf::async {
3756 Coro::AIO::aio_wait cache_extensions; 4025 Coro::AIO::aio_wait cache_extensions;
3757 4026
3758 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4027 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3759 do_reload_perl; 4028 do_reload_perl;
3760 undef $RELOAD_WATCHER; 4029 undef $RELOAD_WATCHER;
3761 }; 4030 };
3762 }; 4031 };
3763} 4032}
3772 reload_perl; 4041 reload_perl;
3773 }; 4042 };
3774 } 4043 }
3775}; 4044};
3776 4045
3777unshift @INC, $LIBDIR; 4046#############################################################################
3778 4047
3779my $bug_warning = 0; 4048my $bug_warning = 0;
3780 4049
3781our @WAIT_FOR_TICK; 4050our @WAIT_FOR_TICK;
3782our @WAIT_FOR_TICK_BEGIN; 4051our @WAIT_FOR_TICK_BEGIN;
3783 4052
3784sub wait_for_tick { 4053sub wait_for_tick {
3785 return if tick_inhibit || $Coro::current == $Coro::main; 4054 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3786 4055
3787 my $signal = new Coro::Signal; 4056 my $signal = new Coro::Signal;
3788 push @WAIT_FOR_TICK, $signal; 4057 push @WAIT_FOR_TICK, $signal;
3789 $signal->wait; 4058 $signal->wait;
3790} 4059}
3791 4060
3792sub wait_for_tick_begin { 4061sub wait_for_tick_begin {
3793 return if tick_inhibit || $Coro::current == $Coro::main; 4062 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3794 4063
3795 my $signal = new Coro::Signal; 4064 my $signal = new Coro::Signal;
3796 push @WAIT_FOR_TICK_BEGIN, $signal; 4065 push @WAIT_FOR_TICK_BEGIN, $signal;
3797 $signal->wait; 4066 $signal->wait;
3798} 4067}
3804 return; 4073 return;
3805 } 4074 }
3806 4075
3807 cf::server_tick; # one server iteration 4076 cf::server_tick; # one server iteration
3808 4077
4078 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4079
3809 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4080 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4081 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3811 Coro::async_pool { 4082 Coro::async_pool {
3812 $Coro::current->{desc} = "runtime saver"; 4083 $Coro::current->{desc} = "runtime saver";
3813 write_runtime_sync 4084 write_runtime_sync
3814 or warn "ERROR: unable to write runtime file: $!"; 4085 or error "ERROR: unable to write runtime file: $!";
3815 }; 4086 };
3816 } 4087 }
3817 4088
3818 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4089 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3819 $sig->send; 4090 $sig->send;
3827 4098
3828 if (0) { 4099 if (0) {
3829 if ($NEXT_TICK) { 4100 if ($NEXT_TICK) {
3830 my $jitter = $TICK_START - $NEXT_TICK; 4101 my $jitter = $TICK_START - $NEXT_TICK;
3831 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4102 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3832 warn "jitter $JITTER\n";#d# 4103 debug "jitter $JITTER\n";#d#
3833 } 4104 }
3834 } 4105 }
3835} 4106}
3836 4107
3837{ 4108{
3838 # configure BDB 4109 # configure BDB
3839 4110
3840 BDB::min_parallel 8; 4111 BDB::min_parallel 16;
3841 BDB::max_poll_reqs $TICK * 0.1; 4112 BDB::max_poll_reqs $TICK * 0.1;
3842 $AnyEvent::BDB::WATCHER->priority (1); 4113 $AnyEvent::BDB::WATCHER->priority (1);
3843 4114
3844 unless ($DB_ENV) { 4115 unless ($DB_ENV) {
3845 $DB_ENV = BDB::db_env_create; 4116 $DB_ENV = BDB::db_env_create;
3925 LOG llevInfo, "[ABT] [suppressed]\n"; 4196 LOG llevInfo, "[ABT] [suppressed]\n";
3926 } 4197 }
3927} 4198}
3928 4199
3929# load additional modules 4200# load additional modules
3930use cf::pod; 4201require "cf/$_.pm" for @EXTRA_MODULES;
4202cf::_connect_to_perl_2;
3931 4203
3932END { cf::emergency_save } 4204END { cf::emergency_save }
3933 4205
39341 42061
3935 4207

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines