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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines