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.549 by root, Tue May 11 13:19:59 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
270=item cf::lock_wait $string 388=item cf::lock_wait $string
271 389
272Wait until the given lock is available. See cf::lock_acquire. 390Wait until the given lock is available. See cf::lock_acquire.
273 391
274=item my $lock = cf::lock_acquire $string 392=item my $lock = cf::lock_acquire $string
275 393
276Wait until the given lock is available and then acquires it and returns 394Wait 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, 395a L<Guard> object. If the guard object gets destroyed (goes out of scope,
278for example when the coroutine gets canceled), the lock is automatically 396for example when the coroutine gets canceled), the lock is automatically
279returned. 397returned.
280 398
281Locks are *not* recursive, locking from the same coro twice results in a 399Locks are *not* recursive, locking from the same coro twice results in a
282deadlocked coro. 400deadlocked coro.
288 406
289Return true if the lock is currently active, i.e. somebody has locked it. 407Return true if the lock is currently active, i.e. somebody has locked it.
290 408
291=cut 409=cut
292 410
293our %LOCK; 411our $LOCKS = new Coro::SemaphoreSet;
294our %LOCKER;#d#
295 412
296sub lock_wait($) { 413sub lock_wait($) {
297 my ($key) = @_; 414 $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} 415}
310 416
311sub lock_acquire($) { 417sub lock_acquire($) {
312 my ($key) = @_; 418 $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} 419}
326 420
327sub lock_active($) { 421sub lock_active($) {
328 my ($key) = @_; 422 $LOCKS->count ($_[0]) < 1
329
330 ! ! $LOCK{$key}
331} 423}
332 424
333sub freeze_mainloop { 425sub freeze_mainloop {
334 return unless $TICK_WATCHER->is_active; 426 tick_inhibit_inc;
335 427
336 my $guard = Coro::guard { 428 &Guard::guard (\&tick_inhibit_dec);
337 $TICK_WATCHER->start;
338 };
339 $TICK_WATCHER->stop;
340 $guard
341} 429}
342 430
343=item cf::periodic $interval, $cb 431=item cf::periodic $interval, $cb
344 432
345Like EV::periodic, but randomly selects a starting point so that the actions 433Like EV::periodic, but randomly selects a starting point so that the actions
346get spread over timer. 434get spread over time.
347 435
348=cut 436=cut
349 437
350sub periodic($$) { 438sub periodic($$) {
351 my ($interval, $cb) = @_; 439 my ($interval, $cb) = @_;
368 456
369=cut 457=cut
370 458
371our @SLOT_QUEUE; 459our @SLOT_QUEUE;
372our $SLOT_QUEUE; 460our $SLOT_QUEUE;
461our $SLOT_DECAY = 0.9;
373 462
374$SLOT_QUEUE->cancel if $SLOT_QUEUE; 463$SLOT_QUEUE->cancel if $SLOT_QUEUE;
375$SLOT_QUEUE = Coro::async { 464$SLOT_QUEUE = Coro::async {
376 $Coro::current->desc ("timeslot manager"); 465 $Coro::current->desc ("timeslot manager");
377 466
378 my $signal = new Coro::Signal; 467 my $signal = new Coro::Signal;
468 my $busy;
379 469
380 while () { 470 while () {
381 next_job: 471 next_job:
472
382 my $avail = cf::till_tick; 473 my $avail = cf::till_tick;
383 if ($avail > 0.01) { 474
384 for (0 .. $#SLOT_QUEUE) { 475 for (0 .. $#SLOT_QUEUE) {
385 if ($SLOT_QUEUE[$_][0] < $avail) { 476 if ($SLOT_QUEUE[$_][0] <= $avail) {
477 $busy = 0;
386 my $job = splice @SLOT_QUEUE, $_, 1, (); 478 my $job = splice @SLOT_QUEUE, $_, 1, ();
387 $job->[2]->send; 479 $job->[2]->send;
388 Coro::cede; 480 Coro::cede;
389 goto next_job; 481 goto next_job;
390 } 482 } else {
483 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
391 } 484 }
392 } 485 }
393 486
394 if (@SLOT_QUEUE) { 487 if (@SLOT_QUEUE) {
395 # we do not use wait_for_tick() as it returns immediately when tick is inactive 488 # we do not use wait_for_tick() as it returns immediately when tick is inactive
396 push @cf::WAIT_FOR_TICK, $signal; 489 push @cf::WAIT_FOR_TICK, $signal;
397 $signal->wait; 490 $signal->wait;
398 } else { 491 } else {
492 $busy = 0;
399 Coro::schedule; 493 Coro::schedule;
400 } 494 }
401 } 495 }
402}; 496};
403 497
404sub get_slot($;$$) { 498sub get_slot($;$$) {
499 return if tick_inhibit || $Coro::current == $Coro::main;
500
405 my ($time, $pri, $name) = @_; 501 my ($time, $pri, $name) = @_;
406 502
407 $time = $TICK * .6 if $time > $TICK * .6; 503 $time = clamp $time, 0.01, $TICK * .6;
504
408 my $sig = new Coro::Signal; 505 my $sig = new Coro::Signal;
409 506
410 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 507 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
411 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 508 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
412 $SLOT_QUEUE->ready; 509 $SLOT_QUEUE->ready;
438=cut 535=cut
439 536
440sub sync_job(&) { 537sub sync_job(&) {
441 my ($job) = @_; 538 my ($job) = @_;
442 539
443 if ($Coro::current == $Coro::main) { 540 if (in_main) {
444 my $time = EV::time; 541 my $time = AE::time;
445 542
446 # this is the main coro, too bad, we have to block 543 # this is the main coro, too bad, we have to block
447 # till the operation succeeds, freezing the server :/ 544 # till the operation succeeds, freezing the server :/
448 545
449 LOG llevError, Carp::longmess "sync job";#d# 546 #LOG llevError, Carp::longmess "sync job";#d#
450 547
451 # TODO: use suspend/resume instead
452 # (but this is cancel-safe)
453 my $freeze_guard = freeze_mainloop; 548 my $freeze_guard = freeze_mainloop;
454 549
455 my $busy = 1; 550 my $busy = 1;
456 my @res; 551 my @res;
457 552
458 (async { 553 (async {
459 $Coro::current->desc ("sync job coro"); 554 $Coro::current->desc ("sync job coro");
460 @res = eval { $job->() }; 555 @res = eval { $job->() };
461 warn $@ if $@; 556 error $@ if $@;
462 undef $busy; 557 undef $busy;
463 })->prio (Coro::PRIO_MAX); 558 })->prio (Coro::PRIO_MAX);
464 559
465 while ($busy) { 560 while ($busy) {
466 if (Coro::nready) { 561 if (Coro::nready) {
468 } else { 563 } else {
469 EV::loop EV::LOOP_ONESHOT; 564 EV::loop EV::LOOP_ONESHOT;
470 } 565 }
471 } 566 }
472 567
473 $time = EV::time - $time; 568 my $time = AE::time - $time;
474 569
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 570 $TICK_START += $time; # do not account sync jobs to server load
479 571
480 wantarray ? @res : $res[0] 572 wantarray ? @res : $res[0]
481 } else { 573 } else {
482 # we are in another coroutine, how wonderful, everything just works 574 # we are in another coroutine, how wonderful, everything just works
483 575
503 $EXT_CORO{$coro+0} = $coro; 595 $EXT_CORO{$coro+0} = $coro;
504 596
505 $coro 597 $coro
506} 598}
507 599
508=item fork_call { }, $args 600=item fork_call { }, @args
509 601
510Executes the given code block with the given arguments in a seperate 602Executes the given code block with the given arguments in a seperate
511process, returning the results. Everything must be serialisable with 603process, returning the results. Everything must be serialisable with
512Coro::Storable. May, of course, block. Note that the executed sub may 604Coro::Storable. May, of course, block. Note that the executed sub may
513never block itself or use any form of event handling. 605never block itself or use any form of event handling.
514 606
515=cut 607=cut
516 608
609sub post_fork {
610 reset_signals;
611}
612
517sub fork_call(&@) { 613sub fork_call(&@) {
518 my ($cb, @args) = @_; 614 my ($cb, @args) = @_;
519 615
520 # we seemingly have to make a local copy of the whole thing, 616 # we seemingly have to make a local copy of the whole thing,
521 # otherwise perl prematurely frees the stuff :/ 617 # otherwise perl prematurely frees the stuff :/
522 # TODO: investigate and fix (likely this will be rather laborious) 618 # TODO: investigate and fix (likely this will be rather laborious)
523 619
524 my @res = Coro::Util::fork_eval { 620 my @res = Coro::Util::fork_eval {
525 reset_signals; 621 cf::post_fork;
526 &$cb 622 &$cb
527 }, @args; 623 } @args;
528 624
529 wantarray ? @res : $res[-1] 625 wantarray ? @res : $res[-1]
626}
627
628sub objinfo {
629 (
630 "counter value" => cf::object::object_count,
631 "objects created" => cf::object::create_count,
632 "objects destroyed" => cf::object::destroy_count,
633 "freelist size" => cf::object::free_count,
634 "allocated objects" => cf::object::objects_size,
635 "active objects" => cf::object::actives_size,
636 )
637}
638
639=item $coin = coin_from_name $name
640
641=cut
642
643our %coin_alias = (
644 "silver" => "silvercoin",
645 "silvercoin" => "silvercoin",
646 "silvercoins" => "silvercoin",
647 "gold" => "goldcoin",
648 "goldcoin" => "goldcoin",
649 "goldcoins" => "goldcoin",
650 "platinum" => "platinacoin",
651 "platinumcoin" => "platinacoin",
652 "platinumcoins" => "platinacoin",
653 "platina" => "platinacoin",
654 "platinacoin" => "platinacoin",
655 "platinacoins" => "platinacoin",
656 "royalty" => "royalty",
657 "royalties" => "royalty",
658);
659
660sub coin_from_name($) {
661 $coin_alias{$_[0]}
662 ? cf::arch::find $coin_alias{$_[0]}
663 : undef
530} 664}
531 665
532=item $value = cf::db_get $family => $key 666=item $value = cf::db_get $family => $key
533 667
534Returns a single value from the environment database. 668Returns a single value from the environment database.
544within each server. 678within each server.
545 679
546=cut 680=cut
547 681
548sub db_table($) { 682sub db_table($) {
683 cf::error "db_get called from main context"
684 if $Coro::current == $Coro::main;
685
549 my ($name) = @_; 686 my ($name) = @_;
550 my $db = BDB::db_create $DB_ENV; 687 my $db = BDB::db_create $DB_ENV;
551 688
552 eval { 689 eval {
553 $db->set_flags (BDB::CHKSUM); 690 $db->set_flags (BDB::CHKSUM);
563} 700}
564 701
565our $DB; 702our $DB;
566 703
567sub db_init { 704sub db_init {
568 cf::sync_job {
569 $DB ||= db_table "db"; 705 $DB ||= db_table "db";
570 };
571} 706}
572 707
573sub db_get($$) { 708sub db_get($$) {
574 my $key = "$_[0]/$_[1]"; 709 my $key = "$_[0]/$_[1]";
575 710
576 cf::sync_job { 711 cf::error "db_get called from main context"
712 if $Coro::current == $Coro::main;
713
577 BDB::db_get $DB, undef, $key, my $data; 714 BDB::db_get $DB, undef, $key, my $data;
578 715
579 $! ? () 716 $! ? ()
580 : $data 717 : $data
581 }
582} 718}
583 719
584sub db_put($$$) { 720sub db_put($$$) {
585 BDB::dbreq_pri 4; 721 BDB::dbreq_pri 4;
586 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 722 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
642 778
643 my $t1 = Time::HiRes::time; 779 my $t1 = Time::HiRes::time;
644 my $data = $process->(\@data); 780 my $data = $process->(\@data);
645 my $t2 = Time::HiRes::time; 781 my $t2 = Time::HiRes::time;
646 782
647 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 783 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
648 784
649 db_put cache => "$id/data", $data; 785 db_put cache => "$id/data", $data;
650 db_put cache => "$id/md5" , $md5; 786 db_put cache => "$id/md5" , $md5;
651 db_put cache => "$id/meta", $meta; 787 db_put cache => "$id/meta", $meta;
652 788
662 798
663=cut 799=cut
664 800
665sub datalog($@) { 801sub datalog($@) {
666 my ($type, %kv) = @_; 802 my ($type, %kv) = @_;
667 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 803 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
668} 804}
669 805
670=back 806=back
671 807
672=cut 808=cut
673 809
674############################################################################# 810#############################################################################
675 811
676=head2 ATTACHABLE OBJECTS 812=head2 ATTACHABLE OBJECTS
677 813
678Many objects in crossfire are so-called attachable objects. That means you can 814Many objects in deliantra are so-called attachable objects. That means you can
679attach callbacks/event handlers (a collection of which is called an "attachment") 815attach callbacks/event handlers (a collection of which is called an "attachment")
680to it. All such attachable objects support the following methods. 816to it. All such attachable objects support the following methods.
681 817
682In the following description, CLASS can be any of C<global>, C<object> 818In 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 819C<player>, C<client> or C<map> (i.e. the attachable objects in
733=item cf::CLASS::attachment $name, ... 869=item cf::CLASS::attachment $name, ...
734 870
735Register an attachment by C<$name> through which attachable objects of the 871Register an attachment by C<$name> through which attachable objects of the
736given CLASS can refer to this attachment. 872given CLASS can refer to this attachment.
737 873
738Some classes such as crossfire maps and objects can specify attachments 874Some classes such as deliantra maps and objects can specify attachments
739that are attached at load/instantiate time, thus the need for a name. 875that are attached at load/instantiate time, thus the need for a name.
740 876
741These calls expect any number of the following handler/hook descriptions: 877These calls expect any number of the following handler/hook descriptions:
742 878
743=over 4 879=over 4
867 1003
868 } elsif (exists $cb_id{$type}) { 1004 } elsif (exists $cb_id{$type}) {
869 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1005 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
870 1006
871 } elsif (ref $type) { 1007 } elsif (ref $type) {
872 warn "attaching objects not supported, ignoring.\n"; 1008 error "attaching objects not supported, ignoring.\n";
873 1009
874 } else { 1010 } else {
875 shift @arg; 1011 shift @arg;
876 warn "attach argument '$type' not supported, ignoring.\n"; 1012 error "attach argument '$type' not supported, ignoring.\n";
877 } 1013 }
878 } 1014 }
879} 1015}
880 1016
881sub _object_attach { 1017sub _object_attach {
891 _attach $registry, $klass, @attach; 1027 _attach $registry, $klass, @attach;
892 } 1028 }
893 1029
894 $obj->{$name} = \%arg; 1030 $obj->{$name} = \%arg;
895 } else { 1031 } else {
896 warn "object uses attachment '$name' which is not available, postponing.\n"; 1032 info "object uses attachment '$name' which is not available, postponing.\n";
897 } 1033 }
898 1034
899 $obj->{_attachment}{$name} = undef; 1035 $obj->{_attachment}{$name} = undef;
900} 1036}
901 1037
960 1096
961 for (@$callbacks) { 1097 for (@$callbacks) {
962 eval { &{$_->[1]} }; 1098 eval { &{$_->[1]} };
963 1099
964 if ($@) { 1100 if ($@) {
965 warn "$@";
966 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1101 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
967 override; 1102 override;
968 } 1103 }
969 1104
970 return 1 if $override; 1105 return 1 if $override;
971 } 1106 }
1034 1169
1035sub reattach { 1170sub reattach {
1036 # basically do the same as instantiate, without calling instantiate 1171 # basically do the same as instantiate, without calling instantiate
1037 my ($obj) = @_; 1172 my ($obj) = @_;
1038 1173
1174 # no longer needed after getting rid of delete_package?
1039 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1175 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1040 1176
1041 my $registry = $obj->registry; 1177 my $registry = $obj->registry;
1042 1178
1043 @$registry = (); 1179 @$registry = ();
1044 1180
1049 for (@$attach) { 1185 for (@$attach) {
1050 my ($klass, @attach) = @$_; 1186 my ($klass, @attach) = @$_;
1051 _attach $registry, $klass, @attach; 1187 _attach $registry, $klass, @attach;
1052 } 1188 }
1053 } else { 1189 } else {
1054 warn "object uses attachment '$name' that is not available, postponing.\n"; 1190 info "object uses attachment '$name' that is not available, postponing.\n";
1055 } 1191 }
1056 } 1192 }
1057} 1193}
1058 1194
1059cf::attachable->attach ( 1195cf::attachable->attach (
1086 my ($filename, $rdata, $objs) = @_; 1222 my ($filename, $rdata, $objs) = @_;
1087 1223
1088 sync_job { 1224 sync_job {
1089 if (length $$rdata) { 1225 if (length $$rdata) {
1090 utf8::decode (my $decname = $filename); 1226 utf8::decode (my $decname = $filename);
1091 warn sprintf "saving %s (%d,%d)\n", 1227 trace sprintf "saving %s (%d,%d)\n",
1092 $decname, length $$rdata, scalar @$objs; 1228 $decname, length $$rdata, scalar @$objs
1229 if $VERBOSE_IO;
1093 1230
1094 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1231 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1095 chmod SAVE_MODE, $fh; 1232 aio_chmod $fh, SAVE_MODE;
1096 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1233 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1097 aio_fsync $fh if $cf::USE_FSYNC; 1234 if ($cf::USE_FSYNC) {
1235 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;
1236 aio_fsync $fh;
1237 }
1098 close $fh; 1238 aio_close $fh;
1099 1239
1100 if (@$objs) { 1240 if (@$objs) {
1101 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1241 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1102 chmod SAVE_MODE, $fh; 1242 aio_chmod $fh, SAVE_MODE;
1103 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1243 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1104 aio_write $fh, 0, (length $data), $data, 0; 1244 aio_write $fh, 0, (length $data), $data, 0;
1105 aio_fsync $fh if $cf::USE_FSYNC; 1245 if ($cf::USE_FSYNC) {
1246 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;
1247 aio_fsync $fh;
1248 }
1106 close $fh; 1249 aio_close $fh;
1107 aio_rename "$filename.pst~", "$filename.pst"; 1250 aio_rename "$filename.pst~", "$filename.pst";
1108 } 1251 }
1109 } else { 1252 } else {
1110 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1111 } 1254 }
1112 1255
1113 aio_rename "$filename~", $filename; 1256 aio_rename "$filename~", $filename;
1257
1258 $filename =~ s%/[^/]+$%%;
1259 aio_pathsync $filename if $cf::USE_FSYNC;
1114 } else { 1260 } else {
1115 warn "FATAL: $filename~: $!\n"; 1261 error "unable to save objects: $filename~: $!\n";
1116 } 1262 }
1117 } else { 1263 } else {
1118 aio_unlink $filename; 1264 aio_unlink $filename;
1119 aio_unlink "$filename.pst"; 1265 aio_unlink "$filename.pst";
1120 } 1266 }
1144 my $st = eval { Coro::Storable::thaw $av }; 1290 my $st = eval { Coro::Storable::thaw $av };
1145 $av = $st->{objs}; 1291 $av = $st->{objs};
1146 } 1292 }
1147 1293
1148 utf8::decode (my $decname = $filename); 1294 utf8::decode (my $decname = $filename);
1149 warn sprintf "loading %s (%d,%d)\n", 1295 trace sprintf "loading %s (%d,%d)\n",
1150 $decname, length $data, scalar @{$av || []}; 1296 $decname, length $data, scalar @{$av || []}
1297 if $VERBOSE_IO;
1151 1298
1152 ($data, $av) 1299 ($data, $av)
1153} 1300}
1154 1301
1155=head2 COMMAND CALLBACKS 1302=head2 COMMAND CALLBACKS
1211 my ($name, $cb) = @_; 1358 my ($name, $cb) = @_;
1212 1359
1213 $EXTICMD{$name} = $cb; 1360 $EXTICMD{$name} = $cb;
1214} 1361}
1215 1362
1363use File::Glob ();
1364
1216cf::player->attach ( 1365cf::player->attach (
1217 on_command => sub { 1366 on_unknown_command => sub {
1218 my ($pl, $name, $params) = @_; 1367 my ($pl, $name, $params) = @_;
1219 1368
1220 my $cb = $COMMAND{$name} 1369 my $cb = $COMMAND{$name}
1221 or return; 1370 or return;
1222 1371
1245 1394
1246 $pl->ext_reply ($reply, @reply) 1395 $pl->ext_reply ($reply, @reply)
1247 if $reply; 1396 if $reply;
1248 1397
1249 } else { 1398 } else {
1250 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1399 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1251 } 1400 }
1252 1401
1253 cf::override; 1402 cf::override;
1254 }, 1403 },
1255); 1404);
1256 1405
1406# "readahead" all extensions
1407sub cache_extensions {
1408 my $grp = IO::AIO::aio_group;
1409
1410 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1411 for (grep /\.ext$/, @{$_[0]}) {
1412 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1413 }
1414 };
1415
1416 $grp
1417}
1418
1257sub load_extensions { 1419sub load_extensions {
1420 info "loading extensions...";
1421
1258 cf::sync_job { 1422 cf::sync_job {
1259 my %todo; 1423 my %todo;
1260 1424
1261 for my $path (<$LIBDIR/*.ext>) { 1425 for my $path (<$LIBDIR/*.ext>) {
1262 next unless -r $path; 1426 next unless -r $path;
1280 1444
1281 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1445 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1282 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1446 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1283 1447
1284 $ext{source} = 1448 $ext{source} =
1285 "package $pkg; use strict; use utf8;\n" 1449 "package $pkg; use common::sense;\n"
1286 . "#line 1 \"$path\"\n{\n" 1450 . "#line 1 \"$path\"\n{\n"
1287 . $source 1451 . $source
1288 . "\n};\n1"; 1452 . "\n};\n1";
1289 1453
1290 $todo{$base} = \%ext; 1454 $todo{$base} = \%ext;
1291 } 1455 }
1292 1456
1457 my $pass = 0;
1293 my %done; 1458 my %done;
1294 while (%todo) { 1459 while (%todo) {
1295 my $progress; 1460 my $progress;
1296 1461
1462 ++$pass;
1463
1464 ext:
1297 while (my ($k, $v) = each %todo) { 1465 while (my ($k, $v) = each %todo) {
1298 for (split /,\s*/, $v->{meta}{depends}) { 1466 for (split /,\s*/, $v->{meta}{depends}) {
1299 goto skip 1467 next ext
1300 unless exists $done{$_}; 1468 unless exists $done{$_};
1301 } 1469 }
1302 1470
1303 warn "... loading '$k' into '$v->{pkg}'\n"; 1471 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1304 1472
1305 unless (eval $v->{source}) { 1473 my $active = eval $v->{source};
1474
1475 if (length $@) {
1306 my $msg = $@ ? "$v->{path}: $@\n" 1476 error "$v->{path}: $@\n";
1307 : "$v->{base}: extension inactive.\n";
1308 1477
1478 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1309 if (exists $v->{meta}{mandatory}) { 1479 if exists $v->{meta}{mandatory};
1310 warn $msg; 1480
1311 warn "mandatory extension failed to load, exiting.\n"; 1481 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1312 exit 1; 1482 delete $todo{$k};
1313 } 1483 } else {
1314 1484 $done{$k} = delete $todo{$k};
1315 warn $msg; 1485 push @EXTS, $v->{pkg};
1486 $progress = 1;
1487
1488 info "$v->{base}: extension inactive.\n"
1489 unless $active;
1316 } 1490 }
1317
1318 $done{$k} = delete $todo{$k};
1319 push @EXTS, $v->{pkg};
1320 $progress = 1;
1321 } 1491 }
1322 1492
1323 skip: 1493 unless ($progress) {
1324 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1494 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1325 unless $progress; 1495
1496 while (my ($k, $v) = each %todo) {
1497 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1498 if exists $v->{meta}{mandatory};
1499 }
1500 }
1326 } 1501 }
1327 }; 1502 };
1328} 1503}
1329 1504
1330############################################################################# 1505#############################################################################
1331 1506
1332=back 1507=back
1333 1508
1334=head2 CORE EXTENSIONS 1509=head2 CORE EXTENSIONS
1335 1510
1336Functions and methods that extend core crossfire objects. 1511Functions and methods that extend core deliantra objects.
1337 1512
1338=cut 1513=cut
1339 1514
1340package cf::player; 1515package cf::player;
1341 1516
1384 1559
1385sub exists($) { 1560sub exists($) {
1386 my ($login) = @_; 1561 my ($login) = @_;
1387 1562
1388 $cf::PLAYER{$login} 1563 $cf::PLAYER{$login}
1389 or cf::sync_job { !aio_stat path $login } 1564 or !aio_stat path $login
1390} 1565}
1391 1566
1392sub find($) { 1567sub find($) {
1393 return $cf::PLAYER{$_[0]} || do { 1568 return $cf::PLAYER{$_[0]} || do {
1394 my $login = $_[0]; 1569 my $login = $_[0];
1406 my $f = new_from_file cf::object::thawer path $login 1581 my $f = new_from_file cf::object::thawer path $login
1407 or return; 1582 or return;
1408 1583
1409 my $pl = cf::player::load_pl $f 1584 my $pl = cf::player::load_pl $f
1410 or return; 1585 or return;
1586
1411 local $cf::PLAYER_LOADING{$login} = $pl; 1587 local $cf::PLAYER_LOADING{$login} = $pl;
1412 $f->resolve_delayed_derefs; 1588 $f->resolve_delayed_derefs;
1413 $cf::PLAYER{$login} = $pl 1589 $cf::PLAYER{$login} = $pl
1414 } 1590 }
1415 } 1591 }
1416} 1592}
1417 1593
1594cf::player->attach (
1595 on_load => sub {
1596 my ($pl, $path) = @_;
1597
1598 # restore slots saved in save, below
1599 my $slots = delete $pl->{_slots};
1600
1601 $pl->ob->current_weapon ($slots->[0]);
1602 $pl->combat_ob ($slots->[1]);
1603 $pl->ranged_ob ($slots->[2]);
1604 },
1605);
1606
1418sub save($) { 1607sub save($) {
1419 my ($pl) = @_; 1608 my ($pl) = @_;
1420 1609
1421 return if $pl->{deny_save}; 1610 return if $pl->{deny_save};
1422 1611
1425 1614
1426 return if $pl->{deny_save}; 1615 return if $pl->{deny_save};
1427 1616
1428 aio_mkdir playerdir $pl, 0770; 1617 aio_mkdir playerdir $pl, 0770;
1429 $pl->{last_save} = $cf::RUNTIME; 1618 $pl->{last_save} = $cf::RUNTIME;
1619
1620 cf::get_slot 0.01;
1621
1622 # save slots, to be restored later
1623 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1430 1624
1431 $pl->save_pl ($path); 1625 $pl->save_pl ($path);
1432 cf::cede_to_tick; 1626 cf::cede_to_tick;
1433} 1627}
1434 1628
1466 my ($pl) = @_; 1660 my ($pl) = @_;
1467 1661
1468 my $name = $pl->ob->name; 1662 my $name = $pl->ob->name;
1469 1663
1470 $pl->{deny_save} = 1; 1664 $pl->{deny_save} = 1;
1471 $pl->password ("*"); # this should lock out the player until we nuked the dir 1665 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1472 1666
1473 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1667 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1474 $pl->deactivate; 1668 $pl->deactivate;
1669
1670 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1475 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1671 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1672 ext::highscore::check ($pl->ob);
1673
1476 $pl->ns->destroy if $pl->ns; 1674 $pl->ns->destroy if $pl->ns;
1477 1675
1478 my $path = playerdir $pl; 1676 my $path = playerdir $pl;
1479 my $temp = "$path~$cf::RUNTIME~deleting~"; 1677 my $temp = "$path~$cf::RUNTIME~deleting~";
1480 aio_rename $path, $temp; 1678 aio_rename $path, $temp;
1518 1716
1519 for my $login (@$dirs) { 1717 for my $login (@$dirs) {
1520 my $path = path $login; 1718 my $path = path $login;
1521 1719
1522 # a .pst is a dead give-away for a valid player 1720 # a .pst is a dead give-away for a valid player
1523 unless (-e "$path.pst") { 1721 # if no pst file found, open and chekc for blocked users
1722 if (aio_stat "$path.pst") {
1524 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1723 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1525 aio_read $fh, 0, 512, my $buf, 0 or next; 1724 aio_read $fh, 0, 512, my $buf, 0 or next;
1526 $buf !~ /^password -------------$/m or next; # official not-valid tag 1725 $buf !~ /^password -------------$/m or next; # official not-valid tag
1527 } 1726 }
1528 1727
1532 1731
1533 \@logins 1732 \@logins
1534} 1733}
1535 1734
1536=item $player->maps 1735=item $player->maps
1736
1737=item cf::player::maps $login
1537 1738
1538Returns an arrayref of map paths that are private for this 1739Returns an arrayref of map paths that are private for this
1539player. May block. 1740player. May block.
1540 1741
1541=cut 1742=cut
1559 } 1760 }
1560 1761
1561 \@paths 1762 \@paths
1562} 1763}
1563 1764
1564=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1765=item $protocol_xml = $player->expand_cfpod ($cfpod)
1565 1766
1566Expand crossfire pod fragments into protocol xml. 1767Expand 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 1768
1657=item $player->ext_reply ($msgid, @msg) 1769=item $player->ext_reply ($msgid, @msg)
1658 1770
1659Sends an ext reply to the player. 1771Sends an ext reply to the player.
1660 1772
1692 1804
1693=cut 1805=cut
1694 1806
1695sub find_by_path($) { 1807sub find_by_path($) {
1696 my ($path) = @_; 1808 my ($path) = @_;
1809
1810 $path =~ s/^~[^\/]*//; # skip ~login
1697 1811
1698 my ($match, $specificity); 1812 my ($match, $specificity);
1699 1813
1700 for my $region (list) { 1814 for my $region (list) {
1701 if ($region->{match} && $path =~ $region->{match}) { 1815 if ($region->{match} && $path =~ $region->{match}) {
1727our $MAX_RESET = 3600; 1841our $MAX_RESET = 3600;
1728our $DEFAULT_RESET = 3000; 1842our $DEFAULT_RESET = 3000;
1729 1843
1730sub generate_random_map { 1844sub generate_random_map {
1731 my ($self, $rmp) = @_; 1845 my ($self, $rmp) = @_;
1846
1847 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1848
1732 # mit "rum" bekleckern, nicht 1849 # mit "rum" bekleckern, nicht
1733 $self->_create_random_map ( 1850 $self->_create_random_map (
1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1851 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1852 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1853 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1737 $rmp->{exit_on_final_map}, 1854 $rmp->{exit_on_final_map},
1738 $rmp->{xsize}, $rmp->{ysize}, 1855 $rmp->{xsize}, $rmp->{ysize},
1739 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1856 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1740 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1857 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1755 1872
1756sub register { 1873sub register {
1757 my (undef, $regex, $prio) = @_; 1874 my (undef, $regex, $prio) = @_;
1758 my $pkg = caller; 1875 my $pkg = caller;
1759 1876
1760 no strict;
1761 push @{"$pkg\::ISA"}, __PACKAGE__; 1877 push @{"$pkg\::ISA"}, __PACKAGE__;
1762 1878
1763 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1879 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1764} 1880}
1765 1881
1766# also paths starting with '/' 1882# also paths starting with '/'
1767$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1883$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1768 1884
1769sub thawer_merge { 1885sub thawer_merge {
1770 my ($self, $merge) = @_; 1886 my ($self, $merge) = @_;
1771 1887
1772 # we have to keep some variables in memory intact 1888 # we have to keep some variables in memory intact
1777} 1893}
1778 1894
1779sub normalise { 1895sub normalise {
1780 my ($path, $base) = @_; 1896 my ($path, $base) = @_;
1781 1897
1782 $path = "$path"; # make sure its a string 1898 $path = "$path"; # make sure it's a string
1783 1899
1784 $path =~ s/\.map$//; 1900 $path =~ s/\.map$//;
1785 1901
1786 # map plan: 1902 # map plan:
1787 # 1903 #
1826 $self->init; # pass $1 etc. 1942 $self->init; # pass $1 etc.
1827 return $self; 1943 return $self;
1828 } 1944 }
1829 } 1945 }
1830 1946
1831 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1947 Carp::cluck "unable to resolve path '$path' (base '$base')";
1832 () 1948 ()
1833} 1949}
1834 1950
1835sub init { 1951sub init {
1836 my ($self) = @_; 1952 my ($self) = @_;
1858 1974
1859# the temporary/swap location 1975# the temporary/swap location
1860sub save_path { 1976sub save_path {
1861 my ($self) = @_; 1977 my ($self) = @_;
1862 1978
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1979 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$TMPDIR/$path.map" 1980 "$TMPDIR/$path.map"
1865} 1981}
1866 1982
1867# the unique path, undef == no special unique path 1983# the unique path, undef == no special unique path
1868sub uniq_path { 1984sub uniq_path {
1869 my ($self) = @_; 1985 my ($self) = @_;
1870 1986
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1987 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 1988 "$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} 1989}
1883 1990
1884sub decay_objects { 1991sub decay_objects {
1885 my ($self) = @_; 1992 my ($self) = @_;
1886 1993
1968 2075
1969sub find; 2076sub find;
1970sub find { 2077sub find {
1971 my ($path, $origin) = @_; 2078 my ($path, $origin) = @_;
1972 2079
2080 cf::cede_to_tick;
2081
1973 $path = normalise $path, $origin && $origin->path; 2082 $path = normalise $path, $origin && $origin->path;
1974 2083
1975 cf::lock_wait "map_data:$path";#d#remove 2084 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 2085 my $guard2 = cf::lock_acquire "map_find:$path";
1977 2086
1978 $cf::MAP{$path} || do { 2087 $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 2088 my $map = new_from_path cf::map $path
1983 or return; 2089 or return;
1984 2090
1985 $map->{last_save} = $cf::RUNTIME; 2091 $map->{last_save} = $cf::RUNTIME;
1986 2092
1988 or return; 2094 or return;
1989 2095
1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2096 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1991 # doing this can freeze the server in a sync job, obviously 2097 # doing this can freeze the server in a sync job, obviously
1992 #$cf::WAIT_FOR_TICK->wait; 2098 #$cf::WAIT_FOR_TICK->wait;
2099 undef $guard2;
1993 undef $guard1; 2100 undef $guard1;
1994 undef $guard2;
1995 $map->reset; 2101 $map->reset;
1996 return find $path; 2102 return find $path;
1997 } 2103 }
1998 2104
1999 $cf::MAP{$path} = $map 2105 $cf::MAP{$path} = $map
2000 } 2106 }
2001} 2107}
2002 2108
2003sub pre_load { } 2109sub pre_load { }
2004sub post_load { } 2110#sub post_load { } # XS
2005 2111
2006sub load { 2112sub load {
2007 my ($self) = @_; 2113 my ($self) = @_;
2008 2114
2009 local $self->{deny_reset} = 1; # loading can take a long time 2115 local $self->{deny_reset} = 1; # loading can take a long time
2026 my $f = new_from_file cf::object::thawer $self->{load_path}; 2132 my $f = new_from_file cf::object::thawer $self->{load_path};
2027 $f->skip_block; 2133 $f->skip_block;
2028 $self->_load_objects ($f) 2134 $self->_load_objects ($f)
2029 or return; 2135 or return;
2030 2136
2031 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2137 $self->post_load_original
2032 if delete $self->{load_original}; 2138 if delete $self->{load_original};
2033 2139
2034 if (my $uniq = $self->uniq_path) { 2140 if (my $uniq = $self->uniq_path) {
2035 utf8::encode $uniq; 2141 utf8::encode $uniq;
2036 unless (aio_stat $uniq) { 2142 unless (aio_stat $uniq) {
2054 unless ($self->{deny_activate}) { 2160 unless ($self->{deny_activate}) {
2055 $self->decay_objects; 2161 $self->decay_objects;
2056 $self->fix_auto_apply; 2162 $self->fix_auto_apply;
2057 $self->update_buttons; 2163 $self->update_buttons;
2058 cf::cede_to_tick; 2164 cf::cede_to_tick;
2059 $self->set_darkness_map;
2060 cf::cede_to_tick;
2061 $self->activate; 2165 $self->activate;
2062 } 2166 }
2063 2167
2064 $self->{last_save} = $cf::RUNTIME; 2168 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2169 $self->last_access ($cf::RUNTIME);
2066 2170
2067 $self->in_memory (cf::MAP_IN_MEMORY); 2171 $self->in_memory (cf::MAP_ACTIVE);
2068 } 2172 }
2069 2173
2070 $self->post_load; 2174 $self->post_load;
2071} 2175}
2072 2176
2177# customize the map for a given player, i.e.
2178# return the _real_ map. used by e.g. per-player
2179# maps to change the path to ~playername/mappath
2073sub customise_for { 2180sub customise_for {
2074 my ($self, $ob) = @_; 2181 my ($self, $ob) = @_;
2075 2182
2076 return find "~" . $ob->name . "/" . $self->{path} 2183 return find "~" . $ob->name . "/" . $self->{path}
2077 if $self->per_player; 2184 if $self->per_player;
2093 or next; 2200 or next;
2094 $neigh = find $neigh, $map 2201 $neigh = find $neigh, $map
2095 or next; 2202 or next;
2096 $neigh->load; 2203 $neigh->load;
2097 2204
2205 # now find the diagonal neighbours
2098 push @neigh, 2206 push @neigh,
2099 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2207 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2100 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2208 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2101 } 2209 }
2102 2210
2109} 2217}
2110 2218
2111sub find_sync { 2219sub find_sync {
2112 my ($path, $origin) = @_; 2220 my ($path, $origin) = @_;
2113 2221
2114 cf::sync_job { find $path, $origin } 2222 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2223 if $Coro::current == $Coro::main;
2224
2225 find $path, $origin
2115} 2226}
2116 2227
2117sub do_load_sync { 2228sub do_load_sync {
2118 my ($map) = @_; 2229 my ($map) = @_;
2119 2230
2120 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2231 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2121 if $Coro::current == $Coro::main; 2232 if $Coro::current == $Coro::main;
2122 2233
2123 cf::sync_job { $map->load }; 2234 $map->load;
2124} 2235}
2125 2236
2126our %MAP_PREFETCH; 2237our %MAP_PREFETCH;
2127our $MAP_PREFETCHER = undef; 2238our $MAP_PREFETCHER = undef;
2128 2239
2130 my ($path, $origin, $load) = @_; 2241 my ($path, $origin, $load) = @_;
2131 2242
2132 $path = normalise $path, $origin && $origin->{path}; 2243 $path = normalise $path, $origin && $origin->{path};
2133 2244
2134 if (my $map = $cf::MAP{$path}) { 2245 if (my $map = $cf::MAP{$path}) {
2135 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2246 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2136 } 2247 }
2137 2248
2138 $MAP_PREFETCH{$path} |= $load; 2249 $MAP_PREFETCH{$path} |= $load;
2139 2250
2140 $MAP_PREFETCHER ||= cf::async { 2251 $MAP_PREFETCHER ||= cf::async {
2154 $MAP_PREFETCHER->prio (6); 2265 $MAP_PREFETCHER->prio (6);
2155 2266
2156 () 2267 ()
2157} 2268}
2158 2269
2270# common code, used by both ->save and ->swapout
2159sub save { 2271sub _save {
2160 my ($self) = @_; 2272 my ($self) = @_;
2161
2162 my $lock = cf::lock_acquire "map_data:$self->{path}";
2163 2273
2164 $self->{last_save} = $cf::RUNTIME; 2274 $self->{last_save} = $cf::RUNTIME;
2165 2275
2166 return unless $self->dirty; 2276 return unless $self->dirty;
2167 2277
2176 2286
2177 cf::async { 2287 cf::async {
2178 $Coro::current->{desc} = "map player save"; 2288 $Coro::current->{desc} = "map player save";
2179 $_->contr->save for $self->players; 2289 $_->contr->save for $self->players;
2180 }; 2290 };
2291
2292 cf::get_slot 0.02;
2181 2293
2182 if ($uniq) { 2294 if ($uniq) {
2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2295 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2184 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2296 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2185 } else { 2297 } else {
2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2298 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2187 } 2299 }
2188} 2300}
2189 2301
2302sub save {
2303 my ($self) = @_;
2304
2305 my $lock = cf::lock_acquire "map_data:$self->{path}";
2306
2307 $self->_save;
2308}
2309
2190sub swap_out { 2310sub swap_out {
2191 my ($self) = @_; 2311 my ($self) = @_;
2192 2312
2193 # save first because save cedes
2194 $self->save;
2195
2196 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2313 my $lock = cf::lock_acquire "map_data:$self->{path}";
2197 2314
2315 return if $self->in_memory != cf::MAP_ACTIVE;
2316 return if $self->{deny_save};
2198 return if $self->players; 2317 return if $self->players;
2199 return if $self->in_memory != cf::MAP_IN_MEMORY;
2200 return if $self->{deny_save};
2201 2318
2319 # first deactivate the map and "unlink" it from the core
2320 $self->deactivate;
2321 $_->clear_links_to ($self) for values %cf::MAP;
2202 $self->in_memory (cf::MAP_SWAPPED); 2322 $self->in_memory (cf::MAP_SWAPPED);
2323
2324 # then atomically save
2325 $self->_save;
2326
2327 # then free the map
2328 $self->clear;
2329}
2330
2331sub reset_at {
2332 my ($self) = @_;
2333
2334 # TODO: safety, remove and allow resettable per-player maps
2335 return 1e99 if $self->{deny_reset};
2336
2337 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2338 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2339
2340 $time + $to
2341}
2342
2343sub should_reset {
2344 my ($self) = @_;
2345
2346 $self->reset_at <= $cf::RUNTIME
2347}
2348
2349sub reset {
2350 my ($self) = @_;
2351
2352 my $lock = cf::lock_acquire "map_data:$self->{path}";
2353
2354 return if $self->players;
2355
2356 cf::trace "resetting map ", $self->path, "\n";
2357
2358 $self->in_memory (cf::MAP_SWAPPED);
2359
2360 # need to save uniques path
2361 unless ($self->{deny_save}) {
2362 my $uniq = $self->uniq_path; utf8::encode $uniq;
2363
2364 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2365 if $uniq;
2366 }
2367
2368 delete $cf::MAP{$self->path};
2203 2369
2204 $self->deactivate; 2370 $self->deactivate;
2205 $_->clear_links_to ($self) for values %cf::MAP; 2371 $_->clear_links_to ($self) for values %cf::MAP;
2206 $self->clear; 2372 $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 2373
2252 $self->unlink_save; 2374 $self->unlink_save;
2253 $self->destroy; 2375 $self->destroy;
2254} 2376}
2255 2377
2263 2385
2264 delete $cf::MAP{$self->path}; 2386 delete $cf::MAP{$self->path};
2265 2387
2266 $self->unlink_save; 2388 $self->unlink_save;
2267 2389
2268 bless $self, "cf::map"; 2390 bless $self, "cf::map::wrap";
2269 delete $self->{deny_reset}; 2391 delete $self->{deny_reset};
2270 $self->{deny_save} = 1; 2392 $self->{deny_save} = 1;
2271 $self->reset_timeout (1); 2393 $self->reset_timeout (1);
2272 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2394 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2273 2395
2322 2444
2323sub unique_maps() { 2445sub unique_maps() {
2324 [ 2446 [
2325 map { 2447 map {
2326 utf8::decode $_; 2448 utf8::decode $_;
2327 /\.map$/ 2449 s/\.map$//; # TODO future compatibility hack
2450 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2451 ? ()
2328 ? normalise $_ 2452 : normalise $_
2329 : ()
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2453 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2454 ]
2332} 2455}
2333 2456
2334package cf; 2457=item cf::map::static_maps
2458
2459Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2460file in the shared directory excluding F</styles> and F</editor>). May
2461block.
2462
2463=cut
2464
2465sub static_maps() {
2466 my @dirs = "";
2467 my @maps;
2468
2469 while (@dirs) {
2470 my $dir = shift @dirs;
2471
2472 next if $dir eq "/styles" || $dir eq "/editor";
2473
2474 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2475 or return;
2476
2477 for (@$files) {
2478 s/\.map$// or next;
2479 utf8::decode $_;
2480 push @maps, "$dir/$_";
2481 }
2482
2483 push @dirs, map "$dir/$_", @$dirs;
2484 }
2485
2486 \@maps
2487}
2335 2488
2336=back 2489=back
2337 2490
2338=head3 cf::object 2491=head3 cf::object
2339 2492
2343 2496
2344=over 4 2497=over 4
2345 2498
2346=item $ob->inv_recursive 2499=item $ob->inv_recursive
2347 2500
2348Returns the inventory of the object _and_ their inventories, recursively. 2501Returns the inventory of the object I<and> their inventories, recursively,
2502but I<not> the object itself.
2349 2503
2350=cut 2504=cut
2351 2505
2352sub inv_recursive_; 2506sub inv_recursive_;
2353sub inv_recursive_ { 2507sub inv_recursive_ {
2358 inv_recursive_ inv $_[0] 2512 inv_recursive_ inv $_[0]
2359} 2513}
2360 2514
2361=item $ref = $ob->ref 2515=item $ref = $ob->ref
2362 2516
2363creates and returns a persistent reference to an objetc that can be stored as a string. 2517Creates and returns a persistent reference to an object that can be stored as a string.
2364 2518
2365=item $ob = cf::object::deref ($refstring) 2519=item $ob = cf::object::deref ($refstring)
2366 2520
2367returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2521returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2368even if the object actually exists. May block. 2522even if the object actually exists. May block.
2400can be C<undef>. Does the right thing when the player is currently in a 2554can be C<undef>. Does the right thing when the player is currently in a
2401dialogue with the given NPC character. 2555dialogue with the given NPC character.
2402 2556
2403=cut 2557=cut
2404 2558
2559our $SAY_CHANNEL = {
2560 id => "say",
2561 title => "Map",
2562 reply => "say ",
2563 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2564};
2565
2566our $CHAT_CHANNEL = {
2567 id => "chat",
2568 title => "Chat",
2569 reply => "chat ",
2570 tooltip => "Player chat and shouts, global to the server.",
2571};
2572
2405# rough implementation of a future "reply" method that works 2573# rough implementation of a future "reply" method that works
2406# with dialog boxes. 2574# with dialog boxes.
2407#TODO: the first argument must go, split into a $npc->reply_to ( method 2575#TODO: the first argument must go, split into a $npc->reply_to ( method
2408sub cf::object::player::reply($$$;$) { 2576sub cf::object::player::reply($$$;$) {
2409 my ($self, $npc, $msg, $flags) = @_; 2577 my ($self, $npc, $msg, $flags) = @_;
2420 my $dialog = $pl->{npc_dialog}; 2588 my $dialog = $pl->{npc_dialog};
2421 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2589 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2422 2590
2423 } else { 2591 } else {
2424 $msg = $npc->name . " says: $msg" if $npc; 2592 $msg = $npc->name . " says: $msg" if $npc;
2425 $self->message ($msg, $flags); 2593 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2426 } 2594 }
2427 } 2595 }
2428} 2596}
2429 2597
2430=item $object->send_msg ($channel, $msg, $color, [extra...]) 2598=item $object->send_msg ($channel, $msg, $color, [extra...])
2455 2623
2456=item $player_object->enter_link 2624=item $player_object->enter_link
2457 2625
2458Freezes the player and moves him/her to a special map (C<{link}>). 2626Freezes the player and moves him/her to a special map (C<{link}>).
2459 2627
2460The player should be reasonably safe there for short amounts of time. You 2628The player should be reasonably safe there for short amounts of time (e.g.
2461I<MUST> call C<leave_link> as soon as possible, though. 2629for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2630though, as the player cannot control the character while it is on the link
2631map.
2462 2632
2463Will never block. 2633Will never block.
2464 2634
2465=item $player_object->leave_link ($map, $x, $y) 2635=item $player_object->leave_link ($map, $x, $y)
2466 2636
2486sub cf::object::player::enter_link { 2656sub cf::object::player::enter_link {
2487 my ($self) = @_; 2657 my ($self) = @_;
2488 2658
2489 $self->deactivate_recursive; 2659 $self->deactivate_recursive;
2490 2660
2661 ++$self->{_link_recursion};
2662
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2663 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2664
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2665 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2666 if $self->map && $self->map->{path} ne "{link}";
2495 2667
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2668 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2669}
2498 2670
2499sub cf::object::player::leave_link { 2671sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2672 my ($self, $map, $x, $y) = @_;
2501 2673
2518 ($x, $y) = (-1, -1) 2690 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2691 unless (defined $x) && (defined $y);
2520 2692
2521 # use -1 or undef as default coordinates, not 0, 0 2693 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2694 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2695 if $x <= 0 && $y <= 0;
2524 2696
2525 $map->load; 2697 $map->load;
2526 $map->load_neighbours; 2698 $map->load_neighbours;
2527 2699
2528 return unless $self->contr->active; 2700 return unless $self->contr->active;
2529 $self->activate_recursive;
2530 2701
2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2702 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2532 $self->enter_map ($map, $x, $y); 2703 if ($self->enter_map ($map, $x, $y)) {
2533} 2704 # entering was successful
2705 delete $self->{_link_recursion};
2706 # only activate afterwards, to support waiting in hooks
2707 $self->activate_recursive;
2708 }
2534 2709
2710}
2711
2535=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2712=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2536 2713
2537Moves the player to the given map-path and coordinates by first freezing 2714Moves the player to the given map-path and coordinates by first freezing
2538her, loading and preparing them map, calling the provided $check callback 2715her, loading and preparing them map, calling the provided $check callback
2539that has to return the map if sucecssful, and then unfreezes the player on 2716that 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 2717the new (success) or old (failed) map position. In either case, $done will
2541be called at the end of this process. 2718be called at the end of this process.
2542 2719
2720Note that $check will be called with a potentially non-loaded map, so if
2721it needs a loaded map it has to call C<< ->load >>.
2722
2543=cut 2723=cut
2544 2724
2545our $GOTOGEN; 2725our $GOTOGEN;
2546 2726
2547sub cf::object::player::goto { 2727sub cf::object::player::goto {
2548 my ($self, $path, $x, $y, $check, $done) = @_; 2728 my ($self, $path, $x, $y, $check, $done) = @_;
2729
2730 if ($self->{_link_recursion} >= $MAX_LINKS) {
2731 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2732 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2733 ($path, $x, $y) = @$EMERGENCY_POSITION;
2734 }
2549 2735
2550 # do generation counting so two concurrent goto's will be executed in-order 2736 # do generation counting so two concurrent goto's will be executed in-order
2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2737 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2552 2738
2553 $self->enter_link; 2739 $self->enter_link;
2577 my $map = eval { 2763 my $map = eval {
2578 my $map = defined $path ? cf::map::find $path : undef; 2764 my $map = defined $path ? cf::map::find $path : undef;
2579 2765
2580 if ($map) { 2766 if ($map) {
2581 $map = $map->customise_for ($self); 2767 $map = $map->customise_for ($self);
2582 $map = $check->($map) if $check && $map; 2768 $map = $check->($map, $x, $y, $self) if $check && $map;
2583 } else { 2769 } else {
2584 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2770 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2585 } 2771 }
2586 2772
2587 $map 2773 $map
2595 if ($gen == $self->{_goto_generation}) { 2781 if ($gen == $self->{_goto_generation}) {
2596 delete $self->{_goto_generation}; 2782 delete $self->{_goto_generation};
2597 $self->leave_link ($map, $x, $y); 2783 $self->leave_link ($map, $x, $y);
2598 } 2784 }
2599 2785
2600 $done->() if $done; 2786 $done->($self) if $done;
2601 })->prio (1); 2787 })->prio (1);
2602} 2788}
2603 2789
2604=item $player_object->enter_exit ($exit_object) 2790=item $player_object->enter_exit ($exit_object)
2605 2791
2625} 2811}
2626 2812
2627sub prepare_random_map { 2813sub prepare_random_map {
2628 my ($exit) = @_; 2814 my ($exit) = @_;
2629 2815
2630 my $guard = cf::lock_acquire "exit_prepare:$exit";
2631
2632 # all this does is basically replace the /! path by 2816 # all this does is basically replace the /! path by
2633 # a new random map path (?random/...) with a seed 2817 # a new random map path (?random/...) with a seed
2634 # that depends on the exit object 2818 # that depends on the exit object
2635 2819
2636 my $rmp = parse_random_map_params $exit->msg; 2820 my $rmp = parse_random_map_params $exit->msg;
2638 if ($exit->map) { 2822 if ($exit->map) {
2639 $rmp->{region} = $exit->region->name; 2823 $rmp->{region} = $exit->region->name;
2640 $rmp->{origin_map} = $exit->map->path; 2824 $rmp->{origin_map} = $exit->map->path;
2641 $rmp->{origin_x} = $exit->x; 2825 $rmp->{origin_x} = $exit->x;
2642 $rmp->{origin_y} = $exit->y; 2826 $rmp->{origin_y} = $exit->y;
2827
2828 $exit->map->touch;
2643 } 2829 }
2644 2830
2645 $rmp->{random_seed} ||= $exit->random_seed; 2831 $rmp->{random_seed} ||= $exit->random_seed;
2646 2832
2647 my $data = cf::encode_json $rmp; 2833 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2648 my $md5 = Digest::MD5::md5_hex $data; 2834 my $md5 = Digest::MD5::md5_hex $data;
2649 my $meta = "$RANDOMDIR/$md5.meta"; 2835 my $meta = "$RANDOMDIR/$md5.meta";
2650 2836
2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2837 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2652 aio_write $fh, 0, (length $data), $data, 0; 2838 aio_write $fh, 0, (length $data), $data, 0;
2653 undef $fh; 2839 undef $fh;
2654 aio_rename "$meta~", $meta; 2840 aio_rename "$meta~", $meta;
2655 2841
2842 my $slaying = "?random/$md5";
2843
2844 if ($exit->valid) {
2656 $exit->slaying ("?random/$md5"); 2845 $exit->slaying ("?random/$md5");
2657 $exit->msg (undef); 2846 $exit->msg (undef);
2847 }
2658 } 2848 }
2659} 2849}
2660 2850
2661sub cf::object::player::enter_exit { 2851sub cf::object::player::enter_exit {
2662 my ($self, $exit) = @_; 2852 my ($self, $exit) = @_;
2663 2853
2664 return unless $self->type == cf::PLAYER; 2854 return unless $self->type == cf::PLAYER;
2665 2855
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; 2856 $self->enter_link;
2678 2857
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 { 2858 (async {
2684 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2859 $Coro::current->{desc} = "enter_exit";
2685 2860
2686 $self->deactivate_recursive; # just to be sure
2687 unless (eval { 2861 unless (eval {
2862 $self->deactivate_recursive; # just to be sure
2863
2864 # random map handling
2865 {
2866 my $guard = cf::lock_acquire "exit_prepare:$exit";
2867
2868 prepare_random_map $exit
2869 if $exit->slaying eq "/!";
2870 }
2871
2872 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2873 my $x = $exit->stats->hp;
2874 my $y = $exit->stats->sp;
2875
2688 $self->goto ($slaying, $hp, $sp); 2876 $self->goto ($map, $x, $y);
2689 2877
2878 # if exit is damned, update players death & WoR home-position
2879 $self->contr->savebed ($map, $x, $y)
2880 if $exit->flag (cf::FLAG_DAMNED);
2881
2690 1; 2882 1
2691 }) { 2883 }) {
2692 $self->message ("Something went wrong deep within the crossfire server. " 2884 $self->message ("Something went wrong deep within the deliantra server. "
2693 . "I'll try to bring you back to the map you were before. " 2885 . "I'll try to bring you back to the map you were before. "
2694 . "Please report this to the dungeon master!", 2886 . "Please report this to the dungeon master!",
2695 cf::NDI_UNIQUE | cf::NDI_RED); 2887 cf::NDI_UNIQUE | cf::NDI_RED);
2696 2888
2697 warn "ERROR in enter_exit: $@"; 2889 error "ERROR in enter_exit: $@";
2698 $self->leave_link; 2890 $self->leave_link;
2699 } 2891 }
2700 })->prio (1); 2892 })->prio (1);
2701} 2893}
2702 2894
2714sub cf::client::send_drawinfo { 2906sub cf::client::send_drawinfo {
2715 my ($self, $text, $flags) = @_; 2907 my ($self, $text, $flags) = @_;
2716 2908
2717 utf8::encode $text; 2909 utf8::encode $text;
2718 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2910 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2911}
2912
2913=item $client->send_big_packet ($pkt)
2914
2915Like C<send_packet>, but tries to compress large packets, and fragments
2916them as required.
2917
2918=cut
2919
2920our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2921
2922sub cf::client::send_big_packet {
2923 my ($self, $pkt) = @_;
2924
2925 # try lzf for large packets
2926 $pkt = "lzf " . Compress::LZF::compress $pkt
2927 if 1024 <= length $pkt and $self->{can_lzf};
2928
2929 # split very large packets
2930 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2931 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2932 $pkt = "frag";
2933 }
2934
2935 $self->send_packet ($pkt);
2719} 2936}
2720 2937
2721=item $client->send_msg ($channel, $msg, $color, [extra...]) 2938=item $client->send_msg ($channel, $msg, $color, [extra...])
2722 2939
2723Send a drawinfo or msg packet to the client, formatting the msg for the 2940Send a drawinfo or msg packet to the client, formatting the msg for the
2727 2944
2728=cut 2945=cut
2729 2946
2730# non-persistent channels (usually the info channel) 2947# non-persistent channels (usually the info channel)
2731our %CHANNEL = ( 2948our %CHANNEL = (
2949 "c/motd" => {
2950 id => "infobox",
2951 title => "MOTD",
2952 reply => undef,
2953 tooltip => "The message of the day",
2954 },
2732 "c/identify" => { 2955 "c/identify" => {
2733 id => "infobox", 2956 id => "infobox",
2734 title => "Identify", 2957 title => "Identify",
2735 reply => undef, 2958 reply => undef,
2736 tooltip => "Items recently identified", 2959 tooltip => "Items recently identified",
2738 "c/examine" => { 2961 "c/examine" => {
2739 id => "infobox", 2962 id => "infobox",
2740 title => "Examine", 2963 title => "Examine",
2741 reply => undef, 2964 reply => undef,
2742 tooltip => "Signs and other items you examined", 2965 tooltip => "Signs and other items you examined",
2966 },
2967 "c/shopinfo" => {
2968 id => "infobox",
2969 title => "Shop Info",
2970 reply => undef,
2971 tooltip => "What your bargaining skill tells you about the shop",
2743 }, 2972 },
2744 "c/book" => { 2973 "c/book" => {
2745 id => "infobox", 2974 id => "infobox",
2746 title => "Book", 2975 title => "Book",
2747 reply => undef, 2976 reply => undef,
2763 id => "infobox", 2992 id => "infobox",
2764 title => "Body Parts", 2993 title => "Body Parts",
2765 reply => undef, 2994 reply => undef,
2766 tooltip => "Shows which body parts you posess and are available", 2995 tooltip => "Shows which body parts you posess and are available",
2767 }, 2996 },
2997 "c/statistics" => {
2998 id => "infobox",
2999 title => "Statistics",
3000 reply => undef,
3001 tooltip => "Shows your primary statistics",
3002 },
3003 "c/skills" => {
3004 id => "infobox",
3005 title => "Skills",
3006 reply => undef,
3007 tooltip => "Shows your experience per skill and item power",
3008 },
3009 "c/shopitems" => {
3010 id => "infobox",
3011 title => "Shop Items",
3012 reply => undef,
3013 tooltip => "Shows the items currently for sale in this shop",
3014 },
3015 "c/resistances" => {
3016 id => "infobox",
3017 title => "Resistances",
3018 reply => undef,
3019 tooltip => "Shows your resistances",
3020 },
3021 "c/pets" => {
3022 id => "infobox",
3023 title => "Pets",
3024 reply => undef,
3025 tooltip => "Shows information abotu your pets/a specific pet",
3026 },
3027 "c/perceiveself" => {
3028 id => "infobox",
3029 title => "Perceive Self",
3030 reply => undef,
3031 tooltip => "You gained detailed knowledge about yourself",
3032 },
2768 "c/uptime" => { 3033 "c/uptime" => {
2769 id => "infobox", 3034 id => "infobox",
2770 title => "Uptime", 3035 title => "Uptime",
2771 reply => undef, 3036 reply => undef,
2772 tooltip => "How long the server has been running since last restart", 3037 tooltip => "How long the server has been running since last restart",
2775 id => "infobox", 3040 id => "infobox",
2776 title => "Map Info", 3041 title => "Map Info",
2777 reply => undef, 3042 reply => undef,
2778 tooltip => "Information related to the maps", 3043 tooltip => "Information related to the maps",
2779 }, 3044 },
3045 "c/party" => {
3046 id => "party",
3047 title => "Party",
3048 reply => "gsay ",
3049 tooltip => "Messages and chat related to your party",
3050 },
3051 "c/death" => {
3052 id => "death",
3053 title => "Death",
3054 reply => undef,
3055 tooltip => "Reason for and more info about your most recent death",
3056 },
3057 "c/say" => $SAY_CHANNEL,
3058 "c/chat" => $CHAT_CHANNEL,
2780); 3059);
2781 3060
2782sub cf::client::send_msg { 3061sub cf::client::send_msg {
2783 my ($self, $channel, $msg, $color, @extra) = @_; 3062 my ($self, $channel, $msg, $color, @extra) = @_;
2784 3063
2785 $msg = $self->pl->expand_cfpod ($msg); 3064 $msg = $self->pl->expand_cfpod ($msg)
3065 unless $color & cf::NDI_VERBATIM;
2786 3066
2787 $color &= cf::NDI_CLIENT_MASK; # just in case... 3067 $color &= cf::NDI_CLIENT_MASK; # just in case...
2788 3068
2789 # check predefined channels, for the benefit of C 3069 # check predefined channels, for the benefit of C
2790 if ($CHANNEL{$channel}) { 3070 if ($CHANNEL{$channel}) {
2791 $channel = $CHANNEL{$channel}; 3071 $channel = $CHANNEL{$channel};
2792 3072
2793 $self->ext_msg (channel_info => $channel) 3073 $self->ext_msg (channel_info => $channel);
2794 if $self->can_msg;
2795
2796 $channel = $channel->{id}; 3074 $channel = $channel->{id};
2797 3075
2798 } elsif (ref $channel) { 3076 } elsif (ref $channel) {
2799 # send meta info to client, if not yet sent 3077 # send meta info to client, if not yet sent
2800 unless (exists $self->{channel}{$channel->{id}}) { 3078 unless (exists $self->{channel}{$channel->{id}}) {
2801 $self->{channel}{$channel->{id}} = $channel; 3079 $self->{channel}{$channel->{id}} = $channel;
2802 $self->ext_msg (channel_info => $channel) 3080 $self->ext_msg (channel_info => $channel);
2803 if $self->can_msg;
2804 } 3081 }
2805 3082
2806 $channel = $channel->{id}; 3083 $channel = $channel->{id};
2807 } 3084 }
2808 3085
2809 return unless @extra || length $msg; 3086 return unless @extra || length $msg;
2810 3087
2811 if ($self->can_msg) {
2812 # default colour, mask it out 3088 # default colour, mask it out
2813 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3089 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2814 if $color & cf::NDI_DEF; 3090 if $color & cf::NDI_DEF;
2815 3091
2816 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3092 my $pkt = "msg "
3093 . $self->{json_coder}->encode (
2817 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3094 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2818 } else { 3095 );
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 3096
2830 $color &= cf::NDI_COLOR_MASK; 3097 $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} 3098}
2844 3099
2845=item $client->ext_msg ($type, @msg) 3100=item $client->ext_msg ($type, @msg)
2846 3101
2847Sends an ext event to the client. 3102Sends an ext event to the client.
2850 3105
2851sub cf::client::ext_msg($$@) { 3106sub cf::client::ext_msg($$@) {
2852 my ($self, $type, @msg) = @_; 3107 my ($self, $type, @msg) = @_;
2853 3108
2854 if ($self->extcmd == 2) { 3109 if ($self->extcmd == 2) {
2855 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3110 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2856 } elsif ($self->extcmd == 1) { # TODO: remove 3111 } elsif ($self->extcmd == 1) { # TODO: remove
2857 push @msg, msgtype => "event_$type"; 3112 push @msg, msgtype => "event_$type";
2858 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3113 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2859 } 3114 }
2860} 3115}
2861 3116
2862=item $client->ext_reply ($msgid, @msg) 3117=item $client->ext_reply ($msgid, @msg)
2863 3118
2867 3122
2868sub cf::client::ext_reply($$@) { 3123sub cf::client::ext_reply($$@) {
2869 my ($self, $id, @msg) = @_; 3124 my ($self, $id, @msg) = @_;
2870 3125
2871 if ($self->extcmd == 2) { 3126 if ($self->extcmd == 2) {
2872 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3127 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2873 } elsif ($self->extcmd == 1) { 3128 } elsif ($self->extcmd == 1) {
2874 #TODO: version 1, remove 3129 #TODO: version 1, remove
2875 unshift @msg, msgtype => "reply", msgid => $id; 3130 unshift @msg, msgtype => "reply", msgid => $id;
2876 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3131 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2877 } 3132 }
2878} 3133}
2879 3134
2880=item $success = $client->query ($flags, "text", \&cb) 3135=item $success = $client->query ($flags, "text", \&cb)
2881 3136
2952 3207
2953 $ns->ext_reply ($reply, @reply) 3208 $ns->ext_reply ($reply, @reply)
2954 if $reply; 3209 if $reply;
2955 3210
2956 } else { 3211 } else {
2957 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3212 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2958 } 3213 }
2959 3214
2960 cf::override; 3215 cf::override;
2961 }, 3216 },
2962); 3217);
2982 3237
2983 $coro 3238 $coro
2984} 3239}
2985 3240
2986cf::client->attach ( 3241cf::client->attach (
2987 on_destroy => sub { 3242 on_client_destroy => sub {
2988 my ($ns) = @_; 3243 my ($ns) = @_;
2989 3244
2990 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3245 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2991 }, 3246 },
2992); 3247);
3008our $safe_hole = new Safe::Hole; 3263our $safe_hole = new Safe::Hole;
3009 3264
3010$SIG{FPE} = 'IGNORE'; 3265$SIG{FPE} = 'IGNORE';
3011 3266
3012$safe->permit_only (Opcode::opset qw( 3267$safe->permit_only (Opcode::opset qw(
3013 :base_core :base_mem :base_orig :base_math 3268 :base_core :base_mem :base_orig :base_math :base_loop
3014 grepstart grepwhile mapstart mapwhile 3269 grepstart grepwhile mapstart mapwhile
3015 sort time 3270 sort time
3016)); 3271));
3017 3272
3018# here we export the classes and methods available to script code 3273# here we export the classes and methods available to script code
3021 3276
3022The following functions and methods are available within a safe environment: 3277The following functions and methods are available within a safe environment:
3023 3278
3024 cf::object 3279 cf::object
3025 contr pay_amount pay_player map x y force_find force_add destroy 3280 contr pay_amount pay_player map x y force_find force_add destroy
3026 insert remove name archname title slaying race decrease_ob_nr 3281 insert remove name archname title slaying race decrease split
3282 value
3027 3283
3028 cf::object::player 3284 cf::object::player
3029 player 3285 player
3030 3286
3031 cf::player 3287 cf::player
3036 3292
3037=cut 3293=cut
3038 3294
3039for ( 3295for (
3040 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3296 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3041 insert remove inv name archname title slaying race 3297 insert remove inv nrof name archname title slaying race
3042 decrease_ob_nr destroy)], 3298 decrease split destroy change_exp value msg lore send_msg)],
3043 ["cf::object::player" => qw(player)], 3299 ["cf::object::player" => qw(player)],
3044 ["cf::player" => qw(peaceful)], 3300 ["cf::player" => qw(peaceful send_msg)],
3045 ["cf::map" => qw(trigger)], 3301 ["cf::map" => qw(trigger)],
3046) { 3302) {
3047 no strict 'refs';
3048 my ($pkg, @funs) = @$_; 3303 my ($pkg, @funs) = @$_;
3049 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3304 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3050 for @funs; 3305 for @funs;
3051} 3306}
3052 3307
3067 3322
3068 my $qcode = $code; 3323 my $qcode = $code;
3069 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3324 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3070 $qcode =~ s/\n/\\n/g; 3325 $qcode =~ s/\n/\\n/g;
3071 3326
3327 %vars = (_dummy => 0) unless %vars;
3328
3329 my @res;
3072 local $_; 3330 local $_;
3073 local @safe::cf::_safe_eval_args = values %vars;
3074 3331
3075 my $eval = 3332 my $eval =
3076 "do {\n" 3333 "do {\n"
3077 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3334 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3078 . "#line 0 \"{$qcode}\"\n" 3335 . "#line 0 \"{$qcode}\"\n"
3079 . $code 3336 . $code
3080 . "\n}" 3337 . "\n}"
3081 ; 3338 ;
3082 3339
3340 if ($CFG{safe_eval}) {
3083 sub_generation_inc; 3341 sub_generation_inc;
3342 local @safe::cf::_safe_eval_args = values %vars;
3084 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3343 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3085 sub_generation_inc; 3344 sub_generation_inc;
3345 } else {
3346 local @cf::_safe_eval_args = values %vars;
3347 @res = wantarray ? eval eval : scalar eval $eval;
3348 }
3086 3349
3087 if ($@) { 3350 if ($@) {
3088 warn "$@"; 3351 warn "$@",
3089 warn "while executing safe code '$code'\n"; 3352 "while executing safe code '$code'\n",
3090 warn "with arguments " . (join " ", %vars) . "\n"; 3353 "with arguments " . (join " ", %vars) . "\n";
3091 } 3354 }
3092 3355
3093 wantarray ? @res : $res[0] 3356 wantarray ? @res : $res[0]
3094} 3357}
3095 3358
3109=cut 3372=cut
3110 3373
3111sub register_script_function { 3374sub register_script_function {
3112 my ($fun, $cb) = @_; 3375 my ($fun, $cb) = @_;
3113 3376
3114 no strict 'refs'; 3377 $fun = "safe::$fun" if $CFG{safe_eval};
3115 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3378 *$fun = $safe_hole->wrap ($cb);
3116} 3379}
3117 3380
3118=back 3381=back
3119 3382
3120=cut 3383=cut
3129 # for this (global event?) 3392 # for this (global event?)
3130 %ext::player_env::MUSIC_FACE_CACHE = (); 3393 %ext::player_env::MUSIC_FACE_CACHE = ();
3131 3394
3132 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3395 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3133 3396
3134 warn "loading facedata from $path\n"; 3397 trace "loading facedata from $path\n";
3135 3398
3136 my $facedata;
3137 0 < aio_load $path, $facedata 3399 0 < aio_load $path, my $facedata
3138 or die "$path: $!"; 3400 or die "$path: $!";
3139 3401
3140 $facedata = Coro::Storable::thaw $facedata; 3402 $facedata = Coro::Storable::thaw $facedata;
3141 3403
3142 $facedata->{version} == 2 3404 $facedata->{version} == 2
3143 or cf::cleanup "$path: version mismatch, cannot proceed."; 3405 or cf::cleanup "$path: version mismatch, cannot proceed.";
3144 3406
3145 # patch in the exptable 3407 # patch in the exptable
3408 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3146 $facedata->{resource}{"res/exp_table"} = { 3409 $facedata->{resource}{"res/exp_table"} = {
3147 type => FT_RSRC, 3410 type => FT_RSRC,
3148 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3411 data => $exp_table,
3412 hash => (Digest::MD5::md5 $exp_table),
3149 }; 3413 };
3150 cf::cede_to_tick; 3414 cf::cede_to_tick;
3151 3415
3152 { 3416 {
3153 my $faces = $facedata->{faceinfo}; 3417 my $faces = $facedata->{faceinfo};
3155 while (my ($face, $info) = each %$faces) { 3419 while (my ($face, $info) = each %$faces) {
3156 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3420 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3157 3421
3158 cf::face::set_visibility $idx, $info->{visibility}; 3422 cf::face::set_visibility $idx, $info->{visibility};
3159 cf::face::set_magicmap $idx, $info->{magicmap}; 3423 cf::face::set_magicmap $idx, $info->{magicmap};
3160 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3424 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3161 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3425 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3162 3426
3163 cf::cede_to_tick; 3427 cf::cede_to_tick;
3164 } 3428 }
3165 3429
3166 while (my ($face, $info) = each %$faces) { 3430 while (my ($face, $info) = each %$faces) {
3171 3435
3172 if (my $smooth = cf::face::find $info->{smooth}) { 3436 if (my $smooth = cf::face::find $info->{smooth}) {
3173 cf::face::set_smooth $idx, $smooth; 3437 cf::face::set_smooth $idx, $smooth;
3174 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3438 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3175 } else { 3439 } else {
3176 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3440 error "smooth face '$info->{smooth}' not found for face '$face'";
3177 } 3441 }
3178 3442
3179 cf::cede_to_tick; 3443 cf::cede_to_tick;
3180 } 3444 }
3181 } 3445 }
3190 3454
3191 cf::anim::invalidate_all; # d'oh 3455 cf::anim::invalidate_all; # d'oh
3192 } 3456 }
3193 3457
3194 { 3458 {
3195 # TODO: for gcfclient pleasure, we should give resources
3196 # that gcfclient doesn't grok a >10000 face index.
3197 my $res = $facedata->{resource}; 3459 my $res = $facedata->{resource};
3198 3460
3199 while (my ($name, $info) = each %$res) { 3461 while (my ($name, $info) = each %$res) {
3200 if (defined $info->{type}) { 3462 if (defined $info->{type}) {
3201 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3463 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3202 my $data;
3203 3464
3204 if ($info->{type} & 1) { 3465 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}; 3466 cf::face::set_type $idx, $info->{type};
3219 } else { 3467 } else {
3220 $RESOURCE{$name} = $info; 3468 $RESOURCE{$name} = $info; # unused
3221 } 3469 }
3222 3470
3223 cf::cede_to_tick; 3471 cf::cede_to_tick;
3224 } 3472 }
3225 } 3473 }
3226 3474
3227 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3475 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3228 3476
3229 1 3477 1
3230} 3478}
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 3479
3252register_exticmd fx_want => sub { 3480register_exticmd fx_want => sub {
3253 my ($ns, $want) = @_; 3481 my ($ns, $want) = @_;
3254 3482
3255 while (my ($k, $v) = each %$want) { 3483 while (my ($k, $v) = each %$want) {
3256 $ns->fx_want ($k, $v); 3484 $ns->fx_want ($k, $v);
3257 } 3485 }
3258}; 3486};
3487
3488sub load_resource_file($) {
3489 my $guard = lock_acquire "load_resource_file";
3490
3491 my $status = load_resource_file_ $_[0];
3492 get_slot 0.1, 100;
3493 cf::arch::commit_load;
3494
3495 $status
3496}
3259 3497
3260sub reload_regions { 3498sub reload_regions {
3261 # HACK to clear player env face cache, we need some signal framework 3499 # HACK to clear player env face cache, we need some signal framework
3262 # for this (global event?) 3500 # for this (global event?)
3263 %ext::player_env::MUSIC_FACE_CACHE = (); 3501 %ext::player_env::MUSIC_FACE_CACHE = ();
3277} 3515}
3278 3516
3279sub reload_archetypes { 3517sub reload_archetypes {
3280 load_resource_file "$DATADIR/archetypes" 3518 load_resource_file "$DATADIR/archetypes"
3281 or die "unable to load archetypes\n"; 3519 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} 3520}
3288 3521
3289sub reload_treasures { 3522sub reload_treasures {
3290 load_resource_file "$DATADIR/treasures" 3523 load_resource_file "$DATADIR/treasures"
3291 or die "unable to load treasurelists\n"; 3524 or die "unable to load treasurelists\n";
3292} 3525}
3293 3526
3527sub reload_sound {
3528 trace "loading sound config from $DATADIR/sound\n";
3529
3530 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3531 or die "$DATADIR/sound $!";
3532
3533 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3534
3535 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3536 my $sound = $soundconf->{compat}[$_]
3537 or next;
3538
3539 my $face = cf::face::find "sound/$sound->[1]";
3540 cf::sound::set $sound->[0] => $face;
3541 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3542 }
3543
3544 while (my ($k, $v) = each %{$soundconf->{event}}) {
3545 my $face = cf::face::find "sound/$v";
3546 cf::sound::set $k => $face;
3547 }
3548}
3549
3294sub reload_resources { 3550sub reload_resources {
3295 warn "reloading resource files...\n"; 3551 trace "reloading resource files...\n";
3296 3552
3553 reload_exp_table;
3554 reload_materials;
3555 reload_facedata;
3556 reload_sound;
3557 reload_archetypes;
3297 reload_regions; 3558 reload_regions;
3298 reload_facedata;
3299 #reload_archetypes;#d#
3300 reload_archetypes;
3301 reload_treasures; 3559 reload_treasures;
3302 3560
3303 warn "finished reloading resource files\n"; 3561 trace "finished reloading resource files\n";
3304}
3305
3306sub init {
3307 reload_resources;
3308} 3562}
3309 3563
3310sub reload_config { 3564sub reload_config {
3311 open my $fh, "<:utf8", "$CONFDIR/config" 3565 trace "reloading config file...\n";
3312 or return;
3313 3566
3314 local $/; 3567 0 < aio_load "$CONFDIR/config", my $config
3315 *CFG = YAML::Load <$fh>; 3568 or die "$CONFDIR/config: $!";
3316 3569
3570 utf8::decode $config;
3571 *CFG = yaml_load $config;
3572
3317 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3573 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3318 3574
3319 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3575 $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}; 3576 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3321 3577
3322 if (exists $CFG{mlockall}) { 3578 if (exists $CFG{mlockall}) {
3326 }; 3582 };
3327 warn $@ if $@; 3583 warn $@ if $@;
3328 } 3584 }
3329} 3585}
3330 3586
3587sub pidfile() {
3588 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3589 or die "$PIDFILE: $!";
3590 flock $fh, &Fcntl::LOCK_EX
3591 or die "$PIDFILE: flock: $!";
3592 $fh
3593}
3594
3595# make sure only one server instance is running at any one time
3596sub atomic {
3597 my $fh = pidfile;
3598
3599 my $pid = <$fh>;
3600 kill 9, $pid if $pid > 0;
3601
3602 seek $fh, 0, 0;
3603 print $fh $$;
3604}
3605
3606sub main_loop {
3607 trace "EV::loop starting\n";
3608 if (1) {
3609 EV::loop;
3610 }
3611 trace "EV::loop returned\n";
3612 goto &main_loop unless $REALLY_UNLOOP;
3613}
3614
3331sub main { 3615sub main {
3616 cf::init_globals; # initialise logging
3617
3618 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3619 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3620 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3621 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3622
3623 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3624
3332 # we must not ever block the main coroutine 3625 # we must not ever block the main coroutine
3333 local $Coro::idle = sub { 3626 local $Coro::idle = sub {
3334 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3627 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3335 (async { 3628 (async {
3336 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3629 $Coro::current->{desc} = "IDLE BUG HANDLER";
3337 EV::loop EV::LOOP_ONESHOT; 3630 EV::loop EV::LOOP_ONESHOT;
3338 })->prio (Coro::PRIO_MAX); 3631 })->prio (Coro::PRIO_MAX);
3339 }; 3632 };
3340 3633
3634 evthread_start IO::AIO::poll_fileno;
3635
3636 cf::sync_job {
3637 cf::incloader::init ();
3638
3639 cf::init_anim;
3640 cf::init_attackmess;
3641 cf::init_dynamic;
3642
3643 cf::load_settings;
3644
3645 reload_resources;
3341 reload_config; 3646 reload_config;
3342 db_init; 3647 db_init;
3648
3649 cf::init_uuid;
3650 cf::init_signals;
3651 cf::init_skills;
3652
3653 cf::init_beforeplay;
3654
3655 atomic;
3656
3343 load_extensions; 3657 load_extensions;
3344 3658
3345 $TICK_WATCHER->start; 3659 utime time, time, $RUNTIMEFILE;
3346 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3660
3347 EV::loop; 3661 # no (long-running) fork's whatsoever before this point(!)
3662 use POSIX ();
3663 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3664
3665 (pop @POST_INIT)->(0) while @POST_INIT;
3666 };
3667
3668 cf::object::thawer::errors_are_fatal 0;
3669 info "parse errors in files are no longer fatal from this point on.\n";
3670
3671 my $free_main; $free_main = EV::idle sub {
3672 undef $free_main;
3673 undef &main; # free gobs of memory :)
3674 };
3675
3676 goto &main_loop;
3348} 3677}
3349 3678
3350############################################################################# 3679#############################################################################
3351# initialisation and cleanup 3680# initialisation and cleanup
3352 3681
3353# install some emergency cleanup handlers 3682# install some emergency cleanup handlers
3354BEGIN { 3683BEGIN {
3355 our %SIGWATCHER = (); 3684 our %SIGWATCHER = ();
3356 for my $signal (qw(INT HUP TERM)) { 3685 for my $signal (qw(INT HUP TERM)) {
3357 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3686 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3358 cf::cleanup "SIG$signal"; 3687 cf::cleanup "SIG$signal";
3359 }; 3688 };
3360 } 3689 }
3361} 3690}
3362 3691
3363sub write_runtime { 3692sub write_runtime_sync {
3364 my $runtime = "$LOCALDIR/runtime"; 3693 my $t0 = AE::time;
3365 3694
3366 # first touch the runtime file to show we are still running: 3695 # first touch the runtime file to show we are still running:
3367 # the fsync below can take a very very long time. 3696 # the fsync below can take a very very long time.
3368 3697
3369 IO::AIO::aio_utime $runtime, undef, undef; 3698 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3370 3699
3371 my $guard = cf::lock_acquire "write_runtime"; 3700 my $guard = cf::lock_acquire "write_runtime";
3372 3701
3373 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3702 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3374 or return; 3703 or return;
3375 3704
3376 my $value = $cf::RUNTIME + 90 + 10; 3705 my $value = $cf::RUNTIME + 90 + 10;
3377 # 10 is the runtime save interval, for a monotonic clock 3706 # 10 is the runtime save interval, for a monotonic clock
3378 # 60 allows for the watchdog to kill the server. 3707 # 60 allows for the watchdog to kill the server.
3388 aio_utime $fh, undef, undef; 3717 aio_utime $fh, undef, undef;
3389 3718
3390 close $fh 3719 close $fh
3391 or return; 3720 or return;
3392 3721
3393 aio_rename "$runtime~", $runtime 3722 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3394 and return; 3723 and return;
3395 3724
3396 warn "runtime file written.\n"; 3725 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3397 3726
3398 1 3727 1
3728}
3729
3730our $uuid_lock;
3731our $uuid_skip;
3732
3733sub write_uuid_sync($) {
3734 $uuid_skip ||= $_[0];
3735
3736 return if $uuid_lock;
3737 local $uuid_lock = 1;
3738
3739 my $uuid = "$LOCALDIR/uuid";
3740
3741 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3742 or return;
3743
3744 my $value = uuid_seq uuid_cur;
3745
3746 unless ($value) {
3747 info "cowardly refusing to write zero uuid value!\n";
3748 return;
3749 }
3750
3751 my $value = uuid_str $value + $uuid_skip;
3752 $uuid_skip = 0;
3753
3754 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3755 and return;
3756
3757 # always fsync - this file is important
3758 aio_fsync $fh
3759 and return;
3760
3761 close $fh
3762 or return;
3763
3764 aio_rename "$uuid~", $uuid
3765 and return;
3766
3767 trace "uuid file written ($value).\n";
3768
3769 1
3770
3771}
3772
3773sub write_uuid($$) {
3774 my ($skip, $sync) = @_;
3775
3776 $sync ? write_uuid_sync $skip
3777 : async { write_uuid_sync $skip };
3399} 3778}
3400 3779
3401sub emergency_save() { 3780sub emergency_save() {
3402 my $freeze_guard = cf::freeze_mainloop; 3781 my $freeze_guard = cf::freeze_mainloop;
3403 3782
3404 warn "enter emergency perl save\n"; 3783 info "emergency_perl_save: enter\n";
3784
3785 # this is a trade-off: we want to be very quick here, so
3786 # save all maps without fsync, and later call a global sync
3787 # (which in turn might be very very slow)
3788 local $USE_FSYNC = 0;
3405 3789
3406 cf::sync_job { 3790 cf::sync_job {
3791 cf::write_runtime_sync; # external watchdog should not bark
3792
3407 # use a peculiar iteration method to avoid tripping on perl 3793 # use a peculiar iteration method to avoid tripping on perl
3408 # refcount bugs in for. also avoids problems with players 3794 # refcount bugs in for. also avoids problems with players
3409 # and maps saved/destroyed asynchronously. 3795 # and maps saved/destroyed asynchronously.
3410 warn "begin emergency player save\n"; 3796 info "emergency_perl_save: begin player save\n";
3411 for my $login (keys %cf::PLAYER) { 3797 for my $login (keys %cf::PLAYER) {
3412 my $pl = $cf::PLAYER{$login} or next; 3798 my $pl = $cf::PLAYER{$login} or next;
3413 $pl->valid or next; 3799 $pl->valid or next;
3414 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3800 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3415 $pl->save; 3801 $pl->save;
3416 } 3802 }
3417 warn "end emergency player save\n"; 3803 info "emergency_perl_save: end player save\n";
3418 3804
3419 warn "begin emergency map save\n"; 3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3807 info "emergency_perl_save: begin map save\n";
3420 for my $path (keys %cf::MAP) { 3808 for my $path (keys %cf::MAP) {
3421 my $map = $cf::MAP{$path} or next; 3809 my $map = $cf::MAP{$path} or next;
3422 $map->valid or next; 3810 $map->valid or next;
3423 $map->save; 3811 $map->save;
3424 } 3812 }
3425 warn "end emergency map save\n"; 3813 info "emergency_perl_save: end map save\n";
3426 3814
3427 warn "begin emergency database checkpoint\n"; 3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3817 info "emergency_perl_save: begin database checkpoint\n";
3428 BDB::db_env_txn_checkpoint $DB_ENV; 3818 BDB::db_env_txn_checkpoint $DB_ENV;
3429 warn "end emergency database checkpoint\n"; 3819 info "emergency_perl_save: end database checkpoint\n";
3820
3821 info "emergency_perl_save: begin write uuid\n";
3822 write_uuid_sync 1;
3823 info "emergency_perl_save: end write uuid\n";
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: syncing database to disk";
3828 BDB::db_env_txn_checkpoint $DB_ENV;
3829
3830 info "emergency_perl_save: starting sync\n";
3831 IO::AIO::aio_sync sub {
3832 info "emergency_perl_save: finished sync\n";
3833 };
3834
3835 cf::write_runtime_sync; # external watchdog should not bark
3836
3837 trace "emergency_perl_save: flushing outstanding aio requests";
3838 while (IO::AIO::nreqs || BDB::nreqs) {
3839 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3840 }
3841
3842 cf::write_runtime_sync; # external watchdog should not bark
3430 }; 3843 };
3431 3844
3432 warn "leave emergency perl save\n"; 3845 info "emergency_perl_save: leave\n";
3433} 3846}
3434 3847
3435sub post_cleanup { 3848sub post_cleanup {
3436 my ($make_core) = @_; 3849 my ($make_core) = @_;
3437 3850
3851 IO::AIO::flush;
3852
3438 warn Carp::longmess "post_cleanup backtrace" 3853 error Carp::longmess "post_cleanup backtrace"
3439 if $make_core; 3854 if $make_core;
3855
3856 my $fh = pidfile;
3857 unlink $PIDFILE if <$fh> == $$;
3858}
3859
3860# a safer delete_package, copied from Symbol
3861sub clear_package($) {
3862 my $pkg = shift;
3863
3864 # expand to full symbol table name if needed
3865 unless ($pkg =~ /^main::.*::$/) {
3866 $pkg = "main$pkg" if $pkg =~ /^::/;
3867 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3868 $pkg .= '::' unless $pkg =~ /::$/;
3869 }
3870
3871 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3872 my $stem_symtab = *{$stem}{HASH};
3873
3874 defined $stem_symtab and exists $stem_symtab->{$leaf}
3875 or return;
3876
3877 # clear all symbols
3878 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3879 for my $name (keys %$leaf_symtab) {
3880 _gv_clear *{"$pkg$name"};
3881# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3882 }
3440} 3883}
3441 3884
3442sub do_reload_perl() { 3885sub do_reload_perl() {
3443 # can/must only be called in main 3886 # can/must only be called in main
3444 if ($Coro::current != $Coro::main) { 3887 unless (in_main) {
3445 warn "can only reload from main coroutine"; 3888 error "can only reload from main coroutine";
3446 return; 3889 return;
3447 } 3890 }
3448 3891
3892 return if $RELOAD++;
3893
3894 my $t1 = AE::time;
3895
3896 while ($RELOAD) {
3897 cf::get_slot 0.1, -1, "reload_perl";
3449 warn "reloading..."; 3898 info "reloading...";
3450 3899
3451 warn "entering sync_job"; 3900 trace "entering sync_job";
3452 3901
3453 cf::sync_job { 3902 cf::sync_job {
3454 cf::write_runtime; # external watchdog should not bark
3455 cf::emergency_save; 3903 #cf::emergency_save;
3456 cf::write_runtime; # external watchdog should not bark
3457 3904
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"; 3905 trace "cancelling all extension coros";
3475 $_->cancel for values %EXT_CORO; 3906 $_->cancel for values %EXT_CORO;
3476 %EXT_CORO = (); 3907 %EXT_CORO = ();
3477 3908
3478 warn "removing commands"; 3909 trace "removing commands";
3479 %COMMAND = (); 3910 %COMMAND = ();
3480 3911
3481 warn "removing ext/exti commands"; 3912 trace "removing ext/exti commands";
3482 %EXTCMD = (); 3913 %EXTCMD = ();
3483 %EXTICMD = (); 3914 %EXTICMD = ();
3484 3915
3485 warn "unloading/nuking all extensions"; 3916 trace "unloading/nuking all extensions";
3486 for my $pkg (@EXTS) { 3917 for my $pkg (@EXTS) {
3487 warn "... unloading $pkg"; 3918 trace "... unloading $pkg";
3488 3919
3489 if (my $cb = $pkg->can ("unload")) { 3920 if (my $cb = $pkg->can ("unload")) {
3490 eval { 3921 eval {
3491 $cb->($pkg); 3922 $cb->($pkg);
3492 1 3923 1
3493 } or warn "$pkg unloaded, but with errors: $@"; 3924 } or error "$pkg unloaded, but with errors: $@";
3925 }
3926
3927 trace "... clearing $pkg";
3928 clear_package $pkg;
3494 } 3929 }
3495 3930
3496 warn "... nuking $pkg";
3497 Symbol::delete_package $pkg;
3498 }
3499
3500 warn "unloading all perl modules loaded from $LIBDIR"; 3931 trace "unloading all perl modules loaded from $LIBDIR";
3501 while (my ($k, $v) = each %INC) { 3932 while (my ($k, $v) = each %INC) {
3502 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3933 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3503 3934
3504 warn "... unloading $k"; 3935 trace "... unloading $k";
3505 delete $INC{$k}; 3936 delete $INC{$k};
3506 3937
3507 $k =~ s/\.pm$//; 3938 $k =~ s/\.pm$//;
3508 $k =~ s/\//::/g; 3939 $k =~ s/\//::/g;
3509 3940
3510 if (my $cb = $k->can ("unload_module")) { 3941 if (my $cb = $k->can ("unload_module")) {
3511 $cb->(); 3942 $cb->();
3943 }
3944
3945 clear_package $k;
3512 } 3946 }
3513 3947
3514 Symbol::delete_package $k;
3515 }
3516
3517 warn "getting rid of safe::, as good as possible"; 3948 trace "getting rid of safe::, as good as possible";
3518 Symbol::delete_package "safe::$_" 3949 clear_package "safe::$_"
3519 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3950 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3520 3951
3521 warn "unloading cf.pm \"a bit\""; 3952 trace "unloading cf.pm \"a bit\"";
3522 delete $INC{"cf.pm"}; 3953 delete $INC{"cf.pm"};
3523 delete $INC{"cf/pod.pm"}; 3954 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3524 3955
3525 # don't, removes xs symbols, too, 3956 # don't, removes xs symbols, too,
3526 # and global variables created in xs 3957 # and global variables created in xs
3527 #Symbol::delete_package __PACKAGE__; 3958 #clear_package __PACKAGE__;
3528 3959
3529 warn "unload completed, starting to reload now"; 3960 info "unload completed, starting to reload now";
3530 3961
3531 warn "reloading cf.pm"; 3962 trace "reloading cf.pm";
3532 require cf; 3963 require cf;
3533 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3964 cf::_connect_to_perl_1;
3534 3965
3535 warn "loading config and database again"; 3966 trace "loading config and database again";
3536 cf::reload_config; 3967 cf::reload_config;
3537 3968
3538 warn "loading extensions"; 3969 trace "loading extensions";
3539 cf::load_extensions; 3970 cf::load_extensions;
3540 3971
3972 if ($REATTACH_ON_RELOAD) {
3541 warn "reattaching attachments to objects/players"; 3973 trace "reattaching attachments to objects/players";
3542 _global_reattach; # objects, sockets 3974 _global_reattach; # objects, sockets
3543 warn "reattaching attachments to maps"; 3975 trace "reattaching attachments to maps";
3544 reattach $_ for values %MAP; 3976 reattach $_ for values %MAP;
3545 warn "reattaching attachments to players"; 3977 trace "reattaching attachments to players";
3546 reattach $_ for values %PLAYER; 3978 reattach $_ for values %PLAYER;
3979 }
3547 3980
3981 trace "running post_init jobs";
3982 (pop @POST_INIT)->(1) while @POST_INIT;
3983
3548 warn "leaving sync_job"; 3984 trace "leaving sync_job";
3549 3985
3550 1 3986 1
3551 } or do { 3987 } or do {
3552 warn $@; 3988 error $@;
3553 warn "error while reloading, exiting."; 3989 cf::cleanup "error while reloading, exiting.";
3554 exit 1; 3990 };
3991
3992 info "reloaded";
3993 --$RELOAD;
3555 }; 3994 }
3556 3995
3557 warn "reloaded"; 3996 $t1 = AE::time - $t1;
3997 info "reload completed in ${t1}s\n";
3558}; 3998};
3559 3999
3560our $RELOAD_WATCHER; # used only during reload 4000our $RELOAD_WATCHER; # used only during reload
3561 4001
3562sub reload_perl() { 4002sub reload_perl() {
3563 # doing reload synchronously and two reloads happen back-to-back, 4003 # doing reload synchronously and two reloads happen back-to-back,
3564 # coro crashes during coro_state_free->destroy here. 4004 # coro crashes during coro_state_free->destroy here.
3565 4005
4006 $RELOAD_WATCHER ||= cf::async {
4007 Coro::AIO::aio_wait cache_extensions;
4008
3566 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4009 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
4010 do_reload_perl;
3567 undef $RELOAD_WATCHER; 4011 undef $RELOAD_WATCHER;
3568 do_reload_perl; 4012 };
3569 }; 4013 };
3570} 4014}
3571 4015
3572register_command "reload" => sub { 4016register_command "reload" => sub {
3573 my ($who, $arg) = @_; 4017 my ($who, $arg) = @_;
3579 reload_perl; 4023 reload_perl;
3580 }; 4024 };
3581 } 4025 }
3582}; 4026};
3583 4027
3584unshift @INC, $LIBDIR; 4028#############################################################################
3585 4029
3586my $bug_warning = 0; 4030my $bug_warning = 0;
3587 4031
3588our @WAIT_FOR_TICK; 4032our @WAIT_FOR_TICK;
3589our @WAIT_FOR_TICK_BEGIN; 4033our @WAIT_FOR_TICK_BEGIN;
3590 4034
3591sub wait_for_tick { 4035sub wait_for_tick() {
3592 return unless $TICK_WATCHER->is_active;
3593 return if $Coro::current == $Coro::main; 4036 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3594 4037
3595 my $signal = new Coro::Signal; 4038 my $signal = new Coro::Signal;
3596 push @WAIT_FOR_TICK, $signal; 4039 push @WAIT_FOR_TICK, $signal;
3597 $signal->wait; 4040 $signal->wait;
3598} 4041}
3599 4042
3600sub wait_for_tick_begin { 4043sub wait_for_tick_begin() {
3601 return unless $TICK_WATCHER->is_active;
3602 return if $Coro::current == $Coro::main; 4044 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3603 4045
3604 my $signal = new Coro::Signal; 4046 my $signal = new Coro::Signal;
3605 push @WAIT_FOR_TICK_BEGIN, $signal; 4047 push @WAIT_FOR_TICK_BEGIN, $signal;
3606 $signal->wait; 4048 $signal->wait;
3607} 4049}
3608 4050
3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 4051sub tick {
3610 if ($Coro::current != $Coro::main) { 4052 if ($Coro::current != $Coro::main) {
3611 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4053 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3612 unless ++$bug_warning > 10; 4054 unless ++$bug_warning > 10;
3613 return; 4055 return;
3614 } 4056 }
3615 4057
3616 $NOW = $tick_start = EV::now;
3617
3618 cf::server_tick; # one server iteration 4058 cf::server_tick; # one server iteration
3619 4059
3620 $RUNTIME += $TICK; 4060 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3621 $NEXT_TICK = $_[0]->at;
3622 4061
3623 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4062 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3624 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4063 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3625 Coro::async_pool { 4064 Coro::async_pool {
3626 $Coro::current->{desc} = "runtime saver"; 4065 $Coro::current->{desc} = "runtime saver";
3627 write_runtime 4066 write_runtime_sync
3628 or warn "ERROR: unable to write runtime file: $!"; 4067 or error "ERROR: unable to write runtime file: $!";
3629 }; 4068 };
3630 } 4069 }
3631 4070
3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4071 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3633 $sig->send; 4072 $sig->send;
3634 } 4073 }
3635 while (my $sig = shift @WAIT_FOR_TICK) { 4074 while (my $sig = shift @WAIT_FOR_TICK) {
3636 $sig->send; 4075 $sig->send;
3637 } 4076 }
3638 4077
3639 $LOAD = ($NOW - $tick_start) / $TICK; 4078 $LOAD = ($NOW - $TICK_START) / $TICK;
3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4079 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3641 4080
3642 _post_tick; 4081 if (0) {
3643}; 4082 if ($NEXT_TICK) {
3644$TICK_WATCHER->priority (EV::MAXPRI); 4083 my $jitter = $TICK_START - $NEXT_TICK;
4084 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4085 debug "jitter $JITTER\n";#d#
4086 }
4087 }
4088}
3645 4089
3646{ 4090{
3647 # configure BDB 4091 # configure BDB
3648 4092
3649 BDB::min_parallel 8; 4093 BDB::min_parallel 16;
3650 BDB::max_poll_reqs $TICK * 0.1; 4094 BDB::max_poll_reqs $TICK * 0.1;
3651 $Coro::BDB::WATCHER->priority (1); 4095 $AnyEvent::BDB::WATCHER->priority (1);
3652 4096
3653 unless ($DB_ENV) { 4097 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 4098 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4099 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656 | BDB::LOG_AUTOREMOVE, 1); 4100 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4101 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4102 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4103 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659 4104
3660 cf::sync_job { 4105 cf::sync_job {
3661 eval { 4106 eval {
3687{ 4132{
3688 # configure IO::AIO 4133 # configure IO::AIO
3689 4134
3690 IO::AIO::min_parallel 8; 4135 IO::AIO::min_parallel 8;
3691 IO::AIO::max_poll_time $TICK * 0.1; 4136 IO::AIO::max_poll_time $TICK * 0.1;
3692 $Coro::AIO::WATCHER->priority (1); 4137 undef $AnyEvent::AIO::WATCHER;
3693} 4138}
3694 4139
3695my $_log_backtrace; 4140my $_log_backtrace;
3696 4141
3697sub _log_backtrace { 4142sub _log_backtrace {
3700 $msg =~ s/\n//; 4145 $msg =~ s/\n//;
3701 4146
3702 # limit the # of concurrent backtraces 4147 # limit the # of concurrent backtraces
3703 if ($_log_backtrace < 2) { 4148 if ($_log_backtrace < 2) {
3704 ++$_log_backtrace; 4149 ++$_log_backtrace;
4150 my $perl_bt = Carp::longmess $msg;
3705 async { 4151 async {
3706 $Coro::current->{desc} = "abt $msg"; 4152 $Coro::current->{desc} = "abt $msg";
3707 4153
3708 my @bt = fork_call { 4154 my @bt = fork_call {
3709 @addr = map { sprintf "%x", $_ } @addr; 4155 @addr = map { sprintf "%x", $_ } @addr;
3720 } 4166 }
3721 4167
3722 @funcs 4168 @funcs
3723 }; 4169 };
3724 4170
3725 LOG llevInfo, "[ABT] $msg\n"; 4171 LOG llevInfo, "[ABT] $perl_bt\n";
4172 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3726 LOG llevInfo, "[ABT] $_\n" for @bt; 4173 LOG llevInfo, "[ABT] $_\n" for @bt;
3727 --$_log_backtrace; 4174 --$_log_backtrace;
3728 }; 4175 };
3729 } else { 4176 } else {
3730 LOG llevInfo, "[ABT] $msg\n"; 4177 LOG llevInfo, "[ABT] $msg\n";
3731 LOG llevInfo, "[ABT] [suppressed]\n"; 4178 LOG llevInfo, "[ABT] [suppressed]\n";
3732 } 4179 }
3733} 4180}
3734 4181
3735# load additional modules 4182# load additional modules
3736use cf::pod; 4183require "cf/$_.pm" for @EXTRA_MODULES;
4184cf::_connect_to_perl_2;
3737 4185
3738END { cf::emergency_save } 4186END { cf::emergency_save }
3739 4187
37401 41881
3741 4189

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines