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.300 by root, Tue Jul 10 06:44:29 2007 UTC vs.
Revision 1.569 by root, Wed May 4 07:36:40 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines