[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.449 by root, Sat Sep 20 00:09:27 2008 UTC vs.
Revision 1.486 by root, Thu Oct 15 21:56:50 2009 UTC

…		…
1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# it under the terms of the GNU General Public License as published by	7	# the terms of the Affero GNU General Public License as published by the
8	# the Free Software Foundation, either version 3 of the License, or	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# (at your option) any later version.	9	# option) any later version.
10	#	10	#
11	# This program is distributed in the hope that it will be useful,	11	# This program is distributed in the hope that it will be useful,
12	# but WITHOUT ANY WARRANTY; without even the implied warranty of	12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	# GNU General Public License for more details.	14	# GNU General Public License for more details.
15	#	15	#
16	# You should have received a copy of the GNU General Public License	16	# You should have received a copy of the Affero GNU General Public License
17	# along with this program. If not, see <http://www.gnu.org/licenses/>.	17	# and the GNU General Public License along with this program. If not, see
		18	# <http://www.gnu.org/licenses/>.
18	#	19	#
19	# The authors can be reached via e-mail to <support@deliantra.net>	20	# The authors can be reached via e-mail to <support@deliantra.net>
20	#	21	#
21		22
22	package cf;	23	package cf;
23		24
24	use 5.10.0;	25	use 5.10.0;
25	use utf8;	26	use utf8;
26	use strict "vars", "subs";	27	use strict qw(vars subs);
27		28
28	use Symbol;	29	use Symbol;
29	use List::Util;	30	use List::Util;
30	use Socket;	31	use Socket;
31	use EV;	32	use EV;
32	use Opcode;	33	use Opcode;
33	use Safe;	34	use Safe;
34	use Safe::Hole;	35	use Safe::Hole;
35	use Storable ();	36	use Storable ();
36		37
		38	use Guard ();
37	use Coro ();	39	use Coro ();
38	use Coro::State;	40	use Coro::State;
39	use Coro::Handle;	41	use Coro::Handle;
40	use Coro::EV;	42	use Coro::EV;
41	use Coro::AnyEvent;	43	use Coro::AnyEvent;
42	use Coro::Timer;	44	use Coro::Timer;
43	use Coro::Signal;	45	use Coro::Signal;
44	use Coro::Semaphore;	46	use Coro::Semaphore;
		47	use Coro::SemaphoreSet;
45	use Coro::AnyEvent;	48	use Coro::AnyEvent;
46	use Coro::AIO;	49	use Coro::AIO;
47	use Coro::BDB 1.6;	50	use Coro::BDB 1.6;
48	use Coro::Storable;	51	use Coro::Storable;
49	use Coro::Util ();	52	use Coro::Util ();
51	use JSON::XS 2.01 ();	54	use JSON::XS 2.01 ();
52	use BDB ();	55	use BDB ();
53	use Data::Dumper;	56	use Data::Dumper;
54	use Digest::MD5;	57	use Digest::MD5;
55	use Fcntl;	58	use Fcntl;
56	use YAML ();	59	use YAML::XS ();
57	use IO::AIO ();	60	use IO::AIO ();
58	use Time::HiRes;	61	use Time::HiRes;
59	use Compress::LZF;	62	use Compress::LZF;
60	use Digest::MD5 ();	63	use Digest::MD5 ();
61		64
…		…
69	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	72	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70		73
71	# make sure c-lzf reinitialises itself	74	# make sure c-lzf reinitialises itself
72	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";	75	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	76	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
		77
		78	# strictly for debugging
		79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
74		80
75	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
76		82
77	our %COMMAND = ();	83	our %COMMAND = ();
78	our %COMMAND_TIME = ();	84	our %COMMAND_TIME = ();
…		…
81	our %EXTCMD = ();	87	our %EXTCMD = ();
82	our %EXTICMD = ();	88	our %EXTICMD = ();
83	our %EXT_CORO = (); # coroutines bound to extensions	89	our %EXT_CORO = (); # coroutines bound to extensions
84	our %EXT_MAP = (); # pluggable maps	90	our %EXT_MAP = (); # pluggable maps
85		91
86	our $RELOAD; # number of reloads so far	92	our $RELOAD; # number of reloads so far, non-zero while in reload
87	our @EVENT;	93	our @EVENT;
		94	our @REFLECT; # set by XS
		95	our %REFLECT; # set by us
88		96
89	our $CONFDIR = confdir;	97	our $CONFDIR = confdir;
90	our $DATADIR = datadir;	98	our $DATADIR = datadir;
91	our $LIBDIR = "$DATADIR/ext";	99	our $LIBDIR = "$DATADIR/ext";
92	our $PODDIR = "$DATADIR/pod";	100	our $PODDIR = "$DATADIR/pod";
…		…
103	our %RESOURCE;	111	our %RESOURCE;
104		112
105	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	113	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	114	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107	our $NEXT_TICK;	115	our $NEXT_TICK;
108	our $USE_FSYNC = 1; # use fsync to write maps - default off	116	our $USE_FSYNC = 1; # use fsync to write maps - default on
109		117
110	our $BDB_DEADLOCK_WATCHER;	118	our $BDB_DEADLOCK_WATCHER;
111	our $BDB_CHECKPOINT_WATCHER;	119	our $BDB_CHECKPOINT_WATCHER;
112	our $BDB_TRICKLE_WATCHER;	120	our $BDB_TRICKLE_WATCHER;
113	our $DB_ENV;	121	our $DB_ENV;
114		122
		123	our @EXTRA_MODULES = qw(pod match mapscript);
		124
115	our %CFG;	125	our %CFG;
116		126
117	our $UPTIME; $UPTIME \|\|= time;	127	our $UPTIME; $UPTIME \|\|= time;
118	our $RUNTIME;	128	our $RUNTIME;
119	our $NOW;	129	our $NOW;
…		…
127		137
128	our $LOAD; # a number between 0 (idle) and 1 (too many objects)	138	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
129	our $LOADAVG; # same thing, but with alpha-smoothing	139	our $LOADAVG; # same thing, but with alpha-smoothing
130	our $JITTER; # average jitter	140	our $JITTER; # average jitter
131	our $TICK_START; # for load detecting purposes	141	our $TICK_START; # for load detecting purposes
		142
		143	our @POST_INIT;
		144
		145	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
		146	our $REALLY_UNLOOP; # never set to true, please :)
132		147
133	binmode STDOUT;	148	binmode STDOUT;
134	binmode STDERR;	149	binmode STDERR;
135		150
136	# read virtual server time, if available	151	# read virtual server time, if available
…		…
138	open my $fh, "<", $RUNTIMEFILE	153	open my $fh, "<", $RUNTIMEFILE
139	or die "unable to read $RUNTIMEFILE file: $!";	154	or die "unable to read $RUNTIMEFILE file: $!";
140	$RUNTIME = <$fh> + 0.;	155	$RUNTIME = <$fh> + 0.;
141	}	156	}
142		157
		158	eval "sub TICK() { $TICK } 1" or die;
		159
143	mkdir $_	160	mkdir $_
144	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	161	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
145		162
146	our $EMERGENCY_POSITION;	163	our $EMERGENCY_POSITION;
147		164
148	sub cf::map::normalise;	165	sub cf::map::normalise;
		166
		167	#############################################################################
		168
		169	%REFLECT = ();
		170	for (@REFLECT) {
		171	my $reflect = JSON::XS::decode_json $_;
		172	$REFLECT{$reflect->{class}} = $reflect;
		173	}
		174
		175	# this is decidedly evil
		176	$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
149		177
150	#############################################################################	178	#############################################################################
151		179
152	=head2 GLOBAL VARIABLES	180	=head2 GLOBAL VARIABLES
153		181
…		…
204		232
205	This array contains the results of the last C<invoke ()> call. When	233	This array contains the results of the last C<invoke ()> call. When
206	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	234	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
207	that call.	235	that call.
208		236
		237	=item %cf::REFLECT
		238
		239	Contains, for each (C++) class name, a hash reference with information
		240	about object members (methods, scalars, arrays and flags) and other
		241	metadata, which is useful for introspection.
		242
209	=back	243	=back
210		244
211	=cut	245	=cut
212		246
213	BEGIN {	247	$Coro::State::WARNHOOK = sub {
214	*CORE::GLOBAL::warn = sub {
215	my $msg = join "", @_;	248	my $msg = join "", @_;
216		249
217	$msg .= "\n"	250	$msg .= "\n"
218	unless $msg =~ /\n$/;	251	unless $msg =~ /\n$/;
219		252
220	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	253	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
221		254
222	LOG llevError, $msg;	255	LOG llevError, $msg;
223	};	256	};
224	}
225		257
226	$Coro::State::DIEHOOK = sub {	258	$Coro::State::DIEHOOK = sub {
227	return unless $^S eq 0; # "eq", not "=="	259	return unless $^S eq 0; # "eq", not "=="
		260
		261	warn Carp::longmess $_[0];
228		262
229	if ($Coro::current == $Coro::main) {#d#	263	if ($Coro::current == $Coro::main) {#d#
230	warn "DIEHOOK called in main context, Coro bug?\n";#d#	264	warn "DIEHOOK called in main context, Coro bug?\n";#d#
231	return;#d#	265	return;#d#
232	}#d#	266	}#d#
233		267
234	# kill coroutine otherwise	268	# kill coroutine otherwise
235	warn Carp::longmess $_[0];
236	Coro::terminate	269	Coro::terminate
237	};	270	};
238
239	$SIG{__DIE__} = sub { }; #d#?
240		271
241	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	272	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
242	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	273	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
243	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	274	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
244	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	275	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
305	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	336	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
306		337
307	sub encode_json($) { $json_coder->encode ($_[0]) }	338	sub encode_json($) { $json_coder->encode ($_[0]) }
308	sub decode_json($) { $json_coder->decode ($_[0]) }	339	sub decode_json($) { $json_coder->decode ($_[0]) }
309		340
		341	=item cf::post_init { BLOCK }
		342
		343	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
		344	but I<before> the server starts ticking again.
		345
		346	The cdoeblock will have a single boolean argument to indicate whether this
		347	is a reload or not.
		348
		349	=cut
		350
		351	sub post_init(&) {
		352	push @POST_INIT, shift;
		353	}
		354
310	=item cf::lock_wait $string	355	=item cf::lock_wait $string
311		356
312	Wait until the given lock is available. See cf::lock_acquire.	357	Wait until the given lock is available. See cf::lock_acquire.
313		358
314	=item my $lock = cf::lock_acquire $string	359	=item my $lock = cf::lock_acquire $string
315		360
316	Wait until the given lock is available and then acquires it and returns	361	Wait until the given lock is available and then acquires it and returns
317	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	362	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
318	for example when the coroutine gets canceled), the lock is automatically	363	for example when the coroutine gets canceled), the lock is automatically
319	returned.	364	returned.
320		365
321	Locks are not recursive, locking from the same coro twice results in a	366	Locks are not recursive, locking from the same coro twice results in a
322	deadlocked coro.	367	deadlocked coro.
…		…
328		373
329	Return true if the lock is currently active, i.e. somebody has locked it.	374	Return true if the lock is currently active, i.e. somebody has locked it.
330		375
331	=cut	376	=cut
332		377
333	our %LOCK;	378	our $LOCKS = new Coro::SemaphoreSet;
334	our %LOCKER;#d#
335		379
336	sub lock_wait($) {	380	sub lock_wait($) {
337	my ($key) = @_;	381	$LOCKS->wait ($_[0]);
338
339	if ($LOCKER{$key} == $Coro::current) {#d#
340	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
341	return;#d#
342	}#d#
343
344	# wait for lock, if any
345	while ($LOCK{$key}) {
346	push @{ $LOCK{$key} }, $Coro::current;
347	Coro::schedule;
348	}
349	}	382	}
350		383
351	sub lock_acquire($) {	384	sub lock_acquire($) {
352	my ($key) = @_;	385	$LOCKS->guard ($_[0])
353
354	# wait, to be sure we are not locked
355	lock_wait $key;
356
357	$LOCK{$key} = [];
358	$LOCKER{$key} = $Coro::current;#d#
359
360	Coro::guard {
361	delete $LOCKER{$key};#d#
362	# wake up all waiters, to be on the safe side
363	$_->ready for @{ delete $LOCK{$key} };
364	}
365	}	386	}
366		387
367	sub lock_active($) {	388	sub lock_active($) {
368	my ($key) = @_;	389	$LOCKS->count ($_[0]) < 1
369
370	! ! $LOCK{$key}
371	}	390	}
372		391
373	sub freeze_mainloop {	392	sub freeze_mainloop {
374	tick_inhibit_inc;	393	tick_inhibit_inc;
375		394
376	Coro::guard \&tick_inhibit_dec;	395	&Guard::guard (\&tick_inhibit_dec);
377	}	396	}
378		397
379	=item cf::periodic $interval, $cb	398	=item cf::periodic $interval, $cb
380		399
381	Like EV::periodic, but randomly selects a starting point so that the actions	400	Like EV::periodic, but randomly selects a starting point so that the actions
…		…
1153	$decname, length $$rdata, scalar @$objs;	1172	$decname, length $$rdata, scalar @$objs;
1154		1173
1155	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1174	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
1156	aio_chmod $fh, SAVE_MODE;	1175	aio_chmod $fh, SAVE_MODE;
1157	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1176	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1158	aio_fsync $fh if $cf::USE_FSYNC;	1177	if ($cf::USE_FSYNC) {
		1178	aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE \| IO::AIO::SYNC_FILE_RANGE_WRITE \| IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
		1179	aio_fsync $fh;
		1180	}
1159	aio_close $fh;	1181	aio_close $fh;
1160		1182
1161	if (@$objs) {	1183	if (@$objs) {
1162	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {	1184	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {
1163	aio_chmod $fh, SAVE_MODE;	1185	aio_chmod $fh, SAVE_MODE;
1164	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1186	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1165	aio_write $fh, 0, (length $data), $data, 0;	1187	aio_write $fh, 0, (length $data), $data, 0;
1166	aio_fsync $fh if $cf::USE_FSYNC;	1188	if ($cf::USE_FSYNC) {
		1189	aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE \| IO::AIO::SYNC_FILE_RANGE_WRITE \| IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
		1190	aio_fsync $fh;
		1191	}
1167	aio_close $fh;	1192	aio_close $fh;
1168	aio_rename "$filename.pst~", "$filename.pst";	1193	aio_rename "$filename.pst~", "$filename.pst";
1169	}	1194	}
1170	} else {	1195	} else {
1171	aio_unlink "$filename.pst";	1196	aio_unlink "$filename.pst";
1172	}	1197	}
1173		1198
1174	aio_rename "$filename~", $filename;	1199	aio_rename "$filename~", $filename;
		1200
		1201	$filename =~ s%/[^/]+$%%;
		1202	aio_pathsync $filename if $cf::USE_FSYNC;
1175	} else {	1203	} else {
1176	warn "FATAL: $filename~: $!\n";	1204	warn "unable to save objects: $filename~: $!\n";
1177	}	1205	}
1178	} else {	1206	} else {
1179	aio_unlink $filename;	1207	aio_unlink $filename;
1180	aio_unlink "$filename.pst";	1208	aio_unlink "$filename.pst";
1181	}	1209	}
…		…
1272	my ($name, $cb) = @_;	1300	my ($name, $cb) = @_;
1273		1301
1274	$EXTICMD{$name} = $cb;	1302	$EXTICMD{$name} = $cb;
1275	}	1303	}
1276		1304
		1305	use File::Glob ();
		1306
1277	cf::player->attach (	1307	cf::player->attach (
1278	on_command => sub {	1308	on_command => sub {
1279	my ($pl, $name, $params) = @_;	1309	my ($pl, $name, $params) = @_;
1280		1310
1281	my $cb = $COMMAND{$name}	1311	my $cb = $COMMAND{$name}
…		…
1312	}	1342	}
1313		1343
1314	cf::override;	1344	cf::override;
1315	},	1345	},
1316	);	1346	);
		1347
		1348	# "readahead" all extensions
		1349	sub cache_extensions {
		1350	my $grp = IO::AIO::aio_group;
		1351
		1352	add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
		1353	for (grep /\.ext$/, @{$_[0]}) {
		1354	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
		1355	}
		1356	};
		1357
		1358	$grp
		1359	}
1317		1360
1318	sub load_extensions {	1361	sub load_extensions {
1319	cf::sync_job {	1362	cf::sync_job {
1320	my %todo;	1363	my %todo;
1321		1364
…		…
1444		1487
1445	sub exists($) {	1488	sub exists($) {
1446	my ($login) = @_;	1489	my ($login) = @_;
1447		1490
1448	$cf::PLAYER{$login}	1491	$cf::PLAYER{$login}
1449	or cf::sync_job { !aio_stat path $login }	1492	or !aio_stat path $login
1450	}	1493	}
1451		1494
1452	sub find($) {	1495	sub find($) {
1453	return $cf::PLAYER{$_[0]} \|\| do {	1496	return $cf::PLAYER{$_[0]} \|\| do {
1454	my $login = $_[0];	1497	my $login = $_[0];
…		…
1850		1893
1851	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;	1894	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852	"$UNIQUEDIR/$path"	1895	"$UNIQUEDIR/$path"
1853	}	1896	}
1854		1897
1855	# and all this just because we cannot iterate over
1856	# all maps in C++...
1857	sub change_all_map_light {
1858	my ($change) = @_;
1859
1860	$_->change_map_light ($change)
1861	for grep $_->outdoor, values %cf::MAP;
1862	}
1863
1864	sub decay_objects {	1898	sub decay_objects {
1865	my ($self) = @_;	1899	my ($self) = @_;
1866		1900
1867	return if $self->{deny_reset};	1901	return if $self->{deny_reset};
1868		1902
…		…
1950	sub find {	1984	sub find {
1951	my ($path, $origin) = @_;	1985	my ($path, $origin) = @_;
1952		1986
1953	$path = normalise $path, $origin && $origin->path;	1987	$path = normalise $path, $origin && $origin->path;
1954		1988
1955	cf::lock_wait "map_data:$path";#d#remove	1989	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1956	cf::lock_wait "map_find:$path";	1990	my $guard2 = cf::lock_acquire "map_find:$path";
1957		1991
1958	$cf::MAP{$path} \|\| do {	1992	$cf::MAP{$path} \|\| do {
1959	my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1960	my $guard2 = cf::lock_acquire "map_find:$path";
1961
1962	my $map = new_from_path cf::map $path	1993	my $map = new_from_path cf::map $path
1963	or return;	1994	or return;
1964		1995
1965	$map->{last_save} = $cf::RUNTIME;	1996	$map->{last_save} = $cf::RUNTIME;
1966		1997
…		…
2034	unless ($self->{deny_activate}) {	2065	unless ($self->{deny_activate}) {
2035	$self->decay_objects;	2066	$self->decay_objects;
2036	$self->fix_auto_apply;	2067	$self->fix_auto_apply;
2037	$self->update_buttons;	2068	$self->update_buttons;
2038	cf::cede_to_tick;	2069	cf::cede_to_tick;
2039	$self->set_darkness_map;
2040	cf::cede_to_tick;
2041	$self->activate;	2070	$self->activate;
2042	}	2071	}
2043		2072
2044	$self->{last_save} = $cf::RUNTIME;	2073	$self->{last_save} = $cf::RUNTIME;
2045	$self->last_access ($cf::RUNTIME);	2074	$self->last_access ($cf::RUNTIME);
…		…
2211		2240
2212	my $lock = cf::lock_acquire "map_data:$self->{path}";	2241	my $lock = cf::lock_acquire "map_data:$self->{path}";
2213		2242
2214	return if $self->players;	2243	return if $self->players;
2215		2244
2216	warn "resetting map ", $self->path;	2245	warn "resetting map ", $self->path, "\n";
2217		2246
2218	$self->in_memory (cf::MAP_SWAPPED);	2247	$self->in_memory (cf::MAP_SWAPPED);
2219		2248
2220	# need to save uniques path	2249	# need to save uniques path
2221	unless ($self->{deny_save}) {	2250	unless ($self->{deny_save}) {
…		…
2386		2415
2387	our $SAY_CHANNEL = {	2416	our $SAY_CHANNEL = {
2388	id => "say",	2417	id => "say",
2389	title => "Map",	2418	title => "Map",
2390	reply => "say ",	2419	reply => "say ",
2391	tooltip => "Things said to and replied from npcs near you and other players on the same map only.",	2420	tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2392	};	2421	};
2393		2422
2394	our $CHAT_CHANNEL = {	2423	our $CHAT_CHANNEL = {
2395	id => "chat",	2424	id => "chat",
2396	title => "Chat",	2425	title => "Chat",
…		…
2522		2551
2523	$map->load;	2552	$map->load;
2524	$map->load_neighbours;	2553	$map->load_neighbours;
2525		2554
2526	return unless $self->contr->active;	2555	return unless $self->contr->active;
2527	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2528	$self->activate_recursive;
2529		2556
2530	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2557	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2531	$self->enter_map ($map, $x, $y);	2558	$self->enter_map ($map, $x, $y);
		2559
		2560	# only activate afterwards, to support waiting in hooks
		2561	$self->activate_recursive;
2532	}	2562	}
2533		2563
2534	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2564	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2535		2565
2536	Moves the player to the given map-path and coordinates by first freezing	2566	Moves the player to the given map-path and coordinates by first freezing
…		…
2735		2765
2736	=cut	2766	=cut
2737		2767
2738	# non-persistent channels (usually the info channel)	2768	# non-persistent channels (usually the info channel)
2739	our %CHANNEL = (	2769	our %CHANNEL = (
		2770	"c/motd" => {
		2771	id => "infobox",
		2772	title => "MOTD",
		2773	reply => undef,
		2774	tooltip => "The message of the day",
		2775	},
2740	"c/identify" => {	2776	"c/identify" => {
2741	id => "infobox",	2777	id => "infobox",
2742	title => "Identify",	2778	title => "Identify",
2743	reply => undef,	2779	reply => undef,
2744	tooltip => "Items recently identified",	2780	tooltip => "Items recently identified",
…		…
2771	id => "infobox",	2807	id => "infobox",
2772	title => "Body Parts",	2808	title => "Body Parts",
2773	reply => undef,	2809	reply => undef,
2774	tooltip => "Shows which body parts you posess and are available",	2810	tooltip => "Shows which body parts you posess and are available",
2775	},	2811	},
		2812	"c/statistics" => {
		2813	id => "infobox",
		2814	title => "Statistics",
		2815	reply => undef,
		2816	tooltip => "Shows your primary statistics",
		2817	},
		2818	"c/skills" => {
		2819	id => "infobox",
		2820	title => "Skills",
		2821	reply => undef,
		2822	tooltip => "Shows your experience per skill and item power",
		2823	},
		2824	"c/shopitems" => {
		2825	id => "infobox",
		2826	title => "Shop Items",
		2827	reply => undef,
		2828	tooltip => "Shows the items currently for sale in this shop",
		2829	},
		2830	"c/resistances" => {
		2831	id => "infobox",
		2832	title => "Resistances",
		2833	reply => undef,
		2834	tooltip => "Shows your resistances",
		2835	},
		2836	"c/pets" => {
		2837	id => "infobox",
		2838	title => "Pets",
		2839	reply => undef,
		2840	tooltip => "Shows information abotu your pets/a specific pet",
		2841	},
		2842	"c/perceiveself" => {
		2843	id => "infobox",
		2844	title => "Perceive Self",
		2845	reply => undef,
		2846	tooltip => "You gained detailed knowledge about yourself",
		2847	},
2776	"c/uptime" => {	2848	"c/uptime" => {
2777	id => "infobox",	2849	id => "infobox",
2778	title => "Uptime",	2850	title => "Uptime",
2779	reply => undef,	2851	reply => undef,
2780	tooltip => "How long the server has been running since last restart",	2852	tooltip => "How long the server has been running since last restart",
…		…
2789	id => "party",	2861	id => "party",
2790	title => "Party",	2862	title => "Party",
2791	reply => "gsay ",	2863	reply => "gsay ",
2792	tooltip => "Messages and chat related to your party",	2864	tooltip => "Messages and chat related to your party",
2793	},	2865	},
		2866	"c/death" => {
		2867	id => "death",
		2868	title => "Death",
		2869	reply => undef,
		2870	tooltip => "Reason for and more info about your most recent death",
		2871	},
		2872	"c/say" => $SAY_CHANNEL,
		2873	"c/chat" => $CHAT_CHANNEL,
2794	);	2874	);
2795		2875
2796	sub cf::client::send_msg {	2876	sub cf::client::send_msg {
2797	my ($self, $channel, $msg, $color, @extra) = @_;	2877	my ($self, $channel, $msg, $color, @extra) = @_;
2798		2878
…		…
2803		2883
2804	# check predefined channels, for the benefit of C	2884	# check predefined channels, for the benefit of C
2805	if ($CHANNEL{$channel}) {	2885	if ($CHANNEL{$channel}) {
2806	$channel = $CHANNEL{$channel};	2886	$channel = $CHANNEL{$channel};
2807		2887
2808	$self->ext_msg (channel_info => $channel)	2888	$self->ext_msg (channel_info => $channel);
2809	if $self->can_msg;
2810
2811	$channel = $channel->{id};	2889	$channel = $channel->{id};
2812		2890
2813	} elsif (ref $channel) {	2891	} elsif (ref $channel) {
2814	# send meta info to client, if not yet sent	2892	# send meta info to client, if not yet sent
2815	unless (exists $self->{channel}{$channel->{id}}) {	2893	unless (exists $self->{channel}{$channel->{id}}) {
2816	$self->{channel}{$channel->{id}} = $channel;	2894	$self->{channel}{$channel->{id}} = $channel;
2817	$self->ext_msg (channel_info => $channel)	2895	$self->ext_msg (channel_info => $channel);
2818	if $self->can_msg;
2819	}	2896	}
2820		2897
2821	$channel = $channel->{id};	2898	$channel = $channel->{id};
2822	}	2899	}
2823		2900
2824	return unless @extra \|\| length $msg;	2901	return unless @extra \|\| length $msg;
2825		2902
2826	if ($self->can_msg) {
2827	# default colour, mask it out	2903	# default colour, mask it out
2828	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)	2904	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
2829	if $color & cf::NDI_DEF;	2905	if $color & cf::NDI_DEF;
2830		2906
2831	my $pkt = "msg "	2907	my $pkt = "msg "
2832	. $self->{json_coder}->encode (	2908	. $self->{json_coder}->encode (
2833	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	2909	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2834	);	2910	);
2835		2911
2836	# try lzf for large packets	2912	# try lzf for large packets
2837	$pkt = "lzf " . Compress::LZF::compress $pkt	2913	$pkt = "lzf " . Compress::LZF::compress $pkt
2838	if 1024 <= length $pkt and $self->{can_lzf};	2914	if 1024 <= length $pkt and $self->{can_lzf};
2839		2915
2840	# split very large packets	2916	# split very large packets
2841	if (8192 < length $pkt and $self->{can_lzf}) {	2917	if (8192 < length $pkt and $self->{can_lzf}) {
2842	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;	2918	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2843	$pkt = "frag";	2919	$pkt = "frag";
2844	}	2920	}
2845		2921
2846	$self->send_packet ($pkt);	2922	$self->send_packet ($pkt);
2847	} else {
2848	if ($color >= 0) {
2849	# replace some tags by gcfclient-compatible ones
2850	for ($msg) {
2851	1 while
2852	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2853	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2854	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2855	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2856	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2857	}
2858
2859	$color &= cf::NDI_COLOR_MASK;
2860
2861	utf8::encode $msg;
2862
2863	if (0 && $msg =~ /\[/) {
2864	# COMMAND/INFO
2865	$self->send_packet ("drawextinfo $color 10 8 $msg")
2866	} else {
2867	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2868	$self->send_packet ("drawinfo $color $msg")
2869	}
2870	}
2871	}
2872	}	2923	}
2873		2924
2874	=item $client->ext_msg ($type, @msg)	2925	=item $client->ext_msg ($type, @msg)
2875		2926
2876	Sends an ext event to the client.	2927	Sends an ext event to the client.
…		…
3051	The following functions and methods are available within a safe environment:	3102	The following functions and methods are available within a safe environment:
3052		3103
3053	cf::object	3104	cf::object
3054	contr pay_amount pay_player map x y force_find force_add destroy	3105	contr pay_amount pay_player map x y force_find force_add destroy
3055	insert remove name archname title slaying race decrease split	3106	insert remove name archname title slaying race decrease split
		3107	value
3056		3108
3057	cf::object::player	3109	cf::object::player
3058	player	3110	player
3059		3111
3060	cf::player	3112	cf::player
…		…
3066	=cut	3118	=cut
3067		3119
3068	for (	3120	for (
3069	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3121	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3070	insert remove inv nrof name archname title slaying race	3122	insert remove inv nrof name archname title slaying race
3071	decrease split destroy change_exp)],	3123	decrease split destroy change_exp value msg lore send_msg)],
3072	["cf::object::player" => qw(player)],	3124	["cf::object::player" => qw(player)],
3073	["cf::player" => qw(peaceful)],	3125	["cf::player" => qw(peaceful send_msg)],
3074	["cf::map" => qw(trigger)],	3126	["cf::map" => qw(trigger)],
3075	) {	3127	) {
3076	no strict 'refs';	3128	no strict 'refs';
3077	my ($pkg, @funs) = @$_;	3129	my ($pkg, @funs) = @$_;
3078	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3130	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
…		…
3095	my ($code, %vars) = @_;	3147	my ($code, %vars) = @_;
3096		3148
3097	my $qcode = $code;	3149	my $qcode = $code;
3098	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3150	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3099	$qcode =~ s/\n/\\n/g;	3151	$qcode =~ s/\n/\\n/g;
		3152
		3153	%vars = (_dummy => 0) unless %vars;
3100		3154
3101	local $_;	3155	local $_;
3102	local @safe::cf::_safe_eval_args = values %vars;	3156	local @safe::cf::_safe_eval_args = values %vars;
3103		3157
3104	my $eval =	3158	my $eval =
…		…
3334	reload_treasures;	3388	reload_treasures;
3335		3389
3336	warn "finished reloading resource files\n";	3390	warn "finished reloading resource files\n";
3337	}	3391	}
3338		3392
3339	sub init {
3340	my $guard = freeze_mainloop;
3341
3342	evthread_start IO::AIO::poll_fileno;
3343
3344	reload_resources;
3345	}
3346
3347	sub reload_config {	3393	sub reload_config {
		3394	warn "reloading config file...\n";
		3395
3348	open my $fh, "<:utf8", "$CONFDIR/config"	3396	open my $fh, "<:utf8", "$CONFDIR/config"
3349	or return;	3397	or return;
3350		3398
3351	local $/;	3399	local $/;
3352	*CFG = YAML::Load <$fh>;	3400	*CFG = YAML::XS::Load scalar <$fh>;
3353		3401
3354	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];	3402	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];
3355		3403
3356	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3404	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3357	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3405	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3361	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3409	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3362	and die "WARNING: m(un)lockall failed: $!\n";	3410	and die "WARNING: m(un)lockall failed: $!\n";
3363	};	3411	};
3364	warn $@ if $@;	3412	warn $@ if $@;
3365	}	3413	}
		3414
		3415	warn "finished reloading resource files\n";
3366	}	3416	}
3367		3417
3368	sub pidfile() {	3418	sub pidfile() {
3369	sysopen my $fh, $PIDFILE, O_RDWR \| O_CREAT	3419	sysopen my $fh, $PIDFILE, O_RDWR \| O_CREAT
3370	or die "$PIDFILE: $!";	3420	or die "$PIDFILE: $!";
…		…
3382		3432
3383	seek $fh, 0, 0;	3433	seek $fh, 0, 0;
3384	print $fh $$;	3434	print $fh $$;
3385	}	3435	}
3386		3436
		3437	sub main_loop {
		3438	warn "EV::loop starting\n";
		3439	if (1) {
		3440	EV::loop;
		3441	}
		3442	warn "EV::loop returned\n";
		3443	goto &main_loop unless $REALLY_UNLOOP;
		3444	}
		3445
3387	sub main {	3446	sub main {
3388	atomic;	3447	cf::init_globals; # initialise logging
		3448
		3449	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3450	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
		3451	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
		3452	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
		3453
		3454	cf::init_experience;
		3455	cf::init_anim;
		3456	cf::init_attackmess;
		3457	cf::init_dynamic;
		3458
		3459	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3389		3460
3390	# we must not ever block the main coroutine	3461	# we must not ever block the main coroutine
3391	local $Coro::idle = sub {	3462	local $Coro::idle = sub {
3392	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3463	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3393	(async {	3464	(async {
3394	$Coro::current->{desc} = "IDLE BUG HANDLER";	3465	$Coro::current->{desc} = "IDLE BUG HANDLER";
3395	EV::loop EV::LOOP_ONESHOT;	3466	EV::loop EV::LOOP_ONESHOT;
3396	})->prio (Coro::PRIO_MAX);	3467	})->prio (Coro::PRIO_MAX);
3397	};	3468	};
3398		3469
3399	{	3470	evthread_start IO::AIO::poll_fileno;
3400	my $guard = freeze_mainloop;	3471
		3472	cf::sync_job {
		3473	reload_resources;
3401	reload_config;	3474	reload_config;
3402	db_init;	3475	db_init;
		3476
		3477	cf::load_settings;
		3478	cf::load_materials;
		3479	cf::init_uuid;
		3480	cf::init_signals;
		3481	cf::init_commands;
		3482	cf::init_skills;
		3483
		3484	cf::init_beforeplay;
		3485
		3486	atomic;
		3487
3403	load_extensions;	3488	load_extensions;
3404		3489
3405	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3406	}
3407
3408	utime time, time, $RUNTIMEFILE;	3490	utime time, time, $RUNTIMEFILE;
3409		3491
3410	# no (long-running) fork's whatsoever before this point(!)	3492	# no (long-running) fork's whatsoever before this point(!)
		3493	use POSIX ();
3411	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3494	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3412		3495
3413	EV::loop;	3496	(pop @POST_INIT)->(0) while @POST_INIT;
		3497	};
		3498
		3499	main_loop;
3414	}	3500	}
3415		3501
3416	#############################################################################	3502	#############################################################################
3417	# initialisation and cleanup	3503	# initialisation and cleanup
3418		3504
…		…
3474	my $uuid = "$LOCALDIR/uuid";	3560	my $uuid = "$LOCALDIR/uuid";
3475		3561
3476	my $fh = aio_open "$uuid~", O_WRONLY \| O_CREAT, 0644	3562	my $fh = aio_open "$uuid~", O_WRONLY \| O_CREAT, 0644
3477	or return;	3563	or return;
3478		3564
3479	my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;	3565	my $value = uuid_seq uuid_cur;
		3566
		3567	unless ($value) {
		3568	warn "cowardly refusing to write zero uuid value!\n";
		3569	return;
		3570	}
		3571
		3572	my $value = uuid_str $value + $uuid_skip;
3480	$uuid_skip = 0;	3573	$uuid_skip = 0;
3481		3574
3482	(aio_write $fh, 0, (length $value), $value, 0) <= 0	3575	(aio_write $fh, 0, (length $value), $value, 0) <= 0
3483	and return;	3576	and return;
3484		3577
…		…
3506	}	3599	}
3507		3600
3508	sub emergency_save() {	3601	sub emergency_save() {
3509	my $freeze_guard = cf::freeze_mainloop;	3602	my $freeze_guard = cf::freeze_mainloop;
3510		3603
3511	warn "enter emergency perl save\n";	3604	warn "emergency_perl_save: enter\n";
3512		3605
3513	cf::sync_job {	3606	cf::sync_job {
		3607	# this is a trade-off: we want to be very quick here, so
		3608	# save all maps without fsync, and later call a global sync
		3609	# (which in turn might be very very slow)
		3610	local $USE_FSYNC = 0;
		3611
3514	# use a peculiar iteration method to avoid tripping on perl	3612	# use a peculiar iteration method to avoid tripping on perl
3515	# refcount bugs in for. also avoids problems with players	3613	# refcount bugs in for. also avoids problems with players
3516	# and maps saved/destroyed asynchronously.	3614	# and maps saved/destroyed asynchronously.
3517	warn "begin emergency player save\n";	3615	warn "emergency_perl_save: begin player save\n";
3518	for my $login (keys %cf::PLAYER) {	3616	for my $login (keys %cf::PLAYER) {
3519	my $pl = $cf::PLAYER{$login} or next;	3617	my $pl = $cf::PLAYER{$login} or next;
3520	$pl->valid or next;	3618	$pl->valid or next;
3521	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3619	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3522	$pl->save;	3620	$pl->save;
3523	}	3621	}
3524	warn "end emergency player save\n";	3622	warn "emergency_perl_save: end player save\n";
3525		3623
3526	warn "begin emergency map save\n";	3624	warn "emergency_perl_save: begin map save\n";
3527	for my $path (keys %cf::MAP) {	3625	for my $path (keys %cf::MAP) {
3528	my $map = $cf::MAP{$path} or next;	3626	my $map = $cf::MAP{$path} or next;
3529	$map->valid or next;	3627	$map->valid or next;
3530	$map->save;	3628	$map->save;
3531	}	3629	}
3532	warn "end emergency map save\n";	3630	warn "emergency_perl_save: end map save\n";
3533		3631
3534	warn "begin emergency database checkpoint\n";	3632	warn "emergency_perl_save: begin database checkpoint\n";
3535	BDB::db_env_txn_checkpoint $DB_ENV;	3633	BDB::db_env_txn_checkpoint $DB_ENV;
3536	warn "end emergency database checkpoint\n";	3634	warn "emergency_perl_save: end database checkpoint\n";
3537		3635
3538	warn "begin write uuid\n";	3636	warn "emergency_perl_save: begin write uuid\n";
3539	write_uuid_sync 1;	3637	write_uuid_sync 1;
3540	warn "end write uuid\n";	3638	warn "emergency_perl_save: end write uuid\n";
3541	};	3639	};
3542		3640
		3641	warn "emergency_perl_save: starting sync()\n";
		3642	IO::AIO::aio_sync sub {
		3643	warn "emergency_perl_save: finished sync()\n";
		3644	};
		3645
3543	warn "leave emergency perl save\n";	3646	warn "emergency_perl_save: leave\n";
3544	}	3647	}
3545		3648
3546	sub post_cleanup {	3649	sub post_cleanup {
3547	my ($make_core) = @_;	3650	my ($make_core) = @_;
3548		3651
…		…
3574	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3677	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3575	for my $name (keys %$leaf_symtab) {	3678	for my $name (keys %$leaf_symtab) {
3576	_gv_clear *{"$pkg$name"};	3679	_gv_clear *{"$pkg$name"};
3577	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3680	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3578	}	3681	}
3579	warn "cleared package #$pkg\n";#d#	3682	warn "cleared package $pkg\n";#d#
3580	}	3683	}
3581
3582	our $RELOAD; # how many times to reload
3583		3684
3584	sub do_reload_perl() {	3685	sub do_reload_perl() {
3585	# can/must only be called in main	3686	# can/must only be called in main
3586	if ($Coro::current != $Coro::main) {	3687	if ($Coro::current != $Coro::main) {
3587	warn "can only reload from main coroutine";	3688	warn "can only reload from main coroutine";
3588	return;	3689	return;
3589	}	3690	}
3590		3691
3591	return if $RELOAD++;	3692	return if $RELOAD++;
		3693
		3694	my $t1 = EV::time;
3592		3695
3593	while ($RELOAD) {	3696	while ($RELOAD) {
3594	warn "reloading...";	3697	warn "reloading...";
3595		3698
3596	warn "entering sync_job";	3699	warn "entering sync_job";
…		…
3657	clear_package "safe::$_"	3760	clear_package "safe::$_"
3658	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3761	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3659		3762
3660	warn "unloading cf.pm \"a bit\"";	3763	warn "unloading cf.pm \"a bit\"";
3661	delete $INC{"cf.pm"};	3764	delete $INC{"cf.pm"};
3662	delete $INC{"cf/pod.pm"};	3765	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3663		3766
3664	# don't, removes xs symbols, too,	3767	# don't, removes xs symbols, too,
3665	# and global variables created in xs	3768	# and global variables created in xs
3666	#clear_package __PACKAGE__;	3769	#clear_package __PACKAGE__;
3667		3770
3668	warn "unload completed, starting to reload now";	3771	warn "unload completed, starting to reload now";
3669		3772
3670	warn "reloading cf.pm";	3773	warn "reloading cf.pm";
3671	require cf;	3774	require cf;
3672	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3775	cf::_connect_to_perl_1;
3673		3776
3674	warn "loading config and database again";	3777	warn "loading config and database again";
3675	cf::reload_config;	3778	cf::reload_config;
3676		3779
3677	warn "loading extensions";	3780	warn "loading extensions";
3678	cf::load_extensions;	3781	cf::load_extensions;
3679		3782
		3783	if ($REATTACH_ON_RELOAD) {
3680	warn "reattaching attachments to objects/players";	3784	warn "reattaching attachments to objects/players";
3681	_global_reattach; # objects, sockets	3785	_global_reattach; # objects, sockets
3682	warn "reattaching attachments to maps";	3786	warn "reattaching attachments to maps";
3683	reattach $_ for values %MAP;	3787	reattach $_ for values %MAP;
3684	warn "reattaching attachments to players";	3788	warn "reattaching attachments to players";
3685	reattach $_ for values %PLAYER;	3789	reattach $_ for values %PLAYER;
		3790	}
		3791
		3792	warn "running post_init jobs";
		3793	(pop @POST_INIT)->(1) while @POST_INIT;
3686		3794
3687	warn "leaving sync_job";	3795	warn "leaving sync_job";
3688		3796
3689	1	3797	1
3690	} or do {	3798	} or do {
…		…
3693	};	3801	};
3694		3802
3695	warn "reloaded";	3803	warn "reloaded";
3696	--$RELOAD;	3804	--$RELOAD;
3697	}	3805	}
		3806
		3807	$t1 = EV::time - $t1;
		3808	warn "reload completed in ${t1}s\n";
3698	};	3809	};
3699		3810
3700	our $RELOAD_WATCHER; # used only during reload	3811	our $RELOAD_WATCHER; # used only during reload
3701		3812
3702	sub reload_perl() {	3813	sub reload_perl() {
3703	# doing reload synchronously and two reloads happen back-to-back,	3814	# doing reload synchronously and two reloads happen back-to-back,
3704	# coro crashes during coro_state_free->destroy here.	3815	# coro crashes during coro_state_free->destroy here.
3705		3816
		3817	$RELOAD_WATCHER \|\|= cf::async {
		3818	Coro::AIO::aio_wait cache_extensions;
		3819
3706	$RELOAD_WATCHER \|\|= EV::timer 0, 0, sub {	3820	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3707	do_reload_perl;	3821	do_reload_perl;
3708	undef $RELOAD_WATCHER;	3822	undef $RELOAD_WATCHER;
		3823	};
3709	};	3824	};
3710	}	3825	}
3711		3826
3712	register_command "reload" => sub {	3827	register_command "reload" => sub {
3713	my ($who, $arg) = @_;	3828	my ($who, $arg) = @_;
…		…
3872	LOG llevInfo, "[ABT] [suppressed]\n";	3987	LOG llevInfo, "[ABT] [suppressed]\n";
3873	}	3988	}
3874	}	3989	}
3875		3990
3876	# load additional modules	3991	# load additional modules
3877	use cf::pod;	3992	require "cf/$_.pm" for @EXTRA_MODULES;
		3993	cf::_connect_to_perl_2;
3878		3994
3879	END { cf::emergency_save }	3995	END { cf::emergency_save }
3880		3996
3881	1	3997	1
3882		3998

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.449 by root, Sat Sep 20 00:09:27 2008 UTC vs. Revision 1.486 by root, Thu Oct 15 21:56:50 2009 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.449 by root, Sat Sep 20 00:09:27 2008 UTC vs.
Revision 1.486 by root, Thu Oct 15 21:56:50 2009 UTC