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.379 by root, Thu Oct 4 23:59:07 2007 UTC vs.
Revision 1.584 by root, Tue Oct 30 17:07:50 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines