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.289 by root, Sat Jun 30 03:00:54 2007 UTC vs.
Revision 1.566 by root, Sun May 1 16:58:16 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines