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.406 by root, Mon Dec 17 08:27:44 2007 UTC vs.
Revision 1.559 by root, Sat Feb 26 12:50:27 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines