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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.112 by root, Mon Jan 1 13:31:47 2007 UTC vs.
Revision 1.154 by root, Tue Jan 9 15:36:19 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
28	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?	29	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29	$YAML::Syck::ImplicitUnicode = 1;	30	$YAML::Syck::ImplicitUnicode = 1;
30		31
31	$Coro::main->prio (2); # run main coroutine ("the server") with very high priority	32	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32		33
33	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	34	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 = ();
…		…
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
57		58
58	binmode STDOUT;	59	binmode STDOUT;
59	binmode STDERR;	60	binmode STDERR;
60		61
61	# read virtual server time, if available	62	# read virtual server time, if available
…		…
71	mkdir cf::localdir . "/" . cf::uniquedir;	72	mkdir cf::localdir . "/" . cf::uniquedir;
72	mkdir $RANDOM_MAPS;	73	mkdir $RANDOM_MAPS;
73		74
74	# a special map that is always available	75	# a special map that is always available
75	our $LINK_MAP;	76	our $LINK_MAP;
76		77	our $EMERGENCY_POSITION;
77	our $EMERGENCY_POSITION = $cf::CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];
78		78
79	#############################################################################	79	#############################################################################
80		80
81	=head2 GLOBAL VARIABLES	81	=head2 GLOBAL VARIABLES
82		82
…		…
119	utf8::encode $msg;	119	utf8::encode $msg;
120		120
121	$msg .= "\n"	121	$msg .= "\n"
122	unless $msg =~ /\n$/;	122	unless $msg =~ /\n$/;
123		123
124	LOG llevError, "cfperl: $msg";	124	LOG llevError, $msg;
125	};	125	};
126	}	126	}
127		127
128	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	128	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
129	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	129	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
…		…
155		155
156	=head2 UTILITY FUNCTIONS	156	=head2 UTILITY FUNCTIONS
157		157
158	=over 4	158	=over 4
159		159
		160	=item dumpval $ref
		161
160	=cut	162	=cut
		163
		164	sub dumpval {
		165	eval {
		166	local $SIG{__DIE__};
		167	my $d;
		168	if (1) {
		169	$d = new Data::Dumper([$_[0]], ["*var"]);
		170	$d->Terse(1);
		171	$d->Indent(2);
		172	$d->Quotekeys(0);
		173	$d->Useqq(1);
		174	#$d->Bless(...);
		175	$d->Seen($_[1]) if @_ > 1;
		176	$d = $d->Dump();
		177	}
		178	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
		179	$d
		180	} \|\| "[unable to dump $_[0]: '$@']";
		181	}
161		182
162	use JSON::Syck (); # TODO# replace by JSON::PC once working	183	use JSON::Syck (); # TODO# replace by JSON::PC once working
163		184
164	=item $ref = cf::from_json $json	185	=item $ref = cf::from_json $json
165		186
…		…
180		201
181	sub to_json($) {	202	sub to_json($) {
182	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs	203	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183	JSON::Syck::Dump $_[0]	204	JSON::Syck::Dump $_[0]
184	}	205	}
		206
		207	=item cf::lock_wait $string
		208
		209	Wait until the given lock is available. See cf::lock_acquire.
		210
		211	=item my $lock = cf::lock_acquire $string
		212
		213	Wait until the given lock is available and then acquires it and returns
		214	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
		215	for example when the coroutine gets canceled), the lock is automatically
		216	returned.
		217
		218	Lock names should begin with a unique identifier (for example, cf::map::find
		219	uses map_find and cf::map::load uses map_load).
		220
		221	=cut
		222
		223	our %LOCK;
		224
		225	sub lock_wait($) {
		226	my ($key) = @_;
		227
		228	# wait for lock, if any
		229	while ($LOCK{$key}) {
		230	push @{ $LOCK{$key} }, $Coro::current;
		231	Coro::schedule;
		232	}
		233	}
		234
		235	sub lock_acquire($) {
		236	my ($key) = @_;
		237
		238	# wait, to be sure we are not locked
		239	lock_wait $key;
		240
		241	$LOCK{$key} = [];
		242
		243	Coro::guard {
		244	# wake up all waiters, to be on the safe side
		245	$_->ready for @{ delete $LOCK{$key} };
		246	}
		247	}
		248
		249	sub freeze_mainloop {
		250	return unless $TICK_WATCHER->is_active;
		251
		252	my $guard = Coro::guard { $TICK_WATCHER->start };
		253	$TICK_WATCHER->stop;
		254	$guard
		255	}
		256
		257	=item cf::async { BLOCK }
		258
		259	Currently the same as Coro::async_pool, meaning you cannot use
		260	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
		261	thing you are allowed to do is call C<prio> on it.
		262
		263	=cut
		264
		265	BEGIN { *async = \&Coro::async_pool }
185		266
186	=item cf::sync_job { BLOCK }	267	=item cf::sync_job { BLOCK }
187		268
188	The design of crossfire+ requires that the main coro ($Coro::main) is	269	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	270	always able to handle events or runnable, as crossfire+ is only partly
…		…
203	# this is the main coro, too bad, we have to block	284	# this is the main coro, too bad, we have to block
204	# till the operation succeeds, freezing the server :/	285	# till the operation succeeds, freezing the server :/
205		286
206	# TODO: use suspend/resume instead	287	# TODO: use suspend/resume instead
207	# (but this is cancel-safe)	288	# (but this is cancel-safe)
208	local $FREEZE = 1;	289	my $freeze_guard = freeze_mainloop;
209		290
210	my $busy = 1;	291	my $busy = 1;
211	my @res;	292	my @res;
212		293
213	(Coro::async {	294	(async {
214	@res = eval { $job->() };	295	@res = eval { $job->() };
215	warn $@ if $@;	296	warn $@ if $@;
216	undef $busy;	297	undef $busy;
217	})->prio (Coro::PRIO_MAX);	298	})->prio (Coro::PRIO_MAX);
218		299
219	while ($busy) {	300	while ($busy) {
220	Coro::cede_notself;	301	Coro::cede or Event::one_event;
221	Event::one_event unless Coro::nready;
222	}	302	}
223		303
224	wantarray ? @res : $res[0]	304	wantarray ? @res : $res[0]
225	} else {	305	} else {
226	# we are in another coroutine, how wonderful, everything just works	306	# we are in another coroutine, how wonderful, everything just works
227		307
228	$job->()	308	$job->()
229	}	309	}
230	}	310	}
231		311
232	=item $coro = cf::coro { BLOCK }	312	=item $coro = cf::async_ext { BLOCK }
233		313
234	Creates and returns a new coro. This coro is automcatially being canceled	314	Like async, but this coro is automcatially being canceled when the
235	when the extension calling this is being unloaded.	315	extension calling this is being unloaded.
236		316
237	=cut	317	=cut
238		318
239	sub coro(&) {	319	sub async_ext(&) {
240	my $cb = shift;	320	my $cb = shift;
241		321
242	my $coro; $coro = async {	322	my $coro = &Coro::async ($cb);
243	eval {
244	$cb->();
245	};
246	warn $@ if $@;
247	};
248		323
249	$coro->on_destroy (sub {	324	$coro->on_destroy (sub {
250	delete $EXT_CORO{$coro+0};	325	delete $EXT_CORO{$coro+0};
251	});	326	});
252	$EXT_CORO{$coro+0} = $coro;	327	$EXT_CORO{$coro+0} = $coro;
…		…
282		357
283	#############################################################################	358	#############################################################################
284		359
285	package cf::path;	360	package cf::path;
286		361
		362	# used to convert map paths into valid unix filenames by repalcing / by ∕
		363	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
		364
287	sub new {	365	sub new {
288	my ($class, $path, $base) = @_;	366	my ($class, $path, $base) = @_;
289		367
290	$path = $path->as_string if ref $path;	368	$path = $path->as_string if ref $path;
291		369
292	my $self = bless { }, $class;	370	my $self = bless { }, $class;
293		371
		372	# {... are special paths that are not touched
		373	# ?xxx/... are special absolute paths
		374	# ?random/... random maps
		375	# /! non-realised random map exit
		376	# /... normal maps
		377	# ~/... per-player maps without a specific player (DO NOT USE)
		378	# ~user/... per-player map of a specific user
		379
		380	if ($path =~ /^{/) {
		381	# fine as it is
294	if ($path =~ s{^\?random/}{}) {	382	} elsif ($path =~ s{^\?random/}{}) {
295	Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;	383	Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
296	$self->{random} = cf::from_json $data;	384	$self->{random} = cf::from_json $data;
297	} else {	385	} else {
298	if ($path =~ s{^~([^/]+)?}{}) {	386	if ($path =~ s{^~([^/]+)?}{}) {
299	$self->{user_rel} = 1;	387	$self->{user_rel} = 1;
…		…
344	# }	432	# }
345	}	433	}
346		434
347	# escape the /'s in the path	435	# escape the /'s in the path
348	sub _escaped_path {	436	sub _escaped_path {
349	# ∕ is U+2215
350	(my $path = $_[0]{path}) =~ s/\//∕/g;	437	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
351	$path	438	$path
352	}	439	}
353		440
354	# the original (read-only) location	441	# the original (read-only) location
355	sub load_path {	442	sub load_path {
…		…
804	or return;	891	or return;
805		892
806	unless (aio_stat "$filename.pst") {	893	unless (aio_stat "$filename.pst") {
807	(aio_load "$filename.pst", $av) >= 0	894	(aio_load "$filename.pst", $av) >= 0
808	or return;	895	or return;
809	$av = eval { (Storable::thaw <$av>)->{objs} };	896	$av = eval { (Storable::thaw $av)->{objs} };
810	}	897	}
811		898
		899	warn sprintf "loading %s (%d)\n",
		900	$filename, length $data, scalar @{$av \|\| []};#d#
812	return ($data, $av);	901	return ($data, $av);
813	}	902	}
814		903
815	#############################################################################	904	#############################################################################
816	# command handling &c	905	# command handling &c
…		…
1007		1096
1008	=head2 CORE EXTENSIONS	1097	=head2 CORE EXTENSIONS
1009		1098
1010	Functions and methods that extend core crossfire objects.	1099	Functions and methods that extend core crossfire objects.
1011		1100
		1101	=cut
		1102
		1103	package cf::player;
		1104
		1105	use Coro::AIO;
		1106
1012	=head3 cf::player	1107	=head3 cf::player
1013		1108
1014	=over 4	1109	=over 4
1015		1110
1016	=item cf::player::exists $login	1111	=item cf::player::find $login
1017		1112
1018	Returns true when the given account exists.	1113	Returns the given player object, loading it if necessary (might block).
1019		1114
1020	=cut	1115	=cut
1021		1116
1022	sub cf::player::exists($) {	1117	sub playerdir($) {
1023	cf::player::find $_[0]	1118	cf::localdir
1024	or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2;	1119	. "/"
		1120	. cf::playerdir
		1121	. "/"
		1122	. (ref $_[0] ? $_[0]->ob->name : $_[0])
		1123	}
		1124
		1125	sub path($) {
		1126	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
		1127
		1128	(playerdir $login) . "/$login.pl"
		1129	}
		1130
		1131	sub find_active($) {
		1132	$cf::PLAYER{$_[0]}
		1133	and $cf::PLAYER{$_[0]}->active
		1134	and $cf::PLAYER{$_[0]}
		1135	}
		1136
		1137	sub exists($) {
		1138	my ($login) = @_;
		1139
		1140	$cf::PLAYER{$login}
		1141	or cf::sync_job { !aio_stat $login }
		1142	}
		1143
		1144	sub find($) {
		1145	return $cf::PLAYER{$_[0]} \|\| do {
		1146	my $login = $_[0];
		1147
		1148	my $guard = cf::lock_acquire "user_find:$login";
		1149
		1150	$cf::PLAYER{$_[0]} \|\| do {
		1151	my $pl = load_pl path $login
		1152	or return;
		1153	$cf::PLAYER{$login} = $pl
		1154	}
		1155	}
		1156	}
		1157
		1158	sub save($) {
		1159	my ($pl) = @_;
		1160
		1161	return if $pl->{deny_save};
		1162
		1163	my $path = path $pl;
		1164	my $guard = cf::lock_acquire "user_save:$path";
		1165
		1166	return if $pl->{deny_save};
		1167
		1168	aio_mkdir playerdir $pl, 0770;
		1169	$pl->{last_save} = $cf::RUNTIME;
		1170
		1171	$pl->save_pl ($path);
		1172	Coro::cede;
		1173	}
		1174
		1175	sub new($) {
		1176	my ($login) = @_;
		1177
		1178	my $self = create;
		1179
		1180	$self->ob->name ($login);
		1181	$self->{deny_save} = 1;
		1182
		1183	$cf::PLAYER{$login} = $self;
		1184
		1185	$self
		1186	}
		1187
		1188	=item $pl->quit_character
		1189
		1190	Nukes the player without looking back. If logged in, the connection will
		1191	be destroyed. May block for a long time.
		1192
		1193	=cut
		1194
		1195	sub quit_character {
		1196	my ($pl) = @_;
		1197
		1198	$pl->{deny_save} = 1;
		1199	$pl->password ("*"); # this should lock out the player until we nuked the dir
		1200
		1201	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
		1202	$pl->deactivate;
		1203	$pl->invoke (cf::EVENT_PLAYER_QUIT);
		1204	$pl->ns->destroy if $pl->ns;
		1205
		1206	my $path = playerdir $pl;
		1207	my $temp = "$path~$cf::RUNTIME~deleting~";
		1208	aio_rename $path, $temp;
		1209	delete $cf::PLAYER{$pl->ob->name};
		1210	$pl->destroy;
		1211	IO::AIO::aio_rmtree $temp;
		1212	}
		1213
		1214	=item cf::player::list_logins
		1215
		1216	Returns am arrayref of all valid playernames in the system, can take a
		1217	while and may block, so not sync_job-capable, ever.
		1218
		1219	=cut
		1220
		1221	sub list_logins {
		1222	my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
		1223	or return [];
		1224
		1225	my @logins;
		1226
		1227	for my $login (@$dirs) {
		1228	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
		1229	aio_read $fh, 0, 512, my $buf, 0 or next;
		1230	$buf !~ /^password -------------$/ or next; # official not-valid tag
		1231
		1232	utf8::decode $login;
		1233	push @logins, $login;
		1234	}
		1235
		1236	\@logins
		1237	}
		1238
		1239	=item $player->maps
		1240
		1241	Returns an arrayref of cf::path's of all maps that are private for this
		1242	player. May block.
		1243
		1244	=cut
		1245
		1246	sub maps($) {
		1247	my ($pl) = @_;
		1248
		1249	my $files = aio_readdir playerdir $pl
		1250	or return;
		1251
		1252	my @paths;
		1253
		1254	for (@$files) {
		1255	utf8::decode $_;
		1256	next if /\.(?:pl\|pst)$/;
		1257	next unless /^$PATH_SEP/;
		1258
		1259	s/$PATH_SEP/\//g;
		1260	push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
		1261	}
		1262
		1263	\@paths
1025	}	1264	}
1026		1265
1027	=item $player->ext_reply ($msgid, $msgtype, %msg)	1266	=item $player->ext_reply ($msgid, $msgtype, %msg)
1028		1267
1029	Sends an ext reply to the player.	1268	Sends an ext reply to the player.
1030		1269
1031	=cut	1270	=cut
1032		1271
1033	sub cf::player::ext_reply($$$%) {	1272	sub ext_reply($$$%) {
1034	my ($self, $id, %msg) = @_;	1273	my ($self, $id, %msg) = @_;
1035		1274
1036	$msg{msgid} = $id;	1275	$msg{msgid} = $id;
1037		1276
1038	$self->send ("ext " . to_json \%msg);	1277	$self->send ("ext " . cf::to_json \%msg);
1039	}	1278	}
		1279
		1280	package cf;
1040		1281
1041	=back	1282	=back
1042		1283
1043		1284
1044	=head3 cf::map	1285	=head3 cf::map
…		…
1050	package cf::map;	1291	package cf::map;
1051		1292
1052	use Fcntl;	1293	use Fcntl;
1053	use Coro::AIO;	1294	use Coro::AIO;
1054		1295
1055	our $MAX_RESET = 7200;	1296	our $MAX_RESET = 3600;
1056	our $DEFAULT_RESET = 3600;	1297	our $DEFAULT_RESET = 3000;
1057		1298
1058	sub generate_random_map {	1299	sub generate_random_map {
1059	my ($path, $rmp) = @_;	1300	my ($path, $rmp) = @_;
1060		1301
1061	# mit "rum" bekleckern, nicht	1302	# mit "rum" bekleckern, nicht
…		…
1077	# and all this just because we cannot iterate over	1318	# and all this just because we cannot iterate over
1078	# all maps in C++...	1319	# all maps in C++...
1079	sub change_all_map_light {	1320	sub change_all_map_light {
1080	my ($change) = @_;	1321	my ($change) = @_;
1081		1322
1082	$_->change_map_light ($change) for values %cf::MAP;	1323	$_->change_map_light ($change)
		1324	for grep $_->outdoor, values %cf::MAP;
1083	}	1325	}
1084		1326
1085	sub try_load_header($) {	1327	sub try_load_header($) {
1086	my ($path) = @_;	1328	my ($path) = @_;
1087		1329
…		…
1090	or return;	1332	or return;
1091		1333
1092	my $map = cf::map::new	1334	my $map = cf::map::new
1093	or return;	1335	or return;
1094		1336
		1337	# for better error messages only, will be overwritten
		1338	$map->path ($path);
		1339
1095	$map->load_header ($path)	1340	$map->load_header ($path)
1096	or return;	1341	or return;
1097		1342
1098	$map->{load_path} = $path;	1343	$map->{load_path} = $path;
1099		1344
1100	$map	1345	$map
1101	}	1346	}
1102		1347
		1348	sub find;
1103	sub find_map {	1349	sub find {
1104	my ($path, $origin) = @_;	1350	my ($path, $origin) = @_;
1105		1351
1106	#warn "find_map<$path,$origin>\n";#d#	1352	#warn "find<$path,$origin>\n";#d#
1107		1353
1108	$path = new cf::path $path, $origin && $origin->path;	1354	$path = new cf::path $path, $origin && $origin->path;
1109	my $key = $path->as_string;	1355	my $key = $path->as_string;
1110		1356
		1357	cf::lock_wait "map_find:$key";
		1358
1111	$cf::MAP{$key} \|\| do {	1359	$cf::MAP{$key} \|\| do {
		1360	my $guard = cf::lock_acquire "map_find:$key";
		1361
1112	# do it the slow way	1362	# do it the slow way
1113	my $map = try_load_header $path->save_path;	1363	my $map = try_load_header $path->save_path;
1114		1364
		1365	Coro::cede;
		1366
1115	if ($map) {	1367	if ($map) {
		1368	$map->last_access ((delete $map->{last_access})
		1369	\|\| $cf::RUNTIME); #d#
1116	# safety	1370	# safety
1117	$map->{instantiate_time} = $cf::RUNTIME	1371	$map->{instantiate_time} = $cf::RUNTIME
1118	if $map->{instantiate_time} > $cf::RUNTIME;	1372	if $map->{instantiate_time} > $cf::RUNTIME;
1119	} else {	1373	} else {
1120	if (my $rmp = $path->random_map_params) {	1374	if (my $rmp = $path->random_map_params) {
…		…
1125		1379
1126	$map or return;	1380	$map or return;
1127		1381
1128	$map->{load_original} = 1;	1382	$map->{load_original} = 1;
1129	$map->{instantiate_time} = $cf::RUNTIME;	1383	$map->{instantiate_time} = $cf::RUNTIME;
		1384	$map->last_access ($cf::RUNTIME);
1130	$map->instantiate;	1385	$map->instantiate;
1131		1386
1132	# per-player maps become, after loading, normal maps	1387	# per-player maps become, after loading, normal maps
1133	$map->per_player (0) if $path->{user_rel};	1388	$map->per_player (0) if $path->{user_rel};
1134	}	1389	}
1135		1390
1136	$map->path ($key);	1391	$map->path ($key);
1137	$map->{path} = $path;	1392	$map->{path} = $path;
1138	$map->last_access ($cf::RUNTIME);	1393	$map->{last_save} = $cf::RUNTIME;
		1394
		1395	Coro::cede;
1139		1396
1140	if ($map->should_reset) {	1397	if ($map->should_reset) {
1141	$map->reset;	1398	$map->reset;
		1399	undef $guard;
1142	$map = find_map $path;	1400	$map = find $path
		1401	or return;
1143	}	1402	}
1144		1403
1145	$cf::MAP{$key} = $map	1404	$cf::MAP{$key} = $map
1146	}	1405	}
1147	}	1406	}
1148		1407
1149	sub load {	1408	sub load {
1150	my ($self) = @_;	1409	my ($self) = @_;
1151		1410
		1411	my $path = $self->{path};
		1412	my $guard = cf::lock_acquire "map_load:" . $path->as_string;
		1413
1152	return if $self->in_memory != cf::MAP_SWAPPED;	1414	return if $self->in_memory != cf::MAP_SWAPPED;
1153		1415
1154	$self->in_memory (cf::MAP_LOADING);	1416	$self->in_memory (cf::MAP_LOADING);
1155
1156	my $path = $self->{path};
1157		1417
1158	$self->alloc;	1418	$self->alloc;
1159	$self->load_objects ($self->{load_path}, 1)	1419	$self->load_objects ($self->{load_path}, 1)
1160	or return;	1420	or return;
1161		1421
…		…
1167	if (aio_open $uniq, O_RDONLY, 0) {	1427	if (aio_open $uniq, O_RDONLY, 0) {
1168	$self->clear_unique_items;	1428	$self->clear_unique_items;
1169	$self->load_objects ($uniq, 0);	1429	$self->load_objects ($uniq, 0);
1170	}	1430	}
1171	}	1431	}
		1432
		1433	Coro::cede;
1172		1434
1173	# now do the right thing for maps	1435	# now do the right thing for maps
1174	$self->link_multipart_objects;	1436	$self->link_multipart_objects;
1175		1437
1176	if ($self->{path}->is_style_map) {	1438	if ($self->{path}->is_style_map) {
…		…
1184	$self->difficulty ($self->estimate_difficulty)	1446	$self->difficulty ($self->estimate_difficulty)
1185	unless $self->difficulty;	1447	unless $self->difficulty;
1186	$self->activate;	1448	$self->activate;
1187	}	1449	}
1188		1450
		1451	Coro::cede;
		1452
1189	$self->in_memory (cf::MAP_IN_MEMORY);	1453	$self->in_memory (cf::MAP_IN_MEMORY);
1190	}	1454	}
1191		1455
1192	sub load_map_sync {	1456	sub find_sync {
1193	my ($path, $origin) = @_;	1457	my ($path, $origin) = @_;
1194		1458
1195	#warn "load_map_sync<$path, $origin>\n";#d#	1459	cf::sync_job { cf::map::find $path, $origin }
		1460	}
1196		1461
1197	cf::sync_job {	1462	sub do_load_sync {
1198	my $map = cf::map::find_map $path, $origin	1463	my ($map) = @_;
1199	or return;	1464
1200	$map->load;	1465	cf::sync_job { $map->load };
1201	$map
1202	}
1203	}	1466	}
1204		1467
1205	sub save {	1468	sub save {
1206	my ($self) = @_;	1469	my ($self) = @_;
1207		1470
		1471	my $lock = cf::lock_acquire "map_data:" . $self->path;
		1472
		1473	$self->{last_save} = $cf::RUNTIME;
		1474
		1475	return unless $self->dirty;
		1476
1208	my $save = $self->{path}->save_path; utf8::encode $save;	1477	my $save = $self->{path}->save_path; utf8::encode $save;
1209	my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;	1478	my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1210		1479
1211	$self->{last_save} = $cf::RUNTIME;
1212
1213	return unless $self->dirty;
1214
1215	$self->{load_path} = $save;	1480	$self->{load_path} = $save;
1216		1481
1217	return if $self->{deny_save};	1482	return if $self->{deny_save};
		1483
		1484	local $self->{last_access} = $self->last_access;#d#
		1485
		1486	cf::async {
		1487	$_->contr->save for $self->players;
		1488	};
1218		1489
1219	if ($uniq) {	1490	if ($uniq) {
1220	$self->save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	1491	$self->save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
1221	$self->save_objects ($uniq, cf::IO_UNIQUES);	1492	$self->save_objects ($uniq, cf::IO_UNIQUES);
1222	} else {	1493	} else {
…		…
1225	}	1496	}
1226		1497
1227	sub swap_out {	1498	sub swap_out {
1228	my ($self) = @_;	1499	my ($self) = @_;
1229		1500
		1501	# save first because save cedes
		1502	$self->save;
		1503
		1504	my $lock = cf::lock_acquire "map_data:" . $self->path;
		1505
1230	return if $self->players;	1506	return if $self->players;
1231	return if $self->in_memory != cf::MAP_IN_MEMORY;	1507	return if $self->in_memory != cf::MAP_IN_MEMORY;
1232	return if $self->{deny_save};	1508	return if $self->{deny_save};
1233		1509
1234	$self->save;
1235	$self->clear;	1510	$self->clear;
1236	$self->in_memory (cf::MAP_SWAPPED);	1511	$self->in_memory (cf::MAP_SWAPPED);
1237	}	1512	}
1238		1513
1239	sub reset_at {	1514	sub reset_at {
1240	my ($self) = @_;	1515	my ($self) = @_;
1241		1516
1242	# TODO: safety, remove and allow resettable per-player maps	1517	# TODO: safety, remove and allow resettable per-player maps
1243	return 1e100 if $self->{path}{user_rel};	1518	return 1e99 if $self->{path}{user_rel};
1244	return 1e100 if $self->{deny_reset};	1519	return 1e99 if $self->{deny_reset};
1245		1520
1246	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;	1521	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1247	my $to = $self->reset_timeout \|\| $DEFAULT_RESET;	1522	my $to = List::Util::min $MAX_RESET, $self->reset_timeout \|\| $DEFAULT_RESET;
1248	$to = $MAX_RESET if $to > $MAX_RESET;
1249		1523
1250	$time + $to	1524	$time + $to
1251	}	1525	}
1252		1526
1253	sub should_reset {	1527	sub should_reset {
…		…
1262	utf8::encode (my $save = $self->{path}->save_path);	1536	utf8::encode (my $save = $self->{path}->save_path);
1263	aioreq_pri 3; IO::AIO::aio_unlink $save;	1537	aioreq_pri 3; IO::AIO::aio_unlink $save;
1264	aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";	1538	aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1265	}	1539	}
1266		1540
		1541	sub rename {
		1542	my ($self, $new_path) = @_;
		1543
		1544	$self->unlink_save;
		1545
		1546	delete $cf::MAP{$self->path};
		1547	$self->{path} = new cf::path $new_path;
		1548	$self->path ($self->{path}->as_string);
		1549	$cf::MAP{$self->path} = $self;
		1550
		1551	$self->save;
		1552	}
		1553
1267	sub reset {	1554	sub reset {
1268	my ($self) = @_;	1555	my ($self) = @_;
1269		1556
		1557	my $lock = cf::lock_acquire "map_data:" . $self->path;
		1558
1270	return if $self->players;	1559	return if $self->players;
1271	return if $self->{path}{user_rel};#d#	1560	return if $self->{path}{user_rel};#d#
1272		1561
1273	warn "resetting map ", $self->path;#d#	1562	warn "resetting map ", $self->path;#d#
1274		1563
…		…
1278		1567
1279	$self->unlink_save;	1568	$self->unlink_save;
1280	$self->destroy;	1569	$self->destroy;
1281	}	1570	}
1282		1571
		1572	my $nuke_counter = "aaaa";
		1573
		1574	sub nuke {
		1575	my ($self) = @_;
		1576
		1577	$self->{deny_save} = 1;
		1578	$self->reset_timeout (1);
		1579	$self->rename ("{nuke}/" . ($nuke_counter++));
		1580	$self->reset; # polite request, might not happen
		1581	}
		1582
1283	sub customise_for {	1583	sub customise_for {
1284	my ($map, $ob) = @_;	1584	my ($map, $ob) = @_;
1285		1585
1286	if ($map->per_player) {	1586	if ($map->per_player) {
1287	return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path};	1587	return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1288	}	1588	}
1289		1589
1290	$map	1590	$map
1291	}	1591	}
1292		1592
1293	sub emergency_save {	1593	sub emergency_save {
1294	local $cf::FREEZE = 1;	1594	my $freeze_guard = cf::freeze_mainloop;
1295		1595
1296	warn "enter emergency map save\n";	1596	warn "enter emergency perl save\n";
1297		1597
1298	cf::sync_job {	1598	cf::sync_job {
		1599	warn "begin emergency player save\n";
		1600	$_->save for values %cf::PLAYER;
		1601	warn "end emergency player save\n";
		1602
1299	warn "begin emergency map save\n";	1603	warn "begin emergency map save\n";
1300	$_->save for values %cf::MAP;	1604	$_->save for values %cf::MAP;
		1605	warn "end emergency map save\n";
1301	};	1606	};
1302		1607
1303	warn "end emergency map save\n";	1608	warn "leave emergency perl save\n";
1304	}	1609	}
1305		1610
1306	package cf;	1611	package cf;
1307		1612
1308	=back	1613	=back
…		…
1350	(ref $cf::CFG{"may_$access"}	1655	(ref $cf::CFG{"may_$access"}
1351	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}	1656	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1352	: $cf::CFG{"may_$access"})	1657	: $cf::CFG{"may_$access"})
1353	}	1658	}
1354		1659
		1660	=item $player_object->enter_link
		1661
		1662	Freezes the player and moves him/her to a special map (C<{link}>).
		1663
		1664	The player should be reaosnably safe there for short amounts of time. You
		1665	I<MUST> call C<leave_link> as soon as possible, though.
		1666
		1667	=item $player_object->leave_link ($map, $x, $y)
		1668
		1669	Moves the player out of the specila link map onto the given map. If the
		1670	map is not valid (or omitted), the player will be moved back to the
		1671	location he/she was before the call to C<enter_link>, or, if that fails,
		1672	to the emergency map position.
		1673
		1674	Might block.
		1675
		1676	=cut
		1677
1355	sub cf::object::player::enter_link {	1678	sub cf::object::player::enter_link {
1356	my ($self) = @_;	1679	my ($self) = @_;
1357		1680
		1681	$self->deactivate_recursive;
		1682
1358	return if $self->map == $LINK_MAP;	1683	return if $self->map == $LINK_MAP;
1359		1684
1360	$self->{_link_pos} = [$self->map->{path}, $self->x, $self->y]	1685	$self->{_link_pos} \|\|= [$self->map->{path}, $self->x, $self->y]
1361	if $self->map;	1686	if $self->map;
1362		1687
1363	$self->enter_map ($LINK_MAP, 20, 20);	1688	$self->enter_map ($LINK_MAP, 20, 20);
1364	$self->deactivate_recursive;
1365	}	1689	}
1366		1690
1367	sub cf::object::player::leave_link {	1691	sub cf::object::player::leave_link {
1368	my ($self, $map, $x, $y) = @_;	1692	my ($self, $map, $x, $y) = @_;
1369		1693
1370	my $link_pos = delete $self->{_link_pos};	1694	my $link_pos = delete $self->{_link_pos};
1371		1695
1372	unless ($map) {	1696	unless ($map) {
1373	$self->message ("The exit is closed", cf::NDI_UNIQUE \| cf::NDI_RED);
1374
1375	# restore original map position	1697	# restore original map position
1376	($map, $x, $y) = @{ $link_pos \|\| [] };	1698	($map, $x, $y) = @{ $link_pos \|\| [] };
1377	$map = cf::map::find_map $map;	1699	$map = cf::map::find $map;
1378		1700
1379	unless ($map) {	1701	unless ($map) {
1380	($map, $x, $y) = @$EMERGENCY_POSITION;	1702	($map, $x, $y) = @$EMERGENCY_POSITION;
1381	$map = cf::map::find_map $map	1703	$map = cf::map::find $map
1382	or die "FATAL: cannot load emergency map\n";	1704	or die "FATAL: cannot load emergency map\n";
1383	}	1705	}
1384	}	1706	}
1385		1707
1386	($x, $y) = (-1, -1)	1708	($x, $y) = (-1, -1)
…		…
1390	($x, $y) = ($map->enter_x, $map->enter_y)	1712	($x, $y) = ($map->enter_x, $map->enter_y)
1391	if $x <=0 && $y <= 0;	1713	if $x <=0 && $y <= 0;
1392		1714
1393	$map->load;	1715	$map->load;
1394		1716
		1717	return unless $self->contr->active;
1395	$self->activate_recursive;	1718	$self->activate_recursive;
1396	$self->enter_map ($map, $x, $y);	1719	$self->enter_map ($map, $x, $y);
1397	}	1720	}
1398		1721
		1722	cf::player->attach (
		1723	on_logout => sub {
		1724	my ($pl) = @_;
		1725
		1726	# abort map switching before logout
		1727	if ($pl->ob->{_link_pos}) {
		1728	cf::sync_job {
		1729	$pl->ob->leave_link
		1730	};
		1731	}
		1732	},
		1733	on_login => sub {
		1734	my ($pl) = @_;
		1735
		1736	# try to abort aborted map switching on player login :)
		1737	# should happen only on crashes
		1738	if ($pl->ob->{_link_pos}) {
		1739	$pl->ob->enter_link;
		1740	(async {
		1741	# we need this sleep as the login has a concurrent enter_exit running
		1742	# and this sleep increases chances of the player not ending up in scorn
		1743	$pl->ob->reply (undef,
		1744	"There was an internal problem at your last logout, "
		1745	. "the server will try to bring you to your intended destination in a second.",
		1746	cf::NDI_RED);
		1747	Coro::Timer::sleep 1;
		1748	$pl->ob->leave_link;
		1749	})->prio (2);
		1750	}
		1751	},
		1752	);
		1753
1399	=item $player_object->goto_map ($map, $x, $y)	1754	=item $player_object->goto ($path, $x, $y)
1400		1755
1401	=cut	1756	=cut
1402		1757
1403	sub cf::object::player::goto_map {	1758	sub cf::object::player::goto {
1404	my ($self, $path, $x, $y) = @_;	1759	my ($self, $path, $x, $y) = @_;
1405		1760
		1761	$path = new cf::path $path;
		1762	$path ne "/" or Carp::cluck ("oy");#d#
		1763
1406	$self->enter_link;	1764	$self->enter_link;
1407		1765
1408	(Coro::async {	1766	(async {
1409	$path = new cf::path $path;
1410
1411	my $map = cf::map::find_map $path->as_string;	1767	my $map = cf::map::find $path->as_string;
1412	$map = $map->customise_for ($self) if $map;	1768	$map = $map->customise_for ($self) if $map;
1413		1769
1414	warn "entering ", $map->path, " at ($x, $y)\n"	1770	# warn "entering ", $map->path, " at ($x, $y)\n"
1415	if $map;	1771	# if $map;
		1772
		1773	$map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);
1416		1774
1417	$self->leave_link ($map, $x, $y);	1775	$self->leave_link ($map, $x, $y);
1418	})->prio (1);	1776	})->prio (1);
1419	}	1777	}
1420		1778
…		…
1473		1831
1474	return unless $self->type == cf::PLAYER;	1832	return unless $self->type == cf::PLAYER;
1475		1833
1476	$self->enter_link;	1834	$self->enter_link;
1477		1835
1478	(Coro::async {	1836	(async {
		1837	$self->deactivate_recursive; # just to be sure
1479	unless (eval {	1838	unless (eval {
1480
1481	prepare_random_map $exit	1839	prepare_random_map $exit
1482	if $exit->slaying eq "/!";	1840	if $exit->slaying eq "/!";
1483		1841
1484	my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;	1842	my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1485	$self->goto_map ($path, $exit->stats->hp, $exit->stats->sp);	1843	$self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1486		1844
1487	1;	1845	1;
1488	}) {	1846	}) {
1489	$self->message ("Something went wrong deep within the crossfire server. "	1847	$self->message ("Something went wrong deep within the crossfire server. "
1490	. "I'll try to bring you back to the map you were before. "	1848	. "I'll try to bring you back to the map you were before. "
…		…
1547	on_reply => sub {	1905	on_reply => sub {
1548	my ($ns, $msg) = @_;	1906	my ($ns, $msg) = @_;
1549		1907
1550	# this weird shuffling is so that direct followup queries	1908	# this weird shuffling is so that direct followup queries
1551	# get handled first	1909	# get handled first
1552	my $queue = delete $ns->{query_queue};	1910	my $queue = delete $ns->{query_queue}
		1911	or return; # be conservative, not sure how that can happen, but we saw a crash here
1553		1912
1554	(shift @$queue)->[1]->($msg);	1913	(shift @$queue)->[1]->($msg);
1555		1914
1556	push @{ $ns->{query_queue} }, @$queue;	1915	push @{ $ns->{query_queue} }, @$queue;
1557		1916
…		…
1563	}	1922	}
1564	}	1923	}
1565	},	1924	},
1566	);	1925	);
1567		1926
1568	=item $client->coro (\&cb)	1927	=item $client->async (\&cb)
1569		1928
1570	Create a new coroutine, running the specified callback. The coroutine will	1929	Create a new coroutine, running the specified callback. The coroutine will
1571	be automatically cancelled when the client gets destroyed (e.g. on logout,	1930	be automatically cancelled when the client gets destroyed (e.g. on logout,
1572	or loss of connection).	1931	or loss of connection).
1573		1932
1574	=cut	1933	=cut
1575		1934
1576	sub cf::client::coro {	1935	sub cf::client::async {
1577	my ($self, $cb) = @_;	1936	my ($self, $cb) = @_;
1578		1937
1579	my $coro; $coro = async {	1938	my $coro = &Coro::async ($cb);
1580	eval {
1581	$cb->();
1582	};
1583	warn $@ if $@;
1584	};
1585		1939
1586	$coro->on_destroy (sub {	1940	$coro->on_destroy (sub {
1587	delete $self->{_coro}{$coro+0};	1941	delete $self->{_coro}{$coro+0};
1588	});	1942	});
1589		1943
…		…
1761		2115
1762	{	2116	{
1763	my $path = cf::localdir . "/database.pst";	2117	my $path = cf::localdir . "/database.pst";
1764		2118
1765	sub db_load() {	2119	sub db_load() {
1766	warn "loading database $path\n";#d# remove later
1767	$DB = stat $path ? Storable::retrieve $path : { };	2120	$DB = stat $path ? Storable::retrieve $path : { };
1768	}	2121	}
1769		2122
1770	my $pid;	2123	my $pid;
1771		2124
1772	sub db_save() {	2125	sub db_save() {
1773	warn "saving database $path\n";#d# remove later
1774	waitpid $pid, 0 if $pid;	2126	waitpid $pid, 0 if $pid;
1775	if (0 == ($pid = fork)) {	2127	if (0 == ($pid = fork)) {
1776	$DB->{_meta}{version} = 1;	2128	$DB->{_meta}{version} = 1;
1777	Storable::nstore $DB, "$path~";	2129	Storable::nstore $DB, "$path~";
1778	rename "$path~", $path;	2130	rename "$path~", $path;
…		…
1826	open my $fh, "<:utf8", cf::confdir . "/config"	2178	open my $fh, "<:utf8", cf::confdir . "/config"
1827	or return;	2179	or return;
1828		2180
1829	local $/;	2181	local $/;
1830	*CFG = YAML::Syck::Load <$fh>;	2182	*CFG = YAML::Syck::Load <$fh>;
		2183
		2184	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];
		2185
		2186	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
		2187	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
		2188
		2189	if (exists $CFG{mlockall}) {
		2190	eval {
		2191	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
		2192	and die "WARNING: m(un)lockall failed: $!\n";
		2193	};
		2194	warn $@ if $@;
		2195	}
1831	}	2196	}
1832		2197
1833	sub main {	2198	sub main {
1834	# we must not ever block the main coroutine	2199	# we must not ever block the main coroutine
1835	local $Coro::idle = sub {	2200	local $Coro::idle = sub {
1836	Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d#	2201	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1837	(Coro::unblock_sub {
1838	Event::one_event;	2202	async { Event::one_event };
1839	})->();
1840	};	2203	};
1841		2204
1842	cfg_load;	2205	cfg_load;
1843	db_load;	2206	db_load;
1844	load_extensions;	2207	load_extensions;
…		…
1855	return;	2218	return;
1856	}	2219	}
1857		2220
1858	warn "reloading...";	2221	warn "reloading...";
1859		2222
1860	local $FREEZE = 1;	2223	my $guard = freeze_mainloop;
1861	cf::emergency_save;	2224	cf::emergency_save;
1862		2225
1863	eval {	2226	eval {
1864	# if anything goes wrong in here, we should simply crash as we already saved	2227	# if anything goes wrong in here, we should simply crash as we already saved
1865		2228
…		…
1927	cf::load_extensions;	2290	cf::load_extensions;
1928		2291
1929	# reattach attachments to objects	2292	# reattach attachments to objects
1930	warn "reattach";	2293	warn "reattach";
1931	_global_reattach;	2294	_global_reattach;
		2295	reattach $_ for values %MAP;
1932	};	2296	};
1933		2297
1934	if ($@) {	2298	if ($@) {
1935	warn $@;	2299	warn $@;
1936	warn "error while reloading, exiting.";	2300	warn "error while reloading, exiting.";
…		…
1952	$LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";	2316	$LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
1953	$LINK_MAP->in_memory (MAP_IN_MEMORY);	2317	$LINK_MAP->in_memory (MAP_IN_MEMORY);
1954		2318
1955	# dirty hack because... archetypes are not yet loaded	2319	# dirty hack because... archetypes are not yet loaded
1956	Event->timer (	2320	Event->timer (
1957	after => 2,	2321	after => 10,
1958	cb => sub {	2322	cb => sub {
1959	$_[0]->w->cancel;	2323	$_[0]->w->cancel;
1960		2324
1961	# provide some exits "home"	2325	# provide some exits "home"
1962	my $exit = cf::object::new "exit";	2326	my $exit = cf::object::new "exit";
…		…
2001	reentrant => 0,	2365	reentrant => 0,
2002	prio => 0,	2366	prio => 0,
2003	at => $NEXT_TICK \|\| $TICK,	2367	at => $NEXT_TICK \|\| $TICK,
2004	data => WF_AUTOCANCEL,	2368	data => WF_AUTOCANCEL,
2005	cb => sub {	2369	cb => sub {
2006	unless ($FREEZE) {
2007	cf::server_tick; # one server iteration	2370	cf::server_tick; # one server iteration
2008	$RUNTIME += $TICK;	2371	$RUNTIME += $TICK;
2009	}
2010
2011	$NEXT_TICK += $TICK;	2372	$NEXT_TICK += $TICK;
2012		2373
2013	# if we are delayed by four ticks or more, skip them all	2374	# if we are delayed by four ticks or more, skip them all
2014	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2375	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2015		2376
…		…
2038	or warn "ERROR: unable to write runtime file: $!";	2399	or warn "ERROR: unable to write runtime file: $!";
2039	})->();	2400	})->();
2040	},	2401	},
2041	);	2402	);
2042		2403
		2404	END { cf::emergency_save }
		2405
2043	1	2406	1
2044		2407

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.112 by root, Mon Jan 1 13:31:47 2007 UTC vs. Revision 1.154 by root, Tue Jan 9 15:36:19 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.112 by root, Mon Jan 1 13:31:47 2007 UTC vs.
Revision 1.154 by root, Tue Jan 9 15:36:19 2007 UTC