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.363 by root, Mon Sep 10 17:24:36 2007 UTC vs.
Revision 1.522 by root, Sat Apr 17 02:22:14 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
		25	use 5.10.0;
3	use utf8;	26	use utf8;
4	use strict;	27	use strict qw(vars subs);
5		28
6	use Symbol;	29	use Symbol;
7	use List::Util;	30	use List::Util;
8	use Socket;	31	use Socket;
9	use Storable;	32	use EV;
10	use Event;
11	use Opcode;	33	use Opcode;
12	use Safe;	34	use Safe;
13	use Safe::Hole;	35	use Safe::Hole;
		36	use Storable ();
		37	use Carp ();
14		38
		39	use Guard ();
15	use Coro 3.64 ();	40	use Coro ();
16	use Coro::State;	41	use Coro::State;
17	use Coro::Handle;	42	use Coro::Handle;
		43	use Coro::EV;
18	use Coro::Event;	44	use Coro::AnyEvent;
19	use Coro::Timer;	45	use Coro::Timer;
20	use Coro::Signal;	46	use Coro::Signal;
21	use Coro::Semaphore;	47	use Coro::Semaphore;
		48	use Coro::SemaphoreSet;
		49	use Coro::AnyEvent;
22	use Coro::AIO;	50	use Coro::AIO;
		51	use Coro::BDB 1.6;
23	use Coro::Storable;	52	use Coro::Storable;
24	use Coro::Util ();	53	use Coro::Util ();
25		54
26	use JSON::XS ();	55	use JSON::XS 2.01 ();
27	use BDB ();	56	use BDB ();
28	use Data::Dumper;	57	use Data::Dumper;
29	use Digest::MD5;
30	use Fcntl;	58	use Fcntl;
31	use YAML::Syck ();	59	use YAML::XS ();
32	use IO::AIO 2.32 ();	60	use IO::AIO ();
33	use Time::HiRes;	61	use Time::HiRes;
34	use Compress::LZF;	62	use Compress::LZF;
35	use Digest::MD5 ();	63	use Digest::MD5 ();
		64
		65	AnyEvent::detect;
36		66
37	# configure various modules to our taste	67	# configure various modules to our taste
38	#	68	#
39	$Storable::canonical = 1; # reduce rsync transfers	69	$Storable::canonical = 1; # reduce rsync transfers
40	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	70	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
		71
		72	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
		73
		74	# make sure c-lzf reinitialises itself
		75	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	76	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42		77
43	$Event::Eval = 1; # no idea why this is required, but it is	78	# strictly for debugging
44		79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46	$YAML::Syck::ImplicitUnicode = 1;
47
48	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49		80
50	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51		82
52	our %COMMAND = ();	83	our %COMMAND = ();
53	our %COMMAND_TIME = ();	84	our %COMMAND_TIME = ();
…		…
56	our %EXTCMD = ();	87	our %EXTCMD = ();
57	our %EXTICMD = ();	88	our %EXTICMD = ();
58	our %EXT_CORO = (); # coroutines bound to extensions	89	our %EXT_CORO = (); # coroutines bound to extensions
59	our %EXT_MAP = (); # pluggable maps	90	our %EXT_MAP = (); # pluggable maps
60		91
61	our $RELOAD; # number of reloads so far	92	our $RELOAD; # number of reloads so far, non-zero while in reload
62	our @EVENT;	93	our @EVENT;
		94	our @REFLECT; # set by XS
		95	our %REFLECT; # set by us
63		96
64	our $CONFDIR = confdir;	97	our $CONFDIR = confdir;
65	our $DATADIR = datadir;	98	our $DATADIR = datadir;
66	our $LIBDIR = "$DATADIR/ext";	99	our $LIBDIR = "$DATADIR/ext";
67	our $PODDIR = "$DATADIR/pod";	100	our $PODDIR = "$DATADIR/pod";
68	our $MAPDIR = "$DATADIR/" . mapdir;	101	our $MAPDIR = "$DATADIR/" . mapdir;
69	our $LOCALDIR = localdir;	102	our $LOCALDIR = localdir;
70	our $TMPDIR = "$LOCALDIR/" . tmpdir;	103	our $TMPDIR = "$LOCALDIR/" . tmpdir;
71	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73	our $RANDOMDIR = "$LOCALDIR/random";	106	our $RANDOMDIR = "$LOCALDIR/random";
74	our $BDBDIR = "$LOCALDIR/db";	107	our $BDBDIR = "$LOCALDIR/db";
		108	our $PIDFILE = "$LOCALDIR/pid";
		109	our $RUNTIMEFILE = "$LOCALDIR/runtime";
		110
		111	our %RESOURCE;
		112
		113	our $OUTPUT_RATE_MIN = 4000;
		114	our $OUTPUT_RATE_MAX = 100000;
75		115
76	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	116	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77	our $TICK_WATCHER;
78	our $AIO_POLL_WATCHER;
79	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	117	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80	our $NEXT_TICK;	118	our $NEXT_TICK;
81	our $NOW;
82	our $USE_FSYNC = 1; # use fsync to write maps - default off	119	our $USE_FSYNC = 1; # use fsync to write maps - default on
83		120
84	our $BDB_POLL_WATCHER;	121	our $BDB_DEADLOCK_WATCHER;
85	our $BDB_CHECKPOINT_WATCHER;	122	our $BDB_CHECKPOINT_WATCHER;
86	our $BDB_TRICKLE_WATCHER;	123	our $BDB_TRICKLE_WATCHER;
87	our $DB_ENV;	124	our $DB_ENV;
88		125
		126	our @EXTRA_MODULES = qw(pod match mapscript);
		127
89	our %CFG;	128	our %CFG;
90		129
91	our $UPTIME; $UPTIME ||= time;	130	our $UPTIME; $UPTIME ||= time;
92	our $RUNTIME;	131	our $RUNTIME;
		132	our $NOW;
93		133
94	our (%PLAYER, %PLAYER_LOADING); # all users	134	our (%PLAYER, %PLAYER_LOADING); # all users
95	our (%MAP, %MAP_LOADING ); # all maps	135	our (%MAP, %MAP_LOADING ); # all maps
96	our $LINK_MAP; # the special {link} map, which is always available	136	our $LINK_MAP; # the special {link} map, which is always available
97		137
98	# used to convert map paths into valid unix filenames by replacing / by ∕	138	# used to convert map paths into valid unix filenames by replacing / by ∕
99	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	139	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100		140
101	our $LOAD; # a number between 0 (idle) and 1 (too many objects)	141	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102	our $LOADAVG; # same thing, but with alpha-smoothing	142	our $LOADAVG; # same thing, but with alpha-smoothing
		143	our $JITTER; # average jitter
103	our $tick_start; # for load detecting purposes	144	our $TICK_START; # for load detecting purposes
		145
		146	our @POST_INIT;
		147
		148	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
		149	our $REALLY_UNLOOP; # never set to true, please :)
104		150
105	binmode STDOUT;	151	binmode STDOUT;
106	binmode STDERR;	152	binmode STDERR;
107		153
108	# read virtual server time, if available	154	# read virtual server time, if available
109	unless ($RUNTIME || !-e "$LOCALDIR/runtime") {	155	unless ($RUNTIME || !-e $RUNTIMEFILE) {
110	open my $fh, "<", "$LOCALDIR/runtime"	156	open my $fh, "<", $RUNTIMEFILE
111	or die "unable to read runtime file: $!";	157	or die "unable to read $RUNTIMEFILE file: $!";
112	$RUNTIME = <$fh> + 0.;	158	$RUNTIME = <$fh> + 0.;
113	}	159	}
		160
		161	eval "sub TICK() { $TICK } 1" or die;
114		162
115	mkdir $_	163	mkdir $_
116	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	164	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
117		165
118	our $EMERGENCY_POSITION;	166	our $EMERGENCY_POSITION;
119		167
120	sub cf::map::normalise;	168	sub cf::map::normalise;
		169
		170	sub in_main() {
		171	$Coro::current == $Coro::main
		172	}
		173
		174	#############################################################################
		175
		176	%REFLECT = ();
		177	for (@REFLECT) {
		178	my $reflect = JSON::XS::decode_json $_;
		179	$REFLECT{$reflect->{class}} = $reflect;
		180	}
		181
		182	# this is decidedly evil
		183	$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
121		184
122	#############################################################################	185	#############################################################################
123		186
124	=head2 GLOBAL VARIABLES	187	=head2 GLOBAL VARIABLES
125		188
…		…
161		224
162	The raw value load value from the last tick.	225	The raw value load value from the last tick.
163		226
164	=item %cf::CFG	227	=item %cf::CFG
165		228
166	Configuration for the server, loaded from C</etc/crossfire/config>, or	229	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
167	from wherever your confdir points to.	230	from wherever your confdir points to.
168		231
169	=item cf::wait_for_tick, cf::wait_for_tick_begin	232	=item cf::wait_for_tick, cf::wait_for_tick_begin
170		233
171	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	234	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
172	returns directly I<after> the tick processing (and consequently, can only wake one process	235	returns directly I<after> the tick processing (and consequently, can only wake one process
173	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	236	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
174		237
175	=item @cf::INVOKE_RESULTS	238	=item @cf::INVOKE_RESULTS
176		239
177	This array contains the results of the last C<invoke ()> call. When	240	This array contains the results of the last C<invoke ()> call. When
178	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	241	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
179	that call.	242	that call.
180		243
		244	=item %cf::REFLECT
		245
		246	Contains, for each (C++) class name, a hash reference with information
		247	about object members (methods, scalars, arrays and flags) and other
		248	metadata, which is useful for introspection.
		249
181	=back	250	=back
182		251
183	=cut	252	=cut
184		253
185	BEGIN {	254	$Coro::State::WARNHOOK = sub {
186	*CORE::GLOBAL::warn = sub {
187	my $msg = join "", @_;	255	my $msg = join "", @_;
188		256
189	$msg .= "\n"	257	$msg .= "\n"
190	unless $msg =~ /\n$/;	258	unless $msg =~ /\n$/;
191		259
192	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	260	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
193		261
194	LOG llevError, $msg;	262	LOG llevError, $msg;
195	};	263	};
196	}	264
		265	$Coro::State::DIEHOOK = sub {
		266	return unless $^S eq 0; # "eq", not "=="
		267
		268	warn Carp::longmess $_[0];
		269
		270	if (in_main) {#d#
		271	warn "DIEHOOK called in main context, Coro bug?\n";#d#
		272	return;#d#
		273	}#d#
		274
		275	# kill coroutine otherwise
		276	Coro::terminate
		277	};
197		278
198	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	279	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	280	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	281	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	282	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
208	for my $pkg (qw(	289	for my $pkg (qw(
209	cf::global cf::attachable	290	cf::global cf::attachable
210	cf::object cf::object::player	291	cf::object cf::object::player
211	cf::client cf::player	292	cf::client cf::player
212	cf::arch cf::living	293	cf::arch cf::living
		294	cf::map cf::mapspace
213	cf::map cf::party cf::region	295	cf::party cf::region
214	)) {	296	)) {
215	no strict 'refs';
216	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	297	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217	}	298	}
218		299
219	$Event::DIED = sub {	300	$EV::DIED = sub {
220	warn "error in event callback: @_";	301	Carp::cluck "error in event callback: @_";
221	};	302	};
222		303
223	#############################################################################	304	#############################################################################
224		305
225	=head2 UTILITY FUNCTIONS	306	=head2 UTILITY FUNCTIONS
…		…
247	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	328	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
248	$d	329	$d
249	} || "[unable to dump $_[0]: '$@']";	330	} || "[unable to dump $_[0]: '$@']";
250	}	331	}
251		332
252	=item $ref = cf::from_json $json	333	=item $ref = cf::decode_json $json
253		334
254	Converts a JSON string into the corresponding perl data structure.	335	Converts a JSON string into the corresponding perl data structure.
255		336
256	=item $json = cf::to_json $ref	337	=item $json = cf::encode_json $ref
257		338
258	Converts a perl data structure into its JSON representation.	339	Converts a perl data structure into its JSON representation.
259		340
260	=cut	341	=cut
261		342
262	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	343	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
263		344
264	sub to_json ($) { $json_coder->encode ($_[0]) }	345	sub encode_json($) { $json_coder->encode ($_[0]) }
265	sub from_json ($) { $json_coder->decode ($_[0]) }	346	sub decode_json($) { $json_coder->decode ($_[0]) }
		347
		348	=item cf::post_init { BLOCK }
		349
		350	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
		351	but I<before> the server starts ticking again.
		352
		353	The cdoeblock will have a single boolean argument to indicate whether this
		354	is a reload or not.
		355
		356	=cut
		357
		358	sub post_init(&) {
		359	push @POST_INIT, shift;
		360	}
266		361
267	=item cf::lock_wait $string	362	=item cf::lock_wait $string
268		363
269	Wait until the given lock is available. See cf::lock_acquire.	364	Wait until the given lock is available. See cf::lock_acquire.
270		365
271	=item my $lock = cf::lock_acquire $string	366	=item my $lock = cf::lock_acquire $string
272		367
273	Wait until the given lock is available and then acquires it and returns	368	Wait until the given lock is available and then acquires it and returns
274	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	369	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
275	for example when the coroutine gets canceled), the lock is automatically	370	for example when the coroutine gets canceled), the lock is automatically
276	returned.	371	returned.
277		372
278	Locks are *not* recursive, locking from the same coro twice results in a	373	Locks are *not* recursive, locking from the same coro twice results in a
279	deadlocked coro.	374	deadlocked coro.
…		…
285		380
286	Return true if the lock is currently active, i.e. somebody has locked it.	381	Return true if the lock is currently active, i.e. somebody has locked it.
287		382
288	=cut	383	=cut
289		384
290	our %LOCK;	385	our $LOCKS = new Coro::SemaphoreSet;
291	our %LOCKER;#d#
292		386
293	sub lock_wait($) {	387	sub lock_wait($) {
294	my ($key) = @_;	388	$LOCKS->wait ($_[0]);
295
296	if ($LOCKER{$key} == $Coro::current) {#d#
297	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298	return;#d#
299	}#d#
300
301	# wait for lock, if any
302	while ($LOCK{$key}) {
303	push @{ $LOCK{$key} }, $Coro::current;
304	Coro::schedule;
305	}
306	}	389	}
307		390
308	sub lock_acquire($) {	391	sub lock_acquire($) {
309	my ($key) = @_;	392	$LOCKS->guard ($_[0])
310
311	# wait, to be sure we are not locked
312	lock_wait $key;
313
314	$LOCK{$key} = [];
315	$LOCKER{$key} = $Coro::current;#d#
316
317	Coro::guard {
318	delete $LOCKER{$key};#d#
319	# wake up all waiters, to be on the safe side
320	$_->ready for @{ delete $LOCK{$key} };
321	}
322	}	393	}
323		394
324	sub lock_active($) {	395	sub lock_active($) {
325	my ($key) = @_;	396	$LOCKS->count ($_[0]) < 1
326
327	! ! $LOCK{$key}
328	}	397	}
329		398
330	sub freeze_mainloop {	399	sub freeze_mainloop {
331	return unless $TICK_WATCHER->is_active;	400	tick_inhibit_inc;
332		401
333	my $guard = Coro::guard {	402	&Guard::guard (\&tick_inhibit_dec);
334	$TICK_WATCHER->start;	403	}
335	};	404
336	$TICK_WATCHER->stop;	405	=item cf::periodic $interval, $cb
337	$guard	406
		407	Like EV::periodic, but randomly selects a starting point so that the actions
		408	get spread over time.
		409
		410	=cut
		411
		412	sub periodic($$) {
		413	my ($interval, $cb) = @_;
		414
		415	my $start = rand List::Util::min 180, $interval;
		416
		417	EV::periodic $start, $interval, 0, $cb
338	}	418	}
339		419
340	=item cf::get_slot $time[, $priority[, $name]]	420	=item cf::get_slot $time[, $priority[, $name]]
341		421
342	Allocate $time seconds of blocking CPU time at priority C<$priority>:	422	Allocate $time seconds of blocking CPU time at priority C<$priority>:
…		…
350		430
351	=cut	431	=cut
352		432
353	our @SLOT_QUEUE;	433	our @SLOT_QUEUE;
354	our $SLOT_QUEUE;	434	our $SLOT_QUEUE;
		435	our $SLOT_DECAY = 0.9;
355		436
356	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	437	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357	$SLOT_QUEUE = Coro::async {	438	$SLOT_QUEUE = Coro::async {
		439	$Coro::current->desc ("timeslot manager");
		440
358	my $signal = new Coro::Signal;	441	my $signal = new Coro::Signal;
		442	my $busy;
359		443
360	while () {	444	while () {
361	next_job:	445	next_job:
		446
362	my $avail = cf::till_tick;	447	my $avail = cf::till_tick;
363	if ($avail > 0.01) {	448
364	for (0 .. $#SLOT_QUEUE) {	449	for (0 .. $#SLOT_QUEUE) {
365	if ($SLOT_QUEUE[$_][0] < $avail) {	450	if ($SLOT_QUEUE[$_][0] <= $avail) {
		451	$busy = 0;
366	my $job = splice @SLOT_QUEUE, $_, 1, ();	452	my $job = splice @SLOT_QUEUE, $_, 1, ();
367	$job->[2]->send;	453	$job->[2]->send;
368	Coro::cede;	454	Coro::cede;
369	goto next_job;	455	goto next_job;
370	}	456	} else {
		457	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
371	}	458	}
372	}	459	}
373		460
374	if (@SLOT_QUEUE) {	461	if (@SLOT_QUEUE) {
375	# we do not use wait_For_tick() as it returns immediately when tick is inactive	462	# we do not use wait_for_tick() as it returns immediately when tick is inactive
376	push @cf::WAIT_FOR_TICK, $signal;	463	push @cf::WAIT_FOR_TICK, $signal;
377	$signal->wait;	464	$signal->wait;
378	} else {	465	} else {
		466	$busy = 0;
379	Coro::schedule;	467	Coro::schedule;
380	}	468	}
381	}	469	}
382	};	470	};
383		471
384	sub get_slot($;$$) {	472	sub get_slot($;$$) {
		473	return if tick_inhibit || $Coro::current == $Coro::main;
		474
385	my ($time, $pri, $name) = @_;	475	my ($time, $pri, $name) = @_;
386		476
387	$time = $TICK * .6 if $time > $TICK * .6;	477	$time = clamp $time, 0.01, $TICK * .6;
		478
388	my $sig = new Coro::Signal;	479	my $sig = new Coro::Signal;
389		480
390	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	481	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
391	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	482	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
392	$SLOT_QUEUE->ready;	483	$SLOT_QUEUE->ready;
…		…
403		494
404	BEGIN { *async = \&Coro::async_pool }	495	BEGIN { *async = \&Coro::async_pool }
405		496
406	=item cf::sync_job { BLOCK }	497	=item cf::sync_job { BLOCK }
407		498
408	The design of Crossfire TRT requires that the main coroutine ($Coro::main)	499	The design of Deliantra requires that the main coroutine ($Coro::main)
409	is always able to handle events or runnable, as Crossfire TRT is only	500	is always able to handle events or runnable, as Deliantra is only
410	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not	501	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
411	acceptable.	502	acceptable.
412		503
413	If it must be done, put the blocking parts into C<sync_job>. This will run	504	If it must be done, put the blocking parts into C<sync_job>. This will run
414	the given BLOCK in another coroutine while waiting for the result. The	505	the given BLOCK in another coroutine while waiting for the result. The
…		…
419		510
420	sub sync_job(&) {	511	sub sync_job(&) {
421	my ($job) = @_;	512	my ($job) = @_;
422		513
423	if ($Coro::current == $Coro::main) {	514	if ($Coro::current == $Coro::main) {
424	my $time = Event::time;	515	my $time = AE::time;
425		516
426	# this is the main coro, too bad, we have to block	517	# this is the main coro, too bad, we have to block
427	# till the operation succeeds, freezing the server :/	518	# till the operation succeeds, freezing the server :/
428		519
429	# TODO: use suspend/resume instead	520	LOG llevError, Carp::longmess "sync job";#d#
430	# (but this is cancel-safe)	521
431	my $freeze_guard = freeze_mainloop;	522	my $freeze_guard = freeze_mainloop;
432		523
433	my $busy = 1;	524	my $busy = 1;
434	my @res;	525	my @res;
435		526
436	(async {	527	(async {
		528	$Coro::current->desc ("sync job coro");
437	@res = eval { $job->() };	529	@res = eval { $job->() };
438	warn $@ if $@;	530	warn $@ if $@;
439	undef $busy;	531	undef $busy;
440	})->prio (Coro::PRIO_MAX);	532	})->prio (Coro::PRIO_MAX);
441		533
442	while ($busy) {	534	while ($busy) {
443	Coro::cede or Event::one_event;	535	if (Coro::nready) {
		536	Coro::cede_notself;
		537	} else {
		538	EV::loop EV::LOOP_ONESHOT;
444	}	539	}
		540	}
445		541
446	$time = Event::time - $time;	542	my $time = AE::time - $time;
447		543
448	LOG llevError | logBacktrace, Carp::longmess "long sync job"
449	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
450
451	$tick_start += $time; # do not account sync jobs to server load	544	$TICK_START += $time; # do not account sync jobs to server load
452		545
453	wantarray ? @res : $res[0]	546	wantarray ? @res : $res[0]
454	} else {	547	} else {
455	# we are in another coroutine, how wonderful, everything just works	548	# we are in another coroutine, how wonderful, everything just works
456		549
…		…
481	=item fork_call { }, $args	574	=item fork_call { }, $args
482		575
483	Executes the given code block with the given arguments in a seperate	576	Executes the given code block with the given arguments in a seperate
484	process, returning the results. Everything must be serialisable with	577	process, returning the results. Everything must be serialisable with
485	Coro::Storable. May, of course, block. Note that the executed sub may	578	Coro::Storable. May, of course, block. Note that the executed sub may
486	never block itself or use any form of Event handling.	579	never block itself or use any form of event handling.
487		580
488	=cut	581	=cut
489		582
490	sub fork_call(&@) {	583	sub fork_call(&@) {
491	my ($cb, @args) = @_;	584	my ($cb, @args) = @_;
…		…
498	reset_signals;	591	reset_signals;
499	&$cb	592	&$cb
500	}, @args;	593	}, @args;
501		594
502	wantarray ? @res : $res[-1]	595	wantarray ? @res : $res[-1]
		596	}
		597
		598	sub objinfo {
		599	(
		600	"counter value" => cf::object::object_count,
		601	"objects created" => cf::object::create_count,
		602	"objects destroyed" => cf::object::destroy_count,
		603	"freelist size" => cf::object::free_count,
		604	"allocated objects" => cf::object::objects_size,
		605	"active objects" => cf::object::actives_size,
		606	)
		607	}
		608
		609	=item $coin = coin_from_name $name
		610
		611	=cut
		612
		613	our %coin_alias = (
		614	"silver" => "silvercoin",
		615	"silvercoin" => "silvercoin",
		616	"silvercoins" => "silvercoin",
		617	"gold" => "goldcoin",
		618	"goldcoin" => "goldcoin",
		619	"goldcoins" => "goldcoin",
		620	"platinum" => "platinacoin",
		621	"platinumcoin" => "platinacoin",
		622	"platinumcoins" => "platinacoin",
		623	"platina" => "platinacoin",
		624	"platinacoin" => "platinacoin",
		625	"platinacoins" => "platinacoin",
		626	"royalty" => "royalty",
		627	"royalties" => "royalty",
		628	);
		629
		630	sub coin_from_name($) {
		631	$coin_alias{$_[0]}
		632	? cf::arch::find $coin_alias{$_[0]}
		633	: undef
503	}	634	}
504		635
505	=item $value = cf::db_get $family => $key	636	=item $value = cf::db_get $family => $key
506		637
507	Returns a single value from the environment database.	638	Returns a single value from the environment database.
…		…
646		777
647	#############################################################################	778	#############################################################################
648		779
649	=head2 ATTACHABLE OBJECTS	780	=head2 ATTACHABLE OBJECTS
650		781
651	Many objects in crossfire are so-called attachable objects. That means you can	782	Many objects in deliantra are so-called attachable objects. That means you can
652	attach callbacks/event handlers (a collection of which is called an "attachment")	783	attach callbacks/event handlers (a collection of which is called an "attachment")
653	to it. All such attachable objects support the following methods.	784	to it. All such attachable objects support the following methods.
654		785
655	In the following description, CLASS can be any of C<global>, C<object>	786	In the following description, CLASS can be any of C<global>, C<object>
656	C<player>, C<client> or C<map> (i.e. the attachable objects in	787	C<player>, C<client> or C<map> (i.e. the attachable objects in
657	Crossfire TRT).	788	Deliantra).
658		789
659	=over 4	790	=over 4
660		791
661	=item $attachable->attach ($attachment, key => $value...)	792	=item $attachable->attach ($attachment, key => $value...)
662		793
…		…
706	=item cf::CLASS::attachment $name, ...	837	=item cf::CLASS::attachment $name, ...
707		838
708	Register an attachment by C<$name> through which attachable objects of the	839	Register an attachment by C<$name> through which attachable objects of the
709	given CLASS can refer to this attachment.	840	given CLASS can refer to this attachment.
710		841
711	Some classes such as crossfire maps and objects can specify attachments	842	Some classes such as deliantra maps and objects can specify attachments
712	that are attached at load/instantiate time, thus the need for a name.	843	that are attached at load/instantiate time, thus the need for a name.
713		844
714	These calls expect any number of the following handler/hook descriptions:	845	These calls expect any number of the following handler/hook descriptions:
715		846
716	=over 4	847	=over 4
…		…
944	}	1075	}
945		1076
946	0	1077	0
947	}	1078	}
948		1079
949	=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...)	1080	=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
950		1081
951	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)	1082	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
952		1083
953	Generate an object-specific event with the given arguments.	1084	Generate an object-specific event with the given arguments.
954		1085
…		…
960		1091
961	=cut	1092	=cut
962		1093
963	#############################################################################	1094	#############################################################################
964	# object support	1095	# object support
965	#
966		1096
		1097	sub _object_equal($$);
		1098	sub _object_equal($$) {
		1099	my ($a, $b) = @_;
		1100
		1101	return 0 unless (ref $a) eq (ref $b);
		1102
		1103	if ("HASH" eq ref $a) {
		1104	my @ka = keys %$a;
		1105	my @kb = keys %$b;
		1106
		1107	return 0 if @ka != @kb;
		1108
		1109	for (0 .. $#ka) {
		1110	return 0 unless $ka[$_] eq $kb[$_];
		1111	return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
		1112	}
		1113
		1114	} elsif ("ARRAY" eq ref $a) {
		1115
		1116	return 0 if @$a != @$b;
		1117
		1118	for (0 .. $#$a) {
		1119	return 0 unless _object_equal $a->[$_], $b->[$_];
		1120	}
		1121
		1122	} elsif ($a ne $b) {
		1123	return 0;
		1124	}
		1125
		1126	1
		1127	}
		1128
		1129	our $SLOW_MERGES;#d#
967	sub _can_merge {	1130	sub _can_merge {
968	my ($ob1, $ob2) = @_;	1131	my ($ob1, $ob2) = @_;
969		1132
970	local $Storable::canonical = 1;	1133	++$SLOW_MERGES;#d#
971	my $fob1 = Storable::freeze $ob1;
972	my $fob2 = Storable::freeze $ob2;
973		1134
974	$fob1 eq $fob2	1135	# we do the slow way here
		1136	return _object_equal $ob1, $ob2
975	}	1137	}
976		1138
977	sub reattach {	1139	sub reattach {
978	# basically do the same as instantiate, without calling instantiate	1140	# basically do the same as instantiate, without calling instantiate
979	my ($obj) = @_;	1141	my ($obj) = @_;
980		1142
		1143	# no longer needed after getting rid of delete_package?
981	bless $obj, ref $obj; # re-bless in case extensions have been reloaded	1144	#bless $obj, ref $obj; # re-bless in case extensions have been reloaded
982		1145
983	my $registry = $obj->registry;	1146	my $registry = $obj->registry;
984		1147
985	@$registry = ();	1148	@$registry = ();
986		1149
…		…
1001	cf::attachable->attach (	1164	cf::attachable->attach (
1002	prio => -1000000,	1165	prio => -1000000,
1003	on_instantiate => sub {	1166	on_instantiate => sub {
1004	my ($obj, $data) = @_;	1167	my ($obj, $data) = @_;
1005		1168
1006	$data = from_json $data;	1169	$data = decode_json $data;
1007		1170
1008	for (@$data) {	1171	for (@$data) {
1009	my ($name, $args) = @$_;	1172	my ($name, $args) = @$_;
1010		1173
1011	$obj->attach ($name, %{$args || {} });	1174	$obj->attach ($name, %{$args || {} });
…		…
1024	},	1187	},
1025	);	1188	);
1026		1189
1027	sub object_freezer_save {	1190	sub object_freezer_save {
1028	my ($filename, $rdata, $objs) = @_;	1191	my ($filename, $rdata, $objs) = @_;
1029
1030	my $guard = cf::lock_acquire "io";
1031		1192
1032	sync_job {	1193	sync_job {
1033	if (length $$rdata) {	1194	if (length $$rdata) {
1034	utf8::decode (my $decname = $filename);	1195	utf8::decode (my $decname = $filename);
1035	warn sprintf "saving %s (%d,%d)\n",	1196	warn sprintf "saving %s (%d,%d)\n",
1036	$decname, length $$rdata, scalar @$objs;	1197	$decname, length $$rdata, scalar @$objs;
1037		1198
1038	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1199	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1039	chmod SAVE_MODE, $fh;	1200	aio_chmod $fh, SAVE_MODE;
1040	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1201	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1041	aio_fsync $fh if $cf::USE_FSYNC;	1202	if ($cf::USE_FSYNC) {
		1203	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;
		1204	aio_fsync $fh;
		1205	}
1042	close $fh;	1206	aio_close $fh;
1043		1207
1044	if (@$objs) {	1208	if (@$objs) {
1045	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1209	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1046	chmod SAVE_MODE, $fh;	1210	aio_chmod $fh, SAVE_MODE;
1047	my $data = Storable::nfreeze { version => 1, objs => $objs };	1211	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1048	aio_write $fh, 0, (length $data), $data, 0;	1212	aio_write $fh, 0, (length $data), $data, 0;
1049	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	}
1050	close $fh;	1217	aio_close $fh;
1051	aio_rename "$filename.pst~", "$filename.pst";	1218	aio_rename "$filename.pst~", "$filename.pst";
1052	}	1219	}
1053	} else {	1220	} else {
1054	aio_unlink "$filename.pst";	1221	aio_unlink "$filename.pst";
1055	}	1222	}
1056		1223
1057	aio_rename "$filename~", $filename;	1224	aio_rename "$filename~", $filename;
		1225
		1226	$filename =~ s%/[^/]+$%%;
		1227	aio_pathsync $filename if $cf::USE_FSYNC;
1058	} else {	1228	} else {
1059	warn "FATAL: $filename~: $!\n";	1229	warn "unable to save objects: $filename~: $!\n";
1060	}	1230	}
1061	} else {	1231	} else {
1062	aio_unlink $filename;	1232	aio_unlink $filename;
1063	aio_unlink "$filename.pst";	1233	aio_unlink "$filename.pst";
1064	}	1234	}
1065	};	1235	};
1066
1067	undef $guard;
1068	}	1236	}
1069		1237
1070	sub object_freezer_as_string {	1238	sub object_freezer_as_string {
1071	my ($rdata, $objs) = @_;	1239	my ($rdata, $objs) = @_;
1072		1240
…		…
1077		1245
1078	sub object_thawer_load {	1246	sub object_thawer_load {
1079	my ($filename) = @_;	1247	my ($filename) = @_;
1080		1248
1081	my ($data, $av);	1249	my ($data, $av);
1082
1083	my $guard = cf::lock_acquire "io";
1084		1250
1085	(aio_load $filename, $data) >= 0	1251	(aio_load $filename, $data) >= 0
1086	or return;	1252	or return;
1087		1253
1088	unless (aio_stat "$filename.pst") {	1254	unless (aio_stat "$filename.pst") {
1089	(aio_load "$filename.pst", $av) >= 0	1255	(aio_load "$filename.pst", $av) >= 0
1090	or return;	1256	or return;
1091		1257
1092	undef $guard;
1093	$av = eval { (Storable::thaw $av)->{objs} };	1258	my $st = eval { Coro::Storable::thaw $av };
		1259	$av = $st->{objs};
1094	}	1260	}
1095		1261
1096	utf8::decode (my $decname = $filename);	1262	utf8::decode (my $decname = $filename);
1097	warn sprintf "loading %s (%d,%d)\n",	1263	warn sprintf "loading %s (%d,%d)\n",
1098	$decname, length $data, scalar @{$av || []};	1264	$decname, length $data, scalar @{$av || []};
…		…
1159	my ($name, $cb) = @_;	1325	my ($name, $cb) = @_;
1160		1326
1161	$EXTICMD{$name} = $cb;	1327	$EXTICMD{$name} = $cb;
1162	}	1328	}
1163		1329
		1330	use File::Glob ();
		1331
1164	cf::player->attach (	1332	cf::player->attach (
1165	on_command => sub {	1333	on_unknown_command => sub {
1166	my ($pl, $name, $params) = @_;	1334	my ($pl, $name, $params) = @_;
1167		1335
1168	my $cb = $COMMAND{$name}	1336	my $cb = $COMMAND{$name}
1169	or return;	1337	or return;
1170		1338
…		…
1200		1368
1201	cf::override;	1369	cf::override;
1202	},	1370	},
1203	);	1371	);
1204		1372
		1373	# "readahead" all extensions
		1374	sub cache_extensions {
		1375	my $grp = IO::AIO::aio_group;
		1376
		1377	add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
		1378	for (grep /\.ext$/, @{$_[0]}) {
		1379	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
		1380	}
		1381	};
		1382
		1383	$grp
		1384	}
		1385
1205	sub load_extensions {	1386	sub load_extensions {
1206	cf::sync_job {	1387	cf::sync_job {
1207	my %todo;	1388	my %todo;
1208		1389
1209	for my $path (<$LIBDIR/*.ext>) {	1390	for my $path (<$LIBDIR/*.ext>) {
…		…
1228		1409
1229	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1410	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1411	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231		1412
1232	$ext{source} =	1413	$ext{source} =
1233	"package $pkg; use strict; use utf8;\n"	1414	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1234	. "#line 1 \"$path\"\n{\n"	1415	. "#line 1 \"$path\"\n{\n"
1235	. $source	1416	. $source
1236	. "\n};\n1";	1417	. "\n};\n1";
1237		1418
1238	$todo{$base} = \%ext;	1419	$todo{$base} = \%ext;
1239	}	1420	}
1240		1421
		1422	my $pass = 0;
1241	my %done;	1423	my %done;
1242	while (%todo) {	1424	while (%todo) {
1243	my $progress;	1425	my $progress;
1244		1426
		1427	++$pass;
		1428
		1429	ext:
1245	while (my ($k, $v) = each %todo) {	1430	while (my ($k, $v) = each %todo) {
1246	for (split /,\s*/, $v->{meta}{depends}) {	1431	for (split /,\s*/, $v->{meta}{depends}) {
1247	goto skip	1432	next ext
1248	unless exists $done{$_};	1433	unless exists $done{$_};
1249	}	1434	}
1250		1435
1251	warn "... loading '$k' into '$v->{pkg}'\n";	1436	warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1252		1437
1253	unless (eval $v->{source}) {	1438	my $active = eval $v->{source};
		1439
		1440	if (length $@) {
1254	my $msg = $@ ? "$v->{path}: $@\n"	1441	warn "$v->{path}: $@\n";
1255	: "$v->{base}: extension inactive.\n";
1256		1442
		1443	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1257	if (exists $v->{meta}{mandatory}) {	1444	if exists $v->{meta}{mandatory};
1258	warn $msg;	1445
1259	warn "mandatory extension failed to load, exiting.\n";	1446	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1260	exit 1;	1447	delete $todo{$k};
1261	}	1448	} else {
1262		1449	$done{$k} = delete $todo{$k};
1263	warn $msg;	1450	push @EXTS, $v->{pkg};
		1451	$progress = 1;
		1452
		1453	warn "$v->{base}: extension inactive.\n"
		1454	unless $active;
1264	}	1455	}
1265
1266	$done{$k} = delete $todo{$k};
1267	push @EXTS, $v->{pkg};
1268	$progress = 1;
1269	}	1456	}
1270		1457
1271	skip:	1458	unless ($progress) {
1272	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1459	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1273	unless $progress;	1460
		1461	while (my ($k, $v) = each %todo) {
		1462	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
		1463	if exists $v->{meta}{mandatory};
		1464	}
		1465	}
1274	}	1466	}
1275	};	1467	};
1276	}	1468	}
1277		1469
1278	#############################################################################	1470	#############################################################################
1279		1471
1280	=back	1472	=back
1281		1473
1282	=head2 CORE EXTENSIONS	1474	=head2 CORE EXTENSIONS
1283		1475
1284	Functions and methods that extend core crossfire objects.	1476	Functions and methods that extend core deliantra objects.
1285		1477
1286	=cut	1478	=cut
1287		1479
1288	package cf::player;	1480	package cf::player;
1289		1481
…		…
1332		1524
1333	sub exists($) {	1525	sub exists($) {
1334	my ($login) = @_;	1526	my ($login) = @_;
1335		1527
1336	$cf::PLAYER{$login}	1528	$cf::PLAYER{$login}
1337	or cf::sync_job { !aio_stat path $login }	1529	or !aio_stat path $login
1338	}	1530	}
1339		1531
1340	sub find($) {	1532	sub find($) {
1341	return $cf::PLAYER{$_[0]} || do {	1533	return $cf::PLAYER{$_[0]} || do {
1342	my $login = $_[0];	1534	my $login = $_[0];
…		…
1352	aio_unlink +(playerdir $login) . "/$login.pl";	1544	aio_unlink +(playerdir $login) . "/$login.pl";
1353		1545
1354	my $f = new_from_file cf::object::thawer path $login	1546	my $f = new_from_file cf::object::thawer path $login
1355	or return;	1547	or return;
1356		1548
1357	$f->next;
1358	my $pl = cf::player::load_pl $f	1549	my $pl = cf::player::load_pl $f
1359	or return;	1550	or return;
		1551
1360	local $cf::PLAYER_LOADING{$login} = $pl;	1552	local $cf::PLAYER_LOADING{$login} = $pl;
1361	$f->resolve_delayed_derefs;	1553	$f->resolve_delayed_derefs;
1362	$cf::PLAYER{$login} = $pl	1554	$cf::PLAYER{$login} = $pl
1363	}	1555	}
1364	}	1556	}
1365	}	1557	}
1366		1558
		1559	cf::player->attach (
		1560	on_load => sub {
		1561	my ($pl, $path) = @_;
		1562
		1563	# restore slots saved in save, below
		1564	my $slots = delete $pl->{_slots};
		1565
		1566	$pl->ob->current_weapon ($slots->[0]);
		1567	$pl->combat_ob ($slots->[1]);
		1568	$pl->ranged_ob ($slots->[2]);
		1569	},
		1570	);
		1571
1367	sub save($) {	1572	sub save($) {
1368	my ($pl) = @_;	1573	my ($pl) = @_;
1369		1574
1370	return if $pl->{deny_save};	1575	return if $pl->{deny_save};
1371		1576
…		…
1374		1579
1375	return if $pl->{deny_save};	1580	return if $pl->{deny_save};
1376		1581
1377	aio_mkdir playerdir $pl, 0770;	1582	aio_mkdir playerdir $pl, 0770;
1378	$pl->{last_save} = $cf::RUNTIME;	1583	$pl->{last_save} = $cf::RUNTIME;
		1584
		1585	cf::get_slot 0.01;
		1586
		1587	# save slots, to be restored later
		1588	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1379		1589
1380	$pl->save_pl ($path);	1590	$pl->save_pl ($path);
1381	cf::cede_to_tick;	1591	cf::cede_to_tick;
1382	}	1592	}
1383		1593
…		…
1415	my ($pl) = @_;	1625	my ($pl) = @_;
1416		1626
1417	my $name = $pl->ob->name;	1627	my $name = $pl->ob->name;
1418		1628
1419	$pl->{deny_save} = 1;	1629	$pl->{deny_save} = 1;
1420	$pl->password ("*"); # this should lock out the player until we nuked the dir	1630	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1421		1631
1422	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1632	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1423	$pl->deactivate;	1633	$pl->deactivate;
		1634	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
		1635	$pl->ob->check_score;
1424	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1636	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1425	$pl->ns->destroy if $pl->ns;	1637	$pl->ns->destroy if $pl->ns;
1426		1638
1427	my $path = playerdir $pl;	1639	my $path = playerdir $pl;
1428	my $temp = "$path~$cf::RUNTIME~deleting~";	1640	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1467		1679
1468	for my $login (@$dirs) {	1680	for my $login (@$dirs) {
1469	my $path = path $login;	1681	my $path = path $login;
1470		1682
1471	# a .pst is a dead give-away for a valid player	1683	# a .pst is a dead give-away for a valid player
1472	unless (-e "$path.pst") {	1684	# if no pst file found, open and chekc for blocked users
		1685	if (aio_stat "$path.pst") {
1473	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;	1686	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1474	aio_read $fh, 0, 512, my $buf, 0 or next;	1687	aio_read $fh, 0, 512, my $buf, 0 or next;
1475	$buf !~ /^password -------------$/m or next; # official not-valid tag	1688	$buf !~ /^password -------------$/m or next; # official not-valid tag
1476	}	1689	}
1477		1690
…		…
1508	}	1721	}
1509		1722
1510	\@paths	1723	\@paths
1511	}	1724	}
1512		1725
1513	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)	1726	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1514		1727
1515	Expand crossfire pod fragments into protocol xml.	1728	Expand deliantra pod fragments into protocol xml.
1516
1517	=cut
1518
1519	sub expand_cfpod {
1520	((my $self), (local $_)) = @_;
1521
1522	# escape & and <
1523	s/&/&amp;/g;
1524	s/(?<![BIUGHT])</&lt;/g;
1525
1526	# this is buggy, it needs to properly take care of nested <'s
1527
1528	1 while
1529	# replace B<>, I<>, U<> etc.
1530	s/B<([^\>]*)>/<b>$1<\/b>/
1531	|| s/I<([^\>]*)>/<i>$1<\/i>/
1532	|| s/U<([^\>]*)>/<u>$1<\/u>/
1533	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1534	# replace G<male|female> tags
1535	|| s{G<([^>|]*)\|([^>]*)>}{
1536	$self->gender ? $2 : $1
1537	}ge
1538	# replace H<hint text>
1539	|| s{H<([^\>]*)>}
1540	{
1541	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1542	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543	"")
1544	[$self->{hintmode}]
1545	}ge;
1546
1547	# create single paragraphs (very hackish)
1548	s/(?<=\S)\n(?=\w)/ /g;
1549
1550	# compress some whitespace
1551	s/\s+\n/\n/g; # ws line-ends
1552	s/\n\n+/\n/g; # double lines
1553	s/^\n+//; # beginning lines
1554	s/\n+$//; # ending lines
1555
1556	$_
1557	}
1558
1559	sub hintmode {
1560	$_[0]{hintmode} = $_[1] if @_ > 1;
1561	$_[0]{hintmode}
1562	}
1563		1729
1564	=item $player->ext_reply ($msgid, @msg)	1730	=item $player->ext_reply ($msgid, @msg)
1565		1731
1566	Sends an ext reply to the player.	1732	Sends an ext reply to the player.
1567		1733
…		…
1634	our $MAX_RESET = 3600;	1800	our $MAX_RESET = 3600;
1635	our $DEFAULT_RESET = 3000;	1801	our $DEFAULT_RESET = 3000;
1636		1802
1637	sub generate_random_map {	1803	sub generate_random_map {
1638	my ($self, $rmp) = @_;	1804	my ($self, $rmp) = @_;
		1805
		1806	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
		1807
1639	# mit "rum" bekleckern, nicht	1808	# mit "rum" bekleckern, nicht
1640	$self->_create_random_map (	1809	$self->_create_random_map (
1641	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1810	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1811	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1643	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1812	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1644	$rmp->{exit_on_final_map},	1813	$rmp->{exit_on_final_map},
1645	$rmp->{xsize}, $rmp->{ysize},	1814	$rmp->{xsize}, $rmp->{ysize},
1646	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},	1815	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1647	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},	1816	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
…		…
1765		1934
1766	# the temporary/swap location	1935	# the temporary/swap location
1767	sub save_path {	1936	sub save_path {
1768	my ($self) = @_;	1937	my ($self) = @_;
1769		1938
1770	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1939	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771	"$TMPDIR/$path.map"	1940	"$TMPDIR/$path.map"
1772	}	1941	}
1773		1942
1774	# the unique path, undef == no special unique path	1943	# the unique path, undef == no special unique path
1775	sub uniq_path {	1944	sub uniq_path {
1776	my ($self) = @_;	1945	my ($self) = @_;
1777		1946
1778	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1947	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779	"$UNIQUEDIR/$path"	1948	"$UNIQUEDIR/$path"
1780	}
1781
1782	# and all this just because we cannot iterate over
1783	# all maps in C++...
1784	sub change_all_map_light {
1785	my ($change) = @_;
1786
1787	$_->change_map_light ($change)
1788	for grep $_->outdoor, values %cf::MAP;
1789	}	1949	}
1790		1950
1791	sub decay_objects {	1951	sub decay_objects {
1792	my ($self) = @_;	1952	my ($self) = @_;
1793		1953
…		…
1877	sub find {	2037	sub find {
1878	my ($path, $origin) = @_;	2038	my ($path, $origin) = @_;
1879		2039
1880	$path = normalise $path, $origin && $origin->path;	2040	$path = normalise $path, $origin && $origin->path;
1881		2041
1882	cf::lock_wait "map_data:$path";#d#remove	2042	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1883	cf::lock_wait "map_find:$path";	2043	my $guard2 = cf::lock_acquire "map_find:$path";
1884		2044
1885	$cf::MAP{$path} || do {	2045	$cf::MAP{$path} || do {
1886	my $guard1 = cf::lock_acquire "map_find:$path";
1887	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1889	my $map = new_from_path cf::map $path	2046	my $map = new_from_path cf::map $path
1890	or return;	2047	or return;
1891		2048
1892	$map->{last_save} = $cf::RUNTIME;	2049	$map->{last_save} = $cf::RUNTIME;
1893		2050
…		…
1895	or return;	2052	or return;
1896		2053
1897	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	2054	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898	# doing this can freeze the server in a sync job, obviously	2055	# doing this can freeze the server in a sync job, obviously
1899	#$cf::WAIT_FOR_TICK->wait;	2056	#$cf::WAIT_FOR_TICK->wait;
		2057	undef $guard2;
1900	undef $guard1;	2058	undef $guard1;
1901	undef $guard2;
1902	$map->reset;	2059	$map->reset;
1903	return find $path;	2060	return find $path;
1904	}	2061	}
1905		2062
1906	$cf::MAP{$path} = $map	2063	$cf::MAP{$path} = $map
1907	}	2064	}
1908	}	2065	}
1909		2066
1910	sub pre_load { }	2067	sub pre_load { }
1911	sub post_load { }	2068	#sub post_load { } # XS
1912		2069
1913	sub load {	2070	sub load {
1914	my ($self) = @_;	2071	my ($self) = @_;
1915		2072
1916	local $self->{deny_reset} = 1; # loading can take a long time	2073	local $self->{deny_reset} = 1; # loading can take a long time
…		…
1933	my $f = new_from_file cf::object::thawer $self->{load_path};	2090	my $f = new_from_file cf::object::thawer $self->{load_path};
1934	$f->skip_block;	2091	$f->skip_block;
1935	$self->_load_objects ($f)	2092	$self->_load_objects ($f)
1936	or return;	2093	or return;
1937		2094
1938	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2095	$self->post_load_original
1939	if delete $self->{load_original};	2096	if delete $self->{load_original};
1940		2097
1941	if (my $uniq = $self->uniq_path) {	2098	if (my $uniq = $self->uniq_path) {
1942	utf8::encode $uniq;	2099	utf8::encode $uniq;
1943	unless (aio_stat $uniq) {	2100	unless (aio_stat $uniq) {
…		…
1961	unless ($self->{deny_activate}) {	2118	unless ($self->{deny_activate}) {
1962	$self->decay_objects;	2119	$self->decay_objects;
1963	$self->fix_auto_apply;	2120	$self->fix_auto_apply;
1964	$self->update_buttons;	2121	$self->update_buttons;
1965	cf::cede_to_tick;	2122	cf::cede_to_tick;
1966	$self->set_darkness_map;
1967	cf::cede_to_tick;
1968	$self->activate;	2123	$self->activate;
1969	}	2124	}
1970		2125
1971	$self->{last_save} = $cf::RUNTIME;	2126	$self->{last_save} = $cf::RUNTIME;
1972	$self->last_access ($cf::RUNTIME);	2127	$self->last_access ($cf::RUNTIME);
1973		2128
1974	$self->in_memory (cf::MAP_IN_MEMORY);	2129	$self->in_memory (cf::MAP_ACTIVE);
1975	}	2130	}
1976		2131
1977	$self->post_load;	2132	$self->post_load;
1978	}	2133	}
1979		2134
		2135	# customize the map for a given player, i.e.
		2136	# return the _real_ map. used by e.g. per-player
		2137	# maps to change the path to ~playername/mappath
1980	sub customise_for {	2138	sub customise_for {
1981	my ($self, $ob) = @_;	2139	my ($self, $ob) = @_;
1982		2140
1983	return find "~" . $ob->name . "/" . $self->{path}	2141	return find "~" . $ob->name . "/" . $self->{path}
1984	if $self->per_player;	2142	if $self->per_player;
…		…
2037	my ($path, $origin, $load) = @_;	2195	my ($path, $origin, $load) = @_;
2038		2196
2039	$path = normalise $path, $origin && $origin->{path};	2197	$path = normalise $path, $origin && $origin->{path};
2040		2198
2041	if (my $map = $cf::MAP{$path}) {	2199	if (my $map = $cf::MAP{$path}) {
2042	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;	2200	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043	}	2201	}
2044		2202
2045	$MAP_PREFETCH{$path} |= $load;	2203	$MAP_PREFETCH{$path} |= $load;
2046		2204
2047	$MAP_PREFETCHER ||= cf::async {	2205	$MAP_PREFETCHER ||= cf::async {
		2206	$Coro::current->{desc} = "map prefetcher";
		2207
2048	while (%MAP_PREFETCH) {	2208	while (%MAP_PREFETCH) {
2049	while (my ($k, $v) = each %MAP_PREFETCH) {	2209	while (my ($k, $v) = each %MAP_PREFETCH) {
2050	if (my $map = find $k) {	2210	if (my $map = find $k) {
2051	$map->load if $v;	2211	$map->load if $v;
2052	}	2212	}
…		…
2059	$MAP_PREFETCHER->prio (6);	2219	$MAP_PREFETCHER->prio (6);
2060		2220
2061	()	2221	()
2062	}	2222	}
2063		2223
		2224	# common code, used by both ->save and ->swapout
2064	sub save {	2225	sub _save {
2065	my ($self) = @_;	2226	my ($self) = @_;
2066
2067	my $lock = cf::lock_acquire "map_data:$self->{path}";
2068		2227
2069	$self->{last_save} = $cf::RUNTIME;	2228	$self->{last_save} = $cf::RUNTIME;
2070		2229
2071	return unless $self->dirty;	2230	return unless $self->dirty;
2072		2231
…		…
2078	return if $self->{deny_save};	2237	return if $self->{deny_save};
2079		2238
2080	local $self->{last_access} = $self->last_access;#d#	2239	local $self->{last_access} = $self->last_access;#d#
2081		2240
2082	cf::async {	2241	cf::async {
		2242	$Coro::current->{desc} = "map player save";
2083	$_->contr->save for $self->players;	2243	$_->contr->save for $self->players;
2084	};	2244	};
		2245
		2246	cf::get_slot 0.02;
2085		2247
2086	if ($uniq) {	2248	if ($uniq) {
2087	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2249	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2088	$self->_save_objects ($uniq, cf::IO_UNIQUES);	2250	$self->_save_objects ($uniq, cf::IO_UNIQUES);
2089	} else {	2251	} else {
2090	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2252	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2091	}	2253	}
2092	}	2254	}
2093		2255
		2256	sub save {
		2257	my ($self) = @_;
		2258
		2259	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2260
		2261	$self->_save;
		2262	}
		2263
2094	sub swap_out {	2264	sub swap_out {
2095	my ($self) = @_;	2265	my ($self) = @_;
2096		2266
2097	# save first because save cedes
2098	$self->save;
2099
2100	my $lock = cf::lock_acquire "map_data:$self->{path}";	2267	my $lock = cf::lock_acquire "map_data:$self->{path}";
2101		2268
		2269	return if $self->in_memory != cf::MAP_ACTIVE;
		2270	return if $self->{deny_save};
2102	return if $self->players;	2271	return if $self->players;
2103	return if $self->in_memory != cf::MAP_IN_MEMORY;
2104	return if $self->{deny_save};
2105		2272
2106	$self->in_memory (cf::MAP_SWAPPED);	2273	# first deactivate the map and "unlink" it from the core
2107
2108	$self->deactivate;	2274	$self->deactivate;
2109	$_->clear_links_to ($self) for values %cf::MAP;	2275	$_->clear_links_to ($self) for values %cf::MAP;
		2276	$self->in_memory (cf::MAP_SWAPPED);
		2277
		2278	# then atomically save
		2279	$self->_save;
		2280
		2281	# then free the map
2110	$self->clear;	2282	$self->clear;
2111	}	2283	}
2112		2284
2113	sub reset_at {	2285	sub reset_at {
2114	my ($self) = @_;	2286	my ($self) = @_;
…		…
2133		2305
2134	my $lock = cf::lock_acquire "map_data:$self->{path}";	2306	my $lock = cf::lock_acquire "map_data:$self->{path}";
2135		2307
2136	return if $self->players;	2308	return if $self->players;
2137		2309
2138	warn "resetting map ", $self->path;	2310	warn "resetting map ", $self->path, "\n";
2139		2311
2140	$self->in_memory (cf::MAP_SWAPPED);	2312	$self->in_memory (cf::MAP_SWAPPED);
2141		2313
2142	# need to save uniques path	2314	# need to save uniques path
2143	unless ($self->{deny_save}) {	2315	unless ($self->{deny_save}) {
…		…
2226		2398
2227	sub unique_maps() {	2399	sub unique_maps() {
2228	[	2400	[
2229	map {	2401	map {
2230	utf8::decode $_;	2402	utf8::decode $_;
2231	/\.map$/	2403	s/\.map$//; # TODO future compatibility hack
		2404	/\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
		2405	? ()
2232	? normalise $_	2406	: normalise $_
2233	: ()
2234	} @{ aio_readdir $UNIQUEDIR or [] }	2407	} @{ aio_readdir $UNIQUEDIR or [] }
2235	]	2408	]
2236	}	2409	}
2237		2410
2238	package cf;	2411	=item cf::map::static_maps
		2412
		2413	Returns an arrayref if paths of all static maps (all preinstalled F<.map>
		2414	file in the shared directory excluding F</styles> and F</editor>). May
		2415	block.
		2416
		2417	=cut
		2418
		2419	sub static_maps() {
		2420	my @dirs = "";
		2421	my @maps;
		2422
		2423	while (@dirs) {
		2424	my $dir = shift @dirs;
		2425
		2426	next if $dir eq "/styles" || $dir eq "/editor";
		2427
		2428	my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
		2429	or return;
		2430
		2431	for (@$files) {
		2432	s/\.map$// or next;
		2433	utf8::decode $_;
		2434	push @maps, "$dir/$_";
		2435	}
		2436
		2437	push @dirs, map "$dir/$_", @$dirs;
		2438	}
		2439
		2440	\@maps
		2441	}
2239		2442
2240	=back	2443	=back
2241		2444
2242	=head3 cf::object	2445	=head3 cf::object
2243		2446
…		…
2247		2450
2248	=over 4	2451	=over 4
2249		2452
2250	=item $ob->inv_recursive	2453	=item $ob->inv_recursive
2251		2454
2252	Returns the inventory of the object _and_ their inventories, recursively.	2455	Returns the inventory of the object I<and> their inventories, recursively,
		2456	but I<not> the object itself.
2253		2457
2254	=cut	2458	=cut
2255		2459
2256	sub inv_recursive_;	2460	sub inv_recursive_;
2257	sub inv_recursive_ {	2461	sub inv_recursive_ {
…		…
2262	inv_recursive_ inv $_[0]	2466	inv_recursive_ inv $_[0]
2263	}	2467	}
2264		2468
2265	=item $ref = $ob->ref	2469	=item $ref = $ob->ref
2266		2470
2267	creates and returns a persistent reference to an objetc that can be stored as a string.	2471	Creates and returns a persistent reference to an object that can be stored as a string.
2268		2472
2269	=item $ob = cf::object::deref ($refstring)	2473	=item $ob = cf::object::deref ($refstring)
2270		2474
2271	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2475	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272	even if the object actually exists. May block.	2476	even if the object actually exists. May block.
…		…
2274	=cut	2478	=cut
2275		2479
2276	sub deref {	2480	sub deref {
2277	my ($ref) = @_;	2481	my ($ref) = @_;
2278		2482
2279	# temporary compatibility#TODO#remove
2280	$ref =~ s{^<}{player/<};
2281
2282	if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {	2483	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283	my ($uuid, $name) = ($1, $2);	2484	my ($uuid, $name) = ($1, $2);
2284	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name	2485	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285	or return;	2486	or return;
2286	$pl->ob->uuid eq $uuid	2487	$pl->ob->uuid eq $uuid
2287	or return;	2488	or return;
…		…
2307	can be C<undef>. Does the right thing when the player is currently in a	2508	can be C<undef>. Does the right thing when the player is currently in a
2308	dialogue with the given NPC character.	2509	dialogue with the given NPC character.
2309		2510
2310	=cut	2511	=cut
2311		2512
		2513	our $SAY_CHANNEL = {
		2514	id => "say",
		2515	title => "Map",
		2516	reply => "say ",
		2517	tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
		2518	};
		2519
		2520	our $CHAT_CHANNEL = {
		2521	id => "chat",
		2522	title => "Chat",
		2523	reply => "chat ",
		2524	tooltip => "Player chat and shouts, global to the server.",
		2525	};
		2526
2312	# rough implementation of a future "reply" method that works	2527	# rough implementation of a future "reply" method that works
2313	# with dialog boxes.	2528	# with dialog boxes.
2314	#TODO: the first argument must go, split into a $npc->reply_to ( method	2529	#TODO: the first argument must go, split into a $npc->reply_to ( method
2315	sub cf::object::player::reply($$$;$) {	2530	sub cf::object::player::reply($$$;$) {
2316	my ($self, $npc, $msg, $flags) = @_;	2531	my ($self, $npc, $msg, $flags) = @_;
…		…
2327	my $dialog = $pl->{npc_dialog};	2542	my $dialog = $pl->{npc_dialog};
2328	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));	2543	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329		2544
2330	} else {	2545	} else {
2331	$msg = $npc->name . " says: $msg" if $npc;	2546	$msg = $npc->name . " says: $msg" if $npc;
2332	$self->message ($msg, $flags);	2547	$self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333	}	2548	}
2334	}	2549	}
2335	}	2550	}
2336		2551
2337	=item $object->send_msg ($channel, $msg, $color, [extra...])	2552	=item $object->send_msg ($channel, $msg, $color, [extra...])
…		…
2362		2577
2363	=item $player_object->enter_link	2578	=item $player_object->enter_link
2364		2579
2365	Freezes the player and moves him/her to a special map (C<{link}>).	2580	Freezes the player and moves him/her to a special map (C<{link}>).
2366		2581
2367	The player should be reasonably safe there for short amounts of time. You	2582	The player should be reasonably safe there for short amounts of time (e.g.
2368	I<MUST> call C<leave_link> as soon as possible, though.	2583	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
		2584	though, as the palyer cannot control the character while it is on the link
		2585	map.
2369		2586
2370	Will never block.	2587	Will never block.
2371		2588
2372	=item $player_object->leave_link ($map, $x, $y)	2589	=item $player_object->leave_link ($map, $x, $y)
2373		2590
…		…
2398	return if UNIVERSAL::isa $self->map, "ext::map_link";	2615	return if UNIVERSAL::isa $self->map, "ext::map_link";
2399		2616
2400	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2617	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2401	if $self->map && $self->map->{path} ne "{link}";	2618	if $self->map && $self->map->{path} ne "{link}";
2402		2619
2403	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2620	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2404	}	2621	}
2405		2622
2406	sub cf::object::player::leave_link {	2623	sub cf::object::player::leave_link {
2407	my ($self, $map, $x, $y) = @_;	2624	my ($self, $map, $x, $y) = @_;
2408		2625
…		…
2425	($x, $y) = (-1, -1)	2642	($x, $y) = (-1, -1)
2426	unless (defined $x) && (defined $y);	2643	unless (defined $x) && (defined $y);
2427		2644
2428	# use -1 or undef as default coordinates, not 0, 0	2645	# use -1 or undef as default coordinates, not 0, 0
2429	($x, $y) = ($map->enter_x, $map->enter_y)	2646	($x, $y) = ($map->enter_x, $map->enter_y)
2430	if $x <=0 && $y <= 0;	2647	if $x <= 0 && $y <= 0;
2431		2648
2432	$map->load;	2649	$map->load;
2433	$map->load_neighbours;	2650	$map->load_neighbours;
2434		2651
2435	return unless $self->contr->active;	2652	return unless $self->contr->active;
2436	$self->activate_recursive;
2437		2653
2438	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2654	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2439	$self->enter_map ($map, $x, $y);	2655	$self->enter_map ($map, $x, $y);
		2656
		2657	# only activate afterwards, to support waiting in hooks
		2658	$self->activate_recursive;
2440	}	2659	}
2441		2660
2442	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2661	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2443		2662
2444	Moves the player to the given map-path and coordinates by first freezing	2663	Moves the player to the given map-path and coordinates by first freezing
2445	her, loading and preparing them map, calling the provided $check callback	2664	her, loading and preparing them map, calling the provided $check callback
2446	that has to return the map if sucecssful, and then unfreezes the player on	2665	that has to return the map if sucecssful, and then unfreezes the player on
2447	the new (success) or old (failed) map position. In either case, $done will	2666	the new (success) or old (failed) map position. In either case, $done will
2448	be called at the end of this process.	2667	be called at the end of this process.
2449		2668
		2669	Note that $check will be called with a potentially non-loaded map, so if
		2670	it needs a loaded map it has to call C<< ->load >>.
		2671
2450	=cut	2672	=cut
2451		2673
2452	our $GOTOGEN;	2674	our $GOTOGEN;
2453		2675
2454	sub cf::object::player::goto {	2676	sub cf::object::player::goto {
…		…
2458	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2680	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459		2681
2460	$self->enter_link;	2682	$self->enter_link;
2461		2683
2462	(async {	2684	(async {
		2685	$Coro::current->{desc} = "player::goto $path $x $y";
		2686
		2687	# *tag paths override both path and x|y
		2688	if ($path =~ /^\*(.*)$/) {
		2689	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2690	my $ob = $obs[rand @obs];
		2691
		2692	# see if we actually can go there
		2693	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2694	$ob = $obs[rand @obs];
		2695	} else {
		2696	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2697	}
		2698	# else put us there anyways for now #d#
		2699
		2700	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2701	} else {
		2702	($path, $x, $y) = (undef, undef, undef);
		2703	}
		2704	}
		2705
2463	my $map = eval {	2706	my $map = eval {
2464	my $map = cf::map::find $path;	2707	my $map = defined $path ? cf::map::find $path : undef;
2465		2708
2466	if ($map) {	2709	if ($map) {
2467	$map = $map->customise_for ($self);	2710	$map = $map->customise_for ($self);
2468	$map = $check->($map) if $check && $map;	2711	$map = $check->($map) if $check && $map;
2469	} else {	2712	} else {
2470	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2713	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2471	}	2714	}
2472		2715
2473	$map	2716	$map
2474	};	2717	};
2475		2718
…		…
2511	}	2754	}
2512		2755
2513	sub prepare_random_map {	2756	sub prepare_random_map {
2514	my ($exit) = @_;	2757	my ($exit) = @_;
2515		2758
2516	my $guard = cf::lock_acquire "exit_prepare:$exit";
2517
2518	# all this does is basically replace the /! path by	2759	# all this does is basically replace the /! path by
2519	# a new random map path (?random/...) with a seed	2760	# a new random map path (?random/...) with a seed
2520	# that depends on the exit object	2761	# that depends on the exit object
2521		2762
2522	my $rmp = parse_random_map_params $exit->msg;	2763	my $rmp = parse_random_map_params $exit->msg;
…		…
2524	if ($exit->map) {	2765	if ($exit->map) {
2525	$rmp->{region} = $exit->region->name;	2766	$rmp->{region} = $exit->region->name;
2526	$rmp->{origin_map} = $exit->map->path;	2767	$rmp->{origin_map} = $exit->map->path;
2527	$rmp->{origin_x} = $exit->x;	2768	$rmp->{origin_x} = $exit->x;
2528	$rmp->{origin_y} = $exit->y;	2769	$rmp->{origin_y} = $exit->y;
		2770
		2771	$exit->map->touch;
2529	}	2772	}
2530		2773
2531	$rmp->{random_seed} ||= $exit->random_seed;	2774	$rmp->{random_seed} ||= $exit->random_seed;
2532		2775
2533	my $data = cf::to_json $rmp;	2776	my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2534	my $md5 = Digest::MD5::md5_hex $data;	2777	my $md5 = Digest::MD5::md5_hex $data;
2535	my $meta = "$RANDOMDIR/$md5.meta";	2778	my $meta = "$RANDOMDIR/$md5.meta";
2536		2779
2537	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2780	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2538	aio_write $fh, 0, (length $data), $data, 0;	2781	aio_write $fh, 0, (length $data), $data, 0;
2539	undef $fh;	2782	undef $fh;
2540	aio_rename "$meta~", $meta;	2783	aio_rename "$meta~", $meta;
2541		2784
		2785	my $slaying = "?random/$md5";
		2786
		2787	if ($exit->valid) {
2542	$exit->slaying ("?random/$md5");	2788	$exit->slaying ("?random/$md5");
2543	$exit->msg (undef);	2789	$exit->msg (undef);
		2790	}
2544	}	2791	}
2545	}	2792	}
2546		2793
2547	sub cf::object::player::enter_exit {	2794	sub cf::object::player::enter_exit {
2548	my ($self, $exit) = @_;	2795	my ($self, $exit) = @_;
2549		2796
2550	return unless $self->type == cf::PLAYER;	2797	return unless $self->type == cf::PLAYER;
2551		2798
2552	if ($exit->slaying eq "/!") {
2553	#TODO: this should de-fi-ni-te-ly not be a sync-job
2554	# the problem is that $exit might not survive long enough
2555	# so it needs to be done right now, right here
2556	cf::sync_job { prepare_random_map $exit };
2557	}
2558
2559	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2560	my $hp = $exit->stats->hp;
2561	my $sp = $exit->stats->sp;
2562
2563	$self->enter_link;	2799	$self->enter_link;
2564		2800
2565	# if exit is damned, update players death & WoR home-position
2566	$self->contr->savebed ($slaying, $hp, $sp)
2567	if $exit->flag (FLAG_DAMNED);
2568
2569	(async {	2801	(async {
2570	$self->deactivate_recursive; # just to be sure	2802	$Coro::current->{desc} = "enter_exit";
		2803
2571	unless (eval {	2804	unless (eval {
		2805	$self->deactivate_recursive; # just to be sure
		2806
		2807	# random map handling
		2808	{
		2809	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2810
		2811	prepare_random_map $exit
		2812	if $exit->slaying eq "/!";
		2813	}
		2814
		2815	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
		2816	my $x = $exit->stats->hp;
		2817	my $y = $exit->stats->sp;
		2818
2572	$self->goto ($slaying, $hp, $sp);	2819	$self->goto ($map, $x, $y);
2573		2820
		2821	# if exit is damned, update players death & WoR home-position
		2822	$self->contr->savebed ($map, $x, $y)
		2823	if $exit->flag (cf::FLAG_DAMNED);
		2824
2574	1;	2825	1
2575	}) {	2826	}) {
2576	$self->message ("Something went wrong deep within the crossfire server. "	2827	$self->message ("Something went wrong deep within the deliantra server. "
2577	. "I'll try to bring you back to the map you were before. "	2828	. "I'll try to bring you back to the map you were before. "
2578	. "Please report this to the dungeon master!",	2829	. "Please report this to the dungeon master!",
2579	cf::NDI_UNIQUE | cf::NDI_RED);	2830	cf::NDI_UNIQUE | cf::NDI_RED);
2580		2831
2581	warn "ERROR in enter_exit: $@";	2832	warn "ERROR in enter_exit: $@";
…		…
2598	sub cf::client::send_drawinfo {	2849	sub cf::client::send_drawinfo {
2599	my ($self, $text, $flags) = @_;	2850	my ($self, $text, $flags) = @_;
2600		2851
2601	utf8::encode $text;	2852	utf8::encode $text;
2602	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2853	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
		2854	}
		2855
		2856	=item $client->send_big_packet ($pkt)
		2857
		2858	Like C<send_packet>, but tries to compress large packets, and fragments
		2859	them as required.
		2860
		2861	=cut
		2862
		2863	our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
		2864
		2865	sub cf::client::send_big_packet {
		2866	my ($self, $pkt) = @_;
		2867
		2868	# try lzf for large packets
		2869	$pkt = "lzf " . Compress::LZF::compress $pkt
		2870	if 1024 <= length $pkt and $self->{can_lzf};
		2871
		2872	# split very large packets
		2873	if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
		2874	$self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
		2875	$pkt = "frag";
		2876	}
		2877
		2878	$self->send_packet ($pkt);
2603	}	2879	}
2604		2880
2605	=item $client->send_msg ($channel, $msg, $color, [extra...])	2881	=item $client->send_msg ($channel, $msg, $color, [extra...])
2606		2882
2607	Send a drawinfo or msg packet to the client, formatting the msg for the	2883	Send a drawinfo or msg packet to the client, formatting the msg for the
…		…
2609	the message, with C<log> being the default. If C<$color> is negative, suppress	2885	the message, with C<log> being the default. If C<$color> is negative, suppress
2610	the message unless the client supports the msg packet.	2886	the message unless the client supports the msg packet.
2611		2887
2612	=cut	2888	=cut
2613		2889
		2890	# non-persistent channels (usually the info channel)
2614	our %CHANNEL = (	2891	our %CHANNEL = (
		2892	"c/motd" => {
		2893	id => "infobox",
		2894	title => "MOTD",
		2895	reply => undef,
		2896	tooltip => "The message of the day",
		2897	},
2615	"c/identify" => {	2898	"c/identify" => {
2616	id => "identify",	2899	id => "infobox",
2617	title => "Identify",	2900	title => "Identify",
2618	reply => undef,	2901	reply => undef,
2619	tooltip => "Items recently identified",	2902	tooltip => "Items recently identified",
2620	},	2903	},
2621	"c/examine" => {	2904	"c/examine" => {
2622	id => "examine",	2905	id => "infobox",
2623	title => "Examine",	2906	title => "Examine",
2624	reply => undef,	2907	reply => undef,
2625	tooltip => "Signs and other items you examined",	2908	tooltip => "Signs and other items you examined",
2626	},	2909	},
		2910	"c/shopinfo" => {
		2911	id => "infobox",
		2912	title => "Shop Info",
		2913	reply => undef,
		2914	tooltip => "What your bargaining skill tells you about the shop",
		2915	},
		2916	"c/book" => {
		2917	id => "infobox",
		2918	title => "Book",
		2919	reply => undef,
		2920	tooltip => "The contents of a note or book",
		2921	},
		2922	"c/lookat" => {
		2923	id => "infobox",
		2924	title => "Look",
		2925	reply => undef,
		2926	tooltip => "What you saw there",
		2927	},
		2928	"c/who" => {
		2929	id => "infobox",
		2930	title => "Players",
		2931	reply => undef,
		2932	tooltip => "Shows players who are currently online",
		2933	},
		2934	"c/body" => {
		2935	id => "infobox",
		2936	title => "Body Parts",
		2937	reply => undef,
		2938	tooltip => "Shows which body parts you posess and are available",
		2939	},
		2940	"c/statistics" => {
		2941	id => "infobox",
		2942	title => "Statistics",
		2943	reply => undef,
		2944	tooltip => "Shows your primary statistics",
		2945	},
		2946	"c/skills" => {
		2947	id => "infobox",
		2948	title => "Skills",
		2949	reply => undef,
		2950	tooltip => "Shows your experience per skill and item power",
		2951	},
		2952	"c/shopitems" => {
		2953	id => "infobox",
		2954	title => "Shop Items",
		2955	reply => undef,
		2956	tooltip => "Shows the items currently for sale in this shop",
		2957	},
		2958	"c/resistances" => {
		2959	id => "infobox",
		2960	title => "Resistances",
		2961	reply => undef,
		2962	tooltip => "Shows your resistances",
		2963	},
		2964	"c/pets" => {
		2965	id => "infobox",
		2966	title => "Pets",
		2967	reply => undef,
		2968	tooltip => "Shows information abotu your pets/a specific pet",
		2969	},
		2970	"c/perceiveself" => {
		2971	id => "infobox",
		2972	title => "Perceive Self",
		2973	reply => undef,
		2974	tooltip => "You gained detailed knowledge about yourself",
		2975	},
		2976	"c/uptime" => {
		2977	id => "infobox",
		2978	title => "Uptime",
		2979	reply => undef,
		2980	tooltip => "How long the server has been running since last restart",
		2981	},
		2982	"c/mapinfo" => {
		2983	id => "infobox",
		2984	title => "Map Info",
		2985	reply => undef,
		2986	tooltip => "Information related to the maps",
		2987	},
		2988	"c/party" => {
		2989	id => "party",
		2990	title => "Party",
		2991	reply => "gsay ",
		2992	tooltip => "Messages and chat related to your party",
		2993	},
		2994	"c/death" => {
		2995	id => "death",
		2996	title => "Death",
		2997	reply => undef,
		2998	tooltip => "Reason for and more info about your most recent death",
		2999	},
		3000	"c/say" => $SAY_CHANNEL,
		3001	"c/chat" => $CHAT_CHANNEL,
2627	);	3002	);
2628		3003
2629	sub cf::client::send_msg {	3004	sub cf::client::send_msg {
2630	my ($self, $channel, $msg, $color, @extra) = @_;	3005	my ($self, $channel, $msg, $color, @extra) = @_;
2631		3006
2632	$msg = $self->pl->expand_cfpod ($msg);	3007	$msg = $self->pl->expand_cfpod ($msg)
		3008	unless $color & cf::NDI_VERBATIM;
2633		3009
2634	$color &= cf::NDI_CLIENT_MASK; # just in case...	3010	$color &= cf::NDI_CLIENT_MASK; # just in case...
2635		3011
2636	# check predefined channels, for the benefit of C	3012	# check predefined channels, for the benefit of C
2637	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};	3013	if ($CHANNEL{$channel}) {
		3014	$channel = $CHANNEL{$channel};
2638		3015
		3016	$self->ext_msg (channel_info => $channel);
		3017	$channel = $channel->{id};
		3018
2639	if (ref $channel) {	3019	} elsif (ref $channel) {
2640	# send meta info to client, if not yet sent	3020	# send meta info to client, if not yet sent
2641	unless (exists $self->{channel}{$channel->{id}}) {	3021	unless (exists $self->{channel}{$channel->{id}}) {
2642	$self->{channel}{$channel->{id}} = $channel;	3022	$self->{channel}{$channel->{id}} = $channel;
2643	$self->ext_msg (channel_info => $channel)	3023	$self->ext_msg (channel_info => $channel);
2644	if $self->can_msg;
2645	}	3024	}
2646		3025
2647	$channel = $channel->{id};	3026	$channel = $channel->{id};
2648	}	3027	}
2649		3028
2650	return unless @extra || length $msg;	3029	return unless @extra || length $msg;
2651		3030
2652	if ($self->can_msg) {
2653	# default colour, mask it out	3031	# default colour, mask it out
2654	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)	3032	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2655	if $color & cf::NDI_DEF;	3033	if $color & cf::NDI_DEF;
2656		3034
2657	$self->send_packet ("msg " . $self->{json_coder}->encode (	3035	my $pkt = "msg "
		3036	. $self->{json_coder}->encode (
2658	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));	3037	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2659	} else {	3038	);
2660	if ($color >= 0) {
2661	# replace some tags by gcfclient-compatible ones
2662	for ($msg) {
2663	1 while
2664	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2665	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2666	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2667	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2668	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2669	}
2670		3039
2671	$color &= cf::NDI_COLOR_MASK;	3040	$self->send_big_packet ($pkt);
2672
2673	utf8::encode $msg;
2674
2675	if (0 && $msg =~ /\[/) {
2676	# COMMAND/INFO
2677	$self->send_packet ("drawextinfo $color 10 8 $msg")
2678	} else {
2679	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2680	$self->send_packet ("drawinfo $color $msg")
2681	}
2682	}
2683	}
2684	}	3041	}
2685		3042
2686	=item $client->ext_msg ($type, @msg)	3043	=item $client->ext_msg ($type, @msg)
2687		3044
2688	Sends an ext event to the client.	3045	Sends an ext event to the client.
…		…
2691		3048
2692	sub cf::client::ext_msg($$@) {	3049	sub cf::client::ext_msg($$@) {
2693	my ($self, $type, @msg) = @_;	3050	my ($self, $type, @msg) = @_;
2694		3051
2695	if ($self->extcmd == 2) {	3052	if ($self->extcmd == 2) {
2696	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3053	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2697	} elsif ($self->extcmd == 1) { # TODO: remove	3054	} elsif ($self->extcmd == 1) { # TODO: remove
2698	push @msg, msgtype => "event_$type";	3055	push @msg, msgtype => "event_$type";
2699	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3056	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2700	}	3057	}
2701	}	3058	}
2702		3059
2703	=item $client->ext_reply ($msgid, @msg)	3060	=item $client->ext_reply ($msgid, @msg)
2704		3061
…		…
2708		3065
2709	sub cf::client::ext_reply($$@) {	3066	sub cf::client::ext_reply($$@) {
2710	my ($self, $id, @msg) = @_;	3067	my ($self, $id, @msg) = @_;
2711		3068
2712	if ($self->extcmd == 2) {	3069	if ($self->extcmd == 2) {
2713	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3070	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2714	} elsif ($self->extcmd == 1) {	3071	} elsif ($self->extcmd == 1) {
2715	#TODO: version 1, remove	3072	#TODO: version 1, remove
2716	unshift @msg, msgtype => "reply", msgid => $id;	3073	unshift @msg, msgtype => "reply", msgid => $id;
2717	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3074	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2718	}	3075	}
2719	}	3076	}
2720		3077
2721	=item $success = $client->query ($flags, "text", \&cb)	3078	=item $success = $client->query ($flags, "text", \&cb)
2722		3079
…		…
2823		3180
2824	$coro	3181	$coro
2825	}	3182	}
2826		3183
2827	cf::client->attach (	3184	cf::client->attach (
2828	on_destroy => sub {	3185	on_client_destroy => sub {
2829	my ($ns) = @_;	3186	my ($ns) = @_;
2830		3187
2831	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3188	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
2832	},	3189	},
2833	);	3190	);
…		…
2849	our $safe_hole = new Safe::Hole;	3206	our $safe_hole = new Safe::Hole;
2850		3207
2851	$SIG{FPE} = 'IGNORE';	3208	$SIG{FPE} = 'IGNORE';
2852		3209
2853	$safe->permit_only (Opcode::opset qw(	3210	$safe->permit_only (Opcode::opset qw(
2854	:base_core :base_mem :base_orig :base_math	3211	:base_core :base_mem :base_orig :base_math :base_loop
2855	grepstart grepwhile mapstart mapwhile	3212	grepstart grepwhile mapstart mapwhile
2856	sort time	3213	sort time
2857	));	3214	));
2858		3215
2859	# here we export the classes and methods available to script code	3216	# here we export the classes and methods available to script code
…		…
2861	=pod	3218	=pod
2862		3219
2863	The following functions and methods are available within a safe environment:	3220	The following functions and methods are available within a safe environment:
2864		3221
2865	cf::object	3222	cf::object
2866	contr pay_amount pay_player map x y force_find force_add	3223	contr pay_amount pay_player map x y force_find force_add destroy
2867	insert remove name archname title slaying race decrease_ob_nr	3224	insert remove name archname title slaying race decrease split
		3225	value
2868		3226
2869	cf::object::player	3227	cf::object::player
2870	player	3228	player
2871		3229
2872	cf::player	3230	cf::player
…		…
2877		3235
2878	=cut	3236	=cut
2879		3237
2880	for (	3238	for (
2881	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3239	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2882	insert remove inv name archname title slaying race	3240	insert remove inv nrof name archname title slaying race
2883	decrease_ob_nr)],	3241	decrease split destroy change_exp value msg lore send_msg)],
2884	["cf::object::player" => qw(player)],	3242	["cf::object::player" => qw(player)],
2885	["cf::player" => qw(peaceful)],	3243	["cf::player" => qw(peaceful send_msg)],
2886	["cf::map" => qw(trigger)],	3244	["cf::map" => qw(trigger)],
2887	) {	3245	) {
2888	no strict 'refs';	3246	no strict 'refs';
2889	my ($pkg, @funs) = @$_;	3247	my ($pkg, @funs) = @$_;
2890	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3248	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
…		…
2908		3266
2909	my $qcode = $code;	3267	my $qcode = $code;
2910	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3268	$qcode =~ s/"/‟/g; # not allowed in #line filenames
2911	$qcode =~ s/\n/\\n/g;	3269	$qcode =~ s/\n/\\n/g;
2912		3270
		3271	%vars = (_dummy => 0) unless %vars;
		3272
		3273	my @res;
2913	local $_;	3274	local $_;
2914	local @safe::cf::_safe_eval_args = values %vars;
2915		3275
2916	my $eval =	3276	my $eval =
2917	"do {\n"	3277	"do {\n"
2918	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3278	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2919	. "#line 0 \"{$qcode}\"\n"	3279	. "#line 0 \"{$qcode}\"\n"
2920	. $code	3280	. $code
2921	. "\n}"	3281	. "\n}"
2922	;	3282	;
2923		3283
		3284	if ($CFG{safe_eval}) {
2924	sub_generation_inc;	3285	sub_generation_inc;
		3286	local @safe::cf::_safe_eval_args = values %vars;
2925	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3287	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2926	sub_generation_inc;	3288	sub_generation_inc;
		3289	} else {
		3290	local @cf::_safe_eval_args = values %vars;
		3291	@res = wantarray ? eval eval : scalar eval $eval;
		3292	}
2927		3293
2928	if ($@) {	3294	if ($@) {
2929	warn "$@";	3295	warn "$@";
2930	warn "while executing safe code '$code'\n";	3296	warn "while executing safe code '$code'\n";
2931	warn "with arguments " . (join " ", %vars) . "\n";	3297	warn "with arguments " . (join " ", %vars) . "\n";
…		…
2950	=cut	3316	=cut
2951		3317
2952	sub register_script_function {	3318	sub register_script_function {
2953	my ($fun, $cb) = @_;	3319	my ($fun, $cb) = @_;
2954		3320
2955	no strict 'refs';	3321	$fun = "safe::$fun" if $CFG{safe_eval};
2956	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3322	*$fun = $safe_hole->wrap ($cb);
2957	}	3323	}
2958		3324
2959	=back	3325	=back
2960		3326
2961	=cut	3327	=cut
…		…
2982		3348
2983	$facedata->{version} == 2	3349	$facedata->{version} == 2
2984	or cf::cleanup "$path: version mismatch, cannot proceed.";	3350	or cf::cleanup "$path: version mismatch, cannot proceed.";
2985		3351
2986	# patch in the exptable	3352	# patch in the exptable
		3353	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
2987	$facedata->{resource}{"res/exp_table"} = {	3354	$facedata->{resource}{"res/exp_table"} = {
2988	type => FT_RSRC,	3355	type => FT_RSRC,
2989	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),	3356	data => $exp_table,
		3357	hash => (Digest::MD5::md5 $exp_table),
2990	};	3358	};
2991	cf::cede_to_tick;	3359	cf::cede_to_tick;
2992		3360
2993	{	3361	{
2994	my $faces = $facedata->{faceinfo};	3362	my $faces = $facedata->{faceinfo};
2995		3363
2996	while (my ($face, $info) = each %$faces) {	3364	while (my ($face, $info) = each %$faces) {
2997	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3365	my $idx = (cf::face::find $face) || cf::face::alloc $face;
		3366
2998	cf::face::set_visibility $idx, $info->{visibility};	3367	cf::face::set_visibility $idx, $info->{visibility};
2999	cf::face::set_magicmap $idx, $info->{magicmap};	3368	cf::face::set_magicmap $idx, $info->{magicmap};
3000	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3369	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3001	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3370	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3002		3371
3003	cf::cede_to_tick;	3372	cf::cede_to_tick;
3004	}	3373	}
3005		3374
3006	while (my ($face, $info) = each %$faces) {	3375	while (my ($face, $info) = each %$faces) {
3007	next unless $info->{smooth};	3376	next unless $info->{smooth};
		3377
3008	my $idx = cf::face::find $face	3378	my $idx = cf::face::find $face
3009	or next;	3379	or next;
		3380
3010	if (my $smooth = cf::face::find $info->{smooth}) {	3381	if (my $smooth = cf::face::find $info->{smooth}) {
3011	cf::face::set_smooth $idx, $smooth;	3382	cf::face::set_smooth $idx, $smooth;
3012	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3383	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3013	} else {	3384	} else {
3014	warn "smooth face '$info->{smooth}' not found for face '$face'";	3385	warn "smooth face '$info->{smooth}' not found for face '$face'";
…		…
3028		3399
3029	cf::anim::invalidate_all; # d'oh	3400	cf::anim::invalidate_all; # d'oh
3030	}	3401	}
3031		3402
3032	{	3403	{
3033	# TODO: for gcfclient pleasure, we should give resources
3034	# that gcfclient doesn't grok a >10000 face index.
3035	my $res = $facedata->{resource};	3404	my $res = $facedata->{resource};
3036		3405
3037	my $soundconf = delete $res->{"res/sound.conf"};
3038
3039	while (my ($name, $info) = each %$res) {	3406	while (my ($name, $info) = each %$res) {
		3407	if (defined $info->{type}) {
3040	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3408	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3041	my $data;
3042		3409
3043	if ($info->{type} & 1) {	3410	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3044	# prepend meta info	3411	cf::face::set_type $idx, $info->{type};
3045
3046	my $meta = $enc->encode ({
3047	name => $name,
3048	%{ $info->{meta} || {} },
3049	});
3050
3051	$data = pack "(w/a*)*", $meta, $info->{data};
3052	} else {	3412	} else {
3053	$data = $info->{data};	3413	$RESOURCE{$name} = $info;
3054	}	3414	}
3055		3415
3056	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3057	cf::face::set_type $idx, $info->{type};
3058
3059	cf::cede_to_tick;	3416	cf::cede_to_tick;
3060	}	3417	}
3061
3062	if ($soundconf) {
3063	$soundconf = $enc->decode (delete $soundconf->{data});
3064
3065	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3066	my $sound = $soundconf->{compat}[$_]
3067	or next;
3068
3069	my $face = cf::face::find "sound/$sound->[1]";
3070	cf::sound::set $sound->[0] => $face;
3071	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3072	}
3073
3074	while (my ($k, $v) = each %{$soundconf->{event}}) {
3075	my $face = cf::face::find "sound/$v";
3076	cf::sound::set $k => $face;
3077	}
3078	}
3079	}	3418	}
		3419
		3420	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3080		3421
3081	1	3422	1
3082	}	3423	}
		3424
		3425	cf::global->attach (on_resource_update => sub {
		3426	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
		3427	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
		3428
		3429	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3430	my $sound = $soundconf->{compat}[$_]
		3431	or next;
		3432
		3433	my $face = cf::face::find "sound/$sound->[1]";
		3434	cf::sound::set $sound->[0] => $face;
		3435	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3436	}
		3437
		3438	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3439	my $face = cf::face::find "sound/$v";
		3440	cf::sound::set $k => $face;
		3441	}
		3442	}
		3443	});
3083		3444
3084	register_exticmd fx_want => sub {	3445	register_exticmd fx_want => sub {
3085	my ($ns, $want) = @_;	3446	my ($ns, $want) = @_;
3086		3447
3087	while (my ($k, $v) = each %$want) {	3448	while (my ($k, $v) = each %$want) {
3088	$ns->fx_want ($k, $v);	3449	$ns->fx_want ($k, $v);
3089	}	3450	}
3090	};	3451	};
		3452
		3453	sub load_resource_file($) {
		3454	my $guard = lock_acquire "load_resource_file";
		3455
		3456	my $status = load_resource_file_ $_[0];
		3457	get_slot 0.1, 100;
		3458	cf::arch::commit_load;
		3459
		3460	$status
		3461	}
3091		3462
3092	sub reload_regions {	3463	sub reload_regions {
3093	# HACK to clear player env face cache, we need some signal framework	3464	# HACK to clear player env face cache, we need some signal framework
3094	# for this (global event?)	3465	# for this (global event?)
3095	%ext::player_env::MUSIC_FACE_CACHE = ();	3466	%ext::player_env::MUSIC_FACE_CACHE = ();
…		…
3109	}	3480	}
3110		3481
3111	sub reload_archetypes {	3482	sub reload_archetypes {
3112	load_resource_file "$DATADIR/archetypes"	3483	load_resource_file "$DATADIR/archetypes"
3113	or die "unable to load archetypes\n";	3484	or die "unable to load archetypes\n";
3114	#d# NEED to laod twice to resolve forward references
3115	# this really needs to be done in an extra post-pass
3116	# (which needs to be synchronous, so solve it differently)
3117	load_resource_file "$DATADIR/archetypes"
3118	or die "unable to load archetypes\n";
3119	}	3485	}
3120		3486
3121	sub reload_treasures {	3487	sub reload_treasures {
3122	load_resource_file "$DATADIR/treasures"	3488	load_resource_file "$DATADIR/treasures"
3123	or die "unable to load treasurelists\n";	3489	or die "unable to load treasurelists\n";
3124	}	3490	}
3125		3491
3126	sub reload_resources {	3492	sub reload_resources {
3127	warn "reloading resource files...\n";	3493	warn "reloading resource files...\n";
3128		3494
		3495	reload_facedata;
		3496	reload_archetypes;
3129	reload_regions;	3497	reload_regions;
3130	reload_facedata;
3131	#reload_archetypes;#d#
3132	reload_archetypes;
3133	reload_treasures;	3498	reload_treasures;
3134		3499
3135	warn "finished reloading resource files\n";	3500	warn "finished reloading resource files\n";
3136	}	3501	}
3137		3502
3138	sub init {
3139	reload_resources;
3140	}
3141
3142	sub reload_config {	3503	sub reload_config {
		3504	warn "reloading config file...\n";
		3505
3143	open my $fh, "<:utf8", "$CONFDIR/config"	3506	open my $fh, "<:utf8", "$CONFDIR/config"
3144	or return;	3507	or return;
3145		3508
3146	local $/;	3509	local $/;
3147	*CFG = YAML::Syck::Load <$fh>;	3510	*CFG = YAML::XS::Load scalar <$fh>;
3148		3511
3149	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3512	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3150		3513
3151	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3514	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3152	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3515	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3156	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3519	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3157	and die "WARNING: m(un)lockall failed: $!\n";	3520	and die "WARNING: m(un)lockall failed: $!\n";
3158	};	3521	};
3159	warn $@ if $@;	3522	warn $@ if $@;
3160	}	3523	}
		3524
		3525	warn "finished reloading resource files\n";
		3526	}
		3527
		3528	sub pidfile() {
		3529	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
		3530	or die "$PIDFILE: $!";
		3531	flock $fh, &Fcntl::LOCK_EX
		3532	or die "$PIDFILE: flock: $!";
		3533	$fh
		3534	}
		3535
		3536	# make sure only one server instance is running at any one time
		3537	sub atomic {
		3538	my $fh = pidfile;
		3539
		3540	my $pid = <$fh>;
		3541	kill 9, $pid if $pid > 0;
		3542
		3543	seek $fh, 0, 0;
		3544	print $fh $$;
		3545	}
		3546
		3547	sub main_loop {
		3548	warn "EV::loop starting\n";
		3549	if (1) {
		3550	EV::loop;
		3551	}
		3552	warn "EV::loop returned\n";
		3553	goto &main_loop unless $REALLY_UNLOOP;
3161	}	3554	}
3162		3555
3163	sub main {	3556	sub main {
		3557	cf::init_globals; # initialise logging
		3558
		3559	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3560	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
		3561	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
		3562	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
		3563
		3564	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
		3565
3164	# we must not ever block the main coroutine	3566	# we must not ever block the main coroutine
3165	local $Coro::idle = sub {	3567	local $Coro::idle = sub {
3166	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3568	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3167	(async {	3569	(async {
3168	Event::one_event;	3570	$Coro::current->{desc} = "IDLE BUG HANDLER";
		3571	EV::loop EV::LOOP_ONESHOT;
3169	})->prio (Coro::PRIO_MAX);	3572	})->prio (Coro::PRIO_MAX);
3170	};	3573	};
3171		3574
		3575	evthread_start IO::AIO::poll_fileno;
		3576
		3577	cf::sync_job {
		3578	cf::init_experience;
		3579	cf::init_anim;
		3580	cf::init_attackmess;
		3581	cf::init_dynamic;
		3582
		3583	cf::load_settings;
		3584	cf::load_materials;
		3585
		3586	reload_resources;
3172	reload_config;	3587	reload_config;
3173	db_init;	3588	db_init;
		3589
		3590	cf::init_uuid;
		3591	cf::init_signals;
		3592	cf::init_skills;
		3593
		3594	cf::init_beforeplay;
		3595
		3596	atomic;
		3597
3174	load_extensions;	3598	load_extensions;
3175		3599
3176	$TICK_WATCHER->start;	3600	utime time, time, $RUNTIMEFILE;
3177	Event::loop;	3601
		3602	# no (long-running) fork's whatsoever before this point(!)
		3603	use POSIX ();
		3604	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
		3605
		3606	(pop @POST_INIT)->(0) while @POST_INIT;
		3607	};
		3608
		3609	cf::object::thawer::errors_are_fatal 0;
		3610	warn "parse errors in files are no longer fatal from this point on.\n";
		3611
		3612	main_loop;
3178	}	3613	}
3179		3614
3180	#############################################################################	3615	#############################################################################
3181	# initialisation and cleanup	3616	# initialisation and cleanup
3182		3617
3183	# install some emergency cleanup handlers	3618	# install some emergency cleanup handlers
3184	BEGIN {	3619	BEGIN {
		3620	our %SIGWATCHER = ();
3185	for my $signal (qw(INT HUP TERM)) {	3621	for my $signal (qw(INT HUP TERM)) {
3186	Event->signal (	3622	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3187	reentrant => 0,
3188	data => WF_AUTOCANCEL,
3189	signal => $signal,
3190	prio => 0,
3191	cb => sub {
3192	cf::cleanup "SIG$signal";	3623	cf::cleanup "SIG$signal";
3193	},
3194	);	3624	};
3195	}	3625	}
3196	}	3626	}
3197		3627
3198	sub write_runtime {	3628	sub write_runtime_sync {
3199	my $runtime = "$LOCALDIR/runtime";	3629	my $t0 = AE::time;
3200		3630
3201	# first touch the runtime file to show we are still running:	3631	# first touch the runtime file to show we are still running:
3202	# the fsync below can take a very very long time.	3632	# the fsync below can take a very very long time.
3203		3633
3204	IO::AIO::aio_utime $runtime, undef, undef;	3634	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3205		3635
3206	my $guard = cf::lock_acquire "write_runtime";	3636	my $guard = cf::lock_acquire "write_runtime";
3207		3637
3208	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	3638	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3209	or return;	3639	or return;
3210		3640
3211	my $value = $cf::RUNTIME + 90 + 10;	3641	my $value = $cf::RUNTIME + 90 + 10;
3212	# 10 is the runtime save interval, for a monotonic clock	3642	# 10 is the runtime save interval, for a monotonic clock
3213	# 60 allows for the watchdog to kill the server.	3643	# 60 allows for the watchdog to kill the server.
…		…
3223	aio_utime $fh, undef, undef;	3653	aio_utime $fh, undef, undef;
3224		3654
3225	close $fh	3655	close $fh
3226	or return;	3656	or return;
3227		3657
3228	aio_rename "$runtime~", $runtime	3658	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3229	and return;	3659	and return;
3230		3660
3231	warn "runtime file written.\n";	3661	warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3232		3662
3233	1	3663	1
		3664	}
		3665
		3666	our $uuid_lock;
		3667	our $uuid_skip;
		3668
		3669	sub write_uuid_sync($) {
		3670	$uuid_skip ||= $_[0];
		3671
		3672	return if $uuid_lock;
		3673	local $uuid_lock = 1;
		3674
		3675	my $uuid = "$LOCALDIR/uuid";
		3676
		3677	my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
		3678	or return;
		3679
		3680	my $value = uuid_seq uuid_cur;
		3681
		3682	unless ($value) {
		3683	warn "cowardly refusing to write zero uuid value!\n";
		3684	return;
		3685	}
		3686
		3687	my $value = uuid_str $value + $uuid_skip;
		3688	$uuid_skip = 0;
		3689
		3690	(aio_write $fh, 0, (length $value), $value, 0) <= 0
		3691	and return;
		3692
		3693	# always fsync - this file is important
		3694	aio_fsync $fh
		3695	and return;
		3696
		3697	close $fh
		3698	or return;
		3699
		3700	aio_rename "$uuid~", $uuid
		3701	and return;
		3702
		3703	warn "uuid file written ($value).\n";
		3704
		3705	1
		3706
		3707	}
		3708
		3709	sub write_uuid($$) {
		3710	my ($skip, $sync) = @_;
		3711
		3712	$sync ? write_uuid_sync $skip
		3713	: async { write_uuid_sync $skip };
3234	}	3714	}
3235		3715
3236	sub emergency_save() {	3716	sub emergency_save() {
3237	my $freeze_guard = cf::freeze_mainloop;	3717	my $freeze_guard = cf::freeze_mainloop;
3238		3718
3239	warn "enter emergency perl save\n";	3719	warn "emergency_perl_save: enter\n";
3240		3720
3241	cf::sync_job {	3721	cf::sync_job {
		3722	# this is a trade-off: we want to be very quick here, so
		3723	# save all maps without fsync, and later call a global sync
		3724	# (which in turn might be very very slow)
		3725	local $USE_FSYNC = 0;
		3726
3242	# use a peculiar iteration method to avoid tripping on perl	3727	# use a peculiar iteration method to avoid tripping on perl
3243	# refcount bugs in for. also avoids problems with players	3728	# refcount bugs in for. also avoids problems with players
3244	# and maps saved/destroyed asynchronously.	3729	# and maps saved/destroyed asynchronously.
3245	warn "begin emergency player save\n";	3730	warn "emergency_perl_save: begin player save\n";
3246	for my $login (keys %cf::PLAYER) {	3731	for my $login (keys %cf::PLAYER) {
3247	my $pl = $cf::PLAYER{$login} or next;	3732	my $pl = $cf::PLAYER{$login} or next;
3248	$pl->valid or next;	3733	$pl->valid or next;
		3734	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3249	$pl->save;	3735	$pl->save;
3250	}	3736	}
3251	warn "end emergency player save\n";	3737	warn "emergency_perl_save: end player save\n";
3252		3738
3253	warn "begin emergency map save\n";	3739	warn "emergency_perl_save: begin map save\n";
3254	for my $path (keys %cf::MAP) {	3740	for my $path (keys %cf::MAP) {
3255	my $map = $cf::MAP{$path} or next;	3741	my $map = $cf::MAP{$path} or next;
3256	$map->valid or next;	3742	$map->valid or next;
3257	$map->save;	3743	$map->save;
3258	}	3744	}
3259	warn "end emergency map save\n";	3745	warn "emergency_perl_save: end map save\n";
3260		3746
3261	warn "begin emergency database checkpoint\n";	3747	warn "emergency_perl_save: begin database checkpoint\n";
3262	BDB::db_env_txn_checkpoint $DB_ENV;	3748	BDB::db_env_txn_checkpoint $DB_ENV;
3263	warn "end emergency database checkpoint\n";	3749	warn "emergency_perl_save: end database checkpoint\n";
		3750
		3751	warn "emergency_perl_save: begin write uuid\n";
		3752	write_uuid_sync 1;
		3753	warn "emergency_perl_save: end write uuid\n";
3264	};	3754	};
3265		3755
		3756	warn "emergency_perl_save: starting sync()\n";
		3757	IO::AIO::aio_sync sub {
		3758	warn "emergency_perl_save: finished sync()\n";
		3759	};
		3760
3266	warn "leave emergency perl save\n";	3761	warn "emergency_perl_save: leave\n";
3267	}	3762	}
3268		3763
3269	sub post_cleanup {	3764	sub post_cleanup {
3270	my ($make_core) = @_;	3765	my ($make_core) = @_;
3271		3766
3272	warn Carp::longmess "post_cleanup backtrace"	3767	warn Carp::longmess "post_cleanup backtrace"
3273	if $make_core;	3768	if $make_core;
		3769
		3770	my $fh = pidfile;
		3771	unlink $PIDFILE if <$fh> == $$;
		3772	}
		3773
		3774	# a safer delete_package, copied from Symbol
		3775	sub clear_package($) {
		3776	my $pkg = shift;
		3777
		3778	# expand to full symbol table name if needed
		3779	unless ($pkg =~ /^main::.*::$/) {
		3780	$pkg = "main$pkg" if $pkg =~ /^::/;
		3781	$pkg = "main::$pkg" unless $pkg =~ /^main::/;
		3782	$pkg .= '::' unless $pkg =~ /::$/;
		3783	}
		3784
		3785	my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
		3786	my $stem_symtab = *{$stem}{HASH};
		3787
		3788	defined $stem_symtab and exists $stem_symtab->{$leaf}
		3789	or return;
		3790
		3791	# clear all symbols
		3792	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
		3793	for my $name (keys %$leaf_symtab) {
		3794	_gv_clear *{"$pkg$name"};
		3795	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
		3796	}
3274	}	3797	}
3275		3798
3276	sub do_reload_perl() {	3799	sub do_reload_perl() {
3277	# can/must only be called in main	3800	# can/must only be called in main
3278	if ($Coro::current != $Coro::main) {	3801	if (in_main) {
3279	warn "can only reload from main coroutine";	3802	warn "can only reload from main coroutine";
3280	return;	3803	return;
3281	}	3804	}
3282		3805
		3806	return if $RELOAD++;
		3807
		3808	my $t1 = AE::time;
		3809
		3810	while ($RELOAD) {
3283	warn "reloading...";	3811	warn "reloading...";
3284		3812
3285	warn "entering sync_job";	3813	warn "entering sync_job";
3286		3814
3287	cf::sync_job {	3815	cf::sync_job {
3288	cf::write_runtime; # external watchdog should not bark	3816	cf::write_runtime_sync; # external watchdog should not bark
3289	cf::emergency_save;	3817	cf::emergency_save;
3290	cf::write_runtime; # external watchdog should not bark	3818	cf::write_runtime_sync; # external watchdog should not bark
3291		3819
3292	warn "syncing database to disk";	3820	warn "syncing database to disk";
3293	BDB::db_env_txn_checkpoint $DB_ENV;	3821	BDB::db_env_txn_checkpoint $DB_ENV;
3294		3822
3295	# if anything goes wrong in here, we should simply crash as we already saved	3823	# if anything goes wrong in here, we should simply crash as we already saved
3296		3824
3297	warn "cancelling all WF_AUTOCANCEL watchers";
3298	for (Event::all_watchers) {
3299	$_->cancel if $_->data & WF_AUTOCANCEL;
3300	}
3301
3302	warn "flushing outstanding aio requests";	3825	warn "flushing outstanding aio requests";
3303	for (;;) {
3304	BDB::flush;
3305	IO::AIO::flush;
3306	Coro::cede;
3307	last unless IO::AIO::nreqs || BDB::nreqs;	3826	while (IO::AIO::nreqs || BDB::nreqs) {
3308	warn "iterate...";	3827	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3309	}
3310
3311	++$RELOAD;
3312
3313	warn "cancelling all extension coros";
3314	$_->cancel for values %EXT_CORO;
3315	%EXT_CORO = ();
3316
3317	warn "removing commands";
3318	%COMMAND = ();
3319
3320	warn "removing ext/exti commands";
3321	%EXTCMD = ();
3322	%EXTICMD = ();
3323
3324	warn "unloading/nuking all extensions";
3325	for my $pkg (@EXTS) {
3326	warn "... unloading $pkg";
3327
3328	if (my $cb = $pkg->can ("unload")) {
3329	eval {
3330	$cb->($pkg);
3331	1
3332	} or warn "$pkg unloaded, but with errors: $@";
3333	}	3828	}
3334		3829
3335	warn "... nuking $pkg";	3830	warn "cancelling all extension coros";
3336	Symbol::delete_package $pkg;	3831	$_->cancel for values %EXT_CORO;
3337	}	3832	%EXT_CORO = ();
3338		3833
3339	warn "unloading all perl modules loaded from $LIBDIR";	3834	warn "removing commands";
3340	while (my ($k, $v) = each %INC) {	3835	%COMMAND = ();
3341	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3342		3836
		3837	warn "removing ext/exti commands";
		3838	%EXTCMD = ();
		3839	%EXTICMD = ();
		3840
		3841	warn "unloading/nuking all extensions";
		3842	for my $pkg (@EXTS) {
3343	warn "... unloading $k";	3843	warn "... unloading $pkg";
3344	delete $INC{$k};
3345		3844
3346	$k =~ s/\.pm$//;
3347	$k =~ s/\//::/g;
3348
3349	if (my $cb = $k->can ("unload_module")) {	3845	if (my $cb = $pkg->can ("unload")) {
		3846	eval {
3350	$cb->();	3847	$cb->($pkg);
		3848	1
		3849	} or warn "$pkg unloaded, but with errors: $@";
		3850	}
		3851
		3852	warn "... clearing $pkg";
		3853	clear_package $pkg;
3351	}	3854	}
3352		3855
3353	Symbol::delete_package $k;	3856	warn "unloading all perl modules loaded from $LIBDIR";
		3857	while (my ($k, $v) = each %INC) {
		3858	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
		3859
		3860	warn "... unloading $k";
		3861	delete $INC{$k};
		3862
		3863	$k =~ s/\.pm$//;
		3864	$k =~ s/\//::/g;
		3865
		3866	if (my $cb = $k->can ("unload_module")) {
		3867	$cb->();
		3868	}
		3869
		3870	clear_package $k;
3354	}	3871	}
3355		3872
3356	warn "getting rid of safe::, as good as possible";	3873	warn "getting rid of safe::, as good as possible";
3357	Symbol::delete_package "safe::$_"	3874	clear_package "safe::$_"
3358	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3875	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3359		3876
3360	warn "unloading cf.pm \"a bit\"";	3877	warn "unloading cf.pm \"a bit\"";
3361	delete $INC{"cf.pm"};	3878	delete $INC{"cf.pm"};
3362	delete $INC{"cf/pod.pm"};	3879	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3363		3880
3364	# don't, removes xs symbols, too,	3881	# don't, removes xs symbols, too,
3365	# and global variables created in xs	3882	# and global variables created in xs
3366	#Symbol::delete_package __PACKAGE__;	3883	#clear_package __PACKAGE__;
3367		3884
3368	warn "unload completed, starting to reload now";	3885	warn "unload completed, starting to reload now";
3369		3886
3370	warn "reloading cf.pm";	3887	warn "reloading cf.pm";
3371	require cf;	3888	require cf;
3372	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3889	cf::_connect_to_perl_1;
3373		3890
3374	warn "loading config and database again";	3891	warn "loading config and database again";
3375	cf::reload_config;	3892	cf::reload_config;
3376		3893
3377	warn "loading extensions";	3894	warn "loading extensions";
3378	cf::load_extensions;	3895	cf::load_extensions;
3379		3896
		3897	if ($REATTACH_ON_RELOAD) {
3380	warn "reattaching attachments to objects/players";	3898	warn "reattaching attachments to objects/players";
3381	_global_reattach; # objects, sockets	3899	_global_reattach; # objects, sockets
3382	warn "reattaching attachments to maps";	3900	warn "reattaching attachments to maps";
3383	reattach $_ for values %MAP;	3901	reattach $_ for values %MAP;
3384	warn "reattaching attachments to players";	3902	warn "reattaching attachments to players";
3385	reattach $_ for values %PLAYER;	3903	reattach $_ for values %PLAYER;
		3904	}
3386		3905
		3906	warn "running post_init jobs";
		3907	(pop @POST_INIT)->(1) while @POST_INIT;
		3908
3387	warn "leaving sync_job";	3909	warn "leaving sync_job";
3388		3910
3389	1	3911	1
3390	} or do {	3912	} or do {
3391	warn $@;	3913	warn $@;
3392	warn "error while reloading, exiting.";	3914	cf::cleanup "error while reloading, exiting.";
3393	exit 1;
3394	};	3915	};
3395		3916
3396	warn "reloaded";	3917	warn "reloaded";
		3918	--$RELOAD;
		3919	}
		3920
		3921	$t1 = AE::time - $t1;
		3922	warn "reload completed in ${t1}s\n";
3397	};	3923	};
3398		3924
3399	our $RELOAD_WATCHER; # used only during reload	3925	our $RELOAD_WATCHER; # used only during reload
3400		3926
3401	sub reload_perl() {	3927	sub reload_perl() {
3402	# doing reload synchronously and two reloads happen back-to-back,	3928	# doing reload synchronously and two reloads happen back-to-back,
3403	# coro crashes during coro_state_free->destroy here.	3929	# coro crashes during coro_state_free->destroy here.
3404		3930
3405	$RELOAD_WATCHER ||= Event->timer (	3931	$RELOAD_WATCHER ||= cf::async {
3406	reentrant => 0,	3932	Coro::AIO::aio_wait cache_extensions;
3407	after => 0,	3933
3408	data => WF_AUTOCANCEL,	3934	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3409	cb => sub {
3410	do_reload_perl;	3935	do_reload_perl;
3411	undef $RELOAD_WATCHER;	3936	undef $RELOAD_WATCHER;
3412	},	3937	};
3413	);	3938	};
3414	}	3939	}
3415		3940
3416	register_command "reload" => sub {	3941	register_command "reload" => sub {
3417	my ($who, $arg) = @_;	3942	my ($who, $arg) = @_;
3418		3943
3419	if ($who->flag (FLAG_WIZ)) {	3944	if ($who->flag (FLAG_WIZ)) {
3420	$who->message ("reloading server.");	3945	$who->message ("reloading server.");
		3946	async {
		3947	$Coro::current->{desc} = "perl_reload";
3421	async { reload_perl };	3948	reload_perl;
		3949	};
3422	}	3950	}
3423	};	3951	};
3424		3952
3425	unshift @INC, $LIBDIR;	3953	unshift @INC, $LIBDIR;
3426		3954
…		…
3428		3956
3429	our @WAIT_FOR_TICK;	3957	our @WAIT_FOR_TICK;
3430	our @WAIT_FOR_TICK_BEGIN;	3958	our @WAIT_FOR_TICK_BEGIN;
3431		3959
3432	sub wait_for_tick {	3960	sub wait_for_tick {
3433	return unless $TICK_WATCHER->is_active;
3434	return if $Coro::current == $Coro::main;	3961	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3435		3962
3436	my $signal = new Coro::Signal;	3963	my $signal = new Coro::Signal;
3437	push @WAIT_FOR_TICK, $signal;	3964	push @WAIT_FOR_TICK, $signal;
3438	$signal->wait;	3965	$signal->wait;
3439	}	3966	}
3440		3967
3441	sub wait_for_tick_begin {	3968	sub wait_for_tick_begin {
3442	return unless $TICK_WATCHER->is_active;
3443	return if $Coro::current == $Coro::main;	3969	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3444		3970
3445	my $signal = new Coro::Signal;	3971	my $signal = new Coro::Signal;
3446	push @WAIT_FOR_TICK_BEGIN, $signal;	3972	push @WAIT_FOR_TICK_BEGIN, $signal;
3447	$signal->wait;	3973	$signal->wait;
3448	}	3974	}
3449		3975
3450	my $min = 1e6;#d#	3976	sub tick {
3451	my $avg = 10;
3452	$TICK_WATCHER = Event->timer (
3453	reentrant => 0,
3454	parked => 1,
3455	prio => 0,
3456	at => $NEXT_TICK || $TICK,
3457	data => WF_AUTOCANCEL,
3458	cb => sub {
3459	if ($Coro::current != $Coro::main) {	3977	if ($Coro::current != $Coro::main) {
3460	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3978	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3461	unless ++$bug_warning > 10;	3979	unless ++$bug_warning > 10;
3462	return;	3980	return;
3463	}	3981	}
3464		3982
3465	$NOW = $tick_start = Event::time;
3466
3467	cf::server_tick; # one server iteration	3983	cf::server_tick; # one server iteration
3468		3984
3469	0 && sync_job {#d#	3985	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3470	for(1..10) {
3471	my $t = Event::time;
3472	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3473	or die;
3474		3986
3475	$map->width (50);	3987	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3476	$map->height (50);	3988	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3477	$map->alloc;	3989	Coro::async_pool {
3478	$map->_load_objects ("/tmp/x.map", 1); #TODO: does not work	3990	$Coro::current->{desc} = "runtime saver";
3479	my $t = Event::time - $t;	3991	write_runtime_sync
3480		3992	or warn "ERROR: unable to write runtime file: $!";
3481	#next unless $t < 0.0013;#d#
3482	if ($t < $min) {
3483	$min = $t;
3484	}
3485	$avg = $avg * 0.99 + $t * 0.01;
3486	}
3487	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3488	exit 0;
3489	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3490	};	3993	};
		3994	}
3491		3995
3492	$RUNTIME += $TICK;
3493	$NEXT_TICK += $TICK;
3494
3495	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3496	$NEXT_RUNTIME_WRITE = $NOW + 10;
3497	Coro::async_pool {
3498	write_runtime
3499	or warn "ERROR: unable to write runtime file: $!";
3500	};
3501	}
3502
3503	# my $AFTER = Event::time;
3504	# warn $AFTER - $NOW;#d#
3505
3506	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3996	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3507	$sig->send;	3997	$sig->send;
3508	}	3998	}
3509	while (my $sig = shift @WAIT_FOR_TICK) {	3999	while (my $sig = shift @WAIT_FOR_TICK) {
3510	$sig->send;	4000	$sig->send;
3511	}	4001	}
3512		4002
3513	$NOW = Event::time;	4003	$LOAD = ($NOW - $TICK_START) / $TICK;
3514
3515	# if we are delayed by four ticks or more, skip them all
3516	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3517
3518	$TICK_WATCHER->at ($NEXT_TICK);
3519	$TICK_WATCHER->start;
3520
3521	$LOAD = ($NOW - $tick_start) / $TICK;
3522	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4004	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3523		4005
3524	_post_tick;	4006	if (0) {
3525		4007	if ($NEXT_TICK) {
3526		4008	my $jitter = $TICK_START - $NEXT_TICK;
		4009	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
		4010	warn "jitter $JITTER\n";#d#
		4011	}
3527	},	4012	}
3528	);	4013	}
3529		4014
3530	{	4015	{
		4016	# configure BDB
		4017
3531	BDB::min_parallel 8;	4018	BDB::min_parallel 16;
3532	BDB::max_poll_time $TICK * 0.1;	4019	BDB::max_poll_reqs $TICK * 0.1;
3533	$BDB_POLL_WATCHER = Event->io (	4020	$AnyEvent::BDB::WATCHER->priority (1);
3534	reentrant => 0,
3535	fd => BDB::poll_fileno,
3536	poll => 'r',
3537	prio => 0,
3538	data => WF_AUTOCANCEL,
3539	cb => \&BDB::poll_cb,
3540	);
3541
3542	BDB::set_sync_prepare {
3543	my $status;
3544	my $current = $Coro::current;
3545	(
3546	sub {
3547	$status = $!;
3548	$current->ready; undef $current;
3549	},
3550	sub {
3551	Coro::schedule while defined $current;
3552	$! = $status;
3553	},
3554	)
3555	};
3556		4021
3557	unless ($DB_ENV) {	4022	unless ($DB_ENV) {
3558	$DB_ENV = BDB::db_env_create;	4023	$DB_ENV = BDB::db_env_create;
		4024	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
		4025	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
		4026	$DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
		4027	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		4028	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3559		4029
3560	cf::sync_job {	4030	cf::sync_job {
3561	eval {	4031	eval {
3562	BDB::db_env_open	4032	BDB::db_env_open
3563	$DB_ENV,	4033	$DB_ENV,
…		…
3565	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	4035	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3566	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	4036	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3567	0666;	4037	0666;
3568		4038
3569	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	4039	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3570
3571	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3572	| BDB::LOG_AUTOREMOVE, 1);
3573	$DB_ENV->set_lk_detect;
3574	};	4040	};
3575		4041
3576	cf::cleanup "db_env_open(db): $@" if $@;	4042	cf::cleanup "db_env_open(db): $@" if $@;
3577	};	4043	};
3578	}	4044	}
3579		4045
3580	$BDB_CHECKPOINT_WATCHER = Event->timer (	4046	$BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3581	after => 11,	4047	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3582	interval => 60,	4048	};
3583	hard => 1,	4049	$BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3584	prio => 0,
3585	data => WF_AUTOCANCEL,
3586	cb => sub {
3587	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4050	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3588	},
3589	);	4051	};
3590	$BDB_TRICKLE_WATCHER = Event->timer (	4052	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3591	after => 5,
3592	interval => 10,
3593	hard => 1,
3594	prio => 0,
3595	data => WF_AUTOCANCEL,
3596	cb => sub {
3597	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4053	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3598	},
3599	);	4054	};
3600	}	4055	}
3601		4056
3602	{	4057	{
		4058	# configure IO::AIO
		4059
3603	IO::AIO::min_parallel 8;	4060	IO::AIO::min_parallel 8;
3604
3605	undef $Coro::AIO::WATCHER;
3606	IO::AIO::max_poll_time $TICK * 0.1;	4061	IO::AIO::max_poll_time $TICK * 0.1;
3607	$AIO_POLL_WATCHER = Event->io (	4062	undef $AnyEvent::AIO::WATCHER;
3608	reentrant => 0,
3609	data => WF_AUTOCANCEL,
3610	fd => IO::AIO::poll_fileno,
3611	poll => 'r',
3612	prio => 6,
3613	cb => \&IO::AIO::poll_cb,
3614	);
3615	}	4063	}
3616		4064
3617	my $_log_backtrace;	4065	my $_log_backtrace;
3618		4066
3619	sub _log_backtrace {	4067	sub _log_backtrace {
…		…
3622	$msg =~ s/\n//;	4070	$msg =~ s/\n//;
3623		4071
3624	# limit the # of concurrent backtraces	4072	# limit the # of concurrent backtraces
3625	if ($_log_backtrace < 2) {	4073	if ($_log_backtrace < 2) {
3626	++$_log_backtrace;	4074	++$_log_backtrace;
		4075	my $perl_bt = Carp::longmess $msg;
3627	async {	4076	async {
		4077	$Coro::current->{desc} = "abt $msg";
		4078
3628	my @bt = fork_call {	4079	my @bt = fork_call {
3629	@addr = map { sprintf "%x", $_ } @addr;	4080	@addr = map { sprintf "%x", $_ } @addr;
3630	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	4081	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3631	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"	4082	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3632	or die "addr2line: $!";	4083	or die "addr2line: $!";
…		…
3640	}	4091	}
3641		4092
3642	@funcs	4093	@funcs
3643	};	4094	};
3644		4095
3645	LOG llevInfo, "[ABT] $msg\n";	4096	LOG llevInfo, "[ABT] $perl_bt\n";
		4097	LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3646	LOG llevInfo, "[ABT] $_\n" for @bt;	4098	LOG llevInfo, "[ABT] $_\n" for @bt;
3647	--$_log_backtrace;	4099	--$_log_backtrace;
3648	};	4100	};
3649	} else {	4101	} else {
3650	LOG llevInfo, "[ABT] $msg\n";	4102	LOG llevInfo, "[ABT] $msg\n";
3651	LOG llevInfo, "[ABT] [suppressed]\n";	4103	LOG llevInfo, "[ABT] [suppressed]\n";
3652	}	4104	}
3653	}	4105	}
3654		4106
3655	# load additional modules	4107	# load additional modules
3656	use cf::pod;	4108	require "cf/$_.pm" for @EXTRA_MODULES;
		4109	cf::_connect_to_perl_2;
3657		4110
3658	END { cf::emergency_save }	4111	END { cf::emergency_save }
3659		4112
3660	1	4113	1
3661		4114

Diff Legend

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