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.470 by root, Sun Apr 26 19:42:45 2009 UTC vs.
Revision 1.572 by root, Sun May 8 11:44:43 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 qw(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 on	124	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
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
117	our @EXTRA_MODULES = qw(pod mapscript);	131	our @EXTRA_MODULES = qw(pod match mapscript incloader);
118		132
119	our %CFG;	133	our %CFG;
120		134
121	our $UPTIME; $UPTIME ||= time;	135	our $UPTIME; $UPTIME ||= time;
122	our $RUNTIME;	136	our $RUNTIME = 0;
		137	our $SERVER_TICK = 0;
123	our $NOW;	138	our $NOW;
124		139
125	our (%PLAYER, %PLAYER_LOADING); # all users	140	our (%PLAYER, %PLAYER_LOADING); # all users
126	our (%MAP, %MAP_LOADING ); # all maps	141	our (%MAP, %MAP_LOADING ); # all maps
127	our $LINK_MAP; # the special {link} map, which is always available	142	our $LINK_MAP; # the special {link} map, which is always available
…		…
134	our $JITTER; # average jitter	149	our $JITTER; # average jitter
135	our $TICK_START; # for load detecting purposes	150	our $TICK_START; # for load detecting purposes
136		151
137	our @POST_INIT;	152	our @POST_INIT;
138		153
139	our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)	154	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
		155	our $REALLY_UNLOOP; # never set to true, please :)
		156
		157	our $WAIT_FOR_TICK = new Coro::Signal;
		158	our @WAIT_FOR_TICK_BEGIN;
140		159
141	binmode STDOUT;	160	binmode STDOUT;
142	binmode STDERR;	161	binmode STDERR;
143		162
144	# read virtual server time, if available	163	# read virtual server time, if available
…		…
155		174
156	our $EMERGENCY_POSITION;	175	our $EMERGENCY_POSITION;
157		176
158	sub cf::map::normalise;	177	sub cf::map::normalise;
159		178
		179	sub in_main() {
		180	$Coro::current == $Coro::main
		181	}
		182
160	#############################################################################	183	#############################################################################
161		184
		185	%REFLECT = ();
		186	for (@REFLECT) {
		187	my $reflect = JSON::XS::decode_json $_;
		188	$REFLECT{$reflect->{class}} = $reflect;
		189	}
		190
		191	# this is decidedly evil
		192	$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
		193
		194	#############################################################################
		195
162	=head2 GLOBAL VARIABLES	196	=head2 GLOBAL VARIABLES
163		197
164	=over 4	198	=over 4
165		199
166	=item $cf::UPTIME	200	=item $cf::UPTIME
167		201
168	The timestamp of the server start (so not actually an uptime).	202	The timestamp of the server start (so not actually an "uptime").
		203
		204	=item $cf::SERVER_TICK
		205
		206	An unsigned integer that starts at zero when the server is started and is
		207	incremented on every tick.
		208
		209	=item $cf::NOW
		210
		211	The (real) time of the last (current) server tick - updated before and
		212	after tick processing, so this is useful only as a rough "what time is it
		213	now" estimate.
		214
		215	=item $cf::TICK
		216
		217	The interval between each server tick, in seconds.
169		218
170	=item $cf::RUNTIME	219	=item $cf::RUNTIME
171		220
172	The time this server has run, starts at 0 and is increased by $cf::TICK on	221	The time this server has run, starts at 0 and is increased by $cf::TICK on
173	every server tick.	222	every server tick.
…		…
179	Various directories - "/etc", read-only install directory, perl-library	228	Various directories - "/etc", read-only install directory, perl-library
180	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	229	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
181	unique-items directory, player file directory, random maps directory and	230	unique-items directory, player file directory, random maps directory and
182	database environment.	231	database environment.
183		232
184	=item $cf::NOW
185
186	The time of the last (current) server tick.
187
188	=item $cf::TICK
189
190	The interval between server ticks, in seconds.
191
192	=item $cf::LOADAVG	233	=item $cf::LOADAVG
193		234
194	The current CPU load on the server (alpha-smoothed), as a value between 0	235	The current CPU load on the server (alpha-smoothed), as a value between 0
195	(none) and 1 (overloaded), indicating how much time is spent on processing	236	(none) and 1 (overloaded), indicating how much time is spent on processing
196	objects per tick. Healthy values are < 0.5.	237	objects per tick. Healthy values are < 0.5.
…		…
205	from wherever your confdir points to.	246	from wherever your confdir points to.
206		247
207	=item cf::wait_for_tick, cf::wait_for_tick_begin	248	=item cf::wait_for_tick, cf::wait_for_tick_begin
208		249
209	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	250	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
210	returns directly I<after> the tick processing (and consequently, can only wake one process	251	returns directly I<after> the tick processing (and consequently, can only wake one thread
211	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	252	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
212		253
		254	Note that cf::Wait_for_tick will immediately return when the server is not
		255	ticking, making it suitable for small pauses in threads that need to run
		256	when the server is paused. If that is not applicable (i.e. you I<really>
		257	want to wait, use C<$cf::WAIT_FOR_TICK>).
		258
		259	=item $cf::WAIT_FOR_TICK
		260
		261	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		262	variable contains a L<Coro::Signal> that is broadcats after every server
		263	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		264	next server tick.
		265
		266	=cut
		267
		268	sub wait_for_tick();
		269	sub wait_for_tick_begin();
		270
213	=item @cf::INVOKE_RESULTS	271	=item @cf::INVOKE_RESULTS
214		272
215	This array contains the results of the last C<invoke ()> call. When	273	This array contains the results of the last C<invoke ()> call. When
216	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	274	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
217	that call.	275	that call.
218		276
		277	=item %cf::REFLECT
		278
		279	Contains, for each (C++) class name, a hash reference with information
		280	about object members (methods, scalars, arrays and flags) and other
		281	metadata, which is useful for introspection.
		282
219	=back	283	=back
220		284
221	=cut	285	=cut
222		286
223	BEGIN {	287	sub error(@) { LOG llevError, join "", @_ }
224	*CORE::GLOBAL::warn = sub {	288	sub warn (@) { LOG llevWarn , join "", @_ }
		289	sub info (@) { LOG llevInfo , join "", @_ }
		290	sub debug(@) { LOG llevDebug, join "", @_ }
		291	sub trace(@) { LOG llevTrace, join "", @_ }
		292
		293	$Coro::State::WARNHOOK = sub {
225	my $msg = join "", @_;	294	my $msg = join "", @_;
226		295
227	$msg .= "\n"	296	$msg .= "\n"
228	unless $msg =~ /\n$/;	297	unless $msg =~ /\n$/;
229		298
230	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	299	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
231		300
232	LOG llevError, $msg;	301	LOG llevWarn, $msg;
233	};	302	};
234	}
235		303
236	$Coro::State::DIEHOOK = sub {	304	$Coro::State::DIEHOOK = sub {
237	return unless $^S eq 0; # "eq", not "=="	305	return unless $^S eq 0; # "eq", not "=="
238		306
239	if ($Coro::current == $Coro::main) {#d#	307	error Carp::longmess $_[0];
		308
		309	if (in_main) {#d#
240	warn "DIEHOOK called in main context, Coro bug?\n";#d#	310	error "DIEHOOK called in main context, Coro bug?\n";#d#
241	return;#d#	311	return;#d#
242	}#d#	312	}#d#
243		313
244	# kill coroutine otherwise	314	# kill coroutine otherwise
245	warn Carp::longmess $_[0];
246	Coro::terminate	315	Coro::terminate
247	};	316	};
248
249	$SIG{__DIE__} = sub { }; #d#?
250		317
251	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	318	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
252	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	319	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
253	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	320	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
254	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	321	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
268	)) {	335	)) {
269	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	336	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
270	}	337	}
271		338
272	$EV::DIED = sub {	339	$EV::DIED = sub {
273	warn "error in event callback: @_";	340	Carp::cluck "error in event callback: @_";
274	};	341	};
		342
		343	#############################################################################
		344
		345	sub fork_call(&@);
		346	sub get_slot($;$$);
275		347
276	#############################################################################	348	#############################################################################
277		349
278	=head2 UTILITY FUNCTIONS	350	=head2 UTILITY FUNCTIONS
279		351
…		…
300	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	372	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
301	$d	373	$d
302	} || "[unable to dump $_[0]: '$@']";	374	} || "[unable to dump $_[0]: '$@']";
303	}	375	}
304		376
		377	=item $scalar = load_file $path
		378
		379	Loads the given file from path and returns its contents. Croaks on error
		380	and can block.
		381
		382	=cut
		383
		384	sub load_file($) {
		385	0 <= aio_load $_[0], my $data
		386	or Carp::croak "$_[0]: $!";
		387
		388	$data
		389	}
		390
305	=item $ref = cf::decode_json $json	391	=item $ref = cf::decode_json $json
306		392
307	Converts a JSON string into the corresponding perl data structure.	393	Converts a JSON string into the corresponding perl data structure.
308		394
309	=item $json = cf::encode_json $ref	395	=item $json = cf::encode_json $ref
…		…
315	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	401	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
316		402
317	sub encode_json($) { $json_coder->encode ($_[0]) }	403	sub encode_json($) { $json_coder->encode ($_[0]) }
318	sub decode_json($) { $json_coder->decode ($_[0]) }	404	sub decode_json($) { $json_coder->decode ($_[0]) }
319		405
		406	=item $ref = cf::decode_storable $scalar
		407
		408	Same as Coro::Storable::thaw, so blocks.
		409
		410	=cut
		411
		412	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		413
		414	=item $ref = cf::decode_yaml $scalar
		415
		416	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		417
		418	=cut
		419
		420	sub decode_yaml($) {
		421	fork_call { YAML::XS::Load $_[0] } @_
		422	}
		423
		424	=item $scalar = cf::unlzf $scalar
		425
		426	Same as Compress::LZF::compress, but takes server ticks into account, so
		427	blocks.
		428
		429	=cut
		430
		431	sub unlzf($) {
		432	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		433	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		434	Compress::LZF::decompress $_[0]
		435	}
		436
320	=item cf::post_init { BLOCK }	437	=item cf::post_init { BLOCK }
321		438
322	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	439	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
323	but I<before> the server starts ticking again.	440	but I<before> the server starts ticking again.
324		441
325	The cdoeblock will have a single boolean argument to indicate whether this	442	The codeblock will have a single boolean argument to indicate whether this
326	is a reload or not.	443	is a reload or not.
327		444
328	=cut	445	=cut
329		446
330	sub post_init(&) {	447	sub post_init(&) {
331	push @POST_INIT, shift;	448	push @POST_INIT, shift;
		449	}
		450
		451	sub _post_init {
		452	trace "running post_init jobs";
		453
		454	# run them in parallel...
		455
		456	my @join;
		457
		458	while () {
		459	push @join, map &Coro::async ($_, 0), @POST_INIT;
		460	@POST_INIT = ();
		461
		462	@join or last;
		463
		464	(pop @join)->join;
		465	}
332	}	466	}
333		467
334	=item cf::lock_wait $string	468	=item cf::lock_wait $string
335		469
336	Wait until the given lock is available. See cf::lock_acquire.	470	Wait until the given lock is available. See cf::lock_acquire.
…		…
375	}	509	}
376		510
377	=item cf::periodic $interval, $cb	511	=item cf::periodic $interval, $cb
378		512
379	Like EV::periodic, but randomly selects a starting point so that the actions	513	Like EV::periodic, but randomly selects a starting point so that the actions
380	get spread over timer.	514	get spread over time.
381		515
382	=cut	516	=cut
383		517
384	sub periodic($$) {	518	sub periodic($$) {
385	my ($interval, $cb) = @_;	519	my ($interval, $cb) = @_;
…		…
389	EV::periodic $start, $interval, 0, $cb	523	EV::periodic $start, $interval, 0, $cb
390	}	524	}
391		525
392	=item cf::get_slot $time[, $priority[, $name]]	526	=item cf::get_slot $time[, $priority[, $name]]
393		527
394	Allocate $time seconds of blocking CPU time at priority C<$priority>:	528	Allocate $time seconds of blocking CPU time at priority C<$priority>
395	This call blocks and returns only when you have at least C<$time> seconds	529	(default: 0): This call blocks and returns only when you have at least
396	of cpu time till the next tick. The slot is only valid till the next cede.	530	C<$time> seconds of cpu time till the next tick. The slot is only valid
		531	till the next cede.
		532
		533	Background jobs should use a priority les than zero, interactive jobs
		534	should use 100 or more.
397		535
398	The optional C<$name> can be used to identify the job to run. It might be	536	The optional C<$name> can be used to identify the job to run. It might be
399	used for statistical purposes and should identify the same time-class.	537	used for statistical purposes and should identify the same time-class.
400		538
401	Useful for short background jobs.	539	Useful for short background jobs.
402		540
403	=cut	541	=cut
404		542
405	our @SLOT_QUEUE;	543	our @SLOT_QUEUE;
406	our $SLOT_QUEUE;	544	our $SLOT_QUEUE;
		545	our $SLOT_DECAY = 0.9;
407		546
408	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	547	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
409	$SLOT_QUEUE = Coro::async {	548	$SLOT_QUEUE = Coro::async {
410	$Coro::current->desc ("timeslot manager");	549	$Coro::current->desc ("timeslot manager");
411		550
412	my $signal = new Coro::Signal;	551	my $signal = new Coro::Signal;
		552	my $busy;
413		553
414	while () {	554	while () {
415	next_job:	555	next_job:
		556
416	my $avail = cf::till_tick;	557	my $avail = cf::till_tick;
417	if ($avail > 0.01) {	558
418	for (0 .. $#SLOT_QUEUE) {	559	for (0 .. $#SLOT_QUEUE) {
419	if ($SLOT_QUEUE[$_][0] < $avail) {	560	if ($SLOT_QUEUE[$_][0] <= $avail) {
		561	$busy = 0;
420	my $job = splice @SLOT_QUEUE, $_, 1, ();	562	my $job = splice @SLOT_QUEUE, $_, 1, ();
421	$job->[2]->send;	563	$job->[2]->send;
422	Coro::cede;	564	Coro::cede;
423	goto next_job;	565	goto next_job;
424	}	566	} else {
		567	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
425	}	568	}
426	}	569	}
427		570
428	if (@SLOT_QUEUE) {	571	if (@SLOT_QUEUE) {
429	# we do not use wait_for_tick() as it returns immediately when tick is inactive	572	# we do not use wait_for_tick() as it returns immediately when tick is inactive
430	push @cf::WAIT_FOR_TICK, $signal;	573	$WAIT_FOR_TICK->wait;
431	$signal->wait;
432	} else {	574	} else {
		575	$busy = 0;
433	Coro::schedule;	576	Coro::schedule;
434	}	577	}
435	}	578	}
436	};	579	};
437		580
438	sub get_slot($;$$) {	581	sub get_slot($;$$) {
439	return if tick_inhibit || $Coro::current == $Coro::main;	582	return if tick_inhibit || $Coro::current == $Coro::main;
440		583
441	my ($time, $pri, $name) = @_;	584	my ($time, $pri, $name) = @_;
442		585
443	$time = $TICK * .6 if $time > $TICK * .6;	586	$time = clamp $time, 0.01, $TICK * .6;
		587
444	my $sig = new Coro::Signal;	588	my $sig = new Coro::Signal;
445		589
446	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	590	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
447	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	591	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
448	$SLOT_QUEUE->ready;	592	$SLOT_QUEUE->ready;
…		…
474	=cut	618	=cut
475		619
476	sub sync_job(&) {	620	sub sync_job(&) {
477	my ($job) = @_;	621	my ($job) = @_;
478		622
479	if ($Coro::current == $Coro::main) {	623	if (in_main) {
480	my $time = EV::time;	624	my $time = AE::time;
481		625
482	# this is the main coro, too bad, we have to block	626	# this is the main coro, too bad, we have to block
483	# till the operation succeeds, freezing the server :/	627	# till the operation succeeds, freezing the server :/
484		628
485	LOG llevError, Carp::longmess "sync job";#d#	629	#LOG llevError, Carp::longmess "sync job";#d#
486		630
487	my $freeze_guard = freeze_mainloop;	631	my $freeze_guard = freeze_mainloop;
488		632
489	my $busy = 1;	633	my $busy = 1;
490	my @res;	634	my @res;
491		635
492	(async {	636	(async {
493	$Coro::current->desc ("sync job coro");	637	$Coro::current->desc ("sync job coro");
494	@res = eval { $job->() };	638	@res = eval { $job->() };
495	warn $@ if $@;	639	error $@ if $@;
496	undef $busy;	640	undef $busy;
497	})->prio (Coro::PRIO_MAX);	641	})->prio (Coro::PRIO_MAX);
498		642
499	while ($busy) {	643	while ($busy) {
500	if (Coro::nready) {	644	if (Coro::nready) {
…		…
502	} else {	646	} else {
503	EV::loop EV::LOOP_ONESHOT;	647	EV::loop EV::LOOP_ONESHOT;
504	}	648	}
505	}	649	}
506		650
507	my $time = EV::time - $time;	651	my $time = AE::time - $time;
508		652
509	$TICK_START += $time; # do not account sync jobs to server load	653	$TICK_START += $time; # do not account sync jobs to server load
510		654
511	wantarray ? @res : $res[0]	655	wantarray ? @res : $res[0]
512	} else {	656	} else {
…		…
534	$EXT_CORO{$coro+0} = $coro;	678	$EXT_CORO{$coro+0} = $coro;
535		679
536	$coro	680	$coro
537	}	681	}
538		682
539	=item fork_call { }, $args	683	=item fork_call { }, @args
540		684
541	Executes the given code block with the given arguments in a seperate	685	Executes the given code block with the given arguments in a seperate
542	process, returning the results. Everything must be serialisable with	686	process, returning the results. Everything must be serialisable with
543	Coro::Storable. May, of course, block. Note that the executed sub may	687	Coro::Storable. May, of course, block. Note that the executed sub may
544	never block itself or use any form of event handling.	688	never block itself or use any form of event handling.
545		689
546	=cut	690	=cut
547		691
		692	sub post_fork {
		693	reset_signals;
		694	}
		695
548	sub fork_call(&@) {	696	sub fork_call(&@) {
549	my ($cb, @args) = @_;	697	my ($cb, @args) = @_;
550		698
551	# we seemingly have to make a local copy of the whole thing,	699	# we seemingly have to make a local copy of the whole thing,
552	# otherwise perl prematurely frees the stuff :/	700	# otherwise perl prematurely frees the stuff :/
553	# TODO: investigate and fix (likely this will be rather laborious)	701	# TODO: investigate and fix (likely this will be rather laborious)
554		702
555	my @res = Coro::Util::fork_eval {	703	my @res = Coro::Util::fork_eval {
556	reset_signals;	704	cf::post_fork;
557	&$cb	705	&$cb
558	}, @args;	706	} @args;
559		707
560	wantarray ? @res : $res[-1]	708	wantarray ? @res : $res[-1]
		709	}
		710
		711	sub objinfo {
		712	(
		713	"counter value" => cf::object::object_count,
		714	"objects created" => cf::object::create_count,
		715	"objects destroyed" => cf::object::destroy_count,
		716	"freelist size" => cf::object::free_count,
		717	"allocated objects" => cf::object::objects_size,
		718	"active objects" => cf::object::actives_size,
		719	)
561	}	720	}
562		721
563	=item $coin = coin_from_name $name	722	=item $coin = coin_from_name $name
564		723
565	=cut	724	=cut
…		…
602	within each server.	761	within each server.
603		762
604	=cut	763	=cut
605		764
606	sub db_table($) {	765	sub db_table($) {
		766	cf::error "db_get called from main context"
		767	if $Coro::current == $Coro::main;
		768
607	my ($name) = @_;	769	my ($name) = @_;
608	my $db = BDB::db_create $DB_ENV;	770	my $db = BDB::db_create $DB_ENV;
609		771
610	eval {	772	eval {
611	$db->set_flags (BDB::CHKSUM);	773	$db->set_flags (BDB::CHKSUM);
…		…
621	}	783	}
622		784
623	our $DB;	785	our $DB;
624		786
625	sub db_init {	787	sub db_init {
626	cf::sync_job {
627	$DB ||= db_table "db";	788	$DB ||= db_table "db";
628	};
629	}	789	}
630		790
631	sub db_get($$) {	791	sub db_get($$) {
632	my $key = "$_[0]/$_[1]";	792	my $key = "$_[0]/$_[1]";
633		793
634	cf::sync_job {	794	cf::error "db_get called from main context"
		795	if $Coro::current == $Coro::main;
		796
635	BDB::db_get $DB, undef, $key, my $data;	797	BDB::db_get $DB, undef, $key, my $data;
636		798
637	$! ? ()	799	$! ? ()
638	: $data	800	: $data
639	}
640	}	801	}
641		802
642	sub db_put($$$) {	803	sub db_put($$$) {
643	BDB::dbreq_pri 4;	804	BDB::dbreq_pri 4;
644	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	805	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
672		833
673	my @data;	834	my @data;
674	my $md5;	835	my $md5;
675		836
676	for (0 .. $#$src) {	837	for (0 .. $#$src) {
677	0 <= aio_load $src->[$_], $data[$_]	838	$data[$_] = load_file $src->[$_];
678	or Carp::croak "$src->[$_]: $!";
679	}	839	}
680		840
681	# if processing is expensive, check	841	# if processing is expensive, check
682	# checksum first	842	# checksum first
683	if (1) {	843	if (1) {
…		…
700		860
701	my $t1 = Time::HiRes::time;	861	my $t1 = Time::HiRes::time;
702	my $data = $process->(\@data);	862	my $data = $process->(\@data);
703	my $t2 = Time::HiRes::time;	863	my $t2 = Time::HiRes::time;
704		864
705	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	865	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
706		866
707	db_put cache => "$id/data", $data;	867	db_put cache => "$id/data", $data;
708	db_put cache => "$id/md5" , $md5;	868	db_put cache => "$id/md5" , $md5;
709	db_put cache => "$id/meta", $meta;	869	db_put cache => "$id/meta", $meta;
710		870
…		…
720		880
721	=cut	881	=cut
722		882
723	sub datalog($@) {	883	sub datalog($@) {
724	my ($type, %kv) = @_;	884	my ($type, %kv) = @_;
725	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	885	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
726	}	886	}
727		887
728	=back	888	=back
729		889
730	=cut	890	=cut
…		…
925		1085
926	} elsif (exists $cb_id{$type}) {	1086	} elsif (exists $cb_id{$type}) {
927	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1087	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
928		1088
929	} elsif (ref $type) {	1089	} elsif (ref $type) {
930	warn "attaching objects not supported, ignoring.\n";	1090	error "attaching objects not supported, ignoring.\n";
931		1091
932	} else {	1092	} else {
933	shift @arg;	1093	shift @arg;
934	warn "attach argument '$type' not supported, ignoring.\n";	1094	error "attach argument '$type' not supported, ignoring.\n";
935	}	1095	}
936	}	1096	}
937	}	1097	}
938		1098
939	sub _object_attach {	1099	sub _object_attach {
…		…
949	_attach $registry, $klass, @attach;	1109	_attach $registry, $klass, @attach;
950	}	1110	}
951		1111
952	$obj->{$name} = \%arg;	1112	$obj->{$name} = \%arg;
953	} else {	1113	} else {
954	warn "object uses attachment '$name' which is not available, postponing.\n";	1114	info "object uses attachment '$name' which is not available, postponing.\n";
955	}	1115	}
956		1116
957	$obj->{_attachment}{$name} = undef;	1117	$obj->{_attachment}{$name} = undef;
958	}	1118	}
959		1119
…		…
1018		1178
1019	for (@$callbacks) {	1179	for (@$callbacks) {
1020	eval { &{$_->[1]} };	1180	eval { &{$_->[1]} };
1021		1181
1022	if ($@) {	1182	if ($@) {
1023	warn "$@";
1024	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1183	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1025	override;	1184	override;
1026	}	1185	}
1027		1186
1028	return 1 if $override;	1187	return 1 if $override;
1029	}	1188	}
…		…
1108	for (@$attach) {	1267	for (@$attach) {
1109	my ($klass, @attach) = @$_;	1268	my ($klass, @attach) = @$_;
1110	_attach $registry, $klass, @attach;	1269	_attach $registry, $klass, @attach;
1111	}	1270	}
1112	} else {	1271	} else {
1113	warn "object uses attachment '$name' that is not available, postponing.\n";	1272	info "object uses attachment '$name' that is not available, postponing.\n";
1114	}	1273	}
1115	}	1274	}
1116	}	1275	}
1117		1276
1118	cf::attachable->attach (	1277	cf::attachable->attach (
…		…
1145	my ($filename, $rdata, $objs) = @_;	1304	my ($filename, $rdata, $objs) = @_;
1146		1305
1147	sync_job {	1306	sync_job {
1148	if (length $$rdata) {	1307	if (length $$rdata) {
1149	utf8::decode (my $decname = $filename);	1308	utf8::decode (my $decname = $filename);
1150	warn sprintf "saving %s (%d,%d)\n",	1309	trace sprintf "saving %s (%d,%d)\n",
1151	$decname, length $$rdata, scalar @$objs;	1310	$decname, length $$rdata, scalar @$objs
		1311	if $VERBOSE_IO;
1152		1312
1153	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1313	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1154	aio_chmod $fh, SAVE_MODE;	1314	aio_chmod $fh, SAVE_MODE;
1155	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1315	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1156	aio_fsync $fh if $cf::USE_FSYNC;	1316	if ($cf::USE_FSYNC) {
		1317	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;
		1318	aio_fsync $fh;
		1319	}
1157	aio_close $fh;	1320	aio_close $fh;
1158		1321
1159	if (@$objs) {	1322	if (@$objs) {
1160	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1323	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1161	aio_chmod $fh, SAVE_MODE;	1324	aio_chmod $fh, SAVE_MODE;
1162	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1325	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1163	aio_write $fh, 0, (length $data), $data, 0;	1326	aio_write $fh, 0, (length $data), $data, 0;
1164	aio_fsync $fh if $cf::USE_FSYNC;	1327	if ($cf::USE_FSYNC) {
		1328	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;
		1329	aio_fsync $fh;
		1330	}
1165	aio_close $fh;	1331	aio_close $fh;
1166	aio_rename "$filename.pst~", "$filename.pst";	1332	aio_rename "$filename.pst~", "$filename.pst";
1167	}	1333	}
1168	} else {	1334	} else {
1169	aio_unlink "$filename.pst";	1335	aio_unlink "$filename.pst";
…		…
1172	aio_rename "$filename~", $filename;	1338	aio_rename "$filename~", $filename;
1173		1339
1174	$filename =~ s%/[^/]+$%%;	1340	$filename =~ s%/[^/]+$%%;
1175	aio_pathsync $filename if $cf::USE_FSYNC;	1341	aio_pathsync $filename if $cf::USE_FSYNC;
1176	} else {	1342	} else {
1177	warn "unable to save objects: $filename~: $!\n";	1343	error "unable to save objects: $filename~: $!\n";
1178	}	1344	}
1179	} else {	1345	} else {
1180	aio_unlink $filename;	1346	aio_unlink $filename;
1181	aio_unlink "$filename.pst";	1347	aio_unlink "$filename.pst";
1182	}	1348	}
…		…
1206	my $st = eval { Coro::Storable::thaw $av };	1372	my $st = eval { Coro::Storable::thaw $av };
1207	$av = $st->{objs};	1373	$av = $st->{objs};
1208	}	1374	}
1209		1375
1210	utf8::decode (my $decname = $filename);	1376	utf8::decode (my $decname = $filename);
1211	warn sprintf "loading %s (%d,%d)\n",	1377	trace sprintf "loading %s (%d,%d)\n",
1212	$decname, length $data, scalar @{$av || []};	1378	$decname, length $data, scalar @{$av || []}
		1379	if $VERBOSE_IO;
1213		1380
1214	($data, $av)	1381	($data, $av)
1215	}	1382	}
1216		1383
1217	=head2 COMMAND CALLBACKS	1384	=head2 COMMAND CALLBACKS
…		…
1276	}	1443	}
1277		1444
1278	use File::Glob ();	1445	use File::Glob ();
1279		1446
1280	cf::player->attach (	1447	cf::player->attach (
1281	on_command => sub {	1448	on_unknown_command => sub {
1282	my ($pl, $name, $params) = @_;	1449	my ($pl, $name, $params) = @_;
1283		1450
1284	my $cb = $COMMAND{$name}	1451	my $cb = $COMMAND{$name}
1285	or return;	1452	or return;
1286		1453
…		…
1309		1476
1310	$pl->ext_reply ($reply, @reply)	1477	$pl->ext_reply ($reply, @reply)
1311	if $reply;	1478	if $reply;
1312		1479
1313	} else {	1480	} else {
1314	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1481	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1315	}	1482	}
1316		1483
1317	cf::override;	1484	cf::override;
1318	},	1485	},
1319	);	1486	);
1320		1487
1321	# "readahead" all extensions	1488	# "readahead" all extensions
1322	sub cache_extensions {	1489	sub cache_extensions {
1323	my $grp = IO::AIO::aio_group;	1490	my $grp = IO::AIO::aio_group;
1324		1491
1325	add $grp IO::AIO::aio_readdir $LIBDIR, sub {	1492	add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1326	for (grep /\.ext$/, @{$_[0]}) {	1493	for (grep /\.ext$/, @{$_[0]}) {
1327	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;	1494	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328	}	1495	}
1329	};	1496	};
1330		1497
1331	$grp	1498	$grp
1332	}	1499	}
1333		1500
1334	sub load_extensions {	1501	sub load_extensions {
		1502	info "loading extensions...";
		1503
1335	cf::sync_job {	1504	cf::sync_job {
1336	my %todo;	1505	my %todo;
1337		1506
1338	for my $path (<$LIBDIR/*.ext>) {	1507	for my $path (<$LIBDIR/*.ext>) {
1339	next unless -r $path;	1508	next unless -r $path;
…		…
1357		1526
1358	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1527	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1359	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1528	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1360		1529
1361	$ext{source} =	1530	$ext{source} =
1362	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1531	"package $pkg; use common::sense;\n"
1363	. "#line 1 \"$path\"\n{\n"	1532	. "#line 1 \"$path\"\n{\n"
1364	. $source	1533	. $source
1365	. "\n};\n1";	1534	. "\n};\n1";
1366		1535
1367	$todo{$base} = \%ext;	1536	$todo{$base} = \%ext;
1368	}	1537	}
1369		1538
		1539	my $pass = 0;
1370	my %done;	1540	my %done;
1371	while (%todo) {	1541	while (%todo) {
1372	my $progress;	1542	my $progress;
1373		1543
		1544	++$pass;
		1545
		1546	ext:
1374	while (my ($k, $v) = each %todo) {	1547	while (my ($k, $v) = each %todo) {
1375	for (split /,\s*/, $v->{meta}{depends}) {	1548	for (split /,\s*/, $v->{meta}{depends}) {
1376	goto skip	1549	next ext
1377	unless exists $done{$_};	1550	unless exists $done{$_};
1378	}	1551	}
1379		1552
1380	warn "... loading '$k' into '$v->{pkg}'\n";	1553	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1381		1554
1382	unless (eval $v->{source}) {	1555	my $active = eval $v->{source};
		1556
		1557	if (length $@) {
1383	my $msg = $@ ? "$v->{path}: $@\n"	1558	error "$v->{path}: $@\n";
1384	: "$v->{base}: extension inactive.\n";
1385		1559
1386	if (exists $v->{meta}{mandatory}) {
1387	warn $msg;
1388	cf::cleanup "mandatory extension failed to load, exiting.";	1560	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1389	}	1561	if exists $v->{meta}{mandatory};
1390		1562
1391	warn $msg;	1563	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1564	delete $todo{$k};
		1565	} else {
		1566	$done{$k} = delete $todo{$k};
		1567	push @EXTS, $v->{pkg};
		1568	$progress = 1;
		1569
		1570	info "$v->{base}: extension inactive.\n"
		1571	unless $active;
1392	}	1572	}
1393
1394	$done{$k} = delete $todo{$k};
1395	push @EXTS, $v->{pkg};
1396	$progress = 1;
1397	}	1573	}
1398		1574
1399	skip:	1575	unless ($progress) {
1400	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1576	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1401	unless $progress;	1577
		1578	while (my ($k, $v) = each %todo) {
		1579	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
		1580	if exists $v->{meta}{mandatory};
		1581	}
		1582
		1583	last;
		1584	}
1402	}	1585	}
1403	};	1586	};
1404	}	1587	}
1405		1588
1406	#############################################################################	1589	#############################################################################
…		…
1490	$cf::PLAYER{$login} = $pl	1673	$cf::PLAYER{$login} = $pl
1491	}	1674	}
1492	}	1675	}
1493	}	1676	}
1494		1677
		1678	cf::player->attach (
		1679	on_load => sub {
		1680	my ($pl, $path) = @_;
		1681
		1682	# restore slots saved in save, below
		1683	my $slots = delete $pl->{_slots};
		1684
		1685	$pl->ob->current_weapon ($slots->[0]);
		1686	$pl->combat_ob ($slots->[1]);
		1687	$pl->ranged_ob ($slots->[2]);
		1688	},
		1689	);
		1690
1495	sub save($) {	1691	sub save($) {
1496	my ($pl) = @_;	1692	my ($pl) = @_;
1497		1693
1498	return if $pl->{deny_save};	1694	return if $pl->{deny_save};
1499		1695
…		…
1504		1700
1505	aio_mkdir playerdir $pl, 0770;	1701	aio_mkdir playerdir $pl, 0770;
1506	$pl->{last_save} = $cf::RUNTIME;	1702	$pl->{last_save} = $cf::RUNTIME;
1507		1703
1508	cf::get_slot 0.01;	1704	cf::get_slot 0.01;
		1705
		1706	# save slots, to be restored later
		1707	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1509		1708
1510	$pl->save_pl ($path);	1709	$pl->save_pl ($path);
1511	cf::cede_to_tick;	1710	cf::cede_to_tick;
1512	}	1711	}
1513		1712
…		…
1547	my $name = $pl->ob->name;	1746	my $name = $pl->ob->name;
1548		1747
1549	$pl->{deny_save} = 1;	1748	$pl->{deny_save} = 1;
1550	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1749	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1551		1750
1552	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1751	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1553	$pl->deactivate;	1752	$pl->deactivate;
		1753
1554	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1754	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1555	$pl->ob->check_score;
1556	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1755	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1756	ext::highscore::check ($pl->ob);
		1757
1557	$pl->ns->destroy if $pl->ns;	1758	$pl->ns->destroy if $pl->ns;
1558		1759
1559	my $path = playerdir $pl;	1760	my $path = playerdir $pl;
1560	my $temp = "$path~$cf::RUNTIME~deleting~";	1761	my $temp = "$path~$cf::RUNTIME~deleting~";
1561	aio_rename $path, $temp;	1762	aio_rename $path, $temp;
…		…
1615	\@logins	1816	\@logins
1616	}	1817	}
1617		1818
1618	=item $player->maps	1819	=item $player->maps
1619		1820
		1821	=item cf::player::maps $login
		1822
1620	Returns an arrayref of map paths that are private for this	1823	Returns an arrayref of map paths that are private for this
1621	player. May block.	1824	player. May block.
1622		1825
1623	=cut	1826	=cut
1624		1827
…		…
1686	=cut	1889	=cut
1687		1890
1688	sub find_by_path($) {	1891	sub find_by_path($) {
1689	my ($path) = @_;	1892	my ($path) = @_;
1690		1893
		1894	$path =~ s/^~[^\/]*//; # skip ~login
		1895
1691	my ($match, $specificity);	1896	my ($match, $specificity);
1692		1897
1693	for my $region (list) {	1898	for my $region (list) {
1694	if ($region->{match} && $path =~ $region->{match}) {	1899	if ($region->{match} && $path =~ $region->{match}) {
1695	($match, $specificity) = ($region, $region->specificity)	1900	($match, $specificity) = ($region, $region->specificity)
…		…
1723	sub generate_random_map {	1928	sub generate_random_map {
1724	my ($self, $rmp) = @_;	1929	my ($self, $rmp) = @_;
1725		1930
1726	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1931	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1727		1932
1728	# mit "rum" bekleckern, nicht
1729	$self->_create_random_map (	1933	$self->_create_random_map ($rmp);
1730	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1732	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733	$rmp->{exit_on_final_map},
1734	$rmp->{xsize}, $rmp->{ysize},
1735	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1737	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1738	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1739	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1740	(cf::region::find $rmp->{region}), $rmp->{custom}
1741	)
1742	}	1934	}
1743		1935
1744	=item cf::map->register ($regex, $prio)	1936	=item cf::map->register ($regex, $prio)
1745		1937
1746	Register a handler for the map path matching the given regex at the	1938	Register a handler for the map path matching the given regex at the
…		…
1751		1943
1752	sub register {	1944	sub register {
1753	my (undef, $regex, $prio) = @_;	1945	my (undef, $regex, $prio) = @_;
1754	my $pkg = caller;	1946	my $pkg = caller;
1755		1947
1756	no strict;
1757	push @{"$pkg\::ISA"}, __PACKAGE__;	1948	push @{"$pkg\::ISA"}, __PACKAGE__;
1758		1949
1759	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1950	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1760	}	1951	}
1761		1952
1762	# also paths starting with '/'	1953	# also paths starting with '/'
1763	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1954	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1764		1955
1765	sub thawer_merge {	1956	sub thawer_merge {
1766	my ($self, $merge) = @_;	1957	my ($self, $merge) = @_;
1767		1958
1768	# we have to keep some variables in memory intact	1959	# we have to keep some variables in memory intact
…		…
1773	}	1964	}
1774		1965
1775	sub normalise {	1966	sub normalise {
1776	my ($path, $base) = @_;	1967	my ($path, $base) = @_;
1777		1968
1778	$path = "$path"; # make sure its a string	1969	$path = "$path"; # make sure it's a string
1779		1970
1780	$path =~ s/\.map$//;	1971	$path =~ s/\.map$//;
1781		1972
1782	# map plan:	1973	# map plan:
1783	#	1974	#
…		…
1798	$base =~ s{[^/]+/?$}{};	1989	$base =~ s{[^/]+/?$}{};
1799	$path = "$base/$path";	1990	$path = "$base/$path";
1800	}	1991	}
1801		1992
1802	for ($path) {	1993	for ($path) {
1803	redo if s{//}{/};
1804	redo if s{/\.?/}{/};	1994	redo if s{/\.?/}{/};
1805	redo if s{/[^/]+/\.\./}{/};	1995	redo if s{/[^/]+/\.\./}{/};
1806	}	1996	}
1807		1997
1808	$path	1998	$path
…		…
1822	$self->init; # pass $1 etc.	2012	$self->init; # pass $1 etc.
1823	return $self;	2013	return $self;
1824	}	2014	}
1825	}	2015	}
1826		2016
1827	Carp::cluck "unable to resolve path '$path' (base '$base').";	2017	Carp::cluck "unable to resolve path '$path' (base '$base')";
1828	()	2018	()
1829	}	2019	}
1830		2020
		2021	# may re-bless or do other evil things
1831	sub init {	2022	sub init {
1832	my ($self) = @_;	2023	my ($self) = @_;
1833		2024
1834	$self	2025	$self
1835	}	2026	}
…		…
1900	$self->{load_path} = $path;	2091	$self->{load_path} = $path;
1901		2092
1902	1	2093	1
1903	}	2094	}
1904		2095
		2096	# used to laod the header of an original map
1905	sub load_header_orig {	2097	sub load_header_orig {
1906	my ($self) = @_;	2098	my ($self) = @_;
1907		2099
1908	$self->load_header_from ($self->load_path)	2100	$self->load_header_from ($self->load_path)
1909	}	2101	}
1910		2102
		2103	# used to laod the header of an instantiated map
1911	sub load_header_temp {	2104	sub load_header_temp {
1912	my ($self) = @_;	2105	my ($self) = @_;
1913		2106
1914	$self->load_header_from ($self->save_path)	2107	$self->load_header_from ($self->save_path)
1915	}	2108	}
1916		2109
		2110	# called after loading the header from an instantiated map
1917	sub prepare_temp {	2111	sub prepare_temp {
1918	my ($self) = @_;	2112	my ($self) = @_;
1919		2113
1920	$self->last_access ((delete $self->{last_access})	2114	$self->last_access ((delete $self->{last_access})
1921	|| $cf::RUNTIME); #d#	2115	|| $cf::RUNTIME); #d#
1922	# safety	2116	# safety
1923	$self->{instantiate_time} = $cf::RUNTIME	2117	$self->{instantiate_time} = $cf::RUNTIME
1924	if $self->{instantiate_time} > $cf::RUNTIME;	2118	if $self->{instantiate_time} > $cf::RUNTIME;
1925	}	2119	}
1926		2120
		2121	# called after loading the header from an original map
1927	sub prepare_orig {	2122	sub prepare_orig {
1928	my ($self) = @_;	2123	my ($self) = @_;
1929		2124
1930	$self->{load_original} = 1;	2125	$self->{load_original} = 1;
1931	$self->{instantiate_time} = $cf::RUNTIME;	2126	$self->{instantiate_time} = $cf::RUNTIME;
…		…
1955		2150
1956	sub find;	2151	sub find;
1957	sub find {	2152	sub find {
1958	my ($path, $origin) = @_;	2153	my ($path, $origin) = @_;
1959		2154
		2155	cf::cede_to_tick;
		2156
1960	$path = normalise $path, $origin && $origin->path;	2157	$path = normalise $path, $origin;
1961		2158
1962	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2159	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1963	my $guard2 = cf::lock_acquire "map_find:$path";	2160	my $guard2 = cf::lock_acquire "map_find:$path";
1964		2161
1965	$cf::MAP{$path} || do {	2162	$cf::MAP{$path} || do {
…		…
1982		2179
1983	$cf::MAP{$path} = $map	2180	$cf::MAP{$path} = $map
1984	}	2181	}
1985	}	2182	}
1986		2183
1987	sub pre_load { }	2184	sub pre_load { }
1988	sub post_load { }	2185	#sub post_load { } # XS
1989		2186
1990	sub load {	2187	sub load {
1991	my ($self) = @_;	2188	my ($self) = @_;
1992		2189
1993	local $self->{deny_reset} = 1; # loading can take a long time	2190	local $self->{deny_reset} = 1; # loading can take a long time
…		…
1996		2193
1997	{	2194	{
1998	my $guard = cf::lock_acquire "map_data:$path";	2195	my $guard = cf::lock_acquire "map_data:$path";
1999		2196
2000	return unless $self->valid;	2197	return unless $self->valid;
2001	return unless $self->in_memory == cf::MAP_SWAPPED;	2198	return unless $self->state == cf::MAP_SWAPPED;
2002
2003	$self->in_memory (cf::MAP_LOADING);
2004		2199
2005	$self->alloc;	2200	$self->alloc;
2006		2201
2007	$self->pre_load;	2202	$self->pre_load;
2008	cf::cede_to_tick;	2203	cf::cede_to_tick;
2009		2204
		2205	if (exists $self->{load_path}) {
2010	my $f = new_from_file cf::object::thawer $self->{load_path};	2206	my $f = new_from_file cf::object::thawer $self->{load_path};
2011	$f->skip_block;	2207	$f->skip_block;
2012	$self->_load_objects ($f)	2208	$self->_load_objects ($f)
2013	or return;	2209	or return;
2014		2210
2015	$self->post_load_original	2211	$self->post_load_original
2016	if delete $self->{load_original};	2212	if delete $self->{load_original};
2017		2213
2018	if (my $uniq = $self->uniq_path) {	2214	if (my $uniq = $self->uniq_path) {
2019	utf8::encode $uniq;	2215	utf8::encode $uniq;
2020	unless (aio_stat $uniq) {	2216	unless (aio_stat $uniq) {
2021	if (my $f = new_from_file cf::object::thawer $uniq) {	2217	if (my $f = new_from_file cf::object::thawer $uniq) {
2022	$self->clear_unique_items;	2218	$self->clear_unique_items;
2023	$self->_load_objects ($f);	2219	$self->_load_objects ($f);
2024	$f->resolve_delayed_derefs;	2220	$f->resolve_delayed_derefs;
		2221	}
2025	}	2222	}
2026	}	2223	}
2027	}
2028		2224
2029	$f->resolve_delayed_derefs;	2225	$f->resolve_delayed_derefs;
		2226	} else {
		2227	$self->post_load_original
		2228	if delete $self->{load_original};
		2229	}
		2230
		2231	$self->state (cf::MAP_INACTIVE);
2030		2232
2031	cf::cede_to_tick;	2233	cf::cede_to_tick;
2032	# now do the right thing for maps	2234	# now do the right thing for maps
2033	$self->link_multipart_objects;	2235	$self->link_multipart_objects;
2034	$self->difficulty ($self->estimate_difficulty)	2236	$self->difficulty ($self->estimate_difficulty)
…		…
2037		2239
2038	unless ($self->{deny_activate}) {	2240	unless ($self->{deny_activate}) {
2039	$self->decay_objects;	2241	$self->decay_objects;
2040	$self->fix_auto_apply;	2242	$self->fix_auto_apply;
2041	$self->update_buttons;	2243	$self->update_buttons;
		2244	$self->post_load_physics;
2042	cf::cede_to_tick;	2245	cf::cede_to_tick;
2043	$self->activate;	2246	#$self->activate; # no longer activate maps automatically
2044	}	2247	}
2045		2248
2046	$self->{last_save} = $cf::RUNTIME;	2249	$self->{last_save} = $cf::RUNTIME;
2047	$self->last_access ($cf::RUNTIME);	2250	$self->last_access ($cf::RUNTIME);
2048
2049	$self->in_memory (cf::MAP_ACTIVE);
2050	}	2251	}
2051		2252
2052	$self->post_load;	2253	$self->post_load;
2053	}
2054		2254
		2255	1
		2256	}
		2257
		2258	# customize the map for a given player, i.e.
		2259	# return the _real_ map. used by e.g. per-player
		2260	# maps to change the path to ~playername/mappath
2055	sub customise_for {	2261	sub customise_for {
2056	my ($self, $ob) = @_;	2262	my ($self, $ob) = @_;
2057		2263
2058	return find "~" . $ob->name . "/" . $self->{path}	2264	return find "~" . $ob->name . "/" . $self->{path}
2059	if $self->per_player;	2265	if $self->per_player;
…		…
2075	or next;	2281	or next;
2076	$neigh = find $neigh, $map	2282	$neigh = find $neigh, $map
2077	or next;	2283	or next;
2078	$neigh->load;	2284	$neigh->load;
2079		2285
		2286	# now find the diagonal neighbours
2080	push @neigh,	2287	push @neigh,
2081	[$neigh->tile_path (($_ + 3) % 4), $neigh],	2288	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2082	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2289	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2083	}	2290	}
2084		2291
…		…
2091	}	2298	}
2092		2299
2093	sub find_sync {	2300	sub find_sync {
2094	my ($path, $origin) = @_;	2301	my ($path, $origin) = @_;
2095		2302
2096	cf::sync_job { find $path, $origin }	2303	# it's a bug to call this from the main context
		2304	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2305	if $Coro::current == $Coro::main;
		2306
		2307	find $path, $origin
2097	}	2308	}
2098		2309
2099	sub do_load_sync {	2310	sub do_load_sync {
2100	my ($map) = @_;	2311	my ($map) = @_;
2101		2312
		2313	# it's a bug to call this from the main context
2102	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2314	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2103	if $Coro::current == $Coro::main;	2315	if $Coro::current == $Coro::main;
2104		2316
2105	cf::sync_job { $map->load };	2317	$map->load;
2106	}	2318	}
2107		2319
2108	our %MAP_PREFETCH;	2320	our %MAP_PREFETCH;
2109	our $MAP_PREFETCHER = undef;	2321	our $MAP_PREFETCHER = undef;
2110		2322
2111	sub find_async {	2323	sub find_async {
2112	my ($path, $origin, $load) = @_;	2324	my ($path, $origin, $load) = @_;
2113		2325
2114	$path = normalise $path, $origin && $origin->{path};	2326	$path = normalise $path, $origin;
2115		2327
		2328	print "find async $path (from $origin)\n";#d#
		2329
2116	if (my $map = $cf::MAP{$path}) {	2330	if (my $map = $cf::MAP{$path}) {
2117	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2331	return $map if !$load || $map->linkable;
2118	}	2332	}
2119		2333
2120	$MAP_PREFETCH{$path} |= $load;	2334	$MAP_PREFETCH{$path} |= $load;
2121		2335
2122	$MAP_PREFETCHER ||= cf::async {	2336	$MAP_PREFETCHER ||= cf::async {
…		…
2136	$MAP_PREFETCHER->prio (6);	2350	$MAP_PREFETCHER->prio (6);
2137		2351
2138	()	2352	()
2139	}	2353	}
2140		2354
		2355	# common code, used by both ->save and ->swapout
2141	sub save {	2356	sub _save {
2142	my ($self) = @_;	2357	my ($self) = @_;
2143
2144	my $lock = cf::lock_acquire "map_data:$self->{path}";
2145		2358
2146	$self->{last_save} = $cf::RUNTIME;	2359	$self->{last_save} = $cf::RUNTIME;
2147		2360
2148	return unless $self->dirty;	2361	return unless $self->dirty;
2149		2362
…		…
2169	} else {	2382	} else {
2170	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2383	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2171	}	2384	}
2172	}	2385	}
2173		2386
		2387	sub save {
		2388	my ($self) = @_;
		2389
		2390	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2391
		2392	$self->_save;
		2393	}
		2394
2174	sub swap_out {	2395	sub swap_out {
2175	my ($self) = @_;	2396	my ($self) = @_;
2176		2397
2177	# save first because save cedes
2178	$self->save;
2179
2180	my $lock = cf::lock_acquire "map_data:$self->{path}";	2398	my $lock = cf::lock_acquire "map_data:$self->{path}";
2181		2399
		2400	return if !$self->linkable;
		2401	return if $self->{deny_save};
2182	return if $self->players;	2402	return if $self->players;
2183	return if $self->in_memory != cf::MAP_ACTIVE;	2403
		2404	# first deactivate the map and "unlink" it from the core
		2405	$self->deactivate;
		2406	$_->clear_links_to ($self) for values %cf::MAP;
		2407	$self->state (cf::MAP_SWAPPED);
		2408
		2409	# then atomically save
		2410	$self->_save;
		2411
		2412	# then free the map
		2413	$self->clear;
		2414	}
		2415
		2416	sub reset_at {
		2417	my ($self) = @_;
		2418
		2419	# TODO: safety, remove and allow resettable per-player maps
2184	return if $self->{deny_save};	2420	return 1e99 if $self->{deny_reset};
2185		2421
		2422	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2423	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2424
		2425	$time + $to
		2426	}
		2427
		2428	sub should_reset {
		2429	my ($self) = @_;
		2430
		2431	$self->reset_at <= $cf::RUNTIME
		2432	}
		2433
		2434	sub reset {
		2435	my ($self) = @_;
		2436
		2437	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2438
		2439	return if $self->players;
		2440
		2441	cf::trace "resetting map ", $self->path, "\n";
		2442
2186	$self->in_memory (cf::MAP_SWAPPED);	2443	$self->state (cf::MAP_SWAPPED);
		2444
		2445	# need to save uniques path
		2446	unless ($self->{deny_save}) {
		2447	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2448
		2449	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2450	if $uniq;
		2451	}
		2452
		2453	delete $cf::MAP{$self->path};
2187		2454
2188	$self->deactivate;	2455	$self->deactivate;
2189	$_->clear_links_to ($self) for values %cf::MAP;	2456	$_->clear_links_to ($self) for values %cf::MAP;
2190	$self->clear;	2457	$self->clear;
2191	}
2192
2193	sub reset_at {
2194	my ($self) = @_;
2195
2196	# TODO: safety, remove and allow resettable per-player maps
2197	return 1e99 if $self->{deny_reset};
2198
2199	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2200	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2201
2202	$time + $to
2203	}
2204
2205	sub should_reset {
2206	my ($self) = @_;
2207
2208	$self->reset_at <= $cf::RUNTIME
2209	}
2210
2211	sub reset {
2212	my ($self) = @_;
2213
2214	my $lock = cf::lock_acquire "map_data:$self->{path}";
2215
2216	return if $self->players;
2217
2218	warn "resetting map ", $self->path;
2219
2220	$self->in_memory (cf::MAP_SWAPPED);
2221
2222	# need to save uniques path
2223	unless ($self->{deny_save}) {
2224	my $uniq = $self->uniq_path; utf8::encode $uniq;
2225
2226	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2227	if $uniq;
2228	}
2229
2230	delete $cf::MAP{$self->path};
2231
2232	$self->deactivate;
2233	$_->clear_links_to ($self) for values %cf::MAP;
2234	$self->clear;
2235		2458
2236	$self->unlink_save;	2459	$self->unlink_save;
2237	$self->destroy;	2460	$self->destroy;
2238	}	2461	}
2239		2462
…		…
2247		2470
2248	delete $cf::MAP{$self->path};	2471	delete $cf::MAP{$self->path};
2249		2472
2250	$self->unlink_save;	2473	$self->unlink_save;
2251		2474
2252	bless $self, "cf::map";	2475	bless $self, "cf::map::wrap";
2253	delete $self->{deny_reset};	2476	delete $self->{deny_reset};
2254	$self->{deny_save} = 1;	2477	$self->{deny_save} = 1;
2255	$self->reset_timeout (1);	2478	$self->reset_timeout (1);
2256	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2479	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2257		2480
…		…
2314	: normalise $_	2537	: normalise $_
2315	} @{ aio_readdir $UNIQUEDIR or [] }	2538	} @{ aio_readdir $UNIQUEDIR or [] }
2316	]	2539	]
2317	}	2540	}
2318		2541
		2542	=item cf::map::static_maps
		2543
		2544	Returns an arrayref if paths of all static maps (all preinstalled F<.map>
		2545	file in the shared directory excluding F</styles> and F</editor>). May
		2546	block.
		2547
		2548	=cut
		2549
		2550	sub static_maps() {
		2551	my @dirs = "";
		2552	my @maps;
		2553
		2554	while (@dirs) {
		2555	my $dir = shift @dirs;
		2556
		2557	next if $dir eq "/styles" || $dir eq "/editor";
		2558
		2559	my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
		2560	or return;
		2561
		2562	for (@$files) {
		2563	s/\.map$// or next;
		2564	utf8::decode $_;
		2565	push @maps, "$dir/$_";
		2566	}
		2567
		2568	push @dirs, map "$dir/$_", @$dirs;
		2569	}
		2570
		2571	\@maps
		2572	}
		2573
2319	=back	2574	=back
2320		2575
2321	=head3 cf::object	2576	=head3 cf::object
2322		2577
2323	=cut	2578	=cut
…		…
2455		2710
2456	Freezes the player and moves him/her to a special map (C<{link}>).	2711	Freezes the player and moves him/her to a special map (C<{link}>).
2457		2712
2458	The player should be reasonably safe there for short amounts of time (e.g.	2713	The player should be reasonably safe there for short amounts of time (e.g.
2459	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2714	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2460	though, as the palyer cannot control the character while it is on the link	2715	though, as the player cannot control the character while it is on the link
2461	map.	2716	map.
2462		2717
2463	Will never block.	2718	Will never block.
2464		2719
2465	=item $player_object->leave_link ($map, $x, $y)	2720	=item $player_object->leave_link ($map, $x, $y)
…		…
2486	sub cf::object::player::enter_link {	2741	sub cf::object::player::enter_link {
2487	my ($self) = @_;	2742	my ($self) = @_;
2488		2743
2489	$self->deactivate_recursive;	2744	$self->deactivate_recursive;
2490		2745
		2746	++$self->{_link_recursion};
		2747
2491	return if UNIVERSAL::isa $self->map, "ext::map_link";	2748	return if UNIVERSAL::isa $self->map, "ext::map_link";
2492		2749
2493	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2750	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494	if $self->map && $self->map->{path} ne "{link}";	2751	if $self->map && $self->map->{path} ne "{link}";
2495		2752
2496	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2753	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2497	}	2754	}
2498		2755
2499	sub cf::object::player::leave_link {	2756	sub cf::object::player::leave_link {
2500	my ($self, $map, $x, $y) = @_;	2757	my ($self, $map, $x, $y) = @_;
2501		2758
…		…
2518	($x, $y) = (-1, -1)	2775	($x, $y) = (-1, -1)
2519	unless (defined $x) && (defined $y);	2776	unless (defined $x) && (defined $y);
2520		2777
2521	# use -1 or undef as default coordinates, not 0, 0	2778	# use -1 or undef as default coordinates, not 0, 0
2522	($x, $y) = ($map->enter_x, $map->enter_y)	2779	($x, $y) = ($map->enter_x, $map->enter_y)
2523	if $x <=0 && $y <= 0;	2780	if $x <= 0 && $y <= 0;
2524		2781
2525	$map->load;	2782	$map->load;
2526	$map->load_neighbours;	2783	$map->load_neighbours;
2527		2784
2528	return unless $self->contr->active;	2785	return unless $self->contr->active;
2529	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2530	$self->activate_recursive;
2531		2786
2532	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2787	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2533	$self->enter_map ($map, $x, $y);	2788	if ($self->enter_map ($map, $x, $y)) {
2534	}	2789	# entering was successful
		2790	delete $self->{_link_recursion};
		2791	# only activate afterwards, to support waiting in hooks
		2792	$self->activate_recursive;
		2793	}
2535		2794
		2795	}
		2796
2536	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2797	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2537		2798
2538	Moves the player to the given map-path and coordinates by first freezing	2799	Moves the player to the given map-path and coordinates by first freezing
2539	her, loading and preparing them map, calling the provided $check callback	2800	her, loading and preparing them map, calling the provided $check callback
2540	that has to return the map if sucecssful, and then unfreezes the player on	2801	that has to return the map if sucecssful, and then unfreezes the player on
2541	the new (success) or old (failed) map position. In either case, $done will	2802	the new (success) or old (failed) map position. In either case, $done will
…		…
2548		2809
2549	our $GOTOGEN;	2810	our $GOTOGEN;
2550		2811
2551	sub cf::object::player::goto {	2812	sub cf::object::player::goto {
2552	my ($self, $path, $x, $y, $check, $done) = @_;	2813	my ($self, $path, $x, $y, $check, $done) = @_;
		2814
		2815	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2816	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2817	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2818	($path, $x, $y) = @$EMERGENCY_POSITION;
		2819	}
2553		2820
2554	# do generation counting so two concurrent goto's will be executed in-order	2821	# do generation counting so two concurrent goto's will be executed in-order
2555	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2822	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2556		2823
2557	$self->enter_link;	2824	$self->enter_link;
…		…
2577	($path, $x, $y) = (undef, undef, undef);	2844	($path, $x, $y) = (undef, undef, undef);
2578	}	2845	}
2579	}	2846	}
2580		2847
2581	my $map = eval {	2848	my $map = eval {
2582	my $map = defined $path ? cf::map::find $path : undef;	2849	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2583		2850
2584	if ($map) {	2851	if ($map) {
2585	$map = $map->customise_for ($self);	2852	$map = $map->customise_for ($self);
2586	$map = $check->($map) if $check && $map;	2853	$map = $check->($map, $x, $y, $self) if $check && $map;
2587	} else {	2854	} else {
2588	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2855	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2589	}	2856	}
2590		2857
2591	$map	2858	$map
…		…
2599	if ($gen == $self->{_goto_generation}) {	2866	if ($gen == $self->{_goto_generation}) {
2600	delete $self->{_goto_generation};	2867	delete $self->{_goto_generation};
2601	$self->leave_link ($map, $x, $y);	2868	$self->leave_link ($map, $x, $y);
2602	}	2869	}
2603		2870
2604	$done->() if $done;	2871	$done->($self) if $done;
2605	})->prio (1);	2872	})->prio (1);
2606	}	2873	}
2607		2874
2608	=item $player_object->enter_exit ($exit_object)	2875	=item $player_object->enter_exit ($exit_object)
2609		2876
…		…
2677	$Coro::current->{desc} = "enter_exit";	2944	$Coro::current->{desc} = "enter_exit";
2678		2945
2679	unless (eval {	2946	unless (eval {
2680	$self->deactivate_recursive; # just to be sure	2947	$self->deactivate_recursive; # just to be sure
2681		2948
2682	# random map handling
2683	{
2684	my $guard = cf::lock_acquire "exit_prepare:$exit";
2685
2686	prepare_random_map $exit
2687	if $exit->slaying eq "/!";
2688	}
2689
2690	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2949	my $map = cf::map::normalise $exit->slaying, $exit->map;
2691	my $x = $exit->stats->hp;	2950	my $x = $exit->stats->hp;
2692	my $y = $exit->stats->sp;	2951	my $y = $exit->stats->sp;
		2952
		2953	# special map handling
		2954	my $slaying = $exit->slaying;
		2955
		2956	# special map handling
		2957	if ($slaying eq "/!") {
		2958	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2959
		2960	prepare_random_map $exit
		2961	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		2962
		2963	$map = $exit->slaying;
		2964
		2965	} elsif ($slaying eq '!up') {
		2966	$map = $exit->map->tile_path (cf::TILE_UP);
		2967	$x = $exit->x;
		2968	$y = $exit->y;
		2969
		2970	} elsif ($slaying eq '!down') {
		2971	$map = $exit->map->tile_path (cf::TILE_DOWN);
		2972	$x = $exit->x;
		2973	$y = $exit->y;
		2974	}
2693		2975
2694	$self->goto ($map, $x, $y);	2976	$self->goto ($map, $x, $y);
2695		2977
2696	# if exit is damned, update players death & WoR home-position	2978	# if exit is damned, update players death & WoR home-position
2697	$self->contr->savebed ($map, $x, $y)	2979	$self->contr->savebed ($map, $x, $y)
…		…
2702	$self->message ("Something went wrong deep within the deliantra server. "	2984	$self->message ("Something went wrong deep within the deliantra server. "
2703	. "I'll try to bring you back to the map you were before. "	2985	. "I'll try to bring you back to the map you were before. "
2704	. "Please report this to the dungeon master!",	2986	. "Please report this to the dungeon master!",
2705	cf::NDI_UNIQUE | cf::NDI_RED);	2987	cf::NDI_UNIQUE | cf::NDI_RED);
2706		2988
2707	warn "ERROR in enter_exit: $@";	2989	error "ERROR in enter_exit: $@";
2708	$self->leave_link;	2990	$self->leave_link;
2709	}	2991	}
2710	})->prio (1);	2992	})->prio (1);
2711	}	2993	}
2712		2994
…		…
2724	sub cf::client::send_drawinfo {	3006	sub cf::client::send_drawinfo {
2725	my ($self, $text, $flags) = @_;	3007	my ($self, $text, $flags) = @_;
2726		3008
2727	utf8::encode $text;	3009	utf8::encode $text;
2728	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	3010	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
		3011	}
		3012
		3013	=item $client->send_big_packet ($pkt)
		3014
		3015	Like C<send_packet>, but tries to compress large packets, and fragments
		3016	them as required.
		3017
		3018	=cut
		3019
		3020	our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
		3021
		3022	sub cf::client::send_big_packet {
		3023	my ($self, $pkt) = @_;
		3024
		3025	# try lzf for large packets
		3026	$pkt = "lzf " . Compress::LZF::compress $pkt
		3027	if 1024 <= length $pkt and $self->{can_lzf};
		3028
		3029	# split very large packets
		3030	if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
		3031	$self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
		3032	$pkt = "frag";
		3033	}
		3034
		3035	$self->send_packet ($pkt);
2729	}	3036	}
2730		3037
2731	=item $client->send_msg ($channel, $msg, $color, [extra...])	3038	=item $client->send_msg ($channel, $msg, $color, [extra...])
2732		3039
2733	Send a drawinfo or msg packet to the client, formatting the msg for the	3040	Send a drawinfo or msg packet to the client, formatting the msg for the
…		…
2737		3044
2738	=cut	3045	=cut
2739		3046
2740	# non-persistent channels (usually the info channel)	3047	# non-persistent channels (usually the info channel)
2741	our %CHANNEL = (	3048	our %CHANNEL = (
		3049	"c/motd" => {
		3050	id => "infobox",
		3051	title => "MOTD",
		3052	reply => undef,
		3053	tooltip => "The message of the day",
		3054	},
2742	"c/identify" => {	3055	"c/identify" => {
2743	id => "infobox",	3056	id => "infobox",
2744	title => "Identify",	3057	title => "Identify",
2745	reply => undef,	3058	reply => undef,
2746	tooltip => "Items recently identified",	3059	tooltip => "Items recently identified",
…		…
2748	"c/examine" => {	3061	"c/examine" => {
2749	id => "infobox",	3062	id => "infobox",
2750	title => "Examine",	3063	title => "Examine",
2751	reply => undef,	3064	reply => undef,
2752	tooltip => "Signs and other items you examined",	3065	tooltip => "Signs and other items you examined",
		3066	},
		3067	"c/shopinfo" => {
		3068	id => "infobox",
		3069	title => "Shop Info",
		3070	reply => undef,
		3071	tooltip => "What your bargaining skill tells you about the shop",
2753	},	3072	},
2754	"c/book" => {	3073	"c/book" => {
2755	id => "infobox",	3074	id => "infobox",
2756	title => "Book",	3075	title => "Book",
2757	reply => undef,	3076	reply => undef,
…		…
2803	id => "infobox",	3122	id => "infobox",
2804	title => "Pets",	3123	title => "Pets",
2805	reply => undef,	3124	reply => undef,
2806	tooltip => "Shows information abotu your pets/a specific pet",	3125	tooltip => "Shows information abotu your pets/a specific pet",
2807	},	3126	},
		3127	"c/perceiveself" => {
		3128	id => "infobox",
		3129	title => "Perceive Self",
		3130	reply => undef,
		3131	tooltip => "You gained detailed knowledge about yourself",
		3132	},
2808	"c/uptime" => {	3133	"c/uptime" => {
2809	id => "infobox",	3134	id => "infobox",
2810	title => "Uptime",	3135	title => "Uptime",
2811	reply => undef,	3136	reply => undef,
2812	tooltip => "How long the server has been running since last restart",	3137	tooltip => "How long the server has been running since last restart",
…		…
2867	my $pkt = "msg "	3192	my $pkt = "msg "
2868	. $self->{json_coder}->encode (	3193	. $self->{json_coder}->encode (
2869	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	3194	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2870	);	3195	);
2871		3196
2872	# try lzf for large packets
2873	$pkt = "lzf " . Compress::LZF::compress $pkt
2874	if 1024 <= length $pkt and $self->{can_lzf};
2875
2876	# split very large packets
2877	if (8192 < length $pkt and $self->{can_lzf}) {
2878	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2879	$pkt = "frag";
2880	}
2881
2882	$self->send_packet ($pkt);	3197	$self->send_big_packet ($pkt);
2883	}	3198	}
2884		3199
2885	=item $client->ext_msg ($type, @msg)	3200	=item $client->ext_msg ($type, @msg)
2886		3201
2887	Sends an ext event to the client.	3202	Sends an ext event to the client.
…		…
2890		3205
2891	sub cf::client::ext_msg($$@) {	3206	sub cf::client::ext_msg($$@) {
2892	my ($self, $type, @msg) = @_;	3207	my ($self, $type, @msg) = @_;
2893		3208
2894	if ($self->extcmd == 2) {	3209	if ($self->extcmd == 2) {
2895	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3210	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2896	} elsif ($self->extcmd == 1) { # TODO: remove	3211	} elsif ($self->extcmd == 1) { # TODO: remove
2897	push @msg, msgtype => "event_$type";	3212	push @msg, msgtype => "event_$type";
2898	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3213	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2899	}	3214	}
2900	}	3215	}
2901		3216
2902	=item $client->ext_reply ($msgid, @msg)	3217	=item $client->ext_reply ($msgid, @msg)
2903		3218
…		…
2907		3222
2908	sub cf::client::ext_reply($$@) {	3223	sub cf::client::ext_reply($$@) {
2909	my ($self, $id, @msg) = @_;	3224	my ($self, $id, @msg) = @_;
2910		3225
2911	if ($self->extcmd == 2) {	3226	if ($self->extcmd == 2) {
2912	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3227	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2913	} elsif ($self->extcmd == 1) {	3228	} elsif ($self->extcmd == 1) {
2914	#TODO: version 1, remove	3229	#TODO: version 1, remove
2915	unshift @msg, msgtype => "reply", msgid => $id;	3230	unshift @msg, msgtype => "reply", msgid => $id;
2916	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3231	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2917	}	3232	}
2918	}	3233	}
2919		3234
2920	=item $success = $client->query ($flags, "text", \&cb)	3235	=item $success = $client->query ($flags, "text", \&cb)
2921		3236
…		…
2992		3307
2993	$ns->ext_reply ($reply, @reply)	3308	$ns->ext_reply ($reply, @reply)
2994	if $reply;	3309	if $reply;
2995		3310
2996	} else {	3311	} else {
2997	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3312	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2998	}	3313	}
2999		3314
3000	cf::override;	3315	cf::override;
3001	},	3316	},
3002	);	3317	);
…		…
3022		3337
3023	$coro	3338	$coro
3024	}	3339	}
3025		3340
3026	cf::client->attach (	3341	cf::client->attach (
3027	on_destroy => sub {	3342	on_client_destroy => sub {
3028	my ($ns) = @_;	3343	my ($ns) = @_;
3029		3344
3030	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3345	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3031	},	3346	},
3032	);	3347	);
…		…
3048	our $safe_hole = new Safe::Hole;	3363	our $safe_hole = new Safe::Hole;
3049		3364
3050	$SIG{FPE} = 'IGNORE';	3365	$SIG{FPE} = 'IGNORE';
3051		3366
3052	$safe->permit_only (Opcode::opset qw(	3367	$safe->permit_only (Opcode::opset qw(
3053	:base_core :base_mem :base_orig :base_math	3368	:base_core :base_mem :base_orig :base_math :base_loop
3054	grepstart grepwhile mapstart mapwhile	3369	grepstart grepwhile mapstart mapwhile
3055	sort time	3370	sort time
3056	));	3371	));
3057		3372
3058	# here we export the classes and methods available to script code	3373	# here we export the classes and methods available to script code
…		…
3083	decrease split destroy change_exp value msg lore send_msg)],	3398	decrease split destroy change_exp value msg lore send_msg)],
3084	["cf::object::player" => qw(player)],	3399	["cf::object::player" => qw(player)],
3085	["cf::player" => qw(peaceful send_msg)],	3400	["cf::player" => qw(peaceful send_msg)],
3086	["cf::map" => qw(trigger)],	3401	["cf::map" => qw(trigger)],
3087	) {	3402	) {
3088	no strict 'refs';
3089	my ($pkg, @funs) = @$_;	3403	my ($pkg, @funs) = @$_;
3090	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3404	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3091	for @funs;	3405	for @funs;
3092	}	3406	}
3093		3407
…		…
3110	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3424	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3111	$qcode =~ s/\n/\\n/g;	3425	$qcode =~ s/\n/\\n/g;
3112		3426
3113	%vars = (_dummy => 0) unless %vars;	3427	%vars = (_dummy => 0) unless %vars;
3114		3428
		3429	my @res;
3115	local $_;	3430	local $_;
3116	local @safe::cf::_safe_eval_args = values %vars;
3117		3431
3118	my $eval =	3432	my $eval =
3119	"do {\n"	3433	"do {\n"
3120	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3434	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3121	. "#line 0 \"{$qcode}\"\n"	3435	. "#line 0 \"{$qcode}\"\n"
3122	. $code	3436	. $code
3123	. "\n}"	3437	. "\n}"
3124	;	3438	;
3125		3439
		3440	if ($CFG{safe_eval}) {
3126	sub_generation_inc;	3441	sub_generation_inc;
		3442	local @safe::cf::_safe_eval_args = values %vars;
3127	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3443	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3128	sub_generation_inc;	3444	sub_generation_inc;
		3445	} else {
		3446	local @cf::_safe_eval_args = values %vars;
		3447	@res = wantarray ? eval eval : scalar eval $eval;
		3448	}
3129		3449
3130	if ($@) {	3450	if ($@) {
3131	warn "$@";	3451	warn "$@",
3132	warn "while executing safe code '$code'\n";	3452	"while executing safe code '$code'\n",
3133	warn "with arguments " . (join " ", %vars) . "\n";	3453	"with arguments " . (join " ", %vars) . "\n";
3134	}	3454	}
3135		3455
3136	wantarray ? @res : $res[0]	3456	wantarray ? @res : $res[0]
3137	}	3457	}
3138		3458
…		…
3152	=cut	3472	=cut
3153		3473
3154	sub register_script_function {	3474	sub register_script_function {
3155	my ($fun, $cb) = @_;	3475	my ($fun, $cb) = @_;
3156		3476
3157	no strict 'refs';	3477	$fun = "safe::$fun" if $CFG{safe_eval};
3158	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3478	*$fun = $safe_hole->wrap ($cb);
3159	}	3479	}
3160		3480
3161	=back	3481	=back
3162		3482
3163	=cut	3483	=cut
…		…
3172	# for this (global event?)	3492	# for this (global event?)
3173	%ext::player_env::MUSIC_FACE_CACHE = ();	3493	%ext::player_env::MUSIC_FACE_CACHE = ();
3174		3494
3175	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3495	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3176		3496
3177	warn "loading facedata from $path\n";	3497	trace "loading facedata from $path\n";
3178		3498
3179	my $facedata;	3499	my $facedata = decode_storable load_file $path;
3180	0 < aio_load $path, $facedata
3181	or die "$path: $!";
3182
3183	$facedata = Coro::Storable::thaw $facedata;
3184		3500
3185	$facedata->{version} == 2	3501	$facedata->{version} == 2
3186	or cf::cleanup "$path: version mismatch, cannot proceed.";	3502	or cf::cleanup "$path: version mismatch, cannot proceed.";
3187		3503
3188	# patch in the exptable	3504	# patch in the exptable
		3505	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3189	$facedata->{resource}{"res/exp_table"} = {	3506	$facedata->{resource}{"res/exp_table"} = {
3190	type => FT_RSRC,	3507	type => FT_RSRC,
3191	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),	3508	data => $exp_table,
		3509	hash => (Digest::MD5::md5 $exp_table),
3192	};	3510	};
3193	cf::cede_to_tick;	3511	cf::cede_to_tick;
3194		3512
3195	{	3513	{
3196	my $faces = $facedata->{faceinfo};	3514	my $faces = $facedata->{faceinfo};
…		…
3198	while (my ($face, $info) = each %$faces) {	3516	while (my ($face, $info) = each %$faces) {
3199	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3517	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3200		3518
3201	cf::face::set_visibility $idx, $info->{visibility};	3519	cf::face::set_visibility $idx, $info->{visibility};
3202	cf::face::set_magicmap $idx, $info->{magicmap};	3520	cf::face::set_magicmap $idx, $info->{magicmap};
3203	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3521	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3204	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3522	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
		3523	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3205		3524
3206	cf::cede_to_tick;	3525	cf::cede_to_tick;
3207	}	3526	}
3208		3527
3209	while (my ($face, $info) = each %$faces) {	3528	while (my ($face, $info) = each %$faces) {
…		…
3214		3533
3215	if (my $smooth = cf::face::find $info->{smooth}) {	3534	if (my $smooth = cf::face::find $info->{smooth}) {
3216	cf::face::set_smooth $idx, $smooth;	3535	cf::face::set_smooth $idx, $smooth;
3217	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3536	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3218	} else {	3537	} else {
3219	warn "smooth face '$info->{smooth}' not found for face '$face'";	3538	error "smooth face '$info->{smooth}' not found for face '$face'";
3220	}	3539	}
3221		3540
3222	cf::cede_to_tick;	3541	cf::cede_to_tick;
3223	}	3542	}
3224	}	3543	}
…		…
3233		3552
3234	cf::anim::invalidate_all; # d'oh	3553	cf::anim::invalidate_all; # d'oh
3235	}	3554	}
3236		3555
3237	{	3556	{
3238	# TODO: for gcfclient pleasure, we should give resources
3239	# that gcfclient doesn't grok a >10000 face index.
3240	my $res = $facedata->{resource};	3557	my $res = $facedata->{resource};
3241		3558
3242	while (my ($name, $info) = each %$res) {	3559	while (my ($name, $info) = each %$res) {
3243	if (defined $info->{type}) {	3560	if (defined $info->{type}) {
3244	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3561	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3245	my $data;
3246		3562
3247	if ($info->{type} & 1) {	3563	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3248	# prepend meta info
3249
3250	my $meta = $enc->encode ({
3251	name => $name,
3252	%{ $info->{meta} || {} },
3253	});
3254
3255	$data = pack "(w/a*)*", $meta, $info->{data};
3256	} else {
3257	$data = $info->{data};
3258	}
3259
3260	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3261	cf::face::set_type $idx, $info->{type};	3564	cf::face::set_type $idx, $info->{type};
3262	} else {	3565	} else {
3263	$RESOURCE{$name} = $info;	3566	$RESOURCE{$name} = $info; # unused
3264	}	3567	}
3265		3568
3266	cf::cede_to_tick;	3569	cf::cede_to_tick;
3267	}	3570	}
3268	}	3571	}
3269		3572
3270	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3573	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3271		3574
3272	1	3575	1
3273	}	3576	}
3274
3275	cf::global->attach (on_resource_update => sub {
3276	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3277	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3278
3279	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3280	my $sound = $soundconf->{compat}[$_]
3281	or next;
3282
3283	my $face = cf::face::find "sound/$sound->[1]";
3284	cf::sound::set $sound->[0] => $face;
3285	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3286	}
3287
3288	while (my ($k, $v) = each %{$soundconf->{event}}) {
3289	my $face = cf::face::find "sound/$v";
3290	cf::sound::set $k => $face;
3291	}
3292	}
3293	});
3294		3577
3295	register_exticmd fx_want => sub {	3578	register_exticmd fx_want => sub {
3296	my ($ns, $want) = @_;	3579	my ($ns, $want) = @_;
3297		3580
3298	while (my ($k, $v) = each %$want) {	3581	while (my ($k, $v) = each %$want) {
…		…
3337	sub reload_treasures {	3620	sub reload_treasures {
3338	load_resource_file "$DATADIR/treasures"	3621	load_resource_file "$DATADIR/treasures"
3339	or die "unable to load treasurelists\n";	3622	or die "unable to load treasurelists\n";
3340	}	3623	}
3341		3624
		3625	sub reload_sound {
		3626	trace "loading sound config from $DATADIR/sound\n";
		3627
		3628	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3629
		3630	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3631	my $sound = $soundconf->{compat}[$_]
		3632	or next;
		3633
		3634	my $face = cf::face::find "sound/$sound->[1]";
		3635	cf::sound::set $sound->[0] => $face;
		3636	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3637	}
		3638
		3639	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3640	my $face = cf::face::find "sound/$v";
		3641	cf::sound::set $k => $face;
		3642	}
		3643	}
		3644
3342	sub reload_resources {	3645	sub reload_resources {
3343	warn "reloading resource files...\n";	3646	trace "reloading resource files...\n";
3344		3647
		3648	reload_exp_table;
		3649	reload_materials;
3345	reload_facedata;	3650	reload_facedata;
		3651	reload_sound;
3346	reload_archetypes;	3652	reload_archetypes;
3347	reload_regions;	3653	reload_regions;
3348	reload_treasures;	3654	reload_treasures;
3349		3655
3350	warn "finished reloading resource files\n";	3656	trace "finished reloading resource files\n";
3351	}	3657	}
3352		3658
3353	sub reload_config {	3659	sub reload_config {
3354	open my $fh, "<:utf8", "$CONFDIR/config"	3660	trace "reloading config file...\n";
3355	or return;
3356		3661
3357	local $/;	3662	my $config = load_file "$CONFDIR/config";
3358	*CFG = YAML::Load <$fh>;	3663	utf8::decode $config;
		3664	*CFG = decode_yaml $config;
3359		3665
3360	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3666	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3361		3667
3362	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3668	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3363	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3669	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3364		3670
3365	if (exists $CFG{mlockall}) {	3671	if (exists $CFG{mlockall}) {
…		…
3388		3694
3389	seek $fh, 0, 0;	3695	seek $fh, 0, 0;
3390	print $fh $$;	3696	print $fh $$;
3391	}	3697	}
3392		3698
		3699	sub main_loop {
		3700	trace "EV::loop starting\n";
		3701	if (1) {
		3702	EV::loop;
		3703	}
		3704	trace "EV::loop returned\n";
		3705	goto &main_loop unless $REALLY_UNLOOP;
		3706	}
		3707
3393	sub main {	3708	sub main {
3394	cf::init_globals; # initialise logging	3709	cf::init_globals; # initialise logging
3395		3710
3396	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3711	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3397	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3712	LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3398	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3713	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3399	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3714	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3400
3401	cf::init_experience;
3402	cf::init_anim;
3403	cf::init_attackmess;
3404	cf::init_dynamic;
3405		3715
3406	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3716	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3407		3717
3408	# we must not ever block the main coroutine	3718	# we must not ever block the main coroutine
3409	local $Coro::idle = sub {	3719	local $Coro::idle = sub {
…		…
3415	};	3725	};
3416		3726
3417	evthread_start IO::AIO::poll_fileno;	3727	evthread_start IO::AIO::poll_fileno;
3418		3728
3419	cf::sync_job {	3729	cf::sync_job {
		3730	cf::incloader::init ();
		3731
		3732	cf::init_anim;
		3733	cf::init_attackmess;
		3734	cf::init_dynamic;
		3735
		3736	cf::load_settings;
		3737
3420	reload_resources;	3738	reload_resources;
3421	reload_config;	3739	reload_config;
3422	db_init;	3740	db_init;
3423		3741
3424	cf::load_settings;
3425	cf::load_materials;
3426	cf::init_uuid;	3742	cf::init_uuid;
3427	cf::init_signals;	3743	cf::init_signals;
3428	cf::init_commands;
3429	cf::init_skills;	3744	cf::init_skills;
3430		3745
3431	cf::init_beforeplay;	3746	cf::init_beforeplay;
3432		3747
3433	atomic;	3748	atomic;
…		…
3435	load_extensions;	3750	load_extensions;
3436		3751
3437	utime time, time, $RUNTIMEFILE;	3752	utime time, time, $RUNTIMEFILE;
3438		3753
3439	# no (long-running) fork's whatsoever before this point(!)	3754	# no (long-running) fork's whatsoever before this point(!)
		3755	use POSIX ();
3440	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3756	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3441		3757
3442	(pop @POST_INIT)->(0) while @POST_INIT;	3758	cf::_post_init 0;
3443	};	3759	};
3444		3760
3445	EV::loop;	3761	cf::object::thawer::errors_are_fatal 0;
		3762	info "parse errors in files are no longer fatal from this point on.\n";
		3763
		3764	my $free_main; $free_main = EV::idle sub {
		3765	undef $free_main;
		3766	undef &main; # free gobs of memory :)
		3767	};
		3768
		3769	goto &main_loop;
3446	}	3770	}
3447		3771
3448	#############################################################################	3772	#############################################################################
3449	# initialisation and cleanup	3773	# initialisation and cleanup
3450		3774
3451	# install some emergency cleanup handlers	3775	# install some emergency cleanup handlers
3452	BEGIN {	3776	BEGIN {
3453	our %SIGWATCHER = ();	3777	our %SIGWATCHER = ();
3454	for my $signal (qw(INT HUP TERM)) {	3778	for my $signal (qw(INT HUP TERM)) {
3455	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3779	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3456	cf::cleanup "SIG$signal";	3780	cf::cleanup "SIG$signal";
3457	};	3781	};
3458	}	3782	}
3459	}	3783	}
3460		3784
3461	sub write_runtime_sync {	3785	sub write_runtime_sync {
		3786	my $t0 = AE::time;
		3787
3462	# first touch the runtime file to show we are still running:	3788	# first touch the runtime file to show we are still running:
3463	# the fsync below can take a very very long time.	3789	# the fsync below can take a very very long time.
3464		3790
3465	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3791	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3466		3792
3467	my $guard = cf::lock_acquire "write_runtime";	3793	my $guard = cf::lock_acquire "write_runtime";
3468		3794
3469	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3795	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3470	or return;	3796	or return;
3471		3797
3472	my $value = $cf::RUNTIME + 90 + 10;	3798	my $value = $cf::RUNTIME + 90 + 10;
3473	# 10 is the runtime save interval, for a monotonic clock	3799	# 10 is the runtime save interval, for a monotonic clock
3474	# 60 allows for the watchdog to kill the server.	3800	# 60 allows for the watchdog to kill the server.
…		…
3487	or return;	3813	or return;
3488		3814
3489	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3815	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3490	and return;	3816	and return;
3491		3817
3492	warn "runtime file written.\n";	3818	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3493		3819
3494	1	3820	1
3495	}	3821	}
3496		3822
3497	our $uuid_lock;	3823	our $uuid_lock;
…		…
3509	or return;	3835	or return;
3510		3836
3511	my $value = uuid_seq uuid_cur;	3837	my $value = uuid_seq uuid_cur;
3512		3838
3513	unless ($value) {	3839	unless ($value) {
3514	warn "cowardly refusing to write zero uuid value!\n";	3840	info "cowardly refusing to write zero uuid value!\n";
3515	return;	3841	return;
3516	}	3842	}
3517		3843
3518	my $value = uuid_str $value + $uuid_skip;	3844	my $value = uuid_str $value + $uuid_skip;
3519	$uuid_skip = 0;	3845	$uuid_skip = 0;
…		…
3529	or return;	3855	or return;
3530		3856
3531	aio_rename "$uuid~", $uuid	3857	aio_rename "$uuid~", $uuid
3532	and return;	3858	and return;
3533		3859
3534	warn "uuid file written ($value).\n";	3860	trace "uuid file written ($value).\n";
3535		3861
3536	1	3862	1
3537		3863
3538	}	3864	}
3539		3865
…		…
3545	}	3871	}
3546		3872
3547	sub emergency_save() {	3873	sub emergency_save() {
3548	my $freeze_guard = cf::freeze_mainloop;	3874	my $freeze_guard = cf::freeze_mainloop;
3549		3875
3550	warn "emergency_perl_save: enter\n";	3876	info "emergency_perl_save: enter\n";
		3877
		3878	# this is a trade-off: we want to be very quick here, so
		3879	# save all maps without fsync, and later call a global sync
		3880	# (which in turn might be very very slow)
		3881	local $USE_FSYNC = 0;
3551		3882
3552	cf::sync_job {	3883	cf::sync_job {
3553	# this is a trade-off: we want to be very quick here, so	3884	cf::write_runtime_sync; # external watchdog should not bark
3554	# save all maps without fsync, and later call a global sync
3555	# (which in turn might be very very slow)
3556	local $USE_FSYNC = 0;
3557		3885
3558	# use a peculiar iteration method to avoid tripping on perl	3886	# use a peculiar iteration method to avoid tripping on perl
3559	# refcount bugs in for. also avoids problems with players	3887	# refcount bugs in for. also avoids problems with players
3560	# and maps saved/destroyed asynchronously.	3888	# and maps saved/destroyed asynchronously.
3561	warn "emergency_perl_save: begin player save\n";	3889	info "emergency_perl_save: begin player save\n";
3562	for my $login (keys %cf::PLAYER) {	3890	for my $login (keys %cf::PLAYER) {
3563	my $pl = $cf::PLAYER{$login} or next;	3891	my $pl = $cf::PLAYER{$login} or next;
3564	$pl->valid or next;	3892	$pl->valid or next;
3565	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3893	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3566	$pl->save;	3894	$pl->save;
3567	}	3895	}
3568	warn "emergency_perl_save: end player save\n";	3896	info "emergency_perl_save: end player save\n";
3569		3897
		3898	cf::write_runtime_sync; # external watchdog should not bark
		3899
3570	warn "emergency_perl_save: begin map save\n";	3900	info "emergency_perl_save: begin map save\n";
3571	for my $path (keys %cf::MAP) {	3901	for my $path (keys %cf::MAP) {
3572	my $map = $cf::MAP{$path} or next;	3902	my $map = $cf::MAP{$path} or next;
3573	$map->valid or next;	3903	$map->valid or next;
3574	$map->save;	3904	$map->save;
3575	}	3905	}
3576	warn "emergency_perl_save: end map save\n";	3906	info "emergency_perl_save: end map save\n";
3577		3907
		3908	cf::write_runtime_sync; # external watchdog should not bark
		3909
3578	warn "emergency_perl_save: begin database checkpoint\n";	3910	info "emergency_perl_save: begin database checkpoint\n";
3579	BDB::db_env_txn_checkpoint $DB_ENV;	3911	BDB::db_env_txn_checkpoint $DB_ENV;
3580	warn "emergency_perl_save: end database checkpoint\n";	3912	info "emergency_perl_save: end database checkpoint\n";
3581		3913
3582	warn "emergency_perl_save: begin write uuid\n";	3914	info "emergency_perl_save: begin write uuid\n";
3583	write_uuid_sync 1;	3915	write_uuid_sync 1;
3584	warn "emergency_perl_save: end write uuid\n";	3916	info "emergency_perl_save: end write uuid\n";
		3917
		3918	cf::write_runtime_sync; # external watchdog should not bark
		3919
		3920	trace "emergency_perl_save: syncing database to disk";
		3921	BDB::db_env_txn_checkpoint $DB_ENV;
		3922
		3923	info "emergency_perl_save: starting sync\n";
		3924	IO::AIO::aio_sync sub {
		3925	info "emergency_perl_save: finished sync\n";
		3926	};
		3927
		3928	cf::write_runtime_sync; # external watchdog should not bark
		3929
		3930	trace "emergency_perl_save: flushing outstanding aio requests";
		3931	while (IO::AIO::nreqs || BDB::nreqs) {
		3932	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
		3933	}
		3934
		3935	cf::write_runtime_sync; # external watchdog should not bark
3585	};	3936	};
3586		3937
3587	warn "emergency_perl_save: starting sync()\n";
3588	IO::AIO::aio_sync sub {
3589	warn "emergency_perl_save: finished sync()\n";
3590	};
3591
3592	warn "emergency_perl_save: leave\n";	3938	info "emergency_perl_save: leave\n";
3593	}	3939	}
3594		3940
3595	sub post_cleanup {	3941	sub post_cleanup {
3596	my ($make_core) = @_;	3942	my ($make_core) = @_;
3597		3943
		3944	IO::AIO::flush;
		3945
3598	warn Carp::longmess "post_cleanup backtrace"	3946	error Carp::longmess "post_cleanup backtrace"
3599	if $make_core;	3947	if $make_core;
3600		3948
3601	my $fh = pidfile;	3949	my $fh = pidfile;
3602	unlink $PIDFILE if <$fh> == $$;	3950	unlink $PIDFILE if <$fh> == $$;
3603	}	3951	}
…		…
3623	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3971	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3624	for my $name (keys %$leaf_symtab) {	3972	for my $name (keys %$leaf_symtab) {
3625	_gv_clear *{"$pkg$name"};	3973	_gv_clear *{"$pkg$name"};
3626	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3974	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3627	}	3975	}
3628	warn "cleared package $pkg\n";#d#
3629	}	3976	}
3630		3977
3631	sub do_reload_perl() {	3978	sub do_reload_perl() {
3632	# can/must only be called in main	3979	# can/must only be called in main
3633	if ($Coro::current != $Coro::main) {	3980	unless (in_main) {
3634	warn "can only reload from main coroutine";	3981	error "can only reload from main coroutine";
3635	return;	3982	return;
3636	}	3983	}
3637		3984
3638	return if $RELOAD++;	3985	return if $RELOAD++;
3639		3986
3640	my $t1 = EV::time;	3987	my $t1 = AE::time;
3641		3988
3642	while ($RELOAD) {	3989	while ($RELOAD) {
3643	warn "reloading...";	3990	cf::get_slot 0.1, -1, "reload_perl";
		3991	info "perl_reload: reloading...";
3644		3992
3645	warn "entering sync_job";	3993	trace "perl_reload: entering sync_job";
3646		3994
3647	cf::sync_job {	3995	cf::sync_job {
3648	cf::write_runtime_sync; # external watchdog should not bark
3649	cf::emergency_save;	3996	#cf::emergency_save;
3650	cf::write_runtime_sync; # external watchdog should not bark
3651		3997
3652	warn "syncing database to disk";
3653	BDB::db_env_txn_checkpoint $DB_ENV;
3654
3655	# if anything goes wrong in here, we should simply crash as we already saved
3656
3657	warn "flushing outstanding aio requests";
3658	while (IO::AIO::nreqs || BDB::nreqs) {
3659	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3660	}
3661
3662	warn "cancelling all extension coros";	3998	trace "perl_reload: cancelling all extension coros";
3663	$_->cancel for values %EXT_CORO;	3999	$_->cancel for values %EXT_CORO;
3664	%EXT_CORO = ();	4000	%EXT_CORO = ();
3665		4001
3666	warn "removing commands";	4002	trace "perl_reload: removing commands";
3667	%COMMAND = ();	4003	%COMMAND = ();
3668		4004
3669	warn "removing ext/exti commands";	4005	trace "perl_reload: removing ext/exti commands";
3670	%EXTCMD = ();	4006	%EXTCMD = ();
3671	%EXTICMD = ();	4007	%EXTICMD = ();
3672		4008
3673	warn "unloading/nuking all extensions";	4009	trace "perl_reload: unloading/nuking all extensions";
3674	for my $pkg (@EXTS) {	4010	for my $pkg (@EXTS) {
3675	warn "... unloading $pkg";	4011	trace "... unloading $pkg";
3676		4012
3677	if (my $cb = $pkg->can ("unload")) {	4013	if (my $cb = $pkg->can ("unload")) {
3678	eval {	4014	eval {
3679	$cb->($pkg);	4015	$cb->($pkg);
3680	1	4016	1
3681	} or warn "$pkg unloaded, but with errors: $@";	4017	} or error "$pkg unloaded, but with errors: $@";
3682	}	4018	}
3683		4019
3684	warn "... clearing $pkg";	4020	trace "... clearing $pkg";
3685	clear_package $pkg;	4021	clear_package $pkg;
3686	}	4022	}
3687		4023
3688	warn "unloading all perl modules loaded from $LIBDIR";	4024	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3689	while (my ($k, $v) = each %INC) {	4025	while (my ($k, $v) = each %INC) {
3690	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4026	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3691		4027
3692	warn "... unloading $k";	4028	trace "... unloading $k";
3693	delete $INC{$k};	4029	delete $INC{$k};
3694		4030
3695	$k =~ s/\.pm$//;	4031	$k =~ s/\.pm$//;
3696	$k =~ s/\//::/g;	4032	$k =~ s/\//::/g;
3697		4033
…		…
3700	}	4036	}
3701		4037
3702	clear_package $k;	4038	clear_package $k;
3703	}	4039	}
3704		4040
3705	warn "getting rid of safe::, as good as possible";	4041	trace "perl_reload: getting rid of safe::, as good as possible";
3706	clear_package "safe::$_"	4042	clear_package "safe::$_"
3707	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4043	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3708		4044
3709	warn "unloading cf.pm \"a bit\"";	4045	trace "perl_reload: unloading cf.pm \"a bit\"";
3710	delete $INC{"cf.pm"};	4046	delete $INC{"cf.pm"};
3711	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4047	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3712		4048
3713	# don't, removes xs symbols, too,	4049	# don't, removes xs symbols, too,
3714	# and global variables created in xs	4050	# and global variables created in xs
3715	#clear_package __PACKAGE__;	4051	#clear_package __PACKAGE__;
3716		4052
3717	warn "unload completed, starting to reload now";	4053	info "perl_reload: unload completed, starting to reload now";
3718		4054
3719	warn "reloading cf.pm";	4055	trace "perl_reload: reloading cf.pm";
3720	require cf;	4056	require cf;
3721	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	4057	cf::_connect_to_perl_1;
3722		4058
3723	warn "loading config and database again";	4059	trace "perl_reload: loading config and database again";
3724	cf::reload_config;	4060	cf::reload_config;
3725		4061
3726	warn "loading extensions";	4062	trace "perl_reload: loading extensions";
3727	cf::load_extensions;	4063	cf::load_extensions;
3728		4064
3729	if ($REATTACH_ON_RELOAD) {	4065	if ($REATTACH_ON_RELOAD) {
3730	warn "reattaching attachments to objects/players";	4066	trace "perl_reload: reattaching attachments to objects/players";
3731	_global_reattach; # objects, sockets	4067	_global_reattach; # objects, sockets
3732	warn "reattaching attachments to maps";	4068	trace "perl_reload: reattaching attachments to maps";
3733	reattach $_ for values %MAP;	4069	reattach $_ for values %MAP;
3734	warn "reattaching attachments to players";	4070	trace "perl_reload: reattaching attachments to players";
3735	reattach $_ for values %PLAYER;	4071	reattach $_ for values %PLAYER;
3736	}	4072	}
3737		4073
3738	warn "running post_init jobs";	4074	cf::_post_init 1;
3739	(pop @POST_INIT)->(1) while @POST_INIT;
3740		4075
3741	warn "leaving sync_job";	4076	trace "perl_reload: leaving sync_job";
3742		4077
3743	1	4078	1
3744	} or do {	4079	} or do {
3745	warn $@;	4080	error $@;
3746	cf::cleanup "error while reloading, exiting.";	4081	cf::cleanup "perl_reload: error, exiting.";
3747	};	4082	};
3748		4083
3749	warn "reloaded";
3750	--$RELOAD;	4084	--$RELOAD;
3751	}	4085	}
3752		4086
3753	$t1 = EV::time - $t1;	4087	$t1 = AE::time - $t1;
3754	warn "reload completed in ${t1}s\n";	4088	info "perl_reload: completed in ${t1}s\n";
3755	};	4089	};
3756		4090
3757	our $RELOAD_WATCHER; # used only during reload	4091	our $RELOAD_WATCHER; # used only during reload
3758		4092
3759	sub reload_perl() {	4093	sub reload_perl() {
…		…
3761	# coro crashes during coro_state_free->destroy here.	4095	# coro crashes during coro_state_free->destroy here.
3762		4096
3763	$RELOAD_WATCHER ||= cf::async {	4097	$RELOAD_WATCHER ||= cf::async {
3764	Coro::AIO::aio_wait cache_extensions;	4098	Coro::AIO::aio_wait cache_extensions;
3765		4099
3766	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	4100	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3767	do_reload_perl;	4101	do_reload_perl;
3768	undef $RELOAD_WATCHER;	4102	undef $RELOAD_WATCHER;
3769	};	4103	};
3770	};	4104	};
3771	}	4105	}
…		…
3780	reload_perl;	4114	reload_perl;
3781	};	4115	};
3782	}	4116	}
3783	};	4117	};
3784		4118
3785	unshift @INC, $LIBDIR;	4119	#############################################################################
3786		4120
3787	my $bug_warning = 0;	4121	my $bug_warning = 0;
3788		4122
3789	our @WAIT_FOR_TICK;
3790	our @WAIT_FOR_TICK_BEGIN;
3791
3792	sub wait_for_tick {	4123	sub wait_for_tick() {
3793	return if tick_inhibit || $Coro::current == $Coro::main;	4124	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3794		4125
3795	my $signal = new Coro::Signal;	4126	$WAIT_FOR_TICK->wait;
3796	push @WAIT_FOR_TICK, $signal;
3797	$signal->wait;
3798	}	4127	}
3799		4128
3800	sub wait_for_tick_begin {	4129	sub wait_for_tick_begin() {
3801	return if tick_inhibit || $Coro::current == $Coro::main;	4130	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3802		4131
3803	my $signal = new Coro::Signal;	4132	my $signal = new Coro::Signal;
3804	push @WAIT_FOR_TICK_BEGIN, $signal;	4133	push @WAIT_FOR_TICK_BEGIN, $signal;
3805	$signal->wait;	4134	$signal->wait;
3806	}	4135	}
…		…
3810	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4139	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3811	unless ++$bug_warning > 10;	4140	unless ++$bug_warning > 10;
3812	return;	4141	return;
3813	}	4142	}
3814		4143
3815	cf::server_tick; # one server iteration	4144	cf::one_tick; # one server iteration
		4145
		4146	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3816		4147
