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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.280 by root, Sat Jun 16 14:35:41 2007 UTC vs.
Revision 1.311 by root, Fri Jul 20 16:11:10 2007 UTC

…		…
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		24
		25	use JSON::XS 1.4 ();
25	use BDB ();	26	use BDB ();
26	use Data::Dumper;	27	use Data::Dumper;
27	use Digest::MD5;	28	use Digest::MD5;
28	use Fcntl;	29	use Fcntl;
29	use YAML::Syck ();	30	use YAML::Syck ();
30	use IO::AIO 2.32 ();	31	use IO::AIO 2.32 ();
31	use Time::HiRes;	32	use Time::HiRes;
32	use Compress::LZF;	33	use Compress::LZF;
		34	use Digest::MD5 ();
33		35
34	# configure various modules to our taste	36	# configure various modules to our taste
35	#	37	#
36	$Storable::canonical = 1; # reduce rsync transfers	38	$Storable::canonical = 1; # reduce rsync transfers
37	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	39	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
…		…
49	our %COMMAND = ();	51	our %COMMAND = ();
50	our %COMMAND_TIME = ();	52	our %COMMAND_TIME = ();
51		53
52	our @EXTS = (); # list of extension package names	54	our @EXTS = (); # list of extension package names
53	our %EXTCMD = ();	55	our %EXTCMD = ();
		56	our %EXTICMD = ();
54	our %EXT_CORO = (); # coroutines bound to extensions	57	our %EXT_CORO = (); # coroutines bound to extensions
55	our %EXT_MAP = (); # pluggable maps	58	our %EXT_MAP = (); # pluggable maps
56		59
57	our $RELOAD; # number of reloads so far	60	our $RELOAD; # number of reloads so far
58	our @EVENT;	61	our @EVENT;
…		…
164		167
165	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	168	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166	returns directly I<after> the tick processing (and consequently, can only wake one process	169	returns directly I<after> the tick processing (and consequently, can only wake one process
167	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	170	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168		171
		172	=item @cf::INVOKE_RESULTS
		173
		174	This array contains the results of the last C<invoke ()> call. When
		175	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
		176	that call.
		177
169	=back	178	=back
170		179
171	=cut	180	=cut
172		181
173	BEGIN {	182	BEGIN {
…		…
206	}	215	}
207		216
208	$Event::DIED = sub {	217	$Event::DIED = sub {
209	warn "error in event callback: @_";	218	warn "error in event callback: @_";
210	};	219	};
		220
		221	#############################################################################
211		222
212	=head2 UTILITY FUNCTIONS	223	=head2 UTILITY FUNCTIONS
213		224
214	=over 4	225	=over 4
215		226
…		…
234	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	245	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
235	$d	246	$d
236	} \|\| "[unable to dump $_[0]: '$@']";	247	} \|\| "[unable to dump $_[0]: '$@']";
237	}	248	}
238		249
239	use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
240
241	=item $ref = cf::from_json $json	250	=item $ref = cf::from_json $json
242		251
243	Converts a JSON string into the corresponding perl data structure.	252	Converts a JSON string into the corresponding perl data structure.
244		253
245	=item $json = cf::to_json $ref	254	=item $json = cf::to_json $ref
246		255
247	Converts a perl data structure into its JSON representation.	256	Converts a perl data structure into its JSON representation.
		257
		258	=cut
		259
		260	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
		261
		262	sub to_json ($) { $json_coder->encode ($_[0]) }
		263	sub from_json ($) { $json_coder->decode ($_[0]) }
248		264
249	=item cf::lock_wait $string	265	=item cf::lock_wait $string
250		266
251	Wait until the given lock is available. See cf::lock_acquire.	267	Wait until the given lock is available. See cf::lock_acquire.
252		268
…		…
318		334
319	BEGIN { *async = \&Coro::async_pool }	335	BEGIN { *async = \&Coro::async_pool }
320		336
321	=item cf::sync_job { BLOCK }	337	=item cf::sync_job { BLOCK }
322		338
323	The design of crossfire+ requires that the main coro ($Coro::main) is	339	The design of Crossfire TRT requires that the main coroutine ($Coro::main)
324	always able to handle events or runnable, as crossfire+ is only partly	340	is always able to handle events or runnable, as Crossfire TRT is only
325	reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.	341	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
		342	acceptable.
326		343
327	If it must be done, put the blocking parts into C<sync_job>. This will run	344	If it must be done, put the blocking parts into C<sync_job>. This will run
328	the given BLOCK in another coroutine while waiting for the result. The	345	the given BLOCK in another coroutine while waiting for the result. The
329	server will be frozen during this time, so the block should either finish	346	server will be frozen during this time, so the block should either finish
330	fast or be very important.	347	fast or be very important.
…		…
390	$EXT_CORO{$coro+0} = $coro;	407	$EXT_CORO{$coro+0} = $coro;
391		408
392	$coro	409	$coro
393	}	410	}
394		411
395	sub write_runtime {	412	=item fork_call { }, $args
396	my $runtime = "$LOCALDIR/runtime";
397		413
398	# first touch the runtime file to show we are still running:	414	Executes the given code block with the given arguments in a seperate
399	# the fsync below can take a very very long time.	415	process, returning the results. Everything must be serialisable with
		416	Coro::Storable. May, of course, block. Note that the executed sub may
		417	never block itself or use any form of Event handling.
400		418
401	IO::AIO::aio_utime $runtime, undef, undef;	419	=cut
402		420
403	my $guard = cf::lock_acquire "write_runtime";	421	sub _store_scalar {
404		422	open my $fh, ">", \my $buf
405	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644	423	or die "fork_call: cannot open fh-to-buf in child : $!";
406	or return;	424	Storable::store_fd $_[0], $fh;
407
408	my $value = $cf::RUNTIME + 90 + 10;
409	# 10 is the runtime save interval, for a monotonic clock
410	# 60 allows for the watchdog to kill the server.
411
412	(aio_write $fh, 0, (length $value), $value, 0) <= 0
413	and return;
414
415	# always fsync - this file is important
416	aio_fsync $fh
417	and return;
418
419	# touch it again to show we are up-to-date
420	aio_utime $fh, undef, undef;
421
422	close $fh	425	close $fh;
423	or return;
424		426
425	aio_rename "$runtime~", $runtime	427	$buf
426	and return;	428	}
427		429
428	warn "runtime file written.\n";	430	sub fork_call(&@) {
		431	my ($cb, @args) = @_;
429		432
		433	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
		434	# or die "socketpair: $!";
		435	pipe my $fh1, my $fh2
		436	or die "pipe: $!";
		437
		438	if (my $pid = fork) {
		439	close $fh2;
		440
		441	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
		442	warn "pst<$res>" unless $res =~ /^pst/;
		443	$res = Coro::Storable::thaw $res;
		444
		445	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
		446
		447	Carp::confess $$res unless "ARRAY" eq ref $res;
		448
		449	return wantarray ? @$res : $res->[-1];
		450	} else {
		451	reset_signals;
		452	local $SIG{__WARN__};
		453	local $SIG{__DIE__};
		454	# just in case, this hack effectively disables event
		455	# in the child. cleaner and slower would be canceling all watchers,
		456	# but this works for the time being.
		457	local $Coro::idle;
		458	$Coro::current->prio (Coro::PRIO_MAX);
		459
		460	eval {
		461	close $fh1;
		462
		463	my @res = eval { $cb->(@args) };
		464
		465	syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
		466	close $fh2;
		467	};
		468
		469	warn $@ if $@;
		470	_exit 0;
430	1	471	}
		472	}
		473
		474	=item $value = cf::db_get $family => $key
		475
		476	Returns a single value from the environment database.
		477
		478	=item cf::db_put $family => $key => $value
		479
		480	Stores the given C<$value> in the family. It can currently store binary
		481	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
		482
		483	=cut
		484
		485	our $DB;
		486
		487	sub db_init {
		488	unless ($DB) {
		489	$DB = BDB::db_create $DB_ENV;
		490
		491	cf::sync_job {
		492	eval {
		493	$DB->set_flags (BDB::CHKSUM);
		494
		495	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
		496	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
		497	cf::cleanup "db_open(db): $!" if $!;
		498	};
		499	cf::cleanup "db_open(db): $@" if $@;
		500	};
		501	}
		502	}
		503
		504	sub db_get($$) {
		505	my $key = "$_[0]/$_[1]";
		506
		507	cf::sync_job {
		508	BDB::db_get $DB, undef, $key, my $data;
		509
		510	$! ? ()
		511	: $data
		512	}
		513	}
		514
		515	sub db_put($$$) {
		516	BDB::dbreq_pri 4;
		517	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
		518	}
		519
		520	=item cf::cache $id => [$paths...], $processversion => $process
		521
		522	Generic caching function that returns the value of the resource $id,
		523	caching and regenerating as required.
		524
		525	This function can block.
		526
		527	=cut
		528
		529	sub cache {
		530	my ($id, $src, $processversion, $process) = @_;
		531
		532	my $meta =
		533	join "\x00",
		534	$processversion,
		535	map {
		536	aio_stat $_
		537	and Carp::croak "$_: $!";
		538
		539	($_, (stat _)[7,9])
		540	} @$src;
		541
		542	my $dbmeta = db_get cache => "$id/meta";
		543	if ($dbmeta ne $meta) {
		544	# changed, we may need to process
		545
		546	my @data;
		547	my $md5;
		548
		549	for (0 .. $#$src) {
		550	0 <= aio_load $src->[$_], $data[$_]
		551	or Carp::croak "$src->[$_]: $!";
		552	}
		553
		554	# if processing is expensive, check
		555	# checksum first
		556	if (1) {
		557	$md5 =
		558	join "\x00",
		559	$processversion,
		560	map {
		561	Coro::cede;
		562	($src->[$_], Digest::MD5::md5_hex $data[$_])
		563	} 0.. $#$src;
		564
		565
		566	my $dbmd5 = db_get cache => "$id/md5";
		567	if ($dbmd5 eq $md5) {
		568	db_put cache => "$id/meta", $meta;
		569
		570	return db_get cache => "$id/data";
		571	}
		572	}
		573
		574	my $t1 = Time::HiRes::time;
		575	my $data = $process->(\@data);
		576	my $t2 = Time::HiRes::time;
		577
		578	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
		579
		580	db_put cache => "$id/data", $data;
		581	db_put cache => "$id/md5" , $md5;
		582	db_put cache => "$id/meta", $meta;
		583
		584	return $data;
		585	}
		586
		587	db_get cache => "$id/data"
431	}	588	}
432		589
433	=item cf::datalog type => key => value, ...	590	=item cf::datalog type => key => value, ...
434		591
435	Log a datalog packet of the given type with the given key-value pairs.	592	Log a datalog packet of the given type with the given key-value pairs.
…		…
453	attach callbacks/event handlers (a collection of which is called an "attachment")	610	attach callbacks/event handlers (a collection of which is called an "attachment")
454	to it. All such attachable objects support the following methods.	611	to it. All such attachable objects support the following methods.
455		612
456	In the following description, CLASS can be any of C<global>, C<object>	613	In the following description, CLASS can be any of C<global>, C<object>
457	C<player>, C<client> or C<map> (i.e. the attachable objects in	614	C<player>, C<client> or C<map> (i.e. the attachable objects in
458	crossfire+).	615	Crossfire TRT).
459		616
460	=over 4	617	=over 4
461		618
462	=item $attachable->attach ($attachment, key => $value...)	619	=item $attachable->attach ($attachment, key => $value...)
463		620
…		…
715	";	872	";
716	die if $@;	873	die if $@;
717	}	874	}
718		875
719	our $override;	876	our $override;
720	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	877	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
721		878
722	sub override {	879	sub override {
723	$override = 1;	880	$override = 1;
724	@invoke_results = ();	881	@INVOKE_RESULTS = (@_);
725	}	882	}
726		883
727	sub do_invoke {	884	sub do_invoke {
728	my $event = shift;	885	my $event = shift;
729	my $callbacks = shift;	886	my $callbacks = shift;
730		887
731	@invoke_results = ();	888	@INVOKE_RESULTS = ();
732		889
733	local $override;	890	local $override;
734		891
735	for (@$callbacks) {	892	for (@$callbacks) {
736	eval { &{$_->[1]} };	893	eval { &{$_->[1]} };
…		…
753		910
754	Generate an object-specific event with the given arguments.	911	Generate an object-specific event with the given arguments.
755		912
756	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	913	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
757	removed in future versions), and there is no public API to access override	914	removed in future versions), and there is no public API to access override
758	results (if you must, access C<@cf::invoke_results> directly).	915	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
759		916
760	=back	917	=back
761		918
762	=cut	919	=cut
763		920
…		…
877	warn sprintf "loading %s (%d)\n",	1034	warn sprintf "loading %s (%d)\n",
878	$filename, length $data, scalar @{$av \|\| []};	1035	$filename, length $data, scalar @{$av \|\| []};
879	return ($data, $av);	1036	return ($data, $av);
880	}	1037	}
881		1038
		1039	=head2 COMMAND CALLBACKS
		1040
		1041	=over 4
		1042
		1043	=cut
		1044
882	#############################################################################	1045	#############################################################################
883	# command handling &c	1046	# command handling &c
884		1047
885	=item cf::register_command $name => \&callback($ob,$args);	1048	=item cf::register_command $name => \&callback($ob,$args);
886		1049
…		…
898	push @{ $COMMAND{$name} }, [$caller, $cb];	1061	push @{ $COMMAND{$name} }, [$caller, $cb];
899	}	1062	}
900		1063
901	=item cf::register_extcmd $name => \&callback($pl,$packet);	1064	=item cf::register_extcmd $name => \&callback($pl,$packet);
902		1065
903	Register a callbackf ro execution when the client sends an extcmd packet.	1066	Register a callback for execution when the client sends an (synchronous)
		1067	extcmd packet. Ext commands will be processed in the order they are
		1068	received by the server, like other user commands. The first argument is
		1069	the logged-in player. Ext commands can only be processed after a player
		1070	has logged in successfully.
904		1071
905	If the callback returns something, it is sent back as if reply was being	1072	If the callback returns something, it is sent back as if reply was being
906	called.	1073	called.
907		1074
		1075	=item cf::register_exticmd $name => \&callback($ns,$packet);
		1076
		1077	Register a callback for execution when the client sends an (asynchronous)
		1078	exticmd packet. Exti commands are processed by the server as soon as they
		1079	are received, i.e. out of order w.r.t. other commands. The first argument
		1080	is a client socket. Exti commands can be received anytime, even before
		1081	log-in.
		1082
		1083	If the callback returns something, it is sent back as if reply was being
		1084	called.
		1085
908	=cut	1086	=cut
909		1087
910	sub register_extcmd {	1088	sub register_extcmd {
911	my ($name, $cb) = @_;	1089	my ($name, $cb) = @_;
912		1090
913	$EXTCMD{$name} = $cb;	1091	$EXTCMD{$name} = $cb;
		1092	}
		1093
		1094	sub register_exticmd {
		1095	my ($name, $cb) = @_;
		1096
		1097	$EXTICMD{$name} = $cb;
914	}	1098	}
915		1099
916	cf::player->attach (	1100	cf::player->attach (
917	on_command => sub {	1101	on_command => sub {
918	my ($pl, $name, $params) = @_;	1102	my ($pl, $name, $params) = @_;
…		…
927	cf::override;	1111	cf::override;
928	},	1112	},
929	on_extcmd => sub {	1113	on_extcmd => sub {
930	my ($pl, $buf) = @_;	1114	my ($pl, $buf) = @_;
931		1115
932	my $msg = eval { from_json $buf };	1116	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
933		1117
934	if (ref $msg) {	1118	if (ref $msg) {
935	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1119	if (my $cb = $EXTCMD{$msg->{msgtype}}) {
936	if (my %reply = $cb->($pl, $msg)) {	1120	if (my %reply = $cb->($pl, $msg)) {
937	$pl->ext_reply ($msg->{msgid}, %reply);	1121	$pl->ext_reply ($msg->{msgid}, %reply);
…		…
1018	};	1202	};
1019	}	1203	}
1020		1204
1021	#############################################################################	1205	#############################################################################
1022		1206
		1207	=back
		1208
1023	=head2 CORE EXTENSIONS	1209	=head2 CORE EXTENSIONS
1024		1210
1025	Functions and methods that extend core crossfire objects.	1211	Functions and methods that extend core crossfire objects.
1026		1212
1027	=cut	1213	=cut
…		…
1214	}	1400	}
1215		1401
1216	\@paths	1402	\@paths
1217	}	1403	}
1218		1404
		1405	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
		1406
		1407	Expand crossfire pod fragments into protocol xml.
		1408
		1409	=cut
		1410
		1411	sub expand_cfpod {
		1412	((my $self), (local $_)) = @_;
		1413
		1414	# escape & and <
		1415	s/&/&/g;
		1416	s/(?<![BIUGH])</</g;
		1417
		1418	# this is buggy, it needs to properly take care of nested <'s
		1419
		1420	1 while
		1421	# replace B<>, I<>, U<> etc.
		1422	s/B<([^\>]*)>/<b>$1<\/b>/
		1423	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
		1424	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1425	# replace G<male\|female> tags
		1426	\|\| s{G<([^>\|])\\|([^>])>}{
		1427	$self->gender ? $2 : $1
		1428	}ge
		1429	# replace H<hint text>
		1430	\|\| s{H<([^\>]*)>}
		1431	{
		1432	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1433	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1434	"")
		1435	[$self->{hintmode}]
		1436	}ge;
		1437
		1438	# create single paragraphs (very hackish)
		1439	s/(?<=\S)\n(?=\w)/ /g;
		1440
		1441	# compress some whitespace
		1442	s/\s+\n/\n/g; # ws line-ends
		1443	s/\n\n+/\n/g; # double lines
		1444	s/^\n+//; # beginning lines
		1445	s/\n+$//; # ending lines
		1446
		1447	$_
		1448	}
		1449
		1450	sub hintmode {
		1451	$_[0]{hintmode} = $_[1] if @_ > 1;
		1452	$_[0]{hintmode}
		1453	}
		1454
1219	=item $player->ext_reply ($msgid, %msg)	1455	=item $player->ext_reply ($msgid, %msg)
1220		1456
1221	Sends an ext reply to the player.	1457	Sends an ext reply to the player.
1222		1458
1223	=cut	1459	=cut
1224		1460
1225	sub ext_reply($$%) {	1461	sub ext_reply($$%) {
1226	my ($self, $id, %msg) = @_;	1462	my ($self, $id, %msg) = @_;
1227		1463
1228	$msg{msgid} = $id;	1464	$msg{msgid} = $id;
1229		1465	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1230	$self->send ("ext " . cf::to_json \%msg);
1231	}	1466	}
1232		1467
1233	=item $player->ext_event ($type, %msg)	1468	=item $player->ext_event ($type, %msg)
1234		1469
1235	Sends an ext event to the client.	1470	Sends an ext event to the client.
…		…
1250		1485
1251	package cf::region;	1486	package cf::region;
1252		1487
1253	=item cf::region::find_by_path $path	1488	=item cf::region::find_by_path $path
1254		1489
1255	Tries to decuce the probable region for a map knowing only its path.	1490	Tries to decuce the likely region for a map knowing only its path.
1256		1491
1257	=cut	1492	=cut
1258		1493
1259	sub find_by_path($) {	1494	sub find_by_path($) {
1260	my ($path) = @_;	1495	my ($path) = @_;
1261		1496
1262	my ($match, $specificity);	1497	my ($match, $specificity);
1263		1498
1264	for my $region (list) {	1499	for my $region (list) {
1265	if ($region->match && $path =~ $region->match) {	1500	if ($region->{match} && $path =~ $region->{match}) {
1266	($match, $specificity) = ($region, $region->specificity)	1501	($match, $specificity) = ($region, $region->specificity)
1267	if $region->specificity > $specificity;	1502	if $region->specificity > $specificity;
1268	}	1503	}
1269	}	1504	}
1270		1505
…		…
1390	$self->init; # pass $1 etc.	1625	$self->init; # pass $1 etc.
1391	return $self;	1626	return $self;
1392	}	1627	}
1393	}	1628	}
1394		1629
1395	Carp::carp "unable to resolve path '$path' (base '$base').";	1630	Carp::cluck "unable to resolve path '$path' (base '$base').";
1396	()	1631	()
1397	}	1632	}
1398		1633
1399	sub init {	1634	sub init {
1400	my ($self) = @_;	1635	my ($self) = @_;
…		…
1678		1913
1679	undef $MAP_PREFETCH{$path};	1914	undef $MAP_PREFETCH{$path};
1680	$MAP_PREFETCHER \|\|= cf::async {	1915	$MAP_PREFETCHER \|\|= cf::async {
1681	while (%MAP_PREFETCH) {	1916	while (%MAP_PREFETCH) {
1682	for my $path (keys %MAP_PREFETCH) {	1917	for my $path (keys %MAP_PREFETCH) {
1683	my $map = find $path	1918	if (my $map = find $path) {
1684	or next;
1685	$map->load;	1919	$map->load;
		1920	}
1686		1921
1687	delete $MAP_PREFETCH{$path};	1922	delete $MAP_PREFETCH{$path};
1688	}	1923	}
1689	}	1924	}
1690	undef $MAP_PREFETCHER;	1925	undef $MAP_PREFETCHER;
…		…
1912		2147
1913	$flags = cf::NDI_BROWN \| cf::NDI_UNIQUE unless @_ >= 4;	2148	$flags = cf::NDI_BROWN \| cf::NDI_UNIQUE unless @_ >= 4;
1914		2149
1915	if ($self->{record_replies}) {	2150	if ($self->{record_replies}) {
1916	push @{ $self->{record_replies} }, [$npc, $msg, $flags];	2151	push @{ $self->{record_replies} }, [$npc, $msg, $flags];
		2152
1917	} else {	2153	} else {
		2154	my $pl = $self->contr;
		2155
		2156	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
		2157	my $diag = $pl->{npc_dialog};
		2158	$diag->{pl}->ext_reply (
		2159	$diag->{id},
		2160	msgtype => "reply",
		2161	msg => $diag->{pl}->expand_cfpod ($msg),
		2162	add_topics => []
		2163	);
		2164
		2165	} else {
1918	$msg = $npc->name . " says: $msg" if $npc;	2166	$msg = $npc->name . " says: $msg" if $npc;
1919	$self->message ($msg, $flags);	2167	$self->message ($msg, $flags);
		2168	}
1920	}	2169	}
1921	}	2170	}
1922		2171
1923	=item $player_object->may ("access")	2172	=item $player_object->may ("access")
1924		2173
…		…
2013		2262
2014	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2263	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2015	$self->enter_map ($map, $x, $y);	2264	$self->enter_map ($map, $x, $y);
2016	}	2265	}
2017		2266
2018	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2267	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2019		2268
2020	Moves the player to the given map-path and coordinates by first freezing	2269	Moves the player to the given map-path and coordinates by first freezing
2021	her, loading and preparing them map, calling the provided $check callback	2270	her, loading and preparing them map, calling the provided $check callback
2022	that has to return the map if sucecssful, and then unfreezes the player on	2271	that has to return the map if sucecssful, and then unfreezes the player on
2023	the new (success) or old (failed) map position.	2272	the new (success) or old (failed) map position. In either case, $done will
		2273	be called at the end of this process.
2024		2274
2025	=cut	2275	=cut
2026		2276
2027	our $GOTOGEN;	2277	our $GOTOGEN;
2028		2278
2029	sub cf::object::player::goto {	2279	sub cf::object::player::goto {
2030	my ($self, $path, $x, $y, $check) = @_;	2280	my ($self, $path, $x, $y, $check, $done) = @_;
2031		2281
2032	# do generation counting so two concurrent goto's will be executed in-order	2282	# do generation counting so two concurrent goto's will be executed in-order
2033	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2283	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2034		2284
2035	$self->enter_link;	2285	$self->enter_link;
…		…
2055		2305
2056	if ($gen == $self->{_goto_generation}) {	2306	if ($gen == $self->{_goto_generation}) {
2057	delete $self->{_goto_generation};	2307	delete $self->{_goto_generation};
2058	$self->leave_link ($map, $x, $y);	2308	$self->leave_link ($map, $x, $y);
2059	}	2309	}
		2310
		2311	$done->() if $done;
2060	})->prio (1);	2312	})->prio (1);
2061	}	2313	}
2062		2314
2063	=item $player_object->enter_exit ($exit_object)	2315	=item $player_object->enter_exit ($exit_object)
2064		2316
…		…
2133	my $hp = $exit->stats->hp;	2385	my $hp = $exit->stats->hp;
2134	my $sp = $exit->stats->sp;	2386	my $sp = $exit->stats->sp;
2135		2387
2136	$self->enter_link;	2388	$self->enter_link;
2137		2389
		2390	# if exit is damned, update players death & WoR home-position
		2391	$self->contr->savebed ($slaying, $hp, $sp)
		2392	if $exit->flag (FLAG_DAMNED);
		2393
2138	(async {	2394	(async {
2139	$self->deactivate_recursive; # just to be sure	2395	$self->deactivate_recursive; # just to be sure
2140	unless (eval {	2396	unless (eval {
2141	$self->goto ($slaying, $hp, $sp);	2397	$self->goto ($slaying, $hp, $sp);
2142		2398
…		…
2169		2425
2170	utf8::encode $text;	2426	utf8::encode $text;
2171	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2427	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2172	}	2428	}
2173		2429
		2430	=item $client->send_msg ($channel, $msg, $color, [extra...])
		2431
		2432	Send a drawinfo or msg packet to the client, formatting the msg for the
		2433	client if neccessary. C<$type> should be a string identifying the type of
		2434	the message, with C<log> being the default. If C<$color> is negative, suppress
		2435	the message unless the client supports the msg packet.
		2436
		2437	=cut
		2438
		2439	sub cf::client::send_msg {
		2440	my ($self, $channel, $msg, $color, @extra) = @_;
		2441
		2442	$msg = $self->pl->expand_cfpod ($msg);
		2443
		2444	return unless @extra \|\| length $msg;
		2445
		2446	$color &= ~cf::NDI_UNIQUE; # just in case...
		2447
		2448	if (ref $channel) {
		2449	# send meta info to client, if not yet sent
		2450	unless (exists $self->{channel}{$channel->{id}}) {
		2451	$self->{channel}{$channel->{id}} = $channel;
		2452	$self->ext_event (channel_info => %$channel);
		2453	}
		2454
		2455	$channel = $channel->{id};
		2456	}
		2457
		2458	if ($self->can_msg) {
		2459	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
		2460	} else {
		2461	# replace some tags by gcfclient-compatible ones
		2462	for ($msg) {
		2463	1 while
		2464	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2465	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2466	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2467	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2468	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2469	}
		2470
		2471	if ($color >= 0) {
		2472	if (0 && $msg =~ /\[/) {
		2473	$self->send_packet ("drawextinfo $color 4 0 $msg")
		2474	} else {
		2475	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
		2476	$self->send_packet ("drawinfo $color $msg")
		2477	}
		2478	}
		2479	}
		2480	}
		2481
2174	=item $client->ext_event ($type, %msg)	2482	=item $client->ext_event ($type, %msg)
2175		2483
2176	Sends an exti event to the client.	2484	Sends an ext event to the client.
2177		2485
2178	=cut	2486	=cut
2179		2487
2180	sub cf::client::ext_event($$%) {	2488	sub cf::client::ext_event($$%) {
2181	my ($self, $type, %msg) = @_;	2489	my ($self, $type, %msg) = @_;
2182		2490
		2491	return unless $self->extcmd;
		2492
2183	$msg{msgtype} = "event_$type";	2493	$msg{msgtype} = "event_$type";
2184	$self->send_packet ("ext " . cf::to_json \%msg);	2494	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2185	}	2495	}
2186		2496
2187	=item $success = $client->query ($flags, "text", \&cb)	2497	=item $success = $client->query ($flags, "text", \&cb)
2188		2498
2189	Queues a query to the client, calling the given callback with	2499	Queues a query to the client, calling the given callback with
2190	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2500	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2191	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.	2501	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2192		2502
2193	Queries can fail, so check the return code. Or don't, as queries will become	2503	Queries can fail, so check the return code. Or don't, as queries will
2194	reliable at some point in the future.	2504	become reliable at some point in the future.
2195		2505
2196	=cut	2506	=cut
2197		2507
2198	sub cf::client::query {	2508	sub cf::client::query {
2199	my ($self, $flags, $text, $cb) = @_;	2509	my ($self, $flags, $text, $cb) = @_;
…		…
2207	utf8::encode $text;	2517	utf8::encode $text;
2208	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];	2518	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2209		2519
2210	$self->send_packet ($self->{query_queue}[0][0])	2520	$self->send_packet ($self->{query_queue}[0][0])
2211	if @{ $self->{query_queue} } == 1;	2521	if @{ $self->{query_queue} } == 1;
		2522
		2523	1
2212	}	2524	}
2213		2525
2214	cf::client->attach (	2526	cf::client->attach (
		2527	on_connect => sub {
		2528	my ($ns) = @_;
		2529
		2530	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2531	},
2215	on_reply => sub {	2532	on_reply => sub {
2216	my ($ns, $msg) = @_;	2533	my ($ns, $msg) = @_;
2217		2534
2218	# this weird shuffling is so that direct followup queries	2535	# this weird shuffling is so that direct followup queries
2219	# get handled first	2536	# get handled first
…		…
2231	} else {	2548	} else {
2232	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;	2549	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2233	}	2550	}
2234	}	2551	}
2235	},	2552	},
		2553	on_exticmd => sub {
		2554	my ($ns, $buf) = @_;
		2555
		2556	my $msg = eval { $ns->{json_coder}->decode ($buf) };
		2557
		2558	if (ref $msg) {
		2559	if (my $cb = $EXTICMD{$msg->{msgtype}}) {
		2560	if (my %reply = $cb->($ns, $msg)) {
		2561	$reply{msgid} = $msg->{msgid};
		2562	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
		2563	}
		2564	}
		2565	} else {
		2566	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
		2567	}
		2568
		2569	cf::override;
		2570	},
2236	);	2571	);
2237		2572
2238	=item $client->async (\&cb)	2573	=item $client->async (\&cb)
2239		2574
2240	Create a new coroutine, running the specified callback. The coroutine will	2575	Create a new coroutine, running the specified callback. The coroutine will
…		…
2289		2624
2290	=pod	2625	=pod
2291		2626
2292	The following functions and methods are available within a safe environment:	2627	The following functions and methods are available within a safe environment:
2293		2628
2294	cf::object contr pay_amount pay_player map	2629	cf::object
		2630	contr pay_amount pay_player map x y force_find force_add
		2631	insert remove
		2632
2295	cf::object::player player	2633	cf::object::player
2296	cf::player peaceful	2634	player
2297	cf::map trigger	2635
		2636	cf::player
		2637	peaceful
		2638
		2639	cf::map
		2640	trigger
2298		2641
2299	=cut	2642	=cut
2300		2643
2301	for (	2644	for (
2302	["cf::object" => qw(contr pay_amount pay_player map)],	2645	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2646	insert remove)],
2303	["cf::object::player" => qw(player)],	2647	["cf::object::player" => qw(player)],
2304	["cf::player" => qw(peaceful)],	2648	["cf::player" => qw(peaceful)],
2305	["cf::map" => qw(trigger)],	2649	["cf::map" => qw(trigger)],
2306	) {	2650	) {
2307	no strict 'refs';	2651	no strict 'refs';
…		…
2378	=back	2722	=back
2379		2723
2380	=cut	2724	=cut
2381		2725
2382	#############################################################################	2726	#############################################################################
2383
2384	=head2 EXTENSION DATABASE SUPPORT
2385
2386	Crossfire maintains a very simple database for extension use. It can
2387	currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2388	convert to/from binary).
2389
2390	The parameter C<$family> should best start with the name of the extension
2391	using it, it should be unique.
2392
2393	=over 4
2394
2395	=item $value = cf::db_get $family => $key
2396
2397	Returns a single value from the database.
2398
2399	=item cf::db_put $family => $key => $value
2400
2401	Stores the given C<$value> in the family.
2402
2403	=cut
2404
2405	our $DB;
2406
2407	sub db_init {
2408	unless ($DB) {
2409	$DB = BDB::db_create $DB_ENV;
2410
2411	cf::sync_job {
2412	eval {
2413	$DB->set_flags (BDB::CHKSUM);
2414
2415	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2416	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
2417	cf::cleanup "db_open(db): $!" if $!;
2418	};
2419	cf::cleanup "db_open(db): $@" if $@;
2420	};
2421	}
2422	}
2423
2424	sub db_get($$) {
2425	my $key = "$_[0]/$_[1]";
2426
2427	cf::sync_job {
2428	BDB::db_get $DB, undef, $key, my $data;
2429
2430	$! ? ()
2431	: $data
2432	}
2433	}
2434
2435	sub db_put($$$) {
2436	BDB::dbreq_pri 4;
2437	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2438	}
2439
2440	=item cf::cache $id => [$paths...], $processversion => $process
2441
2442	Generic caching function that returns the value of the resource $id,
2443	caching and regenerating as required.
2444
2445	This function can block.
2446
2447	=cut
2448
2449	sub cache {
2450	my ($id, $src, $processversion, $process) = @_;
2451
2452	my $meta =
2453	join "\x00",
2454	$processversion,
2455	map {
2456	aio_stat $_
2457	and Carp::croak "$_: $!";
2458
2459	($_, (stat _)[7,9])
2460	} @$src;
2461
2462	my $dbmeta = db_get cache => "$id/meta";
2463	if ($dbmeta ne $meta) {
2464	# changed, we may need to process
2465
2466	my @data;
2467	my $md5;
2468
2469	for (0 .. $#$src) {
2470	0 <= aio_load $src->[$_], $data[$_]
2471	or Carp::croak "$src->[$_]: $!";
2472	}
2473
2474	# if processing is expensive, check
2475	# checksum first
2476	if (1) {
2477	$md5 =
2478	join "\x00",
2479	$processversion,
2480	map {
2481	Coro::cede;
2482	($src->[$_], Digest::MD5::md5_hex $data[$_])
2483	} 0.. $#$src;
2484
2485
2486	my $dbmd5 = db_get cache => "$id/md5";
2487	if ($dbmd5 eq $md5) {
2488	db_put cache => "$id/meta", $meta;
2489
2490	return db_get cache => "$id/data";
2491	}
2492	}
2493
2494	my $t1 = Time::HiRes::time;
2495	my $data = $process->(\@data);
2496	my $t2 = Time::HiRes::time;
2497
2498	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2499
2500	db_put cache => "$id/data", $data;
2501	db_put cache => "$id/md5" , $md5;
2502	db_put cache => "$id/meta", $meta;
2503
2504	return $data;
2505	}
2506
2507	db_get cache => "$id/data"
2508	}
2509
2510	=item fork_call { }, $args
2511
2512	Executes the given code block with the given arguments in a seperate
2513	process, returning the results. Everything must be serialisable with
2514	Coro::Storable. May, of course, block. Note that the executed sub may
2515	never block itself or use any form of Event handling.
2516
2517	=cut
2518
2519	sub fork_call(&@) {
2520	my ($cb, @args) = @_;
2521
2522	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2523	# or die "socketpair: $!";
2524	pipe my $fh1, my $fh2
2525	or die "pipe: $!";
2526
2527	if (my $pid = fork) {
2528	close $fh2;
2529
2530	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2531	$res = Coro::Storable::thaw $res;
2532
2533	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2534
2535	die $$res unless "ARRAY" eq ref $res;
2536
2537	return wantarray ? @$res : $res->[-1];
2538	} else {
2539	reset_signals;
2540	local $SIG{__WARN__};
2541	local $SIG{__DIE__};
2542	eval {
2543	close $fh1;
2544
2545	my @res = eval { $cb->(@args) };
2546	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2547	};
2548
2549	warn $@ if $@;
2550	_exit 0;
2551	}
2552	}
2553
2554	#############################################################################
2555	# the server's init and main functions	2727	# the server's init and main functions
2556		2728
2557	sub load_facedata($) {	2729	sub load_facedata($) {
2558	my ($path) = @_;	2730	my ($path) = @_;
2559		2731
…		…
2571	{	2743	{
2572	my $faces = $facedata->{faceinfo};	2744	my $faces = $facedata->{faceinfo};
2573		2745
2574	while (my ($face, $info) = each %$faces) {	2746	while (my ($face, $info) = each %$faces) {
2575	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	2747	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2576	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	2748	cf::face::set_visibility $idx, $info->{visibility};
		2749	cf::face::set_magicmap $idx, $info->{magicmap};
2577	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	2750	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2578	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	2751	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2579	Coro::cede;	2752
		2753	cf::cede_to_tick;
2580	}	2754	}
2581		2755
2582	while (my ($face, $info) = each %$faces) {	2756	while (my ($face, $info) = each %$faces) {
2583	next unless $info->{smooth};	2757	next unless $info->{smooth};
2584	my $idx = cf::face::find $face	2758	my $idx = cf::face::find $face
2585	or next;	2759	or next;
2586	if (my $smooth = cf::face::find $info->{smooth}) {	2760	if (my $smooth = cf::face::find $info->{smooth}) {
		2761	cf::face::set_smooth $idx, $smooth;
2587	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	2762	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2588	} else {	2763	} else {
2589	warn "smooth face '$info->{smooth}' not found for face '$face'";	2764	warn "smooth face '$info->{smooth}' not found for face '$face'";
2590	}	2765	}
2591	Coro::cede;	2766
		2767	cf::cede_to_tick;
2592	}	2768	}
2593	}	2769	}
2594		2770
2595	{	2771	{
2596	my $anims = $facedata->{animinfo};	2772	my $anims = $facedata->{animinfo};
2597		2773
2598	while (my ($anim, $info) = each %$anims) {	2774	while (my ($anim, $info) = each %$anims) {
2599	cf::anim::set $anim, $info->{frames}, $info->{facings};	2775	cf::anim::set $anim, $info->{frames}, $info->{facings};
2600	Coro::cede;	2776	cf::cede_to_tick;
2601	}	2777	}
2602		2778
2603	cf::anim::invalidate_all; # d'oh	2779	cf::anim::invalidate_all; # d'oh
		2780	}
		2781
		2782	{
		2783	# TODO: for gcfclient pleasure, we should give resources
		2784	# that gcfclient doesn't grok a >10000 face index.
		2785	my $res = $facedata->{resource};
		2786	my $enc = JSON::XS->new->utf8->canonical;
		2787
		2788	while (my ($name, $info) = each %$res) {
		2789	my $meta = $enc->encode ({
		2790	name => $name,
		2791	type => $info->{type},
		2792	copyright => $info->{copyright}, #TODO#
		2793	});
		2794
		2795	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		2796
		2797	if ($name =~ /\.jpg$/) {
		2798	cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
		2799	cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
		2800	} else {
		2801	my $data = pack "(w/a)", $meta, $info->{data};
		2802	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
		2803
		2804	cf::face::set_type $idx, 1;
		2805	cf::face::set_data $idx, 0, $data, $chk;
		2806	}
		2807
		2808	cf::cede_to_tick;
		2809	}
2604	}	2810	}
2605		2811
2606	1	2812	1
2607	}	2813	}
2608		2814
2609	sub reload_regions {	2815	sub reload_regions {
2610	load_resource_file "$MAPDIR/regions"	2816	load_resource_file "$MAPDIR/regions"
2611	or die "unable to load regions file\n";	2817	or die "unable to load regions file\n";
		2818
		2819	for (cf::region::list) {
		2820	$_->{match} = qr/$_->{match}/
		2821	if exists $_->{match};
		2822	}
2612	}	2823	}
2613		2824
2614	sub reload_facedata {	2825	sub reload_facedata {
2615	load_facedata "$DATADIR/facedata"	2826	load_facedata "$DATADIR/facedata"
2616	or die "unable to load facedata\n";	2827	or die "unable to load facedata\n";
2617	}	2828	}
2618		2829
2619	sub reload_archetypes {	2830	sub reload_archetypes {
		2831	load_resource_file "$DATADIR/archetypes"
		2832	or die "unable to load archetypes\n";
		2833	#d# NEED to laod twice to resolve forward references
		2834	# this really needs to be done in an extra post-pass
		2835	# (which needs to be synchronous, so solve it differently)
2620	load_resource_file "$DATADIR/archetypes"	2836	load_resource_file "$DATADIR/archetypes"
2621	or die "unable to load archetypes\n";	2837	or die "unable to load archetypes\n";
2622	}	2838	}
2623		2839
2624	sub reload_treasures {	2840	sub reload_treasures {
…		…
2696	},	2912	},
2697	);	2913	);
2698	}	2914	}
2699	}	2915	}
2700		2916
		2917	sub write_runtime {
		2918	my $runtime = "$LOCALDIR/runtime";
		2919
		2920	# first touch the runtime file to show we are still running:
		2921	# the fsync below can take a very very long time.
		2922
		2923	IO::AIO::aio_utime $runtime, undef, undef;
		2924
		2925	my $guard = cf::lock_acquire "write_runtime";
		2926
		2927	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644
		2928	or return;
		2929
		2930	my $value = $cf::RUNTIME + 90 + 10;
		2931	# 10 is the runtime save interval, for a monotonic clock
		2932	# 60 allows for the watchdog to kill the server.
		2933
		2934	(aio_write $fh, 0, (length $value), $value, 0) <= 0
		2935	and return;
		2936
		2937	# always fsync - this file is important
		2938	aio_fsync $fh
		2939	and return;
		2940
		2941	# touch it again to show we are up-to-date
		2942	aio_utime $fh, undef, undef;
		2943
		2944	close $fh
		2945	or return;
		2946
		2947	aio_rename "$runtime~", $runtime
		2948	and return;
		2949
		2950	warn "runtime file written.\n";
		2951
		2952	1
		2953	}
		2954
2701	sub emergency_save() {	2955	sub emergency_save() {
2702	my $freeze_guard = cf::freeze_mainloop;	2956	my $freeze_guard = cf::freeze_mainloop;
2703		2957
2704	warn "enter emergency perl save\n";	2958	warn "enter emergency perl save\n";
2705		2959
…		…
2780	%EXT_CORO = ();	3034	%EXT_CORO = ();
2781		3035
2782	warn "removing commands";	3036	warn "removing commands";
2783	%COMMAND = ();	3037	%COMMAND = ();
2784		3038
2785	warn "removing ext commands";	3039	warn "removing ext/exti commands";
2786	%EXTCMD = ();	3040	%EXTCMD = ();
		3041	%EXTICMD = ();
2787		3042
2788	warn "unloading/nuking all extensions";	3043	warn "unloading/nuking all extensions";
2789	for my $pkg (@EXTS) {	3044	for my $pkg (@EXTS) {
2790	warn "... unloading $pkg";	3045	warn "... unloading $pkg";
2791		3046

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.280 by root, Sat Jun 16 14:35:41 2007 UTC vs. Revision 1.311 by root, Fri Jul 20 16:11:10 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.280 by root, Sat Jun 16 14:35:41 2007 UTC vs.
Revision 1.311 by root, Fri Jul 20 16:11:10 2007 UTC