ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.460 by root, Mon Dec 15 17:04:53 2008 UTC vs.
Revision 1.546 by root, Thu May 6 22:57:49 2010 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines