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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines