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.157 by root, Wed Jan 10 01:16:54 2007 UTC vs.
Revision 1.242 by root, Mon Apr 16 12:37:08 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;
		21	use Coro::Storable;
19		22
		23	use BDB ();
20	use Data::Dumper;	24	use Data::Dumper;
21	use Digest::MD5;	25	use Digest::MD5;
22	use Fcntl;	26	use Fcntl;
		27	use YAML::Syck ();
23	use IO::AIO 2.32 ();	28	use IO::AIO 2.32 ();
24	use YAML::Syck ();
25	use Time::HiRes;	29	use Time::HiRes;
		30	use Compress::LZF;
26		31
		32	# configure various modules to our taste
		33	#
		34	$Storable::canonical = 1; # reduce rsync transfers
		35	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
		36	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
		37
27	use Event; $Event::Eval = 1; # no idea why this is required, but it is	38	$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		39
31	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?	40	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32	$YAML::Syck::ImplicitUnicode = 1;	41	$YAML::Syck::ImplicitUnicode = 1;
33		42
34	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	43	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
35		44
		45	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
		46
36	our %COMMAND = ();	47	our %COMMAND = ();
37	our %COMMAND_TIME = ();	48	our %COMMAND_TIME = ();
		49
		50	our @EXTS = (); # list of extension package names
38	our %EXTCMD = ();	51	our %EXTCMD = ();
		52	our %EXT_CORO = (); # coroutines bound to extensions
		53	our %EXT_MAP = (); # pluggable maps
39		54
		55	our $RELOAD; # number of reloads so far
40	our @EVENT;	56	our @EVENT;
41	our $LIBDIR = datadir . "/ext";	57	our $LIBDIR = datadir . "/ext";
42		58
43	our $TICK = MAX_TIME * 1e-6;	59	our $TICK = MAX_TIME * 1e-6;
44	our $TICK_WATCHER;	60	our $TICK_WATCHER;
		61	our $AIO_POLL_WATCHER;
		62	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
45	our $NEXT_TICK;	63	our $NEXT_TICK;
46	our $NOW;	64	our $NOW;
		65	our $USE_FSYNC = 1; # use fsync to write maps - default off
		66
		67	our $BDB_POLL_WATCHER;
		68	our $DB_ENV;
47		69
48	our %CFG;	70	our %CFG;
49		71
50	our $UPTIME; $UPTIME ||= time;	72	our $UPTIME; $UPTIME ||= time;
51	our $RUNTIME;	73	our $RUNTIME;
52		74
53	our %PLAYER; # all users	75	our %PLAYER; # all users
54	our %MAP; # all maps	76	our %MAP; # all maps
55	our $LINK_MAP; # the special {link} map	77	our $LINK_MAP; # the special {link} map, which is always available
56	our $RANDOM_MAPS = cf::localdir . "/random";	78	our $RANDOM_MAPS = cf::localdir . "/random";
57	our %EXT_CORO; # coroutines bound to extensions	79	our $BDB_ENV_DIR = cf::localdir . "/db";
58		80
59	our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;	81	# used to convert map paths into valid unix filenames by replacing / by ∕
60	our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;	82	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
61		83
62	binmode STDOUT;	84	binmode STDOUT;
63	binmode STDERR;	85	binmode STDERR;
64		86
65	# read virtual server time, if available	87	# read virtual server time, if available
…		…
72	mkdir cf::localdir;	94	mkdir cf::localdir;
73	mkdir cf::localdir . "/" . cf::playerdir;	95	mkdir cf::localdir . "/" . cf::playerdir;
74	mkdir cf::localdir . "/" . cf::tmpdir;	96	mkdir cf::localdir . "/" . cf::tmpdir;
75	mkdir cf::localdir . "/" . cf::uniquedir;	97	mkdir cf::localdir . "/" . cf::uniquedir;
76	mkdir $RANDOM_MAPS;	98	mkdir $RANDOM_MAPS;
		99	mkdir $BDB_ENV_DIR;
77		100
78	# a special map that is always available
79	our $LINK_MAP;
80	our $EMERGENCY_POSITION;	101	our $EMERGENCY_POSITION;
		102
		103	sub cf::map::normalise;
81		104
82	#############################################################################	105	#############################################################################
83		106
84	=head2 GLOBAL VARIABLES	107	=head2 GLOBAL VARIABLES
85		108
…		…
110	=item %cf::CFG	133	=item %cf::CFG
111		134
112	Configuration for the server, loaded from C</etc/crossfire/config>, or	135	Configuration for the server, loaded from C</etc/crossfire/config>, or
113	from wherever your confdir points to.	136	from wherever your confdir points to.
114		137
115	=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE	138	=item cf::wait_for_tick, cf::wait_for_tick_begin
116		139
117	These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)	140	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
118	or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick	141	returns directly I<after> the tick processing (and consequently, can only wake one process
119	processing has been done. Call C<< ->wait >> on them to maximise the	142	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
120	window of cpu time available, or simply to synchronise to the server tick.
121		143
122	=back	144	=back
123		145
124	=cut	146	=cut
125		147
…		…
156	}	178	}
157		179
158	$Event::DIED = sub {	180	$Event::DIED = sub {
159	warn "error in event callback: @_";	181	warn "error in event callback: @_";
160	};	182	};
161
162	my %ext_pkg;
163	my @exts;
164	my @hook;
165		183
166	=head2 UTILITY FUNCTIONS	184	=head2 UTILITY FUNCTIONS
167		185
168	=over 4	186	=over 4
169		187
…		…
188	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	206	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
189	$d	207	$d
190	} || "[unable to dump $_[0]: '$@']";	208	} || "[unable to dump $_[0]: '$@']";
191	}	209	}
192		210
193	use JSON::Syck (); # TODO# replace by JSON::PC once working	211	use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
194		212
195	=item $ref = cf::from_json $json	213	=item $ref = cf::from_json $json
196		214
197	Converts a JSON string into the corresponding perl data structure.	215	Converts a JSON string into the corresponding perl data structure.
198		216
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	217	=item $json = cf::to_json $ref
207		218
208	Converts a perl data structure into its JSON representation.	219	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		220
217	=item cf::lock_wait $string	221	=item cf::lock_wait $string
218		222
219	Wait until the given lock is available. See cf::lock_acquire.	223	Wait until the given lock is available. See cf::lock_acquire.
220		224
…		…
257	}	261	}
258		262
259	sub freeze_mainloop {	263	sub freeze_mainloop {
260	return unless $TICK_WATCHER->is_active;	264	return unless $TICK_WATCHER->is_active;
261		265
262	my $guard = Coro::guard { $TICK_WATCHER->start };	266	my $guard = Coro::guard {
		267	$TICK_WATCHER->start;
		268	};
263	$TICK_WATCHER->stop;	269	$TICK_WATCHER->stop;
264	$guard	270	$guard
265	}	271	}
266		272
267	=item cf::async { BLOCK }	273	=item cf::async { BLOCK }
…		…
319	}	325	}
320	}	326	}
321		327
322	=item $coro = cf::async_ext { BLOCK }	328	=item $coro = cf::async_ext { BLOCK }
323		329
324	Like async, but this coro is automcatially being canceled when the	330	Like async, but this coro is automatically being canceled when the
325	extension calling this is being unloaded.	331	extension calling this is being unloaded.
326		332
327	=cut	333	=cut
328		334
329	sub async_ext(&) {	335	sub async_ext(&) {
…		…
338		344
339	$coro	345	$coro
340	}	346	}
341		347
342	sub write_runtime {	348	sub write_runtime {
		349	my $guard = cf::lock_acquire "write_runtime";
		350
343	my $runtime = cf::localdir . "/runtime";	351	my $runtime = cf::localdir . "/runtime";
344		352
345	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	353	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
346	or return;	354	or return;
347		355
		356	my $value = $cf::RUNTIME + 90 + 10;
348	my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock	357	# 10 is the runtime save interval, for a monotonic clock
		358	# 60 allows for the watchdog to kill the server.
		359
349	(aio_write $fh, 0, (length $value), $value, 0) <= 0	360	(aio_write $fh, 0, (length $value), $value, 0) <= 0
350	and return;	361	and return;
351		362
		363	# always fsync - this file is important
352	aio_fsync $fh	364	aio_fsync $fh
353	and return;	365	and return;
354		366
355	close $fh	367	close $fh
356	or return;	368	or return;
…		…
359	and return;	371	and return;
360		372
361	1	373	1
362	}	374	}
363		375
		376	=item cf::datalog type => key => value, ...
		377
		378	Log a datalog packet of the given type with the given key-value pairs.
		379
		380	=cut
		381
		382	sub datalog($@) {
		383	my ($type, %kv) = @_;
		384	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
		385	}
		386
364	=back	387	=back
365		388
366	=cut	389	=cut
367
368	#############################################################################
369
370	package cf::path;
371
372	# used to convert map paths into valid unix filenames by repalcing / by ∕
373	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
374
375	sub new {
376	my ($class, $path, $base) = @_;
377
378	$path = $path->as_string if ref $path;
379
380	my $self = bless { }, $class;
381
382	# {... are special paths that are not touched
383	# ?xxx/... are special absolute paths
384	# ?random/... random maps
385	# /! non-realised random map exit
386	# /... normal maps
387	# ~/... per-player maps without a specific player (DO NOT USE)
388	# ~user/... per-player map of a specific user
389
390	if ($path =~ /^{/) {
391	# fine as it is
392	} elsif ($path =~ s{^\?random/}{}) {
393	Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
394	$self->{random} = cf::from_json $data;
395	} else {
396	if ($path =~ s{^~([^/]+)?}{}) {
397	$self->{user_rel} = 1;
398
399	if (defined $1) {
400	$self->{user} = $1;
401	} elsif ($base =~ m{^~([^/]+)/}) {
402	$self->{user} = $1;
403	} else {
404	warn "cannot resolve user-relative path without user <$path,$base>\n";
405	}
406	} elsif ($path =~ /^\//) {
407	# already absolute
408	} else {
409	$base =~ s{[^/]+/?$}{};
410	return $class->new ("$base/$path");
411	}
412
413	for ($path) {
414	redo if s{/\.?/}{/};
415	redo if s{/[^/]+/\.\./}{/};
416	}
417	}
418
419	$self->{path} = $path;
420
421	$self
422	}
423
424	# the name / primary key / in-game path
425	sub as_string {
426	my ($self) = @_;
427
428	$self->{user_rel} ? "~$self->{user}$self->{path}"
429	: $self->{random} ? "?random/$self->{path}"
430	: $self->{path}
431	}
432
433	# the displayed name, this is a one way mapping
434	sub visible_name {
435	my ($self) = @_;
436
437	# if (my $rmp = $self->{random}) {
438	# # todo: be more intelligent about this
439	# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
440	# } else {
441	$self->as_string
442	# }
443	}
444
445	# escape the /'s in the path
446	sub _escaped_path {
447	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
448	$path
449	}
450
451	# the original (read-only) location
452	sub load_path {
453	my ($self) = @_;
454
455	sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
456	}
457
458	# the temporary/swap location
459	sub save_path {
460	my ($self) = @_;
461
462	$self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
463	: $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
464	: sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
465	}
466
467	# the unique path, might be eq to save_path
468	sub uniq_path {
469	my ($self) = @_;
470
471	$self->{user_rel} || $self->{random}
472	? undef
473	: sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
474	}
475
476	# return random map parameters, or undef
477	sub random_map_params {
478	my ($self) = @_;
479
480	$self->{random}
481	}
482
483	# this is somewhat ugly, but style maps do need special treatment
484	sub is_style_map {
485	$_[0]{path} =~ m{^/styles/}
486	}
487
488	package cf;
489		390
490	#############################################################################	391	#############################################################################
491		392
492	=head2 ATTACHABLE OBJECTS	393	=head2 ATTACHABLE OBJECTS
493		394
…		…
619	our @CB_TYPE = (); # registry for type (cf-object class) based events	520	our @CB_TYPE = (); # registry for type (cf-object class) based events
620	our @CB_MAP = ();	521	our @CB_MAP = ();
621		522
622	my %attachment;	523	my %attachment;
623		524
		525	sub cf::attachable::thawer_merge {
		526	# simply override everything except _meta
		527	local $_[0]{_meta};
		528	%{$_[0]} = %{$_[1]};
		529	}
		530
624	sub _attach_cb($$$$) {	531	sub _attach_cb($$$$) {
625	my ($registry, $event, $prio, $cb) = @_;	532	my ($registry, $event, $prio, $cb) = @_;
626		533
627	use sort 'stable';	534	use sort 'stable';
628		535
…		…
799	# object support	706	# object support
800		707
801	sub reattach {	708	sub reattach {
802	# basically do the same as instantiate, without calling instantiate	709	# basically do the same as instantiate, without calling instantiate
803	my ($obj) = @_;	710	my ($obj) = @_;
		711
		712	bless $obj, ref $obj; # re-bless in case extensions have been reloaded
804		713
805	my $registry = $obj->registry;	714	my $registry = $obj->registry;
806		715
807	@$registry = ();	716	@$registry = ();
808		717
…		…
855	$filename, length $$rdata, scalar @$objs;	764	$filename, length $$rdata, scalar @$objs;
856		765
857	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	766	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
858	chmod SAVE_MODE, $fh;	767	chmod SAVE_MODE, $fh;
859	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	768	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
860	aio_fsync $fh;	769	aio_fsync $fh if $cf::USE_FSYNC;
861	close $fh;	770	close $fh;
862		771
863	if (@$objs) {	772	if (@$objs) {
864	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	773	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
865	chmod SAVE_MODE, $fh;	774	chmod SAVE_MODE, $fh;
866	my $data = Storable::nfreeze { version => 1, objs => $objs };	775	my $data = Storable::nfreeze { version => 1, objs => $objs };
867	aio_write $fh, 0, (length $data), $data, 0;	776	aio_write $fh, 0, (length $data), $data, 0;
868	aio_fsync $fh;	777	aio_fsync $fh if $cf::USE_FSYNC;
869	close $fh;	778	close $fh;
870	aio_rename "$filename.pst~", "$filename.pst";	779	aio_rename "$filename.pst~", "$filename.pst";
871	}	780	}
872	} else {	781	} else {
873	aio_unlink "$filename.pst";	782	aio_unlink "$filename.pst";
…		…
940	=cut	849	=cut
941		850
942	sub register_extcmd {	851	sub register_extcmd {
943	my ($name, $cb) = @_;	852	my ($name, $cb) = @_;
944		853
945	my $caller = caller;
946	#warn "registering extcmd '$name' to '$caller'";
947
948	$EXTCMD{$name} = [$cb, $caller];	854	$EXTCMD{$name} = $cb;
949	}	855	}
950		856
951	cf::player->attach (	857	cf::player->attach (
952	on_command => sub {	858	on_command => sub {
953	my ($pl, $name, $params) = @_;	859	my ($pl, $name, $params) = @_;
…		…
966		872
967	my $msg = eval { from_json $buf };	873	my $msg = eval { from_json $buf };
968		874
969	if (ref $msg) {	875	if (ref $msg) {
970	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	876	if (my $cb = $EXTCMD{$msg->{msgtype}}) {
971	if (my %reply = $cb->[0]->($pl, $msg)) {	877	if (my %reply = $cb->($pl, $msg)) {
972	$pl->ext_reply ($msg->{msgid}, %reply);	878	$pl->ext_reply ($msg->{msgid}, %reply);
973	}	879	}
974	}	880	}
975	} else {	881	} else {
976	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	882	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
…		…
978		884
979	cf::override;	885	cf::override;
980	},	886	},
981	);	887	);
982		888
983	sub register {
984	my ($base, $pkg) = @_;
985
986	#TODO
987	}
988
989	sub load_extension {	889	sub load_extension {
990	my ($path) = @_;	890	my ($path) = @_;
991		891
992	$path =~ /([^\/\\]+)\.ext$/ or die "$path";	892	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
993	my $base = $1;	893	my $base = $1;
994	my $pkg = $1;	894	my $pkg = $1;
995	$pkg =~ s/[^[:word:]]/_/g;	895	$pkg =~ s/[^[:word:]]/_/g;
996	$pkg = "ext::$pkg";	896	$pkg = "ext::$pkg";
997		897
998	warn "loading '$path' into '$pkg'\n";	898	warn "... loading '$path' into '$pkg'\n";
999		899
1000	open my $fh, "<:utf8", $path	900	open my $fh, "<:utf8", $path
1001	or die "$path: $!";	901	or die "$path: $!";
1002		902
1003	my $source =	903	my $source =
1004	"package $pkg; use strict; use utf8;\n"	904	"package $pkg; use strict; use utf8;\n"
1005	. "#line 1 \"$path\"\n{\n"	905	. "#line 1 \"$path\"\n{\n"
1006	. (do { local $/; <$fh> })	906	. (do { local $/; <$fh> })
1007	. "\n};\n1";	907	. "\n};\n1";
1008		908
1009	eval $source	909	unless (eval $source) {
1010	or die $@ ? "$path: $@\n"	910	my $msg = $@ ? "$path: $@\n"
1011	: "extension disabled.\n";	911	: "extension disabled.\n";
1012		912	if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
1013	push @exts, $pkg;	913	warn $@;
1014	$ext_pkg{$base} = $pkg;	914	warn "mandatory extension failed to load, exiting.\n";
1015		915	exit 1;
1016	# no strict 'refs';	916	}
1017	# @{"$pkg\::ISA"} = ext::;	917	die $@;
1018
1019	register $base, $pkg;
1020	}
1021
1022	sub unload_extension {
1023	my ($pkg) = @_;
1024
1025	warn "removing extension $pkg\n";
1026
1027	# remove hooks
1028	#TODO
1029	# for my $idx (0 .. $#PLUGIN_EVENT) {
1030	# delete $hook[$idx]{$pkg};
1031	# }	918	}
1032		919
1033	# remove commands	920	push @EXTS, $pkg;
1034	for my $name (keys %COMMAND) {
1035	my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1036
1037	if (@cb) {
1038	$COMMAND{$name} = \@cb;
1039	} else {
1040	delete $COMMAND{$name};
1041	}
1042	}
1043
1044	# remove extcmds
1045	for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1046	delete $EXTCMD{$name};
1047	}
1048
1049	if (my $cb = $pkg->can ("unload")) {
1050	eval {
1051	$cb->($pkg);
1052	1
1053	} or warn "$pkg unloaded, but with errors: $@";
1054	}
1055
1056	Symbol::delete_package $pkg;
1057	}	921	}
1058		922
1059	sub load_extensions {	923	sub load_extensions {
1060	for my $ext (<$LIBDIR/*.ext>) {	924	for my $ext (<$LIBDIR/*.ext>) {
1061	next unless -r $ext;	925	next unless -r $ext;
…		…
1065	} or warn "$ext not loaded: $@";	929	} or warn "$ext not loaded: $@";
1066	}	930	}
1067	}	931	}
1068		932
1069	#############################################################################	933	#############################################################################
1070	# load/save/clean perl data associated with a map
1071
1072	*cf::mapsupport::on_clean = sub {
1073	my ($map) = @_;
1074
1075	my $path = $map->tmpname;
1076	defined $path or return;
1077
1078	unlink "$path.pst";
1079	};
1080
1081	cf::map->attach (prio => -10000, package => cf::mapsupport::);
1082
1083	#############################################################################
1084		934
1085	=head2 CORE EXTENSIONS	935	=head2 CORE EXTENSIONS
1086		936
1087	Functions and methods that extend core crossfire objects.	937	Functions and methods that extend core crossfire objects.
1088		938
…		…
1111	}	961	}
1112		962
1113	sub path($) {	963	sub path($) {
1114	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];	964	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1115		965
1116	(playerdir $login) . "/$login.pl"	966	(playerdir $login) . "/playerdata"
1117	}	967	}
1118		968
1119	sub find_active($) {	969	sub find_active($) {
1120	$cf::PLAYER{$_[0]}	970	$cf::PLAYER{$_[0]}
1121	and $cf::PLAYER{$_[0]}->active	971	and $cf::PLAYER{$_[0]}->active
…		…
1124		974
1125	sub exists($) {	975	sub exists($) {
1126	my ($login) = @_;	976	my ($login) = @_;
1127		977
1128	$cf::PLAYER{$login}	978	$cf::PLAYER{$login}
1129	or cf::sync_job { !aio_stat $login }	979	or cf::sync_job { !aio_stat path $login }
1130	}	980	}
1131		981
1132	sub find($) {	982	sub find($) {
1133	return $cf::PLAYER{$_[0]} || do {	983	return $cf::PLAYER{$_[0]} || do {
1134	my $login = $_[0];	984	my $login = $_[0];
1135		985
1136	my $guard = cf::lock_acquire "user_find:$login";	986	my $guard = cf::lock_acquire "user_find:$login";
1137		987
1138	$cf::PLAYER{$_[0]} || do {	988	$cf::PLAYER{$_[0]} || do {
		989	# rename old playerfiles to new ones
		990	#TODO: remove when no longer required
		991	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
		992	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
		993	aio_unlink +(playerdir $login) . "/$login.pl.pst";
		994	aio_unlink +(playerdir $login) . "/$login.pl";
		995
1139	my $pl = load_pl path $login	996	my $pl = load_pl path $login
1140	or return;	997	or return;
1141	$cf::PLAYER{$login} = $pl	998	$cf::PLAYER{$login} = $pl
1142	}	999	}
1143	}	1000	}
…		…
1180		1037
1181	=cut	1038	=cut
1182		1039
1183	sub quit_character {	1040	sub quit_character {
1184	my ($pl) = @_;	1041	my ($pl) = @_;
		1042
		1043	my $name = $pl->ob->name;
1185		1044
1186	$pl->{deny_save} = 1;	1045	$pl->{deny_save} = 1;
1187	$pl->password ("*"); # this should lock out the player until we nuked the dir	1046	$pl->password ("*"); # this should lock out the player until we nuked the dir
1188		1047
1189	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1048	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
…		…
1194	my $path = playerdir $pl;	1053	my $path = playerdir $pl;
1195	my $temp = "$path~$cf::RUNTIME~deleting~";	1054	my $temp = "$path~$cf::RUNTIME~deleting~";
1196	aio_rename $path, $temp;	1055	aio_rename $path, $temp;
1197	delete $cf::PLAYER{$pl->ob->name};	1056	delete $cf::PLAYER{$pl->ob->name};
1198	$pl->destroy;	1057	$pl->destroy;
		1058
		1059	my $prefix = qr<^~\Q$name\E/>;
		1060
		1061	# nuke player maps
		1062	$cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
		1063
1199	IO::AIO::aio_rmtree $temp;	1064	IO::AIO::aio_rmtree $temp;
		1065	}
		1066
		1067	=item $pl->kick
		1068
		1069	Kicks a player out of the game. This destroys the connection.
		1070
		1071	=cut
		1072
		1073	sub kick {
		1074	my ($pl, $kicker) = @_;
		1075
		1076	$pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
		1077	$pl->killer ("kicked");
		1078	$pl->ns->destroy;
1200	}	1079	}
1201		1080
1202	=item cf::player::list_logins	1081	=item cf::player::list_logins
1203		1082
1204	Returns am arrayref of all valid playernames in the system, can take a	1083	Returns am arrayref of all valid playernames in the system, can take a
…		…
1224	\@logins	1103	\@logins
1225	}	1104	}
1226		1105
1227	=item $player->maps	1106	=item $player->maps
1228		1107
1229	Returns an arrayref of cf::path's of all maps that are private for this	1108	Returns an arrayref of map paths that are private for this
1230	player. May block.	1109	player. May block.
1231		1110
1232	=cut	1111	=cut
1233		1112
1234	sub maps($) {	1113	sub maps($) {
1235	my ($pl) = @_;	1114	my ($pl) = @_;
		1115
		1116	$pl = ref $pl ? $pl->ob->name : $pl;
1236		1117
1237	my $files = aio_readdir playerdir $pl	1118	my $files = aio_readdir playerdir $pl
1238	or return;	1119	or return;
1239		1120
1240	my @paths;	1121	my @paths;
1241		1122
1242	for (@$files) {	1123	for (@$files) {
1243	utf8::decode $_;	1124	utf8::decode $_;
1244	next if /\.(?:pl|pst)$/;	1125	next if /\.(?:pl|pst)$/;
1245	next unless /^$PATH_SEP/;	1126	next unless /^$PATH_SEP/o;
1246		1127
1247	s/$PATH_SEP/\//g;	1128	push @paths, cf::map::normalise "~$pl/$_";
1248	push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1249	}	1129	}
1250		1130
1251	\@paths	1131	\@paths
1252	}	1132	}
1253		1133
1254	=item $player->ext_reply ($msgid, $msgtype, %msg)	1134	=item $player->ext_reply ($msgid, %msg)
1255		1135
1256	Sends an ext reply to the player.	1136	Sends an ext reply to the player.
1257		1137
1258	=cut	1138	=cut
1259		1139
1260	sub ext_reply($$$%) {	1140	sub ext_reply($$%) {
1261	my ($self, $id, %msg) = @_;	1141	my ($self, $id, %msg) = @_;
1262		1142
1263	$msg{msgid} = $id;	1143	$msg{msgid} = $id;
1264		1144
1265	$self->send ("ext " . cf::to_json \%msg);	1145	$self->send ("ext " . cf::to_json \%msg);
1266	}	1146	}
1267		1147
1268	package cf;	1148	=item $player->ext_event ($type, %msg)
		1149
		1150	Sends an ext event to the client.
		1151
		1152	=cut
		1153
		1154	sub ext_event($$%) {
		1155	my ($self, $type, %msg) = @_;
		1156
		1157	$self->ns->ext_event ($type, %msg);
		1158	}
		1159
		1160	=head3 cf::region
		1161
		1162	=over 4
		1163
		1164	=cut
		1165
		1166	package cf::region;
		1167
		1168	=item cf::region::find_by_path $path
		1169
		1170	Tries to decuce the probable region for a map knowing only its path.
		1171
		1172	=cut
		1173
		1174	sub find_by_path($) {
		1175	my ($path) = @_;
		1176
		1177	my ($match, $specificity);
		1178
		1179	for my $region (list) {
		1180	if ($region->match && $path =~ $region->match) {
		1181	($match, $specificity) = ($region, $region->specificity)
		1182	if $region->specificity > $specificity;
		1183	}
		1184	}
		1185
		1186	$match
		1187	}
1269		1188
1270	=back	1189	=back
1271
1272		1190
1273	=head3 cf::map	1191	=head3 cf::map
1274		1192
1275	=over 4	1193	=over 4
1276		1194
…		…
1279	package cf::map;	1197	package cf::map;
1280		1198
1281	use Fcntl;	1199	use Fcntl;
1282	use Coro::AIO;	1200	use Coro::AIO;
1283		1201
		1202	use overload
		1203	'""' => \&as_string,
		1204	fallback => 1;
		1205
1284	our $MAX_RESET = 3600;	1206	our $MAX_RESET = 3600;
1285	our $DEFAULT_RESET = 3000;	1207	our $DEFAULT_RESET = 3000;
1286		1208
1287	sub generate_random_map {	1209	sub generate_random_map {
1288	my ($path, $rmp) = @_;	1210	my ($self, $rmp) = @_;
1289
1290	# mit "rum" bekleckern, nicht	1211	# mit "rum" bekleckern, nicht
1291	cf::map::_create_random_map	1212	$self->_create_random_map (
1292	$path,
1293	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1213	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1294	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1214	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1295	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1215	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1296	$rmp->{exit_on_final_map},	1216	$rmp->{exit_on_final_map},
1297	$rmp->{xsize}, $rmp->{ysize},	1217	$rmp->{xsize}, $rmp->{ysize},
1298	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},	1218	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1299	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},	1219	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1300	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},	1220	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1301	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},	1221	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1302	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},	1222	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1303	(cf::region::find $rmp->{region})	1223	(cf::region::find $rmp->{region}), $rmp->{custom}
		1224	)
		1225	}
		1226
		1227	=item cf::map->register ($regex, $prio)
		1228
		1229	Register a handler for the map path matching the given regex at the
		1230	givne priority (higher is better, built-in handlers have priority 0, the
		1231	default).
		1232
		1233	=cut
		1234
		1235	sub register {
		1236	my (undef, $regex, $prio) = @_;
		1237	my $pkg = caller;
		1238
		1239	no strict;
		1240	push @{"$pkg\::ISA"}, __PACKAGE__;
		1241
		1242	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
		1243	}
		1244
		1245	# also paths starting with '/'
		1246	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
		1247
		1248	sub thawer_merge {
		1249	my ($self, $merge) = @_;
		1250
		1251	# we have to keep some variables in memory intact
		1252	local $self->{path};
		1253	local $self->{load_path};
		1254	local $self->{deny_save};
		1255	local $self->{deny_reset};
		1256
		1257	$self->SUPER::thawer_merge ($merge);
		1258	}
		1259
		1260	sub normalise {
		1261	my ($path, $base) = @_;
		1262
		1263	$path = "$path"; # make sure its a string
		1264
		1265	$path =~ s/\.map$//;
		1266
		1267	# map plan:
		1268	#
		1269	# /! non-realised random map exit (special hack!)
		1270	# {... are special paths that are not being touched
		1271	# ?xxx/... are special absolute paths
		1272	# ?random/... random maps
		1273	# /... normal maps
		1274	# ~user/... per-player map of a specific user
		1275
		1276	$path =~ s/$PATH_SEP/\//go;
		1277
		1278	# treat it as relative path if it starts with
		1279	# something that looks reasonable
		1280	if ($path =~ m{^(?:\./|\.\./|\w)}) {
		1281	$base or Carp::carp "normalise called with relative path and no base: '$path'";
		1282
		1283	$base =~ s{[^/]+/?$}{};
		1284	$path = "$base/$path";
		1285	}
		1286
		1287	for ($path) {
		1288	redo if s{//}{/};
		1289	redo if s{/\.?/}{/};
		1290	redo if s{/[^/]+/\.\./}{/};
		1291	}
		1292
		1293	$path
		1294	}
		1295
		1296	sub new_from_path {
		1297	my (undef, $path, $base) = @_;
		1298
		1299	return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
		1300
		1301	$path = normalise $path, $base;
		1302
		1303	for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
		1304	if ($path =~ $EXT_MAP{$pkg}[1]) {
		1305	my $self = bless cf::map::new, $pkg;
		1306	$self->{path} = $path; $self->path ($path);
		1307	$self->init; # pass $1 etc.
		1308	return $self;
		1309	}
		1310	}
		1311
		1312	Carp::carp "unable to resolve path '$path' (base '$base').";
		1313	()
		1314	}
		1315
		1316	sub init {
		1317	my ($self) = @_;
		1318
		1319	$self
		1320	}
		1321
		1322	sub as_string {
		1323	my ($self) = @_;
		1324
		1325	"$self->{path}"
		1326	}
		1327
		1328	# the displayed name, this is a one way mapping
		1329	sub visible_name {
		1330	&as_string
		1331	}
		1332
		1333	# the original (read-only) location
		1334	sub load_path {
		1335	my ($self) = @_;
		1336
		1337	sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
		1338	}
		1339
		1340	# the temporary/swap location
		1341	sub save_path {
		1342	my ($self) = @_;
		1343
		1344	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
		1345	sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
		1346	}
		1347
		1348	# the unique path, undef == no special unique path
		1349	sub uniq_path {
		1350	my ($self) = @_;
		1351
		1352	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
		1353	sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1304	}	1354	}
1305		1355
1306	# and all this just because we cannot iterate over	1356	# and all this just because we cannot iterate over
1307	# all maps in C++...	1357	# all maps in C++...
1308	sub change_all_map_light {	1358	sub change_all_map_light {
…		…
1310		1360
1311	$_->change_map_light ($change)	1361	$_->change_map_light ($change)
1312	for grep $_->outdoor, values %cf::MAP;	1362	for grep $_->outdoor, values %cf::MAP;
1313	}	1363	}
1314		1364
		1365	sub unlink_save {
		1366	my ($self) = @_;
		1367
		1368	utf8::encode (my $save = $self->save_path);
		1369	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
		1370	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
		1371	}
		1372
1315	sub try_load_header($) {	1373	sub load_header_from($) {
1316	my ($path) = @_;	1374	my ($self, $path) = @_;
1317		1375
1318	utf8::encode $path;	1376	utf8::encode $path;
1319	aio_open $path, O_RDONLY, 0	1377	#aio_open $path, O_RDONLY, 0
		1378	# or return;
		1379
		1380	$self->_load_header ($path)
1320	or return;	1381	or return;
1321		1382
1322	my $map = cf::map::new	1383	$self->{load_path} = $path;
		1384
		1385	1
		1386	}
		1387
		1388	sub load_header_orig {
		1389	my ($self) = @_;
		1390
		1391	$self->load_header_from ($self->load_path)
		1392	}
		1393
		1394	sub load_header_temp {
		1395	my ($self) = @_;
		1396
		1397	$self->load_header_from ($self->save_path)
		1398	}
		1399
		1400	sub prepare_temp {
		1401	my ($self) = @_;
		1402
		1403	$self->last_access ((delete $self->{last_access})
		1404	|| $cf::RUNTIME); #d#
		1405	# safety
		1406	$self->{instantiate_time} = $cf::RUNTIME
		1407	if $self->{instantiate_time} > $cf::RUNTIME;
		1408	}
		1409
		1410	sub prepare_orig {
		1411	my ($self) = @_;
		1412
		1413	$self->{load_original} = 1;
		1414	$self->{instantiate_time} = $cf::RUNTIME;
		1415	$self->last_access ($cf::RUNTIME);
		1416	$self->instantiate;
		1417	}
		1418
		1419	sub load_header {
		1420	my ($self) = @_;
		1421
		1422	if ($self->load_header_temp) {
		1423	$self->prepare_temp;
		1424	} else {
		1425	$self->load_header_orig
1323	or return;	1426	or return;
		1427	$self->prepare_orig;
		1428	}
1324		1429
1325	# for better error messages only, will be overwritten	1430	$self->default_region (cf::region::find_by_path $self->{path})
1326	$map->path ($path);	1431	unless $self->default_region;
1327		1432
1328	$map->load_header ($path)	1433	1
1329	or return;
1330
1331	$map->{load_path} = $path;
1332
1333	$map
1334	}	1434	}
1335		1435
1336	sub find;	1436	sub find;
1337	sub find {	1437	sub find {
1338	my ($path, $origin) = @_;	1438	my ($path, $origin) = @_;
1339		1439
1340	#warn "find<$path,$origin>\n";#d#
1341
1342	$path = new cf::path $path, $origin && $origin->path;	1440	$path = normalise $path, $origin && $origin->path;
1343	my $key = $path->as_string;
1344		1441
1345	cf::lock_wait "map_find:$key";	1442	cf::lock_wait "map_find:$path";
1346		1443
1347	$cf::MAP{$key} || do {	1444	$cf::MAP{$path} || do {
1348	my $guard = cf::lock_acquire "map_find:$key";	1445	my $guard = cf::lock_acquire "map_find:$path";
1349		1446	my $map = new_from_path cf::map $path
1350	# do it the slow way
1351	my $map = try_load_header $path->save_path;
1352
1353	Coro::cede;
1354
1355	if ($map) {
1356	$map->last_access ((delete $map->{last_access})
1357	|| $cf::RUNTIME); #d#
1358	# safety
1359	$map->{instantiate_time} = $cf::RUNTIME
1360	if $map->{instantiate_time} > $cf::RUNTIME;
1361	} else {
1362	if (my $rmp = $path->random_map_params) {
1363	$map = generate_random_map $key, $rmp;
1364	} else {
1365	$map = try_load_header $path->load_path;
1366	}
1367
1368	$map or return;	1447	or return;
1369		1448
1370	$map->{load_original} = 1;
1371	$map->{instantiate_time} = $cf::RUNTIME;
1372	$map->last_access ($cf::RUNTIME);
1373	$map->instantiate;
1374
1375	# per-player maps become, after loading, normal maps
1376	$map->per_player (0) if $path->{user_rel};
1377	}
1378
1379	$map->path ($key);
1380	$map->{path} = $path;
1381	$map->{last_save} = $cf::RUNTIME;	1449	$map->{last_save} = $cf::RUNTIME;
1382		1450
1383	Coro::cede;	1451	$map->load_header
		1452	or return;
1384		1453
1385	if ($map->should_reset) {	1454	if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
		1455	# doing this can freeze the server in a sync job, obviously
		1456	#$cf::WAIT_FOR_TICK->wait;
1386	$map->reset;	1457	$map->reset;
1387	undef $guard;	1458	undef $guard;
1388	$map = find $path	1459	return find $path;
1389	or return;
1390	}	1460	}
1391		1461
1392	$cf::MAP{$key} = $map	1462	$cf::MAP{$path} = $map
1393	}	1463	}
1394	}	1464	}
		1465
		1466	sub pre_load { }
		1467	sub post_load { }
1395		1468
1396	sub load {	1469	sub load {
1397	my ($self) = @_;	1470	my ($self) = @_;
1398		1471
		1472	local $self->{deny_reset} = 1; # loading can take a long time
		1473
1399	my $path = $self->{path};	1474	my $path = $self->{path};
1400	my $guard = cf::lock_acquire "map_load:" . $path->as_string;	1475	my $guard = cf::lock_acquire "map_load:$path";
1401		1476
1402	return if $self->in_memory != cf::MAP_SWAPPED;	1477	return if $self->in_memory != cf::MAP_SWAPPED;
1403		1478
1404	$self->in_memory (cf::MAP_LOADING);	1479	$self->in_memory (cf::MAP_LOADING);
1405		1480
1406	$self->alloc;	1481	$self->alloc;
		1482
		1483	$self->pre_load;
		1484	Coro::cede;
		1485
1407	$self->load_objects ($self->{load_path}, 1)	1486	$self->_load_objects ($self->{load_path}, 1)
1408	or return;	1487	or return;
1409		1488
1410	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1489	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1411	if delete $self->{load_original};	1490	if delete $self->{load_original};
1412		1491
1413	if (my $uniq = $path->uniq_path) {	1492	if (my $uniq = $self->uniq_path) {
1414	utf8::encode $uniq;	1493	utf8::encode $uniq;
1415	if (aio_open $uniq, O_RDONLY, 0) {	1494	if (aio_open $uniq, O_RDONLY, 0) {
1416	$self->clear_unique_items;	1495	$self->clear_unique_items;
1417	$self->load_objects ($uniq, 0);	1496	$self->_load_objects ($uniq, 0);
1418	}	1497	}
1419	}	1498	}
1420		1499
1421	Coro::cede;	1500	Coro::cede;
1422
1423	# now do the right thing for maps	1501	# now do the right thing for maps
1424	$self->link_multipart_objects;	1502	$self->link_multipart_objects;
		1503	Coro::cede;
1425		1504
1426	if ($self->{path}->is_style_map) {	1505	unless ($self->{deny_activate}) {
1427	$self->{deny_save} = 1;	1506	$self->decay_objects;
1428	$self->{deny_reset} = 1;
1429	} else {
1430	$self->fix_auto_apply;	1507	$self->fix_auto_apply;
1431	$self->decay_objects;
1432	$self->update_buttons;	1508	$self->update_buttons;
		1509	Coro::cede;
1433	$self->set_darkness_map;	1510	$self->set_darkness_map;
1434	$self->difficulty ($self->estimate_difficulty)	1511	$self->difficulty ($self->estimate_difficulty)
1435	unless $self->difficulty;	1512	unless $self->difficulty;
		1513	Coro::cede;
1436	$self->activate;	1514	$self->activate;
		1515	Coro::cede;
1437	}	1516	}
1438		1517
		1518	$self->post_load;
1439	Coro::cede;	1519	Coro::cede;
1440		1520
1441	$self->in_memory (cf::MAP_IN_MEMORY);	1521	$self->in_memory (cf::MAP_IN_MEMORY);
		1522	}
		1523
		1524	sub customise_for {
		1525	my ($self, $ob) = @_;
		1526
		1527	return find "~" . $ob->name . "/" . $self->{path}
		1528	if $self->per_player;
		1529
		1530	$self
1442	}	1531	}
1443		1532
1444	# find and load all maps in the 3x3 area around a map	1533	# find and load all maps in the 3x3 area around a map
1445	sub load_diag {	1534	sub load_diag {
1446	my ($map) = @_;	1535	my ($map) = @_;
…		…
1476		1565
1477	cf::sync_job { $map->load };	1566	cf::sync_job { $map->load };
1478	}	1567	}
1479		1568
1480	our %MAP_PREFETCH;	1569	our %MAP_PREFETCH;
1481	our $MAP_PREFETCHER = Coro::async {	1570	our $MAP_PREFETCHER = undef;
1482	while () {
1483	while (%MAP_PREFETCH) {
1484	my $key = each %MAP_PREFETCH
1485	or next;
1486	my $path = delete $MAP_PREFETCH{$key};
1487
1488	my $map = find $path
1489	or next;
1490	$map->load;
1491	}
1492	Coro::schedule;
1493	}
1494	};
1495		1571
1496	sub find_async {	1572	sub find_async {
1497	my ($path, $origin) = @_;	1573	my ($path, $origin) = @_;
1498		1574
1499	$path = new cf::path $path, $origin && $origin->path;	1575	$path = normalise $path, $origin && $origin->{path};
1500	my $key = $path->as_string;
1501		1576
1502	if (my $map = $cf::MAP{$key}) {	1577	if (my $map = $cf::MAP{$path}) {
1503	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	1578	return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1504	}	1579	}
1505		1580
1506	$MAP_PREFETCH{$key} = $path;	1581	undef $MAP_PREFETCH{$path};
		1582	$MAP_PREFETCHER ||= cf::async {
		1583	while (%MAP_PREFETCH) {
		1584	for my $path (keys %MAP_PREFETCH) {
		1585	my $map = find $path
		1586	or next;
		1587	$map->load;
		1588
		1589	delete $MAP_PREFETCH{$path};
		1590	}
		1591	}
		1592	undef $MAP_PREFETCHER;
		1593	};
1507	$MAP_PREFETCHER->ready;	1594	$MAP_PREFETCHER->prio (6);
1508		1595
1509	()	1596	()
1510	}	1597	}
1511		1598
1512	sub save {	1599	sub save {
…		…
1516		1603
1517	$self->{last_save} = $cf::RUNTIME;	1604	$self->{last_save} = $cf::RUNTIME;
1518		1605
1519	return unless $self->dirty;	1606	return unless $self->dirty;
1520		1607
1521	my $save = $self->{path}->save_path; utf8::encode $save;	1608	my $save = $self->save_path; utf8::encode $save;
1522	my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;	1609	my $uniq = $self->uniq_path; utf8::encode $uniq;
1523		1610
1524	$self->{load_path} = $save;	1611	$self->{load_path} = $save;
1525		1612
1526	return if $self->{deny_save};	1613	return if $self->{deny_save};
1527		1614
…		…
1530	cf::async {	1617	cf::async {
1531	$_->contr->save for $self->players;	1618	$_->contr->save for $self->players;
1532	};	1619	};
1533		1620
1534	if ($uniq) {	1621	if ($uniq) {
1535	$self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	1622	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1536	$self->save_objects ($uniq, cf::IO_UNIQUES);	1623	$self->_save_objects ($uniq, cf::IO_UNIQUES);
1537	} else {	1624	} else {
1538	$self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	1625	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1539	}	1626	}
1540	}	1627	}
1541		1628
1542	sub swap_out {	1629	sub swap_out {
1543	my ($self) = @_;	1630	my ($self) = @_;
…		…
1557		1644
1558	sub reset_at {	1645	sub reset_at {
1559	my ($self) = @_;	1646	my ($self) = @_;
1560		1647
1561	# TODO: safety, remove and allow resettable per-player maps	1648	# TODO: safety, remove and allow resettable per-player maps
1562	return 1e99 if $self->{path}{user_rel};	1649	return 1e99 if $self->isa ("ext::map_per_player");#d#
1563	return 1e99 if $self->{deny_reset};	1650	return 1e99 if $self->{deny_reset};
1564		1651
1565	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;	1652	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1566	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;	1653	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1567		1654
…		…
1572	my ($self) = @_;	1659	my ($self) = @_;
1573		1660
1574	$self->reset_at <= $cf::RUNTIME	1661	$self->reset_at <= $cf::RUNTIME
1575	}	1662	}
1576		1663
1577	sub unlink_save {
1578	my ($self) = @_;
1579
1580	utf8::encode (my $save = $self->{path}->save_path);
1581	aioreq_pri 3; IO::AIO::aio_unlink $save;
1582	aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1583	}
1584
1585	sub rename {
1586	my ($self, $new_path) = @_;
1587
1588	$self->unlink_save;
1589
1590	delete $cf::MAP{$self->path};
1591	$self->{path} = new cf::path $new_path;
1592	$self->path ($self->{path}->as_string);
1593	$cf::MAP{$self->path} = $self;
1594
1595	$self->save;
1596	}
1597
1598	sub reset {	1664	sub reset {
1599	my ($self) = @_;	1665	my ($self) = @_;
1600		1666
1601	my $lock = cf::lock_acquire "map_data:" . $self->path;	1667	my $lock = cf::lock_acquire "map_data:$self->{path}";
1602		1668
1603	return if $self->players;	1669	return if $self->players;
1604	return if $self->{path}{user_rel};#d#	1670	return if $self->isa ("ext::map_per_player");#d#
1605		1671
1606	warn "resetting map ", $self->path;#d#	1672	warn "resetting map ", $self->path;#d#
1607		1673
		1674	$self->in_memory (cf::MAP_SWAPPED);
		1675
		1676	# need to save uniques path
		1677	unless ($self->{deny_save}) {
		1678	my $uniq = $self->uniq_path; utf8::encode $uniq;
		1679
		1680	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		1681	if $uniq;
		1682	}
		1683
1608	delete $cf::MAP{$self->path};	1684	delete $cf::MAP{$self->path};
		1685
		1686	$self->clear;
1609		1687
1610	$_->clear_links_to ($self) for values %cf::MAP;	1688	$_->clear_links_to ($self) for values %cf::MAP;
1611		1689
1612	$self->unlink_save;	1690	$self->unlink_save;
1613	$self->destroy;	1691	$self->destroy;
…		…
1616	my $nuke_counter = "aaaa";	1694	my $nuke_counter = "aaaa";
1617		1695
1618	sub nuke {	1696	sub nuke {
1619	my ($self) = @_;	1697	my ($self) = @_;
1620		1698
		1699	delete $cf::MAP{$self->path};
		1700
		1701	$self->unlink_save;
		1702
		1703	bless $self, "cf::map";
		1704	delete $self->{deny_reset};
1621	$self->{deny_save} = 1;	1705	$self->{deny_save} = 1;
1622	$self->reset_timeout (1);	1706	$self->reset_timeout (1);
1623	$self->rename ("{nuke}/" . ($nuke_counter++));	1707	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
		1708
		1709	$cf::MAP{$self->path} = $self;
		1710
1624	$self->reset; # polite request, might not happen	1711	$self->reset; # polite request, might not happen
1625	}	1712	}
1626		1713
1627	sub customise_for {	1714	=item cf::map::unique_maps
1628	my ($map, $ob) = @_;
1629		1715
1630	if ($map->per_player) {	1716	Returns an arrayref of paths of all shared maps that have
1631	return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};	1717	instantiated unique items. May block.
1632	}
1633		1718
1634	$map	1719	=cut
		1720
		1721	sub unique_maps() {
		1722	my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
		1723	or return;
		1724
		1725	my @paths;
		1726
		1727	for (@$files) {
		1728	utf8::decode $_;
		1729	next if /\.pst$/;
		1730	next unless /^$PATH_SEP/o;
		1731
		1732	push @paths, cf::map::normalise $_;
		1733	}
		1734
		1735	\@paths
1635	}	1736	}
1636		1737
1637	package cf;	1738	package cf;
1638		1739
1639	=back	1740	=back
…		…
1711		1812
1712	=item $player_object->enter_link	1813	=item $player_object->enter_link
1713		1814
1714	Freezes the player and moves him/her to a special map (C<{link}>).	1815	Freezes the player and moves him/her to a special map (C<{link}>).
1715		1816
1716	The player should be reaosnably safe there for short amounts of time. You	1817	The player should be reasonably safe there for short amounts of time. You
1717	I<MUST> call C<leave_link> as soon as possible, though.	1818	I<MUST> call C<leave_link> as soon as possible, though.
1718		1819
		1820	Will never block.
		1821
1719	=item $player_object->leave_link ($map, $x, $y)	1822	=item $player_object->leave_link ($map, $x, $y)
1720		1823
1721	Moves the player out of the specila link map onto the given map. If the	1824	Moves the player out of the special C<{link}> map onto the specified
1722	map is not valid (or omitted), the player will be moved back to the	1825	map. If the map is not valid (or omitted), the player will be moved back
1723	location he/she was before the call to C<enter_link>, or, if that fails,	1826	to the location he/she was before the call to C<enter_link>, or, if that
1724	to the emergency map position.	1827	fails, to the emergency map position.
1725		1828
1726	Might block.	1829	Might block.
1727		1830
1728	=cut	1831	=cut
		1832
		1833	sub link_map {
		1834	unless ($LINK_MAP) {
		1835	$LINK_MAP = cf::map::find "{link}"
		1836	or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
		1837	$LINK_MAP->load;
		1838	}
		1839
		1840	$LINK_MAP
		1841	}
1729		1842
1730	sub cf::object::player::enter_link {	1843	sub cf::object::player::enter_link {
1731	my ($self) = @_;	1844	my ($self) = @_;
1732		1845
1733	$self->deactivate_recursive;	1846	$self->deactivate_recursive;
1734		1847
1735	return if $self->map == $LINK_MAP;	1848	return if UNIVERSAL::isa $self->map, "ext::map_link";
1736		1849
1737	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	1850	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1738	if $self->map;	1851	if $self->map;
1739		1852
1740	$self->enter_map ($LINK_MAP, 20, 20);	1853	$self->enter_map ($LINK_MAP || link_map, 10, 10);
1741	}	1854	}
1742		1855
1743	sub cf::object::player::leave_link {	1856	sub cf::object::player::leave_link {
1744	my ($self, $map, $x, $y) = @_;	1857	my ($self, $map, $x, $y) = @_;
1745		1858
…		…
1767	$map->load;	1880	$map->load;
1768	$map->load_diag;	1881	$map->load_diag;
1769		1882
1770	return unless $self->contr->active;	1883	return unless $self->contr->active;
1771	$self->activate_recursive;	1884	$self->activate_recursive;
		1885
		1886	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1772	$self->enter_map ($map, $x, $y);	1887	$self->enter_map ($map, $x, $y);
1773	}	1888	}
1774		1889
1775	cf::player->attach (	1890	cf::player->attach (
1776	on_logout => sub {	1891	on_logout => sub {
…		…
1789	# try to abort aborted map switching on player login :)	1904	# try to abort aborted map switching on player login :)
1790	# should happen only on crashes	1905	# should happen only on crashes
1791	if ($pl->ob->{_link_pos}) {	1906	if ($pl->ob->{_link_pos}) {
1792	$pl->ob->enter_link;	1907	$pl->ob->enter_link;
1793	(async {	1908	(async {
1794	# we need this sleep as the login has a concurrent enter_exit running
1795	# and this sleep increases chances of the player not ending up in scorn
1796	$pl->ob->reply (undef,	1909	$pl->ob->reply (undef,
1797	"There was an internal problem at your last logout, "	1910	"There was an internal problem at your last logout, "
1798	. "the server will try to bring you to your intended destination in a second.",	1911	. "the server will try to bring you to your intended destination in a second.",
1799	cf::NDI_RED);	1912	cf::NDI_RED);
		1913	# we need this sleep as the login has a concurrent enter_exit running
		1914	# and this sleep increases chances of the player not ending up in scorn
1800	Coro::Timer::sleep 1;	1915	Coro::Timer::sleep 1;
1801	$pl->ob->leave_link;	1916	$pl->ob->leave_link;
1802	})->prio (2);	1917	})->prio (2);
1803	}	1918	}
1804	},	1919	},
…		…
1809	=cut	1924	=cut
1810		1925
1811	sub cf::object::player::goto {	1926	sub cf::object::player::goto {
1812	my ($self, $path, $x, $y) = @_;	1927	my ($self, $path, $x, $y) = @_;
1813		1928
1814	$path = new cf::path $path;
1815	$path ne "/" or Carp::cluck ("oy");#d#
1816
1817	$self->enter_link;	1929	$self->enter_link;
1818		1930
1819	(async {	1931	(async {
		1932	my $map = eval {
1820	my $map = cf::map::find $path->as_string;	1933	my $map = cf::map::find $path;
1821	$map = $map->customise_for ($self) if $map;	1934	$map = $map->customise_for ($self) if $map;
1822		1935	$map
1823	# warn "entering ", $map->path, " at ($x, $y)\n"	1936	} or
1824	# if $map;
1825
1826	$map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	1937	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1827		1938
1828	$self->leave_link ($map, $x, $y);	1939	$self->leave_link ($map, $x, $y);
1829	})->prio (1);	1940	})->prio (1);
1830	}	1941	}
1831		1942
…		…
1835		1946
1836	sub parse_random_map_params {	1947	sub parse_random_map_params {
1837	my ($spec) = @_;	1948	my ($spec) = @_;
1838		1949
1839	my $rmp = { # defaults	1950	my $rmp = { # defaults
1840	xsize => 10,	1951	xsize => (cf::rndm 15, 40),
1841	ysize => 10,	1952	ysize => (cf::rndm 15, 40),
		1953	symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
		1954	#layout => string,
1842	};	1955	};
1843		1956
1844	for (split /\n/, $spec) {	1957	for (split /\n/, $spec) {
1845	my ($k, $v) = split /\s+/, $_, 2;	1958	my ($k, $v) = split /\s+/, $_, 2;
1846		1959
…		…
1850	$rmp	1963	$rmp
1851	}	1964	}
1852		1965
1853	sub prepare_random_map {	1966	sub prepare_random_map {
1854	my ($exit) = @_;	1967	my ($exit) = @_;
		1968
		1969	my $guard = cf::lock_acquire "exit_prepare:$exit";
1855		1970
1856	# all this does is basically replace the /! path by	1971	# all this does is basically replace the /! path by
1857	# a new random map path (?random/...) with a seed	1972	# a new random map path (?random/...) with a seed
1858	# that depends on the exit object	1973	# that depends on the exit object
1859		1974
1860	my $rmp = parse_random_map_params $exit->msg;	1975	my $rmp = parse_random_map_params $exit->msg;
1861		1976
1862	if ($exit->map) {	1977	if ($exit->map) {
1863	$rmp->{region} = $exit->map->region_name;	1978	$rmp->{region} = $exit->region->name;
1864	$rmp->{origin_map} = $exit->map->path;	1979	$rmp->{origin_map} = $exit->map->path;
1865	$rmp->{origin_x} = $exit->x;	1980	$rmp->{origin_x} = $exit->x;
1866	$rmp->{origin_y} = $exit->y;	1981	$rmp->{origin_y} = $exit->y;
1867	}	1982	}
1868		1983
1869	$rmp->{random_seed} ||= $exit->random_seed;	1984	$rmp->{random_seed} ||= $exit->random_seed;
1870		1985
1871	my $data = cf::to_json $rmp;	1986	my $data = cf::to_json $rmp;
1872	my $md5 = Digest::MD5::md5_hex $data;	1987	my $md5 = Digest::MD5::md5_hex $data;
		1988	my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1873		1989
1874	if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) {	1990	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1875	aio_write $fh, 0, (length $data), $data, 0;	1991	aio_write $fh, 0, (length $data), $data, 0;
		1992	undef $fh;
		1993	aio_rename "$meta~", $meta;
1876		1994
1877	$exit->slaying ("?random/$md5");	1995	$exit->slaying ("?random/$md5");
1878	$exit->msg (undef);	1996	$exit->msg (undef);
1879	}	1997	}
1880	}	1998	}
1881		1999
1882	sub cf::object::player::enter_exit {	2000	sub cf::object::player::enter_exit {
1883	my ($self, $exit) = @_;	2001	my ($self, $exit) = @_;
1884		2002
1885	return unless $self->type == cf::PLAYER;	2003	return unless $self->type == cf::PLAYER;
		2004
		2005	if ($exit->slaying eq "/!") {
		2006	#TODO: this should de-fi-ni-te-ly not be a sync-job
		2007	# the problem is that $exit might not survive long enough
		2008	# so it needs to be done right now, right here
		2009	cf::sync_job { prepare_random_map $exit };
		2010	}
		2011
		2012	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
		2013	my $hp = $exit->stats->hp;
		2014	my $sp = $exit->stats->sp;
1886		2015
1887	$self->enter_link;	2016	$self->enter_link;
1888		2017
1889	(async {	2018	(async {
1890	$self->deactivate_recursive; # just to be sure	2019	$self->deactivate_recursive; # just to be sure
1891	unless (eval {	2020	unless (eval {
1892	prepare_random_map $exit	2021	$self->goto ($slaying, $hp, $sp);
1893	if $exit->slaying eq "/!";
1894
1895	my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1896	$self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1897		2022
1898	1;	2023	1;
1899	}) {	2024	}) {
1900	$self->message ("Something went wrong deep within the crossfire server. "	2025	$self->message ("Something went wrong deep within the crossfire server. "
1901	. "I'll try to bring you back to the map you were before. "	2026	. "I'll try to bring you back to the map you were before. "
1902	. "Please report this to the dungeon master",	2027	. "Please report this to the dungeon master!",
1903	cf::NDI_UNIQUE | cf::NDI_RED);	2028	cf::NDI_UNIQUE | cf::NDI_RED);
1904		2029
1905	warn "ERROR in enter_exit: $@";	2030	warn "ERROR in enter_exit: $@";
1906	$self->leave_link;	2031	$self->leave_link;
1907	}	2032	}
1908	})->prio (1);	2033	})->prio (1);
…		…
1921		2046
1922	sub cf::client::send_drawinfo {	2047	sub cf::client::send_drawinfo {
1923	my ($self, $text, $flags) = @_;	2048	my ($self, $text, $flags) = @_;
1924		2049
1925	utf8::encode $text;	2050	utf8::encode $text;
1926	$self->send_packet (sprintf "drawinfo %d %s", $flags, $text);	2051	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1927	}	2052	}
1928		2053
		2054	=item $client->ext_event ($type, %msg)
		2055
		2056	Sends an exti event to the client.
		2057
		2058	=cut
		2059
		2060	sub cf::client::ext_event($$%) {
		2061	my ($self, $type, %msg) = @_;
		2062
		2063	$msg{msgtype} = "event_$type";
		2064	$self->send_packet ("ext " . cf::to_json \%msg);
		2065	}
1929		2066
1930	=item $success = $client->query ($flags, "text", \&cb)	2067	=item $success = $client->query ($flags, "text", \&cb)
1931		2068
1932	Queues a query to the client, calling the given callback with	2069	Queues a query to the client, calling the given callback with
1933	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2070	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
…		…
1962	# get handled first	2099	# get handled first
1963	my $queue = delete $ns->{query_queue}	2100	my $queue = delete $ns->{query_queue}
1964	or return; # be conservative, not sure how that can happen, but we saw a crash here	2101	or return; # be conservative, not sure how that can happen, but we saw a crash here
1965		2102
1966	(shift @$queue)->[1]->($msg);	2103	(shift @$queue)->[1]->($msg);
		2104	return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1967		2105
1968	push @{ $ns->{query_queue} }, @$queue;	2106	push @{ $ns->{query_queue} }, @$queue;
1969		2107
1970	if (@{ $ns->{query_queue} } == @$queue) {	2108	if (@{ $ns->{query_queue} } == @$queue) {
1971	if (@$queue) {	2109	if (@$queue) {
…		…
2029		2167
2030	# here we export the classes and methods available to script code	2168	# here we export the classes and methods available to script code
2031		2169
2032	=pod	2170	=pod
2033		2171
2034	The following fucntions and emthods are available within a safe environment:	2172	The following functions and methods are available within a safe environment:
2035		2173
2036	cf::object contr pay_amount pay_player map	2174	cf::object contr pay_amount pay_player map
2037	cf::object::player player	2175	cf::object::player player
2038	cf::player peaceful	2176	cf::player peaceful
2039	cf::map trigger	2177	cf::map trigger
…		…
2132	The parameter C<$family> should best start with the name of the extension	2270	The parameter C<$family> should best start with the name of the extension
2133	using it, it should be unique.	2271	using it, it should be unique.
2134		2272
2135	=over 4	2273	=over 4
2136		2274
2137	=item $hashref = cf::db_get $family
2138
2139	Return a hashref for use by the extension C<$family>, which can be
2140	modified. After modifications, you have to call C<cf::db_dirty> or
2141	C<cf::db_sync>.
2142
2143	=item $value = cf::db_get $family => $key	2275	=item $value = cf::db_get $family => $key
2144		2276
2145	Returns a single value from the database	2277	Returns a single value from the database.
2146
2147	=item cf::db_put $family => $hashref
2148
2149	Stores the given family hashref into the database. Updates are delayed, if
2150	you want the data to be synced to disk immediately, use C<cf::db_sync>.
2151		2278
2152	=item cf::db_put $family => $key => $value	2279	=item cf::db_put $family => $key => $value
2153		2280
2154	Stores the given C<$value> in the family hash. Updates are delayed, if you	2281	Stores the given C<$value> in the family.
2155	want the data to be synced to disk immediately, use C<cf::db_sync>.
2156
2157	=item cf::db_dirty
2158
2159	Marks the database as dirty, to be updated at a later time.
2160
2161	=item cf::db_sync
2162
2163	Immediately write the database to disk I<if it is dirty>.
2164		2282
2165	=cut	2283	=cut
2166		2284
2167	our $DB;	2285	our $DB;
2168		2286
2169	{	2287	sub db_init {
		2288	unless ($DB) {
		2289	$DB = BDB::db_create $DB_ENV;
		2290
		2291	cf::sync_job {
		2292	eval {
		2293	$DB->set_flags (BDB::CHKSUM);
		2294
		2295	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
		2296	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		2297	cf::cleanup "db_open(db): $!" if $!;
		2298	};
		2299	cf::cleanup "db_open(db): $@" if $@;
		2300	};
		2301
2170	my $path = cf::localdir . "/database.pst";	2302	my $path = cf::localdir . "/database.pst";
		2303	if (stat $path) {
		2304	cf::sync_job {
		2305	my $pst = Storable::retrieve $path;
2171		2306
2172	sub db_load() {	2307	cf::db_put (board => data => $pst->{board});
2173	$DB = stat $path ? Storable::retrieve $path : { };	2308	cf::db_put (guildrules => data => $pst->{guildrules});
2174	}	2309	cf::db_put (rent => balance => $pst->{rent}{balance});
		2310	BDB::db_env_txn_checkpoint $DB_ENV;
2175		2311
2176	my $pid;	2312	unlink $path;
2177
2178	sub db_save() {
2179	waitpid $pid, 0 if $pid;
2180	if (0 == ($pid = fork)) {
2181	$DB->{_meta}{version} = 1;
2182	Storable::nstore $DB, "$path~";
2183	rename "$path~", $path;
2184	cf::_exit 0 if defined $pid;
2185	}	2313	};
2186	}
2187
2188	my $dirty;
2189
2190	sub db_sync() {
2191	db_save if $dirty;
2192	undef $dirty;
2193	}
2194
2195	my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2196	db_sync;
2197	});
2198
2199	sub db_dirty() {
2200	$dirty = 1;
2201	$idle->start;
2202	}
2203
2204	sub db_get($;$) {
2205	@_ >= 2
2206	? $DB->{$_[0]}{$_[1]}
2207	: ($DB->{$_[0]} ||= { })
2208	}
2209
2210	sub db_put($$;$) {
2211	if (@_ >= 3) {
2212	$DB->{$_[0]}{$_[1]} = $_[2];
2213	} else {
2214	$DB->{$_[0]} = $_[1];
2215	}
2216	db_dirty;
2217	}
2218
2219	cf::global->attach (
2220	prio => 10000,
2221	on_cleanup => sub {
2222	db_sync;
2223	},	2314	}
2224	);	2315	}
		2316	}
		2317
		2318	sub db_get($$) {
		2319	my $key = "$_[0]/$_[1]";
		2320
		2321	cf::sync_job {
		2322	BDB::db_get $DB, undef, $key, my $data;
		2323
		2324	$! ? ()
		2325	: Compress::LZF::sthaw $data
		2326	}
		2327	}
		2328
		2329	sub db_put($$$) {
		2330	BDB::dbreq_pri 4;
		2331	BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2225	}	2332	}
2226		2333
2227	#############################################################################	2334	#############################################################################
2228	# the server's main()	2335	# the server's init and main functions
		2336
		2337	sub load_facedata {
		2338	my $path = sprintf "%s/facedata", cf::datadir;
		2339
		2340	warn "loading facedata from $path\n";
		2341
		2342	my $facedata;
		2343	0 < aio_load $path, $facedata
		2344	or die "$path: $!";
		2345
		2346	$facedata = Coro::Storable::thaw $facedata;
		2347
		2348	$facedata->{version} == 2
		2349	or cf::cleanup "$path: version mismatch, cannot proceed.";
		2350
		2351	{
		2352	my $faces = $facedata->{faceinfo};
		2353
		2354	while (my ($face, $info) = each %$faces) {
		2355	my $idx = (cf::face::find $face) || cf::face::alloc $face;
		2356	cf::face::set $idx, $info->{visibility}, $info->{magicmap};
		2357	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
		2358	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
		2359	Coro::cede;
		2360	}
		2361
		2362	while (my ($face, $info) = each %$faces) {
		2363	next unless $info->{smooth};
		2364	my $idx = cf::face::find $face
		2365	or next;
		2366	if (my $smooth = cf::face::find $info->{smooth}) {
		2367	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
		2368	} else {
		2369	warn "smooth face '$info->{smooth}' not found for face '$face'";
		2370	}
		2371	Coro::cede;
		2372	}
		2373	}
		2374
		2375	{
		2376	my $anims = $facedata->{animinfo};
		2377
		2378	while (my ($anim, $info) = each %$anims) {
		2379	cf::anim::set $anim, $info->{frames}, $info->{facings};
		2380	Coro::cede;
		2381	}
		2382
		2383	cf::anim::invalidate_all; # d'oh
		2384	}
		2385
		2386	1
		2387	}
		2388
		2389	our $archetypes_loaded;
		2390
		2391	sub load_archetypes {
		2392	return 1 if $archetypes_loaded++; # current can only load them once
		2393	# load_archetype_file sprintf "%s/archetypes", cf::datadir;
		2394	load_archetype_file sprintf "%s/archetypes", cf::datadir
		2395	}
		2396
		2397	sub load_treasures {
		2398	load_treasure_file sprintf "%s/treasures", cf::datadir
		2399	}
		2400
		2401	sub reload_resources {
		2402	load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
		2403	or die "unable to load regions file\n";
		2404	load_facedata
		2405	or die "unable to load facedata\n";
		2406	load_archetypes
		2407	or die "unable to load archetypes\n";
		2408	load_treasures
		2409	or die "unable to load treasurelists\n";
		2410	}
		2411
		2412	sub init {
		2413	reload_resources;
		2414	}
2229		2415
2230	sub cfg_load {	2416	sub cfg_load {
2231	open my $fh, "<:utf8", cf::confdir . "/config"	2417	open my $fh, "<:utf8", cf::confdir . "/config"
2232	or return;	2418	or return;
2233		2419
…		…
2250		2436
2251	sub main {	2437	sub main {
2252	# we must not ever block the main coroutine	2438	# we must not ever block the main coroutine
2253	local $Coro::idle = sub {	2439	local $Coro::idle = sub {
2254	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	2440	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
		2441	(async {
2255	async { Event::one_event };	2442	Event::one_event;
		2443	})->prio (Coro::PRIO_MAX);
2256	};	2444	};
2257		2445
2258	cfg_load;	2446	cfg_load;
2259	db_load;	2447	db_init;
2260	load_extensions;	2448	load_extensions;
		2449
		2450	$TICK_WATCHER->start;
2261	Event::loop;	2451	Event::loop;
2262	}	2452	}
2263		2453
2264	#############################################################################	2454	#############################################################################
2265	# initialisation and cleanup	2455	# initialisation and cleanup
2266		2456
2267	# install some emergency cleanup handlers	2457	# install some emergency cleanup handlers
2268	BEGIN {	2458	BEGIN {
2269	for my $signal (qw(INT HUP TERM)) {	2459	for my $signal (qw(INT HUP TERM)) {
2270	Event->signal (	2460	Event->signal (
		2461	reentrant => 0,
2271	data => WF_AUTOCANCEL,	2462	data => WF_AUTOCANCEL,
2272	signal => $signal,	2463	signal => $signal,
		2464	prio => 0,
2273	cb => sub {	2465	cb => sub {
2274	cf::cleanup "SIG$signal";	2466	cf::cleanup "SIG$signal";
2275	},	2467	},
2276	);	2468	);
2277	}	2469	}
2278	}	2470	}
…		…
2283	warn "enter emergency perl save\n";	2475	warn "enter emergency perl save\n";
2284		2476
2285	cf::sync_job {	2477	cf::sync_job {
2286	# use a peculiar iteration method to avoid tripping on perl	2478	# use a peculiar iteration method to avoid tripping on perl
2287	# refcount bugs in for. also avoids problems with players	2479	# refcount bugs in for. also avoids problems with players
2288	# and maps saved/Destroyed asynchronously.	2480	# and maps saved/destroyed asynchronously.
2289	warn "begin emergency player save\n";	2481	warn "begin emergency player save\n";
2290	for my $login (keys %cf::PLAYER) {	2482	for my $login (keys %cf::PLAYER) {
2291	my $pl = $cf::PLAYER{$login} or next;	2483	my $pl = $cf::PLAYER{$login} or next;
2292	$pl->valid or next;	2484	$pl->valid or next;
2293	$pl->save;	2485	$pl->save;
…		…
2299	my $map = $cf::MAP{$path} or next;	2491	my $map = $cf::MAP{$path} or next;
2300	$map->valid or next;	2492	$map->valid or next;
2301	$map->save;	2493	$map->save;
2302	}	2494	}
2303	warn "end emergency map save\n";	2495	warn "end emergency map save\n";
		2496
		2497	warn "begin emergency database checkpoint\n";
		2498	BDB::db_env_txn_checkpoint $DB_ENV;
		2499	warn "end emergency database checkpoint\n";
2304	};	2500	};
2305		2501
2306	warn "leave emergency perl save\n";	2502	warn "leave emergency perl save\n";
		2503	}
		2504
		2505	sub post_cleanup {
		2506	my ($make_core) = @_;
		2507
		2508	warn Carp::longmess "post_cleanup backtrace"
		2509	if $make_core;
2307	}	2510	}
2308		2511
2309	sub reload() {	2512	sub reload() {
2310	# can/must only be called in main	2513	# can/must only be called in main
2311	if ($Coro::current != $Coro::main) {	2514	if ($Coro::current != $Coro::main) {
2312	warn "can only reload from main coroutine\n";	2515	warn "can only reload from main coroutine";
2313	return;	2516	return;
2314	}	2517	}
2315		2518
2316	warn "reloading...";	2519	warn "reloading...";
2317		2520
2318	my $guard = freeze_mainloop;	2521	warn "entering sync_job";
		2522
		2523	cf::sync_job {
		2524	cf::write_runtime; # external watchdog should not bark
2319	cf::emergency_save;	2525	cf::emergency_save;
		2526	cf::write_runtime; # external watchdog should not bark
2320		2527
2321	eval {	2528	warn "syncing database to disk";
		2529	BDB::db_env_txn_checkpoint $DB_ENV;
		2530
2322	# if anything goes wrong in here, we should simply crash as we already saved	2531	# if anything goes wrong in here, we should simply crash as we already saved
2323		2532
2324	# cancel all watchers	2533	warn "cancelling all WF_AUTOCANCEL watchers";
2325	for (Event::all_watchers) {	2534	for (Event::all_watchers) {
2326	$_->cancel if $_->data & WF_AUTOCANCEL;	2535	$_->cancel if $_->data & WF_AUTOCANCEL;
2327	}	2536	}
2328		2537
		2538	warn "flushing outstanding aio requests";
		2539	for (;;) {
		2540	BDB::flush;
		2541	IO::AIO::flush;
		2542	Coro::cede;
		2543	last unless IO::AIO::nreqs || BDB::nreqs;
		2544	warn "iterate...";
		2545	}
		2546
		2547	++$RELOAD;
		2548
2329	# cancel all extension coros	2549	warn "cancelling all extension coros";
2330	$_->cancel for values %EXT_CORO;	2550	$_->cancel for values %EXT_CORO;
2331	%EXT_CORO = ();	2551	%EXT_CORO = ();
2332		2552
2333	# unload all extensions	2553	warn "removing commands";
2334	for (@exts) {	2554	%COMMAND = ();
		2555
		2556	warn "removing ext commands";
		2557	%EXTCMD = ();
		2558
		2559	warn "unloading/nuking all extensions";
		2560	for my $pkg (@EXTS) {
2335	warn "unloading <$_>";	2561	warn "... unloading $pkg";
2336	unload_extension $_;	2562
		2563	if (my $cb = $pkg->can ("unload")) {
		2564	eval {
		2565	$cb->($pkg);
		2566	1
		2567	} or warn "$pkg unloaded, but with errors: $@";
2337	}	2568	}
2338		2569
		2570	warn "... nuking $pkg";
		2571	Symbol::delete_package $pkg;
		2572	}
		2573
2339	# unload all modules loaded from $LIBDIR	2574	warn "unloading all perl modules loaded from $LIBDIR";
2340	while (my ($k, $v) = each %INC) {	2575	while (my ($k, $v) = each %INC) {
2341	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	2576	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2342		2577
2343	warn "removing <$k>";	2578	warn "... unloading $k";
2344	delete $INC{$k};	2579	delete $INC{$k};
2345		2580
2346	$k =~ s/\.pm$//;	2581	$k =~ s/\.pm$//;
2347	$k =~ s/\//::/g;	2582	$k =~ s/\//::/g;
2348		2583
…		…
2351	}	2586	}
2352		2587
2353	Symbol::delete_package $k;	2588	Symbol::delete_package $k;
2354	}	2589	}
2355		2590
2356	# sync database to disk
2357	cf::db_sync;
2358	IO::AIO::flush;
2359
2360	# get rid of safe::, as good as possible	2591	warn "getting rid of safe::, as good as possible";
2361	Symbol::delete_package "safe::$_"	2592	Symbol::delete_package "safe::$_"
2362	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	2593	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2363		2594
2364	# remove register_script_function callbacks
2365	# TODO
2366
2367	# unload cf.pm "a bit"	2595	warn "unloading cf.pm \"a bit\"";
2368	delete $INC{"cf.pm"};	2596	delete $INC{"cf.pm"};
2369		2597
2370	# don't, removes xs symbols, too,	2598	# don't, removes xs symbols, too,
2371	# and global variables created in xs	2599	# and global variables created in xs
2372	#Symbol::delete_package __PACKAGE__;	2600	#Symbol::delete_package __PACKAGE__;
2373		2601
2374	# reload cf.pm	2602	warn "unload completed, starting to reload now";
		2603
2375	warn "reloading cf.pm";	2604	warn "reloading cf.pm";
2376	require cf;	2605	require cf;
2377	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	2606	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2378		2607
2379	# load config and database again	2608	warn "loading config and database again";
2380	cf::cfg_load;	2609	cf::cfg_load;
2381	cf::db_load;
2382		2610
2383	# load extensions
2384	warn "load extensions";	2611	warn "loading extensions";
2385	cf::load_extensions;	2612	cf::load_extensions;
2386		2613
2387	# reattach attachments to objects	2614	warn "reattaching attachments to objects/players";
2388	warn "reattach";	2615	_global_reattach; # objects, sockets
2389	_global_reattach;	2616	warn "reattaching attachments to maps";
2390	reattach $_ for values %MAP;	2617	reattach $_ for values %MAP;
2391	};	2618	warn "reattaching attachments to players";
		2619	reattach $_ for values %PLAYER;
2392		2620
2393	if ($@) {	2621	warn "loading reloadable resources";
		2622	reload_resources;
		2623
		2624	warn "leaving sync_job";
		2625
		2626	1
		2627	} or do {
2394	warn $@;	2628	warn $@;
2395	warn "error while reloading, exiting.";	2629	warn "error while reloading, exiting.";
2396	exit 1;	2630	exit 1;
2397	}	2631	};
2398		2632
2399	warn "reloaded successfully";	2633	warn "reloaded";
2400	};	2634	};
2401		2635
2402	#############################################################################	2636	our $RELOAD_WATCHER; # used only during reload
2403
2404	unless ($LINK_MAP) {
2405	$LINK_MAP = cf::map::new;
2406
2407	$LINK_MAP->width (41);
2408	$LINK_MAP->height (41);
2409	$LINK_MAP->alloc;
2410	$LINK_MAP->path ("{link}");
2411	$LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2412	$LINK_MAP->in_memory (MAP_IN_MEMORY);
2413
2414	# dirty hack because... archetypes are not yet loaded
2415	Event->timer (
2416	after => 10,
2417	cb => sub {
2418	$_[0]->w->cancel;
2419
2420	# provide some exits "home"
2421	my $exit = cf::object::new "exit";
2422
2423	$exit->slaying ($EMERGENCY_POSITION->[0]);
2424	$exit->stats->hp ($EMERGENCY_POSITION->[1]);
2425	$exit->stats->sp ($EMERGENCY_POSITION->[2]);
2426
2427	$LINK_MAP->insert ($exit->clone, 19, 19);
2428	$LINK_MAP->insert ($exit->clone, 19, 20);
2429	$LINK_MAP->insert ($exit->clone, 19, 21);
2430	$LINK_MAP->insert ($exit->clone, 20, 19);
2431	$LINK_MAP->insert ($exit->clone, 20, 21);
2432	$LINK_MAP->insert ($exit->clone, 21, 19);
2433	$LINK_MAP->insert ($exit->clone, 21, 20);
2434	$LINK_MAP->insert ($exit->clone, 21, 21);
2435
2436	$exit->destroy;
2437	});
2438
2439	$LINK_MAP->{deny_save} = 1;
2440	$LINK_MAP->{deny_reset} = 1;
2441
2442	$cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2443	}
2444
2445	register "<global>", __PACKAGE__;
2446		2637
2447	register_command "reload" => sub {	2638	register_command "reload" => sub {
2448	my ($who, $arg) = @_;	2639	my ($who, $arg) = @_;
2449		2640
2450	if ($who->flag (FLAG_WIZ)) {	2641	if ($who->flag (FLAG_WIZ)) {
2451	$who->message ("start of reload.");	2642	$who->message ("reloading server.");
		2643
		2644	# doing reload synchronously and two reloads happen back-to-back,
		2645	# coro crashes during coro_state_free->destroy here.
		2646
		2647	$RELOAD_WATCHER ||= Event->timer (
		2648	reentrant => 0,
		2649	after => 0,
		2650	data => WF_AUTOCANCEL,
		2651	cb => sub {
2452	reload;	2652	reload;
2453	$who->message ("end of reload.");	2653	undef $RELOAD_WATCHER;
		2654	},
		2655	);
2454	}	2656	}
2455	};	2657	};
2456		2658
2457	unshift @INC, $LIBDIR;	2659	unshift @INC, $LIBDIR;
		2660
		2661	my $bug_warning = 0;
		2662
		2663	our @WAIT_FOR_TICK;
		2664	our @WAIT_FOR_TICK_BEGIN;
		2665
		2666	sub wait_for_tick {
		2667	return unless $TICK_WATCHER->is_active;
		2668	return if $Coro::current == $Coro::main;
		2669
		2670	my $signal = new Coro::Signal;
		2671	push @WAIT_FOR_TICK, $signal;
		2672	$signal->wait;
		2673	}
		2674
		2675	sub wait_for_tick_begin {
		2676	return unless $TICK_WATCHER->is_active;
		2677	return if $Coro::current == $Coro::main;
		2678
		2679	my $signal = new Coro::Signal;
		2680	push @WAIT_FOR_TICK_BEGIN, $signal;
		2681	$signal->wait;
		2682	}
2458		2683
2459	$TICK_WATCHER = Event->timer (	2684	$TICK_WATCHER = Event->timer (
2460	reentrant => 0,	2685	reentrant => 0,
		2686	parked => 1,
2461	prio => 0,	2687	prio => 0,
2462	at => $NEXT_TICK || $TICK,	2688	at => $NEXT_TICK || $TICK,
2463	data => WF_AUTOCANCEL,	2689	data => WF_AUTOCANCEL,
2464	cb => sub {	2690	cb => sub {
		2691	if ($Coro::current != $Coro::main) {
		2692	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
		2693	unless ++$bug_warning > 10;
		2694	return;
		2695	}
		2696
		2697	$NOW = Event::time;
		2698
2465	cf::server_tick; # one server iteration	2699	cf::server_tick; # one server iteration
2466	$RUNTIME += $TICK;	2700	$RUNTIME += $TICK;
2467	$NEXT_TICK += $TICK;	2701	$NEXT_TICK += $TICK;
2468		2702
2469	$WAIT_FOR_TICK->broadcast;	2703	if ($NOW >= $NEXT_RUNTIME_WRITE) {
2470	$WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;	2704	$NEXT_RUNTIME_WRITE = $NOW + 10;
		2705	Coro::async_pool {
		2706	write_runtime
		2707	or warn "ERROR: unable to write runtime file: $!";
		2708	};
		2709	}
		2710
		2711	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
		2712	$sig->send;
		2713	}
		2714	while (my $sig = shift @WAIT_FOR_TICK) {
		2715	$sig->send;
		2716	}
		2717
		2718	# my $AFTER = Event::time;
		2719	# warn $AFTER - $NOW;#d#
2471		2720
2472	# if we are delayed by four ticks or more, skip them all	2721	# if we are delayed by four ticks or more, skip them all
2473	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2722	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2474		2723
2475	$TICK_WATCHER->at ($NEXT_TICK);	2724	$TICK_WATCHER->at ($NEXT_TICK);
2476	$TICK_WATCHER->start;	2725	$TICK_WATCHER->start;
2477	},	2726	},
2478	);	2727	);
2479		2728
		2729	{
2480	IO::AIO::max_poll_time $TICK * 0.2;	2730	BDB::max_poll_time $TICK * 0.1;
2481		2731	$BDB_POLL_WATCHER = Event->io (
2482	Event->io (	2732	reentrant => 0,
2483	fd => IO::AIO::poll_fileno,	2733	fd => BDB::poll_fileno,
2484	poll => 'r',	2734	poll => 'r',
2485	prio => 5,	2735	prio => 0,
2486	data => WF_AUTOCANCEL,
2487	cb => \&IO::AIO::poll_cb,
2488	);
2489
2490	Event->timer (
2491	data => WF_AUTOCANCEL,	2736	data => WF_AUTOCANCEL,
2492	after => 0,	2737	cb => \&BDB::poll_cb,
2493	interval => 10,	2738	);
2494	cb => sub {	2739	BDB::min_parallel 8;
2495	(Coro::unblock_sub {	2740
2496	write_runtime	2741	BDB::set_sync_prepare {
2497	or warn "ERROR: unable to write runtime file: $!";	2742	my $status;
		2743	my $current = $Coro::current;
		2744	(
		2745	sub {
		2746	$status = $!;
		2747	$current->ready; undef $current;
		2748	},
		2749	sub {
		2750	Coro::schedule while defined $current;
		2751	$! = $status;
		2752	},
		2753	)
		2754	};
		2755
		2756	unless ($DB_ENV) {
		2757	$DB_ENV = BDB::db_env_create;
		2758
		2759	cf::sync_job {
		2760	eval {
		2761	BDB::db_env_open
		2762	$DB_ENV,
		2763	$BDB_ENV_DIR,
		2764	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
		2765	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
		2766	0666;
		2767
		2768	cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
		2769
		2770	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
		2771	$DB_ENV->set_lk_detect;
		2772	};
		2773
		2774	cf::cleanup "db_env_open(db): $@" if $@;
2498	})->();	2775	};
2499	},	2776	}
2500	);	2777	}
		2778
		2779	{
		2780	IO::AIO::min_parallel 8;
		2781
		2782	undef $Coro::AIO::WATCHER;
		2783	IO::AIO::max_poll_time $TICK * 0.1;
		2784	$AIO_POLL_WATCHER = Event->io (
		2785	reentrant => 0,
		2786	data => WF_AUTOCANCEL,
		2787	fd => IO::AIO::poll_fileno,
		2788	poll => 'r',
		2789	prio => 6,
		2790	cb => \&IO::AIO::poll_cb,
		2791	);
		2792	}
2501		2793
2502	END { cf::emergency_save }	2794	END { cf::emergency_save }
2503		2795
2504	1	2796	1
2505		2797

Diff Legend

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