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.407 by root, Sun Jan 13 09:53:53 2008 UTC vs.
Revision 1.559 by root, Sat Feb 26 12:50:27 2011 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use EV 1.86; 30use EV;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 4.32 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
18use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
23use Coro::BDB; 49use Coro::BDB 1.6;
24use Coro::Storable; 50use Coro::Storable;
25use Coro::Util (); 51use Coro::Util ();
26 52
27use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
28use BDB (); 54use BDB ();
29use Data::Dumper; 55use Data::Dumper;
30use Digest::MD5;
31use Fcntl; 56use Fcntl;
32use YAML::Syck (); 57use YAML::XS ();
33use IO::AIO 2.51 (); 58use IO::AIO ();
34use Time::HiRes; 59use Time::HiRes;
35use Compress::LZF; 60use Compress::LZF;
36use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
37 64
38# configure various modules to our taste 65# configure various modules to our taste
39# 66#
40$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
43 75
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 76# strictly for debugging
45$YAML::Syck::ImplicitUnicode = 1; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 78
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
50 82
51our %COMMAND = (); 83our %COMMAND = ();
52our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
53 85
54our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
55our %EXTCMD = (); 87our %EXTCMD = ();
56our %EXTICMD = (); 88our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
59 91
60our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
62 96
63our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
64our $DATADIR = datadir; 99our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
68our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
74our %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;
75 120
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 123our $NEXT_TICK;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
82 125
83our $BDB_POLL_WATCHER;
84our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 129our $DB_ENV;
88 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
89our %CFG; 133our %CFG;
90 134
91our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
92our $RUNTIME; 136our $RUNTIME;
93our $NOW; 137our $NOW;
99# used to convert map paths into valid unix filenames by replacing / by ∕ 143# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 144our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 145
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 146our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 147our $LOADAVG; # same thing, but with alpha-smoothing
148our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 149our $TICK_START; # for load detecting purposes
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 :)
105 155
106binmode STDOUT; 156binmode STDOUT;
107binmode STDERR; 157binmode STDERR;
108 158
109# read virtual server time, if available 159# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 160unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 161 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
114} 164}
165
166eval "sub TICK() { $TICK } 1" or die;
115 167
116mkdir $_ 168mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 170
119our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
120 172
121sub 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::"} };
122 189
123############################################################################# 190#############################################################################
124 191
125=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
126 193
168from wherever your confdir points to. 235from wherever your confdir points to.
169 236
170=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
171 238
172These 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
173returns 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
174per 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.
175 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
176=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
177 249
178This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
179C<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
180that call. 252that call.
181 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
182=back 260=back
183 261
184=cut 262=cut
185 263
186BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
187 *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 {
188 my $msg = join "", @_; 271 my $msg = join "", @_;
189 272
190 $msg .= "\n" 273 $msg .= "\n"
191 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
192 275
193 $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;
194 277
195 LOG llevError, $msg; 278 LOG llevWarn, $msg;
196 }; 279};
197}
198 280
199$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
282 return unless $^S eq 0; # "eq", not "=="
283
200 warn Carp::longmess $_[0]; 284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
287 error "DIEHOOK called in main context, Coro bug?\n";#d#
288 return;#d#
289 }#d#
290
291 # kill coroutine otherwise
201 Coro::terminate; 292 Coro::terminate
202}; 293};
203 294
204@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
205@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
206@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
214for my $pkg (qw( 305for my $pkg (qw(
215 cf::global cf::attachable 306 cf::global cf::attachable
216 cf::object cf::object::player 307 cf::object cf::object::player
217 cf::client cf::player 308 cf::client cf::player
218 cf::arch cf::living 309 cf::arch cf::living
310 cf::map cf::mapspace
219 cf::map cf::party cf::region 311 cf::party cf::region
220)) { 312)) {
221 no strict 'refs';
222 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
223} 314}
224 315
225$EV::DIED = sub { 316$EV::DIED = sub {
226 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
227}; 318};
228 319
229############################################################################# 320#############################################################################
230 321
231=head2 UTILITY FUNCTIONS 322=head2 UTILITY FUNCTIONS
268our $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
269 360
270sub encode_json($) { $json_coder->encode ($_[0]) } 361sub encode_json($) { $json_coder->encode ($_[0]) }
271sub decode_json($) { $json_coder->decode ($_[0]) } 362sub decode_json($) { $json_coder->decode ($_[0]) }
272 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
273=item cf::lock_wait $string 407=item cf::lock_wait $string
274 408
275Wait until the given lock is available. See cf::lock_acquire. 409Wait until the given lock is available. See cf::lock_acquire.
276 410
277=item my $lock = cf::lock_acquire $string 411=item my $lock = cf::lock_acquire $string
278 412
279Wait 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
280a 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,
281for example when the coroutine gets canceled), the lock is automatically 415for example when the coroutine gets canceled), the lock is automatically
282returned. 416returned.
283 417
284Locks 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
285deadlocked coro. 419deadlocked coro.
291 425
292Return 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.
293 427
294=cut 428=cut
295 429
296our %LOCK; 430our $LOCKS = new Coro::SemaphoreSet;
297our %LOCKER;#d#
298 431
299sub lock_wait($) { 432sub lock_wait($) {
300 my ($key) = @_; 433 $LOCKS->wait ($_[0]);
301
302 if ($LOCKER{$key} == $Coro::current) {#d#
303 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
304 return;#d#
305 }#d#
306
307 # wait for lock, if any
308 while ($LOCK{$key}) {
309 push @{ $LOCK{$key} }, $Coro::current;
310 Coro::schedule;
311 }
312} 434}
313 435
314sub lock_acquire($) { 436sub lock_acquire($) {
315 my ($key) = @_; 437 $LOCKS->guard ($_[0])
316
317 # wait, to be sure we are not locked
318 lock_wait $key;
319
320 $LOCK{$key} = [];
321 $LOCKER{$key} = $Coro::current;#d#
322
323 Coro::guard {
324 delete $LOCKER{$key};#d#
325 # wake up all waiters, to be on the safe side
326 $_->ready for @{ delete $LOCK{$key} };
327 }
328} 438}
329 439
330sub lock_active($) { 440sub lock_active($) {
331 my ($key) = @_; 441 $LOCKS->count ($_[0]) < 1
332
333 ! ! $LOCK{$key}
334} 442}
335 443
336sub freeze_mainloop { 444sub freeze_mainloop {
337 return unless $TICK_WATCHER->is_active; 445 tick_inhibit_inc;
338 446
339 my $guard = Coro::guard { 447 &Guard::guard (\&tick_inhibit_dec);
340 $TICK_WATCHER->start;
341 };
342 $TICK_WATCHER->stop;
343 $guard
344} 448}
345 449
346=item cf::periodic $interval, $cb 450=item cf::periodic $interval, $cb
347 451
348Like 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
349get spread over timer. 453get spread over time.
350 454
351=cut 455=cut
352 456
353sub periodic($$) { 457sub periodic($$) {
354 my ($interval, $cb) = @_; 458 my ($interval, $cb) = @_;
371 475
372=cut 476=cut
373 477
374our @SLOT_QUEUE; 478our @SLOT_QUEUE;
375our $SLOT_QUEUE; 479our $SLOT_QUEUE;
480our $SLOT_DECAY = 0.9;
376 481
377$SLOT_QUEUE->cancel if $SLOT_QUEUE; 482$SLOT_QUEUE->cancel if $SLOT_QUEUE;
378$SLOT_QUEUE = Coro::async { 483$SLOT_QUEUE = Coro::async {
379 $Coro::current->desc ("timeslot manager"); 484 $Coro::current->desc ("timeslot manager");
380 485
381 my $signal = new Coro::Signal; 486 my $signal = new Coro::Signal;
487 my $busy;
382 488
383 while () { 489 while () {
384 next_job: 490 next_job:
491
385 my $avail = cf::till_tick; 492 my $avail = cf::till_tick;
386 if ($avail > 0.01) { 493
387 for (0 .. $#SLOT_QUEUE) { 494 for (0 .. $#SLOT_QUEUE) {
388 if ($SLOT_QUEUE[$_][0] < $avail) { 495 if ($SLOT_QUEUE[$_][0] <= $avail) {
496 $busy = 0;
389 my $job = splice @SLOT_QUEUE, $_, 1, (); 497 my $job = splice @SLOT_QUEUE, $_, 1, ();
390 $job->[2]->send; 498 $job->[2]->send;
391 Coro::cede; 499 Coro::cede;
392 goto next_job; 500 goto next_job;
393 } 501 } else {
502 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
394 } 503 }
395 } 504 }
396 505
397 if (@SLOT_QUEUE) { 506 if (@SLOT_QUEUE) {
398 # 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
399 push @cf::WAIT_FOR_TICK, $signal; 508 push @cf::WAIT_FOR_TICK, $signal;
400 $signal->wait; 509 $signal->wait;
401 } else { 510 } else {
511 $busy = 0;
402 Coro::schedule; 512 Coro::schedule;
403 } 513 }
404 } 514 }
405}; 515};
406 516
407sub get_slot($;$$) { 517sub get_slot($;$$) {
518 return if tick_inhibit || $Coro::current == $Coro::main;
519
408 my ($time, $pri, $name) = @_; 520 my ($time, $pri, $name) = @_;
409 521
410 $time = $TICK * .6 if $time > $TICK * .6; 522 $time = clamp $time, 0.01, $TICK * .6;
523
411 my $sig = new Coro::Signal; 524 my $sig = new Coro::Signal;
412 525
413 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 526 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
414 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 527 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
415 $SLOT_QUEUE->ready; 528 $SLOT_QUEUE->ready;
441=cut 554=cut
442 555
443sub sync_job(&) { 556sub sync_job(&) {
444 my ($job) = @_; 557 my ($job) = @_;
445 558
446 if ($Coro::current == $Coro::main) { 559 if (in_main) {
447 my $time = EV::time; 560 my $time = AE::time;
448 561
449 # this is the main coro, too bad, we have to block 562 # this is the main coro, too bad, we have to block
450 # till the operation succeeds, freezing the server :/ 563 # till the operation succeeds, freezing the server :/
451 564
452 LOG llevError, Carp::longmess "sync job";#d# 565 #LOG llevError, Carp::longmess "sync job";#d#
453 566
454 # TODO: use suspend/resume instead
455 # (but this is cancel-safe)
456 my $freeze_guard = freeze_mainloop; 567 my $freeze_guard = freeze_mainloop;
457 568
458 my $busy = 1; 569 my $busy = 1;
459 my @res; 570 my @res;
460 571
461 (async { 572 (async {
462 $Coro::current->desc ("sync job coro"); 573 $Coro::current->desc ("sync job coro");
463 @res = eval { $job->() }; 574 @res = eval { $job->() };
464 warn $@ if $@; 575 error $@ if $@;
465 undef $busy; 576 undef $busy;
466 })->prio (Coro::PRIO_MAX); 577 })->prio (Coro::PRIO_MAX);
467 578
468 while ($busy) { 579 while ($busy) {
469 if (Coro::nready) { 580 if (Coro::nready) {
471 } else { 582 } else {
472 EV::loop EV::LOOP_ONESHOT; 583 EV::loop EV::LOOP_ONESHOT;
473 } 584 }
474 } 585 }
475 586
476 $time = EV::time - $time; 587 my $time = AE::time - $time;
477 588
478 LOG llevError | logBacktrace, Carp::longmess "long sync job"
479 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
480
481 $tick_start += $time; # do not account sync jobs to server load 589 $TICK_START += $time; # do not account sync jobs to server load
482 590
483 wantarray ? @res : $res[0] 591 wantarray ? @res : $res[0]
484 } else { 592 } else {
485 # we are in another coroutine, how wonderful, everything just works 593 # we are in another coroutine, how wonderful, everything just works
486 594
506 $EXT_CORO{$coro+0} = $coro; 614 $EXT_CORO{$coro+0} = $coro;
507 615
508 $coro 616 $coro
509} 617}
510 618
511=item fork_call { }, $args 619=item fork_call { }, @args
512 620
513Executes the given code block with the given arguments in a seperate 621Executes the given code block with the given arguments in a seperate
514process, returning the results. Everything must be serialisable with 622process, returning the results. Everything must be serialisable with
515Coro::Storable. May, of course, block. Note that the executed sub may 623Coro::Storable. May, of course, block. Note that the executed sub may
516never block itself or use any form of event handling. 624never block itself or use any form of event handling.
517 625
518=cut 626=cut
519 627
628sub post_fork {
629 reset_signals;
630}
631
520sub fork_call(&@) { 632sub fork_call(&@) {
521 my ($cb, @args) = @_; 633 my ($cb, @args) = @_;
522 634
523 # 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,
524 # otherwise perl prematurely frees the stuff :/ 636 # otherwise perl prematurely frees the stuff :/
525 # TODO: investigate and fix (likely this will be rather laborious) 637 # TODO: investigate and fix (likely this will be rather laborious)
526 638
527 my @res = Coro::Util::fork_eval { 639 my @res = Coro::Util::fork_eval {
528 reset_signals; 640 cf::post_fork;
529 &$cb 641 &$cb
530 }, @args; 642 } @args;
531 643
532 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
533} 683}
534 684
535=item $value = cf::db_get $family => $key 685=item $value = cf::db_get $family => $key
536 686
537Returns a single value from the environment database. 687Returns a single value from the environment database.
547within each server. 697within each server.
548 698
549=cut 699=cut
550 700
551sub db_table($) { 701sub db_table($) {
702 cf::error "db_get called from main context"
703 if $Coro::current == $Coro::main;
704
552 my ($name) = @_; 705 my ($name) = @_;
553 my $db = BDB::db_create $DB_ENV; 706 my $db = BDB::db_create $DB_ENV;
554 707
555 eval { 708 eval {
556 $db->set_flags (BDB::CHKSUM); 709 $db->set_flags (BDB::CHKSUM);
566} 719}
567 720
568our $DB; 721our $DB;
569 722
570sub db_init { 723sub db_init {
571 cf::sync_job {
572 $DB ||= db_table "db"; 724 $DB ||= db_table "db";
573 };
574} 725}
575 726
576sub db_get($$) { 727sub db_get($$) {
577 my $key = "$_[0]/$_[1]"; 728 my $key = "$_[0]/$_[1]";
578 729
579 cf::sync_job { 730 cf::error "db_get called from main context"
731 if $Coro::current == $Coro::main;
732
580 BDB::db_get $DB, undef, $key, my $data; 733 BDB::db_get $DB, undef, $key, my $data;
581 734
582 $! ? () 735 $! ? ()
583 : $data 736 : $data
584 }
585} 737}
586 738
587sub db_put($$$) { 739sub db_put($$$) {
588 BDB::dbreq_pri 4; 740 BDB::dbreq_pri 4;
589 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 741 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
645 797
646 my $t1 = Time::HiRes::time; 798 my $t1 = Time::HiRes::time;
647 my $data = $process->(\@data); 799 my $data = $process->(\@data);
648 my $t2 = Time::HiRes::time; 800 my $t2 = Time::HiRes::time;
649 801
650 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 802 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
651 803
652 db_put cache => "$id/data", $data; 804 db_put cache => "$id/data", $data;
653 db_put cache => "$id/md5" , $md5; 805 db_put cache => "$id/md5" , $md5;
654 db_put cache => "$id/meta", $meta; 806 db_put cache => "$id/meta", $meta;
655 807
665 817
666=cut 818=cut
667 819
668sub datalog($@) { 820sub datalog($@) {
669 my ($type, %kv) = @_; 821 my ($type, %kv) = @_;
670 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 822 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
671} 823}
672 824
673=back 825=back
674 826
675=cut 827=cut
676 828
677############################################################################# 829#############################################################################
678 830
679=head2 ATTACHABLE OBJECTS 831=head2 ATTACHABLE OBJECTS
680 832
681Many 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
682attach callbacks/event handlers (a collection of which is called an "attachment") 834attach callbacks/event handlers (a collection of which is called an "attachment")
683to it. All such attachable objects support the following methods. 835to it. All such attachable objects support the following methods.
684 836
685In 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>
686C<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
736=item cf::CLASS::attachment $name, ... 888=item cf::CLASS::attachment $name, ...
737 889
738Register an attachment by C<$name> through which attachable objects of the 890Register an attachment by C<$name> through which attachable objects of the
739given CLASS can refer to this attachment. 891given CLASS can refer to this attachment.
740 892
741Some classes such as crossfire maps and objects can specify attachments 893Some classes such as deliantra maps and objects can specify attachments
742that 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.
743 895
744These calls expect any number of the following handler/hook descriptions: 896These calls expect any number of the following handler/hook descriptions:
745 897
746=over 4 898=over 4
870 1022
871 } elsif (exists $cb_id{$type}) { 1023 } elsif (exists $cb_id{$type}) {
872 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1024 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
873 1025
874 } elsif (ref $type) { 1026 } elsif (ref $type) {
875 warn "attaching objects not supported, ignoring.\n"; 1027 error "attaching objects not supported, ignoring.\n";
876 1028
877 } else { 1029 } else {
878 shift @arg; 1030 shift @arg;
879 warn "attach argument '$type' not supported, ignoring.\n"; 1031 error "attach argument '$type' not supported, ignoring.\n";
880 } 1032 }
881 } 1033 }
882} 1034}
883 1035
884sub _object_attach { 1036sub _object_attach {
894 _attach $registry, $klass, @attach; 1046 _attach $registry, $klass, @attach;
895 } 1047 }
896 1048
897 $obj->{$name} = \%arg; 1049 $obj->{$name} = \%arg;
898 } else { 1050 } else {
899 warn "object uses attachment '$name' which is not available, postponing.\n"; 1051 info "object uses attachment '$name' which is not available, postponing.\n";
900 } 1052 }
901 1053
902 $obj->{_attachment}{$name} = undef; 1054 $obj->{_attachment}{$name} = undef;
903} 1055}
904 1056
963 1115
964 for (@$callbacks) { 1116 for (@$callbacks) {
965 eval { &{$_->[1]} }; 1117 eval { &{$_->[1]} };
966 1118
967 if ($@) { 1119 if ($@) {
968 warn "$@";
969 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1120 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
970 override; 1121 override;
971 } 1122 }
972 1123
973 return 1 if $override; 1124 return 1 if $override;
974 } 1125 }
1037 1188
1038sub reattach { 1189sub reattach {
1039 # basically do the same as instantiate, without calling instantiate 1190 # basically do the same as instantiate, without calling instantiate
1040 my ($obj) = @_; 1191 my ($obj) = @_;
1041 1192
1193 # no longer needed after getting rid of delete_package?
1042 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
1043 1195
1044 my $registry = $obj->registry; 1196 my $registry = $obj->registry;
1045 1197
1046 @$registry = (); 1198 @$registry = ();
1047 1199
1052 for (@$attach) { 1204 for (@$attach) {
1053 my ($klass, @attach) = @$_; 1205 my ($klass, @attach) = @$_;
1054 _attach $registry, $klass, @attach; 1206 _attach $registry, $klass, @attach;
1055 } 1207 }
1056 } else { 1208 } else {
1057 warn "object uses attachment '$name' that is not available, postponing.\n"; 1209 info "object uses attachment '$name' that is not available, postponing.\n";
1058 } 1210 }
1059 } 1211 }
1060} 1212}
1061 1213
1062cf::attachable->attach ( 1214cf::attachable->attach (
1089 my ($filename, $rdata, $objs) = @_; 1241 my ($filename, $rdata, $objs) = @_;
1090 1242
1091 sync_job { 1243 sync_job {
1092 if (length $$rdata) { 1244 if (length $$rdata) {
1093 utf8::decode (my $decname = $filename); 1245 utf8::decode (my $decname = $filename);
1094 warn sprintf "saving %s (%d,%d)\n", 1246 trace sprintf "saving %s (%d,%d)\n",
1095 $decname, length $$rdata, scalar @$objs; 1247 $decname, length $$rdata, scalar @$objs
1248 if $VERBOSE_IO;
1096 1249
1097 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1250 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1098 chmod SAVE_MODE, $fh; 1251 aio_chmod $fh, SAVE_MODE;
1099 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1252 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1100 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 }
1101 close $fh; 1257 aio_close $fh;
1102 1258
1103 if (@$objs) { 1259 if (@$objs) {
1104 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) {
1105 chmod SAVE_MODE, $fh; 1261 aio_chmod $fh, SAVE_MODE;
1106 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1262 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1107 aio_write $fh, 0, (length $data), $data, 0; 1263 aio_write $fh, 0, (length $data), $data, 0;
1108 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 }
1109 close $fh; 1268 aio_close $fh;
1110 aio_rename "$filename.pst~", "$filename.pst"; 1269 aio_rename "$filename.pst~", "$filename.pst";
1111 } 1270 }
1112 } else { 1271 } else {
1113 aio_unlink "$filename.pst"; 1272 aio_unlink "$filename.pst";
1114 } 1273 }
1115 1274
1116 aio_rename "$filename~", $filename; 1275 aio_rename "$filename~", $filename;
1276
1277 $filename =~ s%/[^/]+$%%;
1278 aio_pathsync $filename if $cf::USE_FSYNC;
1117 } else { 1279 } else {
1118 warn "FATAL: $filename~: $!\n"; 1280 error "unable to save objects: $filename~: $!\n";
1119 } 1281 }
1120 } else { 1282 } else {
1121 aio_unlink $filename; 1283 aio_unlink $filename;
1122 aio_unlink "$filename.pst"; 1284 aio_unlink "$filename.pst";
1123 } 1285 }
1147 my $st = eval { Coro::Storable::thaw $av }; 1309 my $st = eval { Coro::Storable::thaw $av };
1148 $av = $st->{objs}; 1310 $av = $st->{objs};
1149 } 1311 }
1150 1312
1151 utf8::decode (my $decname = $filename); 1313 utf8::decode (my $decname = $filename);
1152 warn sprintf "loading %s (%d,%d)\n", 1314 trace sprintf "loading %s (%d,%d)\n",
1153 $decname, length $data, scalar @{$av || []}; 1315 $decname, length $data, scalar @{$av || []}
1316 if $VERBOSE_IO;
1154 1317
1155 ($data, $av) 1318 ($data, $av)
1156} 1319}
1157 1320
1158=head2 COMMAND CALLBACKS 1321=head2 COMMAND CALLBACKS
1214 my ($name, $cb) = @_; 1377 my ($name, $cb) = @_;
1215 1378
1216 $EXTICMD{$name} = $cb; 1379 $EXTICMD{$name} = $cb;
1217} 1380}
1218 1381
1382use File::Glob ();
1383
1219cf::player->attach ( 1384cf::player->attach (
1220 on_command => sub { 1385 on_unknown_command => sub {
1221 my ($pl, $name, $params) = @_; 1386 my ($pl, $name, $params) = @_;
1222 1387
1223 my $cb = $COMMAND{$name} 1388 my $cb = $COMMAND{$name}
1224 or return; 1389 or return;
1225 1390
1248 1413
1249 $pl->ext_reply ($reply, @reply) 1414 $pl->ext_reply ($reply, @reply)
1250 if $reply; 1415 if $reply;
1251 1416
1252 } else { 1417 } else {
1253 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1418 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1254 } 1419 }
1255 1420
1256 cf::override; 1421 cf::override;
1257 }, 1422 },
1258); 1423);
1259 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
1260sub load_extensions { 1438sub load_extensions {
1439 info "loading extensions...";
1440
1261 cf::sync_job { 1441 cf::sync_job {
1262 my %todo; 1442 my %todo;
1263 1443
1264 for my $path (<$LIBDIR/*.ext>) { 1444 for my $path (<$LIBDIR/*.ext>) {
1265 next unless -r $path; 1445 next unless -r $path;
1283 1463
1284 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1464 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1285 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1465 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1286 1466
1287 $ext{source} = 1467 $ext{source} =
1288 "package $pkg; use strict; use utf8;\n" 1468 "package $pkg; use common::sense;\n"
1289 . "#line 1 \"$path\"\n{\n" 1469 . "#line 1 \"$path\"\n{\n"
1290 . $source 1470 . $source
1291 . "\n};\n1"; 1471 . "\n};\n1";
1292 1472
1293 $todo{$base} = \%ext; 1473 $todo{$base} = \%ext;
1294 } 1474 }
1295 1475
1476 my $pass = 0;
1296 my %done; 1477 my %done;
1297 while (%todo) { 1478 while (%todo) {
1298 my $progress; 1479 my $progress;
1299 1480
1481 ++$pass;
1482
1483 ext:
1300 while (my ($k, $v) = each %todo) { 1484 while (my ($k, $v) = each %todo) {
1301 for (split /,\s*/, $v->{meta}{depends}) { 1485 for (split /,\s*/, $v->{meta}{depends}) {
1302 goto skip 1486 next ext
1303 unless exists $done{$_}; 1487 unless exists $done{$_};
1304 } 1488 }
1305 1489
1306 warn "... loading '$k' into '$v->{pkg}'\n"; 1490 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1307 1491
1308 unless (eval $v->{source}) { 1492 my $active = eval $v->{source};
1493
1494 if (length $@) {
1309 my $msg = $@ ? "$v->{path}: $@\n" 1495 error "$v->{path}: $@\n";
1310 : "$v->{base}: extension inactive.\n";
1311 1496
1497 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1312 if (exists $v->{meta}{mandatory}) { 1498 if exists $v->{meta}{mandatory};
1313 warn $msg; 1499
1314 warn "mandatory extension failed to load, exiting.\n"; 1500 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1315 exit 1; 1501 delete $todo{$k};
1316 } 1502 } else {
1317 1503 $done{$k} = delete $todo{$k};
1318 warn $msg; 1504 push @EXTS, $v->{pkg};
1505 $progress = 1;
1506
1507 info "$v->{base}: extension inactive.\n"
1508 unless $active;
1319 } 1509 }
1320
1321 $done{$k} = delete $todo{$k};
1322 push @EXTS, $v->{pkg};
1323 $progress = 1;
1324 } 1510 }
1325 1511
1326 skip: 1512 unless ($progress) {
1327 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1513 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1328 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 }
1329 } 1520 }
1330 }; 1521 };
1331} 1522}
1332 1523
1333############################################################################# 1524#############################################################################
1334 1525
1335=back 1526=back
1336 1527
1337=head2 CORE EXTENSIONS 1528=head2 CORE EXTENSIONS
1338 1529
1339Functions and methods that extend core crossfire objects. 1530Functions and methods that extend core deliantra objects.
1340 1531
1341=cut 1532=cut
1342 1533
1343package cf::player; 1534package cf::player;
1344 1535
1387 1578
1388sub exists($) { 1579sub exists($) {
1389 my ($login) = @_; 1580 my ($login) = @_;
1390 1581
1391 $cf::PLAYER{$login} 1582 $cf::PLAYER{$login}
1392 or cf::sync_job { !aio_stat path $login } 1583 or !aio_stat path $login
1393} 1584}
1394 1585
1395sub find($) { 1586sub find($) {
1396 return $cf::PLAYER{$_[0]} || do { 1587 return $cf::PLAYER{$_[0]} || do {
1397 my $login = $_[0]; 1588 my $login = $_[0];
1409 my $f = new_from_file cf::object::thawer path $login 1600 my $f = new_from_file cf::object::thawer path $login
1410 or return; 1601 or return;
1411 1602
1412 my $pl = cf::player::load_pl $f 1603 my $pl = cf::player::load_pl $f
1413 or return; 1604 or return;
1605
1414 local $cf::PLAYER_LOADING{$login} = $pl; 1606 local $cf::PLAYER_LOADING{$login} = $pl;
1415 $f->resolve_delayed_derefs; 1607 $f->resolve_delayed_derefs;
1416 $cf::PLAYER{$login} = $pl 1608 $cf::PLAYER{$login} = $pl
1417 } 1609 }
1418 } 1610 }
1419} 1611}
1420 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
1421sub save($) { 1626sub save($) {
1422 my ($pl) = @_; 1627 my ($pl) = @_;
1423 1628
1424 return if $pl->{deny_save}; 1629 return if $pl->{deny_save};
1425 1630
1428 1633
1429 return if $pl->{deny_save}; 1634 return if $pl->{deny_save};
1430 1635
1431 aio_mkdir playerdir $pl, 0770; 1636 aio_mkdir playerdir $pl, 0770;
1432 $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];
1433 1643
1434 $pl->save_pl ($path); 1644 $pl->save_pl ($path);
1435 cf::cede_to_tick; 1645 cf::cede_to_tick;
1436} 1646}
1437 1647
1469 my ($pl) = @_; 1679 my ($pl) = @_;
1470 1680
1471 my $name = $pl->ob->name; 1681 my $name = $pl->ob->name;
1472 1682
1473 $pl->{deny_save} = 1; 1683 $pl->{deny_save} = 1;
1474 $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
1475 1685
1476 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1686 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1477 $pl->deactivate; 1687 $pl->deactivate;
1688
1689 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1478 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1690 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1691 ext::highscore::check ($pl->ob);
1692
1479 $pl->ns->destroy if $pl->ns; 1693 $pl->ns->destroy if $pl->ns;
1480 1694
1481 my $path = playerdir $pl; 1695 my $path = playerdir $pl;
1482 my $temp = "$path~$cf::RUNTIME~deleting~"; 1696 my $temp = "$path~$cf::RUNTIME~deleting~";
1483 aio_rename $path, $temp; 1697 aio_rename $path, $temp;
1521 1735
1522 for my $login (@$dirs) { 1736 for my $login (@$dirs) {
1523 my $path = path $login; 1737 my $path = path $login;
1524 1738
1525 # a .pst is a dead give-away for a valid player 1739 # a .pst is a dead give-away for a valid player
1526 unless (-e "$path.pst") { 1740 # if no pst file found, open and chekc for blocked users
1741 if (aio_stat "$path.pst") {
1527 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1742 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1528 aio_read $fh, 0, 512, my $buf, 0 or next; 1743 aio_read $fh, 0, 512, my $buf, 0 or next;
1529 $buf !~ /^password -------------$/m or next; # official not-valid tag 1744 $buf !~ /^password -------------$/m or next; # official not-valid tag
1530 } 1745 }
1531 1746
1535 1750
1536 \@logins 1751 \@logins
1537} 1752}
1538 1753
1539=item $player->maps 1754=item $player->maps
1755
1756=item cf::player::maps $login
1540 1757
1541Returns an arrayref of map paths that are private for this 1758Returns an arrayref of map paths that are private for this
1542player. May block. 1759player. May block.
1543 1760
1544=cut 1761=cut
1562 } 1779 }
1563 1780
1564 \@paths 1781 \@paths
1565} 1782}
1566 1783
1567=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1784=item $protocol_xml = $player->expand_cfpod ($cfpod)
1568 1785
1569Expand crossfire pod fragments into protocol xml. 1786Expand deliantra pod fragments into protocol xml.
1570
1571=cut
1572
1573use re 'eval';
1574
1575my $group;
1576my $interior; $interior = qr{
1577 # match a pod interior sequence sans C<< >>
1578 (?:
1579 \ (.*?)\ (?{ $group = $^N })
1580 | < (??{$interior}) >
1581 )
1582}x;
1583
1584sub expand_cfpod {
1585 my ($self, $pod) = @_;
1586
1587 my $xml;
1588
1589 while () {
1590 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1591 $group = $1;
1592
1593 $group =~ s/&/&amp;/g;
1594 $group =~ s/</&lt;/g;
1595
1596 $xml .= $group;
1597 } elsif ($pod =~ m%\G
1598 ([BCGHITU])
1599 <
1600 (?:
1601 ([^<>]*) (?{ $group = $^N })
1602 | < $interior >
1603 )
1604 >
1605 %gcsx
1606 ) {
1607 my ($code, $data) = ($1, $group);
1608
1609 if ($code eq "B") {
1610 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1611 } elsif ($code eq "I") {
1612 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1613 } elsif ($code eq "U") {
1614 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1615 } elsif ($code eq "C") {
1616 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1617 } elsif ($code eq "T") {
1618 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1619 } elsif ($code eq "G") {
1620 my ($male, $female) = split /\|/, $data;
1621 $data = $self->gender ? $female : $male;
1622 $xml .= expand_cfpod ($self, $data);
1623 } elsif ($code eq "H") {
1624 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1625 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1626 "")
1627 [$self->{hintmode}];
1628 } else {
1629 $xml .= "error processing '$code($data)' directive";
1630 }
1631 } else {
1632 if ($pod =~ /\G(.+)/) {
1633 warn "parse error while expanding $pod (at $1)";
1634 }
1635 last;
1636 }
1637 }
1638
1639 for ($xml) {
1640 # create single paragraphs (very hackish)
1641 s/(?<=\S)\n(?=\w)/ /g;
1642
1643 # compress some whitespace
1644 s/\s+\n/\n/g; # ws line-ends
1645 s/\n\n+/\n/g; # double lines
1646 s/^\n+//; # beginning lines
1647 s/\n+$//; # ending lines
1648 }
1649
1650 $xml
1651}
1652
1653no re 'eval';
1654
1655sub hintmode {
1656 $_[0]{hintmode} = $_[1] if @_ > 1;
1657 $_[0]{hintmode}
1658}
1659 1787
1660=item $player->ext_reply ($msgid, @msg) 1788=item $player->ext_reply ($msgid, @msg)
1661 1789
1662Sends an ext reply to the player. 1790Sends an ext reply to the player.
1663 1791
1695 1823
1696=cut 1824=cut
1697 1825
1698sub find_by_path($) { 1826sub find_by_path($) {
1699 my ($path) = @_; 1827 my ($path) = @_;
1828
1829 $path =~ s/^~[^\/]*//; # skip ~login
1700 1830
1701 my ($match, $specificity); 1831 my ($match, $specificity);
1702 1832
1703 for my $region (list) { 1833 for my $region (list) {
1704 if ($region->{match} && $path =~ $region->{match}) { 1834 if ($region->{match} && $path =~ $region->{match}) {
1730our $MAX_RESET = 3600; 1860our $MAX_RESET = 3600;
1731our $DEFAULT_RESET = 3000; 1861our $DEFAULT_RESET = 3000;
1732 1862
1733sub generate_random_map { 1863sub generate_random_map {
1734 my ($self, $rmp) = @_; 1864 my ($self, $rmp) = @_;
1735 # mit "rum" bekleckern, nicht 1865
1866 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1867
1736 $self->_create_random_map ( 1868 $self->_create_random_map ($rmp);
1737 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1738 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1739 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1740 $rmp->{exit_on_final_map},
1741 $rmp->{xsize}, $rmp->{ysize},
1742 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1743 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1744 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1745 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1746 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1747 (cf::region::find $rmp->{region}), $rmp->{custom}
1748 )
1749} 1869}
1750 1870
1751=item cf::map->register ($regex, $prio) 1871=item cf::map->register ($regex, $prio)
1752 1872
1753Register 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
1758 1878
1759sub register { 1879sub register {
1760 my (undef, $regex, $prio) = @_; 1880 my (undef, $regex, $prio) = @_;
1761 my $pkg = caller; 1881 my $pkg = caller;
1762 1882
1763 no strict;
1764 push @{"$pkg\::ISA"}, __PACKAGE__; 1883 push @{"$pkg\::ISA"}, __PACKAGE__;
1765 1884
1766 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1885 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1767} 1886}
1768 1887
1769# also paths starting with '/' 1888# also paths starting with '/'
1770$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1889$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1771 1890
1772sub thawer_merge { 1891sub thawer_merge {
1773 my ($self, $merge) = @_; 1892 my ($self, $merge) = @_;
1774 1893
1775 # we have to keep some variables in memory intact 1894 # we have to keep some variables in memory intact
1780} 1899}
1781 1900
1782sub normalise { 1901sub normalise {
1783 my ($path, $base) = @_; 1902 my ($path, $base) = @_;
1784 1903
1785 $path = "$path"; # make sure its a string 1904 $path = "$path"; # make sure it's a string
1786 1905
1787 $path =~ s/\.map$//; 1906 $path =~ s/\.map$//;
1788 1907
1789 # map plan: 1908 # map plan:
1790 # 1909 #
1805 $base =~ s{[^/]+/?$}{}; 1924 $base =~ s{[^/]+/?$}{};
1806 $path = "$base/$path"; 1925 $path = "$base/$path";
1807 } 1926 }
1808 1927
1809 for ($path) { 1928 for ($path) {
1810 redo if s{//}{/};
1811 redo if s{/\.?/}{/}; 1929 redo if s{/\.?/}{/};
1812 redo if s{/[^/]+/\.\./}{/}; 1930 redo if s{/[^/]+/\.\./}{/};
1813 } 1931 }
1814 1932
1815 $path 1933 $path
1829 $self->init; # pass $1 etc. 1947 $self->init; # pass $1 etc.
1830 return $self; 1948 return $self;
1831 } 1949 }
1832 } 1950 }
1833 1951
1834 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1952 Carp::cluck "unable to resolve path '$path' (base '$base')";
1835 () 1953 ()
1836} 1954}
1837 1955
1838sub init { 1956sub init {
1839 my ($self) = @_; 1957 my ($self) = @_;
1861 1979
1862# the temporary/swap location 1980# the temporary/swap location
1863sub save_path { 1981sub save_path {
1864 my ($self) = @_; 1982 my ($self) = @_;
1865 1983
1866 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1984 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1867 "$TMPDIR/$path.map" 1985 "$TMPDIR/$path.map"
1868} 1986}
1869 1987
1870# the unique path, undef == no special unique path 1988# the unique path, undef == no special unique path
1871sub uniq_path { 1989sub uniq_path {
1872 my ($self) = @_; 1990 my ($self) = @_;
1873 1991
1874 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1992 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1875 "$UNIQUEDIR/$path" 1993 "$UNIQUEDIR/$path"
1876}
1877
1878# and all this just because we cannot iterate over
1879# all maps in C++...
1880sub change_all_map_light {
1881 my ($change) = @_;
1882
1883 $_->change_map_light ($change)
1884 for grep $_->outdoor, values %cf::MAP;
1885} 1994}
1886 1995
1887sub decay_objects { 1996sub decay_objects {
1888 my ($self) = @_; 1997 my ($self) = @_;
1889 1998
1971 2080
1972sub find; 2081sub find;
1973sub find { 2082sub find {
1974 my ($path, $origin) = @_; 2083 my ($path, $origin) = @_;
1975 2084
2085 cf::cede_to_tick;
2086
1976 $path = normalise $path, $origin && $origin->path; 2087 $path = normalise $path, $origin && $origin->path;
1977 2088
1978 cf::lock_wait "map_data:$path";#d#remove 2089 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1979 cf::lock_wait "map_find:$path"; 2090 my $guard2 = cf::lock_acquire "map_find:$path";
1980 2091
1981 $cf::MAP{$path} || do { 2092 $cf::MAP{$path} || do {
1982 my $guard1 = cf::lock_acquire "map_find:$path";
1983 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1984
1985 my $map = new_from_path cf::map $path 2093 my $map = new_from_path cf::map $path
1986 or return; 2094 or return;
1987 2095
1988 $map->{last_save} = $cf::RUNTIME; 2096 $map->{last_save} = $cf::RUNTIME;
1989 2097
1991 or return; 2099 or return;
1992 2100
1993 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2101 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1994 # doing this can freeze the server in a sync job, obviously 2102 # doing this can freeze the server in a sync job, obviously
1995 #$cf::WAIT_FOR_TICK->wait; 2103 #$cf::WAIT_FOR_TICK->wait;
2104 undef $guard2;
1996 undef $guard1; 2105 undef $guard1;
1997 undef $guard2;
1998 $map->reset; 2106 $map->reset;
1999 return find $path; 2107 return find $path;
2000 } 2108 }
2001 2109
2002 $cf::MAP{$path} = $map 2110 $cf::MAP{$path} = $map
2003 } 2111 }
2004} 2112}
2005 2113
2006sub pre_load { } 2114sub pre_load { }
2007sub post_load { } 2115#sub post_load { } # XS
2008 2116
2009sub load { 2117sub load {
2010 my ($self) = @_; 2118 my ($self) = @_;
2011 2119
2012 local $self->{deny_reset} = 1; # loading can take a long time 2120 local $self->{deny_reset} = 1; # loading can take a long time
2029 my $f = new_from_file cf::object::thawer $self->{load_path}; 2137 my $f = new_from_file cf::object::thawer $self->{load_path};
2030 $f->skip_block; 2138 $f->skip_block;
2031 $self->_load_objects ($f) 2139 $self->_load_objects ($f)
2032 or return; 2140 or return;
2033 2141
2034 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2142 $self->post_load_original
2035 if delete $self->{load_original}; 2143 if delete $self->{load_original};
2036 2144
2037 if (my $uniq = $self->uniq_path) { 2145 if (my $uniq = $self->uniq_path) {
2038 utf8::encode $uniq; 2146 utf8::encode $uniq;
2039 unless (aio_stat $uniq) { 2147 unless (aio_stat $uniq) {
2057 unless ($self->{deny_activate}) { 2165 unless ($self->{deny_activate}) {
2058 $self->decay_objects; 2166 $self->decay_objects;
2059 $self->fix_auto_apply; 2167 $self->fix_auto_apply;
2060 $self->update_buttons; 2168 $self->update_buttons;
2061 cf::cede_to_tick; 2169 cf::cede_to_tick;
2062 $self->set_darkness_map;
2063 cf::cede_to_tick;
2064 $self->activate; 2170 $self->activate;
2065 } 2171 }
2066 2172
2067 $self->{last_save} = $cf::RUNTIME; 2173 $self->{last_save} = $cf::RUNTIME;
2068 $self->last_access ($cf::RUNTIME); 2174 $self->last_access ($cf::RUNTIME);
2069 2175
2070 $self->in_memory (cf::MAP_IN_MEMORY); 2176 $self->in_memory (cf::MAP_ACTIVE);
2071 } 2177 }
2072 2178
2073 $self->post_load; 2179 $self->post_load;
2074}
2075 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
2076sub customise_for { 2187sub customise_for {
2077 my ($self, $ob) = @_; 2188 my ($self, $ob) = @_;
2078 2189
2079 return find "~" . $ob->name . "/" . $self->{path} 2190 return find "~" . $ob->name . "/" . $self->{path}
2080 if $self->per_player; 2191 if $self->per_player;
2096 or next; 2207 or next;
2097 $neigh = find $neigh, $map 2208 $neigh = find $neigh, $map
2098 or next; 2209 or next;
2099 $neigh->load; 2210 $neigh->load;
2100 2211
2212 # now find the diagonal neighbours
2101 push @neigh, 2213 push @neigh,
2102 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2214 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2103 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2215 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2104 } 2216 }
2105 2217
2112} 2224}
2113 2225
2114sub find_sync { 2226sub find_sync {
2115 my ($path, $origin) = @_; 2227 my ($path, $origin) = @_;
2116 2228
2117 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
2118} 2233}
2119 2234
2120sub do_load_sync { 2235sub do_load_sync {
2121 my ($map) = @_; 2236 my ($map) = @_;
2122 2237
2123 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2238 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2124 if $Coro::current == $Coro::main; 2239 if $Coro::current == $Coro::main;
2125 2240
2126 cf::sync_job { $map->load }; 2241 $map->load;
2127} 2242}
2128 2243
2129our %MAP_PREFETCH; 2244our %MAP_PREFETCH;
2130our $MAP_PREFETCHER = undef; 2245our $MAP_PREFETCHER = undef;
2131 2246
2133 my ($path, $origin, $load) = @_; 2248 my ($path, $origin, $load) = @_;
2134 2249
2135 $path = normalise $path, $origin && $origin->{path}; 2250 $path = normalise $path, $origin && $origin->{path};
2136 2251
2137 if (my $map = $cf::MAP{$path}) { 2252 if (my $map = $cf::MAP{$path}) {
2138 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2253 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2139 } 2254 }
2140 2255
2141 $MAP_PREFETCH{$path} |= $load; 2256 $MAP_PREFETCH{$path} |= $load;
2142 2257
2143 $MAP_PREFETCHER ||= cf::async { 2258 $MAP_PREFETCHER ||= cf::async {
2157 $MAP_PREFETCHER->prio (6); 2272 $MAP_PREFETCHER->prio (6);
2158 2273
2159 () 2274 ()
2160} 2275}
2161 2276
2277# common code, used by both ->save and ->swapout
2162sub save { 2278sub _save {
2163 my ($self) = @_; 2279 my ($self) = @_;
2164
2165 my $lock = cf::lock_acquire "map_data:$self->{path}";
2166 2280
2167 $self->{last_save} = $cf::RUNTIME; 2281 $self->{last_save} = $cf::RUNTIME;
2168 2282
2169 return unless $self->dirty; 2283 return unless $self->dirty;
2170 2284
2179 2293
2180 cf::async { 2294 cf::async {
2181 $Coro::current->{desc} = "map player save"; 2295 $Coro::current->{desc} = "map player save";
2182 $_->contr->save for $self->players; 2296 $_->contr->save for $self->players;
2183 }; 2297 };
2298
2299 cf::get_slot 0.02;
2184 2300
2185 if ($uniq) { 2301 if ($uniq) {
2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2302 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2187 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2303 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2188 } else { 2304 } else {
2189 $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);
2190 } 2306 }
2191} 2307}
2192 2308
2309sub save {
2310 my ($self) = @_;
2311
2312 my $lock = cf::lock_acquire "map_data:$self->{path}";
2313
2314 $self->_save;
2315}
2316
2193sub swap_out { 2317sub swap_out {
2194 my ($self) = @_; 2318 my ($self) = @_;
2195 2319
2196 # save first because save cedes
2197 $self->save;
2198
2199 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2320 my $lock = cf::lock_acquire "map_data:$self->{path}";
2200 2321
2322 return if $self->in_memory != cf::MAP_ACTIVE;
2323 return if $self->{deny_save};
2201 return if $self->players; 2324 return if $self->players;
2202 return if $self->in_memory != cf::MAP_IN_MEMORY;
2203 return if $self->{deny_save};
2204 2325
2326 # first deactivate the map and "unlink" it from the core
2327 $self->deactivate;
2328 $_->clear_links_to ($self) for values %cf::MAP;
2205 $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};
2206 2376
2207 $self->deactivate; 2377 $self->deactivate;
2208 $_->clear_links_to ($self) for values %cf::MAP; 2378 $_->clear_links_to ($self) for values %cf::MAP;
2209 $self->clear; 2379 $self->clear;
2210}
2211
2212sub reset_at {
2213 my ($self) = @_;
2214
2215 # TODO: safety, remove and allow resettable per-player maps
2216 return 1e99 if $self->{deny_reset};
2217
2218 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2219 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2220
2221 $time + $to
2222}
2223
2224sub should_reset {
2225 my ($self) = @_;
2226
2227 $self->reset_at <= $cf::RUNTIME
2228}
2229
2230sub reset {
2231 my ($self) = @_;
2232
2233 my $lock = cf::lock_acquire "map_data:$self->{path}";
2234
2235 return if $self->players;
2236
2237 warn "resetting map ", $self->path;
2238
2239 $self->in_memory (cf::MAP_SWAPPED);
2240
2241 # need to save uniques path
2242 unless ($self->{deny_save}) {
2243 my $uniq = $self->uniq_path; utf8::encode $uniq;
2244
2245 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2246 if $uniq;
2247 }
2248
2249 delete $cf::MAP{$self->path};
2250
2251 $self->deactivate;
2252 $_->clear_links_to ($self) for values %cf::MAP;
2253 $self->clear;
2254 2380
2255 $self->unlink_save; 2381 $self->unlink_save;
2256 $self->destroy; 2382 $self->destroy;
2257} 2383}
2258 2384
2266 2392
2267 delete $cf::MAP{$self->path}; 2393 delete $cf::MAP{$self->path};
2268 2394
2269 $self->unlink_save; 2395 $self->unlink_save;
2270 2396
2271 bless $self, "cf::map"; 2397 bless $self, "cf::map::wrap";
2272 delete $self->{deny_reset}; 2398 delete $self->{deny_reset};
2273 $self->{deny_save} = 1; 2399 $self->{deny_save} = 1;
2274 $self->reset_timeout (1); 2400 $self->reset_timeout (1);
2275 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2401 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2276 2402
2325 2451
2326sub unique_maps() { 2452sub unique_maps() {
2327 [ 2453 [
2328 map { 2454 map {
2329 utf8::decode $_; 2455 utf8::decode $_;
2330 /\.map$/ 2456 s/\.map$//; # TODO future compatibility hack
2457 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2458 ? ()
2331 ? normalise $_ 2459 : normalise $_
2332 : ()
2333 } @{ aio_readdir $UNIQUEDIR or [] } 2460 } @{ aio_readdir $UNIQUEDIR or [] }
2334 ] 2461 ]
2335} 2462}
2336 2463
2337package 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}
2338 2495
2339=back 2496=back
2340 2497
2341=head3 cf::object 2498=head3 cf::object
2342 2499
2346 2503
2347=over 4 2504=over 4
2348 2505
2349=item $ob->inv_recursive 2506=item $ob->inv_recursive
2350 2507
2351Returns 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.
2352 2510
2353=cut 2511=cut
2354 2512
2355sub inv_recursive_; 2513sub inv_recursive_;
2356sub inv_recursive_ { 2514sub inv_recursive_ {
2361 inv_recursive_ inv $_[0] 2519 inv_recursive_ inv $_[0]
2362} 2520}
2363 2521
2364=item $ref = $ob->ref 2522=item $ref = $ob->ref
2365 2523
2366creates 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.
2367 2525
2368=item $ob = cf::object::deref ($refstring) 2526=item $ob = cf::object::deref ($refstring)
2369 2527
2370returns 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,
2371even if the object actually exists. May block. 2529even if the object actually exists. May block.
2403can 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
2404dialogue with the given NPC character. 2562dialogue with the given NPC character.
2405 2563
2406=cut 2564=cut
2407 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
2408# rough implementation of a future "reply" method that works 2580# rough implementation of a future "reply" method that works
2409# with dialog boxes. 2581# with dialog boxes.
2410#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
2411sub cf::object::player::reply($$$;$) { 2583sub cf::object::player::reply($$$;$) {
2412 my ($self, $npc, $msg, $flags) = @_; 2584 my ($self, $npc, $msg, $flags) = @_;
2423 my $dialog = $pl->{npc_dialog}; 2595 my $dialog = $pl->{npc_dialog};
2424 $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));
2425 2597
2426 } else { 2598 } else {
2427 $msg = $npc->name . " says: $msg" if $npc; 2599 $msg = $npc->name . " says: $msg" if $npc;
2428 $self->message ($msg, $flags); 2600 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2429 } 2601 }
2430 } 2602 }
2431} 2603}
2432 2604
2433=item $object->send_msg ($channel, $msg, $color, [extra...]) 2605=item $object->send_msg ($channel, $msg, $color, [extra...])
2458 2630
2459=item $player_object->enter_link 2631=item $player_object->enter_link
2460 2632
2461Freezes 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}>).
2462 2634
2463The 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.
2464I<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.
2465 2639
2466Will never block. 2640Will never block.
2467 2641
2468=item $player_object->leave_link ($map, $x, $y) 2642=item $player_object->leave_link ($map, $x, $y)
2469 2643
2489sub cf::object::player::enter_link { 2663sub cf::object::player::enter_link {
2490 my ($self) = @_; 2664 my ($self) = @_;
2491 2665
2492 $self->deactivate_recursive; 2666 $self->deactivate_recursive;
2493 2667
2668 ++$self->{_link_recursion};
2669
2494 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2670 return if UNIVERSAL::isa $self->map, "ext::map_link";
2495 2671
2496 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2672 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2497 if $self->map && $self->map->{path} ne "{link}"; 2673 if $self->map && $self->map->{path} ne "{link}";
2498 2674
2499 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2675 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2500} 2676}
2501 2677
2502sub cf::object::player::leave_link { 2678sub cf::object::player::leave_link {
2503 my ($self, $map, $x, $y) = @_; 2679 my ($self, $map, $x, $y) = @_;
2504 2680
2521 ($x, $y) = (-1, -1) 2697 ($x, $y) = (-1, -1)
2522 unless (defined $x) && (defined $y); 2698 unless (defined $x) && (defined $y);
2523 2699
2524 # use -1 or undef as default coordinates, not 0, 0 2700 # use -1 or undef as default coordinates, not 0, 0
2525 ($x, $y) = ($map->enter_x, $map->enter_y) 2701 ($x, $y) = ($map->enter_x, $map->enter_y)
2526 if $x <=0 && $y <= 0; 2702 if $x <= 0 && $y <= 0;
2527 2703
2528 $map->load; 2704 $map->load;
2529 $map->load_neighbours; 2705 $map->load_neighbours;
2530 2706
2531 return unless $self->contr->active; 2707 return unless $self->contr->active;
2532 $self->activate_recursive;
2533 2708
2534 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2709 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2535 $self->enter_map ($map, $x, $y); 2710 if ($self->enter_map ($map, $x, $y)) {
2536} 2711 # entering was successful
2712 delete $self->{_link_recursion};
2713 # only activate afterwards, to support waiting in hooks
2714 $self->activate_recursive;
2715 }
2537 2716
2717}
2718
2538=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)]])
2539 2720
2540Moves 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
2541her, loading and preparing them map, calling the provided $check callback 2722her, loading and preparing them map, calling the provided $check callback
2542that 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
2543the 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
2544be called at the end of this process. 2725be called at the end of this process.
2545 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
2546=cut 2730=cut
2547 2731
2548our $GOTOGEN; 2732our $GOTOGEN;
2549 2733
2550sub cf::object::player::goto { 2734sub cf::object::player::goto {
2551 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 }
2552 2742
2553 # 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
2554 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2744 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2555 2745
2556 $self->enter_link; 2746 $self->enter_link;
2580 my $map = eval { 2770 my $map = eval {
2581 my $map = defined $path ? cf::map::find $path : undef; 2771 my $map = defined $path ? cf::map::find $path : undef;
2582 2772
2583 if ($map) { 2773 if ($map) {
2584 $map = $map->customise_for ($self); 2774 $map = $map->customise_for ($self);
2585 $map = $check->($map) if $check && $map; 2775 $map = $check->($map, $x, $y, $self) if $check && $map;
2586 } else { 2776 } else {
2587 $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);
2588 } 2778 }
2589 2779
2590 $map 2780 $map
2598 if ($gen == $self->{_goto_generation}) { 2788 if ($gen == $self->{_goto_generation}) {
2599 delete $self->{_goto_generation}; 2789 delete $self->{_goto_generation};
2600 $self->leave_link ($map, $x, $y); 2790 $self->leave_link ($map, $x, $y);
2601 } 2791 }
2602 2792
2603 $done->() if $done; 2793 $done->($self) if $done;
2604 })->prio (1); 2794 })->prio (1);
2605} 2795}
2606 2796
2607=item $player_object->enter_exit ($exit_object) 2797=item $player_object->enter_exit ($exit_object)
2608 2798
2628} 2818}
2629 2819
2630sub prepare_random_map { 2820sub prepare_random_map {
2631 my ($exit) = @_; 2821 my ($exit) = @_;
2632 2822
2633 my $guard = cf::lock_acquire "exit_prepare:$exit";
2634
2635 # all this does is basically replace the /! path by 2823 # all this does is basically replace the /! path by
2636 # a new random map path (?random/...) with a seed 2824 # a new random map path (?random/...) with a seed
2637 # that depends on the exit object 2825 # that depends on the exit object
2638 2826
2639 my $rmp = parse_random_map_params $exit->msg; 2827 my $rmp = parse_random_map_params $exit->msg;
2641 if ($exit->map) { 2829 if ($exit->map) {
2642 $rmp->{region} = $exit->region->name; 2830 $rmp->{region} = $exit->region->name;
2643 $rmp->{origin_map} = $exit->map->path; 2831 $rmp->{origin_map} = $exit->map->path;
2644 $rmp->{origin_x} = $exit->x; 2832 $rmp->{origin_x} = $exit->x;
2645 $rmp->{origin_y} = $exit->y; 2833 $rmp->{origin_y} = $exit->y;
2834
2835 $exit->map->touch;
2646 } 2836 }
2647 2837
2648 $rmp->{random_seed} ||= $exit->random_seed; 2838 $rmp->{random_seed} ||= $exit->random_seed;
2649 2839
2650 my $data = cf::encode_json $rmp; 2840 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2651 my $md5 = Digest::MD5::md5_hex $data; 2841 my $md5 = Digest::MD5::md5_hex $data;
2652 my $meta = "$RANDOMDIR/$md5.meta"; 2842 my $meta = "$RANDOMDIR/$md5.meta";
2653 2843
2654 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2844 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2655 aio_write $fh, 0, (length $data), $data, 0; 2845 aio_write $fh, 0, (length $data), $data, 0;
2656 undef $fh; 2846 undef $fh;
2657 aio_rename "$meta~", $meta; 2847 aio_rename "$meta~", $meta;
2658 2848
2849 my $slaying = "?random/$md5";
2850
2851 if ($exit->valid) {
2659 $exit->slaying ("?random/$md5"); 2852 $exit->slaying ("?random/$md5");
2660 $exit->msg (undef); 2853 $exit->msg (undef);
2854 }
2661 } 2855 }
2662} 2856}
2663 2857
2664sub cf::object::player::enter_exit { 2858sub cf::object::player::enter_exit {
2665 my ($self, $exit) = @_; 2859 my ($self, $exit) = @_;
2666 2860
2667 return unless $self->type == cf::PLAYER; 2861 return unless $self->type == cf::PLAYER;
2668 2862
2669 if ($exit->slaying eq "/!") {
2670 #TODO: this should de-fi-ni-te-ly not be a sync-job
2671 # the problem is that $exit might not survive long enough
2672 # so it needs to be done right now, right here
2673 cf::sync_job { prepare_random_map $exit };
2674 }
2675
2676 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2677 my $hp = $exit->stats->hp;
2678 my $sp = $exit->stats->sp;
2679
2680 $self->enter_link; 2863 $self->enter_link;
2681 2864
2682 # if exit is damned, update players death & WoR home-position
2683 $self->contr->savebed ($slaying, $hp, $sp)
2684 if $exit->flag (FLAG_DAMNED);
2685
2686 (async { 2865 (async {
2687 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2866 $Coro::current->{desc} = "enter_exit";
2688 2867
2689 $self->deactivate_recursive; # just to be sure
2690 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
2691 $self->goto ($slaying, $hp, $sp); 2883 $self->goto ($map, $x, $y);
2692 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
2693 1; 2889 1
2694 }) { 2890 }) {
2695 $self->message ("Something went wrong deep within the crossfire server. " 2891 $self->message ("Something went wrong deep within the deliantra server. "
2696 . "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. "
2697 . "Please report this to the dungeon master!", 2893 . "Please report this to the dungeon master!",
2698 cf::NDI_UNIQUE | cf::NDI_RED); 2894 cf::NDI_UNIQUE | cf::NDI_RED);
2699 2895
2700 warn "ERROR in enter_exit: $@"; 2896 error "ERROR in enter_exit: $@";
2701 $self->leave_link; 2897 $self->leave_link;
2702 } 2898 }
2703 })->prio (1); 2899 })->prio (1);
2704} 2900}
2705 2901
2717sub cf::client::send_drawinfo { 2913sub cf::client::send_drawinfo {
2718 my ($self, $text, $flags) = @_; 2914 my ($self, $text, $flags) = @_;
2719 2915
2720 utf8::encode $text; 2916 utf8::encode $text;
2721 $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);
2722} 2943}
2723 2944
2724=item $client->send_msg ($channel, $msg, $color, [extra...]) 2945=item $client->send_msg ($channel, $msg, $color, [extra...])
2725 2946
2726Send 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
2730 2951
2731=cut 2952=cut
2732 2953
2733# non-persistent channels (usually the info channel) 2954# non-persistent channels (usually the info channel)
2734our %CHANNEL = ( 2955our %CHANNEL = (
2956 "c/motd" => {
2957 id => "infobox",
2958 title => "MOTD",
2959 reply => undef,
2960 tooltip => "The message of the day",
2961 },
2735 "c/identify" => { 2962 "c/identify" => {
2736 id => "infobox", 2963 id => "infobox",
2737 title => "Identify", 2964 title => "Identify",
2738 reply => undef, 2965 reply => undef,
2739 tooltip => "Items recently identified", 2966 tooltip => "Items recently identified",
2741 "c/examine" => { 2968 "c/examine" => {
2742 id => "infobox", 2969 id => "infobox",
2743 title => "Examine", 2970 title => "Examine",
2744 reply => undef, 2971 reply => undef,
2745 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",
2746 }, 2979 },
2747 "c/book" => { 2980 "c/book" => {
2748 id => "infobox", 2981 id => "infobox",
2749 title => "Book", 2982 title => "Book",
2750 reply => undef, 2983 reply => undef,
2766 id => "infobox", 2999 id => "infobox",
2767 title => "Body Parts", 3000 title => "Body Parts",
2768 reply => undef, 3001 reply => undef,
2769 tooltip => "Shows which body parts you posess and are available", 3002 tooltip => "Shows which body parts you posess and are available",
2770 }, 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 },
2771 "c/uptime" => { 3040 "c/uptime" => {
2772 id => "infobox", 3041 id => "infobox",
2773 title => "Uptime", 3042 title => "Uptime",
2774 reply => undef, 3043 reply => undef,
2775 tooltip => "How long the server has been running since last restart", 3044 tooltip => "How long the server has been running since last restart",
2778 id => "infobox", 3047 id => "infobox",
2779 title => "Map Info", 3048 title => "Map Info",
2780 reply => undef, 3049 reply => undef,
2781 tooltip => "Information related to the maps", 3050 tooltip => "Information related to the maps",
2782 }, 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,
2783); 3066);
2784 3067
2785sub cf::client::send_msg { 3068sub cf::client::send_msg {
2786 my ($self, $channel, $msg, $color, @extra) = @_; 3069 my ($self, $channel, $msg, $color, @extra) = @_;
2787 3070
2788 $msg = $self->pl->expand_cfpod ($msg); 3071 $msg = $self->pl->expand_cfpod ($msg)
3072 unless $color & cf::NDI_VERBATIM;
2789 3073
2790 $color &= cf::NDI_CLIENT_MASK; # just in case... 3074 $color &= cf::NDI_CLIENT_MASK; # just in case...
2791 3075
2792 # check predefined channels, for the benefit of C 3076 # check predefined channels, for the benefit of C
2793 if ($CHANNEL{$channel}) { 3077 if ($CHANNEL{$channel}) {
2794 $channel = $CHANNEL{$channel}; 3078 $channel = $CHANNEL{$channel};
2795 3079
2796 $self->ext_msg (channel_info => $channel) 3080 $self->ext_msg (channel_info => $channel);
2797 if $self->can_msg;
2798
2799 $channel = $channel->{id}; 3081 $channel = $channel->{id};
2800 3082
2801 } elsif (ref $channel) { 3083 } elsif (ref $channel) {
2802 # send meta info to client, if not yet sent 3084 # send meta info to client, if not yet sent
2803 unless (exists $self->{channel}{$channel->{id}}) { 3085 unless (exists $self->{channel}{$channel->{id}}) {
2804 $self->{channel}{$channel->{id}} = $channel; 3086 $self->{channel}{$channel->{id}} = $channel;
2805 $self->ext_msg (channel_info => $channel) 3087 $self->ext_msg (channel_info => $channel);
2806 if $self->can_msg;
2807 } 3088 }
2808 3089
2809 $channel = $channel->{id}; 3090 $channel = $channel->{id};
2810 } 3091 }
2811 3092
2812 return unless @extra || length $msg; 3093 return unless @extra || length $msg;
2813 3094
2814 if ($self->can_msg) {
2815 # default colour, mask it out 3095 # default colour, mask it out
2816 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3096 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2817 if $color & cf::NDI_DEF; 3097 if $color & cf::NDI_DEF;
2818 3098
2819 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3099 my $pkt = "msg "
3100 . $self->{json_coder}->encode (
2820 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3101 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2821 } else { 3102 );
2822 if ($color >= 0) {
2823 # replace some tags by gcfclient-compatible ones
2824 for ($msg) {
2825 1 while
2826 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2827 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2828 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2829 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2830 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2831 }
2832 3103
2833 $color &= cf::NDI_COLOR_MASK; 3104 $self->send_big_packet ($pkt);
2834
2835 utf8::encode $msg;
2836
2837 if (0 && $msg =~ /\[/) {
2838 # COMMAND/INFO
2839 $self->send_packet ("drawextinfo $color 10 8 $msg")
2840 } else {
2841 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2842 $self->send_packet ("drawinfo $color $msg")
2843 }
2844 }
2845 }
2846} 3105}
2847 3106
2848=item $client->ext_msg ($type, @msg) 3107=item $client->ext_msg ($type, @msg)
2849 3108
2850Sends an ext event to the client. 3109Sends an ext event to the client.
2853 3112
2854sub cf::client::ext_msg($$@) { 3113sub cf::client::ext_msg($$@) {
2855 my ($self, $type, @msg) = @_; 3114 my ($self, $type, @msg) = @_;
2856 3115
2857 if ($self->extcmd == 2) { 3116 if ($self->extcmd == 2) {
2858 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3117 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2859 } elsif ($self->extcmd == 1) { # TODO: remove 3118 } elsif ($self->extcmd == 1) { # TODO: remove
2860 push @msg, msgtype => "event_$type"; 3119 push @msg, msgtype => "event_$type";
2861 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3120 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2862 } 3121 }
2863} 3122}
2864 3123
2865=item $client->ext_reply ($msgid, @msg) 3124=item $client->ext_reply ($msgid, @msg)
2866 3125
2870 3129
2871sub cf::client::ext_reply($$@) { 3130sub cf::client::ext_reply($$@) {
2872 my ($self, $id, @msg) = @_; 3131 my ($self, $id, @msg) = @_;
2873 3132
2874 if ($self->extcmd == 2) { 3133 if ($self->extcmd == 2) {
2875 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3134 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2876 } elsif ($self->extcmd == 1) { 3135 } elsif ($self->extcmd == 1) {
2877 #TODO: version 1, remove 3136 #TODO: version 1, remove
2878 unshift @msg, msgtype => "reply", msgid => $id; 3137 unshift @msg, msgtype => "reply", msgid => $id;
2879 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3138 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2880 } 3139 }
2881} 3140}
2882 3141
2883=item $success = $client->query ($flags, "text", \&cb) 3142=item $success = $client->query ($flags, "text", \&cb)
2884 3143
2955 3214
2956 $ns->ext_reply ($reply, @reply) 3215 $ns->ext_reply ($reply, @reply)
2957 if $reply; 3216 if $reply;
2958 3217
2959 } else { 3218 } else {
2960 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";
2961 } 3220 }
2962 3221
2963 cf::override; 3222 cf::override;
2964 }, 3223 },
2965); 3224);
2985 3244
2986 $coro 3245 $coro
2987} 3246}
2988 3247
2989cf::client->attach ( 3248cf::client->attach (
2990 on_destroy => sub { 3249 on_client_destroy => sub {
2991 my ($ns) = @_; 3250 my ($ns) = @_;
2992 3251
2993 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3252 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2994 }, 3253 },
2995); 3254);
3011our $safe_hole = new Safe::Hole; 3270our $safe_hole = new Safe::Hole;
3012 3271
3013$SIG{FPE} = 'IGNORE'; 3272$SIG{FPE} = 'IGNORE';
3014 3273
3015$safe->permit_only (Opcode::opset qw( 3274$safe->permit_only (Opcode::opset qw(
3016 :base_core :base_mem :base_orig :base_math 3275 :base_core :base_mem :base_orig :base_math :base_loop
3017 grepstart grepwhile mapstart mapwhile 3276 grepstart grepwhile mapstart mapwhile
3018 sort time 3277 sort time
3019)); 3278));
3020 3279
3021# here we export the classes and methods available to script code 3280# here we export the classes and methods available to script code
3024 3283
3025The following functions and methods are available within a safe environment: 3284The following functions and methods are available within a safe environment:
3026 3285
3027 cf::object 3286 cf::object
3028 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
3029 insert remove name archname title slaying race decrease_ob_nr 3288 insert remove name archname title slaying race decrease split
3289 value
3030 3290
3031 cf::object::player 3291 cf::object::player
3032 player 3292 player
3033 3293
3034 cf::player 3294 cf::player
3039 3299
3040=cut 3300=cut
3041 3301
3042for ( 3302for (
3043 ["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
3044 insert remove inv name archname title slaying race 3304 insert remove inv nrof name archname title slaying race
3045 decrease_ob_nr destroy)], 3305 decrease split destroy change_exp value msg lore send_msg)],
3046 ["cf::object::player" => qw(player)], 3306 ["cf::object::player" => qw(player)],
3047 ["cf::player" => qw(peaceful)], 3307 ["cf::player" => qw(peaceful send_msg)],
3048 ["cf::map" => qw(trigger)], 3308 ["cf::map" => qw(trigger)],
3049) { 3309) {
3050 no strict 'refs';
3051 my ($pkg, @funs) = @$_; 3310 my ($pkg, @funs) = @$_;
3052 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3311 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3053 for @funs; 3312 for @funs;
3054} 3313}
3055 3314
3070 3329
3071 my $qcode = $code; 3330 my $qcode = $code;
3072 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3331 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3073 $qcode =~ s/\n/\\n/g; 3332 $qcode =~ s/\n/\\n/g;
3074 3333
3334 %vars = (_dummy => 0) unless %vars;
3335
3336 my @res;
3075 local $_; 3337 local $_;
3076 local @safe::cf::_safe_eval_args = values %vars;
3077 3338
3078 my $eval = 3339 my $eval =
3079 "do {\n" 3340 "do {\n"
3080 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3341 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3081 . "#line 0 \"{$qcode}\"\n" 3342 . "#line 0 \"{$qcode}\"\n"
3082 . $code 3343 . $code
3083 . "\n}" 3344 . "\n}"
3084 ; 3345 ;
3085 3346
3347 if ($CFG{safe_eval}) {
3086 sub_generation_inc; 3348 sub_generation_inc;
3349 local @safe::cf::_safe_eval_args = values %vars;
3087 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3350 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3088 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 }
3089 3356
3090 if ($@) { 3357 if ($@) {
3091 warn "$@"; 3358 warn "$@",
3092 warn "while executing safe code '$code'\n"; 3359 "while executing safe code '$code'\n",
3093 warn "with arguments " . (join " ", %vars) . "\n"; 3360 "with arguments " . (join " ", %vars) . "\n";
3094 } 3361 }
3095 3362
3096 wantarray ? @res : $res[0] 3363 wantarray ? @res : $res[0]
3097} 3364}
3098 3365
3112=cut 3379=cut
3113 3380
3114sub register_script_function { 3381sub register_script_function {
3115 my ($fun, $cb) = @_; 3382 my ($fun, $cb) = @_;
3116 3383
3117 no strict 'refs'; 3384 $fun = "safe::$fun" if $CFG{safe_eval};
3118 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3385 *$fun = $safe_hole->wrap ($cb);
3119} 3386}
3120 3387
3121=back 3388=back
3122 3389
3123=cut 3390=cut
3132 # for this (global event?) 3399 # for this (global event?)
3133 %ext::player_env::MUSIC_FACE_CACHE = (); 3400 %ext::player_env::MUSIC_FACE_CACHE = ();
3134 3401
3135 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3402 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3136 3403
3137 warn "loading facedata from $path\n"; 3404 trace "loading facedata from $path\n";
3138 3405
3139 my $facedata;
3140 0 < aio_load $path, $facedata 3406 0 < aio_load $path, my $facedata
3141 or die "$path: $!"; 3407 or die "$path: $!";
3142 3408
3143 $facedata = Coro::Storable::thaw $facedata; 3409 $facedata = Coro::Storable::thaw $facedata;
3144 3410
3145 $facedata->{version} == 2 3411 $facedata->{version} == 2
3146 or cf::cleanup "$path: version mismatch, cannot proceed."; 3412 or cf::cleanup "$path: version mismatch, cannot proceed.";
3147 3413
3148 # 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]);
3149 $facedata->{resource}{"res/exp_table"} = { 3416 $facedata->{resource}{"res/exp_table"} = {
3150 type => FT_RSRC, 3417 type => FT_RSRC,
3151 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),
3152 }; 3420 };
3153 cf::cede_to_tick; 3421 cf::cede_to_tick;
3154 3422
3155 { 3423 {
3156 my $faces = $facedata->{faceinfo}; 3424 my $faces = $facedata->{faceinfo};
3158 while (my ($face, $info) = each %$faces) { 3426 while (my ($face, $info) = each %$faces) {
3159 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3427 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3160 3428
3161 cf::face::set_visibility $idx, $info->{visibility}; 3429 cf::face::set_visibility $idx, $info->{visibility};
3162 cf::face::set_magicmap $idx, $info->{magicmap}; 3430 cf::face::set_magicmap $idx, $info->{magicmap};
3163 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3431 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3164 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} ;
3165 3434
3166 cf::cede_to_tick; 3435 cf::cede_to_tick;
3167 } 3436 }
3168 3437
3169 while (my ($face, $info) = each %$faces) { 3438 while (my ($face, $info) = each %$faces) {
3174 3443
3175 if (my $smooth = cf::face::find $info->{smooth}) { 3444 if (my $smooth = cf::face::find $info->{smooth}) {
3176 cf::face::set_smooth $idx, $smooth; 3445 cf::face::set_smooth $idx, $smooth;
3177 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3446 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3178 } else { 3447 } else {
3179 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3448 error "smooth face '$info->{smooth}' not found for face '$face'";
3180 } 3449 }
3181 3450
3182 cf::cede_to_tick; 3451 cf::cede_to_tick;
3183 } 3452 }
3184 } 3453 }
3193 3462
3194 cf::anim::invalidate_all; # d'oh 3463 cf::anim::invalidate_all; # d'oh
3195 } 3464 }
3196 3465
3197 { 3466 {
3198 # TODO: for gcfclient pleasure, we should give resources
3199 # that gcfclient doesn't grok a >10000 face index.
3200 my $res = $facedata->{resource}; 3467 my $res = $facedata->{resource};
3201 3468
3202 while (my ($name, $info) = each %$res) { 3469 while (my ($name, $info) = each %$res) {
3203 if (defined $info->{type}) { 3470 if (defined $info->{type}) {
3204 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3471 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3205 my $data;
3206 3472
3207 if ($info->{type} & 1) { 3473 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3208 # prepend meta info
3209
3210 my $meta = $enc->encode ({
3211 name => $name,
3212 %{ $info->{meta} || {} },
3213 });
3214
3215 $data = pack "(w/a*)*", $meta, $info->{data};
3216 } else {
3217 $data = $info->{data};
3218 }
3219
3220 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3221 cf::face::set_type $idx, $info->{type}; 3474 cf::face::set_type $idx, $info->{type};
3222 } else { 3475 } else {
3223 $RESOURCE{$name} = $info; 3476 $RESOURCE{$name} = $info; # unused
3224 } 3477 }
3225 3478
3226 cf::cede_to_tick; 3479 cf::cede_to_tick;
3227 } 3480 }
3228 } 3481 }
3229 3482
3230 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3483 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3231 3484
3232 1 3485 1
3233} 3486}
3234
3235cf::global->attach (on_resource_update => sub {
3236 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3237 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3238
3239 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3240 my $sound = $soundconf->{compat}[$_]
3241 or next;
3242
3243 my $face = cf::face::find "sound/$sound->[1]";
3244 cf::sound::set $sound->[0] => $face;
3245 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3246 }
3247
3248 while (my ($k, $v) = each %{$soundconf->{event}}) {
3249 my $face = cf::face::find "sound/$v";
3250 cf::sound::set $k => $face;
3251 }
3252 }
3253});
3254 3487
3255register_exticmd fx_want => sub { 3488register_exticmd fx_want => sub {
3256 my ($ns, $want) = @_; 3489 my ($ns, $want) = @_;
3257 3490
3258 while (my ($k, $v) = each %$want) { 3491 while (my ($k, $v) = each %$want) {
3259 $ns->fx_want ($k, $v); 3492 $ns->fx_want ($k, $v);
3260 } 3493 }
3261}; 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}
3262 3505
3263sub reload_regions { 3506sub reload_regions {
3264 # 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
3265 # for this (global event?) 3508 # for this (global event?)
3266 %ext::player_env::MUSIC_FACE_CACHE = (); 3509 %ext::player_env::MUSIC_FACE_CACHE = ();
3280} 3523}
3281 3524
3282sub reload_archetypes { 3525sub reload_archetypes {
3283 load_resource_file "$DATADIR/archetypes" 3526 load_resource_file "$DATADIR/archetypes"
3284 or die "unable to load archetypes\n"; 3527 or die "unable to load archetypes\n";
3285 #d# NEED to laod twice to resolve forward references
3286 # this really needs to be done in an extra post-pass
3287 # (which needs to be synchronous, so solve it differently)
3288 load_resource_file "$DATADIR/archetypes"
3289 or die "unable to load archetypes\n";
3290} 3528}
3291 3529
3292sub reload_treasures { 3530sub reload_treasures {
3293 load_resource_file "$DATADIR/treasures" 3531 load_resource_file "$DATADIR/treasures"
3294 or die "unable to load treasurelists\n"; 3532 or die "unable to load treasurelists\n";
3295} 3533}
3296 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
3297sub reload_resources { 3558sub reload_resources {
3298 warn "reloading resource files...\n"; 3559 trace "reloading resource files...\n";
3299 3560
3561 reload_exp_table;
3562 reload_materials;
3563 reload_facedata;
3564 reload_sound;
3565 reload_archetypes;
3300 reload_regions; 3566 reload_regions;
3301 reload_facedata;
3302 #reload_archetypes;#d#
3303 reload_archetypes;
3304 reload_treasures; 3567 reload_treasures;
3305 3568
3306 warn "finished reloading resource files\n"; 3569 trace "finished reloading resource files\n";
3307}
3308
3309sub init {
3310 reload_resources;
3311} 3570}
3312 3571
3313sub reload_config { 3572sub reload_config {
3314 open my $fh, "<:utf8", "$CONFDIR/config" 3573 trace "reloading config file...\n";
3315 or return;
3316 3574
3317 local $/; 3575 0 < aio_load "$CONFDIR/config", my $config
3318 *CFG = YAML::Syck::Load <$fh>; 3576 or die "$CONFDIR/config: $!";
3319 3577
3578 utf8::decode $config;
3579 *CFG = yaml_load $config;
3580
3320 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3581 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3321 3582
3322 $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};
3323 $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};
3324 3585
3325 if (exists $CFG{mlockall}) { 3586 if (exists $CFG{mlockall}) {
3329 }; 3590 };
3330 warn $@ if $@; 3591 warn $@ if $@;
3331 } 3592 }
3332} 3593}
3333 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
3334sub 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
3335 # we must not ever block the main coroutine 3633 # we must not ever block the main coroutine
3336 local $Coro::idle = sub { 3634 local $Coro::idle = sub {
3337 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#
3338 (async { 3636 (async {
3339 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3637 $Coro::current->{desc} = "IDLE BUG HANDLER";
3340 EV::loop EV::LOOP_ONESHOT; 3638 EV::loop EV::LOOP_ONESHOT;
3341 })->prio (Coro::PRIO_MAX); 3639 })->prio (Coro::PRIO_MAX);
3342 }; 3640 };
3343 3641
3642 evthread_start IO::AIO::poll_fileno;
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;
3344 reload_config; 3654 reload_config;
3345 db_init; 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
3346 load_extensions; 3665 load_extensions;
3347 3666
3348 $TICK_WATCHER->start; 3667 utime time, time, $RUNTIMEFILE;
3349 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3668
3350 EV::loop; 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;
3351} 3685}
3352 3686
3353############################################################################# 3687#############################################################################
3354# initialisation and cleanup 3688# initialisation and cleanup
3355 3689
3356# install some emergency cleanup handlers 3690# install some emergency cleanup handlers
3357BEGIN { 3691BEGIN {
3358 our %SIGWATCHER = (); 3692 our %SIGWATCHER = ();
3359 for my $signal (qw(INT HUP TERM)) { 3693 for my $signal (qw(INT HUP TERM)) {
3360 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3694 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3361 cf::cleanup "SIG$signal"; 3695 cf::cleanup "SIG$signal";
3362 }; 3696 };
3363 } 3697 }
3364} 3698}
3365 3699
3366sub write_runtime { 3700sub write_runtime_sync {
3367 my $runtime = "$LOCALDIR/runtime"; 3701 my $t0 = AE::time;
3368 3702
3369 # first touch the runtime file to show we are still running: 3703 # first touch the runtime file to show we are still running:
3370 # the fsync below can take a very very long time. 3704 # the fsync below can take a very very long time.
3371 3705
3372 IO::AIO::aio_utime $runtime, undef, undef; 3706 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3373 3707
3374 my $guard = cf::lock_acquire "write_runtime"; 3708 my $guard = cf::lock_acquire "write_runtime";
3375 3709
3376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3710 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3377 or return; 3711 or return;
3378 3712
3379 my $value = $cf::RUNTIME + 90 + 10; 3713 my $value = $cf::RUNTIME + 90 + 10;
3380 # 10 is the runtime save interval, for a monotonic clock 3714 # 10 is the runtime save interval, for a monotonic clock
3381 # 60 allows for the watchdog to kill the server. 3715 # 60 allows for the watchdog to kill the server.
3391 aio_utime $fh, undef, undef; 3725 aio_utime $fh, undef, undef;
3392 3726
3393 close $fh 3727 close $fh
3394 or return; 3728 or return;
3395 3729
3396 aio_rename "$runtime~", $runtime 3730 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3397 and return; 3731 and return;
3398 3732
3399 warn "runtime file written.\n"; 3733 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3400 3734
3401 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 };
3402} 3786}
3403 3787
3404sub emergency_save() { 3788sub emergency_save() {
3405 my $freeze_guard = cf::freeze_mainloop; 3789 my $freeze_guard = cf::freeze_mainloop;
3406 3790
3407 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;
3408 3797
3409 cf::sync_job { 3798 cf::sync_job {
3799 cf::write_runtime_sync; # external watchdog should not bark
3800
3410 # use a peculiar iteration method to avoid tripping on perl 3801 # use a peculiar iteration method to avoid tripping on perl
3411 # refcount bugs in for. also avoids problems with players 3802 # refcount bugs in for. also avoids problems with players
3412 # and maps saved/destroyed asynchronously. 3803 # and maps saved/destroyed asynchronously.
3413 warn "begin emergency player save\n"; 3804 info "emergency_perl_save: begin player save\n";
3414 for my $login (keys %cf::PLAYER) { 3805 for my $login (keys %cf::PLAYER) {
3415 my $pl = $cf::PLAYER{$login} or next; 3806 my $pl = $cf::PLAYER{$login} or next;
3416 $pl->valid or next; 3807 $pl->valid or next;
3417 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3808 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3418 $pl->save; 3809 $pl->save;
3419 } 3810 }
3420 warn "end emergency player save\n"; 3811 info "emergency_perl_save: end player save\n";
3421 3812
3422 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";
3423 for my $path (keys %cf::MAP) { 3816 for my $path (keys %cf::MAP) {
3424 my $map = $cf::MAP{$path} or next; 3817 my $map = $cf::MAP{$path} or next;
3425 $map->valid or next; 3818 $map->valid or next;
3426 $map->save; 3819 $map->save;
3427 } 3820 }
3428 warn "end emergency map save\n"; 3821 info "emergency_perl_save: end map save\n";
3429 3822
3430 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";
3431 BDB::db_env_txn_checkpoint $DB_ENV; 3826 BDB::db_env_txn_checkpoint $DB_ENV;
3432 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
3433 }; 3851 };
3434 3852
3435 warn "leave emergency perl save\n"; 3853 info "emergency_perl_save: leave\n";
3436} 3854}
3437 3855
3438sub post_cleanup { 3856sub post_cleanup {
3439 my ($make_core) = @_; 3857 my ($make_core) = @_;
3440 3858
3859 IO::AIO::flush;
3860
3441 warn Carp::longmess "post_cleanup backtrace" 3861 error Carp::longmess "post_cleanup backtrace"
3442 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 }
3443} 3891}
3444 3892
3445sub do_reload_perl() { 3893sub do_reload_perl() {
3446 # can/must only be called in main 3894 # can/must only be called in main
3447 if ($Coro::current != $Coro::main) { 3895 unless (in_main) {
3448 warn "can only reload from main coroutine"; 3896 error "can only reload from main coroutine";
3449 return; 3897 return;
3450 } 3898 }
3451 3899
3452 warn "reloading..."; 3900 return if $RELOAD++;
3453 3901
3454 warn "entering sync_job"; 3902 my $t1 = AE::time;
3455 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
3456 cf::sync_job { 3910 cf::sync_job {
3457 cf::write_runtime; # external watchdog should not bark
3458 cf::emergency_save; 3911 #cf::emergency_save;
3459 cf::write_runtime; # external watchdog should not bark
3460 3912
3461 warn "syncing database to disk";
3462 BDB::db_env_txn_checkpoint $DB_ENV;
3463
3464 # if anything goes wrong in here, we should simply crash as we already saved
3465
3466 warn "flushing outstanding aio requests";
3467 for (;;) {
3468 BDB::flush;
3469 IO::AIO::flush;
3470 Coro::cede_notself;
3471 last unless IO::AIO::nreqs || BDB::nreqs;
3472 warn "iterate...";
3473 }
3474
3475 ++$RELOAD;
3476
3477 warn "cancelling all extension coros"; 3913 trace "perl_reload: cancelling all extension coros";
3478 $_->cancel for values %EXT_CORO; 3914 $_->cancel for values %EXT_CORO;
3479 %EXT_CORO = (); 3915 %EXT_CORO = ();
3480 3916
3481 warn "removing commands"; 3917 trace "perl_reload: removing commands";
3482 %COMMAND = (); 3918 %COMMAND = ();
3483 3919
3484 warn "removing ext/exti commands"; 3920 trace "perl_reload: removing ext/exti commands";
3485 %EXTCMD = (); 3921 %EXTCMD = ();
3486 %EXTICMD = (); 3922 %EXTICMD = ();
3487 3923
3488 warn "unloading/nuking all extensions"; 3924 trace "perl_reload: unloading/nuking all extensions";
3489 for my $pkg (@EXTS) { 3925 for my $pkg (@EXTS) {
3490 warn "... unloading $pkg"; 3926 trace "... unloading $pkg";
3491 3927
3492 if (my $cb = $pkg->can ("unload")) { 3928 if (my $cb = $pkg->can ("unload")) {
3493 eval { 3929 eval {
3494 $cb->($pkg); 3930 $cb->($pkg);
3495 1 3931 1
3496 } 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;
3497 } 3937 }
3498 3938
3499 warn "... nuking $pkg";
3500 Symbol::delete_package $pkg;
3501 }
3502
3503 warn "unloading all perl modules loaded from $LIBDIR"; 3939 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3504 while (my ($k, $v) = each %INC) { 3940 while (my ($k, $v) = each %INC) {
3505 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3941 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3506 3942
3507 warn "... unloading $k"; 3943 trace "... unloading $k";
3508 delete $INC{$k}; 3944 delete $INC{$k};
3509 3945
3510 $k =~ s/\.pm$//; 3946 $k =~ s/\.pm$//;
3511 $k =~ s/\//::/g; 3947 $k =~ s/\//::/g;
3512 3948
3513 if (my $cb = $k->can ("unload_module")) { 3949 if (my $cb = $k->can ("unload_module")) {
3514 $cb->(); 3950 $cb->();
3951 }
3952
3953 clear_package $k;
3515 } 3954 }
3516 3955
3517 Symbol::delete_package $k;
3518 }
3519
3520 warn "getting rid of safe::, as good as possible"; 3956 trace "perl_reload: getting rid of safe::, as good as possible";
3521 Symbol::delete_package "safe::$_" 3957 clear_package "safe::$_"
3522 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);
3523 3959
3524 warn "unloading cf.pm \"a bit\""; 3960 trace "perl_reload: unloading cf.pm \"a bit\"";
3525 delete $INC{"cf.pm"}; 3961 delete $INC{"cf.pm"};
3526 delete $INC{"cf/pod.pm"}; 3962 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3527 3963
3528 # don't, removes xs symbols, too, 3964 # don't, removes xs symbols, too,
3529 # and global variables created in xs 3965 # and global variables created in xs
3530 #Symbol::delete_package __PACKAGE__; 3966 #clear_package __PACKAGE__;
3531 3967
3532 warn "unload completed, starting to reload now"; 3968 info "perl_reload: unload completed, starting to reload now";
3533 3969
3534 warn "reloading cf.pm"; 3970 trace "perl_reload: reloading cf.pm";
3535 require cf; 3971 require cf;
3536 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3972 cf::_connect_to_perl_1;
3537 3973
3538 warn "loading config and database again"; 3974 trace "perl_reload: loading config and database again";
3539 cf::reload_config; 3975 cf::reload_config;
3540 3976
3541 warn "loading extensions"; 3977 trace "perl_reload: loading extensions";
3542 cf::load_extensions; 3978 cf::load_extensions;
3543 3979
3980 if ($REATTACH_ON_RELOAD) {
3544 warn "reattaching attachments to objects/players"; 3981 trace "perl_reload: reattaching attachments to objects/players";
3545 _global_reattach; # objects, sockets 3982 _global_reattach; # objects, sockets
3546 warn "reattaching attachments to maps"; 3983 trace "perl_reload: reattaching attachments to maps";
3547 reattach $_ for values %MAP; 3984 reattach $_ for values %MAP;
3548 warn "reattaching attachments to players"; 3985 trace "perl_reload: reattaching attachments to players";
3549 reattach $_ for values %PLAYER; 3986 reattach $_ for values %PLAYER;
3987 }
3550 3988
3551 warn "leaving sync_job"; 3989 cf::_post_init 1;
3552 3990
3991 trace "perl_reload: leaving sync_job";
3992
3553 1 3993 1
3554 } or do { 3994 } or do {
3555 warn $@; 3995 error $@;
3556 warn "error while reloading, exiting."; 3996 cf::cleanup "perl_reload: error, exiting.";
3557 exit 1; 3997 };
3998
3999 --$RELOAD;
3558 }; 4000 }
3559 4001
3560 warn "reloaded"; 4002 $t1 = AE::time - $t1;
4003 info "perl_reload: completed in ${t1}s\n";
3561}; 4004};
3562 4005
3563our $RELOAD_WATCHER; # used only during reload 4006our $RELOAD_WATCHER; # used only during reload
3564 4007
3565sub reload_perl() { 4008sub reload_perl() {
3566 # doing reload synchronously and two reloads happen back-to-back, 4009 # doing reload synchronously and two reloads happen back-to-back,
3567 # coro crashes during coro_state_free->destroy here. 4010 # coro crashes during coro_state_free->destroy here.
3568 4011
4012 $RELOAD_WATCHER ||= cf::async {
4013 Coro::AIO::aio_wait cache_extensions;
4014
3569 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4015 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
4016 do_reload_perl;
3570 undef $RELOAD_WATCHER; 4017 undef $RELOAD_WATCHER;
3571 do_reload_perl; 4018 };
3572 }; 4019 };
3573} 4020}
3574 4021
3575register_command "reload" => sub { 4022register_command "reload" => sub {
3576 my ($who, $arg) = @_; 4023 my ($who, $arg) = @_;
3582 reload_perl; 4029 reload_perl;
3583 }; 4030 };
3584 } 4031 }
3585}; 4032};
3586 4033
3587unshift @INC, $LIBDIR; 4034#############################################################################
3588 4035
3589my $bug_warning = 0; 4036my $bug_warning = 0;
3590 4037
3591our @WAIT_FOR_TICK; 4038our @WAIT_FOR_TICK;
3592our @WAIT_FOR_TICK_BEGIN; 4039our @WAIT_FOR_TICK_BEGIN;
3593 4040
3594sub wait_for_tick { 4041sub wait_for_tick() {
3595 return unless $TICK_WATCHER->is_active;
3596 return if $Coro::current == $Coro::main; 4042 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3597 4043
3598 my $signal = new Coro::Signal; 4044 my $signal = new Coro::Signal;
3599 push @WAIT_FOR_TICK, $signal; 4045 push @WAIT_FOR_TICK, $signal;
3600 $signal->wait; 4046 $signal->wait;
3601} 4047}
3602 4048
3603sub wait_for_tick_begin { 4049sub wait_for_tick_begin() {
3604 return unless $TICK_WATCHER->is_active;
3605 return if $Coro::current == $Coro::main; 4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3606 4051
3607 my $signal = new Coro::Signal; 4052 my $signal = new Coro::Signal;
3608 push @WAIT_FOR_TICK_BEGIN, $signal; 4053 push @WAIT_FOR_TICK_BEGIN, $signal;
3609 $signal->wait; 4054 $signal->wait;
3610} 4055}
3611 4056
3612$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 4057sub tick {
3613 if ($Coro::current != $Coro::main) { 4058 if ($Coro::current != $Coro::main) {
3614 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4059 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3615 unless ++$bug_warning > 10; 4060 unless ++$bug_warning > 10;
3616 return; 4061 return;
3617 } 4062 }
3618 4063
3619 $NOW = $tick_start = EV::now;
3620
3621 cf::server_tick; # one server iteration 4064 cf::server_tick; # one server iteration
3622 4065
3623 $RUNTIME += $TICK; 4066 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3624 $NEXT_TICK = $_[0]->at;
3625 4067
3626 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4068 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3627 $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.;
3628 Coro::async_pool { 4070 Coro::async_pool {
3629 $Coro::current->{desc} = "runtime saver"; 4071 $Coro::current->{desc} = "runtime saver";
3630 write_runtime 4072 write_runtime_sync
3631 or warn "ERROR: unable to write runtime file: $!"; 4073 or error "ERROR: unable to write runtime file: $!";
3632 }; 4074 };
3633 } 4075 }
3634 4076
3635 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4077 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3636 $sig->send; 4078 $sig->send;
3637 } 4079 }
3638 while (my $sig = shift @WAIT_FOR_TICK) { 4080 while (my $sig = shift @WAIT_FOR_TICK) {
3639 $sig->send; 4081 $sig->send;
3640 } 4082 }
3641 4083
3642 $LOAD = ($NOW - $tick_start) / $TICK; 4084 $LOAD = ($NOW - $TICK_START) / $TICK;
3643 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4085 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3644 4086
3645 _post_tick; 4087 if (0) {
3646}; 4088 if ($NEXT_TICK) {
3647$TICK_WATCHER->priority (EV::MAXPRI); 4089 my $jitter = $TICK_START - $NEXT_TICK;
4090 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4091 debug "jitter $JITTER\n";#d#
4092 }
4093 }
4094}
3648 4095
3649{ 4096{
3650 # configure BDB 4097 # configure BDB
3651 4098
3652 BDB::min_parallel 8; 4099 BDB::min_parallel 16;
3653 BDB::max_poll_reqs $TICK * 0.1; 4100 BDB::max_poll_reqs $TICK * 0.1;
3654 $Coro::BDB::WATCHER->priority (1); 4101 $AnyEvent::BDB::WATCHER->priority (1);
3655 4102
3656 unless ($DB_ENV) { 4103 unless ($DB_ENV) {
3657 $DB_ENV = BDB::db_env_create; 4104 $DB_ENV = BDB::db_env_create;
3658 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4105 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3659 | 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;
3660 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4108 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3661 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4109 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3662 4110
3663 cf::sync_job { 4111 cf::sync_job {
3664 eval { 4112 eval {
3690{ 4138{
3691 # configure IO::AIO 4139 # configure IO::AIO
3692 4140
3693 IO::AIO::min_parallel 8; 4141 IO::AIO::min_parallel 8;
3694 IO::AIO::max_poll_time $TICK * 0.1; 4142 IO::AIO::max_poll_time $TICK * 0.1;
3695 $Coro::AIO::WATCHER->priority (1); 4143 undef $AnyEvent::AIO::WATCHER;
3696} 4144}
3697 4145
3698my $_log_backtrace; 4146our $_log_backtrace;
4147our $_log_backtrace_last;
3699 4148
3700sub _log_backtrace { 4149sub _log_backtrace {
3701 my ($msg, @addr) = @_; 4150 my ($msg, @addr) = @_;
3702 4151
3703 $msg =~ s/\n//; 4152 $msg =~ s/\n$//;
3704 4153
4154 if ($_log_backtrace_last eq $msg) {
4155 LOG llevInfo, "[ABT] $msg\n";
4156 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3705 # limit the # of concurrent backtraces 4157 # limit the # of concurrent backtraces
3706 if ($_log_backtrace < 2) { 4158 } elsif ($_log_backtrace < 2) {
4159 $_log_backtrace_last = $msg;
3707 ++$_log_backtrace; 4160 ++$_log_backtrace;
4161 my $perl_bt = Carp::longmess $msg;
3708 async { 4162 async {
3709 $Coro::current->{desc} = "abt $msg"; 4163 $Coro::current->{desc} = "abt $msg";
3710 4164
3711 my @bt = fork_call { 4165 my @bt = fork_call {
3712 @addr = map { sprintf "%x", $_ } @addr; 4166 @addr = map { sprintf "%x", $_ } @addr;
3723 } 4177 }
3724 4178
3725 @funcs 4179 @funcs
3726 }; 4180 };
3727 4181
3728 LOG llevInfo, "[ABT] $msg\n"; 4182 LOG llevInfo, "[ABT] $perl_bt\n";
4183 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3729 LOG llevInfo, "[ABT] $_\n" for @bt; 4184 LOG llevInfo, "[ABT] $_\n" for @bt;
3730 --$_log_backtrace; 4185 --$_log_backtrace;
3731 }; 4186 };
3732 } else { 4187 } else {
3733 LOG llevInfo, "[ABT] $msg\n"; 4188 LOG llevInfo, "[ABT] $msg\n";
3734 LOG llevInfo, "[ABT] [suppressed]\n"; 4189 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3735 } 4190 }
3736} 4191}
3737 4192
3738# load additional modules 4193# load additional modules
3739use cf::pod; 4194require "cf/$_.pm" for @EXTRA_MODULES;
4195cf::_connect_to_perl_2;
3740 4196
3741END { cf::emergency_save } 4197END { cf::emergency_save }
3742 4198
37431 41991
3744 4200

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines