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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.257 by root, Sat Apr 21 17:34:24 2007 UTC vs.
Revision 1.282 by elmex, Tue Jun 19 18:15:34 2007 UTC

…		…
90	our $LINK_MAP; # the special {link} map, which is always available	90	our $LINK_MAP; # the special {link} map, which is always available
91		91
92	# used to convert map paths into valid unix filenames by replacing / by ∕	92	# used to convert map paths into valid unix filenames by replacing / by ∕
93	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	93	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94		94
		95	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
		96	our $LOADAVG; # same thing, but with alpha-smoothing
		97	our $tick_start; # for load detecting purposes
		98
95	binmode STDOUT;	99	binmode STDOUT;
96	binmode STDERR;	100	binmode STDERR;
97		101
98	# read virtual server time, if available	102	# read virtual server time, if available
99	unless ($RUNTIME \|\| !-e "$LOCALDIR/runtime") {	103	unless ($RUNTIME \|\| !-e "$LOCALDIR/runtime") {
…		…
139		143
140	=item $cf::TICK	144	=item $cf::TICK
141		145
142	The interval between server ticks, in seconds.	146	The interval between server ticks, in seconds.
143		147
		148	=item $cf::LOADAVG
		149
		150	The current CPU load on the server (alpha-smoothed), as a value between 0
		151	(none) and 1 (overloaded), indicating how much time is spent on processing
		152	objects per tick. Healthy values are < 0.5.
		153
		154	=item $cf::LOAD
		155
		156	The raw value load value from the last tick.
		157
144	=item %cf::CFG	158	=item %cf::CFG
145		159
146	Configuration for the server, loaded from C</etc/crossfire/config>, or	160	Configuration for the server, loaded from C</etc/crossfire/config>, or
147	from wherever your confdir points to.	161	from wherever your confdir points to.
148		162
…		…
173	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	187	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
174	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	188	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
175	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	189	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
176	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	190	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
177	@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';	191	@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
		192	@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
178	@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';	193	@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
179		194
180	# we bless all objects into (empty) derived classes to force a method lookup	195	# we bless all objects into (empty) derived classes to force a method lookup
181	# within the Safe compartment.	196	# within the Safe compartment.
182	for my $pkg (qw(	197	for my $pkg (qw(
183	cf::global cf::attachable	198	cf::global cf::attachable
…		…
191	}	206	}
192		207
193	$Event::DIED = sub {	208	$Event::DIED = sub {
194	warn "error in event callback: @_";	209	warn "error in event callback: @_";
195	};	210	};
		211
		212	#############################################################################
196		213
197	=head2 UTILITY FUNCTIONS	214	=head2 UTILITY FUNCTIONS
198		215
199	=over 4	216	=over 4
200		217
…		…
303		320
304	BEGIN { *async = \&Coro::async_pool }	321	BEGIN { *async = \&Coro::async_pool }
305		322
306	=item cf::sync_job { BLOCK }	323	=item cf::sync_job { BLOCK }
307		324
308	The design of crossfire+ requires that the main coro ($Coro::main) is	325	The design of Crossfire TRT requires that the main coroutine ($Coro::main)
309	always able to handle events or runnable, as crossfire+ is only partly	326	is always able to handle events or runnable, as Crossfire TRT is only
310	reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.	327	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
		328	acceptable.
311		329
312	If it must be done, put the blocking parts into C<sync_job>. This will run	330	If it must be done, put the blocking parts into C<sync_job>. This will run
313	the given BLOCK in another coroutine while waiting for the result. The	331	the given BLOCK in another coroutine while waiting for the result. The
314	server will be frozen during this time, so the block should either finish	332	server will be frozen during this time, so the block should either finish
315	fast or be very important.	333	fast or be very important.
…		…
318		336
319	sub sync_job(&) {	337	sub sync_job(&) {
320	my ($job) = @_;	338	my ($job) = @_;
321		339
322	if ($Coro::current == $Coro::main) {	340	if ($Coro::current == $Coro::main) {
		341	my $time = Event::time;
		342
323	# this is the main coro, too bad, we have to block	343	# this is the main coro, too bad, we have to block
324	# till the operation succeeds, freezing the server :/	344	# till the operation succeeds, freezing the server :/
325		345
326	# TODO: use suspend/resume instead	346	# TODO: use suspend/resume instead
327	# (but this is cancel-safe)	347	# (but this is cancel-safe)
…		…
338		358
339	while ($busy) {	359	while ($busy) {
340	Coro::cede or Event::one_event;	360	Coro::cede or Event::one_event;
341	}	361	}
342		362
		363	$time = Event::time - $time;
		364
		365	LOG llevError \| logBacktrace, Carp::longmess "long sync job"
		366	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
		367
		368	$tick_start += $time; # do not account sync jobs to server load
		369
343	wantarray ? @res : $res[0]	370	wantarray ? @res : $res[0]
344	} else {	371	} else {
345	# we are in another coroutine, how wonderful, everything just works	372	# we are in another coroutine, how wonderful, everything just works
346		373
347	$job->()	374	$job->()
…		…
366	$EXT_CORO{$coro+0} = $coro;	393	$EXT_CORO{$coro+0} = $coro;
367		394
368	$coro	395	$coro
369	}	396	}
370		397
371	sub write_runtime {	398	=item fork_call { }, $args
372	my $guard = cf::lock_acquire "write_runtime";
373		399
374	my $runtime = "$LOCALDIR/runtime";	400	Executes the given code block with the given arguments in a seperate
		401	process, returning the results. Everything must be serialisable with
		402	Coro::Storable. May, of course, block. Note that the executed sub may
		403	never block itself or use any form of Event handling.
375		404
376	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644	405	=cut
377	or return;
378		406
379	my $value = $cf::RUNTIME + 90 + 10;	407	sub fork_call(&@) {
380	# 10 is the runtime save interval, for a monotonic clock	408	my ($cb, @args) = @_;
381	# 60 allows for the watchdog to kill the server.
382		409
383	(aio_write $fh, 0, (length $value), $value, 0) <= 0	410	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
384	and return;	411	# or die "socketpair: $!";
		412	pipe my $fh1, my $fh2
		413	or die "pipe: $!";
385		414
386	# always fsync - this file is important	415	if (my $pid = fork) {
387	aio_fsync $fh
388	and return;
389
390	close $fh	416	close $fh2;
391	or return;
392		417
393	aio_rename "$runtime~", $runtime	418	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
394	and return;	419	$res = Coro::Storable::thaw $res;
395		420
		421	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
		422
		423	die $$res unless "ARRAY" eq ref $res;
		424
		425	return wantarray ? @$res : $res->[-1];
		426	} else {
		427	reset_signals;
		428	local $SIG{__WARN__};
		429	local $SIG{__DIE__};
		430	eval {
		431	close $fh1;
		432
		433	my @res = eval { $cb->(@args) };
		434	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
		435	};
		436
		437	warn $@ if $@;
		438	_exit 0;
396	1	439	}
		440	}
		441
		442	=item $value = cf::db_get $family => $key
		443
		444	Returns a single value from the environment database.
		445
		446	=item cf::db_put $family => $key => $value
		447
		448	Stores the given C<$value> in the family. It can currently store binary
		449	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
		450
		451	=cut
		452
		453	our $DB;
		454
		455	sub db_init {
		456	unless ($DB) {
		457	$DB = BDB::db_create $DB_ENV;
		458
		459	cf::sync_job {
		460	eval {
		461	$DB->set_flags (BDB::CHKSUM);
		462
		463	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
		464	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
		465	cf::cleanup "db_open(db): $!" if $!;
		466	};
		467	cf::cleanup "db_open(db): $@" if $@;
		468	};
		469	}
		470	}
		471
		472	sub db_get($$) {
		473	my $key = "$_[0]/$_[1]";
		474
		475	cf::sync_job {
		476	BDB::db_get $DB, undef, $key, my $data;
		477
		478	$! ? ()
		479	: $data
		480	}
		481	}
		482
		483	sub db_put($$$) {
		484	BDB::dbreq_pri 4;
		485	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
		486	}
		487
		488	=item cf::cache $id => [$paths...], $processversion => $process
		489
		490	Generic caching function that returns the value of the resource $id,
		491	caching and regenerating as required.
		492
		493	This function can block.
		494
		495	=cut
		496
		497	sub cache {
		498	my ($id, $src, $processversion, $process) = @_;
		499
		500	my $meta =
		501	join "\x00",
		502	$processversion,
		503	map {
		504	aio_stat $_
		505	and Carp::croak "$_: $!";
		506
		507	($_, (stat _)[7,9])
		508	} @$src;
		509
		510	my $dbmeta = db_get cache => "$id/meta";
		511	if ($dbmeta ne $meta) {
		512	# changed, we may need to process
		513
		514	my @data;
		515	my $md5;
		516
		517	for (0 .. $#$src) {
		518	0 <= aio_load $src->[$_], $data[$_]
		519	or Carp::croak "$src->[$_]: $!";
		520	}
		521
		522	# if processing is expensive, check
		523	# checksum first
		524	if (1) {
		525	$md5 =
		526	join "\x00",
		527	$processversion,
		528	map {
		529	Coro::cede;
		530	($src->[$_], Digest::MD5::md5_hex $data[$_])
		531	} 0.. $#$src;
		532
		533
		534	my $dbmd5 = db_get cache => "$id/md5";
		535	if ($dbmd5 eq $md5) {
		536	db_put cache => "$id/meta", $meta;
		537
		538	return db_get cache => "$id/data";
		539	}
		540	}
		541
		542	my $t1 = Time::HiRes::time;
		543	my $data = $process->(\@data);
		544	my $t2 = Time::HiRes::time;
		545
		546	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
		547
		548	db_put cache => "$id/data", $data;
		549	db_put cache => "$id/md5" , $md5;
		550	db_put cache => "$id/meta", $meta;
		551
		552	return $data;
		553	}
		554
		555	db_get cache => "$id/data"
397	}	556	}
398		557
399	=item cf::datalog type => key => value, ...	558	=item cf::datalog type => key => value, ...
400		559
401	Log a datalog packet of the given type with the given key-value pairs.	560	Log a datalog packet of the given type with the given key-value pairs.
…		…
419	attach callbacks/event handlers (a collection of which is called an "attachment")	578	attach callbacks/event handlers (a collection of which is called an "attachment")
420	to it. All such attachable objects support the following methods.	579	to it. All such attachable objects support the following methods.
421		580
422	In the following description, CLASS can be any of C<global>, C<object>	581	In the following description, CLASS can be any of C<global>, C<object>
423	C<player>, C<client> or C<map> (i.e. the attachable objects in	582	C<player>, C<client> or C<map> (i.e. the attachable objects in
424	crossfire+).	583	Crossfire TRT).
425		584
426	=over 4	585	=over 4
427		586
428	=item $attachable->attach ($attachment, key => $value...)	587	=item $attachable->attach ($attachment, key => $value...)
429		588
…		…
592	$registry = $CB_TYPE[$object_type] \|\|= [];	751	$registry = $CB_TYPE[$object_type] \|\|= [];
593		752
594	} elsif ($type eq "subtype") {	753	} elsif ($type eq "subtype") {
595	defined $object_type or Carp::croak "subtype specified without type";	754	defined $object_type or Carp::croak "subtype specified without type";
596	my $object_subtype = shift @arg;	755	my $object_subtype = shift @arg;
597	$registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] \|\|= [];	756	$registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] \|\|= [];
598		757
599	} elsif ($type eq "package") {	758	} elsif ($type eq "package") {
600	my $pkg = shift @arg;	759	my $pkg = shift @arg;
601		760
602	while (my ($name, $id) = each %cb_id) {	761	while (my ($name, $id) = each %cb_id) {
…		…
631	_attach $registry, $klass, @attach;	790	_attach $registry, $klass, @attach;
632	}	791	}
633		792
634	$obj->{$name} = \%arg;	793	$obj->{$name} = \%arg;
635	} else {	794	} else {
636	warn "object uses attachment '$name' that is not available, postponing.\n";	795	warn "object uses attachment '$name' which is not available, postponing.\n";
637	}	796	}
638		797
639	$obj->{_attachment}{$name} = undef;	798	$obj->{_attachment}{$name} = undef;
640	}	799	}
641		800
…		…
643	if (ref $_[0]) {	802	if (ref $_[0]) {
644	_object_attach @_;	803	_object_attach @_;
645	} else {	804	} else {
646	_attach shift->_attach_registry, @_;	805	_attach shift->_attach_registry, @_;
647	}	806	}
		807	_recalc_want;
648	};	808	};
649		809
650	# all those should be optimised	810	# all those should be optimised
651	sub cf::attachable::detach {	811	sub cf::attachable::detach {
652	my ($obj, $name) = @_;	812	my ($obj, $name) = @_;
…		…
655	delete $obj->{_attachment}{$name};	815	delete $obj->{_attachment}{$name};
656	reattach ($obj);	816	reattach ($obj);
657	} else {	817	} else {
658	Carp::croak "cannot, currently, detach class attachments";	818	Carp::croak "cannot, currently, detach class attachments";
659	}	819	}
		820	_recalc_want;
660	};	821	};
661		822
662	sub cf::attachable::attached {	823	sub cf::attachable::attached {
663	my ($obj, $name) = @_;	824	my ($obj, $name) = @_;
664		825
…		…
837	or return;	998	or return;
838	$av = eval { (Storable::thaw $av)->{objs} };	999	$av = eval { (Storable::thaw $av)->{objs} };
839	}	1000	}
840		1001
841	warn sprintf "loading %s (%d)\n",	1002	warn sprintf "loading %s (%d)\n",
842	$filename, length $data, scalar @{$av \|\| []};#d#	1003	$filename, length $data, scalar @{$av \|\| []};
843	return ($data, $av);	1004	return ($data, $av);
844	}	1005	}
		1006
		1007	=head2 COMMAND CALLBACKS
		1008
		1009	=over 4
		1010
		1011	=cut
845		1012
846	#############################################################################	1013	#############################################################################
847	# command handling &c	1014	# command handling &c
848		1015
849	=item cf::register_command $name => \&callback($ob,$args);	1016	=item cf::register_command $name => \&callback($ob,$args);
…		…
862	push @{ $COMMAND{$name} }, [$caller, $cb];	1029	push @{ $COMMAND{$name} }, [$caller, $cb];
863	}	1030	}
864		1031
865	=item cf::register_extcmd $name => \&callback($pl,$packet);	1032	=item cf::register_extcmd $name => \&callback($pl,$packet);
866		1033
867	Register a callbackf ro execution when the client sends an extcmd packet.	1034	Register a callback fro execution when the client sends an extcmd packet.
868		1035
869	If the callback returns something, it is sent back as if reply was being	1036	If the callback returns something, it is sent back as if reply was being
870	called.	1037	called.
871		1038
872	=cut	1039	=cut
…		…
907		1074
908	cf::override;	1075	cf::override;
909	},	1076	},
910	);	1077	);
911		1078
912	sub load_extension {
913	my ($path) = @_;
914
915	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
916	my $base = $1;
917	my $pkg = $1;
918	$pkg =~ s/[^[:word:]]/_/g;
919	$pkg = "ext::$pkg";
920
921	warn "... loading '$path' into '$pkg'\n";
922
923	open my $fh, "<:utf8", $path
924	or die "$path: $!";
925
926	my $source =
927	"package $pkg; use strict; use utf8;\n"
928	. "#line 1 \"$path\"\n{\n"
929	. (do { local $/; <$fh> })
930	. "\n};\n1";
931
932	unless (eval $source) {
933	my $msg = $@ ? "$path: $@\n"
934	: "extension disabled.\n";
935	if ($source =~ /^#!.perl.#.*MANDATORY/m) { # ugly match
936	warn $@;
937	warn "mandatory extension failed to load, exiting.\n";
938	exit 1;
939	}
940	die $@;
941	}
942
943	push @EXTS, $pkg;
944	}
945
946	sub load_extensions {	1079	sub load_extensions {
		1080	cf::sync_job {
		1081	my %todo;
		1082
947	for my $ext (<$LIBDIR/*.ext>) {	1083	for my $path (<$LIBDIR/*.ext>) {
948	next unless -r $ext;	1084	next unless -r $path;
949	eval {	1085
950	load_extension $ext;	1086	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
		1087	my $base = $1;
		1088	my $pkg = $1;
		1089	$pkg =~ s/[^[:word:]]/_/g;
		1090	$pkg = "ext::$pkg";
		1091
		1092	open my $fh, "<:utf8", $path
		1093	or die "$path: $!";
		1094
		1095	my $source = do { local $/; <$fh> };
		1096
		1097	my %ext = (
		1098	path => $path,
		1099	base => $base,
		1100	pkg => $pkg,
		1101	);
		1102
		1103	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
		1104	if $source =~ /\A#!.?perl.?#\s(.)$/m;
		1105
		1106	$ext{source} =
		1107	"package $pkg; use strict; use utf8;\n"
		1108	. "#line 1 \"$path\"\n{\n"
		1109	. $source
		1110	. "\n};\n1";
		1111
		1112	$todo{$base} = \%ext;
		1113	}
		1114
		1115	my %done;
		1116	while (%todo) {
		1117	my $progress;
		1118
		1119	while (my ($k, $v) = each %todo) {
		1120	for (split /,\s*/, $v->{meta}{depends}) {
		1121	goto skip
		1122	unless exists $done{$_};
		1123	}
		1124
		1125	warn "... loading '$k' into '$v->{pkg}'\n";
		1126
		1127	unless (eval $v->{source}) {
		1128	my $msg = $@ ? "$v->{path}: $@\n"
		1129	: "$v->{base}: extension inactive.\n";
		1130
		1131	if (exists $v->{meta}{mandatory}) {
		1132	warn $msg;
		1133	warn "mandatory extension failed to load, exiting.\n";
		1134	exit 1;
		1135	}
		1136
		1137	warn $msg;
		1138	}
		1139
		1140	$done{$k} = delete $todo{$k};
		1141	push @EXTS, $v->{pkg};
		1142	$progress = 1;
951	1	1143	}
952	} or warn "$ext not loaded: $@";	1144
		1145	skip:
		1146	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
		1147	unless $progress;
		1148	}
953	}	1149	};
954	}	1150	}
955		1151
956	#############################################################################	1152	#############################################################################
		1153
		1154	=back
957		1155
958	=head2 CORE EXTENSIONS	1156	=head2 CORE EXTENSIONS
959		1157
960	Functions and methods that extend core crossfire objects.	1158	Functions and methods that extend core crossfire objects.
961		1159
…		…
1185		1383
1186	package cf::region;	1384	package cf::region;
1187		1385
1188	=item cf::region::find_by_path $path	1386	=item cf::region::find_by_path $path
1189		1387
1190	Tries to decuce the probable region for a map knowing only its path.	1388	Tries to decuce the likely region for a map knowing only its path.
1191		1389
1192	=cut	1390	=cut
1193		1391
1194	sub find_by_path($) {	1392	sub find_by_path($) {
1195	my ($path) = @_;	1393	my ($path) = @_;
…		…
1269	my ($self, $merge) = @_;	1467	my ($self, $merge) = @_;
1270		1468
1271	# we have to keep some variables in memory intact	1469	# we have to keep some variables in memory intact
1272	local $self->{path};	1470	local $self->{path};
1273	local $self->{load_path};	1471	local $self->{load_path};
1274	local $self->{deny_save};
1275	local $self->{deny_reset};
1276		1472
1277	$self->SUPER::thawer_merge ($merge);	1473	$self->SUPER::thawer_merge ($merge);
1278	}	1474	}
1279		1475
1280	sub normalise {	1476	sub normalise {
…		…
1380		1576
1381	$_->change_map_light ($change)	1577	$_->change_map_light ($change)
1382	for grep $_->outdoor, values %cf::MAP;	1578	for grep $_->outdoor, values %cf::MAP;
1383	}	1579	}
1384		1580
		1581	sub decay_objects {
		1582	my ($self) = @_;
		1583
		1584	return if $self->{deny_reset};
		1585
		1586	$self->do_decay_objects;
		1587	}
		1588
1385	sub unlink_save {	1589	sub unlink_save {
1386	my ($self) = @_;	1590	my ($self) = @_;
1387		1591
1388	utf8::encode (my $save = $self->save_path);	1592	utf8::encode (my $save = $self->save_path);
1389	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;	1593	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
…		…
1445	$self->load_header_orig	1649	$self->load_header_orig
1446	or return;	1650	or return;
1447	$self->prepare_orig;	1651	$self->prepare_orig;
1448	}	1652	}
1449		1653
		1654	$self->{deny_reset} = 1
		1655	if $self->no_reset;
		1656
1450	$self->default_region (cf::region::find_by_path $self->{path})	1657	$self->default_region (cf::region::find_by_path $self->{path})
1451	unless $self->default_region;	1658	unless $self->default_region;
1452		1659
1453	1	1660	1
1454	}	1661	}
…		…
1469	$map->{last_save} = $cf::RUNTIME;	1676	$map->{last_save} = $cf::RUNTIME;
1470		1677
1471	$map->load_header	1678	$map->load_header
1472	or return;	1679	or return;
1473		1680
1474	if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)	1681	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1475	# doing this can freeze the server in a sync job, obviously	1682	# doing this can freeze the server in a sync job, obviously
1476	#$cf::WAIT_FOR_TICK->wait;	1683	#$cf::WAIT_FOR_TICK->wait;
1477	$map->reset;	1684	$map->reset;
1478	undef $guard;	1685	undef $guard;
1479	return find $path;	1686	return find $path;
…		…
1546	my ($self, $ob) = @_;	1753	my ($self, $ob) = @_;
1547		1754
1548	return find "~" . $ob->name . "/" . $self->{path}	1755	return find "~" . $ob->name . "/" . $self->{path}
1549	if $self->per_player;	1756	if $self->per_player;
1550		1757
		1758	# return find "?party/" . $ob->name . "/" . $self->{path}
		1759	# if $self->per_party;
		1760
