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.260 by root, Fri Apr 27 19:53:05 2007 UTC vs.
Revision 1.351 by root, Sun Sep 2 00:57:38 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;
…		…
90	our $LINK_MAP; # the special {link} map, which is always available	94	our $LINK_MAP; # the special {link} map, which is always available
91		95
92	# used to convert map paths into valid unix filenames by replacing / by ∕	96	# used to convert map paths into valid unix filenames by replacing / by ∕
93	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	97	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94		98
		99	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
		100	our $LOADAVG; # same thing, but with alpha-smoothing
		101	our $tick_start; # for load detecting purposes
		102
95	binmode STDOUT;	103	binmode STDOUT;
96	binmode STDERR;	104	binmode STDERR;
97		105
98	# read virtual server time, if available	106	# read virtual server time, if available
99	unless ($RUNTIME || !-e "$LOCALDIR/runtime") {	107	unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
…		…
139		147
140	=item $cf::TICK	148	=item $cf::TICK
141		149
142	The interval between server ticks, in seconds.	150	The interval between server ticks, in seconds.
143		151
		152	=item $cf::LOADAVG
		153
		154	The current CPU load on the server (alpha-smoothed), as a value between 0
		155	(none) and 1 (overloaded), indicating how much time is spent on processing
		156	objects per tick. Healthy values are < 0.5.
		157
		158	=item $cf::LOAD
		159
		160	The raw value load value from the last tick.
		161
144	=item %cf::CFG	162	=item %cf::CFG
145		163
146	Configuration for the server, loaded from C</etc/crossfire/config>, or	164	Configuration for the server, loaded from C</etc/crossfire/config>, or
147	from wherever your confdir points to.	165	from wherever your confdir points to.
148		166
149	=item cf::wait_for_tick, cf::wait_for_tick_begin	167	=item cf::wait_for_tick, cf::wait_for_tick_begin
150		168
151	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
152	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
153	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.
		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.
154		178
155	=back	179	=back
156		180
157	=cut	181	=cut
158		182
…		…
173	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	197	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
174	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	198	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
175	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	199	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
176	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	200	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
177	@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';	201	@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
		202	@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
178	@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';	203	@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
179		204
180	# we bless all objects into (empty) derived classes to force a method lookup	205	# we bless all objects into (empty) derived classes to force a method lookup
181	# within the Safe compartment.	206	# within the Safe compartment.
182	for my $pkg (qw(	207	for my $pkg (qw(
183	cf::global cf::attachable	208	cf::global cf::attachable
…		…
191	}	216	}
192		217
193	$Event::DIED = sub {	218	$Event::DIED = sub {
194	warn "error in event callback: @_";	219	warn "error in event callback: @_";
195	};	220	};
		221
		222	#############################################################################
196		223
197	=head2 UTILITY FUNCTIONS	224	=head2 UTILITY FUNCTIONS
198		225
199	=over 4	226	=over 4
200		227
…		…
219	$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;
220	$d	247	$d
221	} || "[unable to dump $_[0]: '$@']";	248	} || "[unable to dump $_[0]: '$@']";
222	}	249	}
223		250
224	use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
225
226	=item $ref = cf::from_json $json	251	=item $ref = cf::from_json $json
227		252
228	Converts a JSON string into the corresponding perl data structure.	253	Converts a JSON string into the corresponding perl data structure.
229		254
230	=item $json = cf::to_json $ref	255	=item $json = cf::to_json $ref
231		256
232	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]) }
233		265
234	=item cf::lock_wait $string	266	=item cf::lock_wait $string
235		267
236	Wait until the given lock is available. See cf::lock_acquire.	268	Wait until the given lock is available. See cf::lock_acquire.
237		269
…		…
239		271
240	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
241	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,
242	for example when the coroutine gets canceled), the lock is automatically	274	for example when the coroutine gets canceled), the lock is automatically
243	returned.	275	returned.
		276
		277	Locks are *not* recursive, locking from the same coro twice results in a
		278	deadlocked coro.
244		279
245	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
246	uses map_find and cf::map::load uses map_load).	281	uses map_find and cf::map::load uses map_load).
247		282
248	=item $locked = cf::lock_active $string	283	=item $locked = cf::lock_active $string
…		…
291	};	326	};
292	$TICK_WATCHER->stop;	327	$TICK_WATCHER->stop;
293	$guard	328	$guard
294	}	329	}
295		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
296	=item cf::async { BLOCK }	387	=item cf::async { BLOCK }
297		388
298	Currently the same as Coro::async_pool, meaning you cannot use	389	Currently the same as Coro::async_pool, meaning you cannot use
299	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
300	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.
…		…
303		394
304	BEGIN { *async = \&Coro::async_pool }	395	BEGIN { *async = \&Coro::async_pool }
305		396
306	=item cf::sync_job { BLOCK }	397	=item cf::sync_job { BLOCK }
307		398
308	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)
309	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
310	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.
311		403
312	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
313	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
314	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
315	fast or be very important.	407	fast or be very important.
…		…
318		410
319	sub sync_job(&) {	411	sub sync_job(&) {
320	my ($job) = @_;	412	my ($job) = @_;
321		413
322	if ($Coro::current == $Coro::main) {	414	if ($Coro::current == $Coro::main) {
		415	my $time = Event::time;
		416
323	# this is the main coro, too bad, we have to block	417	# this is the main coro, too bad, we have to block
324	# till the operation succeeds, freezing the server :/	418	# till the operation succeeds, freezing the server :/
325		419
326	# TODO: use suspend/resume instead	420	# TODO: use suspend/resume instead
327	# (but this is cancel-safe)	421	# (but this is cancel-safe)
…		…
338		432
339	while ($busy) {	433	while ($busy) {
340	Coro::cede or Event::one_event;	434	Coro::cede or Event::one_event;
341	}	435	}
342		436
		437	$time = Event::time - $time;
		438
		439	LOG llevError | logBacktrace, Carp::longmess "long sync job"
		440	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
		441
		442	$tick_start += $time; # do not account sync jobs to server load
		443
343	wantarray ? @res : $res[0]	444	wantarray ? @res : $res[0]
344	} else {	445	} else {
345	# we are in another coroutine, how wonderful, everything just works	446	# we are in another coroutine, how wonderful, everything just works
346		447
347	$job->()	448	$job->()
…		…
366	$EXT_CORO{$coro+0} = $coro;	467	$EXT_CORO{$coro+0} = $coro;
367		468
368	$coro	469	$coro
369	}	470	}
370		471
371	sub write_runtime {	472	=item fork_call { }, $args
372	my $guard = cf::lock_acquire "write_runtime";
373		473
374	my $runtime = "$LOCALDIR/runtime";	474	Executes the given code block with the given arguments in a seperate
		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.
375		478
376	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	479	=cut
377	or return;
378		480
379	my $value = $cf::RUNTIME + 90 + 10;	481	sub fork_call(&@) {
380	# 10 is the runtime save interval, for a monotonic clock	482	my ($cb, @args) = @_;
381	# 60 allows for the watchdog to kill the server.
382		483
383	(aio_write $fh, 0, (length $value), $value, 0) <= 0	484	# we seemingly have to make a local copy of the whole thing,
384	and return;	485	# otherwise perl prematurely frees the stuff :/
		486	# TODO: investigate and fix (liekly this will be rather laborious)
385		487
386	# always fsync - this file is important	488	my @res = Coro::Util::fork_eval {
387	aio_fsync $fh	489	reset_signals;
388	and return;	490	&$cb
		491	}, @args;
389		492
390	close $fh	493	wantarray ? @res : $res[-1]
391	or return;	494	}
392		495
393	aio_rename "$runtime~", $runtime	496	=item $value = cf::db_get $family => $key
394	and return;
395		497
		498	Returns a single value from the environment database.
		499
		500	=item cf::db_put $family => $key => $value
		501
		502	Stores the given C<$value> in the family. It can currently store binary
		503	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
		504
		505	=cut
		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	};
396	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"
397	}	610	}
398		611
399	=item cf::datalog type => key => value, ...	612	=item cf::datalog type => key => value, ...
400		613
401	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.
…		…
419	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")
420	to it. All such attachable objects support the following methods.	633	to it. All such attachable objects support the following methods.
421		634
422	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>
423	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
424	crossfire+).	637	Crossfire TRT).
425		638
426	=over 4	639	=over 4
427		640
428	=item $attachable->attach ($attachment, key => $value...)	641	=item $attachable->attach ($attachment, key => $value...)
429		642
…		…
592	$registry = $CB_TYPE[$object_type] ||= [];	805	$registry = $CB_TYPE[$object_type] ||= [];
593		806
594	} elsif ($type eq "subtype") {	807	} elsif ($type eq "subtype") {
595	defined $object_type or Carp::croak "subtype specified without type";	808	defined $object_type or Carp::croak "subtype specified without type";
596	my $object_subtype = shift @arg;	809	my $object_subtype = shift @arg;
597	$registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= [];	810	$registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
598		811
599	} elsif ($type eq "package") {	812	} elsif ($type eq "package") {
600	my $pkg = shift @arg;	813	my $pkg = shift @arg;
601		814
602	while (my ($name, $id) = each %cb_id) {	815	while (my ($name, $id) = each %cb_id) {
…		…
631	_attach $registry, $klass, @attach;	844	_attach $registry, $klass, @attach;
632	}	845	}
633		846
634	$obj->{$name} = \%arg;	847	$obj->{$name} = \%arg;
635	} else {	848	} else {
636	warn "object uses attachment '$name' that is not available, postponing.\n";	849	warn "object uses attachment '$name' which is not available, postponing.\n";
637	}	850	}
638		851
639	$obj->{_attachment}{$name} = undef;	852	$obj->{_attachment}{$name} = undef;
640	}	853	}
641		854
…		…
643	if (ref $_[0]) {	856	if (ref $_[0]) {
644	_object_attach @_;	857	_object_attach @_;
645	} else {	858	} else {
646	_attach shift->_attach_registry, @_;	859	_attach shift->_attach_registry, @_;
647	}	860	}
		861	_recalc_want;
648	};	862	};
649		863
650	# all those should be optimised	864	# all those should be optimised
651	sub cf::attachable::detach {	865	sub cf::attachable::detach {
652	my ($obj, $name) = @_;	866	my ($obj, $name) = @_;
…		…
655	delete $obj->{_attachment}{$name};	869	delete $obj->{_attachment}{$name};
656	reattach ($obj);	870	reattach ($obj);
657	} else {	871	} else {
658	Carp::croak "cannot, currently, detach class attachments";	872	Carp::croak "cannot, currently, detach class attachments";
659	}	873	}
		874	_recalc_want;
660	};	875	};
661		876
662	sub cf::attachable::attached {	877	sub cf::attachable::attached {
663	my ($obj, $name) = @_;	878	my ($obj, $name) = @_;
664		879
…		…
679	";	894	";
680	die if $@;	895	die if $@;
681	}	896	}
682		897
683	our $override;	898	our $override;
684	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?
685		900
686	sub override {	901	sub override {
687	$override = 1;	902	$override = 1;
688	@invoke_results = ();	903	@INVOKE_RESULTS = (@_);
689	}	904	}
690		905
691	sub do_invoke {	906	sub do_invoke {
692	my $event = shift;	907	my $event = shift;
693	my $callbacks = shift;	908	my $callbacks = shift;
694		909
695	@invoke_results = ();	910	@INVOKE_RESULTS = ();
696		911
697	local $override;	912	local $override;
698		913
699	for (@$callbacks) {	914	for (@$callbacks) {
700	eval { &{$_->[1]} };	915	eval { &{$_->[1]} };
…		…
717		932
718	Generate an object-specific event with the given arguments.	933	Generate an object-specific event with the given arguments.
719		934
720	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
721	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
722	results (if you must, access C<@cf::invoke_results> directly).	937	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
723		938
724	=back	939	=back
725		940
726	=cut	941	=cut
727		942
728	#############################################################################	943	#############################################################################
729	# 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	}
730		956
731	sub reattach {	957	sub reattach {
732	# basically do the same as instantiate, without calling instantiate	958	# basically do the same as instantiate, without calling instantiate
733	my ($obj) = @_;	959	my ($obj) = @_;
734		960
…		…
837	or return;	1063	or return;
838	$av = eval { (Storable::thaw $av)->{objs} };	1064	$av = eval { (Storable::thaw $av)->{objs} };
839	}	1065	}
840		1066
841	warn sprintf "loading %s (%d)\n",	1067	warn sprintf "loading %s (%d)\n",
842	$filename, length $data, scalar @{$av || []};#d#	1068	$filename, length $data, scalar @{$av || []};
843	return ($data, $av);	1069	return ($data, $av);
844	}	1070	}
		1071
		1072	=head2 COMMAND CALLBACKS
		1073
		1074	=over 4
		1075
		1076	=cut
845		1077
846	#############################################################################	1078	#############################################################################
847	# command handling &c	1079	# command handling &c
848		1080
849	=item cf::register_command $name => \&callback($ob,$args);	1081	=item cf::register_command $name => \&callback($ob,$args);
…		…
862	push @{ $COMMAND{$name} }, [$caller, $cb];	1094	push @{ $COMMAND{$name} }, [$caller, $cb];
863	}	1095	}
864		1096
865	=item cf::register_extcmd $name => \&callback($pl,$packet);	1097	=item cf::register_extcmd $name => \&callback($pl,$packet);
866		1098
867	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.
868		1104
869	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
870	called.	1106	called.
871		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
872	=cut	1119	=cut
873		1120
874	sub register_extcmd {	1121	sub register_extcmd {
875	my ($name, $cb) = @_;	1122	my ($name, $cb) = @_;
876		1123
877	$EXTCMD{$name} = $cb;	1124	$EXTCMD{$name} = $cb;
		1125	}
		1126
		1127	sub register_exticmd {
		1128	my ($name, $cb) = @_;
		1129
		1130	$EXTICMD{$name} = $cb;
878	}	1131	}
879		1132
880	cf::player->attach (	1133	cf::player->attach (
881	on_command => sub {	1134	on_command => sub {
882	my ($pl, $name, $params) = @_;	1135	my ($pl, $name, $params) = @_;
…		…
891	cf::override;	1144	cf::override;
892	},	1145	},
893	on_extcmd => sub {	1146	on_extcmd => sub {
894	my ($pl, $buf) = @_;	1147	my ($pl, $buf) = @_;
895		1148
896	my $msg = eval { from_json $buf };	1149	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
897		1150
898	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
899	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1159	if (my $cb = $EXTCMD{$type}) {
900	if (my %reply = $cb->($pl, $msg)) {	1160	@reply = $cb->($pl, @payload);
901	$pl->ext_reply ($msg->{msgid}, %reply);
902	}
903	}	1161	}
		1162
		1163	$pl->ext_reply ($reply, @reply)
		1164	if $reply;
		1165
904	} else {	1166	} else {
905	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1167	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
906	}	1168	}
907		1169
908	cf::override;	1170	cf::override;
909	},	1171	},
910	);	1172	);
911		1173
912	sub load_extension {
913	my ($path) = @_;
914
915	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
916	my $base = $1;
917	my $pkg = $1;
918	$pkg =~ s/[^[:word:]]/_/g;
919	$pkg = "ext::$pkg";
920
921	warn "... loading '$path' into '$pkg'\n";
922
923	open my $fh, "<:utf8", $path
924	or die "$path: $!";
925
926	my $source =
927	"package $pkg; use strict; use utf8;\n"
928	. "#line 1 \"$path\"\n{\n"
929	. (do { local $/; <$fh> })
930	. "\n};\n1";
931
932	unless (eval $source) {
933	my $msg = $@ ? "$path: $@\n"
934	: "extension disabled.\n";
935	if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
936	warn $@;
937	warn "mandatory extension failed to load, exiting.\n";
938	exit 1;
939	}
940	die $@;
941	}
942
943	push @EXTS, $pkg;
944	}
945
946	sub load_extensions {	1174	sub load_extensions {
		1175	cf::sync_job {
		1176	my %todo;
		1177
947	for my $ext (<$LIBDIR/*.ext>) {	1178	for my $path (<$LIBDIR/*.ext>) {
948	next unless -r $ext;	1179	next unless -r $path;
949	eval {	1180
950	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;
951	1	1238	}
952	} or warn "$ext not loaded: $@";	1239
		1240	skip:
		1241	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
		1242	unless $progress;
		1243	}
953	}	1244	};
954	}	1245	}
955		1246
956	#############################################################################	1247	#############################################################################
		1248
		1249	=back
957		1250
958	=head2 CORE EXTENSIONS	1251	=head2 CORE EXTENSIONS
959		1252
960	Functions and methods that extend core crossfire objects.	1253	Functions and methods that extend core crossfire objects.
961		1254
…		…
1032		1325
1033	aio_mkdir playerdir $pl, 0770;	1326	aio_mkdir playerdir $pl, 0770;
1034	$pl->{last_save} = $cf::RUNTIME;	1327	$pl->{last_save} = $cf::RUNTIME;
1035		1328
1036	$pl->save_pl ($path);	1329	$pl->save_pl ($path);
1037	Coro::cede;	1330	cf::cede_to_tick;
1038	}	1331	}
1039		1332
1040	sub new($) {	1333	sub new($) {
1041	my ($login) = @_;	1334	my ($login) = @_;
1042		1335
…		…
1046	$self->{deny_save} = 1;	1339	$self->{deny_save} = 1;
1047		1340
1048	$cf::PLAYER{$login} = $self;	1341	$cf::PLAYER{$login} = $self;
1049		1342
1050	$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 (@_);
1051	}	1354	}
1052		1355
1053	=item $pl->quit_character	1356	=item $pl->quit_character
1054		1357
1055	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
…		…
1149	}	1452	}
1150		1453
1151	\@paths	1454	\@paths
1152	}	1455	}
1153		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
1154	=item $player->ext_reply ($msgid, %msg)	1507	=item $player->ext_reply ($msgid, @msg)
1155		1508
1156	Sends an ext reply to the player.	1509	Sends an ext reply to the player.
1157		1510
1158	=cut	1511	=cut
1159		1512
1160	sub ext_reply($$%) {	1513	sub ext_reply($$@) {
1161	my ($self, $id, %msg) = @_;	1514	my ($self, $id, @msg) = @_;
1162		1515
1163	$msg{msgid} = $id;	1516	$self->ns->ext_reply ($id, @msg)
1164
1165	$self->send ("ext " . cf::to_json \%msg);
1166	}	1517	}
1167		1518
1168	=item $player->ext_event ($type, %msg)	1519	=item $player->ext_msg ($type, @msg)
1169		1520
1170	Sends an ext event to the client.	1521	Sends an ext event to the client.
1171		1522
1172	=cut	1523	=cut
1173		1524
1174	sub ext_event($$%) {	1525	sub ext_msg($$@) {
1175	my ($self, $type, %msg) = @_;	1526	my ($self, $type, @msg) = @_;
1176		1527
1177	$self->ns->ext_event ($type, %msg);	1528	$self->ns->ext_msg ($type, @msg);
1178	}	1529	}
1179		1530
1180	=head3 cf::region	1531	=head3 cf::region
1181		1532
1182	=over 4	1533	=over 4
…		…
1185		1536
1186	package cf::region;	1537	package cf::region;
1187		1538
1188	=item cf::region::find_by_path $path	1539	=item cf::region::find_by_path $path
1189		1540
1190	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.
1191		1542
1192	=cut	1543	=cut
1193		1544
1194	sub find_by_path($) {	1545	sub find_by_path($) {
1195	my ($path) = @_;	1546	my ($path) = @_;
1196		1547
1197	my ($match, $specificity);	1548	my ($match, $specificity);
1198		1549
1199	for my $region (list) {	1550	for my $region (list) {
1200	if ($region->match && $path =~ $region->match) {	1551	if ($region->{match} && $path =~ $region->{match}) {
1201	($match, $specificity) = ($region, $region->specificity)	1552	($match, $specificity) = ($region, $region->specificity)
1202	if $region->specificity > $specificity;	1553	if $region->specificity > $specificity;
1203	}	1554	}
1204	}	1555	}
1205		1556
…		…
1269	my ($self, $merge) = @_;	1620	my ($self, $merge) = @_;
1270		1621
1271	# we have to keep some variables in memory intact	1622	# we have to keep some variables in memory intact
1272	local $self->{path};	1623	local $self->{path};
1273	local $self->{load_path};	1624	local $self->{load_path};
1274	local $self->{deny_save};
1275	local $self->{deny_reset};
1276		1625
1277	$self->SUPER::thawer_merge ($merge);	1626	$self->SUPER::thawer_merge ($merge);
1278	}	1627	}
1279		1628
1280	sub normalise {	1629	sub normalise {
…		…
1327	$self->init; # pass $1 etc.	1676	$self->init; # pass $1 etc.
1328	return $self;	1677	return $self;
1329	}	1678	}
1330	}	1679	}
1331		1680
1332	Carp::carp "unable to resolve path '$path' (base '$base').";	1681	Carp::cluck "unable to resolve path '$path' (base '$base').";
1333	()	1682	()
1334	}	1683	}
1335		1684
1336	sub init {	1685	sub init {
1337	my ($self) = @_;	1686	my ($self) = @_;
…		…
1378	sub change_all_map_light {	1727	sub change_all_map_light {
1379	my ($change) = @_;	1728	my ($change) = @_;
1380		1729
1381	$_->change_map_light ($change)	1730	$_->change_map_light ($change)
1382	for grep $_->outdoor, values %cf::MAP;	1731	for grep $_->outdoor, values %cf::MAP;
		1732	}
		1733
		1734	sub decay_objects {
		1735	my ($self) = @_;
		1736
		1737	return if $self->{deny_reset};
		1738
		1739	$self->do_decay_objects;
1383	}	1740	}
1384		1741
1385	sub unlink_save {	1742	sub unlink_save {
1386	my ($self) = @_;	1743	my ($self) = @_;
1387		1744
…		…
1445	$self->load_header_orig	1802	$self->load_header_orig
1446	or return;	1803	or return;
1447	$self->prepare_orig;	1804	$self->prepare_orig;
1448	}	1805	}
1449		1806
		1807	$self->{deny_reset} = 1
		1808	if $self->no_reset;
		1809
1450	$self->default_region (cf::region::find_by_path $self->{path})	1810	$self->default_region (cf::region::find_by_path $self->{path})
1451	unless $self->default_region;	1811	unless $self->default_region;
1452		1812
1453	1	1813	1
1454	}	1814	}
…		…
1469	$map->{last_save} = $cf::RUNTIME;	1829	$map->{last_save} = $cf::RUNTIME;
1470		1830
1471	$map->load_header	1831	$map->load_header
1472	or return;	1832	or return;
1473		1833
1474	if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)	1834	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1475	# doing this can freeze the server in a sync job, obviously	1835	# doing this can freeze the server in a sync job, obviously
1476	#$cf::WAIT_FOR_TICK->wait;	1836	#$cf::WAIT_FOR_TICK->wait;
1477	$map->reset;	1837	$map->reset;
1478	undef $guard;	1838	undef $guard;
1479	return find $path;	1839	return find $path;
…		…
1492	local $self->{deny_reset} = 1; # loading can take a long time	1852	local $self->{deny_reset} = 1; # loading can take a long time
1493		1853
1494	my $path = $self->{path};	1854	my $path = $self->{path};
1495		1855
1496	{	1856	{
		1857	my $guard1 = cf::lock_acquire "map_data:$path";
1497	my $guard = cf::lock_acquire "map_load:$path";	1858	my $guard2 = cf::lock_acquire "map_load:$path";
1498		1859
1499	return if $self->in_memory != cf::MAP_SWAPPED;	1860	return if $self->in_memory != cf::MAP_SWAPPED;
1500		1861
1501	$self->in_memory (cf::MAP_LOADING);	1862	$self->in_memory (cf::MAP_LOADING);
1502		1863
1503	$self->alloc;	1864	$self->alloc;
1504		1865
1505	$self->pre_load;	1866	$self->pre_load;
1506	Coro::cede;	1867	cf::cede_to_tick;
1507		1868
1508	$self->_load_objects ($self->{load_path}, 1)	1869	$self->_load_objects ($self->{load_path}, 1)
1509	or return;	1870	or return;
1510		1871
1511	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1872	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
…		…
1517	$self->clear_unique_items;	1878	$self->clear_unique_items;
1518	$self->_load_objects ($uniq, 0);	1879	$self->_load_objects ($uniq, 0);
1519	}	1880	}
1520	}	1881	}
1521		1882
1522	Coro::cede;	1883	cf::cede_to_tick;
1523	# now do the right thing for maps	1884	# now do the right thing for maps
1524	$self->link_multipart_objects;	1885	$self->link_multipart_objects;
1525	$self->difficulty ($self->estimate_difficulty)	1886	$self->difficulty ($self->estimate_difficulty)
1526	unless $self->difficulty;	1887	unless $self->difficulty;
1527	Coro::cede;	1888	cf::cede_to_tick;
1528		1889
1529	unless ($self->{deny_activate}) {	1890	unless ($self->{deny_activate}) {
1530	$self->decay_objects;	1891	$self->decay_objects;
1531	$self->fix_auto_apply;	1892	$self->fix_auto_apply;
1532	$self->update_buttons;	1893	$self->update_buttons;
1533	Coro::cede;	1894	cf::cede_to_tick;
1534	$self->set_darkness_map;	1895	$self->set_darkness_map;
1535	Coro::cede;	1896	cf::cede_to_tick;
1536	$self->activate;	1897	$self->activate;
1537	}	1898	}
		1899
		1900	$self->{last_save} = $cf::RUNTIME;
		1901	$self->last_access ($cf::RUNTIME);
1538		1902
1539	$self->in_memory (cf::MAP_IN_MEMORY);	1903	$self->in_memory (cf::MAP_IN_MEMORY);
1540	}	1904	}
1541		1905
1542	$self->post_load;	1906	$self->post_load;
…		…
1546	my ($self, $ob) = @_;	1910	my ($self, $ob) = @_;
1547		1911
1548	return find "~" . $ob->name . "/" . $self->{path}	1912	return find "~" . $ob->name . "/" . $self->{path}
1549	if $self->per_player;	1913	if $self->per_player;
1550		1914
		1915	# return find "?party/" . $ob->name . "/" . $self->{path}
		1916	# if $self->per_party;
		1917
1551	$self	1918	$self
1552	}	1919	}
1553		1920
1554	# 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
1555	sub load_diag {	1922	sub load_neighbours {
1556	my ($map) = @_;	1923	my ($map) = @_;
1557		1924
1558	my @diag; # diagonal neighbours	1925	my @neigh; # diagonal neighbours
1559		1926
1560	for (0 .. 3) {	1927	for (0 .. 3) {
1561	my $neigh = $map->tile_path ($_)	1928	my $neigh = $map->tile_path ($_)
1562	or next;	1929	or next;
1563	$neigh = find $neigh, $map	1930	$neigh = find $neigh, $map
1564	or next;	1931	or next;
1565	$neigh->load;	1932	$neigh->load;
1566		1933
		1934	push @neigh,
1567	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	1935	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1568	[$neigh->tile_path (($_ + 1) % 4), $neigh];	1936	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1569	}	1937	}
1570		1938
1571	for (@diag) {	1939	for (grep defined $_->[0], @neigh) {
		1940	my ($path, $origin) = @$_;
1572	my $neigh = find @$_	1941	my $neigh = find $path, $origin
1573	or next;	1942	or next;
1574	$neigh->load;	1943	$neigh->load;
1575	}	1944	}
1576	}	1945	}
1577		1946
…		…
1582	}	1951	}
1583		1952
1584	sub do_load_sync {	1953	sub do_load_sync {
1585	my ($map) = @_;	1954	my ($map) = @_;
1586		1955
		1956	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		1957	if $Coro::current == $Coro::main;
		1958
1587	cf::sync_job { $map->load };	1959	cf::sync_job { $map->load };
1588	}	1960	}
1589		1961
1590	our %MAP_PREFETCH;	1962	our %MAP_PREFETCH;
1591	our $MAP_PREFETCHER = undef;	1963	our $MAP_PREFETCHER = undef;
1592		1964
1593	sub find_async {	1965	sub find_async {
1594	my ($path, $origin) = @_;	1966	my ($path, $origin, $load) = @_;
1595		1967
1596	$path = normalise $path, $origin && $origin->{path};	1968	$path = normalise $path, $origin && $origin->{path};
1597		1969
1598	if (my $map = $cf::MAP{$path}) {	1970	if (my $map = $cf::MAP{$path}) {
1599	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	1971	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1600	}	1972	}
1601		1973
1602	undef $MAP_PREFETCH{$path};	1974	$MAP_PREFETCH{$path} |= $load;
		1975
1603	$MAP_PREFETCHER ||= cf::async {	1976	$MAP_PREFETCHER ||= cf::async {
1604	while (%MAP_PREFETCH) {	1977	while (%MAP_PREFETCH) {
1605	for my $path (keys %MAP_PREFETCH) {	1978	while (my ($k, $v) = each %MAP_PREFETCH) {
1606	my $map = find $path	1979	if (my $map = find $k) {
1607	or next;
1608	$map->load;	1980	$map->load if $v;
		1981	}
1609		1982
1610	delete $MAP_PREFETCH{$path};	1983	delete $MAP_PREFETCH{$k};
1611	}	1984	}
1612	}	1985	}
1613	undef $MAP_PREFETCHER;	1986	undef $MAP_PREFETCHER;
1614	};	1987	};
1615	$MAP_PREFETCHER->prio (6);	1988	$MAP_PREFETCHER->prio (6);
…		…
1618	}	1991	}
1619		1992
1620	sub save {	1993	sub save {
1621	my ($self) = @_;	1994	my ($self) = @_;
1622		1995
1623	my $lock = cf::lock_acquire "map_data:" . $self->path;	1996	my $lock = cf::lock_acquire "map_data:$self->{path}";
1624		1997
1625	$self->{last_save} = $cf::RUNTIME;	1998	$self->{last_save} = $cf::RUNTIME;
1626		1999
1627	return unless $self->dirty;	2000	return unless $self->dirty;
1628		2001
…		…
1651	my ($self) = @_;	2024	my ($self) = @_;
1652		2025
1653	# save first because save cedes	2026	# save first because save cedes
1654	$self->save;	2027	$self->save;
1655		2028
1656	my $lock = cf::lock_acquire "map_data:" . $self->path;	2029	my $lock = cf::lock_acquire "map_data:$self->{path}";
1657		2030
1658	return if $self->players;	2031	return if $self->players;
1659	return if $self->in_memory != cf::MAP_IN_MEMORY;	2032	return if $self->in_memory != cf::MAP_IN_MEMORY;
1660	return if $self->{deny_save};	2033	return if $self->{deny_save};
1661		2034
…		…
1665		2038
1666	sub reset_at {	2039	sub reset_at {
1667	my ($self) = @_;	2040	my ($self) = @_;
1668		2041
1669	# TODO: safety, remove and allow resettable per-player maps	2042	# TODO: safety, remove and allow resettable per-player maps
1670	return 1e99 if $self->isa ("ext::map_per_player");#d#
1671	return 1e99 if $self->{deny_reset};	2043	return 1e99 if $self->{deny_reset};
1672		2044
1673	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;	2045	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1674	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;	2046	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1675		2047
…		…
1686	my ($self) = @_;	2058	my ($self) = @_;
1687		2059
1688	my $lock = cf::lock_acquire "map_data:$self->{path}";	2060	my $lock = cf::lock_acquire "map_data:$self->{path}";
1689		2061
1690	return if $self->players;	2062	return if $self->players;
1691	return if $self->isa ("ext::map_per_player");#d#
1692		2063
1693	warn "resetting map ", $self->path;#d#	2064	warn "resetting map ", $self->path;
1694		2065
1695	$self->in_memory (cf::MAP_SWAPPED);	2066	$self->in_memory (cf::MAP_SWAPPED);
1696		2067
1697	# need to save uniques path	2068	# need to save uniques path
1698	unless ($self->{deny_save}) {	2069	unless ($self->{deny_save}) {
…		…
1715	my $nuke_counter = "aaaa";	2086	my $nuke_counter = "aaaa";
1716		2087
1717	sub nuke {	2088	sub nuke {
1718	my ($self) = @_;	2089	my ($self) = @_;
1719		2090
		2091	{
		2092	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2093
1720	delete $cf::MAP{$self->path};	2094	delete $cf::MAP{$self->path};
1721		2095
1722	$self->unlink_save;	2096	$self->unlink_save;
1723		2097
1724	bless $self, "cf::map";	2098	bless $self, "cf::map";
1725	delete $self->{deny_reset};	2099	delete $self->{deny_reset};
1726	$self->{deny_save} = 1;	2100	$self->{deny_save} = 1;
1727	$self->reset_timeout (1);	2101	$self->reset_timeout (1);
1728	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2102	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1729		2103
1730	$cf::MAP{$self->path} = $self;	2104	$cf::MAP{$self->path} = $self;
		2105	}
1731		2106
1732	$self->reset; # polite request, might not happen	2107	$self->reset; # polite request, might not happen
		2108	}
		2109
		2110	=item $maps = cf::map::tmp_maps
		2111
		2112	Returns an arrayref with all map paths of currently instantiated and saved
		2113	maps. May block.
		2114
		2115	=cut
		2116
		2117	sub tmp_maps() {
		2118	[
		2119	map {
		2120	utf8::decode $_;
		2121	/\.map$/
		2122	? normalise $_
		2123	: ()
		2124	} @{ aio_readdir $TMPDIR or [] }
		2125	]
		2126	}
		2127
		2128	=item $maps = cf::map::random_maps
		2129
		2130	Returns an arrayref with all map paths of currently instantiated and saved
		2131	random maps. May block.
		2132
		2133	=cut
		2134
		2135	sub random_maps() {
		2136	[
		2137	map {
		2138	utf8::decode $_;
		2139	/\.map$/
		2140	? normalise "?random/$_"
		2141	: ()
		2142	} @{ aio_readdir $RANDOMDIR or [] }
		2143	]
1733	}	2144	}
1734		2145
1735	=item cf::map::unique_maps	2146	=item cf::map::unique_maps
1736		2147
1737	Returns an arrayref of paths of all shared maps that have	2148	Returns an arrayref of paths of all shared maps that have
1738	instantiated unique items. May block.	2149	instantiated unique items. May block.
1739		2150
1740	=cut	2151	=cut
1741		2152
1742	sub unique_maps() {	2153	sub unique_maps() {
1743	my $files = aio_readdir $UNIQUEDIR	2154	[
1744	or return;	2155	map {
1745
1746	my @paths;
1747
1748	for (@$files) {
1749	utf8::decode $_;	2156	utf8::decode $_;
1750	next if /\.pst$/;	2157	/\.map$/
1751	next unless /^$PATH_SEP/o;	2158	? normalise $_
1752		2159	: ()
1753	push @paths, cf::map::normalise $_;	2160	} @{ aio_readdir $UNIQUEDIR or [] }
1754	}	2161	]
1755
1756	\@paths
1757	}	2162	}
1758		2163
1759	package cf;	2164	package cf;
1760		2165
1761	=back	2166	=back
…		…
1807		2212
1808	$flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;	2213	$flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1809		2214
1810	if ($self->{record_replies}) {	2215	if ($self->{record_replies}) {
1811	push @{ $self->{record_replies} }, [$npc, $msg, $flags];	2216	push @{ $self->{record_replies} }, [$npc, $msg, $flags];
		2217
1812	} 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 {
1813	$msg = $npc->name . " says: $msg" if $npc;	2226	$msg = $npc->name . " says: $msg" if $npc;
1814	$self->message ($msg, $flags);	2227	$self->message ($msg, $flags);
		2228	}
1815	}	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 (@_);
1816	}	2240	}
1817		2241
1818	=item $player_object->may ("access")	2242	=item $player_object->may ("access")
1819		2243
1820	Returns wether the given player is authorized to access resource "access"	2244	Returns wether the given player is authorized to access resource "access"
…		…
1867	$self->deactivate_recursive;	2291	$self->deactivate_recursive;
1868		2292
1869	return if UNIVERSAL::isa $self->map, "ext::map_link";	2293	return if UNIVERSAL::isa $self->map, "ext::map_link";
1870		2294
1871	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2295	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1872	if $self->map;	2296	if $self->map && $self->map->{path} ne "{link}";
1873		2297
1874	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2298	$self->enter_map ($LINK_MAP || link_map, 10, 10);
1875	}	2299	}
1876		2300
1877	sub cf::object::player::leave_link {	2301	sub cf::object::player::leave_link {
1878	my ($self, $map, $x, $y) = @_;	2302	my ($self, $map, $x, $y) = @_;
		2303
		2304	return unless $self->contr->active;
1879		2305
1880	my $link_pos = delete $self->{_link_pos};	2306	my $link_pos = delete $self->{_link_pos};
1881		2307
1882	unless ($map) {	2308	unless ($map) {
1883	# restore original map position	2309	# restore original map position
…		…
1897	# use -1 or undef as default coordinates, not 0, 0	2323	# use -1 or undef as default coordinates, not 0, 0
1898	($x, $y) = ($map->enter_x, $map->enter_y)	2324	($x, $y) = ($map->enter_x, $map->enter_y)
1899	if $x <=0 && $y <= 0;	2325	if $x <=0 && $y <= 0;
1900		2326
1901	$map->load;	2327	$map->load;
1902	$map->load_diag;	2328	$map->load_neighbours;
1903		2329
1904	return unless $self->contr->active;	2330	return unless $self->contr->active;
1905	$self->activate_recursive;	2331	$self->activate_recursive;
1906		2332
1907	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2333	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1908	$self->enter_map ($map, $x, $y);	2334	$self->enter_map ($map, $x, $y);
1909	}	2335	}
1910		2336
1911	cf::player->attach (	2337	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1912	on_logout => sub {
1913	my ($pl) = @_;
1914		2338
1915	# abort map switching before logout	2339	Moves the player to the given map-path and coordinates by first freezing
1916	if ($pl->ob->{_link_pos}) {	2340	her, loading and preparing them map, calling the provided $check callback
1917	cf::sync_job {	2341	that has to return the map if sucecssful, and then unfreezes the player on
1918	$pl->ob->leave_link	2342	the new (success) or old (failed) map position. In either case, $done will
1919	};	2343	be called at the end of this process.
1920	}
1921	},
1922	on_login => sub {
1923	my ($pl) = @_;
1924		2344
1925	# try to abort aborted map switching on player login :)
1926	# should happen only on crashes
1927	if ($pl->ob->{_link_pos}) {
1928	$pl->ob->enter_link;
1929	(async {
1930	$pl->ob->reply (undef,
1931	"There was an internal problem at your last logout, "
1932	. "the server will try to bring you to your intended destination in a second.",
1933	cf::NDI_RED);
1934	# we need this sleep as the login has a concurrent enter_exit running
1935	# and this sleep increases chances of the player not ending up in scorn
1936	Coro::Timer::sleep 1;
1937	$pl->ob->leave_link;
1938	})->prio (2);
1939	}
1940	},
1941	);
1942
1943	=item $player_object->goto ($path, $x, $y)
1944
1945	=cut	2345	=cut
		2346
		2347	our $GOTOGEN;
1946		2348
1947	sub cf::object::player::goto {	2349	sub cf::object::player::goto {
1948	my ($self, $path, $x, $y) = @_;	2350	my ($self, $path, $x, $y, $check, $done) = @_;
		2351
		2352	# do generation counting so two concurrent goto's will be executed in-order
		2353	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1949		2354
1950	$self->enter_link;	2355	$self->enter_link;
1951		2356
1952	(async {	2357	(async {
1953	my $map = eval {	2358	my $map = eval {
1954	my $map = cf::map::find $path;	2359	my $map = cf::map::find $path;
		2360
		2361	if ($map) {
1955	$map = $map->customise_for ($self) if $map;	2362	$map = $map->customise_for ($self);
		2363	$map = $check->($map) if $check && $map;
		2364	} else {
		2365	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
		2366	}
		2367
1956	$map	2368	$map
		2369	};
		2370
		2371	if ($@) {
		2372	$self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
		2373	LOG llevError | logBacktrace, Carp::longmess $@;
1957	} or	2374	}
1958	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1959		2375
		2376	if ($gen == $self->{_goto_generation}) {
		2377	delete $self->{_goto_generation};
1960	$self->leave_link ($map, $x, $y);	2378	$self->leave_link ($map, $x, $y);
		2379	}
		2380
		2381	$done->() if $done;
1961	})->prio (1);	2382	})->prio (1);
1962	}	2383	}
1963		2384
1964	=item $player_object->enter_exit ($exit_object)	2385	=item $player_object->enter_exit ($exit_object)
1965		2386
…		…
2034	my $hp = $exit->stats->hp;	2455	my $hp = $exit->stats->hp;
2035	my $sp = $exit->stats->sp;	2456	my $sp = $exit->stats->sp;
2036		2457
2037	$self->enter_link;	2458	$self->enter_link;
2038		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
2039	(async {	2464	(async {
2040	$self->deactivate_recursive; # just to be sure	2465	$self->deactivate_recursive; # just to be sure
2041	unless (eval {	2466	unless (eval {
2042	$self->goto ($slaying, $hp, $sp);	2467	$self->goto ($slaying, $hp, $sp);
2043		2468
…		…
2070		2495
2071	utf8::encode $text;	2496	utf8::encode $text;
2072	$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);
2073	}	2498	}
2074		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	our %CHANNEL = (
		2510	"c/identify" => {
		2511	id => "identify",
		2512	title => "Identify",
		2513	reply => undef,
		2514	tooltip => "Items recently identified",
		2515	},
		2516	);
		2517
		2518	sub cf::client::send_msg {
		2519	my ($self, $channel, $msg, $color, @extra) = @_;
		2520
		2521	$msg = $self->pl->expand_cfpod ($msg);
		2522
		2523	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2524
		2525	# check predefined channels, for the benefit of C
		2526	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};
		2527
		2528	if (ref $channel) {
		2529	# send meta info to client, if not yet sent
		2530	unless (exists $self->{channel}{$channel->{id}}) {
		2531	$self->{channel}{$channel->{id}} = $channel;
		2532	$self->ext_msg (channel_info => $channel);
		2533	}
		2534
		2535	$channel = $channel->{id};
		2536	}
		2537
		2538	return unless @extra || length $msg;
		2539
		2540	if ($self->can_msg) {
		2541	# default colour, mask it out
		2542	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2543	if $color & cf::NDI_DEF;
		2544
		2545	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2546	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
		2547	} else {
		2548	if ($color >= 0) {
		2549	# replace some tags by gcfclient-compatible ones
		2550	for ($msg) {
		2551	1 while
		2552	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2553	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2554	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2555	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2556	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2557	}
		2558
		2559	$color &= cf::NDI_COLOR_MASK;
		2560
		2561	utf8::encode $msg;
		2562
		2563	if (0 && $msg =~ /\[/) {
		2564	# COMMAND/INFO
		2565	$self->send_packet ("drawextinfo $color 10 8 $msg")
		2566	} else {
		2567	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
		2568	$self->send_packet ("drawinfo $color $msg")
		2569	}
		2570	}
		2571	}
		2572	}
		2573
2075	=item $client->ext_event ($type, %msg)	2574	=item $client->ext_msg ($type, @msg)
2076		2575
2077	Sends an exti event to the client.	2576	Sends an ext event to the client.
2078		2577
2079	=cut	2578	=cut
2080		2579
2081	sub cf::client::ext_event($$%) {	2580	sub cf::client::ext_msg($$@) {
2082	my ($self, $type, %msg) = @_;	2581	my ($self, $type, @msg) = @_;
2083		2582
		2583	if ($self->extcmd == 2) {
		2584	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2585	} elsif ($self->extcmd == 1) { # TODO: remove
2084	$msg{msgtype} = "event_$type";	2586	push @msg, msgtype => "event_$type";
2085	$self->send_packet ("ext " . cf::to_json \%msg);	2587	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2588	}
		2589	}
		2590
		2591	=item $client->ext_reply ($msgid, @msg)
		2592
		2593	Sends an ext reply to the client.
		2594
		2595	=cut
		2596
		2597	sub cf::client::ext_reply($$@) {
		2598	my ($self, $id, @msg) = @_;
		2599
		2600	if ($self->extcmd == 2) {
		2601	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2602	} elsif ($self->extcmd == 1) {
		2603	#TODO: version 1, remove
		2604	unshift @msg, msgtype => "reply", msgid => $id;
		2605	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2606	}
2086	}	2607	}
2087		2608
2088	=item $success = $client->query ($flags, "text", \&cb)	2609	=item $success = $client->query ($flags, "text", \&cb)
2089		2610
2090	Queues a query to the client, calling the given callback with	2611	Queues a query to the client, calling the given callback with
2091	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2612	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2092	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.	2613	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2093		2614
2094	Queries can fail, so check the return code. Or don't, as queries will become	2615	Queries can fail, so check the return code. Or don't, as queries will
2095	reliable at some point in the future.	2616	become reliable at some point in the future.
2096		2617
2097	=cut	2618	=cut
2098		2619
2099	sub cf::client::query {	2620	sub cf::client::query {
2100	my ($self, $flags, $text, $cb) = @_;	2621	my ($self, $flags, $text, $cb) = @_;
…		…
2108	utf8::encode $text;	2629	utf8::encode $text;
2109	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];	2630	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2110		2631
2111	$self->send_packet ($self->{query_queue}[0][0])	2632	$self->send_packet ($self->{query_queue}[0][0])
2112	if @{ $self->{query_queue} } == 1;	2633	if @{ $self->{query_queue} } == 1;
		2634
		2635	1
2113	}	2636	}
2114		2637
2115	cf::client->attach (	2638	cf::client->attach (
		2639	on_connect => sub {
		2640	my ($ns) = @_;
		2641
		2642	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2643	},
2116	on_reply => sub {	2644	on_reply => sub {
2117	my ($ns, $msg) = @_;	2645	my ($ns, $msg) = @_;
2118		2646
2119	# this weird shuffling is so that direct followup queries	2647	# this weird shuffling is so that direct followup queries
2120	# get handled first	2648	# get handled first
…		…
2132	} else {	2660	} else {
2133	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;	2661	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2134	}	2662	}
2135	}	2663	}
2136	},	2664	},
		2665	on_exticmd => sub {
		2666	my ($ns, $buf) = @_;
		2667
		2668	my $msg = eval { $ns->{json_coder}->decode ($buf) };
		2669
		2670	if (ref $msg) {
		2671	my ($type, $reply, @payload) =
		2672	"ARRAY" eq ref $msg
		2673	? @$msg
		2674	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2675
		2676	my @reply;
		2677
		2678	if (my $cb = $EXTICMD{$type}) {
		2679	@reply = $cb->($ns, @payload);
		2680	}
		2681
		2682	$ns->ext_reply ($reply, @reply)
		2683	if $reply;
		2684
		2685	} else {
		2686	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
		2687	}
		2688
		2689	cf::override;
		2690	},
2137	);	2691	);
2138		2692
2139	=item $client->async (\&cb)	2693	=item $client->async (\&cb)
2140		2694
2141	Create a new coroutine, running the specified callback. The coroutine will	2695	Create a new coroutine, running the specified callback. The coroutine will
…		…
2182	our $safe = new Safe "safe";	2736	our $safe = new Safe "safe";
2183	our $safe_hole = new Safe::Hole;	2737	our $safe_hole = new Safe::Hole;
2184		2738
2185	$SIG{FPE} = 'IGNORE';	2739	$SIG{FPE} = 'IGNORE';
2186		2740
2187	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2741	$safe->permit_only (Opcode::opset qw(
		2742	:base_core :base_mem :base_orig :base_math
		2743	grepstart grepwhile mapstart mapwhile
		2744	sort time
		2745	));
2188		2746
2189	# here we export the classes and methods available to script code	2747	# here we export the classes and methods available to script code
2190		2748
2191	=pod	2749	=pod
2192		2750
2193	The following functions and methods are available within a safe environment:	2751	The following functions and methods are available within a safe environment:
2194		2752
2195	cf::object contr pay_amount pay_player map	2753	cf::object
		2754	contr pay_amount pay_player map x y force_find force_add
		2755	insert remove name archname title slaying race decrease_ob_nr
		2756
2196	cf::object::player player	2757	cf::object::player
2197	cf::player peaceful	2758	player
2198	cf::map trigger	2759
		2760	cf::player
		2761	peaceful
		2762
		2763	cf::map
		2764	trigger
2199		2765
2200	=cut	2766	=cut
2201		2767
2202	for (	2768	for (
2203	["cf::object" => qw(contr pay_amount pay_player map)],	2769	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2770	insert remove inv name archname title slaying race
		2771	decrease_ob_nr)],
2204	["cf::object::player" => qw(player)],	2772	["cf::object::player" => qw(player)],
2205	["cf::player" => qw(peaceful)],	2773	["cf::player" => qw(peaceful)],
2206	["cf::map" => qw(trigger)],	2774	["cf::map" => qw(trigger)],
2207	) {	2775	) {
2208	no strict 'refs';	2776	no strict 'refs';
…		…
2279	=back	2847	=back
2280		2848
2281	=cut	2849	=cut
2282		2850
2283	#############################################################################	2851	#############################################################################
2284
2285	=head2 EXTENSION DATABASE SUPPORT
2286
2287	Crossfire maintains a very simple database for extension use. It can
2288	currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2289	convert to/from binary).
2290
2291	The parameter C<$family> should best start with the name of the extension
2292	using it, it should be unique.
2293
2294	=over 4
2295
2296	=item $value = cf::db_get $family => $key
2297
2298	Returns a single value from the database.
2299
2300	=item cf::db_put $family => $key => $value
2301
2302	Stores the given C<$value> in the family.
2303
2304	=cut
2305
2306	our $DB;
2307
2308	sub db_init {
2309	unless ($DB) {
2310	$DB = BDB::db_create $DB_ENV;
2311
2312	cf::sync_job {
2313	eval {
2314	$DB->set_flags (BDB::CHKSUM);
2315
2316	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2317	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2318	cf::cleanup "db_open(db): $!" if $!;
2319	};
2320	cf::cleanup "db_open(db): $@" if $@;
2321	};
2322	}
2323	}
2324
2325	sub db_get($$) {
2326	my $key = "$_[0]/$_[1]";
2327
2328	cf::sync_job {
2329	BDB::db_get $DB, undef, $key, my $data;
2330
2331	$! ? ()
2332	: $data
2333	}
2334	}
2335
2336	sub db_put($$$) {
2337	BDB::dbreq_pri 4;
2338	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2339	}
2340
2341	=item cf::cache $id => [$paths...], $processversion => $process
2342
2343	Generic caching function that returns the value of the resource $id,
2344	caching and regenerating as required.
2345
2346	This function can block.
2347
2348	=cut
2349
2350	sub cache {
2351	my ($id, $src, $processversion, $process) = @_;
2352
2353	my $meta =
2354	join "\x00",
2355	$processversion,
2356	map {
2357	aio_stat $_
2358	and Carp::croak "$_: $!";
2359
2360	($_, (stat _)[7,9])
2361	} @$src;
2362
2363	my $dbmeta = db_get cache => "$id/meta";
2364	if ($dbmeta ne $meta) {
2365	# changed, we may need to process
2366
2367	my @data;
2368	my $md5;
2369
2370	for (0 .. $#$src) {
2371	0 <= aio_load $src->[$_], $data[$_]
2372	or Carp::croak "$src->[$_]: $!";
2373	}
2374
2375	# if processing is expensive, check
2376	# checksum first
2377	if (1) {
2378	$md5 =
2379	join "\x00",
2380	$processversion,
2381	map {
2382	Coro::cede;
2383	($src->[$_], Digest::MD5::md5_hex $data[$_])
2384	} 0.. $#$src;
2385
2386
2387	my $dbmd5 = db_get cache => "$id/md5";
2388	if ($dbmd5 eq $md5) {
2389	db_put cache => "$id/meta", $meta;
2390
2391	return db_get cache => "$id/data";
2392	}
2393	}
2394
2395	my $t1 = Time::HiRes::time;
2396	my $data = $process->(\@data);
2397	my $t2 = Time::HiRes::time;
2398
2399	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2400
2401	db_put cache => "$id/data", $data;
2402	db_put cache => "$id/md5" , $md5;
2403	db_put cache => "$id/meta", $meta;
2404
2405	return $data;
2406	}
2407
2408	db_get cache => "$id/data"
2409	}
2410
2411	=item fork_call { }, $args
2412
2413	Executes the given code block with the given arguments in a seperate
2414	process, returning the results. Everything must be serialisable with
2415	Coro::Storable. May, of course, block. Note that the executed sub may
2416	never block itself or use any form of Event handling.
2417
2418	=cut
2419
2420	sub fork_call(&@) {
2421	my ($cb, @args) = @_;
2422
2423	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2424	# or die "socketpair: $!";
2425	pipe my $fh1, my $fh2
2426	or die "pipe: $!";
2427
2428	if (my $pid = fork) {
2429	close $fh2;
2430
2431	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2432	$res = Coro::Storable::thaw $res;
2433
2434	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2435
2436	die $$res unless "ARRAY" eq ref $res;
2437
2438	return wantarray ? @$res : $res->[-1];
2439	} else {
2440	local $SIG{__WARN__};
2441	eval {
2442	local $SIG{__DIE__};
2443	close $fh1;
2444
2445	my @res = eval { $cb->(@args) };
2446	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2447	};
2448
2449	warn $@ if $@;
2450	_exit 0;
2451	}
2452	}
2453
2454
2455
2456	#############################################################################
2457	# the server's init and main functions	2852	# the server's init and main functions
2458		2853
2459	sub load_facedata($) {	2854	sub load_facedata($) {
2460	my ($path) = @_;	2855	my ($path) = @_;
		2856
		2857	# HACK to clear player env face cache, we need some signal framework
		2858	# for this (global event?)
		2859	%ext::player_env::MUSIC_FACE_CACHE = ();
		2860
		2861	my $enc = JSON::XS->new->utf8->canonical->relaxed;
2461		2862
2462	warn "loading facedata from $path\n";	2863	warn "loading facedata from $path\n";
2463		2864
2464	my $facedata;	2865	my $facedata;
2465	0 < aio_load $path, $facedata	2866	0 < aio_load $path, $facedata
…		…
2468	$facedata = Coro::Storable::thaw $facedata;	2869	$facedata = Coro::Storable::thaw $facedata;
2469		2870
2470	$facedata->{version} == 2	2871	$facedata->{version} == 2
2471	or cf::cleanup "$path: version mismatch, cannot proceed.";	2872	or cf::cleanup "$path: version mismatch, cannot proceed.";
2472		2873
		2874	# patch in the exptable
		2875	$facedata->{resource}{"res/exp_table"} = {
		2876	type => FT_RSRC,
		2877	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		2878	};
		2879	cf::cede_to_tick;
		2880
2473	{	2881	{
2474	my $faces = $facedata->{faceinfo};	2882	my $faces = $facedata->{faceinfo};
2475		2883
2476	while (my ($face, $info) = each %$faces) {	2884	while (my ($face, $info) = each %$faces) {
2477	my $idx = (cf::face::find $face) || cf::face::alloc $face;	2885	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2478	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	2886	cf::face::set_visibility $idx, $info->{visibility};
		2887	cf::face::set_magicmap $idx, $info->{magicmap};
2479	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	2888	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2480	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	2889	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2481	Coro::cede;	2890
		2891	cf::cede_to_tick;
2482	}	2892	}
2483		2893
2484	while (my ($face, $info) = each %$faces) {	2894	while (my ($face, $info) = each %$faces) {
2485	next unless $info->{smooth};	2895	next unless $info->{smooth};
2486	my $idx = cf::face::find $face	2896	my $idx = cf::face::find $face
2487	or next;	2897	or next;
2488	if (my $smooth = cf::face::find $info->{smooth}) {	2898	if (my $smooth = cf::face::find $info->{smooth}) {
		2899	cf::face::set_smooth $idx, $smooth;
2489	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	2900	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2490	} else {	2901	} else {
2491	warn "smooth face '$info->{smooth}' not found for face '$face'";	2902	warn "smooth face '$info->{smooth}' not found for face '$face'";
2492	}	2903	}
2493	Coro::cede;	2904
		2905	cf::cede_to_tick;
2494	}	2906	}
2495	}	2907	}
2496		2908
2497	{	2909	{
2498	my $anims = $facedata->{animinfo};	2910	my $anims = $facedata->{animinfo};
2499		2911
2500	while (my ($anim, $info) = each %$anims) {	2912	while (my ($anim, $info) = each %$anims) {
2501	cf::anim::set $anim, $info->{frames}, $info->{facings};	2913	cf::anim::set $anim, $info->{frames}, $info->{facings};
2502	Coro::cede;	2914	cf::cede_to_tick;
2503	}	2915	}
2504		2916
2505	cf::anim::invalidate_all; # d'oh	2917	cf::anim::invalidate_all; # d'oh
2506	}	2918	}
2507		2919
		2920	{
		2921	# TODO: for gcfclient pleasure, we should give resources
		2922	# that gcfclient doesn't grok a >10000 face index.
		2923	my $res = $facedata->{resource};
		2924
		2925	my $soundconf = delete $res->{"res/sound.conf"};
		2926
		2927	while (my ($name, $info) = each %$res) {
		2928	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		2929	my $data;
		2930
		2931	if ($info->{type} & 1) {
		2932	# prepend meta info
		2933
		2934	my $meta = $enc->encode ({
		2935	name => $name,
		2936	%{ $info->{meta} || {} },
		2937	});
		2938
		2939	$data = pack "(w/a*)*", $meta, $info->{data};
		2940	} else {
		2941	$data = $info->{data};
		2942	}
		2943
		2944	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		2945	cf::face::set_type $idx, $info->{type};
		2946
		2947	cf::cede_to_tick;
		2948	}
		2949
		2950	if ($soundconf) {
		2951	$soundconf = $enc->decode (delete $soundconf->{data});
		2952
		2953	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		2954	my $sound = $soundconf->{compat}[$_]
		2955	or next;
		2956
		2957	my $face = cf::face::find "sound/$sound->[1]";
		2958	cf::sound::set $sound->[0] => $face;
		2959	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		2960	}
		2961
		2962	while (my ($k, $v) = each %{$soundconf->{event}}) {
		2963	my $face = cf::face::find "sound/$v";
		2964	cf::sound::set $k => $face;
		2965	}
		2966	}
		2967	}
		2968
2508	1	2969	1
2509	}	2970	}
2510		2971
		2972	register_exticmd fx_want => sub {
		2973	my ($ns, $want) = @_;
		2974
		2975	while (my ($k, $v) = each %$want) {
		2976	$ns->fx_want ($k, $v);
		2977	}
		2978	};
		2979
2511	sub reload_regions {	2980	sub reload_regions {
		2981	# HACK to clear player env face cache, we need some signal framework
		2982	# for this (global event?)
		2983	%ext::player_env::MUSIC_FACE_CACHE = ();
		2984
2512	load_resource_file "$MAPDIR/regions"	2985	load_resource_file "$MAPDIR/regions"
2513	or die "unable to load regions file\n";	2986	or die "unable to load regions file\n";
		2987
		2988	for (cf::region::list) {
		2989	$_->{match} = qr/$_->{match}/
		2990	if exists $_->{match};
		2991	}
2514	}	2992	}
2515		2993
2516	sub reload_facedata {	2994	sub reload_facedata {
2517	load_facedata "$DATADIR/facedata"	2995	load_facedata "$DATADIR/facedata"
2518	or die "unable to load facedata\n";	2996	or die "unable to load facedata\n";
2519	}	2997	}
2520		2998
2521	sub reload_archetypes {	2999	sub reload_archetypes {
2522	load_resource_file "$DATADIR/archetypes"	3000	load_resource_file "$DATADIR/archetypes"
2523	or die "unable to load archetypes\n";	3001	or die "unable to load archetypes\n";
		3002	#d# NEED to laod twice to resolve forward references
		3003	# this really needs to be done in an extra post-pass
		3004	# (which needs to be synchronous, so solve it differently)
		3005	load_resource_file "$DATADIR/archetypes"
		3006	or die "unable to load archetypes\n";
2524	}	3007	}
2525		3008
2526	sub reload_treasures {	3009	sub reload_treasures {
2527	load_resource_file "$DATADIR/treasures"	3010	load_resource_file "$DATADIR/treasures"
2528	or die "unable to load treasurelists\n";	3011	or die "unable to load treasurelists\n";
…		…
2531	sub reload_resources {	3014	sub reload_resources {
2532	warn "reloading resource files...\n";	3015	warn "reloading resource files...\n";
2533		3016
2534	reload_regions;	3017	reload_regions;
2535	reload_facedata;	3018	reload_facedata;
		3019	#reload_archetypes;#d#
2536	reload_archetypes;	3020	reload_archetypes;
2537	reload_treasures;	3021	reload_treasures;
2538		3022
2539	warn "finished reloading resource files\n";	3023	warn "finished reloading resource files\n";
2540	}	3024	}
2541		3025
2542	sub init {	3026	sub init {
2543	reload_resources;	3027	reload_resources;
2544	}	3028	}
2545		3029
2546	sub cfg_load {	3030	sub reload_config {
2547	open my $fh, "<:utf8", "$CONFDIR/config"	3031	open my $fh, "<:utf8", "$CONFDIR/config"
2548	or return;	3032	or return;
2549		3033
2550	local $/;	3034	local $/;
2551	*CFG = YAML::Syck::Load <$fh>;	3035	*CFG = YAML::Syck::Load <$fh>;
…		…
2571	(async {	3055	(async {
2572	Event::one_event;	3056	Event::one_event;
2573	})->prio (Coro::PRIO_MAX);	3057	})->prio (Coro::PRIO_MAX);
2574	};	3058	};
2575		3059
2576	cfg_load;	3060	reload_config;
2577	db_init;	3061	db_init;
2578	load_extensions;	3062	load_extensions;
2579		3063
2580	$TICK_WATCHER->start;	3064	$TICK_WATCHER->start;
2581	Event::loop;	3065	Event::loop;
…		…
2597	},	3081	},
2598	);	3082	);
2599	}	3083	}
2600	}	3084	}
2601		3085
		3086	sub write_runtime {
		3087	my $runtime = "$LOCALDIR/runtime";
		3088
		3089	# first touch the runtime file to show we are still running:
		3090	# the fsync below can take a very very long time.
		3091
		3092	IO::AIO::aio_utime $runtime, undef, undef;
		3093
		3094	my $guard = cf::lock_acquire "write_runtime";
		3095
		3096	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
		3097	or return;
		3098
		3099	my $value = $cf::RUNTIME + 90 + 10;
		3100	# 10 is the runtime save interval, for a monotonic clock
		3101	# 60 allows for the watchdog to kill the server.
		3102
		3103	(aio_write $fh, 0, (length $value), $value, 0) <= 0
		3104	and return;
		3105
		3106	# always fsync - this file is important
		3107	aio_fsync $fh
		3108	and return;
		3109
		3110	# touch it again to show we are up-to-date
		3111	aio_utime $fh, undef, undef;
		3112
		3113	close $fh
		3114	or return;
		3115
		3116	aio_rename "$runtime~", $runtime
		3117	and return;
		3118
		3119	warn "runtime file written.\n";
		3120
		3121	1
		3122	}
		3123
2602	sub emergency_save() {	3124	sub emergency_save() {
2603	my $freeze_guard = cf::freeze_mainloop;	3125	my $freeze_guard = cf::freeze_mainloop;
2604		3126
2605	warn "enter emergency perl save\n";	3127	warn "enter emergency perl save\n";
2606		3128
…		…
2681	%EXT_CORO = ();	3203	%EXT_CORO = ();
2682		3204
2683	warn "removing commands";	3205	warn "removing commands";
2684	%COMMAND = ();	3206	%COMMAND = ();
2685		3207
2686	warn "removing ext commands";	3208	warn "removing ext/exti commands";
2687	%EXTCMD = ();	3209	%EXTCMD = ();
		3210	%EXTICMD = ();
2688		3211
2689	warn "unloading/nuking all extensions";	3212	warn "unloading/nuking all extensions";
2690	for my $pkg (@EXTS) {	3213	for my $pkg (@EXTS) {
2691	warn "... unloading $pkg";	3214	warn "... unloading $pkg";
2692		3215
…		…
2735	warn "reloading cf.pm";	3258	warn "reloading cf.pm";
2736	require cf;	3259	require cf;
2737	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3260	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2738		3261
2739	warn "loading config and database again";	3262	warn "loading config and database again";
2740	cf::cfg_load;	3263	cf::reload_config;
2741		3264
2742	warn "loading extensions";	3265	warn "loading extensions";
2743	cf::load_extensions;	3266	cf::load_extensions;
2744		3267
2745	warn "reattaching attachments to objects/players";	3268	warn "reattaching attachments to objects/players";
…		…
2810	my $signal = new Coro::Signal;	3333	my $signal = new Coro::Signal;
2811	push @WAIT_FOR_TICK_BEGIN, $signal;	3334	push @WAIT_FOR_TICK_BEGIN, $signal;
2812	$signal->wait;	3335	$signal->wait;
2813	}	3336	}
2814		3337
		3338	my $min = 1e6;#d#
		3339	my $avg = 10;
2815	$TICK_WATCHER = Event->timer (	3340	$TICK_WATCHER = Event->timer (
2816	reentrant => 0,	3341	reentrant => 0,
2817	parked => 1,	3342	parked => 1,
2818	prio => 0,	3343	prio => 0,
2819	at => $NEXT_TICK || $TICK,	3344	at => $NEXT_TICK || $TICK,
…		…
2823	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3348	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2824	unless ++$bug_warning > 10;	3349	unless ++$bug_warning > 10;
2825	return;	3350	return;
2826	}	3351	}
2827		3352
2828	$NOW = Event::time;	3353	$NOW = $tick_start = Event::time;
2829		3354
2830	cf::server_tick; # one server iteration	3355	cf::server_tick; # one server iteration
		3356
		3357	0 && sync_job {#d#
		3358	for(1..10) {
		3359	my $t = Event::time;
		3360	my $map = my $map = new_from_path cf::map "/tmp/x.map"
		3361	or die;
		3362
		3363	$map->width (50);
		3364	$map->height (50);
		3365	$map->alloc;
		3366	$map->_load_objects ("/tmp/x.map", 1);
		3367	my $t = Event::time - $t;
		3368
		3369	#next unless $t < 0.0013;#d#
		3370	if ($t < $min) {
		3371	$min = $t;
		3372	}
		3373	$avg = $avg * 0.99 + $t * 0.01;
		3374	}
		3375	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
		3376	exit 0;
		3377	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
		3378	};
2831		3379
2832	$RUNTIME += $TICK;	3380	$RUNTIME += $TICK;
2833	$NEXT_TICK += $TICK;	3381	$NEXT_TICK += $TICK;
2834		3382
2835	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3383	if ($NOW >= $NEXT_RUNTIME_WRITE) {
…		…
2841	}	3389	}
2842		3390
2843	# my $AFTER = Event::time;	3391	# my $AFTER = Event::time;
2844	# warn $AFTER - $NOW;#d#	3392	# warn $AFTER - $NOW;#d#
2845		3393
		3394	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
		3395	$sig->send;
		3396	}
		3397	while (my $sig = shift @WAIT_FOR_TICK) {
		3398	$sig->send;
		3399	}
		3400
		3401	$NOW = Event::time;
		3402
2846	# if we are delayed by four ticks or more, skip them all	3403	# if we are delayed by four ticks or more, skip them all
2847	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	3404	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2848		3405
2849	$TICK_WATCHER->at ($NEXT_TICK);	3406	$TICK_WATCHER->at ($NEXT_TICK);
2850	$TICK_WATCHER->start;	3407	$TICK_WATCHER->start;
2851		3408
2852	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3409	$LOAD = ($NOW - $tick_start) / $TICK;
2853	$sig->send;	3410	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2854	}
2855	while (my $sig = shift @WAIT_FOR_TICK) {
2856	$sig->send;
2857	}
2858		3411
2859	_post_tick;	3412	_post_tick;
		3413
		3414
2860	},	3415	},
2861	);	3416	);
2862		3417
2863	{	3418	{
2864	BDB::max_poll_time $TICK * 0.1;	3419	BDB::max_poll_time $TICK * 0.1;
…		…
2923	prio => 6,	3478	prio => 6,
2924	cb => \&IO::AIO::poll_cb,	3479	cb => \&IO::AIO::poll_cb,
2925	);	3480	);
2926	}	3481	}
2927		3482
		3483	my $_log_backtrace;
		3484
2928	sub _log_backtrace {	3485	sub _log_backtrace {
2929	my ($msg, @addr) = @_;	3486	my ($msg, @addr) = @_;
2930		3487
		3488	$msg =~ s/\n//;
		3489
		3490	# limit the # of concurrent backtraces
		3491	if ($_log_backtrace < 2) {
		3492	++$_log_backtrace;
2931	async {	3493	async {
2932	my @bt = fork_call {	3494	my @bt = fork_call {
2933	@addr = map { sprintf "%x", $_ } @addr;	3495	@addr = map { sprintf "%x", $_ } @addr;
		3496	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
2934	open my $fh, "exec addr2line -C -f -i -e \Q$^X\E @addr 2>&1 |"	3497	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
2935	or die "addr2line: $!";	3498	or die "addr2line: $!";
2936		3499
2937	my @funcs;	3500	my @funcs;
2938	my @res = <$fh>;	3501	my @res = <$fh>;
2939	chomp for @res;	3502	chomp for @res;
2940	while (@res) {	3503	while (@res) {
2941	my ($func, $line) = splice @res, 0, 2, ();	3504	my ($func, $line) = splice @res, 0, 2, ();
2942	push @funcs, "[$func] $line";	3505	push @funcs, "[$func] $line";
		3506	}
		3507
		3508	@funcs
2943	}	3509	};
2944		3510
2945	@funcs	3511	LOG llevInfo, "[ABT] $msg\n";
		3512	LOG llevInfo, "[ABT] $_\n" for @bt;
		3513	--$_log_backtrace;
2946	};	3514	};
2947		3515	} else {
2948	$msg =~ s/\n//;
2949
2950	LOG llevInfo, "[ABT] $msg\n";	3516	LOG llevInfo, "[ABT] $msg\n";
2951	LOG llevInfo, "[ABT] $_\n" for @bt;	3517	LOG llevInfo, "[ABT] [suppressed]\n";
2952	};	3518	}
2953	}	3519	}
2954		3520
2955	# load additional modules	3521	# load additional modules
2956	use cf::pod;	3522	use cf::pod;
2957		3523

Diff Legend

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