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.414 by root, Thu Apr 10 09:10:45 2008 UTC vs.
Revision 1.559 by root, Sat Feb 26 12:50:27 2011 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines