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.440 by root, Mon Aug 11 23:23:41 2008 UTC vs.
Revision 1.514 by root, Mon Apr 12 17:13:36 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
25use 5.10.0;
24use utf8; 26use utf8;
25use strict; 27use strict qw(vars subs);
26 28
27use Symbol; 29use Symbol;
28use List::Util; 30use List::Util;
29use Socket; 31use Socket;
30use EV; 32use EV;
31use Opcode; 33use Opcode;
32use Safe; 34use Safe;
33use Safe::Hole; 35use Safe::Hole;
34use Storable (); 36use Storable ();
37use Carp ();
35 38
39use Guard ();
36use Coro (); 40use Coro ();
37use Coro::State; 41use Coro::State;
38use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
39use Coro::AnyEvent; 44use Coro::AnyEvent;
40use Coro::Timer; 45use Coro::Timer;
41use Coro::Signal; 46use Coro::Signal;
42use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
43use Coro::AnyEvent; 49use Coro::AnyEvent;
44use Coro::AIO; 50use Coro::AIO;
45use Coro::BDB 1.6; 51use Coro::BDB 1.6;
46use Coro::Storable; 52use Coro::Storable;
47use Coro::Util (); 53use Coro::Util ();
48 54
49use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
50use BDB (); 56use BDB ();
51use Data::Dumper; 57use Data::Dumper;
52use Digest::MD5;
53use Fcntl; 58use Fcntl;
54use YAML (); 59use YAML::XS ();
55use IO::AIO (); 60use IO::AIO ();
56use Time::HiRes; 61use Time::HiRes;
57use Compress::LZF; 62use Compress::LZF;
58use Digest::MD5 (); 63use Digest::MD5 ();
59 64
61 66
62# configure various modules to our taste 67# configure various modules to our taste
63# 68#
64$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
65Coro::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";
66Compress::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
67 77
68$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" };
69 80
70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
71 82
72our %COMMAND = (); 83our %COMMAND = ();
73our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
76our %EXTCMD = (); 87our %EXTCMD = ();
77our %EXTICMD = (); 88our %EXTICMD = ();
78our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
79our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
80 91
81our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
82our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
83 96
84our $CONFDIR = confdir; 97our $CONFDIR = confdir;
85our $DATADIR = datadir; 98our $DATADIR = datadir;
86our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
87our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
88our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
89our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
90our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
92our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
93our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
94our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
95our %RESOURCE; 111our %RESOURCE;
112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
96 115
97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
99our $NEXT_TICK; 118our $NEXT_TICK;
100our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
101 120
102our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
103our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
104our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
105our $DB_ENV; 124our $DB_ENV;
106 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
107our %CFG; 128our %CFG;
108 129
109our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
110our $RUNTIME; 131our $RUNTIME;
111our $NOW; 132our $NOW;
120our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
121our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter 143our $JITTER; # average jitter
123our $TICK_START; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
124 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 :)
150
125binmode STDOUT; 151binmode STDOUT;
126binmode STDERR; 152binmode STDERR;
127 153
128# read virtual server time, if available 154# read virtual server time, if available
129unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 155unless ($RUNTIME || !-e $RUNTIMEFILE) {
130 open my $fh, "<", "$LOCALDIR/runtime" 156 open my $fh, "<", $RUNTIMEFILE
131 or die "unable to read runtime file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
132 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
133} 159}
160
161eval "sub TICK() { $TICK } 1" or die;
134 162
135mkdir $_ 163mkdir $_
136 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
137 165
138our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
139 167
140sub cf::map::normalise; 168sub cf::map::normalise;
169
170#############################################################################
171
172%REFLECT = ();
173for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_;
175 $REFLECT{$reflect->{class}} = $reflect;
176}
177
178# this is decidedly evil
179$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
141 180
142############################################################################# 181#############################################################################
143 182
144=head2 GLOBAL VARIABLES 183=head2 GLOBAL VARIABLES
145 184
192returns directly I<after> the tick processing (and consequently, can only wake one process 231returns directly I<after> the tick processing (and consequently, can only wake one process
193per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 232per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
194 233
195=item @cf::INVOKE_RESULTS 234=item @cf::INVOKE_RESULTS
196 235
197This array contains the results of the last C<invoke ()> call. When 236This array contains the results of the last C<invoke ()> call. When
198C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 237C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
199that call. 238that call.
200 239
240=item %cf::REFLECT
241
242Contains, for each (C++) class name, a hash reference with information
243about object members (methods, scalars, arrays and flags) and other
244metadata, which is useful for introspection.
245
201=back 246=back
202 247
203=cut 248=cut
204 249
205BEGIN { 250$Coro::State::WARNHOOK = sub {
206 *CORE::GLOBAL::warn = sub {
207 my $msg = join "", @_; 251 my $msg = join "", @_;
208 252
209 $msg .= "\n" 253 $msg .= "\n"
210 unless $msg =~ /\n$/; 254 unless $msg =~ /\n$/;
211 255
212 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 256 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
213 257
214 LOG llevError, $msg; 258 LOG llevError, $msg;
215 }; 259};
216}
217 260
218$Coro::State::DIEHOOK = sub { 261$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "==" 262 return unless $^S eq 0; # "eq", not "=="
263
264 warn Carp::longmess $_[0];
220 265
221 if ($Coro::current == $Coro::main) {#d# 266 if ($Coro::current == $Coro::main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d# 267 warn "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d# 268 return;#d#
224 }#d# 269 }#d#
225 270
226 # kill coroutine otherwise 271 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate 272 Coro::terminate
229}; 273};
230
231$SIG{__DIE__} = sub { }; #d#?
232 274
233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 275@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 276@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 277@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 278@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
246 cf::client cf::player 288 cf::client cf::player
247 cf::arch cf::living 289 cf::arch cf::living
248 cf::map cf::mapspace 290 cf::map cf::mapspace
249 cf::party cf::region 291 cf::party cf::region
250)) { 292)) {
251 no strict 'refs';
252 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
253} 294}
254 295
255$EV::DIED = sub { 296$EV::DIED = sub {
256 warn "error in event callback: @_"; 297 Carp::cluck "error in event callback: @_";
257}; 298};
258 299
259############################################################################# 300#############################################################################
260 301
261=head2 UTILITY FUNCTIONS 302=head2 UTILITY FUNCTIONS
298our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 339our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
299 340
300sub encode_json($) { $json_coder->encode ($_[0]) } 341sub encode_json($) { $json_coder->encode ($_[0]) }
301sub decode_json($) { $json_coder->decode ($_[0]) } 342sub decode_json($) { $json_coder->decode ($_[0]) }
302 343
344=item cf::post_init { BLOCK }
345
346Execute the given codeblock, I<after> all extensions have been (re-)loaded,
347but I<before> the server starts ticking again.
348
349The cdoeblock will have a single boolean argument to indicate whether this
350is a reload or not.
351
352=cut
353
354sub post_init(&) {
355 push @POST_INIT, shift;
356}
357
303=item cf::lock_wait $string 358=item cf::lock_wait $string
304 359
305Wait until the given lock is available. See cf::lock_acquire. 360Wait until the given lock is available. See cf::lock_acquire.
306 361
307=item my $lock = cf::lock_acquire $string 362=item my $lock = cf::lock_acquire $string
308 363
309Wait until the given lock is available and then acquires it and returns 364Wait until the given lock is available and then acquires it and returns
310a Coro::guard object. If the guard object gets destroyed (goes out of scope, 365a L<Guard> object. If the guard object gets destroyed (goes out of scope,
311for example when the coroutine gets canceled), the lock is automatically 366for example when the coroutine gets canceled), the lock is automatically
312returned. 367returned.
313 368
314Locks are *not* recursive, locking from the same coro twice results in a 369Locks are *not* recursive, locking from the same coro twice results in a
315deadlocked coro. 370deadlocked coro.
321 376
322Return true if the lock is currently active, i.e. somebody has locked it. 377Return true if the lock is currently active, i.e. somebody has locked it.
323 378
324=cut 379=cut
325 380
326our %LOCK; 381our $LOCKS = new Coro::SemaphoreSet;
327our %LOCKER;#d#
328 382
329sub lock_wait($) { 383sub lock_wait($) {
330 my ($key) = @_; 384 $LOCKS->wait ($_[0]);
331
332 if ($LOCKER{$key} == $Coro::current) {#d#
333 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
334 return;#d#
335 }#d#
336
337 # wait for lock, if any
338 while ($LOCK{$key}) {
339 push @{ $LOCK{$key} }, $Coro::current;
340 Coro::schedule;
341 }
342} 385}
343 386
344sub lock_acquire($) { 387sub lock_acquire($) {
345 my ($key) = @_; 388 $LOCKS->guard ($_[0])
346
347 # wait, to be sure we are not locked
348 lock_wait $key;
349
350 $LOCK{$key} = [];
351 $LOCKER{$key} = $Coro::current;#d#
352
353 Coro::guard {
354 delete $LOCKER{$key};#d#
355 # wake up all waiters, to be on the safe side
356 $_->ready for @{ delete $LOCK{$key} };
357 }
358} 389}
359 390
360sub lock_active($) { 391sub lock_active($) {
361 my ($key) = @_; 392 $LOCKS->count ($_[0]) < 1
362
363 ! ! $LOCK{$key}
364} 393}
365 394
366sub freeze_mainloop { 395sub freeze_mainloop {
367 tick_inhibit_inc; 396 tick_inhibit_inc;
368 397
369 Coro::guard \&tick_inhibit_dec; 398 &Guard::guard (\&tick_inhibit_dec);
370} 399}
371 400
372=item cf::periodic $interval, $cb 401=item cf::periodic $interval, $cb
373 402
374Like EV::periodic, but randomly selects a starting point so that the actions 403Like EV::periodic, but randomly selects a starting point so that the actions
375get spread over timer. 404get spread over time.
376 405
377=cut 406=cut
378 407
379sub periodic($$) { 408sub periodic($$) {
380 my ($interval, $cb) = @_; 409 my ($interval, $cb) = @_;
397 426
398=cut 427=cut
399 428
400our @SLOT_QUEUE; 429our @SLOT_QUEUE;
401our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
402 432
403$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
404$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
405 $Coro::current->desc ("timeslot manager"); 435 $Coro::current->desc ("timeslot manager");
406 436
407 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
408 439
409 while () { 440 while () {
410 next_job: 441 next_job:
442
411 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
412 if ($avail > 0.01) { 444
413 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
414 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
415 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
416 $job->[2]->send; 449 $job->[2]->send;
417 Coro::cede; 450 Coro::cede;
418 goto next_job; 451 goto next_job;
419 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
420 } 454 }
421 } 455 }
422 456
423 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
424 # we do not use wait_for_tick() as it returns immediately when tick is inactive 458 # we do not use wait_for_tick() as it returns immediately when tick is inactive
425 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
426 $signal->wait; 460 $signal->wait;
427 } else { 461 } else {
462 $busy = 0;
428 Coro::schedule; 463 Coro::schedule;
429 } 464 }
430 } 465 }
431}; 466};
432 467
433sub get_slot($;$$) { 468sub get_slot($;$$) {
434 return if tick_inhibit || $Coro::current == $Coro::main; 469 return if tick_inhibit || $Coro::current == $Coro::main;
435 470
436 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
437 472
438 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
439 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
440 476
441 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
442 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
443 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
470 506
471sub sync_job(&) { 507sub sync_job(&) {
472 my ($job) = @_; 508 my ($job) = @_;
473 509
474 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
475 my $time = EV::time; 511 my $time = AE::time;
476 512
477 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
478 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
479 515
480 LOG llevError, Carp::longmess "sync job";#d# 516 LOG llevError, Carp::longmess "sync job";#d#
497 } else { 533 } else {
498 EV::loop EV::LOOP_ONESHOT; 534 EV::loop EV::LOOP_ONESHOT;
499 } 535 }
500 } 536 }
501 537
502 my $time = EV::time - $time; 538 my $time = AE::time - $time;
503 539
504 $TICK_START += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
505 541
506 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
507 } else { 543 } else {
551 reset_signals; 587 reset_signals;
552 &$cb 588 &$cb
553 }, @args; 589 }, @args;
554 590
555 wantarray ? @res : $res[-1] 591 wantarray ? @res : $res[-1]
592}
593
594sub objinfo {
595 (
596 "counter value" => cf::object::object_count,
597 "objects created" => cf::object::create_count,
598 "objects destroyed" => cf::object::destroy_count,
599 "freelist size" => cf::object::free_count,
600 "allocated objects" => cf::object::objects_size,
601 "active objects" => cf::object::actives_size,
602 )
556} 603}
557 604
558=item $coin = coin_from_name $name 605=item $coin = coin_from_name $name
559 606
560=cut 607=cut
726 773
727############################################################################# 774#############################################################################
728 775
729=head2 ATTACHABLE OBJECTS 776=head2 ATTACHABLE OBJECTS
730 777
731Many objects in crossfire are so-called attachable objects. That means you can 778Many objects in deliantra are so-called attachable objects. That means you can
732attach callbacks/event handlers (a collection of which is called an "attachment") 779attach callbacks/event handlers (a collection of which is called an "attachment")
733to it. All such attachable objects support the following methods. 780to it. All such attachable objects support the following methods.
734 781
735In the following description, CLASS can be any of C<global>, C<object> 782In the following description, CLASS can be any of C<global>, C<object>
736C<player>, C<client> or C<map> (i.e. the attachable objects in 783C<player>, C<client> or C<map> (i.e. the attachable objects in
786=item cf::CLASS::attachment $name, ... 833=item cf::CLASS::attachment $name, ...
787 834
788Register an attachment by C<$name> through which attachable objects of the 835Register an attachment by C<$name> through which attachable objects of the
789given CLASS can refer to this attachment. 836given CLASS can refer to this attachment.
790 837
791Some classes such as crossfire maps and objects can specify attachments 838Some classes such as deliantra maps and objects can specify attachments
792that are attached at load/instantiate time, thus the need for a name. 839that are attached at load/instantiate time, thus the need for a name.
793 840
794These calls expect any number of the following handler/hook descriptions: 841These calls expect any number of the following handler/hook descriptions:
795 842
796=over 4 843=over 4
1087 1134
1088sub reattach { 1135sub reattach {
1089 # basically do the same as instantiate, without calling instantiate 1136 # basically do the same as instantiate, without calling instantiate
1090 my ($obj) = @_; 1137 my ($obj) = @_;
1091 1138
1139 # no longer needed after getting rid of delete_package?
1092 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1140 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1093 1141
1094 my $registry = $obj->registry; 1142 my $registry = $obj->registry;
1095 1143
1096 @$registry = (); 1144 @$registry = ();
1097 1145
1145 $decname, length $$rdata, scalar @$objs; 1193 $decname, length $$rdata, scalar @$objs;
1146 1194
1147 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1148 aio_chmod $fh, SAVE_MODE; 1196 aio_chmod $fh, SAVE_MODE;
1149 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1150 aio_fsync $fh if $cf::USE_FSYNC; 1198 if ($cf::USE_FSYNC) {
1199 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;
1200 aio_fsync $fh;
1201 }
1151 aio_close $fh; 1202 aio_close $fh;
1152 1203
1153 if (@$objs) { 1204 if (@$objs) {
1154 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1205 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1155 aio_chmod $fh, SAVE_MODE; 1206 aio_chmod $fh, SAVE_MODE;
1156 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1207 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1157 aio_write $fh, 0, (length $data), $data, 0; 1208 aio_write $fh, 0, (length $data), $data, 0;
1158 aio_fsync $fh if $cf::USE_FSYNC; 1209 if ($cf::USE_FSYNC) {
1210 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;
1211 aio_fsync $fh;
1212 }
1159 aio_close $fh; 1213 aio_close $fh;
1160 aio_rename "$filename.pst~", "$filename.pst"; 1214 aio_rename "$filename.pst~", "$filename.pst";
1161 } 1215 }
1162 } else { 1216 } else {
1163 aio_unlink "$filename.pst"; 1217 aio_unlink "$filename.pst";
1164 } 1218 }
1165 1219
1166 aio_rename "$filename~", $filename; 1220 aio_rename "$filename~", $filename;
1221
1222 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC;
1167 } else { 1224 } else {
1168 warn "FATAL: $filename~: $!\n"; 1225 warn "unable to save objects: $filename~: $!\n";
1169 } 1226 }
1170 } else { 1227 } else {
1171 aio_unlink $filename; 1228 aio_unlink $filename;
1172 aio_unlink "$filename.pst"; 1229 aio_unlink "$filename.pst";
1173 } 1230 }
1264 my ($name, $cb) = @_; 1321 my ($name, $cb) = @_;
1265 1322
1266 $EXTICMD{$name} = $cb; 1323 $EXTICMD{$name} = $cb;
1267} 1324}
1268 1325
1326use File::Glob ();
1327
1269cf::player->attach ( 1328cf::player->attach (
1270 on_command => sub { 1329 on_unknown_command => sub {
1271 my ($pl, $name, $params) = @_; 1330 my ($pl, $name, $params) = @_;
1272 1331
1273 my $cb = $COMMAND{$name} 1332 my $cb = $COMMAND{$name}
1274 or return; 1333 or return;
1275 1334
1305 1364
1306 cf::override; 1365 cf::override;
1307 }, 1366 },
1308); 1367);
1309 1368
1369# "readahead" all extensions
1370sub cache_extensions {
1371 my $grp = IO::AIO::aio_group;
1372
1373 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1374 for (grep /\.ext$/, @{$_[0]}) {
1375 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1376 }
1377 };
1378
1379 $grp
1380}
1381
1310sub load_extensions { 1382sub load_extensions {
1311 cf::sync_job { 1383 cf::sync_job {
1312 my %todo; 1384 my %todo;
1313 1385
1314 for my $path (<$LIBDIR/*.ext>) { 1386 for my $path (<$LIBDIR/*.ext>) {
1333 1405
1334 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1406 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1335 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1407 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1336 1408
1337 $ext{source} = 1409 $ext{source} =
1338 "package $pkg; use strict; use utf8;\n" 1410 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1339 . "#line 1 \"$path\"\n{\n" 1411 . "#line 1 \"$path\"\n{\n"
1340 . $source 1412 . $source
1341 . "\n};\n1"; 1413 . "\n};\n1";
1342 1414
1343 $todo{$base} = \%ext; 1415 $todo{$base} = \%ext;
1344 } 1416 }
1345 1417
1418 my $pass = 0;
1346 my %done; 1419 my %done;
1347 while (%todo) { 1420 while (%todo) {
1348 my $progress; 1421 my $progress;
1349 1422
1423 ++$pass;
1424
1425 ext:
1350 while (my ($k, $v) = each %todo) { 1426 while (my ($k, $v) = each %todo) {
1351 for (split /,\s*/, $v->{meta}{depends}) { 1427 for (split /,\s*/, $v->{meta}{depends}) {
1352 goto skip 1428 next ext
1353 unless exists $done{$_}; 1429 unless exists $done{$_};
1354 } 1430 }
1355 1431
1356 warn "... loading '$k' into '$v->{pkg}'\n"; 1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1357 1433
1358 unless (eval $v->{source}) { 1434 my $active = eval $v->{source};
1435
1436 if (length $@) {
1359 my $msg = $@ ? "$v->{path}: $@\n" 1437 warn "$v->{path}: $@\n";
1360 : "$v->{base}: extension inactive.\n";
1361 1438
1362 if (exists $v->{meta}{mandatory}) {
1363 warn $msg;
1364 cf::cleanup "mandatory extension failed to load, exiting."; 1439 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1365 } 1440 if exists $v->{meta}{mandatory};
1366 1441 } else {
1367 warn $msg; 1442 $done{$k} = delete $todo{$k};
1443 push @EXTS, $v->{pkg};
1444 $progress = 1;
1445
1446 warn "$v->{base}: extension inactive.\n"
1447 unless $active;
1368 } 1448 }
1369
1370 $done{$k} = delete $todo{$k};
1371 push @EXTS, $v->{pkg};
1372 $progress = 1;
1373 } 1449 }
1374 1450
1375 skip: 1451 unless ($progress) {
1376 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1452 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1377 unless $progress; 1453
1454 while (my ($k, $v) = each %todo) {
1455 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1456 if exists $v->{meta}{mandatory};
1457 }
1458 }
1378 } 1459 }
1379 }; 1460 };
1380} 1461}
1381 1462
1382############################################################################# 1463#############################################################################
1383 1464
1384=back 1465=back
1385 1466
1386=head2 CORE EXTENSIONS 1467=head2 CORE EXTENSIONS
1387 1468
1388Functions and methods that extend core crossfire objects. 1469Functions and methods that extend core deliantra objects.
1389 1470
1390=cut 1471=cut
1391 1472
1392package cf::player; 1473package cf::player;
1393 1474
1436 1517
1437sub exists($) { 1518sub exists($) {
1438 my ($login) = @_; 1519 my ($login) = @_;
1439 1520
1440 $cf::PLAYER{$login} 1521 $cf::PLAYER{$login}
1441 or cf::sync_job { !aio_stat path $login } 1522 or !aio_stat path $login
1442} 1523}
1443 1524
1444sub find($) { 1525sub find($) {
1445 return $cf::PLAYER{$_[0]} || do { 1526 return $cf::PLAYER{$_[0]} || do {
1446 my $login = $_[0]; 1527 my $login = $_[0];
1466 $cf::PLAYER{$login} = $pl 1547 $cf::PLAYER{$login} = $pl
1467 } 1548 }
1468 } 1549 }
1469} 1550}
1470 1551
1552cf::player->attach (
1553 on_load => sub {
1554 my ($pl, $path) = @_;
1555
1556 # restore slots saved in save, below
1557 my $slots = delete $pl->{_slots};
1558
1559 $pl->ob->current_weapon ($slots->[0]);
1560 $pl->combat_ob ($slots->[1]);
1561 $pl->ranged_ob ($slots->[2]);
1562 },
1563);
1564
1471sub save($) { 1565sub save($) {
1472 my ($pl) = @_; 1566 my ($pl) = @_;
1473 1567
1474 return if $pl->{deny_save}; 1568 return if $pl->{deny_save};
1475 1569
1480 1574
1481 aio_mkdir playerdir $pl, 0770; 1575 aio_mkdir playerdir $pl, 0770;
1482 $pl->{last_save} = $cf::RUNTIME; 1576 $pl->{last_save} = $cf::RUNTIME;
1483 1577
1484 cf::get_slot 0.01; 1578 cf::get_slot 0.01;
1579
1580 # save slots, to be restored later
1581 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1485 1582
1486 $pl->save_pl ($path); 1583 $pl->save_pl ($path);
1487 cf::cede_to_tick; 1584 cf::cede_to_tick;
1488} 1585}
1489 1586
1521 my ($pl) = @_; 1618 my ($pl) = @_;
1522 1619
1523 my $name = $pl->ob->name; 1620 my $name = $pl->ob->name;
1524 1621
1525 $pl->{deny_save} = 1; 1622 $pl->{deny_save} = 1;
1526 $pl->password ("*"); # this should lock out the player until we nuked the dir 1623 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1527 1624
1528 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1625 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1529 $pl->deactivate; 1626 $pl->deactivate;
1530 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1627 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1531 $pl->ob->check_score; 1628 $pl->ob->check_score;
1617 } 1714 }
1618 1715
1619 \@paths 1716 \@paths
1620} 1717}
1621 1718
1622=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1719=item $protocol_xml = $player->expand_cfpod ($cfpod)
1623 1720
1624Expand crossfire pod fragments into protocol xml. 1721Expand deliantra pod fragments into protocol xml.
1625
1626=cut
1627
1628use re 'eval';
1629
1630my $group;
1631my $interior; $interior = qr{
1632 # match a pod interior sequence sans C<< >>
1633 (?:
1634 \ (.*?)\ (?{ $group = $^N })
1635 | < (??{$interior}) >
1636 )
1637}x;
1638
1639sub expand_cfpod {
1640 my ($self, $pod) = @_;
1641
1642 my $xml;
1643
1644 while () {
1645 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1646 $group = $1;
1647
1648 $group =~ s/&/&amp;/g;
1649 $group =~ s/</&lt;/g;
1650
1651 $xml .= $group;
1652 } elsif ($pod =~ m%\G
1653 ([BCGHITU])
1654 <
1655 (?:
1656 ([^<>]*) (?{ $group = $^N })
1657 | < $interior >
1658 )
1659 >
1660 %gcsx
1661 ) {
1662 my ($code, $data) = ($1, $group);
1663
1664 if ($code eq "B") {
1665 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1666 } elsif ($code eq "I") {
1667 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1668 } elsif ($code eq "U") {
1669 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1670 } elsif ($code eq "C") {
1671 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1672 } elsif ($code eq "T") {
1673 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1674 } elsif ($code eq "G") {
1675 my ($male, $female) = split /\|/, $data;
1676 $data = $self->gender ? $female : $male;
1677 $xml .= expand_cfpod ($self, $data);
1678 } elsif ($code eq "H") {
1679 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1680 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1681 "")
1682 [$self->{hintmode}];
1683 } else {
1684 $xml .= "error processing '$code($data)' directive";
1685 }
1686 } else {
1687 if ($pod =~ /\G(.+)/) {
1688 warn "parse error while expanding $pod (at $1)";
1689 }
1690 last;
1691 }
1692 }
1693
1694 for ($xml) {
1695 # create single paragraphs (very hackish)
1696 s/(?<=\S)\n(?=\w)/ /g;
1697
1698 # compress some whitespace
1699 s/\s+\n/\n/g; # ws line-ends
1700 s/\n\n+/\n/g; # double lines
1701 s/^\n+//; # beginning lines
1702 s/\n+$//; # ending lines
1703 }
1704
1705 $xml
1706}
1707
1708no re 'eval';
1709
1710sub hintmode {
1711 $_[0]{hintmode} = $_[1] if @_ > 1;
1712 $_[0]{hintmode}
1713}
1714 1722
1715=item $player->ext_reply ($msgid, @msg) 1723=item $player->ext_reply ($msgid, @msg)
1716 1724
1717Sends an ext reply to the player. 1725Sends an ext reply to the player.
1718 1726
1791 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1799 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1792 1800
1793 # mit "rum" bekleckern, nicht 1801 # mit "rum" bekleckern, nicht
1794 $self->_create_random_map ( 1802 $self->_create_random_map (
1795 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1796 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1797 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1798 $rmp->{exit_on_final_map}, 1806 $rmp->{exit_on_final_map},
1799 $rmp->{xsize}, $rmp->{ysize}, 1807 $rmp->{xsize}, $rmp->{ysize},
1800 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1801 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1931 1939
1932 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1940 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1933 "$UNIQUEDIR/$path" 1941 "$UNIQUEDIR/$path"
1934} 1942}
1935 1943
1936# and all this just because we cannot iterate over
1937# all maps in C++...
1938sub change_all_map_light {
1939 my ($change) = @_;
1940
1941 $_->change_map_light ($change)
1942 for grep $_->outdoor, values %cf::MAP;
1943}
1944
1945sub decay_objects { 1944sub decay_objects {
1946 my ($self) = @_; 1945 my ($self) = @_;
1947 1946
1948 return if $self->{deny_reset}; 1947 return if $self->{deny_reset};
1949 1948
2031sub find { 2030sub find {
2032 my ($path, $origin) = @_; 2031 my ($path, $origin) = @_;
2033 2032
2034 $path = normalise $path, $origin && $origin->path; 2033 $path = normalise $path, $origin && $origin->path;
2035 2034
2036 cf::lock_wait "map_data:$path";#d#remove 2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2037 cf::lock_wait "map_find:$path"; 2036 my $guard2 = cf::lock_acquire "map_find:$path";
2038 2037
2039 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
2040 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2041 my $guard2 = cf::lock_acquire "map_find:$path";
2042
2043 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
2044 or return; 2040 or return;
2045 2041
2046 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
2047 2043
2059 2055
2060 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
2061 } 2057 }
2062} 2058}
2063 2059
2064sub pre_load { } 2060sub pre_load { }
2065sub post_load { } 2061#sub post_load { } # XS
2066 2062
2067sub load { 2063sub load {
2068 my ($self) = @_; 2064 my ($self) = @_;
2069 2065
2070 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
2115 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
2116 $self->decay_objects; 2112 $self->decay_objects;
2117 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
2118 $self->update_buttons; 2114 $self->update_buttons;
2119 cf::cede_to_tick; 2115 cf::cede_to_tick;
2120 $self->set_darkness_map;
2121 cf::cede_to_tick;
2122 $self->activate; 2116 $self->activate;
2123 } 2117 }
2124 2118
2125 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
2126 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
2129 } 2123 }
2130 2124
2131 $self->post_load; 2125 $self->post_load;
2132} 2126}
2133 2127
2128# customize the map for a given player, i.e.
2129# return the _real_ map. used by e.g. per-player
2130# maps to change the path to ~playername/mappath
2134sub customise_for { 2131sub customise_for {
2135 my ($self, $ob) = @_; 2132 my ($self, $ob) = @_;
2136 2133
2137 return find "~" . $ob->name . "/" . $self->{path} 2134 return find "~" . $ob->name . "/" . $self->{path}
2138 if $self->per_player; 2135 if $self->per_player;
2292 2289
2293 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2290 my $lock = cf::lock_acquire "map_data:$self->{path}";
2294 2291
2295 return if $self->players; 2292 return if $self->players;
2296 2293
2297 warn "resetting map ", $self->path; 2294 warn "resetting map ", $self->path, "\n";
2298 2295
2299 $self->in_memory (cf::MAP_SWAPPED); 2296 $self->in_memory (cf::MAP_SWAPPED);
2300 2297
2301 # need to save uniques path 2298 # need to save uniques path
2302 unless ($self->{deny_save}) { 2299 unless ($self->{deny_save}) {
2393 : normalise $_ 2390 : normalise $_
2394 } @{ aio_readdir $UNIQUEDIR or [] } 2391 } @{ aio_readdir $UNIQUEDIR or [] }
2395 ] 2392 ]
2396} 2393}
2397 2394
2395=item cf::map::static_maps
2396
2397Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2398file in the shared directory excluding F</styles> and F</editor>). May
2399block.
2400
2401=cut
2402
2403sub static_maps() {
2404 my @dirs = "";
2405 my @maps;
2406
2407 while (@dirs) {
2408 my $dir = shift @dirs;
2409
2410 next if $dir eq "/styles" || $dir eq "/editor";
2411
2412 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2413 or return;
2414
2415 for (@$files) {
2416 s/\.map$// or next;
2417 utf8::decode $_;
2418 push @maps, "$dir/$_";
2419 }
2420
2421 push @dirs, map "$dir/$_", @$dirs;
2422 }
2423
2424 \@maps
2425}
2426
2398=back 2427=back
2399 2428
2400=head3 cf::object 2429=head3 cf::object
2401 2430
2402=cut 2431=cut
2467 2496
2468our $SAY_CHANNEL = { 2497our $SAY_CHANNEL = {
2469 id => "say", 2498 id => "say",
2470 title => "Map", 2499 title => "Map",
2471 reply => "say ", 2500 reply => "say ",
2472 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2501 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2473}; 2502};
2474 2503
2475our $CHAT_CHANNEL = { 2504our $CHAT_CHANNEL = {
2476 id => "chat", 2505 id => "chat",
2477 title => "Chat", 2506 title => "Chat",
2532 2561
2533=item $player_object->enter_link 2562=item $player_object->enter_link
2534 2563
2535Freezes the player and moves him/her to a special map (C<{link}>). 2564Freezes the player and moves him/her to a special map (C<{link}>).
2536 2565
2537The player should be reasonably safe there for short amounts of time. You 2566The player should be reasonably safe there for short amounts of time (e.g.
2538I<MUST> call C<leave_link> as soon as possible, though. 2567for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2568though, as the palyer cannot control the character while it is on the link
2569map.
2539 2570
2540Will never block. 2571Will never block.
2541 2572
2542=item $player_object->leave_link ($map, $x, $y) 2573=item $player_object->leave_link ($map, $x, $y)
2543 2574
2595 ($x, $y) = (-1, -1) 2626 ($x, $y) = (-1, -1)
2596 unless (defined $x) && (defined $y); 2627 unless (defined $x) && (defined $y);
2597 2628
2598 # use -1 or undef as default coordinates, not 0, 0 2629 # use -1 or undef as default coordinates, not 0, 0
2599 ($x, $y) = ($map->enter_x, $map->enter_y) 2630 ($x, $y) = ($map->enter_x, $map->enter_y)
2600 if $x <=0 && $y <= 0; 2631 if $x <= 0 && $y <= 0;
2601 2632
2602 $map->load; 2633 $map->load;
2603 $map->load_neighbours; 2634 $map->load_neighbours;
2604 2635
2605 return unless $self->contr->active; 2636 return unless $self->contr->active;
2606 $self->activate_recursive;
2607 2637
2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2638 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2609 $self->enter_map ($map, $x, $y); 2639 $self->enter_map ($map, $x, $y);
2640
2641 # only activate afterwards, to support waiting in hooks
2642 $self->activate_recursive;
2610} 2643}
2611 2644
2612=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2645=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2613 2646
2614Moves the player to the given map-path and coordinates by first freezing 2647Moves the player to the given map-path and coordinates by first freezing
2773 $self->contr->savebed ($map, $x, $y) 2806 $self->contr->savebed ($map, $x, $y)
2774 if $exit->flag (cf::FLAG_DAMNED); 2807 if $exit->flag (cf::FLAG_DAMNED);
2775 2808
2776 1 2809 1
2777 }) { 2810 }) {
2778 $self->message ("Something went wrong deep within the crossfire server. " 2811 $self->message ("Something went wrong deep within the deliantra server. "
2779 . "I'll try to bring you back to the map you were before. " 2812 . "I'll try to bring you back to the map you were before. "
2780 . "Please report this to the dungeon master!", 2813 . "Please report this to the dungeon master!",
2781 cf::NDI_UNIQUE | cf::NDI_RED); 2814 cf::NDI_UNIQUE | cf::NDI_RED);
2782 2815
2783 warn "ERROR in enter_exit: $@"; 2816 warn "ERROR in enter_exit: $@";
2800sub cf::client::send_drawinfo { 2833sub cf::client::send_drawinfo {
2801 my ($self, $text, $flags) = @_; 2834 my ($self, $text, $flags) = @_;
2802 2835
2803 utf8::encode $text; 2836 utf8::encode $text;
2804 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2837 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2838}
2839
2840=item $client->send_big_packet ($pkt)
2841
2842Like C<send_packet>, but tries to compress large packets, and fragments
2843them as required.
2844
2845=cut
2846
2847our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2848
2849sub cf::client::send_big_packet {
2850 my ($self, $pkt) = @_;
2851
2852 # try lzf for large packets
2853 $pkt = "lzf " . Compress::LZF::compress $pkt
2854 if 1024 <= length $pkt and $self->{can_lzf};
2855
2856 # split very large packets
2857 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2858 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2859 $pkt = "frag";
2860 }
2861
2862 $self->send_packet ($pkt);
2805} 2863}
2806 2864
2807=item $client->send_msg ($channel, $msg, $color, [extra...]) 2865=item $client->send_msg ($channel, $msg, $color, [extra...])
2808 2866
2809Send a drawinfo or msg packet to the client, formatting the msg for the 2867Send a drawinfo or msg packet to the client, formatting the msg for the
2813 2871
2814=cut 2872=cut
2815 2873
2816# non-persistent channels (usually the info channel) 2874# non-persistent channels (usually the info channel)
2817our %CHANNEL = ( 2875our %CHANNEL = (
2876 "c/motd" => {
2877 id => "infobox",
2878 title => "MOTD",
2879 reply => undef,
2880 tooltip => "The message of the day",
2881 },
2818 "c/identify" => { 2882 "c/identify" => {
2819 id => "infobox", 2883 id => "infobox",
2820 title => "Identify", 2884 title => "Identify",
2821 reply => undef, 2885 reply => undef,
2822 tooltip => "Items recently identified", 2886 tooltip => "Items recently identified",
2824 "c/examine" => { 2888 "c/examine" => {
2825 id => "infobox", 2889 id => "infobox",
2826 title => "Examine", 2890 title => "Examine",
2827 reply => undef, 2891 reply => undef,
2828 tooltip => "Signs and other items you examined", 2892 tooltip => "Signs and other items you examined",
2893 },
2894 "c/shopinfo" => {
2895 id => "infobox",
2896 title => "Shop Info",
2897 reply => undef,
2898 tooltip => "What your bargaining skill tells you about the shop",
2829 }, 2899 },
2830 "c/book" => { 2900 "c/book" => {
2831 id => "infobox", 2901 id => "infobox",
2832 title => "Book", 2902 title => "Book",
2833 reply => undef, 2903 reply => undef,
2849 id => "infobox", 2919 id => "infobox",
2850 title => "Body Parts", 2920 title => "Body Parts",
2851 reply => undef, 2921 reply => undef,
2852 tooltip => "Shows which body parts you posess and are available", 2922 tooltip => "Shows which body parts you posess and are available",
2853 }, 2923 },
2924 "c/statistics" => {
2925 id => "infobox",
2926 title => "Statistics",
2927 reply => undef,
2928 tooltip => "Shows your primary statistics",
2929 },
2930 "c/skills" => {
2931 id => "infobox",
2932 title => "Skills",
2933 reply => undef,
2934 tooltip => "Shows your experience per skill and item power",
2935 },
2936 "c/shopitems" => {
2937 id => "infobox",
2938 title => "Shop Items",
2939 reply => undef,
2940 tooltip => "Shows the items currently for sale in this shop",
2941 },
2942 "c/resistances" => {
2943 id => "infobox",
2944 title => "Resistances",
2945 reply => undef,
2946 tooltip => "Shows your resistances",
2947 },
2948 "c/pets" => {
2949 id => "infobox",
2950 title => "Pets",
2951 reply => undef,
2952 tooltip => "Shows information abotu your pets/a specific pet",
2953 },
2954 "c/perceiveself" => {
2955 id => "infobox",
2956 title => "Perceive Self",
2957 reply => undef,
2958 tooltip => "You gained detailed knowledge about yourself",
2959 },
2854 "c/uptime" => { 2960 "c/uptime" => {
2855 id => "infobox", 2961 id => "infobox",
2856 title => "Uptime", 2962 title => "Uptime",
2857 reply => undef, 2963 reply => undef,
2858 tooltip => "How long the server has been running since last restart", 2964 tooltip => "How long the server has been running since last restart",
2867 id => "party", 2973 id => "party",
2868 title => "Party", 2974 title => "Party",
2869 reply => "gsay ", 2975 reply => "gsay ",
2870 tooltip => "Messages and chat related to your party", 2976 tooltip => "Messages and chat related to your party",
2871 }, 2977 },
2978 "c/death" => {
2979 id => "death",
2980 title => "Death",
2981 reply => undef,
2982 tooltip => "Reason for and more info about your most recent death",
2983 },
2984 "c/say" => $SAY_CHANNEL,
2985 "c/chat" => $CHAT_CHANNEL,
2872); 2986);
2873 2987
2874sub cf::client::send_msg { 2988sub cf::client::send_msg {
2875 my ($self, $channel, $msg, $color, @extra) = @_; 2989 my ($self, $channel, $msg, $color, @extra) = @_;
2876 2990
2877 $msg = $self->pl->expand_cfpod ($msg); 2991 $msg = $self->pl->expand_cfpod ($msg)
2992 unless $color & cf::NDI_VERBATIM;
2878 2993
2879 $color &= cf::NDI_CLIENT_MASK; # just in case... 2994 $color &= cf::NDI_CLIENT_MASK; # just in case...
2880 2995
2881 # check predefined channels, for the benefit of C 2996 # check predefined channels, for the benefit of C
2882 if ($CHANNEL{$channel}) { 2997 if ($CHANNEL{$channel}) {
2883 $channel = $CHANNEL{$channel}; 2998 $channel = $CHANNEL{$channel};
2884 2999
2885 $self->ext_msg (channel_info => $channel) 3000 $self->ext_msg (channel_info => $channel);
2886 if $self->can_msg;
2887
2888 $channel = $channel->{id}; 3001 $channel = $channel->{id};
2889 3002
2890 } elsif (ref $channel) { 3003 } elsif (ref $channel) {
2891 # send meta info to client, if not yet sent 3004 # send meta info to client, if not yet sent
2892 unless (exists $self->{channel}{$channel->{id}}) { 3005 unless (exists $self->{channel}{$channel->{id}}) {
2893 $self->{channel}{$channel->{id}} = $channel; 3006 $self->{channel}{$channel->{id}} = $channel;
2894 $self->ext_msg (channel_info => $channel) 3007 $self->ext_msg (channel_info => $channel);
2895 if $self->can_msg;
2896 } 3008 }
2897 3009
2898 $channel = $channel->{id}; 3010 $channel = $channel->{id};
2899 } 3011 }
2900 3012
2901 return unless @extra || length $msg; 3013 return unless @extra || length $msg;
2902 3014
2903 if ($self->can_msg) {
2904 # default colour, mask it out 3015 # default colour, mask it out
2905 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3016 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2906 if $color & cf::NDI_DEF; 3017 if $color & cf::NDI_DEF;
2907 3018
2908 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3019 my $pkt = "msg "
3020 . $self->{json_coder}->encode (
2909 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3021 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2910 } else { 3022 );
2911 if ($color >= 0) {
2912 # replace some tags by gcfclient-compatible ones
2913 for ($msg) {
2914 1 while
2915 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2916 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2917 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2918 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2919 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2920 }
2921 3023
2922 $color &= cf::NDI_COLOR_MASK; 3024 $self->send_big_packet ($pkt);
2923
2924 utf8::encode $msg;
2925
2926 if (0 && $msg =~ /\[/) {
2927 # COMMAND/INFO
2928 $self->send_packet ("drawextinfo $color 10 8 $msg")
2929 } else {
2930 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2931 $self->send_packet ("drawinfo $color $msg")
2932 }
2933 }
2934 }
2935} 3025}
2936 3026
2937=item $client->ext_msg ($type, @msg) 3027=item $client->ext_msg ($type, @msg)
2938 3028
2939Sends an ext event to the client. 3029Sends an ext event to the client.
2942 3032
2943sub cf::client::ext_msg($$@) { 3033sub cf::client::ext_msg($$@) {
2944 my ($self, $type, @msg) = @_; 3034 my ($self, $type, @msg) = @_;
2945 3035
2946 if ($self->extcmd == 2) { 3036 if ($self->extcmd == 2) {
2947 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3037 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2948 } elsif ($self->extcmd == 1) { # TODO: remove 3038 } elsif ($self->extcmd == 1) { # TODO: remove
2949 push @msg, msgtype => "event_$type"; 3039 push @msg, msgtype => "event_$type";
2950 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2951 } 3041 }
2952} 3042}
2953 3043
2954=item $client->ext_reply ($msgid, @msg) 3044=item $client->ext_reply ($msgid, @msg)
2955 3045
2959 3049
2960sub cf::client::ext_reply($$@) { 3050sub cf::client::ext_reply($$@) {
2961 my ($self, $id, @msg) = @_; 3051 my ($self, $id, @msg) = @_;
2962 3052
2963 if ($self->extcmd == 2) { 3053 if ($self->extcmd == 2) {
2964 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3054 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2965 } elsif ($self->extcmd == 1) { 3055 } elsif ($self->extcmd == 1) {
2966 #TODO: version 1, remove 3056 #TODO: version 1, remove
2967 unshift @msg, msgtype => "reply", msgid => $id; 3057 unshift @msg, msgtype => "reply", msgid => $id;
2968 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2969 } 3059 }
2970} 3060}
2971 3061
2972=item $success = $client->query ($flags, "text", \&cb) 3062=item $success = $client->query ($flags, "text", \&cb)
2973 3063
3074 3164
3075 $coro 3165 $coro
3076} 3166}
3077 3167
3078cf::client->attach ( 3168cf::client->attach (
3079 on_destroy => sub { 3169 on_client_destroy => sub {
3080 my ($ns) = @_; 3170 my ($ns) = @_;
3081 3171
3082 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3172 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3083 }, 3173 },
3084); 3174);
3100our $safe_hole = new Safe::Hole; 3190our $safe_hole = new Safe::Hole;
3101 3191
3102$SIG{FPE} = 'IGNORE'; 3192$SIG{FPE} = 'IGNORE';
3103 3193
3104$safe->permit_only (Opcode::opset qw( 3194$safe->permit_only (Opcode::opset qw(
3105 :base_core :base_mem :base_orig :base_math 3195 :base_core :base_mem :base_orig :base_math :base_loop
3106 grepstart grepwhile mapstart mapwhile 3196 grepstart grepwhile mapstart mapwhile
3107 sort time 3197 sort time
3108)); 3198));
3109 3199
3110# here we export the classes and methods available to script code 3200# here we export the classes and methods available to script code
3114The following functions and methods are available within a safe environment: 3204The following functions and methods are available within a safe environment:
3115 3205
3116 cf::object 3206 cf::object
3117 contr pay_amount pay_player map x y force_find force_add destroy 3207 contr pay_amount pay_player map x y force_find force_add destroy
3118 insert remove name archname title slaying race decrease split 3208 insert remove name archname title slaying race decrease split
3209 value
3119 3210
3120 cf::object::player 3211 cf::object::player
3121 player 3212 player
3122 3213
3123 cf::player 3214 cf::player
3129=cut 3220=cut
3130 3221
3131for ( 3222for (
3132 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3223 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3133 insert remove inv nrof name archname title slaying race 3224 insert remove inv nrof name archname title slaying race
3134 decrease split destroy change_exp)], 3225 decrease split destroy change_exp value msg lore send_msg)],
3135 ["cf::object::player" => qw(player)], 3226 ["cf::object::player" => qw(player)],
3136 ["cf::player" => qw(peaceful)], 3227 ["cf::player" => qw(peaceful send_msg)],
3137 ["cf::map" => qw(trigger)], 3228 ["cf::map" => qw(trigger)],
3138) { 3229) {
3139 no strict 'refs'; 3230 no strict 'refs';
3140 my ($pkg, @funs) = @$_; 3231 my ($pkg, @funs) = @$_;
3141 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3232 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3159 3250
3160 my $qcode = $code; 3251 my $qcode = $code;
3161 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3252 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3162 $qcode =~ s/\n/\\n/g; 3253 $qcode =~ s/\n/\\n/g;
3163 3254
3255 %vars = (_dummy => 0) unless %vars;
3256
3257 my @res;
3164 local $_; 3258 local $_;
3165 local @safe::cf::_safe_eval_args = values %vars;
3166 3259
3167 my $eval = 3260 my $eval =
3168 "do {\n" 3261 "do {\n"
3169 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3262 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3170 . "#line 0 \"{$qcode}\"\n" 3263 . "#line 0 \"{$qcode}\"\n"
3171 . $code 3264 . $code
3172 . "\n}" 3265 . "\n}"
3173 ; 3266 ;
3174 3267
3268 if ($CFG{safe_eval}) {
3175 sub_generation_inc; 3269 sub_generation_inc;
3270 local @safe::cf::_safe_eval_args = values %vars;
3176 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3271 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3177 sub_generation_inc; 3272 sub_generation_inc;
3273 } else {
3274 local @cf::_safe_eval_args = values %vars;
3275 @res = wantarray ? eval eval : scalar eval $eval;
3276 }
3178 3277
3179 if ($@) { 3278 if ($@) {
3180 warn "$@"; 3279 warn "$@";
3181 warn "while executing safe code '$code'\n"; 3280 warn "while executing safe code '$code'\n";
3182 warn "with arguments " . (join " ", %vars) . "\n"; 3281 warn "with arguments " . (join " ", %vars) . "\n";
3201=cut 3300=cut
3202 3301
3203sub register_script_function { 3302sub register_script_function {
3204 my ($fun, $cb) = @_; 3303 my ($fun, $cb) = @_;
3205 3304
3206 no strict 'refs'; 3305 $fun = "safe::$fun" if $CFG{safe_eval};
3207 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3306 *$fun = $safe_hole->wrap ($cb);
3208} 3307}
3209 3308
3210=back 3309=back
3211 3310
3212=cut 3311=cut
3233 3332
3234 $facedata->{version} == 2 3333 $facedata->{version} == 2
3235 or cf::cleanup "$path: version mismatch, cannot proceed."; 3334 or cf::cleanup "$path: version mismatch, cannot proceed.";
3236 3335
3237 # patch in the exptable 3336 # patch in the exptable
3337 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3238 $facedata->{resource}{"res/exp_table"} = { 3338 $facedata->{resource}{"res/exp_table"} = {
3239 type => FT_RSRC, 3339 type => FT_RSRC,
3240 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3340 data => $exp_table,
3341 hash => (Digest::MD5::md5 $exp_table),
3241 }; 3342 };
3242 cf::cede_to_tick; 3343 cf::cede_to_tick;
3243 3344
3244 { 3345 {
3245 my $faces = $facedata->{faceinfo}; 3346 my $faces = $facedata->{faceinfo};
3247 while (my ($face, $info) = each %$faces) { 3348 while (my ($face, $info) = each %$faces) {
3248 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3349 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3249 3350
3250 cf::face::set_visibility $idx, $info->{visibility}; 3351 cf::face::set_visibility $idx, $info->{visibility};
3251 cf::face::set_magicmap $idx, $info->{magicmap}; 3352 cf::face::set_magicmap $idx, $info->{magicmap};
3252 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3353 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3253 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3354 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3254 3355
3255 cf::cede_to_tick; 3356 cf::cede_to_tick;
3256 } 3357 }
3257 3358
3258 while (my ($face, $info) = each %$faces) { 3359 while (my ($face, $info) = each %$faces) {
3282 3383
3283 cf::anim::invalidate_all; # d'oh 3384 cf::anim::invalidate_all; # d'oh
3284 } 3385 }
3285 3386
3286 { 3387 {
3287 # TODO: for gcfclient pleasure, we should give resources
3288 # that gcfclient doesn't grok a >10000 face index.
3289 my $res = $facedata->{resource}; 3388 my $res = $facedata->{resource};
3290 3389
3291 while (my ($name, $info) = each %$res) { 3390 while (my ($name, $info) = each %$res) {
3292 if (defined $info->{type}) { 3391 if (defined $info->{type}) {
3293 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3392 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3294 my $data;
3295 3393
3296 if ($info->{type} & 1) { 3394 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3297 # prepend meta info
3298
3299 my $meta = $enc->encode ({
3300 name => $name,
3301 %{ $info->{meta} || {} },
3302 });
3303
3304 $data = pack "(w/a*)*", $meta, $info->{data};
3305 } else {
3306 $data = $info->{data};
3307 }
3308
3309 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3310 cf::face::set_type $idx, $info->{type}; 3395 cf::face::set_type $idx, $info->{type};
3311 } else { 3396 } else {
3312 $RESOURCE{$name} = $info; 3397 $RESOURCE{$name} = $info;
3313 } 3398 }
3314 3399
3397 reload_treasures; 3482 reload_treasures;
3398 3483
3399 warn "finished reloading resource files\n"; 3484 warn "finished reloading resource files\n";
3400} 3485}
3401 3486
3402sub init {
3403 my $guard = freeze_mainloop;
3404
3405 evthread_start IO::AIO::poll_fileno;
3406
3407 reload_resources;
3408}
3409
3410sub reload_config { 3487sub reload_config {
3488 warn "reloading config file...\n";
3489
3411 open my $fh, "<:utf8", "$CONFDIR/config" 3490 open my $fh, "<:utf8", "$CONFDIR/config"
3412 or return; 3491 or return;
3413 3492
3414 local $/; 3493 local $/;
3415 *CFG = YAML::Load <$fh>; 3494 *CFG = YAML::XS::Load scalar <$fh>;
3416 3495
3417 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3496 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3418 3497
3419 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3498 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3420 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3499 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3424 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3503 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3425 and die "WARNING: m(un)lockall failed: $!\n"; 3504 and die "WARNING: m(un)lockall failed: $!\n";
3426 }; 3505 };
3427 warn $@ if $@; 3506 warn $@ if $@;
3428 } 3507 }
3508
3509 warn "finished reloading resource files\n";
3510}
3511
3512sub pidfile() {
3513 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3514 or die "$PIDFILE: $!";
3515 flock $fh, &Fcntl::LOCK_EX
3516 or die "$PIDFILE: flock: $!";
3517 $fh
3518}
3519
3520# make sure only one server instance is running at any one time
3521sub atomic {
3522 my $fh = pidfile;
3523
3524 my $pid = <$fh>;
3525 kill 9, $pid if $pid > 0;
3526
3527 seek $fh, 0, 0;
3528 print $fh $$;
3529}
3530
3531sub main_loop {
3532 warn "EV::loop starting\n";
3533 if (1) {
3534 EV::loop;
3535 }
3536 warn "EV::loop returned\n";
3537 goto &main_loop unless $REALLY_UNLOOP;
3429} 3538}
3430 3539
3431sub main { 3540sub main {
3541 cf::init_globals; # initialise logging
3542
3543 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3544 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3545 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3546 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3547
3548 cf::init_experience;
3549 cf::init_anim;
3550 cf::init_attackmess;
3551 cf::init_dynamic;
3552
3553 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3554
3432 # we must not ever block the main coroutine 3555 # we must not ever block the main coroutine
3433 local $Coro::idle = sub { 3556 local $Coro::idle = sub {
3434 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3557 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3435 (async { 3558 (async {
3436 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3559 $Coro::current->{desc} = "IDLE BUG HANDLER";
3437 EV::loop EV::LOOP_ONESHOT; 3560 EV::loop EV::LOOP_ONESHOT;
3438 })->prio (Coro::PRIO_MAX); 3561 })->prio (Coro::PRIO_MAX);
3439 }; 3562 };
3440 3563
3441 { 3564 evthread_start IO::AIO::poll_fileno;
3442 my $guard = freeze_mainloop; 3565
3566 cf::sync_job {
3567 cf::load_settings;
3568 cf::load_materials;
3569
3570 reload_resources;
3443 reload_config; 3571 reload_config;
3444 db_init; 3572 db_init;
3573
3574 cf::init_uuid;
3575 cf::init_signals;
3576 cf::init_skills;
3577
3578 cf::init_beforeplay;
3579
3580 atomic;
3581
3445 load_extensions; 3582 load_extensions;
3446 3583
3447 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3584 utime time, time, $RUNTIMEFILE;
3585
3586 # no (long-running) fork's whatsoever before this point(!)
3587 use POSIX ();
3588 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3589
3590 (pop @POST_INIT)->(0) while @POST_INIT;
3448 } 3591 };
3449 3592
3450 EV::loop; 3593 main_loop;
3451} 3594}
3452 3595
3453############################################################################# 3596#############################################################################
3454# initialisation and cleanup 3597# initialisation and cleanup
3455 3598
3456# install some emergency cleanup handlers 3599# install some emergency cleanup handlers
3457BEGIN { 3600BEGIN {
3458 our %SIGWATCHER = (); 3601 our %SIGWATCHER = ();
3459 for my $signal (qw(INT HUP TERM)) { 3602 for my $signal (qw(INT HUP TERM)) {
3460 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3603 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3461 cf::cleanup "SIG$signal"; 3604 cf::cleanup "SIG$signal";
3462 }; 3605 };
3463 } 3606 }
3464} 3607}
3465 3608
3466sub write_runtime_sync { 3609sub write_runtime_sync {
3467 my $runtime = "$LOCALDIR/runtime"; 3610 my $t0 = AE::time;
3468 3611
3469 # first touch the runtime file to show we are still running: 3612 # first touch the runtime file to show we are still running:
3470 # the fsync below can take a very very long time. 3613 # the fsync below can take a very very long time.
3471 3614
3472 IO::AIO::aio_utime $runtime, undef, undef; 3615 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3473 3616
3474 my $guard = cf::lock_acquire "write_runtime"; 3617 my $guard = cf::lock_acquire "write_runtime";
3475 3618
3476 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3619 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3477 or return; 3620 or return;
3478 3621
3479 my $value = $cf::RUNTIME + 90 + 10; 3622 my $value = $cf::RUNTIME + 90 + 10;
3480 # 10 is the runtime save interval, for a monotonic clock 3623 # 10 is the runtime save interval, for a monotonic clock
3481 # 60 allows for the watchdog to kill the server. 3624 # 60 allows for the watchdog to kill the server.
3491 aio_utime $fh, undef, undef; 3634 aio_utime $fh, undef, undef;
3492 3635
3493 close $fh 3636 close $fh
3494 or return; 3637 or return;
3495 3638
3496 aio_rename "$runtime~", $runtime 3639 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3497 and return; 3640 and return;
3498 3641
3499 warn "runtime file written.\n"; 3642 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3500 3643
3501 1 3644 1
3502} 3645}
3503 3646
3504our $uuid_lock; 3647our $uuid_lock;
3513 my $uuid = "$LOCALDIR/uuid"; 3656 my $uuid = "$LOCALDIR/uuid";
3514 3657
3515 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3658 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3516 or return; 3659 or return;
3517 3660
3518 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3661 my $value = uuid_seq uuid_cur;
3662
3663 unless ($value) {
3664 warn "cowardly refusing to write zero uuid value!\n";
3665 return;
3666 }
3667
3668 my $value = uuid_str $value + $uuid_skip;
3519 $uuid_skip = 0; 3669 $uuid_skip = 0;
3520 3670
3521 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3671 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3522 and return; 3672 and return;
3523 3673
3545} 3695}
3546 3696
3547sub emergency_save() { 3697sub emergency_save() {
3548 my $freeze_guard = cf::freeze_mainloop; 3698 my $freeze_guard = cf::freeze_mainloop;
3549 3699
3550 warn "enter emergency perl save\n"; 3700 warn "emergency_perl_save: enter\n";
3551 3701
3552 cf::sync_job { 3702 cf::sync_job {
3703 # this is a trade-off: we want to be very quick here, so
3704 # save all maps without fsync, and later call a global sync
3705 # (which in turn might be very very slow)
3706 local $USE_FSYNC = 0;
3707
3553 # use a peculiar iteration method to avoid tripping on perl 3708 # use a peculiar iteration method to avoid tripping on perl
3554 # refcount bugs in for. also avoids problems with players 3709 # refcount bugs in for. also avoids problems with players
3555 # and maps saved/destroyed asynchronously. 3710 # and maps saved/destroyed asynchronously.
3556 warn "begin emergency player save\n"; 3711 warn "emergency_perl_save: begin player save\n";
3557 for my $login (keys %cf::PLAYER) { 3712 for my $login (keys %cf::PLAYER) {
3558 my $pl = $cf::PLAYER{$login} or next; 3713 my $pl = $cf::PLAYER{$login} or next;
3559 $pl->valid or next; 3714 $pl->valid or next;
3560 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3715 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3561 $pl->save; 3716 $pl->save;
3562 } 3717 }
3563 warn "end emergency player save\n"; 3718 warn "emergency_perl_save: end player save\n";
3564 3719
3565 warn "begin emergency map save\n"; 3720 warn "emergency_perl_save: begin map save\n";
3566 for my $path (keys %cf::MAP) { 3721 for my $path (keys %cf::MAP) {
3567 my $map = $cf::MAP{$path} or next; 3722 my $map = $cf::MAP{$path} or next;
3568 $map->valid or next; 3723 $map->valid or next;
3569 $map->save; 3724 $map->save;
3570 } 3725 }
3571 warn "end emergency map save\n"; 3726 warn "emergency_perl_save: end map save\n";
3572 3727
3573 warn "begin emergency database checkpoint\n"; 3728 warn "emergency_perl_save: begin database checkpoint\n";
3574 BDB::db_env_txn_checkpoint $DB_ENV; 3729 BDB::db_env_txn_checkpoint $DB_ENV;
3575 warn "end emergency database checkpoint\n"; 3730 warn "emergency_perl_save: end database checkpoint\n";
3576 3731
3577 warn "begin write uuid\n"; 3732 warn "emergency_perl_save: begin write uuid\n";
3578 write_uuid_sync 1; 3733 write_uuid_sync 1;
3579 warn "end write uuid\n"; 3734 warn "emergency_perl_save: end write uuid\n";
3580 }; 3735 };
3581 3736
3737 warn "emergency_perl_save: starting sync()\n";
3738 IO::AIO::aio_sync sub {
3739 warn "emergency_perl_save: finished sync()\n";
3740 };
3741
3582 warn "leave emergency perl save\n"; 3742 warn "emergency_perl_save: leave\n";
3583} 3743}
3584 3744
3585sub post_cleanup { 3745sub post_cleanup {
3586 my ($make_core) = @_; 3746 my ($make_core) = @_;
3587 3747
3588 warn Carp::longmess "post_cleanup backtrace" 3748 warn Carp::longmess "post_cleanup backtrace"
3589 if $make_core; 3749 if $make_core;
3750
3751 my $fh = pidfile;
3752 unlink $PIDFILE if <$fh> == $$;
3753}
3754
3755# a safer delete_package, copied from Symbol
3756sub clear_package($) {
3757 my $pkg = shift;
3758
3759 # expand to full symbol table name if needed
3760 unless ($pkg =~ /^main::.*::$/) {
3761 $pkg = "main$pkg" if $pkg =~ /^::/;
3762 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3763 $pkg .= '::' unless $pkg =~ /::$/;
3764 }
3765
3766 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3767 my $stem_symtab = *{$stem}{HASH};
3768
3769 defined $stem_symtab and exists $stem_symtab->{$leaf}
3770 or return;
3771
3772 # clear all symbols
3773 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3774 for my $name (keys %$leaf_symtab) {
3775 _gv_clear *{"$pkg$name"};
3776# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3777 }
3778 warn "cleared package $pkg\n";#d#
3590} 3779}
3591 3780
3592sub do_reload_perl() { 3781sub do_reload_perl() {
3593 # can/must only be called in main 3782 # can/must only be called in main
3594 if ($Coro::current != $Coro::main) { 3783 if ($Coro::current != $Coro::main) {
3595 warn "can only reload from main coroutine"; 3784 warn "can only reload from main coroutine";
3596 return; 3785 return;
3597 } 3786 }
3598 3787
3788 return if $RELOAD++;
3789
3790 my $t1 = AE::time;
3791
3792 while ($RELOAD) {
3599 warn "reloading..."; 3793 warn "reloading...";
3600 3794
3601 warn "entering sync_job"; 3795 warn "entering sync_job";
3602 3796
3603 cf::sync_job { 3797 cf::sync_job {
3604 cf::write_runtime_sync; # external watchdog should not bark 3798 cf::write_runtime_sync; # external watchdog should not bark
3605 cf::emergency_save; 3799 cf::emergency_save;
3606 cf::write_runtime_sync; # external watchdog should not bark 3800 cf::write_runtime_sync; # external watchdog should not bark
3607 3801
3608 warn "syncing database to disk"; 3802 warn "syncing database to disk";
3609 BDB::db_env_txn_checkpoint $DB_ENV; 3803 BDB::db_env_txn_checkpoint $DB_ENV;
3610 3804
3611 # if anything goes wrong in here, we should simply crash as we already saved 3805 # if anything goes wrong in here, we should simply crash as we already saved
3612 3806
3613 warn "flushing outstanding aio requests"; 3807 warn "flushing outstanding aio requests";
3614 for (;;) {
3615 BDB::flush;
3616 IO::AIO::flush;
3617 Coro::cede_notself;
3618 last unless IO::AIO::nreqs || BDB::nreqs; 3808 while (IO::AIO::nreqs || BDB::nreqs) {
3619 warn "iterate..."; 3809 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3620 }
3621
3622 ++$RELOAD;
3623
3624 warn "cancelling all extension coros";
3625 $_->cancel for values %EXT_CORO;
3626 %EXT_CORO = ();
3627
3628 warn "removing commands";
3629 %COMMAND = ();
3630
3631 warn "removing ext/exti commands";
3632 %EXTCMD = ();
3633 %EXTICMD = ();
3634
3635 warn "unloading/nuking all extensions";
3636 for my $pkg (@EXTS) {
3637 warn "... unloading $pkg";
3638
3639 if (my $cb = $pkg->can ("unload")) {
3640 eval {
3641 $cb->($pkg);
3642 1
3643 } or warn "$pkg unloaded, but with errors: $@";
3644 } 3810 }
3645 3811
3646 warn "... nuking $pkg"; 3812 warn "cancelling all extension coros";
3647 Symbol::delete_package $pkg; 3813 $_->cancel for values %EXT_CORO;
3648 } 3814 %EXT_CORO = ();
3649 3815
3650 warn "unloading all perl modules loaded from $LIBDIR"; 3816 warn "removing commands";
3651 while (my ($k, $v) = each %INC) { 3817 %COMMAND = ();
3652 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3653 3818
3819 warn "removing ext/exti commands";
3820 %EXTCMD = ();
3821 %EXTICMD = ();
3822
3823 warn "unloading/nuking all extensions";
3824 for my $pkg (@EXTS) {
3654 warn "... unloading $k"; 3825 warn "... unloading $pkg";
3655 delete $INC{$k};
3656 3826
3657 $k =~ s/\.pm$//;
3658 $k =~ s/\//::/g;
3659
3660 if (my $cb = $k->can ("unload_module")) { 3827 if (my $cb = $pkg->can ("unload")) {
3828 eval {
3661 $cb->(); 3829 $cb->($pkg);
3830 1
3831 } or warn "$pkg unloaded, but with errors: $@";
3832 }
3833
3834 warn "... clearing $pkg";
3835 clear_package $pkg;
3662 } 3836 }
3663 3837
3664 Symbol::delete_package $k; 3838 warn "unloading all perl modules loaded from $LIBDIR";
3839 while (my ($k, $v) = each %INC) {
3840 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3841
3842 warn "... unloading $k";
3843 delete $INC{$k};
3844
3845 $k =~ s/\.pm$//;
3846 $k =~ s/\//::/g;
3847
3848 if (my $cb = $k->can ("unload_module")) {
3849 $cb->();
3850 }
3851
3852 clear_package $k;
3665 } 3853 }
3666 3854
3667 warn "getting rid of safe::, as good as possible"; 3855 warn "getting rid of safe::, as good as possible";
3668 Symbol::delete_package "safe::$_" 3856 clear_package "safe::$_"
3669 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3857 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3670 3858
3671 warn "unloading cf.pm \"a bit\""; 3859 warn "unloading cf.pm \"a bit\"";
3672 delete $INC{"cf.pm"}; 3860 delete $INC{"cf.pm"};
3673 delete $INC{"cf/pod.pm"}; 3861 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3674 3862
3675 # don't, removes xs symbols, too, 3863 # don't, removes xs symbols, too,
3676 # and global variables created in xs 3864 # and global variables created in xs
3677 #Symbol::delete_package __PACKAGE__; 3865 #clear_package __PACKAGE__;
3678 3866
3679 warn "unload completed, starting to reload now"; 3867 warn "unload completed, starting to reload now";
3680 3868
3681 warn "reloading cf.pm"; 3869 warn "reloading cf.pm";
3682 require cf; 3870 require cf;
3683 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3871 cf::_connect_to_perl_1;
3684 3872
3685 warn "loading config and database again"; 3873 warn "loading config and database again";
3686 cf::reload_config; 3874 cf::reload_config;
3687 3875
3688 warn "loading extensions"; 3876 warn "loading extensions";
3689 cf::load_extensions; 3877 cf::load_extensions;
3690 3878
3879 if ($REATTACH_ON_RELOAD) {
3691 warn "reattaching attachments to objects/players"; 3880 warn "reattaching attachments to objects/players";
3692 _global_reattach; # objects, sockets 3881 _global_reattach; # objects, sockets
3693 warn "reattaching attachments to maps"; 3882 warn "reattaching attachments to maps";
3694 reattach $_ for values %MAP; 3883 reattach $_ for values %MAP;
3695 warn "reattaching attachments to players"; 3884 warn "reattaching attachments to players";
3696 reattach $_ for values %PLAYER; 3885 reattach $_ for values %PLAYER;
3886 }
3697 3887
3888 warn "running post_init jobs";
3889 (pop @POST_INIT)->(1) while @POST_INIT;
3890
3698 warn "leaving sync_job"; 3891 warn "leaving sync_job";
3699 3892
3700 1 3893 1
3701 } or do { 3894 } or do {
3702 warn $@; 3895 warn $@;
3703 cf::cleanup "error while reloading, exiting."; 3896 cf::cleanup "error while reloading, exiting.";
3704 }; 3897 };
3705 3898
3706 warn "reloaded"; 3899 warn "reloaded";
3900 --$RELOAD;
3901 }
3902
3903 $t1 = AE::time - $t1;
3904 warn "reload completed in ${t1}s\n";
3707}; 3905};
3708 3906
3709our $RELOAD_WATCHER; # used only during reload 3907our $RELOAD_WATCHER; # used only during reload
3710 3908
3711sub reload_perl() { 3909sub reload_perl() {
3712 # doing reload synchronously and two reloads happen back-to-back, 3910 # doing reload synchronously and two reloads happen back-to-back,
3713 # coro crashes during coro_state_free->destroy here. 3911 # coro crashes during coro_state_free->destroy here.
3714 3912
3913 $RELOAD_WATCHER ||= cf::async {
3914 Coro::AIO::aio_wait cache_extensions;
3915
3715 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3916 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3716 do_reload_perl; 3917 do_reload_perl;
3717 undef $RELOAD_WATCHER; 3918 undef $RELOAD_WATCHER;
3919 };
3718 }; 3920 };
3719} 3921}
3720 3922
3721register_command "reload" => sub { 3923register_command "reload" => sub {
3722 my ($who, $arg) = @_; 3924 my ($who, $arg) = @_;
3736 3938
3737our @WAIT_FOR_TICK; 3939our @WAIT_FOR_TICK;
3738our @WAIT_FOR_TICK_BEGIN; 3940our @WAIT_FOR_TICK_BEGIN;
3739 3941
3740sub wait_for_tick { 3942sub wait_for_tick {
3741 return if tick_inhibit || $Coro::current == $Coro::main; 3943 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3742 3944
3743 my $signal = new Coro::Signal; 3945 my $signal = new Coro::Signal;
3744 push @WAIT_FOR_TICK, $signal; 3946 push @WAIT_FOR_TICK, $signal;
3745 $signal->wait; 3947 $signal->wait;
3746} 3948}
3747 3949
3748sub wait_for_tick_begin { 3950sub wait_for_tick_begin {
3749 return if tick_inhibit || $Coro::current == $Coro::main; 3951 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3750 3952
3751 my $signal = new Coro::Signal; 3953 my $signal = new Coro::Signal;
3752 push @WAIT_FOR_TICK_BEGIN, $signal; 3954 push @WAIT_FOR_TICK_BEGIN, $signal;
3753 $signal->wait; 3955 $signal->wait;
3754} 3956}
3759 unless ++$bug_warning > 10; 3961 unless ++$bug_warning > 10;
3760 return; 3962 return;
3761 } 3963 }
3762 3964
3763 cf::server_tick; # one server iteration 3965 cf::server_tick; # one server iteration
3966
3967 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3764 3968
3765 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3969 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3766 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3970 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3767 Coro::async_pool { 3971 Coro::async_pool {
3768 $Coro::current->{desc} = "runtime saver"; 3972 $Coro::current->{desc} = "runtime saver";
3791} 3995}
3792 3996
3793{ 3997{
3794 # configure BDB 3998 # configure BDB
3795 3999
3796 BDB::min_parallel 8; 4000 BDB::min_parallel 16;
3797 BDB::max_poll_reqs $TICK * 0.1; 4001 BDB::max_poll_reqs $TICK * 0.1;
3798 $AnyEvent::BDB::WATCHER->priority (1); 4002 $AnyEvent::BDB::WATCHER->priority (1);
3799 4003
3800 unless ($DB_ENV) { 4004 unless ($DB_ENV) {
3801 $DB_ENV = BDB::db_env_create; 4005 $DB_ENV = BDB::db_env_create;
3848 $msg =~ s/\n//; 4052 $msg =~ s/\n//;
3849 4053
3850 # limit the # of concurrent backtraces 4054 # limit the # of concurrent backtraces
3851 if ($_log_backtrace < 2) { 4055 if ($_log_backtrace < 2) {
3852 ++$_log_backtrace; 4056 ++$_log_backtrace;
4057 my $perl_bt = Carp::longmess $msg;
3853 async { 4058 async {
3854 $Coro::current->{desc} = "abt $msg"; 4059 $Coro::current->{desc} = "abt $msg";
3855 4060
3856 my @bt = fork_call { 4061 my @bt = fork_call {
3857 @addr = map { sprintf "%x", $_ } @addr; 4062 @addr = map { sprintf "%x", $_ } @addr;
3868 } 4073 }
3869 4074
3870 @funcs 4075 @funcs
3871 }; 4076 };
3872 4077
3873 LOG llevInfo, "[ABT] $msg\n"; 4078 LOG llevInfo, "[ABT] $perl_bt\n";
4079 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3874 LOG llevInfo, "[ABT] $_\n" for @bt; 4080 LOG llevInfo, "[ABT] $_\n" for @bt;
3875 --$_log_backtrace; 4081 --$_log_backtrace;
3876 }; 4082 };
3877 } else { 4083 } else {
3878 LOG llevInfo, "[ABT] $msg\n"; 4084 LOG llevInfo, "[ABT] $msg\n";
3879 LOG llevInfo, "[ABT] [suppressed]\n"; 4085 LOG llevInfo, "[ABT] [suppressed]\n";
3880 } 4086 }
3881} 4087}
3882 4088
3883# load additional modules 4089# load additional modules
3884use cf::pod; 4090require "cf/$_.pm" for @EXTRA_MODULES;
4091cf::_connect_to_perl_2;
3885 4092
3886END { cf::emergency_save } 4093END { cf::emergency_save }
3887 4094
38881 40951
3889 4096

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines