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.158 by root, Wed Jan 10 19:52:43 2007 UTC vs.
Revision 1.199 by root, Mon Jan 29 14:46:01 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;
…		…
33		33
34	$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
35		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
58		63
59	our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;	64	our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
60	our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= 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
61		69
62	binmode STDOUT;	70	binmode STDOUT;
63	binmode STDERR;	71	binmode STDERR;
64		72
65	# read virtual server time, if available	73	# read virtual server time, if available
…		…
73	mkdir cf::localdir . "/" . cf::playerdir;	81	mkdir cf::localdir . "/" . cf::playerdir;
74	mkdir cf::localdir . "/" . cf::tmpdir;	82	mkdir cf::localdir . "/" . cf::tmpdir;
75	mkdir cf::localdir . "/" . cf::uniquedir;	83	mkdir cf::localdir . "/" . cf::uniquedir;
76	mkdir $RANDOM_MAPS;	84	mkdir $RANDOM_MAPS;
77		85
78	# a special map that is always available
79	our $LINK_MAP;
80	our $EMERGENCY_POSITION;	86	our $EMERGENCY_POSITION;
		87
		88	sub cf::map::normalise;
81		89
82	#############################################################################	90	#############################################################################
83		91
84	=head2 GLOBAL VARIABLES	92	=head2 GLOBAL VARIABLES
85		93
…		…
156	}	164	}
157		165
158	$Event::DIED = sub {	166	$Event::DIED = sub {
159	warn "error in event callback: @_";	167	warn "error in event callback: @_";
160	};	168	};
161
162	my %ext_pkg;
163	my @exts;
164	my @hook;
165		169
166	=head2 UTILITY FUNCTIONS	170	=head2 UTILITY FUNCTIONS
167		171
168	=over 4	172	=over 4
169		173
…		…
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	$WRITE_RUNTIME_WATCHER->start;
		269	};
		270	$WRITE_RUNTIME_WATCHER->stop;
263	$TICK_WATCHER->stop;	271	$TICK_WATCHER->stop;
264	$guard	272	$guard
265	}	273	}
266		274
267	=item cf::async { BLOCK }	275	=item cf::async { BLOCK }
…		…
319	}	327	}
320	}	328	}
321		329
322	=item $coro = cf::async_ext { BLOCK }	330	=item $coro = cf::async_ext { BLOCK }
323		331
324	Like async, but this coro is automcatially being canceled when the	332	Like async, but this coro is automatically being canceled when the
325	extension calling this is being unloaded.	333	extension calling this is being unloaded.
326		334
327	=cut	335	=cut
328		336
329	sub async_ext(&) {	337	sub async_ext(&) {
…		…
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
352	aio_fsync $fh	363	aio_fsync $fh
353	and return;	364	and return;
…		…
362	}	373	}
363		374
364	=back	375	=back
365		376
366	=cut	377	=cut
367
368	#############################################################################
369
370	package cf::path;
371
372	use overload
373	'""' => \&as_string;
374
375	# used to convert map paths into valid unix filenames by repalcing / by ∕
376	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
377
378	sub new {
379	my ($class, $path, $base) = @_;
380
381	$path = $path->as_string if ref $path;
382
383	my $self = bless { }, $class;
384
385	# {... are special paths that are not touched
386	# ?xxx/... are special absolute paths
387	# ?random/... random maps
388	# /! non-realised random map exit
389	# /... normal maps
390	# ~/... per-player maps without a specific player (DO NOT USE)
391	# ~user/... per-player map of a specific user
392
393	$path =~ s/$PATH_SEP/\//go;
394
395	if ($path =~ /^{/) {
396	# fine as it is
397	} elsif ($path =~ s{^\?random/}{}) {
398	Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
399	$self->{random} = cf::from_json $data;
400	} else {
401	if ($path =~ s{^~([^/]+)?}{}) {
402	$self->{user_rel} = 1;
403
404	if (defined $1) {
405	$self->{user} = $1;
406	} elsif ($base =~ m{^~([^/]+)/}) {
407	$self->{user} = $1;
408	} else {
409	warn "cannot resolve user-relative path without user <$path,$base>\n";
410	}
411	} elsif ($path =~ /^\//) {
412	# already absolute
413	} else {
414	$base =~ s{[^/]+/?$}{};
415	return $class->new ("$base/$path");
416	}
417
418	for ($path) {
419	redo if s{/\.?/}{/};
420	redo if s{/[^/]+/\.\./}{/};
421	}
422	}
423
424	$self->{path} = $path;
425
426	$self
427	}
428
429	# the name / primary key / in-game path
430	sub as_string {
431	my ($self) = @_;
432
433	$self->{user_rel} ? "~$self->{user}$self->{path}"
434	: $self->{random} ? "?random/$self->{path}"
435	: $self->{path}
436	}
437
438	# the displayed name, this is a one way mapping
439	sub visible_name {
440	my ($self) = @_;
441
442	# if (my $rmp = $self->{random}) {
443	# # todo: be more intelligent about this
444	# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
445	# } else {
446	$self->as_string
447	# }
448	}
449
450	# escape the /'s in the path
451	sub _escaped_path {
452	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
453	$path
454	}
455
456	# the original (read-only) location
457	sub load_path {
458	my ($self) = @_;
459
460	sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
461	}
462
463	# the temporary/swap location
464	sub save_path {
465	my ($self) = @_;
466
467	$self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
468	: $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
469	: sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
470	}
471
472	# the unique path, might be eq to save_path
473	sub uniq_path {
474	my ($self) = @_;
475
476	$self->{user_rel} || $self->{random}
477	? undef
478	: sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
479	}
480
481	# return random map parameters, or undef
482	sub random_map_params {
483	my ($self) = @_;
484
485	$self->{random}
486	}
487
488	# this is somewhat ugly, but style maps do need special treatment
489	sub is_style_map {
490	$_[0]{path} =~ m{^/styles/}
491	}
492
493	package cf;
494		378
495	#############################################################################	379	#############################################################################
496		380
497	=head2 ATTACHABLE OBJECTS	381	=head2 ATTACHABLE OBJECTS
498		382
…		…
624	our @CB_TYPE = (); # registry for type (cf-object class) based events	508	our @CB_TYPE = (); # registry for type (cf-object class) based events
625	our @CB_MAP = ();	509	our @CB_MAP = ();
626		510
627	my %attachment;	511	my %attachment;
628		512
		513	sub cf::attachable::thawer_merge {
		514	# simply override everything except _meta
		515	local $_[0]{_meta};
		516	%{$_[0]} = %{$_[1]};
		517	}
		518
629	sub _attach_cb($$$$) {	519	sub _attach_cb($$$$) {
630	my ($registry, $event, $prio, $cb) = @_;	520	my ($registry, $event, $prio, $cb) = @_;
631		521
632	use sort 'stable';	522	use sort 'stable';
633		523
…		…
804	# object support	694	# object support
805		695
806	sub reattach {	696	sub reattach {
807	# basically do the same as instantiate, without calling instantiate	697	# basically do the same as instantiate, without calling instantiate
808	my ($obj) = @_;	698	my ($obj) = @_;
		699
		700	bless $obj, ref $obj; # re-bless in case extensions have been reloaded
809		701
810	my $registry = $obj->registry;	702	my $registry = $obj->registry;
811		703
812	@$registry = ();	704	@$registry = ();
813		705
…		…
945	=cut	837	=cut
946		838
947	sub register_extcmd {	839	sub register_extcmd {
948	my ($name, $cb) = @_;	840	my ($name, $cb) = @_;
949		841
950	my $caller = caller;
951	#warn "registering extcmd '$name' to '$caller'";
952
953	$EXTCMD{$name} = [$cb, $caller];	842	$EXTCMD{$name} = $cb;
954	}	843	}
955		844
956	cf::player->attach (	845	cf::player->attach (
957	on_command => sub {	846	on_command => sub {
958	my ($pl, $name, $params) = @_;	847	my ($pl, $name, $params) = @_;
…		…
971		860
972	my $msg = eval { from_json $buf };	861	my $msg = eval { from_json $buf };
973		862
974	if (ref $msg) {	863	if (ref $msg) {
975	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	864	if (my $cb = $EXTCMD{$msg->{msgtype}}) {
976	if (my %reply = $cb->[0]->($pl, $msg)) {	865	if (my %reply = $cb->($pl, $msg)) {
977	$pl->ext_reply ($msg->{msgid}, %reply);	866	$pl->ext_reply ($msg->{msgid}, %reply);
978	}	867	}
979	}	868	}
980	} else {	869	} else {
981	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	870	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
…		…
983		872
984	cf::override;	873	cf::override;
985	},	874	},
986	);	875	);
987		876
988	sub register {
989	my ($base, $pkg) = @_;
990
991	#TODO
992	}
993
994	sub load_extension {	877	sub load_extension {
995	my ($path) = @_;	878	my ($path) = @_;
996		879
997	$path =~ /([^\/\\]+)\.ext$/ or die "$path";	880	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
998	my $base = $1;	881	my $base = $1;
999	my $pkg = $1;	882	my $pkg = $1;
1000	$pkg =~ s/[^[:word:]]/_/g;	883	$pkg =~ s/[^[:word:]]/_/g;
1001	$pkg = "ext::$pkg";	884	$pkg = "ext::$pkg";
1002		885
1003	warn "loading '$path' into '$pkg'\n";	886	warn "... loading '$path' into '$pkg'\n";
1004		887
1005	open my $fh, "<:utf8", $path	888	open my $fh, "<:utf8", $path
1006	or die "$path: $!";	889	or die "$path: $!";
1007		890
1008	my $source =	891	my $source =
1009	"package $pkg; use strict; use utf8;\n"	892	"package $pkg; use strict; use utf8;\n"
1010	. "#line 1 \"$path\"\n{\n"	893	. "#line 1 \"$path\"\n{\n"
1011	. (do { local $/; <$fh> })	894	. (do { local $/; <$fh> })
1012	. "\n};\n1";	895	. "\n};\n1";
1013		896
1014	eval $source	897	unless (eval $source) {
1015	or die $@ ? "$path: $@\n"	898	my $msg = $@ ? "$path: $@\n"
1016	: "extension disabled.\n";	899	: "extension disabled.\n";
1017		900	if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
1018	push @exts, $pkg;	901	warn $@;
1019	$ext_pkg{$base} = $pkg;	902	warn "mandatory extension failed to load, exiting.\n";
1020		903	exit 1;
1021	# no strict 'refs';	904	}
1022	# @{"$pkg\::ISA"} = ext::;	905	die $@;
1023
1024	register $base, $pkg;
1025	}
1026
1027	sub unload_extension {
1028	my ($pkg) = @_;
1029
1030	warn "removing extension $pkg\n";
1031
1032	# remove hooks
1033	#TODO
1034	# for my $idx (0 .. $#PLUGIN_EVENT) {
1035	# delete $hook[$idx]{$pkg};
1036	# }	906	}
1037		907
1038	# remove commands	908	push @EXTS, $pkg;
1039	for my $name (keys %COMMAND) {
1040	my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1041
1042	if (@cb) {
1043	$COMMAND{$name} = \@cb;
1044	} else {
1045	delete $COMMAND{$name};
1046	}
1047	}
1048
1049	# remove extcmds
1050	for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1051	delete $EXTCMD{$name};
1052	}
1053
1054	if (my $cb = $pkg->can ("unload")) {
1055	eval {
1056	$cb->($pkg);
1057	1
1058	} or warn "$pkg unloaded, but with errors: $@";
1059	}
1060
1061	Symbol::delete_package $pkg;
1062	}	909	}
1063		910
1064	sub load_extensions {	911	sub load_extensions {
1065	for my $ext (<$LIBDIR/*.ext>) {	912	for my $ext (<$LIBDIR/*.ext>) {
1066	next unless -r $ext;	913	next unless -r $ext;
…		…
1070	} or warn "$ext not loaded: $@";	917	} or warn "$ext not loaded: $@";
1071	}	918	}
1072	}	919	}
1073		920
1074	#############################################################################	921	#############################################################################
1075	# load/save/clean perl data associated with a map
1076
1077	*cf::mapsupport::on_clean = sub {
1078	my ($map) = @_;
1079
1080	my $path = $map->tmpname;
1081	defined $path or return;
1082
1083	unlink "$path.pst";
1084	};
1085
1086	cf::map->attach (prio => -10000, package => cf::mapsupport::);
1087
1088	#############################################################################
1089		922
1090	=head2 CORE EXTENSIONS	923	=head2 CORE EXTENSIONS
1091		924
1092	Functions and methods that extend core crossfire objects.	925	Functions and methods that extend core crossfire objects.
1093		926
…		…
1129		962
1130	sub exists($) {	963	sub exists($) {
1131	my ($login) = @_;	964	my ($login) = @_;
1132		965
1133	$cf::PLAYER{$login}	966	$cf::PLAYER{$login}
1134	or cf::sync_job { !aio_stat $login }	967	or cf::sync_job { !aio_stat path $login }
1135	}	968	}
1136		969
1137	sub find($) {	970	sub find($) {
1138	return $cf::PLAYER{$_[0]} || do {	971	return $cf::PLAYER{$_[0]} || do {
1139	my $login = $_[0];	972	my $login = $_[0];
…		…
1229	\@logins	1062	\@logins
1230	}	1063	}
1231		1064
1232	=item $player->maps	1065	=item $player->maps
1233		1066
1234	Returns an arrayref of cf::path's of all maps that are private for this	1067	Returns an arrayref of map paths that are private for this
1235	player. May block.	1068	player. May block.
1236		1069
1237	=cut	1070	=cut
1238		1071
1239	sub maps($) {	1072	sub maps($) {
…		…
1247	for (@$files) {	1080	for (@$files) {
1248	utf8::decode $_;	1081	utf8::decode $_;
1249	next if /\.(?:pl|pst)$/;	1082	next if /\.(?:pl|pst)$/;
1250	next unless /^$PATH_SEP/o;	1083	next unless /^$PATH_SEP/o;
1251		1084
1252	push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;	1085	push @paths, cf::map::normalise "~" . $pl->ob->name . "/" . $_;
1253	}	1086	}
1254		1087
1255	\@paths	1088	\@paths
1256	}	1089	}
1257		1090
…		…
1283	package cf::map;	1116	package cf::map;
1284		1117
1285	use Fcntl;	1118	use Fcntl;
1286	use Coro::AIO;	1119	use Coro::AIO;
1287		1120
		1121	use overload
		1122	'""' => \&as_string,
		1123	fallback => 1;
		1124
1288	our $MAX_RESET = 3600;	1125	our $MAX_RESET = 3600;
1289	our $DEFAULT_RESET = 3000;	1126	our $DEFAULT_RESET = 3000;
1290		1127
1291	sub generate_random_map {	1128	sub generate_random_map {
1292	my ($path, $rmp) = @_;	1129	my ($self, $rmp) = @_;
1293
1294	# mit "rum" bekleckern, nicht	1130	# mit "rum" bekleckern, nicht
1295	cf::map::_create_random_map	1131	$self->_create_random_map (
1296	$path,
1297	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1132	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1298	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1133	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1299	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1134	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1300	$rmp->{exit_on_final_map},	1135	$rmp->{exit_on_final_map},
1301	$rmp->{xsize}, $rmp->{ysize},	1136	$rmp->{xsize}, $rmp->{ysize},
1302	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},	1137	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1303	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},	1138	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1304	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},	1139	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1305	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},	1140	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1306	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},	1141	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1307	(cf::region::find $rmp->{region})	1142	(cf::region::find $rmp->{region}), $rmp->{custom}
		1143	)
		1144	}
		1145
		1146	=item cf::map->register ($regex, $prio)
		1147
		1148	Register a handler for the map path matching the given regex at the
		1149	givne priority (higher is better, built-in handlers have priority 0, the
		1150	default).
		1151
		1152	=cut
		1153
		1154	sub register {
		1155	my (undef, $regex, $prio) = @_;
		1156	my $pkg = caller;
		1157
		1158	no strict;
		1159	push @{"$pkg\::ISA"}, __PACKAGE__;
		1160
		1161	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
		1162	}
		1163
		1164	# also paths starting with '/'
		1165	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
		1166
		1167	sub thawer_merge {
		1168	my ($self, $merge) = @_;
		1169
		1170	# we have to keep some variables in memory intact
		1171	local $self->{path};
		1172	local $self->{load_path};
		1173	local $self->{deny_save};
		1174	local $self->{deny_reset};
		1175
		1176	$self->SUPER::thawer_merge ($merge);
		1177	}
		1178
		1179	sub normalise {
		1180	my ($path, $base) = @_;
		1181
		1182	$path = "$path"; # make sure its a string
		1183
		1184	$path =~ s/\.map$//;
		1185
		1186	# map plan:
		1187	#
		1188	# /! non-realised random map exit (special hack!)
		1189	# {... are special paths that are not being touched
		1190	# ?xxx/... are special absolute paths
		1191	# ?random/... random maps
		1192	# /... normal maps
		1193	# ~user/... per-player map of a specific user
		1194
		1195	$path =~ s/$PATH_SEP/\//go;
		1196
		1197	# treat it as relative path if it starts with
		1198	# something that looks reasonable
		1199	if ($path =~ m{^(?:\./|\.\./|\w)}) {
		1200	$base or Carp::carp "normalise called with relative path and no base: '$path'";
		1201
		1202	$base =~ s{[^/]+/?$}{};
		1203	$path = "$base/$path";
		1204	}
		1205
		1206	for ($path) {
		1207	redo if s{//}{/};
		1208	redo if s{/\.?/}{/};
		1209	redo if s{/[^/]+/\.\./}{/};
		1210	}
		1211
		1212	$path
		1213	}
		1214
		1215	sub new_from_path {
		1216	my (undef, $path, $base) = @_;
		1217
		1218	return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
		1219
		1220	$path = normalise $path, $base;
		1221
		1222	for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
		1223	if ($path =~ $EXT_MAP{$pkg}[1]) {
		1224	my $self = bless cf::map::new, $pkg;
		1225	$self->{path} = $path; $self->path ($path);
		1226	$self->init; # pass $1 etc.
		1227	return $self;
		1228	}
		1229	}
		1230
		1231	Carp::carp "unable to resolve path '$path' (base '$base').";
		1232	()
		1233	}
		1234
		1235	sub init {
		1236	my ($self) = @_;
		1237
		1238	$self
		1239	}
		1240
		1241	sub as_string {
		1242	my ($self) = @_;
		1243
		1244	"$self->{path}"
		1245	}
		1246
		1247	# the displayed name, this is a one way mapping
		1248	sub visible_name {
		1249	&as_string
		1250	}
		1251
		1252	# the original (read-only) location
		1253	sub load_path {
		1254	my ($self) = @_;
		1255
		1256	sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
		1257	}
		1258
		1259	# the temporary/swap location
		1260	sub save_path {
		1261	my ($self) = @_;
		1262
		1263	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
		1264	sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
		1265	}
		1266
		1267	# the unique path, undef == no special unique path
		1268	sub uniq_path {
		1269	my ($self) = @_;
		1270
		1271	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
		1272	sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1308	}	1273	}
1309		1274
1310	# and all this just because we cannot iterate over	1275	# and all this just because we cannot iterate over
1311	# all maps in C++...	1276	# all maps in C++...
1312	sub change_all_map_light {	1277	sub change_all_map_light {
…		…
1314		1279
1315	$_->change_map_light ($change)	1280	$_->change_map_light ($change)
1316	for grep $_->outdoor, values %cf::MAP;	1281	for grep $_->outdoor, values %cf::MAP;
1317	}	1282	}
1318		1283
		1284	sub unlink_save {
		1285	my ($self) = @_;
		1286
		1287	utf8::encode (my $save = $self->save_path);
		1288	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
		1289	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
		1290	}
		1291
1319	sub try_load_header($) {	1292	sub load_header_from($) {
1320	my ($path) = @_;	1293	my ($self, $path) = @_;
1321		1294
1322	utf8::encode $path;	1295	utf8::encode $path;
1323	aio_open $path, O_RDONLY, 0	1296	aio_open $path, O_RDONLY, 0
1324	or return;	1297	or return;
1325		1298
1326	my $map = cf::map::new	1299	$self->_load_header ($path)
1327	or return;	1300	or return;
1328		1301
1329	# for better error messages only, will be overwritten	1302	$self->{load_path} = $path;
1330	$map->path ($path);
1331		1303
1332	$map->load_header ($path)	1304	1
		1305	}
		1306
		1307	sub load_header_orig {
		1308	my ($self) = @_;
		1309
		1310	$self->load_header_from ($self->load_path)
		1311	}
		1312
		1313	sub load_header_temp {
		1314	my ($self) = @_;
		1315
		1316	$self->load_header_from ($self->save_path)
		1317	}
		1318
		1319	sub prepare_temp {
		1320	my ($self) = @_;
		1321
		1322	$self->last_access ((delete $self->{last_access})
		1323	|| $cf::RUNTIME); #d#
		1324	# safety
		1325	$self->{instantiate_time} = $cf::RUNTIME
		1326	if $self->{instantiate_time} > $cf::RUNTIME;
		1327	}
		1328
		1329	sub prepare_orig {
		1330	my ($self) = @_;
		1331
		1332	$self->{load_original} = 1;
		1333	$self->{instantiate_time} = $cf::RUNTIME;
		1334	$self->last_access ($cf::RUNTIME);
		1335	$self->instantiate;
		1336	}
		1337
		1338	sub load_header {
		1339	my ($self) = @_;
		1340
		1341	if ($self->load_header_temp) {
		1342	$self->prepare_temp;
		1343	} else {
		1344	$self->load_header_orig
1333	or return;	1345	or return;
		1346	$self->prepare_orig;
		1347	}
1334		1348
1335	$map->{load_path} = $path;	1349	1
1336
1337	$map
1338	}	1350	}
1339		1351
1340	sub find;	1352	sub find;
1341	sub find {	1353	sub find {
1342	my ($path, $origin) = @_;	1354	my ($path, $origin) = @_;
1343		1355
1344	#warn "find<$path,$origin>\n";#d#
1345
1346	$path = new cf::path $path, $origin && $origin->path;	1356	$path = normalise $path, $origin && $origin->path;
1347	my $key = $path->as_string;
1348		1357
1349	cf::lock_wait "map_find:$key";	1358	cf::lock_wait "map_find:$path";
1350		1359
1351	$cf::MAP{$key} || do {	1360	$cf::MAP{$path} || do {
1352	my $guard = cf::lock_acquire "map_find:$key";	1361	my $guard = cf::lock_acquire "map_find:$path";
1353		1362	my $map = new_from_path cf::map $path
1354	# do it the slow way
1355	my $map = try_load_header $path->save_path;
1356
1357	Coro::cede;
1358
1359	if ($map) {
1360	$map->last_access ((delete $map->{last_access})
1361	|| $cf::RUNTIME); #d#
1362	# safety
1363	$map->{instantiate_time} = $cf::RUNTIME
1364	if $map->{instantiate_time} > $cf::RUNTIME;
1365	} else {
1366	if (my $rmp = $path->random_map_params) {
1367	$map = generate_random_map $key, $rmp;
1368	} else {
1369	$map = try_load_header $path->load_path;
1370	}
1371
1372	$map or return;	1363	or return;
1373		1364
1374	$map->{load_original} = 1;
1375	$map->{instantiate_time} = $cf::RUNTIME;
1376	$map->last_access ($cf::RUNTIME);
1377	$map->instantiate;
1378
1379	# per-player maps become, after loading, normal maps
1380	$map->per_player (0) if $path->{user_rel};
1381	}
1382
1383	$map->path ($key);
1384	$map->{path} = $path;
1385	$map->{last_save} = $cf::RUNTIME;	1365	$map->{last_save} = $cf::RUNTIME;
1386		1366
1387	Coro::cede;	1367	$map->load_header
		1368	or return;
1388		1369
1389	if ($map->should_reset) {	1370	if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
		1371	# doing this can freeze the server in a sync job, obviously
		1372	#$cf::WAIT_FOR_TICK->wait;
1390	$map->reset;	1373	$map->reset;
1391	undef $guard;	1374	undef $guard;
1392	$map = find $path	1375	return find $path;
1393	or return;
1394	}	1376	}
1395		1377
1396	$cf::MAP{$key} = $map	1378	$cf::MAP{$path} = $map
1397	}	1379	}
1398	}	1380	}
		1381
		1382	sub pre_load { }
		1383	sub post_load { }
1399		1384
1400	sub load {	1385	sub load {
1401	my ($self) = @_;	1386	my ($self) = @_;
1402		1387
		1388	local $self->{deny_reset} = 1; # loading can take a long time
		1389
1403	my $path = $self->{path};	1390	my $path = $self->{path};
1404	my $guard = cf::lock_acquire "map_load:" . $path->as_string;	1391	my $guard = cf::lock_acquire "map_load:$path";
1405		1392
1406	return if $self->in_memory != cf::MAP_SWAPPED;	1393	return if $self->in_memory != cf::MAP_SWAPPED;
1407		1394
1408	$self->in_memory (cf::MAP_LOADING);	1395	$self->in_memory (cf::MAP_LOADING);
1409		1396
1410	$self->alloc;	1397	$self->alloc;
		1398
		1399	$self->pre_load;
		1400
1411	$self->load_objects ($self->{load_path}, 1)	1401	$self->_load_objects ($self->{load_path}, 1)
1412	or return;	1402	or return;
1413		1403
1414	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1404	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1415	if delete $self->{load_original};	1405	if delete $self->{load_original};
1416		1406
1417	if (my $uniq = $path->uniq_path) {	1407	if (my $uniq = $self->uniq_path) {
1418	utf8::encode $uniq;	1408	utf8::encode $uniq;
1419	if (aio_open $uniq, O_RDONLY, 0) {	1409	if (aio_open $uniq, O_RDONLY, 0) {
1420	$self->clear_unique_items;	1410	$self->clear_unique_items;
1421	$self->load_objects ($uniq, 0);	1411	$self->_load_objects ($uniq, 0);
1422	}	1412	}
1423	}	1413	}
1424		1414
1425	Coro::cede;	1415	Coro::cede;
1426		1416
1427	# now do the right thing for maps	1417	# now do the right thing for maps
1428	$self->link_multipart_objects;	1418	$self->link_multipart_objects;
1429		1419
1430	if ($self->{path}->is_style_map) {	1420	unless ($self->{deny_activate}) {
1431	$self->{deny_save} = 1;	1421	$self->decay_objects;
1432	$self->{deny_reset} = 1;
1433	} else {
1434	$self->fix_auto_apply;	1422	$self->fix_auto_apply;
1435	$self->decay_objects;
1436	$self->update_buttons;	1423	$self->update_buttons;
		1424	Coro::cede;
1437	$self->set_darkness_map;	1425	$self->set_darkness_map;
1438	$self->difficulty ($self->estimate_difficulty)	1426	$self->difficulty ($self->estimate_difficulty)
1439	unless $self->difficulty;	1427	unless $self->difficulty;
		1428	Coro::cede;
1440	$self->activate;	1429	$self->activate;
1441	}	1430	}
1442		1431
1443	Coro::cede;	1432	$self->post_load;
1444		1433
1445	$self->in_memory (cf::MAP_IN_MEMORY);	1434	$self->in_memory (cf::MAP_IN_MEMORY);
		1435	}
		1436
		1437	sub customise_for {
		1438	my ($self, $ob) = @_;
		1439
		1440	return find "~" . $ob->name . "/" . $self->{path}
		1441	if $self->per_player;
		1442
		1443	$self
1446	}	1444	}
1447		1445
1448	# find and load all maps in the 3x3 area around a map	1446	# find and load all maps in the 3x3 area around a map
1449	sub load_diag {	1447	sub load_diag {
1450	my ($map) = @_;	1448	my ($map) = @_;
…		…
1480		1478
1481	cf::sync_job { $map->load };	1479	cf::sync_job { $map->load };
1482	}	1480	}
1483		1481
1484	our %MAP_PREFETCH;	1482	our %MAP_PREFETCH;
1485	our $MAP_PREFETCHER = Coro::async {	1483	our $MAP_PREFETCHER = undef;
1486	while () {
1487	while (%MAP_PREFETCH) {
1488	my $key = each %MAP_PREFETCH
1489	or next;
1490	my $path = delete $MAP_PREFETCH{$key};
1491
1492	my $map = find $path
1493	or next;
1494	$map->load;
1495	}
1496	Coro::schedule;
1497	}
1498	};
1499		1484
1500	sub find_async {	1485	sub find_async {
1501	my ($path, $origin) = @_;	1486	my ($path, $origin) = @_;
1502		1487
1503	$path = new cf::path $path, $origin && $origin->path;	1488	$path = normalise $path, $origin && $origin->{path};
1504	my $key = $path->as_string;
1505		1489
1506	if (my $map = $cf::MAP{$key}) {	1490	if (my $map = $cf::MAP{$path}) {
1507	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	1491	return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1508	}	1492	}
1509		1493
1510	$MAP_PREFETCH{$key} = $path;	1494	undef $MAP_PREFETCH{$path};
		1495	$MAP_PREFETCHER ||= cf::async {
		1496	while (%MAP_PREFETCH) {
		1497	for my $path (keys %MAP_PREFETCH) {
		1498	my $map = find $path
		1499	or next;
		1500	$map->load;
		1501
		1502	delete $MAP_PREFETCH{$path};
		1503	}
		1504	}
		1505	undef $MAP_PREFETCHER;
		1506	};
1511	$MAP_PREFETCHER->ready;	1507	$MAP_PREFETCHER->prio (6);
1512		1508
1513	()	1509	()
1514	}	1510	}
1515		1511
1516	sub save {	1512	sub save {
…		…
1520		1516
1521	$self->{last_save} = $cf::RUNTIME;	1517	$self->{last_save} = $cf::RUNTIME;
1522		1518
1523	return unless $self->dirty;	1519	return unless $self->dirty;
1524		1520
1525	my $save = $self->{path}->save_path; utf8::encode $save;	1521	my $save = $self->save_path; utf8::encode $save;
1526	my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;	1522	my $uniq = $self->uniq_path; utf8::encode $uniq;
1527		1523
1528	$self->{load_path} = $save;	1524	$self->{load_path} = $save;
1529		1525
1530	return if $self->{deny_save};	1526	return if $self->{deny_save};
1531		1527
…		…
1534	cf::async {	1530	cf::async {
1535	$_->contr->save for $self->players;	1531	$_->contr->save for $self->players;
1536	};	1532	};
1537		1533
1538	if ($uniq) {	1534	if ($uniq) {
1539	$self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	1535	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1540	$self->save_objects ($uniq, cf::IO_UNIQUES);	1536	$self->_save_objects ($uniq, cf::IO_UNIQUES);
1541	} else {	1537	} else {
1542	$self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	1538	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1543	}	1539	}
1544	}	1540	}
1545		1541
1546	sub swap_out {	1542	sub swap_out {
1547	my ($self) = @_;	1543	my ($self) = @_;
…		…
1561		1557
1562	sub reset_at {	1558	sub reset_at {
1563	my ($self) = @_;	1559	my ($self) = @_;
1564		1560
1565	# TODO: safety, remove and allow resettable per-player maps	1561	# TODO: safety, remove and allow resettable per-player maps
1566	return 1e99 if $self->{path}{user_rel};	1562	return 1e99 if $self->isa ("ext::map_per_player");#d#
1567	return 1e99 if $self->{deny_reset};	1563	return 1e99 if $self->{deny_reset};
1568		1564
1569	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;	1565	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1570	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;	1566	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1571		1567
…		…
1576	my ($self) = @_;	1572	my ($self) = @_;
1577		1573
1578	$self->reset_at <= $cf::RUNTIME	1574	$self->reset_at <= $cf::RUNTIME
1579	}	1575	}
1580		1576
1581	sub unlink_save {
1582	my ($self) = @_;
1583
1584	utf8::encode (my $save = $self->{path}->save_path);
1585	aioreq_pri 3; IO::AIO::aio_unlink $save;
1586	aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1587	}
1588
1589	sub rename {
1590	my ($self, $new_path) = @_;
1591
1592	$self->unlink_save;
1593
1594	delete $cf::MAP{$self->path};
1595	$self->{path} = new cf::path $new_path;
1596	$self->path ($self->{path}->as_string);
1597	$cf::MAP{$self->path} = $self;
1598
1599	$self->save;
1600	}
1601
1602	sub reset {	1577	sub reset {
1603	my ($self) = @_;	1578	my ($self) = @_;
1604		1579
1605	my $lock = cf::lock_acquire "map_data:" . $self->path;	1580	my $lock = cf::lock_acquire "map_data:$self->{path}";
1606		1581
1607	return if $self->players;	1582	return if $self->players;
1608	return if $self->{path}{user_rel};#d#	1583	return if $self->isa ("ext::map_per_player");#d#
1609		1584
1610	warn "resetting map ", $self->path;#d#	1585	warn "resetting map ", $self->path;#d#
1611		1586
1612	delete $cf::MAP{$self->path};	1587	delete $cf::MAP{$self->path};
		1588
		1589	$self->in_memory (cf::MAP_SWAPPED);
		1590	$self->clear;
1613		1591
1614	$_->clear_links_to ($self) for values %cf::MAP;	1592	$_->clear_links_to ($self) for values %cf::MAP;
1615		1593
1616	$self->unlink_save;	1594	$self->unlink_save;
1617	$self->destroy;	1595	$self->destroy;
…		…
1620	my $nuke_counter = "aaaa";	1598	my $nuke_counter = "aaaa";
1621		1599
1622	sub nuke {	1600	sub nuke {
1623	my ($self) = @_;	1601	my ($self) = @_;
1624		1602
		1603	delete $cf::MAP{$self->path};
		1604
		1605	$self->unlink_save;
		1606
		1607	bless $self, "cf::map";
		1608	delete $self->{deny_reset};
1625	$self->{deny_save} = 1;	1609	$self->{deny_save} = 1;
1626	$self->reset_timeout (1);	1610	$self->reset_timeout (1);
1627	$self->rename ("{nuke}/" . ($nuke_counter++));	1611	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
		1612
		1613	$cf::MAP{$self->path} = $self;
		1614
1628	$self->reset; # polite request, might not happen	1615	$self->reset; # polite request, might not happen
1629	}	1616	}
1630		1617
1631	sub customise_for {
1632	my ($map, $ob) = @_;
1633
1634	if ($map->per_player) {
1635	return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1636	}
1637
1638	$map
1639	}
1640
1641	=item cf::map::unique_maps	1618	=item cf::map::unique_maps
1642		1619
1643	Returns an arrayref of cf::path's of all shared maps that have	1620	Returns an arrayref of paths of all shared maps that have
1644	instantiated unique items. May block.	1621	instantiated unique items. May block.
1645		1622
1646	=cut	1623	=cut
1647		1624
1648	sub unique_maps() {	1625	sub unique_maps() {
…		…
1654	for (@$files) {	1631	for (@$files) {
1655	utf8::decode $_;	1632	utf8::decode $_;
1656	next if /\.pst$/;	1633	next if /\.pst$/;
1657	next unless /^$PATH_SEP/o;	1634	next unless /^$PATH_SEP/o;
1658		1635
1659	push @paths, new cf::path $_;	1636	push @paths, cf::map::normalise $_;
1660	}	1637	}
1661		1638
1662	\@paths	1639	\@paths
1663	}	1640	}
1664		1641
…		…
1739		1716
1740	=item $player_object->enter_link	1717	=item $player_object->enter_link
1741		1718
1742	Freezes the player and moves him/her to a special map (C<{link}>).	1719	Freezes the player and moves him/her to a special map (C<{link}>).
1743		1720
1744	The player should be reaosnably safe there for short amounts of time. You	1721	The player should be reasonably safe there for short amounts of time. You
1745	I<MUST> call C<leave_link> as soon as possible, though.	1722	I<MUST> call C<leave_link> as soon as possible, though.
1746		1723
		1724	Will never block.
		1725
1747	=item $player_object->leave_link ($map, $x, $y)	1726	=item $player_object->leave_link ($map, $x, $y)
1748		1727
1749	Moves the player out of the specila link map onto the given map. If the	1728	Moves the player out of the special C<{link}> map onto the specified
1750	map is not valid (or omitted), the player will be moved back to the	1729	map. If the map is not valid (or omitted), the player will be moved back
1751	location he/she was before the call to C<enter_link>, or, if that fails,	1730	to the location he/she was before the call to C<enter_link>, or, if that
1752	to the emergency map position.	1731	fails, to the emergency map position.
1753		1732
1754	Might block.	1733	Might block.
1755		1734
1756	=cut	1735	=cut
		1736
		1737	sub link_map {
		1738	unless ($LINK_MAP) {
		1739	$LINK_MAP = cf::map::find "{link}"
		1740	or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
		1741	$LINK_MAP->load;
		1742	}
		1743
		1744	$LINK_MAP
		1745	}
1757		1746
1758	sub cf::object::player::enter_link {	1747	sub cf::object::player::enter_link {
1759	my ($self) = @_;	1748	my ($self) = @_;
1760		1749
1761	$self->deactivate_recursive;	1750	$self->deactivate_recursive;
1762		1751
1763	return if $self->map == $LINK_MAP;	1752	return if UNIVERSAL::isa $self->map, "ext::map_link";
1764		1753
1765	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	1754	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1766	if $self->map;	1755	if $self->map;
1767		1756
1768	$self->enter_map ($LINK_MAP, 20, 20);	1757	$self->enter_map ($LINK_MAP || link_map, 10, 10);
1769	}	1758	}
1770		1759
1771	sub cf::object::player::leave_link {	1760	sub cf::object::player::leave_link {
1772	my ($self, $map, $x, $y) = @_;	1761	my ($self, $map, $x, $y) = @_;
1773		1762
…		…
1837	=cut	1826	=cut
1838		1827
1839	sub cf::object::player::goto {	1828	sub cf::object::player::goto {
1840	my ($self, $path, $x, $y) = @_;	1829	my ($self, $path, $x, $y) = @_;
1841		1830
1842	$path = new cf::path $path;
1843
1844	$self->enter_link;	1831	$self->enter_link;
1845		1832
1846	(async {	1833	(async {
		1834	my $map = eval {
1847	my $map = cf::map::find $path->as_string;	1835	my $map = cf::map::find $path;
1848	$map = $map->customise_for ($self) if $map;	1836	$map = $map->customise_for ($self) if $map;
1849		1837	$map
1850	# warn "entering ", $map->path, " at ($x, $y)\n"	1838	} or
1851	# if $map;
1852
1853	$map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	1839	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1854		1840
1855	$self->leave_link ($map, $x, $y);	1841	$self->leave_link ($map, $x, $y);
1856	})->prio (1);	1842	})->prio (1);
1857	}	1843	}
1858		1844
…		…
1862		1848
1863	sub parse_random_map_params {	1849	sub parse_random_map_params {
1864	my ($spec) = @_;	1850	my ($spec) = @_;
1865		1851
1866	my $rmp = { # defaults	1852	my $rmp = { # defaults
1867	xsize => 10,	1853	xsize => (cf::rndm 15, 40),
1868	ysize => 10,	1854	ysize => (cf::rndm 15, 40),
		1855	symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
		1856	#layout => string,
1869	};	1857	};
1870		1858
1871	for (split /\n/, $spec) {	1859	for (split /\n/, $spec) {
1872	my ($k, $v) = split /\s+/, $_, 2;	1860	my ($k, $v) = split /\s+/, $_, 2;
1873		1861
…		…
1877	$rmp	1865	$rmp
1878	}	1866	}
1879		1867
1880	sub prepare_random_map {	1868	sub prepare_random_map {
1881	my ($exit) = @_;	1869	my ($exit) = @_;
		1870
		1871	my $guard = cf::lock_acquire "exit_prepare:$exit";
1882		1872
1883	# all this does is basically replace the /! path by	1873	# all this does is basically replace the /! path by
1884	# a new random map path (?random/...) with a seed	1874	# a new random map path (?random/...) with a seed
1885	# that depends on the exit object	1875	# that depends on the exit object
1886		1876
1887	my $rmp = parse_random_map_params $exit->msg;	1877	my $rmp = parse_random_map_params $exit->msg;
1888		1878
1889	if ($exit->map) {	1879	if ($exit->map) {
1890	$rmp->{region} = $exit->map->region_name;	1880	$rmp->{region} = $exit->region->name;
1891	$rmp->{origin_map} = $exit->map->path;	1881	$rmp->{origin_map} = $exit->map->path;
1892	$rmp->{origin_x} = $exit->x;	1882	$rmp->{origin_x} = $exit->x;
1893	$rmp->{origin_y} = $exit->y;	1883	$rmp->{origin_y} = $exit->y;
1894	}	1884	}
1895		1885
1896	$rmp->{random_seed} ||= $exit->random_seed;	1886	$rmp->{random_seed} ||= $exit->random_seed;
1897		1887
1898	my $data = cf::to_json $rmp;	1888	my $data = cf::to_json $rmp;
1899	my $md5 = Digest::MD5::md5_hex $data;	1889	my $md5 = Digest::MD5::md5_hex $data;
		1890	my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1900		1891
1901	if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) {	1892	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1902	aio_write $fh, 0, (length $data), $data, 0;	1893	aio_write $fh, 0, (length $data), $data, 0;
		1894	undef $fh;
		1895	aio_rename "$meta~", $meta;
1903		1896
1904	$exit->slaying ("?random/$md5");	1897	$exit->slaying ("?random/$md5");
1905	$exit->msg (undef);	1898	$exit->msg (undef);
1906	}	1899	}
1907	}	1900	}
1908		1901
1909	sub cf::object::player::enter_exit {	1902	sub cf::object::player::enter_exit {
1910	my ($self, $exit) = @_;	1903	my ($self, $exit) = @_;
1911		1904
1912	return unless $self->type == cf::PLAYER;	1905	return unless $self->type == cf::PLAYER;
		1906
		1907	if ($exit->slaying eq "/!") {
		1908	#TODO: this should de-fi-ni-te-ly not be a sync-job
		1909	cf::sync_job { prepare_random_map $exit };
		1910	}
		1911
		1912	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
		1913	my $hp = $exit->stats->hp;
		1914	my $sp = $exit->stats->sp;
1913		1915
1914	$self->enter_link;	1916	$self->enter_link;
1915		1917
1916	(async {	1918	(async {
1917	$self->deactivate_recursive; # just to be sure	1919	$self->deactivate_recursive; # just to be sure
1918	unless (eval {	1920	unless (eval {
1919	prepare_random_map $exit	1921	$self->goto ($slaying, $hp, $sp);
1920	if $exit->slaying eq "/!";
1921
1922	my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1923	$self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1924		1922
1925	1;	1923	1;
1926	}) {	1924	}) {
1927	$self->message ("Something went wrong deep within the crossfire server. "	1925	$self->message ("Something went wrong deep within the crossfire server. "
1928	. "I'll try to bring you back to the map you were before. "	1926	. "I'll try to bring you back to the map you were before. "
…		…
2217	sub db_sync() {	2215	sub db_sync() {
2218	db_save if $dirty;	2216	db_save if $dirty;
2219	undef $dirty;	2217	undef $dirty;
2220	}	2218	}
2221		2219
2222	my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {	2220	my $idle = Event->idle (
2223	db_sync;	2221	reentrant => 0,
		2222	min => 10,
		2223	max => 20,
		2224	repeat => 0,
		2225	data => WF_AUTOCANCEL,
		2226	cb => \&db_sync,
2224	});	2227	);
2225		2228
2226	sub db_dirty() {	2229	sub db_dirty() {
2227	$dirty = 1;	2230	$dirty = 1;
2228	$idle->start;	2231	$idle->start;
2229	}	2232	}
…		…
2277		2280
2278	sub main {	2281	sub main {
2279	# we must not ever block the main coroutine	2282	# we must not ever block the main coroutine
2280	local $Coro::idle = sub {	2283	local $Coro::idle = sub {
2281	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	2284	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
		2285	(async {
2282	async { Event::one_event };	2286	Event::one_event;
		2287	})->prio (Coro::PRIO_MAX);
2283	};	2288	};
2284		2289
2285	cfg_load;	2290	cfg_load;
2286	db_load;	2291	db_load;
2287	load_extensions;	2292	load_extensions;
		2293
		2294	$TICK_WATCHER->start;
2288	Event::loop;	2295	Event::loop;
2289	}	2296	}
2290		2297
2291	#############################################################################	2298	#############################################################################
2292	# initialisation and cleanup	2299	# initialisation and cleanup
2293		2300
2294	# install some emergency cleanup handlers	2301	# install some emergency cleanup handlers
2295	BEGIN {	2302	BEGIN {
2296	for my $signal (qw(INT HUP TERM)) {	2303	for my $signal (qw(INT HUP TERM)) {
2297	Event->signal (	2304	Event->signal (
		2305	reentrant => 0,
2298	data => WF_AUTOCANCEL,	2306	data => WF_AUTOCANCEL,
2299	signal => $signal,	2307	signal => $signal,
		2308	prio => 0,
2300	cb => sub {	2309	cb => sub {
2301	cf::cleanup "SIG$signal";	2310	cf::cleanup "SIG$signal";
2302	},	2311	},
2303	);	2312	);
2304	}	2313	}
2305	}	2314	}
…		…
2310	warn "enter emergency perl save\n";	2319	warn "enter emergency perl save\n";
2311		2320
2312	cf::sync_job {	2321	cf::sync_job {
2313	# use a peculiar iteration method to avoid tripping on perl	2322	# use a peculiar iteration method to avoid tripping on perl
2314	# refcount bugs in for. also avoids problems with players	2323	# refcount bugs in for. also avoids problems with players
2315	# and maps saved/Destroyed asynchronously.	2324	# and maps saved/destroyed asynchronously.
2316	warn "begin emergency player save\n";	2325	warn "begin emergency player save\n";
2317	for my $login (keys %cf::PLAYER) {	2326	for my $login (keys %cf::PLAYER) {
2318	my $pl = $cf::PLAYER{$login} or next;	2327	my $pl = $cf::PLAYER{$login} or next;
2319	$pl->valid or next;	2328	$pl->valid or next;
2320	$pl->save;	2329	$pl->save;
…		…
2334	}	2343	}
2335		2344
2336	sub reload() {	2345	sub reload() {
2337	# can/must only be called in main	2346	# can/must only be called in main
2338	if ($Coro::current != $Coro::main) {	2347	if ($Coro::current != $Coro::main) {
2339	warn "can only reload from main coroutine\n";	2348	warn "can only reload from main coroutine";
2340	return;	2349	return;
2341	}	2350	}
2342		2351
2343	warn "reloading...";	2352	warn "reloading...";
2344		2353
2345	my $guard = freeze_mainloop;	2354	warn "cancelling server ticker";
		2355	$TICK_WATCHER->cancel;
		2356
2346	cf::emergency_save;	2357	cf::emergency_save;
2347		2358
2348	eval {	2359	eval {
2349	# if anything goes wrong in here, we should simply crash as we already saved	2360	# if anything goes wrong in here, we should simply crash as we already saved
2350		2361
2351	# cancel all watchers	2362	warn "syncing database to disk";
		2363	cf::db_sync;
		2364
		2365	warn "cancelling all WF_AUTOCANCEL watchers";
2352	for (Event::all_watchers) {	2366	for (Event::all_watchers) {
2353	$_->cancel if $_->data & WF_AUTOCANCEL;	2367	$_->cancel if $_->data & WF_AUTOCANCEL;
2354	}	2368	}
2355		2369
		2370	warn "flushing outstanding aio requests";
		2371	for (;;) {
		2372	IO::AIO::flush;
		2373	Coro::cede;
		2374	last unless IO::AIO::nreqs;
		2375	warn "iterate...";
		2376	}
		2377
2356	# cancel all extension coros	2378	warn "cancelling all extension coros";
2357	$_->cancel for values %EXT_CORO;	2379	$_->cancel for values %EXT_CORO;
2358	%EXT_CORO = ();	2380	%EXT_CORO = ();
2359		2381
2360	# unload all extensions	2382	warn "removing commands";
2361	for (@exts) {	2383	%COMMAND = ();
		2384
		2385	warn "removing ext commands";
		2386	%EXTCMD = ();
		2387
		2388	warn "unloading/nuking all extensions";
		2389	for my $pkg (@EXTS) {
2362	warn "unloading <$_>";	2390	warn "... unloading $pkg";
2363	unload_extension $_;	2391
		2392	if (my $cb = $pkg->can ("unload")) {
		2393	eval {
		2394	$cb->($pkg);
		2395	1
		2396	} or warn "$pkg unloaded, but with errors: $@";
2364	}	2397	}
2365		2398
		2399	warn "... nuking $pkg";
		2400	Symbol::delete_package $pkg;
		2401	}
		2402
2366	# unload all modules loaded from $LIBDIR	2403	warn "unloading all perl modules loaded from $LIBDIR";
2367	while (my ($k, $v) = each %INC) {	2404	while (my ($k, $v) = each %INC) {
2368	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	2405	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2369		2406
2370	warn "removing <$k>";	2407	warn "... unloading $k";
2371	delete $INC{$k};	2408	delete $INC{$k};
2372		2409
2373	$k =~ s/\.pm$//;	2410	$k =~ s/\.pm$//;
2374	$k =~ s/\//::/g;	2411	$k =~ s/\//::/g;
2375		2412
…		…
2378	}	2415	}
2379		2416
2380	Symbol::delete_package $k;	2417	Symbol::delete_package $k;
2381	}	2418	}
2382		2419
2383	# sync database to disk
2384	cf::db_sync;
2385	IO::AIO::flush;
2386
2387	# get rid of safe::, as good as possible	2420	warn "getting rid of safe::, as good as possible";
2388	Symbol::delete_package "safe::$_"	2421	Symbol::delete_package "safe::$_"
2389	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	2422	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2390		2423
2391	# remove register_script_function callbacks
2392	# TODO
2393
2394	# unload cf.pm "a bit"	2424	warn "unloading cf.pm \"a bit\"";
2395	delete $INC{"cf.pm"};	2425	delete $INC{"cf.pm"};
2396		2426
2397	# don't, removes xs symbols, too,	2427	# don't, removes xs symbols, too,
2398	# and global variables created in xs	2428	# and global variables created in xs
2399	#Symbol::delete_package __PACKAGE__;	2429	#Symbol::delete_package __PACKAGE__;
2400		2430
2401	# reload cf.pm	2431	warn "unload completed, starting to reload now";
		2432
2402	warn "reloading cf.pm";	2433	warn "reloading cf.pm";
2403	require cf;	2434	require cf;
2404	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	2435	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2405		2436
2406	# load config and database again	2437	warn "loading config and database again";
2407	cf::cfg_load;	2438	cf::cfg_load;
2408	cf::db_load;	2439	cf::db_load;
2409		2440
2410	# load extensions
2411	warn "load extensions";	2441	warn "loading extensions";
2412	cf::load_extensions;	2442	cf::load_extensions;
2413		2443
2414	# reattach attachments to objects	2444	warn "reattaching attachments to objects/players";
2415	warn "reattach";
2416	_global_reattach;	2445	_global_reattach;
		2446	warn "reattaching attachments to maps";
2417	reattach $_ for values %MAP;	2447	reattach $_ for values %MAP;
		2448
		2449	warn "restarting server ticker";
		2450
		2451	$TICK_WATCHER->start;
2418	};	2452	};
2419		2453
2420	if ($@) {	2454	if ($@) {
2421	warn $@;	2455	warn $@;
2422	warn "error while reloading, exiting.";	2456	warn "error while reloading, exiting.";
2423	exit 1;	2457	exit 1;
2424	}	2458	}
2425		2459
2426	warn "reloaded successfully";	2460	warn "reloaded";
2427	};	2461	};
2428		2462
2429	#############################################################################	2463	our $RELOAD_WATCHER; # used only during reload
2430
2431	unless ($LINK_MAP) {
2432	$LINK_MAP = cf::map::new;
2433
2434	$LINK_MAP->width (41);
2435	$LINK_MAP->height (41);
2436	$LINK_MAP->alloc;
2437	$LINK_MAP->path ("{link}");
2438	$LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2439	$LINK_MAP->in_memory (MAP_IN_MEMORY);
2440
2441	# dirty hack because... archetypes are not yet loaded
2442	Event->timer (
2443	after => 10,
2444	cb => sub {
2445	$_[0]->w->cancel;
2446
2447	# provide some exits "home"
2448	my $exit = cf::object::new "exit";
2449
2450	$exit->slaying ($EMERGENCY_POSITION->[0]);
2451	$exit->stats->hp ($EMERGENCY_POSITION->[1]);
2452	$exit->stats->sp ($EMERGENCY_POSITION->[2]);
2453
2454	$LINK_MAP->insert ($exit->clone, 19, 19);
2455	$LINK_MAP->insert ($exit->clone, 19, 20);
2456	$LINK_MAP->insert ($exit->clone, 19, 21);
2457	$LINK_MAP->insert ($exit->clone, 20, 19);
2458	$LINK_MAP->insert ($exit->clone, 20, 21);
2459	$LINK_MAP->insert ($exit->clone, 21, 19);
2460	$LINK_MAP->insert ($exit->clone, 21, 20);
2461	$LINK_MAP->insert ($exit->clone, 21, 21);
2462
2463	$exit->destroy;
2464	});
2465
2466	$LINK_MAP->{deny_save} = 1;
2467	$LINK_MAP->{deny_reset} = 1;
2468
2469	$cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2470	}
2471
2472	register "<global>", __PACKAGE__;
2473		2464
2474	register_command "reload" => sub {	2465	register_command "reload" => sub {
2475	my ($who, $arg) = @_;	2466	my ($who, $arg) = @_;
2476		2467
2477	if ($who->flag (FLAG_WIZ)) {	2468	if ($who->flag (FLAG_WIZ)) {
2478	$who->message ("start of reload.");	2469	$who->message ("reloading server.");
		2470
		2471	# doing reload synchronously and two reloads happen back-to-back,
		2472	# coro crashes during coro_state_free->destroy here.
		2473
		2474	$RELOAD_WATCHER ||= Event->timer (
		2475	reentrant => 0,
		2476	after => 0,
		2477	data => WF_AUTOCANCEL,
		2478	cb => sub {
2479	reload;	2479	reload;
2480	$who->message ("end of reload.");	2480	undef $RELOAD_WATCHER;
		2481	},
		2482	);
2481	}	2483	}
2482	};	2484	};
2483		2485
2484	unshift @INC, $LIBDIR;	2486	unshift @INC, $LIBDIR;
		2487
		2488	my $bug_warning = 0;
2485		2489
2486	$TICK_WATCHER = Event->timer (	2490	$TICK_WATCHER = Event->timer (
2487	reentrant => 0,	2491	reentrant => 0,
		2492	parked => 1,
2488	prio => 0,	2493	prio => 0,
2489	at => $NEXT_TICK || $TICK,	2494	at => $NEXT_TICK || $TICK,
2490	data => WF_AUTOCANCEL,	2495	data => WF_AUTOCANCEL,
2491	cb => sub {	2496	cb => sub {
		2497	if ($Coro::current != $Coro::main) {
		2498	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
		2499	unless ++$bug_warning > 10;
		2500	return;
		2501	}
		2502
		2503	$NOW = Event::time;
		2504
2492	cf::server_tick; # one server iteration	2505	cf::server_tick; # one server iteration
2493	$RUNTIME += $TICK;	2506	$RUNTIME += $TICK;
2494	$NEXT_TICK += $TICK;	2507	$NEXT_TICK += $TICK;
2495		2508
2496	$WAIT_FOR_TICK->broadcast;	2509	$WAIT_FOR_TICK->broadcast;
2497	$WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;	2510	$WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
		2511
		2512	Event::sweep;
		2513	Coro::cede_notself;
		2514
		2515	# my $AFTER = Event::time;
		2516	# warn $AFTER - $NOW;#d#
2498		2517
2499	# if we are delayed by four ticks or more, skip them all	2518	# if we are delayed by four ticks or more, skip them all
2500	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2519	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2501		2520
2502	$TICK_WATCHER->at ($NEXT_TICK);	2521	$TICK_WATCHER->at ($NEXT_TICK);
2503	$TICK_WATCHER->start;	2522	$TICK_WATCHER->start;
2504	},	2523	},
2505	);	2524	);
2506		2525
2507	IO::AIO::max_poll_time $TICK * 0.2;	2526	IO::AIO::max_poll_time $TICK * 0.1;
2508		2527
2509	Event->io (	2528	undef $Coro::AIO::WATCHER;
		2529	$AIO_POLL_WATCHER = Event->io (
		2530	reentrant => 0,
2510	fd => IO::AIO::poll_fileno,	2531	fd => IO::AIO::poll_fileno,
2511	poll => 'r',	2532	poll => 'r',
2512	prio => 5,	2533	prio => 6,
2513	data => WF_AUTOCANCEL,	2534	data => WF_AUTOCANCEL,
2514	cb => \&IO::AIO::poll_cb,	2535	cb => \&IO::AIO::poll_cb,
2515	);	2536	);
2516		2537
2517	Event->timer (	2538	$WRITE_RUNTIME_WATCHER = Event->timer (
		2539	reentrant => 0,
2518	data => WF_AUTOCANCEL,	2540	data => WF_AUTOCANCEL,
2519	after => 0,	2541	after => 1,
2520	interval => 10,	2542	interval => 10,
2521	cb => sub {	2543	prio => 6, # keep it lowest so it acts like a watchdog
2522	(Coro::unblock_sub {	2544	cb => Coro::unblock_sub {
2523	write_runtime	2545	write_runtime
2524	or warn "ERROR: unable to write runtime file: $!";	2546	or warn "ERROR: unable to write runtime file: $!";
2525	})->();
2526	},	2547	},
2527	);	2548	);
2528		2549
2529	END { cf::emergency_save }	2550	END { cf::emergency_save }
2530		2551

Diff Legend

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