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.403 by root, Mon Dec 17 07:09:18 2007 UTC vs.
Revision 1.548 by root, Mon May 10 21:40:22 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines