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.323 by root, Sat Jul 28 12:02:58 2007 UTC vs.
Revision 1.561 by root, Fri Apr 22 06:10:33 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines