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.176 by root, Sun Jan 14 22:14:35 2007 UTC vs.
Revision 1.280 by root, Sat Jun 16 14:35:41 2007 UTC

3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
10use Event;
9use Opcode; 11use Opcode;
10use Safe; 12use Safe;
11use Safe::Hole; 13use Safe::Hole;
12 14
13use Coro 3.4 (); 15use Coro 3.61 ();
16use Coro::State;
17use Coro::Handle;
14use Coro::Event; 18use Coro::Event;
15use Coro::Timer; 19use Coro::Timer;
16use Coro::Signal; 20use Coro::Signal;
17use Coro::Semaphore; 21use Coro::Semaphore;
18use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
19 24
25use BDB ();
20use Data::Dumper; 26use Data::Dumper;
21use Digest::MD5; 27use Digest::MD5;
22use Fcntl; 28use Fcntl;
29use YAML::Syck ();
23use IO::AIO 2.32 (); 30use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 31use Time::HiRes;
32use Compress::LZF;
26 33
34# configure various modules to our taste
35#
36$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 40$Event::Eval = 1; # no idea why this is required, but it is
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 41
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 43$YAML::Syck::ImplicitUnicode = 1;
33 44
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
35 48
36our %COMMAND = (); 49our %COMMAND = ();
37our %COMMAND_TIME = (); 50our %COMMAND_TIME = ();
38 51
39our @EXTS = (); # list of extension package names 52our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 53our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
43 56
57our $RELOAD; # number of reloads so far
44our @EVENT; 58our @EVENT;
45our $LIBDIR = datadir . "/ext";
46 59
47our $TICK = MAX_TIME * 1e-6; 60our $CONFDIR = confdir;
61our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db";
71
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
48our $TICK_WATCHER; 73our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 74our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 76our $NEXT_TICK;
52our $NOW; 77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off
79
80our $BDB_POLL_WATCHER;
81our $DB_ENV;
53 82
54our %CFG; 83our %CFG;
55 84
56our $UPTIME; $UPTIME ||= time; 85our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 86our $RUNTIME;
58 87
59our %PLAYER; # all users 88our %PLAYER; # all users
60our %MAP; # all maps 89our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random";
63
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 91
67# used to convert map paths into valid unix filenames by replacing / by ∕ 92# used to convert map paths into valid unix filenames by replacing / by ∕
68our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
69 94
95our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing
97our $tick_start; # for load detecting purposes
98
70binmode STDOUT; 99binmode STDOUT;
71binmode STDERR; 100binmode STDERR;
72 101
73# read virtual server time, if available 102# read virtual server time, if available
74unless ($RUNTIME || !-e cf::localdir . "/runtime") { 103unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
75 open my $fh, "<", cf::localdir . "/runtime" 104 open my $fh, "<", "$LOCALDIR/runtime"
76 or die "unable to read runtime file: $!"; 105 or die "unable to read runtime file: $!";
77 $RUNTIME = <$fh> + 0.; 106 $RUNTIME = <$fh> + 0.;
78} 107}
79 108
80mkdir cf::localdir; 109mkdir $_
81mkdir cf::localdir . "/" . cf::playerdir; 110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
82mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS;
85 111
86our $EMERGENCY_POSITION; 112our $EMERGENCY_POSITION;
113
114sub cf::map::normalise;
87 115
88############################################################################# 116#############################################################################
89 117
90=head2 GLOBAL VARIABLES 118=head2 GLOBAL VARIABLES
91 119
98=item $cf::RUNTIME 126=item $cf::RUNTIME
99 127
100The time this server has run, starts at 0 and is increased by $cf::TICK on 128The time this server has run, starts at 0 and is increased by $cf::TICK on
101every server tick. 129every server tick.
102 130
103=item $cf::LIBDIR 131=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
132$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
133$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
104 134
105The perl library directory, where extensions and cf-specific modules can 135Various directories - "/etc", read-only install directory, perl-library
106be found. It will be added to C<@INC> automatically. 136directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
137unique-items directory, player file directory, random maps directory and
138database environment.
107 139
108=item $cf::NOW 140=item $cf::NOW
109 141
110The time of the last (current) server tick. 142The time of the last (current) server tick.
111 143
112=item $cf::TICK 144=item $cf::TICK
113 145
114The interval between server ticks, in seconds. 146The interval between server ticks, in seconds.
147
148=item $cf::LOADAVG
149
150The current CPU load on the server (alpha-smoothed), as a value between 0
151(none) and 1 (overloaded), indicating how much time is spent on processing
152objects per tick. Healthy values are < 0.5.
153
154=item $cf::LOAD
155
156The raw value load value from the last tick.
115 157
116=item %cf::CFG 158=item %cf::CFG
117 159
118Configuration for the server, loaded from C</etc/crossfire/config>, or 160Configuration for the server, loaded from C</etc/crossfire/config>, or
119from wherever your confdir points to. 161from wherever your confdir points to.
120 162
121=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 163=item cf::wait_for_tick, cf::wait_for_tick_begin
122 164
123These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
124or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 166returns directly I<after> the tick processing (and consequently, can only wake one process
125processing has been done. Call C<< ->wait >> on them to maximise the 167per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
126window of cpu time available, or simply to synchronise to the server tick.
127 168
128=back 169=back
129 170
130=cut 171=cut
131 172
132BEGIN { 173BEGIN {
133 *CORE::GLOBAL::warn = sub { 174 *CORE::GLOBAL::warn = sub {
134 my $msg = join "", @_; 175 my $msg = join "", @_;
135 utf8::encode $msg;
136 176
137 $msg .= "\n" 177 $msg .= "\n"
138 unless $msg =~ /\n$/; 178 unless $msg =~ /\n$/;
139 179
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181
182 utf8::encode $msg;
140 LOG llevError, $msg; 183 LOG llevError, $msg;
141 }; 184 };
142} 185}
143 186
144@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
145@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
146@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
147@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
148@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
192@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
149@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 193@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
150 194
151# we bless all objects into (empty) derived classes to force a method lookup 195# we bless all objects into (empty) derived classes to force a method lookup
152# within the Safe compartment. 196# within the Safe compartment.
153for my $pkg (qw( 197for my $pkg (qw(
154 cf::global cf::attachable 198 cf::global cf::attachable
190 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 234 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
191 $d 235 $d
192 } || "[unable to dump $_[0]: '$@']"; 236 } || "[unable to dump $_[0]: '$@']";
193} 237}
194 238
195use JSON::Syck (); # TODO# replace by JSON::PC once working 239use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
196 240
197=item $ref = cf::from_json $json 241=item $ref = cf::from_json $json
198 242
199Converts a JSON string into the corresponding perl data structure. 243Converts a JSON string into the corresponding perl data structure.
200 244
201=cut
202
203sub from_json($) {
204 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
205 JSON::Syck::Load $_[0]
206}
207
208=item $json = cf::to_json $ref 245=item $json = cf::to_json $ref
209 246
210Converts a perl data structure into its JSON representation. 247Converts a perl data structure into its JSON representation.
211
212=cut
213
214sub to_json($) {
215 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
216 JSON::Syck::Dump $_[0]
217}
218 248
219=item cf::lock_wait $string 249=item cf::lock_wait $string
220 250
221Wait until the given lock is available. See cf::lock_acquire. 251Wait until the given lock is available. See cf::lock_acquire.
222 252
228returned. 258returned.
229 259
230Lock names should begin with a unique identifier (for example, cf::map::find 260Lock names should begin with a unique identifier (for example, cf::map::find
231uses map_find and cf::map::load uses map_load). 261uses map_find and cf::map::load uses map_load).
232 262
263=item $locked = cf::lock_active $string
264
265Return true if the lock is currently active, i.e. somebody has locked it.
266
233=cut 267=cut
234 268
235our %LOCK; 269our %LOCK;
236 270
237sub lock_wait($) { 271sub lock_wait($) {
256 # wake up all waiters, to be on the safe side 290 # wake up all waiters, to be on the safe side
257 $_->ready for @{ delete $LOCK{$key} }; 291 $_->ready for @{ delete $LOCK{$key} };
258 } 292 }
259} 293}
260 294
295sub lock_active($) {
296 my ($key) = @_;
297
298 ! ! $LOCK{$key}
299}
300
261sub freeze_mainloop { 301sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 302 return unless $TICK_WATCHER->is_active;
263 303
264 my $guard = Coro::guard { 304 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 305 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 306 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 307 $TICK_WATCHER->stop;
270 $guard 308 $guard
271} 309}
272 310
273=item cf::async { BLOCK } 311=item cf::async { BLOCK }
295 333
296sub sync_job(&) { 334sub sync_job(&) {
297 my ($job) = @_; 335 my ($job) = @_;
298 336
299 if ($Coro::current == $Coro::main) { 337 if ($Coro::current == $Coro::main) {
338 my $time = Event::time;
339
300 # this is the main coro, too bad, we have to block 340 # this is the main coro, too bad, we have to block
301 # till the operation succeeds, freezing the server :/ 341 # till the operation succeeds, freezing the server :/
302 342
303 # TODO: use suspend/resume instead 343 # TODO: use suspend/resume instead
304 # (but this is cancel-safe) 344 # (but this is cancel-safe)
315 355
316 while ($busy) { 356 while ($busy) {
317 Coro::cede or Event::one_event; 357 Coro::cede or Event::one_event;
318 } 358 }
319 359
360 $time = Event::time - $time;
361
362 LOG llevError | logBacktrace, Carp::longmess "long sync job"
363 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
364
365 $tick_start += $time; # do not account sync jobs to server load
366
320 wantarray ? @res : $res[0] 367 wantarray ? @res : $res[0]
321 } else { 368 } else {
322 # we are in another coroutine, how wonderful, everything just works 369 # we are in another coroutine, how wonderful, everything just works
323 370
324 $job->() 371 $job->()
344 391
345 $coro 392 $coro
346} 393}
347 394
348sub write_runtime { 395sub write_runtime {
349 my $runtime = cf::localdir . "/runtime"; 396 my $runtime = "$LOCALDIR/runtime";
397
398 # first touch the runtime file to show we are still running:
399 # the fsync below can take a very very long time.
400
401 IO::AIO::aio_utime $runtime, undef, undef;
402
403 my $guard = cf::lock_acquire "write_runtime";
350 404
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 406 or return;
353 407
408 my $value = $cf::RUNTIME + 90 + 10;
354 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 409 # 10 is the runtime save interval, for a monotonic clock
410 # 60 allows for the watchdog to kill the server.
411
355 (aio_write $fh, 0, (length $value), $value, 0) <= 0 412 (aio_write $fh, 0, (length $value), $value, 0) <= 0
356 and return; 413 and return;
357 414
415 # always fsync - this file is important
358 aio_fsync $fh 416 aio_fsync $fh
359 and return; 417 and return;
360 418
419 # touch it again to show we are up-to-date
420 aio_utime $fh, undef, undef;
421
361 close $fh 422 close $fh
362 or return; 423 or return;
363 424
364 aio_rename "$runtime~", $runtime 425 aio_rename "$runtime~", $runtime
365 and return; 426 and return;
366 427
428 warn "runtime file written.\n";
429
367 1 430 1
431}
432
433=item cf::datalog type => key => value, ...
434
435Log a datalog packet of the given type with the given key-value pairs.
436
437=cut
438
439sub datalog($@) {
440 my ($type, %kv) = @_;
441 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
368} 442}
369 443
370=back 444=back
371 445
372=cut 446=cut
552 $registry = $CB_TYPE[$object_type] ||= []; 626 $registry = $CB_TYPE[$object_type] ||= [];
553 627
554 } elsif ($type eq "subtype") { 628 } elsif ($type eq "subtype") {
555 defined $object_type or Carp::croak "subtype specified without type"; 629 defined $object_type or Carp::croak "subtype specified without type";
556 my $object_subtype = shift @arg; 630 my $object_subtype = shift @arg;
557 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 631 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
558 632
559 } elsif ($type eq "package") { 633 } elsif ($type eq "package") {
560 my $pkg = shift @arg; 634 my $pkg = shift @arg;
561 635
562 while (my ($name, $id) = each %cb_id) { 636 while (my ($name, $id) = each %cb_id) {
591 _attach $registry, $klass, @attach; 665 _attach $registry, $klass, @attach;
592 } 666 }
593 667
594 $obj->{$name} = \%arg; 668 $obj->{$name} = \%arg;
595 } else { 669 } else {
596 warn "object uses attachment '$name' that is not available, postponing.\n"; 670 warn "object uses attachment '$name' which is not available, postponing.\n";
597 } 671 }
598 672
599 $obj->{_attachment}{$name} = undef; 673 $obj->{_attachment}{$name} = undef;
600} 674}
601 675
603 if (ref $_[0]) { 677 if (ref $_[0]) {
604 _object_attach @_; 678 _object_attach @_;
605 } else { 679 } else {
606 _attach shift->_attach_registry, @_; 680 _attach shift->_attach_registry, @_;
607 } 681 }
682 _recalc_want;
608}; 683};
609 684
610# all those should be optimised 685# all those should be optimised
611sub cf::attachable::detach { 686sub cf::attachable::detach {
612 my ($obj, $name) = @_; 687 my ($obj, $name) = @_;
615 delete $obj->{_attachment}{$name}; 690 delete $obj->{_attachment}{$name};
616 reattach ($obj); 691 reattach ($obj);
617 } else { 692 } else {
618 Carp::croak "cannot, currently, detach class attachments"; 693 Carp::croak "cannot, currently, detach class attachments";
619 } 694 }
695 _recalc_want;
620}; 696};
621 697
622sub cf::attachable::attached { 698sub cf::attachable::attached {
623 my ($obj, $name) = @_; 699 my ($obj, $name) = @_;
624 700
747 $filename, length $$rdata, scalar @$objs; 823 $filename, length $$rdata, scalar @$objs;
748 824
749 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 825 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
750 chmod SAVE_MODE, $fh; 826 chmod SAVE_MODE, $fh;
751 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 827 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
752 aio_fsync $fh; 828 aio_fsync $fh if $cf::USE_FSYNC;
753 close $fh; 829 close $fh;
754 830
755 if (@$objs) { 831 if (@$objs) {
756 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 832 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
757 chmod SAVE_MODE, $fh; 833 chmod SAVE_MODE, $fh;
758 my $data = Storable::nfreeze { version => 1, objs => $objs }; 834 my $data = Storable::nfreeze { version => 1, objs => $objs };
759 aio_write $fh, 0, (length $data), $data, 0; 835 aio_write $fh, 0, (length $data), $data, 0;
760 aio_fsync $fh; 836 aio_fsync $fh if $cf::USE_FSYNC;
761 close $fh; 837 close $fh;
762 aio_rename "$filename.pst~", "$filename.pst"; 838 aio_rename "$filename.pst~", "$filename.pst";
763 } 839 }
764 } else { 840 } else {
765 aio_unlink "$filename.pst"; 841 aio_unlink "$filename.pst";
797 or return; 873 or return;
798 $av = eval { (Storable::thaw $av)->{objs} }; 874 $av = eval { (Storable::thaw $av)->{objs} };
799 } 875 }
800 876
801 warn sprintf "loading %s (%d)\n", 877 warn sprintf "loading %s (%d)\n",
802 $filename, length $data, scalar @{$av || []};#d# 878 $filename, length $data, scalar @{$av || []};
803 return ($data, $av); 879 return ($data, $av);
804} 880}
805 881
806############################################################################# 882#############################################################################
807# command handling &c 883# command handling &c
867 943
868 cf::override; 944 cf::override;
869 }, 945 },
870); 946);
871 947
872sub load_extension {
873 my ($path) = @_;
874
875 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
876 my $base = $1;
877 my $pkg = $1;
878 $pkg =~ s/[^[:word:]]/_/g;
879 $pkg = "ext::$pkg";
880
881 warn "... loading '$path' into '$pkg'\n";
882
883 open my $fh, "<:utf8", $path
884 or die "$path: $!";
885
886 my $source =
887 "package $pkg; use strict; use utf8;\n"
888 . "#line 1 \"$path\"\n{\n"
889 . (do { local $/; <$fh> })
890 . "\n};\n1";
891
892 unless (eval $source) {
893 my $msg = $@ ? "$path: $@\n"
894 : "extension disabled.\n";
895 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
896 warn $@;
897 warn "mandatory extension failed to load, exiting.\n";
898 exit 1;
899 }
900 die $@;
901 }
902
903 push @EXTS, $pkg;
904}
905
906sub load_extensions { 948sub load_extensions {
949 cf::sync_job {
950 my %todo;
951
907 for my $ext (<$LIBDIR/*.ext>) { 952 for my $path (<$LIBDIR/*.ext>) {
908 next unless -r $ext; 953 next unless -r $path;
909 eval { 954
910 load_extension $ext; 955 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
956 my $base = $1;
957 my $pkg = $1;
958 $pkg =~ s/[^[:word:]]/_/g;
959 $pkg = "ext::$pkg";
960
961 open my $fh, "<:utf8", $path
962 or die "$path: $!";
963
964 my $source = do { local $/; <$fh> };
965
966 my %ext = (
967 path => $path,
968 base => $base,
969 pkg => $pkg,
970 );
971
972 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
973 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
974
975 $ext{source} =
976 "package $pkg; use strict; use utf8;\n"
977 . "#line 1 \"$path\"\n{\n"
978 . $source
979 . "\n};\n1";
980
981 $todo{$base} = \%ext;
982 }
983
984 my %done;
985 while (%todo) {
986 my $progress;
987
988 while (my ($k, $v) = each %todo) {
989 for (split /,\s*/, $v->{meta}{depends}) {
990 goto skip
991 unless exists $done{$_};
992 }
993
994 warn "... loading '$k' into '$v->{pkg}'\n";
995
996 unless (eval $v->{source}) {
997 my $msg = $@ ? "$v->{path}: $@\n"
998 : "$v->{base}: extension inactive.\n";
999
1000 if (exists $v->{meta}{mandatory}) {
1001 warn $msg;
1002 warn "mandatory extension failed to load, exiting.\n";
1003 exit 1;
1004 }
1005
1006 warn $msg;
1007 }
1008
1009 $done{$k} = delete $todo{$k};
1010 push @EXTS, $v->{pkg};
1011 $progress = 1;
911 1 1012 }
912 } or warn "$ext not loaded: $@"; 1013
1014 skip:
1015 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1016 unless $progress;
1017 }
913 } 1018 };
914} 1019}
915 1020
916############################################################################# 1021#############################################################################
917 1022
918=head2 CORE EXTENSIONS 1023=head2 CORE EXTENSIONS
934Returns the given player object, loading it if necessary (might block). 1039Returns the given player object, loading it if necessary (might block).
935 1040
936=cut 1041=cut
937 1042
938sub playerdir($) { 1043sub playerdir($) {
939 cf::localdir 1044 "$PLAYERDIR/"
940 . "/"
941 . cf::playerdir
942 . "/"
943 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1045 . (ref $_[0] ? $_[0]->ob->name : $_[0])
944} 1046}
945 1047
946sub path($) { 1048sub path($) {
947 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1049 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
948 1050
949 (playerdir $login) . "/$login.pl" 1051 (playerdir $login) . "/playerdata"
950} 1052}
951 1053
952sub find_active($) { 1054sub find_active($) {
953 $cf::PLAYER{$_[0]} 1055 $cf::PLAYER{$_[0]}
954 and $cf::PLAYER{$_[0]}->active 1056 and $cf::PLAYER{$_[0]}->active
957 1059
958sub exists($) { 1060sub exists($) {
959 my ($login) = @_; 1061 my ($login) = @_;
960 1062
961 $cf::PLAYER{$login} 1063 $cf::PLAYER{$login}
962 or cf::sync_job { !aio_stat $login } 1064 or cf::sync_job { !aio_stat path $login }
963} 1065}
964 1066
965sub find($) { 1067sub find($) {
966 return $cf::PLAYER{$_[0]} || do { 1068 return $cf::PLAYER{$_[0]} || do {
967 my $login = $_[0]; 1069 my $login = $_[0];
968 1070
969 my $guard = cf::lock_acquire "user_find:$login"; 1071 my $guard = cf::lock_acquire "user_find:$login";
970 1072
971 $cf::PLAYER{$_[0]} || do { 1073 $cf::PLAYER{$_[0]} || do {
1074 # rename old playerfiles to new ones
1075 #TODO: remove when no longer required
1076 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1077 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1078 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1079 aio_unlink +(playerdir $login) . "/$login.pl";
1080
972 my $pl = load_pl path $login 1081 my $pl = load_pl path $login
973 or return; 1082 or return;
974 $cf::PLAYER{$login} = $pl 1083 $cf::PLAYER{$login} = $pl
975 } 1084 }
976 } 1085 }
1013 1122
1014=cut 1123=cut
1015 1124
1016sub quit_character { 1125sub quit_character {
1017 my ($pl) = @_; 1126 my ($pl) = @_;
1127
1128 my $name = $pl->ob->name;
1018 1129
1019 $pl->{deny_save} = 1; 1130 $pl->{deny_save} = 1;
1020 $pl->password ("*"); # this should lock out the player until we nuked the dir 1131 $pl->password ("*"); # this should lock out the player until we nuked the dir
1021 1132
1022 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1133 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1027 my $path = playerdir $pl; 1138 my $path = playerdir $pl;
1028 my $temp = "$path~$cf::RUNTIME~deleting~"; 1139 my $temp = "$path~$cf::RUNTIME~deleting~";
1029 aio_rename $path, $temp; 1140 aio_rename $path, $temp;
1030 delete $cf::PLAYER{$pl->ob->name}; 1141 delete $cf::PLAYER{$pl->ob->name};
1031 $pl->destroy; 1142 $pl->destroy;
1143
1144 my $prefix = qr<^~\Q$name\E/>;
1145
1146 # nuke player maps
1147 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1148
1032 IO::AIO::aio_rmtree $temp; 1149 IO::AIO::aio_rmtree $temp;
1150}
1151
1152=item $pl->kick
1153
1154Kicks a player out of the game. This destroys the connection.
1155
1156=cut
1157
1158sub kick {
1159 my ($pl, $kicker) = @_;
1160
1161 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1162 $pl->killer ("kicked");
1163 $pl->ns->destroy;
1033} 1164}
1034 1165
1035=item cf::player::list_logins 1166=item cf::player::list_logins
1036 1167
1037Returns am arrayref of all valid playernames in the system, can take a 1168Returns am arrayref of all valid playernames in the system, can take a
1038while and may block, so not sync_job-capable, ever. 1169while and may block, so not sync_job-capable, ever.
1039 1170
1040=cut 1171=cut
1041 1172
1042sub list_logins { 1173sub list_logins {
1043 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1174 my $dirs = aio_readdir $PLAYERDIR
1044 or return []; 1175 or return [];
1045 1176
1046 my @logins; 1177 my @logins;
1047 1178
1048 for my $login (@$dirs) { 1179 for my $login (@$dirs) {
1065=cut 1196=cut
1066 1197
1067sub maps($) { 1198sub maps($) {
1068 my ($pl) = @_; 1199 my ($pl) = @_;
1069 1200
1201 $pl = ref $pl ? $pl->ob->name : $pl;
1202
1070 my $files = aio_readdir playerdir $pl 1203 my $files = aio_readdir playerdir $pl
1071 or return; 1204 or return;
1072 1205
1073 my @paths; 1206 my @paths;
1074 1207
1075 for (@$files) { 1208 for (@$files) {
1076 utf8::decode $_; 1209 utf8::decode $_;
1077 next if /\.(?:pl|pst)$/; 1210 next if /\.(?:pl|pst)$/;
1078 next unless /^$PATH_SEP/o; 1211 next unless /^$PATH_SEP/o;
1079 1212
1080 s/\.map$//; 1213 push @paths, cf::map::normalise "~$pl/$_";
1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1082 } 1214 }
1083 1215
1084 \@paths 1216 \@paths
1085} 1217}
1086 1218
1087=item $player->ext_reply ($msgid, $msgtype, %msg) 1219=item $player->ext_reply ($msgid, %msg)
1088 1220
1089Sends an ext reply to the player. 1221Sends an ext reply to the player.
1090 1222
1091=cut 1223=cut
1092 1224
1093sub ext_reply($$$%) { 1225sub ext_reply($$%) {
1094 my ($self, $id, %msg) = @_; 1226 my ($self, $id, %msg) = @_;
1095 1227
1096 $msg{msgid} = $id; 1228 $msg{msgid} = $id;
1097 1229
1098 $self->send ("ext " . cf::to_json \%msg); 1230 $self->send ("ext " . cf::to_json \%msg);
1099} 1231}
1100 1232
1101package cf; 1233=item $player->ext_event ($type, %msg)
1234
1235Sends an ext event to the client.
1236
1237=cut
1238
1239sub ext_event($$%) {
1240 my ($self, $type, %msg) = @_;
1241
1242 $self->ns->ext_event ($type, %msg);
1243}
1244
1245=head3 cf::region
1246
1247=over 4
1248
1249=cut
1250
1251package cf::region;
1252
1253=item cf::region::find_by_path $path
1254
1255Tries to decuce the probable region for a map knowing only its path.
1256
1257=cut
1258
1259sub find_by_path($) {
1260 my ($path) = @_;
1261
1262 my ($match, $specificity);
1263
1264 for my $region (list) {
1265 if ($region->match && $path =~ $region->match) {
1266 ($match, $specificity) = ($region, $region->specificity)
1267 if $region->specificity > $specificity;
1268 }
1269 }
1270
1271 $match
1272}
1102 1273
1103=back 1274=back
1104
1105 1275
1106=head3 cf::map 1276=head3 cf::map
1107 1277
1108=over 4 1278=over 4
1109 1279
1121our $MAX_RESET = 3600; 1291our $MAX_RESET = 3600;
1122our $DEFAULT_RESET = 3000; 1292our $DEFAULT_RESET = 3000;
1123 1293
1124sub generate_random_map { 1294sub generate_random_map {
1125 my ($self, $rmp) = @_; 1295 my ($self, $rmp) = @_;
1126
1127 # mit "rum" bekleckern, nicht 1296 # mit "rum" bekleckern, nicht
1128 $self->_create_random_map ( 1297 $self->_create_random_map (
1129 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1298 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1130 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1299 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1131 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1300 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1138 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1307 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1139 (cf::region::find $rmp->{region}), $rmp->{custom} 1308 (cf::region::find $rmp->{region}), $rmp->{custom}
1140 ) 1309 )
1141} 1310}
1142 1311
1312=item cf::map->register ($regex, $prio)
1313
1314Register a handler for the map path matching the given regex at the
1315givne priority (higher is better, built-in handlers have priority 0, the
1316default).
1317
1318=cut
1319
1143sub register { 1320sub register {
1144 my (undef, $regex) = @_; 1321 my (undef, $regex, $prio) = @_;
1145 my $pkg = caller; 1322 my $pkg = caller;
1146 1323
1147 no strict; 1324 no strict;
1148 push @{"$pkg\::ISA"}, __PACKAGE__; 1325 push @{"$pkg\::ISA"}, __PACKAGE__;
1149 1326
1150 $EXT_MAP{$pkg} = qr<$regex>; 1327 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1151} 1328}
1152 1329
1153# also paths starting with '/' 1330# also paths starting with '/'
1154$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1331$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1155 1332
1156sub thawer_merge { 1333sub thawer_merge {
1157 my ($self, $merge) = @_; 1334 my ($self, $merge) = @_;
1158 1335
1159 # we have to keep some variables in memory intact 1336 # we have to keep some variables in memory intact
1160 local $self->{path}; 1337 local $self->{path};
1161 local $self->{load_path}; 1338 local $self->{load_path};
1162 local $self->{deny_save};
1163 local $self->{deny_reset};
1164 1339
1165 $self->SUPER::thawer_merge ($merge); 1340 $self->SUPER::thawer_merge ($merge);
1166} 1341}
1167 1342
1168sub normalise { 1343sub normalise {
1169 my ($path, $base) = @_; 1344 my ($path, $base) = @_;
1345
1346 $path = "$path"; # make sure its a string
1347
1348 $path =~ s/\.map$//;
1170 1349
1171 # map plan: 1350 # map plan:
1172 # 1351 #
1173 # /! non-realised random map exit (special hack!) 1352 # /! non-realised random map exit (special hack!)
1174 # {... are special paths that are not being touched 1353 # {... are special paths that are not being touched
1202 1381
1203 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1382 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1204 1383
1205 $path = normalise $path, $base; 1384 $path = normalise $path, $base;
1206 1385
1207 for my $pkg (keys %EXT_MAP) { 1386 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1208 if ($path =~ $EXT_MAP{$pkg}) { 1387 if ($path =~ $EXT_MAP{$pkg}[1]) {
1209 my $self = bless cf::map::new, $pkg; 1388 my $self = bless cf::map::new, $pkg;
1210 $self->{path} = $path; $self->path ($path); 1389 $self->{path} = $path; $self->path ($path);
1211 $self->init; # pass $1 etc. 1390 $self->init; # pass $1 etc.
1212 return $self; 1391 return $self;
1213 } 1392 }
1214 } 1393 }
1215 1394
1216 Carp::carp "unable to resolve path '$path'."; 1395 Carp::carp "unable to resolve path '$path' (base '$base').";
1217 () 1396 ()
1218} 1397}
1219 1398
1220sub init { 1399sub init {
1221 my ($self) = @_; 1400 my ($self) = @_;
1236 1415
1237# the original (read-only) location 1416# the original (read-only) location
1238sub load_path { 1417sub load_path {
1239 my ($self) = @_; 1418 my ($self) = @_;
1240 1419
1241 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1420 "$MAPDIR/$self->{path}.map"
1242} 1421}
1243 1422
1244# the temporary/swap location 1423# the temporary/swap location
1245sub save_path { 1424sub save_path {
1246 my ($self) = @_; 1425 my ($self) = @_;
1247 1426
1248 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1427 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1249 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1428 "$TMPDIR/$path.map"
1250} 1429}
1251 1430
1252# the unique path, undef == no special unique path 1431# the unique path, undef == no special unique path
1253sub uniq_path { 1432sub uniq_path {
1254 my ($self) = @_; 1433 my ($self) = @_;
1255 1434
1256 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1435 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1257 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1436 "$UNIQUEDIR/$path"
1258} 1437}
1259 1438
1260# and all this just because we cannot iterate over 1439# and all this just because we cannot iterate over
1261# all maps in C++... 1440# all maps in C++...
1262sub change_all_map_light { 1441sub change_all_map_light {
1264 1443
1265 $_->change_map_light ($change) 1444 $_->change_map_light ($change)
1266 for grep $_->outdoor, values %cf::MAP; 1445 for grep $_->outdoor, values %cf::MAP;
1267} 1446}
1268 1447
1448sub decay_objects {
1449 my ($self) = @_;
1450
1451 return if $self->{deny_reset};
1452
1453 $self->do_decay_objects;
1454}
1455
1269sub unlink_save { 1456sub unlink_save {
1270 my ($self) = @_; 1457 my ($self) = @_;
1271 1458
1272 utf8::encode (my $save = $self->save_path); 1459 utf8::encode (my $save = $self->save_path);
1273 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1460 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1276 1463
1277sub load_header_from($) { 1464sub load_header_from($) {
1278 my ($self, $path) = @_; 1465 my ($self, $path) = @_;
1279 1466
1280 utf8::encode $path; 1467 utf8::encode $path;
1281 aio_open $path, O_RDONLY, 0 1468 #aio_open $path, O_RDONLY, 0
1282 or return; 1469 # or return;
1283 1470
1284 $self->_load_header ($path) 1471 $self->_load_header ($path)
1285 or return; 1472 or return;
1286 1473
1287 $self->{load_path} = $path; 1474 $self->{load_path} = $path;
1288 1475
1289 1 1476 1
1290} 1477}
1291 1478
1292sub load_orig { 1479sub load_header_orig {
1293 my ($self) = @_; 1480 my ($self) = @_;
1294 1481
1295 $self->load_header_from ($self->load_path) 1482 $self->load_header_from ($self->load_path)
1296} 1483}
1297 1484
1298sub load_temp { 1485sub load_header_temp {
1299 my ($self) = @_; 1486 my ($self) = @_;
1300 1487
1301 $self->load_header_from ($self->save_path) 1488 $self->load_header_from ($self->save_path)
1489}
1490
1491sub prepare_temp {
1492 my ($self) = @_;
1493
1494 $self->last_access ((delete $self->{last_access})
1495 || $cf::RUNTIME); #d#
1496 # safety
1497 $self->{instantiate_time} = $cf::RUNTIME
1498 if $self->{instantiate_time} > $cf::RUNTIME;
1499}
1500
1501sub prepare_orig {
1502 my ($self) = @_;
1503
1504 $self->{load_original} = 1;
1505 $self->{instantiate_time} = $cf::RUNTIME;
1506 $self->last_access ($cf::RUNTIME);
1507 $self->instantiate;
1302} 1508}
1303 1509
1304sub load_header { 1510sub load_header {
1305 my ($self) = @_; 1511 my ($self) = @_;
1306 1512
1307 if ($self->load_temp) { 1513 if ($self->load_header_temp) {
1308 $self->last_access ((delete $self->{last_access}) 1514 $self->prepare_temp;
1309 || $cf::RUNTIME); #d#
1310 # safety
1311 $self->{instantiate_time} = $cf::RUNTIME
1312 if $self->{instantiate_time} > $cf::RUNTIME;
1313 } else { 1515 } else {
1314 $self->load_orig 1516 $self->load_header_orig
1315 or return; 1517 or return;
1316 1518 $self->prepare_orig;
1317 $self->{load_original} = 1;
1318 $self->{instantiate_time} = $cf::RUNTIME;
1319 $self->last_access ($cf::RUNTIME);
1320 $self->instantiate;
1321 } 1519 }
1520
1521 $self->{deny_reset} = 1
1522 if $self->no_reset;
1523
1524 $self->default_region (cf::region::find_by_path $self->{path})
1525 unless $self->default_region;
1322 1526
1323 1 1527 1
1324} 1528}
1325 1529
1326sub find; 1530sub find;
1339 $map->{last_save} = $cf::RUNTIME; 1543 $map->{last_save} = $cf::RUNTIME;
1340 1544
1341 $map->load_header 1545 $map->load_header
1342 or return; 1546 or return;
1343 1547
1344 if ($map->should_reset) { 1548 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1549 # doing this can freeze the server in a sync job, obviously
1345 $cf::WAIT_FOR_TICK->wait; 1550 #$cf::WAIT_FOR_TICK->wait;
1346 $map->reset; 1551 $map->reset;
1347 undef $guard; 1552 undef $guard;
1348 $map = find $path 1553 return find $path;
1349 or return;
1350 } 1554 }
1351 1555
1352 $cf::MAP{$path} = $map 1556 $cf::MAP{$path} = $map
1353 } 1557 }
1354} 1558}
1559
1560sub pre_load { }
1561sub post_load { }
1355 1562
1356sub load { 1563sub load {
1357 my ($self) = @_; 1564 my ($self) = @_;
1358 1565
1566 local $self->{deny_reset} = 1; # loading can take a long time
1567
1359 my $path = $self->{path}; 1568 my $path = $self->{path};
1569
1570 {
1360 my $guard = cf::lock_acquire "map_load:$path"; 1571 my $guard = cf::lock_acquire "map_load:$path";
1361 1572
1362 return if $self->in_memory != cf::MAP_SWAPPED; 1573 return if $self->in_memory != cf::MAP_SWAPPED;
1363 1574
1364 $self->in_memory (cf::MAP_LOADING); 1575 $self->in_memory (cf::MAP_LOADING);
1365 1576
1366 $self->alloc; 1577 $self->alloc;
1367 $self->_load_objects ($self->{load_path}, 1)
1368 or return;
1369 1578
1370 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1579 $self->pre_load;
1371 if delete $self->{load_original};
1372
1373 if (my $uniq = $self->uniq_path) {
1374 utf8::encode $uniq;
1375 if (aio_open $uniq, O_RDONLY, 0) {
1376 $self->clear_unique_items;
1377 $self->_load_objects ($uniq, 0);
1378 }
1379 }
1380
1381 Coro::cede;
1382
1383 # now do the right thing for maps
1384 $self->link_multipart_objects;
1385
1386 unless ($self->{deny_activate}) {
1387 $self->decay_objects;
1388 $self->fix_auto_apply;
1389 $self->update_buttons;
1390 Coro::cede; 1580 Coro::cede;
1391 $self->set_darkness_map; 1581
1582 $self->_load_objects ($self->{load_path}, 1)
1583 or return;
1584
1585 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1586 if delete $self->{load_original};
1587
1588 if (my $uniq = $self->uniq_path) {
1589 utf8::encode $uniq;
1590 if (aio_open $uniq, O_RDONLY, 0) {
1591 $self->clear_unique_items;
1592 $self->_load_objects ($uniq, 0);
1593 }
1594 }
1595
1596 Coro::cede;
1597 # now do the right thing for maps
1598 $self->link_multipart_objects;
1392 $self->difficulty ($self->estimate_difficulty) 1599 $self->difficulty ($self->estimate_difficulty)
1393 unless $self->difficulty; 1600 unless $self->difficulty;
1394 Coro::cede; 1601 Coro::cede;
1602
1603 unless ($self->{deny_activate}) {
1604 $self->decay_objects;
1605 $self->fix_auto_apply;
1606 $self->update_buttons;
1607 Coro::cede;
1608 $self->set_darkness_map;
1609 Coro::cede;
1395 $self->activate; 1610 $self->activate;
1396 } 1611 }
1397 1612
1398 $self->in_memory (cf::MAP_IN_MEMORY); 1613 $self->in_memory (cf::MAP_IN_MEMORY);
1614 }
1615
1616 $self->post_load;
1399} 1617}
1400 1618
1401sub customise_for { 1619sub customise_for {
1402 my ($self, $ob) = @_; 1620 my ($self, $ob) = @_;
1403 1621
1404 return find "~" . $ob->name . "/" . $self->{path} 1622 return find "~" . $ob->name . "/" . $self->{path}
1405 if $self->per_player; 1623 if $self->per_player;
1624
1625# return find "?party/" . $ob->name . "/" . $self->{path}
1626# if $self->per_party;
1406 1627
1407 $self 1628 $self
1408} 1629}
1409 1630
1410# find and load all maps in the 3x3 area around a map 1631# find and load all maps in the 3x3 area around a map
1442 1663
1443 cf::sync_job { $map->load }; 1664 cf::sync_job { $map->load };
1444} 1665}
1445 1666
1446our %MAP_PREFETCH; 1667our %MAP_PREFETCH;
1447our $MAP_PREFETCHER = Coro::async { 1668our $MAP_PREFETCHER = undef;
1448 while () {
1449 for my $path (keys %MAP_PREFETCH) {
1450 my $map = find $path
1451 or next;
1452 $map->load;
1453
1454 delete $MAP_PREFETCH{$path};
1455 }
1456 Coro::schedule;
1457 }
1458};
1459 1669
1460sub find_async { 1670sub find_async {
1461 my ($path, $origin) = @_; 1671 my ($path, $origin) = @_;
1462 1672
1463 $path = normalise $path, $origin && $origin->{path}; 1673 $path = normalise $path, $origin && $origin->{path};
1464 1674
1465 if (my $map = $cf::MAP{$path}) { 1675 if (my $map = $cf::MAP{$path}) {
1466 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1676 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1467 } 1677 }
1468 1678
1469 $MAP_PREFETCH{$path} = 0; 1679 undef $MAP_PREFETCH{$path};
1680 $MAP_PREFETCHER ||= cf::async {
1681 while (%MAP_PREFETCH) {
1682 for my $path (keys %MAP_PREFETCH) {
1683 my $map = find $path
1684 or next;
1685 $map->load;
1686
1687 delete $MAP_PREFETCH{$path};
1688 }
1689 }
1690 undef $MAP_PREFETCHER;
1691 };
1470 $MAP_PREFETCHER->ready; 1692 $MAP_PREFETCHER->prio (6);
1471 1693
1472 () 1694 ()
1473} 1695}
1474 1696
1475sub save { 1697sub save {
1520 1742
1521sub reset_at { 1743sub reset_at {
1522 my ($self) = @_; 1744 my ($self) = @_;
1523 1745
1524 # TODO: safety, remove and allow resettable per-player maps 1746 # TODO: safety, remove and allow resettable per-player maps
1525 return 1e99 if $self->isa ("ext::map_per_player");#d#
1526 return 1e99 if $self->{deny_reset}; 1747 return 1e99 if $self->{deny_reset};
1527 1748
1528 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1749 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1529 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1750 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1530 1751
1541 my ($self) = @_; 1762 my ($self) = @_;
1542 1763
1543 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1764 my $lock = cf::lock_acquire "map_data:$self->{path}";
1544 1765
1545 return if $self->players; 1766 return if $self->players;
1546 return if $self->isa ("ext::map_per_player");#d#
1547 1767
1548 warn "resetting map ", $self->path;#d# 1768 warn "resetting map ", $self->path;
1769
1770 $self->in_memory (cf::MAP_SWAPPED);
1771
1772 # need to save uniques path
1773 unless ($self->{deny_save}) {
1774 my $uniq = $self->uniq_path; utf8::encode $uniq;
1775
1776 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1777 if $uniq;
1778 }
1549 1779
1550 delete $cf::MAP{$self->path}; 1780 delete $cf::MAP{$self->path};
1551 1781
1552 $self->in_memory (cf::MAP_SWAPPED);
1553 $self->clear; 1782 $self->clear;
1554 1783
1555 $_->clear_links_to ($self) for values %cf::MAP; 1784 $_->clear_links_to ($self) for values %cf::MAP;
1556 1785
1557 $self->unlink_save; 1786 $self->unlink_save;
1576 $cf::MAP{$self->path} = $self; 1805 $cf::MAP{$self->path} = $self;
1577 1806
1578 $self->reset; # polite request, might not happen 1807 $self->reset; # polite request, might not happen
1579} 1808}
1580 1809
1810=item $maps = cf::map::tmp_maps
1811
1812Returns an arrayref with all map paths of currently instantiated and saved
1813maps. May block.
1814
1815=cut
1816
1817sub tmp_maps() {
1818 [
1819 map {
1820 utf8::decode $_;
1821 /\.map$/
1822 ? normalise $_
1823 : ()
1824 } @{ aio_readdir $TMPDIR or [] }
1825 ]
1826}
1827
1828=item $maps = cf::map::random_maps
1829
1830Returns an arrayref with all map paths of currently instantiated and saved
1831random maps. May block.
1832
1833=cut
1834
1835sub random_maps() {
1836 [
1837 map {
1838 utf8::decode $_;
1839 /\.map$/
1840 ? normalise "?random/$_"
1841 : ()
1842 } @{ aio_readdir $RANDOMDIR or [] }
1843 ]
1844}
1845
1581=item cf::map::unique_maps 1846=item cf::map::unique_maps
1582 1847
1583Returns an arrayref of paths of all shared maps that have 1848Returns an arrayref of paths of all shared maps that have
1584instantiated unique items. May block. 1849instantiated unique items. May block.
1585 1850
1586=cut 1851=cut
1587 1852
1588sub unique_maps() { 1853sub unique_maps() {
1589 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1854 [
1590 or return; 1855 map {
1591
1592 my @paths;
1593
1594 for (@$files) {
1595 utf8::decode $_; 1856 utf8::decode $_;
1596 next if /\.pst$/;
1597 next unless /^$PATH_SEP/o;
1598
1599 s/\.map$//; 1857 /\.map$/
1600 push @paths, $_; 1858 ? normalise $_
1859 : ()
1860 } @{ aio_readdir $UNIQUEDIR or [] }
1601 } 1861 ]
1602
1603 \@paths
1604} 1862}
1605 1863
1606package cf; 1864package cf;
1607 1865
1608=back 1866=back
1699=cut 1957=cut
1700 1958
1701sub link_map { 1959sub link_map {
1702 unless ($LINK_MAP) { 1960 unless ($LINK_MAP) {
1703 $LINK_MAP = cf::map::find "{link}" 1961 $LINK_MAP = cf::map::find "{link}"
1704 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1962 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1705 $LINK_MAP->load; 1963 $LINK_MAP->load;
1706 } 1964 }
1707 1965
1708 $LINK_MAP 1966 $LINK_MAP
1709} 1967}
1714 $self->deactivate_recursive; 1972 $self->deactivate_recursive;
1715 1973
1716 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1974 return if UNIVERSAL::isa $self->map, "ext::map_link";
1717 1975
1718 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1976 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1719 if $self->map; 1977 if $self->map && $self->map->{path} ne "{link}";
1720 1978
1721 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1979 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1722} 1980}
1723 1981
1724sub cf::object::player::leave_link { 1982sub cf::object::player::leave_link {
1725 my ($self, $map, $x, $y) = @_; 1983 my ($self, $map, $x, $y) = @_;
1984
1985 return unless $self->contr->active;
1726 1986
1727 my $link_pos = delete $self->{_link_pos}; 1987 my $link_pos = delete $self->{_link_pos};
1728 1988
1729 unless ($map) { 1989 unless ($map) {
1730 # restore original map position 1990 # restore original map position
1748 $map->load; 2008 $map->load;
1749 $map->load_diag; 2009 $map->load_diag;
1750 2010
1751 return unless $self->contr->active; 2011 return unless $self->contr->active;
1752 $self->activate_recursive; 2012 $self->activate_recursive;
2013
2014 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1753 $self->enter_map ($map, $x, $y); 2015 $self->enter_map ($map, $x, $y);
1754} 2016}
1755 2017
1756cf::player->attach (
1757 on_logout => sub {
1758 my ($pl) = @_;
1759
1760 # abort map switching before logout
1761 if ($pl->ob->{_link_pos}) {
1762 cf::sync_job {
1763 $pl->ob->leave_link
1764 };
1765 }
1766 },
1767 on_login => sub {
1768 my ($pl) = @_;
1769
1770 # try to abort aborted map switching on player login :)
1771 # should happen only on crashes
1772 if ($pl->ob->{_link_pos}) {
1773 $pl->ob->enter_link;
1774 (async {
1775 # we need this sleep as the login has a concurrent enter_exit running
1776 # and this sleep increases chances of the player not ending up in scorn
1777 $pl->ob->reply (undef,
1778 "There was an internal problem at your last logout, "
1779 . "the server will try to bring you to your intended destination in a second.",
1780 cf::NDI_RED);
1781 Coro::Timer::sleep 1;
1782 $pl->ob->leave_link;
1783 })->prio (2);
1784 }
1785 },
1786);
1787
1788=item $player_object->goto ($path, $x, $y) 2018=item $player_object->goto ($path, $x, $y[, $check->($map)])
1789 2019
2020Moves the player to the given map-path and coordinates by first freezing
2021her, loading and preparing them map, calling the provided $check callback
2022that has to return the map if sucecssful, and then unfreezes the player on
2023the new (success) or old (failed) map position.
2024
1790=cut 2025=cut
2026
2027our $GOTOGEN;
1791 2028
1792sub cf::object::player::goto { 2029sub cf::object::player::goto {
1793 my ($self, $path, $x, $y) = @_; 2030 my ($self, $path, $x, $y, $check) = @_;
2031
2032 # do generation counting so two concurrent goto's will be executed in-order
2033 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1794 2034
1795 $self->enter_link; 2035 $self->enter_link;
1796 2036
1797 (async { 2037 (async {
2038 my $map = eval {
1798 my $map = cf::map::find $path; 2039 my $map = cf::map::find $path;
2040
2041 if ($map) {
1799 $map = $map->customise_for ($self) if $map; 2042 $map = $map->customise_for ($self);
1800 2043 $map = $check->($map) if $check && $map;
1801# warn "entering ", $map->path, " at ($x, $y)\n" 2044 } else {
1802# if $map;
1803
1804 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2045 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2046 }
1805 2047
2048 $map
2049 };
2050
2051 if ($@) {
2052 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2053 LOG llevError | logBacktrace, Carp::longmess $@;
2054 }
2055
2056 if ($gen == $self->{_goto_generation}) {
2057 delete $self->{_goto_generation};
1806 $self->leave_link ($map, $x, $y); 2058 $self->leave_link ($map, $x, $y);
2059 }
1807 })->prio (1); 2060 })->prio (1);
1808} 2061}
1809 2062
1810=item $player_object->enter_exit ($exit_object) 2063=item $player_object->enter_exit ($exit_object)
1811 2064
1813 2066
1814sub parse_random_map_params { 2067sub parse_random_map_params {
1815 my ($spec) = @_; 2068 my ($spec) = @_;
1816 2069
1817 my $rmp = { # defaults 2070 my $rmp = { # defaults
1818 xsize => 10, 2071 xsize => (cf::rndm 15, 40),
1819 ysize => 10, 2072 ysize => (cf::rndm 15, 40),
2073 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
2074 #layout => string,
1820 }; 2075 };
1821 2076
1822 for (split /\n/, $spec) { 2077 for (split /\n/, $spec) {
1823 my ($k, $v) = split /\s+/, $_, 2; 2078 my ($k, $v) = split /\s+/, $_, 2;
1824 2079
1828 $rmp 2083 $rmp
1829} 2084}
1830 2085
1831sub prepare_random_map { 2086sub prepare_random_map {
1832 my ($exit) = @_; 2087 my ($exit) = @_;
2088
2089 my $guard = cf::lock_acquire "exit_prepare:$exit";
1833 2090
1834 # all this does is basically replace the /! path by 2091 # all this does is basically replace the /! path by
1835 # a new random map path (?random/...) with a seed 2092 # a new random map path (?random/...) with a seed
1836 # that depends on the exit object 2093 # that depends on the exit object
1837 2094
1838 my $rmp = parse_random_map_params $exit->msg; 2095 my $rmp = parse_random_map_params $exit->msg;
1839 2096
1840 if ($exit->map) { 2097 if ($exit->map) {
1841 $rmp->{region} = $exit->map->region_name; 2098 $rmp->{region} = $exit->region->name;
1842 $rmp->{origin_map} = $exit->map->path; 2099 $rmp->{origin_map} = $exit->map->path;
1843 $rmp->{origin_x} = $exit->x; 2100 $rmp->{origin_x} = $exit->x;
1844 $rmp->{origin_y} = $exit->y; 2101 $rmp->{origin_y} = $exit->y;
1845 } 2102 }
1846 2103
1847 $rmp->{random_seed} ||= $exit->random_seed; 2104 $rmp->{random_seed} ||= $exit->random_seed;
1848 2105
1849 my $data = cf::to_json $rmp; 2106 my $data = cf::to_json $rmp;
1850 my $md5 = Digest::MD5::md5_hex $data; 2107 my $md5 = Digest::MD5::md5_hex $data;
2108 my $meta = "$RANDOMDIR/$md5.meta";
1851 2109
1852 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 2110 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1853 aio_write $fh, 0, (length $data), $data, 0; 2111 aio_write $fh, 0, (length $data), $data, 0;
2112 undef $fh;
2113 aio_rename "$meta~", $meta;
1854 2114
1855 $exit->slaying ("?random/$md5"); 2115 $exit->slaying ("?random/$md5");
1856 $exit->msg (undef); 2116 $exit->msg (undef);
1857 } 2117 }
1858} 2118}
1859 2119
1860sub cf::object::player::enter_exit { 2120sub cf::object::player::enter_exit {
1861 my ($self, $exit) = @_; 2121 my ($self, $exit) = @_;
1862 2122
1863 return unless $self->type == cf::PLAYER; 2123 return unless $self->type == cf::PLAYER;
2124
2125 if ($exit->slaying eq "/!") {
2126 #TODO: this should de-fi-ni-te-ly not be a sync-job
2127 # the problem is that $exit might not survive long enough
2128 # so it needs to be done right now, right here
2129 cf::sync_job { prepare_random_map $exit };
2130 }
2131
2132 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2133 my $hp = $exit->stats->hp;
2134 my $sp = $exit->stats->sp;
1864 2135
1865 $self->enter_link; 2136 $self->enter_link;
1866 2137
1867 (async { 2138 (async {
1868 $self->deactivate_recursive; # just to be sure 2139 $self->deactivate_recursive; # just to be sure
1869 unless (eval { 2140 unless (eval {
1870 prepare_random_map $exit 2141 $self->goto ($slaying, $hp, $sp);
1871 if $exit->slaying eq "/!";
1872
1873 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1874 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1875 2142
1876 1; 2143 1;
1877 }) { 2144 }) {
1878 $self->message ("Something went wrong deep within the crossfire server. " 2145 $self->message ("Something went wrong deep within the crossfire server. "
1879 . "I'll try to bring you back to the map you were before. " 2146 . "I'll try to bring you back to the map you were before. "
1880 . "Please report this to the dungeon master!", 2147 . "Please report this to the dungeon master!",
1881 cf::NDI_UNIQUE | cf::NDI_RED); 2148 cf::NDI_UNIQUE | cf::NDI_RED);
1882 2149
1883 warn "ERROR in enter_exit: $@"; 2150 warn "ERROR in enter_exit: $@";
1884 $self->leave_link; 2151 $self->leave_link;
1885 } 2152 }
1886 })->prio (1); 2153 })->prio (1);
1899 2166
1900sub cf::client::send_drawinfo { 2167sub cf::client::send_drawinfo {
1901 my ($self, $text, $flags) = @_; 2168 my ($self, $text, $flags) = @_;
1902 2169
1903 utf8::encode $text; 2170 utf8::encode $text;
1904 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2171 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1905} 2172}
1906 2173
2174=item $client->ext_event ($type, %msg)
2175
2176Sends an exti event to the client.
2177
2178=cut
2179
2180sub cf::client::ext_event($$%) {
2181 my ($self, $type, %msg) = @_;
2182
2183 $msg{msgtype} = "event_$type";
2184 $self->send_packet ("ext " . cf::to_json \%msg);
2185}
1907 2186
1908=item $success = $client->query ($flags, "text", \&cb) 2187=item $success = $client->query ($flags, "text", \&cb)
1909 2188
1910Queues a query to the client, calling the given callback with 2189Queues a query to the client, calling the given callback with
1911the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2190the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1940 # get handled first 2219 # get handled first
1941 my $queue = delete $ns->{query_queue} 2220 my $queue = delete $ns->{query_queue}
1942 or return; # be conservative, not sure how that can happen, but we saw a crash here 2221 or return; # be conservative, not sure how that can happen, but we saw a crash here
1943 2222
1944 (shift @$queue)->[1]->($msg); 2223 (shift @$queue)->[1]->($msg);
2224 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1945 2225
1946 push @{ $ns->{query_queue} }, @$queue; 2226 push @{ $ns->{query_queue} }, @$queue;
1947 2227
1948 if (@{ $ns->{query_queue} } == @$queue) { 2228 if (@{ $ns->{query_queue} } == @$queue) {
1949 if (@$queue) { 2229 if (@$queue) {
2007 2287
2008# here we export the classes and methods available to script code 2288# here we export the classes and methods available to script code
2009 2289
2010=pod 2290=pod
2011 2291
2012The following fucntions and emthods are available within a safe environment: 2292The following functions and methods are available within a safe environment:
2013 2293
2014 cf::object contr pay_amount pay_player map 2294 cf::object contr pay_amount pay_player map
2015 cf::object::player player 2295 cf::object::player player
2016 cf::player peaceful 2296 cf::player peaceful
2017 cf::map trigger 2297 cf::map trigger
2102############################################################################# 2382#############################################################################
2103 2383
2104=head2 EXTENSION DATABASE SUPPORT 2384=head2 EXTENSION DATABASE SUPPORT
2105 2385
2106Crossfire maintains a very simple database for extension use. It can 2386Crossfire maintains a very simple database for extension use. It can
2107currently store anything that can be serialised using Storable, which 2387currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2108excludes objects. 2388convert to/from binary).
2109 2389
2110The parameter C<$family> should best start with the name of the extension 2390The parameter C<$family> should best start with the name of the extension
2111using it, it should be unique. 2391using it, it should be unique.
2112 2392
2113=over 4 2393=over 4
2114 2394
2115=item $hashref = cf::db_get $family
2116
2117Return a hashref for use by the extension C<$family>, which can be
2118modified. After modifications, you have to call C<cf::db_dirty> or
2119C<cf::db_sync>.
2120
2121=item $value = cf::db_get $family => $key 2395=item $value = cf::db_get $family => $key
2122 2396
2123Returns a single value from the database 2397Returns a single value from the database.
2124
2125=item cf::db_put $family => $hashref
2126
2127Stores the given family hashref into the database. Updates are delayed, if
2128you want the data to be synced to disk immediately, use C<cf::db_sync>.
2129 2398
2130=item cf::db_put $family => $key => $value 2399=item cf::db_put $family => $key => $value
2131 2400
2132Stores the given C<$value> in the family hash. Updates are delayed, if you 2401Stores the given C<$value> in the family.
2133want the data to be synced to disk immediately, use C<cf::db_sync>.
2134
2135=item cf::db_dirty
2136
2137Marks the database as dirty, to be updated at a later time.
2138
2139=item cf::db_sync
2140
2141Immediately write the database to disk I<if it is dirty>.
2142 2402
2143=cut 2403=cut
2144 2404
2145our $DB; 2405our $DB;
2146 2406
2147{ 2407sub db_init {
2148 my $path = cf::localdir . "/database.pst"; 2408 unless ($DB) {
2409 $DB = BDB::db_create $DB_ENV;
2149 2410
2150 sub db_load() { 2411 cf::sync_job {
2151 $DB = stat $path ? Storable::retrieve $path : { }; 2412 eval {
2152 } 2413 $DB->set_flags (BDB::CHKSUM);
2153 2414
2154 my $pid; 2415 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2155 2416 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2156 sub db_save() { 2417 cf::cleanup "db_open(db): $!" if $!;
2157 waitpid $pid, 0 if $pid; 2418 };
2158 if (0 == ($pid = fork)) { 2419 cf::cleanup "db_open(db): $@" if $@;
2159 $DB->{_meta}{version} = 1;
2160 Storable::nstore $DB, "$path~";
2161 rename "$path~", $path;
2162 cf::_exit 0 if defined $pid;
2163 } 2420 };
2164 }
2165
2166 my $dirty;
2167
2168 sub db_sync() {
2169 db_save if $dirty;
2170 undef $dirty;
2171 }
2172
2173 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2174 db_sync;
2175 }); 2421 }
2422}
2176 2423
2177 sub db_dirty() {
2178 $dirty = 1;
2179 $idle->start;
2180 }
2181
2182 sub db_get($;$) { 2424sub db_get($$) {
2183 @_ >= 2 2425 my $key = "$_[0]/$_[1]";
2184 ? $DB->{$_[0]}{$_[1]}
2185 : ($DB->{$_[0]} ||= { })
2186 }
2187 2426
2427 cf::sync_job {
2428 BDB::db_get $DB, undef, $key, my $data;
2429
2430 $! ? ()
2431 : $data
2432 }
2433}
2434
2188 sub db_put($$;$) { 2435sub db_put($$$) {
2189 if (@_ >= 3) { 2436 BDB::dbreq_pri 4;
2190 $DB->{$_[0]}{$_[1]} = $_[2]; 2437 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2191 } else { 2438}
2192 $DB->{$_[0]} = $_[1];
2193 }
2194 db_dirty;
2195 }
2196 2439
2197 cf::global->attach ( 2440=item cf::cache $id => [$paths...], $processversion => $process
2198 prio => 10000, 2441
2199 on_cleanup => sub { 2442Generic caching function that returns the value of the resource $id,
2200 db_sync; 2443caching and regenerating as required.
2444
2445This function can block.
2446
2447=cut
2448
2449sub cache {
2450 my ($id, $src, $processversion, $process) = @_;
2451
2452 my $meta =
2453 join "\x00",
2454 $processversion,
2455 map {
2456 aio_stat $_
2457 and Carp::croak "$_: $!";
2458
2459 ($_, (stat _)[7,9])
2460 } @$src;
2461
2462 my $dbmeta = db_get cache => "$id/meta";
2463 if ($dbmeta ne $meta) {
2464 # changed, we may need to process
2465
2466 my @data;
2467 my $md5;
2468
2469 for (0 .. $#$src) {
2470 0 <= aio_load $src->[$_], $data[$_]
2471 or Carp::croak "$src->[$_]: $!";
2201 }, 2472 }
2202 ); 2473
2474 # if processing is expensive, check
2475 # checksum first
2476 if (1) {
2477 $md5 =
2478 join "\x00",
2479 $processversion,
2480 map {
2481 Coro::cede;
2482 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2483 } 0.. $#$src;
2484
2485
2486 my $dbmd5 = db_get cache => "$id/md5";
2487 if ($dbmd5 eq $md5) {
2488 db_put cache => "$id/meta", $meta;
2489
2490 return db_get cache => "$id/data";
2491 }
2492 }
2493
2494 my $t1 = Time::HiRes::time;
2495 my $data = $process->(\@data);
2496 my $t2 = Time::HiRes::time;
2497
2498 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2499
2500 db_put cache => "$id/data", $data;
2501 db_put cache => "$id/md5" , $md5;
2502 db_put cache => "$id/meta", $meta;
2503
2504 return $data;
2505 }
2506
2507 db_get cache => "$id/data"
2508}
2509
2510=item fork_call { }, $args
2511
2512Executes the given code block with the given arguments in a seperate
2513process, returning the results. Everything must be serialisable with
2514Coro::Storable. May, of course, block. Note that the executed sub may
2515never block itself or use any form of Event handling.
2516
2517=cut
2518
2519sub fork_call(&@) {
2520 my ($cb, @args) = @_;
2521
2522# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2523# or die "socketpair: $!";
2524 pipe my $fh1, my $fh2
2525 or die "pipe: $!";
2526
2527 if (my $pid = fork) {
2528 close $fh2;
2529
2530 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2531 $res = Coro::Storable::thaw $res;
2532
2533 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2534
2535 die $$res unless "ARRAY" eq ref $res;
2536
2537 return wantarray ? @$res : $res->[-1];
2538 } else {
2539 reset_signals;
2540 local $SIG{__WARN__};
2541 local $SIG{__DIE__};
2542 eval {
2543 close $fh1;
2544
2545 my @res = eval { $cb->(@args) };
2546 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2547 };
2548
2549 warn $@ if $@;
2550 _exit 0;
2551 }
2203} 2552}
2204 2553
2205############################################################################# 2554#############################################################################
2206# the server's main() 2555# the server's init and main functions
2556
2557sub load_facedata($) {
2558 my ($path) = @_;
2559
2560 warn "loading facedata from $path\n";
2561
2562 my $facedata;
2563 0 < aio_load $path, $facedata
2564 or die "$path: $!";
2565
2566 $facedata = Coro::Storable::thaw $facedata;
2567
2568 $facedata->{version} == 2
2569 or cf::cleanup "$path: version mismatch, cannot proceed.";
2570
2571 {
2572 my $faces = $facedata->{faceinfo};
2573
2574 while (my ($face, $info) = each %$faces) {
2575 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2576 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2577 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2578 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2579 Coro::cede;
2580 }
2581
2582 while (my ($face, $info) = each %$faces) {
2583 next unless $info->{smooth};
2584 my $idx = cf::face::find $face
2585 or next;
2586 if (my $smooth = cf::face::find $info->{smooth}) {
2587 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2588 } else {
2589 warn "smooth face '$info->{smooth}' not found for face '$face'";
2590 }
2591 Coro::cede;
2592 }
2593 }
2594
2595 {
2596 my $anims = $facedata->{animinfo};
2597
2598 while (my ($anim, $info) = each %$anims) {
2599 cf::anim::set $anim, $info->{frames}, $info->{facings};
2600 Coro::cede;
2601 }
2602
2603 cf::anim::invalidate_all; # d'oh
2604 }
2605
2606 1
2607}
2608
2609sub reload_regions {
2610 load_resource_file "$MAPDIR/regions"
2611 or die "unable to load regions file\n";
2612}
2613
2614sub reload_facedata {
2615 load_facedata "$DATADIR/facedata"
2616 or die "unable to load facedata\n";
2617}
2618
2619sub reload_archetypes {
2620 load_resource_file "$DATADIR/archetypes"
2621 or die "unable to load archetypes\n";
2622}
2623
2624sub reload_treasures {
2625 load_resource_file "$DATADIR/treasures"
2626 or die "unable to load treasurelists\n";
2627}
2628
2629sub reload_resources {
2630 warn "reloading resource files...\n";
2631
2632 reload_regions;
2633 reload_facedata;
2634 #reload_archetypes;#d#
2635 reload_archetypes;
2636 reload_treasures;
2637
2638 warn "finished reloading resource files\n";
2639}
2640
2641sub init {
2642 reload_resources;
2643}
2207 2644
2208sub cfg_load { 2645sub cfg_load {
2209 open my $fh, "<:utf8", cf::confdir . "/config" 2646 open my $fh, "<:utf8", "$CONFDIR/config"
2210 or return; 2647 or return;
2211 2648
2212 local $/; 2649 local $/;
2213 *CFG = YAML::Syck::Load <$fh>; 2650 *CFG = YAML::Syck::Load <$fh>;
2214 2651
2234 Event::one_event; 2671 Event::one_event;
2235 })->prio (Coro::PRIO_MAX); 2672 })->prio (Coro::PRIO_MAX);
2236 }; 2673 };
2237 2674
2238 cfg_load; 2675 cfg_load;
2239 db_load; 2676 db_init;
2240 load_extensions; 2677 load_extensions;
2678
2679 $TICK_WATCHER->start;
2241 Event::loop; 2680 Event::loop;
2242} 2681}
2243 2682
2244############################################################################# 2683#############################################################################
2245# initialisation and cleanup 2684# initialisation and cleanup
2246 2685
2247# install some emergency cleanup handlers 2686# install some emergency cleanup handlers
2248BEGIN { 2687BEGIN {
2249 for my $signal (qw(INT HUP TERM)) { 2688 for my $signal (qw(INT HUP TERM)) {
2250 Event->signal ( 2689 Event->signal (
2690 reentrant => 0,
2251 data => WF_AUTOCANCEL, 2691 data => WF_AUTOCANCEL,
2252 signal => $signal, 2692 signal => $signal,
2693 prio => 0,
2253 cb => sub { 2694 cb => sub {
2254 cf::cleanup "SIG$signal"; 2695 cf::cleanup "SIG$signal";
2255 }, 2696 },
2256 ); 2697 );
2257 } 2698 }
2258} 2699}
2279 my $map = $cf::MAP{$path} or next; 2720 my $map = $cf::MAP{$path} or next;
2280 $map->valid or next; 2721 $map->valid or next;
2281 $map->save; 2722 $map->save;
2282 } 2723 }
2283 warn "end emergency map save\n"; 2724 warn "end emergency map save\n";
2725
2726 warn "begin emergency database checkpoint\n";
2727 BDB::db_env_txn_checkpoint $DB_ENV;
2728 warn "end emergency database checkpoint\n";
2284 }; 2729 };
2285 2730
2286 warn "leave emergency perl save\n"; 2731 warn "leave emergency perl save\n";
2287} 2732}
2288 2733
2734sub post_cleanup {
2735 my ($make_core) = @_;
2736
2737 warn Carp::longmess "post_cleanup backtrace"
2738 if $make_core;
2739}
2740
2289sub reload() { 2741sub do_reload_perl() {
2290 # can/must only be called in main 2742 # can/must only be called in main
2291 if ($Coro::current != $Coro::main) { 2743 if ($Coro::current != $Coro::main) {
2292 warn "can only reload from main coroutine\n"; 2744 warn "can only reload from main coroutine";
2293 return; 2745 return;
2294 } 2746 }
2295 2747
2296 warn "reloading..."; 2748 warn "reloading...";
2297 2749
2298 warn "freezing server"; 2750 warn "entering sync_job";
2299 my $guard = freeze_mainloop; 2751
2752 cf::sync_job {
2753 cf::write_runtime; # external watchdog should not bark
2300 cf::emergency_save; 2754 cf::emergency_save;
2755 cf::write_runtime; # external watchdog should not bark
2301 2756
2302 warn "sync database to disk"; 2757 warn "syncing database to disk";
2303 cf::db_sync; 2758 BDB::db_env_txn_checkpoint $DB_ENV;
2304 IO::AIO::flush;
2305 2759
2306 eval {
2307 # if anything goes wrong in here, we should simply crash as we already saved 2760 # if anything goes wrong in here, we should simply crash as we already saved
2308 2761
2309 warn "cancel all watchers"; 2762 warn "cancelling all WF_AUTOCANCEL watchers";
2310 for (Event::all_watchers) { 2763 for (Event::all_watchers) {
2311 $_->cancel if $_->data & WF_AUTOCANCEL; 2764 $_->cancel if $_->data & WF_AUTOCANCEL;
2312 } 2765 }
2313 2766
2767 warn "flushing outstanding aio requests";
2768 for (;;) {
2769 BDB::flush;
2770 IO::AIO::flush;
2771 Coro::cede;
2772 last unless IO::AIO::nreqs || BDB::nreqs;
2773 warn "iterate...";
2774 }
2775
2776 ++$RELOAD;
2777
2314 warn "cancel all extension coros"; 2778 warn "cancelling all extension coros";
2315 $_->cancel for values %EXT_CORO; 2779 $_->cancel for values %EXT_CORO;
2316 %EXT_CORO = (); 2780 %EXT_CORO = ();
2317 2781
2318 warn "remove commands"; 2782 warn "removing commands";
2319 %COMMAND = (); 2783 %COMMAND = ();
2320 2784
2321 warn "remove ext commands"; 2785 warn "removing ext commands";
2322 %EXTCMD = (); 2786 %EXTCMD = ();
2323 2787
2324 warn "unload/nuke all extensions"; 2788 warn "unloading/nuking all extensions";
2325 for my $pkg (@EXTS) { 2789 for my $pkg (@EXTS) {
2326 warn "... unloading $pkg"; 2790 warn "... unloading $pkg";
2327 2791
2328 if (my $cb = $pkg->can ("unload")) { 2792 if (my $cb = $pkg->can ("unload")) {
2329 eval { 2793 eval {
2334 2798
2335 warn "... nuking $pkg"; 2799 warn "... nuking $pkg";
2336 Symbol::delete_package $pkg; 2800 Symbol::delete_package $pkg;
2337 } 2801 }
2338 2802
2339 warn "unload all perl modules loaded from $LIBDIR"; 2803 warn "unloading all perl modules loaded from $LIBDIR";
2340 while (my ($k, $v) = each %INC) { 2804 while (my ($k, $v) = each %INC) {
2341 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2805 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2342 2806
2343 warn "removing <$k>"; 2807 warn "... unloading $k";
2344 delete $INC{$k}; 2808 delete $INC{$k};
2345 2809
2346 $k =~ s/\.pm$//; 2810 $k =~ s/\.pm$//;
2347 $k =~ s/\//::/g; 2811 $k =~ s/\//::/g;
2348 2812
2351 } 2815 }
2352 2816
2353 Symbol::delete_package $k; 2817 Symbol::delete_package $k;
2354 } 2818 }
2355 2819
2356 warn "get rid of safe::, as good as possible"; 2820 warn "getting rid of safe::, as good as possible";
2357 Symbol::delete_package "safe::$_" 2821 Symbol::delete_package "safe::$_"
2358 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2822 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2359 2823
2360 warn "unload cf.pm \"a bit\""; 2824 warn "unloading cf.pm \"a bit\"";
2361 delete $INC{"cf.pm"}; 2825 delete $INC{"cf.pm"};
2826 delete $INC{"cf/pod.pm"};
2362 2827
2363 # don't, removes xs symbols, too, 2828 # don't, removes xs symbols, too,
2364 # and global variables created in xs 2829 # and global variables created in xs
2365 #Symbol::delete_package __PACKAGE__; 2830 #Symbol::delete_package __PACKAGE__;
2366 2831
2832 warn "unload completed, starting to reload now";
2833
2367 warn "reloading cf.pm"; 2834 warn "reloading cf.pm";
2368 require cf; 2835 require cf;
2369 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2836 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2370 2837
2371 warn "load config and database again"; 2838 warn "loading config and database again";
2372 cf::cfg_load; 2839 cf::cfg_load;
2373 cf::db_load;
2374 2840
2375 warn "load extensions"; 2841 warn "loading extensions";
2376 cf::load_extensions; 2842 cf::load_extensions;
2377 2843
2378 warn "reattach attachments to objects/players"; 2844 warn "reattaching attachments to objects/players";
2379 _global_reattach; 2845 _global_reattach; # objects, sockets
2380 warn "reattach attachments to maps"; 2846 warn "reattaching attachments to maps";
2381 reattach $_ for values %MAP; 2847 reattach $_ for values %MAP;
2382 }; 2848 warn "reattaching attachments to players";
2849 reattach $_ for values %PLAYER;
2383 2850
2384 if ($@) { 2851 warn "leaving sync_job";
2852
2853 1
2854 } or do {
2385 warn $@; 2855 warn $@;
2386 warn "error while reloading, exiting."; 2856 warn "error while reloading, exiting.";
2387 exit 1; 2857 exit 1;
2388 } 2858 };
2389 2859
2390 warn "reloaded"; 2860 warn "reloaded";
2391}; 2861};
2392 2862
2393our $RELOAD_WATCHER; # used only during reload 2863our $RELOAD_WATCHER; # used only during reload
2394 2864
2865sub reload_perl() {
2866 # doing reload synchronously and two reloads happen back-to-back,
2867 # coro crashes during coro_state_free->destroy here.
2868
2869 $RELOAD_WATCHER ||= Event->timer (
2870 reentrant => 0,
2871 after => 0,
2872 data => WF_AUTOCANCEL,
2873 cb => sub {
2874 do_reload_perl;
2875 undef $RELOAD_WATCHER;
2876 },
2877 );
2878}
2879
2395register_command "reload" => sub { 2880register_command "reload" => sub {
2396 my ($who, $arg) = @_; 2881 my ($who, $arg) = @_;
2397 2882
2398 if ($who->flag (FLAG_WIZ)) { 2883 if ($who->flag (FLAG_WIZ)) {
2399 $who->message ("reloading server."); 2884 $who->message ("reloading server.");
2400 2885 async { reload_perl };
2401 # doing reload synchronously and two reloads happen back-to-back,
2402 # coro crashes during coro_state_free->destroy here.
2403
2404 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2405 reload;
2406 undef $RELOAD_WATCHER;
2407 });
2408 } 2886 }
2409}; 2887};
2410 2888
2411unshift @INC, $LIBDIR; 2889unshift @INC, $LIBDIR;
2412 2890
2891my $bug_warning = 0;
2892
2893our @WAIT_FOR_TICK;
2894our @WAIT_FOR_TICK_BEGIN;
2895
2896sub wait_for_tick {
2897 return unless $TICK_WATCHER->is_active;
2898 return if $Coro::current == $Coro::main;
2899
2900 my $signal = new Coro::Signal;
2901 push @WAIT_FOR_TICK, $signal;
2902 $signal->wait;
2903}
2904
2905sub wait_for_tick_begin {
2906 return unless $TICK_WATCHER->is_active;
2907 return if $Coro::current == $Coro::main;
2908
2909 my $signal = new Coro::Signal;
2910 push @WAIT_FOR_TICK_BEGIN, $signal;
2911 $signal->wait;
2912}
2913
2914 my $min = 1e6;#d#
2915 my $avg = 10;
2413$TICK_WATCHER = Event->timer ( 2916$TICK_WATCHER = Event->timer (
2414 reentrant => 0, 2917 reentrant => 0,
2918 parked => 1,
2415 prio => 0, 2919 prio => 0,
2416 at => $NEXT_TICK || $TICK, 2920 at => $NEXT_TICK || $TICK,
2417 data => WF_AUTOCANCEL, 2921 data => WF_AUTOCANCEL,
2418 cb => sub { 2922 cb => sub {
2923 if ($Coro::current != $Coro::main) {
2924 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2925 unless ++$bug_warning > 10;
2926 return;
2927 }
2928
2419 $NOW = Event::time; 2929 $NOW = $tick_start = Event::time;
2420 2930
2421 cf::server_tick; # one server iteration 2931 cf::server_tick; # one server iteration
2932
2933 0 && sync_job {#d#
2934 for(1..10) {
2935 my $t = Event::time;
2936 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2937 or die;
2938
2939 $map->width (50);
2940 $map->height (50);
2941 $map->alloc;
2942 $map->_load_objects ("/tmp/x.map", 1);
2943 my $t = Event::time - $t;
2944
2945 #next unless $t < 0.0013;#d#
2946 if ($t < $min) {
2947 $min = $t;
2948 }
2949 $avg = $avg * 0.99 + $t * 0.01;
2950 }
2951 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2952 exit 0;
2953 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2954 };
2955
2422 $RUNTIME += $TICK; 2956 $RUNTIME += $TICK;
2423 $NEXT_TICK += $TICK; 2957 $NEXT_TICK += $TICK;
2424 2958
2425 $WAIT_FOR_TICK->broadcast; 2959 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2426 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2960 $NEXT_RUNTIME_WRITE = $NOW + 10;
2961 Coro::async_pool {
2962 write_runtime
2963 or warn "ERROR: unable to write runtime file: $!";
2964 };
2965 }
2966
2967# my $AFTER = Event::time;
2968# warn $AFTER - $NOW;#d#
2969
2970 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2971 $sig->send;
2972 }
2973 while (my $sig = shift @WAIT_FOR_TICK) {
2974 $sig->send;
2975 }
2976
2977 $NOW = Event::time;
2427 2978
2428 # if we are delayed by four ticks or more, skip them all 2979 # if we are delayed by four ticks or more, skip them all
2429 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2980 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2430 2981
2431 $TICK_WATCHER->at ($NEXT_TICK); 2982 $TICK_WATCHER->at ($NEXT_TICK);
2432 $TICK_WATCHER->start; 2983 $TICK_WATCHER->start;
2984
2985 $LOAD = ($NOW - $tick_start) / $TICK;
2986 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2987
2988 _post_tick;
2989
2990
2433 }, 2991 },
2434); 2992);
2435 2993
2994{
2995 BDB::max_poll_time $TICK * 0.1;
2996 $BDB_POLL_WATCHER = Event->io (
2997 reentrant => 0,
2998 fd => BDB::poll_fileno,
2999 poll => 'r',
3000 prio => 0,
3001 data => WF_AUTOCANCEL,
3002 cb => \&BDB::poll_cb,
3003 );
3004 BDB::min_parallel 8;
3005
3006 BDB::set_sync_prepare {
3007 my $status;
3008 my $current = $Coro::current;
3009 (
3010 sub {
3011 $status = $!;
3012 $current->ready; undef $current;
3013 },
3014 sub {
3015 Coro::schedule while defined $current;
3016 $! = $status;
3017 },
3018 )
3019 };
3020
3021 unless ($DB_ENV) {
3022 $DB_ENV = BDB::db_env_create;
3023
3024 cf::sync_job {
3025 eval {
3026 BDB::db_env_open
3027 $DB_ENV,
3028 $BDBDIR,
3029 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3030 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3031 0666;
3032
3033 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3034
3035 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3036 $DB_ENV->set_lk_detect;
3037 };
3038
3039 cf::cleanup "db_env_open(db): $@" if $@;
3040 };
3041 }
3042}
3043
3044{
3045 IO::AIO::min_parallel 8;
3046
3047 undef $Coro::AIO::WATCHER;
2436IO::AIO::max_poll_time $TICK * 0.2; 3048 IO::AIO::max_poll_time $TICK * 0.1;
2437
2438$AIO_POLL_WATCHER = Event->io ( 3049 $AIO_POLL_WATCHER = Event->io (
2439 fd => IO::AIO::poll_fileno, 3050 reentrant => 0,
2440 poll => 'r',
2441 prio => 5,
2442 data => WF_AUTOCANCEL,
2443 cb => \&IO::AIO::poll_cb,
2444);
2445
2446$WRITE_RUNTIME_WATCHER = Event->timer (
2447 data => WF_AUTOCANCEL, 3051 data => WF_AUTOCANCEL,
2448 after => 0, 3052 fd => IO::AIO::poll_fileno,
2449 interval => 10, 3053 poll => 'r',
2450 cb => sub { 3054 prio => 6,
2451 (Coro::unblock_sub { 3055 cb => \&IO::AIO::poll_cb,
2452 write_runtime 3056 );
2453 or warn "ERROR: unable to write runtime file: $!"; 3057}
3058
3059my $_log_backtrace;
3060
3061sub _log_backtrace {
3062 my ($msg, @addr) = @_;
3063
3064 $msg =~ s/\n//;
3065
3066 # limit the # of concurrent backtraces
3067 if ($_log_backtrace < 2) {
3068 ++$_log_backtrace;
3069 async {
3070 my @bt = fork_call {
3071 @addr = map { sprintf "%x", $_ } @addr;
3072 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3073 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3074 or die "addr2line: $!";
3075
3076 my @funcs;
3077 my @res = <$fh>;
3078 chomp for @res;
3079 while (@res) {
3080 my ($func, $line) = splice @res, 0, 2, ();
3081 push @funcs, "[$func] $line";
3082 }
3083
3084 @funcs
3085 };
3086
3087 LOG llevInfo, "[ABT] $msg\n";
3088 LOG llevInfo, "[ABT] $_\n" for @bt;
3089 --$_log_backtrace;
2454 })->(); 3090 };
3091 } else {
3092 LOG llevInfo, "[ABT] $msg\n";
3093 LOG llevInfo, "[ABT] [suppressed]\n";
2455 }, 3094 }
2456); 3095}
3096
3097# load additional modules
3098use cf::pod;
2457 3099
2458END { cf::emergency_save } 3100END { cf::emergency_save }
2459 3101
24601 31021
2461 3103

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines