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.459 by root, Sat Dec 13 21:46:12 2008 UTC vs.
Revision 1.565 by root, Sat Apr 30 05:41:17 2011 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,2011 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 Guard ();
38	use Coro ();	38	use Coro ();
39	use Coro::State;	39	use Coro::State;
40	use Coro::Handle;	40	use Coro::Handle;
…		…
51	use Coro::Util ();	51	use Coro::Util ();
52		52
53	use JSON::XS 2.01 ();	53	use JSON::XS 2.01 ();
54	use BDB ();	54	use BDB ();
55	use Data::Dumper;	55	use Data::Dumper;
56	use Digest::MD5;
57	use Fcntl;	56	use Fcntl;
58	use YAML ();	57	use YAML::XS ();
59	use IO::AIO ();	58	use IO::AIO ();
60	use Time::HiRes;	59	use Time::HiRes;
61	use Compress::LZF;	60	use Compress::LZF;
62	use Digest::MD5 ();	61	use Digest::MD5 ();
63		62
…		…
72		71
73	# make sure c-lzf reinitialises itself	72	# make sure c-lzf reinitialises itself
74	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";	73	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75	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
76		75
		76	# strictly for debugging
		77	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
		78
77	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;
78		82
79	our %COMMAND = ();	83	our %COMMAND = ();
80	our %COMMAND_TIME = ();	84	our %COMMAND_TIME = ();
81		85
82	our @EXTS = (); # list of extension package names	86	our @EXTS = (); # list of extension package names
…		…
85	our %EXT_CORO = (); # coroutines bound to extensions	89	our %EXT_CORO = (); # coroutines bound to extensions
86	our %EXT_MAP = (); # pluggable maps	90	our %EXT_MAP = (); # pluggable maps
87		91
88	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
89	our @EVENT;	93	our @EVENT;
		94	our @REFLECT; # set by XS
		95	our %REFLECT; # set by us
90		96
91	our $CONFDIR = confdir;	97	our $CONFDIR = confdir;
		98
92	our $DATADIR = datadir;	99	our $DATADIR = datadir;
93	our $LIBDIR = "$DATADIR/ext";	100	our $LIBDIR = "$DATADIR/ext";
94	our $PODDIR = "$DATADIR/pod";	101	our $PODDIR = "$DATADIR/pod";
95	our $MAPDIR = "$DATADIR/" . mapdir;	102	our $MAPDIR = "$DATADIR/" . mapdir;
		103
96	our $LOCALDIR = localdir;	104	our $LOCALDIR = localdir;
97	our $TMPDIR = "$LOCALDIR/" . tmpdir;	105	our $TMPDIR = "$LOCALDIR/" . tmpdir;
98	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	106	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
99	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	107	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
100	our $RANDOMDIR = "$LOCALDIR/random";	108	our $RANDOMDIR = "$LOCALDIR/random";
101	our $BDBDIR = "$LOCALDIR/db";	109	our $BDBDIR = "$LOCALDIR/db";
102	our $PIDFILE = "$LOCALDIR/pid";	110	our $PIDFILE = "$LOCALDIR/pid";
103	our $RUNTIMEFILE = "$LOCALDIR/runtime";	111	our $RUNTIMEFILE = "$LOCALDIR/runtime";
104		112
105	our %RESOURCE;	113	our %RESOURCE; # unused
		114
		115	our $OUTPUT_RATE_MIN = 3000;
		116	our $OUTPUT_RATE_MAX = 1000000;
		117
		118	our $MAX_LINKS = 32; # how many chained exits to follow
		119	our $VERBOSE_IO = 1;
106		120
107	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	121	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	122	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109	our $NEXT_TICK;	123	our $NEXT_TICK;
110	our $USE_FSYNC = 1; # use fsync to write maps - default off	124	our $USE_FSYNC = 1; # use fsync to write maps - default on
111		125
112	our $BDB_DEADLOCK_WATCHER;	126	our $BDB_DEADLOCK_WATCHER;
113	our $BDB_CHECKPOINT_WATCHER;	127	our $BDB_CHECKPOINT_WATCHER;
114	our $BDB_TRICKLE_WATCHER;	128	our $BDB_TRICKLE_WATCHER;
115	our $DB_ENV;	129	our $DB_ENV;
116		130
		131	our @EXTRA_MODULES = qw(pod match mapscript incloader);
		132
117	our %CFG;	133	our %CFG;
118		134
119	our $UPTIME; $UPTIME ||= time;	135	our $UPTIME; $UPTIME ||= time;
120	our $RUNTIME;	136	our $RUNTIME;
121	our $NOW;	137	our $NOW;
…		…
132	our $JITTER; # average jitter	148	our $JITTER; # average jitter
133	our $TICK_START; # for load detecting purposes	149	our $TICK_START; # for load detecting purposes
134		150
135	our @POST_INIT;	151	our @POST_INIT;
136		152
137	our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)	153	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
		154	our $REALLY_UNLOOP; # never set to true, please :)
138		155
139	binmode STDOUT;	156	binmode STDOUT;
140	binmode STDERR;	157	binmode STDERR;
141		158
142	# read virtual server time, if available	159	# read virtual server time, if available
…		…
144	open my $fh, "<", $RUNTIMEFILE	161	open my $fh, "<", $RUNTIMEFILE
145	or die "unable to read $RUNTIMEFILE file: $!";	162	or die "unable to read $RUNTIMEFILE file: $!";
146	$RUNTIME = <$fh> + 0.;	163	$RUNTIME = <$fh> + 0.;
147	}	164	}
148		165
		166	eval "sub TICK() { $TICK } 1" or die;
		167
149	mkdir $_	168	mkdir $_
150	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	169	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
151		170
152	our $EMERGENCY_POSITION;	171	our $EMERGENCY_POSITION;
153		172
154	sub cf::map::normalise;	173	sub cf::map::normalise;
		174
		175	sub in_main() {
		176	$Coro::current == $Coro::main
		177	}
		178
		179	#############################################################################
		180
		181	%REFLECT = ();
		182	for (@REFLECT) {
		183	my $reflect = JSON::XS::decode_json $_;
		184	$REFLECT{$reflect->{class}} = $reflect;
		185	}
		186
		187	# this is decidedly evil
		188	$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
155		189
156	#############################################################################	190	#############################################################################
157		191
158	=head2 GLOBAL VARIABLES	192	=head2 GLOBAL VARIABLES
159		193
…		…
201	from wherever your confdir points to.	235	from wherever your confdir points to.
202		236
203	=item cf::wait_for_tick, cf::wait_for_tick_begin	237	=item cf::wait_for_tick, cf::wait_for_tick_begin
204		238
205	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	239	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
206	returns directly I<after> the tick processing (and consequently, can only wake one process	240	returns directly I<after> the tick processing (and consequently, can only wake one thread
207	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	241	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
208		242
		243	=cut
		244
		245	sub wait_for_tick();
		246	sub wait_for_tick_begin();
		247
209	=item @cf::INVOKE_RESULTS	248	=item @cf::INVOKE_RESULTS
210		249
211	This array contains the results of the last C<invoke ()> call. When	250	This array contains the results of the last C<invoke ()> call. When
212	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	251	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
213	that call.	252	that call.
214		253
		254	=item %cf::REFLECT
		255
		256	Contains, for each (C++) class name, a hash reference with information
		257	about object members (methods, scalars, arrays and flags) and other
		258	metadata, which is useful for introspection.
		259
215	=back	260	=back
216		261
217	=cut	262	=cut
218		263
219	BEGIN {	264	sub error(@) { LOG llevError, join "", @_ }
220	*CORE::GLOBAL::warn = sub {	265	sub warn (@) { LOG llevWarn , join "", @_ }
		266	sub info (@) { LOG llevInfo , join "", @_ }
		267	sub debug(@) { LOG llevDebug, join "", @_ }
		268	sub trace(@) { LOG llevTrace, join "", @_ }
		269
		270	$Coro::State::WARNHOOK = sub {
221	my $msg = join "", @_;	271	my $msg = join "", @_;
222		272
223	$msg .= "\n"	273	$msg .= "\n"
224	unless $msg =~ /\n$/;	274	unless $msg =~ /\n$/;
225		275
226	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	276	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
227		277
228	LOG llevError, $msg;	278	LOG llevWarn, $msg;
229	};	279	};
230	}
231		280
232	$Coro::State::DIEHOOK = sub {	281	$Coro::State::DIEHOOK = sub {
233	return unless $^S eq 0; # "eq", not "=="	282	return unless $^S eq 0; # "eq", not "=="
234		283
235	if ($Coro::current == $Coro::main) {#d#	284	error Carp::longmess $_[0];
		285
		286	if (in_main) {#d#
236	warn "DIEHOOK called in main context, Coro bug?\n";#d#	287	error "DIEHOOK called in main context, Coro bug?\n";#d#
237	return;#d#	288	return;#d#
238	}#d#	289	}#d#
239		290
240	# kill coroutine otherwise	291	# kill coroutine otherwise
241	warn Carp::longmess $_[0];
242	Coro::terminate	292	Coro::terminate
243	};	293	};
244
245	$SIG{__DIE__} = sub { }; #d#?
246		294
247	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	295	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
248	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	296	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
249	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	297	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
250	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	298	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
264	)) {	312	)) {
265	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	313	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
266	}	314	}
267		315
268	$EV::DIED = sub {	316	$EV::DIED = sub {
269	warn "error in event callback: @_";	317	Carp::cluck "error in event callback: @_";
270	};	318	};
		319
		320	#############################################################################
		321
		322	sub fork_call(&@);
		323	sub get_slot($;$$);
271		324
272	#############################################################################	325	#############################################################################
273		326
274	=head2 UTILITY FUNCTIONS	327	=head2 UTILITY FUNCTIONS
275		328
…		…
296	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	349	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
297	$d	350	$d
298	} || "[unable to dump $_[0]: '$@']";	351	} || "[unable to dump $_[0]: '$@']";
299	}	352	}
300		353
		354	=item $scalar = load_file $path
		355
		356	Loads the given file from path and returns its contents. Croaks on error
		357	and can block.
		358
		359	=cut
		360
		361	sub load_file($) {
		362	0 <= aio_load $_[0], my $data
		363	or Carp::croak "$_[0]: $!";
		364
		365	$data
		366	}
		367
301	=item $ref = cf::decode_json $json	368	=item $ref = cf::decode_json $json
302		369
303	Converts a JSON string into the corresponding perl data structure.	370	Converts a JSON string into the corresponding perl data structure.
304		371
305	=item $json = cf::encode_json $ref	372	=item $json = cf::encode_json $ref
…		…
311	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	378	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
312		379
313	sub encode_json($) { $json_coder->encode ($_[0]) }	380	sub encode_json($) { $json_coder->encode ($_[0]) }
314	sub decode_json($) { $json_coder->decode ($_[0]) }	381	sub decode_json($) { $json_coder->decode ($_[0]) }
315		382
		383	=item $ref = cf::decode_storable $scalar
		384
		385	Same as Coro::Storable::thaw, so blocks.
		386
		387	=cut
		388
		389	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		390
		391	=item $ref = cf::decode_yaml $scalar
		392
		393	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		394
		395	=cut
		396
		397	sub decode_yaml($) {
		398	fork_call { YAML::XS::Load $_[0] } @_
		399	}
		400
		401	=item $scalar = cf::unlzf $scalar
		402
		403	Same as Compress::LZF::compress, but takes server ticks into account, so
		404	blocks.
		405
		406	=cut
		407
		408	sub unlzf($) {
		409	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		410	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		411	Compress::LZF::decompress $_[0]
		412	}
		413
316	=item cf::post_init { BLOCK }	414	=item cf::post_init { BLOCK }
317		415
318	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	416	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
319	but I<before> the server starts ticking again.	417	but I<before> the server starts ticking again.
320		418
321	The cdoeblock will have a single boolean argument to indicate whether this	419	The codeblock will have a single boolean argument to indicate whether this
322	is a reload or not.	420	is a reload or not.
323		421
324	=cut	422	=cut
325		423
326	sub post_init(&) {	424	sub post_init(&) {
327	push @POST_INIT, shift;	425	push @POST_INIT, shift;
		426	}
		427
		428	sub _post_init {
		429	trace "running post_init jobs";
		430
		431	# run them in parallel...
		432
		433	my @join;
		434
		435	while () {
		436	push @join, map &Coro::async ($_, 0), @POST_INIT;
		437	@POST_INIT = ();
		438
		439	@join or last;
		440
		441	(pop @join)->join;
		442	}
328	}	443	}
329		444
330	=item cf::lock_wait $string	445	=item cf::lock_wait $string
331		446
332	Wait until the given lock is available. See cf::lock_acquire.	447	Wait until the given lock is available. See cf::lock_acquire.
…		…
371	}	486	}
372		487
373	=item cf::periodic $interval, $cb	488	=item cf::periodic $interval, $cb
374		489
375	Like EV::periodic, but randomly selects a starting point so that the actions	490	Like EV::periodic, but randomly selects a starting point so that the actions
376	get spread over timer.	491	get spread over time.
377		492
378	=cut	493	=cut
379		494
380	sub periodic($$) {	495	sub periodic($$) {
381	my ($interval, $cb) = @_;	496	my ($interval, $cb) = @_;
…		…
385	EV::periodic $start, $interval, 0, $cb	500	EV::periodic $start, $interval, 0, $cb
386	}	501	}
387		502
388	=item cf::get_slot $time[, $priority[, $name]]	503	=item cf::get_slot $time[, $priority[, $name]]
389		504
390	Allocate $time seconds of blocking CPU time at priority C<$priority>:	505	Allocate $time seconds of blocking CPU time at priority C<$priority>
391	This call blocks and returns only when you have at least C<$time> seconds	506	(default: 0): This call blocks and returns only when you have at least
392	of cpu time till the next tick. The slot is only valid till the next cede.	507	C<$time> seconds of cpu time till the next tick. The slot is only valid
		508	till the next cede.
		509
		510	Background jobs should use a priority les than zero, interactive jobs
		511	should use 100 or more.
393		512
394	The optional C<$name> can be used to identify the job to run. It might be	513	The optional C<$name> can be used to identify the job to run. It might be
395	used for statistical purposes and should identify the same time-class.	514	used for statistical purposes and should identify the same time-class.
396		515
397	Useful for short background jobs.	516	Useful for short background jobs.
398		517
399	=cut	518	=cut
400		519
401	our @SLOT_QUEUE;	520	our @SLOT_QUEUE;
402	our $SLOT_QUEUE;	521	our $SLOT_QUEUE;
		522	our $SLOT_DECAY = 0.9;
403		523
404	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	524	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405	$SLOT_QUEUE = Coro::async {	525	$SLOT_QUEUE = Coro::async {
406	$Coro::current->desc ("timeslot manager");	526	$Coro::current->desc ("timeslot manager");
407		527
408	my $signal = new Coro::Signal;	528	my $signal = new Coro::Signal;
		529	my $busy;
409		530
410	while () {	531	while () {
411	next_job:	532	next_job:
		533
412	my $avail = cf::till_tick;	534	my $avail = cf::till_tick;
413	if ($avail > 0.01) {	535
414	for (0 .. $#SLOT_QUEUE) {	536	for (0 .. $#SLOT_QUEUE) {
415	if ($SLOT_QUEUE[$_][0] < $avail) {	537	if ($SLOT_QUEUE[$_][0] <= $avail) {
		538	$busy = 0;
416	my $job = splice @SLOT_QUEUE, $_, 1, ();	539	my $job = splice @SLOT_QUEUE, $_, 1, ();
417	$job->[2]->send;	540	$job->[2]->send;
418	Coro::cede;	541	Coro::cede;
419	goto next_job;	542	goto next_job;
420	}	543	} else {
		544	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421	}	545	}
422	}	546	}
423		547
424	if (@SLOT_QUEUE) {	548	if (@SLOT_QUEUE) {
425	# we do not use wait_for_tick() as it returns immediately when tick is inactive	549	# we do not use wait_for_tick() as it returns immediately when tick is inactive
426	push @cf::WAIT_FOR_TICK, $signal;	550	push @cf::WAIT_FOR_TICK, $signal;
427	$signal->wait;	551	$signal->wait;
428	} else {	552	} else {
		553	$busy = 0;
429	Coro::schedule;	554	Coro::schedule;
430	}	555	}
431	}	556	}
432	};	557	};
433		558
434	sub get_slot($;$$) {	559	sub get_slot($;$$) {
435	return if tick_inhibit || $Coro::current == $Coro::main;	560	return if tick_inhibit || $Coro::current == $Coro::main;
436		561
437	my ($time, $pri, $name) = @_;	562	my ($time, $pri, $name) = @_;
438		563
439	$time = $TICK * .6 if $time > $TICK * .6;	564	$time = clamp $time, 0.01, $TICK * .6;
		565
440	my $sig = new Coro::Signal;	566	my $sig = new Coro::Signal;
441		567
442	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	568	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	569	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444	$SLOT_QUEUE->ready;	570	$SLOT_QUEUE->ready;
…		…
470	=cut	596	=cut
471		597
472	sub sync_job(&) {	598	sub sync_job(&) {
473	my ($job) = @_;	599	my ($job) = @_;
474		600
475	if ($Coro::current == $Coro::main) {	601	if (in_main) {
476	my $time = EV::time;	602	my $time = AE::time;
477		603
478	# this is the main coro, too bad, we have to block	604	# this is the main coro, too bad, we have to block
479	# till the operation succeeds, freezing the server :/	605	# till the operation succeeds, freezing the server :/
480		606
481	LOG llevError, Carp::longmess "sync job";#d#	607	#LOG llevError, Carp::longmess "sync job";#d#
482		608
483	my $freeze_guard = freeze_mainloop;	609	my $freeze_guard = freeze_mainloop;
484		610
485	my $busy = 1;	611	my $busy = 1;
486	my @res;	612	my @res;
487		613
488	(async {	614	(async {
489	$Coro::current->desc ("sync job coro");	615	$Coro::current->desc ("sync job coro");
490	@res = eval { $job->() };	616	@res = eval { $job->() };
491	warn $@ if $@;	617	error $@ if $@;
492	undef $busy;	618	undef $busy;
493	})->prio (Coro::PRIO_MAX);	619	})->prio (Coro::PRIO_MAX);
494		620
495	while ($busy) {	621	while ($busy) {
496	if (Coro::nready) {	622	if (Coro::nready) {
…		…
498	} else {	624	} else {
499	EV::loop EV::LOOP_ONESHOT;	625	EV::loop EV::LOOP_ONESHOT;
500	}	626	}
501	}	627	}
502		628
503	my $time = EV::time - $time;	629	my $time = AE::time - $time;
504		630
505	$TICK_START += $time; # do not account sync jobs to server load	631	$TICK_START += $time; # do not account sync jobs to server load
506		632
507	wantarray ? @res : $res[0]	633	wantarray ? @res : $res[0]
508	} else {	634	} else {
…		…
530	$EXT_CORO{$coro+0} = $coro;	656	$EXT_CORO{$coro+0} = $coro;
531		657
532	$coro	658	$coro
533	}	659	}
534		660
535	=item fork_call { }, $args	661	=item fork_call { }, @args
536		662
537	Executes the given code block with the given arguments in a seperate	663	Executes the given code block with the given arguments in a seperate
538	process, returning the results. Everything must be serialisable with	664	process, returning the results. Everything must be serialisable with
539	Coro::Storable. May, of course, block. Note that the executed sub may	665	Coro::Storable. May, of course, block. Note that the executed sub may
540	never block itself or use any form of event handling.	666	never block itself or use any form of event handling.
541		667
542	=cut	668	=cut
543		669
		670	sub post_fork {
		671	reset_signals;
		672	}
		673
544	sub fork_call(&@) {	674	sub fork_call(&@) {
545	my ($cb, @args) = @_;	675	my ($cb, @args) = @_;
546		676
547	# we seemingly have to make a local copy of the whole thing,	677	# we seemingly have to make a local copy of the whole thing,
548	# otherwise perl prematurely frees the stuff :/	678	# otherwise perl prematurely frees the stuff :/
549	# TODO: investigate and fix (likely this will be rather laborious)	679	# TODO: investigate and fix (likely this will be rather laborious)
550		680
551	my @res = Coro::Util::fork_eval {	681	my @res = Coro::Util::fork_eval {
552	reset_signals;	682	cf::post_fork;
553	&$cb	683	&$cb
554	}, @args;	684	} @args;
555		685
556	wantarray ? @res : $res[-1]	686	wantarray ? @res : $res[-1]
		687	}
		688
		689	sub objinfo {
		690	(
		691	"counter value" => cf::object::object_count,
		692	"objects created" => cf::object::create_count,
		693	"objects destroyed" => cf::object::destroy_count,
		694	"freelist size" => cf::object::free_count,
		695	"allocated objects" => cf::object::objects_size,
		696	"active objects" => cf::object::actives_size,
		697	)
557	}	698	}
558		699
559	=item $coin = coin_from_name $name	700	=item $coin = coin_from_name $name
560		701
561	=cut	702	=cut
…		…
598	within each server.	739	within each server.
599		740
600	=cut	741	=cut
601		742
602	sub db_table($) {	743	sub db_table($) {
		744	cf::error "db_get called from main context"
		745	if $Coro::current == $Coro::main;
		746
603	my ($name) = @_;	747	my ($name) = @_;
604	my $db = BDB::db_create $DB_ENV;	748	my $db = BDB::db_create $DB_ENV;
605		749
606	eval {	750	eval {
607	$db->set_flags (BDB::CHKSUM);	751	$db->set_flags (BDB::CHKSUM);
…		…
617	}	761	}
618		762
619	our $DB;	763	our $DB;
620		764
621	sub db_init {	765	sub db_init {
622	cf::sync_job {
623	$DB ||= db_table "db";	766	$DB ||= db_table "db";
624	};
625	}	767	}
626		768
627	sub db_get($$) {	769	sub db_get($$) {
628	my $key = "$_[0]/$_[1]";	770	my $key = "$_[0]/$_[1]";
629		771
630	cf::sync_job {	772	cf::error "db_get called from main context"
		773	if $Coro::current == $Coro::main;
		774
631	BDB::db_get $DB, undef, $key, my $data;	775	BDB::db_get $DB, undef, $key, my $data;
632		776
633	$! ? ()	777	$! ? ()
634	: $data	778	: $data
635	}
636	}	779	}
637		780
638	sub db_put($$$) {	781	sub db_put($$$) {
639	BDB::dbreq_pri 4;	782	BDB::dbreq_pri 4;
640	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	783	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
668		811
669	my @data;	812	my @data;
670	my $md5;	813	my $md5;
671		814
672	for (0 .. $#$src) {	815	for (0 .. $#$src) {
673	0 <= aio_load $src->[$_], $data[$_]	816	$data[$_] = load_file $src->[$_];
674	or Carp::croak "$src->[$_]: $!";
675	}	817	}
676		818
677	# if processing is expensive, check	819	# if processing is expensive, check
678	# checksum first	820	# checksum first
679	if (1) {	821	if (1) {
…		…
696		838
697	my $t1 = Time::HiRes::time;	839	my $t1 = Time::HiRes::time;
698	my $data = $process->(\@data);	840	my $data = $process->(\@data);
699	my $t2 = Time::HiRes::time;	841	my $t2 = Time::HiRes::time;
700		842
701	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	843	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
702		844
703	db_put cache => "$id/data", $data;	845	db_put cache => "$id/data", $data;
704	db_put cache => "$id/md5" , $md5;	846	db_put cache => "$id/md5" , $md5;
705	db_put cache => "$id/meta", $meta;	847	db_put cache => "$id/meta", $meta;
706		848
…		…
716		858
717	=cut	859	=cut
718		860
719	sub datalog($@) {	861	sub datalog($@) {
720	my ($type, %kv) = @_;	862	my ($type, %kv) = @_;
721	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	863	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
722	}	864	}
723		865
724	=back	866	=back
725		867
726	=cut	868	=cut
…		…
921		1063
922	} elsif (exists $cb_id{$type}) {	1064	} elsif (exists $cb_id{$type}) {
923	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1065	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
924		1066
925	} elsif (ref $type) {	1067	} elsif (ref $type) {
926	warn "attaching objects not supported, ignoring.\n";	1068	error "attaching objects not supported, ignoring.\n";
927		1069
928	} else {	1070	} else {
929	shift @arg;	1071	shift @arg;
930	warn "attach argument '$type' not supported, ignoring.\n";	1072	error "attach argument '$type' not supported, ignoring.\n";
931	}	1073	}
932	}	1074	}
933	}	1075	}
934		1076
935	sub _object_attach {	1077	sub _object_attach {
…		…
945	_attach $registry, $klass, @attach;	1087	_attach $registry, $klass, @attach;
946	}	1088	}
947		1089
948	$obj->{$name} = \%arg;	1090	$obj->{$name} = \%arg;
949	} else {	1091	} else {
950	warn "object uses attachment '$name' which is not available, postponing.\n";	1092	info "object uses attachment '$name' which is not available, postponing.\n";
951	}	1093	}
952		1094
953	$obj->{_attachment}{$name} = undef;	1095	$obj->{_attachment}{$name} = undef;
954	}	1096	}
955		1097
…		…
1014		1156
1015	for (@$callbacks) {	1157	for (@$callbacks) {
1016	eval { &{$_->[1]} };	1158	eval { &{$_->[1]} };
1017		1159
1018	if ($@) {	1160	if ($@) {
1019	warn "$@";
1020	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1161	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1021	override;	1162	override;
1022	}	1163	}
1023		1164
1024	return 1 if $override;	1165	return 1 if $override;
1025	}	1166	}
…		…
1104	for (@$attach) {	1245	for (@$attach) {
1105	my ($klass, @attach) = @$_;	1246	my ($klass, @attach) = @$_;
1106	_attach $registry, $klass, @attach;	1247	_attach $registry, $klass, @attach;
1107	}	1248	}
1108	} else {	1249	} else {
1109	warn "object uses attachment '$name' that is not available, postponing.\n";	1250	info "object uses attachment '$name' that is not available, postponing.\n";
1110	}	1251	}
1111	}	1252	}
1112	}	1253	}
1113		1254
1114	cf::attachable->attach (	1255	cf::attachable->attach (
…		…
1141	my ($filename, $rdata, $objs) = @_;	1282	my ($filename, $rdata, $objs) = @_;
1142		1283
1143	sync_job {	1284	sync_job {
1144	if (length $$rdata) {	1285	if (length $$rdata) {
1145	utf8::decode (my $decname = $filename);	1286	utf8::decode (my $decname = $filename);
1146	warn sprintf "saving %s (%d,%d)\n",	1287	trace sprintf "saving %s (%d,%d)\n",
1147	$decname, length $$rdata, scalar @$objs;	1288	$decname, length $$rdata, scalar @$objs
		1289	if $VERBOSE_IO;
1148		1290
1149	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1291	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150	aio_chmod $fh, SAVE_MODE;	1292	aio_chmod $fh, SAVE_MODE;
1151	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1293	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152	aio_fsync $fh if $cf::USE_FSYNC;	1294	if ($cf::USE_FSYNC) {
		1295	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;
		1296	aio_fsync $fh;
		1297	}
1153	aio_close $fh;	1298	aio_close $fh;
1154		1299
1155	if (@$objs) {	1300	if (@$objs) {
1156	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1301	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157	aio_chmod $fh, SAVE_MODE;	1302	aio_chmod $fh, SAVE_MODE;
1158	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1303	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159	aio_write $fh, 0, (length $data), $data, 0;	1304	aio_write $fh, 0, (length $data), $data, 0;
1160	aio_fsync $fh if $cf::USE_FSYNC;	1305	if ($cf::USE_FSYNC) {
		1306	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;
		1307	aio_fsync $fh;
		1308	}
1161	aio_close $fh;	1309	aio_close $fh;
1162	aio_rename "$filename.pst~", "$filename.pst";	1310	aio_rename "$filename.pst~", "$filename.pst";
1163	}	1311	}
1164	} else {	1312	} else {
1165	aio_unlink "$filename.pst";	1313	aio_unlink "$filename.pst";
…		…
1168	aio_rename "$filename~", $filename;	1316	aio_rename "$filename~", $filename;
1169		1317
1170	$filename =~ s%/[^/]+$%%;	1318	$filename =~ s%/[^/]+$%%;
1171	aio_pathsync $filename if $cf::USE_FSYNC;	1319	aio_pathsync $filename if $cf::USE_FSYNC;
1172	} else {	1320	} else {
1173	warn "FATAL: $filename~: $!\n";	1321	error "unable to save objects: $filename~: $!\n";
1174	}	1322	}
1175	} else {	1323	} else {
1176	aio_unlink $filename;	1324	aio_unlink $filename;
1177	aio_unlink "$filename.pst";	1325	aio_unlink "$filename.pst";
1178	}	1326	}
…		…
1202	my $st = eval { Coro::Storable::thaw $av };	1350	my $st = eval { Coro::Storable::thaw $av };
1203	$av = $st->{objs};	1351	$av = $st->{objs};
1204	}	1352	}
1205		1353
1206	utf8::decode (my $decname = $filename);	1354	utf8::decode (my $decname = $filename);
1207	warn sprintf "loading %s (%d,%d)\n",	1355	trace sprintf "loading %s (%d,%d)\n",
1208	$decname, length $data, scalar @{$av || []};	1356	$decname, length $data, scalar @{$av || []}
		1357	if $VERBOSE_IO;
1209		1358
1210	($data, $av)	1359	($data, $av)
1211	}	1360	}
1212		1361
1213	=head2 COMMAND CALLBACKS	1362	=head2 COMMAND CALLBACKS
…		…
1272	}	1421	}
1273		1422
1274	use File::Glob ();	1423	use File::Glob ();
1275		1424
1276	cf::player->attach (	1425	cf::player->attach (
1277	on_command => sub {	1426	on_unknown_command => sub {
1278	my ($pl, $name, $params) = @_;	1427	my ($pl, $name, $params) = @_;
1279		1428
1280	my $cb = $COMMAND{$name}	1429	my $cb = $COMMAND{$name}
1281	or return;	1430	or return;
1282		1431
…		…
1305		1454
1306	$pl->ext_reply ($reply, @reply)	1455	$pl->ext_reply ($reply, @reply)
1307	if $reply;	1456	if $reply;
1308		1457
1309	} else {	1458	} else {
1310	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1459	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1311	}	1460	}
1312		1461
1313	cf::override;	1462	cf::override;
1314	},	1463	},
1315	);	1464	);
1316		1465
1317	# "readahead" all extensions	1466	# "readahead" all extensions
1318	sub cache_extensions {	1467	sub cache_extensions {
1319	my $grp = IO::AIO::aio_group;	1468	my $grp = IO::AIO::aio_group;
1320		1469
1321	add $grp IO::AIO::aio_readdir $LIBDIR, sub {	1470	add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322	for (grep /\.ext$/, @{$_[0]}) {	1471	for (grep /\.ext$/, @{$_[0]}) {
1323	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;	1472	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324	}	1473	}
1325	};	1474	};
1326		1475
1327	$grp	1476	$grp
1328	}	1477	}
1329		1478
1330	sub load_extensions {	1479	sub load_extensions {
		1480	info "loading extensions...";
		1481
1331	cf::sync_job {	1482	cf::sync_job {
1332	my %todo;	1483	my %todo;
1333		1484
1334	for my $path (<$LIBDIR/*.ext>) {	1485	for my $path (<$LIBDIR/*.ext>) {
1335	next unless -r $path;	1486	next unless -r $path;
…		…
1353		1504
1354	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1505	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1355	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1506	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1356		1507
1357	$ext{source} =	1508	$ext{source} =
1358	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1509	"package $pkg; use common::sense;\n"
1359	. "#line 1 \"$path\"\n{\n"	1510	. "#line 1 \"$path\"\n{\n"
1360	. $source	1511	. $source
1361	. "\n};\n1";	1512	. "\n};\n1";
1362		1513
1363	$todo{$base} = \%ext;	1514	$todo{$base} = \%ext;
1364	}	1515	}
1365		1516
		1517	my $pass = 0;
1366	my %done;	1518	my %done;
1367	while (%todo) {	1519	while (%todo) {
1368	my $progress;	1520	my $progress;
1369		1521
		1522	++$pass;
		1523
		1524	ext:
1370	while (my ($k, $v) = each %todo) {	1525	while (my ($k, $v) = each %todo) {
1371	for (split /,\s*/, $v->{meta}{depends}) {	1526	for (split /,\s*/, $v->{meta}{depends}) {
1372	goto skip	1527	next ext
1373	unless exists $done{$_};	1528	unless exists $done{$_};
1374	}	1529	}
1375		1530
1376	warn "... loading '$k' into '$v->{pkg}'\n";	1531	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1377		1532
1378	unless (eval $v->{source}) {	1533	my $active = eval $v->{source};
		1534
		1535	if (length $@) {
1379	my $msg = $@ ? "$v->{path}: $@\n"	1536	error "$v->{path}: $@\n";
1380	: "$v->{base}: extension inactive.\n";
1381		1537
1382	if (exists $v->{meta}{mandatory}) {
1383	warn $msg;
1384	cf::cleanup "mandatory extension failed to load, exiting.";	1538	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1385	}	1539	if exists $v->{meta}{mandatory};
1386		1540
1387	warn $msg;	1541	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1542	delete $todo{$k};
		1543	} else {
		1544	$done{$k} = delete $todo{$k};
		1545	push @EXTS, $v->{pkg};
		1546	$progress = 1;
		1547
		1548	info "$v->{base}: extension inactive.\n"
		1549	unless $active;
1388	}	1550	}
1389
1390	$done{$k} = delete $todo{$k};
1391	push @EXTS, $v->{pkg};
1392	$progress = 1;
1393	}	1551	}
1394		1552
1395	skip:	1553	unless ($progress) {
1396	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1554	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1397	unless $progress;	1555
		1556	while (my ($k, $v) = each %todo) {
		1557	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
		1558	if exists $v->{meta}{mandatory};
		1559	}
		1560
		1561	last;
		1562	}
1398	}	1563	}
1399	};	1564	};
1400	}	1565	}
1401		1566
1402	#############################################################################	1567	#############################################################################
…		…
1486	$cf::PLAYER{$login} = $pl	1651	$cf::PLAYER{$login} = $pl
1487	}	1652	}
1488	}	1653	}
1489	}	1654	}
1490		1655
		1656	cf::player->attach (
		1657	on_load => sub {
		1658	my ($pl, $path) = @_;
		1659
		1660	# restore slots saved in save, below
		1661	my $slots = delete $pl->{_slots};
		1662
		1663	$pl->ob->current_weapon ($slots->[0]);
		1664	$pl->combat_ob ($slots->[1]);
		1665	$pl->ranged_ob ($slots->[2]);
		1666	},
		1667	);
		1668
1491	sub save($) {	1669	sub save($) {
1492	my ($pl) = @_;	1670	my ($pl) = @_;
1493		1671
1494	return if $pl->{deny_save};	1672	return if $pl->{deny_save};
1495		1673
…		…
1500		1678
1501	aio_mkdir playerdir $pl, 0770;	1679	aio_mkdir playerdir $pl, 0770;
1502	$pl->{last_save} = $cf::RUNTIME;	1680	$pl->{last_save} = $cf::RUNTIME;
1503		1681
1504	cf::get_slot 0.01;	1682	cf::get_slot 0.01;
		1683
		1684	# save slots, to be restored later
		1685	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1505		1686
1506	$pl->save_pl ($path);	1687	$pl->save_pl ($path);
1507	cf::cede_to_tick;	1688	cf::cede_to_tick;
1508	}	1689	}
1509		1690
…		…
1543	my $name = $pl->ob->name;	1724	my $name = $pl->ob->name;
1544		1725
1545	$pl->{deny_save} = 1;	1726	$pl->{deny_save} = 1;
1546	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1727	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1547		1728
1548	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1729	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1549	$pl->deactivate;	1730	$pl->deactivate;
		1731
1550	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1732	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551	$pl->ob->check_score;
1552	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1733	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1734	ext::highscore::check ($pl->ob);
		1735
1553	$pl->ns->destroy if $pl->ns;	1736	$pl->ns->destroy if $pl->ns;
1554		1737
1555	my $path = playerdir $pl;	1738	my $path = playerdir $pl;
1556	my $temp = "$path~$cf::RUNTIME~deleting~";	1739	my $temp = "$path~$cf::RUNTIME~deleting~";
1557	aio_rename $path, $temp;	1740	aio_rename $path, $temp;
…		…
1611	\@logins	1794	\@logins
1612	}	1795	}
1613		1796
1614	=item $player->maps	1797	=item $player->maps
1615		1798
		1799	=item cf::player::maps $login
		1800
1616	Returns an arrayref of map paths that are private for this	1801	Returns an arrayref of map paths that are private for this
1617	player. May block.	1802	player. May block.
1618		1803
1619	=cut	1804	=cut
1620		1805
…		…
1682	=cut	1867	=cut
1683		1868
1684	sub find_by_path($) {	1869	sub find_by_path($) {
1685	my ($path) = @_;	1870	my ($path) = @_;
1686		1871
		1872	$path =~ s/^~[^\/]*//; # skip ~login
		1873
1687	my ($match, $specificity);	1874	my ($match, $specificity);
1688		1875
1689	for my $region (list) {	1876	for my $region (list) {
1690	if ($region->{match} && $path =~ $region->{match}) {	1877	if ($region->{match} && $path =~ $region->{match}) {
1691	($match, $specificity) = ($region, $region->specificity)	1878	($match, $specificity) = ($region, $region->specificity)
…		…
1719	sub generate_random_map {	1906	sub generate_random_map {
1720	my ($self, $rmp) = @_;	1907	my ($self, $rmp) = @_;
1721		1908
1722	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1909	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1723		1910
1724	# mit "rum" bekleckern, nicht
1725	$self->_create_random_map (	1911	$self->_create_random_map ($rmp);
1726	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1727	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1728	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1729	$rmp->{exit_on_final_map},
1730	$rmp->{xsize}, $rmp->{ysize},
1731	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1732	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1733	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1734	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1735	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1736	(cf::region::find $rmp->{region}), $rmp->{custom}
1737	)
1738	}	1912	}
1739		1913
1740	=item cf::map->register ($regex, $prio)	1914	=item cf::map->register ($regex, $prio)
1741		1915
1742	Register a handler for the map path matching the given regex at the	1916	Register a handler for the map path matching the given regex at the
…		…
1747		1921
1748	sub register {	1922	sub register {
1749	my (undef, $regex, $prio) = @_;	1923	my (undef, $regex, $prio) = @_;
1750	my $pkg = caller;	1924	my $pkg = caller;
1751		1925
1752	no strict;
1753	push @{"$pkg\::ISA"}, __PACKAGE__;	1926	push @{"$pkg\::ISA"}, __PACKAGE__;
1754		1927
1755	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1928	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1756	}	1929	}
1757		1930
1758	# also paths starting with '/'	1931	# also paths starting with '/'
1759	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1932	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1760		1933
1761	sub thawer_merge {	1934	sub thawer_merge {
1762	my ($self, $merge) = @_;	1935	my ($self, $merge) = @_;
1763		1936
1764	# we have to keep some variables in memory intact	1937	# we have to keep some variables in memory intact
…		…
1769	}	1942	}
1770		1943
1771	sub normalise {	1944	sub normalise {
1772	my ($path, $base) = @_;	1945	my ($path, $base) = @_;
1773		1946
1774	$path = "$path"; # make sure its a string	1947	$path = "$path"; # make sure it's a string
1775		1948
1776	$path =~ s/\.map$//;	1949	$path =~ s/\.map$//;
1777		1950
1778	# map plan:	1951	# map plan:
1779	#	1952	#
…		…
1781	# {... are special paths that are not being touched	1954	# {... are special paths that are not being touched
1782	# ?xxx/... are special absolute paths	1955	# ?xxx/... are special absolute paths
1783	# ?random/... random maps	1956	# ?random/... random maps
1784	# /... normal maps	1957	# /... normal maps
1785	# ~user/... per-player map of a specific user	1958	# ~user/... per-player map of a specific user
		1959	# !up !down for quad maps, or other maps with up/down layers
1786		1960
1787	$path =~ s/$PATH_SEP/\//go;	1961	$path =~ s/$PATH_SEP/\//go;
1788		1962
1789	# treat it as relative path if it starts with	1963	# treat it as relative path if it starts with
1790	# something that looks reasonable	1964	# something that looks reasonable
1791	if ($path =~ m{^(?:\./|\.\./|\w)}) {	1965	if ($path =~ m{^(?:\./|\.\./|\w)}) {
1792	$base or Carp::carp "normalise called with relative path and no base: '$path'";	1966	$base or Carp::carp "normalise called with relative path and no base: '$path'";
1793		1967
1794	$base =~ s{[^/]+/?$}{};	1968	$base =~ s{[^/]+/?$}{};
1795	$path = "$base/$path";	1969	$path = "$base/$path";
		1970
		1971	} elsif ($path eq '!up') {
		1972	$base && ref $base
		1973	or Carp::carp "normalise called with relative tile path and no base: '$path'";
		1974
		1975	my $uppth = $base->tile_path (cf::TILE_UP);
		1976	$path = $uppth if $uppth;
		1977
		1978	} elsif ($path eq '!down') {
		1979	$base && ref $base
		1980	or Carp::carp "normalise called with relative tile path and no base: '$path'";
		1981
		1982	my $dpth = $base->tile_path (cf::TILE_DOWN);
		1983	$path = $dpth if $dpth;
1796	}	1984	}
1797		1985
1798	for ($path) {	1986	for ($path) {
1799	redo if s{//}{/};
1800	redo if s{/\.?/}{/};	1987	redo if s{/\.?/}{/};
1801	redo if s{/[^/]+/\.\./}{/};	1988	redo if s{/[^/]+/\.\./}{/};
1802	}	1989	}
1803		1990
1804	$path	1991	$path
…		…
1818	$self->init; # pass $1 etc.	2005	$self->init; # pass $1 etc.
1819	return $self;	2006	return $self;
1820	}	2007	}
1821	}	2008	}
1822		2009
1823	Carp::cluck "unable to resolve path '$path' (base '$base').";	2010	Carp::cluck "unable to resolve path '$path' (base '$base')";
1824	()	2011	()
1825	}	2012	}
1826		2013
		2014	# may re-bless or do other evil things
1827	sub init {	2015	sub init {
1828	my ($self) = @_;	2016	my ($self) = @_;
1829		2017
1830	$self	2018	$self
1831	}	2019	}
…		…
1860	sub uniq_path {	2048	sub uniq_path {
1861	my ($self) = @_;	2049	my ($self) = @_;
1862		2050
1863	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;	2051	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864	"$UNIQUEDIR/$path"	2052	"$UNIQUEDIR/$path"
1865	}
1866
1867	# and all this just because we cannot iterate over
1868	# all maps in C++...
1869	sub change_all_map_light {
1870	my ($change) = @_;
1871
1872	$_->change_map_light ($change)
1873	for grep $_->outdoor, values %cf::MAP;
1874	}	2053	}
1875		2054
1876	sub decay_objects {	2055	sub decay_objects {
1877	my ($self) = @_;	2056	my ($self) = @_;
1878		2057
…		…
1960		2139
1961	sub find;	2140	sub find;
1962	sub find {	2141	sub find {
1963	my ($path, $origin) = @_;	2142	my ($path, $origin) = @_;
1964		2143
		2144	cf::cede_to_tick;
		2145
1965	$path = normalise $path, $origin && $origin->path;	2146	$path = normalise $path, $origin;
1966		2147
1967	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2148	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1968	my $guard2 = cf::lock_acquire "map_find:$path";	2149	my $guard2 = cf::lock_acquire "map_find:$path";
1969		2150
1970	$cf::MAP{$path} || do {	2151	$cf::MAP{$path} || do {
…		…
1987		2168
1988	$cf::MAP{$path} = $map	2169	$cf::MAP{$path} = $map
1989	}	2170	}
1990	}	2171	}
1991		2172
1992	sub pre_load { }	2173	sub pre_load { }
1993	sub post_load { }	2174	#sub post_load { } # XS
1994		2175
1995	sub load {	2176	sub load {
1996	my ($self) = @_;	2177	my ($self) = @_;
1997		2178
1998	local $self->{deny_reset} = 1; # loading can take a long time	2179	local $self->{deny_reset} = 1; # loading can take a long time
…		…
2010	$self->alloc;	2191	$self->alloc;
2011		2192
2012	$self->pre_load;	2193	$self->pre_load;
2013	cf::cede_to_tick;	2194	cf::cede_to_tick;
2014		2195
		2196	if (exists $self->{load_path}) {
2015	my $f = new_from_file cf::object::thawer $self->{load_path};	2197	my $f = new_from_file cf::object::thawer $self->{load_path};
2016	$f->skip_block;	2198	$f->skip_block;
2017	$self->_load_objects ($f)	2199	$self->_load_objects ($f)
2018	or return;	2200	or return;
2019		2201
2020	$self->post_load_original	2202	$self->post_load_original
2021	if delete $self->{load_original};	2203	if delete $self->{load_original};
2022		2204
2023	if (my $uniq = $self->uniq_path) {	2205	if (my $uniq = $self->uniq_path) {
2024	utf8::encode $uniq;	2206	utf8::encode $uniq;
2025	unless (aio_stat $uniq) {	2207	unless (aio_stat $uniq) {
2026	if (my $f = new_from_file cf::object::thawer $uniq) {	2208	if (my $f = new_from_file cf::object::thawer $uniq) {
2027	$self->clear_unique_items;	2209	$self->clear_unique_items;
2028	$self->_load_objects ($f);	2210	$self->_load_objects ($f);
2029	$f->resolve_delayed_derefs;	2211	$f->resolve_delayed_derefs;
		2212	}
2030	}	2213	}
2031	}	2214	}
2032	}
2033		2215
2034	$f->resolve_delayed_derefs;	2216	$f->resolve_delayed_derefs;
		2217	}
2035		2218
2036	cf::cede_to_tick;	2219	cf::cede_to_tick;
2037	# now do the right thing for maps	2220	# now do the right thing for maps
2038	$self->link_multipart_objects;	2221	$self->link_multipart_objects;
2039	$self->difficulty ($self->estimate_difficulty)	2222	$self->difficulty ($self->estimate_difficulty)
…		…
2043	unless ($self->{deny_activate}) {	2226	unless ($self->{deny_activate}) {
2044	$self->decay_objects;	2227	$self->decay_objects;
2045	$self->fix_auto_apply;	2228	$self->fix_auto_apply;
2046	$self->update_buttons;	2229	$self->update_buttons;
2047	cf::cede_to_tick;	2230	cf::cede_to_tick;
2048	$self->set_darkness_map;
2049	cf::cede_to_tick;
2050	$self->activate;	2231	$self->activate;
2051	}	2232	}
2052		2233
2053	$self->{last_save} = $cf::RUNTIME;	2234	$self->{last_save} = $cf::RUNTIME;
2054	$self->last_access ($cf::RUNTIME);	2235	$self->last_access ($cf::RUNTIME);
2055		2236
2056	$self->in_memory (cf::MAP_ACTIVE);	2237	$self->in_memory (cf::MAP_ACTIVE);
2057	}	2238	}
2058		2239
2059	$self->post_load;	2240	$self->post_load;
2060	}
2061		2241
		2242	1
		2243	}
		2244
		2245	# customize the map for a given player, i.e.
		2246	# return the _real_ map. used by e.g. per-player
		2247	# maps to change the path to ~playername/mappath
2062	sub customise_for {	2248	sub customise_for {
2063	my ($self, $ob) = @_;	2249	my ($self, $ob) = @_;
2064		2250
2065	return find "~" . $ob->name . "/" . $self->{path}	2251	return find "~" . $ob->name . "/" . $self->{path}
2066	if $self->per_player;	2252	if $self->per_player;
…		…
2082	or next;	2268	or next;
2083	$neigh = find $neigh, $map	2269	$neigh = find $neigh, $map
2084	or next;	2270	or next;
2085	$neigh->load;	2271	$neigh->load;
2086		2272
		2273	# now find the diagonal neighbours
2087	push @neigh,	2274	push @neigh,
2088	[$neigh->tile_path (($_ + 3) % 4), $neigh],	2275	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2089	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2276	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2090	}	2277	}
2091		2278
…		…
2098	}	2285	}
2099		2286
2100	sub find_sync {	2287	sub find_sync {
2101	my ($path, $origin) = @_;	2288	my ($path, $origin) = @_;
2102		2289
2103	cf::sync_job { find $path, $origin }	2290	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2291	if $Coro::current == $Coro::main;
		2292
		2293	find $path, $origin
2104	}	2294	}
2105		2295
2106	sub do_load_sync {	2296	sub do_load_sync {
2107	my ($map) = @_;	2297	my ($map) = @_;
2108		2298
2109	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2299	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2110	if $Coro::current == $Coro::main;	2300	if $Coro::current == $Coro::main;
2111		2301
2112	cf::sync_job { $map->load };	2302	$map->load;
2113	}	2303	}
2114		2304
2115	our %MAP_PREFETCH;	2305	our %MAP_PREFETCH;
2116	our $MAP_PREFETCHER = undef;	2306	our $MAP_PREFETCHER = undef;
2117		2307
2118	sub find_async {	2308	sub find_async {
2119	my ($path, $origin, $load) = @_;	2309	my ($path, $origin, $load) = @_;
2120		2310
2121	$path = normalise $path, $origin && $origin->{path};	2311	$path = normalise $path, $origin;
2122		2312
2123	if (my $map = $cf::MAP{$path}) {	2313	if (my $map = $cf::MAP{$path}) {
2124	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2314	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2125	}	2315	}
2126		2316
…		…
2143	$MAP_PREFETCHER->prio (6);	2333	$MAP_PREFETCHER->prio (6);
2144		2334
2145	()	2335	()
2146	}	2336	}
2147		2337
		2338	# common code, used by both ->save and ->swapout
2148	sub save {	2339	sub _save {
2149	my ($self) = @_;	2340	my ($self) = @_;
2150
2151	my $lock = cf::lock_acquire "map_data:$self->{path}";
2152		2341
2153	$self->{last_save} = $cf::RUNTIME;	2342	$self->{last_save} = $cf::RUNTIME;
2154		2343
2155	return unless $self->dirty;	2344	return unless $self->dirty;
2156		2345
…		…
2176	} else {	2365	} else {
2177	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2366	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2178	}	2367	}
2179	}	2368	}
2180		2369
		2370	sub save {
		2371	my ($self) = @_;
		2372
		2373	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2374
		2375	$self->_save;
		2376	}
		2377
2181	sub swap_out {	2378	sub swap_out {
2182	my ($self) = @_;	2379	my ($self) = @_;
2183		2380
2184	# save first because save cedes
2185	$self->save;
2186
2187	my $lock = cf::lock_acquire "map_data:$self->{path}";	2381	my $lock = cf::lock_acquire "map_data:$self->{path}";
2188		2382
2189	return if $self->players;
2190	return if $self->in_memory != cf::MAP_ACTIVE;	2383	return if $self->in_memory != cf::MAP_ACTIVE;
2191	return if $self->{deny_save};	2384	return if $self->{deny_save};
		2385	return if $self->players;
2192		2386
		2387	# first deactivate the map and "unlink" it from the core
		2388	$self->deactivate;
		2389	$_->clear_links_to ($self) for values %cf::MAP;
2193	$self->in_memory (cf::MAP_SWAPPED);	2390	$self->in_memory (cf::MAP_SWAPPED);
		2391
		2392	# then atomically save
		2393	$self->_save;
		2394
		2395	# then free the map
		2396	$self->clear;
		2397	}
		2398
		2399	sub reset_at {
		2400	my ($self) = @_;
		2401
		2402	# TODO: safety, remove and allow resettable per-player maps
		2403	return 1e99 if $self->{deny_reset};
		2404
		2405	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2406	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2407
		2408	$time + $to
		2409	}
		2410
		2411	sub should_reset {
		2412	my ($self) = @_;
		2413
		2414	$self->reset_at <= $cf::RUNTIME
		2415	}
		2416
		2417	sub reset {
		2418	my ($self) = @_;
		2419
		2420	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2421
		2422	return if $self->players;
		2423
		2424	cf::trace "resetting map ", $self->path, "\n";
		2425
		2426	$self->in_memory (cf::MAP_SWAPPED);
		2427
		2428	# need to save uniques path
		2429	unless ($self->{deny_save}) {
		2430	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2431
		2432	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2433	if $uniq;
		2434	}
		2435
		2436	delete $cf::MAP{$self->path};
2194		2437
2195	$self->deactivate;	2438	$self->deactivate;
2196	$_->clear_links_to ($self) for values %cf::MAP;	2439	$_->clear_links_to ($self) for values %cf::MAP;
2197	$self->clear;	2440	$self->clear;
2198	}
2199
2200	sub reset_at {
2201	my ($self) = @_;
2202
2203	# TODO: safety, remove and allow resettable per-player maps
2204	return 1e99 if $self->{deny_reset};
2205
2206	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2207	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2208
2209	$time + $to
2210	}
2211
2212	sub should_reset {
2213	my ($self) = @_;
2214
2215	$self->reset_at <= $cf::RUNTIME
2216	}
2217
2218	sub reset {
2219	my ($self) = @_;
2220
2221	my $lock = cf::lock_acquire "map_data:$self->{path}";
2222
2223	return if $self->players;
2224
2225	warn "resetting map ", $self->path;
2226
2227	$self->in_memory (cf::MAP_SWAPPED);
2228
2229	# need to save uniques path
2230	unless ($self->{deny_save}) {
2231	my $uniq = $self->uniq_path; utf8::encode $uniq;
2232
2233	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2234	if $uniq;
2235	}
2236
2237	delete $cf::MAP{$self->path};
2238
2239	$self->deactivate;
2240	$_->clear_links_to ($self) for values %cf::MAP;
2241	$self->clear;
2242		2441
2243	$self->unlink_save;	2442	$self->unlink_save;
2244	$self->destroy;	2443	$self->destroy;
2245	}	2444	}
2246		2445
…		…
2254		2453
2255	delete $cf::MAP{$self->path};	2454	delete $cf::MAP{$self->path};
2256		2455
2257	$self->unlink_save;	2456	$self->unlink_save;
2258		2457
2259	bless $self, "cf::map";	2458	bless $self, "cf::map::wrap";
2260	delete $self->{deny_reset};	2459	delete $self->{deny_reset};
2261	$self->{deny_save} = 1;	2460	$self->{deny_save} = 1;
2262	$self->reset_timeout (1);	2461	$self->reset_timeout (1);
2263	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2462	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2264		2463
…		…
2321	: normalise $_	2520	: normalise $_
2322	} @{ aio_readdir $UNIQUEDIR or [] }	2521	} @{ aio_readdir $UNIQUEDIR or [] }
2323	]	2522	]
2324	}	2523	}
2325		2524
		2525	=item cf::map::static_maps
		2526
		2527	Returns an arrayref if paths of all static maps (all preinstalled F<.map>
		2528	file in the shared directory excluding F</styles> and F</editor>). May
		2529	block.
		2530
		2531	=cut
		2532
		2533	sub static_maps() {
		2534	my @dirs = "";
		2535	my @maps;
		2536
		2537	while (@dirs) {
		2538	my $dir = shift @dirs;
		2539
		2540	next if $dir eq "/styles" || $dir eq "/editor";
		2541
		2542	my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
		2543	or return;
		2544
		2545	for (@$files) {
		2546	s/\.map$// or next;
		2547	utf8::decode $_;
		2548	push @maps, "$dir/$_";
		2549	}
		2550
		2551	push @dirs, map "$dir/$_", @$dirs;
		2552	}
		2553
		2554	\@maps
		2555	}
		2556
2326	=back	2557	=back
2327		2558
2328	=head3 cf::object	2559	=head3 cf::object
2329		2560
2330	=cut	2561	=cut
…		…
2395		2626
2396	our $SAY_CHANNEL = {	2627	our $SAY_CHANNEL = {
2397	id => "say",	2628	id => "say",
2398	title => "Map",	2629	title => "Map",
2399	reply => "say ",	2630	reply => "say ",
2400	tooltip => "Things said to and replied from npcs near you and other players on the same map only.",	2631	tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2401	};	2632	};
2402		2633
2403	our $CHAT_CHANNEL = {	2634	our $CHAT_CHANNEL = {
2404	id => "chat",	2635	id => "chat",
2405	title => "Chat",	2636	title => "Chat",
…		…
2462		2693
2463	Freezes the player and moves him/her to a special map (C<{link}>).	2694	Freezes the player and moves him/her to a special map (C<{link}>).
2464		2695
2465	The player should be reasonably safe there for short amounts of time (e.g.	2696	The player should be reasonably safe there for short amounts of time (e.g.
2466	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2697	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2467	though, as the palyer cannot control the character while it is on the link	2698	though, as the player cannot control the character while it is on the link
2468	map.	2699	map.
2469		2700
2470	Will never block.	2701	Will never block.
2471		2702
2472	=item $player_object->leave_link ($map, $x, $y)	2703	=item $player_object->leave_link ($map, $x, $y)
…		…
2493	sub cf::object::player::enter_link {	2724	sub cf::object::player::enter_link {
2494	my ($self) = @_;	2725	my ($self) = @_;
2495		2726
2496	$self->deactivate_recursive;	2727	$self->deactivate_recursive;
2497		2728
		2729	++$self->{_link_recursion};
		2730
2498	return if UNIVERSAL::isa $self->map, "ext::map_link";	2731	return if UNIVERSAL::isa $self->map, "ext::map_link";
2499		2732
2500	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2733	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2501	if $self->map && $self->map->{path} ne "{link}";	2734	if $self->map && $self->map->{path} ne "{link}";
2502		2735
2503	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2736	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2504	}	2737	}
2505		2738
2506	sub cf::object::player::leave_link {	2739	sub cf::object::player::leave_link {
2507	my ($self, $map, $x, $y) = @_;	2740	my ($self, $map, $x, $y) = @_;
2508		2741
…		…
2525	($x, $y) = (-1, -1)	2758	($x, $y) = (-1, -1)
2526	unless (defined $x) && (defined $y);	2759	unless (defined $x) && (defined $y);
2527		2760
2528	# use -1 or undef as default coordinates, not 0, 0	2761	# use -1 or undef as default coordinates, not 0, 0
2529	($x, $y) = ($map->enter_x, $map->enter_y)	2762	($x, $y) = ($map->enter_x, $map->enter_y)
2530	if $x <=0 && $y <= 0;	2763	if $x <= 0 && $y <= 0;
2531		2764
2532	$map->load;	2765	$map->load;
2533	$map->load_neighbours;	2766	$map->load_neighbours;
2534		2767
2535	return unless $self->contr->active;	2768	return unless $self->contr->active;
2536	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2537	$self->activate_recursive;
2538		2769
2539	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2770	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2540	$self->enter_map ($map, $x, $y);	2771	if ($self->enter_map ($map, $x, $y)) {
2541	}	2772	# entering was successful
		2773	delete $self->{_link_recursion};
		2774	# only activate afterwards, to support waiting in hooks
		2775	$self->activate_recursive;
		2776	}
2542		2777
		2778	}
		2779
2543	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2780	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2544		2781
2545	Moves the player to the given map-path and coordinates by first freezing	2782	Moves the player to the given map-path and coordinates by first freezing
2546	her, loading and preparing them map, calling the provided $check callback	2783	her, loading and preparing them map, calling the provided $check callback
2547	that has to return the map if sucecssful, and then unfreezes the player on	2784	that has to return the map if sucecssful, and then unfreezes the player on
2548	the new (success) or old (failed) map position. In either case, $done will	2785	the new (success) or old (failed) map position. In either case, $done will
…		…
2555		2792
2556	our $GOTOGEN;	2793	our $GOTOGEN;
2557		2794
2558	sub cf::object::player::goto {	2795	sub cf::object::player::goto {
2559	my ($self, $path, $x, $y, $check, $done) = @_;	2796	my ($self, $path, $x, $y, $check, $done) = @_;
		2797
		2798	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2799	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2800	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2801	($path, $x, $y) = @$EMERGENCY_POSITION;
		2802	}
2560		2803
2561	# do generation counting so two concurrent goto's will be executed in-order	2804	# do generation counting so two concurrent goto's will be executed in-order
2562	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2805	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2563		2806
2564	$self->enter_link;	2807	$self->enter_link;
…		…
2584	($path, $x, $y) = (undef, undef, undef);	2827	($path, $x, $y) = (undef, undef, undef);
2585	}	2828	}
2586	}	2829	}
2587		2830
2588	my $map = eval {	2831	my $map = eval {
2589	my $map = defined $path ? cf::map::find $path : undef;	2832	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2590		2833
2591	if ($map) {	2834	if ($map) {
2592	$map = $map->customise_for ($self);	2835	$map = $map->customise_for ($self);
2593	$map = $check->($map) if $check && $map;	2836	$map = $check->($map, $x, $y, $self) if $check && $map;
2594	} else {	2837	} else {
2595	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2838	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2596	}	2839	}
2597		2840
2598	$map	2841	$map
…		…
2606	if ($gen == $self->{_goto_generation}) {	2849	if ($gen == $self->{_goto_generation}) {
2607	delete $self->{_goto_generation};	2850	delete $self->{_goto_generation};
2608	$self->leave_link ($map, $x, $y);	2851	$self->leave_link ($map, $x, $y);
2609	}	2852	}
2610		2853
2611	$done->() if $done;	2854	$done->($self) if $done;
2612	})->prio (1);	2855	})->prio (1);
2613	}	2856	}
2614		2857
2615	=item $player_object->enter_exit ($exit_object)	2858	=item $player_object->enter_exit ($exit_object)
2616		2859
…		…
2692		2935
2693	prepare_random_map $exit	2936	prepare_random_map $exit
2694	if $exit->slaying eq "/!";	2937	if $exit->slaying eq "/!";
2695	}	2938	}
2696		2939
2697	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2940	my $map = cf::map::normalise $exit->slaying, $exit->map;
2698	my $x = $exit->stats->hp;	2941	my $x = $exit->stats->hp;
2699	my $y = $exit->stats->sp;	2942	my $y = $exit->stats->sp;
2700		2943
2701	$self->goto ($map, $x, $y);	2944	$self->goto ($map, $x, $y);
2702		2945
…		…
2709	$self->message ("Something went wrong deep within the deliantra server. "	2952	$self->message ("Something went wrong deep within the deliantra server. "
2710	. "I'll try to bring you back to the map you were before. "	2953	. "I'll try to bring you back to the map you were before. "
2711	. "Please report this to the dungeon master!",	2954	. "Please report this to the dungeon master!",
2712	cf::NDI_UNIQUE | cf::NDI_RED);	2955	cf::NDI_UNIQUE | cf::NDI_RED);
2713		2956
2714	warn "ERROR in enter_exit: $@";	2957	error "ERROR in enter_exit: $@";
2715	$self->leave_link;	2958	$self->leave_link;
2716	}	2959	}
2717	})->prio (1);	2960	})->prio (1);
2718	}	2961	}
2719		2962
…		…
2731	sub cf::client::send_drawinfo {	2974	sub cf::client::send_drawinfo {
2732	my ($self, $text, $flags) = @_;	2975	my ($self, $text, $flags) = @_;
2733		2976
2734	utf8::encode $text;	2977	utf8::encode $text;
2735	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2978	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
		2979	}
		2980
		2981	=item $client->send_big_packet ($pkt)
		2982
		2983	Like C<send_packet>, but tries to compress large packets, and fragments
		2984	them as required.
		2985
		2986	=cut
		2987
		2988	our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
		2989
		2990	sub cf::client::send_big_packet {
		2991	my ($self, $pkt) = @_;
		2992
		2993	# try lzf for large packets
		2994	$pkt = "lzf " . Compress::LZF::compress $pkt
		2995	if 1024 <= length $pkt and $self->{can_lzf};
		2996
		2997	# split very large packets
		2998	if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
		2999	$self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
		3000	$pkt = "frag";
		3001	}
		3002
		3003	$self->send_packet ($pkt);
2736	}	3004	}
2737		3005
2738	=item $client->send_msg ($channel, $msg, $color, [extra...])	3006	=item $client->send_msg ($channel, $msg, $color, [extra...])
2739		3007
2740	Send a drawinfo or msg packet to the client, formatting the msg for the	3008	Send a drawinfo or msg packet to the client, formatting the msg for the
…		…
2744		3012
2745	=cut	3013	=cut
2746		3014
2747	# non-persistent channels (usually the info channel)	3015	# non-persistent channels (usually the info channel)
2748	our %CHANNEL = (	3016	our %CHANNEL = (
		3017	"c/motd" => {
		3018	id => "infobox",
		3019	title => "MOTD",
		3020	reply => undef,
		3021	tooltip => "The message of the day",
		3022	},
2749	"c/identify" => {	3023	"c/identify" => {
2750	id => "infobox",	3024	id => "infobox",
2751	title => "Identify",	3025	title => "Identify",
2752	reply => undef,	3026	reply => undef,
2753	tooltip => "Items recently identified",	3027	tooltip => "Items recently identified",
…		…
2755	"c/examine" => {	3029	"c/examine" => {
2756	id => "infobox",	3030	id => "infobox",
2757	title => "Examine",	3031	title => "Examine",
2758	reply => undef,	3032	reply => undef,
2759	tooltip => "Signs and other items you examined",	3033	tooltip => "Signs and other items you examined",
		3034	},
		3035	"c/shopinfo" => {
		3036	id => "infobox",
		3037	title => "Shop Info",
		3038	reply => undef,
		3039	tooltip => "What your bargaining skill tells you about the shop",
2760	},	3040	},
2761	"c/book" => {	3041	"c/book" => {
2762	id => "infobox",	3042	id => "infobox",
2763	title => "Book",	3043	title => "Book",
2764	reply => undef,	3044	reply => undef,
…		…
2780	id => "infobox",	3060	id => "infobox",
2781	title => "Body Parts",	3061	title => "Body Parts",
2782	reply => undef,	3062	reply => undef,
2783	tooltip => "Shows which body parts you posess and are available",	3063	tooltip => "Shows which body parts you posess and are available",
2784	},	3064	},
		3065	"c/statistics" => {
		3066	id => "infobox",
		3067	title => "Statistics",
		3068	reply => undef,
		3069	tooltip => "Shows your primary statistics",
		3070	},
2785	"c/skills" => {	3071	"c/skills" => {
2786	id => "infobox",	3072	id => "infobox",
2787	title => "Skills",	3073	title => "Skills",
2788	reply => undef,	3074	reply => undef,
2789	tooltip => "Shows your experience per skill and item power",	3075	tooltip => "Shows your experience per skill and item power",
		3076	},
		3077	"c/shopitems" => {
		3078	id => "infobox",
		3079	title => "Shop Items",
		3080	reply => undef,
		3081	tooltip => "Shows the items currently for sale in this shop",
		3082	},
		3083	"c/resistances" => {
		3084	id => "infobox",
		3085	title => "Resistances",
		3086	reply => undef,
		3087	tooltip => "Shows your resistances",
		3088	},
		3089	"c/pets" => {
		3090	id => "infobox",
		3091	title => "Pets",
		3092	reply => undef,
		3093	tooltip => "Shows information abotu your pets/a specific pet",
		3094	},
		3095	"c/perceiveself" => {
		3096	id => "infobox",
		3097	title => "Perceive Self",
		3098	reply => undef,
		3099	tooltip => "You gained detailed knowledge about yourself",
2790	},	3100	},
2791	"c/uptime" => {	3101	"c/uptime" => {
2792	id => "infobox",	3102	id => "infobox",
2793	title => "Uptime",	3103	title => "Uptime",
2794	reply => undef,	3104	reply => undef,
…		…
2804	id => "party",	3114	id => "party",
2805	title => "Party",	3115	title => "Party",
2806	reply => "gsay ",	3116	reply => "gsay ",
2807	tooltip => "Messages and chat related to your party",	3117	tooltip => "Messages and chat related to your party",
2808	},	3118	},
		3119	"c/death" => {
		3120	id => "death",
		3121	title => "Death",
		3122	reply => undef,
		3123	tooltip => "Reason for and more info about your most recent death",
		3124	},
		3125	"c/say" => $SAY_CHANNEL,
		3126	"c/chat" => $CHAT_CHANNEL,
2809	);	3127	);
2810		3128
2811	sub cf::client::send_msg {	3129	sub cf::client::send_msg {
2812	my ($self, $channel, $msg, $color, @extra) = @_;	3130	my ($self, $channel, $msg, $color, @extra) = @_;
2813		3131
…		…
2818		3136
2819	# check predefined channels, for the benefit of C	3137	# check predefined channels, for the benefit of C
2820	if ($CHANNEL{$channel}) {	3138	if ($CHANNEL{$channel}) {
2821	$channel = $CHANNEL{$channel};	3139	$channel = $CHANNEL{$channel};
2822		3140
2823	$self->ext_msg (channel_info => $channel)	3141	$self->ext_msg (channel_info => $channel);
2824	if $self->can_msg;
2825
2826	$channel = $channel->{id};	3142	$channel = $channel->{id};
2827		3143
2828	} elsif (ref $channel) {	3144	} elsif (ref $channel) {
2829	# send meta info to client, if not yet sent	3145	# send meta info to client, if not yet sent
2830	unless (exists $self->{channel}{$channel->{id}}) {	3146	unless (exists $self->{channel}{$channel->{id}}) {
2831	$self->{channel}{$channel->{id}} = $channel;	3147	$self->{channel}{$channel->{id}} = $channel;
2832	$self->ext_msg (channel_info => $channel)	3148	$self->ext_msg (channel_info => $channel);
2833	if $self->can_msg;
2834	}	3149	}
2835		3150
2836	$channel = $channel->{id};	3151	$channel = $channel->{id};
2837	}	3152	}
2838		3153
2839	return unless @extra || length $msg;	3154	return unless @extra || length $msg;
2840		3155
2841	if ($self->can_msg) {
2842	# default colour, mask it out	3156	# default colour, mask it out
2843	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)	3157	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2844	if $color & cf::NDI_DEF;	3158	if $color & cf::NDI_DEF;
2845		3159
2846	my $pkt = "msg "	3160	my $pkt = "msg "
2847	. $self->{json_coder}->encode (	3161	. $self->{json_coder}->encode (
2848	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	3162	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2849	);	3163	);
2850		3164
2851	# try lzf for large packets
2852	$pkt = "lzf " . Compress::LZF::compress $pkt
2853	if 1024 <= length $pkt and $self->{can_lzf};
2854
2855	# split very large packets
2856	if (8192 < length $pkt and $self->{can_lzf}) {
2857	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2858	$pkt = "frag";
2859	}
2860
2861	$self->send_packet ($pkt);	3165	$self->send_big_packet ($pkt);
2862	} else {
2863	if ($color >= 0) {
2864	# replace some tags by gcfclient-compatible ones
2865	for ($msg) {
2866	1 while
2867	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2868	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2869	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2870	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2871	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2872	}
2873
2874	$color &= cf::NDI_COLOR_MASK;
2875
2876	utf8::encode $msg;
2877
2878	if (0 && $msg =~ /\[/) {
2879	# COMMAND/INFO
2880	$self->send_packet ("drawextinfo $color 10 8 $msg")
2881	} else {
2882	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2883	$self->send_packet ("drawinfo $color $msg")
2884	}
2885	}
2886	}
2887	}	3166	}
2888		3167
2889	=item $client->ext_msg ($type, @msg)	3168	=item $client->ext_msg ($type, @msg)
2890		3169
2891	Sends an ext event to the client.	3170	Sends an ext event to the client.
…		…
2894		3173
2895	sub cf::client::ext_msg($$@) {	3174	sub cf::client::ext_msg($$@) {
2896	my ($self, $type, @msg) = @_;	3175	my ($self, $type, @msg) = @_;
2897		3176
2898	if ($self->extcmd == 2) {	3177	if ($self->extcmd == 2) {
2899	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3178	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2900	} elsif ($self->extcmd == 1) { # TODO: remove	3179	} elsif ($self->extcmd == 1) { # TODO: remove
2901	push @msg, msgtype => "event_$type";	3180	push @msg, msgtype => "event_$type";
2902	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3181	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2903	}	3182	}
2904	}	3183	}
2905		3184
2906	=item $client->ext_reply ($msgid, @msg)	3185	=item $client->ext_reply ($msgid, @msg)
2907		3186
…		…
2911		3190
2912	sub cf::client::ext_reply($$@) {	3191	sub cf::client::ext_reply($$@) {
2913	my ($self, $id, @msg) = @_;	3192	my ($self, $id, @msg) = @_;
2914		3193
2915	if ($self->extcmd == 2) {	3194	if ($self->extcmd == 2) {
2916	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3195	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2917	} elsif ($self->extcmd == 1) {	3196	} elsif ($self->extcmd == 1) {
2918	#TODO: version 1, remove	3197	#TODO: version 1, remove
2919	unshift @msg, msgtype => "reply", msgid => $id;	3198	unshift @msg, msgtype => "reply", msgid => $id;
2920	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3199	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2921	}	3200	}
2922	}	3201	}
2923		3202
2924	=item $success = $client->query ($flags, "text", \&cb)	3203	=item $success = $client->query ($flags, "text", \&cb)
2925		3204
…		…
2996		3275
2997	$ns->ext_reply ($reply, @reply)	3276	$ns->ext_reply ($reply, @reply)
2998	if $reply;	3277	if $reply;
2999		3278
3000	} else {	3279	} else {
3001	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3280	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3002	}	3281	}
3003		3282
3004	cf::override;	3283	cf::override;
3005	},	3284	},
3006	);	3285	);
…		…
3026		3305
3027	$coro	3306	$coro
3028	}	3307	}
3029		3308
3030	cf::client->attach (	3309	cf::client->attach (
3031	on_destroy => sub {	3310	on_client_destroy => sub {
3032	my ($ns) = @_;	3311	my ($ns) = @_;
3033		3312
3034	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3313	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3035	},	3314	},
3036	);	3315	);
…		…
3052	our $safe_hole = new Safe::Hole;	3331	our $safe_hole = new Safe::Hole;
3053		3332
3054	$SIG{FPE} = 'IGNORE';	3333	$SIG{FPE} = 'IGNORE';
3055		3334
3056	$safe->permit_only (Opcode::opset qw(	3335	$safe->permit_only (Opcode::opset qw(
3057	:base_core :base_mem :base_orig :base_math	3336	:base_core :base_mem :base_orig :base_math :base_loop
3058	grepstart grepwhile mapstart mapwhile	3337	grepstart grepwhile mapstart mapwhile
3059	sort time	3338	sort time
3060	));	3339	));
3061		3340
3062	# here we export the classes and methods available to script code	3341	# here we export the classes and methods available to script code
…		…
3066	The following functions and methods are available within a safe environment:	3345	The following functions and methods are available within a safe environment:
3067		3346
3068	cf::object	3347	cf::object
3069	contr pay_amount pay_player map x y force_find force_add destroy	3348	contr pay_amount pay_player map x y force_find force_add destroy
3070	insert remove name archname title slaying race decrease split	3349	insert remove name archname title slaying race decrease split
		3350	value
3071		3351
3072	cf::object::player	3352	cf::object::player
3073	player	3353	player
3074		3354
3075	cf::player	3355	cf::player
…		…
3081	=cut	3361	=cut
3082		3362
3083	for (	3363	for (
3084	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3364	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3085	insert remove inv nrof name archname title slaying race	3365	insert remove inv nrof name archname title slaying race
3086	decrease split destroy change_exp)],	3366	decrease split destroy change_exp value msg lore send_msg)],
3087	["cf::object::player" => qw(player)],	3367	["cf::object::player" => qw(player)],
3088	["cf::player" => qw(peaceful)],	3368	["cf::player" => qw(peaceful send_msg)],
3089	["cf::map" => qw(trigger)],	3369	["cf::map" => qw(trigger)],
3090	) {	3370	) {
3091	no strict 'refs';
3092	my ($pkg, @funs) = @$_;	3371	my ($pkg, @funs) = @$_;
3093	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3372	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3094	for @funs;	3373	for @funs;
3095	}	3374	}
3096		3375
…		…
3111		3390
3112	my $qcode = $code;	3391	my $qcode = $code;
3113	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3392	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3114	$qcode =~ s/\n/\\n/g;	3393	$qcode =~ s/\n/\\n/g;
3115		3394
		3395	%vars = (_dummy => 0) unless %vars;
		3396
		3397	my @res;
3116	local $_;	3398	local $_;
3117	local @safe::cf::_safe_eval_args = values %vars;
3118		3399
3119	my $eval =	3400	my $eval =
3120	"do {\n"	3401	"do {\n"
3121	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3402	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3122	. "#line 0 \"{$qcode}\"\n"	3403	. "#line 0 \"{$qcode}\"\n"
3123	. $code	3404	. $code
3124	. "\n}"	3405	. "\n}"
3125	;	3406	;
3126		3407
		3408	if ($CFG{safe_eval}) {
3127	sub_generation_inc;	3409	sub_generation_inc;
		3410	local @safe::cf::_safe_eval_args = values %vars;
3128	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3411	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3129	sub_generation_inc;	3412	sub_generation_inc;
		3413	} else {
		3414	local @cf::_safe_eval_args = values %vars;
		3415	@res = wantarray ? eval eval : scalar eval $eval;
		3416	}
3130		3417
3131	if ($@) {	3418	if ($@) {
3132	warn "$@";	3419	warn "$@",
3133	warn "while executing safe code '$code'\n";	3420	"while executing safe code '$code'\n",
3134	warn "with arguments " . (join " ", %vars) . "\n";	3421	"with arguments " . (join " ", %vars) . "\n";
3135	}	3422	}
3136		3423
3137	wantarray ? @res : $res[0]	3424	wantarray ? @res : $res[0]
3138	}	3425	}
3139		3426
…		…
3153	=cut	3440	=cut
3154		3441
3155	sub register_script_function {	3442	sub register_script_function {
3156	my ($fun, $cb) = @_;	3443	my ($fun, $cb) = @_;
3157		3444
3158	no strict 'refs';	3445	$fun = "safe::$fun" if $CFG{safe_eval};
3159	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3446	*$fun = $safe_hole->wrap ($cb);
3160	}	3447	}
3161		3448
3162	=back	3449	=back
3163		3450
3164	=cut	3451	=cut
…		…
3173	# for this (global event?)	3460	# for this (global event?)
3174	%ext::player_env::MUSIC_FACE_CACHE = ();	3461	%ext::player_env::MUSIC_FACE_CACHE = ();
3175		3462
3176	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3463	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3177		3464
3178	warn "loading facedata from $path\n";	3465	trace "loading facedata from $path\n";
3179		3466
3180	my $facedata;	3467	my $facedata = decode_storable load_file $path;
3181	0 < aio_load $path, $facedata
3182	or die "$path: $!";
3183
3184	$facedata = Coro::Storable::thaw $facedata;
3185		3468
3186	$facedata->{version} == 2	3469	$facedata->{version} == 2
3187	or cf::cleanup "$path: version mismatch, cannot proceed.";	3470	or cf::cleanup "$path: version mismatch, cannot proceed.";
3188		3471
3189	# patch in the exptable	3472	# patch in the exptable
		3473	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3190	$facedata->{resource}{"res/exp_table"} = {	3474	$facedata->{resource}{"res/exp_table"} = {
3191	type => FT_RSRC,	3475	type => FT_RSRC,
3192	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),	3476	data => $exp_table,
		3477	hash => (Digest::MD5::md5 $exp_table),
3193	};	3478	};
3194	cf::cede_to_tick;	3479	cf::cede_to_tick;
3195		3480
3196	{	3481	{
3197	my $faces = $facedata->{faceinfo};	3482	my $faces = $facedata->{faceinfo};
…		…
3199	while (my ($face, $info) = each %$faces) {	3484	while (my ($face, $info) = each %$faces) {
3200	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3485	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3201		3486
3202	cf::face::set_visibility $idx, $info->{visibility};	3487	cf::face::set_visibility $idx, $info->{visibility};
3203	cf::face::set_magicmap $idx, $info->{magicmap};	3488	cf::face::set_magicmap $idx, $info->{magicmap};
3204	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3489	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3205	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3490	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
		3491	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3206		3492
3207	cf::cede_to_tick;	3493	cf::cede_to_tick;
3208	}	3494	}
3209		3495
3210	while (my ($face, $info) = each %$faces) {	3496	while (my ($face, $info) = each %$faces) {
…		…
3215		3501
3216	if (my $smooth = cf::face::find $info->{smooth}) {	3502	if (my $smooth = cf::face::find $info->{smooth}) {
3217	cf::face::set_smooth $idx, $smooth;	3503	cf::face::set_smooth $idx, $smooth;
3218	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3504	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3219	} else {	3505	} else {
3220	warn "smooth face '$info->{smooth}' not found for face '$face'";	3506	error "smooth face '$info->{smooth}' not found for face '$face'";
3221	}	3507	}
3222		3508
3223	cf::cede_to_tick;	3509	cf::cede_to_tick;
3224	}	3510	}
3225	}	3511	}
…		…
3234		3520
3235	cf::anim::invalidate_all; # d'oh	3521	cf::anim::invalidate_all; # d'oh
3236	}	3522	}
3237		3523
3238	{	3524	{
3239	# TODO: for gcfclient pleasure, we should give resources
3240	# that gcfclient doesn't grok a >10000 face index.
3241	my $res = $facedata->{resource};	3525	my $res = $facedata->{resource};
3242		3526
3243	while (my ($name, $info) = each %$res) {	3527	while (my ($name, $info) = each %$res) {
3244	if (defined $info->{type}) {	3528	if (defined $info->{type}) {
3245	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3529	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3246	my $data;
3247		3530
3248	if ($info->{type} & 1) {	3531	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3249	# prepend meta info
3250
3251	my $meta = $enc->encode ({
3252	name => $name,
3253	%{ $info->{meta} || {} },
3254	});
3255
3256	$data = pack "(w/a*)*", $meta, $info->{data};
3257	} else {
3258	$data = $info->{data};
3259	}
3260
3261	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3262	cf::face::set_type $idx, $info->{type};	3532	cf::face::set_type $idx, $info->{type};
3263	} else {	3533	} else {
3264	$RESOURCE{$name} = $info;	3534	$RESOURCE{$name} = $info; # unused
3265	}	3535	}
3266		3536
3267	cf::cede_to_tick;	3537	cf::cede_to_tick;
3268	}	3538	}
3269	}	3539	}
3270		3540
3271	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3541	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3272		3542
3273	1	3543	1
3274	}	3544	}
3275
3276	cf::global->attach (on_resource_update => sub {
3277	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3278	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3279
3280	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3281	my $sound = $soundconf->{compat}[$_]
3282	or next;
3283
3284	my $face = cf::face::find "sound/$sound->[1]";
3285	cf::sound::set $sound->[0] => $face;
3286	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3287	}
3288
3289	while (my ($k, $v) = each %{$soundconf->{event}}) {
3290	my $face = cf::face::find "sound/$v";
3291	cf::sound::set $k => $face;
3292	}
3293	}
3294	});
3295		3545
3296	register_exticmd fx_want => sub {	3546	register_exticmd fx_want => sub {
3297	my ($ns, $want) = @_;	3547	my ($ns, $want) = @_;
3298		3548
3299	while (my ($k, $v) = each %$want) {	3549	while (my ($k, $v) = each %$want) {
…		…
3338	sub reload_treasures {	3588	sub reload_treasures {
3339	load_resource_file "$DATADIR/treasures"	3589	load_resource_file "$DATADIR/treasures"
3340	or die "unable to load treasurelists\n";	3590	or die "unable to load treasurelists\n";
3341	}	3591	}
3342		3592
		3593	sub reload_sound {
		3594	trace "loading sound config from $DATADIR/sound\n";
		3595
		3596	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3597
		3598	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3599	my $sound = $soundconf->{compat}[$_]
		3600	or next;
		3601
		3602	my $face = cf::face::find "sound/$sound->[1]";
		3603	cf::sound::set $sound->[0] => $face;
		3604	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3605	}
		3606
		3607	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3608	my $face = cf::face::find "sound/$v";
		3609	cf::sound::set $k => $face;
		3610	}
		3611	}
		3612
3343	sub reload_resources {	3613	sub reload_resources {
3344	warn "reloading resource files...\n";	3614	trace "reloading resource files...\n";
3345		3615
		3616	reload_exp_table;
		3617	reload_materials;
3346	reload_facedata;	3618	reload_facedata;
		3619	reload_sound;
3347	reload_archetypes;	3620	reload_archetypes;
3348	reload_regions;	3621	reload_regions;
3349	reload_treasures;	3622	reload_treasures;
3350		3623
3351	warn "finished reloading resource files\n";	3624	trace "finished reloading resource files\n";
3352	}	3625	}
3353		3626
3354	sub reload_config {	3627	sub reload_config {
3355	open my $fh, "<:utf8", "$CONFDIR/config"	3628	trace "reloading config file...\n";
3356	or return;
3357		3629
3358	local $/;	3630	my $config = load_file "$CONFDIR/config";
3359	*CFG = YAML::Load <$fh>;	3631	utf8::decode $config;
		3632	*CFG = decode_yaml $config;
3360		3633
3361	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3634	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3362		3635
3363	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3636	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3364	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3637	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3365		3638
3366	if (exists $CFG{mlockall}) {	3639	if (exists $CFG{mlockall}) {
…		…
3389		3662
3390	seek $fh, 0, 0;	3663	seek $fh, 0, 0;
3391	print $fh $$;	3664	print $fh $$;
3392	}	3665	}
3393		3666
		3667	sub main_loop {
		3668	trace "EV::loop starting\n";
		3669	if (1) {
		3670	EV::loop;
		3671	}
		3672	trace "EV::loop returned\n";
		3673	goto &main_loop unless $REALLY_UNLOOP;
		3674	}
		3675
3394	sub main {	3676	sub main {
3395	cf::init_globals; # initialise logging	3677	cf::init_globals; # initialise logging
3396		3678
3397	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3679	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3398	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3680	LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3399	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3681	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3400	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3682	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3401
3402	cf::init_experience;
3403	cf::init_anim;
3404	cf::init_attackmess;
3405	cf::init_dynamic;
3406	cf::init_block;
3407		3683
3408	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3684	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3409		3685
3410	# we must not ever block the main coroutine	3686	# we must not ever block the main coroutine
3411	local $Coro::idle = sub {	3687	local $Coro::idle = sub {
…		…
3417	};	3693	};
3418		3694
3419	evthread_start IO::AIO::poll_fileno;	3695	evthread_start IO::AIO::poll_fileno;
3420		3696
3421	cf::sync_job {	3697	cf::sync_job {
		3698	cf::incloader::init ();
		3699
		3700	cf::init_anim;
		3701	cf::init_attackmess;
		3702	cf::init_dynamic;
		3703
		3704	cf::load_settings;
		3705
3422	reload_resources;	3706	reload_resources;
3423	reload_config;	3707	reload_config;
3424	db_init;	3708	db_init;
3425		3709
3426	cf::load_settings;
3427	cf::load_materials;
3428	cf::init_uuid;	3710	cf::init_uuid;
3429	cf::init_signals;	3711	cf::init_signals;
3430	cf::init_commands;
3431	cf::init_skills;	3712	cf::init_skills;
3432		3713
3433	cf::init_beforeplay;	3714	cf::init_beforeplay;
3434		3715
3435	atomic;	3716	atomic;
…		…
3437	load_extensions;	3718	load_extensions;
3438		3719
3439	utime time, time, $RUNTIMEFILE;	3720	utime time, time, $RUNTIMEFILE;
3440		3721
3441	# no (long-running) fork's whatsoever before this point(!)	3722	# no (long-running) fork's whatsoever before this point(!)
		3723	use POSIX ();
3442	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3724	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3443		3725
3444	(pop @POST_INIT)->(0) while @POST_INIT;	3726	cf::_post_init 0;
3445	};	3727	};
3446		3728
3447	EV::loop;	3729	cf::object::thawer::errors_are_fatal 0;
		3730	info "parse errors in files are no longer fatal from this point on.\n";
		3731
		3732	my $free_main; $free_main = EV::idle sub {
		3733	undef $free_main;
		3734	undef &main; # free gobs of memory :)
		3735	};
		3736
		3737	goto &main_loop;
3448	}	3738	}
3449		3739
3450	#############################################################################	3740	#############################################################################
3451	# initialisation and cleanup	3741	# initialisation and cleanup
3452		3742
3453	# install some emergency cleanup handlers	3743	# install some emergency cleanup handlers
3454	BEGIN {	3744	BEGIN {
3455	our %SIGWATCHER = ();	3745	our %SIGWATCHER = ();
3456	for my $signal (qw(INT HUP TERM)) {	3746	for my $signal (qw(INT HUP TERM)) {
3457	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3747	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3458	cf::cleanup "SIG$signal";	3748	cf::cleanup "SIG$signal";
3459	};	3749	};
3460	}	3750	}
3461	}	3751	}
3462		3752
3463	sub write_runtime_sync {	3753	sub write_runtime_sync {
		3754	my $t0 = AE::time;
		3755
3464	# first touch the runtime file to show we are still running:	3756	# first touch the runtime file to show we are still running:
3465	# the fsync below can take a very very long time.	3757	# the fsync below can take a very very long time.
3466		3758
3467	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3759	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3468		3760
3469	my $guard = cf::lock_acquire "write_runtime";	3761	my $guard = cf::lock_acquire "write_runtime";
3470		3762
3471	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3763	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3472	or return;	3764	or return;
3473		3765
3474	my $value = $cf::RUNTIME + 90 + 10;	3766	my $value = $cf::RUNTIME + 90 + 10;
3475	# 10 is the runtime save interval, for a monotonic clock	3767	# 10 is the runtime save interval, for a monotonic clock
3476	# 60 allows for the watchdog to kill the server.	3768	# 60 allows for the watchdog to kill the server.
…		…
3489	or return;	3781	or return;
3490		3782
3491	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3783	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3492	and return;	3784	and return;
3493		3785
3494	warn "runtime file written.\n";	3786	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3495		3787
3496	1	3788	1
3497	}	3789	}
3498		3790
3499	our $uuid_lock;	3791	our $uuid_lock;
…		…
3511	or return;	3803	or return;
3512		3804
3513	my $value = uuid_seq uuid_cur;	3805	my $value = uuid_seq uuid_cur;
3514		3806
3515	unless ($value) {	3807	unless ($value) {
3516	warn "cowardly refusing to write zero uuid value!\n";	3808	info "cowardly refusing to write zero uuid value!\n";
3517	return;	3809	return;
3518	}	3810	}
3519		3811
3520	my $value = uuid_str $value + $uuid_skip;	3812	my $value = uuid_str $value + $uuid_skip;
3521	$uuid_skip = 0;	3813	$uuid_skip = 0;
…		…
3531	or return;	3823	or return;
3532		3824
3533	aio_rename "$uuid~", $uuid	3825	aio_rename "$uuid~", $uuid
3534	and return;	3826	and return;
3535		3827
3536	warn "uuid file written ($value).\n";	3828	trace "uuid file written ($value).\n";
3537		3829
3538	1	3830	1
3539		3831
3540	}	3832	}
3541		3833
…		…
3547	}	3839	}
3548		3840
3549	sub emergency_save() {	3841	sub emergency_save() {
3550	my $freeze_guard = cf::freeze_mainloop;	3842	my $freeze_guard = cf::freeze_mainloop;
3551		3843
3552	warn "emergency_perl_save: enter\n";	3844	info "emergency_perl_save: enter\n";
		3845
		3846	# this is a trade-off: we want to be very quick here, so
		3847	# save all maps without fsync, and later call a global sync
		3848	# (which in turn might be very very slow)
		3849	local $USE_FSYNC = 0;
3553		3850
3554	cf::sync_job {	3851	cf::sync_job {
3555	# this is a trade-off: we want to be very quick here, so	3852	cf::write_runtime_sync; # external watchdog should not bark
3556	# save all maps without fsync, and later call a global sync
3557	# (which in turn might be very very slow)
3558	local $USE_FSYNC = 0;
3559		3853
3560	# use a peculiar iteration method to avoid tripping on perl	3854	# use a peculiar iteration method to avoid tripping on perl
3561	# refcount bugs in for. also avoids problems with players	3855	# refcount bugs in for. also avoids problems with players
3562	# and maps saved/destroyed asynchronously.	3856	# and maps saved/destroyed asynchronously.
3563	warn "emergency_perl_save: begin player save\n";	3857	info "emergency_perl_save: begin player save\n";
3564	for my $login (keys %cf::PLAYER) {	3858	for my $login (keys %cf::PLAYER) {
3565	my $pl = $cf::PLAYER{$login} or next;	3859	my $pl = $cf::PLAYER{$login} or next;
3566	$pl->valid or next;	3860	$pl->valid or next;
3567	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3861	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3568	$pl->save;	3862	$pl->save;
3569	}	3863	}
3570	warn "emergency_perl_save: end player save\n";	3864	info "emergency_perl_save: end player save\n";
3571		3865
		3866	cf::write_runtime_sync; # external watchdog should not bark
		3867
3572	warn "emergency_perl_save: begin map save\n";	3868	info "emergency_perl_save: begin map save\n";
3573	for my $path (keys %cf::MAP) {	3869	for my $path (keys %cf::MAP) {
3574	my $map = $cf::MAP{$path} or next;	3870	my $map = $cf::MAP{$path} or next;
3575	$map->valid or next;	3871	$map->valid or next;
3576	$map->save;	3872	$map->save;
3577	}	3873	}
3578	warn "emergency_perl_save: end map save\n";	3874	info "emergency_perl_save: end map save\n";
3579		3875
		3876	cf::write_runtime_sync; # external watchdog should not bark
		3877
3580	warn "emergency_perl_save: begin database checkpoint\n";	3878	info "emergency_perl_save: begin database checkpoint\n";
3581	BDB::db_env_txn_checkpoint $DB_ENV;	3879	BDB::db_env_txn_checkpoint $DB_ENV;
3582	warn "emergency_perl_save: end database checkpoint\n";	3880	info "emergency_perl_save: end database checkpoint\n";
3583		3881
3584	warn "emergency_perl_save: begin write uuid\n";	3882	info "emergency_perl_save: begin write uuid\n";
3585	write_uuid_sync 1;	3883	write_uuid_sync 1;
3586	warn "emergency_perl_save: end write uuid\n";	3884	info "emergency_perl_save: end write uuid\n";
		3885
		3886	cf::write_runtime_sync; # external watchdog should not bark
		3887
		3888	trace "emergency_perl_save: syncing database to disk";
		3889	BDB::db_env_txn_checkpoint $DB_ENV;
		3890
		3891	info "emergency_perl_save: starting sync\n";
		3892	IO::AIO::aio_sync sub {
		3893	info "emergency_perl_save: finished sync\n";
		3894	};
		3895
		3896	cf::write_runtime_sync; # external watchdog should not bark
		3897
		3898	trace "emergency_perl_save: flushing outstanding aio requests";
		3899	while (IO::AIO::nreqs || BDB::nreqs) {
		3900	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
		3901	}
		3902
		3903	cf::write_runtime_sync; # external watchdog should not bark
3587	};	3904	};
3588		3905
3589	warn "emergency_perl_save: starting sync()\n";
3590	IO::AIO::aio_sync sub {
3591	warn "emergency_perl_save: finished sync()\n";
3592	};
3593
3594	warn "emergency_perl_save: leave\n";	3906	info "emergency_perl_save: leave\n";
3595	}	3907	}
3596		3908
3597	sub post_cleanup {	3909	sub post_cleanup {
3598	my ($make_core) = @_;	3910	my ($make_core) = @_;
3599		3911
		3912	IO::AIO::flush;
		3913
3600	warn Carp::longmess "post_cleanup backtrace"	3914	error Carp::longmess "post_cleanup backtrace"
3601	if $make_core;	3915	if $make_core;
3602		3916
3603	my $fh = pidfile;	3917	my $fh = pidfile;
3604	unlink $PIDFILE if <$fh> == $$;	3918	unlink $PIDFILE if <$fh> == $$;
3605	}	3919	}
…		…
3625	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3939	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3626	for my $name (keys %$leaf_symtab) {	3940	for my $name (keys %$leaf_symtab) {
3627	_gv_clear *{"$pkg$name"};	3941	_gv_clear *{"$pkg$name"};
3628	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3942	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3629	}	3943	}
3630	warn "cleared package $pkg\n";#d#
3631	}	3944	}
3632		3945
3633	sub do_reload_perl() {	3946	sub do_reload_perl() {
3634	# can/must only be called in main	3947	# can/must only be called in main
3635	if ($Coro::current != $Coro::main) {	3948	unless (in_main) {
3636	warn "can only reload from main coroutine";	3949	error "can only reload from main coroutine";
3637	return;	3950	return;
3638	}	3951	}
3639		3952
3640	return if $RELOAD++;	3953	return if $RELOAD++;
3641		3954
3642	my $t1 = EV::time;	3955	my $t1 = AE::time;
3643		3956
3644	while ($RELOAD) {	3957	while ($RELOAD) {
3645	warn "reloading...";	3958	cf::get_slot 0.1, -1, "reload_perl";
		3959	info "perl_reload: reloading...";
3646		3960
3647	warn "entering sync_job";	3961	trace "perl_reload: entering sync_job";
3648		3962
3649	cf::sync_job {	3963	cf::sync_job {
3650	cf::write_runtime_sync; # external watchdog should not bark
3651	cf::emergency_save;	3964	#cf::emergency_save;
3652	cf::write_runtime_sync; # external watchdog should not bark
3653		3965
3654	warn "syncing database to disk";
3655	BDB::db_env_txn_checkpoint $DB_ENV;
3656
3657	# if anything goes wrong in here, we should simply crash as we already saved
3658
3659	warn "flushing outstanding aio requests";
3660	while (IO::AIO::nreqs || BDB::nreqs) {
3661	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3662	}
3663
3664	warn "cancelling all extension coros";	3966	trace "perl_reload: cancelling all extension coros";
3665	$_->cancel for values %EXT_CORO;	3967	$_->cancel for values %EXT_CORO;
3666	%EXT_CORO = ();	3968	%EXT_CORO = ();
3667		3969
3668	warn "removing commands";	3970	trace "perl_reload: removing commands";
3669	%COMMAND = ();	3971	%COMMAND = ();
3670		3972
3671	warn "removing ext/exti commands";	3973	trace "perl_reload: removing ext/exti commands";
3672	%EXTCMD = ();	3974	%EXTCMD = ();
3673	%EXTICMD = ();	3975	%EXTICMD = ();
3674		3976
3675	warn "unloading/nuking all extensions";	3977	trace "perl_reload: unloading/nuking all extensions";
3676	for my $pkg (@EXTS) {	3978	for my $pkg (@EXTS) {
3677	warn "... unloading $pkg";	3979	trace "... unloading $pkg";
3678		3980
3679	if (my $cb = $pkg->can ("unload")) {	3981	if (my $cb = $pkg->can ("unload")) {
3680	eval {	3982	eval {
3681	$cb->($pkg);	3983	$cb->($pkg);
3682	1	3984	1
3683	} or warn "$pkg unloaded, but with errors: $@";	3985	} or error "$pkg unloaded, but with errors: $@";
3684	}	3986	}
3685		3987
3686	warn "... clearing $pkg";	3988	trace "... clearing $pkg";
3687	clear_package $pkg;	3989	clear_package $pkg;
3688	}	3990	}
3689		3991
3690	warn "unloading all perl modules loaded from $LIBDIR";	3992	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3691	while (my ($k, $v) = each %INC) {	3993	while (my ($k, $v) = each %INC) {
3692	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	3994	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3693		3995
3694	warn "... unloading $k";	3996	trace "... unloading $k";
3695	delete $INC{$k};	3997	delete $INC{$k};
3696		3998
3697	$k =~ s/\.pm$//;	3999	$k =~ s/\.pm$//;
3698	$k =~ s/\//::/g;	4000	$k =~ s/\//::/g;
3699		4001
…		…
3702	}	4004	}
3703		4005
3704	clear_package $k;	4006	clear_package $k;
3705	}	4007	}
3706		4008
3707	warn "getting rid of safe::, as good as possible";	4009	trace "perl_reload: getting rid of safe::, as good as possible";
3708	clear_package "safe::$_"	4010	clear_package "safe::$_"
3709	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4011	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3710		4012
3711	warn "unloading cf.pm \"a bit\"";	4013	trace "perl_reload: unloading cf.pm \"a bit\"";
3712	delete $INC{"cf.pm"};	4014	delete $INC{"cf.pm"};
3713	delete $INC{"cf/pod.pm"};	4015	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3714		4016
3715	# don't, removes xs symbols, too,	4017	# don't, removes xs symbols, too,
3716	# and global variables created in xs	4018	# and global variables created in xs
3717	#clear_package __PACKAGE__;	4019	#clear_package __PACKAGE__;
3718		4020
3719	warn "unload completed, starting to reload now";	4021	info "perl_reload: unload completed, starting to reload now";
3720		4022
3721	warn "reloading cf.pm";	4023	trace "perl_reload: reloading cf.pm";
3722	require cf;	4024	require cf;
3723	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	4025	cf::_connect_to_perl_1;
3724		4026
3725	warn "loading config and database again";	4027	trace "perl_reload: loading config and database again";
3726	cf::reload_config;	4028	cf::reload_config;
3727		4029
3728	warn "loading extensions";	4030	trace "perl_reload: loading extensions";
3729	cf::load_extensions;	4031	cf::load_extensions;
3730		4032
3731	if ($REATTACH_ON_RELOAD) {	4033	if ($REATTACH_ON_RELOAD) {
3732	warn "reattaching attachments to objects/players";	4034	trace "perl_reload: reattaching attachments to objects/players";
3733	_global_reattach; # objects, sockets	4035	_global_reattach; # objects, sockets
3734	warn "reattaching attachments to maps";	4036	trace "perl_reload: reattaching attachments to maps";
3735	reattach $_ for values %MAP;	4037	reattach $_ for values %MAP;
3736	warn "reattaching attachments to players";	4038	trace "perl_reload: reattaching attachments to players";
3737	reattach $_ for values %PLAYER;	4039	reattach $_ for values %PLAYER;
3738	}	4040	}
3739		4041
3740	warn "running post_init jobs";	4042	cf::_post_init 1;
3741	(pop @POST_INIT)->(1) while @POST_INIT;
3742		4043
3743	warn "leaving sync_job";	4044	trace "perl_reload: leaving sync_job";
3744		4045
3745	1	4046	1
3746	} or do {	4047	} or do {
3747	warn $@;	4048	error $@;
3748	cf::cleanup "error while reloading, exiting.";	4049	cf::cleanup "perl_reload: error, exiting.";
3749	};	4050	};
3750		4051
3751	warn "reloaded";
3752	--$RELOAD;	4052	--$RELOAD;
3753	}	4053	}
3754		4054
3755	$t1 = EV::time - $t1;	4055	$t1 = AE::time - $t1;
3756	warn "reload completed in ${t1}s\n";	4056	info "perl_reload: completed in ${t1}s\n";
3757	};	4057	};
3758		4058
3759	our $RELOAD_WATCHER; # used only during reload	4059	our $RELOAD_WATCHER; # used only during reload
3760		4060
3761	sub reload_perl() {	4061	sub reload_perl() {
…		…
3763	# coro crashes during coro_state_free->destroy here.	4063	# coro crashes during coro_state_free->destroy here.
3764		4064
3765	$RELOAD_WATCHER ||= cf::async {	4065	$RELOAD_WATCHER ||= cf::async {
3766	Coro::AIO::aio_wait cache_extensions;	4066	Coro::AIO::aio_wait cache_extensions;
3767		4067
3768	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	4068	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3769	do_reload_perl;	4069	do_reload_perl;
3770	undef $RELOAD_WATCHER;	4070	undef $RELOAD_WATCHER;
3771	};	4071	};
3772	};	4072	};
3773	}	4073	}
…		…
3782	reload_perl;	4082	reload_perl;
3783	};	4083	};
3784	}	4084	}
3785	};	4085	};
3786		4086
3787	unshift @INC, $LIBDIR;	4087	#############################################################################
3788		4088
3789	my $bug_warning = 0;	4089	my $bug_warning = 0;
3790		4090
3791	our @WAIT_FOR_TICK;	4091	our @WAIT_FOR_TICK;
3792	our @WAIT_FOR_TICK_BEGIN;	4092	our @WAIT_FOR_TICK_BEGIN;
3793		4093
3794	sub wait_for_tick {	4094	sub wait_for_tick() {
3795	return if tick_inhibit || $Coro::current == $Coro::main;	4095	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3796		4096
3797	my $signal = new Coro::Signal;	4097	my $signal = new Coro::Signal;
3798	push @WAIT_FOR_TICK, $signal;	4098	push @WAIT_FOR_TICK, $signal;
3799	$signal->wait;	4099	$signal->wait;
3800	}	4100	}
3801		4101
3802	sub wait_for_tick_begin {	4102	sub wait_for_tick_begin() {
3803	return if tick_inhibit || $Coro::current == $Coro::main;	4103	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3804		4104
3805	my $signal = new Coro::Signal;	4105	my $signal = new Coro::Signal;
3806	push @WAIT_FOR_TICK_BEGIN, $signal;	4106	push @WAIT_FOR_TICK_BEGIN, $signal;
3807	$signal->wait;	4107	$signal->wait;
3808	}	4108	}
…		…
3814	return;	4114	return;
3815	}	4115	}
3816		4116
3817	cf::server_tick; # one server iteration	4117	cf::server_tick; # one server iteration
3818		4118
		4119	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
		4120
3819	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4121	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3820	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4122	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3821	Coro::async_pool {	4123	Coro::async_pool {
3822	$Coro::current->{desc} = "runtime saver";	4124	$Coro::current->{desc} = "runtime saver";
3823	write_runtime_sync	4125	write_runtime_sync
3824	or warn "ERROR: unable to write runtime file: $!";	4126	or error "ERROR: unable to write runtime file: $!";
3825	};	4127	};
3826	}	4128	}
3827		4129
3828	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4130	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3829	$sig->send;	4131	$sig->send;
…		…
3837		4139
3838	if (0) {	4140	if (0) {
3839	if ($NEXT_TICK) {	4141	if ($NEXT_TICK) {
3840	my $jitter = $TICK_START - $NEXT_TICK;	4142	my $jitter = $TICK_START - $NEXT_TICK;
3841	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4143	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3842	warn "jitter $JITTER\n";#d#	4144	debug "jitter $JITTER\n";#d#
3843	}	4145	}
3844	}	4146	}
3845	}	4147	}
3846		4148
3847	{	4149	{
3848	# configure BDB	4150	# configure BDB
3849		4151
3850	BDB::min_parallel 8;	4152	BDB::min_parallel 16;
3851	BDB::max_poll_reqs $TICK * 0.1;	4153	BDB::max_poll_reqs $TICK * 0.1;
3852	$AnyEvent::BDB::WATCHER->priority (1);	4154	$AnyEvent::BDB::WATCHER->priority (1);
3853		4155
3854	unless ($DB_ENV) {	4156	unless ($DB_ENV) {
3855	$DB_ENV = BDB::db_env_create;	4157	$DB_ENV = BDB::db_env_create;
…		…
3892	IO::AIO::min_parallel 8;	4194	IO::AIO::min_parallel 8;
3893	IO::AIO::max_poll_time $TICK * 0.1;	4195	IO::AIO::max_poll_time $TICK * 0.1;
3894	undef $AnyEvent::AIO::WATCHER;	4196	undef $AnyEvent::AIO::WATCHER;
3895	}	4197	}
3896		4198
3897	my $_log_backtrace;	4199	our $_log_backtrace;
		4200	our $_log_backtrace_last;
3898		4201
3899	sub _log_backtrace {	4202	sub _log_backtrace {
3900	my ($msg, @addr) = @_;	4203	my ($msg, @addr) = @_;
3901		4204
3902	$msg =~ s/\n//;	4205	$msg =~ s/\n$//;
3903		4206
		4207	if ($_log_backtrace_last eq $msg) {
		4208	LOG llevInfo, "[ABT] $msg\n";
		4209	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3904	# limit the # of concurrent backtraces	4210	# limit the # of concurrent backtraces
3905	if ($_log_backtrace < 2) {	4211	} elsif ($_log_backtrace < 2) {
		4212	$_log_backtrace_last = $msg;
3906	++$_log_backtrace;	4213	++$_log_backtrace;
3907	my $perl_bt = Carp::longmess $msg;	4214	my $perl_bt = Carp::longmess $msg;
3908	async {	4215	async {
3909	$Coro::current->{desc} = "abt $msg";	4216	$Coro::current->{desc} = "abt $msg";
3910		4217
…		…
3930	LOG llevInfo, "[ABT] $_\n" for @bt;	4237	LOG llevInfo, "[ABT] $_\n" for @bt;
3931	--$_log_backtrace;	4238	--$_log_backtrace;
3932	};	4239	};
3933	} else {	4240	} else {
3934	LOG llevInfo, "[ABT] $msg\n";	4241	LOG llevInfo, "[ABT] $msg\n";
3935	LOG llevInfo, "[ABT] [suppressed]\n";	4242	LOG llevInfo, "[ABT] [overload, suppressed]\n";
3936	}	4243	}
3937	}	4244	}
3938		4245
3939	# load additional modules	4246	# load additional modules
3940	use cf::pod;	4247	require "cf/$_.pm" for @EXTRA_MODULES;
		4248	cf::_connect_to_perl_2;
3941		4249
3942	END { cf::emergency_save }	4250	END { cf::emergency_save }
3943		4251
3944	1	4252	1
3945		4253

Diff Legend

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