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.189 by root, Sun Jan 21 21:28:27 2007 UTC vs.
Revision 1.561 by root, Fri Apr 22 06:10:33 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.4 (); 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 last;
1562 }
1563 }
916 } 1564 };
917} 1565}
918 1566
919############################################################################# 1567#############################################################################
920 1568
1569=back
1570
921=head2 CORE EXTENSIONS 1571=head2 CORE EXTENSIONS
922 1572
923Functions and methods that extend core crossfire objects. 1573Functions and methods that extend core deliantra objects.
924 1574
925=cut 1575=cut
926 1576
927package cf::player; 1577package cf::player;
928 1578
930 1580
931=head3 cf::player 1581=head3 cf::player
932 1582
933=over 4 1583=over 4
934 1584
1585=item cf::player::num_playing
1586
1587Returns the official number of playing players, as per the Crossfire metaserver rules.
1588
1589=cut
1590
1591sub num_playing {
1592 scalar grep
1593 $_->ob->map
1594 && !$_->hidden
1595 && !$_->ob->flag (cf::FLAG_WIZ),
1596 cf::player::list
1597}
1598
935=item cf::player::find $login 1599=item cf::player::find $login
936 1600
937Returns the given player object, loading it if necessary (might block). 1601Returns the given player object, loading it if necessary (might block).
938 1602
939=cut 1603=cut
940 1604
941sub playerdir($) { 1605sub playerdir($) {
942 cf::localdir 1606 "$PLAYERDIR/"
943 . "/"
944 . cf::playerdir
945 . "/"
946 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1607 . (ref $_[0] ? $_[0]->ob->name : $_[0])
947} 1608}
948 1609
949sub path($) { 1610sub path($) {
950 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1611 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
951 1612
952 (playerdir $login) . "/$login.pl" 1613 (playerdir $login) . "/playerdata"
953} 1614}
954 1615
955sub find_active($) { 1616sub find_active($) {
956 $cf::PLAYER{$_[0]} 1617 $cf::PLAYER{$_[0]}
957 and $cf::PLAYER{$_[0]}->active 1618 and $cf::PLAYER{$_[0]}->active
960 1621
961sub exists($) { 1622sub exists($) {
962 my ($login) = @_; 1623 my ($login) = @_;
963 1624
964 $cf::PLAYER{$login} 1625 $cf::PLAYER{$login}
965 or cf::sync_job { !aio_stat path $login } 1626 or !aio_stat path $login
966} 1627}
967 1628
968sub find($) { 1629sub find($) {
969 return $cf::PLAYER{$_[0]} || do { 1630 return $cf::PLAYER{$_[0]} || do {
970 my $login = $_[0]; 1631 my $login = $_[0];
971 1632
972 my $guard = cf::lock_acquire "user_find:$login"; 1633 my $guard = cf::lock_acquire "user_find:$login";
973 1634
974 $cf::PLAYER{$_[0]} || do { 1635 $cf::PLAYER{$_[0]} || do {
975 my $pl = load_pl path $login 1636 # rename old playerfiles to new ones
1637 #TODO: remove when no longer required
1638 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1639 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1640 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1641 aio_unlink +(playerdir $login) . "/$login.pl";
1642
1643 my $f = new_from_file cf::object::thawer path $login
976 or return; 1644 or return;
1645
1646 my $pl = cf::player::load_pl $f
1647 or return;
1648
1649 local $cf::PLAYER_LOADING{$login} = $pl;
1650 $f->resolve_delayed_derefs;
977 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
978 } 1652 }
979 } 1653 }
980} 1654}
1655
1656cf::player->attach (
1657 on_load => sub {
1658 my ($pl, $path) = @_;
1659
1660 # restore slots saved in save, below
1661 my $slots = delete $pl->{_slots};
1662
1663 $pl->ob->current_weapon ($slots->[0]);
1664 $pl->combat_ob ($slots->[1]);
1665 $pl->ranged_ob ($slots->[2]);
1666 },
1667);
981 1668
982sub save($) { 1669sub save($) {
983 my ($pl) = @_; 1670 my ($pl) = @_;
984 1671
985 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
990 return if $pl->{deny_save}; 1677 return if $pl->{deny_save};
991 1678
992 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
993 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
994 1681
1682 cf::get_slot 0.01;
1683
1684 # save slots, to be restored later
1685 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1686
995 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
996 Coro::cede; 1688 cf::cede_to_tick;
997} 1689}
998 1690
999sub new($) { 1691sub new($) {
1000 my ($login) = @_; 1692 my ($login) = @_;
1001 1693
1007 $cf::PLAYER{$login} = $self; 1699 $cf::PLAYER{$login} = $self;
1008 1700
1009 $self 1701 $self
1010} 1702}
1011 1703
1704=item $player->send_msg ($channel, $msg, $color, [extra...])
1705
1706=cut
1707
1708sub send_msg {
1709 my $ns = shift->ns
1710 or return;
1711 $ns->send_msg (@_);
1712}
1713
1012=item $pl->quit_character 1714=item $pl->quit_character
1013 1715
1014Nukes the player without looking back. If logged in, the connection will 1716Nukes the player without looking back. If logged in, the connection will
1015be destroyed. May block for a long time. 1717be destroyed. May block for a long time.
1016 1718
1017=cut 1719=cut
1018 1720
1019sub quit_character { 1721sub quit_character {
1020 my ($pl) = @_; 1722 my ($pl) = @_;
1021 1723
1724 my $name = $pl->ob->name;
1725
1022 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1023 $pl->password ("*"); # this should lock out the player until we nuked the dir 1727 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1024 1728
1025 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1026 $pl->deactivate; 1730 $pl->deactivate;
1731
1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1027 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1028 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1029 1737
1030 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1031 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1032 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1033 delete $cf::PLAYER{$pl->ob->name}; 1741 delete $cf::PLAYER{$pl->ob->name};
1034 $pl->destroy; 1742 $pl->destroy;
1743
1744 my $prefix = qr<^~\Q$name\E/>;
1745
1746 # nuke player maps
1747 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1748
1035 IO::AIO::aio_rmtree $temp; 1749 IO::AIO::aio_rmtree $temp;
1750}
1751
1752=item $pl->kick
1753
1754Kicks a player out of the game. This destroys the connection.
1755
1756=cut
1757
1758sub kick {
1759 my ($pl, $kicker) = @_;
1760
1761 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1762 $pl->killer ("kicked");
1763 $pl->ns->destroy;
1036} 1764}
1037 1765
1038=item cf::player::list_logins 1766=item cf::player::list_logins
1039 1767
1040Returns am arrayref of all valid playernames in the system, can take a 1768Returns am arrayref of all valid playernames in the system, can take a
1041while and may block, so not sync_job-capable, ever. 1769while and may block, so not sync_job-capable, ever.
1042 1770
1043=cut 1771=cut
1044 1772
1045sub list_logins { 1773sub list_logins {
1046 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1774 my $dirs = aio_readdir $PLAYERDIR
1047 or return []; 1775 or return [];
1048 1776
1049 my @logins; 1777 my @logins;
1050 1778
1051 for my $login (@$dirs) { 1779 for my $login (@$dirs) {
1780 my $path = path $login;
1781
1782 # a .pst is a dead give-away for a valid player
1783 # if no pst file found, open and chekc for blocked users
1784 if (aio_stat "$path.pst") {
1052 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1785 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1053 aio_read $fh, 0, 512, my $buf, 0 or next; 1786 aio_read $fh, 0, 512, my $buf, 0 or next;
1054 $buf !~ /^password -------------$/m or next; # official not-valid tag 1787 $buf !~ /^password -------------$/m or next; # official not-valid tag
1788 }
1055 1789
1056 utf8::decode $login; 1790 utf8::decode $login;
1057 push @logins, $login; 1791 push @logins, $login;
1058 } 1792 }
1059 1793
1060 \@logins 1794 \@logins
1061} 1795}
1062 1796
1063=item $player->maps 1797=item $player->maps
1064 1798
1799=item cf::player::maps $login
1800
1065Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1066player. May block. 1802player. May block.
1067 1803
1068=cut 1804=cut
1069 1805
1070sub maps($) { 1806sub maps($) {
1071 my ($pl) = @_; 1807 my ($pl) = @_;
1808
1809 $pl = ref $pl ? $pl->ob->name : $pl;
1072 1810
1073 my $files = aio_readdir playerdir $pl 1811 my $files = aio_readdir playerdir $pl
1074 or return; 1812 or return;
1075 1813
1076 my @paths; 1814 my @paths;
1078 for (@$files) { 1816 for (@$files) {
1079 utf8::decode $_; 1817 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1818 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1819 next unless /^$PATH_SEP/o;
1082 1820
1083 s/\.map$//; 1821 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1822 }
1086 1823
1087 \@paths 1824 \@paths
1088} 1825}
1089 1826
1827=item $protocol_xml = $player->expand_cfpod ($cfpod)
1828
1829Expand deliantra pod fragments into protocol xml.
1830
1090=item $player->ext_reply ($msgid, $msgtype, %msg) 1831=item $player->ext_reply ($msgid, @msg)
1091 1832
1092Sends an ext reply to the player. 1833Sends an ext reply to the player.
1093 1834
1094=cut 1835=cut
1095 1836
1096sub ext_reply($$$%) { 1837sub ext_reply($$@) {
1097 my ($self, $id, %msg) = @_; 1838 my ($self, $id, @msg) = @_;
1098 1839
1099 $msg{msgid} = $id; 1840 $self->ns->ext_reply ($id, @msg)
1100
1101 $self->send ("ext " . cf::to_json \%msg);
1102} 1841}
1103 1842
1104package cf; 1843=item $player->ext_msg ($type, @msg)
1844
1845Sends an ext event to the client.
1846
1847=cut
1848
1849sub ext_msg($$@) {
1850 my ($self, $type, @msg) = @_;
1851
1852 $self->ns->ext_msg ($type, @msg);
1853}
1854
1855=head3 cf::region
1856
1857=over 4
1858
1859=cut
1860
1861package cf::region;
1862
1863=item cf::region::find_by_path $path
1864
1865Tries to decuce the likely region for a map knowing only its path.
1866
1867=cut
1868
1869sub find_by_path($) {
1870 my ($path) = @_;
1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1873
1874 my ($match, $specificity);
1875
1876 for my $region (list) {
1877 if ($region->{match} && $path =~ $region->{match}) {
1878 ($match, $specificity) = ($region, $region->specificity)
1879 if $region->specificity > $specificity;
1880 }
1881 }
1882
1883 $match
1884}
1105 1885
1106=back 1886=back
1107
1108 1887
1109=head3 cf::map 1888=head3 cf::map
1110 1889
1111=over 4 1890=over 4
1112 1891
1124our $MAX_RESET = 3600; 1903our $MAX_RESET = 3600;
1125our $DEFAULT_RESET = 3000; 1904our $DEFAULT_RESET = 3000;
1126 1905
1127sub generate_random_map { 1906sub generate_random_map {
1128 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1129 # mit "rum" bekleckern, nicht 1908
1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1910
1130 $self->_create_random_map ( 1911 $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} 1912}
1144 1913
1145=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1146 1915
1147Register a handler for the map path matching the given regex at the 1916Register a handler for the map path matching the given regex at the
1152 1921
1153sub register { 1922sub register {
1154 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1155 my $pkg = caller; 1924 my $pkg = caller;
1156 1925
1157 no strict;
1158 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1159 1927
1160 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1161} 1929}
1162 1930
1163# also paths starting with '/' 1931# also paths starting with '/'
1164$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1165 1933
1166sub thawer_merge { 1934sub thawer_merge {
1167 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1168 1936
1169 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1170 local $self->{path}; 1938 local $self->{path};
1171 local $self->{load_path}; 1939 local $self->{load_path};
1172 local $self->{deny_save};
1173 local $self->{deny_reset};
1174 1940
1175 $self->SUPER::thawer_merge ($merge); 1941 $self->SUPER::thawer_merge ($merge);
1176} 1942}
1177 1943
1178sub normalise { 1944sub normalise {
1179 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1946
1947 $path = "$path"; # make sure it's a string
1948
1949 $path =~ s/\.map$//;
1180 1950
1181 # map plan: 1951 # map plan:
1182 # 1952 #
1183 # /! non-realised random map exit (special hack!) 1953 # /! non-realised random map exit (special hack!)
1184 # {... are special paths that are not being touched 1954 # {... are special paths that are not being touched
1197 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1198 $path = "$base/$path"; 1968 $path = "$base/$path";
1199 } 1969 }
1200 1970
1201 for ($path) { 1971 for ($path) {
1202 redo if s{//}{/};
1203 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1204 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1205 } 1974 }
1206 1975
1207 $path 1976 $path
1221 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1222 return $self; 1991 return $self;
1223 } 1992 }
1224 } 1993 }
1225 1994
1226 Carp::carp "unable to resolve path '$path'."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1227 () 1996 ()
1228} 1997}
1229 1998
1999# may re-bless or do other evil things
1230sub init { 2000sub init {
1231 my ($self) = @_; 2001 my ($self) = @_;
1232 2002
1233 $self 2003 $self
1234} 2004}
1246 2016
1247# the original (read-only) location 2017# the original (read-only) location
1248sub load_path { 2018sub load_path {
1249 my ($self) = @_; 2019 my ($self) = @_;
1250 2020
1251 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 2021 "$MAPDIR/$self->{path}.map"
1252} 2022}
1253 2023
1254# the temporary/swap location 2024# the temporary/swap location
1255sub save_path { 2025sub save_path {
1256 my ($self) = @_; 2026 my ($self) = @_;
1257 2027
1258 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2028 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1259 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 2029 "$TMPDIR/$path.map"
1260} 2030}
1261 2031
1262# the unique path, undef == no special unique path 2032# the unique path, undef == no special unique path
1263sub uniq_path { 2033sub uniq_path {
1264 my ($self) = @_; 2034 my ($self) = @_;
1265 2035
1266 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2036 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1267 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 2037 "$UNIQUEDIR/$path"
1268} 2038}
1269 2039
1270# and all this just because we cannot iterate over 2040sub decay_objects {
1271# all maps in C++...
1272sub change_all_map_light {
1273 my ($change) = @_; 2041 my ($self) = @_;
1274 2042
1275 $_->change_map_light ($change) 2043 return if $self->{deny_reset};
1276 for grep $_->outdoor, values %cf::MAP; 2044
2045 $self->do_decay_objects;
1277} 2046}
1278 2047
1279sub unlink_save { 2048sub unlink_save {
1280 my ($self) = @_; 2049 my ($self) = @_;
1281 2050
1286 2055
1287sub load_header_from($) { 2056sub load_header_from($) {
1288 my ($self, $path) = @_; 2057 my ($self, $path) = @_;
1289 2058
1290 utf8::encode $path; 2059 utf8::encode $path;
1291 aio_open $path, O_RDONLY, 0 2060 my $f = new_from_file cf::object::thawer $path
1292 or return; 2061 or return;
1293 2062
1294 $self->_load_header ($path) 2063 $self->_load_header ($f)
1295 or return; 2064 or return;
2065
2066 local $MAP_LOADING{$self->{path}} = $self;
2067 $f->resolve_delayed_derefs;
1296 2068
1297 $self->{load_path} = $path; 2069 $self->{load_path} = $path;
1298 2070
1299 1 2071 1
1300} 2072}
1339 $self->load_header_orig 2111 $self->load_header_orig
1340 or return; 2112 or return;
1341 $self->prepare_orig; 2113 $self->prepare_orig;
1342 } 2114 }
1343 2115
2116 $self->{deny_reset} = 1
2117 if $self->no_reset;
2118
2119 $self->default_region (cf::region::find_by_path $self->{path})
2120 unless $self->default_region;
2121
1344 1 2122 1
1345} 2123}
1346 2124
1347sub find; 2125sub find;
1348sub find { 2126sub find {
1349 my ($path, $origin) = @_; 2127 my ($path, $origin) = @_;
1350 2128
2129 cf::cede_to_tick;
2130
1351 $path = normalise $path, $origin && $origin->path; 2131 $path = normalise $path, $origin && $origin->path;
1352 2132
2133 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1353 cf::lock_wait "map_find:$path"; 2134 my $guard2 = cf::lock_acquire "map_find:$path";
1354 2135
1355 $cf::MAP{$path} || do { 2136 $cf::MAP{$path} || do {
1356 my $guard = cf::lock_acquire "map_find:$path";
1357 my $map = new_from_path cf::map $path 2137 my $map = new_from_path cf::map $path
1358 or return; 2138 or return;
1359 2139
1360 $map->{last_save} = $cf::RUNTIME; 2140 $map->{last_save} = $cf::RUNTIME;
1361 2141
1362 $map->load_header 2142 $map->load_header
1363 or return; 2143 or return;
1364 2144
1365 if ($map->should_reset) { 2145 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1366 # doing this can freeze the server in a sync job, obviously 2146 # doing this can freeze the server in a sync job, obviously
1367 #$cf::WAIT_FOR_TICK->wait; 2147 #$cf::WAIT_FOR_TICK->wait;
2148 undef $guard2;
2149 undef $guard1;
1368 $map->reset; 2150 $map->reset;
1369 undef $guard;
1370 $map = find $path 2151 return find $path;
1371 or return;
1372 } 2152 }
1373 2153
1374 $cf::MAP{$path} = $map 2154 $cf::MAP{$path} = $map
1375 } 2155 }
1376} 2156}
1377 2157
1378sub pre_load { } 2158sub pre_load { }
1379sub post_load { } 2159#sub post_load { } # XS
1380 2160
1381sub load { 2161sub load {
1382 my ($self) = @_; 2162 my ($self) = @_;
1383 2163
2164 local $self->{deny_reset} = 1; # loading can take a long time
2165
1384 my $path = $self->{path}; 2166 my $path = $self->{path};
2167
2168 {
1385 my $guard = cf::lock_acquire "map_load:$path"; 2169 my $guard = cf::lock_acquire "map_data:$path";
1386 2170
2171 return unless $self->valid;
1387 return if $self->in_memory != cf::MAP_SWAPPED; 2172 return unless $self->in_memory == cf::MAP_SWAPPED;
1388 2173
1389 $self->in_memory (cf::MAP_LOADING); 2174 $self->in_memory (cf::MAP_LOADING);
1390 2175
1391 $self->alloc; 2176 $self->alloc;
1392 2177
1393 $self->pre_load; 2178 $self->pre_load;
2179 cf::cede_to_tick;
1394 2180
1395 $self->_load_objects ($self->{load_path}, 1) 2181 my $f = new_from_file cf::object::thawer $self->{load_path};
2182 $f->skip_block;
2183 $self->_load_objects ($f)
1396 or return; 2184 or return;
1397 2185
1398 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2186 $self->post_load_original
1399 if delete $self->{load_original}; 2187 if delete $self->{load_original};
1400 2188
1401 if (my $uniq = $self->uniq_path) { 2189 if (my $uniq = $self->uniq_path) {
1402 utf8::encode $uniq; 2190 utf8::encode $uniq;
1403 if (aio_open $uniq, O_RDONLY, 0) { 2191 unless (aio_stat $uniq) {
2192 if (my $f = new_from_file cf::object::thawer $uniq) {
1404 $self->clear_unique_items; 2193 $self->clear_unique_items;
1405 $self->_load_objects ($uniq, 0); 2194 $self->_load_objects ($f);
2195 $f->resolve_delayed_derefs;
2196 }
1406 } 2197 }
1407 } 2198 }
1408 2199
1409 Coro::cede; 2200 $f->resolve_delayed_derefs;
1410 2201
2202 cf::cede_to_tick;
1411 # now do the right thing for maps 2203 # now do the right thing for maps
1412 $self->link_multipart_objects; 2204 $self->link_multipart_objects;
1413
1414 unless ($self->{deny_activate}) {
1415 $self->decay_objects;
1416 $self->fix_auto_apply;
1417 $self->update_buttons;
1418 Coro::cede;
1419 $self->set_darkness_map;
1420 $self->difficulty ($self->estimate_difficulty) 2205 $self->difficulty ($self->estimate_difficulty)
1421 unless $self->difficulty; 2206 unless $self->difficulty;
1422 Coro::cede; 2207 cf::cede_to_tick;
2208
2209 unless ($self->{deny_activate}) {
2210 $self->decay_objects;
2211 $self->fix_auto_apply;
2212 $self->update_buttons;
2213 cf::cede_to_tick;
1423 $self->activate; 2214 $self->activate;
2215 }
2216
2217 $self->{last_save} = $cf::RUNTIME;
2218 $self->last_access ($cf::RUNTIME);
2219
2220 $self->in_memory (cf::MAP_ACTIVE);
1424 } 2221 }
1425 2222
1426 $self->post_load; 2223 $self->post_load;
1427 2224
1428 $self->in_memory (cf::MAP_IN_MEMORY); 2225 1
1429} 2226}
1430 2227
2228# customize the map for a given player, i.e.
2229# return the _real_ map. used by e.g. per-player
2230# maps to change the path to ~playername/mappath
1431sub customise_for { 2231sub customise_for {
1432 my ($self, $ob) = @_; 2232 my ($self, $ob) = @_;
1433 2233
1434 return find "~" . $ob->name . "/" . $self->{path} 2234 return find "~" . $ob->name . "/" . $self->{path}
1435 if $self->per_player; 2235 if $self->per_player;
1436 2236
2237# return find "?party/" . $ob->name . "/" . $self->{path}
2238# if $self->per_party;
2239
1437 $self 2240 $self
1438} 2241}
1439 2242
1440# find and load all maps in the 3x3 area around a map 2243# find and load all maps in the 3x3 area around a map
1441sub load_diag { 2244sub load_neighbours {
1442 my ($map) = @_; 2245 my ($map) = @_;
1443 2246
1444 my @diag; # diagonal neighbours 2247 my @neigh; # diagonal neighbours
1445 2248
1446 for (0 .. 3) { 2249 for (0 .. 3) {
1447 my $neigh = $map->tile_path ($_) 2250 my $neigh = $map->tile_path ($_)
1448 or next; 2251 or next;
1449 $neigh = find $neigh, $map 2252 $neigh = find $neigh, $map
1450 or next; 2253 or next;
1451 $neigh->load; 2254 $neigh->load;
1452 2255
2256 # now find the diagonal neighbours
2257 push @neigh,
1453 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2258 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1454 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2259 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1455 } 2260 }
1456 2261
1457 for (@diag) { 2262 for (grep defined $_->[0], @neigh) {
2263 my ($path, $origin) = @$_;
1458 my $neigh = find @$_ 2264 my $neigh = find $path, $origin
1459 or next; 2265 or next;
1460 $neigh->load; 2266 $neigh->load;
1461 } 2267 }
1462} 2268}
1463 2269
1464sub find_sync { 2270sub find_sync {
1465 my ($path, $origin) = @_; 2271 my ($path, $origin) = @_;
1466 2272
1467 cf::sync_job { find $path, $origin } 2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2274 if $Coro::current == $Coro::main;
2275
2276 find $path, $origin
1468} 2277}
1469 2278
1470sub do_load_sync { 2279sub do_load_sync {
1471 my ($map) = @_; 2280 my ($map) = @_;
1472 2281
1473 cf::sync_job { $map->load }; 2282 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2283 if $Coro::current == $Coro::main;
2284
2285 $map->load;
1474} 2286}
1475 2287
1476our %MAP_PREFETCH; 2288our %MAP_PREFETCH;
1477our $MAP_PREFETCHER = undef; 2289our $MAP_PREFETCHER = undef;
1478 2290
1479sub find_async { 2291sub find_async {
1480 my ($path, $origin) = @_; 2292 my ($path, $origin, $load) = @_;
1481 2293
1482 $path = normalise $path, $origin && $origin->{path}; 2294 $path = normalise $path, $origin && $origin->{path};
1483 2295
1484 if (my $map = $cf::MAP{$path}) { 2296 if (my $map = $cf::MAP{$path}) {
1485 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2297 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1486 } 2298 }
1487 2299
1488 undef $MAP_PREFETCH{$path}; 2300 $MAP_PREFETCH{$path} |= $load;
2301
1489 $MAP_PREFETCHER ||= cf::async { 2302 $MAP_PREFETCHER ||= cf::async {
2303 $Coro::current->{desc} = "map prefetcher";
2304
1490 while (%MAP_PREFETCH) { 2305 while (%MAP_PREFETCH) {
1491 for my $path (keys %MAP_PREFETCH) { 2306 while (my ($k, $v) = each %MAP_PREFETCH) {
1492 my $map = find $path 2307 if (my $map = find $k) {
1493 or next;
1494 $map->load; 2308 $map->load if $v;
2309 }
1495 2310
1496 delete $MAP_PREFETCH{$path}; 2311 delete $MAP_PREFETCH{$k};
1497 } 2312 }
1498 } 2313 }
1499 undef $MAP_PREFETCHER; 2314 undef $MAP_PREFETCHER;
1500 }; 2315 };
1501 $MAP_PREFETCHER->prio (6); 2316 $MAP_PREFETCHER->prio (6);
1502 2317
1503 () 2318 ()
1504} 2319}
1505 2320
2321# common code, used by both ->save and ->swapout
1506sub save { 2322sub _save {
1507 my ($self) = @_; 2323 my ($self) = @_;
1508
1509 my $lock = cf::lock_acquire "map_data:" . $self->path;
1510 2324
1511 $self->{last_save} = $cf::RUNTIME; 2325 $self->{last_save} = $cf::RUNTIME;
1512 2326
1513 return unless $self->dirty; 2327 return unless $self->dirty;
1514 2328
1520 return if $self->{deny_save}; 2334 return if $self->{deny_save};
1521 2335
1522 local $self->{last_access} = $self->last_access;#d# 2336 local $self->{last_access} = $self->last_access;#d#
1523 2337
1524 cf::async { 2338 cf::async {
2339 $Coro::current->{desc} = "map player save";
1525 $_->contr->save for $self->players; 2340 $_->contr->save for $self->players;
1526 }; 2341 };
2342
2343 cf::get_slot 0.02;
1527 2344
1528 if ($uniq) { 2345 if ($uniq) {
1529 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2346 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1530 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2347 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1531 } else { 2348 } else {
1532 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2349 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1533 } 2350 }
1534} 2351}
1535 2352
2353sub save {
2354 my ($self) = @_;
2355
2356 my $lock = cf::lock_acquire "map_data:$self->{path}";
2357
2358 $self->_save;
2359}
2360
1536sub swap_out { 2361sub swap_out {
1537 my ($self) = @_; 2362 my ($self) = @_;
1538 2363
1539 # save first because save cedes
1540 $self->save;
1541
1542 my $lock = cf::lock_acquire "map_data:" . $self->path; 2364 my $lock = cf::lock_acquire "map_data:$self->{path}";
1543 2365
2366 return if $self->in_memory != cf::MAP_ACTIVE;
2367 return if $self->{deny_save};
1544 return if $self->players; 2368 return if $self->players;
1545 return if $self->in_memory != cf::MAP_IN_MEMORY;
1546 return if $self->{deny_save};
1547 2369
2370 # first deactivate the map and "unlink" it from the core
2371 $self->deactivate;
2372 $_->clear_links_to ($self) for values %cf::MAP;
2373 $self->in_memory (cf::MAP_SWAPPED);
2374
2375 # then atomically save
2376 $self->_save;
2377
2378 # then free the map
1548 $self->clear; 2379 $self->clear;
1549 $self->in_memory (cf::MAP_SWAPPED);
1550} 2380}
1551 2381
1552sub reset_at { 2382sub reset_at {
1553 my ($self) = @_; 2383 my ($self) = @_;
1554 2384
1555 # TODO: safety, remove and allow resettable per-player maps 2385 # TODO: safety, remove and allow resettable per-player maps
1556 return 1e99 if $self->isa ("ext::map_per_player");#d#
1557 return 1e99 if $self->{deny_reset}; 2386 return 1e99 if $self->{deny_reset};
1558 2387
1559 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2388 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1560 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2389 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1561 2390
1572 my ($self) = @_; 2401 my ($self) = @_;
1573 2402
1574 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2403 my $lock = cf::lock_acquire "map_data:$self->{path}";
1575 2404
1576 return if $self->players; 2405 return if $self->players;
1577 return if $self->isa ("ext::map_per_player");#d#
1578 2406
1579 warn "resetting map ", $self->path;#d# 2407 cf::trace "resetting map ", $self->path, "\n";
2408
2409 $self->in_memory (cf::MAP_SWAPPED);
2410
2411 # need to save uniques path
2412 unless ($self->{deny_save}) {
2413 my $uniq = $self->uniq_path; utf8::encode $uniq;
2414
2415 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2416 if $uniq;
2417 }
1580 2418
1581 delete $cf::MAP{$self->path}; 2419 delete $cf::MAP{$self->path};
1582 2420
1583 $self->in_memory (cf::MAP_SWAPPED); 2421 $self->deactivate;
2422 $_->clear_links_to ($self) for values %cf::MAP;
1584 $self->clear; 2423 $self->clear;
1585
1586 $_->clear_links_to ($self) for values %cf::MAP;
1587 2424
1588 $self->unlink_save; 2425 $self->unlink_save;
1589 $self->destroy; 2426 $self->destroy;
1590} 2427}
1591 2428
1592my $nuke_counter = "aaaa"; 2429my $nuke_counter = "aaaa";
1593 2430
1594sub nuke { 2431sub nuke {
1595 my ($self) = @_; 2432 my ($self) = @_;
1596 2433
2434 {
2435 my $lock = cf::lock_acquire "map_data:$self->{path}";
2436
1597 delete $cf::MAP{$self->path}; 2437 delete $cf::MAP{$self->path};
1598 2438
1599 $self->unlink_save; 2439 $self->unlink_save;
1600 2440
1601 bless $self, "cf::map"; 2441 bless $self, "cf::map::wrap";
1602 delete $self->{deny_reset}; 2442 delete $self->{deny_reset};
1603 $self->{deny_save} = 1; 2443 $self->{deny_save} = 1;
1604 $self->reset_timeout (1); 2444 $self->reset_timeout (1);
1605 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2445 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1606 2446
1607 $cf::MAP{$self->path} = $self; 2447 $cf::MAP{$self->path} = $self;
2448 }
1608 2449
1609 $self->reset; # polite request, might not happen 2450 $self->reset; # polite request, might not happen
2451}
2452
2453=item $maps = cf::map::tmp_maps
2454
2455Returns an arrayref with all map paths of currently instantiated and saved
2456maps. May block.
2457
2458=cut
2459
2460sub tmp_maps() {
2461 [
2462 map {
2463 utf8::decode $_;
2464 /\.map$/
2465 ? normalise $_
2466 : ()
2467 } @{ aio_readdir $TMPDIR or [] }
2468 ]
2469}
2470
2471=item $maps = cf::map::random_maps
2472
2473Returns an arrayref with all map paths of currently instantiated and saved
2474random maps. May block.
2475
2476=cut
2477
2478sub random_maps() {
2479 [
2480 map {
2481 utf8::decode $_;
2482 /\.map$/
2483 ? normalise "?random/$_"
2484 : ()
2485 } @{ aio_readdir $RANDOMDIR or [] }
2486 ]
1610} 2487}
1611 2488
1612=item cf::map::unique_maps 2489=item cf::map::unique_maps
1613 2490
1614Returns an arrayref of paths of all shared maps that have 2491Returns an arrayref of paths of all shared maps that have
1615instantiated unique items. May block. 2492instantiated unique items. May block.
1616 2493
1617=cut 2494=cut
1618 2495
1619sub unique_maps() { 2496sub unique_maps() {
1620 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2497 [
1621 or return; 2498 map {
1622
1623 my @paths;
1624
1625 for (@$files) {
1626 utf8::decode $_; 2499 utf8::decode $_;
1627 next if /\.pst$/; 2500 s/\.map$//; # TODO future compatibility hack
1628 next unless /^$PATH_SEP/o; 2501 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2502 ? ()
2503 : normalise $_
2504 } @{ aio_readdir $UNIQUEDIR or [] }
2505 ]
2506}
1629 2507
2508=item cf::map::static_maps
2509
2510Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2511file in the shared directory excluding F</styles> and F</editor>). May
2512block.
2513
2514=cut
2515
2516sub static_maps() {
2517 my @dirs = "";
2518 my @maps;
2519
2520 while (@dirs) {
2521 my $dir = shift @dirs;
2522
2523 next if $dir eq "/styles" || $dir eq "/editor";
2524
2525 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2526 or return;
2527
2528 for (@$files) {
1630 s/\.map$//; 2529 s/\.map$// or next;
1631 push @paths, $_; 2530 utf8::decode $_;
1632 } 2531 push @maps, "$dir/$_";
2532 }
1633 2533
1634 \@paths 2534 push @dirs, map "$dir/$_", @$dirs;
1635} 2535 }
1636 2536
1637package cf; 2537 \@maps
2538}
1638 2539
1639=back 2540=back
1640 2541
1641=head3 cf::object 2542=head3 cf::object
1642 2543
1646 2547
1647=over 4 2548=over 4
1648 2549
1649=item $ob->inv_recursive 2550=item $ob->inv_recursive
1650 2551
1651Returns the inventory of the object _and_ their inventories, recursively. 2552Returns the inventory of the object I<and> their inventories, recursively,
2553but I<not> the object itself.
1652 2554
1653=cut 2555=cut
1654 2556
1655sub inv_recursive_; 2557sub inv_recursive_;
1656sub inv_recursive_ { 2558sub inv_recursive_ {
1659 2561
1660sub inv_recursive { 2562sub inv_recursive {
1661 inv_recursive_ inv $_[0] 2563 inv_recursive_ inv $_[0]
1662} 2564}
1663 2565
2566=item $ref = $ob->ref
2567
2568Creates and returns a persistent reference to an object that can be stored as a string.
2569
2570=item $ob = cf::object::deref ($refstring)
2571
2572returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2573even if the object actually exists. May block.
2574
2575=cut
2576
2577sub deref {
2578 my ($ref) = @_;
2579
2580 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2581 my ($uuid, $name) = ($1, $2);
2582 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2583 or return;
2584 $pl->ob->uuid eq $uuid
2585 or return;
2586
2587 $pl->ob
2588 } else {
2589 warn "$ref: cannot resolve object reference\n";
2590 undef
2591 }
2592}
2593
1664package cf; 2594package cf;
1665 2595
1666=back 2596=back
1667 2597
1668=head3 cf::object::player 2598=head3 cf::object::player
1674Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2604Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
1675can be C<undef>. Does the right thing when the player is currently in a 2605can be C<undef>. Does the right thing when the player is currently in a
1676dialogue with the given NPC character. 2606dialogue with the given NPC character.
1677 2607
1678=cut 2608=cut
2609
2610our $SAY_CHANNEL = {
2611 id => "say",
2612 title => "Map",
2613 reply => "say ",
2614 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2615};
2616
2617our $CHAT_CHANNEL = {
2618 id => "chat",
2619 title => "Chat",
2620 reply => "chat ",
2621 tooltip => "Player chat and shouts, global to the server.",
2622};
1679 2623
1680# rough implementation of a future "reply" method that works 2624# rough implementation of a future "reply" method that works
1681# with dialog boxes. 2625# with dialog boxes.
1682#TODO: the first argument must go, split into a $npc->reply_to ( method 2626#TODO: the first argument must go, split into a $npc->reply_to ( method
1683sub cf::object::player::reply($$$;$) { 2627sub cf::object::player::reply($$$;$) {
1685 2629
1686 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2630 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1687 2631
1688 if ($self->{record_replies}) { 2632 if ($self->{record_replies}) {
1689 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2633 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2634
1690 } else { 2635 } else {
2636 my $pl = $self->contr;
2637
2638 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2639 my $dialog = $pl->{npc_dialog};
2640 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2641
2642 } else {
1691 $msg = $npc->name . " says: $msg" if $npc; 2643 $msg = $npc->name . " says: $msg" if $npc;
1692 $self->message ($msg, $flags); 2644 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2645 }
1693 } 2646 }
2647}
2648
2649=item $object->send_msg ($channel, $msg, $color, [extra...])
2650
2651=cut
2652
2653sub cf::object::send_msg {
2654 my $pl = shift->contr
2655 or return;
2656 $pl->send_msg (@_);
1694} 2657}
1695 2658
1696=item $player_object->may ("access") 2659=item $player_object->may ("access")
1697 2660
1698Returns wether the given player is authorized to access resource "access" 2661Returns wether the given player is authorized to access resource "access"
1711 2674
1712=item $player_object->enter_link 2675=item $player_object->enter_link
1713 2676
1714Freezes the player and moves him/her to a special map (C<{link}>). 2677Freezes the player and moves him/her to a special map (C<{link}>).
1715 2678
1716The player should be reasonably safe there for short amounts of time. You 2679The player should be reasonably safe there for short amounts of time (e.g.
1717I<MUST> call C<leave_link> as soon as possible, though. 2680for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2681though, as the player cannot control the character while it is on the link
2682map.
1718 2683
1719Will never block. 2684Will never block.
1720 2685
1721=item $player_object->leave_link ($map, $x, $y) 2686=item $player_object->leave_link ($map, $x, $y)
1722 2687
1730=cut 2695=cut
1731 2696
1732sub link_map { 2697sub link_map {
1733 unless ($LINK_MAP) { 2698 unless ($LINK_MAP) {
1734 $LINK_MAP = cf::map::find "{link}" 2699 $LINK_MAP = cf::map::find "{link}"
1735 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 2700 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1736 $LINK_MAP->load; 2701 $LINK_MAP->load;
1737 } 2702 }
1738 2703
1739 $LINK_MAP 2704 $LINK_MAP
1740} 2705}
1742sub cf::object::player::enter_link { 2707sub cf::object::player::enter_link {
1743 my ($self) = @_; 2708 my ($self) = @_;
1744 2709
1745 $self->deactivate_recursive; 2710 $self->deactivate_recursive;
1746 2711
2712 ++$self->{_link_recursion};
2713
1747 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2714 return if UNIVERSAL::isa $self->map, "ext::map_link";
1748 2715
1749 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2716 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1750 if $self->map; 2717 if $self->map && $self->map->{path} ne "{link}";
1751 2718
1752 $self->enter_map ($LINK_MAP || link_map, 20, 20); 2719 $self->enter_map ($LINK_MAP || link_map, 3, 3);
1753} 2720}
1754 2721
1755sub cf::object::player::leave_link { 2722sub cf::object::player::leave_link {
1756 my ($self, $map, $x, $y) = @_; 2723 my ($self, $map, $x, $y) = @_;
2724
2725 return unless $self->contr->active;
1757 2726
1758 my $link_pos = delete $self->{_link_pos}; 2727 my $link_pos = delete $self->{_link_pos};
1759 2728
1760 unless ($map) { 2729 unless ($map) {
1761 # restore original map position 2730 # restore original map position
1772 ($x, $y) = (-1, -1) 2741 ($x, $y) = (-1, -1)
1773 unless (defined $x) && (defined $y); 2742 unless (defined $x) && (defined $y);
1774 2743
1775 # use -1 or undef as default coordinates, not 0, 0 2744 # use -1 or undef as default coordinates, not 0, 0
1776 ($x, $y) = ($map->enter_x, $map->enter_y) 2745 ($x, $y) = ($map->enter_x, $map->enter_y)
1777 if $x <=0 && $y <= 0; 2746 if $x <= 0 && $y <= 0;
1778 2747
1779 $map->load; 2748 $map->load;
1780 $map->load_diag; 2749 $map->load_neighbours;
1781 2750
1782 return unless $self->contr->active; 2751 return unless $self->contr->active;
2752
2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2754 if ($self->enter_map ($map, $x, $y)) {
2755 # entering was successful
2756 delete $self->{_link_recursion};
2757 # only activate afterwards, to support waiting in hooks
1783 $self->activate_recursive; 2758 $self->activate_recursive;
1784 $self->enter_map ($map, $x, $y);
1785}
1786
1787cf::player->attach (
1788 on_logout => sub {
1789 my ($pl) = @_;
1790
1791 # abort map switching before logout
1792 if ($pl->ob->{_link_pos}) {
1793 cf::sync_job {
1794 $pl->ob->leave_link
1795 };
1796 }
1797 }, 2759 }
1798 on_login => sub {
1799 my ($pl) = @_;
1800 2760
1801 # try to abort aborted map switching on player login :) 2761}
1802 # should happen only on crashes
1803 if ($pl->ob->{_link_pos}) {
1804 $pl->ob->enter_link;
1805 (async {
1806 # we need this sleep as the login has a concurrent enter_exit running
1807 # and this sleep increases chances of the player not ending up in scorn
1808 $pl->ob->reply (undef,
1809 "There was an internal problem at your last logout, "
1810 . "the server will try to bring you to your intended destination in a second.",
1811 cf::NDI_RED);
1812 Coro::Timer::sleep 1;
1813 $pl->ob->leave_link;
1814 })->prio (2);
1815 }
1816 },
1817);
1818 2762
1819=item $player_object->goto ($path, $x, $y) 2763=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
1820 2764
2765Moves the player to the given map-path and coordinates by first freezing
2766her, loading and preparing them map, calling the provided $check callback
2767that has to return the map if sucecssful, and then unfreezes the player on
2768the new (success) or old (failed) map position. In either case, $done will
2769be called at the end of this process.
2770
2771Note that $check will be called with a potentially non-loaded map, so if
2772it needs a loaded map it has to call C<< ->load >>.
2773
1821=cut 2774=cut
2775
2776our $GOTOGEN;
1822 2777
1823sub cf::object::player::goto { 2778sub cf::object::player::goto {
1824 my ($self, $path, $x, $y) = @_; 2779 my ($self, $path, $x, $y, $check, $done) = @_;
2780
2781 if ($self->{_link_recursion} >= $MAX_LINKS) {
2782 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2783 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2784 ($path, $x, $y) = @$EMERGENCY_POSITION;
2785 }
2786
2787 # do generation counting so two concurrent goto's will be executed in-order
2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1825 2789
1826 $self->enter_link; 2790 $self->enter_link;
1827 2791
1828 (async { 2792 (async {
1829 my $map = cf::map::find $path; 2793 $Coro::current->{desc} = "player::goto $path $x $y";
2794
2795 # *tag paths override both path and x|y
2796 if ($path =~ /^\*(.*)$/) {
2797 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2798 my $ob = $obs[rand @obs];
2799
2800 # see if we actually can go there
2801 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2802 $ob = $obs[rand @obs];
2803 } else {
2804 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2805 }
2806 # else put us there anyways for now #d#
2807
2808 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2809 } else {
2810 ($path, $x, $y) = (undef, undef, undef);
2811 }
2812 }
2813
2814 my $map = eval {
2815 my $map = defined $path ? cf::map::find $path : undef;
2816
2817 if ($map) {
1830 $map = $map->customise_for ($self) if $map; 2818 $map = $map->customise_for ($self);
1831 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
1832# warn "entering ", $map->path, " at ($x, $y)\n" 2820 } else {
1833# if $map;
1834
1835 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2821 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2822 }
1836 2823
2824 $map
2825 };
2826
2827 if ($@) {
2828 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2829 LOG llevError | logBacktrace, Carp::longmess $@;
2830 }
2831
2832 if ($gen == $self->{_goto_generation}) {
2833 delete $self->{_goto_generation};
1837 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2835 }
2836
2837 $done->($self) if $done;
1838 })->prio (1); 2838 })->prio (1);
1839} 2839}
1840 2840
1841=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
1842 2842
1862} 2862}
1863 2863
1864sub prepare_random_map { 2864sub prepare_random_map {
1865 my ($exit) = @_; 2865 my ($exit) = @_;
1866 2866
1867 my $guard = cf::lock_acquire "exit_prepare:$exit";
1868
1869 # all this does is basically replace the /! path by 2867 # all this does is basically replace the /! path by
1870 # a new random map path (?random/...) with a seed 2868 # a new random map path (?random/...) with a seed
1871 # that depends on the exit object 2869 # that depends on the exit object
1872 2870
1873 my $rmp = parse_random_map_params $exit->msg; 2871 my $rmp = parse_random_map_params $exit->msg;
1874 2872
1875 if ($exit->map) { 2873 if ($exit->map) {
1876 $rmp->{region} = $exit->map->region_name; 2874 $rmp->{region} = $exit->region->name;
1877 $rmp->{origin_map} = $exit->map->path; 2875 $rmp->{origin_map} = $exit->map->path;
1878 $rmp->{origin_x} = $exit->x; 2876 $rmp->{origin_x} = $exit->x;
1879 $rmp->{origin_y} = $exit->y; 2877 $rmp->{origin_y} = $exit->y;
2878
2879 $exit->map->touch;
1880 } 2880 }
1881 2881
1882 $rmp->{random_seed} ||= $exit->random_seed; 2882 $rmp->{random_seed} ||= $exit->random_seed;
1883 2883
1884 my $data = cf::to_json $rmp; 2884 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
1885 my $md5 = Digest::MD5::md5_hex $data; 2885 my $md5 = Digest::MD5::md5_hex $data;
1886 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2886 my $meta = "$RANDOMDIR/$md5.meta";
1887 2887
1888 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2888 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1889 aio_write $fh, 0, (length $data), $data, 0; 2889 aio_write $fh, 0, (length $data), $data, 0;
1890 undef $fh; 2890 undef $fh;
1891 aio_rename "$meta~", $meta; 2891 aio_rename "$meta~", $meta;
1892 2892
2893 my $slaying = "?random/$md5";
2894
2895 if ($exit->valid) {
1893 $exit->slaying ("?random/$md5"); 2896 $exit->slaying ("?random/$md5");
1894 $exit->msg (undef); 2897 $exit->msg (undef);
2898 }
1895 } 2899 }
1896} 2900}
1897 2901
1898sub cf::object::player::enter_exit { 2902sub cf::object::player::enter_exit {
1899 my ($self, $exit) = @_; 2903 my ($self, $exit) = @_;
1901 return unless $self->type == cf::PLAYER; 2905 return unless $self->type == cf::PLAYER;
1902 2906
1903 $self->enter_link; 2907 $self->enter_link;
1904 2908
1905 (async { 2909 (async {
1906 $self->deactivate_recursive; # just to be sure 2910 $Coro::current->{desc} = "enter_exit";
2911
1907 unless (eval { 2912 unless (eval {
2913 $self->deactivate_recursive; # just to be sure
2914
2915 # random map handling
2916 {
2917 my $guard = cf::lock_acquire "exit_prepare:$exit";
2918
1908 prepare_random_map $exit 2919 prepare_random_map $exit
1909 if $exit->slaying eq "/!"; 2920 if $exit->slaying eq "/!";
2921 }
1910 2922
1911 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path; 2923 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1912 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 2924 my $x = $exit->stats->hp;
2925 my $y = $exit->stats->sp;
1913 2926
2927 $self->goto ($map, $x, $y);
2928
2929 # if exit is damned, update players death & WoR home-position
2930 $self->contr->savebed ($map, $x, $y)
2931 if $exit->flag (cf::FLAG_DAMNED);
2932
1914 1; 2933 1
1915 }) { 2934 }) {
1916 $self->message ("Something went wrong deep within the crossfire server. " 2935 $self->message ("Something went wrong deep within the deliantra server. "
1917 . "I'll try to bring you back to the map you were before. " 2936 . "I'll try to bring you back to the map you were before. "
1918 . "Please report this to the dungeon master!", 2937 . "Please report this to the dungeon master!",
1919 cf::NDI_UNIQUE | cf::NDI_RED); 2938 cf::NDI_UNIQUE | cf::NDI_RED);
1920 2939
1921 warn "ERROR in enter_exit: $@"; 2940 error "ERROR in enter_exit: $@";
1922 $self->leave_link; 2941 $self->leave_link;
1923 } 2942 }
1924 })->prio (1); 2943 })->prio (1);
1925} 2944}
1926 2945
1937 2956
1938sub cf::client::send_drawinfo { 2957sub cf::client::send_drawinfo {
1939 my ($self, $text, $flags) = @_; 2958 my ($self, $text, $flags) = @_;
1940 2959
1941 utf8::encode $text; 2960 utf8::encode $text;
1942 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2961 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1943} 2962}
1944 2963
2964=item $client->send_big_packet ($pkt)
2965
2966Like C<send_packet>, but tries to compress large packets, and fragments
2967them as required.
2968
2969=cut
2970
2971our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2972
2973sub cf::client::send_big_packet {
2974 my ($self, $pkt) = @_;
2975
2976 # try lzf for large packets
2977 $pkt = "lzf " . Compress::LZF::compress $pkt
2978 if 1024 <= length $pkt and $self->{can_lzf};
2979
2980 # split very large packets
2981 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2982 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2983 $pkt = "frag";
2984 }
2985
2986 $self->send_packet ($pkt);
2987}
2988
2989=item $client->send_msg ($channel, $msg, $color, [extra...])
2990
2991Send a drawinfo or msg packet to the client, formatting the msg for the
2992client if neccessary. C<$type> should be a string identifying the type of
2993the message, with C<log> being the default. If C<$color> is negative, suppress
2994the message unless the client supports the msg packet.
2995
2996=cut
2997
2998# non-persistent channels (usually the info channel)
2999our %CHANNEL = (
3000 "c/motd" => {
3001 id => "infobox",
3002 title => "MOTD",
3003 reply => undef,
3004 tooltip => "The message of the day",
3005 },
3006 "c/identify" => {
3007 id => "infobox",
3008 title => "Identify",
3009 reply => undef,
3010 tooltip => "Items recently identified",
3011 },
3012 "c/examine" => {
3013 id => "infobox",
3014 title => "Examine",
3015 reply => undef,
3016 tooltip => "Signs and other items you examined",
3017 },
3018 "c/shopinfo" => {
3019 id => "infobox",
3020 title => "Shop Info",
3021 reply => undef,
3022 tooltip => "What your bargaining skill tells you about the shop",
3023 },
3024 "c/book" => {
3025 id => "infobox",
3026 title => "Book",
3027 reply => undef,
3028 tooltip => "The contents of a note or book",
3029 },
3030 "c/lookat" => {
3031 id => "infobox",
3032 title => "Look",
3033 reply => undef,
3034 tooltip => "What you saw there",
3035 },
3036 "c/who" => {
3037 id => "infobox",
3038 title => "Players",
3039 reply => undef,
3040 tooltip => "Shows players who are currently online",
3041 },
3042 "c/body" => {
3043 id => "infobox",
3044 title => "Body Parts",
3045 reply => undef,
3046 tooltip => "Shows which body parts you posess and are available",
3047 },
3048 "c/statistics" => {
3049 id => "infobox",
3050 title => "Statistics",
3051 reply => undef,
3052 tooltip => "Shows your primary statistics",
3053 },
3054 "c/skills" => {
3055 id => "infobox",
3056 title => "Skills",
3057 reply => undef,
3058 tooltip => "Shows your experience per skill and item power",
3059 },
3060 "c/shopitems" => {
3061 id => "infobox",
3062 title => "Shop Items",
3063 reply => undef,
3064 tooltip => "Shows the items currently for sale in this shop",
3065 },
3066 "c/resistances" => {
3067 id => "infobox",
3068 title => "Resistances",
3069 reply => undef,
3070 tooltip => "Shows your resistances",
3071 },
3072 "c/pets" => {
3073 id => "infobox",
3074 title => "Pets",
3075 reply => undef,
3076 tooltip => "Shows information abotu your pets/a specific pet",
3077 },
3078 "c/perceiveself" => {
3079 id => "infobox",
3080 title => "Perceive Self",
3081 reply => undef,
3082 tooltip => "You gained detailed knowledge about yourself",
3083 },
3084 "c/uptime" => {
3085 id => "infobox",
3086 title => "Uptime",
3087 reply => undef,
3088 tooltip => "How long the server has been running since last restart",
3089 },
3090 "c/mapinfo" => {
3091 id => "infobox",
3092 title => "Map Info",
3093 reply => undef,
3094 tooltip => "Information related to the maps",
3095 },
3096 "c/party" => {
3097 id => "party",
3098 title => "Party",
3099 reply => "gsay ",
3100 tooltip => "Messages and chat related to your party",
3101 },
3102 "c/death" => {
3103 id => "death",
3104 title => "Death",
3105 reply => undef,
3106 tooltip => "Reason for and more info about your most recent death",
3107 },
3108 "c/say" => $SAY_CHANNEL,
3109 "c/chat" => $CHAT_CHANNEL,
3110);
3111
3112sub cf::client::send_msg {
3113 my ($self, $channel, $msg, $color, @extra) = @_;
3114
3115 $msg = $self->pl->expand_cfpod ($msg)
3116 unless $color & cf::NDI_VERBATIM;
3117
3118 $color &= cf::NDI_CLIENT_MASK; # just in case...
3119
3120 # check predefined channels, for the benefit of C
3121 if ($CHANNEL{$channel}) {
3122 $channel = $CHANNEL{$channel};
3123
3124 $self->ext_msg (channel_info => $channel);
3125 $channel = $channel->{id};
3126
3127 } elsif (ref $channel) {
3128 # send meta info to client, if not yet sent
3129 unless (exists $self->{channel}{$channel->{id}}) {
3130 $self->{channel}{$channel->{id}} = $channel;
3131 $self->ext_msg (channel_info => $channel);
3132 }
3133
3134 $channel = $channel->{id};
3135 }
3136
3137 return unless @extra || length $msg;
3138
3139 # default colour, mask it out
3140 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
3141 if $color & cf::NDI_DEF;
3142
3143 my $pkt = "msg "
3144 . $self->{json_coder}->encode (
3145 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
3146 );
3147
3148 $self->send_big_packet ($pkt);
3149}
3150
3151=item $client->ext_msg ($type, @msg)
3152
3153Sends an ext event to the client.
3154
3155=cut
3156
3157sub cf::client::ext_msg($$@) {
3158 my ($self, $type, @msg) = @_;
3159
3160 if ($self->extcmd == 2) {
3161 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3162 } elsif ($self->extcmd == 1) { # TODO: remove
3163 push @msg, msgtype => "event_$type";
3164 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3165 }
3166}
3167
3168=item $client->ext_reply ($msgid, @msg)
3169
3170Sends an ext reply to the client.
3171
3172=cut
3173
3174sub cf::client::ext_reply($$@) {
3175 my ($self, $id, @msg) = @_;
3176
3177 if ($self->extcmd == 2) {
3178 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3179 } elsif ($self->extcmd == 1) {
3180 #TODO: version 1, remove
3181 unshift @msg, msgtype => "reply", msgid => $id;
3182 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3183 }
3184}
1945 3185
1946=item $success = $client->query ($flags, "text", \&cb) 3186=item $success = $client->query ($flags, "text", \&cb)
1947 3187
1948Queues a query to the client, calling the given callback with 3188Queues a query to the client, calling the given callback with
1949the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 3189the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1950C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 3190C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
1951 3191
1952Queries can fail, so check the return code. Or don't, as queries will become 3192Queries can fail, so check the return code. Or don't, as queries will
1953reliable at some point in the future. 3193become reliable at some point in the future.
1954 3194
1955=cut 3195=cut
1956 3196
1957sub cf::client::query { 3197sub cf::client::query {
1958 my ($self, $flags, $text, $cb) = @_; 3198 my ($self, $flags, $text, $cb) = @_;
1966 utf8::encode $text; 3206 utf8::encode $text;
1967 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 3207 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
1968 3208
1969 $self->send_packet ($self->{query_queue}[0][0]) 3209 $self->send_packet ($self->{query_queue}[0][0])
1970 if @{ $self->{query_queue} } == 1; 3210 if @{ $self->{query_queue} } == 1;
3211
3212 1
1971} 3213}
1972 3214
1973cf::client->attach ( 3215cf::client->attach (
3216 on_connect => sub {
3217 my ($ns) = @_;
3218
3219 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
3220 },
1974 on_reply => sub { 3221 on_reply => sub {
1975 my ($ns, $msg) = @_; 3222 my ($ns, $msg) = @_;
1976 3223
1977 # this weird shuffling is so that direct followup queries 3224 # this weird shuffling is so that direct followup queries
1978 # get handled first 3225 # get handled first
1979 my $queue = delete $ns->{query_queue} 3226 my $queue = delete $ns->{query_queue}
1980 or return; # be conservative, not sure how that can happen, but we saw a crash here 3227 or return; # be conservative, not sure how that can happen, but we saw a crash here
1981 3228
1982 (shift @$queue)->[1]->($msg); 3229 (shift @$queue)->[1]->($msg);
3230 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1983 3231
1984 push @{ $ns->{query_queue} }, @$queue; 3232 push @{ $ns->{query_queue} }, @$queue;
1985 3233
1986 if (@{ $ns->{query_queue} } == @$queue) { 3234 if (@{ $ns->{query_queue} } == @$queue) {
1987 if (@$queue) { 3235 if (@$queue) {
1989 } else { 3237 } else {
1990 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 3238 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
1991 } 3239 }
1992 } 3240 }
1993 }, 3241 },
3242 on_exticmd => sub {
3243 my ($ns, $buf) = @_;
3244
3245 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3246
3247 if (ref $msg) {
3248 my ($type, $reply, @payload) =
3249 "ARRAY" eq ref $msg
3250 ? @$msg
3251 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3252
3253 my @reply;
3254
3255 if (my $cb = $EXTICMD{$type}) {
3256 @reply = $cb->($ns, @payload);
3257 }
3258
3259 $ns->ext_reply ($reply, @reply)
3260 if $reply;
3261
3262 } else {
3263 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3264 }
3265
3266 cf::override;
3267 },
1994); 3268);
1995 3269
1996=item $client->async (\&cb) 3270=item $client->async (\&cb)
1997 3271
1998Create a new coroutine, running the specified callback. The coroutine will 3272Create a new coroutine, running the specified callback. The coroutine will
2014 3288
2015 $coro 3289 $coro
2016} 3290}
2017 3291
2018cf::client->attach ( 3292cf::client->attach (
2019 on_destroy => sub { 3293 on_client_destroy => sub {
2020 my ($ns) = @_; 3294 my ($ns) = @_;
2021 3295
2022 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3296 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2023 }, 3297 },
2024); 3298);
2039our $safe = new Safe "safe"; 3313our $safe = new Safe "safe";
2040our $safe_hole = new Safe::Hole; 3314our $safe_hole = new Safe::Hole;
2041 3315
2042$SIG{FPE} = 'IGNORE'; 3316$SIG{FPE} = 'IGNORE';
2043 3317
2044$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3318$safe->permit_only (Opcode::opset qw(
3319 :base_core :base_mem :base_orig :base_math :base_loop
3320 grepstart grepwhile mapstart mapwhile
3321 sort time
3322));
2045 3323
2046# here we export the classes and methods available to script code 3324# here we export the classes and methods available to script code
2047 3325
2048=pod 3326=pod
2049 3327
2050The following fucntions and emthods are available within a safe environment: 3328The following functions and methods are available within a safe environment:
2051 3329
2052 cf::object contr pay_amount pay_player map 3330 cf::object
3331 contr pay_amount pay_player map x y force_find force_add destroy
3332 insert remove name archname title slaying race decrease split
3333 value
3334
2053 cf::object::player player 3335 cf::object::player
2054 cf::player peaceful 3336 player
2055 cf::map trigger 3337
3338 cf::player
3339 peaceful
3340
3341 cf::map
3342 trigger
2056 3343
2057=cut 3344=cut
2058 3345
2059for ( 3346for (
2060 ["cf::object" => qw(contr pay_amount pay_player map)], 3347 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3348 insert remove inv nrof name archname title slaying race
3349 decrease split destroy change_exp value msg lore send_msg)],
2061 ["cf::object::player" => qw(player)], 3350 ["cf::object::player" => qw(player)],
2062 ["cf::player" => qw(peaceful)], 3351 ["cf::player" => qw(peaceful send_msg)],
2063 ["cf::map" => qw(trigger)], 3352 ["cf::map" => qw(trigger)],
2064) { 3353) {
2065 no strict 'refs';
2066 my ($pkg, @funs) = @$_; 3354 my ($pkg, @funs) = @$_;
2067 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3355 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2068 for @funs; 3356 for @funs;
2069} 3357}
2070 3358
2085 3373
2086 my $qcode = $code; 3374 my $qcode = $code;
2087 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3375 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2088 $qcode =~ s/\n/\\n/g; 3376 $qcode =~ s/\n/\\n/g;
2089 3377
3378 %vars = (_dummy => 0) unless %vars;
3379
3380 my @res;
2090 local $_; 3381 local $_;
2091 local @safe::cf::_safe_eval_args = values %vars;
2092 3382
2093 my $eval = 3383 my $eval =
2094 "do {\n" 3384 "do {\n"
2095 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3385 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2096 . "#line 0 \"{$qcode}\"\n" 3386 . "#line 0 \"{$qcode}\"\n"
2097 . $code 3387 . $code
2098 . "\n}" 3388 . "\n}"
2099 ; 3389 ;
2100 3390
3391 if ($CFG{safe_eval}) {
2101 sub_generation_inc; 3392 sub_generation_inc;
3393 local @safe::cf::_safe_eval_args = values %vars;
2102 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3394 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2103 sub_generation_inc; 3395 sub_generation_inc;
3396 } else {
3397 local @cf::_safe_eval_args = values %vars;
3398 @res = wantarray ? eval eval : scalar eval $eval;
3399 }
2104 3400
2105 if ($@) { 3401 if ($@) {
2106 warn "$@"; 3402 warn "$@",
2107 warn "while executing safe code '$code'\n"; 3403 "while executing safe code '$code'\n",
2108 warn "with arguments " . (join " ", %vars) . "\n"; 3404 "with arguments " . (join " ", %vars) . "\n";
2109 } 3405 }
2110 3406
2111 wantarray ? @res : $res[0] 3407 wantarray ? @res : $res[0]
2112} 3408}
2113 3409
2127=cut 3423=cut
2128 3424
2129sub register_script_function { 3425sub register_script_function {
2130 my ($fun, $cb) = @_; 3426 my ($fun, $cb) = @_;
2131 3427
2132 no strict 'refs'; 3428 $fun = "safe::$fun" if $CFG{safe_eval};
2133 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3429 *$fun = $safe_hole->wrap ($cb);
2134} 3430}
2135 3431
2136=back 3432=back
2137 3433
2138=cut 3434=cut
2139 3435
2140############################################################################# 3436#############################################################################
3437# the server's init and main functions
2141 3438
2142=head2 EXTENSION DATABASE SUPPORT 3439sub load_facedata($) {
3440 my ($path) = @_;
2143 3441
2144Crossfire maintains a very simple database for extension use. It can 3442 # HACK to clear player env face cache, we need some signal framework
2145currently store anything that can be serialised using Storable, which 3443 # for this (global event?)
2146excludes objects. 3444 %ext::player_env::MUSIC_FACE_CACHE = ();
2147 3445
2148The parameter C<$family> should best start with the name of the extension 3446 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2149using it, it should be unique.
2150 3447
2151=over 4 3448 trace "loading facedata from $path\n";
2152 3449
2153=item $hashref = cf::db_get $family 3450 my $facedata = decode_storable load_file $path;
2154 3451
2155Return a hashref for use by the extension C<$family>, which can be 3452 $facedata->{version} == 2
2156modified. After modifications, you have to call C<cf::db_dirty> or 3453 or cf::cleanup "$path: version mismatch, cannot proceed.";
2157C<cf::db_sync>.
2158 3454
2159=item $value = cf::db_get $family => $key 3455 # patch in the exptable
2160 3456 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
2161Returns a single value from the database 3457 $facedata->{resource}{"res/exp_table"} = {
2162 3458 type => FT_RSRC,
2163=item cf::db_put $family => $hashref 3459 data => $exp_table,
2164 3460 hash => (Digest::MD5::md5 $exp_table),
2165Stores the given family hashref into the database. Updates are delayed, if
2166you want the data to be synced to disk immediately, use C<cf::db_sync>.
2167
2168=item cf::db_put $family => $key => $value
2169
2170Stores the given C<$value> in the family hash. Updates are delayed, if you
2171want the data to be synced to disk immediately, use C<cf::db_sync>.
2172
2173=item cf::db_dirty
2174
2175Marks the database as dirty, to be updated at a later time.
2176
2177=item cf::db_sync
2178
2179Immediately write the database to disk I<if it is dirty>.
2180
2181=cut
2182
2183our $DB;
2184
2185{
2186 my $path = cf::localdir . "/database.pst";
2187
2188 sub db_load() {
2189 $DB = stat $path ? Storable::retrieve $path : { };
2190 } 3461 };
3462 cf::cede_to_tick;
2191 3463
2192 my $pid;
2193
2194 sub db_save() {
2195 waitpid $pid, 0 if $pid;
2196 if (0 == ($pid = fork)) {
2197 $DB->{_meta}{version} = 1;
2198 Storable::nstore $DB, "$path~";
2199 rename "$path~", $path;
2200 cf::_exit 0 if defined $pid;
2201 }
2202 } 3464 {
3465 my $faces = $facedata->{faceinfo};
2203 3466
2204 my $dirty; 3467 while (my ($face, $info) = each %$faces) {
3468 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2205 3469
2206 sub db_sync() { 3470 cf::face::set_visibility $idx, $info->{visibility};
2207 db_save if $dirty; 3471 cf::face::set_magicmap $idx, $info->{magicmap};
2208 undef $dirty; 3472 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2209 } 3473 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3474 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
2210 3475
2211 my $idle = Event->idle ( 3476 cf::cede_to_tick;
2212 reentrant => 0,
2213 min => 10,
2214 max => 20,
2215 repeat => 0,
2216 data => WF_AUTOCANCEL,
2217 cb => \&db_sync,
2218 );
2219
2220 sub db_dirty() {
2221 $dirty = 1;
2222 $idle->start;
2223 }
2224
2225 sub db_get($;$) {
2226 @_ >= 2
2227 ? $DB->{$_[0]}{$_[1]}
2228 : ($DB->{$_[0]} ||= { })
2229 }
2230
2231 sub db_put($$;$) {
2232 if (@_ >= 3) {
2233 $DB->{$_[0]}{$_[1]} = $_[2];
2234 } else {
2235 $DB->{$_[0]} = $_[1];
2236 }
2237 db_dirty;
2238 }
2239
2240 cf::global->attach (
2241 prio => 10000,
2242 on_cleanup => sub {
2243 db_sync;
2244 }, 3477 }
2245 );
2246}
2247 3478
2248############################################################################# 3479 while (my ($face, $info) = each %$faces) {
2249# the server's main() 3480 next unless $info->{smooth};
2250 3481
2251sub cfg_load { 3482 my $idx = cf::face::find $face
2252 open my $fh, "<:utf8", cf::confdir . "/config" 3483 or next;
2253 or return;
2254 3484
2255 local $/; 3485 if (my $smooth = cf::face::find $info->{smooth}) {
2256 *CFG = YAML::Syck::Load <$fh>; 3486 cf::face::set_smooth $idx, $smooth;
3487 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3488 } else {
3489 error "smooth face '$info->{smooth}' not found for face '$face'";
3490 }
2257 3491
3492 cf::cede_to_tick;
3493 }
3494 }
3495
3496 {
3497 my $anims = $facedata->{animinfo};
3498
3499 while (my ($anim, $info) = each %$anims) {
3500 cf::anim::set $anim, $info->{frames}, $info->{facings};
3501 cf::cede_to_tick;
3502 }
3503
3504 cf::anim::invalidate_all; # d'oh
3505 }
3506
3507 {
3508 my $res = $facedata->{resource};
3509
3510 while (my ($name, $info) = each %$res) {
3511 if (defined $info->{type}) {
3512 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3513
3514 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3515 cf::face::set_type $idx, $info->{type};
3516 } else {
3517 $RESOURCE{$name} = $info; # unused
3518 }
3519
3520 cf::cede_to_tick;
3521 }
3522 }
3523
3524 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3525
3526 1
3527}
3528
3529register_exticmd fx_want => sub {
3530 my ($ns, $want) = @_;
3531
3532 while (my ($k, $v) = each %$want) {
3533 $ns->fx_want ($k, $v);
3534 }
3535};
3536
3537sub load_resource_file($) {
3538 my $guard = lock_acquire "load_resource_file";
3539
3540 my $status = load_resource_file_ $_[0];
3541 get_slot 0.1, 100;
3542 cf::arch::commit_load;
3543
3544 $status
3545}
3546
3547sub reload_regions {
3548 # HACK to clear player env face cache, we need some signal framework
3549 # for this (global event?)
3550 %ext::player_env::MUSIC_FACE_CACHE = ();
3551
3552 load_resource_file "$MAPDIR/regions"
3553 or die "unable to load regions file\n";
3554
3555 for (cf::region::list) {
3556 $_->{match} = qr/$_->{match}/
3557 if exists $_->{match};
3558 }
3559}
3560
3561sub reload_facedata {
3562 load_facedata "$DATADIR/facedata"
3563 or die "unable to load facedata\n";
3564}
3565
3566sub reload_archetypes {
3567 load_resource_file "$DATADIR/archetypes"
3568 or die "unable to load archetypes\n";
3569}
3570
3571sub reload_treasures {
3572 load_resource_file "$DATADIR/treasures"
3573 or die "unable to load treasurelists\n";
3574}
3575
3576sub reload_sound {
3577 trace "loading sound config from $DATADIR/sound\n";
3578
3579 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3580
3581 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3582 my $sound = $soundconf->{compat}[$_]
3583 or next;
3584
3585 my $face = cf::face::find "sound/$sound->[1]";
3586 cf::sound::set $sound->[0] => $face;
3587 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3588 }
3589
3590 while (my ($k, $v) = each %{$soundconf->{event}}) {
3591 my $face = cf::face::find "sound/$v";
3592 cf::sound::set $k => $face;
3593 }
3594}
3595
3596sub reload_resources {
3597 trace "reloading resource files...\n";
3598
3599 reload_exp_table;
3600 reload_materials;
3601 reload_facedata;
3602 reload_sound;
3603 reload_archetypes;
3604 reload_regions;
3605 reload_treasures;
3606
3607 trace "finished reloading resource files\n";
3608}
3609
3610sub reload_config {
3611 trace "reloading config file...\n";
3612
3613 my $config = load_file "$CONFDIR/config";
3614 utf8::decode $config;
3615 *CFG = decode_yaml $config;
3616
2258 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3617 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2259 3618
2260 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3619 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2261 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3620 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2262 3621
2263 if (exists $CFG{mlockall}) { 3622 if (exists $CFG{mlockall}) {
2267 }; 3626 };
2268 warn $@ if $@; 3627 warn $@ if $@;
2269 } 3628 }
2270} 3629}
2271 3630
3631sub pidfile() {
3632 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3633 or die "$PIDFILE: $!";
3634 flock $fh, &Fcntl::LOCK_EX
3635 or die "$PIDFILE: flock: $!";
3636 $fh
3637}
3638
3639# make sure only one server instance is running at any one time
3640sub atomic {
3641 my $fh = pidfile;
3642
3643 my $pid = <$fh>;
3644 kill 9, $pid if $pid > 0;
3645
3646 seek $fh, 0, 0;
3647 print $fh $$;
3648}
3649
3650sub main_loop {
3651 trace "EV::loop starting\n";
3652 if (1) {
3653 EV::loop;
3654 }
3655 trace "EV::loop returned\n";
3656 goto &main_loop unless $REALLY_UNLOOP;
3657}
3658
2272sub main { 3659sub main {
3660 cf::init_globals; # initialise logging
3661
3662 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3663 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3664 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3665 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3666
3667 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3668
2273 # we must not ever block the main coroutine 3669 # we must not ever block the main coroutine
2274 local $Coro::idle = sub { 3670 local $Coro::idle = sub {
2275 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3671 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2276 (async { 3672 (async {
2277 Event::one_event; 3673 $Coro::current->{desc} = "IDLE BUG HANDLER";
3674 EV::loop EV::LOOP_ONESHOT;
2278 })->prio (Coro::PRIO_MAX); 3675 })->prio (Coro::PRIO_MAX);
2279 }; 3676 };
2280 3677
2281 cfg_load; 3678 evthread_start IO::AIO::poll_fileno;
2282 db_load; 3679
3680 cf::sync_job {
3681 cf::incloader::init ();
3682
3683 cf::init_anim;
3684 cf::init_attackmess;
3685 cf::init_dynamic;
3686
3687 cf::load_settings;
3688
3689 reload_resources;
3690 reload_config;
3691 db_init;
3692
3693 cf::init_uuid;
3694 cf::init_signals;
3695 cf::init_skills;
3696
3697 cf::init_beforeplay;
3698
3699 atomic;
3700
2283 load_extensions; 3701 load_extensions;
2284 3702
2285 $TICK_WATCHER->start; 3703 utime time, time, $RUNTIMEFILE;
2286 Event::loop; 3704
3705 # no (long-running) fork's whatsoever before this point(!)
3706 use POSIX ();
3707 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3708
3709 cf::_post_init 0;
3710 };
3711
3712 cf::object::thawer::errors_are_fatal 0;
3713 info "parse errors in files are no longer fatal from this point on.\n";
3714
3715 my $free_main; $free_main = EV::idle sub {
3716 undef $free_main;
3717 undef &main; # free gobs of memory :)
3718 };
3719
3720 goto &main_loop;
2287} 3721}
2288 3722
2289############################################################################# 3723#############################################################################
2290# initialisation and cleanup 3724# initialisation and cleanup
2291 3725
2292# install some emergency cleanup handlers 3726# install some emergency cleanup handlers
2293BEGIN { 3727BEGIN {
3728 our %SIGWATCHER = ();
2294 for my $signal (qw(INT HUP TERM)) { 3729 for my $signal (qw(INT HUP TERM)) {
2295 Event->signal ( 3730 $SIGWATCHER{$signal} = AE::signal $signal, sub {
2296 reentrant => 0,
2297 data => WF_AUTOCANCEL,
2298 signal => $signal,
2299 cb => sub {
2300 cf::cleanup "SIG$signal"; 3731 cf::cleanup "SIG$signal";
2301 },
2302 ); 3732 };
3733 }
3734}
3735
3736sub write_runtime_sync {
3737 my $t0 = AE::time;
3738
3739 # first touch the runtime file to show we are still running:
3740 # the fsync below can take a very very long time.
3741
3742 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3743
3744 my $guard = cf::lock_acquire "write_runtime";
3745
3746 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3747 or return;
3748
3749 my $value = $cf::RUNTIME + 90 + 10;
3750 # 10 is the runtime save interval, for a monotonic clock
3751 # 60 allows for the watchdog to kill the server.
3752
3753 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3754 and return;
3755
3756 # always fsync - this file is important
3757 aio_fsync $fh
3758 and return;
3759
3760 # touch it again to show we are up-to-date
3761 aio_utime $fh, undef, undef;
3762
3763 close $fh
3764 or return;
3765
3766 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3767 and return;
3768
3769 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3770
2303 } 3771 1
3772}
3773
3774our $uuid_lock;
3775our $uuid_skip;
3776
3777sub write_uuid_sync($) {
3778 $uuid_skip ||= $_[0];
3779
3780 return if $uuid_lock;
3781 local $uuid_lock = 1;
3782
3783 my $uuid = "$LOCALDIR/uuid";
3784
3785 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3786 or return;
3787
3788 my $value = uuid_seq uuid_cur;
3789
3790 unless ($value) {
3791 info "cowardly refusing to write zero uuid value!\n";
3792 return;
3793 }
3794
3795 my $value = uuid_str $value + $uuid_skip;
3796 $uuid_skip = 0;
3797
3798 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3799 and return;
3800
3801 # always fsync - this file is important
3802 aio_fsync $fh
3803 and return;
3804
3805 close $fh
3806 or return;
3807
3808 aio_rename "$uuid~", $uuid
3809 and return;
3810
3811 trace "uuid file written ($value).\n";
3812
3813 1
3814
3815}
3816
3817sub write_uuid($$) {
3818 my ($skip, $sync) = @_;
3819
3820 $sync ? write_uuid_sync $skip
3821 : async { write_uuid_sync $skip };
2304} 3822}
2305 3823
2306sub emergency_save() { 3824sub emergency_save() {
2307 my $freeze_guard = cf::freeze_mainloop; 3825 my $freeze_guard = cf::freeze_mainloop;
2308 3826
2309 warn "enter emergency perl save\n"; 3827 info "emergency_perl_save: enter\n";
3828
3829 # this is a trade-off: we want to be very quick here, so
3830 # save all maps without fsync, and later call a global sync
3831 # (which in turn might be very very slow)
3832 local $USE_FSYNC = 0;
2310 3833
2311 cf::sync_job { 3834 cf::sync_job {
3835 cf::write_runtime_sync; # external watchdog should not bark
3836
2312 # use a peculiar iteration method to avoid tripping on perl 3837 # use a peculiar iteration method to avoid tripping on perl
2313 # refcount bugs in for. also avoids problems with players 3838 # refcount bugs in for. also avoids problems with players
2314 # and maps saved/destroyed asynchronously. 3839 # and maps saved/destroyed asynchronously.
2315 warn "begin emergency player save\n"; 3840 info "emergency_perl_save: begin player save\n";
2316 for my $login (keys %cf::PLAYER) { 3841 for my $login (keys %cf::PLAYER) {
2317 my $pl = $cf::PLAYER{$login} or next; 3842 my $pl = $cf::PLAYER{$login} or next;
2318 $pl->valid or next; 3843 $pl->valid or next;
3844 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2319 $pl->save; 3845 $pl->save;
2320 } 3846 }
2321 warn "end emergency player save\n"; 3847 info "emergency_perl_save: end player save\n";
2322 3848
2323 warn "begin emergency map save\n"; 3849 cf::write_runtime_sync; # external watchdog should not bark
3850
3851 info "emergency_perl_save: begin map save\n";
2324 for my $path (keys %cf::MAP) { 3852 for my $path (keys %cf::MAP) {
2325 my $map = $cf::MAP{$path} or next; 3853 my $map = $cf::MAP{$path} or next;
2326 $map->valid or next; 3854 $map->valid or next;
2327 $map->save; 3855 $map->save;
2328 } 3856 }
2329 warn "end emergency map save\n"; 3857 info "emergency_perl_save: end map save\n";
3858
3859 cf::write_runtime_sync; # external watchdog should not bark
3860
3861 info "emergency_perl_save: begin database checkpoint\n";
3862 BDB::db_env_txn_checkpoint $DB_ENV;
3863 info "emergency_perl_save: end database checkpoint\n";
3864
3865 info "emergency_perl_save: begin write uuid\n";
3866 write_uuid_sync 1;
3867 info "emergency_perl_save: end write uuid\n";
3868
3869 cf::write_runtime_sync; # external watchdog should not bark
3870
3871 trace "emergency_perl_save: syncing database to disk";
3872 BDB::db_env_txn_checkpoint $DB_ENV;
3873
3874 info "emergency_perl_save: starting sync\n";
3875 IO::AIO::aio_sync sub {
3876 info "emergency_perl_save: finished sync\n";
3877 };
3878
3879 cf::write_runtime_sync; # external watchdog should not bark
3880
3881 trace "emergency_perl_save: flushing outstanding aio requests";
3882 while (IO::AIO::nreqs || BDB::nreqs) {
3883 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3884 }
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
2330 }; 3887 };
2331 3888
2332 warn "leave emergency perl save\n"; 3889 info "emergency_perl_save: leave\n";
2333} 3890}
2334 3891
3892sub post_cleanup {
3893 my ($make_core) = @_;
3894
3895 IO::AIO::flush;
3896
3897 error Carp::longmess "post_cleanup backtrace"
3898 if $make_core;
3899
3900 my $fh = pidfile;
3901 unlink $PIDFILE if <$fh> == $$;
3902}
3903
3904# a safer delete_package, copied from Symbol
3905sub clear_package($) {
3906 my $pkg = shift;
3907
3908 # expand to full symbol table name if needed
3909 unless ($pkg =~ /^main::.*::$/) {
3910 $pkg = "main$pkg" if $pkg =~ /^::/;
3911 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3912 $pkg .= '::' unless $pkg =~ /::$/;
3913 }
3914
3915 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3916 my $stem_symtab = *{$stem}{HASH};
3917
3918 defined $stem_symtab and exists $stem_symtab->{$leaf}
3919 or return;
3920
3921 # clear all symbols
3922 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3923 for my $name (keys %$leaf_symtab) {
3924 _gv_clear *{"$pkg$name"};
3925# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3926 }
3927}
3928
2335sub reload() { 3929sub do_reload_perl() {
2336 # can/must only be called in main 3930 # can/must only be called in main
2337 if ($Coro::current != $Coro::main) { 3931 unless (in_main) {
2338 warn "can only reload from main coroutine"; 3932 error "can only reload from main coroutine";
2339 return; 3933 return;
2340 } 3934 }
2341 3935
2342 warn "reloading..."; 3936 return if $RELOAD++;
2343 3937
2344 warn "cancelling server ticker"; 3938 my $t1 = AE::time;
2345 $TICK_WATCHER->cancel;
2346 3939
3940 while ($RELOAD) {
3941 cf::get_slot 0.1, -1, "reload_perl";
3942 info "perl_reload: reloading...";
3943
3944 trace "perl_reload: entering sync_job";
3945
3946 cf::sync_job {
2347 cf::emergency_save; 3947 #cf::emergency_save;
2348 3948
2349 eval {
2350 # if anything goes wrong in here, we should simply crash as we already saved
2351
2352 warn "syncing database to disk";
2353 cf::db_sync;
2354
2355 warn "cancelling all WF_AUTOCANCEL watchers";
2356 for (Event::all_watchers) {
2357 $_->cancel if $_->data & WF_AUTOCANCEL;
2358 }
2359
2360 warn "flushing outstanding aio requests";
2361 for (;;) {
2362 IO::AIO::flush;
2363 Coro::cede;
2364 last unless IO::AIO::nreqs;
2365 warn "iterate...";
2366 }
2367
2368 warn "cancelling all extension coros"; 3949 trace "perl_reload: cancelling all extension coros";
2369 $_->cancel for values %EXT_CORO; 3950 $_->cancel for values %EXT_CORO;
2370 %EXT_CORO = (); 3951 %EXT_CORO = ();
2371 3952
2372 warn "removing commands"; 3953 trace "perl_reload: removing commands";
2373 %COMMAND = (); 3954 %COMMAND = ();
2374 3955
2375 warn "removing ext commands"; 3956 trace "perl_reload: removing ext/exti commands";
2376 %EXTCMD = (); 3957 %EXTCMD = ();
3958 %EXTICMD = ();
2377 3959
2378 warn "unloading/nuking all extensions"; 3960 trace "perl_reload: unloading/nuking all extensions";
2379 for my $pkg (@EXTS) { 3961 for my $pkg (@EXTS) {
2380 warn "... unloading $pkg"; 3962 trace "... unloading $pkg";
2381 3963
2382 if (my $cb = $pkg->can ("unload")) { 3964 if (my $cb = $pkg->can ("unload")) {
2383 eval { 3965 eval {
2384 $cb->($pkg); 3966 $cb->($pkg);
2385 1 3967 1
2386 } or warn "$pkg unloaded, but with errors: $@"; 3968 } or error "$pkg unloaded, but with errors: $@";
3969 }
3970
3971 trace "... clearing $pkg";
3972 clear_package $pkg;
2387 } 3973 }
2388 3974
2389 warn "... nuking $pkg";
2390 Symbol::delete_package $pkg;
2391 }
2392
2393 warn "unloading all perl modules loaded from $LIBDIR"; 3975 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
2394 while (my ($k, $v) = each %INC) { 3976 while (my ($k, $v) = each %INC) {
2395 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3977 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2396 3978
2397 warn "... unloading $k"; 3979 trace "... unloading $k";
2398 delete $INC{$k}; 3980 delete $INC{$k};
2399 3981
2400 $k =~ s/\.pm$//; 3982 $k =~ s/\.pm$//;
2401 $k =~ s/\//::/g; 3983 $k =~ s/\//::/g;
2402 3984
2403 if (my $cb = $k->can ("unload_module")) { 3985 if (my $cb = $k->can ("unload_module")) {
2404 $cb->(); 3986 $cb->();
3987 }
3988
3989 clear_package $k;
2405 } 3990 }
2406 3991
2407 Symbol::delete_package $k;
2408 }
2409
2410 warn "getting rid of safe::, as good as possible"; 3992 trace "perl_reload: getting rid of safe::, as good as possible";
2411 Symbol::delete_package "safe::$_" 3993 clear_package "safe::$_"
2412 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3994 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2413 3995
2414 warn "unloading cf.pm \"a bit\""; 3996 trace "perl_reload: unloading cf.pm \"a bit\"";
2415 delete $INC{"cf.pm"}; 3997 delete $INC{"cf.pm"};
3998 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
2416 3999
2417 # don't, removes xs symbols, too, 4000 # don't, removes xs symbols, too,
2418 # and global variables created in xs 4001 # and global variables created in xs
2419 #Symbol::delete_package __PACKAGE__; 4002 #clear_package __PACKAGE__;
2420 4003
2421 warn "unload completed, starting to reload now"; 4004 info "perl_reload: unload completed, starting to reload now";
2422 4005
2423 warn "reloading cf.pm"; 4006 trace "perl_reload: reloading cf.pm";
2424 require cf; 4007 require cf;
2425 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4008 cf::_connect_to_perl_1;
2426 4009
2427 warn "loading config and database again"; 4010 trace "perl_reload: loading config and database again";
2428 cf::cfg_load; 4011 cf::reload_config;
2429 cf::db_load;
2430 4012
2431 warn "loading extensions"; 4013 trace "perl_reload: loading extensions";
2432 cf::load_extensions; 4014 cf::load_extensions;
2433 4015
4016 if ($REATTACH_ON_RELOAD) {
2434 warn "reattaching attachments to objects/players"; 4017 trace "perl_reload: reattaching attachments to objects/players";
2435 _global_reattach; 4018 _global_reattach; # objects, sockets
2436 warn "reattaching attachments to maps"; 4019 trace "perl_reload: reattaching attachments to maps";
2437 reattach $_ for values %MAP; 4020 reattach $_ for values %MAP;
4021 trace "perl_reload: reattaching attachments to players";
4022 reattach $_ for values %PLAYER;
4023 }
2438 4024
2439 warn "restarting server ticker"; 4025 cf::_post_init 1;
2440 4026
2441 $TICK_WATCHER->start; 4027 trace "perl_reload: leaving sync_job";
4028
4029 1
4030 } or do {
4031 error $@;
4032 cf::cleanup "perl_reload: error, exiting.";
4033 };
4034
4035 --$RELOAD;
4036 }
4037
4038 $t1 = AE::time - $t1;
4039 info "perl_reload: completed in ${t1}s\n";
4040};
4041
4042our $RELOAD_WATCHER; # used only during reload
4043
4044sub reload_perl() {
4045 # doing reload synchronously and two reloads happen back-to-back,
4046 # coro crashes during coro_state_free->destroy here.
4047
4048 $RELOAD_WATCHER ||= cf::async {
4049 Coro::AIO::aio_wait cache_extensions;
4050
4051 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
4052 do_reload_perl;
4053 undef $RELOAD_WATCHER;
4054 };
2442 }; 4055 };
2443 4056}
2444 if ($@) {
2445 warn $@;
2446 warn "error while reloading, exiting.";
2447 exit 1;
2448 }
2449
2450 warn "reloaded";
2451};
2452
2453our $RELOAD_WATCHER; # used only during reload
2454 4057
2455register_command "reload" => sub { 4058register_command "reload" => sub {
2456 my ($who, $arg) = @_; 4059 my ($who, $arg) = @_;
2457 4060
2458 if ($who->flag (FLAG_WIZ)) { 4061 if ($who->flag (FLAG_WIZ)) {
2459 $who->message ("reloading server."); 4062 $who->message ("reloading server.");
2460 4063 async {
2461 # doing reload synchronously and two reloads happen back-to-back, 4064 $Coro::current->{desc} = "perl_reload";
2462 # coro crashes during coro_state_free->destroy here.
2463
2464 $RELOAD_WATCHER ||= Event->timer (
2465 reentrant => 0,
2466 after => 0,
2467 data => WF_AUTOCANCEL,
2468 cb => sub {
2469 reload; 4065 reload_perl;
2470 undef $RELOAD_WATCHER;
2471 },
2472 ); 4066 };
2473 } 4067 }
2474}; 4068};
2475 4069
2476unshift @INC, $LIBDIR; 4070#############################################################################
2477 4071
2478my $bug_warning = 0; 4072my $bug_warning = 0;
2479 4073
2480$TICK_WATCHER = Event->timer ( 4074our @WAIT_FOR_TICK;
2481 reentrant => 0, 4075our @WAIT_FOR_TICK_BEGIN;
2482 parked => 1, 4076
2483 prio => 0, 4077sub wait_for_tick() {
2484 at => $NEXT_TICK || $TICK, 4078 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
2485 data => WF_AUTOCANCEL, 4079
2486 cb => sub { 4080 my $signal = new Coro::Signal;
4081 push @WAIT_FOR_TICK, $signal;
4082 $signal->wait;
4083}
4084
4085sub wait_for_tick_begin() {
4086 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
4087
4088 my $signal = new Coro::Signal;
4089 push @WAIT_FOR_TICK_BEGIN, $signal;
4090 $signal->wait;
4091}
4092
4093sub tick {
2487 if ($Coro::current != $Coro::main) { 4094 if ($Coro::current != $Coro::main) {
2488 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4095 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2489 unless ++$bug_warning > 10; 4096 unless ++$bug_warning > 10;
2490 return; 4097 return;
2491 } 4098 }
2492 4099
2493 $NOW = Event::time;
2494
2495 cf::server_tick; # one server iteration 4100 cf::server_tick; # one server iteration
2496 $RUNTIME += $TICK;
2497 $NEXT_TICK += $TICK;
2498 4101
2499 $WAIT_FOR_TICK->broadcast; 4102 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
2500 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2501 4103
2502 # if we are delayed by four ticks or more, skip them all 4104 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2503 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 4105 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2504 4106 Coro::async_pool {
2505 $TICK_WATCHER->at ($NEXT_TICK); 4107 $Coro::current->{desc} = "runtime saver";
2506 $TICK_WATCHER->start; 4108 write_runtime_sync
4109 or error "ERROR: unable to write runtime file: $!";
4110 };
2507 }, 4111 }
2508);
2509 4112
4113 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4114 $sig->send;
4115 }
4116 while (my $sig = shift @WAIT_FOR_TICK) {
4117 $sig->send;
4118 }
4119
4120 $LOAD = ($NOW - $TICK_START) / $TICK;
4121 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4122
4123 if (0) {
4124 if ($NEXT_TICK) {
4125 my $jitter = $TICK_START - $NEXT_TICK;
4126 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4127 debug "jitter $JITTER\n";#d#
4128 }
4129 }
4130}
4131
4132{
4133 # configure BDB
4134
4135 BDB::min_parallel 16;
4136 BDB::max_poll_reqs $TICK * 0.1;
4137 $AnyEvent::BDB::WATCHER->priority (1);
4138
4139 unless ($DB_ENV) {
4140 $DB_ENV = BDB::db_env_create;
4141 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4142 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4143 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4144 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4145 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
4146
4147 cf::sync_job {
4148 eval {
4149 BDB::db_env_open
4150 $DB_ENV,
4151 $BDBDIR,
4152 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
4153 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
4154 0666;
4155
4156 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
4157 };
4158
4159 cf::cleanup "db_env_open(db): $@" if $@;
4160 };
4161 }
4162
4163 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4164 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4165 };
4166 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4167 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4168 };
4169 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4170 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4171 };
4172}
4173
4174{
4175 # configure IO::AIO
4176
4177 IO::AIO::min_parallel 8;
2510IO::AIO::max_poll_time $TICK * 0.2; 4178 IO::AIO::max_poll_time $TICK * 0.1;
4179 undef $AnyEvent::AIO::WATCHER;
4180}
2511 4181
2512undef $Coro::AIO::WATCHER; 4182our $_log_backtrace;
2513$AIO_POLL_WATCHER = Event->io ( 4183our $_log_backtrace_last;
2514 reentrant => 0,
2515 fd => IO::AIO::poll_fileno,
2516 poll => 'r',
2517 prio => 6,
2518 data => WF_AUTOCANCEL,
2519 cb => \&IO::AIO::poll_cb,
2520);
2521 4184
2522$WRITE_RUNTIME_WATCHER = Event->timer ( 4185sub _log_backtrace {
2523 reentrant => 0, 4186 my ($msg, @addr) = @_;
2524 data => WF_AUTOCANCEL, 4187
2525 after => 1, 4188 $msg =~ s/\n$//;
2526 interval => 10, 4189
2527 prio => 6, # keep it lowest so it acts like a watchdog 4190 if ($_log_backtrace_last eq $msg) {
2528 cb => Coro::unblock_sub { 4191 LOG llevInfo, "[ABT] $msg\n";
2529 write_runtime 4192 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
2530 or warn "ERROR: unable to write runtime file: $!"; 4193 # limit the # of concurrent backtraces
4194 } elsif ($_log_backtrace < 2) {
4195 $_log_backtrace_last = $msg;
4196 ++$_log_backtrace;
4197 my $perl_bt = Carp::longmess $msg;
4198 async {
4199 $Coro::current->{desc} = "abt $msg";
4200
4201 my @bt = fork_call {
4202 @addr = map { sprintf "%x", $_ } @addr;
4203 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
4204 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
4205 or die "addr2line: $!";
4206
4207 my @funcs;
4208 my @res = <$fh>;
4209 chomp for @res;
4210 while (@res) {
4211 my ($func, $line) = splice @res, 0, 2, ();
4212 push @funcs, "[$func] $line";
4213 }
4214
4215 @funcs
4216 };
4217
4218 LOG llevInfo, "[ABT] $perl_bt\n";
4219 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
4220 LOG llevInfo, "[ABT] $_\n" for @bt;
4221 --$_log_backtrace;
4222 };
4223 } else {
4224 LOG llevInfo, "[ABT] $msg\n";
4225 LOG llevInfo, "[ABT] [overload, suppressed]\n";
2531 }, 4226 }
2532); 4227}
4228
4229# load additional modules
4230require "cf/$_.pm" for @EXTRA_MODULES;
4231cf::_connect_to_perl_2;
2533 4232
2534END { cf::emergency_save } 4233END { cf::emergency_save }
2535 4234
25361 42351
2537 4236

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines