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.424 by root, Sun Apr 20 05:24:55 2008 UTC vs.
Revision 1.599 by root, Sun Nov 11 04:29:11 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 les 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, 744 # we seemingly have to make a local copy of the whole thing,
545 # otherwise perl prematurely frees the stuff :/ 745 # otherwise perl prematurely frees the stuff :/
546 # TODO: investigate and fix (likely this will be rather laborious) 746 # TODO: investigate and fix (likely this will be rather laborious)
547 747
548 my @res = Coro::Util::fork_eval { 748 my @res = Coro::Util::fork_eval {
549 reset_signals; 749 cf::post_fork;
550 &$cb 750 &$cb
551 }, @args; 751 } @args;
552 752
553 wantarray ? @res : $res[-1] 753 wantarray ? @res : $res[-1]
754}
755
756sub objinfo {
757 (
758 "counter value" => cf::object::object_count,
759 "objects created" => cf::object::create_count,
760 "objects destroyed" => cf::object::destroy_count,
761 "freelist size" => cf::object::free_count,
762 "allocated objects" => cf::object::objects_size,
763 "active objects" => cf::object::actives_size,
764 )
554} 765}
555 766
556=item $coin = coin_from_name $name 767=item $coin = coin_from_name $name
557 768
558=cut 769=cut
595within each server. 806within each server.
596 807
597=cut 808=cut
598 809
599sub db_table($) { 810sub db_table($) {
811 cf::error "db_get called from main context"
812 if $Coro::current == $Coro::main;
813
600 my ($name) = @_; 814 my ($name) = @_;
601 my $db = BDB::db_create $DB_ENV; 815 my $db = BDB::db_create $DB_ENV;
602 816
603 eval { 817 eval {
604 $db->set_flags (BDB::CHKSUM); 818 $db->set_flags (BDB::CHKSUM);
614} 828}
615 829
616our $DB; 830our $DB;
617 831
618sub db_init { 832sub db_init {
619 cf::sync_job {
620 $DB ||= db_table "db"; 833 $DB ||= db_table "db";
621 };
622} 834}
623 835
624sub db_get($$) { 836sub db_get($$) {
625 my $key = "$_[0]/$_[1]"; 837 my $key = "$_[0]/$_[1]";
626 838
627 cf::sync_job { 839 cf::error "db_get called from main context"
840 if $Coro::current == $Coro::main;
841
628 BDB::db_get $DB, undef, $key, my $data; 842 BDB::db_get $DB, undef, $key, my $data;
629 843
630 $! ? () 844 $! ? ()
631 : $data 845 : $data
632 }
633} 846}
634 847
635sub db_put($$$) { 848sub db_put($$$) {
636 BDB::dbreq_pri 4; 849 BDB::dbreq_pri 4;
637 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 850 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
665 878
666 my @data; 879 my @data;
667 my $md5; 880 my $md5;
668 881
669 for (0 .. $#$src) { 882 for (0 .. $#$src) {
670 0 <= aio_load $src->[$_], $data[$_] 883 $data[$_] = load_file $src->[$_];
671 or Carp::croak "$src->[$_]: $!";
672 } 884 }
673 885
674 # if processing is expensive, check 886 # if processing is expensive, check
675 # checksum first 887 # checksum first
676 if (1) { 888 if (1) {
689 901
690 return db_get cache => "$id/data"; 902 return db_get cache => "$id/data";
691 } 903 }
692 } 904 }
693 905
694 my $t1 = Time::HiRes::time; 906 my $t1 = EV::time;
695 my $data = $process->(\@data); 907 my $data = $process->(\@data);
696 my $t2 = Time::HiRes::time; 908 my $t2 = EV::time;
697 909
698 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 910 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
699 911
700 db_put cache => "$id/data", $data; 912 db_put cache => "$id/data", $data;
701 db_put cache => "$id/md5" , $md5; 913 db_put cache => "$id/md5" , $md5;
702 db_put cache => "$id/meta", $meta; 914 db_put cache => "$id/meta", $meta;
703 915
713 925
714=cut 926=cut
715 927
716sub datalog($@) { 928sub datalog($@) {
717 my ($type, %kv) = @_; 929 my ($type, %kv) = @_;
718 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 930 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
719} 931}
720 932
721=back 933=back
722 934
723=cut 935=cut
724 936
725############################################################################# 937#############################################################################
726 938
727=head2 ATTACHABLE OBJECTS 939=head2 ATTACHABLE OBJECTS
728 940
729Many objects in crossfire are so-called attachable objects. That means you can 941Many objects in deliantra are so-called attachable objects. That means you can
730attach callbacks/event handlers (a collection of which is called an "attachment") 942attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 943to it. All such attachable objects support the following methods.
732 944
733In the following description, CLASS can be any of C<global>, C<object> 945In 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 946C<player>, C<client> or C<map> (i.e. the attachable objects in
784=item cf::CLASS::attachment $name, ... 996=item cf::CLASS::attachment $name, ...
785 997
786Register an attachment by C<$name> through which attachable objects of the 998Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 999given CLASS can refer to this attachment.
788 1000
789Some classes such as crossfire maps and objects can specify attachments 1001Some classes such as deliantra maps and objects can specify attachments
790that are attached at load/instantiate time, thus the need for a name. 1002that are attached at load/instantiate time, thus the need for a name.
791 1003
792These calls expect any number of the following handler/hook descriptions: 1004These calls expect any number of the following handler/hook descriptions:
793 1005
794=over 4 1006=over 4
918 1130
919 } elsif (exists $cb_id{$type}) { 1131 } elsif (exists $cb_id{$type}) {
920 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1132 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
921 1133
922 } elsif (ref $type) { 1134 } elsif (ref $type) {
923 warn "attaching objects not supported, ignoring.\n"; 1135 error "attaching objects not supported, ignoring.\n";
924 1136
925 } else { 1137 } else {
926 shift @arg; 1138 shift @arg;
927 warn "attach argument '$type' not supported, ignoring.\n"; 1139 error "attach argument '$type' not supported, ignoring.\n";
928 } 1140 }
929 } 1141 }
930} 1142}
931 1143
932sub _object_attach { 1144sub _object_attach {
942 _attach $registry, $klass, @attach; 1154 _attach $registry, $klass, @attach;
943 } 1155 }
944 1156
945 $obj->{$name} = \%arg; 1157 $obj->{$name} = \%arg;
946 } else { 1158 } else {
947 warn "object uses attachment '$name' which is not available, postponing.\n"; 1159 info "object uses attachment '$name' which is not available, postponing.\n";
948 } 1160 }
949 1161
950 $obj->{_attachment}{$name} = undef; 1162 $obj->{_attachment}{$name} = undef;
951} 1163}
952 1164
1011 1223
1012 for (@$callbacks) { 1224 for (@$callbacks) {
1013 eval { &{$_->[1]} }; 1225 eval { &{$_->[1]} };
1014 1226
1015 if ($@) { 1227 if ($@) {
1016 warn "$@";
1017 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1228 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1018 override; 1229 override;
1019 } 1230 }
1020 1231
1021 return 1 if $override; 1232 return 1 if $override;
1022 } 1233 }
1085 1296
1086sub reattach { 1297sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1298 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1299 my ($obj) = @_;
1089 1300
1301 # no longer needed after getting rid of delete_package?
1090 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1302 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091 1303
1092 my $registry = $obj->registry; 1304 my $registry = $obj->registry;
1093 1305
1094 @$registry = (); 1306 @$registry = ();
1095 1307
1100 for (@$attach) { 1312 for (@$attach) {
1101 my ($klass, @attach) = @$_; 1313 my ($klass, @attach) = @$_;
1102 _attach $registry, $klass, @attach; 1314 _attach $registry, $klass, @attach;
1103 } 1315 }
1104 } else { 1316 } else {
1105 warn "object uses attachment '$name' that is not available, postponing.\n"; 1317 info "object uses attachment '$name' that is not available, postponing.\n";
1106 } 1318 }
1107 } 1319 }
1108} 1320}
1109 1321
1110cf::attachable->attach ( 1322cf::attachable->attach (
1137 my ($filename, $rdata, $objs) = @_; 1349 my ($filename, $rdata, $objs) = @_;
1138 1350
1139 sync_job { 1351 sync_job {
1140 if (length $$rdata) { 1352 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename); 1353 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1354 trace sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1355 $decname, length $$rdata, scalar @$objs
1356 if $VERBOSE_IO;
1144 1357
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1358 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 chmod SAVE_MODE, $fh; 1359 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1360 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 aio_fsync $fh if $cf::USE_FSYNC; 1361 if ($cf::USE_FSYNC) {
1362 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;
1363 aio_fsync $fh;
1364 }
1149 close $fh; 1365 aio_close $fh;
1150 1366
1151 if (@$objs) { 1367 if (@$objs) {
1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1368 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1153 chmod SAVE_MODE, $fh; 1369 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1370 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1371 aio_write $fh, 0, (length $data), $data, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1372 if ($cf::USE_FSYNC) {
1373 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;
1374 aio_fsync $fh;
1375 }
1157 close $fh; 1376 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1377 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1378 }
1160 } else { 1379 } else {
1161 aio_unlink "$filename.pst"; 1380 aio_unlink "$filename.pst";
1162 } 1381 }
1163 1382
1164 aio_rename "$filename~", $filename; 1383 aio_rename "$filename~", $filename;
1384
1385 $filename =~ s%/[^/]+$%%;
1386 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1387 } else {
1166 warn "FATAL: $filename~: $!\n"; 1388 error "unable to save objects: $filename~: $!\n";
1167 } 1389 }
1168 } else { 1390 } else {
1169 aio_unlink $filename; 1391 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1392 aio_unlink "$filename.pst";
1171 } 1393 }
1195 my $st = eval { Coro::Storable::thaw $av }; 1417 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs}; 1418 $av = $st->{objs};
1197 } 1419 }
1198 1420
1199 utf8::decode (my $decname = $filename); 1421 utf8::decode (my $decname = $filename);
1200 warn sprintf "loading %s (%d,%d)\n", 1422 trace sprintf "loading %s (%d,%d)\n",
1201 $decname, length $data, scalar @{$av || []}; 1423 $decname, length $data, scalar @{$av || []}
1424 if $VERBOSE_IO;
1202 1425
1203 ($data, $av) 1426 ($data, $av)
1204} 1427}
1205 1428
1206=head2 COMMAND CALLBACKS 1429=head2 COMMAND CALLBACKS
1210=cut 1433=cut
1211 1434
1212############################################################################# 1435#############################################################################
1213# command handling &c 1436# command handling &c
1214 1437
1215=item cf::register_command $name => \&callback($ob,$args); 1438=item cf::register_command $name => \&callback($ob,$args)
1216 1439
1217Register a callback for execution when the client sends the user command 1440Register a callback for execution when the client sends the user command
1218$name. 1441$name.
1219 1442
1220=cut 1443=cut
1226 #warn "registering command '$name/$time' to '$caller'"; 1449 #warn "registering command '$name/$time' to '$caller'";
1227 1450
1228 push @{ $COMMAND{$name} }, [$caller, $cb]; 1451 push @{ $COMMAND{$name} }, [$caller, $cb];
1229} 1452}
1230 1453
1231=item cf::register_extcmd $name => \&callback($pl,$packet); 1454=item cf::register_extcmd $name => \&callback($pl,@args)
1232 1455
1233Register a callback for execution when the client sends an (synchronous) 1456Register a callback for execution when the client sends an (synchronous)
1234extcmd packet. Ext commands will be processed in the order they are 1457extcmd packet. Ext commands will be processed in the order they are
1235received by the server, like other user commands. The first argument is 1458received by the server, like other user commands. The first argument is
1236the logged-in player. Ext commands can only be processed after a player 1459the logged-in player. Ext commands can only be processed after a player
1237has logged in successfully. 1460has logged in successfully.
1238 1461
1239If the callback returns something, it is sent back as if reply was being 1462The values will be sent back to the client.
1240called.
1241 1463
1464=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1465
1466Same as C<cf::register_extcmd>, but instead of returning values, the
1467callback needs to clal the C<$reply> function.
1468
1242=item cf::register_exticmd $name => \&callback($ns,$packet); 1469=item cf::register_exticmd $name => \&callback($ns,@args)
1243 1470
1244Register a callback for execution when the client sends an (asynchronous) 1471Register a callback for execution when the client sends an (asynchronous)
1245exticmd packet. Exti commands are processed by the server as soon as they 1472exticmd 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 1473are 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 1474is a client socket. Exti commands can be received anytime, even before
1248log-in. 1475log-in.
1249 1476
1250If the callback returns something, it is sent back as if reply was being 1477The values will be sent back to the client.
1251called.
1252 1478
1253=cut 1479=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1254 1480
1481Same as C<cf::register_extcmd>, but instead of returning values, the
1482callback needs to clal the C<$reply> function.
1483
1484=cut
1485
1255sub register_extcmd { 1486sub register_extcmd($$) {
1256 my ($name, $cb) = @_; 1487 my ($name, $cb) = @_;
1257 1488
1258 $EXTCMD{$name} = $cb; 1489 $EXTCMD{$name} = $cb;
1259} 1490}
1260 1491
1261sub register_exticmd { 1492sub register_async_extcmd($$) {
1262 my ($name, $cb) = @_; 1493 my ($name, $cb) = @_;
1263 1494
1495 $EXTACMD{$name} = $cb;
1496}
1497
1498sub register_exticmd($$) {
1499 my ($name, $cb) = @_;
1500
1264 $EXTICMD{$name} = $cb; 1501 $EXTICMD{$name} = $cb;
1265} 1502}
1266 1503
1504sub register_async_exticmd($$) {
1505 my ($name, $cb) = @_;
1506
1507 $EXTIACMD{$name} = $cb;
1508}
1509
1510use File::Glob ();
1511
1267cf::player->attach ( 1512cf::player->attach (
1268 on_command => sub { 1513 on_unknown_command => sub {
1269 my ($pl, $name, $params) = @_; 1514 my ($pl, $name, $params) = @_;
1270 1515
1271 my $cb = $COMMAND{$name} 1516 my $cb = $COMMAND{$name}
1272 or return; 1517 or return;
1273 1518
1281 my ($pl, $buf) = @_; 1526 my ($pl, $buf) = @_;
1282 1527
1283 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1528 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1284 1529
1285 if (ref $msg) { 1530 if (ref $msg) {
1286 my ($type, $reply, @payload) = 1531 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 1532
1291 my @reply;
1292
1293 if (my $cb = $EXTCMD{$type}) { 1533 if (my $cb = $EXTACMD{$type}) {
1534 $cb->(
1535 $pl,
1536 sub {
1537 $pl->ext_msg ("reply-$reply", @_)
1538 if $reply;
1539 },
1540 @payload
1541 );
1542 } else {
1543 my @reply;
1544
1545 if (my $cb = $EXTCMD{$type}) {
1294 @reply = $cb->($pl, @payload); 1546 @reply = $cb->($pl, @payload);
1547 }
1548
1549 $pl->ext_msg ("reply-$reply", @reply)
1550 if $reply;
1295 } 1551 }
1296 1552
1297 $pl->ext_reply ($reply, @reply)
1298 if $reply;
1299
1300 } else { 1553 } else {
1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1554 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1302 } 1555 }
1303 1556
1304 cf::override; 1557 cf::override;
1305 }, 1558 },
1306); 1559);
1307 1560
1561# "readahead" all extensions
1562sub cache_extensions {
1563 my $grp = IO::AIO::aio_group;
1564
1565 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1566 for (grep /\.ext$/, @{$_[0]}) {
1567 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1568 }
1569 };
1570
1571 $grp
1572}
1573
1574sub _ext_cfg_reg($$$$) {
1575 my ($rvar, $varname, $cfgname, $default) = @_;
1576
1577 $cfgname = lc $varname
1578 unless length $cfgname;
1579
1580 $EXT_CFG{$cfgname} = [$rvar, $default];
1581
1582 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1583}
1584
1308sub load_extensions { 1585sub load_extensions {
1586 info "loading extensions...";
1587
1588 %EXT_CFG = ();
1589
1309 cf::sync_job { 1590 cf::sync_job {
1310 my %todo; 1591 my %todo;
1311 1592
1312 for my $path (<$LIBDIR/*.ext>) { 1593 for my $path (<$LIBDIR/*.ext>) {
1313 next unless -r $path; 1594 next unless -r $path;
1331 1612
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1613 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1614 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1615
1335 $ext{source} = 1616 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1617 "package $pkg; use common::sense;\n"
1337 . "#line 1 \"$path\"\n{\n" 1618 . "#line 1 \"$path\"\n{\n"
1338 . $source 1619 . $source
1339 . "\n};\n1"; 1620 . "\n};\n1";
1340 1621
1341 $todo{$base} = \%ext; 1622 $todo{$base} = \%ext;
1342 } 1623 }
1343 1624
1625 my $pass = 0;
1344 my %done; 1626 my %done;
1345 while (%todo) { 1627 while (%todo) {
1346 my $progress; 1628 my $progress;
1347 1629
1630 ++$pass;
1631
1632 ext:
1348 while (my ($k, $v) = each %todo) { 1633 while (my ($k, $v) = each %todo) {
1349 for (split /,\s*/, $v->{meta}{depends}) { 1634 for (split /,\s*/, $v->{meta}{depends}) {
1350 goto skip 1635 next ext
1351 unless exists $done{$_}; 1636 unless exists $done{$_};
1352 } 1637 }
1353 1638
1354 warn "... loading '$k' into '$v->{pkg}'\n"; 1639 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1355 1640
1356 unless (eval $v->{source}) { 1641 my $source = $v->{source};
1642
1643 # support "CONF varname :confname = default" pseudo-statements
1644 $source =~ s{
1645 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1646 }{
1647 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1648 }gmxe;
1649
1650 my $active = eval $source;
1651
1652 if (length $@) {
1357 my $msg = $@ ? "$v->{path}: $@\n" 1653 error "$v->{path}: $@\n";
1358 : "$v->{base}: extension inactive.\n";
1359 1654
1360 if (exists $v->{meta}{mandatory}) {
1361 warn $msg;
1362 cf::cleanup "mandatory extension failed to load, exiting."; 1655 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1363 } 1656 if exists $v->{meta}{mandatory};
1364 1657
1365 warn $msg; 1658 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1659 delete $todo{$k};
1660 } else {
1661 $done{$k} = delete $todo{$k};
1662 push @EXTS, $v->{pkg};
1663 $progress = 1;
1664
1665 info "$v->{base}: extension inactive.\n"
1666 unless $active;
1366 } 1667 }
1367
1368 $done{$k} = delete $todo{$k};
1369 push @EXTS, $v->{pkg};
1370 $progress = 1;
1371 } 1668 }
1372 1669
1373 skip: 1670 unless ($progress) {
1374 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1671 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1375 unless $progress; 1672
1673 while (my ($k, $v) = each %todo) {
1674 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1675 if exists $v->{meta}{mandatory};
1676 }
1677
1678 last;
1679 }
1376 } 1680 }
1377 }; 1681 };
1378} 1682}
1379 1683
1380############################################################################# 1684#############################################################################
1381 1685
1382=back 1686=back
1383 1687
1384=head2 CORE EXTENSIONS 1688=head2 CORE EXTENSIONS
1385 1689
1386Functions and methods that extend core crossfire objects. 1690Functions and methods that extend core deliantra objects.
1387 1691
1388=cut 1692=cut
1389 1693
1390package cf::player; 1694package cf::player;
1391 1695
1434 1738
1435sub exists($) { 1739sub exists($) {
1436 my ($login) = @_; 1740 my ($login) = @_;
1437 1741
1438 $cf::PLAYER{$login} 1742 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1743 or !aio_stat path $login
1440} 1744}
1441 1745
1442sub find($) { 1746sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1747 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1748 my $login = $_[0];
1456 my $f = new_from_file cf::object::thawer path $login 1760 my $f = new_from_file cf::object::thawer path $login
1457 or return; 1761 or return;
1458 1762
1459 my $pl = cf::player::load_pl $f 1763 my $pl = cf::player::load_pl $f
1460 or return; 1764 or return;
1765
1461 local $cf::PLAYER_LOADING{$login} = $pl; 1766 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs; 1767 $f->resolve_delayed_derefs;
1463 $cf::PLAYER{$login} = $pl 1768 $cf::PLAYER{$login} = $pl
1464 } 1769 }
1465 } 1770 }
1466} 1771}
1467 1772
1773cf::player->attach (
1774 on_load => sub {
1775 my ($pl, $path) = @_;
1776
1777 # restore slots saved in save, below
1778 my $slots = delete $pl->{_slots};
1779
1780 $pl->ob->current_weapon ($slots->[0]);
1781 $pl->combat_ob ($slots->[1]);
1782 $pl->ranged_ob ($slots->[2]);
1783 },
1784);
1785
1468sub save($) { 1786sub save($) {
1469 my ($pl) = @_; 1787 my ($pl) = @_;
1470 1788
1471 return if $pl->{deny_save}; 1789 return if $pl->{deny_save};
1472 1790
1477 1795
1478 aio_mkdir playerdir $pl, 0770; 1796 aio_mkdir playerdir $pl, 0770;
1479 $pl->{last_save} = $cf::RUNTIME; 1797 $pl->{last_save} = $cf::RUNTIME;
1480 1798
1481 cf::get_slot 0.01; 1799 cf::get_slot 0.01;
1800
1801 # save slots, to be restored later
1802 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1482 1803
1483 $pl->save_pl ($path); 1804 $pl->save_pl ($path);
1484 cf::cede_to_tick; 1805 cf::cede_to_tick;
1485} 1806}
1486 1807
1518 my ($pl) = @_; 1839 my ($pl) = @_;
1519 1840
1520 my $name = $pl->ob->name; 1841 my $name = $pl->ob->name;
1521 1842
1522 $pl->{deny_save} = 1; 1843 $pl->{deny_save} = 1;
1523 $pl->password ("*"); # this should lock out the player until we nuked the dir 1844 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1524 1845
1525 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1846 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1526 $pl->deactivate; 1847 $pl->deactivate;
1848
1849 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1527 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1850 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1851 ext::highscore::check ($pl->ob);
1852
1528 $pl->ns->destroy if $pl->ns; 1853 $pl->ns->destroy if $pl->ns;
1529 1854
1530 my $path = playerdir $pl; 1855 my $path = playerdir $pl;
1531 my $temp = "$path~$cf::RUNTIME~deleting~"; 1856 my $temp = "$path~$cf::RUNTIME~deleting~";
1532 aio_rename $path, $temp; 1857 aio_rename $path, $temp;
1570 1895
1571 for my $login (@$dirs) { 1896 for my $login (@$dirs) {
1572 my $path = path $login; 1897 my $path = path $login;
1573 1898
1574 # a .pst is a dead give-away for a valid player 1899 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") { 1900 # if no pst file found, open and chekc for blocked users
1901 if (aio_stat "$path.pst") {
1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1902 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577 aio_read $fh, 0, 512, my $buf, 0 or next; 1903 aio_read $fh, 0, 512, my $buf, 0 or next;
1578 $buf !~ /^password -------------$/m or next; # official not-valid tag 1904 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 } 1905 }
1580 1906
1584 1910
1585 \@logins 1911 \@logins
1586} 1912}
1587 1913
1588=item $player->maps 1914=item $player->maps
1915
1916=item cf::player::maps $login
1589 1917
1590Returns an arrayref of map paths that are private for this 1918Returns an arrayref of map paths that are private for this
1591player. May block. 1919player. May block.
1592 1920
1593=cut 1921=cut
1611 } 1939 }
1612 1940
1613 \@paths 1941 \@paths
1614} 1942}
1615 1943
1616=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1944=item $protocol_xml = $player->expand_cfpod ($cfpod)
1617 1945
1618Expand crossfire pod fragments into protocol xml. 1946Expand deliantra pod fragments into protocol xml.
1619
1620=cut
1621
1622use re 'eval';
1623
1624my $group;
1625my $interior; $interior = qr{
1626 # match a pod interior sequence sans C<< >>
1627 (?:
1628 \ (.*?)\ (?{ $group = $^N })
1629 | < (??{$interior}) >
1630 )
1631}x;
1632
1633sub expand_cfpod {
1634 my ($self, $pod) = @_;
1635
1636 my $xml;
1637
1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1641
1642 $group =~ s/&/&amp;/g;
1643 $group =~ s/</&lt;/g;
1644
1645 $xml .= $group;
1646 } elsif ($pod =~ m%\G
1647 ([BCGHITU])
1648 <
1649 (?:
1650 ([^<>]*) (?{ $group = $^N })
1651 | < $interior >
1652 )
1653 >
1654 %gcsx
1655 ) {
1656 my ($code, $data) = ($1, $group);
1657
1658 if ($code eq "B") {
1659 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1660 } elsif ($code eq "I") {
1661 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1662 } elsif ($code eq "U") {
1663 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1664 } elsif ($code eq "C") {
1665 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1666 } elsif ($code eq "T") {
1667 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1668 } elsif ($code eq "G") {
1669 my ($male, $female) = split /\|/, $data;
1670 $data = $self->gender ? $female : $male;
1671 $xml .= expand_cfpod ($self, $data);
1672 } elsif ($code eq "H") {
1673 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1675 "")
1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1687
1688 for ($xml) {
1689 # create single paragraphs (very hackish)
1690 s/(?<=\S)\n(?=\w)/ /g;
1691
1692 # compress some whitespace
1693 s/\s+\n/\n/g; # ws line-ends
1694 s/\n\n+/\n/g; # double lines
1695 s/^\n+//; # beginning lines
1696 s/\n+$//; # ending lines
1697 }
1698
1699 $xml
1700}
1701
1702no re 'eval';
1703
1704sub hintmode {
1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1706 $_[0]{hintmode}
1707}
1708
1709=item $player->ext_reply ($msgid, @msg)
1710
1711Sends an ext reply to the player.
1712
1713=cut
1714
1715sub ext_reply($$@) {
1716 my ($self, $id, @msg) = @_;
1717
1718 $self->ns->ext_reply ($id, @msg)
1719}
1720 1947
1721=item $player->ext_msg ($type, @msg) 1948=item $player->ext_msg ($type, @msg)
1722 1949
1723Sends an ext event to the client. 1950Sends an ext event to the client.
1724 1951
1744 1971
1745=cut 1972=cut
1746 1973
1747sub find_by_path($) { 1974sub find_by_path($) {
1748 my ($path) = @_; 1975 my ($path) = @_;
1976
1977 $path =~ s/^~[^\/]*//; # skip ~login
1749 1978
1750 my ($match, $specificity); 1979 my ($match, $specificity);
1751 1980
1752 for my $region (list) { 1981 for my $region (list) {
1753 if ($region->{match} && $path =~ $region->{match}) { 1982 if ($region->{match} && $path =~ $region->{match}) {
1782sub generate_random_map { 2011sub generate_random_map {
1783 my ($self, $rmp) = @_; 2012 my ($self, $rmp) = @_;
1784 2013
1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2014 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1786 2015
1787 # mit "rum" bekleckern, nicht
1788 $self->_create_random_map ( 2016 $self->_create_random_map ($rmp);
1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1792 $rmp->{exit_on_final_map},
1793 $rmp->{xsize}, $rmp->{ysize},
1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1796 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1797 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1798 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1799 (cf::region::find $rmp->{region}), $rmp->{custom}
1800 )
1801} 2017}
1802 2018
1803=item cf::map->register ($regex, $prio) 2019=item cf::map->register ($regex, $prio)
1804 2020
1805Register a handler for the map path matching the given regex at the 2021Register a handler for the map path matching the given regex at the
1810 2026
1811sub register { 2027sub register {
1812 my (undef, $regex, $prio) = @_; 2028 my (undef, $regex, $prio) = @_;
1813 my $pkg = caller; 2029 my $pkg = caller;
1814 2030
1815 no strict;
1816 push @{"$pkg\::ISA"}, __PACKAGE__; 2031 push @{"$pkg\::ISA"}, __PACKAGE__;
1817 2032
1818 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2033 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1819} 2034}
1820 2035
1821# also paths starting with '/' 2036# also paths starting with '/'
1822$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2037$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1823 2038
1824sub thawer_merge { 2039sub thawer_merge {
1825 my ($self, $merge) = @_; 2040 my ($self, $merge) = @_;
1826 2041
1827 # we have to keep some variables in memory intact 2042 # we have to keep some variables in memory intact
1832} 2047}
1833 2048
1834sub normalise { 2049sub normalise {
1835 my ($path, $base) = @_; 2050 my ($path, $base) = @_;
1836 2051
1837 $path = "$path"; # make sure its a string 2052 $path = "$path"; # make sure it's a string
1838 2053
1839 $path =~ s/\.map$//; 2054 $path =~ s/\.map$//;
1840 2055
1841 # map plan: 2056 # map plan:
1842 # 2057 #
1857 $base =~ s{[^/]+/?$}{}; 2072 $base =~ s{[^/]+/?$}{};
1858 $path = "$base/$path"; 2073 $path = "$base/$path";
1859 } 2074 }
1860 2075
1861 for ($path) { 2076 for ($path) {
1862 redo if s{//}{/};
1863 redo if s{/\.?/}{/}; 2077 redo if s{/\.?/}{/};
1864 redo if s{/[^/]+/\.\./}{/}; 2078 redo if s{/[^/]+/\.\./}{/};
1865 } 2079 }
1866 2080
1867 $path 2081 $path
1881 $self->init; # pass $1 etc. 2095 $self->init; # pass $1 etc.
1882 return $self; 2096 return $self;
1883 } 2097 }
1884 } 2098 }
1885 2099
1886 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2100 Carp::cluck "unable to resolve path '$path' (base '$base')";
1887 () 2101 ()
1888} 2102}
1889 2103
2104# may re-bless or do other evil things
1890sub init { 2105sub init {
1891 my ($self) = @_; 2106 my ($self) = @_;
1892 2107
1893 $self 2108 $self
1894} 2109}
1925 2140
1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2141 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1927 "$UNIQUEDIR/$path" 2142 "$UNIQUEDIR/$path"
1928} 2143}
1929 2144
1930# and all this just because we cannot iterate over
1931# all maps in C++...
1932sub change_all_map_light {
1933 my ($change) = @_;
1934
1935 $_->change_map_light ($change)
1936 for grep $_->outdoor, values %cf::MAP;
1937}
1938
1939sub decay_objects { 2145sub decay_objects {
1940 my ($self) = @_; 2146 my ($self) = @_;
1941 2147
1942 return if $self->{deny_reset}; 2148 return if $self->{deny_reset};
1943 2149
1968 $self->{load_path} = $path; 2174 $self->{load_path} = $path;
1969 2175
1970 1 2176 1
1971} 2177}
1972 2178
2179# used to laod the header of an original map
1973sub load_header_orig { 2180sub load_header_orig {
1974 my ($self) = @_; 2181 my ($self) = @_;
1975 2182
1976 $self->load_header_from ($self->load_path) 2183 $self->load_header_from ($self->load_path)
1977} 2184}
1978 2185
2186# used to laod the header of an instantiated map
1979sub load_header_temp { 2187sub load_header_temp {
1980 my ($self) = @_; 2188 my ($self) = @_;
1981 2189
1982 $self->load_header_from ($self->save_path) 2190 $self->load_header_from ($self->save_path)
1983} 2191}
1984 2192
2193# called after loading the header from an instantiated map
1985sub prepare_temp { 2194sub prepare_temp {
1986 my ($self) = @_; 2195 my ($self) = @_;
1987 2196
1988 $self->last_access ((delete $self->{last_access}) 2197 $self->last_access ((delete $self->{last_access})
1989 || $cf::RUNTIME); #d# 2198 || $cf::RUNTIME); #d#
1990 # safety 2199 # safety
1991 $self->{instantiate_time} = $cf::RUNTIME 2200 $self->{instantiate_time} = $cf::RUNTIME
1992 if $self->{instantiate_time} > $cf::RUNTIME; 2201 if $self->{instantiate_time} > $cf::RUNTIME;
1993} 2202}
1994 2203
2204# called after loading the header from an original map
1995sub prepare_orig { 2205sub prepare_orig {
1996 my ($self) = @_; 2206 my ($self) = @_;
1997 2207
1998 $self->{load_original} = 1; 2208 $self->{load_original} = 1;
1999 $self->{instantiate_time} = $cf::RUNTIME; 2209 $self->{instantiate_time} = $cf::RUNTIME;
2023 2233
2024sub find; 2234sub find;
2025sub find { 2235sub find {
2026 my ($path, $origin) = @_; 2236 my ($path, $origin) = @_;
2027 2237
2238 cf::cede_to_tick;
2239
2028 $path = normalise $path, $origin && $origin->path; 2240 $path = normalise $path, $origin;
2029 2241
2030 cf::lock_wait "map_data:$path";#d#remove 2242 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 2243 my $guard2 = cf::lock_acquire "map_find:$path";
2032 2244
2033 $cf::MAP{$path} || do { 2245 $cf::MAP{$path} || do {
2034 my $guard1 = cf::lock_acquire "map_find:$path";
2035 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2036
2037 my $map = new_from_path cf::map $path 2246 my $map = new_from_path cf::map $path
2038 or return; 2247 or return;
2039 2248
2040 $map->{last_save} = $cf::RUNTIME; 2249 $map->{last_save} = $cf::RUNTIME;
2041 2250
2043 or return; 2252 or return;
2044 2253
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2254 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 2255 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 2256 #$cf::WAIT_FOR_TICK->wait;
2257 undef $guard2;
2048 undef $guard1; 2258 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 2259 $map->reset;
2051 return find $path; 2260 return find $path;
2052 } 2261 }
2053 2262
2054 $cf::MAP{$path} = $map 2263 $cf::MAP{$path} = $map
2055 } 2264 }
2056} 2265}
2057 2266
2058sub pre_load { } 2267sub pre_load { }
2059sub post_load { } 2268#sub post_load { } # XS
2060 2269
2061sub load { 2270sub load {
2062 my ($self) = @_; 2271 my ($self) = @_;
2063 2272
2064 local $self->{deny_reset} = 1; # loading can take a long time 2273 local $self->{deny_reset} = 1; # loading can take a long time
2067 2276
2068 { 2277 {
2069 my $guard = cf::lock_acquire "map_data:$path"; 2278 my $guard = cf::lock_acquire "map_data:$path";
2070 2279
2071 return unless $self->valid; 2280 return unless $self->valid;
2072 return unless $self->in_memory == cf::MAP_SWAPPED; 2281 return unless $self->state == cf::MAP_SWAPPED;
2073
2074 $self->in_memory (cf::MAP_LOADING);
2075 2282
2076 $self->alloc; 2283 $self->alloc;
2077 2284
2078 $self->pre_load; 2285 $self->pre_load;
2079 cf::cede_to_tick; 2286 cf::cede_to_tick;
2080 2287
2288 if (exists $self->{load_path}) {
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2289 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2290 $f->skip_block;
2083 $self->_load_objects ($f) 2291 $self->_load_objects ($f)
2084 or return; 2292 or return;
2085 2293
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2294 $self->post_load_original
2087 if delete $self->{load_original}; 2295 if delete $self->{load_original};
2088 2296
2089 if (my $uniq = $self->uniq_path) { 2297 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2298 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2299 unless (aio_stat $uniq) {
2092 if (my $f = new_from_file cf::object::thawer $uniq) { 2300 if (my $f = new_from_file cf::object::thawer $uniq) {
2093 $self->clear_unique_items; 2301 $self->clear_unique_items;
2094 $self->_load_objects ($f); 2302 $self->_load_objects ($f);
2095 $f->resolve_delayed_derefs; 2303 $f->resolve_delayed_derefs;
2304 }
2096 } 2305 }
2097 } 2306 }
2098 }
2099 2307
2100 $f->resolve_delayed_derefs; 2308 $f->resolve_delayed_derefs;
2309 } else {
2310 $self->post_load_original
2311 if delete $self->{load_original};
2312 }
2313
2314 $self->state (cf::MAP_INACTIVE);
2101 2315
2102 cf::cede_to_tick; 2316 cf::cede_to_tick;
2103 # now do the right thing for maps 2317 # now do the right thing for maps
2104 $self->link_multipart_objects; 2318 $self->link_multipart_objects;
2105 $self->difficulty ($self->estimate_difficulty) 2319 $self->difficulty ($self->estimate_difficulty)
2109 unless ($self->{deny_activate}) { 2323 unless ($self->{deny_activate}) {
2110 $self->decay_objects; 2324 $self->decay_objects;
2111 $self->fix_auto_apply; 2325 $self->fix_auto_apply;
2112 $self->update_buttons; 2326 $self->update_buttons;
2113 cf::cede_to_tick; 2327 cf::cede_to_tick;
2114 $self->set_darkness_map; 2328 #$self->activate; # no longer activate maps automatically
2115 cf::cede_to_tick;
2116 $self->activate;
2117 } 2329 }
2118 2330
2119 $self->{last_save} = $cf::RUNTIME; 2331 $self->{last_save} = $cf::RUNTIME;
2120 $self->last_access ($cf::RUNTIME); 2332 $self->last_access ($cf::RUNTIME);
2121
2122 $self->in_memory (cf::MAP_ACTIVE);
2123 } 2333 }
2124 2334
2125 $self->post_load; 2335 $self->post_load;
2126}
2127 2336
2337 1
2338}
2339
2340# customize the map for a given player, i.e.
2341# return the _real_ map. used by e.g. per-player
2342# maps to change the path to ~playername/mappath
2128sub customise_for { 2343sub customise_for {
2129 my ($self, $ob) = @_; 2344 my ($self, $ob) = @_;
2130 2345
2131 return find "~" . $ob->name . "/" . $self->{path} 2346 return find "~" . $ob->name . "/" . $self->{path}
2132 if $self->per_player; 2347 if $self->per_player;
2135# if $self->per_party; 2350# if $self->per_party;
2136 2351
2137 $self 2352 $self
2138} 2353}
2139 2354
2140# find and load all maps in the 3x3 area around a map
2141sub load_neighbours {
2142 my ($map) = @_;
2143
2144 my @neigh; # diagonal neighbours
2145
2146 for (0 .. 3) {
2147 my $neigh = $map->tile_path ($_)
2148 or next;
2149 $neigh = find $neigh, $map
2150 or next;
2151 $neigh->load;
2152
2153 push @neigh,
2154 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2155 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2156 }
2157
2158 for (grep defined $_->[0], @neigh) {
2159 my ($path, $origin) = @$_;
2160 my $neigh = find $path, $origin
2161 or next;
2162 $neigh->load;
2163 }
2164}
2165
2166sub find_sync { 2355sub find_sync {
2167 my ($path, $origin) = @_; 2356 my ($path, $origin) = @_;
2168 2357
2169 cf::sync_job { find $path, $origin } 2358 # it's a bug to call this from the main context
2359 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2360 if $Coro::current == $Coro::main;
2361
2362 find $path, $origin
2170} 2363}
2171 2364
2172sub do_load_sync { 2365sub do_load_sync {
2173 my ($map) = @_; 2366 my ($map) = @_;
2174 2367
2368 # it's a bug to call this from the main context
2175 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2369 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2176 if $Coro::current == $Coro::main; 2370 if $Coro::current == $Coro::main;
2177 2371
2178 cf::sync_job { $map->load }; 2372 $map->load;
2179} 2373}
2180 2374
2181our %MAP_PREFETCH; 2375our %MAP_PREFETCH;
2182our $MAP_PREFETCHER = undef; 2376our $MAP_PREFETCHER = undef;
2183 2377
2184sub find_async { 2378sub find_async {
2185 my ($path, $origin, $load) = @_; 2379 my ($path, $origin, $load) = @_;
2186 2380
2187 $path = normalise $path, $origin && $origin->{path}; 2381 $path = normalise $path, $origin;
2188 2382
2189 if (my $map = $cf::MAP{$path}) { 2383 if (my $map = $cf::MAP{$path}) {
2190 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2384 return $map if !$load || $map->linkable;
2191 } 2385 }
2192 2386
2193 $MAP_PREFETCH{$path} |= $load; 2387 $MAP_PREFETCH{$path} |= $load;
2194 2388
2195 $MAP_PREFETCHER ||= cf::async { 2389 $MAP_PREFETCHER ||= cf::async {
2209 $MAP_PREFETCHER->prio (6); 2403 $MAP_PREFETCHER->prio (6);
2210 2404
2211 () 2405 ()
2212} 2406}
2213 2407
2408# common code, used by both ->save and ->swapout
2214sub save { 2409sub _save {
2215 my ($self) = @_; 2410 my ($self) = @_;
2216
2217 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2411
2219 $self->{last_save} = $cf::RUNTIME; 2412 $self->{last_save} = $cf::RUNTIME;
2220 2413
2221 return unless $self->dirty; 2414 return unless $self->dirty;
2222 2415
2242 } else { 2435 } else {
2243 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2436 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2244 } 2437 }
2245} 2438}
2246 2439
2440sub save {
2441 my ($self) = @_;
2442
2443 my $lock = cf::lock_acquire "map_data:$self->{path}";
2444
2445 $self->_save;
2446}
2447
2247sub swap_out { 2448sub swap_out {
2248 my ($self) = @_; 2449 my ($self) = @_;
2249 2450
2250 # save first because save cedes
2251 $self->save;
2252
2253 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2451 my $lock = cf::lock_acquire "map_data:$self->{path}";
2254 2452
2453 return if !$self->linkable;
2454 return if $self->{deny_save};
2255 return if $self->players; 2455 return if $self->players;
2256 return if $self->in_memory != cf::MAP_ACTIVE; 2456
2457 # first deactivate the map and "unlink" it from the core
2458 $self->deactivate;
2459 $_->clear_links_to ($self) for values %cf::MAP;
2460 $self->state (cf::MAP_SWAPPED);
2461
2462 # then atomically save
2463 $self->_save;
2464
2465 # then free the map
2466 $self->clear;
2467}
2468
2469sub reset_at {
2470 my ($self) = @_;
2471
2472 # TODO: safety, remove and allow resettable per-player maps
2257 return if $self->{deny_save}; 2473 return 1e99 if $self->{deny_reset};
2258 2474
2475 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2476 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2477
2478 $time + $to
2479}
2480
2481sub should_reset {
2482 my ($self) = @_;
2483
2484 $self->reset_at <= $cf::RUNTIME
2485}
2486
2487sub reset {
2488 my ($self) = @_;
2489
2490 my $lock = cf::lock_acquire "map_data:$self->{path}";
2491
2492 return if $self->players;
2493
2494 cf::trace "resetting map ", $self->path, "\n";
2495
2259 $self->in_memory (cf::MAP_SWAPPED); 2496 $self->state (cf::MAP_SWAPPED);
2497
2498 # need to save uniques path
2499 unless ($self->{deny_save}) {
2500 my $uniq = $self->uniq_path; utf8::encode $uniq;
2501
2502 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2503 if $uniq;
2504 }
2505
2506 delete $cf::MAP{$self->path};
2260 2507
2261 $self->deactivate; 2508 $self->deactivate;
2262 $_->clear_links_to ($self) for values %cf::MAP; 2509 $_->clear_links_to ($self) for values %cf::MAP;
2263 $self->clear; 2510 $self->clear;
2264}
2265
2266sub reset_at {
2267 my ($self) = @_;
2268
2269 # TODO: safety, remove and allow resettable per-player maps
2270 return 1e99 if $self->{deny_reset};
2271
2272 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2273 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2274
2275 $time + $to
2276}
2277
2278sub should_reset {
2279 my ($self) = @_;
2280
2281 $self->reset_at <= $cf::RUNTIME
2282}
2283
2284sub reset {
2285 my ($self) = @_;
2286
2287 my $lock = cf::lock_acquire "map_data:$self->{path}";
2288
2289 return if $self->players;
2290
2291 warn "resetting map ", $self->path;
2292
2293 $self->in_memory (cf::MAP_SWAPPED);
2294
2295 # need to save uniques path
2296 unless ($self->{deny_save}) {
2297 my $uniq = $self->uniq_path; utf8::encode $uniq;
2298
2299 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2300 if $uniq;
2301 }
2302
2303 delete $cf::MAP{$self->path};
2304
2305 $self->deactivate;
2306 $_->clear_links_to ($self) for values %cf::MAP;
2307 $self->clear;
2308 2511
2309 $self->unlink_save; 2512 $self->unlink_save;
2310 $self->destroy; 2513 $self->destroy;
2311} 2514}
2312 2515
2320 2523
2321 delete $cf::MAP{$self->path}; 2524 delete $cf::MAP{$self->path};
2322 2525
2323 $self->unlink_save; 2526 $self->unlink_save;
2324 2527
2325 bless $self, "cf::map"; 2528 bless $self, "cf::map::wrap";
2326 delete $self->{deny_reset}; 2529 delete $self->{deny_reset};
2327 $self->{deny_save} = 1; 2530 $self->{deny_save} = 1;
2328 $self->reset_timeout (1); 2531 $self->reset_timeout (1);
2329 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2532 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2330 2533
2387 : normalise $_ 2590 : normalise $_
2388 } @{ aio_readdir $UNIQUEDIR or [] } 2591 } @{ aio_readdir $UNIQUEDIR or [] }
2389 ] 2592 ]
2390} 2593}
2391 2594
2595=item cf::map::static_maps
2596
2597Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2598file in the shared directory excluding F</styles> and F</editor>). May
2599block.
2600
2601=cut
2602
2603sub static_maps() {
2604 my @dirs = "";
2605 my @maps;
2606
2607 while (@dirs) {
2608 my $dir = shift @dirs;
2609
2610 next if $dir eq "/styles" || $dir eq "/editor";
2611
2612 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2613 or return;
2614
2615 for (@$files) {
2616 s/\.map$// or next;
2617 utf8::decode $_;
2618 push @maps, "$dir/$_";
2619 }
2620
2621 push @dirs, map "$dir/$_", @$dirs;
2622 }
2623
2624 \@maps
2625}
2626
2392=back 2627=back
2393 2628
2394=head3 cf::object 2629=head3 cf::object
2395 2630
2396=cut 2631=cut
2457can be C<undef>. Does the right thing when the player is currently in a 2692can be C<undef>. Does the right thing when the player is currently in a
2458dialogue with the given NPC character. 2693dialogue with the given NPC character.
2459 2694
2460=cut 2695=cut
2461 2696
2697our $SAY_CHANNEL = {
2698 id => "say",
2699 title => "Map",
2700 reply => "say ",
2701 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2702};
2703
2704our $CHAT_CHANNEL = {
2705 id => "chat",
2706 title => "Chat",
2707 reply => "chat ",
2708 tooltip => "Player chat and shouts, global to the server.",
2709};
2710
2462# rough implementation of a future "reply" method that works 2711# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2712# with dialog boxes.
2464#TODO: the first argument must go, split into a $npc->reply_to ( method 2713#TODO: the first argument must go, split into a $npc->reply_to ( method
2465sub cf::object::player::reply($$$;$) { 2714sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2715 my ($self, $npc, $msg, $flags) = @_;
2477 my $dialog = $pl->{npc_dialog}; 2726 my $dialog = $pl->{npc_dialog};
2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2727 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2479 2728
2480 } else { 2729 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2730 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2731 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2732 }
2484 } 2733 }
2485} 2734}
2486 2735
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2736=item $object->send_msg ($channel, $msg, $color, [extra...])
2512 2761
2513=item $player_object->enter_link 2762=item $player_object->enter_link
2514 2763
2515Freezes the player and moves him/her to a special map (C<{link}>). 2764Freezes the player and moves him/her to a special map (C<{link}>).
2516 2765
2517The player should be reasonably safe there for short amounts of time. You 2766The player should be reasonably safe there for short amounts of time (e.g.
2518I<MUST> call C<leave_link> as soon as possible, though. 2767for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2768though, as the player cannot control the character while it is on the link
2769map.
2519 2770
2520Will never block. 2771Will never block.
2521 2772
2522=item $player_object->leave_link ($map, $x, $y) 2773=item $player_object->leave_link ($map, $x, $y)
2523 2774
2543sub cf::object::player::enter_link { 2794sub cf::object::player::enter_link {
2544 my ($self) = @_; 2795 my ($self) = @_;
2545 2796
2546 $self->deactivate_recursive; 2797 $self->deactivate_recursive;
2547 2798
2799 ++$self->{_link_recursion};
2800
2548 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2801 return if UNIVERSAL::isa $self->map, "ext::map_link";
2549 2802
2550 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2803 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2551 if $self->map && $self->map->{path} ne "{link}"; 2804 if $self->map && $self->map->{path} ne "{link}";
2552 2805
2553 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2806 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2554} 2807}
2555 2808
2556sub cf::object::player::leave_link { 2809sub cf::object::player::leave_link {
2557 my ($self, $map, $x, $y) = @_; 2810 my ($self, $map, $x, $y) = @_;
2558 2811
2575 ($x, $y) = (-1, -1) 2828 ($x, $y) = (-1, -1)
2576 unless (defined $x) && (defined $y); 2829 unless (defined $x) && (defined $y);
2577 2830
2578 # use -1 or undef as default coordinates, not 0, 0 2831 # use -1 or undef as default coordinates, not 0, 0
2579 ($x, $y) = ($map->enter_x, $map->enter_y) 2832 ($x, $y) = ($map->enter_x, $map->enter_y)
2580 if $x <=0 && $y <= 0; 2833 if $x <= 0 && $y <= 0;
2581 2834
2582 $map->load; 2835 $map->load;
2583 $map->load_neighbours;
2584 2836
2585 return unless $self->contr->active; 2837 return unless $self->contr->active;
2586 $self->activate_recursive;
2587 2838
2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2839 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589 $self->enter_map ($map, $x, $y); 2840 if ($self->enter_map ($map, $x, $y)) {
2590} 2841 # entering was successful
2842 delete $self->{_link_recursion};
2843 # only activate afterwards, to support waiting in hooks
2844 $self->activate_recursive;
2845 }
2591 2846
2847}
2848
2592=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2849=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2593 2850
2594Moves the player to the given map-path and coordinates by first freezing 2851Moves the player to the given map-path and coordinates by first freezing
2595her, loading and preparing them map, calling the provided $check callback 2852her, loading and preparing them map, calling the provided $check callback
2596that has to return the map if sucecssful, and then unfreezes the player on 2853that has to return the map if sucecssful, and then unfreezes the player on
2597the new (success) or old (failed) map position. In either case, $done will 2854the new (success) or old (failed) map position. In either case, $done will
2598be called at the end of this process. 2855be called at the end of this process.
2599 2856
2857Note that $check will be called with a potentially non-loaded map, so if
2858it needs a loaded map it has to call C<< ->load >>.
2859
2600=cut 2860=cut
2601 2861
2602our $GOTOGEN; 2862our $GOTOGEN;
2603 2863
2604sub cf::object::player::goto { 2864sub cf::object::player::goto {
2605 my ($self, $path, $x, $y, $check, $done) = @_; 2865 my ($self, $path, $x, $y, $check, $done) = @_;
2866
2867 if ($self->{_link_recursion} >= $MAX_LINKS) {
2868 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2869 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2870 ($path, $x, $y) = @$EMERGENCY_POSITION;
2871 }
2606 2872
2607 # do generation counting so two concurrent goto's will be executed in-order 2873 # do generation counting so two concurrent goto's will be executed in-order
2608 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2874 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2609 2875
2610 $self->enter_link; 2876 $self->enter_link;
2630 ($path, $x, $y) = (undef, undef, undef); 2896 ($path, $x, $y) = (undef, undef, undef);
2631 } 2897 }
2632 } 2898 }
2633 2899
2634 my $map = eval { 2900 my $map = eval {
2635 my $map = defined $path ? cf::map::find $path : undef; 2901 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2636 2902
2637 if ($map) { 2903 if ($map) {
2638 $map = $map->customise_for ($self); 2904 $map = $map->customise_for ($self);
2639 $map = $check->($map) if $check && $map; 2905 $map = $check->($map, $x, $y, $self) if $check && $map;
2640 } else { 2906 } else {
2641 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2907 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2642 } 2908 }
2643 2909
2644 $map 2910 $map
2652 if ($gen == $self->{_goto_generation}) { 2918 if ($gen == $self->{_goto_generation}) {
2653 delete $self->{_goto_generation}; 2919 delete $self->{_goto_generation};
2654 $self->leave_link ($map, $x, $y); 2920 $self->leave_link ($map, $x, $y);
2655 } 2921 }
2656 2922
2657 $done->() if $done; 2923 $done->($self) if $done;
2658 })->prio (1); 2924 })->prio (1);
2659} 2925}
2660 2926
2661=item $player_object->enter_exit ($exit_object) 2927=item $player_object->enter_exit ($exit_object)
2662 2928
2682} 2948}
2683 2949
2684sub prepare_random_map { 2950sub prepare_random_map {
2685 my ($exit) = @_; 2951 my ($exit) = @_;
2686 2952
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2953 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2954 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2955 # that depends on the exit object
2692 2956
2693 my $rmp = parse_random_map_params $exit->msg; 2957 my $rmp = parse_random_map_params $exit->msg;
2695 if ($exit->map) { 2959 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2960 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2961 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2962 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2963 $rmp->{origin_y} = $exit->y;
2964
2965 $exit->map->touch;
2700 } 2966 }
2701 2967
2702 $rmp->{random_seed} ||= $exit->random_seed; 2968 $rmp->{random_seed} ||= $exit->random_seed;
2703 2969
2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2970 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2974 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 2975 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 2976 undef $fh;
2711 aio_rename "$meta~", $meta; 2977 aio_rename "$meta~", $meta;
2712 2978
2979 my $slaying = "?random/$md5";
2980
2981 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 2982 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 2983 $exit->msg (undef);
2984 }
2715 } 2985 }
2716} 2986}
2717 2987
2718sub cf::object::player::enter_exit { 2988sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 2989 my ($self, $exit) = @_;
2720 2990
2721 return unless $self->type == cf::PLAYER; 2991 return unless $self->type == cf::PLAYER;
2722 2992
2723 if ($exit->slaying eq "/!") {
2724 #TODO: this should de-fi-ni-te-ly not be a sync-job
2725 # the problem is that $exit might not survive long enough
2726 # so it needs to be done right now, right here
2727 cf::sync_job { prepare_random_map $exit };
2728 }
2729
2730 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2731 my $hp = $exit->stats->hp;
2732 my $sp = $exit->stats->sp;
2733
2734 $self->enter_link; 2993 $self->enter_link;
2735 2994
2736 # if exit is damned, update players death & WoR home-position
2737 $self->contr->savebed ($slaying, $hp, $sp)
2738 if $exit->flag (FLAG_DAMNED);
2739
2740 (async { 2995 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2996 $Coro::current->{desc} = "enter_exit";
2742 2997
2743 $self->deactivate_recursive; # just to be sure
2744 unless (eval { 2998 unless (eval {
2999 $self->deactivate_recursive; # just to be sure
3000
3001 my $map = cf::map::normalise $exit->slaying, $exit->map;
3002 my $x = $exit->stats->hp;
3003 my $y = $exit->stats->sp;
3004
3005 # special map handling
3006 my $slaying = $exit->slaying;
3007
3008 # special map handling
3009 if ($slaying eq "/!") {
3010 my $guard = cf::lock_acquire "exit_prepare:$exit";
3011
3012 prepare_random_map $exit
3013 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3014
3015 $map = $exit->slaying;
3016
3017 } elsif ($slaying eq '!up') {
3018 $map = $exit->map->tile_path (cf::TILE_UP);
3019 $x = $exit->x;
3020 $y = $exit->y;
3021
3022 } elsif ($slaying eq '!down') {
3023 $map = $exit->map->tile_path (cf::TILE_DOWN);
3024 $x = $exit->x;
3025 $y = $exit->y;
3026 }
3027
2745 $self->goto ($slaying, $hp, $sp); 3028 $self->goto ($map, $x, $y);
2746 3029
3030 # if exit is damned, update players death & WoR home-position
3031 $self->contr->savebed ($map, $x, $y)
3032 if $exit->flag (cf::FLAG_DAMNED);
3033
2747 1; 3034 1
2748 }) { 3035 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 3036 $self->message ("Something went wrong deep within the deliantra server. "
2750 . "I'll try to bring you back to the map you were before. " 3037 . "I'll try to bring you back to the map you were before. "
2751 . "Please report this to the dungeon master!", 3038 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 3039 cf::NDI_UNIQUE | cf::NDI_RED);
2753 3040
2754 warn "ERROR in enter_exit: $@"; 3041 error "ERROR in enter_exit: $@";
2755 $self->leave_link; 3042 $self->leave_link;
2756 } 3043 }
2757 })->prio (1); 3044 })->prio (1);
2758} 3045}
2759 3046
2771sub cf::client::send_drawinfo { 3058sub cf::client::send_drawinfo {
2772 my ($self, $text, $flags) = @_; 3059 my ($self, $text, $flags) = @_;
2773 3060
2774 utf8::encode $text; 3061 utf8::encode $text;
2775 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3062 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3063}
3064
3065=item $client->send_big_packet ($pkt)
3066
3067Like C<send_packet>, but tries to compress large packets, and fragments
3068them as required.
3069
3070=cut
3071
3072our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3073
3074sub cf::client::send_big_packet {
3075 my ($self, $pkt) = @_;
3076
3077 # try lzf for large packets
3078 $pkt = "lzf " . Compress::LZF::compress $pkt
3079 if 1024 <= length $pkt and $self->{can_lzf};
3080
3081 # split very large packets
3082 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3083 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3084 $pkt = "frag";
3085 }
3086
3087 $self->send_packet ($pkt);
2776} 3088}
2777 3089
2778=item $client->send_msg ($channel, $msg, $color, [extra...]) 3090=item $client->send_msg ($channel, $msg, $color, [extra...])
2779 3091
2780Send a drawinfo or msg packet to the client, formatting the msg for the 3092Send a drawinfo or msg packet to the client, formatting the msg for the
2784 3096
2785=cut 3097=cut
2786 3098
2787# non-persistent channels (usually the info channel) 3099# non-persistent channels (usually the info channel)
2788our %CHANNEL = ( 3100our %CHANNEL = (
3101 "c/motd" => {
3102 id => "infobox",
3103 title => "MOTD",
3104 reply => undef,
3105 tooltip => "The message of the day",
3106 },
2789 "c/identify" => { 3107 "c/identify" => {
2790 id => "infobox", 3108 id => "infobox",
2791 title => "Identify", 3109 title => "Identify",
2792 reply => undef, 3110 reply => undef,
2793 tooltip => "Items recently identified", 3111 tooltip => "Items recently identified",
2795 "c/examine" => { 3113 "c/examine" => {
2796 id => "infobox", 3114 id => "infobox",
2797 title => "Examine", 3115 title => "Examine",
2798 reply => undef, 3116 reply => undef,
2799 tooltip => "Signs and other items you examined", 3117 tooltip => "Signs and other items you examined",
3118 },
3119 "c/shopinfo" => {
3120 id => "infobox",
3121 title => "Shop Info",
3122 reply => undef,
3123 tooltip => "What your bargaining skill tells you about the shop",
2800 }, 3124 },
2801 "c/book" => { 3125 "c/book" => {
2802 id => "infobox", 3126 id => "infobox",
2803 title => "Book", 3127 title => "Book",
2804 reply => undef, 3128 reply => undef,
2820 id => "infobox", 3144 id => "infobox",
2821 title => "Body Parts", 3145 title => "Body Parts",
2822 reply => undef, 3146 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available", 3147 tooltip => "Shows which body parts you posess and are available",
2824 }, 3148 },
3149 "c/statistics" => {
3150 id => "infobox",
3151 title => "Statistics",
3152 reply => undef,
3153 tooltip => "Shows your primary statistics",
3154 },
3155 "c/skills" => {
3156 id => "infobox",
3157 title => "Skills",
3158 reply => undef,
3159 tooltip => "Shows your experience per skill and item power",
3160 },
3161 "c/shopitems" => {
3162 id => "infobox",
3163 title => "Shop Items",
3164 reply => undef,
3165 tooltip => "Shows the items currently for sale in this shop",
3166 },
3167 "c/resistances" => {
3168 id => "infobox",
3169 title => "Resistances",
3170 reply => undef,
3171 tooltip => "Shows your resistances",
3172 },
3173 "c/pets" => {
3174 id => "infobox",
3175 title => "Pets",
3176 reply => undef,
3177 tooltip => "Shows information abotu your pets/a specific pet",
3178 },
3179 "c/perceiveself" => {
3180 id => "infobox",
3181 title => "Perceive Self",
3182 reply => undef,
3183 tooltip => "You gained detailed knowledge about yourself",
3184 },
2825 "c/uptime" => { 3185 "c/uptime" => {
2826 id => "infobox", 3186 id => "infobox",
2827 title => "Uptime", 3187 title => "Uptime",
2828 reply => undef, 3188 reply => undef,
2829 tooltip => "How long the server has been running since last restart", 3189 tooltip => "How long the server has been running since last restart",
2832 id => "infobox", 3192 id => "infobox",
2833 title => "Map Info", 3193 title => "Map Info",
2834 reply => undef, 3194 reply => undef,
2835 tooltip => "Information related to the maps", 3195 tooltip => "Information related to the maps",
2836 }, 3196 },
3197 "c/party" => {
3198 id => "party",
3199 title => "Party",
3200 reply => "gsay ",
3201 tooltip => "Messages and chat related to your party",
3202 },
3203 "c/death" => {
3204 id => "death",
3205 title => "Death",
3206 reply => undef,
3207 tooltip => "Reason for and more info about your most recent death",
3208 },
3209 "c/say" => $SAY_CHANNEL,
3210 "c/chat" => $CHAT_CHANNEL,
2837); 3211);
2838 3212
2839sub cf::client::send_msg { 3213sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 3214 my ($self, $channel, $msg, $color, @extra) = @_;
2841 3215
2842 $msg = $self->pl->expand_cfpod ($msg); 3216 $msg = $self->pl->expand_cfpod ($msg)
3217 unless $color & cf::NDI_VERBATIM;
2843 3218
2844 $color &= cf::NDI_CLIENT_MASK; # just in case... 3219 $color &= cf::NDI_CLIENT_MASK; # just in case...
2845 3220
2846 # check predefined channels, for the benefit of C 3221 # check predefined channels, for the benefit of C
2847 if ($CHANNEL{$channel}) { 3222 if ($CHANNEL{$channel}) {
2848 $channel = $CHANNEL{$channel}; 3223 $channel = $CHANNEL{$channel};
2849 3224
2850 $self->ext_msg (channel_info => $channel) 3225 $self->ext_msg (channel_info => $channel);
2851 if $self->can_msg;
2852
2853 $channel = $channel->{id}; 3226 $channel = $channel->{id};
2854 3227
2855 } elsif (ref $channel) { 3228 } elsif (ref $channel) {
2856 # send meta info to client, if not yet sent 3229 # send meta info to client, if not yet sent
2857 unless (exists $self->{channel}{$channel->{id}}) { 3230 unless (exists $self->{channel}{$channel->{id}}) {
2858 $self->{channel}{$channel->{id}} = $channel; 3231 $self->{channel}{$channel->{id}} = $channel;
2859 $self->ext_msg (channel_info => $channel) 3232 $self->ext_msg (channel_info => $channel);
2860 if $self->can_msg;
2861 } 3233 }
2862 3234
2863 $channel = $channel->{id}; 3235 $channel = $channel->{id};
2864 } 3236 }
2865 3237
2866 return unless @extra || length $msg; 3238 return unless @extra || length $msg;
2867 3239
2868 if ($self->can_msg) {
2869 # default colour, mask it out 3240 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3241 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF; 3242 if $color & cf::NDI_DEF;
2872 3243
2873 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3244 my $pkt = "msg "
3245 . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3246 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2875 } else { 3247 );
2876 if ($color >= 0) {
2877 # replace some tags by gcfclient-compatible ones
2878 for ($msg) {
2879 1 while
2880 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2881 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2882 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2883 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2884 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2885 }
2886 3248
2887 $color &= cf::NDI_COLOR_MASK; 3249 $self->send_big_packet ($pkt);
2888
2889 utf8::encode $msg;
2890
2891 if (0 && $msg =~ /\[/) {
2892 # COMMAND/INFO
2893 $self->send_packet ("drawextinfo $color 10 8 $msg")
2894 } else {
2895 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2896 $self->send_packet ("drawinfo $color $msg")
2897 }
2898 }
2899 }
2900} 3250}
2901 3251
2902=item $client->ext_msg ($type, @msg) 3252=item $client->ext_msg ($type, @msg)
2903 3253
2904Sends an ext event to the client. 3254Sends an ext event to the client.
2906=cut 3256=cut
2907 3257
2908sub cf::client::ext_msg($$@) { 3258sub cf::client::ext_msg($$@) {
2909 my ($self, $type, @msg) = @_; 3259 my ($self, $type, @msg) = @_;
2910 3260
2911 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3261 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2913 } elsif ($self->extcmd == 1) { # TODO: remove
2914 push @msg, msgtype => "event_$type";
2915 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2916 }
2917}
2918
2919=item $client->ext_reply ($msgid, @msg)
2920
2921Sends an ext reply to the client.
2922
2923=cut
2924
2925sub cf::client::ext_reply($$@) {
2926 my ($self, $id, @msg) = @_;
2927
2928 if ($self->extcmd == 2) {
2929 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2930 } elsif ($self->extcmd == 1) {
2931 #TODO: version 1, remove
2932 unshift @msg, msgtype => "reply", msgid => $id;
2933 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2934 }
2935} 3262}
2936 3263
2937=item $success = $client->query ($flags, "text", \&cb) 3264=item $success = $client->query ($flags, "text", \&cb)
2938 3265
2939Queues a query to the client, calling the given callback with 3266Queues a query to the client, calling the given callback with
2994 my ($ns, $buf) = @_; 3321 my ($ns, $buf) = @_;
2995 3322
2996 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3323 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2997 3324
2998 if (ref $msg) { 3325 if (ref $msg) {
2999 my ($type, $reply, @payload) = 3326 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3000 "ARRAY" eq ref $msg
3001 ? @$msg
3002 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3003 3327
3004 my @reply;
3005
3006 if (my $cb = $EXTICMD{$type}) { 3328 if (my $cb = $EXTIACMD{$type}) {
3329 $cb->(
3330 $ns,
3331 sub {
3332 $ns->ext_msg ("reply-$reply", @_)
3333 if $reply;
3334 },
3335 @payload
3336 );
3337 } else {
3338 my @reply;
3339
3340 if (my $cb = $EXTICMD{$type}) {
3007 @reply = $cb->($ns, @payload); 3341 @reply = $cb->($ns, @payload);
3342 }
3343
3344 $ns->ext_msg ("reply-$reply", @reply)
3345 if $reply;
3008 } 3346 }
3009
3010 $ns->ext_reply ($reply, @reply)
3011 if $reply;
3012
3013 } else { 3347 } else {
3014 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3348 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3015 } 3349 }
3016 3350
3017 cf::override; 3351 cf::override;
3018 }, 3352 },
3019); 3353);
3039 3373
3040 $coro 3374 $coro
3041} 3375}
3042 3376
3043cf::client->attach ( 3377cf::client->attach (
3044 on_destroy => sub { 3378 on_client_destroy => sub {
3045 my ($ns) = @_; 3379 my ($ns) = @_;
3046 3380
3047 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3381 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3048 }, 3382 },
3049); 3383);
3065our $safe_hole = new Safe::Hole; 3399our $safe_hole = new Safe::Hole;
3066 3400
3067$SIG{FPE} = 'IGNORE'; 3401$SIG{FPE} = 'IGNORE';
3068 3402
3069$safe->permit_only (Opcode::opset qw( 3403$safe->permit_only (Opcode::opset qw(
3070 :base_core :base_mem :base_orig :base_math 3404 :base_core :base_mem :base_orig :base_math :base_loop
3071 grepstart grepwhile mapstart mapwhile 3405 grepstart grepwhile mapstart mapwhile
3072 sort time 3406 sort time
3073)); 3407));
3074 3408
3075# here we export the classes and methods available to script code 3409# here we export the classes and methods available to script code
3078 3412
3079The following functions and methods are available within a safe environment: 3413The following functions and methods are available within a safe environment:
3080 3414
3081 cf::object 3415 cf::object
3082 contr pay_amount pay_player map x y force_find force_add destroy 3416 contr pay_amount pay_player map x y force_find force_add destroy
3083 insert remove name archname title slaying race decrease_ob_nr 3417 insert remove name archname title slaying race decrease split
3418 value
3084 3419
3085 cf::object::player 3420 cf::object::player
3086 player 3421 player
3087 3422
3088 cf::player 3423 cf::player
3093 3428
3094=cut 3429=cut
3095 3430
3096for ( 3431for (
3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3432 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3098 insert remove inv name archname title slaying race 3433 insert remove inv nrof name archname title slaying race
3099 decrease_ob_nr destroy)], 3434 decrease split destroy change_exp value msg lore send_msg)],
3100 ["cf::object::player" => qw(player)], 3435 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful)], 3436 ["cf::player" => qw(peaceful send_msg)],
3102 ["cf::map" => qw(trigger)], 3437 ["cf::map" => qw(trigger)],
3103) { 3438) {
3104 no strict 'refs';
3105 my ($pkg, @funs) = @$_; 3439 my ($pkg, @funs) = @$_;
3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3440 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3107 for @funs; 3441 for @funs;
3108} 3442}
3109 3443
3124 3458
3125 my $qcode = $code; 3459 my $qcode = $code;
3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3460 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3127 $qcode =~ s/\n/\\n/g; 3461 $qcode =~ s/\n/\\n/g;
3128 3462
3463 %vars = (_dummy => 0) unless %vars;
3464
3465 my @res;
3129 local $_; 3466 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars;
3131 3467
3132 my $eval = 3468 my $eval =
3133 "do {\n" 3469 "do {\n"
3134 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3470 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3135 . "#line 0 \"{$qcode}\"\n" 3471 . "#line 0 \"{$qcode}\"\n"
3136 . $code 3472 . $code
3137 . "\n}" 3473 . "\n}"
3138 ; 3474 ;
3139 3475
3476 if ($CFG{safe_eval}) {
3140 sub_generation_inc; 3477 sub_generation_inc;
3478 local @safe::cf::_safe_eval_args = values %vars;
3141 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3479 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3142 sub_generation_inc; 3480 sub_generation_inc;
3481 } else {
3482 local @cf::_safe_eval_args = values %vars;
3483 @res = wantarray ? eval eval : scalar eval $eval;
3484 }
3143 3485
3144 if ($@) { 3486 if ($@) {
3145 warn "$@"; 3487 warn "$@",
3146 warn "while executing safe code '$code'\n"; 3488 "while executing safe code '$code'\n",
3147 warn "with arguments " . (join " ", %vars) . "\n"; 3489 "with arguments " . (join " ", %vars) . "\n";
3148 } 3490 }
3149 3491
3150 wantarray ? @res : $res[0] 3492 wantarray ? @res : $res[0]
3151} 3493}
3152 3494
3166=cut 3508=cut
3167 3509
3168sub register_script_function { 3510sub register_script_function {
3169 my ($fun, $cb) = @_; 3511 my ($fun, $cb) = @_;
3170 3512
3171 no strict 'refs'; 3513 $fun = "safe::$fun" if $CFG{safe_eval};
3172 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3514 *$fun = $safe_hole->wrap ($cb);
3173} 3515}
3174 3516
3175=back 3517=back
3176 3518
3177=cut 3519=cut
3178 3520
3179############################################################################# 3521#############################################################################
3180# the server's init and main functions 3522# the server's init and main functions
3181 3523
3524our %FACEHASH; # hash => idx, #d# HACK for http server
3525our @FACEDATA; # dynamically-created facedata
3526
3527# internal api, not fianlised
3528sub set_face {
3529 my ($name, $type, $data) = @_;
3530
3531 my $idx = cf::face::find $name;
3532
3533 if ($idx) {
3534 delete $FACEHASH{cf::face::get_chksum $idx};
3535 } else {
3536 $idx = cf::face::alloc $name;
3537 }
3538
3539 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3540
3541 cf::face::set_type $idx, $type;
3542 cf::face::set_data $idx, 0, (length $data), 0, $hash;
3543 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3544
3545 # we need to destroy the SV itself, not just overwrite,
3546 # as a running ix might hold a reference to it.
3547 # delete achieves that.
3548 delete $FACEDATA[$idx];
3549 $FACEDATA[$idx] = $data;
3550 $FACEHASH{$hash} = $idx;#d#
3551
3552 $idx
3553}
3554
3555our $FACEDATA; # facedata filehandle
3556
3557sub _face_get_data($$$$) {
3558 my ($idx, $size, $fofs, $cb) = @_;
3559
3560 if (defined $FACEDATA[$idx]) {
3561 $cb->($FACEDATA[$idx]);
3562 } elsif ($fofs) {
3563 my $buf;
3564 IO::AIO::aio_read $FACEDATA, $fofs, $size, $buf, 0, sub {
3565 if ($_[0] == $size) {
3566 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3567 $cb->($buf);
3568 } else {
3569 cf::error "INTERNAL ERROR: unable to read facedata for face $idx ($size, $fofs), ignoring request.";
3570 }
3571 };
3572 } else {
3573 cf::error "requested facedata for unknown face $idx ($size, $fofs), ignoring.";
3574 }
3575}
3576
3577# rather ineffient
3578sub cf::face::get_data($;$) {
3579 my ($idx, $faceset) = @_;
3580
3581 my $size = cf::face::get_size $idx, $faceset;
3582 my $fofs = cf::face::get_fofs $idx, $faceset;
3583
3584 _face_get_data $idx, $size, $fofs, Coro::rouse_cb;
3585 Coro::rouse_wait
3586}
3587
3588sub cf::face::ix {
3589 my ($ns, $idx, $pri, $size, $fofs) = @_;
3590
3591 _face_get_data $idx, $size, $fofs, sub {
3592 $ns->ix_send ($idx, $pri, $_[0]);
3593 };
3594}
3595
3182sub load_facedata($) { 3596sub load_facedata($) {
3183 my ($path) = @_; 3597 my ($path) = @_;
3184 3598
3185 # HACK to clear player env face cache, we need some signal framework
3186 # for this (global event?)
3187 %ext::player_env::MUSIC_FACE_CACHE = ();
3188
3189 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3599 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3190 3600
3191 warn "loading facedata from $path\n"; 3601 trace "loading facedata from $path\n";
3192 3602
3193 my $facedata; 3603 my $facedata = decode_storable load_file "$path/faceinfo";
3194 0 < aio_load $path, $facedata
3195 or die "$path: $!";
3196
3197 $facedata = Coro::Storable::thaw $facedata;
3198 3604
3199 $facedata->{version} == 2 3605 $facedata->{version} == 2
3200 or cf::cleanup "$path: version mismatch, cannot proceed."; 3606 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3201 3607
3202 # patch in the exptable 3608 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3203 $facedata->{resource}{"res/exp_table"} = { 3609 or cf::cleanup "$path/facedata: $!, cnanot proceed.";
3204 type => FT_RSRC, 3610
3205 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3611 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3206 }; 3612
3207 cf::cede_to_tick; 3613 # BEGIN ATOMIC
3614 # from here on, everything must be atomic - no thread switch allowed
3615 my $t1 = EV::time;
3208 3616
3209 { 3617 {
3210 my $faces = $facedata->{faceinfo}; 3618 my $faces = $facedata->{faceinfo};
3211 3619
3212 while (my ($face, $info) = each %$faces) { 3620 for my $face (sort keys %$faces) {
3621 my $info = $faces->{$face};
3213 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3622 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214 3623
3215 cf::face::set_visibility $idx, $info->{visibility}; 3624 cf::face::set_visibility $idx, $info->{visibility};
3216 cf::face::set_magicmap $idx, $info->{magicmap}; 3625 cf::face::set_magicmap $idx, $info->{magicmap};
3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3626 cf::face::set_data $idx, 0, $info->{size32}, $info->{fofs32}, $info->{hash32};
3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3627 cf::face::set_data $idx, 1, $info->{size64}, $info->{fofs64}, $info->{hash64};
3219 3628 #cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3220 cf::cede_to_tick; 3629 $FACEHASH{$info->{hash64}} = $idx;#d#
3221 } 3630 }
3222 3631
3223 while (my ($face, $info) = each %$faces) { 3632 while (my ($face, $info) = each %$faces) {
3224 next unless $info->{smooth}; 3633 next unless $info->{smooth};
3225 3634
3228 3637
3229 if (my $smooth = cf::face::find $info->{smooth}) { 3638 if (my $smooth = cf::face::find $info->{smooth}) {
3230 cf::face::set_smooth $idx, $smooth; 3639 cf::face::set_smooth $idx, $smooth;
3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3640 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3232 } else { 3641 } else {
3233 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3642 error "smooth face '$info->{smooth}' not found for face '$face'";
3234 } 3643 }
3235
3236 cf::cede_to_tick;
3237 } 3644 }
3238 } 3645 }
3239 3646
3240 { 3647 {
3241 my $anims = $facedata->{animinfo}; 3648 my $anims = $facedata->{animinfo};
3242 3649
3243 while (my ($anim, $info) = each %$anims) { 3650 while (my ($anim, $info) = each %$anims) {
3244 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3651 cf::anim::set $anim, $info->{frames}, $info->{facings};
3245 cf::cede_to_tick;
3246 } 3652 }
3247 3653
3248 cf::anim::invalidate_all; # d'oh 3654 cf::anim::invalidate_all; # d'oh
3249 } 3655 }
3250 3656
3251 { 3657 {
3252 # TODO: for gcfclient pleasure, we should give resources
3253 # that gcfclient doesn't grok a >10000 face index.
3254 my $res = $facedata->{resource}; 3658 my $res = $facedata->{resource};
3255 3659
3256 while (my ($name, $info) = each %$res) { 3660 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) { 3661 if (defined (my $type = $info->{type})) {
3662 # TODO: different hash - must free and use new index, or cache ixface data queue
3258 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3663 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259 my $data;
3260 3664
3261 if ($info->{type} & 1) {
3262 # prepend meta info
3263
3264 my $meta = $enc->encode ({
3265 name => $name,
3266 %{ $info->{meta} || {} },
3267 });
3268
3269 $data = pack "(w/a*)*", $meta, $info->{data};
3270 } else {
3271 $data = $info->{data};
3272 }
3273
3274 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3275 cf::face::set_type $idx, $info->{type}; 3665 cf::face::set_type $idx, $type;
3666 cf::face::set_data $idx, 0, $info->{size}, $info->{fofs}, $info->{hash};
3667 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3668 $FACEHASH{$info->{hash}} = $idx;#d#
3276 } else { 3669 } else {
3277 $RESOURCE{$name} = $info; 3670# $RESOURCE{$name} = $info; # unused
3278 } 3671 }
3279
3280 cf::cede_to_tick;
3281 } 3672 }
3282 } 3673 }
3674
3675 ($fh, $FACEDATA) = ($FACEDATA, $fh);
3676
3677 # HACK to clear player env face cache, we need some signal framework
3678 # for this (global event?)
3679 %ext::player_env::MUSIC_FACE_CACHE = ();
3680
3681 # END ATOMIC
3682
3683 cf::debug "facedata atomic update time ", EV::time - $t1;
3283 3684
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3685 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3285 3686
3687 aio_close $fh if $fh; # close old facedata
3688
3286 1 3689 1
3287} 3690}
3288
3289cf::global->attach (on_resource_update => sub {
3290 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3291 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3292
3293 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3294 my $sound = $soundconf->{compat}[$_]
3295 or next;
3296
3297 my $face = cf::face::find "sound/$sound->[1]";
3298 cf::sound::set $sound->[0] => $face;
3299 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3300 }
3301
3302 while (my ($k, $v) = each %{$soundconf->{event}}) {
3303 my $face = cf::face::find "sound/$v";
3304 cf::sound::set $k => $face;
3305 }
3306 }
3307});
3308 3691
3309register_exticmd fx_want => sub { 3692register_exticmd fx_want => sub {
3310 my ($ns, $want) = @_; 3693 my ($ns, $want) = @_;
3311 3694
3312 while (my ($k, $v) = each %$want) { 3695 while (my ($k, $v) = each %$want) {
3320 my $status = load_resource_file_ $_[0]; 3703 my $status = load_resource_file_ $_[0];
3321 get_slot 0.1, 100; 3704 get_slot 0.1, 100;
3322 cf::arch::commit_load; 3705 cf::arch::commit_load;
3323 3706
3324 $status 3707 $status
3708}
3709
3710sub reload_exp_table {
3711 _reload_exp_table;
3712
3713 set_face "res/exp_table" => FT_RSRC,
3714 JSON::XS->new->utf8->canonical->encode (
3715 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3716 );
3717}
3718
3719sub reload_materials {
3720 _reload_materials;
3325} 3721}
3326 3722
3327sub reload_regions { 3723sub reload_regions {
3328 # HACK to clear player env face cache, we need some signal framework 3724 # HACK to clear player env face cache, we need some signal framework
3329 # for this (global event?) 3725 # for this (global event?)
3337 if exists $_->{match}; 3733 if exists $_->{match};
3338 } 3734 }
3339} 3735}
3340 3736
3341sub reload_facedata { 3737sub reload_facedata {
3342 load_facedata "$DATADIR/facedata" 3738 load_facedata $DATADIR
3343 or die "unable to load facedata\n"; 3739 or die "unable to load facedata\n";
3344} 3740}
3345 3741
3346sub reload_archetypes { 3742sub reload_archetypes {
3347 load_resource_file "$DATADIR/archetypes" 3743 load_resource_file "$DATADIR/archetypes"
3348 or die "unable to load archetypes\n"; 3744 or die "unable to load archetypes\n";
3745
3746 set_face "res/skill_info" => FT_RSRC,
3747 JSON::XS->new->utf8->canonical->encode (
3748 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3749 );
3750 set_face "res/spell_paths" => FT_RSRC,
3751 JSON::XS->new->utf8->canonical->encode (
3752 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3753 );
3349} 3754}
3350 3755
3351sub reload_treasures { 3756sub reload_treasures {
3352 load_resource_file "$DATADIR/treasures" 3757 load_resource_file "$DATADIR/treasures"
3353 or die "unable to load treasurelists\n"; 3758 or die "unable to load treasurelists\n";
3354} 3759}
3355 3760
3761sub reload_sound {
3762 trace "loading sound config from $DATADIR/sound\n";
3763
3764 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3765
3766 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3767 my $sound = $soundconf->{compat}[$_]
3768 or next;
3769
3770 my $face = cf::face::find "sound/$sound->[1]";
3771 cf::sound::set $sound->[0] => $face;
3772 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3773 }
3774
3775 while (my ($k, $v) = each %{$soundconf->{event}}) {
3776 my $face = cf::face::find "sound/$v";
3777 cf::sound::set $k => $face;
3778 }
3779}
3780
3356sub reload_resources { 3781sub reload_resources {
3357 warn "reloading resource files...\n"; 3782 trace "reloading resource files...\n";
3358 3783
3784 reload_materials;
3359 reload_facedata; 3785 reload_facedata;
3786 reload_exp_table;
3787 reload_sound;
3360 reload_archetypes; 3788 reload_archetypes;
3361 reload_regions; 3789 reload_regions;
3362 reload_treasures; 3790 reload_treasures;
3363 3791
3364 warn "finished reloading resource files\n"; 3792 trace "finished reloading resource files\n";
3365}
3366
3367sub init {
3368 my $guard = freeze_mainloop;
3369
3370 reload_resources;
3371} 3793}
3372 3794
3373sub reload_config { 3795sub reload_config {
3374 open my $fh, "<:utf8", "$CONFDIR/config" 3796 trace "reloading config file...\n";
3375 or return;
3376 3797
3377 local $/; 3798 my $config = load_file "$CONFDIR/config";
3378 *CFG = YAML::Load <$fh>; 3799 utf8::decode $config;
3800 *CFG = decode_yaml $config;
3379 3801
3380 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3802 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3381 3803
3382 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3804 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3383 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3805 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3384 3806
3385 if (exists $CFG{mlockall}) { 3807 if (exists $CFG{mlockall}) {
3389 }; 3811 };
3390 warn $@ if $@; 3812 warn $@ if $@;
3391 } 3813 }
3392} 3814}
3393 3815
3816sub pidfile() {
3817 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3818 or die "$PIDFILE: $!";
3819 flock $fh, &Fcntl::LOCK_EX
3820 or die "$PIDFILE: flock: $!";
3821 $fh
3822}
3823
3824# make sure only one server instance is running at any one time
3825sub atomic {
3826 my $fh = pidfile;
3827
3828 my $pid = <$fh>;
3829 kill 9, $pid if $pid > 0;
3830
3831 seek $fh, 0, 0;
3832 print $fh $$;
3833}
3834
3835sub main_loop {
3836 trace "EV::loop starting\n";
3837 if (1) {
3838 EV::loop;
3839 }
3840 trace "EV::loop returned\n";
3841 goto &main_loop unless $REALLY_UNLOOP;
3842}
3843
3394sub main { 3844sub main {
3845 cf::init_globals; # initialise logging
3846
3847 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3848 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3849 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3850 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3851
3852 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3853
3395 # we must not ever block the main coroutine 3854 # we must not ever block the main coroutine
3396 local $Coro::idle = sub { 3855 $Coro::idle = sub {
3397 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3856 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3398 (async { 3857 (async {
3399 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3858 $Coro::current->{desc} = "IDLE BUG HANDLER";
3400 EV::loop EV::LOOP_ONESHOT; 3859 EV::loop EV::LOOP_ONESHOT;
3401 })->prio (Coro::PRIO_MAX); 3860 })->prio (Coro::PRIO_MAX);
3402 }; 3861 };
3403 3862
3404 { 3863 evthread_start IO::AIO::poll_fileno;
3405 my $guard = freeze_mainloop; 3864
3865 cf::sync_job {
3866 cf::incloader::init ();
3867
3868 db_init;
3869
3870 cf::init_anim;
3871 cf::init_attackmess;
3872 cf::init_dynamic;
3873
3874 cf::load_settings;
3875
3876 reload_resources;
3406 reload_config; 3877 reload_config;
3407 db_init; 3878
3879 cf::init_uuid;
3880 cf::init_signals;
3881 cf::init_skills;
3882
3883 cf::init_beforeplay;
3884
3885 atomic;
3886
3408 load_extensions; 3887 load_extensions;
3409 3888
3410 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3889 utime time, time, $RUNTIMEFILE;
3411 evthread_start IO::AIO::poll_fileno; 3890
3891 # no (long-running) fork's whatsoever before this point(!)
3892 use POSIX ();
3893 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3894
3895 cf::_post_init 0;
3412 } 3896 };
3413 3897
3414 EV::loop; 3898 cf::object::thawer::errors_are_fatal 0;
3899 info "parse errors in files are no longer fatal from this point on.\n";
3900
3901 AE::postpone {
3902 undef &main; # free gobs of memory :)
3903 };
3904
3905 goto &main_loop;
3415} 3906}
3416 3907
3417############################################################################# 3908#############################################################################
3418# initialisation and cleanup 3909# initialisation and cleanup
3419 3910
3420# install some emergency cleanup handlers 3911# install some emergency cleanup handlers
3421BEGIN { 3912BEGIN {
3422 our %SIGWATCHER = (); 3913 our %SIGWATCHER = ();
3423 for my $signal (qw(INT HUP TERM)) { 3914 for my $signal (qw(INT HUP TERM)) {
3424 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3915 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3425 cf::cleanup "SIG$signal"; 3916 cf::cleanup "SIG$signal";
3426 }; 3917 };
3427 } 3918 }
3428} 3919}
3429 3920
3430sub write_runtime_sync { 3921sub write_runtime_sync {
3431 my $runtime = "$LOCALDIR/runtime"; 3922 my $t0 = AE::time;
3432 3923
3433 # first touch the runtime file to show we are still running: 3924 # first touch the runtime file to show we are still running:
3434 # the fsync below can take a very very long time. 3925 # the fsync below can take a very very long time.
3435 3926
3436 IO::AIO::aio_utime $runtime, undef, undef; 3927 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3437 3928
3438 my $guard = cf::lock_acquire "write_runtime"; 3929 my $guard = cf::lock_acquire "write_runtime";
3439 3930
3440 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3931 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3441 or return; 3932 or return;
3442 3933
3443 my $value = $cf::RUNTIME + 90 + 10; 3934 my $value = $cf::RUNTIME + 90 + 10;
3444 # 10 is the runtime save interval, for a monotonic clock 3935 # 10 is the runtime save interval, for a monotonic clock
3445 # 60 allows for the watchdog to kill the server. 3936 # 60 allows for the watchdog to kill the server.
3455 aio_utime $fh, undef, undef; 3946 aio_utime $fh, undef, undef;
3456 3947
3457 close $fh 3948 close $fh
3458 or return; 3949 or return;
3459 3950
3460 aio_rename "$runtime~", $runtime 3951 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3461 and return; 3952 and return;
3462 3953
3463 warn "runtime file written.\n"; 3954 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3464 3955
3465 1 3956 1
3466} 3957}
3467 3958
3468our $uuid_lock; 3959our $uuid_lock;
3477 my $uuid = "$LOCALDIR/uuid"; 3968 my $uuid = "$LOCALDIR/uuid";
3478 3969
3479 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3970 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3480 or return; 3971 or return;
3481 3972
3482 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3973 my $value = uuid_seq uuid_cur;
3974
3975 unless ($value) {
3976 info "cowardly refusing to write zero uuid value!\n";
3977 return;
3978 }
3979
3980 my $value = uuid_str $value + $uuid_skip;
3483 $uuid_skip = 0; 3981 $uuid_skip = 0;
3484 3982
3485 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3983 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3486 and return; 3984 and return;
3487 3985
3493 or return; 3991 or return;
3494 3992
3495 aio_rename "$uuid~", $uuid 3993 aio_rename "$uuid~", $uuid
3496 and return; 3994 and return;
3497 3995
3498 warn "uuid file written ($value).\n"; 3996 trace "uuid file written ($value).\n";
3499 3997
3500 1 3998 1
3501 3999
3502} 4000}
3503 4001
3509} 4007}
3510 4008
3511sub emergency_save() { 4009sub emergency_save() {
3512 my $freeze_guard = cf::freeze_mainloop; 4010 my $freeze_guard = cf::freeze_mainloop;
3513 4011
3514 warn "enter emergency perl save\n"; 4012 info "emergency_perl_save: enter\n";
4013
4014 # this is a trade-off: we want to be very quick here, so
4015 # save all maps without fsync, and later call a global sync
4016 # (which in turn might be very very slow)
4017 local $USE_FSYNC = 0;
3515 4018
3516 cf::sync_job { 4019 cf::sync_job {
4020 cf::write_runtime_sync; # external watchdog should not bark
4021
3517 # use a peculiar iteration method to avoid tripping on perl 4022 # use a peculiar iteration method to avoid tripping on perl
3518 # refcount bugs in for. also avoids problems with players 4023 # refcount bugs in for. also avoids problems with players
3519 # and maps saved/destroyed asynchronously. 4024 # and maps saved/destroyed asynchronously.
3520 warn "begin emergency player save\n"; 4025 info "emergency_perl_save: begin player save\n";
3521 for my $login (keys %cf::PLAYER) { 4026 for my $login (keys %cf::PLAYER) {
3522 my $pl = $cf::PLAYER{$login} or next; 4027 my $pl = $cf::PLAYER{$login} or next;
3523 $pl->valid or next; 4028 $pl->valid or next;
3524 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4029 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3525 $pl->save; 4030 $pl->save;
3526 } 4031 }
3527 warn "end emergency player save\n"; 4032 info "emergency_perl_save: end player save\n";
3528 4033
3529 warn "begin emergency map save\n"; 4034 cf::write_runtime_sync; # external watchdog should not bark
4035
4036 info "emergency_perl_save: begin map save\n";
3530 for my $path (keys %cf::MAP) { 4037 for my $path (keys %cf::MAP) {
3531 my $map = $cf::MAP{$path} or next; 4038 my $map = $cf::MAP{$path} or next;
3532 $map->valid or next; 4039 $map->valid or next;
3533 $map->save; 4040 $map->save;
3534 } 4041 }
3535 warn "end emergency map save\n"; 4042 info "emergency_perl_save: end map save\n";
3536 4043
3537 warn "begin emergency database checkpoint\n"; 4044 cf::write_runtime_sync; # external watchdog should not bark
4045
4046 info "emergency_perl_save: begin database checkpoint\n";
3538 BDB::db_env_txn_checkpoint $DB_ENV; 4047 BDB::db_env_txn_checkpoint $DB_ENV;
3539 warn "end emergency database checkpoint\n"; 4048 info "emergency_perl_save: end database checkpoint\n";
3540 4049
3541 warn "begin write uuid\n"; 4050 info "emergency_perl_save: begin write uuid\n";
3542 write_uuid_sync 1; 4051 write_uuid_sync 1;
3543 warn "end write uuid\n"; 4052 info "emergency_perl_save: end write uuid\n";
4053
4054 cf::write_runtime_sync; # external watchdog should not bark
4055
4056 trace "emergency_perl_save: syncing database to disk";
4057 BDB::db_env_txn_checkpoint $DB_ENV;
4058
4059 info "emergency_perl_save: starting sync\n";
4060 IO::AIO::aio_sync sub {
4061 info "emergency_perl_save: finished sync\n";
4062 };
4063
4064 cf::write_runtime_sync; # external watchdog should not bark
4065
4066 trace "emergency_perl_save: flushing outstanding aio requests";
4067 while (IO::AIO::nreqs || BDB::nreqs) {
4068 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4069 }
4070
4071 cf::write_runtime_sync; # external watchdog should not bark
3544 }; 4072 };
3545 4073
3546 warn "leave emergency perl save\n"; 4074 info "emergency_perl_save: leave\n";
3547} 4075}
3548 4076
3549sub post_cleanup { 4077sub post_cleanup {
3550 my ($make_core) = @_; 4078 my ($make_core) = @_;
3551 4079
4080 IO::AIO::flush;
4081
3552 warn Carp::longmess "post_cleanup backtrace" 4082 error Carp::longmess "post_cleanup backtrace"
3553 if $make_core; 4083 if $make_core;
4084
4085 my $fh = pidfile;
4086 unlink $PIDFILE if <$fh> == $$;
4087}
4088
4089# a safer delete_package, copied from Symbol
4090sub clear_package($) {
4091 my $pkg = shift;
4092
4093 # expand to full symbol table name if needed
4094 unless ($pkg =~ /^main::.*::$/) {
4095 $pkg = "main$pkg" if $pkg =~ /^::/;
4096 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
4097 $pkg .= '::' unless $pkg =~ /::$/;
4098 }
4099
4100 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
4101 my $stem_symtab = *{$stem}{HASH};
4102
4103 defined $stem_symtab and exists $stem_symtab->{$leaf}
4104 or return;
4105
4106 # clear all symbols
4107 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
4108 for my $name (keys %$leaf_symtab) {
4109 _gv_clear *{"$pkg$name"};
4110# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
4111 }
3554} 4112}
3555 4113
3556sub do_reload_perl() { 4114sub do_reload_perl() {
3557 # can/must only be called in main 4115 # can/must only be called in main
3558 if ($Coro::current != $Coro::main) { 4116 unless (in_main) {
3559 warn "can only reload from main coroutine"; 4117 error "can only reload from main coroutine";
3560 return; 4118 return;
3561 } 4119 }
3562 4120
3563 warn "reloading..."; 4121 return if $RELOAD++;
3564 4122
3565 warn "entering sync_job"; 4123 my $t1 = AE::time;
3566 4124
4125 while ($RELOAD) {
4126 cf::get_slot 0.1, -1, "reload_perl";
4127 info "perl_reload: reloading...";
4128
4129 trace "perl_reload: entering sync_job";
4130
3567 cf::sync_job { 4131 cf::sync_job {
3568 cf::write_runtime_sync; # external watchdog should not bark
3569 cf::emergency_save; 4132 #cf::emergency_save;
3570 cf::write_runtime_sync; # external watchdog should not bark
3571 4133
3572 warn "syncing database to disk";
3573 BDB::db_env_txn_checkpoint $DB_ENV;
3574
3575 # if anything goes wrong in here, we should simply crash as we already saved
3576
3577 warn "flushing outstanding aio requests";
3578 for (;;) {
3579 BDB::flush;
3580 IO::AIO::flush;
3581 Coro::cede_notself;
3582 last unless IO::AIO::nreqs || BDB::nreqs;
3583 warn "iterate...";
3584 }
3585
3586 ++$RELOAD;
3587
3588 warn "cancelling all extension coros"; 4134 trace "perl_reload: cancelling all extension coros";
3589 $_->cancel for values %EXT_CORO; 4135 $_->cancel for values %EXT_CORO;
3590 %EXT_CORO = (); 4136 %EXT_CORO = ();
3591 4137
3592 warn "removing commands"; 4138 trace "perl_reload: removing commands";
3593 %COMMAND = (); 4139 %COMMAND = ();
3594 4140
3595 warn "removing ext/exti commands"; 4141 trace "perl_reload: removing ext/exti commands";
3596 %EXTCMD = (); 4142 %EXTCMD = ();
3597 %EXTICMD = (); 4143 %EXTICMD = ();
3598 4144
3599 warn "unloading/nuking all extensions"; 4145 trace "perl_reload: unloading/nuking all extensions";
3600 for my $pkg (@EXTS) { 4146 for my $pkg (@EXTS) {
3601 warn "... unloading $pkg"; 4147 trace "... unloading $pkg";
3602 4148
3603 if (my $cb = $pkg->can ("unload")) { 4149 if (my $cb = $pkg->can ("unload")) {
3604 eval { 4150 eval {
3605 $cb->($pkg); 4151 $cb->($pkg);
3606 1 4152 1
3607 } or warn "$pkg unloaded, but with errors: $@"; 4153 } or error "$pkg unloaded, but with errors: $@";
4154 }
4155
4156 trace "... clearing $pkg";
4157 clear_package $pkg;
3608 } 4158 }
3609 4159
3610 warn "... nuking $pkg";
3611 Symbol::delete_package $pkg;
3612 }
3613
3614 warn "unloading all perl modules loaded from $LIBDIR"; 4160 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3615 while (my ($k, $v) = each %INC) { 4161 while (my ($k, $v) = each %INC) {
3616 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4162 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3617 4163
3618 warn "... unloading $k"; 4164 trace "... unloading $k";
3619 delete $INC{$k}; 4165 delete $INC{$k};
3620 4166
3621 $k =~ s/\.pm$//; 4167 $k =~ s/\.pm$//;
3622 $k =~ s/\//::/g; 4168 $k =~ s/\//::/g;
3623 4169
3624 if (my $cb = $k->can ("unload_module")) { 4170 if (my $cb = $k->can ("unload_module")) {
3625 $cb->(); 4171 $cb->();
4172 }
4173
4174 clear_package $k;
3626 } 4175 }
3627 4176
3628 Symbol::delete_package $k;
3629 }
3630
3631 warn "getting rid of safe::, as good as possible"; 4177 trace "perl_reload: getting rid of safe::, as good as possible";
3632 Symbol::delete_package "safe::$_" 4178 clear_package "safe::$_"
3633 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4179 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3634 4180
3635 warn "unloading cf.pm \"a bit\""; 4181 trace "perl_reload: unloading cf.pm \"a bit\"";
3636 delete $INC{"cf.pm"}; 4182 delete $INC{"cf.pm"};
3637 delete $INC{"cf/pod.pm"}; 4183 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3638 4184
3639 # don't, removes xs symbols, too, 4185 # don't, removes xs symbols, too,
3640 # and global variables created in xs 4186 # and global variables created in xs
3641 #Symbol::delete_package __PACKAGE__; 4187 #clear_package __PACKAGE__;
3642 4188
3643 warn "unload completed, starting to reload now"; 4189 info "perl_reload: unload completed, starting to reload now";
3644 4190
3645 warn "reloading cf.pm"; 4191 trace "perl_reload: reloading cf.pm";
3646 require cf; 4192 require cf;
3647 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4193 cf::_connect_to_perl_1;
3648 4194
3649 warn "loading config and database again"; 4195 trace "perl_reload: loading config and database again";
3650 cf::reload_config; 4196 cf::reload_config;
3651 4197
3652 warn "loading extensions"; 4198 trace "perl_reload: loading extensions";
3653 cf::load_extensions; 4199 cf::load_extensions;
3654 4200
4201 if ($REATTACH_ON_RELOAD) {
3655 warn "reattaching attachments to objects/players"; 4202 trace "perl_reload: reattaching attachments to objects/players";
3656 _global_reattach; # objects, sockets 4203 _global_reattach; # objects, sockets
3657 warn "reattaching attachments to maps"; 4204 trace "perl_reload: reattaching attachments to maps";
3658 reattach $_ for values %MAP; 4205 reattach $_ for values %MAP;
3659 warn "reattaching attachments to players"; 4206 trace "perl_reload: reattaching attachments to players";
3660 reattach $_ for values %PLAYER; 4207 reattach $_ for values %PLAYER;
4208 }
3661 4209
3662 warn "leaving sync_job"; 4210 cf::_post_init 1;
3663 4211
4212 trace "perl_reload: leaving sync_job";
4213
3664 1 4214 1
3665 } or do { 4215 } or do {
3666 warn $@; 4216 error $@;
3667 cf::cleanup "error while reloading, exiting."; 4217 cf::cleanup "perl_reload: error, exiting.";
4218 };
4219
4220 --$RELOAD;
3668 }; 4221 }
3669 4222
3670 warn "reloaded"; 4223 $t1 = AE::time - $t1;
4224 info "perl_reload: completed in ${t1}s\n";
3671}; 4225};
3672 4226
3673our $RELOAD_WATCHER; # used only during reload 4227our $RELOAD_WATCHER; # used only during reload
3674 4228
3675sub reload_perl() { 4229sub reload_perl() {
3676 # doing reload synchronously and two reloads happen back-to-back, 4230 # doing reload synchronously and two reloads happen back-to-back,
3677 # coro crashes during coro_state_free->destroy here. 4231 # coro crashes during coro_state_free->destroy here.
3678 4232
4233 $RELOAD_WATCHER ||= cf::async {
4234 Coro::AIO::aio_wait cache_extensions;
4235
3679 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4236 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3680 do_reload_perl; 4237 do_reload_perl;
3681 undef $RELOAD_WATCHER; 4238 undef $RELOAD_WATCHER;
4239 };
3682 }; 4240 };
3683} 4241}
3684 4242
3685register_command "reload" => sub { 4243register_command "reload" => sub {
3686 my ($who, $arg) = @_; 4244 my ($who, $arg) = @_;
3692 reload_perl; 4250 reload_perl;
3693 }; 4251 };
3694 } 4252 }
3695}; 4253};
3696 4254
3697unshift @INC, $LIBDIR; 4255#############################################################################
3698 4256
3699my $bug_warning = 0; 4257my $bug_warning = 0;
3700 4258
3701our @WAIT_FOR_TICK;
3702our @WAIT_FOR_TICK_BEGIN;
3703
3704sub wait_for_tick { 4259sub wait_for_tick() {
3705 return if tick_inhibit || $Coro::current == $Coro::main; 4260 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3706 4261
3707 my $signal = new Coro::Signal; 4262 $WAIT_FOR_TICK->wait;
3708 push @WAIT_FOR_TICK, $signal;
3709 $signal->wait;
3710} 4263}
3711 4264
3712sub wait_for_tick_begin { 4265sub wait_for_tick_begin() {
3713 return if tick_inhibit || $Coro::current == $Coro::main; 4266 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3714 4267
3715 my $signal = new Coro::Signal; 4268 my $signal = new Coro::Signal;
3716 push @WAIT_FOR_TICK_BEGIN, $signal; 4269 push @WAIT_FOR_TICK_BEGIN, $signal;
3717 $signal->wait; 4270 $signal->wait;
3718} 4271}
3722 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4275 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3723 unless ++$bug_warning > 10; 4276 unless ++$bug_warning > 10;
3724 return; 4277 return;
3725 } 4278 }
3726 4279
3727 cf::server_tick; # one server iteration 4280 cf::one_tick; # one server iteration
4281
4282 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3728 4283
3729 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4284 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3730 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4285 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3731 Coro::async_pool { 4286 Coro::async_pool {
3732 $Coro::current->{desc} = "runtime saver"; 4287 $Coro::current->{desc} = "runtime saver";
3733 write_runtime_sync 4288 write_runtime_sync
3734 or warn "ERROR: unable to write runtime file: $!"; 4289 or error "ERROR: unable to write runtime file: $!";
3735 }; 4290 };
3736 } 4291 }
3737 4292
3738 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4293 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3739 $sig->send; 4294 $sig->send;
3740 } 4295 }
3741 while (my $sig = shift @WAIT_FOR_TICK) { 4296 $WAIT_FOR_TICK->broadcast;
3742 $sig->send;
3743 }
3744 4297
3745 $LOAD = ($NOW - $TICK_START) / $TICK; 4298 $LOAD = ($NOW - $TICK_START) / $TICK;
3746 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4299 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3747 4300
3748 if (0) { 4301 if (0) {
3749 if ($NEXT_TICK) { 4302 if ($NEXT_TICK) {
3750 my $jitter = $TICK_START - $NEXT_TICK; 4303 my $jitter = $TICK_START - $NEXT_TICK;
3751 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4304 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3752 warn "jitter $JITTER\n";#d# 4305 debug "jitter $JITTER\n";#d#
3753 } 4306 }
3754 } 4307 }
3755} 4308}
3756 4309
3757{ 4310{
3758 # configure BDB 4311 # configure BDB
4312 info "initialising database";
3759 4313
3760 BDB::min_parallel 8; 4314 BDB::min_parallel 16;
3761 BDB::max_poll_reqs $TICK * 0.1; 4315 BDB::max_poll_reqs $TICK * 0.1;
3762 $Coro::BDB::WATCHER->priority (1); 4316 #$AnyEvent::BDB::WATCHER->priority (1);
3763 4317
3764 unless ($DB_ENV) { 4318 unless ($DB_ENV) {
3765 $DB_ENV = BDB::db_env_create; 4319 $DB_ENV = BDB::db_env_create;
3766 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4320 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3767 | BDB::LOG_AUTOREMOVE, 1); 4321 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4322 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3768 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4323 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3769 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4324 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3770 4325
3771 cf::sync_job { 4326 cf::sync_job {
3772 eval { 4327 eval {
3791 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4346 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3792 }; 4347 };
3793 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4348 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3794 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4349 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3795 }; 4350 };
4351
4352 info "database initialised";
3796} 4353}
3797 4354
3798{ 4355{
3799 # configure IO::AIO 4356 # configure IO::AIO
3800 4357
4358 info "initialising aio";
3801 IO::AIO::min_parallel 8; 4359 IO::AIO::min_parallel 8;
3802 IO::AIO::max_poll_time $TICK * 0.1; 4360 IO::AIO::max_poll_time $TICK * 0.1;
3803 $Coro::AIO::WATCHER->priority (1); 4361 undef $AnyEvent::AIO::WATCHER;
4362 info "aio initialised";
3804} 4363}
3805 4364
3806my $_log_backtrace; 4365our $_log_backtrace;
4366our $_log_backtrace_last;
3807 4367
3808sub _log_backtrace { 4368sub _log_backtrace {
3809 my ($msg, @addr) = @_; 4369 my ($msg, @addr) = @_;
3810 4370
3811 $msg =~ s/\n//; 4371 $msg =~ s/\n$//;
3812 4372
4373 if ($_log_backtrace_last eq $msg) {
4374 LOG llevInfo, "[ABT] $msg\n";
4375 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3813 # limit the # of concurrent backtraces 4376 # limit the # of concurrent backtraces
3814 if ($_log_backtrace < 2) { 4377 } elsif ($_log_backtrace < 2) {
4378 $_log_backtrace_last = $msg;
3815 ++$_log_backtrace; 4379 ++$_log_backtrace;
4380 my $perl_bt = Carp::longmess $msg;
3816 async { 4381 async {
3817 $Coro::current->{desc} = "abt $msg"; 4382 $Coro::current->{desc} = "abt $msg";
3818 4383
3819 my @bt = fork_call { 4384 my @bt = fork_call {
3820 @addr = map { sprintf "%x", $_ } @addr; 4385 @addr = map { sprintf "%x", $_ } @addr;
3831 } 4396 }
3832 4397
3833 @funcs 4398 @funcs
3834 }; 4399 };
3835 4400
3836 LOG llevInfo, "[ABT] $msg\n"; 4401 LOG llevInfo, "[ABT] $perl_bt\n";
4402 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3837 LOG llevInfo, "[ABT] $_\n" for @bt; 4403 LOG llevInfo, "[ABT] $_\n" for @bt;
3838 --$_log_backtrace; 4404 --$_log_backtrace;
3839 }; 4405 };
3840 } else { 4406 } else {
3841 LOG llevInfo, "[ABT] $msg\n"; 4407 LOG llevInfo, "[ABT] $msg\n";
3842 LOG llevInfo, "[ABT] [suppressed]\n"; 4408 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3843 } 4409 }
3844} 4410}
3845 4411
3846# load additional modules 4412# load additional modules
3847use cf::pod; 4413require "cf/$_.pm" for @EXTRA_MODULES;
4414cf::_connect_to_perl_2;
3848 4415
3849END { cf::emergency_save } 4416END { cf::emergency_save }
3850 4417
38511 44181
3852 4419

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines