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.460 by root, Mon Dec 15 17:04:53 2008 UTC vs.
Revision 1.540 by root, Tue May 4 23:32:29 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"; 1456 undef $@; # work around perl 5.10.0 utf-8 caching bug
1381 1457
1382 if (exists $v->{meta}{mandatory}) {
1383 warn $msg;
1384 cf::cleanup "mandatory extension failed to load, exiting."; 1458 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1385 } 1459 if exists $v->{meta}{mandatory};
1386 1460
1387 warn $msg; 1461 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1462 delete $todo{$k};
1463 } else {
1464 $done{$k} = delete $todo{$k};
1465 push @EXTS, $v->{pkg};
1466 $progress = 1;
1467
1468 info "$v->{base}: extension inactive.\n"
1469 unless $active;
1388 } 1470 }
1389
1390 $done{$k} = delete $todo{$k};
1391 push @EXTS, $v->{pkg};
1392 $progress = 1;
1393 } 1471 }
1394 1472
1395 skip: 1473 unless ($progress) {
1396 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1474 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1397 unless $progress; 1475
1476 while (my ($k, $v) = each %todo) {
1477 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1478 if exists $v->{meta}{mandatory};
1479 }
1480 }
1398 } 1481 }
1399 }; 1482 };
1400} 1483}
1401 1484
1402############################################################################# 1485#############################################################################
1486 $cf::PLAYER{$login} = $pl 1569 $cf::PLAYER{$login} = $pl
1487 } 1570 }
1488 } 1571 }
1489} 1572}
1490 1573
1574cf::player->attach (
1575 on_load => sub {
1576 my ($pl, $path) = @_;
1577
1578 # restore slots saved in save, below
1579 my $slots = delete $pl->{_slots};
1580
1581 $pl->ob->current_weapon ($slots->[0]);
1582 $pl->combat_ob ($slots->[1]);
1583 $pl->ranged_ob ($slots->[2]);
1584 },
1585);
1586
1491sub save($) { 1587sub save($) {
1492 my ($pl) = @_; 1588 my ($pl) = @_;
1493 1589
1494 return if $pl->{deny_save}; 1590 return if $pl->{deny_save};
1495 1591
1500 1596
1501 aio_mkdir playerdir $pl, 0770; 1597 aio_mkdir playerdir $pl, 0770;
1502 $pl->{last_save} = $cf::RUNTIME; 1598 $pl->{last_save} = $cf::RUNTIME;
1503 1599
1504 cf::get_slot 0.01; 1600 cf::get_slot 0.01;
1601
1602 # save slots, to be restored later
1603 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1505 1604
1506 $pl->save_pl ($path); 1605 $pl->save_pl ($path);
1507 cf::cede_to_tick; 1606 cf::cede_to_tick;
1508} 1607}
1509 1608
1546 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1645 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1547 1646
1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1647 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1549 $pl->deactivate; 1648 $pl->deactivate;
1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1649 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551 $pl->ob->check_score;
1552 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1650 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1553 $pl->ns->destroy if $pl->ns; 1651 $pl->ns->destroy if $pl->ns;
1554 1652
1555 my $path = playerdir $pl; 1653 my $path = playerdir $pl;
1556 my $temp = "$path~$cf::RUNTIME~deleting~"; 1654 my $temp = "$path~$cf::RUNTIME~deleting~";
1611 \@logins 1709 \@logins
1612} 1710}
1613 1711
1614=item $player->maps 1712=item $player->maps
1615 1713
1714=item cf::player::maps $login
1715
1616Returns an arrayref of map paths that are private for this 1716Returns an arrayref of map paths that are private for this
1617player. May block. 1717player. May block.
1618 1718
1619=cut 1719=cut
1620 1720
1682=cut 1782=cut
1683 1783
1684sub find_by_path($) { 1784sub find_by_path($) {
1685 my ($path) = @_; 1785 my ($path) = @_;
1686 1786
1787 $path =~ s/^~[^\/]*//; # skip ~login
1788
1687 my ($match, $specificity); 1789 my ($match, $specificity);
1688 1790
1689 for my $region (list) { 1791 for my $region (list) {
1690 if ($region->{match} && $path =~ $region->{match}) { 1792 if ($region->{match} && $path =~ $region->{match}) {
1691 ($match, $specificity) = ($region, $region->specificity) 1793 ($match, $specificity) = ($region, $region->specificity)
1722 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1824 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1723 1825
1724 # mit "rum" bekleckern, nicht 1826 # mit "rum" bekleckern, nicht
1725 $self->_create_random_map ( 1827 $self->_create_random_map (
1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1828 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1829 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1830 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1729 $rmp->{exit_on_final_map}, 1831 $rmp->{exit_on_final_map},
1730 $rmp->{xsize}, $rmp->{ysize}, 1832 $rmp->{xsize}, $rmp->{ysize},
1731 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1833 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1732 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1834 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1747 1849
1748sub register { 1850sub register {
1749 my (undef, $regex, $prio) = @_; 1851 my (undef, $regex, $prio) = @_;
1750 my $pkg = caller; 1852 my $pkg = caller;
1751 1853
1752 no strict;
1753 push @{"$pkg\::ISA"}, __PACKAGE__; 1854 push @{"$pkg\::ISA"}, __PACKAGE__;
1754 1855
1755 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1756} 1857}
1757 1858
1758# also paths starting with '/' 1859# also paths starting with '/'
1759$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1860$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1760 1861
1761sub thawer_merge { 1862sub thawer_merge {
1762 my ($self, $merge) = @_; 1863 my ($self, $merge) = @_;
1763 1864
1764 # we have to keep some variables in memory intact 1865 # we have to keep some variables in memory intact
1862 1963
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1964 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$UNIQUEDIR/$path" 1965 "$UNIQUEDIR/$path"
1865} 1966}
1866 1967
1867# and all this just because we cannot iterate over
1868# all maps in C++...
1869sub change_all_map_light {
1870 my ($change) = @_;
1871
1872 $_->change_map_light ($change)
1873 for grep $_->outdoor, values %cf::MAP;
1874}
1875
1876sub decay_objects { 1968sub decay_objects {
1877 my ($self) = @_; 1969 my ($self) = @_;
1878 1970
1879 return if $self->{deny_reset}; 1971 return if $self->{deny_reset};
1880 1972
1987 2079
1988 $cf::MAP{$path} = $map 2080 $cf::MAP{$path} = $map
1989 } 2081 }
1990} 2082}
1991 2083
1992sub pre_load { } 2084sub pre_load { }
1993sub post_load { } 2085#sub post_load { } # XS
1994 2086
1995sub load { 2087sub load {
1996 my ($self) = @_; 2088 my ($self) = @_;
1997 2089
1998 local $self->{deny_reset} = 1; # loading can take a long time 2090 local $self->{deny_reset} = 1; # loading can take a long time
2043 unless ($self->{deny_activate}) { 2135 unless ($self->{deny_activate}) {
2044 $self->decay_objects; 2136 $self->decay_objects;
2045 $self->fix_auto_apply; 2137 $self->fix_auto_apply;
2046 $self->update_buttons; 2138 $self->update_buttons;
2047 cf::cede_to_tick; 2139 cf::cede_to_tick;
2048 $self->set_darkness_map;
2049 cf::cede_to_tick;
2050 $self->activate; 2140 $self->activate;
2051 } 2141 }
2052 2142
2053 $self->{last_save} = $cf::RUNTIME; 2143 $self->{last_save} = $cf::RUNTIME;
2054 $self->last_access ($cf::RUNTIME); 2144 $self->last_access ($cf::RUNTIME);
2057 } 2147 }
2058 2148
2059 $self->post_load; 2149 $self->post_load;
2060} 2150}
2061 2151
2152# customize the map for a given player, i.e.
2153# return the _real_ map. used by e.g. per-player
2154# maps to change the path to ~playername/mappath
2062sub customise_for { 2155sub customise_for {
2063 my ($self, $ob) = @_; 2156 my ($self, $ob) = @_;
2064 2157
2065 return find "~" . $ob->name . "/" . $self->{path} 2158 return find "~" . $ob->name . "/" . $self->{path}
2066 if $self->per_player; 2159 if $self->per_player;
2082 or next; 2175 or next;
2083 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
2084 or next; 2177 or next;
2085 $neigh->load; 2178 $neigh->load;
2086 2179
2180 # now find the diagonal neighbours
2087 push @neigh, 2181 push @neigh,
2088 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2089 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2090 } 2184 }
2091 2185
2098} 2192}
2099 2193
2100sub find_sync { 2194sub find_sync {
2101 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2102 2196
2103 cf::sync_job { find $path, $origin } 2197 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198 if $Coro::current == $Coro::main;
2199
2200 find $path, $origin
2104} 2201}
2105 2202
2106sub do_load_sync { 2203sub do_load_sync {
2107 my ($map) = @_; 2204 my ($map) = @_;
2108 2205
2109 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2110 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2111 2208
2112 cf::sync_job { $map->load }; 2209 $map->load;
2113} 2210}
2114 2211
2115our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2116our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2117 2214
2143 $MAP_PREFETCHER->prio (6); 2240 $MAP_PREFETCHER->prio (6);
2144 2241
2145 () 2242 ()
2146} 2243}
2147 2244
2245# common code, used by both ->save and ->swapout
2148sub save { 2246sub _save {
2149 my ($self) = @_; 2247 my ($self) = @_;
2150
2151 my $lock = cf::lock_acquire "map_data:$self->{path}";
2152 2248
2153 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2154 2250
2155 return unless $self->dirty; 2251 return unless $self->dirty;
2156 2252
2176 } else { 2272 } else {
2177 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2273 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2178 } 2274 }
2179} 2275}
2180 2276
2277sub save {
2278 my ($self) = @_;
2279
2280 my $lock = cf::lock_acquire "map_data:$self->{path}";
2281
2282 $self->_save;
2283}
2284
2181sub swap_out { 2285sub swap_out {
2182 my ($self) = @_; 2286 my ($self) = @_;
2183 2287
2184 # save first because save cedes
2185 $self->save;
2186
2187 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2288 my $lock = cf::lock_acquire "map_data:$self->{path}";
2188 2289
2189 return if $self->players;
2190 return if $self->in_memory != cf::MAP_ACTIVE; 2290 return if $self->in_memory != cf::MAP_ACTIVE;
2191 return if $self->{deny_save}; 2291 return if $self->{deny_save};
2292 return if $self->players;
2192 2293
2294 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP;
2193 $self->in_memory (cf::MAP_SWAPPED); 2297 $self->in_memory (cf::MAP_SWAPPED);
2298
2299 # then atomically save
2300 $self->_save;
2301
2302 # then free the map
2303 $self->clear;
2304}
2305
2306sub reset_at {
2307 my ($self) = @_;
2308
2309 # TODO: safety, remove and allow resettable per-player maps
2310 return 1e99 if $self->{deny_reset};
2311
2312 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2313 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2314
2315 $time + $to
2316}
2317
2318sub should_reset {
2319 my ($self) = @_;
2320
2321 $self->reset_at <= $cf::RUNTIME
2322}
2323
2324sub reset {
2325 my ($self) = @_;
2326
2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2328
2329 return if $self->players;
2330
2331 cf::trace "resetting map ", $self->path, "\n";
2332
2333 $self->in_memory (cf::MAP_SWAPPED);
2334
2335 # need to save uniques path
2336 unless ($self->{deny_save}) {
2337 my $uniq = $self->uniq_path; utf8::encode $uniq;
2338
2339 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2340 if $uniq;
2341 }
2342
2343 delete $cf::MAP{$self->path};
2194 2344
2195 $self->deactivate; 2345 $self->deactivate;
2196 $_->clear_links_to ($self) for values %cf::MAP; 2346 $_->clear_links_to ($self) for values %cf::MAP;
2197 $self->clear; 2347 $self->clear;
2198}
2199
2200sub reset_at {
2201 my ($self) = @_;
2202
2203 # TODO: safety, remove and allow resettable per-player maps
2204 return 1e99 if $self->{deny_reset};
2205
2206 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2207 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2208
2209 $time + $to
2210}
2211
2212sub should_reset {
2213 my ($self) = @_;
2214
2215 $self->reset_at <= $cf::RUNTIME
2216}
2217
2218sub reset {
2219 my ($self) = @_;
2220
2221 my $lock = cf::lock_acquire "map_data:$self->{path}";
2222
2223 return if $self->players;
2224
2225 warn "resetting map ", $self->path;
2226
2227 $self->in_memory (cf::MAP_SWAPPED);
2228
2229 # need to save uniques path
2230 unless ($self->{deny_save}) {
2231 my $uniq = $self->uniq_path; utf8::encode $uniq;
2232
2233 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2234 if $uniq;
2235 }
2236
2237 delete $cf::MAP{$self->path};
2238
2239 $self->deactivate;
2240 $_->clear_links_to ($self) for values %cf::MAP;
2241 $self->clear;
2242 2348
2243 $self->unlink_save; 2349 $self->unlink_save;
2244 $self->destroy; 2350 $self->destroy;
2245} 2351}
2246 2352
2254 2360
2255 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
2256 2362
2257 $self->unlink_save; 2363 $self->unlink_save;
2258 2364
2259 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
2260 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
2261 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
2262 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
2263 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2264 2370
2321 : normalise $_ 2427 : normalise $_
2322 } @{ aio_readdir $UNIQUEDIR or [] } 2428 } @{ aio_readdir $UNIQUEDIR or [] }
2323 ] 2429 ]
2324} 2430}
2325 2431
2432=item cf::map::static_maps
2433
2434Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2435file in the shared directory excluding F</styles> and F</editor>). May
2436block.
2437
2438=cut
2439
2440sub static_maps() {
2441 my @dirs = "";
2442 my @maps;
2443
2444 while (@dirs) {
2445 my $dir = shift @dirs;
2446
2447 next if $dir eq "/styles" || $dir eq "/editor";
2448
2449 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2450 or return;
2451
2452 for (@$files) {
2453 s/\.map$// or next;
2454 utf8::decode $_;
2455 push @maps, "$dir/$_";
2456 }
2457
2458 push @dirs, map "$dir/$_", @$dirs;
2459 }
2460
2461 \@maps
2462}
2463
2326=back 2464=back
2327 2465
2328=head3 cf::object 2466=head3 cf::object
2329 2467
2330=cut 2468=cut
2395 2533
2396our $SAY_CHANNEL = { 2534our $SAY_CHANNEL = {
2397 id => "say", 2535 id => "say",
2398 title => "Map", 2536 title => "Map",
2399 reply => "say ", 2537 reply => "say ",
2400 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2538 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2401}; 2539};
2402 2540
2403our $CHAT_CHANNEL = { 2541our $CHAT_CHANNEL = {
2404 id => "chat", 2542 id => "chat",
2405 title => "Chat", 2543 title => "Chat",
2462 2600
2463Freezes the player and moves him/her to a special map (C<{link}>). 2601Freezes the player and moves him/her to a special map (C<{link}>).
2464 2602
2465The player should be reasonably safe there for short amounts of time (e.g. 2603The player should be reasonably safe there for short amounts of time (e.g.
2466for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2604for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2467though, as the palyer cannot control the character while it is on the link 2605though, as the player cannot control the character while it is on the link
2468map. 2606map.
2469 2607
2470Will never block. 2608Will never block.
2471 2609
2472=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
2493sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2494 my ($self) = @_; 2632 my ($self) = @_;
2495 2633
2496 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2497 2635
2636 ++$self->{_link_recursion};
2637
2498 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2499 2639
2500 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2501 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2502 2642
2503 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2643 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2504} 2644}
2505 2645
2506sub cf::object::player::leave_link { 2646sub cf::object::player::leave_link {
2507 my ($self, $map, $x, $y) = @_; 2647 my ($self, $map, $x, $y) = @_;
2508 2648
2525 ($x, $y) = (-1, -1) 2665 ($x, $y) = (-1, -1)
2526 unless (defined $x) && (defined $y); 2666 unless (defined $x) && (defined $y);
2527 2667
2528 # use -1 or undef as default coordinates, not 0, 0 2668 # use -1 or undef as default coordinates, not 0, 0
2529 ($x, $y) = ($map->enter_x, $map->enter_y) 2669 ($x, $y) = ($map->enter_x, $map->enter_y)
2530 if $x <=0 && $y <= 0; 2670 if $x <= 0 && $y <= 0;
2531 2671
2532 $map->load; 2672 $map->load;
2533 $map->load_neighbours; 2673 $map->load_neighbours;
2534 2674
2535 return unless $self->contr->active; 2675 return unless $self->contr->active;
2536 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2537 $self->activate_recursive;
2538 2676
2539 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2540 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2541} 2679 # entering was successful
2680 delete $self->{_link_recursion};
2681 # only activate afterwards, to support waiting in hooks
2682 $self->activate_recursive;
2683 }
2542 2684
2685}
2686
2543=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2687=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2544 2688
2545Moves the player to the given map-path and coordinates by first freezing 2689Moves the player to the given map-path and coordinates by first freezing
2546her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2547that has to return the map if sucecssful, and then unfreezes the player on 2691that has to return the map if sucecssful, and then unfreezes the player on
2548the new (success) or old (failed) map position. In either case, $done will 2692the new (success) or old (failed) map position. In either case, $done will
2555 2699
2556our $GOTOGEN; 2700our $GOTOGEN;
2557 2701
2558sub cf::object::player::goto { 2702sub cf::object::player::goto {
2559 my ($self, $path, $x, $y, $check, $done) = @_; 2703 my ($self, $path, $x, $y, $check, $done) = @_;
2704
2705 if ($self->{_link_recursion} >= $MAX_LINKS) {
2706 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2707 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2708 ($path, $x, $y) = @$EMERGENCY_POSITION;
2709 }
2560 2710
2561 # do generation counting so two concurrent goto's will be executed in-order 2711 # do generation counting so two concurrent goto's will be executed in-order
2562 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2563 2713
2564 $self->enter_link; 2714 $self->enter_link;
2588 my $map = eval { 2738 my $map = eval {
2589 my $map = defined $path ? cf::map::find $path : undef; 2739 my $map = defined $path ? cf::map::find $path : undef;
2590 2740
2591 if ($map) { 2741 if ($map) {
2592 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2593 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2594 } else { 2744 } else {
2595 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2745 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2596 } 2746 }
2597 2747
2598 $map 2748 $map
2606 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2607 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2608 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2609 } 2759 }
2610 2760
2611 $done->() if $done; 2761 $done->($self) if $done;
2612 })->prio (1); 2762 })->prio (1);
2613} 2763}
2614 2764
2615=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2616 2766
2709 $self->message ("Something went wrong deep within the deliantra server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2710 . "I'll try to bring you back to the map you were before. " 2860 . "I'll try to bring you back to the map you were before. "
2711 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2712 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2713 2863
2714 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2715 $self->leave_link; 2865 $self->leave_link;
2716 } 2866 }
2717 })->prio (1); 2867 })->prio (1);
2718} 2868}
2719 2869
2731sub cf::client::send_drawinfo { 2881sub cf::client::send_drawinfo {
2732 my ($self, $text, $flags) = @_; 2882 my ($self, $text, $flags) = @_;
2733 2883
2734 utf8::encode $text; 2884 utf8::encode $text;
2735 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2885 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2886}
2887
2888=item $client->send_big_packet ($pkt)
2889
2890Like C<send_packet>, but tries to compress large packets, and fragments
2891them as required.
2892
2893=cut
2894
2895our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2896
2897sub cf::client::send_big_packet {
2898 my ($self, $pkt) = @_;
2899
2900 # try lzf for large packets
2901 $pkt = "lzf " . Compress::LZF::compress $pkt
2902 if 1024 <= length $pkt and $self->{can_lzf};
2903
2904 # split very large packets
2905 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2906 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2907 $pkt = "frag";
2908 }
2909
2910 $self->send_packet ($pkt);
2736} 2911}
2737 2912
2738=item $client->send_msg ($channel, $msg, $color, [extra...]) 2913=item $client->send_msg ($channel, $msg, $color, [extra...])
2739 2914
2740Send a drawinfo or msg packet to the client, formatting the msg for the 2915Send a drawinfo or msg packet to the client, formatting the msg for the
2744 2919
2745=cut 2920=cut
2746 2921
2747# non-persistent channels (usually the info channel) 2922# non-persistent channels (usually the info channel)
2748our %CHANNEL = ( 2923our %CHANNEL = (
2924 "c/motd" => {
2925 id => "infobox",
2926 title => "MOTD",
2927 reply => undef,
2928 tooltip => "The message of the day",
2929 },
2749 "c/identify" => { 2930 "c/identify" => {
2750 id => "infobox", 2931 id => "infobox",
2751 title => "Identify", 2932 title => "Identify",
2752 reply => undef, 2933 reply => undef,
2753 tooltip => "Items recently identified", 2934 tooltip => "Items recently identified",
2755 "c/examine" => { 2936 "c/examine" => {
2756 id => "infobox", 2937 id => "infobox",
2757 title => "Examine", 2938 title => "Examine",
2758 reply => undef, 2939 reply => undef,
2759 tooltip => "Signs and other items you examined", 2940 tooltip => "Signs and other items you examined",
2941 },
2942 "c/shopinfo" => {
2943 id => "infobox",
2944 title => "Shop Info",
2945 reply => undef,
2946 tooltip => "What your bargaining skill tells you about the shop",
2760 }, 2947 },
2761 "c/book" => { 2948 "c/book" => {
2762 id => "infobox", 2949 id => "infobox",
2763 title => "Book", 2950 title => "Book",
2764 reply => undef, 2951 reply => undef,
2780 id => "infobox", 2967 id => "infobox",
2781 title => "Body Parts", 2968 title => "Body Parts",
2782 reply => undef, 2969 reply => undef,
2783 tooltip => "Shows which body parts you posess and are available", 2970 tooltip => "Shows which body parts you posess and are available",
2784 }, 2971 },
2972 "c/statistics" => {
2973 id => "infobox",
2974 title => "Statistics",
2975 reply => undef,
2976 tooltip => "Shows your primary statistics",
2977 },
2785 "c/skills" => { 2978 "c/skills" => {
2786 id => "infobox", 2979 id => "infobox",
2787 title => "Skills", 2980 title => "Skills",
2788 reply => undef, 2981 reply => undef,
2789 tooltip => "Shows your experience per skill and item power", 2982 tooltip => "Shows your experience per skill and item power",
2983 },
2984 "c/shopitems" => {
2985 id => "infobox",
2986 title => "Shop Items",
2987 reply => undef,
2988 tooltip => "Shows the items currently for sale in this shop",
2989 },
2990 "c/resistances" => {
2991 id => "infobox",
2992 title => "Resistances",
2993 reply => undef,
2994 tooltip => "Shows your resistances",
2995 },
2996 "c/pets" => {
2997 id => "infobox",
2998 title => "Pets",
2999 reply => undef,
3000 tooltip => "Shows information abotu your pets/a specific pet",
3001 },
3002 "c/perceiveself" => {
3003 id => "infobox",
3004 title => "Perceive Self",
3005 reply => undef,
3006 tooltip => "You gained detailed knowledge about yourself",
2790 }, 3007 },
2791 "c/uptime" => { 3008 "c/uptime" => {
2792 id => "infobox", 3009 id => "infobox",
2793 title => "Uptime", 3010 title => "Uptime",
2794 reply => undef, 3011 reply => undef,
2804 id => "party", 3021 id => "party",
2805 title => "Party", 3022 title => "Party",
2806 reply => "gsay ", 3023 reply => "gsay ",
2807 tooltip => "Messages and chat related to your party", 3024 tooltip => "Messages and chat related to your party",
2808 }, 3025 },
3026 "c/death" => {
3027 id => "death",
3028 title => "Death",
3029 reply => undef,
3030 tooltip => "Reason for and more info about your most recent death",
3031 },
3032 "c/say" => $SAY_CHANNEL,
3033 "c/chat" => $CHAT_CHANNEL,
2809); 3034);
2810 3035
2811sub cf::client::send_msg { 3036sub cf::client::send_msg {
2812 my ($self, $channel, $msg, $color, @extra) = @_; 3037 my ($self, $channel, $msg, $color, @extra) = @_;
2813 3038
2818 3043
2819 # check predefined channels, for the benefit of C 3044 # check predefined channels, for the benefit of C
2820 if ($CHANNEL{$channel}) { 3045 if ($CHANNEL{$channel}) {
2821 $channel = $CHANNEL{$channel}; 3046 $channel = $CHANNEL{$channel};
2822 3047
2823 $self->ext_msg (channel_info => $channel) 3048 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825
2826 $channel = $channel->{id}; 3049 $channel = $channel->{id};
2827 3050
2828 } elsif (ref $channel) { 3051 } elsif (ref $channel) {
2829 # send meta info to client, if not yet sent 3052 # send meta info to client, if not yet sent
2830 unless (exists $self->{channel}{$channel->{id}}) { 3053 unless (exists $self->{channel}{$channel->{id}}) {
2831 $self->{channel}{$channel->{id}} = $channel; 3054 $self->{channel}{$channel->{id}} = $channel;
2832 $self->ext_msg (channel_info => $channel) 3055 $self->ext_msg (channel_info => $channel);
2833 if $self->can_msg;
2834 } 3056 }
2835 3057
2836 $channel = $channel->{id}; 3058 $channel = $channel->{id};
2837 } 3059 }
2838 3060
2839 return unless @extra || length $msg; 3061 return unless @extra || length $msg;
2840 3062
2841 if ($self->can_msg) {
2842 # default colour, mask it out 3063 # default colour, mask it out
2843 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3064 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2844 if $color & cf::NDI_DEF; 3065 if $color & cf::NDI_DEF;
2845 3066
2846 my $pkt = "msg " 3067 my $pkt = "msg "
2847 . $self->{json_coder}->encode ( 3068 . $self->{json_coder}->encode (
2848 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3069 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2849 ); 3070 );
2850 3071
2851 # try lzf for large packets
2852 $pkt = "lzf " . Compress::LZF::compress $pkt
2853 if 1024 <= length $pkt and $self->{can_lzf};
2854
2855 # split very large packets
2856 if (8192 < length $pkt and $self->{can_lzf}) {
2857 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2858 $pkt = "frag";
2859 }
2860
2861 $self->send_packet ($pkt); 3072 $self->send_big_packet ($pkt);
2862 } else {
2863 if ($color >= 0) {
2864 # replace some tags by gcfclient-compatible ones
2865 for ($msg) {
2866 1 while
2867 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2868 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2869 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2870 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2871 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2872 }
2873
2874 $color &= cf::NDI_COLOR_MASK;
2875
2876 utf8::encode $msg;
2877
2878 if (0 && $msg =~ /\[/) {
2879 # COMMAND/INFO
2880 $self->send_packet ("drawextinfo $color 10 8 $msg")
2881 } else {
2882 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2883 $self->send_packet ("drawinfo $color $msg")
2884 }
2885 }
2886 }
2887} 3073}
2888 3074
2889=item $client->ext_msg ($type, @msg) 3075=item $client->ext_msg ($type, @msg)
2890 3076
2891Sends an ext event to the client. 3077Sends an ext event to the client.
2894 3080
2895sub cf::client::ext_msg($$@) { 3081sub cf::client::ext_msg($$@) {
2896 my ($self, $type, @msg) = @_; 3082 my ($self, $type, @msg) = @_;
2897 3083
2898 if ($self->extcmd == 2) { 3084 if ($self->extcmd == 2) {
2899 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3085 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2900 } elsif ($self->extcmd == 1) { # TODO: remove 3086 } elsif ($self->extcmd == 1) { # TODO: remove
2901 push @msg, msgtype => "event_$type"; 3087 push @msg, msgtype => "event_$type";
2902 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3088 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2903 } 3089 }
2904} 3090}
2905 3091
2906=item $client->ext_reply ($msgid, @msg) 3092=item $client->ext_reply ($msgid, @msg)
2907 3093
2911 3097
2912sub cf::client::ext_reply($$@) { 3098sub cf::client::ext_reply($$@) {
2913 my ($self, $id, @msg) = @_; 3099 my ($self, $id, @msg) = @_;
2914 3100
2915 if ($self->extcmd == 2) { 3101 if ($self->extcmd == 2) {
2916 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3102 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2917 } elsif ($self->extcmd == 1) { 3103 } elsif ($self->extcmd == 1) {
2918 #TODO: version 1, remove 3104 #TODO: version 1, remove
2919 unshift @msg, msgtype => "reply", msgid => $id; 3105 unshift @msg, msgtype => "reply", msgid => $id;
2920 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3106 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2921 } 3107 }
2922} 3108}
2923 3109
2924=item $success = $client->query ($flags, "text", \&cb) 3110=item $success = $client->query ($flags, "text", \&cb)
2925 3111
2996 3182
2997 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
2998 if $reply; 3184 if $reply;
2999 3185
3000 } else { 3186 } else {
3001 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3187 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3002 } 3188 }
3003 3189
3004 cf::override; 3190 cf::override;
3005 }, 3191 },
3006); 3192);
3026 3212
3027 $coro 3213 $coro
3028} 3214}
3029 3215
3030cf::client->attach ( 3216cf::client->attach (
3031 on_destroy => sub { 3217 on_client_destroy => sub {
3032 my ($ns) = @_; 3218 my ($ns) = @_;
3033 3219
3034 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3220 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3035 }, 3221 },
3036); 3222);
3052our $safe_hole = new Safe::Hole; 3238our $safe_hole = new Safe::Hole;
3053 3239
3054$SIG{FPE} = 'IGNORE'; 3240$SIG{FPE} = 'IGNORE';
3055 3241
3056$safe->permit_only (Opcode::opset qw( 3242$safe->permit_only (Opcode::opset qw(
3057 :base_core :base_mem :base_orig :base_math 3243 :base_core :base_mem :base_orig :base_math :base_loop
3058 grepstart grepwhile mapstart mapwhile 3244 grepstart grepwhile mapstart mapwhile
3059 sort time 3245 sort time
3060)); 3246));
3061 3247
3062# here we export the classes and methods available to script code 3248# here we export the classes and methods available to script code
3066The following functions and methods are available within a safe environment: 3252The following functions and methods are available within a safe environment:
3067 3253
3068 cf::object 3254 cf::object
3069 contr pay_amount pay_player map x y force_find force_add destroy 3255 contr pay_amount pay_player map x y force_find force_add destroy
3070 insert remove name archname title slaying race decrease split 3256 insert remove name archname title slaying race decrease split
3257 value
3071 3258
3072 cf::object::player 3259 cf::object::player
3073 player 3260 player
3074 3261
3075 cf::player 3262 cf::player
3081=cut 3268=cut
3082 3269
3083for ( 3270for (
3084 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3271 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3085 insert remove inv nrof name archname title slaying race 3272 insert remove inv nrof name archname title slaying race
3086 decrease split destroy change_exp)], 3273 decrease split destroy change_exp value msg lore send_msg)],
3087 ["cf::object::player" => qw(player)], 3274 ["cf::object::player" => qw(player)],
3088 ["cf::player" => qw(peaceful)], 3275 ["cf::player" => qw(peaceful send_msg)],
3089 ["cf::map" => qw(trigger)], 3276 ["cf::map" => qw(trigger)],
3090) { 3277) {
3091 no strict 'refs';
3092 my ($pkg, @funs) = @$_; 3278 my ($pkg, @funs) = @$_;
3093 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3279 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3094 for @funs; 3280 for @funs;
3095} 3281}
3096 3282
3111 3297
3112 my $qcode = $code; 3298 my $qcode = $code;
3113 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3299 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3114 $qcode =~ s/\n/\\n/g; 3300 $qcode =~ s/\n/\\n/g;
3115 3301
3302 %vars = (_dummy => 0) unless %vars;
3303
3304 my @res;
3116 local $_; 3305 local $_;
3117 local @safe::cf::_safe_eval_args = values %vars;
3118 3306
3119 my $eval = 3307 my $eval =
3120 "do {\n" 3308 "do {\n"
3121 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3309 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3122 . "#line 0 \"{$qcode}\"\n" 3310 . "#line 0 \"{$qcode}\"\n"
3123 . $code 3311 . $code
3124 . "\n}" 3312 . "\n}"
3125 ; 3313 ;
3126 3314
3315 if ($CFG{safe_eval}) {
3127 sub_generation_inc; 3316 sub_generation_inc;
3317 local @safe::cf::_safe_eval_args = values %vars;
3128 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3318 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3129 sub_generation_inc; 3319 sub_generation_inc;
3320 } else {
3321 local @cf::_safe_eval_args = values %vars;
3322 @res = wantarray ? eval eval : scalar eval $eval;
3323 }
3130 3324
3131 if ($@) { 3325 if ($@) {
3132 warn "$@"; 3326 warn "$@",
3133 warn "while executing safe code '$code'\n"; 3327 "while executing safe code '$code'\n",
3134 warn "with arguments " . (join " ", %vars) . "\n"; 3328 "with arguments " . (join " ", %vars) . "\n";
3135 } 3329 }
3136 3330
3137 wantarray ? @res : $res[0] 3331 wantarray ? @res : $res[0]
3138} 3332}
3139 3333
3153=cut 3347=cut
3154 3348
3155sub register_script_function { 3349sub register_script_function {
3156 my ($fun, $cb) = @_; 3350 my ($fun, $cb) = @_;
3157 3351
3158 no strict 'refs'; 3352 $fun = "safe::$fun" if $CFG{safe_eval};
3159 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3353 *$fun = $safe_hole->wrap ($cb);
3160} 3354}
3161 3355
3162=back 3356=back
3163 3357
3164=cut 3358=cut
3165 3359
3166############################################################################# 3360#############################################################################
3167# the server's init and main functions 3361# the server's init and main functions
3362
3363# async inc loader. yay.
3364sub inc_loader {
3365 my $mod = $_[1];
3366
3367 if (in_main && !tick_inhibit) {
3368 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3369 } else {
3370 debug "loading perl module $mod\n";
3371 }
3372
3373 # 1. find real file
3374 for my $dir (@ORIG_INC) {
3375 warn "$dir/$mod\n";#d#
3376 ref $dir and next;
3377 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3378 or next;
3379
3380 $data = "#line 1 $dir/$mod\n$data";
3381
3382 open my $fh, "<", \$data or die;
3383
3384 return $fh;
3385 }
3386
3387 ()
3388}
3389
3390sub init_inc {
3391 # save original @INC
3392 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3393
3394 # make sure we can do scalar-opens
3395 open my $dummy, "<", \my $dummy2;
3396
3397 # execute some stuff so perl load's some of the core modules
3398 /Ü/ =~ /ü/i;
3399 eval { &Storable::nstore_fd };
3400
3401 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3402
3403 debug "module loading will be asynchronous from this point on.";
3404}
3168 3405
3169sub load_facedata($) { 3406sub load_facedata($) {
3170 my ($path) = @_; 3407 my ($path) = @_;
3171 3408
3172 # HACK to clear player env face cache, we need some signal framework 3409 # HACK to clear player env face cache, we need some signal framework
3173 # for this (global event?) 3410 # for this (global event?)
3174 %ext::player_env::MUSIC_FACE_CACHE = (); 3411 %ext::player_env::MUSIC_FACE_CACHE = ();
3175 3412
3176 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3413 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3177 3414
3178 warn "loading facedata from $path\n"; 3415 trace "loading facedata from $path\n";
3179 3416
3180 my $facedata; 3417 my $facedata;
3181 0 < aio_load $path, $facedata 3418 0 < aio_load $path, $facedata
3182 or die "$path: $!"; 3419 or die "$path: $!";
3183 3420
3185 3422
3186 $facedata->{version} == 2 3423 $facedata->{version} == 2
3187 or cf::cleanup "$path: version mismatch, cannot proceed."; 3424 or cf::cleanup "$path: version mismatch, cannot proceed.";
3188 3425
3189 # patch in the exptable 3426 # patch in the exptable
3427 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3190 $facedata->{resource}{"res/exp_table"} = { 3428 $facedata->{resource}{"res/exp_table"} = {
3191 type => FT_RSRC, 3429 type => FT_RSRC,
3192 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3430 data => $exp_table,
3431 hash => (Digest::MD5::md5 $exp_table),
3193 }; 3432 };
3194 cf::cede_to_tick; 3433 cf::cede_to_tick;
3195 3434
3196 { 3435 {
3197 my $faces = $facedata->{faceinfo}; 3436 my $faces = $facedata->{faceinfo};
3199 while (my ($face, $info) = each %$faces) { 3438 while (my ($face, $info) = each %$faces) {
3200 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3439 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3201 3440
3202 cf::face::set_visibility $idx, $info->{visibility}; 3441 cf::face::set_visibility $idx, $info->{visibility};
3203 cf::face::set_magicmap $idx, $info->{magicmap}; 3442 cf::face::set_magicmap $idx, $info->{magicmap};
3204 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3443 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3205 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3444 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3206 3445
3207 cf::cede_to_tick; 3446 cf::cede_to_tick;
3208 } 3447 }
3209 3448
3210 while (my ($face, $info) = each %$faces) { 3449 while (my ($face, $info) = each %$faces) {
3215 3454
3216 if (my $smooth = cf::face::find $info->{smooth}) { 3455 if (my $smooth = cf::face::find $info->{smooth}) {
3217 cf::face::set_smooth $idx, $smooth; 3456 cf::face::set_smooth $idx, $smooth;
3218 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3457 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3219 } else { 3458 } else {
3220 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3459 error "smooth face '$info->{smooth}' not found for face '$face'";
3221 } 3460 }
3222 3461
3223 cf::cede_to_tick; 3462 cf::cede_to_tick;
3224 } 3463 }
3225 } 3464 }
3234 3473
3235 cf::anim::invalidate_all; # d'oh 3474 cf::anim::invalidate_all; # d'oh
3236 } 3475 }
3237 3476
3238 { 3477 {
3239 # TODO: for gcfclient pleasure, we should give resources
3240 # that gcfclient doesn't grok a >10000 face index.
3241 my $res = $facedata->{resource}; 3478 my $res = $facedata->{resource};
3242 3479
3243 while (my ($name, $info) = each %$res) { 3480 while (my ($name, $info) = each %$res) {
3244 if (defined $info->{type}) { 3481 if (defined $info->{type}) {
3245 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3482 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3246 my $data;
3247 3483
3248 if ($info->{type} & 1) { 3484 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3249 # prepend meta info
3250
3251 my $meta = $enc->encode ({
3252 name => $name,
3253 %{ $info->{meta} || {} },
3254 });
3255
3256 $data = pack "(w/a*)*", $meta, $info->{data};
3257 } else {
3258 $data = $info->{data};
3259 }
3260
3261 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3262 cf::face::set_type $idx, $info->{type}; 3485 cf::face::set_type $idx, $info->{type};
3263 } else { 3486 } else {
3264 $RESOURCE{$name} = $info; 3487 $RESOURCE{$name} = $info; # unused
3265 } 3488 }
3266 3489
3267 cf::cede_to_tick; 3490 cf::cede_to_tick;
3268 } 3491 }
3269 } 3492 }
3270 3493
3271 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3494 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3272 3495
3273 1 3496 1
3274} 3497}
3275
3276cf::global->attach (on_resource_update => sub {
3277 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3278 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3279
3280 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3281 my $sound = $soundconf->{compat}[$_]
3282 or next;
3283
3284 my $face = cf::face::find "sound/$sound->[1]";
3285 cf::sound::set $sound->[0] => $face;
3286 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3287 }
3288
3289 while (my ($k, $v) = each %{$soundconf->{event}}) {
3290 my $face = cf::face::find "sound/$v";
3291 cf::sound::set $k => $face;
3292 }
3293 }
3294});
3295 3498
3296register_exticmd fx_want => sub { 3499register_exticmd fx_want => sub {
3297 my ($ns, $want) = @_; 3500 my ($ns, $want) = @_;
3298 3501
3299 while (my ($k, $v) = each %$want) { 3502 while (my ($k, $v) = each %$want) {
3338sub reload_treasures { 3541sub reload_treasures {
3339 load_resource_file "$DATADIR/treasures" 3542 load_resource_file "$DATADIR/treasures"
3340 or die "unable to load treasurelists\n"; 3543 or die "unable to load treasurelists\n";
3341} 3544}
3342 3545
3546sub reload_sound {
3547 trace "loading sound config from $DATADIR/sound\n";
3548
3549 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3550 or die "$DATADIR/sound $!";
3551
3552 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3553
3554 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3555 my $sound = $soundconf->{compat}[$_]
3556 or next;
3557
3558 my $face = cf::face::find "sound/$sound->[1]";
3559 cf::sound::set $sound->[0] => $face;
3560 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3561 }
3562
3563 while (my ($k, $v) = each %{$soundconf->{event}}) {
3564 my $face = cf::face::find "sound/$v";
3565 cf::sound::set $k => $face;
3566 }
3567}
3568
3343sub reload_resources { 3569sub reload_resources {
3344 warn "reloading resource files...\n"; 3570 trace "reloading resource files...\n";
3345 3571
3346 reload_facedata; 3572 reload_facedata;
3573 reload_sound;
3347 reload_archetypes; 3574 reload_archetypes;
3348 reload_regions; 3575 reload_regions;
3349 reload_treasures; 3576 reload_treasures;
3350 3577
3351 warn "finished reloading resource files\n"; 3578 trace "finished reloading resource files\n";
3352} 3579}
3353 3580
3354sub reload_config { 3581sub reload_config {
3582 trace "reloading config file...\n";
3583
3355 open my $fh, "<:utf8", "$CONFDIR/config" 3584 open my $fh, "<:utf8", "$CONFDIR/config"
3356 or return; 3585 or return;
3357 3586
3358 local $/; 3587 local $/;
3359 *CFG = YAML::Load <$fh>; 3588 *CFG = YAML::XS::Load scalar <$fh>;
3360 3589
3361 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3590 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3362 3591
3363 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3592 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3364 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3593 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3365 3594
3366 if (exists $CFG{mlockall}) { 3595 if (exists $CFG{mlockall}) {
3368 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3597 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3369 and die "WARNING: m(un)lockall failed: $!\n"; 3598 and die "WARNING: m(un)lockall failed: $!\n";
3370 }; 3599 };
3371 warn $@ if $@; 3600 warn $@ if $@;
3372 } 3601 }
3602
3603 trace "finished reloading resource files\n";
3373} 3604}
3374 3605
3375sub pidfile() { 3606sub pidfile() {
3376 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3607 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3377 or die "$PIDFILE: $!"; 3608 or die "$PIDFILE: $!";
3389 3620
3390 seek $fh, 0, 0; 3621 seek $fh, 0, 0;
3391 print $fh $$; 3622 print $fh $$;
3392} 3623}
3393 3624
3625sub main_loop {
3626 trace "EV::loop starting\n";
3627 if (1) {
3628 EV::loop;
3629 }
3630 trace "EV::loop returned\n";
3631 goto &main_loop unless $REALLY_UNLOOP;
3632}
3633
3394sub main { 3634sub main {
3395 cf::init_globals; # initialise logging 3635 cf::init_globals; # initialise logging
3396 3636
3397 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3637 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3398 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3638 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3399 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3639 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3400 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3640 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3401
3402 cf::init_experience;
3403 cf::init_anim;
3404 cf::init_attackmess;
3405 cf::init_dynamic;
3406 cf::init_block;
3407 3641
3408 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3642 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3409 3643
3410 # we must not ever block the main coroutine 3644 # we must not ever block the main coroutine
3411 local $Coro::idle = sub { 3645 local $Coro::idle = sub {
3417 }; 3651 };
3418 3652
3419 evthread_start IO::AIO::poll_fileno; 3653 evthread_start IO::AIO::poll_fileno;
3420 3654
3421 cf::sync_job { 3655 cf::sync_job {
3656 init_inc;
3657
3658 cf::init_experience;
3659 cf::init_anim;
3660 cf::init_attackmess;
3661 cf::init_dynamic;
3662
3663 cf::load_settings;
3664 cf::load_materials;
3665
3422 reload_resources; 3666 reload_resources;
3423 reload_config; 3667 reload_config;
3424 db_init; 3668 db_init;
3425 3669
3426 cf::load_settings;
3427 cf::load_materials;
3428 cf::init_uuid; 3670 cf::init_uuid;
3429 cf::init_signals; 3671 cf::init_signals;
3430 cf::init_commands;
3431 cf::init_skills; 3672 cf::init_skills;
3432 3673
3433 cf::init_beforeplay; 3674 cf::init_beforeplay;
3434 3675
3435 atomic; 3676 atomic;
3437 load_extensions; 3678 load_extensions;
3438 3679
3439 utime time, time, $RUNTIMEFILE; 3680 utime time, time, $RUNTIMEFILE;
3440 3681
3441 # no (long-running) fork's whatsoever before this point(!) 3682 # no (long-running) fork's whatsoever before this point(!)
3683 use POSIX ();
3442 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3684 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3443 3685
3444 (pop @POST_INIT)->(0) while @POST_INIT; 3686 (pop @POST_INIT)->(0) while @POST_INIT;
3445 }; 3687 };
3446 3688
3447 EV::loop; 3689 cf::object::thawer::errors_are_fatal 0;
3690 info "parse errors in files are no longer fatal from this point on.\n";
3691
3692 my $free_main; $free_main = EV::idle sub {
3693 undef $free_main;
3694 undef &main; # free gobs of memory :)
3695 };
3696
3697 goto &main_loop;
3448} 3698}
3449 3699
3450############################################################################# 3700#############################################################################
3451# initialisation and cleanup 3701# initialisation and cleanup
3452 3702
3453# install some emergency cleanup handlers 3703# install some emergency cleanup handlers
3454BEGIN { 3704BEGIN {
3455 our %SIGWATCHER = (); 3705 our %SIGWATCHER = ();
3456 for my $signal (qw(INT HUP TERM)) { 3706 for my $signal (qw(INT HUP TERM)) {
3457 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3707 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3458 cf::cleanup "SIG$signal"; 3708 cf::cleanup "SIG$signal";
3459 }; 3709 };
3460 } 3710 }
3461} 3711}
3462 3712
3463sub write_runtime_sync { 3713sub write_runtime_sync {
3714 my $t0 = AE::time;
3715
3464 # first touch the runtime file to show we are still running: 3716 # first touch the runtime file to show we are still running:
3465 # the fsync below can take a very very long time. 3717 # the fsync below can take a very very long time.
3466 3718
3467 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3719 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3468 3720
3469 my $guard = cf::lock_acquire "write_runtime"; 3721 my $guard = cf::lock_acquire "write_runtime";
3470 3722
3471 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3723 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3472 or return; 3724 or return;
3473 3725
3474 my $value = $cf::RUNTIME + 90 + 10; 3726 my $value = $cf::RUNTIME + 90 + 10;
3475 # 10 is the runtime save interval, for a monotonic clock 3727 # 10 is the runtime save interval, for a monotonic clock
3476 # 60 allows for the watchdog to kill the server. 3728 # 60 allows for the watchdog to kill the server.
3489 or return; 3741 or return;
3490 3742
3491 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3743 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3492 and return; 3744 and return;
3493 3745
3494 warn "runtime file written.\n"; 3746 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3495 3747
3496 1 3748 1
3497} 3749}
3498 3750
3499our $uuid_lock; 3751our $uuid_lock;
3511 or return; 3763 or return;
3512 3764
3513 my $value = uuid_seq uuid_cur; 3765 my $value = uuid_seq uuid_cur;
3514 3766
3515 unless ($value) { 3767 unless ($value) {
3516 warn "cowardly refusing to write zero uuid value!\n"; 3768 info "cowardly refusing to write zero uuid value!\n";
3517 return; 3769 return;
3518 } 3770 }
3519 3771
3520 my $value = uuid_str $value + $uuid_skip; 3772 my $value = uuid_str $value + $uuid_skip;
3521 $uuid_skip = 0; 3773 $uuid_skip = 0;
3531 or return; 3783 or return;
3532 3784
3533 aio_rename "$uuid~", $uuid 3785 aio_rename "$uuid~", $uuid
3534 and return; 3786 and return;
3535 3787
3536 warn "uuid file written ($value).\n"; 3788 trace "uuid file written ($value).\n";
3537 3789
3538 1 3790 1
3539 3791
3540} 3792}
3541 3793
3547} 3799}
3548 3800
3549sub emergency_save() { 3801sub emergency_save() {
3550 my $freeze_guard = cf::freeze_mainloop; 3802 my $freeze_guard = cf::freeze_mainloop;
3551 3803
3552 warn "emergency_perl_save: enter\n"; 3804 info "emergency_perl_save: enter\n";
3805
3806 # this is a trade-off: we want to be very quick here, so
3807 # save all maps without fsync, and later call a global sync
3808 # (which in turn might be very very slow)
3809 local $USE_FSYNC = 0;
3553 3810
3554 cf::sync_job { 3811 cf::sync_job {
3555 # this is a trade-off: we want to be very quick here, so 3812 cf::write_runtime_sync; # external watchdog should not bark
3556 # save all maps without fsync, and later call a global sync
3557 # (which in turn might be very very slow)
3558 local $USE_FSYNC = 0;
3559 3813
3560 # use a peculiar iteration method to avoid tripping on perl 3814 # use a peculiar iteration method to avoid tripping on perl
3561 # refcount bugs in for. also avoids problems with players 3815 # refcount bugs in for. also avoids problems with players
3562 # and maps saved/destroyed asynchronously. 3816 # and maps saved/destroyed asynchronously.
3563 warn "emergency_perl_save: begin player save\n"; 3817 info "emergency_perl_save: begin player save\n";
3564 for my $login (keys %cf::PLAYER) { 3818 for my $login (keys %cf::PLAYER) {
3565 my $pl = $cf::PLAYER{$login} or next; 3819 my $pl = $cf::PLAYER{$login} or next;
3566 $pl->valid or next; 3820 $pl->valid or next;
3567 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3821 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3568 $pl->save; 3822 $pl->save;
3569 } 3823 }
3570 warn "emergency_perl_save: end player save\n"; 3824 info "emergency_perl_save: end player save\n";
3571 3825
3826 cf::write_runtime_sync; # external watchdog should not bark
3827
3572 warn "emergency_perl_save: begin map save\n"; 3828 info "emergency_perl_save: begin map save\n";
3573 for my $path (keys %cf::MAP) { 3829 for my $path (keys %cf::MAP) {
3574 my $map = $cf::MAP{$path} or next; 3830 my $map = $cf::MAP{$path} or next;
3575 $map->valid or next; 3831 $map->valid or next;
3576 $map->save; 3832 $map->save;
3577 } 3833 }
3578 warn "emergency_perl_save: end map save\n"; 3834 info "emergency_perl_save: end map save\n";
3579 3835
3836 cf::write_runtime_sync; # external watchdog should not bark
3837
3580 warn "emergency_perl_save: begin database checkpoint\n"; 3838 info "emergency_perl_save: begin database checkpoint\n";
3581 BDB::db_env_txn_checkpoint $DB_ENV; 3839 BDB::db_env_txn_checkpoint $DB_ENV;
3582 warn "emergency_perl_save: end database checkpoint\n"; 3840 info "emergency_perl_save: end database checkpoint\n";
3583 3841
3584 warn "emergency_perl_save: begin write uuid\n"; 3842 info "emergency_perl_save: begin write uuid\n";
3585 write_uuid_sync 1; 3843 write_uuid_sync 1;
3586 warn "emergency_perl_save: end write uuid\n"; 3844 info "emergency_perl_save: end write uuid\n";
3845
3846 cf::write_runtime_sync; # external watchdog should not bark
3847
3848 trace "emergency_perl_save: syncing database to disk";
3849 BDB::db_env_txn_checkpoint $DB_ENV;
3850
3851 info "emergency_perl_save: starting sync\n";
3852 IO::AIO::aio_sync sub {
3853 info "emergency_perl_save: finished sync\n";
3854 };
3855
3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3858 trace "emergency_perl_save: flushing outstanding aio requests";
3859 while (IO::AIO::nreqs || BDB::nreqs) {
3860 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3861 }
3862
3863 cf::write_runtime_sync; # external watchdog should not bark
3587 }; 3864 };
3588 3865
3589 warn "emergency_perl_save: starting sync()\n";
3590 IO::AIO::aio_sync sub {
3591 warn "emergency_perl_save: finished sync()\n";
3592 };
3593
3594 warn "emergency_perl_save: leave\n"; 3866 info "emergency_perl_save: leave\n";
3595} 3867}
3596 3868
3597sub post_cleanup { 3869sub post_cleanup {
3598 my ($make_core) = @_; 3870 my ($make_core) = @_;
3599 3871
3872 IO::AIO::flush;
3873
3600 warn Carp::longmess "post_cleanup backtrace" 3874 error Carp::longmess "post_cleanup backtrace"
3601 if $make_core; 3875 if $make_core;
3602 3876
3603 my $fh = pidfile; 3877 my $fh = pidfile;
3604 unlink $PIDFILE if <$fh> == $$; 3878 unlink $PIDFILE if <$fh> == $$;
3605} 3879}
3625 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3899 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3626 for my $name (keys %$leaf_symtab) { 3900 for my $name (keys %$leaf_symtab) {
3627 _gv_clear *{"$pkg$name"}; 3901 _gv_clear *{"$pkg$name"};
3628# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3902# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3629 } 3903 }
3630 warn "cleared package $pkg\n";#d#
3631} 3904}
3632 3905
3633sub do_reload_perl() { 3906sub do_reload_perl() {
3634 # can/must only be called in main 3907 # can/must only be called in main
3635 if ($Coro::current != $Coro::main) { 3908 if (in_main) {
3636 warn "can only reload from main coroutine"; 3909 error "can only reload from main coroutine";
3637 return; 3910 return;
3638 } 3911 }
3639 3912
3640 return if $RELOAD++; 3913 return if $RELOAD++;
3641 3914
3642 my $t1 = EV::time; 3915 my $t1 = AE::time;
3643 3916
3644 while ($RELOAD) { 3917 while ($RELOAD) {
3645 warn "reloading..."; 3918 info "reloading...";
3646 3919
3647 warn "entering sync_job"; 3920 trace "entering sync_job";
3648 3921
3649 cf::sync_job { 3922 cf::sync_job {
3650 cf::write_runtime_sync; # external watchdog should not bark
3651 cf::emergency_save; 3923 cf::emergency_save;
3652 cf::write_runtime_sync; # external watchdog should not bark
3653 3924
3654 warn "syncing database to disk";
3655 BDB::db_env_txn_checkpoint $DB_ENV;
3656
3657 # if anything goes wrong in here, we should simply crash as we already saved
3658
3659 warn "flushing outstanding aio requests";
3660 while (IO::AIO::nreqs || BDB::nreqs) {
3661 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3662 }
3663
3664 warn "cancelling all extension coros"; 3925 trace "cancelling all extension coros";
3665 $_->cancel for values %EXT_CORO; 3926 $_->cancel for values %EXT_CORO;
3666 %EXT_CORO = (); 3927 %EXT_CORO = ();
3667 3928
3668 warn "removing commands"; 3929 trace "removing commands";
3669 %COMMAND = (); 3930 %COMMAND = ();
3670 3931
3671 warn "removing ext/exti commands"; 3932 trace "removing ext/exti commands";
3672 %EXTCMD = (); 3933 %EXTCMD = ();
3673 %EXTICMD = (); 3934 %EXTICMD = ();
3674 3935
3675 warn "unloading/nuking all extensions"; 3936 trace "unloading/nuking all extensions";
3676 for my $pkg (@EXTS) { 3937 for my $pkg (@EXTS) {
3677 warn "... unloading $pkg"; 3938 trace "... unloading $pkg";
3678 3939
3679 if (my $cb = $pkg->can ("unload")) { 3940 if (my $cb = $pkg->can ("unload")) {
3680 eval { 3941 eval {
3681 $cb->($pkg); 3942 $cb->($pkg);
3682 1 3943 1
3683 } or warn "$pkg unloaded, but with errors: $@"; 3944 } or error "$pkg unloaded, but with errors: $@";
3684 } 3945 }
3685 3946
3686 warn "... clearing $pkg"; 3947 trace "... clearing $pkg";
3687 clear_package $pkg; 3948 clear_package $pkg;
3688 } 3949 }
3689 3950
3690 warn "unloading all perl modules loaded from $LIBDIR"; 3951 trace "unloading all perl modules loaded from $LIBDIR";
3691 while (my ($k, $v) = each %INC) { 3952 while (my ($k, $v) = each %INC) {
3692 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3953 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3693 3954
3694 warn "... unloading $k"; 3955 trace "... unloading $k";
3695 delete $INC{$k}; 3956 delete $INC{$k};
3696 3957
3697 $k =~ s/\.pm$//; 3958 $k =~ s/\.pm$//;
3698 $k =~ s/\//::/g; 3959 $k =~ s/\//::/g;
3699 3960
3702 } 3963 }
3703 3964
3704 clear_package $k; 3965 clear_package $k;
3705 } 3966 }
3706 3967
3707 warn "getting rid of safe::, as good as possible"; 3968 trace "getting rid of safe::, as good as possible";
3708 clear_package "safe::$_" 3969 clear_package "safe::$_"
3709 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3970 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3710 3971
3711 warn "unloading cf.pm \"a bit\""; 3972 trace "unloading cf.pm \"a bit\"";
3712 delete $INC{"cf.pm"}; 3973 delete $INC{"cf.pm"};
3713 delete $INC{"cf/pod.pm"}; 3974 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3714 3975
3715 # don't, removes xs symbols, too, 3976 # don't, removes xs symbols, too,
3716 # and global variables created in xs 3977 # and global variables created in xs
3717 #clear_package __PACKAGE__; 3978 #clear_package __PACKAGE__;
3718 3979
3719 warn "unload completed, starting to reload now"; 3980 info "unload completed, starting to reload now";
3720 3981
3721 warn "reloading cf.pm"; 3982 trace "reloading cf.pm";
3722 require cf; 3983 require cf;
3723 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3984 cf::_connect_to_perl_1;
3724 3985
3725 warn "loading config and database again"; 3986 trace "loading config and database again";
3726 cf::reload_config; 3987 cf::reload_config;
3727 3988
3728 warn "loading extensions"; 3989 trace "loading extensions";
3729 cf::load_extensions; 3990 cf::load_extensions;
3730 3991
3731 if ($REATTACH_ON_RELOAD) { 3992 if ($REATTACH_ON_RELOAD) {
3732 warn "reattaching attachments to objects/players"; 3993 trace "reattaching attachments to objects/players";
3733 _global_reattach; # objects, sockets 3994 _global_reattach; # objects, sockets
3734 warn "reattaching attachments to maps"; 3995 trace "reattaching attachments to maps";
3735 reattach $_ for values %MAP; 3996 reattach $_ for values %MAP;
3736 warn "reattaching attachments to players"; 3997 trace "reattaching attachments to players";
3737 reattach $_ for values %PLAYER; 3998 reattach $_ for values %PLAYER;
3738 } 3999 }
3739 4000
3740 warn "running post_init jobs"; 4001 trace "running post_init jobs";
3741 (pop @POST_INIT)->(1) while @POST_INIT; 4002 (pop @POST_INIT)->(1) while @POST_INIT;
3742 4003
3743 warn "leaving sync_job"; 4004 trace "leaving sync_job";
3744 4005
3745 1 4006 1
3746 } or do { 4007 } or do {
3747 warn $@; 4008 error $@;
3748 cf::cleanup "error while reloading, exiting."; 4009 cf::cleanup "error while reloading, exiting.";
3749 }; 4010 };
3750 4011
3751 warn "reloaded"; 4012 info "reloaded";
3752 --$RELOAD; 4013 --$RELOAD;
3753 } 4014 }
3754 4015
3755 $t1 = EV::time - $t1; 4016 $t1 = AE::time - $t1;
3756 warn "reload completed in ${t1}s\n"; 4017 info "reload completed in ${t1}s\n";
3757}; 4018};
3758 4019
3759our $RELOAD_WATCHER; # used only during reload 4020our $RELOAD_WATCHER; # used only during reload
3760 4021
3761sub reload_perl() { 4022sub reload_perl() {
3763 # coro crashes during coro_state_free->destroy here. 4024 # coro crashes during coro_state_free->destroy here.
3764 4025
3765 $RELOAD_WATCHER ||= cf::async { 4026 $RELOAD_WATCHER ||= cf::async {
3766 Coro::AIO::aio_wait cache_extensions; 4027 Coro::AIO::aio_wait cache_extensions;
3767 4028
3768 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4029 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3769 do_reload_perl; 4030 do_reload_perl;
3770 undef $RELOAD_WATCHER; 4031 undef $RELOAD_WATCHER;
3771 }; 4032 };
3772 }; 4033 };
3773} 4034}
3782 reload_perl; 4043 reload_perl;
3783 }; 4044 };
3784 } 4045 }
3785}; 4046};
3786 4047
3787unshift @INC, $LIBDIR; 4048#############################################################################
3788 4049
3789my $bug_warning = 0; 4050my $bug_warning = 0;
3790 4051
3791our @WAIT_FOR_TICK; 4052our @WAIT_FOR_TICK;
3792our @WAIT_FOR_TICK_BEGIN; 4053our @WAIT_FOR_TICK_BEGIN;
3793 4054
3794sub wait_for_tick { 4055sub wait_for_tick {
3795 return if tick_inhibit || $Coro::current == $Coro::main; 4056 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3796 4057
3797 my $signal = new Coro::Signal; 4058 my $signal = new Coro::Signal;
3798 push @WAIT_FOR_TICK, $signal; 4059 push @WAIT_FOR_TICK, $signal;
3799 $signal->wait; 4060 $signal->wait;
3800} 4061}
3801 4062
3802sub wait_for_tick_begin { 4063sub wait_for_tick_begin {
3803 return if tick_inhibit || $Coro::current == $Coro::main; 4064 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3804 4065
3805 my $signal = new Coro::Signal; 4066 my $signal = new Coro::Signal;
3806 push @WAIT_FOR_TICK_BEGIN, $signal; 4067 push @WAIT_FOR_TICK_BEGIN, $signal;
3807 $signal->wait; 4068 $signal->wait;
3808} 4069}
3814 return; 4075 return;
3815 } 4076 }
3816 4077
3817 cf::server_tick; # one server iteration 4078 cf::server_tick; # one server iteration
3818 4079
4080 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4081
3819 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4082 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3820 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4083 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3821 Coro::async_pool { 4084 Coro::async_pool {
3822 $Coro::current->{desc} = "runtime saver"; 4085 $Coro::current->{desc} = "runtime saver";
3823 write_runtime_sync 4086 write_runtime_sync
3824 or warn "ERROR: unable to write runtime file: $!"; 4087 or error "ERROR: unable to write runtime file: $!";
3825 }; 4088 };
3826 } 4089 }
3827 4090
3828 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4091 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3829 $sig->send; 4092 $sig->send;
3837 4100
3838 if (0) { 4101 if (0) {
3839 if ($NEXT_TICK) { 4102 if ($NEXT_TICK) {
3840 my $jitter = $TICK_START - $NEXT_TICK; 4103 my $jitter = $TICK_START - $NEXT_TICK;
3841 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4104 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3842 warn "jitter $JITTER\n";#d# 4105 debug "jitter $JITTER\n";#d#
3843 } 4106 }
3844 } 4107 }
3845} 4108}
3846 4109
3847{ 4110{
3848 # configure BDB 4111 # configure BDB
3849 4112
3850 BDB::min_parallel 8; 4113 BDB::min_parallel 16;
3851 BDB::max_poll_reqs $TICK * 0.1; 4114 BDB::max_poll_reqs $TICK * 0.1;
3852 $AnyEvent::BDB::WATCHER->priority (1); 4115 $AnyEvent::BDB::WATCHER->priority (1);
3853 4116
3854 unless ($DB_ENV) { 4117 unless ($DB_ENV) {
3855 $DB_ENV = BDB::db_env_create; 4118 $DB_ENV = BDB::db_env_create;
3935 LOG llevInfo, "[ABT] [suppressed]\n"; 4198 LOG llevInfo, "[ABT] [suppressed]\n";
3936 } 4199 }
3937} 4200}
3938 4201
3939# load additional modules 4202# load additional modules
3940use cf::pod; 4203require "cf/$_.pm" for @EXTRA_MODULES;
4204cf::_connect_to_perl_2;
3941 4205
3942END { cf::emergency_save } 4206END { cf::emergency_save }
3943 4207
39441 42081
3945 4209

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines