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.412 by root, Wed Apr 2 11:13:55 2008 UTC vs.
Revision 1.523 by root, Sat Apr 17 02:39:46 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
25use 5.10.0;
24use utf8; 26use utf8;
25use strict; 27use strict qw(vars subs);
26 28
27use Symbol; 29use Symbol;
28use List::Util; 30use List::Util;
29use Socket; 31use Socket;
30use EV 1.86; 32use EV;
31use Opcode; 33use Opcode;
32use Safe; 34use Safe;
33use Safe::Hole; 35use Safe::Hole;
34use Storable (); 36use Storable ();
37use Carp ();
35 38
39use Guard ();
36use Coro 4.32 (); 40use Coro ();
37use Coro::State; 41use Coro::State;
38use Coro::Handle; 42use Coro::Handle;
39use Coro::EV; 43use Coro::EV;
44use Coro::AnyEvent;
40use Coro::Timer; 45use Coro::Timer;
41use Coro::Signal; 46use Coro::Signal;
42use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
43use Coro::AIO; 50use Coro::AIO;
44use Coro::BDB; 51use Coro::BDB 1.6;
45use Coro::Storable; 52use Coro::Storable;
46use Coro::Util (); 53use Coro::Util ();
47 54
48use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
49use BDB (); 56use BDB ();
50use Data::Dumper; 57use Data::Dumper;
51use Digest::MD5;
52use Fcntl; 58use Fcntl;
53use YAML (); 59use YAML::XS ();
54use IO::AIO 2.51 (); 60use IO::AIO ();
55use Time::HiRes; 61use Time::HiRes;
56use Compress::LZF; 62use Compress::LZF;
57use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
58 66
59# configure various modules to our taste 67# configure various modules to our taste
60# 68#
61$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
62Coro::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";
63Compress::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
64 77
65$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" };
66 80
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 82
69our %COMMAND = (); 83our %COMMAND = ();
70our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
73our %EXTCMD = (); 87our %EXTCMD = ();
74our %EXTICMD = (); 88our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
77 91
78our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
80 96
81our $CONFDIR = confdir; 97our $CONFDIR = confdir;
82our $DATADIR = datadir; 98our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
92our %RESOURCE; 111our %RESOURCE;
93 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 118our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
99 120
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 124our $DB_ENV;
105 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
106our %CFG; 128our %CFG;
107 129
108our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 131our $RUNTIME;
110our $NOW; 132our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 143our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
123 145
146our @POST_INIT;
147
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
150
124binmode STDOUT; 151binmode STDOUT;
125binmode STDERR; 152binmode STDERR;
126 153
127# read virtual server time, if available 154# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 155unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 156 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
132} 159}
160
161eval "sub TICK() { $TICK } 1" or die;
133 162
134mkdir $_ 163mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 165
137our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
138 167
139sub cf::map::normalise; 168sub cf::map::normalise;
169
170sub in_main() {
171 $Coro::current == $Coro::main
172}
173
174#############################################################################
175
176%REFLECT = ();
177for (@REFLECT) {
178 my $reflect = JSON::XS::decode_json $_;
179 $REFLECT{$reflect->{class}} = $reflect;
180}
181
182# this is decidedly evil
183$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
140 184
141############################################################################# 185#############################################################################
142 186
143=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
144 188
191returns directly I<after> the tick processing (and consequently, can only wake one process 235returns directly I<after> the tick processing (and consequently, can only wake one process
192per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 236per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
193 237
194=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
195 239
196This array contains the results of the last C<invoke ()> call. When 240This array contains the results of the last C<invoke ()> call. When
197C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call. 242that call.
199 243
244=item %cf::REFLECT
245
246Contains, for each (C++) class name, a hash reference with information
247about object members (methods, scalars, arrays and flags) and other
248metadata, which is useful for introspection.
249
200=back 250=back
201 251
202=cut 252=cut
203 253
204BEGIN { 254$Coro::State::WARNHOOK = sub {
205 *CORE::GLOBAL::warn = sub {
206 my $msg = join "", @_; 255 my $msg = join "", @_;
207 256
208 $msg .= "\n" 257 $msg .= "\n"
209 unless $msg =~ /\n$/; 258 unless $msg =~ /\n$/;
210 259
211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 260 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
212 261
213 LOG llevError, $msg; 262 LOG llevError, $msg;
214 }; 263};
215}
216 264
217$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 266 return unless $^S eq 0; # "eq", not "=="
219 267
220 if ($Coro::current == $Coro::main) {#d# 268 warn Carp::longmess $_[0];
269
270 if (in_main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 272 return;#d#
223 }#d# 273 }#d#
224 274
225 # kill coroutine otherwise 275 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 276 Coro::terminate
228}; 277};
229
230$SIG{__DIE__} = sub { }; #d#?
231 278
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 279@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 280@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 281@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 282@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 289for my $pkg (qw(
243 cf::global cf::attachable 290 cf::global cf::attachable
244 cf::object cf::object::player 291 cf::object cf::object::player
245 cf::client cf::player 292 cf::client cf::player
246 cf::arch cf::living 293 cf::arch cf::living
294 cf::map cf::mapspace
247 cf::map cf::party cf::region 295 cf::party cf::region
248)) { 296)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 298}
252 299
253$EV::DIED = sub { 300$EV::DIED = sub {
254 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
255}; 302};
256 303
257############################################################################# 304#############################################################################
258 305
259=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 343our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 344
298sub encode_json($) { $json_coder->encode ($_[0]) } 345sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 346sub decode_json($) { $json_coder->decode ($_[0]) }
300 347
348=item cf::post_init { BLOCK }
349
350Execute the given codeblock, I<after> all extensions have been (re-)loaded,
351but I<before> the server starts ticking again.
352
353The cdoeblock will have a single boolean argument to indicate whether this
354is a reload or not.
355
356=cut
357
358sub post_init(&) {
359 push @POST_INIT, shift;
360}
361
301=item cf::lock_wait $string 362=item cf::lock_wait $string
302 363
303Wait until the given lock is available. See cf::lock_acquire. 364Wait until the given lock is available. See cf::lock_acquire.
304 365
305=item my $lock = cf::lock_acquire $string 366=item my $lock = cf::lock_acquire $string
306 367
307Wait until the given lock is available and then acquires it and returns 368Wait until the given lock is available and then acquires it and returns
308a Coro::guard object. If the guard object gets destroyed (goes out of scope, 369a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 370for example when the coroutine gets canceled), the lock is automatically
310returned. 371returned.
311 372
312Locks are *not* recursive, locking from the same coro twice results in a 373Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 374deadlocked coro.
319 380
320Return true if the lock is currently active, i.e. somebody has locked it. 381Return true if the lock is currently active, i.e. somebody has locked it.
321 382
322=cut 383=cut
323 384
324our %LOCK; 385our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 386
327sub lock_wait($) { 387sub lock_wait($) {
328 my ($key) = @_; 388 $LOCKS->wait ($_[0]);
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
334
335 # wait for lock, if any
336 while ($LOCK{$key}) {
337 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule;
339 }
340} 389}
341 390
342sub lock_acquire($) { 391sub lock_acquire($) {
343 my ($key) = @_; 392 $LOCKS->guard ($_[0])
344
345 # wait, to be sure we are not locked
346 lock_wait $key;
347
348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
350
351 Coro::guard {
352 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} };
355 }
356} 393}
357 394
358sub lock_active($) { 395sub lock_active($) {
359 my ($key) = @_; 396 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 397}
363 398
364sub freeze_mainloop { 399sub freeze_mainloop {
365 tick_inhibit_inc; 400 tick_inhibit_inc;
366 401
367 Coro::guard \&tick_inhibit_dec; 402 &Guard::guard (\&tick_inhibit_dec);
368} 403}
369 404
370=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
371 406
372Like EV::periodic, but randomly selects a starting point so that the actions 407Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer. 408get spread over time.
374 409
375=cut 410=cut
376 411
377sub periodic($$) { 412sub periodic($$) {
378 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
395 430
396=cut 431=cut
397 432
398our @SLOT_QUEUE; 433our @SLOT_QUEUE;
399our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
400 436
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
404 440
405 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
406 443
407 while () { 444 while () {
408 next_job: 445 next_job:
446
409 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 448
411 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 453 $job->[2]->send;
415 Coro::cede; 454 Coro::cede;
416 goto next_job; 455 goto next_job;
417 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 458 }
419 } 459 }
420 460
421 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive 462 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait; 464 $signal->wait;
425 } else { 465 } else {
466 $busy = 0;
426 Coro::schedule; 467 Coro::schedule;
427 } 468 }
428 } 469 }
429}; 470};
430 471
431sub get_slot($;$$) { 472sub get_slot($;$$) {
473 return if tick_inhibit || $Coro::current == $Coro::main;
474
432 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
433 476
434 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
435 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
436 480
437 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
438 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
439 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
466 510
467sub sync_job(&) { 511sub sync_job(&) {
468 my ($job) = @_; 512 my ($job) = @_;
469 513
470 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
471 my $time = EV::time; 515 my $time = AE::time;
472 516
473 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
474 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
475 519
476 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
493 } else { 537 } else {
494 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
495 } 539 }
496 } 540 }
497 541
498 my $time = EV::time - $time; 542 my $time = AE::time - $time;
499 543
500 $TICK_START += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
501 545
502 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
503 } else { 547 } else {
547 reset_signals; 591 reset_signals;
548 &$cb 592 &$cb
549 }, @args; 593 }, @args;
550 594
551 wantarray ? @res : $res[-1] 595 wantarray ? @res : $res[-1]
596}
597
598sub objinfo {
599 (
600 "counter value" => cf::object::object_count,
601 "objects created" => cf::object::create_count,
602 "objects destroyed" => cf::object::destroy_count,
603 "freelist size" => cf::object::free_count,
604 "allocated objects" => cf::object::objects_size,
605 "active objects" => cf::object::actives_size,
606 )
607}
608
609=item $coin = coin_from_name $name
610
611=cut
612
613our %coin_alias = (
614 "silver" => "silvercoin",
615 "silvercoin" => "silvercoin",
616 "silvercoins" => "silvercoin",
617 "gold" => "goldcoin",
618 "goldcoin" => "goldcoin",
619 "goldcoins" => "goldcoin",
620 "platinum" => "platinacoin",
621 "platinumcoin" => "platinacoin",
622 "platinumcoins" => "platinacoin",
623 "platina" => "platinacoin",
624 "platinacoin" => "platinacoin",
625 "platinacoins" => "platinacoin",
626 "royalty" => "royalty",
627 "royalties" => "royalty",
628);
629
630sub coin_from_name($) {
631 $coin_alias{$_[0]}
632 ? cf::arch::find $coin_alias{$_[0]}
633 : undef
552} 634}
553 635
554=item $value = cf::db_get $family => $key 636=item $value = cf::db_get $family => $key
555 637
556Returns a single value from the environment database. 638Returns a single value from the environment database.
695 777
696############################################################################# 778#############################################################################
697 779
698=head2 ATTACHABLE OBJECTS 780=head2 ATTACHABLE OBJECTS
699 781
700Many objects in crossfire are so-called attachable objects. That means you can 782Many objects in deliantra are so-called attachable objects. That means you can
701attach callbacks/event handlers (a collection of which is called an "attachment") 783attach callbacks/event handlers (a collection of which is called an "attachment")
702to it. All such attachable objects support the following methods. 784to it. All such attachable objects support the following methods.
703 785
704In the following description, CLASS can be any of C<global>, C<object> 786In the following description, CLASS can be any of C<global>, C<object>
705C<player>, C<client> or C<map> (i.e. the attachable objects in 787C<player>, C<client> or C<map> (i.e. the attachable objects in
755=item cf::CLASS::attachment $name, ... 837=item cf::CLASS::attachment $name, ...
756 838
757Register an attachment by C<$name> through which attachable objects of the 839Register an attachment by C<$name> through which attachable objects of the
758given CLASS can refer to this attachment. 840given CLASS can refer to this attachment.
759 841
760Some classes such as crossfire maps and objects can specify attachments 842Some classes such as deliantra maps and objects can specify attachments
761that are attached at load/instantiate time, thus the need for a name. 843that are attached at load/instantiate time, thus the need for a name.
762 844
763These calls expect any number of the following handler/hook descriptions: 845These calls expect any number of the following handler/hook descriptions:
764 846
765=over 4 847=over 4
1056 1138
1057sub reattach { 1139sub reattach {
1058 # basically do the same as instantiate, without calling instantiate 1140 # basically do the same as instantiate, without calling instantiate
1059 my ($obj) = @_; 1141 my ($obj) = @_;
1060 1142
1143 # no longer needed after getting rid of delete_package?
1061 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1144 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1062 1145
1063 my $registry = $obj->registry; 1146 my $registry = $obj->registry;
1064 1147
1065 @$registry = (); 1148 @$registry = ();
1066 1149
1112 utf8::decode (my $decname = $filename); 1195 utf8::decode (my $decname = $filename);
1113 warn sprintf "saving %s (%d,%d)\n", 1196 warn sprintf "saving %s (%d,%d)\n",
1114 $decname, length $$rdata, scalar @$objs; 1197 $decname, length $$rdata, scalar @$objs;
1115 1198
1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1117 chmod SAVE_MODE, $fh; 1200 aio_chmod $fh, SAVE_MODE;
1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1119 aio_fsync $fh if $cf::USE_FSYNC; 1202 if ($cf::USE_FSYNC) {
1203 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;
1204 aio_fsync $fh;
1205 }
1120 close $fh; 1206 aio_close $fh;
1121 1207
1122 if (@$objs) { 1208 if (@$objs) {
1123 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1209 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1124 chmod SAVE_MODE, $fh; 1210 aio_chmod $fh, SAVE_MODE;
1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1211 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1126 aio_write $fh, 0, (length $data), $data, 0; 1212 aio_write $fh, 0, (length $data), $data, 0;
1127 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1215 aio_fsync $fh;
1216 }
1128 close $fh; 1217 aio_close $fh;
1129 aio_rename "$filename.pst~", "$filename.pst"; 1218 aio_rename "$filename.pst~", "$filename.pst";
1130 } 1219 }
1131 } else { 1220 } else {
1132 aio_unlink "$filename.pst"; 1221 aio_unlink "$filename.pst";
1133 } 1222 }
1134 1223
1135 aio_rename "$filename~", $filename; 1224 aio_rename "$filename~", $filename;
1225
1226 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC;
1136 } else { 1228 } else {
1137 warn "FATAL: $filename~: $!\n"; 1229 warn "unable to save objects: $filename~: $!\n";
1138 } 1230 }
1139 } else { 1231 } else {
1140 aio_unlink $filename; 1232 aio_unlink $filename;
1141 aio_unlink "$filename.pst"; 1233 aio_unlink "$filename.pst";
1142 } 1234 }
1233 my ($name, $cb) = @_; 1325 my ($name, $cb) = @_;
1234 1326
1235 $EXTICMD{$name} = $cb; 1327 $EXTICMD{$name} = $cb;
1236} 1328}
1237 1329
1330use File::Glob ();
1331
1238cf::player->attach ( 1332cf::player->attach (
1239 on_command => sub { 1333 on_unknown_command => sub {
1240 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1241 1335
1242 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1243 or return; 1337 or return;
1244 1338
1274 1368
1275 cf::override; 1369 cf::override;
1276 }, 1370 },
1277); 1371);
1278 1372
1373# "readahead" all extensions
1374sub cache_extensions {
1375 my $grp = IO::AIO::aio_group;
1376
1377 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1378 for (grep /\.ext$/, @{$_[0]}) {
1379 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1380 }
1381 };
1382
1383 $grp
1384}
1385
1279sub load_extensions { 1386sub load_extensions {
1280 cf::sync_job { 1387 cf::sync_job {
1281 my %todo; 1388 my %todo;
1282 1389
1283 for my $path (<$LIBDIR/*.ext>) { 1390 for my $path (<$LIBDIR/*.ext>) {
1302 1409
1303 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1304 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1305 1412
1306 $ext{source} = 1413 $ext{source} =
1307 "package $pkg; use strict; use utf8;\n" 1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1308 . "#line 1 \"$path\"\n{\n" 1415 . "#line 1 \"$path\"\n{\n"
1309 . $source 1416 . $source
1310 . "\n};\n1"; 1417 . "\n};\n1";
1311 1418
1312 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1313 } 1420 }
1314 1421
1422 my $pass = 0;
1315 my %done; 1423 my %done;
1316 while (%todo) { 1424 while (%todo) {
1317 my $progress; 1425 my $progress;
1318 1426
1427 ++$pass;
1428
1429 ext:
1319 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1320 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1321 goto skip 1432 next ext
1322 unless exists $done{$_}; 1433 unless exists $done{$_};
1323 } 1434 }
1324 1435
1325 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1326 1437
1327 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1328 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1329 : "$v->{base}: extension inactive.\n";
1330 1442
1331 if (exists $v->{meta}{mandatory}) {
1332 warn $msg;
1333 cf::cleanup "mandatory extension failed to load, exiting."; 1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1334 } 1444 if exists $v->{meta}{mandatory};
1335 1445
1336 warn $msg; 1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1447 delete $todo{$k};
1448 } else {
1449 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg};
1451 $progress = 1;
1452
1453 warn "$v->{base}: extension inactive.\n"
1454 unless $active;
1337 } 1455 }
1338
1339 $done{$k} = delete $todo{$k};
1340 push @EXTS, $v->{pkg};
1341 $progress = 1;
1342 } 1456 }
1343 1457
1344 skip: 1458 unless ($progress) {
1345 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1346 unless $progress; 1460
1461 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory};
1464 }
1465 }
1347 } 1466 }
1348 }; 1467 };
1349} 1468}
1350 1469
1351############################################################################# 1470#############################################################################
1352 1471
1353=back 1472=back
1354 1473
1355=head2 CORE EXTENSIONS 1474=head2 CORE EXTENSIONS
1356 1475
1357Functions and methods that extend core crossfire objects. 1476Functions and methods that extend core deliantra objects.
1358 1477
1359=cut 1478=cut
1360 1479
1361package cf::player; 1480package cf::player;
1362 1481
1405 1524
1406sub exists($) { 1525sub exists($) {
1407 my ($login) = @_; 1526 my ($login) = @_;
1408 1527
1409 $cf::PLAYER{$login} 1528 $cf::PLAYER{$login}
1410 or cf::sync_job { !aio_stat path $login } 1529 or !aio_stat path $login
1411} 1530}
1412 1531
1413sub find($) { 1532sub find($) {
1414 return $cf::PLAYER{$_[0]} || do { 1533 return $cf::PLAYER{$_[0]} || do {
1415 my $login = $_[0]; 1534 my $login = $_[0];
1427 my $f = new_from_file cf::object::thawer path $login 1546 my $f = new_from_file cf::object::thawer path $login
1428 or return; 1547 or return;
1429 1548
1430 my $pl = cf::player::load_pl $f 1549 my $pl = cf::player::load_pl $f
1431 or return; 1550 or return;
1551
1432 local $cf::PLAYER_LOADING{$login} = $pl; 1552 local $cf::PLAYER_LOADING{$login} = $pl;
1433 $f->resolve_delayed_derefs; 1553 $f->resolve_delayed_derefs;
1434 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1435 } 1555 }
1436 } 1556 }
1437} 1557}
1438 1558
1559cf::player->attach (
1560 on_load => sub {
1561 my ($pl, $path) = @_;
1562
1563 # restore slots saved in save, below
1564 my $slots = delete $pl->{_slots};
1565
1566 $pl->ob->current_weapon ($slots->[0]);
1567 $pl->combat_ob ($slots->[1]);
1568 $pl->ranged_ob ($slots->[2]);
1569 },
1570);
1571
1439sub save($) { 1572sub save($) {
1440 my ($pl) = @_; 1573 my ($pl) = @_;
1441 1574
1442 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1443 1576
1446 1579
1447 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1448 1581
1449 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1450 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1584
1585 cf::get_slot 0.01;
1586
1587 # save slots, to be restored later
1588 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1451 1589
1452 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1453 cf::cede_to_tick; 1591 cf::cede_to_tick;
1454} 1592}
1455 1593
1487 my ($pl) = @_; 1625 my ($pl) = @_;
1488 1626
1489 my $name = $pl->ob->name; 1627 my $name = $pl->ob->name;
1490 1628
1491 $pl->{deny_save} = 1; 1629 $pl->{deny_save} = 1;
1492 $pl->password ("*"); # this should lock out the player until we nuked the dir 1630 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1493 1631
1494 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1495 $pl->deactivate; 1633 $pl->deactivate;
1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635 $pl->ob->check_score;
1496 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1636 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1497 $pl->ns->destroy if $pl->ns; 1637 $pl->ns->destroy if $pl->ns;
1498 1638
1499 my $path = playerdir $pl; 1639 my $path = playerdir $pl;
1500 my $temp = "$path~$cf::RUNTIME~deleting~"; 1640 my $temp = "$path~$cf::RUNTIME~deleting~";
1539 1679
1540 for my $login (@$dirs) { 1680 for my $login (@$dirs) {
1541 my $path = path $login; 1681 my $path = path $login;
1542 1682
1543 # a .pst is a dead give-away for a valid player 1683 # a .pst is a dead give-away for a valid player
1544 unless (-e "$path.pst") { 1684 # if no pst file found, open and chekc for blocked users
1685 if (aio_stat "$path.pst") {
1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1686 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1546 aio_read $fh, 0, 512, my $buf, 0 or next; 1687 aio_read $fh, 0, 512, my $buf, 0 or next;
1547 $buf !~ /^password -------------$/m or next; # official not-valid tag 1688 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 } 1689 }
1549 1690
1553 1694
1554 \@logins 1695 \@logins
1555} 1696}
1556 1697
1557=item $player->maps 1698=item $player->maps
1699
1700=item cf::player::maps $login
1558 1701
1559Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1560player. May block. 1703player. May block.
1561 1704
1562=cut 1705=cut
1580 } 1723 }
1581 1724
1582 \@paths 1725 \@paths
1583} 1726}
1584 1727
1585=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1728=item $protocol_xml = $player->expand_cfpod ($cfpod)
1586 1729
1587Expand crossfire pod fragments into protocol xml. 1730Expand deliantra pod fragments into protocol xml.
1588
1589=cut
1590
1591use re 'eval';
1592
1593my $group;
1594my $interior; $interior = qr{
1595 # match a pod interior sequence sans C<< >>
1596 (?:
1597 \ (.*?)\ (?{ $group = $^N })
1598 | < (??{$interior}) >
1599 )
1600}x;
1601
1602sub expand_cfpod {
1603 my ($self, $pod) = @_;
1604
1605 my $xml;
1606
1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1610
1611 $group =~ s/&/&amp;/g;
1612 $group =~ s/</&lt;/g;
1613
1614 $xml .= $group;
1615 } elsif ($pod =~ m%\G
1616 ([BCGHITU])
1617 <
1618 (?:
1619 ([^<>]*) (?{ $group = $^N })
1620 | < $interior >
1621 )
1622 >
1623 %gcsx
1624 ) {
1625 my ($code, $data) = ($1, $group);
1626
1627 if ($code eq "B") {
1628 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1629 } elsif ($code eq "I") {
1630 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1631 } elsif ($code eq "U") {
1632 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1633 } elsif ($code eq "C") {
1634 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1635 } elsif ($code eq "T") {
1636 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1637 } elsif ($code eq "G") {
1638 my ($male, $female) = split /\|/, $data;
1639 $data = $self->gender ? $female : $male;
1640 $xml .= expand_cfpod ($self, $data);
1641 } elsif ($code eq "H") {
1642 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1644 "")
1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1654 }
1655 }
1656
1657 for ($xml) {
1658 # create single paragraphs (very hackish)
1659 s/(?<=\S)\n(?=\w)/ /g;
1660
1661 # compress some whitespace
1662 s/\s+\n/\n/g; # ws line-ends
1663 s/\n\n+/\n/g; # double lines
1664 s/^\n+//; # beginning lines
1665 s/\n+$//; # ending lines
1666 }
1667
1668 $xml
1669}
1670
1671no re 'eval';
1672
1673sub hintmode {
1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1675 $_[0]{hintmode}
1676}
1677 1731
1678=item $player->ext_reply ($msgid, @msg) 1732=item $player->ext_reply ($msgid, @msg)
1679 1733
1680Sends an ext reply to the player. 1734Sends an ext reply to the player.
1681 1735
1713 1767
1714=cut 1768=cut
1715 1769
1716sub find_by_path($) { 1770sub find_by_path($) {
1717 my ($path) = @_; 1771 my ($path) = @_;
1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1718 1774
1719 my ($match, $specificity); 1775 my ($match, $specificity);
1720 1776
1721 for my $region (list) { 1777 for my $region (list) {
1722 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
1748our $MAX_RESET = 3600; 1804our $MAX_RESET = 3600;
1749our $DEFAULT_RESET = 3000; 1805our $DEFAULT_RESET = 3000;
1750 1806
1751sub generate_random_map { 1807sub generate_random_map {
1752 my ($self, $rmp) = @_; 1808 my ($self, $rmp) = @_;
1809
1810 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1811
1753 # mit "rum" bekleckern, nicht 1812 # mit "rum" bekleckern, nicht
1754 $self->_create_random_map ( 1813 $self->_create_random_map (
1755 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1756 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1757 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1758 $rmp->{exit_on_final_map}, 1817 $rmp->{exit_on_final_map},
1759 $rmp->{xsize}, $rmp->{ysize}, 1818 $rmp->{xsize}, $rmp->{ysize},
1760 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1761 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1879 1938
1880# the temporary/swap location 1939# the temporary/swap location
1881sub save_path { 1940sub save_path {
1882 my ($self) = @_; 1941 my ($self) = @_;
1883 1942
1884 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1943 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1885 "$TMPDIR/$path.map" 1944 "$TMPDIR/$path.map"
1886} 1945}
1887 1946
1888# the unique path, undef == no special unique path 1947# the unique path, undef == no special unique path
1889sub uniq_path { 1948sub uniq_path {
1890 my ($self) = @_; 1949 my ($self) = @_;
1891 1950
1892 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1951 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1893 "$UNIQUEDIR/$path" 1952 "$UNIQUEDIR/$path"
1894}
1895
1896# and all this just because we cannot iterate over
1897# all maps in C++...
1898sub change_all_map_light {
1899 my ($change) = @_;
1900
1901 $_->change_map_light ($change)
1902 for grep $_->outdoor, values %cf::MAP;
1903} 1953}
1904 1954
1905sub decay_objects { 1955sub decay_objects {
1906 my ($self) = @_; 1956 my ($self) = @_;
1907 1957
1991sub find { 2041sub find {
1992 my ($path, $origin) = @_; 2042 my ($path, $origin) = @_;
1993 2043
1994 $path = normalise $path, $origin && $origin->path; 2044 $path = normalise $path, $origin && $origin->path;
1995 2045
1996 cf::lock_wait "map_data:$path";#d#remove 2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1997 cf::lock_wait "map_find:$path"; 2047 my $guard2 = cf::lock_acquire "map_find:$path";
1998 2048
1999 $cf::MAP{$path} || do { 2049 $cf::MAP{$path} || do {
2000 my $guard1 = cf::lock_acquire "map_find:$path";
2001 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2002
2003 my $map = new_from_path cf::map $path 2050 my $map = new_from_path cf::map $path
2004 or return; 2051 or return;
2005 2052
2006 $map->{last_save} = $cf::RUNTIME; 2053 $map->{last_save} = $cf::RUNTIME;
2007 2054
2009 or return; 2056 or return;
2010 2057
2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2058 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2012 # doing this can freeze the server in a sync job, obviously 2059 # doing this can freeze the server in a sync job, obviously
2013 #$cf::WAIT_FOR_TICK->wait; 2060 #$cf::WAIT_FOR_TICK->wait;
2061 undef $guard2;
2014 undef $guard1; 2062 undef $guard1;
2015 undef $guard2;
2016 $map->reset; 2063 $map->reset;
2017 return find $path; 2064 return find $path;
2018 } 2065 }
2019 2066
2020 $cf::MAP{$path} = $map 2067 $cf::MAP{$path} = $map
2021 } 2068 }
2022} 2069}
2023 2070
2024sub pre_load { } 2071sub pre_load { }
2025sub post_load { } 2072#sub post_load { } # XS
2026 2073
2027sub load { 2074sub load {
2028 my ($self) = @_; 2075 my ($self) = @_;
2029 2076
2030 local $self->{deny_reset} = 1; # loading can take a long time 2077 local $self->{deny_reset} = 1; # loading can take a long time
2047 my $f = new_from_file cf::object::thawer $self->{load_path}; 2094 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block; 2095 $f->skip_block;
2049 $self->_load_objects ($f) 2096 $self->_load_objects ($f)
2050 or return; 2097 or return;
2051 2098
2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2099 $self->post_load_original
2053 if delete $self->{load_original}; 2100 if delete $self->{load_original};
2054 2101
2055 if (my $uniq = $self->uniq_path) { 2102 if (my $uniq = $self->uniq_path) {
2056 utf8::encode $uniq; 2103 utf8::encode $uniq;
2057 unless (aio_stat $uniq) { 2104 unless (aio_stat $uniq) {
2075 unless ($self->{deny_activate}) { 2122 unless ($self->{deny_activate}) {
2076 $self->decay_objects; 2123 $self->decay_objects;
2077 $self->fix_auto_apply; 2124 $self->fix_auto_apply;
2078 $self->update_buttons; 2125 $self->update_buttons;
2079 cf::cede_to_tick; 2126 cf::cede_to_tick;
2080 $self->set_darkness_map;
2081 cf::cede_to_tick;
2082 $self->activate; 2127 $self->activate;
2083 } 2128 }
2084 2129
2085 $self->{last_save} = $cf::RUNTIME; 2130 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME); 2131 $self->last_access ($cf::RUNTIME);
2087 2132
2088 $self->in_memory (cf::MAP_IN_MEMORY); 2133 $self->in_memory (cf::MAP_ACTIVE);
2089 } 2134 }
2090 2135
2091 $self->post_load; 2136 $self->post_load;
2092} 2137}
2093 2138
2139# customize the map for a given player, i.e.
2140# return the _real_ map. used by e.g. per-player
2141# maps to change the path to ~playername/mappath
2094sub customise_for { 2142sub customise_for {
2095 my ($self, $ob) = @_; 2143 my ($self, $ob) = @_;
2096 2144
2097 return find "~" . $ob->name . "/" . $self->{path} 2145 return find "~" . $ob->name . "/" . $self->{path}
2098 if $self->per_player; 2146 if $self->per_player;
2151 my ($path, $origin, $load) = @_; 2199 my ($path, $origin, $load) = @_;
2152 2200
2153 $path = normalise $path, $origin && $origin->{path}; 2201 $path = normalise $path, $origin && $origin->{path};
2154 2202
2155 if (my $map = $cf::MAP{$path}) { 2203 if (my $map = $cf::MAP{$path}) {
2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2204 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2157 } 2205 }
2158 2206
2159 $MAP_PREFETCH{$path} |= $load; 2207 $MAP_PREFETCH{$path} |= $load;
2160 2208
2161 $MAP_PREFETCHER ||= cf::async { 2209 $MAP_PREFETCHER ||= cf::async {
2175 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
2176 2224
2177 () 2225 ()
2178} 2226}
2179 2227
2228# common code, used by both ->save and ->swapout
2180sub save { 2229sub _save {
2181 my ($self) = @_; 2230 my ($self) = @_;
2182
2183 my $lock = cf::lock_acquire "map_data:$self->{path}";
2184 2231
2185 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2186 2233
2187 return unless $self->dirty; 2234 return unless $self->dirty;
2188 2235
2197 2244
2198 cf::async { 2245 cf::async {
2199 $Coro::current->{desc} = "map player save"; 2246 $Coro::current->{desc} = "map player save";
2200 $_->contr->save for $self->players; 2247 $_->contr->save for $self->players;
2201 }; 2248 };
2249
2250 cf::get_slot 0.02;
2202 2251
2203 if ($uniq) { 2252 if ($uniq) {
2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2253 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2205 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2254 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2206 } else { 2255 } else {
2207 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2256 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2208 } 2257 }
2209} 2258}
2210 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2211sub swap_out { 2268sub swap_out {
2212 my ($self) = @_; 2269 my ($self) = @_;
2213 2270
2214 # save first because save cedes
2215 $self->save;
2216
2217 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2272
2273 return if $self->in_memory != cf::MAP_ACTIVE;
2274 return if $self->{deny_save};
2219 return if $self->players; 2275 return if $self->players;
2220 return if $self->in_memory != cf::MAP_IN_MEMORY;
2221 return if $self->{deny_save};
2222 2276
2223 $self->in_memory (cf::MAP_SWAPPED); 2277 # first deactivate the map and "unlink" it from the core
2224
2225 $self->deactivate; 2278 $self->deactivate;
2226 $_->clear_links_to ($self) for values %cf::MAP; 2279 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->in_memory (cf::MAP_SWAPPED);
2281
2282 # then atomically save
2283 $self->_save;
2284
2285 # then free the map
2227 $self->clear; 2286 $self->clear;
2228} 2287}
2229 2288
2230sub reset_at { 2289sub reset_at {
2231 my ($self) = @_; 2290 my ($self) = @_;
2250 2309
2251 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2252 2311
2253 return if $self->players; 2312 return if $self->players;
2254 2313
2255 warn "resetting map ", $self->path; 2314 warn "resetting map ", $self->path, "\n";
2256 2315
2257 $self->in_memory (cf::MAP_SWAPPED); 2316 $self->in_memory (cf::MAP_SWAPPED);
2258 2317
2259 # need to save uniques path 2318 # need to save uniques path
2260 unless ($self->{deny_save}) { 2319 unless ($self->{deny_save}) {
2343 2402
2344sub unique_maps() { 2403sub unique_maps() {
2345 [ 2404 [
2346 map { 2405 map {
2347 utf8::decode $_; 2406 utf8::decode $_;
2348 /\.map$/ 2407 s/\.map$//; # TODO future compatibility hack
2408 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2409 ? ()
2349 ? normalise $_ 2410 : normalise $_
2350 : ()
2351 } @{ aio_readdir $UNIQUEDIR or [] } 2411 } @{ aio_readdir $UNIQUEDIR or [] }
2352 ] 2412 ]
2353} 2413}
2354 2414
2355package cf; 2415=item cf::map::static_maps
2416
2417Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2418file in the shared directory excluding F</styles> and F</editor>). May
2419block.
2420
2421=cut
2422
2423sub static_maps() {
2424 my @dirs = "";
2425 my @maps;
2426
2427 while (@dirs) {
2428 my $dir = shift @dirs;
2429
2430 next if $dir eq "/styles" || $dir eq "/editor";
2431
2432 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2433 or return;
2434
2435 for (@$files) {
2436 s/\.map$// or next;
2437 utf8::decode $_;
2438 push @maps, "$dir/$_";
2439 }
2440
2441 push @dirs, map "$dir/$_", @$dirs;
2442 }
2443
2444 \@maps
2445}
2356 2446
2357=back 2447=back
2358 2448
2359=head3 cf::object 2449=head3 cf::object
2360 2450
2364 2454
2365=over 4 2455=over 4
2366 2456
2367=item $ob->inv_recursive 2457=item $ob->inv_recursive
2368 2458
2369Returns the inventory of the object _and_ their inventories, recursively. 2459Returns the inventory of the object I<and> their inventories, recursively,
2460but I<not> the object itself.
2370 2461
2371=cut 2462=cut
2372 2463
2373sub inv_recursive_; 2464sub inv_recursive_;
2374sub inv_recursive_ { 2465sub inv_recursive_ {
2379 inv_recursive_ inv $_[0] 2470 inv_recursive_ inv $_[0]
2380} 2471}
2381 2472
2382=item $ref = $ob->ref 2473=item $ref = $ob->ref
2383 2474
2384creates and returns a persistent reference to an objetc that can be stored as a string. 2475Creates and returns a persistent reference to an object that can be stored as a string.
2385 2476
2386=item $ob = cf::object::deref ($refstring) 2477=item $ob = cf::object::deref ($refstring)
2387 2478
2388returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2479returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2389even if the object actually exists. May block. 2480even if the object actually exists. May block.
2421can be C<undef>. Does the right thing when the player is currently in a 2512can be C<undef>. Does the right thing when the player is currently in a
2422dialogue with the given NPC character. 2513dialogue with the given NPC character.
2423 2514
2424=cut 2515=cut
2425 2516
2517our $SAY_CHANNEL = {
2518 id => "say",
2519 title => "Map",
2520 reply => "say ",
2521 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2522};
2523
2524our $CHAT_CHANNEL = {
2525 id => "chat",
2526 title => "Chat",
2527 reply => "chat ",
2528 tooltip => "Player chat and shouts, global to the server.",
2529};
2530
2426# rough implementation of a future "reply" method that works 2531# rough implementation of a future "reply" method that works
2427# with dialog boxes. 2532# with dialog boxes.
2428#TODO: the first argument must go, split into a $npc->reply_to ( method 2533#TODO: the first argument must go, split into a $npc->reply_to ( method
2429sub cf::object::player::reply($$$;$) { 2534sub cf::object::player::reply($$$;$) {
2430 my ($self, $npc, $msg, $flags) = @_; 2535 my ($self, $npc, $msg, $flags) = @_;
2441 my $dialog = $pl->{npc_dialog}; 2546 my $dialog = $pl->{npc_dialog};
2442 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2547 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2443 2548
2444 } else { 2549 } else {
2445 $msg = $npc->name . " says: $msg" if $npc; 2550 $msg = $npc->name . " says: $msg" if $npc;
2446 $self->message ($msg, $flags); 2551 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2447 } 2552 }
2448 } 2553 }
2449} 2554}
2450 2555
2451=item $object->send_msg ($channel, $msg, $color, [extra...]) 2556=item $object->send_msg ($channel, $msg, $color, [extra...])
2476 2581
2477=item $player_object->enter_link 2582=item $player_object->enter_link
2478 2583
2479Freezes the player and moves him/her to a special map (C<{link}>). 2584Freezes the player and moves him/her to a special map (C<{link}>).
2480 2585
2481The player should be reasonably safe there for short amounts of time. You 2586The player should be reasonably safe there for short amounts of time (e.g.
2482I<MUST> call C<leave_link> as soon as possible, though. 2587for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2588though, as the palyer cannot control the character while it is on the link
2589map.
2483 2590
2484Will never block. 2591Will never block.
2485 2592
2486=item $player_object->leave_link ($map, $x, $y) 2593=item $player_object->leave_link ($map, $x, $y)
2487 2594
2512 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2513 2620
2514 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2515 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2516 2623
2517 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2518} 2625}
2519 2626
2520sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2521 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2522 2629
2539 ($x, $y) = (-1, -1) 2646 ($x, $y) = (-1, -1)
2540 unless (defined $x) && (defined $y); 2647 unless (defined $x) && (defined $y);
2541 2648
2542 # use -1 or undef as default coordinates, not 0, 0 2649 # use -1 or undef as default coordinates, not 0, 0
2543 ($x, $y) = ($map->enter_x, $map->enter_y) 2650 ($x, $y) = ($map->enter_x, $map->enter_y)
2544 if $x <=0 && $y <= 0; 2651 if $x <= 0 && $y <= 0;
2545 2652
2546 $map->load; 2653 $map->load;
2547 $map->load_neighbours; 2654 $map->load_neighbours;
2548 2655
2549 return unless $self->contr->active; 2656 return unless $self->contr->active;
2550 $self->activate_recursive;
2551 2657
2552 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2553 $self->enter_map ($map, $x, $y); 2659 $self->enter_map ($map, $x, $y);
2660
2661 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive;
2554} 2663}
2555 2664
2556=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2665=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2557 2666
2558Moves the player to the given map-path and coordinates by first freezing 2667Moves the player to the given map-path and coordinates by first freezing
2559her, loading and preparing them map, calling the provided $check callback 2668her, loading and preparing them map, calling the provided $check callback
2560that has to return the map if sucecssful, and then unfreezes the player on 2669that has to return the map if sucecssful, and then unfreezes the player on
2561the new (success) or old (failed) map position. In either case, $done will 2670the new (success) or old (failed) map position. In either case, $done will
2562be called at the end of this process. 2671be called at the end of this process.
2672
2673Note that $check will be called with a potentially non-loaded map, so if
2674it needs a loaded map it has to call C<< ->load >>.
2563 2675
2564=cut 2676=cut
2565 2677
2566our $GOTOGEN; 2678our $GOTOGEN;
2567 2679
2646} 2758}
2647 2759
2648sub prepare_random_map { 2760sub prepare_random_map {
2649 my ($exit) = @_; 2761 my ($exit) = @_;
2650 2762
2651 my $guard = cf::lock_acquire "exit_prepare:$exit";
2652
2653 # all this does is basically replace the /! path by 2763 # all this does is basically replace the /! path by
2654 # a new random map path (?random/...) with a seed 2764 # a new random map path (?random/...) with a seed
2655 # that depends on the exit object 2765 # that depends on the exit object
2656 2766
2657 my $rmp = parse_random_map_params $exit->msg; 2767 my $rmp = parse_random_map_params $exit->msg;
2659 if ($exit->map) { 2769 if ($exit->map) {
2660 $rmp->{region} = $exit->region->name; 2770 $rmp->{region} = $exit->region->name;
2661 $rmp->{origin_map} = $exit->map->path; 2771 $rmp->{origin_map} = $exit->map->path;
2662 $rmp->{origin_x} = $exit->x; 2772 $rmp->{origin_x} = $exit->x;
2663 $rmp->{origin_y} = $exit->y; 2773 $rmp->{origin_y} = $exit->y;
2774
2775 $exit->map->touch;
2664 } 2776 }
2665 2777
2666 $rmp->{random_seed} ||= $exit->random_seed; 2778 $rmp->{random_seed} ||= $exit->random_seed;
2667 2779
2668 my $data = cf::encode_json $rmp; 2780 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2669 my $md5 = Digest::MD5::md5_hex $data; 2781 my $md5 = Digest::MD5::md5_hex $data;
2670 my $meta = "$RANDOMDIR/$md5.meta"; 2782 my $meta = "$RANDOMDIR/$md5.meta";
2671 2783
2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2784 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2673 aio_write $fh, 0, (length $data), $data, 0; 2785 aio_write $fh, 0, (length $data), $data, 0;
2674 undef $fh; 2786 undef $fh;
2675 aio_rename "$meta~", $meta; 2787 aio_rename "$meta~", $meta;
2676 2788
2789 my $slaying = "?random/$md5";
2790
2791 if ($exit->valid) {
2677 $exit->slaying ("?random/$md5"); 2792 $exit->slaying ("?random/$md5");
2678 $exit->msg (undef); 2793 $exit->msg (undef);
2794 }
2679 } 2795 }
2680} 2796}
2681 2797
2682sub cf::object::player::enter_exit { 2798sub cf::object::player::enter_exit {
2683 my ($self, $exit) = @_; 2799 my ($self, $exit) = @_;
2684 2800
2685 return unless $self->type == cf::PLAYER; 2801 return unless $self->type == cf::PLAYER;
2686 2802
2687 if ($exit->slaying eq "/!") {
2688 #TODO: this should de-fi-ni-te-ly not be a sync-job
2689 # the problem is that $exit might not survive long enough
2690 # so it needs to be done right now, right here
2691 cf::sync_job { prepare_random_map $exit };
2692 }
2693
2694 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2695 my $hp = $exit->stats->hp;
2696 my $sp = $exit->stats->sp;
2697
2698 $self->enter_link; 2803 $self->enter_link;
2699 2804
2700 # if exit is damned, update players death & WoR home-position
2701 $self->contr->savebed ($slaying, $hp, $sp)
2702 if $exit->flag (FLAG_DAMNED);
2703
2704 (async { 2805 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2806 $Coro::current->{desc} = "enter_exit";
2706 2807
2707 $self->deactivate_recursive; # just to be sure
2708 unless (eval { 2808 unless (eval {
2809 $self->deactivate_recursive; # just to be sure
2810
2811 # random map handling
2812 {
2813 my $guard = cf::lock_acquire "exit_prepare:$exit";
2814
2815 prepare_random_map $exit
2816 if $exit->slaying eq "/!";
2817 }
2818
2819 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2820 my $x = $exit->stats->hp;
2821 my $y = $exit->stats->sp;
2822
2709 $self->goto ($slaying, $hp, $sp); 2823 $self->goto ($map, $x, $y);
2710 2824
2825 # if exit is damned, update players death & WoR home-position
2826 $self->contr->savebed ($map, $x, $y)
2827 if $exit->flag (cf::FLAG_DAMNED);
2828
2711 1; 2829 1
2712 }) { 2830 }) {
2713 $self->message ("Something went wrong deep within the crossfire server. " 2831 $self->message ("Something went wrong deep within the deliantra server. "
2714 . "I'll try to bring you back to the map you were before. " 2832 . "I'll try to bring you back to the map you were before. "
2715 . "Please report this to the dungeon master!", 2833 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 2834 cf::NDI_UNIQUE | cf::NDI_RED);
2717 2835
2718 warn "ERROR in enter_exit: $@"; 2836 warn "ERROR in enter_exit: $@";
2735sub cf::client::send_drawinfo { 2853sub cf::client::send_drawinfo {
2736 my ($self, $text, $flags) = @_; 2854 my ($self, $text, $flags) = @_;
2737 2855
2738 utf8::encode $text; 2856 utf8::encode $text;
2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2857 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2858}
2859
2860=item $client->send_big_packet ($pkt)
2861
2862Like C<send_packet>, but tries to compress large packets, and fragments
2863them as required.
2864
2865=cut
2866
2867our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2868
2869sub cf::client::send_big_packet {
2870 my ($self, $pkt) = @_;
2871
2872 # try lzf for large packets
2873 $pkt = "lzf " . Compress::LZF::compress $pkt
2874 if 1024 <= length $pkt and $self->{can_lzf};
2875
2876 # split very large packets
2877 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2878 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2879 $pkt = "frag";
2880 }
2881
2882 $self->send_packet ($pkt);
2740} 2883}
2741 2884
2742=item $client->send_msg ($channel, $msg, $color, [extra...]) 2885=item $client->send_msg ($channel, $msg, $color, [extra...])
2743 2886
2744Send a drawinfo or msg packet to the client, formatting the msg for the 2887Send a drawinfo or msg packet to the client, formatting the msg for the
2748 2891
2749=cut 2892=cut
2750 2893
2751# non-persistent channels (usually the info channel) 2894# non-persistent channels (usually the info channel)
2752our %CHANNEL = ( 2895our %CHANNEL = (
2896 "c/motd" => {
2897 id => "infobox",
2898 title => "MOTD",
2899 reply => undef,
2900 tooltip => "The message of the day",
2901 },
2753 "c/identify" => { 2902 "c/identify" => {
2754 id => "infobox", 2903 id => "infobox",
2755 title => "Identify", 2904 title => "Identify",
2756 reply => undef, 2905 reply => undef,
2757 tooltip => "Items recently identified", 2906 tooltip => "Items recently identified",
2759 "c/examine" => { 2908 "c/examine" => {
2760 id => "infobox", 2909 id => "infobox",
2761 title => "Examine", 2910 title => "Examine",
2762 reply => undef, 2911 reply => undef,
2763 tooltip => "Signs and other items you examined", 2912 tooltip => "Signs and other items you examined",
2913 },
2914 "c/shopinfo" => {
2915 id => "infobox",
2916 title => "Shop Info",
2917 reply => undef,
2918 tooltip => "What your bargaining skill tells you about the shop",
2764 }, 2919 },
2765 "c/book" => { 2920 "c/book" => {
2766 id => "infobox", 2921 id => "infobox",
2767 title => "Book", 2922 title => "Book",
2768 reply => undef, 2923 reply => undef,
2784 id => "infobox", 2939 id => "infobox",
2785 title => "Body Parts", 2940 title => "Body Parts",
2786 reply => undef, 2941 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available", 2942 tooltip => "Shows which body parts you posess and are available",
2788 }, 2943 },
2944 "c/statistics" => {
2945 id => "infobox",
2946 title => "Statistics",
2947 reply => undef,
2948 tooltip => "Shows your primary statistics",
2949 },
2950 "c/skills" => {
2951 id => "infobox",
2952 title => "Skills",
2953 reply => undef,
2954 tooltip => "Shows your experience per skill and item power",
2955 },
2956 "c/shopitems" => {
2957 id => "infobox",
2958 title => "Shop Items",
2959 reply => undef,
2960 tooltip => "Shows the items currently for sale in this shop",
2961 },
2962 "c/resistances" => {
2963 id => "infobox",
2964 title => "Resistances",
2965 reply => undef,
2966 tooltip => "Shows your resistances",
2967 },
2968 "c/pets" => {
2969 id => "infobox",
2970 title => "Pets",
2971 reply => undef,
2972 tooltip => "Shows information abotu your pets/a specific pet",
2973 },
2974 "c/perceiveself" => {
2975 id => "infobox",
2976 title => "Perceive Self",
2977 reply => undef,
2978 tooltip => "You gained detailed knowledge about yourself",
2979 },
2789 "c/uptime" => { 2980 "c/uptime" => {
2790 id => "infobox", 2981 id => "infobox",
2791 title => "Uptime", 2982 title => "Uptime",
2792 reply => undef, 2983 reply => undef,
2793 tooltip => "How long the server has been running since last restart", 2984 tooltip => "How long the server has been running since last restart",
2796 id => "infobox", 2987 id => "infobox",
2797 title => "Map Info", 2988 title => "Map Info",
2798 reply => undef, 2989 reply => undef,
2799 tooltip => "Information related to the maps", 2990 tooltip => "Information related to the maps",
2800 }, 2991 },
2992 "c/party" => {
2993 id => "party",
2994 title => "Party",
2995 reply => "gsay ",
2996 tooltip => "Messages and chat related to your party",
2997 },
2998 "c/death" => {
2999 id => "death",
3000 title => "Death",
3001 reply => undef,
3002 tooltip => "Reason for and more info about your most recent death",
3003 },
3004 "c/say" => $SAY_CHANNEL,
3005 "c/chat" => $CHAT_CHANNEL,
2801); 3006);
2802 3007
2803sub cf::client::send_msg { 3008sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 3009 my ($self, $channel, $msg, $color, @extra) = @_;
2805 3010
2806 $msg = $self->pl->expand_cfpod ($msg); 3011 $msg = $self->pl->expand_cfpod ($msg)
3012 unless $color & cf::NDI_VERBATIM;
2807 3013
2808 $color &= cf::NDI_CLIENT_MASK; # just in case... 3014 $color &= cf::NDI_CLIENT_MASK; # just in case...
2809 3015
2810 # check predefined channels, for the benefit of C 3016 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 3017 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 3018 $channel = $CHANNEL{$channel};
2813 3019
2814 $self->ext_msg (channel_info => $channel) 3020 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 3021 $channel = $channel->{id};
2818 3022
2819 } elsif (ref $channel) { 3023 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 3024 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 3025 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 3026 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 3027 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 3028 }
2826 3029
2827 $channel = $channel->{id}; 3030 $channel = $channel->{id};
2828 } 3031 }
2829 3032
2830 return unless @extra || length $msg; 3033 return unless @extra || length $msg;
2831 3034
2832 if ($self->can_msg) {
2833 # default colour, mask it out 3035 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3036 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 3037 if $color & cf::NDI_DEF;
2836 3038
2837 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3039 my $pkt = "msg "
3040 . $self->{json_coder}->encode (
2838 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3041 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2839 } else { 3042 );
2840 if ($color >= 0) {
2841 # replace some tags by gcfclient-compatible ones
2842 for ($msg) {
2843 1 while
2844 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2845 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2846 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2847 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2848 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2849 }
2850 3043
2851 $color &= cf::NDI_COLOR_MASK; 3044 $self->send_big_packet ($pkt);
2852
2853 utf8::encode $msg;
2854
2855 if (0 && $msg =~ /\[/) {
2856 # COMMAND/INFO
2857 $self->send_packet ("drawextinfo $color 10 8 $msg")
2858 } else {
2859 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2860 $self->send_packet ("drawinfo $color $msg")
2861 }
2862 }
2863 }
2864} 3045}
2865 3046
2866=item $client->ext_msg ($type, @msg) 3047=item $client->ext_msg ($type, @msg)
2867 3048
2868Sends an ext event to the client. 3049Sends an ext event to the client.
2871 3052
2872sub cf::client::ext_msg($$@) { 3053sub cf::client::ext_msg($$@) {
2873 my ($self, $type, @msg) = @_; 3054 my ($self, $type, @msg) = @_;
2874 3055
2875 if ($self->extcmd == 2) { 3056 if ($self->extcmd == 2) {
2876 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3057 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2877 } elsif ($self->extcmd == 1) { # TODO: remove 3058 } elsif ($self->extcmd == 1) { # TODO: remove
2878 push @msg, msgtype => "event_$type"; 3059 push @msg, msgtype => "event_$type";
2879 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3060 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2880 } 3061 }
2881} 3062}
2882 3063
2883=item $client->ext_reply ($msgid, @msg) 3064=item $client->ext_reply ($msgid, @msg)
2884 3065
2888 3069
2889sub cf::client::ext_reply($$@) { 3070sub cf::client::ext_reply($$@) {
2890 my ($self, $id, @msg) = @_; 3071 my ($self, $id, @msg) = @_;
2891 3072
2892 if ($self->extcmd == 2) { 3073 if ($self->extcmd == 2) {
2893 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2894 } elsif ($self->extcmd == 1) { 3075 } elsif ($self->extcmd == 1) {
2895 #TODO: version 1, remove 3076 #TODO: version 1, remove
2896 unshift @msg, msgtype => "reply", msgid => $id; 3077 unshift @msg, msgtype => "reply", msgid => $id;
2897 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3078 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2898 } 3079 }
2899} 3080}
2900 3081
2901=item $success = $client->query ($flags, "text", \&cb) 3082=item $success = $client->query ($flags, "text", \&cb)
2902 3083
3003 3184
3004 $coro 3185 $coro
3005} 3186}
3006 3187
3007cf::client->attach ( 3188cf::client->attach (
3008 on_destroy => sub { 3189 on_client_destroy => sub {
3009 my ($ns) = @_; 3190 my ($ns) = @_;
3010 3191
3011 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3192 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3012 }, 3193 },
3013); 3194);
3029our $safe_hole = new Safe::Hole; 3210our $safe_hole = new Safe::Hole;
3030 3211
3031$SIG{FPE} = 'IGNORE'; 3212$SIG{FPE} = 'IGNORE';
3032 3213
3033$safe->permit_only (Opcode::opset qw( 3214$safe->permit_only (Opcode::opset qw(
3034 :base_core :base_mem :base_orig :base_math 3215 :base_core :base_mem :base_orig :base_math :base_loop
3035 grepstart grepwhile mapstart mapwhile 3216 grepstart grepwhile mapstart mapwhile
3036 sort time 3217 sort time
3037)); 3218));
3038 3219
3039# here we export the classes and methods available to script code 3220# here we export the classes and methods available to script code
3042 3223
3043The following functions and methods are available within a safe environment: 3224The following functions and methods are available within a safe environment:
3044 3225
3045 cf::object 3226 cf::object
3046 contr pay_amount pay_player map x y force_find force_add destroy 3227 contr pay_amount pay_player map x y force_find force_add destroy
3047 insert remove name archname title slaying race decrease_ob_nr 3228 insert remove name archname title slaying race decrease split
3229 value
3048 3230
3049 cf::object::player 3231 cf::object::player
3050 player 3232 player
3051 3233
3052 cf::player 3234 cf::player
3057 3239
3058=cut 3240=cut
3059 3241
3060for ( 3242for (
3061 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3243 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3062 insert remove inv name archname title slaying race 3244 insert remove inv nrof name archname title slaying race
3063 decrease_ob_nr destroy)], 3245 decrease split destroy change_exp value msg lore send_msg)],
3064 ["cf::object::player" => qw(player)], 3246 ["cf::object::player" => qw(player)],
3065 ["cf::player" => qw(peaceful)], 3247 ["cf::player" => qw(peaceful send_msg)],
3066 ["cf::map" => qw(trigger)], 3248 ["cf::map" => qw(trigger)],
3067) { 3249) {
3068 no strict 'refs'; 3250 no strict 'refs';
3069 my ($pkg, @funs) = @$_; 3251 my ($pkg, @funs) = @$_;
3070 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3252 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3088 3270
3089 my $qcode = $code; 3271 my $qcode = $code;
3090 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3272 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3091 $qcode =~ s/\n/\\n/g; 3273 $qcode =~ s/\n/\\n/g;
3092 3274
3275 %vars = (_dummy => 0) unless %vars;
3276
3277 my @res;
3093 local $_; 3278 local $_;
3094 local @safe::cf::_safe_eval_args = values %vars;
3095 3279
3096 my $eval = 3280 my $eval =
3097 "do {\n" 3281 "do {\n"
3098 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3282 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3099 . "#line 0 \"{$qcode}\"\n" 3283 . "#line 0 \"{$qcode}\"\n"
3100 . $code 3284 . $code
3101 . "\n}" 3285 . "\n}"
3102 ; 3286 ;
3103 3287
3288 if ($CFG{safe_eval}) {
3104 sub_generation_inc; 3289 sub_generation_inc;
3290 local @safe::cf::_safe_eval_args = values %vars;
3105 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3291 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3106 sub_generation_inc; 3292 sub_generation_inc;
3293 } else {
3294 local @cf::_safe_eval_args = values %vars;
3295 @res = wantarray ? eval eval : scalar eval $eval;
3296 }
3107 3297
3108 if ($@) { 3298 if ($@) {
3109 warn "$@"; 3299 warn "$@";
3110 warn "while executing safe code '$code'\n"; 3300 warn "while executing safe code '$code'\n";
3111 warn "with arguments " . (join " ", %vars) . "\n"; 3301 warn "with arguments " . (join " ", %vars) . "\n";
3130=cut 3320=cut
3131 3321
3132sub register_script_function { 3322sub register_script_function {
3133 my ($fun, $cb) = @_; 3323 my ($fun, $cb) = @_;
3134 3324
3135 no strict 'refs'; 3325 $fun = "safe::$fun" if $CFG{safe_eval};
3136 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3326 *$fun = $safe_hole->wrap ($cb);
3137} 3327}
3138 3328
3139=back 3329=back
3140 3330
3141=cut 3331=cut
3162 3352
3163 $facedata->{version} == 2 3353 $facedata->{version} == 2
3164 or cf::cleanup "$path: version mismatch, cannot proceed."; 3354 or cf::cleanup "$path: version mismatch, cannot proceed.";
3165 3355
3166 # patch in the exptable 3356 # patch in the exptable
3357 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3167 $facedata->{resource}{"res/exp_table"} = { 3358 $facedata->{resource}{"res/exp_table"} = {
3168 type => FT_RSRC, 3359 type => FT_RSRC,
3169 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3360 data => $exp_table,
3361 hash => (Digest::MD5::md5 $exp_table),
3170 }; 3362 };
3171 cf::cede_to_tick; 3363 cf::cede_to_tick;
3172 3364
3173 { 3365 {
3174 my $faces = $facedata->{faceinfo}; 3366 my $faces = $facedata->{faceinfo};
3176 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
3177 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3369 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3178 3370
3179 cf::face::set_visibility $idx, $info->{visibility}; 3371 cf::face::set_visibility $idx, $info->{visibility};
3180 cf::face::set_magicmap $idx, $info->{magicmap}; 3372 cf::face::set_magicmap $idx, $info->{magicmap};
3181 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3373 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3182 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3374 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3183 3375
3184 cf::cede_to_tick; 3376 cf::cede_to_tick;
3185 } 3377 }
3186 3378
3187 while (my ($face, $info) = each %$faces) { 3379 while (my ($face, $info) = each %$faces) {
3211 3403
3212 cf::anim::invalidate_all; # d'oh 3404 cf::anim::invalidate_all; # d'oh
3213 } 3405 }
3214 3406
3215 { 3407 {
3216 # TODO: for gcfclient pleasure, we should give resources
3217 # that gcfclient doesn't grok a >10000 face index.
3218 my $res = $facedata->{resource}; 3408 my $res = $facedata->{resource};
3219 3409
3220 while (my ($name, $info) = each %$res) { 3410 while (my ($name, $info) = each %$res) {
3221 if (defined $info->{type}) { 3411 if (defined $info->{type}) {
3222 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3412 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3223 my $data;
3224 3413
3225 if ($info->{type} & 1) { 3414 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3226 # prepend meta info
3227
3228 my $meta = $enc->encode ({
3229 name => $name,
3230 %{ $info->{meta} || {} },
3231 });
3232
3233 $data = pack "(w/a*)*", $meta, $info->{data};
3234 } else {
3235 $data = $info->{data};
3236 }
3237
3238 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3239 cf::face::set_type $idx, $info->{type}; 3415 cf::face::set_type $idx, $info->{type};
3240 } else { 3416 } else {
3241 $RESOURCE{$name} = $info; 3417 $RESOURCE{$name} = $info;
3242 } 3418 }
3243 3419
3276 while (my ($k, $v) = each %$want) { 3452 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v); 3453 $ns->fx_want ($k, $v);
3278 } 3454 }
3279}; 3455};
3280 3456
3457sub load_resource_file($) {
3458 my $guard = lock_acquire "load_resource_file";
3459
3460 my $status = load_resource_file_ $_[0];
3461 get_slot 0.1, 100;
3462 cf::arch::commit_load;
3463
3464 $status
3465}
3466
3281sub reload_regions { 3467sub reload_regions {
3282 # HACK to clear player env face cache, we need some signal framework 3468 # HACK to clear player env face cache, we need some signal framework
3283 # for this (global event?) 3469 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = (); 3470 %ext::player_env::MUSIC_FACE_CACHE = ();
3285 3471
3298} 3484}
3299 3485
3300sub reload_archetypes { 3486sub reload_archetypes {
3301 load_resource_file "$DATADIR/archetypes" 3487 load_resource_file "$DATADIR/archetypes"
3302 or die "unable to load archetypes\n"; 3488 or die "unable to load archetypes\n";
3303 #d# NEED to laod twice to resolve forward references
3304 # this really needs to be done in an extra post-pass
3305 # (which needs to be synchronous, so solve it differently)
3306 load_resource_file "$DATADIR/archetypes"
3307 or die "unable to load archetypes\n";
3308} 3489}
3309 3490
3310sub reload_treasures { 3491sub reload_treasures {
3311 load_resource_file "$DATADIR/treasures" 3492 load_resource_file "$DATADIR/treasures"
3312 or die "unable to load treasurelists\n"; 3493 or die "unable to load treasurelists\n";
3313} 3494}
3314 3495
3315sub reload_resources { 3496sub reload_resources {
3316 warn "reloading resource files...\n"; 3497 warn "reloading resource files...\n";
3317 3498
3499 reload_facedata;
3500 reload_archetypes;
3318 reload_regions; 3501 reload_regions;
3319 reload_facedata;
3320 #reload_archetypes;#d#
3321 reload_archetypes;
3322 reload_treasures; 3502 reload_treasures;
3323 3503
3324 warn "finished reloading resource files\n"; 3504 warn "finished reloading resource files\n";
3325} 3505}
3326 3506
3327sub init {
3328 reload_resources;
3329}
3330
3331sub reload_config { 3507sub reload_config {
3508 warn "reloading config file...\n";
3509
3332 open my $fh, "<:utf8", "$CONFDIR/config" 3510 open my $fh, "<:utf8", "$CONFDIR/config"
3333 or return; 3511 or return;
3334 3512
3335 local $/; 3513 local $/;
3336 *CFG = YAML::Load <$fh>; 3514 *CFG = YAML::XS::Load scalar <$fh>;
3337 3515
3338 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3339 3517
3340 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3518 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3341 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3519 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3345 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3523 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3346 and die "WARNING: m(un)lockall failed: $!\n"; 3524 and die "WARNING: m(un)lockall failed: $!\n";
3347 }; 3525 };
3348 warn $@ if $@; 3526 warn $@ if $@;
3349 } 3527 }
3528
3529 warn "finished reloading resource files\n";
3530}
3531
3532sub pidfile() {
3533 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3534 or die "$PIDFILE: $!";
3535 flock $fh, &Fcntl::LOCK_EX
3536 or die "$PIDFILE: flock: $!";
3537 $fh
3538}
3539
3540# make sure only one server instance is running at any one time
3541sub atomic {
3542 my $fh = pidfile;
3543
3544 my $pid = <$fh>;
3545 kill 9, $pid if $pid > 0;
3546
3547 seek $fh, 0, 0;
3548 print $fh $$;
3549}
3550
3551sub main_loop {
3552 warn "EV::loop starting\n";
3553 if (1) {
3554 EV::loop;
3555 }
3556 warn "EV::loop returned\n";
3557 goto &main_loop unless $REALLY_UNLOOP;
3350} 3558}
3351 3559
3352sub main { 3560sub main {
3561 cf::init_globals; # initialise logging
3562
3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3564 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3567
3568 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3569
3353 # we must not ever block the main coroutine 3570 # we must not ever block the main coroutine
3354 local $Coro::idle = sub { 3571 local $Coro::idle = sub {
3355 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3572 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3356 (async { 3573 (async {
3357 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3574 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT; 3575 EV::loop EV::LOOP_ONESHOT;
3359 })->prio (Coro::PRIO_MAX); 3576 })->prio (Coro::PRIO_MAX);
3360 }; 3577 };
3361 3578
3579 evthread_start IO::AIO::poll_fileno;
3580
3581 cf::sync_job {
3582 cf::init_experience;
3583 cf::init_anim;
3584 cf::init_attackmess;
3585 cf::init_dynamic;
3586
3587 cf::load_settings;
3588 cf::load_materials;
3589
3590 reload_resources;
3362 reload_config; 3591 reload_config;
3363 db_init; 3592 db_init;
3593
3594 cf::init_uuid;
3595 cf::init_signals;
3596 cf::init_skills;
3597
3598 cf::init_beforeplay;
3599
3600 atomic;
3601
3364 load_extensions; 3602 load_extensions;
3365 3603
3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3604 utime time, time, $RUNTIMEFILE;
3367 evthread_start; 3605
3368 EV::loop; 3606 # no (long-running) fork's whatsoever before this point(!)
3607 use POSIX ();
3608 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3609
3610 (pop @POST_INIT)->(0) while @POST_INIT;
3611 };
3612
3613 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n";
3615
3616 main_loop;
3369} 3617}
3370 3618
3371############################################################################# 3619#############################################################################
3372# initialisation and cleanup 3620# initialisation and cleanup
3373 3621
3374# install some emergency cleanup handlers 3622# install some emergency cleanup handlers
3375BEGIN { 3623BEGIN {
3376 our %SIGWATCHER = (); 3624 our %SIGWATCHER = ();
3377 for my $signal (qw(INT HUP TERM)) { 3625 for my $signal (qw(INT HUP TERM)) {
3378 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3626 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3379 cf::cleanup "SIG$signal"; 3627 cf::cleanup "SIG$signal";
3380 }; 3628 };
3381 } 3629 }
3382} 3630}
3383 3631
3384sub write_runtime { 3632sub write_runtime_sync {
3385 my $runtime = "$LOCALDIR/runtime"; 3633 my $t0 = AE::time;
3386 3634
3387 # first touch the runtime file to show we are still running: 3635 # first touch the runtime file to show we are still running:
3388 # the fsync below can take a very very long time. 3636 # the fsync below can take a very very long time.
3389 3637
3390 IO::AIO::aio_utime $runtime, undef, undef; 3638 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3391 3639
3392 my $guard = cf::lock_acquire "write_runtime"; 3640 my $guard = cf::lock_acquire "write_runtime";
3393 3641
3394 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3642 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3395 or return; 3643 or return;
3396 3644
3397 my $value = $cf::RUNTIME + 90 + 10; 3645 my $value = $cf::RUNTIME + 90 + 10;
3398 # 10 is the runtime save interval, for a monotonic clock 3646 # 10 is the runtime save interval, for a monotonic clock
3399 # 60 allows for the watchdog to kill the server. 3647 # 60 allows for the watchdog to kill the server.
3409 aio_utime $fh, undef, undef; 3657 aio_utime $fh, undef, undef;
3410 3658
3411 close $fh 3659 close $fh
3412 or return; 3660 or return;
3413 3661
3414 aio_rename "$runtime~", $runtime 3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3415 and return; 3663 and return;
3416 3664
3417 warn "runtime file written.\n"; 3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3418 3666
3419 1 3667 1
3668}
3669
3670our $uuid_lock;
3671our $uuid_skip;
3672
3673sub write_uuid_sync($) {
3674 $uuid_skip ||= $_[0];
3675
3676 return if $uuid_lock;
3677 local $uuid_lock = 1;
3678
3679 my $uuid = "$LOCALDIR/uuid";
3680
3681 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3682 or return;
3683
3684 my $value = uuid_seq uuid_cur;
3685
3686 unless ($value) {
3687 warn "cowardly refusing to write zero uuid value!\n";
3688 return;
3689 }
3690
3691 my $value = uuid_str $value + $uuid_skip;
3692 $uuid_skip = 0;
3693
3694 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3695 and return;
3696
3697 # always fsync - this file is important
3698 aio_fsync $fh
3699 and return;
3700
3701 close $fh
3702 or return;
3703
3704 aio_rename "$uuid~", $uuid
3705 and return;
3706
3707 warn "uuid file written ($value).\n";
3708
3709 1
3710
3711}
3712
3713sub write_uuid($$) {
3714 my ($skip, $sync) = @_;
3715
3716 $sync ? write_uuid_sync $skip
3717 : async { write_uuid_sync $skip };
3420} 3718}
3421 3719
3422sub emergency_save() { 3720sub emergency_save() {
3423 my $freeze_guard = cf::freeze_mainloop; 3721 my $freeze_guard = cf::freeze_mainloop;
3424 3722
3425 warn "enter emergency perl save\n"; 3723 warn "emergency_perl_save: enter\n";
3426 3724
3427 cf::sync_job { 3725 cf::sync_job {
3726 # this is a trade-off: we want to be very quick here, so
3727 # save all maps without fsync, and later call a global sync
3728 # (which in turn might be very very slow)
3729 local $USE_FSYNC = 0;
3730
3428 # use a peculiar iteration method to avoid tripping on perl 3731 # use a peculiar iteration method to avoid tripping on perl
3429 # refcount bugs in for. also avoids problems with players 3732 # refcount bugs in for. also avoids problems with players
3430 # and maps saved/destroyed asynchronously. 3733 # and maps saved/destroyed asynchronously.
3431 warn "begin emergency player save\n"; 3734 warn "emergency_perl_save: begin player save\n";
3432 for my $login (keys %cf::PLAYER) { 3735 for my $login (keys %cf::PLAYER) {
3433 my $pl = $cf::PLAYER{$login} or next; 3736 my $pl = $cf::PLAYER{$login} or next;
3434 $pl->valid or next; 3737 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3738 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3436 $pl->save; 3739 $pl->save;
3437 } 3740 }
3438 warn "end emergency player save\n"; 3741 warn "emergency_perl_save: end player save\n";
3439 3742
3440 warn "begin emergency map save\n"; 3743 warn "emergency_perl_save: begin map save\n";
3441 for my $path (keys %cf::MAP) { 3744 for my $path (keys %cf::MAP) {
3442 my $map = $cf::MAP{$path} or next; 3745 my $map = $cf::MAP{$path} or next;
3443 $map->valid or next; 3746 $map->valid or next;
3444 $map->save; 3747 $map->save;
3445 } 3748 }
3446 warn "end emergency map save\n"; 3749 warn "emergency_perl_save: end map save\n";
3447 3750
3448 warn "begin emergency database checkpoint\n"; 3751 warn "emergency_perl_save: begin database checkpoint\n";
3449 BDB::db_env_txn_checkpoint $DB_ENV; 3752 BDB::db_env_txn_checkpoint $DB_ENV;
3450 warn "end emergency database checkpoint\n"; 3753 warn "emergency_perl_save: end database checkpoint\n";
3754
3755 warn "emergency_perl_save: begin write uuid\n";
3756 write_uuid_sync 1;
3757 warn "emergency_perl_save: end write uuid\n";
3451 }; 3758 };
3452 3759
3760 warn "emergency_perl_save: starting sync()\n";
3761 IO::AIO::aio_sync sub {
3762 warn "emergency_perl_save: finished sync()\n";
3763 };
3764
3453 warn "leave emergency perl save\n"; 3765 warn "emergency_perl_save: leave\n";
3454} 3766}
3455 3767
3456sub post_cleanup { 3768sub post_cleanup {
3457 my ($make_core) = @_; 3769 my ($make_core) = @_;
3458 3770
3459 warn Carp::longmess "post_cleanup backtrace" 3771 warn Carp::longmess "post_cleanup backtrace"
3460 if $make_core; 3772 if $make_core;
3773
3774 my $fh = pidfile;
3775 unlink $PIDFILE if <$fh> == $$;
3776}
3777
3778# a safer delete_package, copied from Symbol
3779sub clear_package($) {
3780 my $pkg = shift;
3781
3782 # expand to full symbol table name if needed
3783 unless ($pkg =~ /^main::.*::$/) {
3784 $pkg = "main$pkg" if $pkg =~ /^::/;
3785 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3786 $pkg .= '::' unless $pkg =~ /::$/;
3787 }
3788
3789 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3790 my $stem_symtab = *{$stem}{HASH};
3791
3792 defined $stem_symtab and exists $stem_symtab->{$leaf}
3793 or return;
3794
3795 # clear all symbols
3796 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3797 for my $name (keys %$leaf_symtab) {
3798 _gv_clear *{"$pkg$name"};
3799# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3800 }
3461} 3801}
3462 3802
3463sub do_reload_perl() { 3803sub do_reload_perl() {
3464 # can/must only be called in main 3804 # can/must only be called in main
3465 if ($Coro::current != $Coro::main) { 3805 if (in_main) {
3466 warn "can only reload from main coroutine"; 3806 warn "can only reload from main coroutine";
3467 return; 3807 return;
3468 } 3808 }
3469 3809
3810 return if $RELOAD++;
3811
3812 my $t1 = AE::time;
3813
3814 while ($RELOAD) {
3470 warn "reloading..."; 3815 warn "reloading...";
3471 3816
3472 warn "entering sync_job"; 3817 warn "entering sync_job";
3473 3818
3474 cf::sync_job { 3819 cf::sync_job {
3475 cf::write_runtime; # external watchdog should not bark 3820 cf::write_runtime_sync; # external watchdog should not bark
3476 cf::emergency_save; 3821 cf::emergency_save;
3477 cf::write_runtime; # external watchdog should not bark 3822 cf::write_runtime_sync; # external watchdog should not bark
3478 3823
3479 warn "syncing database to disk"; 3824 warn "syncing database to disk";
3480 BDB::db_env_txn_checkpoint $DB_ENV; 3825 BDB::db_env_txn_checkpoint $DB_ENV;
3481 3826
3482 # if anything goes wrong in here, we should simply crash as we already saved 3827 # if anything goes wrong in here, we should simply crash as we already saved
3483 3828
3484 warn "flushing outstanding aio requests"; 3829 warn "flushing outstanding aio requests";
3485 for (;;) {
3486 BDB::flush;
3487 IO::AIO::flush;
3488 Coro::cede_notself;
3489 last unless IO::AIO::nreqs || BDB::nreqs; 3830 while (IO::AIO::nreqs || BDB::nreqs) {
3490 warn "iterate..."; 3831 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3491 }
3492
3493 ++$RELOAD;
3494
3495 warn "cancelling all extension coros";
3496 $_->cancel for values %EXT_CORO;
3497 %EXT_CORO = ();
3498
3499 warn "removing commands";
3500 %COMMAND = ();
3501
3502 warn "removing ext/exti commands";
3503 %EXTCMD = ();
3504 %EXTICMD = ();
3505
3506 warn "unloading/nuking all extensions";
3507 for my $pkg (@EXTS) {
3508 warn "... unloading $pkg";
3509
3510 if (my $cb = $pkg->can ("unload")) {
3511 eval {
3512 $cb->($pkg);
3513 1
3514 } or warn "$pkg unloaded, but with errors: $@";
3515 } 3832 }
3516 3833
3517 warn "... nuking $pkg"; 3834 warn "cancelling all extension coros";
3518 Symbol::delete_package $pkg; 3835 $_->cancel for values %EXT_CORO;
3519 } 3836 %EXT_CORO = ();
3520 3837
3521 warn "unloading all perl modules loaded from $LIBDIR"; 3838 warn "removing commands";
3522 while (my ($k, $v) = each %INC) { 3839 %COMMAND = ();
3523 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3524 3840
3841 warn "removing ext/exti commands";
3842 %EXTCMD = ();
3843 %EXTICMD = ();
3844
3845 warn "unloading/nuking all extensions";
3846 for my $pkg (@EXTS) {
3525 warn "... unloading $k"; 3847 warn "... unloading $pkg";
3526 delete $INC{$k};
3527 3848
3528 $k =~ s/\.pm$//;
3529 $k =~ s/\//::/g;
3530
3531 if (my $cb = $k->can ("unload_module")) { 3849 if (my $cb = $pkg->can ("unload")) {
3850 eval {
3532 $cb->(); 3851 $cb->($pkg);
3852 1
3853 } or warn "$pkg unloaded, but with errors: $@";
3854 }
3855
3856 warn "... clearing $pkg";
3857 clear_package $pkg;
3533 } 3858 }
3534 3859
3535 Symbol::delete_package $k; 3860 warn "unloading all perl modules loaded from $LIBDIR";
3861 while (my ($k, $v) = each %INC) {
3862 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3863
3864 warn "... unloading $k";
3865 delete $INC{$k};
3866
3867 $k =~ s/\.pm$//;
3868 $k =~ s/\//::/g;
3869
3870 if (my $cb = $k->can ("unload_module")) {
3871 $cb->();
3872 }
3873
3874 clear_package $k;
3536 } 3875 }
3537 3876
3538 warn "getting rid of safe::, as good as possible"; 3877 warn "getting rid of safe::, as good as possible";
3539 Symbol::delete_package "safe::$_" 3878 clear_package "safe::$_"
3540 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3879 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3541 3880
3542 warn "unloading cf.pm \"a bit\""; 3881 warn "unloading cf.pm \"a bit\"";
3543 delete $INC{"cf.pm"}; 3882 delete $INC{"cf.pm"};
3544 delete $INC{"cf/pod.pm"}; 3883 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3545 3884
3546 # don't, removes xs symbols, too, 3885 # don't, removes xs symbols, too,
3547 # and global variables created in xs 3886 # and global variables created in xs
3548 #Symbol::delete_package __PACKAGE__; 3887 #clear_package __PACKAGE__;
3549 3888
3550 warn "unload completed, starting to reload now"; 3889 warn "unload completed, starting to reload now";
3551 3890
3552 warn "reloading cf.pm"; 3891 warn "reloading cf.pm";
3553 require cf; 3892 require cf;
3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3893 cf::_connect_to_perl_1;
3555 3894
3556 warn "loading config and database again"; 3895 warn "loading config and database again";
3557 cf::reload_config; 3896 cf::reload_config;
3558 3897
3559 warn "loading extensions"; 3898 warn "loading extensions";
3560 cf::load_extensions; 3899 cf::load_extensions;
3561 3900
3901 if ($REATTACH_ON_RELOAD) {
3562 warn "reattaching attachments to objects/players"; 3902 warn "reattaching attachments to objects/players";
3563 _global_reattach; # objects, sockets 3903 _global_reattach; # objects, sockets
3564 warn "reattaching attachments to maps"; 3904 warn "reattaching attachments to maps";
3565 reattach $_ for values %MAP; 3905 reattach $_ for values %MAP;
3566 warn "reattaching attachments to players"; 3906 warn "reattaching attachments to players";
3567 reattach $_ for values %PLAYER; 3907 reattach $_ for values %PLAYER;
3908 }
3568 3909
3910 warn "running post_init jobs";
3911 (pop @POST_INIT)->(1) while @POST_INIT;
3912
3569 warn "leaving sync_job"; 3913 warn "leaving sync_job";
3570 3914
3571 1 3915 1
3572 } or do { 3916 } or do {
3573 warn $@; 3917 warn $@;
3574 cf::cleanup "error while reloading, exiting."; 3918 cf::cleanup "error while reloading, exiting.";
3575 }; 3919 };
3576 3920
3577 warn "reloaded"; 3921 warn "reloaded";
3922 --$RELOAD;
3923 }
3924
3925 $t1 = AE::time - $t1;
3926 warn "reload completed in ${t1}s\n";
3578}; 3927};
3579 3928
3580our $RELOAD_WATCHER; # used only during reload 3929our $RELOAD_WATCHER; # used only during reload
3581 3930
3582sub reload_perl() { 3931sub reload_perl() {
3583 # doing reload synchronously and two reloads happen back-to-back, 3932 # doing reload synchronously and two reloads happen back-to-back,
3584 # coro crashes during coro_state_free->destroy here. 3933 # coro crashes during coro_state_free->destroy here.
3585 3934
3935 $RELOAD_WATCHER ||= cf::async {
3936 Coro::AIO::aio_wait cache_extensions;
3937
3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3938 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3587 do_reload_perl; 3939 do_reload_perl;
3588 undef $RELOAD_WATCHER; 3940 undef $RELOAD_WATCHER;
3941 };
3589 }; 3942 };
3590} 3943}
3591 3944
3592register_command "reload" => sub { 3945register_command "reload" => sub {
3593 my ($who, $arg) = @_; 3946 my ($who, $arg) = @_;
3607 3960
3608our @WAIT_FOR_TICK; 3961our @WAIT_FOR_TICK;
3609our @WAIT_FOR_TICK_BEGIN; 3962our @WAIT_FOR_TICK_BEGIN;
3610 3963
3611sub wait_for_tick { 3964sub wait_for_tick {
3612 return if tick_inhibit;
3613 return if $Coro::current == $Coro::main; 3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3614 3966
3615 my $signal = new Coro::Signal; 3967 my $signal = new Coro::Signal;
3616 push @WAIT_FOR_TICK, $signal; 3968 push @WAIT_FOR_TICK, $signal;
3617 $signal->wait; 3969 $signal->wait;
3618} 3970}
3619 3971
3620sub wait_for_tick_begin { 3972sub wait_for_tick_begin {
3621 return if tick_inhibit;
3622 return if $Coro::current == $Coro::main; 3973 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3623 3974
3624 my $signal = new Coro::Signal; 3975 my $signal = new Coro::Signal;
3625 push @WAIT_FOR_TICK_BEGIN, $signal; 3976 push @WAIT_FOR_TICK_BEGIN, $signal;
3626 $signal->wait; 3977 $signal->wait;
3627} 3978}
3633 return; 3984 return;
3634 } 3985 }
3635 3986
3636 cf::server_tick; # one server iteration 3987 cf::server_tick; # one server iteration
3637 3988
3989 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3990
3638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3991 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3992 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3640 Coro::async_pool { 3993 Coro::async_pool {
3641 $Coro::current->{desc} = "runtime saver"; 3994 $Coro::current->{desc} = "runtime saver";
3642 write_runtime 3995 write_runtime_sync
3643 or warn "ERROR: unable to write runtime file: $!"; 3996 or warn "ERROR: unable to write runtime file: $!";
3644 }; 3997 };
3645 } 3998 }
3646 3999
3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4000 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3664} 4017}
3665 4018
3666{ 4019{
3667 # configure BDB 4020 # configure BDB
3668 4021
3669 BDB::min_parallel 8; 4022 BDB::min_parallel 16;
3670 BDB::max_poll_reqs $TICK * 0.1; 4023 BDB::max_poll_reqs $TICK * 0.1;
3671 $Coro::BDB::WATCHER->priority (1); 4024 $AnyEvent::BDB::WATCHER->priority (1);
3672 4025
3673 unless ($DB_ENV) { 4026 unless ($DB_ENV) {
3674 $DB_ENV = BDB::db_env_create; 4027 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4028 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3676 | BDB::LOG_AUTOREMOVE, 1); 4029 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4030 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4031 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4032 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3679 4033
3680 cf::sync_job { 4034 cf::sync_job {
3681 eval { 4035 eval {
3707{ 4061{
3708 # configure IO::AIO 4062 # configure IO::AIO
3709 4063
3710 IO::AIO::min_parallel 8; 4064 IO::AIO::min_parallel 8;
3711 IO::AIO::max_poll_time $TICK * 0.1; 4065 IO::AIO::max_poll_time $TICK * 0.1;
3712 $Coro::AIO::WATCHER->priority (1); 4066 undef $AnyEvent::AIO::WATCHER;
3713} 4067}
3714 4068
3715my $_log_backtrace; 4069my $_log_backtrace;
3716 4070
3717sub _log_backtrace { 4071sub _log_backtrace {
3720 $msg =~ s/\n//; 4074 $msg =~ s/\n//;
3721 4075
3722 # limit the # of concurrent backtraces 4076 # limit the # of concurrent backtraces
3723 if ($_log_backtrace < 2) { 4077 if ($_log_backtrace < 2) {
3724 ++$_log_backtrace; 4078 ++$_log_backtrace;
4079 my $perl_bt = Carp::longmess $msg;
3725 async { 4080 async {
3726 $Coro::current->{desc} = "abt $msg"; 4081 $Coro::current->{desc} = "abt $msg";
3727 4082
3728 my @bt = fork_call { 4083 my @bt = fork_call {
3729 @addr = map { sprintf "%x", $_ } @addr; 4084 @addr = map { sprintf "%x", $_ } @addr;
3740 } 4095 }
3741 4096
3742 @funcs 4097 @funcs
3743 }; 4098 };
3744 4099
3745 LOG llevInfo, "[ABT] $msg\n"; 4100 LOG llevInfo, "[ABT] $perl_bt\n";
4101 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3746 LOG llevInfo, "[ABT] $_\n" for @bt; 4102 LOG llevInfo, "[ABT] $_\n" for @bt;
3747 --$_log_backtrace; 4103 --$_log_backtrace;
3748 }; 4104 };
3749 } else { 4105 } else {
3750 LOG llevInfo, "[ABT] $msg\n"; 4106 LOG llevInfo, "[ABT] $msg\n";
3751 LOG llevInfo, "[ABT] [suppressed]\n"; 4107 LOG llevInfo, "[ABT] [suppressed]\n";
3752 } 4108 }
3753} 4109}
3754 4110
3755# load additional modules 4111# load additional modules
3756use cf::pod; 4112require "cf/$_.pm" for @EXTRA_MODULES;
4113cf::_connect_to_perl_2;
3757 4114
3758END { cf::emergency_save } 4115END { cf::emergency_save }
3759 4116
37601 41171
3761 4118

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines