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.303 by root, Wed Jul 11 15:57:31 2007 UTC vs.
Revision 1.566 by root, Sun May 1 16:58:16 2011 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 3.61 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
51use Coro::Util ();
24 52
25use JSON::XS 1.4 (); 53use JSON::XS 2.01 ();
26use BDB (); 54use BDB ();
27use Data::Dumper; 55use Data::Dumper;
28use Digest::MD5;
29use Fcntl; 56use Fcntl;
30use YAML::Syck (); 57use YAML::XS ();
31use IO::AIO 2.32 (); 58use IO::AIO ();
32use Time::HiRes; 59use Time::HiRes;
33use Compress::LZF; 60use Compress::LZF;
34use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
35 64
36# configure various modules to our taste 65# configure various modules to our taste
37# 66#
38$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
39Coro::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";
40Compress::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
41 75
42$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
43 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 78
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
50 82
51our %COMMAND = (); 83our %COMMAND = ();
52our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
53 85
54our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
55our %EXTCMD = (); 87our %EXTCMD = ();
56our %EXTICMD = (); 88our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
59 91
60our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
62 96
63our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
64our $DATADIR = datadir; 99our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
68our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
74 120
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 123our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
82 125
126our $BDB_DEADLOCK_WATCHER;
127our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 128our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 129our $DB_ENV;
130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
85 132
86our %CFG; 133our %CFG;
87 134
88our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 136our $RUNTIME;
137our $NOW;
90 138
91our %PLAYER; # all users 139our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 140our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 141our $LINK_MAP; # the special {link} map, which is always available
94 142
95# used to convert map paths into valid unix filenames by replacing / by ∕ 143# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 144our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 145
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 146our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 147our $LOADAVG; # same thing, but with alpha-smoothing
148our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 149our $TICK_START; # for load detecting purposes
150
151our @POST_INIT;
152
153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :)
101 155
102binmode STDOUT; 156binmode STDOUT;
103binmode STDERR; 157binmode STDERR;
104 158
105# read virtual server time, if available 159# read virtual server time, if available
106unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 160unless ($RUNTIME || !-e $RUNTIMEFILE) {
107 open my $fh, "<", "$LOCALDIR/runtime" 161 open my $fh, "<", $RUNTIMEFILE
108 or die "unable to read runtime file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
109 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
110} 164}
165
166eval "sub TICK() { $TICK } 1" or die;
111 167
112mkdir $_ 168mkdir $_
113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
114 170
115our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
116 172
117sub cf::map::normalise; 173sub cf::map::normalise;
174
175sub in_main() {
176 $Coro::current == $Coro::main
177}
178
179#############################################################################
180
181%REFLECT = ();
182for (@REFLECT) {
183 my $reflect = JSON::XS::decode_json $_;
184 $REFLECT{$reflect->{class}} = $reflect;
185}
186
187# this is decidedly evil
188$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
118 189
119############################################################################# 190#############################################################################
120 191
121=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
122 193
158 229
159The raw value load value from the last tick. 230The raw value load value from the last tick.
160 231
161=item %cf::CFG 232=item %cf::CFG
162 233
163Configuration for the server, loaded from C</etc/crossfire/config>, or 234Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 235from wherever your confdir points to.
165 236
166=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
167 238
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
169returns directly I<after> the tick processing (and consequently, can only wake one process 240returns directly I<after> the tick processing (and consequently, can only wake one thread
170per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 241per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
171 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
248=item @cf::INVOKE_RESULTS
249
250This array contains the results of the last C<invoke ()> call. When
251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
252that call.
253
254=item %cf::REFLECT
255
256Contains, for each (C++) class name, a hash reference with information
257about object members (methods, scalars, arrays and flags) and other
258metadata, which is useful for introspection.
259
172=back 260=back
173 261
174=cut 262=cut
175 263
176BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
177 *CORE::GLOBAL::warn = sub { 265sub warn (@) { LOG llevWarn , join "", @_ }
266sub info (@) { LOG llevInfo , join "", @_ }
267sub debug(@) { LOG llevDebug, join "", @_ }
268sub trace(@) { LOG llevTrace, join "", @_ }
269
270$Coro::State::WARNHOOK = sub {
178 my $msg = join "", @_; 271 my $msg = join "", @_;
179 272
180 $msg .= "\n" 273 $msg .= "\n"
181 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
182 275
183 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 276 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
184 277
185 utf8::encode $msg;
186 LOG llevError, $msg; 278 LOG llevWarn, $msg;
187 }; 279};
188} 280
281$Coro::State::DIEHOOK = sub {
282 return unless $^S eq 0; # "eq", not "=="
283
284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
287 error "DIEHOOK called in main context, Coro bug?\n";#d#
288 return;#d#
289 }#d#
290
291 # kill coroutine otherwise
292 Coro::terminate
293};
189 294
190@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
191@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
192@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
193@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
200for my $pkg (qw( 305for my $pkg (qw(
201 cf::global cf::attachable 306 cf::global cf::attachable
202 cf::object cf::object::player 307 cf::object cf::object::player
203 cf::client cf::player 308 cf::client cf::player
204 cf::arch cf::living 309 cf::arch cf::living
310 cf::map cf::mapspace
205 cf::map cf::party cf::region 311 cf::party cf::region
206)) { 312)) {
207 no strict 'refs';
208 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
209} 314}
210 315
211$Event::DIED = sub { 316$EV::DIED = sub {
212 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
213}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
214 324
215############################################################################# 325#############################################################################
216 326
217=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
218 328
239 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
240 $d 350 $d
241 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
242} 352}
243 353
354=item $scalar = load_file $path
355
356Loads the given file from path and returns its contents. Croaks on error
357and can block.
358
359=cut
360
361sub load_file($) {
362 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!";
364
365 $data
366}
367
244=item $ref = cf::from_json $json 368=item $ref = cf::decode_json $json
245 369
246Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
247 371
248=item $json = cf::to_json $ref 372=item $json = cf::encode_json $ref
249 373
250Converts a perl data structure into its JSON representation. 374Converts a perl data structure into its JSON representation.
251 375
252=cut 376=cut
253 377
254our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 378our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255 379
256sub to_json ($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
257sub from_json ($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
382
383=item $ref = cf::decode_storable $scalar
384
385Same as Coro::Storable::thaw, so blocks.
386
387=cut
388
389BEGIN { *decode_storable = \&Coro::Storable::thaw }
390
391=item $ref = cf::decode_yaml $scalar
392
393Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
394
395=cut
396
397sub decode_yaml($) {
398 fork_call { YAML::XS::Load $_[0] } @_
399}
400
401=item $scalar = cf::unlzf $scalar
402
403Same as Compress::LZF::compress, but takes server ticks into account, so
404blocks.
405
406=cut
407
408sub unlzf($) {
409 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
410 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
411 Compress::LZF::decompress $_[0]
412}
413
414=item cf::post_init { BLOCK }
415
416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
417but I<before> the server starts ticking again.
418
419The codeblock will have a single boolean argument to indicate whether this
420is a reload or not.
421
422=cut
423
424sub post_init(&) {
425 push @POST_INIT, shift;
426}
427
428sub _post_init {
429 trace "running post_init jobs";
430
431 # run them in parallel...
432
433 my @join;
434
435 while () {
436 push @join, map &Coro::async ($_, 0), @POST_INIT;
437 @POST_INIT = ();
438
439 @join or last;
440
441 (pop @join)->join;
442 }
443}
258 444
259=item cf::lock_wait $string 445=item cf::lock_wait $string
260 446
261Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
262 448
263=item my $lock = cf::lock_acquire $string 449=item my $lock = cf::lock_acquire $string
264 450
265Wait until the given lock is available and then acquires it and returns 451Wait until the given lock is available and then acquires it and returns
266a Coro::guard object. If the guard object gets destroyed (goes out of scope, 452a L<Guard> object. If the guard object gets destroyed (goes out of scope,
267for example when the coroutine gets canceled), the lock is automatically 453for example when the coroutine gets canceled), the lock is automatically
268returned. 454returned.
269 455
456Locks are *not* recursive, locking from the same coro twice results in a
457deadlocked coro.
458
270Lock names should begin with a unique identifier (for example, cf::map::find 459Lock names should begin with a unique identifier (for example, cf::map::find
271uses map_find and cf::map::load uses map_load). 460uses map_find and cf::map::load uses map_load).
272 461
273=item $locked = cf::lock_active $string 462=item $locked = cf::lock_active $string
274 463
275Return true if the lock is currently active, i.e. somebody has locked it. 464Return true if the lock is currently active, i.e. somebody has locked it.
276 465
277=cut 466=cut
278 467
279our %LOCK; 468our $LOCKS = new Coro::SemaphoreSet;
280 469
281sub lock_wait($) { 470sub lock_wait($) {
282 my ($key) = @_; 471 $LOCKS->wait ($_[0]);
283
284 # wait for lock, if any
285 while ($LOCK{$key}) {
286 push @{ $LOCK{$key} }, $Coro::current;
287 Coro::schedule;
288 }
289} 472}
290 473
291sub lock_acquire($) { 474sub lock_acquire($) {
292 my ($key) = @_; 475 $LOCKS->guard ($_[0])
293
294 # wait, to be sure we are not locked
295 lock_wait $key;
296
297 $LOCK{$key} = [];
298
299 Coro::guard {
300 # wake up all waiters, to be on the safe side
301 $_->ready for @{ delete $LOCK{$key} };
302 }
303} 476}
304 477
305sub lock_active($) { 478sub lock_active($) {
306 my ($key) = @_; 479 $LOCKS->count ($_[0]) < 1
307
308 ! ! $LOCK{$key}
309} 480}
310 481
311sub freeze_mainloop { 482sub freeze_mainloop {
312 return unless $TICK_WATCHER->is_active; 483 tick_inhibit_inc;
313 484
314 my $guard = Coro::guard { 485 &Guard::guard (\&tick_inhibit_dec);
315 $TICK_WATCHER->start; 486}
487
488=item cf::periodic $interval, $cb
489
490Like EV::periodic, but randomly selects a starting point so that the actions
491get spread over time.
492
493=cut
494
495sub periodic($$) {
496 my ($interval, $cb) = @_;
497
498 my $start = rand List::Util::min 180, $interval;
499
500 EV::periodic $start, $interval, 0, $cb
501}
502
503=item cf::get_slot $time[, $priority[, $name]]
504
505Allocate $time seconds of blocking CPU time at priority C<$priority>
506(default: 0): This call blocks and returns only when you have at least
507C<$time> seconds of cpu time till the next tick. The slot is only valid
508till the next cede.
509
510Background jobs should use a priority les than zero, interactive jobs
511should use 100 or more.
512
513The optional C<$name> can be used to identify the job to run. It might be
514used for statistical purposes and should identify the same time-class.
515
516Useful for short background jobs.
517
518=cut
519
520our @SLOT_QUEUE;
521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
523
524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
525$SLOT_QUEUE = Coro::async {
526 $Coro::current->desc ("timeslot manager");
527
528 my $signal = new Coro::Signal;
529 my $busy;
530
531 while () {
532 next_job:
533
534 my $avail = cf::till_tick;
535
536 for (0 .. $#SLOT_QUEUE) {
537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
539 my $job = splice @SLOT_QUEUE, $_, 1, ();
540 $job->[2]->send;
541 Coro::cede;
542 goto next_job;
543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
545 }
546 }
547
548 if (@SLOT_QUEUE) {
549 # we do not use wait_for_tick() as it returns immediately when tick is inactive
550 push @cf::WAIT_FOR_TICK, $signal;
551 $signal->wait;
552 } else {
553 $busy = 0;
554 Coro::schedule;
555 }
316 }; 556 }
317 $TICK_WATCHER->stop; 557};
318 $guard 558
559sub get_slot($;$$) {
560 return if tick_inhibit || $Coro::current == $Coro::main;
561
562 my ($time, $pri, $name) = @_;
563
564 $time = clamp $time, 0.01, $TICK * .6;
565
566 my $sig = new Coro::Signal;
567
568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
570 $SLOT_QUEUE->ready;
571 $sig->wait;
319} 572}
320 573
321=item cf::async { BLOCK } 574=item cf::async { BLOCK }
322 575
323Currently the same as Coro::async_pool, meaning you cannot use 576Currently the same as Coro::async_pool, meaning you cannot use
328 581
329BEGIN { *async = \&Coro::async_pool } 582BEGIN { *async = \&Coro::async_pool }
330 583
331=item cf::sync_job { BLOCK } 584=item cf::sync_job { BLOCK }
332 585
333The design of Crossfire TRT requires that the main coroutine ($Coro::main) 586The design of Deliantra requires that the main coroutine ($Coro::main)
334is always able to handle events or runnable, as Crossfire TRT is only 587is always able to handle events or runnable, as Deliantra is only
335partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 588partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
336acceptable. 589acceptable.
337 590
338If it must be done, put the blocking parts into C<sync_job>. This will run 591If it must be done, put the blocking parts into C<sync_job>. This will run
339the given BLOCK in another coroutine while waiting for the result. The 592the given BLOCK in another coroutine while waiting for the result. The
343=cut 596=cut
344 597
345sub sync_job(&) { 598sub sync_job(&) {
346 my ($job) = @_; 599 my ($job) = @_;
347 600
348 if ($Coro::current == $Coro::main) { 601 if (in_main) {
349 my $time = Event::time; 602 my $time = AE::time;
350 603
351 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
352 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
353 606
354 # TODO: use suspend/resume instead 607 #LOG llevError, Carp::longmess "sync job";#d#
355 # (but this is cancel-safe) 608
356 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
357 610
358 my $busy = 1; 611 my $busy = 1;
359 my @res; 612 my @res;
360 613
361 (async { 614 (async {
615 $Coro::current->desc ("sync job coro");
362 @res = eval { $job->() }; 616 @res = eval { $job->() };
363 warn $@ if $@; 617 error $@ if $@;
364 undef $busy; 618 undef $busy;
365 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
366 620
367 while ($busy) { 621 while ($busy) {
368 Coro::cede or Event::one_event; 622 if (Coro::nready) {
623 Coro::cede_notself;
624 } else {
625 EV::loop EV::LOOP_ONESHOT;
369 } 626 }
627 }
370 628
371 $time = Event::time - $time; 629 my $time = AE::time - $time;
372 630
373 LOG llevError | logBacktrace, Carp::longmess "long sync job"
374 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
375
376 $tick_start += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
377 632
378 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
379 } else { 634 } else {
380 # we are in another coroutine, how wonderful, everything just works 635 # we are in another coroutine, how wonderful, everything just works
381 636
401 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
402 657
403 $coro 658 $coro
404} 659}
405 660
406=item fork_call { }, $args 661=item fork_call { }, @args
407 662
408Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
409process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
410Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 666never block itself or use any form of event handling.
412 667
413=cut 668=cut
414 669
415sub _store_scalar { 670sub post_fork {
416 open my $fh, ">", \my $buf 671 reset_signals;
417 or die "fork_call: cannot open fh-to-buf in child : $!";
418 Storable::store_fd $_[0], $fh;
419 close $fh;
420
421 $buf
422} 672}
423 673
424sub fork_call(&@) { 674sub fork_call(&@) {
425 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
426 676
427# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 677 # we seemingly have to make a local copy of the whole thing,
428# or die "socketpair: $!"; 678 # otherwise perl prematurely frees the stuff :/
429 pipe my $fh1, my $fh2 679 # TODO: investigate and fix (likely this will be rather laborious)
430 or die "pipe: $!";
431 680
432 if (my $pid = fork) { 681 my @res = Coro::Util::fork_eval {
433 close $fh2; 682 cf::post_fork;
683 &$cb
684 } @args;
434 685
435 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 686 wantarray ? @res : $res[-1]
436 warn "pst<$res>" unless $res =~ /^pst/; 687}
437 $res = Coro::Storable::thaw $res;
438 688
439 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave 689sub objinfo {
440
441 Carp::confess $$res unless "ARRAY" eq ref $res;
442
443 return wantarray ? @$res : $res->[-1];
444 } else {
445 reset_signals;
446 local $SIG{__WARN__};
447 local $SIG{__DIE__};
448 # just in case, this hack effectively disables event
449 # in the child. cleaner and slower would be canceling all watchers,
450 # but this works for the time being.
451 local $Coro::idle;
452 $Coro::current->prio (Coro::PRIO_MAX);
453
454 eval {
455 close $fh1;
456
457 my @res = eval { $cb->(@args) };
458
459 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
460 close $fh2;
461 };
462
463 warn $@ if $@;
464 _exit 0;
465 } 690 (
691 "counter value" => cf::object::object_count,
692 "objects created" => cf::object::create_count,
693 "objects destroyed" => cf::object::destroy_count,
694 "freelist size" => cf::object::free_count,
695 "allocated objects" => cf::object::objects_size,
696 "active objects" => cf::object::actives_size,
697 )
698}
699
700=item $coin = coin_from_name $name
701
702=cut
703
704our %coin_alias = (
705 "silver" => "silvercoin",
706 "silvercoin" => "silvercoin",
707 "silvercoins" => "silvercoin",
708 "gold" => "goldcoin",
709 "goldcoin" => "goldcoin",
710 "goldcoins" => "goldcoin",
711 "platinum" => "platinacoin",
712 "platinumcoin" => "platinacoin",
713 "platinumcoins" => "platinacoin",
714 "platina" => "platinacoin",
715 "platinacoin" => "platinacoin",
716 "platinacoins" => "platinacoin",
717 "royalty" => "royalty",
718 "royalties" => "royalty",
719);
720
721sub coin_from_name($) {
722 $coin_alias{$_[0]}
723 ? cf::arch::find $coin_alias{$_[0]}
724 : undef
466} 725}
467 726
468=item $value = cf::db_get $family => $key 727=item $value = cf::db_get $family => $key
469 728
470Returns a single value from the environment database. 729Returns a single value from the environment database.
472=item cf::db_put $family => $key => $value 731=item cf::db_put $family => $key => $value
473 732
474Stores the given C<$value> in the family. It can currently store binary 733Stores the given C<$value> in the family. It can currently store binary
475data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 734data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
476 735
736=item $db = cf::db_table "name"
737
738Create and/or open a new database table. The string must not be "db" and must be unique
739within each server.
740
477=cut 741=cut
742
743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
747 my ($name) = @_;
748 my $db = BDB::db_create $DB_ENV;
749
750 eval {
751 $db->set_flags (BDB::CHKSUM);
752
753 utf8::encode $name;
754 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
755 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
756 cf::cleanup "db_open(db): $!" if $!;
757 };
758 cf::cleanup "db_open(db): $@" if $@;
759
760 $db
761}
478 762
479our $DB; 763our $DB;
480 764
481sub db_init { 765sub db_init {
482 unless ($DB) { 766 $DB ||= db_table "db";
483 $DB = BDB::db_create $DB_ENV;
484
485 cf::sync_job {
486 eval {
487 $DB->set_flags (BDB::CHKSUM);
488
489 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
490 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
491 cf::cleanup "db_open(db): $!" if $!;
492 };
493 cf::cleanup "db_open(db): $@" if $@;
494 };
495 }
496} 767}
497 768
498sub db_get($$) { 769sub db_get($$) {
499 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
500 771
501 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
502 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
503 776
504 $! ? () 777 $! ? ()
505 : $data 778 : $data
506 }
507} 779}
508 780
509sub db_put($$$) { 781sub db_put($$$) {
510 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
511 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
539 811
540 my @data; 812 my @data;
541 my $md5; 813 my $md5;
542 814
543 for (0 .. $#$src) { 815 for (0 .. $#$src) {
544 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
545 or Carp::croak "$src->[$_]: $!";
546 } 817 }
547 818
548 # if processing is expensive, check 819 # if processing is expensive, check
549 # checksum first 820 # checksum first
550 if (1) { 821 if (1) {
551 $md5 = 822 $md5 =
552 join "\x00", 823 join "\x00",
553 $processversion, 824 $processversion,
554 map { 825 map {
555 Coro::cede; 826 cf::cede_to_tick;
556 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 827 ($src->[$_], Digest::MD5::md5_hex $data[$_])
557 } 0.. $#$src; 828 } 0.. $#$src;
558 829
559 830
560 my $dbmd5 = db_get cache => "$id/md5"; 831 my $dbmd5 = db_get cache => "$id/md5";
567 838
568 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
569 my $data = $process->(\@data); 840 my $data = $process->(\@data);
570 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
571 842
572 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
573 844
574 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
575 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
576 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
577 848
587 858
588=cut 859=cut
589 860
590sub datalog($@) { 861sub datalog($@) {
591 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
592 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
593} 864}
594 865
595=back 866=back
596 867
597=cut 868=cut
598 869
599############################################################################# 870#############################################################################
600 871
601=head2 ATTACHABLE OBJECTS 872=head2 ATTACHABLE OBJECTS
602 873
603Many objects in crossfire are so-called attachable objects. That means you can 874Many objects in deliantra are so-called attachable objects. That means you can
604attach callbacks/event handlers (a collection of which is called an "attachment") 875attach callbacks/event handlers (a collection of which is called an "attachment")
605to it. All such attachable objects support the following methods. 876to it. All such attachable objects support the following methods.
606 877
607In the following description, CLASS can be any of C<global>, C<object> 878In the following description, CLASS can be any of C<global>, C<object>
608C<player>, C<client> or C<map> (i.e. the attachable objects in 879C<player>, C<client> or C<map> (i.e. the attachable objects in
609Crossfire TRT). 880Deliantra).
610 881
611=over 4 882=over 4
612 883
613=item $attachable->attach ($attachment, key => $value...) 884=item $attachable->attach ($attachment, key => $value...)
614 885
658=item cf::CLASS::attachment $name, ... 929=item cf::CLASS::attachment $name, ...
659 930
660Register an attachment by C<$name> through which attachable objects of the 931Register an attachment by C<$name> through which attachable objects of the
661given CLASS can refer to this attachment. 932given CLASS can refer to this attachment.
662 933
663Some classes such as crossfire maps and objects can specify attachments 934Some classes such as deliantra maps and objects can specify attachments
664that are attached at load/instantiate time, thus the need for a name. 935that are attached at load/instantiate time, thus the need for a name.
665 936
666These calls expect any number of the following handler/hook descriptions: 937These calls expect any number of the following handler/hook descriptions:
667 938
668=over 4 939=over 4
792 1063
793 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
794 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
795 1066
796 } elsif (ref $type) { 1067 } elsif (ref $type) {
797 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
798 1069
799 } else { 1070 } else {
800 shift @arg; 1071 shift @arg;
801 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
802 } 1073 }
803 } 1074 }
804} 1075}
805 1076
806sub _object_attach { 1077sub _object_attach {
816 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
817 } 1088 }
818 1089
819 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
820 } else { 1091 } else {
821 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
822 } 1093 }
823 1094
824 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
825} 1096}
826 1097
866 "; 1137 ";
867 die if $@; 1138 die if $@;
868} 1139}
869 1140
870our $override; 1141our $override;
871our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1142our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
872 1143
873sub override { 1144sub override {
874 $override = 1; 1145 $override = 1;
875 @invoke_results = (); 1146 @INVOKE_RESULTS = (@_);
876} 1147}
877 1148
878sub do_invoke { 1149sub do_invoke {
879 my $event = shift; 1150 my $event = shift;
880 my $callbacks = shift; 1151 my $callbacks = shift;
881 1152
882 @invoke_results = (); 1153 @INVOKE_RESULTS = ();
883 1154
884 local $override; 1155 local $override;
885 1156
886 for (@$callbacks) { 1157 for (@$callbacks) {
887 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
888 1159
889 if ($@) { 1160 if ($@) {
890 warn "$@";
891 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
892 override; 1162 override;
893 } 1163 }
894 1164
895 return 1 if $override; 1165 return 1 if $override;
896 } 1166 }
897 1167
898 0 1168 0
899} 1169}
900 1170
901=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1171=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
902 1172
903=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1173=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
904 1174
905Generate an object-specific event with the given arguments. 1175Generate an object-specific event with the given arguments.
906 1176
907This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1177This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
908removed in future versions), and there is no public API to access override 1178removed in future versions), and there is no public API to access override
909results (if you must, access C<@cf::invoke_results> directly). 1179results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910 1180
911=back 1181=back
912 1182
913=cut 1183=cut
914 1184
915############################################################################# 1185#############################################################################
916# object support 1186# object support
1187
1188sub _object_equal($$);
1189sub _object_equal($$) {
1190 my ($a, $b) = @_;
1191
1192 return 0 unless (ref $a) eq (ref $b);
1193
1194 if ("HASH" eq ref $a) {
1195 my @ka = keys %$a;
1196 my @kb = keys %$b;
1197
1198 return 0 if @ka != @kb;
1199
1200 for (0 .. $#ka) {
1201 return 0 unless $ka[$_] eq $kb[$_];
1202 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1203 }
1204
1205 } elsif ("ARRAY" eq ref $a) {
1206
1207 return 0 if @$a != @$b;
1208
1209 for (0 .. $#$a) {
1210 return 0 unless _object_equal $a->[$_], $b->[$_];
1211 }
1212
1213 } elsif ($a ne $b) {
1214 return 0;
1215 }
1216
1217 1
1218}
1219
1220our $SLOW_MERGES;#d#
1221sub _can_merge {
1222 my ($ob1, $ob2) = @_;
1223
1224 ++$SLOW_MERGES;#d#
1225
1226 # we do the slow way here
1227 return _object_equal $ob1, $ob2
1228}
917 1229
918sub reattach { 1230sub reattach {
919 # basically do the same as instantiate, without calling instantiate 1231 # basically do the same as instantiate, without calling instantiate
920 my ($obj) = @_; 1232 my ($obj) = @_;
921 1233
1234 # no longer needed after getting rid of delete_package?
922 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1235 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
923 1236
924 my $registry = $obj->registry; 1237 my $registry = $obj->registry;
925 1238
926 @$registry = (); 1239 @$registry = ();
927 1240
932 for (@$attach) { 1245 for (@$attach) {
933 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
934 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
935 } 1248 }
936 } else { 1249 } else {
937 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
938 } 1251 }
939 } 1252 }
940} 1253}
941 1254
942cf::attachable->attach ( 1255cf::attachable->attach (
943 prio => -1000000, 1256 prio => -1000000,
944 on_instantiate => sub { 1257 on_instantiate => sub {
945 my ($obj, $data) = @_; 1258 my ($obj, $data) = @_;
946 1259
947 $data = from_json $data; 1260 $data = decode_json $data;
948 1261
949 for (@$data) { 1262 for (@$data) {
950 my ($name, $args) = @$_; 1263 my ($name, $args) = @$_;
951 1264
952 $obj->attach ($name, %{$args || {} }); 1265 $obj->attach ($name, %{$args || {} });
968sub object_freezer_save { 1281sub object_freezer_save {
969 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
970 1283
971 sync_job { 1284 sync_job {
972 if (length $$rdata) { 1285 if (length $$rdata) {
1286 utf8::decode (my $decname = $filename);
973 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
974 $filename, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
975 1290
976 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
977 chmod SAVE_MODE, $fh; 1292 aio_chmod $fh, SAVE_MODE;
978 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
979 aio_fsync $fh if $cf::USE_FSYNC; 1294 if ($cf::USE_FSYNC) {
1295 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;
1296 aio_fsync $fh;
1297 }
980 close $fh; 1298 aio_close $fh;
981 1299
982 if (@$objs) { 1300 if (@$objs) {
983 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1301 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
984 chmod SAVE_MODE, $fh; 1302 aio_chmod $fh, SAVE_MODE;
985 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
986 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
987 aio_fsync $fh if $cf::USE_FSYNC; 1305 if ($cf::USE_FSYNC) {
1306 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;
1307 aio_fsync $fh;
1308 }
988 close $fh; 1309 aio_close $fh;
989 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
990 } 1311 }
991 } else { 1312 } else {
992 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
993 } 1314 }
994 1315
995 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
996 } else { 1320 } else {
997 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
998 } 1322 }
999 } else { 1323 } else {
1000 aio_unlink $filename; 1324 aio_unlink $filename;
1001 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1002 } 1326 }
1003 } 1327 };
1004} 1328}
1005 1329
1006sub object_freezer_as_string { 1330sub object_freezer_as_string {
1007 my ($rdata, $objs) = @_; 1331 my ($rdata, $objs) = @_;
1008 1332
1020 or return; 1344 or return;
1021 1345
1022 unless (aio_stat "$filename.pst") { 1346 unless (aio_stat "$filename.pst") {
1023 (aio_load "$filename.pst", $av) >= 0 1347 (aio_load "$filename.pst", $av) >= 0
1024 or return; 1348 or return;
1349
1025 $av = eval { (Storable::thaw $av)->{objs} }; 1350 my $st = eval { Coro::Storable::thaw $av };
1351 $av = $st->{objs};
1026 } 1352 }
1027 1353
1354 utf8::decode (my $decname = $filename);
1028 warn sprintf "loading %s (%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1029 $filename, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1358
1030 return ($data, $av); 1359 ($data, $av)
1031} 1360}
1032 1361
1033=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1034 1363
1035=over 4 1364=over 4
1089 my ($name, $cb) = @_; 1418 my ($name, $cb) = @_;
1090 1419
1091 $EXTICMD{$name} = $cb; 1420 $EXTICMD{$name} = $cb;
1092} 1421}
1093 1422
1423use File::Glob ();
1424
1094cf::player->attach ( 1425cf::player->attach (
1095 on_command => sub { 1426 on_unknown_command => sub {
1096 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1097 1428
1098 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1099 or return; 1430 or return;
1100 1431
1108 my ($pl, $buf) = @_; 1439 my ($pl, $buf) = @_;
1109 1440
1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1441 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111 1442
1112 if (ref $msg) { 1443 if (ref $msg) {
1444 my ($type, $reply, @payload) =
1445 "ARRAY" eq ref $msg
1446 ? @$msg
1447 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1448
1449 my @reply;
1450
1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1451 if (my $cb = $EXTCMD{$type}) {
1114 if (my %reply = $cb->($pl, $msg)) { 1452 @reply = $cb->($pl, @payload);
1115 $pl->ext_reply ($msg->{msgid}, %reply);
1116 }
1117 } 1453 }
1454
1455 $pl->ext_reply ($reply, @reply)
1456 if $reply;
1457
1118 } else { 1458 } else {
1119 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120 } 1460 }
1121 1461
1122 cf::override; 1462 cf::override;
1123 }, 1463 },
1124); 1464);
1125 1465
1466# "readahead" all extensions
1467sub cache_extensions {
1468 my $grp = IO::AIO::aio_group;
1469
1470 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1471 for (grep /\.ext$/, @{$_[0]}) {
1472 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1473 }
1474 };
1475
1476 $grp
1477}
1478
1126sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1127 cf::sync_job { 1482 cf::sync_job {
1128 my %todo; 1483 my %todo;
1129 1484
1130 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1131 next unless -r $path; 1486 next unless -r $path;
1149 1504
1150 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1151 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1152 1507
1153 $ext{source} = 1508 $ext{source} =
1154 "package $pkg; use strict; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1155 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1156 . $source 1511 . $source
1157 . "\n};\n1"; 1512 . "\n};\n1";
1158 1513
1159 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1160 } 1515 }
1161 1516
1517 my $pass = 0;
1162 my %done; 1518 my %done;
1163 while (%todo) { 1519 while (%todo) {
1164 my $progress; 1520 my $progress;
1165 1521
1522 ++$pass;
1523
1524 ext:
1166 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1167 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1168 goto skip 1527 next ext
1169 unless exists $done{$_}; 1528 unless exists $done{$_};
1170 } 1529 }
1171 1530
1172 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1173 1532
1174 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1175 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1176 : "$v->{base}: extension inactive.\n";
1177 1537
1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1178 if (exists $v->{meta}{mandatory}) { 1539 if exists $v->{meta}{mandatory};
1179 warn $msg; 1540
1180 warn "mandatory extension failed to load, exiting.\n"; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1181 exit 1; 1542 delete $todo{$k};
1182 } 1543 } else {
1183 1544 $done{$k} = delete $todo{$k};
1184 warn $msg; 1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1185 } 1550 }
1186
1187 $done{$k} = delete $todo{$k};
1188 push @EXTS, $v->{pkg};
1189 $progress = 1;
1190 } 1551 }
1191 1552
1192 skip: 1553 unless ($progress) {
1193 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1194 unless $progress; 1555
1556 while (my ($k, $v) = each %todo) {
1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1558 if exists $v->{meta}{mandatory};
1559 }
1560
1561 last;
1562 }
1195 } 1563 }
1196 }; 1564 };
1197} 1565}
1198 1566
1199############################################################################# 1567#############################################################################
1200 1568
1201=back 1569=back
1202 1570
1203=head2 CORE EXTENSIONS 1571=head2 CORE EXTENSIONS
1204 1572
1205Functions and methods that extend core crossfire objects. 1573Functions and methods that extend core deliantra objects.
1206 1574
1207=cut 1575=cut
1208 1576
1209package cf::player; 1577package cf::player;
1210 1578
1211use Coro::AIO; 1579use Coro::AIO;
1212 1580
1213=head3 cf::player 1581=head3 cf::player
1214 1582
1215=over 4 1583=over 4
1584
1585=item cf::player::num_playing
1586
1587Returns the official number of playing players, as per the Crossfire metaserver rules.
1588
1589=cut
1590
1591sub num_playing {
1592 scalar grep
1593 $_->ob->map
1594 && !$_->hidden
1595 && !$_->ob->flag (cf::FLAG_WIZ),
1596 cf::player::list
1597}
1216 1598
1217=item cf::player::find $login 1599=item cf::player::find $login
1218 1600
1219Returns the given player object, loading it if necessary (might block). 1601Returns the given player object, loading it if necessary (might block).
1220 1602
1239 1621
1240sub exists($) { 1622sub exists($) {
1241 my ($login) = @_; 1623 my ($login) = @_;
1242 1624
1243 $cf::PLAYER{$login} 1625 $cf::PLAYER{$login}
1244 or cf::sync_job { !aio_stat path $login } 1626 or !aio_stat path $login
1245} 1627}
1246 1628
1247sub find($) { 1629sub find($) {
1248 return $cf::PLAYER{$_[0]} || do { 1630 return $cf::PLAYER{$_[0]} || do {
1249 my $login = $_[0]; 1631 my $login = $_[0];
1256 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1638 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1257 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1639 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1258 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1640 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1259 aio_unlink +(playerdir $login) . "/$login.pl"; 1641 aio_unlink +(playerdir $login) . "/$login.pl";
1260 1642
1261 my $pl = load_pl path $login 1643 my $f = new_from_file cf::object::thawer path $login
1262 or return; 1644 or return;
1645
1646 my $pl = cf::player::load_pl $f
1647 or return;
1648
1649 local $cf::PLAYER_LOADING{$login} = $pl;
1650 $f->resolve_delayed_derefs;
1263 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1264 } 1652 }
1265 } 1653 }
1266} 1654}
1655
1656cf::player->attach (
1657 on_load => sub {
1658 my ($pl, $path) = @_;
1659
1660 # restore slots saved in save, below
1661 my $slots = delete $pl->{_slots};
1662
1663 $pl->ob->current_weapon ($slots->[0]);
1664 $pl->combat_ob ($slots->[1]);
1665 $pl->ranged_ob ($slots->[2]);
1666 },
1667);
1267 1668
1268sub save($) { 1669sub save($) {
1269 my ($pl) = @_; 1670 my ($pl) = @_;
1270 1671
1271 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1276 return if $pl->{deny_save}; 1677 return if $pl->{deny_save};
1277 1678
1278 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1279 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1280 1681
1682 cf::get_slot 0.01;
1683
1684 # save slots, to be restored later
1685 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1686
1281 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1282 Coro::cede; 1688 cf::cede_to_tick;
1283} 1689}
1284 1690
1285sub new($) { 1691sub new($) {
1286 my ($login) = @_; 1692 my ($login) = @_;
1287 1693
1293 $cf::PLAYER{$login} = $self; 1699 $cf::PLAYER{$login} = $self;
1294 1700
1295 $self 1701 $self
1296} 1702}
1297 1703
1704=item $player->send_msg ($channel, $msg, $color, [extra...])
1705
1706=cut
1707
1708sub send_msg {
1709 my $ns = shift->ns
1710 or return;
1711 $ns->send_msg (@_);
1712}
1713
1298=item $pl->quit_character 1714=item $pl->quit_character
1299 1715
1300Nukes the player without looking back. If logged in, the connection will 1716Nukes the player without looking back. If logged in, the connection will
1301be destroyed. May block for a long time. 1717be destroyed. May block for a long time.
1302 1718
1306 my ($pl) = @_; 1722 my ($pl) = @_;
1307 1723
1308 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1309 1725
1310 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1311 $pl->password ("*"); # this should lock out the player until we nuked the dir 1727 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1312 1728
1313 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1314 $pl->deactivate; 1730 $pl->deactivate;
1731
1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1315 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1316 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1317 1737
1318 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1319 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1320 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1355 or return []; 1775 or return [];
1356 1776
1357 my @logins; 1777 my @logins;
1358 1778
1359 for my $login (@$dirs) { 1779 for my $login (@$dirs) {
1780 my $path = path $login;
1781
1782 # a .pst is a dead give-away for a valid player
1783 # if no pst file found, open and chekc for blocked users
1784 if (aio_stat "$path.pst") {
1360 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1785 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1361 aio_read $fh, 0, 512, my $buf, 0 or next; 1786 aio_read $fh, 0, 512, my $buf, 0 or next;
1362 $buf !~ /^password -------------$/m or next; # official not-valid tag 1787 $buf !~ /^password -------------$/m or next; # official not-valid tag
1788 }
1363 1789
1364 utf8::decode $login; 1790 utf8::decode $login;
1365 push @logins, $login; 1791 push @logins, $login;
1366 } 1792 }
1367 1793
1368 \@logins 1794 \@logins
1369} 1795}
1370 1796
1371=item $player->maps 1797=item $player->maps
1798
1799=item cf::player::maps $login
1372 1800
1373Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1374player. May block. 1802player. May block.
1375 1803
1376=cut 1804=cut
1394 } 1822 }
1395 1823
1396 \@paths 1824 \@paths
1397} 1825}
1398 1826
1399=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1827=item $protocol_xml = $player->expand_cfpod ($cfpod)
1400 1828
1401Expand crossfire pod fragments into protocol xml. 1829Expand deliantra pod fragments into protocol xml.
1402 1830
1403=cut
1404
1405sub expand_cfpod {
1406 ((my $self), (local $_)) = @_;
1407
1408 # escape & and <
1409 s/&/&amp;/g;
1410 s/(?<![BIUGH])</&lt;/g;
1411
1412 # this is buggy, it needs to properly take care of nested <'s
1413
1414 1 while
1415 # replace B<>, I<>, U<> etc.
1416 s/B<([^\>]*)>/<b>$1<\/b>/
1417 || s/I<([^\>]*)>/<i>$1<\/i>/
1418 || s/U<([^\>]*)>/<u>$1<\/u>/
1419 # replace G<male|female> tags
1420 || s{G<([^>|]*)\|([^>]*)>}{
1421 $self->gender ? $2 : $1
1422 }ge
1423 # replace H<hint text>
1424 || s{H<([^\>]*)>}
1425 {
1426 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1427 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1428 "")
1429 [$self->{hintmode}]
1430 }ge;
1431
1432 # create single paragraphs (very hackish)
1433 s/(?<=\S)\n(?=\w)/ /g;
1434
1435 # compress some whitespace
1436 s/\s+\n/\n/g; # ws line-ends
1437 s/\n\n+/\n/g; # double lines
1438 s/^\n+//; # beginning lines
1439 s/\n+$//; # ending lines
1440
1441 $_
1442}
1443
1444sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode}
1447}
1448
1449=item $player->ext_reply ($msgid, %msg) 1831=item $player->ext_reply ($msgid, @msg)
1450 1832
1451Sends an ext reply to the player. 1833Sends an ext reply to the player.
1452 1834
1453=cut 1835=cut
1454 1836
1455sub ext_reply($$%) { 1837sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1838 my ($self, $id, @msg) = @_;
1457 1839
1458 $msg{msgid} = $id; 1840 $self->ns->ext_reply ($id, @msg)
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460} 1841}
1461 1842
1462=item $player->ext_event ($type, %msg) 1843=item $player->ext_msg ($type, @msg)
1463 1844
1464Sends an ext event to the client. 1845Sends an ext event to the client.
1465 1846
1466=cut 1847=cut
1467 1848
1468sub ext_event($$%) { 1849sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1850 my ($self, $type, @msg) = @_;
1470 1851
1471 $self->ns->ext_event ($type, %msg); 1852 $self->ns->ext_msg ($type, @msg);
1472} 1853}
1473 1854
1474=head3 cf::region 1855=head3 cf::region
1475 1856
1476=over 4 1857=over 4
1486=cut 1867=cut
1487 1868
1488sub find_by_path($) { 1869sub find_by_path($) {
1489 my ($path) = @_; 1870 my ($path) = @_;
1490 1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1873
1491 my ($match, $specificity); 1874 my ($match, $specificity);
1492 1875
1493 for my $region (list) { 1876 for my $region (list) {
1494 if ($region->match && $path =~ $region->match) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1495 ($match, $specificity) = ($region, $region->specificity) 1878 ($match, $specificity) = ($region, $region->specificity)
1496 if $region->specificity > $specificity; 1879 if $region->specificity > $specificity;
1497 } 1880 }
1498 } 1881 }
1499 1882
1520our $MAX_RESET = 3600; 1903our $MAX_RESET = 3600;
1521our $DEFAULT_RESET = 3000; 1904our $DEFAULT_RESET = 3000;
1522 1905
1523sub generate_random_map { 1906sub generate_random_map {
1524 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1525 # mit "rum" bekleckern, nicht 1908
1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1910
1526 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1527 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1528 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1529 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1530 $rmp->{exit_on_final_map},
1531 $rmp->{xsize}, $rmp->{ysize},
1532 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1533 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1534 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1535 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1536 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1537 (cf::region::find $rmp->{region}), $rmp->{custom}
1538 )
1539} 1912}
1540 1913
1541=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1542 1915
1543Register a handler for the map path matching the given regex at the 1916Register a handler for the map path matching the given regex at the
1548 1921
1549sub register { 1922sub register {
1550 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1551 my $pkg = caller; 1924 my $pkg = caller;
1552 1925
1553 no strict;
1554 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1555 1927
1556 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1557} 1929}
1558 1930
1559# also paths starting with '/' 1931# also paths starting with '/'
1560$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1561 1933
1562sub thawer_merge { 1934sub thawer_merge {
1563 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1564 1936
1565 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1570} 1942}
1571 1943
1572sub normalise { 1944sub normalise {
1573 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1574 1946
1575 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1576 1948
1577 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1578 1950
1579 # map plan: 1951 # map plan:
1580 # 1952 #
1582 # {... are special paths that are not being touched 1954 # {... are special paths that are not being touched
1583 # ?xxx/... are special absolute paths 1955 # ?xxx/... are special absolute paths
1584 # ?random/... random maps 1956 # ?random/... random maps
1585 # /... normal maps 1957 # /... normal maps
1586 # ~user/... per-player map of a specific user 1958 # ~user/... per-player map of a specific user
1959 # !up !down for quad maps, or other maps with up/down layers
1587 1960
1588 $path =~ s/$PATH_SEP/\//go; 1961 $path =~ s/$PATH_SEP/\//go;
1589 1962
1590 # treat it as relative path if it starts with 1963 # treat it as relative path if it starts with
1591 # something that looks reasonable 1964 # something that looks reasonable
1592 if ($path =~ m{^(?:\./|\.\./|\w)}) { 1965 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1593 $base or Carp::carp "normalise called with relative path and no base: '$path'"; 1966 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1594 1967
1595 $base =~ s{[^/]+/?$}{}; 1968 $base =~ s{[^/]+/?$}{};
1596 $path = "$base/$path"; 1969 $path = "$base/$path";
1970
1971 } elsif ($path eq '!up') {
1972 $base && ref $base
1973 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1974
1975 my $uppth = $base->tile_path (cf::TILE_UP);
1976 $path = $uppth if $uppth;
1977
1978 } elsif ($path eq '!down') {
1979 $base && ref $base
1980 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1981
1982 my $dpth = $base->tile_path (cf::TILE_DOWN);
1983 $path = $dpth if $dpth;
1597 } 1984 }
1598 1985
1599 for ($path) { 1986 for ($path) {
1600 redo if s{//}{/};
1601 redo if s{/\.?/}{/}; 1987 redo if s{/\.?/}{/};
1602 redo if s{/[^/]+/\.\./}{/}; 1988 redo if s{/[^/]+/\.\./}{/};
1603 } 1989 }
1604 1990
1605 $path 1991 $path
1619 $self->init; # pass $1 etc. 2005 $self->init; # pass $1 etc.
1620 return $self; 2006 return $self;
1621 } 2007 }
1622 } 2008 }
1623 2009
1624 Carp::carp "unable to resolve path '$path' (base '$base')."; 2010 Carp::cluck "unable to resolve path '$path' (base '$base')";
1625 () 2011 ()
1626} 2012}
1627 2013
2014# may re-bless or do other evil things
1628sub init { 2015sub init {
1629 my ($self) = @_; 2016 my ($self) = @_;
1630 2017
1631 $self 2018 $self
1632} 2019}
1651 2038
1652# the temporary/swap location 2039# the temporary/swap location
1653sub save_path { 2040sub save_path {
1654 my ($self) = @_; 2041 my ($self) = @_;
1655 2042
1656 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2043 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1657 "$TMPDIR/$path.map" 2044 "$TMPDIR/$path.map"
1658} 2045}
1659 2046
1660# the unique path, undef == no special unique path 2047# the unique path, undef == no special unique path
1661sub uniq_path { 2048sub uniq_path {
1662 my ($self) = @_; 2049 my ($self) = @_;
1663 2050
1664 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2051 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1665 "$UNIQUEDIR/$path" 2052 "$UNIQUEDIR/$path"
1666}
1667
1668# and all this just because we cannot iterate over
1669# all maps in C++...
1670sub change_all_map_light {
1671 my ($change) = @_;
1672
1673 $_->change_map_light ($change)
1674 for grep $_->outdoor, values %cf::MAP;
1675} 2053}
1676 2054
1677sub decay_objects { 2055sub decay_objects {
1678 my ($self) = @_; 2056 my ($self) = @_;
1679 2057
1692 2070
1693sub load_header_from($) { 2071sub load_header_from($) {
1694 my ($self, $path) = @_; 2072 my ($self, $path) = @_;
1695 2073
1696 utf8::encode $path; 2074 utf8::encode $path;
1697 #aio_open $path, O_RDONLY, 0 2075 my $f = new_from_file cf::object::thawer $path
1698 # or return;
1699
1700 $self->_load_header ($path)
1701 or return; 2076 or return;
1702 2077
2078 $self->_load_header ($f)
2079 or return;
2080
2081 local $MAP_LOADING{$self->{path}} = $self;
2082 $f->resolve_delayed_derefs;
2083
1703 $self->{load_path} = $path; 2084 $self->{load_path} = $path;
1704 2085
1705 1 2086 1
1706} 2087}
1707 2088
2089# used to laod the header of an original map
1708sub load_header_orig { 2090sub load_header_orig {
1709 my ($self) = @_; 2091 my ($self) = @_;
1710 2092
1711 $self->load_header_from ($self->load_path) 2093 $self->load_header_from ($self->load_path)
1712} 2094}
1713 2095
2096# used to laod the header of an instantiated map
1714sub load_header_temp { 2097sub load_header_temp {
1715 my ($self) = @_; 2098 my ($self) = @_;
1716 2099
1717 $self->load_header_from ($self->save_path) 2100 $self->load_header_from ($self->save_path)
1718} 2101}
1719 2102
2103# called after loading the header from an instantiated map
1720sub prepare_temp { 2104sub prepare_temp {
1721 my ($self) = @_; 2105 my ($self) = @_;
1722 2106
1723 $self->last_access ((delete $self->{last_access}) 2107 $self->last_access ((delete $self->{last_access})
1724 || $cf::RUNTIME); #d# 2108 || $cf::RUNTIME); #d#
1725 # safety 2109 # safety
1726 $self->{instantiate_time} = $cf::RUNTIME 2110 $self->{instantiate_time} = $cf::RUNTIME
1727 if $self->{instantiate_time} > $cf::RUNTIME; 2111 if $self->{instantiate_time} > $cf::RUNTIME;
1728} 2112}
1729 2113
2114# called after loading the header from an original map
1730sub prepare_orig { 2115sub prepare_orig {
1731 my ($self) = @_; 2116 my ($self) = @_;
1732 2117
1733 $self->{load_original} = 1; 2118 $self->{load_original} = 1;
1734 $self->{instantiate_time} = $cf::RUNTIME; 2119 $self->{instantiate_time} = $cf::RUNTIME;
1758 2143
1759sub find; 2144sub find;
1760sub find { 2145sub find {
1761 my ($path, $origin) = @_; 2146 my ($path, $origin) = @_;
1762 2147
2148 cf::cede_to_tick;
2149
1763 $path = normalise $path, $origin && $origin->path; 2150 $path = normalise $path, $origin;
1764 2151
2152 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1765 cf::lock_wait "map_find:$path"; 2153 my $guard2 = cf::lock_acquire "map_find:$path";
1766 2154
1767 $cf::MAP{$path} || do { 2155 $cf::MAP{$path} || do {
1768 my $guard = cf::lock_acquire "map_find:$path";
1769 my $map = new_from_path cf::map $path 2156 my $map = new_from_path cf::map $path
1770 or return; 2157 or return;
1771 2158
1772 $map->{last_save} = $cf::RUNTIME; 2159 $map->{last_save} = $cf::RUNTIME;
1773 2160
1775 or return; 2162 or return;
1776 2163
1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2164 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778 # doing this can freeze the server in a sync job, obviously 2165 # doing this can freeze the server in a sync job, obviously
1779 #$cf::WAIT_FOR_TICK->wait; 2166 #$cf::WAIT_FOR_TICK->wait;
2167 undef $guard2;
2168 undef $guard1;
1780 $map->reset; 2169 $map->reset;
1781 undef $guard;
1782 return find $path; 2170 return find $path;
1783 } 2171 }
1784 2172
1785 $cf::MAP{$path} = $map 2173 $cf::MAP{$path} = $map
1786 } 2174 }
1787} 2175}
1788 2176
1789sub pre_load { } 2177sub pre_load { }
1790sub post_load { } 2178#sub post_load { } # XS
1791 2179
1792sub load { 2180sub load {
1793 my ($self) = @_; 2181 my ($self) = @_;
1794 2182
1795 local $self->{deny_reset} = 1; # loading can take a long time 2183 local $self->{deny_reset} = 1; # loading can take a long time
1796 2184
1797 my $path = $self->{path}; 2185 my $path = $self->{path};
1798 2186
1799 { 2187 {
1800 my $guard = cf::lock_acquire "map_load:$path"; 2188 my $guard = cf::lock_acquire "map_data:$path";
1801 2189
2190 return unless $self->valid;
1802 return if $self->in_memory != cf::MAP_SWAPPED; 2191 return unless $self->in_memory == cf::MAP_SWAPPED;
1803 2192
1804 $self->in_memory (cf::MAP_LOADING); 2193 $self->in_memory (cf::MAP_LOADING);
1805 2194
1806 $self->alloc; 2195 $self->alloc;
1807 2196
1808 $self->pre_load; 2197 $self->pre_load;
1809 Coro::cede; 2198 cf::cede_to_tick;
1810 2199
1811 $self->_load_objects ($self->{load_path}, 1) 2200 if (exists $self->{load_path}) {
2201 my $f = new_from_file cf::object::thawer $self->{load_path};
2202 $f->skip_block;
2203 $self->_load_objects ($f)
1812 or return; 2204 or return;
1813 2205
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2206 $self->post_load_original
1815 if delete $self->{load_original}; 2207 if delete $self->{load_original};
1816 2208
1817 if (my $uniq = $self->uniq_path) { 2209 if (my $uniq = $self->uniq_path) {
1818 utf8::encode $uniq; 2210 utf8::encode $uniq;
1819 if (aio_open $uniq, O_RDONLY, 0) { 2211 unless (aio_stat $uniq) {
2212 if (my $f = new_from_file cf::object::thawer $uniq) {
1820 $self->clear_unique_items; 2213 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 2214 $self->_load_objects ($f);
2215 $f->resolve_delayed_derefs;
2216 }
2217 }
1822 } 2218 }
1823 }
1824 2219
1825 Coro::cede; 2220 $f->resolve_delayed_derefs;
2221 } else {
2222 $self->post_load_original
2223 if delete $self->{load_original};
2224 }
2225
2226 cf::cede_to_tick;
1826 # now do the right thing for maps 2227 # now do the right thing for maps
1827 $self->link_multipart_objects; 2228 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 2229 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 2230 unless $self->difficulty;
1830 Coro::cede; 2231 cf::cede_to_tick;
1831 2232
1832 unless ($self->{deny_activate}) { 2233 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 2234 $self->decay_objects;
1834 $self->fix_auto_apply; 2235 $self->fix_auto_apply;
1835 $self->update_buttons; 2236 $self->update_buttons;
1836 Coro::cede; 2237 cf::cede_to_tick;
1837 $self->set_darkness_map;
1838 Coro::cede;
1839 $self->activate; 2238 $self->activate;
1840 } 2239 }
1841 2240
2241 $self->{last_save} = $cf::RUNTIME;
2242 $self->last_access ($cf::RUNTIME);
2243
1842 $self->in_memory (cf::MAP_IN_MEMORY); 2244 $self->in_memory (cf::MAP_ACTIVE);
1843 } 2245 }
1844 2246
1845 $self->post_load; 2247 $self->post_load;
1846}
1847 2248
2249 1
2250}
2251
2252# customize the map for a given player, i.e.
2253# return the _real_ map. used by e.g. per-player
2254# maps to change the path to ~playername/mappath
1848sub customise_for { 2255sub customise_for {
1849 my ($self, $ob) = @_; 2256 my ($self, $ob) = @_;
1850 2257
1851 return find "~" . $ob->name . "/" . $self->{path} 2258 return find "~" . $ob->name . "/" . $self->{path}
1852 if $self->per_player; 2259 if $self->per_player;
1856 2263
1857 $self 2264 $self
1858} 2265}
1859 2266
1860# find and load all maps in the 3x3 area around a map 2267# find and load all maps in the 3x3 area around a map
1861sub load_diag { 2268sub load_neighbours {
1862 my ($map) = @_; 2269 my ($map) = @_;
1863 2270
1864 my @diag; # diagonal neighbours 2271 my @neigh; # diagonal neighbours
1865 2272
1866 for (0 .. 3) { 2273 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 2274 my $neigh = $map->tile_path ($_)
1868 or next; 2275 or next;
1869 $neigh = find $neigh, $map 2276 $neigh = find $neigh, $map
1870 or next; 2277 or next;
1871 $neigh->load; 2278 $neigh->load;
1872 2279
2280 # now find the diagonal neighbours
2281 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2282 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2283 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 2284 }
1876 2285
1877 for (@diag) { 2286 for (grep defined $_->[0], @neigh) {
2287 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 2288 my $neigh = find $path, $origin
1879 or next; 2289 or next;
1880 $neigh->load; 2290 $neigh->load;
1881 } 2291 }
1882} 2292}
1883 2293
1884sub find_sync { 2294sub find_sync {
1885 my ($path, $origin) = @_; 2295 my ($path, $origin) = @_;
1886 2296
1887 cf::sync_job { find $path, $origin } 2297 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2298 if $Coro::current == $Coro::main;
2299
2300 find $path, $origin
1888} 2301}
1889 2302
1890sub do_load_sync { 2303sub do_load_sync {
1891 my ($map) = @_; 2304 my ($map) = @_;
1892 2305
1893 cf::sync_job { $map->load }; 2306 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2307 if $Coro::current == $Coro::main;
2308
2309 $map->load;
1894} 2310}
1895 2311
1896our %MAP_PREFETCH; 2312our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 2313our $MAP_PREFETCHER = undef;
1898 2314
1899sub find_async { 2315sub find_async {
1900 my ($path, $origin) = @_; 2316 my ($path, $origin, $load) = @_;
1901 2317
1902 $path = normalise $path, $origin && $origin->{path}; 2318 $path = normalise $path, $origin;
1903 2319
1904 if (my $map = $cf::MAP{$path}) { 2320 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2321 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1906 } 2322 }
1907 2323
1908 undef $MAP_PREFETCH{$path}; 2324 $MAP_PREFETCH{$path} |= $load;
2325
1909 $MAP_PREFETCHER ||= cf::async { 2326 $MAP_PREFETCHER ||= cf::async {
2327 $Coro::current->{desc} = "map prefetcher";
2328
1910 while (%MAP_PREFETCH) { 2329 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 2330 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 my $map = find $path 2331 if (my $map = find $k) {
1913 or next;
1914 $map->load; 2332 $map->load if $v;
2333 }
1915 2334
1916 delete $MAP_PREFETCH{$path}; 2335 delete $MAP_PREFETCH{$k};
1917 } 2336 }
1918 } 2337 }
1919 undef $MAP_PREFETCHER; 2338 undef $MAP_PREFETCHER;
1920 }; 2339 };
1921 $MAP_PREFETCHER->prio (6); 2340 $MAP_PREFETCHER->prio (6);
1922 2341
1923 () 2342 ()
1924} 2343}
1925 2344
2345# common code, used by both ->save and ->swapout
1926sub save { 2346sub _save {
1927 my ($self) = @_; 2347 my ($self) = @_;
1928
1929 my $lock = cf::lock_acquire "map_data:" . $self->path;
1930 2348
1931 $self->{last_save} = $cf::RUNTIME; 2349 $self->{last_save} = $cf::RUNTIME;
1932 2350
1933 return unless $self->dirty; 2351 return unless $self->dirty;
1934 2352
1940 return if $self->{deny_save}; 2358 return if $self->{deny_save};
1941 2359
1942 local $self->{last_access} = $self->last_access;#d# 2360 local $self->{last_access} = $self->last_access;#d#
1943 2361
1944 cf::async { 2362 cf::async {
2363 $Coro::current->{desc} = "map player save";
1945 $_->contr->save for $self->players; 2364 $_->contr->save for $self->players;
1946 }; 2365 };
2366
2367 cf::get_slot 0.02;
1947 2368
1948 if ($uniq) { 2369 if ($uniq) {
1949 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2370 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1950 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2371 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1951 } else { 2372 } else {
1952 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2373 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1953 } 2374 }
1954} 2375}
1955 2376
2377sub save {
2378 my ($self) = @_;
2379
2380 my $lock = cf::lock_acquire "map_data:$self->{path}";
2381
2382 $self->_save;
2383}
2384
1956sub swap_out { 2385sub swap_out {
1957 my ($self) = @_; 2386 my ($self) = @_;
1958 2387
1959 # save first because save cedes
1960 $self->save;
1961
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2388 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2389
2390 return if $self->in_memory != cf::MAP_ACTIVE;
2391 return if $self->{deny_save};
1964 return if $self->players; 2392 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY;
1966 return if $self->{deny_save};
1967 2393
2394 # first deactivate the map and "unlink" it from the core
2395 $self->deactivate;
2396 $_->clear_links_to ($self) for values %cf::MAP;
2397 $self->in_memory (cf::MAP_SWAPPED);
2398
2399 # then atomically save
2400 $self->_save;
2401
2402 # then free the map
1968 $self->clear; 2403 $self->clear;
1969 $self->in_memory (cf::MAP_SWAPPED);
1970} 2404}
1971 2405
1972sub reset_at { 2406sub reset_at {
1973 my ($self) = @_; 2407 my ($self) = @_;
1974 2408
1992 2426
1993 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2427 my $lock = cf::lock_acquire "map_data:$self->{path}";
1994 2428
1995 return if $self->players; 2429 return if $self->players;
1996 2430
1997 warn "resetting map ", $self->path; 2431 cf::trace "resetting map ", $self->path, "\n";
1998 2432
1999 $self->in_memory (cf::MAP_SWAPPED); 2433 $self->in_memory (cf::MAP_SWAPPED);
2000 2434
2001 # need to save uniques path 2435 # need to save uniques path
2002 unless ($self->{deny_save}) { 2436 unless ($self->{deny_save}) {
2006 if $uniq; 2440 if $uniq;
2007 } 2441 }
2008 2442
2009 delete $cf::MAP{$self->path}; 2443 delete $cf::MAP{$self->path};
2010 2444
2445 $self->deactivate;
2446 $_->clear_links_to ($self) for values %cf::MAP;
2011 $self->clear; 2447 $self->clear;
2012
2013 $_->clear_links_to ($self) for values %cf::MAP;
2014 2448
2015 $self->unlink_save; 2449 $self->unlink_save;
2016 $self->destroy; 2450 $self->destroy;
2017} 2451}
2018 2452
2019my $nuke_counter = "aaaa"; 2453my $nuke_counter = "aaaa";
2020 2454
2021sub nuke { 2455sub nuke {
2022 my ($self) = @_; 2456 my ($self) = @_;
2023 2457
2458 {
2459 my $lock = cf::lock_acquire "map_data:$self->{path}";
2460
2024 delete $cf::MAP{$self->path}; 2461 delete $cf::MAP{$self->path};
2025 2462
2026 $self->unlink_save; 2463 $self->unlink_save;
2027 2464
2028 bless $self, "cf::map"; 2465 bless $self, "cf::map::wrap";
2029 delete $self->{deny_reset}; 2466 delete $self->{deny_reset};
2030 $self->{deny_save} = 1; 2467 $self->{deny_save} = 1;
2031 $self->reset_timeout (1); 2468 $self->reset_timeout (1);
2032 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2469 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033 2470
2034 $cf::MAP{$self->path} = $self; 2471 $cf::MAP{$self->path} = $self;
2472 }
2035 2473
2036 $self->reset; # polite request, might not happen 2474 $self->reset; # polite request, might not happen
2037} 2475}
2038 2476
2039=item $maps = cf::map::tmp_maps 2477=item $maps = cf::map::tmp_maps
2081 2519
2082sub unique_maps() { 2520sub unique_maps() {
2083 [ 2521 [
2084 map { 2522 map {
2085 utf8::decode $_; 2523 utf8::decode $_;
2086 /\.map$/ 2524 s/\.map$//; # TODO future compatibility hack
2525 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2526 ? ()
2087 ? normalise $_ 2527 : normalise $_
2088 : ()
2089 } @{ aio_readdir $UNIQUEDIR or [] } 2528 } @{ aio_readdir $UNIQUEDIR or [] }
2090 ] 2529 ]
2091} 2530}
2092 2531
2093package cf; 2532=item cf::map::static_maps
2533
2534Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2535file in the shared directory excluding F</styles> and F</editor>). May
2536block.
2537
2538=cut
2539
2540sub static_maps() {
2541 my @dirs = "";
2542 my @maps;
2543
2544 while (@dirs) {
2545 my $dir = shift @dirs;
2546
2547 next if $dir eq "/styles" || $dir eq "/editor";
2548
2549 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2550 or return;
2551
2552 for (@$files) {
2553 s/\.map$// or next;
2554 utf8::decode $_;
2555 push @maps, "$dir/$_";
2556 }
2557
2558 push @dirs, map "$dir/$_", @$dirs;
2559 }
2560
2561 \@maps
2562}
2094 2563
2095=back 2564=back
2096 2565
2097=head3 cf::object 2566=head3 cf::object
2098 2567
2102 2571
2103=over 4 2572=over 4
2104 2573
2105=item $ob->inv_recursive 2574=item $ob->inv_recursive
2106 2575
2107Returns the inventory of the object _and_ their inventories, recursively. 2576Returns the inventory of the object I<and> their inventories, recursively,
2577but I<not> the object itself.
2108 2578
2109=cut 2579=cut
2110 2580
2111sub inv_recursive_; 2581sub inv_recursive_;
2112sub inv_recursive_ { 2582sub inv_recursive_ {
2115 2585
2116sub inv_recursive { 2586sub inv_recursive {
2117 inv_recursive_ inv $_[0] 2587 inv_recursive_ inv $_[0]
2118} 2588}
2119 2589
2590=item $ref = $ob->ref
2591
2592Creates and returns a persistent reference to an object that can be stored as a string.
2593
2594=item $ob = cf::object::deref ($refstring)
2595
2596returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2597even if the object actually exists. May block.
2598
2599=cut
2600
2601sub deref {
2602 my ($ref) = @_;
2603
2604 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2605 my ($uuid, $name) = ($1, $2);
2606 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2607 or return;
2608 $pl->ob->uuid eq $uuid
2609 or return;
2610
2611 $pl->ob
2612 } else {
2613 warn "$ref: cannot resolve object reference\n";
2614 undef
2615 }
2616}
2617
2120package cf; 2618package cf;
2121 2619
2122=back 2620=back
2123 2621
2124=head3 cf::object::player 2622=head3 cf::object::player
2130Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2628Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2131can be C<undef>. Does the right thing when the player is currently in a 2629can be C<undef>. Does the right thing when the player is currently in a
2132dialogue with the given NPC character. 2630dialogue with the given NPC character.
2133 2631
2134=cut 2632=cut
2633
2634our $SAY_CHANNEL = {
2635 id => "say",
2636 title => "Map",
2637 reply => "say ",
2638 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2639};
2640
2641our $CHAT_CHANNEL = {
2642 id => "chat",
2643 title => "Chat",
2644 reply => "chat ",
2645 tooltip => "Player chat and shouts, global to the server.",
2646};
2135 2647
2136# rough implementation of a future "reply" method that works 2648# rough implementation of a future "reply" method that works
2137# with dialog boxes. 2649# with dialog boxes.
2138#TODO: the first argument must go, split into a $npc->reply_to ( method 2650#TODO: the first argument must go, split into a $npc->reply_to ( method
2139sub cf::object::player::reply($$$;$) { 2651sub cf::object::player::reply($$$;$) {
2146 2658
2147 } else { 2659 } else {
2148 my $pl = $self->contr; 2660 my $pl = $self->contr;
2149 2661
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2662 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2663 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2664 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2665
2159 } else { 2666 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2667 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2668 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2162 } 2669 }
2163 } 2670 }
2671}
2672
2673=item $object->send_msg ($channel, $msg, $color, [extra...])
2674
2675=cut
2676
2677sub cf::object::send_msg {
2678 my $pl = shift->contr
2679 or return;
2680 $pl->send_msg (@_);
2164} 2681}
2165 2682
2166=item $player_object->may ("access") 2683=item $player_object->may ("access")
2167 2684
2168Returns wether the given player is authorized to access resource "access" 2685Returns wether the given player is authorized to access resource "access"
2181 2698
2182=item $player_object->enter_link 2699=item $player_object->enter_link
2183 2700
2184Freezes the player and moves him/her to a special map (C<{link}>). 2701Freezes the player and moves him/her to a special map (C<{link}>).
2185 2702
2186The player should be reasonably safe there for short amounts of time. You 2703The player should be reasonably safe there for short amounts of time (e.g.
2187I<MUST> call C<leave_link> as soon as possible, though. 2704for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2705though, as the player cannot control the character while it is on the link
2706map.
2188 2707
2189Will never block. 2708Will never block.
2190 2709
2191=item $player_object->leave_link ($map, $x, $y) 2710=item $player_object->leave_link ($map, $x, $y)
2192 2711
2212sub cf::object::player::enter_link { 2731sub cf::object::player::enter_link {
2213 my ($self) = @_; 2732 my ($self) = @_;
2214 2733
2215 $self->deactivate_recursive; 2734 $self->deactivate_recursive;
2216 2735
2736 ++$self->{_link_recursion};
2737
2217 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2738 return if UNIVERSAL::isa $self->map, "ext::map_link";
2218 2739
2219 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2740 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2220 if $self->map && $self->map->{path} ne "{link}"; 2741 if $self->map && $self->map->{path} ne "{link}";
2221 2742
2222 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2743 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2223} 2744}
2224 2745
2225sub cf::object::player::leave_link { 2746sub cf::object::player::leave_link {
2226 my ($self, $map, $x, $y) = @_; 2747 my ($self, $map, $x, $y) = @_;
2227 2748
2244 ($x, $y) = (-1, -1) 2765 ($x, $y) = (-1, -1)
2245 unless (defined $x) && (defined $y); 2766 unless (defined $x) && (defined $y);
2246 2767
2247 # use -1 or undef as default coordinates, not 0, 0 2768 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2769 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2770 if $x <= 0 && $y <= 0;
2250 2771
2251 $map->load; 2772 $map->load;
2252 $map->load_diag; 2773 $map->load_neighbours;
2253 2774
2254 return unless $self->contr->active; 2775 return unless $self->contr->active;
2255 $self->activate_recursive;
2256 2776
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2777 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258 $self->enter_map ($map, $x, $y); 2778 if ($self->enter_map ($map, $x, $y)) {
2259} 2779 # entering was successful
2780 delete $self->{_link_recursion};
2781 # only activate afterwards, to support waiting in hooks
2782 $self->activate_recursive;
2783 }
2260 2784
2785}
2786
2261=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2787=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2262 2788
2263Moves the player to the given map-path and coordinates by first freezing 2789Moves the player to the given map-path and coordinates by first freezing
2264her, loading and preparing them map, calling the provided $check callback 2790her, loading and preparing them map, calling the provided $check callback
2265that has to return the map if sucecssful, and then unfreezes the player on 2791that has to return the map if sucecssful, and then unfreezes the player on
2266the new (success) or old (failed) map position. 2792the new (success) or old (failed) map position. In either case, $done will
2793be called at the end of this process.
2794
2795Note that $check will be called with a potentially non-loaded map, so if
2796it needs a loaded map it has to call C<< ->load >>.
2267 2797
2268=cut 2798=cut
2269 2799
2270our $GOTOGEN; 2800our $GOTOGEN;
2271 2801
2272sub cf::object::player::goto { 2802sub cf::object::player::goto {
2273 my ($self, $path, $x, $y, $check) = @_; 2803 my ($self, $path, $x, $y, $check, $done) = @_;
2804
2805 if ($self->{_link_recursion} >= $MAX_LINKS) {
2806 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2807 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2808 ($path, $x, $y) = @$EMERGENCY_POSITION;
2809 }
2274 2810
2275 # do generation counting so two concurrent goto's will be executed in-order 2811 # do generation counting so two concurrent goto's will be executed in-order
2276 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2812 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2277 2813
2278 $self->enter_link; 2814 $self->enter_link;
2279 2815
2280 (async { 2816 (async {
2817 $Coro::current->{desc} = "player::goto $path $x $y";
2818
2819 # *tag paths override both path and x|y
2820 if ($path =~ /^\*(.*)$/) {
2821 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2822 my $ob = $obs[rand @obs];
2823
2824 # see if we actually can go there
2825 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2826 $ob = $obs[rand @obs];
2827 } else {
2828 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2829 }
2830 # else put us there anyways for now #d#
2831
2832 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2833 } else {
2834 ($path, $x, $y) = (undef, undef, undef);
2835 }
2836 }
2837
2281 my $map = eval { 2838 my $map = eval {
2282 my $map = cf::map::find $path; 2839 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2283 2840
2284 if ($map) { 2841 if ($map) {
2285 $map = $map->customise_for ($self); 2842 $map = $map->customise_for ($self);
2286 $map = $check->($map) if $check && $map; 2843 $map = $check->($map, $x, $y, $self) if $check && $map;
2287 } else { 2844 } else {
2288 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2845 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2289 } 2846 }
2290 2847
2291 $map 2848 $map
2292 }; 2849 };
2293 2850
2298 2855
2299 if ($gen == $self->{_goto_generation}) { 2856 if ($gen == $self->{_goto_generation}) {
2300 delete $self->{_goto_generation}; 2857 delete $self->{_goto_generation};
2301 $self->leave_link ($map, $x, $y); 2858 $self->leave_link ($map, $x, $y);
2302 } 2859 }
2860
2861 $done->($self) if $done;
2303 })->prio (1); 2862 })->prio (1);
2304} 2863}
2305 2864
2306=item $player_object->enter_exit ($exit_object) 2865=item $player_object->enter_exit ($exit_object)
2307 2866
2327} 2886}
2328 2887
2329sub prepare_random_map { 2888sub prepare_random_map {
2330 my ($exit) = @_; 2889 my ($exit) = @_;
2331 2890
2332 my $guard = cf::lock_acquire "exit_prepare:$exit";
2333
2334 # all this does is basically replace the /! path by 2891 # all this does is basically replace the /! path by
2335 # a new random map path (?random/...) with a seed 2892 # a new random map path (?random/...) with a seed
2336 # that depends on the exit object 2893 # that depends on the exit object
2337 2894
2338 my $rmp = parse_random_map_params $exit->msg; 2895 my $rmp = parse_random_map_params $exit->msg;
2340 if ($exit->map) { 2897 if ($exit->map) {
2341 $rmp->{region} = $exit->region->name; 2898 $rmp->{region} = $exit->region->name;
2342 $rmp->{origin_map} = $exit->map->path; 2899 $rmp->{origin_map} = $exit->map->path;
2343 $rmp->{origin_x} = $exit->x; 2900 $rmp->{origin_x} = $exit->x;
2344 $rmp->{origin_y} = $exit->y; 2901 $rmp->{origin_y} = $exit->y;
2902
2903 $exit->map->touch;
2345 } 2904 }
2346 2905
2347 $rmp->{random_seed} ||= $exit->random_seed; 2906 $rmp->{random_seed} ||= $exit->random_seed;
2348 2907
2349 my $data = cf::to_json $rmp; 2908 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2350 my $md5 = Digest::MD5::md5_hex $data; 2909 my $md5 = Digest::MD5::md5_hex $data;
2351 my $meta = "$RANDOMDIR/$md5.meta"; 2910 my $meta = "$RANDOMDIR/$md5.meta";
2352 2911
2353 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2912 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2354 aio_write $fh, 0, (length $data), $data, 0; 2913 aio_write $fh, 0, (length $data), $data, 0;
2355 undef $fh; 2914 undef $fh;
2356 aio_rename "$meta~", $meta; 2915 aio_rename "$meta~", $meta;
2357 2916
2917 my $slaying = "?random/$md5";
2918
2919 if ($exit->valid) {
2358 $exit->slaying ("?random/$md5"); 2920 $exit->slaying ("?random/$md5");
2359 $exit->msg (undef); 2921 $exit->msg (undef);
2922 }
2360 } 2923 }
2361} 2924}
2362 2925
2363sub cf::object::player::enter_exit { 2926sub cf::object::player::enter_exit {
2364 my ($self, $exit) = @_; 2927 my ($self, $exit) = @_;
2365 2928
2366 return unless $self->type == cf::PLAYER; 2929 return unless $self->type == cf::PLAYER;
2367 2930
2368 if ($exit->slaying eq "/!") {
2369 #TODO: this should de-fi-ni-te-ly not be a sync-job
2370 # the problem is that $exit might not survive long enough
2371 # so it needs to be done right now, right here
2372 cf::sync_job { prepare_random_map $exit };
2373 }
2374
2375 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2376 my $hp = $exit->stats->hp;
2377 my $sp = $exit->stats->sp;
2378
2379 $self->enter_link; 2931 $self->enter_link;
2380 2932
2381 # if exit is damned, update players death & WoR home-position
2382 $self->contr->savebed ($slaying, $hp, $sp)
2383 if $exit->flag (FLAG_DAMNED);
2384
2385 (async { 2933 (async {
2386 $self->deactivate_recursive; # just to be sure 2934 $Coro::current->{desc} = "enter_exit";
2935
2387 unless (eval { 2936 unless (eval {
2937 $self->deactivate_recursive; # just to be sure
2938
2939 # random map handling
2940 {
2941 my $guard = cf::lock_acquire "exit_prepare:$exit";
2942
2943 prepare_random_map $exit
2944 if $exit->slaying eq "/!";
2945 }
2946
2947 my $map = cf::map::normalise $exit->slaying, $exit->map;
2948 my $x = $exit->stats->hp;
2949 my $y = $exit->stats->sp;
2950
2388 $self->goto ($slaying, $hp, $sp); 2951 $self->goto ($map, $x, $y);
2389 2952
2953 # if exit is damned, update players death & WoR home-position
2954 $self->contr->savebed ($map, $x, $y)
2955 if $exit->flag (cf::FLAG_DAMNED);
2956
2390 1; 2957 1
2391 }) { 2958 }) {
2392 $self->message ("Something went wrong deep within the crossfire server. " 2959 $self->message ("Something went wrong deep within the deliantra server. "
2393 . "I'll try to bring you back to the map you were before. " 2960 . "I'll try to bring you back to the map you were before. "
2394 . "Please report this to the dungeon master!", 2961 . "Please report this to the dungeon master!",
2395 cf::NDI_UNIQUE | cf::NDI_RED); 2962 cf::NDI_UNIQUE | cf::NDI_RED);
2396 2963
2397 warn "ERROR in enter_exit: $@"; 2964 error "ERROR in enter_exit: $@";
2398 $self->leave_link; 2965 $self->leave_link;
2399 } 2966 }
2400 })->prio (1); 2967 })->prio (1);
2401} 2968}
2402 2969
2416 2983
2417 utf8::encode $text; 2984 utf8::encode $text;
2418 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2985 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2419} 2986}
2420 2987
2988=item $client->send_big_packet ($pkt)
2989
2990Like C<send_packet>, but tries to compress large packets, and fragments
2991them as required.
2992
2993=cut
2994
2995our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2996
2997sub cf::client::send_big_packet {
2998 my ($self, $pkt) = @_;
2999
3000 # try lzf for large packets
3001 $pkt = "lzf " . Compress::LZF::compress $pkt
3002 if 1024 <= length $pkt and $self->{can_lzf};
3003
3004 # split very large packets
3005 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3006 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3007 $pkt = "frag";
3008 }
3009
3010 $self->send_packet ($pkt);
3011}
3012
2421=item $client->send_msg ($color, $type, $msg, [extra...]) 3013=item $client->send_msg ($channel, $msg, $color, [extra...])
2422 3014
2423Send a drawinfo or msg packet to the client, formatting the msg for the 3015Send a drawinfo or msg packet to the client, formatting the msg for the
2424client if neccessary. C<$type> should be a string identifying the type of 3016client if neccessary. C<$type> should be a string identifying the type of
2425the message, with C<log> being the default. If C<$color> is negative, suppress 3017the message, with C<log> being the default. If C<$color> is negative, suppress
2426the message unless the client supports the msg packet. 3018the message unless the client supports the msg packet.
2427 3019
2428=cut 3020=cut
2429 3021
3022# non-persistent channels (usually the info channel)
3023our %CHANNEL = (
3024 "c/motd" => {
3025 id => "infobox",
3026 title => "MOTD",
3027 reply => undef,
3028 tooltip => "The message of the day",
3029 },
3030 "c/identify" => {
3031 id => "infobox",
3032 title => "Identify",
3033 reply => undef,
3034 tooltip => "Items recently identified",
3035 },
3036 "c/examine" => {
3037 id => "infobox",
3038 title => "Examine",
3039 reply => undef,
3040 tooltip => "Signs and other items you examined",
3041 },
3042 "c/shopinfo" => {
3043 id => "infobox",
3044 title => "Shop Info",
3045 reply => undef,
3046 tooltip => "What your bargaining skill tells you about the shop",
3047 },
3048 "c/book" => {
3049 id => "infobox",
3050 title => "Book",
3051 reply => undef,
3052 tooltip => "The contents of a note or book",
3053 },
3054 "c/lookat" => {
3055 id => "infobox",
3056 title => "Look",
3057 reply => undef,
3058 tooltip => "What you saw there",
3059 },
3060 "c/who" => {
3061 id => "infobox",
3062 title => "Players",
3063 reply => undef,
3064 tooltip => "Shows players who are currently online",
3065 },
3066 "c/body" => {
3067 id => "infobox",
3068 title => "Body Parts",
3069 reply => undef,
3070 tooltip => "Shows which body parts you posess and are available",
3071 },
3072 "c/statistics" => {
3073 id => "infobox",
3074 title => "Statistics",
3075 reply => undef,
3076 tooltip => "Shows your primary statistics",
3077 },
3078 "c/skills" => {
3079 id => "infobox",
3080 title => "Skills",
3081 reply => undef,
3082 tooltip => "Shows your experience per skill and item power",
3083 },
3084 "c/shopitems" => {
3085 id => "infobox",
3086 title => "Shop Items",
3087 reply => undef,
3088 tooltip => "Shows the items currently for sale in this shop",
3089 },
3090 "c/resistances" => {
3091 id => "infobox",
3092 title => "Resistances",
3093 reply => undef,
3094 tooltip => "Shows your resistances",
3095 },
3096 "c/pets" => {
3097 id => "infobox",
3098 title => "Pets",
3099 reply => undef,
3100 tooltip => "Shows information abotu your pets/a specific pet",
3101 },
3102 "c/perceiveself" => {
3103 id => "infobox",
3104 title => "Perceive Self",
3105 reply => undef,
3106 tooltip => "You gained detailed knowledge about yourself",
3107 },
3108 "c/uptime" => {
3109 id => "infobox",
3110 title => "Uptime",
3111 reply => undef,
3112 tooltip => "How long the server has been running since last restart",
3113 },
3114 "c/mapinfo" => {
3115 id => "infobox",
3116 title => "Map Info",
3117 reply => undef,
3118 tooltip => "Information related to the maps",
3119 },
3120 "c/party" => {
3121 id => "party",
3122 title => "Party",
3123 reply => "gsay ",
3124 tooltip => "Messages and chat related to your party",
3125 },
3126 "c/death" => {
3127 id => "death",
3128 title => "Death",
3129 reply => undef,
3130 tooltip => "Reason for and more info about your most recent death",
3131 },
3132 "c/say" => $SAY_CHANNEL,
3133 "c/chat" => $CHAT_CHANNEL,
3134);
3135
2430sub cf::client::send_msg { 3136sub cf::client::send_msg {
2431 my ($self, $color, $type, $msg, @extra) = @_; 3137 my ($self, $channel, $msg, $color, @extra) = @_;
2432 3138
2433 $msg = $self->pl->expand_cfpod ($msg); 3139 $msg = $self->pl->expand_cfpod ($msg)
3140 unless $color & cf::NDI_VERBATIM;
3141
3142 $color &= cf::NDI_CLIENT_MASK; # just in case...
3143
3144 # check predefined channels, for the benefit of C
3145 if ($CHANNEL{$channel}) {
3146 $channel = $CHANNEL{$channel};
3147
3148 $self->ext_msg (channel_info => $channel);
3149 $channel = $channel->{id};
3150
3151 } elsif (ref $channel) {
3152 # send meta info to client, if not yet sent
3153 unless (exists $self->{channel}{$channel->{id}}) {
3154 $self->{channel}{$channel->{id}} = $channel;
3155 $self->ext_msg (channel_info => $channel);
3156 }
3157
3158 $channel = $channel->{id};
3159 }
2434 3160
2435 return unless @extra || length $msg; 3161 return unless @extra || length $msg;
2436 3162
2437 if ($self->can_msg) { 3163 # default colour, mask it out
2438 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 3164 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2439 } else { 3165 if $color & cf::NDI_DEF;
2440 # replace some tags by gcfclient-compatible ones
2441 for ($msg) {
2442 1 while
2443 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2444 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2445 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2446 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2447 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2448 }
2449 3166
2450 if ($color >= 0) { 3167 my $pkt = "msg "
2451 if (0 && $msg =~ /\[/) { 3168 . $self->{json_coder}->encode (
2452 $self->send_packet ("drawextinfo $color 4 0 $msg") 3169 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2453 } else { 3170 );
2454 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2455 $self->send_packet ("drawinfo $color $msg")
2456 }
2457 }
2458 }
2459}
2460 3171
3172 $self->send_big_packet ($pkt);
3173}
3174
2461=item $client->ext_event ($type, %msg) 3175=item $client->ext_msg ($type, @msg)
2462 3176
2463Sends an ext event to the client. 3177Sends an ext event to the client.
2464 3178
2465=cut 3179=cut
2466 3180
2467sub cf::client::ext_event($$%) { 3181sub cf::client::ext_msg($$@) {
2468 my ($self, $type, %msg) = @_; 3182 my ($self, $type, @msg) = @_;
2469 3183
3184 if ($self->extcmd == 2) {
3185 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3186 } elsif ($self->extcmd == 1) { # TODO: remove
2470 $msg{msgtype} = "event_$type"; 3187 push @msg, msgtype => "event_$type";
2471 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 3188 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3189 }
3190}
3191
3192=item $client->ext_reply ($msgid, @msg)
3193
3194Sends an ext reply to the client.
3195
3196=cut
3197
3198sub cf::client::ext_reply($$@) {
3199 my ($self, $id, @msg) = @_;
3200
3201 if ($self->extcmd == 2) {
3202 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3203 } elsif ($self->extcmd == 1) {
3204 #TODO: version 1, remove
3205 unshift @msg, msgtype => "reply", msgid => $id;
3206 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3207 }
2472} 3208}
2473 3209
2474=item $success = $client->query ($flags, "text", \&cb) 3210=item $success = $client->query ($flags, "text", \&cb)
2475 3211
2476Queues a query to the client, calling the given callback with 3212Queues a query to the client, calling the given callback with
2531 my ($ns, $buf) = @_; 3267 my ($ns, $buf) = @_;
2532 3268
2533 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3269 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2534 3270
2535 if (ref $msg) { 3271 if (ref $msg) {
3272 my ($type, $reply, @payload) =
3273 "ARRAY" eq ref $msg
3274 ? @$msg
3275 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3276
3277 my @reply;
3278
2536 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3279 if (my $cb = $EXTICMD{$type}) {
2537 if (my %reply = $cb->($ns, $msg)) { 3280 @reply = $cb->($ns, @payload);
2538 $reply{msgid} = $msg->{msgid};
2539 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2540 }
2541 } 3281 }
3282
3283 $ns->ext_reply ($reply, @reply)
3284 if $reply;
3285
2542 } else { 3286 } else {
2543 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3287 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2544 } 3288 }
2545 3289
2546 cf::override; 3290 cf::override;
2547 }, 3291 },
2548); 3292);
2568 3312
2569 $coro 3313 $coro
2570} 3314}
2571 3315
2572cf::client->attach ( 3316cf::client->attach (
2573 on_destroy => sub { 3317 on_client_destroy => sub {
2574 my ($ns) = @_; 3318 my ($ns) = @_;
2575 3319
2576 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3320 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2577 }, 3321 },
2578); 3322);
2593our $safe = new Safe "safe"; 3337our $safe = new Safe "safe";
2594our $safe_hole = new Safe::Hole; 3338our $safe_hole = new Safe::Hole;
2595 3339
2596$SIG{FPE} = 'IGNORE'; 3340$SIG{FPE} = 'IGNORE';
2597 3341
2598$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3342$safe->permit_only (Opcode::opset qw(
3343 :base_core :base_mem :base_orig :base_math :base_loop
3344 grepstart grepwhile mapstart mapwhile
3345 sort time
3346));
2599 3347
2600# here we export the classes and methods available to script code 3348# here we export the classes and methods available to script code
2601 3349
2602=pod 3350=pod
2603 3351
2604The following functions and methods are available within a safe environment: 3352The following functions and methods are available within a safe environment:
2605 3353
2606 cf::object 3354 cf::object
2607 contr pay_amount pay_player map x y force_find force_add 3355 contr pay_amount pay_player map x y force_find force_add destroy
2608 insert remove 3356 insert remove name archname title slaying race decrease split
3357 value
2609 3358
2610 cf::object::player 3359 cf::object::player
2611 player 3360 player
2612 3361
2613 cf::player 3362 cf::player
2618 3367
2619=cut 3368=cut
2620 3369
2621for ( 3370for (
2622 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3371 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2623 insert remove)], 3372 insert remove inv nrof name archname title slaying race
3373 decrease split destroy change_exp value msg lore send_msg)],
2624 ["cf::object::player" => qw(player)], 3374 ["cf::object::player" => qw(player)],
2625 ["cf::player" => qw(peaceful)], 3375 ["cf::player" => qw(peaceful send_msg)],
2626 ["cf::map" => qw(trigger)], 3376 ["cf::map" => qw(trigger)],
2627) { 3377) {
2628 no strict 'refs';
2629 my ($pkg, @funs) = @$_; 3378 my ($pkg, @funs) = @$_;
2630 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3379 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2631 for @funs; 3380 for @funs;
2632} 3381}
2633 3382
2648 3397
2649 my $qcode = $code; 3398 my $qcode = $code;
2650 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3399 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2651 $qcode =~ s/\n/\\n/g; 3400 $qcode =~ s/\n/\\n/g;
2652 3401
3402 %vars = (_dummy => 0) unless %vars;
3403
3404 my @res;
2653 local $_; 3405 local $_;
2654 local @safe::cf::_safe_eval_args = values %vars;
2655 3406
2656 my $eval = 3407 my $eval =
2657 "do {\n" 3408 "do {\n"
2658 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3409 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2659 . "#line 0 \"{$qcode}\"\n" 3410 . "#line 0 \"{$qcode}\"\n"
2660 . $code 3411 . $code
2661 . "\n}" 3412 . "\n}"
2662 ; 3413 ;
2663 3414
3415 if ($CFG{safe_eval}) {
2664 sub_generation_inc; 3416 sub_generation_inc;
3417 local @safe::cf::_safe_eval_args = values %vars;
2665 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3418 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2666 sub_generation_inc; 3419 sub_generation_inc;
3420 } else {
3421 local @cf::_safe_eval_args = values %vars;
3422 @res = wantarray ? eval eval : scalar eval $eval;
3423 }
2667 3424
2668 if ($@) { 3425 if ($@) {
2669 warn "$@"; 3426 warn "$@",
2670 warn "while executing safe code '$code'\n"; 3427 "while executing safe code '$code'\n",
2671 warn "with arguments " . (join " ", %vars) . "\n"; 3428 "with arguments " . (join " ", %vars) . "\n";
2672 } 3429 }
2673 3430
2674 wantarray ? @res : $res[0] 3431 wantarray ? @res : $res[0]
2675} 3432}
2676 3433
2690=cut 3447=cut
2691 3448
2692sub register_script_function { 3449sub register_script_function {
2693 my ($fun, $cb) = @_; 3450 my ($fun, $cb) = @_;
2694 3451
2695 no strict 'refs'; 3452 $fun = "safe::$fun" if $CFG{safe_eval};
2696 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3453 *$fun = $safe_hole->wrap ($cb);
2697} 3454}
2698 3455
2699=back 3456=back
2700 3457
2701=cut 3458=cut
2704# the server's init and main functions 3461# the server's init and main functions
2705 3462
2706sub load_facedata($) { 3463sub load_facedata($) {
2707 my ($path) = @_; 3464 my ($path) = @_;
2708 3465
3466 # HACK to clear player env face cache, we need some signal framework
3467 # for this (global event?)
3468 %ext::player_env::MUSIC_FACE_CACHE = ();
3469
3470 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3471
2709 warn "loading facedata from $path\n"; 3472 trace "loading facedata from $path\n";
2710 3473
2711 my $facedata; 3474 my $facedata = decode_storable load_file $path;
2712 0 < aio_load $path, $facedata
2713 or die "$path: $!";
2714
2715 $facedata = Coro::Storable::thaw $facedata;
2716 3475
2717 $facedata->{version} == 2 3476 $facedata->{version} == 2
2718 or cf::cleanup "$path: version mismatch, cannot proceed."; 3477 or cf::cleanup "$path: version mismatch, cannot proceed.";
2719 3478
3479 # patch in the exptable
3480 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3481 $facedata->{resource}{"res/exp_table"} = {
3482 type => FT_RSRC,
3483 data => $exp_table,
3484 hash => (Digest::MD5::md5 $exp_table),
3485 };
3486 cf::cede_to_tick;
3487
2720 { 3488 {
2721 my $faces = $facedata->{faceinfo}; 3489 my $faces = $facedata->{faceinfo};
2722 3490
2723 while (my ($face, $info) = each %$faces) { 3491 while (my ($face, $info) = each %$faces) {
2724 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3492 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3493
2725 cf::face::set_visibility $idx, $info->{visibility}; 3494 cf::face::set_visibility $idx, $info->{visibility};
2726 cf::face::set_magicmap $idx, $info->{magicmap}; 3495 cf::face::set_magicmap $idx, $info->{magicmap};
2727 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3496 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2728 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3497 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3498 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
2729 3499
2730 cf::cede_to_tick; 3500 cf::cede_to_tick;
2731 } 3501 }
2732 3502
2733 while (my ($face, $info) = each %$faces) { 3503 while (my ($face, $info) = each %$faces) {
2734 next unless $info->{smooth}; 3504 next unless $info->{smooth};
3505
2735 my $idx = cf::face::find $face 3506 my $idx = cf::face::find $face
2736 or next; 3507 or next;
3508
2737 if (my $smooth = cf::face::find $info->{smooth}) { 3509 if (my $smooth = cf::face::find $info->{smooth}) {
2738 cf::face::set_smooth $idx, $smooth; 3510 cf::face::set_smooth $idx, $smooth;
2739 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3511 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2740 } else { 3512 } else {
2741 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3513 error "smooth face '$info->{smooth}' not found for face '$face'";
2742 } 3514 }
2743 3515
2744 cf::cede_to_tick; 3516 cf::cede_to_tick;
2745 } 3517 }
2746 } 3518 }
2755 3527
2756 cf::anim::invalidate_all; # d'oh 3528 cf::anim::invalidate_all; # d'oh
2757 } 3529 }
2758 3530
2759 { 3531 {
2760 # TODO: for gcfclient pleasure, we should give resources
2761 # that gcfclient doesn't grok a >10000 face index.
2762 my $res = $facedata->{resource}; 3532 my $res = $facedata->{resource};
2763 my $enc = JSON::XS->new->utf8->canonical;
2764 3533
2765 while (my ($name, $info) = each %$res) { 3534 while (my ($name, $info) = each %$res) {
2766 my $meta = $enc->encode ({ 3535 if (defined $info->{type}) {
2767 name => $name,
2768 type => $info->{type},
2769 copyright => $info->{copyright}, #TODO#
2770 });
2771 my $data = pack "(w/a*)*", $meta, $info->{data};
2772 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2773
2774 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3536 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3537
3538 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
2775 cf::face::set_type $idx, 1; 3539 cf::face::set_type $idx, $info->{type};
2776 cf::face::set_data $idx, 0, $data, $chk; 3540 } else {
3541 $RESOURCE{$name} = $info; # unused
3542 }
2777 3543
2778 cf::cede_to_tick; 3544 cf::cede_to_tick;
2779 } 3545 }
2780 } 3546 }
2781 3547
3548 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3549
2782 1 3550 1
2783} 3551}
2784 3552
3553register_exticmd fx_want => sub {
3554 my ($ns, $want) = @_;
3555
3556 while (my ($k, $v) = each %$want) {
3557 $ns->fx_want ($k, $v);
3558 }
3559};
3560
3561sub load_resource_file($) {
3562 my $guard = lock_acquire "load_resource_file";
3563
3564 my $status = load_resource_file_ $_[0];
3565 get_slot 0.1, 100;
3566 cf::arch::commit_load;
3567
3568 $status
3569}
3570
2785sub reload_regions { 3571sub reload_regions {
3572 # HACK to clear player env face cache, we need some signal framework
3573 # for this (global event?)
3574 %ext::player_env::MUSIC_FACE_CACHE = ();
3575
2786 load_resource_file "$MAPDIR/regions" 3576 load_resource_file "$MAPDIR/regions"
2787 or die "unable to load regions file\n"; 3577 or die "unable to load regions file\n";
3578
3579 for (cf::region::list) {
3580 $_->{match} = qr/$_->{match}/
3581 if exists $_->{match};
3582 }
2788} 3583}
2789 3584
2790sub reload_facedata { 3585sub reload_facedata {
2791 load_facedata "$DATADIR/facedata" 3586 load_facedata "$DATADIR/facedata"
2792 or die "unable to load facedata\n"; 3587 or die "unable to load facedata\n";
2793} 3588}
2794 3589
2795sub reload_archetypes { 3590sub reload_archetypes {
2796 load_resource_file "$DATADIR/archetypes" 3591 load_resource_file "$DATADIR/archetypes"
2797 or die "unable to load archetypes\n"; 3592 or die "unable to load archetypes\n";
2798 #d# NEED to laod twice to resolve forward references
2799 # this really needs to be done in an extra post-pass
2800 # (which needs to be synchronous, so solve it differently)
2801 load_resource_file "$DATADIR/archetypes"
2802 or die "unable to load archetypes\n";
2803} 3593}
2804 3594
2805sub reload_treasures { 3595sub reload_treasures {
2806 load_resource_file "$DATADIR/treasures" 3596 load_resource_file "$DATADIR/treasures"
2807 or die "unable to load treasurelists\n"; 3597 or die "unable to load treasurelists\n";
2808} 3598}
2809 3599
3600sub reload_sound {
3601 trace "loading sound config from $DATADIR/sound\n";
3602
3603 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3604
3605 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3606 my $sound = $soundconf->{compat}[$_]
3607 or next;
3608
3609 my $face = cf::face::find "sound/$sound->[1]";
3610 cf::sound::set $sound->[0] => $face;
3611 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3612 }
3613
3614 while (my ($k, $v) = each %{$soundconf->{event}}) {
3615 my $face = cf::face::find "sound/$v";
3616 cf::sound::set $k => $face;
3617 }
3618}
3619
2810sub reload_resources { 3620sub reload_resources {
2811 warn "reloading resource files...\n"; 3621 trace "reloading resource files...\n";
2812 3622
3623 reload_exp_table;
3624 reload_materials;
3625 reload_facedata;
3626 reload_sound;
3627 reload_archetypes;
2813 reload_regions; 3628 reload_regions;
2814 reload_facedata;
2815 #reload_archetypes;#d#
2816 reload_archetypes;
2817 reload_treasures; 3629 reload_treasures;
2818 3630
2819 warn "finished reloading resource files\n"; 3631 trace "finished reloading resource files\n";
2820} 3632}
2821 3633
2822sub init { 3634sub reload_config {
2823 reload_resources; 3635 trace "reloading config file...\n";
2824}
2825 3636
2826sub cfg_load { 3637 my $config = load_file "$CONFDIR/config";
2827 open my $fh, "<:utf8", "$CONFDIR/config" 3638 utf8::decode $config;
2828 or return; 3639 *CFG = decode_yaml $config;
2829 3640
2830 local $/;
2831 *CFG = YAML::Syck::Load <$fh>;
2832
2833 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3641 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2834 3642
2835 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3643 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2836 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3644 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2837 3645
2838 if (exists $CFG{mlockall}) { 3646 if (exists $CFG{mlockall}) {
2842 }; 3650 };
2843 warn $@ if $@; 3651 warn $@ if $@;
2844 } 3652 }
2845} 3653}
2846 3654
3655sub pidfile() {
3656 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3657 or die "$PIDFILE: $!";
3658 flock $fh, &Fcntl::LOCK_EX
3659 or die "$PIDFILE: flock: $!";
3660 $fh
3661}
3662
3663# make sure only one server instance is running at any one time
3664sub atomic {
3665 my $fh = pidfile;
3666
3667 my $pid = <$fh>;
3668 kill 9, $pid if $pid > 0;
3669
3670 seek $fh, 0, 0;
3671 print $fh $$;
3672}
3673
3674sub main_loop {
3675 trace "EV::loop starting\n";
3676 if (1) {
3677 EV::loop;
3678 }
3679 trace "EV::loop returned\n";
3680 goto &main_loop unless $REALLY_UNLOOP;
3681}
3682
2847sub main { 3683sub main {
3684 cf::init_globals; # initialise logging
3685
3686 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3687 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3688 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3689 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3690
3691 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3692
2848 # we must not ever block the main coroutine 3693 # we must not ever block the main coroutine
2849 local $Coro::idle = sub { 3694 local $Coro::idle = sub {
2850 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3695 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2851 (async { 3696 (async {
2852 Event::one_event; 3697 $Coro::current->{desc} = "IDLE BUG HANDLER";
3698 EV::loop EV::LOOP_ONESHOT;
2853 })->prio (Coro::PRIO_MAX); 3699 })->prio (Coro::PRIO_MAX);
2854 }; 3700 };
2855 3701
2856 cfg_load; 3702 evthread_start IO::AIO::poll_fileno;
3703
3704 cf::sync_job {
3705 cf::incloader::init ();
3706
3707 cf::init_anim;
3708 cf::init_attackmess;
3709 cf::init_dynamic;
3710
3711 cf::load_settings;
3712
3713 reload_resources;
3714 reload_config;
2857 db_init; 3715 db_init;
3716
3717 cf::init_uuid;
3718 cf::init_signals;
3719 cf::init_skills;
3720
3721 cf::init_beforeplay;
3722
3723 atomic;
3724
2858 load_extensions; 3725 load_extensions;
2859 3726
2860 $TICK_WATCHER->start; 3727 utime time, time, $RUNTIMEFILE;
2861 Event::loop; 3728
3729 # no (long-running) fork's whatsoever before this point(!)
3730 use POSIX ();
3731 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3732
3733 cf::_post_init 0;
3734 };
3735
3736 cf::object::thawer::errors_are_fatal 0;
3737 info "parse errors in files are no longer fatal from this point on.\n";
3738
3739 my $free_main; $free_main = EV::idle sub {
3740 undef $free_main;
3741 undef &main; # free gobs of memory :)
3742 };
3743
3744 goto &main_loop;
2862} 3745}
2863 3746
2864############################################################################# 3747#############################################################################
2865# initialisation and cleanup 3748# initialisation and cleanup
2866 3749
2867# install some emergency cleanup handlers 3750# install some emergency cleanup handlers
2868BEGIN { 3751BEGIN {
3752 our %SIGWATCHER = ();
2869 for my $signal (qw(INT HUP TERM)) { 3753 for my $signal (qw(INT HUP TERM)) {
2870 Event->signal ( 3754 $SIGWATCHER{$signal} = AE::signal $signal, sub {
2871 reentrant => 0,
2872 data => WF_AUTOCANCEL,
2873 signal => $signal,
2874 prio => 0,
2875 cb => sub {
2876 cf::cleanup "SIG$signal"; 3755 cf::cleanup "SIG$signal";
2877 },
2878 ); 3756 };
2879 } 3757 }
2880} 3758}
2881 3759
2882sub write_runtime { 3760sub write_runtime_sync {
2883 my $runtime = "$LOCALDIR/runtime"; 3761 my $t0 = AE::time;
2884 3762
2885 # first touch the runtime file to show we are still running: 3763 # first touch the runtime file to show we are still running:
2886 # the fsync below can take a very very long time. 3764 # the fsync below can take a very very long time.
2887 3765
2888 IO::AIO::aio_utime $runtime, undef, undef; 3766 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2889 3767
2890 my $guard = cf::lock_acquire "write_runtime"; 3768 my $guard = cf::lock_acquire "write_runtime";
2891 3769
2892 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3770 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
2893 or return; 3771 or return;
2894 3772
2895 my $value = $cf::RUNTIME + 90 + 10; 3773 my $value = $cf::RUNTIME + 90 + 10;
2896 # 10 is the runtime save interval, for a monotonic clock 3774 # 10 is the runtime save interval, for a monotonic clock
2897 # 60 allows for the watchdog to kill the server. 3775 # 60 allows for the watchdog to kill the server.
2907 aio_utime $fh, undef, undef; 3785 aio_utime $fh, undef, undef;
2908 3786
2909 close $fh 3787 close $fh
2910 or return; 3788 or return;
2911 3789
2912 aio_rename "$runtime~", $runtime 3790 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2913 and return; 3791 and return;
2914 3792
2915 warn "runtime file written.\n"; 3793 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
2916 3794
2917 1 3795 1
3796}
3797
3798our $uuid_lock;
3799our $uuid_skip;
3800
3801sub write_uuid_sync($) {
3802 $uuid_skip ||= $_[0];
3803
3804 return if $uuid_lock;
3805 local $uuid_lock = 1;
3806
3807 my $uuid = "$LOCALDIR/uuid";
3808
3809 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3810 or return;
3811
3812 my $value = uuid_seq uuid_cur;
3813
3814 unless ($value) {
3815 info "cowardly refusing to write zero uuid value!\n";
3816 return;
3817 }
3818
3819 my $value = uuid_str $value + $uuid_skip;
3820 $uuid_skip = 0;
3821
3822 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3823 and return;
3824
3825 # always fsync - this file is important
3826 aio_fsync $fh
3827 and return;
3828
3829 close $fh
3830 or return;
3831
3832 aio_rename "$uuid~", $uuid
3833 and return;
3834
3835 trace "uuid file written ($value).\n";
3836
3837 1
3838
3839}
3840
3841sub write_uuid($$) {
3842 my ($skip, $sync) = @_;
3843
3844 $sync ? write_uuid_sync $skip
3845 : async { write_uuid_sync $skip };
2918} 3846}
2919 3847
2920sub emergency_save() { 3848sub emergency_save() {
2921 my $freeze_guard = cf::freeze_mainloop; 3849 my $freeze_guard = cf::freeze_mainloop;
2922 3850
2923 warn "enter emergency perl save\n"; 3851 info "emergency_perl_save: enter\n";
3852
3853 # this is a trade-off: we want to be very quick here, so
3854 # save all maps without fsync, and later call a global sync
3855 # (which in turn might be very very slow)
3856 local $USE_FSYNC = 0;
2924 3857
2925 cf::sync_job { 3858 cf::sync_job {
3859 cf::write_runtime_sync; # external watchdog should not bark
3860
2926 # use a peculiar iteration method to avoid tripping on perl 3861 # use a peculiar iteration method to avoid tripping on perl
2927 # refcount bugs in for. also avoids problems with players 3862 # refcount bugs in for. also avoids problems with players
2928 # and maps saved/destroyed asynchronously. 3863 # and maps saved/destroyed asynchronously.
2929 warn "begin emergency player save\n"; 3864 info "emergency_perl_save: begin player save\n";
2930 for my $login (keys %cf::PLAYER) { 3865 for my $login (keys %cf::PLAYER) {
2931 my $pl = $cf::PLAYER{$login} or next; 3866 my $pl = $cf::PLAYER{$login} or next;
2932 $pl->valid or next; 3867 $pl->valid or next;
3868 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2933 $pl->save; 3869 $pl->save;
2934 } 3870 }
2935 warn "end emergency player save\n"; 3871 info "emergency_perl_save: end player save\n";
2936 3872
2937 warn "begin emergency map save\n"; 3873 cf::write_runtime_sync; # external watchdog should not bark
3874
3875 info "emergency_perl_save: begin map save\n";
2938 for my $path (keys %cf::MAP) { 3876 for my $path (keys %cf::MAP) {
2939 my $map = $cf::MAP{$path} or next; 3877 my $map = $cf::MAP{$path} or next;
2940 $map->valid or next; 3878 $map->valid or next;
2941 $map->save; 3879 $map->save;
2942 } 3880 }
2943 warn "end emergency map save\n"; 3881 info "emergency_perl_save: end map save\n";
2944 3882
2945 warn "begin emergency database checkpoint\n"; 3883 cf::write_runtime_sync; # external watchdog should not bark
3884
3885 info "emergency_perl_save: begin database checkpoint\n";
2946 BDB::db_env_txn_checkpoint $DB_ENV; 3886 BDB::db_env_txn_checkpoint $DB_ENV;
2947 warn "end emergency database checkpoint\n"; 3887 info "emergency_perl_save: end database checkpoint\n";
3888
3889 info "emergency_perl_save: begin write uuid\n";
3890 write_uuid_sync 1;
3891 info "emergency_perl_save: end write uuid\n";
3892
3893 cf::write_runtime_sync; # external watchdog should not bark
3894
3895 trace "emergency_perl_save: syncing database to disk";
3896 BDB::db_env_txn_checkpoint $DB_ENV;
3897
3898 info "emergency_perl_save: starting sync\n";
3899 IO::AIO::aio_sync sub {
3900 info "emergency_perl_save: finished sync\n";
3901 };
3902
3903 cf::write_runtime_sync; # external watchdog should not bark
3904
3905 trace "emergency_perl_save: flushing outstanding aio requests";
3906 while (IO::AIO::nreqs || BDB::nreqs) {
3907 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3908 }
3909
3910 cf::write_runtime_sync; # external watchdog should not bark
2948 }; 3911 };
2949 3912
2950 warn "leave emergency perl save\n"; 3913 info "emergency_perl_save: leave\n";
2951} 3914}
2952 3915
2953sub post_cleanup { 3916sub post_cleanup {
2954 my ($make_core) = @_; 3917 my ($make_core) = @_;
2955 3918
3919 IO::AIO::flush;
3920
2956 warn Carp::longmess "post_cleanup backtrace" 3921 error Carp::longmess "post_cleanup backtrace"
2957 if $make_core; 3922 if $make_core;
3923
3924 my $fh = pidfile;
3925 unlink $PIDFILE if <$fh> == $$;
3926}
3927
3928# a safer delete_package, copied from Symbol
3929sub clear_package($) {
3930 my $pkg = shift;
3931
3932 # expand to full symbol table name if needed
3933 unless ($pkg =~ /^main::.*::$/) {
3934 $pkg = "main$pkg" if $pkg =~ /^::/;
3935 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3936 $pkg .= '::' unless $pkg =~ /::$/;
3937 }
3938
3939 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3940 my $stem_symtab = *{$stem}{HASH};
3941
3942 defined $stem_symtab and exists $stem_symtab->{$leaf}
3943 or return;
3944
3945 # clear all symbols
3946 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3947 for my $name (keys %$leaf_symtab) {
3948 _gv_clear *{"$pkg$name"};
3949# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3950 }
2958} 3951}
2959 3952
2960sub do_reload_perl() { 3953sub do_reload_perl() {
2961 # can/must only be called in main 3954 # can/must only be called in main
2962 if ($Coro::current != $Coro::main) { 3955 unless (in_main) {
2963 warn "can only reload from main coroutine"; 3956 error "can only reload from main coroutine";
2964 return; 3957 return;
2965 } 3958 }
2966 3959
2967 warn "reloading..."; 3960 return if $RELOAD++;
2968 3961
2969 warn "entering sync_job"; 3962 my $t1 = AE::time;
2970 3963
3964 while ($RELOAD) {
3965 cf::get_slot 0.1, -1, "reload_perl";
3966 info "perl_reload: reloading...";
3967
3968 trace "perl_reload: entering sync_job";
3969
2971 cf::sync_job { 3970 cf::sync_job {
2972 cf::write_runtime; # external watchdog should not bark
2973 cf::emergency_save; 3971 #cf::emergency_save;
2974 cf::write_runtime; # external watchdog should not bark
2975 3972
2976 warn "syncing database to disk";
2977 BDB::db_env_txn_checkpoint $DB_ENV;
2978
2979 # if anything goes wrong in here, we should simply crash as we already saved
2980
2981 warn "cancelling all WF_AUTOCANCEL watchers";
2982 for (Event::all_watchers) {
2983 $_->cancel if $_->data & WF_AUTOCANCEL;
2984 }
2985
2986 warn "flushing outstanding aio requests";
2987 for (;;) {
2988 BDB::flush;
2989 IO::AIO::flush;
2990 Coro::cede;
2991 last unless IO::AIO::nreqs || BDB::nreqs;
2992 warn "iterate...";
2993 }
2994
2995 ++$RELOAD;
2996
2997 warn "cancelling all extension coros"; 3973 trace "perl_reload: cancelling all extension coros";
2998 $_->cancel for values %EXT_CORO; 3974 $_->cancel for values %EXT_CORO;
2999 %EXT_CORO = (); 3975 %EXT_CORO = ();
3000 3976
3001 warn "removing commands"; 3977 trace "perl_reload: removing commands";
3002 %COMMAND = (); 3978 %COMMAND = ();
3003 3979
3004 warn "removing ext/exti commands"; 3980 trace "perl_reload: removing ext/exti commands";
3005 %EXTCMD = (); 3981 %EXTCMD = ();
3006 %EXTICMD = (); 3982 %EXTICMD = ();
3007 3983
3008 warn "unloading/nuking all extensions"; 3984 trace "perl_reload: unloading/nuking all extensions";
3009 for my $pkg (@EXTS) { 3985 for my $pkg (@EXTS) {
3010 warn "... unloading $pkg"; 3986 trace "... unloading $pkg";
3011 3987
3012 if (my $cb = $pkg->can ("unload")) { 3988 if (my $cb = $pkg->can ("unload")) {
3013 eval { 3989 eval {
3014 $cb->($pkg); 3990 $cb->($pkg);
3015 1 3991 1
3016 } or warn "$pkg unloaded, but with errors: $@"; 3992 } or error "$pkg unloaded, but with errors: $@";
3993 }
3994
3995 trace "... clearing $pkg";
3996 clear_package $pkg;
3017 } 3997 }
3018 3998
3019 warn "... nuking $pkg";
3020 Symbol::delete_package $pkg;
3021 }
3022
3023 warn "unloading all perl modules loaded from $LIBDIR"; 3999 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3024 while (my ($k, $v) = each %INC) { 4000 while (my ($k, $v) = each %INC) {
3025 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4001 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3026 4002
3027 warn "... unloading $k"; 4003 trace "... unloading $k";
3028 delete $INC{$k}; 4004 delete $INC{$k};
3029 4005
3030 $k =~ s/\.pm$//; 4006 $k =~ s/\.pm$//;
3031 $k =~ s/\//::/g; 4007 $k =~ s/\//::/g;
3032 4008
3033 if (my $cb = $k->can ("unload_module")) { 4009 if (my $cb = $k->can ("unload_module")) {
3034 $cb->(); 4010 $cb->();
4011 }
4012
4013 clear_package $k;
3035 } 4014 }
3036 4015
3037 Symbol::delete_package $k;
3038 }
3039
3040 warn "getting rid of safe::, as good as possible"; 4016 trace "perl_reload: getting rid of safe::, as good as possible";
3041 Symbol::delete_package "safe::$_" 4017 clear_package "safe::$_"
3042 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4018 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3043 4019
3044 warn "unloading cf.pm \"a bit\""; 4020 trace "perl_reload: unloading cf.pm \"a bit\"";
3045 delete $INC{"cf.pm"}; 4021 delete $INC{"cf.pm"};
3046 delete $INC{"cf/pod.pm"}; 4022 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3047 4023
3048 # don't, removes xs symbols, too, 4024 # don't, removes xs symbols, too,
3049 # and global variables created in xs 4025 # and global variables created in xs
3050 #Symbol::delete_package __PACKAGE__; 4026 #clear_package __PACKAGE__;
3051 4027
3052 warn "unload completed, starting to reload now"; 4028 info "perl_reload: unload completed, starting to reload now";
3053 4029
3054 warn "reloading cf.pm"; 4030 trace "perl_reload: reloading cf.pm";
3055 require cf; 4031 require cf;
3056 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4032 cf::_connect_to_perl_1;
3057 4033
3058 warn "loading config and database again"; 4034 trace "perl_reload: loading config and database again";
3059 cf::cfg_load; 4035 cf::reload_config;
3060 4036
3061 warn "loading extensions"; 4037 trace "perl_reload: loading extensions";
3062 cf::load_extensions; 4038 cf::load_extensions;
3063 4039
4040 if ($REATTACH_ON_RELOAD) {
3064 warn "reattaching attachments to objects/players"; 4041 trace "perl_reload: reattaching attachments to objects/players";
3065 _global_reattach; # objects, sockets 4042 _global_reattach; # objects, sockets
3066 warn "reattaching attachments to maps"; 4043 trace "perl_reload: reattaching attachments to maps";
3067 reattach $_ for values %MAP; 4044 reattach $_ for values %MAP;
3068 warn "reattaching attachments to players"; 4045 trace "perl_reload: reattaching attachments to players";
3069 reattach $_ for values %PLAYER; 4046 reattach $_ for values %PLAYER;
4047 }
3070 4048
3071 warn "leaving sync_job"; 4049 cf::_post_init 1;
3072 4050
4051 trace "perl_reload: leaving sync_job";
4052
3073 1 4053 1
3074 } or do { 4054 } or do {
3075 warn $@; 4055 error $@;
3076 warn "error while reloading, exiting."; 4056 cf::cleanup "perl_reload: error, exiting.";
3077 exit 1; 4057 };
4058
4059 --$RELOAD;
3078 }; 4060 }
3079 4061
3080 warn "reloaded"; 4062 $t1 = AE::time - $t1;
4063 info "perl_reload: completed in ${t1}s\n";
3081}; 4064};
3082 4065
3083our $RELOAD_WATCHER; # used only during reload 4066our $RELOAD_WATCHER; # used only during reload
3084 4067
3085sub reload_perl() { 4068sub reload_perl() {
3086 # doing reload synchronously and two reloads happen back-to-back, 4069 # doing reload synchronously and two reloads happen back-to-back,
3087 # coro crashes during coro_state_free->destroy here. 4070 # coro crashes during coro_state_free->destroy here.
3088 4071
3089 $RELOAD_WATCHER ||= Event->timer ( 4072 $RELOAD_WATCHER ||= cf::async {
3090 reentrant => 0, 4073 Coro::AIO::aio_wait cache_extensions;
3091 after => 0, 4074
3092 data => WF_AUTOCANCEL, 4075 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3093 cb => sub {
3094 do_reload_perl; 4076 do_reload_perl;
3095 undef $RELOAD_WATCHER; 4077 undef $RELOAD_WATCHER;
3096 }, 4078 };
3097 ); 4079 };
3098} 4080}
3099 4081
3100register_command "reload" => sub { 4082register_command "reload" => sub {
3101 my ($who, $arg) = @_; 4083 my ($who, $arg) = @_;
3102 4084
3103 if ($who->flag (FLAG_WIZ)) { 4085 if ($who->flag (FLAG_WIZ)) {
3104 $who->message ("reloading server."); 4086 $who->message ("reloading server.");
4087 async {
4088 $Coro::current->{desc} = "perl_reload";
3105 async { reload_perl }; 4089 reload_perl;
4090 };
3106 } 4091 }
3107}; 4092};
3108 4093
3109unshift @INC, $LIBDIR; 4094#############################################################################
3110 4095
3111my $bug_warning = 0; 4096my $bug_warning = 0;
3112 4097
3113our @WAIT_FOR_TICK; 4098our @WAIT_FOR_TICK;
3114our @WAIT_FOR_TICK_BEGIN; 4099our @WAIT_FOR_TICK_BEGIN;
3115 4100
3116sub wait_for_tick { 4101sub wait_for_tick() {
3117 return unless $TICK_WATCHER->is_active;
3118 return if $Coro::current == $Coro::main; 4102 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3119 4103
3120 my $signal = new Coro::Signal; 4104 my $signal = new Coro::Signal;
3121 push @WAIT_FOR_TICK, $signal; 4105 push @WAIT_FOR_TICK, $signal;
3122 $signal->wait; 4106 $signal->wait;
3123} 4107}
3124 4108
3125sub wait_for_tick_begin { 4109sub wait_for_tick_begin() {
3126 return unless $TICK_WATCHER->is_active;
3127 return if $Coro::current == $Coro::main; 4110 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3128 4111
3129 my $signal = new Coro::Signal; 4112 my $signal = new Coro::Signal;
3130 push @WAIT_FOR_TICK_BEGIN, $signal; 4113 push @WAIT_FOR_TICK_BEGIN, $signal;
3131 $signal->wait; 4114 $signal->wait;
3132} 4115}
3133 4116
3134 my $min = 1e6;#d# 4117sub tick {
3135 my $avg = 10;
3136$TICK_WATCHER = Event->timer (
3137 reentrant => 0,
3138 parked => 1,
3139 prio => 0,
3140 at => $NEXT_TICK || $TICK,
3141 data => WF_AUTOCANCEL,
3142 cb => sub {
3143 if ($Coro::current != $Coro::main) { 4118 if ($Coro::current != $Coro::main) {
3144 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4119 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3145 unless ++$bug_warning > 10; 4120 unless ++$bug_warning > 10;
3146 return; 4121 return;
3147 } 4122 }
3148 4123
3149 $NOW = $tick_start = Event::time;
3150
3151 cf::server_tick; # one server iteration 4124 cf::server_tick; # one server iteration
3152 4125
3153 0 && sync_job {#d# 4126 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3154 for(1..10) {
3155 my $t = Event::time;
3156 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3157 or die;
3158 4127
3159 $map->width (50); 4128 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3160 $map->height (50); 4129 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3161 $map->alloc; 4130 Coro::async_pool {
3162 $map->_load_objects ("/tmp/x.map", 1); 4131 $Coro::current->{desc} = "runtime saver";
3163 my $t = Event::time - $t; 4132 write_runtime_sync
3164 4133 or error "ERROR: unable to write runtime file: $!";
3165 #next unless $t < 0.0013;#d#
3166 if ($t < $min) {
3167 $min = $t;
3168 }
3169 $avg = $avg * 0.99 + $t * 0.01;
3170 }
3171 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3172 exit 0;
3173 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3174 }; 4134 };
4135 }
3175 4136
3176 $RUNTIME += $TICK;
3177 $NEXT_TICK += $TICK;
3178
3179 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3180 $NEXT_RUNTIME_WRITE = $NOW + 10;
3181 Coro::async_pool {
3182 write_runtime
3183 or warn "ERROR: unable to write runtime file: $!";
3184 };
3185 }
3186
3187# my $AFTER = Event::time;
3188# warn $AFTER - $NOW;#d#
3189
3190 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4137 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3191 $sig->send; 4138 $sig->send;
3192 } 4139 }
3193 while (my $sig = shift @WAIT_FOR_TICK) { 4140 while (my $sig = shift @WAIT_FOR_TICK) {
3194 $sig->send; 4141 $sig->send;
3195 } 4142 }
3196 4143
3197 $NOW = Event::time; 4144 $LOAD = ($NOW - $TICK_START) / $TICK;
3198
3199 # if we are delayed by four ticks or more, skip them all
3200 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3201
3202 $TICK_WATCHER->at ($NEXT_TICK);
3203 $TICK_WATCHER->start;
3204
3205 $LOAD = ($NOW - $tick_start) / $TICK;
3206 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4145 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3207 4146
3208 _post_tick; 4147 if (0) {
3209 4148 if ($NEXT_TICK) {
3210 4149 my $jitter = $TICK_START - $NEXT_TICK;
4150 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4151 debug "jitter $JITTER\n";#d#
4152 }
3211 }, 4153 }
3212); 4154}
3213 4155
3214{ 4156{
3215 BDB::max_poll_time $TICK * 0.1; 4157 # configure BDB
3216 $BDB_POLL_WATCHER = Event->io ( 4158
3217 reentrant => 0,
3218 fd => BDB::poll_fileno,
3219 poll => 'r',
3220 prio => 0,
3221 data => WF_AUTOCANCEL,
3222 cb => \&BDB::poll_cb,
3223 );
3224 BDB::min_parallel 8; 4159 BDB::min_parallel 16;
3225 4160 BDB::max_poll_reqs $TICK * 0.1;
3226 BDB::set_sync_prepare { 4161 $AnyEvent::BDB::WATCHER->priority (1);
3227 my $status;
3228 my $current = $Coro::current;
3229 (
3230 sub {
3231 $status = $!;
3232 $current->ready; undef $current;
3233 },
3234 sub {
3235 Coro::schedule while defined $current;
3236 $! = $status;
3237 },
3238 )
3239 };
3240 4162
3241 unless ($DB_ENV) { 4163 unless ($DB_ENV) {
3242 $DB_ENV = BDB::db_env_create; 4164 $DB_ENV = BDB::db_env_create;
4165 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4166 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4167 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4168 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4169 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3243 4170
3244 cf::sync_job { 4171 cf::sync_job {
3245 eval { 4172 eval {
3246 BDB::db_env_open 4173 BDB::db_env_open
3247 $DB_ENV, 4174 $DB_ENV,
3249 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4176 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3250 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4177 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3251 0666; 4178 0666;
3252 4179
3253 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4180 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3254
3255 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3256 $DB_ENV->set_lk_detect;
3257 }; 4181 };
3258 4182
3259 cf::cleanup "db_env_open(db): $@" if $@; 4183 cf::cleanup "db_env_open(db): $@" if $@;
3260 }; 4184 };
3261 } 4185 }
4186
4187 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4188 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4189 };
4190 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4191 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4192 };
4193 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4194 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4195 };
3262} 4196}
3263 4197
3264{ 4198{
4199 # configure IO::AIO
4200
3265 IO::AIO::min_parallel 8; 4201 IO::AIO::min_parallel 8;
3266
3267 undef $Coro::AIO::WATCHER;
3268 IO::AIO::max_poll_time $TICK * 0.1; 4202 IO::AIO::max_poll_time $TICK * 0.1;
3269 $AIO_POLL_WATCHER = Event->io ( 4203 undef $AnyEvent::AIO::WATCHER;
3270 reentrant => 0,
3271 data => WF_AUTOCANCEL,
3272 fd => IO::AIO::poll_fileno,
3273 poll => 'r',
3274 prio => 6,
3275 cb => \&IO::AIO::poll_cb,
3276 );
3277} 4204}
3278 4205
3279my $_log_backtrace; 4206our $_log_backtrace;
4207our $_log_backtrace_last;
3280 4208
3281sub _log_backtrace { 4209sub _log_backtrace {
3282 my ($msg, @addr) = @_; 4210 my ($msg, @addr) = @_;
3283 4211
3284 $msg =~ s/\n//; 4212 $msg =~ s/\n$//;
3285 4213
4214 if ($_log_backtrace_last eq $msg) {
4215 LOG llevInfo, "[ABT] $msg\n";
4216 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3286 # limit the # of concurrent backtraces 4217 # limit the # of concurrent backtraces
3287 if ($_log_backtrace < 2) { 4218 } elsif ($_log_backtrace < 2) {
4219 $_log_backtrace_last = $msg;
3288 ++$_log_backtrace; 4220 ++$_log_backtrace;
4221 my $perl_bt = Carp::longmess $msg;
3289 async { 4222 async {
4223 $Coro::current->{desc} = "abt $msg";
4224
3290 my @bt = fork_call { 4225 my @bt = fork_call {
3291 @addr = map { sprintf "%x", $_ } @addr; 4226 @addr = map { sprintf "%x", $_ } @addr;
3292 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4227 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3293 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4228 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3294 or die "addr2line: $!"; 4229 or die "addr2line: $!";
3302 } 4237 }
3303 4238
3304 @funcs 4239 @funcs
3305 }; 4240 };
3306 4241
3307 LOG llevInfo, "[ABT] $msg\n"; 4242 LOG llevInfo, "[ABT] $perl_bt\n";
4243 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3308 LOG llevInfo, "[ABT] $_\n" for @bt; 4244 LOG llevInfo, "[ABT] $_\n" for @bt;
3309 --$_log_backtrace; 4245 --$_log_backtrace;
3310 }; 4246 };
3311 } else { 4247 } else {
3312 LOG llevInfo, "[ABT] $msg\n"; 4248 LOG llevInfo, "[ABT] $msg\n";
3313 LOG llevInfo, "[ABT] [suppressed]\n"; 4249 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3314 } 4250 }
3315} 4251}
3316 4252
3317# load additional modules 4253# load additional modules
3318use cf::pod; 4254require "cf/$_.pm" for @EXTRA_MODULES;
4255cf::_connect_to_perl_2;
3319 4256
3320END { cf::emergency_save } 4257END { cf::emergency_save }
3321 4258
33221 42591
3323 4260

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines