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.457 by root, Wed Oct 1 05:50:19 2008 UTC vs.
Revision 1.551 by root, Sun May 16 13:48:07 2010 UTC

1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# it under the terms of the GNU General Public License as published by	7	# the terms of the Affero GNU General Public License as published by the
8	# the Free Software Foundation, either version 3 of the License, or	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# (at your option) any later version.	9	# option) any later version.
10	#	10	#
11	# This program is distributed in the hope that it will be useful,	11	# This program is distributed in the hope that it will be useful,
12	# but WITHOUT ANY WARRANTY; without even the implied warranty of	12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	# GNU General Public License for more details.	14	# GNU General Public License for more details.
15	#	15	#
16	# You should have received a copy of the GNU General Public License	16	# You should have received a copy of the Affero GNU General Public License
17	# along with this program. If not, see <http://www.gnu.org/licenses/>.	17	# and the GNU General Public License along with this program. If not, see
		18	# <http://www.gnu.org/licenses/>.
18	#	19	#
19	# The authors can be reached via e-mail to <support@deliantra.net>	20	# The authors can be reached via e-mail to <support@deliantra.net>
20	#	21	#
21		22
22	package cf;	23	package cf;
23		24
24	use 5.10.0;	25	use common::sense;
25	use utf8;
26	use strict "vars", "subs";
27		26
28	use Symbol;	27	use Symbol;
29	use List::Util;	28	use List::Util;
30	use Socket;	29	use Socket;
31	use EV;	30	use EV;
32	use Opcode;	31	use Opcode;
33	use Safe;	32	use Safe;
34	use Safe::Hole;	33	use Safe::Hole;
35	use Storable ();	34	use Storable ();
		35	use Carp ();
36		36
		37	use Guard ();
37	use Coro ();	38	use Coro ();
38	use Coro::State;	39	use Coro::State;
39	use Coro::Handle;	40	use Coro::Handle;
40	use Coro::EV;	41	use Coro::EV;
41	use Coro::AnyEvent;	42	use Coro::AnyEvent;
42	use Coro::Timer;	43	use Coro::Timer;
43	use Coro::Signal;	44	use Coro::Signal;
44	use Coro::Semaphore;	45	use Coro::Semaphore;
		46	use Coro::SemaphoreSet;
45	use Coro::AnyEvent;	47	use Coro::AnyEvent;
46	use Coro::AIO;	48	use Coro::AIO;
47	use Coro::BDB 1.6;	49	use Coro::BDB 1.6;
48	use Coro::Storable;	50	use Coro::Storable;
49	use Coro::Util ();	51	use Coro::Util ();
50		52
51	use JSON::XS 2.01 ();	53	use JSON::XS 2.01 ();
52	use BDB ();	54	use BDB ();
53	use Data::Dumper;	55	use Data::Dumper;
54	use Digest::MD5;
55	use Fcntl;	56	use Fcntl;
56	use YAML ();	57	use YAML::XS ();
57	use IO::AIO ();	58	use IO::AIO ();
58	use Time::HiRes;	59	use Time::HiRes;
59	use Compress::LZF;	60	use Compress::LZF;
60	use Digest::MD5 ();	61	use Digest::MD5 ();
61		62
…		…
70		71
71	# make sure c-lzf reinitialises itself	72	# make sure c-lzf reinitialises itself
72	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";	73	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	74	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
74		75
		76	# strictly for debugging
		77	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
		78
75	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	79	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
		80
		81	our @ORIG_INC;
76		82
77	our %COMMAND = ();	83	our %COMMAND = ();
78	our %COMMAND_TIME = ();	84	our %COMMAND_TIME = ();
79		85
80	our @EXTS = (); # list of extension package names	86	our @EXTS = (); # list of extension package names
…		…
83	our %EXT_CORO = (); # coroutines bound to extensions	89	our %EXT_CORO = (); # coroutines bound to extensions
84	our %EXT_MAP = (); # pluggable maps	90	our %EXT_MAP = (); # pluggable maps
85		91
86	our $RELOAD; # number of reloads so far, non-zero while in reload	92	our $RELOAD; # number of reloads so far, non-zero while in reload
87	our @EVENT;	93	our @EVENT;
		94	our @REFLECT; # set by XS
		95	our %REFLECT; # set by us
88		96
89	our $CONFDIR = confdir;	97	our $CONFDIR = confdir;
90	our $DATADIR = datadir;	98	our $DATADIR = datadir;
91	our $LIBDIR = "$DATADIR/ext";	99	our $LIBDIR = "$DATADIR/ext";
92	our $PODDIR = "$DATADIR/pod";	100	our $PODDIR = "$DATADIR/pod";
…		…
98	our $RANDOMDIR = "$LOCALDIR/random";	106	our $RANDOMDIR = "$LOCALDIR/random";
99	our $BDBDIR = "$LOCALDIR/db";	107	our $BDBDIR = "$LOCALDIR/db";
100	our $PIDFILE = "$LOCALDIR/pid";	108	our $PIDFILE = "$LOCALDIR/pid";
101	our $RUNTIMEFILE = "$LOCALDIR/runtime";	109	our $RUNTIMEFILE = "$LOCALDIR/runtime";
102		110
103	our %RESOURCE;	111	our %RESOURCE; # unused
		112
		113	our $OUTPUT_RATE_MIN = 3000;
		114	our $OUTPUT_RATE_MAX = 1000000;
		115
		116	our $MAX_LINKS = 32; # how many chained exits to follow
		117	our $VERBOSE_IO = 1;
104		118
105	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	119	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	120	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107	our $NEXT_TICK;	121	our $NEXT_TICK;
108	our $USE_FSYNC = 1; # use fsync to write maps - default off	122	our $USE_FSYNC = 1; # use fsync to write maps - default on
109		123
110	our $BDB_DEADLOCK_WATCHER;	124	our $BDB_DEADLOCK_WATCHER;
111	our $BDB_CHECKPOINT_WATCHER;	125	our $BDB_CHECKPOINT_WATCHER;
112	our $BDB_TRICKLE_WATCHER;	126	our $BDB_TRICKLE_WATCHER;
113	our $DB_ENV;	127	our $DB_ENV;
114		128
		129	our @EXTRA_MODULES = qw(pod match mapscript incloader);
		130
115	our %CFG;	131	our %CFG;
116		132
117	our $UPTIME; $UPTIME ||= time;	133	our $UPTIME; $UPTIME ||= time;
118	our $RUNTIME;	134	our $RUNTIME;
119	our $NOW;	135	our $NOW;
…		…
130	our $JITTER; # average jitter	146	our $JITTER; # average jitter
131	our $TICK_START; # for load detecting purposes	147	our $TICK_START; # for load detecting purposes
132		148
133	our @POST_INIT;	149	our @POST_INIT;
134		150
135	our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)	151	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
		152	our $REALLY_UNLOOP; # never set to true, please :)
136		153
137	binmode STDOUT;	154	binmode STDOUT;
138	binmode STDERR;	155	binmode STDERR;
139		156
140	# read virtual server time, if available	157	# read virtual server time, if available
…		…
142	open my $fh, "<", $RUNTIMEFILE	159	open my $fh, "<", $RUNTIMEFILE
143	or die "unable to read $RUNTIMEFILE file: $!";	160	or die "unable to read $RUNTIMEFILE file: $!";
144	$RUNTIME = <$fh> + 0.;	161	$RUNTIME = <$fh> + 0.;
145	}	162	}
146		163
		164	eval "sub TICK() { $TICK } 1" or die;
		165
147	mkdir $_	166	mkdir $_
148	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	167	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
149		168
150	our $EMERGENCY_POSITION;	169	our $EMERGENCY_POSITION;
151		170
152	sub cf::map::normalise;	171	sub cf::map::normalise;
		172
		173	sub in_main() {
		174	$Coro::current == $Coro::main
		175	}
		176
		177	#############################################################################
		178
		179	%REFLECT = ();
		180	for (@REFLECT) {
		181	my $reflect = JSON::XS::decode_json $_;
		182	$REFLECT{$reflect->{class}} = $reflect;
		183	}
		184
		185	# this is decidedly evil
		186	$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
153		187
154	#############################################################################	188	#############################################################################
155		189
156	=head2 GLOBAL VARIABLES	190	=head2 GLOBAL VARIABLES
157		191
…		…
199	from wherever your confdir points to.	233	from wherever your confdir points to.
200		234
201	=item cf::wait_for_tick, cf::wait_for_tick_begin	235	=item cf::wait_for_tick, cf::wait_for_tick_begin
202		236
203	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	237	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
204	returns directly I<after> the tick processing (and consequently, can only wake one process	238	returns directly I<after> the tick processing (and consequently, can only wake one thread
205	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	239	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
206		240
		241	=cut
		242
		243	sub wait_for_tick();
		244	sub wait_for_tick_begin();
		245
207	=item @cf::INVOKE_RESULTS	246	=item @cf::INVOKE_RESULTS
208		247
209	This array contains the results of the last C<invoke ()> call. When	248	This array contains the results of the last C<invoke ()> call. When
210	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	249	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
211	that call.	250	that call.
212		251
		252	=item %cf::REFLECT
		253
		254	Contains, for each (C++) class name, a hash reference with information
		255	about object members (methods, scalars, arrays and flags) and other
		256	metadata, which is useful for introspection.
		257
213	=back	258	=back
214		259
215	=cut	260	=cut
216		261
217	BEGIN {	262	sub error(@) { LOG llevError, join "", @_ }
218	*CORE::GLOBAL::warn = sub {	263	sub warn (@) { LOG llevWarn , join "", @_ }
		264	sub info (@) { LOG llevInfo , join "", @_ }
		265	sub debug(@) { LOG llevDebug, join "", @_ }
		266	sub trace(@) { LOG llevTrace, join "", @_ }
		267
		268	$Coro::State::WARNHOOK = sub {
219	my $msg = join "", @_;	269	my $msg = join "", @_;
220		270
221	$msg .= "\n"	271	$msg .= "\n"
222	unless $msg =~ /\n$/;	272	unless $msg =~ /\n$/;
223		273
224	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	274	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
225		275
226	LOG llevError, $msg;	276	LOG llevWarn, $msg;
227	};	277	};
228	}
229		278
230	$Coro::State::DIEHOOK = sub {	279	$Coro::State::DIEHOOK = sub {
231	return unless $^S eq 0; # "eq", not "=="	280	return unless $^S eq 0; # "eq", not "=="
232		281
233	if ($Coro::current == $Coro::main) {#d#	282	error Carp::longmess $_[0];
		283
		284	if (in_main) {#d#
234	warn "DIEHOOK called in main context, Coro bug?\n";#d#	285	error "DIEHOOK called in main context, Coro bug?\n";#d#
235	return;#d#	286	return;#d#
236	}#d#	287	}#d#
237		288
238	# kill coroutine otherwise	289	# kill coroutine otherwise
239	warn Carp::longmess $_[0];
240	Coro::terminate	290	Coro::terminate
241	};	291	};
242
243	$SIG{__DIE__} = sub { }; #d#?
244		292
245	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	293	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
246	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	294	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
247	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	295	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
248	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	296	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
262	)) {	310	)) {
263	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	311	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
264	}	312	}
265		313
266	$EV::DIED = sub {	314	$EV::DIED = sub {
267	warn "error in event callback: @_";	315	Carp::cluck "error in event callback: @_";
268	};	316	};
269		317
270	#############################################################################	318	#############################################################################
271		319
272	=head2 UTILITY FUNCTIONS	320	=head2 UTILITY FUNCTIONS
…		…
309	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	357	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
310		358
311	sub encode_json($) { $json_coder->encode ($_[0]) }	359	sub encode_json($) { $json_coder->encode ($_[0]) }
312	sub decode_json($) { $json_coder->decode ($_[0]) }	360	sub decode_json($) { $json_coder->decode ($_[0]) }
313		361
		362	=item $ref = cf::yaml_load $scalar
		363
		364	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		365
		366	=cut
		367
		368	sub fork_call(&@);
		369
		370	sub yaml_load($) {
		371	fork_call { YAML::XS::Load $_[0] } @_
		372	}
		373
314	=item cf::post_init { BLOCK }	374	=item cf::post_init { BLOCK }
315		375
316	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	376	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
317	but I<before> the server starts ticking again.	377	but I<before> the server starts ticking again.
318		378
319	The cdoeblock will have a single boolean argument to indicate whether this	379	The codeblock will have a single boolean argument to indicate whether this
320	is a reload or not.	380	is a reload or not.
321		381
322	=cut	382	=cut
323		383
324	sub post_init(&) {	384	sub post_init(&) {
325	push @POST_INIT, shift;	385	push @POST_INIT, shift;
326	}	386	}
327		387
		388	sub _post_init {
		389	trace "running post_init jobs";
		390
		391	# run them in parallel...
		392
		393	my @join;
		394
		395	while () {
		396	push @join, map &Coro::async ($_, 0), @POST_INIT;
		397	@POST_INIT = ();
		398
		399	@join or last;
		400
		401	(pop @join)->join;
		402	}
		403	}
		404
328	=item cf::lock_wait $string	405	=item cf::lock_wait $string
329		406
330	Wait until the given lock is available. See cf::lock_acquire.	407	Wait until the given lock is available. See cf::lock_acquire.
331		408
332	=item my $lock = cf::lock_acquire $string	409	=item my $lock = cf::lock_acquire $string
333		410
334	Wait until the given lock is available and then acquires it and returns	411	Wait until the given lock is available and then acquires it and returns
335	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	412	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
336	for example when the coroutine gets canceled), the lock is automatically	413	for example when the coroutine gets canceled), the lock is automatically
337	returned.	414	returned.
338		415
339	Locks are *not* recursive, locking from the same coro twice results in a	416	Locks are *not* recursive, locking from the same coro twice results in a
340	deadlocked coro.	417	deadlocked coro.
…		…
346		423
347	Return true if the lock is currently active, i.e. somebody has locked it.	424	Return true if the lock is currently active, i.e. somebody has locked it.
348		425
349	=cut	426	=cut
350		427
351	our %LOCK;	428	our $LOCKS = new Coro::SemaphoreSet;
352	our %LOCKER;#d#
353		429
354	sub lock_wait($) {	430	sub lock_wait($) {
355	my ($key) = @_;	431	$LOCKS->wait ($_[0]);
356
357	if ($LOCKER{$key} == $Coro::current) {#d#
358	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
359	return;#d#
360	}#d#
361
362	# wait for lock, if any
363	while ($LOCK{$key}) {
364	#local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
365	push @{ $LOCK{$key} }, $Coro::current;
366	Coro::schedule;
367	}
368	}	432	}
369		433
370	sub lock_acquire($) {	434	sub lock_acquire($) {
371	my ($key) = @_;	435	$LOCKS->guard ($_[0])
372
373	# wait, to be sure we are not locked
374	lock_wait $key;
375
376	$LOCK{$key} = [];
377	$LOCKER{$key} = $Coro::current;#d#
378
379	Coro::guard {
380	delete $LOCKER{$key};#d#
381	# wake up all waiters, to be on the safe side
382	$_->ready for @{ delete $LOCK{$key} };
383	}
384	}	436	}
385		437
386	sub lock_active($) {	438	sub lock_active($) {
387	my ($key) = @_;	439	$LOCKS->count ($_[0]) < 1
388
389	! ! $LOCK{$key}
390	}	440	}
391		441
392	sub freeze_mainloop {	442	sub freeze_mainloop {
393	tick_inhibit_inc;	443	tick_inhibit_inc;
394		444
395	Coro::guard \&tick_inhibit_dec;	445	&Guard::guard (\&tick_inhibit_dec);
396	}	446	}
397		447
398	=item cf::periodic $interval, $cb	448	=item cf::periodic $interval, $cb
399		449
400	Like EV::periodic, but randomly selects a starting point so that the actions	450	Like EV::periodic, but randomly selects a starting point so that the actions
401	get spread over timer.	451	get spread over time.
402		452
403	=cut	453	=cut
404		454
405	sub periodic($$) {	455	sub periodic($$) {
406	my ($interval, $cb) = @_;	456	my ($interval, $cb) = @_;
…		…
423		473
424	=cut	474	=cut
425		475
426	our @SLOT_QUEUE;	476	our @SLOT_QUEUE;
427	our $SLOT_QUEUE;	477	our $SLOT_QUEUE;
		478	our $SLOT_DECAY = 0.9;
428		479
429	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	480	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430	$SLOT_QUEUE = Coro::async {	481	$SLOT_QUEUE = Coro::async {
431	$Coro::current->desc ("timeslot manager");	482	$Coro::current->desc ("timeslot manager");
432		483
433	my $signal = new Coro::Signal;	484	my $signal = new Coro::Signal;
		485	my $busy;
434		486
435	while () {	487	while () {
436	next_job:	488	next_job:
		489
437	my $avail = cf::till_tick;	490	my $avail = cf::till_tick;
438	if ($avail > 0.01) {	491
439	for (0 .. $#SLOT_QUEUE) {	492	for (0 .. $#SLOT_QUEUE) {
440	if ($SLOT_QUEUE[$_][0] < $avail) {	493	if ($SLOT_QUEUE[$_][0] <= $avail) {
		494	$busy = 0;
441	my $job = splice @SLOT_QUEUE, $_, 1, ();	495	my $job = splice @SLOT_QUEUE, $_, 1, ();
442	$job->[2]->send;	496	$job->[2]->send;
443	Coro::cede;	497	Coro::cede;
444	goto next_job;	498	goto next_job;
445	}	499	} else {
		500	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446	}	501	}
447	}	502	}
448		503
449	if (@SLOT_QUEUE) {	504	if (@SLOT_QUEUE) {
450	# we do not use wait_for_tick() as it returns immediately when tick is inactive	505	# we do not use wait_for_tick() as it returns immediately when tick is inactive
451	push @cf::WAIT_FOR_TICK, $signal;	506	push @cf::WAIT_FOR_TICK, $signal;
452	$signal->wait;	507	$signal->wait;
453	} else {	508	} else {
		509	$busy = 0;
454	Coro::schedule;	510	Coro::schedule;
455	}	511	}
456	}	512	}
457	};	513	};
458		514
459	sub get_slot($;$$) {	515	sub get_slot($;$$) {
460	return if tick_inhibit || $Coro::current == $Coro::main;	516	return if tick_inhibit || $Coro::current == $Coro::main;
461		517
462	my ($time, $pri, $name) = @_;	518	my ($time, $pri, $name) = @_;
463		519
464	$time = $TICK * .6 if $time > $TICK * .6;	520	$time = clamp $time, 0.01, $TICK * .6;
		521
465	my $sig = new Coro::Signal;	522	my $sig = new Coro::Signal;
466		523
467	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	524	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	525	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469	$SLOT_QUEUE->ready;	526	$SLOT_QUEUE->ready;
…		…
495	=cut	552	=cut
496		553
497	sub sync_job(&) {	554	sub sync_job(&) {
498	my ($job) = @_;	555	my ($job) = @_;
499		556
500	if ($Coro::current == $Coro::main) {	557	if (in_main) {
501	my $time = EV::time;	558	my $time = AE::time;
502		559
503	# this is the main coro, too bad, we have to block	560	# this is the main coro, too bad, we have to block
504	# till the operation succeeds, freezing the server :/	561	# till the operation succeeds, freezing the server :/
505		562
506	LOG llevError, Carp::longmess "sync job";#d#	563	#LOG llevError, Carp::longmess "sync job";#d#
507		564
508	my $freeze_guard = freeze_mainloop;	565	my $freeze_guard = freeze_mainloop;
509		566
510	my $busy = 1;	567	my $busy = 1;
511	my @res;	568	my @res;
512		569
513	(async {	570	(async {
514	$Coro::current->desc ("sync job coro");	571	$Coro::current->desc ("sync job coro");
515	@res = eval { $job->() };	572	@res = eval { $job->() };
516	warn $@ if $@;	573	error $@ if $@;
517	undef $busy;	574	undef $busy;
518	})->prio (Coro::PRIO_MAX);	575	})->prio (Coro::PRIO_MAX);
519		576
520	while ($busy) {	577	while ($busy) {
521	if (Coro::nready) {	578	if (Coro::nready) {
…		…
523	} else {	580	} else {
524	EV::loop EV::LOOP_ONESHOT;	581	EV::loop EV::LOOP_ONESHOT;
525	}	582	}
526	}	583	}
527		584
528	my $time = EV::time - $time;	585	my $time = AE::time - $time;
529		586
530	$TICK_START += $time; # do not account sync jobs to server load	587	$TICK_START += $time; # do not account sync jobs to server load
531		588
532	wantarray ? @res : $res[0]	589	wantarray ? @res : $res[0]
533	} else {	590	} else {
…		…
555	$EXT_CORO{$coro+0} = $coro;	612	$EXT_CORO{$coro+0} = $coro;
556		613
557	$coro	614	$coro
558	}	615	}
559		616
560	=item fork_call { }, $args	617	=item fork_call { }, @args
561		618
562	Executes the given code block with the given arguments in a seperate	619	Executes the given code block with the given arguments in a seperate
563	process, returning the results. Everything must be serialisable with	620	process, returning the results. Everything must be serialisable with
564	Coro::Storable. May, of course, block. Note that the executed sub may	621	Coro::Storable. May, of course, block. Note that the executed sub may
565	never block itself or use any form of event handling.	622	never block itself or use any form of event handling.
566		623
567	=cut	624	=cut
568		625
		626	sub post_fork {
		627	reset_signals;
		628	}
		629
569	sub fork_call(&@) {	630	sub fork_call(&@) {
570	my ($cb, @args) = @_;	631	my ($cb, @args) = @_;
571		632
572	# we seemingly have to make a local copy of the whole thing,	633	# we seemingly have to make a local copy of the whole thing,
573	# otherwise perl prematurely frees the stuff :/	634	# otherwise perl prematurely frees the stuff :/
574	# TODO: investigate and fix (likely this will be rather laborious)	635	# TODO: investigate and fix (likely this will be rather laborious)
575		636
576	my @res = Coro::Util::fork_eval {	637	my @res = Coro::Util::fork_eval {
577	reset_signals;	638	cf::post_fork;
578	&$cb	639	&$cb
579	}, @args;	640	} @args;
580		641
581	wantarray ? @res : $res[-1]	642	wantarray ? @res : $res[-1]
		643	}
		644
		645	sub objinfo {
		646	(
		647	"counter value" => cf::object::object_count,
		648	"objects created" => cf::object::create_count,
		649	"objects destroyed" => cf::object::destroy_count,
		650	"freelist size" => cf::object::free_count,
		651	"allocated objects" => cf::object::objects_size,
		652	"active objects" => cf::object::actives_size,
		653	)
582	}	654	}
583		655
584	=item $coin = coin_from_name $name	656	=item $coin = coin_from_name $name
585		657
586	=cut	658	=cut
…		…
623	within each server.	695	within each server.
624		696
625	=cut	697	=cut
626		698
627	sub db_table($) {	699	sub db_table($) {
		700	cf::error "db_get called from main context"
		701	if $Coro::current == $Coro::main;
		702
628	my ($name) = @_;	703	my ($name) = @_;
629	my $db = BDB::db_create $DB_ENV;	704	my $db = BDB::db_create $DB_ENV;
630		705
631	eval {	706	eval {
632	$db->set_flags (BDB::CHKSUM);	707	$db->set_flags (BDB::CHKSUM);
…		…
642	}	717	}
643		718
644	our $DB;	719	our $DB;
645		720
646	sub db_init {	721	sub db_init {
647	cf::sync_job {
648	$DB ||= db_table "db";	722	$DB ||= db_table "db";
649	};
650	}	723	}
651		724
652	sub db_get($$) {	725	sub db_get($$) {
653	my $key = "$_[0]/$_[1]";	726	my $key = "$_[0]/$_[1]";
654		727
655	cf::sync_job {	728	cf::error "db_get called from main context"
		729	if $Coro::current == $Coro::main;
		730
656	BDB::db_get $DB, undef, $key, my $data;	731	BDB::db_get $DB, undef, $key, my $data;
657		732
658	$! ? ()	733	$! ? ()
659	: $data	734	: $data
660	}
661	}	735	}
662		736
663	sub db_put($$$) {	737	sub db_put($$$) {
664	BDB::dbreq_pri 4;	738	BDB::dbreq_pri 4;
665	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	739	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
721		795
722	my $t1 = Time::HiRes::time;	796	my $t1 = Time::HiRes::time;
723	my $data = $process->(\@data);	797	my $data = $process->(\@data);
724	my $t2 = Time::HiRes::time;	798	my $t2 = Time::HiRes::time;
725		799
726	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	800	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
727		801
728	db_put cache => "$id/data", $data;	802	db_put cache => "$id/data", $data;
729	db_put cache => "$id/md5" , $md5;	803	db_put cache => "$id/md5" , $md5;
730	db_put cache => "$id/meta", $meta;	804	db_put cache => "$id/meta", $meta;
731		805
…		…
741		815
742	=cut	816	=cut
743		817
744	sub datalog($@) {	818	sub datalog($@) {
745	my ($type, %kv) = @_;	819	my ($type, %kv) = @_;
746	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	820	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
747	}	821	}
748		822
749	=back	823	=back
750		824
751	=cut	825	=cut
…		…
946		1020
947	} elsif (exists $cb_id{$type}) {	1021	} elsif (exists $cb_id{$type}) {
948	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1022	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
949		1023
950	} elsif (ref $type) {	1024	} elsif (ref $type) {
951	warn "attaching objects not supported, ignoring.\n";	1025	error "attaching objects not supported, ignoring.\n";
952		1026
953	} else {	1027	} else {
954	shift @arg;	1028	shift @arg;
955	warn "attach argument '$type' not supported, ignoring.\n";	1029	error "attach argument '$type' not supported, ignoring.\n";
956	}	1030	}
957	}	1031	}
958	}	1032	}
959		1033
960	sub _object_attach {	1034	sub _object_attach {
…		…
970	_attach $registry, $klass, @attach;	1044	_attach $registry, $klass, @attach;
971	}	1045	}
972		1046
973	$obj->{$name} = \%arg;	1047	$obj->{$name} = \%arg;
974	} else {	1048	} else {
975	warn "object uses attachment '$name' which is not available, postponing.\n";	1049	info "object uses attachment '$name' which is not available, postponing.\n";
976	}	1050	}
977		1051
978	$obj->{_attachment}{$name} = undef;	1052	$obj->{_attachment}{$name} = undef;
979	}	1053	}
980		1054
…		…
1039		1113
1040	for (@$callbacks) {	1114	for (@$callbacks) {
1041	eval { &{$_->[1]} };	1115	eval { &{$_->[1]} };
1042		1116
1043	if ($@) {	1117	if ($@) {
1044	warn "$@";
1045	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1118	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1046	override;	1119	override;
1047	}	1120	}
1048		1121
1049	return 1 if $override;	1122	return 1 if $override;
1050	}	1123	}
…		…
1129	for (@$attach) {	1202	for (@$attach) {
1130	my ($klass, @attach) = @$_;	1203	my ($klass, @attach) = @$_;
1131	_attach $registry, $klass, @attach;	1204	_attach $registry, $klass, @attach;
1132	}	1205	}
1133	} else {	1206	} else {
1134	warn "object uses attachment '$name' that is not available, postponing.\n";	1207	info "object uses attachment '$name' that is not available, postponing.\n";
1135	}	1208	}
1136	}	1209	}
1137	}	1210	}
1138		1211
1139	cf::attachable->attach (	1212	cf::attachable->attach (
…		…
1166	my ($filename, $rdata, $objs) = @_;	1239	my ($filename, $rdata, $objs) = @_;
1167		1240
1168	sync_job {	1241	sync_job {
1169	if (length $$rdata) {	1242	if (length $$rdata) {
1170	utf8::decode (my $decname = $filename);	1243	utf8::decode (my $decname = $filename);
1171	warn sprintf "saving %s (%d,%d)\n",	1244	trace sprintf "saving %s (%d,%d)\n",
1172	$decname, length $$rdata, scalar @$objs;	1245	$decname, length $$rdata, scalar @$objs
		1246	if $VERBOSE_IO;
1173		1247
1174	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1248	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175	aio_chmod $fh, SAVE_MODE;	1249	aio_chmod $fh, SAVE_MODE;
1176	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1250	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177	aio_fsync $fh if $cf::USE_FSYNC;	1251	if ($cf::USE_FSYNC) {
		1252	aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
		1253	aio_fsync $fh;
		1254	}
1178	aio_close $fh;	1255	aio_close $fh;
1179		1256
1180	if (@$objs) {	1257	if (@$objs) {
1181	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1258	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1182	aio_chmod $fh, SAVE_MODE;	1259	aio_chmod $fh, SAVE_MODE;
1183	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1260	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1184	aio_write $fh, 0, (length $data), $data, 0;	1261	aio_write $fh, 0, (length $data), $data, 0;
1185	aio_fsync $fh if $cf::USE_FSYNC;	1262	if ($cf::USE_FSYNC) {
		1263	aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
		1264	aio_fsync $fh;
		1265	}
1186	aio_close $fh;	1266	aio_close $fh;
1187	aio_rename "$filename.pst~", "$filename.pst";	1267	aio_rename "$filename.pst~", "$filename.pst";
1188	}	1268	}
1189	} else {	1269	} else {
1190	aio_unlink "$filename.pst";	1270	aio_unlink "$filename.pst";
…		…
1193	aio_rename "$filename~", $filename;	1273	aio_rename "$filename~", $filename;
1194		1274
1195	$filename =~ s%/[^/]+$%%;	1275	$filename =~ s%/[^/]+$%%;
1196	aio_pathsync $filename if $cf::USE_FSYNC;	1276	aio_pathsync $filename if $cf::USE_FSYNC;
1197	} else {	1277	} else {
1198	warn "FATAL: $filename~: $!\n";	1278	error "unable to save objects: $filename~: $!\n";
1199	}	1279	}
1200	} else {	1280	} else {
1201	aio_unlink $filename;	1281	aio_unlink $filename;
1202	aio_unlink "$filename.pst";	1282	aio_unlink "$filename.pst";
1203	}	1283	}
…		…
1227	my $st = eval { Coro::Storable::thaw $av };	1307	my $st = eval { Coro::Storable::thaw $av };
1228	$av = $st->{objs};	1308	$av = $st->{objs};
1229	}	1309	}
1230		1310
1231	utf8::decode (my $decname = $filename);	1311	utf8::decode (my $decname = $filename);
1232	warn sprintf "loading %s (%d,%d)\n",	1312	trace sprintf "loading %s (%d,%d)\n",
1233	$decname, length $data, scalar @{$av || []};	1313	$decname, length $data, scalar @{$av || []}
		1314	if $VERBOSE_IO;
1234		1315
1235	($data, $av)	1316	($data, $av)
1236	}	1317	}
1237		1318
1238	=head2 COMMAND CALLBACKS	1319	=head2 COMMAND CALLBACKS
…		…
1297	}	1378	}
1298		1379
1299	use File::Glob ();	1380	use File::Glob ();
1300		1381
1301	cf::player->attach (	1382	cf::player->attach (
1302	on_command => sub {	1383	on_unknown_command => sub {
1303	my ($pl, $name, $params) = @_;	1384	my ($pl, $name, $params) = @_;
1304		1385
1305	my $cb = $COMMAND{$name}	1386	my $cb = $COMMAND{$name}
1306	or return;	1387	or return;
1307		1388
…		…
1330		1411
1331	$pl->ext_reply ($reply, @reply)	1412	$pl->ext_reply ($reply, @reply)
1332	if $reply;	1413	if $reply;
1333		1414
1334	} else {	1415	} else {
1335	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1416	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1336	}	1417	}
1337		1418
1338	cf::override;	1419	cf::override;
1339	},	1420	},
1340	);	1421	);
1341		1422
1342	# "readahead" all extensions	1423	# "readahead" all extensions
1343	sub cache_extensions {	1424	sub cache_extensions {
1344	my $grp = IO::AIO::aio_group;	1425	my $grp = IO::AIO::aio_group;
1345		1426
1346	add $grp IO::AIO::aio_readdir $LIBDIR, sub {	1427	add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1347	for (grep /\.ext$/, @{$_[0]}) {	1428	for (grep /\.ext$/, @{$_[0]}) {
1348	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;	1429	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1349	}	1430	}
1350	};	1431	};
1351		1432
1352	$grp	1433	$grp
1353	}	1434	}
1354		1435
1355	sub load_extensions {	1436	sub load_extensions {
		1437	info "loading extensions...";
		1438
1356	cf::sync_job {	1439	cf::sync_job {
1357	my %todo;	1440	my %todo;
1358		1441
1359	for my $path (<$LIBDIR/*.ext>) {	1442	for my $path (<$LIBDIR/*.ext>) {
1360	next unless -r $path;	1443	next unless -r $path;
…		…
1378		1461
1379	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1462	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1380	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1463	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1381		1464
1382	$ext{source} =	1465	$ext{source} =
1383	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1466	"package $pkg; use common::sense;\n"
1384	. "#line 1 \"$path\"\n{\n"	1467	. "#line 1 \"$path\"\n{\n"
1385	. $source	1468	. $source
1386	. "\n};\n1";	1469	. "\n};\n1";
1387		1470
1388	$todo{$base} = \%ext;	1471	$todo{$base} = \%ext;
1389	}	1472	}
1390		1473
		1474	my $pass = 0;
1391	my %done;	1475	my %done;
1392	while (%todo) {	1476	while (%todo) {
1393	my $progress;	1477	my $progress;
1394		1478
		1479	++$pass;
		1480
		1481	ext:
1395	while (my ($k, $v) = each %todo) {	1482	while (my ($k, $v) = each %todo) {
1396	for (split /,\s*/, $v->{meta}{depends}) {	1483	for (split /,\s*/, $v->{meta}{depends}) {
1397	goto skip	1484	next ext
1398	unless exists $done{$_};	1485	unless exists $done{$_};
1399	}	1486	}
1400		1487
1401	warn "... loading '$k' into '$v->{pkg}'\n";	1488	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1402		1489
1403	unless (eval $v->{source}) {	1490	my $active = eval $v->{source};
		1491
		1492	if (length $@) {
1404	my $msg = $@ ? "$v->{path}: $@\n"	1493	error "$v->{path}: $@\n";
1405	: "$v->{base}: extension inactive.\n";
1406		1494
1407	if (exists $v->{meta}{mandatory}) {
1408	warn $msg;
1409	cf::cleanup "mandatory extension failed to load, exiting.";	1495	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1410	}	1496	if exists $v->{meta}{mandatory};
1411		1497
1412	warn $msg;	1498	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1499	delete $todo{$k};
		1500	} else {
		1501	$done{$k} = delete $todo{$k};
		1502	push @EXTS, $v->{pkg};
		1503	$progress = 1;
		1504
		1505	info "$v->{base}: extension inactive.\n"
		1506	unless $active;
1413	}	1507	}
1414
1415	$done{$k} = delete $todo{$k};
1416	push @EXTS, $v->{pkg};
1417	$progress = 1;
1418	}	1508	}
1419		1509
1420	skip:	1510	unless ($progress) {
1421	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1511	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1422	unless $progress;	1512
		1513	while (my ($k, $v) = each %todo) {
		1514	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
		1515	if exists $v->{meta}{mandatory};
		1516	}
		1517	}
1423	}	1518	}
1424	};	1519	};
1425	}	1520	}
1426		1521
1427	#############################################################################	1522	#############################################################################
…		…
1511	$cf::PLAYER{$login} = $pl	1606	$cf::PLAYER{$login} = $pl
1512	}	1607	}
1513	}	1608	}
1514	}	1609	}
1515		1610
		1611	cf::player->attach (
		1612	on_load => sub {
		1613	my ($pl, $path) = @_;
		1614
		1615	# restore slots saved in save, below
		1616	my $slots = delete $pl->{_slots};
		1617
		1618	$pl->ob->current_weapon ($slots->[0]);
		1619	$pl->combat_ob ($slots->[1]);
		1620	$pl->ranged_ob ($slots->[2]);
		1621	},
		1622	);
		1623
1516	sub save($) {	1624	sub save($) {
1517	my ($pl) = @_;	1625	my ($pl) = @_;
1518		1626
1519	return if $pl->{deny_save};	1627	return if $pl->{deny_save};
1520		1628
…		…
1525		1633
1526	aio_mkdir playerdir $pl, 0770;	1634	aio_mkdir playerdir $pl, 0770;
1527	$pl->{last_save} = $cf::RUNTIME;	1635	$pl->{last_save} = $cf::RUNTIME;
1528		1636
1529	cf::get_slot 0.01;	1637	cf::get_slot 0.01;
		1638
		1639	# save slots, to be restored later
		1640	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1530		1641
1531	$pl->save_pl ($path);	1642	$pl->save_pl ($path);
1532	cf::cede_to_tick;	1643	cf::cede_to_tick;
1533	}	1644	}
1534		1645
…		…
1568	my $name = $pl->ob->name;	1679	my $name = $pl->ob->name;
1569		1680
1570	$pl->{deny_save} = 1;	1681	$pl->{deny_save} = 1;
1571	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1682	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1572		1683
1573	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1684	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1574	$pl->deactivate;	1685	$pl->deactivate;
		1686
1575	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1687	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1576	$pl->ob->check_score;
1577	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1688	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1689	ext::highscore::check ($pl->ob);
		1690
1578	$pl->ns->destroy if $pl->ns;	1691	$pl->ns->destroy if $pl->ns;
1579		1692
1580	my $path = playerdir $pl;	1693	my $path = playerdir $pl;
1581	my $temp = "$path~$cf::RUNTIME~deleting~";	1694	my $temp = "$path~$cf::RUNTIME~deleting~";
1582	aio_rename $path, $temp;	1695	aio_rename $path, $temp;
…		…
1636	\@logins	1749	\@logins
1637	}	1750	}
1638		1751
1639	=item $player->maps	1752	=item $player->maps
1640		1753
		1754	=item cf::player::maps $login
		1755
1641	Returns an arrayref of map paths that are private for this	1756	Returns an arrayref of map paths that are private for this
1642	player. May block.	1757	player. May block.
1643		1758
1644	=cut	1759	=cut
1645		1760
…		…
1707	=cut	1822	=cut
1708		1823
1709	sub find_by_path($) {	1824	sub find_by_path($) {
1710	my ($path) = @_;	1825	my ($path) = @_;
1711		1826
		1827	$path =~ s/^~[^\/]*//; # skip ~login
		1828
1712	my ($match, $specificity);	1829	my ($match, $specificity);
1713		1830
1714	for my $region (list) {	1831	for my $region (list) {
1715	if ($region->{match} && $path =~ $region->{match}) {	1832	if ($region->{match} && $path =~ $region->{match}) {
1716	($match, $specificity) = ($region, $region->specificity)	1833	($match, $specificity) = ($region, $region->specificity)
…		…
1747	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1864	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1748		1865
1749	# mit "rum" bekleckern, nicht	1866	# mit "rum" bekleckern, nicht
1750	$self->_create_random_map (	1867	$self->_create_random_map (
1751	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1868	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1752	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1869	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1753	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1870	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1754	$rmp->{exit_on_final_map},	1871	$rmp->{exit_on_final_map},
1755	$rmp->{xsize}, $rmp->{ysize},	1872	$rmp->{xsize}, $rmp->{ysize},
1756	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},	1873	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1757	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},	1874	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
…		…
1772		1889
1773	sub register {	1890	sub register {
1774	my (undef, $regex, $prio) = @_;	1891	my (undef, $regex, $prio) = @_;
1775	my $pkg = caller;	1892	my $pkg = caller;
1776		1893
1777	no strict;
1778	push @{"$pkg\::ISA"}, __PACKAGE__;	1894	push @{"$pkg\::ISA"}, __PACKAGE__;
1779		1895
1780	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1896	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1781	}	1897	}
1782		1898
1783	# also paths starting with '/'	1899	# also paths starting with '/'
1784	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1900	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1785		1901
1786	sub thawer_merge {	1902	sub thawer_merge {
1787	my ($self, $merge) = @_;	1903	my ($self, $merge) = @_;
1788		1904
1789	# we have to keep some variables in memory intact	1905	# we have to keep some variables in memory intact
…		…
1794	}	1910	}
1795		1911
1796	sub normalise {	1912	sub normalise {
1797	my ($path, $base) = @_;	1913	my ($path, $base) = @_;
1798		1914
1799	$path = "$path"; # make sure its a string	1915	$path = "$path"; # make sure it's a string
1800		1916
1801	$path =~ s/\.map$//;	1917	$path =~ s/\.map$//;
1802		1918
1803	# map plan:	1919	# map plan:
1804	#	1920	#
…		…
1819	$base =~ s{[^/]+/?$}{};	1935	$base =~ s{[^/]+/?$}{};
1820	$path = "$base/$path";	1936	$path = "$base/$path";
1821	}	1937	}
1822		1938
1823	for ($path) {	1939	for ($path) {
1824	redo if s{//}{/};
1825	redo if s{/\.?/}{/};	1940	redo if s{/\.?/}{/};
1826	redo if s{/[^/]+/\.\./}{/};	1941	redo if s{/[^/]+/\.\./}{/};
1827	}	1942	}
1828		1943
1829	$path	1944	$path
…		…
1843	$self->init; # pass $1 etc.	1958	$self->init; # pass $1 etc.
1844	return $self;	1959	return $self;
1845	}	1960	}
1846	}	1961	}
1847		1962
1848	Carp::cluck "unable to resolve path '$path' (base '$base').";	1963	Carp::cluck "unable to resolve path '$path' (base '$base')";
1849	()	1964	()
1850	}	1965	}
1851		1966
1852	sub init {	1967	sub init {
1853	my ($self) = @_;	1968	my ($self) = @_;
…		…
1885	sub uniq_path {	2000	sub uniq_path {
1886	my ($self) = @_;	2001	my ($self) = @_;
1887		2002
1888	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;	2003	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1889	"$UNIQUEDIR/$path"	2004	"$UNIQUEDIR/$path"
1890	}
1891
1892	# and all this just because we cannot iterate over
1893	# all maps in C++...
1894	sub change_all_map_light {
1895	my ($change) = @_;
1896
1897	$_->change_map_light ($change)
1898	for grep $_->outdoor, values %cf::MAP;
1899	}	2005	}
1900		2006
1901	sub decay_objects {	2007	sub decay_objects {
1902	my ($self) = @_;	2008	my ($self) = @_;
1903		2009
…		…
1985		2091
1986	sub find;	2092	sub find;
1987	sub find {	2093	sub find {
1988	my ($path, $origin) = @_;	2094	my ($path, $origin) = @_;
1989		2095
		2096	cf::cede_to_tick;
		2097
1990	$path = normalise $path, $origin && $origin->path;	2098	$path = normalise $path, $origin && $origin->path;
1991		2099
1992	cf::lock_wait "map_data:$path";#d#remove	2100	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1993	cf::lock_wait "map_find:$path";	2101	my $guard2 = cf::lock_acquire "map_find:$path";
1994		2102
1995	$cf::MAP{$path} || do {	2103	$cf::MAP{$path} || do {
1996	my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1997	my $guard2 = cf::lock_acquire "map_find:$path";
1998
1999	my $map = new_from_path cf::map $path	2104	my $map = new_from_path cf::map $path
2000	or return;	2105	or return;
2001		2106
2002	$map->{last_save} = $cf::RUNTIME;	2107	$map->{last_save} = $cf::RUNTIME;
2003		2108
…		…
2015		2120
2016	$cf::MAP{$path} = $map	2121	$cf::MAP{$path} = $map
2017	}	2122	}
2018	}	2123	}
2019		2124
2020	sub pre_load { }	2125	sub pre_load { }
2021	sub post_load { }	2126	#sub post_load { } # XS
2022		2127
2023	sub load {	2128	sub load {
2024	my ($self) = @_;	2129	my ($self) = @_;
2025		2130
2026	local $self->{deny_reset} = 1; # loading can take a long time	2131	local $self->{deny_reset} = 1; # loading can take a long time
…		…
2071	unless ($self->{deny_activate}) {	2176	unless ($self->{deny_activate}) {
2072	$self->decay_objects;	2177	$self->decay_objects;
2073	$self->fix_auto_apply;	2178	$self->fix_auto_apply;
2074	$self->update_buttons;	2179	$self->update_buttons;
2075	cf::cede_to_tick;	2180	cf::cede_to_tick;
2076	$self->set_darkness_map;
2077	cf::cede_to_tick;
2078	$self->activate;	2181	$self->activate;
2079	}	2182	}
2080		2183
2081	$self->{last_save} = $cf::RUNTIME;	2184	$self->{last_save} = $cf::RUNTIME;
2082	$self->last_access ($cf::RUNTIME);	2185	$self->last_access ($cf::RUNTIME);
…		…
2085	}	2188	}
2086		2189
2087	$self->post_load;	2190	$self->post_load;
2088	}	2191	}
2089		2192
		2193	# customize the map for a given player, i.e.
		2194	# return the _real_ map. used by e.g. per-player
		2195	# maps to change the path to ~playername/mappath
2090	sub customise_for {	2196	sub customise_for {
2091	my ($self, $ob) = @_;	2197	my ($self, $ob) = @_;
2092		2198
2093	return find "~" . $ob->name . "/" . $self->{path}	2199	return find "~" . $ob->name . "/" . $self->{path}
2094	if $self->per_player;	2200	if $self->per_player;
…		…
2110	or next;	2216	or next;
2111	$neigh = find $neigh, $map	2217	$neigh = find $neigh, $map
2112	or next;	2218	or next;
2113	$neigh->load;	2219	$neigh->load;
2114		2220
		2221	# now find the diagonal neighbours
2115	push @neigh,	2222	push @neigh,
2116	[$neigh->tile_path (($_ + 3) % 4), $neigh],	2223	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2117	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2224	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2118	}	2225	}
2119		2226
…		…
2126	}	2233	}
2127		2234
2128	sub find_sync {	2235	sub find_sync {
2129	my ($path, $origin) = @_;	2236	my ($path, $origin) = @_;
2130		2237
2131	cf::sync_job { find $path, $origin }	2238	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2239	if $Coro::current == $Coro::main;
		2240
		2241	find $path, $origin
2132	}	2242	}
2133		2243
2134	sub do_load_sync {	2244	sub do_load_sync {
2135	my ($map) = @_;	2245	my ($map) = @_;
2136		2246
2137	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2247	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2138	if $Coro::current == $Coro::main;	2248	if $Coro::current == $Coro::main;
2139		2249
2140	cf::sync_job { $map->load };	2250	$map->load;
2141	}	2251	}
2142		2252
2143	our %MAP_PREFETCH;	2253	our %MAP_PREFETCH;
2144	our $MAP_PREFETCHER = undef;	2254	our $MAP_PREFETCHER = undef;
2145		2255
…		…
2171	$MAP_PREFETCHER->prio (6);	2281	$MAP_PREFETCHER->prio (6);
2172		2282
2173	()	2283	()
2174	}	2284	}
2175		2285
		2286	# common code, used by both ->save and ->swapout
2176	sub save {	2287	sub _save {
2177	my ($self) = @_;	2288	my ($self) = @_;
2178
2179	my $lock = cf::lock_acquire "map_data:$self->{path}";
2180		2289
2181	$self->{last_save} = $cf::RUNTIME;	2290	$self->{last_save} = $cf::RUNTIME;
2182		2291
2183	return unless $self->dirty;	2292	return unless $self->dirty;
2184		2293
…		…
2204	} else {	2313	} else {
2205	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2314	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2206	}	2315	}
2207	}	2316	}
2208		2317
		2318	sub save {
		2319	my ($self) = @_;
		2320
		2321	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2322
		2323	$self->_save;
		2324	}
		2325
2209	sub swap_out {	2326	sub swap_out {
2210	my ($self) = @_;	2327	my ($self) = @_;
2211		2328
2212	# save first because save cedes
2213	$self->save;
2214
2215	my $lock = cf::lock_acquire "map_data:$self->{path}";	2329	my $lock = cf::lock_acquire "map_data:$self->{path}";
2216		2330
2217	return if $self->players;
2218	return if $self->in_memory != cf::MAP_ACTIVE;	2331	return if $self->in_memory != cf::MAP_ACTIVE;
2219	return if $self->{deny_save};	2332	return if $self->{deny_save};
		2333	return if $self->players;
2220		2334
		2335	# first deactivate the map and "unlink" it from the core
		2336	$self->deactivate;
		2337	$_->clear_links_to ($self) for values %cf::MAP;
2221	$self->in_memory (cf::MAP_SWAPPED);	2338	$self->in_memory (cf::MAP_SWAPPED);
		2339
		2340	# then atomically save
		2341	$self->_save;
		2342
		2343	# then free the map
		2344	$self->clear;
		2345	}
		2346
		2347	sub reset_at {
		2348	my ($self) = @_;
		2349
		2350	# TODO: safety, remove and allow resettable per-player maps
		2351	return 1e99 if $self->{deny_reset};
		2352
		2353	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2354	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2355
		2356	$time + $to
		2357	}
		2358
		2359	sub should_reset {
		2360	my ($self) = @_;
		2361
		2362	$self->reset_at <= $cf::RUNTIME
		2363	}
		2364
		2365	sub reset {
		2366	my ($self) = @_;
		2367
		2368	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2369
		2370	return if $self->players;
		2371
		2372	cf::trace "resetting map ", $self->path, "\n";
		2373
		2374	$self->in_memory (cf::MAP_SWAPPED);
		2375
		2376	# need to save uniques path
		2377	unless ($self->{deny_save}) {
		2378	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2379
		2380	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2381	if $uniq;
		2382	}
		2383
		2384	delete $cf::MAP{$self->path};
2222		2385
2223	$self->deactivate;	2386	$self->deactivate;
2224	$_->clear_links_to ($self) for values %cf::MAP;	2387	$_->clear_links_to ($self) for values %cf::MAP;
2225	$self->clear;	2388	$self->clear;
2226	}
2227
2228	sub reset_at {
2229	my ($self) = @_;
2230
2231	# TODO: safety, remove and allow resettable per-player maps
2232	return 1e99 if $self->{deny_reset};
2233
2234	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2235	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2236
2237	$time + $to
2238	}
2239
2240	sub should_reset {
2241	my ($self) = @_;
2242
2243	$self->reset_at <= $cf::RUNTIME
2244	}
2245
2246	sub reset {
2247	my ($self) = @_;
2248
2249	my $lock = cf::lock_acquire "map_data:$self->{path}";
2250
2251	return if $self->players;
2252
2253	warn "resetting map ", $self->path;
2254
2255	$self->in_memory (cf::MAP_SWAPPED);
2256
2257	# need to save uniques path
2258	unless ($self->{deny_save}) {
2259	my $uniq = $self->uniq_path; utf8::encode $uniq;
2260
2261	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2262	if $uniq;
2263	}
2264
2265	delete $cf::MAP{$self->path};
2266
2267	$self->deactivate;
2268	$_->clear_links_to ($self) for values %cf::MAP;
2269	$self->clear;
2270		2389
2271	$self->unlink_save;	2390	$self->unlink_save;
2272	$self->destroy;	2391	$self->destroy;
2273	}	2392	}
2274		2393
…		…
2282		2401
2283	delete $cf::MAP{$self->path};	2402	delete $cf::MAP{$self->path};
2284		2403
2285	$self->unlink_save;	2404	$self->unlink_save;
2286		2405
2287	bless $self, "cf::map";	2406	bless $self, "cf::map::wrap";
2288	delete $self->{deny_reset};	2407	delete $self->{deny_reset};
2289	$self->{deny_save} = 1;	2408	$self->{deny_save} = 1;
2290	$self->reset_timeout (1);	2409	$self->reset_timeout (1);
2291	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2410	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2292		2411
…		…
2349	: normalise $_	2468	: normalise $_
2350	} @{ aio_readdir $UNIQUEDIR or [] }	2469	} @{ aio_readdir $UNIQUEDIR or [] }
2351	]	2470	]
2352	}	2471	}
2353		2472
		2473	=item cf::map::static_maps
		2474
		2475	Returns an arrayref if paths of all static maps (all preinstalled F<.map>
		2476	file in the shared directory excluding F</styles> and F</editor>). May
		2477	block.
		2478
		2479	=cut
		2480
		2481	sub static_maps() {
		2482	my @dirs = "";
		2483	my @maps;
		2484
		2485	while (@dirs) {
		2486	my $dir = shift @dirs;
		2487
		2488	next if $dir eq "/styles" || $dir eq "/editor";
		2489
		2490	my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
		2491	or return;
		2492
		2493	for (@$files) {
		2494	s/\.map$// or next;
		2495	utf8::decode $_;
		2496	push @maps, "$dir/$_";
		2497	}
		2498
		2499	push @dirs, map "$dir/$_", @$dirs;
		2500	}
		2501
		2502	\@maps
		2503	}
		2504
