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.175 by root, Sun Jan 14 21:20:51 2007 UTC vs.
Revision 1.278 by root, Mon Jun 11 21:38:14 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) {
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 } split /\s+/, $1 }
973 if $source =~ /^#!.*?perl.*?#\s*(.*)$/;
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*/, $ext{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 : "extension disabled.\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 die $msg;
1007 }
1008
1009 $done{$k} = delete $todo{$k};
1010 push @EXTS, $v->{pkg};
911 1 1011 }
912 } or warn "$ext not loaded: $@"; 1012
1013 skip:
1014 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1015 unless $progress;
1016 }
913 } 1017 };
914} 1018}
915 1019
916############################################################################# 1020#############################################################################
917 1021
918=head2 CORE EXTENSIONS 1022=head2 CORE EXTENSIONS
934Returns the given player object, loading it if necessary (might block). 1038Returns the given player object, loading it if necessary (might block).
935 1039
936=cut 1040=cut
937 1041
938sub playerdir($) { 1042sub playerdir($) {
939 cf::localdir 1043 "$PLAYERDIR/"
940 . "/"
941 . cf::playerdir
942 . "/"
943 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1044 . (ref $_[0] ? $_[0]->ob->name : $_[0])
944} 1045}
945 1046
946sub path($) { 1047sub path($) {
947 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1048 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
948 1049
949 (playerdir $login) . "/$login.pl" 1050 (playerdir $login) . "/playerdata"
950} 1051}
951 1052
952sub find_active($) { 1053sub find_active($) {
953 $cf::PLAYER{$_[0]} 1054 $cf::PLAYER{$_[0]}
954 and $cf::PLAYER{$_[0]}->active 1055 and $cf::PLAYER{$_[0]}->active
957 1058
958sub exists($) { 1059sub exists($) {
959 my ($login) = @_; 1060 my ($login) = @_;
960 1061
961 $cf::PLAYER{$login} 1062 $cf::PLAYER{$login}
962 or cf::sync_job { !aio_stat $login } 1063 or cf::sync_job { !aio_stat path $login }
963} 1064}
964 1065
965sub find($) { 1066sub find($) {
966 return $cf::PLAYER{$_[0]} || do { 1067 return $cf::PLAYER{$_[0]} || do {
967 my $login = $_[0]; 1068 my $login = $_[0];
968 1069
969 my $guard = cf::lock_acquire "user_find:$login"; 1070 my $guard = cf::lock_acquire "user_find:$login";
970 1071
971 $cf::PLAYER{$_[0]} || do { 1072 $cf::PLAYER{$_[0]} || do {
1073 # rename old playerfiles to new ones
1074 #TODO: remove when no longer required
1075 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1076 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1077 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1078 aio_unlink +(playerdir $login) . "/$login.pl";
1079
972 my $pl = load_pl path $login 1080 my $pl = load_pl path $login
973 or return; 1081 or return;
974 $cf::PLAYER{$login} = $pl 1082 $cf::PLAYER{$login} = $pl
975 } 1083 }
976 } 1084 }
1013 1121
1014=cut 1122=cut
1015 1123
1016sub quit_character { 1124sub quit_character {
1017 my ($pl) = @_; 1125 my ($pl) = @_;
1126
1127 my $name = $pl->ob->name;
1018 1128
1019 $pl->{deny_save} = 1; 1129 $pl->{deny_save} = 1;
1020 $pl->password ("*"); # this should lock out the player until we nuked the dir 1130 $pl->password ("*"); # this should lock out the player until we nuked the dir
1021 1131
1022 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1132 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1027 my $path = playerdir $pl; 1137 my $path = playerdir $pl;
1028 my $temp = "$path~$cf::RUNTIME~deleting~"; 1138 my $temp = "$path~$cf::RUNTIME~deleting~";
1029 aio_rename $path, $temp; 1139 aio_rename $path, $temp;
1030 delete $cf::PLAYER{$pl->ob->name}; 1140 delete $cf::PLAYER{$pl->ob->name};
1031 $pl->destroy; 1141 $pl->destroy;
1142
1143 my $prefix = qr<^~\Q$name\E/>;
1144
1145 # nuke player maps
1146 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1147
1032 IO::AIO::aio_rmtree $temp; 1148 IO::AIO::aio_rmtree $temp;
1149}
1150
1151=item $pl->kick
1152
1153Kicks a player out of the game. This destroys the connection.
1154
1155=cut
1156
1157sub kick {
1158 my ($pl, $kicker) = @_;
1159
1160 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1161 $pl->killer ("kicked");
1162 $pl->ns->destroy;
1033} 1163}
1034 1164
1035=item cf::player::list_logins 1165=item cf::player::list_logins
1036 1166
1037Returns am arrayref of all valid playernames in the system, can take a 1167Returns am arrayref of all valid playernames in the system, can take a
1038while and may block, so not sync_job-capable, ever. 1168while and may block, so not sync_job-capable, ever.
1039 1169
1040=cut 1170=cut
1041 1171
1042sub list_logins { 1172sub list_logins {
1043 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1173 my $dirs = aio_readdir $PLAYERDIR
1044 or return []; 1174 or return [];
1045 1175
1046 my @logins; 1176 my @logins;
1047 1177
1048 for my $login (@$dirs) { 1178 for my $login (@$dirs) {
1065=cut 1195=cut
1066 1196
1067sub maps($) { 1197sub maps($) {
1068 my ($pl) = @_; 1198 my ($pl) = @_;
1069 1199
1200 $pl = ref $pl ? $pl->ob->name : $pl;
1201
1070 my $files = aio_readdir playerdir $pl 1202 my $files = aio_readdir playerdir $pl
1071 or return; 1203 or return;
1072 1204
1073 my @paths; 1205 my @paths;
1074 1206
1075 for (@$files) { 1207 for (@$files) {
1076 utf8::decode $_; 1208 utf8::decode $_;
1077 next if /\.(?:pl|pst)$/; 1209 next if /\.(?:pl|pst)$/;
1078 next unless /^$PATH_SEP/o; 1210 next unless /^$PATH_SEP/o;
1079 1211
1080 s/\.map$//; 1212 push @paths, cf::map::normalise "~$pl/$_";
1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1082 } 1213 }
1083 1214
1084 \@paths 1215 \@paths
1085} 1216}
1086 1217
1087=item $player->ext_reply ($msgid, $msgtype, %msg) 1218=item $player->ext_reply ($msgid, %msg)
1088 1219
1089Sends an ext reply to the player. 1220Sends an ext reply to the player.
1090 1221
1091=cut 1222=cut
1092 1223
1093sub ext_reply($$$%) { 1224sub ext_reply($$%) {
1094 my ($self, $id, %msg) = @_; 1225 my ($self, $id, %msg) = @_;
1095 1226
1096 $msg{msgid} = $id; 1227 $msg{msgid} = $id;
1097 1228
1098 $self->send ("ext " . cf::to_json \%msg); 1229 $self->send ("ext " . cf::to_json \%msg);
1099} 1230}
1100 1231
1101package cf; 1232=item $player->ext_event ($type, %msg)
1233
1234Sends an ext event to the client.
1235
1236=cut
1237
1238sub ext_event($$%) {
1239 my ($self, $type, %msg) = @_;
1240
1241 $self->ns->ext_event ($type, %msg);
1242}
1243
1244=head3 cf::region
1245
1246=over 4
1247
1248=cut
1249
1250package cf::region;
1251
1252=item cf::region::find_by_path $path
1253
1254Tries to decuce the probable region for a map knowing only its path.
1255
1256=cut
1257
1258sub find_by_path($) {
1259 my ($path) = @_;
1260
1261 my ($match, $specificity);
1262
1263 for my $region (list) {
1264 if ($region->match && $path =~ $region->match) {
1265 ($match, $specificity) = ($region, $region->specificity)
1266 if $region->specificity > $specificity;
1267 }
1268 }
1269
1270 $match
1271}
1102 1272
1103=back 1273=back
1104
1105 1274
1106=head3 cf::map 1275=head3 cf::map
1107 1276
1108=over 4 1277=over 4
1109 1278
1121our $MAX_RESET = 3600; 1290our $MAX_RESET = 3600;
1122our $DEFAULT_RESET = 3000; 1291our $DEFAULT_RESET = 3000;
1123 1292
1124sub generate_random_map { 1293sub generate_random_map {
1125 my ($self, $rmp) = @_; 1294 my ($self, $rmp) = @_;
1126
1127 # mit "rum" bekleckern, nicht 1295 # mit "rum" bekleckern, nicht
1128 $self->_create_random_map ( 1296 $self->_create_random_map (
1129 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1297 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1130 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1298 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1131 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1299 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1138 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1306 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1139 (cf::region::find $rmp->{region}), $rmp->{custom} 1307 (cf::region::find $rmp->{region}), $rmp->{custom}
1140 ) 1308 )
1141} 1309}
1142 1310
1311=item cf::map->register ($regex, $prio)
1312
1313Register a handler for the map path matching the given regex at the
1314givne priority (higher is better, built-in handlers have priority 0, the
1315default).
1316
1317=cut
1318
1143sub register { 1319sub register {
1144 my (undef, $regex) = @_; 1320 my (undef, $regex, $prio) = @_;
1145 my $pkg = caller; 1321 my $pkg = caller;
1146 1322
1147 no strict; 1323 no strict;
1148 push @{"$pkg\::ISA"}, __PACKAGE__; 1324 push @{"$pkg\::ISA"}, __PACKAGE__;
1149 1325
1150 $EXT_MAP{$pkg} = qr<$regex>; 1326 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1151} 1327}
1152 1328
1153# also paths starting with '/' 1329# also paths starting with '/'
1154$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1330$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1155 1331
1156sub thawer_merge { 1332sub thawer_merge {
1157 my ($self, $merge) = @_; 1333 my ($self, $merge) = @_;
1158 1334
1159 # we have to keep some variables in memory intact 1335 # we have to keep some variables in memory intact
1160 local $self->{path}; 1336 local $self->{path};
1161 local $self->{load_path}; 1337 local $self->{load_path};
1162 local $self->{deny_save};
1163 local $self->{deny_reset};
1164 1338
1165 $self->SUPER::thawer_merge ($merge); 1339 $self->SUPER::thawer_merge ($merge);
1166} 1340}
1167 1341
1168sub normalise { 1342sub normalise {
1169 my ($path, $base) = @_; 1343 my ($path, $base) = @_;
1344
1345 $path = "$path"; # make sure its a string
1346
1347 $path =~ s/\.map$//;
1170 1348
1171 # map plan: 1349 # map plan:
1172 # 1350 #
1173 # /! non-realised random map exit (special hack!) 1351 # /! non-realised random map exit (special hack!)
1174 # {... are special paths that are not being touched 1352 # {... are special paths that are not being touched
1202 1380
1203 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1381 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1204 1382
1205 $path = normalise $path, $base; 1383 $path = normalise $path, $base;
1206 1384
1207 for my $pkg (keys %EXT_MAP) { 1385 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1208 if ($path =~ $EXT_MAP{$pkg}) { 1386 if ($path =~ $EXT_MAP{$pkg}[1]) {
1209 my $self = bless cf::map::new, $pkg; 1387 my $self = bless cf::map::new, $pkg;
1210 $self->{path} = $path; $self->path ($path); 1388 $self->{path} = $path; $self->path ($path);
1211 $self->init; # pass $1 etc. 1389 $self->init; # pass $1 etc.
1212 return $self; 1390 return $self;
1213 } 1391 }
1214 } 1392 }
1215 1393
1216 Carp::carp "unable to resolve path '$path'."; 1394 Carp::carp "unable to resolve path '$path' (base '$base').";
1217 () 1395 ()
1218} 1396}
1219 1397
1220sub init { 1398sub init {
1221 my ($self) = @_; 1399 my ($self) = @_;
1236 1414
1237# the original (read-only) location 1415# the original (read-only) location
1238sub load_path { 1416sub load_path {
1239 my ($self) = @_; 1417 my ($self) = @_;
1240 1418
1241 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1419 "$MAPDIR/$self->{path}.map"
1242} 1420}
1243 1421
1244# the temporary/swap location 1422# the temporary/swap location
1245sub save_path { 1423sub save_path {
1246 my ($self) = @_; 1424 my ($self) = @_;
1247 1425
1248 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1426 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1249 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1427 "$TMPDIR/$path.map"
1250} 1428}
1251 1429
1252# the unique path, undef == no special unique path 1430# the unique path, undef == no special unique path
1253sub uniq_path { 1431sub uniq_path {
1254 my ($self) = @_; 1432 my ($self) = @_;
1255 1433
1256 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1434 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1257 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1435 "$UNIQUEDIR/$path"
1258} 1436}
1259 1437
1260# and all this just because we cannot iterate over 1438# and all this just because we cannot iterate over
1261# all maps in C++... 1439# all maps in C++...
1262sub change_all_map_light { 1440sub change_all_map_light {
1264 1442
1265 $_->change_map_light ($change) 1443 $_->change_map_light ($change)
1266 for grep $_->outdoor, values %cf::MAP; 1444 for grep $_->outdoor, values %cf::MAP;
1267} 1445}
1268 1446
1447sub decay_objects {
1448 my ($self) = @_;
1449
1450 return if $self->{deny_reset};
1451
1452 $self->do_decay_objects;
1453}
1454
1269sub unlink_save { 1455sub unlink_save {
1270 my ($self) = @_; 1456 my ($self) = @_;
1271 1457
1272 utf8::encode (my $save = $self->save_path); 1458 utf8::encode (my $save = $self->save_path);
1273 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1459 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1276 1462
1277sub load_header_from($) { 1463sub load_header_from($) {
1278 my ($self, $path) = @_; 1464 my ($self, $path) = @_;
1279 1465
1280 utf8::encode $path; 1466 utf8::encode $path;
1281 aio_open $path, O_RDONLY, 0 1467 #aio_open $path, O_RDONLY, 0
1282 or return; 1468 # or return;
1283 1469
1284 $self->_load_header ($path) 1470 $self->_load_header ($path)
1285 or return; 1471 or return;
1286 1472
1287 $self->{load_path} = $path; 1473 $self->{load_path} = $path;
1288 1474
1289 1 1475 1
1290} 1476}
1291 1477
1292sub load_orig { 1478sub load_header_orig {
1293 my ($self) = @_; 1479 my ($self) = @_;
1294 1480
1295 $self->load_header_from ($self->load_path) 1481 $self->load_header_from ($self->load_path)
1296} 1482}
1297 1483
1298sub load_temp { 1484sub load_header_temp {
1299 my ($self) = @_; 1485 my ($self) = @_;
1300 1486
1301 $self->load_header_from ($self->save_path) 1487 $self->load_header_from ($self->save_path)
1488}
1489
1490sub prepare_temp {
1491 my ($self) = @_;
1492
1493 $self->last_access ((delete $self->{last_access})
1494 || $cf::RUNTIME); #d#
1495 # safety
1496 $self->{instantiate_time} = $cf::RUNTIME
1497 if $self->{instantiate_time} > $cf::RUNTIME;
1498}
1499
1500sub prepare_orig {
1501 my ($self) = @_;
1502
1503 $self->{load_original} = 1;
1504 $self->{instantiate_time} = $cf::RUNTIME;
1505 $self->last_access ($cf::RUNTIME);
1506 $self->instantiate;
1302} 1507}
1303 1508
1304sub load_header { 1509sub load_header {
1305 my ($self) = @_; 1510 my ($self) = @_;
1306 1511
1307 if ($self->load_temp) { 1512 if ($self->load_header_temp) {
1308 $self->last_access ((delete $self->{last_access}) 1513 $self->prepare_temp;
1309 || $cf::RUNTIME); #d#
1310 # safety
1311 $self->{instantiate_time} = $cf::RUNTIME
1312 if $self->{instantiate_time} > $cf::RUNTIME;
1313 } else { 1514 } else {
1314 $self->load_orig 1515 $self->load_header_orig
1315 or return; 1516 or return;
1316 1517 $self->prepare_orig;
1317 $self->{load_original} = 1;
1318 $self->{instantiate_time} = $cf::RUNTIME;
1319 $self->last_access ($cf::RUNTIME);
1320 $self->instantiate;
1321 } 1518 }
1519
1520 $self->{deny_reset} = 1
1521 if $self->no_reset;
1522
1523 $self->default_region (cf::region::find_by_path $self->{path})
1524 unless $self->default_region;
1322 1525
1323 1 1526 1
1324} 1527}
1325 1528
1326sub find; 1529sub find;
1339 $map->{last_save} = $cf::RUNTIME; 1542 $map->{last_save} = $cf::RUNTIME;
1340 1543
1341 $map->load_header 1544 $map->load_header
1342 or return; 1545 or return;
1343 1546
1344 if ($map->should_reset) { 1547 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1548 # doing this can freeze the server in a sync job, obviously
1345 $cf::WAIT_FOR_TICK->wait; 1549 #$cf::WAIT_FOR_TICK->wait;
1346 $map->reset; 1550 $map->reset;
1347 undef $guard; 1551 undef $guard;
1348 $map = find $path 1552 return find $path;
1349 or return;
1350 } 1553 }
1351 1554
1352 $cf::MAP{$path} = $map 1555 $cf::MAP{$path} = $map
1353 } 1556 }
1354} 1557}
1558
1559sub pre_load { }
1560sub post_load { }
1355 1561
1356sub load { 1562sub load {
1357 my ($self) = @_; 1563 my ($self) = @_;
1358 1564
1565 local $self->{deny_reset} = 1; # loading can take a long time
1566
1359 my $path = $self->{path}; 1567 my $path = $self->{path};
1568
1569 {
1360 my $guard = cf::lock_acquire "map_load:$path"; 1570 my $guard = cf::lock_acquire "map_load:$path";
1361 1571
1362 return if $self->in_memory != cf::MAP_SWAPPED; 1572 return if $self->in_memory != cf::MAP_SWAPPED;
1363 1573
1364 $self->in_memory (cf::MAP_LOADING); 1574 $self->in_memory (cf::MAP_LOADING);
1365 1575
1366 $self->alloc; 1576 $self->alloc;
1367 $self->_load_objects ($self->{load_path}, 1)
1368 or return;
1369 1577
1370 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1578 $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; 1579 Coro::cede;
1391 $self->set_darkness_map; 1580
1581 $self->_load_objects ($self->{load_path}, 1)
1582 or return;
1583
1584 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1585 if delete $self->{load_original};
1586
1587 if (my $uniq = $self->uniq_path) {
1588 utf8::encode $uniq;
1589 if (aio_open $uniq, O_RDONLY, 0) {
1590 $self->clear_unique_items;
1591 $self->_load_objects ($uniq, 0);
1592 }
1593 }
1594
1595 Coro::cede;
1596 # now do the right thing for maps
1597 $self->link_multipart_objects;
1392 $self->difficulty ($self->estimate_difficulty) 1598 $self->difficulty ($self->estimate_difficulty)
1393 unless $self->difficulty; 1599 unless $self->difficulty;
1394 Coro::cede; 1600 Coro::cede;
1601
1602 unless ($self->{deny_activate}) {
1603 $self->decay_objects;
1604 $self->fix_auto_apply;
1605 $self->update_buttons;
1606 Coro::cede;
1607 $self->set_darkness_map;
1608 Coro::cede;
1395 $self->activate; 1609 $self->activate;
1396 } 1610 }
1397 1611
1398 $self->in_memory (cf::MAP_IN_MEMORY); 1612 $self->in_memory (cf::MAP_IN_MEMORY);
1613 }
1614
1615 $self->post_load;
1399} 1616}
1400 1617
1401sub customise_for { 1618sub customise_for {
1402 my ($self, $ob) = @_; 1619 my ($self, $ob) = @_;
1403 1620
1404 return find "~" . $ob->name . "/" . $self->{path} 1621 return find "~" . $ob->name . "/" . $self->{path}
1405 if $self->per_player; 1622 if $self->per_player;
1623
1624# return find "?party/" . $ob->name . "/" . $self->{path}
1625# if $self->per_party;
1406 1626
1407 $self 1627 $self
1408} 1628}
1409 1629
1410# find and load all maps in the 3x3 area around a map 1630# find and load all maps in the 3x3 area around a map
1442 1662
1443 cf::sync_job { $map->load }; 1663 cf::sync_job { $map->load };
1444} 1664}
1445 1665
1446our %MAP_PREFETCH; 1666our %MAP_PREFETCH;
1447our $MAP_PREFETCHER = Coro::async { 1667our $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 1668
1460sub find_async { 1669sub find_async {
1461 my ($path, $origin) = @_; 1670 my ($path, $origin) = @_;
1462 1671
1463 $path = normalise $path, $origin && $origin->{path}; 1672 $path = normalise $path, $origin && $origin->{path};
1464 1673
1465 if (my $map = $cf::MAP{$path}) { 1674 if (my $map = $cf::MAP{$path}) {
1466 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1675 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1467 } 1676 }
1468 1677
1469 $MAP_PREFETCH{$path} = 0; 1678 undef $MAP_PREFETCH{$path};
1679 $MAP_PREFETCHER ||= cf::async {
1680 while (%MAP_PREFETCH) {
1681 for my $path (keys %MAP_PREFETCH) {
1682 my $map = find $path
1683 or next;
1684 $map->load;
1685
1686 delete $MAP_PREFETCH{$path};
1687 }
1688 }
1689 undef $MAP_PREFETCHER;
1690 };
1470 $MAP_PREFETCHER->ready; 1691 $MAP_PREFETCHER->prio (6);
1471 1692
1472 () 1693 ()
1473} 1694}
1474 1695
1475sub save { 1696sub save {
1520 1741
1521sub reset_at { 1742sub reset_at {
1522 my ($self) = @_; 1743 my ($self) = @_;
1523 1744
1524 # TODO: safety, remove and allow resettable per-player maps 1745 # 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}; 1746 return 1e99 if $self->{deny_reset};
1527 1747
1528 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1748 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1529 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1749 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1530 1750
1541 my ($self) = @_; 1761 my ($self) = @_;
1542 1762
1543 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1763 my $lock = cf::lock_acquire "map_data:$self->{path}";
1544 1764
1545 return if $self->players; 1765 return if $self->players;
1546 return if $self->isa ("ext::map_per_player");#d#
1547 1766
1548 warn "resetting map ", $self->path;#d# 1767 warn "resetting map ", $self->path;
1768
1769 $self->in_memory (cf::MAP_SWAPPED);
1770
1771 # need to save uniques path
1772 unless ($self->{deny_save}) {
1773 my $uniq = $self->uniq_path; utf8::encode $uniq;
1774
1775 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1776 if $uniq;
1777 }
1549 1778
1550 delete $cf::MAP{$self->path}; 1779 delete $cf::MAP{$self->path};
1551 1780
1552 $self->in_memory (cf::MAP_SWAPPED);
1553 $self->clear; 1781 $self->clear;
1554 1782
1555 $_->clear_links_to ($self) for values %cf::MAP; 1783 $_->clear_links_to ($self) for values %cf::MAP;
1556 1784
1557 $self->unlink_save; 1785 $self->unlink_save;
1576 $cf::MAP{$self->path} = $self; 1804 $cf::MAP{$self->path} = $self;
1577 1805
1578 $self->reset; # polite request, might not happen 1806 $self->reset; # polite request, might not happen
1579} 1807}
1580 1808
1809=item $maps = cf::map::tmp_maps
1810
1811Returns an arrayref with all map paths of currently instantiated and saved
1812maps. May block.
1813
1814=cut
1815
1816sub tmp_maps() {
1817 [
1818 map {
1819 utf8::decode $_;
1820 /\.map$/
1821 ? normalise $_
1822 : ()
1823 } @{ aio_readdir $TMPDIR or [] }
1824 ]
1825}
1826
1827=item $maps = cf::map::random_maps
1828
1829Returns an arrayref with all map paths of currently instantiated and saved
1830random maps. May block.
1831
1832=cut
1833
1834sub random_maps() {
1835 [
1836 map {
1837 utf8::decode $_;
1838 /\.map$/
1839 ? normalise "?random/$_"
1840 : ()
1841 } @{ aio_readdir $RANDOMDIR or [] }
1842 ]
1843}
1844
1581=item cf::map::unique_maps 1845=item cf::map::unique_maps
1582 1846
1583Returns an arrayref of paths of all shared maps that have 1847Returns an arrayref of paths of all shared maps that have
1584instantiated unique items. May block. 1848instantiated unique items. May block.
1585 1849
1586=cut 1850=cut
1587 1851
1588sub unique_maps() { 1852sub unique_maps() {
1589 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1853 [
1590 or return; 1854 map {
1591
1592 my @paths;
1593
1594 for (@$files) {
1595 utf8::decode $_; 1855 utf8::decode $_;
1596 next if /\.pst$/;
1597 next unless /^$PATH_SEP/o;
1598
1599 s/\.map$//; 1856 /\.map$/
1600 push @paths, $_; 1857 ? normalise $_
1858 : ()
1859 } @{ aio_readdir $UNIQUEDIR or [] }
1601 } 1860 ]
1602
1603 \@paths
1604} 1861}
1605 1862
1606package cf; 1863package cf;
1607 1864
1608=back 1865=back
1699=cut 1956=cut
1700 1957
1701sub link_map { 1958sub link_map {
1702 unless ($LINK_MAP) { 1959 unless ($LINK_MAP) {
1703 $LINK_MAP = cf::map::find "{link}" 1960 $LINK_MAP = cf::map::find "{link}"
1704 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1961 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1705 $LINK_MAP->load; 1962 $LINK_MAP->load;
1706 } 1963 }
1707 1964
1708 $LINK_MAP 1965 $LINK_MAP
1709} 1966}
1714 $self->deactivate_recursive; 1971 $self->deactivate_recursive;
1715 1972
1716 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1973 return if UNIVERSAL::isa $self->map, "ext::map_link";
1717 1974
1718 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1975 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1719 if $self->map; 1976 if $self->map && $self->map->{path} ne "{link}";
1720 1977
1721 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1978 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1722} 1979}
1723 1980
1724sub cf::object::player::leave_link { 1981sub cf::object::player::leave_link {
1725 my ($self, $map, $x, $y) = @_; 1982 my ($self, $map, $x, $y) = @_;
1983
1984 return unless $self->contr->active;
1726 1985
1727 my $link_pos = delete $self->{_link_pos}; 1986 my $link_pos = delete $self->{_link_pos};
1728 1987
1729 unless ($map) { 1988 unless ($map) {
1730 # restore original map position 1989 # restore original map position
1748 $map->load; 2007 $map->load;
1749 $map->load_diag; 2008 $map->load_diag;
1750 2009
1751 return unless $self->contr->active; 2010 return unless $self->contr->active;
1752 $self->activate_recursive; 2011 $self->activate_recursive;
2012
2013 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1753 $self->enter_map ($map, $x, $y); 2014 $self->enter_map ($map, $x, $y);
1754} 2015}
1755 2016
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) 2017=item $player_object->goto ($path, $x, $y[, $check->($map)])
1789 2018
2019Moves the player to the given map-path and coordinates by first freezing
2020her, loading and preparing them map, calling the provided $check callback
2021that has to return the map if sucecssful, and then unfreezes the player on
2022the new (success) or old (failed) map position.
2023
1790=cut 2024=cut
2025
2026our $GOTOGEN;
1791 2027
1792sub cf::object::player::goto { 2028sub cf::object::player::goto {
1793 my ($self, $path, $x, $y) = @_; 2029 my ($self, $path, $x, $y, $check) = @_;
2030
2031 # do generation counting so two concurrent goto's will be executed in-order
2032 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1794 2033
1795 $self->enter_link; 2034 $self->enter_link;
1796 2035
1797 (async { 2036 (async {
2037 my $map = eval {
1798 my $map = cf::map::find $path; 2038 my $map = cf::map::find $path;
2039
2040 if ($map) {
1799 $map = $map->customise_for ($self) if $map; 2041 $map = $map->customise_for ($self);
1800 2042 $map = $check->($map) if $check && $map;
1801# warn "entering ", $map->path, " at ($x, $y)\n" 2043 } else {
1802# if $map;
1803
1804 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2044 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2045 }
1805 2046
2047 $map
2048 };
2049
2050 if ($@) {
2051 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2052 LOG llevError | logBacktrace, Carp::longmess $@;
2053 }
2054
2055 if ($gen == $self->{_goto_generation}) {
2056 delete $self->{_goto_generation};
1806 $self->leave_link ($map, $x, $y); 2057 $self->leave_link ($map, $x, $y);
2058 }
1807 })->prio (1); 2059 })->prio (1);
1808} 2060}
1809 2061
1810=item $player_object->enter_exit ($exit_object) 2062=item $player_object->enter_exit ($exit_object)
1811 2063
1813 2065
1814sub parse_random_map_params { 2066sub parse_random_map_params {
1815 my ($spec) = @_; 2067 my ($spec) = @_;
1816 2068
1817 my $rmp = { # defaults 2069 my $rmp = { # defaults
1818 xsize => 10, 2070 xsize => (cf::rndm 15, 40),
1819 ysize => 10, 2071 ysize => (cf::rndm 15, 40),
2072 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
2073 #layout => string,
1820 }; 2074 };
1821 2075
1822 for (split /\n/, $spec) { 2076 for (split /\n/, $spec) {
1823 my ($k, $v) = split /\s+/, $_, 2; 2077 my ($k, $v) = split /\s+/, $_, 2;
1824 2078
1828 $rmp 2082 $rmp
1829} 2083}
1830 2084
1831sub prepare_random_map { 2085sub prepare_random_map {
1832 my ($exit) = @_; 2086 my ($exit) = @_;
2087
2088 my $guard = cf::lock_acquire "exit_prepare:$exit";
1833 2089
1834 # all this does is basically replace the /! path by 2090 # all this does is basically replace the /! path by
1835 # a new random map path (?random/...) with a seed 2091 # a new random map path (?random/...) with a seed
1836 # that depends on the exit object 2092 # that depends on the exit object
1837 2093
1838 my $rmp = parse_random_map_params $exit->msg; 2094 my $rmp = parse_random_map_params $exit->msg;
1839 2095
1840 if ($exit->map) { 2096 if ($exit->map) {
1841 $rmp->{region} = $exit->map->region_name; 2097 $rmp->{region} = $exit->region->name;
1842 $rmp->{origin_map} = $exit->map->path; 2098 $rmp->{origin_map} = $exit->map->path;
1843 $rmp->{origin_x} = $exit->x; 2099 $rmp->{origin_x} = $exit->x;
1844 $rmp->{origin_y} = $exit->y; 2100 $rmp->{origin_y} = $exit->y;
1845 } 2101 }
1846 2102
1847 $rmp->{random_seed} ||= $exit->random_seed; 2103 $rmp->{random_seed} ||= $exit->random_seed;
1848 2104
1849 my $data = cf::to_json $rmp; 2105 my $data = cf::to_json $rmp;
1850 my $md5 = Digest::MD5::md5_hex $data; 2106 my $md5 = Digest::MD5::md5_hex $data;
2107 my $meta = "$RANDOMDIR/$md5.meta";
1851 2108
1852 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 2109 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1853 aio_write $fh, 0, (length $data), $data, 0; 2110 aio_write $fh, 0, (length $data), $data, 0;
2111 undef $fh;
2112 aio_rename "$meta~", $meta;
1854 2113
1855 $exit->slaying ("?random/$md5"); 2114 $exit->slaying ("?random/$md5");
1856 $exit->msg (undef); 2115 $exit->msg (undef);
1857 } 2116 }
1858} 2117}
1859 2118
1860sub cf::object::player::enter_exit { 2119sub cf::object::player::enter_exit {
1861 my ($self, $exit) = @_; 2120 my ($self, $exit) = @_;
1862 2121
1863 return unless $self->type == cf::PLAYER; 2122 return unless $self->type == cf::PLAYER;
2123
2124 if ($exit->slaying eq "/!") {
2125 #TODO: this should de-fi-ni-te-ly not be a sync-job
2126 # the problem is that $exit might not survive long enough
2127 # so it needs to be done right now, right here
2128 cf::sync_job { prepare_random_map $exit };
2129 }
2130
2131 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2132 my $hp = $exit->stats->hp;
2133 my $sp = $exit->stats->sp;
1864 2134
1865 $self->enter_link; 2135 $self->enter_link;
1866 2136
1867 (async { 2137 (async {
1868 $self->deactivate_recursive; # just to be sure 2138 $self->deactivate_recursive; # just to be sure
1869 unless (eval { 2139 unless (eval {
1870 prepare_random_map $exit 2140 $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 2141
1876 1; 2142 1;
1877 }) { 2143 }) {
1878 $self->message ("Something went wrong deep within the crossfire server. " 2144 $self->message ("Something went wrong deep within the crossfire server. "
1879 . "I'll try to bring you back to the map you were before. " 2145 . "I'll try to bring you back to the map you were before. "
1880 . "Please report this to the dungeon master!", 2146 . "Please report this to the dungeon master!",
1881 cf::NDI_UNIQUE | cf::NDI_RED); 2147 cf::NDI_UNIQUE | cf::NDI_RED);
1882 2148
1883 warn "ERROR in enter_exit: $@"; 2149 warn "ERROR in enter_exit: $@";
1884 $self->leave_link; 2150 $self->leave_link;
1885 } 2151 }
1886 })->prio (1); 2152 })->prio (1);
1899 2165
1900sub cf::client::send_drawinfo { 2166sub cf::client::send_drawinfo {
1901 my ($self, $text, $flags) = @_; 2167 my ($self, $text, $flags) = @_;
1902 2168
1903 utf8::encode $text; 2169 utf8::encode $text;
1904 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2170 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1905} 2171}
1906 2172
2173=item $client->ext_event ($type, %msg)
2174
2175Sends an exti event to the client.
2176
2177=cut
2178
2179sub cf::client::ext_event($$%) {
2180 my ($self, $type, %msg) = @_;
2181
2182 $msg{msgtype} = "event_$type";
2183 $self->send_packet ("ext " . cf::to_json \%msg);
2184}
1907 2185
1908=item $success = $client->query ($flags, "text", \&cb) 2186=item $success = $client->query ($flags, "text", \&cb)
1909 2187
1910Queues a query to the client, calling the given callback with 2188Queues a query to the client, calling the given callback with
1911the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2189the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1940 # get handled first 2218 # get handled first
1941 my $queue = delete $ns->{query_queue} 2219 my $queue = delete $ns->{query_queue}
1942 or return; # be conservative, not sure how that can happen, but we saw a crash here 2220 or return; # be conservative, not sure how that can happen, but we saw a crash here
1943 2221
1944 (shift @$queue)->[1]->($msg); 2222 (shift @$queue)->[1]->($msg);
2223 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1945 2224
1946 push @{ $ns->{query_queue} }, @$queue; 2225 push @{ $ns->{query_queue} }, @$queue;
1947 2226
1948 if (@{ $ns->{query_queue} } == @$queue) { 2227 if (@{ $ns->{query_queue} } == @$queue) {
1949 if (@$queue) { 2228 if (@$queue) {
2007 2286
2008# here we export the classes and methods available to script code 2287# here we export the classes and methods available to script code
2009 2288
2010=pod 2289=pod
2011 2290
2012The following fucntions and emthods are available within a safe environment: 2291The following functions and methods are available within a safe environment:
2013 2292
2014 cf::object contr pay_amount pay_player map 2293 cf::object contr pay_amount pay_player map
2015 cf::object::player player 2294 cf::object::player player
2016 cf::player peaceful 2295 cf::player peaceful
2017 cf::map trigger 2296 cf::map trigger
2102############################################################################# 2381#############################################################################
2103 2382
2104=head2 EXTENSION DATABASE SUPPORT 2383=head2 EXTENSION DATABASE SUPPORT
2105 2384
2106Crossfire maintains a very simple database for extension use. It can 2385Crossfire maintains a very simple database for extension use. It can
2107currently store anything that can be serialised using Storable, which 2386currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2108excludes objects. 2387convert to/from binary).
2109 2388
2110The parameter C<$family> should best start with the name of the extension 2389The parameter C<$family> should best start with the name of the extension
2111using it, it should be unique. 2390using it, it should be unique.
2112 2391
2113=over 4 2392=over 4
2114 2393
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 2394=item $value = cf::db_get $family => $key
2122 2395
2123Returns a single value from the database 2396Returns 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 2397
2130=item cf::db_put $family => $key => $value 2398=item cf::db_put $family => $key => $value
2131 2399
2132Stores the given C<$value> in the family hash. Updates are delayed, if you 2400Stores 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 2401
2143=cut 2402=cut
2144 2403
2145our $DB; 2404our $DB;
2146 2405
2147{ 2406sub db_init {
2148 my $path = cf::localdir . "/database.pst"; 2407 unless ($DB) {
2408 $DB = BDB::db_create $DB_ENV;
2149 2409
2150 sub db_load() { 2410 cf::sync_job {
2151 $DB = stat $path ? Storable::retrieve $path : { }; 2411 eval {
2152 } 2412 $DB->set_flags (BDB::CHKSUM);
2153 2413
2154 my $pid; 2414 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2155 2415 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2156 sub db_save() { 2416 cf::cleanup "db_open(db): $!" if $!;
2157 waitpid $pid, 0 if $pid; 2417 };
2158 if (0 == ($pid = fork)) { 2418 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 } 2419 };
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 }); 2420 }
2421}
2176 2422
2177 sub db_dirty() {
2178 $dirty = 1;
2179 $idle->start;
2180 }
2181
2182 sub db_get($;$) { 2423sub db_get($$) {
2183 @_ >= 2 2424 my $key = "$_[0]/$_[1]";
2184 ? $DB->{$_[0]}{$_[1]}
2185 : ($DB->{$_[0]} ||= { })
2186 }
2187 2425
2426 cf::sync_job {
2427 BDB::db_get $DB, undef, $key, my $data;
2428
2429 $! ? ()
2430 : $data
2431 }
2432}
2433
2188 sub db_put($$;$) { 2434sub db_put($$$) {
2189 if (@_ >= 3) { 2435 BDB::dbreq_pri 4;
2190 $DB->{$_[0]}{$_[1]} = $_[2]; 2436 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2191 } else { 2437}
2192 $DB->{$_[0]} = $_[1];
2193 }
2194 db_dirty;
2195 }
2196 2438
2197 cf::global->attach ( 2439=item cf::cache $id => [$paths...], $processversion => $process
2198 prio => 10000, 2440
2199 on_cleanup => sub { 2441Generic caching function that returns the value of the resource $id,
2200 db_sync; 2442caching and regenerating as required.
2443
2444This function can block.
2445
2446=cut
2447
2448sub cache {
2449 my ($id, $src, $processversion, $process) = @_;
2450
2451 my $meta =
2452 join "\x00",
2453 $processversion,
2454 map {
2455 aio_stat $_
2456 and Carp::croak "$_: $!";
2457
2458 ($_, (stat _)[7,9])
2459 } @$src;
2460
2461 my $dbmeta = db_get cache => "$id/meta";
2462 if ($dbmeta ne $meta) {
2463 # changed, we may need to process
2464
2465 my @data;
2466 my $md5;
2467
2468 for (0 .. $#$src) {
2469 0 <= aio_load $src->[$_], $data[$_]
2470 or Carp::croak "$src->[$_]: $!";
2201 }, 2471 }
2202 ); 2472
2473 # if processing is expensive, check
2474 # checksum first
2475 if (1) {
2476 $md5 =
2477 join "\x00",
2478 $processversion,
2479 map {
2480 Coro::cede;
2481 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2482 } 0.. $#$src;
2483
2484
2485 my $dbmd5 = db_get cache => "$id/md5";
2486 if ($dbmd5 eq $md5) {
2487 db_put cache => "$id/meta", $meta;
2488
2489 return db_get cache => "$id/data";
2490 }
2491 }
2492
2493 my $t1 = Time::HiRes::time;
2494 my $data = $process->(\@data);
2495 my $t2 = Time::HiRes::time;
2496
2497 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2498
2499 db_put cache => "$id/data", $data;
2500 db_put cache => "$id/md5" , $md5;
2501 db_put cache => "$id/meta", $meta;
2502
2503 return $data;
2504 }
2505
2506 db_get cache => "$id/data"
2507}
2508
2509=item fork_call { }, $args
2510
2511Executes the given code block with the given arguments in a seperate
2512process, returning the results. Everything must be serialisable with
2513Coro::Storable. May, of course, block. Note that the executed sub may
2514never block itself or use any form of Event handling.
2515
2516=cut
2517
2518sub fork_call(&@) {
2519 my ($cb, @args) = @_;
2520
2521# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2522# or die "socketpair: $!";
2523 pipe my $fh1, my $fh2
2524 or die "pipe: $!";
2525
2526 if (my $pid = fork) {
2527 close $fh2;
2528
2529 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2530 $res = Coro::Storable::thaw $res;
2531
2532 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2533
2534 die $$res unless "ARRAY" eq ref $res;
2535
2536 return wantarray ? @$res : $res->[-1];
2537 } else {
2538 reset_signals;
2539 local $SIG{__WARN__};
2540 local $SIG{__DIE__};
2541 eval {
2542 close $fh1;
2543
2544 my @res = eval { $cb->(@args) };
2545 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2546 };
2547
2548 warn $@ if $@;
2549 _exit 0;
2550 }
2203} 2551}
2204 2552
2205############################################################################# 2553#############################################################################
2206# the server's main() 2554# the server's init and main functions
2555
2556sub load_facedata($) {
2557 my ($path) = @_;
2558
2559 warn "loading facedata from $path\n";
2560
2561 my $facedata;
2562 0 < aio_load $path, $facedata
2563 or die "$path: $!";
2564
2565 $facedata = Coro::Storable::thaw $facedata;
2566
2567 $facedata->{version} == 2
2568 or cf::cleanup "$path: version mismatch, cannot proceed.";
2569
2570 {
2571 my $faces = $facedata->{faceinfo};
2572
2573 while (my ($face, $info) = each %$faces) {
2574 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2575 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2576 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2577 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2578 Coro::cede;
2579 }
2580
2581 while (my ($face, $info) = each %$faces) {
2582 next unless $info->{smooth};
2583 my $idx = cf::face::find $face
2584 or next;
2585 if (my $smooth = cf::face::find $info->{smooth}) {
2586 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2587 } else {
2588 warn "smooth face '$info->{smooth}' not found for face '$face'";
2589 }
2590 Coro::cede;
2591 }
2592 }
2593
2594 {
2595 my $anims = $facedata->{animinfo};
2596
2597 while (my ($anim, $info) = each %$anims) {
2598 cf::anim::set $anim, $info->{frames}, $info->{facings};
2599 Coro::cede;
2600 }
2601
2602 cf::anim::invalidate_all; # d'oh
2603 }
2604
2605 1
2606}
2607
2608sub reload_regions {
2609 load_resource_file "$MAPDIR/regions"
2610 or die "unable to load regions file\n";
2611}
2612
2613sub reload_facedata {
2614 load_facedata "$DATADIR/facedata"
2615 or die "unable to load facedata\n";
2616}
2617
2618sub reload_archetypes {
2619 load_resource_file "$DATADIR/archetypes"
2620 or die "unable to load archetypes\n";
2621}
2622
2623sub reload_treasures {
2624 load_resource_file "$DATADIR/treasures"
2625 or die "unable to load treasurelists\n";
2626}
2627
2628sub reload_resources {
2629 warn "reloading resource files...\n";
2630
2631 reload_regions;
2632 reload_facedata;
2633 #reload_archetypes;#d#
2634 reload_archetypes;
2635 reload_treasures;
2636
2637 warn "finished reloading resource files\n";
2638}
2639
2640sub init {
2641 reload_resources;
2642}
2207 2643
2208sub cfg_load { 2644sub cfg_load {
2209 open my $fh, "<:utf8", cf::confdir . "/config" 2645 open my $fh, "<:utf8", "$CONFDIR/config"
2210 or return; 2646 or return;
2211 2647
2212 local $/; 2648 local $/;
2213 *CFG = YAML::Syck::Load <$fh>; 2649 *CFG = YAML::Syck::Load <$fh>;
2214 2650
2229sub main { 2665sub main {
2230 # we must not ever block the main coroutine 2666 # we must not ever block the main coroutine
2231 local $Coro::idle = sub { 2667 local $Coro::idle = sub {
2232 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2668 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2233 (async { 2669 (async {
2234 warn "BP1\n";#d#
2235 Event::one_event; 2670 Event::one_event;
2236 warn "BP2\n";#d#
2237 })->prio (Coro::PRIO_MAX); 2671 })->prio (Coro::PRIO_MAX);
2238 }; 2672 };
2239 2673
2240 cfg_load; 2674 cfg_load;
2241 db_load; 2675 db_init;
2242 load_extensions; 2676 load_extensions;
2677
2678 $TICK_WATCHER->start;
2243 Event::loop; 2679 Event::loop;
2244} 2680}
2245 2681
2246############################################################################# 2682#############################################################################
2247# initialisation and cleanup 2683# initialisation and cleanup
2248 2684
2249# install some emergency cleanup handlers 2685# install some emergency cleanup handlers
2250BEGIN { 2686BEGIN {
2251 for my $signal (qw(INT HUP TERM)) { 2687 for my $signal (qw(INT HUP TERM)) {
2252 Event->signal ( 2688 Event->signal (
2689 reentrant => 0,
2253 data => WF_AUTOCANCEL, 2690 data => WF_AUTOCANCEL,
2254 signal => $signal, 2691 signal => $signal,
2692 prio => 0,
2255 cb => sub { 2693 cb => sub {
2256 cf::cleanup "SIG$signal"; 2694 cf::cleanup "SIG$signal";
2257 }, 2695 },
2258 ); 2696 );
2259 } 2697 }
2260} 2698}
2281 my $map = $cf::MAP{$path} or next; 2719 my $map = $cf::MAP{$path} or next;
2282 $map->valid or next; 2720 $map->valid or next;
2283 $map->save; 2721 $map->save;
2284 } 2722 }
2285 warn "end emergency map save\n"; 2723 warn "end emergency map save\n";
2724
2725 warn "begin emergency database checkpoint\n";
2726 BDB::db_env_txn_checkpoint $DB_ENV;
2727 warn "end emergency database checkpoint\n";
2286 }; 2728 };
2287 2729
2288 warn "leave emergency perl save\n"; 2730 warn "leave emergency perl save\n";
2289} 2731}
2290 2732
2733sub post_cleanup {
2734 my ($make_core) = @_;
2735
2736 warn Carp::longmess "post_cleanup backtrace"
2737 if $make_core;
2738}
2739
2291sub reload() { 2740sub do_reload_perl() {
2292 # can/must only be called in main 2741 # can/must only be called in main
2293 if ($Coro::current != $Coro::main) { 2742 if ($Coro::current != $Coro::main) {
2294 warn "can only reload from main coroutine\n"; 2743 warn "can only reload from main coroutine";
2295 return; 2744 return;
2296 } 2745 }
2297 2746
2298 warn "reloading..."; 2747 warn "reloading...";
2299 2748
2300 warn "freezing server"; 2749 warn "entering sync_job";
2301 my $guard = freeze_mainloop; 2750
2751 cf::sync_job {
2752 cf::write_runtime; # external watchdog should not bark
2302 cf::emergency_save; 2753 cf::emergency_save;
2754 cf::write_runtime; # external watchdog should not bark
2303 2755
2304 warn "sync database to disk"; 2756 warn "syncing database to disk";
2305 cf::db_sync; 2757 BDB::db_env_txn_checkpoint $DB_ENV;
2306 IO::AIO::flush;
2307 2758
2308 eval {
2309 # if anything goes wrong in here, we should simply crash as we already saved 2759 # if anything goes wrong in here, we should simply crash as we already saved
2310 2760
2311 warn "cancel all watchers"; 2761 warn "cancelling all WF_AUTOCANCEL watchers";
2312 for (Event::all_watchers) { 2762 for (Event::all_watchers) {
2313 $_->cancel if $_->data & WF_AUTOCANCEL; 2763 $_->cancel if $_->data & WF_AUTOCANCEL;
2314 } 2764 }
2315 2765
2766 warn "flushing outstanding aio requests";
2767 for (;;) {
2768 BDB::flush;
2769 IO::AIO::flush;
2770 Coro::cede;
2771 last unless IO::AIO::nreqs || BDB::nreqs;
2772 warn "iterate...";
2773 }
2774
2775 ++$RELOAD;
2776
2316 warn "cancel all extension coros"; 2777 warn "cancelling all extension coros";
2317 $_->cancel for values %EXT_CORO; 2778 $_->cancel for values %EXT_CORO;
2318 %EXT_CORO = (); 2779 %EXT_CORO = ();
2319 2780
2320 warn "remove commands"; 2781 warn "removing commands";
2321 %COMMAND = (); 2782 %COMMAND = ();
2322 2783
2323 warn "remove ext commands"; 2784 warn "removing ext commands";
2324 %EXTCMD = (); 2785 %EXTCMD = ();
2325 2786
2326 warn "unload/nuke all extensions"; 2787 warn "unloading/nuking all extensions";
2327 for my $pkg (@EXTS) { 2788 for my $pkg (@EXTS) {
2328 warn "... unloading $pkg"; 2789 warn "... unloading $pkg";
2329 2790
2330 if (my $cb = $pkg->can ("unload")) { 2791 if (my $cb = $pkg->can ("unload")) {
2331 eval { 2792 eval {
2336 2797
2337 warn "... nuking $pkg"; 2798 warn "... nuking $pkg";
2338 Symbol::delete_package $pkg; 2799 Symbol::delete_package $pkg;
2339 } 2800 }
2340 2801
2341 warn "unload all perl modules loaded from $LIBDIR"; 2802 warn "unloading all perl modules loaded from $LIBDIR";
2342 while (my ($k, $v) = each %INC) { 2803 while (my ($k, $v) = each %INC) {
2343 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2804 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2344 2805
2345 warn "removing <$k>"; 2806 warn "... unloading $k";
2346 delete $INC{$k}; 2807 delete $INC{$k};
2347 2808
2348 $k =~ s/\.pm$//; 2809 $k =~ s/\.pm$//;
2349 $k =~ s/\//::/g; 2810 $k =~ s/\//::/g;
2350 2811
2353 } 2814 }
2354 2815
2355 Symbol::delete_package $k; 2816 Symbol::delete_package $k;
2356 } 2817 }
2357 2818
2358 warn "get rid of safe::, as good as possible"; 2819 warn "getting rid of safe::, as good as possible";
2359 Symbol::delete_package "safe::$_" 2820 Symbol::delete_package "safe::$_"
2360 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2821 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2361 2822
2362 warn "unload cf.pm \"a bit\""; 2823 warn "unloading cf.pm \"a bit\"";
2363 delete $INC{"cf.pm"}; 2824 delete $INC{"cf.pm"};
2825 delete $INC{"cf/pod.pm"};
2364 2826
2365 # don't, removes xs symbols, too, 2827 # don't, removes xs symbols, too,
2366 # and global variables created in xs 2828 # and global variables created in xs
2367 #Symbol::delete_package __PACKAGE__; 2829 #Symbol::delete_package __PACKAGE__;
2368 2830
2831 warn "unload completed, starting to reload now";
2832
2369 warn "reloading cf.pm"; 2833 warn "reloading cf.pm";
2370 require cf; 2834 require cf;
2371 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2835 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2372 2836
2373 warn "load config and database again"; 2837 warn "loading config and database again";
2374 cf::cfg_load; 2838 cf::cfg_load;
2375 cf::db_load;
2376 2839
2377 warn "load extensions"; 2840 warn "loading extensions";
2378 cf::load_extensions; 2841 cf::load_extensions;
2379 2842
2380 warn "reattach attachments to objects/players"; 2843 warn "reattaching attachments to objects/players";
2381 _global_reattach; 2844 _global_reattach; # objects, sockets
2382 warn "reattach attachments to maps"; 2845 warn "reattaching attachments to maps";
2383 reattach $_ for values %MAP; 2846 reattach $_ for values %MAP;
2384 }; 2847 warn "reattaching attachments to players";
2848 reattach $_ for values %PLAYER;
2385 2849
2386 if ($@) { 2850 warn "leaving sync_job";
2851
2852 1
2853 } or do {
2387 warn $@; 2854 warn $@;
2388 warn "error while reloading, exiting."; 2855 warn "error while reloading, exiting.";
2389 exit 1; 2856 exit 1;
2390 } 2857 };
2391 2858
2392 warn "reloaded"; 2859 warn "reloaded";
2393}; 2860};
2394 2861
2395our $RELOAD_WATCHER; # used only during reload 2862our $RELOAD_WATCHER; # used only during reload
2396 2863
2864sub reload_perl() {
2865 # doing reload synchronously and two reloads happen back-to-back,
2866 # coro crashes during coro_state_free->destroy here.
2867
2868 $RELOAD_WATCHER ||= Event->timer (
2869 reentrant => 0,
2870 after => 0,
2871 data => WF_AUTOCANCEL,
2872 cb => sub {
2873 do_reload_perl;
2874 undef $RELOAD_WATCHER;
2875 },
2876 );
2877}
2878
2397register_command "reload" => sub { 2879register_command "reload" => sub {
2398 my ($who, $arg) = @_; 2880 my ($who, $arg) = @_;
2399 2881
2400 if ($who->flag (FLAG_WIZ)) { 2882 if ($who->flag (FLAG_WIZ)) {
2401 $who->message ("reloading server."); 2883 $who->message ("reloading server.");
2402 2884 async { reload_perl };
2403 # doing reload synchronously and two reloads happen back-to-back,
2404 # coro crashes during coro_state_free->destroy here.
2405
2406 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2407 reload;
2408 undef $RELOAD_WATCHER;
2409 });
2410 } 2885 }
2411}; 2886};
2412 2887
2413unshift @INC, $LIBDIR; 2888unshift @INC, $LIBDIR;
2414 2889
2890my $bug_warning = 0;
2891
2892our @WAIT_FOR_TICK;
2893our @WAIT_FOR_TICK_BEGIN;
2894
2895sub wait_for_tick {
2896 return unless $TICK_WATCHER->is_active;
2897 return if $Coro::current == $Coro::main;
2898
2899 my $signal = new Coro::Signal;
2900 push @WAIT_FOR_TICK, $signal;
2901 $signal->wait;
2902}
2903
2904sub wait_for_tick_begin {
2905 return unless $TICK_WATCHER->is_active;
2906 return if $Coro::current == $Coro::main;
2907
2908 my $signal = new Coro::Signal;
2909 push @WAIT_FOR_TICK_BEGIN, $signal;
2910 $signal->wait;
2911}
2912
2913 my $min = 1e6;#d#
2914 my $avg = 10;
2415$TICK_WATCHER = Event->timer ( 2915$TICK_WATCHER = Event->timer (
2416 reentrant => 0, 2916 reentrant => 0,
2917 parked => 1,
2417 prio => 0, 2918 prio => 0,
2418 at => $NEXT_TICK || $TICK, 2919 at => $NEXT_TICK || $TICK,
2419 data => WF_AUTOCANCEL, 2920 data => WF_AUTOCANCEL,
2420 cb => sub { 2921 cb => sub {
2922 if ($Coro::current != $Coro::main) {
2923 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2924 unless ++$bug_warning > 10;
2925 return;
2926 }
2927
2421 $NOW = Event::time; 2928 $NOW = $tick_start = Event::time;
2422 2929
2423 cf::server_tick; # one server iteration 2930 cf::server_tick; # one server iteration
2931
2932 0 && sync_job {#d#
2933 for(1..10) {
2934 my $t = Event::time;
2935 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2936 or die;
2937
2938 $map->width (50);
2939 $map->height (50);
2940 $map->alloc;
2941 $map->_load_objects ("/tmp/x.map", 1);
2942 my $t = Event::time - $t;
2943
2944 #next unless $t < 0.0013;#d#
2945 if ($t < $min) {
2946 $min = $t;
2947 }
2948 $avg = $avg * 0.99 + $t * 0.01;
2949 }
2950 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2951 exit 0;
2952 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2953 };
2954
2424 $RUNTIME += $TICK; 2955 $RUNTIME += $TICK;
2425 $NEXT_TICK += $TICK; 2956 $NEXT_TICK += $TICK;
2426 2957
2427 $WAIT_FOR_TICK->broadcast; 2958 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2428 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2959 $NEXT_RUNTIME_WRITE = $NOW + 10;
2960 Coro::async_pool {
2961 write_runtime
2962 or warn "ERROR: unable to write runtime file: $!";
2963 };
2964 }
2965
2966# my $AFTER = Event::time;
2967# warn $AFTER - $NOW;#d#
2968
2969 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2970 $sig->send;
2971 }
2972 while (my $sig = shift @WAIT_FOR_TICK) {
2973 $sig->send;
2974 }
2975
2976 $NOW = Event::time;
2429 2977
2430 # if we are delayed by four ticks or more, skip them all 2978 # if we are delayed by four ticks or more, skip them all
2431 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2979 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2432 2980
2433 $TICK_WATCHER->at ($NEXT_TICK); 2981 $TICK_WATCHER->at ($NEXT_TICK);
2434 $TICK_WATCHER->start; 2982 $TICK_WATCHER->start;
2983
2984 $LOAD = ($NOW - $tick_start) / $TICK;
2985 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2986
2987 _post_tick;
2988
2989
2435 }, 2990 },
2436); 2991);
2437 2992
2993{
2994 BDB::max_poll_time $TICK * 0.1;
2995 $BDB_POLL_WATCHER = Event->io (
2996 reentrant => 0,
2997 fd => BDB::poll_fileno,
2998 poll => 'r',
2999 prio => 0,
3000 data => WF_AUTOCANCEL,
3001 cb => \&BDB::poll_cb,
3002 );
3003 BDB::min_parallel 8;
3004
3005 BDB::set_sync_prepare {
3006 my $status;
3007 my $current = $Coro::current;
3008 (
3009 sub {
3010 $status = $!;
3011 $current->ready; undef $current;
3012 },
3013 sub {
3014 Coro::schedule while defined $current;
3015 $! = $status;
3016 },
3017 )
3018 };
3019
3020 unless ($DB_ENV) {
3021 $DB_ENV = BDB::db_env_create;
3022
3023 cf::sync_job {
3024 eval {
3025 BDB::db_env_open
3026 $DB_ENV,
3027 $BDBDIR,
3028 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3029 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3030 0666;
3031
3032 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3033
3034 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3035 $DB_ENV->set_lk_detect;
3036 };
3037
3038 cf::cleanup "db_env_open(db): $@" if $@;
3039 };
3040 }
3041}
3042
3043{
3044 IO::AIO::min_parallel 8;
3045
3046 undef $Coro::AIO::WATCHER;
2438IO::AIO::max_poll_time $TICK * 0.2; 3047 IO::AIO::max_poll_time $TICK * 0.1;
2439
2440$AIO_POLL_WATCHER = Event->io ( 3048 $AIO_POLL_WATCHER = Event->io (
2441 fd => IO::AIO::poll_fileno, 3049 reentrant => 0,
2442 poll => 'r',
2443 prio => 5,
2444 data => WF_AUTOCANCEL,
2445 cb => \&IO::AIO::poll_cb,
2446);
2447
2448$WRITE_RUNTIME_WATCHER = Event->timer (
2449 data => WF_AUTOCANCEL, 3050 data => WF_AUTOCANCEL,
2450 after => 0, 3051 fd => IO::AIO::poll_fileno,
2451 interval => 10, 3052 poll => 'r',
2452 cb => sub { 3053 prio => 6,
2453 (Coro::unblock_sub { 3054 cb => \&IO::AIO::poll_cb,
2454 write_runtime 3055 );
2455 or warn "ERROR: unable to write runtime file: $!"; 3056}
3057
3058my $_log_backtrace;
3059
3060sub _log_backtrace {
3061 my ($msg, @addr) = @_;
3062
3063 $msg =~ s/\n//;
3064
3065 # limit the # of concurrent backtraces
3066 if ($_log_backtrace < 2) {
3067 ++$_log_backtrace;
3068 async {
3069 my @bt = fork_call {
3070 @addr = map { sprintf "%x", $_ } @addr;
3071 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3072 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3073 or die "addr2line: $!";
3074
3075 my @funcs;
3076 my @res = <$fh>;
3077 chomp for @res;
3078 while (@res) {
3079 my ($func, $line) = splice @res, 0, 2, ();
3080 push @funcs, "[$func] $line";
3081 }
3082
3083 @funcs
3084 };
3085
3086 LOG llevInfo, "[ABT] $msg\n";
3087 LOG llevInfo, "[ABT] $_\n" for @bt;
3088 --$_log_backtrace;
2456 })->(); 3089 };
3090 } else {
3091 LOG llevInfo, "[ABT] $msg\n";
3092 LOG llevInfo, "[ABT] [suppressed]\n";
2457 }, 3093 }
2458); 3094}
3095
3096# load additional modules
3097use cf::pod;
2459 3098
2460END { cf::emergency_save } 3099END { cf::emergency_save }
2461 3100
24621 31011
2463 3102

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines