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.439 by root, Mon Jul 14 16:42:49 2008 UTC vs.
Revision 1.532 by root, Thu Apr 29 07:32:34 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; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
96 118
97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
99our $NEXT_TICK; 121our $NEXT_TICK;
100our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
101 123
102our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
103our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
104our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
105our $DB_ENV; 127our $DB_ENV;
106 128
129our @EXTRA_MODULES = qw(pod match mapscript);
130
107our %CFG; 131our %CFG;
108 132
109our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
110our $RUNTIME; 134our $RUNTIME;
111our $NOW; 135our $NOW;
120our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
121our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter 146our $JITTER; # average jitter
123our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
124 148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
153
125binmode STDOUT; 154binmode STDOUT;
126binmode STDERR; 155binmode STDERR;
127 156
128# read virtual server time, if available 157# read virtual server time, if available
129unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
130 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
131 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
132 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
133} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
134 165
135mkdir $_ 166mkdir $_
136 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
137 168
138our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
139 170
140sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
141 187
142############################################################################# 188#############################################################################
143 189
144=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
145 191
192returns directly I<after> the tick processing (and consequently, can only wake one process 238returns 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. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
194 240
195=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
196 242
197This array contains the results of the last C<invoke ()> call. When 243This 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 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
199that call. 245that call.
200 246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
201=back 253=back
202 254
203=cut 255=cut
204 256
205BEGIN { 257sub error(@) { LOG llevError, join "", @_ }
206 *CORE::GLOBAL::warn = sub { 258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
262
263$Coro::State::WARNHOOK = sub {
207 my $msg = join "", @_; 264 my $msg = join "", @_;
208 265
209 $msg .= "\n" 266 $msg .= "\n"
210 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
211 268
212 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 269 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
213 270
214 LOG llevError, $msg; 271 LOG llevWarn, $msg;
215 }; 272};
216}
217 273
218$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
220 276
221 if ($Coro::current == $Coro::main) {#d# 277 error Carp::longmess $_[0];
278
279 if (in_main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d# 281 return;#d#
224 }#d# 282 }#d#
225 283
226 # kill coroutine otherwise 284 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate 285 Coro::terminate
229}; 286};
230
231$SIG{__DIE__} = sub { }; #d#?
232 287
233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 288@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 289@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 290@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 291@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
243for my $pkg (qw( 298for my $pkg (qw(
244 cf::global cf::attachable 299 cf::global cf::attachable
245 cf::object cf::object::player 300 cf::object cf::object::player
246 cf::client cf::player 301 cf::client cf::player
247 cf::arch cf::living 302 cf::arch cf::living
303 cf::map cf::mapspace
248 cf::map cf::party cf::region 304 cf::party cf::region
249)) { 305)) {
250 no strict 'refs';
251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
252} 307}
253 308
254$EV::DIED = sub { 309$EV::DIED = sub {
255 warn "error in event callback: @_"; 310 Carp::cluck "error in event callback: @_";
256}; 311};
257 312
258############################################################################# 313#############################################################################
259 314
260=head2 UTILITY FUNCTIONS 315=head2 UTILITY FUNCTIONS
297our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 352our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
298 353
299sub encode_json($) { $json_coder->encode ($_[0]) } 354sub encode_json($) { $json_coder->encode ($_[0]) }
300sub decode_json($) { $json_coder->decode ($_[0]) } 355sub decode_json($) { $json_coder->decode ($_[0]) }
301 356
357=item cf::post_init { BLOCK }
358
359Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again.
361
362The cdoeblock will have a single boolean argument to indicate whether this
363is a reload or not.
364
365=cut
366
367sub post_init(&) {
368 push @POST_INIT, shift;
369}
370
302=item cf::lock_wait $string 371=item cf::lock_wait $string
303 372
304Wait until the given lock is available. See cf::lock_acquire. 373Wait until the given lock is available. See cf::lock_acquire.
305 374
306=item my $lock = cf::lock_acquire $string 375=item my $lock = cf::lock_acquire $string
307 376
308Wait until the given lock is available and then acquires it and returns 377Wait until the given lock is available and then acquires it and returns
309a Coro::guard object. If the guard object gets destroyed (goes out of scope, 378a L<Guard> object. If the guard object gets destroyed (goes out of scope,
310for example when the coroutine gets canceled), the lock is automatically 379for example when the coroutine gets canceled), the lock is automatically
311returned. 380returned.
312 381
313Locks are *not* recursive, locking from the same coro twice results in a 382Locks are *not* recursive, locking from the same coro twice results in a
314deadlocked coro. 383deadlocked coro.
320 389
321Return true if the lock is currently active, i.e. somebody has locked it. 390Return true if the lock is currently active, i.e. somebody has locked it.
322 391
323=cut 392=cut
324 393
325our %LOCK; 394our $LOCKS = new Coro::SemaphoreSet;
326our %LOCKER;#d#
327 395
328sub lock_wait($) { 396sub lock_wait($) {
329 my ($key) = @_; 397 $LOCKS->wait ($_[0]);
330
331 if ($LOCKER{$key} == $Coro::current) {#d#
332 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
333 return;#d#
334 }#d#
335
336 # wait for lock, if any
337 while ($LOCK{$key}) {
338 push @{ $LOCK{$key} }, $Coro::current;
339 Coro::schedule;
340 }
341} 398}
342 399
343sub lock_acquire($) { 400sub lock_acquire($) {
344 my ($key) = @_; 401 $LOCKS->guard ($_[0])
345
346 # wait, to be sure we are not locked
347 lock_wait $key;
348
349 $LOCK{$key} = [];
350 $LOCKER{$key} = $Coro::current;#d#
351
352 Coro::guard {
353 delete $LOCKER{$key};#d#
354 # wake up all waiters, to be on the safe side
355 $_->ready for @{ delete $LOCK{$key} };
356 }
357} 402}
358 403
359sub lock_active($) { 404sub lock_active($) {
360 my ($key) = @_; 405 $LOCKS->count ($_[0]) < 1
361
362 ! ! $LOCK{$key}
363} 406}
364 407
365sub freeze_mainloop { 408sub freeze_mainloop {
366 tick_inhibit_inc; 409 tick_inhibit_inc;
367 410
368 Coro::guard \&tick_inhibit_dec; 411 &Guard::guard (\&tick_inhibit_dec);
369} 412}
370 413
371=item cf::periodic $interval, $cb 414=item cf::periodic $interval, $cb
372 415
373Like EV::periodic, but randomly selects a starting point so that the actions 416Like EV::periodic, but randomly selects a starting point so that the actions
374get spread over timer. 417get spread over time.
375 418
376=cut 419=cut
377 420
378sub periodic($$) { 421sub periodic($$) {
379 my ($interval, $cb) = @_; 422 my ($interval, $cb) = @_;
396 439
397=cut 440=cut
398 441
399our @SLOT_QUEUE; 442our @SLOT_QUEUE;
400our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
401 445
402$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
403$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
404 $Coro::current->desc ("timeslot manager"); 448 $Coro::current->desc ("timeslot manager");
405 449
406 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
407 452
408 while () { 453 while () {
409 next_job: 454 next_job:
455
410 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
411 if ($avail > 0.01) { 457
412 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
413 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
414 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
415 $job->[2]->send; 462 $job->[2]->send;
416 Coro::cede; 463 Coro::cede;
417 goto next_job; 464 goto next_job;
418 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
419 } 467 }
420 } 468 }
421 469
422 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
423 # we do not use wait_for_tick() as it returns immediately when tick is inactive 471 # we do not use wait_for_tick() as it returns immediately when tick is inactive
424 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
425 $signal->wait; 473 $signal->wait;
426 } else { 474 } else {
475 $busy = 0;
427 Coro::schedule; 476 Coro::schedule;
428 } 477 }
429 } 478 }
430}; 479};
431 480
432sub get_slot($;$$) { 481sub get_slot($;$$) {
433 return if tick_inhibit || $Coro::current == $Coro::main; 482 return if tick_inhibit || $Coro::current == $Coro::main;
434 483
435 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
436 485
437 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
438 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
439 489
440 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
441 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
442 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
469 519
470sub sync_job(&) { 520sub sync_job(&) {
471 my ($job) = @_; 521 my ($job) = @_;
472 522
473 if ($Coro::current == $Coro::main) { 523 if ($Coro::current == $Coro::main) {
474 my $time = EV::time; 524 my $time = AE::time;
475 525
476 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
477 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
478 528
479 LOG llevError, Carp::longmess "sync job";#d# 529 LOG llevError, Carp::longmess "sync job";#d#
484 my @res; 534 my @res;
485 535
486 (async { 536 (async {
487 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
488 @res = eval { $job->() }; 538 @res = eval { $job->() };
489 warn $@ if $@; 539 error $@ if $@;
490 undef $busy; 540 undef $busy;
491 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
492 542
493 while ($busy) { 543 while ($busy) {
494 if (Coro::nready) { 544 if (Coro::nready) {
496 } else { 546 } else {
497 EV::loop EV::LOOP_ONESHOT; 547 EV::loop EV::LOOP_ONESHOT;
498 } 548 }
499 } 549 }
500 550
501 my $time = EV::time - $time; 551 my $time = AE::time - $time;
502 552
503 $TICK_START += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
504 554
505 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
506 } else { 556 } else {
550 reset_signals; 600 reset_signals;
551 &$cb 601 &$cb
552 }, @args; 602 }, @args;
553 603
554 wantarray ? @res : $res[-1] 604 wantarray ? @res : $res[-1]
605}
606
607sub objinfo {
608 (
609 "counter value" => cf::object::object_count,
610 "objects created" => cf::object::create_count,
611 "objects destroyed" => cf::object::destroy_count,
612 "freelist size" => cf::object::free_count,
613 "allocated objects" => cf::object::objects_size,
614 "active objects" => cf::object::actives_size,
615 )
555} 616}
556 617
557=item $coin = coin_from_name $name 618=item $coin = coin_from_name $name
558 619
559=cut 620=cut
694 755
695 my $t1 = Time::HiRes::time; 756 my $t1 = Time::HiRes::time;
696 my $data = $process->(\@data); 757 my $data = $process->(\@data);
697 my $t2 = Time::HiRes::time; 758 my $t2 = Time::HiRes::time;
698 759
699 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 760 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
700 761
701 db_put cache => "$id/data", $data; 762 db_put cache => "$id/data", $data;
702 db_put cache => "$id/md5" , $md5; 763 db_put cache => "$id/md5" , $md5;
703 db_put cache => "$id/meta", $meta; 764 db_put cache => "$id/meta", $meta;
704 765
714 775
715=cut 776=cut
716 777
717sub datalog($@) { 778sub datalog($@) {
718 my ($type, %kv) = @_; 779 my ($type, %kv) = @_;
719 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 780 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
720} 781}
721 782
722=back 783=back
723 784
724=cut 785=cut
725 786
726############################################################################# 787#############################################################################
727 788
728=head2 ATTACHABLE OBJECTS 789=head2 ATTACHABLE OBJECTS
729 790
730Many objects in crossfire are so-called attachable objects. That means you can 791Many objects in deliantra are so-called attachable objects. That means you can
731attach callbacks/event handlers (a collection of which is called an "attachment") 792attach callbacks/event handlers (a collection of which is called an "attachment")
732to it. All such attachable objects support the following methods. 793to it. All such attachable objects support the following methods.
733 794
734In the following description, CLASS can be any of C<global>, C<object> 795In the following description, CLASS can be any of C<global>, C<object>
735C<player>, C<client> or C<map> (i.e. the attachable objects in 796C<player>, C<client> or C<map> (i.e. the attachable objects in
785=item cf::CLASS::attachment $name, ... 846=item cf::CLASS::attachment $name, ...
786 847
787Register an attachment by C<$name> through which attachable objects of the 848Register an attachment by C<$name> through which attachable objects of the
788given CLASS can refer to this attachment. 849given CLASS can refer to this attachment.
789 850
790Some classes such as crossfire maps and objects can specify attachments 851Some classes such as deliantra maps and objects can specify attachments
791that are attached at load/instantiate time, thus the need for a name. 852that are attached at load/instantiate time, thus the need for a name.
792 853
793These calls expect any number of the following handler/hook descriptions: 854These calls expect any number of the following handler/hook descriptions:
794 855
795=over 4 856=over 4
919 980
920 } elsif (exists $cb_id{$type}) { 981 } elsif (exists $cb_id{$type}) {
921 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 982 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
922 983
923 } elsif (ref $type) { 984 } elsif (ref $type) {
924 warn "attaching objects not supported, ignoring.\n"; 985 error "attaching objects not supported, ignoring.\n";
925 986
926 } else { 987 } else {
927 shift @arg; 988 shift @arg;
928 warn "attach argument '$type' not supported, ignoring.\n"; 989 error "attach argument '$type' not supported, ignoring.\n";
929 } 990 }
930 } 991 }
931} 992}
932 993
933sub _object_attach { 994sub _object_attach {
943 _attach $registry, $klass, @attach; 1004 _attach $registry, $klass, @attach;
944 } 1005 }
945 1006
946 $obj->{$name} = \%arg; 1007 $obj->{$name} = \%arg;
947 } else { 1008 } else {
948 warn "object uses attachment '$name' which is not available, postponing.\n"; 1009 info "object uses attachment '$name' which is not available, postponing.\n";
949 } 1010 }
950 1011
951 $obj->{_attachment}{$name} = undef; 1012 $obj->{_attachment}{$name} = undef;
952} 1013}
953 1014
1012 1073
1013 for (@$callbacks) { 1074 for (@$callbacks) {
1014 eval { &{$_->[1]} }; 1075 eval { &{$_->[1]} };
1015 1076
1016 if ($@) { 1077 if ($@) {
1017 warn "$@";
1018 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1078 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1019 override; 1079 override;
1020 } 1080 }
1021 1081
1022 return 1 if $override; 1082 return 1 if $override;
1023 } 1083 }
1086 1146
1087sub reattach { 1147sub reattach {
1088 # basically do the same as instantiate, without calling instantiate 1148 # basically do the same as instantiate, without calling instantiate
1089 my ($obj) = @_; 1149 my ($obj) = @_;
1090 1150
1151 # no longer needed after getting rid of delete_package?
1091 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1152 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1092 1153
1093 my $registry = $obj->registry; 1154 my $registry = $obj->registry;
1094 1155
1095 @$registry = (); 1156 @$registry = ();
1096 1157
1101 for (@$attach) { 1162 for (@$attach) {
1102 my ($klass, @attach) = @$_; 1163 my ($klass, @attach) = @$_;
1103 _attach $registry, $klass, @attach; 1164 _attach $registry, $klass, @attach;
1104 } 1165 }
1105 } else { 1166 } else {
1106 warn "object uses attachment '$name' that is not available, postponing.\n"; 1167 info "object uses attachment '$name' that is not available, postponing.\n";
1107 } 1168 }
1108 } 1169 }
1109} 1170}
1110 1171
1111cf::attachable->attach ( 1172cf::attachable->attach (
1138 my ($filename, $rdata, $objs) = @_; 1199 my ($filename, $rdata, $objs) = @_;
1139 1200
1140 sync_job { 1201 sync_job {
1141 if (length $$rdata) { 1202 if (length $$rdata) {
1142 utf8::decode (my $decname = $filename); 1203 utf8::decode (my $decname = $filename);
1143 warn sprintf "saving %s (%d,%d)\n", 1204 trace sprintf "saving %s (%d,%d)\n",
1144 $decname, length $$rdata, scalar @$objs; 1205 $decname, length $$rdata, scalar @$objs
1206 if $VERBOSE_IO;
1145 1207
1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1208 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1147 aio_chmod $fh, SAVE_MODE; 1209 aio_chmod $fh, SAVE_MODE;
1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1210 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1149 aio_fsync $fh if $cf::USE_FSYNC; 1211 if ($cf::USE_FSYNC) {
1212 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;
1213 aio_fsync $fh;
1214 }
1150 aio_close $fh; 1215 aio_close $fh;
1151 1216
1152 if (@$objs) { 1217 if (@$objs) {
1153 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1218 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1219 aio_chmod $fh, SAVE_MODE;
1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1220 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1156 aio_write $fh, 0, (length $data), $data, 0; 1221 aio_write $fh, 0, (length $data), $data, 0;
1157 aio_fsync $fh if $cf::USE_FSYNC; 1222 if ($cf::USE_FSYNC) {
1223 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;
1224 aio_fsync $fh;
1225 }
1158 aio_close $fh; 1226 aio_close $fh;
1159 aio_rename "$filename.pst~", "$filename.pst"; 1227 aio_rename "$filename.pst~", "$filename.pst";
1160 } 1228 }
1161 } else { 1229 } else {
1162 aio_unlink "$filename.pst"; 1230 aio_unlink "$filename.pst";
1163 } 1231 }
1164 1232
1165 aio_rename "$filename~", $filename; 1233 aio_rename "$filename~", $filename;
1234
1235 $filename =~ s%/[^/]+$%%;
1236 aio_pathsync $filename if $cf::USE_FSYNC;
1166 } else { 1237 } else {
1167 warn "FATAL: $filename~: $!\n"; 1238 error "unable to save objects: $filename~: $!\n";
1168 } 1239 }
1169 } else { 1240 } else {
1170 aio_unlink $filename; 1241 aio_unlink $filename;
1171 aio_unlink "$filename.pst"; 1242 aio_unlink "$filename.pst";
1172 } 1243 }
1196 my $st = eval { Coro::Storable::thaw $av }; 1267 my $st = eval { Coro::Storable::thaw $av };
1197 $av = $st->{objs}; 1268 $av = $st->{objs};
1198 } 1269 }
1199 1270
1200 utf8::decode (my $decname = $filename); 1271 utf8::decode (my $decname = $filename);
1201 warn sprintf "loading %s (%d,%d)\n", 1272 trace sprintf "loading %s (%d,%d)\n",
1202 $decname, length $data, scalar @{$av || []}; 1273 $decname, length $data, scalar @{$av || []}
1274 if $VERBOSE_IO;
1203 1275
1204 ($data, $av) 1276 ($data, $av)
1205} 1277}
1206 1278
1207=head2 COMMAND CALLBACKS 1279=head2 COMMAND CALLBACKS
1263 my ($name, $cb) = @_; 1335 my ($name, $cb) = @_;
1264 1336
1265 $EXTICMD{$name} = $cb; 1337 $EXTICMD{$name} = $cb;
1266} 1338}
1267 1339
1340use File::Glob ();
1341
1268cf::player->attach ( 1342cf::player->attach (
1269 on_command => sub { 1343 on_unknown_command => sub {
1270 my ($pl, $name, $params) = @_; 1344 my ($pl, $name, $params) = @_;
1271 1345
1272 my $cb = $COMMAND{$name} 1346 my $cb = $COMMAND{$name}
1273 or return; 1347 or return;
1274 1348
1297 1371
1298 $pl->ext_reply ($reply, @reply) 1372 $pl->ext_reply ($reply, @reply)
1299 if $reply; 1373 if $reply;
1300 1374
1301 } else { 1375 } else {
1302 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1376 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1303 } 1377 }
1304 1378
1305 cf::override; 1379 cf::override;
1306 }, 1380 },
1307); 1381);
1308 1382
1383# "readahead" all extensions
1384sub cache_extensions {
1385 my $grp = IO::AIO::aio_group;
1386
1387 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1388 for (grep /\.ext$/, @{$_[0]}) {
1389 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1390 }
1391 };
1392
1393 $grp
1394}
1395
1309sub load_extensions { 1396sub load_extensions {
1397 info "loading extensions...";
1398
1310 cf::sync_job { 1399 cf::sync_job {
1311 my %todo; 1400 my %todo;
1312 1401
1313 for my $path (<$LIBDIR/*.ext>) { 1402 for my $path (<$LIBDIR/*.ext>) {
1314 next unless -r $path; 1403 next unless -r $path;
1332 1421
1333 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1422 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1334 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1423 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1335 1424
1336 $ext{source} = 1425 $ext{source} =
1337 "package $pkg; use strict; use utf8;\n" 1426 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1338 . "#line 1 \"$path\"\n{\n" 1427 . "#line 1 \"$path\"\n{\n"
1339 . $source 1428 . $source
1340 . "\n};\n1"; 1429 . "\n};\n1";
1341 1430
1342 $todo{$base} = \%ext; 1431 $todo{$base} = \%ext;
1343 } 1432 }
1344 1433
1434 my $pass = 0;
1345 my %done; 1435 my %done;
1346 while (%todo) { 1436 while (%todo) {
1347 my $progress; 1437 my $progress;
1348 1438
1439 ++$pass;
1440
1441 ext:
1349 while (my ($k, $v) = each %todo) { 1442 while (my ($k, $v) = each %todo) {
1350 for (split /,\s*/, $v->{meta}{depends}) { 1443 for (split /,\s*/, $v->{meta}{depends}) {
1351 goto skip 1444 next ext
1352 unless exists $done{$_}; 1445 unless exists $done{$_};
1353 } 1446 }
1354 1447
1355 warn "... loading '$k' into '$v->{pkg}'\n"; 1448 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1356 1449
1357 unless (eval $v->{source}) { 1450 my $active = eval $v->{source};
1451
1452 if (length $@) {
1358 my $msg = $@ ? "$v->{path}: $@\n" 1453 error "$v->{path}: $@\n";
1359 : "$v->{base}: extension inactive.\n";
1360 1454
1361 if (exists $v->{meta}{mandatory}) {
1362 warn $msg;
1363 cf::cleanup "mandatory extension failed to load, exiting."; 1455 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1364 } 1456 if exists $v->{meta}{mandatory};
1365 1457
1366 warn $msg; 1458 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1459 delete $todo{$k};
1460 } else {
1461 $done{$k} = delete $todo{$k};
1462 push @EXTS, $v->{pkg};
1463 $progress = 1;
1464
1465 info "$v->{base}: extension inactive.\n"
1466 unless $active;
1367 } 1467 }
1368
1369 $done{$k} = delete $todo{$k};
1370 push @EXTS, $v->{pkg};
1371 $progress = 1;
1372 } 1468 }
1373 1469
1374 skip: 1470 unless ($progress) {
1375 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1471 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1376 unless $progress; 1472
1473 while (my ($k, $v) = each %todo) {
1474 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1475 if exists $v->{meta}{mandatory};
1476 }
1477 }
1377 } 1478 }
1378 }; 1479 };
1379} 1480}
1380 1481
1381############################################################################# 1482#############################################################################
1382 1483
1383=back 1484=back
1384 1485
1385=head2 CORE EXTENSIONS 1486=head2 CORE EXTENSIONS
1386 1487
1387Functions and methods that extend core crossfire objects. 1488Functions and methods that extend core deliantra objects.
1388 1489
1389=cut 1490=cut
1390 1491
1391package cf::player; 1492package cf::player;
1392 1493
1435 1536
1436sub exists($) { 1537sub exists($) {
1437 my ($login) = @_; 1538 my ($login) = @_;
1438 1539
1439 $cf::PLAYER{$login} 1540 $cf::PLAYER{$login}
1440 or cf::sync_job { !aio_stat path $login } 1541 or !aio_stat path $login
1441} 1542}
1442 1543
1443sub find($) { 1544sub find($) {
1444 return $cf::PLAYER{$_[0]} || do { 1545 return $cf::PLAYER{$_[0]} || do {
1445 my $login = $_[0]; 1546 my $login = $_[0];
1465 $cf::PLAYER{$login} = $pl 1566 $cf::PLAYER{$login} = $pl
1466 } 1567 }
1467 } 1568 }
1468} 1569}
1469 1570
1571cf::player->attach (
1572 on_load => sub {
1573 my ($pl, $path) = @_;
1574
1575 # restore slots saved in save, below
1576 my $slots = delete $pl->{_slots};
1577
1578 $pl->ob->current_weapon ($slots->[0]);
1579 $pl->combat_ob ($slots->[1]);
1580 $pl->ranged_ob ($slots->[2]);
1581 },
1582);
1583
1470sub save($) { 1584sub save($) {
1471 my ($pl) = @_; 1585 my ($pl) = @_;
1472 1586
1473 return if $pl->{deny_save}; 1587 return if $pl->{deny_save};
1474 1588
1479 1593
1480 aio_mkdir playerdir $pl, 0770; 1594 aio_mkdir playerdir $pl, 0770;
1481 $pl->{last_save} = $cf::RUNTIME; 1595 $pl->{last_save} = $cf::RUNTIME;
1482 1596
1483 cf::get_slot 0.01; 1597 cf::get_slot 0.01;
1598
1599 # save slots, to be restored later
1600 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1484 1601
1485 $pl->save_pl ($path); 1602 $pl->save_pl ($path);
1486 cf::cede_to_tick; 1603 cf::cede_to_tick;
1487} 1604}
1488 1605
1520 my ($pl) = @_; 1637 my ($pl) = @_;
1521 1638
1522 my $name = $pl->ob->name; 1639 my $name = $pl->ob->name;
1523 1640
1524 $pl->{deny_save} = 1; 1641 $pl->{deny_save} = 1;
1525 $pl->password ("*"); # this should lock out the player until we nuked the dir 1642 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1526 1643
1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1644 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1528 $pl->deactivate; 1645 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1646 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score;
1531 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1647 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1532 $pl->ns->destroy if $pl->ns; 1648 $pl->ns->destroy if $pl->ns;
1533 1649
1534 my $path = playerdir $pl; 1650 my $path = playerdir $pl;
1535 my $temp = "$path~$cf::RUNTIME~deleting~"; 1651 my $temp = "$path~$cf::RUNTIME~deleting~";
1590 \@logins 1706 \@logins
1591} 1707}
1592 1708
1593=item $player->maps 1709=item $player->maps
1594 1710
1711=item cf::player::maps $login
1712
1595Returns an arrayref of map paths that are private for this 1713Returns an arrayref of map paths that are private for this
1596player. May block. 1714player. May block.
1597 1715
1598=cut 1716=cut
1599 1717
1616 } 1734 }
1617 1735
1618 \@paths 1736 \@paths
1619} 1737}
1620 1738
1621=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1739=item $protocol_xml = $player->expand_cfpod ($cfpod)
1622 1740
1623Expand crossfire pod fragments into protocol xml. 1741Expand deliantra pod fragments into protocol xml.
1624
1625=cut
1626
1627use re 'eval';
1628
1629my $group;
1630my $interior; $interior = qr{
1631 # match a pod interior sequence sans C<< >>
1632 (?:
1633 \ (.*?)\ (?{ $group = $^N })
1634 | < (??{$interior}) >
1635 )
1636}x;
1637
1638sub expand_cfpod {
1639 my ($self, $pod) = @_;
1640
1641 my $xml;
1642
1643 while () {
1644 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1645 $group = $1;
1646
1647 $group =~ s/&/&amp;/g;
1648 $group =~ s/</&lt;/g;
1649
1650 $xml .= $group;
1651 } elsif ($pod =~ m%\G
1652 ([BCGHITU])
1653 <
1654 (?:
1655 ([^<>]*) (?{ $group = $^N })
1656 | < $interior >
1657 )
1658 >
1659 %gcsx
1660 ) {
1661 my ($code, $data) = ($1, $group);
1662
1663 if ($code eq "B") {
1664 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1665 } elsif ($code eq "I") {
1666 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1667 } elsif ($code eq "U") {
1668 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1669 } elsif ($code eq "C") {
1670 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1671 } elsif ($code eq "T") {
1672 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1673 } elsif ($code eq "G") {
1674 my ($male, $female) = split /\|/, $data;
1675 $data = $self->gender ? $female : $male;
1676 $xml .= expand_cfpod ($self, $data);
1677 } elsif ($code eq "H") {
1678 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1679 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1680 "")
1681 [$self->{hintmode}];
1682 } else {
1683 $xml .= "error processing '$code($data)' directive";
1684 }
1685 } else {
1686 if ($pod =~ /\G(.+)/) {
1687 warn "parse error while expanding $pod (at $1)";
1688 }
1689 last;
1690 }
1691 }
1692
1693 for ($xml) {
1694 # create single paragraphs (very hackish)
1695 s/(?<=\S)\n(?=\w)/ /g;
1696
1697 # compress some whitespace
1698 s/\s+\n/\n/g; # ws line-ends
1699 s/\n\n+/\n/g; # double lines
1700 s/^\n+//; # beginning lines
1701 s/\n+$//; # ending lines
1702 }
1703
1704 $xml
1705}
1706
1707no re 'eval';
1708
1709sub hintmode {
1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1711 $_[0]{hintmode}
1712}
1713 1742
1714=item $player->ext_reply ($msgid, @msg) 1743=item $player->ext_reply ($msgid, @msg)
1715 1744
1716Sends an ext reply to the player. 1745Sends an ext reply to the player.
1717 1746
1749 1778
1750=cut 1779=cut
1751 1780
1752sub find_by_path($) { 1781sub find_by_path($) {
1753 my ($path) = @_; 1782 my ($path) = @_;
1783
1784 $path =~ s/^~[^\/]*//; # skip ~login
1754 1785
1755 my ($match, $specificity); 1786 my ($match, $specificity);
1756 1787
1757 for my $region (list) { 1788 for my $region (list) {
1758 if ($region->{match} && $path =~ $region->{match}) { 1789 if ($region->{match} && $path =~ $region->{match}) {
1790 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1821 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1791 1822
1792 # mit "rum" bekleckern, nicht 1823 # mit "rum" bekleckern, nicht
1793 $self->_create_random_map ( 1824 $self->_create_random_map (
1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1825 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1826 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1827 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1797 $rmp->{exit_on_final_map}, 1828 $rmp->{exit_on_final_map},
1798 $rmp->{xsize}, $rmp->{ysize}, 1829 $rmp->{xsize}, $rmp->{ysize},
1799 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1830 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1800 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1831 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1822 1853
1823 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1854 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1824} 1855}
1825 1856
1826# also paths starting with '/' 1857# also paths starting with '/'
1827$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1858$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1828 1859
1829sub thawer_merge { 1860sub thawer_merge {
1830 my ($self, $merge) = @_; 1861 my ($self, $merge) = @_;
1831 1862
1832 # we have to keep some variables in memory intact 1863 # we have to keep some variables in memory intact
1930 1961
1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1962 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1932 "$UNIQUEDIR/$path" 1963 "$UNIQUEDIR/$path"
1933} 1964}
1934 1965
1935# and all this just because we cannot iterate over
1936# all maps in C++...
1937sub change_all_map_light {
1938 my ($change) = @_;
1939
1940 $_->change_map_light ($change)
1941 for grep $_->outdoor, values %cf::MAP;
1942}
1943
1944sub decay_objects { 1966sub decay_objects {
1945 my ($self) = @_; 1967 my ($self) = @_;
1946 1968
1947 return if $self->{deny_reset}; 1969 return if $self->{deny_reset};
1948 1970
2030sub find { 2052sub find {
2031 my ($path, $origin) = @_; 2053 my ($path, $origin) = @_;
2032 2054
2033 $path = normalise $path, $origin && $origin->path; 2055 $path = normalise $path, $origin && $origin->path;
2034 2056
2035 cf::lock_wait "map_data:$path";#d#remove 2057 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 cf::lock_wait "map_find:$path"; 2058 my $guard2 = cf::lock_acquire "map_find:$path";
2037 2059
2038 $cf::MAP{$path} || do { 2060 $cf::MAP{$path} || do {
2039 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2040 my $guard2 = cf::lock_acquire "map_find:$path";
2041
2042 my $map = new_from_path cf::map $path 2061 my $map = new_from_path cf::map $path
2043 or return; 2062 or return;
2044 2063
2045 $map->{last_save} = $cf::RUNTIME; 2064 $map->{last_save} = $cf::RUNTIME;
2046 2065
2058 2077
2059 $cf::MAP{$path} = $map 2078 $cf::MAP{$path} = $map
2060 } 2079 }
2061} 2080}
2062 2081
2063sub pre_load { } 2082sub pre_load { }
2064sub post_load { } 2083#sub post_load { } # XS
2065 2084
2066sub load { 2085sub load {
2067 my ($self) = @_; 2086 my ($self) = @_;
2068 2087
2069 local $self->{deny_reset} = 1; # loading can take a long time 2088 local $self->{deny_reset} = 1; # loading can take a long time
2114 unless ($self->{deny_activate}) { 2133 unless ($self->{deny_activate}) {
2115 $self->decay_objects; 2134 $self->decay_objects;
2116 $self->fix_auto_apply; 2135 $self->fix_auto_apply;
2117 $self->update_buttons; 2136 $self->update_buttons;
2118 cf::cede_to_tick; 2137 cf::cede_to_tick;
2119 $self->set_darkness_map;
2120 cf::cede_to_tick;
2121 $self->activate; 2138 $self->activate;
2122 } 2139 }
2123 2140
2124 $self->{last_save} = $cf::RUNTIME; 2141 $self->{last_save} = $cf::RUNTIME;
2125 $self->last_access ($cf::RUNTIME); 2142 $self->last_access ($cf::RUNTIME);
2128 } 2145 }
2129 2146
2130 $self->post_load; 2147 $self->post_load;
2131} 2148}
2132 2149
2150# customize the map for a given player, i.e.
2151# return the _real_ map. used by e.g. per-player
2152# maps to change the path to ~playername/mappath
2133sub customise_for { 2153sub customise_for {
2134 my ($self, $ob) = @_; 2154 my ($self, $ob) = @_;
2135 2155
2136 return find "~" . $ob->name . "/" . $self->{path} 2156 return find "~" . $ob->name . "/" . $self->{path}
2137 if $self->per_player; 2157 if $self->per_player;
2153 or next; 2173 or next;
2154 $neigh = find $neigh, $map 2174 $neigh = find $neigh, $map
2155 or next; 2175 or next;
2156 $neigh->load; 2176 $neigh->load;
2157 2177
2178 # now find the diagonal neighbours
2158 push @neigh, 2179 push @neigh,
2159 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2180 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2160 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2181 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2161 } 2182 }
2162 2183
2214 $MAP_PREFETCHER->prio (6); 2235 $MAP_PREFETCHER->prio (6);
2215 2236
2216 () 2237 ()
2217} 2238}
2218 2239
2240# common code, used by both ->save and ->swapout
2219sub save { 2241sub _save {
2220 my ($self) = @_; 2242 my ($self) = @_;
2221
2222 my $lock = cf::lock_acquire "map_data:$self->{path}";
2223 2243
2224 $self->{last_save} = $cf::RUNTIME; 2244 $self->{last_save} = $cf::RUNTIME;
2225 2245
2226 return unless $self->dirty; 2246 return unless $self->dirty;
2227 2247
2247 } else { 2267 } else {
2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2268 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2249 } 2269 }
2250} 2270}
2251 2271
2272sub save {
2273 my ($self) = @_;
2274
2275 my $lock = cf::lock_acquire "map_data:$self->{path}";
2276
2277 $self->_save;
2278}
2279
2252sub swap_out { 2280sub swap_out {
2253 my ($self) = @_; 2281 my ($self) = @_;
2254 2282
2255 # save first because save cedes
2256 $self->save;
2257
2258 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2283 my $lock = cf::lock_acquire "map_data:$self->{path}";
2259 2284
2260 return if $self->players;
2261 return if $self->in_memory != cf::MAP_ACTIVE; 2285 return if $self->in_memory != cf::MAP_ACTIVE;
2262 return if $self->{deny_save}; 2286 return if $self->{deny_save};
2287 return if $self->players;
2263 2288
2289 # first deactivate the map and "unlink" it from the core
2290 $self->deactivate;
2291 $_->clear_links_to ($self) for values %cf::MAP;
2264 $self->in_memory (cf::MAP_SWAPPED); 2292 $self->in_memory (cf::MAP_SWAPPED);
2293
2294 # then atomically save
2295 $self->_save;
2296
2297 # then free the map
2298 $self->clear;
2299}
2300
2301sub reset_at {
2302 my ($self) = @_;
2303
2304 # TODO: safety, remove and allow resettable per-player maps
2305 return 1e99 if $self->{deny_reset};
2306
2307 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2308 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2309
2310 $time + $to
2311}
2312
2313sub should_reset {
2314 my ($self) = @_;
2315
2316 $self->reset_at <= $cf::RUNTIME
2317}
2318
2319sub reset {
2320 my ($self) = @_;
2321
2322 my $lock = cf::lock_acquire "map_data:$self->{path}";
2323
2324 return if $self->players;
2325
2326 cf::trace "resetting map ", $self->path, "\n";
2327
2328 $self->in_memory (cf::MAP_SWAPPED);
2329
2330 # need to save uniques path
2331 unless ($self->{deny_save}) {
2332 my $uniq = $self->uniq_path; utf8::encode $uniq;
2333
2334 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2335 if $uniq;
2336 }
2337
2338 delete $cf::MAP{$self->path};
2265 2339
2266 $self->deactivate; 2340 $self->deactivate;
2267 $_->clear_links_to ($self) for values %cf::MAP; 2341 $_->clear_links_to ($self) for values %cf::MAP;
2268 $self->clear; 2342 $self->clear;
2269}
2270
2271sub reset_at {
2272 my ($self) = @_;
2273
2274 # TODO: safety, remove and allow resettable per-player maps
2275 return 1e99 if $self->{deny_reset};
2276
2277 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2278 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2279
2280 $time + $to
2281}
2282
2283sub should_reset {
2284 my ($self) = @_;
2285
2286 $self->reset_at <= $cf::RUNTIME
2287}
2288
2289sub reset {
2290 my ($self) = @_;
2291
2292 my $lock = cf::lock_acquire "map_data:$self->{path}";
2293
2294 return if $self->players;
2295
2296 warn "resetting map ", $self->path;
2297
2298 $self->in_memory (cf::MAP_SWAPPED);
2299
2300 # need to save uniques path
2301 unless ($self->{deny_save}) {
2302 my $uniq = $self->uniq_path; utf8::encode $uniq;
2303
2304 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2305 if $uniq;
2306 }
2307
2308 delete $cf::MAP{$self->path};
2309
2310 $self->deactivate;
2311 $_->clear_links_to ($self) for values %cf::MAP;
2312 $self->clear;
2313 2343
2314 $self->unlink_save; 2344 $self->unlink_save;
2315 $self->destroy; 2345 $self->destroy;
2316} 2346}
2317 2347
2325 2355
2326 delete $cf::MAP{$self->path}; 2356 delete $cf::MAP{$self->path};
2327 2357
2328 $self->unlink_save; 2358 $self->unlink_save;
2329 2359
2330 bless $self, "cf::map"; 2360 bless $self, "cf::map::wrap";
2331 delete $self->{deny_reset}; 2361 delete $self->{deny_reset};
2332 $self->{deny_save} = 1; 2362 $self->{deny_save} = 1;
2333 $self->reset_timeout (1); 2363 $self->reset_timeout (1);
2334 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2364 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2335 2365
2392 : normalise $_ 2422 : normalise $_
2393 } @{ aio_readdir $UNIQUEDIR or [] } 2423 } @{ aio_readdir $UNIQUEDIR or [] }
2394 ] 2424 ]
2395} 2425}
2396 2426
2427=item cf::map::static_maps
2428
2429Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2430file in the shared directory excluding F</styles> and F</editor>). May
2431block.
2432
2433=cut
2434
2435sub static_maps() {
2436 my @dirs = "";
2437 my @maps;
2438
2439 while (@dirs) {
2440 my $dir = shift @dirs;
2441
2442 next if $dir eq "/styles" || $dir eq "/editor";
2443
2444 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2445 or return;
2446
2447 for (@$files) {
2448 s/\.map$// or next;
2449 utf8::decode $_;
2450 push @maps, "$dir/$_";
2451 }
2452
2453 push @dirs, map "$dir/$_", @$dirs;
2454 }
2455
2456 \@maps
2457}
2458
2397=back 2459=back
2398 2460
2399=head3 cf::object 2461=head3 cf::object
2400 2462
2401=cut 2463=cut
2466 2528
2467our $SAY_CHANNEL = { 2529our $SAY_CHANNEL = {
2468 id => "say", 2530 id => "say",
2469 title => "Map", 2531 title => "Map",
2470 reply => "say ", 2532 reply => "say ",
2471 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2533 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2472}; 2534};
2473 2535
2474our $CHAT_CHANNEL = { 2536our $CHAT_CHANNEL = {
2475 id => "chat", 2537 id => "chat",
2476 title => "Chat", 2538 title => "Chat",
2531 2593
2532=item $player_object->enter_link 2594=item $player_object->enter_link
2533 2595
2534Freezes the player and moves him/her to a special map (C<{link}>). 2596Freezes the player and moves him/her to a special map (C<{link}>).
2535 2597
2536The player should be reasonably safe there for short amounts of time. You 2598The player should be reasonably safe there for short amounts of time (e.g.
2537I<MUST> call C<leave_link> as soon as possible, though. 2599for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2600though, as the player cannot control the character while it is on the link
2601map.
2538 2602
2539Will never block. 2603Will never block.
2540 2604
2541=item $player_object->leave_link ($map, $x, $y) 2605=item $player_object->leave_link ($map, $x, $y)
2542 2606
2562sub cf::object::player::enter_link { 2626sub cf::object::player::enter_link {
2563 my ($self) = @_; 2627 my ($self) = @_;
2564 2628
2565 $self->deactivate_recursive; 2629 $self->deactivate_recursive;
2566 2630
2631 ++$self->{_link_recursion};
2632
2567 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2633 return if UNIVERSAL::isa $self->map, "ext::map_link";
2568 2634
2569 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2635 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2570 if $self->map && $self->map->{path} ne "{link}"; 2636 if $self->map && $self->map->{path} ne "{link}";
2571 2637
2572 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2638 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2573} 2639}
2574 2640
2575sub cf::object::player::leave_link { 2641sub cf::object::player::leave_link {
2576 my ($self, $map, $x, $y) = @_; 2642 my ($self, $map, $x, $y) = @_;
2577 2643
2594 ($x, $y) = (-1, -1) 2660 ($x, $y) = (-1, -1)
2595 unless (defined $x) && (defined $y); 2661 unless (defined $x) && (defined $y);
2596 2662
2597 # use -1 or undef as default coordinates, not 0, 0 2663 # use -1 or undef as default coordinates, not 0, 0
2598 ($x, $y) = ($map->enter_x, $map->enter_y) 2664 ($x, $y) = ($map->enter_x, $map->enter_y)
2599 if $x <=0 && $y <= 0; 2665 if $x <= 0 && $y <= 0;
2600 2666
2601 $map->load; 2667 $map->load;
2602 $map->load_neighbours; 2668 $map->load_neighbours;
2603 2669
2604 return unless $self->contr->active; 2670 return unless $self->contr->active;
2605 $self->activate_recursive;
2606 2671
2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2672 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2608 $self->enter_map ($map, $x, $y); 2673 if ($self->enter_map ($map, $x, $y)) {
2609} 2674 # entering was successful
2675 delete $self->{_link_recursion};
2676 # only activate afterwards, to support waiting in hooks
2677 $self->activate_recursive;
2678 }
2610 2679
2680}
2681
2611=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2682=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2612 2683
2613Moves the player to the given map-path and coordinates by first freezing 2684Moves the player to the given map-path and coordinates by first freezing
2614her, loading and preparing them map, calling the provided $check callback 2685her, loading and preparing them map, calling the provided $check callback
2615that has to return the map if sucecssful, and then unfreezes the player on 2686that has to return the map if sucecssful, and then unfreezes the player on
2616the new (success) or old (failed) map position. In either case, $done will 2687the new (success) or old (failed) map position. In either case, $done will
2623 2694
2624our $GOTOGEN; 2695our $GOTOGEN;
2625 2696
2626sub cf::object::player::goto { 2697sub cf::object::player::goto {
2627 my ($self, $path, $x, $y, $check, $done) = @_; 2698 my ($self, $path, $x, $y, $check, $done) = @_;
2699
2700 if ($self->{_link_recursion} >= $MAX_LINKS) {
2701 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2702 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2703 ($path, $x, $y) = @$EMERGENCY_POSITION;
2704 }
2628 2705
2629 # do generation counting so two concurrent goto's will be executed in-order 2706 # do generation counting so two concurrent goto's will be executed in-order
2630 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2707 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2631 2708
2632 $self->enter_link; 2709 $self->enter_link;
2656 my $map = eval { 2733 my $map = eval {
2657 my $map = defined $path ? cf::map::find $path : undef; 2734 my $map = defined $path ? cf::map::find $path : undef;
2658 2735
2659 if ($map) { 2736 if ($map) {
2660 $map = $map->customise_for ($self); 2737 $map = $map->customise_for ($self);
2661 $map = $check->($map) if $check && $map; 2738 $map = $check->($map, $x, $y, $self) if $check && $map;
2662 } else { 2739 } else {
2663 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2740 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2664 } 2741 }
2665 2742
2666 $map 2743 $map
2674 if ($gen == $self->{_goto_generation}) { 2751 if ($gen == $self->{_goto_generation}) {
2675 delete $self->{_goto_generation}; 2752 delete $self->{_goto_generation};
2676 $self->leave_link ($map, $x, $y); 2753 $self->leave_link ($map, $x, $y);
2677 } 2754 }
2678 2755
2679 $done->() if $done; 2756 $done->($self) if $done;
2680 })->prio (1); 2757 })->prio (1);
2681} 2758}
2682 2759
2683=item $player_object->enter_exit ($exit_object) 2760=item $player_object->enter_exit ($exit_object)
2684 2761
2772 $self->contr->savebed ($map, $x, $y) 2849 $self->contr->savebed ($map, $x, $y)
2773 if $exit->flag (cf::FLAG_DAMNED); 2850 if $exit->flag (cf::FLAG_DAMNED);
2774 2851
2775 1 2852 1
2776 }) { 2853 }) {
2777 $self->message ("Something went wrong deep within the crossfire server. " 2854 $self->message ("Something went wrong deep within the deliantra server. "
2778 . "I'll try to bring you back to the map you were before. " 2855 . "I'll try to bring you back to the map you were before. "
2779 . "Please report this to the dungeon master!", 2856 . "Please report this to the dungeon master!",
2780 cf::NDI_UNIQUE | cf::NDI_RED); 2857 cf::NDI_UNIQUE | cf::NDI_RED);
2781 2858
2782 warn "ERROR in enter_exit: $@"; 2859 error "ERROR in enter_exit: $@";
2783 $self->leave_link; 2860 $self->leave_link;
2784 } 2861 }
2785 })->prio (1); 2862 })->prio (1);
2786} 2863}
2787 2864
2799sub cf::client::send_drawinfo { 2876sub cf::client::send_drawinfo {
2800 my ($self, $text, $flags) = @_; 2877 my ($self, $text, $flags) = @_;
2801 2878
2802 utf8::encode $text; 2879 utf8::encode $text;
2803 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2880 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2881}
2882
2883=item $client->send_big_packet ($pkt)
2884
2885Like C<send_packet>, but tries to compress large packets, and fragments
2886them as required.
2887
2888=cut
2889
2890our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2891
2892sub cf::client::send_big_packet {
2893 my ($self, $pkt) = @_;
2894
2895 # try lzf for large packets
2896 $pkt = "lzf " . Compress::LZF::compress $pkt
2897 if 1024 <= length $pkt and $self->{can_lzf};
2898
2899 # split very large packets
2900 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2901 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2902 $pkt = "frag";
2903 }
2904
2905 $self->send_packet ($pkt);
2804} 2906}
2805 2907
2806=item $client->send_msg ($channel, $msg, $color, [extra...]) 2908=item $client->send_msg ($channel, $msg, $color, [extra...])
2807 2909
2808Send a drawinfo or msg packet to the client, formatting the msg for the 2910Send a drawinfo or msg packet to the client, formatting the msg for the
2812 2914
2813=cut 2915=cut
2814 2916
2815# non-persistent channels (usually the info channel) 2917# non-persistent channels (usually the info channel)
2816our %CHANNEL = ( 2918our %CHANNEL = (
2919 "c/motd" => {
2920 id => "infobox",
2921 title => "MOTD",
2922 reply => undef,
2923 tooltip => "The message of the day",
2924 },
2817 "c/identify" => { 2925 "c/identify" => {
2818 id => "infobox", 2926 id => "infobox",
2819 title => "Identify", 2927 title => "Identify",
2820 reply => undef, 2928 reply => undef,
2821 tooltip => "Items recently identified", 2929 tooltip => "Items recently identified",
2823 "c/examine" => { 2931 "c/examine" => {
2824 id => "infobox", 2932 id => "infobox",
2825 title => "Examine", 2933 title => "Examine",
2826 reply => undef, 2934 reply => undef,
2827 tooltip => "Signs and other items you examined", 2935 tooltip => "Signs and other items you examined",
2936 },
2937 "c/shopinfo" => {
2938 id => "infobox",
2939 title => "Shop Info",
2940 reply => undef,
2941 tooltip => "What your bargaining skill tells you about the shop",
2828 }, 2942 },
2829 "c/book" => { 2943 "c/book" => {
2830 id => "infobox", 2944 id => "infobox",
2831 title => "Book", 2945 title => "Book",
2832 reply => undef, 2946 reply => undef,
2848 id => "infobox", 2962 id => "infobox",
2849 title => "Body Parts", 2963 title => "Body Parts",
2850 reply => undef, 2964 reply => undef,
2851 tooltip => "Shows which body parts you posess and are available", 2965 tooltip => "Shows which body parts you posess and are available",
2852 }, 2966 },
2967 "c/statistics" => {
2968 id => "infobox",
2969 title => "Statistics",
2970 reply => undef,
2971 tooltip => "Shows your primary statistics",
2972 },
2973 "c/skills" => {
2974 id => "infobox",
2975 title => "Skills",
2976 reply => undef,
2977 tooltip => "Shows your experience per skill and item power",
2978 },
2979 "c/shopitems" => {
2980 id => "infobox",
2981 title => "Shop Items",
2982 reply => undef,
2983 tooltip => "Shows the items currently for sale in this shop",
2984 },
2985 "c/resistances" => {
2986 id => "infobox",
2987 title => "Resistances",
2988 reply => undef,
2989 tooltip => "Shows your resistances",
2990 },
2991 "c/pets" => {
2992 id => "infobox",
2993 title => "Pets",
2994 reply => undef,
2995 tooltip => "Shows information abotu your pets/a specific pet",
2996 },
2997 "c/perceiveself" => {
2998 id => "infobox",
2999 title => "Perceive Self",
3000 reply => undef,
3001 tooltip => "You gained detailed knowledge about yourself",
3002 },
2853 "c/uptime" => { 3003 "c/uptime" => {
2854 id => "infobox", 3004 id => "infobox",
2855 title => "Uptime", 3005 title => "Uptime",
2856 reply => undef, 3006 reply => undef,
2857 tooltip => "How long the server has been running since last restart", 3007 tooltip => "How long the server has been running since last restart",
2866 id => "party", 3016 id => "party",
2867 title => "Party", 3017 title => "Party",
2868 reply => "gsay ", 3018 reply => "gsay ",
2869 tooltip => "Messages and chat related to your party", 3019 tooltip => "Messages and chat related to your party",
2870 }, 3020 },
3021 "c/death" => {
3022 id => "death",
3023 title => "Death",
3024 reply => undef,
3025 tooltip => "Reason for and more info about your most recent death",
3026 },
3027 "c/say" => $SAY_CHANNEL,
3028 "c/chat" => $CHAT_CHANNEL,
2871); 3029);
2872 3030
2873sub cf::client::send_msg { 3031sub cf::client::send_msg {
2874 my ($self, $channel, $msg, $color, @extra) = @_; 3032 my ($self, $channel, $msg, $color, @extra) = @_;
2875 3033
2876 $msg = $self->pl->expand_cfpod ($msg); 3034 $msg = $self->pl->expand_cfpod ($msg)
3035 unless $color & cf::NDI_VERBATIM;
2877 3036
2878 $color &= cf::NDI_CLIENT_MASK; # just in case... 3037 $color &= cf::NDI_CLIENT_MASK; # just in case...
2879 3038
2880 # check predefined channels, for the benefit of C 3039 # check predefined channels, for the benefit of C
2881 if ($CHANNEL{$channel}) { 3040 if ($CHANNEL{$channel}) {
2882 $channel = $CHANNEL{$channel}; 3041 $channel = $CHANNEL{$channel};
2883 3042
2884 $self->ext_msg (channel_info => $channel) 3043 $self->ext_msg (channel_info => $channel);
2885 if $self->can_msg;
2886
2887 $channel = $channel->{id}; 3044 $channel = $channel->{id};
2888 3045
2889 } elsif (ref $channel) { 3046 } elsif (ref $channel) {
2890 # send meta info to client, if not yet sent 3047 # send meta info to client, if not yet sent
2891 unless (exists $self->{channel}{$channel->{id}}) { 3048 unless (exists $self->{channel}{$channel->{id}}) {
2892 $self->{channel}{$channel->{id}} = $channel; 3049 $self->{channel}{$channel->{id}} = $channel;
2893 $self->ext_msg (channel_info => $channel) 3050 $self->ext_msg (channel_info => $channel);
2894 if $self->can_msg;
2895 } 3051 }
2896 3052
2897 $channel = $channel->{id}; 3053 $channel = $channel->{id};
2898 } 3054 }
2899 3055
2900 return unless @extra || length $msg; 3056 return unless @extra || length $msg;
2901 3057
2902 if ($self->can_msg) {
2903 # default colour, mask it out 3058 # default colour, mask it out
2904 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3059 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2905 if $color & cf::NDI_DEF; 3060 if $color & cf::NDI_DEF;
2906 3061
2907 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3062 my $pkt = "msg "
3063 . $self->{json_coder}->encode (
2908 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3064 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2909 } else { 3065 );
2910 if ($color >= 0) {
2911 # replace some tags by gcfclient-compatible ones
2912 for ($msg) {
2913 1 while
2914 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2915 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2916 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2917 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2918 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2919 }
2920 3066
2921 $color &= cf::NDI_COLOR_MASK; 3067 $self->send_big_packet ($pkt);
2922
2923 utf8::encode $msg;
2924
2925 if (0 && $msg =~ /\[/) {
2926 # COMMAND/INFO
2927 $self->send_packet ("drawextinfo $color 10 8 $msg")
2928 } else {
2929 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2930 $self->send_packet ("drawinfo $color $msg")
2931 }
2932 }
2933 }
2934} 3068}
2935 3069
2936=item $client->ext_msg ($type, @msg) 3070=item $client->ext_msg ($type, @msg)
2937 3071
2938Sends an ext event to the client. 3072Sends an ext event to the client.
2941 3075
2942sub cf::client::ext_msg($$@) { 3076sub cf::client::ext_msg($$@) {
2943 my ($self, $type, @msg) = @_; 3077 my ($self, $type, @msg) = @_;
2944 3078
2945 if ($self->extcmd == 2) { 3079 if ($self->extcmd == 2) {
2946 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3080 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2947 } elsif ($self->extcmd == 1) { # TODO: remove 3081 } elsif ($self->extcmd == 1) { # TODO: remove
2948 push @msg, msgtype => "event_$type"; 3082 push @msg, msgtype => "event_$type";
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3083 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 } 3084 }
2951} 3085}
2952 3086
2953=item $client->ext_reply ($msgid, @msg) 3087=item $client->ext_reply ($msgid, @msg)
2954 3088
2958 3092
2959sub cf::client::ext_reply($$@) { 3093sub cf::client::ext_reply($$@) {
2960 my ($self, $id, @msg) = @_; 3094 my ($self, $id, @msg) = @_;
2961 3095
2962 if ($self->extcmd == 2) { 3096 if ($self->extcmd == 2) {
2963 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3097 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2964 } elsif ($self->extcmd == 1) { 3098 } elsif ($self->extcmd == 1) {
2965 #TODO: version 1, remove 3099 #TODO: version 1, remove
2966 unshift @msg, msgtype => "reply", msgid => $id; 3100 unshift @msg, msgtype => "reply", msgid => $id;
2967 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2968 } 3102 }
2969} 3103}
2970 3104
2971=item $success = $client->query ($flags, "text", \&cb) 3105=item $success = $client->query ($flags, "text", \&cb)
2972 3106
3043 3177
3044 $ns->ext_reply ($reply, @reply) 3178 $ns->ext_reply ($reply, @reply)
3045 if $reply; 3179 if $reply;
3046 3180
3047 } else { 3181 } else {
3048 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3182 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3049 } 3183 }
3050 3184
3051 cf::override; 3185 cf::override;
3052 }, 3186 },
3053); 3187);
3073 3207
3074 $coro 3208 $coro
3075} 3209}
3076 3210
3077cf::client->attach ( 3211cf::client->attach (
3078 on_destroy => sub { 3212 on_client_destroy => sub {
3079 my ($ns) = @_; 3213 my ($ns) = @_;
3080 3214
3081 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3215 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3082 }, 3216 },
3083); 3217);
3099our $safe_hole = new Safe::Hole; 3233our $safe_hole = new Safe::Hole;
3100 3234
3101$SIG{FPE} = 'IGNORE'; 3235$SIG{FPE} = 'IGNORE';
3102 3236
3103$safe->permit_only (Opcode::opset qw( 3237$safe->permit_only (Opcode::opset qw(
3104 :base_core :base_mem :base_orig :base_math 3238 :base_core :base_mem :base_orig :base_math :base_loop
3105 grepstart grepwhile mapstart mapwhile 3239 grepstart grepwhile mapstart mapwhile
3106 sort time 3240 sort time
3107)); 3241));
3108 3242
3109# here we export the classes and methods available to script code 3243# here we export the classes and methods available to script code
3113The following functions and methods are available within a safe environment: 3247The following functions and methods are available within a safe environment:
3114 3248
3115 cf::object 3249 cf::object
3116 contr pay_amount pay_player map x y force_find force_add destroy 3250 contr pay_amount pay_player map x y force_find force_add destroy
3117 insert remove name archname title slaying race decrease split 3251 insert remove name archname title slaying race decrease split
3252 value
3118 3253
3119 cf::object::player 3254 cf::object::player
3120 player 3255 player
3121 3256
3122 cf::player 3257 cf::player
3128=cut 3263=cut
3129 3264
3130for ( 3265for (
3131 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3266 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3132 insert remove inv nrof name archname title slaying race 3267 insert remove inv nrof name archname title slaying race
3133 decrease split destroy change_exp)], 3268 decrease split destroy change_exp value msg lore send_msg)],
3134 ["cf::object::player" => qw(player)], 3269 ["cf::object::player" => qw(player)],
3135 ["cf::player" => qw(peaceful)], 3270 ["cf::player" => qw(peaceful send_msg)],
3136 ["cf::map" => qw(trigger)], 3271 ["cf::map" => qw(trigger)],
3137) { 3272) {
3138 no strict 'refs'; 3273 no strict 'refs';
3139 my ($pkg, @funs) = @$_; 3274 my ($pkg, @funs) = @$_;
3140 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3275 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3158 3293
3159 my $qcode = $code; 3294 my $qcode = $code;
3160 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3295 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3161 $qcode =~ s/\n/\\n/g; 3296 $qcode =~ s/\n/\\n/g;
3162 3297
3298 %vars = (_dummy => 0) unless %vars;
3299
3300 my @res;
3163 local $_; 3301 local $_;
3164 local @safe::cf::_safe_eval_args = values %vars;
3165 3302
3166 my $eval = 3303 my $eval =
3167 "do {\n" 3304 "do {\n"
3168 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3305 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3169 . "#line 0 \"{$qcode}\"\n" 3306 . "#line 0 \"{$qcode}\"\n"
3170 . $code 3307 . $code
3171 . "\n}" 3308 . "\n}"
3172 ; 3309 ;
3173 3310
3311 if ($CFG{safe_eval}) {
3174 sub_generation_inc; 3312 sub_generation_inc;
3313 local @safe::cf::_safe_eval_args = values %vars;
3175 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3314 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3176 sub_generation_inc; 3315 sub_generation_inc;
3316 } else {
3317 local @cf::_safe_eval_args = values %vars;
3318 @res = wantarray ? eval eval : scalar eval $eval;
3319 }
3177 3320
3178 if ($@) { 3321 if ($@) {
3179 warn "$@"; 3322 warn "$@",
3180 warn "while executing safe code '$code'\n"; 3323 "while executing safe code '$code'\n",
3181 warn "with arguments " . (join " ", %vars) . "\n"; 3324 "with arguments " . (join " ", %vars) . "\n";
3182 } 3325 }
3183 3326
3184 wantarray ? @res : $res[0] 3327 wantarray ? @res : $res[0]
3185} 3328}
3186 3329
3200=cut 3343=cut
3201 3344
3202sub register_script_function { 3345sub register_script_function {
3203 my ($fun, $cb) = @_; 3346 my ($fun, $cb) = @_;
3204 3347
3205 no strict 'refs'; 3348 $fun = "safe::$fun" if $CFG{safe_eval};
3206 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3349 *$fun = $safe_hole->wrap ($cb);
3207} 3350}
3208 3351
3209=back 3352=back
3210 3353
3211=cut 3354=cut
3220 # for this (global event?) 3363 # for this (global event?)
3221 %ext::player_env::MUSIC_FACE_CACHE = (); 3364 %ext::player_env::MUSIC_FACE_CACHE = ();
3222 3365
3223 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3366 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3224 3367
3225 warn "loading facedata from $path\n"; 3368 trace "loading facedata from $path\n";
3226 3369
3227 my $facedata; 3370 my $facedata;
3228 0 < aio_load $path, $facedata 3371 0 < aio_load $path, $facedata
3229 or die "$path: $!"; 3372 or die "$path: $!";
3230 3373
3232 3375
3233 $facedata->{version} == 2 3376 $facedata->{version} == 2
3234 or cf::cleanup "$path: version mismatch, cannot proceed."; 3377 or cf::cleanup "$path: version mismatch, cannot proceed.";
3235 3378
3236 # patch in the exptable 3379 # patch in the exptable
3380 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3237 $facedata->{resource}{"res/exp_table"} = { 3381 $facedata->{resource}{"res/exp_table"} = {
3238 type => FT_RSRC, 3382 type => FT_RSRC,
3239 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3383 data => $exp_table,
3384 hash => (Digest::MD5::md5 $exp_table),
3240 }; 3385 };
3241 cf::cede_to_tick; 3386 cf::cede_to_tick;
3242 3387
3243 { 3388 {
3244 my $faces = $facedata->{faceinfo}; 3389 my $faces = $facedata->{faceinfo};
3246 while (my ($face, $info) = each %$faces) { 3391 while (my ($face, $info) = each %$faces) {
3247 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3392 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3248 3393
3249 cf::face::set_visibility $idx, $info->{visibility}; 3394 cf::face::set_visibility $idx, $info->{visibility};
3250 cf::face::set_magicmap $idx, $info->{magicmap}; 3395 cf::face::set_magicmap $idx, $info->{magicmap};
3251 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3396 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3252 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3397 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3253 3398
3254 cf::cede_to_tick; 3399 cf::cede_to_tick;
3255 } 3400 }
3256 3401
3257 while (my ($face, $info) = each %$faces) { 3402 while (my ($face, $info) = each %$faces) {
3262 3407
3263 if (my $smooth = cf::face::find $info->{smooth}) { 3408 if (my $smooth = cf::face::find $info->{smooth}) {
3264 cf::face::set_smooth $idx, $smooth; 3409 cf::face::set_smooth $idx, $smooth;
3265 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3410 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3266 } else { 3411 } else {
3267 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3412 error "smooth face '$info->{smooth}' not found for face '$face'";
3268 } 3413 }
3269 3414
3270 cf::cede_to_tick; 3415 cf::cede_to_tick;
3271 } 3416 }
3272 } 3417 }
3281 3426
3282 cf::anim::invalidate_all; # d'oh 3427 cf::anim::invalidate_all; # d'oh
3283 } 3428 }
3284 3429
3285 { 3430 {
3286 # TODO: for gcfclient pleasure, we should give resources
3287 # that gcfclient doesn't grok a >10000 face index.
3288 my $res = $facedata->{resource}; 3431 my $res = $facedata->{resource};
3289 3432
3290 while (my ($name, $info) = each %$res) { 3433 while (my ($name, $info) = each %$res) {
3291 if (defined $info->{type}) { 3434 if (defined $info->{type}) {
3292 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3435 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3293 my $data;
3294 3436
3295 if ($info->{type} & 1) { 3437 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3296 # prepend meta info
3297
3298 my $meta = $enc->encode ({
3299 name => $name,
3300 %{ $info->{meta} || {} },
3301 });
3302
3303 $data = pack "(w/a*)*", $meta, $info->{data};
3304 } else {
3305 $data = $info->{data};
3306 }
3307
3308 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3309 cf::face::set_type $idx, $info->{type}; 3438 cf::face::set_type $idx, $info->{type};
3310 } else { 3439 } else {
3311 $RESOURCE{$name} = $info; 3440 $RESOURCE{$name} = $info; # unused
3312 } 3441 }
3313 3442
3314 cf::cede_to_tick; 3443 cf::cede_to_tick;
3315 } 3444 }
3316 } 3445 }
3317 3446
3318 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3447 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3319 3448
3320 1 3449 1
3321} 3450}
3322
3323cf::global->attach (on_resource_update => sub {
3324 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3325 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3326
3327 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3328 my $sound = $soundconf->{compat}[$_]
3329 or next;
3330
3331 my $face = cf::face::find "sound/$sound->[1]";
3332 cf::sound::set $sound->[0] => $face;
3333 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3334 }
3335
3336 while (my ($k, $v) = each %{$soundconf->{event}}) {
3337 my $face = cf::face::find "sound/$v";
3338 cf::sound::set $k => $face;
3339 }
3340 }
3341});
3342 3451
3343register_exticmd fx_want => sub { 3452register_exticmd fx_want => sub {
3344 my ($ns, $want) = @_; 3453 my ($ns, $want) = @_;
3345 3454
3346 while (my ($k, $v) = each %$want) { 3455 while (my ($k, $v) = each %$want) {
3385sub reload_treasures { 3494sub reload_treasures {
3386 load_resource_file "$DATADIR/treasures" 3495 load_resource_file "$DATADIR/treasures"
3387 or die "unable to load treasurelists\n"; 3496 or die "unable to load treasurelists\n";
3388} 3497}
3389 3498
3499sub reload_sound {
3500 trace "loading sound config from $DATADIR/sound\n";
3501
3502 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3503 or die "$DATADIR/sound $!";
3504
3505 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3506
3507 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3508 my $sound = $soundconf->{compat}[$_]
3509 or next;
3510
3511 my $face = cf::face::find "sound/$sound->[1]";
3512 cf::sound::set $sound->[0] => $face;
3513 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3514 }
3515
3516 while (my ($k, $v) = each %{$soundconf->{event}}) {
3517 my $face = cf::face::find "sound/$v";
3518 cf::sound::set $k => $face;
3519 }
3520}
3521
3390sub reload_resources { 3522sub reload_resources {
3391 warn "reloading resource files...\n"; 3523 trace "reloading resource files...\n";
3392 3524
3393 reload_facedata; 3525 reload_facedata;
3526 reload_sound;
3394 reload_archetypes; 3527 reload_archetypes;
3395 reload_regions; 3528 reload_regions;
3396 reload_treasures; 3529 reload_treasures;
3397 3530
3398 warn "finished reloading resource files\n"; 3531 trace "finished reloading resource files\n";
3399}
3400
3401sub init {
3402 my $guard = freeze_mainloop;
3403
3404 evthread_start IO::AIO::poll_fileno;
3405
3406 reload_resources;
3407} 3532}
3408 3533
3409sub reload_config { 3534sub reload_config {
3535 trace "reloading config file...\n";
3536
3410 open my $fh, "<:utf8", "$CONFDIR/config" 3537 open my $fh, "<:utf8", "$CONFDIR/config"
3411 or return; 3538 or return;
3412 3539
3413 local $/; 3540 local $/;
3414 *CFG = YAML::Load <$fh>; 3541 *CFG = YAML::XS::Load scalar <$fh>;
3415 3542
3416 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3543 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3417 3544
3418 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3545 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3419 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3546 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3420 3547
3421 if (exists $CFG{mlockall}) { 3548 if (exists $CFG{mlockall}) {
3423 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3550 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3424 and die "WARNING: m(un)lockall failed: $!\n"; 3551 and die "WARNING: m(un)lockall failed: $!\n";
3425 }; 3552 };
3426 warn $@ if $@; 3553 warn $@ if $@;
3427 } 3554 }
3555
3556 trace "finished reloading resource files\n";
3557}
3558
3559sub pidfile() {
3560 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3561 or die "$PIDFILE: $!";
3562 flock $fh, &Fcntl::LOCK_EX
3563 or die "$PIDFILE: flock: $!";
3564 $fh
3565}
3566
3567# make sure only one server instance is running at any one time
3568sub atomic {
3569 my $fh = pidfile;
3570
3571 my $pid = <$fh>;
3572 kill 9, $pid if $pid > 0;
3573
3574 seek $fh, 0, 0;
3575 print $fh $$;
3576}
3577
3578sub main_loop {
3579 trace "EV::loop starting\n";
3580 if (1) {
3581 EV::loop;
3582 }
3583 trace "EV::loop returned\n";
3584 goto &main_loop unless $REALLY_UNLOOP;
3428} 3585}
3429 3586
3430sub main { 3587sub main {
3588 cf::init_globals; # initialise logging
3589
3590 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3591 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3592 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3593 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3594
3595 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3596
3431 # we must not ever block the main coroutine 3597 # we must not ever block the main coroutine
3432 local $Coro::idle = sub { 3598 local $Coro::idle = sub {
3433 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3599 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3434 (async { 3600 (async {
3435 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3601 $Coro::current->{desc} = "IDLE BUG HANDLER";
3436 EV::loop EV::LOOP_ONESHOT; 3602 EV::loop EV::LOOP_ONESHOT;
3437 })->prio (Coro::PRIO_MAX); 3603 })->prio (Coro::PRIO_MAX);
3438 }; 3604 };
3439 3605
3440 { 3606 evthread_start IO::AIO::poll_fileno;
3441 my $guard = freeze_mainloop; 3607
3608 cf::sync_job {
3609 cf::init_experience;
3610 cf::init_anim;
3611 cf::init_attackmess;
3612 cf::init_dynamic;
3613
3614 cf::load_settings;
3615 cf::load_materials;
3616
3617 reload_resources;
3442 reload_config; 3618 reload_config;
3443 db_init; 3619 db_init;
3620
3621 cf::init_uuid;
3622 cf::init_signals;
3623 cf::init_skills;
3624
3625 cf::init_beforeplay;
3626
3627 atomic;
3628
3444 load_extensions; 3629 load_extensions;
3445 3630
3446 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3631 utime time, time, $RUNTIMEFILE;
3632
3633 # no (long-running) fork's whatsoever before this point(!)
3634 use POSIX ();
3635 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3636
3637 (pop @POST_INIT)->(0) while @POST_INIT;
3447 } 3638 };
3448 3639
3449 EV::loop; 3640 cf::object::thawer::errors_are_fatal 0;
3641 info "parse errors in files are no longer fatal from this point on.\n";
3642
3643 main_loop;
3450} 3644}
3451 3645
3452############################################################################# 3646#############################################################################
3453# initialisation and cleanup 3647# initialisation and cleanup
3454 3648
3455# install some emergency cleanup handlers 3649# install some emergency cleanup handlers
3456BEGIN { 3650BEGIN {
3457 our %SIGWATCHER = (); 3651 our %SIGWATCHER = ();
3458 for my $signal (qw(INT HUP TERM)) { 3652 for my $signal (qw(INT HUP TERM)) {
3459 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3653 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3460 cf::cleanup "SIG$signal"; 3654 cf::cleanup "SIG$signal";
3461 }; 3655 };
3462 } 3656 }
3463} 3657}
3464 3658
3465sub write_runtime_sync { 3659sub write_runtime_sync {
3466 my $runtime = "$LOCALDIR/runtime"; 3660 my $t0 = AE::time;
3467 3661
3468 # first touch the runtime file to show we are still running: 3662 # first touch the runtime file to show we are still running:
3469 # the fsync below can take a very very long time. 3663 # the fsync below can take a very very long time.
3470 3664
3471 IO::AIO::aio_utime $runtime, undef, undef; 3665 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3472 3666
3473 my $guard = cf::lock_acquire "write_runtime"; 3667 my $guard = cf::lock_acquire "write_runtime";
3474 3668
3475 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3669 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3476 or return; 3670 or return;
3477 3671
3478 my $value = $cf::RUNTIME + 90 + 10; 3672 my $value = $cf::RUNTIME + 90 + 10;
3479 # 10 is the runtime save interval, for a monotonic clock 3673 # 10 is the runtime save interval, for a monotonic clock
3480 # 60 allows for the watchdog to kill the server. 3674 # 60 allows for the watchdog to kill the server.
3490 aio_utime $fh, undef, undef; 3684 aio_utime $fh, undef, undef;
3491 3685
3492 close $fh 3686 close $fh
3493 or return; 3687 or return;
3494 3688
3495 aio_rename "$runtime~", $runtime 3689 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3496 and return; 3690 and return;
3497 3691
3498 warn "runtime file written.\n"; 3692 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3499 3693
3500 1 3694 1
3501} 3695}
3502 3696
3503our $uuid_lock; 3697our $uuid_lock;
3512 my $uuid = "$LOCALDIR/uuid"; 3706 my $uuid = "$LOCALDIR/uuid";
3513 3707
3514 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3708 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3515 or return; 3709 or return;
3516 3710
3517 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3711 my $value = uuid_seq uuid_cur;
3712
3713 unless ($value) {
3714 info "cowardly refusing to write zero uuid value!\n";
3715 return;
3716 }
3717
3718 my $value = uuid_str $value + $uuid_skip;
3518 $uuid_skip = 0; 3719 $uuid_skip = 0;
3519 3720
3520 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3721 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3521 and return; 3722 and return;
3522 3723
3528 or return; 3729 or return;
3529 3730
3530 aio_rename "$uuid~", $uuid 3731 aio_rename "$uuid~", $uuid
3531 and return; 3732 and return;
3532 3733
3533 warn "uuid file written ($value).\n"; 3734 trace "uuid file written ($value).\n";
3534 3735
3535 1 3736 1
3536 3737
3537} 3738}
3538 3739
3544} 3745}
3545 3746
3546sub emergency_save() { 3747sub emergency_save() {
3547 my $freeze_guard = cf::freeze_mainloop; 3748 my $freeze_guard = cf::freeze_mainloop;
3548 3749
3549 warn "enter emergency perl save\n"; 3750 info "emergency_perl_save: enter\n";
3550 3751
3551 cf::sync_job { 3752 cf::sync_job {
3753 # this is a trade-off: we want to be very quick here, so
3754 # save all maps without fsync, and later call a global sync
3755 # (which in turn might be very very slow)
3756 local $USE_FSYNC = 0;
3757
3552 # use a peculiar iteration method to avoid tripping on perl 3758 # use a peculiar iteration method to avoid tripping on perl
3553 # refcount bugs in for. also avoids problems with players 3759 # refcount bugs in for. also avoids problems with players
3554 # and maps saved/destroyed asynchronously. 3760 # and maps saved/destroyed asynchronously.
3555 warn "begin emergency player save\n"; 3761 info "emergency_perl_save: begin player save\n";
3556 for my $login (keys %cf::PLAYER) { 3762 for my $login (keys %cf::PLAYER) {
3557 my $pl = $cf::PLAYER{$login} or next; 3763 my $pl = $cf::PLAYER{$login} or next;
3558 $pl->valid or next; 3764 $pl->valid or next;
3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3765 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3560 $pl->save; 3766 $pl->save;
3561 } 3767 }
3562 warn "end emergency player save\n"; 3768 info "emergency_perl_save: end player save\n";
3563 3769
3564 warn "begin emergency map save\n"; 3770 info "emergency_perl_save: begin map save\n";
3565 for my $path (keys %cf::MAP) { 3771 for my $path (keys %cf::MAP) {
3566 my $map = $cf::MAP{$path} or next; 3772 my $map = $cf::MAP{$path} or next;
3567 $map->valid or next; 3773 $map->valid or next;
3568 $map->save; 3774 $map->save;
3569 } 3775 }
3570 warn "end emergency map save\n"; 3776 info "emergency_perl_save: end map save\n";
3571 3777
3572 warn "begin emergency database checkpoint\n"; 3778 info "emergency_perl_save: begin database checkpoint\n";
3573 BDB::db_env_txn_checkpoint $DB_ENV; 3779 BDB::db_env_txn_checkpoint $DB_ENV;
3574 warn "end emergency database checkpoint\n"; 3780 info "emergency_perl_save: end database checkpoint\n";
3575 3781
3576 warn "begin write uuid\n"; 3782 info "emergency_perl_save: begin write uuid\n";
3577 write_uuid_sync 1; 3783 write_uuid_sync 1;
3578 warn "end write uuid\n"; 3784 info "emergency_perl_save: end write uuid\n";
3579 }; 3785 };
3580 3786
3581 warn "leave emergency perl save\n"; 3787 info "emergency_perl_save: starting sync()\n";
3788 IO::AIO::aio_sync sub {
3789 info "emergency_perl_save: finished sync()\n";
3790 };
3791
3792 info "emergency_perl_save: leave\n";
3582} 3793}
3583 3794
3584sub post_cleanup { 3795sub post_cleanup {
3585 my ($make_core) = @_; 3796 my ($make_core) = @_;
3586 3797
3587 warn Carp::longmess "post_cleanup backtrace" 3798 error Carp::longmess "post_cleanup backtrace"
3588 if $make_core; 3799 if $make_core;
3800
3801 my $fh = pidfile;
3802 unlink $PIDFILE if <$fh> == $$;
3803}
3804
3805# a safer delete_package, copied from Symbol
3806sub clear_package($) {
3807 my $pkg = shift;
3808
3809 # expand to full symbol table name if needed
3810 unless ($pkg =~ /^main::.*::$/) {
3811 $pkg = "main$pkg" if $pkg =~ /^::/;
3812 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3813 $pkg .= '::' unless $pkg =~ /::$/;
3814 }
3815
3816 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3817 my $stem_symtab = *{$stem}{HASH};
3818
3819 defined $stem_symtab and exists $stem_symtab->{$leaf}
3820 or return;
3821
3822 # clear all symbols
3823 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3824 for my $name (keys %$leaf_symtab) {
3825 _gv_clear *{"$pkg$name"};
3826# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3827 }
3589} 3828}
3590 3829
3591sub do_reload_perl() { 3830sub do_reload_perl() {
3592 # can/must only be called in main 3831 # can/must only be called in main
3593 if ($Coro::current != $Coro::main) { 3832 if (in_main) {
3594 warn "can only reload from main coroutine"; 3833 error "can only reload from main coroutine";
3595 return; 3834 return;
3596 } 3835 }
3597 3836
3837 return if $RELOAD++;
3838
3839 my $t1 = AE::time;
3840
3841 while ($RELOAD) {
3598 warn "reloading..."; 3842 info "reloading...";
3599 3843
3600 warn "entering sync_job"; 3844 trace "entering sync_job";
3601 3845
3602 cf::sync_job { 3846 cf::sync_job {
3603 cf::write_runtime_sync; # external watchdog should not bark 3847 cf::write_runtime_sync; # external watchdog should not bark
3604 cf::emergency_save; 3848 cf::emergency_save;
3605 cf::write_runtime_sync; # external watchdog should not bark 3849 cf::write_runtime_sync; # external watchdog should not bark
3606 3850
3607 warn "syncing database to disk"; 3851 trace "syncing database to disk";
3608 BDB::db_env_txn_checkpoint $DB_ENV; 3852 BDB::db_env_txn_checkpoint $DB_ENV;
3609 3853
3610 # if anything goes wrong in here, we should simply crash as we already saved 3854 # if anything goes wrong in here, we should simply crash as we already saved
3611 3855
3612 warn "flushing outstanding aio requests"; 3856 trace "flushing outstanding aio requests";
3613 for (;;) {
3614 BDB::flush;
3615 IO::AIO::flush;
3616 Coro::cede_notself;
3617 last unless IO::AIO::nreqs || BDB::nreqs; 3857 while (IO::AIO::nreqs || BDB::nreqs) {
3618 warn "iterate..."; 3858 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3619 }
3620
3621 ++$RELOAD;
3622
3623 warn "cancelling all extension coros";
3624 $_->cancel for values %EXT_CORO;
3625 %EXT_CORO = ();
3626
3627 warn "removing commands";
3628 %COMMAND = ();
3629
3630 warn "removing ext/exti commands";
3631 %EXTCMD = ();
3632 %EXTICMD = ();
3633
3634 warn "unloading/nuking all extensions";
3635 for my $pkg (@EXTS) {
3636 warn "... unloading $pkg";
3637
3638 if (my $cb = $pkg->can ("unload")) {
3639 eval {
3640 $cb->($pkg);
3641 1
3642 } or warn "$pkg unloaded, but with errors: $@";
3643 } 3859 }
3644 3860
3645 warn "... nuking $pkg"; 3861 trace "cancelling all extension coros";
3646 Symbol::delete_package $pkg; 3862 $_->cancel for values %EXT_CORO;
3647 } 3863 %EXT_CORO = ();
3648 3864
3649 warn "unloading all perl modules loaded from $LIBDIR"; 3865 trace "removing commands";
3650 while (my ($k, $v) = each %INC) { 3866 %COMMAND = ();
3651 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3652 3867
3868 trace "removing ext/exti commands";
3869 %EXTCMD = ();
3870 %EXTICMD = ();
3871
3872 trace "unloading/nuking all extensions";
3873 for my $pkg (@EXTS) {
3653 warn "... unloading $k"; 3874 trace "... unloading $pkg";
3654 delete $INC{$k};
3655 3875
3656 $k =~ s/\.pm$//;
3657 $k =~ s/\//::/g;
3658
3659 if (my $cb = $k->can ("unload_module")) { 3876 if (my $cb = $pkg->can ("unload")) {
3877 eval {
3660 $cb->(); 3878 $cb->($pkg);
3879 1
3880 } or error "$pkg unloaded, but with errors: $@";
3881 }
3882
3883 trace "... clearing $pkg";
3884 clear_package $pkg;
3661 } 3885 }
3662 3886
3663 Symbol::delete_package $k; 3887 trace "unloading all perl modules loaded from $LIBDIR";
3888 while (my ($k, $v) = each %INC) {
3889 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3890
3891 trace "... unloading $k";
3892 delete $INC{$k};
3893
3894 $k =~ s/\.pm$//;
3895 $k =~ s/\//::/g;
3896
3897 if (my $cb = $k->can ("unload_module")) {
3898 $cb->();
3899 }
3900
3901 clear_package $k;
3664 } 3902 }
3665 3903
3666 warn "getting rid of safe::, as good as possible"; 3904 trace "getting rid of safe::, as good as possible";
3667 Symbol::delete_package "safe::$_" 3905 clear_package "safe::$_"
3668 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3906 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3669 3907
3670 warn "unloading cf.pm \"a bit\""; 3908 trace "unloading cf.pm \"a bit\"";
3671 delete $INC{"cf.pm"}; 3909 delete $INC{"cf.pm"};
3672 delete $INC{"cf/pod.pm"}; 3910 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3673 3911
3674 # don't, removes xs symbols, too, 3912 # don't, removes xs symbols, too,
3675 # and global variables created in xs 3913 # and global variables created in xs
3676 #Symbol::delete_package __PACKAGE__; 3914 #clear_package __PACKAGE__;
3677 3915
3678 warn "unload completed, starting to reload now"; 3916 info "unload completed, starting to reload now";
3679 3917
3680 warn "reloading cf.pm"; 3918 trace "reloading cf.pm";
3681 require cf; 3919 require cf;
3682 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3920 cf::_connect_to_perl_1;
3683 3921
3684 warn "loading config and database again"; 3922 trace "loading config and database again";
3685 cf::reload_config; 3923 cf::reload_config;
3686 3924
3687 warn "loading extensions"; 3925 trace "loading extensions";
3688 cf::load_extensions; 3926 cf::load_extensions;
3689 3927
3928 if ($REATTACH_ON_RELOAD) {
3690 warn "reattaching attachments to objects/players"; 3929 trace "reattaching attachments to objects/players";
3691 _global_reattach; # objects, sockets 3930 _global_reattach; # objects, sockets
3692 warn "reattaching attachments to maps"; 3931 trace "reattaching attachments to maps";
3693 reattach $_ for values %MAP; 3932 reattach $_ for values %MAP;
3694 warn "reattaching attachments to players"; 3933 trace "reattaching attachments to players";
3695 reattach $_ for values %PLAYER; 3934 reattach $_ for values %PLAYER;
3935 }
3696 3936
3937 trace "running post_init jobs";
3938 (pop @POST_INIT)->(1) while @POST_INIT;
3939
3697 warn "leaving sync_job"; 3940 trace "leaving sync_job";
3698 3941
3699 1 3942 1
3700 } or do { 3943 } or do {
3701 warn $@; 3944 error $@;
3702 cf::cleanup "error while reloading, exiting."; 3945 cf::cleanup "error while reloading, exiting.";
3946 };
3947
3948 info "reloaded";
3949 --$RELOAD;
3703 }; 3950 }
3704 3951
3705 warn "reloaded"; 3952 $t1 = AE::time - $t1;
3953 info "reload completed in ${t1}s\n";
3706}; 3954};
3707 3955
3708our $RELOAD_WATCHER; # used only during reload 3956our $RELOAD_WATCHER; # used only during reload
3709 3957
3710sub reload_perl() { 3958sub reload_perl() {
3711 # doing reload synchronously and two reloads happen back-to-back, 3959 # doing reload synchronously and two reloads happen back-to-back,
3712 # coro crashes during coro_state_free->destroy here. 3960 # coro crashes during coro_state_free->destroy here.
3713 3961
3962 $RELOAD_WATCHER ||= cf::async {
3963 Coro::AIO::aio_wait cache_extensions;
3964
3714 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3965 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3715 do_reload_perl; 3966 do_reload_perl;
3716 undef $RELOAD_WATCHER; 3967 undef $RELOAD_WATCHER;
3968 };
3717 }; 3969 };
3718} 3970}
3719 3971
3720register_command "reload" => sub { 3972register_command "reload" => sub {
3721 my ($who, $arg) = @_; 3973 my ($who, $arg) = @_;
3735 3987
3736our @WAIT_FOR_TICK; 3988our @WAIT_FOR_TICK;
3737our @WAIT_FOR_TICK_BEGIN; 3989our @WAIT_FOR_TICK_BEGIN;
3738 3990
3739sub wait_for_tick { 3991sub wait_for_tick {
3740 return if tick_inhibit || $Coro::current == $Coro::main; 3992 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3741 3993
3742 my $signal = new Coro::Signal; 3994 my $signal = new Coro::Signal;
3743 push @WAIT_FOR_TICK, $signal; 3995 push @WAIT_FOR_TICK, $signal;
3744 $signal->wait; 3996 $signal->wait;
3745} 3997}
3746 3998
3747sub wait_for_tick_begin { 3999sub wait_for_tick_begin {
3748 return if tick_inhibit || $Coro::current == $Coro::main; 4000 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3749 4001
3750 my $signal = new Coro::Signal; 4002 my $signal = new Coro::Signal;
3751 push @WAIT_FOR_TICK_BEGIN, $signal; 4003 push @WAIT_FOR_TICK_BEGIN, $signal;
3752 $signal->wait; 4004 $signal->wait;
3753} 4005}
3759 return; 4011 return;
3760 } 4012 }
3761 4013
3762 cf::server_tick; # one server iteration 4014 cf::server_tick; # one server iteration
3763 4015
4016 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4017
3764 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4018 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3765 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4019 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3766 Coro::async_pool { 4020 Coro::async_pool {
3767 $Coro::current->{desc} = "runtime saver"; 4021 $Coro::current->{desc} = "runtime saver";
3768 write_runtime_sync 4022 write_runtime_sync
3769 or warn "ERROR: unable to write runtime file: $!"; 4023 or error "ERROR: unable to write runtime file: $!";
3770 }; 4024 };
3771 } 4025 }
3772 4026
3773 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4027 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3774 $sig->send; 4028 $sig->send;
3782 4036
3783 if (0) { 4037 if (0) {
3784 if ($NEXT_TICK) { 4038 if ($NEXT_TICK) {
3785 my $jitter = $TICK_START - $NEXT_TICK; 4039 my $jitter = $TICK_START - $NEXT_TICK;
3786 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4040 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3787 warn "jitter $JITTER\n";#d# 4041 debug "jitter $JITTER\n";#d#
3788 } 4042 }
3789 } 4043 }
3790} 4044}
3791 4045
3792{ 4046{
3793 # configure BDB 4047 # configure BDB
3794 4048
3795 BDB::min_parallel 8; 4049 BDB::min_parallel 16;
3796 BDB::max_poll_reqs $TICK * 0.1; 4050 BDB::max_poll_reqs $TICK * 0.1;
3797 $AnyEvent::BDB::WATCHER->priority (1); 4051 $AnyEvent::BDB::WATCHER->priority (1);
3798 4052
3799 unless ($DB_ENV) { 4053 unless ($DB_ENV) {
3800 $DB_ENV = BDB::db_env_create; 4054 $DB_ENV = BDB::db_env_create;
3847 $msg =~ s/\n//; 4101 $msg =~ s/\n//;
3848 4102
3849 # limit the # of concurrent backtraces 4103 # limit the # of concurrent backtraces
3850 if ($_log_backtrace < 2) { 4104 if ($_log_backtrace < 2) {
3851 ++$_log_backtrace; 4105 ++$_log_backtrace;
4106 my $perl_bt = Carp::longmess $msg;
3852 async { 4107 async {
3853 $Coro::current->{desc} = "abt $msg"; 4108 $Coro::current->{desc} = "abt $msg";
3854 4109
3855 my @bt = fork_call { 4110 my @bt = fork_call {
3856 @addr = map { sprintf "%x", $_ } @addr; 4111 @addr = map { sprintf "%x", $_ } @addr;
3867 } 4122 }
3868 4123
3869 @funcs 4124 @funcs
3870 }; 4125 };
3871 4126
3872 LOG llevInfo, "[ABT] $msg\n"; 4127 LOG llevInfo, "[ABT] $perl_bt\n";
4128 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3873 LOG llevInfo, "[ABT] $_\n" for @bt; 4129 LOG llevInfo, "[ABT] $_\n" for @bt;
3874 --$_log_backtrace; 4130 --$_log_backtrace;
3875 }; 4131 };
3876 } else { 4132 } else {
3877 LOG llevInfo, "[ABT] $msg\n"; 4133 LOG llevInfo, "[ABT] $msg\n";
3878 LOG llevInfo, "[ABT] [suppressed]\n"; 4134 LOG llevInfo, "[ABT] [suppressed]\n";
3879 } 4135 }
3880} 4136}
3881 4137
3882# load additional modules 4138# load additional modules
3883use cf::pod; 4139require "cf/$_.pm" for @EXTRA_MODULES;
4140cf::_connect_to_perl_2;
3884 4141
3885END { cf::emergency_save } 4142END { cf::emergency_save }
3886 4143
38871 41441
3888 4145

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines