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.292 by root, Tue Jul 3 00:54:57 2007 UTC vs.
Revision 1.541 by root, Tue May 4 23:33:16 2010 UTC

		1	#
		2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
		3	#
		4	# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
		5	#
		6	# Deliantra is free software: you can redistribute it and/or modify it under
		7	# the terms of the Affero GNU General Public License as published by the
		8	# Free Software Foundation, either version 3 of the License, or (at your
		9	# option) any later version.
		10	#
		11	# This program is distributed in the hope that it will be useful,
		12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		14	# GNU General Public License for more details.
		15	#
		16	# You should have received a copy of the Affero GNU General Public License
		17	# and the GNU General Public License along with this program. If not, see
		18	# <http://www.gnu.org/licenses/>.
		19	#
		20	# The authors can be reached via e-mail to <support@deliantra.net>
		21	#
		22
1	package cf;	23	package cf;
2		24
3	use utf8;	25	use common::sense;
4	use strict;
5		26
6	use Symbol;	27	use Symbol;
7	use List::Util;	28	use List::Util;
8	use Socket;	29	use Socket;
9	use Storable;	30	use EV;
10	use Event;
11	use Opcode;	31	use Opcode;
12	use Safe;	32	use Safe;
13	use Safe::Hole;	33	use Safe::Hole;
		34	use Storable ();
		35	use Carp ();
14		36
		37	use Guard ();
15	use Coro 3.61 ();	38	use Coro ();
16	use Coro::State;	39	use Coro::State;
17	use Coro::Handle;	40	use Coro::Handle;
		41	use Coro::EV;
18	use Coro::Event;	42	use Coro::AnyEvent;
19	use Coro::Timer;	43	use Coro::Timer;
20	use Coro::Signal;	44	use Coro::Signal;
21	use Coro::Semaphore;	45	use Coro::Semaphore;
		46	use Coro::SemaphoreSet;
		47	use Coro::AnyEvent;
22	use Coro::AIO;	48	use Coro::AIO;
		49	use Coro::BDB 1.6;
23	use Coro::Storable;	50	use Coro::Storable;
		51	use Coro::Util ();
24		52
25	use JSON::XS 1.4 ();	53	use JSON::XS 2.01 ();
26	use BDB ();	54	use BDB ();
27	use Data::Dumper;	55	use Data::Dumper;
28	use Digest::MD5;
29	use Fcntl;	56	use Fcntl;
30	use YAML::Syck ();	57	use YAML::XS ();
31	use IO::AIO 2.32 ();	58	use IO::AIO ();
32	use Time::HiRes;	59	use Time::HiRes;
33	use Compress::LZF;	60	use Compress::LZF;
		61	use Digest::MD5 ();
		62
		63	AnyEvent::detect;
34		64
35	# configure various modules to our taste	65	# configure various modules to our taste
36	#	66	#
37	$Storable::canonical = 1; # reduce rsync transfers	67	$Storable::canonical = 1; # reduce rsync transfers
38	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	68	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
		69
		70	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
		71
		72	# make sure c-lzf reinitialises itself
		73	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
39	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	74	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
40		75
41	$Event::Eval = 1; # no idea why this is required, but it is	76	# strictly for debugging
42		77	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
43	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44	$YAML::Syck::ImplicitUnicode = 1;
45
46	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47		78
48	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	79	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
		80
		81	our @ORIG_INC;
49		82
50	our %COMMAND = ();	83	our %COMMAND = ();
51	our %COMMAND_TIME = ();	84	our %COMMAND_TIME = ();
52		85
53	our @EXTS = (); # list of extension package names	86	our @EXTS = (); # list of extension package names
54	our %EXTCMD = ();	87	our %EXTCMD = ();
55	our %EXTICMD = ();	88	our %EXTICMD = ();
56	our %EXT_CORO = (); # coroutines bound to extensions	89	our %EXT_CORO = (); # coroutines bound to extensions
57	our %EXT_MAP = (); # pluggable maps	90	our %EXT_MAP = (); # pluggable maps
58		91
59	our $RELOAD; # number of reloads so far	92	our $RELOAD; # number of reloads so far, non-zero while in reload
60	our @EVENT;	93	our @EVENT;
		94	our @REFLECT; # set by XS
		95	our %REFLECT; # set by us
61		96
62	our $CONFDIR = confdir;	97	our $CONFDIR = confdir;
63	our $DATADIR = datadir;	98	our $DATADIR = datadir;
64	our $LIBDIR = "$DATADIR/ext";	99	our $LIBDIR = "$DATADIR/ext";
65	our $PODDIR = "$DATADIR/pod";	100	our $PODDIR = "$DATADIR/pod";
66	our $MAPDIR = "$DATADIR/" . mapdir;	101	our $MAPDIR = "$DATADIR/" . mapdir;
67	our $LOCALDIR = localdir;	102	our $LOCALDIR = localdir;
68	our $TMPDIR = "$LOCALDIR/" . tmpdir;	103	our $TMPDIR = "$LOCALDIR/" . tmpdir;
69	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71	our $RANDOMDIR = "$LOCALDIR/random";	106	our $RANDOMDIR = "$LOCALDIR/random";
72	our $BDBDIR = "$LOCALDIR/db";	107	our $BDBDIR = "$LOCALDIR/db";
		108	our $PIDFILE = "$LOCALDIR/pid";
		109	our $RUNTIMEFILE = "$LOCALDIR/runtime";
		110
		111	our %RESOURCE; # unused
		112
		113	our $OUTPUT_RATE_MIN = 3000;
		114	our $OUTPUT_RATE_MAX = 1000000;
		115
		116	our $MAX_LINKS = 32; # how many chained exits to follow
		117	our $VERBOSE_IO = 1;
73		118
74	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	119	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75	our $TICK_WATCHER;
76	our $AIO_POLL_WATCHER;
77	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	120	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78	our $NEXT_TICK;	121	our $NEXT_TICK;
79	our $NOW;
80	our $USE_FSYNC = 1; # use fsync to write maps - default off	122	our $USE_FSYNC = 1; # use fsync to write maps - default on
81		123
		124	our $BDB_DEADLOCK_WATCHER;
		125	our $BDB_CHECKPOINT_WATCHER;
82	our $BDB_POLL_WATCHER;	126	our $BDB_TRICKLE_WATCHER;
83	our $DB_ENV;	127	our $DB_ENV;
		128
		129	our @EXTRA_MODULES = qw(pod match mapscript);
84		130
85	our %CFG;	131	our %CFG;
86		132
87	our $UPTIME; $UPTIME ||= time;	133	our $UPTIME; $UPTIME ||= time;
88	our $RUNTIME;	134	our $RUNTIME;
		135	our $NOW;
89		136
90	our %PLAYER; # all users	137	our (%PLAYER, %PLAYER_LOADING); # all users
91	our %MAP; # all maps	138	our (%MAP, %MAP_LOADING ); # all maps
92	our $LINK_MAP; # the special {link} map, which is always available	139	our $LINK_MAP; # the special {link} map, which is always available
93		140
94	# used to convert map paths into valid unix filenames by replacing / by ∕	141	# used to convert map paths into valid unix filenames by replacing / by ∕
95	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	142	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96		143
97	our $LOAD; # a number between 0 (idle) and 1 (too many objects)	144	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98	our $LOADAVG; # same thing, but with alpha-smoothing	145	our $LOADAVG; # same thing, but with alpha-smoothing
		146	our $JITTER; # average jitter
99	our $tick_start; # for load detecting purposes	147	our $TICK_START; # for load detecting purposes
		148
		149	our @POST_INIT;
		150
		151	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
		152	our $REALLY_UNLOOP; # never set to true, please :)
100		153
101	binmode STDOUT;	154	binmode STDOUT;
102	binmode STDERR;	155	binmode STDERR;
103		156
104	# read virtual server time, if available	157	# read virtual server time, if available
105	unless ($RUNTIME || !-e "$LOCALDIR/runtime") {	158	unless ($RUNTIME || !-e $RUNTIMEFILE) {
106	open my $fh, "<", "$LOCALDIR/runtime"	159	open my $fh, "<", $RUNTIMEFILE
107	or die "unable to read runtime file: $!";	160	or die "unable to read $RUNTIMEFILE file: $!";
108	$RUNTIME = <$fh> + 0.;	161	$RUNTIME = <$fh> + 0.;
109	}	162	}
		163
		164	eval "sub TICK() { $TICK } 1" or die;
110		165
111	mkdir $_	166	mkdir $_
112	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	167	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
113		168
114	our $EMERGENCY_POSITION;	169	our $EMERGENCY_POSITION;
115		170
116	sub cf::map::normalise;	171	sub cf::map::normalise;
		172
		173	sub in_main() {
		174	$Coro::current == $Coro::main
		175	}
		176
		177	#############################################################################
		178
		179	%REFLECT = ();
		180	for (@REFLECT) {
		181	my $reflect = JSON::XS::decode_json $_;
		182	$REFLECT{$reflect->{class}} = $reflect;
		183	}
		184
		185	# this is decidedly evil
		186	$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
117		187
118	#############################################################################	188	#############################################################################
119		189
120	=head2 GLOBAL VARIABLES	190	=head2 GLOBAL VARIABLES
121		191
…		…
157		227
158	The raw value load value from the last tick.	228	The raw value load value from the last tick.
159		229
160	=item %cf::CFG	230	=item %cf::CFG
161		231
162	Configuration for the server, loaded from C</etc/crossfire/config>, or	232	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163	from wherever your confdir points to.	233	from wherever your confdir points to.
164		234
165	=item cf::wait_for_tick, cf::wait_for_tick_begin	235	=item cf::wait_for_tick, cf::wait_for_tick_begin
166		236
167	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	237	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168	returns directly I<after> the tick processing (and consequently, can only wake one process	238	returns directly I<after> the tick processing (and consequently, can only wake one process
169	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	239	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
170		240
		241	=item @cf::INVOKE_RESULTS
		242
		243	This array contains the results of the last C<invoke ()> call. When
		244	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
		245	that call.
		246
		247	=item %cf::REFLECT
		248
		249	Contains, for each (C++) class name, a hash reference with information
		250	about object members (methods, scalars, arrays and flags) and other
		251	metadata, which is useful for introspection.
		252
171	=back	253	=back
172		254
173	=cut	255	=cut
174		256
175	BEGIN {	257	sub error(@) { LOG llevError, join "", @_ }
176	*CORE::GLOBAL::warn = sub {	258	sub warn (@) { LOG llevWarn , join "", @_ }
		259	sub info (@) { LOG llevInfo , join "", @_ }
		260	sub debug(@) { LOG llevDebug, join "", @_ }
		261	sub trace(@) { LOG llevTrace, join "", @_ }
		262
		263	$Coro::State::WARNHOOK = sub {
177	my $msg = join "", @_;	264	my $msg = join "", @_;
178		265
179	$msg .= "\n"	266	$msg .= "\n"
180	unless $msg =~ /\n$/;	267	unless $msg =~ /\n$/;
181		268
182	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	269	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183		270
184	utf8::encode $msg;
185	LOG llevError, $msg;	271	LOG llevWarn, $msg;
186	};	272	};
187	}	273
		274	$Coro::State::DIEHOOK = sub {
		275	return unless $^S eq 0; # "eq", not "=="
		276
		277	error Carp::longmess $_[0];
		278
		279	if (in_main) {#d#
		280	error "DIEHOOK called in main context, Coro bug?\n";#d#
		281	return;#d#
		282	}#d#
		283
		284	# kill coroutine otherwise
		285	Coro::terminate
		286	};
188		287
189	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	288	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	289	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	290	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	291	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
199	for my $pkg (qw(	298	for my $pkg (qw(
200	cf::global cf::attachable	299	cf::global cf::attachable
201	cf::object cf::object::player	300	cf::object cf::object::player
202	cf::client cf::player	301	cf::client cf::player
203	cf::arch cf::living	302	cf::arch cf::living
		303	cf::map cf::mapspace
204	cf::map cf::party cf::region	304	cf::party cf::region
205	)) {	305	)) {
206	no strict 'refs';
207	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	306	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208	}	307	}
209		308
210	$Event::DIED = sub {	309	$EV::DIED = sub {
211	warn "error in event callback: @_";	310	Carp::cluck "error in event callback: @_";
212	};	311	};
213		312
214	#############################################################################	313	#############################################################################
215		314
216	=head2 UTILITY FUNCTIONS	315	=head2 UTILITY FUNCTIONS
…		…
238	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	337	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
239	$d	338	$d
240	} || "[unable to dump $_[0]: '$@']";	339	} || "[unable to dump $_[0]: '$@']";
241	}	340	}
242		341
243	=item $ref = cf::from_json $json	342	=item $ref = cf::decode_json $json
244		343
245	Converts a JSON string into the corresponding perl data structure.	344	Converts a JSON string into the corresponding perl data structure.
246		345
247	=item $json = cf::to_json $ref	346	=item $json = cf::encode_json $ref
248		347
249	Converts a perl data structure into its JSON representation.	348	Converts a perl data structure into its JSON representation.
250		349
251	=cut	350	=cut
252		351
253	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	352	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254		353
255	sub to_json ($) { $json_coder->encode ($_[0]) }	354	sub encode_json($) { $json_coder->encode ($_[0]) }
256	sub from_json ($) { $json_coder->decode ($_[0]) }	355	sub decode_json($) { $json_coder->decode ($_[0]) }
		356
		357	=item cf::post_init { BLOCK }
		358
		359	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
		360	but I<before> the server starts ticking again.
		361
		362	The cdoeblock will have a single boolean argument to indicate whether this
		363	is a reload or not.
		364
		365	=cut
		366
		367	sub post_init(&) {
		368	push @POST_INIT, shift;
		369	}
257		370
258	=item cf::lock_wait $string	371	=item cf::lock_wait $string
259		372
260	Wait until the given lock is available. See cf::lock_acquire.	373	Wait until the given lock is available. See cf::lock_acquire.
261		374
262	=item my $lock = cf::lock_acquire $string	375	=item my $lock = cf::lock_acquire $string
263		376
264	Wait until the given lock is available and then acquires it and returns	377	Wait until the given lock is available and then acquires it and returns
265	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	378	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
266	for example when the coroutine gets canceled), the lock is automatically	379	for example when the coroutine gets canceled), the lock is automatically
267	returned.	380	returned.
268		381
		382	Locks are *not* recursive, locking from the same coro twice results in a
		383	deadlocked coro.
		384
269	Lock names should begin with a unique identifier (for example, cf::map::find	385	Lock names should begin with a unique identifier (for example, cf::map::find
270	uses map_find and cf::map::load uses map_load).	386	uses map_find and cf::map::load uses map_load).
271		387
272	=item $locked = cf::lock_active $string	388	=item $locked = cf::lock_active $string
273		389
274	Return true if the lock is currently active, i.e. somebody has locked it.	390	Return true if the lock is currently active, i.e. somebody has locked it.
275		391
276	=cut	392	=cut
277		393
278	our %LOCK;	394	our $LOCKS = new Coro::SemaphoreSet;
279		395
280	sub lock_wait($) {	396	sub lock_wait($) {
281	my ($key) = @_;	397	$LOCKS->wait ($_[0]);
282
283	# wait for lock, if any
284	while ($LOCK{$key}) {
285	push @{ $LOCK{$key} }, $Coro::current;
286	Coro::schedule;
287	}
288	}	398	}
289		399
290	sub lock_acquire($) {	400	sub lock_acquire($) {
291	my ($key) = @_;	401	$LOCKS->guard ($_[0])
292
293	# wait, to be sure we are not locked
294	lock_wait $key;
295
296	$LOCK{$key} = [];
297
298	Coro::guard {
299	# wake up all waiters, to be on the safe side
300	$_->ready for @{ delete $LOCK{$key} };
301	}
302	}	402	}
303		403
304	sub lock_active($) {	404	sub lock_active($) {
305	my ($key) = @_;	405	$LOCKS->count ($_[0]) < 1
306
307	! ! $LOCK{$key}
308	}	406	}
309		407
310	sub freeze_mainloop {	408	sub freeze_mainloop {
311	return unless $TICK_WATCHER->is_active;	409	tick_inhibit_inc;
312		410
313	my $guard = Coro::guard {	411	&Guard::guard (\&tick_inhibit_dec);
314	$TICK_WATCHER->start;	412	}
		413
		414	=item cf::periodic $interval, $cb
		415
		416	Like EV::periodic, but randomly selects a starting point so that the actions
		417	get spread over time.
		418
		419	=cut
		420
		421	sub periodic($$) {
		422	my ($interval, $cb) = @_;
		423
		424	my $start = rand List::Util::min 180, $interval;
		425
		426	EV::periodic $start, $interval, 0, $cb
		427	}
		428
		429	=item cf::get_slot $time[, $priority[, $name]]
		430
		431	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		432	This call blocks and returns only when you have at least C<$time> seconds
		433	of cpu time till the next tick. The slot is only valid till the next cede.
		434
		435	The optional C<$name> can be used to identify the job to run. It might be
		436	used for statistical purposes and should identify the same time-class.
		437
		438	Useful for short background jobs.
		439
		440	=cut
		441
		442	our @SLOT_QUEUE;
		443	our $SLOT_QUEUE;
		444	our $SLOT_DECAY = 0.9;
		445
		446	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		447	$SLOT_QUEUE = Coro::async {
		448	$Coro::current->desc ("timeslot manager");
		449
		450	my $signal = new Coro::Signal;
		451	my $busy;
		452
		453	while () {
		454	next_job:
		455
		456	my $avail = cf::till_tick;
		457
		458	for (0 .. $#SLOT_QUEUE) {
		459	if ($SLOT_QUEUE[$_][0] <= $avail) {
		460	$busy = 0;
		461	my $job = splice @SLOT_QUEUE, $_, 1, ();
		462	$job->[2]->send;
		463	Coro::cede;
		464	goto next_job;
		465	} else {
		466	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
		467	}
		468	}
		469
		470	if (@SLOT_QUEUE) {
		471	# we do not use wait_for_tick() as it returns immediately when tick is inactive
		472	push @cf::WAIT_FOR_TICK, $signal;
		473	$signal->wait;
		474	} else {
		475	$busy = 0;
		476	Coro::schedule;
		477	}
315	};	478	}
316	$TICK_WATCHER->stop;	479	};
317	$guard	480
		481	sub get_slot($;$$) {
		482	return if tick_inhibit || $Coro::current == $Coro::main;
		483
		484	my ($time, $pri, $name) = @_;
		485
		486	$time = clamp $time, 0.01, $TICK * .6;
		487
		488	my $sig = new Coro::Signal;
		489
		490	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		491	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		492	$SLOT_QUEUE->ready;
		493	$sig->wait;
318	}	494	}
319		495
320	=item cf::async { BLOCK }	496	=item cf::async { BLOCK }
321		497
322	Currently the same as Coro::async_pool, meaning you cannot use	498	Currently the same as Coro::async_pool, meaning you cannot use
…		…
327		503
328	BEGIN { *async = \&Coro::async_pool }	504	BEGIN { *async = \&Coro::async_pool }
329		505
330	=item cf::sync_job { BLOCK }	506	=item cf::sync_job { BLOCK }
331		507
332	The design of Crossfire TRT requires that the main coroutine ($Coro::main)	508	The design of Deliantra requires that the main coroutine ($Coro::main)
333	is always able to handle events or runnable, as Crossfire TRT is only	509	is always able to handle events or runnable, as Deliantra is only
334	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not	510	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
335	acceptable.	511	acceptable.
336		512
337	If it must be done, put the blocking parts into C<sync_job>. This will run	513	If it must be done, put the blocking parts into C<sync_job>. This will run
338	the given BLOCK in another coroutine while waiting for the result. The	514	the given BLOCK in another coroutine while waiting for the result. The
…		…
342	=cut	518	=cut
343		519
344	sub sync_job(&) {	520	sub sync_job(&) {
345	my ($job) = @_;	521	my ($job) = @_;
346		522
347	if ($Coro::current == $Coro::main) {	523	if (in_main) {
348	my $time = Event::time;	524	my $time = AE::time;
349		525
350	# this is the main coro, too bad, we have to block	526	# this is the main coro, too bad, we have to block
351	# till the operation succeeds, freezing the server :/	527	# till the operation succeeds, freezing the server :/
352		528
353	# TODO: use suspend/resume instead	529	#LOG llevError, Carp::longmess "sync job";#d#
354	# (but this is cancel-safe)	530
355	my $freeze_guard = freeze_mainloop;	531	my $freeze_guard = freeze_mainloop;
356		532
357	my $busy = 1;	533	my $busy = 1;
358	my @res;	534	my @res;
359		535
360	(async {	536	(async {
		537	$Coro::current->desc ("sync job coro");
361	@res = eval { $job->() };	538	@res = eval { $job->() };
362	warn $@ if $@;	539	error $@ if $@;
363	undef $busy;	540	undef $busy;
364	})->prio (Coro::PRIO_MAX);	541	})->prio (Coro::PRIO_MAX);
365		542
366	while ($busy) {	543	while ($busy) {
367	Coro::cede or Event::one_event;	544	if (Coro::nready) {
		545	Coro::cede_notself;
		546	} else {
		547	EV::loop EV::LOOP_ONESHOT;
368	}	548	}
		549	}
369		550
370	$time = Event::time - $time;	551	my $time = AE::time - $time;
371		552
372	LOG llevError | logBacktrace, Carp::longmess "long sync job"
373	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374
375	$tick_start += $time; # do not account sync jobs to server load	553	$TICK_START += $time; # do not account sync jobs to server load
376		554
377	wantarray ? @res : $res[0]	555	wantarray ? @res : $res[0]
378	} else {	556	} else {
379	# we are in another coroutine, how wonderful, everything just works	557	# we are in another coroutine, how wonderful, everything just works
380		558
…		…
405	=item fork_call { }, $args	583	=item fork_call { }, $args
406		584
407	Executes the given code block with the given arguments in a seperate	585	Executes the given code block with the given arguments in a seperate
408	process, returning the results. Everything must be serialisable with	586	process, returning the results. Everything must be serialisable with
409	Coro::Storable. May, of course, block. Note that the executed sub may	587	Coro::Storable. May, of course, block. Note that the executed sub may
410	never block itself or use any form of Event handling.	588	never block itself or use any form of event handling.
411		589
412	=cut	590	=cut
413		591
414	sub fork_call(&@) {	592	sub fork_call(&@) {
415	my ($cb, @args) = @_;	593	my ($cb, @args) = @_;
416		594
417	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	595	# we seemingly have to make a local copy of the whole thing,
418	# or die "socketpair: $!";	596	# otherwise perl prematurely frees the stuff :/
419	pipe my $fh1, my $fh2	597	# TODO: investigate and fix (likely this will be rather laborious)
420	or die "pipe: $!";
421		598
422	if (my $pid = fork) {	599	my @res = Coro::Util::fork_eval {
423	close $fh2;
424
425	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426	$res = Coro::Storable::thaw $res;
427
428	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430	die $$res unless "ARRAY" eq ref $res;
431
432	return wantarray ? @$res : $res->[-1];
433	} else {
434	reset_signals;	600	reset_signals;
435	local $SIG{__WARN__};	601	&$cb
436	local $SIG{__DIE__};	602	}, @args;
437	eval {
438	close $fh1;
439		603
440	my @res = eval { $cb->(@args) };	604	wantarray ? @res : $res[-1]
441	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);	605	}
442	};
443		606
444	warn $@ if $@;	607	sub objinfo {
445	_exit 0;
446	}	608	(
		609	"counter value" => cf::object::object_count,
		610	"objects created" => cf::object::create_count,
		611	"objects destroyed" => cf::object::destroy_count,
		612	"freelist size" => cf::object::free_count,
		613	"allocated objects" => cf::object::objects_size,
		614	"active objects" => cf::object::actives_size,
		615	)
		616	}
		617
		618	=item $coin = coin_from_name $name
		619
		620	=cut
		621
		622	our %coin_alias = (
		623	"silver" => "silvercoin",
		624	"silvercoin" => "silvercoin",
		625	"silvercoins" => "silvercoin",
		626	"gold" => "goldcoin",
		627	"goldcoin" => "goldcoin",
		628	"goldcoins" => "goldcoin",
		629	"platinum" => "platinacoin",
		630	"platinumcoin" => "platinacoin",
		631	"platinumcoins" => "platinacoin",
		632	"platina" => "platinacoin",
		633	"platinacoin" => "platinacoin",
		634	"platinacoins" => "platinacoin",
		635	"royalty" => "royalty",
		636	"royalties" => "royalty",
		637	);
		638
		639	sub coin_from_name($) {
		640	$coin_alias{$_[0]}
		641	? cf::arch::find $coin_alias{$_[0]}
		642	: undef
447	}	643	}
448		644
449	=item $value = cf::db_get $family => $key	645	=item $value = cf::db_get $family => $key
450		646
451	Returns a single value from the environment database.	647	Returns a single value from the environment database.
…		…
453	=item cf::db_put $family => $key => $value	649	=item cf::db_put $family => $key => $value
454		650
455	Stores the given C<$value> in the family. It can currently store binary	651	Stores the given C<$value> in the family. It can currently store binary
456	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).	652	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
457		653
		654	=item $db = cf::db_table "name"
		655
		656	Create and/or open a new database table. The string must not be "db" and must be unique
		657	within each server.
		658
458	=cut	659	=cut
		660
		661	sub db_table($) {
		662	cf::error "db_get called from main context"
		663	if $Coro::current == $Coro::main;
		664
		665	my ($name) = @_;
		666	my $db = BDB::db_create $DB_ENV;
		667
		668	eval {
		669	$db->set_flags (BDB::CHKSUM);
		670
		671	utf8::encode $name;
		672	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		673	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		674	cf::cleanup "db_open(db): $!" if $!;
		675	};
		676	cf::cleanup "db_open(db): $@" if $@;
		677
		678	$db
		679	}
459		680
460	our $DB;	681	our $DB;
461		682
462	sub db_init {	683	sub db_init {
463	unless ($DB) {	684	$DB ||= db_table "db";
464	$DB = BDB::db_create $DB_ENV;
465
466	cf::sync_job {
467	eval {
468	$DB->set_flags (BDB::CHKSUM);
469
470	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
472	cf::cleanup "db_open(db): $!" if $!;
473	};
474	cf::cleanup "db_open(db): $@" if $@;
475	};
476	}
477	}	685	}
478		686
479	sub db_get($$) {	687	sub db_get($$) {
480	my $key = "$_[0]/$_[1]";	688	my $key = "$_[0]/$_[1]";
481		689
482	cf::sync_job {	690	cf::error "db_get called from main context"
		691	if $Coro::current == $Coro::main;
		692
483	BDB::db_get $DB, undef, $key, my $data;	693	BDB::db_get $DB, undef, $key, my $data;
484		694
485	$! ? ()	695	$! ? ()
486	: $data	696	: $data
487	}
488	}	697	}
489		698
490	sub db_put($$$) {	699	sub db_put($$$) {
491	BDB::dbreq_pri 4;	700	BDB::dbreq_pri 4;
492	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	701	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
531	if (1) {	740	if (1) {
532	$md5 =	741	$md5 =
533	join "\x00",	742	join "\x00",
534	$processversion,	743	$processversion,
535	map {	744	map {
536	Coro::cede;	745	cf::cede_to_tick;
537	($src->[$_], Digest::MD5::md5_hex $data[$_])	746	($src->[$_], Digest::MD5::md5_hex $data[$_])
538	} 0.. $#$src;	747	} 0.. $#$src;
539		748
540		749
541	my $dbmd5 = db_get cache => "$id/md5";	750	my $dbmd5 = db_get cache => "$id/md5";
…		…
548		757
549	my $t1 = Time::HiRes::time;	758	my $t1 = Time::HiRes::time;
550	my $data = $process->(\@data);	759	my $data = $process->(\@data);
551	my $t2 = Time::HiRes::time;	760	my $t2 = Time::HiRes::time;
552		761
553	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	762	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
554		763
555	db_put cache => "$id/data", $data;	764	db_put cache => "$id/data", $data;
556	db_put cache => "$id/md5" , $md5;	765	db_put cache => "$id/md5" , $md5;
557	db_put cache => "$id/meta", $meta;	766	db_put cache => "$id/meta", $meta;
558		767
…		…
568		777
569	=cut	778	=cut
570		779
571	sub datalog($@) {	780	sub datalog($@) {
572	my ($type, %kv) = @_;	781	my ($type, %kv) = @_;
573	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	782	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
574	}	783	}
575		784
576	=back	785	=back
577		786
578	=cut	787	=cut
579		788
580	#############################################################################	789	#############################################################################
581		790
582	=head2 ATTACHABLE OBJECTS	791	=head2 ATTACHABLE OBJECTS
583		792
584	Many objects in crossfire are so-called attachable objects. That means you can	793	Many objects in deliantra are so-called attachable objects. That means you can
585	attach callbacks/event handlers (a collection of which is called an "attachment")	794	attach callbacks/event handlers (a collection of which is called an "attachment")
586	to it. All such attachable objects support the following methods.	795	to it. All such attachable objects support the following methods.
587		796
588	In the following description, CLASS can be any of C<global>, C<object>	797	In the following description, CLASS can be any of C<global>, C<object>
589	C<player>, C<client> or C<map> (i.e. the attachable objects in	798	C<player>, C<client> or C<map> (i.e. the attachable objects in
590	Crossfire TRT).	799	Deliantra).
591		800
592	=over 4	801	=over 4
593		802
594	=item $attachable->attach ($attachment, key => $value...)	803	=item $attachable->attach ($attachment, key => $value...)
595		804
…		…
639	=item cf::CLASS::attachment $name, ...	848	=item cf::CLASS::attachment $name, ...
640		849
641	Register an attachment by C<$name> through which attachable objects of the	850	Register an attachment by C<$name> through which attachable objects of the
642	given CLASS can refer to this attachment.	851	given CLASS can refer to this attachment.
643		852
644	Some classes such as crossfire maps and objects can specify attachments	853	Some classes such as deliantra maps and objects can specify attachments
645	that are attached at load/instantiate time, thus the need for a name.	854	that are attached at load/instantiate time, thus the need for a name.
646		855
647	These calls expect any number of the following handler/hook descriptions:	856	These calls expect any number of the following handler/hook descriptions:
648		857
649	=over 4	858	=over 4
…		…
773		982
774	} elsif (exists $cb_id{$type}) {	983	} elsif (exists $cb_id{$type}) {
775	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	984	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
776		985
777	} elsif (ref $type) {	986	} elsif (ref $type) {
778	warn "attaching objects not supported, ignoring.\n";	987	error "attaching objects not supported, ignoring.\n";
779		988
780	} else {	989	} else {
781	shift @arg;	990	shift @arg;
782	warn "attach argument '$type' not supported, ignoring.\n";	991	error "attach argument '$type' not supported, ignoring.\n";
783	}	992	}
784	}	993	}
785	}	994	}
786		995
787	sub _object_attach {	996	sub _object_attach {
…		…
797	_attach $registry, $klass, @attach;	1006	_attach $registry, $klass, @attach;
798	}	1007	}
799		1008
800	$obj->{$name} = \%arg;	1009	$obj->{$name} = \%arg;
801	} else {	1010	} else {
802	warn "object uses attachment '$name' which is not available, postponing.\n";	1011	info "object uses attachment '$name' which is not available, postponing.\n";
803	}	1012	}
804		1013
805	$obj->{_attachment}{$name} = undef;	1014	$obj->{_attachment}{$name} = undef;
806	}	1015	}
807		1016
…		…
847	";	1056	";
848	die if $@;	1057	die if $@;
849	}	1058	}
850		1059
851	our $override;	1060	our $override;
852	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	1061	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
853		1062
854	sub override {	1063	sub override {
855	$override = 1;	1064	$override = 1;
856	@invoke_results = ();	1065	@INVOKE_RESULTS = (@_);
857	}	1066	}
858		1067
859	sub do_invoke {	1068	sub do_invoke {
860	my $event = shift;	1069	my $event = shift;
861	my $callbacks = shift;	1070	my $callbacks = shift;
862		1071
863	@invoke_results = ();	1072	@INVOKE_RESULTS = ();
864		1073
865	local $override;	1074	local $override;
866		1075
867	for (@$callbacks) {	1076	for (@$callbacks) {
868	eval { &{$_->[1]} };	1077	eval { &{$_->[1]} };
869		1078
870	if ($@) {	1079	if ($@) {
871	warn "$@";
872	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1080	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
873	override;	1081	override;
874	}	1082	}
875		1083
876	return 1 if $override;	1084	return 1 if $override;
877	}	1085	}
878		1086
879	0	1087	0
880	}	1088	}
881		1089
882	=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...)	1090	=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
883		1091
884	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)	1092	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
885		1093
886	Generate an object-specific event with the given arguments.	1094	Generate an object-specific event with the given arguments.
887		1095
888	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	1096	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
889	removed in future versions), and there is no public API to access override	1097	removed in future versions), and there is no public API to access override
890	results (if you must, access C<@cf::invoke_results> directly).	1098	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891		1099
892	=back	1100	=back
893		1101
894	=cut	1102	=cut
895		1103
896	#############################################################################	1104	#############################################################################
897	# object support	1105	# object support
		1106
		1107	sub _object_equal($$);
		1108	sub _object_equal($$) {
		1109	my ($a, $b) = @_;
		1110
		1111	return 0 unless (ref $a) eq (ref $b);
		1112
		1113	if ("HASH" eq ref $a) {
		1114	my @ka = keys %$a;
		1115	my @kb = keys %$b;
		1116
		1117	return 0 if @ka != @kb;
		1118
		1119	for (0 .. $#ka) {
		1120	return 0 unless $ka[$_] eq $kb[$_];
		1121	return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
		1122	}
		1123
		1124	} elsif ("ARRAY" eq ref $a) {
		1125
		1126	return 0 if @$a != @$b;
		1127
		1128	for (0 .. $#$a) {
		1129	return 0 unless _object_equal $a->[$_], $b->[$_];
		1130	}
		1131
		1132	} elsif ($a ne $b) {
		1133	return 0;
		1134	}
		1135
		1136	1
		1137	}
		1138
		1139	our $SLOW_MERGES;#d#
		1140	sub _can_merge {
		1141	my ($ob1, $ob2) = @_;
		1142
		1143	++$SLOW_MERGES;#d#
		1144
		1145	# we do the slow way here
		1146	return _object_equal $ob1, $ob2
		1147	}
898		1148
899	sub reattach {	1149	sub reattach {
900	# basically do the same as instantiate, without calling instantiate	1150	# basically do the same as instantiate, without calling instantiate
901	my ($obj) = @_;	1151	my ($obj) = @_;
902		1152
		1153	# no longer needed after getting rid of delete_package?
903	bless $obj, ref $obj; # re-bless in case extensions have been reloaded	1154	#bless $obj, ref $obj; # re-bless in case extensions have been reloaded
904		1155
905	my $registry = $obj->registry;	1156	my $registry = $obj->registry;
906		1157
907	@$registry = ();	1158	@$registry = ();
908		1159
…		…
913	for (@$attach) {	1164	for (@$attach) {
914	my ($klass, @attach) = @$_;	1165	my ($klass, @attach) = @$_;
915	_attach $registry, $klass, @attach;	1166	_attach $registry, $klass, @attach;
916	}	1167	}
917	} else {	1168	} else {
918	warn "object uses attachment '$name' that is not available, postponing.\n";	1169	info "object uses attachment '$name' that is not available, postponing.\n";
919	}	1170	}
920	}	1171	}
921	}	1172	}
922		1173
923	cf::attachable->attach (	1174	cf::attachable->attach (
924	prio => -1000000,	1175	prio => -1000000,
925	on_instantiate => sub {	1176	on_instantiate => sub {
926	my ($obj, $data) = @_;	1177	my ($obj, $data) = @_;
927		1178
928	$data = from_json $data;	1179	$data = decode_json $data;
929		1180
930	for (@$data) {	1181	for (@$data) {
931	my ($name, $args) = @$_;	1182	my ($name, $args) = @$_;
932		1183
933	$obj->attach ($name, %{$args || {} });	1184	$obj->attach ($name, %{$args || {} });
…		…
949	sub object_freezer_save {	1200	sub object_freezer_save {
950	my ($filename, $rdata, $objs) = @_;	1201	my ($filename, $rdata, $objs) = @_;
951		1202
952	sync_job {	1203	sync_job {
953	if (length $$rdata) {	1204	if (length $$rdata) {
		1205	utf8::decode (my $decname = $filename);
954	warn sprintf "saving %s (%d,%d)\n",	1206	trace sprintf "saving %s (%d,%d)\n",
955	$filename, length $$rdata, scalar @$objs;	1207	$decname, length $$rdata, scalar @$objs
		1208	if $VERBOSE_IO;
956		1209
957	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1210	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
958	chmod SAVE_MODE, $fh;	1211	aio_chmod $fh, SAVE_MODE;
959	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1212	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960	aio_fsync $fh if $cf::USE_FSYNC;	1213	if ($cf::USE_FSYNC) {
		1214	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;
		1215	aio_fsync $fh;
		1216	}
961	close $fh;	1217	aio_close $fh;
962		1218
963	if (@$objs) {	1219	if (@$objs) {
964	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1220	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
965	chmod SAVE_MODE, $fh;	1221	aio_chmod $fh, SAVE_MODE;
966	my $data = Storable::nfreeze { version => 1, objs => $objs };	1222	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
967	aio_write $fh, 0, (length $data), $data, 0;	1223	aio_write $fh, 0, (length $data), $data, 0;
968	aio_fsync $fh if $cf::USE_FSYNC;	1224	if ($cf::USE_FSYNC) {
		1225	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;
		1226	aio_fsync $fh;
		1227	}
969	close $fh;	1228	aio_close $fh;
970	aio_rename "$filename.pst~", "$filename.pst";	1229	aio_rename "$filename.pst~", "$filename.pst";
971	}	1230	}
972	} else {	1231	} else {
973	aio_unlink "$filename.pst";	1232	aio_unlink "$filename.pst";
974	}	1233	}
975		1234
976	aio_rename "$filename~", $filename;	1235	aio_rename "$filename~", $filename;
		1236
		1237	$filename =~ s%/[^/]+$%%;
		1238	aio_pathsync $filename if $cf::USE_FSYNC;
977	} else {	1239	} else {
978	warn "FATAL: $filename~: $!\n";	1240	error "unable to save objects: $filename~: $!\n";
979	}	1241	}
980	} else {	1242	} else {
981	aio_unlink $filename;	1243	aio_unlink $filename;
982	aio_unlink "$filename.pst";	1244	aio_unlink "$filename.pst";
983	}	1245	}
984	}	1246	};
985	}	1247	}
986		1248
987	sub object_freezer_as_string {	1249	sub object_freezer_as_string {
988	my ($rdata, $objs) = @_;	1250	my ($rdata, $objs) = @_;
989		1251
…		…
1001	or return;	1263	or return;
1002		1264
1003	unless (aio_stat "$filename.pst") {	1265	unless (aio_stat "$filename.pst") {
1004	(aio_load "$filename.pst", $av) >= 0	1266	(aio_load "$filename.pst", $av) >= 0
1005	or return;	1267	or return;
		1268
1006	$av = eval { (Storable::thaw $av)->{objs} };	1269	my $st = eval { Coro::Storable::thaw $av };
		1270	$av = $st->{objs};
1007	}	1271	}
1008		1272
		1273	utf8::decode (my $decname = $filename);
1009	warn sprintf "loading %s (%d)\n",	1274	trace sprintf "loading %s (%d,%d)\n",
1010	$filename, length $data, scalar @{$av || []};	1275	$decname, length $data, scalar @{$av || []}
		1276	if $VERBOSE_IO;
		1277
1011	return ($data, $av);	1278	($data, $av)
1012	}	1279	}
1013		1280
1014	=head2 COMMAND CALLBACKS	1281	=head2 COMMAND CALLBACKS
1015		1282
1016	=over 4	1283	=over 4
…		…
1070	my ($name, $cb) = @_;	1337	my ($name, $cb) = @_;
1071		1338
1072	$EXTICMD{$name} = $cb;	1339	$EXTICMD{$name} = $cb;
1073	}	1340	}
1074		1341
		1342	use File::Glob ();
		1343
1075	cf::player->attach (	1344	cf::player->attach (
1076	on_command => sub {	1345	on_unknown_command => sub {
1077	my ($pl, $name, $params) = @_;	1346	my ($pl, $name, $params) = @_;
1078		1347
1079	my $cb = $COMMAND{$name}	1348	my $cb = $COMMAND{$name}
1080	or return;	1349	or return;
1081		1350
…		…
1089	my ($pl, $buf) = @_;	1358	my ($pl, $buf) = @_;
1090		1359
1091	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1360	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092		1361
1093	if (ref $msg) {	1362	if (ref $msg) {
		1363	my ($type, $reply, @payload) =
		1364	"ARRAY" eq ref $msg
		1365	? @$msg
		1366	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1367
		1368	my @reply;
		1369
1094	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1370	if (my $cb = $EXTCMD{$type}) {
1095	if (my %reply = $cb->($pl, $msg)) {	1371	@reply = $cb->($pl, @payload);
1096	$pl->ext_reply ($msg->{msgid}, %reply);
1097	}
1098	}	1372	}
		1373
		1374	$pl->ext_reply ($reply, @reply)
		1375	if $reply;
		1376
1099	} else {	1377	} else {
1100	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1378	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101	}	1379	}
1102		1380
1103	cf::override;	1381	cf::override;
1104	},	1382	},
1105	);	1383	);
1106		1384
		1385	# "readahead" all extensions
		1386	sub cache_extensions {
		1387	my $grp = IO::AIO::aio_group;
		1388
		1389	add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
		1390	for (grep /\.ext$/, @{$_[0]}) {
		1391	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
		1392	}
		1393	};
		1394
		1395	$grp
		1396	}
		1397
1107	sub load_extensions {	1398	sub load_extensions {
		1399	info "loading extensions...";
		1400
1108	cf::sync_job {	1401	cf::sync_job {
1109	my %todo;	1402	my %todo;
1110		1403
1111	for my $path (<$LIBDIR/*.ext>) {	1404	for my $path (<$LIBDIR/*.ext>) {
1112	next unless -r $path;	1405	next unless -r $path;
…		…
1130		1423
1131	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1424	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1132	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1425	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1133		1426
1134	$ext{source} =	1427	$ext{source} =
1135	"package $pkg; use strict; use utf8;\n"	1428	"package $pkg; use common::sense;\n"
1136	. "#line 1 \"$path\"\n{\n"	1429	. "#line 1 \"$path\"\n{\n"
1137	. $source	1430	. $source
1138	. "\n};\n1";	1431	. "\n};\n1";
1139		1432
1140	$todo{$base} = \%ext;	1433	$todo{$base} = \%ext;
1141	}	1434	}
1142		1435
		1436	my $pass = 0;
1143	my %done;	1437	my %done;
1144	while (%todo) {	1438	while (%todo) {
1145	my $progress;	1439	my $progress;
1146		1440
		1441	++$pass;
		1442
		1443	ext:
1147	while (my ($k, $v) = each %todo) {	1444	while (my ($k, $v) = each %todo) {
1148	for (split /,\s*/, $v->{meta}{depends}) {	1445	for (split /,\s*/, $v->{meta}{depends}) {
1149	goto skip	1446	next ext
1150	unless exists $done{$_};	1447	unless exists $done{$_};
1151	}	1448	}
1152		1449
1153	warn "... loading '$k' into '$v->{pkg}'\n";	1450	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1154		1451
1155	unless (eval $v->{source}) {	1452	my $active = eval $v->{source};
		1453
		1454	if (length $@) {
1156	my $msg = $@ ? "$v->{path}: $@\n"	1455	error "$v->{path}: $@\n";
1157	: "$v->{base}: extension inactive.\n";	1456	undef $@; # work around perl 5.10.0 utf-8 caching bug
1158		1457
		1458	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1159	if (exists $v->{meta}{mandatory}) {	1459	if exists $v->{meta}{mandatory};
1160	warn $msg;	1460
1161	warn "mandatory extension failed to load, exiting.\n";	1461	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1162	exit 1;	1462	delete $todo{$k};
1163	}	1463	} else {
1164		1464	$done{$k} = delete $todo{$k};
1165	warn $msg;	1465	push @EXTS, $v->{pkg};
		1466	$progress = 1;
		1467
		1468	info "$v->{base}: extension inactive.\n"
		1469	unless $active;
1166	}	1470	}
1167
1168	$done{$k} = delete $todo{$k};
1169	push @EXTS, $v->{pkg};
1170	$progress = 1;
1171	}	1471	}
1172		1472
1173	skip:	1473	unless ($progress) {
1174	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1474	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1175	unless $progress;	1475
		1476	while (my ($k, $v) = each %todo) {
		1477	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
		1478	if exists $v->{meta}{mandatory};
		1479	}
		1480	}
1176	}	1481	}
1177	};	1482	};
1178	}	1483	}
1179		1484
1180	#############################################################################	1485	#############################################################################
1181		1486
1182	=back	1487	=back
1183		1488
1184	=head2 CORE EXTENSIONS	1489	=head2 CORE EXTENSIONS
1185		1490
1186	Functions and methods that extend core crossfire objects.	1491	Functions and methods that extend core deliantra objects.
1187		1492
1188	=cut	1493	=cut
1189		1494
1190	package cf::player;	1495	package cf::player;
1191		1496
1192	use Coro::AIO;	1497	use Coro::AIO;
1193		1498
1194	=head3 cf::player	1499	=head3 cf::player
1195		1500
1196	=over 4	1501	=over 4
		1502
		1503	=item cf::player::num_playing
		1504
		1505	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1506
		1507	=cut
		1508
		1509	sub num_playing {
		1510	scalar grep
		1511	$_->ob->map
		1512	&& !$_->hidden
		1513	&& !$_->ob->flag (cf::FLAG_WIZ),
		1514	cf::player::list
		1515	}
1197		1516
1198	=item cf::player::find $login	1517	=item cf::player::find $login
1199		1518
1200	Returns the given player object, loading it if necessary (might block).	1519	Returns the given player object, loading it if necessary (might block).
1201		1520
…		…
1220		1539
1221	sub exists($) {	1540	sub exists($) {
1222	my ($login) = @_;	1541	my ($login) = @_;
1223		1542
1224	$cf::PLAYER{$login}	1543	$cf::PLAYER{$login}
1225	or cf::sync_job { !aio_stat path $login }	1544	or !aio_stat path $login
1226	}	1545	}
1227		1546
1228	sub find($) {	1547	sub find($) {
1229	return $cf::PLAYER{$_[0]} || do {	1548	return $cf::PLAYER{$_[0]} || do {
1230	my $login = $_[0];	1549	my $login = $_[0];
…		…
1237	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1556	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1557	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1558	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240	aio_unlink +(playerdir $login) . "/$login.pl";	1559	aio_unlink +(playerdir $login) . "/$login.pl";
1241		1560
1242	my $pl = load_pl path $login	1561	my $f = new_from_file cf::object::thawer path $login
1243	or return;	1562	or return;
		1563
		1564	my $pl = cf::player::load_pl $f
		1565	or return;
		1566
		1567	local $cf::PLAYER_LOADING{$login} = $pl;
		1568	$f->resolve_delayed_derefs;
1244	$cf::PLAYER{$login} = $pl	1569	$cf::PLAYER{$login} = $pl
1245	}	1570	}
1246	}	1571	}
1247	}	1572	}
		1573
		1574	cf::player->attach (
		1575	on_load => sub {
		1576	my ($pl, $path) = @_;
		1577
		1578	# restore slots saved in save, below
		1579	my $slots = delete $pl->{_slots};
		1580
		1581	$pl->ob->current_weapon ($slots->[0]);
		1582	$pl->combat_ob ($slots->[1]);
		1583	$pl->ranged_ob ($slots->[2]);
		1584	},
		1585	);
1248		1586
1249	sub save($) {	1587	sub save($) {
1250	my ($pl) = @_;	1588	my ($pl) = @_;
1251		1589
1252	return if $pl->{deny_save};	1590	return if $pl->{deny_save};
…		…
1257	return if $pl->{deny_save};	1595	return if $pl->{deny_save};
1258		1596
1259	aio_mkdir playerdir $pl, 0770;	1597	aio_mkdir playerdir $pl, 0770;
1260	$pl->{last_save} = $cf::RUNTIME;	1598	$pl->{last_save} = $cf::RUNTIME;
1261		1599
		1600	cf::get_slot 0.01;
		1601
		1602	# save slots, to be restored later
		1603	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
		1604
1262	$pl->save_pl ($path);	1605	$pl->save_pl ($path);
1263	Coro::cede;	1606	cf::cede_to_tick;
1264	}	1607	}
1265		1608
1266	sub new($) {	1609	sub new($) {
1267	my ($login) = @_;	1610	my ($login) = @_;
1268		1611
…		…
1274	$cf::PLAYER{$login} = $self;	1617	$cf::PLAYER{$login} = $self;
1275		1618
1276	$self	1619	$self
1277	}	1620	}
1278		1621
		1622	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1623
		1624	=cut
		1625
		1626	sub send_msg {
		1627	my $ns = shift->ns
		1628	or return;
		1629	$ns->send_msg (@_);
		1630	}
		1631
1279	=item $pl->quit_character	1632	=item $pl->quit_character
1280		1633
1281	Nukes the player without looking back. If logged in, the connection will	1634	Nukes the player without looking back. If logged in, the connection will
1282	be destroyed. May block for a long time.	1635	be destroyed. May block for a long time.
1283		1636
…		…
1287	my ($pl) = @_;	1640	my ($pl) = @_;
1288		1641
1289	my $name = $pl->ob->name;	1642	my $name = $pl->ob->name;
1290		1643
1291	$pl->{deny_save} = 1;	1644	$pl->{deny_save} = 1;
1292	$pl->password ("*"); # this should lock out the player until we nuked the dir	1645	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1293		1646
1294	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1647	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1295	$pl->deactivate;	1648	$pl->deactivate;
		1649	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1296	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1650	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1297	$pl->ns->destroy if $pl->ns;	1651	$pl->ns->destroy if $pl->ns;
1298		1652
1299	my $path = playerdir $pl;	1653	my $path = playerdir $pl;
1300	my $temp = "$path~$cf::RUNTIME~deleting~";	1654	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1336	or return [];	1690	or return [];
1337		1691
1338	my @logins;	1692	my @logins;
1339		1693
1340	for my $login (@$dirs) {	1694	for my $login (@$dirs) {
		1695	my $path = path $login;
		1696
		1697	# a .pst is a dead give-away for a valid player
		1698	# if no pst file found, open and chekc for blocked users
		1699	if (aio_stat "$path.pst") {
1341	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1700	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342	aio_read $fh, 0, 512, my $buf, 0 or next;	1701	aio_read $fh, 0, 512, my $buf, 0 or next;
1343	$buf !~ /^password -------------$/m or next; # official not-valid tag	1702	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1703	}
1344		1704
1345	utf8::decode $login;	1705	utf8::decode $login;
1346	push @logins, $login;	1706	push @logins, $login;
1347	}	1707	}
1348		1708
1349	\@logins	1709	\@logins
1350	}	1710	}
1351		1711
1352	=item $player->maps	1712	=item $player->maps
		1713
		1714	=item cf::player::maps $login
1353		1715
1354	Returns an arrayref of map paths that are private for this	1716	Returns an arrayref of map paths that are private for this
1355	player. May block.	1717	player. May block.
1356		1718
1357	=cut	1719	=cut
…		…
1375	}	1737	}
1376		1738
1377	\@paths	1739	\@paths
1378	}	1740	}
1379		1741
1380	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)	1742	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1381		1743
1382	Expand crossfire pod fragments into protocol xml.	1744	Expand deliantra pod fragments into protocol xml.
1383		1745
1384	=cut
1385
1386	sub expand_cfpod {
1387	((my $self), (local $_)) = @_;
1388
1389	# escape & and <
1390	s/&/&amp;/g;
1391	s/(?<![BIUGH])</&lt;/g;
1392
1393	# this is buggy, it needs to properly take care of nested <'s
1394
1395	1 while
1396	# replace B<>, I<>, U<> etc.
1397	s/B<([^\>]*)>/<b>$1<\/b>/
1398	|| s/I<([^\>]*)>/<i>$1<\/i>/
1399	|| s/U<([^\>]*)>/<u>$1<\/u>/
1400	# replace G<male|female> tags
1401	|| s{G<([^>|]*)\|([^>]*)>}{
1402	$self->gender ? $2 : $1
1403	}ge
1404	# replace H<hint text>
1405	|| s{H<([^\>]*)>}
1406	{
1407	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1408	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1409	"")
1410	[$self->{hintmode}]
1411	}ge;
1412
1413	# create single paragraphs (very hackish)
1414	s/(?<=\S)\n(?=\w)/ /g;
1415
1416	# compress some whitespace
1417	1 while s/\s*\n\s*\n\s*/\n/;
1418
1419	$_
1420	}
1421
1422	sub hintmode {
1423	$_[0]{hintmode} = $_[1] if @_ > 1;
1424	$_[0]{hintmode}
1425	}
1426
1427	=item $player->ext_reply ($msgid, %msg)	1746	=item $player->ext_reply ($msgid, @msg)
1428		1747
1429	Sends an ext reply to the player.	1748	Sends an ext reply to the player.
1430		1749
1431	=cut	1750	=cut
1432		1751
1433	sub ext_reply($$%) {	1752	sub ext_reply($$@) {
1434	my ($self, $id, %msg) = @_;	1753	my ($self, $id, @msg) = @_;
1435		1754
1436	$msg{msgid} = $id;	1755	$self->ns->ext_reply ($id, @msg)
1437	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1438	}	1756	}
1439		1757
1440	=item $player->ext_event ($type, %msg)	1758	=item $player->ext_msg ($type, @msg)
1441		1759
1442	Sends an ext event to the client.	1760	Sends an ext event to the client.
1443		1761
1444	=cut	1762	=cut
1445		1763
1446	sub ext_event($$%) {	1764	sub ext_msg($$@) {
1447	my ($self, $type, %msg) = @_;	1765	my ($self, $type, @msg) = @_;
1448		1766
1449	$self->ns->ext_event ($type, %msg);	1767	$self->ns->ext_msg ($type, @msg);
1450	}	1768	}
1451		1769
1452	=head3 cf::region	1770	=head3 cf::region
1453		1771
1454	=over 4	1772	=over 4
…		…
1464	=cut	1782	=cut
1465		1783
1466	sub find_by_path($) {	1784	sub find_by_path($) {
1467	my ($path) = @_;	1785	my ($path) = @_;
1468		1786
		1787	$path =~ s/^~[^\/]*//; # skip ~login
		1788
1469	my ($match, $specificity);	1789	my ($match, $specificity);
1470		1790
1471	for my $region (list) {	1791	for my $region (list) {
1472	if ($region->match && $path =~ $region->match) {	1792	if ($region->{match} && $path =~ $region->{match}) {
1473	($match, $specificity) = ($region, $region->specificity)	1793	($match, $specificity) = ($region, $region->specificity)
1474	if $region->specificity > $specificity;	1794	if $region->specificity > $specificity;
1475	}	1795	}
1476	}	1796	}
1477		1797
…		…
1498	our $MAX_RESET = 3600;	1818	our $MAX_RESET = 3600;
1499	our $DEFAULT_RESET = 3000;	1819	our $DEFAULT_RESET = 3000;
1500		1820
1501	sub generate_random_map {	1821	sub generate_random_map {
1502	my ($self, $rmp) = @_;	1822	my ($self, $rmp) = @_;
		1823
		1824	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
		1825
1503	# mit "rum" bekleckern, nicht	1826	# mit "rum" bekleckern, nicht
1504	$self->_create_random_map (	1827	$self->_create_random_map (
1505	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1828	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1506	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1829	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1507	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1830	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1508	$rmp->{exit_on_final_map},	1831	$rmp->{exit_on_final_map},
1509	$rmp->{xsize}, $rmp->{ysize},	1832	$rmp->{xsize}, $rmp->{ysize},
1510	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},	1833	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1511	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},	1834	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
…		…
1526		1849
1527	sub register {	1850	sub register {
1528	my (undef, $regex, $prio) = @_;	1851	my (undef, $regex, $prio) = @_;
1529	my $pkg = caller;	1852	my $pkg = caller;
1530		1853
1531	no strict;
1532	push @{"$pkg\::ISA"}, __PACKAGE__;	1854	push @{"$pkg\::ISA"}, __PACKAGE__;
1533		1855
1534	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1856	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1535	}	1857	}
1536		1858
1537	# also paths starting with '/'	1859	# also paths starting with '/'
1538	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1860	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1539		1861
1540	sub thawer_merge {	1862	sub thawer_merge {
1541	my ($self, $merge) = @_;	1863	my ($self, $merge) = @_;
1542		1864
1543	# we have to keep some variables in memory intact	1865	# we have to keep some variables in memory intact
…		…
1597	$self->init; # pass $1 etc.	1919	$self->init; # pass $1 etc.
1598	return $self;	1920	return $self;
1599	}	1921	}
1600	}	1922	}
1601		1923
1602	Carp::carp "unable to resolve path '$path' (base '$base').";	1924	Carp::cluck "unable to resolve path '$path' (base '$base').";
1603	()	1925	()
1604	}	1926	}
1605		1927
1606	sub init {	1928	sub init {
1607	my ($self) = @_;	1929	my ($self) = @_;
…		…
1629		1951
1630	# the temporary/swap location	1952	# the temporary/swap location
1631	sub save_path {	1953	sub save_path {
1632	my ($self) = @_;	1954	my ($self) = @_;
1633		1955
1634	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1956	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1635	"$TMPDIR/$path.map"	1957	"$TMPDIR/$path.map"
1636	}	1958	}
1637		1959
1638	# the unique path, undef == no special unique path	1960	# the unique path, undef == no special unique path
1639	sub uniq_path {	1961	sub uniq_path {
1640	my ($self) = @_;	1962	my ($self) = @_;
1641		1963
1642	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1964	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1643	"$UNIQUEDIR/$path"	1965	"$UNIQUEDIR/$path"
1644	}
1645
1646	# and all this just because we cannot iterate over
1647	# all maps in C++...
1648	sub change_all_map_light {
1649	my ($change) = @_;
1650
1651	$_->change_map_light ($change)
1652	for grep $_->outdoor, values %cf::MAP;
1653	}	1966	}
1654		1967
1655	sub decay_objects {	1968	sub decay_objects {
1656	my ($self) = @_;	1969	my ($self) = @_;
1657		1970
…		…
1670		1983
1671	sub load_header_from($) {	1984	sub load_header_from($) {
1672	my ($self, $path) = @_;	1985	my ($self, $path) = @_;
1673		1986
1674	utf8::encode $path;	1987	utf8::encode $path;
1675	#aio_open $path, O_RDONLY, 0	1988	my $f = new_from_file cf::object::thawer $path
1676	# or return;
1677
1678	$self->_load_header ($path)
1679	or return;	1989	or return;
		1990
		1991	$self->_load_header ($f)
		1992	or return;
		1993
		1994	local $MAP_LOADING{$self->{path}} = $self;
		1995	$f->resolve_delayed_derefs;
1680		1996
1681	$self->{load_path} = $path;	1997	$self->{load_path} = $path;
1682		1998
1683	1	1999	1
1684	}	2000	}
…		…
1738	sub find {	2054	sub find {
1739	my ($path, $origin) = @_;	2055	my ($path, $origin) = @_;
1740		2056
1741	$path = normalise $path, $origin && $origin->path;	2057	$path = normalise $path, $origin && $origin->path;
1742		2058
		2059	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1743	cf::lock_wait "map_find:$path";	2060	my $guard2 = cf::lock_acquire "map_find:$path";
1744		2061
1745	$cf::MAP{$path} || do {	2062	$cf::MAP{$path} || do {
1746	my $guard = cf::lock_acquire "map_find:$path";
1747	my $map = new_from_path cf::map $path	2063	my $map = new_from_path cf::map $path
1748	or return;	2064	or return;
1749		2065
1750	$map->{last_save} = $cf::RUNTIME;	2066	$map->{last_save} = $cf::RUNTIME;
1751		2067
…		…
1753	or return;	2069	or return;
1754		2070
1755	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	2071	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1756	# doing this can freeze the server in a sync job, obviously	2072	# doing this can freeze the server in a sync job, obviously
1757	#$cf::WAIT_FOR_TICK->wait;	2073	#$cf::WAIT_FOR_TICK->wait;
		2074	undef $guard2;
		2075	undef $guard1;
1758	$map->reset;	2076	$map->reset;
1759	undef $guard;
1760	return find $path;	2077	return find $path;
1761	}	2078	}
1762		2079
1763	$cf::MAP{$path} = $map	2080	$cf::MAP{$path} = $map
1764	}	2081	}
1765	}	2082	}
1766		2083
1767	sub pre_load { }	2084	sub pre_load { }
1768	sub post_load { }	2085	#sub post_load { } # XS
1769		2086
1770	sub load {	2087	sub load {
1771	my ($self) = @_;	2088	my ($self) = @_;
1772		2089
1773	local $self->{deny_reset} = 1; # loading can take a long time	2090	local $self->{deny_reset} = 1; # loading can take a long time
1774		2091
1775	my $path = $self->{path};	2092	my $path = $self->{path};
1776		2093
1777	{	2094	{
1778	my $guard = cf::lock_acquire "map_load:$path";	2095	my $guard = cf::lock_acquire "map_data:$path";
1779		2096
		2097	return unless $self->valid;
1780	return if $self->in_memory != cf::MAP_SWAPPED;	2098	return unless $self->in_memory == cf::MAP_SWAPPED;
1781		2099
1782	$self->in_memory (cf::MAP_LOADING);	2100	$self->in_memory (cf::MAP_LOADING);
1783		2101
1784	$self->alloc;	2102	$self->alloc;
1785		2103
1786	$self->pre_load;	2104	$self->pre_load;
1787	Coro::cede;	2105	cf::cede_to_tick;
1788		2106
		2107	my $f = new_from_file cf::object::thawer $self->{load_path};
		2108	$f->skip_block;
1789	$self->_load_objects ($self->{load_path}, 1)	2109	$self->_load_objects ($f)
1790	or return;	2110	or return;
1791		2111
1792	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2112	$self->post_load_original
1793	if delete $self->{load_original};	2113	if delete $self->{load_original};
1794		2114
1795	if (my $uniq = $self->uniq_path) {	2115	if (my $uniq = $self->uniq_path) {
1796	utf8::encode $uniq;	2116	utf8::encode $uniq;
1797	if (aio_open $uniq, O_RDONLY, 0) {	2117	unless (aio_stat $uniq) {
		2118	if (my $f = new_from_file cf::object::thawer $uniq) {
1798	$self->clear_unique_items;	2119	$self->clear_unique_items;
1799	$self->_load_objects ($uniq, 0);	2120	$self->_load_objects ($f);
		2121	$f->resolve_delayed_derefs;
		2122	}
1800	}	2123	}
1801	}	2124	}
1802		2125
1803	Coro::cede;	2126	$f->resolve_delayed_derefs;
		2127
		2128	cf::cede_to_tick;
1804	# now do the right thing for maps	2129	# now do the right thing for maps
1805	$self->link_multipart_objects;	2130	$self->link_multipart_objects;
1806	$self->difficulty ($self->estimate_difficulty)	2131	$self->difficulty ($self->estimate_difficulty)
1807	unless $self->difficulty;	2132	unless $self->difficulty;
1808	Coro::cede;	2133	cf::cede_to_tick;
1809		2134
1810	unless ($self->{deny_activate}) {	2135	unless ($self->{deny_activate}) {
1811	$self->decay_objects;	2136	$self->decay_objects;
1812	$self->fix_auto_apply;	2137	$self->fix_auto_apply;
1813	$self->update_buttons;	2138	$self->update_buttons;
1814	Coro::cede;	2139	cf::cede_to_tick;
1815	$self->set_darkness_map;
1816	Coro::cede;
1817	$self->activate;	2140	$self->activate;
1818	}	2141	}
1819		2142
		2143	$self->{last_save} = $cf::RUNTIME;
		2144	$self->last_access ($cf::RUNTIME);
		2145
1820	$self->in_memory (cf::MAP_IN_MEMORY);	2146	$self->in_memory (cf::MAP_ACTIVE);
1821	}	2147	}
1822		2148
1823	$self->post_load;	2149	$self->post_load;
1824	}	2150	}
1825		2151
		2152	# customize the map for a given player, i.e.
		2153	# return the _real_ map. used by e.g. per-player
		2154	# maps to change the path to ~playername/mappath
1826	sub customise_for {	2155	sub customise_for {
1827	my ($self, $ob) = @_;	2156	my ($self, $ob) = @_;
1828		2157
1829	return find "~" . $ob->name . "/" . $self->{path}	2158	return find "~" . $ob->name . "/" . $self->{path}
1830	if $self->per_player;	2159	if $self->per_player;
…		…
1834		2163
1835	$self	2164	$self
1836	}	2165	}
1837		2166
1838	# find and load all maps in the 3x3 area around a map	2167	# find and load all maps in the 3x3 area around a map
1839	sub load_diag {	2168	sub load_neighbours {
1840	my ($map) = @_;	2169	my ($map) = @_;
1841		2170
1842	my @diag; # diagonal neighbours	2171	my @neigh; # diagonal neighbours
1843		2172
1844	for (0 .. 3) {	2173	for (0 .. 3) {
1845	my $neigh = $map->tile_path ($_)	2174	my $neigh = $map->tile_path ($_)
1846	or next;	2175	or next;
1847	$neigh = find $neigh, $map	2176	$neigh = find $neigh, $map
1848	or next;	2177	or next;
1849	$neigh->load;	2178	$neigh->load;
1850		2179
		2180	# now find the diagonal neighbours
		2181	push @neigh,
1851	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2182	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1852	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2183	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1853	}	2184	}
1854		2185
1855	for (@diag) {	2186	for (grep defined $_->[0], @neigh) {
		2187	my ($path, $origin) = @$_;
1856	my $neigh = find @$_	2188	my $neigh = find $path, $origin
1857	or next;	2189	or next;
1858	$neigh->load;	2190	$neigh->load;
1859	}	2191	}
1860	}	2192	}
1861		2193
1862	sub find_sync {	2194	sub find_sync {
1863	my ($path, $origin) = @_;	2195	my ($path, $origin) = @_;
1864		2196
1865	cf::sync_job { find $path, $origin }	2197	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2198	if $Coro::current == $Coro::main;
		2199
		2200	find $path, $origin
1866	}	2201	}
1867		2202
1868	sub do_load_sync {	2203	sub do_load_sync {
1869	my ($map) = @_;	2204	my ($map) = @_;
1870		2205
1871	cf::sync_job { $map->load };	2206	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
		2207	if $Coro::current == $Coro::main;
		2208
		2209	$map->load;
1872	}	2210	}
1873		2211
1874	our %MAP_PREFETCH;	2212	our %MAP_PREFETCH;
1875	our $MAP_PREFETCHER = undef;	2213	our $MAP_PREFETCHER = undef;
1876		2214
1877	sub find_async {	2215	sub find_async {
1878	my ($path, $origin) = @_;	2216	my ($path, $origin, $load) = @_;
1879		2217
1880	$path = normalise $path, $origin && $origin->{path};	2218	$path = normalise $path, $origin && $origin->{path};
1881		2219
1882	if (my $map = $cf::MAP{$path}) {	2220	if (my $map = $cf::MAP{$path}) {
1883	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2221	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1884	}	2222	}
1885		2223
1886	undef $MAP_PREFETCH{$path};	2224	$MAP_PREFETCH{$path} |= $load;
		2225
1887	$MAP_PREFETCHER ||= cf::async {	2226	$MAP_PREFETCHER ||= cf::async {
		2227	$Coro::current->{desc} = "map prefetcher";
		2228
1888	while (%MAP_PREFETCH) {	2229	while (%MAP_PREFETCH) {
1889	for my $path (keys %MAP_PREFETCH) {	2230	while (my ($k, $v) = each %MAP_PREFETCH) {
1890	my $map = find $path	2231	if (my $map = find $k) {
1891	or next;
1892	$map->load;	2232	$map->load if $v;
		2233	}
1893		2234
1894	delete $MAP_PREFETCH{$path};	2235	delete $MAP_PREFETCH{$k};
1895	}	2236	}
1896	}	2237	}
1897	undef $MAP_PREFETCHER;	2238	undef $MAP_PREFETCHER;
1898	};	2239	};
1899	$MAP_PREFETCHER->prio (6);	2240	$MAP_PREFETCHER->prio (6);
1900		2241
1901	()	2242	()
1902	}	2243	}
1903		2244
		2245	# common code, used by both ->save and ->swapout
1904	sub save {	2246	sub _save {
1905	my ($self) = @_;	2247	my ($self) = @_;
1906
1907	my $lock = cf::lock_acquire "map_data:" . $self->path;
1908		2248
1909	$self->{last_save} = $cf::RUNTIME;	2249	$self->{last_save} = $cf::RUNTIME;
1910		2250
1911	return unless $self->dirty;	2251	return unless $self->dirty;
1912		2252
…		…
1918	return if $self->{deny_save};	2258	return if $self->{deny_save};
1919		2259
1920	local $self->{last_access} = $self->last_access;#d#	2260	local $self->{last_access} = $self->last_access;#d#
1921		2261
1922	cf::async {	2262	cf::async {
		2263	$Coro::current->{desc} = "map player save";
1923	$_->contr->save for $self->players;	2264	$_->contr->save for $self->players;
1924	};	2265	};
		2266
		2267	cf::get_slot 0.02;
1925		2268
1926	if ($uniq) {	2269	if ($uniq) {
1927	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2270	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1928	$self->_save_objects ($uniq, cf::IO_UNIQUES);	2271	$self->_save_objects ($uniq, cf::IO_UNIQUES);
1929	} else {	2272	} else {
1930	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2273	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1931	}	2274	}
1932	}	2275	}
1933		2276
		2277	sub save {
		2278	my ($self) = @_;
		2279
		2280	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2281
		2282	$self->_save;
		2283	}
		2284
1934	sub swap_out {	2285	sub swap_out {
1935	my ($self) = @_;	2286	my ($self) = @_;
1936		2287
1937	# save first because save cedes
1938	$self->save;
1939
1940	my $lock = cf::lock_acquire "map_data:" . $self->path;	2288	my $lock = cf::lock_acquire "map_data:$self->{path}";
1941		2289
		2290	return if $self->in_memory != cf::MAP_ACTIVE;
		2291	return if $self->{deny_save};
1942	return if $self->players;	2292	return if $self->players;
1943	return if $self->in_memory != cf::MAP_IN_MEMORY;
1944	return if $self->{deny_save};
1945		2293
		2294	# first deactivate the map and "unlink" it from the core
		2295	$self->deactivate;
		2296	$_->clear_links_to ($self) for values %cf::MAP;
		2297	$self->in_memory (cf::MAP_SWAPPED);
		2298
		2299	# then atomically save
		2300	$self->_save;
		2301
		2302	# then free the map
1946	$self->clear;	2303	$self->clear;
1947	$self->in_memory (cf::MAP_SWAPPED);
1948	}	2304	}
1949		2305
1950	sub reset_at {	2306	sub reset_at {
1951	my ($self) = @_;	2307	my ($self) = @_;
1952		2308
…		…
1970		2326
1971	my $lock = cf::lock_acquire "map_data:$self->{path}";	2327	my $lock = cf::lock_acquire "map_data:$self->{path}";
1972		2328
1973	return if $self->players;	2329	return if $self->players;
1974		2330
1975	warn "resetting map ", $self->path;	2331	cf::trace "resetting map ", $self->path, "\n";
1976		2332
1977	$self->in_memory (cf::MAP_SWAPPED);	2333	$self->in_memory (cf::MAP_SWAPPED);
1978		2334
1979	# need to save uniques path	2335	# need to save uniques path
1980	unless ($self->{deny_save}) {	2336	unless ($self->{deny_save}) {
…		…
1984	if $uniq;	2340	if $uniq;
1985	}	2341	}
1986		2342
1987	delete $cf::MAP{$self->path};	2343	delete $cf::MAP{$self->path};
1988		2344
		2345	$self->deactivate;
		2346	$_->clear_links_to ($self) for values %cf::MAP;
1989	$self->clear;	2347	$self->clear;
1990
1991	$_->clear_links_to ($self) for values %cf::MAP;
1992		2348
1993	$self->unlink_save;	2349	$self->unlink_save;
1994	$self->destroy;	2350	$self->destroy;
1995	}	2351	}
1996		2352
1997	my $nuke_counter = "aaaa";	2353	my $nuke_counter = "aaaa";
1998		2354
1999	sub nuke {	2355	sub nuke {
2000	my ($self) = @_;	2356	my ($self) = @_;
2001		2357
		2358	{
		2359	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2360
2002	delete $cf::MAP{$self->path};	2361	delete $cf::MAP{$self->path};
2003		2362
2004	$self->unlink_save;	2363	$self->unlink_save;
2005		2364
2006	bless $self, "cf::map";	2365	bless $self, "cf::map::wrap";
2007	delete $self->{deny_reset};	2366	delete $self->{deny_reset};
2008	$self->{deny_save} = 1;	2367	$self->{deny_save} = 1;
2009	$self->reset_timeout (1);	2368	$self->reset_timeout (1);
2010	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2369	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2011		2370
2012	$cf::MAP{$self->path} = $self;	2371	$cf::MAP{$self->path} = $self;
		2372	}
2013		2373
2014	$self->reset; # polite request, might not happen	2374	$self->reset; # polite request, might not happen
2015	}	2375	}
2016		2376
2017	=item $maps = cf::map::tmp_maps	2377	=item $maps = cf::map::tmp_maps
…		…
2059		2419
2060	sub unique_maps() {	2420	sub unique_maps() {
2061	[	2421	[
2062	map {	2422	map {
2063	utf8::decode $_;	2423	utf8::decode $_;
2064	/\.map$/	2424	s/\.map$//; # TODO future compatibility hack
		2425	/\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
		2426	? ()
2065	? normalise $_	2427	: normalise $_
2066	: ()
2067	} @{ aio_readdir $UNIQUEDIR or [] }	2428	} @{ aio_readdir $UNIQUEDIR or [] }
2068	]	2429	]
2069	}	2430	}
2070		2431
2071	package cf;	2432	=item cf::map::static_maps
		2433
		2434	Returns an arrayref if paths of all static maps (all preinstalled F<.map>
		2435	file in the shared directory excluding F</styles> and F</editor>). May
		2436	block.
		2437
		2438	=cut
		2439
		2440	sub static_maps() {
		2441	my @dirs = "";
		2442	my @maps;
		2443
		2444	while (@dirs) {
		2445	my $dir = shift @dirs;
		2446
		2447	next if $dir eq "/styles" || $dir eq "/editor";
		2448
		2449	my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
		2450	or return;
		2451
		2452	for (@$files) {
		2453	s/\.map$// or next;
		2454	utf8::decode $_;
		2455	push @maps, "$dir/$_";
		2456	}
		2457
		2458	push @dirs, map "$dir/$_", @$dirs;
		2459	}
		2460
		2461	\@maps
		2462	}
2072		2463
2073	=back	2464	=back
2074		2465
2075	=head3 cf::object	2466	=head3 cf::object
2076		2467
…		…
2080		2471
2081	=over 4	2472	=over 4
2082		2473
2083	=item $ob->inv_recursive	2474	=item $ob->inv_recursive
2084		2475
2085	Returns the inventory of the object _and_ their inventories, recursively.	2476	Returns the inventory of the object I<and> their inventories, recursively,
		2477	but I<not> the object itself.
2086		2478
2087	=cut	2479	=cut
2088		2480
2089	sub inv_recursive_;	2481	sub inv_recursive_;
2090	sub inv_recursive_ {	2482	sub inv_recursive_ {
…		…
2093		2485
2094	sub inv_recursive {	2486	sub inv_recursive {
2095	inv_recursive_ inv $_[0]	2487	inv_recursive_ inv $_[0]
2096	}	2488	}
2097		2489
		2490	=item $ref = $ob->ref
		2491
		2492	Creates and returns a persistent reference to an object that can be stored as a string.
		2493
		2494	=item $ob = cf::object::deref ($refstring)
		2495
		2496	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2497	even if the object actually exists. May block.
		2498
		2499	=cut
		2500
		2501	sub deref {
		2502	my ($ref) = @_;
		2503
		2504	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2505	my ($uuid, $name) = ($1, $2);
		2506	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2507	or return;
		2508	$pl->ob->uuid eq $uuid
		2509	or return;
		2510
		2511	$pl->ob
		2512	} else {
		2513	warn "$ref: cannot resolve object reference\n";
		2514	undef
		2515	}
		2516	}
		2517
2098	package cf;	2518	package cf;
2099		2519
2100	=back	2520	=back
2101		2521
2102	=head3 cf::object::player	2522	=head3 cf::object::player
…		…
2108	Sends a message to the player, as if the npc C<$npc> replied. C<$npc>	2528	Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2109	can be C<undef>. Does the right thing when the player is currently in a	2529	can be C<undef>. Does the right thing when the player is currently in a
2110	dialogue with the given NPC character.	2530	dialogue with the given NPC character.
2111		2531
2112	=cut	2532	=cut
		2533
		2534	our $SAY_CHANNEL = {
		2535	id => "say",
		2536	title => "Map",
		2537	reply => "say ",
		2538	tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
		2539	};
		2540
		2541	our $CHAT_CHANNEL = {
		2542	id => "chat",
		2543	title => "Chat",
		2544	reply => "chat ",
		2545	tooltip => "Player chat and shouts, global to the server.",
		2546	};
2113		2547
2114	# rough implementation of a future "reply" method that works	2548	# rough implementation of a future "reply" method that works
2115	# with dialog boxes.	2549	# with dialog boxes.
2116	#TODO: the first argument must go, split into a $npc->reply_to ( method	2550	#TODO: the first argument must go, split into a $npc->reply_to ( method
2117	sub cf::object::player::reply($$$;$) {	2551	sub cf::object::player::reply($$$;$) {
…		…
2124		2558
2125	} else {	2559	} else {
2126	my $pl = $self->contr;	2560	my $pl = $self->contr;
2127		2561
2128	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2562	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2129	my $diag = $pl->{npc_dialog};	2563	my $dialog = $pl->{npc_dialog};
2130	$diag->{pl}->ext_reply (	2564	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2131	$diag->{id},
2132	msgtype => "reply",
2133	msg => $diag->{pl}->expand_cfpod ($msg),
2134	add_topics => []
2135	);
2136		2565
2137	} else {	2566	} else {
2138	$msg = $npc->name . " says: $msg" if $npc;	2567	$msg = $npc->name . " says: $msg" if $npc;
2139	$self->message ($msg, $flags);	2568	$self->send_msg ($SAY_CHANNEL => $msg, $flags);
2140	}	2569	}
2141	}	2570	}
		2571	}
		2572
		2573	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2574
		2575	=cut
		2576
		2577	sub cf::object::send_msg {
		2578	my $pl = shift->contr
		2579	or return;
		2580	$pl->send_msg (@_);
2142	}	2581	}
2143		2582
2144	=item $player_object->may ("access")	2583	=item $player_object->may ("access")
2145		2584
2146	Returns wether the given player is authorized to access resource "access"	2585	Returns wether the given player is authorized to access resource "access"
…		…
2159		2598
2160	=item $player_object->enter_link	2599	=item $player_object->enter_link
2161		2600
2162	Freezes the player and moves him/her to a special map (C<{link}>).	2601	Freezes the player and moves him/her to a special map (C<{link}>).
2163		2602
2164	The player should be reasonably safe there for short amounts of time. You	2603	The player should be reasonably safe there for short amounts of time (e.g.
2165	I<MUST> call C<leave_link> as soon as possible, though.	2604	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
		2605	though, as the player cannot control the character while it is on the link
		2606	map.
2166		2607
2167	Will never block.	2608	Will never block.
2168		2609
2169	=item $player_object->leave_link ($map, $x, $y)	2610	=item $player_object->leave_link ($map, $x, $y)
2170		2611
…		…
2190	sub cf::object::player::enter_link {	2631	sub cf::object::player::enter_link {
2191	my ($self) = @_;	2632	my ($self) = @_;
2192		2633
2193	$self->deactivate_recursive;	2634	$self->deactivate_recursive;
2194		2635
		2636	++$self->{_link_recursion};
		2637
2195	return if UNIVERSAL::isa $self->map, "ext::map_link";	2638	return if UNIVERSAL::isa $self->map, "ext::map_link";
2196		2639
2197	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2640	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2198	if $self->map && $self->map->{path} ne "{link}";	2641	if $self->map && $self->map->{path} ne "{link}";
2199		2642
2200	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2643	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2201	}	2644	}
2202		2645
2203	sub cf::object::player::leave_link {	2646	sub cf::object::player::leave_link {
2204	my ($self, $map, $x, $y) = @_;	2647	my ($self, $map, $x, $y) = @_;
2205		2648
…		…
2222	($x, $y) = (-1, -1)	2665	($x, $y) = (-1, -1)
2223	unless (defined $x) && (defined $y);	2666	unless (defined $x) && (defined $y);
2224		2667
2225	# use -1 or undef as default coordinates, not 0, 0	2668	# use -1 or undef as default coordinates, not 0, 0
2226	($x, $y) = ($map->enter_x, $map->enter_y)	2669	($x, $y) = ($map->enter_x, $map->enter_y)
2227	if $x <=0 && $y <= 0;	2670	if $x <= 0 && $y <= 0;
2228		2671
2229	$map->load;	2672	$map->load;
2230	$map->load_diag;	2673	$map->load_neighbours;
2231		2674
2232	return unless $self->contr->active;	2675	return unless $self->contr->active;
2233	$self->activate_recursive;
2234		2676
2235	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2677	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2236	$self->enter_map ($map, $x, $y);	2678	if ($self->enter_map ($map, $x, $y)) {
2237	}	2679	# entering was successful
		2680	delete $self->{_link_recursion};
		2681	# only activate afterwards, to support waiting in hooks
		2682	$self->activate_recursive;
		2683	}
2238		2684
		2685	}
		2686
2239	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2687	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2240		2688
2241	Moves the player to the given map-path and coordinates by first freezing	2689	Moves the player to the given map-path and coordinates by first freezing
2242	her, loading and preparing them map, calling the provided $check callback	2690	her, loading and preparing them map, calling the provided $check callback
2243	that has to return the map if sucecssful, and then unfreezes the player on	2691	that has to return the map if sucecssful, and then unfreezes the player on
2244	the new (success) or old (failed) map position.	2692	the new (success) or old (failed) map position. In either case, $done will
		2693	be called at the end of this process.
		2694
		2695	Note that $check will be called with a potentially non-loaded map, so if
		2696	it needs a loaded map it has to call C<< ->load >>.
2245		2697
2246	=cut	2698	=cut
2247		2699
2248	our $GOTOGEN;	2700	our $GOTOGEN;
2249		2701
2250	sub cf::object::player::goto {	2702	sub cf::object::player::goto {
2251	my ($self, $path, $x, $y, $check) = @_;	2703	my ($self, $path, $x, $y, $check, $done) = @_;
		2704
		2705	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2706	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2707	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2708	($path, $x, $y) = @$EMERGENCY_POSITION;
		2709	}
2252		2710
2253	# do generation counting so two concurrent goto's will be executed in-order	2711	# do generation counting so two concurrent goto's will be executed in-order
2254	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2712	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2255		2713
2256	$self->enter_link;	2714	$self->enter_link;
2257		2715
2258	(async {	2716	(async {
		2717	$Coro::current->{desc} = "player::goto $path $x $y";
		2718
		2719	# *tag paths override both path and x|y
		2720	if ($path =~ /^\*(.*)$/) {
		2721	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2722	my $ob = $obs[rand @obs];
		2723
		2724	# see if we actually can go there
		2725	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2726	$ob = $obs[rand @obs];
		2727	} else {
		2728	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2729	}
		2730	# else put us there anyways for now #d#
		2731
		2732	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2733	} else {
		2734	($path, $x, $y) = (undef, undef, undef);
		2735	}
		2736	}
		2737
2259	my $map = eval {	2738	my $map = eval {
2260	my $map = cf::map::find $path;	2739	my $map = defined $path ? cf::map::find $path : undef;
2261		2740
2262	if ($map) {	2741	if ($map) {
2263	$map = $map->customise_for ($self);	2742	$map = $map->customise_for ($self);
2264	$map = $check->($map) if $check && $map;	2743	$map = $check->($map, $x, $y, $self) if $check && $map;
2265	} else {	2744	} else {
2266	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2745	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2267	}	2746	}
2268		2747
2269	$map	2748	$map
2270	};	2749	};
2271		2750
…		…
2276		2755
2277	if ($gen == $self->{_goto_generation}) {	2756	if ($gen == $self->{_goto_generation}) {
2278	delete $self->{_goto_generation};	2757	delete $self->{_goto_generation};
2279	$self->leave_link ($map, $x, $y);	2758	$self->leave_link ($map, $x, $y);
2280	}	2759	}
		2760
		2761	$done->($self) if $done;
2281	})->prio (1);	2762	})->prio (1);
2282	}	2763	}
2283		2764
2284	=item $player_object->enter_exit ($exit_object)	2765	=item $player_object->enter_exit ($exit_object)
2285		2766
…		…
2305	}	2786	}
2306		2787
2307	sub prepare_random_map {	2788	sub prepare_random_map {
2308	my ($exit) = @_;	2789	my ($exit) = @_;
2309		2790
2310	my $guard = cf::lock_acquire "exit_prepare:$exit";
2311
2312	# all this does is basically replace the /! path by	2791	# all this does is basically replace the /! path by
2313	# a new random map path (?random/...) with a seed	2792	# a new random map path (?random/...) with a seed
2314	# that depends on the exit object	2793	# that depends on the exit object
2315		2794
2316	my $rmp = parse_random_map_params $exit->msg;	2795	my $rmp = parse_random_map_params $exit->msg;
…		…
2318	if ($exit->map) {	2797	if ($exit->map) {
2319	$rmp->{region} = $exit->region->name;	2798	$rmp->{region} = $exit->region->name;
2320	$rmp->{origin_map} = $exit->map->path;	2799	$rmp->{origin_map} = $exit->map->path;
2321	$rmp->{origin_x} = $exit->x;	2800	$rmp->{origin_x} = $exit->x;
2322	$rmp->{origin_y} = $exit->y;	2801	$rmp->{origin_y} = $exit->y;
		2802
		2803	$exit->map->touch;
2323	}	2804	}
2324		2805
2325	$rmp->{random_seed} ||= $exit->random_seed;	2806	$rmp->{random_seed} ||= $exit->random_seed;
2326		2807
2327	my $data = cf::to_json $rmp;	2808	my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2328	my $md5 = Digest::MD5::md5_hex $data;	2809	my $md5 = Digest::MD5::md5_hex $data;
2329	my $meta = "$RANDOMDIR/$md5.meta";	2810	my $meta = "$RANDOMDIR/$md5.meta";
2330		2811
2331	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2812	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2332	aio_write $fh, 0, (length $data), $data, 0;	2813	aio_write $fh, 0, (length $data), $data, 0;
2333	undef $fh;	2814	undef $fh;
2334	aio_rename "$meta~", $meta;	2815	aio_rename "$meta~", $meta;
2335		2816
		2817	my $slaying = "?random/$md5";
		2818
		2819	if ($exit->valid) {
2336	$exit->slaying ("?random/$md5");	2820	$exit->slaying ("?random/$md5");
2337	$exit->msg (undef);	2821	$exit->msg (undef);
		2822	}
2338	}	2823	}
2339	}	2824	}
2340		2825
2341	sub cf::object::player::enter_exit {	2826	sub cf::object::player::enter_exit {
2342	my ($self, $exit) = @_;	2827	my ($self, $exit) = @_;
2343		2828
2344	return unless $self->type == cf::PLAYER;	2829	return unless $self->type == cf::PLAYER;
2345		2830
2346	if ($exit->slaying eq "/!") {
2347	#TODO: this should de-fi-ni-te-ly not be a sync-job
2348	# the problem is that $exit might not survive long enough
2349	# so it needs to be done right now, right here
2350	cf::sync_job { prepare_random_map $exit };
2351	}
2352
2353	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2354	my $hp = $exit->stats->hp;
2355	my $sp = $exit->stats->sp;
2356
2357	$self->enter_link;	2831	$self->enter_link;
2358		2832
2359	(async {	2833	(async {
2360	$self->deactivate_recursive; # just to be sure	2834	$Coro::current->{desc} = "enter_exit";
		2835
2361	unless (eval {	2836	unless (eval {
		2837	$self->deactivate_recursive; # just to be sure
		2838
		2839	# random map handling
		2840	{
		2841	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2842
		2843	prepare_random_map $exit
		2844	if $exit->slaying eq "/!";
		2845	}
		2846
		2847	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
		2848	my $x = $exit->stats->hp;
		2849	my $y = $exit->stats->sp;
		2850
2362	$self->goto ($slaying, $hp, $sp);	2851	$self->goto ($map, $x, $y);
2363		2852
		2853	# if exit is damned, update players death & WoR home-position
		2854	$self->contr->savebed ($map, $x, $y)
		2855	if $exit->flag (cf::FLAG_DAMNED);
		2856
2364	1;	2857	1
2365	}) {	2858	}) {
2366	$self->message ("Something went wrong deep within the crossfire server. "	2859	$self->message ("Something went wrong deep within the deliantra server. "
2367	. "I'll try to bring you back to the map you were before. "	2860	. "I'll try to bring you back to the map you were before. "
2368	. "Please report this to the dungeon master!",	2861	. "Please report this to the dungeon master!",
2369	cf::NDI_UNIQUE | cf::NDI_RED);	2862	cf::NDI_UNIQUE | cf::NDI_RED);
2370		2863
2371	warn "ERROR in enter_exit: $@";	2864	error "ERROR in enter_exit: $@";
2372	$self->leave_link;	2865	$self->leave_link;
2373	}	2866	}
2374	})->prio (1);	2867	})->prio (1);
2375	}	2868	}
2376		2869
…		…
2390		2883
2391	utf8::encode $text;	2884	utf8::encode $text;
2392	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2885	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2393	}	2886	}
2394		2887
		2888	=item $client->send_big_packet ($pkt)
		2889
		2890	Like C<send_packet>, but tries to compress large packets, and fragments
		2891	them as required.
		2892
		2893	=cut
		2894
		2895	our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
		2896
		2897	sub cf::client::send_big_packet {
		2898	my ($self, $pkt) = @_;
		2899
		2900	# try lzf for large packets
		2901	$pkt = "lzf " . Compress::LZF::compress $pkt
		2902	if 1024 <= length $pkt and $self->{can_lzf};
		2903
		2904	# split very large packets
		2905	if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
		2906	$self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
		2907	$pkt = "frag";
		2908	}
		2909
		2910	$self->send_packet ($pkt);
		2911	}
		2912
2395	=item $client->send_msg ($color, $type, $msg, [extra...])	2913	=item $client->send_msg ($channel, $msg, $color, [extra...])
2396		2914
2397	Send a drawinfo or msg packet to the client, formatting the msg for the	2915	Send a drawinfo or msg packet to the client, formatting the msg for the
2398	client if neccessary. C<$type> should be a string identifying the type of	2916	client if neccessary. C<$type> should be a string identifying the type of
2399	the message, with C<log> being the default. If C<$color> is negative, suppress	2917	the message, with C<log> being the default. If C<$color> is negative, suppress
2400	the message unless the client supports the msg packet.	2918	the message unless the client supports the msg packet.
2401		2919
2402	=cut	2920	=cut
2403		2921
		2922	# non-persistent channels (usually the info channel)
		2923	our %CHANNEL = (
		2924	"c/motd" => {
		2925	id => "infobox",
		2926	title => "MOTD",
		2927	reply => undef,
		2928	tooltip => "The message of the day",
		2929	},
		2930	"c/identify" => {
		2931	id => "infobox",
		2932	title => "Identify",
		2933	reply => undef,
		2934	tooltip => "Items recently identified",
		2935	},
		2936	"c/examine" => {
		2937	id => "infobox",
		2938	title => "Examine",
		2939	reply => undef,
		2940	tooltip => "Signs and other items you examined",
		2941	},
		2942	"c/shopinfo" => {
		2943	id => "infobox",
		2944	title => "Shop Info",
		2945	reply => undef,
		2946	tooltip => "What your bargaining skill tells you about the shop",
		2947	},
		2948	"c/book" => {
		2949	id => "infobox",
		2950	title => "Book",
		2951	reply => undef,
		2952	tooltip => "The contents of a note or book",
		2953	},
		2954	"c/lookat" => {
		2955	id => "infobox",
		2956	title => "Look",
		2957	reply => undef,
		2958	tooltip => "What you saw there",
		2959	},
		2960	"c/who" => {
		2961	id => "infobox",
		2962	title => "Players",
		2963	reply => undef,
		2964	tooltip => "Shows players who are currently online",
		2965	},
		2966	"c/body" => {
		2967	id => "infobox",
		2968	title => "Body Parts",
		2969	reply => undef,
		2970	tooltip => "Shows which body parts you posess and are available",
		2971	},
		2972	"c/statistics" => {
		2973	id => "infobox",
		2974	title => "Statistics",
		2975	reply => undef,
		2976	tooltip => "Shows your primary statistics",
		2977	},
		2978	"c/skills" => {
		2979	id => "infobox",
		2980	title => "Skills",
		2981	reply => undef,
		2982	tooltip => "Shows your experience per skill and item power",
		2983	},
		2984	"c/shopitems" => {
		2985	id => "infobox",
		2986	title => "Shop Items",
		2987	reply => undef,
		2988	tooltip => "Shows the items currently for sale in this shop",
		2989	},
		2990	"c/resistances" => {
		2991	id => "infobox",
		2992	title => "Resistances",
		2993	reply => undef,
		2994	tooltip => "Shows your resistances",
		2995	},
		2996	"c/pets" => {
		2997	id => "infobox",
		2998	title => "Pets",
		2999	reply => undef,
		3000	tooltip => "Shows information abotu your pets/a specific pet",
		3001	},
		3002	"c/perceiveself" => {
		3003	id => "infobox",
		3004	title => "Perceive Self",
		3005	reply => undef,
		3006	tooltip => "You gained detailed knowledge about yourself",
		3007	},
		3008	"c/uptime" => {
		3009	id => "infobox",
		3010	title => "Uptime",
		3011	reply => undef,
		3012	tooltip => "How long the server has been running since last restart",
		3013	},
		3014	"c/mapinfo" => {
		3015	id => "infobox",
		3016	title => "Map Info",
		3017	reply => undef,
		3018	tooltip => "Information related to the maps",
		3019	},
		3020	"c/party" => {
		3021	id => "party",
		3022	title => "Party",
		3023	reply => "gsay ",
		3024	tooltip => "Messages and chat related to your party",
		3025	},
		3026	"c/death" => {
		3027	id => "death",
		3028	title => "Death",
		3029	reply => undef,
		3030	tooltip => "Reason for and more info about your most recent death",
		3031	},
		3032	"c/say" => $SAY_CHANNEL,
		3033	"c/chat" => $CHAT_CHANNEL,
		3034	);
		3035
2404	sub cf::client::send_msg {	3036	sub cf::client::send_msg {
2405	my ($self, $color, $type, $msg, @extra) = @_;	3037	my ($self, $channel, $msg, $color, @extra) = @_;
2406		3038
2407	$msg = $self->pl->expand_cfpod ($msg);	3039	$msg = $self->pl->expand_cfpod ($msg)
		3040	unless $color & cf::NDI_VERBATIM;
2408		3041
2409	if ($self->can_msg) {	3042	$color &= cf::NDI_CLIENT_MASK; # just in case...
2410	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
2411	} else {
2412	# replace some tags by gcfclient-compatible ones
2413	for ($msg) {
2414	1 while
2415	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2416	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2417	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2418	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2419	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2420	}
2421		3043
2422	if ($color >= 0) {	3044	# check predefined channels, for the benefit of C
2423	if (0 && $msg =~ /\[/) {	3045	if ($CHANNEL{$channel}) {
2424	$self->send_packet ("drawextinfo $color 4 0 $msg")	3046	$channel = $CHANNEL{$channel};
2425	} else {	3047
2426	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;	3048	$self->ext_msg (channel_info => $channel);
2427	$self->send_packet ("drawinfo $color $msg")	3049	$channel = $channel->{id};
		3050
		3051	} elsif (ref $channel) {
		3052	# send meta info to client, if not yet sent
		3053	unless (exists $self->{channel}{$channel->{id}}) {
		3054	$self->{channel}{$channel->{id}} = $channel;
		3055	$self->ext_msg (channel_info => $channel);
2428	}	3056	}
2429	}
2430	}
2431	}
2432		3057
		3058	$channel = $channel->{id};
		3059	}
		3060
		3061	return unless @extra || length $msg;
		3062
		3063	# default colour, mask it out
		3064	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		3065	if $color & cf::NDI_DEF;
		3066
		3067	my $pkt = "msg "
		3068	. $self->{json_coder}->encode (
		3069	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
		3070	);
		3071
		3072	$self->send_big_packet ($pkt);
		3073	}
		3074
2433	=item $client->ext_event ($type, %msg)	3075	=item $client->ext_msg ($type, @msg)
2434		3076
2435	Sends an ext event to the client.	3077	Sends an ext event to the client.
2436		3078
2437	=cut	3079	=cut
2438		3080
2439	sub cf::client::ext_event($$%) {	3081	sub cf::client::ext_msg($$@) {
2440	my ($self, $type, %msg) = @_;	3082	my ($self, $type, @msg) = @_;
2441		3083
		3084	if ($self->extcmd == 2) {
		3085	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		3086	} elsif ($self->extcmd == 1) { # TODO: remove
2442	$msg{msgtype} = "event_$type";	3087	push @msg, msgtype => "event_$type";
2443	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	3088	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		3089	}
		3090	}
		3091
		3092	=item $client->ext_reply ($msgid, @msg)
		3093
		3094	Sends an ext reply to the client.
		3095
		3096	=cut
		3097
		3098	sub cf::client::ext_reply($$@) {
		3099	my ($self, $id, @msg) = @_;
		3100
		3101	if ($self->extcmd == 2) {
		3102	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		3103	} elsif ($self->extcmd == 1) {
		3104	#TODO: version 1, remove
		3105	unshift @msg, msgtype => "reply", msgid => $id;
		3106	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		3107	}
2444	}	3108	}
2445		3109
2446	=item $success = $client->query ($flags, "text", \&cb)	3110	=item $success = $client->query ($flags, "text", \&cb)
2447		3111
2448	Queues a query to the client, calling the given callback with	3112	Queues a query to the client, calling the given callback with
…		…
2503	my ($ns, $buf) = @_;	3167	my ($ns, $buf) = @_;
2504		3168
2505	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3169	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2506		3170
2507	if (ref $msg) {	3171	if (ref $msg) {
		3172	my ($type, $reply, @payload) =
		3173	"ARRAY" eq ref $msg
		3174	? @$msg
		3175	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		3176
		3177	my @reply;
		3178
2508	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	3179	if (my $cb = $EXTICMD{$type}) {
2509	if (my %reply = $cb->($ns, $msg)) {	3180	@reply = $cb->($ns, @payload);
2510	$reply{msgid} = $msg->{msgid};
2511	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2512	}
2513	}	3181	}
		3182
		3183	$ns->ext_reply ($reply, @reply)
		3184	if $reply;
		3185
2514	} else {	3186	} else {
2515	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3187	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2516	}	3188	}
2517		3189
2518	cf::override;	3190	cf::override;
2519	},	3191	},
2520	);	3192	);
…		…
2540		3212
2541	$coro	3213	$coro
2542	}	3214	}
2543		3215
2544	cf::client->attach (	3216	cf::client->attach (
2545	on_destroy => sub {	3217	on_client_destroy => sub {
2546	my ($ns) = @_;	3218	my ($ns) = @_;
2547		3219
2548	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3220	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
2549	},	3221	},
2550	);	3222	);
…		…
2565	our $safe = new Safe "safe";	3237	our $safe = new Safe "safe";
2566	our $safe_hole = new Safe::Hole;	3238	our $safe_hole = new Safe::Hole;
2567		3239
2568	$SIG{FPE} = 'IGNORE';	3240	$SIG{FPE} = 'IGNORE';
2569		3241
2570	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	3242	$safe->permit_only (Opcode::opset qw(
		3243	:base_core :base_mem :base_orig :base_math :base_loop
		3244	grepstart grepwhile mapstart mapwhile
		3245	sort time
		3246	));
2571		3247
2572	# here we export the classes and methods available to script code	3248	# here we export the classes and methods available to script code
2573		3249
2574	=pod	3250	=pod
2575		3251
2576	The following functions and methods are available within a safe environment:	3252	The following functions and methods are available within a safe environment:
2577		3253
2578	cf::object contr pay_amount pay_player map	3254	cf::object
		3255	contr pay_amount pay_player map x y force_find force_add destroy
		3256	insert remove name archname title slaying race decrease split
		3257	value
		3258
2579	cf::object::player player	3259	cf::object::player
2580	cf::player peaceful	3260	player
2581	cf::map trigger	3261
		3262	cf::player
		3263	peaceful
		3264
		3265	cf::map
		3266	trigger
2582		3267
2583	=cut	3268	=cut
2584		3269
2585	for (	3270	for (
2586	["cf::object" => qw(contr pay_amount pay_player map)],	3271	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		3272	insert remove inv nrof name archname title slaying race
		3273	decrease split destroy change_exp value msg lore send_msg)],
2587	["cf::object::player" => qw(player)],	3274	["cf::object::player" => qw(player)],
2588	["cf::player" => qw(peaceful)],	3275	["cf::player" => qw(peaceful send_msg)],
2589	["cf::map" => qw(trigger)],	3276	["cf::map" => qw(trigger)],
2590	) {	3277	) {
2591	no strict 'refs';
2592	my ($pkg, @funs) = @$_;	3278	my ($pkg, @funs) = @$_;
2593	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3279	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2594	for @funs;	3280	for @funs;
2595	}	3281	}
2596		3282
…		…
2611		3297
2612	my $qcode = $code;	3298	my $qcode = $code;
2613	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3299	$qcode =~ s/"/‟/g; # not allowed in #line filenames
2614	$qcode =~ s/\n/\\n/g;	3300	$qcode =~ s/\n/\\n/g;
2615		3301
		3302	%vars = (_dummy => 0) unless %vars;
		3303
		3304	my @res;
2616	local $_;	3305	local $_;
2617	local @safe::cf::_safe_eval_args = values %vars;
2618		3306
2619	my $eval =	3307	my $eval =
2620	"do {\n"	3308	"do {\n"
2621	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3309	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2622	. "#line 0 \"{$qcode}\"\n"	3310	. "#line 0 \"{$qcode}\"\n"
2623	. $code	3311	. $code
2624	. "\n}"	3312	. "\n}"
2625	;	3313	;
2626		3314
		3315	if ($CFG{safe_eval}) {
2627	sub_generation_inc;	3316	sub_generation_inc;
		3317	local @safe::cf::_safe_eval_args = values %vars;
2628	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3318	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2629	sub_generation_inc;	3319	sub_generation_inc;
		3320	} else {
		3321	local @cf::_safe_eval_args = values %vars;
		3322	@res = wantarray ? eval eval : scalar eval $eval;
		3323	}
2630		3324
2631	if ($@) {	3325	if ($@) {
2632	warn "$@";	3326	warn "$@",
2633	warn "while executing safe code '$code'\n";	3327	"while executing safe code '$code'\n",
2634	warn "with arguments " . (join " ", %vars) . "\n";	3328	"with arguments " . (join " ", %vars) . "\n";
2635	}	3329	}
2636		3330
2637	wantarray ? @res : $res[0]	3331	wantarray ? @res : $res[0]
2638	}	3332	}
2639		3333
…		…
2653	=cut	3347	=cut
2654		3348
2655	sub register_script_function {	3349	sub register_script_function {
2656	my ($fun, $cb) = @_;	3350	my ($fun, $cb) = @_;
2657		3351
2658	no strict 'refs';	3352	$fun = "safe::$fun" if $CFG{safe_eval};
2659	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3353	*$fun = $safe_hole->wrap ($cb);
2660	}	3354	}
2661		3355
2662	=back	3356	=back
2663		3357
2664	=cut	3358	=cut
2665		3359
2666	#############################################################################	3360	#############################################################################
2667	# the server's init and main functions	3361	# the server's init and main functions
2668		3362
		3363	# async inc loader. yay.
		3364	sub inc_loader {
		3365	my $mod = $_[1];
		3366
		3367	if (in_main && !tick_inhibit) {
		3368	Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
		3369	} else {
		3370	debug "loading perl module $mod\n";
		3371	}
		3372
		3373	# 1. find real file
		3374	for my $dir (@ORIG_INC) {
		3375	ref $dir and next;
		3376	0 <= Coro::AIO::aio_load "$dir/$mod", my $data
		3377	or next;
		3378
		3379	$data = "#line 1 $dir/$mod\n$data";
		3380
		3381	open my $fh, "<", \$data or die;
		3382
		3383	return $fh;
		3384	}
		3385
		3386	()
		3387	}
		3388
		3389	sub init_inc {
		3390	# save original @INC
		3391	@ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
		3392
		3393	# make sure we can do scalar-opens
		3394	open my $dummy, "<", \my $dummy2;
		3395
		3396	# execute some stuff so perl load's some of the core modules
		3397	/Ü/ =~ /ü/i;
		3398	eval { &Storable::nstore_fd };
		3399
		3400	@INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
		3401
		3402	debug "module loading will be asynchronous from this point on.";
		3403	}
		3404
2669	sub load_facedata($) {	3405	sub load_facedata($) {
2670	my ($path) = @_;	3406	my ($path) = @_;
2671		3407
		3408	# HACK to clear player env face cache, we need some signal framework
		3409	# for this (global event?)
		3410	%ext::player_env::MUSIC_FACE_CACHE = ();
		3411
		3412	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3413
2672	warn "loading facedata from $path\n";	3414	trace "loading facedata from $path\n";
2673		3415
2674	my $facedata;	3416	my $facedata;
2675	0 < aio_load $path, $facedata	3417	0 < aio_load $path, $facedata
2676	or die "$path: $!";	3418	or die "$path: $!";
2677		3419
2678	$facedata = Coro::Storable::thaw $facedata;	3420	$facedata = Coro::Storable::thaw $facedata;
2679		3421
2680	$facedata->{version} == 2	3422	$facedata->{version} == 2
2681	or cf::cleanup "$path: version mismatch, cannot proceed.";	3423	or cf::cleanup "$path: version mismatch, cannot proceed.";
2682		3424
		3425	# patch in the exptable
		3426	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
		3427	$facedata->{resource}{"res/exp_table"} = {
		3428	type => FT_RSRC,
		3429	data => $exp_table,
		3430	hash => (Digest::MD5::md5 $exp_table),
		3431	};
		3432	cf::cede_to_tick;
		3433
2683	{	3434	{
2684	my $faces = $facedata->{faceinfo};	3435	my $faces = $facedata->{faceinfo};
2685		3436
2686	while (my ($face, $info) = each %$faces) {	3437	while (my ($face, $info) = each %$faces) {
2687	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3438	my $idx = (cf::face::find $face) || cf::face::alloc $face;
		3439
2688	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3440	cf::face::set_visibility $idx, $info->{visibility};
		3441	cf::face::set_magicmap $idx, $info->{magicmap};
2689	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3442	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2690	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3443	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2691	Coro::cede;	3444
		3445	cf::cede_to_tick;
2692	}	3446	}
2693		3447
2694	while (my ($face, $info) = each %$faces) {	3448	while (my ($face, $info) = each %$faces) {
2695	next unless $info->{smooth};	3449	next unless $info->{smooth};
		3450
2696	my $idx = cf::face::find $face	3451	my $idx = cf::face::find $face
2697	or next;	3452	or next;
		3453
2698	if (my $smooth = cf::face::find $info->{smooth}) {	3454	if (my $smooth = cf::face::find $info->{smooth}) {
		3455	cf::face::set_smooth $idx, $smooth;
2699	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3456	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2700	} else {	3457	} else {
2701	warn "smooth face '$info->{smooth}' not found for face '$face'";	3458	error "smooth face '$info->{smooth}' not found for face '$face'";
2702	}	3459	}
2703	Coro::cede;	3460
		3461	cf::cede_to_tick;
2704	}	3462	}
2705	}	3463	}
2706		3464
2707	{	3465	{
2708	my $anims = $facedata->{animinfo};	3466	my $anims = $facedata->{animinfo};
2709		3467
2710	while (my ($anim, $info) = each %$anims) {	3468	while (my ($anim, $info) = each %$anims) {
2711	cf::anim::set $anim, $info->{frames}, $info->{facings};	3469	cf::anim::set $anim, $info->{frames}, $info->{facings};
2712	Coro::cede;	3470	cf::cede_to_tick;
2713	}	3471	}
2714		3472
2715	cf::anim::invalidate_all; # d'oh	3473	cf::anim::invalidate_all; # d'oh
2716	}	3474	}
2717		3475
		3476	{
		3477	my $res = $facedata->{resource};
		3478
		3479	while (my ($name, $info) = each %$res) {
		3480	if (defined $info->{type}) {
		3481	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3482
		3483	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
		3484	cf::face::set_type $idx, $info->{type};
		3485	} else {
		3486	$RESOURCE{$name} = $info; # unused
		3487	}
		3488
		3489	cf::cede_to_tick;
		3490	}
		3491	}
		3492
		3493	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
		3494
2718	1	3495	1
2719	}	3496	}
2720		3497
		3498	register_exticmd fx_want => sub {
		3499	my ($ns, $want) = @_;
		3500
		3501	while (my ($k, $v) = each %$want) {
		3502	$ns->fx_want ($k, $v);
		3503	}
		3504	};
		3505
		3506	sub load_resource_file($) {
		3507	my $guard = lock_acquire "load_resource_file";
		3508
		3509	my $status = load_resource_file_ $_[0];
		3510	get_slot 0.1, 100;
		3511	cf::arch::commit_load;
		3512
		3513	$status
		3514	}
		3515
2721	sub reload_regions {	3516	sub reload_regions {
		3517	# HACK to clear player env face cache, we need some signal framework
		3518	# for this (global event?)
		3519	%ext::player_env::MUSIC_FACE_CACHE = ();
		3520
2722	load_resource_file "$MAPDIR/regions"	3521	load_resource_file "$MAPDIR/regions"
2723	or die "unable to load regions file\n";	3522	or die "unable to load regions file\n";
		3523
		3524	for (cf::region::list) {
		3525	$_->{match} = qr/$_->{match}/
		3526	if exists $_->{match};
		3527	}
2724	}	3528	}
2725		3529
2726	sub reload_facedata {	3530	sub reload_facedata {
2727	load_facedata "$DATADIR/facedata"	3531	load_facedata "$DATADIR/facedata"
2728	or die "unable to load facedata\n";	3532	or die "unable to load facedata\n";
2729	}	3533	}
2730		3534
2731	sub reload_archetypes {	3535	sub reload_archetypes {
2732	load_resource_file "$DATADIR/archetypes"	3536	load_resource_file "$DATADIR/archetypes"
2733	or die "unable to load archetypes\n";	3537	or die "unable to load archetypes\n";
2734	#d# NEED to laod twice to resolve forward references
2735	# this really needs to be done in an extra post-pass
2736	# (which needs to be synchronous, so solve it differently)
2737	load_resource_file "$DATADIR/archetypes"
2738	or die "unable to load archetypes\n";
2739	}	3538	}
2740		3539
2741	sub reload_treasures {	3540	sub reload_treasures {
2742	load_resource_file "$DATADIR/treasures"	3541	load_resource_file "$DATADIR/treasures"
2743	or die "unable to load treasurelists\n";	3542	or die "unable to load treasurelists\n";
2744	}	3543	}
2745		3544
		3545	sub reload_sound {
		3546	trace "loading sound config from $DATADIR/sound\n";
		3547
		3548	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
		3549	or die "$DATADIR/sound $!";
		3550
		3551	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
		3552
		3553	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3554	my $sound = $soundconf->{compat}[$_]
		3555	or next;
		3556
		3557	my $face = cf::face::find "sound/$sound->[1]";
		3558	cf::sound::set $sound->[0] => $face;
		3559	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3560	}
		3561
		3562	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3563	my $face = cf::face::find "sound/$v";
		3564	cf::sound::set $k => $face;
		3565	}
		3566	}
		3567
2746	sub reload_resources {	3568	sub reload_resources {
2747	warn "reloading resource files...\n";	3569	trace "reloading resource files...\n";
2748		3570
		3571	reload_facedata;
		3572	reload_sound;
		3573	reload_archetypes;
2749	reload_regions;	3574	reload_regions;
2750	reload_facedata;
2751	#reload_archetypes;#d#
2752	reload_archetypes;
2753	reload_treasures;	3575	reload_treasures;
2754		3576
2755	warn "finished reloading resource files\n";	3577	trace "finished reloading resource files\n";
2756	}	3578	}
2757		3579
2758	sub init {	3580	sub reload_config {
2759	reload_resources;	3581	trace "reloading config file...\n";
2760	}
2761		3582
2762	sub cfg_load {
2763	open my $fh, "<:utf8", "$CONFDIR/config"	3583	open my $fh, "<:utf8", "$CONFDIR/config"
2764	or return;	3584	or return;
2765		3585
2766	local $/;	3586	local $/;
2767	*CFG = YAML::Syck::Load <$fh>;	3587	*CFG = YAML::XS::Load scalar <$fh>;
2768		3588
2769	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3589	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2770		3590
2771	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3591	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2772	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3592	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2773		3593
2774	if (exists $CFG{mlockall}) {	3594	if (exists $CFG{mlockall}) {
…		…
2776	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3596	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2777	and die "WARNING: m(un)lockall failed: $!\n";	3597	and die "WARNING: m(un)lockall failed: $!\n";
2778	};	3598	};
2779	warn $@ if $@;	3599	warn $@ if $@;
2780	}	3600	}
		3601
		3602	trace "finished reloading resource files\n";
		3603	}
		3604
		3605	sub pidfile() {
		3606	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
		3607	or die "$PIDFILE: $!";
		3608	flock $fh, &Fcntl::LOCK_EX
		3609	or die "$PIDFILE: flock: $!";
		3610	$fh
		3611	}
		3612
		3613	# make sure only one server instance is running at any one time
		3614	sub atomic {
		3615	my $fh = pidfile;
		3616
		3617	my $pid = <$fh>;
		3618	kill 9, $pid if $pid > 0;
		3619
		3620	seek $fh, 0, 0;
		3621	print $fh $$;
		3622	}
		3623
		3624	sub main_loop {
		3625	trace "EV::loop starting\n";
		3626	if (1) {
		3627	EV::loop;
		3628	}
		3629	trace "EV::loop returned\n";
		3630	goto &main_loop unless $REALLY_UNLOOP;
2781	}	3631	}
2782		3632
2783	sub main {	3633	sub main {
		3634	cf::init_globals; # initialise logging
		3635
		3636	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3637	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
		3638	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
		3639	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
		3640
		3641	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
		3642
2784	# we must not ever block the main coroutine	3643	# we must not ever block the main coroutine
2785	local $Coro::idle = sub {	3644	local $Coro::idle = sub {
2786	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3645	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2787	(async {	3646	(async {
2788	Event::one_event;	3647	$Coro::current->{desc} = "IDLE BUG HANDLER";
		3648	EV::loop EV::LOOP_ONESHOT;
2789	})->prio (Coro::PRIO_MAX);	3649	})->prio (Coro::PRIO_MAX);
2790	};	3650	};
2791		3651
2792	cfg_load;	3652	evthread_start IO::AIO::poll_fileno;
		3653
		3654	cf::sync_job {
		3655	init_inc;
		3656
		3657	cf::init_experience;
		3658	cf::init_anim;
		3659	cf::init_attackmess;
		3660	cf::init_dynamic;
		3661
		3662	cf::load_settings;
		3663	cf::load_materials;
		3664
		3665	reload_resources;
		3666	reload_config;
2793	db_init;	3667	db_init;
		3668
		3669	cf::init_uuid;
		3670	cf::init_signals;
		3671	cf::init_skills;
		3672
		3673	cf::init_beforeplay;
		3674
		3675	atomic;
		3676
2794	load_extensions;	3677	load_extensions;
2795		3678
2796	$TICK_WATCHER->start;	3679	utime time, time, $RUNTIMEFILE;
2797	Event::loop;	3680
		3681	# no (long-running) fork's whatsoever before this point(!)
		3682	use POSIX ();
		3683	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
		3684
		3685	(pop @POST_INIT)->(0) while @POST_INIT;
		3686	};
		3687
		3688	cf::object::thawer::errors_are_fatal 0;
		3689	info "parse errors in files are no longer fatal from this point on.\n";
		3690
		3691	my $free_main; $free_main = EV::idle sub {
		3692	undef $free_main;
		3693	undef &main; # free gobs of memory :)
		3694	};
		3695
		3696	goto &main_loop;
2798	}	3697	}
2799		3698
2800	#############################################################################	3699	#############################################################################
2801	# initialisation and cleanup	3700	# initialisation and cleanup
2802		3701
2803	# install some emergency cleanup handlers	3702	# install some emergency cleanup handlers
2804	BEGIN {	3703	BEGIN {
		3704	our %SIGWATCHER = ();
2805	for my $signal (qw(INT HUP TERM)) {	3705	for my $signal (qw(INT HUP TERM)) {
2806	Event->signal (	3706	$SIGWATCHER{$signal} = AE::signal $signal, sub {
2807	reentrant => 0,
2808	data => WF_AUTOCANCEL,
2809	signal => $signal,
2810	prio => 0,
2811	cb => sub {
2812	cf::cleanup "SIG$signal";	3707	cf::cleanup "SIG$signal";
2813	},
2814	);	3708	};
2815	}	3709	}
2816	}	3710	}
2817		3711
2818	sub write_runtime {	3712	sub write_runtime_sync {
2819	my $runtime = "$LOCALDIR/runtime";	3713	my $t0 = AE::time;
2820		3714
2821	# first touch the runtime file to show we are still running:	3715	# first touch the runtime file to show we are still running:
2822	# the fsync below can take a very very long time.	3716	# the fsync below can take a very very long time.
2823		3717
2824	IO::AIO::aio_utime $runtime, undef, undef;	3718	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2825		3719
2826	my $guard = cf::lock_acquire "write_runtime";	3720	my $guard = cf::lock_acquire "write_runtime";
2827		3721
2828	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	3722	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
2829	or return;	3723	or return;
2830		3724
2831	my $value = $cf::RUNTIME + 90 + 10;	3725	my $value = $cf::RUNTIME + 90 + 10;
2832	# 10 is the runtime save interval, for a monotonic clock	3726	# 10 is the runtime save interval, for a monotonic clock
2833	# 60 allows for the watchdog to kill the server.	3727	# 60 allows for the watchdog to kill the server.
…		…
2843	aio_utime $fh, undef, undef;	3737	aio_utime $fh, undef, undef;
2844		3738
2845	close $fh	3739	close $fh
2846	or return;	3740	or return;
2847		3741
2848	aio_rename "$runtime~", $runtime	3742	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2849	and return;	3743	and return;
2850		3744
2851	warn "runtime file written.\n";	3745	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
2852		3746
2853	1	3747	1
		3748	}
		3749
		3750	our $uuid_lock;
		3751	our $uuid_skip;
		3752
		3753	sub write_uuid_sync($) {
		3754	$uuid_skip ||= $_[0];
		3755
		3756	return if $uuid_lock;
		3757	local $uuid_lock = 1;
		3758
		3759	my $uuid = "$LOCALDIR/uuid";
		3760
		3761	my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
		3762	or return;
		3763
		3764	my $value = uuid_seq uuid_cur;
		3765
		3766	unless ($value) {
		3767	info "cowardly refusing to write zero uuid value!\n";
		3768	return;
		3769	}
		3770
		3771	my $value = uuid_str $value + $uuid_skip;
		3772	$uuid_skip = 0;
		3773
		3774	(aio_write $fh, 0, (length $value), $value, 0) <= 0
		3775	and return;
		3776
		3777	# always fsync - this file is important
		3778	aio_fsync $fh
		3779	and return;
		3780
		3781	close $fh
		3782	or return;
		3783
		3784	aio_rename "$uuid~", $uuid
		3785	and return;
		3786
		3787	trace "uuid file written ($value).\n";
		3788
		3789	1
		3790
		3791	}
		3792
		3793	sub write_uuid($$) {
		3794	my ($skip, $sync) = @_;
		3795
		3796	$sync ? write_uuid_sync $skip
		3797	: async { write_uuid_sync $skip };
2854	}	3798	}
2855		3799
2856	sub emergency_save() {	3800	sub emergency_save() {
2857	my $freeze_guard = cf::freeze_mainloop;	3801	my $freeze_guard = cf::freeze_mainloop;
2858		3802
2859	warn "enter emergency perl save\n";	3803	info "emergency_perl_save: enter\n";
		3804
		3805	# this is a trade-off: we want to be very quick here, so
		3806	# save all maps without fsync, and later call a global sync
		3807	# (which in turn might be very very slow)
		3808	local $USE_FSYNC = 0;
2860		3809
2861	cf::sync_job {	3810	cf::sync_job {
		3811	cf::write_runtime_sync; # external watchdog should not bark
		3812
2862	# use a peculiar iteration method to avoid tripping on perl	3813	# use a peculiar iteration method to avoid tripping on perl
2863	# refcount bugs in for. also avoids problems with players	3814	# refcount bugs in for. also avoids problems with players
2864	# and maps saved/destroyed asynchronously.	3815	# and maps saved/destroyed asynchronously.
2865	warn "begin emergency player save\n";	3816	info "emergency_perl_save: begin player save\n";
2866	for my $login (keys %cf::PLAYER) {	3817	for my $login (keys %cf::PLAYER) {
2867	my $pl = $cf::PLAYER{$login} or next;	3818	my $pl = $cf::PLAYER{$login} or next;
2868	$pl->valid or next;	3819	$pl->valid or next;
		3820	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2869	$pl->save;	3821	$pl->save;
2870	}	3822	}
2871	warn "end emergency player save\n";	3823	info "emergency_perl_save: end player save\n";
2872		3824
2873	warn "begin emergency map save\n";	3825	cf::write_runtime_sync; # external watchdog should not bark
		3826
		3827	info "emergency_perl_save: begin map save\n";
2874	for my $path (keys %cf::MAP) {	3828	for my $path (keys %cf::MAP) {
2875	my $map = $cf::MAP{$path} or next;	3829	my $map = $cf::MAP{$path} or next;
2876	$map->valid or next;	3830	$map->valid or next;
2877	$map->save;	3831	$map->save;
2878	}	3832	}
2879	warn "end emergency map save\n";	3833	info "emergency_perl_save: end map save\n";
2880		3834
2881	warn "begin emergency database checkpoint\n";	3835	cf::write_runtime_sync; # external watchdog should not bark
		3836
		3837	info "emergency_perl_save: begin database checkpoint\n";
2882	BDB::db_env_txn_checkpoint $DB_ENV;	3838	BDB::db_env_txn_checkpoint $DB_ENV;
2883	warn "end emergency database checkpoint\n";	3839	info "emergency_perl_save: end database checkpoint\n";
		3840
		3841	info "emergency_perl_save: begin write uuid\n";
		3842	write_uuid_sync 1;
		3843	info "emergency_perl_save: end write uuid\n";
		3844
		3845	cf::write_runtime_sync; # external watchdog should not bark
		3846
		3847	trace "emergency_perl_save: syncing database to disk";
		3848	BDB::db_env_txn_checkpoint $DB_ENV;
		3849
		3850	info "emergency_perl_save: starting sync\n";
		3851	IO::AIO::aio_sync sub {
		3852	info "emergency_perl_save: finished sync\n";
		3853	};
		3854
		3855	cf::write_runtime_sync; # external watchdog should not bark
		3856
		3857	trace "emergency_perl_save: flushing outstanding aio requests";
		3858	while (IO::AIO::nreqs || BDB::nreqs) {
		3859	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
		3860	}
		3861
		3862	cf::write_runtime_sync; # external watchdog should not bark
2884	};	3863	};
2885		3864
2886	warn "leave emergency perl save\n";	3865	info "emergency_perl_save: leave\n";
2887	}	3866	}
2888		3867
2889	sub post_cleanup {	3868	sub post_cleanup {
2890	my ($make_core) = @_;	3869	my ($make_core) = @_;
2891		3870
		3871	IO::AIO::flush;
		3872
2892	warn Carp::longmess "post_cleanup backtrace"	3873	error Carp::longmess "post_cleanup backtrace"
2893	if $make_core;	3874	if $make_core;
		3875
		3876	my $fh = pidfile;
		3877	unlink $PIDFILE if <$fh> == $$;
		3878	}
		3879
		3880	# a safer delete_package, copied from Symbol
		3881	sub clear_package($) {
		3882	my $pkg = shift;
		3883
		3884	# expand to full symbol table name if needed
		3885	unless ($pkg =~ /^main::.*::$/) {
		3886	$pkg = "main$pkg" if $pkg =~ /^::/;
		3887	$pkg = "main::$pkg" unless $pkg =~ /^main::/;
		3888	$pkg .= '::' unless $pkg =~ /::$/;
		3889	}
		3890
		3891	my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
		3892	my $stem_symtab = *{$stem}{HASH};
		3893
		3894	defined $stem_symtab and exists $stem_symtab->{$leaf}
		3895	or return;
		3896
		3897	# clear all symbols
		3898	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
		3899	for my $name (keys %$leaf_symtab) {
		3900	_gv_clear *{"$pkg$name"};
		3901	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
		3902	}
2894	}	3903	}
2895		3904
2896	sub do_reload_perl() {	3905	sub do_reload_perl() {
2897	# can/must only be called in main	3906	# can/must only be called in main
2898	if ($Coro::current != $Coro::main) {	3907	if (in_main) {
2899	warn "can only reload from main coroutine";	3908	error "can only reload from main coroutine";
2900	return;	3909	return;
2901	}	3910	}
2902		3911
		3912	return if $RELOAD++;
		3913
		3914	my $t1 = AE::time;
		3915
		3916	while ($RELOAD) {
2903	warn "reloading...";	3917	info "reloading...";
2904		3918
2905	warn "entering sync_job";	3919	trace "entering sync_job";
2906		3920
2907	cf::sync_job {	3921	cf::sync_job {
2908	cf::write_runtime; # external watchdog should not bark
2909	cf::emergency_save;	3922	cf::emergency_save;
2910	cf::write_runtime; # external watchdog should not bark
2911		3923
2912	warn "syncing database to disk";
2913	BDB::db_env_txn_checkpoint $DB_ENV;
2914
2915	# if anything goes wrong in here, we should simply crash as we already saved
2916
2917	warn "cancelling all WF_AUTOCANCEL watchers";
2918	for (Event::all_watchers) {
2919	$_->cancel if $_->data & WF_AUTOCANCEL;
2920	}
2921
2922	warn "flushing outstanding aio requests";
2923	for (;;) {
2924	BDB::flush;
2925	IO::AIO::flush;
2926	Coro::cede;
2927	last unless IO::AIO::nreqs || BDB::nreqs;
2928	warn "iterate...";
2929	}
2930
2931	++$RELOAD;
2932
2933	warn "cancelling all extension coros";	3924	trace "cancelling all extension coros";
2934	$_->cancel for values %EXT_CORO;	3925	$_->cancel for values %EXT_CORO;
2935	%EXT_CORO = ();	3926	%EXT_CORO = ();
2936		3927
2937	warn "removing commands";	3928	trace "removing commands";
2938	%COMMAND = ();	3929	%COMMAND = ();
2939		3930
2940	warn "removing ext/exti commands";	3931	trace "removing ext/exti commands";
2941	%EXTCMD = ();	3932	%EXTCMD = ();
2942	%EXTICMD = ();	3933	%EXTICMD = ();
2943		3934
2944	warn "unloading/nuking all extensions";	3935	trace "unloading/nuking all extensions";
2945	for my $pkg (@EXTS) {	3936	for my $pkg (@EXTS) {
2946	warn "... unloading $pkg";	3937	trace "... unloading $pkg";
2947		3938
2948	if (my $cb = $pkg->can ("unload")) {	3939	if (my $cb = $pkg->can ("unload")) {
2949	eval {	3940	eval {
2950	$cb->($pkg);	3941	$cb->($pkg);
2951	1	3942	1
2952	} or warn "$pkg unloaded, but with errors: $@";	3943	} or error "$pkg unloaded, but with errors: $@";
		3944	}
		3945
		3946	trace "... clearing $pkg";
		3947	clear_package $pkg;
2953	}	3948	}
2954		3949
2955	warn "... nuking $pkg";
2956	Symbol::delete_package $pkg;
2957	}
2958
2959	warn "unloading all perl modules loaded from $LIBDIR";	3950	trace "unloading all perl modules loaded from $LIBDIR";
2960	while (my ($k, $v) = each %INC) {	3951	while (my ($k, $v) = each %INC) {
2961	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	3952	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2962		3953
2963	warn "... unloading $k";	3954	trace "... unloading $k";
2964	delete $INC{$k};	3955	delete $INC{$k};
2965		3956
2966	$k =~ s/\.pm$//;	3957	$k =~ s/\.pm$//;
2967	$k =~ s/\//::/g;	3958	$k =~ s/\//::/g;
2968		3959
2969	if (my $cb = $k->can ("unload_module")) {	3960	if (my $cb = $k->can ("unload_module")) {
2970	$cb->();	3961	$cb->();
		3962	}
		3963
		3964	clear_package $k;
2971	}	3965	}
2972		3966
2973	Symbol::delete_package $k;
2974	}
2975
2976	warn "getting rid of safe::, as good as possible";	3967	trace "getting rid of safe::, as good as possible";
2977	Symbol::delete_package "safe::$_"	3968	clear_package "safe::$_"
2978	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3969	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2979		3970
2980	warn "unloading cf.pm \"a bit\"";	3971	trace "unloading cf.pm \"a bit\"";
2981	delete $INC{"cf.pm"};	3972	delete $INC{"cf.pm"};
2982	delete $INC{"cf/pod.pm"};	3973	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
2983		3974
2984	# don't, removes xs symbols, too,	3975	# don't, removes xs symbols, too,
2985	# and global variables created in xs	3976	# and global variables created in xs
2986	#Symbol::delete_package __PACKAGE__;	3977	#clear_package __PACKAGE__;
2987		3978
2988	warn "unload completed, starting to reload now";	3979	info "unload completed, starting to reload now";
2989		3980
2990	warn "reloading cf.pm";	3981	trace "reloading cf.pm";
2991	require cf;	3982	require cf;
2992	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3983	cf::_connect_to_perl_1;
2993		3984
2994	warn "loading config and database again";	3985	trace "loading config and database again";
2995	cf::cfg_load;	3986	cf::reload_config;
2996		3987
2997	warn "loading extensions";	3988	trace "loading extensions";
2998	cf::load_extensions;	3989	cf::load_extensions;
2999		3990
		3991	if ($REATTACH_ON_RELOAD) {
3000	warn "reattaching attachments to objects/players";	3992	trace "reattaching attachments to objects/players";
3001	_global_reattach; # objects, sockets	3993	_global_reattach; # objects, sockets
3002	warn "reattaching attachments to maps";	3994	trace "reattaching attachments to maps";
3003	reattach $_ for values %MAP;	3995	reattach $_ for values %MAP;
3004	warn "reattaching attachments to players";	3996	trace "reattaching attachments to players";
3005	reattach $_ for values %PLAYER;	3997	reattach $_ for values %PLAYER;
		3998	}
3006		3999
		4000	trace "running post_init jobs";
		4001	(pop @POST_INIT)->(1) while @POST_INIT;
		4002
3007	warn "leaving sync_job";	4003	trace "leaving sync_job";
3008		4004
3009	1	4005	1
3010	} or do {	4006	} or do {
3011	warn $@;	4007	error $@;
3012	warn "error while reloading, exiting.";	4008	cf::cleanup "error while reloading, exiting.";
3013	exit 1;	4009	};
		4010
		4011	info "reloaded";
		4012	--$RELOAD;
3014	};	4013	}
3015		4014
3016	warn "reloaded";	4015	$t1 = AE::time - $t1;
		4016	info "reload completed in ${t1}s\n";
3017	};	4017	};
3018		4018
3019	our $RELOAD_WATCHER; # used only during reload	4019	our $RELOAD_WATCHER; # used only during reload
3020		4020
3021	sub reload_perl() {	4021	sub reload_perl() {
3022	# doing reload synchronously and two reloads happen back-to-back,	4022	# doing reload synchronously and two reloads happen back-to-back,
3023	# coro crashes during coro_state_free->destroy here.	4023	# coro crashes during coro_state_free->destroy here.
3024		4024
3025	$RELOAD_WATCHER ||= Event->timer (	4025	$RELOAD_WATCHER ||= cf::async {
3026	reentrant => 0,	4026	Coro::AIO::aio_wait cache_extensions;
3027	after => 0,	4027
3028	data => WF_AUTOCANCEL,	4028	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3029	cb => sub {
3030	do_reload_perl;	4029	do_reload_perl;
3031	undef $RELOAD_WATCHER;	4030	undef $RELOAD_WATCHER;
3032	},	4031	};
3033	);	4032	};
3034	}	4033	}
3035		4034
3036	register_command "reload" => sub {	4035	register_command "reload" => sub {
3037	my ($who, $arg) = @_;	4036	my ($who, $arg) = @_;
3038		4037
3039	if ($who->flag (FLAG_WIZ)) {	4038	if ($who->flag (FLAG_WIZ)) {
3040	$who->message ("reloading server.");	4039	$who->message ("reloading server.");
		4040	async {
		4041	$Coro::current->{desc} = "perl_reload";
3041	async { reload_perl };	4042	reload_perl;
		4043	};
3042	}	4044	}
3043	};	4045	};
3044		4046
3045	unshift @INC, $LIBDIR;	4047	#############################################################################
3046		4048
3047	my $bug_warning = 0;	4049	my $bug_warning = 0;
3048		4050
3049	our @WAIT_FOR_TICK;	4051	our @WAIT_FOR_TICK;
3050	our @WAIT_FOR_TICK_BEGIN;	4052	our @WAIT_FOR_TICK_BEGIN;
3051		4053
3052	sub wait_for_tick {	4054	sub wait_for_tick {
3053	return unless $TICK_WATCHER->is_active;
3054	return if $Coro::current == $Coro::main;	4055	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3055		4056
3056	my $signal = new Coro::Signal;	4057	my $signal = new Coro::Signal;
3057	push @WAIT_FOR_TICK, $signal;	4058	push @WAIT_FOR_TICK, $signal;
3058	$signal->wait;	4059	$signal->wait;
3059	}	4060	}
3060		4061
3061	sub wait_for_tick_begin {	4062	sub wait_for_tick_begin {
3062	return unless $TICK_WATCHER->is_active;
3063	return if $Coro::current == $Coro::main;	4063	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3064		4064
3065	my $signal = new Coro::Signal;	4065	my $signal = new Coro::Signal;
3066	push @WAIT_FOR_TICK_BEGIN, $signal;	4066	push @WAIT_FOR_TICK_BEGIN, $signal;
3067	$signal->wait;	4067	$signal->wait;
3068	}	4068	}
3069		4069
3070	my $min = 1e6;#d#	4070	sub tick {
3071	my $avg = 10;
3072	$TICK_WATCHER = Event->timer (
3073	reentrant => 0,
3074	parked => 1,
3075	prio => 0,
3076	at => $NEXT_TICK || $TICK,
3077	data => WF_AUTOCANCEL,
3078	cb => sub {
3079	if ($Coro::current != $Coro::main) {	4071	if ($Coro::current != $Coro::main) {
3080	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4072	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3081	unless ++$bug_warning > 10;	4073	unless ++$bug_warning > 10;
3082	return;	4074	return;
3083	}	4075	}
3084		4076
3085	$NOW = $tick_start = Event::time;
3086
3087	cf::server_tick; # one server iteration	4077	cf::server_tick; # one server iteration
3088		4078
3089	0 && sync_job {#d#	4079	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3090	for(1..10) {
3091	my $t = Event::time;
3092	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3093	or die;
3094		4080
3095	$map->width (50);	4081	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3096	$map->height (50);	4082	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3097	$map->alloc;	4083	Coro::async_pool {
3098	$map->_load_objects ("/tmp/x.map", 1);	4084	$Coro::current->{desc} = "runtime saver";
3099	my $t = Event::time - $t;	4085	write_runtime_sync
3100		4086	or error "ERROR: unable to write runtime file: $!";
3101	#next unless $t < 0.0013;#d#
3102	if ($t < $min) {
3103	$min = $t;
3104	}
3105	$avg = $avg * 0.99 + $t * 0.01;
3106	}
3107	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3108	exit 0;
3109	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3110	};	4087	};
		4088	}
3111		4089
3112	$RUNTIME += $TICK;
3113	$NEXT_TICK += $TICK;
3114
3115	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3116	$NEXT_RUNTIME_WRITE = $NOW + 10;
3117	Coro::async_pool {
3118	write_runtime
3119	or warn "ERROR: unable to write runtime file: $!";
3120	};
3121	}
3122
3123	# my $AFTER = Event::time;
3124	# warn $AFTER - $NOW;#d#
3125
3126	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4090	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3127	$sig->send;	4091	$sig->send;
3128	}	4092	}
3129	while (my $sig = shift @WAIT_FOR_TICK) {	4093	while (my $sig = shift @WAIT_FOR_TICK) {
3130	$sig->send;	4094	$sig->send;
3131	}	4095	}
3132		4096
3133	$NOW = Event::time;	4097	$LOAD = ($NOW - $TICK_START) / $TICK;
3134
3135	# if we are delayed by four ticks or more, skip them all
3136	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3137
3138	$TICK_WATCHER->at ($NEXT_TICK);
3139	$TICK_WATCHER->start;
3140
3141	$LOAD = ($NOW - $tick_start) / $TICK;
3142	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4098	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3143		4099
3144	_post_tick;	4100	if (0) {
3145		4101	if ($NEXT_TICK) {
3146		4102	my $jitter = $TICK_START - $NEXT_TICK;
		4103	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
		4104	debug "jitter $JITTER\n";#d#
		4105	}
3147	},	4106	}
3148	);	4107	}
3149		4108
3150	{	4109	{
3151	BDB::max_poll_time $TICK * 0.1;	4110	# configure BDB
3152	$BDB_POLL_WATCHER = Event->io (	4111
3153	reentrant => 0,
3154	fd => BDB::poll_fileno,
3155	poll => 'r',
3156	prio => 0,
3157	data => WF_AUTOCANCEL,
3158	cb => \&BDB::poll_cb,
3159	);
3160	BDB::min_parallel 8;	4112	BDB::min_parallel 16;
3161		4113	BDB::max_poll_reqs $TICK * 0.1;
3162	BDB::set_sync_prepare {	4114	$AnyEvent::BDB::WATCHER->priority (1);
3163	my $status;
3164	my $current = $Coro::current;
3165	(
3166	sub {
3167	$status = $!;
3168	$current->ready; undef $current;
3169	},
3170	sub {
3171	Coro::schedule while defined $current;
3172	$! = $status;
3173	},
3174	)
3175	};
3176		4115
3177	unless ($DB_ENV) {	4116	unless ($DB_ENV) {
3178	$DB_ENV = BDB::db_env_create;	4117	$DB_ENV = BDB::db_env_create;
		4118	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
		4119	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
		4120	$DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
		4121	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		4122	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3179		4123
3180	cf::sync_job {	4124	cf::sync_job {
3181	eval {	4125	eval {
3182	BDB::db_env_open	4126	BDB::db_env_open
3183	$DB_ENV,	4127	$DB_ENV,
…		…
3185	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	4129	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3186	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	4130	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3187	0666;	4131	0666;
3188		4132
3189	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	4133	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3190
3191	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3192	$DB_ENV->set_lk_detect;
3193	};	4134	};
3194		4135
3195	cf::cleanup "db_env_open(db): $@" if $@;	4136	cf::cleanup "db_env_open(db): $@" if $@;
3196	};	4137	};
3197	}	4138	}
		4139
		4140	$BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
		4141	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		4142	};
		4143	$BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
		4144	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		4145	};
		4146	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
		4147	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		4148	};
3198	}	4149	}
3199		4150
3200	{	4151	{
		4152	# configure IO::AIO
		4153
3201	IO::AIO::min_parallel 8;	4154	IO::AIO::min_parallel 8;
3202
3203	undef $Coro::AIO::WATCHER;
3204	IO::AIO::max_poll_time $TICK * 0.1;	4155	IO::AIO::max_poll_time $TICK * 0.1;
3205	$AIO_POLL_WATCHER = Event->io (	4156	undef $AnyEvent::AIO::WATCHER;
3206	reentrant => 0,
3207	data => WF_AUTOCANCEL,
3208	fd => IO::AIO::poll_fileno,
3209	poll => 'r',
3210	prio => 6,
3211	cb => \&IO::AIO::poll_cb,
3212	);
3213	}	4157	}
3214		4158
3215	my $_log_backtrace;	4159	my $_log_backtrace;
3216		4160
3217	sub _log_backtrace {	4161	sub _log_backtrace {
…		…
3220	$msg =~ s/\n//;	4164	$msg =~ s/\n//;
3221		4165
3222	# limit the # of concurrent backtraces	4166	# limit the # of concurrent backtraces
3223	if ($_log_backtrace < 2) {	4167	if ($_log_backtrace < 2) {
3224	++$_log_backtrace;	4168	++$_log_backtrace;
		4169	my $perl_bt = Carp::longmess $msg;
3225	async {	4170	async {
		4171	$Coro::current->{desc} = "abt $msg";
		4172
3226	my @bt = fork_call {	4173	my @bt = fork_call {
3227	@addr = map { sprintf "%x", $_ } @addr;	4174	@addr = map { sprintf "%x", $_ } @addr;
3228	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	4175	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3229	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"	4176	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3230	or die "addr2line: $!";	4177	or die "addr2line: $!";
…		…
3238	}	4185	}
3239		4186
3240	@funcs	4187	@funcs
3241	};	4188	};
3242		4189
3243	LOG llevInfo, "[ABT] $msg\n";	4190	LOG llevInfo, "[ABT] $perl_bt\n";
		4191	LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3244	LOG llevInfo, "[ABT] $_\n" for @bt;	4192	LOG llevInfo, "[ABT] $_\n" for @bt;
3245	--$_log_backtrace;	4193	--$_log_backtrace;
3246	};	4194	};
3247	} else {	4195	} else {
3248	LOG llevInfo, "[ABT] $msg\n";	4196	LOG llevInfo, "[ABT] $msg\n";
3249	LOG llevInfo, "[ABT] [suppressed]\n";	4197	LOG llevInfo, "[ABT] [suppressed]\n";
3250	}	4198	}
3251	}	4199	}
3252		4200
3253	# load additional modules	4201	# load additional modules
3254	use cf::pod;	4202	require "cf/$_.pm" for @EXTRA_MODULES;
		4203	cf::_connect_to_perl_2;
3255		4204
3256	END { cf::emergency_save }	4205	END { cf::emergency_save }
3257		4206
3258	1	4207	1
3259		4208

Diff Legend

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