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.112 by root, Mon Jan 1 13:31:47 2007 UTC vs.
Revision 1.166 by root, Sat Jan 13 23:06:13 2007 UTC

8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3; 13use Coro 3.3 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Data::Dumper;
20use Digest::MD5; 21use Digest::MD5;
21use Fcntl; 22use Fcntl;
22use IO::AIO 2.31 (); 23use IO::AIO 2.32 ();
23use YAML::Syck (); 24use YAML::Syck ();
24use Time::HiRes; 25use Time::HiRes;
25 26
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 27use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 32$YAML::Syck::ImplicitUnicode = 1;
30 33
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 35
35our %COMMAND = (); 36our %COMMAND = ();
36our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
38
39our @EXTS = (); # list of extension package names
37our %EXTCMD = (); 40our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps
38 43
39our @EVENT; 44our @EVENT;
40our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
41 46
42our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
47our %CFG; 52our %CFG;
48 53
49our $UPTIME; $UPTIME ||= time; 54our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 55our $RUNTIME;
51 56
57our %PLAYER; # all users
52our %MAP; # all maps 58our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 59our $LINK_MAP; # the special {link} map, which is always available
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 60our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 61
62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
63our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
64
65# used to convert map paths into valid unix filenames by replacing / by ∕
66our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
57 67
58binmode STDOUT; 68binmode STDOUT;
59binmode STDERR; 69binmode STDERR;
60 70
61# read virtual server time, if available 71# read virtual server time, if available
69mkdir cf::localdir . "/" . cf::playerdir; 79mkdir cf::localdir . "/" . cf::playerdir;
70mkdir cf::localdir . "/" . cf::tmpdir; 80mkdir cf::localdir . "/" . cf::tmpdir;
71mkdir cf::localdir . "/" . cf::uniquedir; 81mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 82mkdir $RANDOM_MAPS;
73 83
74# a special map that is always available 84our $EMERGENCY_POSITION;
75our $LINK_MAP;
76
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 85
79############################################################################# 86#############################################################################
80 87
81=head2 GLOBAL VARIABLES 88=head2 GLOBAL VARIABLES
82 89
106 113
107=item %cf::CFG 114=item %cf::CFG
108 115
109Configuration for the server, loaded from C</etc/crossfire/config>, or 116Configuration for the server, loaded from C</etc/crossfire/config>, or
110from wherever your confdir points to. 117from wherever your confdir points to.
118
119=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
120
121These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
122or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
123processing has been done. Call C<< ->wait >> on them to maximise the
124window of cpu time available, or simply to synchronise to the server tick.
111 125
112=back 126=back
113 127
114=cut 128=cut
115 129
119 utf8::encode $msg; 133 utf8::encode $msg;
120 134
121 $msg .= "\n" 135 $msg .= "\n"
122 unless $msg =~ /\n$/; 136 unless $msg =~ /\n$/;
123 137
124 LOG llevError, "cfperl: $msg"; 138 LOG llevError, $msg;
125 }; 139 };
126} 140}
127 141
128@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 142@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
129@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 143@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
147 161
148$Event::DIED = sub { 162$Event::DIED = sub {
149 warn "error in event callback: @_"; 163 warn "error in event callback: @_";
150}; 164};
151 165
152my %ext_pkg;
153my @exts;
154my @hook;
155
156=head2 UTILITY FUNCTIONS 166=head2 UTILITY FUNCTIONS
157 167
158=over 4 168=over 4
159 169
170=item dumpval $ref
171
160=cut 172=cut
173
174sub dumpval {
175 eval {
176 local $SIG{__DIE__};
177 my $d;
178 if (1) {
179 $d = new Data::Dumper([$_[0]], ["*var"]);
180 $d->Terse(1);
181 $d->Indent(2);
182 $d->Quotekeys(0);
183 $d->Useqq(1);
184 #$d->Bless(...);
185 $d->Seen($_[1]) if @_ > 1;
186 $d = $d->Dump();
187 }
188 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
189 $d
190 } || "[unable to dump $_[0]: '$@']";
191}
161 192
162use JSON::Syck (); # TODO# replace by JSON::PC once working 193use JSON::Syck (); # TODO# replace by JSON::PC once working
163 194
164=item $ref = cf::from_json $json 195=item $ref = cf::from_json $json
165 196
180 211
181sub to_json($) { 212sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 213 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 214 JSON::Syck::Dump $_[0]
184} 215}
216
217=item cf::lock_wait $string
218
219Wait until the given lock is available. See cf::lock_acquire.
220
221=item my $lock = cf::lock_acquire $string
222
223Wait until the given lock is available and then acquires it and returns
224a Coro::guard object. If the guard object gets destroyed (goes out of scope,
225for example when the coroutine gets canceled), the lock is automatically
226returned.
227
228Lock names should begin with a unique identifier (for example, cf::map::find
229uses map_find and cf::map::load uses map_load).
230
231=cut
232
233our %LOCK;
234
235sub lock_wait($) {
236 my ($key) = @_;
237
238 # wait for lock, if any
239 while ($LOCK{$key}) {
240 push @{ $LOCK{$key} }, $Coro::current;
241 Coro::schedule;
242 }
243}
244
245sub lock_acquire($) {
246 my ($key) = @_;
247
248 # wait, to be sure we are not locked
249 lock_wait $key;
250
251 $LOCK{$key} = [];
252
253 Coro::guard {
254 # wake up all waiters, to be on the safe side
255 $_->ready for @{ delete $LOCK{$key} };
256 }
257}
258
259sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active;
261
262 my $guard = Coro::guard { $TICK_WATCHER->start };
263 $TICK_WATCHER->stop;
264 $guard
265}
266
267=item cf::async { BLOCK }
268
269Currently the same as Coro::async_pool, meaning you cannot use
270C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
271thing you are allowed to do is call C<prio> on it.
272
273=cut
274
275BEGIN { *async = \&Coro::async_pool }
185 276
186=item cf::sync_job { BLOCK } 277=item cf::sync_job { BLOCK }
187 278
188The design of crossfire+ requires that the main coro ($Coro::main) is 279The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 280always able to handle events or runnable, as crossfire+ is only partly
203 # this is the main coro, too bad, we have to block 294 # this is the main coro, too bad, we have to block
204 # till the operation succeeds, freezing the server :/ 295 # till the operation succeeds, freezing the server :/
205 296
206 # TODO: use suspend/resume instead 297 # TODO: use suspend/resume instead
207 # (but this is cancel-safe) 298 # (but this is cancel-safe)
208 local $FREEZE = 1; 299 my $freeze_guard = freeze_mainloop;
209 300
210 my $busy = 1; 301 my $busy = 1;
211 my @res; 302 my @res;
212 303
213 (Coro::async { 304 (async {
214 @res = eval { $job->() }; 305 @res = eval { $job->() };
215 warn $@ if $@; 306 warn $@ if $@;
216 undef $busy; 307 undef $busy;
217 })->prio (Coro::PRIO_MAX); 308 })->prio (Coro::PRIO_MAX);
218 309
219 while ($busy) { 310 while ($busy) {
220 Coro::cede_notself; 311 Coro::cede or Event::one_event;
221 Event::one_event unless Coro::nready;
222 } 312 }
223 313
224 wantarray ? @res : $res[0] 314 wantarray ? @res : $res[0]
225 } else { 315 } else {
226 # we are in another coroutine, how wonderful, everything just works 316 # we are in another coroutine, how wonderful, everything just works
227 317
228 $job->() 318 $job->()
229 } 319 }
230} 320}
231 321
232=item $coro = cf::coro { BLOCK } 322=item $coro = cf::async_ext { BLOCK }
233 323
234Creates and returns a new coro. This coro is automcatially being canceled 324Like async, but this coro is automatically being canceled when the
235when the extension calling this is being unloaded. 325extension calling this is being unloaded.
236 326
237=cut 327=cut
238 328
239sub coro(&) { 329sub async_ext(&) {
240 my $cb = shift; 330 my $cb = shift;
241 331
242 my $coro; $coro = async { 332 my $coro = &Coro::async ($cb);
243 eval {
244 $cb->();
245 };
246 warn $@ if $@;
247 };
248 333
249 $coro->on_destroy (sub { 334 $coro->on_destroy (sub {
250 delete $EXT_CORO{$coro+0}; 335 delete $EXT_CORO{$coro+0};
251 }); 336 });
252 $EXT_CORO{$coro+0} = $coro; 337 $EXT_CORO{$coro+0} = $coro;
253 338
254 $coro 339 $coro
255} 340}
256 341
257sub write_runtime { 342sub write_runtime {
343 return unless $TICK_WATCHER->is_active;
344
258 my $runtime = cf::localdir . "/runtime"; 345 my $runtime = cf::localdir . "/runtime";
259 346
260 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 347 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
261 or return; 348 or return;
262 349
277} 364}
278 365
279=back 366=back
280 367
281=cut 368=cut
282
283#############################################################################
284
285package cf::path;
286
287sub new {
288 my ($class, $path, $base) = @_;
289
290 $path = $path->as_string if ref $path;
291
292 my $self = bless { }, $class;
293
294 if ($path =~ s{^\?random/}{}) {
295 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
296 $self->{random} = cf::from_json $data;
297 } else {
298 if ($path =~ s{^~([^/]+)?}{}) {
299 $self->{user_rel} = 1;
300
301 if (defined $1) {
302 $self->{user} = $1;
303 } elsif ($base =~ m{^~([^/]+)/}) {
304 $self->{user} = $1;
305 } else {
306 warn "cannot resolve user-relative path without user <$path,$base>\n";
307 }
308 } elsif ($path =~ /^\//) {
309 # already absolute
310 } else {
311 $base =~ s{[^/]+/?$}{};
312 return $class->new ("$base/$path");
313 }
314
315 for ($path) {
316 redo if s{/\.?/}{/};
317 redo if s{/[^/]+/\.\./}{/};
318 }
319 }
320
321 $self->{path} = $path;
322
323 $self
324}
325
326# the name / primary key / in-game path
327sub as_string {
328 my ($self) = @_;
329
330 $self->{user_rel} ? "~$self->{user}$self->{path}"
331 : $self->{random} ? "?random/$self->{path}"
332 : $self->{path}
333}
334
335# the displayed name, this is a one way mapping
336sub visible_name {
337 my ($self) = @_;
338
339# if (my $rmp = $self->{random}) {
340# # todo: be more intelligent about this
341# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
342# } else {
343 $self->as_string
344# }
345}
346
347# escape the /'s in the path
348sub _escaped_path {
349 # ∕ is U+2215
350 (my $path = $_[0]{path}) =~ s/\//∕/g;
351 $path
352}
353
354# the original (read-only) location
355sub load_path {
356 my ($self) = @_;
357
358 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
359}
360
361# the temporary/swap location
362sub save_path {
363 my ($self) = @_;
364
365 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
366 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
367 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
368}
369
370# the unique path, might be eq to save_path
371sub uniq_path {
372 my ($self) = @_;
373
374 $self->{user_rel} || $self->{random}
375 ? undef
376 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
377}
378
379# return random map parameters, or undef
380sub random_map_params {
381 my ($self) = @_;
382
383 $self->{random}
384}
385
386# this is somewhat ugly, but style maps do need special treatment
387sub is_style_map {
388 $_[0]{path} =~ m{^/styles/}
389}
390
391package cf;
392 369
393############################################################################# 370#############################################################################
394 371
395=head2 ATTACHABLE OBJECTS 372=head2 ATTACHABLE OBJECTS
396 373
804 or return; 781 or return;
805 782
806 unless (aio_stat "$filename.pst") { 783 unless (aio_stat "$filename.pst") {
807 (aio_load "$filename.pst", $av) >= 0 784 (aio_load "$filename.pst", $av) >= 0
808 or return; 785 or return;
809 $av = eval { (Storable::thaw <$av>)->{objs} }; 786 $av = eval { (Storable::thaw $av)->{objs} };
810 } 787 }
811 788
789 warn sprintf "loading %s (%d)\n",
790 $filename, length $data, scalar @{$av || []};#d#
812 return ($data, $av); 791 return ($data, $av);
813} 792}
814 793
815############################################################################# 794#############################################################################
816# command handling &c 795# command handling &c
841=cut 820=cut
842 821
843sub register_extcmd { 822sub register_extcmd {
844 my ($name, $cb) = @_; 823 my ($name, $cb) = @_;
845 824
846 my $caller = caller;
847 #warn "registering extcmd '$name' to '$caller'";
848
849 $EXTCMD{$name} = [$cb, $caller]; 825 $EXTCMD{$name} = $cb;
850} 826}
851 827
852cf::player->attach ( 828cf::player->attach (
853 on_command => sub { 829 on_command => sub {
854 my ($pl, $name, $params) = @_; 830 my ($pl, $name, $params) = @_;
867 843
868 my $msg = eval { from_json $buf }; 844 my $msg = eval { from_json $buf };
869 845
870 if (ref $msg) { 846 if (ref $msg) {
871 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 847 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
872 if (my %reply = $cb->[0]->($pl, $msg)) { 848 if (my %reply = $cb->($pl, $msg)) {
873 $pl->ext_reply ($msg->{msgid}, %reply); 849 $pl->ext_reply ($msg->{msgid}, %reply);
874 } 850 }
875 } 851 }
876 } else { 852 } else {
877 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 853 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
879 855
880 cf::override; 856 cf::override;
881 }, 857 },
882); 858);
883 859
884sub register {
885 my ($base, $pkg) = @_;
886
887 #TODO
888}
889
890sub load_extension { 860sub load_extension {
891 my ($path) = @_; 861 my ($path) = @_;
892 862
893 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 863 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
894 my $base = $1; 864 my $base = $1;
895 my $pkg = $1; 865 my $pkg = $1;
896 $pkg =~ s/[^[:word:]]/_/g; 866 $pkg =~ s/[^[:word:]]/_/g;
897 $pkg = "ext::$pkg"; 867 $pkg = "ext::$pkg";
898 868
899 warn "loading '$path' into '$pkg'\n"; 869 warn "... loading '$path' into '$pkg'\n";
900 870
901 open my $fh, "<:utf8", $path 871 open my $fh, "<:utf8", $path
902 or die "$path: $!"; 872 or die "$path: $!";
903 873
904 my $source = 874 my $source =
905 "package $pkg; use strict; use utf8;\n" 875 "package $pkg; use strict; use utf8;\n"
906 . "#line 1 \"$path\"\n{\n" 876 . "#line 1 \"$path\"\n{\n"
907 . (do { local $/; <$fh> }) 877 . (do { local $/; <$fh> })
908 . "\n};\n1"; 878 . "\n};\n1";
909 879
910 eval $source 880 unless (eval $source) {
911 or die $@ ? "$path: $@\n" 881 my $msg = $@ ? "$path: $@\n"
912 : "extension disabled.\n"; 882 : "extension disabled.\n";
913 883 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
914 push @exts, $pkg; 884 warn $@;
915 $ext_pkg{$base} = $pkg; 885 warn "mandatory extension failed to load, exiting.\n";
916 886 exit 1;
917# no strict 'refs'; 887 }
918# @{"$pkg\::ISA"} = ext::; 888 die $@;
919
920 register $base, $pkg;
921}
922
923sub unload_extension {
924 my ($pkg) = @_;
925
926 warn "removing extension $pkg\n";
927
928 # remove hooks
929 #TODO
930# for my $idx (0 .. $#PLUGIN_EVENT) {
931# delete $hook[$idx]{$pkg};
932# } 889 }
933 890
934 # remove commands 891 push @EXTS, $pkg;
935 for my $name (keys %COMMAND) {
936 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
937
938 if (@cb) {
939 $COMMAND{$name} = \@cb;
940 } else {
941 delete $COMMAND{$name};
942 }
943 }
944
945 # remove extcmds
946 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
947 delete $EXTCMD{$name};
948 }
949
950 if (my $cb = $pkg->can ("unload")) {
951 eval {
952 $cb->($pkg);
953 1
954 } or warn "$pkg unloaded, but with errors: $@";
955 }
956
957 Symbol::delete_package $pkg;
958} 892}
959 893
960sub load_extensions { 894sub load_extensions {
961 for my $ext (<$LIBDIR/*.ext>) { 895 for my $ext (<$LIBDIR/*.ext>) {
962 next unless -r $ext; 896 next unless -r $ext;
980}; 914};
981 915
982cf::map->attach (prio => -10000, package => cf::mapsupport::); 916cf::map->attach (prio => -10000, package => cf::mapsupport::);
983 917
984############################################################################# 918#############################################################################
985# load/save perl data associated with player->ob objects
986
987sub all_objects(@) {
988 @_, map all_objects ($_->inv), @_
989}
990
991# TODO: compatibility cruft, remove when no longer needed
992cf::player->attach (
993 on_load => sub {
994 my ($pl, $path) = @_;
995
996 for my $o (all_objects $pl->ob) {
997 if (my $value = $o->get_ob_key_value ("_perl_data")) {
998 $o->set_ob_key_value ("_perl_data");
999
1000 %$o = %{ Storable::thaw pack "H*", $value };
1001 }
1002 }
1003 },
1004);
1005
1006#############################################################################
1007 919
1008=head2 CORE EXTENSIONS 920=head2 CORE EXTENSIONS
1009 921
1010Functions and methods that extend core crossfire objects. 922Functions and methods that extend core crossfire objects.
1011 923
924=cut
925
926package cf::player;
927
928use Coro::AIO;
929
1012=head3 cf::player 930=head3 cf::player
1013 931
1014=over 4 932=over 4
1015 933
1016=item cf::player::exists $login 934=item cf::player::find $login
1017 935
1018Returns true when the given account exists. 936Returns the given player object, loading it if necessary (might block).
1019 937
1020=cut 938=cut
1021 939
1022sub cf::player::exists($) { 940sub playerdir($) {
1023 cf::player::find $_[0] 941 cf::localdir
1024 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 942 . "/"
943 . cf::playerdir
944 . "/"
945 . (ref $_[0] ? $_[0]->ob->name : $_[0])
946}
947
948sub path($) {
949 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
950
951 (playerdir $login) . "/$login.pl"
952}
953
954sub find_active($) {
955 $cf::PLAYER{$_[0]}
956 and $cf::PLAYER{$_[0]}->active
957 and $cf::PLAYER{$_[0]}
958}
959
960sub exists($) {
961 my ($login) = @_;
962
963 $cf::PLAYER{$login}
964 or cf::sync_job { !aio_stat $login }
965}
966
967sub find($) {
968 return $cf::PLAYER{$_[0]} || do {
969 my $login = $_[0];
970
971 my $guard = cf::lock_acquire "user_find:$login";
972
973 $cf::PLAYER{$_[0]} || do {
974 my $pl = load_pl path $login
975 or return;
976 $cf::PLAYER{$login} = $pl
977 }
978 }
979}
980
981sub save($) {
982 my ($pl) = @_;
983
984 return if $pl->{deny_save};
985
986 my $path = path $pl;
987 my $guard = cf::lock_acquire "user_save:$path";
988
989 return if $pl->{deny_save};
990
991 aio_mkdir playerdir $pl, 0770;
992 $pl->{last_save} = $cf::RUNTIME;
993
994 $pl->save_pl ($path);
995 Coro::cede;
996}
997
998sub new($) {
999 my ($login) = @_;
1000
1001 my $self = create;
1002
1003 $self->ob->name ($login);
1004 $self->{deny_save} = 1;
1005
1006 $cf::PLAYER{$login} = $self;
1007
1008 $self
1009}
1010
1011=item $pl->quit_character
1012
1013Nukes the player without looking back. If logged in, the connection will
1014be destroyed. May block for a long time.
1015
1016=cut
1017
1018sub quit_character {
1019 my ($pl) = @_;
1020
1021 $pl->{deny_save} = 1;
1022 $pl->password ("*"); # this should lock out the player until we nuked the dir
1023
1024 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1025 $pl->deactivate;
1026 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1027 $pl->ns->destroy if $pl->ns;
1028
1029 my $path = playerdir $pl;
1030 my $temp = "$path~$cf::RUNTIME~deleting~";
1031 aio_rename $path, $temp;
1032 delete $cf::PLAYER{$pl->ob->name};
1033 $pl->destroy;
1034 IO::AIO::aio_rmtree $temp;
1035}
1036
1037=item cf::player::list_logins
1038
1039Returns am arrayref of all valid playernames in the system, can take a
1040while and may block, so not sync_job-capable, ever.
1041
1042=cut
1043
1044sub list_logins {
1045 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1046 or return [];
1047
1048 my @logins;
1049
1050 for my $login (@$dirs) {
1051 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1052 aio_read $fh, 0, 512, my $buf, 0 or next;
1053 $buf !~ /^password -------------$/m or next; # official not-valid tag
1054
1055 utf8::decode $login;
1056 push @logins, $login;
1057 }
1058
1059 \@logins
1060}
1061
1062=item $player->maps
1063
1064Returns an arrayref of map paths that are private for this
1065player. May block.
1066
1067=cut
1068
1069sub maps($) {
1070 my ($pl) = @_;
1071
1072 my $files = aio_readdir playerdir $pl
1073 or return;
1074
1075 my @paths;
1076
1077 for (@$files) {
1078 utf8::decode $_;
1079 next if /\.(?:pl|pst)$/;
1080 next unless /^$PATH_SEP/o;
1081
1082 push @paths, "~" . $pl->ob->name . "/" . $_;
1083 }
1084
1085 \@paths
1025} 1086}
1026 1087
1027=item $player->ext_reply ($msgid, $msgtype, %msg) 1088=item $player->ext_reply ($msgid, $msgtype, %msg)
1028 1089
1029Sends an ext reply to the player. 1090Sends an ext reply to the player.
1030 1091
1031=cut 1092=cut
1032 1093
1033sub cf::player::ext_reply($$$%) { 1094sub ext_reply($$$%) {
1034 my ($self, $id, %msg) = @_; 1095 my ($self, $id, %msg) = @_;
1035 1096
1036 $msg{msgid} = $id; 1097 $msg{msgid} = $id;
1037 1098
1038 $self->send ("ext " . to_json \%msg); 1099 $self->send ("ext " . cf::to_json \%msg);
1039} 1100}
1101
1102package cf;
1040 1103
1041=back 1104=back
1042 1105
1043 1106
1044=head3 cf::map 1107=head3 cf::map
1050package cf::map; 1113package cf::map;
1051 1114
1052use Fcntl; 1115use Fcntl;
1053use Coro::AIO; 1116use Coro::AIO;
1054 1117
1118use overload
1119 '""' => \&as_string;
1120
1055our $MAX_RESET = 7200; 1121our $MAX_RESET = 3600;
1056our $DEFAULT_RESET = 3600; 1122our $DEFAULT_RESET = 3000;
1057 1123
1058sub generate_random_map { 1124sub generate_random_map {
1059 my ($path, $rmp) = @_; 1125 my ($self, $rmp) = @_;
1060 1126
1061 # mit "rum" bekleckern, nicht 1127 # mit "rum" bekleckern, nicht
1062 cf::map::_create_random_map 1128 $self->_create_random_map (
1063 $path,
1064 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1129 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1065 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1130 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1066 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1131 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1067 $rmp->{exit_on_final_map}, 1132 $rmp->{exit_on_final_map},
1068 $rmp->{xsize}, $rmp->{ysize}, 1133 $rmp->{xsize}, $rmp->{ysize},
1069 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1134 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1070 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1135 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1071 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1136 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1072 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1137 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1073 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1138 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1074 (cf::region::find $rmp->{region}) 1139 (cf::region::find $rmp->{region}), $rmp->{custom}
1140 )
1141}
1142
1143sub register {
1144 my (undef, $regex) = @_;
1145 my $pkg = caller;
1146
1147 no strict;
1148 push @{"$pkg\::ISA"}, __PACKAGE__;
1149
1150 $EXT_MAP{$pkg} = qr<$regex>;
1151}
1152
1153# also paths starting with '/'
1154$EXT_MAP{"cf::map"} = qr{^(?=/)};
1155
1156sub normalise {
1157 my ($path, $base) = @_;
1158
1159 # map plan:
1160 #
1161 # /! non-realised random map exit (special hack!)
1162 # {... are special paths that are not being touched
1163 # ?xxx/... are special absolute paths
1164 # ?random/... random maps
1165 # /... normal maps
1166 # ~user/... per-player map of a specific user
1167
1168 $path =~ s/$PATH_SEP/\//go;
1169
1170 # treat it as relative path if it starts with
1171 # something that looks reasonable
1172 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1173 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1174
1175 $base =~ s{[^/]+/?$}{};
1176 $path = "$base/$path";
1177 }
1178
1179 for ($path) {
1180 redo if s{//}{/};
1181 redo if s{/\.?/}{/};
1182 redo if s{/[^/]+/\.\./}{/};
1183 }
1184
1185 $path
1186}
1187
1188sub new_from_path {
1189 my (undef, $path, $base) = @_;
1190
1191 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1192
1193 $path = normalise $path, $base;
1194
1195 for my $pkg (keys %EXT_MAP) {
1196 if ($path =~ $EXT_MAP{$pkg}) {
1197 my $self = bless cf::map::new, $pkg;
1198 $self->{path} = $path; $self->path ($path);
1199 $self->init; # pass $1 etc.
1200 return $self;
1201 }
1202 }
1203
1204 Carp::carp "unable to resolve path '$path'.";
1205 ()
1206}
1207
1208sub init {
1209 my ($self) = @_;
1210
1211 $self
1212}
1213
1214sub as_string {
1215 my ($self) = @_;
1216
1217 "$self->{path}"
1218}
1219
1220# the displayed name, this is a one way mapping
1221sub visible_name {
1222 &as_string
1223}
1224
1225# escape the /'s in the path
1226sub _escaped_path {
1227 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1228
1229 $path
1230}
1231
1232# the original (read-only) location
1233sub load_path {
1234 my ($self) = @_;
1235
1236 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1237}
1238
1239# the temporary/swap location
1240sub save_path {
1241 my ($self) = @_;
1242
1243 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $self->_escaped_path
1244}
1245
1246# the unique path, undef == no special unique path
1247sub uniq_path {
1248 my ($self) = @_;
1249
1250 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
1075} 1251}
1076 1252
1077# and all this just because we cannot iterate over 1253# and all this just because we cannot iterate over
1078# all maps in C++... 1254# all maps in C++...
1079sub change_all_map_light { 1255sub change_all_map_light {
1080 my ($change) = @_; 1256 my ($change) = @_;
1081 1257
1082 $_->change_map_light ($change) for values %cf::MAP; 1258 $_->change_map_light ($change)
1259 for grep $_->outdoor, values %cf::MAP;
1083} 1260}
1084 1261
1262sub unlink_save {
1263 my ($self) = @_;
1264
1265 utf8::encode (my $save = $self->save_path);
1266 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
1267 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
1268}
1269
1085sub try_load_header($) { 1270sub load_header_from($) {
1086 my ($path) = @_; 1271 my ($self, $path) = @_;
1087 1272
1088 utf8::encode $path; 1273 utf8::encode $path;
1089 aio_open $path, O_RDONLY, 0 1274 aio_open $path, O_RDONLY, 0
1090 or return; 1275 or return;
1091 1276
1092 my $map = cf::map::new 1277 $self->_load_header ($path)
1093 or return; 1278 or return;
1094 1279
1095 $map->load_header ($path) 1280 $self->{load_path} = $path;
1281
1282 1
1283}
1284
1285sub load_orig {
1286 my ($self) = @_;
1287
1288 $self->load_header_from ($self->load_path)
1289}
1290
1291sub load_temp {
1292 my ($self) = @_;
1293
1294 $self->load_header_from ($self->save_path)
1295}
1296
1297sub load_header {
1298 my ($self) = @_;
1299
1300 if ($self->load_temp) {
1301 $self->last_access ((delete $self->{last_access})
1302 || $cf::RUNTIME); #d#
1303 # safety
1304 $self->{instantiate_time} = $cf::RUNTIME
1305 if $self->{instantiate_time} > $cf::RUNTIME;
1306 } else {
1307 $self->load_orig
1096 or return; 1308 or return;
1097 1309
1098 $map->{load_path} = $path; 1310 $self->{load_original} = 1;
1311 $self->{instantiate_time} = $cf::RUNTIME;
1312 $self->last_access ($cf::RUNTIME);
1313 $self->instantiate;
1314 }
1099 1315
1100 $map 1316 1
1101} 1317}
1102 1318
1319sub find;
1103sub find_map { 1320sub find {
1104 my ($path, $origin) = @_; 1321 my ($path, $origin) = @_;
1105 1322
1106 #warn "find_map<$path,$origin>\n";#d#
1107
1108 $path = new cf::path $path, $origin && $origin->path; 1323 $path = normalise $path, $origin && $origin->path;
1109 my $key = $path->as_string;
1110 1324
1325 cf::lock_wait "map_find:$path";
1326
1111 $cf::MAP{$key} || do { 1327 $cf::MAP{$path} || do {
1112 # do it the slow way 1328 my $guard = cf::lock_acquire "map_find:$path";
1113 my $map = try_load_header $path->save_path; 1329 my $map = new_from_path cf::map $path
1114
1115 if ($map) {
1116 # safety
1117 $map->{instantiate_time} = $cf::RUNTIME
1118 if $map->{instantiate_time} > $cf::RUNTIME;
1119 } else {
1120 if (my $rmp = $path->random_map_params) {
1121 $map = generate_random_map $key, $rmp;
1122 } else {
1123 $map = try_load_header $path->load_path;
1124 }
1125
1126 $map or return; 1330 or return;
1127 1331
1128 $map->{load_original} = 1;
1129 $map->{instantiate_time} = $cf::RUNTIME;
1130 $map->instantiate;
1131
1132 # per-player maps become, after loading, normal maps
1133 $map->per_player (0) if $path->{user_rel};
1134 }
1135
1136 $map->path ($key);
1137 $map->{path} = $path;
1138 $map->last_access ($cf::RUNTIME); 1332 $map->{last_save} = $cf::RUNTIME;
1333
1334 $map->load_header
1335 or return;
1139 1336
1140 if ($map->should_reset) { 1337 if ($map->should_reset) {
1141 $map->reset; 1338 $map->reset;
1339 undef $guard;
1142 $map = find_map $path; 1340 $map = find $path
1341 or return;
1143 } 1342 }
1144 1343
1145 $cf::MAP{$key} = $map 1344 $cf::MAP{$path} = $map
1146 } 1345 }
1147} 1346}
1148 1347
1149sub load { 1348sub load {
1150 my ($self) = @_; 1349 my ($self) = @_;
1151 1350
1351 my $path = $self->{path};
1352 my $guard = cf::lock_acquire "map_load:$path";
1353
1152 return if $self->in_memory != cf::MAP_SWAPPED; 1354 return if $self->in_memory != cf::MAP_SWAPPED;
1153 1355
1154 $self->in_memory (cf::MAP_LOADING); 1356 $self->in_memory (cf::MAP_LOADING);
1155 1357
1156 my $path = $self->{path};
1157
1158 $self->alloc; 1358 $self->alloc;
1159 $self->load_objects ($self->{load_path}, 1) 1359 $self->_load_objects ($self->{load_path}, 1)
1160 or return; 1360 or return;
1161 1361
1162 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1362 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1163 if delete $self->{load_original}; 1363 if delete $self->{load_original};
1164 1364
1165 if (my $uniq = $path->uniq_path) { 1365 if (my $uniq = $self->uniq_path) {
1166 utf8::encode $uniq; 1366 utf8::encode $uniq;
1167 if (aio_open $uniq, O_RDONLY, 0) { 1367 if (aio_open $uniq, O_RDONLY, 0) {
1168 $self->clear_unique_items; 1368 $self->clear_unique_items;
1169 $self->load_objects ($uniq, 0); 1369 $self->_load_objects ($uniq, 0);
1170 } 1370 }
1171 } 1371 }
1372
1373 Coro::cede;
1172 1374
1173 # now do the right thing for maps 1375 # now do the right thing for maps
1174 $self->link_multipart_objects; 1376 $self->link_multipart_objects;
1175 1377
1176 if ($self->{path}->is_style_map) { 1378 unless ($self->{deny_activate}) {
1177 $self->{deny_save} = 1; 1379 $self->decay_objects;
1178 $self->{deny_reset} = 1;
1179 } else {
1180 $self->fix_auto_apply; 1380 $self->fix_auto_apply;
1181 $self->decay_objects;
1182 $self->update_buttons; 1381 $self->update_buttons;
1382 Coro::cede;
1183 $self->set_darkness_map; 1383 $self->set_darkness_map;
1184 $self->difficulty ($self->estimate_difficulty) 1384 $self->difficulty ($self->estimate_difficulty)
1185 unless $self->difficulty; 1385 unless $self->difficulty;
1386 Coro::cede;
1186 $self->activate; 1387 $self->activate;
1187 } 1388 }
1188 1389
1189 $self->in_memory (cf::MAP_IN_MEMORY); 1390 $self->in_memory (cf::MAP_IN_MEMORY);
1190} 1391}
1191 1392
1192sub load_map_sync { 1393sub customise_for {
1394 my ($self, $ob) = @_;
1395
1396 return find "~" . $ob->name . "/" . $self->{path}
1397 if $self->per_player;
1398
1399 $self
1400}
1401
1402# find and load all maps in the 3x3 area around a map
1403sub load_diag {
1404 my ($map) = @_;
1405
1406 my @diag; # diagonal neighbours
1407
1408 for (0 .. 3) {
1409 my $neigh = $map->tile_path ($_)
1410 or next;
1411 $neigh = find $neigh, $map
1412 or next;
1413 $neigh->load;
1414
1415 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1416 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1417 }
1418
1419 for (@diag) {
1420 my $neigh = find @$_
1421 or next;
1422 $neigh->load;
1423 }
1424}
1425
1426sub find_sync {
1193 my ($path, $origin) = @_; 1427 my ($path, $origin) = @_;
1194 1428
1195 #warn "load_map_sync<$path, $origin>\n";#d# 1429 cf::sync_job { find $path, $origin }
1430}
1196 1431
1197 cf::sync_job { 1432sub do_load_sync {
1198 my $map = cf::map::find_map $path, $origin 1433 my ($map) = @_;
1434
1435 cf::sync_job { $map->load };
1436}
1437
1438our %MAP_PREFETCH;
1439our $MAP_PREFETCHER = Coro::async {
1440 while () {
1441 for my $path (keys %MAP_PREFETCH) {
1442 my $map = find $path
1199 or return; 1443 or next;
1200 $map->load; 1444 $map->load;
1201 $map 1445
1446 delete $MAP_PREFETCH{$path};
1447 }
1448 Coro::schedule;
1202 } 1449 }
1450};
1451
1452sub find_async {
1453 my ($path, $origin) = @_;
1454
1455 $path = normalise $path, $origin && $origin->{path};
1456
1457 if (my $map = $cf::MAP{$path}) {
1458 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1459 }
1460
1461 $MAP_PREFETCH{$path} = 0;
1462 $MAP_PREFETCHER->ready;
1463
1464 ()
1203} 1465}
1204 1466
1205sub save { 1467sub save {
1206 my ($self) = @_; 1468 my ($self) = @_;
1207 1469
1208 my $save = $self->{path}->save_path; utf8::encode $save; 1470 my $lock = cf::lock_acquire "map_data:" . $self->path;
1209 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1210 1471
1211 $self->{last_save} = $cf::RUNTIME; 1472 $self->{last_save} = $cf::RUNTIME;
1212 1473
1213 return unless $self->dirty; 1474 return unless $self->dirty;
1214 1475
1476 my $save = $self->save_path; utf8::encode $save;
1477 my $uniq = $self->uniq_path; utf8::encode $uniq;
1478
1215 $self->{load_path} = $save; 1479 $self->{load_path} = $save;
1216 1480
1217 return if $self->{deny_save}; 1481 return if $self->{deny_save};
1218 1482
1483 local $self->{last_access} = $self->last_access;#d#
1484
1485 cf::async {
1486 $_->contr->save for $self->players;
1487 };
1488
1219 if ($uniq) { 1489 if ($uniq) {
1220 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1490 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1221 $self->save_objects ($uniq, cf::IO_UNIQUES); 1491 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1222 } else { 1492 } else {
1223 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1493 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1224 } 1494 }
1225} 1495}
1226 1496
1227sub swap_out { 1497sub swap_out {
1228 my ($self) = @_; 1498 my ($self) = @_;
1499
1500 # save first because save cedes
1501 $self->save;
1502
1503 my $lock = cf::lock_acquire "map_data:" . $self->path;
1229 1504
1230 return if $self->players; 1505 return if $self->players;
1231 return if $self->in_memory != cf::MAP_IN_MEMORY; 1506 return if $self->in_memory != cf::MAP_IN_MEMORY;
1232 return if $self->{deny_save}; 1507 return if $self->{deny_save};
1233 1508
1234 $self->save;
1235 $self->clear; 1509 $self->clear;
1236 $self->in_memory (cf::MAP_SWAPPED); 1510 $self->in_memory (cf::MAP_SWAPPED);
1237} 1511}
1238 1512
1239sub reset_at { 1513sub reset_at {
1240 my ($self) = @_; 1514 my ($self) = @_;
1241 1515
1242 # TODO: safety, remove and allow resettable per-player maps 1516 # TODO: safety, remove and allow resettable per-player maps
1243 return 1e100 if $self->{path}{user_rel}; 1517 return 1e99 if $self->isa ("ext::map_per_player");
1244 return 1e100 if $self->{deny_reset}; 1518 return 1e99 if $self->{deny_reset};
1245 1519
1246 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1520 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1247 my $to = $self->reset_timeout || $DEFAULT_RESET; 1521 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1248 $to = $MAX_RESET if $to > $MAX_RESET;
1249 1522
1250 $time + $to 1523 $time + $to
1251} 1524}
1252 1525
1253sub should_reset { 1526sub should_reset {
1254 my ($self) = @_; 1527 my ($self) = @_;
1255 1528
1256 $self->reset_at <= $cf::RUNTIME 1529 $self->reset_at <= $cf::RUNTIME
1257} 1530}
1258 1531
1259sub unlink_save { 1532sub rename {
1260 my ($self) = @_; 1533 my ($self, $new_path) = @_;
1261 1534
1262 utf8::encode (my $save = $self->{path}->save_path); 1535 normalise $new_path;
1263 aioreq_pri 3; IO::AIO::aio_unlink $save; 1536
1264 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst"; 1537 $self->unlink_save;
1538
1539 delete $cf::MAP{$self->path};
1540 $self->{path} = $new_path; $self->path ($self->{path});
1541 $cf::MAP{$self->path} = $self;
1542
1543 $self->save;
1265} 1544}
1266 1545
1267sub reset { 1546sub reset {
1268 my ($self) = @_; 1547 my ($self) = @_;
1269 1548
1549 my $lock = cf::lock_acquire "map_data:" . $self->path;
1550
1270 return if $self->players; 1551 return if $self->players;
1271 return if $self->{path}{user_rel};#d# 1552 return if $self->isa ("ext::map_per_player");#d#
1272 1553
1273 warn "resetting map ", $self->path;#d# 1554 warn "resetting map ", $self->path;#d#
1274 1555
1275 delete $cf::MAP{$self->path}; 1556 delete $cf::MAP{$self->path};
1276 1557
1278 1559
1279 $self->unlink_save; 1560 $self->unlink_save;
1280 $self->destroy; 1561 $self->destroy;
1281} 1562}
1282 1563
1283sub customise_for { 1564my $nuke_counter = "aaaa";
1284 my ($map, $ob) = @_;
1285 1565
1286 if ($map->per_player) { 1566sub nuke {
1287 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1567 my ($self) = @_;
1288 }
1289 1568
1290 $map 1569 $self->{deny_save} = 1;
1570 $self->reset_timeout (1);
1571 $self->rename ("{nuke}/" . ($nuke_counter++));
1572 $self->reset; # polite request, might not happen
1291} 1573}
1292 1574
1293sub emergency_save { 1575=item cf::map::unique_maps
1294 local $cf::FREEZE = 1;
1295 1576
1296 warn "enter emergency map save\n"; 1577Returns an arrayref of paths of all shared maps that have
1578instantiated unique items. May block.
1297 1579
1298 cf::sync_job { 1580=cut
1299 warn "begin emergency map save\n"; 1581
1300 $_->save for values %cf::MAP; 1582sub unique_maps() {
1583 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1584 or return;
1585
1586 my @paths;
1587
1588 for (@$files) {
1589 utf8::decode $_;
1590 next if /\.pst$/;
1591 next unless /^$PATH_SEP/o;
1592
1593 push @paths, $_;
1301 }; 1594 }
1302 1595
1303 warn "end emergency map save\n"; 1596 \@paths
1304} 1597}
1305 1598
1306package cf; 1599package cf;
1307 1600
1308=back 1601=back
1309 1602
1603=head3 cf::object
1604
1605=cut
1606
1607package cf::object;
1608
1609=over 4
1610
1611=item $ob->inv_recursive
1612
1613Returns the inventory of the object _and_ their inventories, recursively.
1614
1615=cut
1616
1617sub inv_recursive_;
1618sub inv_recursive_ {
1619 map { $_, inv_recursive_ $_->inv } @_
1620}
1621
1622sub inv_recursive {
1623 inv_recursive_ inv $_[0]
1624}
1625
1626package cf;
1627
1628=back
1310 1629
1311=head3 cf::object::player 1630=head3 cf::object::player
1312 1631
1313=over 4 1632=over 4
1314 1633
1350 (ref $cf::CFG{"may_$access"} 1669 (ref $cf::CFG{"may_$access"}
1351 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1670 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1352 : $cf::CFG{"may_$access"}) 1671 : $cf::CFG{"may_$access"})
1353} 1672}
1354 1673
1674=item $player_object->enter_link
1675
1676Freezes the player and moves him/her to a special map (C<{link}>).
1677
1678The player should be reasonably safe there for short amounts of time. You
1679I<MUST> call C<leave_link> as soon as possible, though.
1680
1681Will never block.
1682
1683=item $player_object->leave_link ($map, $x, $y)
1684
1685Moves the player out of the special C<{link}> map onto the specified
1686map. If the map is not valid (or omitted), the player will be moved back
1687to the location he/she was before the call to C<enter_link>, or, if that
1688fails, to the emergency map position.
1689
1690Might block.
1691
1692=cut
1693
1694sub link_map {
1695 unless ($LINK_MAP) {
1696 $LINK_MAP = cf::map::find "{link}"
1697 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1698 $LINK_MAP->load;
1699 }
1700
1701 $LINK_MAP
1702}
1703
1355sub cf::object::player::enter_link { 1704sub cf::object::player::enter_link {
1356 my ($self) = @_; 1705 my ($self) = @_;
1357 1706
1358 return if $self->map == $LINK_MAP; 1707 $self->deactivate_recursive;
1359 1708
1709 return if UNIVERSAL::isa $self->map, "ext::map_link";
1710
1360 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1711 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1361 if $self->map; 1712 if $self->map;
1362 1713
1363 $self->enter_map ($LINK_MAP, 20, 20); 1714 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1364 $self->deactivate_recursive;
1365} 1715}
1366 1716
1367sub cf::object::player::leave_link { 1717sub cf::object::player::leave_link {
1368 my ($self, $map, $x, $y) = @_; 1718 my ($self, $map, $x, $y) = @_;
1369 1719
1370 my $link_pos = delete $self->{_link_pos}; 1720 my $link_pos = delete $self->{_link_pos};
1371 1721
1372 unless ($map) { 1722 unless ($map) {
1373 $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1374
1375 # restore original map position 1723 # restore original map position
1376 ($map, $x, $y) = @{ $link_pos || [] }; 1724 ($map, $x, $y) = @{ $link_pos || [] };
1377 $map = cf::map::find_map $map; 1725 $map = cf::map::find $map;
1378 1726
1379 unless ($map) { 1727 unless ($map) {
1380 ($map, $x, $y) = @$EMERGENCY_POSITION; 1728 ($map, $x, $y) = @$EMERGENCY_POSITION;
1381 $map = cf::map::find_map $map 1729 $map = cf::map::find $map
1382 or die "FATAL: cannot load emergency map\n"; 1730 or die "FATAL: cannot load emergency map\n";
1383 } 1731 }
1384 } 1732 }
1385 1733
1386 ($x, $y) = (-1, -1) 1734 ($x, $y) = (-1, -1)
1389 # use -1 or undef as default coordinates, not 0, 0 1737 # use -1 or undef as default coordinates, not 0, 0
1390 ($x, $y) = ($map->enter_x, $map->enter_y) 1738 ($x, $y) = ($map->enter_x, $map->enter_y)
1391 if $x <=0 && $y <= 0; 1739 if $x <=0 && $y <= 0;
1392 1740
1393 $map->load; 1741 $map->load;
1742 $map->load_diag;
1394 1743
1744 return unless $self->contr->active;
1395 $self->activate_recursive; 1745 $self->activate_recursive;
1396 $self->enter_map ($map, $x, $y); 1746 $self->enter_map ($map, $x, $y);
1397} 1747}
1398 1748
1749cf::player->attach (
1750 on_logout => sub {
1751 my ($pl) = @_;
1752
1753 # abort map switching before logout
1754 if ($pl->ob->{_link_pos}) {
1755 cf::sync_job {
1756 $pl->ob->leave_link
1757 };
1758 }
1759 },
1760 on_login => sub {
1761 my ($pl) = @_;
1762
1763 # try to abort aborted map switching on player login :)
1764 # should happen only on crashes
1765 if ($pl->ob->{_link_pos}) {
1766 $pl->ob->enter_link;
1767 (async {
1768 # we need this sleep as the login has a concurrent enter_exit running
1769 # and this sleep increases chances of the player not ending up in scorn
1770 $pl->ob->reply (undef,
1771 "There was an internal problem at your last logout, "
1772 . "the server will try to bring you to your intended destination in a second.",
1773 cf::NDI_RED);
1774 Coro::Timer::sleep 1;
1775 $pl->ob->leave_link;
1776 })->prio (2);
1777 }
1778 },
1779);
1780
1399=item $player_object->goto_map ($map, $x, $y) 1781=item $player_object->goto ($path, $x, $y)
1400 1782
1401=cut 1783=cut
1402 1784
1403sub cf::object::player::goto_map { 1785sub cf::object::player::goto {
1404 my ($self, $path, $x, $y) = @_; 1786 my ($self, $path, $x, $y) = @_;
1405 1787
1406 $self->enter_link; 1788 $self->enter_link;
1407 1789
1408 (Coro::async { 1790 (async {
1409 $path = new cf::path $path;
1410
1411 my $map = cf::map::find_map $path->as_string; 1791 my $map = cf::map::find $path;
1412 $map = $map->customise_for ($self) if $map; 1792 $map = $map->customise_for ($self) if $map;
1413 1793
1414 warn "entering ", $map->path, " at ($x, $y)\n" 1794# warn "entering ", $map->path, " at ($x, $y)\n"
1415 if $map; 1795# if $map;
1796
1797 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1416 1798
1417 $self->leave_link ($map, $x, $y); 1799 $self->leave_link ($map, $x, $y);
1418 })->prio (1); 1800 })->prio (1);
1419} 1801}
1420 1802
1473 1855
1474 return unless $self->type == cf::PLAYER; 1856 return unless $self->type == cf::PLAYER;
1475 1857
1476 $self->enter_link; 1858 $self->enter_link;
1477 1859
1478 (Coro::async { 1860 (async {
1861 $self->deactivate_recursive; # just to be sure
1479 unless (eval { 1862 unless (eval {
1480
1481 prepare_random_map $exit 1863 prepare_random_map $exit
1482 if $exit->slaying eq "/!"; 1864 if $exit->slaying eq "/!";
1483 1865
1484 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1866 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1485 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1867 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1486 1868
1487 1; 1869 1;
1488 }) { 1870 }) {
1489 $self->message ("Something went wrong deep within the crossfire server. " 1871 $self->message ("Something went wrong deep within the crossfire server. "
1490 . "I'll try to bring you back to the map you were before. " 1872 . "I'll try to bring you back to the map you were before. "
1491 . "Please report this to the dungeon master", 1873 . "Please report this to the dungeon master!",
1492 cf::NDI_UNIQUE | cf::NDI_RED); 1874 cf::NDI_UNIQUE | cf::NDI_RED);
1493 1875
1494 warn "ERROR in enter_exit: $@"; 1876 warn "ERROR in enter_exit: $@";
1495 $self->leave_link; 1877 $self->leave_link;
1496 } 1878 }
1547 on_reply => sub { 1929 on_reply => sub {
1548 my ($ns, $msg) = @_; 1930 my ($ns, $msg) = @_;
1549 1931
1550 # this weird shuffling is so that direct followup queries 1932 # this weird shuffling is so that direct followup queries
1551 # get handled first 1933 # get handled first
1552 my $queue = delete $ns->{query_queue}; 1934 my $queue = delete $ns->{query_queue}
1935 or return; # be conservative, not sure how that can happen, but we saw a crash here
1553 1936
1554 (shift @$queue)->[1]->($msg); 1937 (shift @$queue)->[1]->($msg);
1555 1938
1556 push @{ $ns->{query_queue} }, @$queue; 1939 push @{ $ns->{query_queue} }, @$queue;
1557 1940
1563 } 1946 }
1564 } 1947 }
1565 }, 1948 },
1566); 1949);
1567 1950
1568=item $client->coro (\&cb) 1951=item $client->async (\&cb)
1569 1952
1570Create a new coroutine, running the specified callback. The coroutine will 1953Create a new coroutine, running the specified callback. The coroutine will
1571be automatically cancelled when the client gets destroyed (e.g. on logout, 1954be automatically cancelled when the client gets destroyed (e.g. on logout,
1572or loss of connection). 1955or loss of connection).
1573 1956
1574=cut 1957=cut
1575 1958
1576sub cf::client::coro { 1959sub cf::client::async {
1577 my ($self, $cb) = @_; 1960 my ($self, $cb) = @_;
1578 1961
1579 my $coro; $coro = async { 1962 my $coro = &Coro::async ($cb);
1580 eval {
1581 $cb->();
1582 };
1583 warn $@ if $@;
1584 };
1585 1963
1586 $coro->on_destroy (sub { 1964 $coro->on_destroy (sub {
1587 delete $self->{_coro}{$coro+0}; 1965 delete $self->{_coro}{$coro+0};
1588 }); 1966 });
1589 1967
1761 2139
1762{ 2140{
1763 my $path = cf::localdir . "/database.pst"; 2141 my $path = cf::localdir . "/database.pst";
1764 2142
1765 sub db_load() { 2143 sub db_load() {
1766 warn "loading database $path\n";#d# remove later
1767 $DB = stat $path ? Storable::retrieve $path : { }; 2144 $DB = stat $path ? Storable::retrieve $path : { };
1768 } 2145 }
1769 2146
1770 my $pid; 2147 my $pid;
1771 2148
1772 sub db_save() { 2149 sub db_save() {
1773 warn "saving database $path\n";#d# remove later
1774 waitpid $pid, 0 if $pid; 2150 waitpid $pid, 0 if $pid;
1775 if (0 == ($pid = fork)) { 2151 if (0 == ($pid = fork)) {
1776 $DB->{_meta}{version} = 1; 2152 $DB->{_meta}{version} = 1;
1777 Storable::nstore $DB, "$path~"; 2153 Storable::nstore $DB, "$path~";
1778 rename "$path~", $path; 2154 rename "$path~", $path;
1826 open my $fh, "<:utf8", cf::confdir . "/config" 2202 open my $fh, "<:utf8", cf::confdir . "/config"
1827 or return; 2203 or return;
1828 2204
1829 local $/; 2205 local $/;
1830 *CFG = YAML::Syck::Load <$fh>; 2206 *CFG = YAML::Syck::Load <$fh>;
2207
2208 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2209
2210 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2211 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2212
2213 if (exists $CFG{mlockall}) {
2214 eval {
2215 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2216 and die "WARNING: m(un)lockall failed: $!\n";
2217 };
2218 warn $@ if $@;
2219 }
1831} 2220}
1832 2221
1833sub main { 2222sub main {
1834 # we must not ever block the main coroutine 2223 # we must not ever block the main coroutine
1835 local $Coro::idle = sub { 2224 local $Coro::idle = sub {
1836 Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d# 2225 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1837 (Coro::unblock_sub {
1838 Event::one_event; 2226 async { Event::one_event };
1839 })->();
1840 }; 2227 };
1841 2228
1842 cfg_load; 2229 cfg_load;
1843 db_load; 2230 db_load;
1844 load_extensions; 2231 load_extensions;
1845 Event::loop; 2232 Event::loop;
1846} 2233}
1847 2234
1848############################################################################# 2235#############################################################################
1849# initialisation 2236# initialisation and cleanup
2237
2238# install some emergency cleanup handlers
2239BEGIN {
2240 for my $signal (qw(INT HUP TERM)) {
2241 Event->signal (
2242 data => WF_AUTOCANCEL,
2243 signal => $signal,
2244 cb => sub {
2245 cf::cleanup "SIG$signal";
2246 },
2247 );
2248 }
2249}
2250
2251sub emergency_save() {
2252 my $freeze_guard = cf::freeze_mainloop;
2253
2254 warn "enter emergency perl save\n";
2255
2256 cf::sync_job {
2257 # use a peculiar iteration method to avoid tripping on perl
2258 # refcount bugs in for. also avoids problems with players
2259 # and maps saved/Destroyed asynchronously.
2260 warn "begin emergency player save\n";
2261 for my $login (keys %cf::PLAYER) {
2262 my $pl = $cf::PLAYER{$login} or next;
2263 $pl->valid or next;
2264 $pl->save;
2265 }
2266 warn "end emergency player save\n";
2267
2268 warn "begin emergency map save\n";
2269 for my $path (keys %cf::MAP) {
2270 my $map = $cf::MAP{$path} or next;
2271 $map->valid or next;
2272 $map->save;
2273 }
2274 warn "end emergency map save\n";
2275 };
2276
2277 warn "leave emergency perl save\n";
2278}
1850 2279
1851sub reload() { 2280sub reload() {
1852 # can/must only be called in main 2281 # can/must only be called in main
1853 if ($Coro::current != $Coro::main) { 2282 if ($Coro::current != $Coro::main) {
1854 warn "can only reload from main coroutine\n"; 2283 warn "can only reload from main coroutine\n";
1855 return; 2284 return;
1856 } 2285 }
1857 2286
1858 warn "reloading..."; 2287 warn "reloading...";
1859 2288
1860 local $FREEZE = 1; 2289 warn "freezing server";
2290 my $guard = freeze_mainloop;
1861 cf::emergency_save; 2291 cf::emergency_save;
2292
2293 warn "sync database to disk";
2294 cf::db_sync;
2295 IO::AIO::flush;
1862 2296
1863 eval { 2297 eval {
1864 # if anything goes wrong in here, we should simply crash as we already saved 2298 # if anything goes wrong in here, we should simply crash as we already saved
1865 2299
1866 # cancel all watchers 2300 warn "cancel all watchers";
1867 for (Event::all_watchers) { 2301 for (Event::all_watchers) {
1868 $_->cancel if $_->data & WF_AUTOCANCEL; 2302 $_->cancel if $_->data & WF_AUTOCANCEL;
1869 } 2303 }
1870 2304
1871 # cancel all extension coros 2305 warn "cancel all extension coros";
1872 $_->cancel for values %EXT_CORO; 2306 $_->cancel for values %EXT_CORO;
1873 %EXT_CORO = (); 2307 %EXT_CORO = ();
1874 2308
2309 warn "remove commands";
2310 %COMMAND = ();
2311
2312 warn "remove ext commands";
2313 %EXTCMD = ();
2314
1875 # unload all extensions 2315 warn "unload/nuke all extensions";
1876 for (@exts) { 2316 for my $pkg (@EXTS) {
1877 warn "unloading <$_>"; 2317 warn "... unloading $pkg";
1878 unload_extension $_; 2318
2319 if (my $cb = $pkg->can ("unload")) {
2320 eval {
2321 $cb->($pkg);
2322 1
2323 } or warn "$pkg unloaded, but with errors: $@";
1879 } 2324 }
1880 2325
2326 warn "... nuking $pkg";
2327 Symbol::delete_package $pkg;
2328 }
2329
1881 # unload all modules loaded from $LIBDIR 2330 warn "unload all perl modules loaded from $LIBDIR";
1882 while (my ($k, $v) = each %INC) { 2331 while (my ($k, $v) = each %INC) {
1883 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2332 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
1884 2333
1885 warn "removing <$k>"; 2334 warn "removing <$k>";
1886 delete $INC{$k}; 2335 delete $INC{$k};
1893 } 2342 }
1894 2343
1895 Symbol::delete_package $k; 2344 Symbol::delete_package $k;
1896 } 2345 }
1897 2346
1898 # sync database to disk
1899 cf::db_sync;
1900 IO::AIO::flush;
1901
1902 # get rid of safe::, as good as possible 2347 warn "get rid of safe::, as good as possible";
1903 Symbol::delete_package "safe::$_" 2348 Symbol::delete_package "safe::$_"
1904 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2349 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
1905 2350
1906 # remove register_script_function callbacks
1907 # TODO
1908
1909 # unload cf.pm "a bit" 2351 warn "unload cf.pm \"a bit\"";
1910 delete $INC{"cf.pm"}; 2352 delete $INC{"cf.pm"};
1911 2353
1912 # don't, removes xs symbols, too, 2354 # don't, removes xs symbols, too,
1913 # and global variables created in xs 2355 # and global variables created in xs
1914 #Symbol::delete_package __PACKAGE__; 2356 #Symbol::delete_package __PACKAGE__;
1915 2357
1916 # reload cf.pm
1917 warn "reloading cf.pm"; 2358 warn "reloading cf.pm";
1918 require cf; 2359 require cf;
1919 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2360 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
1920 2361
1921 # load config and database again 2362 warn "load config and database again";
1922 cf::cfg_load; 2363 cf::cfg_load;
1923 cf::db_load; 2364 cf::db_load;
1924 2365
1925 # load extensions
1926 warn "load extensions"; 2366 warn "load extensions";
1927 cf::load_extensions; 2367 cf::load_extensions;
1928 2368
1929 # reattach attachments to objects 2369 warn "reattach attachments to objects/players";
1930 warn "reattach";
1931 _global_reattach; 2370 _global_reattach;
2371 warn "reattach attachments to maps";
2372 reattach $_ for values %MAP;
1932 }; 2373 };
1933 2374
1934 if ($@) { 2375 if ($@) {
1935 warn $@; 2376 warn $@;
1936 warn "error while reloading, exiting."; 2377 warn "error while reloading, exiting.";
1937 exit 1; 2378 exit 1;
1938 } 2379 }
1939 2380
1940 warn "reloaded successfully"; 2381 warn "reloaded";
1941}; 2382};
1942
1943#############################################################################
1944
1945unless ($LINK_MAP) {
1946 $LINK_MAP = cf::map::new;
1947
1948 $LINK_MAP->width (41);
1949 $LINK_MAP->height (41);
1950 $LINK_MAP->alloc;
1951 $LINK_MAP->path ("{link}");
1952 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
1953 $LINK_MAP->in_memory (MAP_IN_MEMORY);
1954
1955 # dirty hack because... archetypes are not yet loaded
1956 Event->timer (
1957 after => 2,
1958 cb => sub {
1959 $_[0]->w->cancel;
1960
1961 # provide some exits "home"
1962 my $exit = cf::object::new "exit";
1963
1964 $exit->slaying ($EMERGENCY_POSITION->[0]);
1965 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
1966 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
1967
1968 $LINK_MAP->insert ($exit->clone, 19, 19);
1969 $LINK_MAP->insert ($exit->clone, 19, 20);
1970 $LINK_MAP->insert ($exit->clone, 19, 21);
1971 $LINK_MAP->insert ($exit->clone, 20, 19);
1972 $LINK_MAP->insert ($exit->clone, 20, 21);
1973 $LINK_MAP->insert ($exit->clone, 21, 19);
1974 $LINK_MAP->insert ($exit->clone, 21, 20);
1975 $LINK_MAP->insert ($exit->clone, 21, 21);
1976
1977 $exit->destroy;
1978 });
1979
1980 $LINK_MAP->{deny_save} = 1;
1981 $LINK_MAP->{deny_reset} = 1;
1982
1983 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
1984}
1985
1986register "<global>", __PACKAGE__;
1987 2383
1988register_command "reload" => sub { 2384register_command "reload" => sub {
1989 my ($who, $arg) = @_; 2385 my ($who, $arg) = @_;
1990 2386
1991 if ($who->flag (FLAG_WIZ)) { 2387 if ($who->flag (FLAG_WIZ)) {
2001 reentrant => 0, 2397 reentrant => 0,
2002 prio => 0, 2398 prio => 0,
2003 at => $NEXT_TICK || $TICK, 2399 at => $NEXT_TICK || $TICK,
2004 data => WF_AUTOCANCEL, 2400 data => WF_AUTOCANCEL,
2005 cb => sub { 2401 cb => sub {
2006 unless ($FREEZE) { 2402 $NOW = Event::time;
2403
2007 cf::server_tick; # one server iteration 2404 cf::server_tick; # one server iteration
2008 $RUNTIME += $TICK; 2405 $RUNTIME += $TICK;
2009 }
2010
2011 $NEXT_TICK += $TICK; 2406 $NEXT_TICK += $TICK;
2407
2408 $WAIT_FOR_TICK->broadcast;
2409 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2012 2410
2013 # if we are delayed by four ticks or more, skip them all 2411 # if we are delayed by four ticks or more, skip them all
2014 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2412 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2015 2413
2016 $TICK_WATCHER->at ($NEXT_TICK); 2414 $TICK_WATCHER->at ($NEXT_TICK);
2038 or warn "ERROR: unable to write runtime file: $!"; 2436 or warn "ERROR: unable to write runtime file: $!";
2039 })->(); 2437 })->();
2040 }, 2438 },
2041); 2439);
2042 2440
2441END { cf::emergency_save }
2442
20431 24431
2044 2444

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines