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.551 by root, Sun May 16 13:48:07 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines