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.462 by root, Tue Dec 23 06:58:23 2008 UTC vs.
Revision 1.531 by root, Wed Apr 28 21:07:41 2010 UTC

1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# it under the terms of the GNU General Public License as published by	7	# the terms of the Affero GNU General Public License as published by the
8	# the Free Software Foundation, either version 3 of the License, or	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# (at your option) any later version.	9	# option) any later version.
10	#	10	#
11	# This program is distributed in the hope that it will be useful,	11	# This program is distributed in the hope that it will be useful,
12	# but WITHOUT ANY WARRANTY; without even the implied warranty of	12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	# GNU General Public License for more details.	14	# GNU General Public License for more details.
15	#	15	#
16	# You should have received a copy of the GNU General Public License	16	# You should have received a copy of the Affero GNU General Public License
17	# along with this program. If not, see <http://www.gnu.org/licenses/>.	17	# and the GNU General Public License along with this program. If not, see
		18	# <http://www.gnu.org/licenses/>.
18	#	19	#
19	# The authors can be reached via e-mail to <support@deliantra.net>	20	# The authors can be reached via e-mail to <support@deliantra.net>
20	#	21	#
21		22
22	package cf;	23	package cf;
23		24
24	use 5.10.0;	25	use 5.10.0;
25	use utf8;	26	use utf8;
26	use strict "vars", "subs";	27	use strict qw(vars subs);
27		28
28	use Symbol;	29	use Symbol;
29	use List::Util;	30	use List::Util;
30	use Socket;	31	use Socket;
31	use EV;	32	use EV;
32	use Opcode;	33	use Opcode;
33	use Safe;	34	use Safe;
34	use Safe::Hole;	35	use Safe::Hole;
35	use Storable ();	36	use Storable ();
		37	use Carp ();
36		38
37	use Guard ();	39	use Guard ();
38	use Coro ();	40	use Coro ();
39	use Coro::State;	41	use Coro::State;
40	use Coro::Handle;	42	use Coro::Handle;
…		…
51	use Coro::Util ();	53	use Coro::Util ();
52		54
53	use JSON::XS 2.01 ();	55	use JSON::XS 2.01 ();
54	use BDB ();	56	use BDB ();
55	use Data::Dumper;	57	use Data::Dumper;
56	use Digest::MD5;
57	use Fcntl;	58	use Fcntl;
58	use YAML ();	59	use YAML::XS ();
59	use IO::AIO ();	60	use IO::AIO ();
60	use Time::HiRes;	61	use Time::HiRes;
61	use Compress::LZF;	62	use Compress::LZF;
62	use Digest::MD5 ();	63	use Digest::MD5 ();
63		64
…		…
71	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	72	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72		73
73	# make sure c-lzf reinitialises itself	74	# make sure c-lzf reinitialises itself
74	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";	75	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	76	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
		77
		78	# strictly for debugging
		79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
76		80
77	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
78		82
79	our %COMMAND = ();	83	our %COMMAND = ();
80	our %COMMAND_TIME = ();	84	our %COMMAND_TIME = ();
…		…
85	our %EXT_CORO = (); # coroutines bound to extensions	89	our %EXT_CORO = (); # coroutines bound to extensions
86	our %EXT_MAP = (); # pluggable maps	90	our %EXT_MAP = (); # pluggable maps
87		91
88	our $RELOAD; # number of reloads so far, non-zero while in reload	92	our $RELOAD; # number of reloads so far, non-zero while in reload
89	our @EVENT;	93	our @EVENT;
		94	our @REFLECT; # set by XS
		95	our %REFLECT; # set by us
90		96
91	our $CONFDIR = confdir;	97	our $CONFDIR = confdir;
92	our $DATADIR = datadir;	98	our $DATADIR = datadir;
93	our $LIBDIR = "$DATADIR/ext";	99	our $LIBDIR = "$DATADIR/ext";
94	our $PODDIR = "$DATADIR/pod";	100	our $PODDIR = "$DATADIR/pod";
…		…
100	our $RANDOMDIR = "$LOCALDIR/random";	106	our $RANDOMDIR = "$LOCALDIR/random";
101	our $BDBDIR = "$LOCALDIR/db";	107	our $BDBDIR = "$LOCALDIR/db";
102	our $PIDFILE = "$LOCALDIR/pid";	108	our $PIDFILE = "$LOCALDIR/pid";
103	our $RUNTIMEFILE = "$LOCALDIR/runtime";	109	our $RUNTIMEFILE = "$LOCALDIR/runtime";
104		110
105	our %RESOURCE;	111	our %RESOURCE; # unused
		112
		113	our $OUTPUT_RATE_MIN = 3000;
		114	our $OUTPUT_RATE_MAX = 1000000;
		115
		116	our $MAX_LINKS = 32; # how many chained exits to follow
		117	our $VERBOSE_IO = 1;
106		118
107	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	119	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	120	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109	our $NEXT_TICK;	121	our $NEXT_TICK;
110	our $USE_FSYNC = 1; # use fsync to write maps - default off	122	our $USE_FSYNC = 1; # use fsync to write maps - default on
111		123
112	our $BDB_DEADLOCK_WATCHER;	124	our $BDB_DEADLOCK_WATCHER;
113	our $BDB_CHECKPOINT_WATCHER;	125	our $BDB_CHECKPOINT_WATCHER;
114	our $BDB_TRICKLE_WATCHER;	126	our $BDB_TRICKLE_WATCHER;
115	our $DB_ENV;	127	our $DB_ENV;
116		128
		129	our @EXTRA_MODULES = qw(pod match mapscript);
		130
117	our %CFG;	131	our %CFG;
118		132
119	our $UPTIME; $UPTIME ||= time;	133	our $UPTIME; $UPTIME ||= time;
120	our $RUNTIME;	134	our $RUNTIME;
121	our $NOW;	135	our $NOW;
…		…
132	our $JITTER; # average jitter	146	our $JITTER; # average jitter
133	our $TICK_START; # for load detecting purposes	147	our $TICK_START; # for load detecting purposes
134		148
135	our @POST_INIT;	149	our @POST_INIT;
136		150
137	our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)	151	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
		152	our $REALLY_UNLOOP; # never set to true, please :)
138		153
139	binmode STDOUT;	154	binmode STDOUT;
140	binmode STDERR;	155	binmode STDERR;
141		156
142	# read virtual server time, if available	157	# read virtual server time, if available
…		…
144	open my $fh, "<", $RUNTIMEFILE	159	open my $fh, "<", $RUNTIMEFILE
145	or die "unable to read $RUNTIMEFILE file: $!";	160	or die "unable to read $RUNTIMEFILE file: $!";
146	$RUNTIME = <$fh> + 0.;	161	$RUNTIME = <$fh> + 0.;
147	}	162	}
148		163
		164	eval "sub TICK() { $TICK } 1" or die;
		165
149	mkdir $_	166	mkdir $_
150	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	167	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
151		168
152	our $EMERGENCY_POSITION;	169	our $EMERGENCY_POSITION;
153		170
154	sub cf::map::normalise;	171	sub cf::map::normalise;
		172
		173	sub in_main() {
		174	$Coro::current == $Coro::main
		175	}
		176
		177	#############################################################################
		178
		179	%REFLECT = ();
		180	for (@REFLECT) {
		181	my $reflect = JSON::XS::decode_json $_;
		182	$REFLECT{$reflect->{class}} = $reflect;
		183	}
		184
		185	# this is decidedly evil
		186	$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
155		187
156	#############################################################################	188	#############################################################################
157		189
158	=head2 GLOBAL VARIABLES	190	=head2 GLOBAL VARIABLES
159		191
…		…
206	returns directly I<after> the tick processing (and consequently, can only wake one process	238	returns directly I<after> the tick processing (and consequently, can only wake one process
207	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	239	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
208		240
209	=item @cf::INVOKE_RESULTS	241	=item @cf::INVOKE_RESULTS
210		242
211	This array contains the results of the last C<invoke ()> call. When	243	This array contains the results of the last C<invoke ()> call. When
212	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	244	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
213	that call.	245	that call.
214		246
		247	=item %cf::REFLECT
		248
		249	Contains, for each (C++) class name, a hash reference with information
		250	about object members (methods, scalars, arrays and flags) and other
		251	metadata, which is useful for introspection.
		252
215	=back	253	=back
216		254
217	=cut	255	=cut
218		256
219	BEGIN {	257	$Coro::State::WARNHOOK = sub {
220	*CORE::GLOBAL::warn = sub {
221	my $msg = join "", @_;	258	my $msg = join "", @_;
222		259
223	$msg .= "\n"	260	$msg .= "\n"
224	unless $msg =~ /\n$/;	261	unless $msg =~ /\n$/;
225		262
226	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	263	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
227		264
228	LOG llevError, $msg;	265	LOG llevError, $msg;
229	};	266	};
230	}
231		267
232	$Coro::State::DIEHOOK = sub {	268	$Coro::State::DIEHOOK = sub {
233	return unless $^S eq 0; # "eq", not "=="	269	return unless $^S eq 0; # "eq", not "=="
234		270
235	if ($Coro::current == $Coro::main) {#d#	271	warn Carp::longmess $_[0];
		272
		273	if (in_main) {#d#
236	warn "DIEHOOK called in main context, Coro bug?\n";#d#	274	warn "DIEHOOK called in main context, Coro bug?\n";#d#
237	return;#d#	275	return;#d#
238	}#d#	276	}#d#
239		277
240	# kill coroutine otherwise	278	# kill coroutine otherwise
241	warn Carp::longmess $_[0];
242	Coro::terminate	279	Coro::terminate
243	};	280	};
244
245	$SIG{__DIE__} = sub { }; #d#?
246		281
247	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	282	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
248	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	283	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
249	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	284	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
250	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	285	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
264	)) {	299	)) {
265	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	300	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
266	}	301	}
267		302
268	$EV::DIED = sub {	303	$EV::DIED = sub {
269	warn "error in event callback: @_";	304	Carp::cluck "error in event callback: @_";
270	};	305	};
271		306
272	#############################################################################	307	#############################################################################
273		308
274	=head2 UTILITY FUNCTIONS	309	=head2 UTILITY FUNCTIONS
…		…
371	}	406	}
372		407
373	=item cf::periodic $interval, $cb	408	=item cf::periodic $interval, $cb
374		409
375	Like EV::periodic, but randomly selects a starting point so that the actions	410	Like EV::periodic, but randomly selects a starting point so that the actions
376	get spread over timer.	411	get spread over time.
377		412
378	=cut	413	=cut
379		414
380	sub periodic($$) {	415	sub periodic($$) {
381	my ($interval, $cb) = @_;	416	my ($interval, $cb) = @_;
…		…
398		433
399	=cut	434	=cut
400		435
401	our @SLOT_QUEUE;	436	our @SLOT_QUEUE;
402	our $SLOT_QUEUE;	437	our $SLOT_QUEUE;
		438	our $SLOT_DECAY = 0.9;
403		439
404	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	440	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405	$SLOT_QUEUE = Coro::async {	441	$SLOT_QUEUE = Coro::async {
406	$Coro::current->desc ("timeslot manager");	442	$Coro::current->desc ("timeslot manager");
407		443
408	my $signal = new Coro::Signal;	444	my $signal = new Coro::Signal;
		445	my $busy;
409		446
410	while () {	447	while () {
411	next_job:	448	next_job:
		449
412	my $avail = cf::till_tick;	450	my $avail = cf::till_tick;
413	if ($avail > 0.01) {	451
414	for (0 .. $#SLOT_QUEUE) {	452	for (0 .. $#SLOT_QUEUE) {
415	if ($SLOT_QUEUE[$_][0] < $avail) {	453	if ($SLOT_QUEUE[$_][0] <= $avail) {
		454	$busy = 0;
416	my $job = splice @SLOT_QUEUE, $_, 1, ();	455	my $job = splice @SLOT_QUEUE, $_, 1, ();
417	$job->[2]->send;	456	$job->[2]->send;
418	Coro::cede;	457	Coro::cede;
419	goto next_job;	458	goto next_job;
420	}	459	} else {
		460	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421	}	461	}
422	}	462	}
423		463
424	if (@SLOT_QUEUE) {	464	if (@SLOT_QUEUE) {
425	# we do not use wait_for_tick() as it returns immediately when tick is inactive	465	# we do not use wait_for_tick() as it returns immediately when tick is inactive
426	push @cf::WAIT_FOR_TICK, $signal;	466	push @cf::WAIT_FOR_TICK, $signal;
427	$signal->wait;	467	$signal->wait;
428	} else {	468	} else {
		469	$busy = 0;
429	Coro::schedule;	470	Coro::schedule;
430	}	471	}
431	}	472	}
432	};	473	};
433		474
434	sub get_slot($;$$) {	475	sub get_slot($;$$) {
435	return if tick_inhibit || $Coro::current == $Coro::main;	476	return if tick_inhibit || $Coro::current == $Coro::main;
436		477
437	my ($time, $pri, $name) = @_;	478	my ($time, $pri, $name) = @_;
438		479
439	$time = $TICK * .6 if $time > $TICK * .6;	480	$time = clamp $time, 0.01, $TICK * .6;
		481
440	my $sig = new Coro::Signal;	482	my $sig = new Coro::Signal;
441		483
442	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	484	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	485	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444	$SLOT_QUEUE->ready;	486	$SLOT_QUEUE->ready;
…		…
471		513
472	sub sync_job(&) {	514	sub sync_job(&) {
473	my ($job) = @_;	515	my ($job) = @_;
474		516
475	if ($Coro::current == $Coro::main) {	517	if ($Coro::current == $Coro::main) {
476	my $time = EV::time;	518	my $time = AE::time;
477		519
478	# this is the main coro, too bad, we have to block	520	# this is the main coro, too bad, we have to block
479	# till the operation succeeds, freezing the server :/	521	# till the operation succeeds, freezing the server :/
480		522
481	LOG llevError, Carp::longmess "sync job";#d#	523	LOG llevError, Carp::longmess "sync job";#d#
…		…
498	} else {	540	} else {
499	EV::loop EV::LOOP_ONESHOT;	541	EV::loop EV::LOOP_ONESHOT;
500	}	542	}
501	}	543	}
502		544
503	my $time = EV::time - $time;	545	my $time = AE::time - $time;
504		546
505	$TICK_START += $time; # do not account sync jobs to server load	547	$TICK_START += $time; # do not account sync jobs to server load
506		548
507	wantarray ? @res : $res[0]	549	wantarray ? @res : $res[0]
508	} else {	550	} else {
…		…
552	reset_signals;	594	reset_signals;
553	&$cb	595	&$cb
554	}, @args;	596	}, @args;
555		597
556	wantarray ? @res : $res[-1]	598	wantarray ? @res : $res[-1]
		599	}
		600
		601	sub objinfo {
		602	(
		603	"counter value" => cf::object::object_count,
		604	"objects created" => cf::object::create_count,
		605	"objects destroyed" => cf::object::destroy_count,
		606	"freelist size" => cf::object::free_count,
		607	"allocated objects" => cf::object::objects_size,
		608	"active objects" => cf::object::actives_size,
		609	)
557	}	610	}
558		611
559	=item $coin = coin_from_name $name	612	=item $coin = coin_from_name $name
560		613
561	=cut	614	=cut
…		…
1142		1195
1143	sync_job {	1196	sync_job {
1144	if (length $$rdata) {	1197	if (length $$rdata) {
1145	utf8::decode (my $decname = $filename);	1198	utf8::decode (my $decname = $filename);
1146	warn sprintf "saving %s (%d,%d)\n",	1199	warn sprintf "saving %s (%d,%d)\n",
1147	$decname, length $$rdata, scalar @$objs;	1200	$decname, length $$rdata, scalar @$objs
		1201	if $VERBOSE_IO;
1148		1202
1149	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1203	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150	aio_chmod $fh, SAVE_MODE;	1204	aio_chmod $fh, SAVE_MODE;
1151	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1205	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152	aio_fsync $fh if $cf::USE_FSYNC;	1206	if ($cf::USE_FSYNC) {
		1207	aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
		1208	aio_fsync $fh;
		1209	}
1153	aio_close $fh;	1210	aio_close $fh;
1154		1211
1155	if (@$objs) {	1212	if (@$objs) {
1156	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1213	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157	aio_chmod $fh, SAVE_MODE;	1214	aio_chmod $fh, SAVE_MODE;
1158	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1215	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159	aio_write $fh, 0, (length $data), $data, 0;	1216	aio_write $fh, 0, (length $data), $data, 0;
1160	aio_fsync $fh if $cf::USE_FSYNC;	1217	if ($cf::USE_FSYNC) {
		1218	aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
		1219	aio_fsync $fh;
		1220	}
1161	aio_close $fh;	1221	aio_close $fh;
1162	aio_rename "$filename.pst~", "$filename.pst";	1222	aio_rename "$filename.pst~", "$filename.pst";
1163	}	1223	}
1164	} else {	1224	} else {
1165	aio_unlink "$filename.pst";	1225	aio_unlink "$filename.pst";
…		…
1203	$av = $st->{objs};	1263	$av = $st->{objs};
1204	}	1264	}
1205		1265
1206	utf8::decode (my $decname = $filename);	1266	utf8::decode (my $decname = $filename);
1207	warn sprintf "loading %s (%d,%d)\n",	1267	warn sprintf "loading %s (%d,%d)\n",
1208	$decname, length $data, scalar @{$av || []};	1268	$decname, length $data, scalar @{$av || []}
		1269	if $VERBOSE_IO;
1209		1270
1210	($data, $av)	1271	($data, $av)
1211	}	1272	}
1212		1273
1213	=head2 COMMAND CALLBACKS	1274	=head2 COMMAND CALLBACKS
…		…
1272	}	1333	}
1273		1334
1274	use File::Glob ();	1335	use File::Glob ();
1275		1336
1276	cf::player->attach (	1337	cf::player->attach (
1277	on_command => sub {	1338	on_unknown_command => sub {
1278	my ($pl, $name, $params) = @_;	1339	my ($pl, $name, $params) = @_;
1279		1340
1280	my $cb = $COMMAND{$name}	1341	my $cb = $COMMAND{$name}
1281	or return;	1342	or return;
1282		1343
…		…
1316		1377
1317	# "readahead" all extensions	1378	# "readahead" all extensions
1318	sub cache_extensions {	1379	sub cache_extensions {
1319	my $grp = IO::AIO::aio_group;	1380	my $grp = IO::AIO::aio_group;
1320		1381
1321	add $grp IO::AIO::aio_readdir $LIBDIR, sub {	1382	add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322	for (grep /\.ext$/, @{$_[0]}) {	1383	for (grep /\.ext$/, @{$_[0]}) {
1323	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;	1384	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324	}	1385	}
1325	};	1386	};
1326		1387
…		…
1361	. "\n};\n1";	1422	. "\n};\n1";
1362		1423
1363	$todo{$base} = \%ext;	1424	$todo{$base} = \%ext;
1364	}	1425	}
1365		1426
		1427	my $pass = 0;
1366	my %done;	1428	my %done;
1367	while (%todo) {	1429	while (%todo) {
1368	my $progress;	1430	my $progress;
1369		1431
		1432	++$pass;
		1433
		1434	ext:
1370	while (my ($k, $v) = each %todo) {	1435	while (my ($k, $v) = each %todo) {
1371	for (split /,\s*/, $v->{meta}{depends}) {	1436	for (split /,\s*/, $v->{meta}{depends}) {
1372	goto skip	1437	next ext
1373	unless exists $done{$_};	1438	unless exists $done{$_};
1374	}	1439	}
1375		1440
1376	warn "... loading '$k' into '$v->{pkg}'\n";	1441	warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1377		1442
1378	unless (eval $v->{source}) {	1443	my $active = eval $v->{source};
		1444
		1445	if (length $@) {
1379	my $msg = $@ ? "$v->{path}: $@\n"	1446	warn "$v->{path}: $@\n";
1380	: "$v->{base}: extension inactive.\n";
1381		1447
1382	if (exists $v->{meta}{mandatory}) {
1383	warn $msg;
1384	cf::cleanup "mandatory extension failed to load, exiting.";	1448	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1385	}	1449	if exists $v->{meta}{mandatory};
1386		1450
1387	warn $msg;	1451	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1452	delete $todo{$k};
		1453	} else {
		1454	$done{$k} = delete $todo{$k};
		1455	push @EXTS, $v->{pkg};
		1456	$progress = 1;
		1457
		1458	warn "$v->{base}: extension inactive.\n"
		1459	unless $active;
1388	}	1460	}
1389
1390	$done{$k} = delete $todo{$k};
1391	push @EXTS, $v->{pkg};
1392	$progress = 1;
1393	}	1461	}
1394		1462
1395	skip:	1463	unless ($progress) {
1396	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1464	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1397	unless $progress;	1465
		1466	while (my ($k, $v) = each %todo) {
		1467	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
		1468	if exists $v->{meta}{mandatory};
		1469	}
		1470	}
1398	}	1471	}
1399	};	1472	};
1400	}	1473	}
1401		1474
1402	#############################################################################	1475	#############################################################################
…		…
1486	$cf::PLAYER{$login} = $pl	1559	$cf::PLAYER{$login} = $pl
1487	}	1560	}
1488	}	1561	}
1489	}	1562	}
1490		1563
		1564	cf::player->attach (
		1565	on_load => sub {
		1566	my ($pl, $path) = @_;
		1567
		1568	# restore slots saved in save, below
		1569	my $slots = delete $pl->{_slots};
		1570
		1571	$pl->ob->current_weapon ($slots->[0]);
		1572	$pl->combat_ob ($slots->[1]);
		1573	$pl->ranged_ob ($slots->[2]);
		1574	},
		1575	);
		1576
1491	sub save($) {	1577	sub save($) {
1492	my ($pl) = @_;	1578	my ($pl) = @_;
1493		1579
1494	return if $pl->{deny_save};	1580	return if $pl->{deny_save};
1495		1581
…		…
1500		1586
1501	aio_mkdir playerdir $pl, 0770;	1587	aio_mkdir playerdir $pl, 0770;
1502	$pl->{last_save} = $cf::RUNTIME;	1588	$pl->{last_save} = $cf::RUNTIME;
1503		1589
1504	cf::get_slot 0.01;	1590	cf::get_slot 0.01;
		1591
		1592	# save slots, to be restored later
		1593	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1505		1594
1506	$pl->save_pl ($path);	1595	$pl->save_pl ($path);
1507	cf::cede_to_tick;	1596	cf::cede_to_tick;
1508	}	1597	}
1509		1598
…		…
1546	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1635	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1547		1636
1548	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1637	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1549	$pl->deactivate;	1638	$pl->deactivate;
1550	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1639	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551	$pl->ob->check_score;
1552	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1640	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1553	$pl->ns->destroy if $pl->ns;	1641	$pl->ns->destroy if $pl->ns;
1554		1642
1555	my $path = playerdir $pl;	1643	my $path = playerdir $pl;
1556	my $temp = "$path~$cf::RUNTIME~deleting~";	1644	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1611	\@logins	1699	\@logins
1612	}	1700	}
1613		1701
1614	=item $player->maps	1702	=item $player->maps
1615		1703
		1704	=item cf::player::maps $login
		1705
1616	Returns an arrayref of map paths that are private for this	1706	Returns an arrayref of map paths that are private for this
1617	player. May block.	1707	player. May block.
1618		1708
1619	=cut	1709	=cut
1620		1710
…		…
1682	=cut	1772	=cut
1683		1773
1684	sub find_by_path($) {	1774	sub find_by_path($) {
1685	my ($path) = @_;	1775	my ($path) = @_;
1686		1776
		1777	$path =~ s/^~[^\/]*//; # skip ~login
		1778
1687	my ($match, $specificity);	1779	my ($match, $specificity);
1688		1780
1689	for my $region (list) {	1781	for my $region (list) {
1690	if ($region->{match} && $path =~ $region->{match}) {	1782	if ($region->{match} && $path =~ $region->{match}) {
1691	($match, $specificity) = ($region, $region->specificity)	1783	($match, $specificity) = ($region, $region->specificity)
…		…
1722	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1814	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1723		1815
1724	# mit "rum" bekleckern, nicht	1816	# mit "rum" bekleckern, nicht
1725	$self->_create_random_map (	1817	$self->_create_random_map (
1726	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1818	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1727	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1819	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1728	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1820	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1729	$rmp->{exit_on_final_map},	1821	$rmp->{exit_on_final_map},
1730	$rmp->{xsize}, $rmp->{ysize},	1822	$rmp->{xsize}, $rmp->{ysize},
1731	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},	1823	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1732	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},	1824	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
…		…
1754		1846
1755	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1847	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1756	}	1848	}
1757		1849
1758	# also paths starting with '/'	1850	# also paths starting with '/'
1759	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1851	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1760		1852
1761	sub thawer_merge {	1853	sub thawer_merge {
1762	my ($self, $merge) = @_;	1854	my ($self, $merge) = @_;
1763		1855
1764	# we have to keep some variables in memory intact	1856	# we have to keep some variables in memory intact
…		…
1978		2070
1979	$cf::MAP{$path} = $map	2071	$cf::MAP{$path} = $map
1980	}	2072	}
1981	}	2073	}
1982		2074
1983	sub pre_load { }	2075	sub pre_load { }
1984	sub post_load { }	2076	#sub post_load { } # XS
1985		2077
1986	sub load {	2078	sub load {
1987	my ($self) = @_;	2079	my ($self) = @_;
1988		2080
1989	local $self->{deny_reset} = 1; # loading can take a long time	2081	local $self->{deny_reset} = 1; # loading can take a long time
…		…
2046	}	2138	}
2047		2139
2048	$self->post_load;	2140	$self->post_load;
2049	}	2141	}
2050		2142
		2143	# customize the map for a given player, i.e.
		2144	# return the _real_ map. used by e.g. per-player
		2145	# maps to change the path to ~playername/mappath
2051	sub customise_for {	2146	sub customise_for {
2052	my ($self, $ob) = @_;	2147	my ($self, $ob) = @_;
2053		2148
2054	return find "~" . $ob->name . "/" . $self->{path}	2149	return find "~" . $ob->name . "/" . $self->{path}
2055	if $self->per_player;	2150	if $self->per_player;
…		…
2071	or next;	2166	or next;
2072	$neigh = find $neigh, $map	2167	$neigh = find $neigh, $map
2073	or next;	2168	or next;
2074	$neigh->load;	2169	$neigh->load;
2075		2170
		2171	# now find the diagonal neighbours
2076	push @neigh,	2172	push @neigh,
2077	[$neigh->tile_path (($_ + 3) % 4), $neigh],	2173	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2078	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2174	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2079	}	2175	}
2080		2176
…		…
2132	$MAP_PREFETCHER->prio (6);	2228	$MAP_PREFETCHER->prio (6);
2133		2229
2134	()	2230	()
2135	}	2231	}
2136		2232
		2233	# common code, used by both ->save and ->swapout
2137	sub save {	2234	sub _save {
2138	my ($self) = @_;	2235	my ($self) = @_;
2139
2140	my $lock = cf::lock_acquire "map_data:$self->{path}";
2141		2236
2142	$self->{last_save} = $cf::RUNTIME;	2237	$self->{last_save} = $cf::RUNTIME;
2143		2238
2144	return unless $self->dirty;	2239	return unless $self->dirty;
2145		2240
…		…
2165	} else {	2260	} else {
2166	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2261	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2167	}	2262	}
2168	}	2263	}
2169		2264
		2265	sub save {
		2266	my ($self) = @_;
		2267
		2268	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2269
		2270	$self->_save;
		2271	}
		2272
2170	sub swap_out {	2273	sub swap_out {
2171	my ($self) = @_;	2274	my ($self) = @_;
2172		2275
2173	# save first because save cedes
2174	$self->save;
2175
2176	my $lock = cf::lock_acquire "map_data:$self->{path}";	2276	my $lock = cf::lock_acquire "map_data:$self->{path}";
2177		2277
2178	return if $self->players;
2179	return if $self->in_memory != cf::MAP_ACTIVE;	2278	return if $self->in_memory != cf::MAP_ACTIVE;
2180	return if $self->{deny_save};	2279	return if $self->{deny_save};
		2280	return if $self->players;
2181		2281
		2282	# first deactivate the map and "unlink" it from the core
		2283	$self->deactivate;
		2284	$_->clear_links_to ($self) for values %cf::MAP;
2182	$self->in_memory (cf::MAP_SWAPPED);	2285	$self->in_memory (cf::MAP_SWAPPED);
		2286
		2287	# then atomically save
		2288	$self->_save;
		2289
		2290	# then free the map
		2291	$self->clear;
		2292	}
		2293
		2294	sub reset_at {
		2295	my ($self) = @_;
		2296
		2297	# TODO: safety, remove and allow resettable per-player maps
		2298	return 1e99 if $self->{deny_reset};
		2299
		2300	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2301	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2302
		2303	$time + $to
		2304	}
		2305
		2306	sub should_reset {
		2307	my ($self) = @_;
		2308
		2309	$self->reset_at <= $cf::RUNTIME
		2310	}
		2311
		2312	sub reset {
		2313	my ($self) = @_;
		2314
		2315	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2316
		2317	return if $self->players;
		2318
		2319	warn "resetting map ", $self->path, "\n";
		2320
		2321	$self->in_memory (cf::MAP_SWAPPED);
		2322
		2323	# need to save uniques path
		2324	unless ($self->{deny_save}) {
		2325	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2326
		2327	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2328	if $uniq;
		2329	}
		2330
		2331	delete $cf::MAP{$self->path};
2183		2332
2184	$self->deactivate;	2333	$self->deactivate;
2185	$_->clear_links_to ($self) for values %cf::MAP;	2334	$_->clear_links_to ($self) for values %cf::MAP;
2186	$self->clear;	2335	$self->clear;
2187	}
2188
2189	sub reset_at {
2190	my ($self) = @_;
2191
2192	# TODO: safety, remove and allow resettable per-player maps
2193	return 1e99 if $self->{deny_reset};
2194
2195	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2196	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2197
2198	$time + $to
2199	}
2200
2201	sub should_reset {
2202	my ($self) = @_;
2203
2204	$self->reset_at <= $cf::RUNTIME
2205	}
2206
2207	sub reset {
2208	my ($self) = @_;
2209
2210	my $lock = cf::lock_acquire "map_data:$self->{path}";
2211
2212	return if $self->players;
2213
2214	warn "resetting map ", $self->path;
2215
2216	$self->in_memory (cf::MAP_SWAPPED);
2217
2218	# need to save uniques path
2219	unless ($self->{deny_save}) {
2220	my $uniq = $self->uniq_path; utf8::encode $uniq;
2221
2222	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2223	if $uniq;
2224	}
2225
2226	delete $cf::MAP{$self->path};
2227
2228	$self->deactivate;
2229	$_->clear_links_to ($self) for values %cf::MAP;
2230	$self->clear;
2231		2336
2232	$self->unlink_save;	2337	$self->unlink_save;
2233	$self->destroy;	2338	$self->destroy;
2234	}	2339	}
2235		2340
…		…
2243		2348
2244	delete $cf::MAP{$self->path};	2349	delete $cf::MAP{$self->path};
2245		2350
2246	$self->unlink_save;	2351	$self->unlink_save;
2247		2352
2248	bless $self, "cf::map";	2353	bless $self, "cf::map::wrap";
2249	delete $self->{deny_reset};	2354	delete $self->{deny_reset};
2250	$self->{deny_save} = 1;	2355	$self->{deny_save} = 1;
2251	$self->reset_timeout (1);	2356	$self->reset_timeout (1);
2252	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2357	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2253		2358
…		…
2310	: normalise $_	2415	: normalise $_
2311	} @{ aio_readdir $UNIQUEDIR or [] }	2416	} @{ aio_readdir $UNIQUEDIR or [] }
2312	]	2417	]
2313	}	2418	}
2314		2419
		2420	=item cf::map::static_maps
		2421
		2422	Returns an arrayref if paths of all static maps (all preinstalled F<.map>
		2423	file in the shared directory excluding F</styles> and F</editor>). May
		2424	block.
		2425
		2426	=cut
		2427
		2428	sub static_maps() {
		2429	my @dirs = "";
		2430	my @maps;
		2431
		2432	while (@dirs) {
		2433	my $dir = shift @dirs;
		2434
		2435	next if $dir eq "/styles" || $dir eq "/editor";
		2436
		2437	my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
		2438	or return;
		2439
		2440	for (@$files) {
		2441	s/\.map$// or next;
		2442	utf8::decode $_;
		2443	push @maps, "$dir/$_";
		2444	}
		2445
		2446	push @dirs, map "$dir/$_", @$dirs;
		2447	}
		2448
		2449	\@maps
		2450	}
		2451
2315	=back	2452	=back
2316		2453
2317	=head3 cf::object	2454	=head3 cf::object
2318		2455
2319	=cut	2456	=cut
…		…
2384		2521
2385	our $SAY_CHANNEL = {	2522	our $SAY_CHANNEL = {
2386	id => "say",	2523	id => "say",
2387	title => "Map",	2524	title => "Map",
2388	reply => "say ",	2525	reply => "say ",
2389	tooltip => "Things said to and replied from npcs near you and other players on the same map only.",	2526	tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2390	};	2527	};
2391		2528
2392	our $CHAT_CHANNEL = {	2529	our $CHAT_CHANNEL = {
2393	id => "chat",	2530	id => "chat",
2394	title => "Chat",	2531	title => "Chat",
…		…
2451		2588
2452	Freezes the player and moves him/her to a special map (C<{link}>).	2589	Freezes the player and moves him/her to a special map (C<{link}>).
2453		2590
2454	The player should be reasonably safe there for short amounts of time (e.g.	2591	The player should be reasonably safe there for short amounts of time (e.g.
2455	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2592	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2456	though, as the palyer cannot control the character while it is on the link	2593	though, as the player cannot control the character while it is on the link
2457	map.	2594	map.
2458		2595
2459	Will never block.	2596	Will never block.
2460		2597
2461	=item $player_object->leave_link ($map, $x, $y)	2598	=item $player_object->leave_link ($map, $x, $y)
…		…
2482	sub cf::object::player::enter_link {	2619	sub cf::object::player::enter_link {
2483	my ($self) = @_;	2620	my ($self) = @_;
2484		2621
2485	$self->deactivate_recursive;	2622	$self->deactivate_recursive;
2486		2623
		2624	++$self->{_link_recursion};
		2625
2487	return if UNIVERSAL::isa $self->map, "ext::map_link";	2626	return if UNIVERSAL::isa $self->map, "ext::map_link";
2488		2627
2489	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2628	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2490	if $self->map && $self->map->{path} ne "{link}";	2629	if $self->map && $self->map->{path} ne "{link}";
2491		2630
2492	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2631	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2493	}	2632	}
2494		2633
2495	sub cf::object::player::leave_link {	2634	sub cf::object::player::leave_link {
2496	my ($self, $map, $x, $y) = @_;	2635	my ($self, $map, $x, $y) = @_;
2497		2636
…		…
2514	($x, $y) = (-1, -1)	2653	($x, $y) = (-1, -1)
2515	unless (defined $x) && (defined $y);	2654	unless (defined $x) && (defined $y);
2516		2655
2517	# use -1 or undef as default coordinates, not 0, 0	2656	# use -1 or undef as default coordinates, not 0, 0
2518	($x, $y) = ($map->enter_x, $map->enter_y)	2657	($x, $y) = ($map->enter_x, $map->enter_y)
2519	if $x <=0 && $y <= 0;	2658	if $x <= 0 && $y <= 0;
2520		2659
2521	$map->load;	2660	$map->load;
2522	$map->load_neighbours;	2661	$map->load_neighbours;
2523		2662
2524	return unless $self->contr->active;	2663	return unless $self->contr->active;
2525	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2526	$self->activate_recursive;
2527		2664
2528	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2665	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529	$self->enter_map ($map, $x, $y);	2666	if ($self->enter_map ($map, $x, $y)) {
2530	}	2667	# entering was successful
		2668	delete $self->{_link_recursion};
		2669	# only activate afterwards, to support waiting in hooks
		2670	$self->activate_recursive;
		2671	}
2531		2672
		2673	}
		2674
2532	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2675	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2533		2676
2534	Moves the player to the given map-path and coordinates by first freezing	2677	Moves the player to the given map-path and coordinates by first freezing
2535	her, loading and preparing them map, calling the provided $check callback	2678	her, loading and preparing them map, calling the provided $check callback
2536	that has to return the map if sucecssful, and then unfreezes the player on	2679	that has to return the map if sucecssful, and then unfreezes the player on
2537	the new (success) or old (failed) map position. In either case, $done will	2680	the new (success) or old (failed) map position. In either case, $done will
…		…
2544		2687
2545	our $GOTOGEN;	2688	our $GOTOGEN;
2546		2689
2547	sub cf::object::player::goto {	2690	sub cf::object::player::goto {
2548	my ($self, $path, $x, $y, $check, $done) = @_;	2691	my ($self, $path, $x, $y, $check, $done) = @_;
		2692
		2693	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2694	warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2695	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2696	($path, $x, $y) = @$EMERGENCY_POSITION;
		2697	}
2549		2698
2550	# do generation counting so two concurrent goto's will be executed in-order	2699	# do generation counting so two concurrent goto's will be executed in-order
2551	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2700	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2552		2701
2553	$self->enter_link;	2702	$self->enter_link;
…		…
2577	my $map = eval {	2726	my $map = eval {
2578	my $map = defined $path ? cf::map::find $path : undef;	2727	my $map = defined $path ? cf::map::find $path : undef;
2579		2728
2580	if ($map) {	2729	if ($map) {
2581	$map = $map->customise_for ($self);	2730	$map = $map->customise_for ($self);
2582	$map = $check->($map) if $check && $map;	2731	$map = $check->($map, $x, $y, $self) if $check && $map;
2583	} else {	2732	} else {
2584	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2733	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2585	}	2734	}
2586		2735
2587	$map	2736	$map
…		…
2595	if ($gen == $self->{_goto_generation}) {	2744	if ($gen == $self->{_goto_generation}) {
2596	delete $self->{_goto_generation};	2745	delete $self->{_goto_generation};
2597	$self->leave_link ($map, $x, $y);	2746	$self->leave_link ($map, $x, $y);
2598	}	2747	}
2599		2748
2600	$done->() if $done;	2749	$done->($self) if $done;
2601	})->prio (1);	2750	})->prio (1);
2602	}	2751	}
2603		2752
2604	=item $player_object->enter_exit ($exit_object)	2753	=item $player_object->enter_exit ($exit_object)
2605		2754
…		…
2722		2871
2723	utf8::encode $text;	2872	utf8::encode $text;
2724	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2873	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2725	}	2874	}
2726		2875
		2876	=item $client->send_big_packet ($pkt)
		2877
		2878	Like C<send_packet>, but tries to compress large packets, and fragments
		2879	them as required.
		2880
		2881	=cut
		2882
		2883	our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
		2884
		2885	sub cf::client::send_big_packet {
		2886	my ($self, $pkt) = @_;
		2887
		2888	# try lzf for large packets
		2889	$pkt = "lzf " . Compress::LZF::compress $pkt
		2890	if 1024 <= length $pkt and $self->{can_lzf};
		2891
		2892	# split very large packets
		2893	if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
		2894	$self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
		2895	$pkt = "frag";
		2896	}
		2897
		2898	$self->send_packet ($pkt);
		2899	}
		2900
2727	=item $client->send_msg ($channel, $msg, $color, [extra...])	2901	=item $client->send_msg ($channel, $msg, $color, [extra...])
2728		2902
2729	Send a drawinfo or msg packet to the client, formatting the msg for the	2903	Send a drawinfo or msg packet to the client, formatting the msg for the
2730	client if neccessary. C<$type> should be a string identifying the type of	2904	client if neccessary. C<$type> should be a string identifying the type of
2731	the message, with C<log> being the default. If C<$color> is negative, suppress	2905	the message, with C<log> being the default. If C<$color> is negative, suppress
…		…
2733		2907
2734	=cut	2908	=cut
2735		2909
2736	# non-persistent channels (usually the info channel)	2910	# non-persistent channels (usually the info channel)
2737	our %CHANNEL = (	2911	our %CHANNEL = (
		2912	"c/motd" => {
		2913	id => "infobox",
		2914	title => "MOTD",
		2915	reply => undef,
		2916	tooltip => "The message of the day",
		2917	},
2738	"c/identify" => {	2918	"c/identify" => {
2739	id => "infobox",	2919	id => "infobox",
2740	title => "Identify",	2920	title => "Identify",
2741	reply => undef,	2921	reply => undef,
2742	tooltip => "Items recently identified",	2922	tooltip => "Items recently identified",
…		…
2744	"c/examine" => {	2924	"c/examine" => {
2745	id => "infobox",	2925	id => "infobox",
2746	title => "Examine",	2926	title => "Examine",
2747	reply => undef,	2927	reply => undef,
2748	tooltip => "Signs and other items you examined",	2928	tooltip => "Signs and other items you examined",
		2929	},
		2930	"c/shopinfo" => {
		2931	id => "infobox",
		2932	title => "Shop Info",
		2933	reply => undef,
		2934	tooltip => "What your bargaining skill tells you about the shop",
2749	},	2935	},
2750	"c/book" => {	2936	"c/book" => {
2751	id => "infobox",	2937	id => "infobox",
2752	title => "Book",	2938	title => "Book",
2753	reply => undef,	2939	reply => undef,
…		…
2769	id => "infobox",	2955	id => "infobox",
2770	title => "Body Parts",	2956	title => "Body Parts",
2771	reply => undef,	2957	reply => undef,
2772	tooltip => "Shows which body parts you posess and are available",	2958	tooltip => "Shows which body parts you posess and are available",
2773	},	2959	},
		2960	"c/statistics" => {
		2961	id => "infobox",
		2962	title => "Statistics",
		2963	reply => undef,
		2964	tooltip => "Shows your primary statistics",
		2965	},
2774	"c/skills" => {	2966	"c/skills" => {
2775	id => "infobox",	2967	id => "infobox",
2776	title => "Skills",	2968	title => "Skills",
2777	reply => undef,	2969	reply => undef,
2778	tooltip => "Shows your experience per skill and item power",	2970	tooltip => "Shows your experience per skill and item power",
		2971	},
		2972	"c/shopitems" => {
		2973	id => "infobox",
		2974	title => "Shop Items",
		2975	reply => undef,
		2976	tooltip => "Shows the items currently for sale in this shop",
		2977	},
		2978	"c/resistances" => {
		2979	id => "infobox",
		2980	title => "Resistances",
		2981	reply => undef,
		2982	tooltip => "Shows your resistances",
		2983	},
		2984	"c/pets" => {
		2985	id => "infobox",
		2986	title => "Pets",
		2987	reply => undef,
		2988	tooltip => "Shows information abotu your pets/a specific pet",
		2989	},
		2990	"c/perceiveself" => {
		2991	id => "infobox",
		2992	title => "Perceive Self",
		2993	reply => undef,
		2994	tooltip => "You gained detailed knowledge about yourself",
2779	},	2995	},
2780	"c/uptime" => {	2996	"c/uptime" => {
2781	id => "infobox",	2997	id => "infobox",
2782	title => "Uptime",	2998	title => "Uptime",
2783	reply => undef,	2999	reply => undef,
…		…
2793	id => "party",	3009	id => "party",
2794	title => "Party",	3010	title => "Party",
2795	reply => "gsay ",	3011	reply => "gsay ",
2796	tooltip => "Messages and chat related to your party",	3012	tooltip => "Messages and chat related to your party",
2797	},	3013	},
		3014	"c/death" => {
		3015	id => "death",
		3016	title => "Death",
		3017	reply => undef,
		3018	tooltip => "Reason for and more info about your most recent death",
		3019	},
2798	"c/say" => $SAY_CHANNEL,	3020	"c/say" => $SAY_CHANNEL,
2799	"c/chat" => $CHAT_CHANNEL,	3021	"c/chat" => $CHAT_CHANNEL,
2800	);	3022	);
2801		3023
2802	sub cf::client::send_msg {	3024	sub cf::client::send_msg {
…		…
2809		3031
2810	# check predefined channels, for the benefit of C	3032	# check predefined channels, for the benefit of C
2811	if ($CHANNEL{$channel}) {	3033	if ($CHANNEL{$channel}) {
2812	$channel = $CHANNEL{$channel};	3034	$channel = $CHANNEL{$channel};
2813		3035
2814	$self->ext_msg (channel_info => $channel)	3036	$self->ext_msg (channel_info => $channel);
2815	if $self->can_msg;
2816
2817	$channel = $channel->{id};	3037	$channel = $channel->{id};
2818		3038
2819	} elsif (ref $channel) {	3039	} elsif (ref $channel) {
2820	# send meta info to client, if not yet sent	3040	# send meta info to client, if not yet sent
2821	unless (exists $self->{channel}{$channel->{id}}) {	3041	unless (exists $self->{channel}{$channel->{id}}) {
2822	$self->{channel}{$channel->{id}} = $channel;	3042	$self->{channel}{$channel->{id}} = $channel;
2823	$self->ext_msg (channel_info => $channel)	3043	$self->ext_msg (channel_info => $channel);
2824	if $self->can_msg;
2825	}	3044	}
2826		3045
2827	$channel = $channel->{id};	3046	$channel = $channel->{id};
2828	}	3047	}
2829		3048
2830	return unless @extra || length $msg;	3049	return unless @extra || length $msg;
2831		3050
2832	if ($self->can_msg) {
2833	# default colour, mask it out	3051	# default colour, mask it out
2834	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)	3052	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835	if $color & cf::NDI_DEF;	3053	if $color & cf::NDI_DEF;
2836		3054
2837	my $pkt = "msg "	3055	my $pkt = "msg "
2838	. $self->{json_coder}->encode (	3056	. $self->{json_coder}->encode (
2839	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	3057	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2840	);	3058	);
2841		3059
2842	# try lzf for large packets
2843	$pkt = "lzf " . Compress::LZF::compress $pkt
2844	if 1024 <= length $pkt and $self->{can_lzf};
2845
2846	# split very large packets
2847	if (8192 < length $pkt and $self->{can_lzf}) {
2848	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2849	$pkt = "frag";
2850	}
2851
2852	$self->send_packet ($pkt);	3060	$self->send_big_packet ($pkt);
2853	} else {
2854	if ($color >= 0) {
2855	# replace some tags by gcfclient-compatible ones
2856	for ($msg) {
2857	1 while
2858	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2859	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2860	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2861	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2862	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2863	}
2864
2865	$color &= cf::NDI_COLOR_MASK;
2866
2867	utf8::encode $msg;
2868
2869	if (0 && $msg =~ /\[/) {
2870	# COMMAND/INFO
2871	$self->send_packet ("drawextinfo $color 10 8 $msg")
2872	} else {
2873	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2874	$self->send_packet ("drawinfo $color $msg")
2875	}
2876	}
2877	}
2878	}	3061	}
2879		3062
2880	=item $client->ext_msg ($type, @msg)	3063	=item $client->ext_msg ($type, @msg)
2881		3064
2882	Sends an ext event to the client.	3065	Sends an ext event to the client.
…		…
2885		3068
2886	sub cf::client::ext_msg($$@) {	3069	sub cf::client::ext_msg($$@) {
2887	my ($self, $type, @msg) = @_;	3070	my ($self, $type, @msg) = @_;
2888		3071
2889	if ($self->extcmd == 2) {	3072	if ($self->extcmd == 2) {
2890	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3073	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2891	} elsif ($self->extcmd == 1) { # TODO: remove	3074	} elsif ($self->extcmd == 1) { # TODO: remove
2892	push @msg, msgtype => "event_$type";	3075	push @msg, msgtype => "event_$type";
2893	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3076	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2894	}	3077	}
2895	}	3078	}
2896		3079
2897	=item $client->ext_reply ($msgid, @msg)	3080	=item $client->ext_reply ($msgid, @msg)
2898		3081
…		…
2902		3085
2903	sub cf::client::ext_reply($$@) {	3086	sub cf::client::ext_reply($$@) {
2904	my ($self, $id, @msg) = @_;	3087	my ($self, $id, @msg) = @_;
2905		3088
2906	if ($self->extcmd == 2) {	3089	if ($self->extcmd == 2) {
2907	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3090	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2908	} elsif ($self->extcmd == 1) {	3091	} elsif ($self->extcmd == 1) {
2909	#TODO: version 1, remove	3092	#TODO: version 1, remove
2910	unshift @msg, msgtype => "reply", msgid => $id;	3093	unshift @msg, msgtype => "reply", msgid => $id;
2911	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3094	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2912	}	3095	}
2913	}	3096	}
2914		3097
2915	=item $success = $client->query ($flags, "text", \&cb)	3098	=item $success = $client->query ($flags, "text", \&cb)
2916		3099
…		…
3017		3200
3018	$coro	3201	$coro
3019	}	3202	}
3020		3203
3021	cf::client->attach (	3204	cf::client->attach (
3022	on_destroy => sub {	3205	on_client_destroy => sub {
3023	my ($ns) = @_;	3206	my ($ns) = @_;
3024		3207
3025	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3208	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3026	},	3209	},
3027	);	3210	);
…		…
3043	our $safe_hole = new Safe::Hole;	3226	our $safe_hole = new Safe::Hole;
3044		3227
3045	$SIG{FPE} = 'IGNORE';	3228	$SIG{FPE} = 'IGNORE';
3046		3229
3047	$safe->permit_only (Opcode::opset qw(	3230	$safe->permit_only (Opcode::opset qw(
3048	:base_core :base_mem :base_orig :base_math	3231	:base_core :base_mem :base_orig :base_math :base_loop
3049	grepstart grepwhile mapstart mapwhile	3232	grepstart grepwhile mapstart mapwhile
3050	sort time	3233	sort time
3051	));	3234	));
3052		3235
3053	# here we export the classes and methods available to script code	3236	# here we export the classes and methods available to script code
…		…
3057	The following functions and methods are available within a safe environment:	3240	The following functions and methods are available within a safe environment:
3058		3241
3059	cf::object	3242	cf::object
3060	contr pay_amount pay_player map x y force_find force_add destroy	3243	contr pay_amount pay_player map x y force_find force_add destroy
3061	insert remove name archname title slaying race decrease split	3244	insert remove name archname title slaying race decrease split
		3245	value
3062		3246
3063	cf::object::player	3247	cf::object::player
3064	player	3248	player
3065		3249
3066	cf::player	3250	cf::player
…		…
3072	=cut	3256	=cut
3073		3257
3074	for (	3258	for (
3075	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3259	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3076	insert remove inv nrof name archname title slaying race	3260	insert remove inv nrof name archname title slaying race
3077	decrease split destroy change_exp)],	3261	decrease split destroy change_exp value msg lore send_msg)],
3078	["cf::object::player" => qw(player)],	3262	["cf::object::player" => qw(player)],
3079	["cf::player" => qw(peaceful)],	3263	["cf::player" => qw(peaceful send_msg)],
3080	["cf::map" => qw(trigger)],	3264	["cf::map" => qw(trigger)],
3081	) {	3265	) {
3082	no strict 'refs';	3266	no strict 'refs';
3083	my ($pkg, @funs) = @$_;	3267	my ($pkg, @funs) = @$_;
3084	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3268	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
…		…
3102		3286
3103	my $qcode = $code;	3287	my $qcode = $code;
3104	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3288	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3105	$qcode =~ s/\n/\\n/g;	3289	$qcode =~ s/\n/\\n/g;
3106		3290
		3291	%vars = (_dummy => 0) unless %vars;
		3292
		3293	my @res;
3107	local $_;	3294	local $_;
3108	local @safe::cf::_safe_eval_args = values %vars;
3109		3295
3110	my $eval =	3296	my $eval =
3111	"do {\n"	3297	"do {\n"
3112	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3298	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3113	. "#line 0 \"{$qcode}\"\n"	3299	. "#line 0 \"{$qcode}\"\n"
3114	. $code	3300	. $code
3115	. "\n}"	3301	. "\n}"
3116	;	3302	;
3117		3303
		3304	if ($CFG{safe_eval}) {
3118	sub_generation_inc;	3305	sub_generation_inc;
		3306	local @safe::cf::_safe_eval_args = values %vars;
3119	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3307	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3120	sub_generation_inc;	3308	sub_generation_inc;
		3309	} else {
		3310	local @cf::_safe_eval_args = values %vars;
		3311	@res = wantarray ? eval eval : scalar eval $eval;
		3312	}
3121		3313
3122	if ($@) {	3314	if ($@) {
3123	warn "$@";	3315	warn "$@";
3124	warn "while executing safe code '$code'\n";	3316	warn "while executing safe code '$code'\n";
3125	warn "with arguments " . (join " ", %vars) . "\n";	3317	warn "with arguments " . (join " ", %vars) . "\n";
…		…
3144	=cut	3336	=cut
3145		3337
3146	sub register_script_function {	3338	sub register_script_function {
3147	my ($fun, $cb) = @_;	3339	my ($fun, $cb) = @_;
3148		3340
3149	no strict 'refs';	3341	$fun = "safe::$fun" if $CFG{safe_eval};
3150	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3342	*$fun = $safe_hole->wrap ($cb);
3151	}	3343	}
3152		3344
3153	=back	3345	=back
3154		3346
3155	=cut	3347	=cut
…		…
3176		3368
3177	$facedata->{version} == 2	3369	$facedata->{version} == 2
3178	or cf::cleanup "$path: version mismatch, cannot proceed.";	3370	or cf::cleanup "$path: version mismatch, cannot proceed.";
3179		3371
3180	# patch in the exptable	3372	# patch in the exptable
		3373	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3181	$facedata->{resource}{"res/exp_table"} = {	3374	$facedata->{resource}{"res/exp_table"} = {
3182	type => FT_RSRC,	3375	type => FT_RSRC,
3183	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),	3376	data => $exp_table,
		3377	hash => (Digest::MD5::md5 $exp_table),
3184	};	3378	};
3185	cf::cede_to_tick;	3379	cf::cede_to_tick;
3186		3380
3187	{	3381	{
3188	my $faces = $facedata->{faceinfo};	3382	my $faces = $facedata->{faceinfo};
…		…
3190	while (my ($face, $info) = each %$faces) {	3384	while (my ($face, $info) = each %$faces) {
3191	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3385	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3192		3386
3193	cf::face::set_visibility $idx, $info->{visibility};	3387	cf::face::set_visibility $idx, $info->{visibility};
3194	cf::face::set_magicmap $idx, $info->{magicmap};	3388	cf::face::set_magicmap $idx, $info->{magicmap};
3195	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3389	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3196	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3390	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3197		3391
3198	cf::cede_to_tick;	3392	cf::cede_to_tick;
3199	}	3393	}
3200		3394
3201	while (my ($face, $info) = each %$faces) {	3395	while (my ($face, $info) = each %$faces) {
…		…
3225		3419
3226	cf::anim::invalidate_all; # d'oh	3420	cf::anim::invalidate_all; # d'oh
3227	}	3421	}
3228		3422
3229	{	3423	{
3230	# TODO: for gcfclient pleasure, we should give resources
3231	# that gcfclient doesn't grok a >10000 face index.
3232	my $res = $facedata->{resource};	3424	my $res = $facedata->{resource};
3233		3425
3234	while (my ($name, $info) = each %$res) {	3426	while (my ($name, $info) = each %$res) {
3235	if (defined $info->{type}) {	3427	if (defined $info->{type}) {
3236	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3428	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3237	my $data;
3238		3429
3239	if ($info->{type} & 1) {	3430	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3240	# prepend meta info
3241
3242	my $meta = $enc->encode ({
3243	name => $name,
3244	%{ $info->{meta} || {} },
3245	});
3246
3247	$data = pack "(w/a*)*", $meta, $info->{data};
3248	} else {
3249	$data = $info->{data};
3250	}
3251
3252	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3253	cf::face::set_type $idx, $info->{type};	3431	cf::face::set_type $idx, $info->{type};
3254	} else {	3432	} else {
3255	$RESOURCE{$name} = $info;	3433	$RESOURCE{$name} = $info; # unused
3256	}	3434	}
3257		3435
3258	cf::cede_to_tick;	3436	cf::cede_to_tick;
3259	}	3437	}
3260	}	3438	}
3261		3439
3262	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3440	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3263		3441
3264	1	3442	1
3265	}	3443	}
3266
3267	cf::global->attach (on_resource_update => sub {
3268	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3269	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3270
3271	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3272	my $sound = $soundconf->{compat}[$_]
3273	or next;
3274
3275	my $face = cf::face::find "sound/$sound->[1]";
3276	cf::sound::set $sound->[0] => $face;
3277	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3278	}
3279
3280	while (my ($k, $v) = each %{$soundconf->{event}}) {
3281	my $face = cf::face::find "sound/$v";
3282	cf::sound::set $k => $face;
3283	}
3284	}
3285	});
3286		3444
3287	register_exticmd fx_want => sub {	3445	register_exticmd fx_want => sub {
3288	my ($ns, $want) = @_;	3446	my ($ns, $want) = @_;
3289		3447
3290	while (my ($k, $v) = each %$want) {	3448	while (my ($k, $v) = each %$want) {
…		…
3329	sub reload_treasures {	3487	sub reload_treasures {
3330	load_resource_file "$DATADIR/treasures"	3488	load_resource_file "$DATADIR/treasures"
3331	or die "unable to load treasurelists\n";	3489	or die "unable to load treasurelists\n";
3332	}	3490	}
3333		3491
		3492	sub reload_sound {
		3493	warn "loading sound config from $DATADIR/sound\n";
		3494
		3495	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
		3496	or die "$DATADIR/sound $!";
		3497
		3498	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
		3499
		3500	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3501	my $sound = $soundconf->{compat}[$_]
		3502	or next;
		3503
		3504	my $face = cf::face::find "sound/$sound->[1]";
		3505	cf::sound::set $sound->[0] => $face;
		3506	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3507	}
		3508
		3509	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3510	my $face = cf::face::find "sound/$v";
		3511	cf::sound::set $k => $face;
		3512	}
		3513	}
		3514
3334	sub reload_resources {	3515	sub reload_resources {
3335	warn "reloading resource files...\n";	3516	warn "reloading resource files...\n";
3336		3517
3337	reload_facedata;	3518	reload_facedata;
		3519	reload_sound;
3338	reload_archetypes;	3520	reload_archetypes;
3339	reload_regions;	3521	reload_regions;
3340	reload_treasures;	3522	reload_treasures;
3341		3523
3342	warn "finished reloading resource files\n";	3524	warn "finished reloading resource files\n";
3343	}	3525	}
3344		3526
3345	sub reload_config {	3527	sub reload_config {
		3528	warn "reloading config file...\n";
		3529
3346	open my $fh, "<:utf8", "$CONFDIR/config"	3530	open my $fh, "<:utf8", "$CONFDIR/config"
3347	or return;	3531	or return;
3348		3532
3349	local $/;	3533	local $/;
3350	*CFG = YAML::Load <$fh>;	3534	*CFG = YAML::XS::Load scalar <$fh>;
3351		3535
3352	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3536	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3353		3537
3354	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3538	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3355	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3539	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3356		3540
3357	if (exists $CFG{mlockall}) {	3541	if (exists $CFG{mlockall}) {
…		…
3359	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3543	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3360	and die "WARNING: m(un)lockall failed: $!\n";	3544	and die "WARNING: m(un)lockall failed: $!\n";
3361	};	3545	};
3362	warn $@ if $@;	3546	warn $@ if $@;
3363	}	3547	}
		3548
		3549	warn "finished reloading resource files\n";
3364	}	3550	}
3365		3551
3366	sub pidfile() {	3552	sub pidfile() {
3367	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3553	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3368	or die "$PIDFILE: $!";	3554	or die "$PIDFILE: $!";
…		…
3380		3566
3381	seek $fh, 0, 0;	3567	seek $fh, 0, 0;
3382	print $fh $$;	3568	print $fh $$;
3383	}	3569	}
3384		3570
		3571	sub main_loop {
		3572	warn "EV::loop starting\n";
		3573	if (1) {
		3574	EV::loop;
		3575	}
		3576	warn "EV::loop returned\n";
		3577	goto &main_loop unless $REALLY_UNLOOP;
		3578	}
		3579
3385	sub main {	3580	sub main {
3386	cf::init_globals; # initialise logging	3581	cf::init_globals; # initialise logging
3387		3582
3388	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3583	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3389	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3584	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3390	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3585	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3391	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3586	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3392
3393	cf::init_experience;
3394	cf::init_anim;
3395	cf::init_attackmess;
3396	cf::init_dynamic;
3397		3587
3398	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3588	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399		3589
3400	# we must not ever block the main coroutine	3590	# we must not ever block the main coroutine
3401	local $Coro::idle = sub {	3591	local $Coro::idle = sub {
…		…
3407	};	3597	};
3408		3598
3409	evthread_start IO::AIO::poll_fileno;	3599	evthread_start IO::AIO::poll_fileno;
3410		3600
3411	cf::sync_job {	3601	cf::sync_job {
		3602	cf::init_experience;
		3603	cf::init_anim;
		3604	cf::init_attackmess;
		3605	cf::init_dynamic;
		3606
		3607	cf::load_settings;
		3608	cf::load_materials;
		3609
3412	reload_resources;	3610	reload_resources;
3413	reload_config;	3611	reload_config;
3414	db_init;	3612	db_init;
3415		3613
3416	cf::load_settings;
3417	cf::load_materials;
3418	cf::init_uuid;	3614	cf::init_uuid;
3419	cf::init_signals;	3615	cf::init_signals;
3420	cf::init_commands;
3421	cf::init_skills;	3616	cf::init_skills;
3422		3617
3423	cf::init_beforeplay;	3618	cf::init_beforeplay;
3424		3619
3425	atomic;	3620	atomic;
…		…
3427	load_extensions;	3622	load_extensions;
3428		3623
3429	utime time, time, $RUNTIMEFILE;	3624	utime time, time, $RUNTIMEFILE;
3430		3625
3431	# no (long-running) fork's whatsoever before this point(!)	3626	# no (long-running) fork's whatsoever before this point(!)
		3627	use POSIX ();
3432	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3628	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3433		3629
3434	(pop @POST_INIT)->(0) while @POST_INIT;	3630	(pop @POST_INIT)->(0) while @POST_INIT;
3435	};	3631	};
3436		3632
3437	EV::loop;	3633	cf::object::thawer::errors_are_fatal 0;
		3634	warn "parse errors in files are no longer fatal from this point on.\n";
		3635
		3636	main_loop;
3438	}	3637	}
3439		3638
3440	#############################################################################	3639	#############################################################################
3441	# initialisation and cleanup	3640	# initialisation and cleanup
3442		3641
3443	# install some emergency cleanup handlers	3642	# install some emergency cleanup handlers
3444	BEGIN {	3643	BEGIN {
3445	our %SIGWATCHER = ();	3644	our %SIGWATCHER = ();
3446	for my $signal (qw(INT HUP TERM)) {	3645	for my $signal (qw(INT HUP TERM)) {
3447	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3646	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3448	cf::cleanup "SIG$signal";	3647	cf::cleanup "SIG$signal";
3449	};	3648	};
3450	}	3649	}
3451	}	3650	}
3452		3651
3453	sub write_runtime_sync {	3652	sub write_runtime_sync {
		3653	my $t0 = AE::time;
		3654
3454	# first touch the runtime file to show we are still running:	3655	# first touch the runtime file to show we are still running:
3455	# the fsync below can take a very very long time.	3656	# the fsync below can take a very very long time.
3456		3657
3457	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3658	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3458		3659
3459	my $guard = cf::lock_acquire "write_runtime";	3660	my $guard = cf::lock_acquire "write_runtime";
3460		3661
3461	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3662	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3462	or return;	3663	or return;
3463		3664
3464	my $value = $cf::RUNTIME + 90 + 10;	3665	my $value = $cf::RUNTIME + 90 + 10;
3465	# 10 is the runtime save interval, for a monotonic clock	3666	# 10 is the runtime save interval, for a monotonic clock
3466	# 60 allows for the watchdog to kill the server.	3667	# 60 allows for the watchdog to kill the server.
…		…
3479	or return;	3680	or return;
3480		3681
3481	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3682	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3482	and return;	3683	and return;
3483		3684
3484	warn "runtime file written.\n";	3685	warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3485		3686
3486	1	3687	1
3487	}	3688	}
3488		3689
3489	our $uuid_lock;	3690	our $uuid_lock;
…		…
3615	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3816	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3616	for my $name (keys %$leaf_symtab) {	3817	for my $name (keys %$leaf_symtab) {
3617	_gv_clear *{"$pkg$name"};	3818	_gv_clear *{"$pkg$name"};
3618	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3819	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3619	}	3820	}
3620	warn "cleared package $pkg\n";#d#
3621	}	3821	}
3622		3822
3623	sub do_reload_perl() {	3823	sub do_reload_perl() {
3624	# can/must only be called in main	3824	# can/must only be called in main
3625	if ($Coro::current != $Coro::main) {	3825	if (in_main) {
3626	warn "can only reload from main coroutine";	3826	warn "can only reload from main coroutine";
3627	return;	3827	return;
3628	}	3828	}
3629		3829
3630	return if $RELOAD++;	3830	return if $RELOAD++;
3631		3831
3632	my $t1 = EV::time;	3832	my $t1 = AE::time;
3633		3833
3634	while ($RELOAD) {	3834	while ($RELOAD) {
3635	warn "reloading...";	3835	warn "reloading...";
3636		3836
3637	warn "entering sync_job";	3837	warn "entering sync_job";
…		…
3698	clear_package "safe::$_"	3898	clear_package "safe::$_"
3699	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3899	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3700		3900
3701	warn "unloading cf.pm \"a bit\"";	3901	warn "unloading cf.pm \"a bit\"";
3702	delete $INC{"cf.pm"};	3902	delete $INC{"cf.pm"};
3703	delete $INC{"cf/pod.pm"};	3903	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3704		3904
3705	# don't, removes xs symbols, too,	3905	# don't, removes xs symbols, too,
3706	# and global variables created in xs	3906	# and global variables created in xs
3707	#clear_package __PACKAGE__;	3907	#clear_package __PACKAGE__;
3708		3908
3709	warn "unload completed, starting to reload now";	3909	warn "unload completed, starting to reload now";
3710		3910
3711	warn "reloading cf.pm";	3911	warn "reloading cf.pm";
3712	require cf;	3912	require cf;
3713	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3913	cf::_connect_to_perl_1;
3714		3914
3715	warn "loading config and database again";	3915	warn "loading config and database again";
3716	cf::reload_config;	3916	cf::reload_config;
3717		3917
3718	warn "loading extensions";	3918	warn "loading extensions";
…		…
3740		3940
3741	warn "reloaded";	3941	warn "reloaded";
3742	--$RELOAD;	3942	--$RELOAD;
3743	}	3943	}
3744		3944
3745	$t1 = EV::time - $t1;	3945	$t1 = AE::time - $t1;
3746	warn "reload completed in ${t1}s\n";	3946	warn "reload completed in ${t1}s\n";
3747	};	3947	};
3748		3948
3749	our $RELOAD_WATCHER; # used only during reload	3949	our $RELOAD_WATCHER; # used only during reload
3750		3950
…		…
3753	# coro crashes during coro_state_free->destroy here.	3953	# coro crashes during coro_state_free->destroy here.
3754		3954
3755	$RELOAD_WATCHER ||= cf::async {	3955	$RELOAD_WATCHER ||= cf::async {
3756	Coro::AIO::aio_wait cache_extensions;	3956	Coro::AIO::aio_wait cache_extensions;
3757		3957
3758	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	3958	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3759	do_reload_perl;	3959	do_reload_perl;
3760	undef $RELOAD_WATCHER;	3960	undef $RELOAD_WATCHER;
3761	};	3961	};
3762	};	3962	};
3763	}	3963	}
…		…
3780		3980
3781	our @WAIT_FOR_TICK;	3981	our @WAIT_FOR_TICK;
3782	our @WAIT_FOR_TICK_BEGIN;	3982	our @WAIT_FOR_TICK_BEGIN;
3783		3983
3784	sub wait_for_tick {	3984	sub wait_for_tick {
3785	return if tick_inhibit || $Coro::current == $Coro::main;	3985	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3786		3986
3787	my $signal = new Coro::Signal;	3987	my $signal = new Coro::Signal;
3788	push @WAIT_FOR_TICK, $signal;	3988	push @WAIT_FOR_TICK, $signal;
3789	$signal->wait;	3989	$signal->wait;
3790	}	3990	}
3791		3991
3792	sub wait_for_tick_begin {	3992	sub wait_for_tick_begin {
3793	return if tick_inhibit || $Coro::current == $Coro::main;	3993	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3794		3994
3795	my $signal = new Coro::Signal;	3995	my $signal = new Coro::Signal;
3796	push @WAIT_FOR_TICK_BEGIN, $signal;	3996	push @WAIT_FOR_TICK_BEGIN, $signal;
3797	$signal->wait;	3997	$signal->wait;
3798	}	3998	}
…		…
3803	unless ++$bug_warning > 10;	4003	unless ++$bug_warning > 10;
3804	return;	4004	return;
3805	}	4005	}
3806		4006
3807	cf::server_tick; # one server iteration	4007	cf::server_tick; # one server iteration
		4008
		4009	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3808		4010
3809	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4011	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3810	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4012	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3811	Coro::async_pool {	4013	Coro::async_pool {
3812	$Coro::current->{desc} = "runtime saver";	4014	$Coro::current->{desc} = "runtime saver";
…		…
3835	}	4037	}
3836		4038
3837	{	4039	{
3838	# configure BDB	4040	# configure BDB
3839		4041
3840	BDB::min_parallel 8;	4042	BDB::min_parallel 16;
3841	BDB::max_poll_reqs $TICK * 0.1;	4043	BDB::max_poll_reqs $TICK * 0.1;
3842	$AnyEvent::BDB::WATCHER->priority (1);	4044	$AnyEvent::BDB::WATCHER->priority (1);
3843		4045
3844	unless ($DB_ENV) {	4046	unless ($DB_ENV) {
3845	$DB_ENV = BDB::db_env_create;	4047	$DB_ENV = BDB::db_env_create;
…		…
3925	LOG llevInfo, "[ABT] [suppressed]\n";	4127	LOG llevInfo, "[ABT] [suppressed]\n";
3926	}	4128	}
3927	}	4129	}
3928		4130
3929	# load additional modules	4131	# load additional modules
3930	use cf::pod;	4132	require "cf/$_.pm" for @EXTRA_MODULES;
		4133	cf::_connect_to_perl_2;
3931		4134
3932	END { cf::emergency_save }	4135	END { cf::emergency_save }
3933		4136
3934	1	4137	1
3935		4138

Diff Legend

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