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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.452 by root, Tue Sep 23 00:24:52 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
…		…
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 = ();
…		…
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, non-zero while in reload	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	#local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
347	push @{ $LOCK{$key} }, $Coro::current;
348	Coro::schedule;
349	}
350	}	382	}
351		383
352	sub lock_acquire($) {	384	sub lock_acquire($) {
353	my ($key) = @_;	385	$LOCKS->guard ($_[0])
354
355	# wait, to be sure we are not locked
356	lock_wait $key;
357
358	$LOCK{$key} = [];
359	$LOCKER{$key} = $Coro::current;#d#
360
361	Coro::guard {
362	delete $LOCKER{$key};#d#
363	# wake up all waiters, to be on the safe side
364	$_->ready for @{ delete $LOCK{$key} };
365	}
366	}	386	}
367		387
368	sub lock_active($) {	388	sub lock_active($) {
369	my ($key) = @_;	389	$LOCKS->count ($_[0]) < 1
370
371	! ! $LOCK{$key}
372	}	390	}
373		391
374	sub freeze_mainloop {	392	sub freeze_mainloop {
375	tick_inhibit_inc;	393	tick_inhibit_inc;
376		394
377	Coro::guard \&tick_inhibit_dec;	395	&Guard::guard (\&tick_inhibit_dec);
378	}	396	}
379		397
380	=item cf::periodic $interval, $cb	398	=item cf::periodic $interval, $cb
381		399
382	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
…		…
1154	$decname, length $$rdata, scalar @$objs;	1172	$decname, length $$rdata, scalar @$objs;
1155		1173
1156	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1174	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
1157	aio_chmod $fh, SAVE_MODE;	1175	aio_chmod $fh, SAVE_MODE;
1158	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1176	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1159	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	}
1160	aio_close $fh;	1181	aio_close $fh;
1161		1182
1162	if (@$objs) {	1183	if (@$objs) {
1163	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) {
1164	aio_chmod $fh, SAVE_MODE;	1185	aio_chmod $fh, SAVE_MODE;
1165	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1186	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1166	aio_write $fh, 0, (length $data), $data, 0;	1187	aio_write $fh, 0, (length $data), $data, 0;
1167	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	}
1168	aio_close $fh;	1192	aio_close $fh;
1169	aio_rename "$filename.pst~", "$filename.pst";	1193	aio_rename "$filename.pst~", "$filename.pst";
1170	}	1194	}
1171	} else {	1195	} else {
1172	aio_unlink "$filename.pst";	1196	aio_unlink "$filename.pst";
1173	}	1197	}
1174		1198
1175	aio_rename "$filename~", $filename;	1199	aio_rename "$filename~", $filename;
		1200
		1201	$filename =~ s%/[^/]+$%%;
		1202	aio_pathsync $filename if $cf::USE_FSYNC;
1176	} else {	1203	} else {
1177	warn "FATAL: $filename~: $!\n";	1204	warn "unable to save objects: $filename~: $!\n";
1178	}	1205	}
1179	} else {	1206	} else {
1180	aio_unlink $filename;	1207	aio_unlink $filename;
1181	aio_unlink "$filename.pst";	1208	aio_unlink "$filename.pst";
1182	}	1209	}
…		…
1273	my ($name, $cb) = @_;	1300	my ($name, $cb) = @_;
1274		1301
1275	$EXTICMD{$name} = $cb;	1302	$EXTICMD{$name} = $cb;
1276	}	1303	}
1277		1304
		1305	use File::Glob ();
		1306
1278	cf::player->attach (	1307	cf::player->attach (
1279	on_command => sub {	1308	on_command => sub {
1280	my ($pl, $name, $params) = @_;	1309	my ($pl, $name, $params) = @_;
1281		1310
1282	my $cb = $COMMAND{$name}	1311	my $cb = $COMMAND{$name}
…		…
1313	}	1342	}
1314		1343
1315	cf::override;	1344	cf::override;
1316	},	1345	},
1317	);	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	}
1318		1360
1319	sub load_extensions {	1361	sub load_extensions {
1320	cf::sync_job {	1362	cf::sync_job {
1321	my %todo;	1363	my %todo;
1322		1364
…		…
1851		1893
1852	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;	1894	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1853	"$UNIQUEDIR/$path"	1895	"$UNIQUEDIR/$path"
1854	}	1896	}
1855		1897
1856	# and all this just because we cannot iterate over
1857	# all maps in C++...
1858	sub change_all_map_light {
1859	my ($change) = @_;
1860
1861	$_->change_map_light ($change)
1862	for grep $_->outdoor, values %cf::MAP;
1863	}
1864
1865	sub decay_objects {	1898	sub decay_objects {
1866	my ($self) = @_;	1899	my ($self) = @_;
1867		1900
1868	return if $self->{deny_reset};	1901	return if $self->{deny_reset};
1869		1902
…		…
1951	sub find {	1984	sub find {
1952	my ($path, $origin) = @_;	1985	my ($path, $origin) = @_;
1953		1986
1954	$path = normalise $path, $origin && $origin->path;	1987	$path = normalise $path, $origin && $origin->path;
1955		1988
1956	cf::lock_wait "map_data:$path";#d#remove	1989	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1957	cf::lock_wait "map_find:$path";	1990	my $guard2 = cf::lock_acquire "map_find:$path";
1958		1991
1959	$cf::MAP{$path} \|\| do {	1992	$cf::MAP{$path} \|\| do {
1960	my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1961	my $guard2 = cf::lock_acquire "map_find:$path";
1962
1963	my $map = new_from_path cf::map $path	1993	my $map = new_from_path cf::map $path
1964	or return;	1994	or return;
1965		1995
1966	$map->{last_save} = $cf::RUNTIME;	1996	$map->{last_save} = $cf::RUNTIME;
1967		1997
…		…
2035	unless ($self->{deny_activate}) {	2065	unless ($self->{deny_activate}) {
2036	$self->decay_objects;	2066	$self->decay_objects;
2037	$self->fix_auto_apply;	2067	$self->fix_auto_apply;
2038	$self->update_buttons;	2068	$self->update_buttons;
2039	cf::cede_to_tick;	2069	cf::cede_to_tick;
2040	$self->set_darkness_map;
2041	cf::cede_to_tick;
2042	$self->activate;	2070	$self->activate;
2043	}	2071	}
2044		2072
2045	$self->{last_save} = $cf::RUNTIME;	2073	$self->{last_save} = $cf::RUNTIME;
2046	$self->last_access ($cf::RUNTIME);	2074	$self->last_access ($cf::RUNTIME);
…		…
2212		2240
2213	my $lock = cf::lock_acquire "map_data:$self->{path}";	2241	my $lock = cf::lock_acquire "map_data:$self->{path}";
2214		2242
2215	return if $self->players;	2243	return if $self->players;
2216		2244
2217	warn "resetting map ", $self->path;	2245	warn "resetting map ", $self->path, "\n";
2218		2246
2219	$self->in_memory (cf::MAP_SWAPPED);	2247	$self->in_memory (cf::MAP_SWAPPED);
2220		2248
2221	# need to save uniques path	2249	# need to save uniques path
2222	unless ($self->{deny_save}) {	2250	unless ($self->{deny_save}) {
…		…
2387		2415
2388	our $SAY_CHANNEL = {	2416	our $SAY_CHANNEL = {
2389	id => "say",	2417	id => "say",
2390	title => "Map",	2418	title => "Map",
2391	reply => "say ",	2419	reply => "say ",
2392	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.",
2393	};	2421	};
2394		2422
2395	our $CHAT_CHANNEL = {	2423	our $CHAT_CHANNEL = {
2396	id => "chat",	2424	id => "chat",
2397	title => "Chat",	2425	title => "Chat",
…		…
2523		2551
2524	$map->load;	2552	$map->load;
2525	$map->load_neighbours;	2553	$map->load_neighbours;
2526		2554
2527	return unless $self->contr->active;	2555	return unless $self->contr->active;
2528	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2529	$self->activate_recursive;
2530		2556
2531	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2557	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2532	$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;
2533	}	2562	}
2534		2563
2535	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2564	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2536		2565
2537	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
…		…
2772	id => "infobox",	2801	id => "infobox",
2773	title => "Body Parts",	2802	title => "Body Parts",
2774	reply => undef,	2803	reply => undef,
2775	tooltip => "Shows which body parts you posess and are available",	2804	tooltip => "Shows which body parts you posess and are available",
2776	},	2805	},
		2806	"c/statistics" => {
		2807	id => "infobox",
		2808	title => "Statistics",
		2809	reply => undef,
		2810	tooltip => "Shows your primary statistics",
		2811	},
2777	"c/skills" => {	2812	"c/skills" => {
2778	id => "infobox",	2813	id => "infobox",
2779	title => "Skills",	2814	title => "Skills",
2780	reply => undef,	2815	reply => undef,
2781	tooltip => "Shows your experience per skill and item power",	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",
2782	},	2841	},
2783	"c/uptime" => {	2842	"c/uptime" => {
2784	id => "infobox",	2843	id => "infobox",
2785	title => "Uptime",	2844	title => "Uptime",
2786	reply => undef,	2845	reply => undef,
…		…
2796	id => "party",	2855	id => "party",
2797	title => "Party",	2856	title => "Party",
2798	reply => "gsay ",	2857	reply => "gsay ",
2799	tooltip => "Messages and chat related to your party",	2858	tooltip => "Messages and chat related to your party",
2800	},	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,
2801	);	2868	);
2802		2869
2803	sub cf::client::send_msg {	2870	sub cf::client::send_msg {
2804	my ($self, $channel, $msg, $color, @extra) = @_;	2871	my ($self, $channel, $msg, $color, @extra) = @_;
2805		2872
…		…
2810		2877
2811	# check predefined channels, for the benefit of C	2878	# check predefined channels, for the benefit of C
2812	if ($CHANNEL{$channel}) {	2879	if ($CHANNEL{$channel}) {
2813	$channel = $CHANNEL{$channel};	2880	$channel = $CHANNEL{$channel};
2814		2881
2815	$self->ext_msg (channel_info => $channel)	2882	$self->ext_msg (channel_info => $channel);
2816	if $self->can_msg;
2817
2818	$channel = $channel->{id};	2883	$channel = $channel->{id};
2819		2884
2820	} elsif (ref $channel) {	2885	} elsif (ref $channel) {
2821	# send meta info to client, if not yet sent	2886	# send meta info to client, if not yet sent
2822	unless (exists $self->{channel}{$channel->{id}}) {	2887	unless (exists $self->{channel}{$channel->{id}}) {
2823	$self->{channel}{$channel->{id}} = $channel;	2888	$self->{channel}{$channel->{id}} = $channel;
2824	$self->ext_msg (channel_info => $channel)	2889	$self->ext_msg (channel_info => $channel);
2825	if $self->can_msg;
2826	}	2890	}
2827		2891
2828	$channel = $channel->{id};	2892	$channel = $channel->{id};
2829	}	2893	}
2830		2894
2831	return unless @extra \|\| length $msg;	2895	return unless @extra \|\| length $msg;
2832		2896
2833	if ($self->can_msg) {
2834	# default colour, mask it out	2897	# default colour, mask it out
2835	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)	2898	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
2836	if $color & cf::NDI_DEF;	2899	if $color & cf::NDI_DEF;
2837		2900
2838	my $pkt = "msg "	2901	my $pkt = "msg "
2839	. $self->{json_coder}->encode (	2902	. $self->{json_coder}->encode (
2840	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	2903	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2841	);	2904	);
2842		2905
2843	# try lzf for large packets	2906	# try lzf for large packets
2844	$pkt = "lzf " . Compress::LZF::compress $pkt	2907	$pkt = "lzf " . Compress::LZF::compress $pkt
2845	if 1024 <= length $pkt and $self->{can_lzf};	2908	if 1024 <= length $pkt and $self->{can_lzf};
2846		2909
2847	# split very large packets	2910	# split very large packets
2848	if (8192 < length $pkt and $self->{can_lzf}) {	2911	if (8192 < length $pkt and $self->{can_lzf}) {
2849	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;	2912	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2850	$pkt = "frag";	2913	$pkt = "frag";
2851	}	2914	}
2852		2915
2853	$self->send_packet ($pkt);	2916	$self->send_packet ($pkt);
2854	} else {
2855	if ($color >= 0) {
2856	# replace some tags by gcfclient-compatible ones
2857	for ($msg) {
2858	1 while
2859	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2860	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2861	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2862	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2863	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2864	}
2865
2866	$color &= cf::NDI_COLOR_MASK;
2867
2868	utf8::encode $msg;
2869
2870	if (0 && $msg =~ /\[/) {
2871	# COMMAND/INFO
2872	$self->send_packet ("drawextinfo $color 10 8 $msg")
2873	} else {
2874	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2875	$self->send_packet ("drawinfo $color $msg")
2876	}
2877	}
2878	}
2879	}	2917	}
2880		2918
2881	=item $client->ext_msg ($type, @msg)	2919	=item $client->ext_msg ($type, @msg)
2882		2920
2883	Sends an ext event to the client.	2921	Sends an ext event to the client.
…		…
3058	The following functions and methods are available within a safe environment:	3096	The following functions and methods are available within a safe environment:
3059		3097
3060	cf::object	3098	cf::object
3061	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
3062	insert remove name archname title slaying race decrease split	3100	insert remove name archname title slaying race decrease split
		3101	value
3063		3102
3064	cf::object::player	3103	cf::object::player
3065	player	3104	player
3066		3105
3067	cf::player	3106	cf::player
…		…
3073	=cut	3112	=cut
3074		3113
3075	for (	3114	for (
3076	["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
3077	insert remove inv nrof name archname title slaying race	3116	insert remove inv nrof name archname title slaying race
3078	decrease split destroy change_exp)],	3117	decrease split destroy change_exp value msg lore send_msg)],
3079	["cf::object::player" => qw(player)],	3118	["cf::object::player" => qw(player)],
3080	["cf::player" => qw(peaceful)],	3119	["cf::player" => qw(peaceful send_msg)],
3081	["cf::map" => qw(trigger)],	3120	["cf::map" => qw(trigger)],
3082	) {	3121	) {
3083	no strict 'refs';	3122	no strict 'refs';
3084	my ($pkg, @funs) = @$_;	3123	my ($pkg, @funs) = @$_;
3085	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3124	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
…		…
3102	my ($code, %vars) = @_;	3141	my ($code, %vars) = @_;
3103		3142
3104	my $qcode = $code;	3143	my $qcode = $code;
3105	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3144	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3106	$qcode =~ s/\n/\\n/g;	3145	$qcode =~ s/\n/\\n/g;
		3146
		3147	%vars = (_dummy => 0) unless %vars;
3107		3148
3108	local $_;	3149	local $_;
3109	local @safe::cf::_safe_eval_args = values %vars;	3150	local @safe::cf::_safe_eval_args = values %vars;
3110		3151
3111	my $eval =	3152	my $eval =
…		…
3341	reload_treasures;	3382	reload_treasures;
3342		3383
3343	warn "finished reloading resource files\n";	3384	warn "finished reloading resource files\n";
3344	}	3385	}
3345		3386
3346	sub init {
3347	my $guard = freeze_mainloop;
3348
3349	evthread_start IO::AIO::poll_fileno;
3350
3351	reload_resources;
3352	}
3353
3354	sub reload_config {	3387	sub reload_config {
		3388	warn "reloading config file...\n";
		3389
3355	open my $fh, "<:utf8", "$CONFDIR/config"	3390	open my $fh, "<:utf8", "$CONFDIR/config"
3356	or return;	3391	or return;
3357		3392
3358	local $/;	3393	local $/;
3359	*CFG = YAML::Load <$fh>;	3394	*CFG = YAML::XS::Load scalar <$fh>;
3360		3395
3361	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];	3396	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];
3362		3397
3363	$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};
3364	$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};
…		…
3368	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3403	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3369	and die "WARNING: m(un)lockall failed: $!\n";	3404	and die "WARNING: m(un)lockall failed: $!\n";
3370	};	3405	};
3371	warn $@ if $@;	3406	warn $@ if $@;
3372	}	3407	}
		3408
		3409	warn "finished reloading resource files\n";
3373	}	3410	}
3374		3411
3375	sub pidfile() {	3412	sub pidfile() {
3376	sysopen my $fh, $PIDFILE, O_RDWR \| O_CREAT	3413	sysopen my $fh, $PIDFILE, O_RDWR \| O_CREAT
3377	or die "$PIDFILE: $!";	3414	or die "$PIDFILE: $!";
…		…
3389		3426
3390	seek $fh, 0, 0;	3427	seek $fh, 0, 0;
3391	print $fh $$;	3428	print $fh $$;
3392	}	3429	}
3393		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
3394	sub main {	3440	sub main {
3395	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
3396		3454
3397	# we must not ever block the main coroutine	3455	# we must not ever block the main coroutine
3398	local $Coro::idle = sub {	3456	local $Coro::idle = sub {
3399	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#
3400	(async {	3458	(async {
3401	$Coro::current->{desc} = "IDLE BUG HANDLER";	3459	$Coro::current->{desc} = "IDLE BUG HANDLER";
3402	EV::loop EV::LOOP_ONESHOT;	3460	EV::loop EV::LOOP_ONESHOT;
3403	})->prio (Coro::PRIO_MAX);	3461	})->prio (Coro::PRIO_MAX);
3404	};	3462	};
3405		3463
3406	{	3464	evthread_start IO::AIO::poll_fileno;
3407	my $guard = freeze_mainloop;	3465
		3466	cf::sync_job {
		3467	reload_resources;
3408	reload_config;	3468	reload_config;
3409	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
3410	load_extensions;	3482	load_extensions;
3411		3483
3412	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3413	}
3414
3415	utime time, time, $RUNTIMEFILE;	3484	utime time, time, $RUNTIMEFILE;
3416		3485
3417	# no (long-running) fork's whatsoever before this point(!)	3486	# no (long-running) fork's whatsoever before this point(!)
		3487	use POSIX ();
3418	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};
3419		3489
3420	EV::loop;	3490	(pop @POST_INIT)->(0) while @POST_INIT;
		3491	};
		3492
		3493	main_loop;
3421	}	3494	}
3422		3495
3423	#############################################################################	3496	#############################################################################
3424	# initialisation and cleanup	3497	# initialisation and cleanup
3425		3498
…		…
3481	my $uuid = "$LOCALDIR/uuid";	3554	my $uuid = "$LOCALDIR/uuid";
3482		3555
3483	my $fh = aio_open "$uuid~", O_WRONLY \| O_CREAT, 0644	3556	my $fh = aio_open "$uuid~", O_WRONLY \| O_CREAT, 0644
3484	or return;	3557	or return;
3485		3558
3486	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;
3487	$uuid_skip = 0;	3567	$uuid_skip = 0;
3488		3568
3489	(aio_write $fh, 0, (length $value), $value, 0) <= 0	3569	(aio_write $fh, 0, (length $value), $value, 0) <= 0
3490	and return;	3570	and return;
3491		3571
…		…
3513	}	3593	}
3514		3594
3515	sub emergency_save() {	3595	sub emergency_save() {
3516	my $freeze_guard = cf::freeze_mainloop;	3596	my $freeze_guard = cf::freeze_mainloop;
3517		3597
3518	warn "enter emergency perl save\n";	3598	warn "emergency_perl_save: enter\n";
3519		3599
3520	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
3521	# use a peculiar iteration method to avoid tripping on perl	3606	# use a peculiar iteration method to avoid tripping on perl
3522	# refcount bugs in for. also avoids problems with players	3607	# refcount bugs in for. also avoids problems with players
3523	# and maps saved/destroyed asynchronously.	3608	# and maps saved/destroyed asynchronously.
3524	warn "begin emergency player save\n";	3609	warn "emergency_perl_save: begin player save\n";
3525	for my $login (keys %cf::PLAYER) {	3610	for my $login (keys %cf::PLAYER) {
3526	my $pl = $cf::PLAYER{$login} or next;	3611	my $pl = $cf::PLAYER{$login} or next;
3527	$pl->valid or next;	3612	$pl->valid or next;
3528	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3613	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3529	$pl->save;	3614	$pl->save;
3530	}	3615	}
3531	warn "end emergency player save\n";	3616	warn "emergency_perl_save: end player save\n";
3532		3617
3533	warn "begin emergency map save\n";	3618	warn "emergency_perl_save: begin map save\n";
3534	for my $path (keys %cf::MAP) {	3619	for my $path (keys %cf::MAP) {
3535	my $map = $cf::MAP{$path} or next;	3620	my $map = $cf::MAP{$path} or next;
3536	$map->valid or next;	3621	$map->valid or next;
3537	$map->save;	3622	$map->save;
3538	}	3623	}
3539	warn "end emergency map save\n";	3624	warn "emergency_perl_save: end map save\n";
3540		3625
3541	warn "begin emergency database checkpoint\n";	3626	warn "emergency_perl_save: begin database checkpoint\n";
3542	BDB::db_env_txn_checkpoint $DB_ENV;	3627	BDB::db_env_txn_checkpoint $DB_ENV;
3543	warn "end emergency database checkpoint\n";	3628	warn "emergency_perl_save: end database checkpoint\n";
3544		3629
3545	warn "begin write uuid\n";	3630	warn "emergency_perl_save: begin write uuid\n";
3546	write_uuid_sync 1;	3631	write_uuid_sync 1;
3547	warn "end write uuid\n";	3632	warn "emergency_perl_save: end write uuid\n";
3548	};	3633	};
3549		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
3550	warn "leave emergency perl save\n";	3640	warn "emergency_perl_save: leave\n";
3551	}	3641	}
3552		3642
3553	sub post_cleanup {	3643	sub post_cleanup {
3554	my ($make_core) = @_;	3644	my ($make_core) = @_;
3555		3645
…		…
3592	warn "can only reload from main coroutine";	3682	warn "can only reload from main coroutine";
3593	return;	3683	return;
3594	}	3684	}
3595		3685
3596	return if $RELOAD++;	3686	return if $RELOAD++;
		3687
		3688	my $t1 = EV::time;
3597		3689
3598	while ($RELOAD) {	3690	while ($RELOAD) {
3599	warn "reloading...";	3691	warn "reloading...";
3600		3692
3601	warn "entering sync_job";	3693	warn "entering sync_job";
…		…
3662	clear_package "safe::$_"	3754	clear_package "safe::$_"
3663	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);
3664		3756
3665	warn "unloading cf.pm \"a bit\"";	3757	warn "unloading cf.pm \"a bit\"";
3666	delete $INC{"cf.pm"};	3758	delete $INC{"cf.pm"};
3667	delete $INC{"cf/pod.pm"};	3759	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3668		3760
3669	# don't, removes xs symbols, too,	3761	# don't, removes xs symbols, too,
3670	# and global variables created in xs	3762	# and global variables created in xs
3671	#clear_package __PACKAGE__;	3763	#clear_package __PACKAGE__;
3672		3764
3673	warn "unload completed, starting to reload now";	3765	warn "unload completed, starting to reload now";
3674		3766
3675	warn "reloading cf.pm";	3767	warn "reloading cf.pm";
3676	require cf;	3768	require cf;
3677	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3769	cf::_connect_to_perl_1;
3678		3770
3679	warn "loading config and database again";	3771	warn "loading config and database again";
3680	cf::reload_config;	3772	cf::reload_config;
3681		3773
3682	warn "loading extensions";	3774	warn "loading extensions";
3683	cf::load_extensions;	3775	cf::load_extensions;
3684		3776
		3777	if ($REATTACH_ON_RELOAD) {
3685	warn "reattaching attachments to objects/players";	3778	warn "reattaching attachments to objects/players";
3686	_global_reattach; # objects, sockets	3779	_global_reattach; # objects, sockets
3687	warn "reattaching attachments to maps";	3780	warn "reattaching attachments to maps";
3688	reattach $_ for values %MAP;	3781	reattach $_ for values %MAP;
3689	warn "reattaching attachments to players";	3782	warn "reattaching attachments to players";
3690	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;
3691		3788
3692	warn "leaving sync_job";	3789	warn "leaving sync_job";
3693		3790
3694	1	3791	1
3695	} or do {	3792	} or do {
…		…
3698	};	3795	};
3699		3796
3700	warn "reloaded";	3797	warn "reloaded";
3701	--$RELOAD;	3798	--$RELOAD;
3702	}	3799	}
		3800
		3801	$t1 = EV::time - $t1;
		3802	warn "reload completed in ${t1}s\n";
3703	};	3803	};
3704		3804
3705	our $RELOAD_WATCHER; # used only during reload	3805	our $RELOAD_WATCHER; # used only during reload
3706		3806
3707	sub reload_perl() {	3807	sub reload_perl() {
3708	# doing reload synchronously and two reloads happen back-to-back,	3808	# doing reload synchronously and two reloads happen back-to-back,
3709	# coro crashes during coro_state_free->destroy here.	3809	# coro crashes during coro_state_free->destroy here.
3710		3810
		3811	$RELOAD_WATCHER \|\|= cf::async {
		3812	Coro::AIO::aio_wait cache_extensions;
		3813
3711	$RELOAD_WATCHER \|\|= EV::timer $TICK * 1.5, 0, sub {	3814	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3712	do_reload_perl;	3815	do_reload_perl;
3713	undef $RELOAD_WATCHER;	3816	undef $RELOAD_WATCHER;
		3817	};
3714	};	3818	};
3715	}	3819	}
3716		3820
3717	register_command "reload" => sub {	3821	register_command "reload" => sub {
3718	my ($who, $arg) = @_;	3822	my ($who, $arg) = @_;
…		…
3877	LOG llevInfo, "[ABT] [suppressed]\n";	3981	LOG llevInfo, "[ABT] [suppressed]\n";
3878	}	3982	}
3879	}	3983	}
3880		3984
3881	# load additional modules	3985	# load additional modules
3882	use cf::pod;	3986	require "cf/$_.pm" for @EXTRA_MODULES;
		3987	cf::_connect_to_perl_2;
3883		3988
3884	END { cf::emergency_save }	3989	END { cf::emergency_save }
3885		3990
3886	1	3991	1
3887		3992

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.452 by root, Tue Sep 23 00:24:52 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.452 by root, Tue Sep 23 00:24:52 2008 UTC vs.
Revision 1.485 by root, Mon Oct 12 14:12:54 2009 UTC