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.415 by root, Thu Apr 10 15:35:16 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 )
552} 654}
553 655
554=item $coin = coin_from_name $name 656=item $coin = coin_from_name $name
555 657
556=cut 658=cut
… …
593within each server. 695within each server.
594 696
595=cut 697=cut
596 698
597sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
598 my ($name) = @_; 703 my ($name) = @_;
599 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
600 705
601 eval { 706 eval {
602 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
… …
612} 717}
613 718
614our $DB; 719our $DB;
615 720
616sub db_init { 721sub db_init {
617 cf::sync_job {
618 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
619 };
620} 723}
621 724
622sub db_get($$) { 725sub db_get($$) {
623 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
624 727
625 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
626 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
627 732
628 $! ? () 733 $! ? ()
629 : $data 734 : $data
630 }
631} 735}
632 736
633sub db_put($$$) { 737sub db_put($$$) {
634 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
635 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
691 795
692 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
693 my $data = $process->(\@data); 797 my $data = $process->(\@data);
694 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
695 799
696 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
697 801
698 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
699 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
700 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
701 805
… …
711 815
712=cut 816=cut
713 817
714sub datalog($@) { 818sub datalog($@) {
715 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
716 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
717} 821}
718 822
719=back 823=back
720 824
721=cut 825=cut
722 826
723############################################################################# 827#############################################################################
724 828
725=head2 ATTACHABLE OBJECTS 829=head2 ATTACHABLE OBJECTS
726 830
727Many 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
728attach callbacks/event handlers (a collection of which is called an "attachment") 832attach callbacks/event handlers (a collection of which is called an "attachment")
729to it. All such attachable objects support the following methods. 833to it. All such attachable objects support the following methods.
730 834
731In 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>
732C<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
… …
782=item cf::CLASS::attachment $name, ... 886=item cf::CLASS::attachment $name, ...
783 887
784Register an attachment by C<$name> through which attachable objects of the 888Register an attachment by C<$name> through which attachable objects of the
785given CLASS can refer to this attachment. 889given CLASS can refer to this attachment.
786 890
787Some classes such as crossfire maps and objects can specify attachments 891Some classes such as deliantra maps and objects can specify attachments
788that 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.
789 893
790These calls expect any number of the following handler/hook descriptions: 894These calls expect any number of the following handler/hook descriptions:
791 895
792=over 4 896=over 4
… …
916 1020
917 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
918 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
919 1023
920 } elsif (ref $type) { 1024 } elsif (ref $type) {
921 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
922 1026
923 } else { 1027 } else {
924 shift @arg; 1028 shift @arg;
925 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
926 } 1030 }
927 } 1031 }
928} 1032}
929 1033
930sub _object_attach { 1034sub _object_attach {
… …
940 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
941 } 1045 }
942 1046
943 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
944 } else { 1048 } else {
945 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
946 } 1050 }
947 1051
948 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
949} 1053}
950 1054
… …
1009 1113
1010 for (@$callbacks) { 1114 for (@$callbacks) {
1011 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
1012 1116
1013 if ($@) { 1117 if ($@) {
1014 warn "$@";
1015 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1016 override; 1119 override;
1017 } 1120 }
1018 1121
1019 return 1 if $override; 1122 return 1 if $override;
1020 } 1123 }
… …
1083 1186
1084sub reattach { 1187sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1188 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1189 my ($obj) = @_;
1087 1190
1191 # no longer needed after getting rid of delete_package?
1088 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
1089 1193
1090 my $registry = $obj->registry; 1194 my $registry = $obj->registry;
1091 1195
1092 @$registry = (); 1196 @$registry = ();
1093 1197
… …
1098 for (@$attach) { 1202 for (@$attach) {
1099 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1100 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1101 } 1205 }
1102 } else { 1206 } else {
1103 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1104 } 1208 }
1105 } 1209 }
1106} 1210}
1107 1211
1108cf::attachable->attach ( 1212cf::attachable->attach (
… …
1135 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1136 1240
1137 sync_job { 1241 sync_job {
1138 if (length $$rdata) { 1242 if (length $$rdata) {
1139 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1142 1247
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1249 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 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 }
1147 close $fh; 1255 aio_close $fh;
1148 1256
1149 if (@$objs) { 1257 if (@$objs) {
1150 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) {
1151 chmod SAVE_MODE, $fh; 1259 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1260 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1261 aio_write $fh, 0, (length $data), $data, 0;
1154 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 }
1155 close $fh; 1266 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1267 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1268 }
1158 } else { 1269 } else {
1159 aio_unlink "$filename.pst"; 1270 aio_unlink "$filename.pst";
1160 } 1271 }
1161 1272
1162 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1274
1275 $filename =~ s%/[^/]+$%%;
1276 aio_pathsync $filename if $cf::USE_FSYNC;
1163 } else { 1277 } else {
1164 warn "FATAL: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1165 } 1279 }
1166 } else { 1280 } else {
1167 aio_unlink $filename; 1281 aio_unlink $filename;
1168 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1169 } 1283 }
… …
1193 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1194 $av = $st->{objs}; 1308 $av = $st->{objs};
1195 } 1309 }
1196 1310
1197 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1198 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1199 $decname, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1200 1315
1201 ($data, $av) 1316 ($data, $av)
1202} 1317}
1203 1318
1204=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
… …
1260 my ($name, $cb) = @_; 1375 my ($name, $cb) = @_;
1261 1376
1262 $EXTICMD{$name} = $cb; 1377 $EXTICMD{$name} = $cb;
1263} 1378}
1264 1379
1380use File::Glob ();
1381
1265cf::player->attach ( 1382cf::player->attach (
1266 on_command => sub { 1383 on_unknown_command => sub {
1267 my ($pl, $name, $params) = @_; 1384 my ($pl, $name, $params) = @_;
1268 1385
1269 my $cb = $COMMAND{$name} 1386 my $cb = $COMMAND{$name}
1270 or return; 1387 or return;
1271 1388
… …
1294 1411
1295 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1296 if $reply; 1413 if $reply;
1297 1414
1298 } else { 1415 } else {
1299 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1300 } 1417 }
1301 1418
1302 cf::override; 1419 cf::override;
1303 }, 1420 },
1304); 1421);
1305 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
1306sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1307 cf::sync_job { 1439 cf::sync_job {
1308 my %todo; 1440 my %todo;
1309 1441
1310 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1311 next unless -r $path; 1443 next unless -r $path;
… …
1329 1461
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1464
1333 $ext{source} = 1465 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1335 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1336 . $source 1468 . $source
1337 . "\n};\n1"; 1469 . "\n};\n1";
1338 1470
1339 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
1340 } 1472 }
1341 1473
1474 my $pass = 0;
1342 my %done; 1475 my %done;
1343 while (%todo) { 1476 while (%todo) {
1344 my $progress; 1477 my $progress;
1345 1478
1479 ++$pass;
1480
1481 ext:
1346 while (my ($k, $v) = each %todo) { 1482 while (my ($k, $v) = each %todo) {
1347 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1348 goto skip 1484 next ext
1349 unless exists $done{$_}; 1485 unless exists $done{$_};
1350 } 1486 }
1351 1487
1352 warn "... loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1353 1489
1354 unless (eval $v->{source}) { 1490 my $active = eval $v->{source};
1491
1492 if (length $@) {
1355 my $msg = $@ ? "$v->{path}: $@\n" 1493 error "$v->{path}: $@\n";
1356 : "$v->{base}: extension inactive.\n";
1357 1494
1358 if (exists $v->{meta}{mandatory}) {
1359 warn $msg;
1360 cf::cleanup "mandatory extension failed to load, exiting."; 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1361 } 1496 if exists $v->{meta}{mandatory};
1362 1497
1363 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;
1364 } 1507 }
1365
1366 $done{$k} = delete $todo{$k};
1367 push @EXTS, $v->{pkg};
1368 $progress = 1;
1369 } 1508 }
1370 1509
1371 skip: 1510 unless ($progress) {
1372 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1511 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1373 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 }
1374 } 1518 }
1375 }; 1519 };
1376} 1520}
1377 1521
1378############################################################################# 1522#############################################################################
1379 1523
1380=back 1524=back
1381 1525
1382=head2 CORE EXTENSIONS 1526=head2 CORE EXTENSIONS
1383 1527
1384Functions and methods that extend core crossfire objects. 1528Functions and methods that extend core deliantra objects.
1385 1529
1386=cut 1530=cut
1387 1531
1388package cf::player; 1532package cf::player;
1389 1533
… …
1432 1576
1433sub exists($) { 1577sub exists($) {
1434 my ($login) = @_; 1578 my ($login) = @_;
1435 1579
1436 $cf::PLAYER{$login} 1580 $cf::PLAYER{$login}
1437 or cf::sync_job { !aio_stat path $login } 1581 or !aio_stat path $login
1438} 1582}
1439 1583
1440sub find($) { 1584sub find($) {
1441 return $cf::PLAYER{$_[0]} || do { 1585 return $cf::PLAYER{$_[0]} || do {
1442 my $login = $_[0]; 1586 my $login = $_[0];
… …
1454 my $f = new_from_file cf::object::thawer path $login 1598 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1599 or return;
1456 1600
1457 my $pl = cf::player::load_pl $f 1601 my $pl = cf::player::load_pl $f
1458 or return; 1602 or return;
1603
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1604 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1605 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1462 } 1607 }
1463 } 1608 }
1464} 1609}
1465 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
1466sub save($) { 1624sub save($) {
1467 my ($pl) = @_; 1625 my ($pl) = @_;
1468 1626
1469 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1470 1628
… …
1473 1631
1474 return if $pl->{deny_save}; 1632 return if $pl->{deny_save};
1475 1633
1476 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1477 $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];
1478 1641
1479 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1643 cf::cede_to_tick;
1481} 1644}
1482 1645
… …
1514 my ($pl) = @_; 1677 my ($pl) = @_;
1515 1678
1516 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1517 1680
1518 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1519 $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
1520 1683
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1522 $pl->deactivate; 1685 $pl->deactivate;
1686
1687 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1524 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1525 1692
1526 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1528 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
… …
1566 1733
1567 for my $login (@$dirs) { 1734 for my $login (@$dirs) {
1568 my $path = path $login; 1735 my $path = path $login;
1569 1736
1570 # a .pst is a dead give-away for a valid player 1737 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1738 # if no pst file found, open and chekc for blocked users
1739 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1740 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1741 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1742 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1743 }
1576 1744
… …
1580 1748
1581 \@logins 1749 \@logins
1582} 1750}
1583 1751
1584=item $player->maps 1752=item $player->maps
1753
1754=item cf::player::maps $login
1585 1755
1586Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1587player. May block. 1757player. May block.
1588 1758
1589=cut 1759=cut
… …
1607 } 1777 }
1608 1778
1609 \@paths 1779 \@paths
1610} 1780}
1611 1781
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1782=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1783
1614Expand crossfire pod fragments into protocol xml. 1784Expand deliantra pod fragments into protocol xml.
1615
1616=cut
1617
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1629sub expand_cfpod {
1630 my ($self, $pod) = @_;
1631
1632 my $xml;
1633
1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1637
1638 $group =~ s/&/&amp;/g;
1639 $group =~ s/</&lt;/g;
1640
1641 $xml .= $group;
1642 } elsif ($pod =~ m%\G
1643 ([BCGHITU])
1644 <
1645 (?:
1646 ([^<>]*) (?{ $group = $^N })
1647 | < $interior >
1648 )
1649 >
1650 %gcsx
1651 ) {
1652 my ($code, $data) = ($1, $group);
1653
1654 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662 } elsif ($code eq "T") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664 } elsif ($code eq "G") {
1665 my ($male, $female) = split /\|/, $data;
1666 $data = $self->gender ? $female : $male;
1667 $xml .= expand_cfpod ($self, $data);
1668 } elsif ($code eq "H") {
1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1671 "")
1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1683
1684 for ($xml) {
1685 # create single paragraphs (very hackish)
1686 s/(?<=\S)\n(?=\w)/ /g;
1687
1688 # compress some whitespace
1689 s/\s+\n/\n/g; # ws line-ends
1690 s/\n\n+/\n/g; # double lines
1691 s/^\n+//; # beginning lines
1692 s/\n+$//; # ending lines
1693 }
1694
1695 $xml
1696}
1697
1698no re 'eval';
1699
1700sub hintmode {
1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1702 $_[0]{hintmode}
1703}
1704 1785
1705=item $player->ext_reply ($msgid, @msg) 1786=item $player->ext_reply ($msgid, @msg)
1706 1787
1707Sends an ext reply to the player. 1788Sends an ext reply to the player.
1708 1789
… …
1740 1821
1741=cut 1822=cut
1742 1823
1743sub find_by_path($) { 1824sub find_by_path($) {
1744 my ($path) = @_; 1825 my ($path) = @_;
1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1745 1828
1746 my ($match, $specificity); 1829 my ($match, $specificity);
1747 1830
1748 for my $region (list) { 1831 for my $region (list) {
1749 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
… …
1775our $MAX_RESET = 3600; 1858our $MAX_RESET = 3600;
1776our $DEFAULT_RESET = 3000; 1859our $DEFAULT_RESET = 3000;
1777 1860
1778sub generate_random_map { 1861sub generate_random_map {
1779 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
1780 # mit "rum" bekleckern, nicht 1866 # mit "rum" bekleckern, nicht
1781 $self->_create_random_map ( 1867 $self->_create_random_map (
1782 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1868 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1783 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1869 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1784 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1870 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1785 $rmp->{exit_on_final_map}, 1871 $rmp->{exit_on_final_map},
1786 $rmp->{xsize}, $rmp->{ysize}, 1872 $rmp->{xsize}, $rmp->{ysize},
1787 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1873 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1788 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1874 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1803 1889
1804sub register { 1890sub register {
1805 my (undef, $regex, $prio) = @_; 1891 my (undef, $regex, $prio) = @_;
1806 my $pkg = caller; 1892 my $pkg = caller;
1807 1893
1808 no strict;
1809 push @{"$pkg\::ISA"}, __PACKAGE__; 1894 push @{"$pkg\::ISA"}, __PACKAGE__;
1810 1895
1811 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1896 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1812} 1897}
1813 1898
1814# also paths starting with '/' 1899# also paths starting with '/'
1815$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1900$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1816 1901
1817sub thawer_merge { 1902sub thawer_merge {
1818 my ($self, $merge) = @_; 1903 my ($self, $merge) = @_;
1819 1904
1820 # we have to keep some variables in memory intact 1905 # we have to keep some variables in memory intact
… …
1825} 1910}
1826 1911
1827sub normalise { 1912sub normalise {
1828 my ($path, $base) = @_; 1913 my ($path, $base) = @_;
1829 1914
1830 $path = "$path"; # make sure its a string 1915 $path = "$path"; # make sure it's a string
1831 1916
1832 $path =~ s/\.map$//; 1917 $path =~ s/\.map$//;
1833 1918
1834 # map plan: 1919 # map plan:
1835 # 1920 #
… …
1874 $self->init; # pass $1 etc. 1959 $self->init; # pass $1 etc.
1875 return $self; 1960 return $self;
1876 } 1961 }
1877 } 1962 }
1878 1963
1879 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1964 Carp::cluck "unable to resolve path '$path' (base '$base')";
1880 () 1965 ()
1881} 1966}
1882 1967
1883sub init { 1968sub init {
1884 my ($self) = @_; 1969 my ($self) = @_;
… …
1906 1991
1907# the temporary/swap location 1992# the temporary/swap location
1908sub save_path { 1993sub save_path {
1909 my ($self) = @_; 1994 my ($self) = @_;
1910 1995
1911 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1996 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1912 "$TMPDIR/$path.map" 1997 "$TMPDIR/$path.map"
1913} 1998}
1914 1999
1915# the unique path, undef == no special unique path 2000# the unique path, undef == no special unique path
1916sub uniq_path { 2001sub uniq_path {
1917 my ($self) = @_; 2002 my ($self) = @_;
1918 2003
1919 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2004 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1920 "$UNIQUEDIR/$path" 2005 "$UNIQUEDIR/$path"
1921}
1922
1923# and all this just because we cannot iterate over
1924# all maps in C++...
1925sub change_all_map_light {
1926 my ($change) = @_;
1927
1928 $_->change_map_light ($change)
1929 for grep $_->outdoor, values %cf::MAP;
1930} 2006}
1931 2007
1932sub decay_objects { 2008sub decay_objects {
1933 my ($self) = @_; 2009 my ($self) = @_;
1934 2010
… …
2016 2092
2017sub find; 2093sub find;
2018sub find { 2094sub find {
2019 my ($path, $origin) = @_; 2095 my ($path, $origin) = @_;
2020 2096
2097 cf::cede_to_tick;
2098
2021 $path = normalise $path, $origin && $origin->path; 2099 $path = normalise $path, $origin && $origin->path;
2022 2100
2023 cf::lock_wait "map_data:$path";#d#remove 2101 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2024 cf::lock_wait "map_find:$path"; 2102 my $guard2 = cf::lock_acquire "map_find:$path";
2025 2103
2026 $cf::MAP{$path} || do { 2104 $cf::MAP{$path} || do {
2027 my $guard1 = cf::lock_acquire "map_find:$path";
2028 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2029
2030 my $map = new_from_path cf::map $path 2105 my $map = new_from_path cf::map $path
2031 or return; 2106 or return;
2032 2107
2033 $map->{last_save} = $cf::RUNTIME; 2108 $map->{last_save} = $cf::RUNTIME;
2034 2109
… …
2036 or return; 2111 or return;
2037 2112
2038 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2113 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2039 # doing this can freeze the server in a sync job, obviously 2114 # doing this can freeze the server in a sync job, obviously
2040 #$cf::WAIT_FOR_TICK->wait; 2115 #$cf::WAIT_FOR_TICK->wait;
2116 undef $guard2;
2041 undef $guard1; 2117 undef $guard1;
2042 undef $guard2;
2043 $map->reset; 2118 $map->reset;
2044 return find $path; 2119 return find $path;
2045 } 2120 }
2046 2121
2047 $cf::MAP{$path} = $map 2122 $cf::MAP{$path} = $map
2048 } 2123 }
2049} 2124}
2050 2125
2051sub pre_load { } 2126sub pre_load { }
2052sub post_load { } 2127#sub post_load { } # XS
2053 2128
2054sub load { 2129sub load {
2055 my ($self) = @_; 2130 my ($self) = @_;
2056 2131
2057 local $self->{deny_reset} = 1; # loading can take a long time 2132 local $self->{deny_reset} = 1; # loading can take a long time
… …
2074 my $f = new_from_file cf::object::thawer $self->{load_path}; 2149 my $f = new_from_file cf::object::thawer $self->{load_path};
2075 $f->skip_block; 2150 $f->skip_block;
2076 $self->_load_objects ($f) 2151 $self->_load_objects ($f)
2077 or return; 2152 or return;
2078 2153
2079 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2154 $self->post_load_original
2080 if delete $self->{load_original}; 2155 if delete $self->{load_original};
2081 2156
2082 if (my $uniq = $self->uniq_path) { 2157 if (my $uniq = $self->uniq_path) {
2083 utf8::encode $uniq; 2158 utf8::encode $uniq;
2084 unless (aio_stat $uniq) { 2159 unless (aio_stat $uniq) {
… …
2102 unless ($self->{deny_activate}) { 2177 unless ($self->{deny_activate}) {
2103 $self->decay_objects; 2178 $self->decay_objects;
2104 $self->fix_auto_apply; 2179 $self->fix_auto_apply;
2105 $self->update_buttons; 2180 $self->update_buttons;
2106 cf::cede_to_tick; 2181 cf::cede_to_tick;
2107 $self->set_darkness_map;
2108 cf::cede_to_tick;
2109 $self->activate; 2182 $self->activate;
2110 } 2183 }
2111 2184
2112 $self->{last_save} = $cf::RUNTIME; 2185 $self->{last_save} = $cf::RUNTIME;
2113 $self->last_access ($cf::RUNTIME); 2186 $self->last_access ($cf::RUNTIME);
2114 2187
2115 $self->in_memory (cf::MAP_IN_MEMORY); 2188 $self->in_memory (cf::MAP_ACTIVE);
2116 } 2189 }
2117 2190
2118 $self->post_load; 2191 $self->post_load;
2119} 2192}
2120 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
2121sub customise_for { 2197sub customise_for {
2122 my ($self, $ob) = @_; 2198 my ($self, $ob) = @_;
2123 2199
2124 return find "~" . $ob->name . "/" . $self->{path} 2200 return find "~" . $ob->name . "/" . $self->{path}
2125 if $self->per_player; 2201 if $self->per_player;
… …
2141 or next; 2217 or next;
2142 $neigh = find $neigh, $map 2218 $neigh = find $neigh, $map
2143 or next; 2219 or next;
2144 $neigh->load; 2220 $neigh->load;
2145 2221
2222 # now find the diagonal neighbours
2146 push @neigh, 2223 push @neigh,
2147 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2224 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2148 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2225 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2149 } 2226 }
2150 2227
… …
2157} 2234}
2158 2235
2159sub find_sync { 2236sub find_sync {
2160 my ($path, $origin) = @_; 2237 my ($path, $origin) = @_;
2161 2238
2162 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
2163} 2243}
2164 2244
2165sub do_load_sync { 2245sub do_load_sync {
2166 my ($map) = @_; 2246 my ($map) = @_;
2167 2247
2168 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2248 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2169 if $Coro::current == $Coro::main; 2249 if $Coro::current == $Coro::main;
2170 2250
2171 cf::sync_job { $map->load }; 2251 $map->load;
2172} 2252}
2173 2253
2174our %MAP_PREFETCH; 2254our %MAP_PREFETCH;
2175our $MAP_PREFETCHER = undef; 2255our $MAP_PREFETCHER = undef;
2176 2256
… …
2178 my ($path, $origin, $load) = @_; 2258 my ($path, $origin, $load) = @_;
2179 2259
2180 $path = normalise $path, $origin && $origin->{path}; 2260 $path = normalise $path, $origin && $origin->{path};
2181 2261
2182 if (my $map = $cf::MAP{$path}) { 2262 if (my $map = $cf::MAP{$path}) {
2183 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2263 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2184 } 2264 }
2185 2265
2186 $MAP_PREFETCH{$path} |= $load; 2266 $MAP_PREFETCH{$path} |= $load;
2187 2267
2188 $MAP_PREFETCHER ||= cf::async { 2268 $MAP_PREFETCHER ||= cf::async {
… …
2202 $MAP_PREFETCHER->prio (6); 2282 $MAP_PREFETCHER->prio (6);
2203 2283
2204 () 2284 ()
2205} 2285}
2206 2286
2287# common code, used by both ->save and ->swapout
2207sub save { 2288sub _save {
2208 my ($self) = @_; 2289 my ($self) = @_;
2209
2210 my $lock = cf::lock_acquire "map_data:$self->{path}";
2211 2290
2212 $self->{last_save} = $cf::RUNTIME; 2291 $self->{last_save} = $cf::RUNTIME;
2213 2292
2214 return unless $self->dirty; 2293 return unless $self->dirty;
2215 2294
… …
2224 2303
2225 cf::async { 2304 cf::async {
2226 $Coro::current->{desc} = "map player save"; 2305 $Coro::current->{desc} = "map player save";
2227 $_->contr->save for $self->players; 2306 $_->contr->save for $self->players;
2228 }; 2307 };
2308
2309 cf::get_slot 0.02;
2229 2310
2230 if ($uniq) { 2311 if ($uniq) {
2231 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2312 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2232 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2313 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2233 } else { 2314 } else {
2234 $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);
2235 } 2316 }
2236} 2317}
2237 2318
2319sub save {
2320 my ($self) = @_;
2321
2322 my $lock = cf::lock_acquire "map_data:$self->{path}";
2323
2324 $self->_save;
2325}
2326
2238sub swap_out { 2327sub swap_out {
2239 my ($self) = @_; 2328 my ($self) = @_;
2240 2329
2241 # save first because save cedes
2242 $self->save;
2243
2244 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2330 my $lock = cf::lock_acquire "map_data:$self->{path}";
2245 2331
2332 return if $self->in_memory != cf::MAP_ACTIVE;
2333 return if $self->{deny_save};
2246 return if $self->players; 2334 return if $self->players;
2247 return if $self->in_memory != cf::MAP_IN_MEMORY;
2248 return if $self->{deny_save};
2249 2335
2336 # first deactivate the map and "unlink" it from the core
2337 $self->deactivate;
2338 $_->clear_links_to ($self) for values %cf::MAP;
2250 $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};
2251 2386
2252 $self->deactivate; 2387 $self->deactivate;
2253 $_->clear_links_to ($self) for values %cf::MAP; 2388 $_->clear_links_to ($self) for values %cf::MAP;
2254 $self->clear; 2389 $self->clear;
2255}
2256
2257sub reset_at {
2258 my ($self) = @_;
2259
2260 # TODO: safety, remove and allow resettable per-player maps
2261 return 1e99 if $self->{deny_reset};
2262
2263 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2264 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2265
2266 $time + $to
2267}
2268
2269sub should_reset {
2270 my ($self) = @_;
2271
2272 $self->reset_at <= $cf::RUNTIME
2273}
2274
2275sub reset {
2276 my ($self) = @_;
2277
2278 my $lock = cf::lock_acquire "map_data:$self->{path}";
2279
2280 return if $self->players;
2281
2282 warn "resetting map ", $self->path;
2283
2284 $self->in_memory (cf::MAP_SWAPPED);
2285
2286 # need to save uniques path
2287 unless ($self->{deny_save}) {
2288 my $uniq = $self->uniq_path; utf8::encode $uniq;
2289
2290 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2291 if $uniq;
2292 }
2293
2294 delete $cf::MAP{$self->path};
2295
2296 $self->deactivate;
2297 $_->clear_links_to ($self) for values %cf::MAP;
2298 $self->clear;
2299 2390
2300 $self->unlink_save; 2391 $self->unlink_save;
2301 $self->destroy; 2392 $self->destroy;
2302} 2393}
2303 2394
… …
2311 2402
2312 delete $cf::MAP{$self->path}; 2403 delete $cf::MAP{$self->path};
2313 2404
2314 $self->unlink_save; 2405 $self->unlink_save;
2315 2406
2316 bless $self, "cf::map"; 2407 bless $self, "cf::map::wrap";
2317 delete $self->{deny_reset}; 2408 delete $self->{deny_reset};
2318 $self->{deny_save} = 1; 2409 $self->{deny_save} = 1;
2319 $self->reset_timeout (1); 2410 $self->reset_timeout (1);
2320 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2411 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2321 2412
… …
2370 2461
2371sub unique_maps() { 2462sub unique_maps() {
2372 [ 2463 [
2373 map { 2464 map {
2374 utf8::decode $_; 2465 utf8::decode $_;
2375 /\.map$/ 2466 s/\.map$//; # TODO future compatibility hack
2467 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2468 ? ()
2376 ? normalise $_ 2469 : normalise $_
2377 : ()
2378 } @{ aio_readdir $UNIQUEDIR or [] } 2470 } @{ aio_readdir $UNIQUEDIR or [] }
2379 ] 2471 ]
2380} 2472}
2381 2473
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}
2505
2382=back 2506=back
2383 2507
2384=head3 cf::object 2508=head3 cf::object
2385 2509
2386=cut 2510=cut
… …
2389 2513
2390=over 4 2514=over 4
2391 2515
2392=item $ob->inv_recursive 2516=item $ob->inv_recursive
2393 2517
2394Returns 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.
2395 2520
2396=cut 2521=cut
2397 2522
2398sub inv_recursive_; 2523sub inv_recursive_;
2399sub inv_recursive_ { 2524sub inv_recursive_ {
… …
2404 inv_recursive_ inv $_[0] 2529 inv_recursive_ inv $_[0]
2405} 2530}
2406 2531
2407=item $ref = $ob->ref 2532=item $ref = $ob->ref
2408 2533
2409creates 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.
2410 2535
2411=item $ob = cf::object::deref ($refstring) 2536=item $ob = cf::object::deref ($refstring)
2412 2537
2413returns 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,
2414even if the object actually exists. May block. 2539even if the object actually exists. May block.
… …
2446can 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
2447dialogue with the given NPC character. 2572dialogue with the given NPC character.
2448 2573
2449=cut 2574=cut
2450 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
2451# rough implementation of a future "reply" method that works 2590# rough implementation of a future "reply" method that works
2452# with dialog boxes. 2591# with dialog boxes.
2453#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
2454sub cf::object::player::reply($$$;$) { 2593sub cf::object::player::reply($$$;$) {
2455 my ($self, $npc, $msg, $flags) = @_; 2594 my ($self, $npc, $msg, $flags) = @_;
… …
2466 my $dialog = $pl->{npc_dialog}; 2605 my $dialog = $pl->{npc_dialog};
2467 $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));
2468 2607
2469 } else { 2608 } else {
2470 $msg = $npc->name . " says: $msg" if $npc; 2609 $msg = $npc->name . " says: $msg" if $npc;
2471 $self->message ($msg, $flags); 2610 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2472 } 2611 }
2473 } 2612 }
2474} 2613}
2475 2614
2476=item $object->send_msg ($channel, $msg, $color, [extra...]) 2615=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2501 2640
2502=item $player_object->enter_link 2641=item $player_object->enter_link
2503 2642
2504Freezes 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}>).
2505 2644
2506The 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.
2507I<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.
2508 2649
2509Will never block. 2650Will never block.
2510 2651
2511=item $player_object->leave_link ($map, $x, $y) 2652=item $player_object->leave_link ($map, $x, $y)
2512 2653
… …
2532sub cf::object::player::enter_link { 2673sub cf::object::player::enter_link {
2533 my ($self) = @_; 2674 my ($self) = @_;
2534 2675
2535 $self->deactivate_recursive; 2676 $self->deactivate_recursive;
2536 2677
2678 ++$self->{_link_recursion};
2679
2537 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2680 return if UNIVERSAL::isa $self->map, "ext::map_link";
2538 2681
2539 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2682 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2540 if $self->map && $self->map->{path} ne "{link}"; 2683 if $self->map && $self->map->{path} ne "{link}";
2541 2684
2542 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2685 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2543} 2686}
2544 2687
2545sub cf::object::player::leave_link { 2688sub cf::object::player::leave_link {
2546 my ($self, $map, $x, $y) = @_; 2689 my ($self, $map, $x, $y) = @_;
2547 2690
… …
2564 ($x, $y) = (-1, -1) 2707 ($x, $y) = (-1, -1)
2565 unless (defined $x) && (defined $y); 2708 unless (defined $x) && (defined $y);
2566 2709
2567 # use -1 or undef as default coordinates, not 0, 0 2710 # use -1 or undef as default coordinates, not 0, 0
2568 ($x, $y) = ($map->enter_x, $map->enter_y) 2711 ($x, $y) = ($map->enter_x, $map->enter_y)
2569 if $x <=0 && $y <= 0; 2712 if $x <= 0 && $y <= 0;
2570 2713
2571 $map->load; 2714 $map->load;
2572 $map->load_neighbours; 2715 $map->load_neighbours;
2573 2716
2574 return unless $self->contr->active; 2717 return unless $self->contr->active;
2575 $self->activate_recursive;
2576 2718
2577 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2719 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2578 $self->enter_map ($map, $x, $y); 2720 if ($self->enter_map ($map, $x, $y)) {
2579} 2721 # entering was successful
2722 delete $self->{_link_recursion};
2723 # only activate afterwards, to support waiting in hooks
2724 $self->activate_recursive;
2725 }
2580 2726
2727}
2728
2581=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)]])
2582 2730
2583Moves 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
2584her, loading and preparing them map, calling the provided $check callback 2732her, loading and preparing them map, calling the provided $check callback
2585that 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
2586the 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
2587be called at the end of this process. 2735be called at the end of this process.
2588 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
2589=cut 2740=cut
2590 2741
2591our $GOTOGEN; 2742our $GOTOGEN;
2592 2743
2593sub cf::object::player::goto { 2744sub cf::object::player::goto {
2594 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 }
2595 2752
2596 # 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
2597 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2754 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2598 2755
2599 $self->enter_link; 2756 $self->enter_link;
… …
2623 my $map = eval { 2780 my $map = eval {
2624 my $map = defined $path ? cf::map::find $path : undef; 2781 my $map = defined $path ? cf::map::find $path : undef;
2625 2782
2626 if ($map) { 2783 if ($map) {
2627 $map = $map->customise_for ($self); 2784 $map = $map->customise_for ($self);
2628 $map = $check->($map) if $check && $map; 2785 $map = $check->($map, $x, $y, $self) if $check && $map;
2629 } else { 2786 } else {
2630 $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);
2631 } 2788 }
2632 2789
2633 $map 2790 $map
… …
2641 if ($gen == $self->{_goto_generation}) { 2798 if ($gen == $self->{_goto_generation}) {
2642 delete $self->{_goto_generation}; 2799 delete $self->{_goto_generation};
2643 $self->leave_link ($map, $x, $y); 2800 $self->leave_link ($map, $x, $y);
2644 } 2801 }
2645 2802
2646 $done->() if $done; 2803 $done->($self) if $done;
2647 })->prio (1); 2804 })->prio (1);
2648} 2805}
2649 2806
2650=item $player_object->enter_exit ($exit_object) 2807=item $player_object->enter_exit ($exit_object)
2651 2808
… …
2671} 2828}
2672 2829
2673sub prepare_random_map { 2830sub prepare_random_map {
2674 my ($exit) = @_; 2831 my ($exit) = @_;
2675 2832
2676 my $guard = cf::lock_acquire "exit_prepare:$exit";
2677
2678 # all this does is basically replace the /! path by 2833 # all this does is basically replace the /! path by
2679 # a new random map path (?random/...) with a seed 2834 # a new random map path (?random/...) with a seed
2680 # that depends on the exit object 2835 # that depends on the exit object
2681 2836
2682 my $rmp = parse_random_map_params $exit->msg; 2837 my $rmp = parse_random_map_params $exit->msg;
… …
2684 if ($exit->map) { 2839 if ($exit->map) {
2685 $rmp->{region} = $exit->region->name; 2840 $rmp->{region} = $exit->region->name;
2686 $rmp->{origin_map} = $exit->map->path; 2841 $rmp->{origin_map} = $exit->map->path;
2687 $rmp->{origin_x} = $exit->x; 2842 $rmp->{origin_x} = $exit->x;
2688 $rmp->{origin_y} = $exit->y; 2843 $rmp->{origin_y} = $exit->y;
2844
2845 $exit->map->touch;
2689 } 2846 }
2690 2847
2691 $rmp->{random_seed} ||= $exit->random_seed; 2848 $rmp->{random_seed} ||= $exit->random_seed;
2692 2849
2693 my $data = cf::encode_json $rmp; 2850 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2694 my $md5 = Digest::MD5::md5_hex $data; 2851 my $md5 = Digest::MD5::md5_hex $data;
2695 my $meta = "$RANDOMDIR/$md5.meta"; 2852 my $meta = "$RANDOMDIR/$md5.meta";
2696 2853
2697 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2854 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2698 aio_write $fh, 0, (length $data), $data, 0; 2855 aio_write $fh, 0, (length $data), $data, 0;
2699 undef $fh; 2856 undef $fh;
2700 aio_rename "$meta~", $meta; 2857 aio_rename "$meta~", $meta;
2701 2858
2859 my $slaying = "?random/$md5";
2860
2861 if ($exit->valid) {
2702 $exit->slaying ("?random/$md5"); 2862 $exit->slaying ("?random/$md5");
2703 $exit->msg (undef); 2863 $exit->msg (undef);
2864 }
2704 } 2865 }
2705} 2866}
2706 2867
2707sub cf::object::player::enter_exit { 2868sub cf::object::player::enter_exit {
2708 my ($self, $exit) = @_; 2869 my ($self, $exit) = @_;
2709 2870
2710 return unless $self->type == cf::PLAYER; 2871 return unless $self->type == cf::PLAYER;
2711 2872
2712 if ($exit->slaying eq "/!") {
2713 #TODO: this should de-fi-ni-te-ly not be a sync-job
2714 # the problem is that $exit might not survive long enough
2715 # so it needs to be done right now, right here
2716 cf::sync_job { prepare_random_map $exit };
2717 }
2718
2719 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2720 my $hp = $exit->stats->hp;
2721 my $sp = $exit->stats->sp;
2722
2723 $self->enter_link; 2873 $self->enter_link;
2724 2874
2725 # if exit is damned, update players death & WoR home-position
2726 $self->contr->savebed ($slaying, $hp, $sp)
2727 if $exit->flag (FLAG_DAMNED);
2728
2729 (async { 2875 (async {
2730 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2876 $Coro::current->{desc} = "enter_exit";
2731 2877
2732 $self->deactivate_recursive; # just to be sure
2733 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
2734 $self->goto ($slaying, $hp, $sp); 2893 $self->goto ($map, $x, $y);
2735 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
2736 1; 2899 1
2737 }) { 2900 }) {
2738 $self->message ("Something went wrong deep within the crossfire server. " 2901 $self->message ("Something went wrong deep within the deliantra server. "
2739 . "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. "
2740 . "Please report this to the dungeon master!", 2903 . "Please report this to the dungeon master!",
2741 cf::NDI_UNIQUE | cf::NDI_RED); 2904 cf::NDI_UNIQUE | cf::NDI_RED);
2742 2905
2743 warn "ERROR in enter_exit: $@"; 2906 error "ERROR in enter_exit: $@";
2744 $self->leave_link; 2907 $self->leave_link;
2745 } 2908 }
2746 })->prio (1); 2909 })->prio (1);
2747} 2910}
2748 2911
… …
2760sub cf::client::send_drawinfo { 2923sub cf::client::send_drawinfo {
2761 my ($self, $text, $flags) = @_; 2924 my ($self, $text, $flags) = @_;
2762 2925
2763 utf8::encode $text; 2926 utf8::encode $text;
2764 $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);
2765} 2953}
2766 2954
2767=item $client->send_msg ($channel, $msg, $color, [extra...]) 2955=item $client->send_msg ($channel, $msg, $color, [extra...])
2768 2956
2769Send 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
… …
2773 2961
2774=cut 2962=cut
2775 2963
2776# non-persistent channels (usually the info channel) 2964# non-persistent channels (usually the info channel)
2777our %CHANNEL = ( 2965our %CHANNEL = (
2966 "c/motd" => {
2967 id => "infobox",
2968 title => "MOTD",
2969 reply => undef,
2970 tooltip => "The message of the day",
2971 },
2778 "c/identify" => { 2972 "c/identify" => {
2779 id => "infobox", 2973 id => "infobox",
2780 title => "Identify", 2974 title => "Identify",
2781 reply => undef, 2975 reply => undef,
2782 tooltip => "Items recently identified", 2976 tooltip => "Items recently identified",
… …
2784 "c/examine" => { 2978 "c/examine" => {
2785 id => "infobox", 2979 id => "infobox",
2786 title => "Examine", 2980 title => "Examine",
2787 reply => undef, 2981 reply => undef,
2788 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",
2789 }, 2989 },
2790 "c/book" => { 2990 "c/book" => {
2791 id => "infobox", 2991 id => "infobox",
2792 title => "Book", 2992 title => "Book",
2793 reply => undef, 2993 reply => undef,
… …
2809 id => "infobox", 3009 id => "infobox",
2810 title => "Body Parts", 3010 title => "Body Parts",
2811 reply => undef, 3011 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available", 3012 tooltip => "Shows which body parts you posess and are available",
2813 }, 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 },
2814 "c/uptime" => { 3050 "c/uptime" => {
2815 id => "infobox", 3051 id => "infobox",
2816 title => "Uptime", 3052 title => "Uptime",
2817 reply => undef, 3053 reply => undef,
2818 tooltip => "How long the server has been running since last restart", 3054 tooltip => "How long the server has been running since last restart",
… …
2821 id => "infobox", 3057 id => "infobox",
2822 title => "Map Info", 3058 title => "Map Info",
2823 reply => undef, 3059 reply => undef,
2824 tooltip => "Information related to the maps", 3060 tooltip => "Information related to the maps",
2825 }, 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,
2826); 3076);
2827 3077
2828sub cf::client::send_msg { 3078sub cf::client::send_msg {
2829 my ($self, $channel, $msg, $color, @extra) = @_; 3079 my ($self, $channel, $msg, $color, @extra) = @_;
2830 3080
2831 $msg = $self->pl->expand_cfpod ($msg); 3081 $msg = $self->pl->expand_cfpod ($msg)
3082 unless $color & cf::NDI_VERBATIM;
2832 3083
2833 $color &= cf::NDI_CLIENT_MASK; # just in case... 3084 $color &= cf::NDI_CLIENT_MASK; # just in case...
2834 3085
2835 # check predefined channels, for the benefit of C 3086 # check predefined channels, for the benefit of C
2836 if ($CHANNEL{$channel}) { 3087 if ($CHANNEL{$channel}) {
2837 $channel = $CHANNEL{$channel}; 3088 $channel = $CHANNEL{$channel};
2838 3089
2839 $self->ext_msg (channel_info => $channel) 3090 $self->ext_msg (channel_info => $channel);
2840 if $self->can_msg;
2841
2842 $channel = $channel->{id}; 3091 $channel = $channel->{id};
2843 3092
2844 } elsif (ref $channel) { 3093 } elsif (ref $channel) {
2845 # send meta info to client, if not yet sent 3094 # send meta info to client, if not yet sent
2846 unless (exists $self->{channel}{$channel->{id}}) { 3095 unless (exists $self->{channel}{$channel->{id}}) {
2847 $self->{channel}{$channel->{id}} = $channel; 3096 $self->{channel}{$channel->{id}} = $channel;
2848 $self->ext_msg (channel_info => $channel) 3097 $self->ext_msg (channel_info => $channel);
2849 if $self->can_msg;
2850 } 3098 }
2851 3099
2852 $channel = $channel->{id}; 3100 $channel = $channel->{id};
2853 } 3101 }
2854 3102
2855 return unless @extra || length $msg; 3103 return unless @extra || length $msg;
2856 3104
2857 if ($self->can_msg) {
2858 # default colour, mask it out 3105 # default colour, mask it out
2859 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3106 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2860 if $color & cf::NDI_DEF; 3107 if $color & cf::NDI_DEF;
2861 3108
2862 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3109 my $pkt = "msg "
3110 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3111 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 } else { 3112 );
2865 if ($color >= 0) {
2866 # replace some tags by gcfclient-compatible ones
2867 for ($msg) {
2868 1 while
2869 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2870 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2871 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2872 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2873 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2874 }
2875 3113
2876 $color &= cf::NDI_COLOR_MASK; 3114 $self->send_big_packet ($pkt);
2877
2878 utf8::encode $msg;
2879
2880 if (0 && $msg =~ /\[/) {
2881 # COMMAND/INFO
2882 $self->send_packet ("drawextinfo $color 10 8 $msg")
2883 } else {
2884 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2885 $self->send_packet ("drawinfo $color $msg")
2886 }
2887 }
2888 }
2889} 3115}
2890 3116
2891=item $client->ext_msg ($type, @msg) 3117=item $client->ext_msg ($type, @msg)
2892 3118
2893Sends an ext event to the client. 3119Sends an ext event to the client.
… …
2896 3122
2897sub cf::client::ext_msg($$@) { 3123sub cf::client::ext_msg($$@) {
2898 my ($self, $type, @msg) = @_; 3124 my ($self, $type, @msg) = @_;
2899 3125
2900 if ($self->extcmd == 2) { 3126 if ($self->extcmd == 2) {
2901 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3127 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2902 } elsif ($self->extcmd == 1) { # TODO: remove 3128 } elsif ($self->extcmd == 1) { # TODO: remove
2903 push @msg, msgtype => "event_$type"; 3129 push @msg, msgtype => "event_$type";
2904 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3130 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2905 } 3131 }
2906} 3132}
2907 3133
2908=item $client->ext_reply ($msgid, @msg) 3134=item $client->ext_reply ($msgid, @msg)
2909 3135
… …
2913 3139
2914sub cf::client::ext_reply($$@) { 3140sub cf::client::ext_reply($$@) {
2915 my ($self, $id, @msg) = @_; 3141 my ($self, $id, @msg) = @_;
2916 3142
2917 if ($self->extcmd == 2) { 3143 if ($self->extcmd == 2) {
2918 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3144 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2919 } elsif ($self->extcmd == 1) { 3145 } elsif ($self->extcmd == 1) {
2920 #TODO: version 1, remove 3146 #TODO: version 1, remove
2921 unshift @msg, msgtype => "reply", msgid => $id; 3147 unshift @msg, msgtype => "reply", msgid => $id;
2922 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3148 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2923 } 3149 }
2924} 3150}
2925 3151
2926=item $success = $client->query ($flags, "text", \&cb) 3152=item $success = $client->query ($flags, "text", \&cb)
2927 3153
… …
2998 3224
2999 $ns->ext_reply ($reply, @reply) 3225 $ns->ext_reply ($reply, @reply)
3000 if $reply; 3226 if $reply;
3001 3227
3002 } else { 3228 } else {
3003 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";
3004 } 3230 }
3005 3231
3006 cf::override; 3232 cf::override;
3007 }, 3233 },
3008); 3234);
… …
3028 3254
3029 $coro 3255 $coro
3030} 3256}
3031 3257
3032cf::client->attach ( 3258cf::client->attach (
3033 on_destroy => sub { 3259 on_client_destroy => sub {
3034 my ($ns) = @_; 3260 my ($ns) = @_;
3035 3261
3036 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3262 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3037 }, 3263 },
3038); 3264);
… …
3054our $safe_hole = new Safe::Hole; 3280our $safe_hole = new Safe::Hole;
3055 3281
3056$SIG{FPE} = 'IGNORE'; 3282$SIG{FPE} = 'IGNORE';
3057 3283
3058$safe->permit_only (Opcode::opset qw( 3284$safe->permit_only (Opcode::opset qw(
3059 :base_core :base_mem :base_orig :base_math 3285 :base_core :base_mem :base_orig :base_math :base_loop
3060 grepstart grepwhile mapstart mapwhile 3286 grepstart grepwhile mapstart mapwhile
3061 sort time 3287 sort time
3062)); 3288));
3063 3289
3064# here we export the classes and methods available to script code 3290# here we export the classes and methods available to script code
… …
3067 3293
3068The following functions and methods are available within a safe environment: 3294The following functions and methods are available within a safe environment:
3069 3295
3070 cf::object 3296 cf::object
3071 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
3072 insert remove name archname title slaying race decrease_ob_nr 3298 insert remove name archname title slaying race decrease split
3299 value
3073 3300
3074 cf::object::player 3301 cf::object::player
3075 player 3302 player
3076 3303
3077 cf::player 3304 cf::player
… …
3082 3309
3083=cut 3310=cut
3084 3311
3085for ( 3312for (
3086 ["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
3087 insert remove inv name archname title slaying race 3314 insert remove inv nrof name archname title slaying race
3088 decrease_ob_nr destroy)], 3315 decrease split destroy change_exp value msg lore send_msg)],
3089 ["cf::object::player" => qw(player)], 3316 ["cf::object::player" => qw(player)],
3090 ["cf::player" => qw(peaceful)], 3317 ["cf::player" => qw(peaceful send_msg)],
3091 ["cf::map" => qw(trigger)], 3318 ["cf::map" => qw(trigger)],
3092) { 3319) {
3093 no strict 'refs';
3094 my ($pkg, @funs) = @$_; 3320 my ($pkg, @funs) = @$_;
3095 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3321 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3096 for @funs; 3322 for @funs;
3097} 3323}
3098 3324
… …
3113 3339
3114 my $qcode = $code; 3340 my $qcode = $code;
3115 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3341 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3116 $qcode =~ s/\n/\\n/g; 3342 $qcode =~ s/\n/\\n/g;
3117 3343
3344 %vars = (_dummy => 0) unless %vars;
3345
3346 my @res;
3118 local $_; 3347 local $_;
3119 local @safe::cf::_safe_eval_args = values %vars;
3120 3348
3121 my $eval = 3349 my $eval =
3122 "do {\n" 3350 "do {\n"
3123 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3351 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3124 . "#line 0 \"{$qcode}\"\n" 3352 . "#line 0 \"{$qcode}\"\n"
3125 . $code 3353 . $code
3126 . "\n}" 3354 . "\n}"
3127 ; 3355 ;
3128 3356
3357 if ($CFG{safe_eval}) {
3129 sub_generation_inc; 3358 sub_generation_inc;
3359 local @safe::cf::_safe_eval_args = values %vars;
3130 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3360 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3131 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 }
3132 3366
3133 if ($@) { 3367 if ($@) {
3134 warn "$@"; 3368 warn "$@",
3135 warn "while executing safe code '$code'\n"; 3369 "while executing safe code '$code'\n",
3136 warn "with arguments " . (join " ", %vars) . "\n"; 3370 "with arguments " . (join " ", %vars) . "\n";
3137 } 3371 }
3138 3372
3139 wantarray ? @res : $res[0] 3373 wantarray ? @res : $res[0]
3140} 3374}
3141 3375
… …
3155=cut 3389=cut
3156 3390
3157sub register_script_function { 3391sub register_script_function {
3158 my ($fun, $cb) = @_; 3392 my ($fun, $cb) = @_;
3159 3393
3160 no strict 'refs'; 3394 $fun = "safe::$fun" if $CFG{safe_eval};
3161 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3395 *$fun = $safe_hole->wrap ($cb);
3162} 3396}
3163 3397
3164=back 3398=back
3165 3399
3166=cut 3400=cut
… …
3175 # for this (global event?) 3409 # for this (global event?)
3176 %ext::player_env::MUSIC_FACE_CACHE = (); 3410 %ext::player_env::MUSIC_FACE_CACHE = ();
3177 3411
3178 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3412 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3179 3413
3180 warn "loading facedata from $path\n"; 3414 trace "loading facedata from $path\n";
3181 3415
3182 my $facedata;
3183 0 < aio_load $path, $facedata 3416 0 < aio_load $path, my $facedata
3184 or die "$path: $!"; 3417 or die "$path: $!";
3185 3418
3186 $facedata = Coro::Storable::thaw $facedata; 3419 $facedata = Coro::Storable::thaw $facedata;
3187 3420
3188 $facedata->{version} == 2 3421 $facedata->{version} == 2
3189 or cf::cleanup "$path: version mismatch, cannot proceed."; 3422 or cf::cleanup "$path: version mismatch, cannot proceed.";
3190 3423
3191 # 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]);
3192 $facedata->{resource}{"res/exp_table"} = { 3426 $facedata->{resource}{"res/exp_table"} = {
3193 type => FT_RSRC, 3427 type => FT_RSRC,
3194 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),
3195 }; 3430 };
3196 cf::cede_to_tick; 3431 cf::cede_to_tick;
3197 3432
3198 { 3433 {
3199 my $faces = $facedata->{faceinfo}; 3434 my $faces = $facedata->{faceinfo};
… …
3201 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
3202 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3437 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3203 3438
3204 cf::face::set_visibility $idx, $info->{visibility}; 3439 cf::face::set_visibility $idx, $info->{visibility};
3205 cf::face::set_magicmap $idx, $info->{magicmap}; 3440 cf::face::set_magicmap $idx, $info->{magicmap};
3206 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3441 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3207 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3442 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3208 3443
3209 cf::cede_to_tick; 3444 cf::cede_to_tick;
3210 } 3445 }
3211 3446
3212 while (my ($face, $info) = each %$faces) { 3447 while (my ($face, $info) = each %$faces) {
… …
3217 3452
3218 if (my $smooth = cf::face::find $info->{smooth}) { 3453 if (my $smooth = cf::face::find $info->{smooth}) {
3219 cf::face::set_smooth $idx, $smooth; 3454 cf::face::set_smooth $idx, $smooth;
3220 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3455 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3221 } else { 3456 } else {
3222 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3457 error "smooth face '$info->{smooth}' not found for face '$face'";
3223 } 3458 }
3224 3459
3225 cf::cede_to_tick; 3460 cf::cede_to_tick;
3226 } 3461 }
3227 } 3462 }
… …
3236 3471
3237 cf::anim::invalidate_all; # d'oh 3472 cf::anim::invalidate_all; # d'oh
3238 } 3473 }
3239 3474
3240 { 3475 {
3241 # TODO: for gcfclient pleasure, we should give resources
3242 # that gcfclient doesn't grok a >10000 face index.
3243 my $res = $facedata->{resource}; 3476 my $res = $facedata->{resource};
3244 3477
3245 while (my ($name, $info) = each %$res) { 3478 while (my ($name, $info) = each %$res) {
3246 if (defined $info->{type}) { 3479 if (defined $info->{type}) {
3247 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3480 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3248 my $data;
3249 3481
3250 if ($info->{type} & 1) { 3482 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3251 # prepend meta info
3252
3253 my $meta = $enc->encode ({
3254 name => $name,
3255 %{ $info->{meta} || {} },
3256 });
3257
3258 $data = pack "(w/a*)*", $meta, $info->{data};
3259 } else {
3260 $data = $info->{data};
3261 }
3262
3263 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3264 cf::face::set_type $idx, $info->{type}; 3483 cf::face::set_type $idx, $info->{type};
3265 } else { 3484 } else {
3266 $RESOURCE{$name} = $info; 3485 $RESOURCE{$name} = $info; # unused
3267 } 3486 }
3268 3487
3269 cf::cede_to_tick; 3488 cf::cede_to_tick;
3270 } 3489 }
3271 } 3490 }
3272 3491
3273 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3492 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3274 3493
3275 1 3494 1
3276} 3495}
3277
3278cf::global->attach (on_resource_update => sub {
3279 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3280 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3281
3282 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3283 my $sound = $soundconf->{compat}[$_]
3284 or next;
3285
3286 my $face = cf::face::find "sound/$sound->[1]";
3287 cf::sound::set $sound->[0] => $face;
3288 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3289 }
3290
3291 while (my ($k, $v) = each %{$soundconf->{event}}) {
3292 my $face = cf::face::find "sound/$v";
3293 cf::sound::set $k => $face;
3294 }
3295 }
3296});
3297 3496
3298register_exticmd fx_want => sub { 3497register_exticmd fx_want => sub {
3299 my ($ns, $want) = @_; 3498 my ($ns, $want) = @_;
3300 3499
3301 while (my ($k, $v) = each %$want) { 3500 while (my ($k, $v) = each %$want) {
3302 $ns->fx_want ($k, $v); 3501 $ns->fx_want ($k, $v);
3303 } 3502 }
3304}; 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}
3305 3514
3306sub reload_regions { 3515sub reload_regions {
3307 # 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
3308 # for this (global event?) 3517 # for this (global event?)
3309 %ext::player_env::MUSIC_FACE_CACHE = (); 3518 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3323} 3532}
3324 3533
3325sub reload_archetypes { 3534sub reload_archetypes {
3326 load_resource_file "$DATADIR/archetypes" 3535 load_resource_file "$DATADIR/archetypes"
3327 or die "unable to load archetypes\n"; 3536 or die "unable to load archetypes\n";
3328 #d# NEED to laod twice to resolve forward references
3329 # this really needs to be done in an extra post-pass
3330 # (which needs to be synchronous, so solve it differently)
3331 load_resource_file "$DATADIR/archetypes"
3332 or die "unable to load archetypes\n";
3333} 3537}
3334 3538
3335sub reload_treasures { 3539sub reload_treasures {
3336 load_resource_file "$DATADIR/treasures" 3540 load_resource_file "$DATADIR/treasures"
3337 or die "unable to load treasurelists\n"; 3541 or die "unable to load treasurelists\n";
3338} 3542}
3339 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
3340sub reload_resources { 3567sub reload_resources {
3341 warn "reloading resource files...\n"; 3568 trace "reloading resource files...\n";
3342 3569
3570 reload_exp_table;
3571 reload_materials;
3572 reload_facedata;
3573 reload_sound;
3574 reload_archetypes;
3343 reload_regions; 3575 reload_regions;
3344 reload_facedata;
3345 #reload_archetypes;#d#
3346 reload_archetypes;
3347 reload_treasures; 3576 reload_treasures;
3348 3577
3349 warn "finished reloading resource files\n"; 3578 trace "finished reloading resource files\n";
3350}
3351
3352sub init {
3353 reload_resources;
3354} 3579}
3355 3580
3356sub reload_config { 3581sub reload_config {
3357 open my $fh, "<:utf8", "$CONFDIR/config" 3582 trace "reloading config file...\n";
3358 or return;
3359 3583
3360 local $/; 3584 0 < aio_load "$CONFDIR/config", my $config
3361 *CFG = YAML::Load <$fh>; 3585 or die "$CONFDIR/config: $!";
3362 3586
3587 utf8::decode $config;
3588 *CFG = yaml_load $config;
3589
3363 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3590 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3364 3591
3365 $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};
3366 $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};
3367 3594
3368 if (exists $CFG{mlockall}) { 3595 if (exists $CFG{mlockall}) {
… …
3372 }; 3599 };
3373 warn $@ if $@; 3600 warn $@ if $@;
3374 } 3601 }
3375} 3602}
3376 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
3377sub 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
3378 # we must not ever block the main coroutine 3642 # we must not ever block the main coroutine
3379 local $Coro::idle = sub { 3643 local $Coro::idle = sub {
3380 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#
3381 (async { 3645 (async {
3382 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3646 $Coro::current->{desc} = "IDLE BUG HANDLER";
3383 EV::loop EV::LOOP_ONESHOT; 3647 EV::loop EV::LOOP_ONESHOT;
3384 })->prio (Coro::PRIO_MAX); 3648 })->prio (Coro::PRIO_MAX);
3385 }; 3649 };
3386 3650
3387 reload_config;
3388 db_init;
3389 load_extensions;
3390
3391 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3392 evthread_start IO::AIO::poll_fileno; 3651 evthread_start IO::AIO::poll_fileno;
3393 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;
3394} 3694}
3395 3695
3396############################################################################# 3696#############################################################################
3397# initialisation and cleanup 3697# initialisation and cleanup
3398 3698
3399# install some emergency cleanup handlers 3699# install some emergency cleanup handlers
3400BEGIN { 3700BEGIN {
3401 our %SIGWATCHER = (); 3701 our %SIGWATCHER = ();
3402 for my $signal (qw(INT HUP TERM)) { 3702 for my $signal (qw(INT HUP TERM)) {
3403 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3703 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3404 cf::cleanup "SIG$signal"; 3704 cf::cleanup "SIG$signal";
3405 }; 3705 };
3406 } 3706 }
3407} 3707}
3408 3708
3409sub write_runtime { 3709sub write_runtime_sync {
3410 my $runtime = "$LOCALDIR/runtime"; 3710 my $t0 = AE::time;
3411 3711
3412 # first touch the runtime file to show we are still running: 3712 # first touch the runtime file to show we are still running:
3413 # the fsync below can take a very very long time. 3713 # the fsync below can take a very very long time.
3414 3714
3415 IO::AIO::aio_utime $runtime, undef, undef; 3715 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3416 3716
3417 my $guard = cf::lock_acquire "write_runtime"; 3717 my $guard = cf::lock_acquire "write_runtime";
3418 3718
3419 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3719 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3420 or return; 3720 or return;
3421 3721
3422 my $value = $cf::RUNTIME + 90 + 10; 3722 my $value = $cf::RUNTIME + 90 + 10;
3423 # 10 is the runtime save interval, for a monotonic clock 3723 # 10 is the runtime save interval, for a monotonic clock
3424 # 60 allows for the watchdog to kill the server. 3724 # 60 allows for the watchdog to kill the server.
… …
3434 aio_utime $fh, undef, undef; 3734 aio_utime $fh, undef, undef;
3435 3735
3436 close $fh 3736 close $fh
3437 or return; 3737 or return;
3438 3738
3439 aio_rename "$runtime~", $runtime 3739 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3440 and return; 3740 and return;
3441 3741
3442 warn "runtime file written.\n"; 3742 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3443 3743
3444 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 };
3445} 3795}
3446 3796
3447sub emergency_save() { 3797sub emergency_save() {
3448 my $freeze_guard = cf::freeze_mainloop; 3798 my $freeze_guard = cf::freeze_mainloop;
3449 3799
3450 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;
3451 3806
3452 cf::sync_job { 3807 cf::sync_job {
3808 cf::write_runtime_sync; # external watchdog should not bark
3809
3453 # use a peculiar iteration method to avoid tripping on perl 3810 # use a peculiar iteration method to avoid tripping on perl
3454 # refcount bugs in for. also avoids problems with players 3811 # refcount bugs in for. also avoids problems with players
3455 # and maps saved/destroyed asynchronously. 3812 # and maps saved/destroyed asynchronously.
3456 warn "begin emergency player save\n"; 3813 info "emergency_perl_save: begin player save\n";
3457 for my $login (keys %cf::PLAYER) { 3814 for my $login (keys %cf::PLAYER) {
3458 my $pl = $cf::PLAYER{$login} or next; 3815 my $pl = $cf::PLAYER{$login} or next;
3459 $pl->valid or next; 3816 $pl->valid or next;
3460 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3817 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3461 $pl->save; 3818 $pl->save;
3462 } 3819 }
3463 warn "end emergency player save\n"; 3820 info "emergency_perl_save: end player save\n";
3464 3821
3465 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";
3466 for my $path (keys %cf::MAP) { 3825 for my $path (keys %cf::MAP) {
3467 my $map = $cf::MAP{$path} or next; 3826 my $map = $cf::MAP{$path} or next;
3468 $map->valid or next; 3827 $map->valid or next;
3469 $map->save; 3828 $map->save;
3470 } 3829 }
3471 warn "end emergency map save\n"; 3830 info "emergency_perl_save: end map save\n";
3472 3831
3473 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";
3474 BDB::db_env_txn_checkpoint $DB_ENV; 3835 BDB::db_env_txn_checkpoint $DB_ENV;
3475 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
3476 }; 3860 };
3477 3861
3478 warn "leave emergency perl save\n"; 3862 info "emergency_perl_save: leave\n";
3479} 3863}
3480 3864
3481sub post_cleanup { 3865sub post_cleanup {
3482 my ($make_core) = @_; 3866 my ($make_core) = @_;
3483 3867
3868 IO::AIO::flush;
3869
3484 warn Carp::longmess "post_cleanup backtrace" 3870 error Carp::longmess "post_cleanup backtrace"
3485 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 }
3486} 3900}
3487 3901
3488sub do_reload_perl() { 3902sub do_reload_perl() {
3489 # can/must only be called in main 3903 # can/must only be called in main
3490 if ($Coro::current != $Coro::main) { 3904 unless (in_main) {
3491 warn "can only reload from main coroutine"; 3905 error "can only reload from main coroutine";
3492 return; 3906 return;
3493 } 3907 }
3494 3908
3495 warn "reloading..."; 3909 return if $RELOAD++;
3496 3910
3497 warn "entering sync_job"; 3911 my $t1 = AE::time;
3498 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
3499 cf::sync_job { 3919 cf::sync_job {
3500 cf::write_runtime; # external watchdog should not bark
3501 cf::emergency_save; 3920 #cf::emergency_save;
3502 cf::write_runtime; # external watchdog should not bark
3503 3921
3504 warn "syncing database to disk";
3505 BDB::db_env_txn_checkpoint $DB_ENV;
3506
3507 # if anything goes wrong in here, we should simply crash as we already saved
3508
3509 warn "flushing outstanding aio requests";
3510 for (;;) {
3511 BDB::flush;
3512 IO::AIO::flush;
3513 Coro::cede_notself;
3514 last unless IO::AIO::nreqs || BDB::nreqs;
3515 warn "iterate...";
3516 }
3517
3518 ++$RELOAD;
3519
3520 warn "cancelling all extension coros"; 3922 trace "perl_reload: cancelling all extension coros";
3521 $_->cancel for values %EXT_CORO; 3923 $_->cancel for values %EXT_CORO;
3522 %EXT_CORO = (); 3924 %EXT_CORO = ();
3523 3925
3524 warn "removing commands"; 3926 trace "perl_reload: removing commands";
3525 %COMMAND = (); 3927 %COMMAND = ();
3526 3928
3527 warn "removing ext/exti commands"; 3929 trace "perl_reload: removing ext/exti commands";
3528 %EXTCMD = (); 3930 %EXTCMD = ();
3529 %EXTICMD = (); 3931 %EXTICMD = ();
3530 3932
3531 warn "unloading/nuking all extensions"; 3933 trace "perl_reload: unloading/nuking all extensions";
3532 for my $pkg (@EXTS) { 3934 for my $pkg (@EXTS) {
3533 warn "... unloading $pkg"; 3935 trace "... unloading $pkg";
3534 3936
3535 if (my $cb = $pkg->can ("unload")) { 3937 if (my $cb = $pkg->can ("unload")) {
3536 eval { 3938 eval {
3537 $cb->($pkg); 3939 $cb->($pkg);
3538 1 3940 1
3539 } 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;
3540 } 3946 }
3541 3947
3542 warn "... nuking $pkg";
3543 Symbol::delete_package $pkg;
3544 }
3545
3546 warn "unloading all perl modules loaded from $LIBDIR"; 3948 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3547 while (my ($k, $v) = each %INC) { 3949 while (my ($k, $v) = each %INC) {
3548 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3950 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3549 3951
3550 warn "... unloading $k"; 3952 trace "... unloading $k";
3551 delete $INC{$k}; 3953 delete $INC{$k};
3552 3954
3553 $k =~ s/\.pm$//; 3955 $k =~ s/\.pm$//;
3554 $k =~ s/\//::/g; 3956 $k =~ s/\//::/g;
3555 3957
3556 if (my $cb = $k->can ("unload_module")) { 3958 if (my $cb = $k->can ("unload_module")) {
3557 $cb->(); 3959 $cb->();
3960 }
3961
3962 clear_package $k;
3558 } 3963 }
3559 3964
3560 Symbol::delete_package $k;
3561 }
3562
3563 warn "getting rid of safe::, as good as possible"; 3965 trace "perl_reload: getting rid of safe::, as good as possible";
3564 Symbol::delete_package "safe::$_" 3966 clear_package "safe::$_"
3565 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);
3566 3968
3567 warn "unloading cf.pm \"a bit\""; 3969 trace "perl_reload: unloading cf.pm \"a bit\"";
3568 delete $INC{"cf.pm"}; 3970 delete $INC{"cf.pm"};
3569 delete $INC{"cf/pod.pm"}; 3971 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3570 3972
3571 # don't, removes xs symbols, too, 3973 # don't, removes xs symbols, too,
3572 # and global variables created in xs 3974 # and global variables created in xs
3573 #Symbol::delete_package __PACKAGE__; 3975 #clear_package __PACKAGE__;
3574 3976
3575 warn "unload completed, starting to reload now"; 3977 info "perl_reload: unload completed, starting to reload now";
3576 3978
3577 warn "reloading cf.pm"; 3979 trace "perl_reload: reloading cf.pm";
3578 require cf; 3980 require cf;
3579 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3981 cf::_connect_to_perl_1;
3580 3982
3581 warn "loading config and database again"; 3983 trace "perl_reload: loading config and database again";
3582 cf::reload_config; 3984 cf::reload_config;
3583 3985
3584 warn "loading extensions"; 3986 trace "perl_reload: loading extensions";
3585 cf::load_extensions; 3987 cf::load_extensions;
3586 3988
3989 if ($REATTACH_ON_RELOAD) {
3587 warn "reattaching attachments to objects/players"; 3990 trace "perl_reload: reattaching attachments to objects/players";
3588 _global_reattach; # objects, sockets 3991 _global_reattach; # objects, sockets
3589 warn "reattaching attachments to maps"; 3992 trace "perl_reload: reattaching attachments to maps";
3590 reattach $_ for values %MAP; 3993 reattach $_ for values %MAP;
3591 warn "reattaching attachments to players"; 3994 trace "perl_reload: reattaching attachments to players";
3592 reattach $_ for values %PLAYER; 3995 reattach $_ for values %PLAYER;
3996 }
3593 3997
3594 warn "leaving sync_job"; 3998 cf::_post_init 1;
3595 3999
4000 trace "perl_reload: leaving sync_job";
4001
3596 1 4002 1
3597 } or do { 4003 } or do {
3598 warn $@; 4004 error $@;
3599 cf::cleanup "error while reloading, exiting."; 4005 cf::cleanup "perl_reload: error, exiting.";
4006 };
4007
4008 --$RELOAD;
3600 }; 4009 }
3601 4010
3602 warn "reloaded"; 4011 $t1 = AE::time - $t1;
4012 info "perl_reload: completed in ${t1}s\n";
3603}; 4013};
3604 4014
3605our $RELOAD_WATCHER; # used only during reload 4015our $RELOAD_WATCHER; # used only during reload
3606 4016
3607sub reload_perl() { 4017sub reload_perl() {
3608 # doing reload synchronously and two reloads happen back-to-back, 4018 # doing reload synchronously and two reloads happen back-to-back,
3609 # coro crashes during coro_state_free->destroy here. 4019 # coro crashes during coro_state_free->destroy here.
3610 4020
4021 $RELOAD_WATCHER ||= cf::async {
4022 Coro::AIO::aio_wait cache_extensions;
4023
3611 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4024 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3612 do_reload_perl; 4025 do_reload_perl;
3613 undef $RELOAD_WATCHER; 4026 undef $RELOAD_WATCHER;
4027 };
3614 }; 4028 };
3615} 4029}
3616 4030
3617register_command "reload" => sub { 4031register_command "reload" => sub {
3618 my ($who, $arg) = @_; 4032 my ($who, $arg) = @_;
… …
3624 reload_perl; 4038 reload_perl;
3625 }; 4039 };
3626 } 4040 }
3627}; 4041};
3628 4042
3629unshift @INC, $LIBDIR; 4043#############################################################################
3630 4044
3631my $bug_warning = 0; 4045my $bug_warning = 0;
3632 4046
3633our @WAIT_FOR_TICK; 4047our @WAIT_FOR_TICK;
3634our @WAIT_FOR_TICK_BEGIN; 4048our @WAIT_FOR_TICK_BEGIN;
3635 4049
3636sub wait_for_tick { 4050sub wait_for_tick() {
3637 return if tick_inhibit;
3638 return if $Coro::current == $Coro::main; 4051 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3639 4052
3640 my $signal = new Coro::Signal; 4053 my $signal = new Coro::Signal;
3641 push @WAIT_FOR_TICK, $signal; 4054 push @WAIT_FOR_TICK, $signal;
3642 $signal->wait; 4055 $signal->wait;
3643} 4056}
3644 4057
3645sub wait_for_tick_begin { 4058sub wait_for_tick_begin() {
3646 return if tick_inhibit;
3647 return if $Coro::current == $Coro::main; 4059 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3648 4060
3649 my $signal = new Coro::Signal; 4061 my $signal = new Coro::Signal;
3650 push @WAIT_FOR_TICK_BEGIN, $signal; 4062 push @WAIT_FOR_TICK_BEGIN, $signal;
3651 $signal->wait; 4063 $signal->wait;
3652} 4064}
… …
3658 return; 4070 return;
3659 } 4071 }
3660 4072
3661 cf::server_tick; # one server iteration 4073 cf::server_tick; # one server iteration
3662 4074
4075 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4076
3663 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4077 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3664 $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.;
3665 Coro::async_pool { 4079 Coro::async_pool {
3666 $Coro::current->{desc} = "runtime saver"; 4080 $Coro::current->{desc} = "runtime saver";
3667 write_runtime 4081 write_runtime_sync
3668 or warn "ERROR: unable to write runtime file: $!"; 4082 or error "ERROR: unable to write runtime file: $!";
3669 }; 4083 };
3670 } 4084 }
3671 4085
3672 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4086 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3673 $sig->send; 4087 $sig->send;
… …
3681 4095
3682 if (0) { 4096 if (0) {
3683 if ($NEXT_TICK) { 4097 if ($NEXT_TICK) {
3684 my $jitter = $TICK_START - $NEXT_TICK; 4098 my $jitter = $TICK_START - $NEXT_TICK;
3685 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4099 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3686 warn "jitter $JITTER\n";#d# 4100 debug "jitter $JITTER\n";#d#
3687 } 4101 }
3688 } 4102 }
3689} 4103}
3690 4104
3691{ 4105{
3692 # configure BDB 4106 # configure BDB
3693 4107
3694 BDB::min_parallel 8; 4108 BDB::min_parallel 16;
3695 BDB::max_poll_reqs $TICK * 0.1; 4109 BDB::max_poll_reqs $TICK * 0.1;
3696 $Coro::BDB::WATCHER->priority (1); 4110 $AnyEvent::BDB::WATCHER->priority (1);
3697 4111
3698 unless ($DB_ENV) { 4112 unless ($DB_ENV) {
3699 $DB_ENV = BDB::db_env_create; 4113 $DB_ENV = BDB::db_env_create;
3700 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4114 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3701 | 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;
3702 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4117 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3703 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4118 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3704 4119
3705 cf::sync_job { 4120 cf::sync_job {
3706 eval { 4121 eval {
… …
3732{ 4147{
3733 # configure IO::AIO 4148 # configure IO::AIO
3734 4149
3735 IO::AIO::min_parallel 8; 4150 IO::AIO::min_parallel 8;
3736 IO::AIO::max_poll_time $TICK * 0.1; 4151 IO::AIO::max_poll_time $TICK * 0.1;
3737 $Coro::AIO::WATCHER->priority (1); 4152 undef $AnyEvent::AIO::WATCHER;
3738} 4153}
3739 4154
3740my $_log_backtrace; 4155my $_log_backtrace;
3741 4156
3742sub _log_backtrace { 4157sub _log_backtrace {
… …
3745 $msg =~ s/\n//; 4160 $msg =~ s/\n//;
3746 4161
3747 # limit the # of concurrent backtraces 4162 # limit the # of concurrent backtraces
3748 if ($_log_backtrace < 2) { 4163 if ($_log_backtrace < 2) {
3749 ++$_log_backtrace; 4164 ++$_log_backtrace;
4165 my $perl_bt = Carp::longmess $msg;
3750 async { 4166 async {
3751 $Coro::current->{desc} = "abt $msg"; 4167 $Coro::current->{desc} = "abt $msg";
3752 4168
3753 my @bt = fork_call { 4169 my @bt = fork_call {
3754 @addr = map { sprintf "%x", $_ } @addr; 4170 @addr = map { sprintf "%x", $_ } @addr;
… …
3765 } 4181 }
3766 4182
3767 @funcs 4183 @funcs
3768 }; 4184 };
3769 4185
3770 LOG llevInfo, "[ABT] $msg\n"; 4186 LOG llevInfo, "[ABT] $perl_bt\n";
4187 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3771 LOG llevInfo, "[ABT] $_\n" for @bt; 4188 LOG llevInfo, "[ABT] $_\n" for @bt;
3772 --$_log_backtrace; 4189 --$_log_backtrace;
3773 }; 4190 };
3774 } else { 4191 } else {
3775 LOG llevInfo, "[ABT] $msg\n"; 4192 LOG llevInfo, "[ABT] $msg\n";
3776 LOG llevInfo, "[ABT] [suppressed]\n"; 4193 LOG llevInfo, "[ABT] [suppressed]\n";
3777 } 4194 }
3778} 4195}
3779 4196
3780# load additional modules 4197# load additional modules
3781use cf::pod; 4198require "cf/$_.pm" for @EXTRA_MODULES;
4199cf::_connect_to_perl_2;
3782 4200
3783END { cf::emergency_save } 4201END { cf::emergency_save }
3784 4202
37851 42031
3786 4204

Diff Legend

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