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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines