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.272 by root, Sun Jun 3 15:32:50 2007 UTC vs.
Revision 1.362 by root, Mon Sep 10 12:44:06 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;
…		…
83	our %CFG;	87	our %CFG;
84		88
85	our $UPTIME; $UPTIME ||= time;	89	our $UPTIME; $UPTIME ||= time;
86	our $RUNTIME;	90	our $RUNTIME;
87		91
88	our %PLAYER; # all users	92	our (%PLAYER, %PLAYER_LOADING); # all users
89	our %MAP; # all maps	93	our (%MAP, %MAP_LOADING ); # all maps
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
…		…
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 {
…		…
177	$msg .= "\n"	187	$msg .= "\n"
178	unless $msg =~ /\n$/;	188	unless $msg =~ /\n$/;
179		189
180	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	190	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181		191
182	utf8::encode $msg;
183	LOG llevError, $msg;	192	LOG llevError, $msg;
184	};	193	};
185	}	194	}
186		195
187	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	196	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	197	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	198	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	199	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
191	@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';	200	@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
		201	@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
192	@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';	202	@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
193		203
194	# we bless all objects into (empty) derived classes to force a method lookup	204	# we bless all objects into (empty) derived classes to force a method lookup
195	# within the Safe compartment.	205	# within the Safe compartment.
196	for my $pkg (qw(	206	for my $pkg (qw(
197	cf::global cf::attachable	207	cf::global cf::attachable
…		…
205	}	215	}
206		216
207	$Event::DIED = sub {	217	$Event::DIED = sub {
208	warn "error in event callback: @_";	218	warn "error in event callback: @_";
209	};	219	};
		220
		221	#############################################################################
210		222
211	=head2 UTILITY FUNCTIONS	223	=head2 UTILITY FUNCTIONS
212		224
213	=over 4	225	=over 4
214		226
…		…
233	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	245	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
234	$d	246	$d
235	} || "[unable to dump $_[0]: '$@']";	247	} || "[unable to dump $_[0]: '$@']";
236	}	248	}
237		249
238	use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
239
240	=item $ref = cf::from_json $json	250	=item $ref = cf::from_json $json
241		251
242	Converts a JSON string into the corresponding perl data structure.	252	Converts a JSON string into the corresponding perl data structure.
243		253
244	=item $json = cf::to_json $ref	254	=item $json = cf::to_json $ref
245		255
246	Converts a perl data structure into its JSON representation.	256	Converts a perl data structure into its JSON representation.
		257
		258	=cut
		259
		260	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
		261
		262	sub to_json ($) { $json_coder->encode ($_[0]) }
		263	sub from_json ($) { $json_coder->decode ($_[0]) }
247		264
248	=item cf::lock_wait $string	265	=item cf::lock_wait $string
249		266
250	Wait until the given lock is available. See cf::lock_acquire.	267	Wait until the given lock is available. See cf::lock_acquire.
251		268
…		…
254	Wait until the given lock is available and then acquires it and returns	271	Wait until the given lock is available and then acquires it and returns
255	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	272	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
256	for example when the coroutine gets canceled), the lock is automatically	273	for example when the coroutine gets canceled), the lock is automatically
257	returned.	274	returned.
258		275
		276	Locks are *not* recursive, locking from the same coro twice results in a
		277	deadlocked coro.
		278
259	Lock names should begin with a unique identifier (for example, cf::map::find	279	Lock names should begin with a unique identifier (for example, cf::map::find
260	uses map_find and cf::map::load uses map_load).	280	uses map_find and cf::map::load uses map_load).
261		281
262	=item $locked = cf::lock_active $string	282	=item $locked = cf::lock_active $string
263		283
264	Return true if the lock is currently active, i.e. somebody has locked it.	284	Return true if the lock is currently active, i.e. somebody has locked it.
265		285
266	=cut	286	=cut
267		287
268	our %LOCK;	288	our %LOCK;
		289	our %LOCKER;#d#
269		290
270	sub lock_wait($) {	291	sub lock_wait($) {
271	my ($key) = @_;	292	my ($key) = @_;
		293
		294	if ($LOCKER{$key} == $Coro::current) {#d#
		295	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		296	return;#d#
		297	}#d#
272		298
273	# wait for lock, if any	299	# wait for lock, if any
274	while ($LOCK{$key}) {	300	while ($LOCK{$key}) {
275	push @{ $LOCK{$key} }, $Coro::current;	301	push @{ $LOCK{$key} }, $Coro::current;
276	Coro::schedule;	302	Coro::schedule;
…		…
282		308
283	# wait, to be sure we are not locked	309	# wait, to be sure we are not locked
284	lock_wait $key;	310	lock_wait $key;
285		311
286	$LOCK{$key} = [];	312	$LOCK{$key} = [];
		313	$LOCKER{$key} = $Coro::current;#d#
287		314
288	Coro::guard {	315	Coro::guard {
		316	delete $LOCKER{$key};#d#
289	# wake up all waiters, to be on the safe side	317	# wake up all waiters, to be on the safe side
290	$_->ready for @{ delete $LOCK{$key} };	318	$_->ready for @{ delete $LOCK{$key} };
291	}	319	}
292	}	320	}
293		321
…		…
305	};	333	};
306	$TICK_WATCHER->stop;	334	$TICK_WATCHER->stop;
307	$guard	335	$guard
308	}	336	}
309		337
		338	=item cf::get_slot $time[, $priority[, $name]]
		339
		340	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		341	This call blocks and returns only when you have at least C<$time> seconds
		342	of cpu time till the next tick. The slot is only valid till the next cede.
		343
		344	The optional C<$name> can be used to identify the job to run. It might be
		345	used for statistical purposes and should identify the same time-class.
		346
		347	Useful for short background jobs.
		348
		349	=cut
		350
		351	our @SLOT_QUEUE;
		352	our $SLOT_QUEUE;
		353
		354	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		355	$SLOT_QUEUE = Coro::async {
		356	my $signal = new Coro::Signal;
		357
		358	while () {
		359	next_job:
		360	my $avail = cf::till_tick;
		361	if ($avail > 0.01) {
		362	for (0 .. $#SLOT_QUEUE) {
		363	if ($SLOT_QUEUE[$_][0] < $avail) {
		364	my $job = splice @SLOT_QUEUE, $_, 1, ();
		365	$job->[2]->send;
		366	Coro::cede;
		367	goto next_job;
		368	}
		369	}
		370	}
		371
		372	if (@SLOT_QUEUE) {
		373	# we do not use wait_For_tick() as it returns immediately when tick is inactive
		374	push @cf::WAIT_FOR_TICK, $signal;
		375	$signal->wait;
		376	} else {
		377	Coro::schedule;
		378	}
		379	}
		380	};
		381
		382	sub get_slot($;$$) {
		383	my ($time, $pri, $name) = @_;
		384
		385	$time = $TICK * .6 if $time > $TICK * .6;
		386	my $sig = new Coro::Signal;
		387
		388	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		389	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		390	$SLOT_QUEUE->ready;
		391	$sig->wait;
		392	}
		393
310	=item cf::async { BLOCK }	394	=item cf::async { BLOCK }
311		395
312	Currently the same as Coro::async_pool, meaning you cannot use	396	Currently the same as Coro::async_pool, meaning you cannot use
313	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only	397	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
314	thing you are allowed to do is call C<prio> on it.	398	thing you are allowed to do is call C<prio> on it.
…		…
317		401
318	BEGIN { *async = \&Coro::async_pool }	402	BEGIN { *async = \&Coro::async_pool }
319		403
320	=item cf::sync_job { BLOCK }	404	=item cf::sync_job { BLOCK }
321		405
322	The design of crossfire+ requires that the main coro ($Coro::main) is	406	The design of Crossfire TRT requires that the main coroutine ($Coro::main)
323	always able to handle events or runnable, as crossfire+ is only partly	407	is always able to handle events or runnable, as Crossfire TRT is only
324	reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.	408	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
		409	acceptable.
325		410
326	If it must be done, put the blocking parts into C<sync_job>. This will run	411	If it must be done, put the blocking parts into C<sync_job>. This will run
327	the given BLOCK in another coroutine while waiting for the result. The	412	the given BLOCK in another coroutine while waiting for the result. The
328	server will be frozen during this time, so the block should either finish	413	server will be frozen during this time, so the block should either finish
329	fast or be very important.	414	fast or be very important.
…		…
389	$EXT_CORO{$coro+0} = $coro;	474	$EXT_CORO{$coro+0} = $coro;
390		475
391	$coro	476	$coro
392	}	477	}
393		478
394	sub write_runtime {	479	=item fork_call { }, $args
395	my $runtime = "$LOCALDIR/runtime";
396		480
397	# first touch the runtime file to show we are still running:	481	Executes the given code block with the given arguments in a seperate
398	# the fsync below can take a very very long time.	482	process, returning the results. Everything must be serialisable with
		483	Coro::Storable. May, of course, block. Note that the executed sub may
		484	never block itself or use any form of Event handling.
399		485
400	IO::AIO::aio_utime $runtime, undef, undef;	486	=cut
401		487
402	my $guard = cf::lock_acquire "write_runtime";	488	sub fork_call(&@) {
		489	my ($cb, @args) = @_;
403		490
404	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	491	# we seemingly have to make a local copy of the whole thing,
405	or return;	492	# otherwise perl prematurely frees the stuff :/
		493	# TODO: investigate and fix (likely this will be rather laborious)
406		494
407	my $value = $cf::RUNTIME + 90 + 10;	495	my @res = Coro::Util::fork_eval {
408	# 10 is the runtime save interval, for a monotonic clock	496	reset_signals;
409	# 60 allows for the watchdog to kill the server.	497	&$cb
		498	}, @args;
410		499
411	(aio_write $fh, 0, (length $value), $value, 0) <= 0	500	wantarray ? @res : $res[-1]
412	and return;	501	}
413		502
414	# always fsync - this file is important	503	=item $value = cf::db_get $family => $key
415	aio_fsync $fh
416	and return;
417		504
418	# touch it again to show we are up-to-date	505	Returns a single value from the environment database.
419	aio_utime $fh, undef, undef;
420		506
421	close $fh	507	=item cf::db_put $family => $key => $value
422	or return;
423		508
424	aio_rename "$runtime~", $runtime	509	Stores the given C<$value> in the family. It can currently store binary
425	and return;	510	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
426		511
427	warn "runtime file written.\n";#d#	512	=cut
428		513
		514	our $DB;
		515
		516	sub db_init {
		517	unless ($DB) {
		518	$DB = BDB::db_create $DB_ENV;
		519
		520	cf::sync_job {
		521	eval {
		522	$DB->set_flags (BDB::CHKSUM);
		523
		524	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
		525	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		526	cf::cleanup "db_open(db): $!" if $!;
		527	};
		528	cf::cleanup "db_open(db): $@" if $@;
		529	};
429	1	530	}
		531	}
		532
		533	sub db_get($$) {
		534	my $key = "$_[0]/$_[1]";
		535
		536	cf::sync_job {
		537	BDB::db_get $DB, undef, $key, my $data;
		538
		539	$! ? ()
		540	: $data
		541	}
		542	}
		543
		544	sub db_put($$$) {
		545	BDB::dbreq_pri 4;
		546	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
		547	}
		548
		549	=item cf::cache $id => [$paths...], $processversion => $process
		550
		551	Generic caching function that returns the value of the resource $id,
		552	caching and regenerating as required.
		553
		554	This function can block.
		555
		556	=cut
		557
		558	sub cache {
		559	my ($id, $src, $processversion, $process) = @_;
		560
		561	my $meta =
		562	join "\x00",
		563	$processversion,
		564	map {
		565	aio_stat $_
		566	and Carp::croak "$_: $!";
		567
		568	($_, (stat _)[7,9])
		569	} @$src;
		570
		571	my $dbmeta = db_get cache => "$id/meta";
		572	if ($dbmeta ne $meta) {
		573	# changed, we may need to process
		574
		575	my @data;
		576	my $md5;
		577
		578	for (0 .. $#$src) {
		579	0 <= aio_load $src->[$_], $data[$_]
		580	or Carp::croak "$src->[$_]: $!";
		581	}
		582
		583	# if processing is expensive, check
		584	# checksum first
		585	if (1) {
		586	$md5 =
		587	join "\x00",
		588	$processversion,
		589	map {
		590	cf::cede_to_tick;
		591	($src->[$_], Digest::MD5::md5_hex $data[$_])
		592	} 0.. $#$src;
		593
		594
		595	my $dbmd5 = db_get cache => "$id/md5";
		596	if ($dbmd5 eq $md5) {
		597	db_put cache => "$id/meta", $meta;
		598
		599	return db_get cache => "$id/data";
		600	}
		601	}
		602
		603	my $t1 = Time::HiRes::time;
		604	my $data = $process->(\@data);
		605	my $t2 = Time::HiRes::time;
		606
		607	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
		608
		609	db_put cache => "$id/data", $data;
		610	db_put cache => "$id/md5" , $md5;
		611	db_put cache => "$id/meta", $meta;
		612
		613	return $data;
		614	}
		615
		616	db_get cache => "$id/data"
430	}	617	}
431		618
432	=item cf::datalog type => key => value, ...	619	=item cf::datalog type => key => value, ...
433		620
434	Log a datalog packet of the given type with the given key-value pairs.	621	Log a datalog packet of the given type with the given key-value pairs.
…		…
452	attach callbacks/event handlers (a collection of which is called an "attachment")	639	attach callbacks/event handlers (a collection of which is called an "attachment")
453	to it. All such attachable objects support the following methods.	640	to it. All such attachable objects support the following methods.
454		641
455	In the following description, CLASS can be any of C<global>, C<object>	642	In the following description, CLASS can be any of C<global>, C<object>
456	C<player>, C<client> or C<map> (i.e. the attachable objects in	643	C<player>, C<client> or C<map> (i.e. the attachable objects in
457	crossfire+).	644	Crossfire TRT).
458		645
459	=over 4	646	=over 4
460		647
461	=item $attachable->attach ($attachment, key => $value...)	648	=item $attachable->attach ($attachment, key => $value...)
462		649
…		…
664	_attach $registry, $klass, @attach;	851	_attach $registry, $klass, @attach;
665	}	852	}
666		853
667	$obj->{$name} = \%arg;	854	$obj->{$name} = \%arg;
668	} else {	855	} else {
669	warn "object uses attachment '$name' that is not available, postponing.\n";	856	warn "object uses attachment '$name' which is not available, postponing.\n";
670	}	857	}
671		858
672	$obj->{_attachment}{$name} = undef;	859	$obj->{_attachment}{$name} = undef;
673	}	860	}
674		861
…		…
714	";	901	";
715	die if $@;	902	die if $@;
716	}	903	}
717		904
718	our $override;	905	our $override;
719	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	906	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
720		907
721	sub override {	908	sub override {
722	$override = 1;	909	$override = 1;
723	@invoke_results = ();	910	@INVOKE_RESULTS = (@_);
724	}	911	}
725		912
726	sub do_invoke {	913	sub do_invoke {
727	my $event = shift;	914	my $event = shift;
728	my $callbacks = shift;	915	my $callbacks = shift;
729		916
730	@invoke_results = ();	917	@INVOKE_RESULTS = ();
731		918
732	local $override;	919	local $override;
733		920
734	for (@$callbacks) {	921	for (@$callbacks) {
735	eval { &{$_->[1]} };	922	eval { &{$_->[1]} };
…		…
752		939
753	Generate an object-specific event with the given arguments.	940	Generate an object-specific event with the given arguments.
754		941
755	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	942	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
756	removed in future versions), and there is no public API to access override	943	removed in future versions), and there is no public API to access override
757	results (if you must, access C<@cf::invoke_results> directly).	944	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
758		945
759	=back	946	=back
760		947
761	=cut	948	=cut
762		949
763	#############################################################################	950	#############################################################################
764	# object support	951	# object support
		952	#
		953
		954	sub _can_merge {
		955	my ($ob1, $ob2) = @_;
		956
		957	local $Storable::canonical = 1;
		958	my $fob1 = Storable::freeze $ob1;
		959	my $fob2 = Storable::freeze $ob2;
		960
		961	$fob1 eq $fob2
		962	}
765		963
766	sub reattach {	964	sub reattach {
767	# basically do the same as instantiate, without calling instantiate	965	# basically do the same as instantiate, without calling instantiate
768	my ($obj) = @_;	966	my ($obj) = @_;
769		967
…		…
814	);	1012	);
815		1013
816	sub object_freezer_save {	1014	sub object_freezer_save {
817	my ($filename, $rdata, $objs) = @_;	1015	my ($filename, $rdata, $objs) = @_;
818		1016
		1017	my $guard = cf::lock_acquire "io";
		1018
819	sync_job {	1019	sync_job {
820	if (length $$rdata) {	1020	if (length $$rdata) {
		1021	utf8::decode (my $decname = $filename);
821	warn sprintf "saving %s (%d,%d)\n",	1022	warn sprintf "saving %s (%d,%d)\n",
822	$filename, length $$rdata, scalar @$objs;	1023	$decname, length $$rdata, scalar @$objs;
823		1024
824	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1025	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
825	chmod SAVE_MODE, $fh;	1026	chmod SAVE_MODE, $fh;
826	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1027	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
827	aio_fsync $fh if $cf::USE_FSYNC;	1028	aio_fsync $fh if $cf::USE_FSYNC;
…		…
846	}	1047	}
847	} else {	1048	} else {
848	aio_unlink $filename;	1049	aio_unlink $filename;
849	aio_unlink "$filename.pst";	1050	aio_unlink "$filename.pst";
850	}	1051	}
851	}	1052	};
		1053
		1054	undef $guard;
852	}	1055	}
853		1056
854	sub object_freezer_as_string {	1057	sub object_freezer_as_string {
855	my ($rdata, $objs) = @_;	1058	my ($rdata, $objs) = @_;
856		1059
…		…
861		1064
862	sub object_thawer_load {	1065	sub object_thawer_load {
863	my ($filename) = @_;	1066	my ($filename) = @_;
864		1067
865	my ($data, $av);	1068	my ($data, $av);
		1069
		1070	my $guard = cf::lock_acquire "io";
866		1071
867	(aio_load $filename, $data) >= 0	1072	(aio_load $filename, $data) >= 0
868	or return;	1073	or return;
869		1074
870	unless (aio_stat "$filename.pst") {	1075	unless (aio_stat "$filename.pst") {
871	(aio_load "$filename.pst", $av) >= 0	1076	(aio_load "$filename.pst", $av) >= 0
872	or return;	1077	or return;
		1078
		1079	undef $guard;
873	$av = eval { (Storable::thaw $av)->{objs} };	1080	$av = eval { (Storable::thaw $av)->{objs} };
874	}	1081	}
875		1082
		1083	utf8::decode (my $decname = $filename);
876	warn sprintf "loading %s (%d)\n",	1084	warn sprintf "loading %s (%d,%d)\n",
877	$filename, length $data, scalar @{$av || []};#d#	1085	$decname, length $data, scalar @{$av || []};
		1086
878	return ($data, $av);	1087	($data, $av)
879	}	1088	}
		1089
		1090	=head2 COMMAND CALLBACKS
		1091
		1092	=over 4
		1093
		1094	=cut
880		1095
881	#############################################################################	1096	#############################################################################
882	# command handling &c	1097	# command handling &c
883		1098
884	=item cf::register_command $name => \&callback($ob,$args);	1099	=item cf::register_command $name => \&callback($ob,$args);
…		…
897	push @{ $COMMAND{$name} }, [$caller, $cb];	1112	push @{ $COMMAND{$name} }, [$caller, $cb];
898	}	1113	}
899		1114
900	=item cf::register_extcmd $name => \&callback($pl,$packet);	1115	=item cf::register_extcmd $name => \&callback($pl,$packet);
901		1116
902	Register a callbackf ro execution when the client sends an extcmd packet.	1117	Register a callback for execution when the client sends an (synchronous)
		1118	extcmd packet. Ext commands will be processed in the order they are
		1119	received by the server, like other user commands. The first argument is
		1120	the logged-in player. Ext commands can only be processed after a player
		1121	has logged in successfully.
903		1122
904	If the callback returns something, it is sent back as if reply was being	1123	If the callback returns something, it is sent back as if reply was being
905	called.	1124	called.
906		1125
		1126	=item cf::register_exticmd $name => \&callback($ns,$packet);
		1127
		1128	Register a callback for execution when the client sends an (asynchronous)
		1129	exticmd packet. Exti commands are processed by the server as soon as they
		1130	are received, i.e. out of order w.r.t. other commands. The first argument
		1131	is a client socket. Exti commands can be received anytime, even before
		1132	log-in.
		1133
		1134	If the callback returns something, it is sent back as if reply was being
		1135	called.
		1136
907	=cut	1137	=cut
908		1138
909	sub register_extcmd {	1139	sub register_extcmd {
910	my ($name, $cb) = @_;	1140	my ($name, $cb) = @_;
911		1141
912	$EXTCMD{$name} = $cb;	1142	$EXTCMD{$name} = $cb;
		1143	}
		1144
		1145	sub register_exticmd {
		1146	my ($name, $cb) = @_;
		1147
		1148	$EXTICMD{$name} = $cb;
913	}	1149	}
914		1150
915	cf::player->attach (	1151	cf::player->attach (
916	on_command => sub {	1152	on_command => sub {
917	my ($pl, $name, $params) = @_;	1153	my ($pl, $name, $params) = @_;
…		…
926	cf::override;	1162	cf::override;
927	},	1163	},
928	on_extcmd => sub {	1164	on_extcmd => sub {
929	my ($pl, $buf) = @_;	1165	my ($pl, $buf) = @_;
930		1166
931	my $msg = eval { from_json $buf };	1167	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
932		1168
933	if (ref $msg) {	1169	if (ref $msg) {
		1170	my ($type, $reply, @payload) =
		1171	"ARRAY" eq ref $msg
		1172	? @$msg
		1173	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1174
		1175	my @reply;
		1176
934	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1177	if (my $cb = $EXTCMD{$type}) {
935	if (my %reply = $cb->($pl, $msg)) {	1178	@reply = $cb->($pl, @payload);
936	$pl->ext_reply ($msg->{msgid}, %reply);
937	}
938	}	1179	}
		1180
		1181	$pl->ext_reply ($reply, @reply)
		1182	if $reply;
		1183
939	} else {	1184	} else {
940	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1185	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
941	}	1186	}
942		1187
943	cf::override;	1188	cf::override;
944	},	1189	},
945	);	1190	);
946		1191
947	sub load_extension {
948	my ($path) = @_;
949
950	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
951	my $base = $1;
952	my $pkg = $1;
953	$pkg =~ s/[^[:word:]]/_/g;
954	$pkg = "ext::$pkg";
955
956	warn "... loading '$path' into '$pkg'\n";
957
958	open my $fh, "<:utf8", $path
959	or die "$path: $!";
960
961	my $source =
962	"package $pkg; use strict; use utf8;\n"
963	. "#line 1 \"$path\"\n{\n"
964	. (do { local $/; <$fh> })
965	. "\n};\n1";
966
967	unless (eval $source) {
968	my $msg = $@ ? "$path: $@\n"
969	: "extension disabled.\n";
970	if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
971	warn $@;
972	warn "mandatory extension failed to load, exiting.\n";
973	exit 1;
974	}
975	die $@;
976	}
977
978	push @EXTS, $pkg;
979	}
980
981	sub load_extensions {	1192	sub load_extensions {
		1193	cf::sync_job {
		1194	my %todo;
		1195
982	for my $ext (<$LIBDIR/*.ext>) {	1196	for my $path (<$LIBDIR/*.ext>) {
983	next unless -r $ext;	1197	next unless -r $path;
984	eval {	1198
985	load_extension $ext;	1199	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
		1200	my $base = $1;
		1201	my $pkg = $1;
		1202	$pkg =~ s/[^[:word:]]/_/g;
		1203	$pkg = "ext::$pkg";
		1204
		1205	open my $fh, "<:utf8", $path
		1206	or die "$path: $!";
		1207
		1208	my $source = do { local $/; <$fh> };
		1209
		1210	my %ext = (
		1211	path => $path,
		1212	base => $base,
		1213	pkg => $pkg,
		1214	);
		1215
		1216	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
		1217	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
		1218
		1219	$ext{source} =
		1220	"package $pkg; use strict; use utf8;\n"
		1221	. "#line 1 \"$path\"\n{\n"
		1222	. $source
		1223	. "\n};\n1";
		1224
		1225	$todo{$base} = \%ext;
		1226	}
		1227
		1228	my %done;
		1229	while (%todo) {
		1230	my $progress;
		1231
		1232	while (my ($k, $v) = each %todo) {
		1233	for (split /,\s*/, $v->{meta}{depends}) {
		1234	goto skip
		1235	unless exists $done{$_};
		1236	}
		1237
		1238	warn "... loading '$k' into '$v->{pkg}'\n";
		1239
		1240	unless (eval $v->{source}) {
		1241	my $msg = $@ ? "$v->{path}: $@\n"
		1242	: "$v->{base}: extension inactive.\n";
		1243
		1244	if (exists $v->{meta}{mandatory}) {
		1245	warn $msg;
		1246	warn "mandatory extension failed to load, exiting.\n";
		1247	exit 1;
		1248	}
		1249
		1250	warn $msg;
		1251	}
		1252
		1253	$done{$k} = delete $todo{$k};
		1254	push @EXTS, $v->{pkg};
		1255	$progress = 1;
986	1	1256	}
987	} or warn "$ext not loaded: $@";	1257
		1258	skip:
		1259	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
		1260	unless $progress;
		1261	}
988	}	1262	};
989	}	1263	}
990		1264
991	#############################################################################	1265	#############################################################################
992		1266
		1267	=back
		1268
993	=head2 CORE EXTENSIONS	1269	=head2 CORE EXTENSIONS
994		1270
995	Functions and methods that extend core crossfire objects.	1271	Functions and methods that extend core crossfire objects.
996		1272
997	=cut	1273	=cut
…		…
1001	use Coro::AIO;	1277	use Coro::AIO;
1002		1278
1003	=head3 cf::player	1279	=head3 cf::player
1004		1280
1005	=over 4	1281	=over 4
		1282
		1283	=item cf::player::num_playing
		1284
		1285	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1286
		1287	=cut
		1288
		1289	sub num_playing {
		1290	scalar grep
		1291	$_->ob->map
		1292	&& !$_->hidden
		1293	&& !$_->ob->flag (cf::FLAG_WIZ),
		1294	cf::player::list
		1295	}
1006		1296
1007	=item cf::player::find $login	1297	=item cf::player::find $login
1008		1298
1009	Returns the given player object, loading it if necessary (might block).	1299	Returns the given player object, loading it if necessary (might block).
1010		1300
…		…
1046	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1336	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1047	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1337	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1048	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1338	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1049	aio_unlink +(playerdir $login) . "/$login.pl";	1339	aio_unlink +(playerdir $login) . "/$login.pl";
1050		1340
1051	my $pl = load_pl path $login	1341	my $f = new_from_file cf::object::thawer path $login
1052	or return;	1342	or return;
		1343
		1344	$f->next;
		1345	my $pl = cf::player::load_pl $f
		1346	or return;
		1347	local $cf::PLAYER_LOADING{$login} = $pl;
		1348	$f->resolve_delayed_derefs;
1053	$cf::PLAYER{$login} = $pl	1349	$cf::PLAYER{$login} = $pl
1054	}	1350	}
1055	}	1351	}
1056	}	1352	}
1057		1353
…		…
1067		1363
1068	aio_mkdir playerdir $pl, 0770;	1364	aio_mkdir playerdir $pl, 0770;
1069	$pl->{last_save} = $cf::RUNTIME;	1365	$pl->{last_save} = $cf::RUNTIME;
1070		1366
1071	$pl->save_pl ($path);	1367	$pl->save_pl ($path);
1072	Coro::cede;	1368	cf::cede_to_tick;
1073	}	1369	}
1074		1370
1075	sub new($) {	1371	sub new($) {
1076	my ($login) = @_;	1372	my ($login) = @_;
1077		1373
…		…
1081	$self->{deny_save} = 1;	1377	$self->{deny_save} = 1;
1082		1378
1083	$cf::PLAYER{$login} = $self;	1379	$cf::PLAYER{$login} = $self;
1084		1380
1085	$self	1381	$self
		1382	}
		1383
		1384	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1385
		1386	=cut
		1387
		1388	sub send_msg {
		1389	my $ns = shift->ns
		1390	or return;
		1391	$ns->send_msg (@_);
1086	}	1392	}
1087		1393
1088	=item $pl->quit_character	1394	=item $pl->quit_character
1089		1395
1090	Nukes the player without looking back. If logged in, the connection will	1396	Nukes the player without looking back. If logged in, the connection will
…		…
1145	or return [];	1451	or return [];
1146		1452
1147	my @logins;	1453	my @logins;
1148		1454
1149	for my $login (@$dirs) {	1455	for my $login (@$dirs) {
		1456	my $path = path $login;
		1457
		1458	# a .pst is a dead give-away for a valid player
		1459	unless (-e "$path.pst") {
1150	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1460	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1151	aio_read $fh, 0, 512, my $buf, 0 or next;	1461	aio_read $fh, 0, 512, my $buf, 0 or next;
1152	$buf !~ /^password -------------$/m or next; # official not-valid tag	1462	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1463	}
1153		1464
1154	utf8::decode $login;	1465	utf8::decode $login;
1155	push @logins, $login;	1466	push @logins, $login;
1156	}	1467	}
1157		1468
…		…
1184	}	1495	}
1185		1496
1186	\@paths	1497	\@paths
1187	}	1498	}
1188		1499
		1500	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
		1501
		1502	Expand crossfire pod fragments into protocol xml.
		1503
		1504	=cut
		1505
		1506	sub expand_cfpod {
		1507	((my $self), (local $_)) = @_;
		1508
		1509	# escape & and <
		1510	s/&/&amp;/g;
		1511	s/(?<![BIUGHT])</&lt;/g;
		1512
		1513	# this is buggy, it needs to properly take care of nested <'s
		1514
		1515	1 while
		1516	# replace B<>, I<>, U<> etc.
		1517	s/B<([^\>]*)>/<b>$1<\/b>/
		1518	|| s/I<([^\>]*)>/<i>$1<\/i>/
		1519	|| s/U<([^\>]*)>/<u>$1<\/u>/
		1520	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
		1521	# replace G<male|female> tags
		1522	|| s{G<([^>|]*)\|([^>]*)>}{
		1523	$self->gender ? $2 : $1
		1524	}ge
		1525	# replace H<hint text>
		1526	|| s{H<([^\>]*)>}
		1527	{
		1528	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1529	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1530	"")
		1531	[$self->{hintmode}]
		1532	}ge;
		1533
		1534	# create single paragraphs (very hackish)
		1535	s/(?<=\S)\n(?=\w)/ /g;
		1536
		1537	# compress some whitespace
		1538	s/\s+\n/\n/g; # ws line-ends
		1539	s/\n\n+/\n/g; # double lines
		1540	s/^\n+//; # beginning lines
		1541	s/\n+$//; # ending lines
		1542
		1543	$_
		1544	}
		1545
		1546	sub hintmode {
		1547	$_[0]{hintmode} = $_[1] if @_ > 1;
		1548	$_[0]{hintmode}
		1549	}
		1550
1189	=item $player->ext_reply ($msgid, %msg)	1551	=item $player->ext_reply ($msgid, @msg)
1190		1552
1191	Sends an ext reply to the player.	1553	Sends an ext reply to the player.
1192		1554
1193	=cut	1555	=cut
1194		1556
1195	sub ext_reply($$%) {	1557	sub ext_reply($$@) {
1196	my ($self, $id, %msg) = @_;	1558	my ($self, $id, @msg) = @_;
1197		1559
1198	$msg{msgid} = $id;	1560	$self->ns->ext_reply ($id, @msg)
1199
1200	$self->send ("ext " . cf::to_json \%msg);
1201	}	1561	}
1202		1562
1203	=item $player->ext_event ($type, %msg)	1563	=item $player->ext_msg ($type, @msg)
1204		1564
1205	Sends an ext event to the client.	1565	Sends an ext event to the client.
1206		1566
1207	=cut	1567	=cut
1208		1568
1209	sub ext_event($$%) {	1569	sub ext_msg($$@) {
1210	my ($self, $type, %msg) = @_;	1570	my ($self, $type, @msg) = @_;
1211		1571
1212	$self->ns->ext_event ($type, %msg);	1572	$self->ns->ext_msg ($type, @msg);
1213	}	1573	}
1214		1574
1215	=head3 cf::region	1575	=head3 cf::region
1216		1576
1217	=over 4	1577	=over 4
…		…
1220		1580
1221	package cf::region;	1581	package cf::region;
1222		1582
1223	=item cf::region::find_by_path $path	1583	=item cf::region::find_by_path $path
1224		1584
1225	Tries to decuce the probable region for a map knowing only its path.	1585	Tries to decuce the likely region for a map knowing only its path.
1226		1586
1227	=cut	1587	=cut
1228		1588
1229	sub find_by_path($) {	1589	sub find_by_path($) {
1230	my ($path) = @_;	1590	my ($path) = @_;
1231		1591
1232	my ($match, $specificity);	1592	my ($match, $specificity);
1233		1593
1234	for my $region (list) {	1594	for my $region (list) {
1235	if ($region->match && $path =~ $region->match) {	1595	if ($region->{match} && $path =~ $region->{match}) {
1236	($match, $specificity) = ($region, $region->specificity)	1596	($match, $specificity) = ($region, $region->specificity)
1237	if $region->specificity > $specificity;	1597	if $region->specificity > $specificity;
1238	}	1598	}
1239	}	1599	}
1240		1600
…		…
1304	my ($self, $merge) = @_;	1664	my ($self, $merge) = @_;
1305		1665
1306	# we have to keep some variables in memory intact	1666	# we have to keep some variables in memory intact
1307	local $self->{path};	1667	local $self->{path};
1308	local $self->{load_path};	1668	local $self->{load_path};
1309	local $self->{deny_save};
1310	local $self->{deny_reset};
1311		1669
1312	$self->SUPER::thawer_merge ($merge);	1670	$self->SUPER::thawer_merge ($merge);
1313	}	1671	}
1314		1672
1315	sub normalise {	1673	sub normalise {
…		…
1362	$self->init; # pass $1 etc.	1720	$self->init; # pass $1 etc.
1363	return $self;	1721	return $self;
1364	}	1722	}
1365	}	1723	}
1366		1724
1367	Carp::carp "unable to resolve path '$path' (base '$base').";	1725	Carp::cluck "unable to resolve path '$path' (base '$base').";
1368	()	1726	()
1369	}	1727	}
1370		1728
1371	sub init {	1729	sub init {
1372	my ($self) = @_;	1730	my ($self) = @_;
…		…
1415		1773
1416	$_->change_map_light ($change)	1774	$_->change_map_light ($change)
1417	for grep $_->outdoor, values %cf::MAP;	1775	for grep $_->outdoor, values %cf::MAP;
1418	}	1776	}
1419		1777
		1778	sub decay_objects {
		1779	my ($self) = @_;
		1780
		1781	return if $self->{deny_reset};
		1782
		1783	$self->do_decay_objects;
		1784	}
		1785
1420	sub unlink_save {	1786	sub unlink_save {
1421	my ($self) = @_;	1787	my ($self) = @_;
1422		1788
1423	utf8::encode (my $save = $self->save_path);	1789	utf8::encode (my $save = $self->save_path);
1424	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;	1790	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
…		…
1427		1793
1428	sub load_header_from($) {	1794	sub load_header_from($) {
1429	my ($self, $path) = @_;	1795	my ($self, $path) = @_;
1430		1796
1431	utf8::encode $path;	1797	utf8::encode $path;
1432	#aio_open $path, O_RDONLY, 0	1798	my $f = new_from_file cf::object::thawer $path
1433	# or return;
1434
1435	$self->_load_header ($path)
1436	or return;	1799	or return;
		1800
		1801	$self->_load_header ($f)
		1802	or return;
		1803
		1804	local $MAP_LOADING{$self->{path}} = $self;
		1805	$f->resolve_delayed_derefs;
1437		1806
1438	$self->{load_path} = $path;	1807	$self->{load_path} = $path;
1439		1808
1440	1	1809	1
1441	}	1810	}
…		…
1480	$self->load_header_orig	1849	$self->load_header_orig
1481	or return;	1850	or return;
1482	$self->prepare_orig;	1851	$self->prepare_orig;
1483	}	1852	}
1484		1853
		1854	$self->{deny_reset} = 1
		1855	if $self->no_reset;
		1856
1485	$self->default_region (cf::region::find_by_path $self->{path})	1857	$self->default_region (cf::region::find_by_path $self->{path})
1486	unless $self->default_region;	1858	unless $self->default_region;
1487		1859
1488	1	1860	1
1489	}	1861	}
…		…
1492	sub find {	1864	sub find {
1493	my ($path, $origin) = @_;	1865	my ($path, $origin) = @_;
1494		1866
1495	$path = normalise $path, $origin && $origin->path;	1867	$path = normalise $path, $origin && $origin->path;
1496		1868
		1869	cf::lock_wait "map_data:$path";#d#remove
1497	cf::lock_wait "map_find:$path";	1870	cf::lock_wait "map_find:$path";
1498		1871
1499	$cf::MAP{$path} || do {	1872	$cf::MAP{$path} || do {
1500	my $guard = cf::lock_acquire "map_find:$path";	1873	my $guard1 = cf::lock_acquire "map_find:$path";
		1874	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1875
1501	my $map = new_from_path cf::map $path	1876	my $map = new_from_path cf::map $path
1502	or return;	1877	or return;
1503		1878
1504	$map->{last_save} = $cf::RUNTIME;	1879	$map->{last_save} = $cf::RUNTIME;
1505		1880
1506	$map->load_header	1881	$map->load_header
1507	or return;	1882	or return;
1508		1883
1509	if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)	1884	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1510	# doing this can freeze the server in a sync job, obviously	1885	# doing this can freeze the server in a sync job, obviously
1511	#$cf::WAIT_FOR_TICK->wait;	1886	#$cf::WAIT_FOR_TICK->wait;
		1887	undef $guard1;
		1888	undef $guard2;
1512	$map->reset;	1889	$map->reset;
1513	undef $guard;
1514	return find $path;	1890	return find $path;
1515	}	1891	}
1516		1892
1517	$cf::MAP{$path} = $map	1893	$cf::MAP{$path} = $map
1518	}	1894	}
…		…
1527	local $self->{deny_reset} = 1; # loading can take a long time	1903	local $self->{deny_reset} = 1; # loading can take a long time
1528		1904
1529	my $path = $self->{path};	1905	my $path = $self->{path};
1530		1906
1531	{	1907	{
1532	my $guard = cf::lock_acquire "map_load:$path";	1908	my $guard = cf::lock_acquire "map_data:$path";
1533		1909
		1910	return unless $self->valid;
1534	return if $self->in_memory != cf::MAP_SWAPPED;	1911	return unless $self->in_memory == cf::MAP_SWAPPED;
1535		1912
1536	$self->in_memory (cf::MAP_LOADING);	1913	$self->in_memory (cf::MAP_LOADING);
1537		1914
1538	$self->alloc;	1915	$self->alloc;
1539		1916
1540	$self->pre_load;	1917	$self->pre_load;
1541	Coro::cede;	1918	cf::cede_to_tick;
1542		1919
		1920	my $f = new_from_file cf::object::thawer $self->{load_path};
		1921	$f->skip_block;
1543	$self->_load_objects ($self->{load_path}, 1)	1922	$self->_load_objects ($f)
1544	or return;	1923	or return;
1545		1924
1546	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1925	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1547	if delete $self->{load_original};	1926	if delete $self->{load_original};
1548		1927
1549	if (my $uniq = $self->uniq_path) {	1928	if (my $uniq = $self->uniq_path) {
1550	utf8::encode $uniq;	1929	utf8::encode $uniq;
1551	if (aio_open $uniq, O_RDONLY, 0) {	1930	unless (aio_stat $uniq) {
		1931	if (my $f = new_from_file cf::object::thawer $uniq) {
1552	$self->clear_unique_items;	1932	$self->clear_unique_items;
1553	$self->_load_objects ($uniq, 0);	1933	$self->_load_objects ($f);
		1934	$f->resolve_delayed_derefs;
		1935	}
1554	}	1936	}
1555	}	1937	}
1556		1938
1557	Coro::cede;	1939	$f->resolve_delayed_derefs;
		1940
		1941	cf::cede_to_tick;
1558	# now do the right thing for maps	1942	# now do the right thing for maps
1559	$self->link_multipart_objects;	1943	$self->link_multipart_objects;
1560	$self->difficulty ($self->estimate_difficulty)	1944	$self->difficulty ($self->estimate_difficulty)
1561	unless $self->difficulty;	1945	unless $self->difficulty;
1562	Coro::cede;	1946	cf::cede_to_tick;
1563		1947
1564	unless ($self->{deny_activate}) {	1948	unless ($self->{deny_activate}) {
1565	$self->decay_objects;	1949	$self->decay_objects;
1566	$self->fix_auto_apply;	1950	$self->fix_auto_apply;
1567	$self->update_buttons;	1951	$self->update_buttons;
1568	Coro::cede;	1952	cf::cede_to_tick;
1569	$self->set_darkness_map;	1953	$self->set_darkness_map;
1570	Coro::cede;	1954	cf::cede_to_tick;
1571	$self->activate;	1955	$self->activate;
1572	}	1956	}
		1957
		1958	$self->{last_save} = $cf::RUNTIME;
		1959	$self->last_access ($cf::RUNTIME);
1573		1960
1574	$self->in_memory (cf::MAP_IN_MEMORY);	1961	$self->in_memory (cf::MAP_IN_MEMORY);
1575	}	1962	}
1576		1963
1577	$self->post_load;	1964	$self->post_load;
…		…
1581	my ($self, $ob) = @_;	1968	my ($self, $ob) = @_;
1582		1969
1583	return find "~" . $ob->name . "/" . $self->{path}	1970	return find "~" . $ob->name . "/" . $self->{path}
1584	if $self->per_player;	1971	if $self->per_player;
1585		1972
		1973	# return find "?party/" . $ob->name . "/" . $self->{path}
		1974	# if $self->per_party;
		1975
1586	$self	1976	$self
1587	}	1977	}
1588		1978
1589	# find and load all maps in the 3x3 area around a map	1979	# find and load all maps in the 3x3 area around a map
1590	sub load_diag {	1980	sub load_neighbours {
1591	my ($map) = @_;	1981	my ($map) = @_;
1592		1982
1593	my @diag; # diagonal neighbours	1983	my @neigh; # diagonal neighbours
1594		1984
1595	for (0 .. 3) {	1985	for (0 .. 3) {
1596	my $neigh = $map->tile_path ($_)	1986	my $neigh = $map->tile_path ($_)
1597	or next;	1987	or next;
1598	$neigh = find $neigh, $map	1988	$neigh = find $neigh, $map
1599	or next;	1989	or next;
1600	$neigh->load;	1990	$neigh->load;
1601		1991
		1992	push @neigh,
1602	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	1993	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1603	[$neigh->tile_path (($_ + 1) % 4), $neigh];	1994	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1604	}	1995	}
1605		1996
1606	for (@diag) {	1997	for (grep defined $_->[0], @neigh) {
		1998	my ($path, $origin) = @$_;
1607	my $neigh = find @$_	1999	my $neigh = find $path, $origin
1608	or next;	2000	or next;
1609	$neigh->load;	2001	$neigh->load;
1610	}	2002	}
1611	}	2003	}
1612		2004
…		…
1617	}	2009	}
1618		2010
1619	sub do_load_sync {	2011	sub do_load_sync {
1620	my ($map) = @_;	2012	my ($map) = @_;
1621		2013
		2014	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2015	if $Coro::current == $Coro::main;
		2016
1622	cf::sync_job { $map->load };	2017	cf::sync_job { $map->load };
1623	}	2018	}
1624		2019
1625	our %MAP_PREFETCH;	2020	our %MAP_PREFETCH;
1626	our $MAP_PREFETCHER = undef;	2021	our $MAP_PREFETCHER = undef;
1627		2022
1628	sub find_async {	2023	sub find_async {
1629	my ($path, $origin) = @_;	2024	my ($path, $origin, $load) = @_;
1630		2025
1631	$path = normalise $path, $origin && $origin->{path};	2026	$path = normalise $path, $origin && $origin->{path};
1632		2027
1633	if (my $map = $cf::MAP{$path}) {	2028	if (my $map = $cf::MAP{$path}) {
1634	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2029	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1635	}	2030	}
1636		2031
1637	undef $MAP_PREFETCH{$path};	2032	$MAP_PREFETCH{$path} |= $load;
		2033
1638	$MAP_PREFETCHER ||= cf::async {	2034	$MAP_PREFETCHER ||= cf::async {
1639	while (%MAP_PREFETCH) {	2035	while (%MAP_PREFETCH) {
1640	for my $path (keys %MAP_PREFETCH) {	2036	while (my ($k, $v) = each %MAP_PREFETCH) {
1641	my $map = find $path	2037	if (my $map = find $k) {
1642	or next;
1643	$map->load;	2038	$map->load if $v;
		2039	}
1644		2040
1645	delete $MAP_PREFETCH{$path};	2041	delete $MAP_PREFETCH{$k};
1646	}	2042	}
1647	}	2043	}
1648	undef $MAP_PREFETCHER;	2044	undef $MAP_PREFETCHER;
1649	};	2045	};
1650	$MAP_PREFETCHER->prio (6);	2046	$MAP_PREFETCHER->prio (6);
…		…
1653	}	2049	}
1654		2050
1655	sub save {	2051	sub save {
1656	my ($self) = @_;	2052	my ($self) = @_;
1657		2053
1658	my $lock = cf::lock_acquire "map_data:" . $self->path;	2054	my $lock = cf::lock_acquire "map_data:$self->{path}";
1659		2055
1660	$self->{last_save} = $cf::RUNTIME;	2056	$self->{last_save} = $cf::RUNTIME;
1661		2057
1662	return unless $self->dirty;	2058	return unless $self->dirty;
1663		2059
…		…
1686	my ($self) = @_;	2082	my ($self) = @_;
1687		2083
1688	# save first because save cedes	2084	# save first because save cedes
1689	$self->save;	2085	$self->save;
1690		2086
1691	my $lock = cf::lock_acquire "map_data:" . $self->path;	2087	my $lock = cf::lock_acquire "map_data:$self->{path}";
1692		2088
1693	return if $self->players;	2089	return if $self->players;
1694	return if $self->in_memory != cf::MAP_IN_MEMORY;	2090	return if $self->in_memory != cf::MAP_IN_MEMORY;
1695	return if $self->{deny_save};	2091	return if $self->{deny_save};
1696		2092
		2093	$self->in_memory (cf::MAP_SWAPPED);
		2094
		2095	$self->deactivate;
		2096	$_->clear_links_to ($self) for values %cf::MAP;
1697	$self->clear;	2097	$self->clear;
1698	$self->in_memory (cf::MAP_SWAPPED);
1699	}	2098	}
1700		2099
1701	sub reset_at {	2100	sub reset_at {
1702	my ($self) = @_;	2101	my ($self) = @_;
1703		2102
1704	# TODO: safety, remove and allow resettable per-player maps	2103	# TODO: safety, remove and allow resettable per-player maps
1705	return 1e99 if $self->isa ("ext::map_per_player");#d#
1706	return 1e99 if $self->{deny_reset};	2104	return 1e99 if $self->{deny_reset};
1707		2105
1708	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;	2106	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1709	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;	2107	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1710		2108
…		…
1721	my ($self) = @_;	2119	my ($self) = @_;
1722		2120
1723	my $lock = cf::lock_acquire "map_data:$self->{path}";	2121	my $lock = cf::lock_acquire "map_data:$self->{path}";
1724		2122
1725	return if $self->players;	2123	return if $self->players;
1726	return if $self->isa ("ext::map_per_player");#d#
1727		2124
1728	warn "resetting map ", $self->path;#d#	2125	warn "resetting map ", $self->path;
1729		2126
1730	$self->in_memory (cf::MAP_SWAPPED);	2127	$self->in_memory (cf::MAP_SWAPPED);
1731		2128
1732	# need to save uniques path	2129	# need to save uniques path
1733	unless ($self->{deny_save}) {	2130	unless ($self->{deny_save}) {
…		…
1737	if $uniq;	2134	if $uniq;
1738	}	2135	}
1739		2136
1740	delete $cf::MAP{$self->path};	2137	delete $cf::MAP{$self->path};
1741		2138
		2139	$self->deactivate;
		2140	$_->clear_links_to ($self) for values %cf::MAP;
1742	$self->clear;	2141	$self->clear;
1743
1744	$_->clear_links_to ($self) for values %cf::MAP;
1745		2142
1746	$self->unlink_save;	2143	$self->unlink_save;
1747	$self->destroy;	2144	$self->destroy;
1748	}	2145	}
1749		2146
1750	my $nuke_counter = "aaaa";	2147	my $nuke_counter = "aaaa";
1751		2148
1752	sub nuke {	2149	sub nuke {
1753	my ($self) = @_;	2150	my ($self) = @_;
1754		2151
		2152	{
		2153	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2154
1755	delete $cf::MAP{$self->path};	2155	delete $cf::MAP{$self->path};
1756		2156
1757	$self->unlink_save;	2157	$self->unlink_save;
1758		2158
1759	bless $self, "cf::map";	2159	bless $self, "cf::map";
1760	delete $self->{deny_reset};	2160	delete $self->{deny_reset};
1761	$self->{deny_save} = 1;	2161	$self->{deny_save} = 1;
1762	$self->reset_timeout (1);	2162	$self->reset_timeout (1);
1763	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2163	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1764		2164
1765	$cf::MAP{$self->path} = $self;	2165	$cf::MAP{$self->path} = $self;
		2166	}
1766		2167
1767	$self->reset; # polite request, might not happen	2168	$self->reset; # polite request, might not happen
		2169	}
		2170
		2171	=item $maps = cf::map::tmp_maps
		2172
		2173	Returns an arrayref with all map paths of currently instantiated and saved
		2174	maps. May block.
		2175
		2176	=cut
		2177
		2178	sub tmp_maps() {
		2179	[
		2180	map {
		2181	utf8::decode $_;
		2182	/\.map$/
		2183	? normalise $_
		2184	: ()
		2185	} @{ aio_readdir $TMPDIR or [] }
		2186	]
		2187	}
		2188
		2189	=item $maps = cf::map::random_maps
		2190
		2191	Returns an arrayref with all map paths of currently instantiated and saved
		2192	random maps. May block.
		2193
		2194	=cut
		2195
		2196	sub random_maps() {
		2197	[
		2198	map {
		2199	utf8::decode $_;
		2200	/\.map$/
		2201	? normalise "?random/$_"
		2202	: ()
		2203	} @{ aio_readdir $RANDOMDIR or [] }
		2204	]
1768	}	2205	}
1769		2206
1770	=item cf::map::unique_maps	2207	=item cf::map::unique_maps
1771		2208
1772	Returns an arrayref of paths of all shared maps that have	2209	Returns an arrayref of paths of all shared maps that have
1773	instantiated unique items. May block.	2210	instantiated unique items. May block.
1774		2211
1775	=cut	2212	=cut
1776		2213
1777	sub unique_maps() {	2214	sub unique_maps() {
1778	my $files = aio_readdir $UNIQUEDIR	2215	[
1779	or return;	2216	map {
1780
1781	my @paths;
1782
1783	for (@$files) {
1784	utf8::decode $_;	2217	utf8::decode $_;
1785	next if /\.pst$/;	2218	/\.map$/
1786	next unless /^$PATH_SEP/o;	2219	? normalise $_
1787		2220	: ()
1788	push @paths, cf::map::normalise $_;	2221	} @{ aio_readdir $UNIQUEDIR or [] }
1789	}	2222	]
1790
1791	\@paths
1792	}	2223	}
1793		2224
1794	package cf;	2225	package cf;
1795		2226
1796	=back	2227	=back
…		…
1814	map { $_, inv_recursive_ $_->inv } @_	2245	map { $_, inv_recursive_ $_->inv } @_
1815	}	2246	}
1816		2247
1817	sub inv_recursive {	2248	sub inv_recursive {
1818	inv_recursive_ inv $_[0]	2249	inv_recursive_ inv $_[0]
		2250	}
		2251
		2252	=item $ref = $ob->ref
		2253
		2254	creates and returns a persistent reference to an objetc that can be stored as a string.
		2255
		2256	=item $ob = cf::object::deref ($refstring)
		2257
		2258	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2259	even if the object actually exists. May block.
		2260
		2261	=cut
		2262
		2263	sub deref {
		2264	my ($ref) = @_;
		2265
		2266	# temporary compatibility#TODO#remove
		2267	$ref =~ s{^<}{player/<};
		2268
		2269	if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
		2270	my ($uuid, $name) = ($1, $2);
		2271	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2272	or return;
		2273	$pl->ob->uuid eq $uuid
		2274	or return;
		2275
		2276	$pl->ob
		2277	} else {
		2278	warn "$ref: cannot resolve object reference\n";
		2279	undef
		2280	}
1819	}	2281	}
1820		2282
1821	package cf;	2283	package cf;
1822		2284
1823	=back	2285	=back
…		…
1842		2304
1843	$flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;	2305	$flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1844		2306
1845	if ($self->{record_replies}) {	2307	if ($self->{record_replies}) {
1846	push @{ $self->{record_replies} }, [$npc, $msg, $flags];	2308	push @{ $self->{record_replies} }, [$npc, $msg, $flags];
		2309
1847	} else {	2310	} else {
		2311	my $pl = $self->contr;
		2312
		2313	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
		2314	my $dialog = $pl->{npc_dialog};
		2315	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
		2316
		2317	} else {
1848	$msg = $npc->name . " says: $msg" if $npc;	2318	$msg = $npc->name . " says: $msg" if $npc;
1849	$self->message ($msg, $flags);	2319	$self->message ($msg, $flags);
		2320	}
1850	}	2321	}
		2322	}
		2323
		2324	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2325
		2326	=cut
		2327
		2328	sub cf::object::send_msg {
		2329	my $pl = shift->contr
		2330	or return;
		2331	$pl->send_msg (@_);
1851	}	2332	}
1852		2333
1853	=item $player_object->may ("access")	2334	=item $player_object->may ("access")
1854		2335
1855	Returns wether the given player is authorized to access resource "access"	2336	Returns wether the given player is authorized to access resource "access"
…		…
1934	# use -1 or undef as default coordinates, not 0, 0	2415	# use -1 or undef as default coordinates, not 0, 0
1935	($x, $y) = ($map->enter_x, $map->enter_y)	2416	($x, $y) = ($map->enter_x, $map->enter_y)
1936	if $x <=0 && $y <= 0;	2417	if $x <=0 && $y <= 0;
1937		2418
1938	$map->load;	2419	$map->load;
1939	$map->load_diag;	2420	$map->load_neighbours;
1940		2421
1941	return unless $self->contr->active;	2422	return unless $self->contr->active;
1942	$self->activate_recursive;	2423	$self->activate_recursive;
1943		2424
1944	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2425	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1945	$self->enter_map ($map, $x, $y);	2426	$self->enter_map ($map, $x, $y);
1946	}	2427	}
1947		2428
1948	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2429	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1949		2430
1950	Moves the player to the given map-path and coordinates by first freezing	2431	Moves the player to the given map-path and coordinates by first freezing
1951	her, loading and preparing them map, calling the provided $check callback	2432	her, loading and preparing them map, calling the provided $check callback
1952	that has to return the map if sucecssful, and then unfreezes the player on	2433	that has to return the map if sucecssful, and then unfreezes the player on
1953	the new (success) or old (failed) map position.	2434	the new (success) or old (failed) map position. In either case, $done will
		2435	be called at the end of this process.
1954		2436
1955	=cut	2437	=cut
1956		2438
1957	our $GOTOGEN;	2439	our $GOTOGEN;
1958		2440
1959	sub cf::object::player::goto {	2441	sub cf::object::player::goto {
1960	my ($self, $path, $x, $y, $check) = @_;	2442	my ($self, $path, $x, $y, $check, $done) = @_;
1961		2443
1962	# do generation counting so two concurrent goto's will be executed in-order	2444	# do generation counting so two concurrent goto's will be executed in-order
1963	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2445	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1964		2446
1965	$self->enter_link;	2447	$self->enter_link;
…		…
1985		2467
1986	if ($gen == $self->{_goto_generation}) {	2468	if ($gen == $self->{_goto_generation}) {
1987	delete $self->{_goto_generation};	2469	delete $self->{_goto_generation};
1988	$self->leave_link ($map, $x, $y);	2470	$self->leave_link ($map, $x, $y);
1989	}	2471	}
		2472
		2473	$done->() if $done;
1990	})->prio (1);	2474	})->prio (1);
1991	}	2475	}
1992		2476
1993	=item $player_object->enter_exit ($exit_object)	2477	=item $player_object->enter_exit ($exit_object)
1994		2478
…		…
2063	my $hp = $exit->stats->hp;	2547	my $hp = $exit->stats->hp;
2064	my $sp = $exit->stats->sp;	2548	my $sp = $exit->stats->sp;
2065		2549
2066	$self->enter_link;	2550	$self->enter_link;
2067		2551
		2552	# if exit is damned, update players death & WoR home-position
		2553	$self->contr->savebed ($slaying, $hp, $sp)
		2554	if $exit->flag (FLAG_DAMNED);
		2555
2068	(async {	2556	(async {
2069	$self->deactivate_recursive; # just to be sure	2557	$self->deactivate_recursive; # just to be sure
2070	unless (eval {	2558	unless (eval {
2071	$self->goto ($slaying, $hp, $sp);	2559	$self->goto ($slaying, $hp, $sp);
2072		2560
…		…
2099		2587
2100	utf8::encode $text;	2588	utf8::encode $text;
2101	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2589	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2102	}	2590	}
2103		2591
		2592	=item $client->send_msg ($channel, $msg, $color, [extra...])
		2593
		2594	Send a drawinfo or msg packet to the client, formatting the msg for the
		2595	client if neccessary. C<$type> should be a string identifying the type of
		2596	the message, with C<log> being the default. If C<$color> is negative, suppress
		2597	the message unless the client supports the msg packet.
		2598
		2599	=cut
		2600
		2601	our %CHANNEL = (
		2602	"c/identify" => {
		2603	id => "identify",
		2604	title => "Identify",
		2605	reply => undef,
		2606	tooltip => "Items recently identified",
		2607	},
		2608	"c/examine" => {
		2609	id => "examine",
		2610	title => "Examine",
		2611	reply => undef,
		2612	tooltip => "Signs and other items you examined",
		2613	},
		2614	);
		2615
		2616	sub cf::client::send_msg {
		2617	my ($self, $channel, $msg, $color, @extra) = @_;
		2618
		2619	$msg = $self->pl->expand_cfpod ($msg);
		2620
		2621	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2622
		2623	# check predefined channels, for the benefit of C
		2624	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};
		2625
		2626	if (ref $channel) {
		2627	# send meta info to client, if not yet sent
		2628	unless (exists $self->{channel}{$channel->{id}}) {
		2629	$self->{channel}{$channel->{id}} = $channel;
		2630	$self->ext_msg (channel_info => $channel)
		2631	if $self->can_msg;
		2632	}
		2633
		2634	$channel = $channel->{id};
		2635	}
		2636
		2637	return unless @extra || length $msg;
		2638
		2639	if ($self->can_msg) {
		2640	# default colour, mask it out
		2641	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2642	if $color & cf::NDI_DEF;
		2643
		2644	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2645	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
		2646	} else {
		2647	if ($color >= 0) {
		2648	# replace some tags by gcfclient-compatible ones
		2649	for ($msg) {
		2650	1 while
		2651	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2652	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2653	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2654	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2655	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2656	}
		2657
		2658	$color &= cf::NDI_COLOR_MASK;
		2659
		2660	utf8::encode $msg;
		2661
		2662	if (0 && $msg =~ /\[/) {
		2663	# COMMAND/INFO
		2664	$self->send_packet ("drawextinfo $color 10 8 $msg")
		2665	} else {
		2666	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
		2667	$self->send_packet ("drawinfo $color $msg")
		2668	}
		2669	}
		2670	}
		2671	}
		2672
2104	=item $client->ext_event ($type, %msg)	2673	=item $client->ext_msg ($type, @msg)
2105		2674
2106	Sends an exti event to the client.	2675	Sends an ext event to the client.
2107		2676
2108	=cut	2677	=cut
2109		2678
2110	sub cf::client::ext_event($$%) {	2679	sub cf::client::ext_msg($$@) {
2111	my ($self, $type, %msg) = @_;	2680	my ($self, $type, @msg) = @_;
2112		2681
		2682	if ($self->extcmd == 2) {
		2683	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2684	} elsif ($self->extcmd == 1) { # TODO: remove
2113	$msg{msgtype} = "event_$type";	2685	push @msg, msgtype => "event_$type";
2114	$self->send_packet ("ext " . cf::to_json \%msg);	2686	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2687	}
		2688	}
		2689
		2690	=item $client->ext_reply ($msgid, @msg)
		2691
		2692	Sends an ext reply to the client.
		2693
		2694	=cut
		2695
		2696	sub cf::client::ext_reply($$@) {
		2697	my ($self, $id, @msg) = @_;
		2698
		2699	if ($self->extcmd == 2) {
		2700	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2701	} elsif ($self->extcmd == 1) {
		2702	#TODO: version 1, remove
		2703	unshift @msg, msgtype => "reply", msgid => $id;
		2704	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2705	}
2115	}	2706	}
2116		2707
2117	=item $success = $client->query ($flags, "text", \&cb)	2708	=item $success = $client->query ($flags, "text", \&cb)
2118		2709
2119	Queues a query to the client, calling the given callback with	2710	Queues a query to the client, calling the given callback with
2120	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2711	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2121	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.	2712	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2122		2713
2123	Queries can fail, so check the return code. Or don't, as queries will become	2714	Queries can fail, so check the return code. Or don't, as queries will
2124	reliable at some point in the future.	2715	become reliable at some point in the future.
2125		2716
2126	=cut	2717	=cut
2127		2718
2128	sub cf::client::query {	2719	sub cf::client::query {
2129	my ($self, $flags, $text, $cb) = @_;	2720	my ($self, $flags, $text, $cb) = @_;
…		…
2137	utf8::encode $text;	2728	utf8::encode $text;
2138	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];	2729	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2139		2730
2140	$self->send_packet ($self->{query_queue}[0][0])	2731	$self->send_packet ($self->{query_queue}[0][0])
2141	if @{ $self->{query_queue} } == 1;	2732	if @{ $self->{query_queue} } == 1;
		2733
		2734	1
2142	}	2735	}
2143		2736
2144	cf::client->attach (	2737	cf::client->attach (
		2738	on_connect => sub {
		2739	my ($ns) = @_;
		2740
		2741	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2742	},
2145	on_reply => sub {	2743	on_reply => sub {
2146	my ($ns, $msg) = @_;	2744	my ($ns, $msg) = @_;
2147		2745
2148	# this weird shuffling is so that direct followup queries	2746	# this weird shuffling is so that direct followup queries
2149	# get handled first	2747	# get handled first
…		…
2161	} else {	2759	} else {
2162	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;	2760	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2163	}	2761	}
2164	}	2762	}
2165	},	2763	},
		2764	on_exticmd => sub {
		2765	my ($ns, $buf) = @_;
		2766
		2767	my $msg = eval { $ns->{json_coder}->decode ($buf) };
		2768
		2769	if (ref $msg) {
		2770	my ($type, $reply, @payload) =
		2771	"ARRAY" eq ref $msg
		2772	? @$msg
		2773	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2774
		2775	my @reply;
		2776
		2777	if (my $cb = $EXTICMD{$type}) {
		2778	@reply = $cb->($ns, @payload);
		2779	}
		2780
		2781	$ns->ext_reply ($reply, @reply)
		2782	if $reply;
		2783
		2784	} else {
		2785	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
		2786	}
		2787
		2788	cf::override;
		2789	},
2166	);	2790	);
2167		2791
2168	=item $client->async (\&cb)	2792	=item $client->async (\&cb)
2169		2793
2170	Create a new coroutine, running the specified callback. The coroutine will	2794	Create a new coroutine, running the specified callback. The coroutine will
…		…
2211	our $safe = new Safe "safe";	2835	our $safe = new Safe "safe";
2212	our $safe_hole = new Safe::Hole;	2836	our $safe_hole = new Safe::Hole;
2213		2837
2214	$SIG{FPE} = 'IGNORE';	2838	$SIG{FPE} = 'IGNORE';
2215		2839
2216	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2840	$safe->permit_only (Opcode::opset qw(
		2841	:base_core :base_mem :base_orig :base_math
		2842	grepstart grepwhile mapstart mapwhile
		2843	sort time
		2844	));
2217		2845
2218	# here we export the classes and methods available to script code	2846	# here we export the classes and methods available to script code
2219		2847
2220	=pod	2848	=pod
2221		2849
2222	The following functions and methods are available within a safe environment:	2850	The following functions and methods are available within a safe environment:
2223		2851
2224	cf::object contr pay_amount pay_player map	2852	cf::object
		2853	contr pay_amount pay_player map x y force_find force_add
		2854	insert remove name archname title slaying race decrease_ob_nr
		2855
2225	cf::object::player player	2856	cf::object::player
2226	cf::player peaceful	2857	player
2227	cf::map trigger	2858
		2859	cf::player
		2860	peaceful
		2861
		2862	cf::map
		2863	trigger
2228		2864
2229	=cut	2865	=cut
2230		2866
2231	for (	2867	for (
2232	["cf::object" => qw(contr pay_amount pay_player map)],	2868	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2869	insert remove inv name archname title slaying race
		2870	decrease_ob_nr)],
2233	["cf::object::player" => qw(player)],	2871	["cf::object::player" => qw(player)],
2234	["cf::player" => qw(peaceful)],	2872	["cf::player" => qw(peaceful)],
2235	["cf::map" => qw(trigger)],	2873	["cf::map" => qw(trigger)],
2236	) {	2874	) {
2237	no strict 'refs';	2875	no strict 'refs';
…		…
2308	=back	2946	=back
2309		2947
2310	=cut	2948	=cut
2311		2949
2312	#############################################################################	2950	#############################################################################
2313
2314	=head2 EXTENSION DATABASE SUPPORT
2315
2316	Crossfire maintains a very simple database for extension use. It can
2317	currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2318	convert to/from binary).
2319
2320	The parameter C<$family> should best start with the name of the extension
2321	using it, it should be unique.
2322
2323	=over 4
2324
2325	=item $value = cf::db_get $family => $key
2326
2327	Returns a single value from the database.
2328
2329	=item cf::db_put $family => $key => $value
2330
2331	Stores the given C<$value> in the family.
2332
2333	=cut
2334
2335	our $DB;
2336
2337	sub db_init {
2338	unless ($DB) {
2339	$DB = BDB::db_create $DB_ENV;
2340
2341	cf::sync_job {
2342	eval {
2343	$DB->set_flags (BDB::CHKSUM);
2344
2345	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2346	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2347	cf::cleanup "db_open(db): $!" if $!;
2348	};
2349	cf::cleanup "db_open(db): $@" if $@;
2350	};
2351	}
2352	}
2353
2354	sub db_get($$) {
2355	my $key = "$_[0]/$_[1]";
2356
2357	cf::sync_job {
2358	BDB::db_get $DB, undef, $key, my $data;
2359
2360	$! ? ()
2361	: $data
2362	}
2363	}
2364
2365	sub db_put($$$) {
2366	BDB::dbreq_pri 4;
2367	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2368	}
2369
2370	=item cf::cache $id => [$paths...], $processversion => $process
2371
2372	Generic caching function that returns the value of the resource $id,
2373	caching and regenerating as required.
2374
2375	This function can block.
2376
2377	=cut
2378
2379	sub cache {
2380	my ($id, $src, $processversion, $process) = @_;
2381
2382	my $meta =
2383	join "\x00",
2384	$processversion,
2385	map {
2386	aio_stat $_
2387	and Carp::croak "$_: $!";
2388
2389	($_, (stat _)[7,9])
2390	} @$src;
2391
2392	my $dbmeta = db_get cache => "$id/meta";
2393	if ($dbmeta ne $meta) {
2394	# changed, we may need to process
2395
2396	my @data;
2397	my $md5;
2398
2399	for (0 .. $#$src) {
2400	0 <= aio_load $src->[$_], $data[$_]
2401	or Carp::croak "$src->[$_]: $!";
2402	}
2403
2404	# if processing is expensive, check
2405	# checksum first
2406	if (1) {
2407	$md5 =
2408	join "\x00",
2409	$processversion,
2410	map {
2411	Coro::cede;
2412	($src->[$_], Digest::MD5::md5_hex $data[$_])
2413	} 0.. $#$src;
2414
2415
2416	my $dbmd5 = db_get cache => "$id/md5";
2417	if ($dbmd5 eq $md5) {
2418	db_put cache => "$id/meta", $meta;
2419
2420	return db_get cache => "$id/data";
2421	}
2422	}
2423
2424	my $t1 = Time::HiRes::time;
2425	my $data = $process->(\@data);
2426	my $t2 = Time::HiRes::time;
2427
2428	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2429
2430	db_put cache => "$id/data", $data;
2431	db_put cache => "$id/md5" , $md5;
2432	db_put cache => "$id/meta", $meta;
2433
2434	return $data;
2435	}
2436
2437	db_get cache => "$id/data"
2438	}
2439
2440	=item fork_call { }, $args
2441
2442	Executes the given code block with the given arguments in a seperate
2443	process, returning the results. Everything must be serialisable with
2444	Coro::Storable. May, of course, block. Note that the executed sub may
2445	never block itself or use any form of Event handling.
2446
2447	=cut
2448
2449	sub fork_call(&@) {
2450	my ($cb, @args) = @_;
2451
2452	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2453	# or die "socketpair: $!";
2454	pipe my $fh1, my $fh2
2455	or die "pipe: $!";
2456
2457	if (my $pid = fork) {
2458	close $fh2;
2459
2460	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2461	$res = Coro::Storable::thaw $res;
2462
2463	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2464
2465	die $$res unless "ARRAY" eq ref $res;
2466
2467	return wantarray ? @$res : $res->[-1];
2468	} else {
2469	reset_signals;
2470	local $SIG{__WARN__};
2471	local $SIG{__DIE__};
2472	eval {
2473	close $fh1;
2474
2475	my @res = eval { $cb->(@args) };
2476	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2477	};
2478
2479	warn $@ if $@;
2480	_exit 0;
2481	}
2482	}
2483
2484	#############################################################################
2485	# the server's init and main functions	2951	# the server's init and main functions
2486		2952
2487	sub load_facedata($) {	2953	sub load_facedata($) {
2488	my ($path) = @_;	2954	my ($path) = @_;
		2955
		2956	# HACK to clear player env face cache, we need some signal framework
		2957	# for this (global event?)
		2958	%ext::player_env::MUSIC_FACE_CACHE = ();
		2959
		2960	my $enc = JSON::XS->new->utf8->canonical->relaxed;
2489		2961
2490	warn "loading facedata from $path\n";	2962	warn "loading facedata from $path\n";
2491		2963
2492	my $facedata;	2964	my $facedata;
2493	0 < aio_load $path, $facedata	2965	0 < aio_load $path, $facedata
…		…
2496	$facedata = Coro::Storable::thaw $facedata;	2968	$facedata = Coro::Storable::thaw $facedata;
2497		2969
2498	$facedata->{version} == 2	2970	$facedata->{version} == 2
2499	or cf::cleanup "$path: version mismatch, cannot proceed.";	2971	or cf::cleanup "$path: version mismatch, cannot proceed.";
2500		2972
		2973	# patch in the exptable
		2974	$facedata->{resource}{"res/exp_table"} = {
		2975	type => FT_RSRC,
		2976	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		2977	};
		2978	cf::cede_to_tick;
		2979
2501	{	2980	{
2502	my $faces = $facedata->{faceinfo};	2981	my $faces = $facedata->{faceinfo};
2503		2982
2504	while (my ($face, $info) = each %$faces) {	2983	while (my ($face, $info) = each %$faces) {
2505	my $idx = (cf::face::find $face) || cf::face::alloc $face;	2984	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2506	warn "$face $info->{magicmap}\n" if $face =~ /obol/;#d#
2507	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	2985	cf::face::set_visibility $idx, $info->{visibility};
		2986	cf::face::set_magicmap $idx, $info->{magicmap};
2508	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	2987	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2509	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	2988	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2510	Coro::cede;	2989
		2990	cf::cede_to_tick;
2511	}	2991	}
2512		2992
2513	while (my ($face, $info) = each %$faces) {	2993	while (my ($face, $info) = each %$faces) {
2514	next unless $info->{smooth};	2994	next unless $info->{smooth};
2515	my $idx = cf::face::find $face	2995	my $idx = cf::face::find $face
2516	or next;	2996	or next;
2517	if (my $smooth = cf::face::find $info->{smooth}) {	2997	if (my $smooth = cf::face::find $info->{smooth}) {
		2998	cf::face::set_smooth $idx, $smooth;
2518	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	2999	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2519	} else {	3000	} else {
2520	warn "smooth face '$info->{smooth}' not found for face '$face'";	3001	warn "smooth face '$info->{smooth}' not found for face '$face'";
2521	}	3002	}
2522	Coro::cede;	3003
		3004	cf::cede_to_tick;
2523	}	3005	}
2524	}	3006	}
2525		3007
2526	{	3008	{
2527	my $anims = $facedata->{animinfo};	3009	my $anims = $facedata->{animinfo};
2528		3010
2529	while (my ($anim, $info) = each %$anims) {	3011	while (my ($anim, $info) = each %$anims) {
2530	cf::anim::set $anim, $info->{frames}, $info->{facings};	3012	cf::anim::set $anim, $info->{frames}, $info->{facings};
2531	Coro::cede;	3013	cf::cede_to_tick;
2532	}	3014	}
2533		3015
2534	cf::anim::invalidate_all; # d'oh	3016	cf::anim::invalidate_all; # d'oh
2535	}	3017	}
2536		3018
		3019	{
		3020	# TODO: for gcfclient pleasure, we should give resources
		3021	# that gcfclient doesn't grok a >10000 face index.
		3022	my $res = $facedata->{resource};
		3023
		3024	my $soundconf = delete $res->{"res/sound.conf"};
		3025
		3026	while (my ($name, $info) = each %$res) {
		3027	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3028	my $data;
		3029
		3030	if ($info->{type} & 1) {
		3031	# prepend meta info
		3032
		3033	my $meta = $enc->encode ({
		3034	name => $name,
		3035	%{ $info->{meta} || {} },
		3036	});
		3037
		3038	$data = pack "(w/a*)*", $meta, $info->{data};
		3039	} else {
		3040	$data = $info->{data};
		3041	}
		3042
		3043	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3044	cf::face::set_type $idx, $info->{type};
		3045
		3046	cf::cede_to_tick;
		3047	}
		3048
		3049	if ($soundconf) {
		3050	$soundconf = $enc->decode (delete $soundconf->{data});
		3051
		3052	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3053	my $sound = $soundconf->{compat}[$_]
		3054	or next;
		3055
		3056	my $face = cf::face::find "sound/$sound->[1]";
		3057	cf::sound::set $sound->[0] => $face;
		3058	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3059	}
		3060
		3061	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3062	my $face = cf::face::find "sound/$v";
		3063	cf::sound::set $k => $face;
		3064	}
		3065	}
		3066	}
		3067
2537	1	3068	1
2538	}	3069	}
2539		3070
		3071	register_exticmd fx_want => sub {
		3072	my ($ns, $want) = @_;
		3073
		3074	while (my ($k, $v) = each %$want) {
		3075	$ns->fx_want ($k, $v);
		3076	}
		3077	};
		3078
2540	sub reload_regions {	3079	sub reload_regions {
		3080	# HACK to clear player env face cache, we need some signal framework
		3081	# for this (global event?)
		3082	%ext::player_env::MUSIC_FACE_CACHE = ();
		3083
2541	load_resource_file "$MAPDIR/regions"	3084	load_resource_file "$MAPDIR/regions"
2542	or die "unable to load regions file\n";	3085	or die "unable to load regions file\n";
		3086
		3087	for (cf::region::list) {
		3088	$_->{match} = qr/$_->{match}/
		3089	if exists $_->{match};
		3090	}
2543	}	3091	}
2544		3092
2545	sub reload_facedata {	3093	sub reload_facedata {
2546	load_facedata "$DATADIR/facedata"	3094	load_facedata "$DATADIR/facedata"
2547	or die "unable to load facedata\n";	3095	or die "unable to load facedata\n";
2548	}	3096	}
2549		3097
2550	sub reload_archetypes {	3098	sub reload_archetypes {
2551	load_resource_file "$DATADIR/archetypes"	3099	load_resource_file "$DATADIR/archetypes"
2552	or die "unable to load archetypes\n";	3100	or die "unable to load archetypes\n";
		3101	#d# NEED to laod twice to resolve forward references
		3102	# this really needs to be done in an extra post-pass
		3103	# (which needs to be synchronous, so solve it differently)
		3104	load_resource_file "$DATADIR/archetypes"
		3105	or die "unable to load archetypes\n";
2553	}	3106	}
2554		3107
2555	sub reload_treasures {	3108	sub reload_treasures {
2556	load_resource_file "$DATADIR/treasures"	3109	load_resource_file "$DATADIR/treasures"
2557	or die "unable to load treasurelists\n";	3110	or die "unable to load treasurelists\n";
…		…
2560	sub reload_resources {	3113	sub reload_resources {
2561	warn "reloading resource files...\n";	3114	warn "reloading resource files...\n";
2562		3115
2563	reload_regions;	3116	reload_regions;
2564	reload_facedata;	3117	reload_facedata;
		3118	#reload_archetypes;#d#
2565	reload_archetypes;	3119	reload_archetypes;
2566	reload_treasures;	3120	reload_treasures;
2567		3121
2568	warn "finished reloading resource files\n";	3122	warn "finished reloading resource files\n";
2569	}	3123	}
2570		3124
2571	sub init {	3125	sub init {
2572	reload_resources;	3126	reload_resources;
2573	}	3127	}
2574		3128
2575	sub cfg_load {	3129	sub reload_config {
2576	open my $fh, "<:utf8", "$CONFDIR/config"	3130	open my $fh, "<:utf8", "$CONFDIR/config"
2577	or return;	3131	or return;
2578		3132
2579	local $/;	3133	local $/;
2580	*CFG = YAML::Syck::Load <$fh>;	3134	*CFG = YAML::Syck::Load <$fh>;
…		…
2600	(async {	3154	(async {
2601	Event::one_event;	3155	Event::one_event;
2602	})->prio (Coro::PRIO_MAX);	3156	})->prio (Coro::PRIO_MAX);
2603	};	3157	};
2604		3158
2605	cfg_load;	3159	reload_config;
2606	db_init;	3160	db_init;
2607	load_extensions;	3161	load_extensions;
2608		3162
2609	$TICK_WATCHER->start;	3163	$TICK_WATCHER->start;
2610	Event::loop;	3164	Event::loop;
…		…
2626	},	3180	},
2627	);	3181	);
2628	}	3182	}
2629	}	3183	}
2630		3184
		3185	sub write_runtime {
		3186	my $runtime = "$LOCALDIR/runtime";
		3187
		3188	# first touch the runtime file to show we are still running:
		3189	# the fsync below can take a very very long time.
		3190
		3191	IO::AIO::aio_utime $runtime, undef, undef;
		3192
		3193	my $guard = cf::lock_acquire "write_runtime";
		3194
		3195	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
		3196	or return;
		3197
		3198	my $value = $cf::RUNTIME + 90 + 10;
		3199	# 10 is the runtime save interval, for a monotonic clock
		3200	# 60 allows for the watchdog to kill the server.
		3201
		3202	(aio_write $fh, 0, (length $value), $value, 0) <= 0
		3203	and return;
		3204
		3205	# always fsync - this file is important
		3206	aio_fsync $fh
		3207	and return;
		3208
		3209	# touch it again to show we are up-to-date
		3210	aio_utime $fh, undef, undef;
		3211
		3212	close $fh
		3213	or return;
		3214
		3215	aio_rename "$runtime~", $runtime
		3216	and return;
		3217
		3218	warn "runtime file written.\n";
		3219
		3220	1
		3221	}
		3222
2631	sub emergency_save() {	3223	sub emergency_save() {
2632	my $freeze_guard = cf::freeze_mainloop;	3224	my $freeze_guard = cf::freeze_mainloop;
2633		3225
2634	warn "enter emergency perl save\n";	3226	warn "enter emergency perl save\n";
2635		3227
…		…
2710	%EXT_CORO = ();	3302	%EXT_CORO = ();
2711		3303
2712	warn "removing commands";	3304	warn "removing commands";
2713	%COMMAND = ();	3305	%COMMAND = ();
2714		3306
2715	warn "removing ext commands";	3307	warn "removing ext/exti commands";
2716	%EXTCMD = ();	3308	%EXTCMD = ();
		3309	%EXTICMD = ();
2717		3310
2718	warn "unloading/nuking all extensions";	3311	warn "unloading/nuking all extensions";
2719	for my $pkg (@EXTS) {	3312	for my $pkg (@EXTS) {
2720	warn "... unloading $pkg";	3313	warn "... unloading $pkg";
2721		3314
…		…
2764	warn "reloading cf.pm";	3357	warn "reloading cf.pm";
2765	require cf;	3358	require cf;
2766	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3359	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2767		3360
2768	warn "loading config and database again";	3361	warn "loading config and database again";
2769	cf::cfg_load;	3362	cf::reload_config;
2770		3363
2771	warn "loading extensions";	3364	warn "loading extensions";
2772	cf::load_extensions;	3365	cf::load_extensions;
2773		3366
2774	warn "reattaching attachments to objects/players";	3367	warn "reattaching attachments to objects/players";
…		…
2867	or die;	3460	or die;
2868		3461
2869	$map->width (50);	3462	$map->width (50);
2870	$map->height (50);	3463	$map->height (50);
2871	$map->alloc;	3464	$map->alloc;
2872	$map->_load_objects ("/tmp/x.map", 1);	3465	$map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
2873	my $t = Event::time - $t;	3466	my $t = Event::time - $t;
2874		3467
2875	#next unless $t < 0.0013;#d#	3468	#next unless $t < 0.0013;#d#
2876	if ($t < $min) {	3469	if ($t < $min) {
2877	$min = $t;	3470	$min = $t;

Diff Legend

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