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.111 by root, Mon Jan 1 12:28:47 2007 UTC vs.
Revision 1.231 by root, Wed Apr 4 00:02:06 2007 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Storable; 8use Storable;
9use Event;
9use Opcode; 10use Opcode;
10use Safe; 11use Safe;
11use Safe::Hole; 12use Safe::Hole;
12 13
13use Coro 3.3; 14use Coro 3.52 ();
15use Coro::State;
14use Coro::Event; 16use Coro::Event;
15use Coro::Timer; 17use Coro::Timer;
16use Coro::Signal; 18use Coro::Signal;
17use Coro::Semaphore; 19use Coro::Semaphore;
18use Coro::AIO; 20use Coro::AIO;
19 21
22use BDB ();
23use Data::Dumper;
20use Digest::MD5; 24use Digest::MD5;
21use Fcntl; 25use Fcntl;
22use IO::AIO 2.31 ();
23use YAML::Syck (); 26use YAML::Syck ();
27use IO::AIO 2.32 ();
24use Time::HiRes; 28use Time::HiRes;
29use Compress::LZF;
25 30
31# configure various modules to our taste
32#
33Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
34Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
35
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 36$Event::Eval = 1; # no idea why this is required, but it is
27 37
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 38# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 39$YAML::Syck::ImplicitUnicode = 1;
30 40
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 41$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 42
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 43sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 44
35our %COMMAND = (); 45our %COMMAND = ();
36our %COMMAND_TIME = (); 46our %COMMAND_TIME = ();
47
48our @EXTS = (); # list of extension package names
37our %EXTCMD = (); 49our %EXTCMD = ();
50our %EXT_CORO = (); # coroutines bound to extensions
51our %EXT_MAP = (); # pluggable maps
38 52
53our $RELOAD; # number of reloads so far
39our @EVENT; 54our @EVENT;
40our $LIBDIR = datadir . "/ext"; 55our $LIBDIR = datadir . "/ext";
41 56
42our $TICK = MAX_TIME * 1e-6; 57our $TICK = MAX_TIME * 1e-6;
43our $TICK_WATCHER; 58our $TICK_WATCHER;
59our $AIO_POLL_WATCHER;
60our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
44our $NEXT_TICK; 61our $NEXT_TICK;
45our $NOW; 62our $NOW;
63our $USE_FSYNC = 1; # use fsync to write maps - default off
64
65our $BDB_POLL_WATCHER;
66our $DB_ENV;
46 67
47our %CFG; 68our %CFG;
48 69
49our $UPTIME; $UPTIME ||= time; 70our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 71our $RUNTIME;
51 72
73our %PLAYER; # all users
52our %MAP; # all maps 74our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 75our $LINK_MAP; # the special {link} map, which is always available
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 76our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 77our $BDB_ENV_DIR = cf::localdir . "/db";
78
79our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
80our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
81
82# used to convert map paths into valid unix filenames by replacing / by ∕
83our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
57 84
58binmode STDOUT; 85binmode STDOUT;
59binmode STDERR; 86binmode STDERR;
60 87
61# read virtual server time, if available 88# read virtual server time, if available
68mkdir cf::localdir; 95mkdir cf::localdir;
69mkdir cf::localdir . "/" . cf::playerdir; 96mkdir cf::localdir . "/" . cf::playerdir;
70mkdir cf::localdir . "/" . cf::tmpdir; 97mkdir cf::localdir . "/" . cf::tmpdir;
71mkdir cf::localdir . "/" . cf::uniquedir; 98mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 99mkdir $RANDOM_MAPS;
100mkdir $BDB_ENV_DIR;
73 101
74# a special map that is always available 102our $EMERGENCY_POSITION;
75our $LINK_MAP;
76 103
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 104sub cf::map::normalise;
78 105
79############################################################################# 106#############################################################################
80 107
81=head2 GLOBAL VARIABLES 108=head2 GLOBAL VARIABLES
82 109
106 133
107=item %cf::CFG 134=item %cf::CFG
108 135
109Configuration for the server, loaded from C</etc/crossfire/config>, or 136Configuration for the server, loaded from C</etc/crossfire/config>, or
110from wherever your confdir points to. 137from wherever your confdir points to.
138
139=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
140
141These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
142or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
143processing has been done. Call C<< ->wait >> on them to maximise the
144window of cpu time available, or simply to synchronise to the server tick.
111 145
112=back 146=back
113 147
114=cut 148=cut
115 149
119 utf8::encode $msg; 153 utf8::encode $msg;
120 154
121 $msg .= "\n" 155 $msg .= "\n"
122 unless $msg =~ /\n$/; 156 unless $msg =~ /\n$/;
123 157
124 LOG llevError, "cfperl: $msg"; 158 LOG llevError, $msg;
125 }; 159 };
126} 160}
127 161
128@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 162@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
129@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 163@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
147 181
148$Event::DIED = sub { 182$Event::DIED = sub {
149 warn "error in event callback: @_"; 183 warn "error in event callback: @_";
150}; 184};
151 185
152my %ext_pkg;
153my @exts;
154my @hook;
155
156=head2 UTILITY FUNCTIONS 186=head2 UTILITY FUNCTIONS
157 187
158=over 4 188=over 4
159 189
160=cut 190=item dumpval $ref
161 191
192=cut
193
194sub dumpval {
195 eval {
196 local $SIG{__DIE__};
197 my $d;
198 if (1) {
199 $d = new Data::Dumper([$_[0]], ["*var"]);
200 $d->Terse(1);
201 $d->Indent(2);
202 $d->Quotekeys(0);
203 $d->Useqq(1);
204 #$d->Bless(...);
205 $d->Seen($_[1]) if @_ > 1;
206 $d = $d->Dump();
207 }
208 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
209 $d
210 } || "[unable to dump $_[0]: '$@']";
211}
212
162use JSON::Syck (); # TODO# replace by JSON::PC once working 213use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
163 214
164=item $ref = cf::from_json $json 215=item $ref = cf::from_json $json
165 216
166Converts a JSON string into the corresponding perl data structure. 217Converts a JSON string into the corresponding perl data structure.
167 218
168=cut
169
170sub from_json($) {
171 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
172 JSON::Syck::Load $_[0]
173}
174
175=item $json = cf::to_json $ref 219=item $json = cf::to_json $ref
176 220
177Converts a perl data structure into its JSON representation. 221Converts a perl data structure into its JSON representation.
178 222
179=cut 223=item cf::lock_wait $string
180 224
181sub to_json($) { 225Wait until the given lock is available. See cf::lock_acquire.
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 226
183 JSON::Syck::Dump $_[0] 227=item my $lock = cf::lock_acquire $string
228
229Wait until the given lock is available and then acquires it and returns
230a Coro::guard object. If the guard object gets destroyed (goes out of scope,
231for example when the coroutine gets canceled), the lock is automatically
232returned.
233
234Lock names should begin with a unique identifier (for example, cf::map::find
235uses map_find and cf::map::load uses map_load).
236
237=cut
238
239our %LOCK;
240
241sub lock_wait($) {
242 my ($key) = @_;
243
244 # wait for lock, if any
245 while ($LOCK{$key}) {
246 push @{ $LOCK{$key} }, $Coro::current;
247 Coro::schedule;
248 }
184} 249}
250
251sub lock_acquire($) {
252 my ($key) = @_;
253
254 # wait, to be sure we are not locked
255 lock_wait $key;
256
257 $LOCK{$key} = [];
258
259 Coro::guard {
260 # wake up all waiters, to be on the safe side
261 $_->ready for @{ delete $LOCK{$key} };
262 }
263}
264
265sub freeze_mainloop {
266 return unless $TICK_WATCHER->is_active;
267
268 my $guard = Coro::guard {
269 $TICK_WATCHER->start;
270 };
271 $TICK_WATCHER->stop;
272 $guard
273}
274
275=item cf::async { BLOCK }
276
277Currently the same as Coro::async_pool, meaning you cannot use
278C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
279thing you are allowed to do is call C<prio> on it.
280
281=cut
282
283BEGIN { *async = \&Coro::async_pool }
185 284
186=item cf::sync_job { BLOCK } 285=item cf::sync_job { BLOCK }
187 286
188The design of crossfire+ requires that the main coro ($Coro::main) is 287The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 288always able to handle events or runnable, as crossfire+ is only partly
197=cut 296=cut
198 297
199sub sync_job(&) { 298sub sync_job(&) {
200 my ($job) = @_; 299 my ($job) = @_;
201 300
202 my $busy = 1;
203 my @res;
204
205 my $coro = Coro::async {
206 @res = eval { $job->() };
207 warn $@ if $@;
208 undef $busy;
209 };
210
211 if ($Coro::current == $Coro::main) { 301 if ($Coro::current == $Coro::main) {
302 # this is the main coro, too bad, we have to block
303 # till the operation succeeds, freezing the server :/
304
212 # TODO: use suspend/resume instead 305 # TODO: use suspend/resume instead
213 local $FREEZE = 1; 306 # (but this is cancel-safe)
307 my $freeze_guard = freeze_mainloop;
308
309 my $busy = 1;
310 my @res;
311
312 (async {
313 @res = eval { $job->() };
314 warn $@ if $@;
315 undef $busy;
214 $coro->prio (Coro::PRIO_MAX); 316 })->prio (Coro::PRIO_MAX);
317
215 while ($busy) { 318 while ($busy) {
216 Coro::cede_notself; 319 Coro::cede or Event::one_event;
217 Event::one_event unless Coro::nready;
218 } 320 }
321
322 wantarray ? @res : $res[0]
219 } else { 323 } else {
220 $coro->join; 324 # we are in another coroutine, how wonderful, everything just works
325
326 $job->()
221 } 327 }
222
223 wantarray ? @res : $res[0]
224} 328}
225 329
226=item $coro = cf::coro { BLOCK } 330=item $coro = cf::async_ext { BLOCK }
227 331
228Creates and returns a new coro. This coro is automcatially being canceled 332Like async, but this coro is automatically being canceled when the
229when the extension calling this is being unloaded. 333extension calling this is being unloaded.
230 334
231=cut 335=cut
232 336
233sub coro(&) { 337sub async_ext(&) {
234 my $cb = shift; 338 my $cb = shift;
235 339
236 my $coro; $coro = async { 340 my $coro = &Coro::async ($cb);
237 eval {
238 $cb->();
239 };
240 warn $@ if $@;
241 };
242 341
243 $coro->on_destroy (sub { 342 $coro->on_destroy (sub {
244 delete $EXT_CORO{$coro+0}; 343 delete $EXT_CORO{$coro+0};
245 }); 344 });
246 $EXT_CORO{$coro+0} = $coro; 345 $EXT_CORO{$coro+0} = $coro;
247 346
248 $coro 347 $coro
249} 348}
250 349
251sub write_runtime { 350sub write_runtime {
351 my $guard = cf::lock_acquire "write_runtime";
352
252 my $runtime = cf::localdir . "/runtime"; 353 my $runtime = cf::localdir . "/runtime";
253 354
254 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 355 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
255 or return; 356 or return;
256 357
257 my $value = $cf::RUNTIME; 358 my $value = $cf::RUNTIME + 90 + 10;
359 # 10 is the runtime save interval, for a monotonic clock
360 # 60 allows for the watchdog to kill the server.
361
258 (aio_write $fh, 0, (length $value), $value, 0) <= 0 362 (aio_write $fh, 0, (length $value), $value, 0) <= 0
259 and return; 363 and return;
260 364
365 # always fsync - this file is important
261 aio_fsync $fh 366 aio_fsync $fh
262 and return; 367 and return;
263 368
264 close $fh 369 close $fh
265 or return; 370 or return;
268 and return; 373 and return;
269 374
270 1 375 1
271} 376}
272 377
378=item cf::datalog type => key => value, ...
379
380Log a datalog packet of the given type with the given key-value pairs.
381
382=cut
383
384sub datalog($@) {
385 my ($type, %kv) = @_;
386 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
387}
388
273=back 389=back
274 390
275=cut 391=cut
276
277#############################################################################
278
279package cf::path;
280
281sub new {
282 my ($class, $path, $base) = @_;
283
284 $path = $path->as_string if ref $path;
285
286 my $self = bless { }, $class;
287
288 if ($path =~ s{^\?random/}{}) {
289 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
290 $self->{random} = cf::from_json $data;
291 } else {
292 if ($path =~ s{^~([^/]+)?}{}) {
293 $self->{user_rel} = 1;
294
295 if (defined $1) {
296 $self->{user} = $1;
297 } elsif ($base =~ m{^~([^/]+)/}) {
298 $self->{user} = $1;
299 } else {
300 warn "cannot resolve user-relative path without user <$path,$base>\n";
301 }
302 } elsif ($path =~ /^\//) {
303 # already absolute
304 } else {
305 $base =~ s{[^/]+/?$}{};
306 return $class->new ("$base/$path");
307 }
308
309 for ($path) {
310 redo if s{/\.?/}{/};
311 redo if s{/[^/]+/\.\./}{/};
312 }
313 }
314
315 $self->{path} = $path;
316
317 $self
318}
319
320# the name / primary key / in-game path
321sub as_string {
322 my ($self) = @_;
323
324 $self->{user_rel} ? "~$self->{user}$self->{path}"
325 : $self->{random} ? "?random/$self->{path}"
326 : $self->{path}
327}
328
329# the displayed name, this is a one way mapping
330sub visible_name {
331 my ($self) = @_;
332
333# if (my $rmp = $self->{random}) {
334# # todo: be more intelligent about this
335# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
336# } else {
337 $self->as_string
338# }
339}
340
341# escape the /'s in the path
342sub _escaped_path {
343 # ∕ is U+2215
344 (my $path = $_[0]{path}) =~ s/\//∕/g;
345 $path
346}
347
348# the original (read-only) location
349sub load_path {
350 my ($self) = @_;
351
352 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
353}
354
355# the temporary/swap location
356sub save_path {
357 my ($self) = @_;
358
359 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
360 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
361 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
362}
363
364# the unique path, might be eq to save_path
365sub uniq_path {
366 my ($self) = @_;
367
368 $self->{user_rel} || $self->{random}
369 ? undef
370 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
371}
372
373# return random map parameters, or undef
374sub random_map_params {
375 my ($self) = @_;
376
377 $self->{random}
378}
379
380# this is somewhat ugly, but style maps do need special treatment
381sub is_style_map {
382 $_[0]{path} =~ m{^/styles/}
383}
384
385package cf;
386 392
387############################################################################# 393#############################################################################
388 394
389=head2 ATTACHABLE OBJECTS 395=head2 ATTACHABLE OBJECTS
390 396
516our @CB_TYPE = (); # registry for type (cf-object class) based events 522our @CB_TYPE = (); # registry for type (cf-object class) based events
517our @CB_MAP = (); 523our @CB_MAP = ();
518 524
519my %attachment; 525my %attachment;
520 526
527sub cf::attachable::thawer_merge {
528 # simply override everything except _meta
529 local $_[0]{_meta};
530 %{$_[0]} = %{$_[1]};
531}
532
521sub _attach_cb($$$$) { 533sub _attach_cb($$$$) {
522 my ($registry, $event, $prio, $cb) = @_; 534 my ($registry, $event, $prio, $cb) = @_;
523 535
524 use sort 'stable'; 536 use sort 'stable';
525 537
696# object support 708# object support
697 709
698sub reattach { 710sub reattach {
699 # basically do the same as instantiate, without calling instantiate 711 # basically do the same as instantiate, without calling instantiate
700 my ($obj) = @_; 712 my ($obj) = @_;
713
714 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
701 715
702 my $registry = $obj->registry; 716 my $registry = $obj->registry;
703 717
704 @$registry = (); 718 @$registry = ();
705 719
752 $filename, length $$rdata, scalar @$objs; 766 $filename, length $$rdata, scalar @$objs;
753 767
754 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 768 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
755 chmod SAVE_MODE, $fh; 769 chmod SAVE_MODE, $fh;
756 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 770 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
757 aio_fsync $fh; 771 aio_fsync $fh if $cf::USE_FSYNC;
758 close $fh; 772 close $fh;
759 773
760 if (@$objs) { 774 if (@$objs) {
761 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 775 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
762 chmod SAVE_MODE, $fh; 776 chmod SAVE_MODE, $fh;
763 my $data = Storable::nfreeze { version => 1, objs => $objs }; 777 my $data = Storable::nfreeze { version => 1, objs => $objs };
764 aio_write $fh, 0, (length $data), $data, 0; 778 aio_write $fh, 0, (length $data), $data, 0;
765 aio_fsync $fh; 779 aio_fsync $fh if $cf::USE_FSYNC;
766 close $fh; 780 close $fh;
767 aio_rename "$filename.pst~", "$filename.pst"; 781 aio_rename "$filename.pst~", "$filename.pst";
768 } 782 }
769 } else { 783 } else {
770 aio_unlink "$filename.pst"; 784 aio_unlink "$filename.pst";
798 or return; 812 or return;
799 813
800 unless (aio_stat "$filename.pst") { 814 unless (aio_stat "$filename.pst") {
801 (aio_load "$filename.pst", $av) >= 0 815 (aio_load "$filename.pst", $av) >= 0
802 or return; 816 or return;
803 $av = eval { (Storable::thaw <$av>)->{objs} }; 817 $av = eval { (Storable::thaw $av)->{objs} };
804 } 818 }
805 819
820 warn sprintf "loading %s (%d)\n",
821 $filename, length $data, scalar @{$av || []};#d#
806 return ($data, $av); 822 return ($data, $av);
807} 823}
808 824
809############################################################################# 825#############################################################################
810# command handling &c 826# command handling &c
835=cut 851=cut
836 852
837sub register_extcmd { 853sub register_extcmd {
838 my ($name, $cb) = @_; 854 my ($name, $cb) = @_;
839 855
840 my $caller = caller;
841 #warn "registering extcmd '$name' to '$caller'";
842
843 $EXTCMD{$name} = [$cb, $caller]; 856 $EXTCMD{$name} = $cb;
844} 857}
845 858
846cf::player->attach ( 859cf::player->attach (
847 on_command => sub { 860 on_command => sub {
848 my ($pl, $name, $params) = @_; 861 my ($pl, $name, $params) = @_;
861 874
862 my $msg = eval { from_json $buf }; 875 my $msg = eval { from_json $buf };
863 876
864 if (ref $msg) { 877 if (ref $msg) {
865 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 878 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
866 if (my %reply = $cb->[0]->($pl, $msg)) { 879 if (my %reply = $cb->($pl, $msg)) {
867 $pl->ext_reply ($msg->{msgid}, %reply); 880 $pl->ext_reply ($msg->{msgid}, %reply);
868 } 881 }
869 } 882 }
870 } else { 883 } else {
871 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 884 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
873 886
874 cf::override; 887 cf::override;
875 }, 888 },
876); 889);
877 890
878sub register {
879 my ($base, $pkg) = @_;
880
881 #TODO
882}
883
884sub load_extension { 891sub load_extension {
885 my ($path) = @_; 892 my ($path) = @_;
886 893
887 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 894 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
888 my $base = $1; 895 my $base = $1;
889 my $pkg = $1; 896 my $pkg = $1;
890 $pkg =~ s/[^[:word:]]/_/g; 897 $pkg =~ s/[^[:word:]]/_/g;
891 $pkg = "ext::$pkg"; 898 $pkg = "ext::$pkg";
892 899
893 warn "loading '$path' into '$pkg'\n"; 900 warn "... loading '$path' into '$pkg'\n";
894 901
895 open my $fh, "<:utf8", $path 902 open my $fh, "<:utf8", $path
896 or die "$path: $!"; 903 or die "$path: $!";
897 904
898 my $source = 905 my $source =
899 "package $pkg; use strict; use utf8;\n" 906 "package $pkg; use strict; use utf8;\n"
900 . "#line 1 \"$path\"\n{\n" 907 . "#line 1 \"$path\"\n{\n"
901 . (do { local $/; <$fh> }) 908 . (do { local $/; <$fh> })
902 . "\n};\n1"; 909 . "\n};\n1";
903 910
904 eval $source 911 unless (eval $source) {
905 or die $@ ? "$path: $@\n" 912 my $msg = $@ ? "$path: $@\n"
906 : "extension disabled.\n"; 913 : "extension disabled.\n";
907 914 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
908 push @exts, $pkg; 915 warn $@;
909 $ext_pkg{$base} = $pkg; 916 warn "mandatory extension failed to load, exiting.\n";
910 917 exit 1;
911# no strict 'refs'; 918 }
912# @{"$pkg\::ISA"} = ext::; 919 die $@;
913
914 register $base, $pkg;
915}
916
917sub unload_extension {
918 my ($pkg) = @_;
919
920 warn "removing extension $pkg\n";
921
922 # remove hooks
923 #TODO
924# for my $idx (0 .. $#PLUGIN_EVENT) {
925# delete $hook[$idx]{$pkg};
926# } 920 }
927 921
928 # remove commands 922 push @EXTS, $pkg;
929 for my $name (keys %COMMAND) {
930 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
931
932 if (@cb) {
933 $COMMAND{$name} = \@cb;
934 } else {
935 delete $COMMAND{$name};
936 }
937 }
938
939 # remove extcmds
940 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
941 delete $EXTCMD{$name};
942 }
943
944 if (my $cb = $pkg->can ("unload")) {
945 eval {
946 $cb->($pkg);
947 1
948 } or warn "$pkg unloaded, but with errors: $@";
949 }
950
951 Symbol::delete_package $pkg;
952} 923}
953 924
954sub load_extensions { 925sub load_extensions {
955 for my $ext (<$LIBDIR/*.ext>) { 926 for my $ext (<$LIBDIR/*.ext>) {
956 next unless -r $ext; 927 next unless -r $ext;
960 } or warn "$ext not loaded: $@"; 931 } or warn "$ext not loaded: $@";
961 } 932 }
962} 933}
963 934
964############################################################################# 935#############################################################################
965# load/save/clean perl data associated with a map
966
967*cf::mapsupport::on_clean = sub {
968 my ($map) = @_;
969
970 my $path = $map->tmpname;
971 defined $path or return;
972
973 unlink "$path.pst";
974};
975
976cf::map->attach (prio => -10000, package => cf::mapsupport::);
977
978#############################################################################
979# load/save perl data associated with player->ob objects
980
981sub all_objects(@) {
982 @_, map all_objects ($_->inv), @_
983}
984
985# TODO: compatibility cruft, remove when no longer needed
986cf::player->attach (
987 on_load => sub {
988 my ($pl, $path) = @_;
989
990 for my $o (all_objects $pl->ob) {
991 if (my $value = $o->get_ob_key_value ("_perl_data")) {
992 $o->set_ob_key_value ("_perl_data");
993
994 %$o = %{ Storable::thaw pack "H*", $value };
995 }
996 }
997 },
998);
999
1000#############################################################################
1001 936
1002=head2 CORE EXTENSIONS 937=head2 CORE EXTENSIONS
1003 938
1004Functions and methods that extend core crossfire objects. 939Functions and methods that extend core crossfire objects.
1005 940
941=cut
942
943package cf::player;
944
945use Coro::AIO;
946
1006=head3 cf::player 947=head3 cf::player
1007 948
1008=over 4 949=over 4
1009 950
1010=item cf::player::exists $login 951=item cf::player::find $login
1011 952
1012Returns true when the given account exists. 953Returns the given player object, loading it if necessary (might block).
1013 954
1014=cut 955=cut
1015 956
1016sub cf::player::exists($) { 957sub playerdir($) {
1017 cf::player::find $_[0] 958 cf::localdir
1018 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 959 . "/"
960 . cf::playerdir
961 . "/"
962 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1019} 963}
1020 964
965sub path($) {
966 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
967
968 (playerdir $login) . "/$login.pl"
969}
970
971sub find_active($) {
972 $cf::PLAYER{$_[0]}
973 and $cf::PLAYER{$_[0]}->active
974 and $cf::PLAYER{$_[0]}
975}
976
977sub exists($) {
978 my ($login) = @_;
979
980 $cf::PLAYER{$login}
981 or cf::sync_job { !aio_stat path $login }
982}
983
984sub find($) {
985 return $cf::PLAYER{$_[0]} || do {
986 my $login = $_[0];
987
988 my $guard = cf::lock_acquire "user_find:$login";
989
990 $cf::PLAYER{$_[0]} || do {
991 my $pl = load_pl path $login
992 or return;
993 $cf::PLAYER{$login} = $pl
994 }
995 }
996}
997
998sub save($) {
999 my ($pl) = @_;
1000
1001 return if $pl->{deny_save};
1002
1003 my $path = path $pl;
1004 my $guard = cf::lock_acquire "user_save:$path";
1005
1006 return if $pl->{deny_save};
1007
1008 aio_mkdir playerdir $pl, 0770;
1009 $pl->{last_save} = $cf::RUNTIME;
1010
1011 $pl->save_pl ($path);
1012 Coro::cede;
1013}
1014
1015sub new($) {
1016 my ($login) = @_;
1017
1018 my $self = create;
1019
1020 $self->ob->name ($login);
1021 $self->{deny_save} = 1;
1022
1023 $cf::PLAYER{$login} = $self;
1024
1025 $self
1026}
1027
1028=item $pl->quit_character
1029
1030Nukes the player without looking back. If logged in, the connection will
1031be destroyed. May block for a long time.
1032
1033=cut
1034
1035sub quit_character {
1036 my ($pl) = @_;
1037
1038 my $name = $pl->ob->name;
1039
1040 $pl->{deny_save} = 1;
1041 $pl->password ("*"); # this should lock out the player until we nuked the dir
1042
1043 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1044 $pl->deactivate;
1045 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1046 $pl->ns->destroy if $pl->ns;
1047
1048 my $path = playerdir $pl;
1049 my $temp = "$path~$cf::RUNTIME~deleting~";
1050 aio_rename $path, $temp;
1051 delete $cf::PLAYER{$pl->ob->name};
1052 $pl->destroy;
1053
1054 my $prefix = qr<^~\Q$name\E/>;
1055
1056 # nuke player maps
1057 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1058
1059 IO::AIO::aio_rmtree $temp;
1060}
1061
1062=item $pl->kick
1063
1064Kicks a player out of the game. This destroys the connection.
1065
1066=cut
1067
1068sub kick {
1069 my ($pl, $kicker) = @_;
1070
1071 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1072 $pl->killer ("kicked");
1073 $pl->ns->destroy;
1074}
1075
1076=item cf::player::list_logins
1077
1078Returns am arrayref of all valid playernames in the system, can take a
1079while and may block, so not sync_job-capable, ever.
1080
1081=cut
1082
1083sub list_logins {
1084 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1085 or return [];
1086
1087 my @logins;
1088
1089 for my $login (@$dirs) {
1090 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1091 aio_read $fh, 0, 512, my $buf, 0 or next;
1092 $buf !~ /^password -------------$/m or next; # official not-valid tag
1093
1094 utf8::decode $login;
1095 push @logins, $login;
1096 }
1097
1098 \@logins
1099}
1100
1101=item $player->maps
1102
1103Returns an arrayref of map paths that are private for this
1104player. May block.
1105
1106=cut
1107
1108sub maps($) {
1109 my ($pl) = @_;
1110
1111 $pl = ref $pl ? $pl->ob->name : $pl;
1112
1113 my $files = aio_readdir playerdir $pl
1114 or return;
1115
1116 my @paths;
1117
1118 for (@$files) {
1119 utf8::decode $_;
1120 next if /\.(?:pl|pst)$/;
1121 next unless /^$PATH_SEP/o;
1122
1123 push @paths, cf::map::normalise "~$pl/$_";
1124 }
1125
1126 \@paths
1127}
1128
1021=item $player->ext_reply ($msgid, $msgtype, %msg) 1129=item $player->ext_reply ($msgid, %msg)
1022 1130
1023Sends an ext reply to the player. 1131Sends an ext reply to the player.
1024 1132
1025=cut 1133=cut
1026 1134
1027sub cf::player::ext_reply($$$%) { 1135sub ext_reply($$%) {
1028 my ($self, $id, %msg) = @_; 1136 my ($self, $id, %msg) = @_;
1029 1137
1030 $msg{msgid} = $id; 1138 $msg{msgid} = $id;
1031 1139
1032 $self->send ("ext " . to_json \%msg); 1140 $self->send ("ext " . cf::to_json \%msg);
1033} 1141}
1142
1143=item $player->ext_event ($type, %msg)
1144
1145Sends an ext event to the client.
1146
1147=cut
1148
1149sub ext_event($$%) {
1150 my ($self, $type, %msg) = @_;
1151
1152 delete $msg{msgid};
1153 $msg{msgtype} = "event";
1154 $msg{eventtype} = $type;
1155
1156 $self->send ("ext " . cf::to_json \%msg);
1157}
1158
1159package cf;
1034 1160
1035=back 1161=back
1036 1162
1037 1163
1038=head3 cf::map 1164=head3 cf::map
1044package cf::map; 1170package cf::map;
1045 1171
1046use Fcntl; 1172use Fcntl;
1047use Coro::AIO; 1173use Coro::AIO;
1048 1174
1175use overload
1176 '""' => \&as_string,
1177 fallback => 1;
1178
1049our $MAX_RESET = 7200; 1179our $MAX_RESET = 3600;
1050our $DEFAULT_RESET = 3600; 1180our $DEFAULT_RESET = 3000;
1051$MAX_RESET = 10;#d#
1052$DEFAULT_RESET = 10;#d#
1053 1181
1054sub generate_random_map { 1182sub generate_random_map {
1055 my ($path, $rmp) = @_; 1183 my ($self, $rmp) = @_;
1056
1057 # mit "rum" bekleckern, nicht 1184 # mit "rum" bekleckern, nicht
1058 cf::map::_create_random_map 1185 $self->_create_random_map (
1059 $path,
1060 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1186 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1061 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1187 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1062 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1188 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1063 $rmp->{exit_on_final_map}, 1189 $rmp->{exit_on_final_map},
1064 $rmp->{xsize}, $rmp->{ysize}, 1190 $rmp->{xsize}, $rmp->{ysize},
1065 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1191 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1066 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1192 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1067 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1193 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1068 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1194 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1069 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1195 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1070 (cf::region::find $rmp->{region}) 1196 (cf::region::find $rmp->{region}), $rmp->{custom}
1197 )
1198}
1199
1200=item cf::map->register ($regex, $prio)
1201
1202Register a handler for the map path matching the given regex at the
1203givne priority (higher is better, built-in handlers have priority 0, the
1204default).
1205
1206=cut
1207
1208sub register {
1209 my (undef, $regex, $prio) = @_;
1210 my $pkg = caller;
1211
1212 no strict;
1213 push @{"$pkg\::ISA"}, __PACKAGE__;
1214
1215 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1216}
1217
1218# also paths starting with '/'
1219$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1220
1221sub thawer_merge {
1222 my ($self, $merge) = @_;
1223
1224 # we have to keep some variables in memory intact
1225 local $self->{path};
1226 local $self->{load_path};
1227 local $self->{deny_save};
1228 local $self->{deny_reset};
1229
1230 $self->SUPER::thawer_merge ($merge);
1231}
1232
1233sub normalise {
1234 my ($path, $base) = @_;
1235
1236 $path = "$path"; # make sure its a string
1237
1238 $path =~ s/\.map$//;
1239
1240 # map plan:
1241 #
1242 # /! non-realised random map exit (special hack!)
1243 # {... are special paths that are not being touched
1244 # ?xxx/... are special absolute paths
1245 # ?random/... random maps
1246 # /... normal maps
1247 # ~user/... per-player map of a specific user
1248
1249 $path =~ s/$PATH_SEP/\//go;
1250
1251 # treat it as relative path if it starts with
1252 # something that looks reasonable
1253 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1254 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1255
1256 $base =~ s{[^/]+/?$}{};
1257 $path = "$base/$path";
1258 }
1259
1260 for ($path) {
1261 redo if s{//}{/};
1262 redo if s{/\.?/}{/};
1263 redo if s{/[^/]+/\.\./}{/};
1264 }
1265
1266 $path
1267}
1268
1269sub new_from_path {
1270 my (undef, $path, $base) = @_;
1271
1272 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1273
1274 $path = normalise $path, $base;
1275
1276 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1277 if ($path =~ $EXT_MAP{$pkg}[1]) {
1278 my $self = bless cf::map::new, $pkg;
1279 $self->{path} = $path; $self->path ($path);
1280 $self->init; # pass $1 etc.
1281 return $self;
1282 }
1283 }
1284
1285 Carp::carp "unable to resolve path '$path' (base '$base').";
1286 ()
1287}
1288
1289sub init {
1290 my ($self) = @_;
1291
1292 $self
1293}
1294
1295sub as_string {
1296 my ($self) = @_;
1297
1298 "$self->{path}"
1299}
1300
1301# the displayed name, this is a one way mapping
1302sub visible_name {
1303 &as_string
1304}
1305
1306# the original (read-only) location
1307sub load_path {
1308 my ($self) = @_;
1309
1310 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1311}
1312
1313# the temporary/swap location
1314sub save_path {
1315 my ($self) = @_;
1316
1317 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1318 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1319}
1320
1321# the unique path, undef == no special unique path
1322sub uniq_path {
1323 my ($self) = @_;
1324
1325 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1326 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1071} 1327}
1072 1328
1073# and all this just because we cannot iterate over 1329# and all this just because we cannot iterate over
1074# all maps in C++... 1330# all maps in C++...
1075sub change_all_map_light { 1331sub change_all_map_light {
1076 my ($change) = @_; 1332 my ($change) = @_;
1077 1333
1078 $_->change_map_light ($change) for values %cf::MAP; 1334 $_->change_map_light ($change)
1335 for grep $_->outdoor, values %cf::MAP;
1079} 1336}
1080 1337
1338sub unlink_save {
1339 my ($self) = @_;
1340
1341 utf8::encode (my $save = $self->save_path);
1342 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1343 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1344}
1345
1081sub try_load_header($) { 1346sub load_header_from($) {
1082 my ($path) = @_; 1347 my ($self, $path) = @_;
1083 1348
1084 utf8::encode $path; 1349 utf8::encode $path;
1085 aio_open $path, O_RDONLY, 0 1350 #aio_open $path, O_RDONLY, 0
1351 # or return;
1352
1353 $self->_load_header ($path)
1086 or return; 1354 or return;
1087 1355
1088 my $map = cf::map::new 1356 $self->{load_path} = $path;
1357
1358 1
1359}
1360
1361sub load_header_orig {
1362 my ($self) = @_;
1363
1364 $self->load_header_from ($self->load_path)
1365}
1366
1367sub load_header_temp {
1368 my ($self) = @_;
1369
1370 $self->load_header_from ($self->save_path)
1371}
1372
1373sub prepare_temp {
1374 my ($self) = @_;
1375
1376 $self->last_access ((delete $self->{last_access})
1377 || $cf::RUNTIME); #d#
1378 # safety
1379 $self->{instantiate_time} = $cf::RUNTIME
1380 if $self->{instantiate_time} > $cf::RUNTIME;
1381}
1382
1383sub prepare_orig {
1384 my ($self) = @_;
1385
1386 $self->{load_original} = 1;
1387 $self->{instantiate_time} = $cf::RUNTIME;
1388 $self->last_access ($cf::RUNTIME);
1389 $self->instantiate;
1390}
1391
1392sub load_header {
1393 my ($self) = @_;
1394
1395 if ($self->load_header_temp) {
1396 $self->prepare_temp;
1397 } else {
1398 $self->load_header_orig
1089 or return; 1399 or return;
1400 $self->prepare_orig;
1401 }
1090 1402
1091 $map->load_header ($path) 1403 1
1092 or return;
1093
1094 $map->{load_path} = $path;
1095 use Data::Dumper; warn Dumper $map;#d#
1096
1097 $map
1098} 1404}
1099 1405
1406sub find;
1100sub find_map { 1407sub find {
1101 my ($path, $origin) = @_; 1408 my ($path, $origin) = @_;
1102 1409
1103 #warn "find_map<$path,$origin>\n";#d# 1410 $path = normalise $path, $origin && $origin->path;
1104 1411
1105 $path = ref $path ? $path : new cf::path $path, $origin && $origin->path; 1412 cf::lock_wait "map_find:$path";
1106 my $key = $path->as_string;
1107 1413
1108 $cf::MAP{$key} || do { 1414 $cf::MAP{$path} || do {
1109 # do it the slow way 1415 my $guard = cf::lock_acquire "map_find:$path";
1110 my $map = try_load_header $path->save_path; 1416 my $map = new_from_path cf::map $path
1111
1112 if ($map) {
1113 # safety
1114 $map->{instantiate_time} = $cf::RUNTIME
1115 if $map->{instantiate_time} > $cf::RUNTIME;
1116 } else {
1117 if (my $rmp = $path->random_map_params) {
1118 $map = generate_random_map $key, $rmp;
1119 } else {
1120 $map = try_load_header $path->load_path;
1121 }
1122
1123 $map or return; 1417 or return;
1124 1418
1125 $map->{load_original} = 1;
1126 $map->{instantiate_time} = $cf::RUNTIME;
1127 $map->instantiate;
1128
1129 # per-player maps become, after loading, normal maps
1130 $map->per_player (0) if $path->{user_rel};
1131 }
1132
1133 $map->path ($key);
1134 $map->{path} = $path;
1135 $map->last_access ($cf::RUNTIME); 1419 $map->{last_save} = $cf::RUNTIME;
1136 1420
1137 $map->reset if $map->should_reset; 1421 $map->load_header
1422 or return;
1138 1423
1424 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1425 # doing this can freeze the server in a sync job, obviously
1426 #$cf::WAIT_FOR_TICK->wait;
1427 $map->reset;
1428 undef $guard;
1429 return find $path;
1430 }
1431
1139 $cf::MAP{$key} = $map 1432 $cf::MAP{$path} = $map
1140 } 1433 }
1141} 1434}
1435
1436sub pre_load { }
1437sub post_load { }
1142 1438
1143sub load { 1439sub load {
1144 my ($self) = @_; 1440 my ($self) = @_;
1145 1441
1442 local $self->{deny_reset} = 1; # loading can take a long time
1443
1444 my $path = $self->{path};
1445 my $guard = cf::lock_acquire "map_load:$path";
1446
1146 return if $self->in_memory != cf::MAP_SWAPPED; 1447 return if $self->in_memory != cf::MAP_SWAPPED;
1147 1448
1148 $self->in_memory (cf::MAP_LOADING); 1449 $self->in_memory (cf::MAP_LOADING);
1149 1450
1150 my $path = $self->{path};
1151
1152 $self->alloc; 1451 $self->alloc;
1452
1453 $self->pre_load;
1454
1153 $self->load_objects ($self->{load_path}, 1) 1455 $self->_load_objects ($self->{load_path}, 1)
1154 or return; 1456 or return;
1155 1457
1156 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) if delete $self->{load_original}; 1458 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1459 if delete $self->{load_original};
1157 1460
1158 if (my $uniq = $path->uniq_path) { 1461 if (my $uniq = $self->uniq_path) {
1159 utf8::encode $uniq; 1462 utf8::encode $uniq;
1160 if (aio_open $uniq, O_RDONLY, 0) { 1463 if (aio_open $uniq, O_RDONLY, 0) {
1161 $self->clear_unique_items; 1464 $self->clear_unique_items;
1162 $self->load_objects ($uniq, 0); 1465 $self->_load_objects ($uniq, 0);
1163 } 1466 }
1164 } 1467 }
1468
1469 Coro::cede;
1165 1470
1166 # now do the right thing for maps 1471 # now do the right thing for maps
1167 $self->link_multipart_objects; 1472 $self->link_multipart_objects;
1168 1473
1169 if ($self->{path}->is_style_map) { 1474 unless ($self->{deny_activate}) {
1170 $self->{deny_save} = 1; 1475 $self->decay_objects;
1171 $self->{deny_reset} = 1;
1172 } else {
1173 $self->fix_auto_apply; 1476 $self->fix_auto_apply;
1174 $self->decay_objects;
1175 $self->update_buttons; 1477 $self->update_buttons;
1478 Coro::cede;
1176 $self->set_darkness_map; 1479 $self->set_darkness_map;
1177 $self->difficulty ($self->estimate_difficulty) 1480 $self->difficulty ($self->estimate_difficulty)
1178 unless $self->difficulty; 1481 unless $self->difficulty;
1482 Coro::cede;
1179 $self->activate; 1483 $self->activate;
1180 } 1484 }
1181 1485
1486 $self->post_load;
1487
1182 $self->in_memory (cf::MAP_IN_MEMORY); 1488 $self->in_memory (cf::MAP_IN_MEMORY);
1183} 1489}
1184 1490
1185sub load_map_sync { 1491sub customise_for {
1492 my ($self, $ob) = @_;
1493
1494 return find "~" . $ob->name . "/" . $self->{path}
1495 if $self->per_player;
1496
1497 $self
1498}
1499
1500# find and load all maps in the 3x3 area around a map
1501sub load_diag {
1502 my ($map) = @_;
1503
1504 my @diag; # diagonal neighbours
1505
1506 for (0 .. 3) {
1507 my $neigh = $map->tile_path ($_)
1508 or next;
1509 $neigh = find $neigh, $map
1510 or next;
1511 $neigh->load;
1512
1513 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1514 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1515 }
1516
1517 for (@diag) {
1518 my $neigh = find @$_
1519 or next;
1520 $neigh->load;
1521 }
1522}
1523
1524sub find_sync {
1186 my ($path, $origin) = @_; 1525 my ($path, $origin) = @_;
1187 1526
1188 #warn "load_map_sync<$path, $origin>\n";#d# 1527 cf::sync_job { find $path, $origin }
1528}
1189 1529
1190 cf::sync_job { 1530sub do_load_sync {
1191 my $map = cf::map::find_map $path, $origin 1531 my ($map) = @_;
1192 or return; 1532
1533 cf::sync_job { $map->load };
1534}
1535
1536our %MAP_PREFETCH;
1537our $MAP_PREFETCHER = undef;
1538
1539sub find_async {
1540 my ($path, $origin) = @_;
1541
1542 $path = normalise $path, $origin && $origin->{path};
1543
1544 if (my $map = $cf::MAP{$path}) {
1545 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1546 }
1547
1548 undef $MAP_PREFETCH{$path};
1549 $MAP_PREFETCHER ||= cf::async {
1550 while (%MAP_PREFETCH) {
1551 for my $path (keys %MAP_PREFETCH) {
1552 my $map = find $path
1553 or next;
1193 $map->load; 1554 $map->load;
1194 $map 1555
1556 delete $MAP_PREFETCH{$path};
1557 }
1558 }
1559 undef $MAP_PREFETCHER;
1195 } 1560 };
1561 $MAP_PREFETCHER->prio (6);
1562
1563 ()
1196} 1564}
1197 1565
1198sub save { 1566sub save {
1199 my ($self) = @_; 1567 my ($self) = @_;
1200 1568
1201 my $save = $self->{path}->save_path; utf8::encode $save; 1569 my $lock = cf::lock_acquire "map_data:" . $self->path;
1202 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1203 1570
1204 $self->{last_save} = $cf::RUNTIME; 1571 $self->{last_save} = $cf::RUNTIME;
1205 1572
1206 return unless $self->dirty; 1573 return unless $self->dirty;
1207 1574
1575 my $save = $self->save_path; utf8::encode $save;
1576 my $uniq = $self->uniq_path; utf8::encode $uniq;
1577
1208 $self->{load_path} = $save; 1578 $self->{load_path} = $save;
1209 1579
1210 return if $self->{deny_save}; 1580 return if $self->{deny_save};
1211 1581
1212 warn "saving map ", $self->path; 1582 local $self->{last_access} = $self->last_access;#d#
1583
1584 cf::async {
1585 $_->contr->save for $self->players;
1586 };
1213 1587
1214 if ($uniq) { 1588 if ($uniq) {
1215 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1589 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1216 $self->save_objects ($uniq, cf::IO_UNIQUES); 1590 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1217 } else { 1591 } else {
1218 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1592 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1219 } 1593 }
1220} 1594}
1221 1595
1222sub swap_out { 1596sub swap_out {
1223 my ($self) = @_; 1597 my ($self) = @_;
1598
1599 # save first because save cedes
1600 $self->save;
1601
1602 my $lock = cf::lock_acquire "map_data:" . $self->path;
1224 1603
1225 return if $self->players; 1604 return if $self->players;
1226 return if $self->in_memory != cf::MAP_IN_MEMORY; 1605 return if $self->in_memory != cf::MAP_IN_MEMORY;
1227 return if $self->{deny_save}; 1606 return if $self->{deny_save};
1228 1607
1229 $self->save;
1230 $self->clear; 1608 $self->clear;
1231 $self->in_memory (cf::MAP_SWAPPED); 1609 $self->in_memory (cf::MAP_SWAPPED);
1232} 1610}
1233 1611
1612sub reset_at {
1613 my ($self) = @_;
1614
1615 # TODO: safety, remove and allow resettable per-player maps
1616 return 1e99 if $self->isa ("ext::map_per_player");#d#
1617 return 1e99 if $self->{deny_reset};
1618
1619 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1620 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1621
1622 $time + $to
1623}
1624
1234sub should_reset { 1625sub should_reset {
1235 my ($map) = @_;
1236
1237 # TODO: safety, remove and allow resettable per-player maps
1238 return if $map->{path}{user_rel};#d#
1239 return if $map->{deny_reset};
1240 #return unless $map->reset_timeout;
1241
1242 my $time = $map->fixed_resettime ? $map->{instantiate_time} : $map->last_access;
1243 my $to = $map->reset_timeout || $DEFAULT_RESET;
1244 $to = $MAX_RESET if $to > $MAX_RESET;
1245
1246 $time + $to < $cf::RUNTIME
1247}
1248
1249sub unlink_save {
1250 my ($self) = @_; 1626 my ($self) = @_;
1251 1627
1252 utf8::encode (my $save = $self->{path}->save_path); 1628 $self->reset_at <= $cf::RUNTIME
1253 aioreq_pri 3; IO::AIO::aio_unlink $save;
1254 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1255} 1629}
1256 1630
1257sub reset { 1631sub reset {
1258 my ($self) = @_; 1632 my ($self) = @_;
1259 1633
1634 my $lock = cf::lock_acquire "map_data:$self->{path}";
1635
1260 return if $self->players; 1636 return if $self->players;
1261 return if $self->{path}{user_rel};#d# 1637 return if $self->isa ("ext::map_per_player");#d#
1262 1638
1263 warn "resetting map ", $self->path;#d# 1639 warn "resetting map ", $self->path;#d#
1264 1640
1641 $self->in_memory (cf::MAP_SWAPPED);
1642
1643 # need to save uniques path
1644 unless ($self->{deny_save}) {
1645 my $uniq = $self->uniq_path; utf8::encode $uniq;
1646
1647 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1648 if $uniq;
1649 }
1650
1265 delete $cf::MAP{$self->path}; 1651 delete $cf::MAP{$self->path};
1652
1653 $self->clear;
1266 1654
1267 $_->clear_links_to ($self) for values %cf::MAP; 1655 $_->clear_links_to ($self) for values %cf::MAP;
1268 1656
1269 $self->unlink_save; 1657 $self->unlink_save;
1270 $self->destroy; 1658 $self->destroy;
1271} 1659}
1272 1660
1273sub customise_for { 1661my $nuke_counter = "aaaa";
1274 my ($map, $ob) = @_;
1275 1662
1276 if ($map->per_player) { 1663sub nuke {
1277 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1664 my ($self) = @_;
1278 }
1279 1665
1280 $map 1666 delete $cf::MAP{$self->path};
1281}
1282 1667
1283sub emergency_save { 1668 $self->unlink_save;
1284 local $cf::FREEZE = 1;
1285 1669
1286 warn "enter emergency map save\n"; 1670 bless $self, "cf::map";
1671 delete $self->{deny_reset};
1672 $self->{deny_save} = 1;
1673 $self->reset_timeout (1);
1674 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1287 1675
1288 cf::sync_job { 1676 $cf::MAP{$self->path} = $self;
1289 warn "begin emergency map save\n"; 1677
1290 $_->save for values %cf::MAP; 1678 $self->reset; # polite request, might not happen
1679}
1680
1681=item cf::map::unique_maps
1682
1683Returns an arrayref of paths of all shared maps that have
1684instantiated unique items. May block.
1685
1686=cut
1687
1688sub unique_maps() {
1689 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1690 or return;
1691
1692 my @paths;
1693
1694 for (@$files) {
1695 utf8::decode $_;
1696 next if /\.pst$/;
1697 next unless /^$PATH_SEP/o;
1698
1699 push @paths, cf::map::normalise $_;
1291 }; 1700 }
1292 1701
1293 warn "end emergency map save\n"; 1702 \@paths
1294} 1703}
1295 1704
1296package cf; 1705package cf;
1297 1706
1298=back 1707=back
1299 1708
1709=head3 cf::object
1710
1711=cut
1712
1713package cf::object;
1714
1715=over 4
1716
1717=item $ob->inv_recursive
1718
1719Returns the inventory of the object _and_ their inventories, recursively.
1720
1721=cut
1722
1723sub inv_recursive_;
1724sub inv_recursive_ {
1725 map { $_, inv_recursive_ $_->inv } @_
1726}
1727
1728sub inv_recursive {
1729 inv_recursive_ inv $_[0]
1730}
1731
1732package cf;
1733
1734=back
1300 1735
1301=head3 cf::object::player 1736=head3 cf::object::player
1302 1737
1303=over 4 1738=over 4
1304 1739
1340 (ref $cf::CFG{"may_$access"} 1775 (ref $cf::CFG{"may_$access"}
1341 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1776 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1342 : $cf::CFG{"may_$access"}) 1777 : $cf::CFG{"may_$access"})
1343} 1778}
1344 1779
1780=item $player_object->enter_link
1781
1782Freezes the player and moves him/her to a special map (C<{link}>).
1783
1784The player should be reasonably safe there for short amounts of time. You
1785I<MUST> call C<leave_link> as soon as possible, though.
1786
1787Will never block.
1788
1789=item $player_object->leave_link ($map, $x, $y)
1790
1791Moves the player out of the special C<{link}> map onto the specified
1792map. If the map is not valid (or omitted), the player will be moved back
1793to the location he/she was before the call to C<enter_link>, or, if that
1794fails, to the emergency map position.
1795
1796Might block.
1797
1798=cut
1799
1800sub link_map {
1801 unless ($LINK_MAP) {
1802 $LINK_MAP = cf::map::find "{link}"
1803 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1804 $LINK_MAP->load;
1805 }
1806
1807 $LINK_MAP
1808}
1809
1345sub cf::object::player::enter_link { 1810sub cf::object::player::enter_link {
1346 my ($self) = @_; 1811 my ($self) = @_;
1347 1812
1348 return if $self->map == $LINK_MAP; 1813 $self->deactivate_recursive;
1349 1814
1815 return if UNIVERSAL::isa $self->map, "ext::map_link";
1816
1350 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1817 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1351 if $self->map; 1818 if $self->map;
1352 1819
1353 $self->enter_map ($LINK_MAP, 20, 20); 1820 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1354 $self->deactivate_recursive;
1355} 1821}
1356 1822
1357sub cf::object::player::leave_link { 1823sub cf::object::player::leave_link {
1358 my ($self, $map, $x, $y) = @_; 1824 my ($self, $map, $x, $y) = @_;
1359 1825
1360 my $link_pos = delete $self->{_link_pos}; 1826 my $link_pos = delete $self->{_link_pos};
1361 1827
1362 unless ($map) { 1828 unless ($map) {
1363 $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1364
1365 # restore original map position 1829 # restore original map position
1366 ($map, $x, $y) = @{ $link_pos || [] }; 1830 ($map, $x, $y) = @{ $link_pos || [] };
1367 $map = cf::map::find_map $map; 1831 $map = cf::map::find $map;
1368 1832
1369 unless ($map) { 1833 unless ($map) {
1370 ($map, $x, $y) = @$EMERGENCY_POSITION; 1834 ($map, $x, $y) = @$EMERGENCY_POSITION;
1371 $map = cf::map::find_map $map 1835 $map = cf::map::find $map
1372 or die "FATAL: cannot load emergency map\n"; 1836 or die "FATAL: cannot load emergency map\n";
1373 } 1837 }
1374 } 1838 }
1375 1839
1376 ($x, $y) = (-1, -1) 1840 ($x, $y) = (-1, -1)
1379 # use -1 or undef as default coordinates, not 0, 0 1843 # use -1 or undef as default coordinates, not 0, 0
1380 ($x, $y) = ($map->enter_x, $map->enter_y) 1844 ($x, $y) = ($map->enter_x, $map->enter_y)
1381 if $x <=0 && $y <= 0; 1845 if $x <=0 && $y <= 0;
1382 1846
1383 $map->load; 1847 $map->load;
1848 $map->load_diag;
1384 1849
1850 return unless $self->contr->active;
1385 $self->activate_recursive; 1851 $self->activate_recursive;
1852
1853 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1386 $self->enter_map ($map, $x, $y); 1854 $self->enter_map ($map, $x, $y);
1387} 1855}
1388 1856
1857cf::player->attach (
1858 on_logout => sub {
1859 my ($pl) = @_;
1860
1861 # abort map switching before logout
1862 if ($pl->ob->{_link_pos}) {
1863 cf::sync_job {
1864 $pl->ob->leave_link
1865 };
1866 }
1867 },
1868 on_login => sub {
1869 my ($pl) = @_;
1870
1871 # try to abort aborted map switching on player login :)
1872 # should happen only on crashes
1873 if ($pl->ob->{_link_pos}) {
1874 $pl->ob->enter_link;
1875 (async {
1876 $pl->ob->reply (undef,
1877 "There was an internal problem at your last logout, "
1878 . "the server will try to bring you to your intended destination in a second.",
1879 cf::NDI_RED);
1880 # we need this sleep as the login has a concurrent enter_exit running
1881 # and this sleep increases chances of the player not ending up in scorn
1882 Coro::Timer::sleep 1;
1883 $pl->ob->leave_link;
1884 })->prio (2);
1885 }
1886 },
1887);
1888
1389=item $player_object->goto_map ($map, $x, $y) 1889=item $player_object->goto ($path, $x, $y)
1390 1890
1391=cut 1891=cut
1392 1892
1393sub cf::object::player::goto_map { 1893sub cf::object::player::goto {
1394 my ($self, $path, $x, $y) = @_; 1894 my ($self, $path, $x, $y) = @_;
1395 1895
1396 $self->enter_link; 1896 $self->enter_link;
1397 1897
1398 (Coro::async { 1898 (async {
1399 $path = new cf::path $path; 1899 my $map = eval {
1400
1401 my $map = cf::map::find_map $path->as_string; 1900 my $map = cf::map::find $path;
1402 $map = $map->customise_for ($self) if $map; 1901 $map = $map->customise_for ($self) if $map;
1403
1404 warn "entering ", $map->path, " at ($x, $y)\n"
1405 if $map; 1902 $map
1903 } or
1904 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1406 1905
1407 $self->leave_link ($map, $x, $y); 1906 $self->leave_link ($map, $x, $y);
1408 })->prio (1); 1907 })->prio (1);
1409} 1908}
1410 1909
1414 1913
1415sub parse_random_map_params { 1914sub parse_random_map_params {
1416 my ($spec) = @_; 1915 my ($spec) = @_;
1417 1916
1418 my $rmp = { # defaults 1917 my $rmp = { # defaults
1419 xsize => 10, 1918 xsize => (cf::rndm 15, 40),
1420 ysize => 10, 1919 ysize => (cf::rndm 15, 40),
1920 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1921 #layout => string,
1421 }; 1922 };
1422 1923
1423 for (split /\n/, $spec) { 1924 for (split /\n/, $spec) {
1424 my ($k, $v) = split /\s+/, $_, 2; 1925 my ($k, $v) = split /\s+/, $_, 2;
1425 1926
1429 $rmp 1930 $rmp
1430} 1931}
1431 1932
1432sub prepare_random_map { 1933sub prepare_random_map {
1433 my ($exit) = @_; 1934 my ($exit) = @_;
1935
1936 my $guard = cf::lock_acquire "exit_prepare:$exit";
1434 1937
1435 # all this does is basically replace the /! path by 1938 # all this does is basically replace the /! path by
1436 # a new random map path (?random/...) with a seed 1939 # a new random map path (?random/...) with a seed
1437 # that depends on the exit object 1940 # that depends on the exit object
1438 1941
1439 my $rmp = parse_random_map_params $exit->msg; 1942 my $rmp = parse_random_map_params $exit->msg;
1440 1943
1441 if ($exit->map) { 1944 if ($exit->map) {
1442 $rmp->{region} = $exit->map->region_name; 1945 $rmp->{region} = $exit->region->name;
1443 $rmp->{origin_map} = $exit->map->path; 1946 $rmp->{origin_map} = $exit->map->path;
1444 $rmp->{origin_x} = $exit->x; 1947 $rmp->{origin_x} = $exit->x;
1445 $rmp->{origin_y} = $exit->y; 1948 $rmp->{origin_y} = $exit->y;
1446 } 1949 }
1447 1950
1448 $rmp->{random_seed} ||= $exit->random_seed; 1951 $rmp->{random_seed} ||= $exit->random_seed;
1449 1952
1450 my $data = cf::to_json $rmp; 1953 my $data = cf::to_json $rmp;
1451 my $md5 = Digest::MD5::md5_hex $data; 1954 my $md5 = Digest::MD5::md5_hex $data;
1955 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1452 1956
1453 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1957 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1454 aio_write $fh, 0, (length $data), $data, 0; 1958 aio_write $fh, 0, (length $data), $data, 0;
1959 undef $fh;
1960 aio_rename "$meta~", $meta;
1455 1961
1456 $exit->slaying ("?random/$md5"); 1962 $exit->slaying ("?random/$md5");
1457 $exit->msg (undef); 1963 $exit->msg (undef);
1458 } 1964 }
1459} 1965}
1461sub cf::object::player::enter_exit { 1967sub cf::object::player::enter_exit {
1462 my ($self, $exit) = @_; 1968 my ($self, $exit) = @_;
1463 1969
1464 return unless $self->type == cf::PLAYER; 1970 return unless $self->type == cf::PLAYER;
1465 1971
1972 if ($exit->slaying eq "/!") {
1973 #TODO: this should de-fi-ni-te-ly not be a sync-job
1974 cf::sync_job { prepare_random_map $exit };
1975 }
1976
1977 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1978 my $hp = $exit->stats->hp;
1979 my $sp = $exit->stats->sp;
1980
1466 $self->enter_link; 1981 $self->enter_link;
1467 1982
1468 (Coro::async { 1983 (async {
1984 $self->deactivate_recursive; # just to be sure
1469 unless (eval { 1985 unless (eval {
1470 1986 $self->goto ($slaying, $hp, $sp);
1471 prepare_random_map $exit
1472 if $exit->slaying eq "/!";
1473
1474 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1475 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp);
1476 1987
1477 1; 1988 1;
1478 }) { 1989 }) {
1479 $self->message ("Something went wrong deep within the crossfire server. " 1990 $self->message ("Something went wrong deep within the crossfire server. "
1480 . "I'll try to bring you back to the map you were before. " 1991 . "I'll try to bring you back to the map you were before. "
1481 . "Please report this to the dungeon master", 1992 . "Please report this to the dungeon master!",
1482 cf::NDI_UNIQUE | cf::NDI_RED); 1993 cf::NDI_UNIQUE | cf::NDI_RED);
1483 1994
1484 warn "ERROR in enter_exit: $@"; 1995 warn "ERROR in enter_exit: $@";
1485 $self->leave_link; 1996 $self->leave_link;
1486 } 1997 }
1500 2011
1501sub cf::client::send_drawinfo { 2012sub cf::client::send_drawinfo {
1502 my ($self, $text, $flags) = @_; 2013 my ($self, $text, $flags) = @_;
1503 2014
1504 utf8::encode $text; 2015 utf8::encode $text;
1505 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2016 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1506} 2017}
1507 2018
1508 2019
1509=item $success = $client->query ($flags, "text", \&cb) 2020=item $success = $client->query ($flags, "text", \&cb)
1510 2021
1537 on_reply => sub { 2048 on_reply => sub {
1538 my ($ns, $msg) = @_; 2049 my ($ns, $msg) = @_;
1539 2050
1540 # this weird shuffling is so that direct followup queries 2051 # this weird shuffling is so that direct followup queries
1541 # get handled first 2052 # get handled first
1542 my $queue = delete $ns->{query_queue}; 2053 my $queue = delete $ns->{query_queue}
2054 or return; # be conservative, not sure how that can happen, but we saw a crash here
1543 2055
1544 (shift @$queue)->[1]->($msg); 2056 (shift @$queue)->[1]->($msg);
2057 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1545 2058
1546 push @{ $ns->{query_queue} }, @$queue; 2059 push @{ $ns->{query_queue} }, @$queue;
1547 2060
1548 if (@{ $ns->{query_queue} } == @$queue) { 2061 if (@{ $ns->{query_queue} } == @$queue) {
1549 if (@$queue) { 2062 if (@$queue) {
1553 } 2066 }
1554 } 2067 }
1555 }, 2068 },
1556); 2069);
1557 2070
1558=item $client->coro (\&cb) 2071=item $client->async (\&cb)
1559 2072
1560Create a new coroutine, running the specified callback. The coroutine will 2073Create a new coroutine, running the specified callback. The coroutine will
1561be automatically cancelled when the client gets destroyed (e.g. on logout, 2074be automatically cancelled when the client gets destroyed (e.g. on logout,
1562or loss of connection). 2075or loss of connection).
1563 2076
1564=cut 2077=cut
1565 2078
1566sub cf::client::coro { 2079sub cf::client::async {
1567 my ($self, $cb) = @_; 2080 my ($self, $cb) = @_;
1568 2081
1569 my $coro; $coro = async { 2082 my $coro = &Coro::async ($cb);
1570 eval {
1571 $cb->();
1572 };
1573 warn $@ if $@;
1574 };
1575 2083
1576 $coro->on_destroy (sub { 2084 $coro->on_destroy (sub {
1577 delete $self->{_coro}{$coro+0}; 2085 delete $self->{_coro}{$coro+0};
1578 }); 2086 });
1579 2087
1612 2120
1613# here we export the classes and methods available to script code 2121# here we export the classes and methods available to script code
1614 2122
1615=pod 2123=pod
1616 2124
1617The following fucntions and emthods are available within a safe environment: 2125The following functions and methods are available within a safe environment:
1618 2126
1619 cf::object contr pay_amount pay_player map 2127 cf::object contr pay_amount pay_player map
1620 cf::object::player player 2128 cf::object::player player
1621 cf::player peaceful 2129 cf::player peaceful
1622 cf::map trigger 2130 cf::map trigger
1715The parameter C<$family> should best start with the name of the extension 2223The parameter C<$family> should best start with the name of the extension
1716using it, it should be unique. 2224using it, it should be unique.
1717 2225
1718=over 4 2226=over 4
1719 2227
1720=item $hashref = cf::db_get $family
1721
1722Return a hashref for use by the extension C<$family>, which can be
1723modified. After modifications, you have to call C<cf::db_dirty> or
1724C<cf::db_sync>.
1725
1726=item $value = cf::db_get $family => $key 2228=item $value = cf::db_get $family => $key
1727 2229
1728Returns a single value from the database 2230Returns a single value from the database.
1729
1730=item cf::db_put $family => $hashref
1731
1732Stores the given family hashref into the database. Updates are delayed, if
1733you want the data to be synced to disk immediately, use C<cf::db_sync>.
1734 2231
1735=item cf::db_put $family => $key => $value 2232=item cf::db_put $family => $key => $value
1736 2233
1737Stores the given C<$value> in the family hash. Updates are delayed, if you 2234Stores the given C<$value> in the family.
1738want the data to be synced to disk immediately, use C<cf::db_sync>.
1739
1740=item cf::db_dirty
1741
1742Marks the database as dirty, to be updated at a later time.
1743
1744=item cf::db_sync
1745
1746Immediately write the database to disk I<if it is dirty>.
1747 2235
1748=cut 2236=cut
1749 2237
1750our $DB; 2238our $DB;
1751 2239
1752{ 2240sub db_init {
2241 unless ($DB) {
2242 $DB = BDB::db_create $DB_ENV;
2243
2244 cf::sync_job {
2245 eval {
2246 $DB->set_flags (BDB::CHKSUM);
2247
2248 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2249 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2250 cf::cleanup "db_open(db): $!" if $!;
2251 };
2252 cf::cleanup "db_open(db): $@" if $@;
2253 };
2254
1753 my $path = cf::localdir . "/database.pst"; 2255 my $path = cf::localdir . "/database.pst";
2256 if (stat $path) {
2257 cf::sync_job {
2258 my $pst = Storable::retrieve $path;
1754 2259
1755 sub db_load() { 2260 cf::db_put (board => data => $pst->{board});
1756 warn "loading database $path\n";#d# remove later 2261 cf::db_put (guildrules => data => $pst->{guildrules});
1757 $DB = stat $path ? Storable::retrieve $path : { }; 2262 cf::db_put (rent => balance => $pst->{rent}{balance});
1758 } 2263 BDB::db_env_txn_checkpoint $DB_ENV;
1759 2264
1760 my $pid; 2265 unlink $path;
1761
1762 sub db_save() {
1763 warn "saving database $path\n";#d# remove later
1764 waitpid $pid, 0 if $pid;
1765 if (0 == ($pid = fork)) {
1766 $DB->{_meta}{version} = 1;
1767 Storable::nstore $DB, "$path~";
1768 rename "$path~", $path;
1769 cf::_exit 0 if defined $pid;
1770 } 2266 };
1771 } 2267 }
1772
1773 my $dirty;
1774
1775 sub db_sync() {
1776 db_save if $dirty;
1777 undef $dirty;
1778 }
1779
1780 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
1781 db_sync;
1782 }); 2268 }
2269}
1783 2270
1784 sub db_dirty() {
1785 $dirty = 1;
1786 $idle->start;
1787 }
1788
1789 sub db_get($;$) { 2271sub db_get($$) {
1790 @_ >= 2 2272 my $key = "$_[0]/$_[1]";
1791 ? $DB->{$_[0]}{$_[1]}
1792 : ($DB->{$_[0]} ||= { })
1793 }
1794 2273
2274 cf::sync_job {
2275 BDB::db_get $DB, undef, $key, my $data;
2276
2277 $! ? ()
2278 : Compress::LZF::sthaw $data
2279 }
2280}
2281
1795 sub db_put($$;$) { 2282sub db_put($$$) {
1796 if (@_ >= 3) { 2283 BDB::dbreq_pri 4;
1797 $DB->{$_[0]}{$_[1]} = $_[2]; 2284 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2285}
2286
2287#############################################################################
2288# the server's init and main functions
2289
2290sub load_facedata {
2291 my $path = sprintf "%s/facedata", cf::datadir;
2292
2293 warn "loading facedata from $path\n";
2294
2295 my $faces;
2296 0 < aio_load $path, $faces
2297 or die "$path: $!";
2298
2299 Coro::cede;
2300 $faces = Storable::thaw $faces;
2301 Coro::cede;
2302
2303 my $meta = delete $faces->{""};
2304 $meta->{version} == 1
2305 or cf::cleanup "$path: version mismatch, cannot proceed.";
2306
2307 while (my ($face, $info) = each %$faces) {
2308 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2309 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2310 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2311 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2312 Coro::cede;
2313 }
2314
2315 while (my ($face, $info) = each %$faces) {
2316 next unless $info->{smooth};
2317 my $idx = cf::face::find $face
2318 or next;
2319 if (my $smooth = cf::face::find $info->{smooth}) {
2320 cf::face::set_smooth $idx, $smooth;
1798 } else { 2321 } else {
1799 $DB->{$_[0]} = $_[1]; 2322 warn "smooth face '$info->{smooth}' not found for face '$face'";
1800 }
1801 db_dirty;
1802 }
1803
1804 cf::global->attach (
1805 prio => 10000,
1806 on_cleanup => sub {
1807 db_sync;
1808 }, 2323 }
1809 ); 2324 Coro::cede;
1810} 2325 }
1811 2326
1812############################################################################# 2327 1
1813# the server's main() 2328}
2329
2330sub reload_resources {
2331 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2332 or die "unable to load regions file\n";#d#
2333 load_facedata
2334 or die "unable to load facedata\n";#d#
2335}
2336
2337sub init {
2338 reload_resources;
2339}
1814 2340
1815sub cfg_load { 2341sub cfg_load {
1816 open my $fh, "<:utf8", cf::confdir . "/config" 2342 open my $fh, "<:utf8", cf::confdir . "/config"
1817 or return; 2343 or return;
1818 2344
1819 local $/; 2345 local $/;
1820 *CFG = YAML::Syck::Load <$fh>; 2346 *CFG = YAML::Syck::Load <$fh>;
2347
2348 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2349
2350 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2351 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2352
2353 if (exists $CFG{mlockall}) {
2354 eval {
2355 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2356 and die "WARNING: m(un)lockall failed: $!\n";
2357 };
2358 warn $@ if $@;
2359 }
1821} 2360}
1822 2361
1823sub main { 2362sub main {
1824 # we must not ever block the main coroutine 2363 # we must not ever block the main coroutine
1825 local $Coro::idle = sub { 2364 local $Coro::idle = sub {
1826 Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d# 2365 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1827 (Coro::unblock_sub { 2366 (async {
1828 Event::one_event; 2367 Event::one_event;
1829 })->(); 2368 })->prio (Coro::PRIO_MAX);
1830 }; 2369 };
1831 2370
1832 cfg_load; 2371 cfg_load;
1833 db_load; 2372 db_init;
1834 load_extensions; 2373 load_extensions;
2374
2375 $TICK_WATCHER->start;
1835 Event::loop; 2376 Event::loop;
1836} 2377}
1837 2378
1838############################################################################# 2379#############################################################################
1839# initialisation 2380# initialisation and cleanup
2381
2382# install some emergency cleanup handlers
2383BEGIN {
2384 for my $signal (qw(INT HUP TERM)) {
2385 Event->signal (
2386 reentrant => 0,
2387 data => WF_AUTOCANCEL,
2388 signal => $signal,
2389 prio => 0,
2390 cb => sub {
2391 cf::cleanup "SIG$signal";
2392 },
2393 );
2394 }
2395}
2396
2397sub emergency_save() {
2398 my $freeze_guard = cf::freeze_mainloop;
2399
2400 warn "enter emergency perl save\n";
2401
2402 cf::sync_job {
2403 # use a peculiar iteration method to avoid tripping on perl
2404 # refcount bugs in for. also avoids problems with players
2405 # and maps saved/destroyed asynchronously.
2406 warn "begin emergency player save\n";
2407 for my $login (keys %cf::PLAYER) {
2408 my $pl = $cf::PLAYER{$login} or next;
2409 $pl->valid or next;
2410 $pl->save;
2411 }
2412 warn "end emergency player save\n";
2413
2414 warn "begin emergency map save\n";
2415 for my $path (keys %cf::MAP) {
2416 my $map = $cf::MAP{$path} or next;
2417 $map->valid or next;
2418 $map->save;
2419 }
2420 warn "end emergency map save\n";
2421
2422 warn "begin emergency database checkpoint\n";
2423 BDB::db_env_txn_checkpoint $DB_ENV;
2424 warn "end emergency database checkpoint\n";
2425 };
2426
2427 warn "leave emergency perl save\n";
2428}
2429
2430sub post_cleanup {
2431 my ($make_core) = @_;
2432
2433 warn Carp::longmess "post_cleanup backtrace"
2434 if $make_core;
2435}
1840 2436
1841sub reload() { 2437sub reload() {
1842 # can/must only be called in main 2438 # can/must only be called in main
1843 if ($Coro::current != $Coro::main) { 2439 if ($Coro::current != $Coro::main) {
1844 warn "can only reload from main coroutine\n"; 2440 warn "can only reload from main coroutine";
1845 return; 2441 return;
1846 } 2442 }
1847 2443
1848 warn "reloading..."; 2444 warn "reloading...";
1849 2445
1850 local $FREEZE = 1; 2446 warn "entering sync_job";
2447
2448 cf::sync_job {
2449 cf::write_runtime; # external watchdog should not bark
1851 cf::emergency_save; 2450 cf::emergency_save;
2451 cf::write_runtime; # external watchdog should not bark
1852 2452
1853 eval { 2453 warn "syncing database to disk";
2454 BDB::db_env_txn_checkpoint $DB_ENV;
2455
1854 # if anything goes wrong in here, we should simply crash as we already saved 2456 # if anything goes wrong in here, we should simply crash as we already saved
1855 2457
1856 # cancel all watchers 2458 warn "cancelling all WF_AUTOCANCEL watchers";
1857 for (Event::all_watchers) { 2459 for (Event::all_watchers) {
1858 $_->cancel if $_->data & WF_AUTOCANCEL; 2460 $_->cancel if $_->data & WF_AUTOCANCEL;
1859 } 2461 }
1860 2462
2463 warn "flushing outstanding aio requests";
2464 for (;;) {
2465 BDB::flush;
2466 IO::AIO::flush;
2467 Coro::cede;
2468 last unless IO::AIO::nreqs || BDB::nreqs;
2469 warn "iterate...";
2470 }
2471
2472 ++$RELOAD;
2473
1861 # cancel all extension coros 2474 warn "cancelling all extension coros";
1862 $_->cancel for values %EXT_CORO; 2475 $_->cancel for values %EXT_CORO;
1863 %EXT_CORO = (); 2476 %EXT_CORO = ();
1864 2477
1865 # unload all extensions 2478 warn "removing commands";
1866 for (@exts) { 2479 %COMMAND = ();
2480
2481 warn "removing ext commands";
2482 %EXTCMD = ();
2483
2484 warn "unloading/nuking all extensions";
2485 for my $pkg (@EXTS) {
1867 warn "unloading <$_>"; 2486 warn "... unloading $pkg";
1868 unload_extension $_; 2487
2488 if (my $cb = $pkg->can ("unload")) {
2489 eval {
2490 $cb->($pkg);
2491 1
2492 } or warn "$pkg unloaded, but with errors: $@";
1869 } 2493 }
1870 2494
2495 warn "... nuking $pkg";
2496 Symbol::delete_package $pkg;
2497 }
2498
1871 # unload all modules loaded from $LIBDIR 2499 warn "unloading all perl modules loaded from $LIBDIR";
1872 while (my ($k, $v) = each %INC) { 2500 while (my ($k, $v) = each %INC) {
1873 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2501 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
1874 2502
1875 warn "removing <$k>"; 2503 warn "... unloading $k";
1876 delete $INC{$k}; 2504 delete $INC{$k};
1877 2505
1878 $k =~ s/\.pm$//; 2506 $k =~ s/\.pm$//;
1879 $k =~ s/\//::/g; 2507 $k =~ s/\//::/g;
1880 2508
1883 } 2511 }
1884 2512
1885 Symbol::delete_package $k; 2513 Symbol::delete_package $k;
1886 } 2514 }
1887 2515
1888 # sync database to disk
1889 cf::db_sync;
1890 IO::AIO::flush;
1891
1892 # get rid of safe::, as good as possible 2516 warn "getting rid of safe::, as good as possible";
1893 Symbol::delete_package "safe::$_" 2517 Symbol::delete_package "safe::$_"
1894 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2518 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
1895 2519
1896 # remove register_script_function callbacks
1897 # TODO
1898
1899 # unload cf.pm "a bit" 2520 warn "unloading cf.pm \"a bit\"";
1900 delete $INC{"cf.pm"}; 2521 delete $INC{"cf.pm"};
1901 2522
1902 # don't, removes xs symbols, too, 2523 # don't, removes xs symbols, too,
1903 # and global variables created in xs 2524 # and global variables created in xs
1904 #Symbol::delete_package __PACKAGE__; 2525 #Symbol::delete_package __PACKAGE__;
1905 2526
1906 # reload cf.pm 2527 warn "unload completed, starting to reload now";
2528
1907 warn "reloading cf.pm"; 2529 warn "reloading cf.pm";
1908 require cf; 2530 require cf;
1909 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2531 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
1910 2532
1911 # load config and database again 2533 warn "loading config and database again";
1912 cf::cfg_load; 2534 cf::cfg_load;
1913 cf::db_load;
1914 2535
1915 # load extensions
1916 warn "load extensions"; 2536 warn "loading extensions";
1917 cf::load_extensions; 2537 cf::load_extensions;
1918 2538
1919 # reattach attachments to objects 2539 warn "reattaching attachments to objects/players";
1920 warn "reattach"; 2540 _global_reattach; # objects, sockets
1921 _global_reattach; 2541 warn "reattaching attachments to maps";
1922 }; 2542 reattach $_ for values %MAP;
2543 warn "reattaching attachments to players";
2544 reattach $_ for values %PLAYER;
1923 2545
1924 if ($@) { 2546 warn "loading reloadable resources";
2547 reload_resources;
2548
2549 warn "leaving sync_job";
2550
2551 1
2552 } or do {
1925 warn $@; 2553 warn $@;
1926 warn "error while reloading, exiting."; 2554 warn "error while reloading, exiting.";
1927 exit 1; 2555 exit 1;
1928 } 2556 };
1929 2557
1930 warn "reloaded successfully"; 2558 warn "reloaded";
1931}; 2559};
1932 2560
1933############################################################################# 2561our $RELOAD_WATCHER; # used only during reload
1934
1935unless ($LINK_MAP) {
1936 $LINK_MAP = cf::map::new;
1937
1938 $LINK_MAP->width (41);
1939 $LINK_MAP->height (41);
1940 $LINK_MAP->alloc;
1941 $LINK_MAP->path ("{link}");
1942 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
1943 $LINK_MAP->in_memory (MAP_IN_MEMORY);
1944
1945 # dirty hack because... archetypes are not yet loaded
1946 Event->timer (
1947 after => 2,
1948 cb => sub {
1949 $_[0]->w->cancel;
1950
1951 # provide some exits "home"
1952 my $exit = cf::object::new "exit";
1953
1954 $exit->slaying ($EMERGENCY_POSITION->[0]);
1955 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
1956 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
1957
1958 $LINK_MAP->insert ($exit->clone, 19, 19);
1959 $LINK_MAP->insert ($exit->clone, 19, 20);
1960 $LINK_MAP->insert ($exit->clone, 19, 21);
1961 $LINK_MAP->insert ($exit->clone, 20, 19);
1962 $LINK_MAP->insert ($exit->clone, 20, 21);
1963 $LINK_MAP->insert ($exit->clone, 21, 19);
1964 $LINK_MAP->insert ($exit->clone, 21, 20);
1965 $LINK_MAP->insert ($exit->clone, 21, 21);
1966
1967 $exit->destroy;
1968 });
1969
1970 $LINK_MAP->{deny_save} = 1;
1971 $LINK_MAP->{deny_reset} = 1;
1972
1973 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
1974}
1975
1976register "<global>", __PACKAGE__;
1977 2562
1978register_command "reload" => sub { 2563register_command "reload" => sub {
1979 my ($who, $arg) = @_; 2564 my ($who, $arg) = @_;
1980 2565
1981 if ($who->flag (FLAG_WIZ)) { 2566 if ($who->flag (FLAG_WIZ)) {
1982 $who->message ("start of reload."); 2567 $who->message ("reloading server.");
2568
2569 # doing reload synchronously and two reloads happen back-to-back,
2570 # coro crashes during coro_state_free->destroy here.
2571
2572 $RELOAD_WATCHER ||= Event->timer (
2573 reentrant => 0,
2574 after => 0,
2575 data => WF_AUTOCANCEL,
2576 cb => sub {
1983 reload; 2577 reload;
1984 $who->message ("end of reload."); 2578 undef $RELOAD_WATCHER;
2579 },
2580 );
1985 } 2581 }
1986}; 2582};
1987 2583
1988unshift @INC, $LIBDIR; 2584unshift @INC, $LIBDIR;
2585
2586my $bug_warning = 0;
1989 2587
1990$TICK_WATCHER = Event->timer ( 2588$TICK_WATCHER = Event->timer (
1991 reentrant => 0, 2589 reentrant => 0,
2590 parked => 1,
1992 prio => 0, 2591 prio => 0,
1993 at => $NEXT_TICK || $TICK, 2592 at => $NEXT_TICK || $TICK,
1994 data => WF_AUTOCANCEL, 2593 data => WF_AUTOCANCEL,
1995 cb => sub { 2594 cb => sub {
1996 unless ($FREEZE) { 2595 if ($Coro::current != $Coro::main) {
2596 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2597 unless ++$bug_warning > 10;
2598 return;
2599 }
2600
2601 $NOW = Event::time;
2602
1997 cf::server_tick; # one server iteration 2603 cf::server_tick; # one server iteration
1998 $RUNTIME += $TICK; 2604 $RUNTIME += $TICK;
1999 }
2000
2001 $NEXT_TICK += $TICK; 2605 $NEXT_TICK += $TICK;
2606
2607 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2608 $NEXT_RUNTIME_WRITE = $NOW + 10;
2609 Coro::async_pool {
2610 write_runtime
2611 or warn "ERROR: unable to write runtime file: $!";
2612 };
2613 }
2614
2615 $WAIT_FOR_TICK->broadcast;
2616 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2617
2618# my $AFTER = Event::time;
2619# warn $AFTER - $NOW;#d#
2002 2620
2003 # if we are delayed by four ticks or more, skip them all 2621 # if we are delayed by four ticks or more, skip them all
2004 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2622 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2005 2623
2006 $TICK_WATCHER->at ($NEXT_TICK); 2624 $TICK_WATCHER->at ($NEXT_TICK);
2007 $TICK_WATCHER->start; 2625 $TICK_WATCHER->start;
2008 }, 2626 },
2009); 2627);
2010 2628
2629{
2011IO::AIO::max_poll_time $TICK * 0.2; 2630 BDB::max_poll_time $TICK * 0.1;
2012 2631 $BDB_POLL_WATCHER = Event->io (
2013Event->io ( 2632 reentrant => 0,
2014 fd => IO::AIO::poll_fileno, 2633 fd => BDB::poll_fileno,
2015 poll => 'r', 2634 poll => 'r',
2016 prio => 5, 2635 prio => 0,
2017 data => WF_AUTOCANCEL,
2018 cb => \&IO::AIO::poll_cb,
2019);
2020
2021Event->timer (
2022 data => WF_AUTOCANCEL, 2636 data => WF_AUTOCANCEL,
2023 after => 0, 2637 cb => \&BDB::poll_cb,
2024 interval => 10, 2638 );
2025 cb => sub { 2639 BDB::min_parallel 8;
2026 (Coro::unblock_sub { 2640
2027 write_runtime 2641 BDB::set_sync_prepare {
2028 or warn "ERROR: unable to write runtime file: $!"; 2642 my $status;
2643 my $current = $Coro::current;
2644 (
2645 sub {
2646 $status = $!;
2647 $current->ready; undef $current;
2648 },
2649 sub {
2650 Coro::schedule while defined $current;
2651 $! = $status;
2652 },
2653 )
2654 };
2655
2656 unless ($DB_ENV) {
2657 $DB_ENV = BDB::db_env_create;
2658
2659 cf::sync_job {
2660 eval {
2661 BDB::db_env_open
2662 $DB_ENV,
2663 $BDB_ENV_DIR,
2664 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2665 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2666 0666;
2667
2668 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2669
2670 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2671 $DB_ENV->set_lk_detect;
2672 };
2673
2674 cf::cleanup "db_env_open(db): $@" if $@;
2029 })->(); 2675 };
2030 }, 2676 }
2031); 2677}
2678
2679{
2680 IO::AIO::min_parallel 8;
2681
2682 undef $Coro::AIO::WATCHER;
2683 IO::AIO::max_poll_time $TICK * 0.1;
2684 $AIO_POLL_WATCHER = Event->io (
2685 reentrant => 0,
2686 data => WF_AUTOCANCEL,
2687 fd => IO::AIO::poll_fileno,
2688 poll => 'r',
2689 prio => 6,
2690 cb => \&IO::AIO::poll_cb,
2691 );
2692}
2693
2694END { cf::emergency_save }
2032 2695
20331 26961
2034 2697

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines