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.453 by root, Tue Sep 23 04:29:11 2008 UTC vs.
Revision 1.533 by root, Thu Apr 29 07:59:17 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 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
39use Guard ();
37use Coro (); 40use Coro ();
38use Coro::State; 41use Coro::State;
39use Coro::Handle; 42use Coro::Handle;
40use Coro::EV; 43use Coro::EV;
41use Coro::AnyEvent; 44use Coro::AnyEvent;
42use Coro::Timer; 45use Coro::Timer;
43use Coro::Signal; 46use Coro::Signal;
44use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
45use Coro::AnyEvent; 49use Coro::AnyEvent;
46use Coro::AIO; 50use Coro::AIO;
47use Coro::BDB 1.6; 51use Coro::BDB 1.6;
48use Coro::Storable; 52use Coro::Storable;
49use Coro::Util (); 53use Coro::Util ();
50 54
51use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
52use BDB (); 56use BDB ();
53use Data::Dumper; 57use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 58use Fcntl;
56use YAML (); 59use YAML::XS ();
57use IO::AIO (); 60use IO::AIO ();
58use Time::HiRes; 61use Time::HiRes;
59use Compress::LZF; 62use Compress::LZF;
60use Digest::MD5 (); 63use Digest::MD5 ();
61 64
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70 73
71# make sure c-lzf reinitialises itself 74# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
74 80
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
76 82
77our %COMMAND = (); 83our %COMMAND = ();
78our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
83our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
85 91
86our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
88 96
89our $CONFDIR = confdir; 97our $CONFDIR = confdir;
90our $DATADIR = datadir; 98our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
98our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
99our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
102 110
103our %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;
104 118
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 121our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
109 123
110our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 127our $DB_ENV;
114 128
129our @EXTRA_MODULES = qw(pod match mapscript);
130
115our %CFG; 131our %CFG;
116 132
117our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 134our $RUNTIME;
119our $NOW; 135our $NOW;
129our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 146our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
132 148
133our @POST_INIT; 149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
134 153
135binmode STDOUT; 154binmode STDOUT;
136binmode STDERR; 155binmode STDERR;
137 156
138# read virtual server time, if available 157# read virtual server time, if available
140 open my $fh, "<", $RUNTIMEFILE 159 open my $fh, "<", $RUNTIMEFILE
141 or die "unable to read $RUNTIMEFILE file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
142 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
143} 162}
144 163
164eval "sub TICK() { $TICK } 1" or die;
165
145mkdir $_ 166mkdir $_
146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
147 168
148our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
149 170
150sub 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::"} };
151 187
152############################################################################# 188#############################################################################
153 189
154=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
155 191
202returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one process
203per 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.
204 240
205=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
206 242
207This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
208C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
209that call. 245that call.
210 246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
211=back 253=back
212 254
213=cut 255=cut
214 256
215BEGIN { 257sub error(@) { LOG llevError, join "", @_ }
216 *CORE::GLOBAL::warn = sub { 258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
262
263$Coro::State::WARNHOOK = sub {
217 my $msg = join "", @_; 264 my $msg = join "", @_;
218 265
219 $msg .= "\n" 266 $msg .= "\n"
220 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
221 268
222 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 269 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
223 270
224 LOG llevError, $msg; 271 LOG llevWarn, $msg;
225 }; 272};
226}
227 273
228$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
230 276
231 if ($Coro::current == $Coro::main) {#d# 277 error Carp::longmess $_[0];
278
279 if (in_main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d# 281 return;#d#
234 }#d# 282 }#d#
235 283
236 # kill coroutine otherwise 284 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate 285 Coro::terminate
239}; 286};
240
241$SIG{__DIE__} = sub { }; #d#?
242 287
243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 288@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 289@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 290@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 291@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
260)) { 305)) {
261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
262} 307}
263 308
264$EV::DIED = sub { 309$EV::DIED = sub {
265 warn "error in event callback: @_"; 310 Carp::cluck "error in event callback: @_";
266}; 311};
267 312
268############################################################################# 313#############################################################################
269 314
270=head2 UTILITY FUNCTIONS 315=head2 UTILITY FUNCTIONS
328Wait until the given lock is available. See cf::lock_acquire. 373Wait until the given lock is available. See cf::lock_acquire.
329 374
330=item my $lock = cf::lock_acquire $string 375=item my $lock = cf::lock_acquire $string
331 376
332Wait until the given lock is available and then acquires it and returns 377Wait until the given lock is available and then acquires it and returns
333a Coro::guard object. If the guard object gets destroyed (goes out of scope, 378a L<Guard> object. If the guard object gets destroyed (goes out of scope,
334for example when the coroutine gets canceled), the lock is automatically 379for example when the coroutine gets canceled), the lock is automatically
335returned. 380returned.
336 381
337Locks are *not* recursive, locking from the same coro twice results in a 382Locks are *not* recursive, locking from the same coro twice results in a
338deadlocked coro. 383deadlocked coro.
344 389
345Return true if the lock is currently active, i.e. somebody has locked it. 390Return true if the lock is currently active, i.e. somebody has locked it.
346 391
347=cut 392=cut
348 393
349our %LOCK; 394our $LOCKS = new Coro::SemaphoreSet;
350our %LOCKER;#d#
351 395
352sub lock_wait($) { 396sub lock_wait($) {
353 my ($key) = @_; 397 $LOCKS->wait ($_[0]);
354
355 if ($LOCKER{$key} == $Coro::current) {#d#
356 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
357 return;#d#
358 }#d#
359
360 # wait for lock, if any
361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
363 push @{ $LOCK{$key} }, $Coro::current;
364 Coro::schedule;
365 }
366} 398}
367 399
368sub lock_acquire($) { 400sub lock_acquire($) {
369 my ($key) = @_; 401 $LOCKS->guard ($_[0])
370
371 # wait, to be sure we are not locked
372 lock_wait $key;
373
374 $LOCK{$key} = [];
375 $LOCKER{$key} = $Coro::current;#d#
376
377 Coro::guard {
378 delete $LOCKER{$key};#d#
379 # wake up all waiters, to be on the safe side
380 $_->ready for @{ delete $LOCK{$key} };
381 }
382} 402}
383 403
384sub lock_active($) { 404sub lock_active($) {
385 my ($key) = @_; 405 $LOCKS->count ($_[0]) < 1
386
387 ! ! $LOCK{$key}
388} 406}
389 407
390sub freeze_mainloop { 408sub freeze_mainloop {
391 tick_inhibit_inc; 409 tick_inhibit_inc;
392 410
393 Coro::guard \&tick_inhibit_dec; 411 &Guard::guard (\&tick_inhibit_dec);
394} 412}
395 413
396=item cf::periodic $interval, $cb 414=item cf::periodic $interval, $cb
397 415
398Like EV::periodic, but randomly selects a starting point so that the actions 416Like EV::periodic, but randomly selects a starting point so that the actions
399get spread over timer. 417get spread over time.
400 418
401=cut 419=cut
402 420
403sub periodic($$) { 421sub periodic($$) {
404 my ($interval, $cb) = @_; 422 my ($interval, $cb) = @_;
421 439
422=cut 440=cut
423 441
424our @SLOT_QUEUE; 442our @SLOT_QUEUE;
425our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
426 445
427$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
428$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
429 $Coro::current->desc ("timeslot manager"); 448 $Coro::current->desc ("timeslot manager");
430 449
431 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
432 452
433 while () { 453 while () {
434 next_job: 454 next_job:
455
435 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
436 if ($avail > 0.01) { 457
437 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
438 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
439 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
440 $job->[2]->send; 462 $job->[2]->send;
441 Coro::cede; 463 Coro::cede;
442 goto next_job; 464 goto next_job;
443 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
444 } 467 }
445 } 468 }
446 469
447 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
448 # we do not use wait_for_tick() as it returns immediately when tick is inactive 471 # we do not use wait_for_tick() as it returns immediately when tick is inactive
449 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
450 $signal->wait; 473 $signal->wait;
451 } else { 474 } else {
475 $busy = 0;
452 Coro::schedule; 476 Coro::schedule;
453 } 477 }
454 } 478 }
455}; 479};
456 480
457sub get_slot($;$$) { 481sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main; 482 return if tick_inhibit || $Coro::current == $Coro::main;
459 483
460 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
461 485
462 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
463 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
464 489
465 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
466 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
467 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
494 519
495sub sync_job(&) { 520sub sync_job(&) {
496 my ($job) = @_; 521 my ($job) = @_;
497 522
498 if ($Coro::current == $Coro::main) { 523 if ($Coro::current == $Coro::main) {
499 my $time = EV::time; 524 my $time = AE::time;
500 525
501 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
502 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
503 528
504 LOG llevError, Carp::longmess "sync job";#d# 529 LOG llevError, Carp::longmess "sync job";#d#
509 my @res; 534 my @res;
510 535
511 (async { 536 (async {
512 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
513 @res = eval { $job->() }; 538 @res = eval { $job->() };
514 warn $@ if $@; 539 error $@ if $@;
515 undef $busy; 540 undef $busy;
516 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
517 542
518 while ($busy) { 543 while ($busy) {
519 if (Coro::nready) { 544 if (Coro::nready) {
521 } else { 546 } else {
522 EV::loop EV::LOOP_ONESHOT; 547 EV::loop EV::LOOP_ONESHOT;
523 } 548 }
524 } 549 }
525 550
526 my $time = EV::time - $time; 551 my $time = AE::time - $time;
527 552
528 $TICK_START += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
529 554
530 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
531 } else { 556 } else {
575 reset_signals; 600 reset_signals;
576 &$cb 601 &$cb
577 }, @args; 602 }, @args;
578 603
579 wantarray ? @res : $res[-1] 604 wantarray ? @res : $res[-1]
605}
606
607sub objinfo {
608 (
609 "counter value" => cf::object::object_count,
610 "objects created" => cf::object::create_count,
611 "objects destroyed" => cf::object::destroy_count,
612 "freelist size" => cf::object::free_count,
613 "allocated objects" => cf::object::objects_size,
614 "active objects" => cf::object::actives_size,
615 )
580} 616}
581 617
582=item $coin = coin_from_name $name 618=item $coin = coin_from_name $name
583 619
584=cut 620=cut
719 755
720 my $t1 = Time::HiRes::time; 756 my $t1 = Time::HiRes::time;
721 my $data = $process->(\@data); 757 my $data = $process->(\@data);
722 my $t2 = Time::HiRes::time; 758 my $t2 = Time::HiRes::time;
723 759
724 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 760 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
725 761
726 db_put cache => "$id/data", $data; 762 db_put cache => "$id/data", $data;
727 db_put cache => "$id/md5" , $md5; 763 db_put cache => "$id/md5" , $md5;
728 db_put cache => "$id/meta", $meta; 764 db_put cache => "$id/meta", $meta;
729 765
739 775
740=cut 776=cut
741 777
742sub datalog($@) { 778sub datalog($@) {
743 my ($type, %kv) = @_; 779 my ($type, %kv) = @_;
744 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 780 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
745} 781}
746 782
747=back 783=back
748 784
749=cut 785=cut
944 980
945 } elsif (exists $cb_id{$type}) { 981 } elsif (exists $cb_id{$type}) {
946 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 982 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
947 983
948 } elsif (ref $type) { 984 } elsif (ref $type) {
949 warn "attaching objects not supported, ignoring.\n"; 985 error "attaching objects not supported, ignoring.\n";
950 986
951 } else { 987 } else {
952 shift @arg; 988 shift @arg;
953 warn "attach argument '$type' not supported, ignoring.\n"; 989 error "attach argument '$type' not supported, ignoring.\n";
954 } 990 }
955 } 991 }
956} 992}
957 993
958sub _object_attach { 994sub _object_attach {
968 _attach $registry, $klass, @attach; 1004 _attach $registry, $klass, @attach;
969 } 1005 }
970 1006
971 $obj->{$name} = \%arg; 1007 $obj->{$name} = \%arg;
972 } else { 1008 } else {
973 warn "object uses attachment '$name' which is not available, postponing.\n"; 1009 info "object uses attachment '$name' which is not available, postponing.\n";
974 } 1010 }
975 1011
976 $obj->{_attachment}{$name} = undef; 1012 $obj->{_attachment}{$name} = undef;
977} 1013}
978 1014
1037 1073
1038 for (@$callbacks) { 1074 for (@$callbacks) {
1039 eval { &{$_->[1]} }; 1075 eval { &{$_->[1]} };
1040 1076
1041 if ($@) { 1077 if ($@) {
1042 warn "$@";
1043 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1078 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1044 override; 1079 override;
1045 } 1080 }
1046 1081
1047 return 1 if $override; 1082 return 1 if $override;
1048 } 1083 }
1127 for (@$attach) { 1162 for (@$attach) {
1128 my ($klass, @attach) = @$_; 1163 my ($klass, @attach) = @$_;
1129 _attach $registry, $klass, @attach; 1164 _attach $registry, $klass, @attach;
1130 } 1165 }
1131 } else { 1166 } else {
1132 warn "object uses attachment '$name' that is not available, postponing.\n"; 1167 info "object uses attachment '$name' that is not available, postponing.\n";
1133 } 1168 }
1134 } 1169 }
1135} 1170}
1136 1171
1137cf::attachable->attach ( 1172cf::attachable->attach (
1164 my ($filename, $rdata, $objs) = @_; 1199 my ($filename, $rdata, $objs) = @_;
1165 1200
1166 sync_job { 1201 sync_job {
1167 if (length $$rdata) { 1202 if (length $$rdata) {
1168 utf8::decode (my $decname = $filename); 1203 utf8::decode (my $decname = $filename);
1169 warn sprintf "saving %s (%d,%d)\n", 1204 trace sprintf "saving %s (%d,%d)\n",
1170 $decname, length $$rdata, scalar @$objs; 1205 $decname, length $$rdata, scalar @$objs
1206 if $VERBOSE_IO;
1171 1207
1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1208 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1173 aio_chmod $fh, SAVE_MODE; 1209 aio_chmod $fh, SAVE_MODE;
1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1210 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1175 aio_fsync $fh if $cf::USE_FSYNC; 1211 if ($cf::USE_FSYNC) {
1212 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;
1213 aio_fsync $fh;
1214 }
1176 aio_close $fh; 1215 aio_close $fh;
1177 1216
1178 if (@$objs) { 1217 if (@$objs) {
1179 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1218 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1180 aio_chmod $fh, SAVE_MODE; 1219 aio_chmod $fh, SAVE_MODE;
1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1220 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1182 aio_write $fh, 0, (length $data), $data, 0; 1221 aio_write $fh, 0, (length $data), $data, 0;
1183 aio_fsync $fh if $cf::USE_FSYNC; 1222 if ($cf::USE_FSYNC) {
1223 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1224 aio_fsync $fh;
1225 }
1184 aio_close $fh; 1226 aio_close $fh;
1185 aio_rename "$filename.pst~", "$filename.pst"; 1227 aio_rename "$filename.pst~", "$filename.pst";
1186 } 1228 }
1187 } else { 1229 } else {
1188 aio_unlink "$filename.pst"; 1230 aio_unlink "$filename.pst";
1189 } 1231 }
1190 1232
1191 aio_rename "$filename~", $filename; 1233 aio_rename "$filename~", $filename;
1234
1235 $filename =~ s%/[^/]+$%%;
1236 aio_pathsync $filename if $cf::USE_FSYNC;
1192 } else { 1237 } else {
1193 warn "FATAL: $filename~: $!\n"; 1238 error "unable to save objects: $filename~: $!\n";
1194 } 1239 }
1195 } else { 1240 } else {
1196 aio_unlink $filename; 1241 aio_unlink $filename;
1197 aio_unlink "$filename.pst"; 1242 aio_unlink "$filename.pst";
1198 } 1243 }
1222 my $st = eval { Coro::Storable::thaw $av }; 1267 my $st = eval { Coro::Storable::thaw $av };
1223 $av = $st->{objs}; 1268 $av = $st->{objs};
1224 } 1269 }
1225 1270
1226 utf8::decode (my $decname = $filename); 1271 utf8::decode (my $decname = $filename);
1227 warn sprintf "loading %s (%d,%d)\n", 1272 trace sprintf "loading %s (%d,%d)\n",
1228 $decname, length $data, scalar @{$av || []}; 1273 $decname, length $data, scalar @{$av || []}
1274 if $VERBOSE_IO;
1229 1275
1230 ($data, $av) 1276 ($data, $av)
1231} 1277}
1232 1278
1233=head2 COMMAND CALLBACKS 1279=head2 COMMAND CALLBACKS
1289 my ($name, $cb) = @_; 1335 my ($name, $cb) = @_;
1290 1336
1291 $EXTICMD{$name} = $cb; 1337 $EXTICMD{$name} = $cb;
1292} 1338}
1293 1339
1340use File::Glob ();
1341
1294cf::player->attach ( 1342cf::player->attach (
1295 on_command => sub { 1343 on_unknown_command => sub {
1296 my ($pl, $name, $params) = @_; 1344 my ($pl, $name, $params) = @_;
1297 1345
1298 my $cb = $COMMAND{$name} 1346 my $cb = $COMMAND{$name}
1299 or return; 1347 or return;
1300 1348
1323 1371
1324 $pl->ext_reply ($reply, @reply) 1372 $pl->ext_reply ($reply, @reply)
1325 if $reply; 1373 if $reply;
1326 1374
1327 } else { 1375 } else {
1328 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1376 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1329 } 1377 }
1330 1378
1331 cf::override; 1379 cf::override;
1332 }, 1380 },
1333); 1381);
1334 1382
1383# "readahead" all extensions
1384sub cache_extensions {
1385 my $grp = IO::AIO::aio_group;
1386
1387 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1388 for (grep /\.ext$/, @{$_[0]}) {
1389 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1390 }
1391 };
1392
1393 $grp
1394}
1395
1335sub load_extensions { 1396sub load_extensions {
1397 info "loading extensions...";
1398
1336 cf::sync_job { 1399 cf::sync_job {
1337 my %todo; 1400 my %todo;
1338 1401
1339 for my $path (<$LIBDIR/*.ext>) { 1402 for my $path (<$LIBDIR/*.ext>) {
1340 next unless -r $path; 1403 next unless -r $path;
1366 . "\n};\n1"; 1429 . "\n};\n1";
1367 1430
1368 $todo{$base} = \%ext; 1431 $todo{$base} = \%ext;
1369 } 1432 }
1370 1433
1434 my $pass = 0;
1371 my %done; 1435 my %done;
1372 while (%todo) { 1436 while (%todo) {
1373 my $progress; 1437 my $progress;
1374 1438
1439 ++$pass;
1440
1441 ext:
1375 while (my ($k, $v) = each %todo) { 1442 while (my ($k, $v) = each %todo) {
1376 for (split /,\s*/, $v->{meta}{depends}) { 1443 for (split /,\s*/, $v->{meta}{depends}) {
1377 goto skip 1444 next ext
1378 unless exists $done{$_}; 1445 unless exists $done{$_};
1379 } 1446 }
1380 1447
1381 warn "... loading '$k' into '$v->{pkg}'\n"; 1448 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1382 1449
1383 unless (eval $v->{source}) { 1450 my $active = eval $v->{source};
1451
1452 if (length $@) {
1384 my $msg = $@ ? "$v->{path}: $@\n" 1453 error "$v->{path}: $@\n";
1385 : "$v->{base}: extension inactive.\n";
1386 1454
1387 if (exists $v->{meta}{mandatory}) {
1388 warn $msg;
1389 cf::cleanup "mandatory extension failed to load, exiting."; 1455 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1390 } 1456 if exists $v->{meta}{mandatory};
1391 1457
1392 warn $msg; 1458 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1459 delete $todo{$k};
1460 } else {
1461 $done{$k} = delete $todo{$k};
1462 push @EXTS, $v->{pkg};
1463 $progress = 1;
1464
1465 info "$v->{base}: extension inactive.\n"
1466 unless $active;
1393 } 1467 }
1394
1395 $done{$k} = delete $todo{$k};
1396 push @EXTS, $v->{pkg};
1397 $progress = 1;
1398 } 1468 }
1399 1469
1400 skip: 1470 unless ($progress) {
1401 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1471 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1402 unless $progress; 1472
1473 while (my ($k, $v) = each %todo) {
1474 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1475 if exists $v->{meta}{mandatory};
1476 }
1477 }
1403 } 1478 }
1404 }; 1479 };
1405} 1480}
1406 1481
1407############################################################################# 1482#############################################################################
1491 $cf::PLAYER{$login} = $pl 1566 $cf::PLAYER{$login} = $pl
1492 } 1567 }
1493 } 1568 }
1494} 1569}
1495 1570
1571cf::player->attach (
1572 on_load => sub {
1573 my ($pl, $path) = @_;
1574
1575 # restore slots saved in save, below
1576 my $slots = delete $pl->{_slots};
1577
1578 $pl->ob->current_weapon ($slots->[0]);
1579 $pl->combat_ob ($slots->[1]);
1580 $pl->ranged_ob ($slots->[2]);
1581 },
1582);
1583
1496sub save($) { 1584sub save($) {
1497 my ($pl) = @_; 1585 my ($pl) = @_;
1498 1586
1499 return if $pl->{deny_save}; 1587 return if $pl->{deny_save};
1500 1588
1505 1593
1506 aio_mkdir playerdir $pl, 0770; 1594 aio_mkdir playerdir $pl, 0770;
1507 $pl->{last_save} = $cf::RUNTIME; 1595 $pl->{last_save} = $cf::RUNTIME;
1508 1596
1509 cf::get_slot 0.01; 1597 cf::get_slot 0.01;
1598
1599 # save slots, to be restored later
1600 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1510 1601
1511 $pl->save_pl ($path); 1602 $pl->save_pl ($path);
1512 cf::cede_to_tick; 1603 cf::cede_to_tick;
1513} 1604}
1514 1605
1551 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1642 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1552 1643
1553 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1644 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1554 $pl->deactivate; 1645 $pl->deactivate;
1555 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1646 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1556 $pl->ob->check_score;
1557 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1647 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1558 $pl->ns->destroy if $pl->ns; 1648 $pl->ns->destroy if $pl->ns;
1559 1649
1560 my $path = playerdir $pl; 1650 my $path = playerdir $pl;
1561 my $temp = "$path~$cf::RUNTIME~deleting~"; 1651 my $temp = "$path~$cf::RUNTIME~deleting~";
1616 \@logins 1706 \@logins
1617} 1707}
1618 1708
1619=item $player->maps 1709=item $player->maps
1620 1710
1711=item cf::player::maps $login
1712
1621Returns an arrayref of map paths that are private for this 1713Returns an arrayref of map paths that are private for this
1622player. May block. 1714player. May block.
1623 1715
1624=cut 1716=cut
1625 1717
1687=cut 1779=cut
1688 1780
1689sub find_by_path($) { 1781sub find_by_path($) {
1690 my ($path) = @_; 1782 my ($path) = @_;
1691 1783
1784 $path =~ s/^~[^\/]*//; # skip ~login
1785
1692 my ($match, $specificity); 1786 my ($match, $specificity);
1693 1787
1694 for my $region (list) { 1788 for my $region (list) {
1695 if ($region->{match} && $path =~ $region->{match}) { 1789 if ($region->{match} && $path =~ $region->{match}) {
1696 ($match, $specificity) = ($region, $region->specificity) 1790 ($match, $specificity) = ($region, $region->specificity)
1727 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1821 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1728 1822
1729 # mit "rum" bekleckern, nicht 1823 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 1824 $self->_create_random_map (
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1825 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1826 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1827 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1734 $rmp->{exit_on_final_map}, 1828 $rmp->{exit_on_final_map},
1735 $rmp->{xsize}, $rmp->{ysize}, 1829 $rmp->{xsize}, $rmp->{ysize},
1736 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1830 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1737 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1831 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1759 1853
1760 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1854 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1761} 1855}
1762 1856
1763# also paths starting with '/' 1857# also paths starting with '/'
1764$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1858$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1765 1859
1766sub thawer_merge { 1860sub thawer_merge {
1767 my ($self, $merge) = @_; 1861 my ($self, $merge) = @_;
1768 1862
1769 # we have to keep some variables in memory intact 1863 # we have to keep some variables in memory intact
1867 1961
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1962 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1963 "$UNIQUEDIR/$path"
1870} 1964}
1871 1965
1872# and all this just because we cannot iterate over
1873# all maps in C++...
1874sub change_all_map_light {
1875 my ($change) = @_;
1876
1877 $_->change_map_light ($change)
1878 for grep $_->outdoor, values %cf::MAP;
1879}
1880
1881sub decay_objects { 1966sub decay_objects {
1882 my ($self) = @_; 1967 my ($self) = @_;
1883 1968
1884 return if $self->{deny_reset}; 1969 return if $self->{deny_reset};
1885 1970
1967sub find { 2052sub find {
1968 my ($path, $origin) = @_; 2053 my ($path, $origin) = @_;
1969 2054
1970 $path = normalise $path, $origin && $origin->path; 2055 $path = normalise $path, $origin && $origin->path;
1971 2056
1972 cf::lock_wait "map_data:$path";#d#remove 2057 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 2058 my $guard2 = cf::lock_acquire "map_find:$path";
1974 2059
1975 $cf::MAP{$path} || do { 2060 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977 my $guard2 = cf::lock_acquire "map_find:$path";
1978
1979 my $map = new_from_path cf::map $path 2061 my $map = new_from_path cf::map $path
1980 or return; 2062 or return;
1981 2063
1982 $map->{last_save} = $cf::RUNTIME; 2064 $map->{last_save} = $cf::RUNTIME;
1983 2065
1995 2077
1996 $cf::MAP{$path} = $map 2078 $cf::MAP{$path} = $map
1997 } 2079 }
1998} 2080}
1999 2081
2000sub pre_load { } 2082sub pre_load { }
2001sub post_load { } 2083#sub post_load { } # XS
2002 2084
2003sub load { 2085sub load {
2004 my ($self) = @_; 2086 my ($self) = @_;
2005 2087
2006 local $self->{deny_reset} = 1; # loading can take a long time 2088 local $self->{deny_reset} = 1; # loading can take a long time
2051 unless ($self->{deny_activate}) { 2133 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2134 $self->decay_objects;
2053 $self->fix_auto_apply; 2135 $self->fix_auto_apply;
2054 $self->update_buttons; 2136 $self->update_buttons;
2055 cf::cede_to_tick; 2137 cf::cede_to_tick;
2056 $self->set_darkness_map;
2057 cf::cede_to_tick;
2058 $self->activate; 2138 $self->activate;
2059 } 2139 }
2060 2140
2061 $self->{last_save} = $cf::RUNTIME; 2141 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2142 $self->last_access ($cf::RUNTIME);
2065 } 2145 }
2066 2146
2067 $self->post_load; 2147 $self->post_load;
2068} 2148}
2069 2149
2150# customize the map for a given player, i.e.
2151# return the _real_ map. used by e.g. per-player
2152# maps to change the path to ~playername/mappath
2070sub customise_for { 2153sub customise_for {
2071 my ($self, $ob) = @_; 2154 my ($self, $ob) = @_;
2072 2155
2073 return find "~" . $ob->name . "/" . $self->{path} 2156 return find "~" . $ob->name . "/" . $self->{path}
2074 if $self->per_player; 2157 if $self->per_player;
2090 or next; 2173 or next;
2091 $neigh = find $neigh, $map 2174 $neigh = find $neigh, $map
2092 or next; 2175 or next;
2093 $neigh->load; 2176 $neigh->load;
2094 2177
2178 # now find the diagonal neighbours
2095 push @neigh, 2179 push @neigh,
2096 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2180 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2097 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2181 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2098 } 2182 }
2099 2183
2151 $MAP_PREFETCHER->prio (6); 2235 $MAP_PREFETCHER->prio (6);
2152 2236
2153 () 2237 ()
2154} 2238}
2155 2239
2240# common code, used by both ->save and ->swapout
2156sub save { 2241sub _save {
2157 my ($self) = @_; 2242 my ($self) = @_;
2158
2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
2160 2243
2161 $self->{last_save} = $cf::RUNTIME; 2244 $self->{last_save} = $cf::RUNTIME;
2162 2245
2163 return unless $self->dirty; 2246 return unless $self->dirty;
2164 2247
2184 } else { 2267 } else {
2185 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2268 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2186 } 2269 }
2187} 2270}
2188 2271
2272sub save {
2273 my ($self) = @_;
2274
2275 my $lock = cf::lock_acquire "map_data:$self->{path}";
2276
2277 $self->_save;
2278}
2279
2189sub swap_out { 2280sub swap_out {
2190 my ($self) = @_; 2281 my ($self) = @_;
2191 2282
2192 # save first because save cedes
2193 $self->save;
2194
2195 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2283 my $lock = cf::lock_acquire "map_data:$self->{path}";
2196 2284
2197 return if $self->players;
2198 return if $self->in_memory != cf::MAP_ACTIVE; 2285 return if $self->in_memory != cf::MAP_ACTIVE;
2199 return if $self->{deny_save}; 2286 return if $self->{deny_save};
2287 return if $self->players;
2200 2288
2289 # first deactivate the map and "unlink" it from the core
2290 $self->deactivate;
2291 $_->clear_links_to ($self) for values %cf::MAP;
2201 $self->in_memory (cf::MAP_SWAPPED); 2292 $self->in_memory (cf::MAP_SWAPPED);
2293
2294 # then atomically save
2295 $self->_save;
2296
2297 # then free the map
2298 $self->clear;
2299}
2300
2301sub reset_at {
2302 my ($self) = @_;
2303
2304 # TODO: safety, remove and allow resettable per-player maps
2305 return 1e99 if $self->{deny_reset};
2306
2307 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2308 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2309
2310 $time + $to
2311}
2312
2313sub should_reset {
2314 my ($self) = @_;
2315
2316 $self->reset_at <= $cf::RUNTIME
2317}
2318
2319sub reset {
2320 my ($self) = @_;
2321
2322 my $lock = cf::lock_acquire "map_data:$self->{path}";
2323
2324 return if $self->players;
2325
2326 cf::trace "resetting map ", $self->path, "\n";
2327
2328 $self->in_memory (cf::MAP_SWAPPED);
2329
2330 # need to save uniques path
2331 unless ($self->{deny_save}) {
2332 my $uniq = $self->uniq_path; utf8::encode $uniq;
2333
2334 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2335 if $uniq;
2336 }
2337
2338 delete $cf::MAP{$self->path};
2202 2339
2203 $self->deactivate; 2340 $self->deactivate;
2204 $_->clear_links_to ($self) for values %cf::MAP; 2341 $_->clear_links_to ($self) for values %cf::MAP;
2205 $self->clear; 2342 $self->clear;
2206}
2207
2208sub reset_at {
2209 my ($self) = @_;
2210
2211 # TODO: safety, remove and allow resettable per-player maps
2212 return 1e99 if $self->{deny_reset};
2213
2214 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2215 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2216
2217 $time + $to
2218}
2219
2220sub should_reset {
2221 my ($self) = @_;
2222
2223 $self->reset_at <= $cf::RUNTIME
2224}
2225
2226sub reset {
2227 my ($self) = @_;
2228
2229 my $lock = cf::lock_acquire "map_data:$self->{path}";
2230
2231 return if $self->players;
2232
2233 warn "resetting map ", $self->path;
2234
2235 $self->in_memory (cf::MAP_SWAPPED);
2236
2237 # need to save uniques path
2238 unless ($self->{deny_save}) {
2239 my $uniq = $self->uniq_path; utf8::encode $uniq;
2240
2241 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2242 if $uniq;
2243 }
2244
2245 delete $cf::MAP{$self->path};
2246
2247 $self->deactivate;
2248 $_->clear_links_to ($self) for values %cf::MAP;
2249 $self->clear;
2250 2343
2251 $self->unlink_save; 2344 $self->unlink_save;
2252 $self->destroy; 2345 $self->destroy;
2253} 2346}
2254 2347
2262 2355
2263 delete $cf::MAP{$self->path}; 2356 delete $cf::MAP{$self->path};
2264 2357
2265 $self->unlink_save; 2358 $self->unlink_save;
2266 2359
2267 bless $self, "cf::map"; 2360 bless $self, "cf::map::wrap";
2268 delete $self->{deny_reset}; 2361 delete $self->{deny_reset};
2269 $self->{deny_save} = 1; 2362 $self->{deny_save} = 1;
2270 $self->reset_timeout (1); 2363 $self->reset_timeout (1);
2271 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2364 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2272 2365
2329 : normalise $_ 2422 : normalise $_
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2423 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2424 ]
2332} 2425}
2333 2426
2427=item cf::map::static_maps
2428
2429Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2430file in the shared directory excluding F</styles> and F</editor>). May
2431block.
2432
2433=cut
2434
2435sub static_maps() {
2436 my @dirs = "";
2437 my @maps;
2438
2439 while (@dirs) {
2440 my $dir = shift @dirs;
2441
2442 next if $dir eq "/styles" || $dir eq "/editor";
2443
2444 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2445 or return;
2446
2447 for (@$files) {
2448 s/\.map$// or next;
2449 utf8::decode $_;
2450 push @maps, "$dir/$_";
2451 }
2452
2453 push @dirs, map "$dir/$_", @$dirs;
2454 }
2455
2456 \@maps
2457}
2458
2334=back 2459=back
2335 2460
2336=head3 cf::object 2461=head3 cf::object
2337 2462
2338=cut 2463=cut
2403 2528
2404our $SAY_CHANNEL = { 2529our $SAY_CHANNEL = {
2405 id => "say", 2530 id => "say",
2406 title => "Map", 2531 title => "Map",
2407 reply => "say ", 2532 reply => "say ",
2408 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2533 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2409}; 2534};
2410 2535
2411our $CHAT_CHANNEL = { 2536our $CHAT_CHANNEL = {
2412 id => "chat", 2537 id => "chat",
2413 title => "Chat", 2538 title => "Chat",
2470 2595
2471Freezes the player and moves him/her to a special map (C<{link}>). 2596Freezes the player and moves him/her to a special map (C<{link}>).
2472 2597
2473The player should be reasonably safe there for short amounts of time (e.g. 2598The player should be reasonably safe there for short amounts of time (e.g.
2474for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2599for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2475though, as the palyer cannot control the character while it is on the link 2600though, as the player cannot control the character while it is on the link
2476map. 2601map.
2477 2602
2478Will never block. 2603Will never block.
2479 2604
2480=item $player_object->leave_link ($map, $x, $y) 2605=item $player_object->leave_link ($map, $x, $y)
2501sub cf::object::player::enter_link { 2626sub cf::object::player::enter_link {
2502 my ($self) = @_; 2627 my ($self) = @_;
2503 2628
2504 $self->deactivate_recursive; 2629 $self->deactivate_recursive;
2505 2630
2631 ++$self->{_link_recursion};
2632
2506 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2633 return if UNIVERSAL::isa $self->map, "ext::map_link";
2507 2634
2508 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2635 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2509 if $self->map && $self->map->{path} ne "{link}"; 2636 if $self->map && $self->map->{path} ne "{link}";
2510 2637
2511 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2638 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2512} 2639}
2513 2640
2514sub cf::object::player::leave_link { 2641sub cf::object::player::leave_link {
2515 my ($self, $map, $x, $y) = @_; 2642 my ($self, $map, $x, $y) = @_;
2516 2643
2533 ($x, $y) = (-1, -1) 2660 ($x, $y) = (-1, -1)
2534 unless (defined $x) && (defined $y); 2661 unless (defined $x) && (defined $y);
2535 2662
2536 # use -1 or undef as default coordinates, not 0, 0 2663 # use -1 or undef as default coordinates, not 0, 0
2537 ($x, $y) = ($map->enter_x, $map->enter_y) 2664 ($x, $y) = ($map->enter_x, $map->enter_y)
2538 if $x <=0 && $y <= 0; 2665 if $x <= 0 && $y <= 0;
2539 2666
2540 $map->load; 2667 $map->load;
2541 $map->load_neighbours; 2668 $map->load_neighbours;
2542 2669
2543 return unless $self->contr->active; 2670 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2545 $self->activate_recursive;
2546 2671
2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2672 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2548 $self->enter_map ($map, $x, $y); 2673 if ($self->enter_map ($map, $x, $y)) {
2549} 2674 # entering was successful
2675 delete $self->{_link_recursion};
2676 # only activate afterwards, to support waiting in hooks
2677 $self->activate_recursive;
2678 }
2550 2679
2680}
2681
2551=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2682=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2552 2683
2553Moves the player to the given map-path and coordinates by first freezing 2684Moves the player to the given map-path and coordinates by first freezing
2554her, loading and preparing them map, calling the provided $check callback 2685her, loading and preparing them map, calling the provided $check callback
2555that has to return the map if sucecssful, and then unfreezes the player on 2686that has to return the map if sucecssful, and then unfreezes the player on
2556the new (success) or old (failed) map position. In either case, $done will 2687the new (success) or old (failed) map position. In either case, $done will
2563 2694
2564our $GOTOGEN; 2695our $GOTOGEN;
2565 2696
2566sub cf::object::player::goto { 2697sub cf::object::player::goto {
2567 my ($self, $path, $x, $y, $check, $done) = @_; 2698 my ($self, $path, $x, $y, $check, $done) = @_;
2699
2700 if ($self->{_link_recursion} >= $MAX_LINKS) {
2701 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2702 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2703 ($path, $x, $y) = @$EMERGENCY_POSITION;
2704 }
2568 2705
2569 # do generation counting so two concurrent goto's will be executed in-order 2706 # do generation counting so two concurrent goto's will be executed in-order
2570 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2707 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2571 2708
2572 $self->enter_link; 2709 $self->enter_link;
2596 my $map = eval { 2733 my $map = eval {
2597 my $map = defined $path ? cf::map::find $path : undef; 2734 my $map = defined $path ? cf::map::find $path : undef;
2598 2735
2599 if ($map) { 2736 if ($map) {
2600 $map = $map->customise_for ($self); 2737 $map = $map->customise_for ($self);
2601 $map = $check->($map) if $check && $map; 2738 $map = $check->($map, $x, $y, $self) if $check && $map;
2602 } else { 2739 } else {
2603 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2740 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2604 } 2741 }
2605 2742
2606 $map 2743 $map
2614 if ($gen == $self->{_goto_generation}) { 2751 if ($gen == $self->{_goto_generation}) {
2615 delete $self->{_goto_generation}; 2752 delete $self->{_goto_generation};
2616 $self->leave_link ($map, $x, $y); 2753 $self->leave_link ($map, $x, $y);
2617 } 2754 }
2618 2755
2619 $done->() if $done; 2756 $done->($self) if $done;
2620 })->prio (1); 2757 })->prio (1);
2621} 2758}
2622 2759
2623=item $player_object->enter_exit ($exit_object) 2760=item $player_object->enter_exit ($exit_object)
2624 2761
2717 $self->message ("Something went wrong deep within the deliantra server. " 2854 $self->message ("Something went wrong deep within the deliantra server. "
2718 . "I'll try to bring you back to the map you were before. " 2855 . "I'll try to bring you back to the map you were before. "
2719 . "Please report this to the dungeon master!", 2856 . "Please report this to the dungeon master!",
2720 cf::NDI_UNIQUE | cf::NDI_RED); 2857 cf::NDI_UNIQUE | cf::NDI_RED);
2721 2858
2722 warn "ERROR in enter_exit: $@"; 2859 error "ERROR in enter_exit: $@";
2723 $self->leave_link; 2860 $self->leave_link;
2724 } 2861 }
2725 })->prio (1); 2862 })->prio (1);
2726} 2863}
2727 2864
2739sub cf::client::send_drawinfo { 2876sub cf::client::send_drawinfo {
2740 my ($self, $text, $flags) = @_; 2877 my ($self, $text, $flags) = @_;
2741 2878
2742 utf8::encode $text; 2879 utf8::encode $text;
2743 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2880 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2881}
2882
2883=item $client->send_big_packet ($pkt)
2884
2885Like C<send_packet>, but tries to compress large packets, and fragments
2886them as required.
2887
2888=cut
2889
2890our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2891
2892sub cf::client::send_big_packet {
2893 my ($self, $pkt) = @_;
2894
2895 # try lzf for large packets
2896 $pkt = "lzf " . Compress::LZF::compress $pkt
2897 if 1024 <= length $pkt and $self->{can_lzf};
2898
2899 # split very large packets
2900 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2901 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2902 $pkt = "frag";
2903 }
2904
2905 $self->send_packet ($pkt);
2744} 2906}
2745 2907
2746=item $client->send_msg ($channel, $msg, $color, [extra...]) 2908=item $client->send_msg ($channel, $msg, $color, [extra...])
2747 2909
2748Send a drawinfo or msg packet to the client, formatting the msg for the 2910Send a drawinfo or msg packet to the client, formatting the msg for the
2752 2914
2753=cut 2915=cut
2754 2916
2755# non-persistent channels (usually the info channel) 2917# non-persistent channels (usually the info channel)
2756our %CHANNEL = ( 2918our %CHANNEL = (
2919 "c/motd" => {
2920 id => "infobox",
2921 title => "MOTD",
2922 reply => undef,
2923 tooltip => "The message of the day",
2924 },
2757 "c/identify" => { 2925 "c/identify" => {
2758 id => "infobox", 2926 id => "infobox",
2759 title => "Identify", 2927 title => "Identify",
2760 reply => undef, 2928 reply => undef,
2761 tooltip => "Items recently identified", 2929 tooltip => "Items recently identified",
2763 "c/examine" => { 2931 "c/examine" => {
2764 id => "infobox", 2932 id => "infobox",
2765 title => "Examine", 2933 title => "Examine",
2766 reply => undef, 2934 reply => undef,
2767 tooltip => "Signs and other items you examined", 2935 tooltip => "Signs and other items you examined",
2936 },
2937 "c/shopinfo" => {
2938 id => "infobox",
2939 title => "Shop Info",
2940 reply => undef,
2941 tooltip => "What your bargaining skill tells you about the shop",
2768 }, 2942 },
2769 "c/book" => { 2943 "c/book" => {
2770 id => "infobox", 2944 id => "infobox",
2771 title => "Book", 2945 title => "Book",
2772 reply => undef, 2946 reply => undef,
2788 id => "infobox", 2962 id => "infobox",
2789 title => "Body Parts", 2963 title => "Body Parts",
2790 reply => undef, 2964 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available", 2965 tooltip => "Shows which body parts you posess and are available",
2792 }, 2966 },
2967 "c/statistics" => {
2968 id => "infobox",
2969 title => "Statistics",
2970 reply => undef,
2971 tooltip => "Shows your primary statistics",
2972 },
2793 "c/skills" => { 2973 "c/skills" => {
2794 id => "infobox", 2974 id => "infobox",
2795 title => "Skills", 2975 title => "Skills",
2796 reply => undef, 2976 reply => undef,
2797 tooltip => "Shows your experience per skill and item power", 2977 tooltip => "Shows your experience per skill and item power",
2978 },
2979 "c/shopitems" => {
2980 id => "infobox",
2981 title => "Shop Items",
2982 reply => undef,
2983 tooltip => "Shows the items currently for sale in this shop",
2984 },
2985 "c/resistances" => {
2986 id => "infobox",
2987 title => "Resistances",
2988 reply => undef,
2989 tooltip => "Shows your resistances",
2990 },
2991 "c/pets" => {
2992 id => "infobox",
2993 title => "Pets",
2994 reply => undef,
2995 tooltip => "Shows information abotu your pets/a specific pet",
2996 },
2997 "c/perceiveself" => {
2998 id => "infobox",
2999 title => "Perceive Self",
3000 reply => undef,
3001 tooltip => "You gained detailed knowledge about yourself",
2798 }, 3002 },
2799 "c/uptime" => { 3003 "c/uptime" => {
2800 id => "infobox", 3004 id => "infobox",
2801 title => "Uptime", 3005 title => "Uptime",
2802 reply => undef, 3006 reply => undef,
2812 id => "party", 3016 id => "party",
2813 title => "Party", 3017 title => "Party",
2814 reply => "gsay ", 3018 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party", 3019 tooltip => "Messages and chat related to your party",
2816 }, 3020 },
3021 "c/death" => {
3022 id => "death",
3023 title => "Death",
3024 reply => undef,
3025 tooltip => "Reason for and more info about your most recent death",
3026 },
3027 "c/say" => $SAY_CHANNEL,
3028 "c/chat" => $CHAT_CHANNEL,
2817); 3029);
2818 3030
2819sub cf::client::send_msg { 3031sub cf::client::send_msg {
2820 my ($self, $channel, $msg, $color, @extra) = @_; 3032 my ($self, $channel, $msg, $color, @extra) = @_;
2821 3033
2826 3038
2827 # check predefined channels, for the benefit of C 3039 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) { 3040 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel}; 3041 $channel = $CHANNEL{$channel};
2830 3042
2831 $self->ext_msg (channel_info => $channel) 3043 $self->ext_msg (channel_info => $channel);
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id}; 3044 $channel = $channel->{id};
2835 3045
2836 } elsif (ref $channel) { 3046 } elsif (ref $channel) {
2837 # send meta info to client, if not yet sent 3047 # send meta info to client, if not yet sent
2838 unless (exists $self->{channel}{$channel->{id}}) { 3048 unless (exists $self->{channel}{$channel->{id}}) {
2839 $self->{channel}{$channel->{id}} = $channel; 3049 $self->{channel}{$channel->{id}} = $channel;
2840 $self->ext_msg (channel_info => $channel) 3050 $self->ext_msg (channel_info => $channel);
2841 if $self->can_msg;
2842 } 3051 }
2843 3052
2844 $channel = $channel->{id}; 3053 $channel = $channel->{id};
2845 } 3054 }
2846 3055
2847 return unless @extra || length $msg; 3056 return unless @extra || length $msg;
2848 3057
2849 if ($self->can_msg) {
2850 # default colour, mask it out 3058 # default colour, mask it out
2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3059 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852 if $color & cf::NDI_DEF; 3060 if $color & cf::NDI_DEF;
2853 3061
2854 my $pkt = "msg " 3062 my $pkt = "msg "
2855 . $self->{json_coder}->encode ( 3063 . $self->{json_coder}->encode (
2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3064 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 ); 3065 );
2858 3066
2859 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf};
2862
2863 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag";
2867 }
2868
2869 $self->send_packet ($pkt); 3067 $self->send_big_packet ($pkt);
2870 } else {
2871 if ($color >= 0) {
2872 # replace some tags by gcfclient-compatible ones
2873 for ($msg) {
2874 1 while
2875 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2876 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2877 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2878 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2879 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2880 }
2881
2882 $color &= cf::NDI_COLOR_MASK;
2883
2884 utf8::encode $msg;
2885
2886 if (0 && $msg =~ /\[/) {
2887 # COMMAND/INFO
2888 $self->send_packet ("drawextinfo $color 10 8 $msg")
2889 } else {
2890 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2891 $self->send_packet ("drawinfo $color $msg")
2892 }
2893 }
2894 }
2895} 3068}
2896 3069
2897=item $client->ext_msg ($type, @msg) 3070=item $client->ext_msg ($type, @msg)
2898 3071
2899Sends an ext event to the client. 3072Sends an ext event to the client.
2902 3075
2903sub cf::client::ext_msg($$@) { 3076sub cf::client::ext_msg($$@) {
2904 my ($self, $type, @msg) = @_; 3077 my ($self, $type, @msg) = @_;
2905 3078
2906 if ($self->extcmd == 2) { 3079 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3080 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove 3081 } elsif ($self->extcmd == 1) { # TODO: remove
2909 push @msg, msgtype => "event_$type"; 3082 push @msg, msgtype => "event_$type";
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3083 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3084 }
2912} 3085}
2913 3086
2914=item $client->ext_reply ($msgid, @msg) 3087=item $client->ext_reply ($msgid, @msg)
2915 3088
2919 3092
2920sub cf::client::ext_reply($$@) { 3093sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_; 3094 my ($self, $id, @msg) = @_;
2922 3095
2923 if ($self->extcmd == 2) { 3096 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3097 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) { 3098 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove 3099 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id; 3100 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 } 3102 }
2930} 3103}
2931 3104
2932=item $success = $client->query ($flags, "text", \&cb) 3105=item $success = $client->query ($flags, "text", \&cb)
2933 3106
3004 3177
3005 $ns->ext_reply ($reply, @reply) 3178 $ns->ext_reply ($reply, @reply)
3006 if $reply; 3179 if $reply;
3007 3180
3008 } else { 3181 } else {
3009 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3182 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3010 } 3183 }
3011 3184
3012 cf::override; 3185 cf::override;
3013 }, 3186 },
3014); 3187);
3034 3207
3035 $coro 3208 $coro
3036} 3209}
3037 3210
3038cf::client->attach ( 3211cf::client->attach (
3039 on_destroy => sub { 3212 on_client_destroy => sub {
3040 my ($ns) = @_; 3213 my ($ns) = @_;
3041 3214
3042 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3215 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3043 }, 3216 },
3044); 3217);
3060our $safe_hole = new Safe::Hole; 3233our $safe_hole = new Safe::Hole;
3061 3234
3062$SIG{FPE} = 'IGNORE'; 3235$SIG{FPE} = 'IGNORE';
3063 3236
3064$safe->permit_only (Opcode::opset qw( 3237$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math 3238 :base_core :base_mem :base_orig :base_math :base_loop
3066 grepstart grepwhile mapstart mapwhile 3239 grepstart grepwhile mapstart mapwhile
3067 sort time 3240 sort time
3068)); 3241));
3069 3242
3070# here we export the classes and methods available to script code 3243# here we export the classes and methods available to script code
3074The following functions and methods are available within a safe environment: 3247The following functions and methods are available within a safe environment:
3075 3248
3076 cf::object 3249 cf::object
3077 contr pay_amount pay_player map x y force_find force_add destroy 3250 contr pay_amount pay_player map x y force_find force_add destroy
3078 insert remove name archname title slaying race decrease split 3251 insert remove name archname title slaying race decrease split
3252 value
3079 3253
3080 cf::object::player 3254 cf::object::player
3081 player 3255 player
3082 3256
3083 cf::player 3257 cf::player
3089=cut 3263=cut
3090 3264
3091for ( 3265for (
3092 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3266 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3093 insert remove inv nrof name archname title slaying race 3267 insert remove inv nrof name archname title slaying race
3094 decrease split destroy change_exp)], 3268 decrease split destroy change_exp value msg lore send_msg)],
3095 ["cf::object::player" => qw(player)], 3269 ["cf::object::player" => qw(player)],
3096 ["cf::player" => qw(peaceful)], 3270 ["cf::player" => qw(peaceful send_msg)],
3097 ["cf::map" => qw(trigger)], 3271 ["cf::map" => qw(trigger)],
3098) { 3272) {
3099 no strict 'refs'; 3273 no strict 'refs';
3100 my ($pkg, @funs) = @$_; 3274 my ($pkg, @funs) = @$_;
3101 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3275 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3119 3293
3120 my $qcode = $code; 3294 my $qcode = $code;
3121 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3295 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3122 $qcode =~ s/\n/\\n/g; 3296 $qcode =~ s/\n/\\n/g;
3123 3297
3298 %vars = (_dummy => 0) unless %vars;
3299
3300 my @res;
3124 local $_; 3301 local $_;
3125 local @safe::cf::_safe_eval_args = values %vars;
3126 3302
3127 my $eval = 3303 my $eval =
3128 "do {\n" 3304 "do {\n"
3129 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3305 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3130 . "#line 0 \"{$qcode}\"\n" 3306 . "#line 0 \"{$qcode}\"\n"
3131 . $code 3307 . $code
3132 . "\n}" 3308 . "\n}"
3133 ; 3309 ;
3134 3310
3311 if ($CFG{safe_eval}) {
3135 sub_generation_inc; 3312 sub_generation_inc;
3313 local @safe::cf::_safe_eval_args = values %vars;
3136 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3314 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3137 sub_generation_inc; 3315 sub_generation_inc;
3316 } else {
3317 local @cf::_safe_eval_args = values %vars;
3318 @res = wantarray ? eval eval : scalar eval $eval;
3319 }
3138 3320
3139 if ($@) { 3321 if ($@) {
3140 warn "$@"; 3322 warn "$@",
3141 warn "while executing safe code '$code'\n"; 3323 "while executing safe code '$code'\n",
3142 warn "with arguments " . (join " ", %vars) . "\n"; 3324 "with arguments " . (join " ", %vars) . "\n";
3143 } 3325 }
3144 3326
3145 wantarray ? @res : $res[0] 3327 wantarray ? @res : $res[0]
3146} 3328}
3147 3329
3161=cut 3343=cut
3162 3344
3163sub register_script_function { 3345sub register_script_function {
3164 my ($fun, $cb) = @_; 3346 my ($fun, $cb) = @_;
3165 3347
3166 no strict 'refs'; 3348 $fun = "safe::$fun" if $CFG{safe_eval};
3167 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3349 *$fun = $safe_hole->wrap ($cb);
3168} 3350}
3169 3351
3170=back 3352=back
3171 3353
3172=cut 3354=cut
3181 # for this (global event?) 3363 # for this (global event?)
3182 %ext::player_env::MUSIC_FACE_CACHE = (); 3364 %ext::player_env::MUSIC_FACE_CACHE = ();
3183 3365
3184 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3366 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3185 3367
3186 warn "loading facedata from $path\n"; 3368 trace "loading facedata from $path\n";
3187 3369
3188 my $facedata; 3370 my $facedata;
3189 0 < aio_load $path, $facedata 3371 0 < aio_load $path, $facedata
3190 or die "$path: $!"; 3372 or die "$path: $!";
3191 3373
3193 3375
3194 $facedata->{version} == 2 3376 $facedata->{version} == 2
3195 or cf::cleanup "$path: version mismatch, cannot proceed."; 3377 or cf::cleanup "$path: version mismatch, cannot proceed.";
3196 3378
3197 # patch in the exptable 3379 # patch in the exptable
3380 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3198 $facedata->{resource}{"res/exp_table"} = { 3381 $facedata->{resource}{"res/exp_table"} = {
3199 type => FT_RSRC, 3382 type => FT_RSRC,
3200 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3383 data => $exp_table,
3384 hash => (Digest::MD5::md5 $exp_table),
3201 }; 3385 };
3202 cf::cede_to_tick; 3386 cf::cede_to_tick;
3203 3387
3204 { 3388 {
3205 my $faces = $facedata->{faceinfo}; 3389 my $faces = $facedata->{faceinfo};
3207 while (my ($face, $info) = each %$faces) { 3391 while (my ($face, $info) = each %$faces) {
3208 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3392 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3209 3393
3210 cf::face::set_visibility $idx, $info->{visibility}; 3394 cf::face::set_visibility $idx, $info->{visibility};
3211 cf::face::set_magicmap $idx, $info->{magicmap}; 3395 cf::face::set_magicmap $idx, $info->{magicmap};
3212 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3396 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3213 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3397 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3214 3398
3215 cf::cede_to_tick; 3399 cf::cede_to_tick;
3216 } 3400 }
3217 3401
3218 while (my ($face, $info) = each %$faces) { 3402 while (my ($face, $info) = each %$faces) {
3223 3407
3224 if (my $smooth = cf::face::find $info->{smooth}) { 3408 if (my $smooth = cf::face::find $info->{smooth}) {
3225 cf::face::set_smooth $idx, $smooth; 3409 cf::face::set_smooth $idx, $smooth;
3226 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3410 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3227 } else { 3411 } else {
3228 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3412 error "smooth face '$info->{smooth}' not found for face '$face'";
3229 } 3413 }
3230 3414
3231 cf::cede_to_tick; 3415 cf::cede_to_tick;
3232 } 3416 }
3233 } 3417 }
3242 3426
3243 cf::anim::invalidate_all; # d'oh 3427 cf::anim::invalidate_all; # d'oh
3244 } 3428 }
3245 3429
3246 { 3430 {
3247 # TODO: for gcfclient pleasure, we should give resources
3248 # that gcfclient doesn't grok a >10000 face index.
3249 my $res = $facedata->{resource}; 3431 my $res = $facedata->{resource};
3250 3432
3251 while (my ($name, $info) = each %$res) { 3433 while (my ($name, $info) = each %$res) {
3252 if (defined $info->{type}) { 3434 if (defined $info->{type}) {
3253 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3435 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3254 my $data;
3255 3436
3256 if ($info->{type} & 1) { 3437 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3257 # prepend meta info
3258
3259 my $meta = $enc->encode ({
3260 name => $name,
3261 %{ $info->{meta} || {} },
3262 });
3263
3264 $data = pack "(w/a*)*", $meta, $info->{data};
3265 } else {
3266 $data = $info->{data};
3267 }
3268
3269 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3270 cf::face::set_type $idx, $info->{type}; 3438 cf::face::set_type $idx, $info->{type};
3271 } else { 3439 } else {
3272 $RESOURCE{$name} = $info; 3440 $RESOURCE{$name} = $info; # unused
3273 } 3441 }
3274 3442
3275 cf::cede_to_tick; 3443 cf::cede_to_tick;
3276 } 3444 }
3277 } 3445 }
3278 3446
3279 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3447 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3280 3448
3281 1 3449 1
3282} 3450}
3283
3284cf::global->attach (on_resource_update => sub {
3285 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3286 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3287
3288 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3289 my $sound = $soundconf->{compat}[$_]
3290 or next;
3291
3292 my $face = cf::face::find "sound/$sound->[1]";
3293 cf::sound::set $sound->[0] => $face;
3294 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3295 }
3296
3297 while (my ($k, $v) = each %{$soundconf->{event}}) {
3298 my $face = cf::face::find "sound/$v";
3299 cf::sound::set $k => $face;
3300 }
3301 }
3302});
3303 3451
3304register_exticmd fx_want => sub { 3452register_exticmd fx_want => sub {
3305 my ($ns, $want) = @_; 3453 my ($ns, $want) = @_;
3306 3454
3307 while (my ($k, $v) = each %$want) { 3455 while (my ($k, $v) = each %$want) {
3346sub reload_treasures { 3494sub reload_treasures {
3347 load_resource_file "$DATADIR/treasures" 3495 load_resource_file "$DATADIR/treasures"
3348 or die "unable to load treasurelists\n"; 3496 or die "unable to load treasurelists\n";
3349} 3497}
3350 3498
3499sub reload_sound {
3500 trace "loading sound config from $DATADIR/sound\n";
3501
3502 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3503 or die "$DATADIR/sound $!";
3504
3505 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3506
3507 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3508 my $sound = $soundconf->{compat}[$_]
3509 or next;
3510
3511 my $face = cf::face::find "sound/$sound->[1]";
3512 cf::sound::set $sound->[0] => $face;
3513 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3514 }
3515
3516 while (my ($k, $v) = each %{$soundconf->{event}}) {
3517 my $face = cf::face::find "sound/$v";
3518 cf::sound::set $k => $face;
3519 }
3520}
3521
3351sub reload_resources { 3522sub reload_resources {
3352 warn "reloading resource files...\n"; 3523 trace "reloading resource files...\n";
3353 3524
3354 reload_facedata; 3525 reload_facedata;
3526 reload_sound;
3355 reload_archetypes; 3527 reload_archetypes;
3356 reload_regions; 3528 reload_regions;
3357 reload_treasures; 3529 reload_treasures;
3358 3530
3359 warn "finished reloading resource files\n"; 3531 trace "finished reloading resource files\n";
3360} 3532}
3361 3533
3362sub reload_config { 3534sub reload_config {
3535 trace "reloading config file...\n";
3536
3363 open my $fh, "<:utf8", "$CONFDIR/config" 3537 open my $fh, "<:utf8", "$CONFDIR/config"
3364 or return; 3538 or return;
3365 3539
3366 local $/; 3540 local $/;
3367 *CFG = YAML::Load <$fh>; 3541 *CFG = YAML::XS::Load scalar <$fh>;
3368 3542
3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3543 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3370 3544
3371 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3545 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3372 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3546 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3373 3547
3374 if (exists $CFG{mlockall}) { 3548 if (exists $CFG{mlockall}) {
3376 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3550 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3377 and die "WARNING: m(un)lockall failed: $!\n"; 3551 and die "WARNING: m(un)lockall failed: $!\n";
3378 }; 3552 };
3379 warn $@ if $@; 3553 warn $@ if $@;
3380 } 3554 }
3555
3556 trace "finished reloading resource files\n";
3381} 3557}
3382 3558
3383sub pidfile() { 3559sub pidfile() {
3384 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3560 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3385 or die "$PIDFILE: $!"; 3561 or die "$PIDFILE: $!";
3397 3573
3398 seek $fh, 0, 0; 3574 seek $fh, 0, 0;
3399 print $fh $$; 3575 print $fh $$;
3400} 3576}
3401 3577
3578sub main_loop {
3579 trace "EV::loop starting\n";
3580 if (1) {
3581 EV::loop;
3582 }
3583 trace "EV::loop returned\n";
3584 goto &main_loop unless $REALLY_UNLOOP;
3585}
3586
3402sub main { 3587sub main {
3403 cf::init_globals; # initialise logging 3588 cf::init_globals; # initialise logging
3404 3589
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3590 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3591 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3407 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3592 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3408 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3593 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3409
3410 cf::init_experience;
3411 cf::init_anim;
3412 cf::init_attackmess;
3413 cf::init_dynamic;
3414 cf::init_block;
3415 3594
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3595 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417 3596
3418 # we must not ever block the main coroutine 3597 # we must not ever block the main coroutine
3419 local $Coro::idle = sub { 3598 local $Coro::idle = sub {
3425 }; 3604 };
3426 3605
3427 evthread_start IO::AIO::poll_fileno; 3606 evthread_start IO::AIO::poll_fileno;
3428 3607
3429 cf::sync_job { 3608 cf::sync_job {
3609 cf::init_experience;
3610 cf::init_anim;
3611 cf::init_attackmess;
3612 cf::init_dynamic;
3613
3614 cf::load_settings;
3615 cf::load_materials;
3616
3430 reload_resources; 3617 reload_resources;
3431 reload_config; 3618 reload_config;
3432 db_init; 3619 db_init;
3433 3620
3434 cf::load_settings;
3435 cf::load_materials;
3436 cf::init_uuid; 3621 cf::init_uuid;
3437 cf::init_signals; 3622 cf::init_signals;
3438 cf::init_commands;
3439 cf::init_skills; 3623 cf::init_skills;
3440 3624
3441 cf::init_beforeplay; 3625 cf::init_beforeplay;
3442 3626
3443 atomic; 3627 atomic;
3445 load_extensions; 3629 load_extensions;
3446 3630
3447 utime time, time, $RUNTIMEFILE; 3631 utime time, time, $RUNTIMEFILE;
3448 3632
3449 # no (long-running) fork's whatsoever before this point(!) 3633 # no (long-running) fork's whatsoever before this point(!)
3634 use POSIX ();
3450 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3635 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3451 3636
3452 (pop @POST_INIT)->(0) while @POST_INIT; 3637 (pop @POST_INIT)->(0) while @POST_INIT;
3453 }; 3638 };
3454 3639
3455 EV::loop; 3640 cf::object::thawer::errors_are_fatal 0;
3641 info "parse errors in files are no longer fatal from this point on.\n";
3642
3643 main_loop;
3456} 3644}
3457 3645
3458############################################################################# 3646#############################################################################
3459# initialisation and cleanup 3647# initialisation and cleanup
3460 3648
3461# install some emergency cleanup handlers 3649# install some emergency cleanup handlers
3462BEGIN { 3650BEGIN {
3463 our %SIGWATCHER = (); 3651 our %SIGWATCHER = ();
3464 for my $signal (qw(INT HUP TERM)) { 3652 for my $signal (qw(INT HUP TERM)) {
3465 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3653 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3466 cf::cleanup "SIG$signal"; 3654 cf::cleanup "SIG$signal";
3467 }; 3655 };
3468 } 3656 }
3469} 3657}
3470 3658
3471sub write_runtime_sync { 3659sub write_runtime_sync {
3660 my $t0 = AE::time;
3661
3472 # first touch the runtime file to show we are still running: 3662 # first touch the runtime file to show we are still running:
3473 # the fsync below can take a very very long time. 3663 # the fsync below can take a very very long time.
3474 3664
3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3665 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3476 3666
3477 my $guard = cf::lock_acquire "write_runtime"; 3667 my $guard = cf::lock_acquire "write_runtime";
3478 3668
3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3669 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3480 or return; 3670 or return;
3481 3671
3482 my $value = $cf::RUNTIME + 90 + 10; 3672 my $value = $cf::RUNTIME + 90 + 10;
3483 # 10 is the runtime save interval, for a monotonic clock 3673 # 10 is the runtime save interval, for a monotonic clock
3484 # 60 allows for the watchdog to kill the server. 3674 # 60 allows for the watchdog to kill the server.
3497 or return; 3687 or return;
3498 3688
3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3689 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3500 and return; 3690 and return;
3501 3691
3502 warn "runtime file written.\n"; 3692 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3503 3693
3504 1 3694 1
3505} 3695}
3506 3696
3507our $uuid_lock; 3697our $uuid_lock;
3516 my $uuid = "$LOCALDIR/uuid"; 3706 my $uuid = "$LOCALDIR/uuid";
3517 3707
3518 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3708 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3519 or return; 3709 or return;
3520 3710
3521 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3711 my $value = uuid_seq uuid_cur;
3712
3713 unless ($value) {
3714 info "cowardly refusing to write zero uuid value!\n";
3715 return;
3716 }
3717
3718 my $value = uuid_str $value + $uuid_skip;
3522 $uuid_skip = 0; 3719 $uuid_skip = 0;
3523 3720
3524 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3721 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3525 and return; 3722 and return;
3526 3723
3532 or return; 3729 or return;
3533 3730
3534 aio_rename "$uuid~", $uuid 3731 aio_rename "$uuid~", $uuid
3535 and return; 3732 and return;
3536 3733
3537 warn "uuid file written ($value).\n"; 3734 trace "uuid file written ($value).\n";
3538 3735
3539 1 3736 1
3540 3737
3541} 3738}
3542 3739
3548} 3745}
3549 3746
3550sub emergency_save() { 3747sub emergency_save() {
3551 my $freeze_guard = cf::freeze_mainloop; 3748 my $freeze_guard = cf::freeze_mainloop;
3552 3749
3553 warn "enter emergency perl save\n"; 3750 info "emergency_perl_save: enter\n";
3554 3751
3555 cf::sync_job { 3752 cf::sync_job {
3753 # this is a trade-off: we want to be very quick here, so
3754 # save all maps without fsync, and later call a global sync
3755 # (which in turn might be very very slow)
3756 local $USE_FSYNC = 0;
3757
3556 # use a peculiar iteration method to avoid tripping on perl 3758 # use a peculiar iteration method to avoid tripping on perl
3557 # refcount bugs in for. also avoids problems with players 3759 # refcount bugs in for. also avoids problems with players
3558 # and maps saved/destroyed asynchronously. 3760 # and maps saved/destroyed asynchronously.
3559 warn "begin emergency player save\n"; 3761 info "emergency_perl_save: begin player save\n";
3560 for my $login (keys %cf::PLAYER) { 3762 for my $login (keys %cf::PLAYER) {
3561 my $pl = $cf::PLAYER{$login} or next; 3763 my $pl = $cf::PLAYER{$login} or next;
3562 $pl->valid or next; 3764 $pl->valid or next;
3563 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3765 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3564 $pl->save; 3766 $pl->save;
3565 } 3767 }
3566 warn "end emergency player save\n"; 3768 info "emergency_perl_save: end player save\n";
3567 3769
3568 warn "begin emergency map save\n"; 3770 info "emergency_perl_save: begin map save\n";
3569 for my $path (keys %cf::MAP) { 3771 for my $path (keys %cf::MAP) {
3570 my $map = $cf::MAP{$path} or next; 3772 my $map = $cf::MAP{$path} or next;
3571 $map->valid or next; 3773 $map->valid or next;
3572 $map->save; 3774 $map->save;
3573 } 3775 }
3574 warn "end emergency map save\n"; 3776 info "emergency_perl_save: end map save\n";
3575 3777
3576 warn "begin emergency database checkpoint\n"; 3778 info "emergency_perl_save: begin database checkpoint\n";
3577 BDB::db_env_txn_checkpoint $DB_ENV; 3779 BDB::db_env_txn_checkpoint $DB_ENV;
3578 warn "end emergency database checkpoint\n"; 3780 info "emergency_perl_save: end database checkpoint\n";
3579 3781
3580 warn "begin write uuid\n"; 3782 info "emergency_perl_save: begin write uuid\n";
3581 write_uuid_sync 1; 3783 write_uuid_sync 1;
3582 warn "end write uuid\n"; 3784 info "emergency_perl_save: end write uuid\n";
3583 }; 3785 };
3584 3786
3585 warn "leave emergency perl save\n"; 3787 info "emergency_perl_save: starting sync()\n";
3788 IO::AIO::aio_sync sub {
3789 info "emergency_perl_save: finished sync()\n";
3790 };
3791
3792 info "emergency_perl_save: leave\n";
3586} 3793}
3587 3794
3588sub post_cleanup { 3795sub post_cleanup {
3589 my ($make_core) = @_; 3796 my ($make_core) = @_;
3590 3797
3591 warn Carp::longmess "post_cleanup backtrace" 3798 error Carp::longmess "post_cleanup backtrace"
3592 if $make_core; 3799 if $make_core;
3593 3800
3594 my $fh = pidfile; 3801 my $fh = pidfile;
3595 unlink $PIDFILE if <$fh> == $$; 3802 unlink $PIDFILE if <$fh> == $$;
3596} 3803}
3616 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3823 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3617 for my $name (keys %$leaf_symtab) { 3824 for my $name (keys %$leaf_symtab) {
3618 _gv_clear *{"$pkg$name"}; 3825 _gv_clear *{"$pkg$name"};
3619# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3826# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3620 } 3827 }
3621 warn "cleared package $pkg\n";#d#
3622} 3828}
3623 3829
3624sub do_reload_perl() { 3830sub do_reload_perl() {
3625 # can/must only be called in main 3831 # can/must only be called in main
3626 if ($Coro::current != $Coro::main) { 3832 if (in_main) {
3627 warn "can only reload from main coroutine"; 3833 error "can only reload from main coroutine";
3628 return; 3834 return;
3629 } 3835 }
3630 3836
3631 return if $RELOAD++; 3837 return if $RELOAD++;
3632 3838
3839 my $t1 = AE::time;
3840
3633 while ($RELOAD) { 3841 while ($RELOAD) {
3634 warn "reloading..."; 3842 info "reloading...";
3635 3843
3636 warn "entering sync_job"; 3844 trace "entering sync_job";
3637 3845
3638 cf::sync_job { 3846 cf::sync_job {
3639 cf::write_runtime_sync; # external watchdog should not bark 3847 cf::write_runtime_sync; # external watchdog should not bark
3640 cf::emergency_save; 3848 cf::emergency_save;
3641 cf::write_runtime_sync; # external watchdog should not bark 3849 cf::write_runtime_sync; # external watchdog should not bark
3642 3850
3643 warn "syncing database to disk"; 3851 trace "syncing database to disk";
3644 BDB::db_env_txn_checkpoint $DB_ENV; 3852 BDB::db_env_txn_checkpoint $DB_ENV;
3645 3853
3646 # if anything goes wrong in here, we should simply crash as we already saved 3854 # if anything goes wrong in here, we should simply crash as we already saved
3647 3855
3648 warn "flushing outstanding aio requests"; 3856 trace "flushing outstanding aio requests";
3649 while (IO::AIO::nreqs || BDB::nreqs) { 3857 while (IO::AIO::nreqs || BDB::nreqs) {
3650 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3858 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3651 } 3859 }
3652 3860
3653 warn "cancelling all extension coros"; 3861 trace "cancelling all extension coros";
3654 $_->cancel for values %EXT_CORO; 3862 $_->cancel for values %EXT_CORO;
3655 %EXT_CORO = (); 3863 %EXT_CORO = ();
3656 3864
3657 warn "removing commands"; 3865 trace "removing commands";
3658 %COMMAND = (); 3866 %COMMAND = ();
3659 3867
3660 warn "removing ext/exti commands"; 3868 trace "removing ext/exti commands";
3661 %EXTCMD = (); 3869 %EXTCMD = ();
3662 %EXTICMD = (); 3870 %EXTICMD = ();
3663 3871
3664 warn "unloading/nuking all extensions"; 3872 trace "unloading/nuking all extensions";
3665 for my $pkg (@EXTS) { 3873 for my $pkg (@EXTS) {
3666 warn "... unloading $pkg"; 3874 trace "... unloading $pkg";
3667 3875
3668 if (my $cb = $pkg->can ("unload")) { 3876 if (my $cb = $pkg->can ("unload")) {
3669 eval { 3877 eval {
3670 $cb->($pkg); 3878 $cb->($pkg);
3671 1 3879 1
3672 } or warn "$pkg unloaded, but with errors: $@"; 3880 } or error "$pkg unloaded, but with errors: $@";
3673 } 3881 }
3674 3882
3675 warn "... clearing $pkg"; 3883 trace "... clearing $pkg";
3676 clear_package $pkg; 3884 clear_package $pkg;
3677 } 3885 }
3678 3886
3679 warn "unloading all perl modules loaded from $LIBDIR"; 3887 trace "unloading all perl modules loaded from $LIBDIR";
3680 while (my ($k, $v) = each %INC) { 3888 while (my ($k, $v) = each %INC) {
3681 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3889 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3682 3890
3683 warn "... unloading $k"; 3891 trace "... unloading $k";
3684 delete $INC{$k}; 3892 delete $INC{$k};
3685 3893
3686 $k =~ s/\.pm$//; 3894 $k =~ s/\.pm$//;
3687 $k =~ s/\//::/g; 3895 $k =~ s/\//::/g;
3688 3896
3691 } 3899 }
3692 3900
3693 clear_package $k; 3901 clear_package $k;
3694 } 3902 }
3695 3903
3696 warn "getting rid of safe::, as good as possible"; 3904 trace "getting rid of safe::, as good as possible";
3697 clear_package "safe::$_" 3905 clear_package "safe::$_"
3698 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3906 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3699 3907
3700 warn "unloading cf.pm \"a bit\""; 3908 trace "unloading cf.pm \"a bit\"";
3701 delete $INC{"cf.pm"}; 3909 delete $INC{"cf.pm"};
3702 delete $INC{"cf/pod.pm"}; 3910 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3703 3911
3704 # don't, removes xs symbols, too, 3912 # don't, removes xs symbols, too,
3705 # and global variables created in xs 3913 # and global variables created in xs
3706 #clear_package __PACKAGE__; 3914 #clear_package __PACKAGE__;
3707 3915
3708 warn "unload completed, starting to reload now"; 3916 info "unload completed, starting to reload now";
3709 3917
3710 warn "reloading cf.pm"; 3918 trace "reloading cf.pm";
3711 require cf; 3919 require cf;
3712 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3920 cf::_connect_to_perl_1;
3713 3921
3714 warn "loading config and database again"; 3922 trace "loading config and database again";
3715 cf::reload_config; 3923 cf::reload_config;
3716 3924
3717 warn "loading extensions"; 3925 trace "loading extensions";
3718 cf::load_extensions; 3926 cf::load_extensions;
3719 3927
3928 if ($REATTACH_ON_RELOAD) {
3720 warn "reattaching attachments to objects/players"; 3929 trace "reattaching attachments to objects/players";
3721 _global_reattach; # objects, sockets 3930 _global_reattach; # objects, sockets
3722 warn "reattaching attachments to maps"; 3931 trace "reattaching attachments to maps";
3723 reattach $_ for values %MAP; 3932 reattach $_ for values %MAP;
3724 warn "reattaching attachments to players"; 3933 trace "reattaching attachments to players";
3725 reattach $_ for values %PLAYER; 3934 reattach $_ for values %PLAYER;
3935 }
3726 3936
3727 warn "running post_load"; 3937 trace "running post_init jobs";
3728 (pop @POST_INIT)->(1) while @POST_INIT; 3938 (pop @POST_INIT)->(1) while @POST_INIT;
3729 3939
3730 warn "leaving sync_job"; 3940 trace "leaving sync_job";
3731 3941
3732 1 3942 1
3733 } or do { 3943 } or do {
3734 warn $@; 3944 error $@;
3735 cf::cleanup "error while reloading, exiting."; 3945 cf::cleanup "error while reloading, exiting.";
3736 }; 3946 };
3737 3947
3738 warn "reloaded"; 3948 info "reloaded";
3739 --$RELOAD; 3949 --$RELOAD;
3740 } 3950 }
3951
3952 $t1 = AE::time - $t1;
3953 info "reload completed in ${t1}s\n";
3741}; 3954};
3742 3955
3743our $RELOAD_WATCHER; # used only during reload 3956our $RELOAD_WATCHER; # used only during reload
3744 3957
3745sub reload_perl() { 3958sub reload_perl() {
3746 # doing reload synchronously and two reloads happen back-to-back, 3959 # doing reload synchronously and two reloads happen back-to-back,
3747 # coro crashes during coro_state_free->destroy here. 3960 # coro crashes during coro_state_free->destroy here.
3748 3961
3962 $RELOAD_WATCHER ||= cf::async {
3963 Coro::AIO::aio_wait cache_extensions;
3964
3749 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3965 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3750 do_reload_perl; 3966 do_reload_perl;
3751 undef $RELOAD_WATCHER; 3967 undef $RELOAD_WATCHER;
3968 };
3752 }; 3969 };
3753} 3970}
3754 3971
3755register_command "reload" => sub { 3972register_command "reload" => sub {
3756 my ($who, $arg) = @_; 3973 my ($who, $arg) = @_;
3770 3987
3771our @WAIT_FOR_TICK; 3988our @WAIT_FOR_TICK;
3772our @WAIT_FOR_TICK_BEGIN; 3989our @WAIT_FOR_TICK_BEGIN;
3773 3990
3774sub wait_for_tick { 3991sub wait_for_tick {
3775 return if tick_inhibit || $Coro::current == $Coro::main; 3992 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3776 3993
3777 my $signal = new Coro::Signal; 3994 my $signal = new Coro::Signal;
3778 push @WAIT_FOR_TICK, $signal; 3995 push @WAIT_FOR_TICK, $signal;
3779 $signal->wait; 3996 $signal->wait;
3780} 3997}
3781 3998
3782sub wait_for_tick_begin { 3999sub wait_for_tick_begin {
3783 return if tick_inhibit || $Coro::current == $Coro::main; 4000 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3784 4001
3785 my $signal = new Coro::Signal; 4002 my $signal = new Coro::Signal;
3786 push @WAIT_FOR_TICK_BEGIN, $signal; 4003 push @WAIT_FOR_TICK_BEGIN, $signal;
3787 $signal->wait; 4004 $signal->wait;
3788} 4005}
3794 return; 4011 return;
3795 } 4012 }
3796 4013
3797 cf::server_tick; # one server iteration 4014 cf::server_tick; # one server iteration
3798 4015
4016 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4017
3799 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4018 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3800 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4019 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3801 Coro::async_pool { 4020 Coro::async_pool {
3802 $Coro::current->{desc} = "runtime saver"; 4021 $Coro::current->{desc} = "runtime saver";
3803 write_runtime_sync 4022 write_runtime_sync
3804 or warn "ERROR: unable to write runtime file: $!"; 4023 or error "ERROR: unable to write runtime file: $!";
3805 }; 4024 };
3806 } 4025 }
3807 4026
3808 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4027 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3809 $sig->send; 4028 $sig->send;
3817 4036
3818 if (0) { 4037 if (0) {
3819 if ($NEXT_TICK) { 4038 if ($NEXT_TICK) {
3820 my $jitter = $TICK_START - $NEXT_TICK; 4039 my $jitter = $TICK_START - $NEXT_TICK;
3821 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4040 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3822 warn "jitter $JITTER\n";#d# 4041 debug "jitter $JITTER\n";#d#
3823 } 4042 }
3824 } 4043 }
3825} 4044}
3826 4045
3827{ 4046{
3828 # configure BDB 4047 # configure BDB
3829 4048
3830 BDB::min_parallel 8; 4049 BDB::min_parallel 16;
3831 BDB::max_poll_reqs $TICK * 0.1; 4050 BDB::max_poll_reqs $TICK * 0.1;
3832 $AnyEvent::BDB::WATCHER->priority (1); 4051 $AnyEvent::BDB::WATCHER->priority (1);
3833 4052
3834 unless ($DB_ENV) { 4053 unless ($DB_ENV) {
3835 $DB_ENV = BDB::db_env_create; 4054 $DB_ENV = BDB::db_env_create;
3837 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4056 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3838 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7; 4057 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3839 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4058 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3840 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4059 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3841 4060
4061 (Coro::async { # async to keep sync_job from complaining
3842 cf::sync_job { 4062 cf::sync_job {
3843 eval { 4063 eval {
3844 BDB::db_env_open 4064 BDB::db_env_open
3845 $DB_ENV, 4065 $DB_ENV,
3846 $BDBDIR, 4066 $BDBDIR,
3847 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4067 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3848 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4068 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3849 0666; 4069 0666;
3850 4070
3851 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4071 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
4072 };
4073
4074 cf::cleanup "db_env_open(db): $@" if $@;
3852 }; 4075 };
3853 4076 })->join;
3854 cf::cleanup "db_env_open(db): $@" if $@;
3855 };
3856 } 4077 }
3857 4078
3858 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub { 4079 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3859 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4080 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3860 }; 4081 };
3915 LOG llevInfo, "[ABT] [suppressed]\n"; 4136 LOG llevInfo, "[ABT] [suppressed]\n";
3916 } 4137 }
3917} 4138}
3918 4139
3919# load additional modules 4140# load additional modules
3920use cf::pod; 4141require "cf/$_.pm" for @EXTRA_MODULES;
4142cf::_connect_to_perl_2;
3921 4143
3922END { cf::emergency_save } 4144END { cf::emergency_save }
3923 4145
39241 41461
3925 4147

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines