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.441 by root, Sat Aug 30 05:19:03 2008 UTC vs.
Revision 1.532 by root, Thu Apr 29 07:32:34 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
… …
63 66
64# configure various modules to our taste 67# configure various modules to our taste
65# 68#
66$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
68Compress::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
69 77
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
71 80
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73 82
74our %COMMAND = (); 83our %COMMAND = ();
75our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
78our %EXTCMD = (); 87our %EXTCMD = ();
79our %EXTICMD = (); 88our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
82 91
83our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
85 96
86our $CONFDIR = confdir; 97our $CONFDIR = confdir;
87our $DATADIR = datadir; 98our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
90our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
91our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
97our %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;
98 118
99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
101our $NEXT_TICK; 121our $NEXT_TICK;
102our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
103 123
104our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
106our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
107our $DB_ENV; 127our $DB_ENV;
108 128
129our @EXTRA_MODULES = qw(pod match mapscript);
130
109our %CFG; 131our %CFG;
110 132
111our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
112our $RUNTIME; 134our $RUNTIME;
113our $NOW; 135our $NOW;
… …
122our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
123our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter 146our $JITTER; # average jitter
125our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
126 148
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 :)
153
127binmode STDOUT; 154binmode STDOUT;
128binmode STDERR; 155binmode STDERR;
129 156
130# read virtual server time, if available 157# read virtual server time, if available
131unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
132 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
133 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
134 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
135} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
136 165
137mkdir $_ 166mkdir $_
138 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
139 168
140our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
141 170
142sub 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::"} };
143 187
144############################################################################# 188#############################################################################
145 189
146=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
147 191
… …
194returns 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
195per 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.
196 240
197=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
198 242
199This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
200C<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
201that call. 245that call.
202 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
203=back 253=back
204 254
205=cut 255=cut
206 256
207BEGIN { 257sub error(@) { LOG llevError, join "", @_ }
208 *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 {
209 my $msg = join "", @_; 264 my $msg = join "", @_;
210 265
211 $msg .= "\n" 266 $msg .= "\n"
212 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
213 268
214 $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;
215 270
216 LOG llevError, $msg; 271 LOG llevWarn, $msg;
217 }; 272};
218}
219 273
220$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
222 276
223 if ($Coro::current == $Coro::main) {#d# 277 error Carp::longmess $_[0];
278
279 if (in_main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d# 281 return;#d#
226 }#d# 282 }#d#
227 283
228 # kill coroutine otherwise 284 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate 285 Coro::terminate
231}; 286};
232
233$SIG{__DIE__} = sub { }; #d#?
234 287
235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 288@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 289@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 290@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 291@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
252)) { 305)) {
253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
254} 307}
255 308
256$EV::DIED = sub { 309$EV::DIED = sub {
257 warn "error in event callback: @_"; 310 Carp::cluck "error in event callback: @_";
258}; 311};
259 312
260############################################################################# 313#############################################################################
261 314
262=head2 UTILITY FUNCTIONS 315=head2 UTILITY FUNCTIONS
… …
299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 352our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
300 353
301sub encode_json($) { $json_coder->encode ($_[0]) } 354sub encode_json($) { $json_coder->encode ($_[0]) }
302sub decode_json($) { $json_coder->decode ($_[0]) } 355sub decode_json($) { $json_coder->decode ($_[0]) }
303 356
357=item cf::post_init { BLOCK }
358
359Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again.
361
362The cdoeblock will have a single boolean argument to indicate whether this
363is a reload or not.
364
365=cut
366
367sub post_init(&) {
368 push @POST_INIT, shift;
369}
370
304=item cf::lock_wait $string 371=item cf::lock_wait $string
305 372
306Wait until the given lock is available. See cf::lock_acquire. 373Wait until the given lock is available. See cf::lock_acquire.
307 374
308=item my $lock = cf::lock_acquire $string 375=item my $lock = cf::lock_acquire $string
309 376
310Wait 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
311a 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,
312for example when the coroutine gets canceled), the lock is automatically 379for example when the coroutine gets canceled), the lock is automatically
313returned. 380returned.
314 381
315Locks 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
316deadlocked coro. 383deadlocked coro.
… …
322 389
323Return 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.
324 391
325=cut 392=cut
326 393
327our %LOCK; 394our $LOCKS = new Coro::SemaphoreSet;
328our %LOCKER;#d#
329 395
330sub lock_wait($) { 396sub lock_wait($) {
331 my ($key) = @_; 397 $LOCKS->wait ($_[0]);
332
333 if ($LOCKER{$key} == $Coro::current) {#d#
334 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335 return;#d#
336 }#d#
337
338 # wait for lock, if any
339 while ($LOCK{$key}) {
340 push @{ $LOCK{$key} }, $Coro::current;
341 Coro::schedule;
342 }
343} 398}
344 399
345sub lock_acquire($) { 400sub lock_acquire($) {
346 my ($key) = @_; 401 $LOCKS->guard ($_[0])
347
348 # wait, to be sure we are not locked
349 lock_wait $key;
350
351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
353
354 Coro::guard {
355 delete $LOCKER{$key};#d#
356 # wake up all waiters, to be on the safe side
357 $_->ready for @{ delete $LOCK{$key} };
358 }
359} 402}
360 403
361sub lock_active($) { 404sub lock_active($) {
362 my ($key) = @_; 405 $LOCKS->count ($_[0]) < 1
363
364 ! ! $LOCK{$key}
365} 406}
366 407
367sub freeze_mainloop { 408sub freeze_mainloop {
368 tick_inhibit_inc; 409 tick_inhibit_inc;
369 410
370 Coro::guard \&tick_inhibit_dec; 411 &Guard::guard (\&tick_inhibit_dec);
371} 412}
372 413
373=item cf::periodic $interval, $cb 414=item cf::periodic $interval, $cb
374 415
375Like EV::periodic, but randomly selects a starting point so that the actions 416Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer. 417get spread over time.
377 418
378=cut 419=cut
379 420
380sub periodic($$) { 421sub periodic($$) {
381 my ($interval, $cb) = @_; 422 my ($interval, $cb) = @_;
… …
398 439
399=cut 440=cut
400 441
401our @SLOT_QUEUE; 442our @SLOT_QUEUE;
402our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
403 445
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 448 $Coro::current->desc ("timeslot manager");
407 449
408 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
409 452
410 while () { 453 while () {
411 next_job: 454 next_job:
455
412 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 457
414 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 462 $job->[2]->send;
418 Coro::cede; 463 Coro::cede;
419 goto next_job; 464 goto next_job;
420 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 467 }
422 } 468 }
423 469
424 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive 471 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait; 473 $signal->wait;
428 } else { 474 } else {
475 $busy = 0;
429 Coro::schedule; 476 Coro::schedule;
430 } 477 }
431 } 478 }
432}; 479};
433 480
434sub get_slot($;$$) { 481sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 482 return if tick_inhibit || $Coro::current == $Coro::main;
436 483
437 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
438 485
439 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
440 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
441 489
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
… …
471 519
472sub sync_job(&) { 520sub sync_job(&) {
473 my ($job) = @_; 521 my ($job) = @_;
474 522
475 if ($Coro::current == $Coro::main) { 523 if ($Coro::current == $Coro::main) {
476 my $time = EV::time; 524 my $time = AE::time;
477 525
478 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
480 528
481 LOG llevError, Carp::longmess "sync job";#d# 529 LOG llevError, Carp::longmess "sync job";#d#
… …
486 my @res; 534 my @res;
487 535
488 (async { 536 (async {
489 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
490 @res = eval { $job->() }; 538 @res = eval { $job->() };
491 warn $@ if $@; 539 error $@ if $@;
492 undef $busy; 540 undef $busy;
493 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
494 542
495 while ($busy) { 543 while ($busy) {
496 if (Coro::nready) { 544 if (Coro::nready) {
… …
498 } else { 546 } else {
499 EV::loop EV::LOOP_ONESHOT; 547 EV::loop EV::LOOP_ONESHOT;
500 } 548 }
501 } 549 }
502 550
503 my $time = EV::time - $time; 551 my $time = AE::time - $time;
504 552
505 $TICK_START += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
506 554
507 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
508 } else { 556 } else {
… …
552 reset_signals; 600 reset_signals;
553 &$cb 601 &$cb
554 }, @args; 602 }, @args;
555 603
556 wantarray ? @res : $res[-1] 604 wantarray ? @res : $res[-1]
605}
606
607sub objinfo {
608 (
609 "counter value" => cf::object::object_count,
610 "objects created" => cf::object::create_count,
611 "objects destroyed" => cf::object::destroy_count,
612 "freelist size" => cf::object::free_count,
613 "allocated objects" => cf::object::objects_size,
614 "active objects" => cf::object::actives_size,
615 )
557} 616}
558 617
559=item $coin = coin_from_name $name 618=item $coin = coin_from_name $name
560 619
561=cut 620=cut
… …
696 755
697 my $t1 = Time::HiRes::time; 756 my $t1 = Time::HiRes::time;
698 my $data = $process->(\@data); 757 my $data = $process->(\@data);
699 my $t2 = Time::HiRes::time; 758 my $t2 = Time::HiRes::time;
700 759
701 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 760 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
702 761
703 db_put cache => "$id/data", $data; 762 db_put cache => "$id/data", $data;
704 db_put cache => "$id/md5" , $md5; 763 db_put cache => "$id/md5" , $md5;
705 db_put cache => "$id/meta", $meta; 764 db_put cache => "$id/meta", $meta;
706 765
… …
716 775
717=cut 776=cut
718 777
719sub datalog($@) { 778sub datalog($@) {
720 my ($type, %kv) = @_; 779 my ($type, %kv) = @_;
721 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 780 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
722} 781}
723 782
724=back 783=back
725 784
726=cut 785=cut
727 786
728############################################################################# 787#############################################################################
729 788
730=head2 ATTACHABLE OBJECTS 789=head2 ATTACHABLE OBJECTS
731 790
732Many objects in crossfire are so-called attachable objects. That means you can 791Many objects in deliantra are so-called attachable objects. That means you can
733attach callbacks/event handlers (a collection of which is called an "attachment") 792attach callbacks/event handlers (a collection of which is called an "attachment")
734to it. All such attachable objects support the following methods. 793to it. All such attachable objects support the following methods.
735 794
736In the following description, CLASS can be any of C<global>, C<object> 795In the following description, CLASS can be any of C<global>, C<object>
737C<player>, C<client> or C<map> (i.e. the attachable objects in 796C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
787=item cf::CLASS::attachment $name, ... 846=item cf::CLASS::attachment $name, ...
788 847
789Register an attachment by C<$name> through which attachable objects of the 848Register an attachment by C<$name> through which attachable objects of the
790given CLASS can refer to this attachment. 849given CLASS can refer to this attachment.
791 850
792Some classes such as crossfire maps and objects can specify attachments 851Some classes such as deliantra maps and objects can specify attachments
793that are attached at load/instantiate time, thus the need for a name. 852that are attached at load/instantiate time, thus the need for a name.
794 853
795These calls expect any number of the following handler/hook descriptions: 854These calls expect any number of the following handler/hook descriptions:
796 855
797=over 4 856=over 4
… …
921 980
922 } elsif (exists $cb_id{$type}) { 981 } elsif (exists $cb_id{$type}) {
923 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 982 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
924 983
925 } elsif (ref $type) { 984 } elsif (ref $type) {
926 warn "attaching objects not supported, ignoring.\n"; 985 error "attaching objects not supported, ignoring.\n";
927 986
928 } else { 987 } else {
929 shift @arg; 988 shift @arg;
930 warn "attach argument '$type' not supported, ignoring.\n"; 989 error "attach argument '$type' not supported, ignoring.\n";
931 } 990 }
932 } 991 }
933} 992}
934 993
935sub _object_attach { 994sub _object_attach {
… …
945 _attach $registry, $klass, @attach; 1004 _attach $registry, $klass, @attach;
946 } 1005 }
947 1006
948 $obj->{$name} = \%arg; 1007 $obj->{$name} = \%arg;
949 } else { 1008 } else {
950 warn "object uses attachment '$name' which is not available, postponing.\n"; 1009 info "object uses attachment '$name' which is not available, postponing.\n";
951 } 1010 }
952 1011
953 $obj->{_attachment}{$name} = undef; 1012 $obj->{_attachment}{$name} = undef;
954} 1013}
955 1014
… …
1014 1073
1015 for (@$callbacks) { 1074 for (@$callbacks) {
1016 eval { &{$_->[1]} }; 1075 eval { &{$_->[1]} };
1017 1076
1018 if ($@) { 1077 if ($@) {
1019 warn "$@";
1020 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1078 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1021 override; 1079 override;
1022 } 1080 }
1023 1081
1024 return 1 if $override; 1082 return 1 if $override;
1025 } 1083 }
… …
1104 for (@$attach) { 1162 for (@$attach) {
1105 my ($klass, @attach) = @$_; 1163 my ($klass, @attach) = @$_;
1106 _attach $registry, $klass, @attach; 1164 _attach $registry, $klass, @attach;
1107 } 1165 }
1108 } else { 1166 } else {
1109 warn "object uses attachment '$name' that is not available, postponing.\n"; 1167 info "object uses attachment '$name' that is not available, postponing.\n";
1110 } 1168 }
1111 } 1169 }
1112} 1170}
1113 1171
1114cf::attachable->attach ( 1172cf::attachable->attach (
… …
1141 my ($filename, $rdata, $objs) = @_; 1199 my ($filename, $rdata, $objs) = @_;
1142 1200
1143 sync_job { 1201 sync_job {
1144 if (length $$rdata) { 1202 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename); 1203 utf8::decode (my $decname = $filename);
1146 warn sprintf "saving %s (%d,%d)\n", 1204 trace sprintf "saving %s (%d,%d)\n",
1147 $decname, length $$rdata, scalar @$objs; 1205 $decname, length $$rdata, scalar @$objs
1206 if $VERBOSE_IO;
1148 1207
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1208 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1209 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1210 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 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 }
1153 aio_close $fh; 1215 aio_close $fh;
1154 1216
1155 if (@$objs) { 1217 if (@$objs) {
1156 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) {
1157 aio_chmod $fh, SAVE_MODE; 1219 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1220 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1221 aio_write $fh, 0, (length $data), $data, 0;
1160 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 }
1161 aio_close $fh; 1226 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1227 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1228 }
1164 } else { 1229 } else {
1165 aio_unlink "$filename.pst"; 1230 aio_unlink "$filename.pst";
1166 } 1231 }
1167 1232
1168 aio_rename "$filename~", $filename; 1233 aio_rename "$filename~", $filename;
1234
1235 $filename =~ s%/[^/]+$%%;
1236 aio_pathsync $filename if $cf::USE_FSYNC;
1169 } else { 1237 } else {
1170 warn "FATAL: $filename~: $!\n"; 1238 error "unable to save objects: $filename~: $!\n";
1171 } 1239 }
1172 } else { 1240 } else {
1173 aio_unlink $filename; 1241 aio_unlink $filename;
1174 aio_unlink "$filename.pst"; 1242 aio_unlink "$filename.pst";
1175 } 1243 }
… …
1199 my $st = eval { Coro::Storable::thaw $av }; 1267 my $st = eval { Coro::Storable::thaw $av };
1200 $av = $st->{objs}; 1268 $av = $st->{objs};
1201 } 1269 }
1202 1270
1203 utf8::decode (my $decname = $filename); 1271 utf8::decode (my $decname = $filename);
1204 warn sprintf "loading %s (%d,%d)\n", 1272 trace sprintf "loading %s (%d,%d)\n",
1205 $decname, length $data, scalar @{$av || []}; 1273 $decname, length $data, scalar @{$av || []}
1274 if $VERBOSE_IO;
1206 1275
1207 ($data, $av) 1276 ($data, $av)
1208} 1277}
1209 1278
1210=head2 COMMAND CALLBACKS 1279=head2 COMMAND CALLBACKS
… …
1266 my ($name, $cb) = @_; 1335 my ($name, $cb) = @_;
1267 1336
1268 $EXTICMD{$name} = $cb; 1337 $EXTICMD{$name} = $cb;
1269} 1338}
1270 1339
1340use File::Glob ();
1341
1271cf::player->attach ( 1342cf::player->attach (
1272 on_command => sub { 1343 on_unknown_command => sub {
1273 my ($pl, $name, $params) = @_; 1344 my ($pl, $name, $params) = @_;
1274 1345
1275 my $cb = $COMMAND{$name} 1346 my $cb = $COMMAND{$name}
1276 or return; 1347 or return;
1277 1348
… …
1300 1371
1301 $pl->ext_reply ($reply, @reply) 1372 $pl->ext_reply ($reply, @reply)
1302 if $reply; 1373 if $reply;
1303 1374
1304 } else { 1375 } else {
1305 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1376 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1306 } 1377 }
1307 1378
1308 cf::override; 1379 cf::override;
1309 }, 1380 },
1310); 1381);
1311 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
1312sub load_extensions { 1396sub load_extensions {
1397 info "loading extensions...";
1398
1313 cf::sync_job { 1399 cf::sync_job {
1314 my %todo; 1400 my %todo;
1315 1401
1316 for my $path (<$LIBDIR/*.ext>) { 1402 for my $path (<$LIBDIR/*.ext>) {
1317 next unless -r $path; 1403 next unless -r $path;
… …
1343 . "\n};\n1"; 1429 . "\n};\n1";
1344 1430
1345 $todo{$base} = \%ext; 1431 $todo{$base} = \%ext;
1346 } 1432 }
1347 1433
1434 my $pass = 0;
1348 my %done; 1435 my %done;
1349 while (%todo) { 1436 while (%todo) {
1350 my $progress; 1437 my $progress;
1351 1438
1439 ++$pass;
1440
1441 ext:
1352 while (my ($k, $v) = each %todo) { 1442 while (my ($k, $v) = each %todo) {
1353 for (split /,\s*/, $v->{meta}{depends}) { 1443 for (split /,\s*/, $v->{meta}{depends}) {
1354 goto skip 1444 next ext
1355 unless exists $done{$_}; 1445 unless exists $done{$_};
1356 } 1446 }
1357 1447
1358 warn "... loading '$k' into '$v->{pkg}'\n"; 1448 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1359 1449
1360 unless (eval $v->{source}) { 1450 my $active = eval $v->{source};
1451
1452 if (length $@) {
1361 my $msg = $@ ? "$v->{path}: $@\n" 1453 error "$v->{path}: $@\n";
1362 : "$v->{base}: extension inactive.\n";
1363 1454
1364 if (exists $v->{meta}{mandatory}) {
1365 warn $msg;
1366 cf::cleanup "mandatory extension failed to load, exiting."; 1455 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1367 } 1456 if exists $v->{meta}{mandatory};
1368 1457
1369 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;
1370 } 1467 }
1371
1372 $done{$k} = delete $todo{$k};
1373 push @EXTS, $v->{pkg};
1374 $progress = 1;
1375 } 1468 }
1376 1469
1377 skip: 1470 unless ($progress) {
1378 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1471 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1379 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 }
1380 } 1478 }
1381 }; 1479 };
1382} 1480}
1383 1481
1384############################################################################# 1482#############################################################################
1385 1483
1386=back 1484=back
1387 1485
1388=head2 CORE EXTENSIONS 1486=head2 CORE EXTENSIONS
1389 1487
1390Functions and methods that extend core crossfire objects. 1488Functions and methods that extend core deliantra objects.
1391 1489
1392=cut 1490=cut
1393 1491
1394package cf::player; 1492package cf::player;
1395 1493
… …
1438 1536
1439sub exists($) { 1537sub exists($) {
1440 my ($login) = @_; 1538 my ($login) = @_;
1441 1539
1442 $cf::PLAYER{$login} 1540 $cf::PLAYER{$login}
1443 or cf::sync_job { !aio_stat path $login } 1541 or !aio_stat path $login
1444} 1542}
1445 1543
1446sub find($) { 1544sub find($) {
1447 return $cf::PLAYER{$_[0]} || do { 1545 return $cf::PLAYER{$_[0]} || do {
1448 my $login = $_[0]; 1546 my $login = $_[0];
… …
1468 $cf::PLAYER{$login} = $pl 1566 $cf::PLAYER{$login} = $pl
1469 } 1567 }
1470 } 1568 }
1471} 1569}
1472 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
1473sub save($) { 1584sub save($) {
1474 my ($pl) = @_; 1585 my ($pl) = @_;
1475 1586
1476 return if $pl->{deny_save}; 1587 return if $pl->{deny_save};
1477 1588
… …
1482 1593
1483 aio_mkdir playerdir $pl, 0770; 1594 aio_mkdir playerdir $pl, 0770;
1484 $pl->{last_save} = $cf::RUNTIME; 1595 $pl->{last_save} = $cf::RUNTIME;
1485 1596
1486 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];
1487 1601
1488 $pl->save_pl ($path); 1602 $pl->save_pl ($path);
1489 cf::cede_to_tick; 1603 cf::cede_to_tick;
1490} 1604}
1491 1605
… …
1523 my ($pl) = @_; 1637 my ($pl) = @_;
1524 1638
1525 my $name = $pl->ob->name; 1639 my $name = $pl->ob->name;
1526 1640
1527 $pl->{deny_save} = 1; 1641 $pl->{deny_save} = 1;
1528 $pl->password ("*"); # this should lock out the player until we nuked the dir 1642 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1529 1643
1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1644 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1531 $pl->deactivate; 1645 $pl->deactivate;
1532 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;
1533 $pl->ob->check_score;
1534 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1647 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1535 $pl->ns->destroy if $pl->ns; 1648 $pl->ns->destroy if $pl->ns;
1536 1649
1537 my $path = playerdir $pl; 1650 my $path = playerdir $pl;
1538 my $temp = "$path~$cf::RUNTIME~deleting~"; 1651 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1593 \@logins 1706 \@logins
1594} 1707}
1595 1708
1596=item $player->maps 1709=item $player->maps
1597 1710
1711=item cf::player::maps $login
1712
1598Returns an arrayref of map paths that are private for this 1713Returns an arrayref of map paths that are private for this
1599player. May block. 1714player. May block.
1600 1715
1601=cut 1716=cut
1602 1717
… …
1619 } 1734 }
1620 1735
1621 \@paths 1736 \@paths
1622} 1737}
1623 1738
1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1739=item $protocol_xml = $player->expand_cfpod ($cfpod)
1625 1740
1626Expand crossfire pod fragments into protocol xml. 1741Expand deliantra pod fragments into protocol xml.
1627
1628=cut
1629
1630use re 'eval';
1631
1632my $group;
1633my $interior; $interior = qr{
1634 # match a pod interior sequence sans C<< >>
1635 (?:
1636 \ (.*?)\ (?{ $group = $^N })
1637 | < (??{$interior}) >
1638 )
1639}x;
1640
1641sub expand_cfpod {
1642 my ($self, $pod) = @_;
1643
1644 my $xml;
1645
1646 while () {
1647 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1648 $group = $1;
1649
1650 $group =~ s/&/&amp;/g;
1651 $group =~ s/</&lt;/g;
1652
1653 $xml .= $group;
1654 } elsif ($pod =~ m%\G
1655 ([BCGHITU])
1656 <
1657 (?:
1658 ([^<>]*) (?{ $group = $^N })
1659 | < $interior >
1660 )
1661 >
1662 %gcsx
1663 ) {
1664 my ($code, $data) = ($1, $group);
1665
1666 if ($code eq "B") {
1667 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1668 } elsif ($code eq "I") {
1669 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1670 } elsif ($code eq "U") {
1671 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1672 } elsif ($code eq "C") {
1673 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1674 } elsif ($code eq "T") {
1675 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1676 } elsif ($code eq "G") {
1677 my ($male, $female) = split /\|/, $data;
1678 $data = $self->gender ? $female : $male;
1679 $xml .= expand_cfpod ($self, $data);
1680 } elsif ($code eq "H") {
1681 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1682 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1683 "")
1684 [$self->{hintmode}];
1685 } else {
1686 $xml .= "error processing '$code($data)' directive";
1687 }
1688 } else {
1689 if ($pod =~ /\G(.+)/) {
1690 warn "parse error while expanding $pod (at $1)";
1691 }
1692 last;
1693 }
1694 }
1695
1696 for ($xml) {
1697 # create single paragraphs (very hackish)
1698 s/(?<=\S)\n(?=\w)/ /g;
1699
1700 # compress some whitespace
1701 s/\s+\n/\n/g; # ws line-ends
1702 s/\n\n+/\n/g; # double lines
1703 s/^\n+//; # beginning lines
1704 s/\n+$//; # ending lines
1705 }
1706
1707 $xml
1708}
1709
1710no re 'eval';
1711
1712sub hintmode {
1713 $_[0]{hintmode} = $_[1] if @_ > 1;
1714 $_[0]{hintmode}
1715}
1716 1742
1717=item $player->ext_reply ($msgid, @msg) 1743=item $player->ext_reply ($msgid, @msg)
1718 1744
1719Sends an ext reply to the player. 1745Sends an ext reply to the player.
1720 1746
… …
1752 1778
1753=cut 1779=cut
1754 1780
1755sub find_by_path($) { 1781sub find_by_path($) {
1756 my ($path) = @_; 1782 my ($path) = @_;
1783
1784 $path =~ s/^~[^\/]*//; # skip ~login
1757 1785
1758 my ($match, $specificity); 1786 my ($match, $specificity);
1759 1787
1760 for my $region (list) { 1788 for my $region (list) {
1761 if ($region->{match} && $path =~ $region->{match}) { 1789 if ($region->{match} && $path =~ $region->{match}) {
… …
1793 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
1794 1822
1795 # mit "rum" bekleckern, nicht 1823 # mit "rum" bekleckern, nicht
1796 $self->_create_random_map ( 1824 $self->_create_random_map (
1797 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1825 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1798 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1826 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1799 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1827 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1800 $rmp->{exit_on_final_map}, 1828 $rmp->{exit_on_final_map},
1801 $rmp->{xsize}, $rmp->{ysize}, 1829 $rmp->{xsize}, $rmp->{ysize},
1802 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1830 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1803 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1831 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1825 1853
1826 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1854 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1827} 1855}
1828 1856
1829# also paths starting with '/' 1857# also paths starting with '/'
1830$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1858$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1831 1859
1832sub thawer_merge { 1860sub thawer_merge {
1833 my ($self, $merge) = @_; 1861 my ($self, $merge) = @_;
1834 1862
1835 # we have to keep some variables in memory intact 1863 # we have to keep some variables in memory intact
… …
1933 1961
1934 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1962 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1935 "$UNIQUEDIR/$path" 1963 "$UNIQUEDIR/$path"
1936} 1964}
1937 1965
1938# and all this just because we cannot iterate over
1939# all maps in C++...
1940sub change_all_map_light {
1941 my ($change) = @_;
1942
1943 $_->change_map_light ($change)
1944 for grep $_->outdoor, values %cf::MAP;
1945}
1946
1947sub decay_objects { 1966sub decay_objects {
1948 my ($self) = @_; 1967 my ($self) = @_;
1949 1968
1950 return if $self->{deny_reset}; 1969 return if $self->{deny_reset};
1951 1970
… …
2033sub find { 2052sub find {
2034 my ($path, $origin) = @_; 2053 my ($path, $origin) = @_;
2035 2054
2036 $path = normalise $path, $origin && $origin->path; 2055 $path = normalise $path, $origin && $origin->path;
2037 2056
2038 cf::lock_wait "map_data:$path";#d#remove 2057 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2039 cf::lock_wait "map_find:$path"; 2058 my $guard2 = cf::lock_acquire "map_find:$path";
2040 2059
2041 $cf::MAP{$path} || do { 2060 $cf::MAP{$path} || do {
2042 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2043 my $guard2 = cf::lock_acquire "map_find:$path";
2044
2045 my $map = new_from_path cf::map $path 2061 my $map = new_from_path cf::map $path
2046 or return; 2062 or return;
2047 2063
2048 $map->{last_save} = $cf::RUNTIME; 2064 $map->{last_save} = $cf::RUNTIME;
2049 2065
… …
2061 2077
2062 $cf::MAP{$path} = $map 2078 $cf::MAP{$path} = $map
2063 } 2079 }
2064} 2080}
2065 2081
2066sub pre_load { } 2082sub pre_load { }
2067sub post_load { } 2083#sub post_load { } # XS
2068 2084
2069sub load { 2085sub load {
2070 my ($self) = @_; 2086 my ($self) = @_;
2071 2087
2072 local $self->{deny_reset} = 1; # loading can take a long time 2088 local $self->{deny_reset} = 1; # loading can take a long time
… …
2117 unless ($self->{deny_activate}) { 2133 unless ($self->{deny_activate}) {
2118 $self->decay_objects; 2134 $self->decay_objects;
2119 $self->fix_auto_apply; 2135 $self->fix_auto_apply;
2120 $self->update_buttons; 2136 $self->update_buttons;
2121 cf::cede_to_tick; 2137 cf::cede_to_tick;
2122 $self->set_darkness_map;
2123 cf::cede_to_tick;
2124 $self->activate; 2138 $self->activate;
2125 } 2139 }
2126 2140
2127 $self->{last_save} = $cf::RUNTIME; 2141 $self->{last_save} = $cf::RUNTIME;
2128 $self->last_access ($cf::RUNTIME); 2142 $self->last_access ($cf::RUNTIME);
… …
2131 } 2145 }
2132 2146
2133 $self->post_load; 2147 $self->post_load;
2134} 2148}
2135 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
2136sub customise_for { 2153sub customise_for {
2137 my ($self, $ob) = @_; 2154 my ($self, $ob) = @_;
2138 2155
2139 return find "~" . $ob->name . "/" . $self->{path} 2156 return find "~" . $ob->name . "/" . $self->{path}
2140 if $self->per_player; 2157 if $self->per_player;
… …
2156 or next; 2173 or next;
2157 $neigh = find $neigh, $map 2174 $neigh = find $neigh, $map
2158 or next; 2175 or next;
2159 $neigh->load; 2176 $neigh->load;
2160 2177
2178 # now find the diagonal neighbours
2161 push @neigh, 2179 push @neigh,
2162 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2180 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2163 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2181 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2164 } 2182 }
2165 2183
… …
2217 $MAP_PREFETCHER->prio (6); 2235 $MAP_PREFETCHER->prio (6);
2218 2236
2219 () 2237 ()
2220} 2238}
2221 2239
2240# common code, used by both ->save and ->swapout
2222sub save { 2241sub _save {
2223 my ($self) = @_; 2242 my ($self) = @_;
2224
2225 my $lock = cf::lock_acquire "map_data:$self->{path}";
2226 2243
2227 $self->{last_save} = $cf::RUNTIME; 2244 $self->{last_save} = $cf::RUNTIME;
2228 2245
2229 return unless $self->dirty; 2246 return unless $self->dirty;
2230 2247
… …
2250 } else { 2267 } else {
2251 $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);
2252 } 2269 }
2253} 2270}
2254 2271
2272sub save {
2273 my ($self) = @_;
2274
2275 my $lock = cf::lock_acquire "map_data:$self->{path}";
2276
2277 $self->_save;
2278}
2279
2255sub swap_out { 2280sub swap_out {
2256 my ($self) = @_; 2281 my ($self) = @_;
2257 2282
2258 # save first because save cedes
2259 $self->save;
2260
2261 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2283 my $lock = cf::lock_acquire "map_data:$self->{path}";
2262 2284
2263 return if $self->players;
2264 return if $self->in_memory != cf::MAP_ACTIVE; 2285 return if $self->in_memory != cf::MAP_ACTIVE;
2265 return if $self->{deny_save}; 2286 return if $self->{deny_save};
2287 return if $self->players;
2266 2288
2289 # first deactivate the map and "unlink" it from the core
2290 $self->deactivate;
2291 $_->clear_links_to ($self) for values %cf::MAP;
2267 $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};
2268 2339
2269 $self->deactivate; 2340 $self->deactivate;
2270 $_->clear_links_to ($self) for values %cf::MAP; 2341 $_->clear_links_to ($self) for values %cf::MAP;
2271 $self->clear; 2342 $self->clear;
2272}
2273
2274sub reset_at {
2275 my ($self) = @_;
2276
2277 # TODO: safety, remove and allow resettable per-player maps
2278 return 1e99 if $self->{deny_reset};
2279
2280 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2281 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2282
2283 $time + $to
2284}
2285
2286sub should_reset {
2287 my ($self) = @_;
2288
2289 $self->reset_at <= $cf::RUNTIME
2290}
2291
2292sub reset {
2293 my ($self) = @_;
2294
2295 my $lock = cf::lock_acquire "map_data:$self->{path}";
2296
2297 return if $self->players;
2298
2299 warn "resetting map ", $self->path;
2300
2301 $self->in_memory (cf::MAP_SWAPPED);
2302
2303 # need to save uniques path
2304 unless ($self->{deny_save}) {
2305 my $uniq = $self->uniq_path; utf8::encode $uniq;
2306
2307 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2308 if $uniq;
2309 }
2310
2311 delete $cf::MAP{$self->path};
2312
2313 $self->deactivate;
2314 $_->clear_links_to ($self) for values %cf::MAP;
2315 $self->clear;
2316 2343
2317 $self->unlink_save; 2344 $self->unlink_save;
2318 $self->destroy; 2345 $self->destroy;
2319} 2346}
2320 2347
… …
2328 2355
2329 delete $cf::MAP{$self->path}; 2356 delete $cf::MAP{$self->path};
2330 2357
2331 $self->unlink_save; 2358 $self->unlink_save;
2332 2359
2333 bless $self, "cf::map"; 2360 bless $self, "cf::map::wrap";
2334 delete $self->{deny_reset}; 2361 delete $self->{deny_reset};
2335 $self->{deny_save} = 1; 2362 $self->{deny_save} = 1;
2336 $self->reset_timeout (1); 2363 $self->reset_timeout (1);
2337 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2364 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2338 2365
… …
2395 : normalise $_ 2422 : normalise $_
2396 } @{ aio_readdir $UNIQUEDIR or [] } 2423 } @{ aio_readdir $UNIQUEDIR or [] }
2397 ] 2424 ]
2398} 2425}
2399 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
2400=back 2459=back
2401 2460
2402=head3 cf::object 2461=head3 cf::object
2403 2462
2404=cut 2463=cut
… …
2469 2528
2470our $SAY_CHANNEL = { 2529our $SAY_CHANNEL = {
2471 id => "say", 2530 id => "say",
2472 title => "Map", 2531 title => "Map",
2473 reply => "say ", 2532 reply => "say ",
2474 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.",
2475}; 2534};
2476 2535
2477our $CHAT_CHANNEL = { 2536our $CHAT_CHANNEL = {
2478 id => "chat", 2537 id => "chat",
2479 title => "Chat", 2538 title => "Chat",
… …
2534 2593
2535=item $player_object->enter_link 2594=item $player_object->enter_link
2536 2595
2537Freezes 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}>).
2538 2597
2539The player should be reasonably safe there for short amounts of time. You 2598The player should be reasonably safe there for short amounts of time (e.g.
2540I<MUST> call C<leave_link> as soon as possible, though. 2599for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2600though, as the player cannot control the character while it is on the link
2601map.
2541 2602
2542Will never block. 2603Will never block.
2543 2604
2544=item $player_object->leave_link ($map, $x, $y) 2605=item $player_object->leave_link ($map, $x, $y)
2545 2606
… …
2565sub cf::object::player::enter_link { 2626sub cf::object::player::enter_link {
2566 my ($self) = @_; 2627 my ($self) = @_;
2567 2628
2568 $self->deactivate_recursive; 2629 $self->deactivate_recursive;
2569 2630
2631 ++$self->{_link_recursion};
2632
2570 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2633 return if UNIVERSAL::isa $self->map, "ext::map_link";
2571 2634
2572 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2635 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2573 if $self->map && $self->map->{path} ne "{link}"; 2636 if $self->map && $self->map->{path} ne "{link}";
2574 2637
2575 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2638 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2576} 2639}
2577 2640
2578sub cf::object::player::leave_link { 2641sub cf::object::player::leave_link {
2579 my ($self, $map, $x, $y) = @_; 2642 my ($self, $map, $x, $y) = @_;
2580 2643
… …
2597 ($x, $y) = (-1, -1) 2660 ($x, $y) = (-1, -1)
2598 unless (defined $x) && (defined $y); 2661 unless (defined $x) && (defined $y);
2599 2662
2600 # use -1 or undef as default coordinates, not 0, 0 2663 # use -1 or undef as default coordinates, not 0, 0
2601 ($x, $y) = ($map->enter_x, $map->enter_y) 2664 ($x, $y) = ($map->enter_x, $map->enter_y)
2602 if $x <=0 && $y <= 0; 2665 if $x <= 0 && $y <= 0;
2603 2666
2604 $map->load; 2667 $map->load;
2605 $map->load_neighbours; 2668 $map->load_neighbours;
2606 2669
2607 return unless $self->contr->active; 2670 return unless $self->contr->active;
2608 $self->activate_recursive;
2609 2671
2610 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2672 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2611 $self->enter_map ($map, $x, $y); 2673 if ($self->enter_map ($map, $x, $y)) {
2612} 2674 # entering was successful
2675 delete $self->{_link_recursion};
2676 # only activate afterwards, to support waiting in hooks
2677 $self->activate_recursive;
2678 }
2613 2679
2680}
2681
2614=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)]])
2615 2683
2616Moves 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
2617her, loading and preparing them map, calling the provided $check callback 2685her, loading and preparing them map, calling the provided $check callback
2618that 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
2619the 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
… …
2626 2694
2627our $GOTOGEN; 2695our $GOTOGEN;
2628 2696
2629sub cf::object::player::goto { 2697sub cf::object::player::goto {
2630 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 }
2631 2705
2632 # 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
2633 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2707 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2634 2708
2635 $self->enter_link; 2709 $self->enter_link;
… …
2659 my $map = eval { 2733 my $map = eval {
2660 my $map = defined $path ? cf::map::find $path : undef; 2734 my $map = defined $path ? cf::map::find $path : undef;
2661 2735
2662 if ($map) { 2736 if ($map) {
2663 $map = $map->customise_for ($self); 2737 $map = $map->customise_for ($self);
2664 $map = $check->($map) if $check && $map; 2738 $map = $check->($map, $x, $y, $self) if $check && $map;
2665 } else { 2739 } else {
2666 $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);
2667 } 2741 }
2668 2742
2669 $map 2743 $map
… …
2677 if ($gen == $self->{_goto_generation}) { 2751 if ($gen == $self->{_goto_generation}) {
2678 delete $self->{_goto_generation}; 2752 delete $self->{_goto_generation};
2679 $self->leave_link ($map, $x, $y); 2753 $self->leave_link ($map, $x, $y);
2680 } 2754 }
2681 2755
2682 $done->() if $done; 2756 $done->($self) if $done;
2683 })->prio (1); 2757 })->prio (1);
2684} 2758}
2685 2759
2686=item $player_object->enter_exit ($exit_object) 2760=item $player_object->enter_exit ($exit_object)
2687 2761
… …
2775 $self->contr->savebed ($map, $x, $y) 2849 $self->contr->savebed ($map, $x, $y)
2776 if $exit->flag (cf::FLAG_DAMNED); 2850 if $exit->flag (cf::FLAG_DAMNED);
2777 2851
2778 1 2852 1
2779 }) { 2853 }) {
2780 $self->message ("Something went wrong deep within the crossfire server. " 2854 $self->message ("Something went wrong deep within the deliantra server. "
2781 . "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. "
2782 . "Please report this to the dungeon master!", 2856 . "Please report this to the dungeon master!",
2783 cf::NDI_UNIQUE | cf::NDI_RED); 2857 cf::NDI_UNIQUE | cf::NDI_RED);
2784 2858
2785 warn "ERROR in enter_exit: $@"; 2859 error "ERROR in enter_exit: $@";
2786 $self->leave_link; 2860 $self->leave_link;
2787 } 2861 }
2788 })->prio (1); 2862 })->prio (1);
2789} 2863}
2790 2864
… …
2802sub cf::client::send_drawinfo { 2876sub cf::client::send_drawinfo {
2803 my ($self, $text, $flags) = @_; 2877 my ($self, $text, $flags) = @_;
2804 2878
2805 utf8::encode $text; 2879 utf8::encode $text;
2806 $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);
2807} 2906}
2808 2907
2809=item $client->send_msg ($channel, $msg, $color, [extra...]) 2908=item $client->send_msg ($channel, $msg, $color, [extra...])
2810 2909
2811Send 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
… …
2815 2914
2816=cut 2915=cut
2817 2916
2818# non-persistent channels (usually the info channel) 2917# non-persistent channels (usually the info channel)
2819our %CHANNEL = ( 2918our %CHANNEL = (
2919 "c/motd" => {
2920 id => "infobox",
2921 title => "MOTD",
2922 reply => undef,
2923 tooltip => "The message of the day",
2924 },
2820 "c/identify" => { 2925 "c/identify" => {
2821 id => "infobox", 2926 id => "infobox",
2822 title => "Identify", 2927 title => "Identify",
2823 reply => undef, 2928 reply => undef,
2824 tooltip => "Items recently identified", 2929 tooltip => "Items recently identified",
… …
2826 "c/examine" => { 2931 "c/examine" => {
2827 id => "infobox", 2932 id => "infobox",
2828 title => "Examine", 2933 title => "Examine",
2829 reply => undef, 2934 reply => undef,
2830 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",
2831 }, 2942 },
2832 "c/book" => { 2943 "c/book" => {
2833 id => "infobox", 2944 id => "infobox",
2834 title => "Book", 2945 title => "Book",
2835 reply => undef, 2946 reply => undef,
… …
2851 id => "infobox", 2962 id => "infobox",
2852 title => "Body Parts", 2963 title => "Body Parts",
2853 reply => undef, 2964 reply => undef,
2854 tooltip => "Shows which body parts you posess and are available", 2965 tooltip => "Shows which body parts you posess and are available",
2855 }, 2966 },
2967 "c/statistics" => {
2968 id => "infobox",
2969 title => "Statistics",
2970 reply => undef,
2971 tooltip => "Shows your primary statistics",
2972 },
2973 "c/skills" => {
2974 id => "infobox",
2975 title => "Skills",
2976 reply => undef,
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",
3002 },
2856 "c/uptime" => { 3003 "c/uptime" => {
2857 id => "infobox", 3004 id => "infobox",
2858 title => "Uptime", 3005 title => "Uptime",
2859 reply => undef, 3006 reply => undef,
2860 tooltip => "How long the server has been running since last restart", 3007 tooltip => "How long the server has been running since last restart",
… …
2869 id => "party", 3016 id => "party",
2870 title => "Party", 3017 title => "Party",
2871 reply => "gsay ", 3018 reply => "gsay ",
2872 tooltip => "Messages and chat related to your party", 3019 tooltip => "Messages and chat related to your party",
2873 }, 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,
2874); 3029);
2875 3030
2876sub cf::client::send_msg { 3031sub cf::client::send_msg {
2877 my ($self, $channel, $msg, $color, @extra) = @_; 3032 my ($self, $channel, $msg, $color, @extra) = @_;
2878 3033
2879 $msg = $self->pl->expand_cfpod ($msg); 3034 $msg = $self->pl->expand_cfpod ($msg)
3035 unless $color & cf::NDI_VERBATIM;
2880 3036
2881 $color &= cf::NDI_CLIENT_MASK; # just in case... 3037 $color &= cf::NDI_CLIENT_MASK; # just in case...
2882 3038
2883 # check predefined channels, for the benefit of C 3039 # check predefined channels, for the benefit of C
2884 if ($CHANNEL{$channel}) { 3040 if ($CHANNEL{$channel}) {
2885 $channel = $CHANNEL{$channel}; 3041 $channel = $CHANNEL{$channel};
2886 3042
2887 $self->ext_msg (channel_info => $channel) 3043 $self->ext_msg (channel_info => $channel);
2888 if $self->can_msg;
2889
2890 $channel = $channel->{id}; 3044 $channel = $channel->{id};
2891 3045
2892 } elsif (ref $channel) { 3046 } elsif (ref $channel) {
2893 # send meta info to client, if not yet sent 3047 # send meta info to client, if not yet sent
2894 unless (exists $self->{channel}{$channel->{id}}) { 3048 unless (exists $self->{channel}{$channel->{id}}) {
2895 $self->{channel}{$channel->{id}} = $channel; 3049 $self->{channel}{$channel->{id}} = $channel;
2896 $self->ext_msg (channel_info => $channel) 3050 $self->ext_msg (channel_info => $channel);
2897 if $self->can_msg;
2898 } 3051 }
2899 3052
2900 $channel = $channel->{id}; 3053 $channel = $channel->{id};
2901 } 3054 }
2902 3055
2903 return unless @extra || length $msg; 3056 return unless @extra || length $msg;
2904 3057
2905 if ($self->can_msg) {
2906 # default colour, mask it out 3058 # default colour, mask it out
2907 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3059 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2908 if $color & cf::NDI_DEF; 3060 if $color & cf::NDI_DEF;
2909 3061
2910 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3062 my $pkt = "msg "
3063 . $self->{json_coder}->encode (
2911 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3064 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2912 } else { 3065 );
2913 if ($color >= 0) {
2914 # replace some tags by gcfclient-compatible ones
2915 for ($msg) {
2916 1 while
2917 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2918 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2919 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2920 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2921 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2922 }
2923 3066
2924 $color &= cf::NDI_COLOR_MASK; 3067 $self->send_big_packet ($pkt);
2925
2926 utf8::encode $msg;
2927
2928 if (0 && $msg =~ /\[/) {
2929 # COMMAND/INFO
2930 $self->send_packet ("drawextinfo $color 10 8 $msg")
2931 } else {
2932 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2933 $self->send_packet ("drawinfo $color $msg")
2934 }
2935 }
2936 }
2937} 3068}
2938 3069
2939=item $client->ext_msg ($type, @msg) 3070=item $client->ext_msg ($type, @msg)
2940 3071
2941Sends an ext event to the client. 3072Sends an ext event to the client.
… …
2944 3075
2945sub cf::client::ext_msg($$@) { 3076sub cf::client::ext_msg($$@) {
2946 my ($self, $type, @msg) = @_; 3077 my ($self, $type, @msg) = @_;
2947 3078
2948 if ($self->extcmd == 2) { 3079 if ($self->extcmd == 2) {
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3080 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2950 } elsif ($self->extcmd == 1) { # TODO: remove 3081 } elsif ($self->extcmd == 1) { # TODO: remove
2951 push @msg, msgtype => "event_$type"; 3082 push @msg, msgtype => "event_$type";
2952 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3083 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2953 } 3084 }
2954} 3085}
2955 3086
2956=item $client->ext_reply ($msgid, @msg) 3087=item $client->ext_reply ($msgid, @msg)
2957 3088
… …
2961 3092
2962sub cf::client::ext_reply($$@) { 3093sub cf::client::ext_reply($$@) {
2963 my ($self, $id, @msg) = @_; 3094 my ($self, $id, @msg) = @_;
2964 3095
2965 if ($self->extcmd == 2) { 3096 if ($self->extcmd == 2) {
2966 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3097 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2967 } elsif ($self->extcmd == 1) { 3098 } elsif ($self->extcmd == 1) {
2968 #TODO: version 1, remove 3099 #TODO: version 1, remove
2969 unshift @msg, msgtype => "reply", msgid => $id; 3100 unshift @msg, msgtype => "reply", msgid => $id;
2970 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2971 } 3102 }
2972} 3103}
2973 3104
2974=item $success = $client->query ($flags, "text", \&cb) 3105=item $success = $client->query ($flags, "text", \&cb)
2975 3106
… …
3046 3177
3047 $ns->ext_reply ($reply, @reply) 3178 $ns->ext_reply ($reply, @reply)
3048 if $reply; 3179 if $reply;
3049 3180
3050 } else { 3181 } else {
3051 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";
3052 } 3183 }
3053 3184
3054 cf::override; 3185 cf::override;
3055 }, 3186 },
3056); 3187);
… …
3076 3207
3077 $coro 3208 $coro
3078} 3209}
3079 3210
3080cf::client->attach ( 3211cf::client->attach (
3081 on_destroy => sub { 3212 on_client_destroy => sub {
3082 my ($ns) = @_; 3213 my ($ns) = @_;
3083 3214
3084 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3215 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3085 }, 3216 },
3086); 3217);
… …
3102our $safe_hole = new Safe::Hole; 3233our $safe_hole = new Safe::Hole;
3103 3234
3104$SIG{FPE} = 'IGNORE'; 3235$SIG{FPE} = 'IGNORE';
3105 3236
3106$safe->permit_only (Opcode::opset qw( 3237$safe->permit_only (Opcode::opset qw(
3107 :base_core :base_mem :base_orig :base_math 3238 :base_core :base_mem :base_orig :base_math :base_loop
3108 grepstart grepwhile mapstart mapwhile 3239 grepstart grepwhile mapstart mapwhile
3109 sort time 3240 sort time
3110)); 3241));
3111 3242
3112# here we export the classes and methods available to script code 3243# here we export the classes and methods available to script code
… …
3116The following functions and methods are available within a safe environment: 3247The following functions and methods are available within a safe environment:
3117 3248
3118 cf::object 3249 cf::object
3119 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
3120 insert remove name archname title slaying race decrease split 3251 insert remove name archname title slaying race decrease split
3252 value
3121 3253
3122 cf::object::player 3254 cf::object::player
3123 player 3255 player
3124 3256
3125 cf::player 3257 cf::player
… …
3131=cut 3263=cut
3132 3264
3133for ( 3265for (
3134 ["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
3135 insert remove inv nrof name archname title slaying race 3267 insert remove inv nrof name archname title slaying race
3136 decrease split destroy change_exp)], 3268 decrease split destroy change_exp value msg lore send_msg)],
3137 ["cf::object::player" => qw(player)], 3269 ["cf::object::player" => qw(player)],
3138 ["cf::player" => qw(peaceful)], 3270 ["cf::player" => qw(peaceful send_msg)],
3139 ["cf::map" => qw(trigger)], 3271 ["cf::map" => qw(trigger)],
3140) { 3272) {
3141 no strict 'refs'; 3273 no strict 'refs';
3142 my ($pkg, @funs) = @$_; 3274 my ($pkg, @funs) = @$_;
3143 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3275 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3161 3293
3162 my $qcode = $code; 3294 my $qcode = $code;
3163 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3295 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3164 $qcode =~ s/\n/\\n/g; 3296 $qcode =~ s/\n/\\n/g;
3165 3297
3298 %vars = (_dummy => 0) unless %vars;
3299
3300 my @res;
3166 local $_; 3301 local $_;
3167 local @safe::cf::_safe_eval_args = values %vars;
3168 3302
3169 my $eval = 3303 my $eval =
3170 "do {\n" 3304 "do {\n"
3171 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3305 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3172 . "#line 0 \"{$qcode}\"\n" 3306 . "#line 0 \"{$qcode}\"\n"
3173 . $code 3307 . $code
3174 . "\n}" 3308 . "\n}"
3175 ; 3309 ;
3176 3310
3311 if ($CFG{safe_eval}) {
3177 sub_generation_inc; 3312 sub_generation_inc;
3313 local @safe::cf::_safe_eval_args = values %vars;
3178 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3314 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3179 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 }
3180 3320
3181 if ($@) { 3321 if ($@) {
3182 warn "$@"; 3322 warn "$@",
3183 warn "while executing safe code '$code'\n"; 3323 "while executing safe code '$code'\n",
3184 warn "with arguments " . (join " ", %vars) . "\n"; 3324 "with arguments " . (join " ", %vars) . "\n";
3185 } 3325 }
3186 3326
3187 wantarray ? @res : $res[0] 3327 wantarray ? @res : $res[0]
3188} 3328}
3189 3329
… …
3203=cut 3343=cut
3204 3344
3205sub register_script_function { 3345sub register_script_function {
3206 my ($fun, $cb) = @_; 3346 my ($fun, $cb) = @_;
3207 3347
3208 no strict 'refs'; 3348 $fun = "safe::$fun" if $CFG{safe_eval};
3209 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3349 *$fun = $safe_hole->wrap ($cb);
3210} 3350}
3211 3351
3212=back 3352=back
3213 3353
3214=cut 3354=cut
… …
3223 # for this (global event?) 3363 # for this (global event?)
3224 %ext::player_env::MUSIC_FACE_CACHE = (); 3364 %ext::player_env::MUSIC_FACE_CACHE = ();
3225 3365
3226 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3366 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3227 3367
3228 warn "loading facedata from $path\n"; 3368 trace "loading facedata from $path\n";
3229 3369
3230 my $facedata; 3370 my $facedata;
3231 0 < aio_load $path, $facedata 3371 0 < aio_load $path, $facedata
3232 or die "$path: $!"; 3372 or die "$path: $!";
3233 3373
… …
3235 3375
3236 $facedata->{version} == 2 3376 $facedata->{version} == 2
3237 or cf::cleanup "$path: version mismatch, cannot proceed."; 3377 or cf::cleanup "$path: version mismatch, cannot proceed.";
3238 3378
3239 # 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]);
3240 $facedata->{resource}{"res/exp_table"} = { 3381 $facedata->{resource}{"res/exp_table"} = {
3241 type => FT_RSRC, 3382 type => FT_RSRC,
3242 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),
3243 }; 3385 };
3244 cf::cede_to_tick; 3386 cf::cede_to_tick;
3245 3387
3246 { 3388 {
3247 my $faces = $facedata->{faceinfo}; 3389 my $faces = $facedata->{faceinfo};
… …
3249 while (my ($face, $info) = each %$faces) { 3391 while (my ($face, $info) = each %$faces) {
3250 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3392 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3251 3393
3252 cf::face::set_visibility $idx, $info->{visibility}; 3394 cf::face::set_visibility $idx, $info->{visibility};
3253 cf::face::set_magicmap $idx, $info->{magicmap}; 3395 cf::face::set_magicmap $idx, $info->{magicmap};
3254 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3396 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3255 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3397 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3256 3398
3257 cf::cede_to_tick; 3399 cf::cede_to_tick;
3258 } 3400 }
3259 3401
3260 while (my ($face, $info) = each %$faces) { 3402 while (my ($face, $info) = each %$faces) {
… …
3265 3407
3266 if (my $smooth = cf::face::find $info->{smooth}) { 3408 if (my $smooth = cf::face::find $info->{smooth}) {
3267 cf::face::set_smooth $idx, $smooth; 3409 cf::face::set_smooth $idx, $smooth;
3268 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3410 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3269 } else { 3411 } else {
3270 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3412 error "smooth face '$info->{smooth}' not found for face '$face'";
3271 } 3413 }
3272 3414
3273 cf::cede_to_tick; 3415 cf::cede_to_tick;
3274 } 3416 }
3275 } 3417 }
… …
3284 3426
3285 cf::anim::invalidate_all; # d'oh 3427 cf::anim::invalidate_all; # d'oh
3286 } 3428 }
3287 3429
3288 { 3430 {
3289 # TODO: for gcfclient pleasure, we should give resources
3290 # that gcfclient doesn't grok a >10000 face index.
3291 my $res = $facedata->{resource}; 3431 my $res = $facedata->{resource};
3292 3432
3293 while (my ($name, $info) = each %$res) { 3433 while (my ($name, $info) = each %$res) {
3294 if (defined $info->{type}) { 3434 if (defined $info->{type}) {
3295 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3435 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3296 my $data;
3297 3436
3298 if ($info->{type} & 1) { 3437 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3299 # prepend meta info
3300
3301 my $meta = $enc->encode ({
3302 name => $name,
3303 %{ $info->{meta} || {} },
3304 });
3305
3306 $data = pack "(w/a*)*", $meta, $info->{data};
3307 } else {
3308 $data = $info->{data};
3309 }
3310
3311 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3312 cf::face::set_type $idx, $info->{type}; 3438 cf::face::set_type $idx, $info->{type};
3313 } else { 3439 } else {
3314 $RESOURCE{$name} = $info; 3440 $RESOURCE{$name} = $info; # unused
3315 } 3441 }
3316 3442
3317 cf::cede_to_tick; 3443 cf::cede_to_tick;
3318 } 3444 }
3319 } 3445 }
3320 3446
3321 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3447 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3322 3448
3323 1 3449 1
3324} 3450}
3325
3326cf::global->attach (on_resource_update => sub {
3327 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3328 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3329
3330 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3331 my $sound = $soundconf->{compat}[$_]
3332 or next;
3333
3334 my $face = cf::face::find "sound/$sound->[1]";
3335 cf::sound::set $sound->[0] => $face;
3336 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3337 }
3338
3339 while (my ($k, $v) = each %{$soundconf->{event}}) {
3340 my $face = cf::face::find "sound/$v";
3341 cf::sound::set $k => $face;
3342 }
3343 }
3344});
3345 3451
3346register_exticmd fx_want => sub { 3452register_exticmd fx_want => sub {
3347 my ($ns, $want) = @_; 3453 my ($ns, $want) = @_;
3348 3454
3349 while (my ($k, $v) = each %$want) { 3455 while (my ($k, $v) = each %$want) {
… …
3388sub reload_treasures { 3494sub reload_treasures {
3389 load_resource_file "$DATADIR/treasures" 3495 load_resource_file "$DATADIR/treasures"
3390 or die "unable to load treasurelists\n"; 3496 or die "unable to load treasurelists\n";
3391} 3497}
3392 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
3393sub reload_resources { 3522sub reload_resources {
3394 warn "reloading resource files...\n"; 3523 trace "reloading resource files...\n";
3395 3524
3396 reload_facedata; 3525 reload_facedata;
3526 reload_sound;
3397 reload_archetypes; 3527 reload_archetypes;
3398 reload_regions; 3528 reload_regions;
3399 reload_treasures; 3529 reload_treasures;
3400 3530
3401 warn "finished reloading resource files\n"; 3531 trace "finished reloading resource files\n";
3402}
3403
3404sub init {
3405 my $guard = freeze_mainloop;
3406
3407 evthread_start IO::AIO::poll_fileno;
3408
3409 reload_resources;
3410} 3532}
3411 3533
3412sub reload_config { 3534sub reload_config {
3535 trace "reloading config file...\n";
3536
3413 open my $fh, "<:utf8", "$CONFDIR/config" 3537 open my $fh, "<:utf8", "$CONFDIR/config"
3414 or return; 3538 or return;
3415 3539
3416 local $/; 3540 local $/;
3417 *CFG = YAML::Load <$fh>; 3541 *CFG = YAML::XS::Load scalar <$fh>;
3418 3542
3419 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3543 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3420 3544
3421 $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};
3422 $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};
3423 3547
3424 if (exists $CFG{mlockall}) { 3548 if (exists $CFG{mlockall}) {
… …
3426 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3550 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3427 and die "WARNING: m(un)lockall failed: $!\n"; 3551 and die "WARNING: m(un)lockall failed: $!\n";
3428 }; 3552 };
3429 warn $@ if $@; 3553 warn $@ if $@;
3430 } 3554 }
3555
3556 trace "finished reloading resource files\n";
3557}
3558
3559sub pidfile() {
3560 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3561 or die "$PIDFILE: $!";
3562 flock $fh, &Fcntl::LOCK_EX
3563 or die "$PIDFILE: flock: $!";
3564 $fh
3565}
3566
3567# make sure only one server instance is running at any one time
3568sub atomic {
3569 my $fh = pidfile;
3570
3571 my $pid = <$fh>;
3572 kill 9, $pid if $pid > 0;
3573
3574 seek $fh, 0, 0;
3575 print $fh $$;
3576}
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;
3431} 3585}
3432 3586
3433sub main { 3587sub main {
3588 cf::init_globals; # initialise logging
3589
3590 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3591 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3592 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3593 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3594
3595 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3596
3434 # we must not ever block the main coroutine 3597 # we must not ever block the main coroutine
3435 local $Coro::idle = sub { 3598 local $Coro::idle = sub {
3436 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3599 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3437 (async { 3600 (async {
3438 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3601 $Coro::current->{desc} = "IDLE BUG HANDLER";
3439 EV::loop EV::LOOP_ONESHOT; 3602 EV::loop EV::LOOP_ONESHOT;
3440 })->prio (Coro::PRIO_MAX); 3603 })->prio (Coro::PRIO_MAX);
3441 }; 3604 };
3442 3605
3443 { 3606 evthread_start IO::AIO::poll_fileno;
3444 my $guard = freeze_mainloop; 3607
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
3617 reload_resources;
3445 reload_config; 3618 reload_config;
3446 db_init; 3619 db_init;
3620
3621 cf::init_uuid;
3622 cf::init_signals;
3623 cf::init_skills;
3624
3625 cf::init_beforeplay;
3626
3627 atomic;
3628
3447 load_extensions; 3629 load_extensions;
3448 3630
3449 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3631 utime time, time, $RUNTIMEFILE;
3632
3633 # no (long-running) fork's whatsoever before this point(!)
3634 use POSIX ();
3635 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3636
3637 (pop @POST_INIT)->(0) while @POST_INIT;
3450 } 3638 };
3451 3639
3452 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;
3453} 3644}
3454 3645
3455############################################################################# 3646#############################################################################
3456# initialisation and cleanup 3647# initialisation and cleanup
3457 3648
3458# install some emergency cleanup handlers 3649# install some emergency cleanup handlers
3459BEGIN { 3650BEGIN {
3460 our %SIGWATCHER = (); 3651 our %SIGWATCHER = ();
3461 for my $signal (qw(INT HUP TERM)) { 3652 for my $signal (qw(INT HUP TERM)) {
3462 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3653 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3463 cf::cleanup "SIG$signal"; 3654 cf::cleanup "SIG$signal";
3464 }; 3655 };
3465 } 3656 }
3466} 3657}
3467 3658
3468sub write_runtime_sync { 3659sub write_runtime_sync {
3469 my $runtime = "$LOCALDIR/runtime"; 3660 my $t0 = AE::time;
3470 3661
3471 # first touch the runtime file to show we are still running: 3662 # first touch the runtime file to show we are still running:
3472 # the fsync below can take a very very long time. 3663 # the fsync below can take a very very long time.
3473 3664
3474 IO::AIO::aio_utime $runtime, undef, undef; 3665 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3475 3666
3476 my $guard = cf::lock_acquire "write_runtime"; 3667 my $guard = cf::lock_acquire "write_runtime";
3477 3668
3478 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3669 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3479 or return; 3670 or return;
3480 3671
3481 my $value = $cf::RUNTIME + 90 + 10; 3672 my $value = $cf::RUNTIME + 90 + 10;
3482 # 10 is the runtime save interval, for a monotonic clock 3673 # 10 is the runtime save interval, for a monotonic clock
3483 # 60 allows for the watchdog to kill the server. 3674 # 60 allows for the watchdog to kill the server.
… …
3493 aio_utime $fh, undef, undef; 3684 aio_utime $fh, undef, undef;
3494 3685
3495 close $fh 3686 close $fh
3496 or return; 3687 or return;
3497 3688
3498 aio_rename "$runtime~", $runtime 3689 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3499 and return; 3690 and return;
3500 3691
3501 warn "runtime file written.\n"; 3692 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3502 3693
3503 1 3694 1
3504} 3695}
3505 3696
3506our $uuid_lock; 3697our $uuid_lock;
… …
3515 my $uuid = "$LOCALDIR/uuid"; 3706 my $uuid = "$LOCALDIR/uuid";
3516 3707
3517 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3708 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3518 or return; 3709 or return;
3519 3710
3520 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;
3521 $uuid_skip = 0; 3719 $uuid_skip = 0;
3522 3720
3523 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3721 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3524 and return; 3722 and return;
3525 3723
… …
3531 or return; 3729 or return;
3532 3730
3533 aio_rename "$uuid~", $uuid 3731 aio_rename "$uuid~", $uuid
3534 and return; 3732 and return;
3535 3733
3536 warn "uuid file written ($value).\n"; 3734 trace "uuid file written ($value).\n";
3537 3735
3538 1 3736 1
3539 3737
3540} 3738}
3541 3739
… …
3547} 3745}
3548 3746
3549sub emergency_save() { 3747sub emergency_save() {
3550 my $freeze_guard = cf::freeze_mainloop; 3748 my $freeze_guard = cf::freeze_mainloop;
3551 3749
3552 warn "enter emergency perl save\n"; 3750 info "emergency_perl_save: enter\n";
3553 3751
3554 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
3555 # use a peculiar iteration method to avoid tripping on perl 3758 # use a peculiar iteration method to avoid tripping on perl
3556 # refcount bugs in for. also avoids problems with players 3759 # refcount bugs in for. also avoids problems with players
3557 # and maps saved/destroyed asynchronously. 3760 # and maps saved/destroyed asynchronously.
3558 warn "begin emergency player save\n"; 3761 info "emergency_perl_save: begin player save\n";
3559 for my $login (keys %cf::PLAYER) { 3762 for my $login (keys %cf::PLAYER) {
3560 my $pl = $cf::PLAYER{$login} or next; 3763 my $pl = $cf::PLAYER{$login} or next;
3561 $pl->valid or next; 3764 $pl->valid or next;
3562 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3765 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3563 $pl->save; 3766 $pl->save;
3564 } 3767 }
3565 warn "end emergency player save\n"; 3768 info "emergency_perl_save: end player save\n";
3566 3769
3567 warn "begin emergency map save\n"; 3770 info "emergency_perl_save: begin map save\n";
3568 for my $path (keys %cf::MAP) { 3771 for my $path (keys %cf::MAP) {
3569 my $map = $cf::MAP{$path} or next; 3772 my $map = $cf::MAP{$path} or next;
3570 $map->valid or next; 3773 $map->valid or next;
3571 $map->save; 3774 $map->save;
3572 } 3775 }
3573 warn "end emergency map save\n"; 3776 info "emergency_perl_save: end map save\n";
3574 3777
3575 warn "begin emergency database checkpoint\n"; 3778 info "emergency_perl_save: begin database checkpoint\n";
3576 BDB::db_env_txn_checkpoint $DB_ENV; 3779 BDB::db_env_txn_checkpoint $DB_ENV;
3577 warn "end emergency database checkpoint\n"; 3780 info "emergency_perl_save: end database checkpoint\n";
3578 3781
3579 warn "begin write uuid\n"; 3782 info "emergency_perl_save: begin write uuid\n";
3580 write_uuid_sync 1; 3783 write_uuid_sync 1;
3581 warn "end write uuid\n"; 3784 info "emergency_perl_save: end write uuid\n";
3582 }; 3785 };
3583 3786
3584 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";
3585} 3793}
3586 3794
3587sub post_cleanup { 3795sub post_cleanup {
3588 my ($make_core) = @_; 3796 my ($make_core) = @_;
3589 3797
3590 warn Carp::longmess "post_cleanup backtrace" 3798 error Carp::longmess "post_cleanup backtrace"
3591 if $make_core; 3799 if $make_core;
3800
3801 my $fh = pidfile;
3802 unlink $PIDFILE if <$fh> == $$;
3592} 3803}
3593 3804
3594# a safer delete_package, copied from Symbol 3805# a safer delete_package, copied from Symbol
3595sub clear_package($) { 3806sub clear_package($) {
3596 my $pkg = shift; 3807 my $pkg = shift;
… …
3612 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3823 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3613 for my $name (keys %$leaf_symtab) { 3824 for my $name (keys %$leaf_symtab) {
3614 _gv_clear *{"$pkg$name"}; 3825 _gv_clear *{"$pkg$name"};
3615# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3826# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3616 } 3827 }
3617 warn "cleared package #$pkg\n";#d#
3618} 3828}
3619
3620our $RELOAD; # how many times to reload
3621 3829
3622sub do_reload_perl() { 3830sub do_reload_perl() {
3623 # can/must only be called in main 3831 # can/must only be called in main
3624 if ($Coro::current != $Coro::main) { 3832 if (in_main) {
3625 warn "can only reload from main coroutine"; 3833 error "can only reload from main coroutine";
3626 return; 3834 return;
3627 } 3835 }
3628 3836
3629 return if $RELOAD++; 3837 return if $RELOAD++;
3630 3838
3839 my $t1 = AE::time;
3840
3631 while ($RELOAD) { 3841 while ($RELOAD) {
3632 warn "reloading..."; 3842 info "reloading...";
3633 3843
3634 warn "entering sync_job"; 3844 trace "entering sync_job";
3635 3845
3636 cf::sync_job { 3846 cf::sync_job {
3637 cf::write_runtime_sync; # external watchdog should not bark 3847 cf::write_runtime_sync; # external watchdog should not bark
3638 cf::emergency_save; 3848 cf::emergency_save;
3639 cf::write_runtime_sync; # external watchdog should not bark 3849 cf::write_runtime_sync; # external watchdog should not bark
3640 3850
3641 warn "syncing database to disk"; 3851 trace "syncing database to disk";
3642 BDB::db_env_txn_checkpoint $DB_ENV; 3852 BDB::db_env_txn_checkpoint $DB_ENV;
3643 3853
3644 # 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
3645 3855
3646 warn "flushing outstanding aio requests"; 3856 trace "flushing outstanding aio requests";
3647 while (IO::AIO::nreqs || BDB::nreqs) { 3857 while (IO::AIO::nreqs || BDB::nreqs) {
3648 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
3649 } 3859 }
3650 3860
3651 warn "cancelling all extension coros"; 3861 trace "cancelling all extension coros";
3652 $_->cancel for values %EXT_CORO; 3862 $_->cancel for values %EXT_CORO;
3653 %EXT_CORO = (); 3863 %EXT_CORO = ();
3654 3864
3655 warn "removing commands"; 3865 trace "removing commands";
3656 %COMMAND = (); 3866 %COMMAND = ();
3657 3867
3658 warn "removing ext/exti commands"; 3868 trace "removing ext/exti commands";
3659 %EXTCMD = (); 3869 %EXTCMD = ();
3660 %EXTICMD = (); 3870 %EXTICMD = ();
3661 3871
3662 warn "unloading/nuking all extensions"; 3872 trace "unloading/nuking all extensions";
3663 for my $pkg (@EXTS) { 3873 for my $pkg (@EXTS) {
3664 warn "... unloading $pkg"; 3874 trace "... unloading $pkg";
3665 3875
3666 if (my $cb = $pkg->can ("unload")) { 3876 if (my $cb = $pkg->can ("unload")) {
3667 eval { 3877 eval {
3668 $cb->($pkg); 3878 $cb->($pkg);
3669 1 3879 1
3670 } or warn "$pkg unloaded, but with errors: $@"; 3880 } or error "$pkg unloaded, but with errors: $@";
3671 } 3881 }
3672 3882
3673 warn "... clearing $pkg"; 3883 trace "... clearing $pkg";
3674 clear_package $pkg; 3884 clear_package $pkg;
3675 } 3885 }
3676 3886
3677 warn "unloading all perl modules loaded from $LIBDIR"; 3887 trace "unloading all perl modules loaded from $LIBDIR";
3678 while (my ($k, $v) = each %INC) { 3888 while (my ($k, $v) = each %INC) {
3679 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3889 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3680 3890
3681 warn "... unloading $k"; 3891 trace "... unloading $k";
3682 delete $INC{$k}; 3892 delete $INC{$k};
3683 3893
3684 $k =~ s/\.pm$//; 3894 $k =~ s/\.pm$//;
3685 $k =~ s/\//::/g; 3895 $k =~ s/\//::/g;
3686 3896
… …
3689 } 3899 }
3690 3900
3691 clear_package $k; 3901 clear_package $k;
3692 } 3902 }
3693 3903
3694 warn "getting rid of safe::, as good as possible"; 3904 trace "getting rid of safe::, as good as possible";
3695 clear_package "safe::$_" 3905 clear_package "safe::$_"
3696 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);
3697 3907
3698 warn "unloading cf.pm \"a bit\""; 3908 trace "unloading cf.pm \"a bit\"";
3699 delete $INC{"cf.pm"}; 3909 delete $INC{"cf.pm"};
3700 delete $INC{"cf/pod.pm"}; 3910 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3701 3911
3702 # don't, removes xs symbols, too, 3912 # don't, removes xs symbols, too,
3703 # and global variables created in xs 3913 # and global variables created in xs
3704 #clear_package __PACKAGE__; 3914 #clear_package __PACKAGE__;
3705 3915
3706 warn "unload completed, starting to reload now"; 3916 info "unload completed, starting to reload now";
3707 3917
3708 warn "reloading cf.pm"; 3918 trace "reloading cf.pm";
3709 require cf; 3919 require cf;
3710 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3920 cf::_connect_to_perl_1;
3711 3921
3712 warn "loading config and database again"; 3922 trace "loading config and database again";
3713 cf::reload_config; 3923 cf::reload_config;
3714 3924
3715 warn "loading extensions"; 3925 trace "loading extensions";
3716 cf::load_extensions; 3926 cf::load_extensions;
3717 3927
3928 if ($REATTACH_ON_RELOAD) {
3718 warn "reattaching attachments to objects/players"; 3929 trace "reattaching attachments to objects/players";
3719 _global_reattach; # objects, sockets 3930 _global_reattach; # objects, sockets
3720 warn "reattaching attachments to maps"; 3931 trace "reattaching attachments to maps";
3721 reattach $_ for values %MAP; 3932 reattach $_ for values %MAP;
3722 warn "reattaching attachments to players"; 3933 trace "reattaching attachments to players";
3723 reattach $_ for values %PLAYER; 3934 reattach $_ for values %PLAYER;
3935 }
3724 3936
3937 trace "running post_init jobs";
3938 (pop @POST_INIT)->(1) while @POST_INIT;
3939
3725 warn "leaving sync_job"; 3940 trace "leaving sync_job";
3726 3941
3727 1 3942 1
3728 } or do { 3943 } or do {
3729 warn $@; 3944 error $@;
3730 cf::cleanup "error while reloading, exiting."; 3945 cf::cleanup "error while reloading, exiting.";
3731 }; 3946 };
3732 3947
3733 warn "reloaded"; 3948 info "reloaded";
3734 --$RELOAD; 3949 --$RELOAD;
3735 } 3950 }
3951
3952 $t1 = AE::time - $t1;
3953 info "reload completed in ${t1}s\n";
3736}; 3954};
3737 3955
3738our $RELOAD_WATCHER; # used only during reload 3956our $RELOAD_WATCHER; # used only during reload
3739 3957
3740sub reload_perl() { 3958sub reload_perl() {
3741 # doing reload synchronously and two reloads happen back-to-back, 3959 # doing reload synchronously and two reloads happen back-to-back,
3742 # coro crashes during coro_state_free->destroy here. 3960 # coro crashes during coro_state_free->destroy here.
3743 3961
3962 $RELOAD_WATCHER ||= cf::async {
3963 Coro::AIO::aio_wait cache_extensions;
3964
3744 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3965 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3745 do_reload_perl; 3966 do_reload_perl;
3746 undef $RELOAD_WATCHER; 3967 undef $RELOAD_WATCHER;
3968 };
3747 }; 3969 };
3748} 3970}
3749 3971
3750register_command "reload" => sub { 3972register_command "reload" => sub {
3751 my ($who, $arg) = @_; 3973 my ($who, $arg) = @_;
… …
3765 3987
3766our @WAIT_FOR_TICK; 3988our @WAIT_FOR_TICK;
3767our @WAIT_FOR_TICK_BEGIN; 3989our @WAIT_FOR_TICK_BEGIN;
3768 3990
3769sub wait_for_tick { 3991sub wait_for_tick {
3770 return if tick_inhibit || $Coro::current == $Coro::main; 3992 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3771 3993
3772 my $signal = new Coro::Signal; 3994 my $signal = new Coro::Signal;
3773 push @WAIT_FOR_TICK, $signal; 3995 push @WAIT_FOR_TICK, $signal;
3774 $signal->wait; 3996 $signal->wait;
3775} 3997}
3776 3998
3777sub wait_for_tick_begin { 3999sub wait_for_tick_begin {
3778 return if tick_inhibit || $Coro::current == $Coro::main; 4000 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3779 4001
3780 my $signal = new Coro::Signal; 4002 my $signal = new Coro::Signal;
3781 push @WAIT_FOR_TICK_BEGIN, $signal; 4003 push @WAIT_FOR_TICK_BEGIN, $signal;
3782 $signal->wait; 4004 $signal->wait;
3783} 4005}
… …
3789 return; 4011 return;
3790 } 4012 }
3791 4013
3792 cf::server_tick; # one server iteration 4014 cf::server_tick; # one server iteration
3793 4015
4016 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4017
3794 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4018 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3795 $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.;
3796 Coro::async_pool { 4020 Coro::async_pool {
3797 $Coro::current->{desc} = "runtime saver"; 4021 $Coro::current->{desc} = "runtime saver";
3798 write_runtime_sync 4022 write_runtime_sync
3799 or warn "ERROR: unable to write runtime file: $!"; 4023 or error "ERROR: unable to write runtime file: $!";
3800 }; 4024 };
3801 } 4025 }
3802 4026
3803 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4027 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3804 $sig->send; 4028 $sig->send;
… …
3812 4036
3813 if (0) { 4037 if (0) {
3814 if ($NEXT_TICK) { 4038 if ($NEXT_TICK) {
3815 my $jitter = $TICK_START - $NEXT_TICK; 4039 my $jitter = $TICK_START - $NEXT_TICK;
3816 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4040 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3817 warn "jitter $JITTER\n";#d# 4041 debug "jitter $JITTER\n";#d#
3818 } 4042 }
3819 } 4043 }
3820} 4044}
3821 4045
3822{ 4046{
3823 # configure BDB 4047 # configure BDB
3824 4048
3825 BDB::min_parallel 8; 4049 BDB::min_parallel 16;
3826 BDB::max_poll_reqs $TICK * 0.1; 4050 BDB::max_poll_reqs $TICK * 0.1;
3827 $AnyEvent::BDB::WATCHER->priority (1); 4051 $AnyEvent::BDB::WATCHER->priority (1);
3828 4052
3829 unless ($DB_ENV) { 4053 unless ($DB_ENV) {
3830 $DB_ENV = BDB::db_env_create; 4054 $DB_ENV = BDB::db_env_create;
… …
3877 $msg =~ s/\n//; 4101 $msg =~ s/\n//;
3878 4102
3879 # limit the # of concurrent backtraces 4103 # limit the # of concurrent backtraces
3880 if ($_log_backtrace < 2) { 4104 if ($_log_backtrace < 2) {
3881 ++$_log_backtrace; 4105 ++$_log_backtrace;
4106 my $perl_bt = Carp::longmess $msg;
3882 async { 4107 async {
3883 $Coro::current->{desc} = "abt $msg"; 4108 $Coro::current->{desc} = "abt $msg";
3884 4109
3885 my @bt = fork_call { 4110 my @bt = fork_call {
3886 @addr = map { sprintf "%x", $_ } @addr; 4111 @addr = map { sprintf "%x", $_ } @addr;
… …
3897 } 4122 }
3898 4123
3899 @funcs 4124 @funcs
3900 }; 4125 };
3901 4126
3902 LOG llevInfo, "[ABT] $msg\n"; 4127 LOG llevInfo, "[ABT] $perl_bt\n";
4128 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3903 LOG llevInfo, "[ABT] $_\n" for @bt; 4129 LOG llevInfo, "[ABT] $_\n" for @bt;
3904 --$_log_backtrace; 4130 --$_log_backtrace;
3905 }; 4131 };
3906 } else { 4132 } else {
3907 LOG llevInfo, "[ABT] $msg\n"; 4133 LOG llevInfo, "[ABT] $msg\n";
3908 LOG llevInfo, "[ABT] [suppressed]\n"; 4134 LOG llevInfo, "[ABT] [suppressed]\n";
3909 } 4135 }
3910} 4136}
3911 4137
3912# load additional modules 4138# load additional modules
3913use cf::pod; 4139require "cf/$_.pm" for @EXTRA_MODULES;
4140cf::_connect_to_perl_2;
3914 4141
3915END { cf::emergency_save } 4142END { cf::emergency_save }
3916 4143
39171 41441
3918 4145

Diff Legend

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