ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.143 by root, Sun Jan 7 02:39:14 2007 UTC vs.
Revision 1.231 by root, Wed Apr 4 00:02:06 2007 UTC

…		…
4	use strict;	4	use strict;
5		5
6	use Symbol;	6	use Symbol;
7	use List::Util;	7	use List::Util;
8	use Storable;	8	use Storable;
		9	use Event;
9	use Opcode;	10	use Opcode;
10	use Safe;	11	use Safe;
11	use Safe::Hole;	12	use Safe::Hole;
12		13
13	use Coro 3.3 ();	14	use Coro 3.52 ();
		15	use Coro::State;
14	use Coro::Event;	16	use Coro::Event;
15	use Coro::Timer;	17	use Coro::Timer;
16	use Coro::Signal;	18	use Coro::Signal;
17	use Coro::Semaphore;	19	use Coro::Semaphore;
18	use Coro::AIO;	20	use Coro::AIO;
19		21
		22	use BDB ();
		23	use Data::Dumper;
20	use Digest::MD5;	24	use Digest::MD5;
21	use Fcntl;	25	use Fcntl;
22	use IO::AIO 2.31 ();
23	use YAML::Syck ();	26	use YAML::Syck ();
		27	use IO::AIO 2.32 ();
24	use Time::HiRes;	28	use Time::HiRes;
		29	use Compress::LZF;
25		30
		31	# configure various modules to our taste
		32	#
		33	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
		34	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
		35
26	use 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 (Coro::PRIO_MAX); # 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
33	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	43	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34		44
35	our %COMMAND = ();	45	our %COMMAND = ();
36	our %COMMAND_TIME = ();	46	our %COMMAND_TIME = ();
		47
		48	our @EXTS = (); # list of extension package names
37	our %EXTCMD = ();	49	our %EXTCMD = ();
		50	our %EXT_CORO = (); # coroutines bound to extensions
		51	our %EXT_MAP = (); # pluggable maps
38		52
		53	our $RELOAD; # number of reloads so far
39	our @EVENT;	54	our @EVENT;
40	our $LIBDIR = datadir . "/ext";	55	our $LIBDIR = datadir . "/ext";
41		56
42	our $TICK = MAX_TIME * 1e-6;	57	our $TICK = MAX_TIME * 1e-6;
43	our $TICK_WATCHER;	58	our $TICK_WATCHER;
		59	our $AIO_POLL_WATCHER;
		60	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
44	our $NEXT_TICK;	61	our $NEXT_TICK;
45	our $NOW;	62	our $NOW;
		63	our $USE_FSYNC = 1; # use fsync to write maps - default off
		64
		65	our $BDB_POLL_WATCHER;
		66	our $DB_ENV;
46		67
47	our %CFG;	68	our %CFG;
48		69
49	our $UPTIME; $UPTIME ||= time;	70	our $UPTIME; $UPTIME ||= time;
50	our $RUNTIME;	71	our $RUNTIME;
51		72
52	our %PLAYER; # all users	73	our %PLAYER; # all users
53	our %MAP; # all maps	74	our %MAP; # all maps
54	our $LINK_MAP; # the special {link} map	75	our $LINK_MAP; # the special {link} map, which is always available
55	our $RANDOM_MAPS = cf::localdir . "/random";	76	our $RANDOM_MAPS = cf::localdir . "/random";
56	our %EXT_CORO; # coroutines bound to extensions	77	our $BDB_ENV_DIR = cf::localdir . "/db";
		78
		79	our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
		80	our $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 ∕
		83	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
57		84
58	binmode STDOUT;	85	binmode STDOUT;
59	binmode STDERR;	86	binmode STDERR;
60		87
61	# read virtual server time, if available	88	# read virtual server time, if available
…		…
68	mkdir cf::localdir;	95	mkdir cf::localdir;
69	mkdir cf::localdir . "/" . cf::playerdir;	96	mkdir cf::localdir . "/" . cf::playerdir;
70	mkdir cf::localdir . "/" . cf::tmpdir;	97	mkdir cf::localdir . "/" . cf::tmpdir;
71	mkdir cf::localdir . "/" . cf::uniquedir;	98	mkdir cf::localdir . "/" . cf::uniquedir;
72	mkdir $RANDOM_MAPS;	99	mkdir $RANDOM_MAPS;
		100	mkdir $BDB_ENV_DIR;
73		101
74	# a special map that is always available
75	our $LINK_MAP;
76	our $EMERGENCY_POSITION;	102	our $EMERGENCY_POSITION;
		103
		104	sub cf::map::normalise;
77		105
78	#############################################################################	106	#############################################################################
79		107
80	=head2 GLOBAL VARIABLES	108	=head2 GLOBAL VARIABLES
81		109
…		…
105		133
106	=item %cf::CFG	134	=item %cf::CFG
107		135
108	Configuration for the server, loaded from C</etc/crossfire/config>, or	136	Configuration for the server, loaded from C</etc/crossfire/config>, or
109	from wherever your confdir points to.	137	from wherever your confdir points to.
		138
		139	=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
		140
		141	These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
		142	or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
		143	processing has been done. Call C<< ->wait >> on them to maximise the
		144	window of cpu time available, or simply to synchronise to the server tick.
110		145
111	=back	146	=back
112		147
113	=cut	148	=cut
114		149
…		…
118	utf8::encode $msg;	153	utf8::encode $msg;
119		154
120	$msg .= "\n"	155	$msg .= "\n"
121	unless $msg =~ /\n$/;	156	unless $msg =~ /\n$/;
122		157
123	LOG llevError, "cfperl: $msg";	158	LOG llevError, $msg;
124	};	159	};
125	}	160	}
126		161
127	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	162	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
128	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	163	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
…		…
146		181
147	$Event::DIED = sub {	182	$Event::DIED = sub {
148	warn "error in event callback: @_";	183	warn "error in event callback: @_";
149	};	184	};
150		185
151	my %ext_pkg;
152	my @exts;
153	my @hook;
154
155	=head2 UTILITY FUNCTIONS	186	=head2 UTILITY FUNCTIONS
156		187
157	=over 4	188	=over 4
158		189
159	=cut	190	=item dumpval $ref
160		191
		192	=cut
		193
		194	sub 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
161	use JSON::Syck (); # TODO# replace by JSON::PC once working	213	use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
162		214
163	=item $ref = cf::from_json $json	215	=item $ref = cf::from_json $json
164		216
165	Converts a JSON string into the corresponding perl data structure.	217	Converts a JSON string into the corresponding perl data structure.
166		218
167	=cut
168
169	sub from_json($) {
170	$JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
171	JSON::Syck::Load $_[0]
172	}
173
174	=item $json = cf::to_json $ref	219	=item $json = cf::to_json $ref
175		220
176	Converts a perl data structure into its JSON representation.	221	Converts a perl data structure into its JSON representation.
177
178	=cut
179
180	sub to_json($) {
181	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
182	JSON::Syck::Dump $_[0]
183	}
184		222
185	=item cf::lock_wait $string	223	=item cf::lock_wait $string
186		224
187	Wait until the given lock is available. See cf::lock_acquire.	225	Wait until the given lock is available. See cf::lock_acquire.
188		226
…		…
225	}	263	}
226		264
227	sub freeze_mainloop {	265	sub freeze_mainloop {
228	return unless $TICK_WATCHER->is_active;	266	return unless $TICK_WATCHER->is_active;
229		267
230	my $guard = Coro::guard { $TICK_WATCHER->start };	268	my $guard = Coro::guard {
		269	$TICK_WATCHER->start;
		270	};
231	$TICK_WATCHER->stop;	271	$TICK_WATCHER->stop;
232	$guard	272	$guard
233	}	273	}
234		274
235	=item cf::async { BLOCK }	275	=item cf::async { BLOCK }
…		…
287	}	327	}
288	}	328	}
289		329
290	=item $coro = cf::async_ext { BLOCK }	330	=item $coro = cf::async_ext { BLOCK }
291		331
292	Like async, but this coro is automcatially being canceled when the	332	Like async, but this coro is automatically being canceled when the
293	extension calling this is being unloaded.	333	extension calling this is being unloaded.
294		334
295	=cut	335	=cut
296		336
297	sub async_ext(&) {	337	sub async_ext(&) {
…		…
306		346
307	$coro	347	$coro
308	}	348	}
309		349
310	sub write_runtime {	350	sub write_runtime {
		351	my $guard = cf::lock_acquire "write_runtime";
		352
311	my $runtime = cf::localdir . "/runtime";	353	my $runtime = cf::localdir . "/runtime";
312		354
313	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	355	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
314	or return;	356	or return;
315		357
		358	my $value = $cf::RUNTIME + 90 + 10;
316	my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock	359	# 10 is the runtime save interval, for a monotonic clock
		360	# 60 allows for the watchdog to kill the server.
		361
317	(aio_write $fh, 0, (length $value), $value, 0) <= 0	362	(aio_write $fh, 0, (length $value), $value, 0) <= 0
318	and return;	363	and return;
319		364
		365	# always fsync - this file is important
320	aio_fsync $fh	366	aio_fsync $fh
321	and return;	367	and return;
322		368
323	close $fh	369	close $fh
324	or return;	370	or return;
…		…
327	and return;	373	and return;
328		374
329	1	375	1
330	}	376	}
331		377
		378	=item cf::datalog type => key => value, ...
		379
		380	Log a datalog packet of the given type with the given key-value pairs.
		381
		382	=cut
		383
		384	sub datalog($@) {
		385	my ($type, %kv) = @_;
		386	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
		387	}
		388
332	=back	389	=back
333		390
334	=cut	391	=cut
335
336	#############################################################################
337
338	package cf::path;
339
340	sub new {
341	my ($class, $path, $base) = @_;
342
343	$path = $path->as_string if ref $path;
344
345	my $self = bless { }, $class;
346
347	# {... are special paths that are not touched
348	# ?xxx/... are special absolute paths
349	# ?random/... random maps
350	# /! non-realised random map exit
351	# /... normal maps
352	# ~/... per-player maps without a specific player (DO NOT USE)
353	# ~user/... per-player map of a specific user
354
355	if ($path =~ /^{/) {
356	# fine as it is
357	} elsif ($path =~ s{^\?random/}{}) {
358	Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
359	$self->{random} = cf::from_json $data;
360	} else {
361	if ($path =~ s{^~([^/]+)?}{}) {
362	$self->{user_rel} = 1;
363
364	if (defined $1) {
365	$self->{user} = $1;
366	} elsif ($base =~ m{^~([^/]+)/}) {
367	$self->{user} = $1;
368	} else {
369	warn "cannot resolve user-relative path without user <$path,$base>\n";
370	}
371	} elsif ($path =~ /^\//) {
372	# already absolute
373	} else {
374	$base =~ s{[^/]+/?$}{};
375	return $class->new ("$base/$path");
376	}
377
378	for ($path) {
379	redo if s{/\.?/}{/};
380	redo if s{/[^/]+/\.\./}{/};
381	}
382	}
383
384	$self->{path} = $path;
385
386	$self
387	}
388
389	# the name / primary key / in-game path
390	sub as_string {
391	my ($self) = @_;
392
393	$self->{user_rel} ? "~$self->{user}$self->{path}"
394	: $self->{random} ? "?random/$self->{path}"
395	: $self->{path}
396	}
397
398	# the displayed name, this is a one way mapping
399	sub visible_name {
400	my ($self) = @_;
401
402	# if (my $rmp = $self->{random}) {
403	# # todo: be more intelligent about this
404	# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
405	# } else {
406	$self->as_string
407	# }
408	}
409
410	# escape the /'s in the path
411	sub _escaped_path {
412	# ∕ is U+2215
413	(my $path = $_[0]{path}) =~ s/\//∕/g;
414	$path
415	}
416
417	# the original (read-only) location
418	sub load_path {
419	my ($self) = @_;
420
421	sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
422	}
423
424	# the temporary/swap location
425	sub save_path {
426	my ($self) = @_;
427
428	$self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
429	: $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
430	: sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
431	}
432
433	# the unique path, might be eq to save_path
434	sub uniq_path {
435	my ($self) = @_;
436
437	$self->{user_rel} || $self->{random}
438	? undef
439	: sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
440	}
441
442	# return random map parameters, or undef
443	sub random_map_params {
444	my ($self) = @_;
445
446	$self->{random}
447	}
448
449	# this is somewhat ugly, but style maps do need special treatment
450	sub is_style_map {
451	$_[0]{path} =~ m{^/styles/}
452	}
453
454	package cf;
455		392
456	#############################################################################	393	#############################################################################
457		394
458	=head2 ATTACHABLE OBJECTS	395	=head2 ATTACHABLE OBJECTS
459		396
…		…
585	our @CB_TYPE = (); # registry for type (cf-object class) based events	522	our @CB_TYPE = (); # registry for type (cf-object class) based events
586	our @CB_MAP = ();	523	our @CB_MAP = ();
587		524
588	my %attachment;	525	my %attachment;
589		526
		527	sub cf::attachable::thawer_merge {
		528	# simply override everything except _meta
		529	local $_[0]{_meta};
		530	%{$_[0]} = %{$_[1]};
		531	}
		532
590	sub _attach_cb($$$$) {	533	sub _attach_cb($$$$) {
591	my ($registry, $event, $prio, $cb) = @_;	534	my ($registry, $event, $prio, $cb) = @_;
592		535
593	use sort 'stable';	536	use sort 'stable';
594		537
…		…
765	# object support	708	# object support
766		709
767	sub reattach {	710	sub reattach {
768	# basically do the same as instantiate, without calling instantiate	711	# basically do the same as instantiate, without calling instantiate
769	my ($obj) = @_;	712	my ($obj) = @_;
		713
		714	bless $obj, ref $obj; # re-bless in case extensions have been reloaded
770		715
771	my $registry = $obj->registry;	716	my $registry = $obj->registry;
772		717
773	@$registry = ();	718	@$registry = ();
774		719
…		…
821	$filename, length $$rdata, scalar @$objs;	766	$filename, length $$rdata, scalar @$objs;
822		767
823	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	768	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
824	chmod SAVE_MODE, $fh;	769	chmod SAVE_MODE, $fh;
825	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	770	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
826	aio_fsync $fh;	771	aio_fsync $fh if $cf::USE_FSYNC;
827	close $fh;	772	close $fh;
828		773
829	if (@$objs) {	774	if (@$objs) {
830	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) {
831	chmod SAVE_MODE, $fh;	776	chmod SAVE_MODE, $fh;
832	my $data = Storable::nfreeze { version => 1, objs => $objs };	777	my $data = Storable::nfreeze { version => 1, objs => $objs };
833	aio_write $fh, 0, (length $data), $data, 0;	778	aio_write $fh, 0, (length $data), $data, 0;
834	aio_fsync $fh;	779	aio_fsync $fh if $cf::USE_FSYNC;
835	close $fh;	780	close $fh;
836	aio_rename "$filename.pst~", "$filename.pst";	781	aio_rename "$filename.pst~", "$filename.pst";
837	}	782	}
838	} else {	783	} else {
839	aio_unlink "$filename.pst";	784	aio_unlink "$filename.pst";
…		…
906	=cut	851	=cut
907		852
908	sub register_extcmd {	853	sub register_extcmd {
909	my ($name, $cb) = @_;	854	my ($name, $cb) = @_;
910		855
911	my $caller = caller;
912	#warn "registering extcmd '$name' to '$caller'";
913
914	$EXTCMD{$name} = [$cb, $caller];	856	$EXTCMD{$name} = $cb;
915	}	857	}
916		858
917	cf::player->attach (	859	cf::player->attach (
918	on_command => sub {	860	on_command => sub {
919	my ($pl, $name, $params) = @_;	861	my ($pl, $name, $params) = @_;
…		…
932		874
933	my $msg = eval { from_json $buf };	875	my $msg = eval { from_json $buf };
934		876
935	if (ref $msg) {	877	if (ref $msg) {
936	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	878	if (my $cb = $EXTCMD{$msg->{msgtype}}) {
937	if (my %reply = $cb->[0]->($pl, $msg)) {	879	if (my %reply = $cb->($pl, $msg)) {
938	$pl->ext_reply ($msg->{msgid}, %reply);	880	$pl->ext_reply ($msg->{msgid}, %reply);
939	}	881	}
940	}	882	}
941	} else {	883	} else {
942	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	884	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
…		…
944		886
945	cf::override;	887	cf::override;
946	},	888	},
947	);	889	);
948		890
949	sub register {
950	my ($base, $pkg) = @_;
951
952	#TODO
953	}
954
955	sub load_extension {	891	sub load_extension {
956	my ($path) = @_;	892	my ($path) = @_;
957		893
958	$path =~ /([^\/\\]+)\.ext$/ or die "$path";	894	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
959	my $base = $1;	895	my $base = $1;
960	my $pkg = $1;	896	my $pkg = $1;
961	$pkg =~ s/[^[:word:]]/_/g;	897	$pkg =~ s/[^[:word:]]/_/g;
962	$pkg = "ext::$pkg";	898	$pkg = "ext::$pkg";
963		899
964	warn "loading '$path' into '$pkg'\n";	900	warn "... loading '$path' into '$pkg'\n";
965		901
966	open my $fh, "<:utf8", $path	902	open my $fh, "<:utf8", $path
967	or die "$path: $!";	903	or die "$path: $!";
968		904
969	my $source =	905	my $source =
970	"package $pkg; use strict; use utf8;\n"	906	"package $pkg; use strict; use utf8;\n"
971	. "#line 1 \"$path\"\n{\n"	907	. "#line 1 \"$path\"\n{\n"
972	. (do { local $/; <$fh> })	908	. (do { local $/; <$fh> })
973	. "\n};\n1";	909	. "\n};\n1";
974		910
975	eval $source	911	unless (eval $source) {
976	or die $@ ? "$path: $@\n"	912	my $msg = $@ ? "$path: $@\n"
977	: "extension disabled.\n";	913	: "extension disabled.\n";
978		914	if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
979	push @exts, $pkg;	915	warn $@;
980	$ext_pkg{$base} = $pkg;	916	warn "mandatory extension failed to load, exiting.\n";
981		917	exit 1;
982	# no strict 'refs';	918	}
983	# @{"$pkg\::ISA"} = ext::;	919	die $@;
984
985	register $base, $pkg;
986	}
987
988	sub unload_extension {
989	my ($pkg) = @_;
990
991	warn "removing extension $pkg\n";
992
993	# remove hooks
994	#TODO
995	# for my $idx (0 .. $#PLUGIN_EVENT) {
996	# delete $hook[$idx]{$pkg};
997	# }	920	}
998		921
999	# remove commands	922	push @EXTS, $pkg;
1000	for my $name (keys %COMMAND) {
1001	my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1002
1003	if (@cb) {
1004	$COMMAND{$name} = \@cb;
1005	} else {
1006	delete $COMMAND{$name};
1007	}
1008	}
1009
1010	# remove extcmds
1011	for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1012	delete $EXTCMD{$name};
1013	}
1014
1015	if (my $cb = $pkg->can ("unload")) {
1016	eval {
1017	$cb->($pkg);
1018	1
1019	} or warn "$pkg unloaded, but with errors: $@";
1020	}
1021
1022	Symbol::delete_package $pkg;
1023	}	923	}
1024		924
1025	sub load_extensions {	925	sub load_extensions {
1026	for my $ext (<$LIBDIR/*.ext>) {	926	for my $ext (<$LIBDIR/*.ext>) {
1027	next unless -r $ext;	927	next unless -r $ext;
…		…
1031	} or warn "$ext not loaded: $@";	931	} or warn "$ext not loaded: $@";
1032	}	932	}
1033	}	933	}
1034		934
1035	#############################################################################	935	#############################################################################
1036	# load/save/clean perl data associated with a map
1037
1038	*cf::mapsupport::on_clean = sub {
1039	my ($map) = @_;
1040
1041	my $path = $map->tmpname;
1042	defined $path or return;
1043
1044	unlink "$path.pst";
1045	};
1046
1047	cf::map->attach (prio => -10000, package => cf::mapsupport::);
1048
1049	#############################################################################
1050	# load/save perl data associated with player->ob objects
1051
1052	sub all_objects(@) {
1053	@_, map all_objects ($_->inv), @_
1054	}
1055
1056	# TODO: compatibility cruft, remove when no longer needed
1057	cf::player->attach (
1058	on_load => sub {
1059	my ($pl, $path) = @_;
1060
1061	for my $o (all_objects $pl->ob) {
1062	if (my $value = $o->get_ob_key_value ("_perl_data")) {
1063	$o->set_ob_key_value ("_perl_data");
1064
1065	%$o = %{ Storable::thaw pack "H*", $value };
1066	}
1067	}
1068	},
1069	);
1070
1071	#############################################################################
1072		936
1073	=head2 CORE EXTENSIONS	937	=head2 CORE EXTENSIONS
1074		938
1075	Functions and methods that extend core crossfire objects.	939	Functions and methods that extend core crossfire objects.
1076		940
1077	=cut	941	=cut
1078		942
1079	package cf::player;	943	package cf::player;
1080		944
		945	use Coro::AIO;
		946
1081	=head3 cf::player	947	=head3 cf::player
1082		948
1083	=over 4	949	=over 4
1084		950
1085	=item cf::player::find $login	951	=item cf::player::find $login
1086		952
1087	Returns the given player object, loading it if necessary (might block).	953	Returns the given player object, loading it if necessary (might block).
1088		954
1089	=cut	955	=cut
1090		956
		957	sub playerdir($) {
		958	cf::localdir
		959	. "/"
		960	. cf::playerdir
		961	. "/"
		962	. (ref $_[0] ? $_[0]->ob->name : $_[0])
		963	}
		964
1091	sub path($) {	965	sub path($) {
1092	sprintf "%s/%s/%s/%s.pl",	966	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1093	cf::localdir, cf::playerdir,	967
1094	(ref $_[0] ? $_[0]->ob->name : $_[0]) x 2	968	(playerdir $login) . "/$login.pl"
1095	}	969	}
1096		970
1097	sub find_active($) {	971	sub find_active($) {
1098	$cf::PLAYER{$_[0]}	972	$cf::PLAYER{$_[0]}
1099	and $cf::PLAYER{$_[0]}->active	973	and $cf::PLAYER{$_[0]}->active
…		…
1102		976
1103	sub exists($) {	977	sub exists($) {
1104	my ($login) = @_;	978	my ($login) = @_;
1105		979
1106	$cf::PLAYER{$login}	980	$cf::PLAYER{$login}
1107	or cf::sync_job { !aio_stat $login }	981	or cf::sync_job { !aio_stat path $login }
1108	}	982	}
1109		983
1110	sub find($) {	984	sub find($) {
1111	return $cf::PLAYER{$_[0]} || do {	985	return $cf::PLAYER{$_[0]} || do {
1112	my $login = $_[0];	986	my $login = $_[0];
1113		987
1114	my $guard = cf::lock_acquire "user_find:$login";	988	my $guard = cf::lock_acquire "user_find:$login";
1115		989
1116	$cf::PLAYER{$login} ||= (load_pl path $login or return);	990	$cf::PLAYER{$_[0]} || do {
		991	my $pl = load_pl path $login
		992	or return;
		993	$cf::PLAYER{$login} = $pl
		994	}
1117	};	995	}
1118	}	996	}
1119		997
1120	sub save($) {	998	sub save($) {
1121	my ($pl) = @_;	999	my ($pl) = @_;
1122		1000
…		…
1124		1002
1125	my $path = path $pl;	1003	my $path = path $pl;
1126	my $guard = cf::lock_acquire "user_save:$path";	1004	my $guard = cf::lock_acquire "user_save:$path";
1127		1005
1128	return if $pl->{deny_save};	1006	return if $pl->{deny_save};
		1007
		1008	aio_mkdir playerdir $pl, 0770;
1129	$pl->{last_save} = $cf::RUNTIME;	1009	$pl->{last_save} = $cf::RUNTIME;
1130		1010
1131	Coro::cede;
1132	$pl->save_pl ($path);	1011	$pl->save_pl ($path);
1133	Coro::cede;	1012	Coro::cede;
1134	}	1013	}
1135		1014
1136	sub new($) {	1015	sub new($) {
…		…
1144	$cf::PLAYER{$login} = $self;	1023	$cf::PLAYER{$login} = $self;
1145		1024
1146	$self	1025	$self
1147	}	1026	}
1148		1027
		1028	=item $pl->quit_character
		1029
		1030	Nukes the player without looking back. If logged in, the connection will
		1031	be destroyed. May block for a long time.
		1032
		1033	=cut
		1034
		1035	sub 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
		1064	Kicks a player out of the game. This destroys the connection.
		1065
		1066	=cut
		1067
		1068	sub 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
		1078	Returns am arrayref of all valid playernames in the system, can take a
		1079	while and may block, so not sync_job-capable, ever.
		1080
		1081	=cut
		1082
		1083	sub 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
		1103	Returns an arrayref of map paths that are private for this
		1104	player. May block.
		1105
		1106	=cut
		1107
		1108	sub 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
1149	=item $player->ext_reply ($msgid, $msgtype, %msg)	1129	=item $player->ext_reply ($msgid, %msg)
1150		1130
1151	Sends an ext reply to the player.	1131	Sends an ext reply to the player.
1152		1132
1153	=cut	1133	=cut
1154		1134
1155	sub ext_reply($$$%) {	1135	sub ext_reply($$%) {
1156	my ($self, $id, %msg) = @_;	1136	my ($self, $id, %msg) = @_;
1157		1137
1158	$msg{msgid} = $id;	1138	$msg{msgid} = $id;
		1139
		1140	$self->send ("ext " . cf::to_json \%msg);
		1141	}
		1142
		1143	=item $player->ext_event ($type, %msg)
		1144
		1145	Sends an ext event to the client.
		1146
		1147	=cut
		1148
		1149	sub ext_event($$%) {
		1150	my ($self, $type, %msg) = @_;
		1151
		1152	delete $msg{msgid};
		1153	$msg{msgtype} = "event";
		1154	$msg{eventtype} = $type;
1159		1155
1160	$self->send ("ext " . cf::to_json \%msg);	1156	$self->send ("ext " . cf::to_json \%msg);
1161	}	1157	}
1162		1158
1163	package cf;	1159	package cf;
…		…
1174	package cf::map;	1170	package cf::map;
1175		1171
1176	use Fcntl;	1172	use Fcntl;
1177	use Coro::AIO;	1173	use Coro::AIO;
1178		1174
		1175	use overload
		1176	'""' => \&as_string,
		1177	fallback => 1;
		1178
1179	our $MAX_RESET = 3600;	1179	our $MAX_RESET = 3600;
1180	our $DEFAULT_RESET = 3000;	1180	our $DEFAULT_RESET = 3000;
1181		1181
1182	sub generate_random_map {	1182	sub generate_random_map {
1183	my ($path, $rmp) = @_;	1183	my ($self, $rmp) = @_;
1184
1185	# mit "rum" bekleckern, nicht	1184	# mit "rum" bekleckern, nicht
1186	cf::map::_create_random_map	1185	$self->_create_random_map (
1187	$path,
1188	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1186	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1189	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1187	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1190	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1188	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1191	$rmp->{exit_on_final_map},	1189	$rmp->{exit_on_final_map},
1192	$rmp->{xsize}, $rmp->{ysize},	1190	$rmp->{xsize}, $rmp->{ysize},
1193	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},	1191	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1194	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},	1192	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1195	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},	1193	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1196	$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},
1197	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},	1195	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1198	(cf::region::find $rmp->{region})	1196	(cf::region::find $rmp->{region}), $rmp->{custom}
		1197	)
		1198	}
		1199
		1200	=item cf::map->register ($regex, $prio)
		1201
		1202	Register a handler for the map path matching the given regex at the
		1203	givne priority (higher is better, built-in handlers have priority 0, the
		1204	default).
		1205
		1206	=cut
		1207
		1208	sub 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
		1221	sub 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
		1233	sub 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
		1269	sub 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
		1289	sub init {
		1290	my ($self) = @_;
		1291
		1292	$self
		1293	}
		1294
		1295	sub as_string {
		1296	my ($self) = @_;
		1297
		1298	"$self->{path}"
		1299	}
		1300
		1301	# the displayed name, this is a one way mapping
		1302	sub visible_name {
		1303	&as_string
		1304	}
		1305
		1306	# the original (read-only) location
		1307	sub 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
		1314	sub 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
		1322	sub 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
1199	}	1327	}
1200		1328
1201	# and all this just because we cannot iterate over	1329	# and all this just because we cannot iterate over
1202	# all maps in C++...	1330	# all maps in C++...
1203	sub change_all_map_light {	1331	sub change_all_map_light {
…		…
1205		1333
1206	$_->change_map_light ($change)	1334	$_->change_map_light ($change)
1207	for grep $_->outdoor, values %cf::MAP;	1335	for grep $_->outdoor, values %cf::MAP;
1208	}	1336	}
1209		1337
		1338	sub 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
1210	sub try_load_header($) {	1346	sub load_header_from($) {
1211	my ($path) = @_;	1347	my ($self, $path) = @_;
1212		1348
1213	utf8::encode $path;	1349	utf8::encode $path;
1214	aio_open $path, O_RDONLY, 0	1350	#aio_open $path, O_RDONLY, 0
		1351	# or return;
		1352
		1353	$self->_load_header ($path)
1215	or return;	1354	or return;
1216		1355
1217	my $map = cf::map::new	1356	$self->{load_path} = $path;
		1357
		1358	1
		1359	}
		1360
		1361	sub load_header_orig {
		1362	my ($self) = @_;
		1363
		1364	$self->load_header_from ($self->load_path)
		1365	}
		1366
		1367	sub load_header_temp {
		1368	my ($self) = @_;
		1369
		1370	$self->load_header_from ($self->save_path)
		1371	}
		1372
		1373	sub 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
		1383	sub 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
		1392	sub load_header {
		1393	my ($self) = @_;
		1394
		1395	if ($self->load_header_temp) {
		1396	$self->prepare_temp;
		1397	} else {
		1398	$self->load_header_orig
1218	or return;	1399	or return;
		1400	$self->prepare_orig;
		1401	}
1219		1402
1220	# for better error messages only, will be overwritten	1403	1
1221	$map->path ($path);
1222
1223	$map->load_header ($path)
1224	or return;
1225
1226	$map->{load_path} = $path;
1227
1228	$map
1229	}	1404	}
1230		1405
1231	sub find;	1406	sub find;
1232	sub find {	1407	sub find {
1233	my ($path, $origin) = @_;	1408	my ($path, $origin) = @_;
1234		1409
1235	#warn "find<$path,$origin>\n";#d#
1236
1237	$path = new cf::path $path, $origin && $origin->path;	1410	$path = normalise $path, $origin && $origin->path;
1238	my $key = $path->as_string;
1239		1411
1240	cf::lock_wait "map_find:$key";	1412	cf::lock_wait "map_find:$path";
1241		1413
1242	$cf::MAP{$key} || do {	1414	$cf::MAP{$path} || do {
1243	my $guard = cf::lock_acquire "map_find:$key";	1415	my $guard = cf::lock_acquire "map_find:$path";
1244		1416	my $map = new_from_path cf::map $path
1245	# do it the slow way
1246	my $map = try_load_header $path->save_path;
1247
1248	Coro::cede;
1249
1250	if ($map) {
1251	$map->last_access ((delete $map->{last_access})
1252	|| $cf::RUNTIME); #d#
1253	# safety
1254	$map->{instantiate_time} = $cf::RUNTIME
1255	if $map->{instantiate_time} > $cf::RUNTIME;
1256	} else {
1257	if (my $rmp = $path->random_map_params) {
1258	$map = generate_random_map $key, $rmp;
1259	} else {
1260	$map = try_load_header $path->load_path;
1261	}
1262
1263	$map or return;	1417	or return;
1264		1418
1265	$map->{load_original} = 1;
1266	$map->{instantiate_time} = $cf::RUNTIME;
1267	$map->last_access ($cf::RUNTIME);
1268	$map->instantiate;
1269
1270	# per-player maps become, after loading, normal maps
1271	$map->per_player (0) if $path->{user_rel};
1272	}
1273
1274	$map->path ($key);
1275	$map->{path} = $path;
1276	$map->{last_save} = $cf::RUNTIME;	1419	$map->{last_save} = $cf::RUNTIME;
1277		1420
1278	Coro::cede;	1421	$map->load_header
		1422	or return;
1279		1423
1280	if ($map->should_reset) {	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;
1281	$map->reset;	1427	$map->reset;
1282	undef $guard;	1428	undef $guard;
1283	$map = find $path	1429	return find $path;
1284	or return;
1285	}	1430	}
1286		1431
1287	$cf::MAP{$key} = $map	1432	$cf::MAP{$path} = $map
1288	}	1433	}
1289	}	1434	}
		1435
		1436	sub pre_load { }
		1437	sub post_load { }
1290		1438
1291	sub load {	1439	sub load {
1292	my ($self) = @_;	1440	my ($self) = @_;
1293		1441
		1442	local $self->{deny_reset} = 1; # loading can take a long time
		1443
1294	my $path = $self->{path};	1444	my $path = $self->{path};
1295	my $guard = cf::lock_acquire "map_load:" . $path->as_string;	1445	my $guard = cf::lock_acquire "map_load:$path";
1296		1446
1297	return if $self->in_memory != cf::MAP_SWAPPED;	1447	return if $self->in_memory != cf::MAP_SWAPPED;
1298		1448
1299	$self->in_memory (cf::MAP_LOADING);	1449	$self->in_memory (cf::MAP_LOADING);
1300		1450
1301	$self->alloc;	1451	$self->alloc;
		1452
		1453	$self->pre_load;
		1454
1302	$self->load_objects ($self->{load_path}, 1)	1455	$self->_load_objects ($self->{load_path}, 1)
1303	or return;	1456	or return;
1304		1457
1305	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1458	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1306	if delete $self->{load_original};	1459	if delete $self->{load_original};
1307		1460
1308	if (my $uniq = $path->uniq_path) {	1461	if (my $uniq = $self->uniq_path) {
1309	utf8::encode $uniq;	1462	utf8::encode $uniq;
1310	if (aio_open $uniq, O_RDONLY, 0) {	1463	if (aio_open $uniq, O_RDONLY, 0) {
1311	$self->clear_unique_items;	1464	$self->clear_unique_items;
1312	$self->load_objects ($uniq, 0);	1465	$self->_load_objects ($uniq, 0);
1313	}	1466	}
1314	}	1467	}
1315		1468
1316	Coro::cede;	1469	Coro::cede;
1317		1470
1318	# now do the right thing for maps	1471	# now do the right thing for maps
1319	$self->link_multipart_objects;	1472	$self->link_multipart_objects;
1320		1473
1321	if ($self->{path}->is_style_map) {	1474	unless ($self->{deny_activate}) {
1322	$self->{deny_save} = 1;	1475	$self->decay_objects;
1323	$self->{deny_reset} = 1;
1324	} else {
1325	$self->fix_auto_apply;	1476	$self->fix_auto_apply;
1326	$self->decay_objects;
1327	$self->update_buttons;	1477	$self->update_buttons;
		1478	Coro::cede;
1328	$self->set_darkness_map;	1479	$self->set_darkness_map;
1329	$self->difficulty ($self->estimate_difficulty)	1480	$self->difficulty ($self->estimate_difficulty)
1330	unless $self->difficulty;	1481	unless $self->difficulty;
		1482	Coro::cede;
1331	$self->activate;	1483	$self->activate;
1332	}	1484	}
1333		1485
1334	Coro::cede;	1486	$self->post_load;
1335		1487
1336	$self->in_memory (cf::MAP_IN_MEMORY);	1488	$self->in_memory (cf::MAP_IN_MEMORY);
		1489	}
		1490
		1491	sub 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
		1501	sub 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	}
1337	}	1522	}
1338		1523
1339	sub find_sync {	1524	sub find_sync {
1340	my ($path, $origin) = @_;	1525	my ($path, $origin) = @_;
1341		1526
1342	cf::sync_job { cf::map::find $path, $origin }	1527	cf::sync_job { find $path, $origin }
1343	}	1528	}
1344		1529
1345	sub do_load_sync {	1530	sub do_load_sync {
1346	my ($map) = @_;	1531	my ($map) = @_;
1347		1532
1348	cf::sync_job { $map->load };	1533	cf::sync_job { $map->load };
1349	}	1534	}
1350		1535
		1536	our %MAP_PREFETCH;
		1537	our $MAP_PREFETCHER = undef;
		1538
		1539	sub 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;
		1554	$map->load;
		1555
		1556	delete $MAP_PREFETCH{$path};
		1557	}
		1558	}
		1559	undef $MAP_PREFETCHER;
		1560	};
		1561	$MAP_PREFETCHER->prio (6);
		1562
		1563	()
		1564	}
		1565
1351	sub save {	1566	sub save {
1352	my ($self) = @_;	1567	my ($self) = @_;
1353		1568
1354	my $lock = cf::lock_acquire "map_data:" . $self->path;	1569	my $lock = cf::lock_acquire "map_data:" . $self->path;
1355		1570
1356	$self->{last_save} = $cf::RUNTIME;	1571	$self->{last_save} = $cf::RUNTIME;
1357		1572
1358	return unless $self->dirty;	1573	return unless $self->dirty;
1359		1574
1360	my $save = $self->{path}->save_path; utf8::encode $save;	1575	my $save = $self->save_path; utf8::encode $save;
1361	my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;	1576	my $uniq = $self->uniq_path; utf8::encode $uniq;
1362		1577
1363	$self->{load_path} = $save;	1578	$self->{load_path} = $save;
1364		1579
1365	return if $self->{deny_save};	1580	return if $self->{deny_save};
1366		1581
…		…
1369	cf::async {	1584	cf::async {
1370	$_->contr->save for $self->players;	1585	$_->contr->save for $self->players;
1371	};	1586	};
1372		1587
1373	if ($uniq) {	1588	if ($uniq) {
1374	$self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	1589	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1375	$self->save_objects ($uniq, cf::IO_UNIQUES);	1590	$self->_save_objects ($uniq, cf::IO_UNIQUES);
1376	} else {	1591	} else {
1377	$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);
1378	}	1593	}
1379	}	1594	}
1380		1595
1381	sub swap_out {	1596	sub swap_out {
1382	my ($self) = @_;	1597	my ($self) = @_;
…		…
1396		1611
1397	sub reset_at {	1612	sub reset_at {
1398	my ($self) = @_;	1613	my ($self) = @_;
1399		1614
1400	# TODO: safety, remove and allow resettable per-player maps	1615	# TODO: safety, remove and allow resettable per-player maps
1401	return 1e99 if $self->{path}{user_rel};	1616	return 1e99 if $self->isa ("ext::map_per_player");#d#
1402	return 1e99 if $self->{deny_reset};	1617	return 1e99 if $self->{deny_reset};
1403		1618
1404	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;	1619	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1405	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;	1620	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1406		1621
…		…
1411	my ($self) = @_;	1626	my ($self) = @_;
1412		1627
1413	$self->reset_at <= $cf::RUNTIME	1628	$self->reset_at <= $cf::RUNTIME
1414	}	1629	}
1415		1630
1416	sub unlink_save {
1417	my ($self) = @_;
1418
1419	utf8::encode (my $save = $self->{path}->save_path);
1420	aioreq_pri 3; IO::AIO::aio_unlink $save;
1421	aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1422	}
1423
1424	sub rename {
1425	my ($self, $new_path) = @_;
1426
1427	$self->unlink_save;
1428
1429	delete $cf::MAP{$self->path};
1430	$self->{path} = new cf::path $new_path;
1431	$self->path ($self->{path}->as_string);
1432	$cf::MAP{$self->path} = $self;
1433
1434	$self->save;
1435	}
1436
1437	sub reset {	1631	sub reset {
1438	my ($self) = @_;	1632	my ($self) = @_;
1439		1633
1440	my $lock = cf::lock_acquire "map_data:" . $self->path;	1634	my $lock = cf::lock_acquire "map_data:$self->{path}";
1441		1635
1442	return if $self->players;	1636	return if $self->players;
1443	return if $self->{path}{user_rel};#d#	1637	return if $self->isa ("ext::map_per_player");#d#
1444		1638
1445	warn "resetting map ", $self->path;#d#	1639	warn "resetting map ", $self->path;#d#
1446		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
1447	delete $cf::MAP{$self->path};	1651	delete $cf::MAP{$self->path};
		1652
		1653	$self->clear;
1448		1654
1449	$_->clear_links_to ($self) for values %cf::MAP;	1655	$_->clear_links_to ($self) for values %cf::MAP;
1450		1656
1451	$self->unlink_save;	1657	$self->unlink_save;
1452	$self->destroy;	1658	$self->destroy;
…		…
1455	my $nuke_counter = "aaaa";	1661	my $nuke_counter = "aaaa";
1456		1662
1457	sub nuke {	1663	sub nuke {
1458	my ($self) = @_;	1664	my ($self) = @_;
1459		1665
		1666	delete $cf::MAP{$self->path};
		1667
		1668	$self->unlink_save;
		1669
		1670	bless $self, "cf::map";
		1671	delete $self->{deny_reset};
1460	$self->{deny_save} = 1;	1672	$self->{deny_save} = 1;
1461	$self->reset_timeout (1);	1673	$self->reset_timeout (1);
1462	$self->rename ("{nuke}/" . ($nuke_counter++));	1674	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
		1675
		1676	$cf::MAP{$self->path} = $self;
		1677
1463	$self->reset; # polite request, might not happen	1678	$self->reset; # polite request, might not happen
1464	}	1679	}
1465		1680
1466	sub customise_for {	1681	=item cf::map::unique_maps
1467	my ($map, $ob) = @_;
1468		1682
1469	if ($map->per_player) {	1683	Returns an arrayref of paths of all shared maps that have
1470	return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};	1684	instantiated unique items. May block.
1471	}
1472		1685
1473	$map	1686	=cut
1474	}
1475		1687
1476	sub emergency_save {	1688	sub unique_maps() {
1477	my $freeze_guard = cf::freeze_mainloop;	1689	my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
		1690	or return;
1478		1691
1479	warn "enter emergency map save\n";	1692	my @paths;
1480		1693
1481	cf::sync_job {	1694	for (@$files) {
1482	warn "begin emergency map save\n";	1695	utf8::decode $_;
1483	$_->save for values %cf::MAP;	1696	next if /\.pst$/;
		1697	next unless /^$PATH_SEP/o;
		1698
		1699	push @paths, cf::map::normalise $_;
1484	};	1700	}
1485		1701
1486	warn "end emergency map save\n";	1702	\@paths
1487	}	1703	}
1488		1704
1489	package cf;	1705	package cf;
1490		1706
1491	=back	1707	=back
1492		1708
		1709	=head3 cf::object
		1710
		1711	=cut
		1712
		1713	package cf::object;
		1714
		1715	=over 4
		1716
		1717	=item $ob->inv_recursive
		1718
		1719	Returns the inventory of the object _and_ their inventories, recursively.
		1720
		1721	=cut
		1722
		1723	sub inv_recursive_;
		1724	sub inv_recursive_ {
		1725	map { $_, inv_recursive_ $_->inv } @_
		1726	}
		1727
		1728	sub inv_recursive {
		1729	inv_recursive_ inv $_[0]
		1730	}
		1731
		1732	package cf;
		1733
		1734	=back
1493		1735
1494	=head3 cf::object::player	1736	=head3 cf::object::player
1495		1737
1496	=over 4	1738	=over 4
1497		1739
…		…
1537		1779
1538	=item $player_object->enter_link	1780	=item $player_object->enter_link
1539		1781
1540	Freezes the player and moves him/her to a special map (C<{link}>).	1782	Freezes the player and moves him/her to a special map (C<{link}>).
1541		1783
1542	The player should be reaosnably safe there for short amounts of time. You	1784	The player should be reasonably safe there for short amounts of time. You
1543	I<MUST> call C<leave_link> as soon as possible, though.	1785	I<MUST> call C<leave_link> as soon as possible, though.
1544		1786
		1787	Will never block.
		1788
1545	=item $player_object->leave_link ($map, $x, $y)	1789	=item $player_object->leave_link ($map, $x, $y)
1546		1790
1547	Moves the player out of the specila link map onto the given map. If the	1791	Moves the player out of the special C<{link}> map onto the specified
1548	map is not valid (or omitted), the player will be moved back to the	1792	map. If the map is not valid (or omitted), the player will be moved back
1549	location he/she was before the call to C<enter_link>, or, if that fails,	1793	to the location he/she was before the call to C<enter_link>, or, if that
1550	to the emergency map position.	1794	fails, to the emergency map position.
1551		1795
1552	Might block.	1796	Might block.
1553		1797
1554	=cut	1798	=cut
		1799
		1800	sub 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	}
1555		1809
1556	sub cf::object::player::enter_link {	1810	sub cf::object::player::enter_link {
1557	my ($self) = @_;	1811	my ($self) = @_;
1558		1812
1559	$self->deactivate_recursive;	1813	$self->deactivate_recursive;
1560		1814
1561	return if $self->map == $LINK_MAP;	1815	return if UNIVERSAL::isa $self->map, "ext::map_link";
1562		1816
1563	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	1817	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1564	if $self->map;	1818	if $self->map;
1565		1819
1566	$self->enter_map ($LINK_MAP, 20, 20);	1820	$self->enter_map ($LINK_MAP || link_map, 10, 10);
1567	}	1821	}
1568		1822
1569	sub cf::object::player::leave_link {	1823	sub cf::object::player::leave_link {
1570	my ($self, $map, $x, $y) = @_;	1824	my ($self, $map, $x, $y) = @_;
1571		1825
…		…
1589	# use -1 or undef as default coordinates, not 0, 0	1843	# use -1 or undef as default coordinates, not 0, 0
1590	($x, $y) = ($map->enter_x, $map->enter_y)	1844	($x, $y) = ($map->enter_x, $map->enter_y)
1591	if $x <=0 && $y <= 0;	1845	if $x <=0 && $y <= 0;
1592		1846
1593	$map->load;	1847	$map->load;
		1848	$map->load_diag;
1594		1849
1595	return unless $self->contr->active;	1850	return unless $self->contr->active;
1596	$self->activate_recursive;	1851	$self->activate_recursive;
		1852
		1853	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1597	$self->enter_map ($map, $x, $y);	1854	$self->enter_map ($map, $x, $y);
1598	}	1855	}
1599		1856
1600	cf::player->attach (	1857	cf::player->attach (
1601	on_logout => sub {	1858	on_logout => sub {
…		…
1614	# try to abort aborted map switching on player login :)	1871	# try to abort aborted map switching on player login :)
1615	# should happen only on crashes	1872	# should happen only on crashes
1616	if ($pl->ob->{_link_pos}) {	1873	if ($pl->ob->{_link_pos}) {
1617	$pl->ob->enter_link;	1874	$pl->ob->enter_link;
1618	(async {	1875	(async {
1619	# we need this sleep as the login has a concurrent enter_exit running
1620	# and this sleep increases chances of the player not ending up in scorn
1621	$pl->ob->reply (undef,	1876	$pl->ob->reply (undef,
1622	"There was an internal problem at your last logout, "	1877	"There was an internal problem at your last logout, "
1623	. "the server will try to bring you to your intended destination in a second.",	1878	. "the server will try to bring you to your intended destination in a second.",
1624	cf::NDI_RED);	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
1625	Coro::Timer::sleep 1;	1882	Coro::Timer::sleep 1;
1626	$pl->ob->leave_link;	1883	$pl->ob->leave_link;
1627	})->prio (2);	1884	})->prio (2);
1628	}	1885	}
1629	},	1886	},
…		…
1637	my ($self, $path, $x, $y) = @_;	1894	my ($self, $path, $x, $y) = @_;
1638		1895
1639	$self->enter_link;	1896	$self->enter_link;
1640		1897
1641	(async {	1898	(async {
1642	$path = new cf::path $path;	1899	my $map = eval {
1643
1644	my $map = cf::map::find $path->as_string;	1900	my $map = cf::map::find $path;
1645	$map = $map->customise_for ($self) if $map;	1901	$map = $map->customise_for ($self) if $map;
1646		1902	$map
1647	# warn "entering ", $map->path, " at ($x, $y)\n"	1903	} or
1648	# if $map;
1649
1650	$map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);	1904	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1651		1905
1652	$self->leave_link ($map, $x, $y);	1906	$self->leave_link ($map, $x, $y);
1653	})->prio (1);	1907	})->prio (1);
1654	}	1908	}
1655		1909
…		…
1659		1913
1660	sub parse_random_map_params {	1914	sub parse_random_map_params {
1661	my ($spec) = @_;	1915	my ($spec) = @_;
1662		1916
1663	my $rmp = { # defaults	1917	my $rmp = { # defaults
1664	xsize => 10,	1918	xsize => (cf::rndm 15, 40),
1665	ysize => 10,	1919	ysize => (cf::rndm 15, 40),
		1920	symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
		1921	#layout => string,
1666	};	1922	};
1667		1923
1668	for (split /\n/, $spec) {	1924	for (split /\n/, $spec) {
1669	my ($k, $v) = split /\s+/, $_, 2;	1925	my ($k, $v) = split /\s+/, $_, 2;
1670		1926
…		…
1674	$rmp	1930	$rmp
1675	}	1931	}
1676		1932
1677	sub prepare_random_map {	1933	sub prepare_random_map {
1678	my ($exit) = @_;	1934	my ($exit) = @_;
		1935
		1936	my $guard = cf::lock_acquire "exit_prepare:$exit";
1679		1937
1680	# all this does is basically replace the /! path by	1938	# all this does is basically replace the /! path by
1681	# a new random map path (?random/...) with a seed	1939	# a new random map path (?random/...) with a seed
1682	# that depends on the exit object	1940	# that depends on the exit object
1683		1941
1684	my $rmp = parse_random_map_params $exit->msg;	1942	my $rmp = parse_random_map_params $exit->msg;
1685		1943
1686	if ($exit->map) {	1944	if ($exit->map) {
1687	$rmp->{region} = $exit->map->region_name;	1945	$rmp->{region} = $exit->region->name;
1688	$rmp->{origin_map} = $exit->map->path;	1946	$rmp->{origin_map} = $exit->map->path;
1689	$rmp->{origin_x} = $exit->x;	1947	$rmp->{origin_x} = $exit->x;
1690	$rmp->{origin_y} = $exit->y;	1948	$rmp->{origin_y} = $exit->y;
1691	}	1949	}
1692		1950
1693	$rmp->{random_seed} ||= $exit->random_seed;	1951	$rmp->{random_seed} ||= $exit->random_seed;
1694		1952
1695	my $data = cf::to_json $rmp;	1953	my $data = cf::to_json $rmp;
1696	my $md5 = Digest::MD5::md5_hex $data;	1954	my $md5 = Digest::MD5::md5_hex $data;
		1955	my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1697		1956
1698	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) {
1699	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;
1700		1961
1701	$exit->slaying ("?random/$md5");	1962	$exit->slaying ("?random/$md5");
1702	$exit->msg (undef);	1963	$exit->msg (undef);
1703	}	1964	}
1704	}	1965	}
1705		1966
1706	sub cf::object::player::enter_exit {	1967	sub cf::object::player::enter_exit {
1707	my ($self, $exit) = @_;	1968	my ($self, $exit) = @_;
1708		1969
1709	return unless $self->type == cf::PLAYER;	1970	return unless $self->type == cf::PLAYER;
		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;
1710		1980
1711	$self->enter_link;	1981	$self->enter_link;
1712		1982
1713	(async {	1983	(async {
1714	$self->deactivate_recursive; # just to be sure	1984	$self->deactivate_recursive; # just to be sure
1715	unless (eval {	1985	unless (eval {
1716	prepare_random_map $exit	1986	$self->goto ($slaying, $hp, $sp);
1717	if $exit->slaying eq "/!";
1718
1719	my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1720	$self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1721		1987
1722	1;	1988	1;
1723	}) {	1989	}) {
1724	$self->message ("Something went wrong deep within the crossfire server. "	1990	$self->message ("Something went wrong deep within the crossfire server. "
1725	. "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. "
1726	. "Please report this to the dungeon master",	1992	. "Please report this to the dungeon master!",
1727	cf::NDI_UNIQUE | cf::NDI_RED);	1993	cf::NDI_UNIQUE | cf::NDI_RED);
1728		1994
1729	warn "ERROR in enter_exit: $@";	1995	warn "ERROR in enter_exit: $@";
1730	$self->leave_link;	1996	$self->leave_link;
1731	}	1997	}
…		…
1745		2011
1746	sub cf::client::send_drawinfo {	2012	sub cf::client::send_drawinfo {
1747	my ($self, $text, $flags) = @_;	2013	my ($self, $text, $flags) = @_;
1748		2014
1749	utf8::encode $text;	2015	utf8::encode $text;
1750	$self->send_packet (sprintf "drawinfo %d %s", $flags, $text);	2016	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1751	}	2017	}
1752		2018
1753		2019
1754	=item $success = $client->query ($flags, "text", \&cb)	2020	=item $success = $client->query ($flags, "text", \&cb)
1755		2021
…		…
1786	# get handled first	2052	# get handled first
1787	my $queue = delete $ns->{query_queue}	2053	my $queue = delete $ns->{query_queue}
1788	or return; # be conservative, not sure how that can happen, but we saw a crash here	2054	or return; # be conservative, not sure how that can happen, but we saw a crash here
1789		2055
1790	(shift @$queue)->[1]->($msg);	2056	(shift @$queue)->[1]->($msg);
		2057	return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1791		2058
1792	push @{ $ns->{query_queue} }, @$queue;	2059	push @{ $ns->{query_queue} }, @$queue;
1793		2060
1794	if (@{ $ns->{query_queue} } == @$queue) {	2061	if (@{ $ns->{query_queue} } == @$queue) {
1795	if (@$queue) {	2062	if (@$queue) {
…		…
1853		2120
1854	# here we export the classes and methods available to script code	2121	# here we export the classes and methods available to script code
1855		2122
1856	=pod	2123	=pod
1857		2124
1858	The following fucntions and emthods are available within a safe environment:	2125	The following functions and methods are available within a safe environment:
1859		2126
1860	cf::object contr pay_amount pay_player map	2127	cf::object contr pay_amount pay_player map
1861	cf::object::player player	2128	cf::object::player player
1862	cf::player peaceful	2129	cf::player peaceful
1863	cf::map trigger	2130	cf::map trigger
…		…
1956	The parameter C<$family> should best start with the name of the extension	2223	The parameter C<$family> should best start with the name of the extension
1957	using it, it should be unique.	2224	using it, it should be unique.
1958		2225
1959	=over 4	2226	=over 4
1960		2227
1961	=item $hashref = cf::db_get $family
1962
1963	Return a hashref for use by the extension C<$family>, which can be
1964	modified. After modifications, you have to call C<cf::db_dirty> or
1965	C<cf::db_sync>.
1966
1967	=item $value = cf::db_get $family => $key	2228	=item $value = cf::db_get $family => $key
1968		2229
1969	Returns a single value from the database	2230	Returns a single value from the database.
1970
1971	=item cf::db_put $family => $hashref
1972
1973	Stores the given family hashref into the database. Updates are delayed, if
1974	you want the data to be synced to disk immediately, use C<cf::db_sync>.
1975		2231
1976	=item cf::db_put $family => $key => $value	2232	=item cf::db_put $family => $key => $value
1977		2233
1978	Stores the given C<$value> in the family hash. Updates are delayed, if you	2234	Stores the given C<$value> in the family.
1979	want the data to be synced to disk immediately, use C<cf::db_sync>.
1980
1981	=item cf::db_dirty
1982
1983	Marks the database as dirty, to be updated at a later time.
1984
1985	=item cf::db_sync
1986
1987	Immediately write the database to disk I<if it is dirty>.
1988		2235
1989	=cut	2236	=cut
1990		2237
1991	our $DB;	2238	our $DB;
1992		2239
1993	{	2240	sub 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
1994	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;
1995		2259
1996	sub db_load() {	2260	cf::db_put (board => data => $pst->{board});
1997	$DB = stat $path ? Storable::retrieve $path : { };	2261	cf::db_put (guildrules => data => $pst->{guildrules});
1998	}	2262	cf::db_put (rent => balance => $pst->{rent}{balance});
		2263	BDB::db_env_txn_checkpoint $DB_ENV;
1999		2264
2000	my $pid;	2265	unlink $path;
2001
2002	sub db_save() {
2003	waitpid $pid, 0 if $pid;
2004	if (0 == ($pid = fork)) {
2005	$DB->{_meta}{version} = 1;
2006	Storable::nstore $DB, "$path~";
2007	rename "$path~", $path;
2008	cf::_exit 0 if defined $pid;
2009	}	2266	};
2010	}	2267	}
2011
2012	my $dirty;
2013
2014	sub db_sync() {
2015	db_save if $dirty;
2016	undef $dirty;
2017	}
2018
2019	my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2020	db_sync;
2021	});	2268	}
		2269	}
2022		2270
2023	sub db_dirty() {
2024	$dirty = 1;
2025	$idle->start;
2026	}
2027
2028	sub db_get($;$) {	2271	sub db_get($$) {
2029	@_ >= 2	2272	my $key = "$_[0]/$_[1]";
2030	? $DB->{$_[0]}{$_[1]}
2031	: ($DB->{$_[0]} ||= { })
2032	}
2033		2273
		2274	cf::sync_job {
		2275	BDB::db_get $DB, undef, $key, my $data;
		2276
		2277	$! ? ()
		2278	: Compress::LZF::sthaw $data
		2279	}
		2280	}
		2281
2034	sub db_put($$;$) {	2282	sub db_put($$$) {
2035	if (@_ >= 3) {	2283	BDB::dbreq_pri 4;
2036	$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
		2290	sub 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;
2037	} else {	2321	} else {
2038	$DB->{$_[0]} = $_[1];	2322	warn "smooth face '$info->{smooth}' not found for face '$face'";
2039	}
2040	db_dirty;
2041	}
2042
2043	cf::global->attach (
2044	prio => 10000,
2045	on_cleanup => sub {
2046	db_sync;
2047	},	2323	}
2048	);	2324	Coro::cede;
2049	}	2325	}
2050		2326
2051	#############################################################################	2327	1
2052	# the server's main()	2328	}
		2329
		2330	sub 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
		2337	sub init {
		2338	reload_resources;
		2339	}
2053		2340
2054	sub cfg_load {	2341	sub cfg_load {
2055	open my $fh, "<:utf8", cf::confdir . "/config"	2342	open my $fh, "<:utf8", cf::confdir . "/config"
2056	or return;	2343	or return;
2057		2344
…		…
2063	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	2350	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2064	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	2351	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2065		2352
2066	if (exists $CFG{mlockall}) {	2353	if (exists $CFG{mlockall}) {
2067	eval {	2354	eval {
2068	$CFG{mlockall} ? &mlockall : &munlockall	2355	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2069	and die "WARNING: m(un)lockall failed: $!\n";	2356	and die "WARNING: m(un)lockall failed: $!\n";
2070	};	2357	};
2071	warn $@ if $@;	2358	warn $@ if $@;
2072	}	2359	}
2073	}	2360	}
2074		2361
2075	sub main {	2362	sub main {
2076	# we must not ever block the main coroutine	2363	# we must not ever block the main coroutine
2077	local $Coro::idle = sub {	2364	local $Coro::idle = sub {
2078	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	2365	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
		2366	(async {
2079	async { Event::one_event };	2367	Event::one_event;
		2368	})->prio (Coro::PRIO_MAX);
2080	};	2369	};
2081		2370
2082	cfg_load;	2371	cfg_load;
2083	db_load;	2372	db_init;
2084	load_extensions;	2373	load_extensions;
		2374
		2375	$TICK_WATCHER->start;
2085	Event::loop;	2376	Event::loop;
2086	}	2377	}
2087		2378
2088	#############################################################################	2379	#############################################################################
2089	# initialisation	2380	# initialisation and cleanup
		2381
		2382	# install some emergency cleanup handlers
		2383	BEGIN {
		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
		2397	sub 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
		2430	sub post_cleanup {
		2431	my ($make_core) = @_;
		2432
		2433	warn Carp::longmess "post_cleanup backtrace"
		2434	if $make_core;
		2435	}
2090		2436
2091	sub reload() {	2437	sub reload() {
2092	# can/must only be called in main	2438	# can/must only be called in main
2093	if ($Coro::current != $Coro::main) {	2439	if ($Coro::current != $Coro::main) {
2094	warn "can only reload from main coroutine\n";	2440	warn "can only reload from main coroutine";
2095	return;	2441	return;
2096	}	2442	}
2097		2443
2098	warn "reloading...";	2444	warn "reloading...";
2099		2445
2100	my $guard = freeze_mainloop;	2446	warn "entering sync_job";
		2447
		2448	cf::sync_job {
		2449	cf::write_runtime; # external watchdog should not bark
2101	cf::emergency_save;	2450	cf::emergency_save;
		2451	cf::write_runtime; # external watchdog should not bark
2102		2452
2103	eval {	2453	warn "syncing database to disk";
		2454	BDB::db_env_txn_checkpoint $DB_ENV;
		2455
2104	# 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
2105		2457
2106	# cancel all watchers	2458	warn "cancelling all WF_AUTOCANCEL watchers";
2107	for (Event::all_watchers) {	2459	for (Event::all_watchers) {
2108	$_->cancel if $_->data & WF_AUTOCANCEL;	2460	$_->cancel if $_->data & WF_AUTOCANCEL;
2109	}	2461	}
2110		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
2111	# cancel all extension coros	2474	warn "cancelling all extension coros";
2112	$_->cancel for values %EXT_CORO;	2475	$_->cancel for values %EXT_CORO;
2113	%EXT_CORO = ();	2476	%EXT_CORO = ();
2114		2477
2115	# unload all extensions	2478	warn "removing commands";
2116	for (@exts) {	2479	%COMMAND = ();
		2480
		2481	warn "removing ext commands";
		2482	%EXTCMD = ();
		2483
		2484	warn "unloading/nuking all extensions";
		2485	for my $pkg (@EXTS) {
2117	warn "unloading <$_>";	2486	warn "... unloading $pkg";
2118	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: $@";
2119	}	2493	}
2120		2494
		2495	warn "... nuking $pkg";
		2496	Symbol::delete_package $pkg;
		2497	}
		2498
2121	# unload all modules loaded from $LIBDIR	2499	warn "unloading all perl modules loaded from $LIBDIR";
2122	while (my ($k, $v) = each %INC) {	2500	while (my ($k, $v) = each %INC) {
2123	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	2501	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2124		2502
2125	warn "removing <$k>";	2503	warn "... unloading $k";
2126	delete $INC{$k};	2504	delete $INC{$k};
2127		2505
2128	$k =~ s/\.pm$//;	2506	$k =~ s/\.pm$//;
2129	$k =~ s/\//::/g;	2507	$k =~ s/\//::/g;
2130		2508
…		…
2133	}	2511	}
2134		2512
2135	Symbol::delete_package $k;	2513	Symbol::delete_package $k;
2136	}	2514	}
2137		2515
2138	# sync database to disk
2139	cf::db_sync;
2140	IO::AIO::flush;
2141
2142	# get rid of safe::, as good as possible	2516	warn "getting rid of safe::, as good as possible";
2143	Symbol::delete_package "safe::$_"	2517	Symbol::delete_package "safe::$_"
2144	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);
2145		2519
2146	# remove register_script_function callbacks
2147	# TODO
2148
2149	# unload cf.pm "a bit"	2520	warn "unloading cf.pm \"a bit\"";
2150	delete $INC{"cf.pm"};	2521	delete $INC{"cf.pm"};
2151		2522
2152	# don't, removes xs symbols, too,	2523	# don't, removes xs symbols, too,
2153	# and global variables created in xs	2524	# and global variables created in xs
2154	#Symbol::delete_package __PACKAGE__;	2525	#Symbol::delete_package __PACKAGE__;
2155		2526
2156	# reload cf.pm	2527	warn "unload completed, starting to reload now";
		2528
2157	warn "reloading cf.pm";	2529	warn "reloading cf.pm";
2158	require cf;	2530	require cf;
2159	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	2531	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2160		2532
2161	# load config and database again	2533	warn "loading config and database again";
2162	cf::cfg_load;	2534	cf::cfg_load;
2163	cf::db_load;
2164		2535
2165	# load extensions
2166	warn "load extensions";	2536	warn "loading extensions";
2167	cf::load_extensions;	2537	cf::load_extensions;
2168		2538
2169	# reattach attachments to objects	2539	warn "reattaching attachments to objects/players";
2170	warn "reattach";	2540	_global_reattach; # objects, sockets
2171	_global_reattach;	2541	warn "reattaching attachments to maps";
2172	};	2542	reattach $_ for values %MAP;
		2543	warn "reattaching attachments to players";
		2544	reattach $_ for values %PLAYER;
2173		2545
2174	if ($@) {	2546	warn "loading reloadable resources";
		2547	reload_resources;
		2548
		2549	warn "leaving sync_job";
		2550
		2551	1
		2552	} or do {
2175	warn $@;	2553	warn $@;
2176	warn "error while reloading, exiting.";	2554	warn "error while reloading, exiting.";
2177	exit 1;	2555	exit 1;
2178	}	2556	};
2179		2557
2180	warn "reloaded successfully";	2558	warn "reloaded";
2181	};	2559	};
2182		2560
2183	#############################################################################	2561	our $RELOAD_WATCHER; # used only during reload
2184
2185	unless ($LINK_MAP) {
2186	$LINK_MAP = cf::map::new;
2187
2188	$LINK_MAP->width (41);
2189	$LINK_MAP->height (41);
2190	$LINK_MAP->alloc;
2191	$LINK_MAP->path ("{link}");
2192	$LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2193	$LINK_MAP->in_memory (MAP_IN_MEMORY);
2194
2195	# dirty hack because... archetypes are not yet loaded
2196	Event->timer (
2197	after => 10,
2198	cb => sub {
2199	$_[0]->w->cancel;
2200
2201	# provide some exits "home"
2202	my $exit = cf::object::new "exit";
2203
2204	$exit->slaying ($EMERGENCY_POSITION->[0]);
2205	$exit->stats->hp ($EMERGENCY_POSITION->[1]);
2206	$exit->stats->sp ($EMERGENCY_POSITION->[2]);
2207
2208	$LINK_MAP->insert ($exit->clone, 19, 19);
2209	$LINK_MAP->insert ($exit->clone, 19, 20);
2210	$LINK_MAP->insert ($exit->clone, 19, 21);
2211	$LINK_MAP->insert ($exit->clone, 20, 19);
2212	$LINK_MAP->insert ($exit->clone, 20, 21);
2213	$LINK_MAP->insert ($exit->clone, 21, 19);
2214	$LINK_MAP->insert ($exit->clone, 21, 20);
2215	$LINK_MAP->insert ($exit->clone, 21, 21);
2216
2217	$exit->destroy;
2218	});
2219
2220	$LINK_MAP->{deny_save} = 1;
2221	$LINK_MAP->{deny_reset} = 1;
2222
2223	$cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2224	}
2225
2226	register "<global>", __PACKAGE__;
2227		2562
2228	register_command "reload" => sub {	2563	register_command "reload" => sub {
2229	my ($who, $arg) = @_;	2564	my ($who, $arg) = @_;
2230		2565
2231	if ($who->flag (FLAG_WIZ)) {	2566	if ($who->flag (FLAG_WIZ)) {
2232	$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 {
2233	reload;	2577	reload;
2234	$who->message ("end of reload.");	2578	undef $RELOAD_WATCHER;
		2579	},
		2580	);
2235	}	2581	}
2236	};	2582	};
2237		2583
2238	unshift @INC, $LIBDIR;	2584	unshift @INC, $LIBDIR;
		2585
		2586	my $bug_warning = 0;
2239		2587
2240	$TICK_WATCHER = Event->timer (	2588	$TICK_WATCHER = Event->timer (
2241	reentrant => 0,	2589	reentrant => 0,
		2590	parked => 1,
2242	prio => 0,	2591	prio => 0,
2243	at => $NEXT_TICK || $TICK,	2592	at => $NEXT_TICK || $TICK,
2244	data => WF_AUTOCANCEL,	2593	data => WF_AUTOCANCEL,
2245	cb => sub {	2594	cb => sub {
		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
2246	cf::server_tick; # one server iteration	2603	cf::server_tick; # one server iteration
2247	$RUNTIME += $TICK;	2604	$RUNTIME += $TICK;
2248	$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#
2249		2620
2250	# 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
2251	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2622	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2252		2623
2253	$TICK_WATCHER->at ($NEXT_TICK);	2624	$TICK_WATCHER->at ($NEXT_TICK);
2254	$TICK_WATCHER->start;	2625	$TICK_WATCHER->start;
2255	},	2626	},
2256	);	2627	);
2257		2628
		2629	{
2258	IO::AIO::max_poll_time $TICK * 0.2;	2630	BDB::max_poll_time $TICK * 0.1;
2259		2631	$BDB_POLL_WATCHER = Event->io (
2260	Event->io (	2632	reentrant => 0,
2261	fd => IO::AIO::poll_fileno,	2633	fd => BDB::poll_fileno,
2262	poll => 'r',	2634	poll => 'r',
2263	prio => 5,	2635	prio => 0,
2264	data => WF_AUTOCANCEL,
2265	cb => \&IO::AIO::poll_cb,
2266	);
2267
2268	Event->timer (
2269	data => WF_AUTOCANCEL,	2636	data => WF_AUTOCANCEL,
2270	after => 0,	2637	cb => \&BDB::poll_cb,
2271	interval => 10,	2638	);
2272	cb => sub {	2639	BDB::min_parallel 8;
2273	(Coro::unblock_sub {	2640
2274	write_runtime	2641	BDB::set_sync_prepare {
2275	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 $@;
2276	})->();	2675	};
2277	},	2676	}
2278	);	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	}
2279		2693
2280	END { cf::emergency_save }	2694	END { cf::emergency_save }
2281		2695
2282	1	2696	1
2283		2697

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines