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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines