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.168 by root, Sun Jan 14 00:37:14 2007 UTC vs.
Revision 1.235 by root, Tue Apr 10 09:35:23 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;
49	our $AIO_POLL_WATCHER;	59	our $AIO_POLL_WATCHER;
50	our $WRITE_RUNTIME_WATCHER;	60	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51	our $NEXT_TICK;	61	our $NEXT_TICK;
52	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;
53		67
54	our %CFG;	68	our %CFG;
55		69
56	our $UPTIME; $UPTIME ||= time;	70	our $UPTIME; $UPTIME ||= time;
57	our $RUNTIME;	71	our $RUNTIME;
58		72
59	our %PLAYER; # all users	73	our %PLAYER; # all users
60	our %MAP; # all maps	74	our %MAP; # all maps
61	our $LINK_MAP; # the special {link} map, which is always available	75	our $LINK_MAP; # the special {link} map, which is always available
62	our $RANDOM_MAPS = cf::localdir . "/random";	76	our $RANDOM_MAPS = cf::localdir . "/random";
		77	our $BDB_ENV_DIR = cf::localdir . "/db";
63		78
64	our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;	79	our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65	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;
66		81
67	# 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 ∕
…		…
80	mkdir cf::localdir;	95	mkdir cf::localdir;
81	mkdir cf::localdir . "/" . cf::playerdir;	96	mkdir cf::localdir . "/" . cf::playerdir;
82	mkdir cf::localdir . "/" . cf::tmpdir;	97	mkdir cf::localdir . "/" . cf::tmpdir;
83	mkdir cf::localdir . "/" . cf::uniquedir;	98	mkdir cf::localdir . "/" . cf::uniquedir;
84	mkdir $RANDOM_MAPS;	99	mkdir $RANDOM_MAPS;
		100	mkdir $BDB_ENV_DIR;
85		101
86	our $EMERGENCY_POSITION;	102	our $EMERGENCY_POSITION;
		103
		104	sub cf::map::normalise;
87		105
88	#############################################################################	106	#############################################################################
89		107
90	=head2 GLOBAL VARIABLES	108	=head2 GLOBAL VARIABLES
91		109
…		…
190	$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;
191	$d	209	$d
192	} || "[unable to dump $_[0]: '$@']";	210	} || "[unable to dump $_[0]: '$@']";
193	}	211	}
194		212
195	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
196		214
197	=item $ref = cf::from_json $json	215	=item $ref = cf::from_json $json
198		216
199	Converts a JSON string into the corresponding perl data structure.	217	Converts a JSON string into the corresponding perl data structure.
200		218
201	=cut
202
203	sub from_json($) {
204	$JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
205	JSON::Syck::Load $_[0]
206	}
207
208	=item $json = cf::to_json $ref	219	=item $json = cf::to_json $ref
209		220
210	Converts a perl data structure into its JSON representation.	221	Converts a perl data structure into its JSON representation.
211
212	=cut
213
214	sub to_json($) {
215	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
216	JSON::Syck::Dump $_[0]
217	}
218		222
219	=item cf::lock_wait $string	223	=item cf::lock_wait $string
220		224
221	Wait until the given lock is available. See cf::lock_acquire.	225	Wait until the given lock is available. See cf::lock_acquire.
222		226
…		…
261	sub freeze_mainloop {	265	sub freeze_mainloop {
262	return unless $TICK_WATCHER->is_active;	266	return unless $TICK_WATCHER->is_active;
263		267
264	my $guard = Coro::guard {	268	my $guard = Coro::guard {
265	$TICK_WATCHER->start;	269	$TICK_WATCHER->start;
266	$WRITE_RUNTIME_WATCHER->start;
267	};	270	};
268	$WRITE_RUNTIME_WATCHER->stop;
269	$TICK_WATCHER->stop;	271	$TICK_WATCHER->stop;
270	$guard	272	$guard
271	}	273	}
272		274
273	=item cf::async { BLOCK }	275	=item cf::async { BLOCK }
…		…
344		346
345	$coro	347	$coro
346	}	348	}
347		349
348	sub write_runtime {	350	sub write_runtime {
		351	my $guard = cf::lock_acquire "write_runtime";
		352
349	my $runtime = cf::localdir . "/runtime";	353	my $runtime = cf::localdir . "/runtime";
350		354
351	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	355	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352	or return;	356	or return;
353		357
		358	my $value = $cf::RUNTIME + 90 + 10;
354	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
355	(aio_write $fh, 0, (length $value), $value, 0) <= 0	362	(aio_write $fh, 0, (length $value), $value, 0) <= 0
356	and return;	363	and return;
357		364
		365	# always fsync - this file is important
358	aio_fsync $fh	366	aio_fsync $fh
359	and return;	367	and return;
360		368
361	close $fh	369	close $fh
362	or return;	370	or return;
363		371
364	aio_rename "$runtime~", $runtime	372	aio_rename "$runtime~", $runtime
365	and return;	373	and return;
366		374
367	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 });
368	}	387	}
369		388
370	=back	389	=back
371		390
372	=cut	391	=cut
…		…
503	our @CB_TYPE = (); # registry for type (cf-object class) based events	522	our @CB_TYPE = (); # registry for type (cf-object class) based events
504	our @CB_MAP = ();	523	our @CB_MAP = ();
505		524
506	my %attachment;	525	my %attachment;
507		526
		527	sub cf::attachable::thawer_merge {
		528	# simply override everything except _meta
		529	local $_[0]{_meta};
		530	%{$_[0]} = %{$_[1]};
		531	}
		532
508	sub _attach_cb($$$$) {	533	sub _attach_cb($$$$) {
509	my ($registry, $event, $prio, $cb) = @_;	534	my ($registry, $event, $prio, $cb) = @_;
510		535
511	use sort 'stable';	536	use sort 'stable';
512		537
…		…
683	# object support	708	# object support
684		709
685	sub reattach {	710	sub reattach {
686	# basically do the same as instantiate, without calling instantiate	711	# basically do the same as instantiate, without calling instantiate
687	my ($obj) = @_;	712	my ($obj) = @_;
		713
		714	bless $obj, ref $obj; # re-bless in case extensions have been reloaded
688		715
689	my $registry = $obj->registry;	716	my $registry = $obj->registry;
690		717
691	@$registry = ();	718	@$registry = ();
692		719
…		…
739	$filename, length $$rdata, scalar @$objs;	766	$filename, length $$rdata, scalar @$objs;
740		767
741	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	768	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
742	chmod SAVE_MODE, $fh;	769	chmod SAVE_MODE, $fh;
743	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	770	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
744	aio_fsync $fh;	771	aio_fsync $fh if $cf::USE_FSYNC;
745	close $fh;	772	close $fh;
746		773
747	if (@$objs) {	774	if (@$objs) {
748	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) {
749	chmod SAVE_MODE, $fh;	776	chmod SAVE_MODE, $fh;
750	my $data = Storable::nfreeze { version => 1, objs => $objs };	777	my $data = Storable::nfreeze { version => 1, objs => $objs };
751	aio_write $fh, 0, (length $data), $data, 0;	778	aio_write $fh, 0, (length $data), $data, 0;
752	aio_fsync $fh;	779	aio_fsync $fh if $cf::USE_FSYNC;
753	close $fh;	780	close $fh;
754	aio_rename "$filename.pst~", "$filename.pst";	781	aio_rename "$filename.pst~", "$filename.pst";
755	}	782	}
756	} else {	783	} else {
757	aio_unlink "$filename.pst";	784	aio_unlink "$filename.pst";
…		…
936	}	963	}
937		964
938	sub path($) {	965	sub path($) {
939	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];	966	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
940		967
941	(playerdir $login) . "/$login.pl"	968	(playerdir $login) . "/playerdata"
942	}	969	}
943		970
944	sub find_active($) {	971	sub find_active($) {
945	$cf::PLAYER{$_[0]}	972	$cf::PLAYER{$_[0]}
946	and $cf::PLAYER{$_[0]}->active	973	and $cf::PLAYER{$_[0]}->active
…		…
949		976
950	sub exists($) {	977	sub exists($) {
951	my ($login) = @_;	978	my ($login) = @_;
952		979
953	$cf::PLAYER{$login}	980	$cf::PLAYER{$login}
954	or cf::sync_job { !aio_stat $login }	981	or cf::sync_job { !aio_stat path $login }
955	}	982	}
956		983
957	sub find($) {	984	sub find($) {
958	return $cf::PLAYER{$_[0]} || do {	985	return $cf::PLAYER{$_[0]} || do {
959	my $login = $_[0];	986	my $login = $_[0];
960		987
961	my $guard = cf::lock_acquire "user_find:$login";	988	my $guard = cf::lock_acquire "user_find:$login";
962		989
963	$cf::PLAYER{$_[0]} || do {	990	$cf::PLAYER{$_[0]} || do {
		991	# rename old playerfiles to new ones
		992	#TODO: remove when no longer required
		993	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
		994	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
		995	aio_unlink +(playerdir $login) . "/$login.pl.pst";
		996	aio_unlink +(playerdir $login) . "/$login.pl";
		997
964	my $pl = load_pl path $login	998	my $pl = load_pl path $login
965	or return;	999	or return;
966	$cf::PLAYER{$login} = $pl	1000	$cf::PLAYER{$login} = $pl
967	}	1001	}
968	}	1002	}
…		…
1005		1039
1006	=cut	1040	=cut
1007		1041
1008	sub quit_character {	1042	sub quit_character {
1009	my ($pl) = @_;	1043	my ($pl) = @_;
		1044
		1045	my $name = $pl->ob->name;
1010		1046
1011	$pl->{deny_save} = 1;	1047	$pl->{deny_save} = 1;
1012	$pl->password ("*"); # this should lock out the player until we nuked the dir	1048	$pl->password ("*"); # this should lock out the player until we nuked the dir
1013		1049
1014	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1050	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
…		…
1019	my $path = playerdir $pl;	1055	my $path = playerdir $pl;
1020	my $temp = "$path~$cf::RUNTIME~deleting~";	1056	my $temp = "$path~$cf::RUNTIME~deleting~";
1021	aio_rename $path, $temp;	1057	aio_rename $path, $temp;
1022	delete $cf::PLAYER{$pl->ob->name};	1058	delete $cf::PLAYER{$pl->ob->name};
1023	$pl->destroy;	1059	$pl->destroy;
		1060
		1061	my $prefix = qr<^~\Q$name\E/>;
		1062
		1063	# nuke player maps
		1064	$cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
		1065
1024	IO::AIO::aio_rmtree $temp;	1066	IO::AIO::aio_rmtree $temp;
		1067	}
		1068
		1069	=item $pl->kick
		1070
		1071	Kicks a player out of the game. This destroys the connection.
		1072
		1073	=cut
		1074
		1075	sub kick {
		1076	my ($pl, $kicker) = @_;
		1077
		1078	$pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
		1079	$pl->killer ("kicked");
		1080	$pl->ns->destroy;
1025	}	1081	}
1026		1082
1027	=item cf::player::list_logins	1083	=item cf::player::list_logins
1028		1084
1029	Returns am arrayref of all valid playernames in the system, can take a	1085	Returns am arrayref of all valid playernames in the system, can take a
…		…
1057	=cut	1113	=cut
1058		1114
1059	sub maps($) {	1115	sub maps($) {
1060	my ($pl) = @_;	1116	my ($pl) = @_;
1061		1117
		1118	$pl = ref $pl ? $pl->ob->name : $pl;
		1119
1062	my $files = aio_readdir playerdir $pl	1120	my $files = aio_readdir playerdir $pl
1063	or return;	1121	or return;
1064		1122
1065	my @paths;	1123	my @paths;
1066		1124
1067	for (@$files) {	1125	for (@$files) {
1068	utf8::decode $_;	1126	utf8::decode $_;
1069	next if /\.(?:pl|pst)$/;	1127	next if /\.(?:pl|pst)$/;
1070	next unless /^$PATH_SEP/o;	1128	next unless /^$PATH_SEP/o;
1071		1129
1072	s/\.map$//;	1130	push @paths, cf::map::normalise "~$pl/$_";
1073	push @paths, "~" . $pl->ob->name . "/" . $_;
1074	}	1131	}
1075		1132
1076	\@paths	1133	\@paths
1077	}	1134	}
1078		1135
1079	=item $player->ext_reply ($msgid, $msgtype, %msg)	1136	=item $player->ext_reply ($msgid, %msg)
1080		1137
1081	Sends an ext reply to the player.	1138	Sends an ext reply to the player.
1082		1139
1083	=cut	1140	=cut
1084		1141
1085	sub ext_reply($$$%) {	1142	sub ext_reply($$%) {
1086	my ($self, $id, %msg) = @_;	1143	my ($self, $id, %msg) = @_;
1087		1144
1088	$msg{msgid} = $id;	1145	$msg{msgid} = $id;
1089		1146
1090	$self->send ("ext " . cf::to_json \%msg);	1147	$self->send ("ext " . cf::to_json \%msg);
		1148	}
		1149
		1150	=item $player->ext_event ($type, %msg)
		1151
		1152	Sends an ext event to the client.
		1153
		1154	=cut
		1155
		1156	sub ext_event($$%) {
		1157	my ($self, $type, %msg) = @_;
		1158
		1159	$self->ns->ext_event ($type, %msg);
1091	}	1160	}
1092		1161
1093	package cf;	1162	package cf;
1094		1163
1095	=back	1164	=back
…		…
1105		1174
1106	use Fcntl;	1175	use Fcntl;
1107	use Coro::AIO;	1176	use Coro::AIO;
1108		1177
1109	use overload	1178	use overload
1110	'""' => \&as_string;	1179	'""' => \&as_string,
		1180	fallback => 1;
1111		1181
1112	our $MAX_RESET = 3600;	1182	our $MAX_RESET = 3600;
1113	our $DEFAULT_RESET = 3000;	1183	our $DEFAULT_RESET = 3000;
1114		1184
1115	sub generate_random_map {	1185	sub generate_random_map {
1116	my ($self, $rmp) = @_;	1186	my ($self, $rmp) = @_;
1117
1118	# mit "rum" bekleckern, nicht	1187	# mit "rum" bekleckern, nicht
1119	$self->_create_random_map (	1188	$self->_create_random_map (
1120	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1189	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1121	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1190	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1122	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1191	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
…		…
1129	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},	1198	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1130	(cf::region::find $rmp->{region}), $rmp->{custom}	1199	(cf::region::find $rmp->{region}), $rmp->{custom}
1131	)	1200	)
1132	}	1201	}
1133		1202
		1203	=item cf::map->register ($regex, $prio)
		1204
		1205	Register a handler for the map path matching the given regex at the
		1206	givne priority (higher is better, built-in handlers have priority 0, the
		1207	default).
		1208
		1209	=cut
		1210
1134	sub register {	1211	sub register {
1135	my (undef, $regex) = @_;	1212	my (undef, $regex, $prio) = @_;
1136	my $pkg = caller;	1213	my $pkg = caller;
1137		1214
1138	no strict;	1215	no strict;
1139	push @{"$pkg\::ISA"}, __PACKAGE__;	1216	push @{"$pkg\::ISA"}, __PACKAGE__;
1140		1217
1141	$EXT_MAP{$pkg} = qr<$regex>;	1218	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1142	}	1219	}
1143		1220
1144	# also paths starting with '/'	1221	# also paths starting with '/'
1145	$EXT_MAP{"cf::map"} = qr{^(?=/)};	1222	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
		1223
		1224	sub thawer_merge {
		1225	my ($self, $merge) = @_;
		1226
		1227	# we have to keep some variables in memory intact
		1228	local $self->{path};
		1229	local $self->{load_path};
		1230	local $self->{deny_save};
		1231	local $self->{deny_reset};
		1232
		1233	$self->SUPER::thawer_merge ($merge);
		1234	}
1146		1235
1147	sub normalise {	1236	sub normalise {
1148	my ($path, $base) = @_;	1237	my ($path, $base) = @_;
		1238
		1239	$path = "$path"; # make sure its a string
		1240
		1241	$path =~ s/\.map$//;
1149		1242
1150	# map plan:	1243	# map plan:
1151	#	1244	#
1152	# /! non-realised random map exit (special hack!)	1245	# /! non-realised random map exit (special hack!)
1153	# {... are special paths that are not being touched	1246	# {... are special paths that are not being touched
…		…
1181		1274
1182	return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object	1275	return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1183		1276
1184	$path = normalise $path, $base;	1277	$path = normalise $path, $base;
1185		1278
1186	for my $pkg (keys %EXT_MAP) {	1279	for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1187	if ($path =~ $EXT_MAP{$pkg}) {	1280	if ($path =~ $EXT_MAP{$pkg}[1]) {
1188	my $self = bless cf::map::new, $pkg;	1281	my $self = bless cf::map::new, $pkg;
1189	$self->{path} = $path; $self->path ($path);	1282	$self->{path} = $path; $self->path ($path);
1190	$self->init; # pass $1 etc.	1283	$self->init; # pass $1 etc.
1191	return $self;	1284	return $self;
1192	}	1285	}
1193	}	1286	}
1194		1287
1195	Carp::carp "unable to resolve path '$path'.";	1288	Carp::carp "unable to resolve path '$path' (base '$base').";
1196	()	1289	()
1197	}	1290	}
1198		1291
1199	sub init {	1292	sub init {
1200	my ($self) = @_;	1293	my ($self) = @_;
…		…
1215		1308
1216	# the original (read-only) location	1309	# the original (read-only) location
1217	sub load_path {	1310	sub load_path {
1218	my ($self) = @_;	1311	my ($self) = @_;
1219		1312
1220	sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}	1313	sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1221	}	1314	}
1222		1315
1223	# the temporary/swap location	1316	# the temporary/swap location
1224	sub save_path {	1317	sub save_path {
1225	my ($self) = @_;	1318	my ($self) = @_;
1226		1319
1227	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1320	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1228	sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path	1321	sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1229	}	1322	}
1230		1323
1231	# the unique path, undef == no special unique path	1324	# the unique path, undef == no special unique path
1232	sub uniq_path {	1325	sub uniq_path {
1233	my ($self) = @_;	1326	my ($self) = @_;
…		…
1247		1340
1248	sub unlink_save {	1341	sub unlink_save {
1249	my ($self) = @_;	1342	my ($self) = @_;
1250		1343
1251	utf8::encode (my $save = $self->save_path);	1344	utf8::encode (my $save = $self->save_path);
1252	IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;	1345	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1253	IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";	1346	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1254	}	1347	}
1255		1348
1256	sub load_header_from($) {	1349	sub load_header_from($) {
1257	my ($self, $path) = @_;	1350	my ($self, $path) = @_;
1258		1351
1259	utf8::encode $path;	1352	utf8::encode $path;
1260	aio_open $path, O_RDONLY, 0	1353	#aio_open $path, O_RDONLY, 0
1261	or return;	1354	# or return;
1262		1355
1263	$self->_load_header ($path)	1356	$self->_load_header ($path)
1264	or return;	1357	or return;
1265		1358
1266	$self->{load_path} = $path;	1359	$self->{load_path} = $path;
1267		1360
1268	1	1361	1
1269	}	1362	}
1270		1363
1271	sub load_orig {	1364	sub load_header_orig {
1272	my ($self) = @_;	1365	my ($self) = @_;
1273		1366
1274	$self->load_header_from ($self->load_path)	1367	$self->load_header_from ($self->load_path)
1275	}	1368	}
1276		1369
1277	sub load_temp {	1370	sub load_header_temp {
1278	my ($self) = @_;	1371	my ($self) = @_;
1279		1372
1280	$self->load_header_from ($self->save_path)	1373	$self->load_header_from ($self->save_path)
		1374	}
		1375
		1376	sub prepare_temp {
		1377	my ($self) = @_;
		1378
		1379	$self->last_access ((delete $self->{last_access})
		1380	|| $cf::RUNTIME); #d#
		1381	# safety
		1382	$self->{instantiate_time} = $cf::RUNTIME
		1383	if $self->{instantiate_time} > $cf::RUNTIME;
		1384	}
		1385
		1386	sub prepare_orig {
		1387	my ($self) = @_;
		1388
		1389	$self->{load_original} = 1;
		1390	$self->{instantiate_time} = $cf::RUNTIME;
		1391	$self->last_access ($cf::RUNTIME);
		1392	$self->instantiate;
1281	}	1393	}
1282		1394
1283	sub load_header {	1395	sub load_header {
1284	my ($self) = @_;	1396	my ($self) = @_;
1285		1397
1286	if ($self->load_temp) {	1398	if ($self->load_header_temp) {
1287	$self->last_access ((delete $self->{last_access})	1399	$self->prepare_temp;
1288	|| $cf::RUNTIME); #d#
1289	# safety
1290	$self->{instantiate_time} = $cf::RUNTIME
1291	if $self->{instantiate_time} > $cf::RUNTIME;
1292	} else {	1400	} else {
1293	$self->load_orig	1401	$self->load_header_orig
1294	or return;	1402	or return;
1295		1403	$self->prepare_orig;
1296	$self->{load_original} = 1;
1297	$self->{instantiate_time} = $cf::RUNTIME;
1298	$self->last_access ($cf::RUNTIME);
1299	$self->instantiate;
1300	}	1404	}
1301		1405
1302	1	1406	1
1303	}	1407	}
1304		1408
…		…
1318	$map->{last_save} = $cf::RUNTIME;	1422	$map->{last_save} = $cf::RUNTIME;
1319		1423
1320	$map->load_header	1424	$map->load_header
1321	or return;	1425	or return;
1322		1426
1323	if ($map->should_reset) {	1427	if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
		1428	# doing this can freeze the server in a sync job, obviously
		1429	#$cf::WAIT_FOR_TICK->wait;
1324	$map->reset;	1430	$map->reset;
1325	undef $guard;	1431	undef $guard;
1326	$map = find $path	1432	return find $path;
1327	or return;
1328	}	1433	}
1329		1434
1330	$cf::MAP{$path} = $map	1435	$cf::MAP{$path} = $map
1331	}	1436	}
1332	}	1437	}
		1438
		1439	sub pre_load { }
		1440	sub post_load { }
1333		1441
1334	sub load {	1442	sub load {
1335	my ($self) = @_;	1443	my ($self) = @_;
1336		1444
		1445	local $self->{deny_reset} = 1; # loading can take a long time
		1446
1337	my $path = $self->{path};	1447	my $path = $self->{path};
1338	my $guard = cf::lock_acquire "map_load:$path";	1448	my $guard = cf::lock_acquire "map_load:$path";
1339		1449
1340	return if $self->in_memory != cf::MAP_SWAPPED;	1450	return if $self->in_memory != cf::MAP_SWAPPED;
1341		1451
1342	$self->in_memory (cf::MAP_LOADING);	1452	$self->in_memory (cf::MAP_LOADING);
1343		1453
1344	$self->alloc;	1454	$self->alloc;
		1455
		1456	$self->pre_load;
		1457
1345	$self->_load_objects ($self->{load_path}, 1)	1458	$self->_load_objects ($self->{load_path}, 1)
1346	or return;	1459	or return;
1347		1460
1348	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1461	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1349	if delete $self->{load_original};	1462	if delete $self->{load_original};
…		…
1371	unless $self->difficulty;	1484	unless $self->difficulty;
1372	Coro::cede;	1485	Coro::cede;
1373	$self->activate;	1486	$self->activate;
1374	}	1487	}
1375		1488
		1489	$self->post_load;
		1490
1376	$self->in_memory (cf::MAP_IN_MEMORY);	1491	$self->in_memory (cf::MAP_IN_MEMORY);
1377	}	1492	}
1378		1493
1379	sub customise_for {	1494	sub customise_for {
1380	my ($self, $ob) = @_;	1495	my ($self, $ob) = @_;
…		…
1420		1535
1421	cf::sync_job { $map->load };	1536	cf::sync_job { $map->load };
1422	}	1537	}
1423		1538
1424	our %MAP_PREFETCH;	1539	our %MAP_PREFETCH;
1425	our $MAP_PREFETCHER = Coro::async {	1540	our $MAP_PREFETCHER = undef;
1426	while () {
1427	for my $path (keys %MAP_PREFETCH) {
1428	my $map = find $path
1429	or next;
1430	$map->load;
1431
1432	delete $MAP_PREFETCH{$path};
1433	}
1434	Coro::schedule;
1435	}
1436	};
1437		1541
1438	sub find_async {	1542	sub find_async {
1439	my ($path, $origin) = @_;	1543	my ($path, $origin) = @_;
1440		1544
1441	$path = normalise $path, $origin && $origin->{path};	1545	$path = normalise $path, $origin && $origin->{path};
1442		1546
1443	if (my $map = $cf::MAP{$path}) {	1547	if (my $map = $cf::MAP{$path}) {
1444	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	1548	return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1445	}	1549	}
1446		1550
1447	$MAP_PREFETCH{$path} = 0;	1551	undef $MAP_PREFETCH{$path};
		1552	$MAP_PREFETCHER ||= cf::async {
		1553	while (%MAP_PREFETCH) {
		1554	for my $path (keys %MAP_PREFETCH) {
		1555	my $map = find $path
		1556	or next;
		1557	$map->load;
		1558
		1559	delete $MAP_PREFETCH{$path};
		1560	}
		1561	}
		1562	undef $MAP_PREFETCHER;
		1563	};
1448	$MAP_PREFETCHER->ready;	1564	$MAP_PREFETCHER->prio (6);
1449		1565
1450	()	1566	()
1451	}	1567	}
1452		1568
1453	sub save {	1569	sub save {
…		…
1498		1614
1499	sub reset_at {	1615	sub reset_at {
1500	my ($self) = @_;	1616	my ($self) = @_;
1501		1617
1502	# TODO: safety, remove and allow resettable per-player maps	1618	# TODO: safety, remove and allow resettable per-player maps
1503	return 1e99 if $self->isa ("ext::map_per_player");	1619	return 1e99 if $self->isa ("ext::map_per_player");#d#
1504	return 1e99 if $self->{deny_reset};	1620	return 1e99 if $self->{deny_reset};
1505		1621
1506	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;	1622	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1507	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;	1623	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1508		1624
…		…
1513	my ($self) = @_;	1629	my ($self) = @_;
1514		1630
1515	$self->reset_at <= $cf::RUNTIME	1631	$self->reset_at <= $cf::RUNTIME
1516	}	1632	}
1517		1633
1518	sub rename {
1519	my ($self, $new_path) = @_;
1520
1521	normalise $new_path;
1522
1523	$self->unlink_save;
1524
1525	delete $cf::MAP{$self->path};
1526	$self->{path} = $new_path; $self->path ($self->{path});
1527	$cf::MAP{$self->path} = $self;
1528
1529	$self->save;
1530	}
1531
1532	sub reset {	1634	sub reset {
1533	my ($self) = @_;	1635	my ($self) = @_;
1534		1636
1535	my $lock = cf::lock_acquire "map_data:$self->{path}";	1637	my $lock = cf::lock_acquire "map_data:$self->{path}";
1536		1638
1537	return if $self->players;	1639	return if $self->players;
1538	return if $self->isa ("ext::map_per_player");#d#	1640	return if $self->isa ("ext::map_per_player");#d#
1539		1641
1540	warn "resetting map ", $self->path;#d#	1642	warn "resetting map ", $self->path;#d#
1541		1643
		1644	$self->in_memory (cf::MAP_SWAPPED);
		1645
		1646	# need to save uniques path
		1647	unless ($self->{deny_save}) {
		1648	my $uniq = $self->uniq_path; utf8::encode $uniq;
		1649
		1650	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		1651	if $uniq;
		1652	}
		1653
1542	delete $cf::MAP{$self->path};	1654	delete $cf::MAP{$self->path};
1543		1655
1544	$self->in_memory (cf::MAP_SWAPPED);
1545	$self->clear;	1656	$self->clear;
1546		1657
1547	$_->clear_links_to ($self) for values %cf::MAP;	1658	$_->clear_links_to ($self) for values %cf::MAP;
1548		1659
1549	$self->unlink_save;	1660	$self->unlink_save;
…		…
1553	my $nuke_counter = "aaaa";	1664	my $nuke_counter = "aaaa";
1554		1665
1555	sub nuke {	1666	sub nuke {
1556	my ($self) = @_;	1667	my ($self) = @_;
1557		1668
		1669	delete $cf::MAP{$self->path};
		1670
		1671	$self->unlink_save;
		1672
		1673	bless $self, "cf::map";
		1674	delete $self->{deny_reset};
1558	$self->{deny_save} = 1;	1675	$self->{deny_save} = 1;
1559	$self->reset_timeout (1);	1676	$self->reset_timeout (1);
1560	$self->rename ("{nuke}/" . ($nuke_counter++));	1677	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
		1678
		1679	$cf::MAP{$self->path} = $self;
		1680
1561	$self->reset; # polite request, might not happen	1681	$self->reset; # polite request, might not happen
1562	}	1682	}
1563		1683
1564	=item cf::map::unique_maps	1684	=item cf::map::unique_maps
1565		1685
…		…
1577	for (@$files) {	1697	for (@$files) {
1578	utf8::decode $_;	1698	utf8::decode $_;
1579	next if /\.pst$/;	1699	next if /\.pst$/;
1580	next unless /^$PATH_SEP/o;	1700	next unless /^$PATH_SEP/o;
1581		1701
1582	s/\.map$//;	1702	push @paths, cf::map::normalise $_;
1583	push @paths, $_;
1584	}	1703	}
1585		1704
1586	\@paths	1705	\@paths
1587	}	1706	}
1588		1707
…		…
1682	=cut	1801	=cut
1683		1802
1684	sub link_map {	1803	sub link_map {
1685	unless ($LINK_MAP) {	1804	unless ($LINK_MAP) {
1686	$LINK_MAP = cf::map::find "{link}"	1805	$LINK_MAP = cf::map::find "{link}"
1687	or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };	1806	or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1688	$LINK_MAP->load;	1807	$LINK_MAP->load;
1689	}	1808	}
1690		1809
1691	$LINK_MAP	1810	$LINK_MAP
1692	}	1811	}
…		…
1699	return if UNIVERSAL::isa $self->map, "ext::map_link";	1818	return if UNIVERSAL::isa $self->map, "ext::map_link";
1700		1819
1701	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	1820	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1702	if $self->map;	1821	if $self->map;
1703		1822
1704	$self->enter_map ($LINK_MAP || link_map, 20, 20);	1823	$self->enter_map ($LINK_MAP || link_map, 10, 10);
1705	}	1824	}
1706		1825
1707	sub cf::object::player::leave_link {	1826	sub cf::object::player::leave_link {
1708	my ($self, $map, $x, $y) = @_;	1827	my ($self, $map, $x, $y) = @_;
1709		1828
…		…
1731	$map->load;	1850	$map->load;
1732	$map->load_diag;	1851	$map->load_diag;
1733		1852
1734	return unless $self->contr->active;	1853	return unless $self->contr->active;
1735	$self->activate_recursive;	1854	$self->activate_recursive;
		1855
		1856	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1736	$self->enter_map ($map, $x, $y);	1857	$self->enter_map ($map, $x, $y);
1737	}	1858	}
1738		1859
1739	cf::player->attach (	1860	cf::player->attach (
1740	on_logout => sub {	1861	on_logout => sub {
…		…
1753	# try to abort aborted map switching on player login :)	1874	# try to abort aborted map switching on player login :)
1754	# should happen only on crashes	1875	# should happen only on crashes
1755	if ($pl->ob->{_link_pos}) {	1876	if ($pl->ob->{_link_pos}) {
1756	$pl->ob->enter_link;	1877	$pl->ob->enter_link;
1757	(async {	1878	(async {
1758	# we need this sleep as the login has a concurrent enter_exit running
1759	# and this sleep increases chances of the player not ending up in scorn
1760	$pl->ob->reply (undef,	1879	$pl->ob->reply (undef,
1761	"There was an internal problem at your last logout, "	1880	"There was an internal problem at your last logout, "
1762	. "the server will try to bring you to your intended destination in a second.",	1881	. "the server will try to bring you to your intended destination in a second.",
1763	cf::NDI_RED);	1882	cf::NDI_RED);
		1883	# we need this sleep as the login has a concurrent enter_exit running
		1884	# and this sleep increases chances of the player not ending up in scorn
1764	Coro::Timer::sleep 1;	1885	Coro::Timer::sleep 1;
1765	$pl->ob->leave_link;	1886	$pl->ob->leave_link;
1766	})->prio (2);	1887	})->prio (2);
1767	}	1888	}
1768	},	1889	},
…		…
1776	my ($self, $path, $x, $y) = @_;	1897	my ($self, $path, $x, $y) = @_;
1777		1898
1778	$self->enter_link;	1899	$self->enter_link;
1779		1900
1780	(async {	1901	(async {
		1902	my $map = eval {
1781	my $map = cf::map::find $path;	1903	my $map = cf::map::find $path;
1782	$map = $map->customise_for ($self) if $map;	1904	$map = $map->customise_for ($self) if $map;
1783		1905	$map
1784	# warn "entering ", $map->path, " at ($x, $y)\n"	1906	} or
1785	# if $map;
1786
1787	$map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	1907	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1788		1908
1789	$self->leave_link ($map, $x, $y);	1909	$self->leave_link ($map, $x, $y);
1790	})->prio (1);	1910	})->prio (1);
1791	}	1911	}
1792		1912
…		…
1796		1916
1797	sub parse_random_map_params {	1917	sub parse_random_map_params {
1798	my ($spec) = @_;	1918	my ($spec) = @_;
1799		1919
1800	my $rmp = { # defaults	1920	my $rmp = { # defaults
1801	xsize => 10,	1921	xsize => (cf::rndm 15, 40),
1802	ysize => 10,	1922	ysize => (cf::rndm 15, 40),
		1923	symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
		1924	#layout => string,
1803	};	1925	};
1804		1926
1805	for (split /\n/, $spec) {	1927	for (split /\n/, $spec) {
1806	my ($k, $v) = split /\s+/, $_, 2;	1928	my ($k, $v) = split /\s+/, $_, 2;
1807		1929
…		…
1811	$rmp	1933	$rmp
1812	}	1934	}
1813		1935
1814	sub prepare_random_map {	1936	sub prepare_random_map {
1815	my ($exit) = @_;	1937	my ($exit) = @_;
		1938
		1939	my $guard = cf::lock_acquire "exit_prepare:$exit";
1816		1940
1817	# all this does is basically replace the /! path by	1941	# all this does is basically replace the /! path by
1818	# a new random map path (?random/...) with a seed	1942	# a new random map path (?random/...) with a seed
1819	# that depends on the exit object	1943	# that depends on the exit object
1820		1944
1821	my $rmp = parse_random_map_params $exit->msg;	1945	my $rmp = parse_random_map_params $exit->msg;
1822		1946
1823	if ($exit->map) {	1947	if ($exit->map) {
1824	$rmp->{region} = $exit->map->region_name;	1948	$rmp->{region} = $exit->region->name;
1825	$rmp->{origin_map} = $exit->map->path;	1949	$rmp->{origin_map} = $exit->map->path;
1826	$rmp->{origin_x} = $exit->x;	1950	$rmp->{origin_x} = $exit->x;
1827	$rmp->{origin_y} = $exit->y;	1951	$rmp->{origin_y} = $exit->y;
1828	}	1952	}
1829		1953
1830	$rmp->{random_seed} ||= $exit->random_seed;	1954	$rmp->{random_seed} ||= $exit->random_seed;
1831		1955
1832	my $data = cf::to_json $rmp;	1956	my $data = cf::to_json $rmp;
1833	my $md5 = Digest::MD5::md5_hex $data;	1957	my $md5 = Digest::MD5::md5_hex $data;
		1958	my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1834		1959
1835	if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) {	1960	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1836	aio_write $fh, 0, (length $data), $data, 0;	1961	aio_write $fh, 0, (length $data), $data, 0;
		1962	undef $fh;
		1963	aio_rename "$meta~", $meta;
1837		1964
1838	$exit->slaying ("?random/$md5");	1965	$exit->slaying ("?random/$md5");
1839	$exit->msg (undef);	1966	$exit->msg (undef);
1840	}	1967	}
1841	}	1968	}
1842		1969
1843	sub cf::object::player::enter_exit {	1970	sub cf::object::player::enter_exit {
1844	my ($self, $exit) = @_;	1971	my ($self, $exit) = @_;
1845		1972
1846	return unless $self->type == cf::PLAYER;	1973	return unless $self->type == cf::PLAYER;
		1974
		1975	if ($exit->slaying eq "/!") {
		1976	#TODO: this should de-fi-ni-te-ly not be a sync-job
		1977	# the problem is that $exit might not survive long enough
		1978	# so it needs to be done right now, right here
		1979	cf::sync_job { prepare_random_map $exit };
		1980	}
		1981
		1982	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
		1983	my $hp = $exit->stats->hp;
		1984	my $sp = $exit->stats->sp;
1847		1985
1848	$self->enter_link;	1986	$self->enter_link;
1849		1987
1850	(async {	1988	(async {
1851	$self->deactivate_recursive; # just to be sure	1989	$self->deactivate_recursive; # just to be sure
1852	unless (eval {	1990	unless (eval {
1853	prepare_random_map $exit	1991	$self->goto ($slaying, $hp, $sp);
1854	if $exit->slaying eq "/!";
1855
1856	my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1857	$self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1858		1992
1859	1;	1993	1;
1860	}) {	1994	}) {
1861	$self->message ("Something went wrong deep within the crossfire server. "	1995	$self->message ("Something went wrong deep within the crossfire server. "
1862	. "I'll try to bring you back to the map you were before. "	1996	. "I'll try to bring you back to the map you were before. "
1863	. "Please report this to the dungeon master!",	1997	. "Please report this to the dungeon master!",
1864	cf::NDI_UNIQUE | cf::NDI_RED);	1998	cf::NDI_UNIQUE | cf::NDI_RED);
1865		1999
1866	warn "ERROR in enter_exit: $@";	2000	warn "ERROR in enter_exit: $@";
1867	$self->leave_link;	2001	$self->leave_link;
1868	}	2002	}
1869	})->prio (1);	2003	})->prio (1);
…		…
1882		2016
1883	sub cf::client::send_drawinfo {	2017	sub cf::client::send_drawinfo {
1884	my ($self, $text, $flags) = @_;	2018	my ($self, $text, $flags) = @_;
1885		2019
1886	utf8::encode $text;	2020	utf8::encode $text;
1887	$self->send_packet (sprintf "drawinfo %d %s", $flags, $text);	2021	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1888	}	2022	}
1889		2023
		2024	=item $client->ext_event ($type, %msg)
		2025
		2026	Sends an exti event to the client.
		2027
		2028	=cut
		2029
		2030	sub cf::client::ext_event($$%) {
		2031	my ($self, $type, %msg) = @_;
		2032
		2033	$msg{msgtype} = "event_$type";
		2034	$self->send_packet ("ext " . cf::to_json \%msg);
		2035	}
1890		2036
1891	=item $success = $client->query ($flags, "text", \&cb)	2037	=item $success = $client->query ($flags, "text", \&cb)
1892		2038
1893	Queues a query to the client, calling the given callback with	2039	Queues a query to the client, calling the given callback with
1894	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2040	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
…		…
1923	# get handled first	2069	# get handled first
1924	my $queue = delete $ns->{query_queue}	2070	my $queue = delete $ns->{query_queue}
1925	or return; # be conservative, not sure how that can happen, but we saw a crash here	2071	or return; # be conservative, not sure how that can happen, but we saw a crash here
1926		2072
1927	(shift @$queue)->[1]->($msg);	2073	(shift @$queue)->[1]->($msg);
		2074	return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1928		2075
1929	push @{ $ns->{query_queue} }, @$queue;	2076	push @{ $ns->{query_queue} }, @$queue;
1930		2077
1931	if (@{ $ns->{query_queue} } == @$queue) {	2078	if (@{ $ns->{query_queue} } == @$queue) {
1932	if (@$queue) {	2079	if (@$queue) {
…		…
1990		2137
1991	# here we export the classes and methods available to script code	2138	# here we export the classes and methods available to script code
1992		2139
1993	=pod	2140	=pod
1994		2141
1995	The following fucntions and emthods are available within a safe environment:	2142	The following functions and methods are available within a safe environment:
1996		2143
1997	cf::object contr pay_amount pay_player map	2144	cf::object contr pay_amount pay_player map
1998	cf::object::player player	2145	cf::object::player player
1999	cf::player peaceful	2146	cf::player peaceful
2000	cf::map trigger	2147	cf::map trigger
…		…
2093	The parameter C<$family> should best start with the name of the extension	2240	The parameter C<$family> should best start with the name of the extension
2094	using it, it should be unique.	2241	using it, it should be unique.
2095		2242
2096	=over 4	2243	=over 4
2097		2244
2098	=item $hashref = cf::db_get $family
2099
2100	Return a hashref for use by the extension C<$family>, which can be
2101	modified. After modifications, you have to call C<cf::db_dirty> or
2102	C<cf::db_sync>.
2103
2104	=item $value = cf::db_get $family => $key	2245	=item $value = cf::db_get $family => $key
2105		2246
2106	Returns a single value from the database	2247	Returns a single value from the database.
2107
2108	=item cf::db_put $family => $hashref
2109
2110	Stores the given family hashref into the database. Updates are delayed, if
2111	you want the data to be synced to disk immediately, use C<cf::db_sync>.
2112		2248
2113	=item cf::db_put $family => $key => $value	2249	=item cf::db_put $family => $key => $value
2114		2250
2115	Stores the given C<$value> in the family hash. Updates are delayed, if you	2251	Stores the given C<$value> in the family.
2116	want the data to be synced to disk immediately, use C<cf::db_sync>.
2117
2118	=item cf::db_dirty
2119
2120	Marks the database as dirty, to be updated at a later time.
2121
2122	=item cf::db_sync
2123
2124	Immediately write the database to disk I<if it is dirty>.
2125		2252
2126	=cut	2253	=cut
2127		2254
2128	our $DB;	2255	our $DB;
2129		2256
2130	{	2257	sub db_init {
		2258	unless ($DB) {
		2259	$DB = BDB::db_create $DB_ENV;
		2260
		2261	cf::sync_job {
		2262	eval {
		2263	$DB->set_flags (BDB::CHKSUM);
		2264
		2265	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
		2266	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		2267	cf::cleanup "db_open(db): $!" if $!;
		2268	};
		2269	cf::cleanup "db_open(db): $@" if $@;
		2270	};
		2271
2131	my $path = cf::localdir . "/database.pst";	2272	my $path = cf::localdir . "/database.pst";
		2273	if (stat $path) {
		2274	cf::sync_job {
		2275	my $pst = Storable::retrieve $path;
2132		2276
2133	sub db_load() {	2277	cf::db_put (board => data => $pst->{board});
2134	$DB = stat $path ? Storable::retrieve $path : { };	2278	cf::db_put (guildrules => data => $pst->{guildrules});
2135	}	2279	cf::db_put (rent => balance => $pst->{rent}{balance});
		2280	BDB::db_env_txn_checkpoint $DB_ENV;
2136		2281
2137	my $pid;	2282	unlink $path;
2138
2139	sub db_save() {
2140	waitpid $pid, 0 if $pid;
2141	if (0 == ($pid = fork)) {
2142	$DB->{_meta}{version} = 1;
2143	Storable::nstore $DB, "$path~";
2144	rename "$path~", $path;
2145	cf::_exit 0 if defined $pid;
2146	}	2283	};
2147	}	2284	}
2148
2149	my $dirty;
2150
2151	sub db_sync() {
2152	db_save if $dirty;
2153	undef $dirty;
2154	}
2155
2156	my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2157	db_sync;
2158	});	2285	}
		2286	}
2159		2287
2160	sub db_dirty() {
2161	$dirty = 1;
2162	$idle->start;
2163	}
2164
2165	sub db_get($;$) {	2288	sub db_get($$) {
2166	@_ >= 2	2289	my $key = "$_[0]/$_[1]";
2167	? $DB->{$_[0]}{$_[1]}
2168	: ($DB->{$_[0]} ||= { })
2169	}
2170		2290
		2291	cf::sync_job {
		2292	BDB::db_get $DB, undef, $key, my $data;
		2293
		2294	$! ? ()
		2295	: Compress::LZF::sthaw $data
		2296	}
		2297	}
		2298
2171	sub db_put($$;$) {	2299	sub db_put($$$) {
2172	if (@_ >= 3) {	2300	BDB::dbreq_pri 4;
2173	$DB->{$_[0]}{$_[1]} = $_[2];	2301	BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
		2302	}
		2303
		2304	#############################################################################
		2305	# the server's init and main functions
		2306
		2307	sub load_facedata {
		2308	my $path = sprintf "%s/facedata", cf::datadir;
		2309
		2310	warn "loading facedata from $path\n";
		2311
		2312	my $faces;
		2313	0 < aio_load $path, $faces
		2314	or die "$path: $!";
		2315
		2316	Coro::cede;
		2317	$faces = Storable::thaw $faces;
		2318	Coro::cede;
		2319
		2320	my $meta = delete $faces->{""};
		2321	$meta->{version} == 1
		2322	or cf::cleanup "$path: version mismatch, cannot proceed.";
		2323
		2324	while (my ($face, $info) = each %$faces) {
		2325	my $idx = (cf::face::find $face) || cf::face::alloc $face;
		2326	cf::face::set $idx, $info->{visibility}, $info->{magicmap};
		2327	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
		2328	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
		2329	Coro::cede;
		2330	}
		2331
		2332	while (my ($face, $info) = each %$faces) {
		2333	next unless $info->{smooth};
		2334	my $idx = cf::face::find $face
		2335	or next;
		2336	if (my $smooth = cf::face::find $info->{smooth}) {
		2337	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2174	} else {	2338	} else {
2175	$DB->{$_[0]} = $_[1];	2339	warn "smooth face '$info->{smooth}' not found for face '$face'";
2176	}
2177	db_dirty;
2178	}
2179
2180	cf::global->attach (
2181	prio => 10000,
2182	on_cleanup => sub {
2183	db_sync;
2184	},	2340	}
2185	);	2341	Coro::cede;
2186	}	2342	}
2187		2343
2188	#############################################################################	2344	1
2189	# the server's main()	2345	}
		2346
		2347	sub reload_resources {
		2348	load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
		2349	or die "unable to load regions file\n";#d#
		2350	load_facedata
		2351	or die "unable to load facedata\n";#d#
		2352	}
		2353
		2354	sub init {
		2355	reload_resources;
		2356	}
2190		2357
2191	sub cfg_load {	2358	sub cfg_load {
2192	open my $fh, "<:utf8", cf::confdir . "/config"	2359	open my $fh, "<:utf8", cf::confdir . "/config"
2193	or return;	2360	or return;
2194		2361
…		…
2211		2378
2212	sub main {	2379	sub main {
2213	# we must not ever block the main coroutine	2380	# we must not ever block the main coroutine
2214	local $Coro::idle = sub {	2381	local $Coro::idle = sub {
2215	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	2382	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
		2383	(async {
2216	async { Event::one_event };	2384	Event::one_event;
		2385	})->prio (Coro::PRIO_MAX);
2217	};	2386	};
2218		2387
2219	cfg_load;	2388	cfg_load;
2220	db_load;	2389	db_init;
2221	load_extensions;	2390	load_extensions;
		2391
		2392	$TICK_WATCHER->start;
2222	Event::loop;	2393	Event::loop;
2223	}	2394	}
2224		2395
2225	#############################################################################	2396	#############################################################################
2226	# initialisation and cleanup	2397	# initialisation and cleanup
2227		2398
2228	# install some emergency cleanup handlers	2399	# install some emergency cleanup handlers
2229	BEGIN {	2400	BEGIN {
2230	for my $signal (qw(INT HUP TERM)) {	2401	for my $signal (qw(INT HUP TERM)) {
2231	Event->signal (	2402	Event->signal (
		2403	reentrant => 0,
2232	data => WF_AUTOCANCEL,	2404	data => WF_AUTOCANCEL,
2233	signal => $signal,	2405	signal => $signal,
		2406	prio => 0,
2234	cb => sub {	2407	cb => sub {
2235	cf::cleanup "SIG$signal";	2408	cf::cleanup "SIG$signal";
2236	},	2409	},
2237	);	2410	);
2238	}	2411	}
2239	}	2412	}
…		…
2260	my $map = $cf::MAP{$path} or next;	2433	my $map = $cf::MAP{$path} or next;
2261	$map->valid or next;	2434	$map->valid or next;
2262	$map->save;	2435	$map->save;
2263	}	2436	}
2264	warn "end emergency map save\n";	2437	warn "end emergency map save\n";
		2438
		2439	warn "begin emergency database checkpoint\n";
		2440	BDB::db_env_txn_checkpoint $DB_ENV;
		2441	warn "end emergency database checkpoint\n";
2265	};	2442	};
2266		2443
2267	warn "leave emergency perl save\n";	2444	warn "leave emergency perl save\n";
		2445	}
		2446
		2447	sub post_cleanup {
		2448	my ($make_core) = @_;
		2449
		2450	warn Carp::longmess "post_cleanup backtrace"
		2451	if $make_core;
2268	}	2452	}
2269		2453
2270	sub reload() {	2454	sub reload() {
2271	# can/must only be called in main	2455	# can/must only be called in main
2272	if ($Coro::current != $Coro::main) {	2456	if ($Coro::current != $Coro::main) {
2273	warn "can only reload from main coroutine\n";	2457	warn "can only reload from main coroutine";
2274	return;	2458	return;
2275	}	2459	}
2276		2460
2277	warn "reloading...";	2461	warn "reloading...";
2278		2462
2279	warn "freezing server";	2463	warn "entering sync_job";
2280	my $guard = freeze_mainloop;	2464
		2465	cf::sync_job {
		2466	cf::write_runtime; # external watchdog should not bark
2281	cf::emergency_save;	2467	cf::emergency_save;
		2468	cf::write_runtime; # external watchdog should not bark
2282		2469
2283	warn "sync database to disk";	2470	warn "syncing database to disk";
2284	cf::db_sync;	2471	BDB::db_env_txn_checkpoint $DB_ENV;
2285	IO::AIO::flush;
2286		2472
2287	eval {
2288	# if anything goes wrong in here, we should simply crash as we already saved	2473	# if anything goes wrong in here, we should simply crash as we already saved
2289		2474
2290	warn "cancel all watchers";	2475	warn "cancelling all WF_AUTOCANCEL watchers";
2291	for (Event::all_watchers) {	2476	for (Event::all_watchers) {
2292	$_->cancel if $_->data & WF_AUTOCANCEL;	2477	$_->cancel if $_->data & WF_AUTOCANCEL;
2293	}	2478	}
2294		2479
		2480	warn "flushing outstanding aio requests";
		2481	for (;;) {
		2482	BDB::flush;
		2483	IO::AIO::flush;
		2484	Coro::cede;
		2485	last unless IO::AIO::nreqs || BDB::nreqs;
		2486	warn "iterate...";
		2487	}
		2488
		2489	++$RELOAD;
		2490
2295	warn "cancel all extension coros";	2491	warn "cancelling all extension coros";
2296	$_->cancel for values %EXT_CORO;	2492	$_->cancel for values %EXT_CORO;
2297	%EXT_CORO = ();	2493	%EXT_CORO = ();
2298		2494
2299	warn "remove commands";	2495	warn "removing commands";
2300	%COMMAND = ();	2496	%COMMAND = ();
2301		2497
2302	warn "remove ext commands";	2498	warn "removing ext commands";
2303	%EXTCMD = ();	2499	%EXTCMD = ();
2304		2500
2305	warn "unload/nuke all extensions";	2501	warn "unloading/nuking all extensions";
2306	for my $pkg (@EXTS) {	2502	for my $pkg (@EXTS) {
2307	warn "... unloading $pkg";	2503	warn "... unloading $pkg";
2308		2504
2309	if (my $cb = $pkg->can ("unload")) {	2505	if (my $cb = $pkg->can ("unload")) {
2310	eval {	2506	eval {
…		…
2315		2511
2316	warn "... nuking $pkg";	2512	warn "... nuking $pkg";
2317	Symbol::delete_package $pkg;	2513	Symbol::delete_package $pkg;
2318	}	2514	}
2319		2515
2320	warn "unload all perl modules loaded from $LIBDIR";	2516	warn "unloading all perl modules loaded from $LIBDIR";
2321	while (my ($k, $v) = each %INC) {	2517	while (my ($k, $v) = each %INC) {
2322	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	2518	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2323		2519
2324	warn "removing <$k>";	2520	warn "... unloading $k";
2325	delete $INC{$k};	2521	delete $INC{$k};
2326		2522
2327	$k =~ s/\.pm$//;	2523	$k =~ s/\.pm$//;
2328	$k =~ s/\//::/g;	2524	$k =~ s/\//::/g;
2329		2525
…		…
2332	}	2528	}
2333		2529
2334	Symbol::delete_package $k;	2530	Symbol::delete_package $k;
2335	}	2531	}
2336		2532
2337	warn "get rid of safe::, as good as possible";	2533	warn "getting rid of safe::, as good as possible";
2338	Symbol::delete_package "safe::$_"	2534	Symbol::delete_package "safe::$_"
2339	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	2535	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2340		2536
2341	warn "unload cf.pm \"a bit\"";	2537	warn "unloading cf.pm \"a bit\"";
2342	delete $INC{"cf.pm"};	2538	delete $INC{"cf.pm"};
2343		2539
2344	# don't, removes xs symbols, too,	2540	# don't, removes xs symbols, too,
2345	# and global variables created in xs	2541	# and global variables created in xs
2346	#Symbol::delete_package __PACKAGE__;	2542	#Symbol::delete_package __PACKAGE__;
2347		2543
		2544	warn "unload completed, starting to reload now";
		2545
2348	warn "reloading cf.pm";	2546	warn "reloading cf.pm";
2349	require cf;	2547	require cf;
2350	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	2548	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2351		2549
2352	warn "load config and database again";	2550	warn "loading config and database again";
2353	cf::cfg_load;	2551	cf::cfg_load;
2354	cf::db_load;
2355		2552
2356	warn "load extensions";	2553	warn "loading extensions";
2357	cf::load_extensions;	2554	cf::load_extensions;
2358		2555
2359	warn "reattach attachments to objects/players";	2556	warn "reattaching attachments to objects/players";
2360	_global_reattach;	2557	_global_reattach; # objects, sockets
2361	warn "reattach attachments to maps";	2558	warn "reattaching attachments to maps";
2362	reattach $_ for values %MAP;	2559	reattach $_ for values %MAP;
2363	};	2560	warn "reattaching attachments to players";
		2561	reattach $_ for values %PLAYER;
2364		2562
2365	if ($@) {	2563	warn "loading reloadable resources";
		2564	reload_resources;
		2565
		2566	warn "leaving sync_job";
		2567
		2568	1
		2569	} or do {
2366	warn $@;	2570	warn $@;
2367	warn "error while reloading, exiting.";	2571	warn "error while reloading, exiting.";
2368	exit 1;	2572	exit 1;
2369	}	2573	};
2370		2574
2371	warn "reloaded";	2575	warn "reloaded";
2372	};	2576	};
2373		2577
		2578	our $RELOAD_WATCHER; # used only during reload
		2579
2374	register_command "reload" => sub {	2580	register_command "reload" => sub {
2375	my ($who, $arg) = @_;	2581	my ($who, $arg) = @_;
2376		2582
2377	if ($who->flag (FLAG_WIZ)) {	2583	if ($who->flag (FLAG_WIZ)) {
2378	$who->message ("start of reload.");	2584	$who->message ("reloading server.");
		2585
		2586	# doing reload synchronously and two reloads happen back-to-back,
		2587	# coro crashes during coro_state_free->destroy here.
		2588
		2589	$RELOAD_WATCHER ||= Event->timer (
		2590	reentrant => 0,
		2591	after => 0,
		2592	data => WF_AUTOCANCEL,
		2593	cb => sub {
2379	reload;	2594	reload;
2380	$who->message ("end of reload.");	2595	undef $RELOAD_WATCHER;
		2596	},
		2597	);
2381	}	2598	}
2382	};	2599	};
2383		2600
2384	unshift @INC, $LIBDIR;	2601	unshift @INC, $LIBDIR;
		2602
		2603	my $bug_warning = 0;
2385		2604
2386	$TICK_WATCHER = Event->timer (	2605	$TICK_WATCHER = Event->timer (
2387	reentrant => 0,	2606	reentrant => 0,
		2607	parked => 1,
2388	prio => 0,	2608	prio => 0,
2389	at => $NEXT_TICK || $TICK,	2609	at => $NEXT_TICK || $TICK,
2390	data => WF_AUTOCANCEL,	2610	data => WF_AUTOCANCEL,
2391	cb => sub {	2611	cb => sub {
		2612	if ($Coro::current != $Coro::main) {
		2613	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
		2614	unless ++$bug_warning > 10;
		2615	return;
		2616	}
		2617
2392	$NOW = Event::time;	2618	$NOW = Event::time;
2393		2619
2394	cf::server_tick; # one server iteration	2620	cf::server_tick; # one server iteration
2395	$RUNTIME += $TICK;	2621	$RUNTIME += $TICK;
2396	$NEXT_TICK += $TICK;	2622	$NEXT_TICK += $TICK;
2397		2623
		2624	if ($NOW >= $NEXT_RUNTIME_WRITE) {
		2625	$NEXT_RUNTIME_WRITE = $NOW + 10;
		2626	Coro::async_pool {
		2627	write_runtime
		2628	or warn "ERROR: unable to write runtime file: $!";
		2629	};
		2630	}
		2631
2398	$WAIT_FOR_TICK->broadcast;	2632	$WAIT_FOR_TICK->broadcast;
2399	$WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;	2633	$WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
		2634
		2635	# my $AFTER = Event::time;
		2636	# warn $AFTER - $NOW;#d#
2400		2637
2401	# if we are delayed by four ticks or more, skip them all	2638	# if we are delayed by four ticks or more, skip them all
2402	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2639	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2403		2640
2404	$TICK_WATCHER->at ($NEXT_TICK);	2641	$TICK_WATCHER->at ($NEXT_TICK);
2405	$TICK_WATCHER->start;	2642	$TICK_WATCHER->start;
2406	},	2643	},
2407	);	2644	);
2408		2645
		2646	{
		2647	BDB::max_poll_time $TICK * 0.1;
		2648	$BDB_POLL_WATCHER = Event->io (
		2649	reentrant => 0,
		2650	fd => BDB::poll_fileno,
		2651	poll => 'r',
		2652	prio => 0,
		2653	data => WF_AUTOCANCEL,
		2654	cb => \&BDB::poll_cb,
		2655	);
		2656	BDB::min_parallel 8;
		2657
		2658	BDB::set_sync_prepare {
		2659	my $status;
		2660	my $current = $Coro::current;
		2661	(
		2662	sub {
		2663	$status = $!;
		2664	$current->ready; undef $current;
		2665	},
		2666	sub {
		2667	Coro::schedule while defined $current;
		2668	$! = $status;
		2669	},
		2670	)
		2671	};
		2672
		2673	unless ($DB_ENV) {
		2674	$DB_ENV = BDB::db_env_create;
		2675
		2676	cf::sync_job {
		2677	eval {
		2678	BDB::db_env_open
		2679	$DB_ENV,
		2680	$BDB_ENV_DIR,
		2681	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
		2682	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
		2683	0666;
		2684
		2685	cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
		2686
		2687	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
		2688	$DB_ENV->set_lk_detect;
		2689	};
		2690
		2691	cf::cleanup "db_env_open(db): $@" if $@;
		2692	};
		2693	}
		2694	}
		2695
		2696	{
		2697	IO::AIO::min_parallel 8;
		2698
		2699	undef $Coro::AIO::WATCHER;
2409	IO::AIO::max_poll_time $TICK * 0.2;	2700	IO::AIO::max_poll_time $TICK * 0.1;
2410
2411	$AIO_POLL_WATCHER = Event->io (	2701	$AIO_POLL_WATCHER = Event->io (
2412	fd => IO::AIO::poll_fileno,	2702	reentrant => 0,
2413	poll => 'r',
2414	prio => 5,
2415	data => WF_AUTOCANCEL,
2416	cb => \&IO::AIO::poll_cb,
2417	);
2418
2419	$WRITE_RUNTIME_WATCHER = Event->timer (
2420	data => WF_AUTOCANCEL,	2703	data => WF_AUTOCANCEL,
2421	after => 0,	2704	fd => IO::AIO::poll_fileno,
2422	interval => 10,	2705	poll => 'r',
2423	cb => sub {	2706	prio => 6,
2424	(Coro::unblock_sub {	2707	cb => \&IO::AIO::poll_cb,
2425	write_runtime	2708	);
2426	or warn "ERROR: unable to write runtime file: $!";	2709	}
2427	})->();
2428	},
2429	);
2430		2710
2431	END { cf::emergency_save }	2711	END { cf::emergency_save }
2432		2712
2433	1	2713	1
2434		2714

Diff Legend

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