3817	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4148	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3818	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4149	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3819	Coro::async_pool {	4150	Coro::async_pool {
3820	$Coro::current->{desc} = "runtime saver";	4151	$Coro::current->{desc} = "runtime saver";
3821	write_runtime_sync	4152	write_runtime_sync
3822	or warn "ERROR: unable to write runtime file: $!";	4153	or error "ERROR: unable to write runtime file: $!";
3823	};	4154	};
3824	}	4155	}
3825		4156
3826	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4157	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3827	$sig->send;	4158	$sig->send;
3828	}	4159	}
3829	while (my $sig = shift @WAIT_FOR_TICK) {	4160	$WAIT_FOR_TICK->broadcast;
3830	$sig->send;
3831	}
3832		4161
3833	$LOAD = ($NOW - $TICK_START) / $TICK;	4162	$LOAD = ($NOW - $TICK_START) / $TICK;
3834	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4163	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3835		4164
3836	if (0) {	4165	if (0) {
3837	if ($NEXT_TICK) {	4166	if ($NEXT_TICK) {
3838	my $jitter = $TICK_START - $NEXT_TICK;	4167	my $jitter = $TICK_START - $NEXT_TICK;
3839	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4168	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3840	warn "jitter $JITTER\n";#d#	4169	debug "jitter $JITTER\n";#d#
3841	}	4170	}
3842	}	4171	}
3843	}	4172	}
3844		4173
3845	{	4174	{
3846	# configure BDB	4175	# configure BDB
3847		4176
3848	BDB::min_parallel 8;	4177	BDB::min_parallel 16;
3849	BDB::max_poll_reqs $TICK * 0.1;	4178	BDB::max_poll_reqs $TICK * 0.1;
3850	$AnyEvent::BDB::WATCHER->priority (1);	4179	$AnyEvent::BDB::WATCHER->priority (1);
3851		4180
3852	unless ($DB_ENV) {	4181	unless ($DB_ENV) {
3853	$DB_ENV = BDB::db_env_create;	4182	$DB_ENV = BDB::db_env_create;
…		…
3890	IO::AIO::min_parallel 8;	4219	IO::AIO::min_parallel 8;
3891	IO::AIO::max_poll_time $TICK * 0.1;	4220	IO::AIO::max_poll_time $TICK * 0.1;
3892	undef $AnyEvent::AIO::WATCHER;	4221	undef $AnyEvent::AIO::WATCHER;
3893	}	4222	}
3894		4223
3895	my $_log_backtrace;	4224	our $_log_backtrace;
		4225	our $_log_backtrace_last;
3896		4226
3897	sub _log_backtrace {	4227	sub _log_backtrace {
3898	my ($msg, @addr) = @_;	4228	my ($msg, @addr) = @_;
3899		4229
3900	$msg =~ s/\n//;	4230	$msg =~ s/\n$//;
3901		4231
		4232	if ($_log_backtrace_last eq $msg) {
		4233	LOG llevInfo, "[ABT] $msg\n";
		4234	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3902	# limit the # of concurrent backtraces	4235	# limit the # of concurrent backtraces
3903	if ($_log_backtrace < 2) {	4236	} elsif ($_log_backtrace < 2) {
		4237	$_log_backtrace_last = $msg;
3904	++$_log_backtrace;	4238	++$_log_backtrace;
3905	my $perl_bt = Carp::longmess $msg;	4239	my $perl_bt = Carp::longmess $msg;
3906	async {	4240	async {
3907	$Coro::current->{desc} = "abt $msg";	4241	$Coro::current->{desc} = "abt $msg";
3908		4242
…		…
3928	LOG llevInfo, "[ABT] $_\n" for @bt;	4262	LOG llevInfo, "[ABT] $_\n" for @bt;
3929	--$_log_backtrace;	4263	--$_log_backtrace;
3930	};	4264	};
3931	} else {	4265	} else {
3932	LOG llevInfo, "[ABT] $msg\n";	4266	LOG llevInfo, "[ABT] $msg\n";
3933	LOG llevInfo, "[ABT] [suppressed]\n";	4267	LOG llevInfo, "[ABT] [overload, suppressed]\n";
3934	}	4268	}
3935	}	4269	}
3936		4270
3937	# load additional modules	4271	# load additional modules
3938	require "cf/$_.pm" for @EXTRA_MODULES;	4272	require "cf/$_.pm" for @EXTRA_MODULES;
		4273	cf::_connect_to_perl_2;
3939		4274
3940	END { cf::emergency_save }	4275	END { cf::emergency_save }
3941		4276
3942	1	4277	1
3943		4278

Diff Legend

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