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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.116 by root, Mon Jan 1 17:30:34 2007 UTC vs.
Revision 1.155 by root, Tue Jan 9 21:32:42 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.3 ();
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;
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 (2); # 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
33	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34		35
35	our %COMMAND = ();	36	our %COMMAND = ();
36	our %COMMAND_TIME = ();	37	our %COMMAND_TIME = ();
37	our %EXTCMD = ();	38	our %EXTCMD = ();
38		39
…		…
47	our %CFG;	48	our %CFG;
48		49
49	our $UPTIME; $UPTIME \|\|= time;	50	our $UPTIME; $UPTIME \|\|= time;
50	our $RUNTIME;	51	our $RUNTIME;
51		52
		53	our %PLAYER; # all users
52	our %MAP; # all maps	54	our %MAP; # all maps
53	our $LINK_MAP; # the special {link} map	55	our $LINK_MAP; # the special {link} map
54	our $FREEZE;
55	our $RANDOM_MAPS = cf::localdir . "/random";	56	our $RANDOM_MAPS = cf::localdir . "/random";
56	our %EXT_CORO;	57	our %EXT_CORO; # coroutines bound to extensions
		58
		59	our $WAIT_FOR_TICK; $WAIT_FOR_TICK \|\|= new Coro::Signal;
		60	our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE \|\|= new Coro::Signal;
57		61
58	binmode STDOUT;	62	binmode STDOUT;
59	binmode STDERR;	63	binmode STDERR;
60		64
61	# read virtual server time, if available	65	# read virtual server time, if available
…		…
71	mkdir cf::localdir . "/" . cf::uniquedir;	75	mkdir cf::localdir . "/" . cf::uniquedir;
72	mkdir $RANDOM_MAPS;	76	mkdir $RANDOM_MAPS;
73		77
74	# a special map that is always available	78	# a special map that is always available
75	our $LINK_MAP;	79	our $LINK_MAP;
76		80	our $EMERGENCY_POSITION;
77	our $EMERGENCY_POSITION = $cf::CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];
78		81
79	#############################################################################	82	#############################################################################
80		83
81	=head2 GLOBAL VARIABLES	84	=head2 GLOBAL VARIABLES
82		85
…		…
106		109
107	=item %cf::CFG	110	=item %cf::CFG
108		111
109	Configuration for the server, loaded from C</etc/crossfire/config>, or	112	Configuration for the server, loaded from C</etc/crossfire/config>, or
110	from wherever your confdir points to.	113	from wherever your confdir points to.
		114
		115	=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
		116
		117	These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
		118	or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
		119	processing has been done. Call C<< ->wait >> on them to maximise the
		120	window of cpu time available, or simply to synchronise to the server tick.
111		121
112	=back	122	=back
113		123
114	=cut	124	=cut
115		125
…		…
119	utf8::encode $msg;	129	utf8::encode $msg;
120		130
121	$msg .= "\n"	131	$msg .= "\n"
122	unless $msg =~ /\n$/;	132	unless $msg =~ /\n$/;
123		133
124	LOG llevError, "cfperl: $msg";	134	LOG llevError, $msg;
125	};	135	};
126	}	136	}
127		137
128	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	138	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
129	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	139	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
…		…
155		165
156	=head2 UTILITY FUNCTIONS	166	=head2 UTILITY FUNCTIONS
157		167
158	=over 4	168	=over 4
159		169
		170	=item dumpval $ref
		171
160	=cut	172	=cut
		173
		174	sub dumpval {
		175	eval {
		176	local $SIG{__DIE__};
		177	my $d;
		178	if (1) {
		179	$d = new Data::Dumper([$_[0]], ["*var"]);
		180	$d->Terse(1);
		181	$d->Indent(2);
		182	$d->Quotekeys(0);
		183	$d->Useqq(1);
		184	#$d->Bless(...);
		185	$d->Seen($_[1]) if @_ > 1;
		186	$d = $d->Dump();
		187	}
		188	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
		189	$d
		190	} \|\| "[unable to dump $_[0]: '$@']";
		191	}
161		192
162	use JSON::Syck (); # TODO# replace by JSON::PC once working	193	use JSON::Syck (); # TODO# replace by JSON::PC once working
163		194
164	=item $ref = cf::from_json $json	195	=item $ref = cf::from_json $json
165		196
…		…
180		211
181	sub to_json($) {	212	sub to_json($) {
182	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs	213	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183	JSON::Syck::Dump $_[0]	214	JSON::Syck::Dump $_[0]
184	}	215	}
		216
		217	=item cf::lock_wait $string
		218
		219	Wait until the given lock is available. See cf::lock_acquire.
		220
		221	=item my $lock = cf::lock_acquire $string
		222
		223	Wait until the given lock is available and then acquires it and returns
		224	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
		225	for example when the coroutine gets canceled), the lock is automatically
		226	returned.
		227
		228	Lock names should begin with a unique identifier (for example, cf::map::find
		229	uses map_find and cf::map::load uses map_load).
		230
		231	=cut
		232
		233	our %LOCK;
		234
		235	sub lock_wait($) {
		236	my ($key) = @_;
		237
		238	# wait for lock, if any
		239	while ($LOCK{$key}) {
		240	push @{ $LOCK{$key} }, $Coro::current;
		241	Coro::schedule;
		242	}
		243	}
		244
		245	sub lock_acquire($) {
		246	my ($key) = @_;
		247
		248	# wait, to be sure we are not locked
		249	lock_wait $key;
		250
		251	$LOCK{$key} = [];
		252
		253	Coro::guard {
		254	# wake up all waiters, to be on the safe side
		255	$_->ready for @{ delete $LOCK{$key} };
		256	}
		257	}
		258
		259	sub freeze_mainloop {
		260	return unless $TICK_WATCHER->is_active;
		261
		262	my $guard = Coro::guard { $TICK_WATCHER->start };
		263	$TICK_WATCHER->stop;
		264	$guard
		265	}
		266
		267	=item cf::async { BLOCK }
		268
		269	Currently the same as Coro::async_pool, meaning you cannot use
		270	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
		271	thing you are allowed to do is call C<prio> on it.
		272
		273	=cut
		274
		275	BEGIN { *async = \&Coro::async_pool }
