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.397 by root, Mon Nov 19 15:47:14 2007 UTC vs.
Revision 1.507 by root, Sat Mar 20 02:24:38 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use EV; 32use EV;
10use Opcode; 33use Opcode;
11use Safe; 34use Safe;
12use Safe::Hole; 35use Safe::Hole;
13use Storable (); 36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 4.1 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
18use Coro::EV; 43use Coro::EV;
44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
51use Coro::BDB 1.6;
23use Coro::Storable; 52use Coro::Storable;
24use Coro::Util (); 53use Coro::Util ();
25 54
26use JSON::XS (); 55use JSON::XS 2.01 ();
27use BDB (); 56use BDB ();
28use Data::Dumper; 57use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 58use Fcntl;
31use YAML::Syck (); 59use YAML::XS ();
32use IO::AIO 2.51 (); 60use IO::AIO ();
33use Time::HiRes; 61use Time::HiRes;
34use Compress::LZF; 62use Compress::LZF;
35use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
36 66
37# configure various modules to our taste 67# configure various modules to our taste
38# 68#
39$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
40Coro::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";
41Compress::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
42 77
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 78# strictly for debugging
44$YAML::Syck::ImplicitUnicode = 1; 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 80
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 82
50our %COMMAND = (); 83our %COMMAND = ();
51our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
54our %EXTCMD = (); 87our %EXTCMD = ();
55our %EXTICMD = (); 88our %EXTICMD = ();
56our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
57our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
58 91
59our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
60our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
61 96
62our $CONFDIR = confdir; 97our $CONFDIR = confdir;
63our $DATADIR = datadir; 98our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
67our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE;
73 112
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 115our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
81 117
82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
86our $DB_ENV; 121our $DB_ENV;
87 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
88our %CFG; 125our %CFG;
89 126
90our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
91our $RUNTIME; 128our $RUNTIME;
129our $NOW;
92 130
93our (%PLAYER, %PLAYER_LOADING); # all users 131our (%PLAYER, %PLAYER_LOADING); # all users
94our (%MAP, %MAP_LOADING ); # all maps 132our (%MAP, %MAP_LOADING ); # all maps
95our $LINK_MAP; # the special {link} map, which is always available 133our $LINK_MAP; # the special {link} map, which is always available
96 134
97# used to convert map paths into valid unix filenames by replacing / by ∕ 135# used to convert map paths into valid unix filenames by replacing / by ∕
98our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 136our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
99 137
100our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
101our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
140our $JITTER; # average jitter
102our $tick_start; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
142
143our @POST_INIT;
144
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
103 147
104binmode STDOUT; 148binmode STDOUT;
105binmode STDERR; 149binmode STDERR;
106 150
107# read virtual server time, if available 151# read virtual server time, if available
108unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
109 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
110 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
111 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
112} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
113 159
114mkdir $_ 160mkdir $_
115 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
116 162
117our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
118 164
119sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
120 177
121############################################################################# 178#############################################################################
122 179
123=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
124 181
171returns directly I<after> the tick processing (and consequently, can only wake one process 228returns directly I<after> the tick processing (and consequently, can only wake one process
172per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
173 230
174=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
175 232
176This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
177C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
178that call. 235that call.
179 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
180=back 243=back
181 244
182=cut 245=cut
183 246
184BEGIN { 247$Coro::State::WARNHOOK = sub {
185 *CORE::GLOBAL::warn = sub {
186 my $msg = join "", @_; 248 my $msg = join "", @_;
187 249
188 $msg .= "\n" 250 $msg .= "\n"
189 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
190 252
191 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
192 254
193 LOG llevError, $msg; 255 LOG llevError, $msg;
194 }; 256};
195} 257
258$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
262
263 if ($Coro::current == $Coro::main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d#
266 }#d#
267
268 # kill coroutine otherwise
269 Coro::terminate
270};
196 271
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 282for my $pkg (qw(
208 cf::global cf::attachable 283 cf::global cf::attachable
209 cf::object cf::object::player 284 cf::object cf::object::player
210 cf::client cf::player 285 cf::client cf::player
211 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
212 cf::map cf::party cf::region 288 cf::party cf::region
213)) { 289)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 291}
217 292
218$EV::DIED = sub { 293$EV::DIED = sub {
219 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
220}; 295};
221 296
222############################################################################# 297#############################################################################
223 298
224=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 321 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 322 $d
248 } || "[unable to dump $_[0]: '$@']"; 323 } || "[unable to dump $_[0]: '$@']";
249} 324}
250 325
251=item $ref = cf::from_json $json 326=item $ref = cf::decode_json $json
252 327
253Converts a JSON string into the corresponding perl data structure. 328Converts a JSON string into the corresponding perl data structure.
254 329
255=item $json = cf::to_json $ref 330=item $json = cf::encode_json $ref
256 331
257Converts a perl data structure into its JSON representation. 332Converts a perl data structure into its JSON representation.
258 333
259=cut 334=cut
260 335
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 337
263sub to_json ($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
340
341=item cf::post_init { BLOCK }
342
343Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again.
345
346The cdoeblock will have a single boolean argument to indicate whether this
347is a reload or not.
348
349=cut
350
351sub post_init(&) {
352 push @POST_INIT, shift;
353}
265 354
266=item cf::lock_wait $string 355=item cf::lock_wait $string
267 356
268Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
269 358
270=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
271 360
272Wait until the given lock is available and then acquires it and returns 361Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
275returned. 364returned.
276 365
277Locks are *not* recursive, locking from the same coro twice results in a 366Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro. 367deadlocked coro.
284 373
285Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
286 375
287=cut 376=cut
288 377
289our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
290our %LOCKER;#d#
291 379
292sub lock_wait($) { 380sub lock_wait($) {
293 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
299
300 # wait for lock, if any
301 while ($LOCK{$key}) {
302 push @{ $LOCK{$key} }, $Coro::current;
303 Coro::schedule;
304 }
305} 382}
306 383
307sub lock_acquire($) { 384sub lock_acquire($) {
308 my ($key) = @_; 385 $LOCKS->guard ($_[0])
309
310 # wait, to be sure we are not locked
311 lock_wait $key;
312
313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
315
316 Coro::guard {
317 delete $LOCKER{$key};#d#
318 # wake up all waiters, to be on the safe side
319 $_->ready for @{ delete $LOCK{$key} };
320 }
321} 386}
322 387
323sub lock_active($) { 388sub lock_active($) {
324 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
325
326 ! ! $LOCK{$key}
327} 390}
328 391
329sub freeze_mainloop { 392sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
331 394
332 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
333 $TICK_WATCHER->start;
334 };
335 $TICK_WATCHER->stop;
336 $guard
337} 396}
338 397
339=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
340 399
341Like EV::periodic, but randomly selects a starting point so that the actions 400Like EV::periodic, but randomly selects a starting point so that the actions
364 423
365=cut 424=cut
366 425
367our @SLOT_QUEUE; 426our @SLOT_QUEUE;
368our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
369 429
370$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
371$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
372 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
373 433
374 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
375 436
376 while () { 437 while () {
377 next_job: 438 next_job:
439
378 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
379 if ($avail > 0.01) { 441
380 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
381 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
382 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
383 $job->[2]->send; 446 $job->[2]->send;
384 Coro::cede; 447 Coro::cede;
385 goto next_job; 448 goto next_job;
386 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
387 } 451 }
388 } 452 }
389 453
390 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
391 # we do not use wait_for_tick() as it returns immediately when tick is inactive 455 # we do not use wait_for_tick() as it returns immediately when tick is inactive
392 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
393 $signal->wait; 457 $signal->wait;
394 } else { 458 } else {
459 $busy = 0;
395 Coro::schedule; 460 Coro::schedule;
396 } 461 }
397 } 462 }
398}; 463};
399 464
400sub get_slot($;$$) { 465sub get_slot($;$$) {
466 return if tick_inhibit || $Coro::current == $Coro::main;
467
401 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
402 469
403 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
404 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
405 473
406 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
407 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
408 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
442 # this is the main coro, too bad, we have to block 510 # this is the main coro, too bad, we have to block
443 # till the operation succeeds, freezing the server :/ 511 # till the operation succeeds, freezing the server :/
444 512
445 LOG llevError, Carp::longmess "sync job";#d# 513 LOG llevError, Carp::longmess "sync job";#d#
446 514
447 # TODO: use suspend/resume instead
448 # (but this is cancel-safe)
449 my $freeze_guard = freeze_mainloop; 515 my $freeze_guard = freeze_mainloop;
450 516
451 my $busy = 1; 517 my $busy = 1;
452 my @res; 518 my @res;
453 519
464 } else { 530 } else {
465 EV::loop EV::LOOP_ONESHOT; 531 EV::loop EV::LOOP_ONESHOT;
466 } 532 }
467 } 533 }
468 534
469 $time = EV::time - $time; 535 my $time = EV::time - $time;
470 536
471 LOG llevError | logBacktrace, Carp::longmess "long sync job"
472 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
473
474 $tick_start += $time; # do not account sync jobs to server load 537 $TICK_START += $time; # do not account sync jobs to server load
475 538
476 wantarray ? @res : $res[0] 539 wantarray ? @res : $res[0]
477 } else { 540 } else {
478 # we are in another coroutine, how wonderful, everything just works 541 # we are in another coroutine, how wonderful, everything just works
479 542
521 reset_signals; 584 reset_signals;
522 &$cb 585 &$cb
523 }, @args; 586 }, @args;
524 587
525 wantarray ? @res : $res[-1] 588 wantarray ? @res : $res[-1]
589}
590
591=item $coin = coin_from_name $name
592
593=cut
594
595our %coin_alias = (
596 "silver" => "silvercoin",
597 "silvercoin" => "silvercoin",
598 "silvercoins" => "silvercoin",
599 "gold" => "goldcoin",
600 "goldcoin" => "goldcoin",
601 "goldcoins" => "goldcoin",
602 "platinum" => "platinacoin",
603 "platinumcoin" => "platinacoin",
604 "platinumcoins" => "platinacoin",
605 "platina" => "platinacoin",
606 "platinacoin" => "platinacoin",
607 "platinacoins" => "platinacoin",
608 "royalty" => "royalty",
609 "royalties" => "royalty",
610);
611
612sub coin_from_name($) {
613 $coin_alias{$_[0]}
614 ? cf::arch::find $coin_alias{$_[0]}
615 : undef
526} 616}
527 617
528=item $value = cf::db_get $family => $key 618=item $value = cf::db_get $family => $key
529 619
530Returns a single value from the environment database. 620Returns a single value from the environment database.
669 759
670############################################################################# 760#############################################################################
671 761
672=head2 ATTACHABLE OBJECTS 762=head2 ATTACHABLE OBJECTS
673 763
674Many objects in crossfire are so-called attachable objects. That means you can 764Many objects in deliantra are so-called attachable objects. That means you can
675attach callbacks/event handlers (a collection of which is called an "attachment") 765attach callbacks/event handlers (a collection of which is called an "attachment")
676to it. All such attachable objects support the following methods. 766to it. All such attachable objects support the following methods.
677 767
678In the following description, CLASS can be any of C<global>, C<object> 768In the following description, CLASS can be any of C<global>, C<object>
679C<player>, C<client> or C<map> (i.e. the attachable objects in 769C<player>, C<client> or C<map> (i.e. the attachable objects in
729=item cf::CLASS::attachment $name, ... 819=item cf::CLASS::attachment $name, ...
730 820
731Register an attachment by C<$name> through which attachable objects of the 821Register an attachment by C<$name> through which attachable objects of the
732given CLASS can refer to this attachment. 822given CLASS can refer to this attachment.
733 823
734Some classes such as crossfire maps and objects can specify attachments 824Some classes such as deliantra maps and objects can specify attachments
735that are attached at load/instantiate time, thus the need for a name. 825that are attached at load/instantiate time, thus the need for a name.
736 826
737These calls expect any number of the following handler/hook descriptions: 827These calls expect any number of the following handler/hook descriptions:
738 828
739=over 4 829=over 4
967 } 1057 }
968 1058
969 0 1059 0
970} 1060}
971 1061
972=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1062=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
973 1063
974=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1064=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
975 1065
976Generate an object-specific event with the given arguments. 1066Generate an object-specific event with the given arguments.
977 1067
1030 1120
1031sub reattach { 1121sub reattach {
1032 # basically do the same as instantiate, without calling instantiate 1122 # basically do the same as instantiate, without calling instantiate
1033 my ($obj) = @_; 1123 my ($obj) = @_;
1034 1124
1125 # no longer needed after getting rid of delete_package?
1035 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1126 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1036 1127
1037 my $registry = $obj->registry; 1128 my $registry = $obj->registry;
1038 1129
1039 @$registry = (); 1130 @$registry = ();
1040 1131
1055cf::attachable->attach ( 1146cf::attachable->attach (
1056 prio => -1000000, 1147 prio => -1000000,
1057 on_instantiate => sub { 1148 on_instantiate => sub {
1058 my ($obj, $data) = @_; 1149 my ($obj, $data) = @_;
1059 1150
1060 $data = from_json $data; 1151 $data = decode_json $data;
1061 1152
1062 for (@$data) { 1153 for (@$data) {
1063 my ($name, $args) = @$_; 1154 my ($name, $args) = @$_;
1064 1155
1065 $obj->attach ($name, %{$args || {} }); 1156 $obj->attach ($name, %{$args || {} });
1086 utf8::decode (my $decname = $filename); 1177 utf8::decode (my $decname = $filename);
1087 warn sprintf "saving %s (%d,%d)\n", 1178 warn sprintf "saving %s (%d,%d)\n",
1088 $decname, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1089 1180
1090 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1091 chmod SAVE_MODE, $fh; 1182 aio_chmod $fh, SAVE_MODE;
1092 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1093 aio_fsync $fh if $cf::USE_FSYNC; 1184 if ($cf::USE_FSYNC) {
1185 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;
1186 aio_fsync $fh;
1187 }
1094 close $fh; 1188 aio_close $fh;
1095 1189
1096 if (@$objs) { 1190 if (@$objs) {
1097 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1191 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1098 chmod SAVE_MODE, $fh; 1192 aio_chmod $fh, SAVE_MODE;
1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1100 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1101 aio_fsync $fh if $cf::USE_FSYNC; 1195 if ($cf::USE_FSYNC) {
1196 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;
1197 aio_fsync $fh;
1198 }
1102 close $fh; 1199 aio_close $fh;
1103 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1104 } 1201 }
1105 } else { 1202 } else {
1106 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1107 } 1204 }
1108 1205
1109 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
1110 } else { 1210 } else {
1111 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1112 } 1212 }
1113 } else { 1213 } else {
1114 aio_unlink $filename; 1214 aio_unlink $filename;
1115 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1116 } 1216 }
1207 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1208 1308
1209 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1210} 1310}
1211 1311
1312use File::Glob ();
1313
1212cf::player->attach ( 1314cf::player->attach (
1213 on_command => sub { 1315 on_command => sub {
1214 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1215 1317
1216 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1248 1350
1249 cf::override; 1351 cf::override;
1250 }, 1352 },
1251); 1353);
1252 1354
1355# "readahead" all extensions
1356sub cache_extensions {
1357 my $grp = IO::AIO::aio_group;
1358
1359 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1360 for (grep /\.ext$/, @{$_[0]}) {
1361 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1362 }
1363 };
1364
1365 $grp
1366}
1367
1253sub load_extensions { 1368sub load_extensions {
1254 cf::sync_job { 1369 cf::sync_job {
1255 my %todo; 1370 my %todo;
1256 1371
1257 for my $path (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
1276 1391
1277 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1278 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1279 1394
1280 $ext{source} = 1395 $ext{source} =
1281 "package $pkg; use strict; use utf8;\n" 1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1282 . "#line 1 \"$path\"\n{\n" 1397 . "#line 1 \"$path\"\n{\n"
1283 . $source 1398 . $source
1284 . "\n};\n1"; 1399 . "\n};\n1";
1285 1400
1286 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1287 } 1402 }
1288 1403
1404 my $pass = 0;
1289 my %done; 1405 my %done;
1290 while (%todo) { 1406 while (%todo) {
1291 my $progress; 1407 my $progress;
1292 1408
1409 ++$pass;
1410
1411 ext:
1293 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1294 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1295 goto skip 1414 next ext
1296 unless exists $done{$_}; 1415 unless exists $done{$_};
1297 } 1416 }
1298 1417
1299 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1300 1419
1301 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1302 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1303 : "$v->{base}: extension inactive.\n";
1304 1424
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1305 if (exists $v->{meta}{mandatory}) { 1426 if exists $v->{meta}{mandatory};
1306 warn $msg; 1427 } else {
1307 warn "mandatory extension failed to load, exiting.\n"; 1428 $done{$k} = delete $todo{$k};
1308 exit 1; 1429 push @EXTS, $v->{pkg};
1309 } 1430 $progress = 1;
1310 1431
1311 warn $msg; 1432 warn "$v->{base}: extension inactive.\n"
1433 unless $active;
1312 } 1434 }
1313
1314 $done{$k} = delete $todo{$k};
1315 push @EXTS, $v->{pkg};
1316 $progress = 1;
1317 } 1435 }
1318 1436
1319 skip: 1437 unless ($progress) {
1320 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1321 unless $progress; 1439
1440 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory};
1443 }
1444 }
1322 } 1445 }
1323 }; 1446 };
1324} 1447}
1325 1448
1326############################################################################# 1449#############################################################################
1327 1450
1328=back 1451=back
1329 1452
1330=head2 CORE EXTENSIONS 1453=head2 CORE EXTENSIONS
1331 1454
1332Functions and methods that extend core crossfire objects. 1455Functions and methods that extend core deliantra objects.
1333 1456
1334=cut 1457=cut
1335 1458
1336package cf::player; 1459package cf::player;
1337 1460
1380 1503
1381sub exists($) { 1504sub exists($) {
1382 my ($login) = @_; 1505 my ($login) = @_;
1383 1506
1384 $cf::PLAYER{$login} 1507 $cf::PLAYER{$login}
1385 or cf::sync_job { !aio_stat path $login } 1508 or !aio_stat path $login
1386} 1509}
1387 1510
1388sub find($) { 1511sub find($) {
1389 return $cf::PLAYER{$_[0]} || do { 1512 return $cf::PLAYER{$_[0]} || do {
1390 my $login = $_[0]; 1513 my $login = $_[0];
1402 my $f = new_from_file cf::object::thawer path $login 1525 my $f = new_from_file cf::object::thawer path $login
1403 or return; 1526 or return;
1404 1527
1405 my $pl = cf::player::load_pl $f 1528 my $pl = cf::player::load_pl $f
1406 or return; 1529 or return;
1530
1407 local $cf::PLAYER_LOADING{$login} = $pl; 1531 local $cf::PLAYER_LOADING{$login} = $pl;
1408 $f->resolve_delayed_derefs; 1532 $f->resolve_delayed_derefs;
1409 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1410 } 1534 }
1411 } 1535 }
1421 1545
1422 return if $pl->{deny_save}; 1546 return if $pl->{deny_save};
1423 1547
1424 aio_mkdir playerdir $pl, 0770; 1548 aio_mkdir playerdir $pl, 0770;
1425 $pl->{last_save} = $cf::RUNTIME; 1549 $pl->{last_save} = $cf::RUNTIME;
1550
1551 cf::get_slot 0.01;
1426 1552
1427 $pl->save_pl ($path); 1553 $pl->save_pl ($path);
1428 cf::cede_to_tick; 1554 cf::cede_to_tick;
1429} 1555}
1430 1556
1462 my ($pl) = @_; 1588 my ($pl) = @_;
1463 1589
1464 my $name = $pl->ob->name; 1590 my $name = $pl->ob->name;
1465 1591
1466 $pl->{deny_save} = 1; 1592 $pl->{deny_save} = 1;
1467 $pl->password ("*"); # this should lock out the player until we nuked the dir 1593 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1468 1594
1469 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1595 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1470 $pl->deactivate; 1596 $pl->deactivate;
1597 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1598 $pl->ob->check_score;
1471 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1599 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1472 $pl->ns->destroy if $pl->ns; 1600 $pl->ns->destroy if $pl->ns;
1473 1601
1474 my $path = playerdir $pl; 1602 my $path = playerdir $pl;
1475 my $temp = "$path~$cf::RUNTIME~deleting~"; 1603 my $temp = "$path~$cf::RUNTIME~deleting~";
1514 1642
1515 for my $login (@$dirs) { 1643 for my $login (@$dirs) {
1516 my $path = path $login; 1644 my $path = path $login;
1517 1645
1518 # a .pst is a dead give-away for a valid player 1646 # a .pst is a dead give-away for a valid player
1519 unless (-e "$path.pst") { 1647 # if no pst file found, open and chekc for blocked users
1648 if (aio_stat "$path.pst") {
1520 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1649 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1521 aio_read $fh, 0, 512, my $buf, 0 or next; 1650 aio_read $fh, 0, 512, my $buf, 0 or next;
1522 $buf !~ /^password -------------$/m or next; # official not-valid tag 1651 $buf !~ /^password -------------$/m or next; # official not-valid tag
1523 } 1652 }
1524 1653
1555 } 1684 }
1556 1685
1557 \@paths 1686 \@paths
1558} 1687}
1559 1688
1560=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1689=item $protocol_xml = $player->expand_cfpod ($cfpod)
1561 1690
1562Expand crossfire pod fragments into protocol xml. 1691Expand deliantra pod fragments into protocol xml.
1563
1564=cut
1565
1566use re 'eval';
1567
1568my $group;
1569my $interior; $interior = qr{
1570 # match a pod interior sequence sans C<< >>
1571 (?:
1572 \ (.*?)\ (?{ $group = $^N })
1573 | < (??{$interior}) >
1574 )
1575}x;
1576
1577sub expand_cfpod {
1578 my ($self, $pod) = @_;
1579
1580 my $xml;
1581
1582 while () {
1583 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1584 $group = $1;
1585
1586 $group =~ s/&/&amp;/g;
1587 $group =~ s/</&lt;/g;
1588
1589 $xml .= $group;
1590 } elsif ($pod =~ m%\G
1591 ([BCGHITU])
1592 <
1593 (?:
1594 ([^<>]*) (?{ $group = $^N })
1595 | < $interior >
1596 )
1597 >
1598 %gcsx
1599 ) {
1600 my ($code, $data) = ($1, $group);
1601
1602 if ($code eq "B") {
1603 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1604 } elsif ($code eq "I") {
1605 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1606 } elsif ($code eq "U") {
1607 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1608 } elsif ($code eq "C") {
1609 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1610 } elsif ($code eq "T") {
1611 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1612 } elsif ($code eq "G") {
1613 my ($male, $female) = split /\|/, $data;
1614 $data = $self->gender ? $female : $male;
1615 $xml .= expand_cfpod ($self, $data);
1616 } elsif ($code eq "H") {
1617 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1618 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1619 "")
1620 [$self->{hintmode}];
1621 } else {
1622 $xml .= "error processing '$code($data)' directive";
1623 }
1624 } else {
1625 if ($pod =~ /\G(.+)/) {
1626 warn "parse error while expanding $pod (at $1)";
1627 }
1628 last;
1629 }
1630 }
1631
1632 for ($xml) {
1633 # create single paragraphs (very hackish)
1634 s/(?<=\S)\n(?=\w)/ /g;
1635
1636 # compress some whitespace
1637 s/\s+\n/\n/g; # ws line-ends
1638 s/\n\n+/\n/g; # double lines
1639 s/^\n+//; # beginning lines
1640 s/\n+$//; # ending lines
1641 }
1642
1643 $xml
1644}
1645
1646no re 'eval';
1647
1648sub hintmode {
1649 $_[0]{hintmode} = $_[1] if @_ > 1;
1650 $_[0]{hintmode}
1651}
1652 1692
1653=item $player->ext_reply ($msgid, @msg) 1693=item $player->ext_reply ($msgid, @msg)
1654 1694
1655Sends an ext reply to the player. 1695Sends an ext reply to the player.
1656 1696
1723our $MAX_RESET = 3600; 1763our $MAX_RESET = 3600;
1724our $DEFAULT_RESET = 3000; 1764our $DEFAULT_RESET = 3000;
1725 1765
1726sub generate_random_map { 1766sub generate_random_map {
1727 my ($self, $rmp) = @_; 1767 my ($self, $rmp) = @_;
1768
1769 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1770
1728 # mit "rum" bekleckern, nicht 1771 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1772 $self->_create_random_map (
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1775 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1854 1897
1855# the temporary/swap location 1898# the temporary/swap location
1856sub save_path { 1899sub save_path {
1857 my ($self) = @_; 1900 my ($self) = @_;
1858 1901
1859 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1902 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1860 "$TMPDIR/$path.map" 1903 "$TMPDIR/$path.map"
1861} 1904}
1862 1905
1863# the unique path, undef == no special unique path 1906# the unique path, undef == no special unique path
1864sub uniq_path { 1907sub uniq_path {
1865 my ($self) = @_; 1908 my ($self) = @_;
1866 1909
1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1910 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1868 "$UNIQUEDIR/$path" 1911 "$UNIQUEDIR/$path"
1869}
1870
1871# and all this just because we cannot iterate over
1872# all maps in C++...
1873sub change_all_map_light {
1874 my ($change) = @_;
1875
1876 $_->change_map_light ($change)
1877 for grep $_->outdoor, values %cf::MAP;
1878} 1912}
1879 1913
1880sub decay_objects { 1914sub decay_objects {
1881 my ($self) = @_; 1915 my ($self) = @_;
1882 1916
1966sub find { 2000sub find {
1967 my ($path, $origin) = @_; 2001 my ($path, $origin) = @_;
1968 2002
1969 $path = normalise $path, $origin && $origin->path; 2003 $path = normalise $path, $origin && $origin->path;
1970 2004
1971 cf::lock_wait "map_data:$path";#d#remove 2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1972 cf::lock_wait "map_find:$path"; 2006 my $guard2 = cf::lock_acquire "map_find:$path";
1973 2007
1974 $cf::MAP{$path} || do { 2008 $cf::MAP{$path} || do {
1975 my $guard1 = cf::lock_acquire "map_find:$path";
1976 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977
1978 my $map = new_from_path cf::map $path 2009 my $map = new_from_path cf::map $path
1979 or return; 2010 or return;
1980 2011
1981 $map->{last_save} = $cf::RUNTIME; 2012 $map->{last_save} = $cf::RUNTIME;
1982 2013
1984 or return; 2015 or return;
1985 2016
1986 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2017 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1987 # doing this can freeze the server in a sync job, obviously 2018 # doing this can freeze the server in a sync job, obviously
1988 #$cf::WAIT_FOR_TICK->wait; 2019 #$cf::WAIT_FOR_TICK->wait;
2020 undef $guard2;
1989 undef $guard1; 2021 undef $guard1;
1990 undef $guard2;
1991 $map->reset; 2022 $map->reset;
1992 return find $path; 2023 return find $path;
1993 } 2024 }
1994 2025
1995 $cf::MAP{$path} = $map 2026 $cf::MAP{$path} = $map
1996 } 2027 }
1997} 2028}
1998 2029
1999sub pre_load { } 2030sub pre_load { }
2000sub post_load { } 2031#sub post_load { } # XS
2001 2032
2002sub load { 2033sub load {
2003 my ($self) = @_; 2034 my ($self) = @_;
2004 2035
2005 local $self->{deny_reset} = 1; # loading can take a long time 2036 local $self->{deny_reset} = 1; # loading can take a long time
2022 my $f = new_from_file cf::object::thawer $self->{load_path}; 2053 my $f = new_from_file cf::object::thawer $self->{load_path};
2023 $f->skip_block; 2054 $f->skip_block;
2024 $self->_load_objects ($f) 2055 $self->_load_objects ($f)
2025 or return; 2056 or return;
2026 2057
2027 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2058 $self->post_load_original
2028 if delete $self->{load_original}; 2059 if delete $self->{load_original};
2029 2060
2030 if (my $uniq = $self->uniq_path) { 2061 if (my $uniq = $self->uniq_path) {
2031 utf8::encode $uniq; 2062 utf8::encode $uniq;
2032 unless (aio_stat $uniq) { 2063 unless (aio_stat $uniq) {
2050 unless ($self->{deny_activate}) { 2081 unless ($self->{deny_activate}) {
2051 $self->decay_objects; 2082 $self->decay_objects;
2052 $self->fix_auto_apply; 2083 $self->fix_auto_apply;
2053 $self->update_buttons; 2084 $self->update_buttons;
2054 cf::cede_to_tick; 2085 cf::cede_to_tick;
2055 $self->set_darkness_map;
2056 cf::cede_to_tick;
2057 $self->activate; 2086 $self->activate;
2058 } 2087 }
2059 2088
2060 $self->{last_save} = $cf::RUNTIME; 2089 $self->{last_save} = $cf::RUNTIME;
2061 $self->last_access ($cf::RUNTIME); 2090 $self->last_access ($cf::RUNTIME);
2062 2091
2063 $self->in_memory (cf::MAP_IN_MEMORY); 2092 $self->in_memory (cf::MAP_ACTIVE);
2064 } 2093 }
2065 2094
2066 $self->post_load; 2095 $self->post_load;
2067} 2096}
2068 2097
2098# customize the map for a given player, i.e.
2099# return the _real_ map. used by e.g. per-player
2100# maps to change the path to ~playername/mappath
2069sub customise_for { 2101sub customise_for {
2070 my ($self, $ob) = @_; 2102 my ($self, $ob) = @_;
2071 2103
2072 return find "~" . $ob->name . "/" . $self->{path} 2104 return find "~" . $ob->name . "/" . $self->{path}
2073 if $self->per_player; 2105 if $self->per_player;
2126 my ($path, $origin, $load) = @_; 2158 my ($path, $origin, $load) = @_;
2127 2159
2128 $path = normalise $path, $origin && $origin->{path}; 2160 $path = normalise $path, $origin && $origin->{path};
2129 2161
2130 if (my $map = $cf::MAP{$path}) { 2162 if (my $map = $cf::MAP{$path}) {
2131 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2163 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2132 } 2164 }
2133 2165
2134 $MAP_PREFETCH{$path} |= $load; 2166 $MAP_PREFETCH{$path} |= $load;
2135 2167
2136 $MAP_PREFETCHER ||= cf::async { 2168 $MAP_PREFETCHER ||= cf::async {
2173 cf::async { 2205 cf::async {
2174 $Coro::current->{desc} = "map player save"; 2206 $Coro::current->{desc} = "map player save";
2175 $_->contr->save for $self->players; 2207 $_->contr->save for $self->players;
2176 }; 2208 };
2177 2209
2210 cf::get_slot 0.02;
2211
2178 if ($uniq) { 2212 if ($uniq) {
2179 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2213 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2180 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2214 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2181 } else { 2215 } else {
2182 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2216 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2190 $self->save; 2224 $self->save;
2191 2225
2192 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2226 my $lock = cf::lock_acquire "map_data:$self->{path}";
2193 2227
2194 return if $self->players; 2228 return if $self->players;
2195 return if $self->in_memory != cf::MAP_IN_MEMORY; 2229 return if $self->in_memory != cf::MAP_ACTIVE;
2196 return if $self->{deny_save}; 2230 return if $self->{deny_save};
2197 2231
2198 $self->in_memory (cf::MAP_SWAPPED); 2232 $self->in_memory (cf::MAP_SWAPPED);
2199 2233
2200 $self->deactivate; 2234 $self->deactivate;
2225 2259
2226 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2227 2261
2228 return if $self->players; 2262 return if $self->players;
2229 2263
2230 warn "resetting map ", $self->path; 2264 warn "resetting map ", $self->path, "\n";
2231 2265
2232 $self->in_memory (cf::MAP_SWAPPED); 2266 $self->in_memory (cf::MAP_SWAPPED);
2233 2267
2234 # need to save uniques path 2268 # need to save uniques path
2235 unless ($self->{deny_save}) { 2269 unless ($self->{deny_save}) {
2318 2352
2319sub unique_maps() { 2353sub unique_maps() {
2320 [ 2354 [
2321 map { 2355 map {
2322 utf8::decode $_; 2356 utf8::decode $_;
2323 /\.map$/ 2357 s/\.map$//; # TODO future compatibility hack
2358 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2359 ? ()
2324 ? normalise $_ 2360 : normalise $_
2325 : ()
2326 } @{ aio_readdir $UNIQUEDIR or [] } 2361 } @{ aio_readdir $UNIQUEDIR or [] }
2327 ] 2362 ]
2328} 2363}
2329 2364
2330package cf; 2365=item cf::map::static_maps
2366
2367Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2368file in the shared directory excluding F</styles> and F</editor>). May
2369block.
2370
2371=cut
2372
2373sub static_maps() {
2374 my @dirs = "";
2375 my @maps;
2376
2377 while (@dirs) {
2378 my $dir = shift @dirs;
2379
2380 next if $dir eq "/styles" || $dir eq "/editor";
2381
2382 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2383 or return;
2384
2385 for (@$files) {
2386 s/\.map$// or next;
2387 utf8::decode $_;
2388 push @maps, "$dir/$_";
2389 }
2390
2391 push @dirs, map "$dir/$_", @$dirs;
2392 }
2393
2394 \@maps
2395}
2331 2396
2332=back 2397=back
2333 2398
2334=head3 cf::object 2399=head3 cf::object
2335 2400
2339 2404
2340=over 4 2405=over 4
2341 2406
2342=item $ob->inv_recursive 2407=item $ob->inv_recursive
2343 2408
2344Returns the inventory of the object _and_ their inventories, recursively. 2409Returns the inventory of the object I<and> their inventories, recursively,
2410but I<not> the object itself.
2345 2411
2346=cut 2412=cut
2347 2413
2348sub inv_recursive_; 2414sub inv_recursive_;
2349sub inv_recursive_ { 2415sub inv_recursive_ {
2354 inv_recursive_ inv $_[0] 2420 inv_recursive_ inv $_[0]
2355} 2421}
2356 2422
2357=item $ref = $ob->ref 2423=item $ref = $ob->ref
2358 2424
2359creates and returns a persistent reference to an objetc that can be stored as a string. 2425Creates and returns a persistent reference to an object that can be stored as a string.
2360 2426
2361=item $ob = cf::object::deref ($refstring) 2427=item $ob = cf::object::deref ($refstring)
2362 2428
2363returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2429returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2364even if the object actually exists. May block. 2430even if the object actually exists. May block.
2396can be C<undef>. Does the right thing when the player is currently in a 2462can be C<undef>. Does the right thing when the player is currently in a
2397dialogue with the given NPC character. 2463dialogue with the given NPC character.
2398 2464
2399=cut 2465=cut
2400 2466
2467our $SAY_CHANNEL = {
2468 id => "say",
2469 title => "Map",
2470 reply => "say ",
2471 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2472};
2473
2474our $CHAT_CHANNEL = {
2475 id => "chat",
2476 title => "Chat",
2477 reply => "chat ",
2478 tooltip => "Player chat and shouts, global to the server.",
2479};
2480
2401# rough implementation of a future "reply" method that works 2481# rough implementation of a future "reply" method that works
2402# with dialog boxes. 2482# with dialog boxes.
2403#TODO: the first argument must go, split into a $npc->reply_to ( method 2483#TODO: the first argument must go, split into a $npc->reply_to ( method
2404sub cf::object::player::reply($$$;$) { 2484sub cf::object::player::reply($$$;$) {
2405 my ($self, $npc, $msg, $flags) = @_; 2485 my ($self, $npc, $msg, $flags) = @_;
2416 my $dialog = $pl->{npc_dialog}; 2496 my $dialog = $pl->{npc_dialog};
2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2497 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2418 2498
2419 } else { 2499 } else {
2420 $msg = $npc->name . " says: $msg" if $npc; 2500 $msg = $npc->name . " says: $msg" if $npc;
2421 $self->message ($msg, $flags); 2501 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2422 } 2502 }
2423 } 2503 }
2424} 2504}
2425 2505
2426=item $object->send_msg ($channel, $msg, $color, [extra...]) 2506=item $object->send_msg ($channel, $msg, $color, [extra...])
2451 2531
2452=item $player_object->enter_link 2532=item $player_object->enter_link
2453 2533
2454Freezes the player and moves him/her to a special map (C<{link}>). 2534Freezes the player and moves him/her to a special map (C<{link}>).
2455 2535
2456The player should be reasonably safe there for short amounts of time. You 2536The player should be reasonably safe there for short amounts of time (e.g.
2457I<MUST> call C<leave_link> as soon as possible, though. 2537for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2538though, as the palyer cannot control the character while it is on the link
2539map.
2458 2540
2459Will never block. 2541Will never block.
2460 2542
2461=item $player_object->leave_link ($map, $x, $y) 2543=item $player_object->leave_link ($map, $x, $y)
2462 2544
2514 ($x, $y) = (-1, -1) 2596 ($x, $y) = (-1, -1)
2515 unless (defined $x) && (defined $y); 2597 unless (defined $x) && (defined $y);
2516 2598
2517 # use -1 or undef as default coordinates, not 0, 0 2599 # use -1 or undef as default coordinates, not 0, 0
2518 ($x, $y) = ($map->enter_x, $map->enter_y) 2600 ($x, $y) = ($map->enter_x, $map->enter_y)
2519 if $x <=0 && $y <= 0; 2601 if $x <= 0 && $y <= 0;
2520 2602
2521 $map->load; 2603 $map->load;
2522 $map->load_neighbours; 2604 $map->load_neighbours;
2523 2605
2524 return unless $self->contr->active; 2606 return unless $self->contr->active;
2525 $self->activate_recursive;
2526 2607
2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528 $self->enter_map ($map, $x, $y); 2609 $self->enter_map ($map, $x, $y);
2610
2611 # only activate afterwards, to support waiting in hooks
2612 $self->activate_recursive;
2529} 2613}
2530 2614
2531=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2615=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2532 2616
2533Moves the player to the given map-path and coordinates by first freezing 2617Moves the player to the given map-path and coordinates by first freezing
2534her, loading and preparing them map, calling the provided $check callback 2618her, loading and preparing them map, calling the provided $check callback
2535that has to return the map if sucecssful, and then unfreezes the player on 2619that has to return the map if sucecssful, and then unfreezes the player on
2536the new (success) or old (failed) map position. In either case, $done will 2620the new (success) or old (failed) map position. In either case, $done will
2537be called at the end of this process. 2621be called at the end of this process.
2622
2623Note that $check will be called with a potentially non-loaded map, so if
2624it needs a loaded map it has to call C<< ->load >>.
2538 2625
2539=cut 2626=cut
2540 2627
2541our $GOTOGEN; 2628our $GOTOGEN;
2542 2629
2621} 2708}
2622 2709
2623sub prepare_random_map { 2710sub prepare_random_map {
2624 my ($exit) = @_; 2711 my ($exit) = @_;
2625 2712
2626 my $guard = cf::lock_acquire "exit_prepare:$exit";
2627
2628 # all this does is basically replace the /! path by 2713 # all this does is basically replace the /! path by
2629 # a new random map path (?random/...) with a seed 2714 # a new random map path (?random/...) with a seed
2630 # that depends on the exit object 2715 # that depends on the exit object
2631 2716
2632 my $rmp = parse_random_map_params $exit->msg; 2717 my $rmp = parse_random_map_params $exit->msg;
2634 if ($exit->map) { 2719 if ($exit->map) {
2635 $rmp->{region} = $exit->region->name; 2720 $rmp->{region} = $exit->region->name;
2636 $rmp->{origin_map} = $exit->map->path; 2721 $rmp->{origin_map} = $exit->map->path;
2637 $rmp->{origin_x} = $exit->x; 2722 $rmp->{origin_x} = $exit->x;
2638 $rmp->{origin_y} = $exit->y; 2723 $rmp->{origin_y} = $exit->y;
2724
2725 $exit->map->touch;
2639 } 2726 }
2640 2727
2641 $rmp->{random_seed} ||= $exit->random_seed; 2728 $rmp->{random_seed} ||= $exit->random_seed;
2642 2729
2643 my $data = cf::to_json $rmp; 2730 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2644 my $md5 = Digest::MD5::md5_hex $data; 2731 my $md5 = Digest::MD5::md5_hex $data;
2645 my $meta = "$RANDOMDIR/$md5.meta"; 2732 my $meta = "$RANDOMDIR/$md5.meta";
2646 2733
2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2734 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2648 aio_write $fh, 0, (length $data), $data, 0; 2735 aio_write $fh, 0, (length $data), $data, 0;
2649 undef $fh; 2736 undef $fh;
2650 aio_rename "$meta~", $meta; 2737 aio_rename "$meta~", $meta;
2651 2738
2739 my $slaying = "?random/$md5";
2740
2741 if ($exit->valid) {
2652 $exit->slaying ("?random/$md5"); 2742 $exit->slaying ("?random/$md5");
2653 $exit->msg (undef); 2743 $exit->msg (undef);
2744 }
2654 } 2745 }
2655} 2746}
2656 2747
2657sub cf::object::player::enter_exit { 2748sub cf::object::player::enter_exit {
2658 my ($self, $exit) = @_; 2749 my ($self, $exit) = @_;
2659 2750
2660 return unless $self->type == cf::PLAYER; 2751 return unless $self->type == cf::PLAYER;
2661 2752
2662 if ($exit->slaying eq "/!") {
2663 #TODO: this should de-fi-ni-te-ly not be a sync-job
2664 # the problem is that $exit might not survive long enough
2665 # so it needs to be done right now, right here
2666 cf::sync_job { prepare_random_map $exit };
2667 }
2668
2669 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2670 my $hp = $exit->stats->hp;
2671 my $sp = $exit->stats->sp;
2672
2673 $self->enter_link; 2753 $self->enter_link;
2674 2754
2675 # if exit is damned, update players death & WoR home-position
2676 $self->contr->savebed ($slaying, $hp, $sp)
2677 if $exit->flag (FLAG_DAMNED);
2678
2679 (async { 2755 (async {
2680 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2756 $Coro::current->{desc} = "enter_exit";
2681 2757
2682 $self->deactivate_recursive; # just to be sure
2683 unless (eval { 2758 unless (eval {
2759 $self->deactivate_recursive; # just to be sure
2760
2761 # random map handling
2762 {
2763 my $guard = cf::lock_acquire "exit_prepare:$exit";
2764
2765 prepare_random_map $exit
2766 if $exit->slaying eq "/!";
2767 }
2768
2769 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2770 my $x = $exit->stats->hp;
2771 my $y = $exit->stats->sp;
2772
2684 $self->goto ($slaying, $hp, $sp); 2773 $self->goto ($map, $x, $y);
2685 2774
2775 # if exit is damned, update players death & WoR home-position
2776 $self->contr->savebed ($map, $x, $y)
2777 if $exit->flag (cf::FLAG_DAMNED);
2778
2686 1; 2779 1
2687 }) { 2780 }) {
2688 $self->message ("Something went wrong deep within the crossfire server. " 2781 $self->message ("Something went wrong deep within the deliantra server. "
2689 . "I'll try to bring you back to the map you were before. " 2782 . "I'll try to bring you back to the map you were before. "
2690 . "Please report this to the dungeon master!", 2783 . "Please report this to the dungeon master!",
2691 cf::NDI_UNIQUE | cf::NDI_RED); 2784 cf::NDI_UNIQUE | cf::NDI_RED);
2692 2785
2693 warn "ERROR in enter_exit: $@"; 2786 warn "ERROR in enter_exit: $@";
2710sub cf::client::send_drawinfo { 2803sub cf::client::send_drawinfo {
2711 my ($self, $text, $flags) = @_; 2804 my ($self, $text, $flags) = @_;
2712 2805
2713 utf8::encode $text; 2806 utf8::encode $text;
2714 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2807 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2808}
2809
2810=item $client->send_big_packet ($pkt)
2811
2812Like C<send_packet>, but tries to compress large packets, and fragments
2813them as required.
2814
2815=cut
2816
2817our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2818
2819sub cf::client::send_big_packet {
2820 my ($self, $pkt) = @_;
2821
2822 # try lzf for large packets
2823 $pkt = "lzf " . Compress::LZF::compress $pkt
2824 if 1024 <= length $pkt and $self->{can_lzf};
2825
2826 # split very large packets
2827 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2828 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2829 $pkt = "frag";
2830 }
2831
2832 $self->send_packet ($pkt);
2715} 2833}
2716 2834
2717=item $client->send_msg ($channel, $msg, $color, [extra...]) 2835=item $client->send_msg ($channel, $msg, $color, [extra...])
2718 2836
2719Send a drawinfo or msg packet to the client, formatting the msg for the 2837Send a drawinfo or msg packet to the client, formatting the msg for the
2723 2841
2724=cut 2842=cut
2725 2843
2726# non-persistent channels (usually the info channel) 2844# non-persistent channels (usually the info channel)
2727our %CHANNEL = ( 2845our %CHANNEL = (
2846 "c/motd" => {
2847 id => "infobox",
2848 title => "MOTD",
2849 reply => undef,
2850 tooltip => "The message of the day",
2851 },
2728 "c/identify" => { 2852 "c/identify" => {
2729 id => "infobox", 2853 id => "infobox",
2730 title => "Identify", 2854 title => "Identify",
2731 reply => undef, 2855 reply => undef,
2732 tooltip => "Items recently identified", 2856 tooltip => "Items recently identified",
2734 "c/examine" => { 2858 "c/examine" => {
2735 id => "infobox", 2859 id => "infobox",
2736 title => "Examine", 2860 title => "Examine",
2737 reply => undef, 2861 reply => undef,
2738 tooltip => "Signs and other items you examined", 2862 tooltip => "Signs and other items you examined",
2863 },
2864 "c/shopinfo" => {
2865 id => "infobox",
2866 title => "Shop Info",
2867 reply => undef,
2868 tooltip => "What your bargaining skill tells you about the shop",
2739 }, 2869 },
2740 "c/book" => { 2870 "c/book" => {
2741 id => "infobox", 2871 id => "infobox",
2742 title => "Book", 2872 title => "Book",
2743 reply => undef, 2873 reply => undef,
2759 id => "infobox", 2889 id => "infobox",
2760 title => "Body Parts", 2890 title => "Body Parts",
2761 reply => undef, 2891 reply => undef,
2762 tooltip => "Shows which body parts you posess and are available", 2892 tooltip => "Shows which body parts you posess and are available",
2763 }, 2893 },
2894 "c/statistics" => {
2895 id => "infobox",
2896 title => "Statistics",
2897 reply => undef,
2898 tooltip => "Shows your primary statistics",
2899 },
2900 "c/skills" => {
2901 id => "infobox",
2902 title => "Skills",
2903 reply => undef,
2904 tooltip => "Shows your experience per skill and item power",
2905 },
2906 "c/shopitems" => {
2907 id => "infobox",
2908 title => "Shop Items",
2909 reply => undef,
2910 tooltip => "Shows the items currently for sale in this shop",
2911 },
2912 "c/resistances" => {
2913 id => "infobox",
2914 title => "Resistances",
2915 reply => undef,
2916 tooltip => "Shows your resistances",
2917 },
2918 "c/pets" => {
2919 id => "infobox",
2920 title => "Pets",
2921 reply => undef,
2922 tooltip => "Shows information abotu your pets/a specific pet",
2923 },
2924 "c/perceiveself" => {
2925 id => "infobox",
2926 title => "Perceive Self",
2927 reply => undef,
2928 tooltip => "You gained detailed knowledge about yourself",
2929 },
2764 "c/uptime" => { 2930 "c/uptime" => {
2765 id => "infobox", 2931 id => "infobox",
2766 title => "Uptime", 2932 title => "Uptime",
2767 reply => undef, 2933 reply => undef,
2768 tooltip => "How long the server has been running since last restart", 2934 tooltip => "How long the server has been running since last restart",
2771 id => "infobox", 2937 id => "infobox",
2772 title => "Map Info", 2938 title => "Map Info",
2773 reply => undef, 2939 reply => undef,
2774 tooltip => "Information related to the maps", 2940 tooltip => "Information related to the maps",
2775 }, 2941 },
2942 "c/party" => {
2943 id => "party",
2944 title => "Party",
2945 reply => "gsay ",
2946 tooltip => "Messages and chat related to your party",
2947 },
2948 "c/death" => {
2949 id => "death",
2950 title => "Death",
2951 reply => undef,
2952 tooltip => "Reason for and more info about your most recent death",
2953 },
2954 "c/say" => $SAY_CHANNEL,
2955 "c/chat" => $CHAT_CHANNEL,
2776); 2956);
2777 2957
2778sub cf::client::send_msg { 2958sub cf::client::send_msg {
2779 my ($self, $channel, $msg, $color, @extra) = @_; 2959 my ($self, $channel, $msg, $color, @extra) = @_;
2780 2960
2781 $msg = $self->pl->expand_cfpod ($msg); 2961 $msg = $self->pl->expand_cfpod ($msg)
2962 unless $color & cf::NDI_VERBATIM;
2782 2963
2783 $color &= cf::NDI_CLIENT_MASK; # just in case... 2964 $color &= cf::NDI_CLIENT_MASK; # just in case...
2784 2965
2785 # check predefined channels, for the benefit of C 2966 # check predefined channels, for the benefit of C
2786 if ($CHANNEL{$channel}) { 2967 if ($CHANNEL{$channel}) {
2787 $channel = $CHANNEL{$channel}; 2968 $channel = $CHANNEL{$channel};
2788 2969
2789 $self->ext_msg (channel_info => $channel) 2970 $self->ext_msg (channel_info => $channel);
2790 if $self->can_msg;
2791
2792 $channel = $channel->{id}; 2971 $channel = $channel->{id};
2793 2972
2794 } elsif (ref $channel) { 2973 } elsif (ref $channel) {
2795 # send meta info to client, if not yet sent 2974 # send meta info to client, if not yet sent
2796 unless (exists $self->{channel}{$channel->{id}}) { 2975 unless (exists $self->{channel}{$channel->{id}}) {
2797 $self->{channel}{$channel->{id}} = $channel; 2976 $self->{channel}{$channel->{id}} = $channel;
2798 $self->ext_msg (channel_info => $channel) 2977 $self->ext_msg (channel_info => $channel);
2799 if $self->can_msg;
2800 } 2978 }
2801 2979
2802 $channel = $channel->{id}; 2980 $channel = $channel->{id};
2803 } 2981 }
2804 2982
2805 return unless @extra || length $msg; 2983 return unless @extra || length $msg;
2806 2984
2807 if ($self->can_msg) {
2808 # default colour, mask it out 2985 # default colour, mask it out
2809 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2986 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2810 if $color & cf::NDI_DEF; 2987 if $color & cf::NDI_DEF;
2811 2988
2812 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2989 my $pkt = "msg "
2990 . $self->{json_coder}->encode (
2813 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2991 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2814 } else { 2992 );
2815 if ($color >= 0) {
2816 # replace some tags by gcfclient-compatible ones
2817 for ($msg) {
2818 1 while
2819 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2820 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2821 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2822 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2823 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2824 }
2825 2993
2826 $color &= cf::NDI_COLOR_MASK; 2994 $self->send_big_packet ($pkt);
2827
2828 utf8::encode $msg;
2829
2830 if (0 && $msg =~ /\[/) {
2831 # COMMAND/INFO
2832 $self->send_packet ("drawextinfo $color 10 8 $msg")
2833 } else {
2834 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2835 $self->send_packet ("drawinfo $color $msg")
2836 }
2837 }
2838 }
2839} 2995}
2840 2996
2841=item $client->ext_msg ($type, @msg) 2997=item $client->ext_msg ($type, @msg)
2842 2998
2843Sends an ext event to the client. 2999Sends an ext event to the client.
2846 3002
2847sub cf::client::ext_msg($$@) { 3003sub cf::client::ext_msg($$@) {
2848 my ($self, $type, @msg) = @_; 3004 my ($self, $type, @msg) = @_;
2849 3005
2850 if ($self->extcmd == 2) { 3006 if ($self->extcmd == 2) {
2851 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3007 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2852 } elsif ($self->extcmd == 1) { # TODO: remove 3008 } elsif ($self->extcmd == 1) { # TODO: remove
2853 push @msg, msgtype => "event_$type"; 3009 push @msg, msgtype => "event_$type";
2854 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2855 } 3011 }
2856} 3012}
2857 3013
2858=item $client->ext_reply ($msgid, @msg) 3014=item $client->ext_reply ($msgid, @msg)
2859 3015
2863 3019
2864sub cf::client::ext_reply($$@) { 3020sub cf::client::ext_reply($$@) {
2865 my ($self, $id, @msg) = @_; 3021 my ($self, $id, @msg) = @_;
2866 3022
2867 if ($self->extcmd == 2) { 3023 if ($self->extcmd == 2) {
2868 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3024 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2869 } elsif ($self->extcmd == 1) { 3025 } elsif ($self->extcmd == 1) {
2870 #TODO: version 1, remove 3026 #TODO: version 1, remove
2871 unshift @msg, msgtype => "reply", msgid => $id; 3027 unshift @msg, msgtype => "reply", msgid => $id;
2872 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3028 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2873 } 3029 }
2874} 3030}
2875 3031
2876=item $success = $client->query ($flags, "text", \&cb) 3032=item $success = $client->query ($flags, "text", \&cb)
2877 3033
3004our $safe_hole = new Safe::Hole; 3160our $safe_hole = new Safe::Hole;
3005 3161
3006$SIG{FPE} = 'IGNORE'; 3162$SIG{FPE} = 'IGNORE';
3007 3163
3008$safe->permit_only (Opcode::opset qw( 3164$safe->permit_only (Opcode::opset qw(
3009 :base_core :base_mem :base_orig :base_math 3165 :base_core :base_mem :base_orig :base_math :base_loop
3010 grepstart grepwhile mapstart mapwhile 3166 grepstart grepwhile mapstart mapwhile
3011 sort time 3167 sort time
3012)); 3168));
3013 3169
3014# here we export the classes and methods available to script code 3170# here we export the classes and methods available to script code
3017 3173
3018The following functions and methods are available within a safe environment: 3174The following functions and methods are available within a safe environment:
3019 3175
3020 cf::object 3176 cf::object
3021 contr pay_amount pay_player map x y force_find force_add destroy 3177 contr pay_amount pay_player map x y force_find force_add destroy
3022 insert remove name archname title slaying race decrease_ob_nr 3178 insert remove name archname title slaying race decrease split
3179 value
3023 3180
3024 cf::object::player 3181 cf::object::player
3025 player 3182 player
3026 3183
3027 cf::player 3184 cf::player
3032 3189
3033=cut 3190=cut
3034 3191
3035for ( 3192for (
3036 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3193 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3037 insert remove inv name archname title slaying race 3194 insert remove inv nrof name archname title slaying race
3038 decrease_ob_nr destroy)], 3195 decrease split destroy change_exp value msg lore send_msg)],
3039 ["cf::object::player" => qw(player)], 3196 ["cf::object::player" => qw(player)],
3040 ["cf::player" => qw(peaceful)], 3197 ["cf::player" => qw(peaceful send_msg)],
3041 ["cf::map" => qw(trigger)], 3198 ["cf::map" => qw(trigger)],
3042) { 3199) {
3043 no strict 'refs'; 3200 no strict 'refs';
3044 my ($pkg, @funs) = @$_; 3201 my ($pkg, @funs) = @$_;
3045 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3202 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3063 3220
3064 my $qcode = $code; 3221 my $qcode = $code;
3065 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3222 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3066 $qcode =~ s/\n/\\n/g; 3223 $qcode =~ s/\n/\\n/g;
3067 3224
3225 %vars = (_dummy => 0) unless %vars;
3226
3227 my @res;
3068 local $_; 3228 local $_;
3069 local @safe::cf::_safe_eval_args = values %vars;
3070 3229
3071 my $eval = 3230 my $eval =
3072 "do {\n" 3231 "do {\n"
3073 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3232 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3074 . "#line 0 \"{$qcode}\"\n" 3233 . "#line 0 \"{$qcode}\"\n"
3075 . $code 3234 . $code
3076 . "\n}" 3235 . "\n}"
3077 ; 3236 ;
3078 3237
3238 if ($CFG{safe_eval}) {
3079 sub_generation_inc; 3239 sub_generation_inc;
3240 local @safe::cf::_safe_eval_args = values %vars;
3080 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3241 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3081 sub_generation_inc; 3242 sub_generation_inc;
3243 } else {
3244 local @cf::_safe_eval_args = values %vars;
3245 @res = wantarray ? eval eval : scalar eval $eval;
3246 }
3082 3247
3083 if ($@) { 3248 if ($@) {
3084 warn "$@"; 3249 warn "$@";
3085 warn "while executing safe code '$code'\n"; 3250 warn "while executing safe code '$code'\n";
3086 warn "with arguments " . (join " ", %vars) . "\n"; 3251 warn "with arguments " . (join " ", %vars) . "\n";
3105=cut 3270=cut
3106 3271
3107sub register_script_function { 3272sub register_script_function {
3108 my ($fun, $cb) = @_; 3273 my ($fun, $cb) = @_;
3109 3274
3110 no strict 'refs'; 3275 $fun = "safe::$fun" if $CFG{safe_eval};
3111 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3276 *$fun = $safe_hole->wrap ($cb);
3112} 3277}
3113 3278
3114=back 3279=back
3115 3280
3116=cut 3281=cut
3137 3302
3138 $facedata->{version} == 2 3303 $facedata->{version} == 2
3139 or cf::cleanup "$path: version mismatch, cannot proceed."; 3304 or cf::cleanup "$path: version mismatch, cannot proceed.";
3140 3305
3141 # patch in the exptable 3306 # patch in the exptable
3307 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3142 $facedata->{resource}{"res/exp_table"} = { 3308 $facedata->{resource}{"res/exp_table"} = {
3143 type => FT_RSRC, 3309 type => FT_RSRC,
3144 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3310 data => $exp_table,
3311 hash => (Digest::MD5::md5 $exp_table),
3145 }; 3312 };
3146 cf::cede_to_tick; 3313 cf::cede_to_tick;
3147 3314
3148 { 3315 {
3149 my $faces = $facedata->{faceinfo}; 3316 my $faces = $facedata->{faceinfo};
3150 3317
3151 while (my ($face, $info) = each %$faces) { 3318 while (my ($face, $info) = each %$faces) {
3152 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3319 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3320
3153 cf::face::set_visibility $idx, $info->{visibility}; 3321 cf::face::set_visibility $idx, $info->{visibility};
3154 cf::face::set_magicmap $idx, $info->{magicmap}; 3322 cf::face::set_magicmap $idx, $info->{magicmap};
3155 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3323 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3156 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3324 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3157 3325
3158 cf::cede_to_tick; 3326 cf::cede_to_tick;
3159 } 3327 }
3160 3328
3161 while (my ($face, $info) = each %$faces) { 3329 while (my ($face, $info) = each %$faces) {
3162 next unless $info->{smooth}; 3330 next unless $info->{smooth};
3331
3163 my $idx = cf::face::find $face 3332 my $idx = cf::face::find $face
3164 or next; 3333 or next;
3334
3165 if (my $smooth = cf::face::find $info->{smooth}) { 3335 if (my $smooth = cf::face::find $info->{smooth}) {
3166 cf::face::set_smooth $idx, $smooth; 3336 cf::face::set_smooth $idx, $smooth;
3167 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3337 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3168 } else { 3338 } else {
3169 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3339 warn "smooth face '$info->{smooth}' not found for face '$face'";
3183 3353
3184 cf::anim::invalidate_all; # d'oh 3354 cf::anim::invalidate_all; # d'oh
3185 } 3355 }
3186 3356
3187 { 3357 {
3188 # TODO: for gcfclient pleasure, we should give resources
3189 # that gcfclient doesn't grok a >10000 face index.
3190 my $res = $facedata->{resource}; 3358 my $res = $facedata->{resource};
3191 3359
3192 my $soundconf = delete $res->{"res/sound.conf"};
3193
3194 while (my ($name, $info) = each %$res) { 3360 while (my ($name, $info) = each %$res) {
3361 if (defined $info->{type}) {
3195 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3362 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3196 my $data;
3197 3363
3198 if ($info->{type} & 1) { 3364 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3199 # prepend meta info 3365 cf::face::set_type $idx, $info->{type};
3200
3201 my $meta = $enc->encode ({
3202 name => $name,
3203 %{ $info->{meta} || {} },
3204 });
3205
3206 $data = pack "(w/a*)*", $meta, $info->{data};
3207 } else { 3366 } else {
3208 $data = $info->{data}; 3367 $RESOURCE{$name} = $info;
3209 } 3368 }
3210 3369
3211 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3212 cf::face::set_type $idx, $info->{type};
3213
3214 cf::cede_to_tick; 3370 cf::cede_to_tick;
3215 } 3371 }
3216
3217 if ($soundconf) {
3218 $soundconf = $enc->decode (delete $soundconf->{data});
3219
3220 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3221 my $sound = $soundconf->{compat}[$_]
3222 or next;
3223
3224 my $face = cf::face::find "sound/$sound->[1]";
3225 cf::sound::set $sound->[0] => $face;
3226 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3227 }
3228
3229 while (my ($k, $v) = each %{$soundconf->{event}}) {
3230 my $face = cf::face::find "sound/$v";
3231 cf::sound::set $k => $face;
3232 }
3233 }
3234 } 3372 }
3373
3374 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3235 3375
3236 1 3376 1
3237} 3377}
3378
3379cf::global->attach (on_resource_update => sub {
3380 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3381 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3382
3383 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3384 my $sound = $soundconf->{compat}[$_]
3385 or next;
3386
3387 my $face = cf::face::find "sound/$sound->[1]";
3388 cf::sound::set $sound->[0] => $face;
3389 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3390 }
3391
3392 while (my ($k, $v) = each %{$soundconf->{event}}) {
3393 my $face = cf::face::find "sound/$v";
3394 cf::sound::set $k => $face;
3395 }
3396 }
3397});
3238 3398
3239register_exticmd fx_want => sub { 3399register_exticmd fx_want => sub {
3240 my ($ns, $want) = @_; 3400 my ($ns, $want) = @_;
3241 3401
3242 while (my ($k, $v) = each %$want) { 3402 while (my ($k, $v) = each %$want) {
3243 $ns->fx_want ($k, $v); 3403 $ns->fx_want ($k, $v);
3244 } 3404 }
3245}; 3405};
3406
3407sub load_resource_file($) {
3408 my $guard = lock_acquire "load_resource_file";
3409
3410 my $status = load_resource_file_ $_[0];
3411 get_slot 0.1, 100;
3412 cf::arch::commit_load;
3413
3414 $status
3415}
3246 3416
3247sub reload_regions { 3417sub reload_regions {
3248 # HACK to clear player env face cache, we need some signal framework 3418 # HACK to clear player env face cache, we need some signal framework
3249 # for this (global event?) 3419 # for this (global event?)
3250 %ext::player_env::MUSIC_FACE_CACHE = (); 3420 %ext::player_env::MUSIC_FACE_CACHE = ();
3264} 3434}
3265 3435
3266sub reload_archetypes { 3436sub reload_archetypes {
3267 load_resource_file "$DATADIR/archetypes" 3437 load_resource_file "$DATADIR/archetypes"
3268 or die "unable to load archetypes\n"; 3438 or die "unable to load archetypes\n";
3269 #d# NEED to laod twice to resolve forward references
3270 # this really needs to be done in an extra post-pass
3271 # (which needs to be synchronous, so solve it differently)
3272 load_resource_file "$DATADIR/archetypes"
3273 or die "unable to load archetypes\n";
3274} 3439}
3275 3440
3276sub reload_treasures { 3441sub reload_treasures {
3277 load_resource_file "$DATADIR/treasures" 3442 load_resource_file "$DATADIR/treasures"
3278 or die "unable to load treasurelists\n"; 3443 or die "unable to load treasurelists\n";
3279} 3444}
3280 3445
3281sub reload_resources { 3446sub reload_resources {
3282 warn "reloading resource files...\n"; 3447 warn "reloading resource files...\n";
3283 3448
3449 reload_facedata;
3450 reload_archetypes;
3284 reload_regions; 3451 reload_regions;
3285 reload_facedata;
3286 #reload_archetypes;#d#
3287 reload_archetypes;
3288 reload_treasures; 3452 reload_treasures;
3289 3453
3290 warn "finished reloading resource files\n"; 3454 warn "finished reloading resource files\n";
3291} 3455}
3292 3456
3293sub init {
3294 reload_resources;
3295}
3296
3297sub reload_config { 3457sub reload_config {
3458 warn "reloading config file...\n";
3459
3298 open my $fh, "<:utf8", "$CONFDIR/config" 3460 open my $fh, "<:utf8", "$CONFDIR/config"
3299 or return; 3461 or return;
3300 3462
3301 local $/; 3463 local $/;
3302 *CFG = YAML::Syck::Load <$fh>; 3464 *CFG = YAML::XS::Load scalar <$fh>;
3303 3465
3304 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3466 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3305 3467
3306 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3468 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3307 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3469 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3311 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3473 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3312 and die "WARNING: m(un)lockall failed: $!\n"; 3474 and die "WARNING: m(un)lockall failed: $!\n";
3313 }; 3475 };
3314 warn $@ if $@; 3476 warn $@ if $@;
3315 } 3477 }
3478
3479 warn "finished reloading resource files\n";
3480}
3481
3482sub pidfile() {
3483 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3484 or die "$PIDFILE: $!";
3485 flock $fh, &Fcntl::LOCK_EX
3486 or die "$PIDFILE: flock: $!";
3487 $fh
3488}
3489
3490# make sure only one server instance is running at any one time
3491sub atomic {
3492 my $fh = pidfile;
3493
3494 my $pid = <$fh>;
3495 kill 9, $pid if $pid > 0;
3496
3497 seek $fh, 0, 0;
3498 print $fh $$;
3499}
3500
3501sub main_loop {
3502 warn "EV::loop starting\n";
3503 if (1) {
3504 EV::loop;
3505 }
3506 warn "EV::loop returned\n";
3507 goto &main_loop unless $REALLY_UNLOOP;
3316} 3508}
3317 3509
3318sub main { 3510sub main {
3511 cf::init_globals; # initialise logging
3512
3513 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3514 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3515 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3516 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3517
3518 cf::init_experience;
3519 cf::init_anim;
3520 cf::init_attackmess;
3521 cf::init_dynamic;
3522
3523 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3524
3319 # we must not ever block the main coroutine 3525 # we must not ever block the main coroutine
3320 local $Coro::idle = sub { 3526 local $Coro::idle = sub {
3321 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3527 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3322 (async { 3528 (async {
3323 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3529 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT; 3530 EV::loop EV::LOOP_ONESHOT;
3325 })->prio (Coro::PRIO_MAX); 3531 })->prio (Coro::PRIO_MAX);
3326 }; 3532 };
3327 3533
3534 evthread_start IO::AIO::poll_fileno;
3535
3536 cf::sync_job {
3537 cf::load_settings;
3538 cf::load_materials;
3539
3540 reload_resources;
3328 reload_config; 3541 reload_config;
3329 db_init; 3542 db_init;
3543
3544 cf::init_uuid;
3545 cf::init_signals;
3546 cf::init_commands;
3547 cf::init_skills;
3548
3549 cf::init_beforeplay;
3550
3551 atomic;
3552
3330 load_extensions; 3553 load_extensions;
3331 3554
3332 $TICK_WATCHER->start; 3555 utime time, time, $RUNTIMEFILE;
3333 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3556
3334 EV::loop; 3557 # no (long-running) fork's whatsoever before this point(!)
3558 use POSIX ();
3559 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3560
3561 (pop @POST_INIT)->(0) while @POST_INIT;
3562 };
3563
3564 main_loop;
3335} 3565}
3336 3566
3337############################################################################# 3567#############################################################################
3338# initialisation and cleanup 3568# initialisation and cleanup
3339 3569
3345 cf::cleanup "SIG$signal"; 3575 cf::cleanup "SIG$signal";
3346 }; 3576 };
3347 } 3577 }
3348} 3578}
3349 3579
3350sub write_runtime { 3580sub write_runtime_sync {
3351 my $runtime = "$LOCALDIR/runtime"; 3581 my $t0 = EV::time;
3352 3582
3353 # first touch the runtime file to show we are still running: 3583 # first touch the runtime file to show we are still running:
3354 # the fsync below can take a very very long time. 3584 # the fsync below can take a very very long time.
3355 3585
3356 IO::AIO::aio_utime $runtime, undef, undef; 3586 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3357 3587
3358 my $guard = cf::lock_acquire "write_runtime"; 3588 my $guard = cf::lock_acquire "write_runtime";
3359 3589
3360 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3590 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3361 or return; 3591 or return;
3362 3592
3363 my $value = $cf::RUNTIME + 90 + 10; 3593 my $value = $cf::RUNTIME + 90 + 10;
3364 # 10 is the runtime save interval, for a monotonic clock 3594 # 10 is the runtime save interval, for a monotonic clock
3365 # 60 allows for the watchdog to kill the server. 3595 # 60 allows for the watchdog to kill the server.
3375 aio_utime $fh, undef, undef; 3605 aio_utime $fh, undef, undef;
3376 3606
3377 close $fh 3607 close $fh
3378 or return; 3608 or return;
3379 3609
3380 aio_rename "$runtime~", $runtime 3610 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3381 and return; 3611 and return;
3382 3612
3383 warn "runtime file written.\n"; 3613 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3384 3614
3385 1 3615 1
3616}
3617
3618our $uuid_lock;
3619our $uuid_skip;
3620
3621sub write_uuid_sync($) {
3622 $uuid_skip ||= $_[0];
3623
3624 return if $uuid_lock;
3625 local $uuid_lock = 1;
3626
3627 my $uuid = "$LOCALDIR/uuid";
3628
3629 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3630 or return;
3631
3632 my $value = uuid_seq uuid_cur;
3633
3634 unless ($value) {
3635 warn "cowardly refusing to write zero uuid value!\n";
3636 return;
3637 }
3638
3639 my $value = uuid_str $value + $uuid_skip;
3640 $uuid_skip = 0;
3641
3642 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3643 and return;
3644
3645 # always fsync - this file is important
3646 aio_fsync $fh
3647 and return;
3648
3649 close $fh
3650 or return;
3651
3652 aio_rename "$uuid~", $uuid
3653 and return;
3654
3655 warn "uuid file written ($value).\n";
3656
3657 1
3658
3659}
3660
3661sub write_uuid($$) {
3662 my ($skip, $sync) = @_;
3663
3664 $sync ? write_uuid_sync $skip
3665 : async { write_uuid_sync $skip };
3386} 3666}
3387 3667
3388sub emergency_save() { 3668sub emergency_save() {
3389 my $freeze_guard = cf::freeze_mainloop; 3669 my $freeze_guard = cf::freeze_mainloop;
3390 3670
3391 warn "enter emergency perl save\n"; 3671 warn "emergency_perl_save: enter\n";
3392 3672
3393 cf::sync_job { 3673 cf::sync_job {
3674 # this is a trade-off: we want to be very quick here, so
3675 # save all maps without fsync, and later call a global sync
3676 # (which in turn might be very very slow)
3677 local $USE_FSYNC = 0;
3678
3394 # use a peculiar iteration method to avoid tripping on perl 3679 # use a peculiar iteration method to avoid tripping on perl
3395 # refcount bugs in for. also avoids problems with players 3680 # refcount bugs in for. also avoids problems with players
3396 # and maps saved/destroyed asynchronously. 3681 # and maps saved/destroyed asynchronously.
3397 warn "begin emergency player save\n"; 3682 warn "emergency_perl_save: begin player save\n";
3398 for my $login (keys %cf::PLAYER) { 3683 for my $login (keys %cf::PLAYER) {
3399 my $pl = $cf::PLAYER{$login} or next; 3684 my $pl = $cf::PLAYER{$login} or next;
3400 $pl->valid or next; 3685 $pl->valid or next;
3401 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3686 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3402 $pl->save; 3687 $pl->save;
3403 } 3688 }
3404 warn "end emergency player save\n"; 3689 warn "emergency_perl_save: end player save\n";
3405 3690
3406 warn "begin emergency map save\n"; 3691 warn "emergency_perl_save: begin map save\n";
3407 for my $path (keys %cf::MAP) { 3692 for my $path (keys %cf::MAP) {
3408 my $map = $cf::MAP{$path} or next; 3693 my $map = $cf::MAP{$path} or next;
3409 $map->valid or next; 3694 $map->valid or next;
3410 $map->save; 3695 $map->save;
3411 } 3696 }
3412 warn "end emergency map save\n"; 3697 warn "emergency_perl_save: end map save\n";
3413 3698
3414 warn "begin emergency database checkpoint\n"; 3699 warn "emergency_perl_save: begin database checkpoint\n";
3415 BDB::db_env_txn_checkpoint $DB_ENV; 3700 BDB::db_env_txn_checkpoint $DB_ENV;
3416 warn "end emergency database checkpoint\n"; 3701 warn "emergency_perl_save: end database checkpoint\n";
3702
3703 warn "emergency_perl_save: begin write uuid\n";
3704 write_uuid_sync 1;
3705 warn "emergency_perl_save: end write uuid\n";
3417 }; 3706 };
3418 3707
3708 warn "emergency_perl_save: starting sync()\n";
3709 IO::AIO::aio_sync sub {
3710 warn "emergency_perl_save: finished sync()\n";
3711 };
3712
3419 warn "leave emergency perl save\n"; 3713 warn "emergency_perl_save: leave\n";
3420} 3714}
3421 3715
3422sub post_cleanup { 3716sub post_cleanup {
3423 my ($make_core) = @_; 3717 my ($make_core) = @_;
3424 3718
3425 warn Carp::longmess "post_cleanup backtrace" 3719 warn Carp::longmess "post_cleanup backtrace"
3426 if $make_core; 3720 if $make_core;
3721
3722 my $fh = pidfile;
3723 unlink $PIDFILE if <$fh> == $$;
3724}
3725
3726# a safer delete_package, copied from Symbol
3727sub clear_package($) {
3728 my $pkg = shift;
3729
3730 # expand to full symbol table name if needed
3731 unless ($pkg =~ /^main::.*::$/) {
3732 $pkg = "main$pkg" if $pkg =~ /^::/;
3733 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3734 $pkg .= '::' unless $pkg =~ /::$/;
3735 }
3736
3737 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3738 my $stem_symtab = *{$stem}{HASH};
3739
3740 defined $stem_symtab and exists $stem_symtab->{$leaf}
3741 or return;
3742
3743 # clear all symbols
3744 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3745 for my $name (keys %$leaf_symtab) {
3746 _gv_clear *{"$pkg$name"};
3747# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3748 }
3749 warn "cleared package $pkg\n";#d#
3427} 3750}
3428 3751
3429sub do_reload_perl() { 3752sub do_reload_perl() {
3430 # can/must only be called in main 3753 # can/must only be called in main
3431 if ($Coro::current != $Coro::main) { 3754 if ($Coro::current != $Coro::main) {
3432 warn "can only reload from main coroutine"; 3755 warn "can only reload from main coroutine";
3433 return; 3756 return;
3434 } 3757 }
3435 3758
3759 return if $RELOAD++;
3760
3761 my $t1 = EV::time;
3762
3763 while ($RELOAD) {
3436 warn "reloading..."; 3764 warn "reloading...";
3437 3765
3438 warn "entering sync_job"; 3766 warn "entering sync_job";
3439 3767
3440 cf::sync_job { 3768 cf::sync_job {
3441 cf::write_runtime; # external watchdog should not bark 3769 cf::write_runtime_sync; # external watchdog should not bark
3442 cf::emergency_save; 3770 cf::emergency_save;
3443 cf::write_runtime; # external watchdog should not bark 3771 cf::write_runtime_sync; # external watchdog should not bark
3444 3772
3445 warn "syncing database to disk"; 3773 warn "syncing database to disk";
3446 BDB::db_env_txn_checkpoint $DB_ENV; 3774 BDB::db_env_txn_checkpoint $DB_ENV;
3447 3775
3448 # if anything goes wrong in here, we should simply crash as we already saved 3776 # if anything goes wrong in here, we should simply crash as we already saved
3449 3777
3450 warn "flushing outstanding aio requests"; 3778 warn "flushing outstanding aio requests";
3451 for (;;) {
3452 BDB::flush;
3453 IO::AIO::flush;
3454 Coro::cede_notself;
3455 last unless IO::AIO::nreqs || BDB::nreqs; 3779 while (IO::AIO::nreqs || BDB::nreqs) {
3456 warn "iterate..."; 3780 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3457 }
3458
3459 ++$RELOAD;
3460
3461 warn "cancelling all extension coros";
3462 $_->cancel for values %EXT_CORO;
3463 %EXT_CORO = ();
3464
3465 warn "removing commands";
3466 %COMMAND = ();
3467
3468 warn "removing ext/exti commands";
3469 %EXTCMD = ();
3470 %EXTICMD = ();
3471
3472 warn "unloading/nuking all extensions";
3473 for my $pkg (@EXTS) {
3474 warn "... unloading $pkg";
3475
3476 if (my $cb = $pkg->can ("unload")) {
3477 eval {
3478 $cb->($pkg);
3479 1
3480 } or warn "$pkg unloaded, but with errors: $@";
3481 } 3781 }
3482 3782
3483 warn "... nuking $pkg"; 3783 warn "cancelling all extension coros";
3484 Symbol::delete_package $pkg; 3784 $_->cancel for values %EXT_CORO;
3485 } 3785 %EXT_CORO = ();
3486 3786
3487 warn "unloading all perl modules loaded from $LIBDIR"; 3787 warn "removing commands";
3488 while (my ($k, $v) = each %INC) { 3788 %COMMAND = ();
3489 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3490 3789
3790 warn "removing ext/exti commands";
3791 %EXTCMD = ();
3792 %EXTICMD = ();
3793
3794 warn "unloading/nuking all extensions";
3795 for my $pkg (@EXTS) {
3491 warn "... unloading $k"; 3796 warn "... unloading $pkg";
3492 delete $INC{$k};
3493 3797
3494 $k =~ s/\.pm$//;
3495 $k =~ s/\//::/g;
3496
3497 if (my $cb = $k->can ("unload_module")) { 3798 if (my $cb = $pkg->can ("unload")) {
3799 eval {
3498 $cb->(); 3800 $cb->($pkg);
3801 1
3802 } or warn "$pkg unloaded, but with errors: $@";
3803 }
3804
3805 warn "... clearing $pkg";
3806 clear_package $pkg;
3499 } 3807 }
3500 3808
3501 Symbol::delete_package $k; 3809 warn "unloading all perl modules loaded from $LIBDIR";
3810 while (my ($k, $v) = each %INC) {
3811 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3812
3813 warn "... unloading $k";
3814 delete $INC{$k};
3815
3816 $k =~ s/\.pm$//;
3817 $k =~ s/\//::/g;
3818
3819 if (my $cb = $k->can ("unload_module")) {
3820 $cb->();
3821 }
3822
3823 clear_package $k;
3502 } 3824 }
3503 3825
3504 warn "getting rid of safe::, as good as possible"; 3826 warn "getting rid of safe::, as good as possible";
3505 Symbol::delete_package "safe::$_" 3827 clear_package "safe::$_"
3506 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3828 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3507 3829
3508 warn "unloading cf.pm \"a bit\""; 3830 warn "unloading cf.pm \"a bit\"";
3509 delete $INC{"cf.pm"}; 3831 delete $INC{"cf.pm"};
3510 delete $INC{"cf/pod.pm"}; 3832 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3511 3833
3512 # don't, removes xs symbols, too, 3834 # don't, removes xs symbols, too,
3513 # and global variables created in xs 3835 # and global variables created in xs
3514 #Symbol::delete_package __PACKAGE__; 3836 #clear_package __PACKAGE__;
3515 3837
3516 warn "unload completed, starting to reload now"; 3838 warn "unload completed, starting to reload now";
3517 3839
3518 warn "reloading cf.pm"; 3840 warn "reloading cf.pm";
3519 require cf; 3841 require cf;
3520 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3842 cf::_connect_to_perl_1;
3521 3843
3522 warn "loading config and database again"; 3844 warn "loading config and database again";
3523 cf::reload_config; 3845 cf::reload_config;
3524 3846
3525 warn "loading extensions"; 3847 warn "loading extensions";
3526 cf::load_extensions; 3848 cf::load_extensions;
3527 3849
3850 if ($REATTACH_ON_RELOAD) {
3528 warn "reattaching attachments to objects/players"; 3851 warn "reattaching attachments to objects/players";
3529 _global_reattach; # objects, sockets 3852 _global_reattach; # objects, sockets
3530 warn "reattaching attachments to maps"; 3853 warn "reattaching attachments to maps";
3531 reattach $_ for values %MAP; 3854 reattach $_ for values %MAP;
3532 warn "reattaching attachments to players"; 3855 warn "reattaching attachments to players";
3533 reattach $_ for values %PLAYER; 3856 reattach $_ for values %PLAYER;
3857 }
3534 3858
3859 warn "running post_init jobs";
3860 (pop @POST_INIT)->(1) while @POST_INIT;
3861
3535 warn "leaving sync_job"; 3862 warn "leaving sync_job";
3536 3863
3537 1 3864 1
3538 } or do { 3865 } or do {
3539 warn $@; 3866 warn $@;
3540 warn "error while reloading, exiting."; 3867 cf::cleanup "error while reloading, exiting.";
3541 exit 1;
3542 }; 3868 };
3543 3869
3544 warn "reloaded"; 3870 warn "reloaded";
3871 --$RELOAD;
3872 }
3873
3874 $t1 = EV::time - $t1;
3875 warn "reload completed in ${t1}s\n";
3545}; 3876};
3546 3877
3547our $RELOAD_WATCHER; # used only during reload 3878our $RELOAD_WATCHER; # used only during reload
3548 3879
3549sub reload_perl() { 3880sub reload_perl() {
3550 # doing reload synchronously and two reloads happen back-to-back, 3881 # doing reload synchronously and two reloads happen back-to-back,
3551 # coro crashes during coro_state_free->destroy here. 3882 # coro crashes during coro_state_free->destroy here.
3552 3883
3884 $RELOAD_WATCHER ||= cf::async {
3885 Coro::AIO::aio_wait cache_extensions;
3886
3553 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3887 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3888 do_reload_perl;
3554 undef $RELOAD_WATCHER; 3889 undef $RELOAD_WATCHER;
3555 do_reload_perl; 3890 };
3556 }; 3891 };
3557} 3892}
3558 3893
3559register_command "reload" => sub { 3894register_command "reload" => sub {
3560 my ($who, $arg) = @_; 3895 my ($who, $arg) = @_;
3574 3909
3575our @WAIT_FOR_TICK; 3910our @WAIT_FOR_TICK;
3576our @WAIT_FOR_TICK_BEGIN; 3911our @WAIT_FOR_TICK_BEGIN;
3577 3912
3578sub wait_for_tick { 3913sub wait_for_tick {
3579 return unless $TICK_WATCHER->is_active;
3580 return if $Coro::current == $Coro::main; 3914 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3581 3915
3582 my $signal = new Coro::Signal; 3916 my $signal = new Coro::Signal;
3583 push @WAIT_FOR_TICK, $signal; 3917 push @WAIT_FOR_TICK, $signal;
3584 $signal->wait; 3918 $signal->wait;
3585} 3919}
3586 3920
3587sub wait_for_tick_begin { 3921sub wait_for_tick_begin {
3588 return unless $TICK_WATCHER->is_active;
3589 return if $Coro::current == $Coro::main; 3922 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3590 3923
3591 my $signal = new Coro::Signal; 3924 my $signal = new Coro::Signal;
3592 push @WAIT_FOR_TICK_BEGIN, $signal; 3925 push @WAIT_FOR_TICK_BEGIN, $signal;
3593 $signal->wait; 3926 $signal->wait;
3594} 3927}
3595 3928
3596$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3929sub tick {
3597 if ($Coro::current != $Coro::main) { 3930 if ($Coro::current != $Coro::main) {
3598 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3931 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3599 unless ++$bug_warning > 10; 3932 unless ++$bug_warning > 10;
3600 return; 3933 return;
3601 } 3934 }
3602 3935
3603 $NOW = $tick_start = EV::now;
3604
3605 cf::server_tick; # one server iteration 3936 cf::server_tick; # one server iteration
3606 3937
3607 $RUNTIME += $TICK; 3938 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3608 $NEXT_TICK += $TICK;
3609 3939
3610 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3940 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3611 $NEXT_RUNTIME_WRITE = $NOW + 10; 3941 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3612 Coro::async_pool { 3942 Coro::async_pool {
3613 $Coro::current->{desc} = "runtime saver"; 3943 $Coro::current->{desc} = "runtime saver";
3614 write_runtime 3944 write_runtime_sync
3615 or warn "ERROR: unable to write runtime file: $!"; 3945 or warn "ERROR: unable to write runtime file: $!";
3616 }; 3946 };
3617 } 3947 }
3618 3948
3619 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3949 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3621 } 3951 }
3622 while (my $sig = shift @WAIT_FOR_TICK) { 3952 while (my $sig = shift @WAIT_FOR_TICK) {
3623 $sig->send; 3953 $sig->send;
3624 } 3954 }
3625 3955
3626 $LOAD = ($NOW - $tick_start) / $TICK; 3956 $LOAD = ($NOW - $TICK_START) / $TICK;
3627 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3957 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3628 3958
3629 _post_tick; 3959 if (0) {
3630}; 3960 if ($NEXT_TICK) {
3631$TICK_WATCHER->priority (EV::MAXPRI); 3961 my $jitter = $TICK_START - $NEXT_TICK;
3962 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3963 warn "jitter $JITTER\n";#d#
3964 }
3965 }
3966}
3632 3967
3633{ 3968{
3969 # configure BDB
3970
3634 BDB::min_parallel 8; 3971 BDB::min_parallel 16;
3635 BDB::max_poll_time $TICK * 0.1; 3972 BDB::max_poll_reqs $TICK * 0.1;
3636 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb; 3973 $AnyEvent::BDB::WATCHER->priority (1);
3637
3638 BDB::set_sync_prepare {
3639 my $status;
3640 my $current = $Coro::current;
3641 (
3642 sub {
3643 $status = $!;
3644 $current->ready; undef $current;
3645 },
3646 sub {
3647 Coro::schedule while defined $current;
3648 $! = $status;
3649 },
3650 )
3651 };
3652 3974
3653 unless ($DB_ENV) { 3975 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 3976 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3977 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656 | BDB::LOG_AUTOREMOVE, 1); 3978 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3979 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3980 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3981 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659 3982
3660 cf::sync_job { 3983 cf::sync_job {
3661 eval { 3984 eval {
3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4006 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3684 }; 4007 };
3685} 4008}
3686 4009
3687{ 4010{
4011 # configure IO::AIO
4012
3688 IO::AIO::min_parallel 8; 4013 IO::AIO::min_parallel 8;
3689
3690 undef $Coro::AIO::WATCHER;
3691 IO::AIO::max_poll_time $TICK * 0.1; 4014 IO::AIO::max_poll_time $TICK * 0.1;
3692 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb; 4015 undef $AnyEvent::AIO::WATCHER;
3693} 4016}
3694 4017
3695my $_log_backtrace; 4018my $_log_backtrace;
3696 4019
3697sub _log_backtrace { 4020sub _log_backtrace {
3700 $msg =~ s/\n//; 4023 $msg =~ s/\n//;
3701 4024
3702 # limit the # of concurrent backtraces 4025 # limit the # of concurrent backtraces
3703 if ($_log_backtrace < 2) { 4026 if ($_log_backtrace < 2) {
3704 ++$_log_backtrace; 4027 ++$_log_backtrace;
4028 my $perl_bt = Carp::longmess $msg;
3705 async { 4029 async {
3706 $Coro::current->{desc} = "abt $msg"; 4030 $Coro::current->{desc} = "abt $msg";
3707 4031
3708 my @bt = fork_call { 4032 my @bt = fork_call {
3709 @addr = map { sprintf "%x", $_ } @addr; 4033 @addr = map { sprintf "%x", $_ } @addr;
3720 } 4044 }
3721 4045
3722 @funcs 4046 @funcs
3723 }; 4047 };
3724 4048
3725 LOG llevInfo, "[ABT] $msg\n"; 4049 LOG llevInfo, "[ABT] $perl_bt\n";
4050 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3726 LOG llevInfo, "[ABT] $_\n" for @bt; 4051 LOG llevInfo, "[ABT] $_\n" for @bt;
3727 --$_log_backtrace; 4052 --$_log_backtrace;
3728 }; 4053 };
3729 } else { 4054 } else {
3730 LOG llevInfo, "[ABT] $msg\n"; 4055 LOG llevInfo, "[ABT] $msg\n";
3731 LOG llevInfo, "[ABT] [suppressed]\n"; 4056 LOG llevInfo, "[ABT] [suppressed]\n";
3732 } 4057 }
3733} 4058}
3734 4059
3735# load additional modules 4060# load additional modules
3736use cf::pod; 4061require "cf/$_.pm" for @EXTRA_MODULES;
4062cf::_connect_to_perl_2;
3737 4063
3738END { cf::emergency_save } 4064END { cf::emergency_save }
3739 4065
37401 40661
3741 4067

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines