ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/cf.schmorp.de/server/lib/cf.pm

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.264 by root, Sun May 6 05:44:48 2007 UTC vs.
Revision 1.356 by root, Tue Sep 4 05:43:21 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
		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
94		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
…		…
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 $runtime = "$LOCALDIR/runtime";
373		473
374	# first touch the runtime file to show we are still running:	474	Executes the given code block with the given arguments in a seperate
375	# the fsync below can take a very very long time.	475	process, returning the results. Everything must be serialisable with
		476	Coro::Storable. May, of course, block. Note that the executed sub may
		477	never block itself or use any form of Event handling.
376		478
377	warn "touching runtime...\n";#d#	479	=cut
378	if (my $fh = aio_open $runtime, O_WRONLY, 0) {
379	utime undef, undef, $fh;
380	}
381		480
382	my $guard = cf::lock_acquire "write_runtime";	481	sub fork_call(&@) {
		482	my ($cb, @args) = @_;
383		483
384	warn "starting to write runtime...\n";#d#	484	# we seemingly have to make a local copy of the whole thing,
385	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	485	# otherwise perl prematurely frees the stuff :/
386	or return;	486	# TODO: investigate and fix (likely this will be rather laborious)
387		487
388	my $value = $cf::RUNTIME + 90 + 10;	488	my @res = Coro::Util::fork_eval {
389	# 10 is the runtime save interval, for a monotonic clock	489	reset_signals;
390	# 60 allows for the watchdog to kill the server.	490	&$cb
		491	}, @args;
391		492
392	(aio_write $fh, 0, (length $value), $value, 0) <= 0	493	wantarray ? @res : $res[-1]
393	and return;	494	}
394		495
395	# always fsync - this file is important	496	=item $value = cf::db_get $family => $key
396	aio_fsync $fh
397	and return;
398		497
399	# touch it again to show we are up-to-date	498	Returns a single value from the environment database.
400	utime undef, undef, $fh;
401		499
402	close $fh	500	=item cf::db_put $family => $key => $value
403	or return;
404		501
405	aio_rename "$runtime~", $runtime	502	Stores the given C<$value> in the family. It can currently store binary
406	and return;	503	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
407		504
408	warn "... done writing runtime.\n";#d#	505	=cut
409		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	};
410	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"
411	}	610	}
412		611
413	=item cf::datalog type => key => value, ...	612	=item cf::datalog type => key => value, ...
414		613
415	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.
…		…
433	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")
434	to it. All such attachable objects support the following methods.	633	to it. All such attachable objects support the following methods.
435		634
436	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>
437	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
438	crossfire+).	637	Crossfire TRT).
439		638
440	=over 4	639	=over 4
441		640
442	=item $attachable->attach ($attachment, key => $value...)	641	=item $attachable->attach ($attachment, key => $value...)
443		642
…		…
606	$registry = $CB_TYPE[$object_type] ||= [];	805	$registry = $CB_TYPE[$object_type] ||= [];
607		806
608	} elsif ($type eq "subtype") {	807	} elsif ($type eq "subtype") {
609	defined $object_type or Carp::croak "subtype specified without type";	808	defined $object_type or Carp::croak "subtype specified without type";
610	my $object_subtype = shift @arg;	809	my $object_subtype = shift @arg;
611	$registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= [];	810	$registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
612		811
613	} elsif ($type eq "package") {	812	} elsif ($type eq "package") {
614	my $pkg = shift @arg;	813	my $pkg = shift @arg;
615		814
616	while (my ($name, $id) = each %cb_id) {	815	while (my ($name, $id) = each %cb_id) {
…		…
645	_attach $registry, $klass, @attach;	844	_attach $registry, $klass, @attach;
646	}	845	}
647		846
648	$obj->{$name} = \%arg;	847	$obj->{$name} = \%arg;
649	} else {	848	} else {
650	warn "object uses attachment '$name' that is not available, postponing.\n";	849	warn "object uses attachment '$name' which is not available, postponing.\n";
651	}	850	}
652		851
653	$obj->{_attachment}{$name} = undef;	852	$obj->{_attachment}{$name} = undef;
654	}	853	}
655		854
…		…
657	if (ref $_[0]) {	856	if (ref $_[0]) {
658	_object_attach @_;	857	_object_attach @_;
659	} else {	858	} else {
660	_attach shift->_attach_registry, @_;	859	_attach shift->_attach_registry, @_;
661	}	860	}
		861	_recalc_want;
662	};	862	};
663		863
664	# all those should be optimised	864	# all those should be optimised
665	sub cf::attachable::detach {	865	sub cf::attachable::detach {
666	my ($obj, $name) = @_;	866	my ($obj, $name) = @_;
…		…
669	delete $obj->{_attachment}{$name};	869	delete $obj->{_attachment}{$name};
670	reattach ($obj);	870	reattach ($obj);
671	} else {	871	} else {
672	Carp::croak "cannot, currently, detach class attachments";	872	Carp::croak "cannot, currently, detach class attachments";
673	}	873	}
		874	_recalc_want;
674	};	875	};
675		876
676	sub cf::attachable::attached {	877	sub cf::attachable::attached {
677	my ($obj, $name) = @_;	878	my ($obj, $name) = @_;
678		879
…		…
693	";	894	";
694	die if $@;	895	die if $@;
695	}	896	}
696		897
697	our $override;	898	our $override;
698	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?
699		900
700	sub override {	901	sub override {
701	$override = 1;	902	$override = 1;
702	@invoke_results = ();	903	@INVOKE_RESULTS = (@_);
703	}	904	}
704		905
705	sub do_invoke {	906	sub do_invoke {
706	my $event = shift;	907	my $event = shift;
707	my $callbacks = shift;	908	my $callbacks = shift;
708		909
709	@invoke_results = ();	910	@INVOKE_RESULTS = ();
710		911
711	local $override;	912	local $override;
712		913
713	for (@$callbacks) {	914	for (@$callbacks) {
714	eval { &{$_->[1]} };	915	eval { &{$_->[1]} };
…		…
731		932
732	Generate an object-specific event with the given arguments.	933	Generate an object-specific event with the given arguments.
733		934
734	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
735	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
736	results (if you must, access C<@cf::invoke_results> directly).	937	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
737		938
738	=back	939	=back
739		940
740	=cut	941	=cut
741		942
742	#############################################################################	943	#############################################################################
743	# 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	}
744		956
745	sub reattach {	957	sub reattach {
746	# basically do the same as instantiate, without calling instantiate	958	# basically do the same as instantiate, without calling instantiate
747	my ($obj) = @_;	959	my ($obj) = @_;
748		960
…		…
792	},	1004	},
793	);	1005	);
794		1006
795	sub object_freezer_save {	1007	sub object_freezer_save {
796	my ($filename, $rdata, $objs) = @_;	1008	my ($filename, $rdata, $objs) = @_;
		1009
		1010	my $guard = cf::lock_acquire "io";
797		1011
798	sync_job {	1012	sync_job {
799	if (length $$rdata) {	1013	if (length $$rdata) {
800	warn sprintf "saving %s (%d,%d)\n",	1014	warn sprintf "saving %s (%d,%d)\n",
801	$filename, length $$rdata, scalar @$objs;	1015	$filename, length $$rdata, scalar @$objs;
…		…
825	}	1039	}
826	} else {	1040	} else {
827	aio_unlink $filename;	1041	aio_unlink $filename;
828	aio_unlink "$filename.pst";	1042	aio_unlink "$filename.pst";
829	}	1043	}
830	}	1044	};
		1045
		1046	undef $guard;
831	}	1047	}
832		1048
833	sub object_freezer_as_string {	1049	sub object_freezer_as_string {
834	my ($rdata, $objs) = @_;	1050	my ($rdata, $objs) = @_;
835		1051
…		…
840		1056
841	sub object_thawer_load {	1057	sub object_thawer_load {
842	my ($filename) = @_;	1058	my ($filename) = @_;
843		1059
844	my ($data, $av);	1060	my ($data, $av);
		1061
		1062	my $guard = cf::lock_acquire "io";
845		1063
846	(aio_load $filename, $data) >= 0	1064	(aio_load $filename, $data) >= 0
847	or return;	1065	or return;
848		1066
849	unless (aio_stat "$filename.pst") {	1067	unless (aio_stat "$filename.pst") {
850	(aio_load "$filename.pst", $av) >= 0	1068	(aio_load "$filename.pst", $av) >= 0
851	or return;	1069	or return;
		1070
		1071	undef $guard;
852	$av = eval { (Storable::thaw $av)->{objs} };	1072	$av = eval { (Storable::thaw $av)->{objs} };
853	}	1073	}
854		1074
855	warn sprintf "loading %s (%d)\n",	1075	warn sprintf "loading %s (%d)\n",
856	$filename, length $data, scalar @{$av || []};#d#	1076	$filename, length $data, scalar @{$av || []};
		1077
857	return ($data, $av);	1078	($data, $av)
858	}	1079	}
		1080
		1081	=head2 COMMAND CALLBACKS
		1082
		1083	=over 4
		1084
		1085	=cut
859		1086
860	#############################################################################	1087	#############################################################################
861	# command handling &c	1088	# command handling &c
862		1089
863	=item cf::register_command $name => \&callback($ob,$args);	1090	=item cf::register_command $name => \&callback($ob,$args);
…		…
876	push @{ $COMMAND{$name} }, [$caller, $cb];	1103	push @{ $COMMAND{$name} }, [$caller, $cb];
877	}	1104	}
878		1105
879	=item cf::register_extcmd $name => \&callback($pl,$packet);	1106	=item cf::register_extcmd $name => \&callback($pl,$packet);
880		1107
881	Register a callbackf ro execution when the client sends an extcmd packet.	1108	Register a callback for execution when the client sends an (synchronous)
		1109	extcmd packet. Ext commands will be processed in the order they are
		1110	received by the server, like other user commands. The first argument is
		1111	the logged-in player. Ext commands can only be processed after a player
		1112	has logged in successfully.
882		1113
883	If the callback returns something, it is sent back as if reply was being	1114	If the callback returns something, it is sent back as if reply was being
884	called.	1115	called.
885		1116
		1117	=item cf::register_exticmd $name => \&callback($ns,$packet);
		1118
		1119	Register a callback for execution when the client sends an (asynchronous)
		1120	exticmd packet. Exti commands are processed by the server as soon as they
		1121	are received, i.e. out of order w.r.t. other commands. The first argument
		1122	is a client socket. Exti commands can be received anytime, even before
		1123	log-in.
		1124
		1125	If the callback returns something, it is sent back as if reply was being
		1126	called.
		1127
886	=cut	1128	=cut
887		1129
888	sub register_extcmd {	1130	sub register_extcmd {
889	my ($name, $cb) = @_;	1131	my ($name, $cb) = @_;
890		1132
891	$EXTCMD{$name} = $cb;	1133	$EXTCMD{$name} = $cb;
		1134	}
		1135
		1136	sub register_exticmd {
		1137	my ($name, $cb) = @_;
		1138
		1139	$EXTICMD{$name} = $cb;
892	}	1140	}
893		1141
894	cf::player->attach (	1142	cf::player->attach (
895	on_command => sub {	1143	on_command => sub {
896	my ($pl, $name, $params) = @_;	1144	my ($pl, $name, $params) = @_;
…		…
905	cf::override;	1153	cf::override;
906	},	1154	},
907	on_extcmd => sub {	1155	on_extcmd => sub {
908	my ($pl, $buf) = @_;	1156	my ($pl, $buf) = @_;
909		1157
910	my $msg = eval { from_json $buf };	1158	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
911		1159
912	if (ref $msg) {	1160	if (ref $msg) {
		1161	my ($type, $reply, @payload) =
		1162	"ARRAY" eq ref $msg
		1163	? @$msg
		1164	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1165
		1166	my @reply;
		1167
913	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1168	if (my $cb = $EXTCMD{$type}) {
914	if (my %reply = $cb->($pl, $msg)) {	1169	@reply = $cb->($pl, @payload);
915	$pl->ext_reply ($msg->{msgid}, %reply);
916	}
917	}	1170	}
		1171
		1172	$pl->ext_reply ($reply, @reply)
		1173	if $reply;
		1174
918	} else {	1175	} else {
919	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1176	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
920	}	1177	}
921		1178
922	cf::override;	1179	cf::override;
923	},	1180	},
924	);	1181	);
925		1182
926	sub load_extension {
927	my ($path) = @_;
928
929	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
930	my $base = $1;
931	my $pkg = $1;
932	$pkg =~ s/[^[:word:]]/_/g;
933	$pkg = "ext::$pkg";
934
935	warn "... loading '$path' into '$pkg'\n";
936
937	open my $fh, "<:utf8", $path
938	or die "$path: $!";
939
940	my $source =
941	"package $pkg; use strict; use utf8;\n"
942	. "#line 1 \"$path\"\n{\n"
943	. (do { local $/; <$fh> })
944	. "\n};\n1";
945
946	unless (eval $source) {
947	my $msg = $@ ? "$path: $@\n"
948	: "extension disabled.\n";
949	if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
950	warn $@;
951	warn "mandatory extension failed to load, exiting.\n";
952	exit 1;
953	}
954	die $@;
955	}
956
957	push @EXTS, $pkg;
958	}
959
960	sub load_extensions {	1183	sub load_extensions {
		1184	cf::sync_job {
		1185	my %todo;
		1186
961	for my $ext (<$LIBDIR/*.ext>) {	1187	for my $path (<$LIBDIR/*.ext>) {
962	next unless -r $ext;	1188	next unless -r $path;
963	eval {	1189
964	load_extension $ext;	1190	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
		1191	my $base = $1;
		1192	my $pkg = $1;
		1193	$pkg =~ s/[^[:word:]]/_/g;
		1194	$pkg = "ext::$pkg";
		1195
		1196	open my $fh, "<:utf8", $path
		1197	or die "$path: $!";
		1198
		1199	my $source = do { local $/; <$fh> };
		1200
		1201	my %ext = (
		1202	path => $path,
		1203	base => $base,
		1204	pkg => $pkg,
		1205	);
		1206
		1207	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
		1208	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
		1209
		1210	$ext{source} =
		1211	"package $pkg; use strict; use utf8;\n"
		1212	. "#line 1 \"$path\"\n{\n"
		1213	. $source
		1214	. "\n};\n1";
		1215
		1216	$todo{$base} = \%ext;
		1217	}
		1218
		1219	my %done;
		1220	while (%todo) {
		1221	my $progress;
		1222
		1223	while (my ($k, $v) = each %todo) {
		1224	for (split /,\s*/, $v->{meta}{depends}) {
		1225	goto skip
		1226	unless exists $done{$_};
		1227	}
		1228
		1229	warn "... loading '$k' into '$v->{pkg}'\n";
		1230
		1231	unless (eval $v->{source}) {
		1232	my $msg = $@ ? "$v->{path}: $@\n"
		1233	: "$v->{base}: extension inactive.\n";
		1234
		1235	if (exists $v->{meta}{mandatory}) {
		1236	warn $msg;
		1237	warn "mandatory extension failed to load, exiting.\n";
		1238	exit 1;
		1239	}
		1240
		1241	warn $msg;
		1242	}
		1243
		1244	$done{$k} = delete $todo{$k};
		1245	push @EXTS, $v->{pkg};
		1246	$progress = 1;
965	1	1247	}
966	} or warn "$ext not loaded: $@";	1248
		1249	skip:
		1250	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
		1251	unless $progress;
		1252	}
967	}	1253	};
968	}	1254	}
969		1255
970	#############################################################################	1256	#############################################################################
		1257
		1258	=back
971		1259
972	=head2 CORE EXTENSIONS	1260	=head2 CORE EXTENSIONS
973		1261
974	Functions and methods that extend core crossfire objects.	1262	Functions and methods that extend core crossfire objects.
975		1263
…		…
1025	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1313	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1026	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1314	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1027	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1315	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1028	aio_unlink +(playerdir $login) . "/$login.pl";	1316	aio_unlink +(playerdir $login) . "/$login.pl";
1029		1317
1030	my $pl = load_pl path $login	1318	my $f = new_from_file cf::object::thawer path $login
1031	or return;	1319	or return;
		1320
		1321	$f->next;
		1322	my $pl = cf::player::load_pl $f
		1323	or return;
		1324	local $cf::PLAYER_LOADING{$login} = $pl;
		1325	$f->resolve_delayed_derefs;
1032	$cf::PLAYER{$login} = $pl	1326	$cf::PLAYER{$login} = $pl
1033	}	1327	}
1034	}	1328	}
1035	}	1329	}
1036		1330
…		…
1046		1340
1047	aio_mkdir playerdir $pl, 0770;	1341	aio_mkdir playerdir $pl, 0770;
1048	$pl->{last_save} = $cf::RUNTIME;	1342	$pl->{last_save} = $cf::RUNTIME;
1049		1343
1050	$pl->save_pl ($path);	1344	$pl->save_pl ($path);
1051	Coro::cede;	1345	cf::cede_to_tick;
1052	}	1346	}
1053		1347
1054	sub new($) {	1348	sub new($) {
1055	my ($login) = @_;	1349	my ($login) = @_;
1056		1350
…		…
1060	$self->{deny_save} = 1;	1354	$self->{deny_save} = 1;
1061		1355
1062	$cf::PLAYER{$login} = $self;	1356	$cf::PLAYER{$login} = $self;
1063		1357
1064	$self	1358	$self
		1359	}
		1360
		1361	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1362
		1363	=cut
		1364
		1365	sub send_msg {
		1366	my $ns = shift->ns
		1367	or return;
		1368	$ns->send_msg (@_);
1065	}	1369	}
1066		1370
1067	=item $pl->quit_character	1371	=item $pl->quit_character
1068		1372
1069	Nukes the player without looking back. If logged in, the connection will	1373	Nukes the player without looking back. If logged in, the connection will
…		…
1124	or return [];	1428	or return [];
1125		1429
1126	my @logins;	1430	my @logins;
1127		1431
1128	for my $login (@$dirs) {	1432	for my $login (@$dirs) {
		1433	my $path = path $login;
		1434
		1435	# a .pst is a dead give-away for a valid player
		1436	unless (-e "$path.pst") {
1129	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1437	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1130	aio_read $fh, 0, 512, my $buf, 0 or next;	1438	aio_read $fh, 0, 512, my $buf, 0 or next;
1131	$buf !~ /^password -------------$/m or next; # official not-valid tag	1439	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1440	}
1132		1441
1133	utf8::decode $login;	1442	utf8::decode $login;
1134	push @logins, $login;	1443	push @logins, $login;
1135	}	1444	}
1136		1445
…		…
1163	}	1472	}
1164		1473
1165	\@paths	1474	\@paths
1166	}	1475	}
1167		1476
		1477	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
		1478
		1479	Expand crossfire pod fragments into protocol xml.
		1480
		1481	=cut
		1482
		1483	sub expand_cfpod {
		1484	((my $self), (local $_)) = @_;
		1485
		1486	# escape & and <
		1487	s/&/&amp;/g;
		1488	s/(?<![BIUGHT])</&lt;/g;
		1489
		1490	# this is buggy, it needs to properly take care of nested <'s
		1491
		1492	1 while
		1493	# replace B<>, I<>, U<> etc.
		1494	s/B<([^\>]*)>/<b>$1<\/b>/
		1495	|| s/I<([^\>]*)>/<i>$1<\/i>/
		1496	|| s/U<([^\>]*)>/<u>$1<\/u>/
		1497	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
		1498	# replace G<male|female> tags
		1499	|| s{G<([^>|]*)\|([^>]*)>}{
		1500	$self->gender ? $2 : $1
		1501	}ge
		1502	# replace H<hint text>
		1503	|| s{H<([^\>]*)>}
		1504	{
		1505	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1506	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1507	"")
		1508	[$self->{hintmode}]
		1509	}ge;
		1510
		1511	# create single paragraphs (very hackish)
		1512	s/(?<=\S)\n(?=\w)/ /g;
		1513
		1514	# compress some whitespace
		1515	s/\s+\n/\n/g; # ws line-ends
		1516	s/\n\n+/\n/g; # double lines
		1517	s/^\n+//; # beginning lines
		1518	s/\n+$//; # ending lines
		1519
		1520	$_
		1521	}
		1522
		1523	sub hintmode {
		1524	$_[0]{hintmode} = $_[1] if @_ > 1;
		1525	$_[0]{hintmode}
		1526	}
		1527
1168	=item $player->ext_reply ($msgid, %msg)	1528	=item $player->ext_reply ($msgid, @msg)
1169		1529
1170	Sends an ext reply to the player.	1530	Sends an ext reply to the player.
1171		1531
1172	=cut	1532	=cut
1173		1533
1174	sub ext_reply($$%) {	1534	sub ext_reply($$@) {
1175	my ($self, $id, %msg) = @_;	1535	my ($self, $id, @msg) = @_;
1176		1536
1177	$msg{msgid} = $id;	1537	$self->ns->ext_reply ($id, @msg)
1178
1179	$self->send ("ext " . cf::to_json \%msg);
1180	}	1538	}
1181		1539
1182	=item $player->ext_event ($type, %msg)	1540	=item $player->ext_msg ($type, @msg)
1183		1541
1184	Sends an ext event to the client.	1542	Sends an ext event to the client.
1185		1543
1186	=cut	1544	=cut
1187		1545
1188	sub ext_event($$%) {	1546	sub ext_msg($$@) {
1189	my ($self, $type, %msg) = @_;	1547	my ($self, $type, @msg) = @_;
1190		1548
1191	$self->ns->ext_event ($type, %msg);	1549	$self->ns->ext_msg ($type, @msg);
1192	}	1550	}
1193		1551
1194	=head3 cf::region	1552	=head3 cf::region
1195		1553
1196	=over 4	1554	=over 4
…		…
1199		1557
1200	package cf::region;	1558	package cf::region;
1201		1559
1202	=item cf::region::find_by_path $path	1560	=item cf::region::find_by_path $path
1203		1561
1204	Tries to decuce the probable region for a map knowing only its path.	1562	Tries to decuce the likely region for a map knowing only its path.
1205		1563
1206	=cut	1564	=cut
1207		1565
1208	sub find_by_path($) {	1566	sub find_by_path($) {
1209	my ($path) = @_;	1567	my ($path) = @_;
1210		1568
1211	my ($match, $specificity);	1569	my ($match, $specificity);
1212		1570
1213	for my $region (list) {	1571	for my $region (list) {
1214	if ($region->match && $path =~ $region->match) {	1572	if ($region->{match} && $path =~ $region->{match}) {
1215	($match, $specificity) = ($region, $region->specificity)	1573	($match, $specificity) = ($region, $region->specificity)
1216	if $region->specificity > $specificity;	1574	if $region->specificity > $specificity;
1217	}	1575	}
1218	}	1576	}
1219		1577
…		…
1283	my ($self, $merge) = @_;	1641	my ($self, $merge) = @_;
1284		1642
1285	# we have to keep some variables in memory intact	1643	# we have to keep some variables in memory intact
1286	local $self->{path};	1644	local $self->{path};
1287	local $self->{load_path};	1645	local $self->{load_path};
1288	local $self->{deny_save};
1289	local $self->{deny_reset};
1290		1646
1291	$self->SUPER::thawer_merge ($merge);	1647	$self->SUPER::thawer_merge ($merge);
1292	}	1648	}
1293		1649
1294	sub normalise {	1650	sub normalise {
…		…
1341	$self->init; # pass $1 etc.	1697	$self->init; # pass $1 etc.
1342	return $self;	1698	return $self;
1343	}	1699	}
1344	}	1700	}
1345		1701
1346	Carp::carp "unable to resolve path '$path' (base '$base').";	1702	Carp::cluck "unable to resolve path '$path' (base '$base').";
1347	()	1703	()
1348	}	1704	}
1349		1705
1350	sub init {	1706	sub init {
1351	my ($self) = @_;	1707	my ($self) = @_;
…		…
1394		1750
1395	$_->change_map_light ($change)	1751	$_->change_map_light ($change)
1396	for grep $_->outdoor, values %cf::MAP;	1752	for grep $_->outdoor, values %cf::MAP;
1397	}	1753	}
1398		1754
		1755	sub decay_objects {
		1756	my ($self) = @_;
		1757
		1758	return if $self->{deny_reset};
		1759
		1760	$self->do_decay_objects;
		1761	}
		1762
1399	sub unlink_save {	1763	sub unlink_save {
1400	my ($self) = @_;	1764	my ($self) = @_;
1401		1765
1402	utf8::encode (my $save = $self->save_path);	1766	utf8::encode (my $save = $self->save_path);
1403	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;	1767	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
…		…
1406		1770
1407	sub load_header_from($) {	1771	sub load_header_from($) {
1408	my ($self, $path) = @_;	1772	my ($self, $path) = @_;
1409		1773
1410	utf8::encode $path;	1774	utf8::encode $path;
1411	#aio_open $path, O_RDONLY, 0	1775	my $f = new_from_file cf::object::thawer $path
1412	# or return;
1413
1414	$self->_load_header ($path)
1415	or return;	1776	or return;
		1777
		1778	$self->_load_header ($f)
		1779	or return;
		1780
		1781	local $MAP_LOADING{$self->{path}} = $self;
		1782	$f->resolve_delayed_derefs;
1416		1783
1417	$self->{load_path} = $path;	1784	$self->{load_path} = $path;
1418		1785
1419	1	1786	1
1420	}	1787	}
…		…
1459	$self->load_header_orig	1826	$self->load_header_orig
1460	or return;	1827	or return;
1461	$self->prepare_orig;	1828	$self->prepare_orig;
1462	}	1829	}
1463		1830
		1831	$self->{deny_reset} = 1
		1832	if $self->no_reset;
		1833
1464	$self->default_region (cf::region::find_by_path $self->{path})	1834	$self->default_region (cf::region::find_by_path $self->{path})
1465	unless $self->default_region;	1835	unless $self->default_region;
1466		1836
1467	1	1837	1
1468	}	1838	}
…		…
1483	$map->{last_save} = $cf::RUNTIME;	1853	$map->{last_save} = $cf::RUNTIME;
1484		1854
1485	$map->load_header	1855	$map->load_header
1486	or return;	1856	or return;
1487		1857
1488	if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)	1858	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1489	# doing this can freeze the server in a sync job, obviously	1859	# doing this can freeze the server in a sync job, obviously
1490	#$cf::WAIT_FOR_TICK->wait;	1860	#$cf::WAIT_FOR_TICK->wait;
1491	$map->reset;	1861	$map->reset;
1492	undef $guard;	1862	undef $guard;
1493	return find $path;	1863	return find $path;
…		…
1506	local $self->{deny_reset} = 1; # loading can take a long time	1876	local $self->{deny_reset} = 1; # loading can take a long time
1507		1877
1508	my $path = $self->{path};	1878	my $path = $self->{path};
1509		1879
1510	{	1880	{
		1881	my $guard1 = cf::lock_acquire "map_data:$path";
1511	my $guard = cf::lock_acquire "map_load:$path";	1882	my $guard2 = cf::lock_acquire "map_load:$path";
1512		1883
1513	return if $self->in_memory != cf::MAP_SWAPPED;	1884	return if $self->in_memory != cf::MAP_SWAPPED;
1514		1885
1515	$self->in_memory (cf::MAP_LOADING);	1886	$self->in_memory (cf::MAP_LOADING);
1516		1887
1517	$self->alloc;	1888	$self->alloc;
1518		1889
1519	$self->pre_load;	1890	$self->pre_load;
1520	Coro::cede;	1891	cf::cede_to_tick;
1521		1892
		1893	my $f = new_from_file cf::object::thawer $self->{load_path};
		1894	$f->skip_block;
1522	$self->_load_objects ($self->{load_path}, 1)	1895	$self->_load_objects ($f)
1523	or return;	1896	or return;
1524		1897
1525	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1898	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1526	if delete $self->{load_original};	1899	if delete $self->{load_original};
1527		1900
1528	if (my $uniq = $self->uniq_path) {	1901	if (my $uniq = $self->uniq_path) {
1529	utf8::encode $uniq;	1902	utf8::encode $uniq;
1530	if (aio_open $uniq, O_RDONLY, 0) {	1903	unless (aio_stat $uniq) {
		1904	if (my $f = new_from_file cf::object::thawer $uniq) {
1531	$self->clear_unique_items;	1905	$self->clear_unique_items;
1532	$self->_load_objects ($uniq, 0);	1906	$self->_load_objects ($f);
		1907	$f->resolve_delayed_derefs;
		1908	}
1533	}	1909	}
1534	}	1910	}
1535		1911
1536	Coro::cede;	1912	$f->resolve_delayed_derefs;
		1913
		1914	cf::cede_to_tick;
1537	# now do the right thing for maps	1915	# now do the right thing for maps
1538	$self->link_multipart_objects;	1916	$self->link_multipart_objects;
1539	$self->difficulty ($self->estimate_difficulty)	1917	$self->difficulty ($self->estimate_difficulty)
1540	unless $self->difficulty;	1918	unless $self->difficulty;
1541	Coro::cede;	1919	cf::cede_to_tick;
1542		1920
1543	unless ($self->{deny_activate}) {	1921	unless ($self->{deny_activate}) {
1544	$self->decay_objects;	1922	$self->decay_objects;
1545	$self->fix_auto_apply;	1923	$self->fix_auto_apply;
1546	$self->update_buttons;	1924	$self->update_buttons;
1547	Coro::cede;	1925	cf::cede_to_tick;
1548	$self->set_darkness_map;	1926	$self->set_darkness_map;
1549	Coro::cede;	1927	cf::cede_to_tick;
1550	$self->activate;	1928	$self->activate;
1551	}	1929	}
		1930
		1931	$self->{last_save} = $cf::RUNTIME;
		1932	$self->last_access ($cf::RUNTIME);
1552		1933
1553	$self->in_memory (cf::MAP_IN_MEMORY);	1934	$self->in_memory (cf::MAP_IN_MEMORY);
1554	}	1935	}
1555		1936
1556	$self->post_load;	1937	$self->post_load;
…		…
1560	my ($self, $ob) = @_;	1941	my ($self, $ob) = @_;
1561		1942
1562	return find "~" . $ob->name . "/" . $self->{path}	1943	return find "~" . $ob->name . "/" . $self->{path}
1563	if $self->per_player;	1944	if $self->per_player;
1564		1945
		1946	# return find "?party/" . $ob->name . "/" . $self->{path}
		1947	# if $self->per_party;
		1948
1565	$self	1949	$self
1566	}	1950	}
1567		1951
1568	# find and load all maps in the 3x3 area around a map	1952	# find and load all maps in the 3x3 area around a map
1569	sub load_diag {	1953	sub load_neighbours {
1570	my ($map) = @_;	1954	my ($map) = @_;
1571		1955
1572	my @diag; # diagonal neighbours	1956	my @neigh; # diagonal neighbours
1573		1957
1574	for (0 .. 3) {	1958	for (0 .. 3) {
1575	my $neigh = $map->tile_path ($_)	1959	my $neigh = $map->tile_path ($_)
1576	or next;	1960	or next;
1577	$neigh = find $neigh, $map	1961	$neigh = find $neigh, $map
1578	or next;	1962	or next;
1579	$neigh->load;	1963	$neigh->load;
1580		1964
		1965	push @neigh,
1581	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	1966	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1582	[$neigh->tile_path (($_ + 1) % 4), $neigh];	1967	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1583	}	1968	}
1584		1969
1585	for (@diag) {	1970	for (grep defined $_->[0], @neigh) {
		1971	my ($path, $origin) = @$_;
1586	my $neigh = find @$_	1972	my $neigh = find $path, $origin
1587	or next;	1973	or next;
1588	$neigh->load;	1974	$neigh->load;
1589	}	1975	}
1590	}	1976	}
1591		1977
…		…
1596	}	1982	}
1597		1983
1598	sub do_load_sync {	1984	sub do_load_sync {
1599	my ($map) = @_;	1985	my ($map) = @_;
1600		1986
		1987	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		1988	if $Coro::current == $Coro::main;
		1989
1601	cf::sync_job { $map->load };	1990	cf::sync_job { $map->load };
1602	}	1991	}
1603		1992
1604	our %MAP_PREFETCH;	1993	our %MAP_PREFETCH;
1605	our $MAP_PREFETCHER = undef;	1994	our $MAP_PREFETCHER = undef;
1606		1995
1607	sub find_async {	1996	sub find_async {
1608	my ($path, $origin) = @_;	1997	my ($path, $origin, $load) = @_;
1609		1998
1610	$path = normalise $path, $origin && $origin->{path};	1999	$path = normalise $path, $origin && $origin->{path};
1611		2000
1612	if (my $map = $cf::MAP{$path}) {	2001	if (my $map = $cf::MAP{$path}) {
1613	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2002	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1614	}	2003	}
1615		2004
1616	undef $MAP_PREFETCH{$path};	2005	$MAP_PREFETCH{$path} |= $load;
		2006
1617	$MAP_PREFETCHER ||= cf::async {	2007	$MAP_PREFETCHER ||= cf::async {
1618	while (%MAP_PREFETCH) {	2008	while (%MAP_PREFETCH) {
1619	for my $path (keys %MAP_PREFETCH) {	2009	while (my ($k, $v) = each %MAP_PREFETCH) {
1620	my $map = find $path	2010	if (my $map = find $k) {
1621	or next;
1622	$map->load;	2011	$map->load if $v;
		2012	}
1623		2013
1624	delete $MAP_PREFETCH{$path};	2014	delete $MAP_PREFETCH{$k};
1625	}	2015	}
1626	}	2016	}
1627	undef $MAP_PREFETCHER;	2017	undef $MAP_PREFETCHER;
1628	};	2018	};
1629	$MAP_PREFETCHER->prio (6);	2019	$MAP_PREFETCHER->prio (6);
…		…
1632	}	2022	}
1633		2023
1634	sub save {	2024	sub save {
1635	my ($self) = @_;	2025	my ($self) = @_;
1636		2026
1637	my $lock = cf::lock_acquire "map_data:" . $self->path;	2027	my $lock = cf::lock_acquire "map_data:$self->{path}";
1638		2028
1639	$self->{last_save} = $cf::RUNTIME;	2029	$self->{last_save} = $cf::RUNTIME;
1640		2030
1641	return unless $self->dirty;	2031	return unless $self->dirty;
1642		2032
…		…
1665	my ($self) = @_;	2055	my ($self) = @_;
1666		2056
1667	# save first because save cedes	2057	# save first because save cedes
1668	$self->save;	2058	$self->save;
1669		2059
1670	my $lock = cf::lock_acquire "map_data:" . $self->path;	2060	my $lock = cf::lock_acquire "map_data:$self->{path}";
1671		2061
1672	return if $self->players;	2062	return if $self->players;
1673	return if $self->in_memory != cf::MAP_IN_MEMORY;	2063	return if $self->in_memory != cf::MAP_IN_MEMORY;
1674	return if $self->{deny_save};	2064	return if $self->{deny_save};
1675		2065
…		…
1679		2069
1680	sub reset_at {	2070	sub reset_at {
1681	my ($self) = @_;	2071	my ($self) = @_;
1682		2072
1683	# TODO: safety, remove and allow resettable per-player maps	2073	# TODO: safety, remove and allow resettable per-player maps
1684	return 1e99 if $self->isa ("ext::map_per_player");#d#
1685	return 1e99 if $self->{deny_reset};	2074	return 1e99 if $self->{deny_reset};
1686		2075
1687	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;	2076	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1688	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;	2077	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1689		2078
…		…
1700	my ($self) = @_;	2089	my ($self) = @_;
1701		2090
1702	my $lock = cf::lock_acquire "map_data:$self->{path}";	2091	my $lock = cf::lock_acquire "map_data:$self->{path}";
1703		2092
1704	return if $self->players;	2093	return if $self->players;
1705	return if $self->isa ("ext::map_per_player");#d#
1706		2094
1707	warn "resetting map ", $self->path;#d#	2095	warn "resetting map ", $self->path;
1708		2096
1709	$self->in_memory (cf::MAP_SWAPPED);	2097	$self->in_memory (cf::MAP_SWAPPED);
1710		2098
1711	# need to save uniques path	2099	# need to save uniques path
1712	unless ($self->{deny_save}) {	2100	unless ($self->{deny_save}) {
…		…
1729	my $nuke_counter = "aaaa";	2117	my $nuke_counter = "aaaa";
1730		2118
1731	sub nuke {	2119	sub nuke {
1732	my ($self) = @_;	2120	my ($self) = @_;
1733		2121
		2122	{
		2123	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2124
1734	delete $cf::MAP{$self->path};	2125	delete $cf::MAP{$self->path};
1735		2126
1736	$self->unlink_save;	2127	$self->unlink_save;
1737		2128
1738	bless $self, "cf::map";	2129	bless $self, "cf::map";
1739	delete $self->{deny_reset};	2130	delete $self->{deny_reset};
1740	$self->{deny_save} = 1;	2131	$self->{deny_save} = 1;
1741	$self->reset_timeout (1);	2132	$self->reset_timeout (1);
1742	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2133	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1743		2134
1744	$cf::MAP{$self->path} = $self;	2135	$cf::MAP{$self->path} = $self;
		2136	}
1745		2137
1746	$self->reset; # polite request, might not happen	2138	$self->reset; # polite request, might not happen
		2139	}
		2140
		2141	=item $maps = cf::map::tmp_maps
		2142
		2143	Returns an arrayref with all map paths of currently instantiated and saved
		2144	maps. May block.
		2145
		2146	=cut
		2147
		2148	sub tmp_maps() {
		2149	[
		2150	map {
		2151	utf8::decode $_;
		2152	/\.map$/
		2153	? normalise $_
		2154	: ()
		2155	} @{ aio_readdir $TMPDIR or [] }
		2156	]
		2157	}
		2158
		2159	=item $maps = cf::map::random_maps
		2160
		2161	Returns an arrayref with all map paths of currently instantiated and saved
		2162	random maps. May block.
		2163
		2164	=cut
		2165
		2166	sub random_maps() {
		2167	[
		2168	map {
		2169	utf8::decode $_;
		2170	/\.map$/
		2171	? normalise "?random/$_"
		2172	: ()
		2173	} @{ aio_readdir $RANDOMDIR or [] }
		2174	]
1747	}	2175	}
1748		2176
1749	=item cf::map::unique_maps	2177	=item cf::map::unique_maps
1750		2178
1751	Returns an arrayref of paths of all shared maps that have	2179	Returns an arrayref of paths of all shared maps that have
1752	instantiated unique items. May block.	2180	instantiated unique items. May block.
1753		2181
1754	=cut	2182	=cut
1755		2183
1756	sub unique_maps() {	2184	sub unique_maps() {
1757	my $files = aio_readdir $UNIQUEDIR	2185	[
1758	or return;	2186	map {
1759
1760	my @paths;
1761
1762	for (@$files) {
1763	utf8::decode $_;	2187	utf8::decode $_;
1764	next if /\.pst$/;	2188	/\.map$/
1765	next unless /^$PATH_SEP/o;	2189	? normalise $_
1766		2190	: ()
1767	push @paths, cf::map::normalise $_;	2191	} @{ aio_readdir $UNIQUEDIR or [] }
1768	}	2192	]
1769
1770	\@paths
1771	}	2193	}
1772		2194
1773	package cf;	2195	package cf;
1774		2196
1775	=back	2197	=back
…		…
1793	map { $_, inv_recursive_ $_->inv } @_	2215	map { $_, inv_recursive_ $_->inv } @_
1794	}	2216	}
1795		2217
1796	sub inv_recursive {	2218	sub inv_recursive {
1797	inv_recursive_ inv $_[0]	2219	inv_recursive_ inv $_[0]
		2220	}
		2221
		2222	=item $ref = $ob->ref
		2223
		2224	creates and returns a persistent reference to an objetc that can be stored as a string.
		2225
		2226	=item $ob = cf::object::deref ($refstring)
		2227
		2228	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2229	even if the object actually exists. May block.
		2230
		2231	=cut
		2232
		2233	sub deref {
		2234	my ($ref) = @_;
		2235
		2236	# temporary compatibility#TODO#remove
		2237	$ref =~ s{^<}{player/<};
		2238
		2239	if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
		2240	my ($uuid, $name) = ($1, $2);
		2241	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2242	or return;
		2243	$pl->ob->uuid eq $uuid
		2244	or return;
		2245
		2246	$pl->ob
		2247	} else {
		2248	warn "$ref: cannot resolve object reference\n";
		2249	undef
		2250	}
1798	}	2251	}
1799		2252
1800	package cf;	2253	package cf;
1801		2254
1802	=back	2255	=back
…		…
1821		2274
1822	$flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;	2275	$flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1823		2276
1824	if ($self->{record_replies}) {	2277	if ($self->{record_replies}) {
1825	push @{ $self->{record_replies} }, [$npc, $msg, $flags];	2278	push @{ $self->{record_replies} }, [$npc, $msg, $flags];
		2279
1826	} else {	2280	} else {
		2281	my $pl = $self->contr;
		2282
		2283	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
		2284	my $dialog = $pl->{npc_dialog};
		2285	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
		2286
		2287	} else {
1827	$msg = $npc->name . " says: $msg" if $npc;	2288	$msg = $npc->name . " says: $msg" if $npc;
1828	$self->message ($msg, $flags);	2289	$self->message ($msg, $flags);
		2290	}
1829	}	2291	}
		2292	}
		2293
		2294	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2295
		2296	=cut
		2297
		2298	sub cf::object::send_msg {
		2299	my $pl = shift->contr
		2300	or return;
		2301	$pl->send_msg (@_);
1830	}	2302	}
1831		2303
1832	=item $player_object->may ("access")	2304	=item $player_object->may ("access")
1833		2305
1834	Returns wether the given player is authorized to access resource "access"	2306	Returns wether the given player is authorized to access resource "access"
…		…
1881	$self->deactivate_recursive;	2353	$self->deactivate_recursive;
1882		2354
1883	return if UNIVERSAL::isa $self->map, "ext::map_link";	2355	return if UNIVERSAL::isa $self->map, "ext::map_link";
1884		2356
1885	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2357	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1886	if $self->map;	2358	if $self->map && $self->map->{path} ne "{link}";
1887		2359
1888	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2360	$self->enter_map ($LINK_MAP || link_map, 10, 10);
1889	}	2361	}
1890		2362
1891	sub cf::object::player::leave_link {	2363	sub cf::object::player::leave_link {
1892	my ($self, $map, $x, $y) = @_;	2364	my ($self, $map, $x, $y) = @_;
		2365
		2366	return unless $self->contr->active;
1893		2367
1894	my $link_pos = delete $self->{_link_pos};	2368	my $link_pos = delete $self->{_link_pos};
1895		2369
1896	unless ($map) {	2370	unless ($map) {
1897	# restore original map position	2371	# restore original map position
…		…
1911	# use -1 or undef as default coordinates, not 0, 0	2385	# use -1 or undef as default coordinates, not 0, 0
1912	($x, $y) = ($map->enter_x, $map->enter_y)	2386	($x, $y) = ($map->enter_x, $map->enter_y)
1913	if $x <=0 && $y <= 0;	2387	if $x <=0 && $y <= 0;
1914		2388
1915	$map->load;	2389	$map->load;
1916	$map->load_diag;	2390	$map->load_neighbours;
1917		2391
1918	return unless $self->contr->active;	2392	return unless $self->contr->active;
1919	$self->activate_recursive;	2393	$self->activate_recursive;
1920		2394
1921	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2395	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1922	$self->enter_map ($map, $x, $y);	2396	$self->enter_map ($map, $x, $y);
1923	}	2397	}
1924		2398
1925	cf::player->attach (	2399	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1926	on_logout => sub {
1927	my ($pl) = @_;
1928		2400
1929	# abort map switching before logout	2401	Moves the player to the given map-path and coordinates by first freezing
1930	if ($pl->ob->{_link_pos}) {	2402	her, loading and preparing them map, calling the provided $check callback
1931	cf::sync_job {	2403	that has to return the map if sucecssful, and then unfreezes the player on
1932	$pl->ob->leave_link	2404	the new (success) or old (failed) map position. In either case, $done will
1933	};	2405	be called at the end of this process.
1934	}
1935	},
1936	on_login => sub {
1937	my ($pl) = @_;
1938		2406
1939	# try to abort aborted map switching on player login :)
1940	# should happen only on crashes
1941	if ($pl->ob->{_link_pos}) {
1942	$pl->ob->enter_link;
1943	(async {
1944	$pl->ob->reply (undef,
1945	"There was an internal problem at your last logout, "
1946	. "the server will try to bring you to your intended destination in a second.",
1947	cf::NDI_RED);
1948	# we need this sleep as the login has a concurrent enter_exit running
1949	# and this sleep increases chances of the player not ending up in scorn
1950	Coro::Timer::sleep 1;
1951	$pl->ob->leave_link;
1952	})->prio (2);
1953	}
1954	},
1955	);
1956
1957	=item $player_object->goto ($path, $x, $y)
1958
1959	=cut	2407	=cut
		2408
		2409	our $GOTOGEN;
1960		2410
1961	sub cf::object::player::goto {	2411	sub cf::object::player::goto {
1962	my ($self, $path, $x, $y) = @_;	2412	my ($self, $path, $x, $y, $check, $done) = @_;
		2413
		2414	# do generation counting so two concurrent goto's will be executed in-order
		2415	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1963		2416
1964	$self->enter_link;	2417	$self->enter_link;
1965		2418
1966	(async {	2419	(async {
1967	my $map = eval {	2420	my $map = eval {
1968	my $map = cf::map::find $path;	2421	my $map = cf::map::find $path;
		2422
		2423	if ($map) {
1969	$map = $map->customise_for ($self) if $map;	2424	$map = $map->customise_for ($self);
		2425	$map = $check->($map) if $check && $map;
		2426	} else {
		2427	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
		2428	}
		2429
1970	$map	2430	$map
		2431	};
		2432
		2433	if ($@) {
		2434	$self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
		2435	LOG llevError | logBacktrace, Carp::longmess $@;
1971	} or	2436	}
1972	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1973		2437
		2438	if ($gen == $self->{_goto_generation}) {
		2439	delete $self->{_goto_generation};
1974	$self->leave_link ($map, $x, $y);	2440	$self->leave_link ($map, $x, $y);
		2441	}
		2442
		2443	$done->() if $done;
1975	})->prio (1);	2444	})->prio (1);
1976	}	2445	}
1977		2446
1978	=item $player_object->enter_exit ($exit_object)	2447	=item $player_object->enter_exit ($exit_object)
1979		2448
…		…
2048	my $hp = $exit->stats->hp;	2517	my $hp = $exit->stats->hp;
2049	my $sp = $exit->stats->sp;	2518	my $sp = $exit->stats->sp;
2050		2519
2051	$self->enter_link;	2520	$self->enter_link;
2052		2521
		2522	# if exit is damned, update players death & WoR home-position
		2523	$self->contr->savebed ($slaying, $hp, $sp)
		2524	if $exit->flag (FLAG_DAMNED);
		2525
2053	(async {	2526	(async {
2054	$self->deactivate_recursive; # just to be sure	2527	$self->deactivate_recursive; # just to be sure
2055	unless (eval {	2528	unless (eval {
2056	$self->goto ($slaying, $hp, $sp);	2529	$self->goto ($slaying, $hp, $sp);
2057		2530
…		…
2084		2557
2085	utf8::encode $text;	2558	utf8::encode $text;
2086	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2559	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2087	}	2560	}
2088		2561
		2562	=item $client->send_msg ($channel, $msg, $color, [extra...])
		2563
		2564	Send a drawinfo or msg packet to the client, formatting the msg for the
		2565	client if neccessary. C<$type> should be a string identifying the type of
		2566	the message, with C<log> being the default. If C<$color> is negative, suppress
		2567	the message unless the client supports the msg packet.
		2568
		2569	=cut
		2570
		2571	our %CHANNEL = (
		2572	"c/identify" => {
		2573	id => "identify",
		2574	title => "Identify",
		2575	reply => undef,
		2576	tooltip => "Items recently identified",
		2577	},
		2578	"c/examine" => {
		2579	id => "examine",
		2580	title => "Examine",
		2581	reply => undef,
		2582	tooltip => "Signs and other items you examined",
		2583	},
		2584	);
		2585
		2586	sub cf::client::send_msg {
		2587	my ($self, $channel, $msg, $color, @extra) = @_;
		2588
		2589	$msg = $self->pl->expand_cfpod ($msg);
		2590
		2591	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2592
		2593	# check predefined channels, for the benefit of C
		2594	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};
		2595
		2596	if (ref $channel) {
		2597	# send meta info to client, if not yet sent
		2598	unless (exists $self->{channel}{$channel->{id}}) {
		2599	$self->{channel}{$channel->{id}} = $channel;
		2600	$self->ext_msg (channel_info => $channel)
		2601	if $self->can_msg;
		2602	}
		2603
		2604	$channel = $channel->{id};
		2605	}
		2606
		2607	return unless @extra || length $msg;
		2608
		2609	if ($self->can_msg) {
		2610	# default colour, mask it out
		2611	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2612	if $color & cf::NDI_DEF;
		2613
		2614	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2615	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
		2616	} else {
		2617	if ($color >= 0) {
		2618	# replace some tags by gcfclient-compatible ones
		2619	for ($msg) {
		2620	1 while
		2621	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2622	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2623	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2624	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2625	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2626	}
		2627
		2628	$color &= cf::NDI_COLOR_MASK;
		2629
		2630	utf8::encode $msg;
		2631
		2632	if (0 && $msg =~ /\[/) {
		2633	# COMMAND/INFO
		2634	$self->send_packet ("drawextinfo $color 10 8 $msg")
		2635	} else {
		2636	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
		2637	$self->send_packet ("drawinfo $color $msg")
		2638	}
		2639	}
		2640	}
		2641	}
		2642
2089	=item $client->ext_event ($type, %msg)	2643	=item $client->ext_msg ($type, @msg)
2090		2644
2091	Sends an exti event to the client.	2645	Sends an ext event to the client.
2092		2646
2093	=cut	2647	=cut
2094		2648
2095	sub cf::client::ext_event($$%) {	2649	sub cf::client::ext_msg($$@) {
2096	my ($self, $type, %msg) = @_;	2650	my ($self, $type, @msg) = @_;
2097		2651
		2652	if ($self->extcmd == 2) {
		2653	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2654	} elsif ($self->extcmd == 1) { # TODO: remove
2098	$msg{msgtype} = "event_$type";	2655	push @msg, msgtype => "event_$type";
2099	$self->send_packet ("ext " . cf::to_json \%msg);	2656	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2657	}
		2658	}
		2659
		2660	=item $client->ext_reply ($msgid, @msg)
		2661
		2662	Sends an ext reply to the client.
		2663
		2664	=cut
		2665
		2666	sub cf::client::ext_reply($$@) {
		2667	my ($self, $id, @msg) = @_;
		2668
		2669	if ($self->extcmd == 2) {
		2670	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2671	} elsif ($self->extcmd == 1) {
		2672	#TODO: version 1, remove
		2673	unshift @msg, msgtype => "reply", msgid => $id;
		2674	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2675	}
2100	}	2676	}
2101		2677
2102	=item $success = $client->query ($flags, "text", \&cb)	2678	=item $success = $client->query ($flags, "text", \&cb)
2103		2679
2104	Queues a query to the client, calling the given callback with	2680	Queues a query to the client, calling the given callback with
2105	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2681	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2106	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.	2682	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2107		2683
2108	Queries can fail, so check the return code. Or don't, as queries will become	2684	Queries can fail, so check the return code. Or don't, as queries will
2109	reliable at some point in the future.	2685	become reliable at some point in the future.
2110		2686
2111	=cut	2687	=cut
2112		2688
2113	sub cf::client::query {	2689	sub cf::client::query {
2114	my ($self, $flags, $text, $cb) = @_;	2690	my ($self, $flags, $text, $cb) = @_;
…		…
2122	utf8::encode $text;	2698	utf8::encode $text;
2123	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];	2699	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2124		2700
2125	$self->send_packet ($self->{query_queue}[0][0])	2701	$self->send_packet ($self->{query_queue}[0][0])
2126	if @{ $self->{query_queue} } == 1;	2702	if @{ $self->{query_queue} } == 1;
		2703
		2704	1
2127	}	2705	}
2128		2706
2129	cf::client->attach (	2707	cf::client->attach (
		2708	on_connect => sub {
		2709	my ($ns) = @_;
		2710
		2711	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2712	},
2130	on_reply => sub {	2713	on_reply => sub {
2131	my ($ns, $msg) = @_;	2714	my ($ns, $msg) = @_;
2132		2715
2133	# this weird shuffling is so that direct followup queries	2716	# this weird shuffling is so that direct followup queries
2134	# get handled first	2717	# get handled first
…		…
2146	} else {	2729	} else {
2147	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;	2730	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2148	}	2731	}
2149	}	2732	}
2150	},	2733	},
		2734	on_exticmd => sub {
		2735	my ($ns, $buf) = @_;
		2736
		2737	my $msg = eval { $ns->{json_coder}->decode ($buf) };
		2738
		2739	if (ref $msg) {
		2740	my ($type, $reply, @payload) =
		2741	"ARRAY" eq ref $msg
		2742	? @$msg
		2743	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2744
		2745	my @reply;
		2746
		2747	if (my $cb = $EXTICMD{$type}) {
		2748	@reply = $cb->($ns, @payload);
		2749	}
		2750
		2751	$ns->ext_reply ($reply, @reply)
		2752	if $reply;
		2753
		2754	} else {
		2755	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
		2756	}
		2757
		2758	cf::override;
		2759	},
2151	);	2760	);
2152		2761
2153	=item $client->async (\&cb)	2762	=item $client->async (\&cb)
2154		2763
2155	Create a new coroutine, running the specified callback. The coroutine will	2764	Create a new coroutine, running the specified callback. The coroutine will
…		…
2196	our $safe = new Safe "safe";	2805	our $safe = new Safe "safe";
2197	our $safe_hole = new Safe::Hole;	2806	our $safe_hole = new Safe::Hole;
2198		2807
2199	$SIG{FPE} = 'IGNORE';	2808	$SIG{FPE} = 'IGNORE';
2200		2809
2201	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2810	$safe->permit_only (Opcode::opset qw(
		2811	:base_core :base_mem :base_orig :base_math
		2812	grepstart grepwhile mapstart mapwhile
		2813	sort time
		2814	));
2202		2815
2203	# here we export the classes and methods available to script code	2816	# here we export the classes and methods available to script code
2204		2817
2205	=pod	2818	=pod
2206		2819
2207	The following functions and methods are available within a safe environment:	2820	The following functions and methods are available within a safe environment:
2208		2821
2209	cf::object contr pay_amount pay_player map	2822	cf::object
		2823	contr pay_amount pay_player map x y force_find force_add
		2824	insert remove name archname title slaying race decrease_ob_nr
		2825
2210	cf::object::player player	2826	cf::object::player
2211	cf::player peaceful	2827	player
2212	cf::map trigger	2828
		2829	cf::player
		2830	peaceful
		2831
		2832	cf::map
		2833	trigger
2213		2834
2214	=cut	2835	=cut
2215		2836
2216	for (	2837	for (
2217	["cf::object" => qw(contr pay_amount pay_player map)],	2838	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2839	insert remove inv name archname title slaying race
		2840	decrease_ob_nr)],
2218	["cf::object::player" => qw(player)],	2841	["cf::object::player" => qw(player)],
2219	["cf::player" => qw(peaceful)],	2842	["cf::player" => qw(peaceful)],
2220	["cf::map" => qw(trigger)],	2843	["cf::map" => qw(trigger)],
2221	) {	2844	) {
2222	no strict 'refs';	2845	no strict 'refs';
…		…
2293	=back	2916	=back
2294		2917
2295	=cut	2918	=cut
2296		2919
2297	#############################################################################	2920	#############################################################################
2298
2299	=head2 EXTENSION DATABASE SUPPORT
2300
2301	Crossfire maintains a very simple database for extension use. It can
2302	currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2303	convert to/from binary).
2304
2305	The parameter C<$family> should best start with the name of the extension
2306	using it, it should be unique.
2307
2308	=over 4
2309
2310	=item $value = cf::db_get $family => $key
2311
2312	Returns a single value from the database.
2313
2314	=item cf::db_put $family => $key => $value
2315
2316	Stores the given C<$value> in the family.
2317
2318	=cut
2319
2320	our $DB;
2321
2322	sub db_init {
2323	unless ($DB) {
2324	$DB = BDB::db_create $DB_ENV;
2325
2326	cf::sync_job {
2327	eval {
2328	$DB->set_flags (BDB::CHKSUM);
2329
2330	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2331	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2332	cf::cleanup "db_open(db): $!" if $!;
2333	};
2334	cf::cleanup "db_open(db): $@" if $@;
2335	};
2336	}
2337	}
2338
2339	sub db_get($$) {
2340	my $key = "$_[0]/$_[1]";
2341
2342	cf::sync_job {
2343	BDB::db_get $DB, undef, $key, my $data;
2344
2345	$! ? ()
2346	: $data
2347	}
2348	}
2349
2350	sub db_put($$$) {
2351	BDB::dbreq_pri 4;
2352	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2353	}
2354
2355	=item cf::cache $id => [$paths...], $processversion => $process
2356
2357	Generic caching function that returns the value of the resource $id,
2358	caching and regenerating as required.
2359
2360	This function can block.
2361
2362	=cut
2363
2364	sub cache {
2365	my ($id, $src, $processversion, $process) = @_;
2366
2367	my $meta =
2368	join "\x00",
2369	$processversion,
2370	map {
2371	aio_stat $_
2372	and Carp::croak "$_: $!";
2373
2374	($_, (stat _)[7,9])
2375	} @$src;
2376
2377	my $dbmeta = db_get cache => "$id/meta";
2378	if ($dbmeta ne $meta) {
2379	# changed, we may need to process
2380
2381	my @data;
2382	my $md5;
2383
2384	for (0 .. $#$src) {
2385	0 <= aio_load $src->[$_], $data[$_]
2386	or Carp::croak "$src->[$_]: $!";
2387	}
2388
2389	# if processing is expensive, check
2390	# checksum first
2391	if (1) {
2392	$md5 =
2393	join "\x00",
2394	$processversion,
2395	map {
2396	Coro::cede;
2397	($src->[$_], Digest::MD5::md5_hex $data[$_])
2398	} 0.. $#$src;
2399
2400
2401	my $dbmd5 = db_get cache => "$id/md5";
2402	if ($dbmd5 eq $md5) {
2403	db_put cache => "$id/meta", $meta;
2404
2405	return db_get cache => "$id/data";
2406	}
2407	}
2408
2409	my $t1 = Time::HiRes::time;
2410	my $data = $process->(\@data);
2411	my $t2 = Time::HiRes::time;
2412
2413	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2414
2415	db_put cache => "$id/data", $data;
2416	db_put cache => "$id/md5" , $md5;
2417	db_put cache => "$id/meta", $meta;
2418
2419	return $data;
2420	}
2421
2422	db_get cache => "$id/data"
2423	}
2424
2425	=item fork_call { }, $args
2426
2427	Executes the given code block with the given arguments in a seperate
2428	process, returning the results. Everything must be serialisable with
2429	Coro::Storable. May, of course, block. Note that the executed sub may
2430	never block itself or use any form of Event handling.
2431
2432	=cut
2433
2434	sub fork_call(&@) {
2435	my ($cb, @args) = @_;
2436
2437	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2438	# or die "socketpair: $!";
2439	pipe my $fh1, my $fh2
2440	or die "pipe: $!";
2441
2442	if (my $pid = fork) {
2443	close $fh2;
2444
2445	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2446	$res = Coro::Storable::thaw $res;
2447
2448	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2449
2450	die $$res unless "ARRAY" eq ref $res;
2451
2452	return wantarray ? @$res : $res->[-1];
2453	} else {
2454	reset_signals;
2455	local $SIG{__WARN__};
2456	local $SIG{__DIE__};
2457	eval {
2458	close $fh1;
2459
2460	my @res = eval { $cb->(@args) };
2461	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2462	};
2463
2464	warn $@ if $@;
2465	_exit 0;
2466	}
2467	}
2468
2469
2470
2471	#############################################################################
2472	# the server's init and main functions	2921	# the server's init and main functions
2473		2922
2474	sub load_facedata($) {	2923	sub load_facedata($) {
2475	my ($path) = @_;	2924	my ($path) = @_;
		2925
		2926	# HACK to clear player env face cache, we need some signal framework
		2927	# for this (global event?)
		2928	%ext::player_env::MUSIC_FACE_CACHE = ();
		2929
		2930	my $enc = JSON::XS->new->utf8->canonical->relaxed;
2476		2931
2477	warn "loading facedata from $path\n";	2932	warn "loading facedata from $path\n";
2478		2933
2479	my $facedata;	2934	my $facedata;
2480	0 < aio_load $path, $facedata	2935	0 < aio_load $path, $facedata
…		…
2483	$facedata = Coro::Storable::thaw $facedata;	2938	$facedata = Coro::Storable::thaw $facedata;
2484		2939
2485	$facedata->{version} == 2	2940	$facedata->{version} == 2
2486	or cf::cleanup "$path: version mismatch, cannot proceed.";	2941	or cf::cleanup "$path: version mismatch, cannot proceed.";
2487		2942
		2943	# patch in the exptable
		2944	$facedata->{resource}{"res/exp_table"} = {
		2945	type => FT_RSRC,
		2946	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		2947	};
		2948	cf::cede_to_tick;
		2949
2488	{	2950	{
2489	my $faces = $facedata->{faceinfo};	2951	my $faces = $facedata->{faceinfo};
2490		2952
2491	while (my ($face, $info) = each %$faces) {	2953	while (my ($face, $info) = each %$faces) {
2492	my $idx = (cf::face::find $face) || cf::face::alloc $face;	2954	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2493	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	2955	cf::face::set_visibility $idx, $info->{visibility};
		2956	cf::face::set_magicmap $idx, $info->{magicmap};
2494	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	2957	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2495	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	2958	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2496	Coro::cede;	2959
		2960	cf::cede_to_tick;
2497	}	2961	}
2498		2962
2499	while (my ($face, $info) = each %$faces) {	2963	while (my ($face, $info) = each %$faces) {
2500	next unless $info->{smooth};	2964	next unless $info->{smooth};
2501	my $idx = cf::face::find $face	2965	my $idx = cf::face::find $face
2502	or next;	2966	or next;
2503	if (my $smooth = cf::face::find $info->{smooth}) {	2967	if (my $smooth = cf::face::find $info->{smooth}) {
		2968	cf::face::set_smooth $idx, $smooth;
2504	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	2969	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2505	} else {	2970	} else {
2506	warn "smooth face '$info->{smooth}' not found for face '$face'";	2971	warn "smooth face '$info->{smooth}' not found for face '$face'";
2507	}	2972	}
2508	Coro::cede;	2973
		2974	cf::cede_to_tick;
2509	}	2975	}
2510	}	2976	}
2511		2977
2512	{	2978	{
2513	my $anims = $facedata->{animinfo};	2979	my $anims = $facedata->{animinfo};
2514		2980
2515	while (my ($anim, $info) = each %$anims) {	2981	while (my ($anim, $info) = each %$anims) {
2516	cf::anim::set $anim, $info->{frames}, $info->{facings};	2982	cf::anim::set $anim, $info->{frames}, $info->{facings};
2517	Coro::cede;	2983	cf::cede_to_tick;
2518	}	2984	}
2519		2985
2520	cf::anim::invalidate_all; # d'oh	2986	cf::anim::invalidate_all; # d'oh
2521	}	2987	}
2522		2988
		2989	{
		2990	# TODO: for gcfclient pleasure, we should give resources
		2991	# that gcfclient doesn't grok a >10000 face index.
		2992	my $res = $facedata->{resource};
		2993
		2994	my $soundconf = delete $res->{"res/sound.conf"};
		2995
		2996	while (my ($name, $info) = each %$res) {
		2997	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		2998	my $data;
		2999
		3000	if ($info->{type} & 1) {
		3001	# prepend meta info
		3002
		3003	my $meta = $enc->encode ({
		3004	name => $name,
		3005	%{ $info->{meta} || {} },
		3006	});
		3007
		3008	$data = pack "(w/a*)*", $meta, $info->{data};
		3009	} else {
		3010	$data = $info->{data};
		3011	}
		3012
		3013	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3014	cf::face::set_type $idx, $info->{type};
		3015
		3016	cf::cede_to_tick;
		3017	}
		3018
		3019	if ($soundconf) {
		3020	$soundconf = $enc->decode (delete $soundconf->{data});
		3021
		3022	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3023	my $sound = $soundconf->{compat}[$_]
		3024	or next;
		3025
		3026	my $face = cf::face::find "sound/$sound->[1]";
		3027	cf::sound::set $sound->[0] => $face;
		3028	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3029	}
		3030
		3031	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3032	my $face = cf::face::find "sound/$v";
		3033	cf::sound::set $k => $face;
		3034	}
		3035	}
		3036	}
		3037
2523	1	3038	1
2524	}	3039	}
2525		3040
		3041	register_exticmd fx_want => sub {
		3042	my ($ns, $want) = @_;
		3043
		3044	while (my ($k, $v) = each %$want) {
		3045	$ns->fx_want ($k, $v);
		3046	}
		3047	};
		3048
2526	sub reload_regions {	3049	sub reload_regions {
		3050	# HACK to clear player env face cache, we need some signal framework
		3051	# for this (global event?)
		3052	%ext::player_env::MUSIC_FACE_CACHE = ();
		3053
2527	load_resource_file "$MAPDIR/regions"	3054	load_resource_file "$MAPDIR/regions"
2528	or die "unable to load regions file\n";	3055	or die "unable to load regions file\n";
		3056
		3057	for (cf::region::list) {
		3058	$_->{match} = qr/$_->{match}/
		3059	if exists $_->{match};
		3060	}
2529	}	3061	}
2530		3062
2531	sub reload_facedata {	3063	sub reload_facedata {
2532	load_facedata "$DATADIR/facedata"	3064	load_facedata "$DATADIR/facedata"
2533	or die "unable to load facedata\n";	3065	or die "unable to load facedata\n";
2534	}	3066	}
2535		3067
2536	sub reload_archetypes {	3068	sub reload_archetypes {
2537	load_resource_file "$DATADIR/archetypes"	3069	load_resource_file "$DATADIR/archetypes"
2538	or die "unable to load archetypes\n";	3070	or die "unable to load archetypes\n";
		3071	#d# NEED to laod twice to resolve forward references
		3072	# this really needs to be done in an extra post-pass
		3073	# (which needs to be synchronous, so solve it differently)
		3074	load_resource_file "$DATADIR/archetypes"
		3075	or die "unable to load archetypes\n";
2539	}	3076	}
2540		3077
2541	sub reload_treasures {	3078	sub reload_treasures {
2542	load_resource_file "$DATADIR/treasures"	3079	load_resource_file "$DATADIR/treasures"
2543	or die "unable to load treasurelists\n";	3080	or die "unable to load treasurelists\n";
…		…
2546	sub reload_resources {	3083	sub reload_resources {
2547	warn "reloading resource files...\n";	3084	warn "reloading resource files...\n";
2548		3085
2549	reload_regions;	3086	reload_regions;
2550	reload_facedata;	3087	reload_facedata;
		3088	#reload_archetypes;#d#
2551	reload_archetypes;	3089	reload_archetypes;
2552	reload_treasures;	3090	reload_treasures;
2553		3091
2554	warn "finished reloading resource files\n";	3092	warn "finished reloading resource files\n";
2555	}	3093	}
2556		3094
2557	sub init {	3095	sub init {
2558	reload_resources;	3096	reload_resources;
2559	}	3097	}
2560		3098
2561	sub cfg_load {	3099	sub reload_config {
2562	open my $fh, "<:utf8", "$CONFDIR/config"	3100	open my $fh, "<:utf8", "$CONFDIR/config"
2563	or return;	3101	or return;
2564		3102
2565	local $/;	3103	local $/;
2566	*CFG = YAML::Syck::Load <$fh>;	3104	*CFG = YAML::Syck::Load <$fh>;
…		…
2586	(async {	3124	(async {
2587	Event::one_event;	3125	Event::one_event;
2588	})->prio (Coro::PRIO_MAX);	3126	})->prio (Coro::PRIO_MAX);
2589	};	3127	};
2590		3128
2591	cfg_load;	3129	reload_config;
2592	db_init;	3130	db_init;
2593	load_extensions;	3131	load_extensions;
2594		3132
2595	$TICK_WATCHER->start;	3133	$TICK_WATCHER->start;
2596	Event::loop;	3134	Event::loop;
…		…
2612	},	3150	},
2613	);	3151	);
2614	}	3152	}
2615	}	3153	}
2616		3154
		3155	sub write_runtime {
		3156	my $runtime = "$LOCALDIR/runtime";
		3157
		3158	# first touch the runtime file to show we are still running:
		3159	# the fsync below can take a very very long time.
		3160
		3161	IO::AIO::aio_utime $runtime, undef, undef;
		3162
		3163	my $guard = cf::lock_acquire "write_runtime";
		3164
		3165	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
		3166	or return;
		3167
		3168	my $value = $cf::RUNTIME + 90 + 10;
		3169	# 10 is the runtime save interval, for a monotonic clock
		3170	# 60 allows for the watchdog to kill the server.
		3171
		3172	(aio_write $fh, 0, (length $value), $value, 0) <= 0
		3173	and return;
		3174
		3175	# always fsync - this file is important
		3176	aio_fsync $fh
		3177	and return;
		3178
		3179	# touch it again to show we are up-to-date
		3180	aio_utime $fh, undef, undef;
		3181
		3182	close $fh
		3183	or return;
		3184
		3185	aio_rename "$runtime~", $runtime
		3186	and return;
		3187
		3188	warn "runtime file written.\n";
		3189
		3190	1
		3191	}
		3192
2617	sub emergency_save() {	3193	sub emergency_save() {
2618	my $freeze_guard = cf::freeze_mainloop;	3194	my $freeze_guard = cf::freeze_mainloop;
2619		3195
2620	warn "enter emergency perl save\n";	3196	warn "enter emergency perl save\n";
2621		3197
…		…
2696	%EXT_CORO = ();	3272	%EXT_CORO = ();
2697		3273
2698	warn "removing commands";	3274	warn "removing commands";
2699	%COMMAND = ();	3275	%COMMAND = ();
2700		3276
2701	warn "removing ext commands";	3277	warn "removing ext/exti commands";
2702	%EXTCMD = ();	3278	%EXTCMD = ();
		3279	%EXTICMD = ();
2703		3280
2704	warn "unloading/nuking all extensions";	3281	warn "unloading/nuking all extensions";
2705	for my $pkg (@EXTS) {	3282	for my $pkg (@EXTS) {
2706	warn "... unloading $pkg";	3283	warn "... unloading $pkg";
2707		3284
…		…
2750	warn "reloading cf.pm";	3327	warn "reloading cf.pm";
2751	require cf;	3328	require cf;
2752	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3329	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2753		3330
2754	warn "loading config and database again";	3331	warn "loading config and database again";
2755	cf::cfg_load;	3332	cf::reload_config;
2756		3333
2757	warn "loading extensions";	3334	warn "loading extensions";
2758	cf::load_extensions;	3335	cf::load_extensions;
2759		3336
2760	warn "reattaching attachments to objects/players";	3337	warn "reattaching attachments to objects/players";
…		…
2825	my $signal = new Coro::Signal;	3402	my $signal = new Coro::Signal;
2826	push @WAIT_FOR_TICK_BEGIN, $signal;	3403	push @WAIT_FOR_TICK_BEGIN, $signal;
2827	$signal->wait;	3404	$signal->wait;
2828	}	3405	}
2829		3406
		3407	my $min = 1e6;#d#
		3408	my $avg = 10;
2830	$TICK_WATCHER = Event->timer (	3409	$TICK_WATCHER = Event->timer (
2831	reentrant => 0,	3410	reentrant => 0,
2832	parked => 1,	3411	parked => 1,
2833	prio => 0,	3412	prio => 0,
2834	at => $NEXT_TICK || $TICK,	3413	at => $NEXT_TICK || $TICK,
…		…
2838	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3417	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2839	unless ++$bug_warning > 10;	3418	unless ++$bug_warning > 10;
2840	return;	3419	return;
2841	}	3420	}
2842		3421
2843	$NOW = Event::time;	3422	$NOW = $tick_start = Event::time;
2844		3423
2845	cf::server_tick; # one server iteration	3424	cf::server_tick; # one server iteration
		3425
		3426	0 && sync_job {#d#
		3427	for(1..10) {
		3428	my $t = Event::time;
		3429	my $map = my $map = new_from_path cf::map "/tmp/x.map"
		3430	or die;
		3431
		3432	$map->width (50);
		3433	$map->height (50);
		3434	$map->alloc;
		3435	$map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
		3436	my $t = Event::time - $t;
		3437
		3438	#next unless $t < 0.0013;#d#
		3439	if ($t < $min) {
		3440	$min = $t;
		3441	}
		3442	$avg = $avg * 0.99 + $t * 0.01;
		3443	}
		3444	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
		3445	exit 0;
		3446	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
		3447	};
2846		3448
2847	$RUNTIME += $TICK;	3449	$RUNTIME += $TICK;
2848	$NEXT_TICK += $TICK;	3450	$NEXT_TICK += $TICK;
2849		3451
2850	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3452	if ($NOW >= $NEXT_RUNTIME_WRITE) {
…		…
2856	}	3458	}
2857		3459
2858	# my $AFTER = Event::time;	3460	# my $AFTER = Event::time;
2859	# warn $AFTER - $NOW;#d#	3461	# warn $AFTER - $NOW;#d#
2860		3462
		3463	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
		3464	$sig->send;
		3465	}
		3466	while (my $sig = shift @WAIT_FOR_TICK) {
		3467	$sig->send;
		3468	}
		3469
		3470	$NOW = Event::time;
		3471
2861	# if we are delayed by four ticks or more, skip them all	3472	# if we are delayed by four ticks or more, skip them all
2862	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	3473	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2863		3474
2864	$TICK_WATCHER->at ($NEXT_TICK);	3475	$TICK_WATCHER->at ($NEXT_TICK);
2865	$TICK_WATCHER->start;	3476	$TICK_WATCHER->start;
2866		3477
2867	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3478	$LOAD = ($NOW - $tick_start) / $TICK;
2868	$sig->send;	3479	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2869	}
2870	while (my $sig = shift @WAIT_FOR_TICK) {
2871	$sig->send;
2872	}
2873		3480
2874	_post_tick;	3481	_post_tick;
		3482
		3483
2875	},	3484	},
2876	);	3485	);
2877		3486
2878	{	3487	{
2879	BDB::max_poll_time $TICK * 0.1;	3488	BDB::max_poll_time $TICK * 0.1;

Diff Legend

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