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.154 by root, Tue Jan 9 15:36:19 2007 UTC vs.
Revision 1.200 by root, Mon Jan 29 17:57:22 2007 UTC

…		…
8	use Storable;	8	use Storable;
9	use Opcode;	9	use Opcode;
10	use Safe;	10	use Safe;
11	use Safe::Hole;	11	use Safe::Hole;
12		12
13	use Coro 3.3 ();	13	use Coro 3.5 ();
14	use Coro::Event;	14	use Coro::Event;
15	use Coro::Timer;	15	use Coro::Timer;
16	use Coro::Signal;	16	use Coro::Signal;
17	use Coro::Semaphore;	17	use Coro::Semaphore;
18	use Coro::AIO;	18	use Coro::AIO;
…		…
24	use YAML::Syck ();	24	use YAML::Syck ();
25	use Time::HiRes;	25	use Time::HiRes;
26		26
27	use Event; $Event::Eval = 1; # no idea why this is required, but it is	27	use Event; $Event::Eval = 1; # no idea why this is required, but it is
28		28
		29	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
		30
29	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?	31	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
30	$YAML::Syck::ImplicitUnicode = 1;	32	$YAML::Syck::ImplicitUnicode = 1;
31		33
32	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	34	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
33		35
34	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
35
36	our %COMMAND = ();	36	our %COMMAND = ();
37	our %COMMAND_TIME = ();	37	our %COMMAND_TIME = ();
		38
		39	our @EXTS = (); # list of extension package names
38	our %EXTCMD = ();	40	our %EXTCMD = ();
		41	our %EXT_CORO = (); # coroutines bound to extensions
		42	our %EXT_MAP = (); # pluggable maps
39		43
40	our @EVENT;	44	our @EVENT;
41	our $LIBDIR = datadir . "/ext";	45	our $LIBDIR = datadir . "/ext";
42		46
43	our $TICK = MAX_TIME * 1e-6;	47	our $TICK = MAX_TIME * 1e-6;
44	our $TICK_WATCHER;	48	our $TICK_WATCHER;
		49	our $AIO_POLL_WATCHER;
		50	our $WRITE_RUNTIME_WATCHER;
45	our $NEXT_TICK;	51	our $NEXT_TICK;
46	our $NOW;	52	our $NOW;
47		53
48	our %CFG;	54	our %CFG;
49		55
50	our $UPTIME; $UPTIME ||= time;	56	our $UPTIME; $UPTIME ||= time;
51	our $RUNTIME;	57	our $RUNTIME;
52		58
53	our %PLAYER; # all users	59	our %PLAYER; # all users
54	our %MAP; # all maps	60	our %MAP; # all maps
55	our $LINK_MAP; # the special {link} map	61	our $LINK_MAP; # the special {link} map, which is always available
56	our $RANDOM_MAPS = cf::localdir . "/random";	62	our $RANDOM_MAPS = cf::localdir . "/random";
57	our %EXT_CORO; # coroutines bound to extensions	63
		64	our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
		65	our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
		66
		67	# used to convert map paths into valid unix filenames by replacing / by ∕
		68	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
58		69
59	binmode STDOUT;	70	binmode STDOUT;
60	binmode STDERR;	71	binmode STDERR;
61		72
62	# read virtual server time, if available	73	# read virtual server time, if available
…		…
70	mkdir cf::localdir . "/" . cf::playerdir;	81	mkdir cf::localdir . "/" . cf::playerdir;
71	mkdir cf::localdir . "/" . cf::tmpdir;	82	mkdir cf::localdir . "/" . cf::tmpdir;
72	mkdir cf::localdir . "/" . cf::uniquedir;	83	mkdir cf::localdir . "/" . cf::uniquedir;
73	mkdir $RANDOM_MAPS;	84	mkdir $RANDOM_MAPS;
74		85
75	# a special map that is always available
76	our $LINK_MAP;
77	our $EMERGENCY_POSITION;	86	our $EMERGENCY_POSITION;
		87
		88	sub cf::map::normalise;
78		89
79	#############################################################################	90	#############################################################################
80		91
81	=head2 GLOBAL VARIABLES	92	=head2 GLOBAL VARIABLES
82		93
…		…
106		117
107	=item %cf::CFG	118	=item %cf::CFG
108		119
109	Configuration for the server, loaded from C</etc/crossfire/config>, or	120	Configuration for the server, loaded from C</etc/crossfire/config>, or
110	from wherever your confdir points to.	121	from wherever your confdir points to.
		122
		123	=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
		124
		125	These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
		126	or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
		127	processing has been done. Call C<< ->wait >> on them to maximise the
		128	window of cpu time available, or simply to synchronise to the server tick.
111		129
112	=back	130	=back
113		131
114	=cut	132	=cut
115		133
…		…
146	}	164	}
147		165
148	$Event::DIED = sub {	166	$Event::DIED = sub {
149	warn "error in event callback: @_";	167	warn "error in event callback: @_";
150	};	168	};
151
152	my %ext_pkg;
153	my @exts;
154	my @hook;
155		169
156	=head2 UTILITY FUNCTIONS	170	=head2 UTILITY FUNCTIONS
157		171
158	=over 4	172	=over 4
159		173
…		…
247	}	261	}
248		262
249	sub freeze_mainloop {	263	sub freeze_mainloop {
250	return unless $TICK_WATCHER->is_active;	264	return unless $TICK_WATCHER->is_active;
251		265
252	my $guard = Coro::guard { $TICK_WATCHER->start };	266	my $guard = Coro::guard {
		267	$TICK_WATCHER->start;
		268	$WRITE_RUNTIME_WATCHER->start;
		269	};
		270	$WRITE_RUNTIME_WATCHER->stop;
253	$TICK_WATCHER->stop;	271	$TICK_WATCHER->stop;
254	$guard	272	$guard
255	}	273	}
256		274
257	=item cf::async { BLOCK }	275	=item cf::async { BLOCK }
…		…
309	}	327	}
310	}	328	}
311		329
312	=item $coro = cf::async_ext { BLOCK }	330	=item $coro = cf::async_ext { BLOCK }
313		331
314	Like async, but this coro is automcatially being canceled when the	332	Like async, but this coro is automatically being canceled when the
315	extension calling this is being unloaded.	333	extension calling this is being unloaded.
316		334
317	=cut	335	=cut
318		336
319	sub async_ext(&) {	337	sub async_ext(&) {
…		…
333	my $runtime = cf::localdir . "/runtime";	351	my $runtime = cf::localdir . "/runtime";
334		352
335	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	353	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
336	or return;	354	or return;
337		355
		356	my $value = $cf::RUNTIME + 90 + 10;
338	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
339	(aio_write $fh, 0, (length $value), $value, 0) <= 0	360	(aio_write $fh, 0, (length $value), $value, 0) <= 0
340	and return;	361	and return;
341		362
342	aio_fsync $fh	363	aio_fsync $fh
343	and return;	364	and return;
…		…
352	}	373	}
353		374
354	=back	375	=back
355		376
356	=cut	377	=cut
357
358	#############################################################################
359
360	package cf::path;
361
362	# used to convert map paths into valid unix filenames by repalcing / by ∕
363	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
364
365	sub new {
366	my ($class, $path, $base) = @_;
367
368	$path = $path->as_string if ref $path;
369
370	my $self = bless { }, $class;
371
372	# {... are special paths that are not touched
373	# ?xxx/... are special absolute paths
374	# ?random/... random maps
375	# /! non-realised random map exit
376	# /... normal maps
377	# ~/... per-player maps without a specific player (DO NOT USE)
378	# ~user/... per-player map of a specific user
379
380	if ($path =~ /^{/) {
381	# fine as it is
382	} elsif ($path =~ s{^\?random/}{}) {
383	Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
384	$self->{random} = cf::from_json $data;
385	} else {
386	if ($path =~ s{^~([^/]+)?}{}) {
387	$self->{user_rel} = 1;
388
389	if (defined $1) {
390	$self->{user} = $1;
391	} elsif ($base =~ m{^~([^/]+)/}) {
392	$self->{user} = $1;
393	} else {
394	warn "cannot resolve user-relative path without user <$path,$base>\n";
395	}
396	} elsif ($path =~ /^\//) {
397	# already absolute
398	} else {
399	$base =~ s{[^/]+/?$}{};
400	return $class->new ("$base/$path");
401	}
402
403	for ($path) {
404	redo if s{/\.?/}{/};
405	redo if s{/[^/]+/\.\./}{/};
406	}
407	}
408
409	$self->{path} = $path;
410
411	$self
412	}
413
414	# the name / primary key / in-game path
415	sub as_string {
416	my ($self) = @_;
417
418	$self->{user_rel} ? "~$self->{user}$self->{path}"
419	: $self->{random} ? "?random/$self->{path}"
420	: $self->{path}
421	}
422
423	# the displayed name, this is a one way mapping
424	sub visible_name {
425	my ($self) = @_;
426
427	# if (my $rmp = $self->{random}) {
428	# # todo: be more intelligent about this
429	# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
430	# } else {
431	$self->as_string
432	# }
433	}
434
435	# escape the /'s in the path
436	sub _escaped_path {
437	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
438	$path
439	}
440
441	# the original (read-only) location
442	sub load_path {
443	my ($self) = @_;
444
445	sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
446	}
447
448	# the temporary/swap location
449	sub save_path {
450	my ($self) = @_;
451
452	$self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
453	: $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
454	: sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
455	}
456
457	# the unique path, might be eq to save_path
458	sub uniq_path {
459	my ($self) = @_;
460
461	$self->{user_rel} || $self->{random}
462	? undef
463	: sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
464	}
465
466	# return random map parameters, or undef
467	sub random_map_params {
468	my ($self) = @_;
469
470	$self->{random}
471	}
472
473	# this is somewhat ugly, but style maps do need special treatment
474	sub is_style_map {
475	$_[0]{path} =~ m{^/styles/}
476	}
477
478	package cf;
479		378
480	#############################################################################	379	#############################################################################
481		380
482	=head2 ATTACHABLE OBJECTS	381	=head2 ATTACHABLE OBJECTS
483		382
…		…
609	our @CB_TYPE = (); # registry for type (cf-object class) based events	508	our @CB_TYPE = (); # registry for type (cf-object class) based events
610	our @CB_MAP = ();	509	our @CB_MAP = ();
611		510
612	my %attachment;	511	my %attachment;
613		512
		513	sub cf::attachable::thawer_merge {
		514	# simply override everything except _meta
		515	local $_[0]{_meta};
		516	%{$_[0]} = %{$_[1]};
		517	}
		518
614	sub _attach_cb($$$$) {	519	sub _attach_cb($$$$) {
615	my ($registry, $event, $prio, $cb) = @_;	520	my ($registry, $event, $prio, $cb) = @_;
616		521
617	use sort 'stable';	522	use sort 'stable';
618		523
…		…
789	# object support	694	# object support
790		695
791	sub reattach {	696	sub reattach {
792	# basically do the same as instantiate, without calling instantiate	697	# basically do the same as instantiate, without calling instantiate
793	my ($obj) = @_;	698	my ($obj) = @_;
		699
		700	bless $obj, ref $obj; # re-bless in case extensions have been reloaded
794		701
795	my $registry = $obj->registry;	702	my $registry = $obj->registry;
796		703
797	@$registry = ();	704	@$registry = ();
798		705
…		…
869	}	776	}
870	} else {	777	} else {
871	aio_unlink $filename;	778	aio_unlink $filename;
872	aio_unlink "$filename.pst";	779	aio_unlink "$filename.pst";
873	}	780	}
		781
		782	#d##TODO# nuke non .map-files if exist
		783	if ($filename =~ s/\.map$//) {
		784	aio_unlink $filename;
		785	aio_unlink "$filename.pst";
		786	}
874	}	787	}
875	}	788	}
876		789
877	sub object_freezer_as_string {	790	sub object_freezer_as_string {
878	my ($rdata, $objs) = @_;	791	my ($rdata, $objs) = @_;
…		…
884		797
885	sub object_thawer_load {	798	sub object_thawer_load {
886	my ($filename) = @_;	799	my ($filename) = @_;
887		800
888	my ($data, $av);	801	my ($data, $av);
		802
		803	#d#TODO remove .map if file does not exist
		804	aio_stat $filename and $filename =~ s/\.map$//;
889		805
890	(aio_load $filename, $data) >= 0	806	(aio_load $filename, $data) >= 0
891	or return;	807	or return;
892		808
893	unless (aio_stat "$filename.pst") {	809	unless (aio_stat "$filename.pst") {
…		…
930	=cut	846	=cut
931		847
932	sub register_extcmd {	848	sub register_extcmd {
933	my ($name, $cb) = @_;	849	my ($name, $cb) = @_;
934		850
935	my $caller = caller;
936	#warn "registering extcmd '$name' to '$caller'";
937
938	$EXTCMD{$name} = [$cb, $caller];	851	$EXTCMD{$name} = $cb;
939	}	852	}
940		853
941	cf::player->attach (	854	cf::player->attach (
942	on_command => sub {	855	on_command => sub {
943	my ($pl, $name, $params) = @_;	856	my ($pl, $name, $params) = @_;
…		…
956		869
957	my $msg = eval { from_json $buf };	870	my $msg = eval { from_json $buf };
958		871
959	if (ref $msg) {	872	if (ref $msg) {
960	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	873	if (my $cb = $EXTCMD{$msg->{msgtype}}) {
961	if (my %reply = $cb->[0]->($pl, $msg)) {	874	if (my %reply = $cb->($pl, $msg)) {
962	$pl->ext_reply ($msg->{msgid}, %reply);	875	$pl->ext_reply ($msg->{msgid}, %reply);
963	}	876	}
964	}	877	}
965	} else {	878	} else {
966	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	879	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
…		…
968		881
969	cf::override;	882	cf::override;
970	},	883	},
971	);	884	);
972		885
973	sub register {
974	my ($base, $pkg) = @_;
975
976	#TODO
977	}
978
979	sub load_extension {	886	sub load_extension {
980	my ($path) = @_;	887	my ($path) = @_;
981		888
982	$path =~ /([^\/\\]+)\.ext$/ or die "$path";	889	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
983	my $base = $1;	890	my $base = $1;
984	my $pkg = $1;	891	my $pkg = $1;
985	$pkg =~ s/[^[:word:]]/_/g;	892	$pkg =~ s/[^[:word:]]/_/g;
986	$pkg = "ext::$pkg";	893	$pkg = "ext::$pkg";
987		894
988	warn "loading '$path' into '$pkg'\n";	895	warn "... loading '$path' into '$pkg'\n";
989		896
990	open my $fh, "<:utf8", $path	897	open my $fh, "<:utf8", $path
991	or die "$path: $!";	898	or die "$path: $!";
992		899
993	my $source =	900	my $source =
994	"package $pkg; use strict; use utf8;\n"	901	"package $pkg; use strict; use utf8;\n"
995	. "#line 1 \"$path\"\n{\n"	902	. "#line 1 \"$path\"\n{\n"
996	. (do { local $/; <$fh> })	903	. (do { local $/; <$fh> })
997	. "\n};\n1";	904	. "\n};\n1";
998		905
999	eval $source	906	unless (eval $source) {
1000	or die $@ ? "$path: $@\n"	907	my $msg = $@ ? "$path: $@\n"
1001	: "extension disabled.\n";	908	: "extension disabled.\n";
1002		909	if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
1003	push @exts, $pkg;	910	warn $@;
1004	$ext_pkg{$base} = $pkg;	911	warn "mandatory extension failed to load, exiting.\n";
1005		912	exit 1;
1006	# no strict 'refs';	913	}
1007	# @{"$pkg\::ISA"} = ext::;	914	die $@;
1008
1009	register $base, $pkg;
1010	}
1011
1012	sub unload_extension {
1013	my ($pkg) = @_;
1014
1015	warn "removing extension $pkg\n";
1016
1017	# remove hooks
1018	#TODO
1019	# for my $idx (0 .. $#PLUGIN_EVENT) {
1020	# delete $hook[$idx]{$pkg};
1021	# }	915	}
1022		916
1023	# remove commands	917	push @EXTS, $pkg;
1024	for my $name (keys %COMMAND) {
1025	my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1026
1027	if (@cb) {
1028	$COMMAND{$name} = \@cb;
1029	} else {
1030	delete $COMMAND{$name};
1031	}
1032	}
1033
1034	# remove extcmds
1035	for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1036	delete $EXTCMD{$name};
1037	}
1038
1039	if (my $cb = $pkg->can ("unload")) {
1040	eval {
1041	$cb->($pkg);
1042	1
1043	} or warn "$pkg unloaded, but with errors: $@";
1044	}
1045
1046	Symbol::delete_package $pkg;
1047	}	918	}
1048		919
1049	sub load_extensions {	920	sub load_extensions {
1050	for my $ext (<$LIBDIR/*.ext>) {	921	for my $ext (<$LIBDIR/*.ext>) {
1051	next unless -r $ext;	922	next unless -r $ext;
…		…
1055	} or warn "$ext not loaded: $@";	926	} or warn "$ext not loaded: $@";
1056	}	927	}
1057	}	928	}
1058		929
1059	#############################################################################	930	#############################################################################
1060	# load/save/clean perl data associated with a map
1061
1062	*cf::mapsupport::on_clean = sub {
1063	my ($map) = @_;
1064
1065	my $path = $map->tmpname;
1066	defined $path or return;
1067
1068	unlink "$path.pst";
1069	};
1070
1071	cf::map->attach (prio => -10000, package => cf::mapsupport::);
1072
1073	#############################################################################
1074	# load/save perl data associated with player->ob objects
1075
1076	sub all_objects(@) {
1077	@_, map all_objects ($_->inv), @_
1078	}
1079
1080	# TODO: compatibility cruft, remove when no longer needed
1081	cf::player->attach (
1082	on_load => sub {
1083	my ($pl, $path) = @_;
1084
1085	for my $o (all_objects $pl->ob) {
1086	if (my $value = $o->get_ob_key_value ("_perl_data")) {
1087	$o->set_ob_key_value ("_perl_data");
1088
1089	%$o = %{ Storable::thaw pack "H*", $value };
1090	}
1091	}
1092	},
1093	);
1094
1095	#############################################################################
1096		931
1097	=head2 CORE EXTENSIONS	932	=head2 CORE EXTENSIONS
1098		933
1099	Functions and methods that extend core crossfire objects.	934	Functions and methods that extend core crossfire objects.
1100		935
…		…
1136		971
1137	sub exists($) {	972	sub exists($) {
1138	my ($login) = @_;	973	my ($login) = @_;
1139		974
1140	$cf::PLAYER{$login}	975	$cf::PLAYER{$login}
1141	or cf::sync_job { !aio_stat $login }	976	or cf::sync_job { !aio_stat path $login }
1142	}	977	}
1143		978
1144	sub find($) {	979	sub find($) {
1145	return $cf::PLAYER{$_[0]} || do {	980	return $cf::PLAYER{$_[0]} || do {
1146	my $login = $_[0];	981	my $login = $_[0];
…		…
1225	my @logins;	1060	my @logins;
1226		1061
1227	for my $login (@$dirs) {	1062	for my $login (@$dirs) {
1228	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1063	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1229	aio_read $fh, 0, 512, my $buf, 0 or next;	1064	aio_read $fh, 0, 512, my $buf, 0 or next;
1230	$buf !~ /^password -------------$/ or next; # official not-valid tag	1065	$buf !~ /^password -------------$/m or next; # official not-valid tag
1231		1066
1232	utf8::decode $login;	1067	utf8::decode $login;
1233	push @logins, $login;	1068	push @logins, $login;
1234	}	1069	}
1235		1070
1236	\@logins	1071	\@logins
1237	}	1072	}
1238		1073
1239	=item $player->maps	1074	=item $player->maps
1240		1075
1241	Returns an arrayref of cf::path's of all maps that are private for this	1076	Returns an arrayref of map paths that are private for this
1242	player. May block.	1077	player. May block.
1243		1078
1244	=cut	1079	=cut
1245		1080
1246	sub maps($) {	1081	sub maps($) {
…		…
1252	my @paths;	1087	my @paths;
1253		1088
1254	for (@$files) {	1089	for (@$files) {
1255	utf8::decode $_;	1090	utf8::decode $_;
1256	next if /\.(?:pl|pst)$/;	1091	next if /\.(?:pl|pst)$/;
1257	next unless /^$PATH_SEP/;	1092	next unless /^$PATH_SEP/o;
1258		1093
1259	s/$PATH_SEP/\//g;
1260	push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;	1094	push @paths, cf::map::normalise "~" . $pl->ob->name . "/" . $_;
1261	}	1095	}
1262		1096
1263	\@paths	1097	\@paths
1264	}	1098	}
1265		1099
…		…
1291	package cf::map;	1125	package cf::map;
1292		1126
1293	use Fcntl;	1127	use Fcntl;
1294	use Coro::AIO;	1128	use Coro::AIO;
1295		1129
		1130	use overload
		1131	'""' => \&as_string,
		1132	fallback => 1;
		1133
1296	our $MAX_RESET = 3600;	1134	our $MAX_RESET = 3600;
1297	our $DEFAULT_RESET = 3000;	1135	our $DEFAULT_RESET = 3000;
1298		1136
1299	sub generate_random_map {	1137	sub generate_random_map {
1300	my ($path, $rmp) = @_;	1138	my ($self, $rmp) = @_;
1301
1302	# mit "rum" bekleckern, nicht	1139	# mit "rum" bekleckern, nicht
1303	cf::map::_create_random_map	1140	$self->_create_random_map (
1304	$path,
1305	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1141	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1306	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1142	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1307	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1143	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1308	$rmp->{exit_on_final_map},	1144	$rmp->{exit_on_final_map},
1309	$rmp->{xsize}, $rmp->{ysize},	1145	$rmp->{xsize}, $rmp->{ysize},
1310	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},	1146	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1311	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},	1147	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1312	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},	1148	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1313	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},	1149	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1314	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},	1150	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1315	(cf::region::find $rmp->{region})	1151	(cf::region::find $rmp->{region}), $rmp->{custom}
		1152	)
		1153	}
		1154
		1155	=item cf::map->register ($regex, $prio)
		1156
		1157	Register a handler for the map path matching the given regex at the
		1158	givne priority (higher is better, built-in handlers have priority 0, the
		1159	default).
		1160
		1161	=cut
		1162
		1163	sub register {
		1164	my (undef, $regex, $prio) = @_;
		1165	my $pkg = caller;
		1166
		1167	no strict;
		1168	push @{"$pkg\::ISA"}, __PACKAGE__;
		1169
		1170	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
		1171	}
		1172
		1173	# also paths starting with '/'
		1174	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
		1175
		1176	sub thawer_merge {
		1177	my ($self, $merge) = @_;
		1178
		1179	# we have to keep some variables in memory intact
		1180	local $self->{path};
		1181	local $self->{load_path};
		1182	local $self->{deny_save};
		1183	local $self->{deny_reset};
		1184
		1185	$self->SUPER::thawer_merge ($merge);
		1186	}
		1187
		1188	sub normalise {
		1189	my ($path, $base) = @_;
		1190
		1191	$path = "$path"; # make sure its a string
		1192
		1193	$path =~ s/\.map$//;
		1194
		1195	# map plan:
		1196	#
		1197	# /! non-realised random map exit (special hack!)
		1198	# {... are special paths that are not being touched
		1199	# ?xxx/... are special absolute paths
		1200	# ?random/... random maps
		1201	# /... normal maps
		1202	# ~user/... per-player map of a specific user
		1203
		1204	$path =~ s/$PATH_SEP/\//go;
		1205
		1206	# treat it as relative path if it starts with
		1207	# something that looks reasonable
		1208	if ($path =~ m{^(?:\./|\.\./|\w)}) {
		1209	$base or Carp::carp "normalise called with relative path and no base: '$path'";
		1210
		1211	$base =~ s{[^/]+/?$}{};
		1212	$path = "$base/$path";
		1213	}
		1214
		1215	for ($path) {
		1216	redo if s{//}{/};
		1217	redo if s{/\.?/}{/};
		1218	redo if s{/[^/]+/\.\./}{/};
		1219	}
		1220
		1221	$path
		1222	}
		1223
		1224	sub new_from_path {
		1225	my (undef, $path, $base) = @_;
		1226
		1227	return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
		1228
		1229	$path = normalise $path, $base;
		1230
		1231	for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
		1232	if ($path =~ $EXT_MAP{$pkg}[1]) {
		1233	my $self = bless cf::map::new, $pkg;
		1234	$self->{path} = $path; $self->path ($path);
		1235	$self->init; # pass $1 etc.
		1236	return $self;
		1237	}
		1238	}
		1239
		1240	Carp::carp "unable to resolve path '$path' (base '$base').";
		1241	()
		1242	}
		1243
		1244	sub init {
		1245	my ($self) = @_;
		1246
		1247	$self
		1248	}
		1249
		1250	sub as_string {
		1251	my ($self) = @_;
		1252
		1253	"$self->{path}"
		1254	}
		1255
		1256	# the displayed name, this is a one way mapping
		1257	sub visible_name {
		1258	&as_string
		1259	}
		1260
		1261	# the original (read-only) location
		1262	sub load_path {
		1263	my ($self) = @_;
		1264
		1265	sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
		1266	}
		1267
		1268	# the temporary/swap location
		1269	sub save_path {
		1270	my ($self) = @_;
		1271
		1272	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
		1273	sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
		1274	}
		1275
		1276	# the unique path, undef == no special unique path
		1277	sub uniq_path {
		1278	my ($self) = @_;
		1279
		1280	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
		1281	sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1316	}	1282	}
1317		1283
1318	# and all this just because we cannot iterate over	1284	# and all this just because we cannot iterate over
1319	# all maps in C++...	1285	# all maps in C++...
1320	sub change_all_map_light {	1286	sub change_all_map_light {
…		…
1322		1288
1323	$_->change_map_light ($change)	1289	$_->change_map_light ($change)
1324	for grep $_->outdoor, values %cf::MAP;	1290	for grep $_->outdoor, values %cf::MAP;
1325	}	1291	}
1326		1292
		1293	sub unlink_save {
		1294	my ($self) = @_;
		1295
		1296	utf8::encode (my $save = $self->save_path);
		1297	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
		1298	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
		1299
		1300	#d#TODO remove .map and also nuke
		1301	$save =~ s/\.map// or return;#d#
		1302	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
		1303	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
		1304	}
		1305
1327	sub try_load_header($) {	1306	sub load_header_from($) {
1328	my ($path) = @_;	1307	my ($self, $path) = @_;
1329		1308
1330	utf8::encode $path;	1309	utf8::encode $path;
1331	aio_open $path, O_RDONLY, 0	1310	#aio_open $path, O_RDONLY, 0
		1311	# or return;
		1312
		1313	$self->_load_header ($path)
1332	or return;	1314	or return;
1333		1315
1334	my $map = cf::map::new	1316	$self->{load_path} = $path;
		1317
		1318	1
		1319	}
		1320
		1321	sub load_header_orig {
		1322	my ($self) = @_;
		1323
		1324	$self->load_header_from ($self->load_path)
		1325	}
		1326
		1327	sub load_header_temp {
		1328	my ($self) = @_;
		1329
		1330	$self->load_header_from ($self->save_path)
		1331	}
		1332
		1333	sub prepare_temp {
		1334	my ($self) = @_;
		1335
		1336	$self->last_access ((delete $self->{last_access})
		1337	|| $cf::RUNTIME); #d#
		1338	# safety
		1339	$self->{instantiate_time} = $cf::RUNTIME
		1340	if $self->{instantiate_time} > $cf::RUNTIME;
		1341	}
		1342
		1343	sub prepare_orig {
		1344	my ($self) = @_;
		1345
		1346	$self->{load_original} = 1;
		1347	$self->{instantiate_time} = $cf::RUNTIME;
		1348	$self->last_access ($cf::RUNTIME);
		1349	$self->instantiate;
		1350	}
		1351
		1352	sub load_header {
		1353	my ($self) = @_;
		1354
		1355	if ($self->load_header_temp) {
		1356	$self->prepare_temp;
		1357	} else {
		1358	$self->load_header_orig
1335	or return;	1359	or return;
		1360	$self->prepare_orig;
		1361	}
1336		1362
1337	# for better error messages only, will be overwritten	1363	1
1338	$map->path ($path);
1339
1340	$map->load_header ($path)
1341	or return;
1342
1343	$map->{load_path} = $path;
1344
1345	$map
1346	}	1364	}
1347		1365
1348	sub find;	1366	sub find;
1349	sub find {	1367	sub find {
1350	my ($path, $origin) = @_;	1368	my ($path, $origin) = @_;
1351		1369
1352	#warn "find<$path,$origin>\n";#d#
1353
1354	$path = new cf::path $path, $origin && $origin->path;	1370	$path = normalise $path, $origin && $origin->path;
1355	my $key = $path->as_string;
1356		1371
1357	cf::lock_wait "map_find:$key";	1372	cf::lock_wait "map_find:$path";
1358		1373
1359	$cf::MAP{$key} || do {	1374	$cf::MAP{$path} || do {
1360	my $guard = cf::lock_acquire "map_find:$key";	1375	my $guard = cf::lock_acquire "map_find:$path";
1361		1376	my $map = new_from_path cf::map $path
1362	# do it the slow way
1363	my $map = try_load_header $path->save_path;
1364
1365	Coro::cede;
1366
1367	if ($map) {
1368	$map->last_access ((delete $map->{last_access})
1369	|| $cf::RUNTIME); #d#
1370	# safety
1371	$map->{instantiate_time} = $cf::RUNTIME
1372	if $map->{instantiate_time} > $cf::RUNTIME;
1373	} else {
1374	if (my $rmp = $path->random_map_params) {
1375	$map = generate_random_map $key, $rmp;
1376	} else {
1377	$map = try_load_header $path->load_path;
1378	}
1379
1380	$map or return;	1377	or return;
1381		1378
1382	$map->{load_original} = 1;
1383	$map->{instantiate_time} = $cf::RUNTIME;
1384	$map->last_access ($cf::RUNTIME);
1385	$map->instantiate;
1386
1387	# per-player maps become, after loading, normal maps
1388	$map->per_player (0) if $path->{user_rel};
1389	}
1390
1391	$map->path ($key);
1392	$map->{path} = $path;
1393	$map->{last_save} = $cf::RUNTIME;	1379	$map->{last_save} = $cf::RUNTIME;
1394		1380
1395	Coro::cede;	1381	$map->load_header
		1382	or return;
1396		1383
1397	if ($map->should_reset) {	1384	if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
		1385	# doing this can freeze the server in a sync job, obviously
		1386	#$cf::WAIT_FOR_TICK->wait;
1398	$map->reset;	1387	$map->reset;
1399	undef $guard;	1388	undef $guard;
1400	$map = find $path	1389	return find $path;
1401	or return;
1402	}	1390	}
1403		1391
1404	$cf::MAP{$key} = $map	1392	$cf::MAP{$path} = $map
1405	}	1393	}
1406	}	1394	}
		1395
		1396	sub pre_load { }
		1397	sub post_load { }
1407		1398
1408	sub load {	1399	sub load {
1409	my ($self) = @_;	1400	my ($self) = @_;
1410		1401
		1402	local $self->{deny_reset} = 1; # loading can take a long time
		1403
1411	my $path = $self->{path};	1404	my $path = $self->{path};
1412	my $guard = cf::lock_acquire "map_load:" . $path->as_string;	1405	my $guard = cf::lock_acquire "map_load:$path";
1413		1406
1414	return if $self->in_memory != cf::MAP_SWAPPED;	1407	return if $self->in_memory != cf::MAP_SWAPPED;
1415		1408
1416	$self->in_memory (cf::MAP_LOADING);	1409	$self->in_memory (cf::MAP_LOADING);
1417		1410
1418	$self->alloc;	1411	$self->alloc;
		1412
		1413	$self->pre_load;
		1414
1419	$self->load_objects ($self->{load_path}, 1)	1415	$self->_load_objects ($self->{load_path}, 1)
1420	or return;	1416	or return;
1421		1417
1422	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1418	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1423	if delete $self->{load_original};	1419	if delete $self->{load_original};
1424		1420
1425	if (my $uniq = $path->uniq_path) {	1421	if (my $uniq = $self->uniq_path) {
1426	utf8::encode $uniq;	1422	utf8::encode $uniq;
1427	if (aio_open $uniq, O_RDONLY, 0) {	1423	if (aio_open $uniq, O_RDONLY, 0) {
1428	$self->clear_unique_items;	1424	$self->clear_unique_items;
1429	$self->load_objects ($uniq, 0);	1425	$self->_load_objects ($uniq, 0);
1430	}	1426	}
1431	}	1427	}
1432		1428
1433	Coro::cede;	1429	Coro::cede;
1434		1430
1435	# now do the right thing for maps	1431	# now do the right thing for maps
1436	$self->link_multipart_objects;	1432	$self->link_multipart_objects;
1437		1433
1438	if ($self->{path}->is_style_map) {	1434	unless ($self->{deny_activate}) {
1439	$self->{deny_save} = 1;	1435	$self->decay_objects;
1440	$self->{deny_reset} = 1;
1441	} else {
1442	$self->fix_auto_apply;	1436	$self->fix_auto_apply;
1443	$self->decay_objects;
1444	$self->update_buttons;	1437	$self->update_buttons;
		1438	Coro::cede;
1445	$self->set_darkness_map;	1439	$self->set_darkness_map;
1446	$self->difficulty ($self->estimate_difficulty)	1440	$self->difficulty ($self->estimate_difficulty)
1447	unless $self->difficulty;	1441	unless $self->difficulty;
		1442	Coro::cede;
1448	$self->activate;	1443	$self->activate;
1449	}	1444	}
1450		1445
1451	Coro::cede;	1446	$self->post_load;
1452		1447
1453	$self->in_memory (cf::MAP_IN_MEMORY);	1448	$self->in_memory (cf::MAP_IN_MEMORY);
		1449	}
		1450
		1451	sub customise_for {
		1452	my ($self, $ob) = @_;
		1453
		1454	return find "~" . $ob->name . "/" . $self->{path}
		1455	if $self->per_player;
		1456
		1457	$self
		1458	}
		1459
		1460	# find and load all maps in the 3x3 area around a map
		1461	sub load_diag {
		1462	my ($map) = @_;
		1463
		1464	my @diag; # diagonal neighbours
		1465
		1466	for (0 .. 3) {
		1467	my $neigh = $map->tile_path ($_)
		1468	or next;
		1469	$neigh = find $neigh, $map
		1470	or next;
		1471	$neigh->load;
		1472
		1473	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
		1474	[$neigh->tile_path (($_ + 1) % 4), $neigh];
		1475	}
		1476
		1477	for (@diag) {
		1478	my $neigh = find @$_
		1479	or next;
		1480	$neigh->load;
		1481	}
1454	}	1482	}
1455		1483
1456	sub find_sync {	1484	sub find_sync {
1457	my ($path, $origin) = @_;	1485	my ($path, $origin) = @_;
1458		1486
1459	cf::sync_job { cf::map::find $path, $origin }	1487	cf::sync_job { find $path, $origin }
1460	}	1488	}
1461		1489
1462	sub do_load_sync {	1490	sub do_load_sync {
1463	my ($map) = @_;	1491	my ($map) = @_;
1464		1492
1465	cf::sync_job { $map->load };	1493	cf::sync_job { $map->load };
1466	}	1494	}
1467		1495
		1496	our %MAP_PREFETCH;
		1497	our $MAP_PREFETCHER = undef;
		1498
		1499	sub find_async {
		1500	my ($path, $origin) = @_;
		1501
		1502	$path = normalise $path, $origin && $origin->{path};
		1503
		1504	if (my $map = $cf::MAP{$path}) {
		1505	return $map if $map->in_memory == cf::MAP_IN_MEMORY;
		1506	}
		1507
		1508	undef $MAP_PREFETCH{$path};
		1509	$MAP_PREFETCHER ||= cf::async {
		1510	while (%MAP_PREFETCH) {
		1511	for my $path (keys %MAP_PREFETCH) {
		1512	my $map = find $path
		1513	or next;
		1514	$map->load;
		1515
		1516	delete $MAP_PREFETCH{$path};
		1517	}
		1518	}
		1519	undef $MAP_PREFETCHER;
		1520	};
		1521	$MAP_PREFETCHER->prio (6);
		1522
		1523	()
		1524	}
		1525
1468	sub save {	1526	sub save {
1469	my ($self) = @_;	1527	my ($self) = @_;
1470		1528
1471	my $lock = cf::lock_acquire "map_data:" . $self->path;	1529	my $lock = cf::lock_acquire "map_data:" . $self->path;
1472		1530
1473	$self->{last_save} = $cf::RUNTIME;	1531	$self->{last_save} = $cf::RUNTIME;
1474		1532
1475	return unless $self->dirty;	1533	return unless $self->dirty;
1476		1534
1477	my $save = $self->{path}->save_path; utf8::encode $save;	1535	my $save = $self->save_path; utf8::encode $save;
1478	my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;	1536	my $uniq = $self->uniq_path; utf8::encode $uniq;
1479		1537
1480	$self->{load_path} = $save;	1538	$self->{load_path} = $save;
1481		1539
1482	return if $self->{deny_save};	1540	return if $self->{deny_save};
1483		1541
…		…
1486	cf::async {	1544	cf::async {
1487	$_->contr->save for $self->players;	1545	$_->contr->save for $self->players;
1488	};	1546	};
1489		1547
1490	if ($uniq) {	1548	if ($uniq) {
1491	$self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	1549	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1492	$self->save_objects ($uniq, cf::IO_UNIQUES);	1550	$self->_save_objects ($uniq, cf::IO_UNIQUES);
1493	} else {	1551	} else {
1494	$self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	1552	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1495	}	1553	}
1496	}	1554	}
1497		1555
1498	sub swap_out {	1556	sub swap_out {
1499	my ($self) = @_;	1557	my ($self) = @_;
…		…
1513		1571
1514	sub reset_at {	1572	sub reset_at {
1515	my ($self) = @_;	1573	my ($self) = @_;
1516		1574
1517	# TODO: safety, remove and allow resettable per-player maps	1575	# TODO: safety, remove and allow resettable per-player maps
1518	return 1e99 if $self->{path}{user_rel};	1576	return 1e99 if $self->isa ("ext::map_per_player");#d#
1519	return 1e99 if $self->{deny_reset};	1577	return 1e99 if $self->{deny_reset};
1520		1578
1521	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;	1579	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1522	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;	1580	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1523		1581
…		…
1528	my ($self) = @_;	1586	my ($self) = @_;
1529		1587
1530	$self->reset_at <= $cf::RUNTIME	1588	$self->reset_at <= $cf::RUNTIME
1531	}	1589	}
1532		1590
1533	sub unlink_save {
1534	my ($self) = @_;
1535
1536	utf8::encode (my $save = $self->{path}->save_path);
1537	aioreq_pri 3; IO::AIO::aio_unlink $save;
1538	aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1539	}
1540
1541	sub rename {
1542	my ($self, $new_path) = @_;
1543
1544	$self->unlink_save;
1545
1546	delete $cf::MAP{$self->path};
1547	$self->{path} = new cf::path $new_path;
1548	$self->path ($self->{path}->as_string);
1549	$cf::MAP{$self->path} = $self;
1550
1551	$self->save;
1552	}
1553
1554	sub reset {	1591	sub reset {
1555	my ($self) = @_;	1592	my ($self) = @_;
1556		1593
1557	my $lock = cf::lock_acquire "map_data:" . $self->path;	1594	my $lock = cf::lock_acquire "map_data:$self->{path}";
1558		1595
1559	return if $self->players;	1596	return if $self->players;
1560	return if $self->{path}{user_rel};#d#	1597	return if $self->isa ("ext::map_per_player");#d#
1561		1598
1562	warn "resetting map ", $self->path;#d#	1599	warn "resetting map ", $self->path;#d#
1563		1600
1564	delete $cf::MAP{$self->path};	1601	delete $cf::MAP{$self->path};
		1602
		1603	$self->in_memory (cf::MAP_SWAPPED);
		1604	$self->clear;
1565		1605
1566	$_->clear_links_to ($self) for values %cf::MAP;	1606	$_->clear_links_to ($self) for values %cf::MAP;
1567		1607
1568	$self->unlink_save;	1608	$self->unlink_save;
1569	$self->destroy;	1609	$self->destroy;
…		…
1572	my $nuke_counter = "aaaa";	1612	my $nuke_counter = "aaaa";
1573		1613
1574	sub nuke {	1614	sub nuke {
1575	my ($self) = @_;	1615	my ($self) = @_;
1576		1616
		1617	delete $cf::MAP{$self->path};
		1618
		1619	$self->unlink_save;
		1620
		1621	bless $self, "cf::map";
		1622	delete $self->{deny_reset};
1577	$self->{deny_save} = 1;	1623	$self->{deny_save} = 1;
1578	$self->reset_timeout (1);	1624	$self->reset_timeout (1);
1579	$self->rename ("{nuke}/" . ($nuke_counter++));	1625	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
		1626
		1627	$cf::MAP{$self->path} = $self;
		1628
1580	$self->reset; # polite request, might not happen	1629	$self->reset; # polite request, might not happen
1581	}	1630	}
1582		1631
1583	sub customise_for {	1632	=item cf::map::unique_maps
1584	my ($map, $ob) = @_;
1585		1633
1586	if ($map->per_player) {	1634	Returns an arrayref of paths of all shared maps that have
1587	return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};	1635	instantiated unique items. May block.
1588	}
1589		1636
1590	$map	1637	=cut
1591	}
1592		1638
1593	sub emergency_save {	1639	sub unique_maps() {
1594	my $freeze_guard = cf::freeze_mainloop;	1640	my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
		1641	or return;
1595		1642
1596	warn "enter emergency perl save\n";	1643	my @paths;
1597		1644
1598	cf::sync_job {	1645	for (@$files) {
1599	warn "begin emergency player save\n";	1646	utf8::decode $_;
1600	$_->save for values %cf::PLAYER;	1647	next if /\.pst$/;
1601	warn "end emergency player save\n";	1648	next unless /^$PATH_SEP/o;
1602		1649
1603	warn "begin emergency map save\n";	1650	push @paths, cf::map::normalise $_;
1604	$_->save for values %cf::MAP;
1605	warn "end emergency map save\n";
1606	};	1651	}
1607		1652
1608	warn "leave emergency perl save\n";	1653	\@paths
1609	}	1654	}
1610		1655
1611	package cf;	1656	package cf;
1612		1657
1613	=back	1658	=back
1614		1659
		1660	=head3 cf::object
		1661
		1662	=cut
		1663
		1664	package cf::object;
		1665
		1666	=over 4
		1667
		1668	=item $ob->inv_recursive
		1669
		1670	Returns the inventory of the object _and_ their inventories, recursively.
		1671
		1672	=cut
		1673
		1674	sub inv_recursive_;
		1675	sub inv_recursive_ {
		1676	map { $_, inv_recursive_ $_->inv } @_
		1677	}
		1678
		1679	sub inv_recursive {
		1680	inv_recursive_ inv $_[0]
		1681	}
		1682
		1683	package cf;
		1684
		1685	=back
1615		1686
1616	=head3 cf::object::player	1687	=head3 cf::object::player
1617		1688
1618	=over 4	1689	=over 4
1619		1690
…		…
1659		1730
1660	=item $player_object->enter_link	1731	=item $player_object->enter_link
1661		1732
1662	Freezes the player and moves him/her to a special map (C<{link}>).	1733	Freezes the player and moves him/her to a special map (C<{link}>).
1663		1734
1664	The player should be reaosnably safe there for short amounts of time. You	1735	The player should be reasonably safe there for short amounts of time. You
1665	I<MUST> call C<leave_link> as soon as possible, though.	1736	I<MUST> call C<leave_link> as soon as possible, though.
1666		1737
		1738	Will never block.
		1739
1667	=item $player_object->leave_link ($map, $x, $y)	1740	=item $player_object->leave_link ($map, $x, $y)
1668		1741
1669	Moves the player out of the specila link map onto the given map. If the	1742	Moves the player out of the special C<{link}> map onto the specified
1670	map is not valid (or omitted), the player will be moved back to the	1743	map. If the map is not valid (or omitted), the player will be moved back
1671	location he/she was before the call to C<enter_link>, or, if that fails,	1744	to the location he/she was before the call to C<enter_link>, or, if that
1672	to the emergency map position.	1745	fails, to the emergency map position.
1673		1746
1674	Might block.	1747	Might block.
1675		1748
1676	=cut	1749	=cut
		1750
		1751	sub link_map {
		1752	unless ($LINK_MAP) {
		1753	$LINK_MAP = cf::map::find "{link}"
		1754	or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
		1755	$LINK_MAP->load;
		1756	}
		1757
		1758	$LINK_MAP
		1759	}
1677		1760
1678	sub cf::object::player::enter_link {	1761	sub cf::object::player::enter_link {
1679	my ($self) = @_;	1762	my ($self) = @_;
1680		1763
1681	$self->deactivate_recursive;	1764	$self->deactivate_recursive;
1682		1765
1683	return if $self->map == $LINK_MAP;	1766	return if UNIVERSAL::isa $self->map, "ext::map_link";
1684		1767
1685	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	1768	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1686	if $self->map;	1769	if $self->map;
1687		1770
1688	$self->enter_map ($LINK_MAP, 20, 20);	1771	$self->enter_map ($LINK_MAP || link_map, 10, 10);
1689	}	1772	}
1690		1773
1691	sub cf::object::player::leave_link {	1774	sub cf::object::player::leave_link {
1692	my ($self, $map, $x, $y) = @_;	1775	my ($self, $map, $x, $y) = @_;
1693		1776
…		…
1711	# use -1 or undef as default coordinates, not 0, 0	1794	# use -1 or undef as default coordinates, not 0, 0
1712	($x, $y) = ($map->enter_x, $map->enter_y)	1795	($x, $y) = ($map->enter_x, $map->enter_y)
1713	if $x <=0 && $y <= 0;	1796	if $x <=0 && $y <= 0;
1714		1797
1715	$map->load;	1798	$map->load;
		1799	$map->load_diag;
1716		1800
1717	return unless $self->contr->active;	1801	return unless $self->contr->active;
1718	$self->activate_recursive;	1802	$self->activate_recursive;
1719	$self->enter_map ($map, $x, $y);	1803	$self->enter_map ($map, $x, $y);
1720	}	1804	}
…		…
1756	=cut	1840	=cut
1757		1841
1758	sub cf::object::player::goto {	1842	sub cf::object::player::goto {
1759	my ($self, $path, $x, $y) = @_;	1843	my ($self, $path, $x, $y) = @_;
1760		1844
1761	$path = new cf::path $path;
1762	$path ne "/" or Carp::cluck ("oy");#d#
1763
1764	$self->enter_link;	1845	$self->enter_link;
1765		1846
1766	(async {	1847	(async {
		1848	my $map = eval {
1767	my $map = cf::map::find $path->as_string;	1849	my $map = cf::map::find $path;
1768	$map = $map->customise_for ($self) if $map;	1850	$map = $map->customise_for ($self) if $map;
1769		1851	$map
1770	# warn "entering ", $map->path, " at ($x, $y)\n"	1852	} or
1771	# if $map;
1772
1773	$map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	1853	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1774		1854
1775	$self->leave_link ($map, $x, $y);	1855	$self->leave_link ($map, $x, $y);
1776	})->prio (1);	1856	})->prio (1);
1777	}	1857	}
1778		1858
…		…
1782		1862
1783	sub parse_random_map_params {	1863	sub parse_random_map_params {
1784	my ($spec) = @_;	1864	my ($spec) = @_;
1785		1865
1786	my $rmp = { # defaults	1866	my $rmp = { # defaults
1787	xsize => 10,	1867	xsize => (cf::rndm 15, 40),
1788	ysize => 10,	1868	ysize => (cf::rndm 15, 40),
		1869	symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
		1870	#layout => string,
1789	};	1871	};
1790		1872
1791	for (split /\n/, $spec) {	1873	for (split /\n/, $spec) {
1792	my ($k, $v) = split /\s+/, $_, 2;	1874	my ($k, $v) = split /\s+/, $_, 2;
1793		1875
…		…
1797	$rmp	1879	$rmp
1798	}	1880	}
1799		1881
1800	sub prepare_random_map {	1882	sub prepare_random_map {
1801	my ($exit) = @_;	1883	my ($exit) = @_;
		1884
		1885	my $guard = cf::lock_acquire "exit_prepare:$exit";
1802		1886
1803	# all this does is basically replace the /! path by	1887	# all this does is basically replace the /! path by
1804	# a new random map path (?random/...) with a seed	1888	# a new random map path (?random/...) with a seed
1805	# that depends on the exit object	1889	# that depends on the exit object
1806		1890
1807	my $rmp = parse_random_map_params $exit->msg;	1891	my $rmp = parse_random_map_params $exit->msg;
1808		1892
1809	if ($exit->map) {	1893	if ($exit->map) {
1810	$rmp->{region} = $exit->map->region_name;	1894	$rmp->{region} = $exit->region->name;
1811	$rmp->{origin_map} = $exit->map->path;	1895	$rmp->{origin_map} = $exit->map->path;
1812	$rmp->{origin_x} = $exit->x;	1896	$rmp->{origin_x} = $exit->x;
1813	$rmp->{origin_y} = $exit->y;	1897	$rmp->{origin_y} = $exit->y;
1814	}	1898	}
1815		1899
1816	$rmp->{random_seed} ||= $exit->random_seed;	1900	$rmp->{random_seed} ||= $exit->random_seed;
1817		1901
1818	my $data = cf::to_json $rmp;	1902	my $data = cf::to_json $rmp;
1819	my $md5 = Digest::MD5::md5_hex $data;	1903	my $md5 = Digest::MD5::md5_hex $data;
		1904	my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1820		1905
1821	if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) {	1906	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1822	aio_write $fh, 0, (length $data), $data, 0;	1907	aio_write $fh, 0, (length $data), $data, 0;
		1908	undef $fh;
		1909	aio_rename "$meta~", $meta;
1823		1910
1824	$exit->slaying ("?random/$md5");	1911	$exit->slaying ("?random/$md5");
1825	$exit->msg (undef);	1912	$exit->msg (undef);
1826	}	1913	}
1827	}	1914	}
1828		1915
1829	sub cf::object::player::enter_exit {	1916	sub cf::object::player::enter_exit {
1830	my ($self, $exit) = @_;	1917	my ($self, $exit) = @_;
1831		1918
1832	return unless $self->type == cf::PLAYER;	1919	return unless $self->type == cf::PLAYER;
		1920
		1921	if ($exit->slaying eq "/!") {
		1922	#TODO: this should de-fi-ni-te-ly not be a sync-job
		1923	cf::sync_job { prepare_random_map $exit };
		1924	}
		1925
		1926	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
		1927	my $hp = $exit->stats->hp;
		1928	my $sp = $exit->stats->sp;
1833		1929
1834	$self->enter_link;	1930	$self->enter_link;
1835		1931
1836	(async {	1932	(async {
1837	$self->deactivate_recursive; # just to be sure	1933	$self->deactivate_recursive; # just to be sure
1838	unless (eval {	1934	unless (eval {
1839	prepare_random_map $exit	1935	$self->goto ($slaying, $hp, $sp);
1840	if $exit->slaying eq "/!";
1841
1842	my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1843	$self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1844		1936
1845	1;	1937	1;
1846	}) {	1938	}) {
1847	$self->message ("Something went wrong deep within the crossfire server. "	1939	$self->message ("Something went wrong deep within the crossfire server. "
1848	. "I'll try to bring you back to the map you were before. "	1940	. "I'll try to bring you back to the map you were before. "
1849	. "Please report this to the dungeon master",	1941	. "Please report this to the dungeon master!",
1850	cf::NDI_UNIQUE | cf::NDI_RED);	1942	cf::NDI_UNIQUE | cf::NDI_RED);
1851		1943
1852	warn "ERROR in enter_exit: $@";	1944	warn "ERROR in enter_exit: $@";
1853	$self->leave_link;	1945	$self->leave_link;
1854	}	1946	}
…		…
2137	sub db_sync() {	2229	sub db_sync() {
2138	db_save if $dirty;	2230	db_save if $dirty;
2139	undef $dirty;	2231	undef $dirty;
2140	}	2232	}
2141		2233
2142	my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {	2234	my $idle = Event->idle (
2143	db_sync;	2235	reentrant => 0,
		2236	min => 10,
		2237	max => 20,
		2238	repeat => 0,
		2239	data => WF_AUTOCANCEL,
		2240	cb => \&db_sync,
2144	});	2241	);
2145		2242
2146	sub db_dirty() {	2243	sub db_dirty() {
2147	$dirty = 1;	2244	$dirty = 1;
2148	$idle->start;	2245	$idle->start;
2149	}	2246	}
…		…
2197		2294
2198	sub main {	2295	sub main {
2199	# we must not ever block the main coroutine	2296	# we must not ever block the main coroutine
2200	local $Coro::idle = sub {	2297	local $Coro::idle = sub {
2201	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	2298	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
		2299	(async {
2202	async { Event::one_event };	2300	Event::one_event;
		2301	})->prio (Coro::PRIO_MAX);
2203	};	2302	};
2204		2303
2205	cfg_load;	2304	cfg_load;
2206	db_load;	2305	db_load;
2207	load_extensions;	2306	load_extensions;
		2307
		2308	$TICK_WATCHER->start;
2208	Event::loop;	2309	Event::loop;
2209	}	2310	}
2210		2311
2211	#############################################################################	2312	#############################################################################
2212	# initialisation	2313	# initialisation and cleanup
		2314
		2315	# install some emergency cleanup handlers
		2316	BEGIN {
		2317	for my $signal (qw(INT HUP TERM)) {
		2318	Event->signal (
		2319	reentrant => 0,
		2320	data => WF_AUTOCANCEL,
		2321	signal => $signal,
		2322	prio => 0,
		2323	cb => sub {
		2324	cf::cleanup "SIG$signal";
		2325	},
		2326	);
		2327	}
		2328	}
		2329
		2330	sub emergency_save() {
		2331	my $freeze_guard = cf::freeze_mainloop;
		2332
		2333	warn "enter emergency perl save\n";
		2334
		2335	cf::sync_job {
		2336	# use a peculiar iteration method to avoid tripping on perl
		2337	# refcount bugs in for. also avoids problems with players
		2338	# and maps saved/destroyed asynchronously.
		2339	warn "begin emergency player save\n";
		2340	for my $login (keys %cf::PLAYER) {
		2341	my $pl = $cf::PLAYER{$login} or next;
		2342	$pl->valid or next;
		2343	$pl->save;
		2344	}
		2345	warn "end emergency player save\n";
		2346
		2347	warn "begin emergency map save\n";
		2348	for my $path (keys %cf::MAP) {
		2349	my $map = $cf::MAP{$path} or next;
		2350	$map->valid or next;
		2351	$map->save;
		2352	}
		2353	warn "end emergency map save\n";
		2354	};
		2355
		2356	warn "leave emergency perl save\n";
		2357	}
2213		2358
2214	sub reload() {	2359	sub reload() {
2215	# can/must only be called in main	2360	# can/must only be called in main
2216	if ($Coro::current != $Coro::main) {	2361	if ($Coro::current != $Coro::main) {
2217	warn "can only reload from main coroutine\n";	2362	warn "can only reload from main coroutine";
2218	return;	2363	return;
2219	}	2364	}
2220		2365
2221	warn "reloading...";	2366	warn "reloading...";
2222		2367
2223	my $guard = freeze_mainloop;	2368	warn "cancelling server ticker";
		2369	$TICK_WATCHER->cancel;
		2370
2224	cf::emergency_save;	2371	cf::emergency_save;
2225		2372
2226	eval {	2373	eval {
2227	# if anything goes wrong in here, we should simply crash as we already saved	2374	# if anything goes wrong in here, we should simply crash as we already saved
2228		2375
2229	# cancel all watchers	2376	warn "syncing database to disk";
		2377	cf::db_sync;
		2378
		2379	warn "cancelling all WF_AUTOCANCEL watchers";
2230	for (Event::all_watchers) {	2380	for (Event::all_watchers) {
2231	$_->cancel if $_->data & WF_AUTOCANCEL;	2381	$_->cancel if $_->data & WF_AUTOCANCEL;
2232	}	2382	}
2233		2383
		2384	warn "flushing outstanding aio requests";
		2385	for (;;) {
		2386	IO::AIO::flush;
		2387	Coro::cede;
		2388	last unless IO::AIO::nreqs;
		2389	warn "iterate...";
		2390	}
		2391
2234	# cancel all extension coros	2392	warn "cancelling all extension coros";
2235	$_->cancel for values %EXT_CORO;	2393	$_->cancel for values %EXT_CORO;
2236	%EXT_CORO = ();	2394	%EXT_CORO = ();
2237		2395
2238	# unload all extensions	2396	warn "removing commands";
2239	for (@exts) {	2397	%COMMAND = ();
		2398
		2399	warn "removing ext commands";
		2400	%EXTCMD = ();
		2401
		2402	warn "unloading/nuking all extensions";
		2403	for my $pkg (@EXTS) {
2240	warn "unloading <$_>";	2404	warn "... unloading $pkg";
2241	unload_extension $_;	2405
		2406	if (my $cb = $pkg->can ("unload")) {
		2407	eval {
		2408	$cb->($pkg);
		2409	1
		2410	} or warn "$pkg unloaded, but with errors: $@";
2242	}	2411	}
2243		2412
		2413	warn "... nuking $pkg";
		2414	Symbol::delete_package $pkg;
		2415	}
		2416
2244	# unload all modules loaded from $LIBDIR	2417	warn "unloading all perl modules loaded from $LIBDIR";
2245	while (my ($k, $v) = each %INC) {	2418	while (my ($k, $v) = each %INC) {
2246	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	2419	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2247		2420
2248	warn "removing <$k>";	2421	warn "... unloading $k";
2249	delete $INC{$k};	2422	delete $INC{$k};
2250		2423
2251	$k =~ s/\.pm$//;	2424	$k =~ s/\.pm$//;
2252	$k =~ s/\//::/g;	2425	$k =~ s/\//::/g;
2253		2426
…		…
2256	}	2429	}
2257		2430
2258	Symbol::delete_package $k;	2431	Symbol::delete_package $k;
2259	}	2432	}
2260		2433
2261	# sync database to disk
2262	cf::db_sync;
2263	IO::AIO::flush;
2264
2265	# get rid of safe::, as good as possible	2434	warn "getting rid of safe::, as good as possible";
2266	Symbol::delete_package "safe::$_"	2435	Symbol::delete_package "safe::$_"
2267	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	2436	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2268		2437
2269	# remove register_script_function callbacks
2270	# TODO
2271
2272	# unload cf.pm "a bit"	2438	warn "unloading cf.pm \"a bit\"";
2273	delete $INC{"cf.pm"};	2439	delete $INC{"cf.pm"};
2274		2440
2275	# don't, removes xs symbols, too,	2441	# don't, removes xs symbols, too,
2276	# and global variables created in xs	2442	# and global variables created in xs
2277	#Symbol::delete_package __PACKAGE__;	2443	#Symbol::delete_package __PACKAGE__;
2278		2444
2279	# reload cf.pm	2445	warn "unload completed, starting to reload now";
		2446
2280	warn "reloading cf.pm";	2447	warn "reloading cf.pm";
2281	require cf;	2448	require cf;
2282	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	2449	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2283		2450
2284	# load config and database again	2451	warn "loading config and database again";
2285	cf::cfg_load;	2452	cf::cfg_load;
2286	cf::db_load;	2453	cf::db_load;
2287		2454
2288	# load extensions
2289	warn "load extensions";	2455	warn "loading extensions";
2290	cf::load_extensions;	2456	cf::load_extensions;
2291		2457
2292	# reattach attachments to objects	2458	warn "reattaching attachments to objects/players";
2293	warn "reattach";
2294	_global_reattach;	2459	_global_reattach;
		2460	warn "reattaching attachments to maps";
2295	reattach $_ for values %MAP;	2461	reattach $_ for values %MAP;
		2462
		2463	warn "restarting server ticker";
		2464
		2465	$TICK_WATCHER->start;
2296	};	2466	};
2297		2467
2298	if ($@) {	2468	if ($@) {
2299	warn $@;	2469	warn $@;
2300	warn "error while reloading, exiting.";	2470	warn "error while reloading, exiting.";
2301	exit 1;	2471	exit 1;
2302	}	2472	}
2303		2473
2304	warn "reloaded successfully";	2474	warn "reloaded";
2305	};	2475	};
2306		2476
2307	#############################################################################	2477	our $RELOAD_WATCHER; # used only during reload
2308
2309	unless ($LINK_MAP) {
2310	$LINK_MAP = cf::map::new;
2311
2312	$LINK_MAP->width (41);
2313	$LINK_MAP->height (41);
2314	$LINK_MAP->alloc;
2315	$LINK_MAP->path ("{link}");
2316	$LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2317	$LINK_MAP->in_memory (MAP_IN_MEMORY);
2318
2319	# dirty hack because... archetypes are not yet loaded
2320	Event->timer (
2321	after => 10,
2322	cb => sub {
2323	$_[0]->w->cancel;
2324
2325	# provide some exits "home"
2326	my $exit = cf::object::new "exit";
2327
2328	$exit->slaying ($EMERGENCY_POSITION->[0]);
2329	$exit->stats->hp ($EMERGENCY_POSITION->[1]);
2330	$exit->stats->sp ($EMERGENCY_POSITION->[2]);
2331
2332	$LINK_MAP->insert ($exit->clone, 19, 19);
2333	$LINK_MAP->insert ($exit->clone, 19, 20);
2334	$LINK_MAP->insert ($exit->clone, 19, 21);
2335	$LINK_MAP->insert ($exit->clone, 20, 19);
2336	$LINK_MAP->insert ($exit->clone, 20, 21);
2337	$LINK_MAP->insert ($exit->clone, 21, 19);
2338	$LINK_MAP->insert ($exit->clone, 21, 20);
2339	$LINK_MAP->insert ($exit->clone, 21, 21);
2340
2341	$exit->destroy;
2342	});
2343
2344	$LINK_MAP->{deny_save} = 1;
2345	$LINK_MAP->{deny_reset} = 1;
2346
2347	$cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2348	}
2349
2350	register "<global>", __PACKAGE__;
2351		2478
2352	register_command "reload" => sub {	2479	register_command "reload" => sub {
2353	my ($who, $arg) = @_;	2480	my ($who, $arg) = @_;
2354		2481
2355	if ($who->flag (FLAG_WIZ)) {	2482	if ($who->flag (FLAG_WIZ)) {
2356	$who->message ("start of reload.");	2483	$who->message ("reloading server.");
		2484
		2485	# doing reload synchronously and two reloads happen back-to-back,
		2486	# coro crashes during coro_state_free->destroy here.
		2487
		2488	$RELOAD_WATCHER ||= Event->timer (
		2489	reentrant => 0,
		2490	after => 0,
		2491	data => WF_AUTOCANCEL,
		2492	cb => sub {
2357	reload;	2493	reload;
2358	$who->message ("end of reload.");	2494	undef $RELOAD_WATCHER;
		2495	},
		2496	);
2359	}	2497	}
2360	};	2498	};
2361		2499
2362	unshift @INC, $LIBDIR;	2500	unshift @INC, $LIBDIR;
		2501
		2502	my $bug_warning = 0;
2363		2503
2364	$TICK_WATCHER = Event->timer (	2504	$TICK_WATCHER = Event->timer (
2365	reentrant => 0,	2505	reentrant => 0,
		2506	parked => 1,
2366	prio => 0,	2507	prio => 0,
2367	at => $NEXT_TICK || $TICK,	2508	at => $NEXT_TICK || $TICK,
2368	data => WF_AUTOCANCEL,	2509	data => WF_AUTOCANCEL,
2369	cb => sub {	2510	cb => sub {
		2511	if ($Coro::current != $Coro::main) {
		2512	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
		2513	unless ++$bug_warning > 10;
		2514	return;
		2515	}
		2516
		2517	$NOW = Event::time;
		2518
2370	cf::server_tick; # one server iteration	2519	cf::server_tick; # one server iteration
2371	$RUNTIME += $TICK;	2520	$RUNTIME += $TICK;
2372	$NEXT_TICK += $TICK;	2521	$NEXT_TICK += $TICK;
		2522
		2523	$WAIT_FOR_TICK->broadcast;
		2524	$WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
		2525
		2526	Event::sweep;
		2527	Coro::cede_notself;
		2528
		2529	# my $AFTER = Event::time;
		2530	# warn $AFTER - $NOW;#d#
2373		2531
2374	# if we are delayed by four ticks or more, skip them all	2532	# if we are delayed by four ticks or more, skip them all
2375	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2533	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2376		2534
2377	$TICK_WATCHER->at ($NEXT_TICK);	2535	$TICK_WATCHER->at ($NEXT_TICK);
2378	$TICK_WATCHER->start;	2536	$TICK_WATCHER->start;
2379	},	2537	},
2380	);	2538	);
2381		2539
2382	IO::AIO::max_poll_time $TICK * 0.2;	2540	IO::AIO::max_poll_time $TICK * 0.1;
2383		2541
2384	Event->io (	2542	undef $Coro::AIO::WATCHER;
		2543	$AIO_POLL_WATCHER = Event->io (
		2544	reentrant => 0,
2385	fd => IO::AIO::poll_fileno,	2545	fd => IO::AIO::poll_fileno,
2386	poll => 'r',	2546	poll => 'r',
2387	prio => 5,	2547	prio => 6,
2388	data => WF_AUTOCANCEL,	2548	data => WF_AUTOCANCEL,
2389	cb => \&IO::AIO::poll_cb,	2549	cb => \&IO::AIO::poll_cb,
2390	);	2550	);
2391		2551
2392	Event->timer (	2552	$WRITE_RUNTIME_WATCHER = Event->timer (
		2553	reentrant => 0,
2393	data => WF_AUTOCANCEL,	2554	data => WF_AUTOCANCEL,
2394	after => 0,	2555	after => 1,
2395	interval => 10,	2556	interval => 10,
2396	cb => sub {	2557	prio => 6, # keep it lowest so it acts like a watchdog
2397	(Coro::unblock_sub {	2558	cb => Coro::unblock_sub {
2398	write_runtime	2559	write_runtime
2399	or warn "ERROR: unable to write runtime file: $!";	2560	or warn "ERROR: unable to write runtime file: $!";
2400	})->();
2401	},	2561	},
2402	);	2562	);
2403		2563
2404	END { cf::emergency_save }	2564	END { cf::emergency_save }
2405		2565

Diff Legend

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