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.407 by root, Sun Jan 13 09:53:53 2008 UTC vs.
Revision 1.547 by root, Sun May 9 22:51:13 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use EV 1.86; 30use EV;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 4.32 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
18use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
23use Coro::BDB; 49use Coro::BDB 1.6;
24use Coro::Storable; 50use Coro::Storable;
25use Coro::Util (); 51use Coro::Util ();
26 52
27use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
28use BDB (); 54use BDB ();
29use Data::Dumper; 55use Data::Dumper;
30use Digest::MD5;
31use Fcntl; 56use Fcntl;
32use YAML::Syck (); 57use YAML::XS ();
33use IO::AIO 2.51 (); 58use IO::AIO ();
34use Time::HiRes; 59use Time::HiRes;
35use Compress::LZF; 60use Compress::LZF;
36use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
37 64
38# configure various modules to our taste 65# configure various modules to our taste
39# 66#
40$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
43 75
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 76# strictly for debugging
45$YAML::Syck::ImplicitUnicode = 1; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 78
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
50 82
51our %COMMAND = (); 83our %COMMAND = ();
52our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
53 85
54our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
55our %EXTCMD = (); 87our %EXTCMD = ();
56our %EXTICMD = (); 88our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
59 91
60our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
62 96
63our $CONFDIR = confdir; 97our $CONFDIR = confdir;
64our $DATADIR = datadir; 98our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
74our %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;
75 118
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 121our $NEXT_TICK;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
82 123
83our $BDB_POLL_WATCHER;
84our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 127our $DB_ENV;
88 128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
130
89our %CFG; 131our %CFG;
90 132
91our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
92our $RUNTIME; 134our $RUNTIME;
93our $NOW; 135our $NOW;
99# used to convert map paths into valid unix filenames by replacing / by ∕ 141# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 142our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 143
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
146our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
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 :)
105 153
106binmode STDOUT; 154binmode STDOUT;
107binmode STDERR; 155binmode STDERR;
108 156
109# read virtual server time, if available 157# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
114} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
115 165
116mkdir $_ 166mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 168
119our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
120 170
121sub 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::"} };
122 187
123############################################################################# 188#############################################################################
124 189
125=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
126 191
168from wherever your confdir points to. 233from wherever your confdir points to.
169 234
170=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
171 236
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
173returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one thread
174per 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.
175 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
176=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
177 247
178This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call. 250that call.
181 251
252=item %cf::REFLECT
253
254Contains, for each (C++) class name, a hash reference with information
255about object members (methods, scalars, arrays and flags) and other
256metadata, which is useful for introspection.
257
182=back 258=back
183 259
184=cut 260=cut
185 261
186BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
187 *CORE::GLOBAL::warn = sub { 263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
268$Coro::State::WARNHOOK = sub {
188 my $msg = join "", @_; 269 my $msg = join "", @_;
189 270
190 $msg .= "\n" 271 $msg .= "\n"
191 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
192 273
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 275
195 LOG llevError, $msg; 276 LOG llevWarn, $msg;
196 }; 277};
197}
198 278
199$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
280 return unless $^S eq 0; # "eq", not "=="
281
200 warn Carp::longmess $_[0]; 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
285 error "DIEHOOK called in main context, Coro bug?\n";#d#
286 return;#d#
287 }#d#
288
289 # kill coroutine otherwise
201 Coro::terminate; 290 Coro::terminate
202}; 291};
203 292
204@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
205@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
206@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
214for my $pkg (qw( 303for my $pkg (qw(
215 cf::global cf::attachable 304 cf::global cf::attachable
216 cf::object cf::object::player 305 cf::object cf::object::player
217 cf::client cf::player 306 cf::client cf::player
218 cf::arch cf::living 307 cf::arch cf::living
308 cf::map cf::mapspace
219 cf::map cf::party cf::region 309 cf::party cf::region
220)) { 310)) {
221 no strict 'refs';
222 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
223} 312}
224 313
225$EV::DIED = sub { 314$EV::DIED = sub {
226 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
227}; 316};
228 317
229############################################################################# 318#############################################################################
230 319
231=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
268our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
269 358
270sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
271sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
272 361
362=item cf::post_init { BLOCK }
363
364Execute the given codeblock, I<after> all extensions have been (re-)loaded,
365but I<before> the server starts ticking again.
366
367The cdoeblock will have a single boolean argument to indicate whether this
368is a reload or not.
369
370=cut
371
372sub post_init(&) {
373 push @POST_INIT, shift;
374}
375
273=item cf::lock_wait $string 376=item cf::lock_wait $string
274 377
275Wait until the given lock is available. See cf::lock_acquire. 378Wait until the given lock is available. See cf::lock_acquire.
276 379
277=item my $lock = cf::lock_acquire $string 380=item my $lock = cf::lock_acquire $string
278 381
279Wait until the given lock is available and then acquires it and returns 382Wait until the given lock is available and then acquires it and returns
280a Coro::guard object. If the guard object gets destroyed (goes out of scope, 383a L<Guard> object. If the guard object gets destroyed (goes out of scope,
281for example when the coroutine gets canceled), the lock is automatically 384for example when the coroutine gets canceled), the lock is automatically
282returned. 385returned.
283 386
284Locks are *not* recursive, locking from the same coro twice results in a 387Locks are *not* recursive, locking from the same coro twice results in a
285deadlocked coro. 388deadlocked coro.
291 394
292Return true if the lock is currently active, i.e. somebody has locked it. 395Return true if the lock is currently active, i.e. somebody has locked it.
293 396
294=cut 397=cut
295 398
296our %LOCK; 399our $LOCKS = new Coro::SemaphoreSet;
297our %LOCKER;#d#
298 400
299sub lock_wait($) { 401sub lock_wait($) {
300 my ($key) = @_; 402 $LOCKS->wait ($_[0]);
301
302 if ($LOCKER{$key} == $Coro::current) {#d#
303 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
304 return;#d#
305 }#d#
306
307 # wait for lock, if any
308 while ($LOCK{$key}) {
309 push @{ $LOCK{$key} }, $Coro::current;
310 Coro::schedule;
311 }
312} 403}
313 404
314sub lock_acquire($) { 405sub lock_acquire($) {
315 my ($key) = @_; 406 $LOCKS->guard ($_[0])
316
317 # wait, to be sure we are not locked
318 lock_wait $key;
319
320 $LOCK{$key} = [];
321 $LOCKER{$key} = $Coro::current;#d#
322
323 Coro::guard {
324 delete $LOCKER{$key};#d#
325 # wake up all waiters, to be on the safe side
326 $_->ready for @{ delete $LOCK{$key} };
327 }
328} 407}
329 408
330sub lock_active($) { 409sub lock_active($) {
331 my ($key) = @_; 410 $LOCKS->count ($_[0]) < 1
332
333 ! ! $LOCK{$key}
334} 411}
335 412
336sub freeze_mainloop { 413sub freeze_mainloop {
337 return unless $TICK_WATCHER->is_active; 414 tick_inhibit_inc;
338 415
339 my $guard = Coro::guard { 416 &Guard::guard (\&tick_inhibit_dec);
340 $TICK_WATCHER->start;
341 };
342 $TICK_WATCHER->stop;
343 $guard
344} 417}
345 418
346=item cf::periodic $interval, $cb 419=item cf::periodic $interval, $cb
347 420
348Like EV::periodic, but randomly selects a starting point so that the actions 421Like EV::periodic, but randomly selects a starting point so that the actions
349get spread over timer. 422get spread over time.
350 423
351=cut 424=cut
352 425
353sub periodic($$) { 426sub periodic($$) {
354 my ($interval, $cb) = @_; 427 my ($interval, $cb) = @_;
371 444
372=cut 445=cut
373 446
374our @SLOT_QUEUE; 447our @SLOT_QUEUE;
375our $SLOT_QUEUE; 448our $SLOT_QUEUE;
449our $SLOT_DECAY = 0.9;
376 450
377$SLOT_QUEUE->cancel if $SLOT_QUEUE; 451$SLOT_QUEUE->cancel if $SLOT_QUEUE;
378$SLOT_QUEUE = Coro::async { 452$SLOT_QUEUE = Coro::async {
379 $Coro::current->desc ("timeslot manager"); 453 $Coro::current->desc ("timeslot manager");
380 454
381 my $signal = new Coro::Signal; 455 my $signal = new Coro::Signal;
456 my $busy;
382 457
383 while () { 458 while () {
384 next_job: 459 next_job:
460
385 my $avail = cf::till_tick; 461 my $avail = cf::till_tick;
386 if ($avail > 0.01) { 462
387 for (0 .. $#SLOT_QUEUE) { 463 for (0 .. $#SLOT_QUEUE) {
388 if ($SLOT_QUEUE[$_][0] < $avail) { 464 if ($SLOT_QUEUE[$_][0] <= $avail) {
465 $busy = 0;
389 my $job = splice @SLOT_QUEUE, $_, 1, (); 466 my $job = splice @SLOT_QUEUE, $_, 1, ();
390 $job->[2]->send; 467 $job->[2]->send;
391 Coro::cede; 468 Coro::cede;
392 goto next_job; 469 goto next_job;
393 } 470 } else {
471 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
394 } 472 }
395 } 473 }
396 474
397 if (@SLOT_QUEUE) { 475 if (@SLOT_QUEUE) {
398 # we do not use wait_for_tick() as it returns immediately when tick is inactive 476 # we do not use wait_for_tick() as it returns immediately when tick is inactive
399 push @cf::WAIT_FOR_TICK, $signal; 477 push @cf::WAIT_FOR_TICK, $signal;
400 $signal->wait; 478 $signal->wait;
401 } else { 479 } else {
480 $busy = 0;
402 Coro::schedule; 481 Coro::schedule;
403 } 482 }
404 } 483 }
405}; 484};
406 485
407sub get_slot($;$$) { 486sub get_slot($;$$) {
487 return if tick_inhibit || $Coro::current == $Coro::main;
488
408 my ($time, $pri, $name) = @_; 489 my ($time, $pri, $name) = @_;
409 490
410 $time = $TICK * .6 if $time > $TICK * .6; 491 $time = clamp $time, 0.01, $TICK * .6;
492
411 my $sig = new Coro::Signal; 493 my $sig = new Coro::Signal;
412 494
413 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 495 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
414 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 496 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
415 $SLOT_QUEUE->ready; 497 $SLOT_QUEUE->ready;
441=cut 523=cut
442 524
443sub sync_job(&) { 525sub sync_job(&) {
444 my ($job) = @_; 526 my ($job) = @_;
445 527
446 if ($Coro::current == $Coro::main) { 528 if (in_main) {
447 my $time = EV::time; 529 my $time = AE::time;
448 530
449 # this is the main coro, too bad, we have to block 531 # this is the main coro, too bad, we have to block
450 # till the operation succeeds, freezing the server :/ 532 # till the operation succeeds, freezing the server :/
451 533
452 LOG llevError, Carp::longmess "sync job";#d# 534 #LOG llevError, Carp::longmess "sync job";#d#
453 535
454 # TODO: use suspend/resume instead
455 # (but this is cancel-safe)
456 my $freeze_guard = freeze_mainloop; 536 my $freeze_guard = freeze_mainloop;
457 537
458 my $busy = 1; 538 my $busy = 1;
459 my @res; 539 my @res;
460 540
461 (async { 541 (async {
462 $Coro::current->desc ("sync job coro"); 542 $Coro::current->desc ("sync job coro");
463 @res = eval { $job->() }; 543 @res = eval { $job->() };
464 warn $@ if $@; 544 error $@ if $@;
465 undef $busy; 545 undef $busy;
466 })->prio (Coro::PRIO_MAX); 546 })->prio (Coro::PRIO_MAX);
467 547
468 while ($busy) { 548 while ($busy) {
469 if (Coro::nready) { 549 if (Coro::nready) {
471 } else { 551 } else {
472 EV::loop EV::LOOP_ONESHOT; 552 EV::loop EV::LOOP_ONESHOT;
473 } 553 }
474 } 554 }
475 555
476 $time = EV::time - $time; 556 my $time = AE::time - $time;
477 557
478 LOG llevError | logBacktrace, Carp::longmess "long sync job"
479 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
480
481 $tick_start += $time; # do not account sync jobs to server load 558 $TICK_START += $time; # do not account sync jobs to server load
482 559
483 wantarray ? @res : $res[0] 560 wantarray ? @res : $res[0]
484 } else { 561 } else {
485 # we are in another coroutine, how wonderful, everything just works 562 # we are in another coroutine, how wonderful, everything just works
486 563
515Coro::Storable. May, of course, block. Note that the executed sub may 592Coro::Storable. May, of course, block. Note that the executed sub may
516never block itself or use any form of event handling. 593never block itself or use any form of event handling.
517 594
518=cut 595=cut
519 596
597sub post_fork {
598 reset_signals;
599}
600
520sub fork_call(&@) { 601sub fork_call(&@) {
521 my ($cb, @args) = @_; 602 my ($cb, @args) = @_;
522 603
523 # we seemingly have to make a local copy of the whole thing, 604 # we seemingly have to make a local copy of the whole thing,
524 # otherwise perl prematurely frees the stuff :/ 605 # otherwise perl prematurely frees the stuff :/
525 # TODO: investigate and fix (likely this will be rather laborious) 606 # TODO: investigate and fix (likely this will be rather laborious)
526 607
527 my @res = Coro::Util::fork_eval { 608 my @res = Coro::Util::fork_eval {
528 reset_signals; 609 cf::post_fork;
529 &$cb 610 &$cb
530 }, @args; 611 }, @args;
531 612
532 wantarray ? @res : $res[-1] 613 wantarray ? @res : $res[-1]
533} 614}
534 615
616sub objinfo {
617 (
618 "counter value" => cf::object::object_count,
619 "objects created" => cf::object::create_count,
620 "objects destroyed" => cf::object::destroy_count,
621 "freelist size" => cf::object::free_count,
622 "allocated objects" => cf::object::objects_size,
623 "active objects" => cf::object::actives_size,
624 )
625}
626
627=item $coin = coin_from_name $name
628
629=cut
630
631our %coin_alias = (
632 "silver" => "silvercoin",
633 "silvercoin" => "silvercoin",
634 "silvercoins" => "silvercoin",
635 "gold" => "goldcoin",
636 "goldcoin" => "goldcoin",
637 "goldcoins" => "goldcoin",
638 "platinum" => "platinacoin",
639 "platinumcoin" => "platinacoin",
640 "platinumcoins" => "platinacoin",
641 "platina" => "platinacoin",
642 "platinacoin" => "platinacoin",
643 "platinacoins" => "platinacoin",
644 "royalty" => "royalty",
645 "royalties" => "royalty",
646);
647
648sub coin_from_name($) {
649 $coin_alias{$_[0]}
650 ? cf::arch::find $coin_alias{$_[0]}
651 : undef
652}
653
535=item $value = cf::db_get $family => $key 654=item $value = cf::db_get $family => $key
536 655
537Returns a single value from the environment database. 656Returns a single value from the environment database.
538 657
539=item cf::db_put $family => $key => $value 658=item cf::db_put $family => $key => $value
547within each server. 666within each server.
548 667
549=cut 668=cut
550 669
551sub db_table($) { 670sub db_table($) {
671 cf::error "db_get called from main context"
672 if $Coro::current == $Coro::main;
673
552 my ($name) = @_; 674 my ($name) = @_;
553 my $db = BDB::db_create $DB_ENV; 675 my $db = BDB::db_create $DB_ENV;
554 676
555 eval { 677 eval {
556 $db->set_flags (BDB::CHKSUM); 678 $db->set_flags (BDB::CHKSUM);
566} 688}
567 689
568our $DB; 690our $DB;
569 691
570sub db_init { 692sub db_init {
571 cf::sync_job {
572 $DB ||= db_table "db"; 693 $DB ||= db_table "db";
573 };
574} 694}
575 695
576sub db_get($$) { 696sub db_get($$) {
577 my $key = "$_[0]/$_[1]"; 697 my $key = "$_[0]/$_[1]";
578 698
579 cf::sync_job { 699 cf::error "db_get called from main context"
700 if $Coro::current == $Coro::main;
701
580 BDB::db_get $DB, undef, $key, my $data; 702 BDB::db_get $DB, undef, $key, my $data;
581 703
582 $! ? () 704 $! ? ()
583 : $data 705 : $data
584 }
585} 706}
586 707
587sub db_put($$$) { 708sub db_put($$$) {
588 BDB::dbreq_pri 4; 709 BDB::dbreq_pri 4;
589 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 710 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
645 766
646 my $t1 = Time::HiRes::time; 767 my $t1 = Time::HiRes::time;
647 my $data = $process->(\@data); 768 my $data = $process->(\@data);
648 my $t2 = Time::HiRes::time; 769 my $t2 = Time::HiRes::time;
649 770
650 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 771 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
651 772
652 db_put cache => "$id/data", $data; 773 db_put cache => "$id/data", $data;
653 db_put cache => "$id/md5" , $md5; 774 db_put cache => "$id/md5" , $md5;
654 db_put cache => "$id/meta", $meta; 775 db_put cache => "$id/meta", $meta;
655 776
665 786
666=cut 787=cut
667 788
668sub datalog($@) { 789sub datalog($@) {
669 my ($type, %kv) = @_; 790 my ($type, %kv) = @_;
670 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 791 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
671} 792}
672 793
673=back 794=back
674 795
675=cut 796=cut
676 797
677############################################################################# 798#############################################################################
678 799
679=head2 ATTACHABLE OBJECTS 800=head2 ATTACHABLE OBJECTS
680 801
681Many objects in crossfire are so-called attachable objects. That means you can 802Many objects in deliantra are so-called attachable objects. That means you can
682attach callbacks/event handlers (a collection of which is called an "attachment") 803attach callbacks/event handlers (a collection of which is called an "attachment")
683to it. All such attachable objects support the following methods. 804to it. All such attachable objects support the following methods.
684 805
685In the following description, CLASS can be any of C<global>, C<object> 806In the following description, CLASS can be any of C<global>, C<object>
686C<player>, C<client> or C<map> (i.e. the attachable objects in 807C<player>, C<client> or C<map> (i.e. the attachable objects in
736=item cf::CLASS::attachment $name, ... 857=item cf::CLASS::attachment $name, ...
737 858
738Register an attachment by C<$name> through which attachable objects of the 859Register an attachment by C<$name> through which attachable objects of the
739given CLASS can refer to this attachment. 860given CLASS can refer to this attachment.
740 861
741Some classes such as crossfire maps and objects can specify attachments 862Some classes such as deliantra maps and objects can specify attachments
742that are attached at load/instantiate time, thus the need for a name. 863that are attached at load/instantiate time, thus the need for a name.
743 864
744These calls expect any number of the following handler/hook descriptions: 865These calls expect any number of the following handler/hook descriptions:
745 866
746=over 4 867=over 4
870 991
871 } elsif (exists $cb_id{$type}) { 992 } elsif (exists $cb_id{$type}) {
872 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 993 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
873 994
874 } elsif (ref $type) { 995 } elsif (ref $type) {
875 warn "attaching objects not supported, ignoring.\n"; 996 error "attaching objects not supported, ignoring.\n";
876 997
877 } else { 998 } else {
878 shift @arg; 999 shift @arg;
879 warn "attach argument '$type' not supported, ignoring.\n"; 1000 error "attach argument '$type' not supported, ignoring.\n";
880 } 1001 }
881 } 1002 }
882} 1003}
883 1004
884sub _object_attach { 1005sub _object_attach {
894 _attach $registry, $klass, @attach; 1015 _attach $registry, $klass, @attach;
895 } 1016 }
896 1017
897 $obj->{$name} = \%arg; 1018 $obj->{$name} = \%arg;
898 } else { 1019 } else {
899 warn "object uses attachment '$name' which is not available, postponing.\n"; 1020 info "object uses attachment '$name' which is not available, postponing.\n";
900 } 1021 }
901 1022
902 $obj->{_attachment}{$name} = undef; 1023 $obj->{_attachment}{$name} = undef;
903} 1024}
904 1025
963 1084
964 for (@$callbacks) { 1085 for (@$callbacks) {
965 eval { &{$_->[1]} }; 1086 eval { &{$_->[1]} };
966 1087
967 if ($@) { 1088 if ($@) {
968 warn "$@";
969 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1089 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
970 override; 1090 override;
971 } 1091 }
972 1092
973 return 1 if $override; 1093 return 1 if $override;
974 } 1094 }
1037 1157
1038sub reattach { 1158sub reattach {
1039 # basically do the same as instantiate, without calling instantiate 1159 # basically do the same as instantiate, without calling instantiate
1040 my ($obj) = @_; 1160 my ($obj) = @_;
1041 1161
1162 # no longer needed after getting rid of delete_package?
1042 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1163 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1043 1164
1044 my $registry = $obj->registry; 1165 my $registry = $obj->registry;
1045 1166
1046 @$registry = (); 1167 @$registry = ();
1047 1168
1052 for (@$attach) { 1173 for (@$attach) {
1053 my ($klass, @attach) = @$_; 1174 my ($klass, @attach) = @$_;
1054 _attach $registry, $klass, @attach; 1175 _attach $registry, $klass, @attach;
1055 } 1176 }
1056 } else { 1177 } else {
1057 warn "object uses attachment '$name' that is not available, postponing.\n"; 1178 info "object uses attachment '$name' that is not available, postponing.\n";
1058 } 1179 }
1059 } 1180 }
1060} 1181}
1061 1182
1062cf::attachable->attach ( 1183cf::attachable->attach (
1089 my ($filename, $rdata, $objs) = @_; 1210 my ($filename, $rdata, $objs) = @_;
1090 1211
1091 sync_job { 1212 sync_job {
1092 if (length $$rdata) { 1213 if (length $$rdata) {
1093 utf8::decode (my $decname = $filename); 1214 utf8::decode (my $decname = $filename);
1094 warn sprintf "saving %s (%d,%d)\n", 1215 trace sprintf "saving %s (%d,%d)\n",
1095 $decname, length $$rdata, scalar @$objs; 1216 $decname, length $$rdata, scalar @$objs
1217 if $VERBOSE_IO;
1096 1218
1097 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1219 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1098 chmod SAVE_MODE, $fh; 1220 aio_chmod $fh, SAVE_MODE;
1099 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1221 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1100 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 }
1101 close $fh; 1226 aio_close $fh;
1102 1227
1103 if (@$objs) { 1228 if (@$objs) {
1104 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1229 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1105 chmod SAVE_MODE, $fh; 1230 aio_chmod $fh, SAVE_MODE;
1106 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1231 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1107 aio_write $fh, 0, (length $data), $data, 0; 1232 aio_write $fh, 0, (length $data), $data, 0;
1108 aio_fsync $fh if $cf::USE_FSYNC; 1233 if ($cf::USE_FSYNC) {
1234 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;
1235 aio_fsync $fh;
1236 }
1109 close $fh; 1237 aio_close $fh;
1110 aio_rename "$filename.pst~", "$filename.pst"; 1238 aio_rename "$filename.pst~", "$filename.pst";
1111 } 1239 }
1112 } else { 1240 } else {
1113 aio_unlink "$filename.pst"; 1241 aio_unlink "$filename.pst";
1114 } 1242 }
1115 1243
1116 aio_rename "$filename~", $filename; 1244 aio_rename "$filename~", $filename;
1245
1246 $filename =~ s%/[^/]+$%%;
1247 aio_pathsync $filename if $cf::USE_FSYNC;
1117 } else { 1248 } else {
1118 warn "FATAL: $filename~: $!\n"; 1249 error "unable to save objects: $filename~: $!\n";
1119 } 1250 }
1120 } else { 1251 } else {
1121 aio_unlink $filename; 1252 aio_unlink $filename;
1122 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1123 } 1254 }
1147 my $st = eval { Coro::Storable::thaw $av }; 1278 my $st = eval { Coro::Storable::thaw $av };
1148 $av = $st->{objs}; 1279 $av = $st->{objs};
1149 } 1280 }
1150 1281
1151 utf8::decode (my $decname = $filename); 1282 utf8::decode (my $decname = $filename);
1152 warn sprintf "loading %s (%d,%d)\n", 1283 trace sprintf "loading %s (%d,%d)\n",
1153 $decname, length $data, scalar @{$av || []}; 1284 $decname, length $data, scalar @{$av || []}
1285 if $VERBOSE_IO;
1154 1286
1155 ($data, $av) 1287 ($data, $av)
1156} 1288}
1157 1289
1158=head2 COMMAND CALLBACKS 1290=head2 COMMAND CALLBACKS
1214 my ($name, $cb) = @_; 1346 my ($name, $cb) = @_;
1215 1347
1216 $EXTICMD{$name} = $cb; 1348 $EXTICMD{$name} = $cb;
1217} 1349}
1218 1350
1351use File::Glob ();
1352
1219cf::player->attach ( 1353cf::player->attach (
1220 on_command => sub { 1354 on_unknown_command => sub {
1221 my ($pl, $name, $params) = @_; 1355 my ($pl, $name, $params) = @_;
1222 1356
1223 my $cb = $COMMAND{$name} 1357 my $cb = $COMMAND{$name}
1224 or return; 1358 or return;
1225 1359
1248 1382
1249 $pl->ext_reply ($reply, @reply) 1383 $pl->ext_reply ($reply, @reply)
1250 if $reply; 1384 if $reply;
1251 1385
1252 } else { 1386 } else {
1253 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1387 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1254 } 1388 }
1255 1389
1256 cf::override; 1390 cf::override;
1257 }, 1391 },
1258); 1392);
1259 1393
1394# "readahead" all extensions
1395sub cache_extensions {
1396 my $grp = IO::AIO::aio_group;
1397
1398 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1399 for (grep /\.ext$/, @{$_[0]}) {
1400 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1401 }
1402 };
1403
1404 $grp
1405}
1406
1260sub load_extensions { 1407sub load_extensions {
1408 info "loading extensions...";
1409
1261 cf::sync_job { 1410 cf::sync_job {
1262 my %todo; 1411 my %todo;
1263 1412
1264 for my $path (<$LIBDIR/*.ext>) { 1413 for my $path (<$LIBDIR/*.ext>) {
1265 next unless -r $path; 1414 next unless -r $path;
1283 1432
1284 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1433 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1285 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1434 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1286 1435
1287 $ext{source} = 1436 $ext{source} =
1288 "package $pkg; use strict; use utf8;\n" 1437 "package $pkg; use common::sense;\n"
1289 . "#line 1 \"$path\"\n{\n" 1438 . "#line 1 \"$path\"\n{\n"
1290 . $source 1439 . $source
1291 . "\n};\n1"; 1440 . "\n};\n1";
1292 1441
1293 $todo{$base} = \%ext; 1442 $todo{$base} = \%ext;
1294 } 1443 }
1295 1444
1445 my $pass = 0;
1296 my %done; 1446 my %done;
1297 while (%todo) { 1447 while (%todo) {
1298 my $progress; 1448 my $progress;
1299 1449
1450 ++$pass;
1451
1452 ext:
1300 while (my ($k, $v) = each %todo) { 1453 while (my ($k, $v) = each %todo) {
1301 for (split /,\s*/, $v->{meta}{depends}) { 1454 for (split /,\s*/, $v->{meta}{depends}) {
1302 goto skip 1455 next ext
1303 unless exists $done{$_}; 1456 unless exists $done{$_};
1304 } 1457 }
1305 1458
1306 warn "... loading '$k' into '$v->{pkg}'\n"; 1459 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1307 1460
1308 unless (eval $v->{source}) { 1461 my $active = eval $v->{source};
1462
1463 if (length $@) {
1309 my $msg = $@ ? "$v->{path}: $@\n" 1464 error "$v->{path}: $@\n";
1310 : "$v->{base}: extension inactive.\n";
1311 1465
1466 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1312 if (exists $v->{meta}{mandatory}) { 1467 if exists $v->{meta}{mandatory};
1313 warn $msg; 1468
1314 warn "mandatory extension failed to load, exiting.\n"; 1469 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1315 exit 1; 1470 delete $todo{$k};
1316 } 1471 } else {
1317 1472 $done{$k} = delete $todo{$k};
1318 warn $msg; 1473 push @EXTS, $v->{pkg};
1474 $progress = 1;
1475
1476 info "$v->{base}: extension inactive.\n"
1477 unless $active;
1319 } 1478 }
1320
1321 $done{$k} = delete $todo{$k};
1322 push @EXTS, $v->{pkg};
1323 $progress = 1;
1324 } 1479 }
1325 1480
1326 skip: 1481 unless ($progress) {
1327 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1482 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1328 unless $progress; 1483
1484 while (my ($k, $v) = each %todo) {
1485 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1486 if exists $v->{meta}{mandatory};
1487 }
1488 }
1329 } 1489 }
1330 }; 1490 };
1331} 1491}
1332 1492
1333############################################################################# 1493#############################################################################
1334 1494
1335=back 1495=back
1336 1496
1337=head2 CORE EXTENSIONS 1497=head2 CORE EXTENSIONS
1338 1498
1339Functions and methods that extend core crossfire objects. 1499Functions and methods that extend core deliantra objects.
1340 1500
1341=cut 1501=cut
1342 1502
1343package cf::player; 1503package cf::player;
1344 1504
1387 1547
1388sub exists($) { 1548sub exists($) {
1389 my ($login) = @_; 1549 my ($login) = @_;
1390 1550
1391 $cf::PLAYER{$login} 1551 $cf::PLAYER{$login}
1392 or cf::sync_job { !aio_stat path $login } 1552 or !aio_stat path $login
1393} 1553}
1394 1554
1395sub find($) { 1555sub find($) {
1396 return $cf::PLAYER{$_[0]} || do { 1556 return $cf::PLAYER{$_[0]} || do {
1397 my $login = $_[0]; 1557 my $login = $_[0];
1409 my $f = new_from_file cf::object::thawer path $login 1569 my $f = new_from_file cf::object::thawer path $login
1410 or return; 1570 or return;
1411 1571
1412 my $pl = cf::player::load_pl $f 1572 my $pl = cf::player::load_pl $f
1413 or return; 1573 or return;
1574
1414 local $cf::PLAYER_LOADING{$login} = $pl; 1575 local $cf::PLAYER_LOADING{$login} = $pl;
1415 $f->resolve_delayed_derefs; 1576 $f->resolve_delayed_derefs;
1416 $cf::PLAYER{$login} = $pl 1577 $cf::PLAYER{$login} = $pl
1417 } 1578 }
1418 } 1579 }
1419} 1580}
1420 1581
1582cf::player->attach (
1583 on_load => sub {
1584 my ($pl, $path) = @_;
1585
1586 # restore slots saved in save, below
1587 my $slots = delete $pl->{_slots};
1588
1589 $pl->ob->current_weapon ($slots->[0]);
1590 $pl->combat_ob ($slots->[1]);
1591 $pl->ranged_ob ($slots->[2]);
1592 },
1593);
1594
1421sub save($) { 1595sub save($) {
1422 my ($pl) = @_; 1596 my ($pl) = @_;
1423 1597
1424 return if $pl->{deny_save}; 1598 return if $pl->{deny_save};
1425 1599
1428 1602
1429 return if $pl->{deny_save}; 1603 return if $pl->{deny_save};
1430 1604
1431 aio_mkdir playerdir $pl, 0770; 1605 aio_mkdir playerdir $pl, 0770;
1432 $pl->{last_save} = $cf::RUNTIME; 1606 $pl->{last_save} = $cf::RUNTIME;
1607
1608 cf::get_slot 0.01;
1609
1610 # save slots, to be restored later
1611 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1433 1612
1434 $pl->save_pl ($path); 1613 $pl->save_pl ($path);
1435 cf::cede_to_tick; 1614 cf::cede_to_tick;
1436} 1615}
1437 1616
1469 my ($pl) = @_; 1648 my ($pl) = @_;
1470 1649
1471 my $name = $pl->ob->name; 1650 my $name = $pl->ob->name;
1472 1651
1473 $pl->{deny_save} = 1; 1652 $pl->{deny_save} = 1;
1474 $pl->password ("*"); # this should lock out the player until we nuked the dir 1653 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1475 1654
1476 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1655 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1477 $pl->deactivate; 1656 $pl->deactivate;
1657
1658 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1659 ext::highscore::check ($pl->ob);
1660
1478 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1661 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1479 $pl->ns->destroy if $pl->ns; 1662 $pl->ns->destroy if $pl->ns;
1480 1663
1481 my $path = playerdir $pl; 1664 my $path = playerdir $pl;
1482 my $temp = "$path~$cf::RUNTIME~deleting~"; 1665 my $temp = "$path~$cf::RUNTIME~deleting~";
1521 1704
1522 for my $login (@$dirs) { 1705 for my $login (@$dirs) {
1523 my $path = path $login; 1706 my $path = path $login;
1524 1707
1525 # a .pst is a dead give-away for a valid player 1708 # a .pst is a dead give-away for a valid player
1526 unless (-e "$path.pst") { 1709 # if no pst file found, open and chekc for blocked users
1710 if (aio_stat "$path.pst") {
1527 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1711 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1528 aio_read $fh, 0, 512, my $buf, 0 or next; 1712 aio_read $fh, 0, 512, my $buf, 0 or next;
1529 $buf !~ /^password -------------$/m or next; # official not-valid tag 1713 $buf !~ /^password -------------$/m or next; # official not-valid tag
1530 } 1714 }
1531 1715
1535 1719
1536 \@logins 1720 \@logins
1537} 1721}
1538 1722
1539=item $player->maps 1723=item $player->maps
1724
1725=item cf::player::maps $login
1540 1726
1541Returns an arrayref of map paths that are private for this 1727Returns an arrayref of map paths that are private for this
1542player. May block. 1728player. May block.
1543 1729
1544=cut 1730=cut
1562 } 1748 }
1563 1749
1564 \@paths 1750 \@paths
1565} 1751}
1566 1752
1567=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1753=item $protocol_xml = $player->expand_cfpod ($cfpod)
1568 1754
1569Expand crossfire pod fragments into protocol xml. 1755Expand deliantra pod fragments into protocol xml.
1570
1571=cut
1572
1573use re 'eval';
1574
1575my $group;
1576my $interior; $interior = qr{
1577 # match a pod interior sequence sans C<< >>
1578 (?:
1579 \ (.*?)\ (?{ $group = $^N })
1580 | < (??{$interior}) >
1581 )
1582}x;
1583
1584sub expand_cfpod {
1585 my ($self, $pod) = @_;
1586
1587 my $xml;
1588
1589 while () {
1590 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1591 $group = $1;
1592
1593 $group =~ s/&/&amp;/g;
1594 $group =~ s/</&lt;/g;
1595
1596 $xml .= $group;
1597 } elsif ($pod =~ m%\G
1598 ([BCGHITU])
1599 <
1600 (?:
1601 ([^<>]*) (?{ $group = $^N })
1602 | < $interior >
1603 )
1604 >
1605 %gcsx
1606 ) {
1607 my ($code, $data) = ($1, $group);
1608
1609 if ($code eq "B") {
1610 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1611 } elsif ($code eq "I") {
1612 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1613 } elsif ($code eq "U") {
1614 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1615 } elsif ($code eq "C") {
1616 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1617 } elsif ($code eq "T") {
1618 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1619 } elsif ($code eq "G") {
1620 my ($male, $female) = split /\|/, $data;
1621 $data = $self->gender ? $female : $male;
1622 $xml .= expand_cfpod ($self, $data);
1623 } elsif ($code eq "H") {
1624 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1625 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1626 "")
1627 [$self->{hintmode}];
1628 } else {
1629 $xml .= "error processing '$code($data)' directive";
1630 }
1631 } else {
1632 if ($pod =~ /\G(.+)/) {
1633 warn "parse error while expanding $pod (at $1)";
1634 }
1635 last;
1636 }
1637 }
1638
1639 for ($xml) {
1640 # create single paragraphs (very hackish)
1641 s/(?<=\S)\n(?=\w)/ /g;
1642
1643 # compress some whitespace
1644 s/\s+\n/\n/g; # ws line-ends
1645 s/\n\n+/\n/g; # double lines
1646 s/^\n+//; # beginning lines
1647 s/\n+$//; # ending lines
1648 }
1649
1650 $xml
1651}
1652
1653no re 'eval';
1654
1655sub hintmode {
1656 $_[0]{hintmode} = $_[1] if @_ > 1;
1657 $_[0]{hintmode}
1658}
1659 1756
1660=item $player->ext_reply ($msgid, @msg) 1757=item $player->ext_reply ($msgid, @msg)
1661 1758
1662Sends an ext reply to the player. 1759Sends an ext reply to the player.
1663 1760
1695 1792
1696=cut 1793=cut
1697 1794
1698sub find_by_path($) { 1795sub find_by_path($) {
1699 my ($path) = @_; 1796 my ($path) = @_;
1797
1798 $path =~ s/^~[^\/]*//; # skip ~login
1700 1799
1701 my ($match, $specificity); 1800 my ($match, $specificity);
1702 1801
1703 for my $region (list) { 1802 for my $region (list) {
1704 if ($region->{match} && $path =~ $region->{match}) { 1803 if ($region->{match} && $path =~ $region->{match}) {
1730our $MAX_RESET = 3600; 1829our $MAX_RESET = 3600;
1731our $DEFAULT_RESET = 3000; 1830our $DEFAULT_RESET = 3000;
1732 1831
1733sub generate_random_map { 1832sub generate_random_map {
1734 my ($self, $rmp) = @_; 1833 my ($self, $rmp) = @_;
1834
1835 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1836
1735 # mit "rum" bekleckern, nicht 1837 # mit "rum" bekleckern, nicht
1736 $self->_create_random_map ( 1838 $self->_create_random_map (
1737 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1839 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1738 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1840 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1739 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1841 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1740 $rmp->{exit_on_final_map}, 1842 $rmp->{exit_on_final_map},
1741 $rmp->{xsize}, $rmp->{ysize}, 1843 $rmp->{xsize}, $rmp->{ysize},
1742 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1844 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1743 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1845 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1758 1860
1759sub register { 1861sub register {
1760 my (undef, $regex, $prio) = @_; 1862 my (undef, $regex, $prio) = @_;
1761 my $pkg = caller; 1863 my $pkg = caller;
1762 1864
1763 no strict;
1764 push @{"$pkg\::ISA"}, __PACKAGE__; 1865 push @{"$pkg\::ISA"}, __PACKAGE__;
1765 1866
1766 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1867 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1767} 1868}
1768 1869
1769# also paths starting with '/' 1870# also paths starting with '/'
1770$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1871$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1771 1872
1772sub thawer_merge { 1873sub thawer_merge {
1773 my ($self, $merge) = @_; 1874 my ($self, $merge) = @_;
1774 1875
1775 # we have to keep some variables in memory intact 1876 # we have to keep some variables in memory intact
1780} 1881}
1781 1882
1782sub normalise { 1883sub normalise {
1783 my ($path, $base) = @_; 1884 my ($path, $base) = @_;
1784 1885
1785 $path = "$path"; # make sure its a string 1886 $path = "$path"; # make sure it's a string
1786 1887
1787 $path =~ s/\.map$//; 1888 $path =~ s/\.map$//;
1788 1889
1789 # map plan: 1890 # map plan:
1790 # 1891 #
1829 $self->init; # pass $1 etc. 1930 $self->init; # pass $1 etc.
1830 return $self; 1931 return $self;
1831 } 1932 }
1832 } 1933 }
1833 1934
1834 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1935 Carp::cluck "unable to resolve path '$path' (base '$base')";
1835 () 1936 ()
1836} 1937}
1837 1938
1838sub init { 1939sub init {
1839 my ($self) = @_; 1940 my ($self) = @_;
1861 1962
1862# the temporary/swap location 1963# the temporary/swap location
1863sub save_path { 1964sub save_path {
1864 my ($self) = @_; 1965 my ($self) = @_;
1865 1966
1866 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1967 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1867 "$TMPDIR/$path.map" 1968 "$TMPDIR/$path.map"
1868} 1969}
1869 1970
1870# the unique path, undef == no special unique path 1971# the unique path, undef == no special unique path
1871sub uniq_path { 1972sub uniq_path {
1872 my ($self) = @_; 1973 my ($self) = @_;
1873 1974
1874 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1975 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1875 "$UNIQUEDIR/$path" 1976 "$UNIQUEDIR/$path"
1876}
1877
1878# and all this just because we cannot iterate over
1879# all maps in C++...
1880sub change_all_map_light {
1881 my ($change) = @_;
1882
1883 $_->change_map_light ($change)
1884 for grep $_->outdoor, values %cf::MAP;
1885} 1977}
1886 1978
1887sub decay_objects { 1979sub decay_objects {
1888 my ($self) = @_; 1980 my ($self) = @_;
1889 1981
1971 2063
1972sub find; 2064sub find;
1973sub find { 2065sub find {
1974 my ($path, $origin) = @_; 2066 my ($path, $origin) = @_;
1975 2067
2068 cf::cede_to_tick;
2069
1976 $path = normalise $path, $origin && $origin->path; 2070 $path = normalise $path, $origin && $origin->path;
1977 2071
1978 cf::lock_wait "map_data:$path";#d#remove 2072 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1979 cf::lock_wait "map_find:$path"; 2073 my $guard2 = cf::lock_acquire "map_find:$path";
1980 2074
1981 $cf::MAP{$path} || do { 2075 $cf::MAP{$path} || do {
1982 my $guard1 = cf::lock_acquire "map_find:$path";
1983 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1984
1985 my $map = new_from_path cf::map $path 2076 my $map = new_from_path cf::map $path
1986 or return; 2077 or return;
1987 2078
1988 $map->{last_save} = $cf::RUNTIME; 2079 $map->{last_save} = $cf::RUNTIME;
1989 2080
1991 or return; 2082 or return;
1992 2083
1993 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2084 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1994 # doing this can freeze the server in a sync job, obviously 2085 # doing this can freeze the server in a sync job, obviously
1995 #$cf::WAIT_FOR_TICK->wait; 2086 #$cf::WAIT_FOR_TICK->wait;
2087 undef $guard2;
1996 undef $guard1; 2088 undef $guard1;
1997 undef $guard2;
1998 $map->reset; 2089 $map->reset;
1999 return find $path; 2090 return find $path;
2000 } 2091 }
2001 2092
2002 $cf::MAP{$path} = $map 2093 $cf::MAP{$path} = $map
2003 } 2094 }
2004} 2095}
2005 2096
2006sub pre_load { } 2097sub pre_load { }
2007sub post_load { } 2098#sub post_load { } # XS
2008 2099
2009sub load { 2100sub load {
2010 my ($self) = @_; 2101 my ($self) = @_;
2011 2102
2012 local $self->{deny_reset} = 1; # loading can take a long time 2103 local $self->{deny_reset} = 1; # loading can take a long time
2029 my $f = new_from_file cf::object::thawer $self->{load_path}; 2120 my $f = new_from_file cf::object::thawer $self->{load_path};
2030 $f->skip_block; 2121 $f->skip_block;
2031 $self->_load_objects ($f) 2122 $self->_load_objects ($f)
2032 or return; 2123 or return;
2033 2124
2034 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2125 $self->post_load_original
2035 if delete $self->{load_original}; 2126 if delete $self->{load_original};
2036 2127
2037 if (my $uniq = $self->uniq_path) { 2128 if (my $uniq = $self->uniq_path) {
2038 utf8::encode $uniq; 2129 utf8::encode $uniq;
2039 unless (aio_stat $uniq) { 2130 unless (aio_stat $uniq) {
2057 unless ($self->{deny_activate}) { 2148 unless ($self->{deny_activate}) {
2058 $self->decay_objects; 2149 $self->decay_objects;
2059 $self->fix_auto_apply; 2150 $self->fix_auto_apply;
2060 $self->update_buttons; 2151 $self->update_buttons;
2061 cf::cede_to_tick; 2152 cf::cede_to_tick;
2062 $self->set_darkness_map;
2063 cf::cede_to_tick;
2064 $self->activate; 2153 $self->activate;
2065 } 2154 }
2066 2155
2067 $self->{last_save} = $cf::RUNTIME; 2156 $self->{last_save} = $cf::RUNTIME;
2068 $self->last_access ($cf::RUNTIME); 2157 $self->last_access ($cf::RUNTIME);
2069 2158
2070 $self->in_memory (cf::MAP_IN_MEMORY); 2159 $self->in_memory (cf::MAP_ACTIVE);
2071 } 2160 }
2072 2161
2073 $self->post_load; 2162 $self->post_load;
2074} 2163}
2075 2164
2165# customize the map for a given player, i.e.
2166# return the _real_ map. used by e.g. per-player
2167# maps to change the path to ~playername/mappath
2076sub customise_for { 2168sub customise_for {
2077 my ($self, $ob) = @_; 2169 my ($self, $ob) = @_;
2078 2170
2079 return find "~" . $ob->name . "/" . $self->{path} 2171 return find "~" . $ob->name . "/" . $self->{path}
2080 if $self->per_player; 2172 if $self->per_player;
2096 or next; 2188 or next;
2097 $neigh = find $neigh, $map 2189 $neigh = find $neigh, $map
2098 or next; 2190 or next;
2099 $neigh->load; 2191 $neigh->load;
2100 2192
2193 # now find the diagonal neighbours
2101 push @neigh, 2194 push @neigh,
2102 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2195 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2103 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2196 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2104 } 2197 }
2105 2198
2112} 2205}
2113 2206
2114sub find_sync { 2207sub find_sync {
2115 my ($path, $origin) = @_; 2208 my ($path, $origin) = @_;
2116 2209
2117 cf::sync_job { find $path, $origin } 2210 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2211 if $Coro::current == $Coro::main;
2212
2213 find $path, $origin
2118} 2214}
2119 2215
2120sub do_load_sync { 2216sub do_load_sync {
2121 my ($map) = @_; 2217 my ($map) = @_;
2122 2218
2123 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2219 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2124 if $Coro::current == $Coro::main; 2220 if $Coro::current == $Coro::main;
2125 2221
2126 cf::sync_job { $map->load }; 2222 $map->load;
2127} 2223}
2128 2224
2129our %MAP_PREFETCH; 2225our %MAP_PREFETCH;
2130our $MAP_PREFETCHER = undef; 2226our $MAP_PREFETCHER = undef;
2131 2227
2133 my ($path, $origin, $load) = @_; 2229 my ($path, $origin, $load) = @_;
2134 2230
2135 $path = normalise $path, $origin && $origin->{path}; 2231 $path = normalise $path, $origin && $origin->{path};
2136 2232
2137 if (my $map = $cf::MAP{$path}) { 2233 if (my $map = $cf::MAP{$path}) {
2138 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2234 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2139 } 2235 }
2140 2236
2141 $MAP_PREFETCH{$path} |= $load; 2237 $MAP_PREFETCH{$path} |= $load;
2142 2238
2143 $MAP_PREFETCHER ||= cf::async { 2239 $MAP_PREFETCHER ||= cf::async {
2157 $MAP_PREFETCHER->prio (6); 2253 $MAP_PREFETCHER->prio (6);
2158 2254
2159 () 2255 ()
2160} 2256}
2161 2257
2258# common code, used by both ->save and ->swapout
2162sub save { 2259sub _save {
2163 my ($self) = @_; 2260 my ($self) = @_;
2164
2165 my $lock = cf::lock_acquire "map_data:$self->{path}";
2166 2261
2167 $self->{last_save} = $cf::RUNTIME; 2262 $self->{last_save} = $cf::RUNTIME;
2168 2263
2169 return unless $self->dirty; 2264 return unless $self->dirty;
2170 2265
2179 2274
2180 cf::async { 2275 cf::async {
2181 $Coro::current->{desc} = "map player save"; 2276 $Coro::current->{desc} = "map player save";
2182 $_->contr->save for $self->players; 2277 $_->contr->save for $self->players;
2183 }; 2278 };
2279
2280 cf::get_slot 0.02;
2184 2281
2185 if ($uniq) { 2282 if ($uniq) {
2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2283 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2187 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2284 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2188 } else { 2285 } else {
2189 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2286 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2190 } 2287 }
2191} 2288}
2192 2289
2290sub save {
2291 my ($self) = @_;
2292
2293 my $lock = cf::lock_acquire "map_data:$self->{path}";
2294
2295 $self->_save;
2296}
2297
2193sub swap_out { 2298sub swap_out {
2194 my ($self) = @_; 2299 my ($self) = @_;
2195 2300
2196 # save first because save cedes
2197 $self->save;
2198
2199 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2301 my $lock = cf::lock_acquire "map_data:$self->{path}";
2200 2302
2303 return if $self->in_memory != cf::MAP_ACTIVE;
2304 return if $self->{deny_save};
2201 return if $self->players; 2305 return if $self->players;
2202 return if $self->in_memory != cf::MAP_IN_MEMORY;
2203 return if $self->{deny_save};
2204 2306
2307 # first deactivate the map and "unlink" it from the core
2308 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP;
2205 $self->in_memory (cf::MAP_SWAPPED); 2310 $self->in_memory (cf::MAP_SWAPPED);
2311
2312 # then atomically save
2313 $self->_save;
2314
2315 # then free the map
2316 $self->clear;
2317}
2318
2319sub reset_at {
2320 my ($self) = @_;
2321
2322 # TODO: safety, remove and allow resettable per-player maps
2323 return 1e99 if $self->{deny_reset};
2324
2325 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2326 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2327
2328 $time + $to
2329}
2330
2331sub should_reset {
2332 my ($self) = @_;
2333
2334 $self->reset_at <= $cf::RUNTIME
2335}
2336
2337sub reset {
2338 my ($self) = @_;
2339
2340 my $lock = cf::lock_acquire "map_data:$self->{path}";
2341
2342 return if $self->players;
2343
2344 cf::trace "resetting map ", $self->path, "\n";
2345
2346 $self->in_memory (cf::MAP_SWAPPED);
2347
2348 # need to save uniques path
2349 unless ($self->{deny_save}) {
2350 my $uniq = $self->uniq_path; utf8::encode $uniq;
2351
2352 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2353 if $uniq;
2354 }
2355
2356 delete $cf::MAP{$self->path};
2206 2357
2207 $self->deactivate; 2358 $self->deactivate;
2208 $_->clear_links_to ($self) for values %cf::MAP; 2359 $_->clear_links_to ($self) for values %cf::MAP;
2209 $self->clear; 2360 $self->clear;
2210}
2211
2212sub reset_at {
2213 my ($self) = @_;
2214
2215 # TODO: safety, remove and allow resettable per-player maps
2216 return 1e99 if $self->{deny_reset};
2217
2218 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2219 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2220
2221 $time + $to
2222}
2223
2224sub should_reset {
2225 my ($self) = @_;
2226
2227 $self->reset_at <= $cf::RUNTIME
2228}
2229
2230sub reset {
2231 my ($self) = @_;
2232
2233 my $lock = cf::lock_acquire "map_data:$self->{path}";
2234
2235 return if $self->players;
2236
2237 warn "resetting map ", $self->path;
2238
2239 $self->in_memory (cf::MAP_SWAPPED);
2240
2241 # need to save uniques path
2242 unless ($self->{deny_save}) {
2243 my $uniq = $self->uniq_path; utf8::encode $uniq;
2244
2245 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2246 if $uniq;
2247 }
2248
2249 delete $cf::MAP{$self->path};
2250
2251 $self->deactivate;
2252 $_->clear_links_to ($self) for values %cf::MAP;
2253 $self->clear;
2254 2361
2255 $self->unlink_save; 2362 $self->unlink_save;
2256 $self->destroy; 2363 $self->destroy;
2257} 2364}
2258 2365
2266 2373
2267 delete $cf::MAP{$self->path}; 2374 delete $cf::MAP{$self->path};
2268 2375
2269 $self->unlink_save; 2376 $self->unlink_save;
2270 2377
2271 bless $self, "cf::map"; 2378 bless $self, "cf::map::wrap";
2272 delete $self->{deny_reset}; 2379 delete $self->{deny_reset};
2273 $self->{deny_save} = 1; 2380 $self->{deny_save} = 1;
2274 $self->reset_timeout (1); 2381 $self->reset_timeout (1);
2275 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2382 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2276 2383
2325 2432
2326sub unique_maps() { 2433sub unique_maps() {
2327 [ 2434 [
2328 map { 2435 map {
2329 utf8::decode $_; 2436 utf8::decode $_;
2330 /\.map$/ 2437 s/\.map$//; # TODO future compatibility hack
2438 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2439 ? ()
2331 ? normalise $_ 2440 : normalise $_
2332 : ()
2333 } @{ aio_readdir $UNIQUEDIR or [] } 2441 } @{ aio_readdir $UNIQUEDIR or [] }
2334 ] 2442 ]
2335} 2443}
2336 2444
2337package cf; 2445=item cf::map::static_maps
2446
2447Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2448file in the shared directory excluding F</styles> and F</editor>). May
2449block.
2450
2451=cut
2452
2453sub static_maps() {
2454 my @dirs = "";
2455 my @maps;
2456
2457 while (@dirs) {
2458 my $dir = shift @dirs;
2459
2460 next if $dir eq "/styles" || $dir eq "/editor";
2461
2462 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2463 or return;
2464
2465 for (@$files) {
2466 s/\.map$// or next;
2467 utf8::decode $_;
2468 push @maps, "$dir/$_";
2469 }
2470
2471 push @dirs, map "$dir/$_", @$dirs;
2472 }
2473
2474 \@maps
2475}
2338 2476
2339=back 2477=back
2340 2478
2341=head3 cf::object 2479=head3 cf::object
2342 2480
2346 2484
2347=over 4 2485=over 4
2348 2486
2349=item $ob->inv_recursive 2487=item $ob->inv_recursive
2350 2488
2351Returns the inventory of the object _and_ their inventories, recursively. 2489Returns the inventory of the object I<and> their inventories, recursively,
2490but I<not> the object itself.
2352 2491
2353=cut 2492=cut
2354 2493
2355sub inv_recursive_; 2494sub inv_recursive_;
2356sub inv_recursive_ { 2495sub inv_recursive_ {
2361 inv_recursive_ inv $_[0] 2500 inv_recursive_ inv $_[0]
2362} 2501}
2363 2502
2364=item $ref = $ob->ref 2503=item $ref = $ob->ref
2365 2504
2366creates and returns a persistent reference to an objetc that can be stored as a string. 2505Creates and returns a persistent reference to an object that can be stored as a string.
2367 2506
2368=item $ob = cf::object::deref ($refstring) 2507=item $ob = cf::object::deref ($refstring)
2369 2508
2370returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2509returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2371even if the object actually exists. May block. 2510even if the object actually exists. May block.
2403can be C<undef>. Does the right thing when the player is currently in a 2542can be C<undef>. Does the right thing when the player is currently in a
2404dialogue with the given NPC character. 2543dialogue with the given NPC character.
2405 2544
2406=cut 2545=cut
2407 2546
2547our $SAY_CHANNEL = {
2548 id => "say",
2549 title => "Map",
2550 reply => "say ",
2551 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2552};
2553
2554our $CHAT_CHANNEL = {
2555 id => "chat",
2556 title => "Chat",
2557 reply => "chat ",
2558 tooltip => "Player chat and shouts, global to the server.",
2559};
2560
2408# rough implementation of a future "reply" method that works 2561# rough implementation of a future "reply" method that works
2409# with dialog boxes. 2562# with dialog boxes.
2410#TODO: the first argument must go, split into a $npc->reply_to ( method 2563#TODO: the first argument must go, split into a $npc->reply_to ( method
2411sub cf::object::player::reply($$$;$) { 2564sub cf::object::player::reply($$$;$) {
2412 my ($self, $npc, $msg, $flags) = @_; 2565 my ($self, $npc, $msg, $flags) = @_;
2423 my $dialog = $pl->{npc_dialog}; 2576 my $dialog = $pl->{npc_dialog};
2424 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2577 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2425 2578
2426 } else { 2579 } else {
2427 $msg = $npc->name . " says: $msg" if $npc; 2580 $msg = $npc->name . " says: $msg" if $npc;
2428 $self->message ($msg, $flags); 2581 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2429 } 2582 }
2430 } 2583 }
2431} 2584}
2432 2585
2433=item $object->send_msg ($channel, $msg, $color, [extra...]) 2586=item $object->send_msg ($channel, $msg, $color, [extra...])
2458 2611
2459=item $player_object->enter_link 2612=item $player_object->enter_link
2460 2613
2461Freezes the player and moves him/her to a special map (C<{link}>). 2614Freezes the player and moves him/her to a special map (C<{link}>).
2462 2615
2463The player should be reasonably safe there for short amounts of time. You 2616The player should be reasonably safe there for short amounts of time (e.g.
2464I<MUST> call C<leave_link> as soon as possible, though. 2617for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2618though, as the player cannot control the character while it is on the link
2619map.
2465 2620
2466Will never block. 2621Will never block.
2467 2622
2468=item $player_object->leave_link ($map, $x, $y) 2623=item $player_object->leave_link ($map, $x, $y)
2469 2624
2489sub cf::object::player::enter_link { 2644sub cf::object::player::enter_link {
2490 my ($self) = @_; 2645 my ($self) = @_;
2491 2646
2492 $self->deactivate_recursive; 2647 $self->deactivate_recursive;
2493 2648
2649 ++$self->{_link_recursion};
2650
2494 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2651 return if UNIVERSAL::isa $self->map, "ext::map_link";
2495 2652
2496 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2653 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2497 if $self->map && $self->map->{path} ne "{link}"; 2654 if $self->map && $self->map->{path} ne "{link}";
2498 2655
2499 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2656 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2500} 2657}
2501 2658
2502sub cf::object::player::leave_link { 2659sub cf::object::player::leave_link {
2503 my ($self, $map, $x, $y) = @_; 2660 my ($self, $map, $x, $y) = @_;
2504 2661
2521 ($x, $y) = (-1, -1) 2678 ($x, $y) = (-1, -1)
2522 unless (defined $x) && (defined $y); 2679 unless (defined $x) && (defined $y);
2523 2680
2524 # use -1 or undef as default coordinates, not 0, 0 2681 # use -1 or undef as default coordinates, not 0, 0
2525 ($x, $y) = ($map->enter_x, $map->enter_y) 2682 ($x, $y) = ($map->enter_x, $map->enter_y)
2526 if $x <=0 && $y <= 0; 2683 if $x <= 0 && $y <= 0;
2527 2684
2528 $map->load; 2685 $map->load;
2529 $map->load_neighbours; 2686 $map->load_neighbours;
2530 2687
2531 return unless $self->contr->active; 2688 return unless $self->contr->active;
2532 $self->activate_recursive;
2533 2689
2534 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2690 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2535 $self->enter_map ($map, $x, $y); 2691 if ($self->enter_map ($map, $x, $y)) {
2536} 2692 # entering was successful
2693 delete $self->{_link_recursion};
2694 # only activate afterwards, to support waiting in hooks
2695 $self->activate_recursive;
2696 }
2537 2697
2698}
2699
2538=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2700=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2539 2701
2540Moves the player to the given map-path and coordinates by first freezing 2702Moves the player to the given map-path and coordinates by first freezing
2541her, loading and preparing them map, calling the provided $check callback 2703her, loading and preparing them map, calling the provided $check callback
2542that has to return the map if sucecssful, and then unfreezes the player on 2704that has to return the map if sucecssful, and then unfreezes the player on
2543the new (success) or old (failed) map position. In either case, $done will 2705the new (success) or old (failed) map position. In either case, $done will
2544be called at the end of this process. 2706be called at the end of this process.
2545 2707
2708Note that $check will be called with a potentially non-loaded map, so if
2709it needs a loaded map it has to call C<< ->load >>.
2710
2546=cut 2711=cut
2547 2712
2548our $GOTOGEN; 2713our $GOTOGEN;
2549 2714
2550sub cf::object::player::goto { 2715sub cf::object::player::goto {
2551 my ($self, $path, $x, $y, $check, $done) = @_; 2716 my ($self, $path, $x, $y, $check, $done) = @_;
2717
2718 if ($self->{_link_recursion} >= $MAX_LINKS) {
2719 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2720 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2721 ($path, $x, $y) = @$EMERGENCY_POSITION;
2722 }
2552 2723
2553 # do generation counting so two concurrent goto's will be executed in-order 2724 # do generation counting so two concurrent goto's will be executed in-order
2554 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2725 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2555 2726
2556 $self->enter_link; 2727 $self->enter_link;
2580 my $map = eval { 2751 my $map = eval {
2581 my $map = defined $path ? cf::map::find $path : undef; 2752 my $map = defined $path ? cf::map::find $path : undef;
2582 2753
2583 if ($map) { 2754 if ($map) {
2584 $map = $map->customise_for ($self); 2755 $map = $map->customise_for ($self);
2585 $map = $check->($map) if $check && $map; 2756 $map = $check->($map, $x, $y, $self) if $check && $map;
2586 } else { 2757 } else {
2587 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2758 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2588 } 2759 }
2589 2760
2590 $map 2761 $map
2598 if ($gen == $self->{_goto_generation}) { 2769 if ($gen == $self->{_goto_generation}) {
2599 delete $self->{_goto_generation}; 2770 delete $self->{_goto_generation};
2600 $self->leave_link ($map, $x, $y); 2771 $self->leave_link ($map, $x, $y);
2601 } 2772 }
2602 2773
2603 $done->() if $done; 2774 $done->($self) if $done;
2604 })->prio (1); 2775 })->prio (1);
2605} 2776}
2606 2777
2607=item $player_object->enter_exit ($exit_object) 2778=item $player_object->enter_exit ($exit_object)
2608 2779
2628} 2799}
2629 2800
2630sub prepare_random_map { 2801sub prepare_random_map {
2631 my ($exit) = @_; 2802 my ($exit) = @_;
2632 2803
2633 my $guard = cf::lock_acquire "exit_prepare:$exit";
2634
2635 # all this does is basically replace the /! path by 2804 # all this does is basically replace the /! path by
2636 # a new random map path (?random/...) with a seed 2805 # a new random map path (?random/...) with a seed
2637 # that depends on the exit object 2806 # that depends on the exit object
2638 2807
2639 my $rmp = parse_random_map_params $exit->msg; 2808 my $rmp = parse_random_map_params $exit->msg;
2641 if ($exit->map) { 2810 if ($exit->map) {
2642 $rmp->{region} = $exit->region->name; 2811 $rmp->{region} = $exit->region->name;
2643 $rmp->{origin_map} = $exit->map->path; 2812 $rmp->{origin_map} = $exit->map->path;
2644 $rmp->{origin_x} = $exit->x; 2813 $rmp->{origin_x} = $exit->x;
2645 $rmp->{origin_y} = $exit->y; 2814 $rmp->{origin_y} = $exit->y;
2815
2816 $exit->map->touch;
2646 } 2817 }
2647 2818
2648 $rmp->{random_seed} ||= $exit->random_seed; 2819 $rmp->{random_seed} ||= $exit->random_seed;
2649 2820
2650 my $data = cf::encode_json $rmp; 2821 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2651 my $md5 = Digest::MD5::md5_hex $data; 2822 my $md5 = Digest::MD5::md5_hex $data;
2652 my $meta = "$RANDOMDIR/$md5.meta"; 2823 my $meta = "$RANDOMDIR/$md5.meta";
2653 2824
2654 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2825 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2655 aio_write $fh, 0, (length $data), $data, 0; 2826 aio_write $fh, 0, (length $data), $data, 0;
2656 undef $fh; 2827 undef $fh;
2657 aio_rename "$meta~", $meta; 2828 aio_rename "$meta~", $meta;
2658 2829
2830 my $slaying = "?random/$md5";
2831
2832 if ($exit->valid) {
2659 $exit->slaying ("?random/$md5"); 2833 $exit->slaying ("?random/$md5");
2660 $exit->msg (undef); 2834 $exit->msg (undef);
2835 }
2661 } 2836 }
2662} 2837}
2663 2838
2664sub cf::object::player::enter_exit { 2839sub cf::object::player::enter_exit {
2665 my ($self, $exit) = @_; 2840 my ($self, $exit) = @_;
2666 2841
2667 return unless $self->type == cf::PLAYER; 2842 return unless $self->type == cf::PLAYER;
2668 2843
2669 if ($exit->slaying eq "/!") {
2670 #TODO: this should de-fi-ni-te-ly not be a sync-job
2671 # the problem is that $exit might not survive long enough
2672 # so it needs to be done right now, right here
2673 cf::sync_job { prepare_random_map $exit };
2674 }
2675
2676 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2677 my $hp = $exit->stats->hp;
2678 my $sp = $exit->stats->sp;
2679
2680 $self->enter_link; 2844 $self->enter_link;
2681 2845
2682 # if exit is damned, update players death & WoR home-position
2683 $self->contr->savebed ($slaying, $hp, $sp)
2684 if $exit->flag (FLAG_DAMNED);
2685
2686 (async { 2846 (async {
2687 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2847 $Coro::current->{desc} = "enter_exit";
2688 2848
2689 $self->deactivate_recursive; # just to be sure
2690 unless (eval { 2849 unless (eval {
2850 $self->deactivate_recursive; # just to be sure
2851
2852 # random map handling
2853 {
2854 my $guard = cf::lock_acquire "exit_prepare:$exit";
2855
2856 prepare_random_map $exit
2857 if $exit->slaying eq "/!";
2858 }
2859
2860 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2861 my $x = $exit->stats->hp;
2862 my $y = $exit->stats->sp;
2863
2691 $self->goto ($slaying, $hp, $sp); 2864 $self->goto ($map, $x, $y);
2692 2865
2866 # if exit is damned, update players death & WoR home-position
2867 $self->contr->savebed ($map, $x, $y)
2868 if $exit->flag (cf::FLAG_DAMNED);
2869
2693 1; 2870 1
2694 }) { 2871 }) {
2695 $self->message ("Something went wrong deep within the crossfire server. " 2872 $self->message ("Something went wrong deep within the deliantra server. "
2696 . "I'll try to bring you back to the map you were before. " 2873 . "I'll try to bring you back to the map you were before. "
2697 . "Please report this to the dungeon master!", 2874 . "Please report this to the dungeon master!",
2698 cf::NDI_UNIQUE | cf::NDI_RED); 2875 cf::NDI_UNIQUE | cf::NDI_RED);
2699 2876
2700 warn "ERROR in enter_exit: $@"; 2877 error "ERROR in enter_exit: $@";
2701 $self->leave_link; 2878 $self->leave_link;
2702 } 2879 }
2703 })->prio (1); 2880 })->prio (1);
2704} 2881}
2705 2882
2717sub cf::client::send_drawinfo { 2894sub cf::client::send_drawinfo {
2718 my ($self, $text, $flags) = @_; 2895 my ($self, $text, $flags) = @_;
2719 2896
2720 utf8::encode $text; 2897 utf8::encode $text;
2721 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2898 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2899}
2900
2901=item $client->send_big_packet ($pkt)
2902
2903Like C<send_packet>, but tries to compress large packets, and fragments
2904them as required.
2905
2906=cut
2907
2908our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2909
2910sub cf::client::send_big_packet {
2911 my ($self, $pkt) = @_;
2912
2913 # try lzf for large packets
2914 $pkt = "lzf " . Compress::LZF::compress $pkt
2915 if 1024 <= length $pkt and $self->{can_lzf};
2916
2917 # split very large packets
2918 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2919 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2920 $pkt = "frag";
2921 }
2922
2923 $self->send_packet ($pkt);
2722} 2924}
2723 2925
2724=item $client->send_msg ($channel, $msg, $color, [extra...]) 2926=item $client->send_msg ($channel, $msg, $color, [extra...])
2725 2927
2726Send a drawinfo or msg packet to the client, formatting the msg for the 2928Send a drawinfo or msg packet to the client, formatting the msg for the
2730 2932
2731=cut 2933=cut
2732 2934
2733# non-persistent channels (usually the info channel) 2935# non-persistent channels (usually the info channel)
2734our %CHANNEL = ( 2936our %CHANNEL = (
2937 "c/motd" => {
2938 id => "infobox",
2939 title => "MOTD",
2940 reply => undef,
2941 tooltip => "The message of the day",
2942 },
2735 "c/identify" => { 2943 "c/identify" => {
2736 id => "infobox", 2944 id => "infobox",
2737 title => "Identify", 2945 title => "Identify",
2738 reply => undef, 2946 reply => undef,
2739 tooltip => "Items recently identified", 2947 tooltip => "Items recently identified",
2741 "c/examine" => { 2949 "c/examine" => {
2742 id => "infobox", 2950 id => "infobox",
2743 title => "Examine", 2951 title => "Examine",
2744 reply => undef, 2952 reply => undef,
2745 tooltip => "Signs and other items you examined", 2953 tooltip => "Signs and other items you examined",
2954 },
2955 "c/shopinfo" => {
2956 id => "infobox",
2957 title => "Shop Info",
2958 reply => undef,
2959 tooltip => "What your bargaining skill tells you about the shop",
2746 }, 2960 },
2747 "c/book" => { 2961 "c/book" => {
2748 id => "infobox", 2962 id => "infobox",
2749 title => "Book", 2963 title => "Book",
2750 reply => undef, 2964 reply => undef,
2766 id => "infobox", 2980 id => "infobox",
2767 title => "Body Parts", 2981 title => "Body Parts",
2768 reply => undef, 2982 reply => undef,
2769 tooltip => "Shows which body parts you posess and are available", 2983 tooltip => "Shows which body parts you posess and are available",
2770 }, 2984 },
2985 "c/statistics" => {
2986 id => "infobox",
2987 title => "Statistics",
2988 reply => undef,
2989 tooltip => "Shows your primary statistics",
2990 },
2991 "c/skills" => {
2992 id => "infobox",
2993 title => "Skills",
2994 reply => undef,
2995 tooltip => "Shows your experience per skill and item power",
2996 },
2997 "c/shopitems" => {
2998 id => "infobox",
2999 title => "Shop Items",
3000 reply => undef,
3001 tooltip => "Shows the items currently for sale in this shop",
3002 },
3003 "c/resistances" => {
3004 id => "infobox",
3005 title => "Resistances",
3006 reply => undef,
3007 tooltip => "Shows your resistances",
3008 },
3009 "c/pets" => {
3010 id => "infobox",
3011 title => "Pets",
3012 reply => undef,
3013 tooltip => "Shows information abotu your pets/a specific pet",
3014 },
3015 "c/perceiveself" => {
3016 id => "infobox",
3017 title => "Perceive Self",
3018 reply => undef,
3019 tooltip => "You gained detailed knowledge about yourself",
3020 },
2771 "c/uptime" => { 3021 "c/uptime" => {
2772 id => "infobox", 3022 id => "infobox",
2773 title => "Uptime", 3023 title => "Uptime",
2774 reply => undef, 3024 reply => undef,
2775 tooltip => "How long the server has been running since last restart", 3025 tooltip => "How long the server has been running since last restart",
2778 id => "infobox", 3028 id => "infobox",
2779 title => "Map Info", 3029 title => "Map Info",
2780 reply => undef, 3030 reply => undef,
2781 tooltip => "Information related to the maps", 3031 tooltip => "Information related to the maps",
2782 }, 3032 },
3033 "c/party" => {
3034 id => "party",
3035 title => "Party",
3036 reply => "gsay ",
3037 tooltip => "Messages and chat related to your party",
3038 },
3039 "c/death" => {
3040 id => "death",
3041 title => "Death",
3042 reply => undef,
3043 tooltip => "Reason for and more info about your most recent death",
3044 },
3045 "c/say" => $SAY_CHANNEL,
3046 "c/chat" => $CHAT_CHANNEL,
2783); 3047);
2784 3048
2785sub cf::client::send_msg { 3049sub cf::client::send_msg {
2786 my ($self, $channel, $msg, $color, @extra) = @_; 3050 my ($self, $channel, $msg, $color, @extra) = @_;
2787 3051
2788 $msg = $self->pl->expand_cfpod ($msg); 3052 $msg = $self->pl->expand_cfpod ($msg)
3053 unless $color & cf::NDI_VERBATIM;
2789 3054
2790 $color &= cf::NDI_CLIENT_MASK; # just in case... 3055 $color &= cf::NDI_CLIENT_MASK; # just in case...
2791 3056
2792 # check predefined channels, for the benefit of C 3057 # check predefined channels, for the benefit of C
2793 if ($CHANNEL{$channel}) { 3058 if ($CHANNEL{$channel}) {
2794 $channel = $CHANNEL{$channel}; 3059 $channel = $CHANNEL{$channel};
2795 3060
2796 $self->ext_msg (channel_info => $channel) 3061 $self->ext_msg (channel_info => $channel);
2797 if $self->can_msg;
2798
2799 $channel = $channel->{id}; 3062 $channel = $channel->{id};
2800 3063
2801 } elsif (ref $channel) { 3064 } elsif (ref $channel) {
2802 # send meta info to client, if not yet sent 3065 # send meta info to client, if not yet sent
2803 unless (exists $self->{channel}{$channel->{id}}) { 3066 unless (exists $self->{channel}{$channel->{id}}) {
2804 $self->{channel}{$channel->{id}} = $channel; 3067 $self->{channel}{$channel->{id}} = $channel;
2805 $self->ext_msg (channel_info => $channel) 3068 $self->ext_msg (channel_info => $channel);
2806 if $self->can_msg;
2807 } 3069 }
2808 3070
2809 $channel = $channel->{id}; 3071 $channel = $channel->{id};
2810 } 3072 }
2811 3073
2812 return unless @extra || length $msg; 3074 return unless @extra || length $msg;
2813 3075
2814 if ($self->can_msg) {
2815 # default colour, mask it out 3076 # default colour, mask it out
2816 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3077 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2817 if $color & cf::NDI_DEF; 3078 if $color & cf::NDI_DEF;
2818 3079
2819 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3080 my $pkt = "msg "
3081 . $self->{json_coder}->encode (
2820 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3082 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2821 } else { 3083 );
2822 if ($color >= 0) {
2823 # replace some tags by gcfclient-compatible ones
2824 for ($msg) {
2825 1 while
2826 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2827 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2828 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2829 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2830 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2831 }
2832 3084
2833 $color &= cf::NDI_COLOR_MASK; 3085 $self->send_big_packet ($pkt);
2834
2835 utf8::encode $msg;
2836
2837 if (0 && $msg =~ /\[/) {
2838 # COMMAND/INFO
2839 $self->send_packet ("drawextinfo $color 10 8 $msg")
2840 } else {
2841 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2842 $self->send_packet ("drawinfo $color $msg")
2843 }
2844 }
2845 }
2846} 3086}
2847 3087
2848=item $client->ext_msg ($type, @msg) 3088=item $client->ext_msg ($type, @msg)
2849 3089
2850Sends an ext event to the client. 3090Sends an ext event to the client.
2853 3093
2854sub cf::client::ext_msg($$@) { 3094sub cf::client::ext_msg($$@) {
2855 my ($self, $type, @msg) = @_; 3095 my ($self, $type, @msg) = @_;
2856 3096
2857 if ($self->extcmd == 2) { 3097 if ($self->extcmd == 2) {
2858 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3098 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2859 } elsif ($self->extcmd == 1) { # TODO: remove 3099 } elsif ($self->extcmd == 1) { # TODO: remove
2860 push @msg, msgtype => "event_$type"; 3100 push @msg, msgtype => "event_$type";
2861 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2862 } 3102 }
2863} 3103}
2864 3104
2865=item $client->ext_reply ($msgid, @msg) 3105=item $client->ext_reply ($msgid, @msg)
2866 3106
2870 3110
2871sub cf::client::ext_reply($$@) { 3111sub cf::client::ext_reply($$@) {
2872 my ($self, $id, @msg) = @_; 3112 my ($self, $id, @msg) = @_;
2873 3113
2874 if ($self->extcmd == 2) { 3114 if ($self->extcmd == 2) {
2875 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2876 } elsif ($self->extcmd == 1) { 3116 } elsif ($self->extcmd == 1) {
2877 #TODO: version 1, remove 3117 #TODO: version 1, remove
2878 unshift @msg, msgtype => "reply", msgid => $id; 3118 unshift @msg, msgtype => "reply", msgid => $id;
2879 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3119 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2880 } 3120 }
2881} 3121}
2882 3122
2883=item $success = $client->query ($flags, "text", \&cb) 3123=item $success = $client->query ($flags, "text", \&cb)
2884 3124
2955 3195
2956 $ns->ext_reply ($reply, @reply) 3196 $ns->ext_reply ($reply, @reply)
2957 if $reply; 3197 if $reply;
2958 3198
2959 } else { 3199 } else {
2960 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3200 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2961 } 3201 }
2962 3202
2963 cf::override; 3203 cf::override;
2964 }, 3204 },
2965); 3205);
2985 3225
2986 $coro 3226 $coro
2987} 3227}
2988 3228
2989cf::client->attach ( 3229cf::client->attach (
2990 on_destroy => sub { 3230 on_client_destroy => sub {
2991 my ($ns) = @_; 3231 my ($ns) = @_;
2992 3232
2993 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3233 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2994 }, 3234 },
2995); 3235);
3011our $safe_hole = new Safe::Hole; 3251our $safe_hole = new Safe::Hole;
3012 3252
3013$SIG{FPE} = 'IGNORE'; 3253$SIG{FPE} = 'IGNORE';
3014 3254
3015$safe->permit_only (Opcode::opset qw( 3255$safe->permit_only (Opcode::opset qw(
3016 :base_core :base_mem :base_orig :base_math 3256 :base_core :base_mem :base_orig :base_math :base_loop
3017 grepstart grepwhile mapstart mapwhile 3257 grepstart grepwhile mapstart mapwhile
3018 sort time 3258 sort time
3019)); 3259));
3020 3260
3021# here we export the classes and methods available to script code 3261# here we export the classes and methods available to script code
3024 3264
3025The following functions and methods are available within a safe environment: 3265The following functions and methods are available within a safe environment:
3026 3266
3027 cf::object 3267 cf::object
3028 contr pay_amount pay_player map x y force_find force_add destroy 3268 contr pay_amount pay_player map x y force_find force_add destroy
3029 insert remove name archname title slaying race decrease_ob_nr 3269 insert remove name archname title slaying race decrease split
3270 value
3030 3271
3031 cf::object::player 3272 cf::object::player
3032 player 3273 player
3033 3274
3034 cf::player 3275 cf::player
3039 3280
3040=cut 3281=cut
3041 3282
3042for ( 3283for (
3043 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3284 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3044 insert remove inv name archname title slaying race 3285 insert remove inv nrof name archname title slaying race
3045 decrease_ob_nr destroy)], 3286 decrease split destroy change_exp value msg lore send_msg)],
3046 ["cf::object::player" => qw(player)], 3287 ["cf::object::player" => qw(player)],
3047 ["cf::player" => qw(peaceful)], 3288 ["cf::player" => qw(peaceful send_msg)],
3048 ["cf::map" => qw(trigger)], 3289 ["cf::map" => qw(trigger)],
3049) { 3290) {
3050 no strict 'refs';
3051 my ($pkg, @funs) = @$_; 3291 my ($pkg, @funs) = @$_;
3052 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3292 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3053 for @funs; 3293 for @funs;
3054} 3294}
3055 3295
3070 3310
3071 my $qcode = $code; 3311 my $qcode = $code;
3072 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3312 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3073 $qcode =~ s/\n/\\n/g; 3313 $qcode =~ s/\n/\\n/g;
3074 3314
3315 %vars = (_dummy => 0) unless %vars;
3316
3317 my @res;
3075 local $_; 3318 local $_;
3076 local @safe::cf::_safe_eval_args = values %vars;
3077 3319
3078 my $eval = 3320 my $eval =
3079 "do {\n" 3321 "do {\n"
3080 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3322 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3081 . "#line 0 \"{$qcode}\"\n" 3323 . "#line 0 \"{$qcode}\"\n"
3082 . $code 3324 . $code
3083 . "\n}" 3325 . "\n}"
3084 ; 3326 ;
3085 3327
3328 if ($CFG{safe_eval}) {
3086 sub_generation_inc; 3329 sub_generation_inc;
3330 local @safe::cf::_safe_eval_args = values %vars;
3087 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3331 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3088 sub_generation_inc; 3332 sub_generation_inc;
3333 } else {
3334 local @cf::_safe_eval_args = values %vars;
3335 @res = wantarray ? eval eval : scalar eval $eval;
3336 }
3089 3337
3090 if ($@) { 3338 if ($@) {
3091 warn "$@"; 3339 warn "$@",
3092 warn "while executing safe code '$code'\n"; 3340 "while executing safe code '$code'\n",
3093 warn "with arguments " . (join " ", %vars) . "\n"; 3341 "with arguments " . (join " ", %vars) . "\n";
3094 } 3342 }
3095 3343
3096 wantarray ? @res : $res[0] 3344 wantarray ? @res : $res[0]
3097} 3345}
3098 3346
3112=cut 3360=cut
3113 3361
3114sub register_script_function { 3362sub register_script_function {
3115 my ($fun, $cb) = @_; 3363 my ($fun, $cb) = @_;
3116 3364
3117 no strict 'refs'; 3365 $fun = "safe::$fun" if $CFG{safe_eval};
3118 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3366 *$fun = $safe_hole->wrap ($cb);
3119} 3367}
3120 3368
3121=back 3369=back
3122 3370
3123=cut 3371=cut
3132 # for this (global event?) 3380 # for this (global event?)
3133 %ext::player_env::MUSIC_FACE_CACHE = (); 3381 %ext::player_env::MUSIC_FACE_CACHE = ();
3134 3382
3135 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3383 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3136 3384
3137 warn "loading facedata from $path\n"; 3385 trace "loading facedata from $path\n";
3138 3386
3139 my $facedata;
3140 0 < aio_load $path, $facedata 3387 0 < aio_load $path, my $facedata
3141 or die "$path: $!"; 3388 or die "$path: $!";
3142 3389
3143 $facedata = Coro::Storable::thaw $facedata; 3390 $facedata = Coro::Storable::thaw $facedata;
3144 3391
3145 $facedata->{version} == 2 3392 $facedata->{version} == 2
3146 or cf::cleanup "$path: version mismatch, cannot proceed."; 3393 or cf::cleanup "$path: version mismatch, cannot proceed.";
3147 3394
3148 # patch in the exptable 3395 # patch in the exptable
3396 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3149 $facedata->{resource}{"res/exp_table"} = { 3397 $facedata->{resource}{"res/exp_table"} = {
3150 type => FT_RSRC, 3398 type => FT_RSRC,
3151 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3399 data => $exp_table,
3400 hash => (Digest::MD5::md5 $exp_table),
3152 }; 3401 };
3153 cf::cede_to_tick; 3402 cf::cede_to_tick;
3154 3403
3155 { 3404 {
3156 my $faces = $facedata->{faceinfo}; 3405 my $faces = $facedata->{faceinfo};
3158 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
3159 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3408 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3160 3409
3161 cf::face::set_visibility $idx, $info->{visibility}; 3410 cf::face::set_visibility $idx, $info->{visibility};
3162 cf::face::set_magicmap $idx, $info->{magicmap}; 3411 cf::face::set_magicmap $idx, $info->{magicmap};
3163 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3412 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3164 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3413 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3165 3414
3166 cf::cede_to_tick; 3415 cf::cede_to_tick;
3167 } 3416 }
3168 3417
3169 while (my ($face, $info) = each %$faces) { 3418 while (my ($face, $info) = each %$faces) {
3174 3423
3175 if (my $smooth = cf::face::find $info->{smooth}) { 3424 if (my $smooth = cf::face::find $info->{smooth}) {
3176 cf::face::set_smooth $idx, $smooth; 3425 cf::face::set_smooth $idx, $smooth;
3177 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3426 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3178 } else { 3427 } else {
3179 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3428 error "smooth face '$info->{smooth}' not found for face '$face'";
3180 } 3429 }
3181 3430
3182 cf::cede_to_tick; 3431 cf::cede_to_tick;
3183 } 3432 }
3184 } 3433 }
3193 3442
3194 cf::anim::invalidate_all; # d'oh 3443 cf::anim::invalidate_all; # d'oh
3195 } 3444 }
3196 3445
3197 { 3446 {
3198 # TODO: for gcfclient pleasure, we should give resources
3199 # that gcfclient doesn't grok a >10000 face index.
3200 my $res = $facedata->{resource}; 3447 my $res = $facedata->{resource};
3201 3448
3202 while (my ($name, $info) = each %$res) { 3449 while (my ($name, $info) = each %$res) {
3203 if (defined $info->{type}) { 3450 if (defined $info->{type}) {
3204 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3451 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3205 my $data;
3206 3452
3207 if ($info->{type} & 1) { 3453 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3208 # prepend meta info
3209
3210 my $meta = $enc->encode ({
3211 name => $name,
3212 %{ $info->{meta} || {} },
3213 });
3214
3215 $data = pack "(w/a*)*", $meta, $info->{data};
3216 } else {
3217 $data = $info->{data};
3218 }
3219
3220 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3221 cf::face::set_type $idx, $info->{type}; 3454 cf::face::set_type $idx, $info->{type};
3222 } else { 3455 } else {
3223 $RESOURCE{$name} = $info; 3456 $RESOURCE{$name} = $info; # unused
3224 } 3457 }
3225 3458
3226 cf::cede_to_tick; 3459 cf::cede_to_tick;
3227 } 3460 }
3228 } 3461 }
3229 3462
3230 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3463 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3231 3464
3232 1 3465 1
3233} 3466}
3234
3235cf::global->attach (on_resource_update => sub {
3236 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3237 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3238
3239 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3240 my $sound = $soundconf->{compat}[$_]
3241 or next;
3242
3243 my $face = cf::face::find "sound/$sound->[1]";
3244 cf::sound::set $sound->[0] => $face;
3245 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3246 }
3247
3248 while (my ($k, $v) = each %{$soundconf->{event}}) {
3249 my $face = cf::face::find "sound/$v";
3250 cf::sound::set $k => $face;
3251 }
3252 }
3253});
3254 3467
3255register_exticmd fx_want => sub { 3468register_exticmd fx_want => sub {
3256 my ($ns, $want) = @_; 3469 my ($ns, $want) = @_;
3257 3470
3258 while (my ($k, $v) = each %$want) { 3471 while (my ($k, $v) = each %$want) {
3259 $ns->fx_want ($k, $v); 3472 $ns->fx_want ($k, $v);
3260 } 3473 }
3261}; 3474};
3475
3476sub load_resource_file($) {
3477 my $guard = lock_acquire "load_resource_file";
3478
3479 my $status = load_resource_file_ $_[0];
3480 get_slot 0.1, 100;
3481 cf::arch::commit_load;
3482
3483 $status
3484}
3262 3485
3263sub reload_regions { 3486sub reload_regions {
3264 # HACK to clear player env face cache, we need some signal framework 3487 # HACK to clear player env face cache, we need some signal framework
3265 # for this (global event?) 3488 # for this (global event?)
3266 %ext::player_env::MUSIC_FACE_CACHE = (); 3489 %ext::player_env::MUSIC_FACE_CACHE = ();
3280} 3503}
3281 3504
3282sub reload_archetypes { 3505sub reload_archetypes {
3283 load_resource_file "$DATADIR/archetypes" 3506 load_resource_file "$DATADIR/archetypes"
3284 or die "unable to load archetypes\n"; 3507 or die "unable to load archetypes\n";
3285 #d# NEED to laod twice to resolve forward references
3286 # this really needs to be done in an extra post-pass
3287 # (which needs to be synchronous, so solve it differently)
3288 load_resource_file "$DATADIR/archetypes"
3289 or die "unable to load archetypes\n";
3290} 3508}
3291 3509
3292sub reload_treasures { 3510sub reload_treasures {
3293 load_resource_file "$DATADIR/treasures" 3511 load_resource_file "$DATADIR/treasures"
3294 or die "unable to load treasurelists\n"; 3512 or die "unable to load treasurelists\n";
3295} 3513}
3296 3514
3515sub reload_sound {
3516 trace "loading sound config from $DATADIR/sound\n";
3517
3518 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3519 or die "$DATADIR/sound $!";
3520
3521 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3522
3523 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3524 my $sound = $soundconf->{compat}[$_]
3525 or next;
3526
3527 my $face = cf::face::find "sound/$sound->[1]";
3528 cf::sound::set $sound->[0] => $face;
3529 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3530 }
3531
3532 while (my ($k, $v) = each %{$soundconf->{event}}) {
3533 my $face = cf::face::find "sound/$v";
3534 cf::sound::set $k => $face;
3535 }
3536}
3537
3297sub reload_resources { 3538sub reload_resources {
3298 warn "reloading resource files...\n"; 3539 trace "reloading resource files...\n";
3299 3540
3541 reload_exp_table;
3542 reload_materials;
3543 reload_facedata;
3544 reload_sound;
3545 reload_archetypes;
3300 reload_regions; 3546 reload_regions;
3301 reload_facedata;
3302 #reload_archetypes;#d#
3303 reload_archetypes;
3304 reload_treasures; 3547 reload_treasures;
3305 3548
3306 warn "finished reloading resource files\n"; 3549 trace "finished reloading resource files\n";
3307}
3308
3309sub init {
3310 reload_resources;
3311} 3550}
3312 3551
3313sub reload_config { 3552sub reload_config {
3314 open my $fh, "<:utf8", "$CONFDIR/config" 3553 trace "reloading config file...\n";
3315 or return;
3316 3554
3317 local $/; 3555 0 < aio_load "$CONFDIR/config", my $config
3556 or die "$CONFDIR/config: $!";
3557
3558 utf8::decode $config;
3559
3560 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3318 *CFG = YAML::Syck::Load <$fh>; 3561 *CFG = YAML::XS::Load $config;
3319 3562
3320 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3563 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3321 3564
3322 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3565 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3323 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3566 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3324 3567
3325 if (exists $CFG{mlockall}) { 3568 if (exists $CFG{mlockall}) {
3329 }; 3572 };
3330 warn $@ if $@; 3573 warn $@ if $@;
3331 } 3574 }
3332} 3575}
3333 3576
3577sub pidfile() {
3578 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3579 or die "$PIDFILE: $!";
3580 flock $fh, &Fcntl::LOCK_EX
3581 or die "$PIDFILE: flock: $!";
3582 $fh
3583}
3584
3585# make sure only one server instance is running at any one time
3586sub atomic {
3587 my $fh = pidfile;
3588
3589 my $pid = <$fh>;
3590 kill 9, $pid if $pid > 0;
3591
3592 seek $fh, 0, 0;
3593 print $fh $$;
3594}
3595
3596sub main_loop {
3597 trace "EV::loop starting\n";
3598 if (1) {
3599 EV::loop;
3600 }
3601 trace "EV::loop returned\n";
3602 goto &main_loop unless $REALLY_UNLOOP;
3603}
3604
3334sub main { 3605sub main {
3606 cf::init_globals; # initialise logging
3607
3608 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3609 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3610 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3611 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3612
3613 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3614
3335 # we must not ever block the main coroutine 3615 # we must not ever block the main coroutine
3336 local $Coro::idle = sub { 3616 local $Coro::idle = sub {
3337 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3617 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3338 (async { 3618 (async {
3339 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3619 $Coro::current->{desc} = "IDLE BUG HANDLER";
3340 EV::loop EV::LOOP_ONESHOT; 3620 EV::loop EV::LOOP_ONESHOT;
3341 })->prio (Coro::PRIO_MAX); 3621 })->prio (Coro::PRIO_MAX);
3342 }; 3622 };
3343 3623
3624 evthread_start IO::AIO::poll_fileno;
3625
3626 cf::sync_job {
3627 cf::incloader::init ();
3628
3629 cf::init_anim;
3630 cf::init_attackmess;
3631 cf::init_dynamic;
3632
3633 cf::load_settings;
3634
3635 reload_resources;
3344 reload_config; 3636 reload_config;
3345 db_init; 3637 db_init;
3638
3639 cf::init_uuid;
3640 cf::init_signals;
3641 cf::init_skills;
3642
3643 cf::init_beforeplay;
3644
3645 atomic;
3646
3346 load_extensions; 3647 load_extensions;
3347 3648
3348 $TICK_WATCHER->start; 3649 utime time, time, $RUNTIMEFILE;
3349 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3650
3350 EV::loop; 3651 # no (long-running) fork's whatsoever before this point(!)
3652 use POSIX ();
3653 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3654
3655 (pop @POST_INIT)->(0) while @POST_INIT;
3656 };
3657
3658 cf::object::thawer::errors_are_fatal 0;
3659 info "parse errors in files are no longer fatal from this point on.\n";
3660
3661 my $free_main; $free_main = EV::idle sub {
3662 undef $free_main;
3663 undef &main; # free gobs of memory :)
3664 };
3665
3666 goto &main_loop;
3351} 3667}
3352 3668
3353############################################################################# 3669#############################################################################
3354# initialisation and cleanup 3670# initialisation and cleanup
3355 3671
3356# install some emergency cleanup handlers 3672# install some emergency cleanup handlers
3357BEGIN { 3673BEGIN {
3358 our %SIGWATCHER = (); 3674 our %SIGWATCHER = ();
3359 for my $signal (qw(INT HUP TERM)) { 3675 for my $signal (qw(INT HUP TERM)) {
3360 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3676 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3361 cf::cleanup "SIG$signal"; 3677 cf::cleanup "SIG$signal";
3362 }; 3678 };
3363 } 3679 }
3364} 3680}
3365 3681
3366sub write_runtime { 3682sub write_runtime_sync {
3367 my $runtime = "$LOCALDIR/runtime"; 3683 my $t0 = AE::time;
3368 3684
3369 # first touch the runtime file to show we are still running: 3685 # first touch the runtime file to show we are still running:
3370 # the fsync below can take a very very long time. 3686 # the fsync below can take a very very long time.
3371 3687
3372 IO::AIO::aio_utime $runtime, undef, undef; 3688 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3373 3689
3374 my $guard = cf::lock_acquire "write_runtime"; 3690 my $guard = cf::lock_acquire "write_runtime";
3375 3691
3376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3692 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3377 or return; 3693 or return;
3378 3694
3379 my $value = $cf::RUNTIME + 90 + 10; 3695 my $value = $cf::RUNTIME + 90 + 10;
3380 # 10 is the runtime save interval, for a monotonic clock 3696 # 10 is the runtime save interval, for a monotonic clock
3381 # 60 allows for the watchdog to kill the server. 3697 # 60 allows for the watchdog to kill the server.
3391 aio_utime $fh, undef, undef; 3707 aio_utime $fh, undef, undef;
3392 3708
3393 close $fh 3709 close $fh
3394 or return; 3710 or return;
3395 3711
3396 aio_rename "$runtime~", $runtime 3712 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3397 and return; 3713 and return;
3398 3714
3399 warn "runtime file written.\n"; 3715 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3400 3716
3401 1 3717 1
3718}
3719
3720our $uuid_lock;
3721our $uuid_skip;
3722
3723sub write_uuid_sync($) {
3724 $uuid_skip ||= $_[0];
3725
3726 return if $uuid_lock;
3727 local $uuid_lock = 1;
3728
3729 my $uuid = "$LOCALDIR/uuid";
3730
3731 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3732 or return;
3733
3734 my $value = uuid_seq uuid_cur;
3735
3736 unless ($value) {
3737 info "cowardly refusing to write zero uuid value!\n";
3738 return;
3739 }
3740
3741 my $value = uuid_str $value + $uuid_skip;
3742 $uuid_skip = 0;
3743
3744 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3745 and return;
3746
3747 # always fsync - this file is important
3748 aio_fsync $fh
3749 and return;
3750
3751 close $fh
3752 or return;
3753
3754 aio_rename "$uuid~", $uuid
3755 and return;
3756
3757 trace "uuid file written ($value).\n";
3758
3759 1
3760
3761}
3762
3763sub write_uuid($$) {
3764 my ($skip, $sync) = @_;
3765
3766 $sync ? write_uuid_sync $skip
3767 : async { write_uuid_sync $skip };
3402} 3768}
3403 3769
3404sub emergency_save() { 3770sub emergency_save() {
3405 my $freeze_guard = cf::freeze_mainloop; 3771 my $freeze_guard = cf::freeze_mainloop;
3406 3772
3407 warn "enter emergency perl save\n"; 3773 info "emergency_perl_save: enter\n";
3774
3775 # this is a trade-off: we want to be very quick here, so
3776 # save all maps without fsync, and later call a global sync
3777 # (which in turn might be very very slow)
3778 local $USE_FSYNC = 0;
3408 3779
3409 cf::sync_job { 3780 cf::sync_job {
3781 cf::write_runtime_sync; # external watchdog should not bark
3782
3410 # use a peculiar iteration method to avoid tripping on perl 3783 # use a peculiar iteration method to avoid tripping on perl
3411 # refcount bugs in for. also avoids problems with players 3784 # refcount bugs in for. also avoids problems with players
3412 # and maps saved/destroyed asynchronously. 3785 # and maps saved/destroyed asynchronously.
3413 warn "begin emergency player save\n"; 3786 info "emergency_perl_save: begin player save\n";
3414 for my $login (keys %cf::PLAYER) { 3787 for my $login (keys %cf::PLAYER) {
3415 my $pl = $cf::PLAYER{$login} or next; 3788 my $pl = $cf::PLAYER{$login} or next;
3416 $pl->valid or next; 3789 $pl->valid or next;
3417 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3790 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3418 $pl->save; 3791 $pl->save;
3419 } 3792 }
3420 warn "end emergency player save\n"; 3793 info "emergency_perl_save: end player save\n";
3421 3794
3422 warn "begin emergency map save\n"; 3795 cf::write_runtime_sync; # external watchdog should not bark
3796
3797 info "emergency_perl_save: begin map save\n";
3423 for my $path (keys %cf::MAP) { 3798 for my $path (keys %cf::MAP) {
3424 my $map = $cf::MAP{$path} or next; 3799 my $map = $cf::MAP{$path} or next;
3425 $map->valid or next; 3800 $map->valid or next;
3426 $map->save; 3801 $map->save;
3427 } 3802 }
3428 warn "end emergency map save\n"; 3803 info "emergency_perl_save: end map save\n";
3429 3804
3430 warn "begin emergency database checkpoint\n"; 3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3807 info "emergency_perl_save: begin database checkpoint\n";
3431 BDB::db_env_txn_checkpoint $DB_ENV; 3808 BDB::db_env_txn_checkpoint $DB_ENV;
3432 warn "end emergency database checkpoint\n"; 3809 info "emergency_perl_save: end database checkpoint\n";
3810
3811 info "emergency_perl_save: begin write uuid\n";
3812 write_uuid_sync 1;
3813 info "emergency_perl_save: end write uuid\n";
3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3817 trace "emergency_perl_save: syncing database to disk";
3818 BDB::db_env_txn_checkpoint $DB_ENV;
3819
3820 info "emergency_perl_save: starting sync\n";
3821 IO::AIO::aio_sync sub {
3822 info "emergency_perl_save: finished sync\n";
3823 };
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: flushing outstanding aio requests";
3828 while (IO::AIO::nreqs || BDB::nreqs) {
3829 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3830 }
3831
3832 cf::write_runtime_sync; # external watchdog should not bark
3433 }; 3833 };
3434 3834
3435 warn "leave emergency perl save\n"; 3835 info "emergency_perl_save: leave\n";
3436} 3836}
3437 3837
3438sub post_cleanup { 3838sub post_cleanup {
3439 my ($make_core) = @_; 3839 my ($make_core) = @_;
3440 3840
3841 IO::AIO::flush;
3842
3441 warn Carp::longmess "post_cleanup backtrace" 3843 error Carp::longmess "post_cleanup backtrace"
3442 if $make_core; 3844 if $make_core;
3845
3846 my $fh = pidfile;
3847 unlink $PIDFILE if <$fh> == $$;
3848}
3849
3850# a safer delete_package, copied from Symbol
3851sub clear_package($) {
3852 my $pkg = shift;
3853
3854 # expand to full symbol table name if needed
3855 unless ($pkg =~ /^main::.*::$/) {
3856 $pkg = "main$pkg" if $pkg =~ /^::/;
3857 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3858 $pkg .= '::' unless $pkg =~ /::$/;
3859 }
3860
3861 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3862 my $stem_symtab = *{$stem}{HASH};
3863
3864 defined $stem_symtab and exists $stem_symtab->{$leaf}
3865 or return;
3866
3867 # clear all symbols
3868 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3869 for my $name (keys %$leaf_symtab) {
3870 _gv_clear *{"$pkg$name"};
3871# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3872 }
3443} 3873}
3444 3874
3445sub do_reload_perl() { 3875sub do_reload_perl() {
3446 # can/must only be called in main 3876 # can/must only be called in main
3447 if ($Coro::current != $Coro::main) { 3877 unless (in_main) {
3448 warn "can only reload from main coroutine"; 3878 error "can only reload from main coroutine";
3449 return; 3879 return;
3450 } 3880 }
3451 3881
3882 return if $RELOAD++;
3883
3884 my $t1 = AE::time;
3885
3886 while ($RELOAD) {
3887 cf::get_slot 0.1, -1, "reload_perl";
3452 warn "reloading..."; 3888 info "reloading...";
3453 3889
3454 warn "entering sync_job"; 3890 trace "entering sync_job";
3455 3891
3456 cf::sync_job { 3892 cf::sync_job {
3457 cf::write_runtime; # external watchdog should not bark
3458 cf::emergency_save; 3893 #cf::emergency_save;
3459 cf::write_runtime; # external watchdog should not bark
3460 3894
3461 warn "syncing database to disk";
3462 BDB::db_env_txn_checkpoint $DB_ENV;
3463
3464 # if anything goes wrong in here, we should simply crash as we already saved
3465
3466 warn "flushing outstanding aio requests";
3467 for (;;) {
3468 BDB::flush;
3469 IO::AIO::flush;
3470 Coro::cede_notself;
3471 last unless IO::AIO::nreqs || BDB::nreqs;
3472 warn "iterate...";
3473 }
3474
3475 ++$RELOAD;
3476
3477 warn "cancelling all extension coros"; 3895 trace "cancelling all extension coros";
3478 $_->cancel for values %EXT_CORO; 3896 $_->cancel for values %EXT_CORO;
3479 %EXT_CORO = (); 3897 %EXT_CORO = ();
3480 3898
3481 warn "removing commands"; 3899 trace "removing commands";
3482 %COMMAND = (); 3900 %COMMAND = ();
3483 3901
3484 warn "removing ext/exti commands"; 3902 trace "removing ext/exti commands";
3485 %EXTCMD = (); 3903 %EXTCMD = ();
3486 %EXTICMD = (); 3904 %EXTICMD = ();
3487 3905
3488 warn "unloading/nuking all extensions"; 3906 trace "unloading/nuking all extensions";
3489 for my $pkg (@EXTS) { 3907 for my $pkg (@EXTS) {
3490 warn "... unloading $pkg"; 3908 trace "... unloading $pkg";
3491 3909
3492 if (my $cb = $pkg->can ("unload")) { 3910 if (my $cb = $pkg->can ("unload")) {
3493 eval { 3911 eval {
3494 $cb->($pkg); 3912 $cb->($pkg);
3495 1 3913 1
3496 } or warn "$pkg unloaded, but with errors: $@"; 3914 } or error "$pkg unloaded, but with errors: $@";
3915 }
3916
3917 trace "... clearing $pkg";
3918 clear_package $pkg;
3497 } 3919 }
3498 3920
3499 warn "... nuking $pkg";
3500 Symbol::delete_package $pkg;
3501 }
3502
3503 warn "unloading all perl modules loaded from $LIBDIR"; 3921 trace "unloading all perl modules loaded from $LIBDIR";
3504 while (my ($k, $v) = each %INC) { 3922 while (my ($k, $v) = each %INC) {
3505 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3923 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3506 3924
3507 warn "... unloading $k"; 3925 trace "... unloading $k";
3508 delete $INC{$k}; 3926 delete $INC{$k};
3509 3927
3510 $k =~ s/\.pm$//; 3928 $k =~ s/\.pm$//;
3511 $k =~ s/\//::/g; 3929 $k =~ s/\//::/g;
3512 3930
3513 if (my $cb = $k->can ("unload_module")) { 3931 if (my $cb = $k->can ("unload_module")) {
3514 $cb->(); 3932 $cb->();
3933 }
3934
3935 clear_package $k;
3515 } 3936 }
3516 3937
3517 Symbol::delete_package $k;
3518 }
3519
3520 warn "getting rid of safe::, as good as possible"; 3938 trace "getting rid of safe::, as good as possible";
3521 Symbol::delete_package "safe::$_" 3939 clear_package "safe::$_"
3522 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3940 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3523 3941
3524 warn "unloading cf.pm \"a bit\""; 3942 trace "unloading cf.pm \"a bit\"";
3525 delete $INC{"cf.pm"}; 3943 delete $INC{"cf.pm"};
3526 delete $INC{"cf/pod.pm"}; 3944 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3527 3945
3528 # don't, removes xs symbols, too, 3946 # don't, removes xs symbols, too,
3529 # and global variables created in xs 3947 # and global variables created in xs
3530 #Symbol::delete_package __PACKAGE__; 3948 #clear_package __PACKAGE__;
3531 3949
3532 warn "unload completed, starting to reload now"; 3950 info "unload completed, starting to reload now";
3533 3951
3534 warn "reloading cf.pm"; 3952 trace "reloading cf.pm";
3535 require cf; 3953 require cf;
3536 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3954 cf::_connect_to_perl_1;
3537 3955
3538 warn "loading config and database again"; 3956 trace "loading config and database again";
3539 cf::reload_config; 3957 cf::reload_config;
3540 3958
3541 warn "loading extensions"; 3959 trace "loading extensions";
3542 cf::load_extensions; 3960 cf::load_extensions;
3543 3961
3962 if ($REATTACH_ON_RELOAD) {
3544 warn "reattaching attachments to objects/players"; 3963 trace "reattaching attachments to objects/players";
3545 _global_reattach; # objects, sockets 3964 _global_reattach; # objects, sockets
3546 warn "reattaching attachments to maps"; 3965 trace "reattaching attachments to maps";
3547 reattach $_ for values %MAP; 3966 reattach $_ for values %MAP;
3548 warn "reattaching attachments to players"; 3967 trace "reattaching attachments to players";
3549 reattach $_ for values %PLAYER; 3968 reattach $_ for values %PLAYER;
3969 }
3550 3970
3971 trace "running post_init jobs";
3972 (pop @POST_INIT)->(1) while @POST_INIT;
3973
3551 warn "leaving sync_job"; 3974 trace "leaving sync_job";
3552 3975
3553 1 3976 1
3554 } or do { 3977 } or do {
3555 warn $@; 3978 error $@;
3556 warn "error while reloading, exiting."; 3979 cf::cleanup "error while reloading, exiting.";
3557 exit 1; 3980 };
3981
3982 info "reloaded";
3983 --$RELOAD;
3558 }; 3984 }
3559 3985
3560 warn "reloaded"; 3986 $t1 = AE::time - $t1;
3987 info "reload completed in ${t1}s\n";
3561}; 3988};
3562 3989
3563our $RELOAD_WATCHER; # used only during reload 3990our $RELOAD_WATCHER; # used only during reload
3564 3991
3565sub reload_perl() { 3992sub reload_perl() {
3566 # doing reload synchronously and two reloads happen back-to-back, 3993 # doing reload synchronously and two reloads happen back-to-back,
3567 # coro crashes during coro_state_free->destroy here. 3994 # coro crashes during coro_state_free->destroy here.
3568 3995
3996 $RELOAD_WATCHER ||= cf::async {
3997 Coro::AIO::aio_wait cache_extensions;
3998
3569 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3999 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
4000 do_reload_perl;
3570 undef $RELOAD_WATCHER; 4001 undef $RELOAD_WATCHER;
3571 do_reload_perl; 4002 };
3572 }; 4003 };
3573} 4004}
3574 4005
3575register_command "reload" => sub { 4006register_command "reload" => sub {
3576 my ($who, $arg) = @_; 4007 my ($who, $arg) = @_;
3582 reload_perl; 4013 reload_perl;
3583 }; 4014 };
3584 } 4015 }
3585}; 4016};
3586 4017
3587unshift @INC, $LIBDIR; 4018#############################################################################
3588 4019
3589my $bug_warning = 0; 4020my $bug_warning = 0;
3590 4021
3591our @WAIT_FOR_TICK; 4022our @WAIT_FOR_TICK;
3592our @WAIT_FOR_TICK_BEGIN; 4023our @WAIT_FOR_TICK_BEGIN;
3593 4024
3594sub wait_for_tick { 4025sub wait_for_tick() {
3595 return unless $TICK_WATCHER->is_active;
3596 return if $Coro::current == $Coro::main; 4026 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3597 4027
3598 my $signal = new Coro::Signal; 4028 my $signal = new Coro::Signal;
3599 push @WAIT_FOR_TICK, $signal; 4029 push @WAIT_FOR_TICK, $signal;
3600 $signal->wait; 4030 $signal->wait;
3601} 4031}
3602 4032
3603sub wait_for_tick_begin { 4033sub wait_for_tick_begin() {
3604 return unless $TICK_WATCHER->is_active;
3605 return if $Coro::current == $Coro::main; 4034 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3606 4035
3607 my $signal = new Coro::Signal; 4036 my $signal = new Coro::Signal;
3608 push @WAIT_FOR_TICK_BEGIN, $signal; 4037 push @WAIT_FOR_TICK_BEGIN, $signal;
3609 $signal->wait; 4038 $signal->wait;
3610} 4039}
3611 4040
3612$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 4041sub tick {
3613 if ($Coro::current != $Coro::main) { 4042 if ($Coro::current != $Coro::main) {
3614 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4043 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3615 unless ++$bug_warning > 10; 4044 unless ++$bug_warning > 10;
3616 return; 4045 return;
3617 } 4046 }
3618 4047
3619 $NOW = $tick_start = EV::now;
3620
3621 cf::server_tick; # one server iteration 4048 cf::server_tick; # one server iteration
3622 4049
3623 $RUNTIME += $TICK; 4050 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3624 $NEXT_TICK = $_[0]->at;
3625 4051
3626 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4052 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3627 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4053 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3628 Coro::async_pool { 4054 Coro::async_pool {
3629 $Coro::current->{desc} = "runtime saver"; 4055 $Coro::current->{desc} = "runtime saver";
3630 write_runtime 4056 write_runtime_sync
3631 or warn "ERROR: unable to write runtime file: $!"; 4057 or error "ERROR: unable to write runtime file: $!";
3632 }; 4058 };
3633 } 4059 }
3634 4060
3635 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4061 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3636 $sig->send; 4062 $sig->send;
3637 } 4063 }
3638 while (my $sig = shift @WAIT_FOR_TICK) { 4064 while (my $sig = shift @WAIT_FOR_TICK) {
3639 $sig->send; 4065 $sig->send;
3640 } 4066 }
3641 4067
3642 $LOAD = ($NOW - $tick_start) / $TICK; 4068 $LOAD = ($NOW - $TICK_START) / $TICK;
3643 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4069 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3644 4070
3645 _post_tick; 4071 if (0) {
3646}; 4072 if ($NEXT_TICK) {
3647$TICK_WATCHER->priority (EV::MAXPRI); 4073 my $jitter = $TICK_START - $NEXT_TICK;
4074 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4075 debug "jitter $JITTER\n";#d#
4076 }
4077 }
4078}
3648 4079
3649{ 4080{
3650 # configure BDB 4081 # configure BDB
3651 4082
3652 BDB::min_parallel 8; 4083 BDB::min_parallel 16;
3653 BDB::max_poll_reqs $TICK * 0.1; 4084 BDB::max_poll_reqs $TICK * 0.1;
3654 $Coro::BDB::WATCHER->priority (1); 4085 $AnyEvent::BDB::WATCHER->priority (1);
3655 4086
3656 unless ($DB_ENV) { 4087 unless ($DB_ENV) {
3657 $DB_ENV = BDB::db_env_create; 4088 $DB_ENV = BDB::db_env_create;
3658 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4089 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3659 | BDB::LOG_AUTOREMOVE, 1); 4090 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4091 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3660 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4092 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3661 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4093 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3662 4094
3663 cf::sync_job { 4095 cf::sync_job {
3664 eval { 4096 eval {
3690{ 4122{
3691 # configure IO::AIO 4123 # configure IO::AIO
3692 4124
3693 IO::AIO::min_parallel 8; 4125 IO::AIO::min_parallel 8;
3694 IO::AIO::max_poll_time $TICK * 0.1; 4126 IO::AIO::max_poll_time $TICK * 0.1;
3695 $Coro::AIO::WATCHER->priority (1); 4127 undef $AnyEvent::AIO::WATCHER;
3696} 4128}
3697 4129
3698my $_log_backtrace; 4130my $_log_backtrace;
3699 4131
3700sub _log_backtrace { 4132sub _log_backtrace {
3703 $msg =~ s/\n//; 4135 $msg =~ s/\n//;
3704 4136
3705 # limit the # of concurrent backtraces 4137 # limit the # of concurrent backtraces
3706 if ($_log_backtrace < 2) { 4138 if ($_log_backtrace < 2) {
3707 ++$_log_backtrace; 4139 ++$_log_backtrace;
4140 my $perl_bt = Carp::longmess $msg;
3708 async { 4141 async {
3709 $Coro::current->{desc} = "abt $msg"; 4142 $Coro::current->{desc} = "abt $msg";
3710 4143
3711 my @bt = fork_call { 4144 my @bt = fork_call {
3712 @addr = map { sprintf "%x", $_ } @addr; 4145 @addr = map { sprintf "%x", $_ } @addr;
3723 } 4156 }
3724 4157
3725 @funcs 4158 @funcs
3726 }; 4159 };
3727 4160
3728 LOG llevInfo, "[ABT] $msg\n"; 4161 LOG llevInfo, "[ABT] $perl_bt\n";
4162 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3729 LOG llevInfo, "[ABT] $_\n" for @bt; 4163 LOG llevInfo, "[ABT] $_\n" for @bt;
3730 --$_log_backtrace; 4164 --$_log_backtrace;
3731 }; 4165 };
3732 } else { 4166 } else {
3733 LOG llevInfo, "[ABT] $msg\n"; 4167 LOG llevInfo, "[ABT] $msg\n";
3734 LOG llevInfo, "[ABT] [suppressed]\n"; 4168 LOG llevInfo, "[ABT] [suppressed]\n";
3735 } 4169 }
3736} 4170}
3737 4171
3738# load additional modules 4172# load additional modules
3739use cf::pod; 4173require "cf/$_.pm" for @EXTRA_MODULES;
4174cf::_connect_to_perl_2;
3740 4175
3741END { cf::emergency_save } 4176END { cf::emergency_save }
3742 4177
37431 41781
3744 4179

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines