[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.139 by root, Fri Jan 5 19:12:03 2007 UTC vs.
Revision 1.168 by root, Sun Jan 14 00:37:14 2007 UTC

…		…
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;
19		19
		20	use Data::Dumper;
20	use Digest::MD5;	21	use Digest::MD5;
21	use Fcntl;	22	use Fcntl;
22	use IO::AIO 2.31 ();	23	use IO::AIO 2.32 ();
23	use YAML::Syck ();	24	use YAML::Syck ();
24	use Time::HiRes;	25	use Time::HiRes;
25		26
26	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
27		28
		29	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
		30
28	# 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?
29	$YAML::Syck::ImplicitUnicode = 1;	32	$YAML::Syck::ImplicitUnicode = 1;
30		33
31	$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
32		35
33	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34
35	our %COMMAND = ();	36	our %COMMAND = ();
36	our %COMMAND_TIME = ();	37	our %COMMAND_TIME = ();
		38
		39	our @EXTS = (); # list of extension package names
37	our %EXTCMD = ();	40	our %EXTCMD = ();
		41	our %EXT_CORO = (); # coroutines bound to extensions
		42	our %EXT_MAP = (); # pluggable maps
38		43
39	our @EVENT;	44	our @EVENT;
40	our $LIBDIR = datadir . "/ext";	45	our $LIBDIR = datadir . "/ext";
41		46
42	our $TICK = MAX_TIME * 1e-6;	47	our $TICK = MAX_TIME * 1e-6;
43	our $TICK_WATCHER;	48	our $TICK_WATCHER;
		49	our $AIO_POLL_WATCHER;
		50	our $WRITE_RUNTIME_WATCHER;
44	our $NEXT_TICK;	51	our $NEXT_TICK;
45	our $NOW;	52	our $NOW;
46		53
47	our %CFG;	54	our %CFG;
48		55
49	our $UPTIME; $UPTIME \|\|= time;	56	our $UPTIME; $UPTIME \|\|= time;
50	our $RUNTIME;	57	our $RUNTIME;
51		58
		59	our %PLAYER; # all users
52	our %MAP; # all maps	60	our %MAP; # all maps
53	our $LINK_MAP; # the special {link} map	61	our $LINK_MAP; # the special {link} map, which is always available
54	our $RANDOM_MAPS = cf::localdir . "/random";	62	our $RANDOM_MAPS = cf::localdir . "/random";
55	our %EXT_CORO;	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
56		69
57	binmode STDOUT;	70	binmode STDOUT;
58	binmode STDERR;	71	binmode STDERR;
59		72
60	# read virtual server time, if available	73	# read virtual server time, if available
…		…
68	mkdir cf::localdir . "/" . cf::playerdir;	81	mkdir cf::localdir . "/" . cf::playerdir;
69	mkdir cf::localdir . "/" . cf::tmpdir;	82	mkdir cf::localdir . "/" . cf::tmpdir;
70	mkdir cf::localdir . "/" . cf::uniquedir;	83	mkdir cf::localdir . "/" . cf::uniquedir;
71	mkdir $RANDOM_MAPS;	84	mkdir $RANDOM_MAPS;
72		85
73	# a special map that is always available
74	our $LINK_MAP;
75	our $EMERGENCY_POSITION;	86	our $EMERGENCY_POSITION;
76		87
77	#############################################################################	88	#############################################################################
78		89
79	=head2 GLOBAL VARIABLES	90	=head2 GLOBAL VARIABLES
…		…
104		115
105	=item %cf::CFG	116	=item %cf::CFG
106		117
107	Configuration for the server, loaded from C</etc/crossfire/config>, or	118	Configuration for the server, loaded from C</etc/crossfire/config>, or
108	from wherever your confdir points to.	119	from wherever your confdir points to.
		120
		121	=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
		122
		123	These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
		124	or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
		125	processing has been done. Call C<< ->wait >> on them to maximise the
		126	window of cpu time available, or simply to synchronise to the server tick.
109		127
110	=back	128	=back
111		129
112	=cut	130	=cut
113		131
…		…
117	utf8::encode $msg;	135	utf8::encode $msg;
118		136
119	$msg .= "\n"	137	$msg .= "\n"
120	unless $msg =~ /\n$/;	138	unless $msg =~ /\n$/;
121		139
122	LOG llevError, "cfperl: $msg";	140	LOG llevError, $msg;
123	};	141	};
124	}	142	}
125		143
126	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	144	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
127	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	145	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
…		…
145		163
146	$Event::DIED = sub {	164	$Event::DIED = sub {
147	warn "error in event callback: @_";	165	warn "error in event callback: @_";
148	};	166	};
149		167
150	my %ext_pkg;
151	my @exts;
152	my @hook;
153
154	=head2 UTILITY FUNCTIONS	168	=head2 UTILITY FUNCTIONS
155		169
156	=over 4	170	=over 4
157		171
		172	=item dumpval $ref
		173
158	=cut	174	=cut
		175
		176	sub dumpval {
		177	eval {
		178	local $SIG{__DIE__};
		179	my $d;
		180	if (1) {
		181	$d = new Data::Dumper([$_[0]], ["*var"]);
		182	$d->Terse(1);
		183	$d->Indent(2);
		184	$d->Quotekeys(0);
		185	$d->Useqq(1);
		186	#$d->Bless(...);
		187	$d->Seen($_[1]) if @_ > 1;
		188	$d = $d->Dump();
		189	}
		190	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
		191	$d
		192	} \|\| "[unable to dump $_[0]: '$@']";
		193	}
159		194
160	use JSON::Syck (); # TODO# replace by JSON::PC once working	195	use JSON::Syck (); # TODO# replace by JSON::PC once working
161		196
162	=item $ref = cf::from_json $json	197	=item $ref = cf::from_json $json
163		198
…		…
224	}	259	}
225		260
226	sub freeze_mainloop {	261	sub freeze_mainloop {
227	return unless $TICK_WATCHER->is_active;	262	return unless $TICK_WATCHER->is_active;
228		263
229	my $guard = Coro::guard { $TICK_WATCHER->start };	264	my $guard = Coro::guard {
		265	$TICK_WATCHER->start;
		266	$WRITE_RUNTIME_WATCHER->start;
		267	};
		268	$WRITE_RUNTIME_WATCHER->stop;
230	$TICK_WATCHER->stop;	269	$TICK_WATCHER->stop;
231	$guard	270	$guard
232	}	271	}
		272
		273	=item cf::async { BLOCK }
		274
		275	Currently the same as Coro::async_pool, meaning you cannot use
		276	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
		277	thing you are allowed to do is call C<prio> on it.
		278
		279	=cut
		280
		281	BEGIN { *async = \&Coro::async_pool }
233		282
234	=item cf::sync_job { BLOCK }	283	=item cf::sync_job { BLOCK }
235		284
236	The design of crossfire+ requires that the main coro ($Coro::main) is	285	The design of crossfire+ requires that the main coro ($Coro::main) is
237	always able to handle events or runnable, as crossfire+ is only partly	286	always able to handle events or runnable, as crossfire+ is only partly
…		…
256	my $freeze_guard = freeze_mainloop;	305	my $freeze_guard = freeze_mainloop;
257		306
258	my $busy = 1;	307	my $busy = 1;
259	my @res;	308	my @res;
260		309
261	(Coro::async_pool {	310	(async {
262	@res = eval { $job->() };	311	@res = eval { $job->() };
263	warn $@ if $@;	312	warn $@ if $@;
264	undef $busy;	313	undef $busy;
265	})->prio (Coro::PRIO_MAX);	314	})->prio (Coro::PRIO_MAX);
266		315
267	while ($busy) {	316	while ($busy) {
268	unless (Coro::cede) {	317	Coro::cede or Event::one_event;
269	Coro::nready ? Event::one_event 0 : Event::one_event;
270	Coro::cede_notself unless Coro::cede;
271	}
272	}	318	}
273		319
274	wantarray ? @res : $res[0]	320	wantarray ? @res : $res[0]
275	} else {	321	} else {
276	# we are in another coroutine, how wonderful, everything just works	322	# we are in another coroutine, how wonderful, everything just works
277		323
278	$job->()	324	$job->()
279	}	325	}
280	}	326	}
281		327
282	=item $coro = cf::coro { BLOCK }	328	=item $coro = cf::async_ext { BLOCK }
283		329
284	Creates (and readies) and returns a new coro. This coro is automcatially	330	Like async, but this coro is automatically being canceled when the
285	being canceled when the extension calling this is being unloaded.	331	extension calling this is being unloaded.
286		332
287	=cut	333	=cut
288		334
289	sub coro(&) {	335	sub async_ext(&) {
290	my $cb = shift;	336	my $cb = shift;
291		337
292	my $coro = &Coro::async_pool ($cb);	338	my $coro = &Coro::async ($cb);
293		339
294	$coro->on_destroy (sub {	340	$coro->on_destroy (sub {
295	delete $EXT_CORO{$coro+0};	341	delete $EXT_CORO{$coro+0};
296	});	342	});
297	$EXT_CORO{$coro+0} = $coro;	343	$EXT_CORO{$coro+0} = $coro;
…		…
322	}	368	}
323		369
324	=back	370	=back
325		371
326	=cut	372	=cut
327
328	#############################################################################
329
330	package cf::path;
331
332	sub new {
333	my ($class, $path, $base) = @_;
334
335	$path = $path->as_string if ref $path;
336
337	my $self = bless { }, $class;
338
339	# {... are special paths that are not touched
340	# ?xxx/... are special absolute paths
341	# ?random/... random maps
342	# /! non-realised random map exit
343	# /... normal maps
344	# ~/... per-player maps without a specific player (DO NOT USE)
345	# ~user/... per-player map of a specific user
346
347	if ($path =~ /^{/) {
348	# fine as it is
349	} elsif ($path =~ s{^\?random/}{}) {
350	Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
351	$self->{random} = cf::from_json $data;
352	} else {
353	if ($path =~ s{^~([^/]+)?}{}) {
354	$self->{user_rel} = 1;
355
356	if (defined $1) {
357	$self->{user} = $1;
358	} elsif ($base =~ m{^~([^/]+)/}) {
359	$self->{user} = $1;
360	} else {
361	warn "cannot resolve user-relative path without user <$path,$base>\n";
362	}
363	} elsif ($path =~ /^\//) {
364	# already absolute
365	} else {
366	$base =~ s{[^/]+/?$}{};
367	return $class->new ("$base/$path");
368	}
369
370	for ($path) {
371	redo if s{/\.?/}{/};
372	redo if s{/[^/]+/\.\./}{/};
373	}
374	}
375
376	$self->{path} = $path;
377
378	$self
379	}
380
381	# the name / primary key / in-game path
382	sub as_string {
383	my ($self) = @_;
384
385	$self->{user_rel} ? "~$self->{user}$self->{path}"
386	: $self->{random} ? "?random/$self->{path}"
387	: $self->{path}
388	}
389
390	# the displayed name, this is a one way mapping
391	sub visible_name {
392	my ($self) = @_;
393
394	# if (my $rmp = $self->{random}) {
395	# # todo: be more intelligent about this
396	# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
397	# } else {
398	$self->as_string
399	# }
400	}
401
402	# escape the /'s in the path
403	sub _escaped_path {
404	# ∕ is U+2215
405	(my $path = $_[0]{path}) =~ s/\//∕/g;
406	$path
407	}
408
409	# the original (read-only) location
410	sub load_path {
411	my ($self) = @_;
412
413	sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
414	}
415
416	# the temporary/swap location
417	sub save_path {
418	my ($self) = @_;
419
420	$self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
421	: $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
422	: sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
423	}
424
425	# the unique path, might be eq to save_path
426	sub uniq_path {
427	my ($self) = @_;
428
429	$self->{user_rel} \|\| $self->{random}
430	? undef
431	: sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
432	}
433
434	# return random map parameters, or undef
435	sub random_map_params {
436	my ($self) = @_;
437
438	$self->{random}
439	}
440
441	# this is somewhat ugly, but style maps do need special treatment
442	sub is_style_map {
443	$_[0]{path} =~ m{^/styles/}
444	}
445
446	package cf;
447		373
448	#############################################################################	374	#############################################################################
449		375
450	=head2 ATTACHABLE OBJECTS	376	=head2 ATTACHABLE OBJECTS
451		377
…		…
898	=cut	824	=cut
899		825
900	sub register_extcmd {	826	sub register_extcmd {
901	my ($name, $cb) = @_;	827	my ($name, $cb) = @_;
902		828
903	my $caller = caller;
904	#warn "registering extcmd '$name' to '$caller'";
905
906	$EXTCMD{$name} = [$cb, $caller];	829	$EXTCMD{$name} = $cb;
907	}	830	}
908		831
909	cf::player->attach (	832	cf::player->attach (
910	on_command => sub {	833	on_command => sub {
911	my ($pl, $name, $params) = @_;	834	my ($pl, $name, $params) = @_;
…		…
924		847
925	my $msg = eval { from_json $buf };	848	my $msg = eval { from_json $buf };
926		849
927	if (ref $msg) {	850	if (ref $msg) {
928	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	851	if (my $cb = $EXTCMD{$msg->{msgtype}}) {
929	if (my %reply = $cb->[0]->($pl, $msg)) {	852	if (my %reply = $cb->($pl, $msg)) {
930	$pl->ext_reply ($msg->{msgid}, %reply);	853	$pl->ext_reply ($msg->{msgid}, %reply);
931	}	854	}
932	}	855	}
933	} else {	856	} else {
934	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	857	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
…		…
936		859
937	cf::override;	860	cf::override;
938	},	861	},
939	);	862	);
940		863
941	sub register {
942	my ($base, $pkg) = @_;
943
944	#TODO
945	}
946
947	sub load_extension {	864	sub load_extension {
948	my ($path) = @_;	865	my ($path) = @_;
949		866
950	$path =~ /([^\/\\]+)\.ext$/ or die "$path";	867	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
951	my $base = $1;	868	my $base = $1;
952	my $pkg = $1;	869	my $pkg = $1;
953	$pkg =~ s/[^[:word:]]/_/g;	870	$pkg =~ s/[^[:word:]]/_/g;
954	$pkg = "ext::$pkg";	871	$pkg = "ext::$pkg";
955		872
956	warn "loading '$path' into '$pkg'\n";	873	warn "... loading '$path' into '$pkg'\n";
957		874
958	open my $fh, "<:utf8", $path	875	open my $fh, "<:utf8", $path
959	or die "$path: $!";	876	or die "$path: $!";
960		877
961	my $source =	878	my $source =
962	"package $pkg; use strict; use utf8;\n"	879	"package $pkg; use strict; use utf8;\n"
963	. "#line 1 \"$path\"\n{\n"	880	. "#line 1 \"$path\"\n{\n"
964	. (do { local $/; <$fh> })	881	. (do { local $/; <$fh> })
965	. "\n};\n1";	882	. "\n};\n1";
966		883
967	eval $source	884	unless (eval $source) {
968	or die $@ ? "$path: $@\n"	885	my $msg = $@ ? "$path: $@\n"
969	: "extension disabled.\n";	886	: "extension disabled.\n";
970		887	if ($source =~ /^#!.perl.#.*MANDATORY/m) { # ugly match
971	push @exts, $pkg;	888	warn $@;
972	$ext_pkg{$base} = $pkg;	889	warn "mandatory extension failed to load, exiting.\n";
973		890	exit 1;
974	# no strict 'refs';	891	}
975	# @{"$pkg\::ISA"} = ext::;	892	die $@;
976
977	register $base, $pkg;
978	}
979
980	sub unload_extension {
981	my ($pkg) = @_;
982
983	warn "removing extension $pkg\n";
984
985	# remove hooks
986	#TODO
987	# for my $idx (0 .. $#PLUGIN_EVENT) {
988	# delete $hook[$idx]{$pkg};
989	# }	893	}
990		894
991	# remove commands	895	push @EXTS, $pkg;
992	for my $name (keys %COMMAND) {
993	my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
994
995	if (@cb) {
996	$COMMAND{$name} = \@cb;
997	} else {
998	delete $COMMAND{$name};
999	}
1000	}
1001
1002	# remove extcmds
1003	for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1004	delete $EXTCMD{$name};
1005	}
1006
1007	if (my $cb = $pkg->can ("unload")) {
1008	eval {
1009	$cb->($pkg);
1010	1
1011	} or warn "$pkg unloaded, but with errors: $@";
1012	}
1013
1014	Symbol::delete_package $pkg;
1015	}	896	}
1016		897
1017	sub load_extensions {	898	sub load_extensions {
1018	for my $ext (<$LIBDIR/*.ext>) {	899	for my $ext (<$LIBDIR/*.ext>) {
1019	next unless -r $ext;	900	next unless -r $ext;
…		…
1023	} or warn "$ext not loaded: $@";	904	} or warn "$ext not loaded: $@";
1024	}	905	}
1025	}	906	}
1026		907
1027	#############################################################################	908	#############################################################################
1028	# load/save/clean perl data associated with a map
1029
1030	*cf::mapsupport::on_clean = sub {
1031	my ($map) = @_;
1032
1033	my $path = $map->tmpname;
1034	defined $path or return;
1035
1036	unlink "$path.pst";
1037	};
1038
1039	cf::map->attach (prio => -10000, package => cf::mapsupport::);
1040
1041	#############################################################################
1042	# load/save perl data associated with player->ob objects
1043
1044	sub all_objects(@) {
1045	@_, map all_objects ($_->inv), @_
1046	}
1047
1048	# TODO: compatibility cruft, remove when no longer needed
1049	cf::player->attach (
1050	on_load => sub {
1051	my ($pl, $path) = @_;
1052
1053	for my $o (all_objects $pl->ob) {
1054	if (my $value = $o->get_ob_key_value ("_perl_data")) {
1055	$o->set_ob_key_value ("_perl_data");
1056
1057	%$o = %{ Storable::thaw pack "H*", $value };
1058	}
1059	}
1060	},
1061	);
1062
1063	#############################################################################
1064		909
1065	=head2 CORE EXTENSIONS	910	=head2 CORE EXTENSIONS
1066		911
1067	Functions and methods that extend core crossfire objects.	912	Functions and methods that extend core crossfire objects.
1068		913
		914	=cut
		915
		916	package cf::player;
		917
		918	use Coro::AIO;
		919
1069	=head3 cf::player	920	=head3 cf::player
1070		921
1071	=over 4	922	=over 4
1072		923
1073	=item cf::player::exists $login	924	=item cf::player::find $login
1074		925
1075	Returns true when the given account exists.	926	Returns the given player object, loading it if necessary (might block).
1076		927
1077	=cut	928	=cut
1078		929
1079	sub cf::player::exists($) {	930	sub playerdir($) {
1080	cf::player::find $_[0]	931	cf::localdir
1081	or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2;	932	. "/"
		933	. cf::playerdir
		934	. "/"
		935	. (ref $_[0] ? $_[0]->ob->name : $_[0])
		936	}
		937
		938	sub path($) {
		939	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
		940
		941	(playerdir $login) . "/$login.pl"
		942	}
		943
		944	sub find_active($) {
		945	$cf::PLAYER{$_[0]}
		946	and $cf::PLAYER{$_[0]}->active
		947	and $cf::PLAYER{$_[0]}
		948	}
		949
		950	sub exists($) {
		951	my ($login) = @_;
		952
		953	$cf::PLAYER{$login}
		954	or cf::sync_job { !aio_stat $login }
		955	}
		956
		957	sub find($) {
		958	return $cf::PLAYER{$_[0]} \|\| do {
		959	my $login = $_[0];
		960
		961	my $guard = cf::lock_acquire "user_find:$login";
		962
		963	$cf::PLAYER{$_[0]} \|\| do {
		964	my $pl = load_pl path $login
		965	or return;
		966	$cf::PLAYER{$login} = $pl
		967	}
		968	}
		969	}
		970
		971	sub save($) {
		972	my ($pl) = @_;
		973
		974	return if $pl->{deny_save};
		975
		976	my $path = path $pl;
		977	my $guard = cf::lock_acquire "user_save:$path";
		978
		979	return if $pl->{deny_save};
		980
		981	aio_mkdir playerdir $pl, 0770;
		982	$pl->{last_save} = $cf::RUNTIME;
		983
		984	$pl->save_pl ($path);
		985	Coro::cede;
		986	}
		987
		988	sub new($) {
		989	my ($login) = @_;
		990
		991	my $self = create;
		992
		993	$self->ob->name ($login);
		994	$self->{deny_save} = 1;
		995
		996	$cf::PLAYER{$login} = $self;
		997
		998	$self
		999	}
		1000
		1001	=item $pl->quit_character
		1002
		1003	Nukes the player without looking back. If logged in, the connection will
		1004	be destroyed. May block for a long time.
		1005
		1006	=cut
		1007
		1008	sub quit_character {
		1009	my ($pl) = @_;
		1010
		1011	$pl->{deny_save} = 1;
		1012	$pl->password ("*"); # this should lock out the player until we nuked the dir
		1013
		1014	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
		1015	$pl->deactivate;
		1016	$pl->invoke (cf::EVENT_PLAYER_QUIT);
		1017	$pl->ns->destroy if $pl->ns;
		1018
		1019	my $path = playerdir $pl;
		1020	my $temp = "$path~$cf::RUNTIME~deleting~";
		1021	aio_rename $path, $temp;
		1022	delete $cf::PLAYER{$pl->ob->name};
		1023	$pl->destroy;
		1024	IO::AIO::aio_rmtree $temp;
		1025	}
		1026
		1027	=item cf::player::list_logins
		1028
		1029	Returns am arrayref of all valid playernames in the system, can take a
		1030	while and may block, so not sync_job-capable, ever.
		1031
		1032	=cut
		1033
		1034	sub list_logins {
		1035	my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
		1036	or return [];
		1037
		1038	my @logins;
		1039
		1040	for my $login (@$dirs) {
		1041	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
		1042	aio_read $fh, 0, 512, my $buf, 0 or next;
		1043	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1044
		1045	utf8::decode $login;
		1046	push @logins, $login;
		1047	}
		1048
		1049	\@logins
		1050	}
		1051
		1052	=item $player->maps
		1053
		1054	Returns an arrayref of map paths that are private for this
		1055	player. May block.
		1056
		1057	=cut
		1058
		1059	sub maps($) {
		1060	my ($pl) = @_;
		1061
		1062	my $files = aio_readdir playerdir $pl
		1063	or return;
		1064
		1065	my @paths;
		1066
		1067	for (@$files) {
		1068	utf8::decode $_;
		1069	next if /\.(?:pl\|pst)$/;
		1070	next unless /^$PATH_SEP/o;
		1071
		1072	s/\.map$//;
		1073	push @paths, "~" . $pl->ob->name . "/" . $_;
		1074	}
		1075
		1076	\@paths
1082	}	1077	}
1083		1078
1084	=item $player->ext_reply ($msgid, $msgtype, %msg)	1079	=item $player->ext_reply ($msgid, $msgtype, %msg)
1085		1080
1086	Sends an ext reply to the player.	1081	Sends an ext reply to the player.
1087		1082
1088	=cut	1083	=cut
1089		1084
1090	sub cf::player::ext_reply($$$%) {	1085	sub ext_reply($$$%) {
1091	my ($self, $id, %msg) = @_;	1086	my ($self, $id, %msg) = @_;
1092		1087
1093	$msg{msgid} = $id;	1088	$msg{msgid} = $id;
1094		1089
1095	$self->send ("ext " . to_json \%msg);	1090	$self->send ("ext " . cf::to_json \%msg);
1096	}	1091	}
		1092
		1093	package cf;
1097		1094
1098	=back	1095	=back
1099		1096
1100		1097
1101	=head3 cf::map	1098	=head3 cf::map
…		…
1107	package cf::map;	1104	package cf::map;
1108		1105
1109	use Fcntl;	1106	use Fcntl;
1110	use Coro::AIO;	1107	use Coro::AIO;
1111		1108
		1109	use overload
		1110	'""' => \&as_string;
		1111
1112	our $MAX_RESET = 3600;	1112	our $MAX_RESET = 3600;
1113	our $DEFAULT_RESET = 3000;	1113	our $DEFAULT_RESET = 3000;
1114		1114
1115	sub generate_random_map {	1115	sub generate_random_map {
1116	my ($path, $rmp) = @_;	1116	my ($self, $rmp) = @_;
1117		1117
1118	# mit "rum" bekleckern, nicht	1118	# mit "rum" bekleckern, nicht
1119	cf::map::_create_random_map	1119	$self->_create_random_map (
1120	$path,
1121	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1120	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1122	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1121	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1123	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1122	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1124	$rmp->{exit_on_final_map},	1123	$rmp->{exit_on_final_map},
1125	$rmp->{xsize}, $rmp->{ysize},	1124	$rmp->{xsize}, $rmp->{ysize},
1126	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},	1125	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1127	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},	1126	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1128	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},	1127	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1129	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},	1128	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1130	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},	1129	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1131	(cf::region::find $rmp->{region})	1130	(cf::region::find $rmp->{region}), $rmp->{custom}
		1131	)
		1132	}
		1133
		1134	sub register {
		1135	my (undef, $regex) = @_;
		1136	my $pkg = caller;
		1137
		1138	no strict;
		1139	push @{"$pkg\::ISA"}, __PACKAGE__;
		1140
		1141	$EXT_MAP{$pkg} = qr<$regex>;
		1142	}
		1143
		1144	# also paths starting with '/'
		1145	$EXT_MAP{"cf::map"} = qr{^(?=/)};
		1146
		1147	sub normalise {
		1148	my ($path, $base) = @_;
		1149
		1150	# map plan:
		1151	#
		1152	# /! non-realised random map exit (special hack!)
		1153	# {... are special paths that are not being touched
		1154	# ?xxx/... are special absolute paths
		1155	# ?random/... random maps
		1156	# /... normal maps
		1157	# ~user/... per-player map of a specific user
		1158
		1159	$path =~ s/$PATH_SEP/\//go;
		1160
		1161	# treat it as relative path if it starts with
		1162	# something that looks reasonable
		1163	if ($path =~ m{^(?:\./\|\.\./\|\w)}) {
		1164	$base or Carp::carp "normalise called with relative path and no base: '$path'";
		1165
		1166	$base =~ s{[^/]+/?$}{};
		1167	$path = "$base/$path";
		1168	}
		1169
		1170	for ($path) {
		1171	redo if s{//}{/};
		1172	redo if s{/\.?/}{/};
		1173	redo if s{/[^/]+/\.\./}{/};
		1174	}
		1175
		1176	$path
		1177	}
		1178
		1179	sub new_from_path {
		1180	my (undef, $path, $base) = @_;
		1181
		1182	return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
		1183
		1184	$path = normalise $path, $base;
		1185
		1186	for my $pkg (keys %EXT_MAP) {
		1187	if ($path =~ $EXT_MAP{$pkg}) {
		1188	my $self = bless cf::map::new, $pkg;
		1189	$self->{path} = $path; $self->path ($path);
		1190	$self->init; # pass $1 etc.
		1191	return $self;
		1192	}
		1193	}
		1194
		1195	Carp::carp "unable to resolve path '$path'.";
		1196	()
		1197	}
		1198
		1199	sub init {
		1200	my ($self) = @_;
		1201
		1202	$self
		1203	}
		1204
		1205	sub as_string {
		1206	my ($self) = @_;
		1207
		1208	"$self->{path}"
		1209	}
		1210
		1211	# the displayed name, this is a one way mapping
		1212	sub visible_name {
		1213	&as_string
		1214	}
		1215
		1216	# the original (read-only) location
		1217	sub load_path {
		1218	my ($self) = @_;
		1219
		1220	sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
		1221	}
		1222
		1223	# the temporary/swap location
		1224	sub save_path {
		1225	my ($self) = @_;
		1226
		1227	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
		1228	sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
		1229	}
		1230
		1231	# the unique path, undef == no special unique path
		1232	sub uniq_path {
		1233	my ($self) = @_;
		1234
		1235	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
		1236	sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1132	}	1237	}
1133		1238
1134	# and all this just because we cannot iterate over	1239	# and all this just because we cannot iterate over
1135	# all maps in C++...	1240	# all maps in C++...
1136	sub change_all_map_light {	1241	sub change_all_map_light {
…		…
1138		1243
1139	$_->change_map_light ($change)	1244	$_->change_map_light ($change)
1140	for grep $_->outdoor, values %cf::MAP;	1245	for grep $_->outdoor, values %cf::MAP;
1141	}	1246	}
1142		1247
		1248	sub unlink_save {
		1249	my ($self) = @_;
		1250
		1251	utf8::encode (my $save = $self->save_path);
		1252	IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
		1253	IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
		1254	}
		1255
1143	sub try_load_header($) {	1256	sub load_header_from($) {
1144	my ($path) = @_;	1257	my ($self, $path) = @_;
1145		1258
1146	utf8::encode $path;	1259	utf8::encode $path;
1147	aio_open $path, O_RDONLY, 0	1260	aio_open $path, O_RDONLY, 0
1148	or return;	1261	or return;
1149		1262
1150	my $map = cf::map::new	1263	$self->_load_header ($path)
1151	or return;	1264	or return;
1152		1265
1153	# for better error messages only, will be overwritten	1266	$self->{load_path} = $path;
1154	$map->path ($path);
1155		1267
1156	$map->load_header ($path)	1268	1
		1269	}
		1270
		1271	sub load_orig {
		1272	my ($self) = @_;
		1273
		1274	$self->load_header_from ($self->load_path)
		1275	}
		1276
		1277	sub load_temp {
		1278	my ($self) = @_;
		1279
		1280	$self->load_header_from ($self->save_path)
		1281	}
		1282
		1283	sub load_header {
		1284	my ($self) = @_;
		1285
		1286	if ($self->load_temp) {
		1287	$self->last_access ((delete $self->{last_access})
		1288	\|\| $cf::RUNTIME); #d#
		1289	# safety
		1290	$self->{instantiate_time} = $cf::RUNTIME
		1291	if $self->{instantiate_time} > $cf::RUNTIME;
		1292	} else {
		1293	$self->load_orig
1157	or return;	1294	or return;
1158		1295
1159	$map->{load_path} = $path;	1296	$self->{load_original} = 1;
		1297	$self->{instantiate_time} = $cf::RUNTIME;
		1298	$self->last_access ($cf::RUNTIME);
		1299	$self->instantiate;
		1300	}
1160		1301
1161	$map	1302	1
1162	}	1303	}
1163		1304
1164	sub find;	1305	sub find;
1165	sub find {	1306	sub find {
1166	my ($path, $origin) = @_;	1307	my ($path, $origin) = @_;
1167		1308
1168	#warn "find<$path,$origin>\n";#d#
1169
1170	$path = new cf::path $path, $origin && $origin->path;	1309	$path = normalise $path, $origin && $origin->path;
1171	my $key = $path->as_string;
1172		1310
1173	cf::lock_wait "map_find:$key";	1311	cf::lock_wait "map_find:$path";
1174		1312
1175	$cf::MAP{$key} \|\| do {	1313	$cf::MAP{$path} \|\| do {
1176	my $guard = cf::lock_acquire "map_find:$key";	1314	my $guard = cf::lock_acquire "map_find:$path";
1177		1315	my $map = new_from_path cf::map $path
1178	# do it the slow way
1179	my $map = try_load_header $path->save_path;
1180
1181	Coro::cede;
1182
1183	if ($map) {
1184	$map->last_access ((delete $map->{last_access})
1185	\|\| $cf::RUNTIME); #d#
1186	# safety
1187	$map->{instantiate_time} = $cf::RUNTIME
1188	if $map->{instantiate_time} > $cf::RUNTIME;
1189	} else {
1190	if (my $rmp = $path->random_map_params) {
1191	$map = generate_random_map $key, $rmp;
1192	} else {
1193	$map = try_load_header $path->load_path;
1194	}
1195
1196	$map or return;	1316	or return;
1197		1317
1198	$map->{load_original} = 1;
1199	$map->{instantiate_time} = $cf::RUNTIME;
1200	$map->last_access ($cf::RUNTIME);
1201	$map->instantiate;
1202
1203	# per-player maps become, after loading, normal maps
1204	$map->per_player (0) if $path->{user_rel};
1205	}
1206
1207	$map->path ($key);
1208	$map->{path} = $path;
1209	$map->{last_save} = $cf::RUNTIME;	1318	$map->{last_save} = $cf::RUNTIME;
1210		1319
1211	Coro::cede;	1320	$map->load_header
		1321	or return;
1212		1322
1213	if ($map->should_reset) {	1323	if ($map->should_reset) {
1214	$map->reset;	1324	$map->reset;
1215	undef $guard;	1325	undef $guard;
1216	$map = find $path	1326	$map = find $path
1217	or return;	1327	or return;
1218	}	1328	}
1219		1329
1220	$cf::MAP{$key} = $map	1330	$cf::MAP{$path} = $map
1221	}	1331	}
1222	}	1332	}
1223		1333
1224	sub load {	1334	sub load {
1225	my ($self) = @_;	1335	my ($self) = @_;
1226		1336
1227	my $path = $self->{path};	1337	my $path = $self->{path};
1228	my $guard = cf::lock_acquire "map_load:" . $path->as_string;	1338	my $guard = cf::lock_acquire "map_load:$path";
1229		1339
1230	return if $self->in_memory != cf::MAP_SWAPPED;	1340	return if $self->in_memory != cf::MAP_SWAPPED;
1231		1341
1232	$self->in_memory (cf::MAP_LOADING);	1342	$self->in_memory (cf::MAP_LOADING);
1233		1343
1234	$self->alloc;	1344	$self->alloc;
1235	$self->load_objects ($self->{load_path}, 1)	1345	$self->_load_objects ($self->{load_path}, 1)
1236	or return;	1346	or return;
1237		1347
1238	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1348	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1239	if delete $self->{load_original};	1349	if delete $self->{load_original};
1240		1350
1241	if (my $uniq = $path->uniq_path) {	1351	if (my $uniq = $self->uniq_path) {
1242	utf8::encode $uniq;	1352	utf8::encode $uniq;
1243	if (aio_open $uniq, O_RDONLY, 0) {	1353	if (aio_open $uniq, O_RDONLY, 0) {
1244	$self->clear_unique_items;	1354	$self->clear_unique_items;
1245	$self->load_objects ($uniq, 0);	1355	$self->_load_objects ($uniq, 0);
1246	}	1356	}
1247	}	1357	}
1248		1358
1249	Coro::cede;	1359	Coro::cede;
1250		1360
1251	# now do the right thing for maps	1361	# now do the right thing for maps
1252	$self->link_multipart_objects;	1362	$self->link_multipart_objects;
1253		1363
1254	if ($self->{path}->is_style_map) {	1364	unless ($self->{deny_activate}) {
1255	$self->{deny_save} = 1;	1365	$self->decay_objects;
1256	$self->{deny_reset} = 1;
1257	} else {
1258	$self->fix_auto_apply;	1366	$self->fix_auto_apply;
1259	$self->decay_objects;
1260	$self->update_buttons;	1367	$self->update_buttons;
		1368	Coro::cede;
1261	$self->set_darkness_map;	1369	$self->set_darkness_map;
1262	$self->difficulty ($self->estimate_difficulty)	1370	$self->difficulty ($self->estimate_difficulty)
1263	unless $self->difficulty;	1371	unless $self->difficulty;
		1372	Coro::cede;
1264	$self->activate;	1373	$self->activate;
1265	}	1374	}
1266		1375
1267	Coro::cede;
1268
1269	$self->in_memory (cf::MAP_IN_MEMORY);	1376	$self->in_memory (cf::MAP_IN_MEMORY);
		1377	}
		1378
		1379	sub customise_for {
		1380	my ($self, $ob) = @_;
		1381
		1382	return find "~" . $ob->name . "/" . $self->{path}
		1383	if $self->per_player;
		1384
		1385	$self
		1386	}
		1387
		1388	# find and load all maps in the 3x3 area around a map
		1389	sub load_diag {
		1390	my ($map) = @_;
		1391
		1392	my @diag; # diagonal neighbours
		1393
		1394	for (0 .. 3) {
		1395	my $neigh = $map->tile_path ($_)
		1396	or next;
		1397	$neigh = find $neigh, $map
		1398	or next;
		1399	$neigh->load;
		1400
		1401	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
		1402	[$neigh->tile_path (($_ + 1) % 4), $neigh];
		1403	}
		1404
		1405	for (@diag) {
		1406	my $neigh = find @$_
		1407	or next;
		1408	$neigh->load;
		1409	}
1270	}	1410	}
1271		1411
1272	sub find_sync {	1412	sub find_sync {
1273	my ($path, $origin) = @_;	1413	my ($path, $origin) = @_;
1274		1414
1275	cf::sync_job {	1415	cf::sync_job { find $path, $origin }
1276	my $map = cf::map::find $path, $origin;
1277	$map
1278	}
1279	}	1416	}
1280		1417
1281	sub do_load_sync {	1418	sub do_load_sync {
1282	my ($map) = @_;	1419	my ($map) = @_;
1283		1420
1284	cf::sync_job { $map->load };	1421	cf::sync_job { $map->load };
1285	}	1422	}
1286		1423
		1424	our %MAP_PREFETCH;
		1425	our $MAP_PREFETCHER = Coro::async {
		1426	while () {
		1427	for my $path (keys %MAP_PREFETCH) {
		1428	my $map = find $path
		1429	or next;
		1430	$map->load;
		1431
		1432	delete $MAP_PREFETCH{$path};
		1433	}
		1434	Coro::schedule;
		1435	}
		1436	};
		1437
		1438	sub find_async {
		1439	my ($path, $origin) = @_;
		1440
		1441	$path = normalise $path, $origin && $origin->{path};
		1442
		1443	if (my $map = $cf::MAP{$path}) {
		1444	return $map if $map->in_memory == cf::MAP_IN_MEMORY;
		1445	}
		1446
		1447	$MAP_PREFETCH{$path} = 0;
		1448	$MAP_PREFETCHER->ready;
		1449
		1450	()
		1451	}
		1452
1287	sub save {	1453	sub save {
1288	my ($self) = @_;	1454	my ($self) = @_;
1289		1455
1290	my $lock = cf::lock_acquire "map_data:" . $self->path;	1456	my $lock = cf::lock_acquire "map_data:" . $self->path;
1291		1457
1292	$self->{last_save} = $cf::RUNTIME;	1458	$self->{last_save} = $cf::RUNTIME;
1293		1459
1294	return unless $self->dirty;	1460	return unless $self->dirty;
1295		1461
1296	my $save = $self->{path}->save_path; utf8::encode $save;	1462	my $save = $self->save_path; utf8::encode $save;
1297	my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;	1463	my $uniq = $self->uniq_path; utf8::encode $uniq;
1298		1464
1299	$self->{load_path} = $save;	1465	$self->{load_path} = $save;
1300		1466
1301	return if $self->{deny_save};	1467	return if $self->{deny_save};
1302		1468
1303	local $self->{last_access} = $self->last_access;#d#	1469	local $self->{last_access} = $self->last_access;#d#
1304		1470
		1471	cf::async {
		1472	$_->contr->save for $self->players;
		1473	};
		1474
1305	if ($uniq) {	1475	if ($uniq) {
1306	$self->save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	1476	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
1307	$self->save_objects ($uniq, cf::IO_UNIQUES);	1477	$self->_save_objects ($uniq, cf::IO_UNIQUES);
1308	} else {	1478	} else {
1309	$self->save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS \| cf::IO_UNIQUES);	1479	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS \| cf::IO_UNIQUES);
1310	}	1480	}
1311	}	1481	}
1312		1482
1313	sub swap_out {	1483	sub swap_out {
1314	my ($self) = @_;	1484	my ($self) = @_;
…		…
1328		1498
1329	sub reset_at {	1499	sub reset_at {
1330	my ($self) = @_;	1500	my ($self) = @_;
1331		1501
1332	# TODO: safety, remove and allow resettable per-player maps	1502	# TODO: safety, remove and allow resettable per-player maps
1333	return 1e99 if $self->{path}{user_rel};	1503	return 1e99 if $self->isa ("ext::map_per_player");
1334	return 1e99 if $self->{deny_reset};	1504	return 1e99 if $self->{deny_reset};
1335		1505
1336	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;	1506	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1337	my $to = List::Util::min $MAX_RESET, $self->reset_timeout \|\| $DEFAULT_RESET;	1507	my $to = List::Util::min $MAX_RESET, $self->reset_timeout \|\| $DEFAULT_RESET;
1338		1508
…		…
1343	my ($self) = @_;	1513	my ($self) = @_;
1344		1514
1345	$self->reset_at <= $cf::RUNTIME	1515	$self->reset_at <= $cf::RUNTIME
1346	}	1516	}
1347		1517
1348	sub unlink_save {
1349	my ($self) = @_;
1350
1351	utf8::encode (my $save = $self->{path}->save_path);
1352	aioreq_pri 3; IO::AIO::aio_unlink $save;
1353	aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1354	}
1355
1356	sub rename {	1518	sub rename {
1357	my ($self, $new_path) = @_;	1519	my ($self, $new_path) = @_;
1358		1520
		1521	normalise $new_path;
		1522
1359	$self->unlink_save;	1523	$self->unlink_save;
1360		1524
1361	delete $cf::MAP{$self->path};	1525	delete $cf::MAP{$self->path};
1362	$self->{path} = new cf::path $new_path;	1526	$self->{path} = $new_path; $self->path ($self->{path});
1363	$self->path ($self->{path}->as_string);
1364	$cf::MAP{$self->path} = $self;	1527	$cf::MAP{$self->path} = $self;
1365		1528
1366	$self->save;	1529	$self->save;
1367	}	1530	}
1368		1531
1369	sub reset {	1532	sub reset {
1370	my ($self) = @_;	1533	my ($self) = @_;
1371		1534
1372	my $lock = cf::lock_acquire "map_data:" . $self->path;	1535	my $lock = cf::lock_acquire "map_data:$self->{path}";
1373		1536
1374	return if $self->players;	1537	return if $self->players;
1375	return if $self->{path}{user_rel};#d#	1538	return if $self->isa ("ext::map_per_player");#d#
1376		1539
1377	warn "resetting map ", $self->path;#d#	1540	warn "resetting map ", $self->path;#d#
1378		1541
1379	delete $cf::MAP{$self->path};	1542	delete $cf::MAP{$self->path};
		1543
		1544	$self->in_memory (cf::MAP_SWAPPED);
		1545	$self->clear;
1380		1546
1381	$_->clear_links_to ($self) for values %cf::MAP;	1547	$_->clear_links_to ($self) for values %cf::MAP;
1382		1548
1383	$self->unlink_save;	1549	$self->unlink_save;
1384	$self->destroy;	1550	$self->destroy;
…		…
1393	$self->reset_timeout (1);	1559	$self->reset_timeout (1);
1394	$self->rename ("{nuke}/" . ($nuke_counter++));	1560	$self->rename ("{nuke}/" . ($nuke_counter++));
1395	$self->reset; # polite request, might not happen	1561	$self->reset; # polite request, might not happen
1396	}	1562	}
1397		1563
1398	sub customise_for {	1564	=item cf::map::unique_maps
1399	my ($map, $ob) = @_;
1400		1565
1401	if ($map->per_player) {	1566	Returns an arrayref of paths of all shared maps that have
1402	return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};	1567	instantiated unique items. May block.
1403	}
1404		1568
1405	$map	1569	=cut
1406	}
1407		1570
1408	sub emergency_save {	1571	sub unique_maps() {
1409	my $freeze_guard = cf::freeze_mainloop;	1572	my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
		1573	or return;
1410		1574
1411	warn "enter emergency map save\n";	1575	my @paths;
1412		1576
1413	cf::sync_job {	1577	for (@$files) {
1414	warn "begin emergency map save\n";	1578	utf8::decode $_;
1415	$_->save for values %cf::MAP;	1579	next if /\.pst$/;
		1580	next unless /^$PATH_SEP/o;
		1581
		1582	s/\.map$//;
		1583	push @paths, $_;
1416	};	1584	}
1417		1585
1418	warn "end emergency map save\n";	1586	\@paths
1419	}	1587	}
1420		1588
1421	package cf;	1589	package cf;
1422		1590
1423	=back	1591	=back
1424		1592
		1593	=head3 cf::object
		1594
		1595	=cut
		1596
		1597	package cf::object;
		1598
		1599	=over 4
		1600
		1601	=item $ob->inv_recursive
		1602
		1603	Returns the inventory of the object _and_ their inventories, recursively.
		1604
		1605	=cut
		1606
		1607	sub inv_recursive_;
		1608	sub inv_recursive_ {
		1609	map { $_, inv_recursive_ $_->inv } @_
		1610	}
		1611
		1612	sub inv_recursive {
		1613	inv_recursive_ inv $_[0]
		1614	}
		1615
		1616	package cf;
		1617
		1618	=back
1425		1619
1426	=head3 cf::object::player	1620	=head3 cf::object::player
1427		1621
1428	=over 4	1622	=over 4
1429		1623
…		…
1469		1663
1470	=item $player_object->enter_link	1664	=item $player_object->enter_link
1471		1665
1472	Freezes the player and moves him/her to a special map (C<{link}>).	1666	Freezes the player and moves him/her to a special map (C<{link}>).
1473		1667
1474	The player should be reaosnably safe there for short amounts of time. You	1668	The player should be reasonably safe there for short amounts of time. You
1475	I<MUST> call C<leave_link> as soon as possible, though.	1669	I<MUST> call C<leave_link> as soon as possible, though.
1476		1670
		1671	Will never block.
		1672
1477	=item $player_object->leave_link ($map, $x, $y)	1673	=item $player_object->leave_link ($map, $x, $y)
1478		1674
1479	Moves the player out of the specila link map onto the given map. If the	1675	Moves the player out of the special C<{link}> map onto the specified
1480	map is not valid (or omitted), the player will be moved back to the	1676	map. If the map is not valid (or omitted), the player will be moved back
1481	location he/she was before the call to C<enter_link>, or, if that fails,	1677	to the location he/she was before the call to C<enter_link>, or, if that
1482	to the emergency map position.	1678	fails, to the emergency map position.
1483		1679
1484	Might block.	1680	Might block.
1485		1681
1486	=cut	1682	=cut
		1683
		1684	sub link_map {
		1685	unless ($LINK_MAP) {
		1686	$LINK_MAP = cf::map::find "{link}"
		1687	or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
		1688	$LINK_MAP->load;
		1689	}
		1690
		1691	$LINK_MAP
		1692	}
1487		1693
1488	sub cf::object::player::enter_link {	1694	sub cf::object::player::enter_link {
1489	my ($self) = @_;	1695	my ($self) = @_;
1490		1696
1491	$self->deactivate_recursive;	1697	$self->deactivate_recursive;
1492		1698
1493	return if $self->map == $LINK_MAP;	1699	return if UNIVERSAL::isa $self->map, "ext::map_link";
1494		1700
1495	$self->{_link_pos} \|\|= [$self->map->{path}, $self->x, $self->y]	1701	$self->{_link_pos} \|\|= [$self->map->{path}, $self->x, $self->y]
1496	if $self->map;	1702	if $self->map;
1497		1703
1498	$self->enter_map ($LINK_MAP, 20, 20);	1704	$self->enter_map ($LINK_MAP \|\| link_map, 20, 20);
1499	}	1705	}
1500		1706
1501	sub cf::object::player::leave_link {	1707	sub cf::object::player::leave_link {
1502	my ($self, $map, $x, $y) = @_;	1708	my ($self, $map, $x, $y) = @_;
1503		1709
…		…
1521	# use -1 or undef as default coordinates, not 0, 0	1727	# use -1 or undef as default coordinates, not 0, 0
1522	($x, $y) = ($map->enter_x, $map->enter_y)	1728	($x, $y) = ($map->enter_x, $map->enter_y)
1523	if $x <=0 && $y <= 0;	1729	if $x <=0 && $y <= 0;
1524		1730
1525	$map->load;	1731	$map->load;
		1732	$map->load_diag;
1526		1733
		1734	return unless $self->contr->active;
1527	$self->activate_recursive;	1735	$self->activate_recursive;
1528	$self->enter_map ($map, $x, $y);	1736	$self->enter_map ($map, $x, $y);
1529	}	1737	}
1530		1738
1531	cf::player->attach (	1739	cf::player->attach (
…		…
1543	my ($pl) = @_;	1751	my ($pl) = @_;
1544		1752
1545	# try to abort aborted map switching on player login :)	1753	# try to abort aborted map switching on player login :)
1546	# should happen only on crashes	1754	# should happen only on crashes
1547	if ($pl->ob->{_link_pos}) {	1755	if ($pl->ob->{_link_pos}) {
1548
1549	$pl->ob->enter_link;	1756	$pl->ob->enter_link;
1550	(Coro::async_pool {	1757	(async {
1551	# we need this sleep as the login has a concurrent enter_exit running	1758	# we need this sleep as the login has a concurrent enter_exit running
1552	# and this sleep increases chances of the player not ending up in scorn	1759	# and this sleep increases chances of the player not ending up in scorn
		1760	$pl->ob->reply (undef,
		1761	"There was an internal problem at your last logout, "
		1762	. "the server will try to bring you to your intended destination in a second.",
		1763	cf::NDI_RED);
1553	Coro::Timer::sleep 1;	1764	Coro::Timer::sleep 1;
1554	$pl->ob->leave_link;	1765	$pl->ob->leave_link;
1555	})->prio (2);	1766	})->prio (2);
1556	}	1767	}
1557	},	1768	},
…		…
1564	sub cf::object::player::goto {	1775	sub cf::object::player::goto {
1565	my ($self, $path, $x, $y) = @_;	1776	my ($self, $path, $x, $y) = @_;
1566		1777
1567	$self->enter_link;	1778	$self->enter_link;
1568		1779
1569	(Coro::async_pool {	1780	(async {
1570	$path = new cf::path $path;
1571
1572	my $map = cf::map::find $path->as_string;	1781	my $map = cf::map::find $path;
1573	$map = $map->customise_for ($self) if $map;	1782	$map = $map->customise_for ($self) if $map;
1574		1783
1575	# warn "entering ", $map->path, " at ($x, $y)\n"	1784	# warn "entering ", $map->path, " at ($x, $y)\n"
1576	# if $map;	1785	# if $map;
1577		1786
1578	$map or $self->message ("The exit is closed", cf::NDI_UNIQUE \| cf::NDI_RED);	1787	$map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);
1579		1788
1580	$self->leave_link ($map, $x, $y);	1789	$self->leave_link ($map, $x, $y);
1581	})->prio (1);	1790	})->prio (1);
1582	}	1791	}
1583		1792
…		…
1636		1845
1637	return unless $self->type == cf::PLAYER;	1846	return unless $self->type == cf::PLAYER;
1638		1847
1639	$self->enter_link;	1848	$self->enter_link;
1640		1849
1641	(Coro::async_pool {	1850	(async {
1642	$self->deactivate_recursive; # just to be sure	1851	$self->deactivate_recursive; # just to be sure
1643	unless (eval {	1852	unless (eval {
1644	prepare_random_map $exit	1853	prepare_random_map $exit
1645	if $exit->slaying eq "/!";	1854	if $exit->slaying eq "/!";
1646		1855
1647	my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;	1856	my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1648	$self->goto ($path, $exit->stats->hp, $exit->stats->sp);	1857	$self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1649		1858
1650	1;	1859	1;
1651	}) {	1860	}) {
1652	$self->message ("Something went wrong deep within the crossfire server. "	1861	$self->message ("Something went wrong deep within the crossfire server. "
1653	. "I'll try to bring you back to the map you were before. "	1862	. "I'll try to bring you back to the map you were before. "
1654	. "Please report this to the dungeon master",	1863	. "Please report this to the dungeon master!",
1655	cf::NDI_UNIQUE \| cf::NDI_RED);	1864	cf::NDI_UNIQUE \| cf::NDI_RED);
1656		1865
1657	warn "ERROR in enter_exit: $@";	1866	warn "ERROR in enter_exit: $@";
1658	$self->leave_link;	1867	$self->leave_link;
1659	}	1868	}
…		…
1727	}	1936	}
1728	}	1937	}
1729	},	1938	},
1730	);	1939	);
1731		1940
1732	=item $client->coro (\&cb)	1941	=item $client->async (\&cb)
1733		1942
1734	Create a new coroutine, running the specified callback. The coroutine will	1943	Create a new coroutine, running the specified callback. The coroutine will
1735	be automatically cancelled when the client gets destroyed (e.g. on logout,	1944	be automatically cancelled when the client gets destroyed (e.g. on logout,
1736	or loss of connection).	1945	or loss of connection).
1737		1946
1738	=cut	1947	=cut
1739		1948
1740	sub cf::client::coro {	1949	sub cf::client::async {
1741	my ($self, $cb) = @_;	1950	my ($self, $cb) = @_;
1742		1951
1743	my $coro = &Coro::async_pool ($cb);	1952	my $coro = &Coro::async ($cb);
1744		1953
1745	$coro->on_destroy (sub {	1954	$coro->on_destroy (sub {
1746	delete $self->{_coro}{$coro+0};	1955	delete $self->{_coro}{$coro+0};
1747	});	1956	});
1748		1957
…		…
1991	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	2200	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
1992	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	2201	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
1993		2202
1994	if (exists $CFG{mlockall}) {	2203	if (exists $CFG{mlockall}) {
1995	eval {	2204	eval {
1996	$CFG{mlockall} ? &mlockall : &munlockall	2205	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
1997	and die "WARNING: m(un)lockall failed: $!\n";	2206	and die "WARNING: m(un)lockall failed: $!\n";
1998	};	2207	};
1999	warn $@ if $@;	2208	warn $@ if $@;
2000	}	2209	}
2001	}	2210	}
2002		2211
2003	sub main {	2212	sub main {
2004	# we must not ever block the main coroutine	2213	# we must not ever block the main coroutine
2005	local $Coro::idle = sub {	2214	local $Coro::idle = sub {
2006	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	2215	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2007	Coro::async_pool { Event::one_event };	2216	async { Event::one_event };
2008	};	2217	};
2009		2218
2010	cfg_load;	2219	cfg_load;
2011	db_load;	2220	db_load;
2012	load_extensions;	2221	load_extensions;
2013	Event::loop;	2222	Event::loop;
2014	}	2223	}
2015		2224
2016	#############################################################################	2225	#############################################################################
2017	# initialisation	2226	# initialisation and cleanup
		2227
		2228	# install some emergency cleanup handlers
		2229	BEGIN {
		2230	for my $signal (qw(INT HUP TERM)) {
		2231	Event->signal (
		2232	data => WF_AUTOCANCEL,
		2233	signal => $signal,
		2234	cb => sub {
		2235	cf::cleanup "SIG$signal";
		2236	},
		2237	);
		2238	}
		2239	}
		2240
		2241	sub emergency_save() {
		2242	my $freeze_guard = cf::freeze_mainloop;
		2243
		2244	warn "enter emergency perl save\n";
		2245
		2246	cf::sync_job {
		2247	# use a peculiar iteration method to avoid tripping on perl
		2248	# refcount bugs in for. also avoids problems with players
		2249	# and maps saved/destroyed asynchronously.
		2250	warn "begin emergency player save\n";
		2251	for my $login (keys %cf::PLAYER) {
		2252	my $pl = $cf::PLAYER{$login} or next;
		2253	$pl->valid or next;
		2254	$pl->save;
		2255	}
		2256	warn "end emergency player save\n";
		2257
		2258	warn "begin emergency map save\n";
		2259	for my $path (keys %cf::MAP) {
		2260	my $map = $cf::MAP{$path} or next;
		2261	$map->valid or next;
		2262	$map->save;
		2263	}
		2264	warn "end emergency map save\n";
		2265	};
		2266
		2267	warn "leave emergency perl save\n";
		2268	}
2018		2269
2019	sub reload() {	2270	sub reload() {
2020	# can/must only be called in main	2271	# can/must only be called in main
2021	if ($Coro::current != $Coro::main) {	2272	if ($Coro::current != $Coro::main) {
2022	warn "can only reload from main coroutine\n";	2273	warn "can only reload from main coroutine\n";
2023	return;	2274	return;
2024	}	2275	}
2025		2276
2026	warn "reloading...";	2277	warn "reloading...";
2027		2278
		2279	warn "freezing server";
2028	my $guard = freeze_mainloop;	2280	my $guard = freeze_mainloop;
2029	cf::emergency_save;	2281	cf::emergency_save;
2030		2282
		2283	warn "sync database to disk";
		2284	cf::db_sync;
		2285	IO::AIO::flush;
		2286
2031	eval {	2287	eval {
2032	# if anything goes wrong in here, we should simply crash as we already saved	2288	# if anything goes wrong in here, we should simply crash as we already saved
2033		2289
2034	# cancel all watchers	2290	warn "cancel all watchers";
2035	for (Event::all_watchers) {	2291	for (Event::all_watchers) {
2036	$_->cancel if $_->data & WF_AUTOCANCEL;	2292	$_->cancel if $_->data & WF_AUTOCANCEL;
2037	}	2293	}
2038		2294
2039	# cancel all extension coros	2295	warn "cancel all extension coros";
2040	$_->cancel for values %EXT_CORO;	2296	$_->cancel for values %EXT_CORO;
2041	%EXT_CORO = ();	2297	%EXT_CORO = ();
2042		2298
		2299	warn "remove commands";
		2300	%COMMAND = ();
		2301
		2302	warn "remove ext commands";
		2303	%EXTCMD = ();
		2304
2043	# unload all extensions	2305	warn "unload/nuke all extensions";
2044	for (@exts) {	2306	for my $pkg (@EXTS) {
2045	warn "unloading <$_>";	2307	warn "... unloading $pkg";
2046	unload_extension $_;	2308
		2309	if (my $cb = $pkg->can ("unload")) {
		2310	eval {
		2311	$cb->($pkg);
		2312	1
		2313	} or warn "$pkg unloaded, but with errors: $@";
2047	}	2314	}
2048		2315
		2316	warn "... nuking $pkg";
		2317	Symbol::delete_package $pkg;
		2318	}
		2319
2049	# unload all modules loaded from $LIBDIR	2320	warn "unload all perl modules loaded from $LIBDIR";
2050	while (my ($k, $v) = each %INC) {	2321	while (my ($k, $v) = each %INC) {
2051	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	2322	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2052		2323
2053	warn "removing <$k>";	2324	warn "removing <$k>";
2054	delete $INC{$k};	2325	delete $INC{$k};
…		…
2061	}	2332	}
2062		2333
2063	Symbol::delete_package $k;	2334	Symbol::delete_package $k;
2064	}	2335	}
2065		2336
2066	# sync database to disk
2067	cf::db_sync;
2068	IO::AIO::flush;
2069
2070	# get rid of safe::, as good as possible	2337	warn "get rid of safe::, as good as possible";
2071	Symbol::delete_package "safe::$_"	2338	Symbol::delete_package "safe::$_"
2072	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	2339	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2073		2340
2074	# remove register_script_function callbacks
2075	# TODO
2076
2077	# unload cf.pm "a bit"	2341	warn "unload cf.pm \"a bit\"";
2078	delete $INC{"cf.pm"};	2342	delete $INC{"cf.pm"};
2079		2343
2080	# don't, removes xs symbols, too,	2344	# don't, removes xs symbols, too,
2081	# and global variables created in xs	2345	# and global variables created in xs
2082	#Symbol::delete_package __PACKAGE__;	2346	#Symbol::delete_package __PACKAGE__;
2083		2347
2084	# reload cf.pm
2085	warn "reloading cf.pm";	2348	warn "reloading cf.pm";
2086	require cf;	2349	require cf;
2087	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	2350	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2088		2351
2089	# load config and database again	2352	warn "load config and database again";
2090	cf::cfg_load;	2353	cf::cfg_load;
2091	cf::db_load;	2354	cf::db_load;
2092		2355
2093	# load extensions
2094	warn "load extensions";	2356	warn "load extensions";
2095	cf::load_extensions;	2357	cf::load_extensions;
2096		2358
2097	# reattach attachments to objects	2359	warn "reattach attachments to objects/players";
2098	warn "reattach";
2099	_global_reattach;	2360	_global_reattach;
		2361	warn "reattach attachments to maps";
		2362	reattach $_ for values %MAP;
2100	};	2363	};
2101		2364
2102	if ($@) {	2365	if ($@) {
2103	warn $@;	2366	warn $@;
2104	warn "error while reloading, exiting.";	2367	warn "error while reloading, exiting.";
2105	exit 1;	2368	exit 1;
2106	}	2369	}
2107		2370
2108	warn "reloaded successfully";	2371	warn "reloaded";
2109	};	2372	};
2110
2111	#############################################################################
2112
2113	unless ($LINK_MAP) {
2114	$LINK_MAP = cf::map::new;
2115
2116	$LINK_MAP->width (41);
2117	$LINK_MAP->height (41);
2118	$LINK_MAP->alloc;
2119	$LINK_MAP->path ("{link}");
2120	$LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2121	$LINK_MAP->in_memory (MAP_IN_MEMORY);
2122
2123	# dirty hack because... archetypes are not yet loaded
2124	Event->timer (
2125	after => 2,
2126	cb => sub {
2127	$_[0]->w->cancel;
2128
2129	# provide some exits "home"
2130	my $exit = cf::object::new "exit";
2131
2132	$exit->slaying ($EMERGENCY_POSITION->[0]);
2133	$exit->stats->hp ($EMERGENCY_POSITION->[1]);
2134	$exit->stats->sp ($EMERGENCY_POSITION->[2]);
2135
2136	$LINK_MAP->insert ($exit->clone, 19, 19);
2137	$LINK_MAP->insert ($exit->clone, 19, 20);
2138	$LINK_MAP->insert ($exit->clone, 19, 21);
2139	$LINK_MAP->insert ($exit->clone, 20, 19);
2140	$LINK_MAP->insert ($exit->clone, 20, 21);
2141	$LINK_MAP->insert ($exit->clone, 21, 19);
2142	$LINK_MAP->insert ($exit->clone, 21, 20);
2143	$LINK_MAP->insert ($exit->clone, 21, 21);
2144
2145	$exit->destroy;
2146	});
2147
2148	$LINK_MAP->{deny_save} = 1;
2149	$LINK_MAP->{deny_reset} = 1;
2150
2151	$cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2152	}
2153
2154	register "<global>", __PACKAGE__;
2155		2373
2156	register_command "reload" => sub {	2374	register_command "reload" => sub {
2157	my ($who, $arg) = @_;	2375	my ($who, $arg) = @_;
2158		2376
2159	if ($who->flag (FLAG_WIZ)) {	2377	if ($who->flag (FLAG_WIZ)) {
…		…
2169	reentrant => 0,	2387	reentrant => 0,
2170	prio => 0,	2388	prio => 0,
2171	at => $NEXT_TICK \|\| $TICK,	2389	at => $NEXT_TICK \|\| $TICK,
2172	data => WF_AUTOCANCEL,	2390	data => WF_AUTOCANCEL,
2173	cb => sub {	2391	cb => sub {
		2392	$NOW = Event::time;
		2393
2174	cf::server_tick; # one server iteration	2394	cf::server_tick; # one server iteration
2175	$RUNTIME += $TICK;	2395	$RUNTIME += $TICK;
2176	$NEXT_TICK += $TICK;	2396	$NEXT_TICK += $TICK;
		2397
		2398	$WAIT_FOR_TICK->broadcast;
		2399	$WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2177		2400
2178	# if we are delayed by four ticks or more, skip them all	2401	# if we are delayed by four ticks or more, skip them all
2179	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2402	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2180		2403
2181	$TICK_WATCHER->at ($NEXT_TICK);	2404	$TICK_WATCHER->at ($NEXT_TICK);
…		…
2183	},	2406	},
2184	);	2407	);
2185		2408
2186	IO::AIO::max_poll_time $TICK * 0.2;	2409	IO::AIO::max_poll_time $TICK * 0.2;
2187		2410
2188	Event->io (	2411	$AIO_POLL_WATCHER = Event->io (
2189	fd => IO::AIO::poll_fileno,	2412	fd => IO::AIO::poll_fileno,
2190	poll => 'r',	2413	poll => 'r',
2191	prio => 5,	2414	prio => 5,
2192	data => WF_AUTOCANCEL,	2415	data => WF_AUTOCANCEL,
2193	cb => \&IO::AIO::poll_cb,	2416	cb => \&IO::AIO::poll_cb,
2194	);	2417	);
2195		2418
2196	Event->timer (	2419	$WRITE_RUNTIME_WATCHER = Event->timer (
2197	data => WF_AUTOCANCEL,	2420	data => WF_AUTOCANCEL,
2198	after => 0,	2421	after => 0,
2199	interval => 10,	2422	interval => 10,
2200	cb => sub {	2423	cb => sub {
2201	(Coro::unblock_sub {	2424	(Coro::unblock_sub {

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.139 by root, Fri Jan 5 19:12:03 2007 UTC vs. Revision 1.168 by root, Sun Jan 14 00:37:14 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.139 by root, Fri Jan 5 19:12:03 2007 UTC vs.
Revision 1.168 by root, Sun Jan 14 00:37:14 2007 UTC