ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/lib/cf.pm

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

Diff Legend

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