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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.446 by root, Tue Sep 16 16:03:02 2008 UTC vs.
Revision 1.482 by root, Sun Oct 11 05:31:54 2009 UTC

…		…
21		21
22	package cf;	22	package cf;
23		23
24	use 5.10.0;	24	use 5.10.0;
25	use utf8;	25	use utf8;
26	use strict "vars", "subs";	26	use strict qw(vars subs);
27		27
28	use Symbol;	28	use Symbol;
29	use List::Util;	29	use List::Util;
30	use Socket;	30	use Socket;
31	use EV;	31	use EV;
32	use Opcode;	32	use Opcode;
33	use Safe;	33	use Safe;
34	use Safe::Hole;	34	use Safe::Hole;
35	use Storable ();	35	use Storable ();
36		36
		37	use Guard ();
37	use Coro ();	38	use Coro ();
38	use Coro::State;	39	use Coro::State;
39	use Coro::Handle;	40	use Coro::Handle;
40	use Coro::EV;	41	use Coro::EV;
41	use Coro::AnyEvent;	42	use Coro::AnyEvent;
42	use Coro::Timer;	43	use Coro::Timer;
43	use Coro::Signal;	44	use Coro::Signal;
44	use Coro::Semaphore;	45	use Coro::Semaphore;
		46	use Coro::SemaphoreSet;
45	use Coro::AnyEvent;	47	use Coro::AnyEvent;
46	use Coro::AIO;	48	use Coro::AIO;
47	use Coro::BDB 1.6;	49	use Coro::BDB 1.6;
48	use Coro::Storable;	50	use Coro::Storable;
49	use Coro::Util ();	51	use Coro::Util ();
…		…
63		65
64	# configure various modules to our taste	66	# configure various modules to our taste
65	#	67	#
66	$Storable::canonical = 1; # reduce rsync transfers	68	$Storable::canonical = 1; # reduce rsync transfers
67	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	69	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
		70
		71	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
		72
		73	# make sure c-lzf reinitialises itself
		74	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	75	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
69		76
70	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	77	# strictly for debugging
		78	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
71		79
72	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	80	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73		81
74	our %COMMAND = ();	82	our %COMMAND = ();
75	our %COMMAND_TIME = ();	83	our %COMMAND_TIME = ();
…		…
78	our %EXTCMD = ();	86	our %EXTCMD = ();
79	our %EXTICMD = ();	87	our %EXTICMD = ();
80	our %EXT_CORO = (); # coroutines bound to extensions	88	our %EXT_CORO = (); # coroutines bound to extensions
81	our %EXT_MAP = (); # pluggable maps	89	our %EXT_MAP = (); # pluggable maps
82		90
83	our $RELOAD; # number of reloads so far	91	our $RELOAD; # number of reloads so far, non-zero while in reload
84	our @EVENT;	92	our @EVENT;
		93	our @REFLECT; # set by XS
		94	our %REFLECT; # set by us
85		95
86	our $CONFDIR = confdir;	96	our $CONFDIR = confdir;
87	our $DATADIR = datadir;	97	our $DATADIR = datadir;
88	our $LIBDIR = "$DATADIR/ext";	98	our $LIBDIR = "$DATADIR/ext";
89	our $PODDIR = "$DATADIR/pod";	99	our $PODDIR = "$DATADIR/pod";
…		…
100	our %RESOURCE;	110	our %RESOURCE;
101		111
102	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	112	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
103	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	113	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
104	our $NEXT_TICK;	114	our $NEXT_TICK;
105	our $USE_FSYNC = 1; # use fsync to write maps - default off	115	our $USE_FSYNC = 1; # use fsync to write maps - default on
106		116
107	our $BDB_DEADLOCK_WATCHER;	117	our $BDB_DEADLOCK_WATCHER;
108	our $BDB_CHECKPOINT_WATCHER;	118	our $BDB_CHECKPOINT_WATCHER;
109	our $BDB_TRICKLE_WATCHER;	119	our $BDB_TRICKLE_WATCHER;
110	our $DB_ENV;	120	our $DB_ENV;
111		121
		122	our @EXTRA_MODULES = qw(pod match mapscript);
		123
112	our %CFG;	124	our %CFG;
113		125
114	our $UPTIME; $UPTIME \|\|= time;	126	our $UPTIME; $UPTIME \|\|= time;
115	our $RUNTIME;	127	our $RUNTIME;
116	our $NOW;	128	our $NOW;
…		…
124		136
125	our $LOAD; # a number between 0 (idle) and 1 (too many objects)	137	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
126	our $LOADAVG; # same thing, but with alpha-smoothing	138	our $LOADAVG; # same thing, but with alpha-smoothing
127	our $JITTER; # average jitter	139	our $JITTER; # average jitter
128	our $TICK_START; # for load detecting purposes	140	our $TICK_START; # for load detecting purposes
		141
		142	our @POST_INIT;
		143
		144	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
		145	our $REALLY_UNLOOP; # never set to true, please :)
129		146
130	binmode STDOUT;	147	binmode STDOUT;
131	binmode STDERR;	148	binmode STDERR;
132		149
133	# read virtual server time, if available	150	# read virtual server time, if available
…		…
135	open my $fh, "<", $RUNTIMEFILE	152	open my $fh, "<", $RUNTIMEFILE
136	or die "unable to read $RUNTIMEFILE file: $!";	153	or die "unable to read $RUNTIMEFILE file: $!";
137	$RUNTIME = <$fh> + 0.;	154	$RUNTIME = <$fh> + 0.;
138	}	155	}
139		156
		157	eval "sub TICK() { $TICK } 1" or die;
		158
140	mkdir $_	159	mkdir $_
141	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	160	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
142		161
143	our $EMERGENCY_POSITION;	162	our $EMERGENCY_POSITION;
144		163
145	sub cf::map::normalise;	164	sub cf::map::normalise;
		165
		166	#############################################################################
		167
		168	%REFLECT = ();
		169	for (@REFLECT) {
		170	my $reflect = JSON::XS::decode_json $_;
		171	$REFLECT{$reflect->{class}} = $reflect;
		172	}
		173
		174	# this is decidedly evil
		175	$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
146		176
147	#############################################################################	177	#############################################################################
148		178
149	=head2 GLOBAL VARIABLES	179	=head2 GLOBAL VARIABLES
150		180
…		…
201		231
202	This array contains the results of the last C<invoke ()> call. When	232	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	233	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
204	that call.	234	that call.
205		235
		236	=item %cf::REFLECT
		237
		238	Contains, for each (C++) class name, a hash reference with information
		239	about object members (methods, scalars, arrays and flags) and other
		240	metadata, which is useful for introspection.
		241
206	=back	242	=back
207		243
208	=cut	244	=cut
209		245
210	BEGIN {	246	$Coro::State::WARNHOOK = sub {
211	*CORE::GLOBAL::warn = sub {
212	my $msg = join "", @_;	247	my $msg = join "", @_;
213		248
214	$msg .= "\n"	249	$msg .= "\n"
215	unless $msg =~ /\n$/;	250	unless $msg =~ /\n$/;
216		251
217	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	252	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
218		253
219	LOG llevError, $msg;	254	LOG llevError, $msg;
220	};	255	};
221	}
222		256
223	$Coro::State::DIEHOOK = sub {	257	$Coro::State::DIEHOOK = sub {
224	return unless $^S eq 0; # "eq", not "=="	258	return unless $^S eq 0; # "eq", not "=="
		259
		260	warn Carp::longmess $_[0];
225		261
226	if ($Coro::current == $Coro::main) {#d#	262	if ($Coro::current == $Coro::main) {#d#
227	warn "DIEHOOK called in main context, Coro bug?\n";#d#	263	warn "DIEHOOK called in main context, Coro bug?\n";#d#
228	return;#d#	264	return;#d#
229	}#d#	265	}#d#
230		266
231	# kill coroutine otherwise	267	# kill coroutine otherwise
232	warn Carp::longmess $_[0];
233	Coro::terminate	268	Coro::terminate
234	};	269	};
235
236	$SIG{__DIE__} = sub { }; #d#?
237		270
238	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	271	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
239	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	272	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
240	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	273	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
241	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	274	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
302	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	335	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
303		336
304	sub encode_json($) { $json_coder->encode ($_[0]) }	337	sub encode_json($) { $json_coder->encode ($_[0]) }
305	sub decode_json($) { $json_coder->decode ($_[0]) }	338	sub decode_json($) { $json_coder->decode ($_[0]) }
306		339
		340	=item cf::post_init { BLOCK }
		341
		342	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
		343	but I<before> the server starts ticking again.
		344
		345	The cdoeblock will have a single boolean argument to indicate whether this
		346	is a reload or not.
		347
		348	=cut
		349
		350	sub post_init(&) {
		351	push @POST_INIT, shift;
		352	}
		353
307	=item cf::lock_wait $string	354	=item cf::lock_wait $string
308		355
309	Wait until the given lock is available. See cf::lock_acquire.	356	Wait until the given lock is available. See cf::lock_acquire.
310		357
311	=item my $lock = cf::lock_acquire $string	358	=item my $lock = cf::lock_acquire $string
312		359
313	Wait until the given lock is available and then acquires it and returns	360	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,	361	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	362	for example when the coroutine gets canceled), the lock is automatically
316	returned.	363	returned.
317		364
318	Locks are not recursive, locking from the same coro twice results in a	365	Locks are not recursive, locking from the same coro twice results in a
319	deadlocked coro.	366	deadlocked coro.
…		…
325		372
326	Return true if the lock is currently active, i.e. somebody has locked it.	373	Return true if the lock is currently active, i.e. somebody has locked it.
327		374
328	=cut	375	=cut
329		376
330	our %LOCK;	377	our $LOCKS = new Coro::SemaphoreSet;
331	our %LOCKER;#d#
332		378
333	sub lock_wait($) {	379	sub lock_wait($) {
334	my ($key) = @_;	380	$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	}	381	}
347		382
348	sub lock_acquire($) {	383	sub lock_acquire($) {
349	my ($key) = @_;	384	$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	}	385	}
363		386
364	sub lock_active($) {	387	sub lock_active($) {
365	my ($key) = @_;	388	$LOCKS->count ($_[0]) < 1
366
367	! ! $LOCK{$key}
368	}	389	}
369		390
370	sub freeze_mainloop {	391	sub freeze_mainloop {
371	tick_inhibit_inc;	392	tick_inhibit_inc;
372		393
373	Coro::guard \&tick_inhibit_dec;	394	&Guard::guard (\&tick_inhibit_dec);
374	}	395	}
375		396
376	=item cf::periodic $interval, $cb	397	=item cf::periodic $interval, $cb
377		398
378	Like EV::periodic, but randomly selects a starting point so that the actions	399	Like EV::periodic, but randomly selects a starting point so that the actions
…		…
730		751
731	#############################################################################	752	#############################################################################
732		753
733	=head2 ATTACHABLE OBJECTS	754	=head2 ATTACHABLE OBJECTS
734		755
735	Many objects in crossfire are so-called attachable objects. That means you can	756	Many objects in deliantra are so-called attachable objects. That means you can
736	attach callbacks/event handlers (a collection of which is called an "attachment")	757	attach callbacks/event handlers (a collection of which is called an "attachment")
737	to it. All such attachable objects support the following methods.	758	to it. All such attachable objects support the following methods.
738		759
739	In the following description, CLASS can be any of C<global>, C<object>	760	In the following description, CLASS can be any of C<global>, C<object>
740	C<player>, C<client> or C<map> (i.e. the attachable objects in	761	C<player>, C<client> or C<map> (i.e. the attachable objects in
…		…
790	=item cf::CLASS::attachment $name, ...	811	=item cf::CLASS::attachment $name, ...
791		812
792	Register an attachment by C<$name> through which attachable objects of the	813	Register an attachment by C<$name> through which attachable objects of the
793	given CLASS can refer to this attachment.	814	given CLASS can refer to this attachment.
794		815
795	Some classes such as crossfire maps and objects can specify attachments	816	Some classes such as deliantra maps and objects can specify attachments
796	that are attached at load/instantiate time, thus the need for a name.	817	that are attached at load/instantiate time, thus the need for a name.
797		818
798	These calls expect any number of the following handler/hook descriptions:	819	These calls expect any number of the following handler/hook descriptions:
799		820
800	=over 4	821	=over 4
…		…
1150	$decname, length $$rdata, scalar @$objs;	1171	$decname, length $$rdata, scalar @$objs;
1151		1172
1152	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1173	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
1153	aio_chmod $fh, SAVE_MODE;	1174	aio_chmod $fh, SAVE_MODE;
1154	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1175	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1155	aio_fsync $fh if $cf::USE_FSYNC;	1176	if ($cf::USE_FSYNC) {
		1177	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;
		1178	aio_fsync $fh;
		1179	}
1156	aio_close $fh;	1180	aio_close $fh;
1157		1181
1158	if (@$objs) {	1182	if (@$objs) {
1159	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {	1183	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {
1160	aio_chmod $fh, SAVE_MODE;	1184	aio_chmod $fh, SAVE_MODE;
1161	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1185	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1162	aio_write $fh, 0, (length $data), $data, 0;	1186	aio_write $fh, 0, (length $data), $data, 0;
1163	aio_fsync $fh if $cf::USE_FSYNC;	1187	if ($cf::USE_FSYNC) {
		1188	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;
		1189	aio_fsync $fh;
		1190	}
1164	aio_close $fh;	1191	aio_close $fh;
1165	aio_rename "$filename.pst~", "$filename.pst";	1192	aio_rename "$filename.pst~", "$filename.pst";
1166	}	1193	}
1167	} else {	1194	} else {
1168	aio_unlink "$filename.pst";	1195	aio_unlink "$filename.pst";
1169	}	1196	}
1170		1197
1171	aio_rename "$filename~", $filename;	1198	aio_rename "$filename~", $filename;
		1199
		1200	$filename =~ s%/[^/]+$%%;
		1201	aio_pathsync $filename if $cf::USE_FSYNC;
1172	} else {	1202	} else {
1173	warn "FATAL: $filename~: $!\n";	1203	warn "unable to save objects: $filename~: $!\n";
1174	}	1204	}
1175	} else {	1205	} else {
1176	aio_unlink $filename;	1206	aio_unlink $filename;
1177	aio_unlink "$filename.pst";	1207	aio_unlink "$filename.pst";
1178	}	1208	}
…		…
1269	my ($name, $cb) = @_;	1299	my ($name, $cb) = @_;
1270		1300
1271	$EXTICMD{$name} = $cb;	1301	$EXTICMD{$name} = $cb;
1272	}	1302	}
1273		1303
		1304	use File::Glob ();
		1305
1274	cf::player->attach (	1306	cf::player->attach (
1275	on_command => sub {	1307	on_command => sub {
1276	my ($pl, $name, $params) = @_;	1308	my ($pl, $name, $params) = @_;
1277		1309
1278	my $cb = $COMMAND{$name}	1310	my $cb = $COMMAND{$name}
…		…
1309	}	1341	}
1310		1342
1311	cf::override;	1343	cf::override;
1312	},	1344	},
1313	);	1345	);
		1346
		1347	# "readahead" all extensions
		1348	sub cache_extensions {
		1349	my $grp = IO::AIO::aio_group;
		1350
		1351	add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
		1352	for (grep /\.ext$/, @{$_[0]}) {
		1353	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
		1354	}
		1355	};
		1356
		1357	$grp
		1358	}
1314		1359
1315	sub load_extensions {	1360	sub load_extensions {
1316	cf::sync_job {	1361	cf::sync_job {
1317	my %todo;	1362	my %todo;
1318		1363
…		…
1388		1433
1389	=back	1434	=back
1390		1435
1391	=head2 CORE EXTENSIONS	1436	=head2 CORE EXTENSIONS
1392		1437
1393	Functions and methods that extend core crossfire objects.	1438	Functions and methods that extend core deliantra objects.
1394		1439
1395	=cut	1440	=cut
1396		1441
1397	package cf::player;	1442	package cf::player;
1398		1443
…		…
1441		1486
1442	sub exists($) {	1487	sub exists($) {
1443	my ($login) = @_;	1488	my ($login) = @_;
1444		1489
1445	$cf::PLAYER{$login}	1490	$cf::PLAYER{$login}
1446	or cf::sync_job { !aio_stat path $login }	1491	or !aio_stat path $login
1447	}	1492	}
1448		1493
1449	sub find($) {	1494	sub find($) {
1450	return $cf::PLAYER{$_[0]} \|\| do {	1495	return $cf::PLAYER{$_[0]} \|\| do {
1451	my $login = $_[0];	1496	my $login = $_[0];
…		…
1622	}	1667	}
1623		1668
1624	\@paths	1669	\@paths
1625	}	1670	}
1626		1671
1627	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)	1672	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1628		1673
1629	Expand crossfire pod fragments into protocol xml.	1674	Expand deliantra pod fragments into protocol xml.
1630		1675
1631	=item $player->ext_reply ($msgid, @msg)	1676	=item $player->ext_reply ($msgid, @msg)
1632		1677
1633	Sends an ext reply to the player.	1678	Sends an ext reply to the player.
1634		1679
…		…
1847		1892
1848	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;	1893	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1849	"$UNIQUEDIR/$path"	1894	"$UNIQUEDIR/$path"
1850	}	1895	}
1851		1896
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 {	1897	sub decay_objects {
1862	my ($self) = @_;	1898	my ($self) = @_;
1863		1899
1864	return if $self->{deny_reset};	1900	return if $self->{deny_reset};
1865		1901
…		…
1947	sub find {	1983	sub find {
1948	my ($path, $origin) = @_;	1984	my ($path, $origin) = @_;
1949		1985
1950	$path = normalise $path, $origin && $origin->path;	1986	$path = normalise $path, $origin && $origin->path;
1951		1987
1952	cf::lock_wait "map_data:$path";#d#remove	1988	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1953	cf::lock_wait "map_find:$path";	1989	my $guard2 = cf::lock_acquire "map_find:$path";
1954		1990
1955	$cf::MAP{$path} \|\| do {	1991	$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	1992	my $map = new_from_path cf::map $path
1960	or return;	1993	or return;
1961		1994
1962	$map->{last_save} = $cf::RUNTIME;	1995	$map->{last_save} = $cf::RUNTIME;
1963		1996
…		…
2031	unless ($self->{deny_activate}) {	2064	unless ($self->{deny_activate}) {
2032	$self->decay_objects;	2065	$self->decay_objects;
2033	$self->fix_auto_apply;	2066	$self->fix_auto_apply;
2034	$self->update_buttons;	2067	$self->update_buttons;
2035	cf::cede_to_tick;	2068	cf::cede_to_tick;
2036	$self->set_darkness_map;
2037	cf::cede_to_tick;
2038	$self->activate;	2069	$self->activate;
2039	}	2070	}
2040		2071
2041	$self->{last_save} = $cf::RUNTIME;	2072	$self->{last_save} = $cf::RUNTIME;
2042	$self->last_access ($cf::RUNTIME);	2073	$self->last_access ($cf::RUNTIME);
…		…
2208		2239
2209	my $lock = cf::lock_acquire "map_data:$self->{path}";	2240	my $lock = cf::lock_acquire "map_data:$self->{path}";
2210		2241
2211	return if $self->players;	2242	return if $self->players;
2212		2243
2213	warn "resetting map ", $self->path;	2244	warn "resetting map ", $self->path, "\n";
2214		2245
2215	$self->in_memory (cf::MAP_SWAPPED);	2246	$self->in_memory (cf::MAP_SWAPPED);
2216		2247
2217	# need to save uniques path	2248	# need to save uniques path
2218	unless ($self->{deny_save}) {	2249	unless ($self->{deny_save}) {
…		…
2383		2414
2384	our $SAY_CHANNEL = {	2415	our $SAY_CHANNEL = {
2385	id => "say",	2416	id => "say",
2386	title => "Map",	2417	title => "Map",
2387	reply => "say ",	2418	reply => "say ",
2388	tooltip => "Things said to and replied from npcs near you and other players on the same map only.",	2419	tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2389	};	2420	};
2390		2421
2391	our $CHAT_CHANNEL = {	2422	our $CHAT_CHANNEL = {
2392	id => "chat",	2423	id => "chat",
2393	title => "Chat",	2424	title => "Chat",
…		…
2519		2550
2520	$map->load;	2551	$map->load;
2521	$map->load_neighbours;	2552	$map->load_neighbours;
2522		2553
2523	return unless $self->contr->active;	2554	return unless $self->contr->active;
2524	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2525	$self->activate_recursive;
2526		2555
2527	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2556	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528	$self->enter_map ($map, $x, $y);	2557	$self->enter_map ($map, $x, $y);
		2558
		2559	# only activate afterwards, to support waiting in hooks
		2560	$self->activate_recursive;
2529	}	2561	}
2530		2562
2531	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2563	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2532		2564
2533	Moves the player to the given map-path and coordinates by first freezing	2565	Moves the player to the given map-path and coordinates by first freezing
…		…
2692	$self->contr->savebed ($map, $x, $y)	2724	$self->contr->savebed ($map, $x, $y)
2693	if $exit->flag (cf::FLAG_DAMNED);	2725	if $exit->flag (cf::FLAG_DAMNED);
2694		2726
2695	1	2727	1
2696	}) {	2728	}) {
2697	$self->message ("Something went wrong deep within the crossfire server. "	2729	$self->message ("Something went wrong deep within the deliantra server. "
2698	. "I'll try to bring you back to the map you were before. "	2730	. "I'll try to bring you back to the map you were before. "
2699	. "Please report this to the dungeon master!",	2731	. "Please report this to the dungeon master!",
2700	cf::NDI_UNIQUE \| cf::NDI_RED);	2732	cf::NDI_UNIQUE \| cf::NDI_RED);
2701		2733
2702	warn "ERROR in enter_exit: $@";	2734	warn "ERROR in enter_exit: $@";
…		…
2768	id => "infobox",	2800	id => "infobox",
2769	title => "Body Parts",	2801	title => "Body Parts",
2770	reply => undef,	2802	reply => undef,
2771	tooltip => "Shows which body parts you posess and are available",	2803	tooltip => "Shows which body parts you posess and are available",
2772	},	2804	},
		2805	"c/statistics" => {
		2806	id => "infobox",
		2807	title => "Statistics",
		2808	reply => undef,
		2809	tooltip => "Shows your primary statistics",
		2810	},
		2811	"c/skills" => {
		2812	id => "infobox",
		2813	title => "Skills",
		2814	reply => undef,
		2815	tooltip => "Shows your experience per skill and item power",
		2816	},
		2817	"c/shopitems" => {
		2818	id => "infobox",
		2819	title => "Shop Items",
		2820	reply => undef,
		2821	tooltip => "Shows the items currently for sale in this shop",
		2822	},
		2823	"c/resistances" => {
		2824	id => "infobox",
		2825	title => "Resistances",
		2826	reply => undef,
		2827	tooltip => "Shows your resistances",
		2828	},
		2829	"c/pets" => {
		2830	id => "infobox",
		2831	title => "Pets",
		2832	reply => undef,
		2833	tooltip => "Shows information abotu your pets/a specific pet",
		2834	},
		2835	"c/perceiveself" => {
		2836	id => "infobox",
		2837	title => "Perceive Self",
		2838	reply => undef,
		2839	tooltip => "You gained detailed knowledge about yourself",
		2840	},
2773	"c/uptime" => {	2841	"c/uptime" => {
2774	id => "infobox",	2842	id => "infobox",
2775	title => "Uptime",	2843	title => "Uptime",
2776	reply => undef,	2844	reply => undef,
2777	tooltip => "How long the server has been running since last restart",	2845	tooltip => "How long the server has been running since last restart",
…		…
2786	id => "party",	2854	id => "party",
2787	title => "Party",	2855	title => "Party",
2788	reply => "gsay ",	2856	reply => "gsay ",
2789	tooltip => "Messages and chat related to your party",	2857	tooltip => "Messages and chat related to your party",
2790	},	2858	},
		2859	"c/death" => {
		2860	id => "death",
		2861	title => "Death",
		2862	reply => undef,
		2863	tooltip => "Reason for and more info about your most recent death",
		2864	},
		2865	"c/say" => $SAY_CHANNEL,
		2866	"c/chat" => $CHAT_CHANNEL,
2791	);	2867	);
2792		2868
2793	sub cf::client::send_msg {	2869	sub cf::client::send_msg {
2794	my ($self, $channel, $msg, $color, @extra) = @_;	2870	my ($self, $channel, $msg, $color, @extra) = @_;
2795		2871
2796	$msg = $self->pl->expand_cfpod ($msg);	2872	$msg = $self->pl->expand_cfpod ($msg)
		2873	unless $color & cf::NDI_VERBATIM;
2797		2874
2798	$color &= cf::NDI_CLIENT_MASK; # just in case...	2875	$color &= cf::NDI_CLIENT_MASK; # just in case...
2799		2876
2800	# check predefined channels, for the benefit of C	2877	# check predefined channels, for the benefit of C
2801	if ($CHANNEL{$channel}) {	2878	if ($CHANNEL{$channel}) {
2802	$channel = $CHANNEL{$channel};	2879	$channel = $CHANNEL{$channel};
2803		2880
2804	$self->ext_msg (channel_info => $channel)	2881	$self->ext_msg (channel_info => $channel);
2805	if $self->can_msg;
2806
2807	$channel = $channel->{id};	2882	$channel = $channel->{id};
2808		2883
2809	} elsif (ref $channel) {	2884	} elsif (ref $channel) {
2810	# send meta info to client, if not yet sent	2885	# send meta info to client, if not yet sent
2811	unless (exists $self->{channel}{$channel->{id}}) {	2886	unless (exists $self->{channel}{$channel->{id}}) {
2812	$self->{channel}{$channel->{id}} = $channel;	2887	$self->{channel}{$channel->{id}} = $channel;
2813	$self->ext_msg (channel_info => $channel)	2888	$self->ext_msg (channel_info => $channel);
2814	if $self->can_msg;
2815	}	2889	}
2816		2890
2817	$channel = $channel->{id};	2891	$channel = $channel->{id};
2818	}	2892	}
2819		2893
2820	return unless @extra \|\| length $msg;	2894	return unless @extra \|\| length $msg;
2821		2895
2822	if ($self->can_msg) {
2823	# default colour, mask it out	2896	# default colour, mask it out
2824	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)	2897	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
2825	if $color & cf::NDI_DEF;	2898	if $color & cf::NDI_DEF;
2826		2899
2827	my $pkt = "msg "	2900	my $pkt = "msg "
2828	. $self->{json_coder}->encode (	2901	. $self->{json_coder}->encode (
2829	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	2902	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2830	);	2903	);
2831		2904
2832	# try lzf for large packets	2905	# try lzf for large packets
2833	$pkt = "lzf " . Compress::LZF::compress $pkt	2906	$pkt = "lzf " . Compress::LZF::compress $pkt
2834	if 1024 <= length $pkt and $self->{can_lzf};	2907	if 1024 <= length $pkt and $self->{can_lzf};
2835		2908
2836	# split very large packets	2909	# split very large packets
2837	if (8192 < length $pkt and $self->{can_lzf}) {	2910	if (8192 < length $pkt and $self->{can_lzf}) {
2838	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;	2911	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2839	$pkt = "frag";	2912	$pkt = "frag";
2840	}	2913	}
2841		2914
2842	$self->send_packet ($pkt);	2915	$self->send_packet ($pkt);
2843	} else {
2844	if ($color >= 0) {
2845	# replace some tags by gcfclient-compatible ones
2846	for ($msg) {
2847	1 while
2848	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2849	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2850	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2851	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2852	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2853	}
2854
2855	$color &= cf::NDI_COLOR_MASK;
2856
2857	utf8::encode $msg;
2858
2859	if (0 && $msg =~ /\[/) {
2860	# COMMAND/INFO
2861	$self->send_packet ("drawextinfo $color 10 8 $msg")
2862	} else {
2863	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2864	$self->send_packet ("drawinfo $color $msg")
2865	}
2866	}
2867	}
2868	}	2916	}
2869		2917
2870	=item $client->ext_msg ($type, @msg)	2918	=item $client->ext_msg ($type, @msg)
2871		2919
2872	Sends an ext event to the client.	2920	Sends an ext event to the client.
…		…
3047	The following functions and methods are available within a safe environment:	3095	The following functions and methods are available within a safe environment:
3048		3096
3049	cf::object	3097	cf::object
3050	contr pay_amount pay_player map x y force_find force_add destroy	3098	contr pay_amount pay_player map x y force_find force_add destroy
3051	insert remove name archname title slaying race decrease split	3099	insert remove name archname title slaying race decrease split
		3100	value
3052		3101
3053	cf::object::player	3102	cf::object::player
3054	player	3103	player
3055		3104
3056	cf::player	3105	cf::player
…		…
3062	=cut	3111	=cut
3063		3112
3064	for (	3113	for (
3065	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3114	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3066	insert remove inv nrof name archname title slaying race	3115	insert remove inv nrof name archname title slaying race
3067	decrease split destroy change_exp)],	3116	decrease split destroy change_exp value msg lore send_msg)],
3068	["cf::object::player" => qw(player)],	3117	["cf::object::player" => qw(player)],
3069	["cf::player" => qw(peaceful)],	3118	["cf::player" => qw(peaceful send_msg)],
3070	["cf::map" => qw(trigger)],	3119	["cf::map" => qw(trigger)],
3071	) {	3120	) {
3072	no strict 'refs';	3121	no strict 'refs';
3073	my ($pkg, @funs) = @$_;	3122	my ($pkg, @funs) = @$_;
3074	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3123	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
…		…
3091	my ($code, %vars) = @_;	3140	my ($code, %vars) = @_;
3092		3141
3093	my $qcode = $code;	3142	my $qcode = $code;
3094	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3143	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3095	$qcode =~ s/\n/\\n/g;	3144	$qcode =~ s/\n/\\n/g;
		3145
		3146	%vars = (_dummy => 0) unless %vars;
3096		3147
3097	local $_;	3148	local $_;
3098	local @safe::cf::_safe_eval_args = values %vars;	3149	local @safe::cf::_safe_eval_args = values %vars;
3099		3150
3100	my $eval =	3151	my $eval =
…		…
3330	reload_treasures;	3381	reload_treasures;
3331		3382
3332	warn "finished reloading resource files\n";	3383	warn "finished reloading resource files\n";
3333	}	3384	}
3334		3385
3335	sub init {
3336	my $guard = freeze_mainloop;
3337
3338	evthread_start IO::AIO::poll_fileno;
3339
3340	reload_resources;
3341	}
3342
3343	sub reload_config {	3386	sub reload_config {
3344	open my $fh, "<:utf8", "$CONFDIR/config"	3387	open my $fh, "<:utf8", "$CONFDIR/config"
3345	or return;	3388	or return;
3346		3389
3347	local $/;	3390	local $/;
…		…
3378		3421
3379	seek $fh, 0, 0;	3422	seek $fh, 0, 0;
3380	print $fh $$;	3423	print $fh $$;
3381	}	3424	}
3382		3425
		3426	sub main_loop {
		3427	warn "EV::loop starting\n";
		3428	if (1) {
		3429	EV::loop;
		3430	}
		3431	warn "EV::loop returned\n";
		3432	goto &main_loop unless $REALLY_UNLOOP;
		3433	}
		3434
3383	sub main {	3435	sub main {
3384	atomic;	3436	cf::init_globals; # initialise logging
		3437
		3438	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3439	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
		3440	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
		3441	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
		3442
		3443	cf::init_experience;
		3444	cf::init_anim;
		3445	cf::init_attackmess;
		3446	cf::init_dynamic;
		3447
		3448	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3385		3449
3386	# we must not ever block the main coroutine	3450	# we must not ever block the main coroutine
3387	local $Coro::idle = sub {	3451	local $Coro::idle = sub {
3388	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3452	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3389	(async {	3453	(async {
3390	$Coro::current->{desc} = "IDLE BUG HANDLER";	3454	$Coro::current->{desc} = "IDLE BUG HANDLER";
3391	EV::loop EV::LOOP_ONESHOT;	3455	EV::loop EV::LOOP_ONESHOT;
3392	})->prio (Coro::PRIO_MAX);	3456	})->prio (Coro::PRIO_MAX);
3393	};	3457	};
3394		3458
3395	{	3459	evthread_start IO::AIO::poll_fileno;
3396	my $guard = freeze_mainloop;	3460
		3461	cf::sync_job {
		3462	reload_resources;
3397	reload_config;	3463	reload_config;
3398	db_init;	3464	db_init;
		3465
		3466	cf::load_settings;
		3467	cf::load_materials;
		3468	cf::init_uuid;
		3469	cf::init_signals;
		3470	cf::init_commands;
		3471	cf::init_skills;
		3472
		3473	cf::init_beforeplay;
		3474
		3475	atomic;
		3476
3399	load_extensions;	3477	load_extensions;
3400		3478
3401	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3402	}
3403
3404	utime time, time, $RUNTIMEFILE;	3479	utime time, time, $RUNTIMEFILE;
3405		3480
3406	# no (long-running) fork's whatsoever before this point(!)	3481	# no (long-running) fork's whatsoever before this point(!)
		3482	use POSIX ();
3407	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3483	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3408		3484
3409	EV::loop;	3485	(pop @POST_INIT)->(0) while @POST_INIT;
		3486	};
		3487
		3488	main_loop;
3410	}	3489	}
3411		3490
3412	#############################################################################	3491	#############################################################################
3413	# initialisation and cleanup	3492	# initialisation and cleanup
3414		3493
…		…
3470	my $uuid = "$LOCALDIR/uuid";	3549	my $uuid = "$LOCALDIR/uuid";
3471		3550
3472	my $fh = aio_open "$uuid~", O_WRONLY \| O_CREAT, 0644	3551	my $fh = aio_open "$uuid~", O_WRONLY \| O_CREAT, 0644
3473	or return;	3552	or return;
3474		3553
3475	my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;	3554	my $value = uuid_seq uuid_cur;
		3555
		3556	unless ($value) {
		3557	warn "cowardly refusing to write zero uuid value!\n";
		3558	return;
		3559	}
		3560
		3561	my $value = uuid_str $value + $uuid_skip;
3476	$uuid_skip = 0;	3562	$uuid_skip = 0;
3477		3563
3478	(aio_write $fh, 0, (length $value), $value, 0) <= 0	3564	(aio_write $fh, 0, (length $value), $value, 0) <= 0
3479	and return;	3565	and return;
3480		3566
…		…
3502	}	3588	}
3503		3589
3504	sub emergency_save() {	3590	sub emergency_save() {
3505	my $freeze_guard = cf::freeze_mainloop;	3591	my $freeze_guard = cf::freeze_mainloop;
3506		3592
3507	warn "enter emergency perl save\n";	3593	warn "emergency_perl_save: enter\n";
3508		3594
3509	cf::sync_job {	3595	cf::sync_job {
		3596	# this is a trade-off: we want to be very quick here, so
		3597	# save all maps without fsync, and later call a global sync
		3598	# (which in turn might be very very slow)
		3599	local $USE_FSYNC = 0;
		3600
3510	# use a peculiar iteration method to avoid tripping on perl	3601	# use a peculiar iteration method to avoid tripping on perl
3511	# refcount bugs in for. also avoids problems with players	3602	# refcount bugs in for. also avoids problems with players
3512	# and maps saved/destroyed asynchronously.	3603	# and maps saved/destroyed asynchronously.
3513	warn "begin emergency player save\n";	3604	warn "emergency_perl_save: begin player save\n";
3514	for my $login (keys %cf::PLAYER) {	3605	for my $login (keys %cf::PLAYER) {
3515	my $pl = $cf::PLAYER{$login} or next;	3606	my $pl = $cf::PLAYER{$login} or next;
3516	$pl->valid or next;	3607	$pl->valid or next;
3517	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3608	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3518	$pl->save;	3609	$pl->save;
3519	}	3610	}
3520	warn "end emergency player save\n";	3611	warn "emergency_perl_save: end player save\n";
3521		3612
3522	warn "begin emergency map save\n";	3613	warn "emergency_perl_save: begin map save\n";
3523	for my $path (keys %cf::MAP) {	3614	for my $path (keys %cf::MAP) {
3524	my $map = $cf::MAP{$path} or next;	3615	my $map = $cf::MAP{$path} or next;
3525	$map->valid or next;	3616	$map->valid or next;
3526	$map->save;	3617	$map->save;
3527	}	3618	}
3528	warn "end emergency map save\n";	3619	warn "emergency_perl_save: end map save\n";
3529		3620
3530	warn "begin emergency database checkpoint\n";	3621	warn "emergency_perl_save: begin database checkpoint\n";
3531	BDB::db_env_txn_checkpoint $DB_ENV;	3622	BDB::db_env_txn_checkpoint $DB_ENV;
3532	warn "end emergency database checkpoint\n";	3623	warn "emergency_perl_save: end database checkpoint\n";
3533		3624
3534	warn "begin write uuid\n";	3625	warn "emergency_perl_save: begin write uuid\n";
3535	write_uuid_sync 1;	3626	write_uuid_sync 1;
3536	warn "end write uuid\n";	3627	warn "emergency_perl_save: end write uuid\n";
3537	};	3628	};
3538		3629
		3630	warn "emergency_perl_save: starting sync()\n";
		3631	IO::AIO::aio_sync sub {
		3632	warn "emergency_perl_save: finished sync()\n";
		3633	};
		3634
3539	warn "leave emergency perl save\n";	3635	warn "emergency_perl_save: leave\n";
3540	}	3636	}
3541		3637
3542	sub post_cleanup {	3638	sub post_cleanup {
3543	my ($make_core) = @_;	3639	my ($make_core) = @_;
3544		3640
…		…
3570	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3666	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3571	for my $name (keys %$leaf_symtab) {	3667	for my $name (keys %$leaf_symtab) {
3572	_gv_clear *{"$pkg$name"};	3668	_gv_clear *{"$pkg$name"};
3573	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3669	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3574	}	3670	}
3575	warn "cleared package #$pkg\n";#d#	3671	warn "cleared package $pkg\n";#d#
3576	}	3672	}
3577
3578	our $RELOAD; # how many times to reload
3579		3673
3580	sub do_reload_perl() {	3674	sub do_reload_perl() {
3581	# can/must only be called in main	3675	# can/must only be called in main
3582	if ($Coro::current != $Coro::main) {	3676	if ($Coro::current != $Coro::main) {
3583	warn "can only reload from main coroutine";	3677	warn "can only reload from main coroutine";
3584	return;	3678	return;
3585	}	3679	}
3586		3680
3587	return if $RELOAD++;	3681	return if $RELOAD++;
		3682
		3683	my $t1 = EV::time;
3588		3684
3589	while ($RELOAD) {	3685	while ($RELOAD) {
3590	warn "reloading...";	3686	warn "reloading...";
3591		3687
3592	warn "entering sync_job";	3688	warn "entering sync_job";
…		…
3653	clear_package "safe::$_"	3749	clear_package "safe::$_"
3654	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3750	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3655		3751
3656	warn "unloading cf.pm \"a bit\"";	3752	warn "unloading cf.pm \"a bit\"";
3657	delete $INC{"cf.pm"};	3753	delete $INC{"cf.pm"};
3658	delete $INC{"cf/pod.pm"};	3754	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3659		3755
3660	# don't, removes xs symbols, too,	3756	# don't, removes xs symbols, too,
3661	# and global variables created in xs	3757	# and global variables created in xs
3662	#clear_package __PACKAGE__;	3758	#clear_package __PACKAGE__;
3663		3759
…		…
3671	cf::reload_config;	3767	cf::reload_config;
3672		3768
3673	warn "loading extensions";	3769	warn "loading extensions";
3674	cf::load_extensions;	3770	cf::load_extensions;
3675		3771
		3772	if ($REATTACH_ON_RELOAD) {
3676	warn "reattaching attachments to objects/players";	3773	warn "reattaching attachments to objects/players";
3677	_global_reattach; # objects, sockets	3774	_global_reattach; # objects, sockets
3678	warn "reattaching attachments to maps";	3775	warn "reattaching attachments to maps";
3679	reattach $_ for values %MAP;	3776	reattach $_ for values %MAP;
3680	warn "reattaching attachments to players";	3777	warn "reattaching attachments to players";
3681	reattach $_ for values %PLAYER;	3778	reattach $_ for values %PLAYER;
		3779	}
		3780
		3781	warn "running post_init jobs";
		3782	(pop @POST_INIT)->(1) while @POST_INIT;
3682		3783
3683	warn "leaving sync_job";	3784	warn "leaving sync_job";
3684		3785
3685	1	3786	1
3686	} or do {	3787	} or do {
…		…
3689	};	3790	};
3690		3791
3691	warn "reloaded";	3792	warn "reloaded";
3692	--$RELOAD;	3793	--$RELOAD;
3693	}	3794	}
		3795
		3796	$t1 = EV::time - $t1;
		3797	warn "reload completed in ${t1}s\n";
3694	};	3798	};
3695		3799
3696	our $RELOAD_WATCHER; # used only during reload	3800	our $RELOAD_WATCHER; # used only during reload
3697		3801
3698	sub reload_perl() {	3802	sub reload_perl() {
3699	# doing reload synchronously and two reloads happen back-to-back,	3803	# doing reload synchronously and two reloads happen back-to-back,
3700	# coro crashes during coro_state_free->destroy here.	3804	# coro crashes during coro_state_free->destroy here.
3701		3805
		3806	$RELOAD_WATCHER \|\|= cf::async {
		3807	Coro::AIO::aio_wait cache_extensions;
		3808
3702	$RELOAD_WATCHER \|\|= EV::timer 0, 0, sub {	3809	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3703	do_reload_perl;	3810	do_reload_perl;
3704	undef $RELOAD_WATCHER;	3811	undef $RELOAD_WATCHER;
		3812	};
3705	};	3813	};
3706	}	3814	}
3707		3815
3708	register_command "reload" => sub {	3816	register_command "reload" => sub {
3709	my ($who, $arg) = @_;	3817	my ($who, $arg) = @_;
…		…
3868	LOG llevInfo, "[ABT] [suppressed]\n";	3976	LOG llevInfo, "[ABT] [suppressed]\n";
3869	}	3977	}
3870	}	3978	}
3871		3979
3872	# load additional modules	3980	# load additional modules
3873	use cf::pod;	3981	require "cf/$_.pm" for @EXTRA_MODULES;
3874		3982
3875	END { cf::emergency_save }	3983	END { cf::emergency_save }
3876		3984
3877	1	3985	1
3878		3986

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.446 by root, Tue Sep 16 16:03:02 2008 UTC vs. Revision 1.482 by root, Sun Oct 11 05:31:54 2009 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.446 by root, Tue Sep 16 16:03:02 2008 UTC vs.
Revision 1.482 by root, Sun Oct 11 05:31:54 2009 UTC