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.379 by root, Thu Oct 4 23:59:07 2007 UTC vs.
Revision 1.494 by root, Mon Oct 26 05:18:00 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 3.64 (); 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.32 (); 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>:
373 } 446 }
374 } 447 }
375 } 448 }
376 449
377 if (@SLOT_QUEUE) { 450 if (@SLOT_QUEUE) {
378 # we do not use wait_For_tick() as it returns immediately when tick is inactive 451 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal; 452 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 453 $signal->wait;
381 } else { 454 } else {
382 Coro::schedule; 455 Coro::schedule;
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 = Storable::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 $av = eval { (Storable::thaw $av)->{objs} }; 1234 my $st = eval { Coro::Storable::thaw $av };
1235 $av = $st->{objs};
1093 } 1236 }
1094 1237
1095 utf8::decode (my $decname = $filename); 1238 utf8::decode (my $decname = $filename);
1096 warn sprintf "loading %s (%d,%d)\n", 1239 warn sprintf "loading %s (%d,%d)\n",
1097 $decname, length $data, scalar @{$av || []}; 1240 $decname, length $data, scalar @{$av || []};
1158 my ($name, $cb) = @_; 1301 my ($name, $cb) = @_;
1159 1302
1160 $EXTICMD{$name} = $cb; 1303 $EXTICMD{$name} = $cb;
1161} 1304}
1162 1305
1306use File::Glob ();
1307
1163cf::player->attach ( 1308cf::player->attach (
1164 on_command => sub { 1309 on_command => sub {
1165 my ($pl, $name, $params) = @_; 1310 my ($pl, $name, $params) = @_;
1166 1311
1167 my $cb = $COMMAND{$name} 1312 my $cb = $COMMAND{$name}
1199 1344
1200 cf::override; 1345 cf::override;
1201 }, 1346 },
1202); 1347);
1203 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
1204sub load_extensions { 1362sub load_extensions {
1205 cf::sync_job { 1363 cf::sync_job {
1206 my %todo; 1364 my %todo;
1207 1365
1208 for my $path (<$LIBDIR/*.ext>) { 1366 for my $path (<$LIBDIR/*.ext>) {
1227 1385
1228 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1386 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1229 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1387 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1230 1388
1231 $ext{source} = 1389 $ext{source} =
1232 "package $pkg; use strict; use utf8;\n" 1390 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1233 . "#line 1 \"$path\"\n{\n" 1391 . "#line 1 \"$path\"\n{\n"
1234 . $source 1392 . $source
1235 . "\n};\n1"; 1393 . "\n};\n1";
1236 1394
1237 $todo{$base} = \%ext; 1395 $todo{$base} = \%ext;
1253 my $msg = $@ ? "$v->{path}: $@\n" 1411 my $msg = $@ ? "$v->{path}: $@\n"
1254 : "$v->{base}: extension inactive.\n"; 1412 : "$v->{base}: extension inactive.\n";
1255 1413
1256 if (exists $v->{meta}{mandatory}) { 1414 if (exists $v->{meta}{mandatory}) {
1257 warn $msg; 1415 warn $msg;
1258 warn "mandatory extension failed to load, exiting.\n"; 1416 cf::cleanup "mandatory extension failed to load, exiting.";
1259 exit 1;
1260 } 1417 }
1261 1418
1262 warn $msg; 1419 warn $msg;
1263 } 1420 }
1264 1421
1278 1435
1279=back 1436=back
1280 1437
1281=head2 CORE EXTENSIONS 1438=head2 CORE EXTENSIONS
1282 1439
1283Functions and methods that extend core crossfire objects. 1440Functions and methods that extend core deliantra objects.
1284 1441
1285=cut 1442=cut
1286 1443
1287package cf::player; 1444package cf::player;
1288 1445
1331 1488
1332sub exists($) { 1489sub exists($) {
1333 my ($login) = @_; 1490 my ($login) = @_;
1334 1491
1335 $cf::PLAYER{$login} 1492 $cf::PLAYER{$login}
1336 or cf::sync_job { !aio_stat path $login } 1493 or !aio_stat path $login
1337} 1494}
1338 1495
1339sub find($) { 1496sub find($) {
1340 return $cf::PLAYER{$_[0]} || do { 1497 return $cf::PLAYER{$_[0]} || do {
1341 my $login = $_[0]; 1498 my $login = $_[0];
1353 my $f = new_from_file cf::object::thawer path $login 1510 my $f = new_from_file cf::object::thawer path $login
1354 or return; 1511 or return;
1355 1512
1356 my $pl = cf::player::load_pl $f 1513 my $pl = cf::player::load_pl $f
1357 or return; 1514 or return;
1515
1358 local $cf::PLAYER_LOADING{$login} = $pl; 1516 local $cf::PLAYER_LOADING{$login} = $pl;
1359 $f->resolve_delayed_derefs; 1517 $f->resolve_delayed_derefs;
1360 $cf::PLAYER{$login} = $pl 1518 $cf::PLAYER{$login} = $pl
1361 } 1519 }
1362 } 1520 }
1372 1530
1373 return if $pl->{deny_save}; 1531 return if $pl->{deny_save};
1374 1532
1375 aio_mkdir playerdir $pl, 0770; 1533 aio_mkdir playerdir $pl, 0770;
1376 $pl->{last_save} = $cf::RUNTIME; 1534 $pl->{last_save} = $cf::RUNTIME;
1535
1536 cf::get_slot 0.01;
1377 1537
1378 $pl->save_pl ($path); 1538 $pl->save_pl ($path);
1379 cf::cede_to_tick; 1539 cf::cede_to_tick;
1380} 1540}
1381 1541
1413 my ($pl) = @_; 1573 my ($pl) = @_;
1414 1574
1415 my $name = $pl->ob->name; 1575 my $name = $pl->ob->name;
1416 1576
1417 $pl->{deny_save} = 1; 1577 $pl->{deny_save} = 1;
1418 $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
1419 1579
1420 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1580 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1421 $pl->deactivate; 1581 $pl->deactivate;
1582 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1583 $pl->ob->check_score;
1422 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1584 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1423 $pl->ns->destroy if $pl->ns; 1585 $pl->ns->destroy if $pl->ns;
1424 1586
1425 my $path = playerdir $pl; 1587 my $path = playerdir $pl;
1426 my $temp = "$path~$cf::RUNTIME~deleting~"; 1588 my $temp = "$path~$cf::RUNTIME~deleting~";
1465 1627
1466 for my $login (@$dirs) { 1628 for my $login (@$dirs) {
1467 my $path = path $login; 1629 my $path = path $login;
1468 1630
1469 # a .pst is a dead give-away for a valid player 1631 # a .pst is a dead give-away for a valid player
1470 unless (-e "$path.pst") { 1632 # if no pst file found, open and chekc for blocked users
1633 if (aio_stat "$path.pst") {
1471 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1634 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1472 aio_read $fh, 0, 512, my $buf, 0 or next; 1635 aio_read $fh, 0, 512, my $buf, 0 or next;
1473 $buf !~ /^password -------------$/m or next; # official not-valid tag 1636 $buf !~ /^password -------------$/m or next; # official not-valid tag
1474 } 1637 }
1475 1638
1506 } 1669 }
1507 1670
1508 \@paths 1671 \@paths
1509} 1672}
1510 1673
1511=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1674=item $protocol_xml = $player->expand_cfpod ($cfpod)
1512 1675
1513Expand crossfire pod fragments into protocol xml. 1676Expand deliantra pod fragments into protocol xml.
1514
1515=cut
1516
1517sub expand_cfpod {
1518 ((my $self), (local $_)) = @_;
1519
1520 # escape & and <
1521 s/&/&amp;/g;
1522 s/(?<![BIUGHT])</&lt;/g;
1523
1524 # this is buggy, it needs to properly take care of nested <'s
1525
1526 1 while
1527 # replace B<>, I<>, U<> etc.
1528 s/B<([^\>]*)>/<b>$1<\/b>/
1529 || s/I<([^\>]*)>/<i>$1<\/i>/
1530 || s/U<([^\>]*)>/<u>$1<\/u>/
1531 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1532 # replace G<male|female> tags
1533 || s{G<([^>|]*)\|([^>]*)>}{
1534 $self->gender ? $2 : $1
1535 }ge
1536 # replace H<hint text>
1537 || s{H<([^\>]*)>}
1538 {
1539 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1540 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1541 "")
1542 [$self->{hintmode}]
1543 }ge;
1544
1545 # create single paragraphs (very hackish)
1546 s/(?<=\S)\n(?=\w)/ /g;
1547
1548 # compress some whitespace
1549 s/\s+\n/\n/g; # ws line-ends
1550 s/\n\n+/\n/g; # double lines
1551 s/^\n+//; # beginning lines
1552 s/\n+$//; # ending lines
1553
1554 $_
1555}
1556
1557sub hintmode {
1558 $_[0]{hintmode} = $_[1] if @_ > 1;
1559 $_[0]{hintmode}
1560}
1561 1677
1562=item $player->ext_reply ($msgid, @msg) 1678=item $player->ext_reply ($msgid, @msg)
1563 1679
1564Sends an ext reply to the player. 1680Sends an ext reply to the player.
1565 1681
1632our $MAX_RESET = 3600; 1748our $MAX_RESET = 3600;
1633our $DEFAULT_RESET = 3000; 1749our $DEFAULT_RESET = 3000;
1634 1750
1635sub generate_random_map { 1751sub generate_random_map {
1636 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
1637 # mit "rum" bekleckern, nicht 1756 # mit "rum" bekleckern, nicht
1638 $self->_create_random_map ( 1757 $self->_create_random_map (
1639 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1758 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1640 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1759 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1641 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1760 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1763 1882
1764# the temporary/swap location 1883# the temporary/swap location
1765sub save_path { 1884sub save_path {
1766 my ($self) = @_; 1885 my ($self) = @_;
1767 1886
1768 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1887 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1769 "$TMPDIR/$path.map" 1888 "$TMPDIR/$path.map"
1770} 1889}
1771 1890
1772# the unique path, undef == no special unique path 1891# the unique path, undef == no special unique path
1773sub uniq_path { 1892sub uniq_path {
1774 my ($self) = @_; 1893 my ($self) = @_;
1775 1894
1776 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1895 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1777 "$UNIQUEDIR/$path" 1896 "$UNIQUEDIR/$path"
1778}
1779
1780# and all this just because we cannot iterate over
1781# all maps in C++...
1782sub change_all_map_light {
1783 my ($change) = @_;
1784
1785 $_->change_map_light ($change)
1786 for grep $_->outdoor, values %cf::MAP;
1787} 1897}
1788 1898
1789sub decay_objects { 1899sub decay_objects {
1790 my ($self) = @_; 1900 my ($self) = @_;
1791 1901
1875sub find { 1985sub find {
1876 my ($path, $origin) = @_; 1986 my ($path, $origin) = @_;
1877 1987
1878 $path = normalise $path, $origin && $origin->path; 1988 $path = normalise $path, $origin && $origin->path;
1879 1989
1880 cf::lock_wait "map_data:$path";#d#remove 1990 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1881 cf::lock_wait "map_find:$path"; 1991 my $guard2 = cf::lock_acquire "map_find:$path";
1882 1992
1883 $cf::MAP{$path} || do { 1993 $cf::MAP{$path} || do {
1884 my $guard1 = cf::lock_acquire "map_find:$path";
1885 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1886
1887 my $map = new_from_path cf::map $path 1994 my $map = new_from_path cf::map $path
1888 or return; 1995 or return;
1889 1996
1890 $map->{last_save} = $cf::RUNTIME; 1997 $map->{last_save} = $cf::RUNTIME;
1891 1998
1893 or return; 2000 or return;
1894 2001
1895 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2002 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1896 # doing this can freeze the server in a sync job, obviously 2003 # doing this can freeze the server in a sync job, obviously
1897 #$cf::WAIT_FOR_TICK->wait; 2004 #$cf::WAIT_FOR_TICK->wait;
2005 undef $guard2;
1898 undef $guard1; 2006 undef $guard1;
1899 undef $guard2;
1900 $map->reset; 2007 $map->reset;
1901 return find $path; 2008 return find $path;
1902 } 2009 }
1903 2010
1904 $cf::MAP{$path} = $map 2011 $cf::MAP{$path} = $map
1931 my $f = new_from_file cf::object::thawer $self->{load_path}; 2038 my $f = new_from_file cf::object::thawer $self->{load_path};
1932 $f->skip_block; 2039 $f->skip_block;
1933 $self->_load_objects ($f) 2040 $self->_load_objects ($f)
1934 or return; 2041 or return;
1935 2042
1936 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2043 $self->post_load_original
1937 if delete $self->{load_original}; 2044 if delete $self->{load_original};
1938 2045
1939 if (my $uniq = $self->uniq_path) { 2046 if (my $uniq = $self->uniq_path) {
1940 utf8::encode $uniq; 2047 utf8::encode $uniq;
1941 unless (aio_stat $uniq) { 2048 unless (aio_stat $uniq) {
1959 unless ($self->{deny_activate}) { 2066 unless ($self->{deny_activate}) {
1960 $self->decay_objects; 2067 $self->decay_objects;
1961 $self->fix_auto_apply; 2068 $self->fix_auto_apply;
1962 $self->update_buttons; 2069 $self->update_buttons;
1963 cf::cede_to_tick; 2070 cf::cede_to_tick;
1964 $self->set_darkness_map;
1965 cf::cede_to_tick;
1966 $self->activate; 2071 $self->activate;
1967 } 2072 }
1968 2073
1969 $self->{last_save} = $cf::RUNTIME; 2074 $self->{last_save} = $cf::RUNTIME;
1970 $self->last_access ($cf::RUNTIME); 2075 $self->last_access ($cf::RUNTIME);
1971 2076
1972 $self->in_memory (cf::MAP_IN_MEMORY); 2077 $self->in_memory (cf::MAP_ACTIVE);
1973 } 2078 }
1974 2079
1975 $self->post_load; 2080 $self->post_load;
1976} 2081}
1977 2082
2035 my ($path, $origin, $load) = @_; 2140 my ($path, $origin, $load) = @_;
2036 2141
2037 $path = normalise $path, $origin && $origin->{path}; 2142 $path = normalise $path, $origin && $origin->{path};
2038 2143
2039 if (my $map = $cf::MAP{$path}) { 2144 if (my $map = $cf::MAP{$path}) {
2040 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2145 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2041 } 2146 }
2042 2147
2043 $MAP_PREFETCH{$path} |= $load; 2148 $MAP_PREFETCH{$path} |= $load;
2044 2149
2045 $MAP_PREFETCHER ||= cf::async { 2150 $MAP_PREFETCHER ||= cf::async {
2082 cf::async { 2187 cf::async {
2083 $Coro::current->{desc} = "map player save"; 2188 $Coro::current->{desc} = "map player save";
2084 $_->contr->save for $self->players; 2189 $_->contr->save for $self->players;
2085 }; 2190 };
2086 2191
2192 cf::get_slot 0.02;
2193
2087 if ($uniq) { 2194 if ($uniq) {
2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2195 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2089 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2196 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2090 } else { 2197 } else {
2091 $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);
2099 $self->save; 2206 $self->save;
2100 2207
2101 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2208 my $lock = cf::lock_acquire "map_data:$self->{path}";
2102 2209
2103 return if $self->players; 2210 return if $self->players;
2104 return if $self->in_memory != cf::MAP_IN_MEMORY; 2211 return if $self->in_memory != cf::MAP_ACTIVE;
2105 return if $self->{deny_save}; 2212 return if $self->{deny_save};
2106 2213
2107 $self->in_memory (cf::MAP_SWAPPED); 2214 $self->in_memory (cf::MAP_SWAPPED);
2108 2215
2109 $self->deactivate; 2216 $self->deactivate;
2134 2241
2135 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2136 2243
2137 return if $self->players; 2244 return if $self->players;
2138 2245
2139 warn "resetting map ", $self->path; 2246 warn "resetting map ", $self->path, "\n";
2140 2247
2141 $self->in_memory (cf::MAP_SWAPPED); 2248 $self->in_memory (cf::MAP_SWAPPED);
2142 2249
2143 # need to save uniques path 2250 # need to save uniques path
2144 unless ($self->{deny_save}) { 2251 unless ($self->{deny_save}) {
2227 2334
2228sub unique_maps() { 2335sub unique_maps() {
2229 [ 2336 [
2230 map { 2337 map {
2231 utf8::decode $_; 2338 utf8::decode $_;
2232 /\.map$/ 2339 s/\.map$//; # TODO future compatibility hack
2340 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2341 ? ()
2233 ? normalise $_ 2342 : normalise $_
2234 : ()
2235 } @{ aio_readdir $UNIQUEDIR or [] } 2343 } @{ aio_readdir $UNIQUEDIR or [] }
2236 ] 2344 ]
2237} 2345}
2238 2346
2239package 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}
2240 2378
2241=back 2379=back
2242 2380
2243=head3 cf::object 2381=head3 cf::object
2244 2382
2248 2386
2249=over 4 2387=over 4
2250 2388
2251=item $ob->inv_recursive 2389=item $ob->inv_recursive
2252 2390
2253Returns 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.
2254 2393
2255=cut 2394=cut
2256 2395
2257sub inv_recursive_; 2396sub inv_recursive_;
2258sub inv_recursive_ { 2397sub inv_recursive_ {
2263 inv_recursive_ inv $_[0] 2402 inv_recursive_ inv $_[0]
2264} 2403}
2265 2404
2266=item $ref = $ob->ref 2405=item $ref = $ob->ref
2267 2406
2268creates 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.
2269 2408
2270=item $ob = cf::object::deref ($refstring) 2409=item $ob = cf::object::deref ($refstring)
2271 2410
2272returns 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,
2273even if the object actually exists. May block. 2412even if the object actually exists. May block.
2305can 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
2306dialogue with the given NPC character. 2445dialogue with the given NPC character.
2307 2446
2308=cut 2447=cut
2309 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
2310# rough implementation of a future "reply" method that works 2463# rough implementation of a future "reply" method that works
2311# with dialog boxes. 2464# with dialog boxes.
2312#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
2313sub cf::object::player::reply($$$;$) { 2466sub cf::object::player::reply($$$;$) {
2314 my ($self, $npc, $msg, $flags) = @_; 2467 my ($self, $npc, $msg, $flags) = @_;
2325 my $dialog = $pl->{npc_dialog}; 2478 my $dialog = $pl->{npc_dialog};
2326 $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));
2327 2480
2328 } else { 2481 } else {
2329 $msg = $npc->name . " says: $msg" if $npc; 2482 $msg = $npc->name . " says: $msg" if $npc;
2330 $self->message ($msg, $flags); 2483 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2331 } 2484 }
2332 } 2485 }
2333} 2486}
2334 2487
2335=item $object->send_msg ($channel, $msg, $color, [extra...]) 2488=item $object->send_msg ($channel, $msg, $color, [extra...])
2360 2513
2361=item $player_object->enter_link 2514=item $player_object->enter_link
2362 2515
2363Freezes 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}>).
2364 2517
2365The 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.
2366I<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.
2367 2522
2368Will never block. 2523Will never block.
2369 2524
2370=item $player_object->leave_link ($map, $x, $y) 2525=item $player_object->leave_link ($map, $x, $y)
2371 2526
2423 ($x, $y) = (-1, -1) 2578 ($x, $y) = (-1, -1)
2424 unless (defined $x) && (defined $y); 2579 unless (defined $x) && (defined $y);
2425 2580
2426 # use -1 or undef as default coordinates, not 0, 0 2581 # use -1 or undef as default coordinates, not 0, 0
2427 ($x, $y) = ($map->enter_x, $map->enter_y) 2582 ($x, $y) = ($map->enter_x, $map->enter_y)
2428 if $x <=0 && $y <= 0; 2583 if $x <= 0 && $y <= 0;
2429 2584
2430 $map->load; 2585 $map->load;
2431 $map->load_neighbours; 2586 $map->load_neighbours;
2432 2587
2433 return unless $self->contr->active; 2588 return unless $self->contr->active;
2434 $self->activate_recursive;
2435 2589
2436 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2437 $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;
2438} 2595}
2439 2596
2440=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2441 2598
2442Moves 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
2443her, loading and preparing them map, calling the provided $check callback 2600her, loading and preparing them map, calling the provided $check callback
2444that 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
2445the 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
2446be 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 >>.
2447 2607
2448=cut 2608=cut
2449 2609
2450our $GOTOGEN; 2610our $GOTOGEN;
2451 2611
2530} 2690}
2531 2691
2532sub prepare_random_map { 2692sub prepare_random_map {
2533 my ($exit) = @_; 2693 my ($exit) = @_;
2534 2694
2535 my $guard = cf::lock_acquire "exit_prepare:$exit";
2536
2537 # all this does is basically replace the /! path by 2695 # all this does is basically replace the /! path by
2538 # a new random map path (?random/...) with a seed 2696 # a new random map path (?random/...) with a seed
2539 # that depends on the exit object 2697 # that depends on the exit object
2540 2698
2541 my $rmp = parse_random_map_params $exit->msg; 2699 my $rmp = parse_random_map_params $exit->msg;
2543 if ($exit->map) { 2701 if ($exit->map) {
2544 $rmp->{region} = $exit->region->name; 2702 $rmp->{region} = $exit->region->name;
2545 $rmp->{origin_map} = $exit->map->path; 2703 $rmp->{origin_map} = $exit->map->path;
2546 $rmp->{origin_x} = $exit->x; 2704 $rmp->{origin_x} = $exit->x;
2547 $rmp->{origin_y} = $exit->y; 2705 $rmp->{origin_y} = $exit->y;
2706
2707 $exit->map->touch;
2548 } 2708 }
2549 2709
2550 $rmp->{random_seed} ||= $exit->random_seed; 2710 $rmp->{random_seed} ||= $exit->random_seed;
2551 2711
2552 my $data = cf::to_json $rmp; 2712 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2553 my $md5 = Digest::MD5::md5_hex $data; 2713 my $md5 = Digest::MD5::md5_hex $data;
2554 my $meta = "$RANDOMDIR/$md5.meta"; 2714 my $meta = "$RANDOMDIR/$md5.meta";
2555 2715
2556 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2716 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2557 aio_write $fh, 0, (length $data), $data, 0; 2717 aio_write $fh, 0, (length $data), $data, 0;
2558 undef $fh; 2718 undef $fh;
2559 aio_rename "$meta~", $meta; 2719 aio_rename "$meta~", $meta;
2560 2720
2721 my $slaying = "?random/$md5";
2722
2723 if ($exit->valid) {
2561 $exit->slaying ("?random/$md5"); 2724 $exit->slaying ("?random/$md5");
2562 $exit->msg (undef); 2725 $exit->msg (undef);
2726 }
2563 } 2727 }
2564} 2728}
2565 2729
2566sub cf::object::player::enter_exit { 2730sub cf::object::player::enter_exit {
2567 my ($self, $exit) = @_; 2731 my ($self, $exit) = @_;
2568 2732
2569 return unless $self->type == cf::PLAYER; 2733 return unless $self->type == cf::PLAYER;
2570 2734
2571 if ($exit->slaying eq "/!") {
2572 #TODO: this should de-fi-ni-te-ly not be a sync-job
2573 # the problem is that $exit might not survive long enough
2574 # so it needs to be done right now, right here
2575 cf::sync_job { prepare_random_map $exit };
2576 }
2577
2578 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2579 my $hp = $exit->stats->hp;
2580 my $sp = $exit->stats->sp;
2581
2582 $self->enter_link; 2735 $self->enter_link;
2583 2736
2584 # if exit is damned, update players death & WoR home-position
2585 $self->contr->savebed ($slaying, $hp, $sp)
2586 if $exit->flag (FLAG_DAMNED);
2587
2588 (async { 2737 (async {
2589 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2738 $Coro::current->{desc} = "enter_exit";
2590 2739
2591 $self->deactivate_recursive; # just to be sure
2592 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
2593 $self->goto ($slaying, $hp, $sp); 2755 $self->goto ($map, $x, $y);
2594 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
2595 1; 2761 1
2596 }) { 2762 }) {
2597 $self->message ("Something went wrong deep within the crossfire server. " 2763 $self->message ("Something went wrong deep within the deliantra server. "
2598 . "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. "
2599 . "Please report this to the dungeon master!", 2765 . "Please report this to the dungeon master!",
2600 cf::NDI_UNIQUE | cf::NDI_RED); 2766 cf::NDI_UNIQUE | cf::NDI_RED);
2601 2767
2602 warn "ERROR in enter_exit: $@"; 2768 warn "ERROR in enter_exit: $@";
2619sub cf::client::send_drawinfo { 2785sub cf::client::send_drawinfo {
2620 my ($self, $text, $flags) = @_; 2786 my ($self, $text, $flags) = @_;
2621 2787
2622 utf8::encode $text; 2788 utf8::encode $text;
2623 $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);
2624} 2815}
2625 2816
2626=item $client->send_msg ($channel, $msg, $color, [extra...]) 2817=item $client->send_msg ($channel, $msg, $color, [extra...])
2627 2818
2628Send 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
2630the 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
2631the message unless the client supports the msg packet. 2822the message unless the client supports the msg packet.
2632 2823
2633=cut 2824=cut
2634 2825
2826# non-persistent channels (usually the info channel)
2635our %CHANNEL = ( 2827our %CHANNEL = (
2828 "c/motd" => {
2829 id => "infobox",
2830 title => "MOTD",
2831 reply => undef,
2832 tooltip => "The message of the day",
2833 },
2636 "c/identify" => { 2834 "c/identify" => {
2637 id => "infobox", 2835 id => "infobox",
2638 title => "Identify", 2836 title => "Identify",
2639 reply => undef, 2837 reply => undef,
2640 tooltip => "Items recently identified", 2838 tooltip => "Items recently identified",
2643 id => "infobox", 2841 id => "infobox",
2644 title => "Examine", 2842 title => "Examine",
2645 reply => undef, 2843 reply => undef,
2646 tooltip => "Signs and other items you examined", 2844 tooltip => "Signs and other items you examined",
2647 }, 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 },
2648 "c/lookat" => { 2858 "c/lookat" => {
2649 id => "infobox", 2859 id => "infobox",
2650 title => "Look", 2860 title => "Look",
2651 reply => undef, 2861 reply => undef,
2652 tooltip => "What you saw there", 2862 tooltip => "What you saw there",
2653 }, 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,
2654); 2938);
2655 2939
2656sub cf::client::send_msg { 2940sub cf::client::send_msg {
2657 my ($self, $channel, $msg, $color, @extra) = @_; 2941 my ($self, $channel, $msg, $color, @extra) = @_;
2658 2942
2659 $msg = $self->pl->expand_cfpod ($msg); 2943 $msg = $self->pl->expand_cfpod ($msg)
2944 unless $color & cf::NDI_VERBATIM;
2660 2945
2661 $color &= cf::NDI_CLIENT_MASK; # just in case... 2946 $color &= cf::NDI_CLIENT_MASK; # just in case...
2662 2947
2663 # check predefined channels, for the benefit of C 2948 # check predefined channels, for the benefit of C
2664 if ($CHANNEL{$channel}) { 2949 if ($CHANNEL{$channel}) {
2665 $channel = $CHANNEL{$channel}; 2950 $channel = $CHANNEL{$channel};
2666 2951
2667 $self->ext_msg (channel_info => $channel) 2952 $self->ext_msg (channel_info => $channel);
2668 if $self->can_msg;
2669
2670 $channel = $channel->{id}; 2953 $channel = $channel->{id};
2671 2954
2672 } elsif (ref $channel) { 2955 } elsif (ref $channel) {
2673 # send meta info to client, if not yet sent 2956 # send meta info to client, if not yet sent
2674 unless (exists $self->{channel}{$channel->{id}}) { 2957 unless (exists $self->{channel}{$channel->{id}}) {
2675 $self->{channel}{$channel->{id}} = $channel; 2958 $self->{channel}{$channel->{id}} = $channel;
2676 $self->ext_msg (channel_info => $channel) 2959 $self->ext_msg (channel_info => $channel);
2677 if $self->can_msg;
2678 } 2960 }
2679 2961
2680 $channel = $channel->{id}; 2962 $channel = $channel->{id};
2681 } 2963 }
2682 2964
2683 return unless @extra || length $msg; 2965 return unless @extra || length $msg;
2684 2966
2685 if ($self->can_msg) {
2686 # default colour, mask it out 2967 # default colour, mask it out
2687 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2968 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2688 if $color & cf::NDI_DEF; 2969 if $color & cf::NDI_DEF;
2689 2970
2690 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2971 my $pkt = "msg "
2972 . $self->{json_coder}->encode (
2691 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2973 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2692 } else { 2974 );
2693 if ($color >= 0) {
2694 # replace some tags by gcfclient-compatible ones
2695 for ($msg) {
2696 1 while
2697 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2698 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2699 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2700 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2701 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2702 }
2703 2975
2704 $color &= cf::NDI_COLOR_MASK; 2976 $self->send_big_packet ($pkt);
2705
2706 utf8::encode $msg;
2707
2708 if (0 && $msg =~ /\[/) {
2709 # COMMAND/INFO
2710 $self->send_packet ("drawextinfo $color 10 8 $msg")
2711 } else {
2712 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2713 $self->send_packet ("drawinfo $color $msg")
2714 }
2715 }
2716 }
2717} 2977}
2718 2978
2719=item $client->ext_msg ($type, @msg) 2979=item $client->ext_msg ($type, @msg)
2720 2980
2721Sends an ext event to the client. 2981Sends an ext event to the client.
2724 2984
2725sub cf::client::ext_msg($$@) { 2985sub cf::client::ext_msg($$@) {
2726 my ($self, $type, @msg) = @_; 2986 my ($self, $type, @msg) = @_;
2727 2987
2728 if ($self->extcmd == 2) { 2988 if ($self->extcmd == 2) {
2729 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2989 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2730 } elsif ($self->extcmd == 1) { # TODO: remove 2990 } elsif ($self->extcmd == 1) { # TODO: remove
2731 push @msg, msgtype => "event_$type"; 2991 push @msg, msgtype => "event_$type";
2732 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2992 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2733 } 2993 }
2734} 2994}
2735 2995
2736=item $client->ext_reply ($msgid, @msg) 2996=item $client->ext_reply ($msgid, @msg)
2737 2997
2741 3001
2742sub cf::client::ext_reply($$@) { 3002sub cf::client::ext_reply($$@) {
2743 my ($self, $id, @msg) = @_; 3003 my ($self, $id, @msg) = @_;
2744 3004
2745 if ($self->extcmd == 2) { 3005 if ($self->extcmd == 2) {
2746 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3006 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2747 } elsif ($self->extcmd == 1) { 3007 } elsif ($self->extcmd == 1) {
2748 #TODO: version 1, remove 3008 #TODO: version 1, remove
2749 unshift @msg, msgtype => "reply", msgid => $id; 3009 unshift @msg, msgtype => "reply", msgid => $id;
2750 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2751 } 3011 }
2752} 3012}
2753 3013
2754=item $success = $client->query ($flags, "text", \&cb) 3014=item $success = $client->query ($flags, "text", \&cb)
2755 3015
2894=pod 3154=pod
2895 3155
2896The following functions and methods are available within a safe environment: 3156The following functions and methods are available within a safe environment:
2897 3157
2898 cf::object 3158 cf::object
2899 contr pay_amount pay_player map x y force_find force_add 3159 contr pay_amount pay_player map x y force_find force_add destroy
2900 insert remove name archname title slaying race decrease_ob_nr 3160 insert remove name archname title slaying race decrease split
3161 value
2901 3162
2902 cf::object::player 3163 cf::object::player
2903 player 3164 player
2904 3165
2905 cf::player 3166 cf::player
2910 3171
2911=cut 3172=cut
2912 3173
2913for ( 3174for (
2914 ["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
2915 insert remove inv name archname title slaying race 3176 insert remove inv nrof name archname title slaying race
2916 decrease_ob_nr)], 3177 decrease split destroy change_exp value msg lore send_msg)],
2917 ["cf::object::player" => qw(player)], 3178 ["cf::object::player" => qw(player)],
2918 ["cf::player" => qw(peaceful)], 3179 ["cf::player" => qw(peaceful send_msg)],
2919 ["cf::map" => qw(trigger)], 3180 ["cf::map" => qw(trigger)],
2920) { 3181) {
2921 no strict 'refs'; 3182 no strict 'refs';
2922 my ($pkg, @funs) = @$_; 3183 my ($pkg, @funs) = @$_;
2923 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3184 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2940 my ($code, %vars) = @_; 3201 my ($code, %vars) = @_;
2941 3202
2942 my $qcode = $code; 3203 my $qcode = $code;
2943 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3204 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2944 $qcode =~ s/\n/\\n/g; 3205 $qcode =~ s/\n/\\n/g;
3206
3207 %vars = (_dummy => 0) unless %vars;
2945 3208
2946 local $_; 3209 local $_;
2947 local @safe::cf::_safe_eval_args = values %vars; 3210 local @safe::cf::_safe_eval_args = values %vars;
2948 3211
2949 my $eval = 3212 my $eval =
3026 { 3289 {
3027 my $faces = $facedata->{faceinfo}; 3290 my $faces = $facedata->{faceinfo};
3028 3291
3029 while (my ($face, $info) = each %$faces) { 3292 while (my ($face, $info) = each %$faces) {
3030 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3293 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3294
3031 cf::face::set_visibility $idx, $info->{visibility}; 3295 cf::face::set_visibility $idx, $info->{visibility};
3032 cf::face::set_magicmap $idx, $info->{magicmap}; 3296 cf::face::set_magicmap $idx, $info->{magicmap};
3033 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};
3034 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};
3035 3299
3036 cf::cede_to_tick; 3300 cf::cede_to_tick;
3037 } 3301 }
3038 3302
3039 while (my ($face, $info) = each %$faces) { 3303 while (my ($face, $info) = each %$faces) {
3040 next unless $info->{smooth}; 3304 next unless $info->{smooth};
3305
3041 my $idx = cf::face::find $face 3306 my $idx = cf::face::find $face
3042 or next; 3307 or next;
3308
3043 if (my $smooth = cf::face::find $info->{smooth}) { 3309 if (my $smooth = cf::face::find $info->{smooth}) {
3044 cf::face::set_smooth $idx, $smooth; 3310 cf::face::set_smooth $idx, $smooth;
3045 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3311 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3046 } else { 3312 } else {
3047 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3313 warn "smooth face '$info->{smooth}' not found for face '$face'";
3065 { 3331 {
3066 # TODO: for gcfclient pleasure, we should give resources 3332 # TODO: for gcfclient pleasure, we should give resources
3067 # that gcfclient doesn't grok a >10000 face index. 3333 # that gcfclient doesn't grok a >10000 face index.
3068 my $res = $facedata->{resource}; 3334 my $res = $facedata->{resource};
3069 3335
3070 my $soundconf = delete $res->{"res/sound.conf"};
3071
3072 while (my ($name, $info) = each %$res) { 3336 while (my ($name, $info) = each %$res) {
3337 if (defined $info->{type}) {
3073 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3338 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3074 my $data; 3339 my $data;
3075 3340
3076 if ($info->{type} & 1) { 3341 if ($info->{type} & 1) {
3077 # prepend meta info 3342 # prepend meta info
3078 3343
3079 my $meta = $enc->encode ({ 3344 my $meta = $enc->encode ({
3080 name => $name, 3345 name => $name,
3081 %{ $info->{meta} || {} }, 3346 %{ $info->{meta} || {} },
3082 }); 3347 });
3083 3348
3084 $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};
3085 } else { 3356 } else {
3086 $data = $info->{data}; 3357 $RESOURCE{$name} = $info;
3087 } 3358 }
3088 3359
3089 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3090 cf::face::set_type $idx, $info->{type};
3091
3092 cf::cede_to_tick; 3360 cf::cede_to_tick;
3093 } 3361 }
3094
3095 if ($soundconf) {
3096 $soundconf = $enc->decode (delete $soundconf->{data});
3097
3098 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3099 my $sound = $soundconf->{compat}[$_]
3100 or next;
3101
3102 my $face = cf::face::find "sound/$sound->[1]";
3103 cf::sound::set $sound->[0] => $face;
3104 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3105 }
3106
3107 while (my ($k, $v) = each %{$soundconf->{event}}) {
3108 my $face = cf::face::find "sound/$v";
3109 cf::sound::set $k => $face;
3110 }
3111 }
3112 } 3362 }
3363
3364 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3113 3365
3114 1 3366 1
3115} 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});
3116 3388
3117register_exticmd fx_want => sub { 3389register_exticmd fx_want => sub {
3118 my ($ns, $want) = @_; 3390 my ($ns, $want) = @_;
3119 3391
3120 while (my ($k, $v) = each %$want) { 3392 while (my ($k, $v) = each %$want) {
3121 $ns->fx_want ($k, $v); 3393 $ns->fx_want ($k, $v);
3122 } 3394 }
3123}; 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}
3124 3406
3125sub reload_regions { 3407sub reload_regions {
3126 # 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
3127 # for this (global event?) 3409 # for this (global event?)
3128 %ext::player_env::MUSIC_FACE_CACHE = (); 3410 %ext::player_env::MUSIC_FACE_CACHE = ();
3142} 3424}
3143 3425
3144sub reload_archetypes { 3426sub reload_archetypes {
3145 load_resource_file "$DATADIR/archetypes" 3427 load_resource_file "$DATADIR/archetypes"
3146 or die "unable to load archetypes\n"; 3428 or die "unable to load archetypes\n";
3147 #d# NEED to laod twice to resolve forward references
3148 # this really needs to be done in an extra post-pass
3149 # (which needs to be synchronous, so solve it differently)
3150 load_resource_file "$DATADIR/archetypes"
3151 or die "unable to load archetypes\n";
3152} 3429}
3153 3430
3154sub reload_treasures { 3431sub reload_treasures {
3155 load_resource_file "$DATADIR/treasures" 3432 load_resource_file "$DATADIR/treasures"
3156 or die "unable to load treasurelists\n"; 3433 or die "unable to load treasurelists\n";
3157} 3434}
3158 3435
3159sub reload_resources { 3436sub reload_resources {
3160 warn "reloading resource files...\n"; 3437 warn "reloading resource files...\n";
3161 3438
3439 reload_facedata;
3440 reload_archetypes;
3162 reload_regions; 3441 reload_regions;
3163 reload_facedata;
3164 #reload_archetypes;#d#
3165 reload_archetypes;
3166 reload_treasures; 3442 reload_treasures;
3167 3443
3168 warn "finished reloading resource files\n"; 3444 warn "finished reloading resource files\n";
3169} 3445}
3170 3446
3171sub init {
3172 reload_resources;
3173}
3174
3175sub reload_config { 3447sub reload_config {
3448 warn "reloading config file...\n";
3449
3176 open my $fh, "<:utf8", "$CONFDIR/config" 3450 open my $fh, "<:utf8", "$CONFDIR/config"
3177 or return; 3451 or return;
3178 3452
3179 local $/; 3453 local $/;
3180 *CFG = YAML::Syck::Load <$fh>; 3454 *CFG = YAML::XS::Load scalar <$fh>;
3181 3455
3182 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3456 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3183 3457
3184 $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};
3185 $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};
3189 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3463 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3190 and die "WARNING: m(un)lockall failed: $!\n"; 3464 and die "WARNING: m(un)lockall failed: $!\n";
3191 }; 3465 };
3192 warn $@ if $@; 3466 warn $@ if $@;
3193 } 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;
3194} 3498}
3195 3499
3196sub 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
3197 # we must not ever block the main coroutine 3515 # we must not ever block the main coroutine
3198 local $Coro::idle = sub { 3516 local $Coro::idle = sub {
3199 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#
3200 (async { 3518 (async {
3201 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3519 $Coro::current->{desc} = "IDLE BUG HANDLER";
3202 Event::one_event; 3520 EV::loop EV::LOOP_ONESHOT;
3203 })->prio (Coro::PRIO_MAX); 3521 })->prio (Coro::PRIO_MAX);
3204 }; 3522 };
3205 3523
3524 evthread_start IO::AIO::poll_fileno;
3525
3526 cf::sync_job {
3527 reload_resources;
3206 reload_config; 3528 reload_config;
3207 db_init; 3529 db_init;
3530
3531 cf::load_settings;
3532 cf::load_materials;
3533 cf::init_uuid;
3534 cf::init_signals;
3535 cf::init_commands;
3536 cf::init_skills;
3537
3538 cf::init_beforeplay;
3539
3540 atomic;
3541
3208 load_extensions; 3542 load_extensions;
3209 3543
3210 $TICK_WATCHER->start; 3544 utime time, time, $RUNTIMEFILE;
3211 Event::loop; 3545
3546 # no (long-running) fork's whatsoever before this point(!)
3547 use POSIX ();
3548 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3549
3550 (pop @POST_INIT)->(0) while @POST_INIT;
3551 };
3552
3553 main_loop;
3212} 3554}
3213 3555
3214############################################################################# 3556#############################################################################
3215# initialisation and cleanup 3557# initialisation and cleanup
3216 3558
3217# install some emergency cleanup handlers 3559# install some emergency cleanup handlers
3218BEGIN { 3560BEGIN {
3561 our %SIGWATCHER = ();
3219 for my $signal (qw(INT HUP TERM)) { 3562 for my $signal (qw(INT HUP TERM)) {
3220 Event->signal ( 3563 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3221 reentrant => 0,
3222 data => WF_AUTOCANCEL,
3223 signal => $signal,
3224 prio => 0,
3225 cb => sub {
3226 cf::cleanup "SIG$signal"; 3564 cf::cleanup "SIG$signal";
3227 },
3228 ); 3565 };
3229 } 3566 }
3230} 3567}
3231 3568
3232sub write_runtime { 3569sub write_runtime_sync {
3233 my $runtime = "$LOCALDIR/runtime";
3234
3235 # first touch the runtime file to show we are still running: 3570 # first touch the runtime file to show we are still running:
3236 # the fsync below can take a very very long time. 3571 # the fsync below can take a very very long time.
3237 3572
3238 IO::AIO::aio_utime $runtime, undef, undef; 3573 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3239 3574
3240 my $guard = cf::lock_acquire "write_runtime"; 3575 my $guard = cf::lock_acquire "write_runtime";
3241 3576
3242 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3577 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3243 or return; 3578 or return;
3244 3579
3245 my $value = $cf::RUNTIME + 90 + 10; 3580 my $value = $cf::RUNTIME + 90 + 10;
3246 # 10 is the runtime save interval, for a monotonic clock 3581 # 10 is the runtime save interval, for a monotonic clock
3247 # 60 allows for the watchdog to kill the server. 3582 # 60 allows for the watchdog to kill the server.
3257 aio_utime $fh, undef, undef; 3592 aio_utime $fh, undef, undef;
3258 3593
3259 close $fh 3594 close $fh
3260 or return; 3595 or return;
3261 3596
3262 aio_rename "$runtime~", $runtime 3597 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3263 and return; 3598 and return;
3264 3599
3265 warn "runtime file written.\n"; 3600 warn "runtime file written.\n";
3266 3601
3267 1 3602 1
3603}
3604
3605our $uuid_lock;
3606our $uuid_skip;
3607
3608sub write_uuid_sync($) {
3609 $uuid_skip ||= $_[0];
3610
3611 return if $uuid_lock;
3612 local $uuid_lock = 1;
3613
3614 my $uuid = "$LOCALDIR/uuid";
3615
3616 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3617 or return;
3618
3619 my $value = uuid_seq uuid_cur;
3620
3621 unless ($value) {
3622 warn "cowardly refusing to write zero uuid value!\n";
3623 return;
3624 }
3625
3626 my $value = uuid_str $value + $uuid_skip;
3627 $uuid_skip = 0;
3628
3629 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3630 and return;
3631
3632 # always fsync - this file is important
3633 aio_fsync $fh
3634 and return;
3635
3636 close $fh
3637 or return;
3638
3639 aio_rename "$uuid~", $uuid
3640 and return;
3641
3642 warn "uuid file written ($value).\n";
3643
3644 1
3645
3646}
3647
3648sub write_uuid($$) {
3649 my ($skip, $sync) = @_;
3650
3651 $sync ? write_uuid_sync $skip
3652 : async { write_uuid_sync $skip };
3268} 3653}
3269 3654
3270sub emergency_save() { 3655sub emergency_save() {
3271 my $freeze_guard = cf::freeze_mainloop; 3656 my $freeze_guard = cf::freeze_mainloop;
3272 3657
3273 warn "enter emergency perl save\n"; 3658 warn "emergency_perl_save: enter\n";
3274 3659
3275 cf::sync_job { 3660 cf::sync_job {
3661 # this is a trade-off: we want to be very quick here, so
3662 # save all maps without fsync, and later call a global sync
3663 # (which in turn might be very very slow)
3664 local $USE_FSYNC = 0;
3665
3276 # use a peculiar iteration method to avoid tripping on perl 3666 # use a peculiar iteration method to avoid tripping on perl
3277 # refcount bugs in for. also avoids problems with players 3667 # refcount bugs in for. also avoids problems with players
3278 # and maps saved/destroyed asynchronously. 3668 # and maps saved/destroyed asynchronously.
3279 warn "begin emergency player save\n"; 3669 warn "emergency_perl_save: begin player save\n";
3280 for my $login (keys %cf::PLAYER) { 3670 for my $login (keys %cf::PLAYER) {
3281 my $pl = $cf::PLAYER{$login} or next; 3671 my $pl = $cf::PLAYER{$login} or next;
3282 $pl->valid or next; 3672 $pl->valid or next;
3673 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3283 $pl->save; 3674 $pl->save;
3284 } 3675 }
3285 warn "end emergency player save\n"; 3676 warn "emergency_perl_save: end player save\n";
3286 3677
3287 warn "begin emergency map save\n"; 3678 warn "emergency_perl_save: begin map save\n";
3288 for my $path (keys %cf::MAP) { 3679 for my $path (keys %cf::MAP) {
3289 my $map = $cf::MAP{$path} or next; 3680 my $map = $cf::MAP{$path} or next;
3290 $map->valid or next; 3681 $map->valid or next;
3291 $map->save; 3682 $map->save;
3292 } 3683 }
3293 warn "end emergency map save\n"; 3684 warn "emergency_perl_save: end map save\n";
3294 3685
3295 warn "begin emergency database checkpoint\n"; 3686 warn "emergency_perl_save: begin database checkpoint\n";
3296 BDB::db_env_txn_checkpoint $DB_ENV; 3687 BDB::db_env_txn_checkpoint $DB_ENV;
3297 warn "end emergency database checkpoint\n"; 3688 warn "emergency_perl_save: end database checkpoint\n";
3689
3690 warn "emergency_perl_save: begin write uuid\n";
3691 write_uuid_sync 1;
3692 warn "emergency_perl_save: end write uuid\n";
3298 }; 3693 };
3299 3694
3695 warn "emergency_perl_save: starting sync()\n";
3696 IO::AIO::aio_sync sub {
3697 warn "emergency_perl_save: finished sync()\n";
3698 };
3699
3300 warn "leave emergency perl save\n"; 3700 warn "emergency_perl_save: leave\n";
3301} 3701}
3302 3702
3303sub post_cleanup { 3703sub post_cleanup {
3304 my ($make_core) = @_; 3704 my ($make_core) = @_;
3305 3705
3306 warn Carp::longmess "post_cleanup backtrace" 3706 warn Carp::longmess "post_cleanup backtrace"
3307 if $make_core; 3707 if $make_core;
3708
3709 my $fh = pidfile;
3710 unlink $PIDFILE if <$fh> == $$;
3711}
3712
3713# a safer delete_package, copied from Symbol
3714sub clear_package($) {
3715 my $pkg = shift;
3716
3717 # expand to full symbol table name if needed
3718 unless ($pkg =~ /^main::.*::$/) {
3719 $pkg = "main$pkg" if $pkg =~ /^::/;
3720 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3721 $pkg .= '::' unless $pkg =~ /::$/;
3722 }
3723
3724 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3725 my $stem_symtab = *{$stem}{HASH};
3726
3727 defined $stem_symtab and exists $stem_symtab->{$leaf}
3728 or return;
3729
3730 # clear all symbols
3731 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3732 for my $name (keys %$leaf_symtab) {
3733 _gv_clear *{"$pkg$name"};
3734# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3735 }
3736 warn "cleared package $pkg\n";#d#
3308} 3737}
3309 3738
3310sub do_reload_perl() { 3739sub do_reload_perl() {
3311 # can/must only be called in main 3740 # can/must only be called in main
3312 if ($Coro::current != $Coro::main) { 3741 if ($Coro::current != $Coro::main) {
3313 warn "can only reload from main coroutine"; 3742 warn "can only reload from main coroutine";
3314 return; 3743 return;
3315 } 3744 }
3316 3745
3746 return if $RELOAD++;
3747
3748 my $t1 = EV::time;
3749
3750 while ($RELOAD) {
3317 warn "reloading..."; 3751 warn "reloading...";
3318 3752
3319 warn "entering sync_job"; 3753 warn "entering sync_job";
3320 3754
3321 cf::sync_job { 3755 cf::sync_job {
3322 cf::write_runtime; # external watchdog should not bark 3756 cf::write_runtime_sync; # external watchdog should not bark
3323 cf::emergency_save; 3757 cf::emergency_save;
3324 cf::write_runtime; # external watchdog should not bark 3758 cf::write_runtime_sync; # external watchdog should not bark
3325 3759
3326 warn "syncing database to disk"; 3760 warn "syncing database to disk";
3327 BDB::db_env_txn_checkpoint $DB_ENV; 3761 BDB::db_env_txn_checkpoint $DB_ENV;
3328 3762
3329 # if anything goes wrong in here, we should simply crash as we already saved 3763 # if anything goes wrong in here, we should simply crash as we already saved
3330 3764
3331 warn "cancelling all WF_AUTOCANCEL watchers";
3332 for (Event::all_watchers) {
3333 $_->cancel if $_->data & WF_AUTOCANCEL;
3334 }
3335
3336 warn "flushing outstanding aio requests"; 3765 warn "flushing outstanding aio requests";
3337 for (;;) {
3338 BDB::flush;
3339 IO::AIO::flush;
3340 Coro::cede;
3341 last unless IO::AIO::nreqs || BDB::nreqs; 3766 while (IO::AIO::nreqs || BDB::nreqs) {
3342 warn "iterate..."; 3767 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3343 }
3344
3345 ++$RELOAD;
3346
3347 warn "cancelling all extension coros";
3348 $_->cancel for values %EXT_CORO;
3349 %EXT_CORO = ();
3350
3351 warn "removing commands";
3352 %COMMAND = ();
3353
3354 warn "removing ext/exti commands";
3355 %EXTCMD = ();
3356 %EXTICMD = ();
3357
3358 warn "unloading/nuking all extensions";
3359 for my $pkg (@EXTS) {
3360 warn "... unloading $pkg";
3361
3362 if (my $cb = $pkg->can ("unload")) {
3363 eval {
3364 $cb->($pkg);
3365 1
3366 } or warn "$pkg unloaded, but with errors: $@";
3367 } 3768 }
3368 3769
3369 warn "... nuking $pkg"; 3770 warn "cancelling all extension coros";
3370 Symbol::delete_package $pkg; 3771 $_->cancel for values %EXT_CORO;
3371 } 3772 %EXT_CORO = ();
3372 3773
3373 warn "unloading all perl modules loaded from $LIBDIR"; 3774 warn "removing commands";
3374 while (my ($k, $v) = each %INC) { 3775 %COMMAND = ();
3375 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3376 3776
3777 warn "removing ext/exti commands";
3778 %EXTCMD = ();
3779 %EXTICMD = ();
3780
3781 warn "unloading/nuking all extensions";
3782 for my $pkg (@EXTS) {
3377 warn "... unloading $k"; 3783 warn "... unloading $pkg";
3378 delete $INC{$k};
3379 3784
3380 $k =~ s/\.pm$//;
3381 $k =~ s/\//::/g;
3382
3383 if (my $cb = $k->can ("unload_module")) { 3785 if (my $cb = $pkg->can ("unload")) {
3786 eval {
3384 $cb->(); 3787 $cb->($pkg);
3788 1
3789 } or warn "$pkg unloaded, but with errors: $@";
3790 }
3791
3792 warn "... clearing $pkg";
3793 clear_package $pkg;
3385 } 3794 }
3386 3795
3387 Symbol::delete_package $k; 3796 warn "unloading all perl modules loaded from $LIBDIR";
3797 while (my ($k, $v) = each %INC) {
3798 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3799
3800 warn "... unloading $k";
3801 delete $INC{$k};
3802
3803 $k =~ s/\.pm$//;
3804 $k =~ s/\//::/g;
3805
3806 if (my $cb = $k->can ("unload_module")) {
3807 $cb->();
3808 }
3809
3810 clear_package $k;
3388 } 3811 }
3389 3812
3390 warn "getting rid of safe::, as good as possible"; 3813 warn "getting rid of safe::, as good as possible";
3391 Symbol::delete_package "safe::$_" 3814 clear_package "safe::$_"
3392 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3815 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3393 3816
3394 warn "unloading cf.pm \"a bit\""; 3817 warn "unloading cf.pm \"a bit\"";
3395 delete $INC{"cf.pm"}; 3818 delete $INC{"cf.pm"};
3396 delete $INC{"cf/pod.pm"}; 3819 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3397 3820
3398 # don't, removes xs symbols, too, 3821 # don't, removes xs symbols, too,
3399 # and global variables created in xs 3822 # and global variables created in xs
3400 #Symbol::delete_package __PACKAGE__; 3823 #clear_package __PACKAGE__;
3401 3824
3402 warn "unload completed, starting to reload now"; 3825 warn "unload completed, starting to reload now";
3403 3826
3404 warn "reloading cf.pm"; 3827 warn "reloading cf.pm";
3405 require cf; 3828 require cf;
3406 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3829 cf::_connect_to_perl_1;
3407 3830
3408 warn "loading config and database again"; 3831 warn "loading config and database again";
3409 cf::reload_config; 3832 cf::reload_config;
3410 3833
3411 warn "loading extensions"; 3834 warn "loading extensions";
3412 cf::load_extensions; 3835 cf::load_extensions;
3413 3836
3837 if ($REATTACH_ON_RELOAD) {
3414 warn "reattaching attachments to objects/players"; 3838 warn "reattaching attachments to objects/players";
3415 _global_reattach; # objects, sockets 3839 _global_reattach; # objects, sockets
3416 warn "reattaching attachments to maps"; 3840 warn "reattaching attachments to maps";
3417 reattach $_ for values %MAP; 3841 reattach $_ for values %MAP;
3418 warn "reattaching attachments to players"; 3842 warn "reattaching attachments to players";
3419 reattach $_ for values %PLAYER; 3843 reattach $_ for values %PLAYER;
3844 }
3420 3845
3846 warn "running post_init jobs";
3847 (pop @POST_INIT)->(1) while @POST_INIT;
3848
3421 warn "leaving sync_job"; 3849 warn "leaving sync_job";
3422 3850
3423 1 3851 1
3424 } or do { 3852 } or do {
3425 warn $@; 3853 warn $@;
3426 warn "error while reloading, exiting."; 3854 cf::cleanup "error while reloading, exiting.";
3427 exit 1;
3428 }; 3855 };
3429 3856
3430 warn "reloaded"; 3857 warn "reloaded";
3858 --$RELOAD;
3859 }
3860
3861 $t1 = EV::time - $t1;
3862 warn "reload completed in ${t1}s\n";
3431}; 3863};
3432 3864
3433our $RELOAD_WATCHER; # used only during reload 3865our $RELOAD_WATCHER; # used only during reload
3434 3866
3435sub reload_perl() { 3867sub reload_perl() {
3436 # doing reload synchronously and two reloads happen back-to-back, 3868 # doing reload synchronously and two reloads happen back-to-back,
3437 # coro crashes during coro_state_free->destroy here. 3869 # coro crashes during coro_state_free->destroy here.
3438 3870
3439 $RELOAD_WATCHER ||= Event->timer ( 3871 $RELOAD_WATCHER ||= cf::async {
3440 reentrant => 0, 3872 Coro::AIO::aio_wait cache_extensions;
3441 after => 0, 3873
3442 data => WF_AUTOCANCEL, 3874 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3443 cb => sub {
3444 do_reload_perl; 3875 do_reload_perl;
3445 undef $RELOAD_WATCHER; 3876 undef $RELOAD_WATCHER;
3446 }, 3877 };
3447 ); 3878 };
3448} 3879}
3449 3880
3450register_command "reload" => sub { 3881register_command "reload" => sub {
3451 my ($who, $arg) = @_; 3882 my ($who, $arg) = @_;
3452 3883
3465 3896
3466our @WAIT_FOR_TICK; 3897our @WAIT_FOR_TICK;
3467our @WAIT_FOR_TICK_BEGIN; 3898our @WAIT_FOR_TICK_BEGIN;
3468 3899
3469sub wait_for_tick { 3900sub wait_for_tick {
3470 return unless $TICK_WATCHER->is_active;
3471 return if $Coro::current == $Coro::main; 3901 return if tick_inhibit || $Coro::current == $Coro::main;
3472 3902
3473 my $signal = new Coro::Signal; 3903 my $signal = new Coro::Signal;
3474 push @WAIT_FOR_TICK, $signal; 3904 push @WAIT_FOR_TICK, $signal;
3475 $signal->wait; 3905 $signal->wait;
3476} 3906}
3477 3907
3478sub wait_for_tick_begin { 3908sub wait_for_tick_begin {
3479 return unless $TICK_WATCHER->is_active;
3480 return if $Coro::current == $Coro::main; 3909 return if tick_inhibit || $Coro::current == $Coro::main;
3481 3910
3482 my $signal = new Coro::Signal; 3911 my $signal = new Coro::Signal;
3483 push @WAIT_FOR_TICK_BEGIN, $signal; 3912 push @WAIT_FOR_TICK_BEGIN, $signal;
3484 $signal->wait; 3913 $signal->wait;
3485} 3914}
3486 3915
3487$TICK_WATCHER = Event->timer ( 3916sub tick {
3488 reentrant => 0,
3489 parked => 1,
3490 prio => 0,
3491 at => $NEXT_TICK || $TICK,
3492 data => WF_AUTOCANCEL,
3493 cb => sub {
3494 if ($Coro::current != $Coro::main) { 3917 if ($Coro::current != $Coro::main) {
3495 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3918 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3496 unless ++$bug_warning > 10; 3919 unless ++$bug_warning > 10;
3497 return; 3920 return;
3498 } 3921 }
3499 3922
3500 $NOW = $tick_start = Event::time;
3501
3502 cf::server_tick; # one server iteration 3923 cf::server_tick; # one server iteration
3503 3924
3504 $RUNTIME += $TICK;
3505 $NEXT_TICK += $TICK;
3506
3507 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3925 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3508 $NEXT_RUNTIME_WRITE = $NOW + 10; 3926 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3509 Coro::async_pool { 3927 Coro::async_pool {
3510 $Coro::current->{desc} = "runtime saver"; 3928 $Coro::current->{desc} = "runtime saver";
3511 write_runtime 3929 write_runtime_sync
3512 or warn "ERROR: unable to write runtime file: $!"; 3930 or warn "ERROR: unable to write runtime file: $!";
3513 };
3514 } 3931 };
3932 }
3515 3933
3516 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3934 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3517 $sig->send; 3935 $sig->send;
3518 } 3936 }
3519 while (my $sig = shift @WAIT_FOR_TICK) { 3937 while (my $sig = shift @WAIT_FOR_TICK) {
3520 $sig->send; 3938 $sig->send;
3521 } 3939 }
3522 3940
3523 $NOW = Event::time; 3941 $LOAD = ($NOW - $TICK_START) / $TICK;
3524
3525 # if we are delayed by four ticks or more, skip them all
3526 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3527
3528 $TICK_WATCHER->at ($NEXT_TICK);
3529 $TICK_WATCHER->start;
3530
3531 $LOAD = ($NOW - $tick_start) / $TICK;
3532 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3942 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3533 3943
3534 _post_tick; 3944 if (0) {
3945 if ($NEXT_TICK) {
3946 my $jitter = $TICK_START - $NEXT_TICK;
3947 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3948 warn "jitter $JITTER\n";#d#
3949 }
3535 }, 3950 }
3536); 3951}
3537 3952
3538{ 3953{
3954 # configure BDB
3955
3539 BDB::min_parallel 8; 3956 BDB::min_parallel 8;
3540 BDB::max_poll_time $TICK * 0.1; 3957 BDB::max_poll_reqs $TICK * 0.1;
3541 $BDB_POLL_WATCHER = Event->io ( 3958 $AnyEvent::BDB::WATCHER->priority (1);
3542 reentrant => 0,
3543 fd => BDB::poll_fileno,
3544 poll => 'r',
3545 prio => 0,
3546 data => WF_AUTOCANCEL,
3547 cb => \&BDB::poll_cb,
3548 );
3549
3550 BDB::set_sync_prepare {
3551 my $status;
3552 my $current = $Coro::current;
3553 (
3554 sub {
3555 $status = $!;
3556 $current->ready; undef $current;
3557 },
3558 sub {
3559 Coro::schedule while defined $current;
3560 $! = $status;
3561 },
3562 )
3563 };
3564 3959
3565 unless ($DB_ENV) { 3960 unless ($DB_ENV) {
3566 $DB_ENV = BDB::db_env_create; 3961 $DB_ENV = BDB::db_env_create;
3567 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3962 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3568 | BDB::LOG_AUTOREMOVE, 1); 3963 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3964 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3569 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3965 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3570 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3966 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3571 3967
3572 cf::sync_job { 3968 cf::sync_job {
3573 eval { 3969 eval {
3583 3979
3584 cf::cleanup "db_env_open(db): $@" if $@; 3980 cf::cleanup "db_env_open(db): $@" if $@;
3585 }; 3981 };
3586 } 3982 }
3587 3983
3588 $BDB_DEADLOCK_WATCHER = Event->timer ( 3984 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3589 after => 3,
3590 interval => 1,
3591 hard => 1,
3592 prio => 0,
3593 data => WF_AUTOCANCEL,
3594 cb => sub {
3595 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3985 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3596 },
3597 ); 3986 };
3598 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3987 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3599 after => 11,
3600 interval => 60,
3601 hard => 1,
3602 prio => 0,
3603 data => WF_AUTOCANCEL,
3604 cb => sub {
3605 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3988 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3606 },
3607 ); 3989 };
3608 $BDB_TRICKLE_WATCHER = Event->timer ( 3990 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3609 after => 5,
3610 interval => 10,
3611 hard => 1,
3612 prio => 0,
3613 data => WF_AUTOCANCEL,
3614 cb => sub {
3615 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3991 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3616 },
3617 ); 3992 };
3618} 3993}
3619 3994
3620{ 3995{
3996 # configure IO::AIO
3997
3621 IO::AIO::min_parallel 8; 3998 IO::AIO::min_parallel 8;
3622
3623 undef $Coro::AIO::WATCHER;
3624 IO::AIO::max_poll_time $TICK * 0.1; 3999 IO::AIO::max_poll_time $TICK * 0.1;
3625 $AIO_POLL_WATCHER = Event->io ( 4000 undef $AnyEvent::AIO::WATCHER;
3626 reentrant => 0,
3627 data => WF_AUTOCANCEL,
3628 fd => IO::AIO::poll_fileno,
3629 poll => 'r',
3630 prio => 0,
3631 cb => \&IO::AIO::poll_cb,
3632 );
3633} 4001}
3634 4002
3635my $_log_backtrace; 4003my $_log_backtrace;
3636 4004
3637sub _log_backtrace { 4005sub _log_backtrace {
3640 $msg =~ s/\n//; 4008 $msg =~ s/\n//;
3641 4009
3642 # limit the # of concurrent backtraces 4010 # limit the # of concurrent backtraces
3643 if ($_log_backtrace < 2) { 4011 if ($_log_backtrace < 2) {
3644 ++$_log_backtrace; 4012 ++$_log_backtrace;
4013 my $perl_bt = Carp::longmess $msg;
3645 async { 4014 async {
3646 $Coro::current->{desc} = "abt $msg"; 4015 $Coro::current->{desc} = "abt $msg";
3647 4016
3648 my @bt = fork_call { 4017 my @bt = fork_call {
3649 @addr = map { sprintf "%x", $_ } @addr; 4018 @addr = map { sprintf "%x", $_ } @addr;
3660 } 4029 }
3661 4030
3662 @funcs 4031 @funcs
3663 }; 4032 };
3664 4033
3665 LOG llevInfo, "[ABT] $msg\n"; 4034 LOG llevInfo, "[ABT] $perl_bt\n";
4035 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3666 LOG llevInfo, "[ABT] $_\n" for @bt; 4036 LOG llevInfo, "[ABT] $_\n" for @bt;
3667 --$_log_backtrace; 4037 --$_log_backtrace;
3668 }; 4038 };
3669 } else { 4039 } else {
3670 LOG llevInfo, "[ABT] $msg\n"; 4040 LOG llevInfo, "[ABT] $msg\n";
3671 LOG llevInfo, "[ABT] [suppressed]\n"; 4041 LOG llevInfo, "[ABT] [suppressed]\n";
3672 } 4042 }
3673} 4043}
3674 4044
3675# load additional modules 4045# load additional modules
3676use cf::pod; 4046require "cf/$_.pm" for @EXTRA_MODULES;
4047cf::_connect_to_perl_2;
3677 4048
3678END { cf::emergency_save } 4049END { cf::emergency_save }
3679 4050
36801 40511
3681 4052

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines