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.194 by root, Wed Jan 24 22:42:49 2007 UTC vs.
Revision 1.560 by root, Fri Apr 22 02:03:12 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines