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.426 by root, Thu Apr 24 04:40:31 2008 UTC vs.
Revision 1.507 by root, Sat Mar 20 02:24:38 2010 UTC

1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# it under the terms of the GNU General Public License as published by	7	# the terms of the Affero GNU General Public License as published by the
8	# the Free Software Foundation, either version 3 of the License, or	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# (at your option) any later version.	9	# option) any later version.
10	#	10	#
11	# This program is distributed in the hope that it will be useful,	11	# This program is distributed in the hope that it will be useful,
12	# but WITHOUT ANY WARRANTY; without even the implied warranty of	12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	# GNU General Public License for more details.	14	# GNU General Public License for more details.
15	#	15	#
16	# You should have received a copy of the GNU General Public License	16	# You should have received a copy of the Affero GNU General Public License
17	# along with this program. If not, see <http://www.gnu.org/licenses/>.	17	# and the GNU General Public License along with this program. If not, see
		18	# <http://www.gnu.org/licenses/>.
18	#	19	#
19	# The authors can be reached via e-mail to <support@deliantra.net>	20	# The authors can be reached via e-mail to <support@deliantra.net>
20	#	21	#
21		22
22	package cf;	23	package cf;
23		24
		25	use 5.10.0;
24	use utf8;	26	use utf8;
25	use strict;	27	use strict qw(vars subs);
26		28
27	use Symbol;	29	use Symbol;
28	use List::Util;	30	use List::Util;
29	use Socket;	31	use Socket;
30	use EV 3.2;	32	use EV;
31	use Opcode;	33	use Opcode;
32	use Safe;	34	use Safe;
33	use Safe::Hole;	35	use Safe::Hole;
34	use Storable ();	36	use Storable ();
		37	use Carp ();
35		38
		39	use Guard ();
36	use Coro 4.50 ();	40	use Coro ();
37	use Coro::State;	41	use Coro::State;
38	use Coro::Handle;	42	use Coro::Handle;
39	use Coro::EV;	43	use Coro::EV;
		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;
		49	use Coro::AnyEvent;
43	use Coro::AIO;	50	use Coro::AIO;
44	use Coro::BDB;	51	use Coro::BDB 1.6;
45	use Coro::Storable;	52	use Coro::Storable;
46	use Coro::Util ();	53	use Coro::Util ();
47		54
48	use JSON::XS 2.01 ();	55	use JSON::XS 2.01 ();
49	use BDB ();	56	use BDB ();
50	use Data::Dumper;	57	use Data::Dumper;
51	use Digest::MD5;
52	use Fcntl;	58	use Fcntl;
53	use YAML ();	59	use YAML::XS ();
54	use IO::AIO 2.51 ();	60	use IO::AIO ();
55	use Time::HiRes;	61	use Time::HiRes;
56	use Compress::LZF;	62	use Compress::LZF;
57	use Digest::MD5 ();	63	use Digest::MD5 ();
		64
		65	AnyEvent::detect;
58		66
59	# configure various modules to our taste	67	# configure various modules to our taste
60	#	68	#
61	$Storable::canonical = 1; # reduce rsync transfers	69	$Storable::canonical = 1; # reduce rsync transfers
62	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	70	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
		71
		72	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
		73
		74	# make sure c-lzf reinitialises itself
		75	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	76	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
64		77
65	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	78	# strictly for debugging
		79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
66		80
67	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68		82
69	our %COMMAND = ();	83	our %COMMAND = ();
70	our %COMMAND_TIME = ();	84	our %COMMAND_TIME = ();
…		…
73	our %EXTCMD = ();	87	our %EXTCMD = ();
74	our %EXTICMD = ();	88	our %EXTICMD = ();
75	our %EXT_CORO = (); # coroutines bound to extensions	89	our %EXT_CORO = (); # coroutines bound to extensions
76	our %EXT_MAP = (); # pluggable maps	90	our %EXT_MAP = (); # pluggable maps
77		91
78	our $RELOAD; # number of reloads so far	92	our $RELOAD; # number of reloads so far, non-zero while in reload
79	our @EVENT;	93	our @EVENT;
		94	our @REFLECT; # set by XS
		95	our %REFLECT; # set by us
80		96
81	our $CONFDIR = confdir;	97	our $CONFDIR = confdir;
82	our $DATADIR = datadir;	98	our $DATADIR = datadir;
83	our $LIBDIR = "$DATADIR/ext";	99	our $LIBDIR = "$DATADIR/ext";
84	our $PODDIR = "$DATADIR/pod";	100	our $PODDIR = "$DATADIR/pod";
85	our $MAPDIR = "$DATADIR/" . mapdir;	101	our $MAPDIR = "$DATADIR/" . mapdir;
86	our $LOCALDIR = localdir;	102	our $LOCALDIR = localdir;
87	our $TMPDIR = "$LOCALDIR/" . tmpdir;	103	our $TMPDIR = "$LOCALDIR/" . tmpdir;
88	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90	our $RANDOMDIR = "$LOCALDIR/random";	106	our $RANDOMDIR = "$LOCALDIR/random";
91	our $BDBDIR = "$LOCALDIR/db";	107	our $BDBDIR = "$LOCALDIR/db";
		108	our $PIDFILE = "$LOCALDIR/pid";
		109	our $RUNTIMEFILE = "$LOCALDIR/runtime";
		110
92	our %RESOURCE;	111	our %RESOURCE;
93		112
94	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	113	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95	our $AIO_POLL_WATCHER;
96	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	114	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97	our $NEXT_TICK;	115	our $NEXT_TICK;
98	our $USE_FSYNC = 1; # use fsync to write maps - default off	116	our $USE_FSYNC = 1; # use fsync to write maps - default on
99		117
100	our $BDB_POLL_WATCHER;
101	our $BDB_DEADLOCK_WATCHER;	118	our $BDB_DEADLOCK_WATCHER;
102	our $BDB_CHECKPOINT_WATCHER;	119	our $BDB_CHECKPOINT_WATCHER;
103	our $BDB_TRICKLE_WATCHER;	120	our $BDB_TRICKLE_WATCHER;
104	our $DB_ENV;	121	our $DB_ENV;
105		122
		123	our @EXTRA_MODULES = qw(pod match mapscript);
		124
106	our %CFG;	125	our %CFG;
107		126
108	our $UPTIME; $UPTIME ||= time;	127	our $UPTIME; $UPTIME ||= time;
109	our $RUNTIME;	128	our $RUNTIME;
110	our $NOW;	129	our $NOW;
…		…
119	our $LOAD; # a number between 0 (idle) and 1 (too many objects)	138	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120	our $LOADAVG; # same thing, but with alpha-smoothing	139	our $LOADAVG; # same thing, but with alpha-smoothing
121	our $JITTER; # average jitter	140	our $JITTER; # average jitter
122	our $TICK_START; # for load detecting purposes	141	our $TICK_START; # for load detecting purposes
123		142
		143	our @POST_INIT;
		144
		145	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
		146	our $REALLY_UNLOOP; # never set to true, please :)
		147
124	binmode STDOUT;	148	binmode STDOUT;
125	binmode STDERR;	149	binmode STDERR;
126		150
127	# read virtual server time, if available	151	# read virtual server time, if available
128	unless ($RUNTIME || !-e "$LOCALDIR/runtime") {	152	unless ($RUNTIME || !-e $RUNTIMEFILE) {
129	open my $fh, "<", "$LOCALDIR/runtime"	153	open my $fh, "<", $RUNTIMEFILE
130	or die "unable to read runtime file: $!";	154	or die "unable to read $RUNTIMEFILE file: $!";
131	$RUNTIME = <$fh> + 0.;	155	$RUNTIME = <$fh> + 0.;
132	}	156	}
		157
		158	eval "sub TICK() { $TICK } 1" or die;
133		159
134	mkdir $_	160	mkdir $_
135	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	161	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136		162
137	our $EMERGENCY_POSITION;	163	our $EMERGENCY_POSITION;
138		164
139	sub cf::map::normalise;	165	sub cf::map::normalise;
		166
		167	#############################################################################
		168
		169	%REFLECT = ();
		170	for (@REFLECT) {
		171	my $reflect = JSON::XS::decode_json $_;
		172	$REFLECT{$reflect->{class}} = $reflect;
		173	}
		174
		175	# this is decidedly evil
		176	$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
140		177
141	#############################################################################	178	#############################################################################
142		179
143	=head2 GLOBAL VARIABLES	180	=head2 GLOBAL VARIABLES
144		181
…		…
191	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
192	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.
193		230
194	=item @cf::INVOKE_RESULTS	231	=item @cf::INVOKE_RESULTS
195		232
196	This array contains the results of the last C<invoke ()> call. When	233	This array contains the results of the last C<invoke ()> call. When
197	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	234	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198	that call.	235	that call.
199		236
		237	=item %cf::REFLECT
		238
		239	Contains, for each (C++) class name, a hash reference with information
		240	about object members (methods, scalars, arrays and flags) and other
		241	metadata, which is useful for introspection.
		242
200	=back	243	=back
201		244
202	=cut	245	=cut
203		246
204	BEGIN {	247	$Coro::State::WARNHOOK = sub {
205	*CORE::GLOBAL::warn = sub {
206	my $msg = join "", @_;	248	my $msg = join "", @_;
207		249
208	$msg .= "\n"	250	$msg .= "\n"
209	unless $msg =~ /\n$/;	251	unless $msg =~ /\n$/;
210		252
211	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	253	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
212		254
213	LOG llevError, $msg;	255	LOG llevError, $msg;
214	};	256	};
215	}
216		257
217	$Coro::State::DIEHOOK = sub {	258	$Coro::State::DIEHOOK = sub {
218	return unless $^S eq 0; # "eq", not "=="	259	return unless $^S eq 0; # "eq", not "=="
		260
		261	warn Carp::longmess $_[0];
219		262
220	if ($Coro::current == $Coro::main) {#d#	263	if ($Coro::current == $Coro::main) {#d#
221	warn "DIEHOOK called in main context, Coro bug?\n";#d#	264	warn "DIEHOOK called in main context, Coro bug?\n";#d#
222	return;#d#	265	return;#d#
223	}#d#	266	}#d#
224		267
225	# kill coroutine otherwise	268	# kill coroutine otherwise
226	warn Carp::longmess $_[0];
227	Coro::terminate	269	Coro::terminate
228	};	270	};
229
230	$SIG{__DIE__} = sub { }; #d#?
231		271
232	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	272	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	273	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	274	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	275	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
242	for my $pkg (qw(	282	for my $pkg (qw(
243	cf::global cf::attachable	283	cf::global cf::attachable
244	cf::object cf::object::player	284	cf::object cf::object::player
245	cf::client cf::player	285	cf::client cf::player
246	cf::arch cf::living	286	cf::arch cf::living
		287	cf::map cf::mapspace
247	cf::map cf::party cf::region	288	cf::party cf::region
248	)) {	289	)) {
249	no strict 'refs';
250	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	290	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251	}	291	}
252		292
253	$EV::DIED = sub {	293	$EV::DIED = sub {
254	warn "error in event callback: @_";	294	Carp::cluck "error in event callback: @_";
255	};	295	};
256		296
257	#############################################################################	297	#############################################################################
258		298
259	=head2 UTILITY FUNCTIONS	299	=head2 UTILITY FUNCTIONS
…		…
296	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	336	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297		337
298	sub encode_json($) { $json_coder->encode ($_[0]) }	338	sub encode_json($) { $json_coder->encode ($_[0]) }
299	sub decode_json($) { $json_coder->decode ($_[0]) }	339	sub decode_json($) { $json_coder->decode ($_[0]) }
300		340
		341	=item cf::post_init { BLOCK }
		342
		343	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
		344	but I<before> the server starts ticking again.
		345
		346	The cdoeblock will have a single boolean argument to indicate whether this
		347	is a reload or not.
		348
		349	=cut
		350
		351	sub post_init(&) {
		352	push @POST_INIT, shift;
		353	}
		354
301	=item cf::lock_wait $string	355	=item cf::lock_wait $string
302		356
303	Wait until the given lock is available. See cf::lock_acquire.	357	Wait until the given lock is available. See cf::lock_acquire.
304		358
305	=item my $lock = cf::lock_acquire $string	359	=item my $lock = cf::lock_acquire $string
306		360
307	Wait until the given lock is available and then acquires it and returns	361	Wait until the given lock is available and then acquires it and returns
308	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	362	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309	for example when the coroutine gets canceled), the lock is automatically	363	for example when the coroutine gets canceled), the lock is automatically
310	returned.	364	returned.
311		365
312	Locks are *not* recursive, locking from the same coro twice results in a	366	Locks are *not* recursive, locking from the same coro twice results in a
313	deadlocked coro.	367	deadlocked coro.
…		…
319		373
320	Return true if the lock is currently active, i.e. somebody has locked it.	374	Return true if the lock is currently active, i.e. somebody has locked it.
321		375
322	=cut	376	=cut
323		377
324	our %LOCK;	378	our $LOCKS = new Coro::SemaphoreSet;
325	our %LOCKER;#d#
326		379
327	sub lock_wait($) {	380	sub lock_wait($) {
328	my ($key) = @_;	381	$LOCKS->wait ($_[0]);
329
330	if ($LOCKER{$key} == $Coro::current) {#d#
331	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332	return;#d#
333	}#d#
334
335	# wait for lock, if any
336	while ($LOCK{$key}) {
337	push @{ $LOCK{$key} }, $Coro::current;
338	Coro::schedule;
339	}
340	}	382	}
341		383
342	sub lock_acquire($) {	384	sub lock_acquire($) {
343	my ($key) = @_;	385	$LOCKS->guard ($_[0])
344
345	# wait, to be sure we are not locked
346	lock_wait $key;
347
348	$LOCK{$key} = [];
349	$LOCKER{$key} = $Coro::current;#d#
350
351	Coro::guard {
352	delete $LOCKER{$key};#d#
353	# wake up all waiters, to be on the safe side
354	$_->ready for @{ delete $LOCK{$key} };
355	}
356	}	386	}
357		387
358	sub lock_active($) {	388	sub lock_active($) {
359	my ($key) = @_;	389	$LOCKS->count ($_[0]) < 1
360
361	! ! $LOCK{$key}
362	}	390	}
363		391
364	sub freeze_mainloop {	392	sub freeze_mainloop {
365	tick_inhibit_inc;	393	tick_inhibit_inc;
366		394
367	Coro::guard \&tick_inhibit_dec;	395	&Guard::guard (\&tick_inhibit_dec);
368	}	396	}
369		397
370	=item cf::periodic $interval, $cb	398	=item cf::periodic $interval, $cb
371		399
372	Like EV::periodic, but randomly selects a starting point so that the actions	400	Like EV::periodic, but randomly selects a starting point so that the actions
…		…
395		423
396	=cut	424	=cut
397		425
398	our @SLOT_QUEUE;	426	our @SLOT_QUEUE;
399	our $SLOT_QUEUE;	427	our $SLOT_QUEUE;
		428	our $SLOT_DECAY = 0.9;
400		429
401	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	430	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402	$SLOT_QUEUE = Coro::async {	431	$SLOT_QUEUE = Coro::async {
403	$Coro::current->desc ("timeslot manager");	432	$Coro::current->desc ("timeslot manager");
404		433
405	my $signal = new Coro::Signal;	434	my $signal = new Coro::Signal;
		435	my $busy;
406		436
407	while () {	437	while () {
408	next_job:	438	next_job:
		439
409	my $avail = cf::till_tick;	440	my $avail = cf::till_tick;
410	if ($avail > 0.01) {	441
411	for (0 .. $#SLOT_QUEUE) {	442	for (0 .. $#SLOT_QUEUE) {
412	if ($SLOT_QUEUE[$_][0] < $avail) {	443	if ($SLOT_QUEUE[$_][0] <= $avail) {
		444	$busy = 0;
413	my $job = splice @SLOT_QUEUE, $_, 1, ();	445	my $job = splice @SLOT_QUEUE, $_, 1, ();
414	$job->[2]->send;	446	$job->[2]->send;
415	Coro::cede;	447	Coro::cede;
416	goto next_job;	448	goto next_job;
417	}	449	} else {
		450	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418	}	451	}
419	}	452	}
420		453
421	if (@SLOT_QUEUE) {	454	if (@SLOT_QUEUE) {
422	# we do not use wait_for_tick() as it returns immediately when tick is inactive	455	# we do not use wait_for_tick() as it returns immediately when tick is inactive
423	push @cf::WAIT_FOR_TICK, $signal;	456	push @cf::WAIT_FOR_TICK, $signal;
424	$signal->wait;	457	$signal->wait;
425	} else {	458	} else {
		459	$busy = 0;
426	Coro::schedule;	460	Coro::schedule;
427	}	461	}
428	}	462	}
429	};	463	};
430		464
431	sub get_slot($;$$) {	465	sub get_slot($;$$) {
432	return if tick_inhibit || $Coro::current == $Coro::main;	466	return if tick_inhibit || $Coro::current == $Coro::main;
433		467
434	my ($time, $pri, $name) = @_;	468	my ($time, $pri, $name) = @_;
435		469
436	$time = $TICK * .6 if $time > $TICK * .6;	470	$time = clamp $time, 0.01, $TICK * .6;
		471
437	my $sig = new Coro::Signal;	472	my $sig = new Coro::Signal;
438		473
439	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	474	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
440	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	475	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
441	$SLOT_QUEUE->ready;	476	$SLOT_QUEUE->ready;
…		…
724		759
725	#############################################################################	760	#############################################################################
726		761
727	=head2 ATTACHABLE OBJECTS	762	=head2 ATTACHABLE OBJECTS
728		763
729	Many objects in crossfire are so-called attachable objects. That means you can	764	Many objects in deliantra are so-called attachable objects. That means you can
730	attach callbacks/event handlers (a collection of which is called an "attachment")	765	attach callbacks/event handlers (a collection of which is called an "attachment")
731	to it. All such attachable objects support the following methods.	766	to it. All such attachable objects support the following methods.
732		767
733	In the following description, CLASS can be any of C<global>, C<object>	768	In the following description, CLASS can be any of C<global>, C<object>
734	C<player>, C<client> or C<map> (i.e. the attachable objects in	769	C<player>, C<client> or C<map> (i.e. the attachable objects in
…		…
784	=item cf::CLASS::attachment $name, ...	819	=item cf::CLASS::attachment $name, ...
785		820
786	Register an attachment by C<$name> through which attachable objects of the	821	Register an attachment by C<$name> through which attachable objects of the
787	given CLASS can refer to this attachment.	822	given CLASS can refer to this attachment.
788		823
789	Some classes such as crossfire maps and objects can specify attachments	824	Some classes such as deliantra maps and objects can specify attachments
790	that are attached at load/instantiate time, thus the need for a name.	825	that are attached at load/instantiate time, thus the need for a name.
791		826
792	These calls expect any number of the following handler/hook descriptions:	827	These calls expect any number of the following handler/hook descriptions:
793		828
794	=over 4	829	=over 4
…		…
1085		1120
1086	sub reattach {	1121	sub reattach {
1087	# basically do the same as instantiate, without calling instantiate	1122	# basically do the same as instantiate, without calling instantiate
1088	my ($obj) = @_;	1123	my ($obj) = @_;
1089		1124
		1125	# no longer needed after getting rid of delete_package?
1090	bless $obj, ref $obj; # re-bless in case extensions have been reloaded	1126	#bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091		1127
1092	my $registry = $obj->registry;	1128	my $registry = $obj->registry;
1093		1129
1094	@$registry = ();	1130	@$registry = ();
1095		1131
…		…
1141	utf8::decode (my $decname = $filename);	1177	utf8::decode (my $decname = $filename);
1142	warn sprintf "saving %s (%d,%d)\n",	1178	warn sprintf "saving %s (%d,%d)\n",
1143	$decname, length $$rdata, scalar @$objs;	1179	$decname, length $$rdata, scalar @$objs;
1144		1180
1145	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1181	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146	chmod SAVE_MODE, $fh;	1182	aio_chmod $fh, SAVE_MODE;
1147	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1183	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148	aio_fsync $fh if $cf::USE_FSYNC;	1184	if ($cf::USE_FSYNC) {
		1185	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;
		1186	aio_fsync $fh;
		1187	}
1149	close $fh;	1188	aio_close $fh;
1150		1189
1151	if (@$objs) {	1190	if (@$objs) {
1152	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1191	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1153	chmod SAVE_MODE, $fh;	1192	aio_chmod $fh, SAVE_MODE;
1154	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1193	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155	aio_write $fh, 0, (length $data), $data, 0;	1194	aio_write $fh, 0, (length $data), $data, 0;
1156	aio_fsync $fh if $cf::USE_FSYNC;	1195	if ($cf::USE_FSYNC) {
		1196	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;
		1197	aio_fsync $fh;
		1198	}
1157	close $fh;	1199	aio_close $fh;
1158	aio_rename "$filename.pst~", "$filename.pst";	1200	aio_rename "$filename.pst~", "$filename.pst";
1159	}	1201	}
1160	} else {	1202	} else {
1161	aio_unlink "$filename.pst";	1203	aio_unlink "$filename.pst";
1162	}	1204	}
1163		1205
1164	aio_rename "$filename~", $filename;	1206	aio_rename "$filename~", $filename;
		1207
		1208	$filename =~ s%/[^/]+$%%;
		1209	aio_pathsync $filename if $cf::USE_FSYNC;
1165	} else {	1210	} else {
1166	warn "FATAL: $filename~: $!\n";	1211	warn "unable to save objects: $filename~: $!\n";
1167	}	1212	}
1168	} else {	1213	} else {
1169	aio_unlink $filename;	1214	aio_unlink $filename;
1170	aio_unlink "$filename.pst";	1215	aio_unlink "$filename.pst";
1171	}	1216	}
…		…
1262	my ($name, $cb) = @_;	1307	my ($name, $cb) = @_;
1263		1308
1264	$EXTICMD{$name} = $cb;	1309	$EXTICMD{$name} = $cb;
1265	}	1310	}
1266		1311
		1312	use File::Glob ();
		1313
1267	cf::player->attach (	1314	cf::player->attach (
1268	on_command => sub {	1315	on_command => sub {
1269	my ($pl, $name, $params) = @_;	1316	my ($pl, $name, $params) = @_;
1270		1317
1271	my $cb = $COMMAND{$name}	1318	my $cb = $COMMAND{$name}
…		…
1303		1350
1304	cf::override;	1351	cf::override;
1305	},	1352	},
1306	);	1353	);
1307		1354
		1355	# "readahead" all extensions
		1356	sub cache_extensions {
		1357	my $grp = IO::AIO::aio_group;
		1358
		1359	add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
		1360	for (grep /\.ext$/, @{$_[0]}) {
		1361	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
		1362	}
		1363	};
		1364
		1365	$grp
		1366	}
		1367
1308	sub load_extensions {	1368	sub load_extensions {
1309	cf::sync_job {	1369	cf::sync_job {
1310	my %todo;	1370	my %todo;
1311		1371
1312	for my $path (<$LIBDIR/*.ext>) {	1372	for my $path (<$LIBDIR/*.ext>) {
…		…
1331		1391
1332	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1392	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1393	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334		1394
1335	$ext{source} =	1395	$ext{source} =
1336	"package $pkg; use strict; use utf8;\n"	1396	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337	. "#line 1 \"$path\"\n{\n"	1397	. "#line 1 \"$path\"\n{\n"
1338	. $source	1398	. $source
1339	. "\n};\n1";	1399	. "\n};\n1";
1340		1400
1341	$todo{$base} = \%ext;	1401	$todo{$base} = \%ext;
1342	}	1402	}
1343		1403
		1404	my $pass = 0;
1344	my %done;	1405	my %done;
1345	while (%todo) {	1406	while (%todo) {
1346	my $progress;	1407	my $progress;
1347		1408
		1409	++$pass;
		1410
		1411	ext:
1348	while (my ($k, $v) = each %todo) {	1412	while (my ($k, $v) = each %todo) {
1349	for (split /,\s*/, $v->{meta}{depends}) {	1413	for (split /,\s*/, $v->{meta}{depends}) {
1350	goto skip	1414	next ext
1351	unless exists $done{$_};	1415	unless exists $done{$_};
1352	}	1416	}
1353		1417
1354	warn "... loading '$k' into '$v->{pkg}'\n";	1418	warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1355		1419
1356	unless (eval $v->{source}) {	1420	my $active = eval $v->{source};
		1421
		1422	if (length $@) {
1357	my $msg = $@ ? "$v->{path}: $@\n"	1423	warn "$v->{path}: $@\n";
1358	: "$v->{base}: extension inactive.\n";
1359		1424
1360	if (exists $v->{meta}{mandatory}) {
1361	warn $msg;
1362	cf::cleanup "mandatory extension failed to load, exiting.";	1425	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1363	}	1426	if exists $v->{meta}{mandatory};
1364		1427	} else {
1365	warn $msg;	1428	$done{$k} = delete $todo{$k};
		1429	push @EXTS, $v->{pkg};
		1430	$progress = 1;
		1431
		1432	warn "$v->{base}: extension inactive.\n"
		1433	unless $active;
1366	}	1434	}
1367
1368	$done{$k} = delete $todo{$k};
1369	push @EXTS, $v->{pkg};
1370	$progress = 1;
1371	}	1435	}
1372		1436
1373	skip:	1437	unless ($progress) {
1374	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1438	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1375	unless $progress;	1439
		1440	while (my ($k, $v) = each %todo) {
		1441	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
		1442	if exists $v->{meta}{mandatory};
		1443	}
		1444	}
1376	}	1445	}
1377	};	1446	};
1378	}	1447	}
1379		1448
1380	#############################################################################	1449	#############################################################################
1381		1450
1382	=back	1451	=back
1383		1452
1384	=head2 CORE EXTENSIONS	1453	=head2 CORE EXTENSIONS
1385		1454
1386	Functions and methods that extend core crossfire objects.	1455	Functions and methods that extend core deliantra objects.
1387		1456
1388	=cut	1457	=cut
1389		1458
1390	package cf::player;	1459	package cf::player;
1391		1460
…		…
1434		1503
1435	sub exists($) {	1504	sub exists($) {
1436	my ($login) = @_;	1505	my ($login) = @_;
1437		1506
1438	$cf::PLAYER{$login}	1507	$cf::PLAYER{$login}
1439	or cf::sync_job { !aio_stat path $login }	1508	or !aio_stat path $login
1440	}	1509	}
1441		1510
1442	sub find($) {	1511	sub find($) {
1443	return $cf::PLAYER{$_[0]} || do {	1512	return $cf::PLAYER{$_[0]} || do {
1444	my $login = $_[0];	1513	my $login = $_[0];
…		…
1456	my $f = new_from_file cf::object::thawer path $login	1525	my $f = new_from_file cf::object::thawer path $login
1457	or return;	1526	or return;
1458		1527
1459	my $pl = cf::player::load_pl $f	1528	my $pl = cf::player::load_pl $f
1460	or return;	1529	or return;
		1530
1461	local $cf::PLAYER_LOADING{$login} = $pl;	1531	local $cf::PLAYER_LOADING{$login} = $pl;
1462	$f->resolve_delayed_derefs;	1532	$f->resolve_delayed_derefs;
1463	$cf::PLAYER{$login} = $pl	1533	$cf::PLAYER{$login} = $pl
1464	}	1534	}
1465	}	1535	}
…		…
1518	my ($pl) = @_;	1588	my ($pl) = @_;
1519		1589
1520	my $name = $pl->ob->name;	1590	my $name = $pl->ob->name;
1521		1591
1522	$pl->{deny_save} = 1;	1592	$pl->{deny_save} = 1;
1523	$pl->password ("*"); # this should lock out the player until we nuked the dir	1593	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1524		1594
1525	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1595	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1526	$pl->deactivate;	1596	$pl->deactivate;
		1597	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
		1598	$pl->ob->check_score;
1527	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1599	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1528	$pl->ns->destroy if $pl->ns;	1600	$pl->ns->destroy if $pl->ns;
1529		1601
1530	my $path = playerdir $pl;	1602	my $path = playerdir $pl;
1531	my $temp = "$path~$cf::RUNTIME~deleting~";	1603	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1570		1642
1571	for my $login (@$dirs) {	1643	for my $login (@$dirs) {
1572	my $path = path $login;	1644	my $path = path $login;
1573		1645
1574	# a .pst is a dead give-away for a valid player	1646	# a .pst is a dead give-away for a valid player
1575	unless (-e "$path.pst") {	1647	# if no pst file found, open and chekc for blocked users
		1648	if (aio_stat "$path.pst") {
1576	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;	1649	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577	aio_read $fh, 0, 512, my $buf, 0 or next;	1650	aio_read $fh, 0, 512, my $buf, 0 or next;
1578	$buf !~ /^password -------------$/m or next; # official not-valid tag	1651	$buf !~ /^password -------------$/m or next; # official not-valid tag
1579	}	1652	}
1580		1653
…		…
1611	}	1684	}
1612		1685
1613	\@paths	1686	\@paths
1614	}	1687	}
1615		1688
1616	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)	1689	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1617		1690
1618	Expand crossfire pod fragments into protocol xml.	1691	Expand deliantra pod fragments into protocol xml.
1619
1620	=cut
1621
1622	use re 'eval';
1623
1624	my $group;
1625	my $interior; $interior = qr{
1626	# match a pod interior sequence sans C<< >>
1627	(?:
1628	\ (.*?)\ (?{ $group = $^N })
1629	| < (??{$interior}) >
1630	)
1631	}x;
1632
1633	sub expand_cfpod {
1634	my ($self, $pod) = @_;
1635
1636	my $xml;
1637
1638	while () {
1639	if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640	$group = $1;
1641
1642	$group =~ s/&/&amp;/g;
1643	$group =~ s/</&lt;/g;
1644
1645	$xml .= $group;
1646	} elsif ($pod =~ m%\G
1647	([BCGHITU])
1648	<
1649	(?:
1650	([^<>]*) (?{ $group = $^N })
1651	| < $interior >
1652	)
1653	>
1654	%gcsx
1655	) {
1656	my ($code, $data) = ($1, $group);
1657
1658	if ($code eq "B") {
1659	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1660	} elsif ($code eq "I") {
1661	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1662	} elsif ($code eq "U") {
1663	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1664	} elsif ($code eq "C") {
1665	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1666	} elsif ($code eq "T") {
1667	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1668	} elsif ($code eq "G") {
1669	my ($male, $female) = split /\|/, $data;
1670	$data = $self->gender ? $female : $male;
1671	$xml .= expand_cfpod ($self, $data);
1672	} elsif ($code eq "H") {
1673	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1674	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1675	"")
1676	[$self->{hintmode}];
1677	} else {
1678	$xml .= "error processing '$code($data)' directive";
1679	}
1680	} else {
1681	if ($pod =~ /\G(.+)/) {
1682	warn "parse error while expanding $pod (at $1)";
1683	}
1684	last;
1685	}
1686	}
1687
1688	for ($xml) {
1689	# create single paragraphs (very hackish)
1690	s/(?<=\S)\n(?=\w)/ /g;
1691
1692	# compress some whitespace
1693	s/\s+\n/\n/g; # ws line-ends
1694	s/\n\n+/\n/g; # double lines
1695	s/^\n+//; # beginning lines
1696	s/\n+$//; # ending lines
1697	}
1698
1699	$xml
1700	}
1701
1702	no re 'eval';
1703
1704	sub hintmode {
1705	$_[0]{hintmode} = $_[1] if @_ > 1;
1706	$_[0]{hintmode}
1707	}
1708		1692
1709	=item $player->ext_reply ($msgid, @msg)	1693	=item $player->ext_reply ($msgid, @msg)
1710		1694
1711	Sends an ext reply to the player.	1695	Sends an ext reply to the player.
1712		1696
…		…
1925		1909
1926	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;	1910	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1927	"$UNIQUEDIR/$path"	1911	"$UNIQUEDIR/$path"
1928	}	1912	}
1929		1913
1930	# and all this just because we cannot iterate over
1931	# all maps in C++...
1932	sub change_all_map_light {
1933	my ($change) = @_;
1934
1935	$_->change_map_light ($change)
1936	for grep $_->outdoor, values %cf::MAP;
1937	}
1938
1939	sub decay_objects {	1914	sub decay_objects {
1940	my ($self) = @_;	1915	my ($self) = @_;
1941		1916
1942	return if $self->{deny_reset};	1917	return if $self->{deny_reset};
1943		1918
…		…
2025	sub find {	2000	sub find {
2026	my ($path, $origin) = @_;	2001	my ($path, $origin) = @_;
2027		2002
2028	$path = normalise $path, $origin && $origin->path;	2003	$path = normalise $path, $origin && $origin->path;
2029		2004
2030	cf::lock_wait "map_data:$path";#d#remove	2005	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2031	cf::lock_wait "map_find:$path";	2006	my $guard2 = cf::lock_acquire "map_find:$path";
2032		2007
2033	$cf::MAP{$path} || do {	2008	$cf::MAP{$path} || do {
2034	my $guard1 = cf::lock_acquire "map_find:$path";
2035	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2036
2037	my $map = new_from_path cf::map $path	2009	my $map = new_from_path cf::map $path
2038	or return;	2010	or return;
2039		2011
2040	$map->{last_save} = $cf::RUNTIME;	2012	$map->{last_save} = $cf::RUNTIME;
2041		2013
…		…
2043	or return;	2015	or return;
2044		2016
2045	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	2017	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046	# doing this can freeze the server in a sync job, obviously	2018	# doing this can freeze the server in a sync job, obviously
2047	#$cf::WAIT_FOR_TICK->wait;	2019	#$cf::WAIT_FOR_TICK->wait;
		2020	undef $guard2;
2048	undef $guard1;	2021	undef $guard1;
2049	undef $guard2;
2050	$map->reset;	2022	$map->reset;
2051	return find $path;	2023	return find $path;
2052	}	2024	}
2053		2025
2054	$cf::MAP{$path} = $map	2026	$cf::MAP{$path} = $map
2055	}	2027	}
2056	}	2028	}
2057		2029
2058	sub pre_load { }	2030	sub pre_load { }
2059	sub post_load { }	2031	#sub post_load { } # XS
2060		2032
2061	sub load {	2033	sub load {
2062	my ($self) = @_;	2034	my ($self) = @_;
2063		2035
2064	local $self->{deny_reset} = 1; # loading can take a long time	2036	local $self->{deny_reset} = 1; # loading can take a long time
…		…
2081	my $f = new_from_file cf::object::thawer $self->{load_path};	2053	my $f = new_from_file cf::object::thawer $self->{load_path};
2082	$f->skip_block;	2054	$f->skip_block;
2083	$self->_load_objects ($f)	2055	$self->_load_objects ($f)
2084	or return;	2056	or return;
2085		2057
2086	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2058	$self->post_load_original
2087	if delete $self->{load_original};	2059	if delete $self->{load_original};
2088		2060
2089	if (my $uniq = $self->uniq_path) {	2061	if (my $uniq = $self->uniq_path) {
2090	utf8::encode $uniq;	2062	utf8::encode $uniq;
2091	unless (aio_stat $uniq) {	2063	unless (aio_stat $uniq) {
…		…
2109	unless ($self->{deny_activate}) {	2081	unless ($self->{deny_activate}) {
2110	$self->decay_objects;	2082	$self->decay_objects;
2111	$self->fix_auto_apply;	2083	$self->fix_auto_apply;
2112	$self->update_buttons;	2084	$self->update_buttons;
2113	cf::cede_to_tick;	2085	cf::cede_to_tick;
2114	$self->set_darkness_map;
2115	cf::cede_to_tick;
2116	$self->activate;	2086	$self->activate;
2117	}	2087	}
2118		2088
2119	$self->{last_save} = $cf::RUNTIME;	2089	$self->{last_save} = $cf::RUNTIME;
2120	$self->last_access ($cf::RUNTIME);	2090	$self->last_access ($cf::RUNTIME);
…		…
2123	}	2093	}
2124		2094
2125	$self->post_load;	2095	$self->post_load;
2126	}	2096	}
2127		2097
		2098	# customize the map for a given player, i.e.
		2099	# return the _real_ map. used by e.g. per-player
		2100	# maps to change the path to ~playername/mappath
2128	sub customise_for {	2101	sub customise_for {
2129	my ($self, $ob) = @_;	2102	my ($self, $ob) = @_;
2130		2103
2131	return find "~" . $ob->name . "/" . $self->{path}	2104	return find "~" . $ob->name . "/" . $self->{path}
2132	if $self->per_player;	2105	if $self->per_player;
…		…
2286		2259
2287	my $lock = cf::lock_acquire "map_data:$self->{path}";	2260	my $lock = cf::lock_acquire "map_data:$self->{path}";
2288		2261
2289	return if $self->players;	2262	return if $self->players;
2290		2263
2291	warn "resetting map ", $self->path;	2264	warn "resetting map ", $self->path, "\n";
2292		2265
2293	$self->in_memory (cf::MAP_SWAPPED);	2266	$self->in_memory (cf::MAP_SWAPPED);
2294		2267
2295	# need to save uniques path	2268	# need to save uniques path
2296	unless ($self->{deny_save}) {	2269	unless ($self->{deny_save}) {
…		…
2387	: normalise $_	2360	: normalise $_
2388	} @{ aio_readdir $UNIQUEDIR or [] }	2361	} @{ aio_readdir $UNIQUEDIR or [] }
2389	]	2362	]
2390	}	2363	}
2391		2364
		2365	=item cf::map::static_maps
		2366
		2367	Returns an arrayref if paths of all static maps (all preinstalled F<.map>
		2368	file in the shared directory excluding F</styles> and F</editor>). May
		2369	block.
		2370
		2371	=cut
		2372
		2373	sub static_maps() {
		2374	my @dirs = "";
		2375	my @maps;
		2376
		2377	while (@dirs) {
		2378	my $dir = shift @dirs;
		2379
		2380	next if $dir eq "/styles" || $dir eq "/editor";
		2381
		2382	my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
		2383	or return;
		2384
		2385	for (@$files) {
		2386	s/\.map$// or next;
		2387	utf8::decode $_;
		2388	push @maps, "$dir/$_";
		2389	}
		2390
		2391	push @dirs, map "$dir/$_", @$dirs;
		2392	}
		2393
		2394	\@maps
		2395	}
		2396
2392	=back	2397	=back
2393		2398
2394	=head3 cf::object	2399	=head3 cf::object
2395		2400
2396	=cut	2401	=cut
…		…
2457	can be C<undef>. Does the right thing when the player is currently in a	2462	can be C<undef>. Does the right thing when the player is currently in a
2458	dialogue with the given NPC character.	2463	dialogue with the given NPC character.
2459		2464
2460	=cut	2465	=cut
2461		2466
		2467	our $SAY_CHANNEL = {
		2468	id => "say",
		2469	title => "Map",
		2470	reply => "say ",
		2471	tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
		2472	};
		2473
		2474	our $CHAT_CHANNEL = {
		2475	id => "chat",
		2476	title => "Chat",
		2477	reply => "chat ",
		2478	tooltip => "Player chat and shouts, global to the server.",
		2479	};
		2480
2462	# rough implementation of a future "reply" method that works	2481	# rough implementation of a future "reply" method that works
2463	# with dialog boxes.	2482	# with dialog boxes.
2464	#TODO: the first argument must go, split into a $npc->reply_to ( method	2483	#TODO: the first argument must go, split into a $npc->reply_to ( method
2465	sub cf::object::player::reply($$$;$) {	2484	sub cf::object::player::reply($$$;$) {
2466	my ($self, $npc, $msg, $flags) = @_;	2485	my ($self, $npc, $msg, $flags) = @_;
…		…
2477	my $dialog = $pl->{npc_dialog};	2496	my $dialog = $pl->{npc_dialog};
2478	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));	2497	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2479		2498
2480	} else {	2499	} else {
2481	$msg = $npc->name . " says: $msg" if $npc;	2500	$msg = $npc->name . " says: $msg" if $npc;
2482	$self->message ($msg, $flags);	2501	$self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483	}	2502	}
2484	}	2503	}
2485	}	2504	}
2486		2505
2487	=item $object->send_msg ($channel, $msg, $color, [extra...])	2506	=item $object->send_msg ($channel, $msg, $color, [extra...])
…		…
2512		2531
2513	=item $player_object->enter_link	2532	=item $player_object->enter_link
2514		2533
2515	Freezes the player and moves him/her to a special map (C<{link}>).	2534	Freezes the player and moves him/her to a special map (C<{link}>).
2516		2535
2517	The player should be reasonably safe there for short amounts of time. You	2536	The player should be reasonably safe there for short amounts of time (e.g.
2518	I<MUST> call C<leave_link> as soon as possible, though.	2537	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
		2538	though, as the palyer cannot control the character while it is on the link
		2539	map.
2519		2540
2520	Will never block.	2541	Will never block.
2521		2542
2522	=item $player_object->leave_link ($map, $x, $y)	2543	=item $player_object->leave_link ($map, $x, $y)
2523		2544
…		…
2575	($x, $y) = (-1, -1)	2596	($x, $y) = (-1, -1)
2576	unless (defined $x) && (defined $y);	2597	unless (defined $x) && (defined $y);
2577		2598
2578	# use -1 or undef as default coordinates, not 0, 0	2599	# use -1 or undef as default coordinates, not 0, 0
2579	($x, $y) = ($map->enter_x, $map->enter_y)	2600	($x, $y) = ($map->enter_x, $map->enter_y)
2580	if $x <=0 && $y <= 0;	2601	if $x <= 0 && $y <= 0;
2581		2602
2582	$map->load;	2603	$map->load;
2583	$map->load_neighbours;	2604	$map->load_neighbours;
2584		2605
2585	return unless $self->contr->active;	2606	return unless $self->contr->active;
2586	$self->activate_recursive;
2587		2607
2588	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2608	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589	$self->enter_map ($map, $x, $y);	2609	$self->enter_map ($map, $x, $y);
		2610
		2611	# only activate afterwards, to support waiting in hooks
		2612	$self->activate_recursive;
2590	}	2613	}
2591		2614
2592	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2615	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2593		2616
2594	Moves the player to the given map-path and coordinates by first freezing	2617	Moves the player to the given map-path and coordinates by first freezing
2595	her, loading and preparing them map, calling the provided $check callback	2618	her, loading and preparing them map, calling the provided $check callback
2596	that has to return the map if sucecssful, and then unfreezes the player on	2619	that has to return the map if sucecssful, and then unfreezes the player on
2597	the new (success) or old (failed) map position. In either case, $done will	2620	the new (success) or old (failed) map position. In either case, $done will
2598	be called at the end of this process.	2621	be called at the end of this process.
		2622
		2623	Note that $check will be called with a potentially non-loaded map, so if
		2624	it needs a loaded map it has to call C<< ->load >>.
2599		2625
2600	=cut	2626	=cut
2601		2627
2602	our $GOTOGEN;	2628	our $GOTOGEN;
2603		2629
…		…
2682	}	2708	}
2683		2709
2684	sub prepare_random_map {	2710	sub prepare_random_map {
2685	my ($exit) = @_;	2711	my ($exit) = @_;
2686		2712
2687	my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689	# all this does is basically replace the /! path by	2713	# all this does is basically replace the /! path by
2690	# a new random map path (?random/...) with a seed	2714	# a new random map path (?random/...) with a seed
2691	# that depends on the exit object	2715	# that depends on the exit object
2692		2716
2693	my $rmp = parse_random_map_params $exit->msg;	2717	my $rmp = parse_random_map_params $exit->msg;
…		…
2695	if ($exit->map) {	2719	if ($exit->map) {
2696	$rmp->{region} = $exit->region->name;	2720	$rmp->{region} = $exit->region->name;
2697	$rmp->{origin_map} = $exit->map->path;	2721	$rmp->{origin_map} = $exit->map->path;
2698	$rmp->{origin_x} = $exit->x;	2722	$rmp->{origin_x} = $exit->x;
2699	$rmp->{origin_y} = $exit->y;	2723	$rmp->{origin_y} = $exit->y;
		2724
		2725	$exit->map->touch;
2700	}	2726	}
2701		2727
2702	$rmp->{random_seed} ||= $exit->random_seed;	2728	$rmp->{random_seed} ||= $exit->random_seed;
2703		2729
2704	my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);	2730	my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
…		…
2708	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2734	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709	aio_write $fh, 0, (length $data), $data, 0;	2735	aio_write $fh, 0, (length $data), $data, 0;
2710	undef $fh;	2736	undef $fh;
2711	aio_rename "$meta~", $meta;	2737	aio_rename "$meta~", $meta;
2712		2738
		2739	my $slaying = "?random/$md5";
		2740
		2741	if ($exit->valid) {
2713	$exit->slaying ("?random/$md5");	2742	$exit->slaying ("?random/$md5");
2714	$exit->msg (undef);	2743	$exit->msg (undef);
		2744	}
2715	}	2745	}
2716	}	2746	}
2717		2747
2718	sub cf::object::player::enter_exit {	2748	sub cf::object::player::enter_exit {
2719	my ($self, $exit) = @_;	2749	my ($self, $exit) = @_;
2720		2750
2721	return unless $self->type == cf::PLAYER;	2751	return unless $self->type == cf::PLAYER;
2722		2752
2723	if ($exit->slaying eq "/!") {
2724	#TODO: this should de-fi-ni-te-ly not be a sync-job
2725	# the problem is that $exit might not survive long enough
2726	# so it needs to be done right now, right here
2727	cf::sync_job { prepare_random_map $exit };
2728	}
2729
2730	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2731	my $hp = $exit->stats->hp;
2732	my $sp = $exit->stats->sp;
2733
2734	$self->enter_link;	2753	$self->enter_link;
2735		2754
2736	# if exit is damned, update players death & WoR home-position
2737	$self->contr->savebed ($slaying, $hp, $sp)
2738	if $exit->flag (FLAG_DAMNED);
2739
2740	(async {	2755	(async {
2741	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";	2756	$Coro::current->{desc} = "enter_exit";
2742		2757
2743	$self->deactivate_recursive; # just to be sure
2744	unless (eval {	2758	unless (eval {
		2759	$self->deactivate_recursive; # just to be sure
		2760
		2761	# random map handling
		2762	{
		2763	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2764
		2765	prepare_random_map $exit
		2766	if $exit->slaying eq "/!";
		2767	}
		2768
		2769	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
		2770	my $x = $exit->stats->hp;
		2771	my $y = $exit->stats->sp;
		2772
2745	$self->goto ($slaying, $hp, $sp);	2773	$self->goto ($map, $x, $y);
2746		2774
		2775	# if exit is damned, update players death & WoR home-position
		2776	$self->contr->savebed ($map, $x, $y)
		2777	if $exit->flag (cf::FLAG_DAMNED);
		2778
2747	1;	2779	1
2748	}) {	2780	}) {
2749	$self->message ("Something went wrong deep within the crossfire server. "	2781	$self->message ("Something went wrong deep within the deliantra server. "
2750	. "I'll try to bring you back to the map you were before. "	2782	. "I'll try to bring you back to the map you were before. "
2751	. "Please report this to the dungeon master!",	2783	. "Please report this to the dungeon master!",
2752	cf::NDI_UNIQUE | cf::NDI_RED);	2784	cf::NDI_UNIQUE | cf::NDI_RED);
2753		2785
2754	warn "ERROR in enter_exit: $@";	2786	warn "ERROR in enter_exit: $@";
…		…
2771	sub cf::client::send_drawinfo {	2803	sub cf::client::send_drawinfo {
2772	my ($self, $text, $flags) = @_;	2804	my ($self, $text, $flags) = @_;
2773		2805
2774	utf8::encode $text;	2806	utf8::encode $text;
2775	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2807	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
		2808	}
		2809
		2810	=item $client->send_big_packet ($pkt)
		2811
		2812	Like C<send_packet>, but tries to compress large packets, and fragments
		2813	them as required.
		2814
		2815	=cut
		2816
		2817	our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
		2818
		2819	sub cf::client::send_big_packet {
		2820	my ($self, $pkt) = @_;
		2821
		2822	# try lzf for large packets
		2823	$pkt = "lzf " . Compress::LZF::compress $pkt
		2824	if 1024 <= length $pkt and $self->{can_lzf};
		2825
		2826	# split very large packets
		2827	if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
		2828	$self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
		2829	$pkt = "frag";
		2830	}
		2831
		2832	$self->send_packet ($pkt);
2776	}	2833	}
2777		2834
2778	=item $client->send_msg ($channel, $msg, $color, [extra...])	2835	=item $client->send_msg ($channel, $msg, $color, [extra...])
2779		2836
2780	Send a drawinfo or msg packet to the client, formatting the msg for the	2837	Send a drawinfo or msg packet to the client, formatting the msg for the
…		…
2784		2841
2785	=cut	2842	=cut
2786		2843
2787	# non-persistent channels (usually the info channel)	2844	# non-persistent channels (usually the info channel)
2788	our %CHANNEL = (	2845	our %CHANNEL = (
		2846	"c/motd" => {
		2847	id => "infobox",
		2848	title => "MOTD",
		2849	reply => undef,
		2850	tooltip => "The message of the day",
		2851	},
2789	"c/identify" => {	2852	"c/identify" => {
2790	id => "infobox",	2853	id => "infobox",
2791	title => "Identify",	2854	title => "Identify",
2792	reply => undef,	2855	reply => undef,
2793	tooltip => "Items recently identified",	2856	tooltip => "Items recently identified",
…		…
2795	"c/examine" => {	2858	"c/examine" => {
2796	id => "infobox",	2859	id => "infobox",
2797	title => "Examine",	2860	title => "Examine",
2798	reply => undef,	2861	reply => undef,
2799	tooltip => "Signs and other items you examined",	2862	tooltip => "Signs and other items you examined",
		2863	},
		2864	"c/shopinfo" => {
		2865	id => "infobox",
		2866	title => "Shop Info",
		2867	reply => undef,
		2868	tooltip => "What your bargaining skill tells you about the shop",
2800	},	2869	},
2801	"c/book" => {	2870	"c/book" => {
2802	id => "infobox",	2871	id => "infobox",
2803	title => "Book",	2872	title => "Book",
2804	reply => undef,	2873	reply => undef,
…		…
2820	id => "infobox",	2889	id => "infobox",
2821	title => "Body Parts",	2890	title => "Body Parts",
2822	reply => undef,	2891	reply => undef,
2823	tooltip => "Shows which body parts you posess and are available",	2892	tooltip => "Shows which body parts you posess and are available",
2824	},	2893	},
		2894	"c/statistics" => {
		2895	id => "infobox",
		2896	title => "Statistics",
		2897	reply => undef,
		2898	tooltip => "Shows your primary statistics",
		2899	},
		2900	"c/skills" => {
		2901	id => "infobox",
		2902	title => "Skills",
		2903	reply => undef,
		2904	tooltip => "Shows your experience per skill and item power",
		2905	},
		2906	"c/shopitems" => {
		2907	id => "infobox",
		2908	title => "Shop Items",
		2909	reply => undef,
		2910	tooltip => "Shows the items currently for sale in this shop",
		2911	},
		2912	"c/resistances" => {
		2913	id => "infobox",
		2914	title => "Resistances",
		2915	reply => undef,
		2916	tooltip => "Shows your resistances",
		2917	},
		2918	"c/pets" => {
		2919	id => "infobox",
		2920	title => "Pets",
		2921	reply => undef,
		2922	tooltip => "Shows information abotu your pets/a specific pet",
		2923	},
		2924	"c/perceiveself" => {
		2925	id => "infobox",
		2926	title => "Perceive Self",
		2927	reply => undef,
		2928	tooltip => "You gained detailed knowledge about yourself",
		2929	},
2825	"c/uptime" => {	2930	"c/uptime" => {
2826	id => "infobox",	2931	id => "infobox",
2827	title => "Uptime",	2932	title => "Uptime",
2828	reply => undef,	2933	reply => undef,
2829	tooltip => "How long the server has been running since last restart",	2934	tooltip => "How long the server has been running since last restart",
…		…
2838	id => "party",	2943	id => "party",
2839	title => "Party",	2944	title => "Party",
2840	reply => "gsay ",	2945	reply => "gsay ",
2841	tooltip => "Messages and chat related to your party",	2946	tooltip => "Messages and chat related to your party",
2842	},	2947	},
		2948	"c/death" => {
		2949	id => "death",
		2950	title => "Death",
		2951	reply => undef,
		2952	tooltip => "Reason for and more info about your most recent death",
		2953	},
		2954	"c/say" => $SAY_CHANNEL,
		2955	"c/chat" => $CHAT_CHANNEL,
2843	);	2956	);
2844		2957
2845	sub cf::client::send_msg {	2958	sub cf::client::send_msg {
2846	my ($self, $channel, $msg, $color, @extra) = @_;	2959	my ($self, $channel, $msg, $color, @extra) = @_;
2847		2960
2848	$msg = $self->pl->expand_cfpod ($msg);	2961	$msg = $self->pl->expand_cfpod ($msg)
		2962	unless $color & cf::NDI_VERBATIM;
2849		2963
2850	$color &= cf::NDI_CLIENT_MASK; # just in case...	2964	$color &= cf::NDI_CLIENT_MASK; # just in case...
2851		2965
2852	# check predefined channels, for the benefit of C	2966	# check predefined channels, for the benefit of C
2853	if ($CHANNEL{$channel}) {	2967	if ($CHANNEL{$channel}) {
2854	$channel = $CHANNEL{$channel};	2968	$channel = $CHANNEL{$channel};
2855		2969
2856	$self->ext_msg (channel_info => $channel)	2970	$self->ext_msg (channel_info => $channel);
2857	if $self->can_msg;
2858
2859	$channel = $channel->{id};	2971	$channel = $channel->{id};
2860		2972
2861	} elsif (ref $channel) {	2973	} elsif (ref $channel) {
2862	# send meta info to client, if not yet sent	2974	# send meta info to client, if not yet sent
2863	unless (exists $self->{channel}{$channel->{id}}) {	2975	unless (exists $self->{channel}{$channel->{id}}) {
2864	$self->{channel}{$channel->{id}} = $channel;	2976	$self->{channel}{$channel->{id}} = $channel;
2865	$self->ext_msg (channel_info => $channel)	2977	$self->ext_msg (channel_info => $channel);
2866	if $self->can_msg;
2867	}	2978	}
2868		2979
2869	$channel = $channel->{id};	2980	$channel = $channel->{id};
2870	}	2981	}
2871		2982
2872	return unless @extra || length $msg;	2983	return unless @extra || length $msg;
2873		2984
2874	if ($self->can_msg) {
2875	# default colour, mask it out	2985	# default colour, mask it out
2876	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)	2986	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2877	if $color & cf::NDI_DEF;	2987	if $color & cf::NDI_DEF;
2878		2988
2879	$self->send_packet ("msg " . $self->{json_coder}->encode (	2989	my $pkt = "msg "
		2990	. $self->{json_coder}->encode (
2880	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));	2991	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2881	} else {	2992	);
2882	if ($color >= 0) {
2883	# replace some tags by gcfclient-compatible ones
2884	for ($msg) {
2885	1 while
2886	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2887	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2888	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2889	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2890	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2891	}
2892		2993
2893	$color &= cf::NDI_COLOR_MASK;	2994	$self->send_big_packet ($pkt);
2894
2895	utf8::encode $msg;
2896
2897	if (0 && $msg =~ /\[/) {
2898	# COMMAND/INFO
2899	$self->send_packet ("drawextinfo $color 10 8 $msg")
2900	} else {
2901	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2902	$self->send_packet ("drawinfo $color $msg")
2903	}
2904	}
2905	}
2906	}	2995	}
2907		2996
2908	=item $client->ext_msg ($type, @msg)	2997	=item $client->ext_msg ($type, @msg)
2909		2998
2910	Sends an ext event to the client.	2999	Sends an ext event to the client.
…		…
2913		3002
2914	sub cf::client::ext_msg($$@) {	3003	sub cf::client::ext_msg($$@) {
2915	my ($self, $type, @msg) = @_;	3004	my ($self, $type, @msg) = @_;
2916		3005
2917	if ($self->extcmd == 2) {	3006	if ($self->extcmd == 2) {
2918	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3007	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2919	} elsif ($self->extcmd == 1) { # TODO: remove	3008	} elsif ($self->extcmd == 1) { # TODO: remove
2920	push @msg, msgtype => "event_$type";	3009	push @msg, msgtype => "event_$type";
2921	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3010	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2922	}	3011	}
2923	}	3012	}
2924		3013
2925	=item $client->ext_reply ($msgid, @msg)	3014	=item $client->ext_reply ($msgid, @msg)
2926		3015
…		…
2930		3019
2931	sub cf::client::ext_reply($$@) {	3020	sub cf::client::ext_reply($$@) {
2932	my ($self, $id, @msg) = @_;	3021	my ($self, $id, @msg) = @_;
2933		3022
2934	if ($self->extcmd == 2) {	3023	if ($self->extcmd == 2) {
2935	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3024	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2936	} elsif ($self->extcmd == 1) {	3025	} elsif ($self->extcmd == 1) {
2937	#TODO: version 1, remove	3026	#TODO: version 1, remove
2938	unshift @msg, msgtype => "reply", msgid => $id;	3027	unshift @msg, msgtype => "reply", msgid => $id;
2939	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3028	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2940	}	3029	}
2941	}	3030	}
2942		3031
2943	=item $success = $client->query ($flags, "text", \&cb)	3032	=item $success = $client->query ($flags, "text", \&cb)
2944		3033
…		…
3071	our $safe_hole = new Safe::Hole;	3160	our $safe_hole = new Safe::Hole;
3072		3161
3073	$SIG{FPE} = 'IGNORE';	3162	$SIG{FPE} = 'IGNORE';
3074		3163
3075	$safe->permit_only (Opcode::opset qw(	3164	$safe->permit_only (Opcode::opset qw(
3076	:base_core :base_mem :base_orig :base_math	3165	:base_core :base_mem :base_orig :base_math :base_loop
3077	grepstart grepwhile mapstart mapwhile	3166	grepstart grepwhile mapstart mapwhile
3078	sort time	3167	sort time
3079	));	3168	));
3080		3169
3081	# here we export the classes and methods available to script code	3170	# here we export the classes and methods available to script code
…		…
3085	The following functions and methods are available within a safe environment:	3174	The following functions and methods are available within a safe environment:
3086		3175
3087	cf::object	3176	cf::object
3088	contr pay_amount pay_player map x y force_find force_add destroy	3177	contr pay_amount pay_player map x y force_find force_add destroy
3089	insert remove name archname title slaying race decrease split	3178	insert remove name archname title slaying race decrease split
		3179	value
3090		3180
3091	cf::object::player	3181	cf::object::player
3092	player	3182	player
3093		3183
3094	cf::player	3184	cf::player
…		…
3099		3189
3100	=cut	3190	=cut
3101		3191
3102	for (	3192	for (
3103	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3193	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3104	insert remove inv name archname title slaying race	3194	insert remove inv nrof name archname title slaying race
3105	decrease split destroy)],	3195	decrease split destroy change_exp value msg lore send_msg)],
3106	["cf::object::player" => qw(player)],	3196	["cf::object::player" => qw(player)],
3107	["cf::player" => qw(peaceful)],	3197	["cf::player" => qw(peaceful send_msg)],
3108	["cf::map" => qw(trigger)],	3198	["cf::map" => qw(trigger)],
3109	) {	3199	) {
3110	no strict 'refs';	3200	no strict 'refs';
3111	my ($pkg, @funs) = @$_;	3201	my ($pkg, @funs) = @$_;
3112	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3202	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
…		…
3130		3220
3131	my $qcode = $code;	3221	my $qcode = $code;
3132	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3222	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3133	$qcode =~ s/\n/\\n/g;	3223	$qcode =~ s/\n/\\n/g;
3134		3224
		3225	%vars = (_dummy => 0) unless %vars;
		3226
		3227	my @res;
3135	local $_;	3228	local $_;
3136	local @safe::cf::_safe_eval_args = values %vars;
3137		3229
3138	my $eval =	3230	my $eval =
3139	"do {\n"	3231	"do {\n"
3140	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3232	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3141	. "#line 0 \"{$qcode}\"\n"	3233	. "#line 0 \"{$qcode}\"\n"
3142	. $code	3234	. $code
3143	. "\n}"	3235	. "\n}"
3144	;	3236	;
3145		3237
		3238	if ($CFG{safe_eval}) {
3146	sub_generation_inc;	3239	sub_generation_inc;
		3240	local @safe::cf::_safe_eval_args = values %vars;
3147	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3241	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3148	sub_generation_inc;	3242	sub_generation_inc;
		3243	} else {
		3244	local @cf::_safe_eval_args = values %vars;
		3245	@res = wantarray ? eval eval : scalar eval $eval;
		3246	}
3149		3247
3150	if ($@) {	3248	if ($@) {
3151	warn "$@";	3249	warn "$@";
3152	warn "while executing safe code '$code'\n";	3250	warn "while executing safe code '$code'\n";
3153	warn "with arguments " . (join " ", %vars) . "\n";	3251	warn "with arguments " . (join " ", %vars) . "\n";
…		…
3172	=cut	3270	=cut
3173		3271
3174	sub register_script_function {	3272	sub register_script_function {
3175	my ($fun, $cb) = @_;	3273	my ($fun, $cb) = @_;
3176		3274
3177	no strict 'refs';	3275	$fun = "safe::$fun" if $CFG{safe_eval};
3178	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3276	*$fun = $safe_hole->wrap ($cb);
3179	}	3277	}
3180		3278
3181	=back	3279	=back
3182		3280
3183	=cut	3281	=cut
…		…
3204		3302
3205	$facedata->{version} == 2	3303	$facedata->{version} == 2
3206	or cf::cleanup "$path: version mismatch, cannot proceed.";	3304	or cf::cleanup "$path: version mismatch, cannot proceed.";
3207		3305
3208	# patch in the exptable	3306	# patch in the exptable
		3307	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3209	$facedata->{resource}{"res/exp_table"} = {	3308	$facedata->{resource}{"res/exp_table"} = {
3210	type => FT_RSRC,	3309	type => FT_RSRC,
3211	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),	3310	data => $exp_table,
		3311	hash => (Digest::MD5::md5 $exp_table),
3212	};	3312	};
3213	cf::cede_to_tick;	3313	cf::cede_to_tick;
3214		3314
3215	{	3315	{
3216	my $faces = $facedata->{faceinfo};	3316	my $faces = $facedata->{faceinfo};
…		…
3218	while (my ($face, $info) = each %$faces) {	3318	while (my ($face, $info) = each %$faces) {
3219	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3319	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3220		3320
3221	cf::face::set_visibility $idx, $info->{visibility};	3321	cf::face::set_visibility $idx, $info->{visibility};
3222	cf::face::set_magicmap $idx, $info->{magicmap};	3322	cf::face::set_magicmap $idx, $info->{magicmap};
3223	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3323	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3224	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3324	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3225		3325
3226	cf::cede_to_tick;	3326	cf::cede_to_tick;
3227	}	3327	}
3228		3328
3229	while (my ($face, $info) = each %$faces) {	3329	while (my ($face, $info) = each %$faces) {
…		…
3253		3353
3254	cf::anim::invalidate_all; # d'oh	3354	cf::anim::invalidate_all; # d'oh
3255	}	3355	}
3256		3356
3257	{	3357	{
3258	# TODO: for gcfclient pleasure, we should give resources
3259	# that gcfclient doesn't grok a >10000 face index.
3260	my $res = $facedata->{resource};	3358	my $res = $facedata->{resource};
3261		3359
3262	while (my ($name, $info) = each %$res) {	3360	while (my ($name, $info) = each %$res) {
3263	if (defined $info->{type}) {	3361	if (defined $info->{type}) {
3264	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3362	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3265	my $data;
3266		3363
3267	if ($info->{type} & 1) {	3364	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3268	# prepend meta info
3269
3270	my $meta = $enc->encode ({
3271	name => $name,
3272	%{ $info->{meta} || {} },
3273	});
3274
3275	$data = pack "(w/a*)*", $meta, $info->{data};
3276	} else {
3277	$data = $info->{data};
3278	}
3279
3280	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3281	cf::face::set_type $idx, $info->{type};	3365	cf::face::set_type $idx, $info->{type};
3282	} else {	3366	} else {
3283	$RESOURCE{$name} = $info;	3367	$RESOURCE{$name} = $info;
3284	}	3368	}
3285		3369
…		…
3368	reload_treasures;	3452	reload_treasures;
3369		3453
3370	warn "finished reloading resource files\n";	3454	warn "finished reloading resource files\n";
3371	}	3455	}
3372		3456
3373	sub init {
3374	my $guard = freeze_mainloop;
3375
3376	reload_resources;
3377	}
3378
3379	sub reload_config {	3457	sub reload_config {
		3458	warn "reloading config file...\n";
		3459
3380	open my $fh, "<:utf8", "$CONFDIR/config"	3460	open my $fh, "<:utf8", "$CONFDIR/config"
3381	or return;	3461	or return;
3382		3462
3383	local $/;	3463	local $/;
3384	*CFG = YAML::Load <$fh>;	3464	*CFG = YAML::XS::Load scalar <$fh>;
3385		3465
3386	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3466	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3387		3467
3388	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3468	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3389	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3469	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3393	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3473	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3394	and die "WARNING: m(un)lockall failed: $!\n";	3474	and die "WARNING: m(un)lockall failed: $!\n";
3395	};	3475	};
3396	warn $@ if $@;	3476	warn $@ if $@;
3397	}	3477	}
		3478
		3479	warn "finished reloading resource files\n";
		3480	}
		3481
		3482	sub pidfile() {
		3483	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
		3484	or die "$PIDFILE: $!";
		3485	flock $fh, &Fcntl::LOCK_EX
		3486	or die "$PIDFILE: flock: $!";
		3487	$fh
		3488	}
		3489
		3490	# make sure only one server instance is running at any one time
		3491	sub atomic {
		3492	my $fh = pidfile;
		3493
		3494	my $pid = <$fh>;
		3495	kill 9, $pid if $pid > 0;
		3496
		3497	seek $fh, 0, 0;
		3498	print $fh $$;
		3499	}
		3500
		3501	sub main_loop {
		3502	warn "EV::loop starting\n";
		3503	if (1) {
		3504	EV::loop;
		3505	}
		3506	warn "EV::loop returned\n";
		3507	goto &main_loop unless $REALLY_UNLOOP;
3398	}	3508	}
3399		3509
3400	sub main {	3510	sub main {
		3511	cf::init_globals; # initialise logging
		3512
		3513	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3514	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
		3515	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
		3516	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
		3517
		3518	cf::init_experience;
		3519	cf::init_anim;
		3520	cf::init_attackmess;
		3521	cf::init_dynamic;
		3522
		3523	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
		3524
3401	# we must not ever block the main coroutine	3525	# we must not ever block the main coroutine
3402	local $Coro::idle = sub {	3526	local $Coro::idle = sub {
3403	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3527	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3404	(async {	3528	(async {
3405	$Coro::current->{desc} = "IDLE BUG HANDLER";	3529	$Coro::current->{desc} = "IDLE BUG HANDLER";
3406	EV::loop EV::LOOP_ONESHOT;	3530	EV::loop EV::LOOP_ONESHOT;
3407	})->prio (Coro::PRIO_MAX);	3531	})->prio (Coro::PRIO_MAX);
3408	};	3532	};
3409		3533
3410	{	3534	evthread_start IO::AIO::poll_fileno;
3411	my $guard = freeze_mainloop;	3535
		3536	cf::sync_job {
		3537	cf::load_settings;
		3538	cf::load_materials;
		3539
		3540	reload_resources;
3412	reload_config;	3541	reload_config;
3413	db_init;	3542	db_init;
		3543
		3544	cf::init_uuid;
		3545	cf::init_signals;
		3546	cf::init_commands;
		3547	cf::init_skills;
		3548
		3549	cf::init_beforeplay;
		3550
		3551	atomic;
		3552
3414	load_extensions;	3553	load_extensions;
3415		3554
3416	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3555	utime time, time, $RUNTIMEFILE;
3417	evthread_start IO::AIO::poll_fileno;	3556
		3557	# no (long-running) fork's whatsoever before this point(!)
		3558	use POSIX ();
		3559	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
		3560
		3561	(pop @POST_INIT)->(0) while @POST_INIT;
3418	}	3562	};
3419		3563
3420	EV::loop;	3564	main_loop;
3421	}	3565	}
3422		3566
3423	#############################################################################	3567	#############################################################################
3424	# initialisation and cleanup	3568	# initialisation and cleanup
3425		3569
…		…
3432	};	3576	};
3433	}	3577	}
3434	}	3578	}
3435		3579
3436	sub write_runtime_sync {	3580	sub write_runtime_sync {
3437	my $runtime = "$LOCALDIR/runtime";	3581	my $t0 = EV::time;
3438		3582
3439	# first touch the runtime file to show we are still running:	3583	# first touch the runtime file to show we are still running:
3440	# the fsync below can take a very very long time.	3584	# the fsync below can take a very very long time.
3441		3585
3442	IO::AIO::aio_utime $runtime, undef, undef;	3586	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3443		3587
3444	my $guard = cf::lock_acquire "write_runtime";	3588	my $guard = cf::lock_acquire "write_runtime";
3445		3589
3446	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	3590	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3447	or return;	3591	or return;
3448		3592
3449	my $value = $cf::RUNTIME + 90 + 10;	3593	my $value = $cf::RUNTIME + 90 + 10;
3450	# 10 is the runtime save interval, for a monotonic clock	3594	# 10 is the runtime save interval, for a monotonic clock
3451	# 60 allows for the watchdog to kill the server.	3595	# 60 allows for the watchdog to kill the server.
…		…
3461	aio_utime $fh, undef, undef;	3605	aio_utime $fh, undef, undef;
3462		3606
3463	close $fh	3607	close $fh
3464	or return;	3608	or return;
3465		3609
3466	aio_rename "$runtime~", $runtime	3610	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3467	and return;	3611	and return;
3468		3612
3469	warn "runtime file written.\n";	3613	warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3470		3614
3471	1	3615	1
3472	}	3616	}
3473		3617
3474	our $uuid_lock;	3618	our $uuid_lock;
…		…
3483	my $uuid = "$LOCALDIR/uuid";	3627	my $uuid = "$LOCALDIR/uuid";
3484		3628
3485	my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644	3629	my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3486	or return;	3630	or return;
3487		3631
3488	my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;	3632	my $value = uuid_seq uuid_cur;
		3633
		3634	unless ($value) {
		3635	warn "cowardly refusing to write zero uuid value!\n";
		3636	return;
		3637	}
		3638
		3639	my $value = uuid_str $value + $uuid_skip;
3489	$uuid_skip = 0;	3640	$uuid_skip = 0;
3490		3641
3491	(aio_write $fh, 0, (length $value), $value, 0) <= 0	3642	(aio_write $fh, 0, (length $value), $value, 0) <= 0
3492	and return;	3643	and return;
3493		3644
…		…
3515	}	3666	}
3516		3667
3517	sub emergency_save() {	3668	sub emergency_save() {
3518	my $freeze_guard = cf::freeze_mainloop;	3669	my $freeze_guard = cf::freeze_mainloop;
3519		3670
3520	warn "enter emergency perl save\n";	3671	warn "emergency_perl_save: enter\n";
3521		3672
3522	cf::sync_job {	3673	cf::sync_job {
		3674	# this is a trade-off: we want to be very quick here, so
		3675	# save all maps without fsync, and later call a global sync
		3676	# (which in turn might be very very slow)
		3677	local $USE_FSYNC = 0;
		3678
3523	# use a peculiar iteration method to avoid tripping on perl	3679	# use a peculiar iteration method to avoid tripping on perl
3524	# refcount bugs in for. also avoids problems with players	3680	# refcount bugs in for. also avoids problems with players
3525	# and maps saved/destroyed asynchronously.	3681	# and maps saved/destroyed asynchronously.
3526	warn "begin emergency player save\n";	3682	warn "emergency_perl_save: begin player save\n";
3527	for my $login (keys %cf::PLAYER) {	3683	for my $login (keys %cf::PLAYER) {
3528	my $pl = $cf::PLAYER{$login} or next;	3684	my $pl = $cf::PLAYER{$login} or next;
3529	$pl->valid or next;	3685	$pl->valid or next;
3530	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3686	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3531	$pl->save;	3687	$pl->save;
3532	}	3688	}
3533	warn "end emergency player save\n";	3689	warn "emergency_perl_save: end player save\n";
3534		3690
3535	warn "begin emergency map save\n";	3691	warn "emergency_perl_save: begin map save\n";
3536	for my $path (keys %cf::MAP) {	3692	for my $path (keys %cf::MAP) {
3537	my $map = $cf::MAP{$path} or next;	3693	my $map = $cf::MAP{$path} or next;
3538	$map->valid or next;	3694	$map->valid or next;
3539	$map->save;	3695	$map->save;
3540	}	3696	}
3541	warn "end emergency map save\n";	3697	warn "emergency_perl_save: end map save\n";
3542		3698
3543	warn "begin emergency database checkpoint\n";	3699	warn "emergency_perl_save: begin database checkpoint\n";
3544	BDB::db_env_txn_checkpoint $DB_ENV;	3700	BDB::db_env_txn_checkpoint $DB_ENV;
3545	warn "end emergency database checkpoint\n";	3701	warn "emergency_perl_save: end database checkpoint\n";
3546		3702
3547	warn "begin write uuid\n";	3703	warn "emergency_perl_save: begin write uuid\n";
3548	write_uuid_sync 1;	3704	write_uuid_sync 1;
3549	warn "end write uuid\n";	3705	warn "emergency_perl_save: end write uuid\n";
3550	};	3706	};
3551		3707
		3708	warn "emergency_perl_save: starting sync()\n";
		3709	IO::AIO::aio_sync sub {
		3710	warn "emergency_perl_save: finished sync()\n";
		3711	};
		3712
3552	warn "leave emergency perl save\n";	3713	warn "emergency_perl_save: leave\n";
3553	}	3714	}
3554		3715
3555	sub post_cleanup {	3716	sub post_cleanup {
3556	my ($make_core) = @_;	3717	my ($make_core) = @_;
3557		3718
3558	warn Carp::longmess "post_cleanup backtrace"	3719	warn Carp::longmess "post_cleanup backtrace"
3559	if $make_core;	3720	if $make_core;
		3721
		3722	my $fh = pidfile;
		3723	unlink $PIDFILE if <$fh> == $$;
		3724	}
		3725
		3726	# a safer delete_package, copied from Symbol
		3727	sub clear_package($) {
		3728	my $pkg = shift;
		3729
		3730	# expand to full symbol table name if needed
		3731	unless ($pkg =~ /^main::.*::$/) {
		3732	$pkg = "main$pkg" if $pkg =~ /^::/;
		3733	$pkg = "main::$pkg" unless $pkg =~ /^main::/;
		3734	$pkg .= '::' unless $pkg =~ /::$/;
		3735	}
		3736
		3737	my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
		3738	my $stem_symtab = *{$stem}{HASH};
		3739
		3740	defined $stem_symtab and exists $stem_symtab->{$leaf}
		3741	or return;
		3742
		3743	# clear all symbols
		3744	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
		3745	for my $name (keys %$leaf_symtab) {
		3746	_gv_clear *{"$pkg$name"};
		3747	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
		3748	}
		3749	warn "cleared package $pkg\n";#d#
3560	}	3750	}
3561		3751
3562	sub do_reload_perl() {	3752	sub do_reload_perl() {
3563	# can/must only be called in main	3753	# can/must only be called in main
3564	if ($Coro::current != $Coro::main) {	3754	if ($Coro::current != $Coro::main) {
3565	warn "can only reload from main coroutine";	3755	warn "can only reload from main coroutine";
3566	return;	3756	return;
3567	}	3757	}
3568		3758
		3759	return if $RELOAD++;
		3760
		3761	my $t1 = EV::time;
		3762
		3763	while ($RELOAD) {
3569	warn "reloading...";	3764	warn "reloading...";
3570		3765
3571	warn "entering sync_job";	3766	warn "entering sync_job";
3572		3767
3573	cf::sync_job {	3768	cf::sync_job {
3574	cf::write_runtime_sync; # external watchdog should not bark	3769	cf::write_runtime_sync; # external watchdog should not bark
3575	cf::emergency_save;	3770	cf::emergency_save;
3576	cf::write_runtime_sync; # external watchdog should not bark	3771	cf::write_runtime_sync; # external watchdog should not bark
3577		3772
3578	warn "syncing database to disk";	3773	warn "syncing database to disk";
3579	BDB::db_env_txn_checkpoint $DB_ENV;	3774	BDB::db_env_txn_checkpoint $DB_ENV;
3580		3775
3581	# if anything goes wrong in here, we should simply crash as we already saved	3776	# if anything goes wrong in here, we should simply crash as we already saved
3582		3777
3583	warn "flushing outstanding aio requests";	3778	warn "flushing outstanding aio requests";
3584	for (;;) {
3585	BDB::flush;
3586	IO::AIO::flush;
3587	Coro::cede_notself;
3588	last unless IO::AIO::nreqs || BDB::nreqs;	3779	while (IO::AIO::nreqs || BDB::nreqs) {
3589	warn "iterate...";	3780	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3590	}
3591
3592	++$RELOAD;
3593
3594	warn "cancelling all extension coros";
3595	$_->cancel for values %EXT_CORO;
3596	%EXT_CORO = ();
3597
3598	warn "removing commands";
3599	%COMMAND = ();
3600
3601	warn "removing ext/exti commands";
3602	%EXTCMD = ();
3603	%EXTICMD = ();
3604
3605	warn "unloading/nuking all extensions";
3606	for my $pkg (@EXTS) {
3607	warn "... unloading $pkg";
3608
3609	if (my $cb = $pkg->can ("unload")) {
3610	eval {
3611	$cb->($pkg);
3612	1
3613	} or warn "$pkg unloaded, but with errors: $@";
3614	}	3781	}
3615		3782
3616	warn "... nuking $pkg";	3783	warn "cancelling all extension coros";
3617	Symbol::delete_package $pkg;	3784	$_->cancel for values %EXT_CORO;
3618	}	3785	%EXT_CORO = ();
3619		3786
3620	warn "unloading all perl modules loaded from $LIBDIR";	3787	warn "removing commands";
3621	while (my ($k, $v) = each %INC) {	3788	%COMMAND = ();
3622	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3623		3789
		3790	warn "removing ext/exti commands";
		3791	%EXTCMD = ();
		3792	%EXTICMD = ();
		3793
		3794	warn "unloading/nuking all extensions";
		3795	for my $pkg (@EXTS) {
3624	warn "... unloading $k";	3796	warn "... unloading $pkg";
3625	delete $INC{$k};
3626		3797
3627	$k =~ s/\.pm$//;
3628	$k =~ s/\//::/g;
3629
3630	if (my $cb = $k->can ("unload_module")) {	3798	if (my $cb = $pkg->can ("unload")) {
		3799	eval {
3631	$cb->();	3800	$cb->($pkg);
		3801	1
		3802	} or warn "$pkg unloaded, but with errors: $@";
		3803	}
		3804
		3805	warn "... clearing $pkg";
		3806	clear_package $pkg;
3632	}	3807	}
3633		3808
3634	Symbol::delete_package $k;	3809	warn "unloading all perl modules loaded from $LIBDIR";
		3810	while (my ($k, $v) = each %INC) {
		3811	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
		3812
		3813	warn "... unloading $k";
		3814	delete $INC{$k};
		3815
		3816	$k =~ s/\.pm$//;
		3817	$k =~ s/\//::/g;
		3818
		3819	if (my $cb = $k->can ("unload_module")) {
		3820	$cb->();
		3821	}
		3822
		3823	clear_package $k;
3635	}	3824	}
3636		3825
3637	warn "getting rid of safe::, as good as possible";	3826	warn "getting rid of safe::, as good as possible";
3638	Symbol::delete_package "safe::$_"	3827	clear_package "safe::$_"
3639	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3828	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3640		3829
3641	warn "unloading cf.pm \"a bit\"";	3830	warn "unloading cf.pm \"a bit\"";
3642	delete $INC{"cf.pm"};	3831	delete $INC{"cf.pm"};
3643	delete $INC{"cf/pod.pm"};	3832	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3644		3833
3645	# don't, removes xs symbols, too,	3834	# don't, removes xs symbols, too,
3646	# and global variables created in xs	3835	# and global variables created in xs
3647	#Symbol::delete_package __PACKAGE__;	3836	#clear_package __PACKAGE__;
3648		3837
3649	warn "unload completed, starting to reload now";	3838	warn "unload completed, starting to reload now";
3650		3839
3651	warn "reloading cf.pm";	3840	warn "reloading cf.pm";
3652	require cf;	3841	require cf;
3653	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3842	cf::_connect_to_perl_1;
3654		3843
3655	warn "loading config and database again";	3844	warn "loading config and database again";
3656	cf::reload_config;	3845	cf::reload_config;
3657		3846
3658	warn "loading extensions";	3847	warn "loading extensions";
3659	cf::load_extensions;	3848	cf::load_extensions;
3660		3849
		3850	if ($REATTACH_ON_RELOAD) {
3661	warn "reattaching attachments to objects/players";	3851	warn "reattaching attachments to objects/players";
3662	_global_reattach; # objects, sockets	3852	_global_reattach; # objects, sockets
3663	warn "reattaching attachments to maps";	3853	warn "reattaching attachments to maps";
3664	reattach $_ for values %MAP;	3854	reattach $_ for values %MAP;
3665	warn "reattaching attachments to players";	3855	warn "reattaching attachments to players";
3666	reattach $_ for values %PLAYER;	3856	reattach $_ for values %PLAYER;
		3857	}
3667		3858
		3859	warn "running post_init jobs";
		3860	(pop @POST_INIT)->(1) while @POST_INIT;
		3861
3668	warn "leaving sync_job";	3862	warn "leaving sync_job";
3669		3863
3670	1	3864	1
3671	} or do {	3865	} or do {
3672	warn $@;	3866	warn $@;
3673	cf::cleanup "error while reloading, exiting.";	3867	cf::cleanup "error while reloading, exiting.";
3674	};	3868	};
3675		3869
3676	warn "reloaded";	3870	warn "reloaded";
		3871	--$RELOAD;
		3872	}
		3873
		3874	$t1 = EV::time - $t1;
		3875	warn "reload completed in ${t1}s\n";
3677	};	3876	};
3678		3877
3679	our $RELOAD_WATCHER; # used only during reload	3878	our $RELOAD_WATCHER; # used only during reload
3680		3879
3681	sub reload_perl() {	3880	sub reload_perl() {
3682	# doing reload synchronously and two reloads happen back-to-back,	3881	# doing reload synchronously and two reloads happen back-to-back,
3683	# coro crashes during coro_state_free->destroy here.	3882	# coro crashes during coro_state_free->destroy here.
3684		3883
		3884	$RELOAD_WATCHER ||= cf::async {
		3885	Coro::AIO::aio_wait cache_extensions;
		3886
3685	$RELOAD_WATCHER ||= EV::timer 0, 0, sub {	3887	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3686	do_reload_perl;	3888	do_reload_perl;
3687	undef $RELOAD_WATCHER;	3889	undef $RELOAD_WATCHER;
		3890	};
3688	};	3891	};
3689	}	3892	}
3690		3893
3691	register_command "reload" => sub {	3894	register_command "reload" => sub {
3692	my ($who, $arg) = @_;	3895	my ($who, $arg) = @_;
…		…
3706		3909
3707	our @WAIT_FOR_TICK;	3910	our @WAIT_FOR_TICK;
3708	our @WAIT_FOR_TICK_BEGIN;	3911	our @WAIT_FOR_TICK_BEGIN;
3709		3912
3710	sub wait_for_tick {	3913	sub wait_for_tick {
3711	return if tick_inhibit || $Coro::current == $Coro::main;	3914	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3712		3915
3713	my $signal = new Coro::Signal;	3916	my $signal = new Coro::Signal;
3714	push @WAIT_FOR_TICK, $signal;	3917	push @WAIT_FOR_TICK, $signal;
3715	$signal->wait;	3918	$signal->wait;
3716	}	3919	}
3717		3920
3718	sub wait_for_tick_begin {	3921	sub wait_for_tick_begin {
3719	return if tick_inhibit || $Coro::current == $Coro::main;	3922	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3720		3923
3721	my $signal = new Coro::Signal;	3924	my $signal = new Coro::Signal;
3722	push @WAIT_FOR_TICK_BEGIN, $signal;	3925	push @WAIT_FOR_TICK_BEGIN, $signal;
3723	$signal->wait;	3926	$signal->wait;
3724	}	3927	}
…		…
3729	unless ++$bug_warning > 10;	3932	unless ++$bug_warning > 10;
3730	return;	3933	return;
3731	}	3934	}
3732		3935
3733	cf::server_tick; # one server iteration	3936	cf::server_tick; # one server iteration
		3937
		3938	#for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3734		3939
3735	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3940	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3736	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	3941	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3737	Coro::async_pool {	3942	Coro::async_pool {
3738	$Coro::current->{desc} = "runtime saver";	3943	$Coro::current->{desc} = "runtime saver";
…		…
3761	}	3966	}
3762		3967
3763	{	3968	{
3764	# configure BDB	3969	# configure BDB
3765		3970
3766	BDB::min_parallel 8;	3971	BDB::min_parallel 16;
3767	BDB::max_poll_reqs $TICK * 0.1;	3972	BDB::max_poll_reqs $TICK * 0.1;
3768	$Coro::BDB::WATCHER->priority (1);	3973	$AnyEvent::BDB::WATCHER->priority (1);
3769		3974
3770	unless ($DB_ENV) {	3975	unless ($DB_ENV) {
3771	$DB_ENV = BDB::db_env_create;	3976	$DB_ENV = BDB::db_env_create;
3772	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC	3977	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3773	| BDB::LOG_AUTOREMOVE, 1);	3978	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
		3979	$DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3774	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);	3980	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3775	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);	3981	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3776		3982
3777	cf::sync_job {	3983	cf::sync_job {
3778	eval {	3984	eval {
…		…
3804	{	4010	{
3805	# configure IO::AIO	4011	# configure IO::AIO
3806		4012
3807	IO::AIO::min_parallel 8;	4013	IO::AIO::min_parallel 8;
3808	IO::AIO::max_poll_time $TICK * 0.1;	4014	IO::AIO::max_poll_time $TICK * 0.1;
3809	$Coro::AIO::WATCHER->priority (1);	4015	undef $AnyEvent::AIO::WATCHER;
3810	}	4016	}
3811		4017
3812	my $_log_backtrace;	4018	my $_log_backtrace;
3813		4019
3814	sub _log_backtrace {	4020	sub _log_backtrace {
…		…
3817	$msg =~ s/\n//;	4023	$msg =~ s/\n//;
3818		4024
3819	# limit the # of concurrent backtraces	4025	# limit the # of concurrent backtraces
3820	if ($_log_backtrace < 2) {	4026	if ($_log_backtrace < 2) {
3821	++$_log_backtrace;	4027	++$_log_backtrace;
		4028	my $perl_bt = Carp::longmess $msg;
3822	async {	4029	async {
3823	$Coro::current->{desc} = "abt $msg";	4030	$Coro::current->{desc} = "abt $msg";
3824		4031
3825	my @bt = fork_call {	4032	my @bt = fork_call {
3826	@addr = map { sprintf "%x", $_ } @addr;	4033	@addr = map { sprintf "%x", $_ } @addr;
…		…
3837	}	4044	}
3838		4045
3839	@funcs	4046	@funcs
3840	};	4047	};
3841		4048
3842	LOG llevInfo, "[ABT] $msg\n";	4049	LOG llevInfo, "[ABT] $perl_bt\n";
		4050	LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3843	LOG llevInfo, "[ABT] $_\n" for @bt;	4051	LOG llevInfo, "[ABT] $_\n" for @bt;
3844	--$_log_backtrace;	4052	--$_log_backtrace;
3845	};	4053	};
3846	} else {	4054	} else {
3847	LOG llevInfo, "[ABT] $msg\n";	4055	LOG llevInfo, "[ABT] $msg\n";
3848	LOG llevInfo, "[ABT] [suppressed]\n";	4056	LOG llevInfo, "[ABT] [suppressed]\n";
3849	}	4057	}
3850	}	4058	}
3851		4059
3852	# load additional modules	4060	# load additional modules
3853	use cf::pod;	4061	require "cf/$_.pm" for @EXTRA_MODULES;
		4062	cf::_connect_to_perl_2;
3854		4063
3855	END { cf::emergency_save }	4064	END { cf::emergency_save }
3856		4065
3857	1	4066	1
3858		4067

Diff Legend

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