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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.447 by root, Fri Sep 19 01:39:45 2008 UTC vs.
Revision 1.488 by root, Wed Oct 21 00:44:39 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
…		…
63		66
64	# configure various modules to our taste	67	# configure various modules to our taste
65	#	68	#
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
		71
		72	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
		73
		74	# make sure c-lzf reinitialises itself
		75	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
68	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
69		77
70	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	78	# strictly for debugging
		79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
71		80
72	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73		82
74	our %COMMAND = ();	83	our %COMMAND = ();
75	our %COMMAND_TIME = ();	84	our %COMMAND_TIME = ();
…		…
78	our %EXTCMD = ();	87	our %EXTCMD = ();
79	our %EXTICMD = ();	88	our %EXTICMD = ();
80	our %EXT_CORO = (); # coroutines bound to extensions	89	our %EXT_CORO = (); # coroutines bound to extensions
81	our %EXT_MAP = (); # pluggable maps	90	our %EXT_MAP = (); # pluggable maps
82		91
83	our $RELOAD; # number of reloads so far	92	our $RELOAD; # number of reloads so far, non-zero while in reload
84	our @EVENT;	93	our @EVENT;
		94	our @REFLECT; # set by XS
		95	our %REFLECT; # set by us
85		96
86	our $CONFDIR = confdir;	97	our $CONFDIR = confdir;
87	our $DATADIR = datadir;	98	our $DATADIR = datadir;
88	our $LIBDIR = "$DATADIR/ext";	99	our $LIBDIR = "$DATADIR/ext";
89	our $PODDIR = "$DATADIR/pod";	100	our $PODDIR = "$DATADIR/pod";
…		…
100	our %RESOURCE;	111	our %RESOURCE;
101		112
102	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	113	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
103	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	114	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
104	our $NEXT_TICK;	115	our $NEXT_TICK;
105	our $USE_FSYNC = 1; # use fsync to write maps - default off	116	our $USE_FSYNC = 1; # use fsync to write maps - default on
106		117
107	our $BDB_DEADLOCK_WATCHER;	118	our $BDB_DEADLOCK_WATCHER;
108	our $BDB_CHECKPOINT_WATCHER;	119	our $BDB_CHECKPOINT_WATCHER;
109	our $BDB_TRICKLE_WATCHER;	120	our $BDB_TRICKLE_WATCHER;
110	our $DB_ENV;	121	our $DB_ENV;
111		122
		123	our @EXTRA_MODULES = qw(pod match mapscript);
		124
112	our %CFG;	125	our %CFG;
113		126
114	our $UPTIME; $UPTIME \|\|= time;	127	our $UPTIME; $UPTIME \|\|= time;
115	our $RUNTIME;	128	our $RUNTIME;
116	our $NOW;	129	our $NOW;
…		…
124		137
125	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)
126	our $LOADAVG; # same thing, but with alpha-smoothing	139	our $LOADAVG; # same thing, but with alpha-smoothing
127	our $JITTER; # average jitter	140	our $JITTER; # average jitter
128	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 :)
129		147
130	binmode STDOUT;	148	binmode STDOUT;
131	binmode STDERR;	149	binmode STDERR;
132		150
133	# read virtual server time, if available	151	# read virtual server time, if available
…		…
135	open my $fh, "<", $RUNTIMEFILE	153	open my $fh, "<", $RUNTIMEFILE
136	or die "unable to read $RUNTIMEFILE file: $!";	154	or die "unable to read $RUNTIMEFILE file: $!";
137	$RUNTIME = <$fh> + 0.;	155	$RUNTIME = <$fh> + 0.;
138	}	156	}
139		157
		158	eval "sub TICK() { $TICK } 1" or die;
		159
140	mkdir $_	160	mkdir $_
141	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	161	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
142		162
143	our $EMERGENCY_POSITION;	163	our $EMERGENCY_POSITION;
144		164
145	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::"} };
146		177
147	#############################################################################	178	#############################################################################
148		179
149	=head2 GLOBAL VARIABLES	180	=head2 GLOBAL VARIABLES
150		181
…		…
197	returns directly I<after> the tick processing (and consequently, can only wake one process	228	returns directly I<after> the tick processing (and consequently, can only wake one process
198	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	229	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
199		230
200	=item @cf::INVOKE_RESULTS	231	=item @cf::INVOKE_RESULTS
201		232
202	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
203	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
204	that call.	235	that call.
205		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
206	=back	243	=back
207		244
208	=cut	245	=cut
209		246
210	BEGIN {	247	$Coro::State::WARNHOOK = sub {
211	*CORE::GLOBAL::warn = sub {
212	my $msg = join "", @_;	248	my $msg = join "", @_;
213		249
214	$msg .= "\n"	250	$msg .= "\n"
215	unless $msg =~ /\n$/;	251	unless $msg =~ /\n$/;
216		252
217	$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;
218		254
219	LOG llevError, $msg;	255	LOG llevError, $msg;
220	};	256	};
221	}
222		257
223	$Coro::State::DIEHOOK = sub {	258	$Coro::State::DIEHOOK = sub {
224	return unless $^S eq 0; # "eq", not "=="	259	return unless $^S eq 0; # "eq", not "=="
		260
		261	warn Carp::longmess $_[0];
225		262
226	if ($Coro::current == $Coro::main) {#d#	263	if ($Coro::current == $Coro::main) {#d#
227	warn "DIEHOOK called in main context, Coro bug?\n";#d#	264	warn "DIEHOOK called in main context, Coro bug?\n";#d#
228	return;#d#	265	return;#d#
229	}#d#	266	}#d#
230		267
231	# kill coroutine otherwise	268	# kill coroutine otherwise
232	warn Carp::longmess $_[0];
233	Coro::terminate	269	Coro::terminate
234	};	270	};
235
236	$SIG{__DIE__} = sub { }; #d#?
237		271
238	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	272	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
239	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	273	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
240	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	274	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
241	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	275	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
302	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
303		337
304	sub encode_json($) { $json_coder->encode ($_[0]) }	338	sub encode_json($) { $json_coder->encode ($_[0]) }
305	sub decode_json($) { $json_coder->decode ($_[0]) }	339	sub decode_json($) { $json_coder->decode ($_[0]) }
306		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
307	=item cf::lock_wait $string	355	=item cf::lock_wait $string
308		356
309	Wait until the given lock is available. See cf::lock_acquire.	357	Wait until the given lock is available. See cf::lock_acquire.
310		358
311	=item my $lock = cf::lock_acquire $string	359	=item my $lock = cf::lock_acquire $string
312		360
313	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
314	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,
315	for example when the coroutine gets canceled), the lock is automatically	363	for example when the coroutine gets canceled), the lock is automatically
316	returned.	364	returned.
317		365
318	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
319	deadlocked coro.	367	deadlocked coro.
…		…
325		373
326	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.
327		375
328	=cut	376	=cut
329		377
330	our %LOCK;	378	our $LOCKS = new Coro::SemaphoreSet;
331	our %LOCKER;#d#
332		379
333	sub lock_wait($) {	380	sub lock_wait($) {
334	my ($key) = @_;	381	$LOCKS->wait ($_[0]);
335
336	if ($LOCKER{$key} == $Coro::current) {#d#
337	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
338	return;#d#
339	}#d#
340
341	# wait for lock, if any
342	while ($LOCK{$key}) {
343	push @{ $LOCK{$key} }, $Coro::current;
344	Coro::schedule;
345	}
346	}	382	}
347		383
348	sub lock_acquire($) {	384	sub lock_acquire($) {
349	my ($key) = @_;	385	$LOCKS->guard ($_[0])
350
351	# wait, to be sure we are not locked
352	lock_wait $key;
353
354	$LOCK{$key} = [];
355	$LOCKER{$key} = $Coro::current;#d#
356
357	Coro::guard {
358	delete $LOCKER{$key};#d#
359	# wake up all waiters, to be on the safe side
360	$_->ready for @{ delete $LOCK{$key} };
361	}
362	}	386	}
363		387
364	sub lock_active($) {	388	sub lock_active($) {
365	my ($key) = @_;	389	$LOCKS->count ($_[0]) < 1
366
367	! ! $LOCK{$key}
368	}	390	}
369		391
370	sub freeze_mainloop {	392	sub freeze_mainloop {
371	tick_inhibit_inc;	393	tick_inhibit_inc;
372		394
373	Coro::guard \&tick_inhibit_dec;	395	&Guard::guard (\&tick_inhibit_dec);
374	}	396	}
375		397
376	=item cf::periodic $interval, $cb	398	=item cf::periodic $interval, $cb
377		399
378	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
…		…
1150	$decname, length $$rdata, scalar @$objs;	1172	$decname, length $$rdata, scalar @$objs;
1151		1173
1152	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1174	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
1153	aio_chmod $fh, SAVE_MODE;	1175	aio_chmod $fh, SAVE_MODE;
1154	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1176	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1155	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	}
1156	aio_close $fh;	1181	aio_close $fh;
1157		1182
1158	if (@$objs) {	1183	if (@$objs) {
1159	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) {
1160	aio_chmod $fh, SAVE_MODE;	1185	aio_chmod $fh, SAVE_MODE;
1161	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1186	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1162	aio_write $fh, 0, (length $data), $data, 0;	1187	aio_write $fh, 0, (length $data), $data, 0;
1163	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	}
1164	aio_close $fh;	1192	aio_close $fh;
1165	aio_rename "$filename.pst~", "$filename.pst";	1193	aio_rename "$filename.pst~", "$filename.pst";
1166	}	1194	}
1167	} else {	1195	} else {
1168	aio_unlink "$filename.pst";	1196	aio_unlink "$filename.pst";
1169	}	1197	}
1170		1198
1171	aio_rename "$filename~", $filename;	1199	aio_rename "$filename~", $filename;
		1200
		1201	$filename =~ s%/[^/]+$%%;
		1202	aio_pathsync $filename if $cf::USE_FSYNC;
1172	} else {	1203	} else {
1173	warn "FATAL: $filename~: $!\n";	1204	warn "unable to save objects: $filename~: $!\n";
1174	}	1205	}
1175	} else {	1206	} else {
1176	aio_unlink $filename;	1207	aio_unlink $filename;
1177	aio_unlink "$filename.pst";	1208	aio_unlink "$filename.pst";
1178	}	1209	}
…		…
1269	my ($name, $cb) = @_;	1300	my ($name, $cb) = @_;
1270		1301
1271	$EXTICMD{$name} = $cb;	1302	$EXTICMD{$name} = $cb;
1272	}	1303	}
1273		1304
		1305	use File::Glob ();
		1306
1274	cf::player->attach (	1307	cf::player->attach (
1275	on_command => sub {	1308	on_command => sub {
1276	my ($pl, $name, $params) = @_;	1309	my ($pl, $name, $params) = @_;
1277		1310
1278	my $cb = $COMMAND{$name}	1311	my $cb = $COMMAND{$name}
…		…
1309	}	1342	}
1310		1343
1311	cf::override;	1344	cf::override;
1312	},	1345	},
1313	);	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	}
1314		1360
1315	sub load_extensions {	1361	sub load_extensions {
1316	cf::sync_job {	1362	cf::sync_job {
1317	my %todo;	1363	my %todo;
1318		1364
…		…
1441		1487
1442	sub exists($) {	1488	sub exists($) {
1443	my ($login) = @_;	1489	my ($login) = @_;
1444		1490
1445	$cf::PLAYER{$login}	1491	$cf::PLAYER{$login}
1446	or cf::sync_job { !aio_stat path $login }	1492	or !aio_stat path $login
1447	}	1493	}
1448		1494
1449	sub find($) {	1495	sub find($) {
1450	return $cf::PLAYER{$_[0]} \|\| do {	1496	return $cf::PLAYER{$_[0]} \|\| do {
1451	my $login = $_[0];	1497	my $login = $_[0];
…		…
1847		1893
1848	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;	1894	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1849	"$UNIQUEDIR/$path"	1895	"$UNIQUEDIR/$path"
1850	}	1896	}
1851		1897
1852	# and all this just because we cannot iterate over
1853	# all maps in C++...
1854	sub change_all_map_light {
1855	my ($change) = @_;
1856
1857	$_->change_map_light ($change)
1858	for grep $_->outdoor, values %cf::MAP;
1859	}
1860
1861	sub decay_objects {	1898	sub decay_objects {
1862	my ($self) = @_;	1899	my ($self) = @_;
1863		1900
1864	return if $self->{deny_reset};	1901	return if $self->{deny_reset};
1865		1902
…		…
1947	sub find {	1984	sub find {
1948	my ($path, $origin) = @_;	1985	my ($path, $origin) = @_;
1949		1986
1950	$path = normalise $path, $origin && $origin->path;	1987	$path = normalise $path, $origin && $origin->path;
1951		1988
1952	cf::lock_wait "map_data:$path";#d#remove	1989	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1953	cf::lock_wait "map_find:$path";	1990	my $guard2 = cf::lock_acquire "map_find:$path";
1954		1991
1955	$cf::MAP{$path} \|\| do {	1992	$cf::MAP{$path} \|\| do {
1956	my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1957	my $guard2 = cf::lock_acquire "map_find:$path";
1958
1959	my $map = new_from_path cf::map $path	1993	my $map = new_from_path cf::map $path
1960	or return;	1994	or return;
1961		1995
1962	$map->{last_save} = $cf::RUNTIME;	1996	$map->{last_save} = $cf::RUNTIME;
1963		1997
…		…
2031	unless ($self->{deny_activate}) {	2065	unless ($self->{deny_activate}) {
2032	$self->decay_objects;	2066	$self->decay_objects;
2033	$self->fix_auto_apply;	2067	$self->fix_auto_apply;
2034	$self->update_buttons;	2068	$self->update_buttons;
2035	cf::cede_to_tick;	2069	cf::cede_to_tick;
2036	$self->set_darkness_map;
2037	cf::cede_to_tick;
2038	$self->activate;	2070	$self->activate;
2039	}	2071	}
2040		2072
2041	$self->{last_save} = $cf::RUNTIME;	2073	$self->{last_save} = $cf::RUNTIME;
2042	$self->last_access ($cf::RUNTIME);	2074	$self->last_access ($cf::RUNTIME);
…		…
2208		2240
2209	my $lock = cf::lock_acquire "map_data:$self->{path}";	2241	my $lock = cf::lock_acquire "map_data:$self->{path}";
2210		2242
2211	return if $self->players;	2243	return if $self->players;
2212		2244
2213	warn "resetting map ", $self->path;	2245	warn "resetting map ", $self->path, "\n";
2214		2246
2215	$self->in_memory (cf::MAP_SWAPPED);	2247	$self->in_memory (cf::MAP_SWAPPED);
2216		2248
2217	# need to save uniques path	2249	# need to save uniques path
2218	unless ($self->{deny_save}) {	2250	unless ($self->{deny_save}) {
…		…
2383		2415
2384	our $SAY_CHANNEL = {	2416	our $SAY_CHANNEL = {
2385	id => "say",	2417	id => "say",
2386	title => "Map",	2418	title => "Map",
2387	reply => "say ",	2419	reply => "say ",
2388	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.",
2389	};	2421	};
2390		2422
2391	our $CHAT_CHANNEL = {	2423	our $CHAT_CHANNEL = {
2392	id => "chat",	2424	id => "chat",
2393	title => "Chat",	2425	title => "Chat",
…		…
2519		2551
2520	$map->load;	2552	$map->load;
2521	$map->load_neighbours;	2553	$map->load_neighbours;
2522		2554
2523	return unless $self->contr->active;	2555	return unless $self->contr->active;
2524	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2525	$self->activate_recursive;
2526		2556
2527	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2557	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528	$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;
2529	}	2562	}
2530		2563
2531	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2564	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2532		2565
2533	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
…		…
2732		2765
2733	=cut	2766	=cut
2734		2767
2735	# non-persistent channels (usually the info channel)	2768	# non-persistent channels (usually the info channel)
2736	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	},
2737	"c/identify" => {	2776	"c/identify" => {
2738	id => "infobox",	2777	id => "infobox",
2739	title => "Identify",	2778	title => "Identify",
2740	reply => undef,	2779	reply => undef,
2741	tooltip => "Items recently identified",	2780	tooltip => "Items recently identified",
…		…
2743	"c/examine" => {	2782	"c/examine" => {
2744	id => "infobox",	2783	id => "infobox",
2745	title => "Examine",	2784	title => "Examine",
2746	reply => undef,	2785	reply => undef,
2747	tooltip => "Signs and other items you examined",	2786	tooltip => "Signs and other items you examined",
		2787	},
		2788	"c/shopinfo" => {
		2789	id => "infobox",
		2790	title => "Shop Info",
		2791	reply => undef,
		2792	tooltip => "What your bargaining skill tells you about the shop",
2748	},	2793	},
2749	"c/book" => {	2794	"c/book" => {
2750	id => "infobox",	2795	id => "infobox",
2751	title => "Book",	2796	title => "Book",
2752	reply => undef,	2797	reply => undef,
…		…
2768	id => "infobox",	2813	id => "infobox",
2769	title => "Body Parts",	2814	title => "Body Parts",
2770	reply => undef,	2815	reply => undef,
2771	tooltip => "Shows which body parts you posess and are available",	2816	tooltip => "Shows which body parts you posess and are available",
2772	},	2817	},
		2818	"c/statistics" => {
		2819	id => "infobox",
		2820	title => "Statistics",
		2821	reply => undef,
		2822	tooltip => "Shows your primary statistics",
		2823	},
		2824	"c/skills" => {
		2825	id => "infobox",
		2826	title => "Skills",
		2827	reply => undef,
		2828	tooltip => "Shows your experience per skill and item power",
		2829	},
		2830	"c/shopitems" => {
		2831	id => "infobox",
		2832	title => "Shop Items",
		2833	reply => undef,
		2834	tooltip => "Shows the items currently for sale in this shop",
		2835	},
		2836	"c/resistances" => {
		2837	id => "infobox",
		2838	title => "Resistances",
		2839	reply => undef,
		2840	tooltip => "Shows your resistances",
		2841	},
		2842	"c/pets" => {
		2843	id => "infobox",
		2844	title => "Pets",
		2845	reply => undef,
		2846	tooltip => "Shows information abotu your pets/a specific pet",
		2847	},
		2848	"c/perceiveself" => {
		2849	id => "infobox",
		2850	title => "Perceive Self",
		2851	reply => undef,
		2852	tooltip => "You gained detailed knowledge about yourself",
		2853	},
2773	"c/uptime" => {	2854	"c/uptime" => {
2774	id => "infobox",	2855	id => "infobox",
2775	title => "Uptime",	2856	title => "Uptime",
2776	reply => undef,	2857	reply => undef,
2777	tooltip => "How long the server has been running since last restart",	2858	tooltip => "How long the server has been running since last restart",
…		…
2786	id => "party",	2867	id => "party",
2787	title => "Party",	2868	title => "Party",
2788	reply => "gsay ",	2869	reply => "gsay ",
2789	tooltip => "Messages and chat related to your party",	2870	tooltip => "Messages and chat related to your party",
2790	},	2871	},
		2872	"c/death" => {
		2873	id => "death",
		2874	title => "Death",
		2875	reply => undef,
		2876	tooltip => "Reason for and more info about your most recent death",
		2877	},
		2878	"c/say" => $SAY_CHANNEL,
		2879	"c/chat" => $CHAT_CHANNEL,
2791	);	2880	);
2792		2881
2793	sub cf::client::send_msg {	2882	sub cf::client::send_msg {
2794	my ($self, $channel, $msg, $color, @extra) = @_;	2883	my ($self, $channel, $msg, $color, @extra) = @_;
2795		2884
…		…
2800		2889
2801	# check predefined channels, for the benefit of C	2890	# check predefined channels, for the benefit of C
2802	if ($CHANNEL{$channel}) {	2891	if ($CHANNEL{$channel}) {
2803	$channel = $CHANNEL{$channel};	2892	$channel = $CHANNEL{$channel};
2804		2893
2805	$self->ext_msg (channel_info => $channel)	2894	$self->ext_msg (channel_info => $channel);
2806	if $self->can_msg;
2807
2808	$channel = $channel->{id};	2895	$channel = $channel->{id};
2809		2896
2810	} elsif (ref $channel) {	2897	} elsif (ref $channel) {
2811	# send meta info to client, if not yet sent	2898	# send meta info to client, if not yet sent
2812	unless (exists $self->{channel}{$channel->{id}}) {	2899	unless (exists $self->{channel}{$channel->{id}}) {
2813	$self->{channel}{$channel->{id}} = $channel;	2900	$self->{channel}{$channel->{id}} = $channel;
2814	$self->ext_msg (channel_info => $channel)	2901	$self->ext_msg (channel_info => $channel);
2815	if $self->can_msg;
2816	}	2902	}
2817		2903
2818	$channel = $channel->{id};	2904	$channel = $channel->{id};
2819	}	2905	}
2820		2906
2821	return unless @extra \|\| length $msg;	2907	return unless @extra \|\| length $msg;
2822		2908
2823	if ($self->can_msg) {
2824	# default colour, mask it out	2909	# default colour, mask it out
2825	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)	2910	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
2826	if $color & cf::NDI_DEF;	2911	if $color & cf::NDI_DEF;
2827		2912
2828	my $pkt = "msg "	2913	my $pkt = "msg "
2829	. $self->{json_coder}->encode (	2914	. $self->{json_coder}->encode (
2830	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	2915	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2831	);	2916	);
2832		2917
2833	# try lzf for large packets	2918	# try lzf for large packets
2834	$pkt = "lzf " . Compress::LZF::compress $pkt	2919	$pkt = "lzf " . Compress::LZF::compress $pkt
2835	if 1024 <= length $pkt and $self->{can_lzf};	2920	if 1024 <= length $pkt and $self->{can_lzf};
2836		2921
2837	# split very large packets	2922	# split very large packets
2838	if (8192 < length $pkt and $self->{can_lzf}) {	2923	if (8192 < length $pkt and $self->{can_lzf}) {
2839	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;	2924	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2840	$pkt = "frag";	2925	$pkt = "frag";
2841	}	2926	}
2842		2927
2843	$self->send_packet ($pkt);	2928	$self->send_packet ($pkt);
2844	} else {
2845	if ($color >= 0) {
2846	# replace some tags by gcfclient-compatible ones
2847	for ($msg) {
2848	1 while
2849	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2850	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2851	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2852	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2853	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2854	}
2855
2856	$color &= cf::NDI_COLOR_MASK;
2857
2858	utf8::encode $msg;
2859
2860	if (0 && $msg =~ /\[/) {
2861	# COMMAND/INFO
2862	$self->send_packet ("drawextinfo $color 10 8 $msg")
2863	} else {
2864	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2865	$self->send_packet ("drawinfo $color $msg")
2866	}
2867	}
2868	}
2869	}	2929	}
2870		2930
2871	=item $client->ext_msg ($type, @msg)	2931	=item $client->ext_msg ($type, @msg)
2872		2932
2873	Sends an ext event to the client.	2933	Sends an ext event to the client.
…		…
3048	The following functions and methods are available within a safe environment:	3108	The following functions and methods are available within a safe environment:
3049		3109
3050	cf::object	3110	cf::object
3051	contr pay_amount pay_player map x y force_find force_add destroy	3111	contr pay_amount pay_player map x y force_find force_add destroy
3052	insert remove name archname title slaying race decrease split	3112	insert remove name archname title slaying race decrease split
		3113	value
3053		3114
3054	cf::object::player	3115	cf::object::player
3055	player	3116	player
3056		3117
3057	cf::player	3118	cf::player
…		…
3063	=cut	3124	=cut
3064		3125
3065	for (	3126	for (
3066	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3127	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3067	insert remove inv nrof name archname title slaying race	3128	insert remove inv nrof name archname title slaying race
3068	decrease split destroy change_exp)],	3129	decrease split destroy change_exp value msg lore send_msg)],
3069	["cf::object::player" => qw(player)],	3130	["cf::object::player" => qw(player)],
3070	["cf::player" => qw(peaceful)],	3131	["cf::player" => qw(peaceful send_msg)],
3071	["cf::map" => qw(trigger)],	3132	["cf::map" => qw(trigger)],
3072	) {	3133	) {
3073	no strict 'refs';	3134	no strict 'refs';
3074	my ($pkg, @funs) = @$_;	3135	my ($pkg, @funs) = @$_;
3075	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3136	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
…		…
3092	my ($code, %vars) = @_;	3153	my ($code, %vars) = @_;
3093		3154
3094	my $qcode = $code;	3155	my $qcode = $code;
3095	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3156	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3096	$qcode =~ s/\n/\\n/g;	3157	$qcode =~ s/\n/\\n/g;
		3158
		3159	%vars = (_dummy => 0) unless %vars;
3097		3160
3098	local $_;	3161	local $_;
3099	local @safe::cf::_safe_eval_args = values %vars;	3162	local @safe::cf::_safe_eval_args = values %vars;
3100		3163
3101	my $eval =	3164	my $eval =
…		…
3331	reload_treasures;	3394	reload_treasures;
3332		3395
3333	warn "finished reloading resource files\n";	3396	warn "finished reloading resource files\n";
3334	}	3397	}
3335		3398
3336	sub init {
3337	my $guard = freeze_mainloop;
3338
3339	evthread_start IO::AIO::poll_fileno;
3340
3341	reload_resources;
3342	}
3343
3344	sub reload_config {	3399	sub reload_config {
		3400	warn "reloading config file...\n";
		3401
3345	open my $fh, "<:utf8", "$CONFDIR/config"	3402	open my $fh, "<:utf8", "$CONFDIR/config"
3346	or return;	3403	or return;
3347		3404
3348	local $/;	3405	local $/;
3349	*CFG = YAML::Load <$fh>;	3406	*CFG = YAML::XS::Load scalar <$fh>;
3350		3407
3351	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];	3408	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];
3352		3409
3353	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3410	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3354	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3411	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3358	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3415	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3359	and die "WARNING: m(un)lockall failed: $!\n";	3416	and die "WARNING: m(un)lockall failed: $!\n";
3360	};	3417	};
3361	warn $@ if $@;	3418	warn $@ if $@;
3362	}	3419	}
		3420
		3421	warn "finished reloading resource files\n";
3363	}	3422	}
3364		3423
3365	sub pidfile() {	3424	sub pidfile() {
3366	sysopen my $fh, $PIDFILE, O_RDWR \| O_CREAT	3425	sysopen my $fh, $PIDFILE, O_RDWR \| O_CREAT
3367	or die "$PIDFILE: $!";	3426	or die "$PIDFILE: $!";
…		…
3379		3438
3380	seek $fh, 0, 0;	3439	seek $fh, 0, 0;
3381	print $fh $$;	3440	print $fh $$;
3382	}	3441	}
3383		3442
		3443	sub main_loop {
		3444	warn "EV::loop starting\n";
		3445	if (1) {
		3446	EV::loop;
		3447	}
		3448	warn "EV::loop returned\n";
		3449	goto &main_loop unless $REALLY_UNLOOP;
		3450	}
		3451
3384	sub main {	3452	sub main {
3385	atomic;	3453	cf::init_globals; # initialise logging
		3454
		3455	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3456	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
		3457	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
		3458	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
		3459
		3460	cf::init_experience;
		3461	cf::init_anim;
		3462	cf::init_attackmess;
		3463	cf::init_dynamic;
		3464
		3465	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3386		3466
3387	# we must not ever block the main coroutine	3467	# we must not ever block the main coroutine
3388	local $Coro::idle = sub {	3468	local $Coro::idle = sub {
3389	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3469	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3390	(async {	3470	(async {
3391	$Coro::current->{desc} = "IDLE BUG HANDLER";	3471	$Coro::current->{desc} = "IDLE BUG HANDLER";
3392	EV::loop EV::LOOP_ONESHOT;	3472	EV::loop EV::LOOP_ONESHOT;
3393	})->prio (Coro::PRIO_MAX);	3473	})->prio (Coro::PRIO_MAX);
3394	};	3474	};
3395		3475
3396	{	3476	evthread_start IO::AIO::poll_fileno;
3397	my $guard = freeze_mainloop;	3477
		3478	cf::sync_job {
		3479	reload_resources;
3398	reload_config;	3480	reload_config;
3399	db_init;	3481	db_init;
		3482
		3483	cf::load_settings;
		3484	cf::load_materials;
		3485	cf::init_uuid;
		3486	cf::init_signals;
		3487	cf::init_commands;
		3488	cf::init_skills;
		3489
		3490	cf::init_beforeplay;
		3491
		3492	atomic;
		3493
3400	load_extensions;	3494	load_extensions;
3401		3495
3402	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403	}
3404
3405	utime time, time, $RUNTIMEFILE;	3496	utime time, time, $RUNTIMEFILE;
3406		3497
3407	# no (long-running) fork's whatsoever before this point(!)	3498	# no (long-running) fork's whatsoever before this point(!)
		3499	use POSIX ();
3408	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3500	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3409		3501
3410	EV::loop;	3502	(pop @POST_INIT)->(0) while @POST_INIT;
		3503	};
		3504
		3505	main_loop;
3411	}	3506	}
3412		3507
3413	#############################################################################	3508	#############################################################################
3414	# initialisation and cleanup	3509	# initialisation and cleanup
3415		3510
…		…
3471	my $uuid = "$LOCALDIR/uuid";	3566	my $uuid = "$LOCALDIR/uuid";
3472		3567
3473	my $fh = aio_open "$uuid~", O_WRONLY \| O_CREAT, 0644	3568	my $fh = aio_open "$uuid~", O_WRONLY \| O_CREAT, 0644
3474	or return;	3569	or return;
3475		3570
3476	my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;	3571	my $value = uuid_seq uuid_cur;
		3572
		3573	unless ($value) {
		3574	warn "cowardly refusing to write zero uuid value!\n";
		3575	return;
		3576	}
		3577
		3578	my $value = uuid_str $value + $uuid_skip;
3477	$uuid_skip = 0;	3579	$uuid_skip = 0;
3478		3580
3479	(aio_write $fh, 0, (length $value), $value, 0) <= 0	3581	(aio_write $fh, 0, (length $value), $value, 0) <= 0
3480	and return;	3582	and return;
3481		3583
…		…
3503	}	3605	}
3504		3606
3505	sub emergency_save() {	3607	sub emergency_save() {
3506	my $freeze_guard = cf::freeze_mainloop;	3608	my $freeze_guard = cf::freeze_mainloop;
3507		3609
3508	warn "enter emergency perl save\n";	3610	warn "emergency_perl_save: enter\n";
3509		3611
3510	cf::sync_job {	3612	cf::sync_job {
		3613	# this is a trade-off: we want to be very quick here, so
		3614	# save all maps without fsync, and later call a global sync
		3615	# (which in turn might be very very slow)
		3616	local $USE_FSYNC = 0;
		3617
3511	# use a peculiar iteration method to avoid tripping on perl	3618	# use a peculiar iteration method to avoid tripping on perl
3512	# refcount bugs in for. also avoids problems with players	3619	# refcount bugs in for. also avoids problems with players
3513	# and maps saved/destroyed asynchronously.	3620	# and maps saved/destroyed asynchronously.
3514	warn "begin emergency player save\n";	3621	warn "emergency_perl_save: begin player save\n";
3515	for my $login (keys %cf::PLAYER) {	3622	for my $login (keys %cf::PLAYER) {
3516	my $pl = $cf::PLAYER{$login} or next;	3623	my $pl = $cf::PLAYER{$login} or next;
3517	$pl->valid or next;	3624	$pl->valid or next;
3518	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3625	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3519	$pl->save;	3626	$pl->save;
3520	}	3627	}
3521	warn "end emergency player save\n";	3628	warn "emergency_perl_save: end player save\n";
3522		3629
3523	warn "begin emergency map save\n";	3630	warn "emergency_perl_save: begin map save\n";
3524	for my $path (keys %cf::MAP) {	3631	for my $path (keys %cf::MAP) {
3525	my $map = $cf::MAP{$path} or next;	3632	my $map = $cf::MAP{$path} or next;
3526	$map->valid or next;	3633	$map->valid or next;
3527	$map->save;	3634	$map->save;
3528	}	3635	}
3529	warn "end emergency map save\n";	3636	warn "emergency_perl_save: end map save\n";
3530		3637
3531	warn "begin emergency database checkpoint\n";	3638	warn "emergency_perl_save: begin database checkpoint\n";
3532	BDB::db_env_txn_checkpoint $DB_ENV;	3639	BDB::db_env_txn_checkpoint $DB_ENV;
3533	warn "end emergency database checkpoint\n";	3640	warn "emergency_perl_save: end database checkpoint\n";
3534		3641
3535	warn "begin write uuid\n";	3642	warn "emergency_perl_save: begin write uuid\n";
3536	write_uuid_sync 1;	3643	write_uuid_sync 1;
3537	warn "end write uuid\n";	3644	warn "emergency_perl_save: end write uuid\n";
3538	};	3645	};
3539		3646
		3647	warn "emergency_perl_save: starting sync()\n";
		3648	IO::AIO::aio_sync sub {
		3649	warn "emergency_perl_save: finished sync()\n";
		3650	};
		3651
3540	warn "leave emergency perl save\n";	3652	warn "emergency_perl_save: leave\n";
3541	}	3653	}
3542		3654
3543	sub post_cleanup {	3655	sub post_cleanup {
3544	my ($make_core) = @_;	3656	my ($make_core) = @_;
3545		3657
…		…
3571	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3683	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3572	for my $name (keys %$leaf_symtab) {	3684	for my $name (keys %$leaf_symtab) {
3573	_gv_clear *{"$pkg$name"};	3685	_gv_clear *{"$pkg$name"};
3574	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3686	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3575	}	3687	}
3576	warn "cleared package #$pkg\n";#d#	3688	warn "cleared package $pkg\n";#d#
3577	}	3689	}
3578
3579	our $RELOAD; # how many times to reload
3580		3690
3581	sub do_reload_perl() {	3691	sub do_reload_perl() {
3582	# can/must only be called in main	3692	# can/must only be called in main
3583	if ($Coro::current != $Coro::main) {	3693	if ($Coro::current != $Coro::main) {
3584	warn "can only reload from main coroutine";	3694	warn "can only reload from main coroutine";
3585	return;	3695	return;
3586	}	3696	}
3587		3697
3588	return if $RELOAD++;	3698	return if $RELOAD++;
		3699
		3700	my $t1 = EV::time;
3589		3701
3590	while ($RELOAD) {	3702	while ($RELOAD) {
3591	warn "reloading...";	3703	warn "reloading...";
3592		3704
3593	warn "entering sync_job";	3705	warn "entering sync_job";
…		…
3654	clear_package "safe::$_"	3766	clear_package "safe::$_"
3655	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3767	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3656		3768
3657	warn "unloading cf.pm \"a bit\"";	3769	warn "unloading cf.pm \"a bit\"";
3658	delete $INC{"cf.pm"};	3770	delete $INC{"cf.pm"};
3659	delete $INC{"cf/pod.pm"};	3771	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3660		3772
3661	# don't, removes xs symbols, too,	3773	# don't, removes xs symbols, too,
3662	# and global variables created in xs	3774	# and global variables created in xs
3663	#clear_package __PACKAGE__;	3775	#clear_package __PACKAGE__;
3664		3776
3665	warn "unload completed, starting to reload now";	3777	warn "unload completed, starting to reload now";
3666		3778
3667	warn "reloading cf.pm";	3779	warn "reloading cf.pm";
3668	require cf;	3780	require cf;
3669	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3781	cf::_connect_to_perl_1;
3670		3782
3671	warn "loading config and database again";	3783	warn "loading config and database again";
3672	cf::reload_config;	3784	cf::reload_config;
3673		3785
3674	warn "loading extensions";	3786	warn "loading extensions";
3675	cf::load_extensions;	3787	cf::load_extensions;
3676		3788
		3789	if ($REATTACH_ON_RELOAD) {
3677	warn "reattaching attachments to objects/players";	3790	warn "reattaching attachments to objects/players";
3678	_global_reattach; # objects, sockets	3791	_global_reattach; # objects, sockets
3679	warn "reattaching attachments to maps";	3792	warn "reattaching attachments to maps";
3680	reattach $_ for values %MAP;	3793	reattach $_ for values %MAP;
3681	warn "reattaching attachments to players";	3794	warn "reattaching attachments to players";
3682	reattach $_ for values %PLAYER;	3795	reattach $_ for values %PLAYER;
		3796	}
		3797
		3798	warn "running post_init jobs";
		3799	(pop @POST_INIT)->(1) while @POST_INIT;
3683		3800
3684	warn "leaving sync_job";	3801	warn "leaving sync_job";
3685		3802
3686	1	3803	1
3687	} or do {	3804	} or do {
…		…
3690	};	3807	};
3691		3808
3692	warn "reloaded";	3809	warn "reloaded";
3693	--$RELOAD;	3810	--$RELOAD;
3694	}	3811	}
		3812
		3813	$t1 = EV::time - $t1;
		3814	warn "reload completed in ${t1}s\n";
3695	};	3815	};
3696		3816
3697	our $RELOAD_WATCHER; # used only during reload	3817	our $RELOAD_WATCHER; # used only during reload
3698		3818
3699	sub reload_perl() {	3819	sub reload_perl() {
3700	# doing reload synchronously and two reloads happen back-to-back,	3820	# doing reload synchronously and two reloads happen back-to-back,
3701	# coro crashes during coro_state_free->destroy here.	3821	# coro crashes during coro_state_free->destroy here.
3702		3822
		3823	$RELOAD_WATCHER \|\|= cf::async {
		3824	Coro::AIO::aio_wait cache_extensions;
		3825
3703	$RELOAD_WATCHER \|\|= EV::timer 0, 0, sub {	3826	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3704	do_reload_perl;	3827	do_reload_perl;
3705	undef $RELOAD_WATCHER;	3828	undef $RELOAD_WATCHER;
		3829	};
3706	};	3830	};
3707	}	3831	}
3708		3832
3709	register_command "reload" => sub {	3833	register_command "reload" => sub {
3710	my ($who, $arg) = @_;	3834	my ($who, $arg) = @_;
…		…
3869	LOG llevInfo, "[ABT] [suppressed]\n";	3993	LOG llevInfo, "[ABT] [suppressed]\n";
3870	}	3994	}
3871	}	3995	}
3872		3996
3873	# load additional modules	3997	# load additional modules
3874	use cf::pod;	3998	require "cf/$_.pm" for @EXTRA_MODULES;
		3999	cf::_connect_to_perl_2;
3875		4000
3876	END { cf::emergency_save }	4001	END { cf::emergency_save }
3877		4002
3878	1	4003	1
3879		4004

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.447 by root, Fri Sep 19 01:39:45 2008 UTC vs. Revision 1.488 by root, Wed Oct 21 00:44:39 2009 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.447 by root, Fri Sep 19 01:39:45 2008 UTC vs.
Revision 1.488 by root, Wed Oct 21 00:44:39 2009 UTC