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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines