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.401 by root, Mon Dec 17 06:45:53 2007 UTC vs.
Revision 1.458 by root, Sat Dec 13 20:34:37 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
		24	use 5.10.0;
3	use utf8;	25	use utf8;
4	use strict;	26	use strict "vars", "subs";
5		27
6	use Symbol;	28	use Symbol;
7	use List::Util;	29	use List::Util;
8	use Socket;	30	use Socket;
9	use EV;	31	use EV;
10	use Opcode;	32	use Opcode;
11	use Safe;	33	use Safe;
12	use Safe::Hole;	34	use Safe::Hole;
13	use Storable ();	35	use Storable ();
14		36
		37	use Guard ();
15	use Coro 4.32 ();	38	use Coro ();
16	use Coro::State;	39	use Coro::State;
17	use Coro::Handle;	40	use Coro::Handle;
18	use Coro::EV;	41	use Coro::EV;
		42	use Coro::AnyEvent;
19	use Coro::Timer;	43	use Coro::Timer;
20	use Coro::Signal;	44	use Coro::Signal;
21	use Coro::Semaphore;	45	use Coro::Semaphore;
		46	use Coro::AnyEvent;
22	use Coro::AIO;	47	use Coro::AIO;
23	use Coro::BDB;	48	use Coro::BDB 1.6;
24	use Coro::Storable;	49	use Coro::Storable;
25	use Coro::Util ();	50	use Coro::Util ();
26		51
27	use JSON::XS 2.01 ();	52	use JSON::XS 2.01 ();
28	use BDB ();	53	use BDB ();
29	use Data::Dumper;	54	use Data::Dumper;
30	use Digest::MD5;	55	use Digest::MD5;
31	use Fcntl;	56	use Fcntl;
32	use YAML::Syck ();	57	use YAML ();
33	use IO::AIO 2.51 ();	58	use IO::AIO ();
34	use Time::HiRes;	59	use Time::HiRes;
35	use Compress::LZF;	60	use Compress::LZF;
36	use Digest::MD5 ();	61	use Digest::MD5 ();
		62
		63	AnyEvent::detect;
37		64
38	# configure various modules to our taste	65	# configure various modules to our taste
39	#	66	#
40	$Storable::canonical = 1; # reduce rsync transfers	67	$Storable::canonical = 1; # reduce rsync transfers
41	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	68	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
		69
		70	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
		71
		72	# make sure c-lzf reinitialises itself
		73	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
42	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	74	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
43
44	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45	$YAML::Syck::ImplicitUnicode = 1;
46
47	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48		75
49	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	76	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50		77
51	our %COMMAND = ();	78	our %COMMAND = ();
52	our %COMMAND_TIME = ();	79	our %COMMAND_TIME = ();
…		…
55	our %EXTCMD = ();	82	our %EXTCMD = ();
56	our %EXTICMD = ();	83	our %EXTICMD = ();
57	our %EXT_CORO = (); # coroutines bound to extensions	84	our %EXT_CORO = (); # coroutines bound to extensions
58	our %EXT_MAP = (); # pluggable maps	85	our %EXT_MAP = (); # pluggable maps
59		86
60	our $RELOAD; # number of reloads so far	87	our $RELOAD; # number of reloads so far, non-zero while in reload
61	our @EVENT;	88	our @EVENT;
62		89
63	our $CONFDIR = confdir;	90	our $CONFDIR = confdir;
64	our $DATADIR = datadir;	91	our $DATADIR = datadir;
65	our $LIBDIR = "$DATADIR/ext";	92	our $LIBDIR = "$DATADIR/ext";
66	our $PODDIR = "$DATADIR/pod";	93	our $PODDIR = "$DATADIR/pod";
67	our $MAPDIR = "$DATADIR/" . mapdir;	94	our $MAPDIR = "$DATADIR/" . mapdir;
68	our $LOCALDIR = localdir;	95	our $LOCALDIR = localdir;
69	our $TMPDIR = "$LOCALDIR/" . tmpdir;	96	our $TMPDIR = "$LOCALDIR/" . tmpdir;
70	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	97	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	98	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72	our $RANDOMDIR = "$LOCALDIR/random";	99	our $RANDOMDIR = "$LOCALDIR/random";
73	our $BDBDIR = "$LOCALDIR/db";	100	our $BDBDIR = "$LOCALDIR/db";
		101	our $PIDFILE = "$LOCALDIR/pid";
		102	our $RUNTIMEFILE = "$LOCALDIR/runtime";
		103
		104	our %RESOURCE;
74		105
75	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	106	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76	our $TICK_WATCHER;
77	our $AIO_POLL_WATCHER;
78	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	107	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79	our $NEXT_TICK;	108	our $NEXT_TICK;
80	our $USE_FSYNC = 1; # use fsync to write maps - default off	109	our $USE_FSYNC = 1; # use fsync to write maps - default off
81		110
82	our $BDB_POLL_WATCHER;
83	our $BDB_DEADLOCK_WATCHER;	111	our $BDB_DEADLOCK_WATCHER;
84	our $BDB_CHECKPOINT_WATCHER;	112	our $BDB_CHECKPOINT_WATCHER;
85	our $BDB_TRICKLE_WATCHER;	113	our $BDB_TRICKLE_WATCHER;
86	our $DB_ENV;	114	our $DB_ENV;
87		115
…		…
98	# used to convert map paths into valid unix filenames by replacing / by ∕	126	# used to convert map paths into valid unix filenames by replacing / by ∕
99	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	127	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100		128
101	our $LOAD; # a number between 0 (idle) and 1 (too many objects)	129	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102	our $LOADAVG; # same thing, but with alpha-smoothing	130	our $LOADAVG; # same thing, but with alpha-smoothing
		131	our $JITTER; # average jitter
103	our $tick_start; # for load detecting purposes	132	our $TICK_START; # for load detecting purposes
		133
		134	our @POST_INIT;
		135
		136	our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
104		137
105	binmode STDOUT;	138	binmode STDOUT;
106	binmode STDERR;	139	binmode STDERR;
107		140
108	# read virtual server time, if available	141	# read virtual server time, if available
109	unless ($RUNTIME || !-e "$LOCALDIR/runtime") {	142	unless ($RUNTIME || !-e $RUNTIMEFILE) {
110	open my $fh, "<", "$LOCALDIR/runtime"	143	open my $fh, "<", $RUNTIMEFILE
111	or die "unable to read runtime file: $!";	144	or die "unable to read $RUNTIMEFILE file: $!";
112	$RUNTIME = <$fh> + 0.;	145	$RUNTIME = <$fh> + 0.;
113	}	146	}
114		147
115	mkdir $_	148	mkdir $_
116	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	149	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
…		…
192	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	225	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
193		226
194	LOG llevError, $msg;	227	LOG llevError, $msg;
195	};	228	};
196	}	229	}
		230
		231	$Coro::State::DIEHOOK = sub {
		232	return unless $^S eq 0; # "eq", not "=="
		233
		234	if ($Coro::current == $Coro::main) {#d#
		235	warn "DIEHOOK called in main context, Coro bug?\n";#d#
		236	return;#d#
		237	}#d#
		238
		239	# kill coroutine otherwise
		240	warn Carp::longmess $_[0];
		241	Coro::terminate
		242	};
		243
		244	$SIG{__DIE__} = sub { }; #d#?
197		245
198	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	246	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	247	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	248	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	249	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
208	for my $pkg (qw(	256	for my $pkg (qw(
209	cf::global cf::attachable	257	cf::global cf::attachable
210	cf::object cf::object::player	258	cf::object cf::object::player
211	cf::client cf::player	259	cf::client cf::player
212	cf::arch cf::living	260	cf::arch cf::living
		261	cf::map cf::mapspace
213	cf::map cf::party cf::region	262	cf::party cf::region
214	)) {	263	)) {
215	no strict 'refs';
216	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	264	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217	}	265	}
218		266
219	$EV::DIED = sub {	267	$EV::DIED = sub {
220	warn "error in event callback: @_";	268	warn "error in event callback: @_";
…		…
262	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	310	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
263		311
264	sub encode_json($) { $json_coder->encode ($_[0]) }	312	sub encode_json($) { $json_coder->encode ($_[0]) }
265	sub decode_json($) { $json_coder->decode ($_[0]) }	313	sub decode_json($) { $json_coder->decode ($_[0]) }
266		314
		315	=item cf::post_init { BLOCK }
		316
		317	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
		318	but I<before> the server starts ticking again.
		319
		320	The cdoeblock will have a single boolean argument to indicate whether this
		321	is a reload or not.
		322
		323	=cut
		324
		325	sub post_init(&) {
		326	push @POST_INIT, shift;
		327	}
		328
267	=item cf::lock_wait $string	329	=item cf::lock_wait $string
268		330
269	Wait until the given lock is available. See cf::lock_acquire.	331	Wait until the given lock is available. See cf::lock_acquire.
270		332
271	=item my $lock = cf::lock_acquire $string	333	=item my $lock = cf::lock_acquire $string
272		334
273	Wait until the given lock is available and then acquires it and returns	335	Wait until the given lock is available and then acquires it and returns
274	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	336	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
275	for example when the coroutine gets canceled), the lock is automatically	337	for example when the coroutine gets canceled), the lock is automatically
276	returned.	338	returned.
277		339
278	Locks are *not* recursive, locking from the same coro twice results in a	340	Locks are *not* recursive, locking from the same coro twice results in a
279	deadlocked coro.	341	deadlocked coro.
…		…
298	return;#d#	360	return;#d#
299	}#d#	361	}#d#
300		362
301	# wait for lock, if any	363	# wait for lock, if any
302	while ($LOCK{$key}) {	364	while ($LOCK{$key}) {
		365	#local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
303	push @{ $LOCK{$key} }, $Coro::current;	366	push @{ $LOCK{$key} }, $Coro::current;
304	Coro::schedule;	367	Coro::schedule;
305	}	368	}
306	}	369	}
307		370
…		…
312	lock_wait $key;	375	lock_wait $key;
313		376
314	$LOCK{$key} = [];	377	$LOCK{$key} = [];
315	$LOCKER{$key} = $Coro::current;#d#	378	$LOCKER{$key} = $Coro::current;#d#
316		379
317	Coro::guard {	380	Guard::guard {
318	delete $LOCKER{$key};#d#	381	delete $LOCKER{$key};#d#
319	# wake up all waiters, to be on the safe side	382	# wake up all waiters, to be on the safe side
320	$_->ready for @{ delete $LOCK{$key} };	383	$_->ready for @{ delete $LOCK{$key} };
321	}	384	}
322	}	385	}
…		…
326		389
327	! ! $LOCK{$key}	390	! ! $LOCK{$key}
328	}	391	}
329		392
330	sub freeze_mainloop {	393	sub freeze_mainloop {
331	return unless $TICK_WATCHER->is_active;	394	tick_inhibit_inc;
332		395
333	my $guard = Coro::guard {	396	&Guard::guard (\&tick_inhibit_dec);
334	$TICK_WATCHER->start;
335	};
336	$TICK_WATCHER->stop;
337	$guard
338	}	397	}
339		398
340	=item cf::periodic $interval, $cb	399	=item cf::periodic $interval, $cb
341		400
342	Like EV::periodic, but randomly selects a starting point so that the actions	401	Like EV::periodic, but randomly selects a starting point so that the actions
…		…
397	}	456	}
398	}	457	}
399	};	458	};
400		459
401	sub get_slot($;$$) {	460	sub get_slot($;$$) {
		461	return if tick_inhibit || $Coro::current == $Coro::main;
		462
402	my ($time, $pri, $name) = @_;	463	my ($time, $pri, $name) = @_;
403		464
404	$time = $TICK * .6 if $time > $TICK * .6;	465	$time = $TICK * .6 if $time > $TICK * .6;
405	my $sig = new Coro::Signal;	466	my $sig = new Coro::Signal;
406		467
…		…
443	# this is the main coro, too bad, we have to block	504	# this is the main coro, too bad, we have to block
444	# till the operation succeeds, freezing the server :/	505	# till the operation succeeds, freezing the server :/
445		506
446	LOG llevError, Carp::longmess "sync job";#d#	507	LOG llevError, Carp::longmess "sync job";#d#
447		508
448	# TODO: use suspend/resume instead
449	# (but this is cancel-safe)
450	my $freeze_guard = freeze_mainloop;	509	my $freeze_guard = freeze_mainloop;
451		510
452	my $busy = 1;	511	my $busy = 1;
453	my @res;	512	my @res;
454		513
…		…
465	} else {	524	} else {
466	EV::loop EV::LOOP_ONESHOT;	525	EV::loop EV::LOOP_ONESHOT;
467	}	526	}
468	}	527	}
469		528
470	$time = EV::time - $time;	529	my $time = EV::time - $time;
471		530
472	LOG llevError | logBacktrace, Carp::longmess "long sync job"
473	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
474
475	$tick_start += $time; # do not account sync jobs to server load	531	$TICK_START += $time; # do not account sync jobs to server load
476		532
477	wantarray ? @res : $res[0]	533	wantarray ? @res : $res[0]
478	} else {	534	} else {
479	# we are in another coroutine, how wonderful, everything just works	535	# we are in another coroutine, how wonderful, everything just works
480		536
…		…
522	reset_signals;	578	reset_signals;
523	&$cb	579	&$cb
524	}, @args;	580	}, @args;
525		581
526	wantarray ? @res : $res[-1]	582	wantarray ? @res : $res[-1]
		583	}
		584
		585	=item $coin = coin_from_name $name
		586
		587	=cut
		588
		589	our %coin_alias = (
		590	"silver" => "silvercoin",
		591	"silvercoin" => "silvercoin",
		592	"silvercoins" => "silvercoin",
		593	"gold" => "goldcoin",
		594	"goldcoin" => "goldcoin",
		595	"goldcoins" => "goldcoin",
		596	"platinum" => "platinacoin",
		597	"platinumcoin" => "platinacoin",
		598	"platinumcoins" => "platinacoin",
		599	"platina" => "platinacoin",
		600	"platinacoin" => "platinacoin",
		601	"platinacoins" => "platinacoin",
		602	"royalty" => "royalty",
		603	"royalties" => "royalty",
		604	);
		605
		606	sub coin_from_name($) {
		607	$coin_alias{$_[0]}
		608	? cf::arch::find $coin_alias{$_[0]}
		609	: undef
527	}	610	}
528		611
529	=item $value = cf::db_get $family => $key	612	=item $value = cf::db_get $family => $key
530		613
531	Returns a single value from the environment database.	614	Returns a single value from the environment database.
…		…
670		753
671	#############################################################################	754	#############################################################################
672		755
673	=head2 ATTACHABLE OBJECTS	756	=head2 ATTACHABLE OBJECTS
674		757
675	Many objects in crossfire are so-called attachable objects. That means you can	758	Many objects in deliantra are so-called attachable objects. That means you can
676	attach callbacks/event handlers (a collection of which is called an "attachment")	759	attach callbacks/event handlers (a collection of which is called an "attachment")
677	to it. All such attachable objects support the following methods.	760	to it. All such attachable objects support the following methods.
678		761
679	In the following description, CLASS can be any of C<global>, C<object>	762	In the following description, CLASS can be any of C<global>, C<object>
680	C<player>, C<client> or C<map> (i.e. the attachable objects in	763	C<player>, C<client> or C<map> (i.e. the attachable objects in
…		…
730	=item cf::CLASS::attachment $name, ...	813	=item cf::CLASS::attachment $name, ...
731		814
732	Register an attachment by C<$name> through which attachable objects of the	815	Register an attachment by C<$name> through which attachable objects of the
733	given CLASS can refer to this attachment.	816	given CLASS can refer to this attachment.
734		817
735	Some classes such as crossfire maps and objects can specify attachments	818	Some classes such as deliantra maps and objects can specify attachments
736	that are attached at load/instantiate time, thus the need for a name.	819	that are attached at load/instantiate time, thus the need for a name.
737		820
738	These calls expect any number of the following handler/hook descriptions:	821	These calls expect any number of the following handler/hook descriptions:
739		822
740	=over 4	823	=over 4
…		…
968	}	1051	}
969		1052
970	0	1053	0
971	}	1054	}
972		1055
973	=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...)	1056	=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
974		1057
975	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)	1058	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
976		1059
977	Generate an object-specific event with the given arguments.	1060	Generate an object-specific event with the given arguments.
978		1061
…		…
1031		1114
1032	sub reattach {	1115	sub reattach {
1033	# basically do the same as instantiate, without calling instantiate	1116	# basically do the same as instantiate, without calling instantiate
1034	my ($obj) = @_;	1117	my ($obj) = @_;
1035		1118
		1119	# no longer needed after getting rid of delete_package?
1036	bless $obj, ref $obj; # re-bless in case extensions have been reloaded	1120	#bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1037		1121
1038	my $registry = $obj->registry;	1122	my $registry = $obj->registry;
1039		1123
1040	@$registry = ();	1124	@$registry = ();
1041		1125
…		…
1087	utf8::decode (my $decname = $filename);	1171	utf8::decode (my $decname = $filename);
1088	warn sprintf "saving %s (%d,%d)\n",	1172	warn sprintf "saving %s (%d,%d)\n",
1089	$decname, length $$rdata, scalar @$objs;	1173	$decname, length $$rdata, scalar @$objs;
1090		1174
1091	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1175	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1092	chmod SAVE_MODE, $fh;	1176	aio_chmod $fh, SAVE_MODE;
1093	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1177	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1094	aio_fsync $fh if $cf::USE_FSYNC;	1178	aio_fsync $fh if $cf::USE_FSYNC;
1095	close $fh;	1179	aio_close $fh;
1096		1180
1097	if (@$objs) {	1181	if (@$objs) {
1098	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1182	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1099	chmod SAVE_MODE, $fh;	1183	aio_chmod $fh, SAVE_MODE;
1100	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1184	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1101	aio_write $fh, 0, (length $data), $data, 0;	1185	aio_write $fh, 0, (length $data), $data, 0;
1102	aio_fsync $fh if $cf::USE_FSYNC;	1186	aio_fsync $fh if $cf::USE_FSYNC;
1103	close $fh;	1187	aio_close $fh;
1104	aio_rename "$filename.pst~", "$filename.pst";	1188	aio_rename "$filename.pst~", "$filename.pst";
1105	}	1189	}
1106	} else {	1190	} else {
1107	aio_unlink "$filename.pst";	1191	aio_unlink "$filename.pst";
1108	}	1192	}
1109		1193
1110	aio_rename "$filename~", $filename;	1194	aio_rename "$filename~", $filename;
		1195
		1196	$filename =~ s%/[^/]+$%%;
		1197	aio_pathsync $filename if $cf::USE_FSYNC;
1111	} else {	1198	} else {
1112	warn "FATAL: $filename~: $!\n";	1199	warn "FATAL: $filename~: $!\n";
1113	}	1200	}
1114	} else {	1201	} else {
1115	aio_unlink $filename;	1202	aio_unlink $filename;
…		…
1208	my ($name, $cb) = @_;	1295	my ($name, $cb) = @_;
1209		1296
1210	$EXTICMD{$name} = $cb;	1297	$EXTICMD{$name} = $cb;
1211	}	1298	}
1212		1299
		1300	use File::Glob ();
		1301
1213	cf::player->attach (	1302	cf::player->attach (
1214	on_command => sub {	1303	on_command => sub {
1215	my ($pl, $name, $params) = @_;	1304	my ($pl, $name, $params) = @_;
1216		1305
1217	my $cb = $COMMAND{$name}	1306	my $cb = $COMMAND{$name}
…		…
1249		1338
1250	cf::override;	1339	cf::override;
1251	},	1340	},
1252	);	1341	);
1253		1342
		1343	# "readahead" all extensions
		1344	sub cache_extensions {
		1345	my $grp = IO::AIO::aio_group;
		1346
		1347	add $grp IO::AIO::aio_readdir $LIBDIR, sub {
		1348	for (grep /\.ext$/, @{$_[0]}) {
		1349	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
		1350	}
		1351	};
		1352
		1353	$grp
		1354	}
		1355
1254	sub load_extensions {	1356	sub load_extensions {
1255	cf::sync_job {	1357	cf::sync_job {
1256	my %todo;	1358	my %todo;
1257		1359
1258	for my $path (<$LIBDIR/*.ext>) {	1360	for my $path (<$LIBDIR/*.ext>) {
…		…
1277		1379
1278	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1380	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1279	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1381	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1280		1382
1281	$ext{source} =	1383	$ext{source} =
1282	"package $pkg; use strict; use utf8;\n"	1384	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1283	. "#line 1 \"$path\"\n{\n"	1385	. "#line 1 \"$path\"\n{\n"
1284	. $source	1386	. $source
1285	. "\n};\n1";	1387	. "\n};\n1";
1286		1388
1287	$todo{$base} = \%ext;	1389	$todo{$base} = \%ext;
…		…
1303	my $msg = $@ ? "$v->{path}: $@\n"	1405	my $msg = $@ ? "$v->{path}: $@\n"
1304	: "$v->{base}: extension inactive.\n";	1406	: "$v->{base}: extension inactive.\n";
1305		1407
1306	if (exists $v->{meta}{mandatory}) {	1408	if (exists $v->{meta}{mandatory}) {
1307	warn $msg;	1409	warn $msg;
1308	warn "mandatory extension failed to load, exiting.\n";	1410	cf::cleanup "mandatory extension failed to load, exiting.";
1309	exit 1;
1310	}	1411	}
1311		1412
1312	warn $msg;	1413	warn $msg;
1313	}	1414	}
1314		1415
…		…
1328		1429
1329	=back	1430	=back
1330		1431
1331	=head2 CORE EXTENSIONS	1432	=head2 CORE EXTENSIONS
1332		1433
1333	Functions and methods that extend core crossfire objects.	1434	Functions and methods that extend core deliantra objects.
1334		1435
1335	=cut	1436	=cut
1336		1437
1337	package cf::player;	1438	package cf::player;
1338		1439
…		…
1381		1482
1382	sub exists($) {	1483	sub exists($) {
1383	my ($login) = @_;	1484	my ($login) = @_;
1384		1485
1385	$cf::PLAYER{$login}	1486	$cf::PLAYER{$login}
1386	or cf::sync_job { !aio_stat path $login }	1487	or !aio_stat path $login
1387	}	1488	}
1388		1489
1389	sub find($) {	1490	sub find($) {
1390	return $cf::PLAYER{$_[0]} || do {	1491	return $cf::PLAYER{$_[0]} || do {
1391	my $login = $_[0];	1492	my $login = $_[0];
…		…
1403	my $f = new_from_file cf::object::thawer path $login	1504	my $f = new_from_file cf::object::thawer path $login
1404	or return;	1505	or return;
1405		1506
1406	my $pl = cf::player::load_pl $f	1507	my $pl = cf::player::load_pl $f
1407	or return;	1508	or return;
		1509
1408	local $cf::PLAYER_LOADING{$login} = $pl;	1510	local $cf::PLAYER_LOADING{$login} = $pl;
1409	$f->resolve_delayed_derefs;	1511	$f->resolve_delayed_derefs;
1410	$cf::PLAYER{$login} = $pl	1512	$cf::PLAYER{$login} = $pl
1411	}	1513	}
1412	}	1514	}
…		…
1422		1524
1423	return if $pl->{deny_save};	1525	return if $pl->{deny_save};
1424		1526
1425	aio_mkdir playerdir $pl, 0770;	1527	aio_mkdir playerdir $pl, 0770;
1426	$pl->{last_save} = $cf::RUNTIME;	1528	$pl->{last_save} = $cf::RUNTIME;
		1529
		1530	cf::get_slot 0.01;
1427		1531
1428	$pl->save_pl ($path);	1532	$pl->save_pl ($path);
1429	cf::cede_to_tick;	1533	cf::cede_to_tick;
1430	}	1534	}
1431		1535
…		…
1463	my ($pl) = @_;	1567	my ($pl) = @_;
1464		1568
1465	my $name = $pl->ob->name;	1569	my $name = $pl->ob->name;
1466		1570
1467	$pl->{deny_save} = 1;	1571	$pl->{deny_save} = 1;
1468	$pl->password ("*"); # this should lock out the player until we nuked the dir	1572	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1469		1573
1470	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1574	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1471	$pl->deactivate;	1575	$pl->deactivate;
		1576	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
		1577	$pl->ob->check_score;
1472	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1578	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1473	$pl->ns->destroy if $pl->ns;	1579	$pl->ns->destroy if $pl->ns;
1474		1580
1475	my $path = playerdir $pl;	1581	my $path = playerdir $pl;
1476	my $temp = "$path~$cf::RUNTIME~deleting~";	1582	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1515		1621
1516	for my $login (@$dirs) {	1622	for my $login (@$dirs) {
1517	my $path = path $login;	1623	my $path = path $login;
1518		1624
1519	# a .pst is a dead give-away for a valid player	1625	# a .pst is a dead give-away for a valid player
1520	unless (-e "$path.pst") {	1626	# if no pst file found, open and chekc for blocked users
		1627	if (aio_stat "$path.pst") {
1521	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;	1628	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1522	aio_read $fh, 0, 512, my $buf, 0 or next;	1629	aio_read $fh, 0, 512, my $buf, 0 or next;
1523	$buf !~ /^password -------------$/m or next; # official not-valid tag	1630	$buf !~ /^password -------------$/m or next; # official not-valid tag
1524	}	1631	}
1525		1632
…		…
1556	}	1663	}
1557		1664
1558	\@paths	1665	\@paths
1559	}	1666	}
1560		1667
1561	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)	1668	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1562		1669
1563	Expand crossfire pod fragments into protocol xml.	1670	Expand deliantra pod fragments into protocol xml.
1564
1565	=cut
1566
1567	use re 'eval';
1568
1569	my $group;
1570	my $interior; $interior = qr{
1571	# match a pod interior sequence sans C<< >>
1572	(?:
1573	\ (.*?)\ (?{ $group = $^N })
1574	| < (??{$interior}) >
1575	)
1576	}x;
1577
1578	sub expand_cfpod {
1579	my ($self, $pod) = @_;
1580
1581	my $xml;
1582
1583	while () {
1584	if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1585	$group = $1;
1586
1587	$group =~ s/&/&amp;/g;
1588	$group =~ s/</&lt;/g;
1589
1590	$xml .= $group;
1591	} elsif ($pod =~ m%\G
1592	([BCGHITU])
1593	<
1594	(?:
1595	([^<>]*) (?{ $group = $^N })
1596	| < $interior >
1597	)
1598	>
1599	%gcsx
1600	) {
1601	my ($code, $data) = ($1, $group);
1602
1603	if ($code eq "B") {
1604	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1605	} elsif ($code eq "I") {
1606	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1607	} elsif ($code eq "U") {
1608	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1609	} elsif ($code eq "C") {
1610	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1611	} elsif ($code eq "T") {
1612	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1613	} elsif ($code eq "G") {
1614	my ($male, $female) = split /\|/, $data;
1615	$data = $self->gender ? $female : $male;
1616	$xml .= expand_cfpod ($self, $data);
1617	} elsif ($code eq "H") {
1618	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1619	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1620	"")
1621	[$self->{hintmode}];
1622	} else {
1623	$xml .= "error processing '$code($data)' directive";
1624	}
1625	} else {
1626	if ($pod =~ /\G(.+)/) {
1627	warn "parse error while expanding $pod (at $1)";
1628	}
1629	last;
1630	}
1631	}
1632
1633	for ($xml) {
1634	# create single paragraphs (very hackish)
1635	s/(?<=\S)\n(?=\w)/ /g;
1636
1637	# compress some whitespace
1638	s/\s+\n/\n/g; # ws line-ends
1639	s/\n\n+/\n/g; # double lines
1640	s/^\n+//; # beginning lines
1641	s/\n+$//; # ending lines
1642	}
1643
1644	$xml
1645	}
1646
1647	no re 'eval';
1648
1649	sub hintmode {
1650	$_[0]{hintmode} = $_[1] if @_ > 1;
1651	$_[0]{hintmode}
1652	}
1653		1671
1654	=item $player->ext_reply ($msgid, @msg)	1672	=item $player->ext_reply ($msgid, @msg)
1655		1673
1656	Sends an ext reply to the player.	1674	Sends an ext reply to the player.
1657		1675
…		…
1724	our $MAX_RESET = 3600;	1742	our $MAX_RESET = 3600;
1725	our $DEFAULT_RESET = 3000;	1743	our $DEFAULT_RESET = 3000;
1726		1744
1727	sub generate_random_map {	1745	sub generate_random_map {
1728	my ($self, $rmp) = @_;	1746	my ($self, $rmp) = @_;
		1747
		1748	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
		1749
1729	# mit "rum" bekleckern, nicht	1750	# mit "rum" bekleckern, nicht
1730	$self->_create_random_map (	1751	$self->_create_random_map (
1731	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1752	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1753	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1733	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1754	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
…		…
1855		1876
1856	# the temporary/swap location	1877	# the temporary/swap location
1857	sub save_path {	1878	sub save_path {
1858	my ($self) = @_;	1879	my ($self) = @_;
1859		1880
1860	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1881	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1861	"$TMPDIR/$path.map"	1882	"$TMPDIR/$path.map"
1862	}	1883	}
1863		1884
1864	# the unique path, undef == no special unique path	1885	# the unique path, undef == no special unique path
1865	sub uniq_path {	1886	sub uniq_path {
1866	my ($self) = @_;	1887	my ($self) = @_;
1867		1888
1868	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1889	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869	"$UNIQUEDIR/$path"	1890	"$UNIQUEDIR/$path"
1870	}	1891	}
1871		1892
1872	# and all this just because we cannot iterate over	1893	# and all this just because we cannot iterate over
1873	# all maps in C++...	1894	# all maps in C++...
…		…
1971		1992
1972	cf::lock_wait "map_data:$path";#d#remove	1993	cf::lock_wait "map_data:$path";#d#remove
1973	cf::lock_wait "map_find:$path";	1994	cf::lock_wait "map_find:$path";
1974		1995
1975	$cf::MAP{$path} || do {	1996	$cf::MAP{$path} || do {
1976	my $guard1 = cf::lock_acquire "map_find:$path";
1977	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it	1997	my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1998	my $guard2 = cf::lock_acquire "map_find:$path";
1978		1999
1979	my $map = new_from_path cf::map $path	2000	my $map = new_from_path cf::map $path
1980	or return;	2001	or return;
1981		2002
1982	$map->{last_save} = $cf::RUNTIME;	2003	$map->{last_save} = $cf::RUNTIME;
…		…
1985	or return;	2006	or return;
1986		2007
1987	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	2008	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1988	# doing this can freeze the server in a sync job, obviously	2009	# doing this can freeze the server in a sync job, obviously
1989	#$cf::WAIT_FOR_TICK->wait;	2010	#$cf::WAIT_FOR_TICK->wait;
		2011	undef $guard2;
1990	undef $guard1;	2012	undef $guard1;
1991	undef $guard2;
1992	$map->reset;	2013	$map->reset;
1993	return find $path;	2014	return find $path;
1994	}	2015	}
1995		2016
1996	$cf::MAP{$path} = $map	2017	$cf::MAP{$path} = $map
…		…
2023	my $f = new_from_file cf::object::thawer $self->{load_path};	2044	my $f = new_from_file cf::object::thawer $self->{load_path};
2024	$f->skip_block;	2045	$f->skip_block;
2025	$self->_load_objects ($f)	2046	$self->_load_objects ($f)
2026	or return;	2047	or return;
2027		2048
2028	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2049	$self->post_load_original
2029	if delete $self->{load_original};	2050	if delete $self->{load_original};
2030		2051
2031	if (my $uniq = $self->uniq_path) {	2052	if (my $uniq = $self->uniq_path) {
2032	utf8::encode $uniq;	2053	utf8::encode $uniq;
2033	unless (aio_stat $uniq) {	2054	unless (aio_stat $uniq) {
…		…
2059	}	2080	}
2060		2081
2061	$self->{last_save} = $cf::RUNTIME;	2082	$self->{last_save} = $cf::RUNTIME;
2062	$self->last_access ($cf::RUNTIME);	2083	$self->last_access ($cf::RUNTIME);
2063		2084
2064	$self->in_memory (cf::MAP_IN_MEMORY);	2085	$self->in_memory (cf::MAP_ACTIVE);
2065	}	2086	}
2066		2087
2067	$self->post_load;	2088	$self->post_load;
2068	}	2089	}
2069		2090
…		…
2127	my ($path, $origin, $load) = @_;	2148	my ($path, $origin, $load) = @_;
2128		2149
2129	$path = normalise $path, $origin && $origin->{path};	2150	$path = normalise $path, $origin && $origin->{path};
2130		2151
2131	if (my $map = $cf::MAP{$path}) {	2152	if (my $map = $cf::MAP{$path}) {
2132	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;	2153	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2133	}	2154	}
2134		2155
2135	$MAP_PREFETCH{$path} |= $load;	2156	$MAP_PREFETCH{$path} |= $load;
2136		2157
2137	$MAP_PREFETCHER ||= cf::async {	2158	$MAP_PREFETCHER ||= cf::async {
…		…
2174	cf::async {	2195	cf::async {
2175	$Coro::current->{desc} = "map player save";	2196	$Coro::current->{desc} = "map player save";
2176	$_->contr->save for $self->players;	2197	$_->contr->save for $self->players;
2177	};	2198	};
2178		2199
		2200	cf::get_slot 0.02;
		2201
2179	if ($uniq) {	2202	if ($uniq) {
2180	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2203	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2181	$self->_save_objects ($uniq, cf::IO_UNIQUES);	2204	$self->_save_objects ($uniq, cf::IO_UNIQUES);
2182	} else {	2205	} else {
2183	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2206	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
…		…
2191	$self->save;	2214	$self->save;
2192		2215
2193	my $lock = cf::lock_acquire "map_data:$self->{path}";	2216	my $lock = cf::lock_acquire "map_data:$self->{path}";
2194		2217
2195	return if $self->players;	2218	return if $self->players;
2196	return if $self->in_memory != cf::MAP_IN_MEMORY;	2219	return if $self->in_memory != cf::MAP_ACTIVE;
2197	return if $self->{deny_save};	2220	return if $self->{deny_save};
2198		2221
2199	$self->in_memory (cf::MAP_SWAPPED);	2222	$self->in_memory (cf::MAP_SWAPPED);
2200		2223
2201	$self->deactivate;	2224	$self->deactivate;
…		…
2319		2342
2320	sub unique_maps() {	2343	sub unique_maps() {
2321	[	2344	[
2322	map {	2345	map {
2323	utf8::decode $_;	2346	utf8::decode $_;
2324	/\.map$/	2347	s/\.map$//; # TODO future compatibility hack
		2348	/\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
		2349	? ()
2325	? normalise $_	2350	: normalise $_
2326	: ()
2327	} @{ aio_readdir $UNIQUEDIR or [] }	2351	} @{ aio_readdir $UNIQUEDIR or [] }
2328	]	2352	]
2329	}	2353	}
2330		2354
2331	package cf;
2332
2333	=back	2355	=back
2334		2356
2335	=head3 cf::object	2357	=head3 cf::object
2336		2358
2337	=cut	2359	=cut
…		…
2340		2362
2341	=over 4	2363	=over 4
2342		2364
2343	=item $ob->inv_recursive	2365	=item $ob->inv_recursive
2344		2366
2345	Returns the inventory of the object _and_ their inventories, recursively.	2367	Returns the inventory of the object I<and> their inventories, recursively,
		2368	but I<not> the object itself.
2346		2369
2347	=cut	2370	=cut
2348		2371
2349	sub inv_recursive_;	2372	sub inv_recursive_;
2350	sub inv_recursive_ {	2373	sub inv_recursive_ {
…		…
2355	inv_recursive_ inv $_[0]	2378	inv_recursive_ inv $_[0]
2356	}	2379	}
2357		2380
2358	=item $ref = $ob->ref	2381	=item $ref = $ob->ref
2359		2382
2360	creates and returns a persistent reference to an objetc that can be stored as a string.	2383	Creates and returns a persistent reference to an object that can be stored as a string.
2361		2384
2362	=item $ob = cf::object::deref ($refstring)	2385	=item $ob = cf::object::deref ($refstring)
2363		2386
2364	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2387	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2365	even if the object actually exists. May block.	2388	even if the object actually exists. May block.
…		…
2397	can be C<undef>. Does the right thing when the player is currently in a	2420	can be C<undef>. Does the right thing when the player is currently in a
2398	dialogue with the given NPC character.	2421	dialogue with the given NPC character.
2399		2422
2400	=cut	2423	=cut
2401		2424
		2425	our $SAY_CHANNEL = {
		2426	id => "say",
		2427	title => "Map",
		2428	reply => "say ",
		2429	tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
		2430	};
		2431
		2432	our $CHAT_CHANNEL = {
		2433	id => "chat",
		2434	title => "Chat",
		2435	reply => "chat ",
		2436	tooltip => "Player chat and shouts, global to the server.",
		2437	};
		2438
2402	# rough implementation of a future "reply" method that works	2439	# rough implementation of a future "reply" method that works
2403	# with dialog boxes.	2440	# with dialog boxes.
2404	#TODO: the first argument must go, split into a $npc->reply_to ( method	2441	#TODO: the first argument must go, split into a $npc->reply_to ( method
2405	sub cf::object::player::reply($$$;$) {	2442	sub cf::object::player::reply($$$;$) {
2406	my ($self, $npc, $msg, $flags) = @_;	2443	my ($self, $npc, $msg, $flags) = @_;
…		…
2417	my $dialog = $pl->{npc_dialog};	2454	my $dialog = $pl->{npc_dialog};
2418	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));	2455	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2419		2456
2420	} else {	2457	} else {
2421	$msg = $npc->name . " says: $msg" if $npc;	2458	$msg = $npc->name . " says: $msg" if $npc;
2422	$self->message ($msg, $flags);	2459	$self->send_msg ($SAY_CHANNEL => $msg, $flags);
2423	}	2460	}
2424	}	2461	}
2425	}	2462	}
2426		2463
2427	=item $object->send_msg ($channel, $msg, $color, [extra...])	2464	=item $object->send_msg ($channel, $msg, $color, [extra...])
…		…
2452		2489
2453	=item $player_object->enter_link	2490	=item $player_object->enter_link
2454		2491
2455	Freezes the player and moves him/her to a special map (C<{link}>).	2492	Freezes the player and moves him/her to a special map (C<{link}>).
2456		2493
2457	The player should be reasonably safe there for short amounts of time. You	2494	The player should be reasonably safe there for short amounts of time (e.g.
2458	I<MUST> call C<leave_link> as soon as possible, though.	2495	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
		2496	though, as the palyer cannot control the character while it is on the link
		2497	map.
2459		2498
2460	Will never block.	2499	Will never block.
2461		2500
2462	=item $player_object->leave_link ($map, $x, $y)	2501	=item $player_object->leave_link ($map, $x, $y)
2463		2502
…		…
2521		2560
2522	$map->load;	2561	$map->load;
2523	$map->load_neighbours;	2562	$map->load_neighbours;
2524		2563
2525	return unless $self->contr->active;	2564	return unless $self->contr->active;
		2565	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2526	$self->activate_recursive;	2566	$self->activate_recursive;
2527		2567
2528	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2568	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529	$self->enter_map ($map, $x, $y);	2569	$self->enter_map ($map, $x, $y);
2530	}	2570	}
…		…
2534	Moves the player to the given map-path and coordinates by first freezing	2574	Moves the player to the given map-path and coordinates by first freezing
2535	her, loading and preparing them map, calling the provided $check callback	2575	her, loading and preparing them map, calling the provided $check callback
2536	that has to return the map if sucecssful, and then unfreezes the player on	2576	that has to return the map if sucecssful, and then unfreezes the player on
2537	the new (success) or old (failed) map position. In either case, $done will	2577	the new (success) or old (failed) map position. In either case, $done will
2538	be called at the end of this process.	2578	be called at the end of this process.
		2579
		2580	Note that $check will be called with a potentially non-loaded map, so if
		2581	it needs a loaded map it has to call C<< ->load >>.
2539		2582
2540	=cut	2583	=cut
2541		2584
2542	our $GOTOGEN;	2585	our $GOTOGEN;
2543		2586
…		…
2622	}	2665	}
2623		2666
2624	sub prepare_random_map {	2667	sub prepare_random_map {
2625	my ($exit) = @_;	2668	my ($exit) = @_;
2626		2669
2627	my $guard = cf::lock_acquire "exit_prepare:$exit";
2628
2629	# all this does is basically replace the /! path by	2670	# all this does is basically replace the /! path by
2630	# a new random map path (?random/...) with a seed	2671	# a new random map path (?random/...) with a seed
2631	# that depends on the exit object	2672	# that depends on the exit object
2632		2673
2633	my $rmp = parse_random_map_params $exit->msg;	2674	my $rmp = parse_random_map_params $exit->msg;
…		…
2635	if ($exit->map) {	2676	if ($exit->map) {
2636	$rmp->{region} = $exit->region->name;	2677	$rmp->{region} = $exit->region->name;
2637	$rmp->{origin_map} = $exit->map->path;	2678	$rmp->{origin_map} = $exit->map->path;
2638	$rmp->{origin_x} = $exit->x;	2679	$rmp->{origin_x} = $exit->x;
2639	$rmp->{origin_y} = $exit->y;	2680	$rmp->{origin_y} = $exit->y;
		2681
		2682	$exit->map->touch;
2640	}	2683	}
2641		2684
2642	$rmp->{random_seed} ||= $exit->random_seed;	2685	$rmp->{random_seed} ||= $exit->random_seed;
2643		2686
2644	my $data = cf::encode_json $rmp;	2687	my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2645	my $md5 = Digest::MD5::md5_hex $data;	2688	my $md5 = Digest::MD5::md5_hex $data;
2646	my $meta = "$RANDOMDIR/$md5.meta";	2689	my $meta = "$RANDOMDIR/$md5.meta";
2647		2690
2648	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2691	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2649	aio_write $fh, 0, (length $data), $data, 0;	2692	aio_write $fh, 0, (length $data), $data, 0;
2650	undef $fh;	2693	undef $fh;
2651	aio_rename "$meta~", $meta;	2694	aio_rename "$meta~", $meta;
2652		2695
		2696	my $slaying = "?random/$md5";
		2697
		2698	if ($exit->valid) {
2653	$exit->slaying ("?random/$md5");	2699	$exit->slaying ("?random/$md5");
2654	$exit->msg (undef);	2700	$exit->msg (undef);
		2701	}
2655	}	2702	}
2656	}	2703	}
2657		2704
2658	sub cf::object::player::enter_exit {	2705	sub cf::object::player::enter_exit {
2659	my ($self, $exit) = @_;	2706	my ($self, $exit) = @_;
2660		2707
2661	return unless $self->type == cf::PLAYER;	2708	return unless $self->type == cf::PLAYER;
2662		2709
2663	if ($exit->slaying eq "/!") {
2664	#TODO: this should de-fi-ni-te-ly not be a sync-job
2665	# the problem is that $exit might not survive long enough
2666	# so it needs to be done right now, right here
2667	cf::sync_job { prepare_random_map $exit };
2668	}
2669
2670	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2671	my $hp = $exit->stats->hp;
2672	my $sp = $exit->stats->sp;
2673
2674	$self->enter_link;	2710	$self->enter_link;
2675		2711
2676	# if exit is damned, update players death & WoR home-position
2677	$self->contr->savebed ($slaying, $hp, $sp)
2678	if $exit->flag (FLAG_DAMNED);
2679
2680	(async {	2712	(async {
2681	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";	2713	$Coro::current->{desc} = "enter_exit";
2682		2714
2683	$self->deactivate_recursive; # just to be sure
2684	unless (eval {	2715	unless (eval {
		2716	$self->deactivate_recursive; # just to be sure
		2717
		2718	# random map handling
		2719	{
		2720	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2721
		2722	prepare_random_map $exit
		2723	if $exit->slaying eq "/!";
		2724	}
		2725
		2726	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
		2727	my $x = $exit->stats->hp;
		2728	my $y = $exit->stats->sp;
		2729
2685	$self->goto ($slaying, $hp, $sp);	2730	$self->goto ($map, $x, $y);
2686		2731
		2732	# if exit is damned, update players death & WoR home-position
		2733	$self->contr->savebed ($map, $x, $y)
		2734	if $exit->flag (cf::FLAG_DAMNED);
		2735
2687	1;	2736	1
2688	}) {	2737	}) {
2689	$self->message ("Something went wrong deep within the crossfire server. "	2738	$self->message ("Something went wrong deep within the deliantra server. "
2690	. "I'll try to bring you back to the map you were before. "	2739	. "I'll try to bring you back to the map you were before. "
2691	. "Please report this to the dungeon master!",	2740	. "Please report this to the dungeon master!",
2692	cf::NDI_UNIQUE | cf::NDI_RED);	2741	cf::NDI_UNIQUE | cf::NDI_RED);
2693		2742
2694	warn "ERROR in enter_exit: $@";	2743	warn "ERROR in enter_exit: $@";
…		…
2760	id => "infobox",	2809	id => "infobox",
2761	title => "Body Parts",	2810	title => "Body Parts",
2762	reply => undef,	2811	reply => undef,
2763	tooltip => "Shows which body parts you posess and are available",	2812	tooltip => "Shows which body parts you posess and are available",
2764	},	2813	},
		2814	"c/skills" => {
		2815	id => "infobox",
		2816	title => "Skills",
		2817	reply => undef,
		2818	tooltip => "Shows your experience per skill and item power",
		2819	},
2765	"c/uptime" => {	2820	"c/uptime" => {
2766	id => "infobox",	2821	id => "infobox",
2767	title => "Uptime",	2822	title => "Uptime",
2768	reply => undef,	2823	reply => undef,
2769	tooltip => "How long the server has been running since last restart",	2824	tooltip => "How long the server has been running since last restart",
…		…
2772	id => "infobox",	2827	id => "infobox",
2773	title => "Map Info",	2828	title => "Map Info",
2774	reply => undef,	2829	reply => undef,
2775	tooltip => "Information related to the maps",	2830	tooltip => "Information related to the maps",
2776	},	2831	},
		2832	"c/party" => {
		2833	id => "party",
		2834	title => "Party",
		2835	reply => "gsay ",
		2836	tooltip => "Messages and chat related to your party",
		2837	},
2777	);	2838	);
2778		2839
2779	sub cf::client::send_msg {	2840	sub cf::client::send_msg {
2780	my ($self, $channel, $msg, $color, @extra) = @_;	2841	my ($self, $channel, $msg, $color, @extra) = @_;
2781		2842
2782	$msg = $self->pl->expand_cfpod ($msg);	2843	$msg = $self->pl->expand_cfpod ($msg)
		2844	unless $color & cf::NDI_VERBATIM;
2783		2845
2784	$color &= cf::NDI_CLIENT_MASK; # just in case...	2846	$color &= cf::NDI_CLIENT_MASK; # just in case...
2785		2847
2786	# check predefined channels, for the benefit of C	2848	# check predefined channels, for the benefit of C
2787	if ($CHANNEL{$channel}) {	2849	if ($CHANNEL{$channel}) {
…		…
2808	if ($self->can_msg) {	2870	if ($self->can_msg) {
2809	# default colour, mask it out	2871	# default colour, mask it out
2810	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)	2872	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2811	if $color & cf::NDI_DEF;	2873	if $color & cf::NDI_DEF;
2812		2874
2813	$self->send_packet ("msg " . $self->{json_coder}->encode (	2875	my $pkt = "msg "
		2876	. $self->{json_coder}->encode (
2814	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));	2877	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
		2878	);
		2879
		2880	# try lzf for large packets
		2881	$pkt = "lzf " . Compress::LZF::compress $pkt
		2882	if 1024 <= length $pkt and $self->{can_lzf};
		2883
		2884	# split very large packets
		2885	if (8192 < length $pkt and $self->{can_lzf}) {
		2886	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
		2887	$pkt = "frag";
		2888	}
		2889
		2890	$self->send_packet ($pkt);
2815	} else {	2891	} else {
2816	if ($color >= 0) {	2892	if ($color >= 0) {
2817	# replace some tags by gcfclient-compatible ones	2893	# replace some tags by gcfclient-compatible ones
2818	for ($msg) {	2894	for ($msg) {
2819	1 while	2895	1 while
…		…
3018		3094
3019	The following functions and methods are available within a safe environment:	3095	The following functions and methods are available within a safe environment:
3020		3096
3021	cf::object	3097	cf::object
3022	contr pay_amount pay_player map x y force_find force_add destroy	3098	contr pay_amount pay_player map x y force_find force_add destroy
3023	insert remove name archname title slaying race decrease_ob_nr	3099	insert remove name archname title slaying race decrease split
3024		3100
3025	cf::object::player	3101	cf::object::player
3026	player	3102	player
3027		3103
3028	cf::player	3104	cf::player
…		…
3033		3109
3034	=cut	3110	=cut
3035		3111
3036	for (	3112	for (
3037	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3113	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3038	insert remove inv name archname title slaying race	3114	insert remove inv nrof name archname title slaying race
3039	decrease_ob_nr destroy)],	3115	decrease split destroy change_exp)],
3040	["cf::object::player" => qw(player)],	3116	["cf::object::player" => qw(player)],
3041	["cf::player" => qw(peaceful)],	3117	["cf::player" => qw(peaceful)],
3042	["cf::map" => qw(trigger)],	3118	["cf::map" => qw(trigger)],
3043	) {	3119	) {
3044	no strict 'refs';	3120	no strict 'refs';
…		…
3149	{	3225	{
3150	my $faces = $facedata->{faceinfo};	3226	my $faces = $facedata->{faceinfo};
3151		3227
3152	while (my ($face, $info) = each %$faces) {	3228	while (my ($face, $info) = each %$faces) {
3153	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3229	my $idx = (cf::face::find $face) || cf::face::alloc $face;
		3230
3154	cf::face::set_visibility $idx, $info->{visibility};	3231	cf::face::set_visibility $idx, $info->{visibility};
3155	cf::face::set_magicmap $idx, $info->{magicmap};	3232	cf::face::set_magicmap $idx, $info->{magicmap};
3156	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3233	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3157	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3234	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3158		3235
3159	cf::cede_to_tick;	3236	cf::cede_to_tick;
3160	}	3237	}
3161		3238
3162	while (my ($face, $info) = each %$faces) {	3239	while (my ($face, $info) = each %$faces) {
3163	next unless $info->{smooth};	3240	next unless $info->{smooth};
		3241
3164	my $idx = cf::face::find $face	3242	my $idx = cf::face::find $face
3165	or next;	3243	or next;
		3244
3166	if (my $smooth = cf::face::find $info->{smooth}) {	3245	if (my $smooth = cf::face::find $info->{smooth}) {
3167	cf::face::set_smooth $idx, $smooth;	3246	cf::face::set_smooth $idx, $smooth;
3168	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3247	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3169	} else {	3248	} else {
3170	warn "smooth face '$info->{smooth}' not found for face '$face'";	3249	warn "smooth face '$info->{smooth}' not found for face '$face'";
…		…
3188	{	3267	{
3189	# TODO: for gcfclient pleasure, we should give resources	3268	# TODO: for gcfclient pleasure, we should give resources
3190	# that gcfclient doesn't grok a >10000 face index.	3269	# that gcfclient doesn't grok a >10000 face index.
3191	my $res = $facedata->{resource};	3270	my $res = $facedata->{resource};
3192		3271
3193	my $soundconf = delete $res->{"res/sound.conf"};
3194
3195	while (my ($name, $info) = each %$res) {	3272	while (my ($name, $info) = each %$res) {
		3273	if (defined $info->{type}) {
3196	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3274	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3197	my $data;	3275	my $data;
3198		3276
3199	if ($info->{type} & 1) {	3277	if ($info->{type} & 1) {
3200	# prepend meta info	3278	# prepend meta info
3201		3279
3202	my $meta = $enc->encode ({	3280	my $meta = $enc->encode ({
3203	name => $name,	3281	name => $name,
3204	%{ $info->{meta} || {} },	3282	%{ $info->{meta} || {} },
3205	});	3283	});
3206		3284
3207	$data = pack "(w/a*)*", $meta, $info->{data};	3285	$data = pack "(w/a*)*", $meta, $info->{data};
		3286	} else {
		3287	$data = $info->{data};
		3288	}
		3289
		3290	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3291	cf::face::set_type $idx, $info->{type};
3208	} else {	3292	} else {
3209	$data = $info->{data};	3293	$RESOURCE{$name} = $info;
3210	}	3294	}
3211		3295
3212	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3213	cf::face::set_type $idx, $info->{type};
3214
3215	cf::cede_to_tick;	3296	cf::cede_to_tick;
3216	}	3297	}
3217
3218	if ($soundconf) {
3219	$soundconf = $enc->decode (delete $soundconf->{data});
3220
3221	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3222	my $sound = $soundconf->{compat}[$_]
3223	or next;
3224
3225	my $face = cf::face::find "sound/$sound->[1]";
3226	cf::sound::set $sound->[0] => $face;
3227	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3228	}
3229
3230	while (my ($k, $v) = each %{$soundconf->{event}}) {
3231	my $face = cf::face::find "sound/$v";
3232	cf::sound::set $k => $face;
3233	}
3234	}
3235	}	3298	}
		3299
		3300	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3236		3301
3237	1	3302	1
3238	}	3303	}
		3304
		3305	cf::global->attach (on_resource_update => sub {
		3306	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
		3307	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
		3308
		3309	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3310	my $sound = $soundconf->{compat}[$_]
		3311	or next;
		3312
		3313	my $face = cf::face::find "sound/$sound->[1]";
		3314	cf::sound::set $sound->[0] => $face;
		3315	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3316	}
		3317
		3318	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3319	my $face = cf::face::find "sound/$v";
		3320	cf::sound::set $k => $face;
		3321	}
		3322	}
		3323	});
3239		3324
3240	register_exticmd fx_want => sub {	3325	register_exticmd fx_want => sub {
3241	my ($ns, $want) = @_;	3326	my ($ns, $want) = @_;
3242		3327
3243	while (my ($k, $v) = each %$want) {	3328	while (my ($k, $v) = each %$want) {
3244	$ns->fx_want ($k, $v);	3329	$ns->fx_want ($k, $v);
3245	}	3330	}
3246	};	3331	};
		3332
		3333	sub load_resource_file($) {
		3334	my $guard = lock_acquire "load_resource_file";
		3335
		3336	my $status = load_resource_file_ $_[0];
		3337	get_slot 0.1, 100;
		3338	cf::arch::commit_load;
		3339
		3340	$status
		3341	}
3247		3342
3248	sub reload_regions {	3343	sub reload_regions {
3249	# HACK to clear player env face cache, we need some signal framework	3344	# HACK to clear player env face cache, we need some signal framework
3250	# for this (global event?)	3345	# for this (global event?)
3251	%ext::player_env::MUSIC_FACE_CACHE = ();	3346	%ext::player_env::MUSIC_FACE_CACHE = ();
…		…
3265	}	3360	}
3266		3361
3267	sub reload_archetypes {	3362	sub reload_archetypes {
3268	load_resource_file "$DATADIR/archetypes"	3363	load_resource_file "$DATADIR/archetypes"
3269	or die "unable to load archetypes\n";	3364	or die "unable to load archetypes\n";
3270	#d# NEED to laod twice to resolve forward references
3271	# this really needs to be done in an extra post-pass
3272	# (which needs to be synchronous, so solve it differently)
3273	load_resource_file "$DATADIR/archetypes"
3274	or die "unable to load archetypes\n";
3275	}	3365	}
3276		3366
3277	sub reload_treasures {	3367	sub reload_treasures {
3278	load_resource_file "$DATADIR/treasures"	3368	load_resource_file "$DATADIR/treasures"
3279	or die "unable to load treasurelists\n";	3369	or die "unable to load treasurelists\n";
3280	}	3370	}
3281		3371
3282	sub reload_resources {	3372	sub reload_resources {
3283	warn "reloading resource files...\n";	3373	warn "reloading resource files...\n";
3284		3374
		3375	reload_facedata;
		3376	reload_archetypes;
3285	reload_regions;	3377	reload_regions;
3286	reload_facedata;
3287	#reload_archetypes;#d#
3288	reload_archetypes;
3289	reload_treasures;	3378	reload_treasures;
3290		3379
3291	warn "finished reloading resource files\n";	3380	warn "finished reloading resource files\n";
3292	}
3293
3294	sub init {
3295	reload_resources;
3296	}	3381	}
3297		3382
3298	sub reload_config {	3383	sub reload_config {
3299	open my $fh, "<:utf8", "$CONFDIR/config"	3384	open my $fh, "<:utf8", "$CONFDIR/config"
3300	or return;	3385	or return;
3301		3386
3302	local $/;	3387	local $/;
3303	*CFG = YAML::Syck::Load <$fh>;	3388	*CFG = YAML::Load <$fh>;
3304		3389
3305	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3390	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3306		3391
3307	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3392	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3308	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3393	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3314	};	3399	};
3315	warn $@ if $@;	3400	warn $@ if $@;
3316	}	3401	}
3317	}	3402	}
3318		3403
		3404	sub pidfile() {
		3405	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
		3406	or die "$PIDFILE: $!";
		3407	flock $fh, &Fcntl::LOCK_EX
		3408	or die "$PIDFILE: flock: $!";
		3409	$fh
		3410	}
		3411
		3412	# make sure only one server instance is running at any one time
		3413	sub atomic {
		3414	my $fh = pidfile;
		3415
		3416	my $pid = <$fh>;
		3417	kill 9, $pid if $pid > 0;
		3418
		3419	seek $fh, 0, 0;
		3420	print $fh $$;
		3421	}
		3422
3319	sub main {	3423	sub main {
		3424	cf::init_globals; # initialise logging
		3425
		3426	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3427	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
		3428	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
		3429	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
		3430
		3431	cf::init_experience;
		3432	cf::init_anim;
		3433	cf::init_attackmess;
		3434	cf::init_dynamic;
		3435	cf::init_block;
		3436
		3437	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
		3438
3320	# we must not ever block the main coroutine	3439	# we must not ever block the main coroutine
3321	local $Coro::idle = sub {	3440	local $Coro::idle = sub {
3322	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3441	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3323	(async {	3442	(async {
3324	$Coro::current->{desc} = "IDLE BUG HANDLER";	3443	$Coro::current->{desc} = "IDLE BUG HANDLER";
3325	EV::loop EV::LOOP_ONESHOT;	3444	EV::loop EV::LOOP_ONESHOT;
3326	})->prio (Coro::PRIO_MAX);	3445	})->prio (Coro::PRIO_MAX);
3327	};	3446	};
3328		3447
		3448	evthread_start IO::AIO::poll_fileno;
		3449
		3450	cf::sync_job {
		3451	reload_resources;
3329	reload_config;	3452	reload_config;
3330	db_init;	3453	db_init;
		3454
		3455	cf::load_settings;
		3456	cf::load_materials;
		3457	cf::init_uuid;
		3458	cf::init_signals;
		3459	cf::init_commands;
		3460	cf::init_skills;
		3461
		3462	cf::init_beforeplay;
		3463
		3464	atomic;
		3465
3331	load_extensions;	3466	load_extensions;
3332		3467
3333	$TICK_WATCHER->start;	3468	utime time, time, $RUNTIMEFILE;
3334	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3469
		3470	# no (long-running) fork's whatsoever before this point(!)
		3471	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
		3472
		3473	(pop @POST_INIT)->(0) while @POST_INIT;
		3474	};
		3475
3335	EV::loop;	3476	EV::loop;
3336	}	3477	}
3337		3478
3338	#############################################################################	3479	#############################################################################
3339	# initialisation and cleanup	3480	# initialisation and cleanup
…		…
3346	cf::cleanup "SIG$signal";	3487	cf::cleanup "SIG$signal";
3347	};	3488	};
3348	}	3489	}
3349	}	3490	}
3350		3491
3351	sub write_runtime {	3492	sub write_runtime_sync {
3352	my $runtime = "$LOCALDIR/runtime";
3353
3354	# first touch the runtime file to show we are still running:	3493	# first touch the runtime file to show we are still running:
3355	# the fsync below can take a very very long time.	3494	# the fsync below can take a very very long time.
3356		3495
3357	IO::AIO::aio_utime $runtime, undef, undef;	3496	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3358		3497
3359	my $guard = cf::lock_acquire "write_runtime";	3498	my $guard = cf::lock_acquire "write_runtime";
3360		3499
3361	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	3500	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3362	or return;	3501	or return;
3363		3502
3364	my $value = $cf::RUNTIME + 90 + 10;	3503	my $value = $cf::RUNTIME + 90 + 10;
3365	# 10 is the runtime save interval, for a monotonic clock	3504	# 10 is the runtime save interval, for a monotonic clock
3366	# 60 allows for the watchdog to kill the server.	3505	# 60 allows for the watchdog to kill the server.
…		…
3376	aio_utime $fh, undef, undef;	3515	aio_utime $fh, undef, undef;
3377		3516
3378	close $fh	3517	close $fh
3379	or return;	3518	or return;
3380		3519
3381	aio_rename "$runtime~", $runtime	3520	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3382	and return;	3521	and return;
3383		3522
3384	warn "runtime file written.\n";	3523	warn "runtime file written.\n";
3385		3524
3386	1	3525	1
		3526	}
		3527
		3528	our $uuid_lock;
		3529	our $uuid_skip;
		3530
		3531	sub write_uuid_sync($) {
		3532	$uuid_skip ||= $_[0];
		3533
		3534	return if $uuid_lock;
		3535	local $uuid_lock = 1;
		3536
		3537	my $uuid = "$LOCALDIR/uuid";
		3538
		3539	my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
		3540	or return;
		3541
		3542	my $value = uuid_seq uuid_cur;
		3543
		3544	unless ($value) {
		3545	warn "cowardly refusing to write zero uuid value!\n";
		3546	return;
		3547	}
		3548
		3549	my $value = uuid_str $value + $uuid_skip;
		3550	$uuid_skip = 0;
		3551
		3552	(aio_write $fh, 0, (length $value), $value, 0) <= 0
		3553	and return;
		3554
		3555	# always fsync - this file is important
		3556	aio_fsync $fh
		3557	and return;
		3558
		3559	close $fh
		3560	or return;
		3561
		3562	aio_rename "$uuid~", $uuid
		3563	and return;
		3564
		3565	warn "uuid file written ($value).\n";
		3566
		3567	1
		3568
		3569	}
		3570
		3571	sub write_uuid($$) {
		3572	my ($skip, $sync) = @_;
		3573
		3574	$sync ? write_uuid_sync $skip
		3575	: async { write_uuid_sync $skip };
3387	}	3576	}
3388		3577
3389	sub emergency_save() {	3578	sub emergency_save() {
3390	my $freeze_guard = cf::freeze_mainloop;	3579	my $freeze_guard = cf::freeze_mainloop;
3391		3580
3392	warn "enter emergency perl save\n";	3581	warn "emergency_perl_save: enter\n";
3393		3582
3394	cf::sync_job {	3583	cf::sync_job {
		3584	# this is a trade-off: we want to be very quick here, so
		3585	# save all maps without fsync, and later call a global sync
		3586	# (which in turn might be very very slow)
		3587	local $USE_FSYNC = 0;
		3588
3395	# use a peculiar iteration method to avoid tripping on perl	3589	# use a peculiar iteration method to avoid tripping on perl
3396	# refcount bugs in for. also avoids problems with players	3590	# refcount bugs in for. also avoids problems with players
3397	# and maps saved/destroyed asynchronously.	3591	# and maps saved/destroyed asynchronously.
3398	warn "begin emergency player save\n";	3592	warn "emergency_perl_save: begin player save\n";
3399	for my $login (keys %cf::PLAYER) {	3593	for my $login (keys %cf::PLAYER) {
3400	my $pl = $cf::PLAYER{$login} or next;	3594	my $pl = $cf::PLAYER{$login} or next;
3401	$pl->valid or next;	3595	$pl->valid or next;
3402	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3596	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3403	$pl->save;	3597	$pl->save;
3404	}	3598	}
3405	warn "end emergency player save\n";	3599	warn "emergency_perl_save: end player save\n";
3406		3600
3407	warn "begin emergency map save\n";	3601	warn "emergency_perl_save: begin map save\n";
3408	for my $path (keys %cf::MAP) {	3602	for my $path (keys %cf::MAP) {
3409	my $map = $cf::MAP{$path} or next;	3603	my $map = $cf::MAP{$path} or next;
3410	$map->valid or next;	3604	$map->valid or next;
3411	$map->save;	3605	$map->save;
3412	}	3606	}
3413	warn "end emergency map save\n";	3607	warn "emergency_perl_save: end map save\n";
3414		3608
3415	warn "begin emergency database checkpoint\n";	3609	warn "emergency_perl_save: begin database checkpoint\n";
3416	BDB::db_env_txn_checkpoint $DB_ENV;	3610	BDB::db_env_txn_checkpoint $DB_ENV;
3417	warn "end emergency database checkpoint\n";	3611	warn "emergency_perl_save: end database checkpoint\n";
		3612
		3613	warn "emergency_perl_save: begin write uuid\n";
		3614	write_uuid_sync 1;
		3615	warn "emergency_perl_save: end write uuid\n";
3418	};	3616	};
3419		3617
		3618	warn "emergency_perl_save: starting sync()\n";
		3619	IO::AIO::aio_sync sub {
		3620	warn "emergency_perl_save: finished sync()\n";
		3621	};
		3622
3420	warn "leave emergency perl save\n";	3623	warn "emergency_perl_save: leave\n";
3421	}	3624	}
3422		3625
3423	sub post_cleanup {	3626	sub post_cleanup {
3424	my ($make_core) = @_;	3627	my ($make_core) = @_;
3425		3628
3426	warn Carp::longmess "post_cleanup backtrace"	3629	warn Carp::longmess "post_cleanup backtrace"
3427	if $make_core;	3630	if $make_core;
		3631
		3632	my $fh = pidfile;
		3633	unlink $PIDFILE if <$fh> == $$;
		3634	}
		3635
		3636	# a safer delete_package, copied from Symbol
		3637	sub clear_package($) {
		3638	my $pkg = shift;
		3639
		3640	# expand to full symbol table name if needed
		3641	unless ($pkg =~ /^main::.*::$/) {
		3642	$pkg = "main$pkg" if $pkg =~ /^::/;
		3643	$pkg = "main::$pkg" unless $pkg =~ /^main::/;
		3644	$pkg .= '::' unless $pkg =~ /::$/;
		3645	}
		3646
		3647	my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
		3648	my $stem_symtab = *{$stem}{HASH};
		3649
		3650	defined $stem_symtab and exists $stem_symtab->{$leaf}
		3651	or return;
		3652
		3653	# clear all symbols
		3654	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
		3655	for my $name (keys %$leaf_symtab) {
		3656	_gv_clear *{"$pkg$name"};
		3657	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
		3658	}
		3659	warn "cleared package $pkg\n";#d#
3428	}	3660	}
3429		3661
3430	sub do_reload_perl() {	3662	sub do_reload_perl() {
3431	# can/must only be called in main	3663	# can/must only be called in main
3432	if ($Coro::current != $Coro::main) {	3664	if ($Coro::current != $Coro::main) {
3433	warn "can only reload from main coroutine";	3665	warn "can only reload from main coroutine";
3434	return;	3666	return;
3435	}	3667	}
3436		3668
		3669	return if $RELOAD++;
		3670
		3671	my $t1 = EV::time;
		3672
		3673	while ($RELOAD) {
3437	warn "reloading...";	3674	warn "reloading...";
3438		3675
3439	warn "entering sync_job";	3676	warn "entering sync_job";
3440		3677
3441	cf::sync_job {	3678	cf::sync_job {
3442	cf::write_runtime; # external watchdog should not bark	3679	cf::write_runtime_sync; # external watchdog should not bark
3443	cf::emergency_save;	3680	cf::emergency_save;
3444	cf::write_runtime; # external watchdog should not bark	3681	cf::write_runtime_sync; # external watchdog should not bark
3445		3682
3446	warn "syncing database to disk";	3683	warn "syncing database to disk";
3447	BDB::db_env_txn_checkpoint $DB_ENV;	3684	BDB::db_env_txn_checkpoint $DB_ENV;
3448		3685
3449	# if anything goes wrong in here, we should simply crash as we already saved	3686	# if anything goes wrong in here, we should simply crash as we already saved
3450		3687
3451	warn "flushing outstanding aio requests";	3688	warn "flushing outstanding aio requests";
3452	for (;;) {
3453	BDB::flush;
3454	IO::AIO::flush;
3455	Coro::cede_notself;
3456	last unless IO::AIO::nreqs || BDB::nreqs;	3689	while (IO::AIO::nreqs || BDB::nreqs) {
3457	warn "iterate...";	3690	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3458	}
3459
3460	++$RELOAD;
3461
3462	warn "cancelling all extension coros";
3463	$_->cancel for values %EXT_CORO;
3464	%EXT_CORO = ();
3465
3466	warn "removing commands";
3467	%COMMAND = ();
3468
3469	warn "removing ext/exti commands";
3470	%EXTCMD = ();
3471	%EXTICMD = ();
3472
3473	warn "unloading/nuking all extensions";
3474	for my $pkg (@EXTS) {
3475	warn "... unloading $pkg";
3476
3477	if (my $cb = $pkg->can ("unload")) {
3478	eval {
3479	$cb->($pkg);
3480	1
3481	} or warn "$pkg unloaded, but with errors: $@";
3482	}	3691	}
3483		3692
3484	warn "... nuking $pkg";	3693	warn "cancelling all extension coros";
3485	Symbol::delete_package $pkg;	3694	$_->cancel for values %EXT_CORO;
3486	}	3695	%EXT_CORO = ();
3487		3696
3488	warn "unloading all perl modules loaded from $LIBDIR";	3697	warn "removing commands";
3489	while (my ($k, $v) = each %INC) {	3698	%COMMAND = ();
3490	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3491		3699
		3700	warn "removing ext/exti commands";
		3701	%EXTCMD = ();
		3702	%EXTICMD = ();
		3703
		3704	warn "unloading/nuking all extensions";
		3705	for my $pkg (@EXTS) {
3492	warn "... unloading $k";	3706	warn "... unloading $pkg";
3493	delete $INC{$k};
3494		3707
3495	$k =~ s/\.pm$//;
3496	$k =~ s/\//::/g;
3497
3498	if (my $cb = $k->can ("unload_module")) {	3708	if (my $cb = $pkg->can ("unload")) {
		3709	eval {
3499	$cb->();	3710	$cb->($pkg);
		3711	1
		3712	} or warn "$pkg unloaded, but with errors: $@";
		3713	}
		3714
		3715	warn "... clearing $pkg";
		3716	clear_package $pkg;
3500	}	3717	}
3501		3718
3502	Symbol::delete_package $k;	3719	warn "unloading all perl modules loaded from $LIBDIR";
		3720	while (my ($k, $v) = each %INC) {
		3721	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
		3722
		3723	warn "... unloading $k";
		3724	delete $INC{$k};
		3725
		3726	$k =~ s/\.pm$//;
		3727	$k =~ s/\//::/g;
		3728
		3729	if (my $cb = $k->can ("unload_module")) {
		3730	$cb->();
		3731	}
		3732
		3733	clear_package $k;
3503	}	3734	}
3504		3735
3505	warn "getting rid of safe::, as good as possible";	3736	warn "getting rid of safe::, as good as possible";
3506	Symbol::delete_package "safe::$_"	3737	clear_package "safe::$_"
3507	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3738	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3508		3739
3509	warn "unloading cf.pm \"a bit\"";	3740	warn "unloading cf.pm \"a bit\"";
3510	delete $INC{"cf.pm"};	3741	delete $INC{"cf.pm"};
3511	delete $INC{"cf/pod.pm"};	3742	delete $INC{"cf/pod.pm"};
3512		3743
3513	# don't, removes xs symbols, too,	3744	# don't, removes xs symbols, too,
3514	# and global variables created in xs	3745	# and global variables created in xs
3515	#Symbol::delete_package __PACKAGE__;	3746	#clear_package __PACKAGE__;
3516		3747
3517	warn "unload completed, starting to reload now";	3748	warn "unload completed, starting to reload now";
3518		3749
3519	warn "reloading cf.pm";	3750	warn "reloading cf.pm";
3520	require cf;	3751	require cf;
3521	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3752	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3522		3753
3523	warn "loading config and database again";	3754	warn "loading config and database again";
3524	cf::reload_config;	3755	cf::reload_config;
3525		3756
3526	warn "loading extensions";	3757	warn "loading extensions";
3527	cf::load_extensions;	3758	cf::load_extensions;
3528		3759
		3760	if ($REATTACH_ON_RELOAD) {
3529	warn "reattaching attachments to objects/players";	3761	warn "reattaching attachments to objects/players";
3530	_global_reattach; # objects, sockets	3762	_global_reattach; # objects, sockets
3531	warn "reattaching attachments to maps";	3763	warn "reattaching attachments to maps";
3532	reattach $_ for values %MAP;	3764	reattach $_ for values %MAP;
3533	warn "reattaching attachments to players";	3765	warn "reattaching attachments to players";
3534	reattach $_ for values %PLAYER;	3766	reattach $_ for values %PLAYER;
		3767	}
3535		3768
		3769	warn "running post_init jobs";
		3770	(pop @POST_INIT)->(1) while @POST_INIT;
		3771
3536	warn "leaving sync_job";	3772	warn "leaving sync_job";
3537		3773
3538	1	3774	1
3539	} or do {	3775	} or do {
3540	warn $@;	3776	warn $@;
3541	warn "error while reloading, exiting.";	3777	cf::cleanup "error while reloading, exiting.";
3542	exit 1;
3543	};	3778	};
3544		3779
3545	warn "reloaded";	3780	warn "reloaded";
		3781	--$RELOAD;
		3782	}
		3783
		3784	$t1 = EV::time - $t1;
		3785	warn "reload completed in ${t1}s\n";
3546	};	3786	};
3547		3787
3548	our $RELOAD_WATCHER; # used only during reload	3788	our $RELOAD_WATCHER; # used only during reload
3549		3789
3550	sub reload_perl() {	3790	sub reload_perl() {
3551	# doing reload synchronously and two reloads happen back-to-back,	3791	# doing reload synchronously and two reloads happen back-to-back,
3552	# coro crashes during coro_state_free->destroy here.	3792	# coro crashes during coro_state_free->destroy here.
3553		3793
		3794	$RELOAD_WATCHER ||= cf::async {
		3795	Coro::AIO::aio_wait cache_extensions;
		3796
3554	$RELOAD_WATCHER ||= EV::timer 0, 0, sub {	3797	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
		3798	do_reload_perl;
3555	undef $RELOAD_WATCHER;	3799	undef $RELOAD_WATCHER;
3556	do_reload_perl;	3800	};
3557	};	3801	};
3558	}	3802	}
3559		3803
3560	register_command "reload" => sub {	3804	register_command "reload" => sub {
3561	my ($who, $arg) = @_;	3805	my ($who, $arg) = @_;
…		…
3575		3819
3576	our @WAIT_FOR_TICK;	3820	our @WAIT_FOR_TICK;
3577	our @WAIT_FOR_TICK_BEGIN;	3821	our @WAIT_FOR_TICK_BEGIN;
3578		3822
3579	sub wait_for_tick {	3823	sub wait_for_tick {
3580	return unless $TICK_WATCHER->is_active;
3581	return if $Coro::current == $Coro::main;	3824	return if tick_inhibit || $Coro::current == $Coro::main;
3582		3825
3583	my $signal = new Coro::Signal;	3826	my $signal = new Coro::Signal;
3584	push @WAIT_FOR_TICK, $signal;	3827	push @WAIT_FOR_TICK, $signal;
3585	$signal->wait;	3828	$signal->wait;
3586	}	3829	}
3587		3830
3588	sub wait_for_tick_begin {	3831	sub wait_for_tick_begin {
3589	return unless $TICK_WATCHER->is_active;
3590	return if $Coro::current == $Coro::main;	3832	return if tick_inhibit || $Coro::current == $Coro::main;
3591		3833
3592	my $signal = new Coro::Signal;	3834	my $signal = new Coro::Signal;
3593	push @WAIT_FOR_TICK_BEGIN, $signal;	3835	push @WAIT_FOR_TICK_BEGIN, $signal;
3594	$signal->wait;	3836	$signal->wait;
3595	}	3837	}
3596		3838
3597	$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {	3839	sub tick {
3598	if ($Coro::current != $Coro::main) {	3840	if ($Coro::current != $Coro::main) {
3599	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3841	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3600	unless ++$bug_warning > 10;	3842	unless ++$bug_warning > 10;
3601	return;	3843	return;
3602	}	3844	}
3603		3845
3604	$NOW = $tick_start = EV::now;
3605
3606	cf::server_tick; # one server iteration	3846	cf::server_tick; # one server iteration
3607		3847
3608	$RUNTIME += $TICK;
3609	$NEXT_TICK += $TICK;
3610
3611	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3848	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3612	$NEXT_RUNTIME_WRITE = $NOW + 10;	3849	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3613	Coro::async_pool {	3850	Coro::async_pool {
3614	$Coro::current->{desc} = "runtime saver";	3851	$Coro::current->{desc} = "runtime saver";
3615	write_runtime	3852	write_runtime_sync
3616	or warn "ERROR: unable to write runtime file: $!";	3853	or warn "ERROR: unable to write runtime file: $!";
3617	};	3854	};
3618	}	3855	}
3619		3856
3620	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3857	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
…		…
3622	}	3859	}
3623	while (my $sig = shift @WAIT_FOR_TICK) {	3860	while (my $sig = shift @WAIT_FOR_TICK) {
3624	$sig->send;	3861	$sig->send;
3625	}	3862	}
3626		3863
3627	$LOAD = ($NOW - $tick_start) / $TICK;	3864	$LOAD = ($NOW - $TICK_START) / $TICK;
3628	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3865	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3629		3866
3630	_post_tick;	3867	if (0) {
3631	};	3868	if ($NEXT_TICK) {
3632	$TICK_WATCHER->priority (EV::MAXPRI);	3869	my $jitter = $TICK_START - $NEXT_TICK;
		3870	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
		3871	warn "jitter $JITTER\n";#d#
		3872	}
		3873	}
		3874	}
3633		3875
3634	{	3876	{
3635	# configure BDB	3877	# configure BDB
3636		3878
3637	BDB::min_parallel 8;	3879	BDB::min_parallel 8;
3638	BDB::max_poll_reqs $TICK * 0.1;	3880	BDB::max_poll_reqs $TICK * 0.1;
		3881	$AnyEvent::BDB::WATCHER->priority (1);
3639		3882
3640	unless ($DB_ENV) {	3883	unless ($DB_ENV) {
3641	$DB_ENV = BDB::db_env_create;	3884	$DB_ENV = BDB::db_env_create;
3642	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC	3885	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3643	| BDB::LOG_AUTOREMOVE, 1);	3886	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
		3887	$DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3644	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);	3888	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3645	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);	3889	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3646		3890
3647	cf::sync_job {	3891	cf::sync_job {
3648	eval {	3892	eval {
…		…
3674	{	3918	{
3675	# configure IO::AIO	3919	# configure IO::AIO
3676		3920
3677	IO::AIO::min_parallel 8;	3921	IO::AIO::min_parallel 8;
3678	IO::AIO::max_poll_time $TICK * 0.1;	3922	IO::AIO::max_poll_time $TICK * 0.1;
		3923	undef $AnyEvent::AIO::WATCHER;
3679	}	3924	}
3680		3925
3681	my $_log_backtrace;	3926	my $_log_backtrace;
3682		3927
3683	sub _log_backtrace {	3928	sub _log_backtrace {
…		…
3686	$msg =~ s/\n//;	3931	$msg =~ s/\n//;
3687		3932
3688	# limit the # of concurrent backtraces	3933	# limit the # of concurrent backtraces
3689	if ($_log_backtrace < 2) {	3934	if ($_log_backtrace < 2) {
3690	++$_log_backtrace;	3935	++$_log_backtrace;
		3936	my $perl_bt = Carp::longmess $msg;
3691	async {	3937	async {
3692	$Coro::current->{desc} = "abt $msg";	3938	$Coro::current->{desc} = "abt $msg";
3693		3939
3694	my @bt = fork_call {	3940	my @bt = fork_call {
3695	@addr = map { sprintf "%x", $_ } @addr;	3941	@addr = map { sprintf "%x", $_ } @addr;
…		…
3706	}	3952	}
3707		3953
3708	@funcs	3954	@funcs
3709	};	3955	};
3710		3956
3711	LOG llevInfo, "[ABT] $msg\n";	3957	LOG llevInfo, "[ABT] $perl_bt\n";
		3958	LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3712	LOG llevInfo, "[ABT] $_\n" for @bt;	3959	LOG llevInfo, "[ABT] $_\n" for @bt;
3713	--$_log_backtrace;	3960	--$_log_backtrace;
3714	};	3961	};
3715	} else {	3962	} else {
3716	LOG llevInfo, "[ABT] $msg\n";	3963	LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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