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.312 by root, Sat Jul 21 18:01:26 2007 UTC vs.
Revision 1.567 by root, Mon May 2 16:16:00 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines