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.273 by root, Mon Jun 4 12:19:08 2007 UTC vs.
Revision 1.559 by root, Sat Feb 26 12:50:27 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines