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.384 by root, Fri Oct 12 18:17:16 2007 UTC vs.
Revision 1.495 by root, Tue Nov 10 04:38:45 2009 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 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 Storable; 32use EV;
10use Event;
11use Opcode; 33use Opcode;
12use Safe; 34use Safe;
13use Safe::Hole; 35use Safe::Hole;
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;
43use Coro::EV;
18use Coro::Event; 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; 58use Digest::MD5;
30use Fcntl; 59use Fcntl;
31use YAML::Syck (); 60use YAML::XS ();
32use IO::AIO 2.51 (); 61use IO::AIO ();
33use Time::HiRes; 62use Time::HiRes;
34use Compress::LZF; 63use Compress::LZF;
35use Digest::MD5 (); 64use Digest::MD5 ();
65
66AnyEvent::detect;
36 67
37# configure various modules to our taste 68# configure various modules to our taste
38# 69#
39$Storable::canonical = 1; # reduce rsync transfers 70$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 71Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
72
73$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
74
75# make sure c-lzf reinitialises itself
76Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 77Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 78
43$Event::Eval = 1; # no idea why this is required, but it is 79# strictly for debugging
44 80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 81
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 83
52our %COMMAND = (); 84our %COMMAND = ();
53our %COMMAND_TIME = (); 85our %COMMAND_TIME = ();
… …
56our %EXTCMD = (); 88our %EXTCMD = ();
57our %EXTICMD = (); 89our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 90our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 91our %EXT_MAP = (); # pluggable maps
60 92
61our $RELOAD; # number of reloads so far 93our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 94our @EVENT;
95our @REFLECT; # set by XS
96our %REFLECT; # set by us
63 97
64our $CONFDIR = confdir; 98our $CONFDIR = confdir;
65our $DATADIR = datadir; 99our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 103our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 104our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 105our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 106our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 107our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 108our $BDBDIR = "$LOCALDIR/db";
109our $PIDFILE = "$LOCALDIR/pid";
110our $RUNTIMEFILE = "$LOCALDIR/runtime";
111
112our %RESOURCE;
75 113
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 114our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 115our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 116our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 117our $USE_FSYNC = 1; # use fsync to write maps - default on
83 118
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 119our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 120our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 121our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 122our $DB_ENV;
89 123
124our @EXTRA_MODULES = qw(pod match mapscript);
125
90our %CFG; 126our %CFG;
91 127
92our $UPTIME; $UPTIME ||= time; 128our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 129our $RUNTIME;
130our $NOW;
94 131
95our (%PLAYER, %PLAYER_LOADING); # all users 132our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 133our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 134our $LINK_MAP; # the special {link} map, which is always available
98 135
99# used to convert map paths into valid unix filenames by replacing / by ∕ 136# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 137our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 138
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 139our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 140our $LOADAVG; # same thing, but with alpha-smoothing
141our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 142our $TICK_START; # for load detecting purposes
143
144our @POST_INIT;
145
146our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
147our $REALLY_UNLOOP; # never set to true, please :)
105 148
106binmode STDOUT; 149binmode STDOUT;
107binmode STDERR; 150binmode STDERR;
108 151
109# read virtual server time, if available 152# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 153unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 154 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 155 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 156 $RUNTIME = <$fh> + 0.;
114} 157}
158
159eval "sub TICK() { $TICK } 1" or die;
115 160
116mkdir $_ 161mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 162 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 163
119our $EMERGENCY_POSITION; 164our $EMERGENCY_POSITION;
120 165
121sub cf::map::normalise; 166sub cf::map::normalise;
167
168#############################################################################
169
170%REFLECT = ();
171for (@REFLECT) {
172 my $reflect = JSON::XS::decode_json $_;
173 $REFLECT{$reflect->{class}} = $reflect;
174}
175
176# this is decidedly evil
177$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
122 178
123############################################################################# 179#############################################################################
124 180
125=head2 GLOBAL VARIABLES 181=head2 GLOBAL VARIABLES
126 182
… …
162 218
163The raw value load value from the last tick. 219The raw value load value from the last tick.
164 220
165=item %cf::CFG 221=item %cf::CFG
166 222
167Configuration for the server, loaded from C</etc/crossfire/config>, or 223Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 224from wherever your confdir points to.
169 225
170=item cf::wait_for_tick, cf::wait_for_tick_begin 226=item cf::wait_for_tick, cf::wait_for_tick_begin
171 227
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 228These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
173returns directly I<after> the tick processing (and consequently, can only wake one process 229returns directly I<after> the tick processing (and consequently, can only wake one process
174per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 230per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
175 231
176=item @cf::INVOKE_RESULTS 232=item @cf::INVOKE_RESULTS
177 233
178This array contains the results of the last C<invoke ()> call. When 234This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 235C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call. 236that call.
181 237
238=item %cf::REFLECT
239
240Contains, for each (C++) class name, a hash reference with information
241about object members (methods, scalars, arrays and flags) and other
242metadata, which is useful for introspection.
243
182=back 244=back
183 245
184=cut 246=cut
185 247
186BEGIN { 248$Coro::State::WARNHOOK = sub {
187 *CORE::GLOBAL::warn = sub {
188 my $msg = join "", @_; 249 my $msg = join "", @_;
189 250
190 $msg .= "\n" 251 $msg .= "\n"
191 unless $msg =~ /\n$/; 252 unless $msg =~ /\n$/;
192 253
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 254 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 255
195 LOG llevError, $msg; 256 LOG llevError, $msg;
196 }; 257};
197} 258
259$Coro::State::DIEHOOK = sub {
260 return unless $^S eq 0; # "eq", not "=="
261
262 warn Carp::longmess $_[0];
263
264 if ($Coro::current == $Coro::main) {#d#
265 warn "DIEHOOK called in main context, Coro bug?\n";#d#
266 return;#d#
267 }#d#
268
269 # kill coroutine otherwise
270 Coro::terminate
271};
198 272
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 273@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 274@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 275@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 276@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
209for my $pkg (qw( 283for my $pkg (qw(
210 cf::global cf::attachable 284 cf::global cf::attachable
211 cf::object cf::object::player 285 cf::object cf::object::player
212 cf::client cf::player 286 cf::client cf::player
213 cf::arch cf::living 287 cf::arch cf::living
288 cf::map cf::mapspace
214 cf::map cf::party cf::region 289 cf::party cf::region
215)) { 290)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 291 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 292}
219 293
220$Event::DIED = sub { 294$EV::DIED = sub {
221 warn "error in event callback: @_"; 295 Carp::cluck "error in event callback: @_";
222}; 296};
223 297
224############################################################################# 298#############################################################################
225 299
226=head2 UTILITY FUNCTIONS 300=head2 UTILITY FUNCTIONS
… …
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 322 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 323 $d
250 } || "[unable to dump $_[0]: '$@']"; 324 } || "[unable to dump $_[0]: '$@']";
251} 325}
252 326
253=item $ref = cf::from_json $json 327=item $ref = cf::decode_json $json
254 328
255Converts a JSON string into the corresponding perl data structure. 329Converts a JSON string into the corresponding perl data structure.
256 330
257=item $json = cf::to_json $ref 331=item $json = cf::encode_json $ref
258 332
259Converts a perl data structure into its JSON representation. 333Converts a perl data structure into its JSON representation.
260 334
261=cut 335=cut
262 336
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 337our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 338
265sub to_json ($) { $json_coder->encode ($_[0]) } 339sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 340sub decode_json($) { $json_coder->decode ($_[0]) }
341
342=item cf::post_init { BLOCK }
343
344Execute the given codeblock, I<after> all extensions have been (re-)loaded,
345but I<before> the server starts ticking again.
346
347The cdoeblock will have a single boolean argument to indicate whether this
348is a reload or not.
349
350=cut
351
352sub post_init(&) {
353 push @POST_INIT, shift;
354}
267 355
268=item cf::lock_wait $string 356=item cf::lock_wait $string
269 357
270Wait until the given lock is available. See cf::lock_acquire. 358Wait until the given lock is available. See cf::lock_acquire.
271 359
272=item my $lock = cf::lock_acquire $string 360=item my $lock = cf::lock_acquire $string
273 361
274Wait until the given lock is available and then acquires it and returns 362Wait until the given lock is available and then acquires it and returns
275a Coro::guard object. If the guard object gets destroyed (goes out of scope, 363a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276for example when the coroutine gets canceled), the lock is automatically 364for example when the coroutine gets canceled), the lock is automatically
277returned. 365returned.
278 366
279Locks are *not* recursive, locking from the same coro twice results in a 367Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro. 368deadlocked coro.
… …
286 374
287Return true if the lock is currently active, i.e. somebody has locked it. 375Return true if the lock is currently active, i.e. somebody has locked it.
288 376
289=cut 377=cut
290 378
291our %LOCK; 379our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 380
294sub lock_wait($) { 381sub lock_wait($) {
295 my ($key) = @_; 382 $LOCKS->wait ($_[0]);
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
301
302 # wait for lock, if any
303 while ($LOCK{$key}) {
304 push @{ $LOCK{$key} }, $Coro::current;
305 Coro::schedule;
306 }
307} 383}
308 384
309sub lock_acquire($) { 385sub lock_acquire($) {
310 my ($key) = @_; 386 $LOCKS->guard ($_[0])
311
312 # wait, to be sure we are not locked
313 lock_wait $key;
314
315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
317
318 Coro::guard {
319 delete $LOCKER{$key};#d#
320 # wake up all waiters, to be on the safe side
321 $_->ready for @{ delete $LOCK{$key} };
322 }
323} 387}
324 388
325sub lock_active($) { 389sub lock_active($) {
326 my ($key) = @_; 390 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 391}
330 392
331sub freeze_mainloop { 393sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 394 tick_inhibit_inc;
333 395
334 my $guard = Coro::guard { 396 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 397}
336 }; 398
337 $TICK_WATCHER->stop; 399=item cf::periodic $interval, $cb
338 $guard 400
401Like EV::periodic, but randomly selects a starting point so that the actions
402get spread over timer.
403
404=cut
405
406sub periodic($$) {
407 my ($interval, $cb) = @_;
408
409 my $start = rand List::Util::min 180, $interval;
410
411 EV::periodic $start, $interval, 0, $cb
339} 412}
340 413
341=item cf::get_slot $time[, $priority[, $name]] 414=item cf::get_slot $time[, $priority[, $name]]
342 415
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 416Allocate $time seconds of blocking CPU time at priority C<$priority>:
… …
383 } 456 }
384 } 457 }
385}; 458};
386 459
387sub get_slot($;$$) { 460sub get_slot($;$$) {
461 return if tick_inhibit || $Coro::current == $Coro::main;
462
388 my ($time, $pri, $name) = @_; 463 my ($time, $pri, $name) = @_;
389 464
390 $time = $TICK * .6 if $time > $TICK * .6; 465 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 466 my $sig = new Coro::Signal;
392 467
… …
406 481
407BEGIN { *async = \&Coro::async_pool } 482BEGIN { *async = \&Coro::async_pool }
408 483
409=item cf::sync_job { BLOCK } 484=item cf::sync_job { BLOCK }
410 485
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 486The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 487is always able to handle events or runnable, as Deliantra is only
413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 488partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 489acceptable.
415 490
416If it must be done, put the blocking parts into C<sync_job>. This will run 491If it must be done, put the blocking parts into C<sync_job>. This will run
417the given BLOCK in another coroutine while waiting for the result. The 492the given BLOCK in another coroutine while waiting for the result. The
… …
422 497
423sub sync_job(&) { 498sub sync_job(&) {
424 my ($job) = @_; 499 my ($job) = @_;
425 500
426 if ($Coro::current == $Coro::main) { 501 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 502 my $time = EV::time;
428 503
429 # this is the main coro, too bad, we have to block 504 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 505 # till the operation succeeds, freezing the server :/
431 506
432 LOG llevError | logBacktrace, Carp::longmess "sync job";#d# 507 LOG llevError, Carp::longmess "sync job";#d#
433 508
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 509 my $freeze_guard = freeze_mainloop;
437 510
438 my $busy = 1; 511 my $busy = 1;
439 my @res; 512 my @res;
440 513
… …
444 warn $@ if $@; 517 warn $@ if $@;
445 undef $busy; 518 undef $busy;
446 })->prio (Coro::PRIO_MAX); 519 })->prio (Coro::PRIO_MAX);
447 520
448 while ($busy) { 521 while ($busy) {
449 Coro::cede or Event::one_event; 522 if (Coro::nready) {
523 Coro::cede_notself;
524 } else {
525 EV::loop EV::LOOP_ONESHOT;
450 } 526 }
527 }
451 528
452 $time = Event::time - $time; 529 my $time = EV::time - $time;
453 530
454 LOG llevError | logBacktrace, Carp::longmess "long sync job"
455 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
456
457 $tick_start += $time; # do not account sync jobs to server load 531 $TICK_START += $time; # do not account sync jobs to server load
458 532
459 wantarray ? @res : $res[0] 533 wantarray ? @res : $res[0]
460 } else { 534 } else {
461 # we are in another coroutine, how wonderful, everything just works 535 # we are in another coroutine, how wonderful, everything just works
462 536
… …
487=item fork_call { }, $args 561=item fork_call { }, $args
488 562
489Executes the given code block with the given arguments in a seperate 563Executes the given code block with the given arguments in a seperate
490process, returning the results. Everything must be serialisable with 564process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may 565Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling. 566never block itself or use any form of event handling.
493 567
494=cut 568=cut
495 569
496sub fork_call(&@) { 570sub fork_call(&@) {
497 my ($cb, @args) = @_; 571 my ($cb, @args) = @_;
… …
504 reset_signals; 578 reset_signals;
505 &$cb 579 &$cb
506 }, @args; 580 }, @args;
507 581
508 wantarray ? @res : $res[-1] 582 wantarray ? @res : $res[-1]
583}
584
585=item $coin = coin_from_name $name
586
587=cut
588
589our %coin_alias = (
590 "silver" => "silvercoin",
591 "silvercoin" => "silvercoin",
592 "silvercoins" => "silvercoin",
593 "gold" => "goldcoin",
594 "goldcoin" => "goldcoin",
595 "goldcoins" => "goldcoin",
596 "platinum" => "platinacoin",
597 "platinumcoin" => "platinacoin",
598 "platinumcoins" => "platinacoin",
599 "platina" => "platinacoin",
600 "platinacoin" => "platinacoin",
601 "platinacoins" => "platinacoin",
602 "royalty" => "royalty",
603 "royalties" => "royalty",
604);
605
606sub coin_from_name($) {
607 $coin_alias{$_[0]}
608 ? cf::arch::find $coin_alias{$_[0]}
609 : undef
509} 610}
510 611
511=item $value = cf::db_get $family => $key 612=item $value = cf::db_get $family => $key
512 613
513Returns a single value from the environment database. 614Returns a single value from the environment database.
… …
652 753
653############################################################################# 754#############################################################################
654 755
655=head2 ATTACHABLE OBJECTS 756=head2 ATTACHABLE OBJECTS
656 757
657Many objects in crossfire are so-called attachable objects. That means you can 758Many objects in deliantra are so-called attachable objects. That means you can
658attach callbacks/event handlers (a collection of which is called an "attachment") 759attach callbacks/event handlers (a collection of which is called an "attachment")
659to it. All such attachable objects support the following methods. 760to it. All such attachable objects support the following methods.
660 761
661In the following description, CLASS can be any of C<global>, C<object> 762In the following description, CLASS can be any of C<global>, C<object>
662C<player>, C<client> or C<map> (i.e. the attachable objects in 763C<player>, C<client> or C<map> (i.e. the attachable objects in
663Crossfire TRT). 764Deliantra).
664 765
665=over 4 766=over 4
666 767
667=item $attachable->attach ($attachment, key => $value...) 768=item $attachable->attach ($attachment, key => $value...)
668 769
… …
712=item cf::CLASS::attachment $name, ... 813=item cf::CLASS::attachment $name, ...
713 814
714Register an attachment by C<$name> through which attachable objects of the 815Register an attachment by C<$name> through which attachable objects of the
715given CLASS can refer to this attachment. 816given CLASS can refer to this attachment.
716 817
717Some classes such as crossfire maps and objects can specify attachments 818Some classes such as deliantra maps and objects can specify attachments
718that are attached at load/instantiate time, thus the need for a name. 819that are attached at load/instantiate time, thus the need for a name.
719 820
720These calls expect any number of the following handler/hook descriptions: 821These calls expect any number of the following handler/hook descriptions:
721 822
722=over 4 823=over 4
… …
950 } 1051 }
951 1052
952 0 1053 0
953} 1054}
954 1055
955=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1056=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
956 1057
957=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1058=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
958 1059
959Generate an object-specific event with the given arguments. 1060Generate an object-specific event with the given arguments.
960 1061
… …
966 1067
967=cut 1068=cut
968 1069
969############################################################################# 1070#############################################################################
970# object support 1071# object support
971#
972 1072
1073sub _object_equal($$);
1074sub _object_equal($$) {
1075 my ($a, $b) = @_;
1076
1077 return 0 unless (ref $a) eq (ref $b);
1078
1079 if ("HASH" eq ref $a) {
1080 my @ka = keys %$a;
1081 my @kb = keys %$b;
1082
1083 return 0 if @ka != @kb;
1084
1085 for (0 .. $#ka) {
1086 return 0 unless $ka[$_] eq $kb[$_];
1087 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1088 }
1089
1090 } elsif ("ARRAY" eq ref $a) {
1091
1092 return 0 if @$a != @$b;
1093
1094 for (0 .. $#$a) {
1095 return 0 unless _object_equal $a->[$_], $b->[$_];
1096 }
1097
1098 } elsif ($a ne $b) {
1099 return 0;
1100 }
1101
1102 1
1103}
1104
1105our $SLOW_MERGES;#d#
973sub _can_merge { 1106sub _can_merge {
974 my ($ob1, $ob2) = @_; 1107 my ($ob1, $ob2) = @_;
975 1108
976 local $Storable::canonical = 1; 1109 ++$SLOW_MERGES;#d#
977 my $fob1 = Storable::freeze $ob1;
978 my $fob2 = Storable::freeze $ob2;
979 1110
980 $fob1 eq $fob2 1111 # we do the slow way here
1112 return _object_equal $ob1, $ob2
981} 1113}
982 1114
983sub reattach { 1115sub reattach {
984 # basically do the same as instantiate, without calling instantiate 1116 # basically do the same as instantiate, without calling instantiate
985 my ($obj) = @_; 1117 my ($obj) = @_;
986 1118
1119 # no longer needed after getting rid of delete_package?
987 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1120 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
988 1121
989 my $registry = $obj->registry; 1122 my $registry = $obj->registry;
990 1123
991 @$registry = (); 1124 @$registry = ();
992 1125
… …
1007cf::attachable->attach ( 1140cf::attachable->attach (
1008 prio => -1000000, 1141 prio => -1000000,
1009 on_instantiate => sub { 1142 on_instantiate => sub {
1010 my ($obj, $data) = @_; 1143 my ($obj, $data) = @_;
1011 1144
1012 $data = from_json $data; 1145 $data = decode_json $data;
1013 1146
1014 for (@$data) { 1147 for (@$data) {
1015 my ($name, $args) = @$_; 1148 my ($name, $args) = @$_;
1016 1149
1017 $obj->attach ($name, %{$args || {} }); 1150 $obj->attach ($name, %{$args || {} });
… …
1038 utf8::decode (my $decname = $filename); 1171 utf8::decode (my $decname = $filename);
1039 warn sprintf "saving %s (%d,%d)\n", 1172 warn sprintf "saving %s (%d,%d)\n",
1040 $decname, length $$rdata, scalar @$objs; 1173 $decname, length $$rdata, scalar @$objs;
1041 1174
1042 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1043 chmod SAVE_MODE, $fh; 1176 aio_chmod $fh, SAVE_MODE;
1044 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1045 aio_fsync $fh if $cf::USE_FSYNC; 1178 if ($cf::USE_FSYNC) {
1179 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;
1180 aio_fsync $fh;
1181 }
1046 close $fh; 1182 aio_close $fh;
1047 1183
1048 if (@$objs) { 1184 if (@$objs) {
1049 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1185 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1186 aio_chmod $fh, SAVE_MODE;
1051 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs }; 1187 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1052 aio_write $fh, 0, (length $data), $data, 0; 1188 aio_write $fh, 0, (length $data), $data, 0;
1053 aio_fsync $fh if $cf::USE_FSYNC; 1189 if ($cf::USE_FSYNC) {
1190 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;
1191 aio_fsync $fh;
1192 }
1054 close $fh; 1193 aio_close $fh;
1055 aio_rename "$filename.pst~", "$filename.pst"; 1194 aio_rename "$filename.pst~", "$filename.pst";
1056 } 1195 }
1057 } else { 1196 } else {
1058 aio_unlink "$filename.pst"; 1197 aio_unlink "$filename.pst";
1059 } 1198 }
1060 1199
1061 aio_rename "$filename~", $filename; 1200 aio_rename "$filename~", $filename;
1201
1202 $filename =~ s%/[^/]+$%%;
1203 aio_pathsync $filename if $cf::USE_FSYNC;
1062 } else { 1204 } else {
1063 warn "FATAL: $filename~: $!\n"; 1205 warn "unable to save objects: $filename~: $!\n";
1064 } 1206 }
1065 } else { 1207 } else {
1066 aio_unlink $filename; 1208 aio_unlink $filename;
1067 aio_unlink "$filename.pst"; 1209 aio_unlink "$filename.pst";
1068 } 1210 }
… …
1087 1229
1088 unless (aio_stat "$filename.pst") { 1230 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1231 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1232 or return;
1091 1233
1092 my $st = eval { Coro::Storable::thaw $av } 1234 my $st = eval { Coro::Storable::thaw $av };
1093 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1094 $av = $st->{objs}; 1235 $av = $st->{objs};
1095 } 1236 }
1096 1237
1097 utf8::decode (my $decname = $filename); 1238 utf8::decode (my $decname = $filename);
1098 warn sprintf "loading %s (%d,%d)\n", 1239 warn sprintf "loading %s (%d,%d)\n",
… …
1160 my ($name, $cb) = @_; 1301 my ($name, $cb) = @_;
1161 1302
1162 $EXTICMD{$name} = $cb; 1303 $EXTICMD{$name} = $cb;
1163} 1304}
1164 1305
1306use File::Glob ();
1307
1165cf::player->attach ( 1308cf::player->attach (
1166 on_command => sub { 1309 on_command => sub {
1167 my ($pl, $name, $params) = @_; 1310 my ($pl, $name, $params) = @_;
1168 1311
1169 my $cb = $COMMAND{$name} 1312 my $cb = $COMMAND{$name}
… …
1201 1344
1202 cf::override; 1345 cf::override;
1203 }, 1346 },
1204); 1347);
1205 1348
1349# "readahead" all extensions
1350sub cache_extensions {
1351 my $grp = IO::AIO::aio_group;
1352
1353 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1354 for (grep /\.ext$/, @{$_[0]}) {
1355 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1356 }
1357 };
1358
1359 $grp
1360}
1361
1206sub load_extensions { 1362sub load_extensions {
1207 cf::sync_job { 1363 cf::sync_job {
1208 my %todo; 1364 my %todo;
1209 1365
1210 for my $path (<$LIBDIR/*.ext>) { 1366 for my $path (<$LIBDIR/*.ext>) {
… …
1229 1385
1230 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1386 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1231 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1387 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1232 1388
1233 $ext{source} = 1389 $ext{source} =
1234 "package $pkg; use strict; use utf8;\n" 1390 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1235 . "#line 1 \"$path\"\n{\n" 1391 . "#line 1 \"$path\"\n{\n"
1236 . $source 1392 . $source
1237 . "\n};\n1"; 1393 . "\n};\n1";
1238 1394
1239 $todo{$base} = \%ext; 1395 $todo{$base} = \%ext;
… …
1255 my $msg = $@ ? "$v->{path}: $@\n" 1411 my $msg = $@ ? "$v->{path}: $@\n"
1256 : "$v->{base}: extension inactive.\n"; 1412 : "$v->{base}: extension inactive.\n";
1257 1413
1258 if (exists $v->{meta}{mandatory}) { 1414 if (exists $v->{meta}{mandatory}) {
1259 warn $msg; 1415 warn $msg;
1260 warn "mandatory extension failed to load, exiting.\n"; 1416 cf::cleanup "mandatory extension failed to load, exiting.";
1261 exit 1;
1262 } 1417 }
1263 1418
1264 warn $msg; 1419 warn $msg;
1265 } 1420 }
1266 1421
… …
1280 1435
1281=back 1436=back
1282 1437
1283=head2 CORE EXTENSIONS 1438=head2 CORE EXTENSIONS
1284 1439
1285Functions and methods that extend core crossfire objects. 1440Functions and methods that extend core deliantra objects.
1286 1441
1287=cut 1442=cut
1288 1443
1289package cf::player; 1444package cf::player;
1290 1445
… …
1333 1488
1334sub exists($) { 1489sub exists($) {
1335 my ($login) = @_; 1490 my ($login) = @_;
1336 1491
1337 $cf::PLAYER{$login} 1492 $cf::PLAYER{$login}
1338 or cf::sync_job { !aio_stat path $login } 1493 or !aio_stat path $login
1339} 1494}
1340 1495
1341sub find($) { 1496sub find($) {
1342 return $cf::PLAYER{$_[0]} || do { 1497 return $cf::PLAYER{$_[0]} || do {
1343 my $login = $_[0]; 1498 my $login = $_[0];
… …
1355 my $f = new_from_file cf::object::thawer path $login 1510 my $f = new_from_file cf::object::thawer path $login
1356 or return; 1511 or return;
1357 1512
1358 my $pl = cf::player::load_pl $f 1513 my $pl = cf::player::load_pl $f
1359 or return; 1514 or return;
1515
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1516 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1517 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1518 $cf::PLAYER{$login} = $pl
1363 } 1519 }
1364 } 1520 }
… …
1374 1530
1375 return if $pl->{deny_save}; 1531 return if $pl->{deny_save};
1376 1532
1377 aio_mkdir playerdir $pl, 0770; 1533 aio_mkdir playerdir $pl, 0770;
1378 $pl->{last_save} = $cf::RUNTIME; 1534 $pl->{last_save} = $cf::RUNTIME;
1535
1536 cf::get_slot 0.01;
1379 1537
1380 $pl->save_pl ($path); 1538 $pl->save_pl ($path);
1381 cf::cede_to_tick; 1539 cf::cede_to_tick;
1382} 1540}
1383 1541
… …
1415 my ($pl) = @_; 1573 my ($pl) = @_;
1416 1574
1417 my $name = $pl->ob->name; 1575 my $name = $pl->ob->name;
1418 1576
1419 $pl->{deny_save} = 1; 1577 $pl->{deny_save} = 1;
1420 $pl->password ("*"); # this should lock out the player until we nuked the dir 1578 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1421 1579
1422 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1580 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1423 $pl->deactivate; 1581 $pl->deactivate;
1582 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1583 $pl->ob->check_score;
1424 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1584 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1425 $pl->ns->destroy if $pl->ns; 1585 $pl->ns->destroy if $pl->ns;
1426 1586
1427 my $path = playerdir $pl; 1587 my $path = playerdir $pl;
1428 my $temp = "$path~$cf::RUNTIME~deleting~"; 1588 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1467 1627
1468 for my $login (@$dirs) { 1628 for my $login (@$dirs) {
1469 my $path = path $login; 1629 my $path = path $login;
1470 1630
1471 # a .pst is a dead give-away for a valid player 1631 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") { 1632 # if no pst file found, open and chekc for blocked users
1633 if (aio_stat "$path.pst") {
1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1634 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1474 aio_read $fh, 0, 512, my $buf, 0 or next; 1635 aio_read $fh, 0, 512, my $buf, 0 or next;
1475 $buf !~ /^password -------------$/m or next; # official not-valid tag 1636 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 } 1637 }
1477 1638
… …
1508 } 1669 }
1509 1670
1510 \@paths 1671 \@paths
1511} 1672}
1512 1673
1513=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1674=item $protocol_xml = $player->expand_cfpod ($cfpod)
1514 1675
1515Expand crossfire pod fragments into protocol xml. 1676Expand deliantra pod fragments into protocol xml.
1516
1517=cut
1518
1519sub expand_cfpod {
1520 ((my $self), (local $_)) = @_;
1521
1522 # escape & and <
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525
1526 # this is buggy, it needs to properly take care of nested <'s
1527
1528 1 while
1529 # replace B<>, I<>, U<> etc.
1530 s/B<([^\>]*)>/<b>$1<\/b>/
1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1534 # replace G<male|female> tags
1535 || s{G<([^>|]*)\|([^>]*)>}{
1536 $self->gender ? $2 : $1
1537 }ge
1538 # replace H<hint text>
1539 || s{H<([^\>]*)>}
1540 {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "")
1544 [$self->{hintmode}]
1545 }ge;
1546
1547 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g;
1549
1550 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines
1555
1556 $_
1557}
1558
1559sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode}
1562}
1563 1677
1564=item $player->ext_reply ($msgid, @msg) 1678=item $player->ext_reply ($msgid, @msg)
1565 1679
1566Sends an ext reply to the player. 1680Sends an ext reply to the player.
1567 1681
… …
1634our $MAX_RESET = 3600; 1748our $MAX_RESET = 3600;
1635our $DEFAULT_RESET = 3000; 1749our $DEFAULT_RESET = 3000;
1636 1750
1637sub generate_random_map { 1751sub generate_random_map {
1638 my ($self, $rmp) = @_; 1752 my ($self, $rmp) = @_;
1753
1754 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1755
1639 # mit "rum" bekleckern, nicht 1756 # mit "rum" bekleckern, nicht
1640 $self->_create_random_map ( 1757 $self->_create_random_map (
1641 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1758 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1759 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1643 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1760 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1765 1882
1766# the temporary/swap location 1883# the temporary/swap location
1767sub save_path { 1884sub save_path {
1768 my ($self) = @_; 1885 my ($self) = @_;
1769 1886
1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1887 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771 "$TMPDIR/$path.map" 1888 "$TMPDIR/$path.map"
1772} 1889}
1773 1890
1774# the unique path, undef == no special unique path 1891# the unique path, undef == no special unique path
1775sub uniq_path { 1892sub uniq_path {
1776 my ($self) = @_; 1893 my ($self) = @_;
1777 1894
1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1895 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779 "$UNIQUEDIR/$path" 1896 "$UNIQUEDIR/$path"
1780}
1781
1782# and all this just because we cannot iterate over
1783# all maps in C++...
1784sub change_all_map_light {
1785 my ($change) = @_;
1786
1787 $_->change_map_light ($change)
1788 for grep $_->outdoor, values %cf::MAP;
1789} 1897}
1790 1898
1791sub decay_objects { 1899sub decay_objects {
1792 my ($self) = @_; 1900 my ($self) = @_;
1793 1901
… …
1877sub find { 1985sub find {
1878 my ($path, $origin) = @_; 1986 my ($path, $origin) = @_;
1879 1987
1880 $path = normalise $path, $origin && $origin->path; 1988 $path = normalise $path, $origin && $origin->path;
1881 1989
1882 cf::lock_wait "map_data:$path";#d#remove 1990 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1883 cf::lock_wait "map_find:$path"; 1991 my $guard2 = cf::lock_acquire "map_find:$path";
1884 1992
1885 $cf::MAP{$path} || do { 1993 $cf::MAP{$path} || do {
1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1889 my $map = new_from_path cf::map $path 1994 my $map = new_from_path cf::map $path
1890 or return; 1995 or return;
1891 1996
1892 $map->{last_save} = $cf::RUNTIME; 1997 $map->{last_save} = $cf::RUNTIME;
1893 1998
… …
1895 or return; 2000 or return;
1896 2001
1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2002 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898 # doing this can freeze the server in a sync job, obviously 2003 # doing this can freeze the server in a sync job, obviously
1899 #$cf::WAIT_FOR_TICK->wait; 2004 #$cf::WAIT_FOR_TICK->wait;
2005 undef $guard2;
1900 undef $guard1; 2006 undef $guard1;
1901 undef $guard2;
1902 $map->reset; 2007 $map->reset;
1903 return find $path; 2008 return find $path;
1904 } 2009 }
1905 2010
1906 $cf::MAP{$path} = $map 2011 $cf::MAP{$path} = $map
… …
1933 my $f = new_from_file cf::object::thawer $self->{load_path}; 2038 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block; 2039 $f->skip_block;
1935 $self->_load_objects ($f) 2040 $self->_load_objects ($f)
1936 or return; 2041 or return;
1937 2042
1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2043 $self->post_load_original
1939 if delete $self->{load_original}; 2044 if delete $self->{load_original};
1940 2045
1941 if (my $uniq = $self->uniq_path) { 2046 if (my $uniq = $self->uniq_path) {
1942 utf8::encode $uniq; 2047 utf8::encode $uniq;
1943 unless (aio_stat $uniq) { 2048 unless (aio_stat $uniq) {
… …
1961 unless ($self->{deny_activate}) { 2066 unless ($self->{deny_activate}) {
1962 $self->decay_objects; 2067 $self->decay_objects;
1963 $self->fix_auto_apply; 2068 $self->fix_auto_apply;
1964 $self->update_buttons; 2069 $self->update_buttons;
1965 cf::cede_to_tick; 2070 cf::cede_to_tick;
1966 $self->set_darkness_map;
1967 cf::cede_to_tick;
1968 $self->activate; 2071 $self->activate;
1969 } 2072 }
1970 2073
1971 $self->{last_save} = $cf::RUNTIME; 2074 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME); 2075 $self->last_access ($cf::RUNTIME);
1973 2076
1974 $self->in_memory (cf::MAP_IN_MEMORY); 2077 $self->in_memory (cf::MAP_ACTIVE);
1975 } 2078 }
1976 2079
1977 $self->post_load; 2080 $self->post_load;
1978} 2081}
1979 2082
… …
2037 my ($path, $origin, $load) = @_; 2140 my ($path, $origin, $load) = @_;
2038 2141
2039 $path = normalise $path, $origin && $origin->{path}; 2142 $path = normalise $path, $origin && $origin->{path};
2040 2143
2041 if (my $map = $cf::MAP{$path}) { 2144 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2145 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043 } 2146 }
2044 2147
2045 $MAP_PREFETCH{$path} |= $load; 2148 $MAP_PREFETCH{$path} |= $load;
2046 2149
2047 $MAP_PREFETCHER ||= cf::async { 2150 $MAP_PREFETCHER ||= cf::async {
… …
2084 cf::async { 2187 cf::async {
2085 $Coro::current->{desc} = "map player save"; 2188 $Coro::current->{desc} = "map player save";
2086 $_->contr->save for $self->players; 2189 $_->contr->save for $self->players;
2087 }; 2190 };
2088 2191
2192 cf::get_slot 0.02;
2193
2089 if ($uniq) { 2194 if ($uniq) {
2090 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2195 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2091 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2196 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2092 } else { 2197 } else {
2093 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2198 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2101 $self->save; 2206 $self->save;
2102 2207
2103 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2208 my $lock = cf::lock_acquire "map_data:$self->{path}";
2104 2209
2105 return if $self->players; 2210 return if $self->players;
2106 return if $self->in_memory != cf::MAP_IN_MEMORY; 2211 return if $self->in_memory != cf::MAP_ACTIVE;
2107 return if $self->{deny_save}; 2212 return if $self->{deny_save};
2108 2213
2109 $self->in_memory (cf::MAP_SWAPPED); 2214 $self->in_memory (cf::MAP_SWAPPED);
2110 2215
2111 $self->deactivate; 2216 $self->deactivate;
… …
2136 2241
2137 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2138 2243
2139 return if $self->players; 2244 return if $self->players;
2140 2245
2141 warn "resetting map ", $self->path; 2246 warn "resetting map ", $self->path, "\n";
2142 2247
2143 $self->in_memory (cf::MAP_SWAPPED); 2248 $self->in_memory (cf::MAP_SWAPPED);
2144 2249
2145 # need to save uniques path 2250 # need to save uniques path
2146 unless ($self->{deny_save}) { 2251 unless ($self->{deny_save}) {
… …
2229 2334
2230sub unique_maps() { 2335sub unique_maps() {
2231 [ 2336 [
2232 map { 2337 map {
2233 utf8::decode $_; 2338 utf8::decode $_;
2234 /\.map$/ 2339 s/\.map$//; # TODO future compatibility hack
2340 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2341 ? ()
2235 ? normalise $_ 2342 : normalise $_
2236 : ()
2237 } @{ aio_readdir $UNIQUEDIR or [] } 2343 } @{ aio_readdir $UNIQUEDIR or [] }
2238 ] 2344 ]
2239} 2345}
2240 2346
2241package cf; 2347=item cf::map::static_maps
2348
2349Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2350file in the shared directory excluding F</styles> and F</editor>). May
2351block.
2352
2353=cut
2354
2355sub static_maps() {
2356 my @dirs = "";
2357 my @maps;
2358
2359 while (@dirs) {
2360 my $dir = shift @dirs;
2361
2362 next if $dir eq "/styles" || $dir eq "/editor";
2363
2364 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2365 or return;
2366
2367 for (@$files) {
2368 s/\.map$// or next;
2369 utf8::decode $_;
2370 push @maps, "$dir/$_";
2371 }
2372
2373 push @dirs, map "$dir/$_", @$dirs;
2374 }
2375
2376 \@maps
2377}
2242 2378
2243=back 2379=back
2244 2380
2245=head3 cf::object 2381=head3 cf::object
2246 2382
… …
2250 2386
2251=over 4 2387=over 4
2252 2388
2253=item $ob->inv_recursive 2389=item $ob->inv_recursive
2254 2390
2255Returns the inventory of the object _and_ their inventories, recursively. 2391Returns the inventory of the object I<and> their inventories, recursively,
2392but I<not> the object itself.
2256 2393
2257=cut 2394=cut
2258 2395
2259sub inv_recursive_; 2396sub inv_recursive_;
2260sub inv_recursive_ { 2397sub inv_recursive_ {
… …
2265 inv_recursive_ inv $_[0] 2402 inv_recursive_ inv $_[0]
2266} 2403}
2267 2404
2268=item $ref = $ob->ref 2405=item $ref = $ob->ref
2269 2406
2270creates and returns a persistent reference to an objetc that can be stored as a string. 2407Creates and returns a persistent reference to an object that can be stored as a string.
2271 2408
2272=item $ob = cf::object::deref ($refstring) 2409=item $ob = cf::object::deref ($refstring)
2273 2410
2274returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2411returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2275even if the object actually exists. May block. 2412even if the object actually exists. May block.
… …
2307can be C<undef>. Does the right thing when the player is currently in a 2444can be C<undef>. Does the right thing when the player is currently in a
2308dialogue with the given NPC character. 2445dialogue with the given NPC character.
2309 2446
2310=cut 2447=cut
2311 2448
2449our $SAY_CHANNEL = {
2450 id => "say",
2451 title => "Map",
2452 reply => "say ",
2453 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2454};
2455
2456our $CHAT_CHANNEL = {
2457 id => "chat",
2458 title => "Chat",
2459 reply => "chat ",
2460 tooltip => "Player chat and shouts, global to the server.",
2461};
2462
2312# rough implementation of a future "reply" method that works 2463# rough implementation of a future "reply" method that works
2313# with dialog boxes. 2464# with dialog boxes.
2314#TODO: the first argument must go, split into a $npc->reply_to ( method 2465#TODO: the first argument must go, split into a $npc->reply_to ( method
2315sub cf::object::player::reply($$$;$) { 2466sub cf::object::player::reply($$$;$) {
2316 my ($self, $npc, $msg, $flags) = @_; 2467 my ($self, $npc, $msg, $flags) = @_;
… …
2327 my $dialog = $pl->{npc_dialog}; 2478 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2479 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329 2480
2330 } else { 2481 } else {
2331 $msg = $npc->name . " says: $msg" if $npc; 2482 $msg = $npc->name . " says: $msg" if $npc;
2332 $self->message ($msg, $flags); 2483 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333 } 2484 }
2334 } 2485 }
2335} 2486}
2336 2487
2337=item $object->send_msg ($channel, $msg, $color, [extra...]) 2488=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2362 2513
2363=item $player_object->enter_link 2514=item $player_object->enter_link
2364 2515
2365Freezes the player and moves him/her to a special map (C<{link}>). 2516Freezes the player and moves him/her to a special map (C<{link}>).
2366 2517
2367The player should be reasonably safe there for short amounts of time. You 2518The player should be reasonably safe there for short amounts of time (e.g.
2368I<MUST> call C<leave_link> as soon as possible, though. 2519for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2520though, as the palyer cannot control the character while it is on the link
2521map.
2369 2522
2370Will never block. 2523Will never block.
2371 2524
2372=item $player_object->leave_link ($map, $x, $y) 2525=item $player_object->leave_link ($map, $x, $y)
2373 2526
… …
2425 ($x, $y) = (-1, -1) 2578 ($x, $y) = (-1, -1)
2426 unless (defined $x) && (defined $y); 2579 unless (defined $x) && (defined $y);
2427 2580
2428 # use -1 or undef as default coordinates, not 0, 0 2581 # use -1 or undef as default coordinates, not 0, 0
2429 ($x, $y) = ($map->enter_x, $map->enter_y) 2582 ($x, $y) = ($map->enter_x, $map->enter_y)
2430 if $x <=0 && $y <= 0; 2583 if $x <= 0 && $y <= 0;
2431 2584
2432 $map->load; 2585 $map->load;
2433 $map->load_neighbours; 2586 $map->load_neighbours;
2434 2587
2435 return unless $self->contr->active; 2588 return unless $self->contr->active;
2436 $self->activate_recursive;
2437 2589
2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2439 $self->enter_map ($map, $x, $y); 2591 $self->enter_map ($map, $x, $y);
2592
2593 # only activate afterwards, to support waiting in hooks
2594 $self->activate_recursive;
2440} 2595}
2441 2596
2442=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2443 2598
2444Moves the player to the given map-path and coordinates by first freezing 2599Moves the player to the given map-path and coordinates by first freezing
2445her, loading and preparing them map, calling the provided $check callback 2600her, loading and preparing them map, calling the provided $check callback
2446that has to return the map if sucecssful, and then unfreezes the player on 2601that has to return the map if sucecssful, and then unfreezes the player on
2447the new (success) or old (failed) map position. In either case, $done will 2602the new (success) or old (failed) map position. In either case, $done will
2448be called at the end of this process. 2603be called at the end of this process.
2604
2605Note that $check will be called with a potentially non-loaded map, so if
2606it needs a loaded map it has to call C<< ->load >>.
2449 2607
2450=cut 2608=cut
2451 2609
2452our $GOTOGEN; 2610our $GOTOGEN;
2453 2611
… …
2532} 2690}
2533 2691
2534sub prepare_random_map { 2692sub prepare_random_map {
2535 my ($exit) = @_; 2693 my ($exit) = @_;
2536 2694
2537 my $guard = cf::lock_acquire "exit_prepare:$exit";
2538
2539 # all this does is basically replace the /! path by 2695 # all this does is basically replace the /! path by
2540 # a new random map path (?random/...) with a seed 2696 # a new random map path (?random/...) with a seed
2541 # that depends on the exit object 2697 # that depends on the exit object
2542 2698
2543 my $rmp = parse_random_map_params $exit->msg; 2699 my $rmp = parse_random_map_params $exit->msg;
… …
2545 if ($exit->map) { 2701 if ($exit->map) {
2546 $rmp->{region} = $exit->region->name; 2702 $rmp->{region} = $exit->region->name;
2547 $rmp->{origin_map} = $exit->map->path; 2703 $rmp->{origin_map} = $exit->map->path;
2548 $rmp->{origin_x} = $exit->x; 2704 $rmp->{origin_x} = $exit->x;
2549 $rmp->{origin_y} = $exit->y; 2705 $rmp->{origin_y} = $exit->y;
2706
2707 $exit->map->touch;
2550 } 2708 }
2551 2709
2552 $rmp->{random_seed} ||= $exit->random_seed; 2710 $rmp->{random_seed} ||= $exit->random_seed;
2553 2711
2554 my $data = cf::to_json $rmp; 2712 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2555 my $md5 = Digest::MD5::md5_hex $data; 2713 my $md5 = Digest::MD5::md5_hex $data;
2556 my $meta = "$RANDOMDIR/$md5.meta"; 2714 my $meta = "$RANDOMDIR/$md5.meta";
2557 2715
2558 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2716 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2559 aio_write $fh, 0, (length $data), $data, 0; 2717 aio_write $fh, 0, (length $data), $data, 0;
2560 undef $fh; 2718 undef $fh;
2561 aio_rename "$meta~", $meta; 2719 aio_rename "$meta~", $meta;
2562 2720
2721 my $slaying = "?random/$md5";
2722
2723 if ($exit->valid) {
2563 $exit->slaying ("?random/$md5"); 2724 $exit->slaying ("?random/$md5");
2564 $exit->msg (undef); 2725 $exit->msg (undef);
2726 }
2565 } 2727 }
2566} 2728}
2567 2729
2568sub cf::object::player::enter_exit { 2730sub cf::object::player::enter_exit {
2569 my ($self, $exit) = @_; 2731 my ($self, $exit) = @_;
2570 2732
2571 return unless $self->type == cf::PLAYER; 2733 return unless $self->type == cf::PLAYER;
2572 2734
2573 if ($exit->slaying eq "/!") {
2574 #TODO: this should de-fi-ni-te-ly not be a sync-job
2575 # the problem is that $exit might not survive long enough
2576 # so it needs to be done right now, right here
2577 cf::sync_job { prepare_random_map $exit };
2578 }
2579
2580 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2581 my $hp = $exit->stats->hp;
2582 my $sp = $exit->stats->sp;
2583
2584 $self->enter_link; 2735 $self->enter_link;
2585 2736
2586 # if exit is damned, update players death & WoR home-position
2587 $self->contr->savebed ($slaying, $hp, $sp)
2588 if $exit->flag (FLAG_DAMNED);
2589
2590 (async { 2737 (async {
2591 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2738 $Coro::current->{desc} = "enter_exit";
2592 2739
2593 $self->deactivate_recursive; # just to be sure
2594 unless (eval { 2740 unless (eval {
2741 $self->deactivate_recursive; # just to be sure
2742
2743 # random map handling
2744 {
2745 my $guard = cf::lock_acquire "exit_prepare:$exit";
2746
2747 prepare_random_map $exit
2748 if $exit->slaying eq "/!";
2749 }
2750
2751 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2752 my $x = $exit->stats->hp;
2753 my $y = $exit->stats->sp;
2754
2595 $self->goto ($slaying, $hp, $sp); 2755 $self->goto ($map, $x, $y);
2596 2756
2757 # if exit is damned, update players death & WoR home-position
2758 $self->contr->savebed ($map, $x, $y)
2759 if $exit->flag (cf::FLAG_DAMNED);
2760
2597 1; 2761 1
2598 }) { 2762 }) {
2599 $self->message ("Something went wrong deep within the crossfire server. " 2763 $self->message ("Something went wrong deep within the deliantra server. "
2600 . "I'll try to bring you back to the map you were before. " 2764 . "I'll try to bring you back to the map you were before. "
2601 . "Please report this to the dungeon master!", 2765 . "Please report this to the dungeon master!",
2602 cf::NDI_UNIQUE | cf::NDI_RED); 2766 cf::NDI_UNIQUE | cf::NDI_RED);
2603 2767
2604 warn "ERROR in enter_exit: $@"; 2768 warn "ERROR in enter_exit: $@";
… …
2621sub cf::client::send_drawinfo { 2785sub cf::client::send_drawinfo {
2622 my ($self, $text, $flags) = @_; 2786 my ($self, $text, $flags) = @_;
2623 2787
2624 utf8::encode $text; 2788 utf8::encode $text;
2625 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2789 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2790}
2791
2792=item $client->send_big_packet ($pkt)
2793
2794Like C<send_packet>, but tries to compress large packets, and fragments
2795them as required.
2796
2797=cut
2798
2799our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2800
2801sub cf::client::send_big_packet {
2802 my ($self, $pkt) = @_;
2803
2804 # try lzf for large packets
2805 $pkt = "lzf " . Compress::LZF::compress $pkt
2806 if 1024 <= length $pkt and $self->{can_lzf};
2807
2808 # split very large packets
2809 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2810 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2811 $pkt = "frag";
2812 }
2813
2814 $self->send_packet ($pkt);
2626} 2815}
2627 2816
2628=item $client->send_msg ($channel, $msg, $color, [extra...]) 2817=item $client->send_msg ($channel, $msg, $color, [extra...])
2629 2818
2630Send a drawinfo or msg packet to the client, formatting the msg for the 2819Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2632the message, with C<log> being the default. If C<$color> is negative, suppress 2821the message, with C<log> being the default. If C<$color> is negative, suppress
2633the message unless the client supports the msg packet. 2822the message unless the client supports the msg packet.
2634 2823
2635=cut 2824=cut
2636 2825
2826# non-persistent channels (usually the info channel)
2637our %CHANNEL = ( 2827our %CHANNEL = (
2828 "c/motd" => {
2829 id => "infobox",
2830 title => "MOTD",
2831 reply => undef,
2832 tooltip => "The message of the day",
2833 },
2638 "c/identify" => { 2834 "c/identify" => {
2639 id => "infobox", 2835 id => "infobox",
2640 title => "Identify", 2836 title => "Identify",
2641 reply => undef, 2837 reply => undef,
2642 tooltip => "Items recently identified", 2838 tooltip => "Items recently identified",
… …
2645 id => "infobox", 2841 id => "infobox",
2646 title => "Examine", 2842 title => "Examine",
2647 reply => undef, 2843 reply => undef,
2648 tooltip => "Signs and other items you examined", 2844 tooltip => "Signs and other items you examined",
2649 }, 2845 },
2846 "c/shopinfo" => {
2847 id => "infobox",
2848 title => "Shop Info",
2849 reply => undef,
2850 tooltip => "What your bargaining skill tells you about the shop",
2851 },
2852 "c/book" => {
2853 id => "infobox",
2854 title => "Book",
2855 reply => undef,
2856 tooltip => "The contents of a note or book",
2857 },
2650 "c/lookat" => { 2858 "c/lookat" => {
2651 id => "infobox", 2859 id => "infobox",
2652 title => "Look", 2860 title => "Look",
2653 reply => undef, 2861 reply => undef,
2654 tooltip => "What you saw there", 2862 tooltip => "What you saw there",
2655 }, 2863 },
2864 "c/who" => {
2865 id => "infobox",
2866 title => "Players",
2867 reply => undef,
2868 tooltip => "Shows players who are currently online",
2869 },
2870 "c/body" => {
2871 id => "infobox",
2872 title => "Body Parts",
2873 reply => undef,
2874 tooltip => "Shows which body parts you posess and are available",
2875 },
2876 "c/statistics" => {
2877 id => "infobox",
2878 title => "Statistics",
2879 reply => undef,
2880 tooltip => "Shows your primary statistics",
2881 },
2882 "c/skills" => {
2883 id => "infobox",
2884 title => "Skills",
2885 reply => undef,
2886 tooltip => "Shows your experience per skill and item power",
2887 },
2888 "c/shopitems" => {
2889 id => "infobox",
2890 title => "Shop Items",
2891 reply => undef,
2892 tooltip => "Shows the items currently for sale in this shop",
2893 },
2894 "c/resistances" => {
2895 id => "infobox",
2896 title => "Resistances",
2897 reply => undef,
2898 tooltip => "Shows your resistances",
2899 },
2900 "c/pets" => {
2901 id => "infobox",
2902 title => "Pets",
2903 reply => undef,
2904 tooltip => "Shows information abotu your pets/a specific pet",
2905 },
2906 "c/perceiveself" => {
2907 id => "infobox",
2908 title => "Perceive Self",
2909 reply => undef,
2910 tooltip => "You gained detailed knowledge about yourself",
2911 },
2912 "c/uptime" => {
2913 id => "infobox",
2914 title => "Uptime",
2915 reply => undef,
2916 tooltip => "How long the server has been running since last restart",
2917 },
2918 "c/mapinfo" => {
2919 id => "infobox",
2920 title => "Map Info",
2921 reply => undef,
2922 tooltip => "Information related to the maps",
2923 },
2924 "c/party" => {
2925 id => "party",
2926 title => "Party",
2927 reply => "gsay ",
2928 tooltip => "Messages and chat related to your party",
2929 },
2930 "c/death" => {
2931 id => "death",
2932 title => "Death",
2933 reply => undef,
2934 tooltip => "Reason for and more info about your most recent death",
2935 },
2936 "c/say" => $SAY_CHANNEL,
2937 "c/chat" => $CHAT_CHANNEL,
2656); 2938);
2657 2939
2658sub cf::client::send_msg { 2940sub cf::client::send_msg {
2659 my ($self, $channel, $msg, $color, @extra) = @_; 2941 my ($self, $channel, $msg, $color, @extra) = @_;
2660 2942
2661 $msg = $self->pl->expand_cfpod ($msg); 2943 $msg = $self->pl->expand_cfpod ($msg)
2944 unless $color & cf::NDI_VERBATIM;
2662 2945
2663 $color &= cf::NDI_CLIENT_MASK; # just in case... 2946 $color &= cf::NDI_CLIENT_MASK; # just in case...
2664 2947
2665 # check predefined channels, for the benefit of C 2948 # check predefined channels, for the benefit of C
2666 if ($CHANNEL{$channel}) { 2949 if ($CHANNEL{$channel}) {
2667 $channel = $CHANNEL{$channel}; 2950 $channel = $CHANNEL{$channel};
2668 2951
2669 $self->ext_msg (channel_info => $channel) 2952 $self->ext_msg (channel_info => $channel);
2670 if $self->can_msg;
2671
2672 $channel = $channel->{id}; 2953 $channel = $channel->{id};
2673 2954
2674 } elsif (ref $channel) { 2955 } elsif (ref $channel) {
2675 # send meta info to client, if not yet sent 2956 # send meta info to client, if not yet sent
2676 unless (exists $self->{channel}{$channel->{id}}) { 2957 unless (exists $self->{channel}{$channel->{id}}) {
2677 $self->{channel}{$channel->{id}} = $channel; 2958 $self->{channel}{$channel->{id}} = $channel;
2678 $self->ext_msg (channel_info => $channel) 2959 $self->ext_msg (channel_info => $channel);
2679 if $self->can_msg;
2680 } 2960 }
2681 2961
2682 $channel = $channel->{id}; 2962 $channel = $channel->{id};
2683 } 2963 }
2684 2964
2685 return unless @extra || length $msg; 2965 return unless @extra || length $msg;
2686 2966
2687 if ($self->can_msg) {
2688 # default colour, mask it out 2967 # default colour, mask it out
2689 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2968 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2690 if $color & cf::NDI_DEF; 2969 if $color & cf::NDI_DEF;
2691 2970
2692 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2971 my $pkt = "msg "
2972 . $self->{json_coder}->encode (
2693 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2973 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2694 } else { 2974 );
2695 if ($color >= 0) {
2696 # replace some tags by gcfclient-compatible ones
2697 for ($msg) {
2698 1 while
2699 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2700 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2701 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2702 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2703 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2704 }
2705 2975
2706 $color &= cf::NDI_COLOR_MASK; 2976 $self->send_big_packet ($pkt);
2707
2708 utf8::encode $msg;
2709
2710 if (0 && $msg =~ /\[/) {
2711 # COMMAND/INFO
2712 $self->send_packet ("drawextinfo $color 10 8 $msg")
2713 } else {
2714 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2715 $self->send_packet ("drawinfo $color $msg")
2716 }
2717 }
2718 }
2719} 2977}
2720 2978
2721=item $client->ext_msg ($type, @msg) 2979=item $client->ext_msg ($type, @msg)
2722 2980
2723Sends an ext event to the client. 2981Sends an ext event to the client.
… …
2726 2984
2727sub cf::client::ext_msg($$@) { 2985sub cf::client::ext_msg($$@) {
2728 my ($self, $type, @msg) = @_; 2986 my ($self, $type, @msg) = @_;
2729 2987
2730 if ($self->extcmd == 2) { 2988 if ($self->extcmd == 2) {
2731 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2989 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2732 } elsif ($self->extcmd == 1) { # TODO: remove 2990 } elsif ($self->extcmd == 1) { # TODO: remove
2733 push @msg, msgtype => "event_$type"; 2991 push @msg, msgtype => "event_$type";
2734 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2992 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2735 } 2993 }
2736} 2994}
2737 2995
2738=item $client->ext_reply ($msgid, @msg) 2996=item $client->ext_reply ($msgid, @msg)
2739 2997
… …
2743 3001
2744sub cf::client::ext_reply($$@) { 3002sub cf::client::ext_reply($$@) {
2745 my ($self, $id, @msg) = @_; 3003 my ($self, $id, @msg) = @_;
2746 3004
2747 if ($self->extcmd == 2) { 3005 if ($self->extcmd == 2) {
2748 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3006 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2749 } elsif ($self->extcmd == 1) { 3007 } elsif ($self->extcmd == 1) {
2750 #TODO: version 1, remove 3008 #TODO: version 1, remove
2751 unshift @msg, msgtype => "reply", msgid => $id; 3009 unshift @msg, msgtype => "reply", msgid => $id;
2752 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2753 } 3011 }
2754} 3012}
2755 3013
2756=item $success = $client->query ($flags, "text", \&cb) 3014=item $success = $client->query ($flags, "text", \&cb)
2757 3015
… …
2897 3155
2898The following functions and methods are available within a safe environment: 3156The following functions and methods are available within a safe environment:
2899 3157
2900 cf::object 3158 cf::object
2901 contr pay_amount pay_player map x y force_find force_add destroy 3159 contr pay_amount pay_player map x y force_find force_add destroy
2902 insert remove name archname title slaying race decrease_ob_nr 3160 insert remove name archname title slaying race decrease split
3161 value
2903 3162
2904 cf::object::player 3163 cf::object::player
2905 player 3164 player
2906 3165
2907 cf::player 3166 cf::player
… …
2912 3171
2913=cut 3172=cut
2914 3173
2915for ( 3174for (
2916 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3175 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2917 insert remove inv name archname title slaying race 3176 insert remove inv nrof name archname title slaying race
2918 decrease_ob_nr destroy)], 3177 decrease split destroy change_exp value msg lore send_msg)],
2919 ["cf::object::player" => qw(player)], 3178 ["cf::object::player" => qw(player)],
2920 ["cf::player" => qw(peaceful)], 3179 ["cf::player" => qw(peaceful send_msg)],
2921 ["cf::map" => qw(trigger)], 3180 ["cf::map" => qw(trigger)],
2922) { 3181) {
2923 no strict 'refs'; 3182 no strict 'refs';
2924 my ($pkg, @funs) = @$_; 3183 my ($pkg, @funs) = @$_;
2925 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3184 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2942 my ($code, %vars) = @_; 3201 my ($code, %vars) = @_;
2943 3202
2944 my $qcode = $code; 3203 my $qcode = $code;
2945 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3204 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2946 $qcode =~ s/\n/\\n/g; 3205 $qcode =~ s/\n/\\n/g;
3206
3207 %vars = (_dummy => 0) unless %vars;
2947 3208
2948 local $_; 3209 local $_;
2949 local @safe::cf::_safe_eval_args = values %vars; 3210 local @safe::cf::_safe_eval_args = values %vars;
2950 3211
2951 my $eval = 3212 my $eval =
… …
3028 { 3289 {
3029 my $faces = $facedata->{faceinfo}; 3290 my $faces = $facedata->{faceinfo};
3030 3291
3031 while (my ($face, $info) = each %$faces) { 3292 while (my ($face, $info) = each %$faces) {
3032 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3293 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3294
3033 cf::face::set_visibility $idx, $info->{visibility}; 3295 cf::face::set_visibility $idx, $info->{visibility};
3034 cf::face::set_magicmap $idx, $info->{magicmap}; 3296 cf::face::set_magicmap $idx, $info->{magicmap};
3035 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3297 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3036 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3298 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3037 3299
3038 cf::cede_to_tick; 3300 cf::cede_to_tick;
3039 } 3301 }
3040 3302
3041 while (my ($face, $info) = each %$faces) { 3303 while (my ($face, $info) = each %$faces) {
3042 next unless $info->{smooth}; 3304 next unless $info->{smooth};
3305
3043 my $idx = cf::face::find $face 3306 my $idx = cf::face::find $face
3044 or next; 3307 or next;
3308
3045 if (my $smooth = cf::face::find $info->{smooth}) { 3309 if (my $smooth = cf::face::find $info->{smooth}) {
3046 cf::face::set_smooth $idx, $smooth; 3310 cf::face::set_smooth $idx, $smooth;
3047 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3311 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3048 } else { 3312 } else {
3049 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3313 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3067 { 3331 {
3068 # TODO: for gcfclient pleasure, we should give resources 3332 # TODO: for gcfclient pleasure, we should give resources
3069 # that gcfclient doesn't grok a >10000 face index. 3333 # that gcfclient doesn't grok a >10000 face index.
3070 my $res = $facedata->{resource}; 3334 my $res = $facedata->{resource};
3071 3335
3072 my $soundconf = delete $res->{"res/sound.conf"};
3073
3074 while (my ($name, $info) = each %$res) { 3336 while (my ($name, $info) = each %$res) {
3337 if (defined $info->{type}) {
3075 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3338 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3076 my $data; 3339 my $data;
3077 3340
3078 if ($info->{type} & 1) { 3341 if ($info->{type} & 1) {
3079 # prepend meta info 3342 # prepend meta info
3080 3343
3081 my $meta = $enc->encode ({ 3344 my $meta = $enc->encode ({
3082 name => $name, 3345 name => $name,
3083 %{ $info->{meta} || {} }, 3346 %{ $info->{meta} || {} },
3084 }); 3347 });
3085 3348
3086 $data = pack "(w/a*)*", $meta, $info->{data}; 3349 $data = pack "(w/a*)*", $meta, $info->{data};
3350 } else {
3351 $data = $info->{data};
3352 }
3353
3354 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3355 cf::face::set_type $idx, $info->{type};
3087 } else { 3356 } else {
3088 $data = $info->{data}; 3357 $RESOURCE{$name} = $info;
3089 } 3358 }
3090 3359
3091 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3092 cf::face::set_type $idx, $info->{type};
3093
3094 cf::cede_to_tick; 3360 cf::cede_to_tick;
3095 } 3361 }
3096
3097 if ($soundconf) {
3098 $soundconf = $enc->decode (delete $soundconf->{data});
3099
3100 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3101 my $sound = $soundconf->{compat}[$_]
3102 or next;
3103
3104 my $face = cf::face::find "sound/$sound->[1]";
3105 cf::sound::set $sound->[0] => $face;
3106 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3107 }
3108
3109 while (my ($k, $v) = each %{$soundconf->{event}}) {
3110 my $face = cf::face::find "sound/$v";
3111 cf::sound::set $k => $face;
3112 }
3113 }
3114 } 3362 }
3363
3364 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3115 3365
3116 1 3366 1
3117} 3367}
3368
3369cf::global->attach (on_resource_update => sub {
3370 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3371 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3372
3373 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3374 my $sound = $soundconf->{compat}[$_]
3375 or next;
3376
3377 my $face = cf::face::find "sound/$sound->[1]";
3378 cf::sound::set $sound->[0] => $face;
3379 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3380 }
3381
3382 while (my ($k, $v) = each %{$soundconf->{event}}) {
3383 my $face = cf::face::find "sound/$v";
3384 cf::sound::set $k => $face;
3385 }
3386 }
3387});
3118 3388
3119register_exticmd fx_want => sub { 3389register_exticmd fx_want => sub {
3120 my ($ns, $want) = @_; 3390 my ($ns, $want) = @_;
3121 3391
3122 while (my ($k, $v) = each %$want) { 3392 while (my ($k, $v) = each %$want) {
3123 $ns->fx_want ($k, $v); 3393 $ns->fx_want ($k, $v);
3124 } 3394 }
3125}; 3395};
3396
3397sub load_resource_file($) {
3398 my $guard = lock_acquire "load_resource_file";
3399
3400 my $status = load_resource_file_ $_[0];
3401 get_slot 0.1, 100;
3402 cf::arch::commit_load;
3403
3404 $status
3405}
3126 3406
3127sub reload_regions { 3407sub reload_regions {
3128 # HACK to clear player env face cache, we need some signal framework 3408 # HACK to clear player env face cache, we need some signal framework
3129 # for this (global event?) 3409 # for this (global event?)
3130 %ext::player_env::MUSIC_FACE_CACHE = (); 3410 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3144} 3424}
3145 3425
3146sub reload_archetypes { 3426sub reload_archetypes {
3147 load_resource_file "$DATADIR/archetypes" 3427 load_resource_file "$DATADIR/archetypes"
3148 or die "unable to load archetypes\n"; 3428 or die "unable to load archetypes\n";
3149 #d# NEED to laod twice to resolve forward references
3150 # this really needs to be done in an extra post-pass
3151 # (which needs to be synchronous, so solve it differently)
3152 load_resource_file "$DATADIR/archetypes"
3153 or die "unable to load archetypes\n";
3154} 3429}
3155 3430
3156sub reload_treasures { 3431sub reload_treasures {
3157 load_resource_file "$DATADIR/treasures" 3432 load_resource_file "$DATADIR/treasures"
3158 or die "unable to load treasurelists\n"; 3433 or die "unable to load treasurelists\n";
3159} 3434}
3160 3435
3161sub reload_resources { 3436sub reload_resources {
3162 warn "reloading resource files...\n"; 3437 warn "reloading resource files...\n";
3163 3438
3439 reload_facedata;
3440 reload_archetypes;
3164 reload_regions; 3441 reload_regions;
3165 reload_facedata;
3166 #reload_archetypes;#d#
3167 reload_archetypes;
3168 reload_treasures; 3442 reload_treasures;
3169 3443
3170 warn "finished reloading resource files\n"; 3444 warn "finished reloading resource files\n";
3171} 3445}
3172 3446
3173sub init {
3174 reload_resources;
3175}
3176
3177sub reload_config { 3447sub reload_config {
3448 warn "reloading config file...\n";
3449
3178 open my $fh, "<:utf8", "$CONFDIR/config" 3450 open my $fh, "<:utf8", "$CONFDIR/config"
3179 or return; 3451 or return;
3180 3452
3181 local $/; 3453 local $/;
3182 *CFG = YAML::Syck::Load <$fh>; 3454 *CFG = YAML::XS::Load scalar <$fh>;
3183 3455
3184 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3456 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3185 3457
3186 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3458 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3187 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3459 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3191 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3463 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3192 and die "WARNING: m(un)lockall failed: $!\n"; 3464 and die "WARNING: m(un)lockall failed: $!\n";
3193 }; 3465 };
3194 warn $@ if $@; 3466 warn $@ if $@;
3195 } 3467 }
3468
3469 warn "finished reloading resource files\n";
3470}
3471
3472sub pidfile() {
3473 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3474 or die "$PIDFILE: $!";
3475 flock $fh, &Fcntl::LOCK_EX
3476 or die "$PIDFILE: flock: $!";
3477 $fh
3478}
3479
3480# make sure only one server instance is running at any one time
3481sub atomic {
3482 my $fh = pidfile;
3483
3484 my $pid = <$fh>;
3485 kill 9, $pid if $pid > 0;
3486
3487 seek $fh, 0, 0;
3488 print $fh $$;
3489}
3490
3491sub main_loop {
3492 warn "EV::loop starting\n";
3493 if (1) {
3494 EV::loop;
3495 }
3496 warn "EV::loop returned\n";
3497 goto &main_loop unless $REALLY_UNLOOP;
3196} 3498}
3197 3499
3198sub main { 3500sub main {
3501 cf::init_globals; # initialise logging
3502
3503 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3504 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3505 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3506 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3507
3508 cf::init_experience;
3509 cf::init_anim;
3510 cf::init_attackmess;
3511 cf::init_dynamic;
3512
3513 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3514
3199 # we must not ever block the main coroutine 3515 # we must not ever block the main coroutine
3200 local $Coro::idle = sub { 3516 local $Coro::idle = sub {
3201 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3517 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3202 (async { 3518 (async {
3203 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3519 $Coro::current->{desc} = "IDLE BUG HANDLER";
3204 Event::one_event; 3520 EV::loop EV::LOOP_ONESHOT;
3205 })->prio (Coro::PRIO_MAX); 3521 })->prio (Coro::PRIO_MAX);
3206 }; 3522 };
3207 3523
3524 evthread_start IO::AIO::poll_fileno;
3525
3526 cf::sync_job {
3527 cf::load_settings;
3528 cf::load_materials;
3529
3530 reload_resources;
3208 reload_config; 3531 reload_config;
3209 db_init; 3532 db_init;
3533
3534 cf::init_uuid;
3535 cf::init_signals;
3536 cf::init_commands;
3537 cf::init_skills;
3538
3539 cf::init_beforeplay;
3540
3541 atomic;
3542
3210 load_extensions; 3543 load_extensions;
3211 3544
3212 $TICK_WATCHER->start; 3545 utime time, time, $RUNTIMEFILE;
3213 Event::loop; 3546
3547 # no (long-running) fork's whatsoever before this point(!)
3548 use POSIX ();
3549 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3550
3551 (pop @POST_INIT)->(0) while @POST_INIT;
3552 };
3553
3554 main_loop;
3214} 3555}
3215 3556
3216############################################################################# 3557#############################################################################
3217# initialisation and cleanup 3558# initialisation and cleanup
3218 3559
3219# install some emergency cleanup handlers 3560# install some emergency cleanup handlers
3220BEGIN { 3561BEGIN {
3562 our %SIGWATCHER = ();
3221 for my $signal (qw(INT HUP TERM)) { 3563 for my $signal (qw(INT HUP TERM)) {
3222 Event->signal ( 3564 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3223 reentrant => 0,
3224 data => WF_AUTOCANCEL,
3225 signal => $signal,
3226 prio => 0,
3227 cb => sub {
3228 cf::cleanup "SIG$signal"; 3565 cf::cleanup "SIG$signal";
3229 },
3230 ); 3566 };
3231 } 3567 }
3232} 3568}
3233 3569
3234sub write_runtime { 3570sub write_runtime_sync {
3235 my $runtime = "$LOCALDIR/runtime";
3236
3237 # first touch the runtime file to show we are still running: 3571 # first touch the runtime file to show we are still running:
3238 # the fsync below can take a very very long time. 3572 # the fsync below can take a very very long time.
3239 3573
3240 IO::AIO::aio_utime $runtime, undef, undef; 3574 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3241 3575
3242 my $guard = cf::lock_acquire "write_runtime"; 3576 my $guard = cf::lock_acquire "write_runtime";
3243 3577
3244 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3578 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3245 or return; 3579 or return;
3246 3580
3247 my $value = $cf::RUNTIME + 90 + 10; 3581 my $value = $cf::RUNTIME + 90 + 10;
3248 # 10 is the runtime save interval, for a monotonic clock 3582 # 10 is the runtime save interval, for a monotonic clock
3249 # 60 allows for the watchdog to kill the server. 3583 # 60 allows for the watchdog to kill the server.
… …
3259 aio_utime $fh, undef, undef; 3593 aio_utime $fh, undef, undef;
3260 3594
3261 close $fh 3595 close $fh
3262 or return; 3596 or return;
3263 3597
3264 aio_rename "$runtime~", $runtime 3598 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3265 and return; 3599 and return;
3266 3600
3267 warn "runtime file written.\n"; 3601 warn "runtime file written.\n";
3268 3602
3269 1 3603 1
3604}
3605
3606our $uuid_lock;
3607our $uuid_skip;
3608
3609sub write_uuid_sync($) {
3610 $uuid_skip ||= $_[0];
3611
3612 return if $uuid_lock;
3613 local $uuid_lock = 1;
3614
3615 my $uuid = "$LOCALDIR/uuid";
3616
3617 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3618 or return;
3619
3620 my $value = uuid_seq uuid_cur;
3621
3622 unless ($value) {
3623 warn "cowardly refusing to write zero uuid value!\n";
3624 return;
3625 }
3626
3627 my $value = uuid_str $value + $uuid_skip;
3628 $uuid_skip = 0;
3629
3630 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3631 and return;
3632
3633 # always fsync - this file is important
3634 aio_fsync $fh
3635 and return;
3636
3637 close $fh
3638 or return;
3639
3640 aio_rename "$uuid~", $uuid
3641 and return;
3642
3643 warn "uuid file written ($value).\n";
3644
3645 1
3646
3647}
3648
3649sub write_uuid($$) {
3650 my ($skip, $sync) = @_;
3651
3652 $sync ? write_uuid_sync $skip
3653 : async { write_uuid_sync $skip };
3270} 3654}
3271 3655
3272sub emergency_save() { 3656sub emergency_save() {
3273 my $freeze_guard = cf::freeze_mainloop; 3657 my $freeze_guard = cf::freeze_mainloop;
3274 3658
3275 warn "enter emergency perl save\n"; 3659 warn "emergency_perl_save: enter\n";
3276 3660
3277 cf::sync_job { 3661 cf::sync_job {
3662 # this is a trade-off: we want to be very quick here, so
3663 # save all maps without fsync, and later call a global sync
3664 # (which in turn might be very very slow)
3665 local $USE_FSYNC = 0;
3666
3278 # use a peculiar iteration method to avoid tripping on perl 3667 # use a peculiar iteration method to avoid tripping on perl
3279 # refcount bugs in for. also avoids problems with players 3668 # refcount bugs in for. also avoids problems with players
3280 # and maps saved/destroyed asynchronously. 3669 # and maps saved/destroyed asynchronously.
3281 warn "begin emergency player save\n"; 3670 warn "emergency_perl_save: begin player save\n";
3282 for my $login (keys %cf::PLAYER) { 3671 for my $login (keys %cf::PLAYER) {
3283 my $pl = $cf::PLAYER{$login} or next; 3672 my $pl = $cf::PLAYER{$login} or next;
3284 $pl->valid or next; 3673 $pl->valid or next;
3285 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3674 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3286 $pl->save; 3675 $pl->save;
3287 } 3676 }
3288 warn "end emergency player save\n"; 3677 warn "emergency_perl_save: end player save\n";
3289 3678
3290 warn "begin emergency map save\n"; 3679 warn "emergency_perl_save: begin map save\n";
3291 for my $path (keys %cf::MAP) { 3680 for my $path (keys %cf::MAP) {
3292 my $map = $cf::MAP{$path} or next; 3681 my $map = $cf::MAP{$path} or next;
3293 $map->valid or next; 3682 $map->valid or next;
3294 $map->save; 3683 $map->save;
3295 } 3684 }
3296 warn "end emergency map save\n"; 3685 warn "emergency_perl_save: end map save\n";
3297 3686
3298 warn "begin emergency database checkpoint\n"; 3687 warn "emergency_perl_save: begin database checkpoint\n";
3299 BDB::db_env_txn_checkpoint $DB_ENV; 3688 BDB::db_env_txn_checkpoint $DB_ENV;
3300 warn "end emergency database checkpoint\n"; 3689 warn "emergency_perl_save: end database checkpoint\n";
3690
3691 warn "emergency_perl_save: begin write uuid\n";
3692 write_uuid_sync 1;
3693 warn "emergency_perl_save: end write uuid\n";
3301 }; 3694 };
3302 3695
3696 warn "emergency_perl_save: starting sync()\n";
3697 IO::AIO::aio_sync sub {
3698 warn "emergency_perl_save: finished sync()\n";
3699 };
3700
3303 warn "leave emergency perl save\n"; 3701 warn "emergency_perl_save: leave\n";
3304} 3702}
3305 3703
3306sub post_cleanup { 3704sub post_cleanup {
3307 my ($make_core) = @_; 3705 my ($make_core) = @_;
3308 3706
3309 warn Carp::longmess "post_cleanup backtrace" 3707 warn Carp::longmess "post_cleanup backtrace"
3310 if $make_core; 3708 if $make_core;
3709
3710 my $fh = pidfile;
3711 unlink $PIDFILE if <$fh> == $$;
3712}
3713
3714# a safer delete_package, copied from Symbol
3715sub clear_package($) {
3716 my $pkg = shift;
3717
3718 # expand to full symbol table name if needed
3719 unless ($pkg =~ /^main::.*::$/) {
3720 $pkg = "main$pkg" if $pkg =~ /^::/;
3721 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3722 $pkg .= '::' unless $pkg =~ /::$/;
3723 }
3724
3725 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3726 my $stem_symtab = *{$stem}{HASH};
3727
3728 defined $stem_symtab and exists $stem_symtab->{$leaf}
3729 or return;
3730
3731 # clear all symbols
3732 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3733 for my $name (keys %$leaf_symtab) {
3734 _gv_clear *{"$pkg$name"};
3735# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3736 }
3737 warn "cleared package $pkg\n";#d#
3311} 3738}
3312 3739
3313sub do_reload_perl() { 3740sub do_reload_perl() {
3314 # can/must only be called in main 3741 # can/must only be called in main
3315 if ($Coro::current != $Coro::main) { 3742 if ($Coro::current != $Coro::main) {
3316 warn "can only reload from main coroutine"; 3743 warn "can only reload from main coroutine";
3317 return; 3744 return;
3318 } 3745 }
3319 3746
3747 return if $RELOAD++;
3748
3749 my $t1 = EV::time;
3750
3751 while ($RELOAD) {
3320 warn "reloading..."; 3752 warn "reloading...";
3321 3753
3322 warn "entering sync_job"; 3754 warn "entering sync_job";
3323 3755
3324 cf::sync_job { 3756 cf::sync_job {
3325 cf::write_runtime; # external watchdog should not bark 3757 cf::write_runtime_sync; # external watchdog should not bark
3326 cf::emergency_save; 3758 cf::emergency_save;
3327 cf::write_runtime; # external watchdog should not bark 3759 cf::write_runtime_sync; # external watchdog should not bark
3328 3760
3329 warn "syncing database to disk"; 3761 warn "syncing database to disk";
3330 BDB::db_env_txn_checkpoint $DB_ENV; 3762 BDB::db_env_txn_checkpoint $DB_ENV;
3331 3763
3332 # if anything goes wrong in here, we should simply crash as we already saved 3764 # if anything goes wrong in here, we should simply crash as we already saved
3333 3765
3334 warn "cancelling all WF_AUTOCANCEL watchers";
3335 for (Event::all_watchers) {
3336 $_->cancel if $_->data & WF_AUTOCANCEL;
3337 }
3338
3339 warn "flushing outstanding aio requests"; 3766 warn "flushing outstanding aio requests";
3340 for (;;) {
3341 BDB::flush;
3342 IO::AIO::flush;
3343 Coro::cede;
3344 last unless IO::AIO::nreqs || BDB::nreqs; 3767 while (IO::AIO::nreqs || BDB::nreqs) {
3345 warn "iterate..."; 3768 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3346 }
3347
3348 ++$RELOAD;
3349
3350 warn "cancelling all extension coros";
3351 $_->cancel for values %EXT_CORO;
3352 %EXT_CORO = ();
3353
3354 warn "removing commands";
3355 %COMMAND = ();
3356
3357 warn "removing ext/exti commands";
3358 %EXTCMD = ();
3359 %EXTICMD = ();
3360
3361 warn "unloading/nuking all extensions";
3362 for my $pkg (@EXTS) {
3363 warn "... unloading $pkg";
3364
3365 if (my $cb = $pkg->can ("unload")) {
3366 eval {
3367 $cb->($pkg);
3368 1
3369 } or warn "$pkg unloaded, but with errors: $@";
3370 } 3769 }
3371 3770
3372 warn "... nuking $pkg"; 3771 warn "cancelling all extension coros";
3373 Symbol::delete_package $pkg; 3772 $_->cancel for values %EXT_CORO;
3374 } 3773 %EXT_CORO = ();
3375 3774
3376 warn "unloading all perl modules loaded from $LIBDIR"; 3775 warn "removing commands";
3377 while (my ($k, $v) = each %INC) { 3776 %COMMAND = ();
3378 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3379 3777
3778 warn "removing ext/exti commands";
3779 %EXTCMD = ();
3780 %EXTICMD = ();
3781
3782 warn "unloading/nuking all extensions";
3783 for my $pkg (@EXTS) {
3380 warn "... unloading $k"; 3784 warn "... unloading $pkg";
3381 delete $INC{$k};
3382 3785
3383 $k =~ s/\.pm$//;
3384 $k =~ s/\//::/g;
3385
3386 if (my $cb = $k->can ("unload_module")) { 3786 if (my $cb = $pkg->can ("unload")) {
3787 eval {
3387 $cb->(); 3788 $cb->($pkg);
3789 1
3790 } or warn "$pkg unloaded, but with errors: $@";
3791 }
3792
3793 warn "... clearing $pkg";
3794 clear_package $pkg;
3388 } 3795 }
3389 3796
3390 Symbol::delete_package $k; 3797 warn "unloading all perl modules loaded from $LIBDIR";
3798 while (my ($k, $v) = each %INC) {
3799 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3800
3801 warn "... unloading $k";
3802 delete $INC{$k};
3803
3804 $k =~ s/\.pm$//;
3805 $k =~ s/\//::/g;
3806
3807 if (my $cb = $k->can ("unload_module")) {
3808 $cb->();
3809 }
3810
3811 clear_package $k;
3391 } 3812 }
3392 3813
3393 warn "getting rid of safe::, as good as possible"; 3814 warn "getting rid of safe::, as good as possible";
3394 Symbol::delete_package "safe::$_" 3815 clear_package "safe::$_"
3395 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3816 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3396 3817
3397 warn "unloading cf.pm \"a bit\""; 3818 warn "unloading cf.pm \"a bit\"";
3398 delete $INC{"cf.pm"}; 3819 delete $INC{"cf.pm"};
3399 delete $INC{"cf/pod.pm"}; 3820 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3400 3821
3401 # don't, removes xs symbols, too, 3822 # don't, removes xs symbols, too,
3402 # and global variables created in xs 3823 # and global variables created in xs
3403 #Symbol::delete_package __PACKAGE__; 3824 #clear_package __PACKAGE__;
3404 3825
3405 warn "unload completed, starting to reload now"; 3826 warn "unload completed, starting to reload now";
3406 3827
3407 warn "reloading cf.pm"; 3828 warn "reloading cf.pm";
3408 require cf; 3829 require cf;
3409 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3830 cf::_connect_to_perl_1;
3410 3831
3411 warn "loading config and database again"; 3832 warn "loading config and database again";
3412 cf::reload_config; 3833 cf::reload_config;
3413 3834
3414 warn "loading extensions"; 3835 warn "loading extensions";
3415 cf::load_extensions; 3836 cf::load_extensions;
3416 3837
3838 if ($REATTACH_ON_RELOAD) {
3417 warn "reattaching attachments to objects/players"; 3839 warn "reattaching attachments to objects/players";
3418 _global_reattach; # objects, sockets 3840 _global_reattach; # objects, sockets
3419 warn "reattaching attachments to maps"; 3841 warn "reattaching attachments to maps";
3420 reattach $_ for values %MAP; 3842 reattach $_ for values %MAP;
3421 warn "reattaching attachments to players"; 3843 warn "reattaching attachments to players";
3422 reattach $_ for values %PLAYER; 3844 reattach $_ for values %PLAYER;
3845 }
3423 3846
3847 warn "running post_init jobs";
3848 (pop @POST_INIT)->(1) while @POST_INIT;
3849
3424 warn "leaving sync_job"; 3850 warn "leaving sync_job";
3425 3851
3426 1 3852 1
3427 } or do { 3853 } or do {
3428 warn $@; 3854 warn $@;
3429 warn "error while reloading, exiting."; 3855 cf::cleanup "error while reloading, exiting.";
3430 exit 1;
3431 }; 3856 };
3432 3857
3433 warn "reloaded"; 3858 warn "reloaded";
3859 --$RELOAD;
3860 }
3861
3862 $t1 = EV::time - $t1;
3863 warn "reload completed in ${t1}s\n";
3434}; 3864};
3435 3865
3436our $RELOAD_WATCHER; # used only during reload 3866our $RELOAD_WATCHER; # used only during reload
3437 3867
3438sub reload_perl() { 3868sub reload_perl() {
3439 # doing reload synchronously and two reloads happen back-to-back, 3869 # doing reload synchronously and two reloads happen back-to-back,
3440 # coro crashes during coro_state_free->destroy here. 3870 # coro crashes during coro_state_free->destroy here.
3441 3871
3442 $RELOAD_WATCHER ||= Event->timer ( 3872 $RELOAD_WATCHER ||= cf::async {
3443 reentrant => 0, 3873 Coro::AIO::aio_wait cache_extensions;
3444 after => 0, 3874
3445 data => WF_AUTOCANCEL, 3875 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3446 cb => sub {
3447 do_reload_perl; 3876 do_reload_perl;
3448 undef $RELOAD_WATCHER; 3877 undef $RELOAD_WATCHER;
3449 }, 3878 };
3450 ); 3879 };
3451} 3880}
3452 3881
3453register_command "reload" => sub { 3882register_command "reload" => sub {
3454 my ($who, $arg) = @_; 3883 my ($who, $arg) = @_;
3455 3884
… …
3468 3897
3469our @WAIT_FOR_TICK; 3898our @WAIT_FOR_TICK;
3470our @WAIT_FOR_TICK_BEGIN; 3899our @WAIT_FOR_TICK_BEGIN;
3471 3900
3472sub wait_for_tick { 3901sub wait_for_tick {
3473 return unless $TICK_WATCHER->is_active;
3474 return if $Coro::current == $Coro::main; 3902 return if tick_inhibit || $Coro::current == $Coro::main;
3475 3903
3476 my $signal = new Coro::Signal; 3904 my $signal = new Coro::Signal;
3477 push @WAIT_FOR_TICK, $signal; 3905 push @WAIT_FOR_TICK, $signal;
3478 $signal->wait; 3906 $signal->wait;
3479} 3907}
3480 3908
3481sub wait_for_tick_begin { 3909sub wait_for_tick_begin {
3482 return unless $TICK_WATCHER->is_active;
3483 return if $Coro::current == $Coro::main; 3910 return if tick_inhibit || $Coro::current == $Coro::main;
3484 3911
3485 my $signal = new Coro::Signal; 3912 my $signal = new Coro::Signal;
3486 push @WAIT_FOR_TICK_BEGIN, $signal; 3913 push @WAIT_FOR_TICK_BEGIN, $signal;
3487 $signal->wait; 3914 $signal->wait;
3488} 3915}
3489 3916
3490$TICK_WATCHER = Event->timer ( 3917sub tick {
3491 reentrant => 0,
3492 parked => 1,
3493 prio => 0,
3494 at => $NEXT_TICK || $TICK,
3495 data => WF_AUTOCANCEL,
3496 cb => sub {
3497 if ($Coro::current != $Coro::main) { 3918 if ($Coro::current != $Coro::main) {
3498 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3919 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3499 unless ++$bug_warning > 10; 3920 unless ++$bug_warning > 10;
3500 return; 3921 return;
3501 } 3922 }
3502 3923
3503 $NOW = $tick_start = Event::time;
3504
3505 cf::server_tick; # one server iteration 3924 cf::server_tick; # one server iteration
3506 3925
3507 $RUNTIME += $TICK;
3508 $NEXT_TICK += $TICK;
3509
3510 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3926 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3511 $NEXT_RUNTIME_WRITE = $NOW + 10; 3927 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3512 Coro::async_pool { 3928 Coro::async_pool {
3513 $Coro::current->{desc} = "runtime saver"; 3929 $Coro::current->{desc} = "runtime saver";
3514 write_runtime 3930 write_runtime_sync
3515 or warn "ERROR: unable to write runtime file: $!"; 3931 or warn "ERROR: unable to write runtime file: $!";
3516 };
3517 } 3932 };
3933 }
3518 3934
3519 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3935 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3520 $sig->send; 3936 $sig->send;
3521 } 3937 }
3522 while (my $sig = shift @WAIT_FOR_TICK) { 3938 while (my $sig = shift @WAIT_FOR_TICK) {
3523 $sig->send; 3939 $sig->send;
3524 } 3940 }
3525 3941
3526 $NOW = Event::time; 3942 $LOAD = ($NOW - $TICK_START) / $TICK;
3527
3528 # if we are delayed by four ticks or more, skip them all
3529 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3530
3531 $TICK_WATCHER->at ($NEXT_TICK);
3532 $TICK_WATCHER->start;
3533
3534 $LOAD = ($NOW - $tick_start) / $TICK;
3535 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3943 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3536 3944
3537 _post_tick; 3945 if (0) {
3946 if ($NEXT_TICK) {
3947 my $jitter = $TICK_START - $NEXT_TICK;
3948 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3949 warn "jitter $JITTER\n";#d#
3950 }
3538 }, 3951 }
3539); 3952}
3540 3953
3541{ 3954{
3955 # configure BDB
3956
3542 BDB::min_parallel 8; 3957 BDB::min_parallel 8;
3543 BDB::max_poll_time $TICK * 0.1; 3958 BDB::max_poll_reqs $TICK * 0.1;
3544 $BDB_POLL_WATCHER = Event->io ( 3959 $AnyEvent::BDB::WATCHER->priority (1);
3545 reentrant => 0,
3546 fd => BDB::poll_fileno,
3547 poll => 'r',
3548 prio => 0,
3549 data => WF_AUTOCANCEL,
3550 cb => \&BDB::poll_cb,
3551 );
3552
3553 BDB::set_sync_prepare {
3554 my $status;
3555 my $current = $Coro::current;
3556 (
3557 sub {
3558 $status = $!;
3559 $current->ready; undef $current;
3560 },
3561 sub {
3562 Coro::schedule while defined $current;
3563 $! = $status;
3564 },
3565 )
3566 };
3567 3960
3568 unless ($DB_ENV) { 3961 unless ($DB_ENV) {
3569 $DB_ENV = BDB::db_env_create; 3962 $DB_ENV = BDB::db_env_create;
3570 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3963 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3571 | BDB::LOG_AUTOREMOVE, 1); 3964 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3965 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3572 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3966 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3573 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3967 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3574 3968
3575 cf::sync_job { 3969 cf::sync_job {
3576 eval { 3970 eval {
… …
3586 3980
3587 cf::cleanup "db_env_open(db): $@" if $@; 3981 cf::cleanup "db_env_open(db): $@" if $@;
3588 }; 3982 };
3589 } 3983 }
3590 3984
3591 $BDB_DEADLOCK_WATCHER = Event->timer ( 3985 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3592 after => 3,
3593 interval => 1,
3594 hard => 1,
3595 prio => 0,
3596 data => WF_AUTOCANCEL,
3597 cb => sub {
3598 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3986 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3599 },
3600 ); 3987 };
3601 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3988 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3602 after => 11,
3603 interval => 60,
3604 hard => 1,
3605 prio => 0,
3606 data => WF_AUTOCANCEL,
3607 cb => sub {
3608 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3989 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3609 },
3610 ); 3990 };
3611 $BDB_TRICKLE_WATCHER = Event->timer ( 3991 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3612 after => 5,
3613 interval => 10,
3614 hard => 1,
3615 prio => 0,
3616 data => WF_AUTOCANCEL,
3617 cb => sub {
3618 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3992 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3619 },
3620 ); 3993 };
3621} 3994}
3622 3995
3623{ 3996{
3997 # configure IO::AIO
3998
3624 IO::AIO::min_parallel 8; 3999 IO::AIO::min_parallel 8;
3625
3626 undef $Coro::AIO::WATCHER;
3627 IO::AIO::max_poll_time $TICK * 0.1; 4000 IO::AIO::max_poll_time $TICK * 0.1;
3628 $AIO_POLL_WATCHER = Event->io ( 4001 undef $AnyEvent::AIO::WATCHER;
3629 reentrant => 0,
3630 data => WF_AUTOCANCEL,
3631 fd => IO::AIO::poll_fileno,
3632 poll => 'r',
3633 prio => 0,
3634 cb => \&IO::AIO::poll_cb,
3635 );
3636} 4002}
3637 4003
3638my $_log_backtrace; 4004my $_log_backtrace;
3639 4005
3640sub _log_backtrace { 4006sub _log_backtrace {
… …
3643 $msg =~ s/\n//; 4009 $msg =~ s/\n//;
3644 4010
3645 # limit the # of concurrent backtraces 4011 # limit the # of concurrent backtraces
3646 if ($_log_backtrace < 2) { 4012 if ($_log_backtrace < 2) {
3647 ++$_log_backtrace; 4013 ++$_log_backtrace;
4014 my $perl_bt = Carp::longmess $msg;
3648 async { 4015 async {
3649 $Coro::current->{desc} = "abt $msg"; 4016 $Coro::current->{desc} = "abt $msg";
3650 4017
3651 my @bt = fork_call { 4018 my @bt = fork_call {
3652 @addr = map { sprintf "%x", $_ } @addr; 4019 @addr = map { sprintf "%x", $_ } @addr;
… …
3663 } 4030 }
3664 4031
3665 @funcs 4032 @funcs
3666 }; 4033 };
3667 4034
3668 LOG llevInfo, "[ABT] $msg\n"; 4035 LOG llevInfo, "[ABT] $perl_bt\n";
4036 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3669 LOG llevInfo, "[ABT] $_\n" for @bt; 4037 LOG llevInfo, "[ABT] $_\n" for @bt;
3670 --$_log_backtrace; 4038 --$_log_backtrace;
3671 }; 4039 };
3672 } else { 4040 } else {
3673 LOG llevInfo, "[ABT] $msg\n"; 4041 LOG llevInfo, "[ABT] $msg\n";
3674 LOG llevInfo, "[ABT] [suppressed]\n"; 4042 LOG llevInfo, "[ABT] [suppressed]\n";
3675 } 4043 }
3676} 4044}
3677 4045
3678# load additional modules 4046# load additional modules
3679use cf::pod; 4047require "cf/$_.pm" for @EXTRA_MODULES;
4048cf::_connect_to_perl_2;
3680 4049
3681END { cf::emergency_save } 4050END { cf::emergency_save }
3682 4051
36831 40521
3684 4053

Diff Legend

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