ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.277 by root, Sun Jun 10 04:24:50 2007 UTC vs.
Revision 1.349 by root, Fri Aug 31 04:10:43 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
		26	use JSON::XS ();
25	use BDB ();	27	use BDB ();
26	use Data::Dumper;	28	use Data::Dumper;
27	use Digest::MD5;	29	use Digest::MD5;
28	use Fcntl;	30	use Fcntl;
29	use YAML::Syck ();	31	use YAML::Syck ();
30	use IO::AIO 2.32 ();	32	use IO::AIO 2.32 ();
31	use Time::HiRes;	33	use Time::HiRes;
32	use Compress::LZF;	34	use Compress::LZF;
		35	use Digest::MD5 ();
33		36
34	# configure various modules to our taste	37	# configure various modules to our taste
35	#	38	#
36	$Storable::canonical = 1; # reduce rsync transfers	39	$Storable::canonical = 1; # reduce rsync transfers
37	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
…		…
49	our %COMMAND = ();	52	our %COMMAND = ();
50	our %COMMAND_TIME = ();	53	our %COMMAND_TIME = ();
51		54
52	our @EXTS = (); # list of extension package names	55	our @EXTS = (); # list of extension package names
53	our %EXTCMD = ();	56	our %EXTCMD = ();
		57	our %EXTICMD = ();
54	our %EXT_CORO = (); # coroutines bound to extensions	58	our %EXT_CORO = (); # coroutines bound to extensions
55	our %EXT_MAP = (); # pluggable maps	59	our %EXT_MAP = (); # pluggable maps
56		60
57	our $RELOAD; # number of reloads so far	61	our $RELOAD; # number of reloads so far
58	our @EVENT;	62	our @EVENT;
…		…
164		168
165	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	169	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	170	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.	171	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168		172
		173	=item @cf::INVOKE_RESULTS
		174
		175	This array contains the results of the last C<invoke ()> call. When
		176	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
		177	that call.
		178
169	=back	179	=back
170		180
171	=cut	181	=cut
172		182
173	BEGIN {	183	BEGIN {
…		…
206	}	216	}
207		217
208	$Event::DIED = sub {	218	$Event::DIED = sub {
209	warn "error in event callback: @_";	219	warn "error in event callback: @_";
210	};	220	};
		221
		222	#############################################################################
211		223
212	=head2 UTILITY FUNCTIONS	224	=head2 UTILITY FUNCTIONS
213		225
214	=over 4	226	=over 4
215		227
…		…
234	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	246	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
235	$d	247	$d
236	} || "[unable to dump $_[0]: '$@']";	248	} || "[unable to dump $_[0]: '$@']";
237	}	249	}
238		250
239	use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
240
241	=item $ref = cf::from_json $json	251	=item $ref = cf::from_json $json
242		252
243	Converts a JSON string into the corresponding perl data structure.	253	Converts a JSON string into the corresponding perl data structure.
244		254
245	=item $json = cf::to_json $ref	255	=item $json = cf::to_json $ref
246		256
247	Converts a perl data structure into its JSON representation.	257	Converts a perl data structure into its JSON representation.
		258
		259	=cut
		260
		261	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
		262
		263	sub to_json ($) { $json_coder->encode ($_[0]) }
		264	sub from_json ($) { $json_coder->decode ($_[0]) }
248		265
249	=item cf::lock_wait $string	266	=item cf::lock_wait $string
250		267
251	Wait until the given lock is available. See cf::lock_acquire.	268	Wait until the given lock is available. See cf::lock_acquire.
252		269
…		…
254		271
255	Wait until the given lock is available and then acquires it and returns	272	Wait until the given lock is available and then acquires it and returns
256	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	273	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
257	for example when the coroutine gets canceled), the lock is automatically	274	for example when the coroutine gets canceled), the lock is automatically
258	returned.	275	returned.
		276
		277	Locks are *not* recursive, locking from the same coro twice results in a
		278	deadlocked coro.
259		279
260	Lock names should begin with a unique identifier (for example, cf::map::find	280	Lock names should begin with a unique identifier (for example, cf::map::find
261	uses map_find and cf::map::load uses map_load).	281	uses map_find and cf::map::load uses map_load).
262		282
263	=item $locked = cf::lock_active $string	283	=item $locked = cf::lock_active $string
…		…
306	};	326	};
307	$TICK_WATCHER->stop;	327	$TICK_WATCHER->stop;
308	$guard	328	$guard
309	}	329	}
310		330
		331	=item cf::get_slot $time[, $priority[, $name]]
		332
		333	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		334	This call blocks and returns only when you have at least C<$time> seconds
		335	of cpu time till the next tick. The slot is only valid till the next cede.
		336
		337	The optional C<$name> can be used to identify the job to run. It might be
		338	used for statistical purposes and should identify the same time-class.
		339
		340	Useful for short background jobs.
		341
		342	=cut
		343
		344	our @SLOT_QUEUE;
		345	our $SLOT_QUEUE;
		346
		347	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		348	$SLOT_QUEUE = Coro::async {
		349	my $signal = new Coro::Signal;
		350
		351	while () {
		352	next_job:
		353	my $avail = cf::till_tick;
		354	if ($avail > 0.01) {
		355	for (0 .. $#SLOT_QUEUE) {
		356	if ($SLOT_QUEUE[$_][0] < $avail) {
		357	my $job = splice @SLOT_QUEUE, $_, 1, ();
		358	$job->[2]->send;
		359	Coro::cede;
		360	goto next_job;
		361	}
		362	}
		363	}
		364
		365	if (@SLOT_QUEUE) {
		366	# we do not use wait_For_tick() as it returns immediately when tick is inactive
		367	push @cf::WAIT_FOR_TICK, $signal;
		368	$signal->wait;
		369	} else {
		370	Coro::schedule;
		371	}
		372	}
		373	};
		374
		375	sub get_slot($;$$) {
		376	my ($time, $pri, $name) = @_;
		377
		378	$time = $TICK * .6 if $time > $TICK * .6;
		379	my $sig = new Coro::Signal;
		380
		381	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		382	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		383	$SLOT_QUEUE->ready;
		384	$sig->wait;
		385	}
		386
311	=item cf::async { BLOCK }	387	=item cf::async { BLOCK }
312		388
313	Currently the same as Coro::async_pool, meaning you cannot use	389	Currently the same as Coro::async_pool, meaning you cannot use
314	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only	390	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
315	thing you are allowed to do is call C<prio> on it.	391	thing you are allowed to do is call C<prio> on it.
…		…
318		394
319	BEGIN { *async = \&Coro::async_pool }	395	BEGIN { *async = \&Coro::async_pool }
320		396
321	=item cf::sync_job { BLOCK }	397	=item cf::sync_job { BLOCK }
322		398
323	The design of crossfire+ requires that the main coro ($Coro::main) is	399	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	400	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.	401	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
		402	acceptable.
326		403
327	If it must be done, put the blocking parts into C<sync_job>. This will run	404	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	405	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	406	server will be frozen during this time, so the block should either finish
330	fast or be very important.	407	fast or be very important.
…		…
390	$EXT_CORO{$coro+0} = $coro;	467	$EXT_CORO{$coro+0} = $coro;
391		468
392	$coro	469	$coro
393	}	470	}
394		471
395	sub write_runtime {	472	=item fork_call { }, $args
396	my $runtime = "$LOCALDIR/runtime";
397		473
398	# first touch the runtime file to show we are still running:	474	Executes the given code block with the given arguments in a seperate
399	# the fsync below can take a very very long time.	475	process, returning the results. Everything must be serialisable with
		476	Coro::Storable. May, of course, block. Note that the executed sub may
		477	never block itself or use any form of Event handling.
400		478
401	IO::AIO::aio_utime $runtime, undef, undef;	479	=cut
402		480
403	my $guard = cf::lock_acquire "write_runtime";	481	sub fork_call(&@) {
		482	my ($cb, @args) = @_;
404		483
405	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	484	# we seemingly have to make a local copy of the whole thing,
406	or return;	485	# otherwise perl prematurely frees the stuff :/
		486	# TODO: investigate and fix (liekly this will be rather laborious)
407		487
408	my $value = $cf::RUNTIME + 90 + 10;	488	my @res = Coro::Util::fork_eval {
409	# 10 is the runtime save interval, for a monotonic clock	489	reset_signals;
410	# 60 allows for the watchdog to kill the server.	490	&$cb
		491	}, @args;
411		492
412	(aio_write $fh, 0, (length $value), $value, 0) <= 0	493	wantarray ? @res : $res[-1]
413	and return;	494	}
414		495
415	# always fsync - this file is important	496	=item $value = cf::db_get $family => $key
416	aio_fsync $fh
417	and return;
418		497
419	# touch it again to show we are up-to-date	498	Returns a single value from the environment database.
420	aio_utime $fh, undef, undef;
421		499
422	close $fh	500	=item cf::db_put $family => $key => $value
423	or return;
424		501
425	aio_rename "$runtime~", $runtime	502	Stores the given C<$value> in the family. It can currently store binary
426	and return;	503	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
427		504
428	warn "runtime file written.\n";	505	=cut
429		506
		507	our $DB;
		508
		509	sub db_init {
		510	unless ($DB) {
		511	$DB = BDB::db_create $DB_ENV;
		512
		513	cf::sync_job {
		514	eval {
		515	$DB->set_flags (BDB::CHKSUM);
		516
		517	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
		518	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		519	cf::cleanup "db_open(db): $!" if $!;
		520	};
		521	cf::cleanup "db_open(db): $@" if $@;
		522	};
430	1	523	}
		524	}
		525
		526	sub db_get($$) {
		527	my $key = "$_[0]/$_[1]";
		528
		529	cf::sync_job {
		530	BDB::db_get $DB, undef, $key, my $data;
		531
		532	$! ? ()
		533	: $data
		534	}
		535	}
		536
		537	sub db_put($$$) {
		538	BDB::dbreq_pri 4;
		539	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
		540	}
		541
		542	=item cf::cache $id => [$paths...], $processversion => $process
		543
		544	Generic caching function that returns the value of the resource $id,
		545	caching and regenerating as required.
		546
		547	This function can block.
		548
		549	=cut
		550
		551	sub cache {
		552	my ($id, $src, $processversion, $process) = @_;
		553
		554	my $meta =
		555	join "\x00",
		556	$processversion,
		557	map {
		558	aio_stat $_
		559	and Carp::croak "$_: $!";
		560
		561	($_, (stat _)[7,9])
		562	} @$src;
		563
		564	my $dbmeta = db_get cache => "$id/meta";
		565	if ($dbmeta ne $meta) {
		566	# changed, we may need to process
		567
		568	my @data;
		569	my $md5;
		570
		571	for (0 .. $#$src) {
		572	0 <= aio_load $src->[$_], $data[$_]
		573	or Carp::croak "$src->[$_]: $!";
		574	}
		575
		576	# if processing is expensive, check
		577	# checksum first
		578	if (1) {
		579	$md5 =
		580	join "\x00",
		581	$processversion,
		582	map {
		583	cf::cede_to_tick;
		584	($src->[$_], Digest::MD5::md5_hex $data[$_])
		585	} 0.. $#$src;
		586
		587
		588	my $dbmd5 = db_get cache => "$id/md5";
		589	if ($dbmd5 eq $md5) {
		590	db_put cache => "$id/meta", $meta;
		591
		592	return db_get cache => "$id/data";
		593	}
		594	}
		595
		596	my $t1 = Time::HiRes::time;
		597	my $data = $process->(\@data);
		598	my $t2 = Time::HiRes::time;
		599
		600	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
		601
		602	db_put cache => "$id/data", $data;
		603	db_put cache => "$id/md5" , $md5;
		604	db_put cache => "$id/meta", $meta;
		605
		606	return $data;
		607	}
		608
		609	db_get cache => "$id/data"
431	}	610	}
432		611
433	=item cf::datalog type => key => value, ...	612	=item cf::datalog type => key => value, ...
434		613
435	Log a datalog packet of the given type with the given key-value pairs.	614	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")	632	attach callbacks/event handlers (a collection of which is called an "attachment")
454	to it. All such attachable objects support the following methods.	633	to it. All such attachable objects support the following methods.
455		634
456	In the following description, CLASS can be any of C<global>, C<object>	635	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	636	C<player>, C<client> or C<map> (i.e. the attachable objects in
458	crossfire+).	637	Crossfire TRT).
459		638
460	=over 4	639	=over 4
461		640
462	=item $attachable->attach ($attachment, key => $value...)	641	=item $attachable->attach ($attachment, key => $value...)
463		642
…		…
665	_attach $registry, $klass, @attach;	844	_attach $registry, $klass, @attach;
666	}	845	}
667		846
668	$obj->{$name} = \%arg;	847	$obj->{$name} = \%arg;
669	} else {	848	} else {
670	warn "object uses attachment '$name' that is not available, postponing.\n";	849	warn "object uses attachment '$name' which is not available, postponing.\n";
671	}	850	}
672		851
673	$obj->{_attachment}{$name} = undef;	852	$obj->{_attachment}{$name} = undef;
674	}	853	}
675		854
…		…
715	";	894	";
716	die if $@;	895	die if $@;
717	}	896	}
718		897
719	our $override;	898	our $override;
720	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	899	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
721		900
722	sub override {	901	sub override {
723	$override = 1;	902	$override = 1;
724	@invoke_results = ();	903	@INVOKE_RESULTS = (@_);
725	}	904	}
726		905
727	sub do_invoke {	906	sub do_invoke {
728	my $event = shift;	907	my $event = shift;
729	my $callbacks = shift;	908	my $callbacks = shift;
730		909
731	@invoke_results = ();	910	@INVOKE_RESULTS = ();
732		911
733	local $override;	912	local $override;
734		913
735	for (@$callbacks) {	914	for (@$callbacks) {
736	eval { &{$_->[1]} };	915	eval { &{$_->[1]} };
…		…
753		932
754	Generate an object-specific event with the given arguments.	933	Generate an object-specific event with the given arguments.
755		934
756	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	935	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	936	removed in future versions), and there is no public API to access override
758	results (if you must, access C<@cf::invoke_results> directly).	937	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
759		938
760	=back	939	=back
761		940
762	=cut	941	=cut
763		942
764	#############################################################################	943	#############################################################################
765	# object support	944	# object support
		945	#
		946
		947	sub _can_merge {
		948	my ($ob1, $ob2) = @_;
		949
		950	local $Storable::canonical = 1;
		951	my $fob1 = Storable::freeze $ob1;
		952	my $fob2 = Storable::freeze $ob2;
		953
		954	$fob1 eq $fob2
		955	}
766		956
767	sub reattach {	957	sub reattach {
768	# basically do the same as instantiate, without calling instantiate	958	# basically do the same as instantiate, without calling instantiate
769	my ($obj) = @_;	959	my ($obj) = @_;
770		960
…		…
877	warn sprintf "loading %s (%d)\n",	1067	warn sprintf "loading %s (%d)\n",
878	$filename, length $data, scalar @{$av || []};	1068	$filename, length $data, scalar @{$av || []};
879	return ($data, $av);	1069	return ($data, $av);
880	}	1070	}
881		1071
		1072	=head2 COMMAND CALLBACKS
		1073
		1074	=over 4
		1075
		1076	=cut
		1077
882	#############################################################################	1078	#############################################################################
883	# command handling &c	1079	# command handling &c
884		1080
885	=item cf::register_command $name => \&callback($ob,$args);	1081	=item cf::register_command $name => \&callback($ob,$args);
886		1082
…		…
898	push @{ $COMMAND{$name} }, [$caller, $cb];	1094	push @{ $COMMAND{$name} }, [$caller, $cb];
899	}	1095	}
900		1096
901	=item cf::register_extcmd $name => \&callback($pl,$packet);	1097	=item cf::register_extcmd $name => \&callback($pl,$packet);
902		1098
903	Register a callbackf ro execution when the client sends an extcmd packet.	1099	Register a callback for execution when the client sends an (synchronous)
		1100	extcmd packet. Ext commands will be processed in the order they are
		1101	received by the server, like other user commands. The first argument is
		1102	the logged-in player. Ext commands can only be processed after a player
		1103	has logged in successfully.
904		1104
905	If the callback returns something, it is sent back as if reply was being	1105	If the callback returns something, it is sent back as if reply was being
906	called.	1106	called.
907		1107
		1108	=item cf::register_exticmd $name => \&callback($ns,$packet);
		1109
		1110	Register a callback for execution when the client sends an (asynchronous)
		1111	exticmd packet. Exti commands are processed by the server as soon as they
		1112	are received, i.e. out of order w.r.t. other commands. The first argument
		1113	is a client socket. Exti commands can be received anytime, even before
		1114	log-in.
		1115
		1116	If the callback returns something, it is sent back as if reply was being
		1117	called.
		1118
908	=cut	1119	=cut
909		1120
910	sub register_extcmd {	1121	sub register_extcmd {
911	my ($name, $cb) = @_;	1122	my ($name, $cb) = @_;
912		1123
913	$EXTCMD{$name} = $cb;	1124	$EXTCMD{$name} = $cb;
		1125	}
		1126
		1127	sub register_exticmd {
		1128	my ($name, $cb) = @_;
		1129
		1130	$EXTICMD{$name} = $cb;
914	}	1131	}
915		1132
916	cf::player->attach (	1133	cf::player->attach (
917	on_command => sub {	1134	on_command => sub {
918	my ($pl, $name, $params) = @_;	1135	my ($pl, $name, $params) = @_;
…		…
927	cf::override;	1144	cf::override;
928	},	1145	},
929	on_extcmd => sub {	1146	on_extcmd => sub {
930	my ($pl, $buf) = @_;	1147	my ($pl, $buf) = @_;
931		1148
932	my $msg = eval { from_json $buf };	1149	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
933		1150
934	if (ref $msg) {	1151	if (ref $msg) {
		1152	my ($type, $reply, @payload) =
		1153	"ARRAY" eq ref $msg
		1154	? @$msg
		1155	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1156
		1157	my @reply;
		1158
935	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1159	if (my $cb = $EXTCMD{$type}) {
936	if (my %reply = $cb->($pl, $msg)) {	1160	@reply = $cb->($pl, @payload);
937	$pl->ext_reply ($msg->{msgid}, %reply);
938	}
939	}	1161	}
		1162
		1163	$pl->ext_reply ($reply, @reply)
		1164	if $reply;
		1165
940	} else {	1166	} else {
941	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1167	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
942	}	1168	}
943		1169
944	cf::override;	1170	cf::override;
945	},	1171	},
946	);	1172	);
947		1173
948	sub load_extension {
949	my ($path) = @_;
950
951	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
952	my $base = $1;
953	my $pkg = $1;
954	$pkg =~ s/[^[:word:]]/_/g;
955	$pkg = "ext::$pkg";
956
957	warn "... loading '$path' into '$pkg'\n";
958
959	open my $fh, "<:utf8", $path
960	or die "$path: $!";
961
962	my $source =
963	"package $pkg; use strict; use utf8;\n"
964	. "#line 1 \"$path\"\n{\n"
965	. (do { local $/; <$fh> })
966	. "\n};\n1";
967
968	unless (eval $source) {
969	my $msg = $@ ? "$path: $@\n"
970	: "extension disabled.\n";
971	if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
972	warn $@;
973	warn "mandatory extension failed to load, exiting.\n";
974	exit 1;
975	}
976	die $@;
977	}
978
979	push @EXTS, $pkg;
980	}
981
982	sub load_extensions {	1174	sub load_extensions {
		1175	cf::sync_job {
		1176	my %todo;
		1177
983	for my $ext (<$LIBDIR/*.ext>) {	1178	for my $path (<$LIBDIR/*.ext>) {
984	next unless -r $ext;	1179	next unless -r $path;
985	eval {	1180
986	load_extension $ext;	1181	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
		1182	my $base = $1;
		1183	my $pkg = $1;
		1184	$pkg =~ s/[^[:word:]]/_/g;
		1185	$pkg = "ext::$pkg";
		1186
		1187	open my $fh, "<:utf8", $path
		1188	or die "$path: $!";
		1189
		1190	my $source = do { local $/; <$fh> };
		1191
		1192	my %ext = (
		1193	path => $path,
		1194	base => $base,
		1195	pkg => $pkg,
		1196	);
		1197
		1198	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
		1199	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
		1200
		1201	$ext{source} =
		1202	"package $pkg; use strict; use utf8;\n"
		1203	. "#line 1 \"$path\"\n{\n"
		1204	. $source
		1205	. "\n};\n1";
		1206
		1207	$todo{$base} = \%ext;
		1208	}
		1209
		1210	my %done;
		1211	while (%todo) {
		1212	my $progress;
		1213
		1214	while (my ($k, $v) = each %todo) {
		1215	for (split /,\s*/, $v->{meta}{depends}) {
		1216	goto skip
		1217	unless exists $done{$_};
		1218	}
		1219
		1220	warn "... loading '$k' into '$v->{pkg}'\n";
		1221
		1222	unless (eval $v->{source}) {
		1223	my $msg = $@ ? "$v->{path}: $@\n"
		1224	: "$v->{base}: extension inactive.\n";
		1225
		1226	if (exists $v->{meta}{mandatory}) {
		1227	warn $msg;
		1228	warn "mandatory extension failed to load, exiting.\n";
		1229	exit 1;
		1230	}
		1231
		1232	warn $msg;
		1233	}
		1234
		1235	$done{$k} = delete $todo{$k};
		1236	push @EXTS, $v->{pkg};
		1237	$progress = 1;
987	1	1238	}
988	} or warn "$ext not loaded: $@";	1239
		1240	skip:
		1241	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
		1242	unless $progress;
		1243	}
989	}	1244	};
990	}	1245	}
991		1246
992	#############################################################################	1247	#############################################################################
		1248
		1249	=back
993		1250
994	=head2 CORE EXTENSIONS	1251	=head2 CORE EXTENSIONS
995		1252
996	Functions and methods that extend core crossfire objects.	1253	Functions and methods that extend core crossfire objects.
997		1254
…		…
1068		1325
1069	aio_mkdir playerdir $pl, 0770;	1326	aio_mkdir playerdir $pl, 0770;
1070	$pl->{last_save} = $cf::RUNTIME;	1327	$pl->{last_save} = $cf::RUNTIME;
1071		1328
1072	$pl->save_pl ($path);	1329	$pl->save_pl ($path);
1073	Coro::cede;	1330	cf::cede_to_tick;
1074	}	1331	}
1075		1332
1076	sub new($) {	1333	sub new($) {
1077	my ($login) = @_;	1334	my ($login) = @_;
1078		1335
…		…
1082	$self->{deny_save} = 1;	1339	$self->{deny_save} = 1;
1083		1340
1084	$cf::PLAYER{$login} = $self;	1341	$cf::PLAYER{$login} = $self;
1085		1342
1086	$self	1343	$self
		1344	}
		1345
		1346	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1347
		1348	=cut
		1349
		1350	sub send_msg {
		1351	my $ns = shift->ns
		1352	or return;
		1353	$ns->send_msg (@_);
1087	}	1354	}
1088		1355
1089	=item $pl->quit_character	1356	=item $pl->quit_character
1090		1357
1091	Nukes the player without looking back. If logged in, the connection will	1358	Nukes the player without looking back. If logged in, the connection will
…		…
1185	}	1452	}
1186		1453
1187	\@paths	1454	\@paths
1188	}	1455	}
1189		1456
		1457	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
		1458
		1459	Expand crossfire pod fragments into protocol xml.
		1460
		1461	=cut
		1462
		1463	sub expand_cfpod {
		1464	((my $self), (local $_)) = @_;
		1465
		1466	# escape & and <
		1467	s/&/&amp;/g;
		1468	s/(?<![BIUGH])</&lt;/g;
		1469
		1470	# this is buggy, it needs to properly take care of nested <'s
		1471
		1472	1 while
		1473	# replace B<>, I<>, U<> etc.
		1474	s/B<([^\>]*)>/<b>$1<\/b>/
		1475	|| s/I<([^\>]*)>/<i>$1<\/i>/
		1476	|| s/U<([^\>]*)>/<u>$1<\/u>/
		1477	# replace G<male|female> tags
		1478	|| s{G<([^>|]*)\|([^>]*)>}{
		1479	$self->gender ? $2 : $1
		1480	}ge
		1481	# replace H<hint text>
		1482	|| s{H<([^\>]*)>}
		1483	{
		1484	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1485	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1486	"")
		1487	[$self->{hintmode}]
		1488	}ge;
		1489
		1490	# create single paragraphs (very hackish)
		1491	s/(?<=\S)\n(?=\w)/ /g;
		1492
		1493	# compress some whitespace
		1494	s/\s+\n/\n/g; # ws line-ends
		1495	s/\n\n+/\n/g; # double lines
		1496	s/^\n+//; # beginning lines
		1497	s/\n+$//; # ending lines
		1498
		1499	$_
		1500	}
		1501
		1502	sub hintmode {
		1503	$_[0]{hintmode} = $_[1] if @_ > 1;
		1504	$_[0]{hintmode}
		1505	}
		1506
1190	=item $player->ext_reply ($msgid, %msg)	1507	=item $player->ext_reply ($msgid, @msg)
1191		1508
1192	Sends an ext reply to the player.	1509	Sends an ext reply to the player.
1193		1510
1194	=cut	1511	=cut
1195		1512
1196	sub ext_reply($$%) {	1513	sub ext_reply($$@) {
1197	my ($self, $id, %msg) = @_;	1514	my ($self, $id, @msg) = @_;
1198		1515
1199	$msg{msgid} = $id;	1516	$self->ns->ext_reply ($id, @msg)
1200
1201	$self->send ("ext " . cf::to_json \%msg);
1202	}	1517	}
1203		1518
1204	=item $player->ext_event ($type, %msg)	1519	=item $player->ext_msg ($type, @msg)
1205		1520
1206	Sends an ext event to the client.	1521	Sends an ext event to the client.
1207		1522
1208	=cut	1523	=cut
1209		1524
1210	sub ext_event($$%) {	1525	sub ext_msg($$@) {
1211	my ($self, $type, %msg) = @_;	1526	my ($self, $type, @msg) = @_;
1212		1527
1213	$self->ns->ext_event ($type, %msg);	1528	$self->ns->ext_msg ($type, @msg);
1214	}	1529	}
1215		1530
1216	=head3 cf::region	1531	=head3 cf::region
1217		1532
1218	=over 4	1533	=over 4
…		…
1221		1536
1222	package cf::region;	1537	package cf::region;
1223		1538
1224	=item cf::region::find_by_path $path	1539	=item cf::region::find_by_path $path
1225		1540
1226	Tries to decuce the probable region for a map knowing only its path.	1541	Tries to decuce the likely region for a map knowing only its path.
1227		1542
1228	=cut	1543	=cut
1229		1544
1230	sub find_by_path($) {	1545	sub find_by_path($) {
1231	my ($path) = @_;	1546	my ($path) = @_;
1232		1547
1233	my ($match, $specificity);	1548	my ($match, $specificity);
1234		1549
1235	for my $region (list) {	1550	for my $region (list) {
1236	if ($region->match && $path =~ $region->match) {	1551	if ($region->{match} && $path =~ $region->{match}) {
1237	($match, $specificity) = ($region, $region->specificity)	1552	($match, $specificity) = ($region, $region->specificity)
1238	if $region->specificity > $specificity;	1553	if $region->specificity > $specificity;
1239	}	1554	}
1240	}	1555	}
1241		1556
…		…
1361	$self->init; # pass $1 etc.	1676	$self->init; # pass $1 etc.
1362	return $self;	1677	return $self;
1363	}	1678	}
1364	}	1679	}
1365		1680
1366	Carp::carp "unable to resolve path '$path' (base '$base').";	1681	Carp::cluck "unable to resolve path '$path' (base '$base').";
1367	()	1682	()
1368	}	1683	}
1369		1684
1370	sub init {	1685	sub init {
1371	my ($self) = @_;	1686	my ($self) = @_;
…		…
1537	local $self->{deny_reset} = 1; # loading can take a long time	1852	local $self->{deny_reset} = 1; # loading can take a long time
1538		1853
1539	my $path = $self->{path};	1854	my $path = $self->{path};
1540		1855
1541	{	1856	{
		1857	my $guard1 = cf::lock_acquire "map_data:$path";
1542	my $guard = cf::lock_acquire "map_load:$path";	1858	my $guard2 = cf::lock_acquire "map_load:$path";
1543		1859
1544	return if $self->in_memory != cf::MAP_SWAPPED;	1860	return if $self->in_memory != cf::MAP_SWAPPED;
1545		1861
1546	$self->in_memory (cf::MAP_LOADING);	1862	$self->in_memory (cf::MAP_LOADING);
1547		1863
1548	$self->alloc;	1864	$self->alloc;
1549		1865
1550	$self->pre_load;	1866	$self->pre_load;
1551	Coro::cede;	1867	cf::cede_to_tick;
1552		1868
1553	$self->_load_objects ($self->{load_path}, 1)	1869	$self->_load_objects ($self->{load_path}, 1)
1554	or return;	1870	or return;
1555		1871
1556	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1872	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
…		…
1562	$self->clear_unique_items;	1878	$self->clear_unique_items;
1563	$self->_load_objects ($uniq, 0);	1879	$self->_load_objects ($uniq, 0);
1564	}	1880	}
1565	}	1881	}
1566		1882
1567	Coro::cede;	1883	cf::cede_to_tick;
1568	# now do the right thing for maps	1884	# now do the right thing for maps
1569	$self->link_multipart_objects;	1885	$self->link_multipart_objects;
1570	$self->difficulty ($self->estimate_difficulty)	1886	$self->difficulty ($self->estimate_difficulty)
1571	unless $self->difficulty;	1887	unless $self->difficulty;
1572	Coro::cede;	1888	cf::cede_to_tick;
1573		1889
1574	unless ($self->{deny_activate}) {	1890	unless ($self->{deny_activate}) {
1575	$self->decay_objects;	1891	$self->decay_objects;
1576	$self->fix_auto_apply;	1892	$self->fix_auto_apply;
1577	$self->update_buttons;	1893	$self->update_buttons;
1578	Coro::cede;	1894	cf::cede_to_tick;
1579	$self->set_darkness_map;	1895	$self->set_darkness_map;
1580	Coro::cede;	1896	cf::cede_to_tick;
1581	$self->activate;	1897	$self->activate;
1582	}	1898	}
		1899
		1900	$self->{last_save} = $cf::RUNTIME;
		1901	$self->last_access ($cf::RUNTIME);
1583		1902
1584	$self->in_memory (cf::MAP_IN_MEMORY);	1903	$self->in_memory (cf::MAP_IN_MEMORY);
1585	}	1904	}
1586		1905
1587	$self->post_load;	1906	$self->post_load;
…		…
1598		1917
1599	$self	1918	$self
1600	}	1919	}
1601		1920
1602	# find and load all maps in the 3x3 area around a map	1921	# find and load all maps in the 3x3 area around a map
1603	sub load_diag {	1922	sub load_neighbours {
1604	my ($map) = @_;	1923	my ($map) = @_;
1605		1924
1606	my @diag; # diagonal neighbours	1925	my @neigh; # diagonal neighbours
1607		1926
1608	for (0 .. 3) {	1927	for (0 .. 3) {
1609	my $neigh = $map->tile_path ($_)	1928	my $neigh = $map->tile_path ($_)
1610	or next;	1929	or next;
1611	$neigh = find $neigh, $map	1930	$neigh = find $neigh, $map
1612	or next;	1931	or next;
1613	$neigh->load;	1932	$neigh->load;
1614		1933
		1934	push @neigh,
1615	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	1935	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1616	[$neigh->tile_path (($_ + 1) % 4), $neigh];	1936	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1617	}	1937	}
1618		1938
1619	for (@diag) {	1939	for (grep defined $_->[0], @neigh) {
		1940	my ($path, $origin) = @$_;
1620	my $neigh = find @$_	1941	my $neigh = find $path, $origin
1621	or next;	1942	or next;
1622	$neigh->load;	1943	$neigh->load;
1623	}	1944	}
1624	}	1945	}
1625		1946
…		…
1630	}	1951	}
1631		1952
1632	sub do_load_sync {	1953	sub do_load_sync {
1633	my ($map) = @_;	1954	my ($map) = @_;
1634		1955
		1956	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		1957	if $Coro::current == $Coro::main;
		1958
1635	cf::sync_job { $map->load };	1959	cf::sync_job { $map->load };
1636	}	1960	}
1637		1961
1638	our %MAP_PREFETCH;	1962	our %MAP_PREFETCH;
1639	our $MAP_PREFETCHER = undef;	1963	our $MAP_PREFETCHER = undef;
1640		1964
1641	sub find_async {	1965	sub find_async {
1642	my ($path, $origin) = @_;	1966	my ($path, $origin, $load) = @_;
1643		1967
1644	$path = normalise $path, $origin && $origin->{path};	1968	$path = normalise $path, $origin && $origin->{path};
1645		1969
1646	if (my $map = $cf::MAP{$path}) {	1970	if (my $map = $cf::MAP{$path}) {
1647	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	1971	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1648	}	1972	}
1649		1973
1650	undef $MAP_PREFETCH{$path};	1974	$MAP_PREFETCH{$path} |= $load;
		1975
1651	$MAP_PREFETCHER ||= cf::async {	1976	$MAP_PREFETCHER ||= cf::async {
1652	while (%MAP_PREFETCH) {	1977	while (%MAP_PREFETCH) {
1653	for my $path (keys %MAP_PREFETCH) {	1978	while (my ($k, $v) = each %MAP_PREFETCH) {
1654	my $map = find $path	1979	if (my $map = find $k) {
1655	or next;
1656	$map->load;	1980	$map->load if $v;
		1981	}
1657		1982
1658	delete $MAP_PREFETCH{$path};	1983	delete $MAP_PREFETCH{$k};
1659	}	1984	}
1660	}	1985	}
1661	undef $MAP_PREFETCHER;	1986	undef $MAP_PREFETCHER;
1662	};	1987	};
1663	$MAP_PREFETCHER->prio (6);	1988	$MAP_PREFETCHER->prio (6);
…		…
1666	}	1991	}
1667		1992
1668	sub save {	1993	sub save {
1669	my ($self) = @_;	1994	my ($self) = @_;
1670		1995
1671	my $lock = cf::lock_acquire "map_data:" . $self->path;	1996	my $lock = cf::lock_acquire "map_data:$self->{path}";
1672		1997
1673	$self->{last_save} = $cf::RUNTIME;	1998	$self->{last_save} = $cf::RUNTIME;
1674		1999
1675	return unless $self->dirty;	2000	return unless $self->dirty;
1676		2001
…		…
1699	my ($self) = @_;	2024	my ($self) = @_;
1700		2025
1701	# save first because save cedes	2026	# save first because save cedes
1702	$self->save;	2027	$self->save;
1703		2028
1704	my $lock = cf::lock_acquire "map_data:" . $self->path;	2029	my $lock = cf::lock_acquire "map_data:$self->{path}";
1705		2030
1706	return if $self->players;	2031	return if $self->players;
1707	return if $self->in_memory != cf::MAP_IN_MEMORY;	2032	return if $self->in_memory != cf::MAP_IN_MEMORY;
1708	return if $self->{deny_save};	2033	return if $self->{deny_save};
1709		2034
…		…
1761	my $nuke_counter = "aaaa";	2086	my $nuke_counter = "aaaa";
1762		2087
1763	sub nuke {	2088	sub nuke {
1764	my ($self) = @_;	2089	my ($self) = @_;
1765		2090
		2091	{
		2092	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2093
1766	delete $cf::MAP{$self->path};	2094	delete $cf::MAP{$self->path};
1767		2095
1768	$self->unlink_save;
1769
1770	bless $self, "cf::map";	2096	bless $self, "cf::map";
1771	delete $self->{deny_reset};	2097	delete $self->{deny_reset};
1772	$self->{deny_save} = 1;	2098	$self->{deny_save} = 1;
1773	$self->reset_timeout (1);	2099	$self->reset_timeout (1);
1774	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2100	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1775		2101
		2102	$self->unlink_save;
		2103
1776	$cf::MAP{$self->path} = $self;	2104	$cf::MAP{$self->path} = $self;
		2105	}
1777		2106
1778	$self->reset; # polite request, might not happen	2107	$self->reset; # polite request, might not happen
1779	}	2108	}
1780		2109
1781	=item $maps = cf::map::tmp_maps	2110	=item $maps = cf::map::tmp_maps
…		…
1883		2212
1884	$flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;	2213	$flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1885		2214
1886	if ($self->{record_replies}) {	2215	if ($self->{record_replies}) {
1887	push @{ $self->{record_replies} }, [$npc, $msg, $flags];	2216	push @{ $self->{record_replies} }, [$npc, $msg, $flags];
		2217
1888	} else {	2218	} else {
		2219	my $pl = $self->contr;
		2220
		2221	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
		2222	my $dialog = $pl->{npc_dialog};
		2223	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
		2224
		2225	} else {
1889	$msg = $npc->name . " says: $msg" if $npc;	2226	$msg = $npc->name . " says: $msg" if $npc;
1890	$self->message ($msg, $flags);	2227	$self->message ($msg, $flags);
		2228	}
1891	}	2229	}
		2230	}
		2231
		2232	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2233
		2234	=cut
		2235
		2236	sub cf::object::send_msg {
		2237	my $pl = shift->contr
		2238	or return;
		2239	$pl->send_msg (@_);
1892	}	2240	}
1893		2241
1894	=item $player_object->may ("access")	2242	=item $player_object->may ("access")
1895		2243
1896	Returns wether the given player is authorized to access resource "access"	2244	Returns wether the given player is authorized to access resource "access"
…		…
1975	# use -1 or undef as default coordinates, not 0, 0	2323	# use -1 or undef as default coordinates, not 0, 0
1976	($x, $y) = ($map->enter_x, $map->enter_y)	2324	($x, $y) = ($map->enter_x, $map->enter_y)
1977	if $x <=0 && $y <= 0;	2325	if $x <=0 && $y <= 0;
1978		2326
1979	$map->load;	2327	$map->load;
1980	$map->load_diag;	2328	$map->load_neighbours;
1981		2329
1982	return unless $self->contr->active;	2330	return unless $self->contr->active;
1983	$self->activate_recursive;	2331	$self->activate_recursive;
1984		2332
1985	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2333	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1986	$self->enter_map ($map, $x, $y);	2334	$self->enter_map ($map, $x, $y);
1987	}	2335	}
1988		2336
1989	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2337	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1990		2338
1991	Moves the player to the given map-path and coordinates by first freezing	2339	Moves the player to the given map-path and coordinates by first freezing
1992	her, loading and preparing them map, calling the provided $check callback	2340	her, loading and preparing them map, calling the provided $check callback
1993	that has to return the map if sucecssful, and then unfreezes the player on	2341	that has to return the map if sucecssful, and then unfreezes the player on
1994	the new (success) or old (failed) map position.	2342	the new (success) or old (failed) map position. In either case, $done will
		2343	be called at the end of this process.
1995		2344
1996	=cut	2345	=cut
1997		2346
1998	our $GOTOGEN;	2347	our $GOTOGEN;
1999		2348
2000	sub cf::object::player::goto {	2349	sub cf::object::player::goto {
2001	my ($self, $path, $x, $y, $check) = @_;	2350	my ($self, $path, $x, $y, $check, $done) = @_;
2002		2351
2003	# do generation counting so two concurrent goto's will be executed in-order	2352	# do generation counting so two concurrent goto's will be executed in-order
2004	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2353	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2005		2354
2006	$self->enter_link;	2355	$self->enter_link;
…		…
2026		2375
2027	if ($gen == $self->{_goto_generation}) {	2376	if ($gen == $self->{_goto_generation}) {
2028	delete $self->{_goto_generation};	2377	delete $self->{_goto_generation};
2029	$self->leave_link ($map, $x, $y);	2378	$self->leave_link ($map, $x, $y);
2030	}	2379	}
		2380
		2381	$done->() if $done;
2031	})->prio (1);	2382	})->prio (1);
2032	}	2383	}
2033		2384
2034	=item $player_object->enter_exit ($exit_object)	2385	=item $player_object->enter_exit ($exit_object)
2035		2386
…		…
2104	my $hp = $exit->stats->hp;	2455	my $hp = $exit->stats->hp;
2105	my $sp = $exit->stats->sp;	2456	my $sp = $exit->stats->sp;
2106		2457
2107	$self->enter_link;	2458	$self->enter_link;
2108		2459
		2460	# if exit is damned, update players death & WoR home-position
		2461	$self->contr->savebed ($slaying, $hp, $sp)
		2462	if $exit->flag (FLAG_DAMNED);
		2463
2109	(async {	2464	(async {
2110	$self->deactivate_recursive; # just to be sure	2465	$self->deactivate_recursive; # just to be sure
2111	unless (eval {	2466	unless (eval {
2112	$self->goto ($slaying, $hp, $sp);	2467	$self->goto ($slaying, $hp, $sp);
2113		2468
…		…
2140		2495
2141	utf8::encode $text;	2496	utf8::encode $text;
2142	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2497	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2143	}	2498	}
2144		2499
		2500	=item $client->send_msg ($channel, $msg, $color, [extra...])
		2501
		2502	Send a drawinfo or msg packet to the client, formatting the msg for the
		2503	client if neccessary. C<$type> should be a string identifying the type of
		2504	the message, with C<log> being the default. If C<$color> is negative, suppress
		2505	the message unless the client supports the msg packet.
		2506
		2507	=cut
		2508
		2509	sub cf::client::send_msg {
		2510	my ($self, $channel, $msg, $color, @extra) = @_;
		2511
		2512	$msg = $self->pl->expand_cfpod ($msg);
		2513
		2514	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2515
		2516	if (ref $channel) {
		2517	# send meta info to client, if not yet sent
		2518	unless (exists $self->{channel}{$channel->{id}}) {
		2519	$self->{channel}{$channel->{id}} = $channel;
		2520	$self->ext_msg (channel_info => $channel);
		2521	}
		2522
		2523	$channel = $channel->{id};
		2524	}
		2525
		2526	return unless @extra || length $msg;
		2527
		2528	if ($self->can_msg) {
		2529	# default colour, mask it out
		2530	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2531	if $color & cf::NDI_DEF;
		2532
		2533	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2534	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
		2535	} else {
		2536	if ($color >= 0) {
		2537	# replace some tags by gcfclient-compatible ones
		2538	for ($msg) {
		2539	1 while
		2540	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2541	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2542	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2543	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2544	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2545	}
		2546
		2547	$color &= cf::NDI_COLOR_MASK;
		2548
		2549	utf8::encode $msg;
		2550
		2551	if (0 && $msg =~ /\[/) {
		2552	# COMMAND/INFO
		2553	$self->send_packet ("drawextinfo $color 10 8 $msg")
		2554	} else {
		2555	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
		2556	$self->send_packet ("drawinfo $color $msg")
		2557	}
		2558	}
		2559	}
		2560	}
		2561
2145	=item $client->ext_event ($type, %msg)	2562	=item $client->ext_msg ($type, @msg)
2146		2563
2147	Sends an exti event to the client.	2564	Sends an ext event to the client.
2148		2565
2149	=cut	2566	=cut
2150		2567
2151	sub cf::client::ext_event($$%) {	2568	sub cf::client::ext_msg($$@) {
2152	my ($self, $type, %msg) = @_;	2569	my ($self, $type, @msg) = @_;
2153		2570
		2571	if ($self->extcmd == 2) {
		2572	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2573	} elsif ($self->extcmd == 1) { # TODO: remove
2154	$msg{msgtype} = "event_$type";	2574	push @msg, msgtype => "event_$type";
2155	$self->send_packet ("ext " . cf::to_json \%msg);	2575	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2576	}
		2577	}
		2578
		2579	=item $client->ext_reply ($msgid, @msg)
		2580
		2581	Sends an ext reply to the client.
		2582
		2583	=cut
		2584
		2585	sub cf::client::ext_reply($$@) {
		2586	my ($self, $id, @msg) = @_;
		2587
		2588	if ($self->extcmd == 2) {
		2589	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2590	} elsif ($self->extcmd == 1) {
		2591	#TODO: version 1, remove
		2592	unshift @msg, msgtype => "reply", msgid => $id;
		2593	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2594	}
2156	}	2595	}
2157		2596
2158	=item $success = $client->query ($flags, "text", \&cb)	2597	=item $success = $client->query ($flags, "text", \&cb)
2159		2598
2160	Queues a query to the client, calling the given callback with	2599	Queues a query to the client, calling the given callback with
2161	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2600	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2162	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.	2601	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2163		2602
2164	Queries can fail, so check the return code. Or don't, as queries will become	2603	Queries can fail, so check the return code. Or don't, as queries will
2165	reliable at some point in the future.	2604	become reliable at some point in the future.
2166		2605
2167	=cut	2606	=cut
2168		2607
2169	sub cf::client::query {	2608	sub cf::client::query {
2170	my ($self, $flags, $text, $cb) = @_;	2609	my ($self, $flags, $text, $cb) = @_;
…		…
2178	utf8::encode $text;	2617	utf8::encode $text;
2179	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];	2618	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2180		2619
2181	$self->send_packet ($self->{query_queue}[0][0])	2620	$self->send_packet ($self->{query_queue}[0][0])
2182	if @{ $self->{query_queue} } == 1;	2621	if @{ $self->{query_queue} } == 1;
		2622
		2623	1
2183	}	2624	}
2184		2625
2185	cf::client->attach (	2626	cf::client->attach (
		2627	on_connect => sub {
		2628	my ($ns) = @_;
		2629
		2630	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2631	},
2186	on_reply => sub {	2632	on_reply => sub {
2187	my ($ns, $msg) = @_;	2633	my ($ns, $msg) = @_;
2188		2634
2189	# this weird shuffling is so that direct followup queries	2635	# this weird shuffling is so that direct followup queries
2190	# get handled first	2636	# get handled first
…		…
2202	} else {	2648	} else {
2203	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;	2649	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2204	}	2650	}
2205	}	2651	}
2206	},	2652	},
		2653	on_exticmd => sub {
		2654	my ($ns, $buf) = @_;
		2655
		2656	my $msg = eval { $ns->{json_coder}->decode ($buf) };
		2657
		2658	if (ref $msg) {
		2659	my ($type, $reply, @payload) =
		2660	"ARRAY" eq ref $msg
		2661	? @$msg
		2662	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2663
		2664	my @reply;
		2665
		2666	if (my $cb = $EXTICMD{$type}) {
		2667	@reply = $cb->($ns, @payload);
		2668	}
		2669
		2670	$ns->ext_reply ($reply, @reply)
		2671	if $reply;
		2672
		2673	} else {
		2674	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
		2675	}
		2676
		2677	cf::override;
		2678	},
2207	);	2679	);
2208		2680
2209	=item $client->async (\&cb)	2681	=item $client->async (\&cb)
2210		2682
2211	Create a new coroutine, running the specified callback. The coroutine will	2683	Create a new coroutine, running the specified callback. The coroutine will
…		…
2252	our $safe = new Safe "safe";	2724	our $safe = new Safe "safe";
2253	our $safe_hole = new Safe::Hole;	2725	our $safe_hole = new Safe::Hole;
2254		2726
2255	$SIG{FPE} = 'IGNORE';	2727	$SIG{FPE} = 'IGNORE';
2256		2728
2257	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2729	$safe->permit_only (Opcode::opset qw(
		2730	:base_core :base_mem :base_orig :base_math
		2731	grepstart grepwhile mapstart mapwhile
		2732	sort time
		2733	));
2258		2734
2259	# here we export the classes and methods available to script code	2735	# here we export the classes and methods available to script code
2260		2736
2261	=pod	2737	=pod
2262		2738
2263	The following functions and methods are available within a safe environment:	2739	The following functions and methods are available within a safe environment:
2264		2740
2265	cf::object contr pay_amount pay_player map	2741	cf::object
		2742	contr pay_amount pay_player map x y force_find force_add
		2743	insert remove name archname title slaying race decrease_ob_nr
		2744
2266	cf::object::player player	2745	cf::object::player
2267	cf::player peaceful	2746	player
2268	cf::map trigger	2747
		2748	cf::player
		2749	peaceful
		2750
		2751	cf::map
		2752	trigger
2269		2753
2270	=cut	2754	=cut
2271		2755
2272	for (	2756	for (
2273	["cf::object" => qw(contr pay_amount pay_player map)],	2757	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2758	insert remove inv name archname title slaying race
		2759	decrease_ob_nr)],
2274	["cf::object::player" => qw(player)],	2760	["cf::object::player" => qw(player)],
2275	["cf::player" => qw(peaceful)],	2761	["cf::player" => qw(peaceful)],
2276	["cf::map" => qw(trigger)],	2762	["cf::map" => qw(trigger)],
2277	) {	2763	) {
2278	no strict 'refs';	2764	no strict 'refs';
…		…
2349	=back	2835	=back
2350		2836
2351	=cut	2837	=cut
2352		2838
2353	#############################################################################	2839	#############################################################################
2354
2355	=head2 EXTENSION DATABASE SUPPORT
2356
2357	Crossfire maintains a very simple database for extension use. It can
2358	currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2359	convert to/from binary).
2360
2361	The parameter C<$family> should best start with the name of the extension
2362	using it, it should be unique.
2363
2364	=over 4
2365
2366	=item $value = cf::db_get $family => $key
2367
2368	Returns a single value from the database.
2369
2370	=item cf::db_put $family => $key => $value
2371
2372	Stores the given C<$value> in the family.
2373
2374	=cut
2375
2376	our $DB;
2377
2378	sub db_init {
2379	unless ($DB) {
2380	$DB = BDB::db_create $DB_ENV;
2381
2382	cf::sync_job {
2383	eval {
2384	$DB->set_flags (BDB::CHKSUM);
2385
2386	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2387	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2388	cf::cleanup "db_open(db): $!" if $!;
2389	};
2390	cf::cleanup "db_open(db): $@" if $@;
2391	};
2392	}
2393	}
2394
2395	sub db_get($$) {
2396	my $key = "$_[0]/$_[1]";
2397
2398	cf::sync_job {
2399	BDB::db_get $DB, undef, $key, my $data;
2400
2401	$! ? ()
2402	: $data
2403	}
2404	}
2405
2406	sub db_put($$$) {
2407	BDB::dbreq_pri 4;
2408	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2409	}
2410
2411	=item cf::cache $id => [$paths...], $processversion => $process
2412
2413	Generic caching function that returns the value of the resource $id,
2414	caching and regenerating as required.
2415
2416	This function can block.
2417
2418	=cut
2419
2420	sub cache {
2421	my ($id, $src, $processversion, $process) = @_;
2422
2423	my $meta =
2424	join "\x00",
2425	$processversion,
2426	map {
2427	aio_stat $_
2428	and Carp::croak "$_: $!";
2429
2430	($_, (stat _)[7,9])
2431	} @$src;
2432
2433	my $dbmeta = db_get cache => "$id/meta";
2434	if ($dbmeta ne $meta) {
2435	# changed, we may need to process
2436
2437	my @data;
2438	my $md5;
2439
2440	for (0 .. $#$src) {
2441	0 <= aio_load $src->[$_], $data[$_]
2442	or Carp::croak "$src->[$_]: $!";
2443	}
2444
2445	# if processing is expensive, check
2446	# checksum first
2447	if (1) {
2448	$md5 =
2449	join "\x00",
2450	$processversion,
2451	map {
2452	Coro::cede;
2453	($src->[$_], Digest::MD5::md5_hex $data[$_])
2454	} 0.. $#$src;
2455
2456
2457	my $dbmd5 = db_get cache => "$id/md5";
2458	if ($dbmd5 eq $md5) {
2459	db_put cache => "$id/meta", $meta;
2460
2461	return db_get cache => "$id/data";
2462	}
2463	}
2464
2465	my $t1 = Time::HiRes::time;
2466	my $data = $process->(\@data);
2467	my $t2 = Time::HiRes::time;
2468
2469	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2470
2471	db_put cache => "$id/data", $data;
2472	db_put cache => "$id/md5" , $md5;
2473	db_put cache => "$id/meta", $meta;
2474
2475	return $data;
2476	}
2477
2478	db_get cache => "$id/data"
2479	}
2480
2481	=item fork_call { }, $args
2482
2483	Executes the given code block with the given arguments in a seperate
2484	process, returning the results. Everything must be serialisable with
2485	Coro::Storable. May, of course, block. Note that the executed sub may
2486	never block itself or use any form of Event handling.
2487
2488	=cut
2489
2490	sub fork_call(&@) {
2491	my ($cb, @args) = @_;
2492
2493	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2494	# or die "socketpair: $!";
2495	pipe my $fh1, my $fh2
2496	or die "pipe: $!";
2497
2498	if (my $pid = fork) {
2499	close $fh2;
2500
2501	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2502	$res = Coro::Storable::thaw $res;
2503
2504	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2505
2506	die $$res unless "ARRAY" eq ref $res;
2507
2508	return wantarray ? @$res : $res->[-1];
2509	} else {
2510	reset_signals;
2511	local $SIG{__WARN__};
2512	local $SIG{__DIE__};
2513	eval {
2514	close $fh1;
2515
2516	my @res = eval { $cb->(@args) };
2517	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2518	};
2519
2520	warn $@ if $@;
2521	_exit 0;
2522	}
2523	}
2524
2525	#############################################################################
2526	# the server's init and main functions	2840	# the server's init and main functions
2527		2841
2528	sub load_facedata($) {	2842	sub load_facedata($) {
2529	my ($path) = @_;	2843	my ($path) = @_;
		2844
		2845	# HACK to clear player env face cache, we need some signal framework
		2846	# for this (global event?)
		2847	%ext::player_env::MUSIC_FACE_CACHE = ();
		2848
		2849	my $enc = JSON::XS->new->utf8->canonical->relaxed;
2530		2850
2531	warn "loading facedata from $path\n";	2851	warn "loading facedata from $path\n";
2532		2852
2533	my $facedata;	2853	my $facedata;
2534	0 < aio_load $path, $facedata	2854	0 < aio_load $path, $facedata
…		…
2537	$facedata = Coro::Storable::thaw $facedata;	2857	$facedata = Coro::Storable::thaw $facedata;
2538		2858
2539	$facedata->{version} == 2	2859	$facedata->{version} == 2
2540	or cf::cleanup "$path: version mismatch, cannot proceed.";	2860	or cf::cleanup "$path: version mismatch, cannot proceed.";
2541		2861
		2862	# patch in the exptable
		2863	$facedata->{resource}{"res/exp_table"} = {
		2864	type => FT_RSRC,
		2865	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		2866	};
		2867	cf::cede_to_tick;
		2868
2542	{	2869	{
2543	my $faces = $facedata->{faceinfo};	2870	my $faces = $facedata->{faceinfo};
2544		2871
2545	while (my ($face, $info) = each %$faces) {	2872	while (my ($face, $info) = each %$faces) {
2546	my $idx = (cf::face::find $face) || cf::face::alloc $face;	2873	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2547	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	2874	cf::face::set_visibility $idx, $info->{visibility};
		2875	cf::face::set_magicmap $idx, $info->{magicmap};
2548	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	2876	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2549	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	2877	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2550	Coro::cede;	2878
		2879	cf::cede_to_tick;
2551	}	2880	}
2552		2881
2553	while (my ($face, $info) = each %$faces) {	2882	while (my ($face, $info) = each %$faces) {
2554	next unless $info->{smooth};	2883	next unless $info->{smooth};
2555	my $idx = cf::face::find $face	2884	my $idx = cf::face::find $face
2556	or next;	2885	or next;
2557	if (my $smooth = cf::face::find $info->{smooth}) {	2886	if (my $smooth = cf::face::find $info->{smooth}) {
		2887	cf::face::set_smooth $idx, $smooth;
2558	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	2888	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2559	} else {	2889	} else {
2560	warn "smooth face '$info->{smooth}' not found for face '$face'";	2890	warn "smooth face '$info->{smooth}' not found for face '$face'";
2561	}	2891	}
2562	Coro::cede;	2892
		2893	cf::cede_to_tick;
2563	}	2894	}
2564	}	2895	}
2565		2896
2566	{	2897	{
2567	my $anims = $facedata->{animinfo};	2898	my $anims = $facedata->{animinfo};
2568		2899
2569	while (my ($anim, $info) = each %$anims) {	2900	while (my ($anim, $info) = each %$anims) {
2570	cf::anim::set $anim, $info->{frames}, $info->{facings};	2901	cf::anim::set $anim, $info->{frames}, $info->{facings};
2571	Coro::cede;	2902	cf::cede_to_tick;
2572	}	2903	}
2573		2904
2574	cf::anim::invalidate_all; # d'oh	2905	cf::anim::invalidate_all; # d'oh
2575	}	2906	}
2576		2907
		2908	{
		2909	# TODO: for gcfclient pleasure, we should give resources
		2910	# that gcfclient doesn't grok a >10000 face index.
		2911	my $res = $facedata->{resource};
		2912
		2913	my $soundconf = delete $res->{"res/sound.conf"};
		2914
		2915	while (my ($name, $info) = each %$res) {
		2916	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		2917	my $data;
		2918
		2919	if ($info->{type} & 1) {
		2920	# prepend meta info
		2921
		2922	my $meta = $enc->encode ({
		2923	name => $name,
		2924	%{ $info->{meta} || {} },
		2925	});
		2926
		2927	$data = pack "(w/a*)*", $meta, $info->{data};
		2928	} else {
		2929	$data = $info->{data};
		2930	}
		2931
		2932	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		2933	cf::face::set_type $idx, $info->{type};
		2934
		2935	cf::cede_to_tick;
		2936	}
		2937
		2938	if ($soundconf) {
		2939	$soundconf = $enc->decode (delete $soundconf->{data});
		2940
		2941	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		2942	my $sound = $soundconf->{compat}[$_]
		2943	or next;
		2944
		2945	my $face = cf::face::find "sound/$sound->[1]";
		2946	cf::sound::set $sound->[0] => $face;
		2947	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		2948	}
		2949
		2950	while (my ($k, $v) = each %{$soundconf->{event}}) {
		2951	my $face = cf::face::find "sound/$v";
		2952	cf::sound::set $k => $face;
		2953	}
		2954	}
		2955	}
		2956
2577	1	2957	1
2578	}	2958	}
2579		2959
		2960	register_exticmd fx_want => sub {
		2961	my ($ns, $want) = @_;
		2962
		2963	while (my ($k, $v) = each %$want) {
		2964	$ns->fx_want ($k, $v);
		2965	}
		2966	};
		2967
2580	sub reload_regions {	2968	sub reload_regions {
		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
2581	load_resource_file "$MAPDIR/regions"	2973	load_resource_file "$MAPDIR/regions"
2582	or die "unable to load regions file\n";	2974	or die "unable to load regions file\n";
		2975
		2976	for (cf::region::list) {
		2977	$_->{match} = qr/$_->{match}/
		2978	if exists $_->{match};
		2979	}
2583	}	2980	}
2584		2981
2585	sub reload_facedata {	2982	sub reload_facedata {
2586	load_facedata "$DATADIR/facedata"	2983	load_facedata "$DATADIR/facedata"
2587	or die "unable to load facedata\n";	2984	or die "unable to load facedata\n";
2588	}	2985	}
2589		2986
2590	sub reload_archetypes {	2987	sub reload_archetypes {
		2988	load_resource_file "$DATADIR/archetypes"
		2989	or die "unable to load archetypes\n";
		2990	#d# NEED to laod twice to resolve forward references
		2991	# this really needs to be done in an extra post-pass
		2992	# (which needs to be synchronous, so solve it differently)
2591	load_resource_file "$DATADIR/archetypes"	2993	load_resource_file "$DATADIR/archetypes"
2592	or die "unable to load archetypes\n";	2994	or die "unable to load archetypes\n";
2593	}	2995	}
2594		2996
2595	sub reload_treasures {	2997	sub reload_treasures {
…		…
2611		3013
2612	sub init {	3014	sub init {
2613	reload_resources;	3015	reload_resources;
2614	}	3016	}
2615		3017
2616	sub cfg_load {	3018	sub reload_config {
2617	open my $fh, "<:utf8", "$CONFDIR/config"	3019	open my $fh, "<:utf8", "$CONFDIR/config"
2618	or return;	3020	or return;
2619		3021
2620	local $/;	3022	local $/;
2621	*CFG = YAML::Syck::Load <$fh>;	3023	*CFG = YAML::Syck::Load <$fh>;
…		…
2641	(async {	3043	(async {
2642	Event::one_event;	3044	Event::one_event;
2643	})->prio (Coro::PRIO_MAX);	3045	})->prio (Coro::PRIO_MAX);
2644	};	3046	};
2645		3047
2646	cfg_load;	3048	reload_config;
2647	db_init;	3049	db_init;
2648	load_extensions;	3050	load_extensions;
2649		3051
2650	$TICK_WATCHER->start;	3052	$TICK_WATCHER->start;
2651	Event::loop;	3053	Event::loop;
…		…
2667	},	3069	},
2668	);	3070	);
2669	}	3071	}
2670	}	3072	}
2671		3073
		3074	sub write_runtime {
		3075	my $runtime = "$LOCALDIR/runtime";
		3076
		3077	# first touch the runtime file to show we are still running:
		3078	# the fsync below can take a very very long time.
		3079
		3080	IO::AIO::aio_utime $runtime, undef, undef;
		3081
		3082	my $guard = cf::lock_acquire "write_runtime";
		3083
		3084	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
		3085	or return;
		3086
		3087	my $value = $cf::RUNTIME + 90 + 10;
		3088	# 10 is the runtime save interval, for a monotonic clock
		3089	# 60 allows for the watchdog to kill the server.
		3090
		3091	(aio_write $fh, 0, (length $value), $value, 0) <= 0
		3092	and return;
		3093
		3094	# always fsync - this file is important
		3095	aio_fsync $fh
		3096	and return;
		3097
		3098	# touch it again to show we are up-to-date
		3099	aio_utime $fh, undef, undef;
		3100
		3101	close $fh
		3102	or return;
		3103
		3104	aio_rename "$runtime~", $runtime
		3105	and return;
		3106
		3107	warn "runtime file written.\n";
		3108
		3109	1
		3110	}
		3111