1551	$self	1761	$self
1552	}	1762	}
1553		1763
1554	# find and load all maps in the 3x3 area around a map	1764	# find and load all maps in the 3x3 area around a map
1555	sub load_diag {	1765	sub load_diag {
…		…
1665		1875
1666	sub reset_at {	1876	sub reset_at {
1667	my ($self) = @_;	1877	my ($self) = @_;
1668		1878
1669	# TODO: safety, remove and allow resettable per-player maps	1879	# TODO: safety, remove and allow resettable per-player maps
1670	return 1e99 if $self->isa ("ext::map_per_player");#d#
1671	return 1e99 if $self->{deny_reset};	1880	return 1e99 if $self->{deny_reset};
1672		1881
1673	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;	1882	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1674	my $to = List::Util::min $MAX_RESET, $self->reset_timeout \|\| $DEFAULT_RESET;	1883	my $to = List::Util::min $MAX_RESET, $self->reset_timeout \|\| $DEFAULT_RESET;
1675		1884
…		…
1686	my ($self) = @_;	1895	my ($self) = @_;
1687		1896
1688	my $lock = cf::lock_acquire "map_data:$self->{path}";	1897	my $lock = cf::lock_acquire "map_data:$self->{path}";
1689		1898
1690	return if $self->players;	1899	return if $self->players;
1691	return if $self->isa ("ext::map_per_player");#d#
1692		1900
1693	warn "resetting map ", $self->path;#d#	1901	warn "resetting map ", $self->path;
1694		1902
1695	$self->in_memory (cf::MAP_SWAPPED);	1903	$self->in_memory (cf::MAP_SWAPPED);
1696		1904
1697	# need to save uniques path	1905	# need to save uniques path
1698	unless ($self->{deny_save}) {	1906	unless ($self->{deny_save}) {
…		…
1730	$cf::MAP{$self->path} = $self;	1938	$cf::MAP{$self->path} = $self;
1731		1939
1732	$self->reset; # polite request, might not happen	1940	$self->reset; # polite request, might not happen
1733	}	1941	}
1734		1942
		1943	=item $maps = cf::map::tmp_maps
		1944
		1945	Returns an arrayref with all map paths of currently instantiated and saved
		1946	maps. May block.
		1947
		1948	=cut
		1949
		1950	sub tmp_maps() {
		1951	[
		1952	map {
		1953	utf8::decode $_;
		1954	/\.map$/
		1955	? normalise $_
		1956	: ()
		1957	} @{ aio_readdir $TMPDIR or [] }
		1958	]
		1959	}
		1960
		1961	=item $maps = cf::map::random_maps
		1962
		1963	Returns an arrayref with all map paths of currently instantiated and saved
		1964	random maps. May block.
		1965
		1966	=cut
		1967
		1968	sub random_maps() {
		1969	[
		1970	map {
		1971	utf8::decode $_;
		1972	/\.map$/
		1973	? normalise "?random/$_"
		1974	: ()
		1975	} @{ aio_readdir $RANDOMDIR or [] }
		1976	]
		1977	}
		1978
1735	=item cf::map::unique_maps	1979	=item cf::map::unique_maps
1736		1980
1737	Returns an arrayref of paths of all shared maps that have	1981	Returns an arrayref of paths of all shared maps that have
1738	instantiated unique items. May block.	1982	instantiated unique items. May block.
1739		1983
1740	=cut	1984	=cut
1741		1985
1742	sub unique_maps() {	1986	sub unique_maps() {
1743	my $files = aio_readdir $UNIQUEDIR	1987	[
1744	or return;	1988	map {
1745
1746	my @paths;
1747
1748	for (@$files) {
1749	utf8::decode $_;	1989	utf8::decode $_;
1750	next if /\.pst$/;	1990	/\.map$/
1751	next unless /^$PATH_SEP/o;	1991	? normalise $_
1752		1992	: ()
1753	push @paths, cf::map::normalise $_;	1993	} @{ aio_readdir $UNIQUEDIR or [] }
1754	}	1994	]
1755
1756	\@paths
1757	}	1995	}
1758		1996
1759	package cf;	1997	package cf;
1760		1998
1761	=back	1999	=back
…		…
1807		2045
1808	$flags = cf::NDI_BROWN \| cf::NDI_UNIQUE unless @_ >= 4;	2046	$flags = cf::NDI_BROWN \| cf::NDI_UNIQUE unless @_ >= 4;
1809		2047
1810	if ($self->{record_replies}) {	2048	if ($self->{record_replies}) {
1811	push @{ $self->{record_replies} }, [$npc, $msg, $flags];	2049	push @{ $self->{record_replies} }, [$npc, $msg, $flags];
		2050
1812	} else {	2051	} else {
		2052	my $pl = $self->contr;
		2053
		2054	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
		2055	my $diag = $pl->{npc_dialog};
		2056	$diag->{pl}->ext_reply (
		2057	$diag->{id}, msgtype => "reply", msg => $msg, add_topics => []
		2058	);
		2059
		2060	} else {
1813	$msg = $npc->name . " says: $msg" if $npc;	2061	$msg = $npc->name . " says: $msg" if $npc;
1814	$self->message ($msg, $flags);	2062	$self->message ($msg, $flags);
		2063	}
1815	}	2064	}
1816	}	2065	}
1817		2066
1818	=item $player_object->may ("access")	2067	=item $player_object->may ("access")
1819		2068
…		…
1862	}	2111	}
1863		2112
1864	sub cf::object::player::enter_link {	2113	sub cf::object::player::enter_link {
1865	my ($self) = @_;	2114	my ($self) = @_;
1866		2115
		2116	$self->deactivate_recursive;
		2117
1867	return if UNIVERSAL::isa $self->map, "ext::map_link";	2118	return if UNIVERSAL::isa $self->map, "ext::map_link";
1868		2119
1869	$self->{_link_pos} \|\|= [$self->map->{path}, $self->x, $self->y]	2120	$self->{_link_pos} \|\|= [$self->map->{path}, $self->x, $self->y]
1870	if $self->map;	2121	if $self->map && $self->map->{path} ne "{link}";
1871		2122
1872	$self->enter_map ($LINK_MAP \|\| link_map, 10, 10);	2123	$self->enter_map ($LINK_MAP \|\| link_map, 10, 10);
1873	}	2124	}
1874		2125
1875	sub cf::object::player::leave_link {	2126	sub cf::object::player::leave_link {
1876	my ($self, $map, $x, $y) = @_;	2127	my ($self, $map, $x, $y) = @_;
		2128
		2129	return unless $self->contr->active;
1877		2130
1878	my $link_pos = delete $self->{_link_pos};	2131	my $link_pos = delete $self->{_link_pos};
1879		2132
1880	unless ($map) {	2133	unless ($map) {
1881	# restore original map position	2134	# restore original map position
…		…
1904		2157
1905	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2158	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1906	$self->enter_map ($map, $x, $y);	2159	$self->enter_map ($map, $x, $y);
1907	}	2160	}
1908		2161
1909	cf::player->attach (
1910	on_logout => sub {
1911	my ($pl) = @_;
1912
1913	# abort map switching before logout
1914	if ($pl->ob->{_link_pos}) {
1915	cf::sync_job {
1916	$pl->ob->leave_link
1917	};
1918	}
1919	},
1920	on_login => sub {
1921	my ($pl) = @_;
1922
1923	# try to abort aborted map switching on player login :)
1924	# should happen only on crashes
1925	if ($pl->ob->{_link_pos}) {
1926	$pl->ob->enter_link;
1927	(async {
1928	$pl->ob->reply (undef,
1929	"There was an internal problem at your last logout, "
1930	. "the server will try to bring you to your intended destination in a second.",
1931	cf::NDI_RED);
1932	# we need this sleep as the login has a concurrent enter_exit running
1933	# and this sleep increases chances of the player not ending up in scorn
1934	Coro::Timer::sleep 1;
1935	$pl->ob->leave_link;
1936	})->prio (2);
1937	}
1938	},
1939	);
1940
1941	=item $player_object->goto ($path, $x, $y)	2162	=item $player_object->goto ($path, $x, $y[, $check->($map)])
1942		2163
		2164	Moves the player to the given map-path and coordinates by first freezing
		2165	her, loading and preparing them map, calling the provided $check callback
		2166	that has to return the map if sucecssful, and then unfreezes the player on
		2167	the new (success) or old (failed) map position.
		2168
1943	=cut	2169	=cut
		2170
		2171	our $GOTOGEN;
1944		2172
1945	sub cf::object::player::goto {	2173	sub cf::object::player::goto {
1946	my ($self, $path, $x, $y) = @_;	2174	my ($self, $path, $x, $y, $check) = @_;
		2175
		2176	# do generation counting so two concurrent goto's will be executed in-order
		2177	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1947		2178
1948	$self->enter_link;	2179	$self->enter_link;
1949		2180
1950	(async {	2181	(async {
1951	my $map = eval {	2182	my $map = eval {
1952	my $map = cf::map::find $path;	2183	my $map = cf::map::find $path;
		2184
		2185	if ($map) {
1953	$map = $map->customise_for ($self) if $map;	2186	$map = $map->customise_for ($self);
		2187	$map = $check->($map) if $check && $map;
		2188	} else {
		2189	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);
		2190	}
		2191
1954	$map	2192	$map
		2193	};
		2194
		2195	if ($@) {
		2196	$self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE \| cf::NDI_RED);
		2197	LOG llevError \| logBacktrace, Carp::longmess $@;
1955	} or	2198	}
1956	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);
1957		2199
		2200	if ($gen == $self->{_goto_generation}) {
		2201	delete $self->{_goto_generation};
1958	$self->leave_link ($map, $x, $y);	2202	$self->leave_link ($map, $x, $y);
		2203	}
1959	})->prio (1);	2204	})->prio (1);
1960	}	2205	}
1961		2206
1962	=item $player_object->enter_exit ($exit_object)	2207	=item $player_object->enter_exit ($exit_object)
1963		2208
…		…
2277	=back	2522	=back
2278		2523
2279	=cut	2524	=cut
2280		2525
2281	#############################################################################	2526	#############################################################################
2282
2283	=head2 EXTENSION DATABASE SUPPORT
2284
2285	Crossfire maintains a very simple database for extension use. It can
2286	currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2287	convert to/from binary).
2288
2289	The parameter C<$family> should best start with the name of the extension
2290	using it, it should be unique.
2291
2292	=over 4
2293
2294	=item $value = cf::db_get $family => $key
2295
2296	Returns a single value from the database.
2297
2298	=item cf::db_put $family => $key => $value
2299
2300	Stores the given C<$value> in the family.
2301
2302	=cut
2303
2304	our $DB;
2305
2306	sub db_init {
2307	unless ($DB) {
2308	$DB = BDB::db_create $DB_ENV;
2309
2310	cf::sync_job {
2311	eval {
2312	$DB->set_flags (BDB::CHKSUM);
2313
2314	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2315	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
2316	cf::cleanup "db_open(db): $!" if $!;
2317	};
2318	cf::cleanup "db_open(db): $@" if $@;
2319	};
2320	}
2321	}
2322
2323	sub db_get($$) {
2324	my $key = "$_[0]/$_[1]";
2325
2326	cf::sync_job {
2327	BDB::db_get $DB, undef, $key, my $data;
2328
2329	$! ? ()
2330	: $data
2331	}
2332	}
2333
2334	sub db_put($$$) {
2335	BDB::dbreq_pri 4;
2336	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2337	}
2338
2339	=item cf::cache $id => [$paths...], $processversion => $process
2340
2341	Generic caching function that returns the value of the resource $id,
2342	caching and regenerating as required.
2343
2344	This function can block.
2345
2346	=cut
2347
2348	sub cache {
2349	my ($id, $src, $processversion, $process) = @_;
2350
2351	my $meta =
2352	join "\x00",
2353	$processversion,
2354	map {
2355	aio_stat $_
2356	and Carp::croak "$_: $!";
2357
2358	($_, (stat _)[7,9])
2359	} @$src;
2360
2361	my $dbmeta = db_get cache => "$id/meta";
2362	if ($dbmeta ne $meta) {
2363	# changed, we may need to process
2364
2365	my @data;
2366	my $md5;
2367
2368	for (0 .. $#$src) {
2369	0 <= aio_load $src->[$_], $data[$_]
2370	or Carp::croak "$src->[$_]: $!";
2371	}
2372
2373	# if processing is expensive, check
2374	# checksum first
2375	if (1) {
2376	$md5 =
2377	join "\x00",
2378	$processversion,
2379	map {
2380	Coro::cede;
2381	($src->[$_], Digest::MD5::md5_hex $data[$_])
2382	} 0.. $#$src;
2383
2384
2385	my $dbmd5 = db_get cache => "$id/md5";
2386	if ($dbmd5 eq $md5) {
2387	db_put cache => "$id/meta", $meta;
2388
2389	return db_get cache => "$id/data";
2390	}
2391	}
2392
2393	my $t1 = Time::HiRes::time;
2394	my $data = $process->(\@data);
2395	my $t2 = Time::HiRes::time;
2396
2397	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2398
2399	db_put cache => "$id/data", $data;
2400	db_put cache => "$id/md5" , $md5;
2401	db_put cache => "$id/meta", $meta;
2402
2403	return $data;
2404	}
2405
2406	db_get cache => "$id/data"
2407	}
2408
2409	=item fork_call { }, $args
2410
2411	Executes the given code block with the given arguments in a seperate
2412	process, returning the results. Everything must be serialisable with
2413	Coro::Storable. May, of course, block. Note that the executed sub may
2414	never block itself or use any form of Event handling.
2415
2416	=cut
2417
2418	sub fork_call(&@) {
2419	my ($cb, @args) = @_;
2420
2421	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2422	# or die "socketpair: $!";
2423	pipe my $fh1, my $fh2
2424	or die "pipe: $!";
2425
2426	if (my $pid = fork) {
2427	close $fh2;
2428
2429	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2430	$res = Coro::Storable::thaw $res;
2431
2432	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2433
2434	die $$res unless "ARRAY" eq ref $res;
2435
2436	return wantarray ? @$res : $res->[-1];
2437	} else {
2438	local $SIG{__WARN__};
2439	eval {
2440	local $SIG{__DIE__};
2441	close $fh1;
2442
2443	my @res = eval { $cb->(@args) };
2444	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2445	};
2446
2447	warn $@ if $@;
2448	_exit 0;
2449	}
2450	}
2451
2452
2453
2454	#############################################################################
2455	# the server's init and main functions	2527	# the server's init and main functions
2456		2528
2457	sub load_facedata($) {	2529	sub load_facedata($) {
2458	my ($path) = @_;	2530	my ($path) = @_;
2459		2531
…		…
2529	sub reload_resources {	2601	sub reload_resources {
2530	warn "reloading resource files...\n";	2602	warn "reloading resource files...\n";
2531		2603
2532	reload_regions;	2604	reload_regions;
2533	reload_facedata;	2605	reload_facedata;
		2606	#reload_archetypes;#d#
2534	reload_archetypes;	2607	reload_archetypes;
2535	reload_treasures;	2608	reload_treasures;
2536		2609
2537	warn "finished reloading resource files\n";	2610	warn "finished reloading resource files\n";
2538	}	2611	}
…		…
2595	},	2668	},
2596	);	2669	);
2597	}	2670	}
2598	}	2671	}
2599		2672
		2673	sub write_runtime {
		2674	my $runtime = "$LOCALDIR/runtime";
		2675
		2676	# first touch the runtime file to show we are still running:
		2677	# the fsync below can take a very very long time.
		2678
		2679	IO::AIO::aio_utime $runtime, undef, undef;
		2680
		2681	my $guard = cf::lock_acquire "write_runtime";
		2682
		2683	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644
		2684	or return;
		2685
		2686	my $value = $cf::RUNTIME + 90 + 10;
		2687	# 10 is the runtime save interval, for a monotonic clock
		2688	# 60 allows for the watchdog to kill the server.
		2689
		2690	(aio_write $fh, 0, (length $value), $value, 0) <= 0
		2691	and return;
		2692
		2693	# always fsync - this file is important
		2694	aio_fsync $fh
		2695	and return;
		2696
		2697	# touch it again to show we are up-to-date
		2698	aio_utime $fh, undef, undef;
		2699
		2700	close $fh
		2701	or return;
		2702
		2703	aio_rename "$runtime~", $runtime
		2704	and return;
		2705
		2706	warn "runtime file written.\n";
		2707
		2708	1
		2709	}
		2710
2600	sub emergency_save() {	2711	sub emergency_save() {
2601	my $freeze_guard = cf::freeze_mainloop;	2712	my $freeze_guard = cf::freeze_mainloop;
2602		2713
2603	warn "enter emergency perl save\n";	2714	warn "enter emergency perl save\n";
2604		2715
…		…
2808	my $signal = new Coro::Signal;	2919	my $signal = new Coro::Signal;
2809	push @WAIT_FOR_TICK_BEGIN, $signal;	2920	push @WAIT_FOR_TICK_BEGIN, $signal;
2810	$signal->wait;	2921	$signal->wait;
2811	}	2922	}
2812		2923
		2924	my $min = 1e6;#d#
		2925	my $avg = 10;
2813	$TICK_WATCHER = Event->timer (	2926	$TICK_WATCHER = Event->timer (
2814	reentrant => 0,	2927	reentrant => 0,
2815	parked => 1,	2928	parked => 1,
2816	prio => 0,	2929	prio => 0,
2817	at => $NEXT_TICK \|\| $TICK,	2930	at => $NEXT_TICK \|\| $TICK,
…		…
2821	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	2934	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2822	unless ++$bug_warning > 10;	2935	unless ++$bug_warning > 10;
2823	return;	2936	return;
2824	}	2937	}
2825		2938
2826	$NOW = Event::time;	2939	$NOW = $tick_start = Event::time;
2827		2940
2828	cf::server_tick; # one server iteration	2941	cf::server_tick; # one server iteration
		2942
		2943	0 && sync_job {#d#
		2944	for(1..10) {
		2945	my $t = Event::time;
		2946	my $map = my $map = new_from_path cf::map "/tmp/x.map"
		2947	or die;
		2948
		2949	$map->width (50);
		2950	$map->height (50);
		2951	$map->alloc;
		2952	$map->_load_objects ("/tmp/x.map", 1);
		2953	my $t = Event::time - $t;
		2954
		2955	#next unless $t < 0.0013;#d#
		2956	if ($t < $min) {
		2957	$min = $t;
		2958	}
		2959	$avg = $avg * 0.99 + $t * 0.01;
		2960	}
		2961	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
		2962	exit 0;
		2963	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
		2964	};
2829		2965
2830	$RUNTIME += $TICK;	2966	$RUNTIME += $TICK;
2831	$NEXT_TICK += $TICK;	2967	$NEXT_TICK += $TICK;
2832		2968
2833	if ($NOW >= $NEXT_RUNTIME_WRITE) {	2969	if ($NOW >= $NEXT_RUNTIME_WRITE) {
…		…
2839	}	2975	}
2840		2976
2841	# my $AFTER = Event::time;	2977	# my $AFTER = Event::time;
2842	# warn $AFTER - $NOW;#d#	2978	# warn $AFTER - $NOW;#d#
2843		2979
		2980	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
		2981	$sig->send;
		2982	}
		2983	while (my $sig = shift @WAIT_FOR_TICK) {
		2984	$sig->send;
		2985	}
		2986
		2987	$NOW = Event::time;
		2988
2844	# if we are delayed by four ticks or more, skip them all	2989	# if we are delayed by four ticks or more, skip them all
2845	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2990	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2846		2991
2847	$TICK_WATCHER->at ($NEXT_TICK);	2992	$TICK_WATCHER->at ($NEXT_TICK);
2848	$TICK_WATCHER->start;	2993	$TICK_WATCHER->start;
2849		2994
2850	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	2995	$LOAD = ($NOW - $tick_start) / $TICK;
2851	$sig->send;	2996	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2852	}
2853	while (my $sig = shift @WAIT_FOR_TICK) {
2854	$sig->send;
2855	}
2856		2997
2857	_post_tick;	2998	_post_tick;
		2999
		3000
2858	},	3001	},
2859	);	3002	);
2860		3003
2861	{	3004	{
2862	BDB::max_poll_time $TICK * 0.1;	3005	BDB::max_poll_time $TICK * 0.1;
…		…
2921	prio => 6,	3064	prio => 6,
2922	cb => \&IO::AIO::poll_cb,	3065	cb => \&IO::AIO::poll_cb,
2923	);	3066	);
2924	}	3067	}
2925		3068
		3069	my $_log_backtrace;
		3070
		3071	sub _log_backtrace {
		3072	my ($msg, @addr) = @_;
		3073
		3074	$msg =~ s/\n//;
		3075
		3076	# limit the # of concurrent backtraces
		3077	if ($_log_backtrace < 2) {
		3078	++$_log_backtrace;
		3079	async {
		3080	my @bt = fork_call {
		3081	@addr = map { sprintf "%x", $_ } @addr;
		3082	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
		3083	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"
		3084	or die "addr2line: $!";
		3085
		3086	my @funcs;
		3087	my @res = <$fh>;
		3088	chomp for @res;
		3089	while (@res) {
		3090	my ($func, $line) = splice @res, 0, 2, ();
		3091	push @funcs, "[$func] $line";
		3092	}
		3093
		3094	@funcs
		3095	};
		3096
		3097	LOG llevInfo, "[ABT] $msg\n";
		3098	LOG llevInfo, "[ABT] $_\n" for @bt;
		3099	--$_log_backtrace;
		3100	};
		3101	} else {
		3102	LOG llevInfo, "[ABT] $msg\n";
		3103	LOG llevInfo, "[ABT] [suppressed]\n";
		3104	}
		3105	}
		3106
2926	# load additional modules	3107	# load additional modules
2927	use cf::pod;	3108	use cf::pod;
2928		3109
2929	END { cf::emergency_save }	3110	END { cf::emergency_save }
2930		3111

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.257 by root, Sat Apr 21 17:34:24 2007 UTC vs. Revision 1.282 by elmex, Tue Jun 19 18:15:34 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.257 by root, Sat Apr 21 17:34:24 2007 UTC vs.
Revision 1.282 by elmex, Tue Jun 19 18:15:34 2007 UTC