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.508 by root, Sun Mar 28 22:29:50 2010 UTC vs.
Revision 1.595 by root, Fri Nov 9 16:27:55 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,2009,2010 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 = ();
		92	our %EXTACMD = ();
88	our %EXTICMD = ();	93	our %EXTICMD = ();
		94	our %EXTIACMD = ();
89	our %EXT_CORO = (); # coroutines bound to extensions	95	our %EXT_CORO = (); # coroutines bound to extensions
90	our %EXT_MAP = (); # pluggable maps	96	our %EXT_MAP = (); # pluggable maps
91		97
92	our $RELOAD; # number of reloads so far, non-zero while in reload	98	our $RELOAD; # number of reloads so far, non-zero while in reload
93	our @EVENT;	99	our @EVENT;
94	our @REFLECT; # set by XS	100	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	101	our %REFLECT; # set by us
96		102
97	our $CONFDIR = confdir;	103	our $CONFDIR = confdir;
		104
98	our $DATADIR = datadir;	105	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	106	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	107	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	108	our $MAPDIR = "$DATADIR/" . mapdir;
		109
102	our $LOCALDIR = localdir;	110	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	111	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	112	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	113	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	114	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	115	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	116	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	117	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		118
111	our %RESOURCE;	119	#our %RESOURCE; # unused
		120
		121	our $OUTPUT_RATE_MIN = 3000;
		122	our $OUTPUT_RATE_MAX = 1000000;
		123
		124	our $MAX_LINKS = 32; # how many chained exits to follow
		125	our $VERBOSE_IO = 1;
112		126
113	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	127	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	128	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115	our $NEXT_TICK;	129	our $NEXT_TICK;
116	our $USE_FSYNC = 1; # use fsync to write maps - default on	130	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
118	our $BDB_DEADLOCK_WATCHER;	132	our $BDB_DEADLOCK_WATCHER;
119	our $BDB_CHECKPOINT_WATCHER;	133	our $BDB_CHECKPOINT_WATCHER;
120	our $BDB_TRICKLE_WATCHER;	134	our $BDB_TRICKLE_WATCHER;
121	our $DB_ENV;	135	our $DB_ENV;
122		136
123	our @EXTRA_MODULES = qw(pod match mapscript);	137	our @EXTRA_MODULES = qw(pod match mapscript incloader);
124		138
125	our %CFG;	139	our %CFG;
		140	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
126		141
127	our $UPTIME; $UPTIME ||= time;	142	our $UPTIME; $UPTIME ||= time;
128	our $RUNTIME;	143	our $RUNTIME = 0;
		144	our $SERVER_TICK = 0;
129	our $NOW;	145	our $NOW;
130		146
131	our (%PLAYER, %PLAYER_LOADING); # all users	147	our (%PLAYER, %PLAYER_LOADING); # all users
132	our (%MAP, %MAP_LOADING ); # all maps	148	our (%MAP, %MAP_LOADING ); # all maps
133	our $LINK_MAP; # the special {link} map, which is always available	149	our $LINK_MAP; # the special {link} map, which is always available
…		…
142		158
143	our @POST_INIT;	159	our @POST_INIT;
144		160
145	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	161	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146	our $REALLY_UNLOOP; # never set to true, please :)	162	our $REALLY_UNLOOP; # never set to true, please :)
		163
		164	our $WAIT_FOR_TICK = new Coro::Signal;
		165	our @WAIT_FOR_TICK_BEGIN;
147		166
148	binmode STDOUT;	167	binmode STDOUT;
149	binmode STDERR;	168	binmode STDERR;
150		169
151	# read virtual server time, if available	170	# read virtual server time, if available
…		…
162		181
163	our $EMERGENCY_POSITION;	182	our $EMERGENCY_POSITION;
164		183
165	sub cf::map::normalise;	184	sub cf::map::normalise;
166		185
		186	sub in_main() {
		187	$Coro::current == $Coro::main
		188	}
		189
167	#############################################################################	190	#############################################################################
168		191
169	%REFLECT = ();	192	%REFLECT = ();
170	for (@REFLECT) {	193	for (@REFLECT) {
171	my $reflect = JSON::XS::decode_json $_;	194	my $reflect = JSON::XS::decode_json $_;
…		…
181		204
182	=over 4	205	=over 4
183		206
184	=item $cf::UPTIME	207	=item $cf::UPTIME
185		208
186	The timestamp of the server start (so not actually an uptime).	209	The timestamp of the server start (so not actually an "uptime").
		210
		211	=item $cf::SERVER_TICK
		212
		213	An unsigned integer that starts at zero when the server is started and is
		214	incremented on every tick.
		215
		216	=item $cf::NOW
		217
		218	The (real) time of the last (current) server tick - updated before and
		219	after tick processing, so this is useful only as a rough "what time is it
		220	now" estimate.
		221
		222	=item $cf::TICK
		223
		224	The interval between each server tick, in seconds.
187		225
188	=item $cf::RUNTIME	226	=item $cf::RUNTIME
189		227
190	The time this server has run, starts at 0 and is increased by $cf::TICK on	228	The time this server has run, starts at 0 and is increased by $cf::TICK on
191	every server tick.	229	every server tick.
192		230
193	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	231	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
194	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	232	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
195	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	233	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
196		234
197	Various directories - "/etc", read-only install directory, perl-library	235	Various directories - "/etc", read-only install directory, perl-library
198	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	236	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
199	unique-items directory, player file directory, random maps directory and	237	unique-items directory, player file directory, random maps directory and
200	database environment.	238	database environment.
201		239
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	240	=item $cf::LOADAVG
211		241
212	The current CPU load on the server (alpha-smoothed), as a value between 0	242	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	243	(none) and 1 (overloaded), indicating how much time is spent on processing
214	objects per tick. Healthy values are < 0.5.	244	objects per tick. Healthy values are < 0.5.
…		…
223	from wherever your confdir points to.	253	from wherever your confdir points to.
224		254
225	=item cf::wait_for_tick, cf::wait_for_tick_begin	255	=item cf::wait_for_tick, cf::wait_for_tick_begin
226		256
227	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	257	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	258	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.	259	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
		260
		261	Note that cf::Wait_for_tick will immediately return when the server is not
		262	ticking, making it suitable for small pauses in threads that need to run
		263	when the server is paused. If that is not applicable (i.e. you I<really>
		264	want to wait, use C<$cf::WAIT_FOR_TICK>).
		265
		266	=item $cf::WAIT_FOR_TICK
		267
		268	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		269	variable contains a L<Coro::Signal> that is broadcats after every server
		270	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		271	next server tick.
		272
		273	=cut
		274
		275	sub wait_for_tick();
		276	sub wait_for_tick_begin();
230		277
231	=item @cf::INVOKE_RESULTS	278	=item @cf::INVOKE_RESULTS
232		279
233	This array contains the results of the last C<invoke ()> call. When	280	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	281	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
…		…
242		289
243	=back	290	=back
244		291
245	=cut	292	=cut
246		293
		294	sub error(@) { LOG llevError, join "", @_ }
		295	sub warn (@) { LOG llevWarn , join "", @_ }
		296	sub info (@) { LOG llevInfo , join "", @_ }
		297	sub debug(@) { LOG llevDebug, join "", @_ }
		298	sub trace(@) { LOG llevTrace, join "", @_ }
		299
247	$Coro::State::WARNHOOK = sub {	300	$Coro::State::WARNHOOK = sub {
248	my $msg = join "", @_;	301	my $msg = join "", @_;
249		302
250	$msg .= "\n"	303	$msg .= "\n"
251	unless $msg =~ /\n$/;	304	unless $msg =~ /\n$/;
252		305
253	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	306	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
254		307
255	LOG llevError, $msg;	308	LOG llevWarn, $msg;
256	};	309	};
257		310
258	$Coro::State::DIEHOOK = sub {	311	$Coro::State::DIEHOOK = sub {
259	return unless $^S eq 0; # "eq", not "=="	312	return unless $^S eq 0; # "eq", not "=="
260		313
261	warn Carp::longmess $_[0];	314	error Carp::longmess $_[0];
262		315
263	if ($Coro::current == $Coro::main) {#d#	316	if (in_main) {#d#
264	warn "DIEHOOK called in main context, Coro bug?\n";#d#	317	error "DIEHOOK called in main context, Coro bug?\n";#d#
265	return;#d#	318	return;#d#
266	}#d#	319	}#d#
267		320
268	# kill coroutine otherwise	321	# kill coroutine otherwise
269	Coro::terminate	322	Coro::terminate
…		…
289	)) {	342	)) {
290	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	343	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
291	}	344	}
292		345
293	$EV::DIED = sub {	346	$EV::DIED = sub {
294	Carp::cluck "error in event callback: @_";	347	warn "error in event callback: $@";
295	};	348	};
		349
		350	#############################################################################
		351
		352	sub fork_call(&@);
		353	sub get_slot($;$$);
296		354
297	#############################################################################	355	#############################################################################
298		356
299	=head2 UTILITY FUNCTIONS	357	=head2 UTILITY FUNCTIONS
300		358
…		…
321	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	379	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
322	$d	380	$d
323	} || "[unable to dump $_[0]: '$@']";	381	} || "[unable to dump $_[0]: '$@']";
324	}	382	}
325		383
		384	=item $scalar = cf::load_file $path
		385
		386	Loads the given file from path and returns its contents. Croaks on error
		387	and can block.
		388
		389	=cut
		390
		391	sub load_file($) {
		392	0 <= aio_load $_[0], my $data
		393	or Carp::croak "$_[0]: $!";
		394
		395	$data
		396	}
		397
		398	=item $success = cf::replace_file $path, $data, $sync
		399
		400	Atomically replaces the file at the given $path with new $data, and
		401	optionally $sync the data to disk before replacing the file.
		402
		403	=cut
		404
		405	sub replace_file($$;$) {
		406	my ($path, $data, $sync) = @_;
		407
		408	my $lock = cf::lock_acquire ("replace_file:$path");
		409
		410	my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
		411	or return;
		412
		413	$data = $data->() if ref $data;
		414
		415	length $data == aio_write $fh, 0, (length $data), $data, 0
		416	or return;
		417
		418	!$sync
		419	or !aio_fsync $fh
		420	or return;
		421
		422	aio_close $fh
		423	and return;
		424
		425	aio_rename "$path~", $path
		426	and return;
		427
		428	if ($sync) {
		429	$path =~ s%/[^/]*$%%;
		430	aio_pathsync $path;
		431	}
		432
		433	1
		434	}
		435
326	=item $ref = cf::decode_json $json	436	=item $ref = cf::decode_json $json
327		437
328	Converts a JSON string into the corresponding perl data structure.	438	Converts a JSON string into the corresponding perl data structure.
329		439
330	=item $json = cf::encode_json $ref	440	=item $json = cf::encode_json $ref
…		…
336	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	446	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
337		447
338	sub encode_json($) { $json_coder->encode ($_[0]) }	448	sub encode_json($) { $json_coder->encode ($_[0]) }
339	sub decode_json($) { $json_coder->decode ($_[0]) }	449	sub decode_json($) { $json_coder->decode ($_[0]) }
340		450
		451	=item $ref = cf::decode_storable $scalar
		452
		453	Same as Coro::Storable::thaw, so blocks.
		454
		455	=cut
		456
		457	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		458
		459	=item $ref = cf::decode_yaml $scalar
		460
		461	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		462
		463	=cut
		464
		465	sub decode_yaml($) {
		466	fork_call { YAML::XS::Load $_[0] } @_
		467	}
		468
		469	=item $scalar = cf::unlzf $scalar
		470
		471	Same as Compress::LZF::compress, but takes server ticks into account, so
		472	blocks.
		473
		474	=cut
		475
		476	sub unlzf($) {
		477	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		478	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		479	Compress::LZF::decompress $_[0]
		480	}
		481
341	=item cf::post_init { BLOCK }	482	=item cf::post_init { BLOCK }
342		483
343	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	484	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344	but I<before> the server starts ticking again.	485	but I<before> the server starts ticking again.
345		486
346	The cdoeblock will have a single boolean argument to indicate whether this	487	The codeblock will have a single boolean argument to indicate whether this
347	is a reload or not.	488	is a reload or not.
348		489
349	=cut	490	=cut
350		491
351	sub post_init(&) {	492	sub post_init(&) {
352	push @POST_INIT, shift;	493	push @POST_INIT, shift;
		494	}
		495
		496	sub _post_init {
		497	trace "running post_init jobs";
		498
		499	# run them in parallel...
		500
		501	my @join;
		502
		503	while () {
		504	push @join, map &Coro::async ($_, 0), @POST_INIT;
		505	@POST_INIT = ();
		506
		507	@join or last;
		508
		509	(pop @join)->join;
		510	}
353	}	511	}
354		512
355	=item cf::lock_wait $string	513	=item cf::lock_wait $string
356		514
357	Wait until the given lock is available. See cf::lock_acquire.	515	Wait until the given lock is available. See cf::lock_acquire.
…		…
396	}	554	}
397		555
398	=item cf::periodic $interval, $cb	556	=item cf::periodic $interval, $cb
399		557
400	Like EV::periodic, but randomly selects a starting point so that the actions	558	Like EV::periodic, but randomly selects a starting point so that the actions
401	get spread over timer.	559	get spread over time.
402		560
403	=cut	561	=cut
404		562
405	sub periodic($$) {	563	sub periodic($$) {
406	my ($interval, $cb) = @_;	564	my ($interval, $cb) = @_;
…		…
410	EV::periodic $start, $interval, 0, $cb	568	EV::periodic $start, $interval, 0, $cb
411	}	569	}
412		570
413	=item cf::get_slot $time[, $priority[, $name]]	571	=item cf::get_slot $time[, $priority[, $name]]
414		572
415	Allocate $time seconds of blocking CPU time at priority C<$priority>:	573	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	574	(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.	575	C<$time> seconds of cpu time till the next tick. The slot is only valid
		576	till the next cede.
		577
		578	Background jobs should use a priority les than zero, interactive jobs
		579	should use 100 or more.
418		580
419	The optional C<$name> can be used to identify the job to run. It might be	581	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.	582	used for statistical purposes and should identify the same time-class.
421		583
422	Useful for short background jobs.	584	Useful for short background jobs.
…		…
451	}	613	}
452	}	614	}
453		615
454	if (@SLOT_QUEUE) {	616	if (@SLOT_QUEUE) {
455	# we do not use wait_for_tick() as it returns immediately when tick is inactive	617	# we do not use wait_for_tick() as it returns immediately when tick is inactive
456	push @cf::WAIT_FOR_TICK, $signal;	618	$WAIT_FOR_TICK->wait;
457	$signal->wait;
458	} else {	619	} else {
459	$busy = 0;	620	$busy = 0;
460	Coro::schedule;	621	Coro::schedule;
461	}	622	}
462	}	623	}
…		…
502	=cut	663	=cut
503		664
504	sub sync_job(&) {	665	sub sync_job(&) {
505	my ($job) = @_;	666	my ($job) = @_;
506		667
507	if ($Coro::current == $Coro::main) {	668	if (in_main) {
508	my $time = EV::time;	669	my $time = AE::time;
509		670
510	# this is the main coro, too bad, we have to block	671	# this is the main coro, too bad, we have to block
511	# till the operation succeeds, freezing the server :/	672	# till the operation succeeds, freezing the server :/
512		673
513	LOG llevError, Carp::longmess "sync job";#d#	674	#LOG llevError, Carp::longmess "sync job";#d#
514		675
515	my $freeze_guard = freeze_mainloop;	676	my $freeze_guard = freeze_mainloop;
516		677
517	my $busy = 1;	678	my $busy = 1;
518	my @res;	679	my @res;
519		680
520	(async {	681	(async {
521	$Coro::current->desc ("sync job coro");	682	$Coro::current->desc ("sync job coro");
522	@res = eval { $job->() };	683	@res = eval { $job->() };
523	warn $@ if $@;	684	error $@ if $@;
524	undef $busy;	685	undef $busy;
525	})->prio (Coro::PRIO_MAX);	686	})->prio (Coro::PRIO_MAX);
526		687
527	while ($busy) {	688	while ($busy) {
528	if (Coro::nready) {	689	if (Coro::nready) {
…		…
530	} else {	691	} else {
531	EV::loop EV::LOOP_ONESHOT;	692	EV::loop EV::LOOP_ONESHOT;
532	}	693	}
533	}	694	}
534		695
535	my $time = EV::time - $time;	696	my $time = AE::time - $time;
536		697
537	$TICK_START += $time; # do not account sync jobs to server load	698	$TICK_START += $time; # do not account sync jobs to server load
538		699
539	wantarray ? @res : $res[0]	700	wantarray ? @res : $res[0]
540	} else {	701	} else {
…		…
562	$EXT_CORO{$coro+0} = $coro;	723	$EXT_CORO{$coro+0} = $coro;
563		724
564	$coro	725	$coro
565	}	726	}
566		727
567	=item fork_call { }, $args	728	=item fork_call { }, @args
568		729
569	Executes the given code block with the given arguments in a seperate	730	Executes the given code block with the given arguments in a seperate
570	process, returning the results. Everything must be serialisable with	731	process, returning the results. Everything must be serialisable with
571	Coro::Storable. May, of course, block. Note that the executed sub may	732	Coro::Storable. May, of course, block. Note that the executed sub may
572	never block itself or use any form of event handling.	733	never block itself or use any form of event handling.
573		734
574	=cut	735	=cut
575		736
		737	sub post_fork {
		738	reset_signals;
		739	}
		740
576	sub fork_call(&@) {	741	sub fork_call(&@) {
577	my ($cb, @args) = @_;	742	my ($cb, @args) = @_;
578		743
579	# we seemingly have to make a local copy of the whole thing,	744	# we seemingly have to make a local copy of the whole thing,
580	# otherwise perl prematurely frees the stuff :/	745	# otherwise perl prematurely frees the stuff :/
581	# TODO: investigate and fix (likely this will be rather laborious)	746	# TODO: investigate and fix (likely this will be rather laborious)
582		747
583	my @res = Coro::Util::fork_eval {	748	my @res = Coro::Util::fork_eval {
584	reset_signals;	749	cf::post_fork;
585	&$cb	750	&$cb
586	}, @args;	751	} @args;
587		752
588	wantarray ? @res : $res[-1]	753	wantarray ? @res : $res[-1]
		754	}
		755
		756	sub objinfo {
		757	(
		758	"counter value" => cf::object::object_count,
		759	"objects created" => cf::object::create_count,
		760	"objects destroyed" => cf::object::destroy_count,
		761	"freelist size" => cf::object::free_count,
		762	"allocated objects" => cf::object::objects_size,
		763	"active objects" => cf::object::actives_size,
		764	)
589	}	765	}
590		766
591	=item $coin = coin_from_name $name	767	=item $coin = coin_from_name $name
592		768
593	=cut	769	=cut
…		…
630	within each server.	806	within each server.
631		807
632	=cut	808	=cut
633		809
634	sub db_table($) {	810	sub db_table($) {
		811	cf::error "db_get called from main context"
		812	if $Coro::current == $Coro::main;
		813
635	my ($name) = @_;	814	my ($name) = @_;
636	my $db = BDB::db_create $DB_ENV;	815	my $db = BDB::db_create $DB_ENV;
637		816
638	eval {	817	eval {
639	$db->set_flags (BDB::CHKSUM);	818	$db->set_flags (BDB::CHKSUM);
…		…
649	}	828	}
650		829
651	our $DB;	830	our $DB;
652		831
653	sub db_init {	832	sub db_init {
654	cf::sync_job {
655	$DB ||= db_table "db";	833	$DB ||= db_table "db";
656	};
657	}	834	}
658		835
659	sub db_get($$) {	836	sub db_get($$) {
660	my $key = "$_[0]/$_[1]";	837	my $key = "$_[0]/$_[1]";
661		838
662	cf::sync_job {	839	cf::error "db_get called from main context"
		840	if $Coro::current == $Coro::main;
		841
663	BDB::db_get $DB, undef, $key, my $data;	842	BDB::db_get $DB, undef, $key, my $data;
664		843
665	$! ? ()	844	$! ? ()
666	: $data	845	: $data
667	}
668	}	846	}
669		847
670	sub db_put($$$) {	848	sub db_put($$$) {
671	BDB::dbreq_pri 4;	849	BDB::dbreq_pri 4;
672	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	850	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
700		878
701	my @data;	879	my @data;
702	my $md5;	880	my $md5;
703		881
704	for (0 .. $#$src) {	882	for (0 .. $#$src) {
705	0 <= aio_load $src->[$_], $data[$_]	883	$data[$_] = load_file $src->[$_];
706	or Carp::croak "$src->[$_]: $!";
707	}	884	}
708		885
709	# if processing is expensive, check	886	# if processing is expensive, check
710	# checksum first	887	# checksum first
711	if (1) {	888	if (1) {
…		…
728		905
729	my $t1 = Time::HiRes::time;	906	my $t1 = Time::HiRes::time;
730	my $data = $process->(\@data);	907	my $data = $process->(\@data);
731	my $t2 = Time::HiRes::time;	908	my $t2 = Time::HiRes::time;
732		909
733	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	910	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
734		911
735	db_put cache => "$id/data", $data;	912	db_put cache => "$id/data", $data;
736	db_put cache => "$id/md5" , $md5;	913	db_put cache => "$id/md5" , $md5;
737	db_put cache => "$id/meta", $meta;	914	db_put cache => "$id/meta", $meta;
738		915
…		…
748		925
749	=cut	926	=cut
750		927
751	sub datalog($@) {	928	sub datalog($@) {
752	my ($type, %kv) = @_;	929	my ($type, %kv) = @_;
753	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	930	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
754	}	931	}
755		932
756	=back	933	=back
757		934
758	=cut	935	=cut
…		…
953		1130
954	} elsif (exists $cb_id{$type}) {	1131	} elsif (exists $cb_id{$type}) {
955	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1132	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
956		1133
957	} elsif (ref $type) {	1134	} elsif (ref $type) {
958	warn "attaching objects not supported, ignoring.\n";	1135	error "attaching objects not supported, ignoring.\n";
959		1136
960	} else {	1137	} else {
961	shift @arg;	1138	shift @arg;
962	warn "attach argument '$type' not supported, ignoring.\n";	1139	error "attach argument '$type' not supported, ignoring.\n";
963	}	1140	}
964	}	1141	}
965	}	1142	}
966		1143
967	sub _object_attach {	1144	sub _object_attach {
…		…
977	_attach $registry, $klass, @attach;	1154	_attach $registry, $klass, @attach;
978	}	1155	}
979		1156
980	$obj->{$name} = \%arg;	1157	$obj->{$name} = \%arg;
981	} else {	1158	} else {
982	warn "object uses attachment '$name' which is not available, postponing.\n";	1159	info "object uses attachment '$name' which is not available, postponing.\n";
983	}	1160	}
984		1161
985	$obj->{_attachment}{$name} = undef;	1162	$obj->{_attachment}{$name} = undef;
986	}	1163	}
987		1164
…		…
1046		1223
1047	for (@$callbacks) {	1224	for (@$callbacks) {
1048	eval { &{$_->[1]} };	1225	eval { &{$_->[1]} };
1049		1226
1050	if ($@) {	1227	if ($@) {
1051	warn "$@";
1052	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1228	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1053	override;	1229	override;
1054	}	1230	}
1055		1231
1056	return 1 if $override;	1232	return 1 if $override;
1057	}	1233	}
…		…
1136	for (@$attach) {	1312	for (@$attach) {
1137	my ($klass, @attach) = @$_;	1313	my ($klass, @attach) = @$_;
1138	_attach $registry, $klass, @attach;	1314	_attach $registry, $klass, @attach;
1139	}	1315	}
1140	} else {	1316	} else {
1141	warn "object uses attachment '$name' that is not available, postponing.\n";	1317	info "object uses attachment '$name' that is not available, postponing.\n";
1142	}	1318	}
1143	}	1319	}
1144	}	1320	}
1145		1321
1146	cf::attachable->attach (	1322	cf::attachable->attach (
…		…
1173	my ($filename, $rdata, $objs) = @_;	1349	my ($filename, $rdata, $objs) = @_;
1174		1350
1175	sync_job {	1351	sync_job {
1176	if (length $$rdata) {	1352	if (length $$rdata) {
1177	utf8::decode (my $decname = $filename);	1353	utf8::decode (my $decname = $filename);
1178	warn sprintf "saving %s (%d,%d)\n",	1354	trace sprintf "saving %s (%d,%d)\n",
1179	$decname, length $$rdata, scalar @$objs;	1355	$decname, length $$rdata, scalar @$objs
		1356	if $VERBOSE_IO;
1180		1357
1181	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1358	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182	aio_chmod $fh, SAVE_MODE;	1359	aio_chmod $fh, SAVE_MODE;
1183	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1360	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184	if ($cf::USE_FSYNC) {	1361	if ($cf::USE_FSYNC) {
…		…
1206	aio_rename "$filename~", $filename;	1383	aio_rename "$filename~", $filename;
1207		1384
1208	$filename =~ s%/[^/]+$%%;	1385	$filename =~ s%/[^/]+$%%;
1209	aio_pathsync $filename if $cf::USE_FSYNC;	1386	aio_pathsync $filename if $cf::USE_FSYNC;
1210	} else {	1387	} else {
1211	warn "unable to save objects: $filename~: $!\n";	1388	error "unable to save objects: $filename~: $!\n";
1212	}	1389	}
1213	} else {	1390	} else {
1214	aio_unlink $filename;	1391	aio_unlink $filename;
1215	aio_unlink "$filename.pst";	1392	aio_unlink "$filename.pst";
1216	}	1393	}
…		…
1240	my $st = eval { Coro::Storable::thaw $av };	1417	my $st = eval { Coro::Storable::thaw $av };
1241	$av = $st->{objs};	1418	$av = $st->{objs};
1242	}	1419	}
1243		1420
1244	utf8::decode (my $decname = $filename);	1421	utf8::decode (my $decname = $filename);
1245	warn sprintf "loading %s (%d,%d)\n",	1422	trace sprintf "loading %s (%d,%d)\n",
1246	$decname, length $data, scalar @{$av || []};	1423	$decname, length $data, scalar @{$av || []}
		1424	if $VERBOSE_IO;
1247		1425
1248	($data, $av)	1426	($data, $av)
1249	}	1427	}
1250		1428
1251	=head2 COMMAND CALLBACKS	1429	=head2 COMMAND CALLBACKS
…		…
1255	=cut	1433	=cut
1256		1434
1257	#############################################################################	1435	#############################################################################
1258	# command handling &c	1436	# command handling &c
1259		1437
1260	=item cf::register_command $name => \&callback($ob,$args);	1438	=item cf::register_command $name => \&callback($ob,$args)
1261		1439
1262	Register a callback for execution when the client sends the user command	1440	Register a callback for execution when the client sends the user command
1263	$name.	1441	$name.
1264		1442
1265	=cut	1443	=cut
…		…
1271	#warn "registering command '$name/$time' to '$caller'";	1449	#warn "registering command '$name/$time' to '$caller'";
1272		1450
1273	push @{ $COMMAND{$name} }, [$caller, $cb];	1451	push @{ $COMMAND{$name} }, [$caller, $cb];
1274	}	1452	}
1275		1453
1276	=item cf::register_extcmd $name => \&callback($pl,$packet);	1454	=item cf::register_extcmd $name => \&callback($pl,@args)
1277		1455
1278	Register a callback for execution when the client sends an (synchronous)	1456	Register a callback for execution when the client sends an (synchronous)
1279	extcmd packet. Ext commands will be processed in the order they are	1457	extcmd packet. Ext commands will be processed in the order they are
1280	received by the server, like other user commands. The first argument is	1458	received by the server, like other user commands. The first argument is
1281	the logged-in player. Ext commands can only be processed after a player	1459	the logged-in player. Ext commands can only be processed after a player
1282	has logged in successfully.	1460	has logged in successfully.
1283		1461
1284	If the callback returns something, it is sent back as if reply was being	1462	The values will be sent back to the client.
1285	called.
1286		1463
		1464	=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
		1465
		1466	Same as C<cf::register_extcmd>, but instead of returning values, the
		1467	callback needs to clal the C<$reply> function.
		1468
1287	=item cf::register_exticmd $name => \&callback($ns,$packet);	1469	=item cf::register_exticmd $name => \&callback($ns,@args)
1288		1470
1289	Register a callback for execution when the client sends an (asynchronous)	1471	Register a callback for execution when the client sends an (asynchronous)
1290	exticmd packet. Exti commands are processed by the server as soon as they	1472	exticmd packet. Exti commands are processed by the server as soon as they
1291	are received, i.e. out of order w.r.t. other commands. The first argument	1473	are received, i.e. out of order w.r.t. other commands. The first argument
1292	is a client socket. Exti commands can be received anytime, even before	1474	is a client socket. Exti commands can be received anytime, even before
1293	log-in.	1475	log-in.
1294		1476
1295	If the callback returns something, it is sent back as if reply was being	1477	The values will be sent back to the client.
1296	called.
1297		1478
1298	=cut	1479	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1299		1480
		1481	Same as C<cf::register_extcmd>, but instead of returning values, the
		1482	callback needs to clal the C<$reply> function.
		1483
		1484	=cut
		1485
1300	sub register_extcmd {	1486	sub register_extcmd($$) {
1301	my ($name, $cb) = @_;	1487	my ($name, $cb) = @_;
1302		1488
1303	$EXTCMD{$name} = $cb;	1489	$EXTCMD{$name} = $cb;
1304	}	1490	}
1305		1491
1306	sub register_exticmd {	1492	sub register_async_extcmd($$) {
1307	my ($name, $cb) = @_;	1493	my ($name, $cb) = @_;
1308		1494
		1495	$EXTACMD{$name} = $cb;
		1496	}
		1497
		1498	sub register_exticmd($$) {
		1499	my ($name, $cb) = @_;
		1500
1309	$EXTICMD{$name} = $cb;	1501	$EXTICMD{$name} = $cb;
1310	}	1502	}
1311		1503
		1504	sub register_async_exticmd($$) {
		1505	my ($name, $cb) = @_;
		1506
		1507	$EXTIACMD{$name} = $cb;
		1508	}
		1509
1312	use File::Glob ();	1510	use File::Glob ();
1313		1511
1314	cf::player->attach (	1512	cf::player->attach (
1315	on_command => sub {	1513	on_unknown_command => sub {
1316	my ($pl, $name, $params) = @_;	1514	my ($pl, $name, $params) = @_;
1317		1515
1318	my $cb = $COMMAND{$name}	1516	my $cb = $COMMAND{$name}
1319	or return;	1517	or return;
1320		1518
…		…
1328	my ($pl, $buf) = @_;	1526	my ($pl, $buf) = @_;
1329		1527
1330	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1528	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1331		1529
1332	if (ref $msg) {	1530	if (ref $msg) {
1333	my ($type, $reply, @payload) =	1531	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1334	"ARRAY" eq ref $msg
1335	? @$msg
1336	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1337		1532
1338	my @reply;
1339
1340	if (my $cb = $EXTCMD{$type}) {	1533	if (my $cb = $EXTACMD{$type}) {
		1534	$cb->(
		1535	$pl,
		1536	sub {
		1537	$pl->ext_msg ("reply-$reply", @_)
		1538	if $reply;
		1539	},
		1540	@payload
		1541	);
		1542	} else {
		1543	my @reply;
		1544
		1545	if (my $cb = $EXTCMD{$type}) {
1341	@reply = $cb->($pl, @payload);	1546	@reply = $cb->($pl, @payload);
		1547	}
		1548
		1549	$pl->ext_msg ("reply-$reply", @reply)
		1550	if $reply;
1342	}	1551	}
1343		1552
1344	$pl->ext_reply ($reply, @reply)
1345	if $reply;
1346
1347	} else {	1553	} else {
1348	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1554	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349	}	1555	}
1350		1556
1351	cf::override;	1557	cf::override;
1352	},	1558	},
1353	);	1559	);
…		…
1363	};	1569	};
1364		1570
1365	$grp	1571	$grp
1366	}	1572	}
1367		1573
		1574	sub _ext_cfg_reg($$$$) {
		1575	my ($rvar, $varname, $cfgname, $default) = @_;
		1576
		1577	$cfgname = lc $varname
		1578	unless length $cfgname;
		1579
		1580	$EXT_CFG{$cfgname} = [$rvar, $default];
		1581
		1582	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1583	}
		1584
1368	sub load_extensions {	1585	sub load_extensions {
		1586	info "loading extensions...";
		1587
		1588	%EXT_CFG = ();
		1589
1369	cf::sync_job {	1590	cf::sync_job {
1370	my %todo;	1591	my %todo;
1371		1592
1372	for my $path (<$LIBDIR/*.ext>) {	1593	for my $path (<$LIBDIR/*.ext>) {
1373	next unless -r $path;	1594	next unless -r $path;
…		…
1391		1612
1392	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1613	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1393	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1614	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1394		1615
1395	$ext{source} =	1616	$ext{source} =
1396	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1617	"package $pkg; use common::sense;\n"
1397	. "#line 1 \"$path\"\n{\n"	1618	. "#line 1 \"$path\"\n{\n"
1398	. $source	1619	. $source
1399	. "\n};\n1";	1620	. "\n};\n1";
1400		1621
1401	$todo{$base} = \%ext;	1622	$todo{$base} = \%ext;
…		…
1413	for (split /,\s*/, $v->{meta}{depends}) {	1634	for (split /,\s*/, $v->{meta}{depends}) {
1414	next ext	1635	next ext
1415	unless exists $done{$_};	1636	unless exists $done{$_};
1416	}	1637	}
1417		1638
1418	warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1639	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1419		1640
		1641	my $source = $v->{source};
		1642
		1643	# support "CONF varname :confname = default" pseudo-statements
		1644	$source =~ s{
		1645	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1646	}{
		1647	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1648	}gmxe;
		1649
1420	my $active = eval $v->{source};	1650	my $active = eval $source;
1421		1651
1422	if (length $@) {	1652	if (length $@) {
1423	warn "$v->{path}: $@\n";	1653	error "$v->{path}: $@\n";
1424		1654
1425	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1655	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426	if exists $v->{meta}{mandatory};	1656	if exists $v->{meta}{mandatory};
		1657
		1658	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1659	delete $todo{$k};
1427	} else {	1660	} else {
1428	$done{$k} = delete $todo{$k};	1661	$done{$k} = delete $todo{$k};
1429	push @EXTS, $v->{pkg};	1662	push @EXTS, $v->{pkg};
1430	$progress = 1;	1663	$progress = 1;
1431		1664
1432	warn "$v->{base}: extension inactive.\n"	1665	info "$v->{base}: extension inactive.\n"
1433	unless $active;	1666	unless $active;
1434	}	1667	}
1435	}	1668	}
1436		1669
1437	unless ($progress) {	1670	unless ($progress) {
…		…
1439		1672
1440	while (my ($k, $v) = each %todo) {	1673	while (my ($k, $v) = each %todo) {
1441	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1674	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442	if exists $v->{meta}{mandatory};	1675	if exists $v->{meta}{mandatory};
1443	}	1676	}
		1677
		1678	last;
1444	}	1679	}
1445	}	1680	}
1446	};	1681	};
1447	}	1682	}
1448		1683
…		…
1533	$cf::PLAYER{$login} = $pl	1768	$cf::PLAYER{$login} = $pl
1534	}	1769	}
1535	}	1770	}
1536	}	1771	}
1537		1772
		1773	cf::player->attach (
		1774	on_load => sub {
		1775	my ($pl, $path) = @_;
		1776
		1777	# restore slots saved in save, below
		1778	my $slots = delete $pl->{_slots};
		1779
		1780	$pl->ob->current_weapon ($slots->[0]);
		1781	$pl->combat_ob ($slots->[1]);
		1782	$pl->ranged_ob ($slots->[2]);
		1783	},
		1784	);
		1785
1538	sub save($) {	1786	sub save($) {
1539	my ($pl) = @_;	1787	my ($pl) = @_;
1540		1788
1541	return if $pl->{deny_save};	1789	return if $pl->{deny_save};
1542		1790
…		…
1547		1795
1548	aio_mkdir playerdir $pl, 0770;	1796	aio_mkdir playerdir $pl, 0770;
1549	$pl->{last_save} = $cf::RUNTIME;	1797	$pl->{last_save} = $cf::RUNTIME;
1550		1798
1551	cf::get_slot 0.01;	1799	cf::get_slot 0.01;
		1800
		1801	# save slots, to be restored later
		1802	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1552		1803
1553	$pl->save_pl ($path);	1804	$pl->save_pl ($path);
1554	cf::cede_to_tick;	1805	cf::cede_to_tick;
1555	}	1806	}
1556		1807
…		…
1590	my $name = $pl->ob->name;	1841	my $name = $pl->ob->name;
1591		1842
1592	$pl->{deny_save} = 1;	1843	$pl->{deny_save} = 1;
1593	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1844	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1594		1845
1595	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1846	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1596	$pl->deactivate;	1847	$pl->deactivate;
		1848
1597	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1849	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1598	$pl->ob->check_score;
1599	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1850	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1851	ext::highscore::check ($pl->ob);
		1852
1600	$pl->ns->destroy if $pl->ns;	1853	$pl->ns->destroy if $pl->ns;
1601		1854
1602	my $path = playerdir $pl;	1855	my $path = playerdir $pl;
1603	my $temp = "$path~$cf::RUNTIME~deleting~";	1856	my $temp = "$path~$cf::RUNTIME~deleting~";
1604	aio_rename $path, $temp;	1857	aio_rename $path, $temp;
…		…
1658	\@logins	1911	\@logins
1659	}	1912	}
1660		1913
1661	=item $player->maps	1914	=item $player->maps
1662		1915
		1916	=item cf::player::maps $login
		1917
1663	Returns an arrayref of map paths that are private for this	1918	Returns an arrayref of map paths that are private for this
1664	player. May block.	1919	player. May block.
1665		1920
1666	=cut	1921	=cut
1667		1922
…		…
1688		1943
1689	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1944	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1690		1945
1691	Expand deliantra pod fragments into protocol xml.	1946	Expand deliantra pod fragments into protocol xml.
1692		1947
1693	=item $player->ext_reply ($msgid, @msg)
1694
1695	Sends an ext reply to the player.
1696
1697	=cut
1698
1699	sub ext_reply($$@) {
1700	my ($self, $id, @msg) = @_;
1701
1702	$self->ns->ext_reply ($id, @msg)
1703	}
1704
1705	=item $player->ext_msg ($type, @msg)	1948	=item $player->ext_msg ($type, @msg)
1706		1949
1707	Sends an ext event to the client.	1950	Sends an ext event to the client.
1708		1951
1709	=cut	1952	=cut
…		…
1728		1971
1729	=cut	1972	=cut
1730		1973
1731	sub find_by_path($) {	1974	sub find_by_path($) {
1732	my ($path) = @_;	1975	my ($path) = @_;
		1976
		1977	$path =~ s/^~[^\/]*//; # skip ~login
1733		1978
1734	my ($match, $specificity);	1979	my ($match, $specificity);
1735		1980
1736	for my $region (list) {	1981	for my $region (list) {
1737	if ($region->{match} && $path =~ $region->{match}) {	1982	if ($region->{match} && $path =~ $region->{match}) {
…		…
1766	sub generate_random_map {	2011	sub generate_random_map {
1767	my ($self, $rmp) = @_;	2012	my ($self, $rmp) = @_;
1768		2013
1769	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	2014	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1770		2015
1771	# mit "rum" bekleckern, nicht
1772	$self->_create_random_map (	2016	$self->_create_random_map ($rmp);
1773	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1774	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1775	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1776	$rmp->{exit_on_final_map},
1777	$rmp->{xsize}, $rmp->{ysize},
1778	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1779	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1780	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1781	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1782	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1783	(cf::region::find $rmp->{region}), $rmp->{custom}
1784	)
1785	}	2017	}
1786		2018
1787	=item cf::map->register ($regex, $prio)	2019	=item cf::map->register ($regex, $prio)
1788		2020
1789	Register a handler for the map path matching the given regex at the	2021	Register a handler for the map path matching the given regex at the
…		…
1794		2026
1795	sub register {	2027	sub register {
1796	my (undef, $regex, $prio) = @_;	2028	my (undef, $regex, $prio) = @_;
1797	my $pkg = caller;	2029	my $pkg = caller;
1798		2030
1799	no strict;
1800	push @{"$pkg\::ISA"}, __PACKAGE__;	2031	push @{"$pkg\::ISA"}, __PACKAGE__;
1801		2032
1802	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	2033	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1803	}	2034	}
1804		2035
1805	# also paths starting with '/'	2036	# also paths starting with '/'
1806	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	2037	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1807		2038
1808	sub thawer_merge {	2039	sub thawer_merge {
1809	my ($self, $merge) = @_;	2040	my ($self, $merge) = @_;
1810		2041
1811	# we have to keep some variables in memory intact	2042	# we have to keep some variables in memory intact
…		…
1816	}	2047	}
1817		2048
1818	sub normalise {	2049	sub normalise {
1819	my ($path, $base) = @_;	2050	my ($path, $base) = @_;
1820		2051
1821	$path = "$path"; # make sure its a string	2052	$path = "$path"; # make sure it's a string
1822		2053
1823	$path =~ s/\.map$//;	2054	$path =~ s/\.map$//;
1824		2055
1825	# map plan:	2056	# map plan:
1826	#	2057	#
…		…
1841	$base =~ s{[^/]+/?$}{};	2072	$base =~ s{[^/]+/?$}{};
1842	$path = "$base/$path";	2073	$path = "$base/$path";
1843	}	2074	}
1844		2075
1845	for ($path) {	2076	for ($path) {
1846	redo if s{//}{/};
1847	redo if s{/\.?/}{/};	2077	redo if s{/\.?/}{/};
1848	redo if s{/[^/]+/\.\./}{/};	2078	redo if s{/[^/]+/\.\./}{/};
1849	}	2079	}
1850		2080
1851	$path	2081	$path
…		…
1865	$self->init; # pass $1 etc.	2095	$self->init; # pass $1 etc.
1866	return $self;	2096	return $self;
1867	}	2097	}
1868	}	2098	}
1869		2099
1870	Carp::cluck "unable to resolve path '$path' (base '$base').";	2100	Carp::cluck "unable to resolve path '$path' (base '$base')";
1871	()	2101	()
1872	}	2102	}
1873		2103
		2104	# may re-bless or do other evil things
1874	sub init {	2105	sub init {
1875	my ($self) = @_;	2106	my ($self) = @_;
1876		2107
1877	$self	2108	$self
1878	}	2109	}
…		…
1943	$self->{load_path} = $path;	2174	$self->{load_path} = $path;
1944		2175
1945	1	2176	1
1946	}	2177	}
1947		2178
		2179	# used to laod the header of an original map
1948	sub load_header_orig {	2180	sub load_header_orig {
1949	my ($self) = @_;	2181	my ($self) = @_;
1950		2182
1951	$self->load_header_from ($self->load_path)	2183	$self->load_header_from ($self->load_path)
1952	}	2184	}
1953		2185
		2186	# used to laod the header of an instantiated map
1954	sub load_header_temp {	2187	sub load_header_temp {
1955	my ($self) = @_;	2188	my ($self) = @_;
1956		2189
1957	$self->load_header_from ($self->save_path)	2190	$self->load_header_from ($self->save_path)
1958	}	2191	}
1959		2192
		2193	# called after loading the header from an instantiated map
1960	sub prepare_temp {	2194	sub prepare_temp {
1961	my ($self) = @_;	2195	my ($self) = @_;
1962		2196
1963	$self->last_access ((delete $self->{last_access})	2197	$self->last_access ((delete $self->{last_access})
1964	|| $cf::RUNTIME); #d#	2198	|| $cf::RUNTIME); #d#
1965	# safety	2199	# safety
1966	$self->{instantiate_time} = $cf::RUNTIME	2200	$self->{instantiate_time} = $cf::RUNTIME
1967	if $self->{instantiate_time} > $cf::RUNTIME;	2201	if $self->{instantiate_time} > $cf::RUNTIME;
1968	}	2202	}
1969		2203
		2204	# called after loading the header from an original map
1970	sub prepare_orig {	2205	sub prepare_orig {
1971	my ($self) = @_;	2206	my ($self) = @_;
1972		2207
1973	$self->{load_original} = 1;	2208	$self->{load_original} = 1;
1974	$self->{instantiate_time} = $cf::RUNTIME;	2209	$self->{instantiate_time} = $cf::RUNTIME;
…		…
1998		2233
1999	sub find;	2234	sub find;
2000	sub find {	2235	sub find {
2001	my ($path, $origin) = @_;	2236	my ($path, $origin) = @_;
2002		2237
		2238	cf::cede_to_tick;
		2239
2003	$path = normalise $path, $origin && $origin->path;	2240	$path = normalise $path, $origin;
2004		2241
2005	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2242	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2006	my $guard2 = cf::lock_acquire "map_find:$path";	2243	my $guard2 = cf::lock_acquire "map_find:$path";
2007		2244
2008	$cf::MAP{$path} || do {	2245	$cf::MAP{$path} || do {
…		…
2039		2276
2040	{	2277	{
2041	my $guard = cf::lock_acquire "map_data:$path";	2278	my $guard = cf::lock_acquire "map_data:$path";
2042		2279
2043	return unless $self->valid;	2280	return unless $self->valid;
2044	return unless $self->in_memory == cf::MAP_SWAPPED;	2281	return unless $self->state == cf::MAP_SWAPPED;
2045
2046	$self->in_memory (cf::MAP_LOADING);
2047		2282
2048	$self->alloc;	2283	$self->alloc;
2049		2284
2050	$self->pre_load;	2285	$self->pre_load;
2051	cf::cede_to_tick;	2286	cf::cede_to_tick;
2052		2287
		2288	if (exists $self->{load_path}) {
2053	my $f = new_from_file cf::object::thawer $self->{load_path};	2289	my $f = new_from_file cf::object::thawer $self->{load_path};
2054	$f->skip_block;	2290	$f->skip_block;
2055	$self->_load_objects ($f)	2291	$self->_load_objects ($f)
2056	or return;	2292	or return;
2057		2293
2058	$self->post_load_original	2294	$self->post_load_original
2059	if delete $self->{load_original};	2295	if delete $self->{load_original};
2060		2296
2061	if (my $uniq = $self->uniq_path) {	2297	if (my $uniq = $self->uniq_path) {
2062	utf8::encode $uniq;	2298	utf8::encode $uniq;
2063	unless (aio_stat $uniq) {	2299	unless (aio_stat $uniq) {
2064	if (my $f = new_from_file cf::object::thawer $uniq) {	2300	if (my $f = new_from_file cf::object::thawer $uniq) {
2065	$self->clear_unique_items;	2301	$self->clear_unique_items;
2066	$self->_load_objects ($f);	2302	$self->_load_objects ($f);
2067	$f->resolve_delayed_derefs;	2303	$f->resolve_delayed_derefs;
		2304	}
2068	}	2305	}
2069	}	2306	}
2070	}
2071		2307
2072	$f->resolve_delayed_derefs;	2308	$f->resolve_delayed_derefs;
		2309	} else {
		2310	$self->post_load_original
		2311	if delete $self->{load_original};
		2312	}
		2313
		2314	$self->state (cf::MAP_INACTIVE);
2073		2315
2074	cf::cede_to_tick;	2316	cf::cede_to_tick;
2075	# now do the right thing for maps	2317	# now do the right thing for maps
2076	$self->link_multipart_objects;	2318	$self->link_multipart_objects;
2077	$self->difficulty ($self->estimate_difficulty)	2319	$self->difficulty ($self->estimate_difficulty)
…		…
2081	unless ($self->{deny_activate}) {	2323	unless ($self->{deny_activate}) {
2082	$self->decay_objects;	2324	$self->decay_objects;
2083	$self->fix_auto_apply;	2325	$self->fix_auto_apply;
2084	$self->update_buttons;	2326	$self->update_buttons;
2085	cf::cede_to_tick;	2327	cf::cede_to_tick;
2086	$self->activate;	2328	#$self->activate; # no longer activate maps automatically
2087	}	2329	}
2088		2330
2089	$self->{last_save} = $cf::RUNTIME;	2331	$self->{last_save} = $cf::RUNTIME;
2090	$self->last_access ($cf::RUNTIME);	2332	$self->last_access ($cf::RUNTIME);
2091
2092	$self->in_memory (cf::MAP_ACTIVE);
2093	}	2333	}
2094		2334
2095	$self->post_load;	2335	$self->post_load;
		2336
		2337	1
2096	}	2338	}
2097		2339
2098	# customize the map for a given player, i.e.	2340	# customize the map for a given player, i.e.
2099	# return the _real_ map. used by e.g. per-player	2341	# return the _real_ map. used by e.g. per-player
2100	# maps to change the path to ~playername/mappath	2342	# maps to change the path to ~playername/mappath
…		…
2108	# if $self->per_party;	2350	# if $self->per_party;
2109		2351
2110	$self	2352	$self
2111	}	2353	}
2112		2354
2113	# find and load all maps in the 3x3 area around a map
2114	sub load_neighbours {
2115	my ($map) = @_;
2116
2117	my @neigh; # diagonal neighbours
2118
2119	for (0 .. 3) {
2120	my $neigh = $map->tile_path ($_)
2121	or next;
2122	$neigh = find $neigh, $map
2123	or next;
2124	$neigh->load;
2125
2126	push @neigh,
2127	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2128	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2129	}
2130
2131	for (grep defined $_->[0], @neigh) {
2132	my ($path, $origin) = @$_;
2133	my $neigh = find $path, $origin
2134	or next;
2135	$neigh->load;
2136	}
2137	}
2138
2139	sub find_sync {	2355	sub find_sync {
2140	my ($path, $origin) = @_;	2356	my ($path, $origin) = @_;
2141		2357
2142	cf::sync_job { find $path, $origin }	2358	# it's a bug to call this from the main context
		2359	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2360	if $Coro::current == $Coro::main;
		2361
		2362	find $path, $origin
2143	}	2363	}
2144		2364
2145	sub do_load_sync {	2365	sub do_load_sync {
2146	my ($map) = @_;	2366	my ($map) = @_;
2147		2367
		2368	# it's a bug to call this from the main context
2148	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2369	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2149	if $Coro::current == $Coro::main;	2370	if $Coro::current == $Coro::main;
2150		2371
2151	cf::sync_job { $map->load };	2372	$map->load;
2152	}	2373	}
2153		2374
2154	our %MAP_PREFETCH;	2375	our %MAP_PREFETCH;
2155	our $MAP_PREFETCHER = undef;	2376	our $MAP_PREFETCHER = undef;
2156		2377
2157	sub find_async {	2378	sub find_async {
2158	my ($path, $origin, $load) = @_;	2379	my ($path, $origin, $load) = @_;
2159		2380
2160	$path = normalise $path, $origin && $origin->{path};	2381	$path = normalise $path, $origin;
2161		2382
2162	if (my $map = $cf::MAP{$path}) {	2383	if (my $map = $cf::MAP{$path}) {
2163	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2384	return $map if !$load || $map->linkable;
2164	}	2385	}
2165		2386
2166	$MAP_PREFETCH{$path} |= $load;	2387	$MAP_PREFETCH{$path} |= $load;
2167		2388
2168	$MAP_PREFETCHER ||= cf::async {	2389	$MAP_PREFETCHER ||= cf::async {
…		…
2182	$MAP_PREFETCHER->prio (6);	2403	$MAP_PREFETCHER->prio (6);
2183		2404
2184	()	2405	()
2185	}	2406	}
2186		2407
		2408	# common code, used by both ->save and ->swapout
2187	sub save {	2409	sub _save {
2188	my ($self) = @_;	2410	my ($self) = @_;
2189
2190	my $lock = cf::lock_acquire "map_data:$self->{path}";
2191		2411
2192	$self->{last_save} = $cf::RUNTIME;	2412	$self->{last_save} = $cf::RUNTIME;
2193		2413
2194	return unless $self->dirty;	2414	return unless $self->dirty;
2195		2415
…		…
2215	} else {	2435	} else {
2216	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2436	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2217	}	2437	}
2218	}	2438	}
2219		2439
		2440	sub save {
		2441	my ($self) = @_;
		2442
		2443	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2444
		2445	$self->_save;
		2446	}
		2447
2220	sub swap_out {	2448	sub swap_out {
2221	my ($self) = @_;	2449	my ($self) = @_;
2222		2450
2223	# save first because save cedes
2224	$self->save;
2225
2226	my $lock = cf::lock_acquire "map_data:$self->{path}";	2451	my $lock = cf::lock_acquire "map_data:$self->{path}";
2227		2452
		2453	return if !$self->linkable;
		2454	return if $self->{deny_save};
2228	return if $self->players;	2455	return if $self->players;
2229	return if $self->in_memory != cf::MAP_ACTIVE;	2456
		2457	# first deactivate the map and "unlink" it from the core
		2458	$self->deactivate;
		2459	$_->clear_links_to ($self) for values %cf::MAP;
		2460	$self->state (cf::MAP_SWAPPED);
		2461
		2462	# then atomically save
		2463	$self->_save;
		2464
		2465	# then free the map
		2466	$self->clear;
		2467	}
		2468
		2469	sub reset_at {
		2470	my ($self) = @_;
		2471
		2472	# TODO: safety, remove and allow resettable per-player maps
2230	return if $self->{deny_save};	2473	return 1e99 if $self->{deny_reset};
2231		2474
		2475	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2476	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2477
		2478	$time + $to
		2479	}
		2480
		2481	sub should_reset {
		2482	my ($self) = @_;
		2483
		2484	$self->reset_at <= $cf::RUNTIME
		2485	}
		2486
		2487	sub reset {
		2488	my ($self) = @_;
		2489
		2490	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2491
		2492	return if $self->players;
		2493
		2494	cf::trace "resetting map ", $self->path, "\n";
		2495
2232	$self->in_memory (cf::MAP_SWAPPED);	2496	$self->state (cf::MAP_SWAPPED);
		2497
		2498	# need to save uniques path
		2499	unless ($self->{deny_save}) {
		2500	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2501
		2502	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2503	if $uniq;
		2504	}
		2505
		2506	delete $cf::MAP{$self->path};
2233		2507
2234	$self->deactivate;	2508	$self->deactivate;
2235	$_->clear_links_to ($self) for values %cf::MAP;	2509	$_->clear_links_to ($self) for values %cf::MAP;
2236	$self->clear;	2510	$self->clear;
2237	}
2238
2239	sub reset_at {
2240	my ($self) = @_;
2241
2242	# TODO: safety, remove and allow resettable per-player maps
2243	return 1e99 if $self->{deny_reset};
2244
2245	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2246	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2247
2248	$time + $to
2249	}
2250
2251	sub should_reset {
2252	my ($self) = @_;
2253
2254	$self->reset_at <= $cf::RUNTIME
2255	}
2256
2257	sub reset {
2258	my ($self) = @_;
2259
2260	my $lock = cf::lock_acquire "map_data:$self->{path}";
2261
2262	return if $self->players;
2263
2264	warn "resetting map ", $self->path, "\n";
2265
2266	$self->in_memory (cf::MAP_SWAPPED);
2267
2268	# need to save uniques path
2269	unless ($self->{deny_save}) {
2270	my $uniq = $self->uniq_path; utf8::encode $uniq;
2271
2272	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2273	if $uniq;
2274	}
2275
2276	delete $cf::MAP{$self->path};
2277
2278	$self->deactivate;
2279	$_->clear_links_to ($self) for values %cf::MAP;
2280	$self->clear;
2281		2511
2282	$self->unlink_save;	2512	$self->unlink_save;
2283	$self->destroy;	2513	$self->destroy;
2284	}	2514	}
2285		2515
…		…
2293		2523
2294	delete $cf::MAP{$self->path};	2524	delete $cf::MAP{$self->path};
2295		2525
2296	$self->unlink_save;	2526	$self->unlink_save;
2297		2527
2298	bless $self, "cf::map";	2528	bless $self, "cf::map::wrap";
2299	delete $self->{deny_reset};	2529	delete $self->{deny_reset};
2300	$self->{deny_save} = 1;	2530	$self->{deny_save} = 1;
2301	$self->reset_timeout (1);	2531	$self->reset_timeout (1);
2302	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2532	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2303		2533
…		…
2533		2763
2534	Freezes the player and moves him/her to a special map (C<{link}>).	2764	Freezes the player and moves him/her to a special map (C<{link}>).
2535		2765
2536	The player should be reasonably safe there for short amounts of time (e.g.	2766	The player should be reasonably safe there for short amounts of time (e.g.
2537	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2767	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2538	though, as the palyer cannot control the character while it is on the link	2768	though, as the player cannot control the character while it is on the link
2539	map.	2769	map.
2540		2770
2541	Will never block.	2771	Will never block.
2542		2772
2543	=item $player_object->leave_link ($map, $x, $y)	2773	=item $player_object->leave_link ($map, $x, $y)
…		…
2564	sub cf::object::player::enter_link {	2794	sub cf::object::player::enter_link {
2565	my ($self) = @_;	2795	my ($self) = @_;
2566		2796
2567	$self->deactivate_recursive;	2797	$self->deactivate_recursive;
2568		2798
		2799	++$self->{_link_recursion};
		2800
2569	return if UNIVERSAL::isa $self->map, "ext::map_link";	2801	return if UNIVERSAL::isa $self->map, "ext::map_link";
2570		2802
2571	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2803	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2572	if $self->map && $self->map->{path} ne "{link}";	2804	if $self->map && $self->map->{path} ne "{link}";
2573		2805
2574	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2806	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2575	}	2807	}
2576		2808
2577	sub cf::object::player::leave_link {	2809	sub cf::object::player::leave_link {
2578	my ($self, $map, $x, $y) = @_;	2810	my ($self, $map, $x, $y) = @_;
2579		2811
…		…
2599	# use -1 or undef as default coordinates, not 0, 0	2831	# use -1 or undef as default coordinates, not 0, 0
2600	($x, $y) = ($map->enter_x, $map->enter_y)	2832	($x, $y) = ($map->enter_x, $map->enter_y)
2601	if $x <= 0 && $y <= 0;	2833	if $x <= 0 && $y <= 0;
2602		2834
2603	$map->load;	2835	$map->load;
2604	$map->load_neighbours;
2605		2836
2606	return unless $self->contr->active;	2837	return unless $self->contr->active;
2607		2838
2608	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2839	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2609	$self->enter_map ($map, $x, $y);	2840	if ($self->enter_map ($map, $x, $y)) {
2610		2841	# entering was successful
		2842	delete $self->{_link_recursion};
2611	# only activate afterwards, to support waiting in hooks	2843	# only activate afterwards, to support waiting in hooks
2612	$self->activate_recursive;	2844	$self->activate_recursive;
2613	}	2845	}
2614		2846
		2847	}
		2848
2615	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2849	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2616		2850
2617	Moves the player to the given map-path and coordinates by first freezing	2851	Moves the player to the given map-path and coordinates by first freezing
2618	her, loading and preparing them map, calling the provided $check callback	2852	her, loading and preparing them map, calling the provided $check callback
2619	that has to return the map if sucecssful, and then unfreezes the player on	2853	that has to return the map if sucecssful, and then unfreezes the player on
2620	the new (success) or old (failed) map position. In either case, $done will	2854	the new (success) or old (failed) map position. In either case, $done will
…		…
2627		2861
2628	our $GOTOGEN;	2862	our $GOTOGEN;
2629		2863
2630	sub cf::object::player::goto {	2864	sub cf::object::player::goto {
2631	my ($self, $path, $x, $y, $check, $done) = @_;	2865	my ($self, $path, $x, $y, $check, $done) = @_;
		2866
		2867	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2868	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2869	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2870	($path, $x, $y) = @$EMERGENCY_POSITION;
		2871	}
2632		2872
2633	# do generation counting so two concurrent goto's will be executed in-order	2873	# do generation counting so two concurrent goto's will be executed in-order
2634	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2874	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2635		2875
2636	$self->enter_link;	2876	$self->enter_link;
…		…
2656	($path, $x, $y) = (undef, undef, undef);	2896	($path, $x, $y) = (undef, undef, undef);
2657	}	2897	}
2658	}	2898	}
2659		2899
2660	my $map = eval {	2900	my $map = eval {
2661	my $map = defined $path ? cf::map::find $path : undef;	2901	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2662		2902
2663	if ($map) {	2903	if ($map) {
2664	$map = $map->customise_for ($self);	2904	$map = $map->customise_for ($self);
2665	$map = $check->($map) if $check && $map;	2905	$map = $check->($map, $x, $y, $self) if $check && $map;
2666	} else {	2906	} else {
2667	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2907	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2668	}	2908	}
2669		2909
2670	$map	2910	$map
…		…
2678	if ($gen == $self->{_goto_generation}) {	2918	if ($gen == $self->{_goto_generation}) {
2679	delete $self->{_goto_generation};	2919	delete $self->{_goto_generation};
2680	$self->leave_link ($map, $x, $y);	2920	$self->leave_link ($map, $x, $y);
2681	}	2921	}
2682		2922
2683	$done->() if $done;	2923	$done->($self) if $done;
2684	})->prio (1);	2924	})->prio (1);
2685	}	2925	}
2686		2926
2687	=item $player_object->enter_exit ($exit_object)	2927	=item $player_object->enter_exit ($exit_object)
2688		2928
…		…
2756	$Coro::current->{desc} = "enter_exit";	2996	$Coro::current->{desc} = "enter_exit";
2757		2997
2758	unless (eval {	2998	unless (eval {
2759	$self->deactivate_recursive; # just to be sure	2999	$self->deactivate_recursive; # just to be sure
2760		3000
2761	# random map handling
2762	{
2763	my $guard = cf::lock_acquire "exit_prepare:$exit";
2764
2765	prepare_random_map $exit
2766	if $exit->slaying eq "/!";
2767	}
2768
2769	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3001	my $map = cf::map::normalise $exit->slaying, $exit->map;
2770	my $x = $exit->stats->hp;	3002	my $x = $exit->stats->hp;
2771	my $y = $exit->stats->sp;	3003	my $y = $exit->stats->sp;
		3004
		3005	# special map handling
		3006	my $slaying = $exit->slaying;
		3007
		3008	# special map handling
		3009	if ($slaying eq "/!") {
		3010	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3011
		3012	prepare_random_map $exit
		3013	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3014
		3015	$map = $exit->slaying;
		3016
		3017	} elsif ($slaying eq '!up') {
		3018	$map = $exit->map->tile_path (cf::TILE_UP);
		3019	$x = $exit->x;
		3020	$y = $exit->y;
		3021
		3022	} elsif ($slaying eq '!down') {
		3023	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3024	$x = $exit->x;
		3025	$y = $exit->y;
		3026	}
2772		3027
2773	$self->goto ($map, $x, $y);	3028	$self->goto ($map, $x, $y);
2774		3029
2775	# if exit is damned, update players death & WoR home-position	3030	# if exit is damned, update players death & WoR home-position
2776	$self->contr->savebed ($map, $x, $y)	3031	$self->contr->savebed ($map, $x, $y)
…		…
2781	$self->message ("Something went wrong deep within the deliantra server. "	3036	$self->message ("Something went wrong deep within the deliantra server. "
2782	. "I'll try to bring you back to the map you were before. "	3037	. "I'll try to bring you back to the map you were before. "
2783	. "Please report this to the dungeon master!",	3038	. "Please report this to the dungeon master!",
2784	cf::NDI_UNIQUE | cf::NDI_RED);	3039	cf::NDI_UNIQUE | cf::NDI_RED);
2785		3040
2786	warn "ERROR in enter_exit: $@";	3041	error "ERROR in enter_exit: $@";
2787	$self->leave_link;	3042	$self->leave_link;
2788	}	3043	}
2789	})->prio (1);	3044	})->prio (1);
2790	}	3045	}
2791		3046
…		…
3001	=cut	3256	=cut
3002		3257
3003	sub cf::client::ext_msg($$@) {	3258	sub cf::client::ext_msg($$@) {
3004	my ($self, $type, @msg) = @_;	3259	my ($self, $type, @msg) = @_;
3005		3260
3006	if ($self->extcmd == 2) {
3007	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3261	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3008	} elsif ($self->extcmd == 1) { # TODO: remove
3009	push @msg, msgtype => "event_$type";
3010	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3011	}
3012	}
3013
3014	=item $client->ext_reply ($msgid, @msg)
3015
3016	Sends an ext reply to the client.
3017
3018	=cut
3019
3020	sub cf::client::ext_reply($$@) {
3021	my ($self, $id, @msg) = @_;
3022
3023	if ($self->extcmd == 2) {
3024	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3025	} elsif ($self->extcmd == 1) {
3026	#TODO: version 1, remove
3027	unshift @msg, msgtype => "reply", msgid => $id;
3028	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3029	}
3030	}	3262	}
3031		3263
3032	=item $success = $client->query ($flags, "text", \&cb)	3264	=item $success = $client->query ($flags, "text", \&cb)
3033		3265
3034	Queues a query to the client, calling the given callback with	3266	Queues a query to the client, calling the given callback with
…		…
3089	my ($ns, $buf) = @_;	3321	my ($ns, $buf) = @_;
3090		3322
3091	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3323	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3092		3324
3093	if (ref $msg) {	3325	if (ref $msg) {
3094	my ($type, $reply, @payload) =	3326	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3095	"ARRAY" eq ref $msg
3096	? @$msg
3097	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3098		3327
3099	my @reply;
3100
3101	if (my $cb = $EXTICMD{$type}) {	3328	if (my $cb = $EXTIACMD{$type}) {
		3329	$cb->(
		3330	$ns,
		3331	sub {
		3332	$ns->ext_msg ("reply-$reply", @_)
		3333	if $reply;
		3334	},
		3335	@payload
		3336	);
		3337	} else {
		3338	my @reply;
		3339
		3340	if (my $cb = $EXTICMD{$type}) {
3102	@reply = $cb->($ns, @payload);	3341	@reply = $cb->($ns, @payload);
		3342	}
		3343
		3344	$ns->ext_msg ("reply-$reply", @reply)
		3345	if $reply;
3103	}	3346	}
3104
3105	$ns->ext_reply ($reply, @reply)
3106	if $reply;
3107
3108	} else {	3347	} else {
3109	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3348	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3110	}	3349	}
3111		3350
3112	cf::override;	3351	cf::override;
3113	},	3352	},
3114	);	3353	);
…		…
3134		3373
3135	$coro	3374	$coro
3136	}	3375	}
3137		3376
3138	cf::client->attach (	3377	cf::client->attach (
3139	on_destroy => sub {	3378	on_client_destroy => sub {
3140	my ($ns) = @_;	3379	my ($ns) = @_;
3141		3380
3142	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3381	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3143	},	3382	},
3144	);	3383	);
…		…
3195	decrease split destroy change_exp value msg lore send_msg)],	3434	decrease split destroy change_exp value msg lore send_msg)],
3196	["cf::object::player" => qw(player)],	3435	["cf::object::player" => qw(player)],
3197	["cf::player" => qw(peaceful send_msg)],	3436	["cf::player" => qw(peaceful send_msg)],
3198	["cf::map" => qw(trigger)],	3437	["cf::map" => qw(trigger)],
3199	) {	3438	) {
3200	no strict 'refs';
3201	my ($pkg, @funs) = @$_;	3439	my ($pkg, @funs) = @$_;
3202	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3440	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3203	for @funs;	3441	for @funs;
3204	}	3442	}
3205		3443
…		…
3244	local @cf::_safe_eval_args = values %vars;	3482	local @cf::_safe_eval_args = values %vars;
3245	@res = wantarray ? eval eval : scalar eval $eval;	3483	@res = wantarray ? eval eval : scalar eval $eval;
3246	}	3484	}
3247		3485
3248	if ($@) {	3486	if ($@) {
3249	warn "$@";	3487	warn "$@",
3250	warn "while executing safe code '$code'\n";	3488	"while executing safe code '$code'\n",
3251	warn "with arguments " . (join " ", %vars) . "\n";	3489	"with arguments " . (join " ", %vars) . "\n";
3252	}	3490	}
3253		3491
3254	wantarray ? @res : $res[0]	3492	wantarray ? @res : $res[0]
3255	}	3493	}
3256		3494
…		…
3281	=cut	3519	=cut
3282		3520
3283	#############################################################################	3521	#############################################################################
3284	# the server's init and main functions	3522	# the server's init and main functions
3285		3523
		3524	our %FACEHASH; # hash => idx, #d# HACK for http server
		3525
		3526	# internal api, not fianlised
		3527	sub add_face {
		3528	my ($name, $type, $data) = @_;
		3529
		3530	my $idx = cf::face::find $name;
		3531
		3532	if ($idx) {
		3533	delete $FACEHASH{cf::face::get_chksum $idx};
		3534	} else {
		3535	$idx = cf::face::alloc $name;
		3536	}
		3537
		3538	my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
		3539
		3540	cf::face::set_type $idx, $type;
		3541	cf::face::set_data $idx, 0, $data, $hash;
		3542	cf::face::set_meta $idx, $type & 1 ? undef : undef;
		3543	$FACEHASH{$hash} = $idx;#d#
		3544
		3545	$idx
		3546	}
		3547
3286	sub load_facedata($) {	3548	sub load_facedata($) {
3287	my ($path) = @_;	3549	my ($path) = @_;
3288		3550
3289	# HACK to clear player env face cache, we need some signal framework	3551	# HACK to clear player env face cache, we need some signal framework
3290	# for this (global event?)	3552	# for this (global event?)
3291	%ext::player_env::MUSIC_FACE_CACHE = ();	3553	%ext::player_env::MUSIC_FACE_CACHE = ();
3292		3554
3293	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3555	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3294		3556
3295	warn "loading facedata from $path\n";	3557	trace "loading facedata from $path\n";
3296		3558
3297	my $facedata;	3559	my $facedata = decode_storable load_file $path;
3298	0 < aio_load $path, $facedata
3299	or die "$path: $!";
3300
3301	$facedata = Coro::Storable::thaw $facedata;
3302		3560
3303	$facedata->{version} == 2	3561	$facedata->{version} == 2
3304	or cf::cleanup "$path: version mismatch, cannot proceed.";	3562	or cf::cleanup "$path: version mismatch, cannot proceed.";
3305		3563
3306	# patch in the exptable
3307	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3308	$facedata->{resource}{"res/exp_table"} = {
3309	type => FT_RSRC,
3310	data => $exp_table,
3311	hash => (Digest::MD5::md5 $exp_table),
3312	};
3313	cf::cede_to_tick;	3564	cf::cede_to_tick;
3314		3565
3315	{	3566	{
3316	my $faces = $facedata->{faceinfo};	3567	my $faces = $facedata->{faceinfo};
3317		3568
3318	while (my ($face, $info) = each %$faces) {	3569	for my $face (sort keys %$faces) {
		3570	my $info = $faces->{$face};
3319	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3571	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3320		3572
3321	cf::face::set_visibility $idx, $info->{visibility};	3573	cf::face::set_visibility $idx, $info->{visibility};
3322	cf::face::set_magicmap $idx, $info->{magicmap};	3574	cf::face::set_magicmap $idx, $info->{magicmap};
3323	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3575	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3324	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3576	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
		3577	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
		3578	$FACEHASH{$info->{hash64}} = $idx;#d#
3325		3579
3326	cf::cede_to_tick;	3580	cf::cede_to_tick;
3327	}	3581	}
3328		3582
3329	while (my ($face, $info) = each %$faces) {	3583	while (my ($face, $info) = each %$faces) {
…		…
3334		3588
3335	if (my $smooth = cf::face::find $info->{smooth}) {	3589	if (my $smooth = cf::face::find $info->{smooth}) {
3336	cf::face::set_smooth $idx, $smooth;	3590	cf::face::set_smooth $idx, $smooth;
3337	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3591	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3338	} else {	3592	} else {
3339	warn "smooth face '$info->{smooth}' not found for face '$face'";	3593	error "smooth face '$info->{smooth}' not found for face '$face'";
3340	}	3594	}
3341		3595
3342	cf::cede_to_tick;	3596	cf::cede_to_tick;
3343	}	3597	}
3344	}	3598	}
…		…
3356		3610
3357	{	3611	{
3358	my $res = $facedata->{resource};	3612	my $res = $facedata->{resource};
3359		3613
3360	while (my ($name, $info) = each %$res) {	3614	while (my ($name, $info) = each %$res) {
3361	if (defined $info->{type}) {	3615	if (defined (my $type = $info->{type})) {
		3616	# TODO: different hash - must free and use new index, or cache ixface data queue
3362	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3617	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3363		3618
		3619	cf::face::set_type $idx, $type;
3364	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3620	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3365	cf::face::set_type $idx, $info->{type};	3621	cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3622	$FACEHASH{$info->{hash}} = $idx;#d#
3366	} else {	3623	} else {
3367	$RESOURCE{$name} = $info;	3624	# $RESOURCE{$name} = $info; # unused
3368	}	3625	}
3369		3626
3370	cf::cede_to_tick;	3627	cf::cede_to_tick;
3371	}	3628	}
3372	}	3629	}
3373		3630
3374	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3631	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3375		3632
3376	1	3633	1
3377	}	3634	}
3378
3379	cf::global->attach (on_resource_update => sub {
3380	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3381	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3382
3383	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3384	my $sound = $soundconf->{compat}[$_]
3385	or next;
3386
3387	my $face = cf::face::find "sound/$sound->[1]";
3388	cf::sound::set $sound->[0] => $face;
3389	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3390	}
3391
3392	while (my ($k, $v) = each %{$soundconf->{event}}) {
3393	my $face = cf::face::find "sound/$v";
3394	cf::sound::set $k => $face;
3395	}
3396	}
3397	});
3398		3635
3399	register_exticmd fx_want => sub {	3636	register_exticmd fx_want => sub {
3400	my ($ns, $want) = @_;	3637	my ($ns, $want) = @_;
3401		3638
3402	while (my ($k, $v) = each %$want) {	3639	while (my ($k, $v) = each %$want) {
…		…
3410	my $status = load_resource_file_ $_[0];	3647	my $status = load_resource_file_ $_[0];
3411	get_slot 0.1, 100;	3648	get_slot 0.1, 100;
3412	cf::arch::commit_load;	3649	cf::arch::commit_load;
3413		3650
3414	$status	3651	$status
		3652	}
		3653
		3654	sub reload_exp_table {
		3655	_reload_exp_table;
		3656
		3657	add_face "res/exp_table" => FT_RSRC,
		3658	JSON::XS->new->utf8->canonical->encode (
		3659	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3660	);
		3661	}
		3662
		3663	sub reload_materials {
		3664	_reload_materials;
3415	}	3665	}
3416		3666
3417	sub reload_regions {	3667	sub reload_regions {
3418	# HACK to clear player env face cache, we need some signal framework	3668	# HACK to clear player env face cache, we need some signal framework
3419	# for this (global event?)	3669	# for this (global event?)
…		…
3434	}	3684	}
3435		3685
3436	sub reload_archetypes {	3686	sub reload_archetypes {
3437	load_resource_file "$DATADIR/archetypes"	3687	load_resource_file "$DATADIR/archetypes"
3438	or die "unable to load archetypes\n";	3688	or die "unable to load archetypes\n";
		3689
		3690	add_face "res/skill_info" => FT_RSRC,
		3691	JSON::XS->new->utf8->canonical->encode (
		3692	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3693	);
		3694	add_face "res/spell_paths" => FT_RSRC,
		3695	JSON::XS->new->utf8->canonical->encode (
		3696	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3697	);
3439	}	3698	}
3440		3699
3441	sub reload_treasures {	3700	sub reload_treasures {
3442	load_resource_file "$DATADIR/treasures"	3701	load_resource_file "$DATADIR/treasures"
3443	or die "unable to load treasurelists\n";	3702	or die "unable to load treasurelists\n";
3444	}	3703	}
3445		3704
		3705	sub reload_sound {
		3706	trace "loading sound config from $DATADIR/sound\n";
		3707
		3708	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3709
		3710	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3711	my $sound = $soundconf->{compat}[$_]
		3712	or next;
		3713
		3714	my $face = cf::face::find "sound/$sound->[1]";
		3715	cf::sound::set $sound->[0] => $face;
		3716	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3717	}
		3718
		3719	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3720	my $face = cf::face::find "sound/$v";
		3721	cf::sound::set $k => $face;
		3722	}
		3723	}
		3724
3446	sub reload_resources {	3725	sub reload_resources {
3447	warn "reloading resource files...\n";	3726	trace "reloading resource files...\n";
3448		3727
		3728	reload_materials;
3449	reload_facedata;	3729	reload_facedata;
		3730	reload_exp_table;
		3731	reload_sound;
3450	reload_archetypes;	3732	reload_archetypes;
3451	reload_regions;	3733	reload_regions;
3452	reload_treasures;	3734	reload_treasures;
3453		3735
3454	warn "finished reloading resource files\n";	3736	trace "finished reloading resource files\n";
3455	}	3737	}
3456		3738
3457	sub reload_config {	3739	sub reload_config {
3458	warn "reloading config file...\n";	3740	trace "reloading config file...\n";
3459		3741
3460	open my $fh, "<:utf8", "$CONFDIR/config"	3742	my $config = load_file "$CONFDIR/config";
3461	or return;	3743	utf8::decode $config;
		3744	*CFG = decode_yaml $config;
3462		3745
3463	local $/;
3464	*CFG = YAML::XS::Load scalar <$fh>;
3465
3466	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3746	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3467		3747
3468	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3748	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3469	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3749	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3470		3750
3471	if (exists $CFG{mlockall}) {	3751	if (exists $CFG{mlockall}) {
…		…
3473	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3753	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3474	and die "WARNING: m(un)lockall failed: $!\n";	3754	and die "WARNING: m(un)lockall failed: $!\n";
3475	};	3755	};
3476	warn $@ if $@;	3756	warn $@ if $@;
3477	}	3757	}
3478
3479	warn "finished reloading resource files\n";
3480	}	3758	}
3481		3759
3482	sub pidfile() {	3760	sub pidfile() {
3483	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3761	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3484	or die "$PIDFILE: $!";	3762	or die "$PIDFILE: $!";
…		…
3497	seek $fh, 0, 0;	3775	seek $fh, 0, 0;
3498	print $fh $$;	3776	print $fh $$;
3499	}	3777	}
3500		3778
3501	sub main_loop {	3779	sub main_loop {
3502	warn "EV::loop starting\n";	3780	trace "EV::loop starting\n";
3503	if (1) {	3781	if (1) {
3504	EV::loop;	3782	EV::loop;
3505	}	3783	}
3506	warn "EV::loop returned\n";	3784	trace "EV::loop returned\n";
3507	goto &main_loop unless $REALLY_UNLOOP;	3785	goto &main_loop unless $REALLY_UNLOOP;
3508	}	3786	}
3509		3787
3510	sub main {	3788	sub main {
3511	cf::init_globals; # initialise logging	3789	cf::init_globals; # initialise logging
3512		3790
3513	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3791	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3514	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3792	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3515	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3793	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3516	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3794	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3517		3795
3518	cf::init_experience;
3519	cf::init_anim;
3520	cf::init_attackmess;
3521	cf::init_dynamic;
3522
3523	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3796	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3524		3797
3525	# we must not ever block the main coroutine	3798	# we must not ever block the main coroutine
3526	local $Coro::idle = sub {	3799	$Coro::idle = sub {
3527	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3800	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3528	(async {	3801	(async {
3529	$Coro::current->{desc} = "IDLE BUG HANDLER";	3802	$Coro::current->{desc} = "IDLE BUG HANDLER";
3530	EV::loop EV::LOOP_ONESHOT;	3803	EV::loop EV::LOOP_ONESHOT;
3531	})->prio (Coro::PRIO_MAX);	3804	})->prio (Coro::PRIO_MAX);
3532	};	3805	};
3533		3806
3534	evthread_start IO::AIO::poll_fileno;	3807	evthread_start IO::AIO::poll_fileno;
3535		3808
3536	cf::sync_job {	3809	cf::sync_job {
		3810	cf::incloader::init ();
		3811
		3812	db_init;
		3813
		3814	cf::init_anim;
		3815	cf::init_attackmess;
		3816	cf::init_dynamic;
		3817
3537	cf::load_settings;	3818	cf::load_settings;
3538	cf::load_materials;
3539		3819
3540	reload_resources;	3820	reload_resources;
3541	reload_config;	3821	reload_config;
3542	db_init;
3543		3822
3544	cf::init_uuid;	3823	cf::init_uuid;
3545	cf::init_signals;	3824	cf::init_signals;
3546	cf::init_commands;
3547	cf::init_skills;	3825	cf::init_skills;
3548		3826
3549	cf::init_beforeplay;	3827	cf::init_beforeplay;
3550		3828
3551	atomic;	3829	atomic;
…		…
3556		3834
3557	# no (long-running) fork's whatsoever before this point(!)	3835	# no (long-running) fork's whatsoever before this point(!)
3558	use POSIX ();	3836	use POSIX ();
3559	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3837	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3560		3838
3561	(pop @POST_INIT)->(0) while @POST_INIT;	3839	cf::_post_init 0;
3562	};	3840	};
3563		3841
		3842	cf::object::thawer::errors_are_fatal 0;
		3843	info "parse errors in files are no longer fatal from this point on.\n";
		3844
		3845	AE::postpone {
		3846	undef &main; # free gobs of memory :)
		3847	};
		3848
3564	main_loop;	3849	goto &main_loop;
3565	}	3850	}
3566		3851
3567	#############################################################################	3852	#############################################################################
3568	# initialisation and cleanup	3853	# initialisation and cleanup
3569		3854
3570	# install some emergency cleanup handlers	3855	# install some emergency cleanup handlers
3571	BEGIN {	3856	BEGIN {
3572	our %SIGWATCHER = ();	3857	our %SIGWATCHER = ();
3573	for my $signal (qw(INT HUP TERM)) {	3858	for my $signal (qw(INT HUP TERM)) {
3574	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3859	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3575	cf::cleanup "SIG$signal";	3860	cf::cleanup "SIG$signal";
3576	};	3861	};
3577	}	3862	}
3578	}	3863	}
3579		3864
3580	sub write_runtime_sync {	3865	sub write_runtime_sync {
3581	my $t0 = EV::time;	3866	my $t0 = AE::time;
3582		3867
3583	# first touch the runtime file to show we are still running:	3868	# first touch the runtime file to show we are still running:
3584	# the fsync below can take a very very long time.	3869	# the fsync below can take a very very long time.
3585		3870
3586	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3871	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
…		…
3608	or return;	3893	or return;
3609		3894
3610	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3895	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3611	and return;	3896	and return;
3612		3897
3613	warn sprintf "runtime file written (%gs).\n", EV::time - $t0;	3898	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3614		3899
3615	1	3900	1
3616	}	3901	}
3617		3902
3618	our $uuid_lock;	3903	our $uuid_lock;
…		…
3630	or return;	3915	or return;
3631		3916
3632	my $value = uuid_seq uuid_cur;	3917	my $value = uuid_seq uuid_cur;
3633		3918
3634	unless ($value) {	3919	unless ($value) {
3635	warn "cowardly refusing to write zero uuid value!\n";	3920	info "cowardly refusing to write zero uuid value!\n";
3636	return;	3921	return;
3637	}	3922	}
3638		3923
3639	my $value = uuid_str $value + $uuid_skip;	3924	my $value = uuid_str $value + $uuid_skip;
3640	$uuid_skip = 0;	3925	$uuid_skip = 0;
…		…
3650	or return;	3935	or return;
3651		3936
3652	aio_rename "$uuid~", $uuid	3937	aio_rename "$uuid~", $uuid
3653	and return;	3938	and return;
3654		3939
3655	warn "uuid file written ($value).\n";	3940	trace "uuid file written ($value).\n";
3656		3941
3657	1	3942	1
3658		3943
3659	}	3944	}
3660		3945
…		…
3666	}	3951	}
3667		3952
3668	sub emergency_save() {	3953	sub emergency_save() {
3669	my $freeze_guard = cf::freeze_mainloop;	3954	my $freeze_guard = cf::freeze_mainloop;
3670		3955
3671	warn "emergency_perl_save: enter\n";	3956	info "emergency_perl_save: enter\n";
		3957
		3958	# this is a trade-off: we want to be very quick here, so
		3959	# save all maps without fsync, and later call a global sync
		3960	# (which in turn might be very very slow)
		3961	local $USE_FSYNC = 0;
3672		3962
3673	cf::sync_job {	3963	cf::sync_job {
3674	# this is a trade-off: we want to be very quick here, so	3964	cf::write_runtime_sync; # external watchdog should not bark
3675	# save all maps without fsync, and later call a global sync
3676	# (which in turn might be very very slow)
3677	local $USE_FSYNC = 0;
3678		3965
3679	# use a peculiar iteration method to avoid tripping on perl	3966	# use a peculiar iteration method to avoid tripping on perl
3680	# refcount bugs in for. also avoids problems with players	3967	# refcount bugs in for. also avoids problems with players
3681	# and maps saved/destroyed asynchronously.	3968	# and maps saved/destroyed asynchronously.
3682	warn "emergency_perl_save: begin player save\n";	3969	info "emergency_perl_save: begin player save\n";
3683	for my $login (keys %cf::PLAYER) {	3970	for my $login (keys %cf::PLAYER) {
3684	my $pl = $cf::PLAYER{$login} or next;	3971	my $pl = $cf::PLAYER{$login} or next;
3685	$pl->valid or next;	3972	$pl->valid or next;
3686	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3973	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3687	$pl->save;	3974	$pl->save;
3688	}	3975	}
3689	warn "emergency_perl_save: end player save\n";	3976	info "emergency_perl_save: end player save\n";
3690		3977
		3978	cf::write_runtime_sync; # external watchdog should not bark
		3979
3691	warn "emergency_perl_save: begin map save\n";	3980	info "emergency_perl_save: begin map save\n";
3692	for my $path (keys %cf::MAP) {	3981	for my $path (keys %cf::MAP) {
3693	my $map = $cf::MAP{$path} or next;	3982	my $map = $cf::MAP{$path} or next;
3694	$map->valid or next;	3983	$map->valid or next;
3695	$map->save;	3984	$map->save;
3696	}	3985	}
3697	warn "emergency_perl_save: end map save\n";	3986	info "emergency_perl_save: end map save\n";
3698		3987
		3988	cf::write_runtime_sync; # external watchdog should not bark
		3989
3699	warn "emergency_perl_save: begin database checkpoint\n";	3990	info "emergency_perl_save: begin database checkpoint\n";
3700	BDB::db_env_txn_checkpoint $DB_ENV;	3991	BDB::db_env_txn_checkpoint $DB_ENV;
3701	warn "emergency_perl_save: end database checkpoint\n";	3992	info "emergency_perl_save: end database checkpoint\n";
3702		3993
3703	warn "emergency_perl_save: begin write uuid\n";	3994	info "emergency_perl_save: begin write uuid\n";
3704	write_uuid_sync 1;	3995	write_uuid_sync 1;
3705	warn "emergency_perl_save: end write uuid\n";	3996	info "emergency_perl_save: end write uuid\n";
		3997
		3998	cf::write_runtime_sync; # external watchdog should not bark
		3999
		4000	trace "emergency_perl_save: syncing database to disk";
		4001	BDB::db_env_txn_checkpoint $DB_ENV;
		4002
		4003	info "emergency_perl_save: starting sync\n";
		4004	IO::AIO::aio_sync sub {
		4005	info "emergency_perl_save: finished sync\n";
		4006	};
		4007
		4008	cf::write_runtime_sync; # external watchdog should not bark
		4009
		4010	trace "emergency_perl_save: flushing outstanding aio requests";
		4011	while (IO::AIO::nreqs || BDB::nreqs) {
		4012	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
		4013	}
		4014
		4015	cf::write_runtime_sync; # external watchdog should not bark
3706	};	4016	};
3707		4017
3708	warn "emergency_perl_save: starting sync()\n";
3709	IO::AIO::aio_sync sub {
3710	warn "emergency_perl_save: finished sync()\n";
3711	};
3712
3713	warn "emergency_perl_save: leave\n";	4018	info "emergency_perl_save: leave\n";
3714	}	4019	}
3715		4020
3716	sub post_cleanup {	4021	sub post_cleanup {
3717	my ($make_core) = @_;	4022	my ($make_core) = @_;
3718		4023
		4024	IO::AIO::flush;
		4025
3719	warn Carp::longmess "post_cleanup backtrace"	4026	error Carp::longmess "post_cleanup backtrace"
3720	if $make_core;	4027	if $make_core;
3721		4028
3722	my $fh = pidfile;	4029	my $fh = pidfile;
3723	unlink $PIDFILE if <$fh> == $$;	4030	unlink $PIDFILE if <$fh> == $$;
3724	}	4031	}
…		…
3744	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	4051	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3745	for my $name (keys %$leaf_symtab) {	4052	for my $name (keys %$leaf_symtab) {
3746	_gv_clear *{"$pkg$name"};	4053	_gv_clear *{"$pkg$name"};
3747	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	4054	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3748	}	4055	}
3749	warn "cleared package $pkg\n";#d#
3750	}	4056	}
3751		4057
3752	sub do_reload_perl() {	4058	sub do_reload_perl() {
3753	# can/must only be called in main	4059	# can/must only be called in main
3754	if ($Coro::current != $Coro::main) {	4060	unless (in_main) {
3755	warn "can only reload from main coroutine";	4061	error "can only reload from main coroutine";
3756	return;	4062	return;
3757	}	4063	}
3758		4064
3759	return if $RELOAD++;	4065	return if $RELOAD++;
3760		4066
3761	my $t1 = EV::time;	4067	my $t1 = AE::time;
3762		4068
3763	while ($RELOAD) {	4069	while ($RELOAD) {
3764	warn "reloading...";	4070	cf::get_slot 0.1, -1, "reload_perl";
		4071	info "perl_reload: reloading...";
3765		4072
3766	warn "entering sync_job";	4073	trace "perl_reload: entering sync_job";
3767		4074
3768	cf::sync_job {	4075	cf::sync_job {
3769	cf::write_runtime_sync; # external watchdog should not bark
3770	cf::emergency_save;	4076	#cf::emergency_save;
3771	cf::write_runtime_sync; # external watchdog should not bark
3772		4077
3773	warn "syncing database to disk";
3774	BDB::db_env_txn_checkpoint $DB_ENV;
3775
3776	# if anything goes wrong in here, we should simply crash as we already saved
3777
3778	warn "flushing outstanding aio requests";
3779	while (IO::AIO::nreqs || BDB::nreqs) {
3780	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3781	}
3782
3783	warn "cancelling all extension coros";	4078	trace "perl_reload: cancelling all extension coros";
3784	$_->cancel for values %EXT_CORO;	4079	$_->cancel for values %EXT_CORO;
3785	%EXT_CORO = ();	4080	%EXT_CORO = ();
3786		4081
3787	warn "removing commands";	4082	trace "perl_reload: removing commands";
3788	%COMMAND = ();	4083	%COMMAND = ();
3789		4084
3790	warn "removing ext/exti commands";	4085	trace "perl_reload: removing ext/exti commands";
3791	%EXTCMD = ();	4086	%EXTCMD = ();
3792	%EXTICMD = ();	4087	%EXTICMD = ();
3793		4088
3794	warn "unloading/nuking all extensions";	4089	trace "perl_reload: unloading/nuking all extensions";
3795	for my $pkg (@EXTS) {	4090	for my $pkg (@EXTS) {
3796	warn "... unloading $pkg";	4091	trace "... unloading $pkg";
3797		4092
3798	if (my $cb = $pkg->can ("unload")) {	4093	if (my $cb = $pkg->can ("unload")) {
3799	eval {	4094	eval {
3800	$cb->($pkg);	4095	$cb->($pkg);
3801	1	4096	1
3802	} or warn "$pkg unloaded, but with errors: $@";	4097	} or error "$pkg unloaded, but with errors: $@";
3803	}	4098	}
3804		4099
3805	warn "... clearing $pkg";	4100	trace "... clearing $pkg";
3806	clear_package $pkg;	4101	clear_package $pkg;
3807	}	4102	}
3808		4103
3809	warn "unloading all perl modules loaded from $LIBDIR";	4104	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3810	while (my ($k, $v) = each %INC) {	4105	while (my ($k, $v) = each %INC) {
3811	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4106	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3812		4107
3813	warn "... unloading $k";	4108	trace "... unloading $k";
3814	delete $INC{$k};	4109	delete $INC{$k};
3815		4110
3816	$k =~ s/\.pm$//;	4111	$k =~ s/\.pm$//;
3817	$k =~ s/\//::/g;	4112	$k =~ s/\//::/g;
3818		4113
…		…
3821	}	4116	}
3822		4117
3823	clear_package $k;	4118	clear_package $k;
3824	}	4119	}
3825		4120
3826	warn "getting rid of safe::, as good as possible";	4121	trace "perl_reload: getting rid of safe::, as good as possible";
3827	clear_package "safe::$_"	4122	clear_package "safe::$_"
3828	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4123	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3829		4124
3830	warn "unloading cf.pm \"a bit\"";	4125	trace "perl_reload: unloading cf.pm \"a bit\"";
3831	delete $INC{"cf.pm"};	4126	delete $INC{"cf.pm"};
3832	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4127	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3833		4128
3834	# don't, removes xs symbols, too,	4129	# don't, removes xs symbols, too,
3835	# and global variables created in xs	4130	# and global variables created in xs
3836	#clear_package __PACKAGE__;	4131	#clear_package __PACKAGE__;
3837		4132
3838	warn "unload completed, starting to reload now";	4133	info "perl_reload: unload completed, starting to reload now";
3839		4134
3840	warn "reloading cf.pm";	4135	trace "perl_reload: reloading cf.pm";
3841	require cf;	4136	require cf;
3842	cf::_connect_to_perl_1;	4137	cf::_connect_to_perl_1;
3843		4138
3844	warn "loading config and database again";	4139	trace "perl_reload: loading config and database again";
3845	cf::reload_config;	4140	cf::reload_config;
3846		4141
3847	warn "loading extensions";	4142	trace "perl_reload: loading extensions";
3848	cf::load_extensions;	4143	cf::load_extensions;
3849		4144
3850	if ($REATTACH_ON_RELOAD) {	4145	if ($REATTACH_ON_RELOAD) {
3851	warn "reattaching attachments to objects/players";	4146	trace "perl_reload: reattaching attachments to objects/players";
3852	_global_reattach; # objects, sockets	4147	_global_reattach; # objects, sockets
3853	warn "reattaching attachments to maps";	4148	trace "perl_reload: reattaching attachments to maps";
3854	reattach $_ for values %MAP;	4149	reattach $_ for values %MAP;
3855	warn "reattaching attachments to players";	4150	trace "perl_reload: reattaching attachments to players";
3856	reattach $_ for values %PLAYER;	4151	reattach $_ for values %PLAYER;
3857	}	4152	}
3858		4153
3859	warn "running post_init jobs";	4154	cf::_post_init 1;
3860	(pop @POST_INIT)->(1) while @POST_INIT;
3861		4155
3862	warn "leaving sync_job";	4156	trace "perl_reload: leaving sync_job";
3863		4157
3864	1	4158	1
3865	} or do {	4159	} or do {
3866	warn $@;	4160	error $@;
3867	cf::cleanup "error while reloading, exiting.";	4161	cf::cleanup "perl_reload: error, exiting.";
3868	};	4162	};
3869		4163
3870	warn "reloaded";
3871	--$RELOAD;	4164	--$RELOAD;
3872	}	4165	}
3873		4166
3874	$t1 = EV::time - $t1;	4167	$t1 = AE::time - $t1;
3875	warn "reload completed in ${t1}s\n";	4168	info "perl_reload: completed in ${t1}s\n";
3876	};	4169	};
3877		4170
3878	our $RELOAD_WATCHER; # used only during reload	4171	our $RELOAD_WATCHER; # used only during reload
3879		4172
3880	sub reload_perl() {	4173	sub reload_perl() {
…		…
3882	# coro crashes during coro_state_free->destroy here.	4175	# coro crashes during coro_state_free->destroy here.
3883		4176
3884	$RELOAD_WATCHER ||= cf::async {	4177	$RELOAD_WATCHER ||= cf::async {
3885	Coro::AIO::aio_wait cache_extensions;	4178	Coro::AIO::aio_wait cache_extensions;
3886		4179
3887	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	4180	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3888	do_reload_perl;	4181	do_reload_perl;
3889	undef $RELOAD_WATCHER;	4182	undef $RELOAD_WATCHER;
3890	};	4183	};
3891	};	4184	};
3892	}	4185	}
…		…
3901	reload_perl;	4194	reload_perl;
3902	};	4195	};
3903	}	4196	}
3904	};	4197	};
3905		4198
3906	unshift @INC, $LIBDIR;	4199	#############################################################################
3907		4200
3908	my $bug_warning = 0;	4201	my $bug_warning = 0;
3909		4202
3910	our @WAIT_FOR_TICK;
3911	our @WAIT_FOR_TICK_BEGIN;
3912
3913	sub wait_for_tick {	4203	sub wait_for_tick() {
3914	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4204	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3915		4205
3916	my $signal = new Coro::Signal;	4206	$WAIT_FOR_TICK->wait;
3917	push @WAIT_FOR_TICK, $signal;
3918	$signal->wait;
3919	}	4207	}
3920		4208
3921	sub wait_for_tick_begin {	4209	sub wait_for_tick_begin() {
3922	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4210	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3923		4211
3924	my $signal = new Coro::Signal;	4212	my $signal = new Coro::Signal;
3925	push @WAIT_FOR_TICK_BEGIN, $signal;	4213	push @WAIT_FOR_TICK_BEGIN, $signal;
3926	$signal->wait;	4214	$signal->wait;
3927	}	4215	}
…		…
3931	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4219	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3932	unless ++$bug_warning > 10;	4220	unless ++$bug_warning > 10;
3933	return;	4221	return;
3934	}	4222	}
3935		4223
3936	cf::server_tick; # one server iteration	4224	cf::one_tick; # one server iteration
3937		4225
3938	#for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#	4226	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3939		4227
3940	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4228	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3941	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4229	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3942	Coro::async_pool {	4230	Coro::async_pool {
3943	$Coro::current->{desc} = "runtime saver";	4231	$Coro::current->{desc} = "runtime saver";
3944	write_runtime_sync	4232	write_runtime_sync
3945	or warn "ERROR: unable to write runtime file: $!";	4233	or error "ERROR: unable to write runtime file: $!";
3946	};	4234	};
3947	}	4235	}
3948		4236
3949	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4237	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3950	$sig->send;	4238	$sig->send;
3951	}	4239	}
3952	while (my $sig = shift @WAIT_FOR_TICK) {	4240	$WAIT_FOR_TICK->broadcast;
3953	$sig->send;
3954	}
3955		4241
3956	$LOAD = ($NOW - $TICK_START) / $TICK;	4242	$LOAD = ($NOW - $TICK_START) / $TICK;
3957	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4243	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3958		4244
3959	if (0) {	4245	if (0) {
3960	if ($NEXT_TICK) {	4246	if ($NEXT_TICK) {
3961	my $jitter = $TICK_START - $NEXT_TICK;	4247	my $jitter = $TICK_START - $NEXT_TICK;
3962	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4248	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3963	warn "jitter $JITTER\n";#d#	4249	debug "jitter $JITTER\n";#d#
3964	}	4250	}
3965	}	4251	}
3966	}	4252	}
3967		4253
3968	{	4254	{
3969	# configure BDB	4255	# configure BDB
		4256	info "initialising database";
3970		4257
3971	BDB::min_parallel 16;	4258	BDB::min_parallel 16;
3972	BDB::max_poll_reqs $TICK * 0.1;	4259	BDB::max_poll_reqs $TICK * 0.1;
3973	$AnyEvent::BDB::WATCHER->priority (1);	4260	#$AnyEvent::BDB::WATCHER->priority (1);
3974		4261
3975	unless ($DB_ENV) {	4262	unless ($DB_ENV) {
3976	$DB_ENV = BDB::db_env_create;	4263	$DB_ENV = BDB::db_env_create;
3977	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4264	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3978	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4265	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4003	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4290	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4004	};	4291	};
4005	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4292	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4006	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4293	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4007	};	4294	};
		4295
		4296	info "database initialised";
4008	}	4297	}
4009		4298
4010	{	4299	{
4011	# configure IO::AIO	4300	# configure IO::AIO
4012		4301
		4302	info "initialising aio";
4013	IO::AIO::min_parallel 8;	4303	IO::AIO::min_parallel 8;
4014	IO::AIO::max_poll_time $TICK * 0.1;	4304	IO::AIO::max_poll_time $TICK * 0.1;
4015	undef $AnyEvent::AIO::WATCHER;	4305	undef $AnyEvent::AIO::WATCHER;
		4306	info "aio initialised";
4016	}	4307	}
4017		4308
4018	my $_log_backtrace;	4309	our $_log_backtrace;
		4310	our $_log_backtrace_last;
4019		4311
4020	sub _log_backtrace {	4312	sub _log_backtrace {
4021	my ($msg, @addr) = @_;	4313	my ($msg, @addr) = @_;
4022		4314
4023	$msg =~ s/\n//;	4315	$msg =~ s/\n$//;
4024		4316
		4317	if ($_log_backtrace_last eq $msg) {
		4318	LOG llevInfo, "[ABT] $msg\n";
		4319	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4025	# limit the # of concurrent backtraces	4320	# limit the # of concurrent backtraces
4026	if ($_log_backtrace < 2) {	4321	} elsif ($_log_backtrace < 2) {
		4322	$_log_backtrace_last = $msg;
4027	++$_log_backtrace;	4323	++$_log_backtrace;
4028	my $perl_bt = Carp::longmess $msg;	4324	my $perl_bt = Carp::longmess $msg;
4029	async {	4325	async {
4030	$Coro::current->{desc} = "abt $msg";	4326	$Coro::current->{desc} = "abt $msg";
4031		4327
…		…
4051	LOG llevInfo, "[ABT] $_\n" for @bt;	4347	LOG llevInfo, "[ABT] $_\n" for @bt;
4052	--$_log_backtrace;	4348	--$_log_backtrace;
4053	};	4349	};
4054	} else {	4350	} else {
4055	LOG llevInfo, "[ABT] $msg\n";	4351	LOG llevInfo, "[ABT] $msg\n";
4056	LOG llevInfo, "[ABT] [suppressed]\n";	4352	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4057	}	4353	}
4058	}	4354	}
4059		4355
4060	# load additional modules	4356	# load additional modules
4061	require "cf/$_.pm" for @EXTRA_MODULES;	4357	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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