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.550 by root, Fri May 14 22:56:47 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 #
1826 $self->init; # pass $1 etc. 1959 $self->init; # pass $1 etc.
1827 return $self; 1960 return $self;
1828 } 1961 }
1829 } 1962 }
1830 1963
1831 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1964 Carp::cluck "unable to resolve path '$path' (base '$base')";
1832 () 1965 ()
1833} 1966}
1834 1967
1835sub init { 1968sub init {
1836 my ($self) = @_; 1969 my ($self) = @_;
1858 1991
1859# the temporary/swap location 1992# the temporary/swap location
1860sub save_path { 1993sub save_path {
1861 my ($self) = @_; 1994 my ($self) = @_;
1862 1995
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1996 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$TMPDIR/$path.map" 1997 "$TMPDIR/$path.map"
1865} 1998}
1866 1999
1867# the unique path, undef == no special unique path 2000# the unique path, undef == no special unique path
1868sub uniq_path { 2001sub uniq_path {
1869 my ($self) = @_; 2002 my ($self) = @_;
1870 2003
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2004 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 2005 "$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} 2006}
1883 2007
1884sub decay_objects { 2008sub decay_objects {
1885 my ($self) = @_; 2009 my ($self) = @_;
1886 2010
1968 2092
1969sub find; 2093sub find;
1970sub find { 2094sub find {
1971 my ($path, $origin) = @_; 2095 my ($path, $origin) = @_;
1972 2096
2097 cf::cede_to_tick;
2098
1973 $path = normalise $path, $origin && $origin->path; 2099 $path = normalise $path, $origin && $origin->path;
1974 2100
1975 cf::lock_wait "map_data:$path";#d#remove 2101 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 2102 my $guard2 = cf::lock_acquire "map_find:$path";
1977 2103
1978 $cf::MAP{$path} || do { 2104 $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 2105 my $map = new_from_path cf::map $path
1983 or return; 2106 or return;
1984 2107
1985 $map->{last_save} = $cf::RUNTIME; 2108 $map->{last_save} = $cf::RUNTIME;
1986 2109
1988 or return; 2111 or return;
1989 2112
1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2113 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1991 # doing this can freeze the server in a sync job, obviously 2114 # doing this can freeze the server in a sync job, obviously
1992 #$cf::WAIT_FOR_TICK->wait; 2115 #$cf::WAIT_FOR_TICK->wait;
2116 undef $guard2;
1993 undef $guard1; 2117 undef $guard1;
1994 undef $guard2;
1995 $map->reset; 2118 $map->reset;
1996 return find $path; 2119 return find $path;
1997 } 2120 }
1998 2121
1999 $cf::MAP{$path} = $map 2122 $cf::MAP{$path} = $map
2000 } 2123 }
2001} 2124}
2002 2125
2003sub pre_load { } 2126sub pre_load { }
2004sub post_load { } 2127#sub post_load { } # XS
2005 2128
2006sub load { 2129sub load {
2007 my ($self) = @_; 2130 my ($self) = @_;
2008 2131
2009 local $self->{deny_reset} = 1; # loading can take a long time 2132 local $self->{deny_reset} = 1; # loading can take a long time
2026 my $f = new_from_file cf::object::thawer $self->{load_path}; 2149 my $f = new_from_file cf::object::thawer $self->{load_path};
2027 $f->skip_block; 2150 $f->skip_block;
2028 $self->_load_objects ($f) 2151 $self->_load_objects ($f)
2029 or return; 2152 or return;
2030 2153
2031 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2154 $self->post_load_original
2032 if delete $self->{load_original}; 2155 if delete $self->{load_original};
2033 2156
2034 if (my $uniq = $self->uniq_path) { 2157 if (my $uniq = $self->uniq_path) {
2035 utf8::encode $uniq; 2158 utf8::encode $uniq;
2036 unless (aio_stat $uniq) { 2159 unless (aio_stat $uniq) {
2054 unless ($self->{deny_activate}) { 2177 unless ($self->{deny_activate}) {
2055 $self->decay_objects; 2178 $self->decay_objects;
2056 $self->fix_auto_apply; 2179 $self->fix_auto_apply;
2057 $self->update_buttons; 2180 $self->update_buttons;
2058 cf::cede_to_tick; 2181 cf::cede_to_tick;
2059 $self->set_darkness_map;
2060 cf::cede_to_tick;
2061 $self->activate; 2182 $self->activate;
2062 } 2183 }
2063 2184
2064 $self->{last_save} = $cf::RUNTIME; 2185 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2186 $self->last_access ($cf::RUNTIME);
2066 2187
2067 $self->in_memory (cf::MAP_IN_MEMORY); 2188 $self->in_memory (cf::MAP_ACTIVE);
2068 } 2189 }
2069 2190
2070 $self->post_load; 2191 $self->post_load;
2071} 2192}
2072 2193
2194# customize the map for a given player, i.e.
2195# return the _real_ map. used by e.g. per-player
2196# maps to change the path to ~playername/mappath
2073sub customise_for { 2197sub customise_for {
2074 my ($self, $ob) = @_; 2198 my ($self, $ob) = @_;
2075 2199
2076 return find "~" . $ob->name . "/" . $self->{path} 2200 return find "~" . $ob->name . "/" . $self->{path}
2077 if $self->per_player; 2201 if $self->per_player;
2093 or next; 2217 or next;
2094 $neigh = find $neigh, $map 2218 $neigh = find $neigh, $map
2095 or next; 2219 or next;
2096 $neigh->load; 2220 $neigh->load;
2097 2221
2222 # now find the diagonal neighbours
2098 push @neigh, 2223 push @neigh,
2099 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2224 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2100 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2225 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2101 } 2226 }
2102 2227
2109} 2234}
2110 2235
2111sub find_sync { 2236sub find_sync {
2112 my ($path, $origin) = @_; 2237 my ($path, $origin) = @_;
2113 2238
2114 cf::sync_job { find $path, $origin } 2239 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2240 if $Coro::current == $Coro::main;
2241
2242 find $path, $origin
2115} 2243}
2116 2244
2117sub do_load_sync { 2245sub do_load_sync {
2118 my ($map) = @_; 2246 my ($map) = @_;
2119 2247
2120 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2248 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2121 if $Coro::current == $Coro::main; 2249 if $Coro::current == $Coro::main;
2122 2250
2123 cf::sync_job { $map->load }; 2251 $map->load;
2124} 2252}
2125 2253
2126our %MAP_PREFETCH; 2254our %MAP_PREFETCH;
2127our $MAP_PREFETCHER = undef; 2255our $MAP_PREFETCHER = undef;
2128 2256
2130 my ($path, $origin, $load) = @_; 2258 my ($path, $origin, $load) = @_;
2131 2259
2132 $path = normalise $path, $origin && $origin->{path}; 2260 $path = normalise $path, $origin && $origin->{path};
2133 2261
2134 if (my $map = $cf::MAP{$path}) { 2262 if (my $map = $cf::MAP{$path}) {
2135 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2263 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2136 } 2264 }
2137 2265
2138 $MAP_PREFETCH{$path} |= $load; 2266 $MAP_PREFETCH{$path} |= $load;
2139 2267
2140 $MAP_PREFETCHER ||= cf::async { 2268 $MAP_PREFETCHER ||= cf::async {
2154 $MAP_PREFETCHER->prio (6); 2282 $MAP_PREFETCHER->prio (6);
2155 2283
2156 () 2284 ()
2157} 2285}
2158 2286
2287# common code, used by both ->save and ->swapout
2159sub save { 2288sub _save {
2160 my ($self) = @_; 2289 my ($self) = @_;
2161
2162 my $lock = cf::lock_acquire "map_data:$self->{path}";
2163 2290
2164 $self->{last_save} = $cf::RUNTIME; 2291 $self->{last_save} = $cf::RUNTIME;
2165 2292
2166 return unless $self->dirty; 2293 return unless $self->dirty;
2167 2294
2176 2303
2177 cf::async { 2304 cf::async {
2178 $Coro::current->{desc} = "map player save"; 2305 $Coro::current->{desc} = "map player save";
2179 $_->contr->save for $self->players; 2306 $_->contr->save for $self->players;
2180 }; 2307 };
2308
2309 cf::get_slot 0.02;
2181 2310
2182 if ($uniq) { 2311 if ($uniq) {
2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2312 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2184 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2313 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2185 } else { 2314 } else {
2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2315 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2187 } 2316 }
2188} 2317}
2189 2318
2319sub save {
2320 my ($self) = @_;
2321
2322 my $lock = cf::lock_acquire "map_data:$self->{path}";
2323
2324 $self->_save;
2325}
2326
2190sub swap_out { 2327sub swap_out {
2191 my ($self) = @_; 2328 my ($self) = @_;
2192 2329
2193 # save first because save cedes
2194 $self->save;
2195
2196 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2330 my $lock = cf::lock_acquire "map_data:$self->{path}";
2197 2331
2332 return if $self->in_memory != cf::MAP_ACTIVE;
2333 return if $self->{deny_save};
2198 return if $self->players; 2334 return if $self->players;
2199 return if $self->in_memory != cf::MAP_IN_MEMORY;
2200 return if $self->{deny_save};
2201 2335
2336 # first deactivate the map and "unlink" it from the core
2337 $self->deactivate;
2338 $_->clear_links_to ($self) for values %cf::MAP;
2202 $self->in_memory (cf::MAP_SWAPPED); 2339 $self->in_memory (cf::MAP_SWAPPED);
2340
2341 # then atomically save
2342 $self->_save;
2343
2344 # then free the map
2345 $self->clear;
2346}
2347
2348sub reset_at {
2349 my ($self) = @_;
2350
2351 # TODO: safety, remove and allow resettable per-player maps
2352 return 1e99 if $self->{deny_reset};
2353
2354 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2355 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2356
2357 $time + $to
2358}
2359
2360sub should_reset {
2361 my ($self) = @_;
2362
2363 $self->reset_at <= $cf::RUNTIME
2364}
2365
2366sub reset {
2367 my ($self) = @_;
2368
2369 my $lock = cf::lock_acquire "map_data:$self->{path}";
2370
2371 return if $self->players;
2372
2373 cf::trace "resetting map ", $self->path, "\n";
2374
2375 $self->in_memory (cf::MAP_SWAPPED);
2376
2377 # need to save uniques path
2378 unless ($self->{deny_save}) {
2379 my $uniq = $self->uniq_path; utf8::encode $uniq;
2380
2381 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2382 if $uniq;
2383 }
2384
2385 delete $cf::MAP{$self->path};
2203 2386
2204 $self->deactivate; 2387 $self->deactivate;
2205 $_->clear_links_to ($self) for values %cf::MAP; 2388 $_->clear_links_to ($self) for values %cf::MAP;
2206 $self->clear; 2389 $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 2390
2252 $self->unlink_save; 2391 $self->unlink_save;
2253 $self->destroy; 2392 $self->destroy;
2254} 2393}
2255 2394
2263 2402
2264 delete $cf::MAP{$self->path}; 2403 delete $cf::MAP{$self->path};
2265 2404
2266 $self->unlink_save; 2405 $self->unlink_save;
2267 2406
2268 bless $self, "cf::map"; 2407 bless $self, "cf::map::wrap";
2269 delete $self->{deny_reset}; 2408 delete $self->{deny_reset};
2270 $self->{deny_save} = 1; 2409 $self->{deny_save} = 1;
2271 $self->reset_timeout (1); 2410 $self->reset_timeout (1);
2272 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2411 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2273 2412
2322 2461
2323sub unique_maps() { 2462sub unique_maps() {
2324 [ 2463 [
2325 map { 2464 map {
2326 utf8::decode $_; 2465 utf8::decode $_;
2327 /\.map$/ 2466 s/\.map$//; # TODO future compatibility hack
2467 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2468 ? ()
2328 ? normalise $_ 2469 : normalise $_
2329 : ()
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2470 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2471 ]
2332} 2472}
2333 2473
2334package cf; 2474=item cf::map::static_maps
2475
2476Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2477file in the shared directory excluding F</styles> and F</editor>). May
2478block.
2479
2480=cut
2481
2482sub static_maps() {
2483 my @dirs = "";
2484 my @maps;
2485
2486 while (@dirs) {
2487 my $dir = shift @dirs;
2488
2489 next if $dir eq "/styles" || $dir eq "/editor";
2490
2491 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2492 or return;
2493
2494 for (@$files) {
2495 s/\.map$// or next;
2496 utf8::decode $_;
2497 push @maps, "$dir/$_";
2498 }
2499
2500 push @dirs, map "$dir/$_", @$dirs;
2501 }
2502
2503 \@maps
2504}
2335 2505
2336=back 2506=back
2337 2507
2338=head3 cf::object 2508=head3 cf::object
2339 2509
2343 2513
2344=over 4 2514=over 4
2345 2515
2346=item $ob->inv_recursive 2516=item $ob->inv_recursive
2347 2517
2348Returns the inventory of the object _and_ their inventories, recursively. 2518Returns the inventory of the object I<and> their inventories, recursively,
2519but I<not> the object itself.
2349 2520
2350=cut 2521=cut
2351 2522
2352sub inv_recursive_; 2523sub inv_recursive_;
2353sub inv_recursive_ { 2524sub inv_recursive_ {
2358 inv_recursive_ inv $_[0] 2529 inv_recursive_ inv $_[0]
2359} 2530}
2360 2531
2361=item $ref = $ob->ref 2532=item $ref = $ob->ref
2362 2533
2363creates and returns a persistent reference to an objetc that can be stored as a string. 2534Creates and returns a persistent reference to an object that can be stored as a string.
2364 2535
2365=item $ob = cf::object::deref ($refstring) 2536=item $ob = cf::object::deref ($refstring)
2366 2537
2367returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2538returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2368even if the object actually exists. May block. 2539even if the object actually exists. May block.
2400can be C<undef>. Does the right thing when the player is currently in a 2571can be C<undef>. Does the right thing when the player is currently in a
2401dialogue with the given NPC character. 2572dialogue with the given NPC character.
2402 2573
2403=cut 2574=cut
2404 2575
2576our $SAY_CHANNEL = {
2577 id => "say",
2578 title => "Map",
2579 reply => "say ",
2580 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2581};
2582
2583our $CHAT_CHANNEL = {
2584 id => "chat",
2585 title => "Chat",
2586 reply => "chat ",
2587 tooltip => "Player chat and shouts, global to the server.",
2588};
2589
2405# rough implementation of a future "reply" method that works 2590# rough implementation of a future "reply" method that works
2406# with dialog boxes. 2591# with dialog boxes.
2407#TODO: the first argument must go, split into a $npc->reply_to ( method 2592#TODO: the first argument must go, split into a $npc->reply_to ( method
2408sub cf::object::player::reply($$$;$) { 2593sub cf::object::player::reply($$$;$) {
2409 my ($self, $npc, $msg, $flags) = @_; 2594 my ($self, $npc, $msg, $flags) = @_;
2420 my $dialog = $pl->{npc_dialog}; 2605 my $dialog = $pl->{npc_dialog};
2421 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2606 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2422 2607
2423 } else { 2608 } else {
2424 $msg = $npc->name . " says: $msg" if $npc; 2609 $msg = $npc->name . " says: $msg" if $npc;
2425 $self->message ($msg, $flags); 2610 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2426 } 2611 }
2427 } 2612 }
2428} 2613}
2429 2614
2430=item $object->send_msg ($channel, $msg, $color, [extra...]) 2615=item $object->send_msg ($channel, $msg, $color, [extra...])
2455 2640
2456=item $player_object->enter_link 2641=item $player_object->enter_link
2457 2642
2458Freezes the player and moves him/her to a special map (C<{link}>). 2643Freezes the player and moves him/her to a special map (C<{link}>).
2459 2644
2460The player should be reasonably safe there for short amounts of time. You 2645The player should be reasonably safe there for short amounts of time (e.g.
2461I<MUST> call C<leave_link> as soon as possible, though. 2646for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2647though, as the player cannot control the character while it is on the link
2648map.
2462 2649
2463Will never block. 2650Will never block.
2464 2651
2465=item $player_object->leave_link ($map, $x, $y) 2652=item $player_object->leave_link ($map, $x, $y)
2466 2653
2486sub cf::object::player::enter_link { 2673sub cf::object::player::enter_link {
2487 my ($self) = @_; 2674 my ($self) = @_;
2488 2675
2489 $self->deactivate_recursive; 2676 $self->deactivate_recursive;
2490 2677
2678 ++$self->{_link_recursion};
2679
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2680 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2681
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2682 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2683 if $self->map && $self->map->{path} ne "{link}";
2495 2684
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2685 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2686}
2498 2687
2499sub cf::object::player::leave_link { 2688sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2689 my ($self, $map, $x, $y) = @_;
2501 2690
2518 ($x, $y) = (-1, -1) 2707 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2708 unless (defined $x) && (defined $y);
2520 2709
2521 # use -1 or undef as default coordinates, not 0, 0 2710 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2711 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2712 if $x <= 0 && $y <= 0;
2524 2713
2525 $map->load; 2714 $map->load;
2526 $map->load_neighbours; 2715 $map->load_neighbours;
2527 2716
2528 return unless $self->contr->active; 2717 return unless $self->contr->active;
2529 $self->activate_recursive;
2530 2718
2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2719 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2532 $self->enter_map ($map, $x, $y); 2720 if ($self->enter_map ($map, $x, $y)) {
2533} 2721 # entering was successful
2722 delete $self->{_link_recursion};
2723 # only activate afterwards, to support waiting in hooks
2724 $self->activate_recursive;
2725 }
2534 2726
2727}
2728
2535=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2729=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2536 2730
2537Moves the player to the given map-path and coordinates by first freezing 2731Moves the player to the given map-path and coordinates by first freezing
2538her, loading and preparing them map, calling the provided $check callback 2732her, loading and preparing them map, calling the provided $check callback
2539that has to return the map if sucecssful, and then unfreezes the player on 2733that 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 2734the new (success) or old (failed) map position. In either case, $done will
2541be called at the end of this process. 2735be called at the end of this process.
2542 2736
2737Note that $check will be called with a potentially non-loaded map, so if
2738it needs a loaded map it has to call C<< ->load >>.
2739
2543=cut 2740=cut
2544 2741
2545our $GOTOGEN; 2742our $GOTOGEN;
2546 2743
2547sub cf::object::player::goto { 2744sub cf::object::player::goto {
2548 my ($self, $path, $x, $y, $check, $done) = @_; 2745 my ($self, $path, $x, $y, $check, $done) = @_;
2746
2747 if ($self->{_link_recursion} >= $MAX_LINKS) {
2748 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2749 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2750 ($path, $x, $y) = @$EMERGENCY_POSITION;
2751 }
2549 2752
2550 # do generation counting so two concurrent goto's will be executed in-order 2753 # do generation counting so two concurrent goto's will be executed in-order
2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2754 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2552 2755
2553 $self->enter_link; 2756 $self->enter_link;
2577 my $map = eval { 2780 my $map = eval {
2578 my $map = defined $path ? cf::map::find $path : undef; 2781 my $map = defined $path ? cf::map::find $path : undef;
2579 2782
2580 if ($map) { 2783 if ($map) {
2581 $map = $map->customise_for ($self); 2784 $map = $map->customise_for ($self);
2582 $map = $check->($map) if $check && $map; 2785 $map = $check->($map, $x, $y, $self) if $check && $map;
2583 } else { 2786 } else {
2584 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2787 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2585 } 2788 }
2586 2789
2587 $map 2790 $map
2595 if ($gen == $self->{_goto_generation}) { 2798 if ($gen == $self->{_goto_generation}) {
2596 delete $self->{_goto_generation}; 2799 delete $self->{_goto_generation};
2597 $self->leave_link ($map, $x, $y); 2800 $self->leave_link ($map, $x, $y);
2598 } 2801 }
2599 2802
2600 $done->() if $done; 2803 $done->($self) if $done;
2601 })->prio (1); 2804 })->prio (1);
2602} 2805}
2603 2806
2604=item $player_object->enter_exit ($exit_object) 2807=item $player_object->enter_exit ($exit_object)
2605 2808
2625} 2828}
2626 2829
2627sub prepare_random_map { 2830sub prepare_random_map {
2628 my ($exit) = @_; 2831 my ($exit) = @_;
2629 2832
2630 my $guard = cf::lock_acquire "exit_prepare:$exit";
2631
2632 # all this does is basically replace the /! path by 2833 # all this does is basically replace the /! path by
2633 # a new random map path (?random/...) with a seed 2834 # a new random map path (?random/...) with a seed
2634 # that depends on the exit object 2835 # that depends on the exit object
2635 2836
2636 my $rmp = parse_random_map_params $exit->msg; 2837 my $rmp = parse_random_map_params $exit->msg;
2638 if ($exit->map) { 2839 if ($exit->map) {
2639 $rmp->{region} = $exit->region->name; 2840 $rmp->{region} = $exit->region->name;
2640 $rmp->{origin_map} = $exit->map->path; 2841 $rmp->{origin_map} = $exit->map->path;
2641 $rmp->{origin_x} = $exit->x; 2842 $rmp->{origin_x} = $exit->x;
2642 $rmp->{origin_y} = $exit->y; 2843 $rmp->{origin_y} = $exit->y;
2844
2845 $exit->map->touch;
2643 } 2846 }
2644 2847
2645 $rmp->{random_seed} ||= $exit->random_seed; 2848 $rmp->{random_seed} ||= $exit->random_seed;
2646 2849
2647 my $data = cf::encode_json $rmp; 2850 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2648 my $md5 = Digest::MD5::md5_hex $data; 2851 my $md5 = Digest::MD5::md5_hex $data;
2649 my $meta = "$RANDOMDIR/$md5.meta"; 2852 my $meta = "$RANDOMDIR/$md5.meta";
2650 2853
2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2854 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2652 aio_write $fh, 0, (length $data), $data, 0; 2855 aio_write $fh, 0, (length $data), $data, 0;
2653 undef $fh; 2856 undef $fh;
2654 aio_rename "$meta~", $meta; 2857 aio_rename "$meta~", $meta;
2655 2858
2859 my $slaying = "?random/$md5";
2860
2861 if ($exit->valid) {
2656 $exit->slaying ("?random/$md5"); 2862 $exit->slaying ("?random/$md5");
2657 $exit->msg (undef); 2863 $exit->msg (undef);
2864 }
2658 } 2865 }
2659} 2866}
2660 2867
2661sub cf::object::player::enter_exit { 2868sub cf::object::player::enter_exit {
2662 my ($self, $exit) = @_; 2869 my ($self, $exit) = @_;
2663 2870
2664 return unless $self->type == cf::PLAYER; 2871 return unless $self->type == cf::PLAYER;
2665 2872
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; 2873 $self->enter_link;
2678 2874
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 { 2875 (async {
2684 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2876 $Coro::current->{desc} = "enter_exit";
2685 2877
2686 $self->deactivate_recursive; # just to be sure
2687 unless (eval { 2878 unless (eval {
2879 $self->deactivate_recursive; # just to be sure
2880
2881 # random map handling
2882 {
2883 my $guard = cf::lock_acquire "exit_prepare:$exit";
2884
2885 prepare_random_map $exit
2886 if $exit->slaying eq "/!";
2887 }
2888
2889 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2890 my $x = $exit->stats->hp;
2891 my $y = $exit->stats->sp;
2892
2688 $self->goto ($slaying, $hp, $sp); 2893 $self->goto ($map, $x, $y);
2689 2894
2895 # if exit is damned, update players death & WoR home-position
2896 $self->contr->savebed ($map, $x, $y)
2897 if $exit->flag (cf::FLAG_DAMNED);
2898
2690 1; 2899 1
2691 }) { 2900 }) {
2692 $self->message ("Something went wrong deep within the crossfire server. " 2901 $self->message ("Something went wrong deep within the deliantra server. "
2693 . "I'll try to bring you back to the map you were before. " 2902 . "I'll try to bring you back to the map you were before. "
2694 . "Please report this to the dungeon master!", 2903 . "Please report this to the dungeon master!",
2695 cf::NDI_UNIQUE | cf::NDI_RED); 2904 cf::NDI_UNIQUE | cf::NDI_RED);
2696 2905
2697 warn "ERROR in enter_exit: $@"; 2906 error "ERROR in enter_exit: $@";
2698 $self->leave_link; 2907 $self->leave_link;
2699 } 2908 }
2700 })->prio (1); 2909 })->prio (1);
2701} 2910}
2702 2911
2714sub cf::client::send_drawinfo { 2923sub cf::client::send_drawinfo {
2715 my ($self, $text, $flags) = @_; 2924 my ($self, $text, $flags) = @_;
2716 2925
2717 utf8::encode $text; 2926 utf8::encode $text;
2718 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2927 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2928}
2929
2930=item $client->send_big_packet ($pkt)
2931
2932Like C<send_packet>, but tries to compress large packets, and fragments
2933them as required.
2934
2935=cut
2936
2937our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2938
2939sub cf::client::send_big_packet {
2940 my ($self, $pkt) = @_;
2941
2942 # try lzf for large packets
2943 $pkt = "lzf " . Compress::LZF::compress $pkt
2944 if 1024 <= length $pkt and $self->{can_lzf};
2945
2946 # split very large packets
2947 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2948 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2949 $pkt = "frag";
2950 }
2951
2952 $self->send_packet ($pkt);
2719} 2953}
2720 2954
2721=item $client->send_msg ($channel, $msg, $color, [extra...]) 2955=item $client->send_msg ($channel, $msg, $color, [extra...])
2722 2956
2723Send a drawinfo or msg packet to the client, formatting the msg for the 2957Send a drawinfo or msg packet to the client, formatting the msg for the
2727 2961
2728=cut 2962=cut
2729 2963
2730# non-persistent channels (usually the info channel) 2964# non-persistent channels (usually the info channel)
2731our %CHANNEL = ( 2965our %CHANNEL = (
2966 "c/motd" => {
2967 id => "infobox",
2968 title => "MOTD",
2969 reply => undef,
2970 tooltip => "The message of the day",
2971 },
2732 "c/identify" => { 2972 "c/identify" => {
2733 id => "infobox", 2973 id => "infobox",
2734 title => "Identify", 2974 title => "Identify",
2735 reply => undef, 2975 reply => undef,
2736 tooltip => "Items recently identified", 2976 tooltip => "Items recently identified",
2738 "c/examine" => { 2978 "c/examine" => {
2739 id => "infobox", 2979 id => "infobox",
2740 title => "Examine", 2980 title => "Examine",
2741 reply => undef, 2981 reply => undef,
2742 tooltip => "Signs and other items you examined", 2982 tooltip => "Signs and other items you examined",
2983 },
2984 "c/shopinfo" => {
2985 id => "infobox",
2986 title => "Shop Info",
2987 reply => undef,
2988 tooltip => "What your bargaining skill tells you about the shop",
2743 }, 2989 },
2744 "c/book" => { 2990 "c/book" => {
2745 id => "infobox", 2991 id => "infobox",
2746 title => "Book", 2992 title => "Book",
2747 reply => undef, 2993 reply => undef,
2763 id => "infobox", 3009 id => "infobox",
2764 title => "Body Parts", 3010 title => "Body Parts",
2765 reply => undef, 3011 reply => undef,
2766 tooltip => "Shows which body parts you posess and are available", 3012 tooltip => "Shows which body parts you posess and are available",
2767 }, 3013 },
3014 "c/statistics" => {
3015 id => "infobox",
3016 title => "Statistics",
3017 reply => undef,
3018 tooltip => "Shows your primary statistics",
3019 },
3020 "c/skills" => {
3021 id => "infobox",
3022 title => "Skills",
3023 reply => undef,
3024 tooltip => "Shows your experience per skill and item power",
3025 },
3026 "c/shopitems" => {
3027 id => "infobox",
3028 title => "Shop Items",
3029 reply => undef,
3030 tooltip => "Shows the items currently for sale in this shop",
3031 },
3032 "c/resistances" => {
3033 id => "infobox",
3034 title => "Resistances",
3035 reply => undef,
3036 tooltip => "Shows your resistances",
3037 },
3038 "c/pets" => {
3039 id => "infobox",
3040 title => "Pets",
3041 reply => undef,
3042 tooltip => "Shows information abotu your pets/a specific pet",
3043 },
3044 "c/perceiveself" => {
3045 id => "infobox",
3046 title => "Perceive Self",
3047 reply => undef,
3048 tooltip => "You gained detailed knowledge about yourself",
3049 },
2768 "c/uptime" => { 3050 "c/uptime" => {
2769 id => "infobox", 3051 id => "infobox",
2770 title => "Uptime", 3052 title => "Uptime",
2771 reply => undef, 3053 reply => undef,
2772 tooltip => "How long the server has been running since last restart", 3054 tooltip => "How long the server has been running since last restart",
2775 id => "infobox", 3057 id => "infobox",
2776 title => "Map Info", 3058 title => "Map Info",
2777 reply => undef, 3059 reply => undef,
2778 tooltip => "Information related to the maps", 3060 tooltip => "Information related to the maps",
2779 }, 3061 },
3062 "c/party" => {
3063 id => "party",
3064 title => "Party",
3065 reply => "gsay ",
3066 tooltip => "Messages and chat related to your party",
3067 },
3068 "c/death" => {
3069 id => "death",
3070 title => "Death",
3071 reply => undef,
3072 tooltip => "Reason for and more info about your most recent death",
3073 },
3074 "c/say" => $SAY_CHANNEL,
3075 "c/chat" => $CHAT_CHANNEL,
2780); 3076);
2781 3077
2782sub cf::client::send_msg { 3078sub cf::client::send_msg {
2783 my ($self, $channel, $msg, $color, @extra) = @_; 3079 my ($self, $channel, $msg, $color, @extra) = @_;
2784 3080
2785 $msg = $self->pl->expand_cfpod ($msg); 3081 $msg = $self->pl->expand_cfpod ($msg)
3082 unless $color & cf::NDI_VERBATIM;
2786 3083
2787 $color &= cf::NDI_CLIENT_MASK; # just in case... 3084 $color &= cf::NDI_CLIENT_MASK; # just in case...
2788 3085
2789 # check predefined channels, for the benefit of C 3086 # check predefined channels, for the benefit of C
2790 if ($CHANNEL{$channel}) { 3087 if ($CHANNEL{$channel}) {
2791 $channel = $CHANNEL{$channel}; 3088 $channel = $CHANNEL{$channel};
2792 3089
2793 $self->ext_msg (channel_info => $channel) 3090 $self->ext_msg (channel_info => $channel);
2794 if $self->can_msg;
2795
2796 $channel = $channel->{id}; 3091 $channel = $channel->{id};
2797 3092
2798 } elsif (ref $channel) { 3093 } elsif (ref $channel) {
2799 # send meta info to client, if not yet sent 3094 # send meta info to client, if not yet sent
2800 unless (exists $self->{channel}{$channel->{id}}) { 3095 unless (exists $self->{channel}{$channel->{id}}) {
2801 $self->{channel}{$channel->{id}} = $channel; 3096 $self->{channel}{$channel->{id}} = $channel;
2802 $self->ext_msg (channel_info => $channel) 3097 $self->ext_msg (channel_info => $channel);
2803 if $self->can_msg;
2804 } 3098 }
2805 3099
2806 $channel = $channel->{id}; 3100 $channel = $channel->{id};
2807 } 3101 }
2808 3102
2809 return unless @extra || length $msg; 3103 return unless @extra || length $msg;
2810 3104
2811 if ($self->can_msg) {
2812 # default colour, mask it out 3105 # default colour, mask it out
2813 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3106 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2814 if $color & cf::NDI_DEF; 3107 if $color & cf::NDI_DEF;
2815 3108
2816 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3109 my $pkt = "msg "
3110 . $self->{json_coder}->encode (
2817 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3111 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2818 } else { 3112 );
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 3113
2830 $color &= cf::NDI_COLOR_MASK; 3114 $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} 3115}
2844 3116
2845=item $client->ext_msg ($type, @msg) 3117=item $client->ext_msg ($type, @msg)
2846 3118
2847Sends an ext event to the client. 3119Sends an ext event to the client.
2850 3122
2851sub cf::client::ext_msg($$@) { 3123sub cf::client::ext_msg($$@) {
2852 my ($self, $type, @msg) = @_; 3124 my ($self, $type, @msg) = @_;
2853 3125
2854 if ($self->extcmd == 2) { 3126 if ($self->extcmd == 2) {
2855 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3127 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2856 } elsif ($self->extcmd == 1) { # TODO: remove 3128 } elsif ($self->extcmd == 1) { # TODO: remove
2857 push @msg, msgtype => "event_$type"; 3129 push @msg, msgtype => "event_$type";
2858 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3130 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2859 } 3131 }
2860} 3132}
2861 3133
2862=item $client->ext_reply ($msgid, @msg) 3134=item $client->ext_reply ($msgid, @msg)
2863 3135
2867 3139
2868sub cf::client::ext_reply($$@) { 3140sub cf::client::ext_reply($$@) {
2869 my ($self, $id, @msg) = @_; 3141 my ($self, $id, @msg) = @_;
2870 3142
2871 if ($self->extcmd == 2) { 3143 if ($self->extcmd == 2) {
2872 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3144 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2873 } elsif ($self->extcmd == 1) { 3145 } elsif ($self->extcmd == 1) {
2874 #TODO: version 1, remove 3146 #TODO: version 1, remove
2875 unshift @msg, msgtype => "reply", msgid => $id; 3147 unshift @msg, msgtype => "reply", msgid => $id;
2876 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3148 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2877 } 3149 }
2878} 3150}
2879 3151
2880=item $success = $client->query ($flags, "text", \&cb) 3152=item $success = $client->query ($flags, "text", \&cb)
2881 3153
2952 3224
2953 $ns->ext_reply ($reply, @reply) 3225 $ns->ext_reply ($reply, @reply)
2954 if $reply; 3226 if $reply;
2955 3227
2956 } else { 3228 } else {
2957 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3229 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2958 } 3230 }
2959 3231
2960 cf::override; 3232 cf::override;
2961 }, 3233 },
2962); 3234);
2982 3254
2983 $coro 3255 $coro
2984} 3256}
2985 3257
2986cf::client->attach ( 3258cf::client->attach (
2987 on_destroy => sub { 3259 on_client_destroy => sub {
2988 my ($ns) = @_; 3260 my ($ns) = @_;
2989 3261
2990 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3262 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2991 }, 3263 },
2992); 3264);
3008our $safe_hole = new Safe::Hole; 3280our $safe_hole = new Safe::Hole;
3009 3281
3010$SIG{FPE} = 'IGNORE'; 3282$SIG{FPE} = 'IGNORE';
3011 3283
3012$safe->permit_only (Opcode::opset qw( 3284$safe->permit_only (Opcode::opset qw(
3013 :base_core :base_mem :base_orig :base_math 3285 :base_core :base_mem :base_orig :base_math :base_loop
3014 grepstart grepwhile mapstart mapwhile 3286 grepstart grepwhile mapstart mapwhile
3015 sort time 3287 sort time
3016)); 3288));
3017 3289
3018# here we export the classes and methods available to script code 3290# here we export the classes and methods available to script code
3021 3293
3022The following functions and methods are available within a safe environment: 3294The following functions and methods are available within a safe environment:
3023 3295
3024 cf::object 3296 cf::object
3025 contr pay_amount pay_player map x y force_find force_add destroy 3297 contr pay_amount pay_player map x y force_find force_add destroy
3026 insert remove name archname title slaying race decrease_ob_nr 3298 insert remove name archname title slaying race decrease split
3299 value
3027 3300
3028 cf::object::player 3301 cf::object::player
3029 player 3302 player
3030 3303
3031 cf::player 3304 cf::player
3036 3309
3037=cut 3310=cut
3038 3311
3039for ( 3312for (
3040 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3313 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3041 insert remove inv name archname title slaying race 3314 insert remove inv nrof name archname title slaying race
3042 decrease_ob_nr destroy)], 3315 decrease split destroy change_exp value msg lore send_msg)],
3043 ["cf::object::player" => qw(player)], 3316 ["cf::object::player" => qw(player)],
3044 ["cf::player" => qw(peaceful)], 3317 ["cf::player" => qw(peaceful send_msg)],
3045 ["cf::map" => qw(trigger)], 3318 ["cf::map" => qw(trigger)],
3046) { 3319) {
3047 no strict 'refs';
3048 my ($pkg, @funs) = @$_; 3320 my ($pkg, @funs) = @$_;
3049 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3321 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3050 for @funs; 3322 for @funs;
3051} 3323}
3052 3324
3067 3339
3068 my $qcode = $code; 3340 my $qcode = $code;
3069 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3341 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3070 $qcode =~ s/\n/\\n/g; 3342 $qcode =~ s/\n/\\n/g;
3071 3343
3344 %vars = (_dummy => 0) unless %vars;
3345
3346 my @res;
3072 local $_; 3347 local $_;
3073 local @safe::cf::_safe_eval_args = values %vars;
3074 3348
3075 my $eval = 3349 my $eval =
3076 "do {\n" 3350 "do {\n"
3077 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3351 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3078 . "#line 0 \"{$qcode}\"\n" 3352 . "#line 0 \"{$qcode}\"\n"
3079 . $code 3353 . $code
3080 . "\n}" 3354 . "\n}"
3081 ; 3355 ;
3082 3356
3357 if ($CFG{safe_eval}) {
3083 sub_generation_inc; 3358 sub_generation_inc;
3359 local @safe::cf::_safe_eval_args = values %vars;
3084 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3360 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3085 sub_generation_inc; 3361 sub_generation_inc;
3362 } else {
3363 local @cf::_safe_eval_args = values %vars;
3364 @res = wantarray ? eval eval : scalar eval $eval;
3365 }
3086 3366
3087 if ($@) { 3367 if ($@) {
3088 warn "$@"; 3368 warn "$@",
3089 warn "while executing safe code '$code'\n"; 3369 "while executing safe code '$code'\n",
3090 warn "with arguments " . (join " ", %vars) . "\n"; 3370 "with arguments " . (join " ", %vars) . "\n";
3091 } 3371 }
3092 3372
3093 wantarray ? @res : $res[0] 3373 wantarray ? @res : $res[0]
3094} 3374}
3095 3375
3109=cut 3389=cut
3110 3390
3111sub register_script_function { 3391sub register_script_function {
3112 my ($fun, $cb) = @_; 3392 my ($fun, $cb) = @_;
3113 3393
3114 no strict 'refs'; 3394 $fun = "safe::$fun" if $CFG{safe_eval};
3115 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3395 *$fun = $safe_hole->wrap ($cb);
3116} 3396}
3117 3397
3118=back 3398=back
3119 3399
3120=cut 3400=cut
3129 # for this (global event?) 3409 # for this (global event?)
3130 %ext::player_env::MUSIC_FACE_CACHE = (); 3410 %ext::player_env::MUSIC_FACE_CACHE = ();
3131 3411
3132 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3412 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3133 3413
3134 warn "loading facedata from $path\n"; 3414 trace "loading facedata from $path\n";
3135 3415
3136 my $facedata;
3137 0 < aio_load $path, $facedata 3416 0 < aio_load $path, my $facedata
3138 or die "$path: $!"; 3417 or die "$path: $!";
3139 3418
3140 $facedata = Coro::Storable::thaw $facedata; 3419 $facedata = Coro::Storable::thaw $facedata;
3141 3420
3142 $facedata->{version} == 2 3421 $facedata->{version} == 2
3143 or cf::cleanup "$path: version mismatch, cannot proceed."; 3422 or cf::cleanup "$path: version mismatch, cannot proceed.";
3144 3423
3145 # patch in the exptable 3424 # patch in the exptable
3425 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3146 $facedata->{resource}{"res/exp_table"} = { 3426 $facedata->{resource}{"res/exp_table"} = {
3147 type => FT_RSRC, 3427 type => FT_RSRC,
3148 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3428 data => $exp_table,
3429 hash => (Digest::MD5::md5 $exp_table),
3149 }; 3430 };
3150 cf::cede_to_tick; 3431 cf::cede_to_tick;
3151 3432
3152 { 3433 {
3153 my $faces = $facedata->{faceinfo}; 3434 my $faces = $facedata->{faceinfo};
3155 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
3156 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3437 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3157 3438
3158 cf::face::set_visibility $idx, $info->{visibility}; 3439 cf::face::set_visibility $idx, $info->{visibility};
3159 cf::face::set_magicmap $idx, $info->{magicmap}; 3440 cf::face::set_magicmap $idx, $info->{magicmap};
3160 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3441 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3161 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3442 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3162 3443
3163 cf::cede_to_tick; 3444 cf::cede_to_tick;
3164 } 3445 }
3165 3446
3166 while (my ($face, $info) = each %$faces) { 3447 while (my ($face, $info) = each %$faces) {
3171 3452
3172 if (my $smooth = cf::face::find $info->{smooth}) { 3453 if (my $smooth = cf::face::find $info->{smooth}) {
3173 cf::face::set_smooth $idx, $smooth; 3454 cf::face::set_smooth $idx, $smooth;
3174 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3455 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3175 } else { 3456 } else {
3176 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3457 error "smooth face '$info->{smooth}' not found for face '$face'";
3177 } 3458 }
3178 3459
3179 cf::cede_to_tick; 3460 cf::cede_to_tick;
3180 } 3461 }
3181 } 3462 }
3190 3471
3191 cf::anim::invalidate_all; # d'oh 3472 cf::anim::invalidate_all; # d'oh
3192 } 3473 }
3193 3474
3194 { 3475 {
3195 # TODO: for gcfclient pleasure, we should give resources
3196 # that gcfclient doesn't grok a >10000 face index.
3197 my $res = $facedata->{resource}; 3476 my $res = $facedata->{resource};
3198 3477
3199 while (my ($name, $info) = each %$res) { 3478 while (my ($name, $info) = each %$res) {
3200 if (defined $info->{type}) { 3479 if (defined $info->{type}) {
3201 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3480 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3202 my $data;
3203 3481
3204 if ($info->{type} & 1) { 3482 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}; 3483 cf::face::set_type $idx, $info->{type};
3219 } else { 3484 } else {
3220 $RESOURCE{$name} = $info; 3485 $RESOURCE{$name} = $info; # unused
3221 } 3486 }
3222 3487
3223 cf::cede_to_tick; 3488 cf::cede_to_tick;
3224 } 3489 }
3225 } 3490 }
3226 3491
3227 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3492 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3228 3493
3229 1 3494 1
3230} 3495}
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 3496
3252register_exticmd fx_want => sub { 3497register_exticmd fx_want => sub {
3253 my ($ns, $want) = @_; 3498 my ($ns, $want) = @_;
3254 3499
3255 while (my ($k, $v) = each %$want) { 3500 while (my ($k, $v) = each %$want) {
3256 $ns->fx_want ($k, $v); 3501 $ns->fx_want ($k, $v);
3257 } 3502 }
3258}; 3503};
3504
3505sub load_resource_file($) {
3506 my $guard = lock_acquire "load_resource_file";
3507
3508 my $status = load_resource_file_ $_[0];
3509 get_slot 0.1, 100;
3510 cf::arch::commit_load;
3511
3512 $status
3513}
3259 3514
3260sub reload_regions { 3515sub reload_regions {
3261 # HACK to clear player env face cache, we need some signal framework 3516 # HACK to clear player env face cache, we need some signal framework
3262 # for this (global event?) 3517 # for this (global event?)
3263 %ext::player_env::MUSIC_FACE_CACHE = (); 3518 %ext::player_env::MUSIC_FACE_CACHE = ();
3277} 3532}
3278 3533
3279sub reload_archetypes { 3534sub reload_archetypes {
3280 load_resource_file "$DATADIR/archetypes" 3535 load_resource_file "$DATADIR/archetypes"
3281 or die "unable to load archetypes\n"; 3536 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} 3537}
3288 3538
3289sub reload_treasures { 3539sub reload_treasures {
3290 load_resource_file "$DATADIR/treasures" 3540 load_resource_file "$DATADIR/treasures"
3291 or die "unable to load treasurelists\n"; 3541 or die "unable to load treasurelists\n";
3292} 3542}
3293 3543
3544sub reload_sound {
3545 trace "loading sound config from $DATADIR/sound\n";
3546
3547 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3548 or die "$DATADIR/sound $!";
3549
3550 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3551
3552 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3553 my $sound = $soundconf->{compat}[$_]
3554 or next;
3555
3556 my $face = cf::face::find "sound/$sound->[1]";
3557 cf::sound::set $sound->[0] => $face;
3558 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3559 }
3560
3561 while (my ($k, $v) = each %{$soundconf->{event}}) {
3562 my $face = cf::face::find "sound/$v";
3563 cf::sound::set $k => $face;
3564 }
3565}
3566
3294sub reload_resources { 3567sub reload_resources {
3295 warn "reloading resource files...\n"; 3568 trace "reloading resource files...\n";
3296 3569
3570 reload_exp_table;
3571 reload_materials;
3572 reload_facedata;
3573 reload_sound;
3574 reload_archetypes;
3297 reload_regions; 3575 reload_regions;
3298 reload_facedata;
3299 #reload_archetypes;#d#
3300 reload_archetypes;
3301 reload_treasures; 3576 reload_treasures;
3302 3577
3303 warn "finished reloading resource files\n"; 3578 trace "finished reloading resource files\n";
3304}
3305
3306sub init {
3307 reload_resources;
3308} 3579}
3309 3580
3310sub reload_config { 3581sub reload_config {
3311 open my $fh, "<:utf8", "$CONFDIR/config" 3582 trace "reloading config file...\n";
3312 or return;
3313 3583
3314 local $/; 3584 0 < aio_load "$CONFDIR/config", my $config
3315 *CFG = YAML::Load <$fh>; 3585 or die "$CONFDIR/config: $!";
3316 3586
3587 utf8::decode $config;
3588 *CFG = yaml_load $config;
3589
3317 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3590 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3318 3591
3319 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3592 $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}; 3593 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3321 3594
3322 if (exists $CFG{mlockall}) { 3595 if (exists $CFG{mlockall}) {
3326 }; 3599 };
3327 warn $@ if $@; 3600 warn $@ if $@;
3328 } 3601 }
3329} 3602}
3330 3603
3604sub pidfile() {
3605 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3606 or die "$PIDFILE: $!";
3607 flock $fh, &Fcntl::LOCK_EX
3608 or die "$PIDFILE: flock: $!";
3609 $fh
3610}
3611
3612# make sure only one server instance is running at any one time
3613sub atomic {
3614 my $fh = pidfile;
3615
3616 my $pid = <$fh>;
3617 kill 9, $pid if $pid > 0;
3618
3619 seek $fh, 0, 0;
3620 print $fh $$;
3621}
3622
3623sub main_loop {
3624 trace "EV::loop starting\n";
3625 if (1) {
3626 EV::loop;
3627 }
3628 trace "EV::loop returned\n";
3629 goto &main_loop unless $REALLY_UNLOOP;
3630}
3631
3331sub main { 3632sub main {
3633 cf::init_globals; # initialise logging
3634
3635 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3636 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3637 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3638 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3639
3640 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3641
3332 # we must not ever block the main coroutine 3642 # we must not ever block the main coroutine
3333 local $Coro::idle = sub { 3643 local $Coro::idle = sub {
3334 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3644 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3335 (async { 3645 (async {
3336 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3646 $Coro::current->{desc} = "IDLE BUG HANDLER";
3337 EV::loop EV::LOOP_ONESHOT; 3647 EV::loop EV::LOOP_ONESHOT;
3338 })->prio (Coro::PRIO_MAX); 3648 })->prio (Coro::PRIO_MAX);
3339 }; 3649 };
3340 3650
3651 evthread_start IO::AIO::poll_fileno;
3652
3653 cf::sync_job {
3654 cf::incloader::init ();
3655
3656 cf::init_anim;
3657 cf::init_attackmess;
3658 cf::init_dynamic;
3659
3660 cf::load_settings;
3661
3662 reload_resources;
3341 reload_config; 3663 reload_config;
3342 db_init; 3664 db_init;
3665
3666 cf::init_uuid;
3667 cf::init_signals;
3668 cf::init_skills;
3669
3670 cf::init_beforeplay;
3671
3672 atomic;
3673
3343 load_extensions; 3674 load_extensions;
3344 3675
3345 $TICK_WATCHER->start; 3676 utime time, time, $RUNTIMEFILE;
3346 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3677
3347 EV::loop; 3678 # no (long-running) fork's whatsoever before this point(!)
3679 use POSIX ();
3680 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3681
3682 cf::_post_init 0;
3683 };
3684
3685 cf::object::thawer::errors_are_fatal 0;
3686 info "parse errors in files are no longer fatal from this point on.\n";
3687
3688 my $free_main; $free_main = EV::idle sub {
3689 undef $free_main;
3690 undef &main; # free gobs of memory :)
3691 };
3692
3693 goto &main_loop;
3348} 3694}
3349 3695
3350############################################################################# 3696#############################################################################
3351# initialisation and cleanup 3697# initialisation and cleanup
3352 3698
3353# install some emergency cleanup handlers 3699# install some emergency cleanup handlers
3354BEGIN { 3700BEGIN {
3355 our %SIGWATCHER = (); 3701 our %SIGWATCHER = ();
3356 for my $signal (qw(INT HUP TERM)) { 3702 for my $signal (qw(INT HUP TERM)) {
3357 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3703 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3358 cf::cleanup "SIG$signal"; 3704 cf::cleanup "SIG$signal";
3359 }; 3705 };
3360 } 3706 }
3361} 3707}
3362 3708
3363sub write_runtime { 3709sub write_runtime_sync {
3364 my $runtime = "$LOCALDIR/runtime"; 3710 my $t0 = AE::time;
3365 3711
3366 # first touch the runtime file to show we are still running: 3712 # first touch the runtime file to show we are still running:
3367 # the fsync below can take a very very long time. 3713 # the fsync below can take a very very long time.
3368 3714
3369 IO::AIO::aio_utime $runtime, undef, undef; 3715 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3370 3716
3371 my $guard = cf::lock_acquire "write_runtime"; 3717 my $guard = cf::lock_acquire "write_runtime";
3372 3718
3373 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3719 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3374 or return; 3720 or return;
3375 3721
3376 my $value = $cf::RUNTIME + 90 + 10; 3722 my $value = $cf::RUNTIME + 90 + 10;
3377 # 10 is the runtime save interval, for a monotonic clock 3723 # 10 is the runtime save interval, for a monotonic clock
3378 # 60 allows for the watchdog to kill the server. 3724 # 60 allows for the watchdog to kill the server.
3388 aio_utime $fh, undef, undef; 3734 aio_utime $fh, undef, undef;
3389 3735
3390 close $fh 3736 close $fh
3391 or return; 3737 or return;
3392 3738
3393 aio_rename "$runtime~", $runtime 3739 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3394 and return; 3740 and return;
3395 3741
3396 warn "runtime file written.\n"; 3742 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3397 3743
3398 1 3744 1
3745}
3746
3747our $uuid_lock;
3748our $uuid_skip;
3749
3750sub write_uuid_sync($) {
3751 $uuid_skip ||= $_[0];
3752
3753 return if $uuid_lock;
3754 local $uuid_lock = 1;
3755
3756 my $uuid = "$LOCALDIR/uuid";
3757
3758 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3759 or return;
3760
3761 my $value = uuid_seq uuid_cur;
3762
3763 unless ($value) {
3764 info "cowardly refusing to write zero uuid value!\n";
3765 return;
3766 }
3767
3768 my $value = uuid_str $value + $uuid_skip;
3769 $uuid_skip = 0;
3770
3771 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3772 and return;
3773
3774 # always fsync - this file is important
3775 aio_fsync $fh
3776 and return;
3777
3778 close $fh
3779 or return;
3780
3781 aio_rename "$uuid~", $uuid
3782 and return;
3783
3784 trace "uuid file written ($value).\n";
3785
3786 1
3787
3788}
3789
3790sub write_uuid($$) {
3791 my ($skip, $sync) = @_;
3792
3793 $sync ? write_uuid_sync $skip
3794 : async { write_uuid_sync $skip };
3399} 3795}
3400 3796
3401sub emergency_save() { 3797sub emergency_save() {
3402 my $freeze_guard = cf::freeze_mainloop; 3798 my $freeze_guard = cf::freeze_mainloop;
3403 3799
3404 warn "enter emergency perl save\n"; 3800 info "emergency_perl_save: enter\n";
3801
3802 # this is a trade-off: we want to be very quick here, so
3803 # save all maps without fsync, and later call a global sync
3804 # (which in turn might be very very slow)
3805 local $USE_FSYNC = 0;
3405 3806
3406 cf::sync_job { 3807 cf::sync_job {
3808 cf::write_runtime_sync; # external watchdog should not bark
3809
3407 # use a peculiar iteration method to avoid tripping on perl 3810 # use a peculiar iteration method to avoid tripping on perl
3408 # refcount bugs in for. also avoids problems with players 3811 # refcount bugs in for. also avoids problems with players
3409 # and maps saved/destroyed asynchronously. 3812 # and maps saved/destroyed asynchronously.
3410 warn "begin emergency player save\n"; 3813 info "emergency_perl_save: begin player save\n";
3411 for my $login (keys %cf::PLAYER) { 3814 for my $login (keys %cf::PLAYER) {
3412 my $pl = $cf::PLAYER{$login} or next; 3815 my $pl = $cf::PLAYER{$login} or next;
3413 $pl->valid or next; 3816 $pl->valid or next;
3414 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3817 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3415 $pl->save; 3818 $pl->save;
3416 } 3819 }
3417 warn "end emergency player save\n"; 3820 info "emergency_perl_save: end player save\n";
3418 3821
3419 warn "begin emergency map save\n"; 3822 cf::write_runtime_sync; # external watchdog should not bark
3823
3824 info "emergency_perl_save: begin map save\n";
3420 for my $path (keys %cf::MAP) { 3825 for my $path (keys %cf::MAP) {
3421 my $map = $cf::MAP{$path} or next; 3826 my $map = $cf::MAP{$path} or next;
3422 $map->valid or next; 3827 $map->valid or next;
3423 $map->save; 3828 $map->save;
3424 } 3829 }
3425 warn "end emergency map save\n"; 3830 info "emergency_perl_save: end map save\n";
3426 3831
3427 warn "begin emergency database checkpoint\n"; 3832 cf::write_runtime_sync; # external watchdog should not bark
3833
3834 info "emergency_perl_save: begin database checkpoint\n";
3428 BDB::db_env_txn_checkpoint $DB_ENV; 3835 BDB::db_env_txn_checkpoint $DB_ENV;
3429 warn "end emergency database checkpoint\n"; 3836 info "emergency_perl_save: end database checkpoint\n";
3837
3838 info "emergency_perl_save: begin write uuid\n";
3839 write_uuid_sync 1;
3840 info "emergency_perl_save: end write uuid\n";
3841
3842 cf::write_runtime_sync; # external watchdog should not bark
3843
3844 trace "emergency_perl_save: syncing database to disk";
3845 BDB::db_env_txn_checkpoint $DB_ENV;
3846
3847 info "emergency_perl_save: starting sync\n";
3848 IO::AIO::aio_sync sub {
3849 info "emergency_perl_save: finished sync\n";
3850 };
3851
3852 cf::write_runtime_sync; # external watchdog should not bark
3853
3854 trace "emergency_perl_save: flushing outstanding aio requests";
3855 while (IO::AIO::nreqs || BDB::nreqs) {
3856 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3857 }
3858
3859 cf::write_runtime_sync; # external watchdog should not bark
3430 }; 3860 };
3431 3861
3432 warn "leave emergency perl save\n"; 3862 info "emergency_perl_save: leave\n";
3433} 3863}
3434 3864
3435sub post_cleanup { 3865sub post_cleanup {
3436 my ($make_core) = @_; 3866 my ($make_core) = @_;
3437 3867
3868 IO::AIO::flush;
3869
3438 warn Carp::longmess "post_cleanup backtrace" 3870 error Carp::longmess "post_cleanup backtrace"
3439 if $make_core; 3871 if $make_core;
3872
3873 my $fh = pidfile;
3874 unlink $PIDFILE if <$fh> == $$;
3875}
3876
3877# a safer delete_package, copied from Symbol
3878sub clear_package($) {
3879 my $pkg = shift;
3880
3881 # expand to full symbol table name if needed
3882 unless ($pkg =~ /^main::.*::$/) {
3883 $pkg = "main$pkg" if $pkg =~ /^::/;
3884 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3885 $pkg .= '::' unless $pkg =~ /::$/;
3886 }
3887
3888 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3889 my $stem_symtab = *{$stem}{HASH};
3890
3891 defined $stem_symtab and exists $stem_symtab->{$leaf}
3892 or return;
3893
3894 # clear all symbols
3895 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3896 for my $name (keys %$leaf_symtab) {
3897 _gv_clear *{"$pkg$name"};
3898# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3899 }
3440} 3900}
3441 3901
3442sub do_reload_perl() { 3902sub do_reload_perl() {
3443 # can/must only be called in main 3903 # can/must only be called in main
3444 if ($Coro::current != $Coro::main) { 3904 unless (in_main) {
3445 warn "can only reload from main coroutine"; 3905 error "can only reload from main coroutine";
3446 return; 3906 return;
3447 } 3907 }
3448 3908
3449 warn "reloading..."; 3909 return if $RELOAD++;
3450 3910
3451 warn "entering sync_job"; 3911 my $t1 = AE::time;
3452 3912
3913 while ($RELOAD) {
3914 cf::get_slot 0.1, -1, "reload_perl";
3915 info "perl_reload: reloading...";
3916
3917 trace "perl_reload: entering sync_job";
3918
3453 cf::sync_job { 3919 cf::sync_job {
3454 cf::write_runtime; # external watchdog should not bark
3455 cf::emergency_save; 3920 #cf::emergency_save;
3456 cf::write_runtime; # external watchdog should not bark
3457 3921
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"; 3922 trace "perl_reload: cancelling all extension coros";
3475 $_->cancel for values %EXT_CORO; 3923 $_->cancel for values %EXT_CORO;
3476 %EXT_CORO = (); 3924 %EXT_CORO = ();
3477 3925
3478 warn "removing commands"; 3926 trace "perl_reload: removing commands";
3479 %COMMAND = (); 3927 %COMMAND = ();
3480 3928
3481 warn "removing ext/exti commands"; 3929 trace "perl_reload: removing ext/exti commands";
3482 %EXTCMD = (); 3930 %EXTCMD = ();
3483 %EXTICMD = (); 3931 %EXTICMD = ();
3484 3932
3485 warn "unloading/nuking all extensions"; 3933 trace "perl_reload: unloading/nuking all extensions";
3486 for my $pkg (@EXTS) { 3934 for my $pkg (@EXTS) {
3487 warn "... unloading $pkg"; 3935 trace "... unloading $pkg";
3488 3936
3489 if (my $cb = $pkg->can ("unload")) { 3937 if (my $cb = $pkg->can ("unload")) {
3490 eval { 3938 eval {
3491 $cb->($pkg); 3939 $cb->($pkg);
3492 1 3940 1
3493 } or warn "$pkg unloaded, but with errors: $@"; 3941 } or error "$pkg unloaded, but with errors: $@";
3942 }
3943
3944 trace "... clearing $pkg";
3945 clear_package $pkg;
3494 } 3946 }
3495 3947
3496 warn "... nuking $pkg";
3497 Symbol::delete_package $pkg;
3498 }
3499
3500 warn "unloading all perl modules loaded from $LIBDIR"; 3948 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3501 while (my ($k, $v) = each %INC) { 3949 while (my ($k, $v) = each %INC) {
3502 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3950 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3503 3951
3504 warn "... unloading $k"; 3952 trace "... unloading $k";
3505 delete $INC{$k}; 3953 delete $INC{$k};
3506 3954
3507 $k =~ s/\.pm$//; 3955 $k =~ s/\.pm$//;
3508 $k =~ s/\//::/g; 3956 $k =~ s/\//::/g;
3509 3957
3510 if (my $cb = $k->can ("unload_module")) { 3958 if (my $cb = $k->can ("unload_module")) {
3511 $cb->(); 3959 $cb->();
3960 }
3961
3962 clear_package $k;
3512 } 3963 }
3513 3964
3514 Symbol::delete_package $k;
3515 }
3516
3517 warn "getting rid of safe::, as good as possible"; 3965 trace "perl_reload: getting rid of safe::, as good as possible";
3518 Symbol::delete_package "safe::$_" 3966 clear_package "safe::$_"
3519 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3967 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3520 3968
3521 warn "unloading cf.pm \"a bit\""; 3969 trace "perl_reload: unloading cf.pm \"a bit\"";
3522 delete $INC{"cf.pm"}; 3970 delete $INC{"cf.pm"};
3523 delete $INC{"cf/pod.pm"}; 3971 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3524 3972
3525 # don't, removes xs symbols, too, 3973 # don't, removes xs symbols, too,
3526 # and global variables created in xs 3974 # and global variables created in xs
3527 #Symbol::delete_package __PACKAGE__; 3975 #clear_package __PACKAGE__;
3528 3976
3529 warn "unload completed, starting to reload now"; 3977 info "perl_reload: unload completed, starting to reload now";
3530 3978
3531 warn "reloading cf.pm"; 3979 trace "perl_reload: reloading cf.pm";
3532 require cf; 3980 require cf;
3533 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3981 cf::_connect_to_perl_1;
3534 3982
3535 warn "loading config and database again"; 3983 trace "perl_reload: loading config and database again";
3536 cf::reload_config; 3984 cf::reload_config;
3537 3985
3538 warn "loading extensions"; 3986 trace "perl_reload: loading extensions";
3539 cf::load_extensions; 3987 cf::load_extensions;
3540 3988
3989 if ($REATTACH_ON_RELOAD) {
3541 warn "reattaching attachments to objects/players"; 3990 trace "perl_reload: reattaching attachments to objects/players";
3542 _global_reattach; # objects, sockets 3991 _global_reattach; # objects, sockets
3543 warn "reattaching attachments to maps"; 3992 trace "perl_reload: reattaching attachments to maps";
3544 reattach $_ for values %MAP; 3993 reattach $_ for values %MAP;
3545 warn "reattaching attachments to players"; 3994 trace "perl_reload: reattaching attachments to players";
3546 reattach $_ for values %PLAYER; 3995 reattach $_ for values %PLAYER;
3996 }
3547 3997
3548 warn "leaving sync_job"; 3998 cf::_post_init 1;
3549 3999
4000 trace "perl_reload: leaving sync_job";
4001
3550 1 4002 1
3551 } or do { 4003 } or do {
3552 warn $@; 4004 error $@;
3553 warn "error while reloading, exiting."; 4005 cf::cleanup "perl_reload: error, exiting.";
3554 exit 1; 4006 };
4007
4008 --$RELOAD;
3555 }; 4009 }
3556 4010
3557 warn "reloaded"; 4011 $t1 = AE::time - $t1;
4012 info "perl_reload: completed in ${t1}s\n";
3558}; 4013};
3559 4014
3560our $RELOAD_WATCHER; # used only during reload 4015our $RELOAD_WATCHER; # used only during reload
3561 4016
3562sub reload_perl() { 4017sub reload_perl() {
3563 # doing reload synchronously and two reloads happen back-to-back, 4018 # doing reload synchronously and two reloads happen back-to-back,
3564 # coro crashes during coro_state_free->destroy here. 4019 # coro crashes during coro_state_free->destroy here.
3565 4020
4021 $RELOAD_WATCHER ||= cf::async {
4022 Coro::AIO::aio_wait cache_extensions;
4023
3566 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4024 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
4025 do_reload_perl;
3567 undef $RELOAD_WATCHER; 4026 undef $RELOAD_WATCHER;
3568 do_reload_perl; 4027 };
3569 }; 4028 };
3570} 4029}
3571 4030
3572register_command "reload" => sub { 4031register_command "reload" => sub {
3573 my ($who, $arg) = @_; 4032 my ($who, $arg) = @_;
3579 reload_perl; 4038 reload_perl;
3580 }; 4039 };
3581 } 4040 }
3582}; 4041};
3583 4042
3584unshift @INC, $LIBDIR; 4043#############################################################################
3585 4044
3586my $bug_warning = 0; 4045my $bug_warning = 0;
3587 4046
3588our @WAIT_FOR_TICK; 4047our @WAIT_FOR_TICK;
3589our @WAIT_FOR_TICK_BEGIN; 4048our @WAIT_FOR_TICK_BEGIN;
3590 4049
3591sub wait_for_tick { 4050sub wait_for_tick() {
3592 return unless $TICK_WATCHER->is_active;
3593 return if $Coro::current == $Coro::main; 4051 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3594 4052
3595 my $signal = new Coro::Signal; 4053 my $signal = new Coro::Signal;
3596 push @WAIT_FOR_TICK, $signal; 4054 push @WAIT_FOR_TICK, $signal;
3597 $signal->wait; 4055 $signal->wait;
3598} 4056}
3599 4057
3600sub wait_for_tick_begin { 4058sub wait_for_tick_begin() {
3601 return unless $TICK_WATCHER->is_active;
3602 return if $Coro::current == $Coro::main; 4059 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3603 4060
3604 my $signal = new Coro::Signal; 4061 my $signal = new Coro::Signal;
3605 push @WAIT_FOR_TICK_BEGIN, $signal; 4062 push @WAIT_FOR_TICK_BEGIN, $signal;
3606 $signal->wait; 4063 $signal->wait;
3607} 4064}
3608 4065
3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 4066sub tick {
3610 if ($Coro::current != $Coro::main) { 4067 if ($Coro::current != $Coro::main) {
3611 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4068 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3612 unless ++$bug_warning > 10; 4069 unless ++$bug_warning > 10;
3613 return; 4070 return;
3614 } 4071 }
3615 4072
3616 $NOW = $tick_start = EV::now;
3617
3618 cf::server_tick; # one server iteration 4073 cf::server_tick; # one server iteration
3619 4074
3620 $RUNTIME += $TICK; 4075 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3621 $NEXT_TICK = $_[0]->at;
3622 4076
3623 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4077 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3624 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4078 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3625 Coro::async_pool { 4079 Coro::async_pool {
3626 $Coro::current->{desc} = "runtime saver"; 4080 $Coro::current->{desc} = "runtime saver";
3627 write_runtime 4081 write_runtime_sync
3628 or warn "ERROR: unable to write runtime file: $!"; 4082 or error "ERROR: unable to write runtime file: $!";
3629 }; 4083 };
3630 } 4084 }
3631 4085
3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4086 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3633 $sig->send; 4087 $sig->send;
3634 } 4088 }
3635 while (my $sig = shift @WAIT_FOR_TICK) { 4089 while (my $sig = shift @WAIT_FOR_TICK) {
3636 $sig->send; 4090 $sig->send;
3637 } 4091 }
3638 4092
3639 $LOAD = ($NOW - $tick_start) / $TICK; 4093 $LOAD = ($NOW - $TICK_START) / $TICK;
3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4094 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3641 4095
3642 _post_tick; 4096 if (0) {
3643}; 4097 if ($NEXT_TICK) {
3644$TICK_WATCHER->priority (EV::MAXPRI); 4098 my $jitter = $TICK_START - $NEXT_TICK;
4099 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4100 debug "jitter $JITTER\n";#d#
4101 }
4102 }
4103}
3645 4104
3646{ 4105{
3647 # configure BDB 4106 # configure BDB
3648 4107
3649 BDB::min_parallel 8; 4108 BDB::min_parallel 16;
3650 BDB::max_poll_reqs $TICK * 0.1; 4109 BDB::max_poll_reqs $TICK * 0.1;
3651 $Coro::BDB::WATCHER->priority (1); 4110 $AnyEvent::BDB::WATCHER->priority (1);
3652 4111
3653 unless ($DB_ENV) { 4112 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 4113 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4114 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656 | BDB::LOG_AUTOREMOVE, 1); 4115 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4116 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4117 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4118 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659 4119
3660 cf::sync_job { 4120 cf::sync_job {
3661 eval { 4121 eval {
3687{ 4147{
3688 # configure IO::AIO 4148 # configure IO::AIO
3689 4149
3690 IO::AIO::min_parallel 8; 4150 IO::AIO::min_parallel 8;
3691 IO::AIO::max_poll_time $TICK * 0.1; 4151 IO::AIO::max_poll_time $TICK * 0.1;
3692 $Coro::AIO::WATCHER->priority (1); 4152 undef $AnyEvent::AIO::WATCHER;
3693} 4153}
3694 4154
3695my $_log_backtrace; 4155my $_log_backtrace;
3696 4156
3697sub _log_backtrace { 4157sub _log_backtrace {
3700 $msg =~ s/\n//; 4160 $msg =~ s/\n//;
3701 4161
3702 # limit the # of concurrent backtraces 4162 # limit the # of concurrent backtraces
3703 if ($_log_backtrace < 2) { 4163 if ($_log_backtrace < 2) {
3704 ++$_log_backtrace; 4164 ++$_log_backtrace;
4165 my $perl_bt = Carp::longmess $msg;
3705 async { 4166 async {
3706 $Coro::current->{desc} = "abt $msg"; 4167 $Coro::current->{desc} = "abt $msg";
3707 4168
3708 my @bt = fork_call { 4169 my @bt = fork_call {
3709 @addr = map { sprintf "%x", $_ } @addr; 4170 @addr = map { sprintf "%x", $_ } @addr;
3720 } 4181 }
3721 4182
3722 @funcs 4183 @funcs
3723 }; 4184 };
3724 4185
3725 LOG llevInfo, "[ABT] $msg\n"; 4186 LOG llevInfo, "[ABT] $perl_bt\n";
4187 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3726 LOG llevInfo, "[ABT] $_\n" for @bt; 4188 LOG llevInfo, "[ABT] $_\n" for @bt;
3727 --$_log_backtrace; 4189 --$_log_backtrace;
3728 }; 4190 };
3729 } else { 4191 } else {
3730 LOG llevInfo, "[ABT] $msg\n"; 4192 LOG llevInfo, "[ABT] $msg\n";
3731 LOG llevInfo, "[ABT] [suppressed]\n"; 4193 LOG llevInfo, "[ABT] [suppressed]\n";
3732 } 4194 }
3733} 4195}
3734 4196
3735# load additional modules 4197# load additional modules
3736use cf::pod; 4198require "cf/$_.pm" for @EXTRA_MODULES;
4199cf::_connect_to_perl_2;
3737 4200
3738END { cf::emergency_save } 4201END { cf::emergency_save }
3739 4202
37401 42031
3741 4204

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines