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.199 by root, Mon Jan 29 14:46:01 2007 UTC vs.
Revision 1.421 by root, Tue Apr 15 18:43:11 2008 UTC

		1	#
		2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
		3	#
		4	# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
		5	#
		6	# Deliantra is free software: you can redistribute it and/or modify
		7	# it under the terms of the GNU General Public License as published by
		8	# the Free Software Foundation, either version 3 of the License, or
		9	# (at your 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 GNU General Public License
		17	# along with this program. If not, see <http://www.gnu.org/licenses/>.
		18	#
		19	# The authors can be reached via e-mail to <support@deliantra.net>
		20	#
		21
1	package cf;	22	package cf;
2		23
3	use utf8;	24	use utf8;
4	use strict;	25	use strict;
5		26
6	use Symbol;	27	use Symbol;
7	use List::Util;	28	use List::Util;
8	use Storable;	29	use Socket;
		30	use EV 3.2;
9	use Opcode;	31	use Opcode;
10	use Safe;	32	use Safe;
11	use Safe::Hole;	33	use Safe::Hole;
		34	use Storable ();
12		35
13	use Coro 3.5 ();	36	use Coro 4.50 ();
		37	use Coro::State;
		38	use Coro::Handle;
14	use Coro::Event;	39	use Coro::EV;
15	use Coro::Timer;	40	use Coro::Timer;
16	use Coro::Signal;	41	use Coro::Signal;
17	use Coro::Semaphore;	42	use Coro::Semaphore;
18	use Coro::AIO;	43	use Coro::AIO;
		44	use Coro::BDB;
		45	use Coro::Storable;
		46	use Coro::Util ();
19		47
		48	use JSON::XS 2.01 ();
		49	use BDB ();
20	use Data::Dumper;	50	use Data::Dumper;
21	use Digest::MD5;	51	use Digest::MD5;
22	use Fcntl;	52	use Fcntl;
		53	use YAML ();
23	use IO::AIO 2.32 ();	54	use IO::AIO 2.51 ();
24	use YAML::Syck ();
25	use Time::HiRes;	55	use Time::HiRes;
		56	use Compress::LZF;
		57	use Digest::MD5 ();
26		58
27	use Event; $Event::Eval = 1; # no idea why this is required, but it is	59	# configure various modules to our taste
		60	#
		61	$Storable::canonical = 1; # reduce rsync transfers
		62	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
		63	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
		64
		65	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
28		66
29	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	67	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30
31	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32	$YAML::Syck::ImplicitUnicode = 1;
33
34	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
35		68
36	our %COMMAND = ();	69	our %COMMAND = ();
37	our %COMMAND_TIME = ();	70	our %COMMAND_TIME = ();
38		71
39	our @EXTS = (); # list of extension package names	72	our @EXTS = (); # list of extension package names
40	our %EXTCMD = ();	73	our %EXTCMD = ();
		74	our %EXTICMD = ();
41	our %EXT_CORO = (); # coroutines bound to extensions	75	our %EXT_CORO = (); # coroutines bound to extensions
42	our %EXT_MAP = (); # pluggable maps	76	our %EXT_MAP = (); # pluggable maps
43		77
		78	our $RELOAD; # number of reloads so far
44	our @EVENT;	79	our @EVENT;
45	our $LIBDIR = datadir . "/ext";
46		80
47	our $TICK = MAX_TIME * 1e-6;	81	our $CONFDIR = confdir;
48	our $TICK_WATCHER;	82	our $DATADIR = datadir;
		83	our $LIBDIR = "$DATADIR/ext";
		84	our $PODDIR = "$DATADIR/pod";
		85	our $MAPDIR = "$DATADIR/" . mapdir;
		86	our $LOCALDIR = localdir;
		87	our $TMPDIR = "$LOCALDIR/" . tmpdir;
		88	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
		89	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
		90	our $RANDOMDIR = "$LOCALDIR/random";
		91	our $BDBDIR = "$LOCALDIR/db";
		92	our %RESOURCE;
		93
		94	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
49	our $AIO_POLL_WATCHER;	95	our $AIO_POLL_WATCHER;
50	our $WRITE_RUNTIME_WATCHER;	96	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51	our $NEXT_TICK;	97	our $NEXT_TICK;
52	our $NOW;	98	our $USE_FSYNC = 1; # use fsync to write maps - default off
		99
		100	our $BDB_POLL_WATCHER;
		101	our $BDB_DEADLOCK_WATCHER;
		102	our $BDB_CHECKPOINT_WATCHER;
		103	our $BDB_TRICKLE_WATCHER;
		104	our $DB_ENV;
53		105
54	our %CFG;	106	our %CFG;
55		107
56	our $UPTIME; $UPTIME ||= time;	108	our $UPTIME; $UPTIME ||= time;
57	our $RUNTIME;	109	our $RUNTIME;
		110	our $NOW;
58		111
59	our %PLAYER; # all users	112	our (%PLAYER, %PLAYER_LOADING); # all users
60	our %MAP; # all maps	113	our (%MAP, %MAP_LOADING ); # all maps
61	our $LINK_MAP; # the special {link} map, which is always available	114	our $LINK_MAP; # the special {link} map, which is always available
62	our $RANDOM_MAPS = cf::localdir . "/random";
63
64	our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65	our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66		115
67	# used to convert map paths into valid unix filenames by replacing / by ∕	116	# used to convert map paths into valid unix filenames by replacing / by ∕
68	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	117	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
69		118
		119	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
		120	our $LOADAVG; # same thing, but with alpha-smoothing
		121	our $JITTER; # average jitter
		122	our $TICK_START; # for load detecting purposes
		123
70	binmode STDOUT;	124	binmode STDOUT;
71	binmode STDERR;	125	binmode STDERR;
72		126
73	# read virtual server time, if available	127	# read virtual server time, if available
74	unless ($RUNTIME || !-e cf::localdir . "/runtime") {	128	unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
75	open my $fh, "<", cf::localdir . "/runtime"	129	open my $fh, "<", "$LOCALDIR/runtime"
76	or die "unable to read runtime file: $!";	130	or die "unable to read runtime file: $!";
77	$RUNTIME = <$fh> + 0.;	131	$RUNTIME = <$fh> + 0.;
78	}	132	}
79		133
80	mkdir cf::localdir;	134	mkdir $_
81	mkdir cf::localdir . "/" . cf::playerdir;	135	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
82	mkdir cf::localdir . "/" . cf::tmpdir;
83	mkdir cf::localdir . "/" . cf::uniquedir;
84	mkdir $RANDOM_MAPS;
85		136
86	our $EMERGENCY_POSITION;	137	our $EMERGENCY_POSITION;
87		138
88	sub cf::map::normalise;	139	sub cf::map::normalise;
89		140
…		…
100	=item $cf::RUNTIME	151	=item $cf::RUNTIME
101		152
102	The time this server has run, starts at 0 and is increased by $cf::TICK on	153	The time this server has run, starts at 0 and is increased by $cf::TICK on
103	every server tick.	154	every server tick.
104		155
105	=item $cf::LIBDIR	156	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
		157	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
		158	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
106		159
107	The perl library directory, where extensions and cf-specific modules can	160	Various directories - "/etc", read-only install directory, perl-library
108	be found. It will be added to C<@INC> automatically.	161	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
		162	unique-items directory, player file directory, random maps directory and
		163	database environment.
109		164
110	=item $cf::NOW	165	=item $cf::NOW
111		166
112	The time of the last (current) server tick.	167	The time of the last (current) server tick.
113		168
114	=item $cf::TICK	169	=item $cf::TICK
115		170
116	The interval between server ticks, in seconds.	171	The interval between server ticks, in seconds.
117		172
		173	=item $cf::LOADAVG
		174
		175	The current CPU load on the server (alpha-smoothed), as a value between 0
		176	(none) and 1 (overloaded), indicating how much time is spent on processing
		177	objects per tick. Healthy values are < 0.5.
		178
		179	=item $cf::LOAD
		180
		181	The raw value load value from the last tick.
		182
118	=item %cf::CFG	183	=item %cf::CFG
119		184
120	Configuration for the server, loaded from C</etc/crossfire/config>, or	185	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
121	from wherever your confdir points to.	186	from wherever your confdir points to.
122		187
123	=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE	188	=item cf::wait_for_tick, cf::wait_for_tick_begin
124		189
125	These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)	190	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
126	or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick	191	returns directly I<after> the tick processing (and consequently, can only wake one process
127	processing has been done. Call C<< ->wait >> on them to maximise the	192	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
128	window of cpu time available, or simply to synchronise to the server tick.	193
		194	=item @cf::INVOKE_RESULTS
		195
		196	This array contains the results of the last C<invoke ()> call. When
		197	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
		198	that call.
129		199
130	=back	200	=back
131		201
132	=cut	202	=cut
133		203
134	BEGIN {	204	BEGIN {
135	*CORE::GLOBAL::warn = sub {	205	*CORE::GLOBAL::warn = sub {
136	my $msg = join "", @_;	206	my $msg = join "", @_;
137	utf8::encode $msg;
138		207
139	$msg .= "\n"	208	$msg .= "\n"
140	unless $msg =~ /\n$/;	209	unless $msg =~ /\n$/;
141		210
		211	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
		212
142	LOG llevError, $msg;	213	LOG llevError, $msg;
143	};	214	};
144	}	215	}
		216
		217	$Coro::State::DIEHOOK = sub {
		218	return unless $^S eq 0; # "eq", not "=="
		219
		220	if ($Coro::current == $Coro::main) {#d#
		221	warn "DIEHOOK called in main context, Coro bug?\n";#d#
		222	return;#d#
		223	}#d#
		224
		225	# kill coroutine otherwise
		226	warn Carp::longmess $_[0];
		227	Coro::terminate
		228	};
		229
		230	$SIG{__DIE__} = sub { }; #d#?
145		231
146	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	232	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
147	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	233	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
148	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	234	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
149	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	235	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
150	@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';	236	@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
		237	@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
151	@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';	238	@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
152		239
153	# we bless all objects into (empty) derived classes to force a method lookup	240	# we bless all objects into (empty) derived classes to force a method lookup
154	# within the Safe compartment.	241	# within the Safe compartment.
155	for my $pkg (qw(	242	for my $pkg (qw(
156	cf::global cf::attachable	243	cf::global cf::attachable
…		…
161	)) {	248	)) {
162	no strict 'refs';	249	no strict 'refs';
163	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	250	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
164	}	251	}
165		252
166	$Event::DIED = sub {	253	$EV::DIED = sub {
167	warn "error in event callback: @_";	254	warn "error in event callback: @_";
168	};	255	};
		256
		257	#############################################################################
169		258
170	=head2 UTILITY FUNCTIONS	259	=head2 UTILITY FUNCTIONS
171		260
172	=over 4	261	=over 4
173		262
…		…
192	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	281	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
193	$d	282	$d
194	} || "[unable to dump $_[0]: '$@']";	283	} || "[unable to dump $_[0]: '$@']";
195	}	284	}
196		285
197	use JSON::Syck (); # TODO# replace by JSON::PC once working
198
199	=item $ref = cf::from_json $json	286	=item $ref = cf::decode_json $json
200		287
201	Converts a JSON string into the corresponding perl data structure.	288	Converts a JSON string into the corresponding perl data structure.
202		289
203	=cut
204
205	sub from_json($) {
206	$JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
207	JSON::Syck::Load $_[0]
208	}
209
210	=item $json = cf::to_json $ref	290	=item $json = cf::encode_json $ref
211		291
212	Converts a perl data structure into its JSON representation.	292	Converts a perl data structure into its JSON representation.
213		293
214	=cut	294	=cut
215		295
216	sub to_json($) {	296	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
217	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs	297
218	JSON::Syck::Dump $_[0]	298	sub encode_json($) { $json_coder->encode ($_[0]) }
219	}	299	sub decode_json($) { $json_coder->decode ($_[0]) }
220		300
221	=item cf::lock_wait $string	301	=item cf::lock_wait $string
222		302
223	Wait until the given lock is available. See cf::lock_acquire.	303	Wait until the given lock is available. See cf::lock_acquire.
224		304
…		…
227	Wait until the given lock is available and then acquires it and returns	307	Wait until the given lock is available and then acquires it and returns
228	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	308	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
229	for example when the coroutine gets canceled), the lock is automatically	309	for example when the coroutine gets canceled), the lock is automatically
230	returned.	310	returned.
231		311
		312	Locks are *not* recursive, locking from the same coro twice results in a
		313	deadlocked coro.
		314
232	Lock names should begin with a unique identifier (for example, cf::map::find	315	Lock names should begin with a unique identifier (for example, cf::map::find
233	uses map_find and cf::map::load uses map_load).	316	uses map_find and cf::map::load uses map_load).
234		317
		318	=item $locked = cf::lock_active $string
		319
		320	Return true if the lock is currently active, i.e. somebody has locked it.
		321
235	=cut	322	=cut
236		323
237	our %LOCK;	324	our %LOCK;
		325	our %LOCKER;#d#
238		326
239	sub lock_wait($) {	327	sub lock_wait($) {
240	my ($key) = @_;	328	my ($key) = @_;
		329
		330	if ($LOCKER{$key} == $Coro::current) {#d#
		331	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		332	return;#d#
		333	}#d#
241		334
242	# wait for lock, if any	335	# wait for lock, if any
243	while ($LOCK{$key}) {	336	while ($LOCK{$key}) {
244	push @{ $LOCK{$key} }, $Coro::current;	337	push @{ $LOCK{$key} }, $Coro::current;
245	Coro::schedule;	338	Coro::schedule;
…		…
251		344
252	# wait, to be sure we are not locked	345	# wait, to be sure we are not locked
253	lock_wait $key;	346	lock_wait $key;
254		347
255	$LOCK{$key} = [];	348	$LOCK{$key} = [];
		349	$LOCKER{$key} = $Coro::current;#d#
256		350
257	Coro::guard {	351	Coro::guard {
		352	delete $LOCKER{$key};#d#
258	# wake up all waiters, to be on the safe side	353	# wake up all waiters, to be on the safe side
259	$_->ready for @{ delete $LOCK{$key} };	354	$_->ready for @{ delete $LOCK{$key} };
260	}	355	}
261	}	356	}
262		357
		358	sub lock_active($) {
		359	my ($key) = @_;
		360
		361	! ! $LOCK{$key}
		362	}
		363
263	sub freeze_mainloop {	364	sub freeze_mainloop {
264	return unless $TICK_WATCHER->is_active;	365	tick_inhibit_inc;
265		366
266	my $guard = Coro::guard {	367	Coro::guard \&tick_inhibit_dec;
267	$TICK_WATCHER->start;	368	}
268	$WRITE_RUNTIME_WATCHER->start;	369
		370	=item cf::periodic $interval, $cb
		371
		372	Like EV::periodic, but randomly selects a starting point so that the actions
		373	get spread over timer.
		374
		375	=cut
		376
		377	sub periodic($$) {
		378	my ($interval, $cb) = @_;
		379
		380	my $start = rand List::Util::min 180, $interval;
		381
		382	EV::periodic $start, $interval, 0, $cb
		383	}
		384
		385	=item cf::get_slot $time[, $priority[, $name]]
		386
		387	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		388	This call blocks and returns only when you have at least C<$time> seconds
		389	of cpu time till the next tick. The slot is only valid till the next cede.
		390
		391	The optional C<$name> can be used to identify the job to run. It might be
		392	used for statistical purposes and should identify the same time-class.
		393
		394	Useful for short background jobs.
		395
		396	=cut
		397
		398	our @SLOT_QUEUE;
		399	our $SLOT_QUEUE;
		400
		401	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		402	$SLOT_QUEUE = Coro::async {
		403	$Coro::current->desc ("timeslot manager");
		404
		405	my $signal = new Coro::Signal;
		406
		407	while () {
		408	next_job:
		409	my $avail = cf::till_tick;
		410	if ($avail > 0.01) {
		411	for (0 .. $#SLOT_QUEUE) {
		412	if ($SLOT_QUEUE[$_][0] < $avail) {
		413	my $job = splice @SLOT_QUEUE, $_, 1, ();
		414	$job->[2]->send;
		415	Coro::cede;
		416	goto next_job;
		417	}
		418	}
		419	}
		420
		421	if (@SLOT_QUEUE) {
		422	# we do not use wait_for_tick() as it returns immediately when tick is inactive
		423	push @cf::WAIT_FOR_TICK, $signal;
		424	$signal->wait;
		425	} else {
		426	Coro::schedule;
		427	}
269	};	428	}
270	$WRITE_RUNTIME_WATCHER->stop;	429	};
271	$TICK_WATCHER->stop;	430
272	$guard	431	sub get_slot($;$$) {
		432	return if tick_inhibit;
		433
		434	my ($time, $pri, $name) = @_;
		435
		436	$time = $TICK * .6 if $time > $TICK * .6;
		437	my $sig = new Coro::Signal;
		438
		439	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		440	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		441	$SLOT_QUEUE->ready;
		442	$sig->wait;
273	}	443	}
274		444
275	=item cf::async { BLOCK }	445	=item cf::async { BLOCK }
276		446
277	Currently the same as Coro::async_pool, meaning you cannot use	447	Currently the same as Coro::async_pool, meaning you cannot use
…		…
282		452
283	BEGIN { *async = \&Coro::async_pool }	453	BEGIN { *async = \&Coro::async_pool }
284		454
285	=item cf::sync_job { BLOCK }	455	=item cf::sync_job { BLOCK }
286		456
287	The design of crossfire+ requires that the main coro ($Coro::main) is	457	The design of Deliantra requires that the main coroutine ($Coro::main)
288	always able to handle events or runnable, as crossfire+ is only partly	458	is always able to handle events or runnable, as Deliantra is only
289	reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.	459	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
		460	acceptable.
290		461
291	If it must be done, put the blocking parts into C<sync_job>. This will run	462	If it must be done, put the blocking parts into C<sync_job>. This will run
292	the given BLOCK in another coroutine while waiting for the result. The	463	the given BLOCK in another coroutine while waiting for the result. The
293	server will be frozen during this time, so the block should either finish	464	server will be frozen during this time, so the block should either finish
294	fast or be very important.	465	fast or be very important.
…		…
297		468
298	sub sync_job(&) {	469	sub sync_job(&) {
299	my ($job) = @_;	470	my ($job) = @_;
300		471
301	if ($Coro::current == $Coro::main) {	472	if ($Coro::current == $Coro::main) {
		473	my $time = EV::time;
		474
302	# this is the main coro, too bad, we have to block	475	# this is the main coro, too bad, we have to block
303	# till the operation succeeds, freezing the server :/	476	# till the operation succeeds, freezing the server :/
304		477
305	# TODO: use suspend/resume instead	478	LOG llevError, Carp::longmess "sync job";#d#
306	# (but this is cancel-safe)	479
307	my $freeze_guard = freeze_mainloop;	480	my $freeze_guard = freeze_mainloop;
308		481
309	my $busy = 1;	482	my $busy = 1;
310	my @res;	483	my @res;
311		484
312	(async {	485	(async {
		486	$Coro::current->desc ("sync job coro");
313	@res = eval { $job->() };	487	@res = eval { $job->() };
314	warn $@ if $@;	488	warn $@ if $@;
315	undef $busy;	489	undef $busy;
316	})->prio (Coro::PRIO_MAX);	490	})->prio (Coro::PRIO_MAX);
317		491
318	while ($busy) {	492	while ($busy) {
319	Coro::cede or Event::one_event;	493	if (Coro::nready) {
		494	Coro::cede_notself;
		495	} else {
		496	EV::loop EV::LOOP_ONESHOT;
320	}	497	}
		498	}
		499
		500	my $time = EV::time - $time;
		501
		502	$TICK_START += $time; # do not account sync jobs to server load
321		503
322	wantarray ? @res : $res[0]	504	wantarray ? @res : $res[0]
323	} else {	505	} else {
324	# we are in another coroutine, how wonderful, everything just works	506	# we are in another coroutine, how wonderful, everything just works
325		507
…		…
345	$EXT_CORO{$coro+0} = $coro;	527	$EXT_CORO{$coro+0} = $coro;
346		528
347	$coro	529	$coro
348	}	530	}
349		531
350	sub write_runtime {	532	=item fork_call { }, $args
351	my $runtime = cf::localdir . "/runtime";
352		533
353	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	534	Executes the given code block with the given arguments in a seperate
354	or return;	535	process, returning the results. Everything must be serialisable with
		536	Coro::Storable. May, of course, block. Note that the executed sub may
		537	never block itself or use any form of event handling.
355		538
356	my $value = $cf::RUNTIME + 90 + 10;	539	=cut
357	# 10 is the runtime save interval, for a monotonic clock
358	# 60 allows for the watchdog to kill the server.
359		540
360	(aio_write $fh, 0, (length $value), $value, 0) <= 0	541	sub fork_call(&@) {
361	and return;	542	my ($cb, @args) = @_;
362		543
363	aio_fsync $fh	544	# we seemingly have to make a local copy of the whole thing,
364	and return;	545	# otherwise perl prematurely frees the stuff :/
		546	# TODO: investigate and fix (likely this will be rather laborious)
365		547
366	close $fh	548	my @res = Coro::Util::fork_eval {
367	or return;	549	reset_signals;
		550	&$cb
		551	}, @args;
368		552
369	aio_rename "$runtime~", $runtime	553	wantarray ? @res : $res[-1]
370	and return;	554	}
371		555
		556	=item $coin = coin_from_name $name
		557
		558	=cut
		559
		560	our %coin_alias = (
		561	"silver" => "silvercoin",
		562	"silvercoin" => "silvercoin",
		563	"silvercoins" => "silvercoin",
		564	"gold" => "goldcoin",
		565	"goldcoin" => "goldcoin",
		566	"goldcoins" => "goldcoin",
		567	"platinum" => "platinacoin",
		568	"platinumcoin" => "platinacoin",
		569	"platinumcoins" => "platinacoin",
		570	"platina" => "platinacoin",
		571	"platinacoin" => "platinacoin",
		572	"platinacoins" => "platinacoin",
		573	"royalty" => "royalty",
		574	"royalties" => "royalty",
		575	);
		576
		577	sub coin_from_name($) {
		578	$coin_alias{$_[0]}
		579	? cf::arch::find $coin_alias{$_[0]}
		580	: undef
		581	}
		582
		583	=item $value = cf::db_get $family => $key
		584
		585	Returns a single value from the environment database.
		586
		587	=item cf::db_put $family => $key => $value
		588
		589	Stores the given C<$value> in the family. It can currently store binary
		590	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
		591
		592	=item $db = cf::db_table "name"
		593
		594	Create and/or open a new database table. The string must not be "db" and must be unique
		595	within each server.
		596
		597	=cut
		598
		599	sub db_table($) {
		600	my ($name) = @_;
		601	my $db = BDB::db_create $DB_ENV;
		602
		603	eval {
		604	$db->set_flags (BDB::CHKSUM);
		605
		606	utf8::encode $name;
		607	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		608	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		609	cf::cleanup "db_open(db): $!" if $!;
		610	};
		611	cf::cleanup "db_open(db): $@" if $@;
		612
		613	$db
		614	}
		615
		616	our $DB;
		617
		618	sub db_init {
		619	cf::sync_job {
		620	$DB ||= db_table "db";
		621	};
		622	}
		623
		624	sub db_get($$) {
		625	my $key = "$_[0]/$_[1]";
		626
		627	cf::sync_job {
		628	BDB::db_get $DB, undef, $key, my $data;
		629
		630	$! ? ()
		631	: $data
372	1	632	}
		633	}
		634
		635	sub db_put($$$) {
		636	BDB::dbreq_pri 4;
		637	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
		638	}
		639
		640	=item cf::cache $id => [$paths...], $processversion => $process
		641
		642	Generic caching function that returns the value of the resource $id,
		643	caching and regenerating as required.
		644
		645	This function can block.
		646
		647	=cut
		648
		649	sub cache {
		650	my ($id, $src, $processversion, $process) = @_;
		651
		652	my $meta =
		653	join "\x00",
		654	$processversion,
		655	map {
		656	aio_stat $_
		657	and Carp::croak "$_: $!";
		658
		659	($_, (stat _)[7,9])
		660	} @$src;
		661
		662	my $dbmeta = db_get cache => "$id/meta";
		663	if ($dbmeta ne $meta) {
		664	# changed, we may need to process
		665
		666	my @data;
		667	my $md5;
		668
		669	for (0 .. $#$src) {
		670	0 <= aio_load $src->[$_], $data[$_]
		671	or Carp::croak "$src->[$_]: $!";
		672	}
		673
		674	# if processing is expensive, check
		675	# checksum first
		676	if (1) {
		677	$md5 =
		678	join "\x00",
		679	$processversion,
		680	map {
		681	cf::cede_to_tick;
		682	($src->[$_], Digest::MD5::md5_hex $data[$_])
		683	} 0.. $#$src;
		684
		685
		686	my $dbmd5 = db_get cache => "$id/md5";
		687	if ($dbmd5 eq $md5) {
		688	db_put cache => "$id/meta", $meta;
		689
		690	return db_get cache => "$id/data";
		691	}
		692	}
		693
		694	my $t1 = Time::HiRes::time;
		695	my $data = $process->(\@data);
		696	my $t2 = Time::HiRes::time;
		697
		698	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
		699
		700	db_put cache => "$id/data", $data;
		701	db_put cache => "$id/md5" , $md5;
		702	db_put cache => "$id/meta", $meta;
		703
		704	return $data;
		705	}
		706
		707	db_get cache => "$id/data"
		708	}
		709
		710	=item cf::datalog type => key => value, ...
		711
		712	Log a datalog packet of the given type with the given key-value pairs.
		713
		714	=cut
		715
		716	sub datalog($@) {
		717	my ($type, %kv) = @_;
		718	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
373	}	719	}
374		720
375	=back	721	=back
376		722
377	=cut	723	=cut
…		…
384	attach callbacks/event handlers (a collection of which is called an "attachment")	730	attach callbacks/event handlers (a collection of which is called an "attachment")
385	to it. All such attachable objects support the following methods.	731	to it. All such attachable objects support the following methods.
386		732
387	In the following description, CLASS can be any of C<global>, C<object>	733	In the following description, CLASS can be any of C<global>, C<object>
388	C<player>, C<client> or C<map> (i.e. the attachable objects in	734	C<player>, C<client> or C<map> (i.e. the attachable objects in
389	crossfire+).	735	Deliantra).
390		736
391	=over 4	737	=over 4
392		738
393	=item $attachable->attach ($attachment, key => $value...)	739	=item $attachable->attach ($attachment, key => $value...)
394		740
…		…
557	$registry = $CB_TYPE[$object_type] ||= [];	903	$registry = $CB_TYPE[$object_type] ||= [];
558		904
559	} elsif ($type eq "subtype") {	905	} elsif ($type eq "subtype") {
560	defined $object_type or Carp::croak "subtype specified without type";	906	defined $object_type or Carp::croak "subtype specified without type";
561	my $object_subtype = shift @arg;	907	my $object_subtype = shift @arg;
562	$registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= [];	908	$registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
563		909
564	} elsif ($type eq "package") {	910	} elsif ($type eq "package") {
565	my $pkg = shift @arg;	911	my $pkg = shift @arg;
566		912
567	while (my ($name, $id) = each %cb_id) {	913	while (my ($name, $id) = each %cb_id) {
…		…
596	_attach $registry, $klass, @attach;	942	_attach $registry, $klass, @attach;
597	}	943	}
598		944
599	$obj->{$name} = \%arg;	945	$obj->{$name} = \%arg;
600	} else {	946	} else {
601	warn "object uses attachment '$name' that is not available, postponing.\n";	947	warn "object uses attachment '$name' which is not available, postponing.\n";
602	}	948	}
603		949
604	$obj->{_attachment}{$name} = undef;	950	$obj->{_attachment}{$name} = undef;
605	}	951	}
606		952
…		…
608	if (ref $_[0]) {	954	if (ref $_[0]) {
609	_object_attach @_;	955	_object_attach @_;
610	} else {	956	} else {
611	_attach shift->_attach_registry, @_;	957	_attach shift->_attach_registry, @_;
612	}	958	}
		959	_recalc_want;
613	};	960	};
614		961
615	# all those should be optimised	962	# all those should be optimised
616	sub cf::attachable::detach {	963	sub cf::attachable::detach {
617	my ($obj, $name) = @_;	964	my ($obj, $name) = @_;
…		…
620	delete $obj->{_attachment}{$name};	967	delete $obj->{_attachment}{$name};
621	reattach ($obj);	968	reattach ($obj);
622	} else {	969	} else {
623	Carp::croak "cannot, currently, detach class attachments";	970	Carp::croak "cannot, currently, detach class attachments";
624	}	971	}
		972	_recalc_want;
625	};	973	};
626		974
627	sub cf::attachable::attached {	975	sub cf::attachable::attached {
628	my ($obj, $name) = @_;	976	my ($obj, $name) = @_;
629		977
…		…
644	";	992	";
645	die if $@;	993	die if $@;
646	}	994	}
647		995
648	our $override;	996	our $override;
649	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	997	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
650		998
651	sub override {	999	sub override {
652	$override = 1;	1000	$override = 1;
653	@invoke_results = ();	1001	@INVOKE_RESULTS = (@_);
654	}	1002	}
655		1003
656	sub do_invoke {	1004	sub do_invoke {
657	my $event = shift;	1005	my $event = shift;
658	my $callbacks = shift;	1006	my $callbacks = shift;
659		1007
660	@invoke_results = ();	1008	@INVOKE_RESULTS = ();
661		1009
662	local $override;	1010	local $override;
663		1011
664	for (@$callbacks) {	1012	for (@$callbacks) {
665	eval { &{$_->[1]} };	1013	eval { &{$_->[1]} };
…		…
674	}	1022	}
675		1023
676	0	1024	0
677	}	1025	}
678		1026
679	=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...)	1027	=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
680		1028
681	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)	1029	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
682		1030
683	Generate an object-specific event with the given arguments.	1031	Generate an object-specific event with the given arguments.
684		1032
685	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	1033	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
686	removed in future versions), and there is no public API to access override	1034	removed in future versions), and there is no public API to access override
687	results (if you must, access C<@cf::invoke_results> directly).	1035	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
688		1036
689	=back	1037	=back
690		1038
691	=cut	1039	=cut
692		1040
693	#############################################################################	1041	#############################################################################
694	# object support	1042	# object support
		1043
		1044	sub _object_equal($$);
		1045	sub _object_equal($$) {
		1046	my ($a, $b) = @_;
		1047
		1048	return 0 unless (ref $a) eq (ref $b);
		1049
		1050	if ("HASH" eq ref $a) {
		1051	my @ka = keys %$a;
		1052	my @kb = keys %$b;
		1053
		1054	return 0 if @ka != @kb;
		1055
		1056	for (0 .. $#ka) {
		1057	return 0 unless $ka[$_] eq $kb[$_];
		1058	return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
		1059	}
		1060
		1061	} elsif ("ARRAY" eq ref $a) {
		1062
		1063	return 0 if @$a != @$b;
		1064
		1065	for (0 .. $#$a) {
		1066	return 0 unless _object_equal $a->[$_], $b->[$_];
		1067	}
		1068
		1069	} elsif ($a ne $b) {
		1070	return 0;
		1071	}
		1072
		1073	1
		1074	}
		1075
		1076	our $SLOW_MERGES;#d#
		1077	sub _can_merge {
		1078	my ($ob1, $ob2) = @_;
		1079
		1080	++$SLOW_MERGES;#d#
		1081
		1082	# we do the slow way here
		1083	return _object_equal $ob1, $ob2
		1084	}
695		1085
696	sub reattach {	1086	sub reattach {
697	# basically do the same as instantiate, without calling instantiate	1087	# basically do the same as instantiate, without calling instantiate
698	my ($obj) = @_;	1088	my ($obj) = @_;
699		1089
…		…
720	cf::attachable->attach (	1110	cf::attachable->attach (
721	prio => -1000000,	1111	prio => -1000000,
722	on_instantiate => sub {	1112	on_instantiate => sub {
723	my ($obj, $data) = @_;	1113	my ($obj, $data) = @_;
724		1114
725	$data = from_json $data;	1115	$data = decode_json $data;
726		1116
727	for (@$data) {	1117	for (@$data) {
728	my ($name, $args) = @$_;	1118	my ($name, $args) = @$_;
729		1119
730	$obj->attach ($name, %{$args || {} });	1120	$obj->attach ($name, %{$args || {} });
…		…
746	sub object_freezer_save {	1136	sub object_freezer_save {
747	my ($filename, $rdata, $objs) = @_;	1137	my ($filename, $rdata, $objs) = @_;
748		1138
749	sync_job {	1139	sync_job {
750	if (length $$rdata) {	1140	if (length $$rdata) {
		1141	utf8::decode (my $decname = $filename);
751	warn sprintf "saving %s (%d,%d)\n",	1142	warn sprintf "saving %s (%d,%d)\n",
752	$filename, length $$rdata, scalar @$objs;	1143	$decname, length $$rdata, scalar @$objs;
753		1144
754	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1145	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
755	chmod SAVE_MODE, $fh;	1146	chmod SAVE_MODE, $fh;
756	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1147	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
757	aio_fsync $fh;	1148	aio_fsync $fh if $cf::USE_FSYNC;
758	close $fh;	1149	close $fh;
759		1150
760	if (@$objs) {	1151	if (@$objs) {
761	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1152	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
762	chmod SAVE_MODE, $fh;	1153	chmod SAVE_MODE, $fh;
763	my $data = Storable::nfreeze { version => 1, objs => $objs };	1154	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
764	aio_write $fh, 0, (length $data), $data, 0;	1155	aio_write $fh, 0, (length $data), $data, 0;
765	aio_fsync $fh;	1156	aio_fsync $fh if $cf::USE_FSYNC;
766	close $fh;	1157	close $fh;
767	aio_rename "$filename.pst~", "$filename.pst";	1158	aio_rename "$filename.pst~", "$filename.pst";
768	}	1159	}
769	} else {	1160	} else {
770	aio_unlink "$filename.pst";	1161	aio_unlink "$filename.pst";
…		…
776	}	1167	}
777	} else {	1168	} else {
778	aio_unlink $filename;	1169	aio_unlink $filename;
779	aio_unlink "$filename.pst";	1170	aio_unlink "$filename.pst";
780	}	1171	}
781	}	1172	};
782	}	1173	}
783		1174
784	sub object_freezer_as_string {	1175	sub object_freezer_as_string {
785	my ($rdata, $objs) = @_;	1176	my ($rdata, $objs) = @_;
786		1177
…		…
798	or return;	1189	or return;
799		1190
800	unless (aio_stat "$filename.pst") {	1191	unless (aio_stat "$filename.pst") {
801	(aio_load "$filename.pst", $av) >= 0	1192	(aio_load "$filename.pst", $av) >= 0
802	or return;	1193	or return;
		1194
803	$av = eval { (Storable::thaw $av)->{objs} };	1195	my $st = eval { Coro::Storable::thaw $av };
		1196	$av = $st->{objs};
804	}	1197	}
805		1198
		1199	utf8::decode (my $decname = $filename);
806	warn sprintf "loading %s (%d)\n",	1200	warn sprintf "loading %s (%d,%d)\n",
807	$filename, length $data, scalar @{$av || []};#d#	1201	$decname, length $data, scalar @{$av || []};
		1202
808	return ($data, $av);	1203	($data, $av)
809	}	1204	}
		1205
		1206	=head2 COMMAND CALLBACKS
		1207
		1208	=over 4
		1209
		1210	=cut
810		1211
811	#############################################################################	1212	#############################################################################
812	# command handling &c	1213	# command handling &c
813		1214
814	=item cf::register_command $name => \&callback($ob,$args);	1215	=item cf::register_command $name => \&callback($ob,$args);
…		…
827	push @{ $COMMAND{$name} }, [$caller, $cb];	1228	push @{ $COMMAND{$name} }, [$caller, $cb];
828	}	1229	}
829		1230
830	=item cf::register_extcmd $name => \&callback($pl,$packet);	1231	=item cf::register_extcmd $name => \&callback($pl,$packet);
831		1232
832	Register a callbackf ro execution when the client sends an extcmd packet.	1233	Register a callback for execution when the client sends an (synchronous)
		1234	extcmd packet. Ext commands will be processed in the order they are
		1235	received by the server, like other user commands. The first argument is
		1236	the logged-in player. Ext commands can only be processed after a player
		1237	has logged in successfully.
833		1238
834	If the callback returns something, it is sent back as if reply was being	1239	If the callback returns something, it is sent back as if reply was being
835	called.	1240	called.
836		1241
		1242	=item cf::register_exticmd $name => \&callback($ns,$packet);
		1243
		1244	Register a callback for execution when the client sends an (asynchronous)
		1245	exticmd packet. Exti commands are processed by the server as soon as they
		1246	are received, i.e. out of order w.r.t. other commands. The first argument
		1247	is a client socket. Exti commands can be received anytime, even before
		1248	log-in.
		1249
		1250	If the callback returns something, it is sent back as if reply was being
		1251	called.
		1252
837	=cut	1253	=cut
838		1254
839	sub register_extcmd {	1255	sub register_extcmd {
840	my ($name, $cb) = @_;	1256	my ($name, $cb) = @_;
841		1257
842	$EXTCMD{$name} = $cb;	1258	$EXTCMD{$name} = $cb;
		1259	}
		1260
		1261	sub register_exticmd {
		1262	my ($name, $cb) = @_;
		1263
		1264	$EXTICMD{$name} = $cb;
843	}	1265	}
844		1266
845	cf::player->attach (	1267	cf::player->attach (
846	on_command => sub {	1268	on_command => sub {
847	my ($pl, $name, $params) = @_;	1269	my ($pl, $name, $params) = @_;
…		…
856	cf::override;	1278	cf::override;
857	},	1279	},
858	on_extcmd => sub {	1280	on_extcmd => sub {
859	my ($pl, $buf) = @_;	1281	my ($pl, $buf) = @_;
860		1282
861	my $msg = eval { from_json $buf };	1283	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
862		1284
863	if (ref $msg) {	1285	if (ref $msg) {
		1286	my ($type, $reply, @payload) =
		1287	"ARRAY" eq ref $msg
		1288	? @$msg
		1289	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1290
		1291	my @reply;
		1292
864	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1293	if (my $cb = $EXTCMD{$type}) {
865	if (my %reply = $cb->($pl, $msg)) {	1294	@reply = $cb->($pl, @payload);
866	$pl->ext_reply ($msg->{msgid}, %reply);
867	}
868	}	1295	}
		1296
		1297	$pl->ext_reply ($reply, @reply)
		1298	if $reply;
		1299
869	} else {	1300	} else {
870	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1301	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
871	}	1302	}
872		1303
873	cf::override;	1304	cf::override;
874	},	1305	},
875	);	1306	);
876		1307
877	sub load_extension {
878	my ($path) = @_;
879
880	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
881	my $base = $1;
882	my $pkg = $1;
883	$pkg =~ s/[^[:word:]]/_/g;
884	$pkg = "ext::$pkg";
885
886	warn "... loading '$path' into '$pkg'\n";
887
888	open my $fh, "<:utf8", $path
889	or die "$path: $!";
890
891	my $source =
892	"package $pkg; use strict; use utf8;\n"
893	. "#line 1 \"$path\"\n{\n"
894	. (do { local $/; <$fh> })
895	. "\n};\n1";
896
897	unless (eval $source) {
898	my $msg = $@ ? "$path: $@\n"
899	: "extension disabled.\n";
900	if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
901	warn $@;
902	warn "mandatory extension failed to load, exiting.\n";
903	exit 1;
904	}
905	die $@;
906	}
907
908	push @EXTS, $pkg;
909	}
910
911	sub load_extensions {	1308	sub load_extensions {
		1309	cf::sync_job {
		1310	my %todo;
		1311
912	for my $ext (<$LIBDIR/*.ext>) {	1312	for my $path (<$LIBDIR/*.ext>) {
913	next unless -r $ext;	1313	next unless -r $path;
914	eval {	1314
915	load_extension $ext;	1315	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
		1316	my $base = $1;
		1317	my $pkg = $1;
		1318	$pkg =~ s/[^[:word:]]/_/g;
		1319	$pkg = "ext::$pkg";
		1320
		1321	open my $fh, "<:utf8", $path
		1322	or die "$path: $!";
		1323
		1324	my $source = do { local $/; <$fh> };
		1325
		1326	my %ext = (
		1327	path => $path,
		1328	base => $base,
		1329	pkg => $pkg,
		1330	);
		1331
		1332	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
		1333	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
		1334
		1335	$ext{source} =
		1336	"package $pkg; use strict; use utf8;\n"
		1337	. "#line 1 \"$path\"\n{\n"
		1338	. $source
		1339	. "\n};\n1";
		1340
		1341	$todo{$base} = \%ext;
		1342	}
		1343
		1344	my %done;
		1345	while (%todo) {
		1346	my $progress;
		1347
		1348	while (my ($k, $v) = each %todo) {
		1349	for (split /,\s*/, $v->{meta}{depends}) {
		1350	goto skip
		1351	unless exists $done{$_};
		1352	}
		1353
		1354	warn "... loading '$k' into '$v->{pkg}'\n";
		1355
		1356	unless (eval $v->{source}) {
		1357	my $msg = $@ ? "$v->{path}: $@\n"
		1358	: "$v->{base}: extension inactive.\n";
		1359
		1360	if (exists $v->{meta}{mandatory}) {
		1361	warn $msg;
		1362	cf::cleanup "mandatory extension failed to load, exiting.";
		1363	}
		1364
		1365	warn $msg;
		1366	}
		1367
		1368	$done{$k} = delete $todo{$k};
		1369	push @EXTS, $v->{pkg};
		1370	$progress = 1;
916	1	1371	}
917	} or warn "$ext not loaded: $@";	1372
		1373	skip:
		1374	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
		1375	unless $progress;
		1376	}
918	}	1377	};
919	}	1378	}
920		1379
921	#############################################################################	1380	#############################################################################
922		1381
		1382	=back
		1383
923	=head2 CORE EXTENSIONS	1384	=head2 CORE EXTENSIONS
924		1385
925	Functions and methods that extend core crossfire objects.	1386	Functions and methods that extend core crossfire objects.
926		1387
927	=cut	1388	=cut
…		…
932		1393
933	=head3 cf::player	1394	=head3 cf::player
934		1395
935	=over 4	1396	=over 4
936		1397
		1398	=item cf::player::num_playing
		1399
		1400	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1401
		1402	=cut
		1403
		1404	sub num_playing {
		1405	scalar grep
		1406	$_->ob->map
		1407	&& !$_->hidden
		1408	&& !$_->ob->flag (cf::FLAG_WIZ),
		1409	cf::player::list
		1410	}
		1411
937	=item cf::player::find $login	1412	=item cf::player::find $login
938		1413
939	Returns the given player object, loading it if necessary (might block).	1414	Returns the given player object, loading it if necessary (might block).
940		1415
941	=cut	1416	=cut
942		1417
943	sub playerdir($) {	1418	sub playerdir($) {
944	cf::localdir	1419	"$PLAYERDIR/"
945	. "/"
946	. cf::playerdir
947	. "/"
948	. (ref $_[0] ? $_[0]->ob->name : $_[0])	1420	. (ref $_[0] ? $_[0]->ob->name : $_[0])
949	}	1421	}
950		1422
951	sub path($) {	1423	sub path($) {
952	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];	1424	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
953		1425
954	(playerdir $login) . "/$login.pl"	1426	(playerdir $login) . "/playerdata"
955	}	1427	}
956		1428
957	sub find_active($) {	1429	sub find_active($) {
958	$cf::PLAYER{$_[0]}	1430	$cf::PLAYER{$_[0]}
959	and $cf::PLAYER{$_[0]}->active	1431	and $cf::PLAYER{$_[0]}->active
…		…
972	my $login = $_[0];	1444	my $login = $_[0];
973		1445
974	my $guard = cf::lock_acquire "user_find:$login";	1446	my $guard = cf::lock_acquire "user_find:$login";
975		1447
976	$cf::PLAYER{$_[0]} || do {	1448	$cf::PLAYER{$_[0]} || do {
977	my $pl = load_pl path $login	1449	# rename old playerfiles to new ones
		1450	#TODO: remove when no longer required
		1451	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
		1452	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
		1453	aio_unlink +(playerdir $login) . "/$login.pl.pst";
		1454	aio_unlink +(playerdir $login) . "/$login.pl";
		1455
		1456	my $f = new_from_file cf::object::thawer path $login
978	or return;	1457	or return;
		1458
		1459	my $pl = cf::player::load_pl $f
		1460	or return;
		1461	local $cf::PLAYER_LOADING{$login} = $pl;
		1462	$f->resolve_delayed_derefs;
979	$cf::PLAYER{$login} = $pl	1463	$cf::PLAYER{$login} = $pl
980	}	1464	}
981	}	1465	}
982	}	1466	}
983		1467
…		…
992	return if $pl->{deny_save};	1476	return if $pl->{deny_save};
993		1477
994	aio_mkdir playerdir $pl, 0770;	1478	aio_mkdir playerdir $pl, 0770;
995	$pl->{last_save} = $cf::RUNTIME;	1479	$pl->{last_save} = $cf::RUNTIME;
996		1480
		1481	cf::get_slot 0.01;
		1482
997	$pl->save_pl ($path);	1483	$pl->save_pl ($path);
998	Coro::cede;	1484	cf::cede_to_tick;
999	}	1485	}
1000		1486
1001	sub new($) {	1487	sub new($) {
1002	my ($login) = @_;	1488	my ($login) = @_;
1003		1489
…		…
1009	$cf::PLAYER{$login} = $self;	1495	$cf::PLAYER{$login} = $self;
1010		1496
1011	$self	1497	$self
1012	}	1498	}
1013		1499
		1500	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1501
		1502	=cut
		1503
		1504	sub send_msg {
		1505	my $ns = shift->ns
		1506	or return;
		1507	$ns->send_msg (@_);
		1508	}
		1509
1014	=item $pl->quit_character	1510	=item $pl->quit_character
1015		1511
1016	Nukes the player without looking back. If logged in, the connection will	1512	Nukes the player without looking back. If logged in, the connection will
1017	be destroyed. May block for a long time.	1513	be destroyed. May block for a long time.
1018		1514
1019	=cut	1515	=cut
1020		1516
1021	sub quit_character {	1517	sub quit_character {
1022	my ($pl) = @_;	1518	my ($pl) = @_;
		1519
		1520	my $name = $pl->ob->name;
1023		1521
1024	$pl->{deny_save} = 1;	1522	$pl->{deny_save} = 1;
1025	$pl->password ("*"); # this should lock out the player until we nuked the dir	1523	$pl->password ("*"); # this should lock out the player until we nuked the dir
1026		1524
1027	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1525	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
…		…
1032	my $path = playerdir $pl;	1530	my $path = playerdir $pl;
1033	my $temp = "$path~$cf::RUNTIME~deleting~";	1531	my $temp = "$path~$cf::RUNTIME~deleting~";
1034	aio_rename $path, $temp;	1532	aio_rename $path, $temp;
1035	delete $cf::PLAYER{$pl->ob->name};	1533	delete $cf::PLAYER{$pl->ob->name};
1036	$pl->destroy;	1534	$pl->destroy;
		1535
		1536	my $prefix = qr<^~\Q$name\E/>;
		1537
		1538	# nuke player maps
		1539	$cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
		1540
1037	IO::AIO::aio_rmtree $temp;	1541	IO::AIO::aio_rmtree $temp;
		1542	}
		1543
		1544	=item $pl->kick
		1545
		1546	Kicks a player out of the game. This destroys the connection.
		1547
		1548	=cut
		1549
		1550	sub kick {
		1551	my ($pl, $kicker) = @_;
		1552
		1553	$pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
		1554	$pl->killer ("kicked");
		1555	$pl->ns->destroy;
1038	}	1556	}
1039		1557
1040	=item cf::player::list_logins	1558	=item cf::player::list_logins
1041		1559
1042	Returns am arrayref of all valid playernames in the system, can take a	1560	Returns am arrayref of all valid playernames in the system, can take a
1043	while and may block, so not sync_job-capable, ever.	1561	while and may block, so not sync_job-capable, ever.
1044		1562
1045	=cut	1563	=cut
1046		1564
1047	sub list_logins {	1565	sub list_logins {
1048	my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir	1566	my $dirs = aio_readdir $PLAYERDIR
1049	or return [];	1567	or return [];
1050		1568
1051	my @logins;	1569	my @logins;
1052		1570
1053	for my $login (@$dirs) {	1571	for my $login (@$dirs) {
		1572	my $path = path $login;
		1573
		1574	# a .pst is a dead give-away for a valid player
		1575	unless (-e "$path.pst") {
1054	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1576	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1055	aio_read $fh, 0, 512, my $buf, 0 or next;	1577	aio_read $fh, 0, 512, my $buf, 0 or next;
1056	$buf !~ /^password -------------$/m or next; # official not-valid tag	1578	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1579	}
1057		1580
1058	utf8::decode $login;	1581	utf8::decode $login;
1059	push @logins, $login;	1582	push @logins, $login;
1060	}	1583	}
1061		1584
…		…
1069		1592
1070	=cut	1593	=cut
1071		1594
1072	sub maps($) {	1595	sub maps($) {
1073	my ($pl) = @_;	1596	my ($pl) = @_;
		1597
		1598	$pl = ref $pl ? $pl->ob->name : $pl;
1074		1599
1075	my $files = aio_readdir playerdir $pl	1600	my $files = aio_readdir playerdir $pl
1076	or return;	1601	or return;
1077		1602
1078	my @paths;	1603	my @paths;
…		…
1080	for (@$files) {	1605	for (@$files) {
1081	utf8::decode $_;	1606	utf8::decode $_;
1082	next if /\.(?:pl|pst)$/;	1607	next if /\.(?:pl|pst)$/;
1083	next unless /^$PATH_SEP/o;	1608	next unless /^$PATH_SEP/o;
1084		1609
1085	push @paths, cf::map::normalise "~" . $pl->ob->name . "/" . $_;	1610	push @paths, cf::map::normalise "~$pl/$_";
1086	}	1611	}
1087		1612
1088	\@paths	1613	\@paths
1089	}	1614	}
1090		1615
		1616	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
		1617
		1618	Expand crossfire pod fragments into protocol xml.
		1619
		1620	=cut
		1621
		1622	use re 'eval';
		1623
		1624	my $group;
		1625	my $interior; $interior = qr{
		1626	# match a pod interior sequence sans C<< >>
		1627	(?:
		1628	\ (.*?)\ (?{ $group = $^N })
		1629	| < (??{$interior}) >
		1630	)
		1631	}x;
		1632
		1633	sub expand_cfpod {
		1634	my ($self, $pod) = @_;
		1635
		1636	my $xml;
		1637
		1638	while () {
		1639	if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
		1640	$group = $1;
		1641
		1642	$group =~ s/&/&amp;/g;
		1643	$group =~ s/</&lt;/g;
		1644
		1645	$xml .= $group;
		1646	} elsif ($pod =~ m%\G
		1647	([BCGHITU])
		1648	<
		1649	(?:
		1650	([^<>]*) (?{ $group = $^N })
		1651	| < $interior >
		1652	)
		1653	>
		1654	%gcsx
		1655	) {
		1656	my ($code, $data) = ($1, $group);
		1657
		1658	if ($code eq "B") {
		1659	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
		1660	} elsif ($code eq "I") {
		1661	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
		1662	} elsif ($code eq "U") {
		1663	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
		1664	} elsif ($code eq "C") {
		1665	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
		1666	} elsif ($code eq "T") {
		1667	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
		1668	} elsif ($code eq "G") {
		1669	my ($male, $female) = split /\|/, $data;
		1670	$data = $self->gender ? $female : $male;
		1671	$xml .= expand_cfpod ($self, $data);
		1672	} elsif ($code eq "H") {
		1673	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
		1674	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1675	"")
		1676	[$self->{hintmode}];
		1677	} else {
		1678	$xml .= "error processing '$code($data)' directive";
		1679	}
		1680	} else {
		1681	if ($pod =~ /\G(.+)/) {
		1682	warn "parse error while expanding $pod (at $1)";
		1683	}
		1684	last;
		1685	}
		1686	}
		1687
		1688	for ($xml) {
		1689	# create single paragraphs (very hackish)
		1690	s/(?<=\S)\n(?=\w)/ /g;
		1691
		1692	# compress some whitespace
		1693	s/\s+\n/\n/g; # ws line-ends
		1694	s/\n\n+/\n/g; # double lines
		1695	s/^\n+//; # beginning lines
		1696	s/\n+$//; # ending lines
		1697	}
		1698
		1699	$xml
		1700	}
		1701
		1702	no re 'eval';
		1703
		1704	sub hintmode {
		1705	$_[0]{hintmode} = $_[1] if @_ > 1;
		1706	$_[0]{hintmode}
		1707	}
		1708
1091	=item $player->ext_reply ($msgid, $msgtype, %msg)	1709	=item $player->ext_reply ($msgid, @msg)
1092		1710
1093	Sends an ext reply to the player.	1711	Sends an ext reply to the player.
1094		1712
1095	=cut	1713	=cut
1096		1714
1097	sub ext_reply($$$%) {	1715	sub ext_reply($$@) {
1098	my ($self, $id, %msg) = @_;	1716	my ($self, $id, @msg) = @_;
1099		1717
1100	$msg{msgid} = $id;	1718	$self->ns->ext_reply ($id, @msg)
1101
1102	$self->send ("ext " . cf::to_json \%msg);
1103	}	1719	}
1104		1720
1105	package cf;	1721	=item $player->ext_msg ($type, @msg)
		1722
		1723	Sends an ext event to the client.
		1724
		1725	=cut
		1726
		1727	sub ext_msg($$@) {
		1728	my ($self, $type, @msg) = @_;
		1729
		1730	$self->ns->ext_msg ($type, @msg);
		1731	}
		1732
		1733	=head3 cf::region
		1734
		1735	=over 4
		1736
		1737	=cut
		1738
		1739	package cf::region;
		1740
		1741	=item cf::region::find_by_path $path
		1742
		1743	Tries to decuce the likely region for a map knowing only its path.
		1744
		1745	=cut
		1746
		1747	sub find_by_path($) {
		1748	my ($path) = @_;
		1749
		1750	my ($match, $specificity);
		1751
		1752	for my $region (list) {
		1753	if ($region->{match} && $path =~ $region->{match}) {
		1754	($match, $specificity) = ($region, $region->specificity)
		1755	if $region->specificity > $specificity;
		1756	}
		1757	}
		1758
		1759	$match
		1760	}
1106		1761
1107	=back	1762	=back
1108
1109		1763
1110	=head3 cf::map	1764	=head3 cf::map
1111		1765
1112	=over 4	1766	=over 4
1113		1767
…		…
1125	our $MAX_RESET = 3600;	1779	our $MAX_RESET = 3600;
1126	our $DEFAULT_RESET = 3000;	1780	our $DEFAULT_RESET = 3000;
1127		1781
1128	sub generate_random_map {	1782	sub generate_random_map {
1129	my ($self, $rmp) = @_;	1783	my ($self, $rmp) = @_;
		1784
		1785	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
		1786
1130	# mit "rum" bekleckern, nicht	1787	# mit "rum" bekleckern, nicht
1131	$self->_create_random_map (	1788	$self->_create_random_map (
1132	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1789	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1133	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1790	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1134	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1791	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
…		…
1168	my ($self, $merge) = @_;	1825	my ($self, $merge) = @_;
1169		1826
1170	# we have to keep some variables in memory intact	1827	# we have to keep some variables in memory intact
1171	local $self->{path};	1828	local $self->{path};
1172	local $self->{load_path};	1829	local $self->{load_path};
1173	local $self->{deny_save};
1174	local $self->{deny_reset};
1175		1830
1176	$self->SUPER::thawer_merge ($merge);	1831	$self->SUPER::thawer_merge ($merge);
1177	}	1832	}
1178		1833
1179	sub normalise {	1834	sub normalise {
…		…
1226	$self->init; # pass $1 etc.	1881	$self->init; # pass $1 etc.
1227	return $self;	1882	return $self;
1228	}	1883	}
1229	}	1884	}
1230		1885
1231	Carp::carp "unable to resolve path '$path' (base '$base').";	1886	Carp::cluck "unable to resolve path '$path' (base '$base').";
1232	()	1887	()
1233	}	1888	}
1234		1889
1235	sub init {	1890	sub init {
1236	my ($self) = @_;	1891	my ($self) = @_;
…		…
1251		1906
1252	# the original (read-only) location	1907	# the original (read-only) location
1253	sub load_path {	1908	sub load_path {
1254	my ($self) = @_;	1909	my ($self) = @_;
1255		1910
1256	sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}	1911	"$MAPDIR/$self->{path}.map"
1257	}	1912	}
1258		1913
1259	# the temporary/swap location	1914	# the temporary/swap location
1260	sub save_path {	1915	sub save_path {
1261	my ($self) = @_;	1916	my ($self) = @_;
1262		1917
1263	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1918	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1264	sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path	1919	"$TMPDIR/$path.map"
1265	}	1920	}
1266		1921
1267	# the unique path, undef == no special unique path	1922	# the unique path, undef == no special unique path
1268	sub uniq_path {	1923	sub uniq_path {
1269	my ($self) = @_;	1924	my ($self) = @_;
1270		1925
1271	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1926	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1272	sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path	1927	"$UNIQUEDIR/$path"
1273	}	1928	}
1274		1929
1275	# and all this just because we cannot iterate over	1930	# and all this just because we cannot iterate over
1276	# all maps in C++...	1931	# all maps in C++...
1277	sub change_all_map_light {	1932	sub change_all_map_light {
…		…
1279		1934
1280	$_->change_map_light ($change)	1935	$_->change_map_light ($change)
1281	for grep $_->outdoor, values %cf::MAP;	1936	for grep $_->outdoor, values %cf::MAP;
1282	}	1937	}
1283		1938
		1939	sub decay_objects {
		1940	my ($self) = @_;
		1941
		1942	return if $self->{deny_reset};
		1943
		1944	$self->do_decay_objects;
		1945	}
		1946
1284	sub unlink_save {	1947	sub unlink_save {
1285	my ($self) = @_;	1948	my ($self) = @_;
1286		1949
1287	utf8::encode (my $save = $self->save_path);	1950	utf8::encode (my $save = $self->save_path);
1288	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;	1951	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
…		…
1291		1954
1292	sub load_header_from($) {	1955	sub load_header_from($) {
1293	my ($self, $path) = @_;	1956	my ($self, $path) = @_;
1294		1957
1295	utf8::encode $path;	1958	utf8::encode $path;
1296	aio_open $path, O_RDONLY, 0	1959	my $f = new_from_file cf::object::thawer $path
1297	or return;	1960	or return;
1298		1961
1299	$self->_load_header ($path)	1962	$self->_load_header ($f)
1300	or return;	1963	or return;
		1964
		1965	local $MAP_LOADING{$self->{path}} = $self;
		1966	$f->resolve_delayed_derefs;
1301		1967
1302	$self->{load_path} = $path;	1968	$self->{load_path} = $path;
1303		1969
1304	1	1970	1
1305	}	1971	}
…		…
1344	$self->load_header_orig	2010	$self->load_header_orig
1345	or return;	2011	or return;
1346	$self->prepare_orig;	2012	$self->prepare_orig;
1347	}	2013	}
1348		2014
		2015	$self->{deny_reset} = 1
		2016	if $self->no_reset;
		2017
		2018	$self->default_region (cf::region::find_by_path $self->{path})
		2019	unless $self->default_region;
		2020
1349	1	2021	1
1350	}	2022	}
1351		2023
1352	sub find;	2024	sub find;
1353	sub find {	2025	sub find {
1354	my ($path, $origin) = @_;	2026	my ($path, $origin) = @_;
1355		2027
1356	$path = normalise $path, $origin && $origin->path;	2028	$path = normalise $path, $origin && $origin->path;
1357		2029
		2030	cf::lock_wait "map_data:$path";#d#remove
1358	cf::lock_wait "map_find:$path";	2031	cf::lock_wait "map_find:$path";
1359		2032
1360	$cf::MAP{$path} || do {	2033	$cf::MAP{$path} || do {
1361	my $guard = cf::lock_acquire "map_find:$path";	2034	my $guard1 = cf::lock_acquire "map_find:$path";
		2035	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		2036
1362	my $map = new_from_path cf::map $path	2037	my $map = new_from_path cf::map $path
1363	or return;	2038	or return;
1364		2039
1365	$map->{last_save} = $cf::RUNTIME;	2040	$map->{last_save} = $cf::RUNTIME;
1366		2041
1367	$map->load_header	2042	$map->load_header
1368	or return;	2043	or return;
1369		2044
1370	if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)	2045	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1371	# doing this can freeze the server in a sync job, obviously	2046	# doing this can freeze the server in a sync job, obviously
1372	#$cf::WAIT_FOR_TICK->wait;	2047	#$cf::WAIT_FOR_TICK->wait;
		2048	undef $guard1;
		2049	undef $guard2;
1373	$map->reset;	2050	$map->reset;
1374	undef $guard;
1375	return find $path;	2051	return find $path;
1376	}	2052	}
1377		2053
1378	$cf::MAP{$path} = $map	2054	$cf::MAP{$path} = $map
1379	}	2055	}
…		…
1386	my ($self) = @_;	2062	my ($self) = @_;
1387		2063
1388	local $self->{deny_reset} = 1; # loading can take a long time	2064	local $self->{deny_reset} = 1; # loading can take a long time
1389		2065
1390	my $path = $self->{path};	2066	my $path = $self->{path};
		2067
		2068	{
1391	my $guard = cf::lock_acquire "map_load:$path";	2069	my $guard = cf::lock_acquire "map_data:$path";
1392		2070
		2071	return unless $self->valid;
1393	return if $self->in_memory != cf::MAP_SWAPPED;	2072	return unless $self->in_memory == cf::MAP_SWAPPED;
1394		2073
1395	$self->in_memory (cf::MAP_LOADING);	2074	$self->in_memory (cf::MAP_LOADING);
1396		2075
1397	$self->alloc;	2076	$self->alloc;
1398		2077
1399	$self->pre_load;	2078	$self->pre_load;
		2079	cf::cede_to_tick;
1400		2080
1401	$self->_load_objects ($self->{load_path}, 1)	2081	my $f = new_from_file cf::object::thawer $self->{load_path};
		2082	$f->skip_block;
		2083	$self->_load_objects ($f)
1402	or return;	2084	or return;
1403		2085
1404	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2086	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1405	if delete $self->{load_original};	2087	if delete $self->{load_original};
1406		2088
1407	if (my $uniq = $self->uniq_path) {	2089	if (my $uniq = $self->uniq_path) {
1408	utf8::encode $uniq;	2090	utf8::encode $uniq;
1409	if (aio_open $uniq, O_RDONLY, 0) {	2091	unless (aio_stat $uniq) {
		2092	if (my $f = new_from_file cf::object::thawer $uniq) {
1410	$self->clear_unique_items;	2093	$self->clear_unique_items;
1411	$self->_load_objects ($uniq, 0);	2094	$self->_load_objects ($f);
		2095	$f->resolve_delayed_derefs;
		2096	}
1412	}	2097	}
1413	}	2098	}
1414		2099
1415	Coro::cede;	2100	$f->resolve_delayed_derefs;
1416		2101
		2102	cf::cede_to_tick;
1417	# now do the right thing for maps	2103	# now do the right thing for maps
1418	$self->link_multipart_objects;	2104	$self->link_multipart_objects;
1419
1420	unless ($self->{deny_activate}) {
1421	$self->decay_objects;
1422	$self->fix_auto_apply;
1423	$self->update_buttons;
1424	Coro::cede;
1425	$self->set_darkness_map;
1426	$self->difficulty ($self->estimate_difficulty)	2105	$self->difficulty ($self->estimate_difficulty)
1427	unless $self->difficulty;	2106	unless $self->difficulty;
1428	Coro::cede;	2107	cf::cede_to_tick;
		2108
		2109	unless ($self->{deny_activate}) {
		2110	$self->decay_objects;
		2111	$self->fix_auto_apply;
		2112	$self->update_buttons;
		2113	cf::cede_to_tick;
		2114	$self->set_darkness_map;
		2115	cf::cede_to_tick;
1429	$self->activate;	2116	$self->activate;
		2117	}
		2118
		2119	$self->{last_save} = $cf::RUNTIME;
		2120	$self->last_access ($cf::RUNTIME);
		2121
		2122	$self->in_memory (cf::MAP_ACTIVE);
1430	}	2123	}
1431		2124
1432	$self->post_load;	2125	$self->post_load;
1433
1434	$self->in_memory (cf::MAP_IN_MEMORY);
1435	}	2126	}
1436		2127
1437	sub customise_for {	2128	sub customise_for {
1438	my ($self, $ob) = @_;	2129	my ($self, $ob) = @_;
1439		2130
1440	return find "~" . $ob->name . "/" . $self->{path}	2131	return find "~" . $ob->name . "/" . $self->{path}
1441	if $self->per_player;	2132	if $self->per_player;
1442		2133
		2134	# return find "?party/" . $ob->name . "/" . $self->{path}
		2135	# if $self->per_party;
		2136
1443	$self	2137	$self
1444	}	2138	}
1445		2139
1446	# find and load all maps in the 3x3 area around a map	2140	# find and load all maps in the 3x3 area around a map
1447	sub load_diag {	2141	sub load_neighbours {
1448	my ($map) = @_;	2142	my ($map) = @_;
1449		2143
1450	my @diag; # diagonal neighbours	2144	my @neigh; # diagonal neighbours
1451		2145
1452	for (0 .. 3) {	2146	for (0 .. 3) {
1453	my $neigh = $map->tile_path ($_)	2147	my $neigh = $map->tile_path ($_)
1454	or next;	2148	or next;
1455	$neigh = find $neigh, $map	2149	$neigh = find $neigh, $map
1456	or next;	2150	or next;
1457	$neigh->load;	2151	$neigh->load;
1458		2152
		2153	push @neigh,
1459	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2154	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1460	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2155	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1461	}	2156	}
1462		2157
1463	for (@diag) {	2158	for (grep defined $_->[0], @neigh) {
		2159	my ($path, $origin) = @$_;
1464	my $neigh = find @$_	2160	my $neigh = find $path, $origin
1465	or next;	2161	or next;
1466	$neigh->load;	2162	$neigh->load;
1467	}	2163	}
1468	}	2164	}
1469		2165
…		…
1474	}	2170	}
1475		2171
1476	sub do_load_sync {	2172	sub do_load_sync {
1477	my ($map) = @_;	2173	my ($map) = @_;
1478		2174
		2175	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2176	if $Coro::current == $Coro::main;
		2177
1479	cf::sync_job { $map->load };	2178	cf::sync_job { $map->load };
1480	}	2179	}
1481		2180
1482	our %MAP_PREFETCH;	2181	our %MAP_PREFETCH;
1483	our $MAP_PREFETCHER = undef;	2182	our $MAP_PREFETCHER = undef;
1484		2183
1485	sub find_async {	2184	sub find_async {
1486	my ($path, $origin) = @_;	2185	my ($path, $origin, $load) = @_;
1487		2186
1488	$path = normalise $path, $origin && $origin->{path};	2187	$path = normalise $path, $origin && $origin->{path};
1489		2188
1490	if (my $map = $cf::MAP{$path}) {	2189	if (my $map = $cf::MAP{$path}) {
1491	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2190	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1492	}	2191	}
1493		2192
1494	undef $MAP_PREFETCH{$path};	2193	$MAP_PREFETCH{$path} |= $load;
		2194
1495	$MAP_PREFETCHER ||= cf::async {	2195	$MAP_PREFETCHER ||= cf::async {
		2196	$Coro::current->{desc} = "map prefetcher";
		2197
1496	while (%MAP_PREFETCH) {	2198	while (%MAP_PREFETCH) {
1497	for my $path (keys %MAP_PREFETCH) {	2199	while (my ($k, $v) = each %MAP_PREFETCH) {
1498	my $map = find $path	2200	if (my $map = find $k) {
1499	or next;
1500	$map->load;	2201	$map->load if $v;
		2202	}
1501		2203
1502	delete $MAP_PREFETCH{$path};	2204	delete $MAP_PREFETCH{$k};
1503	}	2205	}
1504	}	2206	}
1505	undef $MAP_PREFETCHER;	2207	undef $MAP_PREFETCHER;
1506	};	2208	};
1507	$MAP_PREFETCHER->prio (6);	2209	$MAP_PREFETCHER->prio (6);
…		…
1510	}	2212	}
1511		2213
1512	sub save {	2214	sub save {
1513	my ($self) = @_;	2215	my ($self) = @_;
1514		2216
1515	my $lock = cf::lock_acquire "map_data:" . $self->path;	2217	my $lock = cf::lock_acquire "map_data:$self->{path}";
1516		2218
1517	$self->{last_save} = $cf::RUNTIME;	2219	$self->{last_save} = $cf::RUNTIME;
1518		2220
1519	return unless $self->dirty;	2221	return unless $self->dirty;
1520		2222
…		…
1526	return if $self->{deny_save};	2228	return if $self->{deny_save};
1527		2229
1528	local $self->{last_access} = $self->last_access;#d#	2230	local $self->{last_access} = $self->last_access;#d#
1529		2231
1530	cf::async {	2232	cf::async {
		2233	$Coro::current->{desc} = "map player save";
1531	$_->contr->save for $self->players;	2234	$_->contr->save for $self->players;
1532	};	2235	};
		2236
		2237	cf::get_slot 0.02;
1533		2238
1534	if ($uniq) {	2239	if ($uniq) {
1535	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2240	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1536	$self->_save_objects ($uniq, cf::IO_UNIQUES);	2241	$self->_save_objects ($uniq, cf::IO_UNIQUES);
1537	} else {	2242	} else {
…		…
1543	my ($self) = @_;	2248	my ($self) = @_;
1544		2249
1545	# save first because save cedes	2250	# save first because save cedes
1546	$self->save;	2251	$self->save;
1547		2252
1548	my $lock = cf::lock_acquire "map_data:" . $self->path;	2253	my $lock = cf::lock_acquire "map_data:$self->{path}";
1549		2254
1550	return if $self->players;	2255	return if $self->players;
1551	return if $self->in_memory != cf::MAP_IN_MEMORY;	2256	return if $self->in_memory != cf::MAP_ACTIVE;
1552	return if $self->{deny_save};	2257	return if $self->{deny_save};
1553		2258
		2259	$self->in_memory (cf::MAP_SWAPPED);
		2260
		2261	$self->deactivate;
		2262	$_->clear_links_to ($self) for values %cf::MAP;
1554	$self->clear;	2263	$self->clear;
1555	$self->in_memory (cf::MAP_SWAPPED);
1556	}	2264	}
1557		2265
1558	sub reset_at {	2266	sub reset_at {
1559	my ($self) = @_;	2267	my ($self) = @_;
1560		2268
1561	# TODO: safety, remove and allow resettable per-player maps	2269	# TODO: safety, remove and allow resettable per-player maps
1562	return 1e99 if $self->isa ("ext::map_per_player");#d#
1563	return 1e99 if $self->{deny_reset};	2270	return 1e99 if $self->{deny_reset};
1564		2271
1565	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;	2272	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1566	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;	2273	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1567		2274
…		…
1578	my ($self) = @_;	2285	my ($self) = @_;
1579		2286
1580	my $lock = cf::lock_acquire "map_data:$self->{path}";	2287	my $lock = cf::lock_acquire "map_data:$self->{path}";
1581		2288
1582	return if $self->players;	2289	return if $self->players;
1583	return if $self->isa ("ext::map_per_player");#d#
1584		2290
1585	warn "resetting map ", $self->path;#d#	2291	warn "resetting map ", $self->path;
		2292
		2293	$self->in_memory (cf::MAP_SWAPPED);
		2294
		2295	# need to save uniques path
		2296	unless ($self->{deny_save}) {
		2297	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2298
		2299	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2300	if $uniq;
		2301	}
1586		2302
1587	delete $cf::MAP{$self->path};	2303	delete $cf::MAP{$self->path};
1588		2304
1589	$self->in_memory (cf::MAP_SWAPPED);	2305	$self->deactivate;
		2306	$_->clear_links_to ($self) for values %cf::MAP;
1590	$self->clear;	2307	$self->clear;
1591
1592	$_->clear_links_to ($self) for values %cf::MAP;
1593		2308
1594	$self->unlink_save;	2309	$self->unlink_save;
1595	$self->destroy;	2310	$self->destroy;
1596	}	2311	}
1597		2312
1598	my $nuke_counter = "aaaa";	2313	my $nuke_counter = "aaaa";
1599		2314
1600	sub nuke {	2315	sub nuke {
1601	my ($self) = @_;	2316	my ($self) = @_;
1602		2317
		2318	{
		2319	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2320
1603	delete $cf::MAP{$self->path};	2321	delete $cf::MAP{$self->path};
1604		2322
1605	$self->unlink_save;	2323	$self->unlink_save;
1606		2324
1607	bless $self, "cf::map";	2325	bless $self, "cf::map";
1608	delete $self->{deny_reset};	2326	delete $self->{deny_reset};
1609	$self->{deny_save} = 1;	2327	$self->{deny_save} = 1;
1610	$self->reset_timeout (1);	2328	$self->reset_timeout (1);
1611	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2329	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1612		2330
1613	$cf::MAP{$self->path} = $self;	2331	$cf::MAP{$self->path} = $self;
		2332	}
1614		2333
1615	$self->reset; # polite request, might not happen	2334	$self->reset; # polite request, might not happen
		2335	}
		2336
		2337	=item $maps = cf::map::tmp_maps
		2338
		2339	Returns an arrayref with all map paths of currently instantiated and saved
		2340	maps. May block.
		2341
		2342	=cut
		2343
		2344	sub tmp_maps() {
		2345	[
		2346	map {
		2347	utf8::decode $_;
		2348	/\.map$/
		2349	? normalise $_
		2350	: ()
		2351	} @{ aio_readdir $TMPDIR or [] }
		2352	]
		2353	}
		2354
		2355	=item $maps = cf::map::random_maps
		2356
		2357	Returns an arrayref with all map paths of currently instantiated and saved
		2358	random maps. May block.
		2359
		2360	=cut
		2361
		2362	sub random_maps() {
		2363	[
		2364	map {
		2365	utf8::decode $_;
		2366	/\.map$/
		2367	? normalise "?random/$_"
		2368	: ()
		2369	} @{ aio_readdir $RANDOMDIR or [] }
		2370	]
1616	}	2371	}
1617		2372
1618	=item cf::map::unique_maps	2373	=item cf::map::unique_maps
1619		2374
1620	Returns an arrayref of paths of all shared maps that have	2375	Returns an arrayref of paths of all shared maps that have
1621	instantiated unique items. May block.	2376	instantiated unique items. May block.
1622		2377
1623	=cut	2378	=cut
1624		2379
1625	sub unique_maps() {	2380	sub unique_maps() {
1626	my $files = aio_readdir cf::localdir . "/" . cf::uniquedir	2381	[
1627	or return;	2382	map {
1628
1629	my @paths;
1630
1631	for (@$files) {
1632	utf8::decode $_;	2383	utf8::decode $_;
1633	next if /\.pst$/;	2384	s/\.map$//; # TODO future compatibility hack
1634	next unless /^$PATH_SEP/o;	2385	/\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
1635		2386	? ()
1636	push @paths, cf::map::normalise $_;	2387	: normalise $_
		2388	} @{ aio_readdir $UNIQUEDIR or [] }
1637	}	2389	]
1638
1639	\@paths
1640	}	2390	}
1641
1642	package cf;
1643		2391
1644	=back	2392	=back
1645		2393
1646	=head3 cf::object	2394	=head3 cf::object
1647		2395
…		…
1651		2399
1652	=over 4	2400	=over 4
1653		2401
1654	=item $ob->inv_recursive	2402	=item $ob->inv_recursive
1655		2403
1656	Returns the inventory of the object _and_ their inventories, recursively.	2404	Returns the inventory of the object I<and> their inventories, recursively,
		2405	but I<not> the object itself.
1657		2406
1658	=cut	2407	=cut
1659		2408
1660	sub inv_recursive_;	2409	sub inv_recursive_;
1661	sub inv_recursive_ {	2410	sub inv_recursive_ {
1662	map { $_, inv_recursive_ $_->inv } @_	2411	map { $_, inv_recursive_ $_->inv } @_
1663	}	2412	}
1664		2413
1665	sub inv_recursive {	2414	sub inv_recursive {
1666	inv_recursive_ inv $_[0]	2415	inv_recursive_ inv $_[0]
		2416	}
		2417
		2418	=item $ref = $ob->ref
		2419
		2420	Creates and returns a persistent reference to an object that can be stored as a string.
		2421
		2422	=item $ob = cf::object::deref ($refstring)
		2423
		2424	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2425	even if the object actually exists. May block.
		2426
		2427	=cut
		2428
		2429	sub deref {
		2430	my ($ref) = @_;
		2431
		2432	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2433	my ($uuid, $name) = ($1, $2);
		2434	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2435	or return;
		2436	$pl->ob->uuid eq $uuid
		2437	or return;
		2438
		2439	$pl->ob
		2440	} else {
		2441	warn "$ref: cannot resolve object reference\n";
		2442	undef
		2443	}
1667	}	2444	}
1668		2445
1669	package cf;	2446	package cf;
1670		2447
1671	=back	2448	=back
…		…
1690		2467
1691	$flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;	2468	$flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1692		2469
1693	if ($self->{record_replies}) {	2470	if ($self->{record_replies}) {
1694	push @{ $self->{record_replies} }, [$npc, $msg, $flags];	2471	push @{ $self->{record_replies} }, [$npc, $msg, $flags];
		2472
1695	} else {	2473	} else {
		2474	my $pl = $self->contr;
		2475
		2476	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
		2477	my $dialog = $pl->{npc_dialog};
		2478	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
		2479
		2480	} else {
1696	$msg = $npc->name . " says: $msg" if $npc;	2481	$msg = $npc->name . " says: $msg" if $npc;
1697	$self->message ($msg, $flags);	2482	$self->message ($msg, $flags);
		2483	}
1698	}	2484	}
		2485	}
		2486
		2487	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2488
		2489	=cut
		2490
		2491	sub cf::object::send_msg {
		2492	my $pl = shift->contr
		2493	or return;
		2494	$pl->send_msg (@_);
1699	}	2495	}
1700		2496
1701	=item $player_object->may ("access")	2497	=item $player_object->may ("access")
1702		2498
1703	Returns wether the given player is authorized to access resource "access"	2499	Returns wether the given player is authorized to access resource "access"
…		…
1750	$self->deactivate_recursive;	2546	$self->deactivate_recursive;
1751		2547
1752	return if UNIVERSAL::isa $self->map, "ext::map_link";	2548	return if UNIVERSAL::isa $self->map, "ext::map_link";
1753		2549
1754	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2550	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1755	if $self->map;	2551	if $self->map && $self->map->{path} ne "{link}";
1756		2552
1757	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2553	$self->enter_map ($LINK_MAP || link_map, 10, 10);
1758	}	2554	}
1759		2555
1760	sub cf::object::player::leave_link {	2556	sub cf::object::player::leave_link {
1761	my ($self, $map, $x, $y) = @_;	2557	my ($self, $map, $x, $y) = @_;
		2558
		2559	return unless $self->contr->active;
1762		2560
1763	my $link_pos = delete $self->{_link_pos};	2561	my $link_pos = delete $self->{_link_pos};
1764		2562
1765	unless ($map) {	2563	unless ($map) {
1766	# restore original map position	2564	# restore original map position
…		…
1780	# use -1 or undef as default coordinates, not 0, 0	2578	# use -1 or undef as default coordinates, not 0, 0
1781	($x, $y) = ($map->enter_x, $map->enter_y)	2579	($x, $y) = ($map->enter_x, $map->enter_y)
1782	if $x <=0 && $y <= 0;	2580	if $x <=0 && $y <= 0;
1783		2581
1784	$map->load;	2582	$map->load;
1785	$map->load_diag;	2583	$map->load_neighbours;
1786		2584
1787	return unless $self->contr->active;	2585	return unless $self->contr->active;
1788	$self->activate_recursive;	2586	$self->activate_recursive;
		2587
		2588	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1789	$self->enter_map ($map, $x, $y);	2589	$self->enter_map ($map, $x, $y);
1790	}	2590	}
1791		2591
1792	cf::player->attach (	2592	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1793	on_logout => sub {
1794	my ($pl) = @_;
1795		2593
1796	# abort map switching before logout	2594	Moves the player to the given map-path and coordinates by first freezing
1797	if ($pl->ob->{_link_pos}) {	2595	her, loading and preparing them map, calling the provided $check callback
1798	cf::sync_job {	2596	that has to return the map if sucecssful, and then unfreezes the player on
1799	$pl->ob->leave_link	2597	the new (success) or old (failed) map position. In either case, $done will
1800	};	2598	be called at the end of this process.
1801	}
1802	},
1803	on_login => sub {
1804	my ($pl) = @_;
1805		2599
1806	# try to abort aborted map switching on player login :)
1807	# should happen only on crashes
1808	if ($pl->ob->{_link_pos}) {
1809	$pl->ob->enter_link;
1810	(async {
1811	# we need this sleep as the login has a concurrent enter_exit running
1812	# and this sleep increases chances of the player not ending up in scorn
1813	$pl->ob->reply (undef,
1814	"There was an internal problem at your last logout, "
1815	. "the server will try to bring you to your intended destination in a second.",
1816	cf::NDI_RED);
1817	Coro::Timer::sleep 1;
1818	$pl->ob->leave_link;
1819	})->prio (2);
1820	}
1821	},
1822	);
1823
1824	=item $player_object->goto ($path, $x, $y)
1825
1826	=cut	2600	=cut
		2601
		2602	our $GOTOGEN;
1827		2603
1828	sub cf::object::player::goto {	2604	sub cf::object::player::goto {
1829	my ($self, $path, $x, $y) = @_;	2605	my ($self, $path, $x, $y, $check, $done) = @_;
		2606
		2607	# do generation counting so two concurrent goto's will be executed in-order
		2608	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1830		2609
1831	$self->enter_link;	2610	$self->enter_link;
1832		2611
1833	(async {	2612	(async {
		2613	$Coro::current->{desc} = "player::goto $path $x $y";
		2614
		2615	# *tag paths override both path and x|y
		2616	if ($path =~ /^\*(.*)$/) {
		2617	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2618	my $ob = $obs[rand @obs];
		2619
		2620	# see if we actually can go there
		2621	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2622	$ob = $obs[rand @obs];
		2623	} else {
		2624	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2625	}
		2626	# else put us there anyways for now #d#
		2627
		2628	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2629	} else {
		2630	($path, $x, $y) = (undef, undef, undef);
		2631	}
		2632	}
		2633
1834	my $map = eval {	2634	my $map = eval {
1835	my $map = cf::map::find $path;	2635	my $map = defined $path ? cf::map::find $path : undef;
		2636
		2637	if ($map) {
1836	$map = $map->customise_for ($self) if $map;	2638	$map = $map->customise_for ($self);
		2639	$map = $check->($map) if $check && $map;
		2640	} else {
		2641	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
		2642	}
		2643
1837	$map	2644	$map
		2645	};
		2646
		2647	if ($@) {
		2648	$self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
		2649	LOG llevError | logBacktrace, Carp::longmess $@;
1838	} or	2650	}
1839	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1840		2651
		2652	if ($gen == $self->{_goto_generation}) {
		2653	delete $self->{_goto_generation};
1841	$self->leave_link ($map, $x, $y);	2654	$self->leave_link ($map, $x, $y);
		2655	}
		2656
		2657	$done->() if $done;
1842	})->prio (1);	2658	})->prio (1);
1843	}	2659	}
1844		2660
1845	=item $player_object->enter_exit ($exit_object)	2661	=item $player_object->enter_exit ($exit_object)
1846		2662
…		…
1883	$rmp->{origin_y} = $exit->y;	2699	$rmp->{origin_y} = $exit->y;
1884	}	2700	}
1885		2701
1886	$rmp->{random_seed} ||= $exit->random_seed;	2702	$rmp->{random_seed} ||= $exit->random_seed;
1887		2703
1888	my $data = cf::to_json $rmp;	2704	my $data = JSON::XS->new->utf8->pretty->canolicalize->encode ($rmp);
1889	my $md5 = Digest::MD5::md5_hex $data;	2705	my $md5 = Digest::MD5::md5_hex $data;
1890	my $meta = "$cf::RANDOM_MAPS/$md5.meta";	2706	my $meta = "$RANDOMDIR/$md5.meta";
1891		2707
1892	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2708	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1893	aio_write $fh, 0, (length $data), $data, 0;	2709	aio_write $fh, 0, (length $data), $data, 0;
1894	undef $fh;	2710	undef $fh;
1895	aio_rename "$meta~", $meta;	2711	aio_rename "$meta~", $meta;
…		…
1904		2720
1905	return unless $self->type == cf::PLAYER;	2721	return unless $self->type == cf::PLAYER;
1906		2722
1907	if ($exit->slaying eq "/!") {	2723	if ($exit->slaying eq "/!") {
1908	#TODO: this should de-fi-ni-te-ly not be a sync-job	2724	#TODO: this should de-fi-ni-te-ly not be a sync-job
		2725	# the problem is that $exit might not survive long enough
		2726	# so it needs to be done right now, right here
1909	cf::sync_job { prepare_random_map $exit };	2727	cf::sync_job { prepare_random_map $exit };
1910	}	2728	}
1911		2729
1912	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2730	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1913	my $hp = $exit->stats->hp;	2731	my $hp = $exit->stats->hp;
1914	my $sp = $exit->stats->sp;	2732	my $sp = $exit->stats->sp;
1915		2733
1916	$self->enter_link;	2734	$self->enter_link;
1917		2735
		2736	# if exit is damned, update players death & WoR home-position
		2737	$self->contr->savebed ($slaying, $hp, $sp)
		2738	if $exit->flag (FLAG_DAMNED);
		2739
1918	(async {	2740	(async {
		2741	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2742
1919	$self->deactivate_recursive; # just to be sure	2743	$self->deactivate_recursive; # just to be sure
1920	unless (eval {	2744	unless (eval {
1921	$self->goto ($slaying, $hp, $sp);	2745	$self->goto ($slaying, $hp, $sp);
1922		2746
1923	1;	2747	1;
1924	}) {	2748	}) {
1925	$self->message ("Something went wrong deep within the crossfire server. "	2749	$self->message ("Something went wrong deep within the crossfire server. "
1926	. "I'll try to bring you back to the map you were before. "	2750	. "I'll try to bring you back to the map you were before. "
1927	. "Please report this to the dungeon master!",	2751	. "Please report this to the dungeon master!",
1928	cf::NDI_UNIQUE | cf::NDI_RED);	2752	cf::NDI_UNIQUE | cf::NDI_RED);
1929		2753
1930	warn "ERROR in enter_exit: $@";	2754	warn "ERROR in enter_exit: $@";
1931	$self->leave_link;	2755	$self->leave_link;
1932	}	2756	}
1933	})->prio (1);	2757	})->prio (1);
…		…
1946		2770
1947	sub cf::client::send_drawinfo {	2771	sub cf::client::send_drawinfo {
1948	my ($self, $text, $flags) = @_;	2772	my ($self, $text, $flags) = @_;
1949		2773
1950	utf8::encode $text;	2774	utf8::encode $text;
1951	$self->send_packet (sprintf "drawinfo %d %s", $flags, $text);	2775	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1952	}	2776	}
1953		2777
		2778	=item $client->send_msg ($channel, $msg, $color, [extra...])
		2779
		2780	Send a drawinfo or msg packet to the client, formatting the msg for the
		2781	client if neccessary. C<$type> should be a string identifying the type of
		2782	the message, with C<log> being the default. If C<$color> is negative, suppress
		2783	the message unless the client supports the msg packet.
		2784
		2785	=cut
		2786
		2787	# non-persistent channels (usually the info channel)
		2788	our %CHANNEL = (
		2789	"c/identify" => {
		2790	id => "infobox",
		2791	title => "Identify",
		2792	reply => undef,
		2793	tooltip => "Items recently identified",
		2794	},
		2795	"c/examine" => {
		2796	id => "infobox",
		2797	title => "Examine",
		2798	reply => undef,
		2799	tooltip => "Signs and other items you examined",
		2800	},
		2801	"c/book" => {
		2802	id => "infobox",
		2803	title => "Book",
		2804	reply => undef,
		2805	tooltip => "The contents of a note or book",
		2806	},
		2807	"c/lookat" => {
		2808	id => "infobox",
		2809	title => "Look",
		2810	reply => undef,
		2811	tooltip => "What you saw there",
		2812	},
		2813	"c/who" => {
		2814	id => "infobox",
		2815	title => "Players",
		2816	reply => undef,
		2817	tooltip => "Shows players who are currently online",
		2818	},
		2819	"c/body" => {
		2820	id => "infobox",
		2821	title => "Body Parts",
		2822	reply => undef,
		2823	tooltip => "Shows which body parts you posess and are available",
		2824	},
		2825	"c/uptime" => {
		2826	id => "infobox",
		2827	title => "Uptime",
		2828	reply => undef,
		2829	tooltip => "How long the server has been running since last restart",
		2830	},
		2831	"c/mapinfo" => {
		2832	id => "infobox",
		2833	title => "Map Info",
		2834	reply => undef,
		2835	tooltip => "Information related to the maps",
		2836	},
		2837	);
		2838
		2839	sub cf::client::send_msg {
		2840	my ($self, $channel, $msg, $color, @extra) = @_;
		2841
		2842	$msg = $self->pl->expand_cfpod ($msg);
		2843
		2844	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2845
		2846	# check predefined channels, for the benefit of C
		2847	if ($CHANNEL{$channel}) {
		2848	$channel = $CHANNEL{$channel};
		2849
		2850	$self->ext_msg (channel_info => $channel)
		2851	if $self->can_msg;
		2852
		2853	$channel = $channel->{id};
		2854
		2855	} elsif (ref $channel) {
		2856	# send meta info to client, if not yet sent
		2857	unless (exists $self->{channel}{$channel->{id}}) {
		2858	$self->{channel}{$channel->{id}} = $channel;
		2859	$self->ext_msg (channel_info => $channel)
		2860	if $self->can_msg;
		2861	}
		2862
		2863	$channel = $channel->{id};
		2864	}
		2865
		2866	return unless @extra || length $msg;
		2867
		2868	if ($self->can_msg) {
		2869	# default colour, mask it out
		2870	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2871	if $color & cf::NDI_DEF;
		2872
		2873	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2874	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
		2875	} else {
		2876	if ($color >= 0) {
		2877	# replace some tags by gcfclient-compatible ones
		2878	for ($msg) {
		2879	1 while
		2880	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2881	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2882	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2883	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2884	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2885	}
		2886
		2887	$color &= cf::NDI_COLOR_MASK;
		2888
		2889	utf8::encode $msg;
		2890
		2891	if (0 && $msg =~ /\[/) {
		2892	# COMMAND/INFO
		2893	$self->send_packet ("drawextinfo $color 10 8 $msg")
		2894	} else {
		2895	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
		2896	$self->send_packet ("drawinfo $color $msg")
		2897	}
		2898	}
		2899	}
		2900	}
		2901
		2902	=item $client->ext_msg ($type, @msg)
		2903
		2904	Sends an ext event to the client.
		2905
		2906	=cut
		2907
		2908	sub cf::client::ext_msg($$@) {
		2909	my ($self, $type, @msg) = @_;
		2910
		2911	if ($self->extcmd == 2) {
		2912	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2913	} elsif ($self->extcmd == 1) { # TODO: remove
		2914	push @msg, msgtype => "event_$type";
		2915	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2916	}
		2917	}
		2918
		2919	=item $client->ext_reply ($msgid, @msg)
		2920
		2921	Sends an ext reply to the client.
		2922
		2923	=cut
		2924
		2925	sub cf::client::ext_reply($$@) {
		2926	my ($self, $id, @msg) = @_;
		2927
		2928	if ($self->extcmd == 2) {
		2929	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2930	} elsif ($self->extcmd == 1) {
		2931	#TODO: version 1, remove
		2932	unshift @msg, msgtype => "reply", msgid => $id;
		2933	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2934	}
		2935	}
1954		2936
1955	=item $success = $client->query ($flags, "text", \&cb)	2937	=item $success = $client->query ($flags, "text", \&cb)
1956		2938
1957	Queues a query to the client, calling the given callback with	2939	Queues a query to the client, calling the given callback with
1958	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2940	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1959	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.	2941	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
1960		2942
1961	Queries can fail, so check the return code. Or don't, as queries will become	2943	Queries can fail, so check the return code. Or don't, as queries will
1962	reliable at some point in the future.	2944	become reliable at some point in the future.
1963		2945
1964	=cut	2946	=cut
1965		2947
1966	sub cf::client::query {	2948	sub cf::client::query {
1967	my ($self, $flags, $text, $cb) = @_;	2949	my ($self, $flags, $text, $cb) = @_;
…		…
1975	utf8::encode $text;	2957	utf8::encode $text;
1976	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];	2958	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
1977		2959
1978	$self->send_packet ($self->{query_queue}[0][0])	2960	$self->send_packet ($self->{query_queue}[0][0])
1979	if @{ $self->{query_queue} } == 1;	2961	if @{ $self->{query_queue} } == 1;
		2962
		2963	1
1980	}	2964	}
1981		2965
1982	cf::client->attach (	2966	cf::client->attach (
		2967	on_connect => sub {
		2968	my ($ns) = @_;
		2969
		2970	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2971	},
1983	on_reply => sub {	2972	on_reply => sub {
1984	my ($ns, $msg) = @_;	2973	my ($ns, $msg) = @_;
1985		2974
1986	# this weird shuffling is so that direct followup queries	2975	# this weird shuffling is so that direct followup queries
1987	# get handled first	2976	# get handled first
1988	my $queue = delete $ns->{query_queue}	2977	my $queue = delete $ns->{query_queue}
1989	or return; # be conservative, not sure how that can happen, but we saw a crash here	2978	or return; # be conservative, not sure how that can happen, but we saw a crash here
1990		2979
1991	(shift @$queue)->[1]->($msg);	2980	(shift @$queue)->[1]->($msg);
		2981	return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1992		2982
1993	push @{ $ns->{query_queue} }, @$queue;	2983	push @{ $ns->{query_queue} }, @$queue;
1994		2984
1995	if (@{ $ns->{query_queue} } == @$queue) {	2985	if (@{ $ns->{query_queue} } == @$queue) {
1996	if (@$queue) {	2986	if (@$queue) {
…		…
1998	} else {	2988	} else {
1999	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;	2989	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2000	}	2990	}
2001	}	2991	}
2002	},	2992	},
		2993	on_exticmd => sub {
		2994	my ($ns, $buf) = @_;
		2995
		2996	my $msg = eval { $ns->{json_coder}->decode ($buf) };
		2997
		2998	if (ref $msg) {
		2999	my ($type, $reply, @payload) =
		3000	"ARRAY" eq ref $msg
		3001	? @$msg
		3002	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		3003
		3004	my @reply;
		3005
		3006	if (my $cb = $EXTICMD{$type}) {
		3007	@reply = $cb->($ns, @payload);
		3008	}
		3009
		3010	$ns->ext_reply ($reply, @reply)
		3011	if $reply;
		3012
		3013	} else {
		3014	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
		3015	}
		3016
		3017	cf::override;
		3018	},
2003	);	3019	);
2004		3020
2005	=item $client->async (\&cb)	3021	=item $client->async (\&cb)
2006		3022
2007	Create a new coroutine, running the specified callback. The coroutine will	3023	Create a new coroutine, running the specified callback. The coroutine will
…		…
2048	our $safe = new Safe "safe";	3064	our $safe = new Safe "safe";
2049	our $safe_hole = new Safe::Hole;	3065	our $safe_hole = new Safe::Hole;
2050		3066
2051	$SIG{FPE} = 'IGNORE';	3067	$SIG{FPE} = 'IGNORE';
2052		3068
2053	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	3069	$safe->permit_only (Opcode::opset qw(
		3070	:base_core :base_mem :base_orig :base_math
		3071	grepstart grepwhile mapstart mapwhile
		3072	sort time
		3073	));
2054		3074
2055	# here we export the classes and methods available to script code	3075	# here we export the classes and methods available to script code
2056		3076
2057	=pod	3077	=pod
2058		3078
2059	The following fucntions and emthods are available within a safe environment:	3079	The following functions and methods are available within a safe environment:
2060		3080
2061	cf::object contr pay_amount pay_player map	3081	cf::object
		3082	contr pay_amount pay_player map x y force_find force_add destroy
		3083	insert remove name archname title slaying race decrease_ob_nr
		3084
2062	cf::object::player player	3085	cf::object::player
2063	cf::player peaceful	3086	player
2064	cf::map trigger	3087
		3088	cf::player
		3089	peaceful
		3090
		3091	cf::map
		3092	trigger
2065		3093
2066	=cut	3094	=cut
2067		3095
2068	for (	3096	for (
2069	["cf::object" => qw(contr pay_amount pay_player map)],	3097	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		3098	insert remove inv name archname title slaying race
		3099	decrease_ob_nr destroy)],
2070	["cf::object::player" => qw(player)],	3100	["cf::object::player" => qw(player)],
2071	["cf::player" => qw(peaceful)],	3101	["cf::player" => qw(peaceful)],
2072	["cf::map" => qw(trigger)],	3102	["cf::map" => qw(trigger)],
2073	) {	3103	) {
2074	no strict 'refs';	3104	no strict 'refs';
…		…
2145	=back	3175	=back
2146		3176
2147	=cut	3177	=cut
2148		3178
2149	#############################################################################	3179	#############################################################################
		3180	# the server's init and main functions
2150		3181
2151	=head2 EXTENSION DATABASE SUPPORT	3182	sub load_facedata($) {
		3183	my ($path) = @_;
2152		3184
2153	Crossfire maintains a very simple database for extension use. It can	3185	# HACK to clear player env face cache, we need some signal framework
2154	currently store anything that can be serialised using Storable, which	3186	# for this (global event?)
2155	excludes objects.	3187	%ext::player_env::MUSIC_FACE_CACHE = ();
2156		3188
2157	The parameter C<$family> should best start with the name of the extension	3189	my $enc = JSON::XS->new->utf8->canonical->relaxed;
2158	using it, it should be unique.
2159		3190
2160	=over 4	3191	warn "loading facedata from $path\n";
2161		3192
2162	=item $hashref = cf::db_get $family	3193	my $facedata;
		3194	0 < aio_load $path, $facedata
		3195	or die "$path: $!";
2163		3196
2164	Return a hashref for use by the extension C<$family>, which can be	3197	$facedata = Coro::Storable::thaw $facedata;
2165	modified. After modifications, you have to call C<cf::db_dirty> or
2166	C<cf::db_sync>.
2167		3198
2168	=item $value = cf::db_get $family => $key	3199	$facedata->{version} == 2
		3200	or cf::cleanup "$path: version mismatch, cannot proceed.";
2169		3201
2170	Returns a single value from the database	3202	# patch in the exptable
2171		3203	$facedata->{resource}{"res/exp_table"} = {
2172	=item cf::db_put $family => $hashref	3204	type => FT_RSRC,
2173		3205	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2174	Stores the given family hashref into the database. Updates are delayed, if
2175	you want the data to be synced to disk immediately, use C<cf::db_sync>.
2176
2177	=item cf::db_put $family => $key => $value
2178
2179	Stores the given C<$value> in the family hash. Updates are delayed, if you
2180	want the data to be synced to disk immediately, use C<cf::db_sync>.
2181
2182	=item cf::db_dirty
2183
2184	Marks the database as dirty, to be updated at a later time.
2185
2186	=item cf::db_sync
2187
2188	Immediately write the database to disk I<if it is dirty>.
2189
2190	=cut
2191
2192	our $DB;
2193
2194	{
2195	my $path = cf::localdir . "/database.pst";
2196
2197	sub db_load() {
2198	$DB = stat $path ? Storable::retrieve $path : { };
2199	}	3206	};
		3207	cf::cede_to_tick;
2200		3208
2201	my $pid;
2202
2203	sub db_save() {
2204	waitpid $pid, 0 if $pid;
2205	if (0 == ($pid = fork)) {
2206	$DB->{_meta}{version} = 1;
2207	Storable::nstore $DB, "$path~";
2208	rename "$path~", $path;
2209	cf::_exit 0 if defined $pid;
2210	}
2211	}	3209	{
		3210	my $faces = $facedata->{faceinfo};
2212		3211
2213	my $dirty;	3212	while (my ($face, $info) = each %$faces) {
		3213	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2214		3214
2215	sub db_sync() {	3215	cf::face::set_visibility $idx, $info->{visibility};
2216	db_save if $dirty;	3216	cf::face::set_magicmap $idx, $info->{magicmap};
2217	undef $dirty;	3217	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2218	}	3218	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2219		3219
2220	my $idle = Event->idle (	3220	cf::cede_to_tick;
2221	reentrant => 0,
2222	min => 10,
2223	max => 20,
2224	repeat => 0,
2225	data => WF_AUTOCANCEL,
2226	cb => \&db_sync,
2227	);
2228
2229	sub db_dirty() {
2230	$dirty = 1;
2231	$idle->start;
2232	}
2233
2234	sub db_get($;$) {
2235	@_ >= 2
2236	? $DB->{$_[0]}{$_[1]}
2237	: ($DB->{$_[0]} ||= { })
2238	}
2239
2240	sub db_put($$;$) {
2241	if (@_ >= 3) {
2242	$DB->{$_[0]}{$_[1]} = $_[2];
2243	} else {
2244	$DB->{$_[0]} = $_[1];
2245	}
2246	db_dirty;
2247	}
2248
2249	cf::global->attach (
2250	prio => 10000,
2251	on_cleanup => sub {
2252	db_sync;
2253	},	3221	}
2254	);
2255	}
2256		3222
2257	#############################################################################	3223	while (my ($face, $info) = each %$faces) {
2258	# the server's main()	3224	next unless $info->{smooth};
2259		3225
2260	sub cfg_load {	3226	my $idx = cf::face::find $face
		3227	or next;
		3228
		3229	if (my $smooth = cf::face::find $info->{smooth}) {
		3230	cf::face::set_smooth $idx, $smooth;
		3231	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
		3232	} else {
		3233	warn "smooth face '$info->{smooth}' not found for face '$face'";
		3234	}
		3235
		3236	cf::cede_to_tick;
		3237	}
		3238	}
		3239
		3240	{
		3241	my $anims = $facedata->{animinfo};
		3242
		3243	while (my ($anim, $info) = each %$anims) {
		3244	cf::anim::set $anim, $info->{frames}, $info->{facings};
		3245	cf::cede_to_tick;
		3246	}
		3247
		3248	cf::anim::invalidate_all; # d'oh
		3249	}
		3250
		3251	{
		3252	# TODO: for gcfclient pleasure, we should give resources
		3253	# that gcfclient doesn't grok a >10000 face index.
		3254	my $res = $facedata->{resource};
		3255
		3256	while (my ($name, $info) = each %$res) {
		3257	if (defined $info->{type}) {
		3258	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3259	my $data;
		3260
		3261	if ($info->{type} & 1) {
		3262	# prepend meta info
		3263
		3264	my $meta = $enc->encode ({
		3265	name => $name,
		3266	%{ $info->{meta} || {} },
		3267	});
		3268
		3269	$data = pack "(w/a*)*", $meta, $info->{data};
		3270	} else {
		3271	$data = $info->{data};
		3272	}
		3273
		3274	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3275	cf::face::set_type $idx, $info->{type};
		3276	} else {
		3277	$RESOURCE{$name} = $info;
		3278	}
		3279
		3280	cf::cede_to_tick;
		3281	}
		3282	}
		3283
		3284	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
		3285
		3286	1
		3287	}
		3288
		3289	cf::global->attach (on_resource_update => sub {
		3290	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
		3291	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
		3292
		3293	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3294	my $sound = $soundconf->{compat}[$_]
		3295	or next;
		3296
		3297	my $face = cf::face::find "sound/$sound->[1]";
		3298	cf::sound::set $sound->[0] => $face;
		3299	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3300	}
		3301
		3302	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3303	my $face = cf::face::find "sound/$v";
		3304	cf::sound::set $k => $face;
		3305	}
		3306	}
		3307	});
		3308
		3309	register_exticmd fx_want => sub {
		3310	my ($ns, $want) = @_;
		3311
		3312	while (my ($k, $v) = each %$want) {
		3313	$ns->fx_want ($k, $v);
		3314	}
		3315	};
		3316
		3317	sub reload_regions {
		3318	# HACK to clear player env face cache, we need some signal framework
		3319	# for this (global event?)
		3320	%ext::player_env::MUSIC_FACE_CACHE = ();
		3321
		3322	load_resource_file "$MAPDIR/regions"
		3323	or die "unable to load regions file\n";
		3324
		3325	for (cf::region::list) {
		3326	$_->{match} = qr/$_->{match}/
		3327	if exists $_->{match};
		3328	}
		3329	}
		3330
		3331	sub reload_facedata {
		3332	load_facedata "$DATADIR/facedata"
		3333	or die "unable to load facedata\n";
		3334	}
		3335
		3336	sub reload_archetypes {
		3337	load_resource_file "$DATADIR/archetypes"
		3338	or die "unable to load archetypes\n";
		3339	#d# NEED to laod twice to resolve forward references
		3340	# this really needs to be done in an extra post-pass
		3341	# (which needs to be synchronous, so solve it differently)
		3342	load_resource_file "$DATADIR/archetypes"
		3343	or die "unable to load archetypes\n";
		3344	}
		3345
		3346	sub reload_treasures {
		3347	load_resource_file "$DATADIR/treasures"
		3348	or die "unable to load treasurelists\n";
		3349	}
		3350
		3351	sub reload_resources {
		3352	warn "reloading resource files...\n";
		3353
		3354	reload_regions;
		3355	reload_facedata;
		3356	#reload_archetypes;#d#
		3357	reload_archetypes;
		3358	reload_treasures;
		3359
		3360	warn "finished reloading resource files\n";
		3361	}
		3362
		3363	sub init {
		3364	reload_resources;
		3365	}
		3366
		3367	sub reload_config {
2261	open my $fh, "<:utf8", cf::confdir . "/config"	3368	open my $fh, "<:utf8", "$CONFDIR/config"
2262	or return;	3369	or return;
2263		3370
2264	local $/;	3371	local $/;
2265	*CFG = YAML::Syck::Load <$fh>;	3372	*CFG = YAML::Load <$fh>;
2266		3373
2267	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3374	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2268		3375
2269	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3376	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2270	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3377	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
2281	sub main {	3388	sub main {
2282	# we must not ever block the main coroutine	3389	# we must not ever block the main coroutine
2283	local $Coro::idle = sub {	3390	local $Coro::idle = sub {
2284	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3391	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2285	(async {	3392	(async {
2286	Event::one_event;	3393	$Coro::current->{desc} = "IDLE BUG HANDLER";
		3394	EV::loop EV::LOOP_ONESHOT;
2287	})->prio (Coro::PRIO_MAX);	3395	})->prio (Coro::PRIO_MAX);
2288	};	3396	};
2289		3397
2290	cfg_load;	3398	reload_config;
2291	db_load;	3399	db_init;
2292	load_extensions;	3400	load_extensions;
2293		3401
2294	$TICK_WATCHER->start;	3402	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
		3403	evthread_start IO::AIO::poll_fileno;
2295	Event::loop;	3404	EV::loop;
2296	}	3405	}
2297		3406
2298	#############################################################################	3407	#############################################################################
2299	# initialisation and cleanup	3408	# initialisation and cleanup
2300		3409
2301	# install some emergency cleanup handlers	3410	# install some emergency cleanup handlers
2302	BEGIN {	3411	BEGIN {
		3412	our %SIGWATCHER = ();
2303	for my $signal (qw(INT HUP TERM)) {	3413	for my $signal (qw(INT HUP TERM)) {
2304	Event->signal (	3414	$SIGWATCHER{$signal} = EV::signal $signal, sub {
2305	reentrant => 0,
2306	data => WF_AUTOCANCEL,
2307	signal => $signal,
2308	prio => 0,
2309	cb => sub {
2310	cf::cleanup "SIG$signal";	3415	cf::cleanup "SIG$signal";
2311	},
2312	);	3416	};
		3417	}
		3418	}
		3419
		3420	sub write_runtime_sync {
		3421	my $runtime = "$LOCALDIR/runtime";
		3422
		3423	# first touch the runtime file to show we are still running:
		3424	# the fsync below can take a very very long time.
		3425
		3426	IO::AIO::aio_utime $runtime, undef, undef;
		3427
		3428	my $guard = cf::lock_acquire "write_runtime";
		3429
		3430	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
		3431	or return;
		3432
		3433	my $value = $cf::RUNTIME + 90 + 10;
		3434	# 10 is the runtime save interval, for a monotonic clock
		3435	# 60 allows for the watchdog to kill the server.
		3436
		3437	(aio_write $fh, 0, (length $value), $value, 0) <= 0
		3438	and return;
		3439
		3440	# always fsync - this file is important
		3441	aio_fsync $fh
		3442	and return;
		3443
		3444	# touch it again to show we are up-to-date
		3445	aio_utime $fh, undef, undef;
		3446
		3447	close $fh
		3448	or return;
		3449
		3450	aio_rename "$runtime~", $runtime
		3451	and return;
		3452
		3453	warn "runtime file written.\n";
		3454
2313	}	3455	1
		3456	}
		3457
		3458	our $uuid_lock;
		3459	our $uuid_skip;
		3460
		3461	sub write_uuid_sync($) {
		3462	$uuid_skip ||= $_[0];
		3463
		3464	return if $uuid_lock;
		3465	local $uuid_lock = 1;
		3466
		3467	my $uuid = "$LOCALDIR/uuid";
		3468
		3469	my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
		3470	or return;
		3471
		3472	my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
		3473	$uuid_skip = 0;
		3474
		3475	(aio_write $fh, 0, (length $value), $value, 0) <= 0
		3476	and return;
		3477
		3478	# always fsync - this file is important
		3479	aio_fsync $fh
		3480	and return;
		3481
		3482	close $fh
		3483	or return;
		3484
		3485	aio_rename "$uuid~", $uuid
		3486	and return;
		3487
		3488	warn "uuid file written ($value).\n";
		3489
		3490	1
		3491
		3492	}
		3493
		3494	sub write_uuid($$) {
		3495	my ($skip, $sync) = @_;
		3496
		3497	$sync ? write_uuid_sync $skip
		3498	: async { write_uuid_sync $skip };
2314	}	3499	}
2315		3500
2316	sub emergency_save() {	3501	sub emergency_save() {
2317	my $freeze_guard = cf::freeze_mainloop;	3502	my $freeze_guard = cf::freeze_mainloop;
2318		3503
…		…
2324	# and maps saved/destroyed asynchronously.	3509	# and maps saved/destroyed asynchronously.
2325	warn "begin emergency player save\n";	3510	warn "begin emergency player save\n";
2326	for my $login (keys %cf::PLAYER) {	3511	for my $login (keys %cf::PLAYER) {
2327	my $pl = $cf::PLAYER{$login} or next;	3512	my $pl = $cf::PLAYER{$login} or next;
2328	$pl->valid or next;	3513	$pl->valid or next;
		3514	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2329	$pl->save;	3515	$pl->save;
2330	}	3516	}
2331	warn "end emergency player save\n";	3517	warn "end emergency player save\n";
2332		3518
2333	warn "begin emergency map save\n";	3519	warn "begin emergency map save\n";
…		…
2335	my $map = $cf::MAP{$path} or next;	3521	my $map = $cf::MAP{$path} or next;
2336	$map->valid or next;	3522	$map->valid or next;
2337	$map->save;	3523	$map->save;
2338	}	3524	}
2339	warn "end emergency map save\n";	3525	warn "end emergency map save\n";
		3526
		3527	warn "begin emergency database checkpoint\n";
		3528	BDB::db_env_txn_checkpoint $DB_ENV;
		3529	warn "end emergency database checkpoint\n";
		3530
		3531	warn "begin write uuid\n";
		3532	write_uuid_sync 1;
		3533	warn "end write uuid\n";
2340	};	3534	};
2341		3535
2342	warn "leave emergency perl save\n";	3536	warn "leave emergency perl save\n";
2343	}	3537	}
2344		3538
		3539	sub post_cleanup {
		3540	my ($make_core) = @_;
		3541
		3542	warn Carp::longmess "post_cleanup backtrace"
		3543	if $make_core;
		3544	}
		3545
2345	sub reload() {	3546	sub do_reload_perl() {
2346	# can/must only be called in main	3547	# can/must only be called in main
2347	if ($Coro::current != $Coro::main) {	3548	if ($Coro::current != $Coro::main) {
2348	warn "can only reload from main coroutine";	3549	warn "can only reload from main coroutine";
2349	return;	3550	return;
2350	}	3551	}
2351		3552
2352	warn "reloading...";	3553	warn "reloading...";
2353		3554
2354	warn "cancelling server ticker";	3555	warn "entering sync_job";
2355	$TICK_WATCHER->cancel;
2356		3556
		3557	cf::sync_job {
		3558	cf::write_runtime_sync; # external watchdog should not bark
2357	cf::emergency_save;	3559	cf::emergency_save;
		3560	cf::write_runtime_sync; # external watchdog should not bark
2358		3561
2359	eval {	3562	warn "syncing database to disk";
		3563	BDB::db_env_txn_checkpoint $DB_ENV;
		3564
2360	# if anything goes wrong in here, we should simply crash as we already saved	3565	# if anything goes wrong in here, we should simply crash as we already saved
2361
2362	warn "syncing database to disk";
2363	cf::db_sync;
2364
2365	warn "cancelling all WF_AUTOCANCEL watchers";
2366	for (Event::all_watchers) {
2367	$_->cancel if $_->data & WF_AUTOCANCEL;
2368	}
2369		3566
2370	warn "flushing outstanding aio requests";	3567	warn "flushing outstanding aio requests";
2371	for (;;) {	3568	for (;;) {
		3569	BDB::flush;
2372	IO::AIO::flush;	3570	IO::AIO::flush;
2373	Coro::cede;	3571	Coro::cede_notself;
2374	last unless IO::AIO::nreqs;	3572	last unless IO::AIO::nreqs || BDB::nreqs;
2375	warn "iterate...";	3573	warn "iterate...";
2376	}	3574	}
		3575
		3576	++$RELOAD;
2377		3577
2378	warn "cancelling all extension coros";	3578	warn "cancelling all extension coros";
2379	$_->cancel for values %EXT_CORO;	3579	$_->cancel for values %EXT_CORO;
2380	%EXT_CORO = ();	3580	%EXT_CORO = ();
2381		3581
2382	warn "removing commands";	3582	warn "removing commands";
2383	%COMMAND = ();	3583	%COMMAND = ();
2384		3584
2385	warn "removing ext commands";	3585	warn "removing ext/exti commands";
2386	%EXTCMD = ();	3586	%EXTCMD = ();
		3587	%EXTICMD = ();
2387		3588
2388	warn "unloading/nuking all extensions";	3589	warn "unloading/nuking all extensions";
2389	for my $pkg (@EXTS) {	3590	for my $pkg (@EXTS) {
2390	warn "... unloading $pkg";	3591	warn "... unloading $pkg";
2391		3592
…		…
2421	Symbol::delete_package "safe::$_"	3622	Symbol::delete_package "safe::$_"
2422	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3623	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2423		3624
2424	warn "unloading cf.pm \"a bit\"";	3625	warn "unloading cf.pm \"a bit\"";
2425	delete $INC{"cf.pm"};	3626	delete $INC{"cf.pm"};
		3627	delete $INC{"cf/pod.pm"};
2426		3628
2427	# don't, removes xs symbols, too,	3629	# don't, removes xs symbols, too,
2428	# and global variables created in xs	3630	# and global variables created in xs
2429	#Symbol::delete_package __PACKAGE__;	3631	#Symbol::delete_package __PACKAGE__;
2430		3632
…		…
2433	warn "reloading cf.pm";	3635	warn "reloading cf.pm";
2434	require cf;	3636	require cf;
2435	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3637	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2436		3638
2437	warn "loading config and database again";	3639	warn "loading config and database again";
2438	cf::cfg_load;	3640	cf::reload_config;
2439	cf::db_load;
2440		3641
2441	warn "loading extensions";	3642	warn "loading extensions";
2442	cf::load_extensions;	3643	cf::load_extensions;
2443		3644
2444	warn "reattaching attachments to objects/players";	3645	warn "reattaching attachments to objects/players";
2445	_global_reattach;	3646	_global_reattach; # objects, sockets
2446	warn "reattaching attachments to maps";	3647	warn "reattaching attachments to maps";
2447	reattach $_ for values %MAP;	3648	reattach $_ for values %MAP;
		3649	warn "reattaching attachments to players";
		3650	reattach $_ for values %PLAYER;
2448		3651
2449	warn "restarting server ticker";	3652	warn "leaving sync_job";
2450		3653
2451	$TICK_WATCHER->start;	3654	1
		3655	} or do {
		3656	warn $@;
		3657	cf::cleanup "error while reloading, exiting.";
2452	};	3658	};
2453
2454	if ($@) {
2455	warn $@;
2456	warn "error while reloading, exiting.";
2457	exit 1;
2458	}
2459		3659
2460	warn "reloaded";	3660	warn "reloaded";
2461	};	3661	};
2462		3662
2463	our $RELOAD_WATCHER; # used only during reload	3663	our $RELOAD_WATCHER; # used only during reload
2464		3664
		3665	sub reload_perl() {
		3666	# doing reload synchronously and two reloads happen back-to-back,
		3667	# coro crashes during coro_state_free->destroy here.
		3668
		3669	$RELOAD_WATCHER ||= EV::timer 0, 0, sub {
		3670	do_reload_perl;
		3671	undef $RELOAD_WATCHER;
		3672	};
		3673	}
		3674
2465	register_command "reload" => sub {	3675	register_command "reload" => sub {
2466	my ($who, $arg) = @_;	3676	my ($who, $arg) = @_;
2467		3677
2468	if ($who->flag (FLAG_WIZ)) {	3678	if ($who->flag (FLAG_WIZ)) {
2469	$who->message ("reloading server.");	3679	$who->message ("reloading server.");
2470		3680	async {
2471	# doing reload synchronously and two reloads happen back-to-back,	3681	$Coro::current->{desc} = "perl_reload";
2472	# coro crashes during coro_state_free->destroy here.
2473
2474	$RELOAD_WATCHER ||= Event->timer (
2475	reentrant => 0,
2476	after => 0,
2477	data => WF_AUTOCANCEL,
2478	cb => sub {
2479	reload;	3682	reload_perl;
2480	undef $RELOAD_WATCHER;
2481	},
2482	);	3683	};
2483	}	3684	}
2484	};	3685	};
2485		3686
2486	unshift @INC, $LIBDIR;	3687	unshift @INC, $LIBDIR;
2487		3688
2488	my $bug_warning = 0;	3689	my $bug_warning = 0;
2489		3690
2490	$TICK_WATCHER = Event->timer (	3691	our @WAIT_FOR_TICK;
2491	reentrant => 0,	3692	our @WAIT_FOR_TICK_BEGIN;
2492	parked => 1,	3693
2493	prio => 0,	3694	sub wait_for_tick {
2494	at => $NEXT_TICK || $TICK,	3695	return if tick_inhibit;
2495	data => WF_AUTOCANCEL,	3696	return if $Coro::current == $Coro::main;
2496	cb => sub {	3697
		3698	my $signal = new Coro::Signal;
		3699	push @WAIT_FOR_TICK, $signal;
		3700	$signal->wait;
		3701	}
		3702
		3703	sub wait_for_tick_begin {
		3704	return if tick_inhibit;
		3705	return if $Coro::current == $Coro::main;
		3706
		3707	my $signal = new Coro::Signal;
		3708	push @WAIT_FOR_TICK_BEGIN, $signal;
		3709	$signal->wait;
		3710	}
		3711
		3712	sub tick {
2497	if ($Coro::current != $Coro::main) {	3713	if ($Coro::current != $Coro::main) {
2498	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3714	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2499	unless ++$bug_warning > 10;	3715	unless ++$bug_warning > 10;
2500	return;	3716	return;
2501	}	3717	}
2502		3718
2503	$NOW = Event::time;
2504
2505	cf::server_tick; # one server iteration	3719	cf::server_tick; # one server iteration
2506	$RUNTIME += $TICK;
2507	$NEXT_TICK += $TICK;
2508		3720
2509	$WAIT_FOR_TICK->broadcast;	3721	if ($NOW >= $NEXT_RUNTIME_WRITE) {
2510	$WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;	3722	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2511		3723	Coro::async_pool {
2512	Event::sweep;	3724	$Coro::current->{desc} = "runtime saver";
2513	Coro::cede_notself;
2514
2515	# my $AFTER = Event::time;
2516	# warn $AFTER - $NOW;#d#
2517
2518	# if we are delayed by four ticks or more, skip them all
2519	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2520
2521	$TICK_WATCHER->at ($NEXT_TICK);
2522	$TICK_WATCHER->start;
2523	},
2524	);
2525
2526	IO::AIO::max_poll_time $TICK * 0.1;
2527
2528	undef $Coro::AIO::WATCHER;
2529	$AIO_POLL_WATCHER = Event->io (
2530	reentrant => 0,
2531	fd => IO::AIO::poll_fileno,
2532	poll => 'r',
2533	prio => 6,
2534	data => WF_AUTOCANCEL,
2535	cb => \&IO::AIO::poll_cb,
2536	);
2537
2538	$WRITE_RUNTIME_WATCHER = Event->timer (
2539	reentrant => 0,
2540	data => WF_AUTOCANCEL,
2541	after => 1,
2542	interval => 10,
2543	prio => 6, # keep it lowest so it acts like a watchdog
2544	cb => Coro::unblock_sub {
2545	write_runtime	3725	write_runtime_sync
2546	or warn "ERROR: unable to write runtime file: $!";	3726	or warn "ERROR: unable to write runtime file: $!";
		3727	};
2547	},	3728	}
2548	);	3729
		3730	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
		3731	$sig->send;
		3732	}
		3733	while (my $sig = shift @WAIT_FOR_TICK) {
		3734	$sig->send;
		3735	}
		3736
		3737	$LOAD = ($NOW - $TICK_START) / $TICK;
		3738	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
		3739
		3740	if (0) {
		3741	if ($NEXT_TICK) {
		3742	my $jitter = $TICK_START - $NEXT_TICK;
		3743	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
		3744	warn "jitter $JITTER\n";#d#
		3745	}
		3746	}
		3747	}
		3748
		3749	{
		3750	# configure BDB
		3751
		3752	BDB::min_parallel 8;
		3753	BDB::max_poll_reqs $TICK * 0.1;
		3754	$Coro::BDB::WATCHER->priority (1);
		3755
		3756	unless ($DB_ENV) {
		3757	$DB_ENV = BDB::db_env_create;
		3758	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3759	| BDB::LOG_AUTOREMOVE, 1);
		3760	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3761	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
		3762
		3763	cf::sync_job {
		3764	eval {
		3765	BDB::db_env_open
		3766	$DB_ENV,
		3767	$BDBDIR,
		3768	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
		3769	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
		3770	0666;
		3771
		3772	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
		3773	};
		3774
		3775	cf::cleanup "db_env_open(db): $@" if $@;
		3776	};
		3777	}
		3778
		3779	$BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
		3780	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3781	};
		3782	$BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
		3783	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3784	};
		3785	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
		3786	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3787	};
		3788	}
		3789
		3790	{
		3791	# configure IO::AIO
		3792
		3793	IO::AIO::min_parallel 8;
		3794	IO::AIO::max_poll_time $TICK * 0.1;
		3795	$Coro::AIO::WATCHER->priority (1);
		3796	}
		3797
		3798	my $_log_backtrace;
		3799
		3800	sub _log_backtrace {
		3801	my ($msg, @addr) = @_;
		3802
		3803	$msg =~ s/\n//;
		3804
		3805	# limit the # of concurrent backtraces
		3806	if ($_log_backtrace < 2) {
		3807	++$_log_backtrace;
		3808	async {
		3809	$Coro::current->{desc} = "abt $msg";
		3810
		3811	my @bt = fork_call {
		3812	@addr = map { sprintf "%x", $_ } @addr;
		3813	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
		3814	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
		3815	or die "addr2line: $!";
		3816
		3817	my @funcs;
		3818	my @res = <$fh>;
		3819	chomp for @res;
		3820	while (@res) {
		3821	my ($func, $line) = splice @res, 0, 2, ();
		3822	push @funcs, "[$func] $line";
		3823	}
		3824
		3825	@funcs
		3826	};
		3827
		3828	LOG llevInfo, "[ABT] $msg\n";
		3829	LOG llevInfo, "[ABT] $_\n" for @bt;
		3830	--$_log_backtrace;
		3831	};
		3832	} else {
		3833	LOG llevInfo, "[ABT] $msg\n";
		3834	LOG llevInfo, "[ABT] [suppressed]\n";
		3835	}
		3836	}
		3837
		3838	# load additional modules
		3839	use cf::pod;
2549		3840
2550	END { cf::emergency_save }	3841	END { cf::emergency_save }
2551		3842
2552	1	3843	1
2553		3844

Diff Legend

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