ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines