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.496 by root, Sun Nov 15 18:03:59 2009 UTC vs.
Revision 1.593 by root, Fri Nov 9 01:59:33 2012 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,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify it under	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# the terms of the Affero GNU General Public License as published by the	7	# the terms of the Affero GNU General Public License as published by the
8	# Free Software Foundation, either version 3 of the License, or (at your	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# 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 Affero GNU General Public License	16	# You should have received a copy of the Affero GNU General Public License
17	# and the GNU General Public License along with this program. If not, see	17	# and the GNU General Public License along with this program. If not, see
18	# <http://www.gnu.org/licenses/>.	18	# <http://www.gnu.org/licenses/>.
19	#	19	#
20	# 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>
21	#	21	#
22		22
23	package cf;	23	package cf;
24		24
25	use 5.10.0;	25	use common::sense;
26	use utf8;
27	use strict qw(vars subs);
28		26
29	use Symbol;	27	use Symbol;
30	use List::Util;	28	use List::Util;
31	use Socket;	29	use Socket;
32	use EV;	30	use EV;
…		…
34	use Safe;	32	use Safe;
35	use Safe::Hole;	33	use Safe::Hole;
36	use Storable ();	34	use Storable ();
37	use Carp ();	35	use Carp ();
38		36
39	use Guard ();	37	use AnyEvent ();
		38	use AnyEvent::IO ();
		39	use AnyEvent::DNS ();
		40
40	use Coro ();	41	use Coro ();
41	use Coro::State;	42	use Coro::State;
42	use Coro::Handle;	43	use Coro::Handle;
43	use Coro::EV;	44	use Coro::EV;
44	use Coro::AnyEvent;	45	use Coro::AnyEvent;
…		…
50	use Coro::AIO;	51	use Coro::AIO;
51	use Coro::BDB 1.6;	52	use Coro::BDB 1.6;
52	use Coro::Storable;	53	use Coro::Storable;
53	use Coro::Util ();	54	use Coro::Util ();
54		55
		56	use Guard ();
55	use JSON::XS 2.01 ();	57	use JSON::XS 2.01 ();
56	use BDB ();	58	use BDB ();
57	use Data::Dumper;	59	use Data::Dumper;
58	use Fcntl;	60	use Fcntl;
59	use YAML::XS ();	61	use YAML::XS ();
…		…
78	# strictly for debugging	80	# strictly for debugging
79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	81	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80		82
81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	83	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82		84
		85	our @ORIG_INC;
		86
83	our %COMMAND = ();	87	our %COMMAND = ();
84	our %COMMAND_TIME = ();	88	our %COMMAND_TIME = ();
85		89
86	our @EXTS = (); # list of extension package names	90	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	91	our %EXTCMD = ();
…		…
93	our @EVENT;	97	our @EVENT;
94	our @REFLECT; # set by XS	98	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	99	our %REFLECT; # set by us
96		100
97	our $CONFDIR = confdir;	101	our $CONFDIR = confdir;
		102
98	our $DATADIR = datadir;	103	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	104	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	105	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	106	our $MAPDIR = "$DATADIR/" . mapdir;
		107
102	our $LOCALDIR = localdir;	108	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	109	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	110	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	111	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	112	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	113	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	114	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	115	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		116
111	our %RESOURCE;	117	#our %RESOURCE; # unused
		118
		119	our $OUTPUT_RATE_MIN = 3000;
		120	our $OUTPUT_RATE_MAX = 1000000;
		121
		122	our $MAX_LINKS = 32; # how many chained exits to follow
		123	our $VERBOSE_IO = 1;
112		124
113	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	125	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	126	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115	our $NEXT_TICK;	127	our $NEXT_TICK;
116	our $USE_FSYNC = 1; # use fsync to write maps - default on	128	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
118	our $BDB_DEADLOCK_WATCHER;	130	our $BDB_DEADLOCK_WATCHER;
119	our $BDB_CHECKPOINT_WATCHER;	131	our $BDB_CHECKPOINT_WATCHER;
120	our $BDB_TRICKLE_WATCHER;	132	our $BDB_TRICKLE_WATCHER;
121	our $DB_ENV;	133	our $DB_ENV;
122		134
123	our @EXTRA_MODULES = qw(pod match mapscript);	135	our @EXTRA_MODULES = qw(pod match mapscript incloader);
124		136
125	our %CFG;	137	our %CFG;
		138	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
126		139
127	our $UPTIME; $UPTIME ||= time;	140	our $UPTIME; $UPTIME ||= time;
128	our $RUNTIME;	141	our $RUNTIME = 0;
		142	our $SERVER_TICK = 0;
129	our $NOW;	143	our $NOW;
130		144
131	our (%PLAYER, %PLAYER_LOADING); # all users	145	our (%PLAYER, %PLAYER_LOADING); # all users
132	our (%MAP, %MAP_LOADING ); # all maps	146	our (%MAP, %MAP_LOADING ); # all maps
133	our $LINK_MAP; # the special {link} map, which is always available	147	our $LINK_MAP; # the special {link} map, which is always available
…		…
142		156
143	our @POST_INIT;	157	our @POST_INIT;
144		158
145	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	159	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146	our $REALLY_UNLOOP; # never set to true, please :)	160	our $REALLY_UNLOOP; # never set to true, please :)
		161
		162	our $WAIT_FOR_TICK = new Coro::Signal;
		163	our @WAIT_FOR_TICK_BEGIN;
147		164
148	binmode STDOUT;	165	binmode STDOUT;
149	binmode STDERR;	166	binmode STDERR;
150		167
151	# read virtual server time, if available	168	# read virtual server time, if available
…		…
162		179
163	our $EMERGENCY_POSITION;	180	our $EMERGENCY_POSITION;
164		181
165	sub cf::map::normalise;	182	sub cf::map::normalise;
166		183
		184	sub in_main() {
		185	$Coro::current == $Coro::main
		186	}
		187
167	#############################################################################	188	#############################################################################
168		189
169	%REFLECT = ();	190	%REFLECT = ();
170	for (@REFLECT) {	191	for (@REFLECT) {
171	my $reflect = JSON::XS::decode_json $_;	192	my $reflect = JSON::XS::decode_json $_;
…		…
181		202
182	=over 4	203	=over 4
183		204
184	=item $cf::UPTIME	205	=item $cf::UPTIME
185		206
186	The timestamp of the server start (so not actually an uptime).	207	The timestamp of the server start (so not actually an "uptime").
		208
		209	=item $cf::SERVER_TICK
		210
		211	An unsigned integer that starts at zero when the server is started and is
		212	incremented on every tick.
		213
		214	=item $cf::NOW
		215
		216	The (real) time of the last (current) server tick - updated before and
		217	after tick processing, so this is useful only as a rough "what time is it
		218	now" estimate.
		219
		220	=item $cf::TICK
		221
		222	The interval between each server tick, in seconds.
187		223
188	=item $cf::RUNTIME	224	=item $cf::RUNTIME
189		225
190	The time this server has run, starts at 0 and is increased by $cf::TICK on	226	The time this server has run, starts at 0 and is increased by $cf::TICK on
191	every server tick.	227	every server tick.
192		228
193	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	229	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
194	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	230	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
195	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	231	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
196		232
197	Various directories - "/etc", read-only install directory, perl-library	233	Various directories - "/etc", read-only install directory, perl-library
198	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	234	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
199	unique-items directory, player file directory, random maps directory and	235	unique-items directory, player file directory, random maps directory and
200	database environment.	236	database environment.
201		237
202	=item $cf::NOW
203
204	The time of the last (current) server tick.
205
206	=item $cf::TICK
207
208	The interval between server ticks, in seconds.
209
210	=item $cf::LOADAVG	238	=item $cf::LOADAVG
211		239
212	The current CPU load on the server (alpha-smoothed), as a value between 0	240	The current CPU load on the server (alpha-smoothed), as a value between 0
213	(none) and 1 (overloaded), indicating how much time is spent on processing	241	(none) and 1 (overloaded), indicating how much time is spent on processing
214	objects per tick. Healthy values are < 0.5.	242	objects per tick. Healthy values are < 0.5.
…		…
223	from wherever your confdir points to.	251	from wherever your confdir points to.
224		252
225	=item cf::wait_for_tick, cf::wait_for_tick_begin	253	=item cf::wait_for_tick, cf::wait_for_tick_begin
226		254
227	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	255	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
228	returns directly I<after> the tick processing (and consequently, can only wake one process	256	returns directly I<after> the tick processing (and consequently, can only wake one thread
229	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	257	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
		258
		259	Note that cf::Wait_for_tick will immediately return when the server is not
		260	ticking, making it suitable for small pauses in threads that need to run
		261	when the server is paused. If that is not applicable (i.e. you I<really>
		262	want to wait, use C<$cf::WAIT_FOR_TICK>).
		263
		264	=item $cf::WAIT_FOR_TICK
		265
		266	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		267	variable contains a L<Coro::Signal> that is broadcats after every server
		268	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		269	next server tick.
		270
		271	=cut
		272
		273	sub wait_for_tick();
		274	sub wait_for_tick_begin();
230		275
231	=item @cf::INVOKE_RESULTS	276	=item @cf::INVOKE_RESULTS
232		277
233	This array contains the results of the last C<invoke ()> call. When	278	This array contains the results of the last C<invoke ()> call. When
234	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	279	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
…		…
242		287
243	=back	288	=back
244		289
245	=cut	290	=cut
246		291
		292	sub error(@) { LOG llevError, join "", @_ }
		293	sub warn (@) { LOG llevWarn , join "", @_ }
		294	sub info (@) { LOG llevInfo , join "", @_ }
		295	sub debug(@) { LOG llevDebug, join "", @_ }
		296	sub trace(@) { LOG llevTrace, join "", @_ }
		297
247	$Coro::State::WARNHOOK = sub {	298	$Coro::State::WARNHOOK = sub {
248	my $msg = join "", @_;	299	my $msg = join "", @_;
249		300
250	$msg .= "\n"	301	$msg .= "\n"
251	unless $msg =~ /\n$/;	302	unless $msg =~ /\n$/;
252		303
253	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	304	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
254		305
255	LOG llevError, $msg;	306	LOG llevWarn, $msg;
256	};	307	};
257		308
258	$Coro::State::DIEHOOK = sub {	309	$Coro::State::DIEHOOK = sub {
259	return unless $^S eq 0; # "eq", not "=="	310	return unless $^S eq 0; # "eq", not "=="
260		311
261	warn Carp::longmess $_[0];	312	error Carp::longmess $_[0];
262		313
263	if ($Coro::current == $Coro::main) {#d#	314	if (in_main) {#d#
264	warn "DIEHOOK called in main context, Coro bug?\n";#d#	315	error "DIEHOOK called in main context, Coro bug?\n";#d#
265	return;#d#	316	return;#d#
266	}#d#	317	}#d#
267		318
268	# kill coroutine otherwise	319	# kill coroutine otherwise
269	Coro::terminate	320	Coro::terminate
…		…
289	)) {	340	)) {
290	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	341	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
291	}	342	}
292		343
293	$EV::DIED = sub {	344	$EV::DIED = sub {
294	Carp::cluck "error in event callback: @_";	345	warn "error in event callback: $@";
295	};	346	};
		347
		348	#############################################################################
		349
		350	sub fork_call(&@);
		351	sub get_slot($;$$);
296		352
297	#############################################################################	353	#############################################################################
298		354
299	=head2 UTILITY FUNCTIONS	355	=head2 UTILITY FUNCTIONS
300		356
…		…
321	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	377	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
322	$d	378	$d
323	} || "[unable to dump $_[0]: '$@']";	379	} || "[unable to dump $_[0]: '$@']";
324	}	380	}
325		381
		382	=item $scalar = cf::load_file $path
		383
		384	Loads the given file from path and returns its contents. Croaks on error
		385	and can block.
		386
		387	=cut
		388
		389	sub load_file($) {
		390	0 <= aio_load $_[0], my $data
		391	or Carp::croak "$_[0]: $!";
		392
		393	$data
		394	}
		395
		396	=item $success = cf::replace_file $path, $data, $sync
		397
		398	Atomically replaces the file at the given $path with new $data, and
		399	optionally $sync the data to disk before replacing the file.
		400
		401	=cut
		402
		403	sub replace_file($$;$) {
		404	my ($path, $data, $sync) = @_;
		405
		406	my $lock = cf::lock_acquire ("replace_file:$path");
		407
		408	my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
		409	or return;
		410
		411	$data = $data->() if ref $data;
		412
		413	length $data == aio_write $fh, 0, (length $data), $data, 0
		414	or return;
		415
		416	!$sync
		417	or !aio_fsync $fh
		418	or return;
		419
		420	aio_close $fh
		421	and return;
		422
		423	aio_rename "$path~", $path
		424	and return;
		425
		426	if ($sync) {
		427	$path =~ s%/[^/]*$%%;
		428	aio_pathsync $path;
		429	}
		430
		431	1
		432	}
		433
326	=item $ref = cf::decode_json $json	434	=item $ref = cf::decode_json $json
327		435
328	Converts a JSON string into the corresponding perl data structure.	436	Converts a JSON string into the corresponding perl data structure.
329		437
330	=item $json = cf::encode_json $ref	438	=item $json = cf::encode_json $ref
…		…
336	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	444	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
337		445
338	sub encode_json($) { $json_coder->encode ($_[0]) }	446	sub encode_json($) { $json_coder->encode ($_[0]) }
339	sub decode_json($) { $json_coder->decode ($_[0]) }	447	sub decode_json($) { $json_coder->decode ($_[0]) }
340		448
		449	=item $ref = cf::decode_storable $scalar
		450
		451	Same as Coro::Storable::thaw, so blocks.
		452
		453	=cut
		454
		455	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		456
		457	=item $ref = cf::decode_yaml $scalar
		458
		459	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		460
		461	=cut
		462
		463	sub decode_yaml($) {
		464	fork_call { YAML::XS::Load $_[0] } @_
		465	}
		466
		467	=item $scalar = cf::unlzf $scalar
		468
		469	Same as Compress::LZF::compress, but takes server ticks into account, so
		470	blocks.
		471
		472	=cut
		473
		474	sub unlzf($) {
		475	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		476	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		477	Compress::LZF::decompress $_[0]
		478	}
		479
341	=item cf::post_init { BLOCK }	480	=item cf::post_init { BLOCK }
342		481
343	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	482	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344	but I<before> the server starts ticking again.	483	but I<before> the server starts ticking again.
345		484
346	The cdoeblock will have a single boolean argument to indicate whether this	485	The codeblock will have a single boolean argument to indicate whether this
347	is a reload or not.	486	is a reload or not.
348		487
349	=cut	488	=cut
350		489
351	sub post_init(&) {	490	sub post_init(&) {
352	push @POST_INIT, shift;	491	push @POST_INIT, shift;
		492	}
		493
		494	sub _post_init {
		495	trace "running post_init jobs";
		496
		497	# run them in parallel...
		498
		499	my @join;
		500
		501	while () {
		502	push @join, map &Coro::async ($_, 0), @POST_INIT;
		503	@POST_INIT = ();
		504
		505	@join or last;
		506
		507	(pop @join)->join;
		508	}
353	}	509	}
354		510
355	=item cf::lock_wait $string	511	=item cf::lock_wait $string
356		512
357	Wait until the given lock is available. See cf::lock_acquire.	513	Wait until the given lock is available. See cf::lock_acquire.
…		…
396	}	552	}
397		553
398	=item cf::periodic $interval, $cb	554	=item cf::periodic $interval, $cb
399		555
400	Like EV::periodic, but randomly selects a starting point so that the actions	556	Like EV::periodic, but randomly selects a starting point so that the actions
401	get spread over timer.	557	get spread over time.
402		558
403	=cut	559	=cut
404		560
405	sub periodic($$) {	561	sub periodic($$) {
406	my ($interval, $cb) = @_;	562	my ($interval, $cb) = @_;
…		…
410	EV::periodic $start, $interval, 0, $cb	566	EV::periodic $start, $interval, 0, $cb
411	}	567	}
412		568
413	=item cf::get_slot $time[, $priority[, $name]]	569	=item cf::get_slot $time[, $priority[, $name]]
414		570
415	Allocate $time seconds of blocking CPU time at priority C<$priority>:	571	Allocate $time seconds of blocking CPU time at priority C<$priority>
416	This call blocks and returns only when you have at least C<$time> seconds	572	(default: 0): This call blocks and returns only when you have at least
417	of cpu time till the next tick. The slot is only valid till the next cede.	573	C<$time> seconds of cpu time till the next tick. The slot is only valid
		574	till the next cede.
		575
		576	Background jobs should use a priority les than zero, interactive jobs
		577	should use 100 or more.
418		578
419	The optional C<$name> can be used to identify the job to run. It might be	579	The optional C<$name> can be used to identify the job to run. It might be
420	used for statistical purposes and should identify the same time-class.	580	used for statistical purposes and should identify the same time-class.
421		581
422	Useful for short background jobs.	582	Useful for short background jobs.
423		583
424	=cut	584	=cut
425		585
426	our @SLOT_QUEUE;	586	our @SLOT_QUEUE;
427	our $SLOT_QUEUE;	587	our $SLOT_QUEUE;
		588	our $SLOT_DECAY = 0.9;
428		589
429	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	590	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430	$SLOT_QUEUE = Coro::async {	591	$SLOT_QUEUE = Coro::async {
431	$Coro::current->desc ("timeslot manager");	592	$Coro::current->desc ("timeslot manager");
432		593
433	my $signal = new Coro::Signal;	594	my $signal = new Coro::Signal;
		595	my $busy;
434		596
435	while () {	597	while () {
436	next_job:	598	next_job:
		599
437	my $avail = cf::till_tick;	600	my $avail = cf::till_tick;
438	if ($avail > 0.01) {	601
439	for (0 .. $#SLOT_QUEUE) {	602	for (0 .. $#SLOT_QUEUE) {
440	if ($SLOT_QUEUE[$_][0] < $avail) {	603	if ($SLOT_QUEUE[$_][0] <= $avail) {
		604	$busy = 0;
441	my $job = splice @SLOT_QUEUE, $_, 1, ();	605	my $job = splice @SLOT_QUEUE, $_, 1, ();
442	$job->[2]->send;	606	$job->[2]->send;
443	Coro::cede;	607	Coro::cede;
444	goto next_job;	608	goto next_job;
445	}	609	} else {
		610	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446	}	611	}
447	}	612	}
448		613
449	if (@SLOT_QUEUE) {	614	if (@SLOT_QUEUE) {
450	# we do not use wait_for_tick() as it returns immediately when tick is inactive	615	# we do not use wait_for_tick() as it returns immediately when tick is inactive
451	push @cf::WAIT_FOR_TICK, $signal;	616	$WAIT_FOR_TICK->wait;
452	$signal->wait;
453	} else {	617	} else {
		618	$busy = 0;
454	Coro::schedule;	619	Coro::schedule;
455	}	620	}
456	}	621	}
457	};	622	};
458		623
459	sub get_slot($;$$) {	624	sub get_slot($;$$) {
460	return if tick_inhibit || $Coro::current == $Coro::main;	625	return if tick_inhibit || $Coro::current == $Coro::main;
461		626
462	my ($time, $pri, $name) = @_;	627	my ($time, $pri, $name) = @_;
463		628
464	$time = $TICK * .6 if $time > $TICK * .6;	629	$time = clamp $time, 0.01, $TICK * .6;
		630
465	my $sig = new Coro::Signal;	631	my $sig = new Coro::Signal;
466		632
467	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	633	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	634	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469	$SLOT_QUEUE->ready;	635	$SLOT_QUEUE->ready;
…		…
495	=cut	661	=cut
496		662
497	sub sync_job(&) {	663	sub sync_job(&) {
498	my ($job) = @_;	664	my ($job) = @_;
499		665
500	if ($Coro::current == $Coro::main) {	666	if (in_main) {
501	my $time = EV::time;	667	my $time = AE::time;
502		668
503	# this is the main coro, too bad, we have to block	669	# this is the main coro, too bad, we have to block
504	# till the operation succeeds, freezing the server :/	670	# till the operation succeeds, freezing the server :/
505		671
506	LOG llevError, Carp::longmess "sync job";#d#	672	#LOG llevError, Carp::longmess "sync job";#d#
507		673
508	my $freeze_guard = freeze_mainloop;	674	my $freeze_guard = freeze_mainloop;
509		675
510	my $busy = 1;	676	my $busy = 1;
511	my @res;	677	my @res;
512		678
513	(async {	679	(async {
514	$Coro::current->desc ("sync job coro");	680	$Coro::current->desc ("sync job coro");
515	@res = eval { $job->() };	681	@res = eval { $job->() };
516	warn $@ if $@;	682	error $@ if $@;
517	undef $busy;	683	undef $busy;
518	})->prio (Coro::PRIO_MAX);	684	})->prio (Coro::PRIO_MAX);
519		685
520	while ($busy) {	686	while ($busy) {
521	if (Coro::nready) {	687	if (Coro::nready) {
…		…
523	} else {	689	} else {
524	EV::loop EV::LOOP_ONESHOT;	690	EV::loop EV::LOOP_ONESHOT;
525	}	691	}
526	}	692	}
527		693
528	my $time = EV::time - $time;	694	my $time = AE::time - $time;
529		695
530	$TICK_START += $time; # do not account sync jobs to server load	696	$TICK_START += $time; # do not account sync jobs to server load
531		697
532	wantarray ? @res : $res[0]	698	wantarray ? @res : $res[0]
533	} else {	699	} else {
…		…
555	$EXT_CORO{$coro+0} = $coro;	721	$EXT_CORO{$coro+0} = $coro;
556		722
557	$coro	723	$coro
558	}	724	}
559		725
560	=item fork_call { }, $args	726	=item fork_call { }, @args
561		727
562	Executes the given code block with the given arguments in a seperate	728	Executes the given code block with the given arguments in a seperate
563	process, returning the results. Everything must be serialisable with	729	process, returning the results. Everything must be serialisable with
564	Coro::Storable. May, of course, block. Note that the executed sub may	730	Coro::Storable. May, of course, block. Note that the executed sub may
565	never block itself or use any form of event handling.	731	never block itself or use any form of event handling.
566		732
567	=cut	733	=cut
568		734
		735	sub post_fork {
		736	reset_signals;
		737	}
		738
569	sub fork_call(&@) {	739	sub fork_call(&@) {
570	my ($cb, @args) = @_;	740	my ($cb, @args) = @_;
571		741
572	# we seemingly have to make a local copy of the whole thing,	742	# we seemingly have to make a local copy of the whole thing,
573	# otherwise perl prematurely frees the stuff :/	743	# otherwise perl prematurely frees the stuff :/
574	# TODO: investigate and fix (likely this will be rather laborious)	744	# TODO: investigate and fix (likely this will be rather laborious)
575		745
576	my @res = Coro::Util::fork_eval {	746	my @res = Coro::Util::fork_eval {
577	reset_signals;	747	cf::post_fork;
578	&$cb	748	&$cb
579	}, @args;	749	} @args;
580		750
581	wantarray ? @res : $res[-1]	751	wantarray ? @res : $res[-1]
		752	}
		753
		754	sub objinfo {
		755	(
		756	"counter value" => cf::object::object_count,
		757	"objects created" => cf::object::create_count,
		758	"objects destroyed" => cf::object::destroy_count,
		759	"freelist size" => cf::object::free_count,
		760	"allocated objects" => cf::object::objects_size,
		761	"active objects" => cf::object::actives_size,
		762	)
582	}	763	}
583		764
584	=item $coin = coin_from_name $name	765	=item $coin = coin_from_name $name
585		766
586	=cut	767	=cut
…		…
623	within each server.	804	within each server.
624		805
625	=cut	806	=cut
626		807
627	sub db_table($) {	808	sub db_table($) {
		809	cf::error "db_get called from main context"
		810	if $Coro::current == $Coro::main;
		811
628	my ($name) = @_;	812	my ($name) = @_;
629	my $db = BDB::db_create $DB_ENV;	813	my $db = BDB::db_create $DB_ENV;
630		814
631	eval {	815	eval {
632	$db->set_flags (BDB::CHKSUM);	816	$db->set_flags (BDB::CHKSUM);
…		…
642	}	826	}
643		827
644	our $DB;	828	our $DB;
645		829
646	sub db_init {	830	sub db_init {
647	cf::sync_job {
648	$DB ||= db_table "db";	831	$DB ||= db_table "db";
649	};
650	}	832	}
651		833
652	sub db_get($$) {	834	sub db_get($$) {
653	my $key = "$_[0]/$_[1]";	835	my $key = "$_[0]/$_[1]";
654		836
655	cf::sync_job {	837	cf::error "db_get called from main context"
		838	if $Coro::current == $Coro::main;
		839
656	BDB::db_get $DB, undef, $key, my $data;	840	BDB::db_get $DB, undef, $key, my $data;
657		841
658	$! ? ()	842	$! ? ()
659	: $data	843	: $data
660	}
661	}	844	}
662		845
663	sub db_put($$$) {	846	sub db_put($$$) {
664	BDB::dbreq_pri 4;	847	BDB::dbreq_pri 4;
665	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	848	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
693		876
694	my @data;	877	my @data;
695	my $md5;	878	my $md5;
696		879
697	for (0 .. $#$src) {	880	for (0 .. $#$src) {
698	0 <= aio_load $src->[$_], $data[$_]	881	$data[$_] = load_file $src->[$_];
699	or Carp::croak "$src->[$_]: $!";
700	}	882	}
701		883
702	# if processing is expensive, check	884	# if processing is expensive, check
703	# checksum first	885	# checksum first
704	if (1) {	886	if (1) {
…		…
721		903
722	my $t1 = Time::HiRes::time;	904	my $t1 = Time::HiRes::time;
723	my $data = $process->(\@data);	905	my $data = $process->(\@data);
724	my $t2 = Time::HiRes::time;	906	my $t2 = Time::HiRes::time;
725		907
726	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	908	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
727		909
728	db_put cache => "$id/data", $data;	910	db_put cache => "$id/data", $data;
729	db_put cache => "$id/md5" , $md5;	911	db_put cache => "$id/md5" , $md5;
730	db_put cache => "$id/meta", $meta;	912	db_put cache => "$id/meta", $meta;
731		913
…		…
741		923
742	=cut	924	=cut
743		925
744	sub datalog($@) {	926	sub datalog($@) {
745	my ($type, %kv) = @_;	927	my ($type, %kv) = @_;
746	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	928	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
747	}	929	}
748		930
749	=back	931	=back
750		932
751	=cut	933	=cut
…		…
946		1128
947	} elsif (exists $cb_id{$type}) {	1129	} elsif (exists $cb_id{$type}) {
948	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1130	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
949		1131
950	} elsif (ref $type) {	1132	} elsif (ref $type) {
951	warn "attaching objects not supported, ignoring.\n";	1133	error "attaching objects not supported, ignoring.\n";
952		1134
953	} else {	1135	} else {
954	shift @arg;	1136	shift @arg;
955	warn "attach argument '$type' not supported, ignoring.\n";	1137	error "attach argument '$type' not supported, ignoring.\n";
956	}	1138	}
957	}	1139	}
958	}	1140	}
959		1141
960	sub _object_attach {	1142	sub _object_attach {
…		…
970	_attach $registry, $klass, @attach;	1152	_attach $registry, $klass, @attach;
971	}	1153	}
972		1154
973	$obj->{$name} = \%arg;	1155	$obj->{$name} = \%arg;
974	} else {	1156	} else {
975	warn "object uses attachment '$name' which is not available, postponing.\n";	1157	info "object uses attachment '$name' which is not available, postponing.\n";
976	}	1158	}
977		1159
978	$obj->{_attachment}{$name} = undef;	1160	$obj->{_attachment}{$name} = undef;
979	}	1161	}
980		1162
…		…
1039		1221
1040	for (@$callbacks) {	1222	for (@$callbacks) {
1041	eval { &{$_->[1]} };	1223	eval { &{$_->[1]} };
1042		1224
1043	if ($@) {	1225	if ($@) {
1044	warn "$@";
1045	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1226	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1046	override;	1227	override;
1047	}	1228	}
1048		1229
1049	return 1 if $override;	1230	return 1 if $override;
1050	}	1231	}
…		…
1129	for (@$attach) {	1310	for (@$attach) {
1130	my ($klass, @attach) = @$_;	1311	my ($klass, @attach) = @$_;
1131	_attach $registry, $klass, @attach;	1312	_attach $registry, $klass, @attach;
1132	}	1313	}
1133	} else {	1314	} else {
1134	warn "object uses attachment '$name' that is not available, postponing.\n";	1315	info "object uses attachment '$name' that is not available, postponing.\n";
1135	}	1316	}
1136	}	1317	}
1137	}	1318	}
1138		1319
1139	cf::attachable->attach (	1320	cf::attachable->attach (
…		…
1166	my ($filename, $rdata, $objs) = @_;	1347	my ($filename, $rdata, $objs) = @_;
1167		1348
1168	sync_job {	1349	sync_job {
1169	if (length $$rdata) {	1350	if (length $$rdata) {
1170	utf8::decode (my $decname = $filename);	1351	utf8::decode (my $decname = $filename);
1171	warn sprintf "saving %s (%d,%d)\n",	1352	trace sprintf "saving %s (%d,%d)\n",
1172	$decname, length $$rdata, scalar @$objs;	1353	$decname, length $$rdata, scalar @$objs
		1354	if $VERBOSE_IO;
1173		1355
1174	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1356	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175	aio_chmod $fh, SAVE_MODE;	1357	aio_chmod $fh, SAVE_MODE;
1176	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1358	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177	if ($cf::USE_FSYNC) {	1359	if ($cf::USE_FSYNC) {
…		…
1199	aio_rename "$filename~", $filename;	1381	aio_rename "$filename~", $filename;
1200		1382
1201	$filename =~ s%/[^/]+$%%;	1383	$filename =~ s%/[^/]+$%%;
1202	aio_pathsync $filename if $cf::USE_FSYNC;	1384	aio_pathsync $filename if $cf::USE_FSYNC;
1203	} else {	1385	} else {
1204	warn "unable to save objects: $filename~: $!\n";	1386	error "unable to save objects: $filename~: $!\n";
1205	}	1387	}
1206	} else {	1388	} else {
1207	aio_unlink $filename;	1389	aio_unlink $filename;
1208	aio_unlink "$filename.pst";	1390	aio_unlink "$filename.pst";
1209	}	1391	}
…		…
1233	my $st = eval { Coro::Storable::thaw $av };	1415	my $st = eval { Coro::Storable::thaw $av };
1234	$av = $st->{objs};	1416	$av = $st->{objs};
1235	}	1417	}
1236		1418
1237	utf8::decode (my $decname = $filename);	1419	utf8::decode (my $decname = $filename);
1238	warn sprintf "loading %s (%d,%d)\n",	1420	trace sprintf "loading %s (%d,%d)\n",
1239	$decname, length $data, scalar @{$av || []};	1421	$decname, length $data, scalar @{$av || []}
		1422	if $VERBOSE_IO;
1240		1423
1241	($data, $av)	1424	($data, $av)
1242	}	1425	}
1243		1426
1244	=head2 COMMAND CALLBACKS	1427	=head2 COMMAND CALLBACKS
…		…
1248	=cut	1431	=cut
1249		1432
1250	#############################################################################	1433	#############################################################################
1251	# command handling &c	1434	# command handling &c
1252		1435
1253	=item cf::register_command $name => \&callback($ob,$args);	1436	=item cf::register_command $name => \&callback($ob,$args)
1254		1437
1255	Register a callback for execution when the client sends the user command	1438	Register a callback for execution when the client sends the user command
1256	$name.	1439	$name.
1257		1440
1258	=cut	1441	=cut
…		…
1264	#warn "registering command '$name/$time' to '$caller'";	1447	#warn "registering command '$name/$time' to '$caller'";
1265		1448
1266	push @{ $COMMAND{$name} }, [$caller, $cb];	1449	push @{ $COMMAND{$name} }, [$caller, $cb];
1267	}	1450	}
1268		1451
1269	=item cf::register_extcmd $name => \&callback($pl,$packet);	1452	=item cf::register_extcmd $name => \&callback($pl,$packet)
1270		1453
1271	Register a callback for execution when the client sends an (synchronous)	1454	Register a callback for execution when the client sends an (synchronous)
1272	extcmd packet. Ext commands will be processed in the order they are	1455	extcmd packet. Ext commands will be processed in the order they are
1273	received by the server, like other user commands. The first argument is	1456	received by the server, like other user commands. The first argument is
1274	the logged-in player. Ext commands can only be processed after a player	1457	the logged-in player. Ext commands can only be processed after a player
1275	has logged in successfully.	1458	has logged in successfully.
1276		1459
1277	If the callback returns something, it is sent back as if reply was being	1460	If the callback returns something, it is sent back as if reply was being
1278	called.	1461	called.
1279		1462
1280	=item cf::register_exticmd $name => \&callback($ns,$packet);	1463	=item cf::register_exticmd $name => \&callback($ns,$packet)
1281		1464
1282	Register a callback for execution when the client sends an (asynchronous)	1465	Register a callback for execution when the client sends an (asynchronous)
1283	exticmd packet. Exti commands are processed by the server as soon as they	1466	exticmd packet. Exti commands are processed by the server as soon as they
1284	are received, i.e. out of order w.r.t. other commands. The first argument	1467	are received, i.e. out of order w.r.t. other commands. The first argument
1285	is a client socket. Exti commands can be received anytime, even before	1468	is a client socket. Exti commands can be received anytime, even before
…		…
1303	}	1486	}
1304		1487
1305	use File::Glob ();	1488	use File::Glob ();
1306		1489
1307	cf::player->attach (	1490	cf::player->attach (
1308	on_command => sub {	1491	on_unknown_command => sub {
1309	my ($pl, $name, $params) = @_;	1492	my ($pl, $name, $params) = @_;
1310		1493
1311	my $cb = $COMMAND{$name}	1494	my $cb = $COMMAND{$name}
1312	or return;	1495	or return;
1313		1496
…		…
1321	my ($pl, $buf) = @_;	1504	my ($pl, $buf) = @_;
1322		1505
1323	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1506	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1324		1507
1325	if (ref $msg) {	1508	if (ref $msg) {
1326	my ($type, $reply, @payload) =	1509	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1327	"ARRAY" eq ref $msg
1328	? @$msg
1329	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1330		1510
1331	my @reply;	1511	my @reply;
1332		1512
1333	if (my $cb = $EXTCMD{$type}) {	1513	if (my $cb = $EXTCMD{$type}) {
1334	@reply = $cb->($pl, @payload);	1514	@reply = $cb->($pl, @payload);
1335	}	1515	}
1336		1516
1337	$pl->ext_reply ($reply, @reply)	1517	$pl->ext_msg ("reply-$reply", @reply)
1338	if $reply;	1518	if $reply;
1339		1519
1340	} else {	1520	} else {
1341	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1521	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1342	}	1522	}
1343		1523
1344	cf::override;	1524	cf::override;
1345	},	1525	},
1346	);	1526	);
…		…
1356	};	1536	};
1357		1537
1358	$grp	1538	$grp
1359	}	1539	}
1360		1540
		1541	sub _ext_cfg_reg($$$$) {
		1542	my ($rvar, $varname, $cfgname, $default) = @_;
		1543
		1544	$cfgname = lc $varname
		1545	unless length $cfgname;
		1546
		1547	$EXT_CFG{$cfgname} = [$rvar, $default];
		1548
		1549	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1550	}
		1551
1361	sub load_extensions {	1552	sub load_extensions {
		1553	info "loading extensions...";
		1554
		1555	%EXT_CFG = ();
		1556
1362	cf::sync_job {	1557	cf::sync_job {
1363	my %todo;	1558	my %todo;
1364		1559
1365	for my $path (<$LIBDIR/*.ext>) {	1560	for my $path (<$LIBDIR/*.ext>) {
1366	next unless -r $path;	1561	next unless -r $path;
…		…
1384		1579
1385	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1580	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1386	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1581	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1387		1582
1388	$ext{source} =	1583	$ext{source} =
1389	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1584	"package $pkg; use common::sense;\n"
1390	. "#line 1 \"$path\"\n{\n"	1585	. "#line 1 \"$path\"\n{\n"
1391	. $source	1586	. $source
1392	. "\n};\n1";	1587	. "\n};\n1";
1393		1588
1394	$todo{$base} = \%ext;	1589	$todo{$base} = \%ext;
1395	}	1590	}
1396		1591
		1592	my $pass = 0;
1397	my %done;	1593	my %done;
1398	while (%todo) {	1594	while (%todo) {
1399	my $progress;	1595	my $progress;
1400		1596
		1597	++$pass;
		1598
		1599	ext:
1401	while (my ($k, $v) = each %todo) {	1600	while (my ($k, $v) = each %todo) {
1402	for (split /,\s*/, $v->{meta}{depends}) {	1601	for (split /,\s*/, $v->{meta}{depends}) {
1403	goto skip	1602	next ext
1404	unless exists $done{$_};	1603	unless exists $done{$_};
1405	}	1604	}
1406		1605
1407	warn "... loading '$k' into '$v->{pkg}'\n";	1606	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1408		1607
1409	unless (eval $v->{source}) {	1608	my $source = $v->{source};
		1609
		1610	# support "CONF varname :confname = default" pseudo-statements
		1611	$source =~ s{
		1612	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1613	}{
		1614	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1615	}gmxe;
		1616
		1617	my $active = eval $source;
		1618
		1619	if (length $@) {
1410	my $msg = $@ ? "$v->{path}: $@\n"	1620	error "$v->{path}: $@\n";
1411	: "$v->{base}: extension inactive.\n";
1412		1621
1413	if (exists $v->{meta}{mandatory}) {
1414	warn $msg;
1415	cf::cleanup "mandatory extension failed to load, exiting.";	1622	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1416	}	1623	if exists $v->{meta}{mandatory};
1417		1624
1418	warn $msg;	1625	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1626	delete $todo{$k};
		1627	} else {
		1628	$done{$k} = delete $todo{$k};
		1629	push @EXTS, $v->{pkg};
		1630	$progress = 1;
		1631
		1632	info "$v->{base}: extension inactive.\n"
		1633	unless $active;
1419	}	1634	}
1420
1421	$done{$k} = delete $todo{$k};
1422	push @EXTS, $v->{pkg};
1423	$progress = 1;
1424	}	1635	}
1425		1636
1426	skip:	1637	unless ($progress) {
1427	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1638	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1428	unless $progress;	1639
		1640	while (my ($k, $v) = each %todo) {
		1641	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
		1642	if exists $v->{meta}{mandatory};
		1643	}
		1644
		1645	last;
		1646	}
1429	}	1647	}
1430	};	1648	};
1431	}	1649	}
1432		1650
1433	#############################################################################	1651	#############################################################################
…		…
1517	$cf::PLAYER{$login} = $pl	1735	$cf::PLAYER{$login} = $pl
1518	}	1736	}
1519	}	1737	}
1520	}	1738	}
1521		1739
		1740	cf::player->attach (
		1741	on_load => sub {
		1742	my ($pl, $path) = @_;
		1743
		1744	# restore slots saved in save, below
		1745	my $slots = delete $pl->{_slots};
		1746
		1747	$pl->ob->current_weapon ($slots->[0]);
		1748	$pl->combat_ob ($slots->[1]);
		1749	$pl->ranged_ob ($slots->[2]);
		1750	},
		1751	);
		1752
1522	sub save($) {	1753	sub save($) {
1523	my ($pl) = @_;	1754	my ($pl) = @_;
1524		1755
1525	return if $pl->{deny_save};	1756	return if $pl->{deny_save};
1526		1757
…		…
1531		1762
1532	aio_mkdir playerdir $pl, 0770;	1763	aio_mkdir playerdir $pl, 0770;
1533	$pl->{last_save} = $cf::RUNTIME;	1764	$pl->{last_save} = $cf::RUNTIME;
1534		1765
1535	cf::get_slot 0.01;	1766	cf::get_slot 0.01;
		1767
		1768	# save slots, to be restored later
		1769	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1536		1770
1537	$pl->save_pl ($path);	1771	$pl->save_pl ($path);
1538	cf::cede_to_tick;	1772	cf::cede_to_tick;
1539	}	1773	}
1540		1774
…		…
1574	my $name = $pl->ob->name;	1808	my $name = $pl->ob->name;
1575		1809
1576	$pl->{deny_save} = 1;	1810	$pl->{deny_save} = 1;
1577	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1811	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1578		1812
1579	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1813	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1580	$pl->deactivate;	1814	$pl->deactivate;
		1815
1581	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1816	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582	$pl->ob->check_score;
1583	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1817	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1818	ext::highscore::check ($pl->ob);
		1819
1584	$pl->ns->destroy if $pl->ns;	1820	$pl->ns->destroy if $pl->ns;
1585		1821
1586	my $path = playerdir $pl;	1822	my $path = playerdir $pl;
1587	my $temp = "$path~$cf::RUNTIME~deleting~";	1823	my $temp = "$path~$cf::RUNTIME~deleting~";
1588	aio_rename $path, $temp;	1824	aio_rename $path, $temp;
…		…
1642	\@logins	1878	\@logins
1643	}	1879	}
1644		1880
1645	=item $player->maps	1881	=item $player->maps
1646		1882
		1883	=item cf::player::maps $login
		1884
1647	Returns an arrayref of map paths that are private for this	1885	Returns an arrayref of map paths that are private for this
1648	player. May block.	1886	player. May block.
1649		1887
1650	=cut	1888	=cut
1651		1889
…		…
1672		1910
1673	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1911	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1674		1912
1675	Expand deliantra pod fragments into protocol xml.	1913	Expand deliantra pod fragments into protocol xml.
1676		1914
1677	=item $player->ext_reply ($msgid, @msg)
1678
1679	Sends an ext reply to the player.
1680
1681	=cut
1682
1683	sub ext_reply($$@) {
1684	my ($self, $id, @msg) = @_;
1685
1686	$self->ns->ext_reply ($id, @msg)
1687	}
1688
1689	=item $player->ext_msg ($type, @msg)	1915	=item $player->ext_msg ($type, @msg)
1690		1916
1691	Sends an ext event to the client.	1917	Sends an ext event to the client.
1692		1918
1693	=cut	1919	=cut
…		…
1712		1938
1713	=cut	1939	=cut
1714		1940
1715	sub find_by_path($) {	1941	sub find_by_path($) {
1716	my ($path) = @_;	1942	my ($path) = @_;
		1943
		1944	$path =~ s/^~[^\/]*//; # skip ~login
1717		1945
1718	my ($match, $specificity);	1946	my ($match, $specificity);
1719		1947
1720	for my $region (list) {	1948	for my $region (list) {
1721	if ($region->{match} && $path =~ $region->{match}) {	1949	if ($region->{match} && $path =~ $region->{match}) {
…		…
1750	sub generate_random_map {	1978	sub generate_random_map {
1751	my ($self, $rmp) = @_;	1979	my ($self, $rmp) = @_;
1752		1980
1753	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1981	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754		1982
1755	# mit "rum" bekleckern, nicht
1756	$self->_create_random_map (	1983	$self->_create_random_map ($rmp);
1757	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1758	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1759	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1760	$rmp->{exit_on_final_map},
1761	$rmp->{xsize}, $rmp->{ysize},
1762	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1763	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1764	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1765	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1766	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1767	(cf::region::find $rmp->{region}), $rmp->{custom}
1768	)
1769	}	1984	}
1770		1985
1771	=item cf::map->register ($regex, $prio)	1986	=item cf::map->register ($regex, $prio)
1772		1987
1773	Register a handler for the map path matching the given regex at the	1988	Register a handler for the map path matching the given regex at the
…		…
1778		1993
1779	sub register {	1994	sub register {
1780	my (undef, $regex, $prio) = @_;	1995	my (undef, $regex, $prio) = @_;
1781	my $pkg = caller;	1996	my $pkg = caller;
1782		1997
1783	no strict;
1784	push @{"$pkg\::ISA"}, __PACKAGE__;	1998	push @{"$pkg\::ISA"}, __PACKAGE__;
1785		1999
1786	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	2000	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1787	}	2001	}
1788		2002
1789	# also paths starting with '/'	2003	# also paths starting with '/'
1790	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	2004	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1791		2005
1792	sub thawer_merge {	2006	sub thawer_merge {
1793	my ($self, $merge) = @_;	2007	my ($self, $merge) = @_;
1794		2008
1795	# we have to keep some variables in memory intact	2009	# we have to keep some variables in memory intact
…		…
1800	}	2014	}
1801		2015
1802	sub normalise {	2016	sub normalise {
1803	my ($path, $base) = @_;	2017	my ($path, $base) = @_;
1804		2018
1805	$path = "$path"; # make sure its a string	2019	$path = "$path"; # make sure it's a string
1806		2020
1807	$path =~ s/\.map$//;	2021	$path =~ s/\.map$//;
1808		2022
1809	# map plan:	2023	# map plan:
1810	#	2024	#
…		…
1825	$base =~ s{[^/]+/?$}{};	2039	$base =~ s{[^/]+/?$}{};
1826	$path = "$base/$path";	2040	$path = "$base/$path";
1827	}	2041	}
1828		2042
1829	for ($path) {	2043	for ($path) {
1830	redo if s{//}{/};
1831	redo if s{/\.?/}{/};	2044	redo if s{/\.?/}{/};
1832	redo if s{/[^/]+/\.\./}{/};	2045	redo if s{/[^/]+/\.\./}{/};
1833	}	2046	}
1834		2047
1835	$path	2048	$path
…		…
1849	$self->init; # pass $1 etc.	2062	$self->init; # pass $1 etc.
1850	return $self;	2063	return $self;
1851	}	2064	}
1852	}	2065	}
1853		2066
1854	Carp::cluck "unable to resolve path '$path' (base '$base').";	2067	Carp::cluck "unable to resolve path '$path' (base '$base')";
1855	()	2068	()
1856	}	2069	}
1857		2070
		2071	# may re-bless or do other evil things
1858	sub init {	2072	sub init {
1859	my ($self) = @_;	2073	my ($self) = @_;
1860		2074
1861	$self	2075	$self
1862	}	2076	}
…		…
1927	$self->{load_path} = $path;	2141	$self->{load_path} = $path;
1928		2142
1929	1	2143	1
1930	}	2144	}
1931		2145
		2146	# used to laod the header of an original map
1932	sub load_header_orig {	2147	sub load_header_orig {
1933	my ($self) = @_;	2148	my ($self) = @_;
1934		2149
1935	$self->load_header_from ($self->load_path)	2150	$self->load_header_from ($self->load_path)
1936	}	2151	}
1937		2152
		2153	# used to laod the header of an instantiated map
1938	sub load_header_temp {	2154	sub load_header_temp {
1939	my ($self) = @_;	2155	my ($self) = @_;
1940		2156
1941	$self->load_header_from ($self->save_path)	2157	$self->load_header_from ($self->save_path)
1942	}	2158	}
1943		2159
		2160	# called after loading the header from an instantiated map
1944	sub prepare_temp {	2161	sub prepare_temp {
1945	my ($self) = @_;	2162	my ($self) = @_;
1946		2163
1947	$self->last_access ((delete $self->{last_access})	2164	$self->last_access ((delete $self->{last_access})
1948	|| $cf::RUNTIME); #d#	2165	|| $cf::RUNTIME); #d#
1949	# safety	2166	# safety
1950	$self->{instantiate_time} = $cf::RUNTIME	2167	$self->{instantiate_time} = $cf::RUNTIME
1951	if $self->{instantiate_time} > $cf::RUNTIME;	2168	if $self->{instantiate_time} > $cf::RUNTIME;
1952	}	2169	}
1953		2170
		2171	# called after loading the header from an original map
1954	sub prepare_orig {	2172	sub prepare_orig {
1955	my ($self) = @_;	2173	my ($self) = @_;
1956		2174
1957	$self->{load_original} = 1;	2175	$self->{load_original} = 1;
1958	$self->{instantiate_time} = $cf::RUNTIME;	2176	$self->{instantiate_time} = $cf::RUNTIME;
…		…
1982		2200
1983	sub find;	2201	sub find;
1984	sub find {	2202	sub find {
1985	my ($path, $origin) = @_;	2203	my ($path, $origin) = @_;
1986		2204
		2205	cf::cede_to_tick;
		2206
1987	$path = normalise $path, $origin && $origin->path;	2207	$path = normalise $path, $origin;
1988		2208
1989	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2209	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1990	my $guard2 = cf::lock_acquire "map_find:$path";	2210	my $guard2 = cf::lock_acquire "map_find:$path";
1991		2211
1992	$cf::MAP{$path} || do {	2212	$cf::MAP{$path} || do {
…		…
2009		2229
2010	$cf::MAP{$path} = $map	2230	$cf::MAP{$path} = $map
2011	}	2231	}
2012	}	2232	}
2013		2233
2014	sub pre_load { }	2234	sub pre_load { }
2015	sub post_load { }	2235	#sub post_load { } # XS
2016		2236
2017	sub load {	2237	sub load {
2018	my ($self) = @_;	2238	my ($self) = @_;
2019		2239
2020	local $self->{deny_reset} = 1; # loading can take a long time	2240	local $self->{deny_reset} = 1; # loading can take a long time
…		…
2023		2243
2024	{	2244	{
2025	my $guard = cf::lock_acquire "map_data:$path";	2245	my $guard = cf::lock_acquire "map_data:$path";
2026		2246
2027	return unless $self->valid;	2247	return unless $self->valid;
2028	return unless $self->in_memory == cf::MAP_SWAPPED;	2248	return unless $self->state == cf::MAP_SWAPPED;
2029
2030	$self->in_memory (cf::MAP_LOADING);
2031		2249
2032	$self->alloc;	2250	$self->alloc;
2033		2251
2034	$self->pre_load;	2252	$self->pre_load;
2035	cf::cede_to_tick;	2253	cf::cede_to_tick;
2036		2254
		2255	if (exists $self->{load_path}) {
2037	my $f = new_from_file cf::object::thawer $self->{load_path};	2256	my $f = new_from_file cf::object::thawer $self->{load_path};
2038	$f->skip_block;	2257	$f->skip_block;
2039	$self->_load_objects ($f)	2258	$self->_load_objects ($f)
2040	or return;	2259	or return;
2041		2260
2042	$self->post_load_original	2261	$self->post_load_original
2043	if delete $self->{load_original};	2262	if delete $self->{load_original};
2044		2263
2045	if (my $uniq = $self->uniq_path) {	2264	if (my $uniq = $self->uniq_path) {
2046	utf8::encode $uniq;	2265	utf8::encode $uniq;
2047	unless (aio_stat $uniq) {	2266	unless (aio_stat $uniq) {
2048	if (my $f = new_from_file cf::object::thawer $uniq) {	2267	if (my $f = new_from_file cf::object::thawer $uniq) {
2049	$self->clear_unique_items;	2268	$self->clear_unique_items;
2050	$self->_load_objects ($f);	2269	$self->_load_objects ($f);
2051	$f->resolve_delayed_derefs;	2270	$f->resolve_delayed_derefs;
		2271	}
2052	}	2272	}
2053	}	2273	}
2054	}
2055		2274
2056	$f->resolve_delayed_derefs;	2275	$f->resolve_delayed_derefs;
		2276	} else {
		2277	$self->post_load_original
		2278	if delete $self->{load_original};
		2279	}
		2280
		2281	$self->state (cf::MAP_INACTIVE);
2057		2282
2058	cf::cede_to_tick;	2283	cf::cede_to_tick;
2059	# now do the right thing for maps	2284	# now do the right thing for maps
2060	$self->link_multipart_objects;	2285	$self->link_multipart_objects;
2061	$self->difficulty ($self->estimate_difficulty)	2286	$self->difficulty ($self->estimate_difficulty)
…		…
2065	unless ($self->{deny_activate}) {	2290	unless ($self->{deny_activate}) {
2066	$self->decay_objects;	2291	$self->decay_objects;
2067	$self->fix_auto_apply;	2292	$self->fix_auto_apply;
2068	$self->update_buttons;	2293	$self->update_buttons;
2069	cf::cede_to_tick;	2294	cf::cede_to_tick;
2070	$self->activate;	2295	#$self->activate; # no longer activate maps automatically
2071	}	2296	}
2072		2297
2073	$self->{last_save} = $cf::RUNTIME;	2298	$self->{last_save} = $cf::RUNTIME;
2074	$self->last_access ($cf::RUNTIME);	2299	$self->last_access ($cf::RUNTIME);
2075
2076	$self->in_memory (cf::MAP_ACTIVE);
2077	}	2300	}
2078		2301
2079	$self->post_load;	2302	$self->post_load;
2080	}
2081		2303
		2304	1
		2305	}
		2306
		2307	# customize the map for a given player, i.e.
		2308	# return the _real_ map. used by e.g. per-player
		2309	# maps to change the path to ~playername/mappath
2082	sub customise_for {	2310	sub customise_for {
2083	my ($self, $ob) = @_;	2311	my ($self, $ob) = @_;
2084		2312
2085	return find "~" . $ob->name . "/" . $self->{path}	2313	return find "~" . $ob->name . "/" . $self->{path}
2086	if $self->per_player;	2314	if $self->per_player;
…		…
2089	# if $self->per_party;	2317	# if $self->per_party;
2090		2318
2091	$self	2319	$self
2092	}	2320	}
2093		2321
2094	# find and load all maps in the 3x3 area around a map
2095	sub load_neighbours {
2096	my ($map) = @_;
2097
2098	my @neigh; # diagonal neighbours
2099
2100	for (0 .. 3) {
2101	my $neigh = $map->tile_path ($_)
2102	or next;
2103	$neigh = find $neigh, $map
2104	or next;
2105	$neigh->load;
2106
2107	push @neigh,
2108	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2109	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2110	}
2111
2112	for (grep defined $_->[0], @neigh) {
2113	my ($path, $origin) = @$_;
2114	my $neigh = find $path, $origin
2115	or next;
2116	$neigh->load;
2117	}
2118	}
2119
2120	sub find_sync {	2322	sub find_sync {
2121	my ($path, $origin) = @_;	2323	my ($path, $origin) = @_;
2122		2324
2123	cf::sync_job { find $path, $origin }	2325	# it's a bug to call this from the main context
		2326	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2327	if $Coro::current == $Coro::main;
		2328
		2329	find $path, $origin
2124	}	2330	}
2125		2331
2126	sub do_load_sync {	2332	sub do_load_sync {
2127	my ($map) = @_;	2333	my ($map) = @_;
2128		2334
		2335	# it's a bug to call this from the main context
2129	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2336	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2130	if $Coro::current == $Coro::main;	2337	if $Coro::current == $Coro::main;
2131		2338
2132	cf::sync_job { $map->load };	2339	$map->load;
2133	}	2340	}
2134		2341
2135	our %MAP_PREFETCH;	2342	our %MAP_PREFETCH;
2136	our $MAP_PREFETCHER = undef;	2343	our $MAP_PREFETCHER = undef;
2137		2344
2138	sub find_async {	2345	sub find_async {
2139	my ($path, $origin, $load) = @_;	2346	my ($path, $origin, $load) = @_;
2140		2347
2141	$path = normalise $path, $origin && $origin->{path};	2348	$path = normalise $path, $origin;
2142		2349
2143	if (my $map = $cf::MAP{$path}) {	2350	if (my $map = $cf::MAP{$path}) {
2144	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2351	return $map if !$load || $map->linkable;
2145	}	2352	}
2146		2353
2147	$MAP_PREFETCH{$path} |= $load;	2354	$MAP_PREFETCH{$path} |= $load;
2148		2355
2149	$MAP_PREFETCHER ||= cf::async {	2356	$MAP_PREFETCHER ||= cf::async {
…		…
2163	$MAP_PREFETCHER->prio (6);	2370	$MAP_PREFETCHER->prio (6);
2164		2371
2165	()	2372	()
2166	}	2373	}
2167		2374
		2375	# common code, used by both ->save and ->swapout
2168	sub save {	2376	sub _save {
2169	my ($self) = @_;	2377	my ($self) = @_;
2170
2171	my $lock = cf::lock_acquire "map_data:$self->{path}";
2172		2378
2173	$self->{last_save} = $cf::RUNTIME;	2379	$self->{last_save} = $cf::RUNTIME;
2174		2380
2175	return unless $self->dirty;	2381	return unless $self->dirty;
2176		2382
…		…
2196	} else {	2402	} else {
2197	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2403	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2198	}	2404	}
2199	}	2405	}
2200		2406
		2407	sub save {
		2408	my ($self) = @_;
		2409
		2410	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2411
		2412	$self->_save;
		2413	}
		2414
2201	sub swap_out {	2415	sub swap_out {
2202	my ($self) = @_;	2416	my ($self) = @_;
2203		2417
2204	# save first because save cedes
2205	$self->save;
2206
2207	my $lock = cf::lock_acquire "map_data:$self->{path}";	2418	my $lock = cf::lock_acquire "map_data:$self->{path}";
2208		2419
		2420	return if !$self->linkable;
		2421	return if $self->{deny_save};
2209	return if $self->players;	2422	return if $self->players;
2210	return if $self->in_memory != cf::MAP_ACTIVE;	2423
		2424	# first deactivate the map and "unlink" it from the core
		2425	$self->deactivate;
		2426	$_->clear_links_to ($self) for values %cf::MAP;
		2427	$self->state (cf::MAP_SWAPPED);
		2428
		2429	# then atomically save
		2430	$self->_save;
		2431
		2432	# then free the map
		2433	$self->clear;
		2434	}
		2435
		2436	sub reset_at {
		2437	my ($self) = @_;
		2438
		2439	# TODO: safety, remove and allow resettable per-player maps
2211	return if $self->{deny_save};	2440	return 1e99 if $self->{deny_reset};
2212		2441
		2442	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2443	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2444
		2445	$time + $to
		2446	}
		2447
		2448	sub should_reset {
		2449	my ($self) = @_;
		2450
		2451	$self->reset_at <= $cf::RUNTIME
		2452	}
		2453
		2454	sub reset {
		2455	my ($self) = @_;
		2456
		2457	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2458
		2459	return if $self->players;
		2460
		2461	cf::trace "resetting map ", $self->path, "\n";
		2462
2213	$self->in_memory (cf::MAP_SWAPPED);	2463	$self->state (cf::MAP_SWAPPED);
		2464
		2465	# need to save uniques path
		2466	unless ($self->{deny_save}) {
		2467	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2468
		2469	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2470	if $uniq;
		2471	}
		2472
		2473	delete $cf::MAP{$self->path};
2214		2474
2215	$self->deactivate;	2475	$self->deactivate;
2216	$_->clear_links_to ($self) for values %cf::MAP;	2476	$_->clear_links_to ($self) for values %cf::MAP;
2217	$self->clear;	2477	$self->clear;
2218	}
2219
2220	sub reset_at {
2221	my ($self) = @_;
2222
2223	# TODO: safety, remove and allow resettable per-player maps
2224	return 1e99 if $self->{deny_reset};
2225
2226	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2227	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2228
2229	$time + $to
2230	}
2231
2232	sub should_reset {
2233	my ($self) = @_;
2234
2235	$self->reset_at <= $cf::RUNTIME
2236	}
2237
2238	sub reset {
2239	my ($self) = @_;
2240
2241	my $lock = cf::lock_acquire "map_data:$self->{path}";
2242
2243	return if $self->players;
2244
2245	warn "resetting map ", $self->path, "\n";
2246
2247	$self->in_memory (cf::MAP_SWAPPED);
2248
2249	# need to save uniques path
2250	unless ($self->{deny_save}) {
2251	my $uniq = $self->uniq_path; utf8::encode $uniq;
2252
2253	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2254	if $uniq;
2255	}
2256
2257	delete $cf::MAP{$self->path};
2258
2259	$self->deactivate;
2260	$_->clear_links_to ($self) for values %cf::MAP;
2261	$self->clear;
2262		2478
2263	$self->unlink_save;	2479	$self->unlink_save;
2264	$self->destroy;	2480	$self->destroy;
2265	}	2481	}
2266		2482
…		…
2274		2490
2275	delete $cf::MAP{$self->path};	2491	delete $cf::MAP{$self->path};
2276		2492
2277	$self->unlink_save;	2493	$self->unlink_save;
2278		2494
2279	bless $self, "cf::map";	2495	bless $self, "cf::map::wrap";
2280	delete $self->{deny_reset};	2496	delete $self->{deny_reset};
2281	$self->{deny_save} = 1;	2497	$self->{deny_save} = 1;
2282	$self->reset_timeout (1);	2498	$self->reset_timeout (1);
2283	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2499	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2284		2500
…		…
2514		2730
2515	Freezes the player and moves him/her to a special map (C<{link}>).	2731	Freezes the player and moves him/her to a special map (C<{link}>).
2516		2732
2517	The player should be reasonably safe there for short amounts of time (e.g.	2733	The player should be reasonably safe there for short amounts of time (e.g.
2518	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2734	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2519	though, as the palyer cannot control the character while it is on the link	2735	though, as the player cannot control the character while it is on the link
2520	map.	2736	map.
2521		2737
2522	Will never block.	2738	Will never block.
2523		2739
2524	=item $player_object->leave_link ($map, $x, $y)	2740	=item $player_object->leave_link ($map, $x, $y)
…		…
2545	sub cf::object::player::enter_link {	2761	sub cf::object::player::enter_link {
2546	my ($self) = @_;	2762	my ($self) = @_;
2547		2763
2548	$self->deactivate_recursive;	2764	$self->deactivate_recursive;
2549		2765
		2766	++$self->{_link_recursion};
		2767
2550	return if UNIVERSAL::isa $self->map, "ext::map_link";	2768	return if UNIVERSAL::isa $self->map, "ext::map_link";
2551		2769
2552	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2770	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2553	if $self->map && $self->map->{path} ne "{link}";	2771	if $self->map && $self->map->{path} ne "{link}";
2554		2772
2555	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2773	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2556	}	2774	}
2557		2775
2558	sub cf::object::player::leave_link {	2776	sub cf::object::player::leave_link {
2559	my ($self, $map, $x, $y) = @_;	2777	my ($self, $map, $x, $y) = @_;
2560		2778
…		…
2580	# use -1 or undef as default coordinates, not 0, 0	2798	# use -1 or undef as default coordinates, not 0, 0
2581	($x, $y) = ($map->enter_x, $map->enter_y)	2799	($x, $y) = ($map->enter_x, $map->enter_y)
2582	if $x <= 0 && $y <= 0;	2800	if $x <= 0 && $y <= 0;
2583		2801
2584	$map->load;	2802	$map->load;
2585	$map->load_neighbours;
2586		2803
2587	return unless $self->contr->active;	2804	return unless $self->contr->active;
2588		2805
2589	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2806	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2590	$self->enter_map ($map, $x, $y);	2807	if ($self->enter_map ($map, $x, $y)) {
2591		2808	# entering was successful
		2809	delete $self->{_link_recursion};
2592	# only activate afterwards, to support waiting in hooks	2810	# only activate afterwards, to support waiting in hooks
2593	$self->activate_recursive;	2811	$self->activate_recursive;
2594	}	2812	}
2595		2813
		2814	}
		2815
2596	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2816	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2597		2817
2598	Moves the player to the given map-path and coordinates by first freezing	2818	Moves the player to the given map-path and coordinates by first freezing
2599	her, loading and preparing them map, calling the provided $check callback	2819	her, loading and preparing them map, calling the provided $check callback
2600	that has to return the map if sucecssful, and then unfreezes the player on	2820	that has to return the map if sucecssful, and then unfreezes the player on
2601	the new (success) or old (failed) map position. In either case, $done will	2821	the new (success) or old (failed) map position. In either case, $done will
…		…
2608		2828
2609	our $GOTOGEN;	2829	our $GOTOGEN;
2610		2830
2611	sub cf::object::player::goto {	2831	sub cf::object::player::goto {
2612	my ($self, $path, $x, $y, $check, $done) = @_;	2832	my ($self, $path, $x, $y, $check, $done) = @_;
		2833
		2834	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2835	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2836	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2837	($path, $x, $y) = @$EMERGENCY_POSITION;
		2838	}
2613		2839
2614	# do generation counting so two concurrent goto's will be executed in-order	2840	# do generation counting so two concurrent goto's will be executed in-order
2615	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2841	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2616		2842
2617	$self->enter_link;	2843	$self->enter_link;
…		…
2637	($path, $x, $y) = (undef, undef, undef);	2863	($path, $x, $y) = (undef, undef, undef);
2638	}	2864	}
2639	}	2865	}
2640		2866
2641	my $map = eval {	2867	my $map = eval {
2642	my $map = defined $path ? cf::map::find $path : undef;	2868	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2643		2869
2644	if ($map) {	2870	if ($map) {
2645	$map = $map->customise_for ($self);	2871	$map = $map->customise_for ($self);
2646	$map = $check->($map) if $check && $map;	2872	$map = $check->($map, $x, $y, $self) if $check && $map;
2647	} else {	2873	} else {
2648	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2874	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2649	}	2875	}
2650		2876
2651	$map	2877	$map
…		…
2659	if ($gen == $self->{_goto_generation}) {	2885	if ($gen == $self->{_goto_generation}) {
2660	delete $self->{_goto_generation};	2886	delete $self->{_goto_generation};
2661	$self->leave_link ($map, $x, $y);	2887	$self->leave_link ($map, $x, $y);
2662	}	2888	}
2663		2889
2664	$done->() if $done;	2890	$done->($self) if $done;
2665	})->prio (1);	2891	})->prio (1);
2666	}	2892	}
2667		2893
2668	=item $player_object->enter_exit ($exit_object)	2894	=item $player_object->enter_exit ($exit_object)
2669		2895
…		…
2737	$Coro::current->{desc} = "enter_exit";	2963	$Coro::current->{desc} = "enter_exit";
2738		2964
2739	unless (eval {	2965	unless (eval {
2740	$self->deactivate_recursive; # just to be sure	2966	$self->deactivate_recursive; # just to be sure
2741		2967
2742	# random map handling
2743	{
2744	my $guard = cf::lock_acquire "exit_prepare:$exit";
2745
2746	prepare_random_map $exit
2747	if $exit->slaying eq "/!";
2748	}
2749
2750	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2968	my $map = cf::map::normalise $exit->slaying, $exit->map;
2751	my $x = $exit->stats->hp;	2969	my $x = $exit->stats->hp;
2752	my $y = $exit->stats->sp;	2970	my $y = $exit->stats->sp;
		2971
		2972	# special map handling
		2973	my $slaying = $exit->slaying;
		2974
		2975	# special map handling
		2976	if ($slaying eq "/!") {
		2977	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2978
		2979	prepare_random_map $exit
		2980	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		2981
		2982	$map = $exit->slaying;
		2983
		2984	} elsif ($slaying eq '!up') {
		2985	$map = $exit->map->tile_path (cf::TILE_UP);
		2986	$x = $exit->x;
		2987	$y = $exit->y;
		2988
		2989	} elsif ($slaying eq '!down') {
		2990	$map = $exit->map->tile_path (cf::TILE_DOWN);
		2991	$x = $exit->x;
		2992	$y = $exit->y;
		2993	}
2753		2994
2754	$self->goto ($map, $x, $y);	2995	$self->goto ($map, $x, $y);
2755		2996
2756	# if exit is damned, update players death & WoR home-position	2997	# if exit is damned, update players death & WoR home-position
2757	$self->contr->savebed ($map, $x, $y)	2998	$self->contr->savebed ($map, $x, $y)
…		…
2762	$self->message ("Something went wrong deep within the deliantra server. "	3003	$self->message ("Something went wrong deep within the deliantra server. "
2763	. "I'll try to bring you back to the map you were before. "	3004	. "I'll try to bring you back to the map you were before. "
2764	. "Please report this to the dungeon master!",	3005	. "Please report this to the dungeon master!",
2765	cf::NDI_UNIQUE | cf::NDI_RED);	3006	cf::NDI_UNIQUE | cf::NDI_RED);
2766		3007
2767	warn "ERROR in enter_exit: $@";	3008	error "ERROR in enter_exit: $@";
2768	$self->leave_link;	3009	$self->leave_link;
2769	}	3010	}
2770	})->prio (1);	3011	})->prio (1);
2771	}	3012	}
2772		3013
…		…
2982	=cut	3223	=cut
2983		3224
2984	sub cf::client::ext_msg($$@) {	3225	sub cf::client::ext_msg($$@) {
2985	my ($self, $type, @msg) = @_;	3226	my ($self, $type, @msg) = @_;
2986		3227
2987	if ($self->extcmd == 2) {
2988	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3228	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2989	} elsif ($self->extcmd == 1) { # TODO: remove
2990	push @msg, msgtype => "event_$type";
2991	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2992	}
2993	}
2994
2995	=item $client->ext_reply ($msgid, @msg)
2996
2997	Sends an ext reply to the client.
2998
2999	=cut
3000
3001	sub cf::client::ext_reply($$@) {
3002	my ($self, $id, @msg) = @_;
3003
3004	if ($self->extcmd == 2) {
3005	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3006	} elsif ($self->extcmd == 1) {
3007	#TODO: version 1, remove
3008	unshift @msg, msgtype => "reply", msgid => $id;
3009	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3010	}
3011	}	3229	}
3012		3230
3013	=item $success = $client->query ($flags, "text", \&cb)	3231	=item $success = $client->query ($flags, "text", \&cb)
3014		3232
3015	Queues a query to the client, calling the given callback with	3233	Queues a query to the client, calling the given callback with
…		…
3070	my ($ns, $buf) = @_;	3288	my ($ns, $buf) = @_;
3071		3289
3072	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3290	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3073		3291
3074	if (ref $msg) {	3292	if (ref $msg) {
3075	my ($type, $reply, @payload) =	3293	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3076	"ARRAY" eq ref $msg
3077	? @$msg
3078	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3079		3294
3080	my @reply;	3295	my @reply;
3081		3296
3082	if (my $cb = $EXTICMD{$type}) {	3297	if (my $cb = $EXTICMD{$type}) {
3083	@reply = $cb->($ns, @payload);	3298	@reply = $cb->($ns, @payload);
3084	}	3299	}
3085		3300
3086	$ns->ext_reply ($reply, @reply)	3301	$ns->ext_msg ("reply-$reply", @reply)
3087	if $reply;	3302	if $reply;
3088		3303
3089	} else {	3304	} else {
3090	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3305	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3091	}	3306	}
3092		3307
3093	cf::override;	3308	cf::override;
3094	},	3309	},
3095	);	3310	);
…		…
3115		3330
3116	$coro	3331	$coro
3117	}	3332	}
3118		3333
3119	cf::client->attach (	3334	cf::client->attach (
3120	on_destroy => sub {	3335	on_client_destroy => sub {
3121	my ($ns) = @_;	3336	my ($ns) = @_;
3122		3337
3123	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3338	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3124	},	3339	},
3125	);	3340	);
…		…
3141	our $safe_hole = new Safe::Hole;	3356	our $safe_hole = new Safe::Hole;
3142		3357
3143	$SIG{FPE} = 'IGNORE';	3358	$SIG{FPE} = 'IGNORE';
3144		3359
3145	$safe->permit_only (Opcode::opset qw(	3360	$safe->permit_only (Opcode::opset qw(
3146	:base_core :base_mem :base_orig :base_math	3361	:base_core :base_mem :base_orig :base_math :base_loop
3147	grepstart grepwhile mapstart mapwhile	3362	grepstart grepwhile mapstart mapwhile
3148	sort time	3363	sort time
3149	));	3364	));
3150		3365
3151	# here we export the classes and methods available to script code	3366	# here we export the classes and methods available to script code
…		…
3176	decrease split destroy change_exp value msg lore send_msg)],	3391	decrease split destroy change_exp value msg lore send_msg)],
3177	["cf::object::player" => qw(player)],	3392	["cf::object::player" => qw(player)],
3178	["cf::player" => qw(peaceful send_msg)],	3393	["cf::player" => qw(peaceful send_msg)],
3179	["cf::map" => qw(trigger)],	3394	["cf::map" => qw(trigger)],
3180	) {	3395	) {
3181	no strict 'refs';
3182	my ($pkg, @funs) = @$_;	3396	my ($pkg, @funs) = @$_;
3183	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3397	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3184	for @funs;	3398	for @funs;
3185	}	3399	}
3186		3400
…		…
3203	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3417	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3204	$qcode =~ s/\n/\\n/g;	3418	$qcode =~ s/\n/\\n/g;
3205		3419
3206	%vars = (_dummy => 0) unless %vars;	3420	%vars = (_dummy => 0) unless %vars;
3207		3421
		3422	my @res;
3208	local $_;	3423	local $_;
3209	local @safe::cf::_safe_eval_args = values %vars;
3210		3424
3211	my $eval =	3425	my $eval =
3212	"do {\n"	3426	"do {\n"
3213	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3427	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3214	. "#line 0 \"{$qcode}\"\n"	3428	. "#line 0 \"{$qcode}\"\n"
3215	. $code	3429	. $code
3216	. "\n}"	3430	. "\n}"
3217	;	3431	;
3218		3432
		3433	if ($CFG{safe_eval}) {
3219	sub_generation_inc;	3434	sub_generation_inc;
		3435	local @safe::cf::_safe_eval_args = values %vars;
3220	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3436	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3221	sub_generation_inc;	3437	sub_generation_inc;
		3438	} else {
		3439	local @cf::_safe_eval_args = values %vars;
		3440	@res = wantarray ? eval eval : scalar eval $eval;
		3441	}
3222		3442
3223	if ($@) {	3443	if ($@) {
3224	warn "$@";	3444	warn "$@",
3225	warn "while executing safe code '$code'\n";	3445	"while executing safe code '$code'\n",
3226	warn "with arguments " . (join " ", %vars) . "\n";	3446	"with arguments " . (join " ", %vars) . "\n";
3227	}	3447	}
3228		3448
3229	wantarray ? @res : $res[0]	3449	wantarray ? @res : $res[0]
3230	}	3450	}
3231		3451
…		…
3245	=cut	3465	=cut
3246		3466
3247	sub register_script_function {	3467	sub register_script_function {
3248	my ($fun, $cb) = @_;	3468	my ($fun, $cb) = @_;
3249		3469
3250	no strict 'refs';	3470	$fun = "safe::$fun" if $CFG{safe_eval};
3251	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3471	*$fun = $safe_hole->wrap ($cb);
3252	}	3472	}
3253		3473
3254	=back	3474	=back
3255		3475
3256	=cut	3476	=cut
3257		3477
3258	#############################################################################	3478	#############################################################################
3259	# the server's init and main functions	3479	# the server's init and main functions
		3480
		3481	our %FACEHASH; # hash => idx, #d# HACK for http server
		3482
		3483	# internal api, not fianlised
		3484	sub add_face {
		3485	my ($name, $type, $data) = @_;
		3486
		3487	my $idx = cf::face::find $name;
		3488
		3489	if ($idx) {
		3490	delete $FACEHASH{cf::face::get_chksum $idx};
		3491	} else {
		3492	$idx = cf::face::alloc $name;
		3493	}
		3494
		3495	my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
		3496
		3497	cf::face::set_type $idx, $type;
		3498	cf::face::set_data $idx, 0, $data, $hash;
		3499	cf::face::set_meta $idx, $type & 1 ? undef : undef;
		3500	$FACEHASH{$hash} = $idx;#d#
		3501
		3502	$idx
		3503	}
3260		3504
3261	sub load_facedata($) {	3505	sub load_facedata($) {
3262	my ($path) = @_;	3506	my ($path) = @_;
3263		3507
3264	# HACK to clear player env face cache, we need some signal framework	3508	# HACK to clear player env face cache, we need some signal framework
3265	# for this (global event?)	3509	# for this (global event?)
3266	%ext::player_env::MUSIC_FACE_CACHE = ();	3510	%ext::player_env::MUSIC_FACE_CACHE = ();
3267		3511
3268	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3512	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3269		3513
3270	warn "loading facedata from $path\n";	3514	trace "loading facedata from $path\n";
3271		3515
3272	my $facedata;	3516	my $facedata = decode_storable load_file $path;
3273	0 < aio_load $path, $facedata
3274	or die "$path: $!";
3275
3276	$facedata = Coro::Storable::thaw $facedata;
3277		3517
3278	$facedata->{version} == 2	3518	$facedata->{version} == 2
3279	or cf::cleanup "$path: version mismatch, cannot proceed.";	3519	or cf::cleanup "$path: version mismatch, cannot proceed.";
3280		3520
3281	# patch in the exptable
3282	$facedata->{resource}{"res/exp_table"} = {
3283	type => FT_RSRC,
3284	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3285	};
3286	cf::cede_to_tick;	3521	cf::cede_to_tick;
3287		3522
3288	{	3523	{
3289	my $faces = $facedata->{faceinfo};	3524	my $faces = $facedata->{faceinfo};
3290		3525
3291	while (my ($face, $info) = each %$faces) {	3526	for my $face (sort keys %$faces) {
		3527	my $info = $faces->{$face};
3292	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3528	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3293		3529
3294	cf::face::set_visibility $idx, $info->{visibility};	3530	cf::face::set_visibility $idx, $info->{visibility};
3295	cf::face::set_magicmap $idx, $info->{magicmap};	3531	cf::face::set_magicmap $idx, $info->{magicmap};
3296	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3532	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3297	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3533	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
		3534	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
		3535	$FACEHASH{$info->{hash64}} = $idx;#d#
3298		3536
3299	cf::cede_to_tick;	3537	cf::cede_to_tick;
3300	}	3538	}
3301		3539
3302	while (my ($face, $info) = each %$faces) {	3540	while (my ($face, $info) = each %$faces) {
…		…
3307		3545
3308	if (my $smooth = cf::face::find $info->{smooth}) {	3546	if (my $smooth = cf::face::find $info->{smooth}) {
3309	cf::face::set_smooth $idx, $smooth;	3547	cf::face::set_smooth $idx, $smooth;
3310	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3548	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3311	} else {	3549	} else {
3312	warn "smooth face '$info->{smooth}' not found for face '$face'";	3550	error "smooth face '$info->{smooth}' not found for face '$face'";
3313	}	3551	}
3314		3552
3315	cf::cede_to_tick;	3553	cf::cede_to_tick;
3316	}	3554	}
3317	}	3555	}
…		…
3329		3567
3330	{	3568	{
3331	my $res = $facedata->{resource};	3569	my $res = $facedata->{resource};
3332		3570
3333	while (my ($name, $info) = each %$res) {	3571	while (my ($name, $info) = each %$res) {
3334	if (defined $info->{type}) {	3572	if (defined (my $type = $info->{type})) {
		3573	# TODO: different hash - must free and use new index, or cache ixface data queue
3335	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3574	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3336		3575
		3576	cf::face::set_type $idx, $type;
3337	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3577	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3338	cf::face::set_type $idx, $info->{type};	3578	cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3579	$FACEHASH{$info->{hash}} = $idx;#d#
3339	} else {	3580	} else {
3340	$RESOURCE{$name} = $info;	3581	# $RESOURCE{$name} = $info; # unused
3341	}	3582	}
3342		3583
3343	cf::cede_to_tick;	3584	cf::cede_to_tick;
3344	}	3585	}
3345	}	3586	}
3346		3587
3347	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3588	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3348		3589
3349	1	3590	1
3350	}	3591	}
3351
3352	cf::global->attach (on_resource_update => sub {
3353	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3354	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3355
3356	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3357	my $sound = $soundconf->{compat}[$_]
3358	or next;
3359
3360	my $face = cf::face::find "sound/$sound->[1]";
3361	cf::sound::set $sound->[0] => $face;
3362	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3363	}
3364
3365	while (my ($k, $v) = each %{$soundconf->{event}}) {
3366	my $face = cf::face::find "sound/$v";
3367	cf::sound::set $k => $face;
3368	}
3369	}
3370	});
3371		3592
3372	register_exticmd fx_want => sub {	3593	register_exticmd fx_want => sub {
3373	my ($ns, $want) = @_;	3594	my ($ns, $want) = @_;
3374		3595
3375	while (my ($k, $v) = each %$want) {	3596	while (my ($k, $v) = each %$want) {
…		…
3383	my $status = load_resource_file_ $_[0];	3604	my $status = load_resource_file_ $_[0];
3384	get_slot 0.1, 100;	3605	get_slot 0.1, 100;
3385	cf::arch::commit_load;	3606	cf::arch::commit_load;
3386		3607
3387	$status	3608	$status
		3609	}
		3610
		3611	sub reload_exp_table {
		3612	_reload_exp_table;
		3613
		3614	add_face "res/exp_table" => FT_RSRC,
		3615	JSON::XS->new->utf8->canonical->encode (
		3616	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3617	);
		3618	}
		3619
		3620	sub reload_materials {
		3621	_reload_materials;
3388	}	3622	}
3389		3623
3390	sub reload_regions {	3624	sub reload_regions {
3391	# HACK to clear player env face cache, we need some signal framework	3625	# HACK to clear player env face cache, we need some signal framework
3392	# for this (global event?)	3626	# for this (global event?)
…		…
3407	}	3641	}
3408		3642
3409	sub reload_archetypes {	3643	sub reload_archetypes {
3410	load_resource_file "$DATADIR/archetypes"	3644	load_resource_file "$DATADIR/archetypes"
3411	or die "unable to load archetypes\n";	3645	or die "unable to load archetypes\n";
		3646
		3647	add_face "res/skill_info" => FT_RSRC,
		3648	JSON::XS->new->utf8->canonical->encode (
		3649	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3650	);
		3651	add_face "res/spell_paths" => FT_RSRC,
		3652	JSON::XS->new->utf8->canonical->encode (
		3653	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3654	);
3412	}	3655	}
3413		3656
3414	sub reload_treasures {	3657	sub reload_treasures {
3415	load_resource_file "$DATADIR/treasures"	3658	load_resource_file "$DATADIR/treasures"
3416	or die "unable to load treasurelists\n";	3659	or die "unable to load treasurelists\n";
3417	}	3660	}
3418		3661
		3662	sub reload_sound {
		3663	trace "loading sound config from $DATADIR/sound\n";
		3664
		3665	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3666
		3667	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3668	my $sound = $soundconf->{compat}[$_]
		3669	or next;
		3670
		3671	my $face = cf::face::find "sound/$sound->[1]";
		3672	cf::sound::set $sound->[0] => $face;
		3673	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3674	}
		3675
		3676	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3677	my $face = cf::face::find "sound/$v";
		3678	cf::sound::set $k => $face;
		3679	}
		3680	}
		3681
		3682	#d# move docstuff to help or so
		3683	our %DOCSTRING;
		3684
		3685	sub reload_pod {
		3686	trace "loading pods $PODDIR\n";
		3687
		3688	%DOCSTRING = ();
		3689	my @command_list;
		3690
		3691	for (
		3692	[0, "command_help"],
		3693	[1, "emote_help"],
		3694	[2, "dmcommand_help"],
		3695	) {
		3696	my ($type, $path) = @$_;
		3697
		3698	my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
		3699	or die "unable to load $path";
		3700
		3701	my $level = 1e9;
		3702	my $rpar;
		3703
		3704	for my $par (@$paragraphs) {
		3705	if ($par->{type} eq "head2") {
		3706	# this code taken almost verbatim from DC/Protocol.pm
		3707
		3708	if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
		3709	my $cmd = $1;
		3710	my @args = split /\|/, $2;
		3711	@args = (".*") unless @args;
		3712
		3713	$_ = $_ eq ".*" ? "" : " $_"
		3714	for @args;
		3715
		3716	my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
		3717
		3718	$rpar = \($DOCSTRING{"command/$cmd"} = &cf::pod::as_cfpod ([$par]));
		3719
		3720	push @command_list, [$type, \@variants];
		3721	$level = $par->{level};
		3722	} else {
		3723	error "$par->{markup}: unparsable command heading";
		3724	}
		3725	} elsif ($par->{level} > $level) {
		3726	$$rpar .= &cf::pod::as_cfpod ([$par]);
		3727	}
		3728
		3729	cf::cede_to_tick;
		3730	}
		3731	}
		3732
		3733	@command_list = sort {
		3734	$a->[0] <=> $b->[0]
		3735	or $a->[1] cmp $b->[1]
		3736	} @command_list;
		3737
		3738	cf::cede_to_tick;
		3739
		3740	add_face "res/command_list" => FT_RSRC,
		3741	JSON::XS->new->utf8->encode (\@command_list);
		3742	}
		3743
3419	sub reload_resources {	3744	sub reload_resources {
3420	warn "reloading resource files...\n";	3745	trace "reloading resource files...\n";
3421		3746
		3747	reload_materials;
3422	reload_facedata;	3748	reload_facedata;
		3749	reload_exp_table;
		3750	reload_sound;
3423	reload_archetypes;	3751	reload_archetypes;
3424	reload_regions;	3752	reload_regions;
3425	reload_treasures;	3753	reload_treasures;
		3754	reload_pod;
3426		3755
3427	warn "finished reloading resource files\n";	3756	trace "finished reloading resource files\n";
3428	}	3757	}
3429		3758
3430	sub reload_config {	3759	sub reload_config {
3431	warn "reloading config file...\n";	3760	trace "reloading config file...\n";
3432		3761
3433	open my $fh, "<:utf8", "$CONFDIR/config"	3762	my $config = load_file "$CONFDIR/config";
3434	or return;	3763	utf8::decode $config;
		3764	*CFG = decode_yaml $config;
3435		3765
3436	local $/;
3437	*CFG = YAML::XS::Load scalar <$fh>;
3438
3439	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3766	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3440		3767
3441	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3768	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3442	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3769	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3443		3770
3444	if (exists $CFG{mlockall}) {	3771	if (exists $CFG{mlockall}) {
…		…
3446	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3773	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3447	and die "WARNING: m(un)lockall failed: $!\n";	3774	and die "WARNING: m(un)lockall failed: $!\n";
3448	};	3775	};
3449	warn $@ if $@;	3776	warn $@ if $@;
3450	}	3777	}
3451
3452	warn "finished reloading resource files\n";
3453	}	3778	}
3454		3779
3455	sub pidfile() {	3780	sub pidfile() {
3456	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3781	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3457	or die "$PIDFILE: $!";	3782	or die "$PIDFILE: $!";
…		…
3470	seek $fh, 0, 0;	3795	seek $fh, 0, 0;
3471	print $fh $$;	3796	print $fh $$;
3472	}	3797	}
3473		3798
3474	sub main_loop {	3799	sub main_loop {
3475	warn "EV::loop starting\n";	3800	trace "EV::loop starting\n";
3476	if (1) {	3801	if (1) {
3477	EV::loop;	3802	EV::loop;
3478	}	3803	}
3479	warn "EV::loop returned\n";	3804	trace "EV::loop returned\n";
3480	goto &main_loop unless $REALLY_UNLOOP;	3805	goto &main_loop unless $REALLY_UNLOOP;
3481	}	3806	}
3482		3807
3483	sub main {	3808	sub main {
3484	cf::init_globals; # initialise logging	3809	cf::init_globals; # initialise logging
3485		3810
3486	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3811	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3487	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3812	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3488	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3813	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3489	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3814	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3490		3815
3491	cf::init_experience;
3492	cf::init_anim;
3493	cf::init_attackmess;
3494	cf::init_dynamic;
3495
3496	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3816	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3497		3817
3498	# we must not ever block the main coroutine	3818	# we must not ever block the main coroutine
3499	local $Coro::idle = sub {	3819	$Coro::idle = sub {
3500	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3820	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3501	(async {	3821	(async {
3502	$Coro::current->{desc} = "IDLE BUG HANDLER";	3822	$Coro::current->{desc} = "IDLE BUG HANDLER";
3503	EV::loop EV::LOOP_ONESHOT;	3823	EV::loop EV::LOOP_ONESHOT;
3504	})->prio (Coro::PRIO_MAX);	3824	})->prio (Coro::PRIO_MAX);
3505	};	3825	};
3506		3826
3507	evthread_start IO::AIO::poll_fileno;	3827	evthread_start IO::AIO::poll_fileno;
3508		3828
3509	cf::sync_job {	3829	cf::sync_job {
		3830	cf::incloader::init ();
		3831
		3832	db_init;
		3833
		3834	cf::init_anim;
		3835	cf::init_attackmess;
		3836	cf::init_dynamic;
		3837
3510	cf::load_settings;	3838	cf::load_settings;
3511	cf::load_materials;
3512		3839
3513	reload_resources;	3840	reload_resources;
3514	reload_config;	3841	reload_config;
3515	db_init;
3516		3842
3517	cf::init_uuid;	3843	cf::init_uuid;
3518	cf::init_signals;	3844	cf::init_signals;
3519	cf::init_commands;
3520	cf::init_skills;	3845	cf::init_skills;
3521		3846
3522	cf::init_beforeplay;	3847	cf::init_beforeplay;
3523		3848
3524	atomic;	3849	atomic;
…		…
3529		3854
3530	# no (long-running) fork's whatsoever before this point(!)	3855	# no (long-running) fork's whatsoever before this point(!)
3531	use POSIX ();	3856	use POSIX ();
3532	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3857	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3533		3858
3534	(pop @POST_INIT)->(0) while @POST_INIT;	3859	cf::_post_init 0;
3535	};	3860	};
3536		3861
		3862	cf::object::thawer::errors_are_fatal 0;
		3863	info "parse errors in files are no longer fatal from this point on.\n";
		3864
		3865	AE::postpone {
		3866	undef &main; # free gobs of memory :)
		3867	};
		3868
3537	main_loop;	3869	goto &main_loop;
3538	}	3870	}
3539		3871
3540	#############################################################################	3872	#############################################################################
3541	# initialisation and cleanup	3873	# initialisation and cleanup
3542		3874
3543	# install some emergency cleanup handlers	3875	# install some emergency cleanup handlers
3544	BEGIN {	3876	BEGIN {
3545	our %SIGWATCHER = ();	3877	our %SIGWATCHER = ();
3546	for my $signal (qw(INT HUP TERM)) {	3878	for my $signal (qw(INT HUP TERM)) {
3547	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3879	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3548	cf::cleanup "SIG$signal";	3880	cf::cleanup "SIG$signal";
3549	};	3881	};
3550	}	3882	}
3551	}	3883	}
3552		3884
3553	sub write_runtime_sync {	3885	sub write_runtime_sync {
		3886	my $t0 = AE::time;
		3887
3554	# first touch the runtime file to show we are still running:	3888	# first touch the runtime file to show we are still running:
3555	# the fsync below can take a very very long time.	3889	# the fsync below can take a very very long time.
3556		3890
3557	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3891	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3558		3892
3559	my $guard = cf::lock_acquire "write_runtime";	3893	my $guard = cf::lock_acquire "write_runtime";
3560		3894
3561	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3895	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3562	or return;	3896	or return;
3563		3897
3564	my $value = $cf::RUNTIME + 90 + 10;	3898	my $value = $cf::RUNTIME + 90 + 10;
3565	# 10 is the runtime save interval, for a monotonic clock	3899	# 10 is the runtime save interval, for a monotonic clock
3566	# 60 allows for the watchdog to kill the server.	3900	# 60 allows for the watchdog to kill the server.
…		…
3579	or return;	3913	or return;
3580		3914
3581	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3915	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3582	and return;	3916	and return;
3583		3917
3584	warn "runtime file written.\n";	3918	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3585		3919
3586	1	3920	1
3587	}	3921	}
3588		3922
3589	our $uuid_lock;	3923	our $uuid_lock;
…		…
3601	or return;	3935	or return;
3602		3936
3603	my $value = uuid_seq uuid_cur;	3937	my $value = uuid_seq uuid_cur;
3604		3938
3605	unless ($value) {	3939	unless ($value) {
3606	warn "cowardly refusing to write zero uuid value!\n";	3940	info "cowardly refusing to write zero uuid value!\n";
3607	return;	3941	return;
3608	}	3942	}
3609		3943
3610	my $value = uuid_str $value + $uuid_skip;	3944	my $value = uuid_str $value + $uuid_skip;
3611	$uuid_skip = 0;	3945	$uuid_skip = 0;
…		…
3621	or return;	3955	or return;
3622		3956
3623	aio_rename "$uuid~", $uuid	3957	aio_rename "$uuid~", $uuid
3624	and return;	3958	and return;
3625		3959
3626	warn "uuid file written ($value).\n";	3960	trace "uuid file written ($value).\n";
3627		3961
3628	1	3962	1
3629		3963
3630	}	3964	}
3631		3965
…		…
3637	}	3971	}
3638		3972
3639	sub emergency_save() {	3973	sub emergency_save() {
3640	my $freeze_guard = cf::freeze_mainloop;	3974	my $freeze_guard = cf::freeze_mainloop;
3641		3975
3642	warn "emergency_perl_save: enter\n";	3976	info "emergency_perl_save: enter\n";
		3977
		3978	# this is a trade-off: we want to be very quick here, so
		3979	# save all maps without fsync, and later call a global sync
		3980	# (which in turn might be very very slow)
		3981	local $USE_FSYNC = 0;
3643		3982
3644	cf::sync_job {	3983	cf::sync_job {
3645	# this is a trade-off: we want to be very quick here, so	3984	cf::write_runtime_sync; # external watchdog should not bark
3646	# save all maps without fsync, and later call a global sync
3647	# (which in turn might be very very slow)
3648	local $USE_FSYNC = 0;
3649		3985
3650	# use a peculiar iteration method to avoid tripping on perl	3986	# use a peculiar iteration method to avoid tripping on perl
3651	# refcount bugs in for. also avoids problems with players	3987	# refcount bugs in for. also avoids problems with players
3652	# and maps saved/destroyed asynchronously.	3988	# and maps saved/destroyed asynchronously.
3653	warn "emergency_perl_save: begin player save\n";	3989	info "emergency_perl_save: begin player save\n";
3654	for my $login (keys %cf::PLAYER) {	3990	for my $login (keys %cf::PLAYER) {
3655	my $pl = $cf::PLAYER{$login} or next;	3991	my $pl = $cf::PLAYER{$login} or next;
3656	$pl->valid or next;	3992	$pl->valid or next;
3657	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3993	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3658	$pl->save;	3994	$pl->save;
3659	}	3995	}
3660	warn "emergency_perl_save: end player save\n";	3996	info "emergency_perl_save: end player save\n";
3661		3997
		3998	cf::write_runtime_sync; # external watchdog should not bark
		3999
3662	warn "emergency_perl_save: begin map save\n";	4000	info "emergency_perl_save: begin map save\n";
3663	for my $path (keys %cf::MAP) {	4001	for my $path (keys %cf::MAP) {
3664	my $map = $cf::MAP{$path} or next;	4002	my $map = $cf::MAP{$path} or next;
3665	$map->valid or next;	4003	$map->valid or next;
3666	$map->save;	4004	$map->save;
3667	}	4005	}
3668	warn "emergency_perl_save: end map save\n";	4006	info "emergency_perl_save: end map save\n";
3669		4007
		4008	cf::write_runtime_sync; # external watchdog should not bark
		4009
3670	warn "emergency_perl_save: begin database checkpoint\n";	4010	info "emergency_perl_save: begin database checkpoint\n";
3671	BDB::db_env_txn_checkpoint $DB_ENV;	4011	BDB::db_env_txn_checkpoint $DB_ENV;
3672	warn "emergency_perl_save: end database checkpoint\n";	4012	info "emergency_perl_save: end database checkpoint\n";
3673		4013
3674	warn "emergency_perl_save: begin write uuid\n";	4014	info "emergency_perl_save: begin write uuid\n";
3675	write_uuid_sync 1;	4015	write_uuid_sync 1;
3676	warn "emergency_perl_save: end write uuid\n";	4016	info "emergency_perl_save: end write uuid\n";
		4017
		4018	cf::write_runtime_sync; # external watchdog should not bark
		4019
		4020	trace "emergency_perl_save: syncing database to disk";
		4021	BDB::db_env_txn_checkpoint $DB_ENV;
		4022
		4023	info "emergency_perl_save: starting sync\n";
		4024	IO::AIO::aio_sync sub {
		4025	info "emergency_perl_save: finished sync\n";
		4026	};
		4027
		4028	cf::write_runtime_sync; # external watchdog should not bark
		4029
		4030	trace "emergency_perl_save: flushing outstanding aio requests";
		4031	while (IO::AIO::nreqs || BDB::nreqs) {
		4032	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
		4033	}
		4034
		4035	cf::write_runtime_sync; # external watchdog should not bark
3677	};	4036	};
3678		4037
3679	warn "emergency_perl_save: starting sync()\n";
3680	IO::AIO::aio_sync sub {
3681	warn "emergency_perl_save: finished sync()\n";
3682	};
3683
3684	warn "emergency_perl_save: leave\n";	4038	info "emergency_perl_save: leave\n";
3685	}	4039	}
3686		4040
3687	sub post_cleanup {	4041	sub post_cleanup {
3688	my ($make_core) = @_;	4042	my ($make_core) = @_;
3689		4043
		4044	IO::AIO::flush;
		4045
3690	warn Carp::longmess "post_cleanup backtrace"	4046	error Carp::longmess "post_cleanup backtrace"
3691	if $make_core;	4047	if $make_core;
3692		4048
3693	my $fh = pidfile;	4049	my $fh = pidfile;
3694	unlink $PIDFILE if <$fh> == $$;	4050	unlink $PIDFILE if <$fh> == $$;
3695	}	4051	}
…		…
3715	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	4071	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3716	for my $name (keys %$leaf_symtab) {	4072	for my $name (keys %$leaf_symtab) {
3717	_gv_clear *{"$pkg$name"};	4073	_gv_clear *{"$pkg$name"};
3718	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	4074	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3719	}	4075	}
3720	warn "cleared package $pkg\n";#d#
3721	}	4076	}
3722		4077
3723	sub do_reload_perl() {	4078	sub do_reload_perl() {
3724	# can/must only be called in main	4079	# can/must only be called in main
3725	if ($Coro::current != $Coro::main) {	4080	unless (in_main) {
3726	warn "can only reload from main coroutine";	4081	error "can only reload from main coroutine";
3727	return;	4082	return;
3728	}	4083	}
3729		4084
3730	return if $RELOAD++;	4085	return if $RELOAD++;
3731		4086
3732	my $t1 = EV::time;	4087	my $t1 = AE::time;
3733		4088
3734	while ($RELOAD) {	4089	while ($RELOAD) {
3735	warn "reloading...";	4090	cf::get_slot 0.1, -1, "reload_perl";
		4091	info "perl_reload: reloading...";
3736		4092
3737	warn "entering sync_job";	4093	trace "perl_reload: entering sync_job";
3738		4094
3739	cf::sync_job {	4095	cf::sync_job {
3740	cf::write_runtime_sync; # external watchdog should not bark
3741	cf::emergency_save;	4096	#cf::emergency_save;
3742	cf::write_runtime_sync; # external watchdog should not bark
3743		4097
3744	warn "syncing database to disk";
3745	BDB::db_env_txn_checkpoint $DB_ENV;
3746
3747	# if anything goes wrong in here, we should simply crash as we already saved
3748
3749	warn "flushing outstanding aio requests";
3750	while (IO::AIO::nreqs || BDB::nreqs) {
3751	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3752	}
3753
3754	warn "cancelling all extension coros";	4098	trace "perl_reload: cancelling all extension coros";
3755	$_->cancel for values %EXT_CORO;	4099	$_->cancel for values %EXT_CORO;
3756	%EXT_CORO = ();	4100	%EXT_CORO = ();
3757		4101
3758	warn "removing commands";	4102	trace "perl_reload: removing commands";
3759	%COMMAND = ();	4103	%COMMAND = ();
3760		4104
3761	warn "removing ext/exti commands";	4105	trace "perl_reload: removing ext/exti commands";
3762	%EXTCMD = ();	4106	%EXTCMD = ();
3763	%EXTICMD = ();	4107	%EXTICMD = ();
3764		4108
3765	warn "unloading/nuking all extensions";	4109	trace "perl_reload: unloading/nuking all extensions";
3766	for my $pkg (@EXTS) {	4110	for my $pkg (@EXTS) {
3767	warn "... unloading $pkg";	4111	trace "... unloading $pkg";
3768		4112
3769	if (my $cb = $pkg->can ("unload")) {	4113	if (my $cb = $pkg->can ("unload")) {
3770	eval {	4114	eval {
3771	$cb->($pkg);	4115	$cb->($pkg);
3772	1	4116	1
3773	} or warn "$pkg unloaded, but with errors: $@";	4117	} or error "$pkg unloaded, but with errors: $@";
3774	}	4118	}
3775		4119
3776	warn "... clearing $pkg";	4120	trace "... clearing $pkg";
3777	clear_package $pkg;	4121	clear_package $pkg;
3778	}	4122	}
3779		4123
3780	warn "unloading all perl modules loaded from $LIBDIR";	4124	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3781	while (my ($k, $v) = each %INC) {	4125	while (my ($k, $v) = each %INC) {
3782	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4126	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3783		4127
3784	warn "... unloading $k";	4128	trace "... unloading $k";
3785	delete $INC{$k};	4129	delete $INC{$k};
3786		4130
3787	$k =~ s/\.pm$//;	4131	$k =~ s/\.pm$//;
3788	$k =~ s/\//::/g;	4132	$k =~ s/\//::/g;
3789		4133
…		…
3792	}	4136	}
3793		4137
3794	clear_package $k;	4138	clear_package $k;
3795	}	4139	}
3796		4140
3797	warn "getting rid of safe::, as good as possible";	4141	trace "perl_reload: getting rid of safe::, as good as possible";
3798	clear_package "safe::$_"	4142	clear_package "safe::$_"
3799	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4143	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3800		4144
3801	warn "unloading cf.pm \"a bit\"";	4145	trace "perl_reload: unloading cf.pm \"a bit\"";
3802	delete $INC{"cf.pm"};	4146	delete $INC{"cf.pm"};
3803	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4147	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3804		4148
3805	# don't, removes xs symbols, too,	4149	# don't, removes xs symbols, too,
3806	# and global variables created in xs	4150	# and global variables created in xs
3807	#clear_package __PACKAGE__;	4151	#clear_package __PACKAGE__;
3808		4152
3809	warn "unload completed, starting to reload now";	4153	info "perl_reload: unload completed, starting to reload now";
3810		4154
3811	warn "reloading cf.pm";	4155	trace "perl_reload: reloading cf.pm";
3812	require cf;	4156	require cf;
3813	cf::_connect_to_perl_1;	4157	cf::_connect_to_perl_1;
3814		4158
3815	warn "loading config and database again";	4159	trace "perl_reload: loading config and database again";
3816	cf::reload_config;	4160	cf::reload_config;
3817		4161
3818	warn "loading extensions";	4162	trace "perl_reload: loading extensions";
3819	cf::load_extensions;	4163	cf::load_extensions;
3820		4164
3821	if ($REATTACH_ON_RELOAD) {	4165	if ($REATTACH_ON_RELOAD) {
3822	warn "reattaching attachments to objects/players";	4166	trace "perl_reload: reattaching attachments to objects/players";
3823	_global_reattach; # objects, sockets	4167	_global_reattach; # objects, sockets
3824	warn "reattaching attachments to maps";	4168	trace "perl_reload: reattaching attachments to maps";
3825	reattach $_ for values %MAP;	4169	reattach $_ for values %MAP;
3826	warn "reattaching attachments to players";	4170	trace "perl_reload: reattaching attachments to players";
3827	reattach $_ for values %PLAYER;	4171	reattach $_ for values %PLAYER;
3828	}	4172	}
3829		4173
3830	warn "running post_init jobs";	4174	cf::_post_init 1;
3831	(pop @POST_INIT)->(1) while @POST_INIT;
3832		4175
3833	warn "leaving sync_job";	4176	trace "perl_reload: leaving sync_job";
3834		4177
3835	1	4178	1
3836	} or do {	4179	} or do {
3837	warn $@;	4180	error $@;
3838	cf::cleanup "error while reloading, exiting.";	4181	cf::cleanup "perl_reload: error, exiting.";
3839	};	4182	};
3840		4183
3841	warn "reloaded";
3842	--$RELOAD;	4184	--$RELOAD;
3843	}	4185	}
3844		4186
3845	$t1 = EV::time - $t1;	4187	$t1 = AE::time - $t1;
3846	warn "reload completed in ${t1}s\n";	4188	info "perl_reload: completed in ${t1}s\n";
3847	};	4189	};
3848		4190
3849	our $RELOAD_WATCHER; # used only during reload	4191	our $RELOAD_WATCHER; # used only during reload
3850		4192
3851	sub reload_perl() {	4193	sub reload_perl() {
…		…
3853	# coro crashes during coro_state_free->destroy here.	4195	# coro crashes during coro_state_free->destroy here.
3854		4196
3855	$RELOAD_WATCHER ||= cf::async {	4197	$RELOAD_WATCHER ||= cf::async {
3856	Coro::AIO::aio_wait cache_extensions;	4198	Coro::AIO::aio_wait cache_extensions;
3857		4199
3858	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	4200	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3859	do_reload_perl;	4201	do_reload_perl;
3860	undef $RELOAD_WATCHER;	4202	undef $RELOAD_WATCHER;
3861	};	4203	};
3862	};	4204	};
3863	}	4205	}
…		…
3872	reload_perl;	4214	reload_perl;
3873	};	4215	};
3874	}	4216	}
3875	};	4217	};
3876		4218
3877	unshift @INC, $LIBDIR;	4219	#############################################################################
3878		4220
3879	my $bug_warning = 0;	4221	my $bug_warning = 0;
3880		4222
3881	our @WAIT_FOR_TICK;
3882	our @WAIT_FOR_TICK_BEGIN;
3883
3884	sub wait_for_tick {	4223	sub wait_for_tick() {
3885	return if tick_inhibit || $Coro::current == $Coro::main;	4224	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3886		4225
3887	my $signal = new Coro::Signal;	4226	$WAIT_FOR_TICK->wait;
3888	push @WAIT_FOR_TICK, $signal;
3889	$signal->wait;
3890	}	4227	}
3891		4228
3892	sub wait_for_tick_begin {	4229	sub wait_for_tick_begin() {
3893	return if tick_inhibit || $Coro::current == $Coro::main;	4230	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3894		4231
3895	my $signal = new Coro::Signal;	4232	my $signal = new Coro::Signal;
3896	push @WAIT_FOR_TICK_BEGIN, $signal;	4233	push @WAIT_FOR_TICK_BEGIN, $signal;
3897	$signal->wait;	4234	$signal->wait;
3898	}	4235	}
…		…
3902	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4239	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3903	unless ++$bug_warning > 10;	4240	unless ++$bug_warning > 10;
3904	return;	4241	return;
3905	}	4242	}
3906		4243
3907	cf::server_tick; # one server iteration	4244	cf::one_tick; # one server iteration
		4245
		4246	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3908		4247
3909	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4248	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3910	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4249	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3911	Coro::async_pool {	4250	Coro::async_pool {
3912	$Coro::current->{desc} = "runtime saver";	4251	$Coro::current->{desc} = "runtime saver";
3913	write_runtime_sync	4252	write_runtime_sync
3914	or warn "ERROR: unable to write runtime file: $!";	4253	or error "ERROR: unable to write runtime file: $!";
3915	};	4254	};
3916	}	4255	}
3917		4256
3918	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4257	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3919	$sig->send;	4258	$sig->send;
3920	}	4259	}
3921	while (my $sig = shift @WAIT_FOR_TICK) {	4260	$WAIT_FOR_TICK->broadcast;
3922	$sig->send;
3923	}
3924		4261
3925	$LOAD = ($NOW - $TICK_START) / $TICK;	4262	$LOAD = ($NOW - $TICK_START) / $TICK;
3926	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4263	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3927		4264
3928	if (0) {	4265	if (0) {
3929	if ($NEXT_TICK) {	4266	if ($NEXT_TICK) {
3930	my $jitter = $TICK_START - $NEXT_TICK;	4267	my $jitter = $TICK_START - $NEXT_TICK;
3931	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4268	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3932	warn "jitter $JITTER\n";#d#	4269	debug "jitter $JITTER\n";#d#
3933	}	4270	}
3934	}	4271	}
3935	}	4272	}
3936		4273
3937	{	4274	{
3938	# configure BDB	4275	# configure BDB
		4276	info "initialising database";
3939		4277
3940	BDB::min_parallel 8;	4278	BDB::min_parallel 16;
3941	BDB::max_poll_reqs $TICK * 0.1;	4279	BDB::max_poll_reqs $TICK * 0.1;
3942	$AnyEvent::BDB::WATCHER->priority (1);	4280	#$AnyEvent::BDB::WATCHER->priority (1);
3943		4281
3944	unless ($DB_ENV) {	4282	unless ($DB_ENV) {
3945	$DB_ENV = BDB::db_env_create;	4283	$DB_ENV = BDB::db_env_create;
3946	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4284	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3947	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4285	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
3972	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4310	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3973	};	4311	};
3974	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4312	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3975	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4313	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3976	};	4314	};
		4315
		4316	info "database initialised";
3977	}	4317	}
3978		4318
3979	{	4319	{
3980	# configure IO::AIO	4320	# configure IO::AIO
3981		4321
		4322	info "initialising aio";
3982	IO::AIO::min_parallel 8;	4323	IO::AIO::min_parallel 8;
3983	IO::AIO::max_poll_time $TICK * 0.1;	4324	IO::AIO::max_poll_time $TICK * 0.1;
3984	undef $AnyEvent::AIO::WATCHER;	4325	undef $AnyEvent::AIO::WATCHER;
		4326	info "aio initialised";
3985	}	4327	}
3986		4328
3987	my $_log_backtrace;	4329	our $_log_backtrace;
		4330	our $_log_backtrace_last;
3988		4331
3989	sub _log_backtrace {	4332	sub _log_backtrace {
3990	my ($msg, @addr) = @_;	4333	my ($msg, @addr) = @_;
3991		4334
3992	$msg =~ s/\n//;	4335	$msg =~ s/\n$//;
3993		4336
		4337	if ($_log_backtrace_last eq $msg) {
		4338	LOG llevInfo, "[ABT] $msg\n";
		4339	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3994	# limit the # of concurrent backtraces	4340	# limit the # of concurrent backtraces
3995	if ($_log_backtrace < 2) {	4341	} elsif ($_log_backtrace < 2) {
		4342	$_log_backtrace_last = $msg;
3996	++$_log_backtrace;	4343	++$_log_backtrace;
3997	my $perl_bt = Carp::longmess $msg;	4344	my $perl_bt = Carp::longmess $msg;
3998	async {	4345	async {
3999	$Coro::current->{desc} = "abt $msg";	4346	$Coro::current->{desc} = "abt $msg";
4000		4347
…		…
4020	LOG llevInfo, "[ABT] $_\n" for @bt;	4367	LOG llevInfo, "[ABT] $_\n" for @bt;
4021	--$_log_backtrace;	4368	--$_log_backtrace;
4022	};	4369	};
4023	} else {	4370	} else {
4024	LOG llevInfo, "[ABT] $msg\n";	4371	LOG llevInfo, "[ABT] $msg\n";
4025	LOG llevInfo, "[ABT] [suppressed]\n";	4372	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4026	}	4373	}
4027	}	4374	}
4028		4375
4029	# load additional modules	4376	# load additional modules
4030	require "cf/$_.pm" for @EXTRA_MODULES;	4377	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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