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.428 by root, Thu May 1 06:33:19 2008 UTC vs.
Revision 1.610 by root, Tue Nov 20 14:40:01 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines