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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.450 by root, Mon Sep 22 01:33:09 2008 UTC vs.
Revision 1.487 by root, Fri Oct 16 01:56:41 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",
…		…
2746	"c/examine" => {	2782	"c/examine" => {
2747	id => "infobox",	2783	id => "infobox",
2748	title => "Examine",	2784	title => "Examine",
2749	reply => undef,	2785	reply => undef,
2750	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",
2751	},	2793	},
2752	"c/book" => {	2794	"c/book" => {
2753	id => "infobox",	2795	id => "infobox",
2754	title => "Book",	2796	title => "Book",
2755	reply => undef,	2797	reply => undef,
…		…
2771	id => "infobox",	2813	id => "infobox",
2772	title => "Body Parts",	2814	title => "Body Parts",
2773	reply => undef,	2815	reply => undef,
2774	tooltip => "Shows which body parts you posess and are available",	2816	tooltip => "Shows which body parts you posess and are available",
2775	},	2817	},
		2818	"c/statistics" => {
		2819	id => "infobox",
		2820	title => "Statistics",
		2821	reply => undef,
		2822	tooltip => "Shows your primary statistics",
		2823	},
2776	"c/skills" => {	2824	"c/skills" => {
2777	id => "infobox",	2825	id => "infobox",
2778	title => "Skills",	2826	title => "Skills",
2779	reply => undef,	2827	reply => undef,
2780	tooltip => "Shows your experience per skill and item power",	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",
2781	},	2853	},
2782	"c/uptime" => {	2854	"c/uptime" => {
2783	id => "infobox",	2855	id => "infobox",
2784	title => "Uptime",	2856	title => "Uptime",
2785	reply => undef,	2857	reply => undef,
…		…
2795	id => "party",	2867	id => "party",
2796	title => "Party",	2868	title => "Party",
2797	reply => "gsay ",	2869	reply => "gsay ",
2798	tooltip => "Messages and chat related to your party",	2870	tooltip => "Messages and chat related to your party",
2799	},	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,
2800	);	2880	);
2801		2881
2802	sub cf::client::send_msg {	2882	sub cf::client::send_msg {
2803	my ($self, $channel, $msg, $color, @extra) = @_;	2883	my ($self, $channel, $msg, $color, @extra) = @_;
2804		2884
…		…
2809		2889
2810	# check predefined channels, for the benefit of C	2890	# check predefined channels, for the benefit of C
2811	if ($CHANNEL{$channel}) {	2891	if ($CHANNEL{$channel}) {
2812	$channel = $CHANNEL{$channel};	2892	$channel = $CHANNEL{$channel};
2813		2893
2814	$self->ext_msg (channel_info => $channel)	2894	$self->ext_msg (channel_info => $channel);
2815	if $self->can_msg;
2816
2817	$channel = $channel->{id};	2895	$channel = $channel->{id};
2818		2896
2819	} elsif (ref $channel) {	2897	} elsif (ref $channel) {
2820	# send meta info to client, if not yet sent	2898	# send meta info to client, if not yet sent
2821	unless (exists $self->{channel}{$channel->{id}}) {	2899	unless (exists $self->{channel}{$channel->{id}}) {
2822	$self->{channel}{$channel->{id}} = $channel;	2900	$self->{channel}{$channel->{id}} = $channel;
2823	$self->ext_msg (channel_info => $channel)	2901	$self->ext_msg (channel_info => $channel);
2824	if $self->can_msg;
2825	}	2902	}
2826		2903
2827	$channel = $channel->{id};	2904	$channel = $channel->{id};
2828	}	2905	}
2829		2906
2830	return unless @extra \|\| length $msg;	2907	return unless @extra \|\| length $msg;
2831		2908
2832	if ($self->can_msg) {
2833	# default colour, mask it out	2909	# default colour, mask it out
2834	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)	2910	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
2835	if $color & cf::NDI_DEF;	2911	if $color & cf::NDI_DEF;
2836		2912
2837	my $pkt = "msg "	2913	my $pkt = "msg "
2838	. $self->{json_coder}->encode (	2914	. $self->{json_coder}->encode (
2839	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	2915	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2840	);	2916	);
2841		2917
2842	# try lzf for large packets	2918	# try lzf for large packets
2843	$pkt = "lzf " . Compress::LZF::compress $pkt	2919	$pkt = "lzf " . Compress::LZF::compress $pkt
2844	if 1024 <= length $pkt and $self->{can_lzf};	2920	if 1024 <= length $pkt and $self->{can_lzf};
2845		2921
2846	# split very large packets	2922	# split very large packets
2847	if (8192 < length $pkt and $self->{can_lzf}) {	2923	if (8192 < length $pkt and $self->{can_lzf}) {
2848	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;	2924	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2849	$pkt = "frag";	2925	$pkt = "frag";
2850	}	2926	}
2851		2927
2852	$self->send_packet ($pkt);	2928	$self->send_packet ($pkt);
2853	} else {
2854	if ($color >= 0) {
2855	# replace some tags by gcfclient-compatible ones
2856	for ($msg) {
2857	1 while
2858	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2859	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2860	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2861	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2862	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2863	}
2864
2865	$color &= cf::NDI_COLOR_MASK;
2866
2867	utf8::encode $msg;
2868
2869	if (0 && $msg =~ /\[/) {
2870	# COMMAND/INFO
2871	$self->send_packet ("drawextinfo $color 10 8 $msg")
2872	} else {
2873	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2874	$self->send_packet ("drawinfo $color $msg")
2875	}
2876	}
2877	}
2878	}	2929	}
2879		2930
2880	=item $client->ext_msg ($type, @msg)	2931	=item $client->ext_msg ($type, @msg)
2881		2932
2882	Sends an ext event to the client.	2933	Sends an ext event to the client.
…		…
3057	The following functions and methods are available within a safe environment:	3108	The following functions and methods are available within a safe environment:
3058		3109
3059	cf::object	3110	cf::object
3060	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
3061	insert remove name archname title slaying race decrease split	3112	insert remove name archname title slaying race decrease split
		3113	value
3062		3114
3063	cf::object::player	3115	cf::object::player
3064	player	3116	player
3065		3117
3066	cf::player	3118	cf::player
…		…
3072	=cut	3124	=cut
3073		3125
3074	for (	3126	for (
3075	["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
3076	insert remove inv nrof name archname title slaying race	3128	insert remove inv nrof name archname title slaying race
3077	decrease split destroy change_exp)],	3129	decrease split destroy change_exp value msg lore send_msg)],
3078	["cf::object::player" => qw(player)],	3130	["cf::object::player" => qw(player)],
3079	["cf::player" => qw(peaceful)],	3131	["cf::player" => qw(peaceful send_msg)],
3080	["cf::map" => qw(trigger)],	3132	["cf::map" => qw(trigger)],
3081	) {	3133	) {
3082	no strict 'refs';	3134	no strict 'refs';
3083	my ($pkg, @funs) = @$_;	3135	my ($pkg, @funs) = @$_;
3084	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3136	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
…		…
3101	my ($code, %vars) = @_;	3153	my ($code, %vars) = @_;
3102		3154
3103	my $qcode = $code;	3155	my $qcode = $code;
3104	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3156	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3105	$qcode =~ s/\n/\\n/g;	3157	$qcode =~ s/\n/\\n/g;
		3158
		3159	%vars = (_dummy => 0) unless %vars;
3106		3160
3107	local $_;	3161	local $_;
3108	local @safe::cf::_safe_eval_args = values %vars;	3162	local @safe::cf::_safe_eval_args = values %vars;
3109		3163
3110	my $eval =	3164	my $eval =
…		…
3340	reload_treasures;	3394	reload_treasures;
3341		3395
3342	warn "finished reloading resource files\n";	3396	warn "finished reloading resource files\n";
3343	}	3397	}
3344		3398
3345	sub init {
3346	my $guard = freeze_mainloop;
3347
3348	evthread_start IO::AIO::poll_fileno;
3349
3350	reload_resources;
3351	}
3352
3353	sub reload_config {	3399	sub reload_config {
		3400	warn "reloading config file...\n";
		3401
3354	open my $fh, "<:utf8", "$CONFDIR/config"	3402	open my $fh, "<:utf8", "$CONFDIR/config"
3355	or return;	3403	or return;
3356		3404
3357	local $/;	3405	local $/;
3358	*CFG = YAML::Load <$fh>;	3406	*CFG = YAML::XS::Load scalar <$fh>;
3359		3407
3360	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];	3408	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];
3361		3409
3362	$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};
3363	$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};
…		…
3367	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3415	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3368	and die "WARNING: m(un)lockall failed: $!\n";	3416	and die "WARNING: m(un)lockall failed: $!\n";
3369	};	3417	};
3370	warn $@ if $@;	3418	warn $@ if $@;
3371	}	3419	}
		3420
		3421	warn "finished reloading resource files\n";
3372	}	3422	}
3373		3423
3374	sub pidfile() {	3424	sub pidfile() {
3375	sysopen my $fh, $PIDFILE, O_RDWR \| O_CREAT	3425	sysopen my $fh, $PIDFILE, O_RDWR \| O_CREAT
3376	or die "$PIDFILE: $!";	3426	or die "$PIDFILE: $!";
…		…
3388		3438
3389	seek $fh, 0, 0;	3439	seek $fh, 0, 0;
3390	print $fh $$;	3440	print $fh $$;
3391	}	3441	}
3392		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
3393	sub main {	3452	sub main {
3394	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
3395		3466
3396	# we must not ever block the main coroutine	3467	# we must not ever block the main coroutine
3397	local $Coro::idle = sub {	3468	local $Coro::idle = sub {
3398	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#
3399	(async {	3470	(async {
3400	$Coro::current->{desc} = "IDLE BUG HANDLER";	3471	$Coro::current->{desc} = "IDLE BUG HANDLER";
3401	EV::loop EV::LOOP_ONESHOT;	3472	EV::loop EV::LOOP_ONESHOT;
3402	})->prio (Coro::PRIO_MAX);	3473	})->prio (Coro::PRIO_MAX);
3403	};	3474	};
3404		3475
3405	{	3476	evthread_start IO::AIO::poll_fileno;
3406	my $guard = freeze_mainloop;	3477
		3478	cf::sync_job {
		3479	reload_resources;
3407	reload_config;	3480	reload_config;
3408	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
3409	load_extensions;	3494	load_extensions;
3410		3495
3411	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3412	}
3413
3414	utime time, time, $RUNTIMEFILE;	3496	utime time, time, $RUNTIMEFILE;
3415		3497
3416	# no (long-running) fork's whatsoever before this point(!)	3498	# no (long-running) fork's whatsoever before this point(!)
		3499	use POSIX ();
3417	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};
3418		3501
3419	EV::loop;	3502	(pop @POST_INIT)->(0) while @POST_INIT;
		3503	};
		3504
		3505	main_loop;
3420	}	3506	}
3421		3507
3422	#############################################################################	3508	#############################################################################
3423	# initialisation and cleanup	3509	# initialisation and cleanup
3424		3510
…		…
3480	my $uuid = "$LOCALDIR/uuid";	3566	my $uuid = "$LOCALDIR/uuid";
3481		3567
3482	my $fh = aio_open "$uuid~", O_WRONLY \| O_CREAT, 0644	3568	my $fh = aio_open "$uuid~", O_WRONLY \| O_CREAT, 0644
3483	or return;	3569	or return;
3484		3570
3485	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;
3486	$uuid_skip = 0;	3579	$uuid_skip = 0;
3487		3580
3488	(aio_write $fh, 0, (length $value), $value, 0) <= 0	3581	(aio_write $fh, 0, (length $value), $value, 0) <= 0
3489	and return;	3582	and return;
3490		3583
…		…
3512	}	3605	}
3513		3606
3514	sub emergency_save() {	3607	sub emergency_save() {
3515	my $freeze_guard = cf::freeze_mainloop;	3608	my $freeze_guard = cf::freeze_mainloop;
3516		3609
3517	warn "enter emergency perl save\n";	3610	warn "emergency_perl_save: enter\n";
3518		3611
3519	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
3520	# use a peculiar iteration method to avoid tripping on perl	3618	# use a peculiar iteration method to avoid tripping on perl
3521	# refcount bugs in for. also avoids problems with players	3619	# refcount bugs in for. also avoids problems with players
3522	# and maps saved/destroyed asynchronously.	3620	# and maps saved/destroyed asynchronously.
3523	warn "begin emergency player save\n";	3621	warn "emergency_perl_save: begin player save\n";
3524	for my $login (keys %cf::PLAYER) {	3622	for my $login (keys %cf::PLAYER) {
3525	my $pl = $cf::PLAYER{$login} or next;	3623	my $pl = $cf::PLAYER{$login} or next;
3526	$pl->valid or next;	3624	$pl->valid or next;
3527	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3625	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3528	$pl->save;	3626	$pl->save;
3529	}	3627	}
3530	warn "end emergency player save\n";	3628	warn "emergency_perl_save: end player save\n";
3531		3629
3532	warn "begin emergency map save\n";	3630	warn "emergency_perl_save: begin map save\n";
3533	for my $path (keys %cf::MAP) {	3631	for my $path (keys %cf::MAP) {
3534	my $map = $cf::MAP{$path} or next;	3632	my $map = $cf::MAP{$path} or next;
3535	$map->valid or next;	3633	$map->valid or next;
3536	$map->save;	3634	$map->save;
3537	}	3635	}
3538	warn "end emergency map save\n";	3636	warn "emergency_perl_save: end map save\n";
3539		3637
3540	warn "begin emergency database checkpoint\n";	3638	warn "emergency_perl_save: begin database checkpoint\n";
3541	BDB::db_env_txn_checkpoint $DB_ENV;	3639	BDB::db_env_txn_checkpoint $DB_ENV;
3542	warn "end emergency database checkpoint\n";	3640	warn "emergency_perl_save: end database checkpoint\n";
3543		3641
3544	warn "begin write uuid\n";	3642	warn "emergency_perl_save: begin write uuid\n";
3545	write_uuid_sync 1;	3643	write_uuid_sync 1;
3546	warn "end write uuid\n";	3644	warn "emergency_perl_save: end write uuid\n";
3547	};	3645	};
3548		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
3549	warn "leave emergency perl save\n";	3652	warn "emergency_perl_save: leave\n";
3550	}	3653	}
3551		3654
3552	sub post_cleanup {	3655	sub post_cleanup {
3553	my ($make_core) = @_;	3656	my ($make_core) = @_;
3554		3657
…		…
3580	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3683	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3581	for my $name (keys %$leaf_symtab) {	3684	for my $name (keys %$leaf_symtab) {
3582	_gv_clear *{"$pkg$name"};	3685	_gv_clear *{"$pkg$name"};
3583	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3686	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3584	}	3687	}
3585	warn "cleared package #$pkg\n";#d#	3688	warn "cleared package $pkg\n";#d#
3586	}	3689	}
3587
3588	our $RELOAD; # how many times to reload
3589		3690
3590	sub do_reload_perl() {	3691	sub do_reload_perl() {
3591	# can/must only be called in main	3692	# can/must only be called in main
3592	if ($Coro::current != $Coro::main) {	3693	if ($Coro::current != $Coro::main) {
3593	warn "can only reload from main coroutine";	3694	warn "can only reload from main coroutine";
3594	return;	3695	return;
3595	}	3696	}
3596		3697
3597	return if $RELOAD++;	3698	return if $RELOAD++;
		3699
		3700	my $t1 = EV::time;
3598		3701
3599	while ($RELOAD) {	3702	while ($RELOAD) {
3600	warn "reloading...";	3703	warn "reloading...";
3601		3704
3602	warn "entering sync_job";	3705	warn "entering sync_job";
…		…
3663	clear_package "safe::$_"	3766	clear_package "safe::$_"
3664	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);
3665		3768
3666	warn "unloading cf.pm \"a bit\"";	3769	warn "unloading cf.pm \"a bit\"";
3667	delete $INC{"cf.pm"};	3770	delete $INC{"cf.pm"};
3668	delete $INC{"cf/pod.pm"};	3771	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3669		3772
3670	# don't, removes xs symbols, too,	3773	# don't, removes xs symbols, too,
3671	# and global variables created in xs	3774	# and global variables created in xs
3672	#clear_package __PACKAGE__;	3775	#clear_package __PACKAGE__;
3673		3776
3674	warn "unload completed, starting to reload now";	3777	warn "unload completed, starting to reload now";
3675		3778
3676	warn "reloading cf.pm";	3779	warn "reloading cf.pm";
3677	require cf;	3780	require cf;
3678	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3781	cf::_connect_to_perl_1;
3679		3782
3680	warn "loading config and database again";	3783	warn "loading config and database again";
3681	cf::reload_config;	3784	cf::reload_config;
3682		3785
3683	warn "loading extensions";	3786	warn "loading extensions";
3684	cf::load_extensions;	3787	cf::load_extensions;
3685		3788
		3789	if ($REATTACH_ON_RELOAD) {
3686	warn "reattaching attachments to objects/players";	3790	warn "reattaching attachments to objects/players";
3687	_global_reattach; # objects, sockets	3791	_global_reattach; # objects, sockets
3688	warn "reattaching attachments to maps";	3792	warn "reattaching attachments to maps";
3689	reattach $_ for values %MAP;	3793	reattach $_ for values %MAP;
3690	warn "reattaching attachments to players";	3794	warn "reattaching attachments to players";
3691	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;
3692		3800
3693	warn "leaving sync_job";	3801	warn "leaving sync_job";
3694		3802
3695	1	3803	1
3696	} or do {	3804	} or do {
…		…
3699	};	3807	};
3700		3808
3701	warn "reloaded";	3809	warn "reloaded";
3702	--$RELOAD;	3810	--$RELOAD;
3703	}	3811	}
		3812
		3813	$t1 = EV::time - $t1;
		3814	warn "reload completed in ${t1}s\n";
3704	};	3815	};
3705		3816
3706	our $RELOAD_WATCHER; # used only during reload	3817	our $RELOAD_WATCHER; # used only during reload
3707		3818
3708	sub reload_perl() {	3819	sub reload_perl() {
3709	# doing reload synchronously and two reloads happen back-to-back,	3820	# doing reload synchronously and two reloads happen back-to-back,
3710	# coro crashes during coro_state_free->destroy here.	3821	# coro crashes during coro_state_free->destroy here.
3711		3822
		3823	$RELOAD_WATCHER \|\|= cf::async {
		3824	Coro::AIO::aio_wait cache_extensions;
		3825
3712	$RELOAD_WATCHER \|\|= EV::timer 0, 0, sub {	3826	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3713	do_reload_perl;	3827	do_reload_perl;
3714	undef $RELOAD_WATCHER;	3828	undef $RELOAD_WATCHER;
		3829	};
3715	};	3830	};
3716	}	3831	}
3717		3832
3718	register_command "reload" => sub {	3833	register_command "reload" => sub {
3719	my ($who, $arg) = @_;	3834	my ($who, $arg) = @_;
…		…
3878	LOG llevInfo, "[ABT] [suppressed]\n";	3993	LOG llevInfo, "[ABT] [suppressed]\n";
3879	}	3994	}
3880	}	3995	}
3881		3996
3882	# load additional modules	3997	# load additional modules
3883	use cf::pod;	3998	require "cf/$_.pm" for @EXTRA_MODULES;
		3999	cf::_connect_to_perl_2;
3884		4000
3885	END { cf::emergency_save }	4001	END { cf::emergency_save }
3886		4002
3887	1	4003	1
3888		4004

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.450 by root, Mon Sep 22 01:33:09 2008 UTC vs. Revision 1.487 by root, Fri Oct 16 01:56:41 2009 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.450 by root, Mon Sep 22 01:33:09 2008 UTC vs.
Revision 1.487 by root, Fri Oct 16 01:56:41 2009 UTC