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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines