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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.435 by root, Thu May 29 03:33:20 2008 UTC vs.
Revision 1.490 by root, Sat Oct 24 06:16:40 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;	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 ();	39	use Coro ();
37	use Coro::State;	40	use Coro::State;
38	use Coro::Handle;	41	use Coro::Handle;
		42	use Coro::EV;
39	use Coro::AnyEvent;	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;
43	use Coro::AnyEvent;	48	use Coro::AnyEvent;
44	use Coro::AIO;	49	use Coro::AIO;
45	use Coro::BDB;	50	use Coro::BDB 1.6;
46	use Coro::Storable;	51	use Coro::Storable;
47	use Coro::Util ();	52	use Coro::Util ();
48		53
49	use JSON::XS 2.01 ();	54	use JSON::XS 2.01 ();
50	use BDB ();	55	use BDB ();
51	use Data::Dumper;	56	use Data::Dumper;
52	use Digest::MD5;	57	use Digest::MD5;
53	use Fcntl;	58	use Fcntl;
54	use YAML ();	59	use YAML::XS ();
55	use IO::AIO ();	60	use IO::AIO ();
56	use Time::HiRes;	61	use Time::HiRes;
57	use Compress::LZF;	62	use Compress::LZF;
58	use Digest::MD5 ();	63	use Digest::MD5 ();
59		64
61		66
62	# configure various modules to our taste	67	# configure various modules to our taste
63	#	68	#
64	$Storable::canonical = 1; # reduce rsync transfers	69	$Storable::canonical = 1; # reduce rsync transfers
65	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";
66	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
67		77
68	$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" };
69		80
70	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
71		82
72	our %COMMAND = ();	83	our %COMMAND = ();
73	our %COMMAND_TIME = ();	84	our %COMMAND_TIME = ();
…		…
76	our %EXTCMD = ();	87	our %EXTCMD = ();
77	our %EXTICMD = ();	88	our %EXTICMD = ();
78	our %EXT_CORO = (); # coroutines bound to extensions	89	our %EXT_CORO = (); # coroutines bound to extensions
79	our %EXT_MAP = (); # pluggable maps	90	our %EXT_MAP = (); # pluggable maps
80		91
81	our $RELOAD; # number of reloads so far	92	our $RELOAD; # number of reloads so far, non-zero while in reload
82	our @EVENT;	93	our @EVENT;
		94	our @REFLECT; # set by XS
		95	our %REFLECT; # set by us
83		96
84	our $CONFDIR = confdir;	97	our $CONFDIR = confdir;
85	our $DATADIR = datadir;	98	our $DATADIR = datadir;
86	our $LIBDIR = "$DATADIR/ext";	99	our $LIBDIR = "$DATADIR/ext";
87	our $PODDIR = "$DATADIR/pod";	100	our $PODDIR = "$DATADIR/pod";
88	our $MAPDIR = "$DATADIR/" . mapdir;	101	our $MAPDIR = "$DATADIR/" . mapdir;
89	our $LOCALDIR = localdir;	102	our $LOCALDIR = localdir;
90	our $TMPDIR = "$LOCALDIR/" . tmpdir;	103	our $TMPDIR = "$LOCALDIR/" . tmpdir;
91	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
92	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
93	our $RANDOMDIR = "$LOCALDIR/random";	106	our $RANDOMDIR = "$LOCALDIR/random";
94	our $BDBDIR = "$LOCALDIR/db";	107	our $BDBDIR = "$LOCALDIR/db";
		108	our $PIDFILE = "$LOCALDIR/pid";
		109	our $RUNTIMEFILE = "$LOCALDIR/runtime";
		110
95	our %RESOURCE;	111	our %RESOURCE;
96		112
97	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	113	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
98	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	114	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
99	our $NEXT_TICK;	115	our $NEXT_TICK;
100	our $USE_FSYNC = 1; # use fsync to write maps - default off	116	our $USE_FSYNC = 1; # use fsync to write maps - default on
101		117
102	our $BDB_DEADLOCK_WATCHER;	118	our $BDB_DEADLOCK_WATCHER;
103	our $BDB_CHECKPOINT_WATCHER;	119	our $BDB_CHECKPOINT_WATCHER;
104	our $BDB_TRICKLE_WATCHER;	120	our $BDB_TRICKLE_WATCHER;
105	our $DB_ENV;	121	our $DB_ENV;
106		122
		123	our @EXTRA_MODULES = qw(pod match mapscript);
		124
107	our %CFG;	125	our %CFG;
108		126
109	our $UPTIME; $UPTIME \|\|= time;	127	our $UPTIME; $UPTIME \|\|= time;
110	our $RUNTIME;	128	our $RUNTIME;
111	our $NOW;	129	our $NOW;
…		…
120	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)
121	our $LOADAVG; # same thing, but with alpha-smoothing	139	our $LOADAVG; # same thing, but with alpha-smoothing
122	our $JITTER; # average jitter	140	our $JITTER; # average jitter
123	our $TICK_START; # for load detecting purposes	141	our $TICK_START; # for load detecting purposes
124		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
125	binmode STDOUT;	148	binmode STDOUT;
126	binmode STDERR;	149	binmode STDERR;
127		150
128	# read virtual server time, if available	151	# read virtual server time, if available
129	unless ($RUNTIME \|\| !-e "$LOCALDIR/runtime") {	152	unless ($RUNTIME \|\| !-e $RUNTIMEFILE) {
130	open my $fh, "<", "$LOCALDIR/runtime"	153	open my $fh, "<", $RUNTIMEFILE
131	or die "unable to read runtime file: $!";	154	or die "unable to read $RUNTIMEFILE file: $!";
132	$RUNTIME = <$fh> + 0.;	155	$RUNTIME = <$fh> + 0.;
133	}	156	}
		157
		158	eval "sub TICK() { $TICK } 1" or die;
134		159
135	mkdir $_	160	mkdir $_
136	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	161	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
137		162
138	our $EMERGENCY_POSITION;	163	our $EMERGENCY_POSITION;
139		164
140	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::"} };
141		177
142	#############################################################################	178	#############################################################################
143		179
144	=head2 GLOBAL VARIABLES	180	=head2 GLOBAL VARIABLES
145		181
…		…
192	returns directly I<after> the tick processing (and consequently, can only wake one process	228	returns directly I<after> the tick processing (and consequently, can only wake one process
193	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	229	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
194		230
195	=item @cf::INVOKE_RESULTS	231	=item @cf::INVOKE_RESULTS
196		232
197	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
198	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
199	that call.	235	that call.
200		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
201	=back	243	=back
202		244
203	=cut	245	=cut
204		246
205	BEGIN {	247	$Coro::State::WARNHOOK = sub {
206	*CORE::GLOBAL::warn = sub {
207	my $msg = join "", @_;	248	my $msg = join "", @_;
208		249
209	$msg .= "\n"	250	$msg .= "\n"
210	unless $msg =~ /\n$/;	251	unless $msg =~ /\n$/;
211		252
212	$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;
213		254
214	LOG llevError, $msg;	255	LOG llevError, $msg;
215	};	256	};
216	}
217		257
218	$Coro::State::DIEHOOK = sub {	258	$Coro::State::DIEHOOK = sub {
219	return unless $^S eq 0; # "eq", not "=="	259	return unless $^S eq 0; # "eq", not "=="
		260
		261	warn Carp::longmess $_[0];
220		262
221	if ($Coro::current == $Coro::main) {#d#	263	if ($Coro::current == $Coro::main) {#d#
222	warn "DIEHOOK called in main context, Coro bug?\n";#d#	264	warn "DIEHOOK called in main context, Coro bug?\n";#d#
223	return;#d#	265	return;#d#
224	}#d#	266	}#d#
225		267
226	# kill coroutine otherwise	268	# kill coroutine otherwise
227	warn Carp::longmess $_[0];
228	Coro::terminate	269	Coro::terminate
229	};	270	};
230
231	$SIG{__DIE__} = sub { }; #d#?
232		271
233	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	272	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
234	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	273	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
235	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	274	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
236	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	275	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
243	for my $pkg (qw(	282	for my $pkg (qw(
244	cf::global cf::attachable	283	cf::global cf::attachable
245	cf::object cf::object::player	284	cf::object cf::object::player
246	cf::client cf::player	285	cf::client cf::player
247	cf::arch cf::living	286	cf::arch cf::living
		287	cf::map cf::mapspace
248	cf::map cf::party cf::region	288	cf::party cf::region
249	)) {	289	)) {
250	no strict 'refs';
251	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	290	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
252	}	291	}
253		292
254	$EV::DIED = sub {	293	$EV::DIED = sub {
255	warn "error in event callback: @_";	294	warn "error in event callback: @_";
…		…
297	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
298		337
299	sub encode_json($) { $json_coder->encode ($_[0]) }	338	sub encode_json($) { $json_coder->encode ($_[0]) }
300	sub decode_json($) { $json_coder->decode ($_[0]) }	339	sub decode_json($) { $json_coder->decode ($_[0]) }
301		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
302	=item cf::lock_wait $string	355	=item cf::lock_wait $string
303		356
304	Wait until the given lock is available. See cf::lock_acquire.	357	Wait until the given lock is available. See cf::lock_acquire.
305		358
306	=item my $lock = cf::lock_acquire $string	359	=item my $lock = cf::lock_acquire $string
307		360
308	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
309	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,
310	for example when the coroutine gets canceled), the lock is automatically	363	for example when the coroutine gets canceled), the lock is automatically
311	returned.	364	returned.
312		365
313	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
314	deadlocked coro.	367	deadlocked coro.
…		…
320		373
321	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.
322		375
323	=cut	376	=cut
324		377
325	our %LOCK;	378	our $LOCKS = new Coro::SemaphoreSet;
326	our %LOCKER;#d#
327		379
328	sub lock_wait($) {	380	sub lock_wait($) {
329	my ($key) = @_;	381	$LOCKS->wait ($_[0]);
330
331	if ($LOCKER{$key} == $Coro::current) {#d#
332	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
333	return;#d#
334	}#d#
335
336	# wait for lock, if any
337	while ($LOCK{$key}) {
338	push @{ $LOCK{$key} }, $Coro::current;
339	Coro::schedule;
340	}
341	}	382	}
342		383
343	sub lock_acquire($) {	384	sub lock_acquire($) {
344	my ($key) = @_;	385	$LOCKS->guard ($_[0])
345
346	# wait, to be sure we are not locked
347	lock_wait $key;
348
349	$LOCK{$key} = [];
350	$LOCKER{$key} = $Coro::current;#d#
351
352	Coro::guard {
353	delete $LOCKER{$key};#d#
354	# wake up all waiters, to be on the safe side
355	$_->ready for @{ delete $LOCK{$key} };
356	}
357	}	386	}
358		387
359	sub lock_active($) {	388	sub lock_active($) {
360	my ($key) = @_;	389	$LOCKS->count ($_[0]) < 1
361
362	! ! $LOCK{$key}
363	}	390	}
364		391
365	sub freeze_mainloop {	392	sub freeze_mainloop {
366	tick_inhibit_inc;	393	tick_inhibit_inc;
367		394
368	Coro::guard \&tick_inhibit_dec;	395	&Guard::guard (\&tick_inhibit_dec);
369	}	396	}
370		397
371	=item cf::periodic $interval, $cb	398	=item cf::periodic $interval, $cb
372		399
373	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
…		…
725		752
726	#############################################################################	753	#############################################################################
727		754
728	=head2 ATTACHABLE OBJECTS	755	=head2 ATTACHABLE OBJECTS
729		756
730	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
731	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")
732	to it. All such attachable objects support the following methods.	759	to it. All such attachable objects support the following methods.
733		760
734	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>
735	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
…		…
785	=item cf::CLASS::attachment $name, ...	812	=item cf::CLASS::attachment $name, ...
786		813
787	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
788	given CLASS can refer to this attachment.	815	given CLASS can refer to this attachment.
789		816
790	Some classes such as crossfire maps and objects can specify attachments	817	Some classes such as deliantra maps and objects can specify attachments
791	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.
792		819
793	These calls expect any number of the following handler/hook descriptions:	820	These calls expect any number of the following handler/hook descriptions:
794		821
795	=over 4	822	=over 4
…		…
1086		1113
1087	sub reattach {	1114	sub reattach {
1088	# basically do the same as instantiate, without calling instantiate	1115	# basically do the same as instantiate, without calling instantiate
1089	my ($obj) = @_;	1116	my ($obj) = @_;
1090		1117
		1118	# no longer needed after getting rid of delete_package?
1091	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
1092		1120
1093	my $registry = $obj->registry;	1121	my $registry = $obj->registry;
1094		1122
1095	@$registry = ();	1123	@$registry = ();
1096		1124
…		…
1144	$decname, length $$rdata, scalar @$objs;	1172	$decname, length $$rdata, scalar @$objs;
1145		1173
1146	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1174	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
1147	aio_chmod $fh, SAVE_MODE;	1175	aio_chmod $fh, SAVE_MODE;
1148	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1176	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1149	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	}
1150	aio_close $fh;	1181	aio_close $fh;
1151		1182
1152	if (@$objs) {	1183	if (@$objs) {
1153	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) {
1154	aio_chmod $fh, SAVE_MODE;	1185	aio_chmod $fh, SAVE_MODE;
1155	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1186	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1156	aio_write $fh, 0, (length $data), $data, 0;	1187	aio_write $fh, 0, (length $data), $data, 0;
1157	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	}
1158	aio_close $fh;	1192	aio_close $fh;
1159	aio_rename "$filename.pst~", "$filename.pst";	1193	aio_rename "$filename.pst~", "$filename.pst";
1160	}	1194	}
1161	} else {	1195	} else {
1162	aio_unlink "$filename.pst";	1196	aio_unlink "$filename.pst";
1163	}	1197	}
1164		1198
1165	aio_rename "$filename~", $filename;	1199	aio_rename "$filename~", $filename;
		1200
		1201	$filename =~ s%/[^/]+$%%;
		1202	aio_pathsync $filename if $cf::USE_FSYNC;
1166	} else {	1203	} else {
1167	warn "FATAL: $filename~: $!\n";	1204	warn "unable to save objects: $filename~: $!\n";
1168	}	1205	}
1169	} else {	1206	} else {
1170	aio_unlink $filename;	1207	aio_unlink $filename;
1171	aio_unlink "$filename.pst";	1208	aio_unlink "$filename.pst";
1172	}	1209	}
…		…
1263	my ($name, $cb) = @_;	1300	my ($name, $cb) = @_;
1264		1301
1265	$EXTICMD{$name} = $cb;	1302	$EXTICMD{$name} = $cb;
1266	}	1303	}
1267		1304
		1305	use File::Glob ();
		1306
1268	cf::player->attach (	1307	cf::player->attach (
1269	on_command => sub {	1308	on_command => sub {
1270	my ($pl, $name, $params) = @_;	1309	my ($pl, $name, $params) = @_;
1271		1310
1272	my $cb = $COMMAND{$name}	1311	my $cb = $COMMAND{$name}
…		…
1304		1343
1305	cf::override;	1344	cf::override;
1306	},	1345	},
1307	);	1346	);
1308		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
1309	sub load_extensions {	1361	sub load_extensions {
1310	cf::sync_job {	1362	cf::sync_job {
1311	my %todo;	1363	my %todo;
1312		1364
1313	for my $path (<$LIBDIR/*.ext>) {	1365	for my $path (<$LIBDIR/*.ext>) {
…		…
1332		1384
1333	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1385	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1334	if $source =~ /\A#!.?perl.?#\s(.)$/m;	1386	if $source =~ /\A#!.?perl.?#\s(.)$/m;
1335		1387
1336	$ext{source} =	1388	$ext{source} =
1337	"package $pkg; use strict; use utf8;\n"	1389	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1338	. "#line 1 \"$path\"\n{\n"	1390	. "#line 1 \"$path\"\n{\n"
1339	. $source	1391	. $source
1340	. "\n};\n1";	1392	. "\n};\n1";
1341		1393
1342	$todo{$base} = \%ext;	1394	$todo{$base} = \%ext;
…		…
1382		1434
1383	=back	1435	=back
1384		1436
1385	=head2 CORE EXTENSIONS	1437	=head2 CORE EXTENSIONS
1386		1438
1387	Functions and methods that extend core crossfire objects.	1439	Functions and methods that extend core deliantra objects.
1388		1440
1389	=cut	1441	=cut
1390		1442
1391	package cf::player;	1443	package cf::player;
1392		1444
…		…
1435		1487
1436	sub exists($) {	1488	sub exists($) {
1437	my ($login) = @_;	1489	my ($login) = @_;
1438		1490
1439	$cf::PLAYER{$login}	1491	$cf::PLAYER{$login}
1440	or cf::sync_job { !aio_stat path $login }	1492	or !aio_stat path $login
1441	}	1493	}
1442		1494
1443	sub find($) {	1495	sub find($) {
1444	return $cf::PLAYER{$_[0]} \|\| do {	1496	return $cf::PLAYER{$_[0]} \|\| do {
1445	my $login = $_[0];	1497	my $login = $_[0];
…		…
1520	my ($pl) = @_;	1572	my ($pl) = @_;
1521		1573
1522	my $name = $pl->ob->name;	1574	my $name = $pl->ob->name;
1523		1575
1524	$pl->{deny_save} = 1;	1576	$pl->{deny_save} = 1;
1525	$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
1526		1578
1527	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1579	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1528	$pl->deactivate;	1580	$pl->deactivate;
1529	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1581	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530	$pl->ob->check_score;	1582	$pl->ob->check_score;
…		…
1616	}	1668	}
1617		1669
1618	\@paths	1670	\@paths
1619	}	1671	}
1620		1672
1621	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)	1673	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1622		1674
1623	Expand crossfire pod fragments into protocol xml.	1675	Expand deliantra pod fragments into protocol xml.
1624
1625	=cut
1626
1627	use re 'eval';
1628
1629	my $group;
1630	my $interior; $interior = qr{
1631	# match a pod interior sequence sans C<< >>
1632	(?:
1633	\ (.*?)\ (?{ $group = $^N })
1634	\| < (??{$interior}) >
1635	)
1636	}x;
1637
1638	sub expand_cfpod {
1639	my ($self, $pod) = @_;
1640
1641	my $xml;
1642
1643	while () {
1644	if ($pod =~ /\G( (?: [^BCGHITU]+ \| .(?!<) )+ )/xgcs) {
1645	$group = $1;
1646
1647	$group =~ s/&/&/g;
1648	$group =~ s/</</g;
1649
1650	$xml .= $group;
1651	} elsif ($pod =~ m%\G
1652	([BCGHITU])
1653	<
1654	(?:
1655	([^<>]*) (?{ $group = $^N })
1656	\| < $interior >
1657	)
1658	>
1659	%gcsx
1660	) {
1661	my ($code, $data) = ($1, $group);
1662
1663	if ($code eq "B") {
1664	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1665	} elsif ($code eq "I") {
1666	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1667	} elsif ($code eq "U") {
1668	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1669	} elsif ($code eq "C") {
1670	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1671	} elsif ($code eq "T") {
1672	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1673	} elsif ($code eq "G") {
1674	my ($male, $female) = split /\\|/, $data;
1675	$data = $self->gender ? $female : $male;
1676	$xml .= expand_cfpod ($self, $data);
1677	} elsif ($code eq "H") {
1678	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1679	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1680	"")
1681	[$self->{hintmode}];
1682	} else {
1683	$xml .= "error processing '$code($data)' directive";
1684	}
1685	} else {
1686	if ($pod =~ /\G(.+)/) {
1687	warn "parse error while expanding $pod (at $1)";
1688	}
1689	last;
1690	}
1691	}
1692
1693	for ($xml) {
1694	# create single paragraphs (very hackish)
1695	s/(?<=\S)\n(?=\w)/ /g;
1696
1697	# compress some whitespace
1698	s/\s+\n/\n/g; # ws line-ends
1699	s/\n\n+/\n/g; # double lines
1700	s/^\n+//; # beginning lines
1701	s/\n+$//; # ending lines
1702	}
1703
1704	$xml
1705	}
1706
1707	no re 'eval';
1708
1709	sub hintmode {
1710	$_[0]{hintmode} = $_[1] if @_ > 1;
1711	$_[0]{hintmode}
1712	}
1713		1676
1714	=item $player->ext_reply ($msgid, @msg)	1677	=item $player->ext_reply ($msgid, @msg)
1715		1678
1716	Sends an ext reply to the player.	1679	Sends an ext reply to the player.
1717		1680
…		…
1930		1893
1931	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;	1894	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1932	"$UNIQUEDIR/$path"	1895	"$UNIQUEDIR/$path"
1933	}	1896	}
1934		1897
1935	# and all this just because we cannot iterate over
1936	# all maps in C++...
1937	sub change_all_map_light {
1938	my ($change) = @_;
1939
1940	$_->change_map_light ($change)
1941	for grep $_->outdoor, values %cf::MAP;
1942	}
1943
1944	sub decay_objects {	1898	sub decay_objects {
1945	my ($self) = @_;	1899	my ($self) = @_;
1946		1900
1947	return if $self->{deny_reset};	1901	return if $self->{deny_reset};
1948		1902
…		…
2030	sub find {	1984	sub find {
2031	my ($path, $origin) = @_;	1985	my ($path, $origin) = @_;
2032		1986
2033	$path = normalise $path, $origin && $origin->path;	1987	$path = normalise $path, $origin && $origin->path;
2034		1988
2035	cf::lock_wait "map_data:$path";#d#remove	1989	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036	cf::lock_wait "map_find:$path";	1990	my $guard2 = cf::lock_acquire "map_find:$path";
2037		1991
2038	$cf::MAP{$path} \|\| do {	1992	$cf::MAP{$path} \|\| do {
2039	my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2040	my $guard2 = cf::lock_acquire "map_find:$path";
2041
2042	my $map = new_from_path cf::map $path	1993	my $map = new_from_path cf::map $path
2043	or return;	1994	or return;
2044		1995
2045	$map->{last_save} = $cf::RUNTIME;	1996	$map->{last_save} = $cf::RUNTIME;
2046		1997
…		…
2086	my $f = new_from_file cf::object::thawer $self->{load_path};	2037	my $f = new_from_file cf::object::thawer $self->{load_path};
2087	$f->skip_block;	2038	$f->skip_block;
2088	$self->_load_objects ($f)	2039	$self->_load_objects ($f)
2089	or return;	2040	or return;
2090		2041
2091	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2042	$self->post_load_original
2092	if delete $self->{load_original};	2043	if delete $self->{load_original};
2093		2044
2094	if (my $uniq = $self->uniq_path) {	2045	if (my $uniq = $self->uniq_path) {
2095	utf8::encode $uniq;	2046	utf8::encode $uniq;
2096	unless (aio_stat $uniq) {	2047	unless (aio_stat $uniq) {
…		…
2114	unless ($self->{deny_activate}) {	2065	unless ($self->{deny_activate}) {
2115	$self->decay_objects;	2066	$self->decay_objects;
2116	$self->fix_auto_apply;	2067	$self->fix_auto_apply;
2117	$self->update_buttons;	2068	$self->update_buttons;
2118	cf::cede_to_tick;	2069	cf::cede_to_tick;
2119	$self->set_darkness_map;
2120	cf::cede_to_tick;
2121	$self->activate;	2070	$self->activate;
2122	}	2071	}
2123		2072
2124	$self->{last_save} = $cf::RUNTIME;	2073	$self->{last_save} = $cf::RUNTIME;
2125	$self->last_access ($cf::RUNTIME);	2074	$self->last_access ($cf::RUNTIME);
…		…
2291		2240
2292	my $lock = cf::lock_acquire "map_data:$self->{path}";	2241	my $lock = cf::lock_acquire "map_data:$self->{path}";
2293		2242
2294	return if $self->players;	2243	return if $self->players;
2295		2244
2296	warn "resetting map ", $self->path;	2245	warn "resetting map ", $self->path, "\n";
2297		2246
2298	$self->in_memory (cf::MAP_SWAPPED);	2247	$self->in_memory (cf::MAP_SWAPPED);
2299		2248
2300	# need to save uniques path	2249	# need to save uniques path
2301	unless ($self->{deny_save}) {	2250	unless ($self->{deny_save}) {
…		…
2392	: normalise $_	2341	: normalise $_
2393	} @{ aio_readdir $UNIQUEDIR or [] }	2342	} @{ aio_readdir $UNIQUEDIR or [] }
2394	]	2343	]
2395	}	2344	}
2396		2345
		2346	=item cf::map::static_maps
		2347
		2348	Returns an arrayref if paths of all static maps (all preinstalled F<.map>
		2349	file in the shared directory excluding F</styles>). May block.
		2350
		2351	=cut
		2352
		2353	sub static_maps() {
		2354	my @dirs = "";
		2355	my @maps;
		2356
		2357	while (@dirs) {
		2358	my $dir = shift @dirs;
		2359
		2360	next if $dir eq "/styles";
		2361
		2362	my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
		2363	or return;
		2364
		2365	for (@$files) {
		2366	s/\.map$// or next;
		2367	utf8::decode $_;
		2368	push @maps, "$dir/$_";
		2369	}
		2370
		2371	push @dirs, map "$dir/$_", @$dirs;
		2372	}
		2373
		2374	\@maps
		2375	}
		2376
2397	=back	2377	=back
2398		2378
2399	=head3 cf::object	2379	=head3 cf::object
2400		2380
2401	=cut	2381	=cut
…		…
2466		2446
2467	our $SAY_CHANNEL = {	2447	our $SAY_CHANNEL = {
2468	id => "say",	2448	id => "say",
2469	title => "Map",	2449	title => "Map",
2470	reply => "say ",	2450	reply => "say ",
2471	tooltip => "Things said to and replied from npcs near you and other players on the same map only.",	2451	tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2472	};	2452	};
2473		2453
2474	our $CHAT_CHANNEL = {	2454	our $CHAT_CHANNEL = {
2475	id => "chat",	2455	id => "chat",
2476	title => "Chat",	2456	title => "Chat",
…		…
2531		2511
2532	=item $player_object->enter_link	2512	=item $player_object->enter_link
2533		2513
2534	Freezes the player and moves him/her to a special map (C<{link}>).	2514	Freezes the player and moves him/her to a special map (C<{link}>).
2535		2515
2536	The player should be reasonably safe there for short amounts of time. You	2516	The player should be reasonably safe there for short amounts of time (e.g.
2537	I<MUST> call C<leave_link> as soon as possible, though.	2517	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
		2518	though, as the palyer cannot control the character while it is on the link
		2519	map.
2538		2520
2539	Will never block.	2521	Will never block.
2540		2522
2541	=item $player_object->leave_link ($map, $x, $y)	2523	=item $player_object->leave_link ($map, $x, $y)
2542		2524
…		…
2600		2582
2601	$map->load;	2583	$map->load;
2602	$map->load_neighbours;	2584	$map->load_neighbours;
2603		2585
2604	return unless $self->contr->active;	2586	return unless $self->contr->active;
2605	$self->activate_recursive;
2606		2587
2607	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2588	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2608	$self->enter_map ($map, $x, $y);	2589	$self->enter_map ($map, $x, $y);
		2590
		2591	# only activate afterwards, to support waiting in hooks
		2592	$self->activate_recursive;
2609	}	2593	}
2610		2594
2611	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2595	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2612		2596
2613	Moves the player to the given map-path and coordinates by first freezing	2597	Moves the player to the given map-path and coordinates by first freezing
2614	her, loading and preparing them map, calling the provided $check callback	2598	her, loading and preparing them map, calling the provided $check callback
2615	that has to return the map if sucecssful, and then unfreezes the player on	2599	that has to return the map if sucecssful, and then unfreezes the player on
2616	the new (success) or old (failed) map position. In either case, $done will	2600	the new (success) or old (failed) map position. In either case, $done will
2617	be called at the end of this process.	2601	be called at the end of this process.
		2602
		2603	Note that $check will be called with a potentially non-loaded map, so if
		2604	it needs a loaded map it has to call C<< ->load >>.
2618		2605
2619	=cut	2606	=cut
2620		2607
2621	our $GOTOGEN;	2608	our $GOTOGEN;
2622		2609
…		…
2769	$self->contr->savebed ($map, $x, $y)	2756	$self->contr->savebed ($map, $x, $y)
2770	if $exit->flag (cf::FLAG_DAMNED);	2757	if $exit->flag (cf::FLAG_DAMNED);
2771		2758
2772	1	2759	1
2773	}) {	2760	}) {
2774	$self->message ("Something went wrong deep within the crossfire server. "	2761	$self->message ("Something went wrong deep within the deliantra server. "
2775	. "I'll try to bring you back to the map you were before. "	2762	. "I'll try to bring you back to the map you were before. "
2776	. "Please report this to the dungeon master!",	2763	. "Please report this to the dungeon master!",
2777	cf::NDI_UNIQUE \| cf::NDI_RED);	2764	cf::NDI_UNIQUE \| cf::NDI_RED);
2778		2765
2779	warn "ERROR in enter_exit: $@";	2766	warn "ERROR in enter_exit: $@";
…		…
2809		2796
2810	=cut	2797	=cut
2811		2798
2812	# non-persistent channels (usually the info channel)	2799	# non-persistent channels (usually the info channel)
2813	our %CHANNEL = (	2800	our %CHANNEL = (
		2801	"c/motd" => {
		2802	id => "infobox",
		2803	title => "MOTD",
		2804	reply => undef,
		2805	tooltip => "The message of the day",
		2806	},
2814	"c/identify" => {	2807	"c/identify" => {
2815	id => "infobox",	2808	id => "infobox",
2816	title => "Identify",	2809	title => "Identify",
2817	reply => undef,	2810	reply => undef,
2818	tooltip => "Items recently identified",	2811	tooltip => "Items recently identified",
…		…
2820	"c/examine" => {	2813	"c/examine" => {
2821	id => "infobox",	2814	id => "infobox",
2822	title => "Examine",	2815	title => "Examine",
2823	reply => undef,	2816	reply => undef,
2824	tooltip => "Signs and other items you examined",	2817	tooltip => "Signs and other items you examined",
		2818	},
		2819	"c/shopinfo" => {
		2820	id => "infobox",
		2821	title => "Shop Info",
		2822	reply => undef,
		2823	tooltip => "What your bargaining skill tells you about the shop",
2825	},	2824	},
2826	"c/book" => {	2825	"c/book" => {
2827	id => "infobox",	2826	id => "infobox",
2828	title => "Book",	2827	title => "Book",
2829	reply => undef,	2828	reply => undef,
…		…
2845	id => "infobox",	2844	id => "infobox",
2846	title => "Body Parts",	2845	title => "Body Parts",
2847	reply => undef,	2846	reply => undef,
2848	tooltip => "Shows which body parts you posess and are available",	2847	tooltip => "Shows which body parts you posess and are available",
2849	},	2848	},
		2849	"c/statistics" => {
		2850	id => "infobox",
		2851	title => "Statistics",
		2852	reply => undef,
		2853	tooltip => "Shows your primary statistics",
		2854	},
		2855	"c/skills" => {
		2856	id => "infobox",
		2857	title => "Skills",
		2858	reply => undef,
		2859	tooltip => "Shows your experience per skill and item power",
		2860	},
		2861	"c/shopitems" => {
		2862	id => "infobox",
		2863	title => "Shop Items",
		2864	reply => undef,
		2865	tooltip => "Shows the items currently for sale in this shop",
		2866	},
		2867	"c/resistances" => {
		2868	id => "infobox",
		2869	title => "Resistances",
		2870	reply => undef,
		2871	tooltip => "Shows your resistances",
		2872	},
		2873	"c/pets" => {
		2874	id => "infobox",
		2875	title => "Pets",
		2876	reply => undef,
		2877	tooltip => "Shows information abotu your pets/a specific pet",
		2878	},
		2879	"c/perceiveself" => {
		2880	id => "infobox",
		2881	title => "Perceive Self",
		2882	reply => undef,
		2883	tooltip => "You gained detailed knowledge about yourself",
		2884	},
2850	"c/uptime" => {	2885	"c/uptime" => {
2851	id => "infobox",	2886	id => "infobox",
2852	title => "Uptime",	2887	title => "Uptime",
2853	reply => undef,	2888	reply => undef,
2854	tooltip => "How long the server has been running since last restart",	2889	tooltip => "How long the server has been running since last restart",
…		…
2863	id => "party",	2898	id => "party",
2864	title => "Party",	2899	title => "Party",
2865	reply => "gsay ",	2900	reply => "gsay ",
2866	tooltip => "Messages and chat related to your party",	2901	tooltip => "Messages and chat related to your party",
2867	},	2902	},
		2903	"c/death" => {
		2904	id => "death",
		2905	title => "Death",
		2906	reply => undef,
		2907	tooltip => "Reason for and more info about your most recent death",
		2908	},
		2909	"c/say" => $SAY_CHANNEL,
		2910	"c/chat" => $CHAT_CHANNEL,
2868	);	2911	);
2869		2912
2870	sub cf::client::send_msg {	2913	sub cf::client::send_msg {
2871	my ($self, $channel, $msg, $color, @extra) = @_;	2914	my ($self, $channel, $msg, $color, @extra) = @_;
2872		2915
2873	$msg = $self->pl->expand_cfpod ($msg);	2916	$msg = $self->pl->expand_cfpod ($msg)
		2917	unless $color & cf::NDI_VERBATIM;
2874		2918
2875	$color &= cf::NDI_CLIENT_MASK; # just in case...	2919	$color &= cf::NDI_CLIENT_MASK; # just in case...
2876		2920
2877	# check predefined channels, for the benefit of C	2921	# check predefined channels, for the benefit of C
2878	if ($CHANNEL{$channel}) {	2922	if ($CHANNEL{$channel}) {
2879	$channel = $CHANNEL{$channel};	2923	$channel = $CHANNEL{$channel};
2880		2924
2881	$self->ext_msg (channel_info => $channel)	2925	$self->ext_msg (channel_info => $channel);
2882	if $self->can_msg;
2883
2884	$channel = $channel->{id};	2926	$channel = $channel->{id};
2885		2927
2886	} elsif (ref $channel) {	2928	} elsif (ref $channel) {
2887	# send meta info to client, if not yet sent	2929	# send meta info to client, if not yet sent
2888	unless (exists $self->{channel}{$channel->{id}}) {	2930	unless (exists $self->{channel}{$channel->{id}}) {
2889	$self->{channel}{$channel->{id}} = $channel;	2931	$self->{channel}{$channel->{id}} = $channel;
2890	$self->ext_msg (channel_info => $channel)	2932	$self->ext_msg (channel_info => $channel);
2891	if $self->can_msg;
2892	}	2933	}
2893		2934
2894	$channel = $channel->{id};	2935	$channel = $channel->{id};
2895	}	2936	}
2896		2937
2897	return unless @extra \|\| length $msg;	2938	return unless @extra \|\| length $msg;
2898		2939
2899	if ($self->can_msg) {
2900	# default colour, mask it out	2940	# default colour, mask it out
2901	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)	2941	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
2902	if $color & cf::NDI_DEF;	2942	if $color & cf::NDI_DEF;
2903		2943
2904	$self->send_packet ("msg " . $self->{json_coder}->encode (	2944	my $pkt = "msg "
		2945	. $self->{json_coder}->encode (
2905	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));	2946	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2906	} else {	2947	);
2907	if ($color >= 0) {
2908	# replace some tags by gcfclient-compatible ones
2909	for ($msg) {
2910	1 while
2911	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2912	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2913	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2914	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2915	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2916	}
2917		2948
2918	$color &= cf::NDI_COLOR_MASK;	2949	# try lzf for large packets
		2950	$pkt = "lzf " . Compress::LZF::compress $pkt
		2951	if 1024 <= length $pkt and $self->{can_lzf};
2919		2952
2920	utf8::encode $msg;	2953	# split very large packets
2921		2954	if (8192 < length $pkt and $self->{can_lzf}) {
2922	if (0 && $msg =~ /\[/) {	2955	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2923	# COMMAND/INFO	2956	$pkt = "frag";
2924	$self->send_packet ("drawextinfo $color 10 8 $msg")
2925	} else {
2926	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2927	$self->send_packet ("drawinfo $color $msg")
2928	}
2929	}
2930	}	2957	}
		2958
		2959	$self->send_packet ($pkt);
2931	}	2960	}
2932		2961
2933	=item $client->ext_msg ($type, @msg)	2962	=item $client->ext_msg ($type, @msg)
2934		2963
2935	Sends an ext event to the client.	2964	Sends an ext event to the client.
…		…
3110	The following functions and methods are available within a safe environment:	3139	The following functions and methods are available within a safe environment:
3111		3140
3112	cf::object	3141	cf::object
3113	contr pay_amount pay_player map x y force_find force_add destroy	3142	contr pay_amount pay_player map x y force_find force_add destroy
3114	insert remove name archname title slaying race decrease split	3143	insert remove name archname title slaying race decrease split
		3144	value
3115		3145
3116	cf::object::player	3146	cf::object::player
3117	player	3147	player
3118		3148
3119	cf::player	3149	cf::player
…		…
3125	=cut	3155	=cut
3126		3156
3127	for (	3157	for (
3128	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3158	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3129	insert remove inv nrof name archname title slaying race	3159	insert remove inv nrof name archname title slaying race
3130	decrease split destroy)],	3160	decrease split destroy change_exp value msg lore send_msg)],
3131	["cf::object::player" => qw(player)],	3161	["cf::object::player" => qw(player)],
3132	["cf::player" => qw(peaceful)],	3162	["cf::player" => qw(peaceful send_msg)],
3133	["cf::map" => qw(trigger)],	3163	["cf::map" => qw(trigger)],
3134	) {	3164	) {
3135	no strict 'refs';	3165	no strict 'refs';
3136	my ($pkg, @funs) = @$_;	3166	my ($pkg, @funs) = @$_;
3137	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3167	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
…		…
3154	my ($code, %vars) = @_;	3184	my ($code, %vars) = @_;
3155		3185
3156	my $qcode = $code;	3186	my $qcode = $code;
3157	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3187	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3158	$qcode =~ s/\n/\\n/g;	3188	$qcode =~ s/\n/\\n/g;
		3189
		3190	%vars = (_dummy => 0) unless %vars;
3159		3191
3160	local $_;	3192	local $_;
3161	local @safe::cf::_safe_eval_args = values %vars;	3193	local @safe::cf::_safe_eval_args = values %vars;
3162		3194
3163	my $eval =	3195	my $eval =
…		…
3393	reload_treasures;	3425	reload_treasures;
3394		3426
3395	warn "finished reloading resource files\n";	3427	warn "finished reloading resource files\n";
3396	}	3428	}
3397		3429
3398	sub init {
3399	my $guard = freeze_mainloop;
3400
3401	evthread_start IO::AIO::poll_fileno;
3402
3403	reload_resources;
3404	}
3405
3406	sub reload_config {	3430	sub reload_config {
		3431	warn "reloading config file...\n";
		3432
3407	open my $fh, "<:utf8", "$CONFDIR/config"	3433	open my $fh, "<:utf8", "$CONFDIR/config"
3408	or return;	3434	or return;
3409		3435
3410	local $/;	3436	local $/;
3411	*CFG = YAML::Load <$fh>;	3437	*CFG = YAML::XS::Load scalar <$fh>;
3412		3438
3413	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];	3439	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];
3414		3440
3415	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3441	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3416	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3442	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3420	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3446	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3421	and die "WARNING: m(un)lockall failed: $!\n";	3447	and die "WARNING: m(un)lockall failed: $!\n";
3422	};	3448	};
3423	warn $@ if $@;	3449	warn $@ if $@;
3424	}	3450	}
		3451
		3452	warn "finished reloading resource files\n";
		3453	}
		3454
		3455	sub pidfile() {
		3456	sysopen my $fh, $PIDFILE, O_RDWR \| O_CREAT
		3457	or die "$PIDFILE: $!";
		3458	flock $fh, &Fcntl::LOCK_EX
		3459	or die "$PIDFILE: flock: $!";
		3460	$fh
		3461	}
		3462
		3463	# make sure only one server instance is running at any one time
		3464	sub atomic {
		3465	my $fh = pidfile;
		3466
		3467	my $pid = <$fh>;
		3468	kill 9, $pid if $pid > 0;
		3469
		3470	seek $fh, 0, 0;
		3471	print $fh $$;
		3472	}
		3473
		3474	sub main_loop {
		3475	warn "EV::loop starting\n";
		3476	if (1) {
		3477	EV::loop;
		3478	}
		3479	warn "EV::loop returned\n";
		3480	goto &main_loop unless $REALLY_UNLOOP;
3425	}	3481	}
3426		3482
3427	sub main {	3483	sub main {
		3484	cf::init_globals; # initialise logging
		3485
		3486	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3487	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
		3488	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
		3489	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
		3490
		3491	cf::init_experience;
		3492	cf::init_anim;
		3493	cf::init_attackmess;
		3494	cf::init_dynamic;
		3495
		3496	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
		3497
3428	# we must not ever block the main coroutine	3498	# we must not ever block the main coroutine
3429	local $Coro::idle = sub {	3499	local $Coro::idle = sub {
3430	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3500	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3431	(async {	3501	(async {
3432	$Coro::current->{desc} = "IDLE BUG HANDLER";	3502	$Coro::current->{desc} = "IDLE BUG HANDLER";
3433	EV::loop EV::LOOP_ONESHOT;	3503	EV::loop EV::LOOP_ONESHOT;
3434	})->prio (Coro::PRIO_MAX);	3504	})->prio (Coro::PRIO_MAX);
3435	};	3505	};
3436		3506
3437	{	3507	evthread_start IO::AIO::poll_fileno;
3438	my $guard = freeze_mainloop;	3508
		3509	cf::sync_job {
		3510	reload_resources;
3439	reload_config;	3511	reload_config;
3440	db_init;	3512	db_init;
		3513
		3514	cf::load_settings;
		3515	cf::load_materials;
		3516	cf::init_uuid;
		3517	cf::init_signals;
		3518	cf::init_commands;
		3519	cf::init_skills;
		3520
		3521	cf::init_beforeplay;
		3522
		3523	atomic;
		3524
3441	load_extensions;	3525	load_extensions;
3442		3526
3443	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3527	utime time, time, $RUNTIMEFILE;
		3528
		3529	# no (long-running) fork's whatsoever before this point(!)
		3530	use POSIX ();
		3531	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
		3532
		3533	(pop @POST_INIT)->(0) while @POST_INIT;
3444	}	3534	};
3445		3535
3446	EV::loop;	3536	main_loop;
3447	}	3537	}
3448		3538
3449	#############################################################################	3539	#############################################################################
3450	# initialisation and cleanup	3540	# initialisation and cleanup
3451		3541
…		…
3458	};	3548	};
3459	}	3549	}
3460	}	3550	}
3461		3551
3462	sub write_runtime_sync {	3552	sub write_runtime_sync {
3463	my $runtime = "$LOCALDIR/runtime";
3464
3465	# first touch the runtime file to show we are still running:	3553	# first touch the runtime file to show we are still running:
3466	# the fsync below can take a very very long time.	3554	# the fsync below can take a very very long time.
3467		3555
3468	IO::AIO::aio_utime $runtime, undef, undef;	3556	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3469		3557
3470	my $guard = cf::lock_acquire "write_runtime";	3558	my $guard = cf::lock_acquire "write_runtime";
3471		3559
3472	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644	3560	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY \| O_CREAT, 0644
3473	or return;	3561	or return;
3474		3562
3475	my $value = $cf::RUNTIME + 90 + 10;	3563	my $value = $cf::RUNTIME + 90 + 10;
3476	# 10 is the runtime save interval, for a monotonic clock	3564	# 10 is the runtime save interval, for a monotonic clock
3477	# 60 allows for the watchdog to kill the server.	3565	# 60 allows for the watchdog to kill the server.
…		…
3487	aio_utime $fh, undef, undef;	3575	aio_utime $fh, undef, undef;
3488		3576
3489	close $fh	3577	close $fh
3490	or return;	3578	or return;
3491		3579
3492	aio_rename "$runtime~", $runtime	3580	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3493	and return;	3581	and return;
3494		3582
3495	warn "runtime file written.\n";	3583	warn "runtime file written.\n";
3496		3584
3497	1	3585	1
…		…
3509	my $uuid = "$LOCALDIR/uuid";	3597	my $uuid = "$LOCALDIR/uuid";
3510		3598
3511	my $fh = aio_open "$uuid~", O_WRONLY \| O_CREAT, 0644	3599	my $fh = aio_open "$uuid~", O_WRONLY \| O_CREAT, 0644
3512	or return;	3600	or return;
3513		3601
3514	my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;	3602	my $value = uuid_seq uuid_cur;
		3603
		3604	unless ($value) {
		3605	warn "cowardly refusing to write zero uuid value!\n";
		3606	return;
		3607	}
		3608
		3609	my $value = uuid_str $value + $uuid_skip;
3515	$uuid_skip = 0;	3610	$uuid_skip = 0;
3516		3611
3517	(aio_write $fh, 0, (length $value), $value, 0) <= 0	3612	(aio_write $fh, 0, (length $value), $value, 0) <= 0
3518	and return;	3613	and return;
3519		3614
…		…
3541	}	3636	}
3542		3637
3543	sub emergency_save() {	3638	sub emergency_save() {
3544	my $freeze_guard = cf::freeze_mainloop;	3639	my $freeze_guard = cf::freeze_mainloop;
3545		3640
3546	warn "enter emergency perl save\n";	3641	warn "emergency_perl_save: enter\n";
3547		3642
3548	cf::sync_job {	3643	cf::sync_job {
		3644	# this is a trade-off: we want to be very quick here, so
		3645	# save all maps without fsync, and later call a global sync
		3646	# (which in turn might be very very slow)
		3647	local $USE_FSYNC = 0;
		3648
3549	# use a peculiar iteration method to avoid tripping on perl	3649	# use a peculiar iteration method to avoid tripping on perl
3550	# refcount bugs in for. also avoids problems with players	3650	# refcount bugs in for. also avoids problems with players
3551	# and maps saved/destroyed asynchronously.	3651	# and maps saved/destroyed asynchronously.
3552	warn "begin emergency player save\n";	3652	warn "emergency_perl_save: begin player save\n";
3553	for my $login (keys %cf::PLAYER) {	3653	for my $login (keys %cf::PLAYER) {
3554	my $pl = $cf::PLAYER{$login} or next;	3654	my $pl = $cf::PLAYER{$login} or next;
3555	$pl->valid or next;	3655	$pl->valid or next;
3556	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3656	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3557	$pl->save;	3657	$pl->save;
3558	}	3658	}
3559	warn "end emergency player save\n";	3659	warn "emergency_perl_save: end player save\n";
3560		3660
3561	warn "begin emergency map save\n";	3661	warn "emergency_perl_save: begin map save\n";
3562	for my $path (keys %cf::MAP) {	3662	for my $path (keys %cf::MAP) {
3563	my $map = $cf::MAP{$path} or next;	3663	my $map = $cf::MAP{$path} or next;
3564	$map->valid or next;	3664	$map->valid or next;
3565	$map->save;	3665	$map->save;
3566	}	3666	}
3567	warn "end emergency map save\n";	3667	warn "emergency_perl_save: end map save\n";
3568		3668
3569	warn "begin emergency database checkpoint\n";	3669	warn "emergency_perl_save: begin database checkpoint\n";
3570	BDB::db_env_txn_checkpoint $DB_ENV;	3670	BDB::db_env_txn_checkpoint $DB_ENV;
3571	warn "end emergency database checkpoint\n";	3671	warn "emergency_perl_save: end database checkpoint\n";
3572		3672
3573	warn "begin write uuid\n";	3673	warn "emergency_perl_save: begin write uuid\n";
3574	write_uuid_sync 1;	3674	write_uuid_sync 1;
3575	warn "end write uuid\n";	3675	warn "emergency_perl_save: end write uuid\n";
3576	};	3676	};
3577		3677
		3678	warn "emergency_perl_save: starting sync()\n";
		3679	IO::AIO::aio_sync sub {
		3680	warn "emergency_perl_save: finished sync()\n";
		3681	};
		3682
3578	warn "leave emergency perl save\n";	3683	warn "emergency_perl_save: leave\n";
3579	}	3684	}
3580		3685
3581	sub post_cleanup {	3686	sub post_cleanup {
3582	my ($make_core) = @_;	3687	my ($make_core) = @_;
3583		3688
3584	warn Carp::longmess "post_cleanup backtrace"	3689	warn Carp::longmess "post_cleanup backtrace"
3585	if $make_core;	3690	if $make_core;
		3691
		3692	my $fh = pidfile;
		3693	unlink $PIDFILE if <$fh> == $$;
		3694	}
		3695
		3696	# a safer delete_package, copied from Symbol
		3697	sub clear_package($) {
		3698	my $pkg = shift;
		3699
		3700	# expand to full symbol table name if needed
		3701	unless ($pkg =~ /^main::.*::$/) {
		3702	$pkg = "main$pkg" if $pkg =~ /^::/;
		3703	$pkg = "main::$pkg" unless $pkg =~ /^main::/;
		3704	$pkg .= '::' unless $pkg =~ /::$/;
		3705	}
		3706
		3707	my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
		3708	my $stem_symtab = *{$stem}{HASH};
		3709
		3710	defined $stem_symtab and exists $stem_symtab->{$leaf}
		3711	or return;
		3712
		3713	# clear all symbols
		3714	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
		3715	for my $name (keys %$leaf_symtab) {
		3716	_gv_clear *{"$pkg$name"};
		3717	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
		3718	}
		3719	warn "cleared package $pkg\n";#d#
3586	}	3720	}
3587		3721
3588	sub do_reload_perl() {	3722	sub do_reload_perl() {
3589	# can/must only be called in main	3723	# can/must only be called in main
3590	if ($Coro::current != $Coro::main) {	3724	if ($Coro::current != $Coro::main) {
3591	warn "can only reload from main coroutine";	3725	warn "can only reload from main coroutine";
3592	return;	3726	return;
3593	}	3727	}
3594		3728
		3729	return if $RELOAD++;
		3730
		3731	my $t1 = EV::time;
		3732
		3733	while ($RELOAD) {
3595	warn "reloading...";	3734	warn "reloading...";
3596		3735
3597	warn "entering sync_job";	3736	warn "entering sync_job";
3598		3737
3599	cf::sync_job {	3738	cf::sync_job {
3600	cf::write_runtime_sync; # external watchdog should not bark	3739	cf::write_runtime_sync; # external watchdog should not bark
3601	cf::emergency_save;	3740	cf::emergency_save;
3602	cf::write_runtime_sync; # external watchdog should not bark	3741	cf::write_runtime_sync; # external watchdog should not bark
3603		3742
3604	warn "syncing database to disk";	3743	warn "syncing database to disk";
3605	BDB::db_env_txn_checkpoint $DB_ENV;	3744	BDB::db_env_txn_checkpoint $DB_ENV;
3606		3745
3607	# if anything goes wrong in here, we should simply crash as we already saved	3746	# if anything goes wrong in here, we should simply crash as we already saved
3608		3747
3609	warn "flushing outstanding aio requests";	3748	warn "flushing outstanding aio requests";
3610	for (;;) {
3611	BDB::flush;
3612	IO::AIO::flush;
3613	Coro::cede_notself;
3614	last unless IO::AIO::nreqs \|\| BDB::nreqs;	3749	while (IO::AIO::nreqs \|\| BDB::nreqs) {
3615	warn "iterate...";	3750	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3616	}
3617
3618	++$RELOAD;
3619
3620	warn "cancelling all extension coros";
3621	$_->cancel for values %EXT_CORO;
3622	%EXT_CORO = ();
3623
3624	warn "removing commands";
3625	%COMMAND = ();
3626
3627	warn "removing ext/exti commands";
3628	%EXTCMD = ();
3629	%EXTICMD = ();
3630
3631	warn "unloading/nuking all extensions";
3632	for my $pkg (@EXTS) {
3633	warn "... unloading $pkg";
3634
3635	if (my $cb = $pkg->can ("unload")) {
3636	eval {
3637	$cb->($pkg);
3638	1
3639	} or warn "$pkg unloaded, but with errors: $@";
3640	}	3751	}
3641		3752
3642	warn "... nuking $pkg";	3753	warn "cancelling all extension coros";
3643	Symbol::delete_package $pkg;	3754	$_->cancel for values %EXT_CORO;
3644	}	3755	%EXT_CORO = ();
3645		3756
3646	warn "unloading all perl modules loaded from $LIBDIR";	3757	warn "removing commands";
3647	while (my ($k, $v) = each %INC) {	3758	%COMMAND = ();
3648	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3649		3759
		3760	warn "removing ext/exti commands";
		3761	%EXTCMD = ();
		3762	%EXTICMD = ();
		3763
		3764	warn "unloading/nuking all extensions";
		3765	for my $pkg (@EXTS) {
3650	warn "... unloading $k";	3766	warn "... unloading $pkg";
3651	delete $INC{$k};
3652		3767
3653	$k =~ s/\.pm$//;
3654	$k =~ s/\//::/g;
3655
3656	if (my $cb = $k->can ("unload_module")) {	3768	if (my $cb = $pkg->can ("unload")) {
		3769	eval {
3657	$cb->();	3770	$cb->($pkg);
		3771	1
		3772	} or warn "$pkg unloaded, but with errors: $@";
		3773	}
		3774
		3775	warn "... clearing $pkg";
		3776	clear_package $pkg;
3658	}	3777	}
3659		3778
3660	Symbol::delete_package $k;	3779	warn "unloading all perl modules loaded from $LIBDIR";
		3780	while (my ($k, $v) = each %INC) {
		3781	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
		3782
		3783	warn "... unloading $k";
		3784	delete $INC{$k};
		3785
		3786	$k =~ s/\.pm$//;
		3787	$k =~ s/\//::/g;
		3788
		3789	if (my $cb = $k->can ("unload_module")) {
		3790	$cb->();
		3791	}
		3792
		3793	clear_package $k;
3661	}	3794	}
3662		3795
3663	warn "getting rid of safe::, as good as possible";	3796	warn "getting rid of safe::, as good as possible";
3664	Symbol::delete_package "safe::$_"	3797	clear_package "safe::$_"
3665	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3798	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3666		3799
3667	warn "unloading cf.pm \"a bit\"";	3800	warn "unloading cf.pm \"a bit\"";
3668	delete $INC{"cf.pm"};	3801	delete $INC{"cf.pm"};
3669	delete $INC{"cf/pod.pm"};	3802	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3670		3803
3671	# don't, removes xs symbols, too,	3804	# don't, removes xs symbols, too,
3672	# and global variables created in xs	3805	# and global variables created in xs
3673	#Symbol::delete_package __PACKAGE__;	3806	#clear_package __PACKAGE__;
3674		3807
3675	warn "unload completed, starting to reload now";	3808	warn "unload completed, starting to reload now";
3676		3809
3677	warn "reloading cf.pm";	3810	warn "reloading cf.pm";
3678	require cf;	3811	require cf;
3679	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3812	cf::_connect_to_perl_1;
3680		3813
3681	warn "loading config and database again";	3814	warn "loading config and database again";
3682	cf::reload_config;	3815	cf::reload_config;
3683		3816
3684	warn "loading extensions";	3817	warn "loading extensions";
3685	cf::load_extensions;	3818	cf::load_extensions;
3686		3819
		3820	if ($REATTACH_ON_RELOAD) {
3687	warn "reattaching attachments to objects/players";	3821	warn "reattaching attachments to objects/players";
3688	_global_reattach; # objects, sockets	3822	_global_reattach; # objects, sockets
3689	warn "reattaching attachments to maps";	3823	warn "reattaching attachments to maps";
3690	reattach $_ for values %MAP;	3824	reattach $_ for values %MAP;
3691	warn "reattaching attachments to players";	3825	warn "reattaching attachments to players";
3692	reattach $_ for values %PLAYER;	3826	reattach $_ for values %PLAYER;
		3827	}
3693		3828
		3829	warn "running post_init jobs";
		3830	(pop @POST_INIT)->(1) while @POST_INIT;
		3831
3694	warn "leaving sync_job";	3832	warn "leaving sync_job";
3695		3833
3696	1	3834	1
3697	} or do {	3835	} or do {
3698	warn $@;	3836	warn $@;
3699	cf::cleanup "error while reloading, exiting.";	3837	cf::cleanup "error while reloading, exiting.";
3700	};	3838	};
3701		3839
3702	warn "reloaded";	3840	warn "reloaded";
		3841	--$RELOAD;
		3842	}
		3843
		3844	$t1 = EV::time - $t1;
		3845	warn "reload completed in ${t1}s\n";
3703	};	3846	};
3704		3847
3705	our $RELOAD_WATCHER; # used only during reload	3848	our $RELOAD_WATCHER; # used only during reload
3706		3849
3707	sub reload_perl() {	3850	sub reload_perl() {
3708	# doing reload synchronously and two reloads happen back-to-back,	3851	# doing reload synchronously and two reloads happen back-to-back,
3709	# coro crashes during coro_state_free->destroy here.	3852	# coro crashes during coro_state_free->destroy here.
3710		3853
		3854	$RELOAD_WATCHER \|\|= cf::async {
		3855	Coro::AIO::aio_wait cache_extensions;
		3856
3711	$RELOAD_WATCHER \|\|= EV::timer 0, 0, sub {	3857	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3712	do_reload_perl;	3858	do_reload_perl;
3713	undef $RELOAD_WATCHER;	3859	undef $RELOAD_WATCHER;
		3860	};
3714	};	3861	};
3715	}	3862	}
3716		3863
3717	register_command "reload" => sub {	3864	register_command "reload" => sub {
3718	my ($who, $arg) = @_;	3865	my ($who, $arg) = @_;
…		…
3793	BDB::max_poll_reqs $TICK * 0.1;	3940	BDB::max_poll_reqs $TICK * 0.1;
3794	$AnyEvent::BDB::WATCHER->priority (1);	3941	$AnyEvent::BDB::WATCHER->priority (1);
3795		3942
3796	unless ($DB_ENV) {	3943	unless ($DB_ENV) {
3797	$DB_ENV = BDB::db_env_create;	3944	$DB_ENV = BDB::db_env_create;
3798	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC	3945	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);
3799	\| BDB::LOG_AUTOREMOVE, 1);	3946	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
		3947	$DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3800	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);	3948	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3801	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);	3949	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3802		3950
3803	cf::sync_job {	3951	cf::sync_job {
3804	eval {	3952	eval {
…		…
3843	$msg =~ s/\n//;	3991	$msg =~ s/\n//;
3844		3992
3845	# limit the # of concurrent backtraces	3993	# limit the # of concurrent backtraces
3846	if ($_log_backtrace < 2) {	3994	if ($_log_backtrace < 2) {
3847	++$_log_backtrace;	3995	++$_log_backtrace;
		3996	my $perl_bt = Carp::longmess $msg;
3848	async {	3997	async {
3849	$Coro::current->{desc} = "abt $msg";	3998	$Coro::current->{desc} = "abt $msg";
3850		3999
3851	my @bt = fork_call {	4000	my @bt = fork_call {
3852	@addr = map { sprintf "%x", $_ } @addr;	4001	@addr = map { sprintf "%x", $_ } @addr;
…		…
3863	}	4012	}
3864		4013
3865	@funcs	4014	@funcs
3866	};	4015	};
3867		4016
3868	LOG llevInfo, "[ABT] $msg\n";	4017	LOG llevInfo, "[ABT] $perl_bt\n";
		4018	LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3869	LOG llevInfo, "[ABT] $_\n" for @bt;	4019	LOG llevInfo, "[ABT] $_\n" for @bt;
3870	--$_log_backtrace;	4020	--$_log_backtrace;
3871	};	4021	};
3872	} else {	4022	} else {
3873	LOG llevInfo, "[ABT] $msg\n";	4023	LOG llevInfo, "[ABT] $msg\n";
3874	LOG llevInfo, "[ABT] [suppressed]\n";	4024	LOG llevInfo, "[ABT] [suppressed]\n";
3875	}	4025	}
3876	}	4026	}
3877		4027
3878	# load additional modules	4028	# load additional modules
3879	use cf::pod;	4029	require "cf/$_.pm" for @EXTRA_MODULES;
		4030	cf::_connect_to_perl_2;
3880		4031
3881	END { cf::emergency_save }	4032	END { cf::emergency_save }
3882		4033
3883	1	4034	1
3884		4035

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.435 by root, Thu May 29 03:33:20 2008 UTC vs. Revision 1.490 by root, Sat Oct 24 06:16:40 2009 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.435 by root, Thu May 29 03:33:20 2008 UTC vs.
Revision 1.490 by root, Sat Oct 24 06:16:40 2009 UTC