2354	=back	2505	=back
2355		2506
2356	=head3 cf::object	2507	=head3 cf::object
2357		2508
2358	=cut	2509	=cut
…		…
2423		2574
2424	our $SAY_CHANNEL = {	2575	our $SAY_CHANNEL = {
2425	id => "say",	2576	id => "say",
2426	title => "Map",	2577	title => "Map",
2427	reply => "say ",	2578	reply => "say ",
2428	tooltip => "Things said to and replied from npcs near you and other players on the same map only.",	2579	tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2429	};	2580	};
2430		2581
2431	our $CHAT_CHANNEL = {	2582	our $CHAT_CHANNEL = {
2432	id => "chat",	2583	id => "chat",
2433	title => "Chat",	2584	title => "Chat",
…		…
2490		2641
2491	Freezes the player and moves him/her to a special map (C<{link}>).	2642	Freezes the player and moves him/her to a special map (C<{link}>).
2492		2643
2493	The player should be reasonably safe there for short amounts of time (e.g.	2644	The player should be reasonably safe there for short amounts of time (e.g.
2494	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2645	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2495	though, as the palyer cannot control the character while it is on the link	2646	though, as the player cannot control the character while it is on the link
2496	map.	2647	map.
2497		2648
2498	Will never block.	2649	Will never block.
2499		2650
2500	=item $player_object->leave_link ($map, $x, $y)	2651	=item $player_object->leave_link ($map, $x, $y)
…		…
2521	sub cf::object::player::enter_link {	2672	sub cf::object::player::enter_link {
2522	my ($self) = @_;	2673	my ($self) = @_;
2523		2674
2524	$self->deactivate_recursive;	2675	$self->deactivate_recursive;
2525		2676
		2677	++$self->{_link_recursion};
		2678
2526	return if UNIVERSAL::isa $self->map, "ext::map_link";	2679	return if UNIVERSAL::isa $self->map, "ext::map_link";
2527		2680
2528	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2681	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2529	if $self->map && $self->map->{path} ne "{link}";	2682	if $self->map && $self->map->{path} ne "{link}";
2530		2683
2531	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2684	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2532	}	2685	}
2533		2686
2534	sub cf::object::player::leave_link {	2687	sub cf::object::player::leave_link {
2535	my ($self, $map, $x, $y) = @_;	2688	my ($self, $map, $x, $y) = @_;
2536		2689
…		…
2553	($x, $y) = (-1, -1)	2706	($x, $y) = (-1, -1)
2554	unless (defined $x) && (defined $y);	2707	unless (defined $x) && (defined $y);
2555		2708
2556	# use -1 or undef as default coordinates, not 0, 0	2709	# use -1 or undef as default coordinates, not 0, 0
2557	($x, $y) = ($map->enter_x, $map->enter_y)	2710	($x, $y) = ($map->enter_x, $map->enter_y)
2558	if $x <=0 && $y <= 0;	2711	if $x <= 0 && $y <= 0;
2559		2712
2560	$map->load;	2713	$map->load;
2561	$map->load_neighbours;	2714	$map->load_neighbours;
2562		2715
2563	return unless $self->contr->active;	2716	return unless $self->contr->active;
2564	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2565	$self->activate_recursive;
2566		2717
2567	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2718	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2568	$self->enter_map ($map, $x, $y);	2719	if ($self->enter_map ($map, $x, $y)) {
2569	}	2720	# entering was successful
		2721	delete $self->{_link_recursion};
		2722	# only activate afterwards, to support waiting in hooks
		2723	$self->activate_recursive;
		2724	}
2570		2725
		2726	}
		2727
2571	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2728	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2572		2729
2573	Moves the player to the given map-path and coordinates by first freezing	2730	Moves the player to the given map-path and coordinates by first freezing
2574	her, loading and preparing them map, calling the provided $check callback	2731	her, loading and preparing them map, calling the provided $check callback
2575	that has to return the map if sucecssful, and then unfreezes the player on	2732	that has to return the map if sucecssful, and then unfreezes the player on
2576	the new (success) or old (failed) map position. In either case, $done will	2733	the new (success) or old (failed) map position. In either case, $done will
…		…
2583		2740
2584	our $GOTOGEN;	2741	our $GOTOGEN;
2585		2742
2586	sub cf::object::player::goto {	2743	sub cf::object::player::goto {
2587	my ($self, $path, $x, $y, $check, $done) = @_;	2744	my ($self, $path, $x, $y, $check, $done) = @_;
		2745
		2746	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2747	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2748	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2749	($path, $x, $y) = @$EMERGENCY_POSITION;
		2750	}
2588		2751
2589	# do generation counting so two concurrent goto's will be executed in-order	2752	# do generation counting so two concurrent goto's will be executed in-order
2590	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2753	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2591		2754
2592	$self->enter_link;	2755	$self->enter_link;
…		…
2616	my $map = eval {	2779	my $map = eval {
2617	my $map = defined $path ? cf::map::find $path : undef;	2780	my $map = defined $path ? cf::map::find $path : undef;
2618		2781
2619	if ($map) {	2782	if ($map) {
2620	$map = $map->customise_for ($self);	2783	$map = $map->customise_for ($self);
2621	$map = $check->($map) if $check && $map;	2784	$map = $check->($map, $x, $y, $self) if $check && $map;
2622	} else {	2785	} else {
2623	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2786	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2624	}	2787	}
2625		2788
2626	$map	2789	$map
…		…
2634	if ($gen == $self->{_goto_generation}) {	2797	if ($gen == $self->{_goto_generation}) {
2635	delete $self->{_goto_generation};	2798	delete $self->{_goto_generation};
2636	$self->leave_link ($map, $x, $y);	2799	$self->leave_link ($map, $x, $y);
2637	}	2800	}
2638		2801
2639	$done->() if $done;	2802	$done->($self) if $done;
2640	})->prio (1);	2803	})->prio (1);
2641	}	2804	}
2642		2805
2643	=item $player_object->enter_exit ($exit_object)	2806	=item $player_object->enter_exit ($exit_object)
2644		2807
…		…
2737	$self->message ("Something went wrong deep within the deliantra server. "	2900	$self->message ("Something went wrong deep within the deliantra server. "
2738	. "I'll try to bring you back to the map you were before. "	2901	. "I'll try to bring you back to the map you were before. "
2739	. "Please report this to the dungeon master!",	2902	. "Please report this to the dungeon master!",
2740	cf::NDI_UNIQUE | cf::NDI_RED);	2903	cf::NDI_UNIQUE | cf::NDI_RED);
2741		2904
2742	warn "ERROR in enter_exit: $@";	2905	error "ERROR in enter_exit: $@";
2743	$self->leave_link;	2906	$self->leave_link;
2744	}	2907	}
2745	})->prio (1);	2908	})->prio (1);
2746	}	2909	}
2747		2910
…		…
2759	sub cf::client::send_drawinfo {	2922	sub cf::client::send_drawinfo {
2760	my ($self, $text, $flags) = @_;	2923	my ($self, $text, $flags) = @_;
2761		2924
2762	utf8::encode $text;	2925	utf8::encode $text;
2763	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2926	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
		2927	}
		2928
		2929	=item $client->send_big_packet ($pkt)
		2930
		2931	Like C<send_packet>, but tries to compress large packets, and fragments
		2932	them as required.
		2933
		2934	=cut
		2935
		2936	our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
		2937
		2938	sub cf::client::send_big_packet {
		2939	my ($self, $pkt) = @_;
		2940
		2941	# try lzf for large packets
		2942	$pkt = "lzf " . Compress::LZF::compress $pkt
		2943	if 1024 <= length $pkt and $self->{can_lzf};
		2944
		2945	# split very large packets
		2946	if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
		2947	$self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
		2948	$pkt = "frag";
		2949	}
		2950
		2951	$self->send_packet ($pkt);
2764	}	2952	}
2765		2953
2766	=item $client->send_msg ($channel, $msg, $color, [extra...])	2954	=item $client->send_msg ($channel, $msg, $color, [extra...])
2767		2955
2768	Send a drawinfo or msg packet to the client, formatting the msg for the	2956	Send a drawinfo or msg packet to the client, formatting the msg for the
…		…
2772		2960
2773	=cut	2961	=cut
2774		2962
2775	# non-persistent channels (usually the info channel)	2963	# non-persistent channels (usually the info channel)
2776	our %CHANNEL = (	2964	our %CHANNEL = (
		2965	"c/motd" => {
		2966	id => "infobox",
		2967	title => "MOTD",
		2968	reply => undef,
		2969	tooltip => "The message of the day",
		2970	},
2777	"c/identify" => {	2971	"c/identify" => {
2778	id => "infobox",	2972	id => "infobox",
2779	title => "Identify",	2973	title => "Identify",
2780	reply => undef,	2974	reply => undef,
2781	tooltip => "Items recently identified",	2975	tooltip => "Items recently identified",
…		…
2783	"c/examine" => {	2977	"c/examine" => {
2784	id => "infobox",	2978	id => "infobox",
2785	title => "Examine",	2979	title => "Examine",
2786	reply => undef,	2980	reply => undef,
2787	tooltip => "Signs and other items you examined",	2981	tooltip => "Signs and other items you examined",
		2982	},
		2983	"c/shopinfo" => {
		2984	id => "infobox",
		2985	title => "Shop Info",
		2986	reply => undef,
		2987	tooltip => "What your bargaining skill tells you about the shop",
2788	},	2988	},
2789	"c/book" => {	2989	"c/book" => {
2790	id => "infobox",	2990	id => "infobox",
2791	title => "Book",	2991	title => "Book",
2792	reply => undef,	2992	reply => undef,
…		…
2808	id => "infobox",	3008	id => "infobox",
2809	title => "Body Parts",	3009	title => "Body Parts",
2810	reply => undef,	3010	reply => undef,
2811	tooltip => "Shows which body parts you posess and are available",	3011	tooltip => "Shows which body parts you posess and are available",
2812	},	3012	},
		3013	"c/statistics" => {
		3014	id => "infobox",
		3015	title => "Statistics",
		3016	reply => undef,
		3017	tooltip => "Shows your primary statistics",
		3018	},
2813	"c/skills" => {	3019	"c/skills" => {
2814	id => "infobox",	3020	id => "infobox",
2815	title => "Skills",	3021	title => "Skills",
2816	reply => undef,	3022	reply => undef,
2817	tooltip => "Shows your experience per skill and item power",	3023	tooltip => "Shows your experience per skill and item power",
		3024	},
		3025	"c/shopitems" => {
		3026	id => "infobox",
		3027	title => "Shop Items",
		3028	reply => undef,
		3029	tooltip => "Shows the items currently for sale in this shop",
		3030	},
		3031	"c/resistances" => {
		3032	id => "infobox",
		3033	title => "Resistances",
		3034	reply => undef,
		3035	tooltip => "Shows your resistances",
		3036	},
		3037	"c/pets" => {
		3038	id => "infobox",
		3039	title => "Pets",
		3040	reply => undef,
		3041	tooltip => "Shows information abotu your pets/a specific pet",
		3042	},
		3043	"c/perceiveself" => {
		3044	id => "infobox",
		3045	title => "Perceive Self",
		3046	reply => undef,
		3047	tooltip => "You gained detailed knowledge about yourself",
2818	},	3048	},
2819	"c/uptime" => {	3049	"c/uptime" => {
2820	id => "infobox",	3050	id => "infobox",
2821	title => "Uptime",	3051	title => "Uptime",
2822	reply => undef,	3052	reply => undef,
…		…
2832	id => "party",	3062	id => "party",
2833	title => "Party",	3063	title => "Party",
2834	reply => "gsay ",	3064	reply => "gsay ",
2835	tooltip => "Messages and chat related to your party",	3065	tooltip => "Messages and chat related to your party",
2836	},	3066	},
		3067	"c/death" => {
		3068	id => "death",
		3069	title => "Death",
		3070	reply => undef,
		3071	tooltip => "Reason for and more info about your most recent death",
		3072	},
		3073	"c/say" => $SAY_CHANNEL,
		3074	"c/chat" => $CHAT_CHANNEL,
2837	);	3075	);
2838		3076
2839	sub cf::client::send_msg {	3077	sub cf::client::send_msg {
2840	my ($self, $channel, $msg, $color, @extra) = @_;	3078	my ($self, $channel, $msg, $color, @extra) = @_;
2841		3079
…		…
2846		3084
2847	# check predefined channels, for the benefit of C	3085	# check predefined channels, for the benefit of C
2848	if ($CHANNEL{$channel}) {	3086	if ($CHANNEL{$channel}) {
2849	$channel = $CHANNEL{$channel};	3087	$channel = $CHANNEL{$channel};
2850		3088
2851	$self->ext_msg (channel_info => $channel)	3089	$self->ext_msg (channel_info => $channel);
2852	if $self->can_msg;
2853
2854	$channel = $channel->{id};	3090	$channel = $channel->{id};
2855		3091
2856	} elsif (ref $channel) {	3092	} elsif (ref $channel) {
2857	# send meta info to client, if not yet sent	3093	# send meta info to client, if not yet sent
2858	unless (exists $self->{channel}{$channel->{id}}) {	3094	unless (exists $self->{channel}{$channel->{id}}) {
2859	$self->{channel}{$channel->{id}} = $channel;	3095	$self->{channel}{$channel->{id}} = $channel;
2860	$self->ext_msg (channel_info => $channel)	3096	$self->ext_msg (channel_info => $channel);
2861	if $self->can_msg;
2862	}	3097	}
2863		3098
2864	$channel = $channel->{id};	3099	$channel = $channel->{id};
2865	}	3100	}
2866		3101
2867	return unless @extra || length $msg;	3102	return unless @extra || length $msg;
2868		3103
2869	if ($self->can_msg) {
2870	# default colour, mask it out	3104	# default colour, mask it out
2871	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)	3105	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2872	if $color & cf::NDI_DEF;	3106	if $color & cf::NDI_DEF;
2873		3107
2874	my $pkt = "msg "	3108	my $pkt = "msg "
2875	. $self->{json_coder}->encode (	3109	. $self->{json_coder}->encode (
2876	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	3110	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2877	);	3111	);
2878		3112
2879	# try lzf for large packets
2880	$pkt = "lzf " . Compress::LZF::compress $pkt
2881	if 1024 <= length $pkt and $self->{can_lzf};
2882
2883	# split very large packets
2884	if (8192 < length $pkt and $self->{can_lzf}) {
2885	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2886	$pkt = "frag";
2887	}
2888
2889	$self->send_packet ($pkt);	3113	$self->send_big_packet ($pkt);
2890	} else {
2891	if ($color >= 0) {
2892	# replace some tags by gcfclient-compatible ones
2893	for ($msg) {
2894	1 while
2895	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2896	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2897	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2898	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2899	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2900	}
2901
2902	$color &= cf::NDI_COLOR_MASK;
2903
2904	utf8::encode $msg;
2905
2906	if (0 && $msg =~ /\[/) {
2907	# COMMAND/INFO
2908	$self->send_packet ("drawextinfo $color 10 8 $msg")
2909	} else {
2910	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2911	$self->send_packet ("drawinfo $color $msg")
2912	}
2913	}
2914	}
2915	}	3114	}
2916		3115
2917	=item $client->ext_msg ($type, @msg)	3116	=item $client->ext_msg ($type, @msg)
2918		3117
2919	Sends an ext event to the client.	3118	Sends an ext event to the client.
…		…
2922		3121
2923	sub cf::client::ext_msg($$@) {	3122	sub cf::client::ext_msg($$@) {
2924	my ($self, $type, @msg) = @_;	3123	my ($self, $type, @msg) = @_;
2925		3124
2926	if ($self->extcmd == 2) {	3125	if ($self->extcmd == 2) {
2927	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3126	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2928	} elsif ($self->extcmd == 1) { # TODO: remove	3127	} elsif ($self->extcmd == 1) { # TODO: remove
2929	push @msg, msgtype => "event_$type";	3128	push @msg, msgtype => "event_$type";
2930	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3129	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2931	}	3130	}
2932	}	3131	}
2933		3132
2934	=item $client->ext_reply ($msgid, @msg)	3133	=item $client->ext_reply ($msgid, @msg)
2935		3134
…		…
2939		3138
2940	sub cf::client::ext_reply($$@) {	3139	sub cf::client::ext_reply($$@) {
2941	my ($self, $id, @msg) = @_;	3140	my ($self, $id, @msg) = @_;
2942		3141
2943	if ($self->extcmd == 2) {	3142	if ($self->extcmd == 2) {
2944	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3143	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2945	} elsif ($self->extcmd == 1) {	3144	} elsif ($self->extcmd == 1) {
2946	#TODO: version 1, remove	3145	#TODO: version 1, remove
2947	unshift @msg, msgtype => "reply", msgid => $id;	3146	unshift @msg, msgtype => "reply", msgid => $id;
2948	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3147	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2949	}	3148	}
2950	}	3149	}
2951		3150
2952	=item $success = $client->query ($flags, "text", \&cb)	3151	=item $success = $client->query ($flags, "text", \&cb)
2953		3152
…		…
3024		3223
3025	$ns->ext_reply ($reply, @reply)	3224	$ns->ext_reply ($reply, @reply)
3026	if $reply;	3225	if $reply;
3027		3226
3028	} else {	3227	} else {
3029	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3228	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3030	}	3229	}
3031		3230
3032	cf::override;	3231	cf::override;
3033	},	3232	},
3034	);	3233	);
…		…
3054		3253
3055	$coro	3254	$coro
3056	}	3255	}
3057		3256
3058	cf::client->attach (	3257	cf::client->attach (
3059	on_destroy => sub {	3258	on_client_destroy => sub {
3060	my ($ns) = @_;	3259	my ($ns) = @_;
3061		3260
3062	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3261	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3063	},	3262	},
3064	);	3263	);
…		…
3080	our $safe_hole = new Safe::Hole;	3279	our $safe_hole = new Safe::Hole;
3081		3280
3082	$SIG{FPE} = 'IGNORE';	3281	$SIG{FPE} = 'IGNORE';
3083		3282
3084	$safe->permit_only (Opcode::opset qw(	3283	$safe->permit_only (Opcode::opset qw(
3085	:base_core :base_mem :base_orig :base_math	3284	:base_core :base_mem :base_orig :base_math :base_loop
3086	grepstart grepwhile mapstart mapwhile	3285	grepstart grepwhile mapstart mapwhile
3087	sort time	3286	sort time
3088	));	3287	));
3089		3288
3090	# here we export the classes and methods available to script code	3289	# here we export the classes and methods available to script code
…		…
3094	The following functions and methods are available within a safe environment:	3293	The following functions and methods are available within a safe environment:
3095		3294
3096	cf::object	3295	cf::object
3097	contr pay_amount pay_player map x y force_find force_add destroy	3296	contr pay_amount pay_player map x y force_find force_add destroy
3098	insert remove name archname title slaying race decrease split	3297	insert remove name archname title slaying race decrease split
		3298	value
3099		3299
3100	cf::object::player	3300	cf::object::player
3101	player	3301	player
3102		3302
3103	cf::player	3303	cf::player
…		…
3109	=cut	3309	=cut
3110		3310
3111	for (	3311	for (
3112	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3312	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3113	insert remove inv nrof name archname title slaying race	3313	insert remove inv nrof name archname title slaying race
3114	decrease split destroy change_exp)],	3314	decrease split destroy change_exp value msg lore send_msg)],
3115	["cf::object::player" => qw(player)],	3315	["cf::object::player" => qw(player)],
3116	["cf::player" => qw(peaceful)],	3316	["cf::player" => qw(peaceful send_msg)],
3117	["cf::map" => qw(trigger)],	3317	["cf::map" => qw(trigger)],
3118	) {	3318	) {
3119	no strict 'refs';
3120	my ($pkg, @funs) = @$_;	3319	my ($pkg, @funs) = @$_;
3121	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3320	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3122	for @funs;	3321	for @funs;
3123	}	3322	}
3124		3323
…		…
3139		3338
3140	my $qcode = $code;	3339	my $qcode = $code;
3141	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3340	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3142	$qcode =~ s/\n/\\n/g;	3341	$qcode =~ s/\n/\\n/g;
3143		3342
		3343	%vars = (_dummy => 0) unless %vars;
		3344
		3345	my @res;
3144	local $_;	3346	local $_;
3145	local @safe::cf::_safe_eval_args = values %vars;
3146		3347
3147	my $eval =	3348	my $eval =
3148	"do {\n"	3349	"do {\n"
3149	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3350	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3150	. "#line 0 \"{$qcode}\"\n"	3351	. "#line 0 \"{$qcode}\"\n"
3151	. $code	3352	. $code
3152	. "\n}"	3353	. "\n}"
3153	;	3354	;
3154		3355
		3356	if ($CFG{safe_eval}) {
3155	sub_generation_inc;	3357	sub_generation_inc;
		3358	local @safe::cf::_safe_eval_args = values %vars;
3156	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3359	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3157	sub_generation_inc;	3360	sub_generation_inc;
		3361	} else {
		3362	local @cf::_safe_eval_args = values %vars;
		3363	@res = wantarray ? eval eval : scalar eval $eval;
		3364	}
3158		3365
3159	if ($@) {	3366	if ($@) {
3160	warn "$@";	3367	warn "$@",
3161	warn "while executing safe code '$code'\n";	3368	"while executing safe code '$code'\n",
3162	warn "with arguments " . (join " ", %vars) . "\n";	3369	"with arguments " . (join " ", %vars) . "\n";
3163	}	3370	}
3164		3371
3165	wantarray ? @res : $res[0]	3372	wantarray ? @res : $res[0]
3166	}	3373	}
3167		3374
…		…
3181	=cut	3388	=cut
3182		3389
3183	sub register_script_function {	3390	sub register_script_function {
3184	my ($fun, $cb) = @_;	3391	my ($fun, $cb) = @_;
3185		3392
3186	no strict 'refs';	3393	$fun = "safe::$fun" if $CFG{safe_eval};
3187	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3394	*$fun = $safe_hole->wrap ($cb);
3188	}	3395	}
3189		3396
3190	=back	3397	=back
3191		3398
3192	=cut	3399	=cut
…		…
3201	# for this (global event?)	3408	# for this (global event?)
3202	%ext::player_env::MUSIC_FACE_CACHE = ();	3409	%ext::player_env::MUSIC_FACE_CACHE = ();
3203		3410
3204	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3411	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3205		3412
3206	warn "loading facedata from $path\n";	3413	trace "loading facedata from $path\n";
3207		3414
3208	my $facedata;
3209	0 < aio_load $path, $facedata	3415	0 < aio_load $path, my $facedata
3210	or die "$path: $!";	3416	or die "$path: $!";
3211		3417
3212	$facedata = Coro::Storable::thaw $facedata;	3418	$facedata = Coro::Storable::thaw $facedata;
3213		3419
3214	$facedata->{version} == 2	3420	$facedata->{version} == 2
3215	or cf::cleanup "$path: version mismatch, cannot proceed.";	3421	or cf::cleanup "$path: version mismatch, cannot proceed.";
3216		3422
3217	# patch in the exptable	3423	# patch in the exptable
		3424	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3218	$facedata->{resource}{"res/exp_table"} = {	3425	$facedata->{resource}{"res/exp_table"} = {
3219	type => FT_RSRC,	3426	type => FT_RSRC,
3220	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),	3427	data => $exp_table,
		3428	hash => (Digest::MD5::md5 $exp_table),
3221	};	3429	};
3222	cf::cede_to_tick;	3430	cf::cede_to_tick;
3223		3431
3224	{	3432	{
3225	my $faces = $facedata->{faceinfo};	3433	my $faces = $facedata->{faceinfo};
…		…
3227	while (my ($face, $info) = each %$faces) {	3435	while (my ($face, $info) = each %$faces) {
3228	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3436	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3229		3437
3230	cf::face::set_visibility $idx, $info->{visibility};	3438	cf::face::set_visibility $idx, $info->{visibility};
3231	cf::face::set_magicmap $idx, $info->{magicmap};	3439	cf::face::set_magicmap $idx, $info->{magicmap};
3232	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3440	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3233	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3441	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3234		3442
3235	cf::cede_to_tick;	3443	cf::cede_to_tick;
3236	}	3444	}
3237		3445
3238	while (my ($face, $info) = each %$faces) {	3446	while (my ($face, $info) = each %$faces) {
…		…
3243		3451
3244	if (my $smooth = cf::face::find $info->{smooth}) {	3452	if (my $smooth = cf::face::find $info->{smooth}) {
3245	cf::face::set_smooth $idx, $smooth;	3453	cf::face::set_smooth $idx, $smooth;
3246	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3454	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3247	} else {	3455	} else {
3248	warn "smooth face '$info->{smooth}' not found for face '$face'";	3456	error "smooth face '$info->{smooth}' not found for face '$face'";
3249	}	3457	}
3250		3458
3251	cf::cede_to_tick;	3459	cf::cede_to_tick;
3252	}	3460	}
3253	}	3461	}
…		…
3262		3470
3263	cf::anim::invalidate_all; # d'oh	3471	cf::anim::invalidate_all; # d'oh
3264	}	3472	}
3265		3473
3266	{	3474	{
3267	# TODO: for gcfclient pleasure, we should give resources
3268	# that gcfclient doesn't grok a >10000 face index.
3269	my $res = $facedata->{resource};	3475	my $res = $facedata->{resource};
3270		3476
3271	while (my ($name, $info) = each %$res) {	3477	while (my ($name, $info) = each %$res) {
3272	if (defined $info->{type}) {	3478	if (defined $info->{type}) {
3273	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3479	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3274	my $data;
3275		3480
3276	if ($info->{type} & 1) {	3481	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3277	# prepend meta info
3278
3279	my $meta = $enc->encode ({
3280	name => $name,
3281	%{ $info->{meta} || {} },
3282	});
3283
3284	$data = pack "(w/a*)*", $meta, $info->{data};
3285	} else {
3286	$data = $info->{data};
3287	}
3288
3289	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3290	cf::face::set_type $idx, $info->{type};	3482	cf::face::set_type $idx, $info->{type};
3291	} else {	3483	} else {
3292	$RESOURCE{$name} = $info;	3484	$RESOURCE{$name} = $info; # unused
3293	}	3485	}
3294		3486
3295	cf::cede_to_tick;	3487	cf::cede_to_tick;
3296	}	3488	}
3297	}	3489	}
3298		3490
3299	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3491	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3300		3492
3301	1	3493	1
3302	}	3494	}
3303
3304	cf::global->attach (on_resource_update => sub {
3305	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3306	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3307
3308	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3309	my $sound = $soundconf->{compat}[$_]
3310	or next;
3311
3312	my $face = cf::face::find "sound/$sound->[1]";
3313	cf::sound::set $sound->[0] => $face;
3314	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3315	}
3316
3317	while (my ($k, $v) = each %{$soundconf->{event}}) {
3318	my $face = cf::face::find "sound/$v";
3319	cf::sound::set $k => $face;
3320	}
3321	}
3322	});
3323		3495
3324	register_exticmd fx_want => sub {	3496	register_exticmd fx_want => sub {
3325	my ($ns, $want) = @_;	3497	my ($ns, $want) = @_;
3326		3498
3327	while (my ($k, $v) = each %$want) {	3499	while (my ($k, $v) = each %$want) {
…		…
3366	sub reload_treasures {	3538	sub reload_treasures {
3367	load_resource_file "$DATADIR/treasures"	3539	load_resource_file "$DATADIR/treasures"
3368	or die "unable to load treasurelists\n";	3540	or die "unable to load treasurelists\n";
3369	}	3541	}
3370		3542
		3543	sub reload_sound {
		3544	trace "loading sound config from $DATADIR/sound\n";
		3545
		3546	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
		3547	or die "$DATADIR/sound $!";
		3548
		3549	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
		3550
		3551	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3552	my $sound = $soundconf->{compat}[$_]
		3553	or next;
		3554
		3555	my $face = cf::face::find "sound/$sound->[1]";
		3556	cf::sound::set $sound->[0] => $face;
		3557	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3558	}
		3559
		3560	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3561	my $face = cf::face::find "sound/$v";
		3562	cf::sound::set $k => $face;
		3563	}
		3564	}
		3565
3371	sub reload_resources {	3566	sub reload_resources {
3372	warn "reloading resource files...\n";	3567	trace "reloading resource files...\n";
3373		3568
		3569	reload_exp_table;
		3570	reload_materials;
3374	reload_facedata;	3571	reload_facedata;
		3572	reload_sound;
3375	reload_archetypes;	3573	reload_archetypes;
3376	reload_regions;	3574	reload_regions;
3377	reload_treasures;	3575	reload_treasures;
3378		3576
3379	warn "finished reloading resource files\n";	3577	trace "finished reloading resource files\n";
3380	}	3578	}
3381		3579
3382	sub reload_config {	3580	sub reload_config {
3383	open my $fh, "<:utf8", "$CONFDIR/config"	3581	trace "reloading config file...\n";
3384	or return;
3385		3582
3386	local $/;	3583	0 < aio_load "$CONFDIR/config", my $config
3387	*CFG = YAML::Load <$fh>;	3584	or die "$CONFDIR/config: $!";
3388		3585
		3586	utf8::decode $config;
		3587	*CFG = yaml_load $config;
		3588
3389	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3589	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3390		3590
3391	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3591	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3392	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3592	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3393		3593
3394	if (exists $CFG{mlockall}) {	3594	if (exists $CFG{mlockall}) {
…		…
3417		3617
3418	seek $fh, 0, 0;	3618	seek $fh, 0, 0;
3419	print $fh $$;	3619	print $fh $$;
3420	}	3620	}
3421		3621
		3622	sub main_loop {
		3623	trace "EV::loop starting\n";
		3624	if (1) {
		3625	EV::loop;
		3626	}
		3627	trace "EV::loop returned\n";
		3628	goto &main_loop unless $REALLY_UNLOOP;
		3629	}
		3630
3422	sub main {	3631	sub main {
3423	cf::init_globals; # initialise logging	3632	cf::init_globals; # initialise logging
3424		3633
3425	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3634	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3426	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3635	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3427	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3636	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3428	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3637	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3429
3430	cf::init_experience;
3431	cf::init_anim;
3432	cf::init_attackmess;
3433	cf::init_dynamic;
3434	cf::init_block;
3435		3638
3436	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3639	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3437		3640
3438	# we must not ever block the main coroutine	3641	# we must not ever block the main coroutine
3439	local $Coro::idle = sub {	3642	local $Coro::idle = sub {
…		…
3445	};	3648	};
3446		3649
3447	evthread_start IO::AIO::poll_fileno;	3650	evthread_start IO::AIO::poll_fileno;
3448		3651
3449	cf::sync_job {	3652	cf::sync_job {
		3653	cf::incloader::init ();
		3654
		3655	cf::init_anim;
		3656	cf::init_attackmess;
		3657	cf::init_dynamic;
		3658
		3659	cf::load_settings;
		3660
3450	reload_resources;	3661	reload_resources;
3451	reload_config;	3662	reload_config;
3452	db_init;	3663	db_init;
3453		3664
3454	cf::load_settings;
3455	cf::load_materials;
3456	cf::init_uuid;	3665	cf::init_uuid;
3457	cf::init_signals;	3666	cf::init_signals;
3458	cf::init_commands;
3459	cf::init_skills;	3667	cf::init_skills;
3460		3668
3461	cf::init_beforeplay;	3669	cf::init_beforeplay;
3462		3670
3463	atomic;	3671	atomic;
…		…
3465	load_extensions;	3673	load_extensions;
3466		3674
3467	utime time, time, $RUNTIMEFILE;	3675	utime time, time, $RUNTIMEFILE;
3468		3676
3469	# no (long-running) fork's whatsoever before this point(!)	3677	# no (long-running) fork's whatsoever before this point(!)
		3678	use POSIX ();
3470	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3679	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3471		3680
3472	(pop @POST_INIT)->(0) while @POST_INIT;	3681	cf::_post_init 0;
3473	};	3682	};
3474		3683
3475	EV::loop;	3684	cf::object::thawer::errors_are_fatal 0;
		3685	info "parse errors in files are no longer fatal from this point on.\n";
		3686
		3687	my $free_main; $free_main = EV::idle sub {
		3688	undef $free_main;
		3689	undef &main; # free gobs of memory :)
		3690	};
		3691
		3692	goto &main_loop;
3476	}	3693	}
3477		3694
3478	#############################################################################	3695	#############################################################################
3479	# initialisation and cleanup	3696	# initialisation and cleanup
3480		3697
3481	# install some emergency cleanup handlers	3698	# install some emergency cleanup handlers
3482	BEGIN {	3699	BEGIN {
3483	our %SIGWATCHER = ();	3700	our %SIGWATCHER = ();
3484	for my $signal (qw(INT HUP TERM)) {	3701	for my $signal (qw(INT HUP TERM)) {
3485	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3702	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3486	cf::cleanup "SIG$signal";	3703	cf::cleanup "SIG$signal";
3487	};	3704	};
3488	}	3705	}
3489	}	3706	}
3490		3707
3491	sub write_runtime_sync {	3708	sub write_runtime_sync {
		3709	my $t0 = AE::time;
		3710
3492	# first touch the runtime file to show we are still running:	3711	# first touch the runtime file to show we are still running:
3493	# the fsync below can take a very very long time.	3712	# the fsync below can take a very very long time.
3494		3713
3495	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3714	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3496		3715
3497	my $guard = cf::lock_acquire "write_runtime";	3716	my $guard = cf::lock_acquire "write_runtime";
3498		3717
3499	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3718	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3500	or return;	3719	or return;
3501		3720
3502	my $value = $cf::RUNTIME + 90 + 10;	3721	my $value = $cf::RUNTIME + 90 + 10;
3503	# 10 is the runtime save interval, for a monotonic clock	3722	# 10 is the runtime save interval, for a monotonic clock
3504	# 60 allows for the watchdog to kill the server.	3723	# 60 allows for the watchdog to kill the server.
…		…
3517	or return;	3736	or return;
3518		3737
3519	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3738	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3520	and return;	3739	and return;
3521		3740
3522	warn "runtime file written.\n";	3741	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3523		3742
3524	1	3743	1
3525	}	3744	}
3526		3745
3527	our $uuid_lock;	3746	our $uuid_lock;
…		…
3539	or return;	3758	or return;
3540		3759
3541	my $value = uuid_seq uuid_cur;	3760	my $value = uuid_seq uuid_cur;
3542		3761
3543	unless ($value) {	3762	unless ($value) {
3544	warn "cowardly refusing to write zero uuid value!\n";	3763	info "cowardly refusing to write zero uuid value!\n";
3545	return;	3764	return;
3546	}	3765	}
3547		3766
3548	my $value = uuid_str $value + $uuid_skip;	3767	my $value = uuid_str $value + $uuid_skip;
3549	$uuid_skip = 0;	3768	$uuid_skip = 0;
…		…
3559	or return;	3778	or return;
3560		3779
3561	aio_rename "$uuid~", $uuid	3780	aio_rename "$uuid~", $uuid
3562	and return;	3781	and return;
3563		3782
3564	warn "uuid file written ($value).\n";	3783	trace "uuid file written ($value).\n";
3565		3784
3566	1	3785	1
3567		3786
3568	}	3787	}
3569		3788
…		…
3575	}	3794	}
3576		3795
3577	sub emergency_save() {	3796	sub emergency_save() {
3578	my $freeze_guard = cf::freeze_mainloop;	3797	my $freeze_guard = cf::freeze_mainloop;
3579		3798
3580	warn "emergency_perl_save: enter\n";	3799	info "emergency_perl_save: enter\n";
		3800
		3801	# this is a trade-off: we want to be very quick here, so
		3802	# save all maps without fsync, and later call a global sync
		3803	# (which in turn might be very very slow)
		3804	local $USE_FSYNC = 0;
3581		3805
3582	cf::sync_job {	3806	cf::sync_job {
3583	# this is a trade-off: we want to be very quick here, so	3807	cf::write_runtime_sync; # external watchdog should not bark
3584	# save all maps without fsync, and later call a global sync
3585	# (which in turn might be very very slow)
3586	local $USE_FSYNC = 0;
3587		3808
3588	# use a peculiar iteration method to avoid tripping on perl	3809	# use a peculiar iteration method to avoid tripping on perl
3589	# refcount bugs in for. also avoids problems with players	3810	# refcount bugs in for. also avoids problems with players
3590	# and maps saved/destroyed asynchronously.	3811	# and maps saved/destroyed asynchronously.
3591	warn "emergency_perl_save: begin player save\n";	3812	info "emergency_perl_save: begin player save\n";
3592	for my $login (keys %cf::PLAYER) {	3813	for my $login (keys %cf::PLAYER) {
3593	my $pl = $cf::PLAYER{$login} or next;	3814	my $pl = $cf::PLAYER{$login} or next;
3594	$pl->valid or next;	3815	$pl->valid or next;
3595	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3816	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3596	$pl->save;	3817	$pl->save;
3597	}	3818	}
3598	warn "emergency_perl_save: end player save\n";	3819	info "emergency_perl_save: end player save\n";
3599		3820
		3821	cf::write_runtime_sync; # external watchdog should not bark
		3822
3600	warn "emergency_perl_save: begin map save\n";	3823	info "emergency_perl_save: begin map save\n";
3601	for my $path (keys %cf::MAP) {	3824	for my $path (keys %cf::MAP) {
3602	my $map = $cf::MAP{$path} or next;	3825	my $map = $cf::MAP{$path} or next;
3603	$map->valid or next;	3826	$map->valid or next;
3604	$map->save;	3827	$map->save;
3605	}	3828	}
3606	warn "emergency_perl_save: end map save\n";	3829	info "emergency_perl_save: end map save\n";
3607		3830
		3831	cf::write_runtime_sync; # external watchdog should not bark
		3832
3608	warn "emergency_perl_save: begin database checkpoint\n";	3833	info "emergency_perl_save: begin database checkpoint\n";
3609	BDB::db_env_txn_checkpoint $DB_ENV;	3834	BDB::db_env_txn_checkpoint $DB_ENV;
3610	warn "emergency_perl_save: end database checkpoint\n";	3835	info "emergency_perl_save: end database checkpoint\n";
3611		3836
3612	warn "emergency_perl_save: begin write uuid\n";	3837	info "emergency_perl_save: begin write uuid\n";
3613	write_uuid_sync 1;	3838	write_uuid_sync 1;
3614	warn "emergency_perl_save: end write uuid\n";	3839	info "emergency_perl_save: end write uuid\n";
		3840
		3841	cf::write_runtime_sync; # external watchdog should not bark
		3842
		3843	trace "emergency_perl_save: syncing database to disk";
		3844	BDB::db_env_txn_checkpoint $DB_ENV;
		3845
		3846	info "emergency_perl_save: starting sync\n";
		3847	IO::AIO::aio_sync sub {
		3848	info "emergency_perl_save: finished sync\n";
		3849	};
		3850
		3851	cf::write_runtime_sync; # external watchdog should not bark
		3852
		3853	trace "emergency_perl_save: flushing outstanding aio requests";
		3854	while (IO::AIO::nreqs || BDB::nreqs) {
		3855	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
		3856	}
		3857
		3858	cf::write_runtime_sync; # external watchdog should not bark
3615	};	3859	};
3616		3860
3617	warn "emergency_perl_save: starting sync()\n";
3618	IO::AIO::aio_sync sub {
3619	warn "emergency_perl_save: finished sync()\n";
3620	};
3621
3622	warn "emergency_perl_save: leave\n";	3861	info "emergency_perl_save: leave\n";
3623	}	3862	}
3624		3863
3625	sub post_cleanup {	3864	sub post_cleanup {
3626	my ($make_core) = @_;	3865	my ($make_core) = @_;
3627		3866
		3867	IO::AIO::flush;
		3868
3628	warn Carp::longmess "post_cleanup backtrace"	3869	error Carp::longmess "post_cleanup backtrace"
3629	if $make_core;	3870	if $make_core;
3630		3871
3631	my $fh = pidfile;	3872	my $fh = pidfile;
3632	unlink $PIDFILE if <$fh> == $$;	3873	unlink $PIDFILE if <$fh> == $$;
3633	}	3874	}
…		…
3653	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3894	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3654	for my $name (keys %$leaf_symtab) {	3895	for my $name (keys %$leaf_symtab) {
3655	_gv_clear *{"$pkg$name"};	3896	_gv_clear *{"$pkg$name"};
3656	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3897	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3657	}	3898	}
3658	warn "cleared package $pkg\n";#d#
3659	}	3899	}
3660		3900
3661	sub do_reload_perl() {	3901	sub do_reload_perl() {
3662	# can/must only be called in main	3902	# can/must only be called in main
3663	if ($Coro::current != $Coro::main) {	3903	unless (in_main) {
3664	warn "can only reload from main coroutine";	3904	error "can only reload from main coroutine";
3665	return;	3905	return;
3666	}	3906	}
3667		3907
3668	return if $RELOAD++;	3908	return if $RELOAD++;
3669		3909
3670	my $t1 = EV::time;	3910	my $t1 = AE::time;
3671		3911
3672	while ($RELOAD) {	3912	while ($RELOAD) {
3673	warn "reloading...";	3913	cf::get_slot 0.1, -1, "reload_perl";
		3914	info "perl_reload: reloading...";
3674		3915
3675	warn "entering sync_job";	3916	trace "perl_reload: entering sync_job";
3676		3917
3677	cf::sync_job {	3918	cf::sync_job {
3678	cf::write_runtime_sync; # external watchdog should not bark
3679	cf::emergency_save;	3919	#cf::emergency_save;
3680	cf::write_runtime_sync; # external watchdog should not bark
3681		3920
3682	warn "syncing database to disk";
3683	BDB::db_env_txn_checkpoint $DB_ENV;
3684
3685	# if anything goes wrong in here, we should simply crash as we already saved
3686
3687	warn "flushing outstanding aio requests";
3688	while (IO::AIO::nreqs || BDB::nreqs) {
3689	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3690	}
3691
3692	warn "cancelling all extension coros";	3921	trace "perl_reload: cancelling all extension coros";
3693	$_->cancel for values %EXT_CORO;	3922	$_->cancel for values %EXT_CORO;
3694	%EXT_CORO = ();	3923	%EXT_CORO = ();
3695		3924
3696	warn "removing commands";	3925	trace "perl_reload: removing commands";
3697	%COMMAND = ();	3926	%COMMAND = ();
3698		3927
3699	warn "removing ext/exti commands";	3928	trace "perl_reload: removing ext/exti commands";
3700	%EXTCMD = ();	3929	%EXTCMD = ();
3701	%EXTICMD = ();	3930	%EXTICMD = ();
3702		3931
3703	warn "unloading/nuking all extensions";	3932	trace "perl_reload: unloading/nuking all extensions";
3704	for my $pkg (@EXTS) {	3933	for my $pkg (@EXTS) {
3705	warn "... unloading $pkg";	3934	trace "... unloading $pkg";
3706		3935
3707	if (my $cb = $pkg->can ("unload")) {	3936	if (my $cb = $pkg->can ("unload")) {
3708	eval {	3937	eval {
3709	$cb->($pkg);	3938	$cb->($pkg);
3710	1	3939	1
3711	} or warn "$pkg unloaded, but with errors: $@";	3940	} or error "$pkg unloaded, but with errors: $@";
3712	}	3941	}
3713		3942
3714	warn "... clearing $pkg";	3943	trace "... clearing $pkg";
3715	clear_package $pkg;	3944	clear_package $pkg;
3716	}	3945	}
3717		3946
3718	warn "unloading all perl modules loaded from $LIBDIR";	3947	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3719	while (my ($k, $v) = each %INC) {	3948	while (my ($k, $v) = each %INC) {
3720	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	3949	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3721		3950
3722	warn "... unloading $k";	3951	trace "... unloading $k";
3723	delete $INC{$k};	3952	delete $INC{$k};
3724		3953
3725	$k =~ s/\.pm$//;	3954	$k =~ s/\.pm$//;
3726	$k =~ s/\//::/g;	3955	$k =~ s/\//::/g;
3727		3956
…		…
3730	}	3959	}
3731		3960
3732	clear_package $k;	3961	clear_package $k;
3733	}	3962	}
3734		3963
3735	warn "getting rid of safe::, as good as possible";	3964	trace "perl_reload: getting rid of safe::, as good as possible";
3736	clear_package "safe::$_"	3965	clear_package "safe::$_"
3737	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3966	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3738		3967
3739	warn "unloading cf.pm \"a bit\"";	3968	trace "perl_reload: unloading cf.pm \"a bit\"";
3740	delete $INC{"cf.pm"};	3969	delete $INC{"cf.pm"};
3741	delete $INC{"cf/pod.pm"};	3970	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3742		3971
3743	# don't, removes xs symbols, too,	3972	# don't, removes xs symbols, too,
3744	# and global variables created in xs	3973	# and global variables created in xs
3745	#clear_package __PACKAGE__;	3974	#clear_package __PACKAGE__;
3746		3975
3747	warn "unload completed, starting to reload now";	3976	info "perl_reload: unload completed, starting to reload now";
3748		3977
3749	warn "reloading cf.pm";	3978	trace "perl_reload: reloading cf.pm";
3750	require cf;	3979	require cf;
3751	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3980	cf::_connect_to_perl_1;
3752		3981
3753	warn "loading config and database again";	3982	trace "perl_reload: loading config and database again";
3754	cf::reload_config;	3983	cf::reload_config;
3755		3984
3756	warn "loading extensions";	3985	trace "perl_reload: loading extensions";
3757	cf::load_extensions;	3986	cf::load_extensions;
3758		3987
3759	if ($REATTACH_ON_RELOAD) {	3988	if ($REATTACH_ON_RELOAD) {
3760	warn "reattaching attachments to objects/players";	3989	trace "perl_reload: reattaching attachments to objects/players";
3761	_global_reattach; # objects, sockets	3990	_global_reattach; # objects, sockets
3762	warn "reattaching attachments to maps";	3991	trace "perl_reload: reattaching attachments to maps";
3763	reattach $_ for values %MAP;	3992	reattach $_ for values %MAP;
3764	warn "reattaching attachments to players";	3993	trace "perl_reload: reattaching attachments to players";
3765	reattach $_ for values %PLAYER;	3994	reattach $_ for values %PLAYER;
3766	}	3995	}
3767		3996
3768	warn "running post_init jobs";	3997	cf::_post_init 1;
3769	(pop @POST_INIT)->(1) while @POST_INIT;
3770		3998
3771	warn "leaving sync_job";	3999	trace "perl_reload: leaving sync_job";
3772		4000
3773	1	4001	1
3774	} or do {	4002	} or do {
3775	warn $@;	4003	error $@;
3776	cf::cleanup "error while reloading, exiting.";	4004	cf::cleanup "perl_reload: error, exiting.";
3777	};	4005	};
3778		4006
3779	warn "reloaded";
3780	--$RELOAD;	4007	--$RELOAD;
3781	}	4008	}
3782		4009
3783	$t1 = EV::time - $t1;	4010	$t1 = AE::time - $t1;
3784	warn "reload completed in ${t1}s\n";	4011	info "perl_reload: completed in ${t1}s\n";
3785	};	4012	};
3786		4013
3787	our $RELOAD_WATCHER; # used only during reload	4014	our $RELOAD_WATCHER; # used only during reload
3788		4015
3789	sub reload_perl() {	4016	sub reload_perl() {
…		…
3791	# coro crashes during coro_state_free->destroy here.	4018	# coro crashes during coro_state_free->destroy here.
3792		4019
3793	$RELOAD_WATCHER ||= cf::async {	4020	$RELOAD_WATCHER ||= cf::async {
3794	Coro::AIO::aio_wait cache_extensions;	4021	Coro::AIO::aio_wait cache_extensions;
3795		4022
3796	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	4023	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3797	do_reload_perl;	4024	do_reload_perl;
3798	undef $RELOAD_WATCHER;	4025	undef $RELOAD_WATCHER;
3799	};	4026	};
3800	};	4027	};
3801	}	4028	}
…		…
3810	reload_perl;	4037	reload_perl;
3811	};	4038	};
3812	}	4039	}
3813	};	4040	};
3814		4041
3815	unshift @INC, $LIBDIR;	4042	#############################################################################
3816		4043
3817	my $bug_warning = 0;	4044	my $bug_warning = 0;
3818		4045
3819	our @WAIT_FOR_TICK;	4046	our @WAIT_FOR_TICK;
3820	our @WAIT_FOR_TICK_BEGIN;	4047	our @WAIT_FOR_TICK_BEGIN;
3821		4048
3822	sub wait_for_tick {	4049	sub wait_for_tick() {
3823	return if tick_inhibit || $Coro::current == $Coro::main;	4050	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3824		4051
3825	my $signal = new Coro::Signal;	4052	my $signal = new Coro::Signal;
3826	push @WAIT_FOR_TICK, $signal;	4053	push @WAIT_FOR_TICK, $signal;
3827	$signal->wait;	4054	$signal->wait;
3828	}	4055	}
3829		4056
3830	sub wait_for_tick_begin {	4057	sub wait_for_tick_begin() {
3831	return if tick_inhibit || $Coro::current == $Coro::main;	4058	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3832		4059
3833	my $signal = new Coro::Signal;	4060	my $signal = new Coro::Signal;
3834	push @WAIT_FOR_TICK_BEGIN, $signal;	4061	push @WAIT_FOR_TICK_BEGIN, $signal;
3835	$signal->wait;	4062	$signal->wait;
3836	}	4063	}
…		…
3842	return;	4069	return;
3843	}	4070	}
3844		4071
3845	cf::server_tick; # one server iteration	4072	cf::server_tick; # one server iteration
3846		4073
		4074	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
		4075
