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.410 by root, Tue Jan 15 12:02:24 2008 UTC vs.
Revision 1.522 by root, Sat Apr 17 02:22:14 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines