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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines