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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines