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.203 by root, Thu Feb 1 19:40:42 2007 UTC vs.
Revision 1.271 by root, Fri Jun 1 06:04:08 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.5 (); 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;
87 113
88sub cf::map::normalise; 114sub cf::map::normalise;
89 115
100=item $cf::RUNTIME 126=item $cf::RUNTIME
101 127
102The 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
103every server tick. 129every server tick.
104 130
105=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
106 134
107The perl library directory, where extensions and cf-specific modules can 135Various directories - "/etc", read-only install directory, perl-library
108be 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.
109 139
110=item $cf::NOW 140=item $cf::NOW
111 141
112The time of the last (current) server tick. 142The time of the last (current) server tick.
113 143
114=item $cf::TICK 144=item $cf::TICK
115 145
116The 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.
117 157
118=item %cf::CFG 158=item %cf::CFG
119 159
120Configuration for the server, loaded from C</etc/crossfire/config>, or 160Configuration for the server, loaded from C</etc/crossfire/config>, or
121from wherever your confdir points to. 161from wherever your confdir points to.
122 162
123=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 163=item cf::wait_for_tick, cf::wait_for_tick_begin
124 164
125These 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
126or 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
127processing 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.
128window of cpu time available, or simply to synchronise to the server tick.
129 168
130=back 169=back
131 170
132=cut 171=cut
133 172
134BEGIN { 173BEGIN {
135 *CORE::GLOBAL::warn = sub { 174 *CORE::GLOBAL::warn = sub {
136 my $msg = join "", @_; 175 my $msg = join "", @_;
137 utf8::encode $msg;
138 176
139 $msg .= "\n" 177 $msg .= "\n"
140 unless $msg =~ /\n$/; 178 unless $msg =~ /\n$/;
141 179
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181
182 utf8::encode $msg;
142 LOG llevError, $msg; 183 LOG llevError, $msg;
143 }; 184 };
144} 185}
145 186
146@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
192 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 233 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
193 $d 234 $d
194 } || "[unable to dump $_[0]: '$@']"; 235 } || "[unable to dump $_[0]: '$@']";
195} 236}
196 237
197use JSON::Syck (); # TODO# replace by JSON::PC once working 238use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
198 239
199=item $ref = cf::from_json $json 240=item $ref = cf::from_json $json
200 241
201Converts a JSON string into the corresponding perl data structure. 242Converts a JSON string into the corresponding perl data structure.
202 243
203=cut
204
205sub from_json($) {
206 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
207 JSON::Syck::Load $_[0]
208}
209
210=item $json = cf::to_json $ref 244=item $json = cf::to_json $ref
211 245
212Converts a perl data structure into its JSON representation. 246Converts a perl data structure into its JSON representation.
213
214=cut
215
216sub to_json($) {
217 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
218 JSON::Syck::Dump $_[0]
219}
220 247
221=item cf::lock_wait $string 248=item cf::lock_wait $string
222 249
223Wait until the given lock is available. See cf::lock_acquire. 250Wait until the given lock is available. See cf::lock_acquire.
224 251
230returned. 257returned.
231 258
232Lock names should begin with a unique identifier (for example, cf::map::find 259Lock names should begin with a unique identifier (for example, cf::map::find
233uses map_find and cf::map::load uses map_load). 260uses map_find and cf::map::load uses map_load).
234 261
262=item $locked = cf::lock_active $string
263
264Return true if the lock is currently active, i.e. somebody has locked it.
265
235=cut 266=cut
236 267
237our %LOCK; 268our %LOCK;
238 269
239sub lock_wait($) { 270sub lock_wait($) {
258 # wake up all waiters, to be on the safe side 289 # wake up all waiters, to be on the safe side
259 $_->ready for @{ delete $LOCK{$key} }; 290 $_->ready for @{ delete $LOCK{$key} };
260 } 291 }
261} 292}
262 293
294sub lock_active($) {
295 my ($key) = @_;
296
297 ! ! $LOCK{$key}
298}
299
263sub freeze_mainloop { 300sub freeze_mainloop {
264 return unless $TICK_WATCHER->is_active; 301 return unless $TICK_WATCHER->is_active;
265 302
266 my $guard = Coro::guard { 303 my $guard = Coro::guard {
267 $TICK_WATCHER->start; 304 $TICK_WATCHER->start;
268 $WRITE_RUNTIME_WATCHER->start;
269 }; 305 };
270 $WRITE_RUNTIME_WATCHER->stop;
271 $TICK_WATCHER->stop; 306 $TICK_WATCHER->stop;
272 $guard 307 $guard
273} 308}
274 309
275=item cf::async { BLOCK } 310=item cf::async { BLOCK }
297 332
298sub sync_job(&) { 333sub sync_job(&) {
299 my ($job) = @_; 334 my ($job) = @_;
300 335
301 if ($Coro::current == $Coro::main) { 336 if ($Coro::current == $Coro::main) {
337 my $time = Event::time;
338
302 # this is the main coro, too bad, we have to block 339 # this is the main coro, too bad, we have to block
303 # till the operation succeeds, freezing the server :/ 340 # till the operation succeeds, freezing the server :/
304 341
305 # TODO: use suspend/resume instead 342 # TODO: use suspend/resume instead
306 # (but this is cancel-safe) 343 # (but this is cancel-safe)
317 354
318 while ($busy) { 355 while ($busy) {
319 Coro::cede or Event::one_event; 356 Coro::cede or Event::one_event;
320 } 357 }
321 358
359 $time = Event::time - $time;
360
361 LOG llevError | logBacktrace, Carp::longmess "long sync job"
362 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
363
364 $tick_start += $time; # do not account sync jobs to server load
365
322 wantarray ? @res : $res[0] 366 wantarray ? @res : $res[0]
323 } else { 367 } else {
324 # we are in another coroutine, how wonderful, everything just works 368 # we are in another coroutine, how wonderful, everything just works
325 369
326 $job->() 370 $job->()
346 390
347 $coro 391 $coro
348} 392}
349 393
350sub write_runtime { 394sub write_runtime {
351 my $runtime = cf::localdir . "/runtime"; 395 my $runtime = "$LOCALDIR/runtime";
396
397 # first touch the runtime file to show we are still running:
398 # the fsync below can take a very very long time.
399
400 IO::AIO::aio_utime $runtime, undef, undef;
401
402 my $guard = cf::lock_acquire "write_runtime";
352 403
353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 404 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
354 or return; 405 or return;
355 406
356 my $value = $cf::RUNTIME + 90 + 10; 407 my $value = $cf::RUNTIME + 90 + 10;
358 # 60 allows for the watchdog to kill the server. 409 # 60 allows for the watchdog to kill the server.
359 410
360 (aio_write $fh, 0, (length $value), $value, 0) <= 0 411 (aio_write $fh, 0, (length $value), $value, 0) <= 0
361 and return; 412 and return;
362 413
414 # always fsync - this file is important
363 aio_fsync $fh 415 aio_fsync $fh
364 and return; 416 and return;
365 417
418 # touch it again to show we are up-to-date
419 aio_utime $fh, undef, undef;
420
366 close $fh 421 close $fh
367 or return; 422 or return;
368 423
369 aio_rename "$runtime~", $runtime 424 aio_rename "$runtime~", $runtime
370 and return; 425 and return;
371 426
427 warn "runtime file written.\n";#d#
428
372 1 429 1
430}
431
432=item cf::datalog type => key => value, ...
433
434Log a datalog packet of the given type with the given key-value pairs.
435
436=cut
437
438sub datalog($@) {
439 my ($type, %kv) = @_;
440 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
373} 441}
374 442
375=back 443=back
376 444
377=cut 445=cut
557 $registry = $CB_TYPE[$object_type] ||= []; 625 $registry = $CB_TYPE[$object_type] ||= [];
558 626
559 } elsif ($type eq "subtype") { 627 } elsif ($type eq "subtype") {
560 defined $object_type or Carp::croak "subtype specified without type"; 628 defined $object_type or Carp::croak "subtype specified without type";
561 my $object_subtype = shift @arg; 629 my $object_subtype = shift @arg;
562 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 630 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
563 631
564 } elsif ($type eq "package") { 632 } elsif ($type eq "package") {
565 my $pkg = shift @arg; 633 my $pkg = shift @arg;
566 634
567 while (my ($name, $id) = each %cb_id) { 635 while (my ($name, $id) = each %cb_id) {
608 if (ref $_[0]) { 676 if (ref $_[0]) {
609 _object_attach @_; 677 _object_attach @_;
610 } else { 678 } else {
611 _attach shift->_attach_registry, @_; 679 _attach shift->_attach_registry, @_;
612 } 680 }
681 _recalc_want;
613}; 682};
614 683
615# all those should be optimised 684# all those should be optimised
616sub cf::attachable::detach { 685sub cf::attachable::detach {
617 my ($obj, $name) = @_; 686 my ($obj, $name) = @_;
620 delete $obj->{_attachment}{$name}; 689 delete $obj->{_attachment}{$name};
621 reattach ($obj); 690 reattach ($obj);
622 } else { 691 } else {
623 Carp::croak "cannot, currently, detach class attachments"; 692 Carp::croak "cannot, currently, detach class attachments";
624 } 693 }
694 _recalc_want;
625}; 695};
626 696
627sub cf::attachable::attached { 697sub cf::attachable::attached {
628 my ($obj, $name) = @_; 698 my ($obj, $name) = @_;
629 699
752 $filename, length $$rdata, scalar @$objs; 822 $filename, length $$rdata, scalar @$objs;
753 823
754 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 824 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
755 chmod SAVE_MODE, $fh; 825 chmod SAVE_MODE, $fh;
756 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 826 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
757 aio_fsync $fh; 827 aio_fsync $fh if $cf::USE_FSYNC;
758 close $fh; 828 close $fh;
759 829
760 if (@$objs) { 830 if (@$objs) {
761 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 831 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
762 chmod SAVE_MODE, $fh; 832 chmod SAVE_MODE, $fh;
763 my $data = Storable::nfreeze { version => 1, objs => $objs }; 833 my $data = Storable::nfreeze { version => 1, objs => $objs };
764 aio_write $fh, 0, (length $data), $data, 0; 834 aio_write $fh, 0, (length $data), $data, 0;
765 aio_fsync $fh; 835 aio_fsync $fh if $cf::USE_FSYNC;
766 close $fh; 836 close $fh;
767 aio_rename "$filename.pst~", "$filename.pst"; 837 aio_rename "$filename.pst~", "$filename.pst";
768 } 838 }
769 } else { 839 } else {
770 aio_unlink "$filename.pst"; 840 aio_unlink "$filename.pst";
776 } 846 }
777 } else { 847 } else {
778 aio_unlink $filename; 848 aio_unlink $filename;
779 aio_unlink "$filename.pst"; 849 aio_unlink "$filename.pst";
780 } 850 }
781
782 #d##TODO# nuke non .map-files if exist
783 if ($filename =~ s/\.map$//) {
784 aio_unlink $filename;
785 aio_unlink "$filename.pst";
786 }
787 } 851 }
788} 852}
789 853
790sub object_freezer_as_string { 854sub object_freezer_as_string {
791 my ($rdata, $objs) = @_; 855 my ($rdata, $objs) = @_;
797 861
798sub object_thawer_load { 862sub object_thawer_load {
799 my ($filename) = @_; 863 my ($filename) = @_;
800 864
801 my ($data, $av); 865 my ($data, $av);
802
803 #d#TODO remove .map if file does not exist
804 aio_stat $filename and $filename =~ s/\.map$//;
805 866
806 (aio_load $filename, $data) >= 0 867 (aio_load $filename, $data) >= 0
807 or return; 868 or return;
808 869
809 unless (aio_stat "$filename.pst") { 870 unless (aio_stat "$filename.pst") {
948Returns the given player object, loading it if necessary (might block). 1009Returns the given player object, loading it if necessary (might block).
949 1010
950=cut 1011=cut
951 1012
952sub playerdir($) { 1013sub playerdir($) {
953 cf::localdir 1014 "$PLAYERDIR/"
954 . "/"
955 . cf::playerdir
956 . "/"
957 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1015 . (ref $_[0] ? $_[0]->ob->name : $_[0])
958} 1016}
959 1017
960sub path($) { 1018sub path($) {
961 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1019 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
962 1020
963 (playerdir $login) . "/$login.pl" 1021 (playerdir $login) . "/playerdata"
964} 1022}
965 1023
966sub find_active($) { 1024sub find_active($) {
967 $cf::PLAYER{$_[0]} 1025 $cf::PLAYER{$_[0]}
968 and $cf::PLAYER{$_[0]}->active 1026 and $cf::PLAYER{$_[0]}->active
981 my $login = $_[0]; 1039 my $login = $_[0];
982 1040
983 my $guard = cf::lock_acquire "user_find:$login"; 1041 my $guard = cf::lock_acquire "user_find:$login";
984 1042
985 $cf::PLAYER{$_[0]} || do { 1043 $cf::PLAYER{$_[0]} || do {
1044 # rename old playerfiles to new ones
1045 #TODO: remove when no longer required
1046 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1047 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1048 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1049 aio_unlink +(playerdir $login) . "/$login.pl";
1050
986 my $pl = load_pl path $login 1051 my $pl = load_pl path $login
987 or return; 1052 or return;
988 $cf::PLAYER{$login} = $pl 1053 $cf::PLAYER{$login} = $pl
989 } 1054 }
990 } 1055 }
1027 1092
1028=cut 1093=cut
1029 1094
1030sub quit_character { 1095sub quit_character {
1031 my ($pl) = @_; 1096 my ($pl) = @_;
1097
1098 my $name = $pl->ob->name;
1032 1099
1033 $pl->{deny_save} = 1; 1100 $pl->{deny_save} = 1;
1034 $pl->password ("*"); # this should lock out the player until we nuked the dir 1101 $pl->password ("*"); # this should lock out the player until we nuked the dir
1035 1102
1036 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1103 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1041 my $path = playerdir $pl; 1108 my $path = playerdir $pl;
1042 my $temp = "$path~$cf::RUNTIME~deleting~"; 1109 my $temp = "$path~$cf::RUNTIME~deleting~";
1043 aio_rename $path, $temp; 1110 aio_rename $path, $temp;
1044 delete $cf::PLAYER{$pl->ob->name}; 1111 delete $cf::PLAYER{$pl->ob->name};
1045 $pl->destroy; 1112 $pl->destroy;
1113
1114 my $prefix = qr<^~\Q$name\E/>;
1115
1116 # nuke player maps
1117 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1118
1046 IO::AIO::aio_rmtree $temp; 1119 IO::AIO::aio_rmtree $temp;
1120}
1121
1122=item $pl->kick
1123
1124Kicks a player out of the game. This destroys the connection.
1125
1126=cut
1127
1128sub kick {
1129 my ($pl, $kicker) = @_;
1130
1131 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1132 $pl->killer ("kicked");
1133 $pl->ns->destroy;
1047} 1134}
1048 1135
1049=item cf::player::list_logins 1136=item cf::player::list_logins
1050 1137
1051Returns am arrayref of all valid playernames in the system, can take a 1138Returns am arrayref of all valid playernames in the system, can take a
1052while and may block, so not sync_job-capable, ever. 1139while and may block, so not sync_job-capable, ever.
1053 1140
1054=cut 1141=cut
1055 1142
1056sub list_logins { 1143sub list_logins {
1057 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1144 my $dirs = aio_readdir $PLAYERDIR
1058 or return []; 1145 or return [];
1059 1146
1060 my @logins; 1147 my @logins;
1061 1148
1062 for my $login (@$dirs) { 1149 for my $login (@$dirs) {
1097 } 1184 }
1098 1185
1099 \@paths 1186 \@paths
1100} 1187}
1101 1188
1102=item $player->ext_reply ($msgid, $msgtype, %msg) 1189=item $player->ext_reply ($msgid, %msg)
1103 1190
1104Sends an ext reply to the player. 1191Sends an ext reply to the player.
1105 1192
1106=cut 1193=cut
1107 1194
1108sub ext_reply($$$%) { 1195sub ext_reply($$%) {
1109 my ($self, $id, %msg) = @_; 1196 my ($self, $id, %msg) = @_;
1110 1197
1111 $msg{msgid} = $id; 1198 $msg{msgid} = $id;
1112 1199
1113 $self->send ("ext " . cf::to_json \%msg); 1200 $self->send ("ext " . cf::to_json \%msg);
1114} 1201}
1115 1202
1116package cf; 1203=item $player->ext_event ($type, %msg)
1204
1205Sends an ext event to the client.
1206
1207=cut
1208
1209sub ext_event($$%) {
1210 my ($self, $type, %msg) = @_;
1211
1212 $self->ns->ext_event ($type, %msg);
1213}
1214
1215=head3 cf::region
1216
1217=over 4
1218
1219=cut
1220
1221package cf::region;
1222
1223=item cf::region::find_by_path $path
1224
1225Tries to decuce the probable region for a map knowing only its path.
1226
1227=cut
1228
1229sub find_by_path($) {
1230 my ($path) = @_;
1231
1232 my ($match, $specificity);
1233
1234 for my $region (list) {
1235 if ($region->match && $path =~ $region->match) {
1236 ($match, $specificity) = ($region, $region->specificity)
1237 if $region->specificity > $specificity;
1238 }
1239 }
1240
1241 $match
1242}
1117 1243
1118=back 1244=back
1119
1120 1245
1121=head3 cf::map 1246=head3 cf::map
1122 1247
1123=over 4 1248=over 4
1124 1249
1262 1387
1263# the original (read-only) location 1388# the original (read-only) location
1264sub load_path { 1389sub load_path {
1265 my ($self) = @_; 1390 my ($self) = @_;
1266 1391
1267 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1392 "$MAPDIR/$self->{path}.map"
1268} 1393}
1269 1394
1270# the temporary/swap location 1395# the temporary/swap location
1271sub save_path { 1396sub save_path {
1272 my ($self) = @_; 1397 my ($self) = @_;
1273 1398
1274 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1399 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1275 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1400 "$TMPDIR/$path.map"
1276} 1401}
1277 1402
1278# the unique path, undef == no special unique path 1403# the unique path, undef == no special unique path
1279sub uniq_path { 1404sub uniq_path {
1280 my ($self) = @_; 1405 my ($self) = @_;
1281 1406
1282 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1407 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1283 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1408 "$UNIQUEDIR/$path"
1284} 1409}
1285 1410
1286# and all this just because we cannot iterate over 1411# and all this just because we cannot iterate over
1287# all maps in C++... 1412# all maps in C++...
1288sub change_all_map_light { 1413sub change_all_map_light {
1296 my ($self) = @_; 1421 my ($self) = @_;
1297 1422
1298 utf8::encode (my $save = $self->save_path); 1423 utf8::encode (my $save = $self->save_path);
1299 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1424 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1300 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1425 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1301
1302 #d#TODO remove .map and also nuke
1303 $save =~ s/\.map// or return;#d#
1304 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1305 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1306} 1426}
1307 1427
1308sub load_header_from($) { 1428sub load_header_from($) {
1309 my ($self, $path) = @_; 1429 my ($self, $path) = @_;
1310 1430
1360 $self->load_header_orig 1480 $self->load_header_orig
1361 or return; 1481 or return;
1362 $self->prepare_orig; 1482 $self->prepare_orig;
1363 } 1483 }
1364 1484
1485 $self->default_region (cf::region::find_by_path $self->{path})
1486 unless $self->default_region;
1487
1365 1 1488 1
1366} 1489}
1367 1490
1368sub find; 1491sub find;
1369sub find { 1492sub find {
1402 my ($self) = @_; 1525 my ($self) = @_;
1403 1526
1404 local $self->{deny_reset} = 1; # loading can take a long time 1527 local $self->{deny_reset} = 1; # loading can take a long time
1405 1528
1406 my $path = $self->{path}; 1529 my $path = $self->{path};
1530
1531 {
1407 my $guard = cf::lock_acquire "map_load:$path"; 1532 my $guard = cf::lock_acquire "map_load:$path";
1408 1533
1409 return if $self->in_memory != cf::MAP_SWAPPED; 1534 return if $self->in_memory != cf::MAP_SWAPPED;
1410 1535
1411 $self->in_memory (cf::MAP_LOADING); 1536 $self->in_memory (cf::MAP_LOADING);
1412 1537
1413 $self->alloc; 1538 $self->alloc;
1414 1539
1415 $self->pre_load; 1540 $self->pre_load;
1416
1417 $self->_load_objects ($self->{load_path}, 1)
1418 or return;
1419
1420 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1421 if delete $self->{load_original};
1422
1423 if (my $uniq = $self->uniq_path) {
1424 utf8::encode $uniq;
1425 if (aio_open $uniq, O_RDONLY, 0) {
1426 $self->clear_unique_items;
1427 $self->_load_objects ($uniq, 0);
1428 }
1429 }
1430
1431 Coro::cede;
1432
1433 # now do the right thing for maps
1434 $self->link_multipart_objects;
1435
1436 unless ($self->{deny_activate}) {
1437 $self->decay_objects;
1438 $self->fix_auto_apply;
1439 $self->update_buttons;
1440 Coro::cede; 1541 Coro::cede;
1441 $self->set_darkness_map; 1542
1543 $self->_load_objects ($self->{load_path}, 1)
1544 or return;
1545
1546 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1547 if delete $self->{load_original};
1548
1549 if (my $uniq = $self->uniq_path) {
1550 utf8::encode $uniq;
1551 if (aio_open $uniq, O_RDONLY, 0) {
1552 $self->clear_unique_items;
1553 $self->_load_objects ($uniq, 0);
1554 }
1555 }
1556
1557 Coro::cede;
1558 # now do the right thing for maps
1559 $self->link_multipart_objects;
1442 $self->difficulty ($self->estimate_difficulty) 1560 $self->difficulty ($self->estimate_difficulty)
1443 unless $self->difficulty; 1561 unless $self->difficulty;
1444 Coro::cede; 1562 Coro::cede;
1563
1564 unless ($self->{deny_activate}) {
1565 $self->decay_objects;
1566 $self->fix_auto_apply;
1567 $self->update_buttons;
1568 Coro::cede;
1569 $self->set_darkness_map;
1570 Coro::cede;
1445 $self->activate; 1571 $self->activate;
1572 }
1573
1574 $self->in_memory (cf::MAP_IN_MEMORY);
1446 } 1575 }
1447 1576
1448 $self->post_load; 1577 $self->post_load;
1449
1450 $self->in_memory (cf::MAP_IN_MEMORY);
1451} 1578}
1452 1579
1453sub customise_for { 1580sub customise_for {
1454 my ($self, $ob) = @_; 1581 my ($self, $ob) = @_;
1455 1582
1598 return if $self->players; 1725 return if $self->players;
1599 return if $self->isa ("ext::map_per_player");#d# 1726 return if $self->isa ("ext::map_per_player");#d#
1600 1727
1601 warn "resetting map ", $self->path;#d# 1728 warn "resetting map ", $self->path;#d#
1602 1729
1730 $self->in_memory (cf::MAP_SWAPPED);
1731
1732 # need to save uniques path
1733 unless ($self->{deny_save}) {
1734 my $uniq = $self->uniq_path; utf8::encode $uniq;
1735
1736 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1737 if $uniq;
1738 }
1739
1603 delete $cf::MAP{$self->path}; 1740 delete $cf::MAP{$self->path};
1604 1741
1605 $self->in_memory (cf::MAP_SWAPPED);
1606 $self->clear; 1742 $self->clear;
1607 1743
1608 $_->clear_links_to ($self) for values %cf::MAP; 1744 $_->clear_links_to ($self) for values %cf::MAP;
1609 1745
1610 $self->unlink_save; 1746 $self->unlink_save;
1637instantiated unique items. May block. 1773instantiated unique items. May block.
1638 1774
1639=cut 1775=cut
1640 1776
1641sub unique_maps() { 1777sub unique_maps() {
1642 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1778 my $files = aio_readdir $UNIQUEDIR
1643 or return; 1779 or return;
1644 1780
1645 my @paths; 1781 my @paths;
1646 1782
1647 for (@$files) { 1783 for (@$files) {
1766 $self->deactivate_recursive; 1902 $self->deactivate_recursive;
1767 1903
1768 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1904 return if UNIVERSAL::isa $self->map, "ext::map_link";
1769 1905
1770 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1906 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1771 if $self->map; 1907 if $self->map && $self->map->{path} ne "{link}";
1772 1908
1773 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1909 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1774} 1910}
1775 1911
1776sub cf::object::player::leave_link { 1912sub cf::object::player::leave_link {
1777 my ($self, $map, $x, $y) = @_; 1913 my ($self, $map, $x, $y) = @_;
1914
1915 return unless $self->contr->active;
1778 1916
1779 my $link_pos = delete $self->{_link_pos}; 1917 my $link_pos = delete $self->{_link_pos};
1780 1918
1781 unless ($map) { 1919 unless ($map) {
1782 # restore original map position 1920 # restore original map position
1800 $map->load; 1938 $map->load;
1801 $map->load_diag; 1939 $map->load_diag;
1802 1940
1803 return unless $self->contr->active; 1941 return unless $self->contr->active;
1804 $self->activate_recursive; 1942 $self->activate_recursive;
1943
1944 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1805 $self->enter_map ($map, $x, $y); 1945 $self->enter_map ($map, $x, $y);
1806} 1946}
1807 1947
1808cf::player->attach (
1809 on_logout => sub {
1810 my ($pl) = @_;
1811
1812 # abort map switching before logout
1813 if ($pl->ob->{_link_pos}) {
1814 cf::sync_job {
1815 $pl->ob->leave_link
1816 };
1817 }
1818 },
1819 on_login => sub {
1820 my ($pl) = @_;
1821
1822 # try to abort aborted map switching on player login :)
1823 # should happen only on crashes
1824 if ($pl->ob->{_link_pos}) {
1825 $pl->ob->enter_link;
1826 (async {
1827 # we need this sleep as the login has a concurrent enter_exit running
1828 # and this sleep increases chances of the player not ending up in scorn
1829 $pl->ob->reply (undef,
1830 "There was an internal problem at your last logout, "
1831 . "the server will try to bring you to your intended destination in a second.",
1832 cf::NDI_RED);
1833 Coro::Timer::sleep 1;
1834 $pl->ob->leave_link;
1835 })->prio (2);
1836 }
1837 },
1838);
1839
1840=item $player_object->goto ($path, $x, $y) 1948=item $player_object->goto ($path, $x, $y[, $check->($map)])
1841 1949
1950Moves the player to the given map-path and coordinates by first freezing
1951her, loading and preparing them map, calling the provided $check callback
1952that has to return the map if sucecssful, and then unfreezes the player on
1953the new (success) or old (failed) map position.
1954
1842=cut 1955=cut
1956
1957our $GOTOGEN;
1843 1958
1844sub cf::object::player::goto { 1959sub cf::object::player::goto {
1845 my ($self, $path, $x, $y) = @_; 1960 my ($self, $path, $x, $y, $check) = @_;
1961
1962 # do generation counting so two concurrent goto's will be executed in-order
1963 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1846 1964
1847 $self->enter_link; 1965 $self->enter_link;
1848 1966
1849 (async { 1967 (async {
1850 my $map = eval { 1968 my $map = eval {
1851 my $map = cf::map::find $path; 1969 my $map = cf::map::find $path;
1970
1971 if ($map) {
1852 $map = $map->customise_for ($self) if $map; 1972 $map = $map->customise_for ($self);
1973 $map = $check->($map) if $check && $map;
1974 } else {
1975 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1976 }
1977
1853 $map 1978 $map
1979 };
1980
1981 if ($@) {
1982 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
1983 LOG llevError | logBacktrace, Carp::longmess $@;
1854 } or 1984 }
1855 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1856 1985
1986 if ($gen == $self->{_goto_generation}) {
1987 delete $self->{_goto_generation};
1857 $self->leave_link ($map, $x, $y); 1988 $self->leave_link ($map, $x, $y);
1989 }
1858 })->prio (1); 1990 })->prio (1);
1859} 1991}
1860 1992
1861=item $player_object->enter_exit ($exit_object) 1993=item $player_object->enter_exit ($exit_object)
1862 1994
1901 2033
1902 $rmp->{random_seed} ||= $exit->random_seed; 2034 $rmp->{random_seed} ||= $exit->random_seed;
1903 2035
1904 my $data = cf::to_json $rmp; 2036 my $data = cf::to_json $rmp;
1905 my $md5 = Digest::MD5::md5_hex $data; 2037 my $md5 = Digest::MD5::md5_hex $data;
1906 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2038 my $meta = "$RANDOMDIR/$md5.meta";
1907 2039
1908 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2040 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1909 aio_write $fh, 0, (length $data), $data, 0; 2041 aio_write $fh, 0, (length $data), $data, 0;
1910 undef $fh; 2042 undef $fh;
1911 aio_rename "$meta~", $meta; 2043 aio_rename "$meta~", $meta;
1920 2052
1921 return unless $self->type == cf::PLAYER; 2053 return unless $self->type == cf::PLAYER;
1922 2054
1923 if ($exit->slaying eq "/!") { 2055 if ($exit->slaying eq "/!") {
1924 #TODO: this should de-fi-ni-te-ly not be a sync-job 2056 #TODO: this should de-fi-ni-te-ly not be a sync-job
2057 # the problem is that $exit might not survive long enough
2058 # so it needs to be done right now, right here
1925 cf::sync_job { prepare_random_map $exit }; 2059 cf::sync_job { prepare_random_map $exit };
1926 } 2060 }
1927 2061
1928 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2062 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1929 my $hp = $exit->stats->hp; 2063 my $hp = $exit->stats->hp;
1937 $self->goto ($slaying, $hp, $sp); 2071 $self->goto ($slaying, $hp, $sp);
1938 2072
1939 1; 2073 1;
1940 }) { 2074 }) {
1941 $self->message ("Something went wrong deep within the crossfire server. " 2075 $self->message ("Something went wrong deep within the crossfire server. "
1942 . "I'll try to bring you back to the map you were before. " 2076 . "I'll try to bring you back to the map you were before. "
1943 . "Please report this to the dungeon master!", 2077 . "Please report this to the dungeon master!",
1944 cf::NDI_UNIQUE | cf::NDI_RED); 2078 cf::NDI_UNIQUE | cf::NDI_RED);
1945 2079
1946 warn "ERROR in enter_exit: $@"; 2080 warn "ERROR in enter_exit: $@";
1947 $self->leave_link; 2081 $self->leave_link;
1948 } 2082 }
1949 })->prio (1); 2083 })->prio (1);
1962 2096
1963sub cf::client::send_drawinfo { 2097sub cf::client::send_drawinfo {
1964 my ($self, $text, $flags) = @_; 2098 my ($self, $text, $flags) = @_;
1965 2099
1966 utf8::encode $text; 2100 utf8::encode $text;
1967 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2101 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1968} 2102}
1969 2103
2104=item $client->ext_event ($type, %msg)
2105
2106Sends an exti event to the client.
2107
2108=cut
2109
2110sub cf::client::ext_event($$%) {
2111 my ($self, $type, %msg) = @_;
2112
2113 $msg{msgtype} = "event_$type";
2114 $self->send_packet ("ext " . cf::to_json \%msg);
2115}
1970 2116
1971=item $success = $client->query ($flags, "text", \&cb) 2117=item $success = $client->query ($flags, "text", \&cb)
1972 2118
1973Queues a query to the client, calling the given callback with 2119Queues a query to the client, calling the given callback with
1974the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2120the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2071 2217
2072# here we export the classes and methods available to script code 2218# here we export the classes and methods available to script code
2073 2219
2074=pod 2220=pod
2075 2221
2076The following fucntions and emthods are available within a safe environment: 2222The following functions and methods are available within a safe environment:
2077 2223
2078 cf::object contr pay_amount pay_player map 2224 cf::object contr pay_amount pay_player map
2079 cf::object::player player 2225 cf::object::player player
2080 cf::player peaceful 2226 cf::player peaceful
2081 cf::map trigger 2227 cf::map trigger
2166############################################################################# 2312#############################################################################
2167 2313
2168=head2 EXTENSION DATABASE SUPPORT 2314=head2 EXTENSION DATABASE SUPPORT
2169 2315
2170Crossfire maintains a very simple database for extension use. It can 2316Crossfire maintains a very simple database for extension use. It can
2171currently store anything that can be serialised using Storable, which 2317currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2172excludes objects. 2318convert to/from binary).
2173 2319
2174The parameter C<$family> should best start with the name of the extension 2320The parameter C<$family> should best start with the name of the extension
2175using it, it should be unique. 2321using it, it should be unique.
2176 2322
2177=over 4 2323=over 4
2178 2324
2179=item $hashref = cf::db_get $family
2180
2181Return a hashref for use by the extension C<$family>, which can be
2182modified. After modifications, you have to call C<cf::db_dirty> or
2183C<cf::db_sync>.
2184
2185=item $value = cf::db_get $family => $key 2325=item $value = cf::db_get $family => $key
2186 2326
2187Returns a single value from the database 2327Returns a single value from the database.
2188
2189=item cf::db_put $family => $hashref
2190
2191Stores the given family hashref into the database. Updates are delayed, if
2192you want the data to be synced to disk immediately, use C<cf::db_sync>.
2193 2328
2194=item cf::db_put $family => $key => $value 2329=item cf::db_put $family => $key => $value
2195 2330
2196Stores the given C<$value> in the family hash. Updates are delayed, if you 2331Stores the given C<$value> in the family.
2197want the data to be synced to disk immediately, use C<cf::db_sync>.
2198
2199=item cf::db_dirty
2200
2201Marks the database as dirty, to be updated at a later time.
2202
2203=item cf::db_sync
2204
2205Immediately write the database to disk I<if it is dirty>.
2206 2332
2207=cut 2333=cut
2208 2334
2209our $DB; 2335our $DB;
2210 2336
2211{ 2337sub db_init {
2212 my $path = cf::localdir . "/database.pst"; 2338 unless ($DB) {
2339 $DB = BDB::db_create $DB_ENV;
2213 2340
2214 sub db_load() { 2341 cf::sync_job {
2215 $DB = stat $path ? Storable::retrieve $path : { }; 2342 eval {
2216 } 2343 $DB->set_flags (BDB::CHKSUM);
2217 2344
2218 my $pid; 2345 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2219 2346 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2220 sub db_save() { 2347 cf::cleanup "db_open(db): $!" if $!;
2221 waitpid $pid, 0 if $pid; 2348 };
2222 if (0 == ($pid = fork)) { 2349 cf::cleanup "db_open(db): $@" if $@;
2223 $DB->{_meta}{version} = 1;
2224 Storable::nstore $DB, "$path~";
2225 rename "$path~", $path;
2226 cf::_exit 0 if defined $pid;
2227 } 2350 };
2228 } 2351 }
2352}
2229 2353
2230 my $dirty;
2231
2232 sub db_sync() {
2233 db_save if $dirty;
2234 undef $dirty;
2235 }
2236
2237 my $idle = Event->idle (
2238 reentrant => 0,
2239 min => 10,
2240 max => 20,
2241 repeat => 0,
2242 data => WF_AUTOCANCEL,
2243 cb => \&db_sync,
2244 );
2245
2246 sub db_dirty() {
2247 $dirty = 1;
2248 $idle->start;
2249 }
2250
2251 sub db_get($;$) { 2354sub db_get($$) {
2252 @_ >= 2 2355 my $key = "$_[0]/$_[1]";
2253 ? $DB->{$_[0]}{$_[1]}
2254 : ($DB->{$_[0]} ||= { })
2255 }
2256 2356
2357 cf::sync_job {
2358 BDB::db_get $DB, undef, $key, my $data;
2359
2360 $! ? ()
2361 : $data
2362 }
2363}
2364
2257 sub db_put($$;$) { 2365sub db_put($$$) {
2258 if (@_ >= 3) { 2366 BDB::dbreq_pri 4;
2259 $DB->{$_[0]}{$_[1]} = $_[2]; 2367 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2260 } else { 2368}
2261 $DB->{$_[0]} = $_[1];
2262 }
2263 db_dirty;
2264 }
2265 2369
2266 cf::global->attach ( 2370=item cf::cache $id => [$paths...], $processversion => $process
2267 prio => 10000, 2371
2268 on_cleanup => sub { 2372Generic caching function that returns the value of the resource $id,
2269 db_sync; 2373caching and regenerating as required.
2374
2375This function can block.
2376
2377=cut
2378
2379sub cache {
2380 my ($id, $src, $processversion, $process) = @_;
2381
2382 my $meta =
2383 join "\x00",
2384 $processversion,
2385 map {
2386 aio_stat $_
2387 and Carp::croak "$_: $!";
2388
2389 ($_, (stat _)[7,9])
2390 } @$src;
2391
2392 my $dbmeta = db_get cache => "$id/meta";
2393 if ($dbmeta ne $meta) {
2394 # changed, we may need to process
2395
2396 my @data;
2397 my $md5;
2398
2399 for (0 .. $#$src) {
2400 0 <= aio_load $src->[$_], $data[$_]
2401 or Carp::croak "$src->[$_]: $!";
2270 }, 2402 }
2271 ); 2403
2404 # if processing is expensive, check
2405 # checksum first
2406 if (1) {
2407 $md5 =
2408 join "\x00",
2409 $processversion,
2410 map {
2411 Coro::cede;
2412 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2413 } 0.. $#$src;
2414
2415
2416 my $dbmd5 = db_get cache => "$id/md5";
2417 if ($dbmd5 eq $md5) {
2418 db_put cache => "$id/meta", $meta;
2419
2420 return db_get cache => "$id/data";
2421 }
2422 }
2423
2424 my $t1 = Time::HiRes::time;
2425 my $data = $process->(\@data);
2426 my $t2 = Time::HiRes::time;
2427
2428 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2429
2430 db_put cache => "$id/data", $data;
2431 db_put cache => "$id/md5" , $md5;
2432 db_put cache => "$id/meta", $meta;
2433
2434 return $data;
2435 }
2436
2437 db_get cache => "$id/data"
2438}
2439
2440=item fork_call { }, $args
2441
2442Executes the given code block with the given arguments in a seperate
2443process, returning the results. Everything must be serialisable with
2444Coro::Storable. May, of course, block. Note that the executed sub may
2445never block itself or use any form of Event handling.
2446
2447=cut
2448
2449sub fork_call(&@) {
2450 my ($cb, @args) = @_;
2451
2452# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2453# or die "socketpair: $!";
2454 pipe my $fh1, my $fh2
2455 or die "pipe: $!";
2456
2457 if (my $pid = fork) {
2458 close $fh2;
2459
2460 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2461 $res = Coro::Storable::thaw $res;
2462
2463 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2464
2465 die $$res unless "ARRAY" eq ref $res;
2466
2467 return wantarray ? @$res : $res->[-1];
2468 } else {
2469 reset_signals;
2470 local $SIG{__WARN__};
2471 local $SIG{__DIE__};
2472 eval {
2473 close $fh1;
2474
2475 my @res = eval { $cb->(@args) };
2476 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2477 };
2478
2479 warn $@ if $@;
2480 _exit 0;
2481 }
2272} 2482}
2273 2483
2274############################################################################# 2484#############################################################################
2275# the server's init and main functions 2485# the server's init and main functions
2276 2486
2277sub load_resources { 2487sub load_facedata($) {
2278 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2488 my ($path) = @_;
2489
2490 warn "loading facedata from $path\n";
2491
2492 my $facedata;
2493 0 < aio_load $path, $facedata
2494 or die "$path: $!";
2495
2496 $facedata = Coro::Storable::thaw $facedata;
2497
2498 $facedata->{version} == 2
2499 or cf::cleanup "$path: version mismatch, cannot proceed.";
2500
2501 {
2502 my $faces = $facedata->{faceinfo};
2503
2504 while (my ($face, $info) = each %$faces) {
2505 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2506 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2507 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2508 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2509 Coro::cede;
2510 }
2511
2512 while (my ($face, $info) = each %$faces) {
2513 next unless $info->{smooth};
2514 my $idx = cf::face::find $face
2515 or next;
2516 if (my $smooth = cf::face::find $info->{smooth}) {
2517 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2518 } else {
2519 warn "smooth face '$info->{smooth}' not found for face '$face'";
2520 }
2521 Coro::cede;
2522 }
2523 }
2524
2525 {
2526 my $anims = $facedata->{animinfo};
2527
2528 while (my ($anim, $info) = each %$anims) {
2529 cf::anim::set $anim, $info->{frames}, $info->{facings};
2530 Coro::cede;
2531 }
2532
2533 cf::anim::invalidate_all; # d'oh
2534 }
2535
2536 1
2537}
2538
2539sub reload_regions {
2540 load_resource_file "$MAPDIR/regions"
2279 or die "unable to load regions file\n";#d# 2541 or die "unable to load regions file\n";
2542}
2543
2544sub reload_facedata {
2545 load_facedata "$DATADIR/facedata"
2546 or die "unable to load facedata\n";
2547}
2548
2549sub reload_archetypes {
2550 load_resource_file "$DATADIR/archetypes"
2551 or die "unable to load archetypes\n";
2552}
2553
2554sub reload_treasures {
2555 load_resource_file "$DATADIR/treasures"
2556 or die "unable to load treasurelists\n";
2557}
2558
2559sub reload_resources {
2560 warn "reloading resource files...\n";
2561
2562 reload_regions;
2563 reload_facedata;
2564 reload_archetypes;
2565 reload_treasures;
2566
2567 warn "finished reloading resource files\n";
2568}
2569
2570sub init {
2571 reload_resources;
2280} 2572}
2281 2573
2282sub cfg_load { 2574sub cfg_load {
2283 open my $fh, "<:utf8", cf::confdir . "/config" 2575 open my $fh, "<:utf8", "$CONFDIR/config"
2284 or return; 2576 or return;
2285 2577
2286 local $/; 2578 local $/;
2287 *CFG = YAML::Syck::Load <$fh>; 2579 *CFG = YAML::Syck::Load <$fh>;
2288 2580
2296 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2588 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2297 and die "WARNING: m(un)lockall failed: $!\n"; 2589 and die "WARNING: m(un)lockall failed: $!\n";
2298 }; 2590 };
2299 warn $@ if $@; 2591 warn $@ if $@;
2300 } 2592 }
2301}
2302
2303sub init {
2304 load_resources;
2305} 2593}
2306 2594
2307sub main { 2595sub main {
2308 # we must not ever block the main coroutine 2596 # we must not ever block the main coroutine
2309 local $Coro::idle = sub { 2597 local $Coro::idle = sub {
2312 Event::one_event; 2600 Event::one_event;
2313 })->prio (Coro::PRIO_MAX); 2601 })->prio (Coro::PRIO_MAX);
2314 }; 2602 };
2315 2603
2316 cfg_load; 2604 cfg_load;
2317 db_load; 2605 db_init;
2318 load_extensions; 2606 load_extensions;
2319 2607
2320 $TICK_WATCHER->start; 2608 $TICK_WATCHER->start;
2321 Event::loop; 2609 Event::loop;
2322} 2610}
2361 my $map = $cf::MAP{$path} or next; 2649 my $map = $cf::MAP{$path} or next;
2362 $map->valid or next; 2650 $map->valid or next;
2363 $map->save; 2651 $map->save;
2364 } 2652 }
2365 warn "end emergency map save\n"; 2653 warn "end emergency map save\n";
2654
2655 warn "begin emergency database checkpoint\n";
2656 BDB::db_env_txn_checkpoint $DB_ENV;
2657 warn "end emergency database checkpoint\n";
2366 }; 2658 };
2367 2659
2368 warn "leave emergency perl save\n"; 2660 warn "leave emergency perl save\n";
2369} 2661}
2370 2662
2663sub post_cleanup {
2664 my ($make_core) = @_;
2665
2666 warn Carp::longmess "post_cleanup backtrace"
2667 if $make_core;
2668}
2669
2371sub reload() { 2670sub do_reload_perl() {
2372 # can/must only be called in main 2671 # can/must only be called in main
2373 if ($Coro::current != $Coro::main) { 2672 if ($Coro::current != $Coro::main) {
2374 warn "can only reload from main coroutine"; 2673 warn "can only reload from main coroutine";
2375 return; 2674 return;
2376 } 2675 }
2377 2676
2378 warn "reloading..."; 2677 warn "reloading...";
2379 2678
2380 warn "cancelling server ticker"; 2679 warn "entering sync_job";
2381 $TICK_WATCHER->cancel;
2382 2680
2681 cf::sync_job {
2682 cf::write_runtime; # external watchdog should not bark
2383 cf::emergency_save; 2683 cf::emergency_save;
2684 cf::write_runtime; # external watchdog should not bark
2384 2685
2385 eval { 2686 warn "syncing database to disk";
2687 BDB::db_env_txn_checkpoint $DB_ENV;
2688
2386 # if anything goes wrong in here, we should simply crash as we already saved 2689 # if anything goes wrong in here, we should simply crash as we already saved
2387
2388 warn "syncing database to disk";
2389 cf::db_sync;
2390 2690
2391 warn "cancelling all WF_AUTOCANCEL watchers"; 2691 warn "cancelling all WF_AUTOCANCEL watchers";
2392 for (Event::all_watchers) { 2692 for (Event::all_watchers) {
2393 $_->cancel if $_->data & WF_AUTOCANCEL; 2693 $_->cancel if $_->data & WF_AUTOCANCEL;
2394 } 2694 }
2395 2695
2396 warn "flushing outstanding aio requests"; 2696 warn "flushing outstanding aio requests";
2397 for (;;) { 2697 for (;;) {
2698 BDB::flush;
2398 IO::AIO::flush; 2699 IO::AIO::flush;
2399 Coro::cede; 2700 Coro::cede;
2400 last unless IO::AIO::nreqs; 2701 last unless IO::AIO::nreqs || BDB::nreqs;
2401 warn "iterate..."; 2702 warn "iterate...";
2402 } 2703 }
2704
2705 ++$RELOAD;
2403 2706
2404 warn "cancelling all extension coros"; 2707 warn "cancelling all extension coros";
2405 $_->cancel for values %EXT_CORO; 2708 $_->cancel for values %EXT_CORO;
2406 %EXT_CORO = (); 2709 %EXT_CORO = ();
2407 2710
2447 Symbol::delete_package "safe::$_" 2750 Symbol::delete_package "safe::$_"
2448 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2751 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2449 2752
2450 warn "unloading cf.pm \"a bit\""; 2753 warn "unloading cf.pm \"a bit\"";
2451 delete $INC{"cf.pm"}; 2754 delete $INC{"cf.pm"};
2755 delete $INC{"cf/pod.pm"};
2452 2756
2453 # don't, removes xs symbols, too, 2757 # don't, removes xs symbols, too,
2454 # and global variables created in xs 2758 # and global variables created in xs
2455 #Symbol::delete_package __PACKAGE__; 2759 #Symbol::delete_package __PACKAGE__;
2456 2760
2460 require cf; 2764 require cf;
2461 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2765 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2462 2766
2463 warn "loading config and database again"; 2767 warn "loading config and database again";
2464 cf::cfg_load; 2768 cf::cfg_load;
2465 cf::db_load;
2466 2769
2467 warn "loading extensions"; 2770 warn "loading extensions";
2468 cf::load_extensions; 2771 cf::load_extensions;
2469 2772
2470 warn "reattaching attachments to objects/players"; 2773 warn "reattaching attachments to objects/players";
2471 _global_reattach; 2774 _global_reattach; # objects, sockets
2472 warn "reattaching attachments to maps"; 2775 warn "reattaching attachments to maps";
2473 reattach $_ for values %MAP; 2776 reattach $_ for values %MAP;
2777 warn "reattaching attachments to players";
2778 reattach $_ for values %PLAYER;
2474 2779
2475 warn "loading reloadable resources"; 2780 warn "leaving sync_job";
2476 load_resources;
2477 2781
2478 warn "restarting server ticker"; 2782 1
2479 2783 } or do {
2480 $TICK_WATCHER->start;
2481 };
2482
2483 if ($@) {
2484 warn $@; 2784 warn $@;
2485 warn "error while reloading, exiting."; 2785 warn "error while reloading, exiting.";
2486 exit 1; 2786 exit 1;
2487 } 2787 };
2488 2788
2489 warn "reloaded"; 2789 warn "reloaded";
2490}; 2790};
2491 2791
2492our $RELOAD_WATCHER; # used only during reload 2792our $RELOAD_WATCHER; # used only during reload
2493 2793
2794sub reload_perl() {
2795 # doing reload synchronously and two reloads happen back-to-back,
2796 # coro crashes during coro_state_free->destroy here.
2797
2798 $RELOAD_WATCHER ||= Event->timer (
2799 reentrant => 0,
2800 after => 0,
2801 data => WF_AUTOCANCEL,
2802 cb => sub {
2803 do_reload_perl;
2804 undef $RELOAD_WATCHER;
2805 },
2806 );
2807}
2808
2494register_command "reload" => sub { 2809register_command "reload" => sub {
2495 my ($who, $arg) = @_; 2810 my ($who, $arg) = @_;
2496 2811
2497 if ($who->flag (FLAG_WIZ)) { 2812 if ($who->flag (FLAG_WIZ)) {
2498 $who->message ("reloading server."); 2813 $who->message ("reloading server.");
2499 2814 async { reload_perl };
2500 # doing reload synchronously and two reloads happen back-to-back,
2501 # coro crashes during coro_state_free->destroy here.
2502
2503 $RELOAD_WATCHER ||= Event->timer (
2504 reentrant => 0,
2505 after => 0,
2506 data => WF_AUTOCANCEL,
2507 cb => sub {
2508 reload;
2509 undef $RELOAD_WATCHER;
2510 },
2511 );
2512 } 2815 }
2513}; 2816};
2514 2817
2515unshift @INC, $LIBDIR; 2818unshift @INC, $LIBDIR;
2516 2819
2517my $bug_warning = 0; 2820my $bug_warning = 0;
2518 2821
2822our @WAIT_FOR_TICK;
2823our @WAIT_FOR_TICK_BEGIN;
2824
2825sub wait_for_tick {
2826 return unless $TICK_WATCHER->is_active;
2827 return if $Coro::current == $Coro::main;
2828
2829 my $signal = new Coro::Signal;
2830 push @WAIT_FOR_TICK, $signal;
2831 $signal->wait;
2832}
2833
2834sub wait_for_tick_begin {
2835 return unless $TICK_WATCHER->is_active;
2836 return if $Coro::current == $Coro::main;
2837
2838 my $signal = new Coro::Signal;
2839 push @WAIT_FOR_TICK_BEGIN, $signal;
2840 $signal->wait;
2841}
2842
2843 my $min = 1e6;#d#
2844 my $avg = 10;
2519$TICK_WATCHER = Event->timer ( 2845$TICK_WATCHER = Event->timer (
2520 reentrant => 0, 2846 reentrant => 0,
2521 parked => 1, 2847 parked => 1,
2522 prio => 0, 2848 prio => 0,
2523 at => $NEXT_TICK || $TICK, 2849 at => $NEXT_TICK || $TICK,
2527 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2853 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2528 unless ++$bug_warning > 10; 2854 unless ++$bug_warning > 10;
2529 return; 2855 return;
2530 } 2856 }
2531 2857
2532 $NOW = Event::time; 2858 $NOW = $tick_start = Event::time;
2533 2859
2534 cf::server_tick; # one server iteration 2860 cf::server_tick; # one server iteration
2861
2862 0 && sync_job {#d#
2863 for(1..10) {
2864 my $t = Event::time;
2865 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2866 or die;
2867
2868 $map->width (50);
2869 $map->height (50);
2870 $map->alloc;
2871 $map->_load_objects ("/tmp/x.map", 1);
2872 my $t = Event::time - $t;
2873
2874 #next unless $t < 0.0013;#d#
2875 if ($t < $min) {
2876 $min = $t;
2877 }
2878 $avg = $avg * 0.99 + $t * 0.01;
2879 }
2880 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2881 exit 0;
2882 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2883 };
2884
2535 $RUNTIME += $TICK; 2885 $RUNTIME += $TICK;
2536 $NEXT_TICK += $TICK; 2886 $NEXT_TICK += $TICK;
2537 2887
2538 $WAIT_FOR_TICK->broadcast; 2888 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2539 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2889 $NEXT_RUNTIME_WRITE = $NOW + 10;
2540 2890 Coro::async_pool {
2541 Event::sweep; 2891 write_runtime
2542 Coro::cede_notself; 2892 or warn "ERROR: unable to write runtime file: $!";
2893 };
2543 2894 }
2895
2544# my $AFTER = Event::time; 2896# my $AFTER = Event::time;
2545# warn $AFTER - $NOW;#d# 2897# warn $AFTER - $NOW;#d#
2546 2898
2899 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2900 $sig->send;
2901 }
2902 while (my $sig = shift @WAIT_FOR_TICK) {
2903 $sig->send;
2904 }
2905
2906 $NOW = Event::time;
2907
2547 # if we are delayed by four ticks or more, skip them all 2908 # if we are delayed by four ticks or more, skip them all
2548 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2909 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2549 2910
2550 $TICK_WATCHER->at ($NEXT_TICK); 2911 $TICK_WATCHER->at ($NEXT_TICK);
2551 $TICK_WATCHER->start; 2912 $TICK_WATCHER->start;
2913
2914 $LOAD = ($NOW - $tick_start) / $TICK;
2915 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2916
2917 _post_tick;
2918
2919
2552 }, 2920 },
2553); 2921);
2554 2922
2923{
2924 BDB::max_poll_time $TICK * 0.1;
2925 $BDB_POLL_WATCHER = Event->io (
2926 reentrant => 0,
2927 fd => BDB::poll_fileno,
2928 poll => 'r',
2929 prio => 0,
2930 data => WF_AUTOCANCEL,
2931 cb => \&BDB::poll_cb,
2932 );
2933 BDB::min_parallel 8;
2934
2935 BDB::set_sync_prepare {
2936 my $status;
2937 my $current = $Coro::current;
2938 (
2939 sub {
2940 $status = $!;
2941 $current->ready; undef $current;
2942 },
2943 sub {
2944 Coro::schedule while defined $current;
2945 $! = $status;
2946 },
2947 )
2948 };
2949
2950 unless ($DB_ENV) {
2951 $DB_ENV = BDB::db_env_create;
2952
2953 cf::sync_job {
2954 eval {
2955 BDB::db_env_open
2956 $DB_ENV,
2957 $BDBDIR,
2958 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2959 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2960 0666;
2961
2962 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2963
2964 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2965 $DB_ENV->set_lk_detect;
2966 };
2967
2968 cf::cleanup "db_env_open(db): $@" if $@;
2969 };
2970 }
2971}
2972
2973{
2974 IO::AIO::min_parallel 8;
2975
2976 undef $Coro::AIO::WATCHER;
2555IO::AIO::max_poll_time $TICK * 0.1; 2977 IO::AIO::max_poll_time $TICK * 0.1;
2556
2557undef $Coro::AIO::WATCHER;
2558$AIO_POLL_WATCHER = Event->io ( 2978 $AIO_POLL_WATCHER = Event->io (
2559 reentrant => 0, 2979 reentrant => 0,
2980 data => WF_AUTOCANCEL,
2560 fd => IO::AIO::poll_fileno, 2981 fd => IO::AIO::poll_fileno,
2561 poll => 'r', 2982 poll => 'r',
2562 prio => 6, 2983 prio => 6,
2563 data => WF_AUTOCANCEL,
2564 cb => \&IO::AIO::poll_cb, 2984 cb => \&IO::AIO::poll_cb,
2565); 2985 );
2986}
2566 2987
2567$WRITE_RUNTIME_WATCHER = Event->timer ( 2988my $_log_backtrace;
2568 reentrant => 0, 2989
2569 data => WF_AUTOCANCEL, 2990sub _log_backtrace {
2570 after => 1, 2991 my ($msg, @addr) = @_;
2571 interval => 10, 2992
2572 prio => 6, # keep it lowest so it acts like a watchdog 2993 $msg =~ s/\n//;
2573 cb => Coro::unblock_sub { 2994
2574 write_runtime 2995 # limit the # of concurrent backtraces
2575 or warn "ERROR: unable to write runtime file: $!"; 2996 if ($_log_backtrace < 2) {
2997 ++$_log_backtrace;
2998 async {
2999 my @bt = fork_call {
3000 @addr = map { sprintf "%x", $_ } @addr;
3001 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3002 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3003 or die "addr2line: $!";
3004
3005 my @funcs;
3006 my @res = <$fh>;
3007 chomp for @res;
3008 while (@res) {
3009 my ($func, $line) = splice @res, 0, 2, ();
3010 push @funcs, "[$func] $line";
3011 }
3012
3013 @funcs
3014 };
3015
3016 LOG llevInfo, "[ABT] $msg\n";
3017 LOG llevInfo, "[ABT] $_\n" for @bt;
3018 --$_log_backtrace;
3019 };
3020 } else {
3021 LOG llevInfo, "[ABT] $msg\n";
3022 LOG llevInfo, "[ABT] [suppressed]\n";
2576 }, 3023 }
2577); 3024}
3025
3026# load additional modules
3027use cf::pod;
2578 3028
2579END { cf::emergency_save } 3029END { cf::emergency_save }
2580 3030
25811 30311
2582 3032

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines