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.166 by root, Sat Jan 13 23:06:13 2007 UTC vs.
Revision 1.232 by root, Wed Apr 4 02:07:19 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 ();
20	use Data::Dumper;	23	use Data::Dumper;
21	use Digest::MD5;	24	use Digest::MD5;
22	use Fcntl;	25	use Fcntl;
		26	use YAML::Syck ();
23	use IO::AIO 2.32 ();	27	use IO::AIO 2.32 ();
24	use YAML::Syck ();
25	use Time::HiRes;	28	use Time::HiRes;
		29	use Compress::LZF;
26		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
27	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
28
29	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30		37
31	# 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?
32	$YAML::Syck::ImplicitUnicode = 1;	39	$YAML::Syck::ImplicitUnicode = 1;
33		40
34	$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
		42
		43	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
35		44
36	our %COMMAND = ();	45	our %COMMAND = ();
37	our %COMMAND_TIME = ();	46	our %COMMAND_TIME = ();
38		47
39	our @EXTS = (); # list of extension package names	48	our @EXTS = (); # list of extension package names
40	our %EXTCMD = ();	49	our %EXTCMD = ();
41	our %EXT_CORO = (); # coroutines bound to extensions	50	our %EXT_CORO = (); # coroutines bound to extensions
42	our %EXT_MAP = (); # pluggable maps	51	our %EXT_MAP = (); # pluggable maps
43		52
		53	our $RELOAD; # number of reloads so far
44	our @EVENT;	54	our @EVENT;
45	our $LIBDIR = datadir . "/ext";	55	our $LIBDIR = datadir . "/ext";
46		56
47	our $TICK = MAX_TIME * 1e-6;	57	our $TICK = MAX_TIME * 1e-6;
48	our $TICK_WATCHER;	58	our $TICK_WATCHER;
		59	our $AIO_POLL_WATCHER;
		60	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
49	our $NEXT_TICK;	61	our $NEXT_TICK;
50	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;
51		67
52	our %CFG;	68	our %CFG;
53		69
54	our $UPTIME; $UPTIME ||= time;	70	our $UPTIME; $UPTIME ||= time;
55	our $RUNTIME;	71	our $RUNTIME;
56		72
57	our %PLAYER; # all users	73	our %PLAYER; # all users
58	our %MAP; # all maps	74	our %MAP; # all maps
59	our $LINK_MAP; # the special {link} map, which is always available	75	our $LINK_MAP; # the special {link} map, which is always available
60	our $RANDOM_MAPS = cf::localdir . "/random";	76	our $RANDOM_MAPS = cf::localdir . "/random";
		77	our $BDB_ENV_DIR = cf::localdir . "/db";
61		78
62	our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;	79	our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
63	our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;	80	our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
64		81
65	# used to convert map paths into valid unix filenames by replacing / by ∕	82	# used to convert map paths into valid unix filenames by replacing / by ∕
…		…
78	mkdir cf::localdir;	95	mkdir cf::localdir;
79	mkdir cf::localdir . "/" . cf::playerdir;	96	mkdir cf::localdir . "/" . cf::playerdir;
80	mkdir cf::localdir . "/" . cf::tmpdir;	97	mkdir cf::localdir . "/" . cf::tmpdir;
81	mkdir cf::localdir . "/" . cf::uniquedir;	98	mkdir cf::localdir . "/" . cf::uniquedir;
82	mkdir $RANDOM_MAPS;	99	mkdir $RANDOM_MAPS;
		100	mkdir $BDB_ENV_DIR;
83		101
84	our $EMERGENCY_POSITION;	102	our $EMERGENCY_POSITION;
		103
		104	sub cf::map::normalise;
85		105
86	#############################################################################	106	#############################################################################
87		107
88	=head2 GLOBAL VARIABLES	108	=head2 GLOBAL VARIABLES
89		109
…		…
188	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	208	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
189	$d	209	$d
190	} || "[unable to dump $_[0]: '$@']";	210	} || "[unable to dump $_[0]: '$@']";
191	}	211	}
192		212
193	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
194		214
195	=item $ref = cf::from_json $json	215	=item $ref = cf::from_json $json
196		216
197	Converts a JSON string into the corresponding perl data structure.	217	Converts a JSON string into the corresponding perl data structure.
198		218
199	=cut
200
201	sub from_json($) {
202	$JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
203	JSON::Syck::Load $_[0]
204	}
205
206	=item $json = cf::to_json $ref	219	=item $json = cf::to_json $ref
207		220
208	Converts a perl data structure into its JSON representation.	221	Converts a perl data structure into its JSON representation.
209
210	=cut
211
212	sub to_json($) {
213	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
214	JSON::Syck::Dump $_[0]
215	}
216		222
217	=item cf::lock_wait $string	223	=item cf::lock_wait $string
218		224
219	Wait until the given lock is available. See cf::lock_acquire.	225	Wait until the given lock is available. See cf::lock_acquire.
220		226
…		…
257	}	263	}
258		264
259	sub freeze_mainloop {	265	sub freeze_mainloop {
260	return unless $TICK_WATCHER->is_active;	266	return unless $TICK_WATCHER->is_active;
261		267
262	my $guard = Coro::guard { $TICK_WATCHER->start };	268	my $guard = Coro::guard {
		269	$TICK_WATCHER->start;
		270	};
263	$TICK_WATCHER->stop;	271	$TICK_WATCHER->stop;
264	$guard	272	$guard
265	}	273	}
266		274
267	=item cf::async { BLOCK }	275	=item cf::async { BLOCK }
…		…
338		346
339	$coro	347	$coro
340	}	348	}
341		349
342	sub write_runtime {	350	sub write_runtime {
343	return unless $TICK_WATCHER->is_active;	351	my $guard = cf::lock_acquire "write_runtime";
344		352
345	my $runtime = cf::localdir . "/runtime";	353	my $runtime = cf::localdir . "/runtime";
346		354
347	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	355	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
348	or return;	356	or return;
349		357
		358	my $value = $cf::RUNTIME + 90 + 10;
350	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
351	(aio_write $fh, 0, (length $value), $value, 0) <= 0	362	(aio_write $fh, 0, (length $value), $value, 0) <= 0
352	and return;	363	and return;
353		364
		365	# always fsync - this file is important
354	aio_fsync $fh	366	aio_fsync $fh
355	and return;	367	and return;
356		368
357	close $fh	369	close $fh
358	or return;	370	or return;
359		371
360	aio_rename "$runtime~", $runtime	372	aio_rename "$runtime~", $runtime
361	and return;	373	and return;
362		374
363	1	375	1
		376	}
		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 });
364	}	387	}
365		388
366	=back	389	=back
367		390
368	=cut	391	=cut
…		…
499	our @CB_TYPE = (); # registry for type (cf-object class) based events	522	our @CB_TYPE = (); # registry for type (cf-object class) based events
500	our @CB_MAP = ();	523	our @CB_MAP = ();
501		524
502	my %attachment;	525	my %attachment;
503		526
		527	sub cf::attachable::thawer_merge {
		528	# simply override everything except _meta
		529	local $_[0]{_meta};
		530	%{$_[0]} = %{$_[1]};
		531	}
		532
504	sub _attach_cb($$$$) {	533	sub _attach_cb($$$$) {
505	my ($registry, $event, $prio, $cb) = @_;	534	my ($registry, $event, $prio, $cb) = @_;
506		535
507	use sort 'stable';	536	use sort 'stable';
508		537
…		…
679	# object support	708	# object support
680		709
681	sub reattach {	710	sub reattach {
682	# basically do the same as instantiate, without calling instantiate	711	# basically do the same as instantiate, without calling instantiate
683	my ($obj) = @_;	712	my ($obj) = @_;
		713
		714	bless $obj, ref $obj; # re-bless in case extensions have been reloaded
684		715
685	my $registry = $obj->registry;	716	my $registry = $obj->registry;
686		717
687	@$registry = ();	718	@$registry = ();
688		719
…		…
735	$filename, length $$rdata, scalar @$objs;	766	$filename, length $$rdata, scalar @$objs;
736		767
737	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	768	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
738	chmod SAVE_MODE, $fh;	769	chmod SAVE_MODE, $fh;
739	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	770	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
740	aio_fsync $fh;	771	aio_fsync $fh if $cf::USE_FSYNC;
741	close $fh;	772	close $fh;
742		773
743	if (@$objs) {	774	if (@$objs) {
744	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) {
745	chmod SAVE_MODE, $fh;	776	chmod SAVE_MODE, $fh;
746	my $data = Storable::nfreeze { version => 1, objs => $objs };	777	my $data = Storable::nfreeze { version => 1, objs => $objs };
747	aio_write $fh, 0, (length $data), $data, 0;	778	aio_write $fh, 0, (length $data), $data, 0;
748	aio_fsync $fh;	779	aio_fsync $fh if $cf::USE_FSYNC;
749	close $fh;	780	close $fh;
750	aio_rename "$filename.pst~", "$filename.pst";	781	aio_rename "$filename.pst~", "$filename.pst";
751	}	782	}
752	} else {	783	} else {
753	aio_unlink "$filename.pst";	784	aio_unlink "$filename.pst";
…		…
900	} or warn "$ext not loaded: $@";	931	} or warn "$ext not loaded: $@";
901	}	932	}
902	}	933	}
903		934
904	#############################################################################	935	#############################################################################
905	# load/save/clean perl data associated with a map
906
907	*cf::mapsupport::on_clean = sub {
908	my ($map) = @_;
909
910	my $path = $map->tmpname;
911	defined $path or return;
912
913	unlink "$path.pst";
914	};
915
916	cf::map->attach (prio => -10000, package => cf::mapsupport::);
917
918	#############################################################################
919		936
920	=head2 CORE EXTENSIONS	937	=head2 CORE EXTENSIONS
921		938
922	Functions and methods that extend core crossfire objects.	939	Functions and methods that extend core crossfire objects.
923		940
…		…
959		976
960	sub exists($) {	977	sub exists($) {
961	my ($login) = @_;	978	my ($login) = @_;
962		979
963	$cf::PLAYER{$login}	980	$cf::PLAYER{$login}
964	or cf::sync_job { !aio_stat $login }	981	or cf::sync_job { !aio_stat path $login }
965	}	982	}
966		983
967	sub find($) {	984	sub find($) {
968	return $cf::PLAYER{$_[0]} || do {	985	return $cf::PLAYER{$_[0]} || do {
969	my $login = $_[0];	986	my $login = $_[0];
…		…
1015		1032
1016	=cut	1033	=cut
1017		1034
1018	sub quit_character {	1035	sub quit_character {
1019	my ($pl) = @_;	1036	my ($pl) = @_;
		1037
		1038	my $name = $pl->ob->name;
1020		1039
1021	$pl->{deny_save} = 1;	1040	$pl->{deny_save} = 1;
1022	$pl->password ("*"); # this should lock out the player until we nuked the dir	1041	$pl->password ("*"); # this should lock out the player until we nuked the dir
1023		1042
1024	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1043	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
…		…
1029	my $path = playerdir $pl;	1048	my $path = playerdir $pl;
1030	my $temp = "$path~$cf::RUNTIME~deleting~";	1049	my $temp = "$path~$cf::RUNTIME~deleting~";
1031	aio_rename $path, $temp;	1050	aio_rename $path, $temp;
1032	delete $cf::PLAYER{$pl->ob->name};	1051	delete $cf::PLAYER{$pl->ob->name};
1033	$pl->destroy;	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
1034	IO::AIO::aio_rmtree $temp;	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;
1035	}	1074	}
1036		1075
1037	=item cf::player::list_logins	1076	=item cf::player::list_logins
1038		1077
1039	Returns am arrayref of all valid playernames in the system, can take a	1078	Returns am arrayref of all valid playernames in the system, can take a
…		…
1067	=cut	1106	=cut
1068		1107
1069	sub maps($) {	1108	sub maps($) {
1070	my ($pl) = @_;	1109	my ($pl) = @_;
1071		1110
		1111	$pl = ref $pl ? $pl->ob->name : $pl;
		1112
1072	my $files = aio_readdir playerdir $pl	1113	my $files = aio_readdir playerdir $pl
1073	or return;	1114	or return;
1074		1115
1075	my @paths;	1116	my @paths;
1076		1117
1077	for (@$files) {	1118	for (@$files) {
1078	utf8::decode $_;	1119	utf8::decode $_;
1079	next if /\.(?:pl|pst)$/;	1120	next if /\.(?:pl|pst)$/;
1080	next unless /^$PATH_SEP/o;	1121	next unless /^$PATH_SEP/o;
1081		1122
1082	push @paths, "~" . $pl->ob->name . "/" . $_;	1123	push @paths, cf::map::normalise "~$pl/$_";
1083	}	1124	}
1084		1125
1085	\@paths	1126	\@paths
1086	}	1127	}
1087		1128
1088	=item $player->ext_reply ($msgid, $msgtype, %msg)	1129	=item $player->ext_reply ($msgid, %msg)
1089		1130
1090	Sends an ext reply to the player.	1131	Sends an ext reply to the player.
1091		1132
1092	=cut	1133	=cut
1093		1134
1094	sub ext_reply($$$%) {	1135	sub ext_reply($$%) {
1095	my ($self, $id, %msg) = @_;	1136	my ($self, $id, %msg) = @_;
1096		1137
1097	$msg{msgid} = $id;	1138	$msg{msgid} = $id;
1098		1139
1099	$self->send ("ext " . cf::to_json \%msg);	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	$self->ns->ext_event ($type, %msg);
1100	}	1153	}
1101		1154
1102	package cf;	1155	package cf;
1103		1156
1104	=back	1157	=back
…		…
1114		1167
1115	use Fcntl;	1168	use Fcntl;
1116	use Coro::AIO;	1169	use Coro::AIO;
1117		1170
1118	use overload	1171	use overload
1119	'""' => \&as_string;	1172	'""' => \&as_string,
		1173	fallback => 1;
1120		1174
1121	our $MAX_RESET = 3600;	1175	our $MAX_RESET = 3600;
1122	our $DEFAULT_RESET = 3000;	1176	our $DEFAULT_RESET = 3000;
1123		1177
1124	sub generate_random_map {	1178	sub generate_random_map {
1125	my ($self, $rmp) = @_;	1179	my ($self, $rmp) = @_;
1126
1127	# mit "rum" bekleckern, nicht	1180	# mit "rum" bekleckern, nicht
1128	$self->_create_random_map (	1181	$self->_create_random_map (
1129	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1182	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1130	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1183	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1131	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1184	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
…		…
1138	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},	1191	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1139	(cf::region::find $rmp->{region}), $rmp->{custom}	1192	(cf::region::find $rmp->{region}), $rmp->{custom}
1140	)	1193	)
1141	}	1194	}
1142		1195
		1196	=item cf::map->register ($regex, $prio)
		1197
		1198	Register a handler for the map path matching the given regex at the
		1199	givne priority (higher is better, built-in handlers have priority 0, the
		1200	default).
		1201
		1202	=cut
		1203
1143	sub register {	1204	sub register {
1144	my (undef, $regex) = @_;	1205	my (undef, $regex, $prio) = @_;
1145	my $pkg = caller;	1206	my $pkg = caller;
1146		1207
1147	no strict;	1208	no strict;
1148	push @{"$pkg\::ISA"}, __PACKAGE__;	1209	push @{"$pkg\::ISA"}, __PACKAGE__;
1149		1210
1150	$EXT_MAP{$pkg} = qr<$regex>;	1211	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1151	}	1212	}
1152		1213
1153	# also paths starting with '/'	1214	# also paths starting with '/'
1154	$EXT_MAP{"cf::map"} = qr{^(?=/)};	1215	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
		1216
		1217	sub thawer_merge {
		1218	my ($self, $merge) = @_;
		1219
		1220	# we have to keep some variables in memory intact
		1221	local $self->{path};
		1222	local $self->{load_path};
		1223	local $self->{deny_save};
		1224	local $self->{deny_reset};
		1225
		1226	$self->SUPER::thawer_merge ($merge);
		1227	}
1155		1228
1156	sub normalise {	1229	sub normalise {
1157	my ($path, $base) = @_;	1230	my ($path, $base) = @_;
		1231
		1232	$path = "$path"; # make sure its a string
		1233
		1234	$path =~ s/\.map$//;
1158		1235
1159	# map plan:	1236	# map plan:
1160	#	1237	#
1161	# /! non-realised random map exit (special hack!)	1238	# /! non-realised random map exit (special hack!)
1162	# {... are special paths that are not being touched	1239	# {... are special paths that are not being touched
…		…
1190		1267
1191	return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object	1268	return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1192		1269
1193	$path = normalise $path, $base;	1270	$path = normalise $path, $base;
1194		1271
1195	for my $pkg (keys %EXT_MAP) {	1272	for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1196	if ($path =~ $EXT_MAP{$pkg}) {	1273	if ($path =~ $EXT_MAP{$pkg}[1]) {
1197	my $self = bless cf::map::new, $pkg;	1274	my $self = bless cf::map::new, $pkg;
1198	$self->{path} = $path; $self->path ($path);	1275	$self->{path} = $path; $self->path ($path);
1199	$self->init; # pass $1 etc.	1276	$self->init; # pass $1 etc.
1200	return $self;	1277	return $self;
1201	}	1278	}
1202	}	1279	}
1203		1280
1204	Carp::carp "unable to resolve path '$path'.";	1281	Carp::carp "unable to resolve path '$path' (base '$base').";
1205	()	1282	()
1206	}	1283	}
1207		1284
1208	sub init {	1285	sub init {
1209	my ($self) = @_;	1286	my ($self) = @_;
…		…
1220	# the displayed name, this is a one way mapping	1297	# the displayed name, this is a one way mapping
1221	sub visible_name {	1298	sub visible_name {
1222	&as_string	1299	&as_string
1223	}	1300	}
1224		1301
1225	# escape the /'s in the path
1226	sub _escaped_path {
1227	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1228
1229	$path
1230	}
1231
1232	# the original (read-only) location	1302	# the original (read-only) location
1233	sub load_path {	1303	sub load_path {
1234	my ($self) = @_;	1304	my ($self) = @_;
1235		1305
1236	sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}	1306	sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1237	}	1307	}
1238		1308
1239	# the temporary/swap location	1309	# the temporary/swap location
1240	sub save_path {	1310	sub save_path {
1241	my ($self) = @_;	1311	my ($self) = @_;
1242		1312
		1313	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1243	sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $self->_escaped_path	1314	sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1244	}	1315	}
1245		1316
1246	# the unique path, undef == no special unique path	1317	# the unique path, undef == no special unique path
1247	sub uniq_path {	1318	sub uniq_path {
1248	my ($self) = @_;	1319	my ($self) = @_;
1249		1320
		1321	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1250	sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path	1322	sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1251	}	1323	}
1252		1324
1253	# and all this just because we cannot iterate over	1325	# and all this just because we cannot iterate over
1254	# all maps in C++...	1326	# all maps in C++...
1255	sub change_all_map_light {	1327	sub change_all_map_light {
…		…
1261		1333
1262	sub unlink_save {	1334	sub unlink_save {
1263	my ($self) = @_;	1335	my ($self) = @_;
1264		1336
1265	utf8::encode (my $save = $self->save_path);	1337	utf8::encode (my $save = $self->save_path);
1266	IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;	1338	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1267	IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";	1339	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1268	}	1340	}
1269		1341
1270	sub load_header_from($) {	1342	sub load_header_from($) {
1271	my ($self, $path) = @_;	1343	my ($self, $path) = @_;
1272		1344
1273	utf8::encode $path;	1345	utf8::encode $path;
1274	aio_open $path, O_RDONLY, 0	1346	#aio_open $path, O_RDONLY, 0
1275	or return;	1347	# or return;
1276		1348
1277	$self->_load_header ($path)	1349	$self->_load_header ($path)
1278	or return;	1350	or return;
1279		1351
1280	$self->{load_path} = $path;	1352	$self->{load_path} = $path;
1281		1353
1282	1	1354	1
1283	}	1355	}
1284		1356
1285	sub load_orig {	1357	sub load_header_orig {
1286	my ($self) = @_;	1358	my ($self) = @_;
1287		1359
1288	$self->load_header_from ($self->load_path)	1360	$self->load_header_from ($self->load_path)
1289	}	1361	}
1290		1362
1291	sub load_temp {	1363	sub load_header_temp {
1292	my ($self) = @_;	1364	my ($self) = @_;
1293		1365
1294	$self->load_header_from ($self->save_path)	1366	$self->load_header_from ($self->save_path)
		1367	}
		1368
		1369	sub prepare_temp {
		1370	my ($self) = @_;
		1371
		1372	$self->last_access ((delete $self->{last_access})
		1373	|| $cf::RUNTIME); #d#
		1374	# safety
		1375	$self->{instantiate_time} = $cf::RUNTIME
		1376	if $self->{instantiate_time} > $cf::RUNTIME;
		1377	}
		1378
		1379	sub prepare_orig {
		1380	my ($self) = @_;
		1381
		1382	$self->{load_original} = 1;
		1383	$self->{instantiate_time} = $cf::RUNTIME;
		1384	$self->last_access ($cf::RUNTIME);
		1385	$self->instantiate;
1295	}	1386	}
1296		1387
1297	sub load_header {	1388	sub load_header {
1298	my ($self) = @_;	1389	my ($self) = @_;
1299		1390
1300	if ($self->load_temp) {	1391	if ($self->load_header_temp) {
1301	$self->last_access ((delete $self->{last_access})	1392	$self->prepare_temp;
1302	|| $cf::RUNTIME); #d#
1303	# safety
1304	$self->{instantiate_time} = $cf::RUNTIME
1305	if $self->{instantiate_time} > $cf::RUNTIME;
1306	} else {	1393	} else {
1307	$self->load_orig	1394	$self->load_header_orig
1308	or return;	1395	or return;
1309		1396	$self->prepare_orig;
1310	$self->{load_original} = 1;
1311	$self->{instantiate_time} = $cf::RUNTIME;
1312	$self->last_access ($cf::RUNTIME);
1313	$self->instantiate;
1314	}	1397	}
1315		1398
1316	1	1399	1
1317	}	1400	}
1318		1401
…		…
1332	$map->{last_save} = $cf::RUNTIME;	1415	$map->{last_save} = $cf::RUNTIME;
1333		1416
1334	$map->load_header	1417	$map->load_header
1335	or return;	1418	or return;
1336		1419
1337	if ($map->should_reset) {	1420	if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
		1421	# doing this can freeze the server in a sync job, obviously
		1422	#$cf::WAIT_FOR_TICK->wait;
1338	$map->reset;	1423	$map->reset;
1339	undef $guard;	1424	undef $guard;
1340	$map = find $path	1425	return find $path;
1341	or return;
1342	}	1426	}
1343		1427
1344	$cf::MAP{$path} = $map	1428	$cf::MAP{$path} = $map
1345	}	1429	}
1346	}	1430	}
		1431
		1432	sub pre_load { }
		1433	sub post_load { }
1347		1434
1348	sub load {	1435	sub load {
1349	my ($self) = @_;	1436	my ($self) = @_;
1350		1437
		1438	local $self->{deny_reset} = 1; # loading can take a long time
		1439
1351	my $path = $self->{path};	1440	my $path = $self->{path};
1352	my $guard = cf::lock_acquire "map_load:$path";	1441	my $guard = cf::lock_acquire "map_load:$path";
1353		1442
1354	return if $self->in_memory != cf::MAP_SWAPPED;	1443	return if $self->in_memory != cf::MAP_SWAPPED;
1355		1444
1356	$self->in_memory (cf::MAP_LOADING);	1445	$self->in_memory (cf::MAP_LOADING);
1357		1446
1358	$self->alloc;	1447	$self->alloc;
		1448
		1449	$self->pre_load;
		1450
1359	$self->_load_objects ($self->{load_path}, 1)	1451	$self->_load_objects ($self->{load_path}, 1)
1360	or return;	1452	or return;
1361		1453
1362	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1454	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1363	if delete $self->{load_original};	1455	if delete $self->{load_original};
…		…
1385	unless $self->difficulty;	1477	unless $self->difficulty;
1386	Coro::cede;	1478	Coro::cede;
1387	$self->activate;	1479	$self->activate;
1388	}	1480	}
1389		1481
		1482	$self->post_load;
		1483
1390	$self->in_memory (cf::MAP_IN_MEMORY);	1484	$self->in_memory (cf::MAP_IN_MEMORY);
1391	}	1485	}
1392		1486
1393	sub customise_for {	1487	sub customise_for {
1394	my ($self, $ob) = @_;	1488	my ($self, $ob) = @_;
…		…
1434		1528
1435	cf::sync_job { $map->load };	1529	cf::sync_job { $map->load };
1436	}	1530	}
1437		1531
1438	our %MAP_PREFETCH;	1532	our %MAP_PREFETCH;
1439	our $MAP_PREFETCHER = Coro::async {	1533	our $MAP_PREFETCHER = undef;
1440	while () {
1441	for my $path (keys %MAP_PREFETCH) {
1442	my $map = find $path
1443	or next;
1444	$map->load;
1445
1446	delete $MAP_PREFETCH{$path};
1447	}
1448	Coro::schedule;
1449	}
1450	};
1451		1534
1452	sub find_async {	1535	sub find_async {
1453	my ($path, $origin) = @_;	1536	my ($path, $origin) = @_;
1454		1537
1455	$path = normalise $path, $origin && $origin->{path};	1538	$path = normalise $path, $origin && $origin->{path};
1456		1539
1457	if (my $map = $cf::MAP{$path}) {	1540	if (my $map = $cf::MAP{$path}) {
1458	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	1541	return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1459	}	1542	}
1460		1543
1461	$MAP_PREFETCH{$path} = 0;	1544	undef $MAP_PREFETCH{$path};
		1545	$MAP_PREFETCHER ||= cf::async {
		1546	while (%MAP_PREFETCH) {
		1547	for my $path (keys %MAP_PREFETCH) {
		1548	my $map = find $path
		1549	or next;
		1550	$map->load;
		1551
		1552	delete $MAP_PREFETCH{$path};
		1553	}
		1554	}
		1555	undef $MAP_PREFETCHER;
		1556	};
1462	$MAP_PREFETCHER->ready;	1557	$MAP_PREFETCHER->prio (6);
1463		1558
1464	()	1559	()
1465	}	1560	}
1466		1561
1467	sub save {	1562	sub save {
…		…
1512		1607
1513	sub reset_at {	1608	sub reset_at {
1514	my ($self) = @_;	1609	my ($self) = @_;
1515		1610
1516	# TODO: safety, remove and allow resettable per-player maps	1611	# TODO: safety, remove and allow resettable per-player maps
1517	return 1e99 if $self->isa ("ext::map_per_player");	1612	return 1e99 if $self->isa ("ext::map_per_player");#d#
1518	return 1e99 if $self->{deny_reset};	1613	return 1e99 if $self->{deny_reset};
1519		1614
1520	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;	1615	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1521	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;	1616	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1522		1617
…		…
1527	my ($self) = @_;	1622	my ($self) = @_;
1528		1623
1529	$self->reset_at <= $cf::RUNTIME	1624	$self->reset_at <= $cf::RUNTIME
1530	}	1625	}
1531		1626
1532	sub rename {
1533	my ($self, $new_path) = @_;
1534
1535	normalise $new_path;
1536
1537	$self->unlink_save;
1538
1539	delete $cf::MAP{$self->path};
1540	$self->{path} = $new_path; $self->path ($self->{path});
1541	$cf::MAP{$self->path} = $self;
1542
1543	$self->save;
1544	}
1545
1546	sub reset {	1627	sub reset {
1547	my ($self) = @_;	1628	my ($self) = @_;
1548		1629
1549	my $lock = cf::lock_acquire "map_data:" . $self->path;	1630	my $lock = cf::lock_acquire "map_data:$self->{path}";
1550		1631
1551	return if $self->players;	1632	return if $self->players;
1552	return if $self->isa ("ext::map_per_player");#d#	1633	return if $self->isa ("ext::map_per_player");#d#
1553		1634
1554	warn "resetting map ", $self->path;#d#	1635	warn "resetting map ", $self->path;#d#
1555		1636
		1637	$self->in_memory (cf::MAP_SWAPPED);
		1638
		1639	# need to save uniques path
		1640	unless ($self->{deny_save}) {
		1641	my $uniq = $self->uniq_path; utf8::encode $uniq;
		1642
		1643	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		1644	if $uniq;
		1645	}
		1646
1556	delete $cf::MAP{$self->path};	1647	delete $cf::MAP{$self->path};
		1648
		1649	$self->clear;
1557		1650
1558	$_->clear_links_to ($self) for values %cf::MAP;	1651	$_->clear_links_to ($self) for values %cf::MAP;
1559		1652
1560	$self->unlink_save;	1653	$self->unlink_save;
1561	$self->destroy;	1654	$self->destroy;
…		…
1564	my $nuke_counter = "aaaa";	1657	my $nuke_counter = "aaaa";
1565		1658
1566	sub nuke {	1659	sub nuke {
1567	my ($self) = @_;	1660	my ($self) = @_;
1568		1661
		1662	delete $cf::MAP{$self->path};
		1663
		1664	$self->unlink_save;
		1665
		1666	bless $self, "cf::map";
		1667	delete $self->{deny_reset};
1569	$self->{deny_save} = 1;	1668	$self->{deny_save} = 1;
1570	$self->reset_timeout (1);	1669	$self->reset_timeout (1);
1571	$self->rename ("{nuke}/" . ($nuke_counter++));	1670	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
		1671
		1672	$cf::MAP{$self->path} = $self;
		1673
1572	$self->reset; # polite request, might not happen	1674	$self->reset; # polite request, might not happen
1573	}	1675	}
1574		1676
1575	=item cf::map::unique_maps	1677	=item cf::map::unique_maps
1576		1678
…		…
1588	for (@$files) {	1690	for (@$files) {
1589	utf8::decode $_;	1691	utf8::decode $_;
1590	next if /\.pst$/;	1692	next if /\.pst$/;
1591	next unless /^$PATH_SEP/o;	1693	next unless /^$PATH_SEP/o;
1592		1694
1593	push @paths, $_;	1695	push @paths, cf::map::normalise $_;
1594	}	1696	}
1595		1697
1596	\@paths	1698	\@paths
1597	}	1699	}
1598		1700
…		…
1692	=cut	1794	=cut
1693		1795
1694	sub link_map {	1796	sub link_map {
1695	unless ($LINK_MAP) {	1797	unless ($LINK_MAP) {
1696	$LINK_MAP = cf::map::find "{link}"	1798	$LINK_MAP = cf::map::find "{link}"
1697	or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };	1799	or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1698	$LINK_MAP->load;	1800	$LINK_MAP->load;
1699	}	1801	}
1700		1802
1701	$LINK_MAP	1803	$LINK_MAP
1702	}	1804	}
…		…
1709	return if UNIVERSAL::isa $self->map, "ext::map_link";	1811	return if UNIVERSAL::isa $self->map, "ext::map_link";
1710		1812
1711	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	1813	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1712	if $self->map;	1814	if $self->map;
1713		1815
1714	$self->enter_map ($LINK_MAP || link_map, 20, 20);	1816	$self->enter_map ($LINK_MAP || link_map, 10, 10);
1715	}	1817	}
1716		1818
1717	sub cf::object::player::leave_link {	1819	sub cf::object::player::leave_link {
1718	my ($self, $map, $x, $y) = @_;	1820	my ($self, $map, $x, $y) = @_;
1719		1821
…		…
1741	$map->load;	1843	$map->load;
1742	$map->load_diag;	1844	$map->load_diag;
1743		1845
1744	return unless $self->contr->active;	1846	return unless $self->contr->active;
1745	$self->activate_recursive;	1847	$self->activate_recursive;
		1848
		1849	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1746	$self->enter_map ($map, $x, $y);	1850	$self->enter_map ($map, $x, $y);
1747	}	1851	}
1748		1852
1749	cf::player->attach (	1853	cf::player->attach (
1750	on_logout => sub {	1854	on_logout => sub {
…		…
1763	# try to abort aborted map switching on player login :)	1867	# try to abort aborted map switching on player login :)
1764	# should happen only on crashes	1868	# should happen only on crashes
1765	if ($pl->ob->{_link_pos}) {	1869	if ($pl->ob->{_link_pos}) {
1766	$pl->ob->enter_link;	1870	$pl->ob->enter_link;
1767	(async {	1871	(async {
1768	# we need this sleep as the login has a concurrent enter_exit running
1769	# and this sleep increases chances of the player not ending up in scorn
1770	$pl->ob->reply (undef,	1872	$pl->ob->reply (undef,
1771	"There was an internal problem at your last logout, "	1873	"There was an internal problem at your last logout, "
1772	. "the server will try to bring you to your intended destination in a second.",	1874	. "the server will try to bring you to your intended destination in a second.",
1773	cf::NDI_RED);	1875	cf::NDI_RED);
		1876	# we need this sleep as the login has a concurrent enter_exit running
		1877	# and this sleep increases chances of the player not ending up in scorn
1774	Coro::Timer::sleep 1;	1878	Coro::Timer::sleep 1;
1775	$pl->ob->leave_link;	1879	$pl->ob->leave_link;
1776	})->prio (2);	1880	})->prio (2);
1777	}	1881	}
1778	},	1882	},
…		…
1786	my ($self, $path, $x, $y) = @_;	1890	my ($self, $path, $x, $y) = @_;
1787		1891
1788	$self->enter_link;	1892	$self->enter_link;
1789		1893
1790	(async {	1894	(async {
		1895	my $map = eval {
1791	my $map = cf::map::find $path;	1896	my $map = cf::map::find $path;
1792	$map = $map->customise_for ($self) if $map;	1897	$map = $map->customise_for ($self) if $map;
1793		1898	$map
1794	# warn "entering ", $map->path, " at ($x, $y)\n"	1899	} or
1795	# if $map;
1796
1797	$map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	1900	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1798		1901
1799	$self->leave_link ($map, $x, $y);	1902	$self->leave_link ($map, $x, $y);
1800	})->prio (1);	1903	})->prio (1);
1801	}	1904	}
1802		1905
…		…
1806		1909
1807	sub parse_random_map_params {	1910	sub parse_random_map_params {
1808	my ($spec) = @_;	1911	my ($spec) = @_;
1809		1912
1810	my $rmp = { # defaults	1913	my $rmp = { # defaults
1811	xsize => 10,	1914	xsize => (cf::rndm 15, 40),
1812	ysize => 10,	1915	ysize => (cf::rndm 15, 40),
		1916	symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
		1917	#layout => string,
1813	};	1918	};
1814		1919
1815	for (split /\n/, $spec) {	1920	for (split /\n/, $spec) {
1816	my ($k, $v) = split /\s+/, $_, 2;	1921	my ($k, $v) = split /\s+/, $_, 2;
1817		1922
…		…
1821	$rmp	1926	$rmp
1822	}	1927	}
1823		1928
1824	sub prepare_random_map {	1929	sub prepare_random_map {
1825	my ($exit) = @_;	1930	my ($exit) = @_;
		1931
		1932	my $guard = cf::lock_acquire "exit_prepare:$exit";
1826		1933
1827	# all this does is basically replace the /! path by	1934	# all this does is basically replace the /! path by
1828	# a new random map path (?random/...) with a seed	1935	# a new random map path (?random/...) with a seed
1829	# that depends on the exit object	1936	# that depends on the exit object
1830		1937
1831	my $rmp = parse_random_map_params $exit->msg;	1938	my $rmp = parse_random_map_params $exit->msg;
1832		1939
1833	if ($exit->map) {	1940	if ($exit->map) {
1834	$rmp->{region} = $exit->map->region_name;	1941	$rmp->{region} = $exit->region->name;
1835	$rmp->{origin_map} = $exit->map->path;	1942	$rmp->{origin_map} = $exit->map->path;
1836	$rmp->{origin_x} = $exit->x;	1943	$rmp->{origin_x} = $exit->x;
1837	$rmp->{origin_y} = $exit->y;	1944	$rmp->{origin_y} = $exit->y;
1838	}	1945	}
1839		1946
1840	$rmp->{random_seed} ||= $exit->random_seed;	1947	$rmp->{random_seed} ||= $exit->random_seed;
1841		1948
1842	my $data = cf::to_json $rmp;	1949	my $data = cf::to_json $rmp;
1843	my $md5 = Digest::MD5::md5_hex $data;	1950	my $md5 = Digest::MD5::md5_hex $data;
		1951	my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1844		1952
1845	if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) {	1953	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1846	aio_write $fh, 0, (length $data), $data, 0;	1954	aio_write $fh, 0, (length $data), $data, 0;
		1955	undef $fh;
		1956	aio_rename "$meta~", $meta;
1847		1957
1848	$exit->slaying ("?random/$md5");	1958	$exit->slaying ("?random/$md5");
1849	$exit->msg (undef);	1959	$exit->msg (undef);
1850	}	1960	}
1851	}	1961	}
1852		1962
1853	sub cf::object::player::enter_exit {	1963	sub cf::object::player::enter_exit {
1854	my ($self, $exit) = @_;	1964	my ($self, $exit) = @_;
1855		1965
1856	return unless $self->type == cf::PLAYER;	1966	return unless $self->type == cf::PLAYER;
		1967
		1968	if ($exit->slaying eq "/!") {
		1969	#TODO: this should de-fi-ni-te-ly not be a sync-job
		1970	cf::sync_job { prepare_random_map $exit };
		1971	}
		1972
		1973	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
		1974	my $hp = $exit->stats->hp;
		1975	my $sp = $exit->stats->sp;
1857		1976
1858	$self->enter_link;	1977	$self->enter_link;
1859		1978
1860	(async {	1979	(async {
1861	$self->deactivate_recursive; # just to be sure	1980	$self->deactivate_recursive; # just to be sure
1862	unless (eval {	1981	unless (eval {
1863	prepare_random_map $exit	1982	$self->goto ($slaying, $hp, $sp);
1864	if $exit->slaying eq "/!";
1865
1866	my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1867	$self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1868		1983
1869	1;	1984	1;
1870	}) {	1985	}) {
1871	$self->message ("Something went wrong deep within the crossfire server. "	1986	$self->message ("Something went wrong deep within the crossfire server. "
1872	. "I'll try to bring you back to the map you were before. "	1987	. "I'll try to bring you back to the map you were before. "
…		…
1892		2007
1893	sub cf::client::send_drawinfo {	2008	sub cf::client::send_drawinfo {
1894	my ($self, $text, $flags) = @_;	2009	my ($self, $text, $flags) = @_;
1895		2010
1896	utf8::encode $text;	2011	utf8::encode $text;
1897	$self->send_packet (sprintf "drawinfo %d %s", $flags, $text);	2012	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1898	}	2013	}
1899		2014
		2015	=item $client->ext_event ($type, %msg)
		2016
		2017	Sends an exti event to the client.
		2018
		2019	=cut
		2020
		2021	sub cf::client::ext_event($$%) {
		2022	my ($self, $type, %msg) = @_;
		2023
		2024	$msg{msgtype} = "event_$type";
		2025	$self->send_packet ("ext " . cf::to_json \%msg);
		2026	}
1900		2027
1901	=item $success = $client->query ($flags, "text", \&cb)	2028	=item $success = $client->query ($flags, "text", \&cb)
1902		2029
1903	Queues a query to the client, calling the given callback with	2030	Queues a query to the client, calling the given callback with
1904	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2031	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
…		…
1933	# get handled first	2060	# get handled first
1934	my $queue = delete $ns->{query_queue}	2061	my $queue = delete $ns->{query_queue}
1935	or return; # be conservative, not sure how that can happen, but we saw a crash here	2062	or return; # be conservative, not sure how that can happen, but we saw a crash here
1936		2063
1937	(shift @$queue)->[1]->($msg);	2064	(shift @$queue)->[1]->($msg);
		2065	return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1938		2066
1939	push @{ $ns->{query_queue} }, @$queue;	2067	push @{ $ns->{query_queue} }, @$queue;
1940		2068
1941	if (@{ $ns->{query_queue} } == @$queue) {	2069	if (@{ $ns->{query_queue} } == @$queue) {
1942	if (@$queue) {	2070	if (@$queue) {
…		…
2000		2128
2001	# here we export the classes and methods available to script code	2129	# here we export the classes and methods available to script code
2002		2130
2003	=pod	2131	=pod
2004		2132
2005	The following fucntions and emthods are available within a safe environment:	2133	The following functions and methods are available within a safe environment:
2006		2134
2007	cf::object contr pay_amount pay_player map	2135	cf::object contr pay_amount pay_player map
2008	cf::object::player player	2136	cf::object::player player
2009	cf::player peaceful	2137	cf::player peaceful
2010	cf::map trigger	2138	cf::map trigger
…		…
2103	The parameter C<$family> should best start with the name of the extension	2231	The parameter C<$family> should best start with the name of the extension
2104	using it, it should be unique.	2232	using it, it should be unique.
2105		2233
2106	=over 4	2234	=over 4
2107		2235
2108	=item $hashref = cf::db_get $family
2109
2110	Return a hashref for use by the extension C<$family>, which can be
2111	modified. After modifications, you have to call C<cf::db_dirty> or
2112	C<cf::db_sync>.
2113
2114	=item $value = cf::db_get $family => $key	2236	=item $value = cf::db_get $family => $key
2115		2237
2116	Returns a single value from the database	2238	Returns a single value from the database.
2117
2118	=item cf::db_put $family => $hashref
2119
2120	Stores the given family hashref into the database. Updates are delayed, if
2121	you want the data to be synced to disk immediately, use C<cf::db_sync>.
2122		2239
2123	=item cf::db_put $family => $key => $value	2240	=item cf::db_put $family => $key => $value
2124		2241
2125	Stores the given C<$value> in the family hash. Updates are delayed, if you	2242	Stores the given C<$value> in the family.
2126	want the data to be synced to disk immediately, use C<cf::db_sync>.
2127
2128	=item cf::db_dirty
2129
2130	Marks the database as dirty, to be updated at a later time.
2131
2132	=item cf::db_sync
2133
2134	Immediately write the database to disk I<if it is dirty>.
2135		2243
2136	=cut	2244	=cut
2137		2245
2138	our $DB;	2246	our $DB;
2139		2247
2140	{	2248	sub db_init {
		2249	unless ($DB) {
		2250	$DB = BDB::db_create $DB_ENV;
		2251
		2252	cf::sync_job {
		2253	eval {
		2254	$DB->set_flags (BDB::CHKSUM);
		2255
		2256	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
		2257	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		2258	cf::cleanup "db_open(db): $!" if $!;
		2259	};
		2260	cf::cleanup "db_open(db): $@" if $@;
		2261	};
		2262
2141	my $path = cf::localdir . "/database.pst";	2263	my $path = cf::localdir . "/database.pst";
		2264	if (stat $path) {
		2265	cf::sync_job {
		2266	my $pst = Storable::retrieve $path;
2142		2267
2143	sub db_load() {	2268	cf::db_put (board => data => $pst->{board});
2144	$DB = stat $path ? Storable::retrieve $path : { };	2269	cf::db_put (guildrules => data => $pst->{guildrules});
2145	}	2270	cf::db_put (rent => balance => $pst->{rent}{balance});
		2271	BDB::db_env_txn_checkpoint $DB_ENV;
2146		2272
2147	my $pid;	2273	unlink $path;
2148
2149	sub db_save() {
2150	waitpid $pid, 0 if $pid;
2151	if (0 == ($pid = fork)) {
2152	$DB->{_meta}{version} = 1;
2153	Storable::nstore $DB, "$path~";
2154	rename "$path~", $path;
2155	cf::_exit 0 if defined $pid;
2156	}	2274	};
2157	}	2275	}
2158
2159	my $dirty;
2160
2161	sub db_sync() {
2162	db_save if $dirty;
2163	undef $dirty;
2164	}
2165
2166	my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2167	db_sync;
2168	});	2276	}
		2277	}
2169		2278
2170	sub db_dirty() {
2171	$dirty = 1;
2172	$idle->start;
2173	}
2174
2175	sub db_get($;$) {	2279	sub db_get($$) {
2176	@_ >= 2	2280	my $key = "$_[0]/$_[1]";
2177	? $DB->{$_[0]}{$_[1]}
2178	: ($DB->{$_[0]} ||= { })
2179	}
2180		2281
		2282	cf::sync_job {
		2283	BDB::db_get $DB, undef, $key, my $data;
		2284
		2285	$! ? ()
		2286	: Compress::LZF::sthaw $data
		2287	}
		2288	}
		2289
2181	sub db_put($$;$) {	2290	sub db_put($$$) {
2182	if (@_ >= 3) {	2291	BDB::dbreq_pri 4;
2183	$DB->{$_[0]}{$_[1]} = $_[2];	2292	BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
		2293	}
		2294
		2295	#############################################################################
		2296	# the server's init and main functions
		2297
		2298	sub load_facedata {
		2299	my $path = sprintf "%s/facedata", cf::datadir;
		2300
		2301	warn "loading facedata from $path\n";
		2302
		2303	my $faces;
		2304	0 < aio_load $path, $faces
		2305	or die "$path: $!";
		2306
		2307	Coro::cede;
		2308	$faces = Storable::thaw $faces;
		2309	Coro::cede;
		2310
		2311	my $meta = delete $faces->{""};
		2312	$meta->{version} == 1
		2313	or cf::cleanup "$path: version mismatch, cannot proceed.";
		2314
		2315	while (my ($face, $info) = each %$faces) {
		2316	my $idx = (cf::face::find $face) || cf::face::alloc $face;
		2317	cf::face::set $idx, $info->{visibility}, $info->{magicmap};
		2318	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
		2319	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
		2320	Coro::cede;
		2321	}
		2322
		2323	while (my ($face, $info) = each %$faces) {
		2324	next unless $info->{smooth};
		2325	my $idx = cf::face::find $face
		2326	or next;
		2327	if (my $smooth = cf::face::find $info->{smooth}) {
		2328	cf::face::set_smooth $idx, $smooth;
2184	} else {	2329	} else {
2185	$DB->{$_[0]} = $_[1];	2330	warn "smooth face '$info->{smooth}' not found for face '$face'";
2186	}
2187	db_dirty;
2188	}
2189
2190	cf::global->attach (
2191	prio => 10000,
2192	on_cleanup => sub {
2193	db_sync;
2194	},	2331	}
2195	);	2332	Coro::cede;
2196	}	2333	}
2197		2334
2198	#############################################################################	2335	1
2199	# the server's main()	2336	}
		2337
		2338	sub reload_resources {
		2339	load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
		2340	or die "unable to load regions file\n";#d#
		2341	load_facedata
		2342	or die "unable to load facedata\n";#d#
		2343	}
		2344
		2345	sub init {
		2346	reload_resources;
		2347	}
2200		2348
2201	sub cfg_load {	2349	sub cfg_load {
2202	open my $fh, "<:utf8", cf::confdir . "/config"	2350	open my $fh, "<:utf8", cf::confdir . "/config"
2203	or return;	2351	or return;
2204		2352
…		…
2221		2369
2222	sub main {	2370	sub main {
2223	# we must not ever block the main coroutine	2371	# we must not ever block the main coroutine
2224	local $Coro::idle = sub {	2372	local $Coro::idle = sub {
2225	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	2373	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
		2374	(async {
2226	async { Event::one_event };	2375	Event::one_event;
		2376	})->prio (Coro::PRIO_MAX);
2227	};	2377	};
2228		2378
2229	cfg_load;	2379	cfg_load;
2230	db_load;	2380	db_init;
2231	load_extensions;	2381	load_extensions;
		2382
		2383	$TICK_WATCHER->start;
2232	Event::loop;	2384	Event::loop;
2233	}	2385	}
2234		2386
2235	#############################################################################	2387	#############################################################################
2236	# initialisation and cleanup	2388	# initialisation and cleanup
2237		2389
2238	# install some emergency cleanup handlers	2390	# install some emergency cleanup handlers
2239	BEGIN {	2391	BEGIN {
2240	for my $signal (qw(INT HUP TERM)) {	2392	for my $signal (qw(INT HUP TERM)) {
2241	Event->signal (	2393	Event->signal (
		2394	reentrant => 0,
2242	data => WF_AUTOCANCEL,	2395	data => WF_AUTOCANCEL,
2243	signal => $signal,	2396	signal => $signal,
		2397	prio => 0,
2244	cb => sub {	2398	cb => sub {
2245	cf::cleanup "SIG$signal";	2399	cf::cleanup "SIG$signal";
2246	},	2400	},
2247	);	2401	);
2248	}	2402	}
2249	}	2403	}
…		…
2254	warn "enter emergency perl save\n";	2408	warn "enter emergency perl save\n";
2255		2409
2256	cf::sync_job {	2410	cf::sync_job {
2257	# use a peculiar iteration method to avoid tripping on perl	2411	# use a peculiar iteration method to avoid tripping on perl
2258	# refcount bugs in for. also avoids problems with players	2412	# refcount bugs in for. also avoids problems with players
2259	# and maps saved/Destroyed asynchronously.	2413	# and maps saved/destroyed asynchronously.
2260	warn "begin emergency player save\n";	2414	warn "begin emergency player save\n";
2261	for my $login (keys %cf::PLAYER) {	2415	for my $login (keys %cf::PLAYER) {
2262	my $pl = $cf::PLAYER{$login} or next;	2416	my $pl = $cf::PLAYER{$login} or next;
2263	$pl->valid or next;	2417	$pl->valid or next;
2264	$pl->save;	2418	$pl->save;
…		…
2270	my $map = $cf::MAP{$path} or next;	2424	my $map = $cf::MAP{$path} or next;
2271	$map->valid or next;	2425	$map->valid or next;
2272	$map->save;	2426	$map->save;
2273	}	2427	}
2274	warn "end emergency map save\n";	2428	warn "end emergency map save\n";
		2429
		2430	warn "begin emergency database checkpoint\n";
		2431	BDB::db_env_txn_checkpoint $DB_ENV;
		2432	warn "end emergency database checkpoint\n";
2275	};	2433	};
2276		2434
2277	warn "leave emergency perl save\n";	2435	warn "leave emergency perl save\n";
		2436	}
		2437
		2438	sub post_cleanup {
		2439	my ($make_core) = @_;
		2440
		2441	warn Carp::longmess "post_cleanup backtrace"
		2442	if $make_core;
2278	}	2443	}
2279		2444
2280	sub reload() {	2445	sub reload() {
2281	# can/must only be called in main	2446	# can/must only be called in main
2282	if ($Coro::current != $Coro::main) {	2447	if ($Coro::current != $Coro::main) {
2283	warn "can only reload from main coroutine\n";	2448	warn "can only reload from main coroutine";
2284	return;	2449	return;
2285	}	2450	}
2286		2451
2287	warn "reloading...";	2452	warn "reloading...";
2288		2453
2289	warn "freezing server";	2454	warn "entering sync_job";
2290	my $guard = freeze_mainloop;	2455
		2456	cf::sync_job {
		2457	cf::write_runtime; # external watchdog should not bark
2291	cf::emergency_save;	2458	cf::emergency_save;
		2459	cf::write_runtime; # external watchdog should not bark
2292		2460
2293	warn "sync database to disk";	2461	warn "syncing database to disk";
2294	cf::db_sync;	2462	BDB::db_env_txn_checkpoint $DB_ENV;
2295	IO::AIO::flush;
2296		2463
2297	eval {
2298	# if anything goes wrong in here, we should simply crash as we already saved	2464	# if anything goes wrong in here, we should simply crash as we already saved
2299		2465
2300	warn "cancel all watchers";	2466	warn "cancelling all WF_AUTOCANCEL watchers";
2301	for (Event::all_watchers) {	2467	for (Event::all_watchers) {
2302	$_->cancel if $_->data & WF_AUTOCANCEL;	2468	$_->cancel if $_->data & WF_AUTOCANCEL;
2303	}	2469	}
2304		2470
		2471	warn "flushing outstanding aio requests";
		2472	for (;;) {
		2473	BDB::flush;
		2474	IO::AIO::flush;
		2475	Coro::cede;
		2476	last unless IO::AIO::nreqs || BDB::nreqs;
		2477	warn "iterate...";
		2478	}
		2479
		2480	++$RELOAD;
		2481
2305	warn "cancel all extension coros";	2482	warn "cancelling all extension coros";
2306	$_->cancel for values %EXT_CORO;	2483	$_->cancel for values %EXT_CORO;
2307	%EXT_CORO = ();	2484	%EXT_CORO = ();
2308		2485
2309	warn "remove commands";	2486	warn "removing commands";
2310	%COMMAND = ();	2487	%COMMAND = ();
2311		2488
2312	warn "remove ext commands";	2489	warn "removing ext commands";
2313	%EXTCMD = ();	2490	%EXTCMD = ();
2314		2491
2315	warn "unload/nuke all extensions";	2492	warn "unloading/nuking all extensions";
2316	for my $pkg (@EXTS) {	2493	for my $pkg (@EXTS) {
2317	warn "... unloading $pkg";	2494	warn "... unloading $pkg";
2318		2495
2319	if (my $cb = $pkg->can ("unload")) {	2496	if (my $cb = $pkg->can ("unload")) {
2320	eval {	2497	eval {
…		…
2325		2502
2326	warn "... nuking $pkg";	2503	warn "... nuking $pkg";
2327	Symbol::delete_package $pkg;	2504	Symbol::delete_package $pkg;
2328	}	2505	}
2329		2506
2330	warn "unload all perl modules loaded from $LIBDIR";	2507	warn "unloading all perl modules loaded from $LIBDIR";
2331	while (my ($k, $v) = each %INC) {	2508	while (my ($k, $v) = each %INC) {
2332	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	2509	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2333		2510
2334	warn "removing <$k>";	2511	warn "... unloading $k";
2335	delete $INC{$k};	2512	delete $INC{$k};
2336		2513
2337	$k =~ s/\.pm$//;	2514	$k =~ s/\.pm$//;
2338	$k =~ s/\//::/g;	2515	$k =~ s/\//::/g;
2339		2516
…		…
2342	}	2519	}
2343		2520
2344	Symbol::delete_package $k;	2521	Symbol::delete_package $k;
2345	}	2522	}
2346		2523
2347	warn "get rid of safe::, as good as possible";	2524	warn "getting rid of safe::, as good as possible";
2348	Symbol::delete_package "safe::$_"	2525	Symbol::delete_package "safe::$_"
2349	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	2526	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2350		2527
2351	warn "unload cf.pm \"a bit\"";	2528	warn "unloading cf.pm \"a bit\"";
2352	delete $INC{"cf.pm"};	2529	delete $INC{"cf.pm"};
2353		2530
2354	# don't, removes xs symbols, too,	2531	# don't, removes xs symbols, too,
2355	# and global variables created in xs	2532	# and global variables created in xs
2356	#Symbol::delete_package __PACKAGE__;	2533	#Symbol::delete_package __PACKAGE__;
2357		2534
		2535	warn "unload completed, starting to reload now";
		2536
2358	warn "reloading cf.pm";	2537	warn "reloading cf.pm";
2359	require cf;	2538	require cf;
2360	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	2539	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2361		2540
2362	warn "load config and database again";	2541	warn "loading config and database again";
2363	cf::cfg_load;	2542	cf::cfg_load;
2364	cf::db_load;
2365		2543
2366	warn "load extensions";	2544	warn "loading extensions";
2367	cf::load_extensions;	2545	cf::load_extensions;
2368		2546
2369	warn "reattach attachments to objects/players";	2547	warn "reattaching attachments to objects/players";
2370	_global_reattach;	2548	_global_reattach; # objects, sockets
2371	warn "reattach attachments to maps";	2549	warn "reattaching attachments to maps";
2372	reattach $_ for values %MAP;	2550	reattach $_ for values %MAP;
2373	};	2551	warn "reattaching attachments to players";
		2552	reattach $_ for values %PLAYER;
2374		2553
2375	if ($@) {	2554	warn "loading reloadable resources";
		2555	reload_resources;
		2556
		2557	warn "leaving sync_job";
		2558
		2559	1
		2560	} or do {
2376	warn $@;	2561	warn $@;
2377	warn "error while reloading, exiting.";	2562	warn "error while reloading, exiting.";
2378	exit 1;	2563	exit 1;
2379	}	2564	};
2380		2565
2381	warn "reloaded";	2566	warn "reloaded";
2382	};	2567	};
2383		2568
		2569	our $RELOAD_WATCHER; # used only during reload
		2570
2384	register_command "reload" => sub {	2571	register_command "reload" => sub {
2385	my ($who, $arg) = @_;	2572	my ($who, $arg) = @_;
2386		2573
2387	if ($who->flag (FLAG_WIZ)) {	2574	if ($who->flag (FLAG_WIZ)) {
2388	$who->message ("start of reload.");	2575	$who->message ("reloading server.");
		2576
		2577	# doing reload synchronously and two reloads happen back-to-back,
		2578	# coro crashes during coro_state_free->destroy here.
		2579
		2580	$RELOAD_WATCHER ||= Event->timer (
		2581	reentrant => 0,
		2582	after => 0,
		2583	data => WF_AUTOCANCEL,
		2584	cb => sub {
2389	reload;	2585	reload;
2390	$who->message ("end of reload.");	2586	undef $RELOAD_WATCHER;
		2587	},
		2588	);
2391	}	2589	}
2392	};	2590	};
2393		2591
2394	unshift @INC, $LIBDIR;	2592	unshift @INC, $LIBDIR;
		2593
		2594	my $bug_warning = 0;
2395		2595
2396	$TICK_WATCHER = Event->timer (	2596	$TICK_WATCHER = Event->timer (
2397	reentrant => 0,	2597	reentrant => 0,
		2598	parked => 1,
2398	prio => 0,	2599	prio => 0,
2399	at => $NEXT_TICK || $TICK,	2600	at => $NEXT_TICK || $TICK,
2400	data => WF_AUTOCANCEL,	2601	data => WF_AUTOCANCEL,
2401	cb => sub {	2602	cb => sub {
		2603	if ($Coro::current != $Coro::main) {
		2604	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
		2605	unless ++$bug_warning > 10;
		2606	return;
		2607	}
		2608
2402	$NOW = Event::time;	2609	$NOW = Event::time;
2403		2610
2404	cf::server_tick; # one server iteration	2611	cf::server_tick; # one server iteration
2405	$RUNTIME += $TICK;	2612	$RUNTIME += $TICK;
2406	$NEXT_TICK += $TICK;	2613	$NEXT_TICK += $TICK;
2407		2614
		2615	if ($NOW >= $NEXT_RUNTIME_WRITE) {
		2616	$NEXT_RUNTIME_WRITE = $NOW + 10;
		2617	Coro::async_pool {
		2618	write_runtime
		2619	or warn "ERROR: unable to write runtime file: $!";
		2620	};
		2621	}
		2622
2408	$WAIT_FOR_TICK->broadcast;	2623	$WAIT_FOR_TICK->broadcast;
2409	$WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;	2624	$WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
		2625
		2626	# my $AFTER = Event::time;
		2627	# warn $AFTER - $NOW;#d#
2410		2628
2411	# if we are delayed by four ticks or more, skip them all	2629	# if we are delayed by four ticks or more, skip them all
2412	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2630	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2413		2631
2414	$TICK_WATCHER->at ($NEXT_TICK);	2632	$TICK_WATCHER->at ($NEXT_TICK);
2415	$TICK_WATCHER->start;	2633	$TICK_WATCHER->start;
2416	},	2634	},
2417	);	2635	);
2418		2636
		2637	{
2419	IO::AIO::max_poll_time $TICK * 0.2;	2638	BDB::max_poll_time $TICK * 0.1;
2420		2639	$BDB_POLL_WATCHER = Event->io (
2421	Event->io (	2640	reentrant => 0,
2422	fd => IO::AIO::poll_fileno,	2641	fd => BDB::poll_fileno,
2423	poll => 'r',	2642	poll => 'r',
2424	prio => 5,	2643	prio => 0,
2425	data => WF_AUTOCANCEL,
2426	cb => \&IO::AIO::poll_cb,
2427	);
2428
2429	Event->timer (
2430	data => WF_AUTOCANCEL,	2644	data => WF_AUTOCANCEL,
2431	after => 0,	2645	cb => \&BDB::poll_cb,
2432	interval => 10,	2646	);
2433	cb => sub {	2647	BDB::min_parallel 8;
2434	(Coro::unblock_sub {	2648
2435	write_runtime	2649	BDB::set_sync_prepare {
2436	or warn "ERROR: unable to write runtime file: $!";	2650	my $status;
		2651	my $current = $Coro::current;
		2652	(
		2653	sub {
		2654	$status = $!;
		2655	$current->ready; undef $current;
		2656	},
		2657	sub {
		2658	Coro::schedule while defined $current;
		2659	$! = $status;
		2660	},
		2661	)
		2662	};
		2663
		2664	unless ($DB_ENV) {
		2665	$DB_ENV = BDB::db_env_create;
		2666
		2667	cf::sync_job {
		2668	eval {
		2669	BDB::db_env_open
		2670	$DB_ENV,
		2671	$BDB_ENV_DIR,
		2672	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
		2673	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
		2674	0666;
		2675
		2676	cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
		2677
		2678	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
		2679	$DB_ENV->set_lk_detect;
		2680	};
		2681
		2682	cf::cleanup "db_env_open(db): $@" if $@;
2437	})->();	2683	};
2438	},	2684	}
2439	);	2685	}
		2686
		2687	{
		2688	IO::AIO::min_parallel 8;
		2689
		2690	undef $Coro::AIO::WATCHER;
		2691	IO::AIO::max_poll_time $TICK * 0.1;
		2692	$AIO_POLL_WATCHER = Event->io (
		2693	reentrant => 0,
		2694	data => WF_AUTOCANCEL,
		2695	fd => IO::AIO::poll_fileno,
		2696	poll => 'r',
		2697	prio => 6,
		2698	cb => \&IO::AIO::poll_cb,
		2699	);
		2700	}
2440		2701
2441	END { cf::emergency_save }	2702	END { cf::emergency_save }
2442		2703
2443	1	2704	1
2444		2705

Diff Legend

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