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.445 by root, Wed Sep 10 18:18:10 2008 UTC vs.
Revision 1.534 by root, Thu Apr 29 08:13:51 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
39use Guard ();
37use Coro (); 40use Coro ();
38use Coro::State; 41use Coro::State;
39use Coro::Handle; 42use Coro::Handle;
40use Coro::EV; 43use Coro::EV;
41use Coro::AnyEvent; 44use Coro::AnyEvent;
42use Coro::Timer; 45use Coro::Timer;
43use Coro::Signal; 46use Coro::Signal;
44use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
45use Coro::AnyEvent; 49use Coro::AnyEvent;
46use Coro::AIO; 50use Coro::AIO;
47use Coro::BDB 1.6; 51use Coro::BDB 1.6;
48use Coro::Storable; 52use Coro::Storable;
49use Coro::Util (); 53use Coro::Util ();
50 54
51use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
52use BDB (); 56use BDB ();
53use Data::Dumper; 57use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 58use Fcntl;
56use YAML (); 59use YAML::XS ();
57use IO::AIO (); 60use IO::AIO ();
58use Time::HiRes; 61use Time::HiRes;
59use Compress::LZF; 62use Compress::LZF;
60use Digest::MD5 (); 63use Digest::MD5 ();
61 64
63 66
64# configure various modules to our taste 67# configure various modules to our taste
65# 68#
66$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
69 77
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
71 80
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73 82
74our %COMMAND = (); 83our %COMMAND = ();
75our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
78our %EXTCMD = (); 87our %EXTCMD = ();
79our %EXTICMD = (); 88our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
82 91
83our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
85 96
86our $CONFDIR = confdir; 97our $CONFDIR = confdir;
87our $DATADIR = datadir; 98our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
95our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
97our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
98our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
99 110
100our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
101 118
102our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
103our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
104our $NEXT_TICK; 121our $NEXT_TICK;
105our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
106 123
107our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
108our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
109our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
110our $DB_ENV; 127our $DB_ENV;
111 128
129our @EXTRA_MODULES = qw(pod match mapscript);
130
112our %CFG; 131our %CFG;
113 132
114our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
115our $RUNTIME; 134our $RUNTIME;
116our $NOW; 135our $NOW;
124 143
125our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
126our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
127our $JITTER; # average jitter 146our $JITTER; # average jitter
128our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
129 153
130binmode STDOUT; 154binmode STDOUT;
131binmode STDERR; 155binmode STDERR;
132 156
133# read virtual server time, if available 157# read virtual server time, if available
135 open my $fh, "<", $RUNTIMEFILE 159 open my $fh, "<", $RUNTIMEFILE
136 or die "unable to read $RUNTIMEFILE file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
137 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
138} 162}
139 163
164eval "sub TICK() { $TICK } 1" or die;
165
140mkdir $_ 166mkdir $_
141 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
142 168
143our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
144 170
145sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
146 187
147############################################################################# 188#############################################################################
148 189
149=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
150 191
197returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one process
198per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
199 240
200=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
201 242
202This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
203C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
204that call. 245that call.
205 246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
206=back 253=back
207 254
208=cut 255=cut
209 256
210BEGIN { 257sub error(@) { LOG llevError, join "", @_ }
211 *CORE::GLOBAL::warn = sub { 258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
262
263$Coro::State::WARNHOOK = sub {
212 my $msg = join "", @_; 264 my $msg = join "", @_;
213 265
214 $msg .= "\n" 266 $msg .= "\n"
215 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
216 268
217 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 269 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
218 270
219 LOG llevError, $msg; 271 LOG llevWarn, $msg;
220 }; 272};
221}
222 273
223$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
224 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
225 276
226 if ($Coro::current == $Coro::main) {#d# 277 error Carp::longmess $_[0];
278
279 if (in_main) {#d#
227 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
228 return;#d# 281 return;#d#
229 }#d# 282 }#d#
230 283
231 # kill coroutine otherwise 284 # kill coroutine otherwise
232 warn Carp::longmess $_[0];
233 Coro::terminate 285 Coro::terminate
234}; 286};
235
236$SIG{__DIE__} = sub { }; #d#?
237 287
238@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 288@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
239@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 289@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
240@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 290@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
241@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 291@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
255)) { 305)) {
256 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
257} 307}
258 308
259$EV::DIED = sub { 309$EV::DIED = sub {
260 warn "error in event callback: @_"; 310 Carp::cluck "error in event callback: @_";
261}; 311};
262 312
263############################################################################# 313#############################################################################
264 314
265=head2 UTILITY FUNCTIONS 315=head2 UTILITY FUNCTIONS
302our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 352our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
303 353
304sub encode_json($) { $json_coder->encode ($_[0]) } 354sub encode_json($) { $json_coder->encode ($_[0]) }
305sub decode_json($) { $json_coder->decode ($_[0]) } 355sub decode_json($) { $json_coder->decode ($_[0]) }
306 356
357=item cf::post_init { BLOCK }
358
359Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again.
361
362The cdoeblock will have a single boolean argument to indicate whether this
363is a reload or not.
364
365=cut
366
367sub post_init(&) {
368 push @POST_INIT, shift;
369}
370
307=item cf::lock_wait $string 371=item cf::lock_wait $string
308 372
309Wait until the given lock is available. See cf::lock_acquire. 373Wait until the given lock is available. See cf::lock_acquire.
310 374
311=item my $lock = cf::lock_acquire $string 375=item my $lock = cf::lock_acquire $string
312 376
313Wait until the given lock is available and then acquires it and returns 377Wait until the given lock is available and then acquires it and returns
314a Coro::guard object. If the guard object gets destroyed (goes out of scope, 378a L<Guard> object. If the guard object gets destroyed (goes out of scope,
315for example when the coroutine gets canceled), the lock is automatically 379for example when the coroutine gets canceled), the lock is automatically
316returned. 380returned.
317 381
318Locks are *not* recursive, locking from the same coro twice results in a 382Locks are *not* recursive, locking from the same coro twice results in a
319deadlocked coro. 383deadlocked coro.
325 389
326Return true if the lock is currently active, i.e. somebody has locked it. 390Return true if the lock is currently active, i.e. somebody has locked it.
327 391
328=cut 392=cut
329 393
330our %LOCK; 394our $LOCKS = new Coro::SemaphoreSet;
331our %LOCKER;#d#
332 395
333sub lock_wait($) { 396sub lock_wait($) {
334 my ($key) = @_; 397 $LOCKS->wait ($_[0]);
335
336 if ($LOCKER{$key} == $Coro::current) {#d#
337 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
338 return;#d#
339 }#d#
340
341 # wait for lock, if any
342 while ($LOCK{$key}) {
343 push @{ $LOCK{$key} }, $Coro::current;
344 Coro::schedule;
345 }
346} 398}
347 399
348sub lock_acquire($) { 400sub lock_acquire($) {
349 my ($key) = @_; 401 $LOCKS->guard ($_[0])
350
351 # wait, to be sure we are not locked
352 lock_wait $key;
353
354 $LOCK{$key} = [];
355 $LOCKER{$key} = $Coro::current;#d#
356
357 Coro::guard {
358 delete $LOCKER{$key};#d#
359 # wake up all waiters, to be on the safe side
360 $_->ready for @{ delete $LOCK{$key} };
361 }
362} 402}
363 403
364sub lock_active($) { 404sub lock_active($) {
365 my ($key) = @_; 405 $LOCKS->count ($_[0]) < 1
366
367 ! ! $LOCK{$key}
368} 406}
369 407
370sub freeze_mainloop { 408sub freeze_mainloop {
371 tick_inhibit_inc; 409 tick_inhibit_inc;
372 410
373 Coro::guard \&tick_inhibit_dec; 411 &Guard::guard (\&tick_inhibit_dec);
374} 412}
375 413
376=item cf::periodic $interval, $cb 414=item cf::periodic $interval, $cb
377 415
378Like EV::periodic, but randomly selects a starting point so that the actions 416Like EV::periodic, but randomly selects a starting point so that the actions
379get spread over timer. 417get spread over time.
380 418
381=cut 419=cut
382 420
383sub periodic($$) { 421sub periodic($$) {
384 my ($interval, $cb) = @_; 422 my ($interval, $cb) = @_;
401 439
402=cut 440=cut
403 441
404our @SLOT_QUEUE; 442our @SLOT_QUEUE;
405our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
406 445
407$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
408$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
409 $Coro::current->desc ("timeslot manager"); 448 $Coro::current->desc ("timeslot manager");
410 449
411 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
412 452
413 while () { 453 while () {
414 next_job: 454 next_job:
455
415 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
416 if ($avail > 0.01) { 457
417 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
418 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
419 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
420 $job->[2]->send; 462 $job->[2]->send;
421 Coro::cede; 463 Coro::cede;
422 goto next_job; 464 goto next_job;
423 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
424 } 467 }
425 } 468 }
426 469
427 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
428 # we do not use wait_for_tick() as it returns immediately when tick is inactive 471 # we do not use wait_for_tick() as it returns immediately when tick is inactive
429 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
430 $signal->wait; 473 $signal->wait;
431 } else { 474 } else {
475 $busy = 0;
432 Coro::schedule; 476 Coro::schedule;
433 } 477 }
434 } 478 }
435}; 479};
436 480
437sub get_slot($;$$) { 481sub get_slot($;$$) {
438 return if tick_inhibit || $Coro::current == $Coro::main; 482 return if tick_inhibit || $Coro::current == $Coro::main;
439 483
440 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
441 485
442 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
443 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
444 489
445 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
446 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
447 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
473=cut 518=cut
474 519
475sub sync_job(&) { 520sub sync_job(&) {
476 my ($job) = @_; 521 my ($job) = @_;
477 522
478 if ($Coro::current == $Coro::main) { 523 if (in_main) {
479 my $time = EV::time; 524 my $time = AE::time;
480 525
481 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
482 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
483 528
484 LOG llevError, Carp::longmess "sync job";#d# 529 #LOG llevError, Carp::longmess "sync job";#d#
485 530
486 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
487 532
488 my $busy = 1; 533 my $busy = 1;
489 my @res; 534 my @res;
490 535
491 (async { 536 (async {
492 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
493 @res = eval { $job->() }; 538 @res = eval { $job->() };
494 warn $@ if $@; 539 error $@ if $@;
495 undef $busy; 540 undef $busy;
496 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
497 542
498 while ($busy) { 543 while ($busy) {
499 if (Coro::nready) { 544 if (Coro::nready) {
501 } else { 546 } else {
502 EV::loop EV::LOOP_ONESHOT; 547 EV::loop EV::LOOP_ONESHOT;
503 } 548 }
504 } 549 }
505 550
506 my $time = EV::time - $time; 551 my $time = AE::time - $time;
507 552
508 $TICK_START += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
509 554
510 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
511 } else { 556 } else {
555 reset_signals; 600 reset_signals;
556 &$cb 601 &$cb
557 }, @args; 602 }, @args;
558 603
559 wantarray ? @res : $res[-1] 604 wantarray ? @res : $res[-1]
605}
606
607sub objinfo {
608 (
609 "counter value" => cf::object::object_count,
610 "objects created" => cf::object::create_count,
611 "objects destroyed" => cf::object::destroy_count,
612 "freelist size" => cf::object::free_count,
613 "allocated objects" => cf::object::objects_size,
614 "active objects" => cf::object::actives_size,
615 )
560} 616}
561 617
562=item $coin = coin_from_name $name 618=item $coin = coin_from_name $name
563 619
564=cut 620=cut
601within each server. 657within each server.
602 658
603=cut 659=cut
604 660
605sub db_table($) { 661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
606 my ($name) = @_; 665 my ($name) = @_;
607 my $db = BDB::db_create $DB_ENV; 666 my $db = BDB::db_create $DB_ENV;
608 667
609 eval { 668 eval {
610 $db->set_flags (BDB::CHKSUM); 669 $db->set_flags (BDB::CHKSUM);
620} 679}
621 680
622our $DB; 681our $DB;
623 682
624sub db_init { 683sub db_init {
625 cf::sync_job {
626 $DB ||= db_table "db"; 684 $DB ||= db_table "db";
627 };
628} 685}
629 686
630sub db_get($$) { 687sub db_get($$) {
631 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
632 689
633 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
634 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
635 694
636 $! ? () 695 $! ? ()
637 : $data 696 : $data
638 }
639} 697}
640 698
641sub db_put($$$) { 699sub db_put($$$) {
642 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
643 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
699 757
700 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
701 my $data = $process->(\@data); 759 my $data = $process->(\@data);
702 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
703 761
704 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
705 763
706 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
707 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
708 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
709 767
719 777
720=cut 778=cut
721 779
722sub datalog($@) { 780sub datalog($@) {
723 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
724 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
725} 783}
726 784
727=back 785=back
728 786
729=cut 787=cut
730 788
731############################################################################# 789#############################################################################
732 790
733=head2 ATTACHABLE OBJECTS 791=head2 ATTACHABLE OBJECTS
734 792
735Many objects in crossfire are so-called attachable objects. That means you can 793Many objects in deliantra are so-called attachable objects. That means you can
736attach callbacks/event handlers (a collection of which is called an "attachment") 794attach callbacks/event handlers (a collection of which is called an "attachment")
737to it. All such attachable objects support the following methods. 795to it. All such attachable objects support the following methods.
738 796
739In the following description, CLASS can be any of C<global>, C<object> 797In the following description, CLASS can be any of C<global>, C<object>
740C<player>, C<client> or C<map> (i.e. the attachable objects in 798C<player>, C<client> or C<map> (i.e. the attachable objects in
790=item cf::CLASS::attachment $name, ... 848=item cf::CLASS::attachment $name, ...
791 849
792Register an attachment by C<$name> through which attachable objects of the 850Register an attachment by C<$name> through which attachable objects of the
793given CLASS can refer to this attachment. 851given CLASS can refer to this attachment.
794 852
795Some classes such as crossfire maps and objects can specify attachments 853Some classes such as deliantra maps and objects can specify attachments
796that are attached at load/instantiate time, thus the need for a name. 854that are attached at load/instantiate time, thus the need for a name.
797 855
798These calls expect any number of the following handler/hook descriptions: 856These calls expect any number of the following handler/hook descriptions:
799 857
800=over 4 858=over 4
924 982
925 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
926 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
927 985
928 } elsif (ref $type) { 986 } elsif (ref $type) {
929 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
930 988
931 } else { 989 } else {
932 shift @arg; 990 shift @arg;
933 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
934 } 992 }
935 } 993 }
936} 994}
937 995
938sub _object_attach { 996sub _object_attach {
948 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
949 } 1007 }
950 1008
951 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
952 } else { 1010 } else {
953 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
954 } 1012 }
955 1013
956 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
957} 1015}
958 1016
1017 1075
1018 for (@$callbacks) { 1076 for (@$callbacks) {
1019 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
1020 1078
1021 if ($@) { 1079 if ($@) {
1022 warn "$@";
1023 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1024 override; 1081 override;
1025 } 1082 }
1026 1083
1027 return 1 if $override; 1084 return 1 if $override;
1028 } 1085 }
1107 for (@$attach) { 1164 for (@$attach) {
1108 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
1109 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
1110 } 1167 }
1111 } else { 1168 } else {
1112 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
1113 } 1170 }
1114 } 1171 }
1115} 1172}
1116 1173
1117cf::attachable->attach ( 1174cf::attachable->attach (
1144 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1145 1202
1146 sync_job { 1203 sync_job {
1147 if (length $$rdata) { 1204 if (length $$rdata) {
1148 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1149 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1150 $decname, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1151 1209
1152 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1153 aio_chmod $fh, SAVE_MODE; 1211 aio_chmod $fh, SAVE_MODE;
1154 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1155 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 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;
1215 aio_fsync $fh;
1216 }
1156 aio_close $fh; 1217 aio_close $fh;
1157 1218
1158 if (@$objs) { 1219 if (@$objs) {
1159 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1220 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1160 aio_chmod $fh, SAVE_MODE; 1221 aio_chmod $fh, SAVE_MODE;
1161 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1222 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1162 aio_write $fh, 0, (length $data), $data, 0; 1223 aio_write $fh, 0, (length $data), $data, 0;
1163 aio_fsync $fh if $cf::USE_FSYNC; 1224 if ($cf::USE_FSYNC) {
1225 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;
1226 aio_fsync $fh;
1227 }
1164 aio_close $fh; 1228 aio_close $fh;
1165 aio_rename "$filename.pst~", "$filename.pst"; 1229 aio_rename "$filename.pst~", "$filename.pst";
1166 } 1230 }
1167 } else { 1231 } else {
1168 aio_unlink "$filename.pst"; 1232 aio_unlink "$filename.pst";
1169 } 1233 }
1170 1234
1171 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1236
1237 $filename =~ s%/[^/]+$%%;
1238 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1239 } else {
1173 warn "FATAL: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1174 } 1241 }
1175 } else { 1242 } else {
1176 aio_unlink $filename; 1243 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1178 } 1245 }
1202 my $st = eval { Coro::Storable::thaw $av }; 1269 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs}; 1270 $av = $st->{objs};
1204 } 1271 }
1205 1272
1206 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1207 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1208 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1209 1277
1210 ($data, $av) 1278 ($data, $av)
1211} 1279}
1212 1280
1213=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
1269 my ($name, $cb) = @_; 1337 my ($name, $cb) = @_;
1270 1338
1271 $EXTICMD{$name} = $cb; 1339 $EXTICMD{$name} = $cb;
1272} 1340}
1273 1341
1342use File::Glob ();
1343
1274cf::player->attach ( 1344cf::player->attach (
1275 on_command => sub { 1345 on_unknown_command => sub {
1276 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
1277 1347
1278 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
1279 or return; 1349 or return;
1280 1350
1303 1373
1304 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1305 if $reply; 1375 if $reply;
1306 1376
1307 } else { 1377 } else {
1308 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1309 } 1379 }
1310 1380
1311 cf::override; 1381 cf::override;
1312 }, 1382 },
1313); 1383);
1314 1384
1385# "readahead" all extensions
1386sub cache_extensions {
1387 my $grp = IO::AIO::aio_group;
1388
1389 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1390 for (grep /\.ext$/, @{$_[0]}) {
1391 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1392 }
1393 };
1394
1395 $grp
1396}
1397
1315sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1316 cf::sync_job { 1401 cf::sync_job {
1317 my %todo; 1402 my %todo;
1318 1403
1319 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1320 next unless -r $path; 1405 next unless -r $path;
1346 . "\n};\n1"; 1431 . "\n};\n1";
1347 1432
1348 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
1349 } 1434 }
1350 1435
1436 my $pass = 0;
1351 my %done; 1437 my %done;
1352 while (%todo) { 1438 while (%todo) {
1353 my $progress; 1439 my $progress;
1354 1440
1441 ++$pass;
1442
1443 ext:
1355 while (my ($k, $v) = each %todo) { 1444 while (my ($k, $v) = each %todo) {
1356 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1357 goto skip 1446 next ext
1358 unless exists $done{$_}; 1447 unless exists $done{$_};
1359 } 1448 }
1360 1449
1361 warn "... loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1362 1451
1363 unless (eval $v->{source}) { 1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1364 my $msg = $@ ? "$v->{path}: $@\n" 1455 error "$v->{path}: $@\n";
1365 : "$v->{base}: extension inactive.\n";
1366 1456
1367 if (exists $v->{meta}{mandatory}) {
1368 warn $msg;
1369 cf::cleanup "mandatory extension failed to load, exiting."; 1457 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1370 } 1458 if exists $v->{meta}{mandatory};
1371 1459
1372 warn $msg; 1460 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1461 delete $todo{$k};
1462 } else {
1463 $done{$k} = delete $todo{$k};
1464 push @EXTS, $v->{pkg};
1465 $progress = 1;
1466
1467 info "$v->{base}: extension inactive.\n"
1468 unless $active;
1373 } 1469 }
1374
1375 $done{$k} = delete $todo{$k};
1376 push @EXTS, $v->{pkg};
1377 $progress = 1;
1378 } 1470 }
1379 1471
1380 skip: 1472 unless ($progress) {
1381 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1473 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1382 unless $progress; 1474
1475 while (my ($k, $v) = each %todo) {
1476 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477 if exists $v->{meta}{mandatory};
1478 }
1479 }
1383 } 1480 }
1384 }; 1481 };
1385} 1482}
1386 1483
1387############################################################################# 1484#############################################################################
1388 1485
1389=back 1486=back
1390 1487
1391=head2 CORE EXTENSIONS 1488=head2 CORE EXTENSIONS
1392 1489
1393Functions and methods that extend core crossfire objects. 1490Functions and methods that extend core deliantra objects.
1394 1491
1395=cut 1492=cut
1396 1493
1397package cf::player; 1494package cf::player;
1398 1495
1441 1538
1442sub exists($) { 1539sub exists($) {
1443 my ($login) = @_; 1540 my ($login) = @_;
1444 1541
1445 $cf::PLAYER{$login} 1542 $cf::PLAYER{$login}
1446 or cf::sync_job { !aio_stat path $login } 1543 or !aio_stat path $login
1447} 1544}
1448 1545
1449sub find($) { 1546sub find($) {
1450 return $cf::PLAYER{$_[0]} || do { 1547 return $cf::PLAYER{$_[0]} || do {
1451 my $login = $_[0]; 1548 my $login = $_[0];
1471 $cf::PLAYER{$login} = $pl 1568 $cf::PLAYER{$login} = $pl
1472 } 1569 }
1473 } 1570 }
1474} 1571}
1475 1572
1573cf::player->attach (
1574 on_load => sub {
1575 my ($pl, $path) = @_;
1576
1577 # restore slots saved in save, below
1578 my $slots = delete $pl->{_slots};
1579
1580 $pl->ob->current_weapon ($slots->[0]);
1581 $pl->combat_ob ($slots->[1]);
1582 $pl->ranged_ob ($slots->[2]);
1583 },
1584);
1585
1476sub save($) { 1586sub save($) {
1477 my ($pl) = @_; 1587 my ($pl) = @_;
1478 1588
1479 return if $pl->{deny_save}; 1589 return if $pl->{deny_save};
1480 1590
1485 1595
1486 aio_mkdir playerdir $pl, 0770; 1596 aio_mkdir playerdir $pl, 0770;
1487 $pl->{last_save} = $cf::RUNTIME; 1597 $pl->{last_save} = $cf::RUNTIME;
1488 1598
1489 cf::get_slot 0.01; 1599 cf::get_slot 0.01;
1600
1601 # save slots, to be restored later
1602 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1490 1603
1491 $pl->save_pl ($path); 1604 $pl->save_pl ($path);
1492 cf::cede_to_tick; 1605 cf::cede_to_tick;
1493} 1606}
1494 1607
1531 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1644 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1532 1645
1533 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1534 $pl->deactivate; 1647 $pl->deactivate;
1535 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1648 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1536 $pl->ob->check_score;
1537 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1649 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1538 $pl->ns->destroy if $pl->ns; 1650 $pl->ns->destroy if $pl->ns;
1539 1651
1540 my $path = playerdir $pl; 1652 my $path = playerdir $pl;
1541 my $temp = "$path~$cf::RUNTIME~deleting~"; 1653 my $temp = "$path~$cf::RUNTIME~deleting~";
1596 \@logins 1708 \@logins
1597} 1709}
1598 1710
1599=item $player->maps 1711=item $player->maps
1600 1712
1713=item cf::player::maps $login
1714
1601Returns an arrayref of map paths that are private for this 1715Returns an arrayref of map paths that are private for this
1602player. May block. 1716player. May block.
1603 1717
1604=cut 1718=cut
1605 1719
1622 } 1736 }
1623 1737
1624 \@paths 1738 \@paths
1625} 1739}
1626 1740
1627=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1741=item $protocol_xml = $player->expand_cfpod ($cfpod)
1628 1742
1629Expand crossfire pod fragments into protocol xml. 1743Expand deliantra pod fragments into protocol xml.
1630 1744
1631=item $player->ext_reply ($msgid, @msg) 1745=item $player->ext_reply ($msgid, @msg)
1632 1746
1633Sends an ext reply to the player. 1747Sends an ext reply to the player.
1634 1748
1666 1780
1667=cut 1781=cut
1668 1782
1669sub find_by_path($) { 1783sub find_by_path($) {
1670 my ($path) = @_; 1784 my ($path) = @_;
1785
1786 $path =~ s/^~[^\/]*//; # skip ~login
1671 1787
1672 my ($match, $specificity); 1788 my ($match, $specificity);
1673 1789
1674 for my $region (list) { 1790 for my $region (list) {
1675 if ($region->{match} && $path =~ $region->{match}) { 1791 if ($region->{match} && $path =~ $region->{match}) {
1707 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1823 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1708 1824
1709 # mit "rum" bekleckern, nicht 1825 # mit "rum" bekleckern, nicht
1710 $self->_create_random_map ( 1826 $self->_create_random_map (
1711 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1712 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1713 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1714 $rmp->{exit_on_final_map}, 1830 $rmp->{exit_on_final_map},
1715 $rmp->{xsize}, $rmp->{ysize}, 1831 $rmp->{xsize}, $rmp->{ysize},
1716 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1717 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1739 1855
1740 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1741} 1857}
1742 1858
1743# also paths starting with '/' 1859# also paths starting with '/'
1744$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1860$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1745 1861
1746sub thawer_merge { 1862sub thawer_merge {
1747 my ($self, $merge) = @_; 1863 my ($self, $merge) = @_;
1748 1864
1749 # we have to keep some variables in memory intact 1865 # we have to keep some variables in memory intact
1847 1963
1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1964 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1849 "$UNIQUEDIR/$path" 1965 "$UNIQUEDIR/$path"
1850} 1966}
1851 1967
1852# and all this just because we cannot iterate over
1853# all maps in C++...
1854sub change_all_map_light {
1855 my ($change) = @_;
1856
1857 $_->change_map_light ($change)
1858 for grep $_->outdoor, values %cf::MAP;
1859}
1860
1861sub decay_objects { 1968sub decay_objects {
1862 my ($self) = @_; 1969 my ($self) = @_;
1863 1970
1864 return if $self->{deny_reset}; 1971 return if $self->{deny_reset};
1865 1972
1947sub find { 2054sub find {
1948 my ($path, $origin) = @_; 2055 my ($path, $origin) = @_;
1949 2056
1950 $path = normalise $path, $origin && $origin->path; 2057 $path = normalise $path, $origin && $origin->path;
1951 2058
1952 cf::lock_wait "map_data:$path";#d#remove 2059 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1953 cf::lock_wait "map_find:$path"; 2060 my $guard2 = cf::lock_acquire "map_find:$path";
1954 2061
1955 $cf::MAP{$path} || do { 2062 $cf::MAP{$path} || do {
1956 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1957 my $guard2 = cf::lock_acquire "map_find:$path";
1958
1959 my $map = new_from_path cf::map $path 2063 my $map = new_from_path cf::map $path
1960 or return; 2064 or return;
1961 2065
1962 $map->{last_save} = $cf::RUNTIME; 2066 $map->{last_save} = $cf::RUNTIME;
1963 2067
1975 2079
1976 $cf::MAP{$path} = $map 2080 $cf::MAP{$path} = $map
1977 } 2081 }
1978} 2082}
1979 2083
1980sub pre_load { } 2084sub pre_load { }
1981sub post_load { } 2085#sub post_load { } # XS
1982 2086
1983sub load { 2087sub load {
1984 my ($self) = @_; 2088 my ($self) = @_;
1985 2089
1986 local $self->{deny_reset} = 1; # loading can take a long time 2090 local $self->{deny_reset} = 1; # loading can take a long time
2031 unless ($self->{deny_activate}) { 2135 unless ($self->{deny_activate}) {
2032 $self->decay_objects; 2136 $self->decay_objects;
2033 $self->fix_auto_apply; 2137 $self->fix_auto_apply;
2034 $self->update_buttons; 2138 $self->update_buttons;
2035 cf::cede_to_tick; 2139 cf::cede_to_tick;
2036 $self->set_darkness_map;
2037 cf::cede_to_tick;
2038 $self->activate; 2140 $self->activate;
2039 } 2141 }
2040 2142
2041 $self->{last_save} = $cf::RUNTIME; 2143 $self->{last_save} = $cf::RUNTIME;
2042 $self->last_access ($cf::RUNTIME); 2144 $self->last_access ($cf::RUNTIME);
2045 } 2147 }
2046 2148
2047 $self->post_load; 2149 $self->post_load;
2048} 2150}
2049 2151
2152# customize the map for a given player, i.e.
2153# return the _real_ map. used by e.g. per-player
2154# maps to change the path to ~playername/mappath
2050sub customise_for { 2155sub customise_for {
2051 my ($self, $ob) = @_; 2156 my ($self, $ob) = @_;
2052 2157
2053 return find "~" . $ob->name . "/" . $self->{path} 2158 return find "~" . $ob->name . "/" . $self->{path}
2054 if $self->per_player; 2159 if $self->per_player;
2070 or next; 2175 or next;
2071 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
2072 or next; 2177 or next;
2073 $neigh->load; 2178 $neigh->load;
2074 2179
2180 # now find the diagonal neighbours
2075 push @neigh, 2181 push @neigh,
2076 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2077 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2078 } 2184 }
2079 2185
2086} 2192}
2087 2193
2088sub find_sync { 2194sub find_sync {
2089 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2090 2196
2091 cf::sync_job { find $path, $origin } 2197 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198 if $Coro::current == $Coro::main;
2199
2200 find $path, $origin
2092} 2201}
2093 2202
2094sub do_load_sync { 2203sub do_load_sync {
2095 my ($map) = @_; 2204 my ($map) = @_;
2096 2205
2097 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2098 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2099 2208
2100 cf::sync_job { $map->load }; 2209 $map->load;
2101} 2210}
2102 2211
2103our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2104our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2105 2214
2131 $MAP_PREFETCHER->prio (6); 2240 $MAP_PREFETCHER->prio (6);
2132 2241
2133 () 2242 ()
2134} 2243}
2135 2244
2245# common code, used by both ->save and ->swapout
2136sub save { 2246sub _save {
2137 my ($self) = @_; 2247 my ($self) = @_;
2138
2139 my $lock = cf::lock_acquire "map_data:$self->{path}";
2140 2248
2141 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2142 2250
2143 return unless $self->dirty; 2251 return unless $self->dirty;
2144 2252
2164 } else { 2272 } else {
2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2273 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2166 } 2274 }
2167} 2275}
2168 2276
2277sub save {
2278 my ($self) = @_;
2279
2280 my $lock = cf::lock_acquire "map_data:$self->{path}";
2281
2282 $self->_save;
2283}
2284
2169sub swap_out { 2285sub swap_out {
2170 my ($self) = @_; 2286 my ($self) = @_;
2171 2287
2172 # save first because save cedes
2173 $self->save;
2174
2175 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2288 my $lock = cf::lock_acquire "map_data:$self->{path}";
2176 2289
2177 return if $self->players;
2178 return if $self->in_memory != cf::MAP_ACTIVE; 2290 return if $self->in_memory != cf::MAP_ACTIVE;
2179 return if $self->{deny_save}; 2291 return if $self->{deny_save};
2292 return if $self->players;
2180 2293
2294 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP;
2181 $self->in_memory (cf::MAP_SWAPPED); 2297 $self->in_memory (cf::MAP_SWAPPED);
2298
2299 # then atomically save
2300 $self->_save;
2301
2302 # then free the map
2303 $self->clear;
2304}
2305
2306sub reset_at {
2307 my ($self) = @_;
2308
2309 # TODO: safety, remove and allow resettable per-player maps
2310 return 1e99 if $self->{deny_reset};
2311
2312 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2313 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2314
2315 $time + $to
2316}
2317
2318sub should_reset {
2319 my ($self) = @_;
2320
2321 $self->reset_at <= $cf::RUNTIME
2322}
2323
2324sub reset {
2325 my ($self) = @_;
2326
2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2328
2329 return if $self->players;
2330
2331 cf::trace "resetting map ", $self->path, "\n";
2332
2333 $self->in_memory (cf::MAP_SWAPPED);
2334
2335 # need to save uniques path
2336 unless ($self->{deny_save}) {
2337 my $uniq = $self->uniq_path; utf8::encode $uniq;
2338
2339 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2340 if $uniq;
2341 }
2342
2343 delete $cf::MAP{$self->path};
2182 2344
2183 $self->deactivate; 2345 $self->deactivate;
2184 $_->clear_links_to ($self) for values %cf::MAP; 2346 $_->clear_links_to ($self) for values %cf::MAP;
2185 $self->clear; 2347 $self->clear;
2186}
2187
2188sub reset_at {
2189 my ($self) = @_;
2190
2191 # TODO: safety, remove and allow resettable per-player maps
2192 return 1e99 if $self->{deny_reset};
2193
2194 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2195 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2196
2197 $time + $to
2198}
2199
2200sub should_reset {
2201 my ($self) = @_;
2202
2203 $self->reset_at <= $cf::RUNTIME
2204}
2205
2206sub reset {
2207 my ($self) = @_;
2208
2209 my $lock = cf::lock_acquire "map_data:$self->{path}";
2210
2211 return if $self->players;
2212
2213 warn "resetting map ", $self->path;
2214
2215 $self->in_memory (cf::MAP_SWAPPED);
2216
2217 # need to save uniques path
2218 unless ($self->{deny_save}) {
2219 my $uniq = $self->uniq_path; utf8::encode $uniq;
2220
2221 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2222 if $uniq;
2223 }
2224
2225 delete $cf::MAP{$self->path};
2226
2227 $self->deactivate;
2228 $_->clear_links_to ($self) for values %cf::MAP;
2229 $self->clear;
2230 2348
2231 $self->unlink_save; 2349 $self->unlink_save;
2232 $self->destroy; 2350 $self->destroy;
2233} 2351}
2234 2352
2242 2360
2243 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
2244 2362
2245 $self->unlink_save; 2363 $self->unlink_save;
2246 2364
2247 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
2248 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
2249 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
2250 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
2251 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2252 2370
2309 : normalise $_ 2427 : normalise $_
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2428 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2429 ]
2312} 2430}
2313 2431
2432=item cf::map::static_maps
2433
2434Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2435file in the shared directory excluding F</styles> and F</editor>). May
2436block.
2437
2438=cut
2439
2440sub static_maps() {
2441 my @dirs = "";
2442 my @maps;
2443
2444 while (@dirs) {
2445 my $dir = shift @dirs;
2446
2447 next if $dir eq "/styles" || $dir eq "/editor";
2448
2449 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2450 or return;
2451
2452 for (@$files) {
2453 s/\.map$// or next;
2454 utf8::decode $_;
2455 push @maps, "$dir/$_";
2456 }
2457
2458 push @dirs, map "$dir/$_", @$dirs;
2459 }
2460
2461 \@maps
2462}
2463
2314=back 2464=back
2315 2465
2316=head3 cf::object 2466=head3 cf::object
2317 2467
2318=cut 2468=cut
2383 2533
2384our $SAY_CHANNEL = { 2534our $SAY_CHANNEL = {
2385 id => "say", 2535 id => "say",
2386 title => "Map", 2536 title => "Map",
2387 reply => "say ", 2537 reply => "say ",
2388 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2538 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2389}; 2539};
2390 2540
2391our $CHAT_CHANNEL = { 2541our $CHAT_CHANNEL = {
2392 id => "chat", 2542 id => "chat",
2393 title => "Chat", 2543 title => "Chat",
2448 2598
2449=item $player_object->enter_link 2599=item $player_object->enter_link
2450 2600
2451Freezes the player and moves him/her to a special map (C<{link}>). 2601Freezes the player and moves him/her to a special map (C<{link}>).
2452 2602
2453The player should be reasonably safe there for short amounts of time. You 2603The player should be reasonably safe there for short amounts of time (e.g.
2454I<MUST> call C<leave_link> as soon as possible, though. 2604for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2605though, as the player cannot control the character while it is on the link
2606map.
2455 2607
2456Will never block. 2608Will never block.
2457 2609
2458=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
2459 2611
2479sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2480 my ($self) = @_; 2632 my ($self) = @_;
2481 2633
2482 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2483 2635
2636 ++$self->{_link_recursion};
2637
2484 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2485 2639
2486 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2487 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2488 2642
2489 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2643 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2490} 2644}
2491 2645
2492sub cf::object::player::leave_link { 2646sub cf::object::player::leave_link {
2493 my ($self, $map, $x, $y) = @_; 2647 my ($self, $map, $x, $y) = @_;
2494 2648
2511 ($x, $y) = (-1, -1) 2665 ($x, $y) = (-1, -1)
2512 unless (defined $x) && (defined $y); 2666 unless (defined $x) && (defined $y);
2513 2667
2514 # use -1 or undef as default coordinates, not 0, 0 2668 # use -1 or undef as default coordinates, not 0, 0
2515 ($x, $y) = ($map->enter_x, $map->enter_y) 2669 ($x, $y) = ($map->enter_x, $map->enter_y)
2516 if $x <=0 && $y <= 0; 2670 if $x <= 0 && $y <= 0;
2517 2671
2518 $map->load; 2672 $map->load;
2519 $map->load_neighbours; 2673 $map->load_neighbours;
2520 2674
2521 return unless $self->contr->active; 2675 return unless $self->contr->active;
2522 $self->activate_recursive;
2523 2676
2524 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2525 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2526} 2679 # entering was successful
2680 delete $self->{_link_recursion};
2681 # only activate afterwards, to support waiting in hooks
2682 $self->activate_recursive;
2683 }
2527 2684
2685}
2686
2528=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2687=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2529 2688
2530Moves the player to the given map-path and coordinates by first freezing 2689Moves the player to the given map-path and coordinates by first freezing
2531her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2532that has to return the map if sucecssful, and then unfreezes the player on 2691that has to return the map if sucecssful, and then unfreezes the player on
2533the new (success) or old (failed) map position. In either case, $done will 2692the new (success) or old (failed) map position. In either case, $done will
2540 2699
2541our $GOTOGEN; 2700our $GOTOGEN;
2542 2701
2543sub cf::object::player::goto { 2702sub cf::object::player::goto {
2544 my ($self, $path, $x, $y, $check, $done) = @_; 2703 my ($self, $path, $x, $y, $check, $done) = @_;
2704
2705 if ($self->{_link_recursion} >= $MAX_LINKS) {
2706 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2707 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2708 ($path, $x, $y) = @$EMERGENCY_POSITION;
2709 }
2545 2710
2546 # do generation counting so two concurrent goto's will be executed in-order 2711 # do generation counting so two concurrent goto's will be executed in-order
2547 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2548 2713
2549 $self->enter_link; 2714 $self->enter_link;
2573 my $map = eval { 2738 my $map = eval {
2574 my $map = defined $path ? cf::map::find $path : undef; 2739 my $map = defined $path ? cf::map::find $path : undef;
2575 2740
2576 if ($map) { 2741 if ($map) {
2577 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2578 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2579 } else { 2744 } else {
2580 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2745 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2581 } 2746 }
2582 2747
2583 $map 2748 $map
2591 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2592 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2593 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2594 } 2759 }
2595 2760
2596 $done->() if $done; 2761 $done->($self) if $done;
2597 })->prio (1); 2762 })->prio (1);
2598} 2763}
2599 2764
2600=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2601 2766
2689 $self->contr->savebed ($map, $x, $y) 2854 $self->contr->savebed ($map, $x, $y)
2690 if $exit->flag (cf::FLAG_DAMNED); 2855 if $exit->flag (cf::FLAG_DAMNED);
2691 2856
2692 1 2857 1
2693 }) { 2858 }) {
2694 $self->message ("Something went wrong deep within the crossfire server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2695 . "I'll try to bring you back to the map you were before. " 2860 . "I'll try to bring you back to the map you were before. "
2696 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2697 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2698 2863
2699 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2700 $self->leave_link; 2865 $self->leave_link;
2701 } 2866 }
2702 })->prio (1); 2867 })->prio (1);
2703} 2868}
2704 2869
2716sub cf::client::send_drawinfo { 2881sub cf::client::send_drawinfo {
2717 my ($self, $text, $flags) = @_; 2882 my ($self, $text, $flags) = @_;
2718 2883
2719 utf8::encode $text; 2884 utf8::encode $text;
2720 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2885 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2886}
2887
2888=item $client->send_big_packet ($pkt)
2889
2890Like C<send_packet>, but tries to compress large packets, and fragments
2891them as required.
2892
2893=cut
2894
2895our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2896
2897sub cf::client::send_big_packet {
2898 my ($self, $pkt) = @_;
2899
2900 # try lzf for large packets
2901 $pkt = "lzf " . Compress::LZF::compress $pkt
2902 if 1024 <= length $pkt and $self->{can_lzf};
2903
2904 # split very large packets
2905 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2906 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2907 $pkt = "frag";
2908 }
2909
2910 $self->send_packet ($pkt);
2721} 2911}
2722 2912
2723=item $client->send_msg ($channel, $msg, $color, [extra...]) 2913=item $client->send_msg ($channel, $msg, $color, [extra...])
2724 2914
2725Send a drawinfo or msg packet to the client, formatting the msg for the 2915Send a drawinfo or msg packet to the client, formatting the msg for the
2729 2919
2730=cut 2920=cut
2731 2921
2732# non-persistent channels (usually the info channel) 2922# non-persistent channels (usually the info channel)
2733our %CHANNEL = ( 2923our %CHANNEL = (
2924 "c/motd" => {
2925 id => "infobox",
2926 title => "MOTD",
2927 reply => undef,
2928 tooltip => "The message of the day",
2929 },
2734 "c/identify" => { 2930 "c/identify" => {
2735 id => "infobox", 2931 id => "infobox",
2736 title => "Identify", 2932 title => "Identify",
2737 reply => undef, 2933 reply => undef,
2738 tooltip => "Items recently identified", 2934 tooltip => "Items recently identified",
2740 "c/examine" => { 2936 "c/examine" => {
2741 id => "infobox", 2937 id => "infobox",
2742 title => "Examine", 2938 title => "Examine",
2743 reply => undef, 2939 reply => undef,
2744 tooltip => "Signs and other items you examined", 2940 tooltip => "Signs and other items you examined",
2941 },
2942 "c/shopinfo" => {
2943 id => "infobox",
2944 title => "Shop Info",
2945 reply => undef,
2946 tooltip => "What your bargaining skill tells you about the shop",
2745 }, 2947 },
2746 "c/book" => { 2948 "c/book" => {
2747 id => "infobox", 2949 id => "infobox",
2748 title => "Book", 2950 title => "Book",
2749 reply => undef, 2951 reply => undef,
2765 id => "infobox", 2967 id => "infobox",
2766 title => "Body Parts", 2968 title => "Body Parts",
2767 reply => undef, 2969 reply => undef,
2768 tooltip => "Shows which body parts you posess and are available", 2970 tooltip => "Shows which body parts you posess and are available",
2769 }, 2971 },
2972 "c/statistics" => {
2973 id => "infobox",
2974 title => "Statistics",
2975 reply => undef,
2976 tooltip => "Shows your primary statistics",
2977 },
2978 "c/skills" => {
2979 id => "infobox",
2980 title => "Skills",
2981 reply => undef,
2982 tooltip => "Shows your experience per skill and item power",
2983 },
2984 "c/shopitems" => {
2985 id => "infobox",
2986 title => "Shop Items",
2987 reply => undef,
2988 tooltip => "Shows the items currently for sale in this shop",
2989 },
2990 "c/resistances" => {
2991 id => "infobox",
2992 title => "Resistances",
2993 reply => undef,
2994 tooltip => "Shows your resistances",
2995 },
2996 "c/pets" => {
2997 id => "infobox",
2998 title => "Pets",
2999 reply => undef,
3000 tooltip => "Shows information abotu your pets/a specific pet",
3001 },
3002 "c/perceiveself" => {
3003 id => "infobox",
3004 title => "Perceive Self",
3005 reply => undef,
3006 tooltip => "You gained detailed knowledge about yourself",
3007 },
2770 "c/uptime" => { 3008 "c/uptime" => {
2771 id => "infobox", 3009 id => "infobox",
2772 title => "Uptime", 3010 title => "Uptime",
2773 reply => undef, 3011 reply => undef,
2774 tooltip => "How long the server has been running since last restart", 3012 tooltip => "How long the server has been running since last restart",
2783 id => "party", 3021 id => "party",
2784 title => "Party", 3022 title => "Party",
2785 reply => "gsay ", 3023 reply => "gsay ",
2786 tooltip => "Messages and chat related to your party", 3024 tooltip => "Messages and chat related to your party",
2787 }, 3025 },
3026 "c/death" => {
3027 id => "death",
3028 title => "Death",
3029 reply => undef,
3030 tooltip => "Reason for and more info about your most recent death",
3031 },
3032 "c/say" => $SAY_CHANNEL,
3033 "c/chat" => $CHAT_CHANNEL,
2788); 3034);
2789 3035
2790sub cf::client::send_msg { 3036sub cf::client::send_msg {
2791 my ($self, $channel, $msg, $color, @extra) = @_; 3037 my ($self, $channel, $msg, $color, @extra) = @_;
2792 3038
2793 $msg = $self->pl->expand_cfpod ($msg); 3039 $msg = $self->pl->expand_cfpod ($msg)
3040 unless $color & cf::NDI_VERBATIM;
2794 3041
2795 $color &= cf::NDI_CLIENT_MASK; # just in case... 3042 $color &= cf::NDI_CLIENT_MASK; # just in case...
2796 3043
2797 # check predefined channels, for the benefit of C 3044 # check predefined channels, for the benefit of C
2798 if ($CHANNEL{$channel}) { 3045 if ($CHANNEL{$channel}) {
2799 $channel = $CHANNEL{$channel}; 3046 $channel = $CHANNEL{$channel};
2800 3047
2801 $self->ext_msg (channel_info => $channel) 3048 $self->ext_msg (channel_info => $channel);
2802 if $self->can_msg;
2803
2804 $channel = $channel->{id}; 3049 $channel = $channel->{id};
2805 3050
2806 } elsif (ref $channel) { 3051 } elsif (ref $channel) {
2807 # send meta info to client, if not yet sent 3052 # send meta info to client, if not yet sent
2808 unless (exists $self->{channel}{$channel->{id}}) { 3053 unless (exists $self->{channel}{$channel->{id}}) {
2809 $self->{channel}{$channel->{id}} = $channel; 3054 $self->{channel}{$channel->{id}} = $channel;
2810 $self->ext_msg (channel_info => $channel) 3055 $self->ext_msg (channel_info => $channel);
2811 if $self->can_msg;
2812 } 3056 }
2813 3057
2814 $channel = $channel->{id}; 3058 $channel = $channel->{id};
2815 } 3059 }
2816 3060
2817 return unless @extra || length $msg; 3061 return unless @extra || length $msg;
2818 3062
2819 if ($self->can_msg) {
2820 # default colour, mask it out 3063 # default colour, mask it out
2821 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3064 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2822 if $color & cf::NDI_DEF; 3065 if $color & cf::NDI_DEF;
2823 3066
2824 my $pkt = "msg " 3067 my $pkt = "msg "
2825 . $self->{json_coder}->encode ( 3068 . $self->{json_coder}->encode (
2826 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3069 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2827 ); 3070 );
2828 3071
2829 # try lzf for large packets
2830 $pkt = "lzf " . Compress::LZF::compress $pkt
2831 if 1024 <= length $pkt and $self->{can_lzf};
2832
2833 # split very large packets
2834 if (8192 < length $pkt and $self->{can_lzf}) {
2835 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2836 $pkt = "frag";
2837 }
2838
2839 $self->send_packet ($pkt); 3072 $self->send_big_packet ($pkt);
2840 } else {
2841 if ($color >= 0) {
2842 # replace some tags by gcfclient-compatible ones
2843 for ($msg) {
2844 1 while
2845 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2846 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2847 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2848 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2849 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2850 }
2851
2852 $color &= cf::NDI_COLOR_MASK;
2853
2854 utf8::encode $msg;
2855
2856 if (0 && $msg =~ /\[/) {
2857 # COMMAND/INFO
2858 $self->send_packet ("drawextinfo $color 10 8 $msg")
2859 } else {
2860 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2861 $self->send_packet ("drawinfo $color $msg")
2862 }
2863 }
2864 }
2865} 3073}
2866 3074
2867=item $client->ext_msg ($type, @msg) 3075=item $client->ext_msg ($type, @msg)
2868 3076
2869Sends an ext event to the client. 3077Sends an ext event to the client.
2872 3080
2873sub cf::client::ext_msg($$@) { 3081sub cf::client::ext_msg($$@) {
2874 my ($self, $type, @msg) = @_; 3082 my ($self, $type, @msg) = @_;
2875 3083
2876 if ($self->extcmd == 2) { 3084 if ($self->extcmd == 2) {
2877 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3085 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2878 } elsif ($self->extcmd == 1) { # TODO: remove 3086 } elsif ($self->extcmd == 1) { # TODO: remove
2879 push @msg, msgtype => "event_$type"; 3087 push @msg, msgtype => "event_$type";
2880 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3088 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2881 } 3089 }
2882} 3090}
2883 3091
2884=item $client->ext_reply ($msgid, @msg) 3092=item $client->ext_reply ($msgid, @msg)
2885 3093
2889 3097
2890sub cf::client::ext_reply($$@) { 3098sub cf::client::ext_reply($$@) {
2891 my ($self, $id, @msg) = @_; 3099 my ($self, $id, @msg) = @_;
2892 3100
2893 if ($self->extcmd == 2) { 3101 if ($self->extcmd == 2) {
2894 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3102 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2895 } elsif ($self->extcmd == 1) { 3103 } elsif ($self->extcmd == 1) {
2896 #TODO: version 1, remove 3104 #TODO: version 1, remove
2897 unshift @msg, msgtype => "reply", msgid => $id; 3105 unshift @msg, msgtype => "reply", msgid => $id;
2898 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3106 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2899 } 3107 }
2900} 3108}
2901 3109
2902=item $success = $client->query ($flags, "text", \&cb) 3110=item $success = $client->query ($flags, "text", \&cb)
2903 3111
2974 3182
2975 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
2976 if $reply; 3184 if $reply;
2977 3185
2978 } else { 3186 } else {
2979 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3187 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2980 } 3188 }
2981 3189
2982 cf::override; 3190 cf::override;
2983 }, 3191 },
2984); 3192);
3004 3212
3005 $coro 3213 $coro
3006} 3214}
3007 3215
3008cf::client->attach ( 3216cf::client->attach (
3009 on_destroy => sub { 3217 on_client_destroy => sub {
3010 my ($ns) = @_; 3218 my ($ns) = @_;
3011 3219
3012 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3220 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3013 }, 3221 },
3014); 3222);
3030our $safe_hole = new Safe::Hole; 3238our $safe_hole = new Safe::Hole;
3031 3239
3032$SIG{FPE} = 'IGNORE'; 3240$SIG{FPE} = 'IGNORE';
3033 3241
3034$safe->permit_only (Opcode::opset qw( 3242$safe->permit_only (Opcode::opset qw(
3035 :base_core :base_mem :base_orig :base_math 3243 :base_core :base_mem :base_orig :base_math :base_loop
3036 grepstart grepwhile mapstart mapwhile 3244 grepstart grepwhile mapstart mapwhile
3037 sort time 3245 sort time
3038)); 3246));
3039 3247
3040# here we export the classes and methods available to script code 3248# here we export the classes and methods available to script code
3044The following functions and methods are available within a safe environment: 3252The following functions and methods are available within a safe environment:
3045 3253
3046 cf::object 3254 cf::object
3047 contr pay_amount pay_player map x y force_find force_add destroy 3255 contr pay_amount pay_player map x y force_find force_add destroy
3048 insert remove name archname title slaying race decrease split 3256 insert remove name archname title slaying race decrease split
3257 value
3049 3258
3050 cf::object::player 3259 cf::object::player
3051 player 3260 player
3052 3261
3053 cf::player 3262 cf::player
3059=cut 3268=cut
3060 3269
3061for ( 3270for (
3062 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3271 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3063 insert remove inv nrof name archname title slaying race 3272 insert remove inv nrof name archname title slaying race
3064 decrease split destroy change_exp)], 3273 decrease split destroy change_exp value msg lore send_msg)],
3065 ["cf::object::player" => qw(player)], 3274 ["cf::object::player" => qw(player)],
3066 ["cf::player" => qw(peaceful)], 3275 ["cf::player" => qw(peaceful send_msg)],
3067 ["cf::map" => qw(trigger)], 3276 ["cf::map" => qw(trigger)],
3068) { 3277) {
3069 no strict 'refs'; 3278 no strict 'refs';
3070 my ($pkg, @funs) = @$_; 3279 my ($pkg, @funs) = @$_;
3071 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3280 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3089 3298
3090 my $qcode = $code; 3299 my $qcode = $code;
3091 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3300 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3092 $qcode =~ s/\n/\\n/g; 3301 $qcode =~ s/\n/\\n/g;
3093 3302
3303 %vars = (_dummy => 0) unless %vars;
3304
3305 my @res;
3094 local $_; 3306 local $_;
3095 local @safe::cf::_safe_eval_args = values %vars;
3096 3307
3097 my $eval = 3308 my $eval =
3098 "do {\n" 3309 "do {\n"
3099 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3310 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3100 . "#line 0 \"{$qcode}\"\n" 3311 . "#line 0 \"{$qcode}\"\n"
3101 . $code 3312 . $code
3102 . "\n}" 3313 . "\n}"
3103 ; 3314 ;
3104 3315
3316 if ($CFG{safe_eval}) {
3105 sub_generation_inc; 3317 sub_generation_inc;
3318 local @safe::cf::_safe_eval_args = values %vars;
3106 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3319 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3107 sub_generation_inc; 3320 sub_generation_inc;
3321 } else {
3322 local @cf::_safe_eval_args = values %vars;
3323 @res = wantarray ? eval eval : scalar eval $eval;
3324 }
3108 3325
3109 if ($@) { 3326 if ($@) {
3110 warn "$@"; 3327 warn "$@",
3111 warn "while executing safe code '$code'\n"; 3328 "while executing safe code '$code'\n",
3112 warn "with arguments " . (join " ", %vars) . "\n"; 3329 "with arguments " . (join " ", %vars) . "\n";
3113 } 3330 }
3114 3331
3115 wantarray ? @res : $res[0] 3332 wantarray ? @res : $res[0]
3116} 3333}
3117 3334
3131=cut 3348=cut
3132 3349
3133sub register_script_function { 3350sub register_script_function {
3134 my ($fun, $cb) = @_; 3351 my ($fun, $cb) = @_;
3135 3352
3136 no strict 'refs'; 3353 $fun = "safe::$fun" if $CFG{safe_eval};
3137 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3354 *$fun = $safe_hole->wrap ($cb);
3138} 3355}
3139 3356
3140=back 3357=back
3141 3358
3142=cut 3359=cut
3151 # for this (global event?) 3368 # for this (global event?)
3152 %ext::player_env::MUSIC_FACE_CACHE = (); 3369 %ext::player_env::MUSIC_FACE_CACHE = ();
3153 3370
3154 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3371 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3155 3372
3156 warn "loading facedata from $path\n"; 3373 trace "loading facedata from $path\n";
3157 3374
3158 my $facedata; 3375 my $facedata;
3159 0 < aio_load $path, $facedata 3376 0 < aio_load $path, $facedata
3160 or die "$path: $!"; 3377 or die "$path: $!";
3161 3378
3163 3380
3164 $facedata->{version} == 2 3381 $facedata->{version} == 2
3165 or cf::cleanup "$path: version mismatch, cannot proceed."; 3382 or cf::cleanup "$path: version mismatch, cannot proceed.";
3166 3383
3167 # patch in the exptable 3384 # patch in the exptable
3385 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3168 $facedata->{resource}{"res/exp_table"} = { 3386 $facedata->{resource}{"res/exp_table"} = {
3169 type => FT_RSRC, 3387 type => FT_RSRC,
3170 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3388 data => $exp_table,
3389 hash => (Digest::MD5::md5 $exp_table),
3171 }; 3390 };
3172 cf::cede_to_tick; 3391 cf::cede_to_tick;
3173 3392
3174 { 3393 {
3175 my $faces = $facedata->{faceinfo}; 3394 my $faces = $facedata->{faceinfo};
3177 while (my ($face, $info) = each %$faces) { 3396 while (my ($face, $info) = each %$faces) {
3178 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3397 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3179 3398
3180 cf::face::set_visibility $idx, $info->{visibility}; 3399 cf::face::set_visibility $idx, $info->{visibility};
3181 cf::face::set_magicmap $idx, $info->{magicmap}; 3400 cf::face::set_magicmap $idx, $info->{magicmap};
3182 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3401 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3183 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3402 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3184 3403
3185 cf::cede_to_tick; 3404 cf::cede_to_tick;
3186 } 3405 }
3187 3406
3188 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
3193 3412
3194 if (my $smooth = cf::face::find $info->{smooth}) { 3413 if (my $smooth = cf::face::find $info->{smooth}) {
3195 cf::face::set_smooth $idx, $smooth; 3414 cf::face::set_smooth $idx, $smooth;
3196 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3415 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3197 } else { 3416 } else {
3198 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3417 error "smooth face '$info->{smooth}' not found for face '$face'";
3199 } 3418 }
3200 3419
3201 cf::cede_to_tick; 3420 cf::cede_to_tick;
3202 } 3421 }
3203 } 3422 }
3212 3431
3213 cf::anim::invalidate_all; # d'oh 3432 cf::anim::invalidate_all; # d'oh
3214 } 3433 }
3215 3434
3216 { 3435 {
3217 # TODO: for gcfclient pleasure, we should give resources
3218 # that gcfclient doesn't grok a >10000 face index.
3219 my $res = $facedata->{resource}; 3436 my $res = $facedata->{resource};
3220 3437
3221 while (my ($name, $info) = each %$res) { 3438 while (my ($name, $info) = each %$res) {
3222 if (defined $info->{type}) { 3439 if (defined $info->{type}) {
3223 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3440 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3224 my $data;
3225 3441
3226 if ($info->{type} & 1) { 3442 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3227 # prepend meta info
3228
3229 my $meta = $enc->encode ({
3230 name => $name,
3231 %{ $info->{meta} || {} },
3232 });
3233
3234 $data = pack "(w/a*)*", $meta, $info->{data};
3235 } else {
3236 $data = $info->{data};
3237 }
3238
3239 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3240 cf::face::set_type $idx, $info->{type}; 3443 cf::face::set_type $idx, $info->{type};
3241 } else { 3444 } else {
3242 $RESOURCE{$name} = $info; 3445 $RESOURCE{$name} = $info; # unused
3243 } 3446 }
3244 3447
3245 cf::cede_to_tick; 3448 cf::cede_to_tick;
3246 } 3449 }
3247 } 3450 }
3248 3451
3249 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3452 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3250 3453
3251 1 3454 1
3252} 3455}
3253
3254cf::global->attach (on_resource_update => sub {
3255 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3256 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3257
3258 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3259 my $sound = $soundconf->{compat}[$_]
3260 or next;
3261
3262 my $face = cf::face::find "sound/$sound->[1]";
3263 cf::sound::set $sound->[0] => $face;
3264 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3265 }
3266
3267 while (my ($k, $v) = each %{$soundconf->{event}}) {
3268 my $face = cf::face::find "sound/$v";
3269 cf::sound::set $k => $face;
3270 }
3271 }
3272});
3273 3456
3274register_exticmd fx_want => sub { 3457register_exticmd fx_want => sub {
3275 my ($ns, $want) = @_; 3458 my ($ns, $want) = @_;
3276 3459
3277 while (my ($k, $v) = each %$want) { 3460 while (my ($k, $v) = each %$want) {
3316sub reload_treasures { 3499sub reload_treasures {
3317 load_resource_file "$DATADIR/treasures" 3500 load_resource_file "$DATADIR/treasures"
3318 or die "unable to load treasurelists\n"; 3501 or die "unable to load treasurelists\n";
3319} 3502}
3320 3503
3504sub reload_sound {
3505 trace "loading sound config from $DATADIR/sound\n";
3506
3507 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3508 or die "$DATADIR/sound $!";
3509
3510 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3511
3512 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3513 my $sound = $soundconf->{compat}[$_]
3514 or next;
3515
3516 my $face = cf::face::find "sound/$sound->[1]";
3517 cf::sound::set $sound->[0] => $face;
3518 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3519 }
3520
3521 while (my ($k, $v) = each %{$soundconf->{event}}) {
3522 my $face = cf::face::find "sound/$v";
3523 cf::sound::set $k => $face;
3524 }
3525}
3526
3321sub reload_resources { 3527sub reload_resources {
3322 warn "reloading resource files...\n"; 3528 trace "reloading resource files...\n";
3323 3529
3324 reload_facedata; 3530 reload_facedata;
3531 reload_sound;
3325 reload_archetypes; 3532 reload_archetypes;
3326 reload_regions; 3533 reload_regions;
3327 reload_treasures; 3534 reload_treasures;
3328 3535
3329 warn "finished reloading resource files\n"; 3536 trace "finished reloading resource files\n";
3330}
3331
3332sub init {
3333 my $guard = freeze_mainloop;
3334
3335 evthread_start IO::AIO::poll_fileno;
3336
3337 reload_resources;
3338} 3537}
3339 3538
3340sub reload_config { 3539sub reload_config {
3540 trace "reloading config file...\n";
3541
3341 open my $fh, "<:utf8", "$CONFDIR/config" 3542 open my $fh, "<:utf8", "$CONFDIR/config"
3342 or return; 3543 or return;
3343 3544
3344 local $/; 3545 local $/;
3345 *CFG = YAML::Load <$fh>; 3546 *CFG = YAML::XS::Load scalar <$fh>;
3346 3547
3347 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3548 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3348 3549
3349 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3550 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3350 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3551 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3351 3552
3352 if (exists $CFG{mlockall}) { 3553 if (exists $CFG{mlockall}) {
3354 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3555 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3355 and die "WARNING: m(un)lockall failed: $!\n"; 3556 and die "WARNING: m(un)lockall failed: $!\n";
3356 }; 3557 };
3357 warn $@ if $@; 3558 warn $@ if $@;
3358 } 3559 }
3560
3561 trace "finished reloading resource files\n";
3359} 3562}
3360 3563
3361sub pidfile() { 3564sub pidfile() {
3362 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3565 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3363 or die "$PIDFILE: $!"; 3566 or die "$PIDFILE: $!";
3375 3578
3376 seek $fh, 0, 0; 3579 seek $fh, 0, 0;
3377 print $fh $$; 3580 print $fh $$;
3378} 3581}
3379 3582
3583sub main_loop {
3584 trace "EV::loop starting\n";
3585 if (1) {
3586 EV::loop;
3587 }
3588 trace "EV::loop returned\n";
3589 goto &main_loop unless $REALLY_UNLOOP;
3590}
3591
3380sub main { 3592sub main {
3381 atomic; 3593 cf::init_globals; # initialise logging
3594
3595 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3596 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3597 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3598 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3599
3600 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3382 3601
3383 # we must not ever block the main coroutine 3602 # we must not ever block the main coroutine
3384 local $Coro::idle = sub { 3603 local $Coro::idle = sub {
3385 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3604 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3386 (async { 3605 (async {
3387 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3606 $Coro::current->{desc} = "IDLE BUG HANDLER";
3388 EV::loop EV::LOOP_ONESHOT; 3607 EV::loop EV::LOOP_ONESHOT;
3389 })->prio (Coro::PRIO_MAX); 3608 })->prio (Coro::PRIO_MAX);
3390 }; 3609 };
3391 3610
3392 { 3611 evthread_start IO::AIO::poll_fileno;
3393 my $guard = freeze_mainloop; 3612
3613 cf::sync_job {
3614 cf::init_experience;
3615 cf::init_anim;
3616 cf::init_attackmess;
3617 cf::init_dynamic;
3618
3619 cf::load_settings;
3620 cf::load_materials;
3621
3622 reload_resources;
3394 reload_config; 3623 reload_config;
3395 db_init; 3624 db_init;
3625
3626 cf::init_uuid;
3627 cf::init_signals;
3628 cf::init_skills;
3629
3630 cf::init_beforeplay;
3631
3632 atomic;
3633
3396 load_extensions; 3634 load_extensions;
3397 3635
3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399 }
3400
3401 utime time, time, $RUNTIMEFILE; 3636 utime time, time, $RUNTIMEFILE;
3402 3637
3403 # no (long-running) fork's whatsoever before this point(!) 3638 # no (long-running) fork's whatsoever before this point(!)
3639 use POSIX ();
3404 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3640 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3405 3641
3406 EV::loop; 3642 (pop @POST_INIT)->(0) while @POST_INIT;
3643 };
3644
3645 cf::object::thawer::errors_are_fatal 0;
3646 info "parse errors in files are no longer fatal from this point on.\n";
3647
3648 main_loop;
3407} 3649}
3408 3650
3409############################################################################# 3651#############################################################################
3410# initialisation and cleanup 3652# initialisation and cleanup
3411 3653
3412# install some emergency cleanup handlers 3654# install some emergency cleanup handlers
3413BEGIN { 3655BEGIN {
3414 our %SIGWATCHER = (); 3656 our %SIGWATCHER = ();
3415 for my $signal (qw(INT HUP TERM)) { 3657 for my $signal (qw(INT HUP TERM)) {
3416 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3658 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3417 cf::cleanup "SIG$signal"; 3659 cf::cleanup "SIG$signal";
3418 }; 3660 };
3419 } 3661 }
3420} 3662}
3421 3663
3422sub write_runtime_sync { 3664sub write_runtime_sync {
3665 my $t0 = AE::time;
3666
3423 # first touch the runtime file to show we are still running: 3667 # first touch the runtime file to show we are still running:
3424 # the fsync below can take a very very long time. 3668 # the fsync below can take a very very long time.
3425 3669
3426 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3670 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3427 3671
3428 my $guard = cf::lock_acquire "write_runtime"; 3672 my $guard = cf::lock_acquire "write_runtime";
3429 3673
3430 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3674 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3431 or return; 3675 or return;
3432 3676
3433 my $value = $cf::RUNTIME + 90 + 10; 3677 my $value = $cf::RUNTIME + 90 + 10;
3434 # 10 is the runtime save interval, for a monotonic clock 3678 # 10 is the runtime save interval, for a monotonic clock
3435 # 60 allows for the watchdog to kill the server. 3679 # 60 allows for the watchdog to kill the server.
3448 or return; 3692 or return;
3449 3693
3450 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3694 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3451 and return; 3695 and return;
3452 3696
3453 warn "runtime file written.\n"; 3697 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3454 3698
3455 1 3699 1
3456} 3700}
3457 3701
3458our $uuid_lock; 3702our $uuid_lock;
3467 my $uuid = "$LOCALDIR/uuid"; 3711 my $uuid = "$LOCALDIR/uuid";
3468 3712
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3713 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return; 3714 or return;
3471 3715
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3716 my $value = uuid_seq uuid_cur;
3717
3718 unless ($value) {
3719 info "cowardly refusing to write zero uuid value!\n";
3720 return;
3721 }
3722
3723 my $value = uuid_str $value + $uuid_skip;
3473 $uuid_skip = 0; 3724 $uuid_skip = 0;
3474 3725
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3726 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return; 3727 and return;
3477 3728
3483 or return; 3734 or return;
3484 3735
3485 aio_rename "$uuid~", $uuid 3736 aio_rename "$uuid~", $uuid
3486 and return; 3737 and return;
3487 3738
3488 warn "uuid file written ($value).\n"; 3739 trace "uuid file written ($value).\n";
3489 3740
3490 1 3741 1
3491 3742
3492} 3743}
3493 3744
3499} 3750}
3500 3751
3501sub emergency_save() { 3752sub emergency_save() {
3502 my $freeze_guard = cf::freeze_mainloop; 3753 my $freeze_guard = cf::freeze_mainloop;
3503 3754
3504 warn "enter emergency perl save\n"; 3755 info "emergency_perl_save: enter\n";
3756
3757 # this is a trade-off: we want to be very quick here, so
3758 # save all maps without fsync, and later call a global sync
3759 # (which in turn might be very very slow)
3760 local $USE_FSYNC = 0;
3505 3761
3506 cf::sync_job { 3762 cf::sync_job {
3507 # use a peculiar iteration method to avoid tripping on perl 3763 # use a peculiar iteration method to avoid tripping on perl
3508 # refcount bugs in for. also avoids problems with players 3764 # refcount bugs in for. also avoids problems with players
3509 # and maps saved/destroyed asynchronously. 3765 # and maps saved/destroyed asynchronously.
3510 warn "begin emergency player save\n"; 3766 info "emergency_perl_save: begin player save\n";
3511 for my $login (keys %cf::PLAYER) { 3767 for my $login (keys %cf::PLAYER) {
3512 my $pl = $cf::PLAYER{$login} or next; 3768 my $pl = $cf::PLAYER{$login} or next;
3513 $pl->valid or next; 3769 $pl->valid or next;
3514 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3770 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3515 $pl->save; 3771 $pl->save;
3516 } 3772 }
3517 warn "end emergency player save\n"; 3773 info "emergency_perl_save: end player save\n";
3518 3774
3519 warn "begin emergency map save\n"; 3775 info "emergency_perl_save: begin map save\n";
3520 for my $path (keys %cf::MAP) { 3776 for my $path (keys %cf::MAP) {
3521 my $map = $cf::MAP{$path} or next; 3777 my $map = $cf::MAP{$path} or next;
3522 $map->valid or next; 3778 $map->valid or next;
3523 $map->save; 3779 $map->save;
3524 } 3780 }
3525 warn "end emergency map save\n"; 3781 info "emergency_perl_save: end map save\n";
3526 3782
3527 warn "begin emergency database checkpoint\n"; 3783 info "emergency_perl_save: begin database checkpoint\n";
3528 BDB::db_env_txn_checkpoint $DB_ENV; 3784 BDB::db_env_txn_checkpoint $DB_ENV;
3529 warn "end emergency database checkpoint\n"; 3785 info "emergency_perl_save: end database checkpoint\n";
3530 3786
3531 warn "begin write uuid\n"; 3787 info "emergency_perl_save: begin write uuid\n";
3532 write_uuid_sync 1; 3788 write_uuid_sync 1;
3533 warn "end write uuid\n"; 3789 info "emergency_perl_save: end write uuid\n";
3534 }; 3790 };
3535 3791
3536 warn "leave emergency perl save\n"; 3792 info "emergency_perl_save: starting sync()\n";
3793 IO::AIO::aio_sync sub {
3794 info "emergency_perl_save: finished sync()\n";
3795 };
3796
3797 info "emergency_perl_save: leave\n";
3537} 3798}
3538 3799
3539sub post_cleanup { 3800sub post_cleanup {
3540 my ($make_core) = @_; 3801 my ($make_core) = @_;
3541 3802
3542 warn Carp::longmess "post_cleanup backtrace" 3803 error Carp::longmess "post_cleanup backtrace"
3543 if $make_core; 3804 if $make_core;
3544 3805
3545 my $fh = pidfile; 3806 my $fh = pidfile;
3546 unlink $PIDFILE if <$fh> == $$; 3807 unlink $PIDFILE if <$fh> == $$;
3547} 3808}
3567 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3828 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3568 for my $name (keys %$leaf_symtab) { 3829 for my $name (keys %$leaf_symtab) {
3569 _gv_clear *{"$pkg$name"}; 3830 _gv_clear *{"$pkg$name"};
3570# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3831# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3571 } 3832 }
3572 warn "cleared package #$pkg\n";#d#
3573} 3833}
3574
3575our $RELOAD; # how many times to reload
3576 3834
3577sub do_reload_perl() { 3835sub do_reload_perl() {
3578 # can/must only be called in main 3836 # can/must only be called in main
3579 if ($Coro::current != $Coro::main) { 3837 if (in_main) {
3580 warn "can only reload from main coroutine"; 3838 error "can only reload from main coroutine";
3581 return; 3839 return;
3582 } 3840 }
3583 3841
3584 return if $RELOAD++; 3842 return if $RELOAD++;
3585 3843
3844 my $t1 = AE::time;
3845
3586 while ($RELOAD) { 3846 while ($RELOAD) {
3587 warn "reloading..."; 3847 info "reloading...";
3588 3848
3589 warn "entering sync_job"; 3849 trace "entering sync_job";
3590 3850
3591 cf::sync_job { 3851 cf::sync_job {
3592 cf::write_runtime_sync; # external watchdog should not bark 3852 cf::write_runtime_sync; # external watchdog should not bark
3593 cf::emergency_save; 3853 cf::emergency_save;
3594 cf::write_runtime_sync; # external watchdog should not bark 3854 cf::write_runtime_sync; # external watchdog should not bark
3595 3855
3596 warn "syncing database to disk"; 3856 trace "syncing database to disk";
3597 BDB::db_env_txn_checkpoint $DB_ENV; 3857 BDB::db_env_txn_checkpoint $DB_ENV;
3598 3858
3599 # if anything goes wrong in here, we should simply crash as we already saved 3859 # if anything goes wrong in here, we should simply crash as we already saved
3600 3860
3601 warn "flushing outstanding aio requests"; 3861 trace "flushing outstanding aio requests";
3602 while (IO::AIO::nreqs || BDB::nreqs) { 3862 while (IO::AIO::nreqs || BDB::nreqs) {
3603 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3863 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3604 } 3864 }
3605 3865
3606 warn "cancelling all extension coros"; 3866 trace "cancelling all extension coros";
3607 $_->cancel for values %EXT_CORO; 3867 $_->cancel for values %EXT_CORO;
3608 %EXT_CORO = (); 3868 %EXT_CORO = ();
3609 3869
3610 warn "removing commands"; 3870 trace "removing commands";
3611 %COMMAND = (); 3871 %COMMAND = ();
3612 3872
3613 warn "removing ext/exti commands"; 3873 trace "removing ext/exti commands";
3614 %EXTCMD = (); 3874 %EXTCMD = ();
3615 %EXTICMD = (); 3875 %EXTICMD = ();
3616 3876
3617 warn "unloading/nuking all extensions"; 3877 trace "unloading/nuking all extensions";
3618 for my $pkg (@EXTS) { 3878 for my $pkg (@EXTS) {
3619 warn "... unloading $pkg"; 3879 trace "... unloading $pkg";
3620 3880
3621 if (my $cb = $pkg->can ("unload")) { 3881 if (my $cb = $pkg->can ("unload")) {
3622 eval { 3882 eval {
3623 $cb->($pkg); 3883 $cb->($pkg);
3624 1 3884 1
3625 } or warn "$pkg unloaded, but with errors: $@"; 3885 } or error "$pkg unloaded, but with errors: $@";
3626 } 3886 }
3627 3887
3628 warn "... clearing $pkg"; 3888 trace "... clearing $pkg";
3629 clear_package $pkg; 3889 clear_package $pkg;
3630 } 3890 }
3631 3891
3632 warn "unloading all perl modules loaded from $LIBDIR"; 3892 trace "unloading all perl modules loaded from $LIBDIR";
3633 while (my ($k, $v) = each %INC) { 3893 while (my ($k, $v) = each %INC) {
3634 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3894 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3635 3895
3636 warn "... unloading $k"; 3896 trace "... unloading $k";
3637 delete $INC{$k}; 3897 delete $INC{$k};
3638 3898
3639 $k =~ s/\.pm$//; 3899 $k =~ s/\.pm$//;
3640 $k =~ s/\//::/g; 3900 $k =~ s/\//::/g;
3641 3901
3644 } 3904 }
3645 3905
3646 clear_package $k; 3906 clear_package $k;
3647 } 3907 }
3648 3908
3649 warn "getting rid of safe::, as good as possible"; 3909 trace "getting rid of safe::, as good as possible";
3650 clear_package "safe::$_" 3910 clear_package "safe::$_"
3651 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3911 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3652 3912
3653 warn "unloading cf.pm \"a bit\""; 3913 trace "unloading cf.pm \"a bit\"";
3654 delete $INC{"cf.pm"}; 3914 delete $INC{"cf.pm"};
3655 delete $INC{"cf/pod.pm"}; 3915 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3656 3916
3657 # don't, removes xs symbols, too, 3917 # don't, removes xs symbols, too,
3658 # and global variables created in xs 3918 # and global variables created in xs
3659 #clear_package __PACKAGE__; 3919 #clear_package __PACKAGE__;
3660 3920
3661 warn "unload completed, starting to reload now"; 3921 info "unload completed, starting to reload now";
3662 3922
3663 warn "reloading cf.pm"; 3923 trace "reloading cf.pm";
3664 require cf; 3924 require cf;
3665 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3925 cf::_connect_to_perl_1;
3666 3926
3667 warn "loading config and database again"; 3927 trace "loading config and database again";
3668 cf::reload_config; 3928 cf::reload_config;
3669 3929
3670 warn "loading extensions"; 3930 trace "loading extensions";
3671 cf::load_extensions; 3931 cf::load_extensions;
3672 3932
3933 if ($REATTACH_ON_RELOAD) {
3673 warn "reattaching attachments to objects/players"; 3934 trace "reattaching attachments to objects/players";
3674 _global_reattach; # objects, sockets 3935 _global_reattach; # objects, sockets
3675 warn "reattaching attachments to maps"; 3936 trace "reattaching attachments to maps";
3676 reattach $_ for values %MAP; 3937 reattach $_ for values %MAP;
3677 warn "reattaching attachments to players"; 3938 trace "reattaching attachments to players";
3678 reattach $_ for values %PLAYER; 3939 reattach $_ for values %PLAYER;
3940 }
3679 3941
3942 trace "running post_init jobs";
3943 (pop @POST_INIT)->(1) while @POST_INIT;
3944
3680 warn "leaving sync_job"; 3945 trace "leaving sync_job";
3681 3946
3682 1 3947 1
3683 } or do { 3948 } or do {
3684 warn $@; 3949 error $@;
3685 cf::cleanup "error while reloading, exiting."; 3950 cf::cleanup "error while reloading, exiting.";
3686 }; 3951 };
3687 3952
3688 warn "reloaded"; 3953 info "reloaded";
3689 --$RELOAD; 3954 --$RELOAD;
3690 } 3955 }
3956
3957 $t1 = AE::time - $t1;
3958 info "reload completed in ${t1}s\n";
3691}; 3959};
3692 3960
3693our $RELOAD_WATCHER; # used only during reload 3961our $RELOAD_WATCHER; # used only during reload
3694 3962
3695sub reload_perl() { 3963sub reload_perl() {
3696 # doing reload synchronously and two reloads happen back-to-back, 3964 # doing reload synchronously and two reloads happen back-to-back,
3697 # coro crashes during coro_state_free->destroy here. 3965 # coro crashes during coro_state_free->destroy here.
3698 3966
3967 $RELOAD_WATCHER ||= cf::async {
3968 Coro::AIO::aio_wait cache_extensions;
3969
3699 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3970 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3700 do_reload_perl; 3971 do_reload_perl;
3701 undef $RELOAD_WATCHER; 3972 undef $RELOAD_WATCHER;
3973 };
3702 }; 3974 };
3703} 3975}
3704 3976
3705register_command "reload" => sub { 3977register_command "reload" => sub {
3706 my ($who, $arg) = @_; 3978 my ($who, $arg) = @_;
3720 3992
3721our @WAIT_FOR_TICK; 3993our @WAIT_FOR_TICK;
3722our @WAIT_FOR_TICK_BEGIN; 3994our @WAIT_FOR_TICK_BEGIN;
3723 3995
3724sub wait_for_tick { 3996sub wait_for_tick {
3725 return if tick_inhibit || $Coro::current == $Coro::main; 3997 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3726 3998
3727 my $signal = new Coro::Signal; 3999 my $signal = new Coro::Signal;
3728 push @WAIT_FOR_TICK, $signal; 4000 push @WAIT_FOR_TICK, $signal;
3729 $signal->wait; 4001 $signal->wait;
3730} 4002}
3731 4003
3732sub wait_for_tick_begin { 4004sub wait_for_tick_begin {
3733 return if tick_inhibit || $Coro::current == $Coro::main; 4005 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3734 4006
3735 my $signal = new Coro::Signal; 4007 my $signal = new Coro::Signal;
3736 push @WAIT_FOR_TICK_BEGIN, $signal; 4008 push @WAIT_FOR_TICK_BEGIN, $signal;
3737 $signal->wait; 4009 $signal->wait;
3738} 4010}
3744 return; 4016 return;
3745 } 4017 }
3746 4018
3747 cf::server_tick; # one server iteration 4019 cf::server_tick; # one server iteration
3748 4020
4021 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4022
3749 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4023 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3750 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4024 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3751 Coro::async_pool { 4025 Coro::async_pool {
3752 $Coro::current->{desc} = "runtime saver"; 4026 $Coro::current->{desc} = "runtime saver";
3753 write_runtime_sync 4027 write_runtime_sync
3754 or warn "ERROR: unable to write runtime file: $!"; 4028 or error "ERROR: unable to write runtime file: $!";
3755 }; 4029 };
3756 } 4030 }
3757 4031
3758 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4032 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3759 $sig->send; 4033 $sig->send;
3767 4041
3768 if (0) { 4042 if (0) {
3769 if ($NEXT_TICK) { 4043 if ($NEXT_TICK) {
3770 my $jitter = $TICK_START - $NEXT_TICK; 4044 my $jitter = $TICK_START - $NEXT_TICK;
3771 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4045 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3772 warn "jitter $JITTER\n";#d# 4046 debug "jitter $JITTER\n";#d#
3773 } 4047 }
3774 } 4048 }
3775} 4049}
3776 4050
3777{ 4051{
3778 # configure BDB 4052 # configure BDB
3779 4053
3780 BDB::min_parallel 8; 4054 BDB::min_parallel 16;
3781 BDB::max_poll_reqs $TICK * 0.1; 4055 BDB::max_poll_reqs $TICK * 0.1;
3782 $AnyEvent::BDB::WATCHER->priority (1); 4056 $AnyEvent::BDB::WATCHER->priority (1);
3783 4057
3784 unless ($DB_ENV) { 4058 unless ($DB_ENV) {
3785 $DB_ENV = BDB::db_env_create; 4059 $DB_ENV = BDB::db_env_create;
3832 $msg =~ s/\n//; 4106 $msg =~ s/\n//;
3833 4107
3834 # limit the # of concurrent backtraces 4108 # limit the # of concurrent backtraces
3835 if ($_log_backtrace < 2) { 4109 if ($_log_backtrace < 2) {
3836 ++$_log_backtrace; 4110 ++$_log_backtrace;
4111 my $perl_bt = Carp::longmess $msg;
3837 async { 4112 async {
3838 $Coro::current->{desc} = "abt $msg"; 4113 $Coro::current->{desc} = "abt $msg";
3839 4114
3840 my @bt = fork_call { 4115 my @bt = fork_call {
3841 @addr = map { sprintf "%x", $_ } @addr; 4116 @addr = map { sprintf "%x", $_ } @addr;
3852 } 4127 }
3853 4128
3854 @funcs 4129 @funcs
3855 }; 4130 };
3856 4131
3857 LOG llevInfo, "[ABT] $msg\n"; 4132 LOG llevInfo, "[ABT] $perl_bt\n";
4133 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3858 LOG llevInfo, "[ABT] $_\n" for @bt; 4134 LOG llevInfo, "[ABT] $_\n" for @bt;
3859 --$_log_backtrace; 4135 --$_log_backtrace;
3860 }; 4136 };
3861 } else { 4137 } else {
3862 LOG llevInfo, "[ABT] $msg\n"; 4138 LOG llevInfo, "[ABT] $msg\n";
3863 LOG llevInfo, "[ABT] [suppressed]\n"; 4139 LOG llevInfo, "[ABT] [suppressed]\n";
3864 } 4140 }
3865} 4141}
3866 4142
3867# load additional modules 4143# load additional modules
3868use cf::pod; 4144require "cf/$_.pm" for @EXTRA_MODULES;
4145cf::_connect_to_perl_2;
3869 4146
3870END { cf::emergency_save } 4147END { cf::emergency_save }
3871 4148
38721 41491
3873 4150

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines