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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.414 by root, Thu Apr 10 09:10:45 2008 UTC vs.
Revision 1.550 by root, Fri May 14 22:56:47 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines