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.411 by root, Fri Feb 1 15:54:07 2008 UTC vs.
Revision 1.553 by root, Tue May 18 21:30:16 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines