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.234 by root, Thu Apr 5 13:44:31 2007 UTC vs.
Revision 1.279 by root, Mon Jun 11 22:16:53 2007 UTC

…		…
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Symbol;	6	use Symbol;
7	use List::Util;	7	use List::Util;
		8	use Socket;
8	use Storable;	9	use Storable;
9	use Event;	10	use Event;
10	use Opcode;	11	use Opcode;
11	use Safe;	12	use Safe;
12	use Safe::Hole;	13	use Safe::Hole;
13		14
14	use Coro 3.52 ();	15	use Coro 3.61 ();
15	use Coro::State;	16	use Coro::State;
		17	use Coro::Handle;
16	use Coro::Event;	18	use Coro::Event;
17	use Coro::Timer;	19	use Coro::Timer;
18	use Coro::Signal;	20	use Coro::Signal;
19	use Coro::Semaphore;	21	use Coro::Semaphore;
20	use Coro::AIO;	22	use Coro::AIO;
		23	use Coro::Storable;
21		24
22	use BDB ();	25	use BDB ();
23	use Data::Dumper;	26	use Data::Dumper;
24	use Digest::MD5;	27	use Digest::MD5;
25	use Fcntl;	28	use Fcntl;
…		…
28	use Time::HiRes;	31	use Time::HiRes;
29	use Compress::LZF;	32	use Compress::LZF;
30		33
31	# configure various modules to our taste	34	# configure various modules to our taste
32	#	35	#
		36	$Storable::canonical = 1; # reduce rsync transfers
33	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	37	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
34	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	38	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
35		39
36	$Event::Eval = 1; # no idea why this is required, but it is	40	$Event::Eval = 1; # no idea why this is required, but it is
37		41
…		…
50	our %EXT_CORO = (); # coroutines bound to extensions	54	our %EXT_CORO = (); # coroutines bound to extensions
51	our %EXT_MAP = (); # pluggable maps	55	our %EXT_MAP = (); # pluggable maps
52		56
53	our $RELOAD; # number of reloads so far	57	our $RELOAD; # number of reloads so far
54	our @EVENT;	58	our @EVENT;
55	our $LIBDIR = datadir . "/ext";
56		59
57	our $TICK = MAX_TIME * 1e-6;	60	our $CONFDIR = confdir;
		61	our $DATADIR = datadir;
		62	our $LIBDIR = "$DATADIR/ext";
		63	our $PODDIR = "$DATADIR/pod";
		64	our $MAPDIR = "$DATADIR/" . mapdir;
		65	our $LOCALDIR = localdir;
		66	our $TMPDIR = "$LOCALDIR/" . tmpdir;
		67	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
		68	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
		69	our $RANDOMDIR = "$LOCALDIR/random";
		70	our $BDBDIR = "$LOCALDIR/db";
		71
		72	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
58	our $TICK_WATCHER;	73	our $TICK_WATCHER;
59	our $AIO_POLL_WATCHER;	74	our $AIO_POLL_WATCHER;
60	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	75	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
61	our $NEXT_TICK;	76	our $NEXT_TICK;
62	our $NOW;	77	our $NOW;
…		…
71	our $RUNTIME;	86	our $RUNTIME;
72		87
73	our %PLAYER; # all users	88	our %PLAYER; # all users
74	our %MAP; # all maps	89	our %MAP; # all maps
75	our $LINK_MAP; # the special {link} map, which is always available	90	our $LINK_MAP; # the special {link} map, which is always available
76	our $RANDOM_MAPS = cf::localdir . "/random";
77	our $BDB_ENV_DIR = cf::localdir . "/db";
78
79	our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
80	our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
81		91
82	# used to convert map paths into valid unix filenames by replacing / by ∕	92	# used to convert map paths into valid unix filenames by replacing / by ∕
83	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	93	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
84		94
		95	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
		96	our $LOADAVG; # same thing, but with alpha-smoothing
		97	our $tick_start; # for load detecting purposes
		98
85	binmode STDOUT;	99	binmode STDOUT;
86	binmode STDERR;	100	binmode STDERR;
87		101
88	# read virtual server time, if available	102	# read virtual server time, if available
89	unless ($RUNTIME || !-e cf::localdir . "/runtime") {	103	unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
90	open my $fh, "<", cf::localdir . "/runtime"	104	open my $fh, "<", "$LOCALDIR/runtime"
91	or die "unable to read runtime file: $!";	105	or die "unable to read runtime file: $!";
92	$RUNTIME = <$fh> + 0.;	106	$RUNTIME = <$fh> + 0.;
93	}	107	}
94		108
95	mkdir cf::localdir;	109	mkdir $_
96	mkdir cf::localdir . "/" . cf::playerdir;	110	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
97	mkdir cf::localdir . "/" . cf::tmpdir;
98	mkdir cf::localdir . "/" . cf::uniquedir;
99	mkdir $RANDOM_MAPS;
100	mkdir $BDB_ENV_DIR;
101		111
102	our $EMERGENCY_POSITION;	112	our $EMERGENCY_POSITION;
103		113
104	sub cf::map::normalise;	114	sub cf::map::normalise;
105		115
…		…
116	=item $cf::RUNTIME	126	=item $cf::RUNTIME
117		127
118	The time this server has run, starts at 0 and is increased by $cf::TICK on	128	The time this server has run, starts at 0 and is increased by $cf::TICK on
119	every server tick.	129	every server tick.
120		130
121	=item $cf::LIBDIR	131	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
		132	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
		133	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
122		134
123	The perl library directory, where extensions and cf-specific modules can	135	Various directories - "/etc", read-only install directory, perl-library
124	be found. It will be added to C<@INC> automatically.	136	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
		137	unique-items directory, player file directory, random maps directory and
		138	database environment.
125		139
126	=item $cf::NOW	140	=item $cf::NOW
127		141
128	The time of the last (current) server tick.	142	The time of the last (current) server tick.
129		143
130	=item $cf::TICK	144	=item $cf::TICK
131		145
132	The interval between server ticks, in seconds.	146	The interval between server ticks, in seconds.
		147
		148	=item $cf::LOADAVG
		149
		150	The current CPU load on the server (alpha-smoothed), as a value between 0
		151	(none) and 1 (overloaded), indicating how much time is spent on processing
		152	objects per tick. Healthy values are < 0.5.
		153
		154	=item $cf::LOAD
		155
		156	The raw value load value from the last tick.
133		157
134	=item %cf::CFG	158	=item %cf::CFG
135		159
136	Configuration for the server, loaded from C</etc/crossfire/config>, or	160	Configuration for the server, loaded from C</etc/crossfire/config>, or
137	from wherever your confdir points to.	161	from wherever your confdir points to.
138		162
139	=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE	163	=item cf::wait_for_tick, cf::wait_for_tick_begin
140		164
141	These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)	165	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
142	or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick	166	returns directly I<after> the tick processing (and consequently, can only wake one process
143	processing has been done. Call C<< ->wait >> on them to maximise the	167	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
144	window of cpu time available, or simply to synchronise to the server tick.
145		168
146	=back	169	=back
147		170
148	=cut	171	=cut
149		172
150	BEGIN {	173	BEGIN {
151	*CORE::GLOBAL::warn = sub {	174	*CORE::GLOBAL::warn = sub {
152	my $msg = join "", @_;	175	my $msg = join "", @_;
153	utf8::encode $msg;
154		176
155	$msg .= "\n"	177	$msg .= "\n"
156	unless $msg =~ /\n$/;	178	unless $msg =~ /\n$/;
157		179
		180	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
		181
		182	utf8::encode $msg;
158	LOG llevError, $msg;	183	LOG llevError, $msg;
159	};	184	};
160	}	185	}
161		186
162	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	187	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
163	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	188	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
164	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	189	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
165	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	190	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
166	@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';	191	@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
		192	@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
167	@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';	193	@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
168		194
169	# we bless all objects into (empty) derived classes to force a method lookup	195	# we bless all objects into (empty) derived classes to force a method lookup
170	# within the Safe compartment.	196	# within the Safe compartment.
171	for my $pkg (qw(	197	for my $pkg (qw(
172	cf::global cf::attachable	198	cf::global cf::attachable
…		…
232	returned.	258	returned.
233		259
234	Lock names should begin with a unique identifier (for example, cf::map::find	260	Lock names should begin with a unique identifier (for example, cf::map::find
235	uses map_find and cf::map::load uses map_load).	261	uses map_find and cf::map::load uses map_load).
236		262
		263	=item $locked = cf::lock_active $string
		264
		265	Return true if the lock is currently active, i.e. somebody has locked it.
		266
237	=cut	267	=cut
238		268
239	our %LOCK;	269	our %LOCK;
240		270
241	sub lock_wait($) {	271	sub lock_wait($) {
…		…
258		288
259	Coro::guard {	289	Coro::guard {
260	# wake up all waiters, to be on the safe side	290	# wake up all waiters, to be on the safe side
261	$_->ready for @{ delete $LOCK{$key} };	291	$_->ready for @{ delete $LOCK{$key} };
262	}	292	}
		293	}
		294
		295	sub lock_active($) {
		296	my ($key) = @_;
		297
		298	! ! $LOCK{$key}
263	}	299	}
264		300
265	sub freeze_mainloop {	301	sub freeze_mainloop {
266	return unless $TICK_WATCHER->is_active;	302	return unless $TICK_WATCHER->is_active;
267		303
…		…
297		333
298	sub sync_job(&) {	334	sub sync_job(&) {
299	my ($job) = @_;	335	my ($job) = @_;
300		336
301	if ($Coro::current == $Coro::main) {	337	if ($Coro::current == $Coro::main) {
		338	my $time = Event::time;
		339
302	# this is the main coro, too bad, we have to block	340	# this is the main coro, too bad, we have to block
303	# till the operation succeeds, freezing the server :/	341	# till the operation succeeds, freezing the server :/
304		342
305	# TODO: use suspend/resume instead	343	# TODO: use suspend/resume instead
306	# (but this is cancel-safe)	344	# (but this is cancel-safe)
…		…
317		355
318	while ($busy) {	356	while ($busy) {
319	Coro::cede or Event::one_event;	357	Coro::cede or Event::one_event;
320	}	358	}
321		359
		360	$time = Event::time - $time;
		361
		362	LOG llevError | logBacktrace, Carp::longmess "long sync job"
		363	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
		364
		365	$tick_start += $time; # do not account sync jobs to server load
		366
322	wantarray ? @res : $res[0]	367	wantarray ? @res : $res[0]
323	} else {	368	} else {
324	# we are in another coroutine, how wonderful, everything just works	369	# we are in another coroutine, how wonderful, everything just works
325		370
326	$job->()	371	$job->()
…		…
346		391
347	$coro	392	$coro
348	}	393	}
349		394
350	sub write_runtime {	395	sub write_runtime {
		396	my $runtime = "$LOCALDIR/runtime";
		397
		398	# first touch the runtime file to show we are still running:
		399	# the fsync below can take a very very long time.
		400
		401	IO::AIO::aio_utime $runtime, undef, undef;
		402
351	my $guard = cf::lock_acquire "write_runtime";	403	my $guard = cf::lock_acquire "write_runtime";
352
353	my $runtime = cf::localdir . "/runtime";
354		404
355	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	405	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
356	or return;	406	or return;
357		407
358	my $value = $cf::RUNTIME + 90 + 10;	408	my $value = $cf::RUNTIME + 90 + 10;
…		…
364		414
365	# always fsync - this file is important	415	# always fsync - this file is important
366	aio_fsync $fh	416	aio_fsync $fh
367	and return;	417	and return;
368		418
		419	# touch it again to show we are up-to-date
		420	aio_utime $fh, undef, undef;
		421
369	close $fh	422	close $fh
370	or return;	423	or return;
371		424
372	aio_rename "$runtime~", $runtime	425	aio_rename "$runtime~", $runtime
373	and return;	426	and return;
		427
		428	warn "runtime file written.\n";
374		429
375	1	430	1
376	}	431	}
377		432
378	=item cf::datalog type => key => value, ...	433	=item cf::datalog type => key => value, ...
…		…
571	$registry = $CB_TYPE[$object_type] ||= [];	626	$registry = $CB_TYPE[$object_type] ||= [];
572		627
573	} elsif ($type eq "subtype") {	628	} elsif ($type eq "subtype") {
574	defined $object_type or Carp::croak "subtype specified without type";	629	defined $object_type or Carp::croak "subtype specified without type";
575	my $object_subtype = shift @arg;	630	my $object_subtype = shift @arg;
576	$registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= [];	631	$registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
577		632
578	} elsif ($type eq "package") {	633	} elsif ($type eq "package") {
579	my $pkg = shift @arg;	634	my $pkg = shift @arg;
580		635
581	while (my ($name, $id) = each %cb_id) {	636	while (my ($name, $id) = each %cb_id) {
…		…
622	if (ref $_[0]) {	677	if (ref $_[0]) {
623	_object_attach @_;	678	_object_attach @_;
624	} else {	679	} else {
625	_attach shift->_attach_registry, @_;	680	_attach shift->_attach_registry, @_;
626	}	681	}
		682	_recalc_want;
627	};	683	};
628		684
629	# all those should be optimised	685	# all those should be optimised
630	sub cf::attachable::detach {	686	sub cf::attachable::detach {
631	my ($obj, $name) = @_;	687	my ($obj, $name) = @_;
…		…
634	delete $obj->{_attachment}{$name};	690	delete $obj->{_attachment}{$name};
635	reattach ($obj);	691	reattach ($obj);
636	} else {	692	} else {
637	Carp::croak "cannot, currently, detach class attachments";	693	Carp::croak "cannot, currently, detach class attachments";
638	}	694	}
		695	_recalc_want;
639	};	696	};
640		697
641	sub cf::attachable::attached {	698	sub cf::attachable::attached {
642	my ($obj, $name) = @_;	699	my ($obj, $name) = @_;
643		700
…		…
816	or return;	873	or return;
817	$av = eval { (Storable::thaw $av)->{objs} };	874	$av = eval { (Storable::thaw $av)->{objs} };
818	}	875	}
819		876
820	warn sprintf "loading %s (%d)\n",	877	warn sprintf "loading %s (%d)\n",
821	$filename, length $data, scalar @{$av || []};#d#	878	$filename, length $data, scalar @{$av || []};
822	return ($data, $av);	879	return ($data, $av);
823	}	880	}
824		881
825	#############################################################################	882	#############################################################################
826	# command handling &c	883	# command handling &c
…		…
886		943
887	cf::override;	944	cf::override;
888	},	945	},
889	);	946	);
890		947
891	sub load_extension {
892	my ($path) = @_;
893
894	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
895	my $base = $1;
896	my $pkg = $1;
897	$pkg =~ s/[^[:word:]]/_/g;
898	$pkg = "ext::$pkg";
899
900	warn "... loading '$path' into '$pkg'\n";
901
902	open my $fh, "<:utf8", $path
903	or die "$path: $!";
904
905	my $source =
906	"package $pkg; use strict; use utf8;\n"
907	. "#line 1 \"$path\"\n{\n"
908	. (do { local $/; <$fh> })
909	. "\n};\n1";
910
911	unless (eval $source) {
912	my $msg = $@ ? "$path: $@\n"
913	: "extension disabled.\n";
914	if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
915	warn $@;
916	warn "mandatory extension failed to load, exiting.\n";
917	exit 1;
918	}
919	die $@;
920	}
921
922	push @EXTS, $pkg;
923	}
924
925	sub load_extensions {	948	sub load_extensions {
		949	cf::sync_job {
		950	my %todo;
		951
926	for my $ext (<$LIBDIR/*.ext>) {	952	for my $path (<$LIBDIR/*.ext>) {
927	next unless -r $ext;	953	next unless -r $path;
928	eval {	954
929	load_extension $ext;	955	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
		956	my $base = $1;
		957	my $pkg = $1;
		958	$pkg =~ s/[^[:word:]]/_/g;
		959	$pkg = "ext::$pkg";
		960
		961	open my $fh, "<:utf8", $path
		962	or die "$path: $!";
		963
		964	my $source = do { local $/; <$fh> };
		965
		966	my %ext = (
		967	path => $path,
		968	base => $base,
		969	pkg => $pkg,
		970	);
		971
		972	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
		973	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
		974
		975	$ext{source} =
		976	"package $pkg; use strict; use utf8;\n"
		977	. "#line 1 \"$path\"\n{\n"
		978	. $source
		979	. "\n};\n1";
		980
		981	$todo{$base} = \%ext;
		982	}
		983
		984	my %done;
		985	while (%todo) {
		986	my $progress;
		987
		988	while (my ($k, $v) = each %todo) {
		989	for (split /,\s*/, $v->{meta}{depends}) {
		990	goto skip
		991	unless exists $done{$_};
		992	}
		993
		994	warn "... loading '$k' into '$v->{pkg}'\n";
		995
		996	unless (eval $v->{source}) {
		997	my $msg = $@ ? "$v->{path}: $@\n"
		998	: "$v->{base}: extension inactive.\n";
		999
		1000	if (exists $v->{meta}{mandatory}) {
		1001	warn $msg;
		1002	warn "mandatory extension failed to load, exiting.\n";
		1003	exit 1;
		1004	}
		1005
		1006	warn $msg;
		1007	}
		1008
		1009	$done{$k} = delete $todo{$k};
		1010	push @EXTS, $v->{pkg};
		1011	$progress = 1;
930	1	1012	}
931	} or warn "$ext not loaded: $@";	1013
		1014	skip:
		1015	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
		1016	unless $progress;
		1017	}
932	}	1018	};
933	}	1019	}
934		1020
935	#############################################################################	1021	#############################################################################
936		1022
937	=head2 CORE EXTENSIONS	1023	=head2 CORE EXTENSIONS
…		…
953	Returns the given player object, loading it if necessary (might block).	1039	Returns the given player object, loading it if necessary (might block).
954		1040
955	=cut	1041	=cut
956		1042
957	sub playerdir($) {	1043	sub playerdir($) {
958	cf::localdir	1044	"$PLAYERDIR/"
959	. "/"
960	. cf::playerdir
961	. "/"
962	. (ref $_[0] ? $_[0]->ob->name : $_[0])	1045	. (ref $_[0] ? $_[0]->ob->name : $_[0])
963	}	1046	}
964		1047
965	sub path($) {	1048	sub path($) {
966	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];	1049	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
…		…
1086	while and may block, so not sync_job-capable, ever.	1169	while and may block, so not sync_job-capable, ever.
1087		1170
1088	=cut	1171	=cut
1089		1172
1090	sub list_logins {	1173	sub list_logins {
1091	my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir	1174	my $dirs = aio_readdir $PLAYERDIR
1092	or return [];	1175	or return [];
1093		1176
1094	my @logins;	1177	my @logins;
1095		1178
1096	for my $login (@$dirs) {	1179	for my $login (@$dirs) {
…		…
1157	my ($self, $type, %msg) = @_;	1240	my ($self, $type, %msg) = @_;
1158		1241
1159	$self->ns->ext_event ($type, %msg);	1242	$self->ns->ext_event ($type, %msg);
1160	}	1243	}
1161		1244
1162	package cf;	1245	=head3 cf::region
		1246
		1247	=over 4
		1248
		1249	=cut
		1250
		1251	package cf::region;
		1252
		1253	=item cf::region::find_by_path $path
		1254
		1255	Tries to decuce the probable region for a map knowing only its path.
		1256
		1257	=cut
		1258
		1259	sub find_by_path($) {
		1260	my ($path) = @_;
		1261
		1262	my ($match, $specificity);
		1263
		1264	for my $region (list) {
		1265	if ($region->match && $path =~ $region->match) {
		1266	($match, $specificity) = ($region, $region->specificity)
		1267	if $region->specificity > $specificity;
		1268	}
		1269	}
		1270
		1271	$match
		1272	}
1163		1273
1164	=back	1274	=back
1165
1166		1275
1167	=head3 cf::map	1276	=head3 cf::map
1168		1277
1169	=over 4	1278	=over 4
1170		1279
…		…
1225	my ($self, $merge) = @_;	1334	my ($self, $merge) = @_;
1226		1335
1227	# we have to keep some variables in memory intact	1336	# we have to keep some variables in memory intact
1228	local $self->{path};	1337	local $self->{path};
1229	local $self->{load_path};	1338	local $self->{load_path};
1230	local $self->{deny_save};
1231	local $self->{deny_reset};
1232		1339
1233	$self->SUPER::thawer_merge ($merge);	1340	$self->SUPER::thawer_merge ($merge);
1234	}	1341	}
1235		1342
1236	sub normalise {	1343	sub normalise {
…		…
1308		1415
1309	# the original (read-only) location	1416	# the original (read-only) location
1310	sub load_path {	1417	sub load_path {
1311	my ($self) = @_;	1418	my ($self) = @_;
1312		1419
1313	sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}	1420	"$MAPDIR/$self->{path}.map"
1314	}	1421	}
1315		1422
1316	# the temporary/swap location	1423	# the temporary/swap location
1317	sub save_path {	1424	sub save_path {
1318	my ($self) = @_;	1425	my ($self) = @_;
1319		1426
1320	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1427	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1321	sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path	1428	"$TMPDIR/$path.map"
1322	}	1429	}
1323		1430
1324	# the unique path, undef == no special unique path	1431	# the unique path, undef == no special unique path
1325	sub uniq_path {	1432	sub uniq_path {
1326	my ($self) = @_;	1433	my ($self) = @_;
1327		1434
1328	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1435	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1329	sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path	1436	"$UNIQUEDIR/$path"
1330	}	1437	}
1331		1438
1332	# and all this just because we cannot iterate over	1439	# and all this just because we cannot iterate over
1333	# all maps in C++...	1440	# all maps in C++...
1334	sub change_all_map_light {	1441	sub change_all_map_light {
1335	my ($change) = @_;	1442	my ($change) = @_;
1336		1443
1337	$_->change_map_light ($change)	1444	$_->change_map_light ($change)
1338	for grep $_->outdoor, values %cf::MAP;	1445	for grep $_->outdoor, values %cf::MAP;
		1446	}
		1447
		1448	sub decay_objects {
		1449	my ($self) = @_;
		1450
		1451	return if $self->{deny_reset};
		1452
		1453	$self->do_decay_objects;
1339	}	1454	}
1340		1455
1341	sub unlink_save {	1456	sub unlink_save {
1342	my ($self) = @_;	1457	my ($self) = @_;
1343		1458
…		…
1401	$self->load_header_orig	1516	$self->load_header_orig
1402	or return;	1517	or return;
1403	$self->prepare_orig;	1518	$self->prepare_orig;
1404	}	1519	}
1405		1520
		1521	$self->{deny_reset} = 1
		1522	if $self->no_reset;
		1523
		1524	$self->default_region (cf::region::find_by_path $self->{path})
		1525	unless $self->default_region;
		1526
1406	1	1527	1
1407	}	1528	}
1408		1529
1409	sub find;	1530	sub find;
1410	sub find {	1531	sub find {
…		…
1422	$map->{last_save} = $cf::RUNTIME;	1543	$map->{last_save} = $cf::RUNTIME;
1423		1544
1424	$map->load_header	1545	$map->load_header
1425	or return;	1546	or return;
1426		1547
1427	if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)	1548	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1428	# doing this can freeze the server in a sync job, obviously	1549	# doing this can freeze the server in a sync job, obviously
1429	#$cf::WAIT_FOR_TICK->wait;	1550	#$cf::WAIT_FOR_TICK->wait;
1430	$map->reset;	1551	$map->reset;
1431	undef $guard;	1552	undef $guard;
1432	return find $path;	1553	return find $path;
…		…
1443	my ($self) = @_;	1564	my ($self) = @_;
1444		1565
1445	local $self->{deny_reset} = 1; # loading can take a long time	1566	local $self->{deny_reset} = 1; # loading can take a long time
1446		1567
1447	my $path = $self->{path};	1568	my $path = $self->{path};
		1569
		1570	{
1448	my $guard = cf::lock_acquire "map_load:$path";	1571	my $guard = cf::lock_acquire "map_load:$path";
1449		1572
1450	return if $self->in_memory != cf::MAP_SWAPPED;	1573	return if $self->in_memory != cf::MAP_SWAPPED;
1451		1574
1452	$self->in_memory (cf::MAP_LOADING);	1575	$self->in_memory (cf::MAP_LOADING);
1453		1576
1454	$self->alloc;	1577	$self->alloc;
1455		1578
1456	$self->pre_load;	1579	$self->pre_load;
1457
1458	$self->_load_objects ($self->{load_path}, 1)
1459	or return;
1460
1461	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1462	if delete $self->{load_original};
1463
1464	if (my $uniq = $self->uniq_path) {
1465	utf8::encode $uniq;
1466	if (aio_open $uniq, O_RDONLY, 0) {
1467	$self->clear_unique_items;
1468	$self->_load_objects ($uniq, 0);
1469	}
1470	}
1471
1472	Coro::cede;
1473
1474	# now do the right thing for maps
1475	$self->link_multipart_objects;
1476
1477	unless ($self->{deny_activate}) {
1478	$self->decay_objects;
1479	$self->fix_auto_apply;
1480	$self->update_buttons;
1481	Coro::cede;	1580	Coro::cede;
1482	$self->set_darkness_map;	1581
		1582	$self->_load_objects ($self->{load_path}, 1)
		1583	or return;
		1584
		1585	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
		1586	if delete $self->{load_original};
		1587
		1588	if (my $uniq = $self->uniq_path) {
		1589	utf8::encode $uniq;
		1590	if (aio_open $uniq, O_RDONLY, 0) {
		1591	$self->clear_unique_items;
		1592	$self->_load_objects ($uniq, 0);
		1593	}
		1594	}
		1595
		1596	Coro::cede;
		1597	# now do the right thing for maps
		1598	$self->link_multipart_objects;
1483	$self->difficulty ($self->estimate_difficulty)	1599	$self->difficulty ($self->estimate_difficulty)
1484	unless $self->difficulty;	1600	unless $self->difficulty;
1485	Coro::cede;	1601	Coro::cede;
		1602
		1603	unless ($self->{deny_activate}) {
		1604	$self->decay_objects;
		1605	$self->fix_auto_apply;
		1606	$self->update_buttons;
		1607	Coro::cede;
		1608	$self->set_darkness_map;
		1609	Coro::cede;
1486	$self->activate;	1610	$self->activate;
		1611	}
		1612
		1613	$self->in_memory (cf::MAP_IN_MEMORY);
1487	}	1614	}
1488		1615
1489	$self->post_load;	1616	$self->post_load;
1490
1491	$self->in_memory (cf::MAP_IN_MEMORY);
1492	}	1617	}
1493		1618
1494	sub customise_for {	1619	sub customise_for {
1495	my ($self, $ob) = @_;	1620	my ($self, $ob) = @_;
1496		1621
1497	return find "~" . $ob->name . "/" . $self->{path}	1622	return find "~" . $ob->name . "/" . $self->{path}
1498	if $self->per_player;	1623	if $self->per_player;
		1624
		1625	# return find "?party/" . $ob->name . "/" . $self->{path}
		1626	# if $self->per_party;
1499		1627
1500	$self	1628	$self
1501	}	1629	}
1502		1630
1503	# find and load all maps in the 3x3 area around a map	1631	# find and load all maps in the 3x3 area around a map
…		…
1614		1742
1615	sub reset_at {	1743	sub reset_at {
1616	my ($self) = @_;	1744	my ($self) = @_;
1617		1745
1618	# TODO: safety, remove and allow resettable per-player maps	1746	# TODO: safety, remove and allow resettable per-player maps
1619	return 1e99 if $self->isa ("ext::map_per_player");#d#
1620	return 1e99 if $self->{deny_reset};	1747	return 1e99 if $self->{deny_reset};
1621		1748
1622	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;	1749	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1623	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;	1750	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1624		1751
…		…
1635	my ($self) = @_;	1762	my ($self) = @_;
1636		1763
1637	my $lock = cf::lock_acquire "map_data:$self->{path}";	1764	my $lock = cf::lock_acquire "map_data:$self->{path}";
1638		1765
1639	return if $self->players;	1766	return if $self->players;
1640	return if $self->isa ("ext::map_per_player");#d#
1641		1767
1642	warn "resetting map ", $self->path;#d#	1768	warn "resetting map ", $self->path;
1643		1769
1644	$self->in_memory (cf::MAP_SWAPPED);	1770	$self->in_memory (cf::MAP_SWAPPED);
1645		1771
1646	# need to save uniques path	1772	# need to save uniques path
1647	unless ($self->{deny_save}) {	1773	unless ($self->{deny_save}) {
…		…
1679	$cf::MAP{$self->path} = $self;	1805	$cf::MAP{$self->path} = $self;
1680		1806
1681	$self->reset; # polite request, might not happen	1807	$self->reset; # polite request, might not happen
1682	}	1808	}
1683		1809
		1810	=item $maps = cf::map::tmp_maps
		1811
		1812	Returns an arrayref with all map paths of currently instantiated and saved
		1813	maps. May block.
		1814
		1815	=cut
		1816
		1817	sub tmp_maps() {
		1818	[
		1819	map {
		1820	utf8::decode $_;
		1821	/\.map$/
		1822	? normalise $_
		1823	: ()
		1824	} @{ aio_readdir $TMPDIR or [] }
		1825	]
		1826	}
		1827
		1828	=item $maps = cf::map::random_maps
		1829
		1830	Returns an arrayref with all map paths of currently instantiated and saved
		1831	random maps. May block.
		1832
		1833	=cut
		1834
		1835	sub random_maps() {
		1836	[
		1837	map {
		1838	utf8::decode $_;
		1839	/\.map$/
		1840	? normalise "?random/$_"
		1841	: ()
		1842	} @{ aio_readdir $RANDOMDIR or [] }
		1843	]
		1844	}
		1845
1684	=item cf::map::unique_maps	1846	=item cf::map::unique_maps
1685		1847
1686	Returns an arrayref of paths of all shared maps that have	1848	Returns an arrayref of paths of all shared maps that have
1687	instantiated unique items. May block.	1849	instantiated unique items. May block.
1688		1850
1689	=cut	1851	=cut
1690		1852
1691	sub unique_maps() {	1853	sub unique_maps() {
1692	my $files = aio_readdir cf::localdir . "/" . cf::uniquedir	1854	[
1693	or return;	1855	map {
1694
1695	my @paths;
1696
1697	for (@$files) {
1698	utf8::decode $_;	1856	utf8::decode $_;
1699	next if /\.pst$/;	1857	/\.map$/
1700	next unless /^$PATH_SEP/o;	1858	? normalise $_
1701		1859	: ()
1702	push @paths, cf::map::normalise $_;	1860	} @{ aio_readdir $UNIQUEDIR or [] }
1703	}	1861	]
1704
1705	\@paths
1706	}	1862	}
1707		1863
1708	package cf;	1864	package cf;
1709		1865
1710	=back	1866	=back
…		…
1816	$self->deactivate_recursive;	1972	$self->deactivate_recursive;
1817		1973
1818	return if UNIVERSAL::isa $self->map, "ext::map_link";	1974	return if UNIVERSAL::isa $self->map, "ext::map_link";
1819		1975
1820	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	1976	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1821	if $self->map;	1977	if $self->map && $self->map->{path} ne "{link}";
1822		1978
1823	$self->enter_map ($LINK_MAP || link_map, 10, 10);	1979	$self->enter_map ($LINK_MAP || link_map, 10, 10);
1824	}	1980	}
1825		1981
1826	sub cf::object::player::leave_link {	1982	sub cf::object::player::leave_link {
1827	my ($self, $map, $x, $y) = @_;	1983	my ($self, $map, $x, $y) = @_;
		1984
		1985	return unless $self->contr->active;
1828		1986
1829	my $link_pos = delete $self->{_link_pos};	1987	my $link_pos = delete $self->{_link_pos};
1830		1988
1831	unless ($map) {	1989	unless ($map) {
1832	# restore original map position	1990	# restore original map position
…		…
1855		2013
1856	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2014	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1857	$self->enter_map ($map, $x, $y);	2015	$self->enter_map ($map, $x, $y);
1858	}	2016	}
1859		2017
1860	cf::player->attach (
1861	on_logout => sub {
1862	my ($pl) = @_;
1863
1864	# abort map switching before logout
1865	if ($pl->ob->{_link_pos}) {
1866	cf::sync_job {
1867	$pl->ob->leave_link
1868	};
1869	}
1870	},
1871	on_login => sub {
1872	my ($pl) = @_;
1873
1874	# try to abort aborted map switching on player login :)
1875	# should happen only on crashes
1876	if ($pl->ob->{_link_pos}) {
1877	$pl->ob->enter_link;
1878	(async {
1879	$pl->ob->reply (undef,
1880	"There was an internal problem at your last logout, "
1881	. "the server will try to bring you to your intended destination in a second.",
1882	cf::NDI_RED);
1883	# we need this sleep as the login has a concurrent enter_exit running
1884	# and this sleep increases chances of the player not ending up in scorn
1885	Coro::Timer::sleep 1;
1886	$pl->ob->leave_link;
1887	})->prio (2);
1888	}
1889	},
1890	);
1891
1892	=item $player_object->goto ($path, $x, $y)	2018	=item $player_object->goto ($path, $x, $y[, $check->($map)])
1893		2019
		2020	Moves the player to the given map-path and coordinates by first freezing
		2021	her, loading and preparing them map, calling the provided $check callback
		2022	that has to return the map if sucecssful, and then unfreezes the player on
		2023	the new (success) or old (failed) map position.
		2024
1894	=cut	2025	=cut
		2026
		2027	our $GOTOGEN;
1895		2028
1896	sub cf::object::player::goto {	2029	sub cf::object::player::goto {
1897	my ($self, $path, $x, $y) = @_;	2030	my ($self, $path, $x, $y, $check) = @_;
		2031
		2032	# do generation counting so two concurrent goto's will be executed in-order
		2033	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1898		2034
1899	$self->enter_link;	2035	$self->enter_link;
1900		2036
1901	(async {	2037	(async {
1902	my $map = eval {	2038	my $map = eval {
1903	my $map = cf::map::find $path;	2039	my $map = cf::map::find $path;
		2040
		2041	if ($map) {
1904	$map = $map->customise_for ($self) if $map;	2042	$map = $map->customise_for ($self);
		2043	$map = $check->($map) if $check && $map;
		2044	} else {
		2045	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
		2046	}
		2047
1905	$map	2048	$map
		2049	};
		2050
		2051	if ($@) {
		2052	$self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
		2053	LOG llevError | logBacktrace, Carp::longmess $@;
1906	} or	2054	}
1907	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1908		2055
		2056	if ($gen == $self->{_goto_generation}) {
		2057	delete $self->{_goto_generation};
1909	$self->leave_link ($map, $x, $y);	2058	$self->leave_link ($map, $x, $y);
		2059	}
1910	})->prio (1);	2060	})->prio (1);
1911	}	2061	}
1912		2062
1913	=item $player_object->enter_exit ($exit_object)	2063	=item $player_object->enter_exit ($exit_object)
1914		2064
…		…
1953		2103
1954	$rmp->{random_seed} ||= $exit->random_seed;	2104	$rmp->{random_seed} ||= $exit->random_seed;
1955		2105
1956	my $data = cf::to_json $rmp;	2106	my $data = cf::to_json $rmp;
1957	my $md5 = Digest::MD5::md5_hex $data;	2107	my $md5 = Digest::MD5::md5_hex $data;
1958	my $meta = "$cf::RANDOM_MAPS/$md5.meta";	2108	my $meta = "$RANDOMDIR/$md5.meta";
1959		2109
1960	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2110	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1961	aio_write $fh, 0, (length $data), $data, 0;	2111	aio_write $fh, 0, (length $data), $data, 0;
1962	undef $fh;	2112	undef $fh;
1963	aio_rename "$meta~", $meta;	2113	aio_rename "$meta~", $meta;
…		…
2232	#############################################################################	2382	#############################################################################
2233		2383
2234	=head2 EXTENSION DATABASE SUPPORT	2384	=head2 EXTENSION DATABASE SUPPORT
2235		2385
2236	Crossfire maintains a very simple database for extension use. It can	2386	Crossfire maintains a very simple database for extension use. It can
2237	currently store anything that can be serialised using Storable, which	2387	currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2238	excludes objects.	2388	convert to/from binary).
2239		2389
2240	The parameter C<$family> should best start with the name of the extension	2390	The parameter C<$family> should best start with the name of the extension
2241	using it, it should be unique.	2391	using it, it should be unique.
2242		2392
2243	=over 4	2393	=over 4
…		…
2266	BDB::CREATE | BDB::AUTO_COMMIT, 0666;	2416	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2267	cf::cleanup "db_open(db): $!" if $!;	2417	cf::cleanup "db_open(db): $!" if $!;
2268	};	2418	};
2269	cf::cleanup "db_open(db): $@" if $@;	2419	cf::cleanup "db_open(db): $@" if $@;
2270	};	2420	};
2271
2272	my $path = cf::localdir . "/database.pst";
2273	if (stat $path) {
2274	cf::sync_job {
2275	my $pst = Storable::retrieve $path;
2276
2277	cf::db_put (board => data => $pst->{board});
2278	cf::db_put (guildrules => data => $pst->{guildrules});
2279	cf::db_put (rent => balance => $pst->{rent}{balance});
2280	BDB::db_env_txn_checkpoint $DB_ENV;
2281
2282	unlink $path;
2283	};
2284	}
2285	}	2421	}
2286	}	2422	}
2287		2423
2288	sub db_get($$) {	2424	sub db_get($$) {
2289	my $key = "$_[0]/$_[1]";	2425	my $key = "$_[0]/$_[1]";
2290		2426
2291	cf::sync_job {	2427	cf::sync_job {
2292	BDB::db_get $DB, undef, $key, my $data;	2428	BDB::db_get $DB, undef, $key, my $data;
2293		2429
2294	$! ? ()	2430	$! ? ()
2295	: Compress::LZF::sthaw $data	2431	: $data
2296	}	2432	}
2297	}	2433	}
2298		2434
2299	sub db_put($$$) {	2435	sub db_put($$$) {
2300	BDB::dbreq_pri 4;	2436	BDB::dbreq_pri 4;
2301	BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };	2437	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
		2438	}
		2439
		2440	=item cf::cache $id => [$paths...], $processversion => $process
		2441
		2442	Generic caching function that returns the value of the resource $id,
		2443	caching and regenerating as required.
		2444
		2445	This function can block.
		2446
		2447	=cut
		2448
		2449	sub cache {
		2450	my ($id, $src, $processversion, $process) = @_;
		2451
		2452	my $meta =
		2453	join "\x00",
		2454	$processversion,
		2455	map {
		2456	aio_stat $_
		2457	and Carp::croak "$_: $!";
		2458
		2459	($_, (stat _)[7,9])
		2460	} @$src;
		2461
		2462	my $dbmeta = db_get cache => "$id/meta";
		2463	if ($dbmeta ne $meta) {
		2464	# changed, we may need to process
		2465
		2466	my @data;
		2467	my $md5;
		2468
		2469	for (0 .. $#$src) {
		2470	0 <= aio_load $src->[$_], $data[$_]
		2471	or Carp::croak "$src->[$_]: $!";
		2472	}
		2473
		2474	# if processing is expensive, check
		2475	# checksum first
		2476	if (1) {
		2477	$md5 =
		2478	join "\x00",
		2479	$processversion,
		2480	map {
		2481	Coro::cede;
		2482	($src->[$_], Digest::MD5::md5_hex $data[$_])
		2483	} 0.. $#$src;
		2484
		2485
		2486	my $dbmd5 = db_get cache => "$id/md5";
		2487	if ($dbmd5 eq $md5) {
		2488	db_put cache => "$id/meta", $meta;
		2489
		2490	return db_get cache => "$id/data";
		2491	}
		2492	}
		2493
		2494	my $t1 = Time::HiRes::time;
		2495	my $data = $process->(\@data);
		2496	my $t2 = Time::HiRes::time;
		2497
		2498	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
		2499
		2500	db_put cache => "$id/data", $data;
		2501	db_put cache => "$id/md5" , $md5;
		2502	db_put cache => "$id/meta", $meta;
		2503
		2504	return $data;
		2505	}
		2506
		2507	db_get cache => "$id/data"
		2508	}
		2509
		2510	=item fork_call { }, $args
		2511
		2512	Executes the given code block with the given arguments in a seperate
		2513	process, returning the results. Everything must be serialisable with
		2514	Coro::Storable. May, of course, block. Note that the executed sub may
		2515	never block itself or use any form of Event handling.
		2516
		2517	=cut
		2518
		2519	sub fork_call(&@) {
		2520	my ($cb, @args) = @_;
		2521
		2522	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
		2523	# or die "socketpair: $!";
		2524	pipe my $fh1, my $fh2
		2525	or die "pipe: $!";
		2526
		2527	if (my $pid = fork) {
		2528	close $fh2;
		2529
		2530	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
		2531	$res = Coro::Storable::thaw $res;
		2532
		2533	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
		2534
		2535	die $$res unless "ARRAY" eq ref $res;
		2536
		2537	return wantarray ? @$res : $res->[-1];
		2538	} else {
		2539	reset_signals;
		2540	local $SIG{__WARN__};
		2541	local $SIG{__DIE__};
		2542	eval {
		2543	close $fh1;
		2544
		2545	my @res = eval { $cb->(@args) };
		2546	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
		2547	};
		2548
		2549	warn $@ if $@;
		2550	_exit 0;
		2551	}
2302	}	2552	}
2303		2553
2304	#############################################################################	2554	#############################################################################
2305	# the server's init and main functions	2555	# the server's init and main functions
2306		2556
2307	sub load_facedata {	2557	sub load_facedata($) {
2308	my $path = sprintf "%s/facedata", cf::datadir;	2558	my ($path) = @_;
2309		2559
2310	warn "loading facedata from $path\n";	2560	warn "loading facedata from $path\n";
2311		2561
2312	my $faces;	2562	my $facedata;
2313	0 < aio_load $path, $faces	2563	0 < aio_load $path, $facedata
2314	or die "$path: $!";	2564	or die "$path: $!";
2315		2565
2316	Coro::cede;
2317	$faces = Storable::thaw $faces;	2566	$facedata = Coro::Storable::thaw $facedata;
2318	Coro::cede;
2319		2567
2320	my $meta = delete $faces->{""};
2321	$meta->{version} == 1	2568	$facedata->{version} == 2
2322	or cf::cleanup "$path: version mismatch, cannot proceed.";	2569	or cf::cleanup "$path: version mismatch, cannot proceed.";
2323		2570
		2571	{
		2572	my $faces = $facedata->{faceinfo};
		2573
2324	while (my ($face, $info) = each %$faces) {	2574	while (my ($face, $info) = each %$faces) {
2325	my $idx = (cf::face::find $face) || cf::face::alloc $face;	2575	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2326	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	2576	cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2327	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	2577	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2328	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	2578	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2329	Coro::cede;	2579	Coro::cede;
2330	}	2580	}
2331		2581
2332	while (my ($face, $info) = each %$faces) {	2582	while (my ($face, $info) = each %$faces) {
2333	next unless $info->{smooth};	2583	next unless $info->{smooth};
2334	my $idx = cf::face::find $face	2584	my $idx = cf::face::find $face
2335	or next;	2585	or next;
2336	if (my $smooth = cf::face::find $info->{smooth}) {	2586	if (my $smooth = cf::face::find $info->{smooth}) {
2337	cf::face::set_smooth $idx, $smooth;	2587	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2338	} else {	2588	} else {
2339	warn "smooth face '$info->{smooth}' not found for face '$face'";	2589	warn "smooth face '$info->{smooth}' not found for face '$face'";
2340	}	2590	}
2341	Coro::cede;	2591	Coro::cede;
		2592	}
		2593	}
		2594
		2595	{
		2596	my $anims = $facedata->{animinfo};
		2597
		2598	while (my ($anim, $info) = each %$anims) {
		2599	cf::anim::set $anim, $info->{frames}, $info->{facings};
		2600	Coro::cede;
		2601	}
		2602
		2603	cf::anim::invalidate_all; # d'oh
2342	}	2604	}
2343		2605
2344	1	2606	1
2345	}	2607	}
2346		2608
		2609	sub reload_regions {
		2610	load_resource_file "$MAPDIR/regions"
		2611	or die "unable to load regions file\n";
		2612	}
		2613
		2614	sub reload_facedata {
		2615	load_facedata "$DATADIR/facedata"
		2616	or die "unable to load facedata\n";
		2617	}
		2618
		2619	sub reload_archetypes {
		2620	load_resource_file "$DATADIR/archetypes"
		2621	or die "unable to load archetypes\n";
		2622	}
		2623
		2624	sub reload_treasures {
		2625	load_resource_file "$DATADIR/treasures"
		2626	or die "unable to load treasurelists\n";
		2627	}
		2628
2347	sub reload_resources {	2629	sub reload_resources {
2348	load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir	2630	warn "reloading resource files...\n";
2349	or die "unable to load regions file\n";#d#	2631
		2632	reload_regions;
2350	load_facedata	2633	reload_facedata;
2351	or die "unable to load facedata\n";#d#	2634	#reload_archetypes;#d#
		2635	reload_archetypes;
		2636	reload_treasures;
		2637
		2638	warn "finished reloading resource files\n";
2352	}	2639	}
2353		2640
2354	sub init {	2641	sub init {
2355	reload_resources;	2642	reload_resources;
2356	}	2643	}
2357		2644
2358	sub cfg_load {	2645	sub cfg_load {
2359	open my $fh, "<:utf8", cf::confdir . "/config"	2646	open my $fh, "<:utf8", "$CONFDIR/config"
2360	or return;	2647	or return;
2361		2648
2362	local $/;	2649	local $/;
2363	*CFG = YAML::Syck::Load <$fh>;	2650	*CFG = YAML::Syck::Load <$fh>;
2364		2651
…		…
2449		2736
2450	warn Carp::longmess "post_cleanup backtrace"	2737	warn Carp::longmess "post_cleanup backtrace"
2451	if $make_core;	2738	if $make_core;
2452	}	2739	}
2453		2740
2454	sub reload() {	2741	sub do_reload_perl() {
2455	# can/must only be called in main	2742	# can/must only be called in main
2456	if ($Coro::current != $Coro::main) {	2743	if ($Coro::current != $Coro::main) {
2457	warn "can only reload from main coroutine";	2744	warn "can only reload from main coroutine";
2458	return;	2745	return;
2459	}	2746	}
…		…
2534	Symbol::delete_package "safe::$_"	2821	Symbol::delete_package "safe::$_"
2535	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	2822	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2536		2823
2537	warn "unloading cf.pm \"a bit\"";	2824	warn "unloading cf.pm \"a bit\"";
2538	delete $INC{"cf.pm"};	2825	delete $INC{"cf.pm"};
		2826	delete $INC{"cf/pod.pm"};
2539		2827
2540	# don't, removes xs symbols, too,	2828	# don't, removes xs symbols, too,
2541	# and global variables created in xs	2829	# and global variables created in xs
2542	#Symbol::delete_package __PACKAGE__;	2830	#Symbol::delete_package __PACKAGE__;
2543		2831
…		…
2558	warn "reattaching attachments to maps";	2846	warn "reattaching attachments to maps";
2559	reattach $_ for values %MAP;	2847	reattach $_ for values %MAP;
2560	warn "reattaching attachments to players";	2848	warn "reattaching attachments to players";
2561	reattach $_ for values %PLAYER;	2849	reattach $_ for values %PLAYER;
2562		2850
2563	warn "loading reloadable resources";
2564	reload_resources;
2565
2566	warn "leaving sync_job";	2851	warn "leaving sync_job";
2567		2852
2568	1	2853	1
2569	} or do {	2854	} or do {
2570	warn $@;	2855	warn $@;
…		…
2575	warn "reloaded";	2860	warn "reloaded";
2576	};	2861	};
2577		2862
2578	our $RELOAD_WATCHER; # used only during reload	2863	our $RELOAD_WATCHER; # used only during reload
2579		2864
		2865	sub reload_perl() {
		2866	# doing reload synchronously and two reloads happen back-to-back,
		2867	# coro crashes during coro_state_free->destroy here.
		2868
		2869	$RELOAD_WATCHER ||= Event->timer (
		2870	reentrant => 0,
		2871	after => 0,
		2872	data => WF_AUTOCANCEL,
		2873	cb => sub {
		2874	do_reload_perl;
		2875	undef $RELOAD_WATCHER;
		2876	},
		2877	);
		2878	}
		2879
2580	register_command "reload" => sub {	2880	register_command "reload" => sub {
2581	my ($who, $arg) = @_;	2881	my ($who, $arg) = @_;
2582		2882
2583	if ($who->flag (FLAG_WIZ)) {	2883	if ($who->flag (FLAG_WIZ)) {
2584	$who->message ("reloading server.");	2884	$who->message ("reloading server.");
2585		2885	async { reload_perl };
2586	# doing reload synchronously and two reloads happen back-to-back,
2587	# coro crashes during coro_state_free->destroy here.
2588
2589	$RELOAD_WATCHER ||= Event->timer (
2590	reentrant => 0,
2591	after => 0,
2592	data => WF_AUTOCANCEL,
2593	cb => sub {
2594	reload;
2595	undef $RELOAD_WATCHER;
2596	},
2597	);
2598	}	2886	}
2599	};	2887	};
2600		2888
2601	unshift @INC, $LIBDIR;	2889	unshift @INC, $LIBDIR;
2602		2890
2603	my $bug_warning = 0;	2891	my $bug_warning = 0;
2604		2892
		2893	our @WAIT_FOR_TICK;
		2894	our @WAIT_FOR_TICK_BEGIN;
		2895
		2896	sub wait_for_tick {
		2897	return unless $TICK_WATCHER->is_active;
		2898	return if $Coro::current == $Coro::main;
		2899
		2900	my $signal = new Coro::Signal;
		2901	push @WAIT_FOR_TICK, $signal;
		2902	$signal->wait;
		2903	}
		2904
		2905	sub wait_for_tick_begin {
		2906	return unless $TICK_WATCHER->is_active;
		2907	return if $Coro::current == $Coro::main;
		2908
		2909	my $signal = new Coro::Signal;
		2910	push @WAIT_FOR_TICK_BEGIN, $signal;
		2911	$signal->wait;
		2912	}
		2913
		2914	my $min = 1e6;#d#
		2915	my $avg = 10;
2605	$TICK_WATCHER = Event->timer (	2916	$TICK_WATCHER = Event->timer (
2606	reentrant => 0,	2917	reentrant => 0,
2607	parked => 1,	2918	parked => 1,
2608	prio => 0,	2919	prio => 0,
2609	at => $NEXT_TICK || $TICK,	2920	at => $NEXT_TICK || $TICK,
…		…
2613	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	2924	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2614	unless ++$bug_warning > 10;	2925	unless ++$bug_warning > 10;
2615	return;	2926	return;
2616	}	2927	}
2617		2928
2618	$NOW = Event::time;	2929	$NOW = $tick_start = Event::time;
2619		2930
2620	cf::server_tick; # one server iteration	2931	cf::server_tick; # one server iteration
		2932
		2933	0 && sync_job {#d#
		2934	for(1..10) {
		2935	my $t = Event::time;
		2936	my $map = my $map = new_from_path cf::map "/tmp/x.map"
		2937	or die;
		2938
		2939	$map->width (50);
		2940	$map->height (50);
		2941	$map->alloc;
		2942	$map->_load_objects ("/tmp/x.map", 1);
		2943	my $t = Event::time - $t;
		2944
		2945	#next unless $t < 0.0013;#d#
		2946	if ($t < $min) {
		2947	$min = $t;
		2948	}
		2949	$avg = $avg * 0.99 + $t * 0.01;
		2950	}
		2951	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
		2952	exit 0;
		2953	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
		2954	};
		2955
2621	$RUNTIME += $TICK;	2956	$RUNTIME += $TICK;
2622	$NEXT_TICK += $TICK;	2957	$NEXT_TICK += $TICK;
2623		2958
2624	if ($NOW >= $NEXT_RUNTIME_WRITE) {	2959	if ($NOW >= $NEXT_RUNTIME_WRITE) {
2625	$NEXT_RUNTIME_WRITE = $NOW + 10;	2960	$NEXT_RUNTIME_WRITE = $NOW + 10;
…		…
2627	write_runtime	2962	write_runtime
2628	or warn "ERROR: unable to write runtime file: $!";	2963	or warn "ERROR: unable to write runtime file: $!";
2629	};	2964	};
2630	}	2965	}
2631		2966
2632	$WAIT_FOR_TICK->broadcast;
2633	$WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2634
2635	# my $AFTER = Event::time;	2967	# my $AFTER = Event::time;
2636	# warn $AFTER - $NOW;#d#	2968	# warn $AFTER - $NOW;#d#
2637		2969
		2970	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
		2971	$sig->send;
		2972	}
		2973	while (my $sig = shift @WAIT_FOR_TICK) {
		2974	$sig->send;
		2975	}
		2976
		2977	$NOW = Event::time;
		2978
2638	# if we are delayed by four ticks or more, skip them all	2979	# if we are delayed by four ticks or more, skip them all
2639	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2980	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2640		2981
2641	$TICK_WATCHER->at ($NEXT_TICK);	2982	$TICK_WATCHER->at ($NEXT_TICK);
2642	$TICK_WATCHER->start;	2983	$TICK_WATCHER->start;
		2984
		2985	$LOAD = ($NOW - $tick_start) / $TICK;
		2986	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
		2987
		2988	_post_tick;
		2989
		2990
2643	},	2991	},
2644	);	2992	);
2645		2993
2646	{	2994	{
2647	BDB::max_poll_time $TICK * 0.1;	2995	BDB::max_poll_time $TICK * 0.1;
…		…
2675		3023
2676	cf::sync_job {	3024	cf::sync_job {
2677	eval {	3025	eval {
2678	BDB::db_env_open	3026	BDB::db_env_open
2679	$DB_ENV,	3027	$DB_ENV,
2680	$BDB_ENV_DIR,	3028	$BDBDIR,
2681	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3029	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2682	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3030	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2683	0666;	3031	0666;
2684		3032
2685	cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;	3033	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2686		3034
2687	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);	3035	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2688	$DB_ENV->set_lk_detect;	3036	$DB_ENV->set_lk_detect;
2689	};	3037	};
2690		3038
…		…
2706	prio => 6,	3054	prio => 6,
2707	cb => \&IO::AIO::poll_cb,	3055	cb => \&IO::AIO::poll_cb,
2708	);	3056	);
2709	}	3057	}
2710		3058
		3059	my $_log_backtrace;
		3060
		3061	sub _log_backtrace {
		3062	my ($msg, @addr) = @_;
		3063
		3064	$msg =~ s/\n//;
		3065
		3066	# limit the # of concurrent backtraces
		3067	if ($_log_backtrace < 2) {
		3068	++$_log_backtrace;
		3069	async {
		3070	my @bt = fork_call {
		3071	@addr = map { sprintf "%x", $_ } @addr;
		3072	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
		3073	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
		3074	or die "addr2line: $!";
		3075
		3076	my @funcs;
		3077	my @res = <$fh>;
		3078	chomp for @res;
		3079	while (@res) {
		3080	my ($func, $line) = splice @res, 0, 2, ();
		3081	push @funcs, "[$func] $line";
		3082	}
		3083
		3084	@funcs
		3085	};
		3086
		3087	LOG llevInfo, "[ABT] $msg\n";
		3088	LOG llevInfo, "[ABT] $_\n" for @bt;
		3089	--$_log_backtrace;
		3090	};
		3091	} else {
		3092	LOG llevInfo, "[ABT] $msg\n";
		3093	LOG llevInfo, "[ABT] [suppressed]\n";
		3094	}
		3095	}
		3096
		3097	# load additional modules
		3098	use cf::pod;
		3099
2711	END { cf::emergency_save }	3100	END { cf::emergency_save }
2712		3101
2713	1	3102	1
2714		3103

Diff Legend

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