185		276
186	=item cf::sync_job { BLOCK }	277	=item cf::sync_job { BLOCK }
187		278
188	The design of crossfire+ requires that the main coro ($Coro::main) is	279	The design of crossfire+ requires that the main coro ($Coro::main) is
189	always able to handle events or runnable, as crossfire+ is only partly	280	always able to handle events or runnable, as crossfire+ is only partly
…		…
203	# this is the main coro, too bad, we have to block	294	# this is the main coro, too bad, we have to block
204	# till the operation succeeds, freezing the server :/	295	# till the operation succeeds, freezing the server :/
205		296
206	# TODO: use suspend/resume instead	297	# TODO: use suspend/resume instead
207	# (but this is cancel-safe)	298	# (but this is cancel-safe)
208	local $FREEZE = 1;	299	my $freeze_guard = freeze_mainloop;
209		300
210	my $busy = 1;	301	my $busy = 1;
211	my @res;	302	my @res;
212		303
213	(Coro::async {	304	(async {
214	@res = eval { $job->() };	305	@res = eval { $job->() };
215	warn $@ if $@;	306	warn $@ if $@;
216	undef $busy;	307	undef $busy;
217	})->prio (Coro::PRIO_MAX);	308	})->prio (Coro::PRIO_MAX);
218		309
219	while ($busy) {	310	while ($busy) {
220	Coro::cede_notself;	311	Coro::cede or Event::one_event;
221	Event::one_event unless Coro::nready;
222	}	312	}
223		313
224	wantarray ? @res : $res[0]	314	wantarray ? @res : $res[0]
225	} else {	315	} else {
226	# we are in another coroutine, how wonderful, everything just works	316	# we are in another coroutine, how wonderful, everything just works
227		317
228	$job->()	318	$job->()
229	}	319	}
230	}	320	}
231		321
232	=item $coro = cf::coro { BLOCK }	322	=item $coro = cf::async_ext { BLOCK }
233		323
234	Creates and returns a new coro. This coro is automcatially being canceled	324	Like async, but this coro is automcatially being canceled when the
235	when the extension calling this is being unloaded.	325	extension calling this is being unloaded.
236		326
237	=cut	327	=cut
238		328
239	sub coro(&) {	329	sub async_ext(&) {
240	my $cb = shift;	330	my $cb = shift;
241		331
242	my $coro; $coro = async {	332	my $coro = &Coro::async ($cb);
243	eval {
244	$cb->();
245	};
246	warn $@ if $@;
247	};
248		333
249	$coro->on_destroy (sub {	334	$coro->on_destroy (sub {
250	delete $EXT_CORO{$coro+0};	335	delete $EXT_CORO{$coro+0};
251	});	336	});
252	$EXT_CORO{$coro+0} = $coro;	337	$EXT_CORO{$coro+0} = $coro;
…		…
281	=cut	366	=cut
282		367
283	#############################################################################	368	#############################################################################
284		369
285	package cf::path;	370	package cf::path;
		371
		372	# used to convert map paths into valid unix filenames by repalcing / by ∕
		373	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
286		374
287	sub new {	375	sub new {
288	my ($class, $path, $base) = @_;	376	my ($class, $path, $base) = @_;
289		377
290	$path = $path->as_string if ref $path;	378	$path = $path->as_string if ref $path;
…		…
354	# }	442	# }
355	}	443	}
356		444
357	# escape the /'s in the path	445	# escape the /'s in the path
358	sub _escaped_path {	446	sub _escaped_path {
359	# ∕ is U+2215
360	(my $path = $_[0]{path}) =~ s/\//∕/g;	447	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
361	$path	448	$path
362	}	449	}
363		450
364	# the original (read-only) location	451	# the original (read-only) location
365	sub load_path {	452	sub load_path {
…		…
817	(aio_load "$filename.pst", $av) >= 0	904	(aio_load "$filename.pst", $av) >= 0
818	or return;	905	or return;
819	$av = eval { (Storable::thaw $av)->{objs} };	906	$av = eval { (Storable::thaw $av)->{objs} };
820	}	907	}
821		908
		909	warn sprintf "loading %s (%d)\n",
		910	$filename, length $data, scalar @{$av \|\| []};#d#
822	return ($data, $av);	911	return ($data, $av);
823	}	912	}
824		913
825	#############################################################################	914	#############################################################################
826	# command handling &c	915	# command handling &c
…		…
990	};	1079	};
991		1080
992	cf::map->attach (prio => -10000, package => cf::mapsupport::);	1081	cf::map->attach (prio => -10000, package => cf::mapsupport::);
993		1082
994	#############################################################################	1083	#############################################################################
995	# load/save perl data associated with player->ob objects
996
997	sub all_objects(@) {
998	@_, map all_objects ($_->inv), @_
999	}
1000
1001	# TODO: compatibility cruft, remove when no longer needed
1002	cf::player->attach (
1003	on_load => sub {
1004	my ($pl, $path) = @_;
1005
1006	for my $o (all_objects $pl->ob) {
1007	if (my $value = $o->get_ob_key_value ("_perl_data")) {
1008	$o->set_ob_key_value ("_perl_data");
1009
1010	%$o = %{ Storable::thaw pack "H*", $value };
1011	}
1012	}
1013	},
1014	);
1015
1016	#############################################################################
1017		1084
1018	=head2 CORE EXTENSIONS	1085	=head2 CORE EXTENSIONS
1019		1086
1020	Functions and methods that extend core crossfire objects.	1087	Functions and methods that extend core crossfire objects.
1021		1088
		1089	=cut
		1090
		1091	package cf::player;
		1092
		1093	use Coro::AIO;
		1094
1022	=head3 cf::player	1095	=head3 cf::player
1023		1096
1024	=over 4	1097	=over 4
1025		1098
1026	=item cf::player::exists $login	1099	=item cf::player::find $login
1027		1100
1028	Returns true when the given account exists.	1101	Returns the given player object, loading it if necessary (might block).
1029		1102
1030	=cut	1103	=cut
1031		1104
1032	sub cf::player::exists($) {	1105	sub playerdir($) {
1033	cf::player::find $_[0]	1106	cf::localdir
1034	or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2;	1107	. "/"
		1108	. cf::playerdir
		1109	. "/"
		1110	. (ref $_[0] ? $_[0]->ob->name : $_[0])
		1111	}
		1112
		1113	sub path($) {
		1114	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
		1115
		1116	(playerdir $login) . "/$login.pl"
		1117	}
		1118
		1119	sub find_active($) {
		1120	$cf::PLAYER{$_[0]}
		1121	and $cf::PLAYER{$_[0]}->active
		1122	and $cf::PLAYER{$_[0]}
		1123	}
		1124
		1125	sub exists($) {
		1126	my ($login) = @_;
		1127
		1128	$cf::PLAYER{$login}
		1129	or cf::sync_job { !aio_stat $login }
		1130	}
		1131
		1132	sub find($) {
		1133	return $cf::PLAYER{$_[0]} \|\| do {
		1134	my $login = $_[0];
		1135
		1136	my $guard = cf::lock_acquire "user_find:$login";
		1137
		1138	$cf::PLAYER{$_[0]} \|\| do {
		1139	my $pl = load_pl path $login
		1140	or return;
		1141	$cf::PLAYER{$login} = $pl
		1142	}
		1143	}
		1144	}
		1145
		1146	sub save($) {
		1147	my ($pl) = @_;
		1148
		1149	return if $pl->{deny_save};
		1150
		1151	my $path = path $pl;
		1152	my $guard = cf::lock_acquire "user_save:$path";
		1153
		1154	return if $pl->{deny_save};
		1155
		1156	aio_mkdir playerdir $pl, 0770;
		1157	$pl->{last_save} = $cf::RUNTIME;
		1158
		1159	$pl->save_pl ($path);
		1160	Coro::cede;
		1161	}
		1162
		1163	sub new($) {
		1164	my ($login) = @_;
		1165
		1166	my $self = create;
		1167
		1168	$self->ob->name ($login);
		1169	$self->{deny_save} = 1;
		1170
		1171	$cf::PLAYER{$login} = $self;
		1172
		1173	$self
		1174	}
		1175
		1176	=item $pl->quit_character
		1177
		1178	Nukes the player without looking back. If logged in, the connection will
		1179	be destroyed. May block for a long time.
		1180
		1181	=cut
		1182
		1183	sub quit_character {
		1184	my ($pl) = @_;
		1185
		1186	$pl->{deny_save} = 1;
		1187	$pl->password ("*"); # this should lock out the player until we nuked the dir
		1188
		1189	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
		1190	$pl->deactivate;
		1191	$pl->invoke (cf::EVENT_PLAYER_QUIT);
		1192	$pl->ns->destroy if $pl->ns;
		1193
		1194	my $path = playerdir $pl;
		1195	my $temp = "$path~$cf::RUNTIME~deleting~";
		1196	aio_rename $path, $temp;
		1197	delete $cf::PLAYER{$pl->ob->name};
		1198	$pl->destroy;
		1199	IO::AIO::aio_rmtree $temp;
		1200	}
		1201
		1202	=item cf::player::list_logins
		1203
		1204	Returns am arrayref of all valid playernames in the system, can take a
		1205	while and may block, so not sync_job-capable, ever.
		1206
		1207	=cut
		1208
		1209	sub list_logins {
		1210	my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
		1211	or return [];
		1212
		1213	my @logins;
		1214
		1215	for my $login (@$dirs) {
		1216	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
		1217	aio_read $fh, 0, 512, my $buf, 0 or next;
		1218	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1219
		1220	utf8::decode $login;
		1221	push @logins, $login;
		1222	}
		1223
		1224	\@logins
		1225	}
		1226
		1227	=item $player->maps
		1228
		1229	Returns an arrayref of cf::path's of all maps that are private for this
		1230	player. May block.
		1231
		1232	=cut
		1233
		1234	sub maps($) {
		1235	my ($pl) = @_;
		1236
		1237	my $files = aio_readdir playerdir $pl
		1238	or return;
		1239
		1240	my @paths;
		1241
		1242	for (@$files) {
		1243	utf8::decode $_;
		1244	next if /\.(?:pl\|pst)$/;
		1245	next unless /^$PATH_SEP/;
		1246
		1247	s/$PATH_SEP/\//g;
		1248	push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
		1249	}
		1250
		1251	\@paths
1035	}	1252	}
1036		1253
1037	=item $player->ext_reply ($msgid, $msgtype, %msg)	1254	=item $player->ext_reply ($msgid, $msgtype, %msg)
1038		1255
1039	Sends an ext reply to the player.	1256	Sends an ext reply to the player.
1040		1257
1041	=cut	1258	=cut
1042		1259
1043	sub cf::player::ext_reply($$$%) {	1260	sub ext_reply($$$%) {
1044	my ($self, $id, %msg) = @_;	1261	my ($self, $id, %msg) = @_;
1045		1262
1046	$msg{msgid} = $id;	1263	$msg{msgid} = $id;
1047		1264
1048	$self->send ("ext " . to_json \%msg);	1265	$self->send ("ext " . cf::to_json \%msg);
1049	}	1266	}
		1267
		1268	package cf;
1050		1269
1051	=back	1270	=back
1052		1271
1053		1272
1054	=head3 cf::map	1273	=head3 cf::map
…		…
1060	package cf::map;	1279	package cf::map;
1061		1280
1062	use Fcntl;	1281	use Fcntl;
1063	use Coro::AIO;	1282	use Coro::AIO;
1064		1283
1065	our $MAX_RESET = 7200;	1284	our $MAX_RESET = 3600;
1066	our $DEFAULT_RESET = 3600;	1285	our $DEFAULT_RESET = 3000;
1067		1286
1068	sub generate_random_map {	1287	sub generate_random_map {
1069	my ($path, $rmp) = @_;	1288	my ($path, $rmp) = @_;
1070		1289
1071	# mit "rum" bekleckern, nicht	1290	# mit "rum" bekleckern, nicht
…		…
1087	# and all this just because we cannot iterate over	1306	# and all this just because we cannot iterate over
1088	# all maps in C++...	1307	# all maps in C++...
1089	sub change_all_map_light {	1308	sub change_all_map_light {
1090	my ($change) = @_;	1309	my ($change) = @_;
1091		1310
1092	$_->change_map_light ($change) for values %cf::MAP;	1311	$_->change_map_light ($change)
		1312	for grep $_->outdoor, values %cf::MAP;
1093	}	1313	}
1094		1314
1095	sub try_load_header($) {	1315	sub try_load_header($) {
1096	my ($path) = @_;	1316	my ($path) = @_;
1097		1317
…		…
1100	or return;	1320	or return;
1101		1321
1102	my $map = cf::map::new	1322	my $map = cf::map::new
1103	or return;	1323	or return;
1104		1324
		1325	# for better error messages only, will be overwritten
		1326	$map->path ($path);
		1327
1105	$map->load_header ($path)	1328	$map->load_header ($path)
1106	or return;	1329	or return;
1107		1330
1108	$map->{load_path} = $path;	1331	$map->{load_path} = $path;
1109		1332
1110	$map	1333	$map
1111	}	1334	}
1112		1335
		1336	sub find;
1113	sub find_map {	1337	sub find {
1114	my ($path, $origin) = @_;	1338	my ($path, $origin) = @_;
1115		1339
1116	#warn "find_map<$path,$origin>\n";#d#	1340	#warn "find<$path,$origin>\n";#d#
1117		1341
1118	$path = new cf::path $path, $origin && $origin->path;	1342	$path = new cf::path $path, $origin && $origin->path;
1119	my $key = $path->as_string;	1343	my $key = $path->as_string;
1120		1344
		1345	cf::lock_wait "map_find:$key";
		1346
1121	$cf::MAP{$key} \|\| do {	1347	$cf::MAP{$key} \|\| do {
		1348	my $guard = cf::lock_acquire "map_find:$key";
		1349
1122	# do it the slow way	1350	# do it the slow way
1123	my $map = try_load_header $path->save_path;	1351	my $map = try_load_header $path->save_path;
1124		1352
		1353	Coro::cede;
		1354
1125	if ($map) {	1355	if ($map) {
		1356	$map->last_access ((delete $map->{last_access})
		1357	\|\| $cf::RUNTIME); #d#
1126	# safety	1358	# safety
1127	$map->{instantiate_time} = $cf::RUNTIME	1359	$map->{instantiate_time} = $cf::RUNTIME
1128	if $map->{instantiate_time} > $cf::RUNTIME;	1360	if $map->{instantiate_time} > $cf::RUNTIME;
1129	} else {	1361	} else {
1130	if (my $rmp = $path->random_map_params) {	1362	if (my $rmp = $path->random_map_params) {
…		…
1135		1367
1136	$map or return;	1368	$map or return;
1137		1369
1138	$map->{load_original} = 1;	1370	$map->{load_original} = 1;
1139	$map->{instantiate_time} = $cf::RUNTIME;	1371	$map->{instantiate_time} = $cf::RUNTIME;
		1372	$map->last_access ($cf::RUNTIME);
1140	$map->instantiate;	1373	$map->instantiate;
1141		1374
1142	# per-player maps become, after loading, normal maps	1375	# per-player maps become, after loading, normal maps
1143	$map->per_player (0) if $path->{user_rel};	1376	$map->per_player (0) if $path->{user_rel};
1144	}	1377	}
1145		1378
1146	$map->path ($key);	1379	$map->path ($key);
1147	$map->{path} = $path;	1380	$map->{path} = $path;
1148	$map->{last_save} = $cf::RUNTIME;	1381	$map->{last_save} = $cf::RUNTIME;
1149	$map->last_access ($cf::RUNTIME);	1382
		1383	Coro::cede;
1150		1384
1151	if ($map->should_reset) {	1385	if ($map->should_reset) {
1152	$map->reset;	1386	$map->reset;
		1387	undef $guard;
1153	$map = find_map $path;	1388	$map = find $path
		1389	or return;
1154	}	1390	}
1155		1391
1156	$cf::MAP{$key} = $map	1392	$cf::MAP{$key} = $map
1157	}	1393	}
1158	}	1394	}
1159		1395
1160	sub load {	1396	sub load {
1161	my ($self) = @_;	1397	my ($self) = @_;
1162		1398
		1399	my $path = $self->{path};
		1400	my $guard = cf::lock_acquire "map_load:" . $path->as_string;
		1401
1163	return if $self->in_memory != cf::MAP_SWAPPED;	1402	return if $self->in_memory != cf::MAP_SWAPPED;
1164		1403
1165	$self->in_memory (cf::MAP_LOADING);	1404	$self->in_memory (cf::MAP_LOADING);
1166
1167	my $path = $self->{path};
1168		1405
1169	$self->alloc;	1406	$self->alloc;
1170	$self->load_objects ($self->{load_path}, 1)	1407	$self->load_objects ($self->{load_path}, 1)
1171	or return;	1408	or return;
1172		1409
…		…
1178	if (aio_open $uniq, O_RDONLY, 0) {	1415	if (aio_open $uniq, O_RDONLY, 0) {
1179	$self->clear_unique_items;	1416	$self->clear_unique_items;
1180	$self->load_objects ($uniq, 0);	1417	$self->load_objects ($uniq, 0);
1181	}	1418	}
1182	}	1419	}
		1420
		1421	Coro::cede;
1183		1422
1184	# now do the right thing for maps	1423	# now do the right thing for maps
1185	$self->link_multipart_objects;	1424	$self->link_multipart_objects;
1186		1425
1187	if ($self->{path}->is_style_map) {	1426	if ($self->{path}->is_style_map) {
…		…
1195	$self->difficulty ($self->estimate_difficulty)	1434	$self->difficulty ($self->estimate_difficulty)
1196	unless $self->difficulty;	1435	unless $self->difficulty;
1197	$self->activate;	1436	$self->activate;
1198	}	1437	}
1199		1438
		1439	Coro::cede;
		1440
1200	$self->in_memory (cf::MAP_IN_MEMORY);	1441	$self->in_memory (cf::MAP_IN_MEMORY);
1201	}	1442	}
1202		1443
1203	sub load_map_sync {	1444	sub find_sync {
1204	my ($path, $origin) = @_;	1445	my ($path, $origin) = @_;
1205		1446
1206	#warn "load_map_sync<$path, $origin>\n";#d#	1447	cf::sync_job { cf::map::find $path, $origin }
		1448	}
1207		1449
1208	cf::sync_job {	1450	sub do_load_sync {
1209	my $map = cf::map::find_map $path, $origin	1451	my ($map) = @_;
1210	or return;	1452
1211	$map->load;	1453	cf::sync_job { $map->load };
1212	$map
1213	}
1214	}	1454	}
1215		1455
1216	sub save {	1456	sub save {
1217	my ($self) = @_;	1457	my ($self) = @_;
1218		1458
		1459	my $lock = cf::lock_acquire "map_data:" . $self->path;
		1460
		1461	$self->{last_save} = $cf::RUNTIME;
		1462
		1463	return unless $self->dirty;
		1464
1219	my $save = $self->{path}->save_path; utf8::encode $save;	1465	my $save = $self->{path}->save_path; utf8::encode $save;
1220	my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;	1466	my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1221		1467
1222	$self->{last_save} = $cf::RUNTIME;
1223
1224	return unless $self->dirty;
1225
1226	$self->{load_path} = $save;	1468	$self->{load_path} = $save;
1227		1469
1228	return if $self->{deny_save};	1470	return if $self->{deny_save};
		1471
		1472	local $self->{last_access} = $self->last_access;#d#
		1473
		1474	cf::async {
		1475	$_->contr->save for $self->players;
		1476	};
1229		1477
1230	if ($uniq) {	1478	if ($uniq) {
1231	$self->save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	1479	$self->save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
1232	$self->save_objects ($uniq, cf::IO_UNIQUES);	1480	$self->save_objects ($uniq, cf::IO_UNIQUES);
1233	} else {	1481	} else {
…		…
1236	}	1484	}
1237		1485
1238	sub swap_out {	1486	sub swap_out {
1239	my ($self) = @_;	1487	my ($self) = @_;
1240		1488
		1489	# save first because save cedes
		1490	$self->save;
		1491
		1492	my $lock = cf::lock_acquire "map_data:" . $self->path;
		1493
1241	return if $self->players;	1494	return if $self->players;
1242	return if $self->in_memory != cf::MAP_IN_MEMORY;	1495	return if $self->in_memory != cf::MAP_IN_MEMORY;
1243	return if $self->{deny_save};	1496	return if $self->{deny_save};
1244		1497
1245	$self->save;
1246	$self->clear;	1498	$self->clear;
1247	$self->in_memory (cf::MAP_SWAPPED);	1499	$self->in_memory (cf::MAP_SWAPPED);
1248	}	1500	}
1249		1501
1250	sub reset_at {	1502	sub reset_at {
…		…
1288	}	1540	}
1289		1541
1290	sub reset {	1542	sub reset {
1291	my ($self) = @_;	1543	my ($self) = @_;
1292		1544
		1545	my $lock = cf::lock_acquire "map_data:" . $self->path;
		1546
1293	return if $self->players;	1547	return if $self->players;
1294	return if $self->{path}{user_rel};#d#	1548	return if $self->{path}{user_rel};#d#
1295		1549
1296	warn "resetting map ", $self->path;#d#	1550	warn "resetting map ", $self->path;#d#
1297		1551
…		…
1316		1570
1317	sub customise_for {	1571	sub customise_for {
1318	my ($map, $ob) = @_;	1572	my ($map, $ob) = @_;
1319		1573
1320	if ($map->per_player) {	1574	if ($map->per_player) {
1321	return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path};	1575	return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1322	}	1576	}
1323		1577
1324	$map	1578	$map
1325	}	1579	}
1326		1580
1327	sub emergency_save {
1328	local $cf::FREEZE = 1;
1329
1330	warn "enter emergency map save\n";
1331
1332	cf::sync_job {
1333	warn "begin emergency map save\n";
1334	$_->save for values %cf::MAP;
1335	};
1336
1337	warn "end emergency map save\n";
1338	}
1339
1340	package cf;	1581	package cf;
1341		1582
1342	=back	1583	=back
1343		1584
		1585	=head3 cf::object
		1586
		1587	=cut
		1588
		1589	package cf::object;
		1590
		1591	=over 4
		1592
		1593	=item $ob->inv_recursive
		1594
		1595	Returns the inventory of the object _and_ their inventories, recursively.
		1596
		1597	=cut
		1598
		1599	sub inv_recursive_;
		1600	sub inv_recursive_ {
		1601	map { $_, inv_recursive_ $_->inv } @_
		1602	}
		1603
		1604	sub inv_recursive {
		1605	inv_recursive_ inv $_[0]
		1606	}
		1607
		1608	package cf;
		1609
		1610	=back
1344		1611
1345	=head3 cf::object::player	1612	=head3 cf::object::player
1346		1613
1347	=over 4	1614	=over 4
1348		1615
…		…
1405	=cut	1672	=cut
1406		1673
1407	sub cf::object::player::enter_link {	1674	sub cf::object::player::enter_link {
1408	my ($self) = @_;	1675	my ($self) = @_;
1409		1676
		1677	$self->deactivate_recursive;
		1678
1410	return if $self->map == $LINK_MAP;	1679	return if $self->map == $LINK_MAP;
1411		1680
1412	$self->{_link_pos} = [$self->map->{path}, $self->x, $self->y]	1681	$self->{_link_pos} \|\|= [$self->map->{path}, $self->x, $self->y]
1413	if $self->map;	1682	if $self->map;
1414		1683
1415	$self->enter_map ($LINK_MAP, 20, 20);	1684	$self->enter_map ($LINK_MAP, 20, 20);
1416	$self->deactivate_recursive;
1417	}	1685	}
1418		1686
1419	sub cf::object::player::leave_link {	1687	sub cf::object::player::leave_link {
1420	my ($self, $map, $x, $y) = @_;	1688	my ($self, $map, $x, $y) = @_;
1421		1689
1422	my $link_pos = delete $self->{_link_pos};	1690	my $link_pos = delete $self->{_link_pos};
1423		1691
1424	unless ($map) {	1692	unless ($map) {
1425	# restore original map position	1693	# restore original map position
1426	($map, $x, $y) = @{ $link_pos \|\| [] };	1694	($map, $x, $y) = @{ $link_pos \|\| [] };
1427	$map = cf::map::find_map $map;	1695	$map = cf::map::find $map;
1428		1696
1429	unless ($map) {	1697	unless ($map) {
1430	($map, $x, $y) = @$EMERGENCY_POSITION;	1698	($map, $x, $y) = @$EMERGENCY_POSITION;
1431	$map = cf::map::find_map $map	1699	$map = cf::map::find $map
1432	or die "FATAL: cannot load emergency map\n";	1700	or die "FATAL: cannot load emergency map\n";
1433	}	1701	}
1434	}	1702	}
1435		1703
1436	($x, $y) = (-1, -1)	1704	($x, $y) = (-1, -1)
…		…
1440	($x, $y) = ($map->enter_x, $map->enter_y)	1708	($x, $y) = ($map->enter_x, $map->enter_y)
1441	if $x <=0 && $y <= 0;	1709	if $x <=0 && $y <= 0;
1442		1710
1443	$map->load;	1711	$map->load;
1444		1712
		1713	return unless $self->contr->active;
1445	$self->activate_recursive;	1714	$self->activate_recursive;
1446	$self->enter_map ($map, $x, $y);	1715	$self->enter_map ($map, $x, $y);
1447	}	1716	}
1448		1717
		1718	cf::player->attach (
		1719	on_logout => sub {
		1720	my ($pl) = @_;
		1721
		1722	# abort map switching before logout
		1723	if ($pl->ob->{_link_pos}) {
		1724	cf::sync_job {
		1725	$pl->ob->leave_link
		1726	};
		1727	}
		1728	},
		1729	on_login => sub {
		1730	my ($pl) = @_;
		1731
		1732	# try to abort aborted map switching on player login :)
		1733	# should happen only on crashes
		1734	if ($pl->ob->{_link_pos}) {
		1735	$pl->ob->enter_link;
		1736	(async {
		1737	# we need this sleep as the login has a concurrent enter_exit running
		1738	# and this sleep increases chances of the player not ending up in scorn
		1739	$pl->ob->reply (undef,
		1740	"There was an internal problem at your last logout, "
		1741	. "the server will try to bring you to your intended destination in a second.",
		1742	cf::NDI_RED);
		1743	Coro::Timer::sleep 1;
		1744	$pl->ob->leave_link;
		1745	})->prio (2);
		1746	}
		1747	},
		1748	);
		1749
1449	=item $player_object->goto_map ($map, $x, $y)	1750	=item $player_object->goto ($path, $x, $y)
1450		1751
1451	=cut	1752	=cut
1452		1753
1453	sub cf::object::player::goto_map {	1754	sub cf::object::player::goto {
1454	my ($self, $path, $x, $y) = @_;	1755	my ($self, $path, $x, $y) = @_;
1455		1756
		1757	$path = new cf::path $path;
		1758	$path ne "/" or Carp::cluck ("oy");#d#
		1759
1456	$self->enter_link;	1760	$self->enter_link;
1457		1761
1458	(Coro::async {	1762	(async {
1459	$path = new cf::path $path;
1460
1461	my $map = cf::map::find_map $path->as_string;	1763	my $map = cf::map::find $path->as_string;
1462	$map = $map->customise_for ($self) if $map;	1764	$map = $map->customise_for ($self) if $map;
1463		1765
1464	warn "entering ", $map->path, " at ($x, $y)\n"	1766	# warn "entering ", $map->path, " at ($x, $y)\n"
1465	if $map;	1767	# if $map;
1466		1768
1467	$map or $self->message ("The exit is closed", cf::NDI_UNIQUE \| cf::NDI_RED);	1769	$map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);
1468		1770
1469	$self->leave_link ($map, $x, $y);	1771	$self->leave_link ($map, $x, $y);
1470	})->prio (1);	1772	})->prio (1);
1471	}	1773	}
1472		1774
…		…
1525		1827
1526	return unless $self->type == cf::PLAYER;	1828	return unless $self->type == cf::PLAYER;
1527		1829
1528	$self->enter_link;	1830	$self->enter_link;
1529		1831
1530	(Coro::async {	1832	(async {
		1833	$self->deactivate_recursive; # just to be sure
1531	unless (eval {	1834	unless (eval {
1532
1533	prepare_random_map $exit	1835	prepare_random_map $exit
1534	if $exit->slaying eq "/!";	1836	if $exit->slaying eq "/!";
1535		1837
1536	my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;	1838	my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1537	$self->goto_map ($path, $exit->stats->hp, $exit->stats->sp);	1839	$self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1538		1840
1539	1;	1841	1;
1540	}) {	1842	}) {
1541	$self->message ("Something went wrong deep within the crossfire server. "	1843	$self->message ("Something went wrong deep within the crossfire server. "
1542	. "I'll try to bring you back to the map you were before. "	1844	. "I'll try to bring you back to the map you were before. "
…		…
1599	on_reply => sub {	1901	on_reply => sub {
1600	my ($ns, $msg) = @_;	1902	my ($ns, $msg) = @_;
1601		1903
1602	# this weird shuffling is so that direct followup queries	1904	# this weird shuffling is so that direct followup queries
1603	# get handled first	1905	# get handled first
1604	my $queue = delete $ns->{query_queue};	1906	my $queue = delete $ns->{query_queue}
		1907	or return; # be conservative, not sure how that can happen, but we saw a crash here
1605		1908
1606	(shift @$queue)->[1]->($msg);	1909	(shift @$queue)->[1]->($msg);
1607		1910
1608	push @{ $ns->{query_queue} }, @$queue;	1911	push @{ $ns->{query_queue} }, @$queue;
1609		1912
…		…
1615	}	1918	}
1616	}	1919	}
1617	},	1920	},
1618	);	1921	);
1619		1922
1620	=item $client->coro (\&cb)	1923	=item $client->async (\&cb)
1621		1924
1622	Create a new coroutine, running the specified callback. The coroutine will	1925	Create a new coroutine, running the specified callback. The coroutine will
1623	be automatically cancelled when the client gets destroyed (e.g. on logout,	1926	be automatically cancelled when the client gets destroyed (e.g. on logout,
1624	or loss of connection).	1927	or loss of connection).
1625		1928
1626	=cut	1929	=cut
1627		1930
1628	sub cf::client::coro {	1931	sub cf::client::async {
1629	my ($self, $cb) = @_;	1932	my ($self, $cb) = @_;
1630		1933
1631	my $coro; $coro = async {	1934	my $coro = &Coro::async ($cb);
1632	eval {
1633	$cb->();
1634	};
1635	warn $@ if $@;
1636	};
1637		1935
1638	$coro->on_destroy (sub {	1936	$coro->on_destroy (sub {
1639	delete $self->{_coro}{$coro+0};	1937	delete $self->{_coro}{$coro+0};
1640	});	1938	});
1641		1939
…		…
1813		2111
1814	{	2112	{
1815	my $path = cf::localdir . "/database.pst";	2113	my $path = cf::localdir . "/database.pst";
1816		2114
1817	sub db_load() {	2115	sub db_load() {
1818	warn "loading database $path\n";#d# remove later
1819	$DB = stat $path ? Storable::retrieve $path : { };	2116	$DB = stat $path ? Storable::retrieve $path : { };
1820	}	2117	}
1821		2118
1822	my $pid;	2119	my $pid;
1823		2120
1824	sub db_save() {	2121	sub db_save() {
1825	warn "saving database $path\n";#d# remove later
1826	waitpid $pid, 0 if $pid;	2122	waitpid $pid, 0 if $pid;
1827	if (0 == ($pid = fork)) {	2123	if (0 == ($pid = fork)) {
1828	$DB->{_meta}{version} = 1;	2124	$DB->{_meta}{version} = 1;
1829	Storable::nstore $DB, "$path~";	2125	Storable::nstore $DB, "$path~";
1830	rename "$path~", $path;	2126	rename "$path~", $path;
…		…
1878	open my $fh, "<:utf8", cf::confdir . "/config"	2174	open my $fh, "<:utf8", cf::confdir . "/config"
1879	or return;	2175	or return;
1880		2176
1881	local $/;	2177	local $/;
1882	*CFG = YAML::Syck::Load <$fh>;	2178	*CFG = YAML::Syck::Load <$fh>;
		2179
		2180	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];
		2181
		2182	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
		2183	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
		2184
		2185	if (exists $CFG{mlockall}) {
		2186	eval {
		2187	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
		2188	and die "WARNING: m(un)lockall failed: $!\n";
		2189	};
		2190	warn $@ if $@;
		2191	}
1883	}	2192	}
1884		2193
1885	sub main {	2194	sub main {
1886	# we must not ever block the main coroutine	2195	# we must not ever block the main coroutine
1887	local $Coro::idle = sub {	2196	local $Coro::idle = sub {
1888	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	2197	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1889	(Coro::unblock_sub {
1890	Event::one_event;	2198	async { Event::one_event };
1891	})->();
1892	};	2199	};
1893		2200
1894	cfg_load;	2201	cfg_load;
1895	db_load;	2202	db_load;
1896	load_extensions;	2203	load_extensions;
1897	Event::loop;	2204	Event::loop;
1898	}	2205	}
1899		2206
1900	#############################################################################	2207	#############################################################################
1901	# initialisation	2208	# initialisation and cleanup
		2209
		2210	# install some emergency cleanup handlers
		2211	BEGIN {
		2212	for my $signal (qw(INT HUP TERM)) {
		2213	Event->signal (
		2214	data => WF_AUTOCANCEL,
		2215	signal => $signal,
		2216	cb => sub {
		2217	cf::cleanup "SIG$signal";
		2218	},
		2219	);
		2220	}
		2221	}
		2222
		2223	sub emergency_save {
		2224	my $freeze_guard = cf::freeze_mainloop;
		2225
		2226	warn "enter emergency perl save\n";
		2227
		2228	cf::sync_job {
		2229	# use a peculiar iteration method to avoid tripping on perl
		2230	# refcount bugs in for. also avoids problems with players
		2231	# and maps saved/Destroyed asynchronously.
		2232	warn "begin emergency player save\n";
		2233	for my $login (keys %cf::PLAYER) {
		2234	my $pl = $cf::PLAYER{$login} or next;
		2235	$pl->valid or next;
		2236	$pl->save;
		2237	}
		2238	warn "end emergency player save\n";
		2239
		2240	warn "begin emergency map save\n";
		2241	for my $path (keys %cf::MAP) {
		2242	my $map = $cf::MAP{$path} or next;
		2243	$map->valid or next;
		2244	$map->save;
		2245	}
		2246	warn "end emergency map save\n";
		2247	};
		2248
		2249	warn "leave emergency perl save\n";
		2250	}
1902		2251
1903	sub reload() {	2252	sub reload() {
1904	# can/must only be called in main	2253	# can/must only be called in main
1905	if ($Coro::current != $Coro::main) {	2254	if ($Coro::current != $Coro::main) {
1906	warn "can only reload from main coroutine\n";	2255	warn "can only reload from main coroutine\n";
1907	return;	2256	return;
1908	}	2257	}
1909		2258
1910	warn "reloading...";	2259	warn "reloading...";
1911		2260
1912	local $FREEZE = 1;	2261	my $guard = freeze_mainloop;
1913	cf::emergency_save;	2262	cf::emergency_save;
1914		2263
1915	eval {	2264	eval {
1916	# if anything goes wrong in here, we should simply crash as we already saved	2265	# if anything goes wrong in here, we should simply crash as we already saved
1917		2266
…		…
1979	cf::load_extensions;	2328	cf::load_extensions;
1980		2329
1981	# reattach attachments to objects	2330	# reattach attachments to objects
1982	warn "reattach";	2331	warn "reattach";
1983	_global_reattach;	2332	_global_reattach;
		2333	reattach $_ for values %MAP;
1984	};	2334	};
1985		2335
1986	if ($@) {	2336	if ($@) {
1987	warn $@;	2337	warn $@;
1988	warn "error while reloading, exiting.";	2338	warn "error while reloading, exiting.";
…		…
2004	$LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";	2354	$LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2005	$LINK_MAP->in_memory (MAP_IN_MEMORY);	2355	$LINK_MAP->in_memory (MAP_IN_MEMORY);
2006		2356
2007	# dirty hack because... archetypes are not yet loaded	2357	# dirty hack because... archetypes are not yet loaded
2008	Event->timer (	2358	Event->timer (
2009	after => 2,	2359	after => 10,
2010	cb => sub {	2360	cb => sub {
2011	$_[0]->w->cancel;	2361	$_[0]->w->cancel;
2012		2362
2013	# provide some exits "home"	2363	# provide some exits "home"
2014	my $exit = cf::object::new "exit";	2364	my $exit = cf::object::new "exit";
…		…
2053	reentrant => 0,	2403	reentrant => 0,
2054	prio => 0,	2404	prio => 0,
2055	at => $NEXT_TICK \|\| $TICK,	2405	at => $NEXT_TICK \|\| $TICK,
2056	data => WF_AUTOCANCEL,	2406	data => WF_AUTOCANCEL,
2057	cb => sub {	2407	cb => sub {
2058	unless ($FREEZE) {
2059	cf::server_tick; # one server iteration	2408	cf::server_tick; # one server iteration
2060	$RUNTIME += $TICK;	2409	$RUNTIME += $TICK;
2061	}
2062
2063	$NEXT_TICK += $TICK;	2410	$NEXT_TICK += $TICK;
		2411
		2412	$WAIT_FOR_TICK->broadcast;
		2413	$WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2064		2414
2065	# if we are delayed by four ticks or more, skip them all	2415	# if we are delayed by four ticks or more, skip them all
2066	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2416	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2067		2417
2068	$TICK_WATCHER->at ($NEXT_TICK);	2418	$TICK_WATCHER->at ($NEXT_TICK);
…		…
2090	or warn "ERROR: unable to write runtime file: $!";	2440	or warn "ERROR: unable to write runtime file: $!";
2091	})->();	2441	})->();
2092	},	2442	},
2093	);	2443	);
2094		2444
		2445	END { cf::emergency_save }
		2446
2095	1	2447	1
2096		2448

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.116 by root, Mon Jan 1 17:30:34 2007 UTC vs. Revision 1.155 by root, Tue Jan 9 21:32:42 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.116 by root, Mon Jan 1 17:30:34 2007 UTC vs.
Revision 1.155 by root, Tue Jan 9 21:32:42 2007 UTC