2672	sub emergency_save() {	3112	sub emergency_save() {
2673	my $freeze_guard = cf::freeze_mainloop;	3113	my $freeze_guard = cf::freeze_mainloop;
2674		3114
2675	warn "enter emergency perl save\n";	3115	warn "enter emergency perl save\n";
2676		3116
…		…
2751	%EXT_CORO = ();	3191	%EXT_CORO = ();
2752		3192
2753	warn "removing commands";	3193	warn "removing commands";
2754	%COMMAND = ();	3194	%COMMAND = ();
2755		3195
2756	warn "removing ext commands";	3196	warn "removing ext/exti commands";
2757	%EXTCMD = ();	3197	%EXTCMD = ();
		3198	%EXTICMD = ();
2758		3199
2759	warn "unloading/nuking all extensions";	3200	warn "unloading/nuking all extensions";
2760	for my $pkg (@EXTS) {	3201	for my $pkg (@EXTS) {
2761	warn "... unloading $pkg";	3202	warn "... unloading $pkg";
2762		3203
…		…
2805	warn "reloading cf.pm";	3246	warn "reloading cf.pm";
2806	require cf;	3247	require cf;
2807	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3248	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2808		3249
2809	warn "loading config and database again";	3250	warn "loading config and database again";
2810	cf::cfg_load;	3251	cf::reload_config;
2811		3252
2812	warn "loading extensions";	3253	warn "loading extensions";
2813	cf::load_extensions;	3254	cf::load_extensions;
2814		3255
2815	warn "reattaching attachments to objects/players";	3256	warn "reattaching attachments to objects/players";

Diff Legend

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