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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.299 by root, Sun Jul 8 14:56:05 2007 UTC vs.
Revision 1.363 by root, Mon Sep 10 17:24:36 2007 UTC

…		…
10	use Event;	10	use Event;
11	use Opcode;	11	use Opcode;
12	use Safe;	12	use Safe;
13	use Safe::Hole;	13	use Safe::Hole;
14		14
15	use Coro 3.61 ();	15	use Coro 3.64 ();
16	use Coro::State;	16	use Coro::State;
17	use Coro::Handle;	17	use Coro::Handle;
18	use Coro::Event;	18	use Coro::Event;
19	use Coro::Timer;	19	use Coro::Timer;
20	use Coro::Signal;	20	use Coro::Signal;
21	use Coro::Semaphore;	21	use Coro::Semaphore;
22	use Coro::AIO;	22	use Coro::AIO;
23	use Coro::Storable;	23	use Coro::Storable;
		24	use Coro::Util ();
24		25
25	use JSON::XS 1.4 ();	26	use JSON::XS ();
26	use BDB ();	27	use BDB ();
27	use Data::Dumper;	28	use Data::Dumper;
28	use Digest::MD5;	29	use Digest::MD5;
29	use Fcntl;	30	use Fcntl;
30	use YAML::Syck ();	31	use YAML::Syck ();
31	use IO::AIO 2.32 ();	32	use IO::AIO 2.32 ();
32	use Time::HiRes;	33	use Time::HiRes;
33	use Compress::LZF;	34	use Compress::LZF;
		35	use Digest::MD5 ();
34		36
35	# configure various modules to our taste	37	# configure various modules to our taste
36	#	38	#
37	$Storable::canonical = 1; # reduce rsync transfers	39	$Storable::canonical = 1; # reduce rsync transfers
38	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	40	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
…		…
78	our $NEXT_TICK;	80	our $NEXT_TICK;
79	our $NOW;	81	our $NOW;
80	our $USE_FSYNC = 1; # use fsync to write maps - default off	82	our $USE_FSYNC = 1; # use fsync to write maps - default off
81		83
82	our $BDB_POLL_WATCHER;	84	our $BDB_POLL_WATCHER;
		85	our $BDB_CHECKPOINT_WATCHER;
		86	our $BDB_TRICKLE_WATCHER;
83	our $DB_ENV;	87	our $DB_ENV;
84		88
85	our %CFG;	89	our %CFG;
86		90
87	our $UPTIME; $UPTIME \|\|= time;	91	our $UPTIME; $UPTIME \|\|= time;
88	our $RUNTIME;	92	our $RUNTIME;
89		93
90	our %PLAYER; # all users	94	our (%PLAYER, %PLAYER_LOADING); # all users
91	our %MAP; # all maps	95	our (%MAP, %MAP_LOADING ); # all maps
92	our $LINK_MAP; # the special {link} map, which is always available	96	our $LINK_MAP; # the special {link} map, which is always available
93		97
94	# used to convert map paths into valid unix filenames by replacing / by ∕	98	# used to convert map paths into valid unix filenames by replacing / by ∕
95	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	99	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96		100
…		…
166		170
167	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	171	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168	returns directly I<after> the tick processing (and consequently, can only wake one process	172	returns directly I<after> the tick processing (and consequently, can only wake one process
169	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	173	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
170		174
		175	=item @cf::INVOKE_RESULTS
		176
		177	This array contains the results of the last C<invoke ()> call. When
		178	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
		179	that call.
		180
171	=back	181	=back
172		182
173	=cut	183	=cut
174		184
175	BEGIN {	185	BEGIN {
…		…
179	$msg .= "\n"	189	$msg .= "\n"
180	unless $msg =~ /\n$/;	190	unless $msg =~ /\n$/;
181		191
182	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	192	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183		193
184	utf8::encode $msg;
185	LOG llevError, $msg;	194	LOG llevError, $msg;
186	};	195	};
187	}	196	}
188		197
189	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	198	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
264	Wait until the given lock is available and then acquires it and returns	273	Wait until the given lock is available and then acquires it and returns
265	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	274	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
266	for example when the coroutine gets canceled), the lock is automatically	275	for example when the coroutine gets canceled), the lock is automatically
267	returned.	276	returned.
268		277
		278	Locks are not recursive, locking from the same coro twice results in a
		279	deadlocked coro.
		280
269	Lock names should begin with a unique identifier (for example, cf::map::find	281	Lock names should begin with a unique identifier (for example, cf::map::find
270	uses map_find and cf::map::load uses map_load).	282	uses map_find and cf::map::load uses map_load).
271		283
272	=item $locked = cf::lock_active $string	284	=item $locked = cf::lock_active $string
273		285
274	Return true if the lock is currently active, i.e. somebody has locked it.	286	Return true if the lock is currently active, i.e. somebody has locked it.
275		287
276	=cut	288	=cut
277		289
278	our %LOCK;	290	our %LOCK;
		291	our %LOCKER;#d#
279		292
280	sub lock_wait($) {	293	sub lock_wait($) {
281	my ($key) = @_;	294	my ($key) = @_;
		295
		296	if ($LOCKER{$key} == $Coro::current) {#d#
		297	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		298	return;#d#
		299	}#d#
282		300
283	# wait for lock, if any	301	# wait for lock, if any
284	while ($LOCK{$key}) {	302	while ($LOCK{$key}) {
285	push @{ $LOCK{$key} }, $Coro::current;	303	push @{ $LOCK{$key} }, $Coro::current;
286	Coro::schedule;	304	Coro::schedule;
…		…
292		310
293	# wait, to be sure we are not locked	311	# wait, to be sure we are not locked
294	lock_wait $key;	312	lock_wait $key;
295		313
296	$LOCK{$key} = [];	314	$LOCK{$key} = [];
		315	$LOCKER{$key} = $Coro::current;#d#
297		316
298	Coro::guard {	317	Coro::guard {
		318	delete $LOCKER{$key};#d#
299	# wake up all waiters, to be on the safe side	319	# wake up all waiters, to be on the safe side
300	$_->ready for @{ delete $LOCK{$key} };	320	$_->ready for @{ delete $LOCK{$key} };
301	}	321	}
302	}	322	}
303		323
…		…
313	my $guard = Coro::guard {	333	my $guard = Coro::guard {
314	$TICK_WATCHER->start;	334	$TICK_WATCHER->start;
315	};	335	};
316	$TICK_WATCHER->stop;	336	$TICK_WATCHER->stop;
317	$guard	337	$guard
		338	}
		339
		340	=item cf::get_slot $time[, $priority[, $name]]
		341
		342	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		343	This call blocks and returns only when you have at least C<$time> seconds
		344	of cpu time till the next tick. The slot is only valid till the next cede.
		345
		346	The optional C<$name> can be used to identify the job to run. It might be
		347	used for statistical purposes and should identify the same time-class.
		348
		349	Useful for short background jobs.
		350
		351	=cut
		352
		353	our @SLOT_QUEUE;
		354	our $SLOT_QUEUE;
		355
		356	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		357	$SLOT_QUEUE = Coro::async {
		358	my $signal = new Coro::Signal;
		359
		360	while () {
		361	next_job:
		362	my $avail = cf::till_tick;
		363	if ($avail > 0.01) {
		364	for (0 .. $#SLOT_QUEUE) {
		365	if ($SLOT_QUEUE[$_][0] < $avail) {
		366	my $job = splice @SLOT_QUEUE, $_, 1, ();
		367	$job->[2]->send;
		368	Coro::cede;
		369	goto next_job;
		370	}
		371	}
		372	}
		373
		374	if (@SLOT_QUEUE) {
		375	# we do not use wait_For_tick() as it returns immediately when tick is inactive
		376	push @cf::WAIT_FOR_TICK, $signal;
		377	$signal->wait;
		378	} else {
		379	Coro::schedule;
		380	}
		381	}
		382	};
		383
		384	sub get_slot($;$$) {
		385	my ($time, $pri, $name) = @_;
		386
		387	$time = $TICK * .6 if $time > $TICK * .6;
		388	my $sig = new Coro::Signal;
		389
		390	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		391	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		392	$SLOT_QUEUE->ready;
		393	$sig->wait;
318	}	394	}
319		395
320	=item cf::async { BLOCK }	396	=item cf::async { BLOCK }
321		397
322	Currently the same as Coro::async_pool, meaning you cannot use	398	Currently the same as Coro::async_pool, meaning you cannot use
…		…
409	Coro::Storable. May, of course, block. Note that the executed sub may	485	Coro::Storable. May, of course, block. Note that the executed sub may
410	never block itself or use any form of Event handling.	486	never block itself or use any form of Event handling.
411		487
412	=cut	488	=cut
413		489
414	sub _store_scalar {
415	open my $fh, ">", \my $buf
416	or die "fork_call: cannot open fh-to-buf in child : $!";
417	Storable::store_fd $_[0], $fh;
418	close $fh;
419
420	$buf
421	}
422
423	sub fork_call(&@) {	490	sub fork_call(&@) {
424	my ($cb, @args) = @_;	491	my ($cb, @args) = @_;
425		492
426	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	493	# we seemingly have to make a local copy of the whole thing,
427	# or die "socketpair: $!";	494	# otherwise perl prematurely frees the stuff :/
428	pipe my $fh1, my $fh2	495	# TODO: investigate and fix (likely this will be rather laborious)
429	or die "pipe: $!";
430		496
431	if (my $pid = fork) {	497	my @res = Coro::Util::fork_eval {
432	close $fh2;
433
434	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
435	warn "pst<$res>" unless $res =~ /^pst/;
436	$res = Coro::Storable::thaw $res;
437
438	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
439
440	Carp::confess $$res unless "ARRAY" eq ref $res;
441
442	return wantarray ? @$res : $res->[-1];
443	} else {
444	reset_signals;	498	reset_signals;
445	local $SIG{__WARN__};	499	&$cb
446	local $SIG{__DIE__};	500	}, @args;
447	# just in case, this hack effectively disables event
448	# in the child. cleaner and slower would be canceling all watchers,
449	# but this works for the time being.
450	local $Coro::idle;
451	$Coro::current->prio (Coro::PRIO_MAX);
452		501
453	eval {	502	wantarray ? @res : $res[-1]
454	close $fh1;
455
456	my @res = eval { $cb->(@args) };
457
458	syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
459	close $fh2;
460	};
461
462	warn $@ if $@;
463	_exit 0;
464	}
465	}	503	}
466		504
467	=item $value = cf::db_get $family => $key	505	=item $value = cf::db_get $family => $key
468		506
469	Returns a single value from the environment database.	507	Returns a single value from the environment database.
…		…
471	=item cf::db_put $family => $key => $value	509	=item cf::db_put $family => $key => $value
472		510
473	Stores the given C<$value> in the family. It can currently store binary	511	Stores the given C<$value> in the family. It can currently store binary
474	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).	512	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
475		513
		514	=item $db = cf::db_table "name"
		515
		516	Create and/or open a new database table. The string must not be "db" and must be unique
		517	within each server.
		518
476	=cut	519	=cut
		520
		521	sub db_table($) {
		522	my ($name) = @_;
		523	my $db = BDB::db_create $DB_ENV;
		524
		525	eval {
		526	$db->set_flags (BDB::CHKSUM);
		527
		528	utf8::encode $name;
		529	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		530	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
		531	cf::cleanup "db_open(db): $!" if $!;
		532	};
		533	cf::cleanup "db_open(db): $@" if $@;
		534
		535	$db
		536	}
477		537
478	our $DB;	538	our $DB;
479		539
480	sub db_init {	540	sub db_init {
481	unless ($DB) {
482	$DB = BDB::db_create $DB_ENV;
483
484	cf::sync_job {	541	cf::sync_job {
485	eval {	542	$DB \|\|= db_table "db";
486	$DB->set_flags (BDB::CHKSUM);
487
488	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
489	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
490	cf::cleanup "db_open(db): $!" if $!;
491	};
492	cf::cleanup "db_open(db): $@" if $@;
493	};
494	}	543	};
495	}	544	}
496		545
497	sub db_get($$) {	546	sub db_get($$) {
498	my $key = "$_[0]/$_[1]";	547	my $key = "$_[0]/$_[1]";
499		548
…		…
549	if (1) {	598	if (1) {
550	$md5 =	599	$md5 =
551	join "\x00",	600	join "\x00",
552	$processversion,	601	$processversion,
553	map {	602	map {
554	Coro::cede;	603	cf::cede_to_tick;
555	($src->[$_], Digest::MD5::md5_hex $data[$_])	604	($src->[$_], Digest::MD5::md5_hex $data[$_])
556	} 0.. $#$src;	605	} 0.. $#$src;
557		606
558		607
559	my $dbmd5 = db_get cache => "$id/md5";	608	my $dbmd5 = db_get cache => "$id/md5";
…		…
865	";	914	";
866	die if $@;	915	die if $@;
867	}	916	}
868		917
869	our $override;	918	our $override;
870	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	919	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
871		920
872	sub override {	921	sub override {
873	$override = 1;	922	$override = 1;
874	@invoke_results = ();	923	@INVOKE_RESULTS = (@_);
875	}	924	}
876		925
877	sub do_invoke {	926	sub do_invoke {
878	my $event = shift;	927	my $event = shift;
879	my $callbacks = shift;	928	my $callbacks = shift;
880		929
881	@invoke_results = ();	930	@INVOKE_RESULTS = ();
882		931
883	local $override;	932	local $override;
884		933
885	for (@$callbacks) {	934	for (@$callbacks) {
886	eval { &{$_->[1]} };	935	eval { &{$_->[1]} };
…		…
903		952
904	Generate an object-specific event with the given arguments.	953	Generate an object-specific event with the given arguments.
905		954
906	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	955	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
907	removed in future versions), and there is no public API to access override	956	removed in future versions), and there is no public API to access override
908	results (if you must, access C<@cf::invoke_results> directly).	957	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
909		958
910	=back	959	=back
911		960
912	=cut	961	=cut
913		962
914	#############################################################################	963	#############################################################################
915	# object support	964	# object support
		965	#
		966
		967	sub _can_merge {
		968	my ($ob1, $ob2) = @_;
		969
		970	local $Storable::canonical = 1;
		971	my $fob1 = Storable::freeze $ob1;
		972	my $fob2 = Storable::freeze $ob2;
		973
		974	$fob1 eq $fob2
		975	}
916		976
917	sub reattach {	977	sub reattach {
918	# basically do the same as instantiate, without calling instantiate	978	# basically do the same as instantiate, without calling instantiate
919	my ($obj) = @_;	979	my ($obj) = @_;
920		980
…		…
965	);	1025	);
966		1026
967	sub object_freezer_save {	1027	sub object_freezer_save {
968	my ($filename, $rdata, $objs) = @_;	1028	my ($filename, $rdata, $objs) = @_;
969		1029
		1030	my $guard = cf::lock_acquire "io";
		1031
970	sync_job {	1032	sync_job {
971	if (length $$rdata) {	1033	if (length $$rdata) {
		1034	utf8::decode (my $decname = $filename);
972	warn sprintf "saving %s (%d,%d)\n",	1035	warn sprintf "saving %s (%d,%d)\n",
973	$filename, length $$rdata, scalar @$objs;	1036	$decname, length $$rdata, scalar @$objs;
974		1037
975	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1038	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
976	chmod SAVE_MODE, $fh;	1039	chmod SAVE_MODE, $fh;
977	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1040	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
978	aio_fsync $fh if $cf::USE_FSYNC;	1041	aio_fsync $fh if $cf::USE_FSYNC;
…		…
997	}	1060	}
998	} else {	1061	} else {
999	aio_unlink $filename;	1062	aio_unlink $filename;
1000	aio_unlink "$filename.pst";	1063	aio_unlink "$filename.pst";
1001	}	1064	}
1002	}	1065	};
		1066
		1067	undef $guard;
1003	}	1068	}
1004		1069
1005	sub object_freezer_as_string {	1070	sub object_freezer_as_string {
1006	my ($rdata, $objs) = @_;	1071	my ($rdata, $objs) = @_;
1007		1072
…		…
1012		1077
1013	sub object_thawer_load {	1078	sub object_thawer_load {
1014	my ($filename) = @_;	1079	my ($filename) = @_;
1015		1080
1016	my ($data, $av);	1081	my ($data, $av);
		1082
		1083	my $guard = cf::lock_acquire "io";
1017		1084
1018	(aio_load $filename, $data) >= 0	1085	(aio_load $filename, $data) >= 0
1019	or return;	1086	or return;
1020		1087
1021	unless (aio_stat "$filename.pst") {	1088	unless (aio_stat "$filename.pst") {
1022	(aio_load "$filename.pst", $av) >= 0	1089	(aio_load "$filename.pst", $av) >= 0
1023	or return;	1090	or return;
		1091
		1092	undef $guard;
1024	$av = eval { (Storable::thaw $av)->{objs} };	1093	$av = eval { (Storable::thaw $av)->{objs} };
1025	}	1094	}
1026		1095
		1096	utf8::decode (my $decname = $filename);
1027	warn sprintf "loading %s (%d)\n",	1097	warn sprintf "loading %s (%d,%d)\n",
1028	$filename, length $data, scalar @{$av \|\| []};	1098	$decname, length $data, scalar @{$av \|\| []};
		1099
1029	return ($data, $av);	1100	($data, $av)
1030	}	1101	}
1031		1102
1032	=head2 COMMAND CALLBACKS	1103	=head2 COMMAND CALLBACKS
1033		1104
1034	=over 4	1105	=over 4
…		…
1107	my ($pl, $buf) = @_;	1178	my ($pl, $buf) = @_;
1108		1179
1109	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1180	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1110		1181
1111	if (ref $msg) {	1182	if (ref $msg) {
		1183	my ($type, $reply, @payload) =
		1184	"ARRAY" eq ref $msg
		1185	? @$msg
		1186	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1187
		1188	my @reply;
		1189
1112	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1190	if (my $cb = $EXTCMD{$type}) {
1113	if (my %reply = $cb->($pl, $msg)) {	1191	@reply = $cb->($pl, @payload);
1114	$pl->ext_reply ($msg->{msgid}, %reply);
1115	}
1116	}	1192	}
		1193
		1194	$pl->ext_reply ($reply, @reply)
		1195	if $reply;
		1196
1117	} else {	1197	} else {
1118	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1198	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1119	}	1199	}
1120		1200
1121	cf::override;	1201	cf::override;
…		…
1211		1291
1212	=head3 cf::player	1292	=head3 cf::player
1213		1293
1214	=over 4	1294	=over 4
1215		1295
		1296	=item cf::player::num_playing
		1297
		1298	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1299
		1300	=cut
		1301
		1302	sub num_playing {
		1303	scalar grep
		1304	$_->ob->map
		1305	&& !$_->hidden
		1306	&& !$_->ob->flag (cf::FLAG_WIZ),
		1307	cf::player::list
		1308	}
		1309
1216	=item cf::player::find $login	1310	=item cf::player::find $login
1217		1311
1218	Returns the given player object, loading it if necessary (might block).	1312	Returns the given player object, loading it if necessary (might block).
1219		1313
1220	=cut	1314	=cut
…		…
1255	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1349	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1256	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1350	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1257	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1351	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1258	aio_unlink +(playerdir $login) . "/$login.pl";	1352	aio_unlink +(playerdir $login) . "/$login.pl";
1259		1353
1260	my $pl = load_pl path $login	1354	my $f = new_from_file cf::object::thawer path $login
1261	or return;	1355	or return;
		1356
		1357	$f->next;
		1358	my $pl = cf::player::load_pl $f
		1359	or return;
		1360	local $cf::PLAYER_LOADING{$login} = $pl;
		1361	$f->resolve_delayed_derefs;
1262	$cf::PLAYER{$login} = $pl	1362	$cf::PLAYER{$login} = $pl
1263	}	1363	}
1264	}	1364	}
1265	}	1365	}
1266		1366
…		…
1276		1376
1277	aio_mkdir playerdir $pl, 0770;	1377	aio_mkdir playerdir $pl, 0770;
1278	$pl->{last_save} = $cf::RUNTIME;	1378	$pl->{last_save} = $cf::RUNTIME;
1279		1379
1280	$pl->save_pl ($path);	1380	$pl->save_pl ($path);
1281	Coro::cede;	1381	cf::cede_to_tick;
1282	}	1382	}
1283		1383
1284	sub new($) {	1384	sub new($) {
1285	my ($login) = @_;	1385	my ($login) = @_;
1286		1386
…		…
1290	$self->{deny_save} = 1;	1390	$self->{deny_save} = 1;
1291		1391
1292	$cf::PLAYER{$login} = $self;	1392	$cf::PLAYER{$login} = $self;
1293		1393
1294	$self	1394	$self
		1395	}
		1396
		1397	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1398
		1399	=cut
		1400
		1401	sub send_msg {
		1402	my $ns = shift->ns
		1403	or return;
		1404	$ns->send_msg (@_);
1295	}	1405	}
1296		1406
1297	=item $pl->quit_character	1407	=item $pl->quit_character
1298		1408
1299	Nukes the player without looking back. If logged in, the connection will	1409	Nukes the player without looking back. If logged in, the connection will
…		…
1354	or return [];	1464	or return [];
1355		1465
1356	my @logins;	1466	my @logins;
1357		1467
1358	for my $login (@$dirs) {	1468	for my $login (@$dirs) {
		1469	my $path = path $login;
		1470
		1471	# a .pst is a dead give-away for a valid player
		1472	unless (-e "$path.pst") {
1359	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1473	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1360	aio_read $fh, 0, 512, my $buf, 0 or next;	1474	aio_read $fh, 0, 512, my $buf, 0 or next;
1361	$buf !~ /^password -------------$/m or next; # official not-valid tag	1475	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1476	}
1362		1477
1363	utf8::decode $login;	1478	utf8::decode $login;
1364	push @logins, $login;	1479	push @logins, $login;
1365	}	1480	}
1366		1481
…		…
1404	sub expand_cfpod {	1519	sub expand_cfpod {
1405	((my $self), (local $_)) = @_;	1520	((my $self), (local $_)) = @_;
1406		1521
1407	# escape & and <	1522	# escape & and <
1408	s/&/&/g;	1523	s/&/&/g;
1409	s/(?<![BIUGH])</</g;	1524	s/(?<![BIUGHT])</</g;
1410		1525
1411	# this is buggy, it needs to properly take care of nested <'s	1526	# this is buggy, it needs to properly take care of nested <'s
1412		1527
1413	1 while	1528	1 while
1414	# replace B<>, I<>, U<> etc.	1529	# replace B<>, I<>, U<> etc.
1415	s/B<([^\>]*)>/<b>$1<\/b>/	1530	s/B<([^\>]*)>/<b>$1<\/b>/
1416	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1531	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
1417	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1532	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1533	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1418	# replace G<male\|female> tags	1534	# replace G<male\|female> tags
1419	\|\| s{G<([^>\|])\\|([^>])>}{	1535	\|\| s{G<([^>\|])\\|([^>])>}{
1420	$self->gender ? $2 : $1	1536	$self->gender ? $2 : $1
1421	}ge	1537	}ge
1422	# replace H<hint text>	1538	# replace H<hint text>
…		…
1443	sub hintmode {	1559	sub hintmode {
1444	$_[0]{hintmode} = $_[1] if @_ > 1;	1560	$_[0]{hintmode} = $_[1] if @_ > 1;
1445	$_[0]{hintmode}	1561	$_[0]{hintmode}
1446	}	1562	}
1447		1563
1448	=item $player->ext_reply ($msgid, %msg)	1564	=item $player->ext_reply ($msgid, @msg)
1449		1565
1450	Sends an ext reply to the player.	1566	Sends an ext reply to the player.
1451		1567
1452	=cut	1568	=cut
1453		1569
1454	sub ext_reply($$%) {	1570	sub ext_reply($$@) {
1455	my ($self, $id, %msg) = @_;	1571	my ($self, $id, @msg) = @_;
1456		1572
1457	$msg{msgid} = $id;	1573	$self->ns->ext_reply ($id, @msg)
1458	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1459	}	1574	}
1460		1575
1461	=item $player->ext_event ($type, %msg)	1576	=item $player->ext_msg ($type, @msg)
1462		1577
1463	Sends an ext event to the client.	1578	Sends an ext event to the client.
1464		1579
1465	=cut	1580	=cut
1466		1581
1467	sub ext_event($$%) {	1582	sub ext_msg($$@) {
1468	my ($self, $type, %msg) = @_;	1583	my ($self, $type, @msg) = @_;
1469		1584
1470	$self->ns->ext_event ($type, %msg);	1585	$self->ns->ext_msg ($type, @msg);
1471	}	1586	}
1472		1587
1473	=head3 cf::region	1588	=head3 cf::region
1474		1589
1475	=over 4	1590	=over 4
…		…
1488	my ($path) = @_;	1603	my ($path) = @_;
1489		1604
1490	my ($match, $specificity);	1605	my ($match, $specificity);
1491		1606
1492	for my $region (list) {	1607	for my $region (list) {
1493	if ($region->match && $path =~ $region->match) {	1608	if ($region->{match} && $path =~ $region->{match}) {
1494	($match, $specificity) = ($region, $region->specificity)	1609	($match, $specificity) = ($region, $region->specificity)
1495	if $region->specificity > $specificity;	1610	if $region->specificity > $specificity;
1496	}	1611	}
1497	}	1612	}
1498		1613
…		…
1618	$self->init; # pass $1 etc.	1733	$self->init; # pass $1 etc.
1619	return $self;	1734	return $self;
1620	}	1735	}
1621	}	1736	}
1622		1737
1623	Carp::carp "unable to resolve path '$path' (base '$base').";	1738	Carp::cluck "unable to resolve path '$path' (base '$base').";
1624	()	1739	()
1625	}	1740	}
1626		1741
1627	sub init {	1742	sub init {
1628	my ($self) = @_;	1743	my ($self) = @_;
…		…
1691		1806
1692	sub load_header_from($) {	1807	sub load_header_from($) {
1693	my ($self, $path) = @_;	1808	my ($self, $path) = @_;
1694		1809
1695	utf8::encode $path;	1810	utf8::encode $path;
1696	#aio_open $path, O_RDONLY, 0	1811	my $f = new_from_file cf::object::thawer $path
1697	# or return;
1698
1699	$self->_load_header ($path)
1700	or return;	1812	or return;
		1813
		1814	$self->_load_header ($f)
		1815	or return;
		1816
		1817	local $MAP_LOADING{$self->{path}} = $self;
		1818	$f->resolve_delayed_derefs;
1701		1819
1702	$self->{load_path} = $path;	1820	$self->{load_path} = $path;
1703		1821
1704	1	1822	1
1705	}	1823	}
…		…
1759	sub find {	1877	sub find {
1760	my ($path, $origin) = @_;	1878	my ($path, $origin) = @_;
1761		1879
1762	$path = normalise $path, $origin && $origin->path;	1880	$path = normalise $path, $origin && $origin->path;
1763		1881
		1882	cf::lock_wait "map_data:$path";#d#remove
1764	cf::lock_wait "map_find:$path";	1883	cf::lock_wait "map_find:$path";
1765		1884
1766	$cf::MAP{$path} \|\| do {	1885	$cf::MAP{$path} \|\| do {
1767	my $guard = cf::lock_acquire "map_find:$path";	1886	my $guard1 = cf::lock_acquire "map_find:$path";
		1887	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1888
1768	my $map = new_from_path cf::map $path	1889	my $map = new_from_path cf::map $path
1769	or return;	1890	or return;
1770		1891
1771	$map->{last_save} = $cf::RUNTIME;	1892	$map->{last_save} = $cf::RUNTIME;
1772		1893
…		…
1774	or return;	1895	or return;
1775		1896
1776	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1897	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1777	# doing this can freeze the server in a sync job, obviously	1898	# doing this can freeze the server in a sync job, obviously
1778	#$cf::WAIT_FOR_TICK->wait;	1899	#$cf::WAIT_FOR_TICK->wait;
		1900	undef $guard1;
		1901	undef $guard2;
1779	$map->reset;	1902	$map->reset;
1780	undef $guard;
1781	return find $path;	1903	return find $path;
1782	}	1904	}
1783		1905
1784	$cf::MAP{$path} = $map	1906	$cf::MAP{$path} = $map
1785	}	1907	}
…		…
1794	local $self->{deny_reset} = 1; # loading can take a long time	1916	local $self->{deny_reset} = 1; # loading can take a long time
1795		1917
1796	my $path = $self->{path};	1918	my $path = $self->{path};
1797		1919
1798	{	1920	{
1799	my $guard = cf::lock_acquire "map_load:$path";	1921	my $guard = cf::lock_acquire "map_data:$path";
1800		1922
		1923	return unless $self->valid;
1801	return if $self->in_memory != cf::MAP_SWAPPED;	1924	return unless $self->in_memory == cf::MAP_SWAPPED;
1802		1925
1803	$self->in_memory (cf::MAP_LOADING);	1926	$self->in_memory (cf::MAP_LOADING);
1804		1927
1805	$self->alloc;	1928	$self->alloc;
1806		1929
1807	$self->pre_load;	1930	$self->pre_load;
1808	Coro::cede;	1931	cf::cede_to_tick;
1809		1932
		1933	my $f = new_from_file cf::object::thawer $self->{load_path};
		1934	$f->skip_block;
1810	$self->_load_objects ($self->{load_path}, 1)	1935	$self->_load_objects ($f)
1811	or return;	1936	or return;
1812		1937
1813	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1938	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1814	if delete $self->{load_original};	1939	if delete $self->{load_original};
1815		1940
1816	if (my $uniq = $self->uniq_path) {	1941	if (my $uniq = $self->uniq_path) {
1817	utf8::encode $uniq;	1942	utf8::encode $uniq;
1818	if (aio_open $uniq, O_RDONLY, 0) {	1943	unless (aio_stat $uniq) {
		1944	if (my $f = new_from_file cf::object::thawer $uniq) {
1819	$self->clear_unique_items;	1945	$self->clear_unique_items;
1820	$self->_load_objects ($uniq, 0);	1946	$self->_load_objects ($f);
		1947	$f->resolve_delayed_derefs;
		1948	}
1821	}	1949	}
1822	}	1950	}
1823		1951
1824	Coro::cede;	1952	$f->resolve_delayed_derefs;
		1953
		1954	cf::cede_to_tick;
1825	# now do the right thing for maps	1955	# now do the right thing for maps
1826	$self->link_multipart_objects;	1956	$self->link_multipart_objects;
1827	$self->difficulty ($self->estimate_difficulty)	1957	$self->difficulty ($self->estimate_difficulty)
1828	unless $self->difficulty;	1958	unless $self->difficulty;
1829	Coro::cede;	1959	cf::cede_to_tick;
1830		1960
1831	unless ($self->{deny_activate}) {	1961	unless ($self->{deny_activate}) {
1832	$self->decay_objects;	1962	$self->decay_objects;
1833	$self->fix_auto_apply;	1963	$self->fix_auto_apply;
1834	$self->update_buttons;	1964	$self->update_buttons;
1835	Coro::cede;	1965	cf::cede_to_tick;
1836	$self->set_darkness_map;	1966	$self->set_darkness_map;
1837	Coro::cede;	1967	cf::cede_to_tick;
1838	$self->activate;	1968	$self->activate;
1839	}	1969	}
		1970
		1971	$self->{last_save} = $cf::RUNTIME;
		1972	$self->last_access ($cf::RUNTIME);
1840		1973
1841	$self->in_memory (cf::MAP_IN_MEMORY);	1974	$self->in_memory (cf::MAP_IN_MEMORY);
1842	}	1975	}
1843		1976
1844	$self->post_load;	1977	$self->post_load;
…		…
1855		1988
1856	$self	1989	$self
1857	}	1990	}
1858		1991
1859	# find and load all maps in the 3x3 area around a map	1992	# find and load all maps in the 3x3 area around a map
1860	sub load_diag {	1993	sub load_neighbours {
1861	my ($map) = @_;	1994	my ($map) = @_;
1862		1995
1863	my @diag; # diagonal neighbours	1996	my @neigh; # diagonal neighbours
1864		1997
1865	for (0 .. 3) {	1998	for (0 .. 3) {
1866	my $neigh = $map->tile_path ($_)	1999	my $neigh = $map->tile_path ($_)
1867	or next;	2000	or next;
1868	$neigh = find $neigh, $map	2001	$neigh = find $neigh, $map
1869	or next;	2002	or next;
1870	$neigh->load;	2003	$neigh->load;
1871		2004
		2005	push @neigh,
1872	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2006	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1873	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2007	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1874	}	2008	}
1875		2009
1876	for (@diag) {	2010	for (grep defined $_->[0], @neigh) {
		2011	my ($path, $origin) = @$_;
1877	my $neigh = find @$_	2012	my $neigh = find $path, $origin
1878	or next;	2013	or next;
1879	$neigh->load;	2014	$neigh->load;
1880	}	2015	}
1881	}	2016	}
1882		2017
…		…
1887	}	2022	}
1888		2023
1889	sub do_load_sync {	2024	sub do_load_sync {
1890	my ($map) = @_;	2025	my ($map) = @_;
1891		2026
		2027	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2028	if $Coro::current == $Coro::main;
		2029
1892	cf::sync_job { $map->load };	2030	cf::sync_job { $map->load };
1893	}	2031	}
1894		2032
1895	our %MAP_PREFETCH;	2033	our %MAP_PREFETCH;
1896	our $MAP_PREFETCHER = undef;	2034	our $MAP_PREFETCHER = undef;
1897		2035
1898	sub find_async {	2036	sub find_async {
1899	my ($path, $origin) = @_;	2037	my ($path, $origin, $load) = @_;
1900		2038
1901	$path = normalise $path, $origin && $origin->{path};	2039	$path = normalise $path, $origin && $origin->{path};
1902		2040
1903	if (my $map = $cf::MAP{$path}) {	2041	if (my $map = $cf::MAP{$path}) {
1904	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2042	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1905	}	2043	}
1906		2044
1907	undef $MAP_PREFETCH{$path};	2045	$MAP_PREFETCH{$path} \|= $load;
		2046
1908	$MAP_PREFETCHER \|\|= cf::async {	2047	$MAP_PREFETCHER \|\|= cf::async {
1909	while (%MAP_PREFETCH) {	2048	while (%MAP_PREFETCH) {
1910	for my $path (keys %MAP_PREFETCH) {	2049	while (my ($k, $v) = each %MAP_PREFETCH) {
1911	my $map = find $path	2050	if (my $map = find $k) {
1912	or next;
1913	$map->load;	2051	$map->load if $v;
		2052	}
1914		2053
1915	delete $MAP_PREFETCH{$path};	2054	delete $MAP_PREFETCH{$k};
1916	}	2055	}
1917	}	2056	}
1918	undef $MAP_PREFETCHER;	2057	undef $MAP_PREFETCHER;
1919	};	2058	};
1920	$MAP_PREFETCHER->prio (6);	2059	$MAP_PREFETCHER->prio (6);
…		…
1923	}	2062	}
1924		2063
1925	sub save {	2064	sub save {
1926	my ($self) = @_;	2065	my ($self) = @_;
1927		2066
1928	my $lock = cf::lock_acquire "map_data:" . $self->path;	2067	my $lock = cf::lock_acquire "map_data:$self->{path}";
1929		2068
1930	$self->{last_save} = $cf::RUNTIME;	2069	$self->{last_save} = $cf::RUNTIME;
1931		2070
1932	return unless $self->dirty;	2071	return unless $self->dirty;
1933		2072
…		…
1956	my ($self) = @_;	2095	my ($self) = @_;
1957		2096
1958	# save first because save cedes	2097	# save first because save cedes
1959	$self->save;	2098	$self->save;
1960		2099
1961	my $lock = cf::lock_acquire "map_data:" . $self->path;	2100	my $lock = cf::lock_acquire "map_data:$self->{path}";
1962		2101
1963	return if $self->players;	2102	return if $self->players;
1964	return if $self->in_memory != cf::MAP_IN_MEMORY;	2103	return if $self->in_memory != cf::MAP_IN_MEMORY;
1965	return if $self->{deny_save};	2104	return if $self->{deny_save};
1966		2105
		2106	$self->in_memory (cf::MAP_SWAPPED);
		2107
		2108	$self->deactivate;
		2109	$_->clear_links_to ($self) for values %cf::MAP;
1967	$self->clear;	2110	$self->clear;
1968	$self->in_memory (cf::MAP_SWAPPED);
1969	}	2111	}
1970		2112
1971	sub reset_at {	2113	sub reset_at {
1972	my ($self) = @_;	2114	my ($self) = @_;
1973		2115
…		…
2005	if $uniq;	2147	if $uniq;
2006	}	2148	}
2007		2149
2008	delete $cf::MAP{$self->path};	2150	delete $cf::MAP{$self->path};
2009		2151
		2152	$self->deactivate;
		2153	$_->clear_links_to ($self) for values %cf::MAP;
2010	$self->clear;	2154	$self->clear;
2011
2012	$_->clear_links_to ($self) for values %cf::MAP;
2013		2155
2014	$self->unlink_save;	2156	$self->unlink_save;
2015	$self->destroy;	2157	$self->destroy;
2016	}	2158	}
2017		2159
2018	my $nuke_counter = "aaaa";	2160	my $nuke_counter = "aaaa";
2019		2161
2020	sub nuke {	2162	sub nuke {
2021	my ($self) = @_;	2163	my ($self) = @_;
2022		2164
		2165	{
		2166	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2167
2023	delete $cf::MAP{$self->path};	2168	delete $cf::MAP{$self->path};
2024		2169
2025	$self->unlink_save;	2170	$self->unlink_save;
2026		2171
2027	bless $self, "cf::map";	2172	bless $self, "cf::map";
2028	delete $self->{deny_reset};	2173	delete $self->{deny_reset};
2029	$self->{deny_save} = 1;	2174	$self->{deny_save} = 1;
2030	$self->reset_timeout (1);	2175	$self->reset_timeout (1);
2031	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2176	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2032		2177
2033	$cf::MAP{$self->path} = $self;	2178	$cf::MAP{$self->path} = $self;
		2179	}
2034		2180
2035	$self->reset; # polite request, might not happen	2181	$self->reset; # polite request, might not happen
2036	}	2182	}
2037		2183
2038	=item $maps = cf::map::tmp_maps	2184	=item $maps = cf::map::tmp_maps
…		…
2114		2260
2115	sub inv_recursive {	2261	sub inv_recursive {
2116	inv_recursive_ inv $_[0]	2262	inv_recursive_ inv $_[0]
2117	}	2263	}
2118		2264
		2265	=item $ref = $ob->ref
		2266
		2267	creates and returns a persistent reference to an objetc that can be stored as a string.
		2268
		2269	=item $ob = cf::object::deref ($refstring)
		2270
		2271	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2272	even if the object actually exists. May block.
		2273
		2274	=cut
		2275
		2276	sub deref {
		2277	my ($ref) = @_;
		2278
		2279	# temporary compatibility#TODO#remove
		2280	$ref =~ s{^<}{player/<};
		2281
		2282	if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
		2283	my ($uuid, $name) = ($1, $2);
		2284	my $pl = $cf::PLAYER_LOADING{$name} \|\| cf::player::find $name
		2285	or return;
		2286	$pl->ob->uuid eq $uuid
		2287	or return;
		2288
		2289	$pl->ob
		2290	} else {
		2291	warn "$ref: cannot resolve object reference\n";
		2292	undef
		2293	}
		2294	}
		2295
2119	package cf;	2296	package cf;
2120		2297
2121	=back	2298	=back
2122		2299
2123	=head3 cf::object::player	2300	=head3 cf::object::player
…		…
2145		2322
2146	} else {	2323	} else {
2147	my $pl = $self->contr;	2324	my $pl = $self->contr;
2148		2325
2149	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2326	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2150	my $diag = $pl->{npc_dialog};	2327	my $dialog = $pl->{npc_dialog};
2151	$diag->{pl}->ext_reply (	2328	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2152	$diag->{id},
2153	msgtype => "reply",
2154	msg => $diag->{pl}->expand_cfpod ($msg),
2155	add_topics => []
2156	);
2157		2329
2158	} else {	2330	} else {
2159	$msg = $npc->name . " says: $msg" if $npc;	2331	$msg = $npc->name . " says: $msg" if $npc;
2160	$self->message ($msg, $flags);	2332	$self->message ($msg, $flags);
2161	}	2333	}
2162	}	2334	}
		2335	}
		2336
		2337	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2338
		2339	=cut
		2340
		2341	sub cf::object::send_msg {
		2342	my $pl = shift->contr
		2343	or return;
		2344	$pl->send_msg (@_);
2163	}	2345	}
2164		2346
2165	=item $player_object->may ("access")	2347	=item $player_object->may ("access")
2166		2348
2167	Returns wether the given player is authorized to access resource "access"	2349	Returns wether the given player is authorized to access resource "access"
…		…
2246	# use -1 or undef as default coordinates, not 0, 0	2428	# use -1 or undef as default coordinates, not 0, 0
2247	($x, $y) = ($map->enter_x, $map->enter_y)	2429	($x, $y) = ($map->enter_x, $map->enter_y)
2248	if $x <=0 && $y <= 0;	2430	if $x <=0 && $y <= 0;
2249		2431
2250	$map->load;	2432	$map->load;
2251	$map->load_diag;	2433	$map->load_neighbours;
2252		2434
2253	return unless $self->contr->active;	2435	return unless $self->contr->active;
2254	$self->activate_recursive;	2436	$self->activate_recursive;
2255		2437
2256	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2438	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2257	$self->enter_map ($map, $x, $y);	2439	$self->enter_map ($map, $x, $y);
2258	}	2440	}
2259		2441
2260	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2442	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2261		2443
2262	Moves the player to the given map-path and coordinates by first freezing	2444	Moves the player to the given map-path and coordinates by first freezing
2263	her, loading and preparing them map, calling the provided $check callback	2445	her, loading and preparing them map, calling the provided $check callback
2264	that has to return the map if sucecssful, and then unfreezes the player on	2446	that has to return the map if sucecssful, and then unfreezes the player on
2265	the new (success) or old (failed) map position.	2447	the new (success) or old (failed) map position. In either case, $done will
		2448	be called at the end of this process.
2266		2449
2267	=cut	2450	=cut
2268		2451
2269	our $GOTOGEN;	2452	our $GOTOGEN;
2270		2453
2271	sub cf::object::player::goto {	2454	sub cf::object::player::goto {
2272	my ($self, $path, $x, $y, $check) = @_;	2455	my ($self, $path, $x, $y, $check, $done) = @_;
2273		2456
2274	# do generation counting so two concurrent goto's will be executed in-order	2457	# do generation counting so two concurrent goto's will be executed in-order
2275	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2458	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2276		2459
2277	$self->enter_link;	2460	$self->enter_link;
…		…
2297		2480
2298	if ($gen == $self->{_goto_generation}) {	2481	if ($gen == $self->{_goto_generation}) {
2299	delete $self->{_goto_generation};	2482	delete $self->{_goto_generation};
2300	$self->leave_link ($map, $x, $y);	2483	$self->leave_link ($map, $x, $y);
2301	}	2484	}
		2485
		2486	$done->() if $done;
2302	})->prio (1);	2487	})->prio (1);
2303	}	2488	}
2304		2489
2305	=item $player_object->enter_exit ($exit_object)	2490	=item $player_object->enter_exit ($exit_object)
2306		2491
…		…
2415		2600
2416	utf8::encode $text;	2601	utf8::encode $text;
2417	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2602	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2418	}	2603	}
2419		2604
2420	=item $client->send_msg ($color, $type, $msg, [extra...])	2605	=item $client->send_msg ($channel, $msg, $color, [extra...])
2421		2606
2422	Send a drawinfo or msg packet to the client, formatting the msg for the	2607	Send a drawinfo or msg packet to the client, formatting the msg for the
2423	client if neccessary. C<$type> should be a string identifying the type of	2608	client if neccessary. C<$type> should be a string identifying the type of
2424	the message, with C<log> being the default. If C<$color> is negative, suppress	2609	the message, with C<log> being the default. If C<$color> is negative, suppress
2425	the message unless the client supports the msg packet.	2610	the message unless the client supports the msg packet.
2426		2611
2427	=cut	2612	=cut
2428		2613
		2614	our %CHANNEL = (
		2615	"c/identify" => {
		2616	id => "identify",
		2617	title => "Identify",
		2618	reply => undef,
		2619	tooltip => "Items recently identified",
		2620	},
		2621	"c/examine" => {
		2622	id => "examine",
		2623	title => "Examine",
		2624	reply => undef,
		2625	tooltip => "Signs and other items you examined",
		2626	},
		2627	);
		2628
2429	sub cf::client::send_msg {	2629	sub cf::client::send_msg {
2430	my ($self, $color, $type, $msg, @extra) = @_;	2630	my ($self, $channel, $msg, $color, @extra) = @_;
2431		2631
2432	$msg = $self->pl->expand_cfpod ($msg);	2632	$msg = $self->pl->expand_cfpod ($msg);
2433		2633
		2634	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2635
		2636	# check predefined channels, for the benefit of C
		2637	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};
		2638
		2639	if (ref $channel) {
		2640	# send meta info to client, if not yet sent
		2641	unless (exists $self->{channel}{$channel->{id}}) {
		2642	$self->{channel}{$channel->{id}} = $channel;
		2643	$self->ext_msg (channel_info => $channel)
		2644	if $self->can_msg;
		2645	}
		2646
		2647	$channel = $channel->{id};
		2648	}
		2649
2434	return unless @extra \|\| length $msg;	2650	return unless @extra \|\| length $msg;
2435		2651
2436	if ($self->can_msg) {	2652	if ($self->can_msg) {
		2653	# default colour, mask it out
		2654	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
		2655	if $color & cf::NDI_DEF;
		2656
2437	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));	2657	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2658	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2438	} else {	2659	} else {
2439	# replace some tags by gcfclient-compatible ones
2440	for ($msg) {
2441	1 while
2442	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2443	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2444	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2445	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2446	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2447	}
2448
2449	if ($color >= 0) {	2660	if ($color >= 0) {
		2661	# replace some tags by gcfclient-compatible ones
		2662	for ($msg) {
		2663	1 while
		2664	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2665	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2666	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2667	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2668	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2669	}
		2670
		2671	$color &= cf::NDI_COLOR_MASK;
		2672
		2673	utf8::encode $msg;
		2674
2450	if (0 && $msg =~ /\[/) {	2675	if (0 && $msg =~ /\[/) {
		2676	# COMMAND/INFO
2451	$self->send_packet ("drawextinfo $color 4 0 $msg")	2677	$self->send_packet ("drawextinfo $color 10 8 $msg")
2452	} else {	2678	} else {
2453	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2679	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2454	$self->send_packet ("drawinfo $color $msg")	2680	$self->send_packet ("drawinfo $color $msg")
2455	}	2681	}
2456	}	2682	}
2457	}	2683	}
2458	}	2684	}
2459		2685
2460	=item $client->ext_event ($type, %msg)	2686	=item $client->ext_msg ($type, @msg)
2461		2687
2462	Sends an ext event to the client.	2688	Sends an ext event to the client.
2463		2689
2464	=cut	2690	=cut
2465		2691
2466	sub cf::client::ext_event($$%) {	2692	sub cf::client::ext_msg($$@) {
2467	my ($self, $type, %msg) = @_;	2693	my ($self, $type, @msg) = @_;
2468		2694
		2695	if ($self->extcmd == 2) {
		2696	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2697	} elsif ($self->extcmd == 1) { # TODO: remove
2469	$msg{msgtype} = "event_$type";	2698	push @msg, msgtype => "event_$type";
2470	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2699	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2700	}
		2701	}
		2702
		2703	=item $client->ext_reply ($msgid, @msg)
		2704
		2705	Sends an ext reply to the client.
		2706
		2707	=cut
		2708
		2709	sub cf::client::ext_reply($$@) {
		2710	my ($self, $id, @msg) = @_;
		2711
		2712	if ($self->extcmd == 2) {
		2713	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2714	} elsif ($self->extcmd == 1) {
		2715	#TODO: version 1, remove
		2716	unshift @msg, msgtype => "reply", msgid => $id;
		2717	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2718	}
2471	}	2719	}
2472		2720
2473	=item $success = $client->query ($flags, "text", \&cb)	2721	=item $success = $client->query ($flags, "text", \&cb)
2474		2722
2475	Queues a query to the client, calling the given callback with	2723	Queues a query to the client, calling the given callback with
…		…
2530	my ($ns, $buf) = @_;	2778	my ($ns, $buf) = @_;
2531		2779
2532	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2780	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2533		2781
2534	if (ref $msg) {	2782	if (ref $msg) {
		2783	my ($type, $reply, @payload) =
		2784	"ARRAY" eq ref $msg
		2785	? @$msg
		2786	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2787
		2788	my @reply;
		2789
2535	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2790	if (my $cb = $EXTICMD{$type}) {
2536	if (my %reply = $cb->($ns, $msg)) {	2791	@reply = $cb->($ns, @payload);
2537	$reply{msgid} = $msg->{msgid};
2538	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2539	}
2540	}	2792	}
		2793
		2794	$ns->ext_reply ($reply, @reply)
		2795	if $reply;
		2796
2541	} else {	2797	} else {
2542	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2798	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2543	}	2799	}
2544		2800
2545	cf::override;	2801	cf::override;
…		…
2592	our $safe = new Safe "safe";	2848	our $safe = new Safe "safe";
2593	our $safe_hole = new Safe::Hole;	2849	our $safe_hole = new Safe::Hole;
2594		2850
2595	$SIG{FPE} = 'IGNORE';	2851	$SIG{FPE} = 'IGNORE';
2596		2852
2597	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2853	$safe->permit_only (Opcode::opset qw(
		2854	:base_core :base_mem :base_orig :base_math
		2855	grepstart grepwhile mapstart mapwhile
		2856	sort time
		2857	));
2598		2858
2599	# here we export the classes and methods available to script code	2859	# here we export the classes and methods available to script code
2600		2860
2601	=pod	2861	=pod
2602		2862
2603	The following functions and methods are available within a safe environment:	2863	The following functions and methods are available within a safe environment:
2604		2864
2605	cf::object	2865	cf::object
2606	contr pay_amount pay_player map x y force_find force_add	2866	contr pay_amount pay_player map x y force_find force_add
2607	insert remove	2867	insert remove name archname title slaying race decrease_ob_nr
2608		2868
2609	cf::object::player	2869	cf::object::player
2610	player	2870	player
2611		2871
2612	cf::player	2872	cf::player
…		…
2617		2877
2618	=cut	2878	=cut
2619		2879
2620	for (	2880	for (
2621	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	2881	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2882	insert remove inv name archname title slaying race
2622	insert remove)],	2883	decrease_ob_nr)],
2623	["cf::object::player" => qw(player)],	2884	["cf::object::player" => qw(player)],
2624	["cf::player" => qw(peaceful)],	2885	["cf::player" => qw(peaceful)],
2625	["cf::map" => qw(trigger)],	2886	["cf::map" => qw(trigger)],
2626	) {	2887	) {
2627	no strict 'refs';	2888	no strict 'refs';
…		…
2703	# the server's init and main functions	2964	# the server's init and main functions
2704		2965
2705	sub load_facedata($) {	2966	sub load_facedata($) {
2706	my ($path) = @_;	2967	my ($path) = @_;
2707		2968
		2969	# HACK to clear player env face cache, we need some signal framework
		2970	# for this (global event?)
		2971	%ext::player_env::MUSIC_FACE_CACHE = ();
		2972
		2973	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		2974
2708	warn "loading facedata from $path\n";	2975	warn "loading facedata from $path\n";
2709		2976
2710	my $facedata;	2977	my $facedata;
2711	0 < aio_load $path, $facedata	2978	0 < aio_load $path, $facedata
2712	or die "$path: $!";	2979	or die "$path: $!";
…		…
2714	$facedata = Coro::Storable::thaw $facedata;	2981	$facedata = Coro::Storable::thaw $facedata;
2715		2982
2716	$facedata->{version} == 2	2983	$facedata->{version} == 2
2717	or cf::cleanup "$path: version mismatch, cannot proceed.";	2984	or cf::cleanup "$path: version mismatch, cannot proceed.";
2718		2985
		2986	# patch in the exptable
		2987	$facedata->{resource}{"res/exp_table"} = {
		2988	type => FT_RSRC,
		2989	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		2990	};
		2991	cf::cede_to_tick;
		2992
2719	{	2993	{
2720	my $faces = $facedata->{faceinfo};	2994	my $faces = $facedata->{faceinfo};
2721		2995
2722	while (my ($face, $info) = each %$faces) {	2996	while (my ($face, $info) = each %$faces) {
2723	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	2997	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2724	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	2998	cf::face::set_visibility $idx, $info->{visibility};
		2999	cf::face::set_magicmap $idx, $info->{magicmap};
2725	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3000	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2726	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3001	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2727	Coro::cede;	3002
		3003	cf::cede_to_tick;
2728	}	3004	}
2729		3005
2730	while (my ($face, $info) = each %$faces) {	3006	while (my ($face, $info) = each %$faces) {
2731	next unless $info->{smooth};	3007	next unless $info->{smooth};
2732	my $idx = cf::face::find $face	3008	my $idx = cf::face::find $face
2733	or next;	3009	or next;
2734	if (my $smooth = cf::face::find $info->{smooth}) {	3010	if (my $smooth = cf::face::find $info->{smooth}) {
		3011	cf::face::set_smooth $idx, $smooth;
2735	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3012	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2736	} else {	3013	} else {
2737	warn "smooth face '$info->{smooth}' not found for face '$face'";	3014	warn "smooth face '$info->{smooth}' not found for face '$face'";
2738	}	3015	}
2739	Coro::cede;	3016
		3017	cf::cede_to_tick;
2740	}	3018	}
2741	}	3019	}
2742		3020
2743	{	3021	{
2744	my $anims = $facedata->{animinfo};	3022	my $anims = $facedata->{animinfo};
2745		3023
2746	while (my ($anim, $info) = each %$anims) {	3024	while (my ($anim, $info) = each %$anims) {
2747	cf::anim::set $anim, $info->{frames}, $info->{facings};	3025	cf::anim::set $anim, $info->{frames}, $info->{facings};
2748	Coro::cede;	3026	cf::cede_to_tick;
2749	}	3027	}
2750		3028
2751	cf::anim::invalidate_all; # d'oh	3029	cf::anim::invalidate_all; # d'oh
2752	}	3030	}
2753		3031
		3032	{
		3033	# TODO: for gcfclient pleasure, we should give resources
		3034	# that gcfclient doesn't grok a >10000 face index.
		3035	my $res = $facedata->{resource};
		3036
		3037	my $soundconf = delete $res->{"res/sound.conf"};
		3038
		3039	while (my ($name, $info) = each %$res) {
		3040	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		3041	my $data;
		3042
		3043	if ($info->{type} & 1) {
		3044	# prepend meta info
		3045
		3046	my $meta = $enc->encode ({
		3047	name => $name,
		3048	%{ $info->{meta} \|\| {} },
		3049	});
		3050
		3051	$data = pack "(w/a)", $meta, $info->{data};
		3052	} else {
		3053	$data = $info->{data};
		3054	}
		3055
		3056	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3057	cf::face::set_type $idx, $info->{type};
		3058
		3059	cf::cede_to_tick;
		3060	}
		3061
		3062	if ($soundconf) {
		3063	$soundconf = $enc->decode (delete $soundconf->{data});
		3064
		3065	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3066	my $sound = $soundconf->{compat}[$_]
		3067	or next;
		3068
		3069	my $face = cf::face::find "sound/$sound->[1]";
		3070	cf::sound::set $sound->[0] => $face;
		3071	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3072	}
		3073
		3074	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3075	my $face = cf::face::find "sound/$v";
		3076	cf::sound::set $k => $face;
		3077	}
		3078	}
		3079	}
		3080
2754	1	3081	1
2755	}	3082	}
2756		3083
		3084	register_exticmd fx_want => sub {
		3085	my ($ns, $want) = @_;
		3086
		3087	while (my ($k, $v) = each %$want) {
		3088	$ns->fx_want ($k, $v);
		3089	}
		3090	};
		3091
2757	sub reload_regions {	3092	sub reload_regions {
		3093	# HACK to clear player env face cache, we need some signal framework
		3094	# for this (global event?)
		3095	%ext::player_env::MUSIC_FACE_CACHE = ();
		3096
2758	load_resource_file "$MAPDIR/regions"	3097	load_resource_file "$MAPDIR/regions"
2759	or die "unable to load regions file\n";	3098	or die "unable to load regions file\n";
		3099
		3100	for (cf::region::list) {
		3101	$_->{match} = qr/$_->{match}/
		3102	if exists $_->{match};
		3103	}
2760	}	3104	}
2761		3105
2762	sub reload_facedata {	3106	sub reload_facedata {
2763	load_facedata "$DATADIR/facedata"	3107	load_facedata "$DATADIR/facedata"
2764	or die "unable to load facedata\n";	3108	or die "unable to load facedata\n";
…		…
2793		3137
2794	sub init {	3138	sub init {
2795	reload_resources;	3139	reload_resources;
2796	}	3140	}
2797		3141
2798	sub cfg_load {	3142	sub reload_config {
2799	open my $fh, "<:utf8", "$CONFDIR/config"	3143	open my $fh, "<:utf8", "$CONFDIR/config"
2800	or return;	3144	or return;
2801		3145
2802	local $/;	3146	local $/;
2803	*CFG = YAML::Syck::Load <$fh>;	3147	*CFG = YAML::Syck::Load <$fh>;
…		…
2823	(async {	3167	(async {
2824	Event::one_event;	3168	Event::one_event;
2825	})->prio (Coro::PRIO_MAX);	3169	})->prio (Coro::PRIO_MAX);
2826	};	3170	};
2827		3171
2828	cfg_load;	3172	reload_config;
2829	db_init;	3173	db_init;
2830	load_extensions;	3174	load_extensions;
2831		3175
2832	$TICK_WATCHER->start;	3176	$TICK_WATCHER->start;
2833	Event::loop;	3177	Event::loop;
…		…
3026	warn "reloading cf.pm";	3370	warn "reloading cf.pm";
3027	require cf;	3371	require cf;
3028	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3372	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3029		3373
3030	warn "loading config and database again";	3374	warn "loading config and database again";
3031	cf::cfg_load;	3375	cf::reload_config;
3032		3376
3033	warn "loading extensions";	3377	warn "loading extensions";
3034	cf::load_extensions;	3378	cf::load_extensions;
3035		3379
3036	warn "reattaching attachments to objects/players";	3380	warn "reattaching attachments to objects/players";
…		…
3129	or die;	3473	or die;
3130		3474
3131	$map->width (50);	3475	$map->width (50);
3132	$map->height (50);	3476	$map->height (50);
3133	$map->alloc;	3477	$map->alloc;
3134	$map->_load_objects ("/tmp/x.map", 1);	3478	$map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3135	my $t = Event::time - $t;	3479	my $t = Event::time - $t;
3136		3480
3137	#next unless $t < 0.0013;#d#	3481	#next unless $t < 0.0013;#d#
3138	if ($t < $min) {	3482	if ($t < $min) {
3139	$min = $t;	3483	$min = $t;
…		…
3182		3526
3183	},	3527	},
3184	);	3528	);
3185		3529
3186	{	3530	{
		3531	BDB::min_parallel 8;
3187	BDB::max_poll_time $TICK * 0.1;	3532	BDB::max_poll_time $TICK * 0.1;
3188	$BDB_POLL_WATCHER = Event->io (	3533	$BDB_POLL_WATCHER = Event->io (
3189	reentrant => 0,	3534	reentrant => 0,
3190	fd => BDB::poll_fileno,	3535	fd => BDB::poll_fileno,
3191	poll => 'r',	3536	poll => 'r',
3192	prio => 0,	3537	prio => 0,
3193	data => WF_AUTOCANCEL,	3538	data => WF_AUTOCANCEL,
3194	cb => \&BDB::poll_cb,	3539	cb => \&BDB::poll_cb,
3195	);	3540	);
3196	BDB::min_parallel 8;
3197		3541
3198	BDB::set_sync_prepare {	3542	BDB::set_sync_prepare {
3199	my $status;	3543	my $status;
3200	my $current = $Coro::current;	3544	my $current = $Coro::current;
3201	(	3545	(
…		…
3222	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3566	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3223	0666;	3567	0666;
3224		3568
3225	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3569	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3226		3570
3227	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);	3571	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC
		3572	\| BDB::LOG_AUTOREMOVE, 1);
3228	$DB_ENV->set_lk_detect;	3573	$DB_ENV->set_lk_detect;
3229	};	3574	};
3230		3575
3231	cf::cleanup "db_env_open(db): $@" if $@;	3576	cf::cleanup "db_env_open(db): $@" if $@;
3232	};	3577	};
3233	}	3578	}
		3579
		3580	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3581	after => 11,
		3582	interval => 60,
		3583	hard => 1,
		3584	prio => 0,
		3585	data => WF_AUTOCANCEL,
		3586	cb => sub {
		3587	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3588	},
		3589	);
		3590	$BDB_TRICKLE_WATCHER = Event->timer (
		3591	after => 5,
		3592	interval => 10,
		3593	hard => 1,
		3594	prio => 0,
		3595	data => WF_AUTOCANCEL,
		3596	cb => sub {
		3597	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3598	},
		3599	);
3234	}	3600	}
3235		3601
3236	{	3602	{
3237	IO::AIO::min_parallel 8;	3603	IO::AIO::min_parallel 8;
3238		3604

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.299 by root, Sun Jul 8 14:56:05 2007 UTC vs. Revision 1.363 by root, Mon Sep 10 17:24:36 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.299 by root, Sun Jul 8 14:56:05 2007 UTC vs.
Revision 1.363 by root, Mon Sep 10 17:24:36 2007 UTC