3847	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4076	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3848	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4077	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3849	Coro::async_pool {	4078	Coro::async_pool {
3850	$Coro::current->{desc} = "runtime saver";	4079	$Coro::current->{desc} = "runtime saver";
3851	write_runtime_sync	4080	write_runtime_sync
3852	or warn "ERROR: unable to write runtime file: $!";	4081	or error "ERROR: unable to write runtime file: $!";
3853	};	4082	};
3854	}	4083	}
3855		4084
3856	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4085	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3857	$sig->send;	4086	$sig->send;
…		…
3865		4094
3866	if (0) {	4095	if (0) {
3867	if ($NEXT_TICK) {	4096	if ($NEXT_TICK) {
3868	my $jitter = $TICK_START - $NEXT_TICK;	4097	my $jitter = $TICK_START - $NEXT_TICK;
3869	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4098	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3870	warn "jitter $JITTER\n";#d#	4099	debug "jitter $JITTER\n";#d#
3871	}	4100	}
3872	}	4101	}
3873	}	4102	}
3874		4103
3875	{	4104	{
3876	# configure BDB	4105	# configure BDB
3877		4106
3878	BDB::min_parallel 8;	4107	BDB::min_parallel 16;
3879	BDB::max_poll_reqs $TICK * 0.1;	4108	BDB::max_poll_reqs $TICK * 0.1;
3880	$AnyEvent::BDB::WATCHER->priority (1);	4109	$AnyEvent::BDB::WATCHER->priority (1);
3881		4110
3882	unless ($DB_ENV) {	4111	unless ($DB_ENV) {
3883	$DB_ENV = BDB::db_env_create;	4112	$DB_ENV = BDB::db_env_create;
…		…
3963	LOG llevInfo, "[ABT] [suppressed]\n";	4192	LOG llevInfo, "[ABT] [suppressed]\n";
3964	}	4193	}
3965	}	4194	}
3966		4195
3967	# load additional modules	4196	# load additional modules
3968	use cf::pod;	4197	require "cf/$_.pm" for @EXTRA_MODULES;
		4198	cf::_connect_to_perl_2;
3969		4199
3970	END { cf::emergency_save }	4200	END { cf::emergency_save }
3971		4201
3972	1	4202	1
3973		4203

Diff Legend

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