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.539 by root, Tue May 4 22:49:21 2010 UTC vs.
Revision 1.599 by root, Sun Nov 11 04:29:11 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
…		…
32	use Safe;	32	use Safe;
33	use Safe::Hole;	33	use Safe::Hole;
34	use Storable ();	34	use Storable ();
35	use Carp ();	35	use Carp ();
36		36
37	use Guard ();	37	use AnyEvent ();
		38	use AnyEvent::IO ();
		39	use AnyEvent::DNS ();
		40
38	use Coro ();	41	use Coro ();
39	use Coro::State;	42	use Coro::State;
40	use Coro::Handle;	43	use Coro::Handle;
41	use Coro::EV;	44	use Coro::EV;
42	use Coro::AnyEvent;	45	use Coro::AnyEvent;
…		…
48	use Coro::AIO;	51	use Coro::AIO;
49	use Coro::BDB 1.6;	52	use Coro::BDB 1.6;
50	use Coro::Storable;	53	use Coro::Storable;
51	use Coro::Util ();	54	use Coro::Util ();
52		55
		56	use Guard ();
53	use JSON::XS 2.01 ();	57	use JSON::XS 2.01 ();
54	use BDB ();	58	use BDB ();
55	use Data::Dumper;	59	use Data::Dumper;
56	use Fcntl;	60	use Fcntl;
57	use YAML::XS ();	61	use YAML::XS ();
58	use IO::AIO ();	62	use IO::AIO ();
59	use Time::HiRes;
60	use Compress::LZF;	63	use Compress::LZF;
61	use Digest::MD5 ();	64	use Digest::MD5 ();
62		65
63	AnyEvent::detect;	66	AnyEvent::detect;
64		67
…		…
76	# strictly for debugging	79	# strictly for debugging
77	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	80	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
78		81
79	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	82	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80		83
		84	our @ORIG_INC;
		85
81	our %COMMAND = ();	86	our %COMMAND = ();
82	our %COMMAND_TIME = ();	87	our %COMMAND_TIME = ();
83		88
84	our @EXTS = (); # list of extension package names	89	our @EXTS = (); # list of extension package names
85	our %EXTCMD = ();	90	our %EXTCMD = ();
		91	our %EXTACMD = ();
86	our %EXTICMD = ();	92	our %EXTICMD = ();
		93	our %EXTIACMD = ();
87	our %EXT_CORO = (); # coroutines bound to extensions	94	our %EXT_CORO = (); # coroutines bound to extensions
88	our %EXT_MAP = (); # pluggable maps	95	our %EXT_MAP = (); # pluggable maps
89		96
90	our $RELOAD; # number of reloads so far, non-zero while in reload	97	our $RELOAD; # number of reloads so far, non-zero while in reload
91	our @EVENT;	98	our @EVENT;
92	our @REFLECT; # set by XS	99	our @REFLECT; # set by XS
93	our %REFLECT; # set by us	100	our %REFLECT; # set by us
94		101
95	our $CONFDIR = confdir;	102	our $CONFDIR = confdir;
		103
96	our $DATADIR = datadir;	104	our $DATADIR = datadir;
97	our $LIBDIR = "$DATADIR/ext";	105	our $LIBDIR = "$DATADIR/ext";
98	our $PODDIR = "$DATADIR/pod";	106	our $PODDIR = "$DATADIR/pod";
99	our $MAPDIR = "$DATADIR/" . mapdir;	107	our $MAPDIR = "$DATADIR/" . mapdir;
		108
100	our $LOCALDIR = localdir;	109	our $LOCALDIR = localdir;
101	our $TMPDIR = "$LOCALDIR/" . tmpdir;	110	our $TMPDIR = "$LOCALDIR/" . tmpdir;
102	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	111	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
103	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	112	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
104	our $RANDOMDIR = "$LOCALDIR/random";	113	our $RANDOMDIR = "$LOCALDIR/random";
105	our $BDBDIR = "$LOCALDIR/db";	114	our $BDBDIR = "$LOCALDIR/db";
106	our $PIDFILE = "$LOCALDIR/pid";	115	our $PIDFILE = "$LOCALDIR/pid";
107	our $RUNTIMEFILE = "$LOCALDIR/runtime";	116	our $RUNTIMEFILE = "$LOCALDIR/runtime";
108		117
109	our %RESOURCE; # unused	118	#our %RESOURCE; # unused
110		119
111	our $OUTPUT_RATE_MIN = 3000;	120	our $OUTPUT_RATE_MIN = 3000;
112	our $OUTPUT_RATE_MAX = 1000000;	121	our $OUTPUT_RATE_MAX = 1000000;
113		122
114	our $MAX_LINKS = 32; # how many chained exits to follow	123	our $MAX_LINKS = 32; # how many chained exits to follow
…		…
122	our $BDB_DEADLOCK_WATCHER;	131	our $BDB_DEADLOCK_WATCHER;
123	our $BDB_CHECKPOINT_WATCHER;	132	our $BDB_CHECKPOINT_WATCHER;
124	our $BDB_TRICKLE_WATCHER;	133	our $BDB_TRICKLE_WATCHER;
125	our $DB_ENV;	134	our $DB_ENV;
126		135
127	our @EXTRA_MODULES = qw(pod match mapscript);	136	our @EXTRA_MODULES = qw(pod match mapscript incloader);
128		137
129	our %CFG;	138	our %CFG;
		139	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
130		140
131	our $UPTIME; $UPTIME ||= time;	141	our $UPTIME; $UPTIME ||= time;
132	our $RUNTIME;	142	our $RUNTIME = 0;
		143	our $SERVER_TICK = 0;
133	our $NOW;	144	our $NOW;
134		145
135	our (%PLAYER, %PLAYER_LOADING); # all users	146	our (%PLAYER, %PLAYER_LOADING); # all users
136	our (%MAP, %MAP_LOADING ); # all maps	147	our (%MAP, %MAP_LOADING ); # all maps
137	our $LINK_MAP; # the special {link} map, which is always available	148	our $LINK_MAP; # the special {link} map, which is always available
…		…
146		157
147	our @POST_INIT;	158	our @POST_INIT;
148		159
149	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	160	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
150	our $REALLY_UNLOOP; # never set to true, please :)	161	our $REALLY_UNLOOP; # never set to true, please :)
		162
		163	our $WAIT_FOR_TICK = new Coro::Signal;
		164	our @WAIT_FOR_TICK_BEGIN;
151		165
152	binmode STDOUT;	166	binmode STDOUT;
153	binmode STDERR;	167	binmode STDERR;
154		168
155	# read virtual server time, if available	169	# read virtual server time, if available
…		…
189		203
190	=over 4	204	=over 4
191		205
192	=item $cf::UPTIME	206	=item $cf::UPTIME
193		207
194	The timestamp of the server start (so not actually an uptime).	208	The timestamp of the server start (so not actually an "uptime").
		209
		210	=item $cf::SERVER_TICK
		211
		212	An unsigned integer that starts at zero when the server is started and is
		213	incremented on every tick.
		214
		215	=item $cf::NOW
		216
		217	The (real) time of the last (current) server tick - updated before and
		218	after tick processing, so this is useful only as a rough "what time is it
		219	now" estimate.
		220
		221	=item $cf::TICK
		222
		223	The interval between each server tick, in seconds.
195		224
196	=item $cf::RUNTIME	225	=item $cf::RUNTIME
197		226
198	The time this server has run, starts at 0 and is increased by $cf::TICK on	227	The time this server has run, starts at 0 and is increased by $cf::TICK on
199	every server tick.	228	every server tick.
200		229
201	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	230	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
202	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	231	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
203	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	232	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
204		233
205	Various directories - "/etc", read-only install directory, perl-library	234	Various directories - "/etc", read-only install directory, perl-library
206	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	235	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
207	unique-items directory, player file directory, random maps directory and	236	unique-items directory, player file directory, random maps directory and
208	database environment.	237	database environment.
209		238
210	=item $cf::NOW
211
212	The time of the last (current) server tick.
213
214	=item $cf::TICK
215
216	The interval between server ticks, in seconds.
217
218	=item $cf::LOADAVG	239	=item $cf::LOADAVG
219		240
220	The current CPU load on the server (alpha-smoothed), as a value between 0	241	The current CPU load on the server (alpha-smoothed), as a value between 0
221	(none) and 1 (overloaded), indicating how much time is spent on processing	242	(none) and 1 (overloaded), indicating how much time is spent on processing
222	objects per tick. Healthy values are < 0.5.	243	objects per tick. Healthy values are < 0.5.
…		…
230	Configuration for the server, loaded from C</etc/deliantra-server/config>, or	251	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
231	from wherever your confdir points to.	252	from wherever your confdir points to.
232		253
233	=item cf::wait_for_tick, cf::wait_for_tick_begin	254	=item cf::wait_for_tick, cf::wait_for_tick_begin
234		255
235	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	256	These are functions that inhibit the current coroutine one tick.
236	returns directly I<after> the tick processing (and consequently, can only wake one process	257	cf::wait_for_tick_begin only returns directly I<after> the tick
		258	processing (and consequently, can only wake one thread per tick), while
237	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	259	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();
238		277
239	=item @cf::INVOKE_RESULTS	278	=item @cf::INVOKE_RESULTS
240		279
241	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
242	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
…		…
303	)) {	342	)) {
304	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	343	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
305	}	344	}
306		345
307	$EV::DIED = sub {	346	$EV::DIED = sub {
308	Carp::cluck "error in event callback: @_";	347	warn "error in event callback: $@";
309	};	348	};
		349
		350	#############################################################################
		351
		352	sub fork_call(&@);
		353	sub get_slot($;$$);
310		354
311	#############################################################################	355	#############################################################################
312		356
313	=head2 UTILITY FUNCTIONS	357	=head2 UTILITY FUNCTIONS
314		358
…		…
335	$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;
336	$d	380	$d
337	} || "[unable to dump $_[0]: '$@']";	381	} || "[unable to dump $_[0]: '$@']";
338	}	382	}
339		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
340	=item $ref = cf::decode_json $json	436	=item $ref = cf::decode_json $json
341		437
342	Converts a JSON string into the corresponding perl data structure.	438	Converts a JSON string into the corresponding perl data structure.
343		439
344	=item $json = cf::encode_json $ref	440	=item $json = cf::encode_json $ref
…		…
350	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
351		447
352	sub encode_json($) { $json_coder->encode ($_[0]) }	448	sub encode_json($) { $json_coder->encode ($_[0]) }
353	sub decode_json($) { $json_coder->decode ($_[0]) }	449	sub decode_json($) { $json_coder->decode ($_[0]) }
354		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
355	=item cf::post_init { BLOCK }	482	=item cf::post_init { BLOCK }
356		483
357	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,
358	but I<before> the server starts ticking again.	485	but I<before> the server starts ticking again.
359		486
360	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
361	is a reload or not.	488	is a reload or not.
362		489
363	=cut	490	=cut
364		491
365	sub post_init(&) {	492	sub post_init(&) {
366	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	}
367	}	511	}
368		512
369	=item cf::lock_wait $string	513	=item cf::lock_wait $string
370		514
371	Wait until the given lock is available. See cf::lock_acquire.	515	Wait until the given lock is available. See cf::lock_acquire.
…		…
424	EV::periodic $start, $interval, 0, $cb	568	EV::periodic $start, $interval, 0, $cb
425	}	569	}
426		570
427	=item cf::get_slot $time[, $priority[, $name]]	571	=item cf::get_slot $time[, $priority[, $name]]
428		572
429	Allocate $time seconds of blocking CPU time at priority C<$priority>:	573	Allocate $time seconds of blocking CPU time at priority C<$priority>
430	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
431	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.
432		580
433	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
434	used for statistical purposes and should identify the same time-class.	582	used for statistical purposes and should identify the same time-class.
435		583
436	Useful for short background jobs.	584	Useful for short background jobs.
…		…
465	}	613	}
466	}	614	}
467		615
468	if (@SLOT_QUEUE) {	616	if (@SLOT_QUEUE) {
469	# 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
470	push @cf::WAIT_FOR_TICK, $signal;	618	$WAIT_FOR_TICK->wait;
471	$signal->wait;
472	} else {	619	} else {
473	$busy = 0;	620	$busy = 0;
474	Coro::schedule;	621	Coro::schedule;
475	}	622	}
476	}	623	}
…		…
576	$EXT_CORO{$coro+0} = $coro;	723	$EXT_CORO{$coro+0} = $coro;
577		724
578	$coro	725	$coro
579	}	726	}
580		727
581	=item fork_call { }, $args	728	=item fork_call { }, @args
582		729
583	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
584	process, returning the results. Everything must be serialisable with	731	process, returning the results. Everything must be serialisable with
585	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
586	never block itself or use any form of event handling.	733	never block itself or use any form of event handling.
587		734
588	=cut	735	=cut
589		736
		737	sub post_fork {
		738	reset_signals;
		739	}
		740
590	sub fork_call(&@) {	741	sub fork_call(&@) {
591	my ($cb, @args) = @_;	742	my ($cb, @args) = @_;
592		743
593	# 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,
594	# otherwise perl prematurely frees the stuff :/	745	# otherwise perl prematurely frees the stuff :/
595	# TODO: investigate and fix (likely this will be rather laborious)	746	# TODO: investigate and fix (likely this will be rather laborious)
596		747
597	my @res = Coro::Util::fork_eval {	748	my @res = Coro::Util::fork_eval {
598	reset_signals;	749	cf::post_fork;
599	&$cb	750	&$cb
600	}, @args;	751	} @args;
601		752
602	wantarray ? @res : $res[-1]	753	wantarray ? @res : $res[-1]
603	}	754	}
604		755
605	sub objinfo {	756	sub objinfo {
…		…
727		878
728	my @data;	879	my @data;
729	my $md5;	880	my $md5;
730		881
731	for (0 .. $#$src) {	882	for (0 .. $#$src) {
732	0 <= aio_load $src->[$_], $data[$_]	883	$data[$_] = load_file $src->[$_];
733	or Carp::croak "$src->[$_]: $!";
734	}	884	}
735		885
736	# if processing is expensive, check	886	# if processing is expensive, check
737	# checksum first	887	# checksum first
738	if (1) {	888	if (1) {
…		…
751		901
752	return db_get cache => "$id/data";	902	return db_get cache => "$id/data";
753	}	903	}
754	}	904	}
755		905
756	my $t1 = Time::HiRes::time;	906	my $t1 = EV::time;
757	my $data = $process->(\@data);	907	my $data = $process->(\@data);
758	my $t2 = Time::HiRes::time;	908	my $t2 = EV::time;
759		909
760	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	910	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
761		911
762	db_put cache => "$id/data", $data;	912	db_put cache => "$id/data", $data;
763	db_put cache => "$id/md5" , $md5;	913	db_put cache => "$id/md5" , $md5;
…		…
1283	=cut	1433	=cut
1284		1434
1285	#############################################################################	1435	#############################################################################
1286	# command handling &c	1436	# command handling &c
1287		1437
1288	=item cf::register_command $name => \&callback($ob,$args);	1438	=item cf::register_command $name => \&callback($ob,$args)
1289		1439
1290	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
1291	$name.	1441	$name.
1292		1442
1293	=cut	1443	=cut
…		…
1299	#warn "registering command '$name/$time' to '$caller'";	1449	#warn "registering command '$name/$time' to '$caller'";
1300		1450
1301	push @{ $COMMAND{$name} }, [$caller, $cb];	1451	push @{ $COMMAND{$name} }, [$caller, $cb];
1302	}	1452	}
1303		1453
1304	=item cf::register_extcmd $name => \&callback($pl,$packet);	1454	=item cf::register_extcmd $name => \&callback($pl,@args)
1305		1455
1306	Register a callback for execution when the client sends an (synchronous)	1456	Register a callback for execution when the client sends an (synchronous)
1307	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
1308	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
1309	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
1310	has logged in successfully.	1460	has logged in successfully.
1311		1461
1312	If the callback returns something, it is sent back as if reply was being	1462	The values will be sent back to the client.
1313	called.
1314		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
1315	=item cf::register_exticmd $name => \&callback($ns,$packet);	1469	=item cf::register_exticmd $name => \&callback($ns,@args)
1316		1470
1317	Register a callback for execution when the client sends an (asynchronous)	1471	Register a callback for execution when the client sends an (asynchronous)
1318	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
1319	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
1320	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
1321	log-in.	1475	log-in.
1322		1476
1323	If the callback returns something, it is sent back as if reply was being	1477	The values will be sent back to the client.
1324	called.
1325		1478
1326	=cut	1479	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1327		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
1328	sub register_extcmd {	1486	sub register_extcmd($$) {
1329	my ($name, $cb) = @_;	1487	my ($name, $cb) = @_;
1330		1488
1331	$EXTCMD{$name} = $cb;	1489	$EXTCMD{$name} = $cb;
1332	}	1490	}
1333		1491
1334	sub register_exticmd {	1492	sub register_async_extcmd($$) {
1335	my ($name, $cb) = @_;	1493	my ($name, $cb) = @_;
1336		1494
		1495	$EXTACMD{$name} = $cb;
		1496	}
		1497
		1498	sub register_exticmd($$) {
		1499	my ($name, $cb) = @_;
		1500
1337	$EXTICMD{$name} = $cb;	1501	$EXTICMD{$name} = $cb;
		1502	}
		1503
		1504	sub register_async_exticmd($$) {
		1505	my ($name, $cb) = @_;
		1506
		1507	$EXTIACMD{$name} = $cb;
1338	}	1508	}
1339		1509
1340	use File::Glob ();	1510	use File::Glob ();
1341		1511
1342	cf::player->attach (	1512	cf::player->attach (
…		…
1356	my ($pl, $buf) = @_;	1526	my ($pl, $buf) = @_;
1357		1527
1358	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1528	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1359		1529
1360	if (ref $msg) {	1530	if (ref $msg) {
1361	my ($type, $reply, @payload) =	1531	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1362	"ARRAY" eq ref $msg
1363	? @$msg
1364	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1365		1532
1366	my @reply;
1367
1368	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}) {
1369	@reply = $cb->($pl, @payload);	1546	@reply = $cb->($pl, @payload);
		1547	}
		1548
		1549	$pl->ext_msg ("reply-$reply", @reply)
		1550	if $reply;
1370	}	1551	}
1371
1372	$pl->ext_reply ($reply, @reply)
1373	if $reply;
1374		1552
1375	} else {	1553	} else {
1376	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1554	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1377	}	1555	}
1378		1556
…		…
1391	};	1569	};
1392		1570
1393	$grp	1571	$grp
1394	}	1572	}
1395		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
1396	sub load_extensions {	1585	sub load_extensions {
1397	info "loading extensions...";	1586	info "loading extensions...";
		1587
		1588	%EXT_CFG = ();
1398		1589
1399	cf::sync_job {	1590	cf::sync_job {
1400	my %todo;	1591	my %todo;
1401		1592
1402	for my $path (<$LIBDIR/*.ext>) {	1593	for my $path (<$LIBDIR/*.ext>) {
…		…
1445	unless exists $done{$_};	1636	unless exists $done{$_};
1446	}	1637	}
1447		1638
1448	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1639	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1449		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
1450	my $active = eval $v->{source};	1650	my $active = eval $source;
1451		1651
1452	if (length $@) {	1652	if (length $@) {
1453	error "$v->{path}: $@\n";	1653	error "$v->{path}: $@\n";
1454	undef $@; # work around perl 5.10.0 utf-8 caching bug
1455		1654
1456	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1655	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1457	if exists $v->{meta}{mandatory};	1656	if exists $v->{meta}{mandatory};
1458		1657
1459	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";	1658	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
…		…
1473		1672
1474	while (my ($k, $v) = each %todo) {	1673	while (my ($k, $v) = each %todo) {
1475	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1674	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1476	if exists $v->{meta}{mandatory};	1675	if exists $v->{meta}{mandatory};
1477	}	1676	}
		1677
		1678	last;
1478	}	1679	}
1479	}	1680	}
1480	};	1681	};
1481	}	1682	}
1482		1683
…		…
1640	my $name = $pl->ob->name;	1841	my $name = $pl->ob->name;
1641		1842
1642	$pl->{deny_save} = 1;	1843	$pl->{deny_save} = 1;
1643	$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
1644		1845
1645	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1846	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1646	$pl->deactivate;	1847	$pl->deactivate;
		1848
1647	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;
1648	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1850	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1851	ext::highscore::check ($pl->ob);
		1852
1649	$pl->ns->destroy if $pl->ns;	1853	$pl->ns->destroy if $pl->ns;
1650		1854
1651	my $path = playerdir $pl;	1855	my $path = playerdir $pl;
1652	my $temp = "$path~$cf::RUNTIME~deleting~";	1856	my $temp = "$path~$cf::RUNTIME~deleting~";
1653	aio_rename $path, $temp;	1857	aio_rename $path, $temp;
…		…
1739		1943
1740	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1944	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1741		1945
1742	Expand deliantra pod fragments into protocol xml.	1946	Expand deliantra pod fragments into protocol xml.
1743		1947
1744	=item $player->ext_reply ($msgid, @msg)
1745
1746	Sends an ext reply to the player.
1747
1748	=cut
1749
1750	sub ext_reply($$@) {
1751	my ($self, $id, @msg) = @_;
1752
1753	$self->ns->ext_reply ($id, @msg)
1754	}
1755
1756	=item $player->ext_msg ($type, @msg)	1948	=item $player->ext_msg ($type, @msg)
1757		1949
1758	Sends an ext event to the client.	1950	Sends an ext event to the client.
1759		1951
1760	=cut	1952	=cut
…		…
1819	sub generate_random_map {	2011	sub generate_random_map {
1820	my ($self, $rmp) = @_;	2012	my ($self, $rmp) = @_;
1821		2013
1822	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
1823		2015
1824	# mit "rum" bekleckern, nicht
1825	$self->_create_random_map (	2016	$self->_create_random_map ($rmp);
1826	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1827	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1828	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1829	$rmp->{exit_on_final_map},
1830	$rmp->{xsize}, $rmp->{ysize},
1831	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1832	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1833	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1834	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1835	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1836	(cf::region::find $rmp->{region}), $rmp->{custom}
1837	)
1838	}	2017	}
1839		2018
1840	=item cf::map->register ($regex, $prio)	2019	=item cf::map->register ($regex, $prio)
1841		2020
1842	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
…		…
1868	}	2047	}
1869		2048
1870	sub normalise {	2049	sub normalise {
1871	my ($path, $base) = @_;	2050	my ($path, $base) = @_;
1872		2051
1873	$path = "$path"; # make sure its a string	2052	$path = "$path"; # make sure it's a string
1874		2053
1875	$path =~ s/\.map$//;	2054	$path =~ s/\.map$//;
1876		2055
1877	# map plan:	2056	# map plan:
1878	#	2057	#
…		…
1893	$base =~ s{[^/]+/?$}{};	2072	$base =~ s{[^/]+/?$}{};
1894	$path = "$base/$path";	2073	$path = "$base/$path";
1895	}	2074	}
1896		2075
1897	for ($path) {	2076	for ($path) {
1898	redo if s{//}{/};
1899	redo if s{/\.?/}{/};	2077	redo if s{/\.?/}{/};
1900	redo if s{/[^/]+/\.\./}{/};	2078	redo if s{/[^/]+/\.\./}{/};
1901	}	2079	}
1902		2080
1903	$path	2081	$path
…		…
1917	$self->init; # pass $1 etc.	2095	$self->init; # pass $1 etc.
1918	return $self;	2096	return $self;
1919	}	2097	}
1920	}	2098	}
1921		2099
1922	Carp::cluck "unable to resolve path '$path' (base '$base').";	2100	Carp::cluck "unable to resolve path '$path' (base '$base')";
1923	()	2101	()
1924	}	2102	}
1925		2103
		2104	# may re-bless or do other evil things
1926	sub init {	2105	sub init {
1927	my ($self) = @_;	2106	my ($self) = @_;
1928		2107
1929	$self	2108	$self
1930	}	2109	}
…		…
1995	$self->{load_path} = $path;	2174	$self->{load_path} = $path;
1996		2175
1997	1	2176	1
1998	}	2177	}
1999		2178
		2179	# used to laod the header of an original map
2000	sub load_header_orig {	2180	sub load_header_orig {
2001	my ($self) = @_;	2181	my ($self) = @_;
2002		2182
2003	$self->load_header_from ($self->load_path)	2183	$self->load_header_from ($self->load_path)
2004	}	2184	}
2005		2185
		2186	# used to laod the header of an instantiated map
2006	sub load_header_temp {	2187	sub load_header_temp {
2007	my ($self) = @_;	2188	my ($self) = @_;
2008		2189
2009	$self->load_header_from ($self->save_path)	2190	$self->load_header_from ($self->save_path)
2010	}	2191	}
2011		2192
		2193	# called after loading the header from an instantiated map
2012	sub prepare_temp {	2194	sub prepare_temp {
2013	my ($self) = @_;	2195	my ($self) = @_;
2014		2196
2015	$self->last_access ((delete $self->{last_access})	2197	$self->last_access ((delete $self->{last_access})
2016	|| $cf::RUNTIME); #d#	2198	|| $cf::RUNTIME); #d#
2017	# safety	2199	# safety
2018	$self->{instantiate_time} = $cf::RUNTIME	2200	$self->{instantiate_time} = $cf::RUNTIME
2019	if $self->{instantiate_time} > $cf::RUNTIME;	2201	if $self->{instantiate_time} > $cf::RUNTIME;
2020	}	2202	}
2021		2203
		2204	# called after loading the header from an original map
2022	sub prepare_orig {	2205	sub prepare_orig {
2023	my ($self) = @_;	2206	my ($self) = @_;
2024		2207
2025	$self->{load_original} = 1;	2208	$self->{load_original} = 1;
2026	$self->{instantiate_time} = $cf::RUNTIME;	2209	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2050		2233
2051	sub find;	2234	sub find;
2052	sub find {	2235	sub find {
2053	my ($path, $origin) = @_;	2236	my ($path, $origin) = @_;
2054		2237
		2238	cf::cede_to_tick;
		2239
2055	$path = normalise $path, $origin && $origin->path;	2240	$path = normalise $path, $origin;
2056		2241
2057	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2242	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2058	my $guard2 = cf::lock_acquire "map_find:$path";	2243	my $guard2 = cf::lock_acquire "map_find:$path";
2059		2244
2060	$cf::MAP{$path} || do {	2245	$cf::MAP{$path} || do {
…		…
2091		2276
2092	{	2277	{
2093	my $guard = cf::lock_acquire "map_data:$path";	2278	my $guard = cf::lock_acquire "map_data:$path";
2094		2279
2095	return unless $self->valid;	2280	return unless $self->valid;
2096	return unless $self->in_memory == cf::MAP_SWAPPED;	2281	return unless $self->state == cf::MAP_SWAPPED;
2097
2098	$self->in_memory (cf::MAP_LOADING);
2099		2282
2100	$self->alloc;	2283	$self->alloc;
2101		2284
2102	$self->pre_load;	2285	$self->pre_load;
2103	cf::cede_to_tick;	2286	cf::cede_to_tick;
2104		2287
		2288	if (exists $self->{load_path}) {
2105	my $f = new_from_file cf::object::thawer $self->{load_path};	2289	my $f = new_from_file cf::object::thawer $self->{load_path};
2106	$f->skip_block;	2290	$f->skip_block;
2107	$self->_load_objects ($f)	2291	$self->_load_objects ($f)
2108	or return;	2292	or return;
2109		2293
2110	$self->post_load_original	2294	$self->post_load_original
2111	if delete $self->{load_original};	2295	if delete $self->{load_original};
2112		2296
2113	if (my $uniq = $self->uniq_path) {	2297	if (my $uniq = $self->uniq_path) {
2114	utf8::encode $uniq;	2298	utf8::encode $uniq;
2115	unless (aio_stat $uniq) {	2299	unless (aio_stat $uniq) {
2116	if (my $f = new_from_file cf::object::thawer $uniq) {	2300	if (my $f = new_from_file cf::object::thawer $uniq) {
2117	$self->clear_unique_items;	2301	$self->clear_unique_items;
2118	$self->_load_objects ($f);	2302	$self->_load_objects ($f);
2119	$f->resolve_delayed_derefs;	2303	$f->resolve_delayed_derefs;
		2304	}
2120	}	2305	}
2121	}	2306	}
2122	}
2123		2307
2124	$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);
2125		2315
2126	cf::cede_to_tick;	2316	cf::cede_to_tick;
2127	# now do the right thing for maps	2317	# now do the right thing for maps
2128	$self->link_multipart_objects;	2318	$self->link_multipart_objects;
2129	$self->difficulty ($self->estimate_difficulty)	2319	$self->difficulty ($self->estimate_difficulty)
…		…
2133	unless ($self->{deny_activate}) {	2323	unless ($self->{deny_activate}) {
2134	$self->decay_objects;	2324	$self->decay_objects;
2135	$self->fix_auto_apply;	2325	$self->fix_auto_apply;
2136	$self->update_buttons;	2326	$self->update_buttons;
2137	cf::cede_to_tick;	2327	cf::cede_to_tick;
2138	$self->activate;	2328	#$self->activate; # no longer activate maps automatically
2139	}	2329	}
2140		2330
2141	$self->{last_save} = $cf::RUNTIME;	2331	$self->{last_save} = $cf::RUNTIME;
2142	$self->last_access ($cf::RUNTIME);	2332	$self->last_access ($cf::RUNTIME);
2143
2144	$self->in_memory (cf::MAP_ACTIVE);
2145	}	2333	}
2146		2334
2147	$self->post_load;	2335	$self->post_load;
		2336
		2337	1
2148	}	2338	}
2149		2339
2150	# customize the map for a given player, i.e.	2340	# customize the map for a given player, i.e.
2151	# return the _real_ map. used by e.g. per-player	2341	# return the _real_ map. used by e.g. per-player
2152	# maps to change the path to ~playername/mappath	2342	# maps to change the path to ~playername/mappath
…		…
2160	# if $self->per_party;	2350	# if $self->per_party;
2161		2351
2162	$self	2352	$self
2163	}	2353	}
2164		2354
2165	# find and load all maps in the 3x3 area around a map
2166	sub load_neighbours {
2167	my ($map) = @_;
2168
2169	my @neigh; # diagonal neighbours
2170
2171	for (0 .. 3) {
2172	my $neigh = $map->tile_path ($_)
2173	or next;
2174	$neigh = find $neigh, $map
2175	or next;
2176	$neigh->load;
2177
2178	# now find the diagonal neighbours
2179	push @neigh,
2180	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2181	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2182	}
2183
2184	for (grep defined $_->[0], @neigh) {
2185	my ($path, $origin) = @$_;
2186	my $neigh = find $path, $origin
2187	or next;
2188	$neigh->load;
2189	}
2190	}
2191
2192	sub find_sync {	2355	sub find_sync {
2193	my ($path, $origin) = @_;	2356	my ($path, $origin) = @_;
2194		2357
		2358	# it's a bug to call this from the main context
2195	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"	2359	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2196	if $Coro::current == $Coro::main;	2360	if $Coro::current == $Coro::main;
2197		2361
2198	find $path, $origin	2362	find $path, $origin
2199	}	2363	}
2200		2364
2201	sub do_load_sync {	2365	sub do_load_sync {
2202	my ($map) = @_;	2366	my ($map) = @_;
2203		2367
		2368	# it's a bug to call this from the main context
2204	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"	2369	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2205	if $Coro::current == $Coro::main;	2370	if $Coro::current == $Coro::main;
2206		2371
2207	$map->load;	2372	$map->load;
2208	}	2373	}
…		…
2211	our $MAP_PREFETCHER = undef;	2376	our $MAP_PREFETCHER = undef;
2212		2377
2213	sub find_async {	2378	sub find_async {
2214	my ($path, $origin, $load) = @_;	2379	my ($path, $origin, $load) = @_;
2215		2380
2216	$path = normalise $path, $origin && $origin->{path};	2381	$path = normalise $path, $origin;
2217		2382
2218	if (my $map = $cf::MAP{$path}) {	2383	if (my $map = $cf::MAP{$path}) {
2219	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2384	return $map if !$load || $map->linkable;
2220	}	2385	}
2221		2386
2222	$MAP_PREFETCH{$path} |= $load;	2387	$MAP_PREFETCH{$path} |= $load;
2223		2388
2224	$MAP_PREFETCHER ||= cf::async {	2389	$MAP_PREFETCHER ||= cf::async {
…		…
2283	sub swap_out {	2448	sub swap_out {
2284	my ($self) = @_;	2449	my ($self) = @_;
2285		2450
2286	my $lock = cf::lock_acquire "map_data:$self->{path}";	2451	my $lock = cf::lock_acquire "map_data:$self->{path}";
2287		2452
2288	return if $self->in_memory != cf::MAP_ACTIVE;	2453	return if !$self->linkable;
2289	return if $self->{deny_save};	2454	return if $self->{deny_save};
2290	return if $self->players;	2455	return if $self->players;
2291		2456
2292	# first deactivate the map and "unlink" it from the core	2457	# first deactivate the map and "unlink" it from the core
2293	$self->deactivate;	2458	$self->deactivate;
2294	$_->clear_links_to ($self) for values %cf::MAP;	2459	$_->clear_links_to ($self) for values %cf::MAP;
2295	$self->in_memory (cf::MAP_SWAPPED);	2460	$self->state (cf::MAP_SWAPPED);
2296		2461
2297	# then atomically save	2462	# then atomically save
2298	$self->_save;	2463	$self->_save;
2299		2464
2300	# then free the map	2465	# then free the map
…		…
2326		2491
2327	return if $self->players;	2492	return if $self->players;
2328		2493
2329	cf::trace "resetting map ", $self->path, "\n";	2494	cf::trace "resetting map ", $self->path, "\n";
2330		2495
2331	$self->in_memory (cf::MAP_SWAPPED);	2496	$self->state (cf::MAP_SWAPPED);
2332		2497
2333	# need to save uniques path	2498	# need to save uniques path
2334	unless ($self->{deny_save}) {	2499	unless ($self->{deny_save}) {
2335	my $uniq = $self->uniq_path; utf8::encode $uniq;	2500	my $uniq = $self->uniq_path; utf8::encode $uniq;
2336		2501
…		…
2666	# use -1 or undef as default coordinates, not 0, 0	2831	# use -1 or undef as default coordinates, not 0, 0
2667	($x, $y) = ($map->enter_x, $map->enter_y)	2832	($x, $y) = ($map->enter_x, $map->enter_y)
2668	if $x <= 0 && $y <= 0;	2833	if $x <= 0 && $y <= 0;
2669		2834
2670	$map->load;	2835	$map->load;
2671	$map->load_neighbours;
2672		2836
2673	return unless $self->contr->active;	2837	return unless $self->contr->active;
2674		2838
2675	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2839	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2676	if ($self->enter_map ($map, $x, $y)) {	2840	if ($self->enter_map ($map, $x, $y)) {
…		…
2732	($path, $x, $y) = (undef, undef, undef);	2896	($path, $x, $y) = (undef, undef, undef);
2733	}	2897	}
2734	}	2898	}
2735		2899
2736	my $map = eval {	2900	my $map = eval {
2737	my $map = defined $path ? cf::map::find $path : undef;	2901	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2738		2902
2739	if ($map) {	2903	if ($map) {
2740	$map = $map->customise_for ($self);	2904	$map = $map->customise_for ($self);
2741	$map = $check->($map, $x, $y, $self) if $check && $map;	2905	$map = $check->($map, $x, $y, $self) if $check && $map;
2742	} else {	2906	} else {
…		…
2832	$Coro::current->{desc} = "enter_exit";	2996	$Coro::current->{desc} = "enter_exit";
2833		2997
2834	unless (eval {	2998	unless (eval {
2835	$self->deactivate_recursive; # just to be sure	2999	$self->deactivate_recursive; # just to be sure
2836		3000
2837	# random map handling
2838	{
2839	my $guard = cf::lock_acquire "exit_prepare:$exit";
2840
2841	prepare_random_map $exit
2842	if $exit->slaying eq "/!";
2843	}
2844
2845	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3001	my $map = cf::map::normalise $exit->slaying, $exit->map;
2846	my $x = $exit->stats->hp;	3002	my $x = $exit->stats->hp;
2847	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	}
2848		3027
2849	$self->goto ($map, $x, $y);	3028	$self->goto ($map, $x, $y);
2850		3029
2851	# if exit is damned, update players death & WoR home-position	3030	# if exit is damned, update players death & WoR home-position
2852	$self->contr->savebed ($map, $x, $y)	3031	$self->contr->savebed ($map, $x, $y)
…		…
3077	=cut	3256	=cut
3078		3257
3079	sub cf::client::ext_msg($$@) {	3258	sub cf::client::ext_msg($$@) {
3080	my ($self, $type, @msg) = @_;	3259	my ($self, $type, @msg) = @_;
3081		3260
3082	if ($self->extcmd == 2) {
3083	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3261	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3084	} elsif ($self->extcmd == 1) { # TODO: remove
3085	push @msg, msgtype => "event_$type";
3086	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3087	}
3088	}
3089
3090	=item $client->ext_reply ($msgid, @msg)
3091
3092	Sends an ext reply to the client.
3093
3094	=cut
3095
3096	sub cf::client::ext_reply($$@) {
3097	my ($self, $id, @msg) = @_;
3098
3099	if ($self->extcmd == 2) {
3100	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3101	} elsif ($self->extcmd == 1) {
3102	#TODO: version 1, remove
3103	unshift @msg, msgtype => "reply", msgid => $id;
3104	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3105	}
3106	}	3262	}
3107		3263
3108	=item $success = $client->query ($flags, "text", \&cb)	3264	=item $success = $client->query ($flags, "text", \&cb)
3109		3265
3110	Queues a query to the client, calling the given callback with	3266	Queues a query to the client, calling the given callback with
…		…
3165	my ($ns, $buf) = @_;	3321	my ($ns, $buf) = @_;
3166		3322
3167	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3323	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3168		3324
3169	if (ref $msg) {	3325	if (ref $msg) {
3170	my ($type, $reply, @payload) =	3326	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3171	"ARRAY" eq ref $msg
3172	? @$msg
3173	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3174		3327
3175	my @reply;
3176
3177	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}) {
3178	@reply = $cb->($ns, @payload);	3341	@reply = $cb->($ns, @payload);
		3342	}
		3343
		3344	$ns->ext_msg ("reply-$reply", @reply)
		3345	if $reply;
3179	}	3346	}
3180
3181	$ns->ext_reply ($reply, @reply)
3182	if $reply;
3183
3184	} else {	3347	} else {
3185	error "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";
3186	}	3349	}
3187		3350
3188	cf::override;	3351	cf::override;
…		…
3356	=cut	3519	=cut
3357		3520
3358	#############################################################################	3521	#############################################################################
3359	# the server's init and main functions	3522	# the server's init and main functions
3360		3523
		3524	our %FACEHASH; # hash => idx, #d# HACK for http server
		3525	our @FACEDATA; # dynamically-created facedata
		3526
		3527	# internal api, not fianlised
		3528	sub set_face {
		3529	my ($name, $type, $data) = @_;
		3530
		3531	my $idx = cf::face::find $name;
		3532
		3533	if ($idx) {
		3534	delete $FACEHASH{cf::face::get_chksum $idx};
		3535	} else {
		3536	$idx = cf::face::alloc $name;
		3537	}
		3538
		3539	my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
		3540
		3541	cf::face::set_type $idx, $type;
		3542	cf::face::set_data $idx, 0, (length $data), 0, $hash;
		3543	cf::face::set_meta $idx, $type & 1 ? undef : undef;
		3544
		3545	# we need to destroy the SV itself, not just overwrite,
		3546	# as a running ix might hold a reference to it.
		3547	# delete achieves that.
		3548	delete $FACEDATA[$idx];
		3549	$FACEDATA[$idx] = $data;
		3550	$FACEHASH{$hash} = $idx;#d#
		3551
		3552	$idx
		3553	}
		3554
		3555	our $FACEDATA; # facedata filehandle
		3556
		3557	sub _face_get_data($$$$) {
		3558	my ($idx, $size, $fofs, $cb) = @_;
		3559
		3560	if (defined $FACEDATA[$idx]) {
		3561	$cb->($FACEDATA[$idx]);
		3562	} elsif ($fofs) {
		3563	my $buf;
		3564	IO::AIO::aio_read $FACEDATA, $fofs, $size, $buf, 0, sub {
		3565	if ($_[0] == $size) {
		3566	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3567	$cb->($buf);
		3568	} else {
		3569	cf::error "INTERNAL ERROR: unable to read facedata for face $idx ($size, $fofs), ignoring request.";
		3570	}
		3571	};
		3572	} else {
		3573	cf::error "requested facedata for unknown face $idx ($size, $fofs), ignoring.";
		3574	}
		3575	}
		3576
		3577	# rather ineffient
		3578	sub cf::face::get_data($;$) {
		3579	my ($idx, $faceset) = @_;
		3580
		3581	my $size = cf::face::get_size $idx, $faceset;
		3582	my $fofs = cf::face::get_fofs $idx, $faceset;
		3583
		3584	_face_get_data $idx, $size, $fofs, Coro::rouse_cb;
		3585	Coro::rouse_wait
		3586	}
		3587
		3588	sub cf::face::ix {
		3589	my ($ns, $idx, $pri, $size, $fofs) = @_;
		3590
		3591	_face_get_data $idx, $size, $fofs, sub {
		3592	$ns->ix_send ($idx, $pri, $_[0]);
		3593	};
		3594	}
		3595
3361	sub load_facedata($) {	3596	sub load_facedata($) {
3362	my ($path) = @_;	3597	my ($path) = @_;
3363		3598
3364	# HACK to clear player env face cache, we need some signal framework
3365	# for this (global event?)
3366	%ext::player_env::MUSIC_FACE_CACHE = ();
3367
3368	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3599	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3369		3600
3370	trace "loading facedata from $path\n";	3601	trace "loading facedata from $path\n";
3371		3602
3372	my $facedata;	3603	my $facedata = decode_storable load_file "$path/faceinfo";
3373	0 < aio_load $path, $facedata
3374	or die "$path: $!";
3375
3376	$facedata = Coro::Storable::thaw $facedata;
3377		3604
3378	$facedata->{version} == 2	3605	$facedata->{version} == 2
3379	or cf::cleanup "$path: version mismatch, cannot proceed.";	3606	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3380		3607
3381	# patch in the exptable	3608	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3382	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3609	or cf::cleanup "$path/facedata: $!, cnanot proceed.";
3383	$facedata->{resource}{"res/exp_table"} = {	3610
3384	type => FT_RSRC,	3611	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3385	data => $exp_table,	3612
3386	hash => (Digest::MD5::md5 $exp_table),	3613	# BEGIN ATOMIC
3387	};	3614	# from here on, everything must be atomic - no thread switch allowed
3388	cf::cede_to_tick;	3615	my $t1 = EV::time;
3389		3616
3390	{	3617	{
3391	my $faces = $facedata->{faceinfo};	3618	my $faces = $facedata->{faceinfo};
3392		3619
3393	while (my ($face, $info) = each %$faces) {	3620	for my $face (sort keys %$faces) {
		3621	my $info = $faces->{$face};
3394	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3622	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3395		3623
3396	cf::face::set_visibility $idx, $info->{visibility};	3624	cf::face::set_visibility $idx, $info->{visibility};
3397	cf::face::set_magicmap $idx, $info->{magicmap};	3625	cf::face::set_magicmap $idx, $info->{magicmap};
3398	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3626	cf::face::set_data $idx, 0, $info->{size32}, $info->{fofs32}, $info->{hash32};
3399	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3627	cf::face::set_data $idx, 1, $info->{size64}, $info->{fofs64}, $info->{hash64};
3400		3628	#cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3401	cf::cede_to_tick;	3629	$FACEHASH{$info->{hash64}} = $idx;#d#
3402	}	3630	}
3403		3631
3404	while (my ($face, $info) = each %$faces) {	3632	while (my ($face, $info) = each %$faces) {
3405	next unless $info->{smooth};	3633	next unless $info->{smooth};
3406		3634
…		…
3411	cf::face::set_smooth $idx, $smooth;	3639	cf::face::set_smooth $idx, $smooth;
3412	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3640	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3413	} else {	3641	} else {
3414	error "smooth face '$info->{smooth}' not found for face '$face'";	3642	error "smooth face '$info->{smooth}' not found for face '$face'";
3415	}	3643	}
3416
3417	cf::cede_to_tick;
3418	}	3644	}
3419	}	3645	}
3420		3646
3421	{	3647	{
3422	my $anims = $facedata->{animinfo};	3648	my $anims = $facedata->{animinfo};
3423		3649
3424	while (my ($anim, $info) = each %$anims) {	3650	while (my ($anim, $info) = each %$anims) {
3425	cf::anim::set $anim, $info->{frames}, $info->{facings};	3651	cf::anim::set $anim, $info->{frames}, $info->{facings};
3426	cf::cede_to_tick;
3427	}	3652	}
3428		3653
3429	cf::anim::invalidate_all; # d'oh	3654	cf::anim::invalidate_all; # d'oh
3430	}	3655	}
3431		3656
3432	{	3657	{
3433	my $res = $facedata->{resource};	3658	my $res = $facedata->{resource};
3434		3659
3435	while (my ($name, $info) = each %$res) {	3660	while (my ($name, $info) = each %$res) {
3436	if (defined $info->{type}) {	3661	if (defined (my $type = $info->{type})) {
		3662	# TODO: different hash - must free and use new index, or cache ixface data queue
3437	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3663	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3438		3664
3439	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3440	cf::face::set_type $idx, $info->{type};	3665	cf::face::set_type $idx, $type;
		3666	cf::face::set_data $idx, 0, $info->{size}, $info->{fofs}, $info->{hash};
		3667	cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3668	$FACEHASH{$info->{hash}} = $idx;#d#
3441	} else {	3669	} else {
3442	$RESOURCE{$name} = $info; # unused	3670	# $RESOURCE{$name} = $info; # unused
3443	}	3671	}
3444
3445	cf::cede_to_tick;
3446	}	3672	}
3447	}	3673	}
		3674
		3675	($fh, $FACEDATA) = ($FACEDATA, $fh);
		3676
		3677	# HACK to clear player env face cache, we need some signal framework
		3678	# for this (global event?)
		3679	%ext::player_env::MUSIC_FACE_CACHE = ();
		3680
		3681	# END ATOMIC
		3682
		3683	cf::debug "facedata atomic update time ", EV::time - $t1;
3448		3684
3449	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3685	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
		3686
		3687	aio_close $fh if $fh; # close old facedata
3450		3688
3451	1	3689	1
3452	}	3690	}
3453		3691
3454	register_exticmd fx_want => sub {	3692	register_exticmd fx_want => sub {
…		…
3465	my $status = load_resource_file_ $_[0];	3703	my $status = load_resource_file_ $_[0];
3466	get_slot 0.1, 100;	3704	get_slot 0.1, 100;
3467	cf::arch::commit_load;	3705	cf::arch::commit_load;
3468		3706
3469	$status	3707	$status
		3708	}
		3709
		3710	sub reload_exp_table {
		3711	_reload_exp_table;
		3712
		3713	set_face "res/exp_table" => FT_RSRC,
		3714	JSON::XS->new->utf8->canonical->encode (
		3715	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3716	);
		3717	}
		3718
		3719	sub reload_materials {
		3720	_reload_materials;
3470	}	3721	}
3471		3722
3472	sub reload_regions {	3723	sub reload_regions {
3473	# HACK to clear player env face cache, we need some signal framework	3724	# HACK to clear player env face cache, we need some signal framework
3474	# for this (global event?)	3725	# for this (global event?)
…		…
3482	if exists $_->{match};	3733	if exists $_->{match};
3483	}	3734	}
3484	}	3735	}
3485		3736
3486	sub reload_facedata {	3737	sub reload_facedata {
3487	load_facedata "$DATADIR/facedata"	3738	load_facedata $DATADIR
3488	or die "unable to load facedata\n";	3739	or die "unable to load facedata\n";
3489	}	3740	}
3490		3741
3491	sub reload_archetypes {	3742	sub reload_archetypes {
3492	load_resource_file "$DATADIR/archetypes"	3743	load_resource_file "$DATADIR/archetypes"
3493	or die "unable to load archetypes\n";	3744	or die "unable to load archetypes\n";
		3745
		3746	set_face "res/skill_info" => FT_RSRC,
		3747	JSON::XS->new->utf8->canonical->encode (
		3748	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3749	);
		3750	set_face "res/spell_paths" => FT_RSRC,
		3751	JSON::XS->new->utf8->canonical->encode (
		3752	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3753	);
3494	}	3754	}
3495		3755
3496	sub reload_treasures {	3756	sub reload_treasures {
3497	load_resource_file "$DATADIR/treasures"	3757	load_resource_file "$DATADIR/treasures"
3498	or die "unable to load treasurelists\n";	3758	or die "unable to load treasurelists\n";
3499	}	3759	}
3500		3760
3501	sub reload_sound {	3761	sub reload_sound {
3502	trace "loading sound config from $DATADIR/sound\n";	3762	trace "loading sound config from $DATADIR/sound\n";
3503		3763
3504	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3505	or die "$DATADIR/sound $!";
3506
3507	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3764	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3508		3765
3509	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3766	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3510	my $sound = $soundconf->{compat}[$_]	3767	my $sound = $soundconf->{compat}[$_]
3511	or next;	3768	or next;
3512		3769
…		…
3522	}	3779	}
3523		3780
3524	sub reload_resources {	3781	sub reload_resources {
3525	trace "reloading resource files...\n";	3782	trace "reloading resource files...\n";
3526		3783
		3784	reload_materials;
3527	reload_facedata;	3785	reload_facedata;
		3786	reload_exp_table;
3528	reload_sound;	3787	reload_sound;
3529	reload_archetypes;	3788	reload_archetypes;
3530	reload_regions;	3789	reload_regions;
3531	reload_treasures;	3790	reload_treasures;
3532		3791
…		…
3534	}	3793	}
3535		3794
3536	sub reload_config {	3795	sub reload_config {
3537	trace "reloading config file...\n";	3796	trace "reloading config file...\n";
3538		3797
3539	open my $fh, "<:utf8", "$CONFDIR/config"	3798	my $config = load_file "$CONFDIR/config";
3540	or return;	3799	utf8::decode $config;
3541		3800	*CFG = decode_yaml $config;
3542	local $/;
3543	*CFG = YAML::XS::Load scalar <$fh>;
3544		3801
3545	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3802	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3546		3803
3547	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3804	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3548	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3805	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3552	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3809	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3553	and die "WARNING: m(un)lockall failed: $!\n";	3810	and die "WARNING: m(un)lockall failed: $!\n";
3554	};	3811	};
3555	warn $@ if $@;	3812	warn $@ if $@;
3556	}	3813	}
3557
3558	trace "finished reloading resource files\n";
3559	}	3814	}
3560		3815
3561	sub pidfile() {	3816	sub pidfile() {
3562	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3817	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3563	or die "$PIDFILE: $!";	3818	or die "$PIDFILE: $!";
…		…
3588		3843
3589	sub main {	3844	sub main {
3590	cf::init_globals; # initialise logging	3845	cf::init_globals; # initialise logging
3591		3846
3592	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3847	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3593	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3848	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3594	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3849	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3595	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3850	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3596		3851
3597	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3852	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3598		3853
3599	# we must not ever block the main coroutine	3854	# we must not ever block the main coroutine
3600	local $Coro::idle = sub {	3855	$Coro::idle = sub {
3601	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3856	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3602	(async {	3857	(async {
3603	$Coro::current->{desc} = "IDLE BUG HANDLER";	3858	$Coro::current->{desc} = "IDLE BUG HANDLER";
3604	EV::loop EV::LOOP_ONESHOT;	3859	EV::loop EV::LOOP_ONESHOT;
3605	})->prio (Coro::PRIO_MAX);	3860	})->prio (Coro::PRIO_MAX);
3606	};	3861	};
3607		3862
3608	evthread_start IO::AIO::poll_fileno;	3863	evthread_start IO::AIO::poll_fileno;
3609		3864
3610	cf::sync_job {	3865	cf::sync_job {
3611	cf::init_experience;	3866	cf::incloader::init ();
		3867
		3868	db_init;
		3869
3612	cf::init_anim;	3870	cf::init_anim;
3613	cf::init_attackmess;	3871	cf::init_attackmess;
3614	cf::init_dynamic;	3872	cf::init_dynamic;
3615		3873
3616	cf::load_settings;	3874	cf::load_settings;
3617	cf::load_materials;
3618		3875
3619	reload_resources;	3876	reload_resources;
3620	reload_config;	3877	reload_config;
3621	db_init;
3622		3878
3623	cf::init_uuid;	3879	cf::init_uuid;
3624	cf::init_signals;	3880	cf::init_signals;
3625	cf::init_skills;	3881	cf::init_skills;
3626		3882
…		…
3634		3890
3635	# no (long-running) fork's whatsoever before this point(!)	3891	# no (long-running) fork's whatsoever before this point(!)
3636	use POSIX ();	3892	use POSIX ();
3637	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3893	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3638		3894
3639	(pop @POST_INIT)->(0) while @POST_INIT;	3895	cf::_post_init 0;
3640	};	3896	};
3641		3897
3642	cf::object::thawer::errors_are_fatal 0;	3898	cf::object::thawer::errors_are_fatal 0;
3643	info "parse errors in files are no longer fatal from this point on.\n";	3899	info "parse errors in files are no longer fatal from this point on.\n";
3644		3900
		3901	AE::postpone {
		3902	undef &main; # free gobs of memory :)
		3903	};
		3904
3645	main_loop;	3905	goto &main_loop;
3646	}	3906	}
3647		3907
3648	#############################################################################	3908	#############################################################################
3649	# initialisation and cleanup	3909	# initialisation and cleanup
3650		3910
…		…
3803		4063
3804	cf::write_runtime_sync; # external watchdog should not bark	4064	cf::write_runtime_sync; # external watchdog should not bark
3805		4065
3806	trace "emergency_perl_save: flushing outstanding aio requests";	4066	trace "emergency_perl_save: flushing outstanding aio requests";
3807	while (IO::AIO::nreqs || BDB::nreqs) {	4067	while (IO::AIO::nreqs || BDB::nreqs) {
3808	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4068	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3809	}	4069	}
3810		4070
3811	cf::write_runtime_sync; # external watchdog should not bark	4071	cf::write_runtime_sync; # external watchdog should not bark
3812	};	4072	};
3813		4073
…		…
3851	}	4111	}
3852	}	4112	}
3853		4113
3854	sub do_reload_perl() {	4114	sub do_reload_perl() {
3855	# can/must only be called in main	4115	# can/must only be called in main
3856	if (in_main) {	4116	unless (in_main) {
3857	error "can only reload from main coroutine";	4117	error "can only reload from main coroutine";
3858	return;	4118	return;
3859	}	4119	}
3860		4120
3861	return if $RELOAD++;	4121	return if $RELOAD++;
3862		4122
3863	my $t1 = AE::time;	4123	my $t1 = AE::time;
3864		4124
3865	while ($RELOAD) {	4125	while ($RELOAD) {
		4126	cf::get_slot 0.1, -1, "reload_perl";
3866	info "reloading...";	4127	info "perl_reload: reloading...";
3867		4128
3868	trace "entering sync_job";	4129	trace "perl_reload: entering sync_job";
3869		4130
3870	cf::sync_job {	4131	cf::sync_job {
3871	cf::emergency_save;	4132	#cf::emergency_save;
3872		4133
3873	trace "cancelling all extension coros";	4134	trace "perl_reload: cancelling all extension coros";
3874	$_->cancel for values %EXT_CORO;	4135	$_->cancel for values %EXT_CORO;
3875	%EXT_CORO = ();	4136	%EXT_CORO = ();
3876		4137
3877	trace "removing commands";	4138	trace "perl_reload: removing commands";
3878	%COMMAND = ();	4139	%COMMAND = ();
3879		4140
3880	trace "removing ext/exti commands";	4141	trace "perl_reload: removing ext/exti commands";
3881	%EXTCMD = ();	4142	%EXTCMD = ();
3882	%EXTICMD = ();	4143	%EXTICMD = ();
3883		4144
3884	trace "unloading/nuking all extensions";	4145	trace "perl_reload: unloading/nuking all extensions";
3885	for my $pkg (@EXTS) {	4146	for my $pkg (@EXTS) {
3886	trace "... unloading $pkg";	4147	trace "... unloading $pkg";
3887		4148
3888	if (my $cb = $pkg->can ("unload")) {	4149	if (my $cb = $pkg->can ("unload")) {
3889	eval {	4150	eval {
…		…
3894		4155
3895	trace "... clearing $pkg";	4156	trace "... clearing $pkg";
3896	clear_package $pkg;	4157	clear_package $pkg;
3897	}	4158	}
3898		4159
3899	trace "unloading all perl modules loaded from $LIBDIR";	4160	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3900	while (my ($k, $v) = each %INC) {	4161	while (my ($k, $v) = each %INC) {
3901	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4162	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3902		4163
3903	trace "... unloading $k";	4164	trace "... unloading $k";
3904	delete $INC{$k};	4165	delete $INC{$k};
…		…
3911	}	4172	}
3912		4173
3913	clear_package $k;	4174	clear_package $k;
3914	}	4175	}
3915		4176
3916	trace "getting rid of safe::, as good as possible";	4177	trace "perl_reload: getting rid of safe::, as good as possible";
3917	clear_package "safe::$_"	4178	clear_package "safe::$_"
3918	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4179	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3919		4180
3920	trace "unloading cf.pm \"a bit\"";	4181	trace "perl_reload: unloading cf.pm \"a bit\"";
3921	delete $INC{"cf.pm"};	4182	delete $INC{"cf.pm"};
3922	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4183	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3923		4184
3924	# don't, removes xs symbols, too,	4185	# don't, removes xs symbols, too,
3925	# and global variables created in xs	4186	# and global variables created in xs
3926	#clear_package __PACKAGE__;	4187	#clear_package __PACKAGE__;
3927		4188
3928	info "unload completed, starting to reload now";	4189	info "perl_reload: unload completed, starting to reload now";
3929		4190
3930	trace "reloading cf.pm";	4191	trace "perl_reload: reloading cf.pm";
3931	require cf;	4192	require cf;
3932	cf::_connect_to_perl_1;	4193	cf::_connect_to_perl_1;
3933		4194
3934	trace "loading config and database again";	4195	trace "perl_reload: loading config and database again";
3935	cf::reload_config;	4196	cf::reload_config;
3936		4197
3937	trace "loading extensions";	4198	trace "perl_reload: loading extensions";
3938	cf::load_extensions;	4199	cf::load_extensions;
3939		4200
3940	if ($REATTACH_ON_RELOAD) {	4201	if ($REATTACH_ON_RELOAD) {
3941	trace "reattaching attachments to objects/players";	4202	trace "perl_reload: reattaching attachments to objects/players";
3942	_global_reattach; # objects, sockets	4203	_global_reattach; # objects, sockets
3943	trace "reattaching attachments to maps";	4204	trace "perl_reload: reattaching attachments to maps";
3944	reattach $_ for values %MAP;	4205	reattach $_ for values %MAP;
3945	trace "reattaching attachments to players";	4206	trace "perl_reload: reattaching attachments to players";
3946	reattach $_ for values %PLAYER;	4207	reattach $_ for values %PLAYER;
3947	}	4208	}
3948		4209
3949	trace "running post_init jobs";	4210	cf::_post_init 1;
3950	(pop @POST_INIT)->(1) while @POST_INIT;
3951		4211
3952	trace "leaving sync_job";	4212	trace "perl_reload: leaving sync_job";
3953		4213
3954	1	4214	1
3955	} or do {	4215	} or do {
3956	error $@;	4216	error $@;
3957	cf::cleanup "error while reloading, exiting.";	4217	cf::cleanup "perl_reload: error, exiting.";
3958	};	4218	};
3959		4219
3960	info "reloaded";
3961	--$RELOAD;	4220	--$RELOAD;
3962	}	4221	}
3963		4222
3964	$t1 = AE::time - $t1;	4223	$t1 = AE::time - $t1;
3965	info "reload completed in ${t1}s\n";	4224	info "perl_reload: completed in ${t1}s\n";
3966	};	4225	};
3967		4226
3968	our $RELOAD_WATCHER; # used only during reload	4227	our $RELOAD_WATCHER; # used only during reload
3969		4228
3970	sub reload_perl() {	4229	sub reload_perl() {
…		…
3991	reload_perl;	4250	reload_perl;
3992	};	4251	};
3993	}	4252	}
3994	};	4253	};
3995		4254
3996	unshift @INC, $LIBDIR;	4255	#############################################################################
3997		4256
3998	my $bug_warning = 0;	4257	my $bug_warning = 0;
3999		4258
4000	our @WAIT_FOR_TICK;
4001	our @WAIT_FOR_TICK_BEGIN;
4002
4003	sub wait_for_tick {	4259	sub wait_for_tick() {
4004	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4260	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4005		4261
4006	my $signal = new Coro::Signal;	4262	$WAIT_FOR_TICK->wait;
4007	push @WAIT_FOR_TICK, $signal;
4008	$signal->wait;
4009	}	4263	}
4010		4264
4011	sub wait_for_tick_begin {	4265	sub wait_for_tick_begin() {
4012	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4266	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4013		4267
4014	my $signal = new Coro::Signal;	4268	my $signal = new Coro::Signal;
4015	push @WAIT_FOR_TICK_BEGIN, $signal;	4269	push @WAIT_FOR_TICK_BEGIN, $signal;
4016	$signal->wait;	4270	$signal->wait;
4017	}	4271	}
…		…
4021	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4275	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4022	unless ++$bug_warning > 10;	4276	unless ++$bug_warning > 10;
4023	return;	4277	return;
4024	}	4278	}
4025		4279
4026	cf::server_tick; # one server iteration	4280	cf::one_tick; # one server iteration
4027		4281
4028	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4282	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4029		4283
4030	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4284	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4031	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4285	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4037	}	4291	}
4038		4292
4039	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4293	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4040	$sig->send;	4294	$sig->send;
4041	}	4295	}
4042	while (my $sig = shift @WAIT_FOR_TICK) {	4296	$WAIT_FOR_TICK->broadcast;
4043	$sig->send;
4044	}
4045		4297
4046	$LOAD = ($NOW - $TICK_START) / $TICK;	4298	$LOAD = ($NOW - $TICK_START) / $TICK;
4047	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4299	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4048		4300
4049	if (0) {	4301	if (0) {
…		…
4055	}	4307	}
4056	}	4308	}
4057		4309
4058	{	4310	{
4059	# configure BDB	4311	# configure BDB
		4312	info "initialising database";
4060		4313
4061	BDB::min_parallel 16;	4314	BDB::min_parallel 16;
4062	BDB::max_poll_reqs $TICK * 0.1;	4315	BDB::max_poll_reqs $TICK * 0.1;
4063	$AnyEvent::BDB::WATCHER->priority (1);	4316	#$AnyEvent::BDB::WATCHER->priority (1);
4064		4317
4065	unless ($DB_ENV) {	4318	unless ($DB_ENV) {
4066	$DB_ENV = BDB::db_env_create;	4319	$DB_ENV = BDB::db_env_create;
4067	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4320	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4068	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4321	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4093	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4346	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4094	};	4347	};
4095	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4348	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4096	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4349	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4097	};	4350	};
		4351
		4352	info "database initialised";
4098	}	4353	}
4099		4354
4100	{	4355	{
4101	# configure IO::AIO	4356	# configure IO::AIO
4102		4357
		4358	info "initialising aio";
4103	IO::AIO::min_parallel 8;	4359	IO::AIO::min_parallel 8;
4104	IO::AIO::max_poll_time $TICK * 0.1;	4360	IO::AIO::max_poll_time $TICK * 0.1;
4105	undef $AnyEvent::AIO::WATCHER;	4361	undef $AnyEvent::AIO::WATCHER;
		4362	info "aio initialised";
4106	}	4363	}
4107		4364
4108	my $_log_backtrace;	4365	our $_log_backtrace;
		4366	our $_log_backtrace_last;
4109		4367
4110	sub _log_backtrace {	4368	sub _log_backtrace {
4111	my ($msg, @addr) = @_;	4369	my ($msg, @addr) = @_;
4112		4370
4113	$msg =~ s/\n//;	4371	$msg =~ s/\n$//;
4114		4372
		4373	if ($_log_backtrace_last eq $msg) {
		4374	LOG llevInfo, "[ABT] $msg\n";
		4375	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4115	# limit the # of concurrent backtraces	4376	# limit the # of concurrent backtraces
4116	if ($_log_backtrace < 2) {	4377	} elsif ($_log_backtrace < 2) {
		4378	$_log_backtrace_last = $msg;
4117	++$_log_backtrace;	4379	++$_log_backtrace;
4118	my $perl_bt = Carp::longmess $msg;	4380	my $perl_bt = Carp::longmess $msg;
4119	async {	4381	async {
4120	$Coro::current->{desc} = "abt $msg";	4382	$Coro::current->{desc} = "abt $msg";
4121		4383
…		…
4141	LOG llevInfo, "[ABT] $_\n" for @bt;	4403	LOG llevInfo, "[ABT] $_\n" for @bt;
4142	--$_log_backtrace;	4404	--$_log_backtrace;
4143	};	4405	};
4144	} else {	4406	} else {
4145	LOG llevInfo, "[ABT] $msg\n";	4407	LOG llevInfo, "[ABT] $msg\n";
4146	LOG llevInfo, "[ABT] [suppressed]\n";	4408	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4147	}	4409	}
4148	}	4410	}
4149		4411
4150	# load additional modules	4412	# load additional modules
4151	require "cf/$_.pm" for @EXTRA_MODULES;	4413	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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