[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.477 by root, Wed Sep 2 22:52:36 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;
85		93
86	our $CONFDIR = confdir;	94	our $CONFDIR = confdir;
87	our $DATADIR = datadir;	95	our $DATADIR = datadir;
88	our $LIBDIR = "$DATADIR/ext";	96	our $LIBDIR = "$DATADIR/ext";
…		…
100	our %RESOURCE;	108	our %RESOURCE;
101		109
102	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	110	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
103	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	111	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
104	our $NEXT_TICK;	112	our $NEXT_TICK;
105	our $USE_FSYNC = 1; # use fsync to write maps - default off	113	our $USE_FSYNC = 1; # use fsync to write maps - default on
106		114
107	our $BDB_DEADLOCK_WATCHER;	115	our $BDB_DEADLOCK_WATCHER;
108	our $BDB_CHECKPOINT_WATCHER;	116	our $BDB_CHECKPOINT_WATCHER;
109	our $BDB_TRICKLE_WATCHER;	117	our $BDB_TRICKLE_WATCHER;
110	our $DB_ENV;	118	our $DB_ENV;
111		119
		120	our @EXTRA_MODULES = qw(pod mapscript);
		121
112	our %CFG;	122	our %CFG;
113		123
114	our $UPTIME; $UPTIME \|\|= time;	124	our $UPTIME; $UPTIME \|\|= time;
115	our $RUNTIME;	125	our $RUNTIME;
116	our $NOW;	126	our $NOW;
…		…
124		134
125	our $LOAD; # a number between 0 (idle) and 1 (too many objects)	135	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
126	our $LOADAVG; # same thing, but with alpha-smoothing	136	our $LOADAVG; # same thing, but with alpha-smoothing
127	our $JITTER; # average jitter	137	our $JITTER; # average jitter
128	our $TICK_START; # for load detecting purposes	138	our $TICK_START; # for load detecting purposes
		139
		140	our @POST_INIT;
		141
		142	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
		143	our $REALLY_UNLOOP; # never set to true, please :)
129		144
130	binmode STDOUT;	145	binmode STDOUT;
131	binmode STDERR;	146	binmode STDERR;
132		147
133	# read virtual server time, if available	148	# read virtual server time, if available
…		…
135	open my $fh, "<", $RUNTIMEFILE	150	open my $fh, "<", $RUNTIMEFILE
136	or die "unable to read $RUNTIMEFILE file: $!";	151	or die "unable to read $RUNTIMEFILE file: $!";
137	$RUNTIME = <$fh> + 0.;	152	$RUNTIME = <$fh> + 0.;
138	}	153	}
139		154
		155	eval "sub TICK() { $TICK } 1" or die;
		156
140	mkdir $_	157	mkdir $_
141	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	158	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
142		159
143	our $EMERGENCY_POSITION;	160	our $EMERGENCY_POSITION;
144		161
…		…
205		222
206	=back	223	=back
207		224
208	=cut	225	=cut
209		226
210	BEGIN {	227	$Coro::State::WARNHOOK = sub {
211	*CORE::GLOBAL::warn = sub {
212	my $msg = join "", @_;	228	my $msg = join "", @_;
213		229
214	$msg .= "\n"	230	$msg .= "\n"
215	unless $msg =~ /\n$/;	231	unless $msg =~ /\n$/;
216		232
217	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	233	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
218		234
219	LOG llevError, $msg;	235	LOG llevError, $msg;
220	};	236	};
221	}
222		237
223	$Coro::State::DIEHOOK = sub {	238	$Coro::State::DIEHOOK = sub {
224	return unless $^S eq 0; # "eq", not "=="	239	return unless $^S eq 0; # "eq", not "=="
		240
		241	warn Carp::longmess $_[0];
225		242
226	if ($Coro::current == $Coro::main) {#d#	243	if ($Coro::current == $Coro::main) {#d#
227	warn "DIEHOOK called in main context, Coro bug?\n";#d#	244	warn "DIEHOOK called in main context, Coro bug?\n";#d#
228	return;#d#	245	return;#d#
229	}#d#	246	}#d#
230		247
231	# kill coroutine otherwise	248	# kill coroutine otherwise
232	warn Carp::longmess $_[0];
233	Coro::terminate	249	Coro::terminate
234	};	250	};
235
236	$SIG{__DIE__} = sub { }; #d#?
237		251
238	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	252	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
239	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	253	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
240	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	254	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
241	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	255	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
302	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	316	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
303		317
304	sub encode_json($) { $json_coder->encode ($_[0]) }	318	sub encode_json($) { $json_coder->encode ($_[0]) }
305	sub decode_json($) { $json_coder->decode ($_[0]) }	319	sub decode_json($) { $json_coder->decode ($_[0]) }
306		320
		321	=item cf::post_init { BLOCK }
		322
		323	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
		324	but I<before> the server starts ticking again.
		325
		326	The cdoeblock will have a single boolean argument to indicate whether this
		327	is a reload or not.
		328
		329	=cut
		330
		331	sub post_init(&) {
		332	push @POST_INIT, shift;
		333	}
		334
307	=item cf::lock_wait $string	335	=item cf::lock_wait $string
308		336
309	Wait until the given lock is available. See cf::lock_acquire.	337	Wait until the given lock is available. See cf::lock_acquire.
310		338
311	=item my $lock = cf::lock_acquire $string	339	=item my $lock = cf::lock_acquire $string
312		340
313	Wait until the given lock is available and then acquires it and returns	341	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,	342	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	343	for example when the coroutine gets canceled), the lock is automatically
316	returned.	344	returned.
317		345
318	Locks are not recursive, locking from the same coro twice results in a	346	Locks are not recursive, locking from the same coro twice results in a
319	deadlocked coro.	347	deadlocked coro.
…		…
325		353
326	Return true if the lock is currently active, i.e. somebody has locked it.	354	Return true if the lock is currently active, i.e. somebody has locked it.
327		355
328	=cut	356	=cut
329		357
330	our %LOCK;	358	our $LOCKS = new Coro::SemaphoreSet;
331	our %LOCKER;#d#
332		359
333	sub lock_wait($) {	360	sub lock_wait($) {
334	my ($key) = @_;	361	$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	}	362	}
347		363
348	sub lock_acquire($) {	364	sub lock_acquire($) {
349	my ($key) = @_;	365	$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	}	366	}
363		367
364	sub lock_active($) {	368	sub lock_active($) {
365	my ($key) = @_;	369	$LOCKS->count ($_[0]) < 1
366
367	! ! $LOCK{$key}
368	}	370	}
369		371
370	sub freeze_mainloop {	372	sub freeze_mainloop {
371	tick_inhibit_inc;	373	tick_inhibit_inc;
372		374
373	Coro::guard \&tick_inhibit_dec;	375	&Guard::guard (\&tick_inhibit_dec);
374	}	376	}
375		377
376	=item cf::periodic $interval, $cb	378	=item cf::periodic $interval, $cb
377		379
378	Like EV::periodic, but randomly selects a starting point so that the actions	380	Like EV::periodic, but randomly selects a starting point so that the actions
…		…
730		732
731	#############################################################################	733	#############################################################################
732		734
733	=head2 ATTACHABLE OBJECTS	735	=head2 ATTACHABLE OBJECTS
734		736
735	Many objects in crossfire are so-called attachable objects. That means you can	737	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")	738	attach callbacks/event handlers (a collection of which is called an "attachment")
737	to it. All such attachable objects support the following methods.	739	to it. All such attachable objects support the following methods.
738		740
739	In the following description, CLASS can be any of C<global>, C<object>	741	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	742	C<player>, C<client> or C<map> (i.e. the attachable objects in
…		…
790	=item cf::CLASS::attachment $name, ...	792	=item cf::CLASS::attachment $name, ...
791		793
792	Register an attachment by C<$name> through which attachable objects of the	794	Register an attachment by C<$name> through which attachable objects of the
793	given CLASS can refer to this attachment.	795	given CLASS can refer to this attachment.
794		796
795	Some classes such as crossfire maps and objects can specify attachments	797	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.	798	that are attached at load/instantiate time, thus the need for a name.
797		799
798	These calls expect any number of the following handler/hook descriptions:	800	These calls expect any number of the following handler/hook descriptions:
799		801
800	=over 4	802	=over 4
…		…
1150	$decname, length $$rdata, scalar @$objs;	1152	$decname, length $$rdata, scalar @$objs;
1151		1153
1152	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1154	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
1153	aio_chmod $fh, SAVE_MODE;	1155	aio_chmod $fh, SAVE_MODE;
1154	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1156	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1155	aio_fsync $fh if $cf::USE_FSYNC;	1157	if ($cf::USE_FSYNC) {
		1158	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;
		1159	aio_fsync $fh;
		1160	}
1156	aio_close $fh;	1161	aio_close $fh;
1157		1162
1158	if (@$objs) {	1163	if (@$objs) {
1159	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {	1164	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {
1160	aio_chmod $fh, SAVE_MODE;	1165	aio_chmod $fh, SAVE_MODE;
1161	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1166	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1162	aio_write $fh, 0, (length $data), $data, 0;	1167	aio_write $fh, 0, (length $data), $data, 0;
1163	aio_fsync $fh if $cf::USE_FSYNC;	1168	if ($cf::USE_FSYNC) {
		1169	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;
		1170	aio_fsync $fh;
		1171	}
1164	aio_close $fh;	1172	aio_close $fh;
1165	aio_rename "$filename.pst~", "$filename.pst";	1173	aio_rename "$filename.pst~", "$filename.pst";
1166	}	1174	}
1167	} else {	1175	} else {
1168	aio_unlink "$filename.pst";	1176	aio_unlink "$filename.pst";
1169	}	1177	}
1170		1178
1171	aio_rename "$filename~", $filename;	1179	aio_rename "$filename~", $filename;
		1180
		1181	$filename =~ s%/[^/]+$%%;
		1182	aio_pathsync $filename if $cf::USE_FSYNC;
1172	} else {	1183	} else {
1173	warn "FATAL: $filename~: $!\n";	1184	warn "unable to save objects: $filename~: $!\n";
1174	}	1185	}
1175	} else {	1186	} else {
1176	aio_unlink $filename;	1187	aio_unlink $filename;
1177	aio_unlink "$filename.pst";	1188	aio_unlink "$filename.pst";
1178	}	1189	}
…		…
1269	my ($name, $cb) = @_;	1280	my ($name, $cb) = @_;
1270		1281
1271	$EXTICMD{$name} = $cb;	1282	$EXTICMD{$name} = $cb;
1272	}	1283	}
1273		1284
		1285	use File::Glob ();
		1286
1274	cf::player->attach (	1287	cf::player->attach (
1275	on_command => sub {	1288	on_command => sub {
1276	my ($pl, $name, $params) = @_;	1289	my ($pl, $name, $params) = @_;
1277		1290
1278	my $cb = $COMMAND{$name}	1291	my $cb = $COMMAND{$name}
…		…
1309	}	1322	}
1310		1323
1311	cf::override;	1324	cf::override;
1312	},	1325	},
1313	);	1326	);
		1327
		1328	# "readahead" all extensions
		1329	sub cache_extensions {
		1330	my $grp = IO::AIO::aio_group;
		1331
		1332	add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
		1333	for (grep /\.ext$/, @{$_[0]}) {
		1334	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
		1335	}
		1336	};
		1337
		1338	$grp
		1339	}
1314		1340
1315	sub load_extensions {	1341	sub load_extensions {
1316	cf::sync_job {	1342	cf::sync_job {
1317	my %todo;	1343	my %todo;
1318		1344
…		…
1388		1414
1389	=back	1415	=back
1390		1416
1391	=head2 CORE EXTENSIONS	1417	=head2 CORE EXTENSIONS
1392		1418
1393	Functions and methods that extend core crossfire objects.	1419	Functions and methods that extend core deliantra objects.
1394		1420
1395	=cut	1421	=cut
1396		1422
1397	package cf::player;	1423	package cf::player;
1398		1424
…		…
1441		1467
1442	sub exists($) {	1468	sub exists($) {
1443	my ($login) = @_;	1469	my ($login) = @_;
1444		1470
1445	$cf::PLAYER{$login}	1471	$cf::PLAYER{$login}
1446	or cf::sync_job { !aio_stat path $login }	1472	or !aio_stat path $login
1447	}	1473	}
1448		1474
1449	sub find($) {	1475	sub find($) {
1450	return $cf::PLAYER{$_[0]} \|\| do {	1476	return $cf::PLAYER{$_[0]} \|\| do {
1451	my $login = $_[0];	1477	my $login = $_[0];
…		…
1622	}	1648	}
1623		1649
1624	\@paths	1650	\@paths
1625	}	1651	}
1626		1652
1627	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)	1653	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1628		1654
1629	Expand crossfire pod fragments into protocol xml.	1655	Expand deliantra pod fragments into protocol xml.
1630		1656
1631	=item $player->ext_reply ($msgid, @msg)	1657	=item $player->ext_reply ($msgid, @msg)
1632		1658
1633	Sends an ext reply to the player.	1659	Sends an ext reply to the player.
1634		1660
…		…
1847		1873
1848	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;	1874	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1849	"$UNIQUEDIR/$path"	1875	"$UNIQUEDIR/$path"
1850	}	1876	}
1851		1877
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 {	1878	sub decay_objects {
1862	my ($self) = @_;	1879	my ($self) = @_;
1863		1880
1864	return if $self->{deny_reset};	1881	return if $self->{deny_reset};
1865		1882
…		…
1947	sub find {	1964	sub find {
1948	my ($path, $origin) = @_;	1965	my ($path, $origin) = @_;
1949		1966
1950	$path = normalise $path, $origin && $origin->path;	1967	$path = normalise $path, $origin && $origin->path;
1951		1968
1952	cf::lock_wait "map_data:$path";#d#remove	1969	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1953	cf::lock_wait "map_find:$path";	1970	my $guard2 = cf::lock_acquire "map_find:$path";
1954		1971
1955	$cf::MAP{$path} \|\| do {	1972	$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	1973	my $map = new_from_path cf::map $path
1960	or return;	1974	or return;
1961		1975
1962	$map->{last_save} = $cf::RUNTIME;	1976	$map->{last_save} = $cf::RUNTIME;
1963		1977
…		…
2030		2044
2031	unless ($self->{deny_activate}) {	2045	unless ($self->{deny_activate}) {
2032	$self->decay_objects;	2046	$self->decay_objects;
2033	$self->fix_auto_apply;	2047	$self->fix_auto_apply;
2034	$self->update_buttons;	2048	$self->update_buttons;
2035	cf::cede_to_tick;
2036	$self->set_darkness_map;
2037	cf::cede_to_tick;	2049	cf::cede_to_tick;
2038	$self->activate;	2050	$self->activate;
2039	}	2051	}
2040		2052
2041	$self->{last_save} = $cf::RUNTIME;	2053	$self->{last_save} = $cf::RUNTIME;
…		…
2383		2395
2384	our $SAY_CHANNEL = {	2396	our $SAY_CHANNEL = {
2385	id => "say",	2397	id => "say",
2386	title => "Map",	2398	title => "Map",
2387	reply => "say ",	2399	reply => "say ",
2388	tooltip => "Things said to and replied from npcs near you and other players on the same map only.",	2400	tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2389	};	2401	};
2390		2402
2391	our $CHAT_CHANNEL = {	2403	our $CHAT_CHANNEL = {
2392	id => "chat",	2404	id => "chat",
2393	title => "Chat",	2405	title => "Chat",
…		…
2519		2531
2520	$map->load;	2532	$map->load;
2521	$map->load_neighbours;	2533	$map->load_neighbours;
2522		2534
2523	return unless $self->contr->active;	2535	return unless $self->contr->active;
2524	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2525	$self->activate_recursive;
2526		2536
2527	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2537	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528	$self->enter_map ($map, $x, $y);	2538	$self->enter_map ($map, $x, $y);
		2539
		2540	# only activate afterwards, to support waiting in hooks
		2541	$self->activate_recursive;
2529	}	2542	}
2530		2543
2531	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2544	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2532		2545
2533	Moves the player to the given map-path and coordinates by first freezing	2546	Moves the player to the given map-path and coordinates by first freezing
…		…
2692	$self->contr->savebed ($map, $x, $y)	2705	$self->contr->savebed ($map, $x, $y)
2693	if $exit->flag (cf::FLAG_DAMNED);	2706	if $exit->flag (cf::FLAG_DAMNED);
2694		2707
2695	1	2708	1
2696	}) {	2709	}) {
2697	$self->message ("Something went wrong deep within the crossfire server. "	2710	$self->message ("Something went wrong deep within the deliantra server. "
2698	. "I'll try to bring you back to the map you were before. "	2711	. "I'll try to bring you back to the map you were before. "
2699	. "Please report this to the dungeon master!",	2712	. "Please report this to the dungeon master!",
2700	cf::NDI_UNIQUE \| cf::NDI_RED);	2713	cf::NDI_UNIQUE \| cf::NDI_RED);
2701		2714
2702	warn "ERROR in enter_exit: $@";	2715	warn "ERROR in enter_exit: $@";
…		…
2768	id => "infobox",	2781	id => "infobox",
2769	title => "Body Parts",	2782	title => "Body Parts",
2770	reply => undef,	2783	reply => undef,
2771	tooltip => "Shows which body parts you posess and are available",	2784	tooltip => "Shows which body parts you posess and are available",
2772	},	2785	},
		2786	"c/statistics" => {
		2787	id => "infobox",
		2788	title => "Statistics",
		2789	reply => undef,
		2790	tooltip => "Shows your primary statistics",
		2791	},
		2792	"c/skills" => {
		2793	id => "infobox",
		2794	title => "Skills",
		2795	reply => undef,
		2796	tooltip => "Shows your experience per skill and item power",
		2797	},
		2798	"c/shopitems" => {
		2799	id => "infobox",
		2800	title => "Shop Items",
		2801	reply => undef,
		2802	tooltip => "Shows the items currently for sale in this shop",
		2803	},
		2804	"c/resistances" => {
		2805	id => "infobox",
		2806	title => "Resistances",
		2807	reply => undef,
		2808	tooltip => "Shows your resistances",
		2809	},
		2810	"c/pets" => {
		2811	id => "infobox",
		2812	title => "Pets",
		2813	reply => undef,
		2814	tooltip => "Shows information abotu your pets/a specific pet",
		2815	},
		2816	"c/perceiveself" => {
		2817	id => "infobox",
		2818	title => "Perceive Self",
		2819	reply => undef,
		2820	tooltip => "You gained detailed knowledge about yourself",
		2821	},
2773	"c/uptime" => {	2822	"c/uptime" => {
2774	id => "infobox",	2823	id => "infobox",
2775	title => "Uptime",	2824	title => "Uptime",
2776	reply => undef,	2825	reply => undef,
2777	tooltip => "How long the server has been running since last restart",	2826	tooltip => "How long the server has been running since last restart",
…		…
2786	id => "party",	2835	id => "party",
2787	title => "Party",	2836	title => "Party",
2788	reply => "gsay ",	2837	reply => "gsay ",
2789	tooltip => "Messages and chat related to your party",	2838	tooltip => "Messages and chat related to your party",
2790	},	2839	},
		2840	"c/death" => {
		2841	id => "death",
		2842	title => "Death",
		2843	reply => undef,
		2844	tooltip => "Reason for and more info about your most recent death",
		2845	},
		2846	"c/say" => $SAY_CHANNEL,
		2847	"c/chat" => $CHAT_CHANNEL,
2791	);	2848	);
2792		2849
2793	sub cf::client::send_msg {	2850	sub cf::client::send_msg {
2794	my ($self, $channel, $msg, $color, @extra) = @_;	2851	my ($self, $channel, $msg, $color, @extra) = @_;
2795		2852
2796	$msg = $self->pl->expand_cfpod ($msg);	2853	$msg = $self->pl->expand_cfpod ($msg)
		2854	unless $color & cf::NDI_VERBATIM;
2797		2855
2798	$color &= cf::NDI_CLIENT_MASK; # just in case...	2856	$color &= cf::NDI_CLIENT_MASK; # just in case...
2799		2857
2800	# check predefined channels, for the benefit of C	2858	# check predefined channels, for the benefit of C
2801	if ($CHANNEL{$channel}) {	2859	if ($CHANNEL{$channel}) {
2802	$channel = $CHANNEL{$channel};	2860	$channel = $CHANNEL{$channel};
2803		2861
2804	$self->ext_msg (channel_info => $channel)	2862	$self->ext_msg (channel_info => $channel);
2805	if $self->can_msg;
2806
2807	$channel = $channel->{id};	2863	$channel = $channel->{id};
2808		2864
2809	} elsif (ref $channel) {	2865	} elsif (ref $channel) {
2810	# send meta info to client, if not yet sent	2866	# send meta info to client, if not yet sent
2811	unless (exists $self->{channel}{$channel->{id}}) {	2867	unless (exists $self->{channel}{$channel->{id}}) {
2812	$self->{channel}{$channel->{id}} = $channel;	2868	$self->{channel}{$channel->{id}} = $channel;
2813	$self->ext_msg (channel_info => $channel)	2869	$self->ext_msg (channel_info => $channel);
2814	if $self->can_msg;
2815	}	2870	}
2816		2871
2817	$channel = $channel->{id};	2872	$channel = $channel->{id};
2818	}	2873	}
2819		2874
2820	return unless @extra \|\| length $msg;	2875	return unless @extra \|\| length $msg;
2821		2876
2822	if ($self->can_msg) {
2823	# default colour, mask it out	2877	# default colour, mask it out
2824	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)	2878	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
2825	if $color & cf::NDI_DEF;	2879	if $color & cf::NDI_DEF;
2826		2880
2827	my $pkt = "msg "	2881	my $pkt = "msg "
2828	. $self->{json_coder}->encode (	2882	. $self->{json_coder}->encode (
2829	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	2883	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2830	);	2884	);
2831		2885
2832	# try lzf for large packets	2886	# try lzf for large packets
2833	$pkt = "lzf " . Compress::LZF::compress $pkt	2887	$pkt = "lzf " . Compress::LZF::compress $pkt
2834	if 1024 <= length $pkt and $self->{can_lzf};	2888	if 1024 <= length $pkt and $self->{can_lzf};
2835		2889
2836	# split very large packets	2890	# split very large packets
2837	if (8192 < length $pkt and $self->{can_lzf}) {	2891	if (8192 < length $pkt and $self->{can_lzf}) {
2838	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;	2892	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2839	$pkt = "frag";	2893	$pkt = "frag";
2840	}	2894	}
2841		2895
2842	$self->send_packet ($pkt);	2896	$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	}	2897	}
2869		2898
2870	=item $client->ext_msg ($type, @msg)	2899	=item $client->ext_msg ($type, @msg)
2871		2900
2872	Sends an ext event to the client.	2901	Sends an ext event to the client.
…		…
3047	The following functions and methods are available within a safe environment:	3076	The following functions and methods are available within a safe environment:
3048		3077
3049	cf::object	3078	cf::object
3050	contr pay_amount pay_player map x y force_find force_add destroy	3079	contr pay_amount pay_player map x y force_find force_add destroy
3051	insert remove name archname title slaying race decrease split	3080	insert remove name archname title slaying race decrease split
		3081	value
3052		3082
3053	cf::object::player	3083	cf::object::player
3054	player	3084	player
3055		3085
3056	cf::player	3086	cf::player
…		…
3062	=cut	3092	=cut
3063		3093
3064	for (	3094	for (
3065	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3095	["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	3096	insert remove inv nrof name archname title slaying race
3067	decrease split destroy change_exp)],	3097	decrease split destroy change_exp value msg lore send_msg)],
3068	["cf::object::player" => qw(player)],	3098	["cf::object::player" => qw(player)],
3069	["cf::player" => qw(peaceful)],	3099	["cf::player" => qw(peaceful send_msg)],
3070	["cf::map" => qw(trigger)],	3100	["cf::map" => qw(trigger)],
3071	) {	3101	) {
3072	no strict 'refs';	3102	no strict 'refs';
3073	my ($pkg, @funs) = @$_;	3103	my ($pkg, @funs) = @$_;
3074	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3104	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
…		…
3091	my ($code, %vars) = @_;	3121	my ($code, %vars) = @_;
3092		3122
3093	my $qcode = $code;	3123	my $qcode = $code;
3094	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3124	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3095	$qcode =~ s/\n/\\n/g;	3125	$qcode =~ s/\n/\\n/g;
		3126
		3127	%vars = (_dummy => 0) unless %vars;
3096		3128
3097	local $_;	3129	local $_;
3098	local @safe::cf::_safe_eval_args = values %vars;	3130	local @safe::cf::_safe_eval_args = values %vars;
3099		3131
3100	my $eval =	3132	my $eval =
…		…
3330	reload_treasures;	3362	reload_treasures;
3331		3363
3332	warn "finished reloading resource files\n";	3364	warn "finished reloading resource files\n";
3333	}	3365	}
3334		3366
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 {	3367	sub reload_config {
3344	open my $fh, "<:utf8", "$CONFDIR/config"	3368	open my $fh, "<:utf8", "$CONFDIR/config"
3345	or return;	3369	or return;
3346		3370
3347	local $/;	3371	local $/;
…		…
3378		3402
3379	seek $fh, 0, 0;	3403	seek $fh, 0, 0;
3380	print $fh $$;	3404	print $fh $$;
3381	}	3405	}
3382		3406
		3407	sub main_loop {
		3408	warn "EV::loop starting\n";
		3409	if (1) {
		3410	EV::loop;
		3411	}
		3412	warn "EV::loop returned\n";
		3413	goto &main_loop unless $REALLY_UNLOOP;
		3414	}
		3415
3383	sub main {	3416	sub main {
3384	atomic;	3417	cf::init_globals; # initialise logging
		3418
		3419	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3420	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
		3421	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
		3422	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
		3423
		3424	cf::init_experience;
		3425	cf::init_anim;
		3426	cf::init_attackmess;
		3427	cf::init_dynamic;
		3428
		3429	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3385		3430
3386	# we must not ever block the main coroutine	3431	# we must not ever block the main coroutine
3387	local $Coro::idle = sub {	3432	local $Coro::idle = sub {
3388	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3433	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3389	(async {	3434	(async {
3390	$Coro::current->{desc} = "IDLE BUG HANDLER";	3435	$Coro::current->{desc} = "IDLE BUG HANDLER";
3391	EV::loop EV::LOOP_ONESHOT;	3436	EV::loop EV::LOOP_ONESHOT;
3392	})->prio (Coro::PRIO_MAX);	3437	})->prio (Coro::PRIO_MAX);
3393	};	3438	};
3394		3439
3395	{	3440	evthread_start IO::AIO::poll_fileno;
3396	my $guard = freeze_mainloop;	3441
		3442	cf::sync_job {
		3443	reload_resources;
3397	reload_config;	3444	reload_config;
3398	db_init;	3445	db_init;
		3446
		3447	cf::load_settings;
		3448	cf::load_materials;
		3449	cf::init_uuid;
		3450	cf::init_signals;
		3451	cf::init_commands;
		3452	cf::init_skills;
		3453
		3454	cf::init_beforeplay;
		3455
		3456	atomic;
		3457
3399	load_extensions;	3458	load_extensions;
3400		3459
3401	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3402	}
3403
3404	utime time, time, $RUNTIMEFILE;	3460	utime time, time, $RUNTIMEFILE;
3405		3461
3406	# no (long-running) fork's whatsoever before this point(!)	3462	# no (long-running) fork's whatsoever before this point(!)
		3463	use POSIX ();
3407	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3464	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3408		3465
3409	EV::loop;	3466	(pop @POST_INIT)->(0) while @POST_INIT;
		3467	};
		3468
		3469	main_loop;
3410	}	3470	}
3411		3471
3412	#############################################################################	3472	#############################################################################
3413	# initialisation and cleanup	3473	# initialisation and cleanup
3414		3474
…		…
3470	my $uuid = "$LOCALDIR/uuid";	3530	my $uuid = "$LOCALDIR/uuid";
3471		3531
3472	my $fh = aio_open "$uuid~", O_WRONLY \| O_CREAT, 0644	3532	my $fh = aio_open "$uuid~", O_WRONLY \| O_CREAT, 0644
3473	or return;	3533	or return;
3474		3534
3475	my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;	3535	my $value = uuid_seq uuid_cur;
		3536
		3537	unless ($value) {
		3538	warn "cowardly refusing to write zero uuid value!\n";
		3539	return;
		3540	}
		3541
		3542	my $value = uuid_str $value + $uuid_skip;
3476	$uuid_skip = 0;	3543	$uuid_skip = 0;
3477		3544
3478	(aio_write $fh, 0, (length $value), $value, 0) <= 0	3545	(aio_write $fh, 0, (length $value), $value, 0) <= 0
3479	and return;	3546	and return;
3480		3547
…		…
3502	}	3569	}
3503		3570
3504	sub emergency_save() {	3571	sub emergency_save() {
3505	my $freeze_guard = cf::freeze_mainloop;	3572	my $freeze_guard = cf::freeze_mainloop;
3506		3573
3507	warn "enter emergency perl save\n";	3574	warn "emergency_perl_save: enter\n";
3508		3575
3509	cf::sync_job {	3576	cf::sync_job {
		3577	# this is a trade-off: we want to be very quick here, so
		3578	# save all maps without fsync, and later call a global sync
		3579	# (which in turn might be very very slow)
		3580	local $USE_FSYNC = 0;
		3581
3510	# use a peculiar iteration method to avoid tripping on perl	3582	# use a peculiar iteration method to avoid tripping on perl
3511	# refcount bugs in for. also avoids problems with players	3583	# refcount bugs in for. also avoids problems with players
3512	# and maps saved/destroyed asynchronously.	3584	# and maps saved/destroyed asynchronously.
3513	warn "begin emergency player save\n";	3585	warn "emergency_perl_save: begin player save\n";
3514	for my $login (keys %cf::PLAYER) {	3586	for my $login (keys %cf::PLAYER) {
3515	my $pl = $cf::PLAYER{$login} or next;	3587	my $pl = $cf::PLAYER{$login} or next;
3516	$pl->valid or next;	3588	$pl->valid or next;
3517	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3589	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3518	$pl->save;	3590	$pl->save;
3519	}	3591	}
3520	warn "end emergency player save\n";	3592	warn "emergency_perl_save: end player save\n";
3521		3593
3522	warn "begin emergency map save\n";	3594	warn "emergency_perl_save: begin map save\n";
3523	for my $path (keys %cf::MAP) {	3595	for my $path (keys %cf::MAP) {
3524	my $map = $cf::MAP{$path} or next;	3596	my $map = $cf::MAP{$path} or next;
3525	$map->valid or next;	3597	$map->valid or next;
3526	$map->save;	3598	$map->save;
3527	}	3599	}
3528	warn "end emergency map save\n";	3600	warn "emergency_perl_save: end map save\n";
3529		3601
3530	warn "begin emergency database checkpoint\n";	3602	warn "emergency_perl_save: begin database checkpoint\n";
3531	BDB::db_env_txn_checkpoint $DB_ENV;	3603	BDB::db_env_txn_checkpoint $DB_ENV;
3532	warn "end emergency database checkpoint\n";	3604	warn "emergency_perl_save: end database checkpoint\n";
3533		3605
3534	warn "begin write uuid\n";	3606	warn "emergency_perl_save: begin write uuid\n";
3535	write_uuid_sync 1;	3607	write_uuid_sync 1;
3536	warn "end write uuid\n";	3608	warn "emergency_perl_save: end write uuid\n";
3537	};	3609	};
3538		3610
		3611	warn "emergency_perl_save: starting sync()\n";
		3612	IO::AIO::aio_sync sub {
		3613	warn "emergency_perl_save: finished sync()\n";
		3614	};
		3615
3539	warn "leave emergency perl save\n";	3616	warn "emergency_perl_save: leave\n";
3540	}	3617	}
3541		3618
3542	sub post_cleanup {	3619	sub post_cleanup {
3543	my ($make_core) = @_;	3620	my ($make_core) = @_;
3544		3621
…		…
3570	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3647	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3571	for my $name (keys %$leaf_symtab) {	3648	for my $name (keys %$leaf_symtab) {
3572	_gv_clear *{"$pkg$name"};	3649	_gv_clear *{"$pkg$name"};
3573	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3650	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3574	}	3651	}
3575	warn "cleared package #$pkg\n";#d#	3652	warn "cleared package $pkg\n";#d#
3576	}	3653	}
3577
3578	our $RELOAD; # how many times to reload
3579		3654
3580	sub do_reload_perl() {	3655	sub do_reload_perl() {
3581	# can/must only be called in main	3656	# can/must only be called in main
3582	if ($Coro::current != $Coro::main) {	3657	if ($Coro::current != $Coro::main) {
3583	warn "can only reload from main coroutine";	3658	warn "can only reload from main coroutine";
3584	return;	3659	return;
3585	}	3660	}
3586		3661
3587	return if $RELOAD++;	3662	return if $RELOAD++;
		3663
		3664	my $t1 = EV::time;
3588		3665
3589	while ($RELOAD) {	3666	while ($RELOAD) {
3590	warn "reloading...";	3667	warn "reloading...";
3591		3668
3592	warn "entering sync_job";	3669	warn "entering sync_job";
…		…
3653	clear_package "safe::$_"	3730	clear_package "safe::$_"
3654	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3731	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3655		3732
3656	warn "unloading cf.pm \"a bit\"";	3733	warn "unloading cf.pm \"a bit\"";
3657	delete $INC{"cf.pm"};	3734	delete $INC{"cf.pm"};
3658	delete $INC{"cf/pod.pm"};	3735	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3659		3736
3660	# don't, removes xs symbols, too,	3737	# don't, removes xs symbols, too,
3661	# and global variables created in xs	3738	# and global variables created in xs
3662	#clear_package __PACKAGE__;	3739	#clear_package __PACKAGE__;
3663		3740
…		…
3671	cf::reload_config;	3748	cf::reload_config;
3672		3749
3673	warn "loading extensions";	3750	warn "loading extensions";
3674	cf::load_extensions;	3751	cf::load_extensions;
3675		3752
		3753	if ($REATTACH_ON_RELOAD) {
3676	warn "reattaching attachments to objects/players";	3754	warn "reattaching attachments to objects/players";
3677	_global_reattach; # objects, sockets	3755	_global_reattach; # objects, sockets
3678	warn "reattaching attachments to maps";	3756	warn "reattaching attachments to maps";
3679	reattach $_ for values %MAP;	3757	reattach $_ for values %MAP;
3680	warn "reattaching attachments to players";	3758	warn "reattaching attachments to players";
3681	reattach $_ for values %PLAYER;	3759	reattach $_ for values %PLAYER;
		3760	}
		3761
		3762	warn "running post_init jobs";
		3763	(pop @POST_INIT)->(1) while @POST_INIT;
3682		3764
3683	warn "leaving sync_job";	3765	warn "leaving sync_job";
3684		3766
3685	1	3767	1
3686	} or do {	3768	} or do {
…		…
3689	};	3771	};
3690		3772
3691	warn "reloaded";	3773	warn "reloaded";
3692	--$RELOAD;	3774	--$RELOAD;
3693	}	3775	}
		3776
		3777	$t1 = EV::time - $t1;
		3778	warn "reload completed in ${t1}s\n";
3694	};	3779	};
3695		3780
3696	our $RELOAD_WATCHER; # used only during reload	3781	our $RELOAD_WATCHER; # used only during reload
3697		3782
3698	sub reload_perl() {	3783	sub reload_perl() {
3699	# doing reload synchronously and two reloads happen back-to-back,	3784	# doing reload synchronously and two reloads happen back-to-back,
3700	# coro crashes during coro_state_free->destroy here.	3785	# coro crashes during coro_state_free->destroy here.
3701		3786
		3787	$RELOAD_WATCHER \|\|= cf::async {
		3788	Coro::AIO::aio_wait cache_extensions;
		3789
3702	$RELOAD_WATCHER \|\|= EV::timer 0, 0, sub {	3790	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3703	do_reload_perl;	3791	do_reload_perl;
3704	undef $RELOAD_WATCHER;	3792	undef $RELOAD_WATCHER;
		3793	};
3705	};	3794	};
3706	}	3795	}
3707		3796
3708	register_command "reload" => sub {	3797	register_command "reload" => sub {
3709	my ($who, $arg) = @_;	3798	my ($who, $arg) = @_;
…		…
3868	LOG llevInfo, "[ABT] [suppressed]\n";	3957	LOG llevInfo, "[ABT] [suppressed]\n";
3869	}	3958	}
3870	}	3959	}
3871		3960
3872	# load additional modules	3961	# load additional modules
3873	use cf::pod;	3962	require "cf/$_.pm" for @EXTRA_MODULES;
3874		3963
3875	END { cf::emergency_save }	3964	END { cf::emergency_save }
3876		3965
3877	1	3966	1
3878		3967

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.477 by root, Wed Sep 2 22:52:36 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.477 by root, Wed Sep 2 22:52:36 2009 UTC