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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.448 by root, Fri Sep 19 05:30:23 2008 UTC vs.
Revision 1.485 by root, Mon Oct 12 14:12:54 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
…		…
66	$Storable::canonical = 1; # reduce rsync transfers	69	$Storable::canonical = 1; # reduce rsync transfers
67	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	70	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
68		71
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	{	74	# make sure c-lzf reinitialises itself
72	# very ugly, but ensure we acquire the storable lock
73
74	sub net_mstore {
75	my $guard = Coro::Storable::guard;
76	&Storable::net_mstore
77	}
78
79	sub mretrieve {
80	my $guard = Coro::Storable::guard;
81	&Storable::mretrieve
82	}
83
84	Compress::LZF::set_serializer "Coro::Storable", "cf::net_mstore", "cf::mretrieve";	75	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
85	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
86	}	77
		78	# strictly for debugging
		79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
87		80
88	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
89		82
90	our %COMMAND = ();	83	our %COMMAND = ();
91	our %COMMAND_TIME = ();	84	our %COMMAND_TIME = ();
…		…
94	our %EXTCMD = ();	87	our %EXTCMD = ();
95	our %EXTICMD = ();	88	our %EXTICMD = ();
96	our %EXT_CORO = (); # coroutines bound to extensions	89	our %EXT_CORO = (); # coroutines bound to extensions
97	our %EXT_MAP = (); # pluggable maps	90	our %EXT_MAP = (); # pluggable maps
98		91
99	our $RELOAD; # number of reloads so far	92	our $RELOAD; # number of reloads so far, non-zero while in reload
100	our @EVENT;	93	our @EVENT;
		94	our @REFLECT; # set by XS
		95	our %REFLECT; # set by us
101		96
102	our $CONFDIR = confdir;	97	our $CONFDIR = confdir;
103	our $DATADIR = datadir;	98	our $DATADIR = datadir;
104	our $LIBDIR = "$DATADIR/ext";	99	our $LIBDIR = "$DATADIR/ext";
105	our $PODDIR = "$DATADIR/pod";	100	our $PODDIR = "$DATADIR/pod";
…		…
116	our %RESOURCE;	111	our %RESOURCE;
117		112
118	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	113	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
119	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	114	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
120	our $NEXT_TICK;	115	our $NEXT_TICK;
121	our $USE_FSYNC = 1; # use fsync to write maps - default off	116	our $USE_FSYNC = 1; # use fsync to write maps - default on
122		117
123	our $BDB_DEADLOCK_WATCHER;	118	our $BDB_DEADLOCK_WATCHER;
124	our $BDB_CHECKPOINT_WATCHER;	119	our $BDB_CHECKPOINT_WATCHER;
125	our $BDB_TRICKLE_WATCHER;	120	our $BDB_TRICKLE_WATCHER;
126	our $DB_ENV;	121	our $DB_ENV;
127		122
		123	our @EXTRA_MODULES = qw(pod match mapscript);
		124
128	our %CFG;	125	our %CFG;
129		126
130	our $UPTIME; $UPTIME \|\|= time;	127	our $UPTIME; $UPTIME \|\|= time;
131	our $RUNTIME;	128	our $RUNTIME;
132	our $NOW;	129	our $NOW;
…		…
140		137
141	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)
142	our $LOADAVG; # same thing, but with alpha-smoothing	139	our $LOADAVG; # same thing, but with alpha-smoothing
143	our $JITTER; # average jitter	140	our $JITTER; # average jitter
144	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 :)
145		147
146	binmode STDOUT;	148	binmode STDOUT;
147	binmode STDERR;	149	binmode STDERR;
148		150
149	# read virtual server time, if available	151	# read virtual server time, if available
…		…
151	open my $fh, "<", $RUNTIMEFILE	153	open my $fh, "<", $RUNTIMEFILE
152	or die "unable to read $RUNTIMEFILE file: $!";	154	or die "unable to read $RUNTIMEFILE file: $!";
153	$RUNTIME = <$fh> + 0.;	155	$RUNTIME = <$fh> + 0.;
154	}	156	}
155		157
		158	eval "sub TICK() { $TICK } 1" or die;
		159
156	mkdir $_	160	mkdir $_
157	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	161	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
158		162
159	our $EMERGENCY_POSITION;	163	our $EMERGENCY_POSITION;
160		164
161	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::"} };
162		177
163	#############################################################################	178	#############################################################################
164		179
165	=head2 GLOBAL VARIABLES	180	=head2 GLOBAL VARIABLES
166		181
…		…
217		232
218	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
219	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
220	that call.	235	that call.
221		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
222	=back	243	=back
223		244
224	=cut	245	=cut
225		246
226	BEGIN {	247	$Coro::State::WARNHOOK = sub {
227	*CORE::GLOBAL::warn = sub {
228	my $msg = join "", @_;	248	my $msg = join "", @_;
229		249
230	$msg .= "\n"	250	$msg .= "\n"
231	unless $msg =~ /\n$/;	251	unless $msg =~ /\n$/;
232		252
233	$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;
234		254
235	LOG llevError, $msg;	255	LOG llevError, $msg;
236	};	256	};
237	}
238		257
239	$Coro::State::DIEHOOK = sub {	258	$Coro::State::DIEHOOK = sub {
240	return unless $^S eq 0; # "eq", not "=="	259	return unless $^S eq 0; # "eq", not "=="
		260
		261	warn Carp::longmess $_[0];
241		262
242	if ($Coro::current == $Coro::main) {#d#	263	if ($Coro::current == $Coro::main) {#d#
243	warn "DIEHOOK called in main context, Coro bug?\n";#d#	264	warn "DIEHOOK called in main context, Coro bug?\n";#d#
244	return;#d#	265	return;#d#
245	}#d#	266	}#d#
246		267
247	# kill coroutine otherwise	268	# kill coroutine otherwise
248	warn Carp::longmess $_[0];
249	Coro::terminate	269	Coro::terminate
250	};	270	};
251
252	$SIG{__DIE__} = sub { }; #d#?
253		271
254	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	272	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
255	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	273	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
256	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	274	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
257	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	275	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
318	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
319		337
320	sub encode_json($) { $json_coder->encode ($_[0]) }	338	sub encode_json($) { $json_coder->encode ($_[0]) }
321	sub decode_json($) { $json_coder->decode ($_[0]) }	339	sub decode_json($) { $json_coder->decode ($_[0]) }
322		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
323	=item cf::lock_wait $string	355	=item cf::lock_wait $string
324		356
325	Wait until the given lock is available. See cf::lock_acquire.	357	Wait until the given lock is available. See cf::lock_acquire.
326		358
327	=item my $lock = cf::lock_acquire $string	359	=item my $lock = cf::lock_acquire $string
328		360
329	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
330	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,
331	for example when the coroutine gets canceled), the lock is automatically	363	for example when the coroutine gets canceled), the lock is automatically
332	returned.	364	returned.
333		365
334	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
335	deadlocked coro.	367	deadlocked coro.
…		…
341		373
342	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.
343		375
344	=cut	376	=cut
345		377
346	our %LOCK;	378	our $LOCKS = new Coro::SemaphoreSet;
347	our %LOCKER;#d#
348		379
349	sub lock_wait($) {	380	sub lock_wait($) {
350	my ($key) = @_;	381	$LOCKS->wait ($_[0]);
351
352	if ($LOCKER{$key} == $Coro::current) {#d#
353	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
354	return;#d#
355	}#d#
356
357	# wait for lock, if any
358	while ($LOCK{$key}) {
359	push @{ $LOCK{$key} }, $Coro::current;
360	Coro::schedule;
361	}
362	}	382	}
363		383
364	sub lock_acquire($) {	384	sub lock_acquire($) {
365	my ($key) = @_;	385	$LOCKS->guard ($_[0])
366
367	# wait, to be sure we are not locked
368	lock_wait $key;
369
370	$LOCK{$key} = [];
371	$LOCKER{$key} = $Coro::current;#d#
372
373	Coro::guard {
374	delete $LOCKER{$key};#d#
375	# wake up all waiters, to be on the safe side
376	$_->ready for @{ delete $LOCK{$key} };
377	}
378	}	386	}
379		387
380	sub lock_active($) {	388	sub lock_active($) {
381	my ($key) = @_;	389	$LOCKS->count ($_[0]) < 1
382
383	! ! $LOCK{$key}
384	}	390	}
385		391
386	sub freeze_mainloop {	392	sub freeze_mainloop {
387	tick_inhibit_inc;	393	tick_inhibit_inc;
388		394
389	Coro::guard \&tick_inhibit_dec;	395	&Guard::guard (\&tick_inhibit_dec);
390	}	396	}
391		397
392	=item cf::periodic $interval, $cb	398	=item cf::periodic $interval, $cb
393		399
394	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
…		…
1166	$decname, length $$rdata, scalar @$objs;	1172	$decname, length $$rdata, scalar @$objs;
1167		1173
1168	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1174	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
1169	aio_chmod $fh, SAVE_MODE;	1175	aio_chmod $fh, SAVE_MODE;
1170	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1176	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1171	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	}
1172	aio_close $fh;	1181	aio_close $fh;
1173		1182
1174	if (@$objs) {	1183	if (@$objs) {
1175	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) {
1176	aio_chmod $fh, SAVE_MODE;	1185	aio_chmod $fh, SAVE_MODE;
1177	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1186	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1178	aio_write $fh, 0, (length $data), $data, 0;	1187	aio_write $fh, 0, (length $data), $data, 0;
1179	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	}
1180	aio_close $fh;	1192	aio_close $fh;
1181	aio_rename "$filename.pst~", "$filename.pst";	1193	aio_rename "$filename.pst~", "$filename.pst";
1182	}	1194	}
1183	} else {	1195	} else {
1184	aio_unlink "$filename.pst";	1196	aio_unlink "$filename.pst";
1185	}	1197	}
1186		1198
1187	aio_rename "$filename~", $filename;	1199	aio_rename "$filename~", $filename;
		1200
		1201	$filename =~ s%/[^/]+$%%;
		1202	aio_pathsync $filename if $cf::USE_FSYNC;
1188	} else {	1203	} else {
1189	warn "FATAL: $filename~: $!\n";	1204	warn "unable to save objects: $filename~: $!\n";
1190	}	1205	}
1191	} else {	1206	} else {
1192	aio_unlink $filename;	1207	aio_unlink $filename;
1193	aio_unlink "$filename.pst";	1208	aio_unlink "$filename.pst";
1194	}	1209	}
…		…
1285	my ($name, $cb) = @_;	1300	my ($name, $cb) = @_;
1286		1301
1287	$EXTICMD{$name} = $cb;	1302	$EXTICMD{$name} = $cb;
1288	}	1303	}
1289		1304
		1305	use File::Glob ();
		1306
1290	cf::player->attach (	1307	cf::player->attach (
1291	on_command => sub {	1308	on_command => sub {
1292	my ($pl, $name, $params) = @_;	1309	my ($pl, $name, $params) = @_;
1293		1310
1294	my $cb = $COMMAND{$name}	1311	my $cb = $COMMAND{$name}
…		…
1325	}	1342	}
1326		1343
1327	cf::override;	1344	cf::override;
1328	},	1345	},
1329	);	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	}
1330		1360
1331	sub load_extensions {	1361	sub load_extensions {
1332	cf::sync_job {	1362	cf::sync_job {
1333	my %todo;	1363	my %todo;
1334		1364
…		…
1457		1487
1458	sub exists($) {	1488	sub exists($) {
1459	my ($login) = @_;	1489	my ($login) = @_;
1460		1490
1461	$cf::PLAYER{$login}	1491	$cf::PLAYER{$login}
1462	or cf::sync_job { !aio_stat path $login }	1492	or !aio_stat path $login
1463	}	1493	}
1464		1494
1465	sub find($) {	1495	sub find($) {
1466	return $cf::PLAYER{$_[0]} \|\| do {	1496	return $cf::PLAYER{$_[0]} \|\| do {
1467	my $login = $_[0];	1497	my $login = $_[0];
…		…
1863		1893
1864	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;	1894	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1865	"$UNIQUEDIR/$path"	1895	"$UNIQUEDIR/$path"
1866	}	1896	}
1867		1897
1868	# and all this just because we cannot iterate over
1869	# all maps in C++...
1870	sub change_all_map_light {
1871	my ($change) = @_;
1872
1873	$_->change_map_light ($change)
1874	for grep $_->outdoor, values %cf::MAP;
1875	}
1876
1877	sub decay_objects {	1898	sub decay_objects {
1878	my ($self) = @_;	1899	my ($self) = @_;
1879		1900
1880	return if $self->{deny_reset};	1901	return if $self->{deny_reset};
1881		1902
…		…
1963	sub find {	1984	sub find {
1964	my ($path, $origin) = @_;	1985	my ($path, $origin) = @_;
1965		1986
1966	$path = normalise $path, $origin && $origin->path;	1987	$path = normalise $path, $origin && $origin->path;
1967		1988
1968	cf::lock_wait "map_data:$path";#d#remove	1989	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1969	cf::lock_wait "map_find:$path";	1990	my $guard2 = cf::lock_acquire "map_find:$path";
1970		1991
1971	$cf::MAP{$path} \|\| do {	1992	$cf::MAP{$path} \|\| do {
1972	my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1973	my $guard2 = cf::lock_acquire "map_find:$path";
1974
1975	my $map = new_from_path cf::map $path	1993	my $map = new_from_path cf::map $path
1976	or return;	1994	or return;
1977		1995
1978	$map->{last_save} = $cf::RUNTIME;	1996	$map->{last_save} = $cf::RUNTIME;
1979		1997
…		…
2047	unless ($self->{deny_activate}) {	2065	unless ($self->{deny_activate}) {
2048	$self->decay_objects;	2066	$self->decay_objects;
2049	$self->fix_auto_apply;	2067	$self->fix_auto_apply;
2050	$self->update_buttons;	2068	$self->update_buttons;
2051	cf::cede_to_tick;	2069	cf::cede_to_tick;
2052	$self->set_darkness_map;
2053	cf::cede_to_tick;
2054	$self->activate;	2070	$self->activate;
2055	}	2071	}
2056		2072
2057	$self->{last_save} = $cf::RUNTIME;	2073	$self->{last_save} = $cf::RUNTIME;
2058	$self->last_access ($cf::RUNTIME);	2074	$self->last_access ($cf::RUNTIME);
…		…
2224		2240
2225	my $lock = cf::lock_acquire "map_data:$self->{path}";	2241	my $lock = cf::lock_acquire "map_data:$self->{path}";
2226		2242
2227	return if $self->players;	2243	return if $self->players;
2228		2244
2229	warn "resetting map ", $self->path;	2245	warn "resetting map ", $self->path, "\n";
2230		2246
2231	$self->in_memory (cf::MAP_SWAPPED);	2247	$self->in_memory (cf::MAP_SWAPPED);
2232		2248
2233	# need to save uniques path	2249	# need to save uniques path
2234	unless ($self->{deny_save}) {	2250	unless ($self->{deny_save}) {
…		…
2399		2415
2400	our $SAY_CHANNEL = {	2416	our $SAY_CHANNEL = {
2401	id => "say",	2417	id => "say",
2402	title => "Map",	2418	title => "Map",
2403	reply => "say ",	2419	reply => "say ",
2404	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.",
2405	};	2421	};
2406		2422
2407	our $CHAT_CHANNEL = {	2423	our $CHAT_CHANNEL = {
2408	id => "chat",	2424	id => "chat",
2409	title => "Chat",	2425	title => "Chat",
…		…
2535		2551
2536	$map->load;	2552	$map->load;
2537	$map->load_neighbours;	2553	$map->load_neighbours;
2538		2554
2539	return unless $self->contr->active;	2555	return unless $self->contr->active;
2540	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2541	$self->activate_recursive;
2542		2556
2543	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2557	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2544	$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;
2545	}	2562	}
2546		2563
2547	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2564	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2548		2565
2549	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
…		…
2784	id => "infobox",	2801	id => "infobox",
2785	title => "Body Parts",	2802	title => "Body Parts",
2786	reply => undef,	2803	reply => undef,
2787	tooltip => "Shows which body parts you posess and are available",	2804	tooltip => "Shows which body parts you posess and are available",
2788	},	2805	},
		2806	"c/statistics" => {
		2807	id => "infobox",
		2808	title => "Statistics",
		2809	reply => undef,
		2810	tooltip => "Shows your primary statistics",
		2811	},
		2812	"c/skills" => {
		2813	id => "infobox",
		2814	title => "Skills",
		2815	reply => undef,
		2816	tooltip => "Shows your experience per skill and item power",
		2817	},
		2818	"c/shopitems" => {
		2819	id => "infobox",
		2820	title => "Shop Items",
		2821	reply => undef,
		2822	tooltip => "Shows the items currently for sale in this shop",
		2823	},
		2824	"c/resistances" => {
		2825	id => "infobox",
		2826	title => "Resistances",
		2827	reply => undef,
		2828	tooltip => "Shows your resistances",
		2829	},
		2830	"c/pets" => {
		2831	id => "infobox",
		2832	title => "Pets",
		2833	reply => undef,
		2834	tooltip => "Shows information abotu your pets/a specific pet",
		2835	},
		2836	"c/perceiveself" => {
		2837	id => "infobox",
		2838	title => "Perceive Self",
		2839	reply => undef,
		2840	tooltip => "You gained detailed knowledge about yourself",
		2841	},
2789	"c/uptime" => {	2842	"c/uptime" => {
2790	id => "infobox",	2843	id => "infobox",
2791	title => "Uptime",	2844	title => "Uptime",
2792	reply => undef,	2845	reply => undef,
2793	tooltip => "How long the server has been running since last restart",	2846	tooltip => "How long the server has been running since last restart",
…		…
2802	id => "party",	2855	id => "party",
2803	title => "Party",	2856	title => "Party",
2804	reply => "gsay ",	2857	reply => "gsay ",
2805	tooltip => "Messages and chat related to your party",	2858	tooltip => "Messages and chat related to your party",
2806	},	2859	},
		2860	"c/death" => {
		2861	id => "death",
		2862	title => "Death",
		2863	reply => undef,
		2864	tooltip => "Reason for and more info about your most recent death",
		2865	},
		2866	"c/say" => $SAY_CHANNEL,
		2867	"c/chat" => $CHAT_CHANNEL,
2807	);	2868	);
2808		2869
2809	sub cf::client::send_msg {	2870	sub cf::client::send_msg {
2810	my ($self, $channel, $msg, $color, @extra) = @_;	2871	my ($self, $channel, $msg, $color, @extra) = @_;
2811		2872
…		…
2816		2877
2817	# check predefined channels, for the benefit of C	2878	# check predefined channels, for the benefit of C
2818	if ($CHANNEL{$channel}) {	2879	if ($CHANNEL{$channel}) {
2819	$channel = $CHANNEL{$channel};	2880	$channel = $CHANNEL{$channel};
2820		2881
2821	$self->ext_msg (channel_info => $channel)	2882	$self->ext_msg (channel_info => $channel);
2822	if $self->can_msg;
2823
2824	$channel = $channel->{id};	2883	$channel = $channel->{id};
2825		2884
2826	} elsif (ref $channel) {	2885	} elsif (ref $channel) {
2827	# send meta info to client, if not yet sent	2886	# send meta info to client, if not yet sent
2828	unless (exists $self->{channel}{$channel->{id}}) {	2887	unless (exists $self->{channel}{$channel->{id}}) {
2829	$self->{channel}{$channel->{id}} = $channel;	2888	$self->{channel}{$channel->{id}} = $channel;
2830	$self->ext_msg (channel_info => $channel)	2889	$self->ext_msg (channel_info => $channel);
2831	if $self->can_msg;
2832	}	2890	}
2833		2891
2834	$channel = $channel->{id};	2892	$channel = $channel->{id};
2835	}	2893	}
2836		2894
2837	return unless @extra \|\| length $msg;	2895	return unless @extra \|\| length $msg;
2838		2896
2839	if ($self->can_msg) {
2840	# default colour, mask it out	2897	# default colour, mask it out
2841	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)	2898	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
2842	if $color & cf::NDI_DEF;	2899	if $color & cf::NDI_DEF;
2843		2900
2844	my $pkt = "msg "	2901	my $pkt = "msg "
2845	. $self->{json_coder}->encode (	2902	. $self->{json_coder}->encode (
2846	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	2903	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2847	);	2904	);
2848		2905
2849	# try lzf for large packets	2906	# try lzf for large packets
2850	$pkt = "lzf " . Compress::LZF::compress $pkt	2907	$pkt = "lzf " . Compress::LZF::compress $pkt
2851	if 1024 <= length $pkt and $self->{can_lzf};	2908	if 1024 <= length $pkt and $self->{can_lzf};
2852		2909
2853	# split very large packets	2910	# split very large packets
2854	if (8192 < length $pkt and $self->{can_lzf}) {	2911	if (8192 < length $pkt and $self->{can_lzf}) {
2855	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;	2912	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2856	$pkt = "frag";	2913	$pkt = "frag";
2857	}	2914	}
2858		2915
2859	$self->send_packet ($pkt);	2916	$self->send_packet ($pkt);
2860	} else {
2861	if ($color >= 0) {
2862	# replace some tags by gcfclient-compatible ones
2863	for ($msg) {
2864	1 while
2865	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2866	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2867	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2868	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2869	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2870	}
2871
2872	$color &= cf::NDI_COLOR_MASK;
2873
2874	utf8::encode $msg;
2875
2876	if (0 && $msg =~ /\[/) {
2877	# COMMAND/INFO
2878	$self->send_packet ("drawextinfo $color 10 8 $msg")
2879	} else {
2880	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2881	$self->send_packet ("drawinfo $color $msg")
2882	}
2883	}
2884	}
2885	}	2917	}
2886		2918
2887	=item $client->ext_msg ($type, @msg)	2919	=item $client->ext_msg ($type, @msg)
2888		2920
2889	Sends an ext event to the client.	2921	Sends an ext event to the client.
…		…
3064	The following functions and methods are available within a safe environment:	3096	The following functions and methods are available within a safe environment:
3065		3097
3066	cf::object	3098	cf::object
3067	contr pay_amount pay_player map x y force_find force_add destroy	3099	contr pay_amount pay_player map x y force_find force_add destroy
3068	insert remove name archname title slaying race decrease split	3100	insert remove name archname title slaying race decrease split
		3101	value
3069		3102
3070	cf::object::player	3103	cf::object::player
3071	player	3104	player
3072		3105
3073	cf::player	3106	cf::player
…		…
3079	=cut	3112	=cut
3080		3113
3081	for (	3114	for (
3082	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3115	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3083	insert remove inv nrof name archname title slaying race	3116	insert remove inv nrof name archname title slaying race
3084	decrease split destroy change_exp)],	3117	decrease split destroy change_exp value msg lore send_msg)],
3085	["cf::object::player" => qw(player)],	3118	["cf::object::player" => qw(player)],
3086	["cf::player" => qw(peaceful)],	3119	["cf::player" => qw(peaceful send_msg)],
3087	["cf::map" => qw(trigger)],	3120	["cf::map" => qw(trigger)],
3088	) {	3121	) {
3089	no strict 'refs';	3122	no strict 'refs';
3090	my ($pkg, @funs) = @$_;	3123	my ($pkg, @funs) = @$_;
3091	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3124	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
…		…
3108	my ($code, %vars) = @_;	3141	my ($code, %vars) = @_;
3109		3142
3110	my $qcode = $code;	3143	my $qcode = $code;
3111	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3144	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3112	$qcode =~ s/\n/\\n/g;	3145	$qcode =~ s/\n/\\n/g;
		3146
		3147	%vars = (_dummy => 0) unless %vars;
3113		3148
3114	local $_;	3149	local $_;
3115	local @safe::cf::_safe_eval_args = values %vars;	3150	local @safe::cf::_safe_eval_args = values %vars;
3116		3151
3117	my $eval =	3152	my $eval =
…		…
3347	reload_treasures;	3382	reload_treasures;
3348		3383
3349	warn "finished reloading resource files\n";	3384	warn "finished reloading resource files\n";
3350	}	3385	}
3351		3386
3352	sub init {
3353	my $guard = freeze_mainloop;
3354
3355	evthread_start IO::AIO::poll_fileno;
3356
3357	reload_resources;
3358	}
3359
3360	sub reload_config {	3387	sub reload_config {
		3388	warn "reloading config file...\n";
		3389
3361	open my $fh, "<:utf8", "$CONFDIR/config"	3390	open my $fh, "<:utf8", "$CONFDIR/config"
3362	or return;	3391	or return;
3363		3392
3364	local $/;	3393	local $/;
3365	*CFG = YAML::Load <$fh>;	3394	*CFG = YAML::XS::Load scalar <$fh>;
3366		3395
3367	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];	3396	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];
3368		3397
3369	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3398	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3370	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3399	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3374	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3403	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3375	and die "WARNING: m(un)lockall failed: $!\n";	3404	and die "WARNING: m(un)lockall failed: $!\n";
3376	};	3405	};
3377	warn $@ if $@;	3406	warn $@ if $@;
3378	}	3407	}
		3408
		3409	warn "finished reloading resource files\n";
3379	}	3410	}
3380		3411
3381	sub pidfile() {	3412	sub pidfile() {
3382	sysopen my $fh, $PIDFILE, O_RDWR \| O_CREAT	3413	sysopen my $fh, $PIDFILE, O_RDWR \| O_CREAT
3383	or die "$PIDFILE: $!";	3414	or die "$PIDFILE: $!";
…		…
3395		3426
3396	seek $fh, 0, 0;	3427	seek $fh, 0, 0;
3397	print $fh $$;	3428	print $fh $$;
3398	}	3429	}
3399		3430
		3431	sub main_loop {
		3432	warn "EV::loop starting\n";
		3433	if (1) {
		3434	EV::loop;
		3435	}
		3436	warn "EV::loop returned\n";
		3437	goto &main_loop unless $REALLY_UNLOOP;
		3438	}
		3439
3400	sub main {	3440	sub main {
3401	atomic;	3441	cf::init_globals; # initialise logging
		3442
		3443	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3444	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
		3445	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
		3446	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
		3447
		3448	cf::init_experience;
		3449	cf::init_anim;
		3450	cf::init_attackmess;
		3451	cf::init_dynamic;
		3452
		3453	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3402		3454
3403	# we must not ever block the main coroutine	3455	# we must not ever block the main coroutine
3404	local $Coro::idle = sub {	3456	local $Coro::idle = sub {
3405	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3457	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3406	(async {	3458	(async {
3407	$Coro::current->{desc} = "IDLE BUG HANDLER";	3459	$Coro::current->{desc} = "IDLE BUG HANDLER";
3408	EV::loop EV::LOOP_ONESHOT;	3460	EV::loop EV::LOOP_ONESHOT;
3409	})->prio (Coro::PRIO_MAX);	3461	})->prio (Coro::PRIO_MAX);
3410	};	3462	};
3411		3463
3412	{	3464	evthread_start IO::AIO::poll_fileno;
3413	my $guard = freeze_mainloop;	3465
		3466	cf::sync_job {
		3467	reload_resources;
3414	reload_config;	3468	reload_config;
3415	db_init;	3469	db_init;
		3470
		3471	cf::load_settings;
		3472	cf::load_materials;
		3473	cf::init_uuid;
		3474	cf::init_signals;
		3475	cf::init_commands;
		3476	cf::init_skills;
		3477
		3478	cf::init_beforeplay;
		3479
		3480	atomic;
		3481
3416	load_extensions;	3482	load_extensions;
3417		3483
3418	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419	}
3420
3421	utime time, time, $RUNTIMEFILE;	3484	utime time, time, $RUNTIMEFILE;
3422		3485
3423	# no (long-running) fork's whatsoever before this point(!)	3486	# no (long-running) fork's whatsoever before this point(!)
		3487	use POSIX ();
3424	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3488	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3425		3489
3426	EV::loop;	3490	(pop @POST_INIT)->(0) while @POST_INIT;
		3491	};
		3492
		3493	main_loop;
3427	}	3494	}
3428		3495
3429	#############################################################################	3496	#############################################################################
3430	# initialisation and cleanup	3497	# initialisation and cleanup
3431		3498
…		…
3487	my $uuid = "$LOCALDIR/uuid";	3554	my $uuid = "$LOCALDIR/uuid";
3488		3555
3489	my $fh = aio_open "$uuid~", O_WRONLY \| O_CREAT, 0644	3556	my $fh = aio_open "$uuid~", O_WRONLY \| O_CREAT, 0644
3490	or return;	3557	or return;
3491		3558
3492	my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;	3559	my $value = uuid_seq uuid_cur;
		3560
		3561	unless ($value) {
		3562	warn "cowardly refusing to write zero uuid value!\n";
		3563	return;
		3564	}
		3565
		3566	my $value = uuid_str $value + $uuid_skip;
3493	$uuid_skip = 0;	3567	$uuid_skip = 0;
3494		3568
3495	(aio_write $fh, 0, (length $value), $value, 0) <= 0	3569	(aio_write $fh, 0, (length $value), $value, 0) <= 0
3496	and return;	3570	and return;
3497		3571
…		…
3519	}	3593	}
3520		3594
3521	sub emergency_save() {	3595	sub emergency_save() {
3522	my $freeze_guard = cf::freeze_mainloop;	3596	my $freeze_guard = cf::freeze_mainloop;
3523		3597
3524	warn "enter emergency perl save\n";	3598	warn "emergency_perl_save: enter\n";
3525		3599
3526	cf::sync_job {	3600	cf::sync_job {
		3601	# this is a trade-off: we want to be very quick here, so
		3602	# save all maps without fsync, and later call a global sync
		3603	# (which in turn might be very very slow)
		3604	local $USE_FSYNC = 0;
		3605
3527	# use a peculiar iteration method to avoid tripping on perl	3606	# use a peculiar iteration method to avoid tripping on perl
3528	# refcount bugs in for. also avoids problems with players	3607	# refcount bugs in for. also avoids problems with players
3529	# and maps saved/destroyed asynchronously.	3608	# and maps saved/destroyed asynchronously.
3530	warn "begin emergency player save\n";	3609	warn "emergency_perl_save: begin player save\n";
3531	for my $login (keys %cf::PLAYER) {	3610	for my $login (keys %cf::PLAYER) {
3532	my $pl = $cf::PLAYER{$login} or next;	3611	my $pl = $cf::PLAYER{$login} or next;
3533	$pl->valid or next;	3612	$pl->valid or next;
3534	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3613	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3535	$pl->save;	3614	$pl->save;
3536	}	3615	}
3537	warn "end emergency player save\n";	3616	warn "emergency_perl_save: end player save\n";
3538		3617
3539	warn "begin emergency map save\n";	3618	warn "emergency_perl_save: begin map save\n";
3540	for my $path (keys %cf::MAP) {	3619	for my $path (keys %cf::MAP) {
3541	my $map = $cf::MAP{$path} or next;	3620	my $map = $cf::MAP{$path} or next;
3542	$map->valid or next;	3621	$map->valid or next;
3543	$map->save;	3622	$map->save;
3544	}	3623	}
3545	warn "end emergency map save\n";	3624	warn "emergency_perl_save: end map save\n";
3546		3625
3547	warn "begin emergency database checkpoint\n";	3626	warn "emergency_perl_save: begin database checkpoint\n";
3548	BDB::db_env_txn_checkpoint $DB_ENV;	3627	BDB::db_env_txn_checkpoint $DB_ENV;
3549	warn "end emergency database checkpoint\n";	3628	warn "emergency_perl_save: end database checkpoint\n";
3550		3629
3551	warn "begin write uuid\n";	3630	warn "emergency_perl_save: begin write uuid\n";
3552	write_uuid_sync 1;	3631	write_uuid_sync 1;
3553	warn "end write uuid\n";	3632	warn "emergency_perl_save: end write uuid\n";
3554	};	3633	};
3555		3634
		3635	warn "emergency_perl_save: starting sync()\n";
		3636	IO::AIO::aio_sync sub {
		3637	warn "emergency_perl_save: finished sync()\n";
		3638	};
		3639
3556	warn "leave emergency perl save\n";	3640	warn "emergency_perl_save: leave\n";
3557	}	3641	}
3558		3642
3559	sub post_cleanup {	3643	sub post_cleanup {
3560	my ($make_core) = @_;	3644	my ($make_core) = @_;
3561		3645
…		…
3587	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3671	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3588	for my $name (keys %$leaf_symtab) {	3672	for my $name (keys %$leaf_symtab) {
3589	_gv_clear *{"$pkg$name"};	3673	_gv_clear *{"$pkg$name"};
3590	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3674	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3591	}	3675	}
3592	warn "cleared package #$pkg\n";#d#	3676	warn "cleared package $pkg\n";#d#
3593	}	3677	}
3594
3595	our $RELOAD; # how many times to reload
3596		3678
3597	sub do_reload_perl() {	3679	sub do_reload_perl() {
3598	# can/must only be called in main	3680	# can/must only be called in main
3599	if ($Coro::current != $Coro::main) {	3681	if ($Coro::current != $Coro::main) {
3600	warn "can only reload from main coroutine";	3682	warn "can only reload from main coroutine";
3601	return;	3683	return;
3602	}	3684	}
3603		3685
3604	return if $RELOAD++;	3686	return if $RELOAD++;
		3687
		3688	my $t1 = EV::time;
3605		3689
3606	while ($RELOAD) {	3690	while ($RELOAD) {
3607	warn "reloading...";	3691	warn "reloading...";
3608		3692
3609	warn "entering sync_job";	3693	warn "entering sync_job";
…		…
3670	clear_package "safe::$_"	3754	clear_package "safe::$_"
3671	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3755	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3672		3756
3673	warn "unloading cf.pm \"a bit\"";	3757	warn "unloading cf.pm \"a bit\"";
3674	delete $INC{"cf.pm"};	3758	delete $INC{"cf.pm"};
3675	delete $INC{"cf/pod.pm"};	3759	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3676		3760
3677	# don't, removes xs symbols, too,	3761	# don't, removes xs symbols, too,
3678	# and global variables created in xs	3762	# and global variables created in xs
3679	#clear_package __PACKAGE__;	3763	#clear_package __PACKAGE__;
3680		3764
3681	warn "unload completed, starting to reload now";	3765	warn "unload completed, starting to reload now";
3682		3766
3683	warn "reloading cf.pm";	3767	warn "reloading cf.pm";
3684	require cf;	3768	require cf;
3685	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3769	cf::_connect_to_perl_1;
3686		3770
3687	warn "loading config and database again";	3771	warn "loading config and database again";
3688	cf::reload_config;	3772	cf::reload_config;
3689		3773
3690	warn "loading extensions";	3774	warn "loading extensions";
3691	cf::load_extensions;	3775	cf::load_extensions;
3692		3776
		3777	if ($REATTACH_ON_RELOAD) {
3693	warn "reattaching attachments to objects/players";	3778	warn "reattaching attachments to objects/players";
3694	_global_reattach; # objects, sockets	3779	_global_reattach; # objects, sockets
3695	warn "reattaching attachments to maps";	3780	warn "reattaching attachments to maps";
3696	reattach $_ for values %MAP;	3781	reattach $_ for values %MAP;
3697	warn "reattaching attachments to players";	3782	warn "reattaching attachments to players";
3698	reattach $_ for values %PLAYER;	3783	reattach $_ for values %PLAYER;
		3784	}
		3785
		3786	warn "running post_init jobs";
		3787	(pop @POST_INIT)->(1) while @POST_INIT;
3699		3788
3700	warn "leaving sync_job";	3789	warn "leaving sync_job";
3701		3790
3702	1	3791	1
3703	} or do {	3792	} or do {
…		…
3706	};	3795	};
3707		3796
3708	warn "reloaded";	3797	warn "reloaded";
3709	--$RELOAD;	3798	--$RELOAD;
3710	}	3799	}
		3800
		3801	$t1 = EV::time - $t1;
		3802	warn "reload completed in ${t1}s\n";
3711	};	3803	};
3712		3804
3713	our $RELOAD_WATCHER; # used only during reload	3805	our $RELOAD_WATCHER; # used only during reload
3714		3806
3715	sub reload_perl() {	3807	sub reload_perl() {
3716	# doing reload synchronously and two reloads happen back-to-back,	3808	# doing reload synchronously and two reloads happen back-to-back,
3717	# coro crashes during coro_state_free->destroy here.	3809	# coro crashes during coro_state_free->destroy here.
3718		3810
		3811	$RELOAD_WATCHER \|\|= cf::async {
		3812	Coro::AIO::aio_wait cache_extensions;
		3813
3719	$RELOAD_WATCHER \|\|= EV::timer 0, 0, sub {	3814	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3720	do_reload_perl;	3815	do_reload_perl;
3721	undef $RELOAD_WATCHER;	3816	undef $RELOAD_WATCHER;
		3817	};
3722	};	3818	};
3723	}	3819	}
3724		3820
3725	register_command "reload" => sub {	3821	register_command "reload" => sub {
3726	my ($who, $arg) = @_;	3822	my ($who, $arg) = @_;
…		…
3885	LOG llevInfo, "[ABT] [suppressed]\n";	3981	LOG llevInfo, "[ABT] [suppressed]\n";
3886	}	3982	}
3887	}	3983	}
3888		3984
3889	# load additional modules	3985	# load additional modules
3890	use cf::pod;	3986	require "cf/$_.pm" for @EXTRA_MODULES;
		3987	cf::_connect_to_perl_2;
3891		3988
3892	END { cf::emergency_save }	3989	END { cf::emergency_save }
3893		3990
3894	1	3991	1
3895		3992

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.448 by root, Fri Sep 19 05:30:23 2008 UTC vs. Revision 1.485 by root, Mon Oct 12 14:12:54 2009 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.448 by root, Fri Sep 19 05:30:23 2008 UTC vs.
Revision 1.485 by root, Mon Oct 12 14:12:54 2009 UTC