[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.416 by root, Fri Apr 11 13:59:06 2008 UTC vs.
Revision 1.486 by root, Thu Oct 15 21:56:50 2009 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 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
		25	use 5.10.0;
24	use utf8;	26	use utf8;
25	use strict;	27	use strict qw(vars subs);
26		28
27	use Symbol;	29	use Symbol;
28	use List::Util;	30	use List::Util;
29	use Socket;	31	use Socket;
30	use EV 3.2;	32	use EV;
31	use Opcode;	33	use Opcode;
32	use Safe;	34	use Safe;
33	use Safe::Hole;	35	use Safe::Hole;
34	use Storable ();	36	use Storable ();
35		37
		38	use Guard ();
36	use Coro 4.50 ();	39	use Coro ();
37	use Coro::State;	40	use Coro::State;
38	use Coro::Handle;	41	use Coro::Handle;
39	use Coro::EV;	42	use Coro::EV;
		43	use Coro::AnyEvent;
40	use Coro::Timer;	44	use Coro::Timer;
41	use Coro::Signal;	45	use Coro::Signal;
42	use Coro::Semaphore;	46	use Coro::Semaphore;
		47	use Coro::SemaphoreSet;
		48	use Coro::AnyEvent;
43	use Coro::AIO;	49	use Coro::AIO;
44	use Coro::BDB;	50	use Coro::BDB 1.6;
45	use Coro::Storable;	51	use Coro::Storable;
46	use Coro::Util ();	52	use Coro::Util ();
47		53
48	use JSON::XS 2.01 ();	54	use JSON::XS 2.01 ();
49	use BDB ();	55	use BDB ();
50	use Data::Dumper;	56	use Data::Dumper;
51	use Digest::MD5;	57	use Digest::MD5;
52	use Fcntl;	58	use Fcntl;
53	use YAML ();	59	use YAML::XS ();
54	use IO::AIO 2.51 ();	60	use IO::AIO ();
55	use Time::HiRes;	61	use Time::HiRes;
56	use Compress::LZF;	62	use Compress::LZF;
57	use Digest::MD5 ();	63	use Digest::MD5 ();
		64
		65	AnyEvent::detect;
58		66
59	# configure various modules to our taste	67	# configure various modules to our taste
60	#	68	#
61	$Storable::canonical = 1; # reduce rsync transfers	69	$Storable::canonical = 1; # reduce rsync transfers
62	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	70	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
		71
		72	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
		73
		74	# make sure c-lzf reinitialises itself
		75	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63	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
64		77
65	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	78	# strictly for debugging
		79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
66		80
67	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68		82
69	our %COMMAND = ();	83	our %COMMAND = ();
70	our %COMMAND_TIME = ();	84	our %COMMAND_TIME = ();
73	our %EXTCMD = ();	87	our %EXTCMD = ();
74	our %EXTICMD = ();	88	our %EXTICMD = ();
75	our %EXT_CORO = (); # coroutines bound to extensions	89	our %EXT_CORO = (); # coroutines bound to extensions
76	our %EXT_MAP = (); # pluggable maps	90	our %EXT_MAP = (); # pluggable maps
77		91
78	our $RELOAD; # number of reloads so far	92	our $RELOAD; # number of reloads so far, non-zero while in reload
79	our @EVENT;	93	our @EVENT;
		94	our @REFLECT; # set by XS
		95	our %REFLECT; # set by us
80		96
81	our $CONFDIR = confdir;	97	our $CONFDIR = confdir;
82	our $DATADIR = datadir;	98	our $DATADIR = datadir;
83	our $LIBDIR = "$DATADIR/ext";	99	our $LIBDIR = "$DATADIR/ext";
84	our $PODDIR = "$DATADIR/pod";	100	our $PODDIR = "$DATADIR/pod";
85	our $MAPDIR = "$DATADIR/" . mapdir;	101	our $MAPDIR = "$DATADIR/" . mapdir;
86	our $LOCALDIR = localdir;	102	our $LOCALDIR = localdir;
87	our $TMPDIR = "$LOCALDIR/" . tmpdir;	103	our $TMPDIR = "$LOCALDIR/" . tmpdir;
88	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90	our $RANDOMDIR = "$LOCALDIR/random";	106	our $RANDOMDIR = "$LOCALDIR/random";
91	our $BDBDIR = "$LOCALDIR/db";	107	our $BDBDIR = "$LOCALDIR/db";
		108	our $PIDFILE = "$LOCALDIR/pid";
		109	our $RUNTIMEFILE = "$LOCALDIR/runtime";
		110
92	our %RESOURCE;	111	our %RESOURCE;
93		112
94	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	113	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95	our $AIO_POLL_WATCHER;
96	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	114	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97	our $NEXT_TICK;	115	our $NEXT_TICK;
98	our $USE_FSYNC = 1; # use fsync to write maps - default off	116	our $USE_FSYNC = 1; # use fsync to write maps - default on
99		117
100	our $BDB_POLL_WATCHER;
101	our $BDB_DEADLOCK_WATCHER;	118	our $BDB_DEADLOCK_WATCHER;
102	our $BDB_CHECKPOINT_WATCHER;	119	our $BDB_CHECKPOINT_WATCHER;
103	our $BDB_TRICKLE_WATCHER;	120	our $BDB_TRICKLE_WATCHER;
104	our $DB_ENV;	121	our $DB_ENV;
105		122
		123	our @EXTRA_MODULES = qw(pod match mapscript);
		124
106	our %CFG;	125	our %CFG;
107		126
108	our $UPTIME; $UPTIME \|\|= time;	127	our $UPTIME; $UPTIME \|\|= time;
109	our $RUNTIME;	128	our $RUNTIME;
110	our $NOW;	129	our $NOW;
…		…
119	our $LOAD; # a number between 0 (idle) and 1 (too many objects)	138	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120	our $LOADAVG; # same thing, but with alpha-smoothing	139	our $LOADAVG; # same thing, but with alpha-smoothing
121	our $JITTER; # average jitter	140	our $JITTER; # average jitter
122	our $TICK_START; # for load detecting purposes	141	our $TICK_START; # for load detecting purposes
123		142
		143	our @POST_INIT;
		144
		145	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
		146	our $REALLY_UNLOOP; # never set to true, please :)
		147
124	binmode STDOUT;	148	binmode STDOUT;
125	binmode STDERR;	149	binmode STDERR;
126		150
127	# read virtual server time, if available	151	# read virtual server time, if available
128	unless ($RUNTIME \|\| !-e "$LOCALDIR/runtime") {	152	unless ($RUNTIME \|\| !-e $RUNTIMEFILE) {
129	open my $fh, "<", "$LOCALDIR/runtime"	153	open my $fh, "<", $RUNTIMEFILE
130	or die "unable to read runtime file: $!";	154	or die "unable to read $RUNTIMEFILE file: $!";
131	$RUNTIME = <$fh> + 0.;	155	$RUNTIME = <$fh> + 0.;
132	}	156	}
		157
		158	eval "sub TICK() { $TICK } 1" or die;
133		159
134	mkdir $_	160	mkdir $_
135	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	161	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136		162
137	our $EMERGENCY_POSITION;	163	our $EMERGENCY_POSITION;
138		164
139	sub cf::map::normalise;	165	sub cf::map::normalise;
		166
		167	#############################################################################
		168
		169	%REFLECT = ();
		170	for (@REFLECT) {
		171	my $reflect = JSON::XS::decode_json $_;
		172	$REFLECT{$reflect->{class}} = $reflect;
		173	}
		174
		175	# this is decidedly evil
		176	$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
140		177
141	#############################################################################	178	#############################################################################
142		179
143	=head2 GLOBAL VARIABLES	180	=head2 GLOBAL VARIABLES
144		181
…		…
195		232
196	This array contains the results of the last C<invoke ()> call. When	233	This array contains the results of the last C<invoke ()> call. When
197	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	234	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198	that call.	235	that call.
199		236
		237	=item %cf::REFLECT
		238
		239	Contains, for each (C++) class name, a hash reference with information
		240	about object members (methods, scalars, arrays and flags) and other
		241	metadata, which is useful for introspection.
		242
200	=back	243	=back
201		244
202	=cut	245	=cut
203		246
204	BEGIN {	247	$Coro::State::WARNHOOK = sub {
205	*CORE::GLOBAL::warn = sub {
206	my $msg = join "", @_;	248	my $msg = join "", @_;
207		249
208	$msg .= "\n"	250	$msg .= "\n"
209	unless $msg =~ /\n$/;	251	unless $msg =~ /\n$/;
210		252
211	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	253	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
212		254
213	LOG llevError, $msg;	255	LOG llevError, $msg;
214	};	256	};
215	}
216		257
217	$Coro::State::DIEHOOK = sub {	258	$Coro::State::DIEHOOK = sub {
218	return unless $^S eq 0; # "eq", not "=="	259	return unless $^S eq 0; # "eq", not "=="
		260
		261	warn Carp::longmess $_[0];
219		262
220	if ($Coro::current == $Coro::main) {#d#	263	if ($Coro::current == $Coro::main) {#d#
221	warn "DIEHOOK called in main context, Coro bug?\n";#d#	264	warn "DIEHOOK called in main context, Coro bug?\n";#d#
222	return;#d#	265	return;#d#
223	}#d#	266	}#d#
224		267
225	# kill coroutine otherwise	268	# kill coroutine otherwise
226	warn Carp::longmess $_[0];
227	Coro::terminate	269	Coro::terminate
228	};	270	};
229
230	$SIG{__DIE__} = sub { }; #d#?
231		271
232	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	272	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	273	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	274	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	275	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
242	for my $pkg (qw(	282	for my $pkg (qw(
243	cf::global cf::attachable	283	cf::global cf::attachable
244	cf::object cf::object::player	284	cf::object cf::object::player
245	cf::client cf::player	285	cf::client cf::player
246	cf::arch cf::living	286	cf::arch cf::living
		287	cf::map cf::mapspace
247	cf::map cf::party cf::region	288	cf::party cf::region
248	)) {	289	)) {
249	no strict 'refs';
250	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	290	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251	}	291	}
252		292
253	$EV::DIED = sub {	293	$EV::DIED = sub {
254	warn "error in event callback: @_";	294	warn "error in event callback: @_";
…		…
296	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	336	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297		337
298	sub encode_json($) { $json_coder->encode ($_[0]) }	338	sub encode_json($) { $json_coder->encode ($_[0]) }
299	sub decode_json($) { $json_coder->decode ($_[0]) }	339	sub decode_json($) { $json_coder->decode ($_[0]) }
300		340
		341	=item cf::post_init { BLOCK }
		342
		343	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
		344	but I<before> the server starts ticking again.
		345
		346	The cdoeblock will have a single boolean argument to indicate whether this
		347	is a reload or not.
		348
		349	=cut
		350
		351	sub post_init(&) {
		352	push @POST_INIT, shift;
		353	}
		354
301	=item cf::lock_wait $string	355	=item cf::lock_wait $string
302		356
303	Wait until the given lock is available. See cf::lock_acquire.	357	Wait until the given lock is available. See cf::lock_acquire.
304		358
305	=item my $lock = cf::lock_acquire $string	359	=item my $lock = cf::lock_acquire $string
306		360
307	Wait until the given lock is available and then acquires it and returns	361	Wait until the given lock is available and then acquires it and returns
308	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	362	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309	for example when the coroutine gets canceled), the lock is automatically	363	for example when the coroutine gets canceled), the lock is automatically
310	returned.	364	returned.
311		365
312	Locks are not recursive, locking from the same coro twice results in a	366	Locks are not recursive, locking from the same coro twice results in a
313	deadlocked coro.	367	deadlocked coro.
…		…
319		373
320	Return true if the lock is currently active, i.e. somebody has locked it.	374	Return true if the lock is currently active, i.e. somebody has locked it.
321		375
322	=cut	376	=cut
323		377
324	our %LOCK;	378	our $LOCKS = new Coro::SemaphoreSet;
325	our %LOCKER;#d#
326		379
327	sub lock_wait($) {	380	sub lock_wait($) {
328	my ($key) = @_;	381	$LOCKS->wait ($_[0]);
329
330	if ($LOCKER{$key} == $Coro::current) {#d#
331	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332	return;#d#
333	}#d#
334
335	# wait for lock, if any
336	while ($LOCK{$key}) {
337	push @{ $LOCK{$key} }, $Coro::current;
338	Coro::schedule;
339	}
340	}	382	}
341		383
342	sub lock_acquire($) {	384	sub lock_acquire($) {
343	my ($key) = @_;	385	$LOCKS->guard ($_[0])
344
345	# wait, to be sure we are not locked
346	lock_wait $key;
347
348	$LOCK{$key} = [];
349	$LOCKER{$key} = $Coro::current;#d#
350
351	Coro::guard {
352	delete $LOCKER{$key};#d#
353	# wake up all waiters, to be on the safe side
354	$_->ready for @{ delete $LOCK{$key} };
355	}
356	}	386	}
357		387
358	sub lock_active($) {	388	sub lock_active($) {
359	my ($key) = @_;	389	$LOCKS->count ($_[0]) < 1
360
361	! ! $LOCK{$key}
362	}	390	}
363		391
364	sub freeze_mainloop {	392	sub freeze_mainloop {
365	tick_inhibit_inc;	393	tick_inhibit_inc;
366		394
367	Coro::guard \&tick_inhibit_dec;	395	&Guard::guard (\&tick_inhibit_dec);
368	}	396	}
369		397
370	=item cf::periodic $interval, $cb	398	=item cf::periodic $interval, $cb
371		399
372	Like EV::periodic, but randomly selects a starting point so that the actions	400	Like EV::periodic, but randomly selects a starting point so that the actions
…		…
427	}	455	}
428	}	456	}
429	};	457	};
430		458
431	sub get_slot($;$$) {	459	sub get_slot($;$$) {
		460	return if tick_inhibit \|\| $Coro::current == $Coro::main;
		461
432	my ($time, $pri, $name) = @_;	462	my ($time, $pri, $name) = @_;
433		463
434	$time = $TICK * .6 if $time > $TICK * .6;	464	$time = $TICK * .6 if $time > $TICK * .6;
435	my $sig = new Coro::Signal;	465	my $sig = new Coro::Signal;
436		466
…		…
722		752
723	#############################################################################	753	#############################################################################
724		754
725	=head2 ATTACHABLE OBJECTS	755	=head2 ATTACHABLE OBJECTS
726		756
727	Many objects in crossfire are so-called attachable objects. That means you can	757	Many objects in deliantra are so-called attachable objects. That means you can
728	attach callbacks/event handlers (a collection of which is called an "attachment")	758	attach callbacks/event handlers (a collection of which is called an "attachment")
729	to it. All such attachable objects support the following methods.	759	to it. All such attachable objects support the following methods.
730		760
731	In the following description, CLASS can be any of C<global>, C<object>	761	In the following description, CLASS can be any of C<global>, C<object>
732	C<player>, C<client> or C<map> (i.e. the attachable objects in	762	C<player>, C<client> or C<map> (i.e. the attachable objects in
…		…
782	=item cf::CLASS::attachment $name, ...	812	=item cf::CLASS::attachment $name, ...
783		813
784	Register an attachment by C<$name> through which attachable objects of the	814	Register an attachment by C<$name> through which attachable objects of the
785	given CLASS can refer to this attachment.	815	given CLASS can refer to this attachment.
786		816
787	Some classes such as crossfire maps and objects can specify attachments	817	Some classes such as deliantra maps and objects can specify attachments
788	that are attached at load/instantiate time, thus the need for a name.	818	that are attached at load/instantiate time, thus the need for a name.
789		819
790	These calls expect any number of the following handler/hook descriptions:	820	These calls expect any number of the following handler/hook descriptions:
791		821
792	=over 4	822	=over 4
…		…
1083		1113
1084	sub reattach {	1114	sub reattach {
1085	# basically do the same as instantiate, without calling instantiate	1115	# basically do the same as instantiate, without calling instantiate
1086	my ($obj) = @_;	1116	my ($obj) = @_;
1087		1117
		1118	# no longer needed after getting rid of delete_package?
1088	bless $obj, ref $obj; # re-bless in case extensions have been reloaded	1119	#bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1089		1120
1090	my $registry = $obj->registry;	1121	my $registry = $obj->registry;
1091		1122
1092	@$registry = ();	1123	@$registry = ();
1093		1124
…		…
1139	utf8::decode (my $decname = $filename);	1170	utf8::decode (my $decname = $filename);
1140	warn sprintf "saving %s (%d,%d)\n",	1171	warn sprintf "saving %s (%d,%d)\n",
1141	$decname, length $$rdata, scalar @$objs;	1172	$decname, length $$rdata, scalar @$objs;
1142		1173
1143	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1174	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
1144	chmod SAVE_MODE, $fh;	1175	aio_chmod $fh, SAVE_MODE;
1145	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1176	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146	aio_fsync $fh if $cf::USE_FSYNC;	1177	if ($cf::USE_FSYNC) {
		1178	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;
		1179	aio_fsync $fh;
		1180	}
1147	close $fh;	1181	aio_close $fh;
1148		1182
1149	if (@$objs) {	1183	if (@$objs) {
1150	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {	1184	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {
1151	chmod SAVE_MODE, $fh;	1185	aio_chmod $fh, SAVE_MODE;
1152	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1186	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153	aio_write $fh, 0, (length $data), $data, 0;	1187	aio_write $fh, 0, (length $data), $data, 0;
1154	aio_fsync $fh if $cf::USE_FSYNC;	1188	if ($cf::USE_FSYNC) {
		1189	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;
		1190	aio_fsync $fh;
		1191	}
1155	close $fh;	1192	aio_close $fh;
1156	aio_rename "$filename.pst~", "$filename.pst";	1193	aio_rename "$filename.pst~", "$filename.pst";
1157	}	1194	}
1158	} else {	1195	} else {
1159	aio_unlink "$filename.pst";	1196	aio_unlink "$filename.pst";
1160	}	1197	}
1161		1198
1162	aio_rename "$filename~", $filename;	1199	aio_rename "$filename~", $filename;
		1200
		1201	$filename =~ s%/[^/]+$%%;
		1202	aio_pathsync $filename if $cf::USE_FSYNC;
1163	} else {	1203	} else {
1164	warn "FATAL: $filename~: $!\n";	1204	warn "unable to save objects: $filename~: $!\n";
1165	}	1205	}
1166	} else {	1206	} else {
1167	aio_unlink $filename;	1207	aio_unlink $filename;
1168	aio_unlink "$filename.pst";	1208	aio_unlink "$filename.pst";
1169	}	1209	}
…		…
1260	my ($name, $cb) = @_;	1300	my ($name, $cb) = @_;
1261		1301
1262	$EXTICMD{$name} = $cb;	1302	$EXTICMD{$name} = $cb;
1263	}	1303	}
1264		1304
		1305	use File::Glob ();
		1306
1265	cf::player->attach (	1307	cf::player->attach (
1266	on_command => sub {	1308	on_command => sub {
1267	my ($pl, $name, $params) = @_;	1309	my ($pl, $name, $params) = @_;
1268		1310
1269	my $cb = $COMMAND{$name}	1311	my $cb = $COMMAND{$name}
…		…
1301		1343
1302	cf::override;	1344	cf::override;
1303	},	1345	},
1304	);	1346	);
1305		1347
		1348	# "readahead" all extensions
		1349	sub cache_extensions {
		1350	my $grp = IO::AIO::aio_group;
		1351
		1352	add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
		1353	for (grep /\.ext$/, @{$_[0]}) {
		1354	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
		1355	}
		1356	};
		1357
		1358	$grp
		1359	}
		1360
1306	sub load_extensions {	1361	sub load_extensions {
1307	cf::sync_job {	1362	cf::sync_job {
1308	my %todo;	1363	my %todo;
1309		1364
1310	for my $path (<$LIBDIR/*.ext>) {	1365	for my $path (<$LIBDIR/*.ext>) {
…		…
1329		1384
1330	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1385	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331	if $source =~ /\A#!.?perl.?#\s(.)$/m;	1386	if $source =~ /\A#!.?perl.?#\s(.)$/m;
1332		1387
1333	$ext{source} =	1388	$ext{source} =
1334	"package $pkg; use strict; use utf8;\n"	1389	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1335	. "#line 1 \"$path\"\n{\n"	1390	. "#line 1 \"$path\"\n{\n"
1336	. $source	1391	. $source
1337	. "\n};\n1";	1392	. "\n};\n1";
1338		1393
1339	$todo{$base} = \%ext;	1394	$todo{$base} = \%ext;
…		…
1379		1434
1380	=back	1435	=back
1381		1436
1382	=head2 CORE EXTENSIONS	1437	=head2 CORE EXTENSIONS
1383		1438
1384	Functions and methods that extend core crossfire objects.	1439	Functions and methods that extend core deliantra objects.
1385		1440
1386	=cut	1441	=cut
1387		1442
1388	package cf::player;	1443	package cf::player;
1389		1444
…		…
1432		1487
1433	sub exists($) {	1488	sub exists($) {
1434	my ($login) = @_;	1489	my ($login) = @_;
1435		1490
1436	$cf::PLAYER{$login}	1491	$cf::PLAYER{$login}
1437	or cf::sync_job { !aio_stat path $login }	1492	or !aio_stat path $login
1438	}	1493	}
1439		1494
1440	sub find($) {	1495	sub find($) {
1441	return $cf::PLAYER{$_[0]} \|\| do {	1496	return $cf::PLAYER{$_[0]} \|\| do {
1442	my $login = $_[0];	1497	my $login = $_[0];
…		…
1454	my $f = new_from_file cf::object::thawer path $login	1509	my $f = new_from_file cf::object::thawer path $login
1455	or return;	1510	or return;
1456		1511
1457	my $pl = cf::player::load_pl $f	1512	my $pl = cf::player::load_pl $f
1458	or return;	1513	or return;
		1514
1459	local $cf::PLAYER_LOADING{$login} = $pl;	1515	local $cf::PLAYER_LOADING{$login} = $pl;
1460	$f->resolve_delayed_derefs;	1516	$f->resolve_delayed_derefs;
1461	$cf::PLAYER{$login} = $pl	1517	$cf::PLAYER{$login} = $pl
1462	}	1518	}
1463	}	1519	}
…		…
1473		1529
1474	return if $pl->{deny_save};	1530	return if $pl->{deny_save};
1475		1531
1476	aio_mkdir playerdir $pl, 0770;	1532	aio_mkdir playerdir $pl, 0770;
1477	$pl->{last_save} = $cf::RUNTIME;	1533	$pl->{last_save} = $cf::RUNTIME;
		1534
		1535	cf::get_slot 0.01;
1478		1536
1479	$pl->save_pl ($path);	1537	$pl->save_pl ($path);
1480	cf::cede_to_tick;	1538	cf::cede_to_tick;
1481	}	1539	}
1482		1540
…		…
1514	my ($pl) = @_;	1572	my ($pl) = @_;
1515		1573
1516	my $name = $pl->ob->name;	1574	my $name = $pl->ob->name;
1517		1575
1518	$pl->{deny_save} = 1;	1576	$pl->{deny_save} = 1;
1519	$pl->password ("*"); # this should lock out the player until we nuked the dir	1577	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1520		1578
1521	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1579	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1522	$pl->deactivate;	1580	$pl->deactivate;
		1581	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
		1582	$pl->ob->check_score;
1523	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1583	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1524	$pl->ns->destroy if $pl->ns;	1584	$pl->ns->destroy if $pl->ns;
1525		1585
1526	my $path = playerdir $pl;	1586	my $path = playerdir $pl;
1527	my $temp = "$path~$cf::RUNTIME~deleting~";	1587	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1566		1626
1567	for my $login (@$dirs) {	1627	for my $login (@$dirs) {
1568	my $path = path $login;	1628	my $path = path $login;
1569		1629
1570	# a .pst is a dead give-away for a valid player	1630	# a .pst is a dead give-away for a valid player
1571	unless (-e "$path.pst") {	1631	# if no pst file found, open and chekc for blocked users
		1632	if (aio_stat "$path.pst") {
1572	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;	1633	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573	aio_read $fh, 0, 512, my $buf, 0 or next;	1634	aio_read $fh, 0, 512, my $buf, 0 or next;
1574	$buf !~ /^password -------------$/m or next; # official not-valid tag	1635	$buf !~ /^password -------------$/m or next; # official not-valid tag
1575	}	1636	}
1576		1637
…		…
1607	}	1668	}
1608		1669
1609	\@paths	1670	\@paths
1610	}	1671	}
1611		1672
1612	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)	1673	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613		1674
1614	Expand crossfire pod fragments into protocol xml.	1675	Expand deliantra pod fragments into protocol xml.
1615
1616	=cut
1617
1618	use re 'eval';
1619
1620	my $group;
1621	my $interior; $interior = qr{
1622	# match a pod interior sequence sans C<< >>
1623	(?:
1624	\ (.*?)\ (?{ $group = $^N })
1625	\| < (??{$interior}) >
1626	)
1627	}x;
1628
1629	sub expand_cfpod {
1630	my ($self, $pod) = @_;
1631
1632	my $xml;
1633
1634	while () {
1635	if ($pod =~ /\G( (?: [^BCGHITU]+ \| .(?!<) )+ )/xgcs) {
1636	$group = $1;
1637
1638	$group =~ s/&/&/g;
1639	$group =~ s/</</g;
1640
1641	$xml .= $group;
1642	} elsif ($pod =~ m%\G
1643	([BCGHITU])
1644	<
1645	(?:
1646	([^<>]*) (?{ $group = $^N })
1647	\| < $interior >
1648	)
1649	>
1650	%gcsx
1651	) {
1652	my ($code, $data) = ($1, $group);
1653
1654	if ($code eq "B") {
1655	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656	} elsif ($code eq "I") {
1657	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658	} elsif ($code eq "U") {
1659	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660	} elsif ($code eq "C") {
1661	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662	} elsif ($code eq "T") {
1663	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664	} elsif ($code eq "G") {
1665	my ($male, $female) = split /\\|/, $data;
1666	$data = $self->gender ? $female : $male;
1667	$xml .= expand_cfpod ($self, $data);
1668	} elsif ($code eq "H") {
1669	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1670	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1671	"")
1672	[$self->{hintmode}];
1673	} else {
1674	$xml .= "error processing '$code($data)' directive";
1675	}
1676	} else {
1677	if ($pod =~ /\G(.+)/) {
1678	warn "parse error while expanding $pod (at $1)";
1679	}
1680	last;
1681	}
1682	}
1683
1684	for ($xml) {
1685	# create single paragraphs (very hackish)
1686	s/(?<=\S)\n(?=\w)/ /g;
1687
1688	# compress some whitespace
1689	s/\s+\n/\n/g; # ws line-ends
1690	s/\n\n+/\n/g; # double lines
1691	s/^\n+//; # beginning lines
1692	s/\n+$//; # ending lines
1693	}
1694
1695	$xml
1696	}
1697
1698	no re 'eval';
1699
1700	sub hintmode {
1701	$_[0]{hintmode} = $_[1] if @_ > 1;
1702	$_[0]{hintmode}
1703	}
1704		1676
1705	=item $player->ext_reply ($msgid, @msg)	1677	=item $player->ext_reply ($msgid, @msg)
1706		1678
1707	Sends an ext reply to the player.	1679	Sends an ext reply to the player.
1708		1680
…		…
1775	our $MAX_RESET = 3600;	1747	our $MAX_RESET = 3600;
1776	our $DEFAULT_RESET = 3000;	1748	our $DEFAULT_RESET = 3000;
1777		1749
1778	sub generate_random_map {	1750	sub generate_random_map {
1779	my ($self, $rmp) = @_;	1751	my ($self, $rmp) = @_;
		1752
		1753	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
		1754
1780	# mit "rum" bekleckern, nicht	1755	# mit "rum" bekleckern, nicht
1781	$self->_create_random_map (	1756	$self->_create_random_map (
1782	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1757	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1783	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1758	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1784	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1759	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
…		…
1906		1881
1907	# the temporary/swap location	1882	# the temporary/swap location
1908	sub save_path {	1883	sub save_path {
1909	my ($self) = @_;	1884	my ($self) = @_;
1910		1885
1911	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1886	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1912	"$TMPDIR/$path.map"	1887	"$TMPDIR/$path.map"
1913	}	1888	}
1914		1889
1915	# the unique path, undef == no special unique path	1890	# the unique path, undef == no special unique path
1916	sub uniq_path {	1891	sub uniq_path {
1917	my ($self) = @_;	1892	my ($self) = @_;
1918		1893
1919	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1894	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1920	"$UNIQUEDIR/$path"	1895	"$UNIQUEDIR/$path"
1921	}
1922
1923	# and all this just because we cannot iterate over
1924	# all maps in C++...
1925	sub change_all_map_light {
1926	my ($change) = @_;
1927
1928	$_->change_map_light ($change)
1929	for grep $_->outdoor, values %cf::MAP;
1930	}	1896	}
1931		1897
1932	sub decay_objects {	1898	sub decay_objects {
1933	my ($self) = @_;	1899	my ($self) = @_;
1934		1900
…		…
2018	sub find {	1984	sub find {
2019	my ($path, $origin) = @_;	1985	my ($path, $origin) = @_;
2020		1986
2021	$path = normalise $path, $origin && $origin->path;	1987	$path = normalise $path, $origin && $origin->path;
2022		1988
2023	cf::lock_wait "map_data:$path";#d#remove	1989	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2024	cf::lock_wait "map_find:$path";	1990	my $guard2 = cf::lock_acquire "map_find:$path";
2025		1991
2026	$cf::MAP{$path} \|\| do {	1992	$cf::MAP{$path} \|\| do {
2027	my $guard1 = cf::lock_acquire "map_find:$path";
2028	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2029
2030	my $map = new_from_path cf::map $path	1993	my $map = new_from_path cf::map $path
2031	or return;	1994	or return;
2032		1995
2033	$map->{last_save} = $cf::RUNTIME;	1996	$map->{last_save} = $cf::RUNTIME;
2034		1997
…		…
2036	or return;	1999	or return;
2037		2000
2038	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	2001	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2039	# doing this can freeze the server in a sync job, obviously	2002	# doing this can freeze the server in a sync job, obviously
2040	#$cf::WAIT_FOR_TICK->wait;	2003	#$cf::WAIT_FOR_TICK->wait;
		2004	undef $guard2;
2041	undef $guard1;	2005	undef $guard1;
2042	undef $guard2;
2043	$map->reset;	2006	$map->reset;
2044	return find $path;	2007	return find $path;
2045	}	2008	}
2046		2009
2047	$cf::MAP{$path} = $map	2010	$cf::MAP{$path} = $map
…		…
2074	my $f = new_from_file cf::object::thawer $self->{load_path};	2037	my $f = new_from_file cf::object::thawer $self->{load_path};
2075	$f->skip_block;	2038	$f->skip_block;
2076	$self->_load_objects ($f)	2039	$self->_load_objects ($f)
2077	or return;	2040	or return;
2078		2041
2079	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2042	$self->post_load_original
2080	if delete $self->{load_original};	2043	if delete $self->{load_original};
2081		2044
2082	if (my $uniq = $self->uniq_path) {	2045	if (my $uniq = $self->uniq_path) {
2083	utf8::encode $uniq;	2046	utf8::encode $uniq;
2084	unless (aio_stat $uniq) {	2047	unless (aio_stat $uniq) {
…		…
2102	unless ($self->{deny_activate}) {	2065	unless ($self->{deny_activate}) {
2103	$self->decay_objects;	2066	$self->decay_objects;
2104	$self->fix_auto_apply;	2067	$self->fix_auto_apply;
2105	$self->update_buttons;	2068	$self->update_buttons;
2106	cf::cede_to_tick;	2069	cf::cede_to_tick;
2107	$self->set_darkness_map;
2108	cf::cede_to_tick;
2109	$self->activate;	2070	$self->activate;
2110	}	2071	}
2111		2072
2112	$self->{last_save} = $cf::RUNTIME;	2073	$self->{last_save} = $cf::RUNTIME;
2113	$self->last_access ($cf::RUNTIME);	2074	$self->last_access ($cf::RUNTIME);
2114		2075
2115	$self->in_memory (cf::MAP_IN_MEMORY);	2076	$self->in_memory (cf::MAP_ACTIVE);
2116	}	2077	}
2117		2078
2118	$self->post_load;	2079	$self->post_load;
2119	}	2080	}
2120		2081
…		…
2178	my ($path, $origin, $load) = @_;	2139	my ($path, $origin, $load) = @_;
2179		2140
2180	$path = normalise $path, $origin && $origin->{path};	2141	$path = normalise $path, $origin && $origin->{path};
2181		2142
2182	if (my $map = $cf::MAP{$path}) {	2143	if (my $map = $cf::MAP{$path}) {
2183	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;	2144	return $map if !$load \|\| $map->in_memory == cf::MAP_ACTIVE;
2184	}	2145	}
2185		2146
2186	$MAP_PREFETCH{$path} \|= $load;	2147	$MAP_PREFETCH{$path} \|= $load;
2187		2148
2188	$MAP_PREFETCHER \|\|= cf::async {	2149	$MAP_PREFETCHER \|\|= cf::async {
…		…
2225	cf::async {	2186	cf::async {
2226	$Coro::current->{desc} = "map player save";	2187	$Coro::current->{desc} = "map player save";
2227	$_->contr->save for $self->players;	2188	$_->contr->save for $self->players;
2228	};	2189	};
2229		2190
		2191	cf::get_slot 0.02;
		2192
2230	if ($uniq) {	2193	if ($uniq) {
2231	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	2194	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
2232	$self->_save_objects ($uniq, cf::IO_UNIQUES);	2195	$self->_save_objects ($uniq, cf::IO_UNIQUES);
2233	} else {	2196	} else {
2234	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS \| cf::IO_UNIQUES);	2197	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS \| cf::IO_UNIQUES);
…		…
2242	$self->save;	2205	$self->save;
2243		2206
2244	my $lock = cf::lock_acquire "map_data:$self->{path}";	2207	my $lock = cf::lock_acquire "map_data:$self->{path}";
2245		2208
2246	return if $self->players;	2209	return if $self->players;
2247	return if $self->in_memory != cf::MAP_IN_MEMORY;	2210	return if $self->in_memory != cf::MAP_ACTIVE;
2248	return if $self->{deny_save};	2211	return if $self->{deny_save};
2249		2212
2250	$self->in_memory (cf::MAP_SWAPPED);	2213	$self->in_memory (cf::MAP_SWAPPED);
2251		2214
2252	$self->deactivate;	2215	$self->deactivate;
…		…
2277		2240
2278	my $lock = cf::lock_acquire "map_data:$self->{path}";	2241	my $lock = cf::lock_acquire "map_data:$self->{path}";
2279		2242
2280	return if $self->players;	2243	return if $self->players;
2281		2244
2282	warn "resetting map ", $self->path;	2245	warn "resetting map ", $self->path, "\n";
2283		2246
2284	$self->in_memory (cf::MAP_SWAPPED);	2247	$self->in_memory (cf::MAP_SWAPPED);
2285		2248
2286	# need to save uniques path	2249	# need to save uniques path
2287	unless ($self->{deny_save}) {	2250	unless ($self->{deny_save}) {
…		…
2370		2333
2371	sub unique_maps() {	2334	sub unique_maps() {
2372	[	2335	[
2373	map {	2336	map {
2374	utf8::decode $_;	2337	utf8::decode $_;
2375	/\.map$/	2338	s/\.map$//; # TODO future compatibility hack
		2339	/\.pst$/ \|\| !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
		2340	? ()
2376	? normalise $_	2341	: normalise $_
2377	: ()
2378	} @{ aio_readdir $UNIQUEDIR or [] }	2342	} @{ aio_readdir $UNIQUEDIR or [] }
2379	]	2343	]
2380	}	2344	}
2381		2345
2382	=back	2346	=back
…		…
2389		2353
2390	=over 4	2354	=over 4
2391		2355
2392	=item $ob->inv_recursive	2356	=item $ob->inv_recursive
2393		2357
2394	Returns the inventory of the object _and_ their inventories, recursively.	2358	Returns the inventory of the object I<and> their inventories, recursively,
		2359	but I<not> the object itself.
2395		2360
2396	=cut	2361	=cut
2397		2362
2398	sub inv_recursive_;	2363	sub inv_recursive_;
2399	sub inv_recursive_ {	2364	sub inv_recursive_ {
…		…
2404	inv_recursive_ inv $_[0]	2369	inv_recursive_ inv $_[0]
2405	}	2370	}
2406		2371
2407	=item $ref = $ob->ref	2372	=item $ref = $ob->ref
2408		2373
2409	creates and returns a persistent reference to an objetc that can be stored as a string.	2374	Creates and returns a persistent reference to an object that can be stored as a string.
2410		2375
2411	=item $ob = cf::object::deref ($refstring)	2376	=item $ob = cf::object::deref ($refstring)
2412		2377
2413	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2378	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2414	even if the object actually exists. May block.	2379	even if the object actually exists. May block.
…		…
2446	can be C<undef>. Does the right thing when the player is currently in a	2411	can be C<undef>. Does the right thing when the player is currently in a
2447	dialogue with the given NPC character.	2412	dialogue with the given NPC character.
2448		2413
2449	=cut	2414	=cut
2450		2415
		2416	our $SAY_CHANNEL = {
		2417	id => "say",
		2418	title => "Map",
		2419	reply => "say ",
		2420	tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
		2421	};
		2422
		2423	our $CHAT_CHANNEL = {
		2424	id => "chat",
		2425	title => "Chat",
		2426	reply => "chat ",
		2427	tooltip => "Player chat and shouts, global to the server.",
		2428	};
		2429
2451	# rough implementation of a future "reply" method that works	2430	# rough implementation of a future "reply" method that works
2452	# with dialog boxes.	2431	# with dialog boxes.
2453	#TODO: the first argument must go, split into a $npc->reply_to ( method	2432	#TODO: the first argument must go, split into a $npc->reply_to ( method
2454	sub cf::object::player::reply($$$;$) {	2433	sub cf::object::player::reply($$$;$) {
2455	my ($self, $npc, $msg, $flags) = @_;	2434	my ($self, $npc, $msg, $flags) = @_;
…		…
2466	my $dialog = $pl->{npc_dialog};	2445	my $dialog = $pl->{npc_dialog};
2467	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));	2446	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2468		2447
2469	} else {	2448	} else {
2470	$msg = $npc->name . " says: $msg" if $npc;	2449	$msg = $npc->name . " says: $msg" if $npc;
2471	$self->message ($msg, $flags);	2450	$self->send_msg ($SAY_CHANNEL => $msg, $flags);
2472	}	2451	}
2473	}	2452	}
2474	}	2453	}
2475		2454
2476	=item $object->send_msg ($channel, $msg, $color, [extra...])	2455	=item $object->send_msg ($channel, $msg, $color, [extra...])
…		…
2501		2480
2502	=item $player_object->enter_link	2481	=item $player_object->enter_link
2503		2482
2504	Freezes the player and moves him/her to a special map (C<{link}>).	2483	Freezes the player and moves him/her to a special map (C<{link}>).
2505		2484
2506	The player should be reasonably safe there for short amounts of time. You	2485	The player should be reasonably safe there for short amounts of time (e.g.
2507	I<MUST> call C<leave_link> as soon as possible, though.	2486	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
		2487	though, as the palyer cannot control the character while it is on the link
		2488	map.
2508		2489
2509	Will never block.	2490	Will never block.
2510		2491
2511	=item $player_object->leave_link ($map, $x, $y)	2492	=item $player_object->leave_link ($map, $x, $y)
2512		2493
…		…
2570		2551
2571	$map->load;	2552	$map->load;
2572	$map->load_neighbours;	2553	$map->load_neighbours;
2573		2554
2574	return unless $self->contr->active;	2555	return unless $self->contr->active;
2575	$self->activate_recursive;
2576		2556
2577	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2557	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2578	$self->enter_map ($map, $x, $y);	2558	$self->enter_map ($map, $x, $y);
		2559
		2560	# only activate afterwards, to support waiting in hooks
		2561	$self->activate_recursive;
2579	}	2562	}
2580		2563
2581	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2564	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2582		2565
2583	Moves the player to the given map-path and coordinates by first freezing	2566	Moves the player to the given map-path and coordinates by first freezing
2584	her, loading and preparing them map, calling the provided $check callback	2567	her, loading and preparing them map, calling the provided $check callback
2585	that has to return the map if sucecssful, and then unfreezes the player on	2568	that has to return the map if sucecssful, and then unfreezes the player on
2586	the new (success) or old (failed) map position. In either case, $done will	2569	the new (success) or old (failed) map position. In either case, $done will
2587	be called at the end of this process.	2570	be called at the end of this process.
		2571
		2572	Note that $check will be called with a potentially non-loaded map, so if
		2573	it needs a loaded map it has to call C<< ->load >>.
2588		2574
2589	=cut	2575	=cut
2590		2576
2591	our $GOTOGEN;	2577	our $GOTOGEN;
2592		2578
…		…
2671	}	2657	}
2672		2658
2673	sub prepare_random_map {	2659	sub prepare_random_map {
2674	my ($exit) = @_;	2660	my ($exit) = @_;
2675		2661
2676	my $guard = cf::lock_acquire "exit_prepare:$exit";
2677
2678	# all this does is basically replace the /! path by	2662	# all this does is basically replace the /! path by
2679	# a new random map path (?random/...) with a seed	2663	# a new random map path (?random/...) with a seed
2680	# that depends on the exit object	2664	# that depends on the exit object
2681		2665
2682	my $rmp = parse_random_map_params $exit->msg;	2666	my $rmp = parse_random_map_params $exit->msg;
…		…
2684	if ($exit->map) {	2668	if ($exit->map) {
2685	$rmp->{region} = $exit->region->name;	2669	$rmp->{region} = $exit->region->name;
2686	$rmp->{origin_map} = $exit->map->path;	2670	$rmp->{origin_map} = $exit->map->path;
2687	$rmp->{origin_x} = $exit->x;	2671	$rmp->{origin_x} = $exit->x;
2688	$rmp->{origin_y} = $exit->y;	2672	$rmp->{origin_y} = $exit->y;
		2673
		2674	$exit->map->touch;
2689	}	2675	}
2690		2676
2691	$rmp->{random_seed} \|\|= $exit->random_seed;	2677	$rmp->{random_seed} \|\|= $exit->random_seed;
2692		2678
2693	my $data = cf::encode_json $rmp;	2679	my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2694	my $md5 = Digest::MD5::md5_hex $data;	2680	my $md5 = Digest::MD5::md5_hex $data;
2695	my $meta = "$RANDOMDIR/$md5.meta";	2681	my $meta = "$RANDOMDIR/$md5.meta";
2696		2682
2697	if (my $fh = aio_open "$meta~", O_WRONLY \| O_CREAT, 0666) {	2683	if (my $fh = aio_open "$meta~", O_WRONLY \| O_CREAT, 0666) {
2698	aio_write $fh, 0, (length $data), $data, 0;	2684	aio_write $fh, 0, (length $data), $data, 0;
2699	undef $fh;	2685	undef $fh;
2700	aio_rename "$meta~", $meta;	2686	aio_rename "$meta~", $meta;
2701		2687
		2688	my $slaying = "?random/$md5";
		2689
		2690	if ($exit->valid) {
2702	$exit->slaying ("?random/$md5");	2691	$exit->slaying ("?random/$md5");
2703	$exit->msg (undef);	2692	$exit->msg (undef);
		2693	}
2704	}	2694	}
2705	}	2695	}
2706		2696
2707	sub cf::object::player::enter_exit {	2697	sub cf::object::player::enter_exit {
2708	my ($self, $exit) = @_;	2698	my ($self, $exit) = @_;
2709		2699
2710	return unless $self->type == cf::PLAYER;	2700	return unless $self->type == cf::PLAYER;
2711		2701
2712	if ($exit->slaying eq "/!") {
2713	#TODO: this should de-fi-ni-te-ly not be a sync-job
2714	# the problem is that $exit might not survive long enough
2715	# so it needs to be done right now, right here
2716	cf::sync_job { prepare_random_map $exit };
2717	}
2718
2719	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2720	my $hp = $exit->stats->hp;
2721	my $sp = $exit->stats->sp;
2722
2723	$self->enter_link;	2702	$self->enter_link;
2724		2703
2725	# if exit is damned, update players death & WoR home-position
2726	$self->contr->savebed ($slaying, $hp, $sp)
2727	if $exit->flag (FLAG_DAMNED);
2728
2729	(async {	2704	(async {
2730	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";	2705	$Coro::current->{desc} = "enter_exit";
2731		2706
2732	$self->deactivate_recursive; # just to be sure
2733	unless (eval {	2707	unless (eval {
		2708	$self->deactivate_recursive; # just to be sure
		2709
		2710	# random map handling
		2711	{
		2712	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2713
		2714	prepare_random_map $exit
		2715	if $exit->slaying eq "/!";
		2716	}
		2717
		2718	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
		2719	my $x = $exit->stats->hp;
		2720	my $y = $exit->stats->sp;
		2721
2734	$self->goto ($slaying, $hp, $sp);	2722	$self->goto ($map, $x, $y);
2735		2723
		2724	# if exit is damned, update players death & WoR home-position
		2725	$self->contr->savebed ($map, $x, $y)
		2726	if $exit->flag (cf::FLAG_DAMNED);
		2727
2736	1;	2728	1
2737	}) {	2729	}) {
2738	$self->message ("Something went wrong deep within the crossfire server. "	2730	$self->message ("Something went wrong deep within the deliantra server. "
2739	. "I'll try to bring you back to the map you were before. "	2731	. "I'll try to bring you back to the map you were before. "
2740	. "Please report this to the dungeon master!",	2732	. "Please report this to the dungeon master!",
2741	cf::NDI_UNIQUE \| cf::NDI_RED);	2733	cf::NDI_UNIQUE \| cf::NDI_RED);
2742		2734
2743	warn "ERROR in enter_exit: $@";	2735	warn "ERROR in enter_exit: $@";
…		…
2773		2765
2774	=cut	2766	=cut
2775		2767
2776	# non-persistent channels (usually the info channel)	2768	# non-persistent channels (usually the info channel)
2777	our %CHANNEL = (	2769	our %CHANNEL = (
		2770	"c/motd" => {
		2771	id => "infobox",
		2772	title => "MOTD",
		2773	reply => undef,
		2774	tooltip => "The message of the day",
		2775	},
2778	"c/identify" => {	2776	"c/identify" => {
2779	id => "infobox",	2777	id => "infobox",
2780	title => "Identify",	2778	title => "Identify",
2781	reply => undef,	2779	reply => undef,
2782	tooltip => "Items recently identified",	2780	tooltip => "Items recently identified",
…		…
2809	id => "infobox",	2807	id => "infobox",
2810	title => "Body Parts",	2808	title => "Body Parts",
2811	reply => undef,	2809	reply => undef,
2812	tooltip => "Shows which body parts you posess and are available",	2810	tooltip => "Shows which body parts you posess and are available",
2813	},	2811	},
		2812	"c/statistics" => {
		2813	id => "infobox",
		2814	title => "Statistics",
		2815	reply => undef,
		2816	tooltip => "Shows your primary statistics",
		2817	},
		2818	"c/skills" => {
		2819	id => "infobox",
		2820	title => "Skills",
		2821	reply => undef,
		2822	tooltip => "Shows your experience per skill and item power",
		2823	},
		2824	"c/shopitems" => {
		2825	id => "infobox",
		2826	title => "Shop Items",
		2827	reply => undef,
		2828	tooltip => "Shows the items currently for sale in this shop",
		2829	},
		2830	"c/resistances" => {
		2831	id => "infobox",
		2832	title => "Resistances",
		2833	reply => undef,
		2834	tooltip => "Shows your resistances",
		2835	},
		2836	"c/pets" => {
		2837	id => "infobox",
		2838	title => "Pets",
		2839	reply => undef,
		2840	tooltip => "Shows information abotu your pets/a specific pet",
		2841	},
		2842	"c/perceiveself" => {
		2843	id => "infobox",
		2844	title => "Perceive Self",
		2845	reply => undef,
		2846	tooltip => "You gained detailed knowledge about yourself",
		2847	},
2814	"c/uptime" => {	2848	"c/uptime" => {
2815	id => "infobox",	2849	id => "infobox",
2816	title => "Uptime",	2850	title => "Uptime",
2817	reply => undef,	2851	reply => undef,
2818	tooltip => "How long the server has been running since last restart",	2852	tooltip => "How long the server has been running since last restart",
…		…
2821	id => "infobox",	2855	id => "infobox",
2822	title => "Map Info",	2856	title => "Map Info",
2823	reply => undef,	2857	reply => undef,
2824	tooltip => "Information related to the maps",	2858	tooltip => "Information related to the maps",
2825	},	2859	},
		2860	"c/party" => {
		2861	id => "party",
		2862	title => "Party",
		2863	reply => "gsay ",
		2864	tooltip => "Messages and chat related to your party",
		2865	},
		2866	"c/death" => {
		2867	id => "death",
		2868	title => "Death",
		2869	reply => undef,
		2870	tooltip => "Reason for and more info about your most recent death",
		2871	},
		2872	"c/say" => $SAY_CHANNEL,
		2873	"c/chat" => $CHAT_CHANNEL,
2826	);	2874	);
2827		2875
2828	sub cf::client::send_msg {	2876	sub cf::client::send_msg {
2829	my ($self, $channel, $msg, $color, @extra) = @_;	2877	my ($self, $channel, $msg, $color, @extra) = @_;
2830		2878
2831	$msg = $self->pl->expand_cfpod ($msg);	2879	$msg = $self->pl->expand_cfpod ($msg)
		2880	unless $color & cf::NDI_VERBATIM;
2832		2881
2833	$color &= cf::NDI_CLIENT_MASK; # just in case...	2882	$color &= cf::NDI_CLIENT_MASK; # just in case...
2834		2883
2835	# check predefined channels, for the benefit of C	2884	# check predefined channels, for the benefit of C
2836	if ($CHANNEL{$channel}) {	2885	if ($CHANNEL{$channel}) {
2837	$channel = $CHANNEL{$channel};	2886	$channel = $CHANNEL{$channel};
2838		2887
2839	$self->ext_msg (channel_info => $channel)	2888	$self->ext_msg (channel_info => $channel);
2840	if $self->can_msg;
2841
2842	$channel = $channel->{id};	2889	$channel = $channel->{id};
2843		2890
2844	} elsif (ref $channel) {	2891	} elsif (ref $channel) {
2845	# send meta info to client, if not yet sent	2892	# send meta info to client, if not yet sent
2846	unless (exists $self->{channel}{$channel->{id}}) {	2893	unless (exists $self->{channel}{$channel->{id}}) {
2847	$self->{channel}{$channel->{id}} = $channel;	2894	$self->{channel}{$channel->{id}} = $channel;
2848	$self->ext_msg (channel_info => $channel)	2895	$self->ext_msg (channel_info => $channel);
2849	if $self->can_msg;
2850	}	2896	}
2851		2897
2852	$channel = $channel->{id};	2898	$channel = $channel->{id};
2853	}	2899	}
2854		2900
2855	return unless @extra \|\| length $msg;	2901	return unless @extra \|\| length $msg;
2856		2902
2857	if ($self->can_msg) {
2858	# default colour, mask it out	2903	# default colour, mask it out
2859	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)	2904	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
2860	if $color & cf::NDI_DEF;	2905	if $color & cf::NDI_DEF;
2861		2906
2862	$self->send_packet ("msg " . $self->{json_coder}->encode (	2907	my $pkt = "msg "
		2908	. $self->{json_coder}->encode (
2863	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));	2909	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864	} else {	2910	);
2865	if ($color >= 0) {
2866	# replace some tags by gcfclient-compatible ones
2867	for ($msg) {
2868	1 while
2869	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2870	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2871	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2872	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2873	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2874	}
2875		2911
2876	$color &= cf::NDI_COLOR_MASK;	2912	# try lzf for large packets
		2913	$pkt = "lzf " . Compress::LZF::compress $pkt
		2914	if 1024 <= length $pkt and $self->{can_lzf};
2877		2915
2878	utf8::encode $msg;	2916	# split very large packets
2879		2917	if (8192 < length $pkt and $self->{can_lzf}) {
2880	if (0 && $msg =~ /\[/) {	2918	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2881	# COMMAND/INFO	2919	$pkt = "frag";
2882	$self->send_packet ("drawextinfo $color 10 8 $msg")
2883	} else {
2884	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2885	$self->send_packet ("drawinfo $color $msg")
2886	}
2887	}
2888	}	2920	}
		2921
		2922	$self->send_packet ($pkt);
2889	}	2923	}
2890		2924
2891	=item $client->ext_msg ($type, @msg)	2925	=item $client->ext_msg ($type, @msg)
2892		2926
2893	Sends an ext event to the client.	2927	Sends an ext event to the client.
…		…
3067		3101
3068	The following functions and methods are available within a safe environment:	3102	The following functions and methods are available within a safe environment:
3069		3103
3070	cf::object	3104	cf::object
3071	contr pay_amount pay_player map x y force_find force_add destroy	3105	contr pay_amount pay_player map x y force_find force_add destroy
3072	insert remove name archname title slaying race decrease_ob_nr	3106	insert remove name archname title slaying race decrease split
		3107	value
3073		3108
3074	cf::object::player	3109	cf::object::player
3075	player	3110	player
3076		3111
3077	cf::player	3112	cf::player
…		…
3082		3117
3083	=cut	3118	=cut
3084		3119
3085	for (	3120	for (
3086	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3121	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3087	insert remove inv name archname title slaying race	3122	insert remove inv nrof name archname title slaying race
3088	decrease_ob_nr destroy)],	3123	decrease split destroy change_exp value msg lore send_msg)],
3089	["cf::object::player" => qw(player)],	3124	["cf::object::player" => qw(player)],
3090	["cf::player" => qw(peaceful)],	3125	["cf::player" => qw(peaceful send_msg)],
3091	["cf::map" => qw(trigger)],	3126	["cf::map" => qw(trigger)],
3092	) {	3127	) {
3093	no strict 'refs';	3128	no strict 'refs';
3094	my ($pkg, @funs) = @$_;	3129	my ($pkg, @funs) = @$_;
3095	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3130	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
…		…
3112	my ($code, %vars) = @_;	3147	my ($code, %vars) = @_;
3113		3148
3114	my $qcode = $code;	3149	my $qcode = $code;
3115	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3150	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3116	$qcode =~ s/\n/\\n/g;	3151	$qcode =~ s/\n/\\n/g;
		3152
		3153	%vars = (_dummy => 0) unless %vars;
3117		3154
3118	local $_;	3155	local $_;
3119	local @safe::cf::_safe_eval_args = values %vars;	3156	local @safe::cf::_safe_eval_args = values %vars;
3120		3157
3121	my $eval =	3158	my $eval =
…		…
3301	while (my ($k, $v) = each %$want) {	3338	while (my ($k, $v) = each %$want) {
3302	$ns->fx_want ($k, $v);	3339	$ns->fx_want ($k, $v);
3303	}	3340	}
3304	};	3341	};
3305		3342
		3343	sub load_resource_file($) {
		3344	my $guard = lock_acquire "load_resource_file";
		3345
		3346	my $status = load_resource_file_ $_[0];
		3347	get_slot 0.1, 100;
		3348	cf::arch::commit_load;
		3349
		3350	$status
		3351	}
		3352
3306	sub reload_regions {	3353	sub reload_regions {
3307	# HACK to clear player env face cache, we need some signal framework	3354	# HACK to clear player env face cache, we need some signal framework
3308	# for this (global event?)	3355	# for this (global event?)
3309	%ext::player_env::MUSIC_FACE_CACHE = ();	3356	%ext::player_env::MUSIC_FACE_CACHE = ();
3310		3357
…		…
3323	}	3370	}
3324		3371
3325	sub reload_archetypes {	3372	sub reload_archetypes {
3326	load_resource_file "$DATADIR/archetypes"	3373	load_resource_file "$DATADIR/archetypes"
3327	or die "unable to load archetypes\n";	3374	or die "unable to load archetypes\n";
3328	#d# NEED to laod twice to resolve forward references
3329	# this really needs to be done in an extra post-pass
3330	# (which needs to be synchronous, so solve it differently)
3331	load_resource_file "$DATADIR/archetypes"
3332	or die "unable to load archetypes\n";
3333	}	3375	}
3334		3376
3335	sub reload_treasures {	3377	sub reload_treasures {
3336	load_resource_file "$DATADIR/treasures"	3378	load_resource_file "$DATADIR/treasures"
3337	or die "unable to load treasurelists\n";	3379	or die "unable to load treasurelists\n";
3338	}	3380	}
3339		3381
3340	sub reload_resources {	3382	sub reload_resources {
3341	warn "reloading resource files...\n";	3383	warn "reloading resource files...\n";
3342		3384
		3385	reload_facedata;
		3386	reload_archetypes;
3343	reload_regions;	3387	reload_regions;
3344	reload_facedata;
3345	#reload_archetypes;#d#
3346	reload_archetypes;
3347	reload_treasures;	3388	reload_treasures;
3348		3389
3349	warn "finished reloading resource files\n";	3390	warn "finished reloading resource files\n";
3350	}	3391	}
3351		3392
3352	sub init {
3353	reload_resources;
3354	}
3355
3356	sub reload_config {	3393	sub reload_config {
		3394	warn "reloading config file...\n";
		3395
3357	open my $fh, "<:utf8", "$CONFDIR/config"	3396	open my $fh, "<:utf8", "$CONFDIR/config"
3358	or return;	3397	or return;
3359		3398
3360	local $/;	3399	local $/;
3361	*CFG = YAML::Load <$fh>;	3400	*CFG = YAML::XS::Load scalar <$fh>;
3362		3401
3363	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];	3402	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];
3364		3403
3365	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3404	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3366	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3405	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3370	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3409	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3371	and die "WARNING: m(un)lockall failed: $!\n";	3410	and die "WARNING: m(un)lockall failed: $!\n";
3372	};	3411	};
3373	warn $@ if $@;	3412	warn $@ if $@;
3374	}	3413	}
		3414
		3415	warn "finished reloading resource files\n";
		3416	}
		3417
		3418	sub pidfile() {
		3419	sysopen my $fh, $PIDFILE, O_RDWR \| O_CREAT
		3420	or die "$PIDFILE: $!";
		3421	flock $fh, &Fcntl::LOCK_EX
		3422	or die "$PIDFILE: flock: $!";
		3423	$fh
		3424	}
		3425
		3426	# make sure only one server instance is running at any one time
		3427	sub atomic {
		3428	my $fh = pidfile;
		3429
		3430	my $pid = <$fh>;
		3431	kill 9, $pid if $pid > 0;
		3432
		3433	seek $fh, 0, 0;
		3434	print $fh $$;
		3435	}
		3436
		3437	sub main_loop {
		3438	warn "EV::loop starting\n";
		3439	if (1) {
		3440	EV::loop;
		3441	}
		3442	warn "EV::loop returned\n";
		3443	goto &main_loop unless $REALLY_UNLOOP;
3375	}	3444	}
3376		3445
3377	sub main {	3446	sub main {
		3447	cf::init_globals; # initialise logging
		3448
		3449	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3450	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
		3451	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
		3452	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
		3453
		3454	cf::init_experience;
		3455	cf::init_anim;
		3456	cf::init_attackmess;
		3457	cf::init_dynamic;
		3458
		3459	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
		3460
3378	# we must not ever block the main coroutine	3461	# we must not ever block the main coroutine
3379	local $Coro::idle = sub {	3462	local $Coro::idle = sub {
3380	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3463	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3381	(async {	3464	(async {
3382	$Coro::current->{desc} = "IDLE BUG HANDLER";	3465	$Coro::current->{desc} = "IDLE BUG HANDLER";
3383	EV::loop EV::LOOP_ONESHOT;	3466	EV::loop EV::LOOP_ONESHOT;
3384	})->prio (Coro::PRIO_MAX);	3467	})->prio (Coro::PRIO_MAX);
3385	};	3468	};
3386		3469
3387	reload_config;
3388	db_init;
3389	load_extensions;
3390
3391	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3392	evthread_start IO::AIO::poll_fileno;	3470	evthread_start IO::AIO::poll_fileno;
3393	EV::loop;	3471
		3472	cf::sync_job {
		3473	reload_resources;
		3474	reload_config;
		3475	db_init;
		3476
		3477	cf::load_settings;
		3478	cf::load_materials;
		3479	cf::init_uuid;
		3480	cf::init_signals;
		3481	cf::init_commands;
		3482	cf::init_skills;
		3483
		3484	cf::init_beforeplay;
		3485
		3486	atomic;
		3487
		3488	load_extensions;
		3489
		3490	utime time, time, $RUNTIMEFILE;
		3491
		3492	# no (long-running) fork's whatsoever before this point(!)
		3493	use POSIX ();
		3494	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
		3495
		3496	(pop @POST_INIT)->(0) while @POST_INIT;
		3497	};
		3498
		3499	main_loop;
3394	}	3500	}
3395		3501
3396	#############################################################################	3502	#############################################################################
3397	# initialisation and cleanup	3503	# initialisation and cleanup
3398		3504
…		…
3404	cf::cleanup "SIG$signal";	3510	cf::cleanup "SIG$signal";
3405	};	3511	};
3406	}	3512	}
3407	}	3513	}
3408		3514
3409	sub write_runtime {	3515	sub write_runtime_sync {
3410	my $runtime = "$LOCALDIR/runtime";
3411
3412	# first touch the runtime file to show we are still running:	3516	# first touch the runtime file to show we are still running:
3413	# the fsync below can take a very very long time.	3517	# the fsync below can take a very very long time.
3414		3518
3415	IO::AIO::aio_utime $runtime, undef, undef;	3519	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3416		3520
3417	my $guard = cf::lock_acquire "write_runtime";	3521	my $guard = cf::lock_acquire "write_runtime";
3418		3522
3419	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644	3523	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY \| O_CREAT, 0644
3420	or return;	3524	or return;
3421		3525
3422	my $value = $cf::RUNTIME + 90 + 10;	3526	my $value = $cf::RUNTIME + 90 + 10;
3423	# 10 is the runtime save interval, for a monotonic clock	3527	# 10 is the runtime save interval, for a monotonic clock
3424	# 60 allows for the watchdog to kill the server.	3528	# 60 allows for the watchdog to kill the server.
…		…
3434	aio_utime $fh, undef, undef;	3538	aio_utime $fh, undef, undef;
3435		3539
3436	close $fh	3540	close $fh
3437	or return;	3541	or return;
3438		3542
3439	aio_rename "$runtime~", $runtime	3543	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3440	and return;	3544	and return;
3441		3545
3442	warn "runtime file written.\n";	3546	warn "runtime file written.\n";
3443		3547
3444	1	3548	1
…		…
3456	my $uuid = "$LOCALDIR/uuid";	3560	my $uuid = "$LOCALDIR/uuid";
3457		3561
3458	my $fh = aio_open "$uuid~", O_WRONLY \| O_CREAT, 0644	3562	my $fh = aio_open "$uuid~", O_WRONLY \| O_CREAT, 0644
3459	or return;	3563	or return;
3460		3564
3461	my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;	3565	my $value = uuid_seq uuid_cur;
		3566
		3567	unless ($value) {
		3568	warn "cowardly refusing to write zero uuid value!\n";
		3569	return;
		3570	}
		3571
		3572	my $value = uuid_str $value + $uuid_skip;
3462	$uuid_skip = 0;	3573	$uuid_skip = 0;
3463		3574
3464	(aio_write $fh, 0, (length $value), $value, 0) <= 0	3575	(aio_write $fh, 0, (length $value), $value, 0) <= 0
3465	and return;	3576	and return;
3466		3577
…		…
3488	}	3599	}
3489		3600
3490	sub emergency_save() {	3601	sub emergency_save() {
3491	my $freeze_guard = cf::freeze_mainloop;	3602	my $freeze_guard = cf::freeze_mainloop;
3492		3603
3493	warn "enter emergency perl save\n";	3604	warn "emergency_perl_save: enter\n";
3494		3605
3495	cf::sync_job {	3606	cf::sync_job {
		3607	# this is a trade-off: we want to be very quick here, so
		3608	# save all maps without fsync, and later call a global sync
		3609	# (which in turn might be very very slow)
		3610	local $USE_FSYNC = 0;
		3611
3496	# use a peculiar iteration method to avoid tripping on perl	3612	# use a peculiar iteration method to avoid tripping on perl
3497	# refcount bugs in for. also avoids problems with players	3613	# refcount bugs in for. also avoids problems with players
3498	# and maps saved/destroyed asynchronously.	3614	# and maps saved/destroyed asynchronously.
3499	warn "begin emergency player save\n";	3615	warn "emergency_perl_save: begin player save\n";
3500	for my $login (keys %cf::PLAYER) {	3616	for my $login (keys %cf::PLAYER) {
3501	my $pl = $cf::PLAYER{$login} or next;	3617	my $pl = $cf::PLAYER{$login} or next;
3502	$pl->valid or next;	3618	$pl->valid or next;
3503	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3619	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3504	$pl->save;	3620	$pl->save;
3505	}	3621	}
3506	warn "end emergency player save\n";	3622	warn "emergency_perl_save: end player save\n";
3507		3623
3508	warn "begin emergency map save\n";	3624	warn "emergency_perl_save: begin map save\n";
3509	for my $path (keys %cf::MAP) {	3625	for my $path (keys %cf::MAP) {
3510	my $map = $cf::MAP{$path} or next;	3626	my $map = $cf::MAP{$path} or next;
3511	$map->valid or next;	3627	$map->valid or next;
3512	$map->save;	3628	$map->save;
3513	}	3629	}
3514	warn "end emergency map save\n";	3630	warn "emergency_perl_save: end map save\n";
3515		3631
3516	warn "begin emergency database checkpoint\n";	3632	warn "emergency_perl_save: begin database checkpoint\n";
3517	BDB::db_env_txn_checkpoint $DB_ENV;	3633	BDB::db_env_txn_checkpoint $DB_ENV;
3518	warn "end emergency database checkpoint\n";	3634	warn "emergency_perl_save: end database checkpoint\n";
3519		3635
3520	warn "begin write uuid\n";	3636	warn "emergency_perl_save: begin write uuid\n";
3521	write_uuid_sync 1;	3637	write_uuid_sync 1;
3522	warn "end write uuid\n";	3638	warn "emergency_perl_save: end write uuid\n";
3523	};	3639	};
3524		3640
		3641	warn "emergency_perl_save: starting sync()\n";
		3642	IO::AIO::aio_sync sub {
		3643	warn "emergency_perl_save: finished sync()\n";
		3644	};
		3645
3525	warn "leave emergency perl save\n";	3646	warn "emergency_perl_save: leave\n";
3526	}	3647	}
3527		3648
3528	sub post_cleanup {	3649	sub post_cleanup {
3529	my ($make_core) = @_;	3650	my ($make_core) = @_;
3530		3651
3531	warn Carp::longmess "post_cleanup backtrace"	3652	warn Carp::longmess "post_cleanup backtrace"
3532	if $make_core;	3653	if $make_core;
		3654
		3655	my $fh = pidfile;
		3656	unlink $PIDFILE if <$fh> == $$;
		3657	}
		3658
		3659	# a safer delete_package, copied from Symbol
		3660	sub clear_package($) {
		3661	my $pkg = shift;
		3662
		3663	# expand to full symbol table name if needed
		3664	unless ($pkg =~ /^main::.*::$/) {
		3665	$pkg = "main$pkg" if $pkg =~ /^::/;
		3666	$pkg = "main::$pkg" unless $pkg =~ /^main::/;
		3667	$pkg .= '::' unless $pkg =~ /::$/;
		3668	}
		3669
		3670	my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
		3671	my $stem_symtab = *{$stem}{HASH};
		3672
		3673	defined $stem_symtab and exists $stem_symtab->{$leaf}
		3674	or return;
		3675
		3676	# clear all symbols
		3677	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
		3678	for my $name (keys %$leaf_symtab) {
		3679	_gv_clear *{"$pkg$name"};
		3680	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
		3681	}
		3682	warn "cleared package $pkg\n";#d#
3533	}	3683	}
3534		3684
3535	sub do_reload_perl() {	3685	sub do_reload_perl() {
3536	# can/must only be called in main	3686	# can/must only be called in main
3537	if ($Coro::current != $Coro::main) {	3687	if ($Coro::current != $Coro::main) {
3538	warn "can only reload from main coroutine";	3688	warn "can only reload from main coroutine";
3539	return;	3689	return;
3540	}	3690	}
3541		3691
		3692	return if $RELOAD++;
		3693
		3694	my $t1 = EV::time;
		3695
		3696	while ($RELOAD) {
3542	warn "reloading...";	3697	warn "reloading...";
3543		3698
3544	warn "entering sync_job";	3699	warn "entering sync_job";
3545		3700
3546	cf::sync_job {	3701	cf::sync_job {
3547	cf::write_runtime; # external watchdog should not bark	3702	cf::write_runtime_sync; # external watchdog should not bark
3548	cf::emergency_save;	3703	cf::emergency_save;
3549	cf::write_runtime; # external watchdog should not bark	3704	cf::write_runtime_sync; # external watchdog should not bark
3550		3705
3551	warn "syncing database to disk";	3706	warn "syncing database to disk";
3552	BDB::db_env_txn_checkpoint $DB_ENV;	3707	BDB::db_env_txn_checkpoint $DB_ENV;
3553		3708
3554	# if anything goes wrong in here, we should simply crash as we already saved	3709	# if anything goes wrong in here, we should simply crash as we already saved
3555		3710
3556	warn "flushing outstanding aio requests";	3711	warn "flushing outstanding aio requests";
3557	for (;;) {
3558	BDB::flush;
3559	IO::AIO::flush;
3560	Coro::cede_notself;
3561	last unless IO::AIO::nreqs \|\| BDB::nreqs;	3712	while (IO::AIO::nreqs \|\| BDB::nreqs) {
3562	warn "iterate...";	3713	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3563	}
3564
3565	++$RELOAD;
3566
3567	warn "cancelling all extension coros";
3568	$_->cancel for values %EXT_CORO;
3569	%EXT_CORO = ();
3570
3571	warn "removing commands";
3572	%COMMAND = ();
3573
3574	warn "removing ext/exti commands";
3575	%EXTCMD = ();
3576	%EXTICMD = ();
3577
3578	warn "unloading/nuking all extensions";
3579	for my $pkg (@EXTS) {
3580	warn "... unloading $pkg";
3581
3582	if (my $cb = $pkg->can ("unload")) {
3583	eval {
3584	$cb->($pkg);
3585	1
3586	} or warn "$pkg unloaded, but with errors: $@";
3587	}	3714	}
3588		3715
3589	warn "... nuking $pkg";	3716	warn "cancelling all extension coros";
3590	Symbol::delete_package $pkg;	3717	$_->cancel for values %EXT_CORO;
3591	}	3718	%EXT_CORO = ();
3592		3719
3593	warn "unloading all perl modules loaded from $LIBDIR";	3720	warn "removing commands";
3594	while (my ($k, $v) = each %INC) {	3721	%COMMAND = ();
3595	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3596		3722
		3723	warn "removing ext/exti commands";
		3724	%EXTCMD = ();
		3725	%EXTICMD = ();
		3726
		3727	warn "unloading/nuking all extensions";
		3728	for my $pkg (@EXTS) {
3597	warn "... unloading $k";	3729	warn "... unloading $pkg";
3598	delete $INC{$k};
3599		3730
3600	$k =~ s/\.pm$//;
3601	$k =~ s/\//::/g;
3602
3603	if (my $cb = $k->can ("unload_module")) {	3731	if (my $cb = $pkg->can ("unload")) {
		3732	eval {
3604	$cb->();	3733	$cb->($pkg);
		3734	1
		3735	} or warn "$pkg unloaded, but with errors: $@";
		3736	}
		3737
		3738	warn "... clearing $pkg";
		3739	clear_package $pkg;
3605	}	3740	}
3606		3741
3607	Symbol::delete_package $k;	3742	warn "unloading all perl modules loaded from $LIBDIR";
		3743	while (my ($k, $v) = each %INC) {
		3744	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
		3745
		3746	warn "... unloading $k";
		3747	delete $INC{$k};
		3748
		3749	$k =~ s/\.pm$//;
		3750	$k =~ s/\//::/g;
		3751
		3752	if (my $cb = $k->can ("unload_module")) {
		3753	$cb->();
		3754	}
		3755
		3756	clear_package $k;
3608	}	3757	}
3609		3758
3610	warn "getting rid of safe::, as good as possible";	3759	warn "getting rid of safe::, as good as possible";
3611	Symbol::delete_package "safe::$_"	3760	clear_package "safe::$_"
3612	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3761	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3613		3762
3614	warn "unloading cf.pm \"a bit\"";	3763	warn "unloading cf.pm \"a bit\"";
3615	delete $INC{"cf.pm"};	3764	delete $INC{"cf.pm"};
3616	delete $INC{"cf/pod.pm"};	3765	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3617		3766
3618	# don't, removes xs symbols, too,	3767	# don't, removes xs symbols, too,
3619	# and global variables created in xs	3768	# and global variables created in xs
3620	#Symbol::delete_package __PACKAGE__;	3769	#clear_package __PACKAGE__;
3621		3770
3622	warn "unload completed, starting to reload now";	3771	warn "unload completed, starting to reload now";
3623		3772
3624	warn "reloading cf.pm";	3773	warn "reloading cf.pm";
3625	require cf;	3774	require cf;
3626	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3775	cf::_connect_to_perl_1;
3627		3776
3628	warn "loading config and database again";	3777	warn "loading config and database again";
3629	cf::reload_config;	3778	cf::reload_config;
3630		3779
3631	warn "loading extensions";	3780	warn "loading extensions";
3632	cf::load_extensions;	3781	cf::load_extensions;
3633		3782
		3783	if ($REATTACH_ON_RELOAD) {
3634	warn "reattaching attachments to objects/players";	3784	warn "reattaching attachments to objects/players";
3635	_global_reattach; # objects, sockets	3785	_global_reattach; # objects, sockets
3636	warn "reattaching attachments to maps";	3786	warn "reattaching attachments to maps";
3637	reattach $_ for values %MAP;	3787	reattach $_ for values %MAP;
3638	warn "reattaching attachments to players";	3788	warn "reattaching attachments to players";
3639	reattach $_ for values %PLAYER;	3789	reattach $_ for values %PLAYER;
		3790	}
3640		3791
		3792	warn "running post_init jobs";
		3793	(pop @POST_INIT)->(1) while @POST_INIT;
		3794
3641	warn "leaving sync_job";	3795	warn "leaving sync_job";
3642		3796
3643	1	3797	1
3644	} or do {	3798	} or do {
3645	warn $@;	3799	warn $@;
3646	cf::cleanup "error while reloading, exiting.";	3800	cf::cleanup "error while reloading, exiting.";
3647	};	3801	};
3648		3802
3649	warn "reloaded";	3803	warn "reloaded";
		3804	--$RELOAD;
		3805	}
		3806
		3807	$t1 = EV::time - $t1;
		3808	warn "reload completed in ${t1}s\n";
3650	};	3809	};
3651		3810
3652	our $RELOAD_WATCHER; # used only during reload	3811	our $RELOAD_WATCHER; # used only during reload
3653		3812
3654	sub reload_perl() {	3813	sub reload_perl() {
3655	# doing reload synchronously and two reloads happen back-to-back,	3814	# doing reload synchronously and two reloads happen back-to-back,
3656	# coro crashes during coro_state_free->destroy here.	3815	# coro crashes during coro_state_free->destroy here.
3657		3816
		3817	$RELOAD_WATCHER \|\|= cf::async {
		3818	Coro::AIO::aio_wait cache_extensions;
		3819
3658	$RELOAD_WATCHER \|\|= EV::timer 0, 0, sub {	3820	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3659	do_reload_perl;	3821	do_reload_perl;
3660	undef $RELOAD_WATCHER;	3822	undef $RELOAD_WATCHER;
		3823	};
3661	};	3824	};
3662	}	3825	}
3663		3826
3664	register_command "reload" => sub {	3827	register_command "reload" => sub {
3665	my ($who, $arg) = @_;	3828	my ($who, $arg) = @_;
…		…
3679		3842
3680	our @WAIT_FOR_TICK;	3843	our @WAIT_FOR_TICK;
3681	our @WAIT_FOR_TICK_BEGIN;	3844	our @WAIT_FOR_TICK_BEGIN;
3682		3845
3683	sub wait_for_tick {	3846	sub wait_for_tick {
3684	return if tick_inhibit;
3685	return if $Coro::current == $Coro::main;	3847	return if tick_inhibit \|\| $Coro::current == $Coro::main;
3686		3848
3687	my $signal = new Coro::Signal;	3849	my $signal = new Coro::Signal;
3688	push @WAIT_FOR_TICK, $signal;	3850	push @WAIT_FOR_TICK, $signal;
3689	$signal->wait;	3851	$signal->wait;
3690	}	3852	}
3691		3853
3692	sub wait_for_tick_begin {	3854	sub wait_for_tick_begin {
3693	return if tick_inhibit;
3694	return if $Coro::current == $Coro::main;	3855	return if tick_inhibit \|\| $Coro::current == $Coro::main;
3695		3856
3696	my $signal = new Coro::Signal;	3857	my $signal = new Coro::Signal;
3697	push @WAIT_FOR_TICK_BEGIN, $signal;	3858	push @WAIT_FOR_TICK_BEGIN, $signal;
3698	$signal->wait;	3859	$signal->wait;
3699	}	3860	}
…		…
3709		3870
3710	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3871	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3711	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	3872	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3712	Coro::async_pool {	3873	Coro::async_pool {
3713	$Coro::current->{desc} = "runtime saver";	3874	$Coro::current->{desc} = "runtime saver";
3714	write_runtime	3875	write_runtime_sync
3715	or warn "ERROR: unable to write runtime file: $!";	3876	or warn "ERROR: unable to write runtime file: $!";
3716	};	3877	};
3717	}	3878	}
3718		3879
3719	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3880	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
…		…
3738	{	3899	{
3739	# configure BDB	3900	# configure BDB
3740		3901
3741	BDB::min_parallel 8;	3902	BDB::min_parallel 8;
3742	BDB::max_poll_reqs $TICK * 0.1;	3903	BDB::max_poll_reqs $TICK * 0.1;
3743	$Coro::BDB::WATCHER->priority (1);	3904	$AnyEvent::BDB::WATCHER->priority (1);
3744		3905
3745	unless ($DB_ENV) {	3906	unless ($DB_ENV) {
3746	$DB_ENV = BDB::db_env_create;	3907	$DB_ENV = BDB::db_env_create;
3747	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC	3908	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);
3748	\| BDB::LOG_AUTOREMOVE, 1);	3909	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
		3910	$DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3749	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);	3911	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3750	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);	3912	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3751		3913
3752	cf::sync_job {	3914	cf::sync_job {
3753	eval {	3915	eval {
…		…
3779	{	3941	{
3780	# configure IO::AIO	3942	# configure IO::AIO
3781		3943
3782	IO::AIO::min_parallel 8;	3944	IO::AIO::min_parallel 8;
3783	IO::AIO::max_poll_time $TICK * 0.1;	3945	IO::AIO::max_poll_time $TICK * 0.1;
3784	$Coro::AIO::WATCHER->priority (1);	3946	undef $AnyEvent::AIO::WATCHER;
3785	}	3947	}
3786		3948
3787	my $_log_backtrace;	3949	my $_log_backtrace;
3788		3950
3789	sub _log_backtrace {	3951	sub _log_backtrace {
…		…
3792	$msg =~ s/\n//;	3954	$msg =~ s/\n//;
3793		3955
3794	# limit the # of concurrent backtraces	3956	# limit the # of concurrent backtraces
3795	if ($_log_backtrace < 2) {	3957	if ($_log_backtrace < 2) {
3796	++$_log_backtrace;	3958	++$_log_backtrace;
		3959	my $perl_bt = Carp::longmess $msg;
3797	async {	3960	async {
3798	$Coro::current->{desc} = "abt $msg";	3961	$Coro::current->{desc} = "abt $msg";
3799		3962
3800	my @bt = fork_call {	3963	my @bt = fork_call {
3801	@addr = map { sprintf "%x", $_ } @addr;	3964	@addr = map { sprintf "%x", $_ } @addr;
…		…
3812	}	3975	}
3813		3976
3814	@funcs	3977	@funcs
3815	};	3978	};
3816		3979
3817	LOG llevInfo, "[ABT] $msg\n";	3980	LOG llevInfo, "[ABT] $perl_bt\n";
		3981	LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3818	LOG llevInfo, "[ABT] $_\n" for @bt;	3982	LOG llevInfo, "[ABT] $_\n" for @bt;
3819	--$_log_backtrace;	3983	--$_log_backtrace;
3820	};	3984	};
3821	} else {	3985	} else {
3822	LOG llevInfo, "[ABT] $msg\n";	3986	LOG llevInfo, "[ABT] $msg\n";
3823	LOG llevInfo, "[ABT] [suppressed]\n";	3987	LOG llevInfo, "[ABT] [suppressed]\n";
3824	}	3988	}
3825	}	3989	}
3826		3990
3827	# load additional modules	3991	# load additional modules
3828	use cf::pod;	3992	require "cf/$_.pm" for @EXTRA_MODULES;
		3993	cf::_connect_to_perl_2;
3829		3994
3830	END { cf::emergency_save }	3995	END { cf::emergency_save }
3831		3996
3832	1	3997	1
3833		3998

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.416 by root, Fri Apr 11 13:59:06 2008 UTC vs. Revision 1.486 by root, Thu Oct 15 21:56:50 2009 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.416 by root, Fri Apr 11 13:59:06 2008 UTC vs.
Revision 1.486 by root, Thu Oct 15 21:56:50 2009 UTC