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

Diff Legend

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