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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.428 by root, Thu May 1 06:33:19 2008 UTC vs.
Revision 1.474 by root, Thu Jul 16 21:42:56 2009 UTC

…		…
19	# The authors can be reached via e-mail to <support@deliantra.net>	19	# The authors can be reached via e-mail to <support@deliantra.net>
20	#	20	#
21		21
22	package cf;	22	package cf;
23		23
		24	use 5.10.0;
24	use utf8;	25	use utf8;
25	use strict;	26	use strict qw(vars subs);
26		27
27	use Symbol;	28	use Symbol;
28	use List::Util;	29	use List::Util;
29	use Socket;	30	use Socket;
30	use EV 3.2;	31	use EV;
31	use Opcode;	32	use Opcode;
32	use Safe;	33	use Safe;
33	use Safe::Hole;	34	use Safe::Hole;
34	use Storable ();	35	use Storable ();
35		36
		37	use Guard ();
36	use Coro 4.50 ();	38	use Coro ();
37	use Coro::State;	39	use Coro::State;
38	use Coro::Handle;	40	use Coro::Handle;
39	use Coro::EV;	41	use Coro::EV;
		42	use Coro::AnyEvent;
40	use Coro::Timer;	43	use Coro::Timer;
41	use Coro::Signal;	44	use Coro::Signal;
42	use Coro::Semaphore;	45	use Coro::Semaphore;
		46	use Coro::SemaphoreSet;
		47	use Coro::AnyEvent;
43	use Coro::AIO;	48	use Coro::AIO;
44	use Coro::BDB;	49	use Coro::BDB 1.6;
45	use Coro::Storable;	50	use Coro::Storable;
46	use Coro::Util ();	51	use Coro::Util ();
47		52
48	use JSON::XS 2.01 ();	53	use JSON::XS 2.01 ();
49	use BDB ();	54	use BDB ();
50	use Data::Dumper;	55	use Data::Dumper;
51	use Digest::MD5;	56	use Digest::MD5;
52	use Fcntl;	57	use Fcntl;
53	use YAML ();	58	use YAML ();
54	use IO::AIO 2.51 ();	59	use IO::AIO ();
55	use Time::HiRes;	60	use Time::HiRes;
56	use Compress::LZF;	61	use Compress::LZF;
57	use Digest::MD5 ();	62	use Digest::MD5 ();
		63
		64	AnyEvent::detect;
58		65
59	# configure various modules to our taste	66	# configure various modules to our taste
60	#	67	#
61	$Storable::canonical = 1; # reduce rsync transfers	68	$Storable::canonical = 1; # reduce rsync transfers
62	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";
63	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
64		76
65	$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" };
66		79
67	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	80	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68		81
69	our %COMMAND = ();	82	our %COMMAND = ();
70	our %COMMAND_TIME = ();	83	our %COMMAND_TIME = ();
…		…
73	our %EXTCMD = ();	86	our %EXTCMD = ();
74	our %EXTICMD = ();	87	our %EXTICMD = ();
75	our %EXT_CORO = (); # coroutines bound to extensions	88	our %EXT_CORO = (); # coroutines bound to extensions
76	our %EXT_MAP = (); # pluggable maps	89	our %EXT_MAP = (); # pluggable maps
77		90
78	our $RELOAD; # number of reloads so far	91	our $RELOAD; # number of reloads so far, non-zero while in reload
79	our @EVENT;	92	our @EVENT;
80		93
81	our $CONFDIR = confdir;	94	our $CONFDIR = confdir;
82	our $DATADIR = datadir;	95	our $DATADIR = datadir;
83	our $LIBDIR = "$DATADIR/ext";	96	our $LIBDIR = "$DATADIR/ext";
84	our $PODDIR = "$DATADIR/pod";	97	our $PODDIR = "$DATADIR/pod";
85	our $MAPDIR = "$DATADIR/" . mapdir;	98	our $MAPDIR = "$DATADIR/" . mapdir;
86	our $LOCALDIR = localdir;	99	our $LOCALDIR = localdir;
87	our $TMPDIR = "$LOCALDIR/" . tmpdir;	100	our $TMPDIR = "$LOCALDIR/" . tmpdir;
88	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	101	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	102	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90	our $RANDOMDIR = "$LOCALDIR/random";	103	our $RANDOMDIR = "$LOCALDIR/random";
91	our $BDBDIR = "$LOCALDIR/db";	104	our $BDBDIR = "$LOCALDIR/db";
		105	our $PIDFILE = "$LOCALDIR/pid";
		106	our $RUNTIMEFILE = "$LOCALDIR/runtime";
		107
92	our %RESOURCE;	108	our %RESOURCE;
93		109
94	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	110	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95	our $AIO_POLL_WATCHER;
96	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	111	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97	our $NEXT_TICK;	112	our $NEXT_TICK;
98	our $USE_FSYNC = 1; # use fsync to write maps - default off	113	our $USE_FSYNC = 1; # use fsync to write maps - default on
99		114
100	our $BDB_POLL_WATCHER;
101	our $BDB_DEADLOCK_WATCHER;	115	our $BDB_DEADLOCK_WATCHER;
102	our $BDB_CHECKPOINT_WATCHER;	116	our $BDB_CHECKPOINT_WATCHER;
103	our $BDB_TRICKLE_WATCHER;	117	our $BDB_TRICKLE_WATCHER;
104	our $DB_ENV;	118	our $DB_ENV;
105		119
		120	our @EXTRA_MODULES = qw(pod mapscript);
		121
106	our %CFG;	122	our %CFG;
107		123
108	our $UPTIME; $UPTIME \|\|= time;	124	our $UPTIME; $UPTIME \|\|= time;
109	our $RUNTIME;	125	our $RUNTIME;
110	our $NOW;	126	our $NOW;
…		…
119	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)
120	our $LOADAVG; # same thing, but with alpha-smoothing	136	our $LOADAVG; # same thing, but with alpha-smoothing
121	our $JITTER; # average jitter	137	our $JITTER; # average jitter
122	our $TICK_START; # for load detecting purposes	138	our $TICK_START; # for load detecting purposes
123		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 :)
		144
124	binmode STDOUT;	145	binmode STDOUT;
125	binmode STDERR;	146	binmode STDERR;
126		147
127	# read virtual server time, if available	148	# read virtual server time, if available
128	unless ($RUNTIME \|\| !-e "$LOCALDIR/runtime") {	149	unless ($RUNTIME \|\| !-e $RUNTIMEFILE) {
129	open my $fh, "<", "$LOCALDIR/runtime"	150	open my $fh, "<", $RUNTIMEFILE
130	or die "unable to read runtime file: $!";	151	or die "unable to read $RUNTIMEFILE file: $!";
131	$RUNTIME = <$fh> + 0.;	152	$RUNTIME = <$fh> + 0.;
132	}	153	}
		154
		155	eval "sub TICK() { $TICK } 1" or die;
133		156
134	mkdir $_	157	mkdir $_
135	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	158	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136		159
137	our $EMERGENCY_POSITION;	160	our $EMERGENCY_POSITION;
…		…
242	for my $pkg (qw(	265	for my $pkg (qw(
243	cf::global cf::attachable	266	cf::global cf::attachable
244	cf::object cf::object::player	267	cf::object cf::object::player
245	cf::client cf::player	268	cf::client cf::player
246	cf::arch cf::living	269	cf::arch cf::living
		270	cf::map cf::mapspace
247	cf::map cf::party cf::region	271	cf::party cf::region
248	)) {	272	)) {
249	no strict 'refs';
250	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	273	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251	}	274	}
252		275
253	$EV::DIED = sub {	276	$EV::DIED = sub {
254	warn "error in event callback: @_";	277	warn "error in event callback: @_";
…		…
296	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	319	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297		320
298	sub encode_json($) { $json_coder->encode ($_[0]) }	321	sub encode_json($) { $json_coder->encode ($_[0]) }
299	sub decode_json($) { $json_coder->decode ($_[0]) }	322	sub decode_json($) { $json_coder->decode ($_[0]) }
300		323
		324	=item cf::post_init { BLOCK }
		325
		326	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
		327	but I<before> the server starts ticking again.
		328
		329	The cdoeblock will have a single boolean argument to indicate whether this
		330	is a reload or not.
		331
		332	=cut
		333
		334	sub post_init(&) {
		335	push @POST_INIT, shift;
		336	}
		337
301	=item cf::lock_wait $string	338	=item cf::lock_wait $string
302		339
303	Wait until the given lock is available. See cf::lock_acquire.	340	Wait until the given lock is available. See cf::lock_acquire.
304		341
305	=item my $lock = cf::lock_acquire $string	342	=item my $lock = cf::lock_acquire $string
306		343
307	Wait until the given lock is available and then acquires it and returns	344	Wait until the given lock is available and then acquires it and returns
308	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	345	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309	for example when the coroutine gets canceled), the lock is automatically	346	for example when the coroutine gets canceled), the lock is automatically
310	returned.	347	returned.
311		348
312	Locks are not recursive, locking from the same coro twice results in a	349	Locks are not recursive, locking from the same coro twice results in a
313	deadlocked coro.	350	deadlocked coro.
…		…
319		356
320	Return true if the lock is currently active, i.e. somebody has locked it.	357	Return true if the lock is currently active, i.e. somebody has locked it.
321		358
322	=cut	359	=cut
323		360
324	our %LOCK;	361	our $LOCKS = new Coro::SemaphoreSet;
325	our %LOCKER;#d#
326		362
327	sub lock_wait($) {	363	sub lock_wait($) {
328	my ($key) = @_;	364	$LOCKS->wait ($_[0]);
329
330	if ($LOCKER{$key} == $Coro::current) {#d#
331	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332	return;#d#
333	}#d#
334
335	# wait for lock, if any
336	while ($LOCK{$key}) {
337	push @{ $LOCK{$key} }, $Coro::current;
338	Coro::schedule;
339	}
340	}	365	}
341		366
342	sub lock_acquire($) {	367	sub lock_acquire($) {
343	my ($key) = @_;	368	$LOCKS->guard ($_[0])
344
345	# wait, to be sure we are not locked
346	lock_wait $key;
347
348	$LOCK{$key} = [];
349	$LOCKER{$key} = $Coro::current;#d#
350
351	Coro::guard {
352	delete $LOCKER{$key};#d#
353	# wake up all waiters, to be on the safe side
354	$_->ready for @{ delete $LOCK{$key} };
355	}
356	}	369	}
357		370
358	sub lock_active($) {	371	sub lock_active($) {
359	my ($key) = @_;	372	$LOCKS->count ($_[0]) < 1
360
361	! ! $LOCK{$key}
362	}	373	}
363		374
364	sub freeze_mainloop {	375	sub freeze_mainloop {
365	tick_inhibit_inc;	376	tick_inhibit_inc;
366		377
367	Coro::guard \&tick_inhibit_dec;	378	&Guard::guard (\&tick_inhibit_dec);
368	}	379	}
369		380
370	=item cf::periodic $interval, $cb	381	=item cf::periodic $interval, $cb
371		382
372	Like EV::periodic, but randomly selects a starting point so that the actions	383	Like EV::periodic, but randomly selects a starting point so that the actions
…		…
724		735
725	#############################################################################	736	#############################################################################
726		737
727	=head2 ATTACHABLE OBJECTS	738	=head2 ATTACHABLE OBJECTS
728		739
729	Many objects in crossfire are so-called attachable objects. That means you can	740	Many objects in deliantra are so-called attachable objects. That means you can
730	attach callbacks/event handlers (a collection of which is called an "attachment")	741	attach callbacks/event handlers (a collection of which is called an "attachment")
731	to it. All such attachable objects support the following methods.	742	to it. All such attachable objects support the following methods.
732		743
733	In the following description, CLASS can be any of C<global>, C<object>	744	In the following description, CLASS can be any of C<global>, C<object>
734	C<player>, C<client> or C<map> (i.e. the attachable objects in	745	C<player>, C<client> or C<map> (i.e. the attachable objects in
…		…
784	=item cf::CLASS::attachment $name, ...	795	=item cf::CLASS::attachment $name, ...
785		796
786	Register an attachment by C<$name> through which attachable objects of the	797	Register an attachment by C<$name> through which attachable objects of the
787	given CLASS can refer to this attachment.	798	given CLASS can refer to this attachment.
788		799
789	Some classes such as crossfire maps and objects can specify attachments	800	Some classes such as deliantra maps and objects can specify attachments
790	that are attached at load/instantiate time, thus the need for a name.	801	that are attached at load/instantiate time, thus the need for a name.
791		802
792	These calls expect any number of the following handler/hook descriptions:	803	These calls expect any number of the following handler/hook descriptions:
793		804
794	=over 4	805	=over 4
…		…
1085		1096
1086	sub reattach {	1097	sub reattach {
1087	# basically do the same as instantiate, without calling instantiate	1098	# basically do the same as instantiate, without calling instantiate
1088	my ($obj) = @_;	1099	my ($obj) = @_;
1089		1100
		1101	# no longer needed after getting rid of delete_package?
1090	bless $obj, ref $obj; # re-bless in case extensions have been reloaded	1102	#bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091		1103
1092	my $registry = $obj->registry;	1104	my $registry = $obj->registry;
1093		1105
1094	@$registry = ();	1106	@$registry = ();
1095		1107
…		…
1143	$decname, length $$rdata, scalar @$objs;	1155	$decname, length $$rdata, scalar @$objs;
1144		1156
1145	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1157	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
1146	aio_chmod $fh, SAVE_MODE;	1158	aio_chmod $fh, SAVE_MODE;
1147	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1159	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148	aio_fsync $fh if $cf::USE_FSYNC;	1160	if ($cf::USE_FSYNC) {
		1161	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;
		1162	aio_fsync $fh;
		1163	}
1149	aio_close $fh;	1164	aio_close $fh;
1150		1165
1151	if (@$objs) {	1166	if (@$objs) {
1152	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {	1167	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {
1153	aio_chmod $fh, SAVE_MODE;	1168	aio_chmod $fh, SAVE_MODE;
1154	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1169	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155	aio_write $fh, 0, (length $data), $data, 0;	1170	aio_write $fh, 0, (length $data), $data, 0;
1156	aio_fsync $fh if $cf::USE_FSYNC;	1171	if ($cf::USE_FSYNC) {
		1172	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;
		1173	aio_fsync $fh;
		1174	}
1157	aio_close $fh;	1175	aio_close $fh;
1158	aio_rename "$filename.pst~", "$filename.pst";	1176	aio_rename "$filename.pst~", "$filename.pst";
1159	}	1177	}
1160	} else {	1178	} else {
1161	aio_unlink "$filename.pst";	1179	aio_unlink "$filename.pst";
1162	}	1180	}
1163		1181
1164	aio_rename "$filename~", $filename;	1182	aio_rename "$filename~", $filename;
		1183
		1184	$filename =~ s%/[^/]+$%%;
		1185	aio_pathsync $filename if $cf::USE_FSYNC;
1165	} else {	1186	} else {
1166	warn "FATAL: $filename~: $!\n";	1187	warn "unable to save objects: $filename~: $!\n";
1167	}	1188	}
1168	} else {	1189	} else {
1169	aio_unlink $filename;	1190	aio_unlink $filename;
1170	aio_unlink "$filename.pst";	1191	aio_unlink "$filename.pst";
1171	}	1192	}
…		…
1262	my ($name, $cb) = @_;	1283	my ($name, $cb) = @_;
1263		1284
1264	$EXTICMD{$name} = $cb;	1285	$EXTICMD{$name} = $cb;
1265	}	1286	}
1266		1287
		1288	use File::Glob ();
		1289
1267	cf::player->attach (	1290	cf::player->attach (
1268	on_command => sub {	1291	on_command => sub {
1269	my ($pl, $name, $params) = @_;	1292	my ($pl, $name, $params) = @_;
1270		1293
1271	my $cb = $COMMAND{$name}	1294	my $cb = $COMMAND{$name}
…		…
1303		1326
1304	cf::override;	1327	cf::override;
1305	},	1328	},
1306	);	1329	);
1307		1330
		1331	# "readahead" all extensions
		1332	sub cache_extensions {
		1333	my $grp = IO::AIO::aio_group;
		1334
		1335	add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
		1336	for (grep /\.ext$/, @{$_[0]}) {
		1337	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
		1338	}
		1339	};
		1340
		1341	$grp
		1342	}
		1343
1308	sub load_extensions {	1344	sub load_extensions {
1309	cf::sync_job {	1345	cf::sync_job {
1310	my %todo;	1346	my %todo;
1311		1347
1312	for my $path (<$LIBDIR/*.ext>) {	1348	for my $path (<$LIBDIR/*.ext>) {
…		…
1331		1367
1332	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1368	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333	if $source =~ /\A#!.?perl.?#\s(.)$/m;	1369	if $source =~ /\A#!.?perl.?#\s(.)$/m;
1334		1370
1335	$ext{source} =	1371	$ext{source} =
1336	"package $pkg; use strict; use utf8;\n"	1372	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337	. "#line 1 \"$path\"\n{\n"	1373	. "#line 1 \"$path\"\n{\n"
1338	. $source	1374	. $source
1339	. "\n};\n1";	1375	. "\n};\n1";
1340		1376
1341	$todo{$base} = \%ext;	1377	$todo{$base} = \%ext;
…		…
1381		1417
1382	=back	1418	=back
1383		1419
1384	=head2 CORE EXTENSIONS	1420	=head2 CORE EXTENSIONS
1385		1421
1386	Functions and methods that extend core crossfire objects.	1422	Functions and methods that extend core deliantra objects.
1387		1423
1388	=cut	1424	=cut
1389		1425
1390	package cf::player;	1426	package cf::player;
1391		1427
…		…
1434		1470
1435	sub exists($) {	1471	sub exists($) {
1436	my ($login) = @_;	1472	my ($login) = @_;
1437		1473
1438	$cf::PLAYER{$login}	1474	$cf::PLAYER{$login}
1439	or cf::sync_job { !aio_stat path $login }	1475	or !aio_stat path $login
1440	}	1476	}
1441		1477
1442	sub find($) {	1478	sub find($) {
1443	return $cf::PLAYER{$_[0]} \|\| do {	1479	return $cf::PLAYER{$_[0]} \|\| do {
1444	my $login = $_[0];	1480	my $login = $_[0];
…		…
1519	my ($pl) = @_;	1555	my ($pl) = @_;
1520		1556
1521	my $name = $pl->ob->name;	1557	my $name = $pl->ob->name;
1522		1558
1523	$pl->{deny_save} = 1;	1559	$pl->{deny_save} = 1;
1524	$pl->password ("*"); # this should lock out the player until we nuked the dir	1560	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1525		1561
1526	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1562	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1527	$pl->deactivate;	1563	$pl->deactivate;
		1564	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
		1565	$pl->ob->check_score;
1528	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1566	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1529	$pl->ns->destroy if $pl->ns;	1567	$pl->ns->destroy if $pl->ns;
1530		1568
1531	my $path = playerdir $pl;	1569	my $path = playerdir $pl;
1532	my $temp = "$path~$cf::RUNTIME~deleting~";	1570	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1613	}	1651	}
1614		1652
1615	\@paths	1653	\@paths
1616	}	1654	}
1617		1655
1618	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)	1656	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1619		1657
1620	Expand crossfire pod fragments into protocol xml.	1658	Expand deliantra pod fragments into protocol xml.
1621
1622	=cut
1623
1624	use re 'eval';
1625
1626	my $group;
1627	my $interior; $interior = qr{
1628	# match a pod interior sequence sans C<< >>
1629	(?:
1630	\ (.*?)\ (?{ $group = $^N })
1631	\| < (??{$interior}) >
1632	)
1633	}x;
1634
1635	sub expand_cfpod {
1636	my ($self, $pod) = @_;
1637
1638	my $xml;
1639
1640	while () {
1641	if ($pod =~ /\G( (?: [^BCGHITU]+ \| .(?!<) )+ )/xgcs) {
1642	$group = $1;
1643
1644	$group =~ s/&/&/g;
1645	$group =~ s/</</g;
1646
1647	$xml .= $group;
1648	} elsif ($pod =~ m%\G
1649	([BCGHITU])
1650	<
1651	(?:
1652	([^<>]*) (?{ $group = $^N })
1653	\| < $interior >
1654	)
1655	>
1656	%gcsx
1657	) {
1658	my ($code, $data) = ($1, $group);
1659
1660	if ($code eq "B") {
1661	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1662	} elsif ($code eq "I") {
1663	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1664	} elsif ($code eq "U") {
1665	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1666	} elsif ($code eq "C") {
1667	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1668	} elsif ($code eq "T") {
1669	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1670	} elsif ($code eq "G") {
1671	my ($male, $female) = split /\\|/, $data;
1672	$data = $self->gender ? $female : $male;
1673	$xml .= expand_cfpod ($self, $data);
1674	} elsif ($code eq "H") {
1675	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1676	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1677	"")
1678	[$self->{hintmode}];
1679	} else {
1680	$xml .= "error processing '$code($data)' directive";
1681	}
1682	} else {
1683	if ($pod =~ /\G(.+)/) {
1684	warn "parse error while expanding $pod (at $1)";
1685	}
1686	last;
1687	}
1688	}
1689
1690	for ($xml) {
1691	# create single paragraphs (very hackish)
1692	s/(?<=\S)\n(?=\w)/ /g;
1693
1694	# compress some whitespace
1695	s/\s+\n/\n/g; # ws line-ends
1696	s/\n\n+/\n/g; # double lines
1697	s/^\n+//; # beginning lines
1698	s/\n+$//; # ending lines
1699	}
1700
1701	$xml
1702	}
1703
1704	no re 'eval';
1705
1706	sub hintmode {
1707	$_[0]{hintmode} = $_[1] if @_ > 1;
1708	$_[0]{hintmode}
1709	}
1710		1659
1711	=item $player->ext_reply ($msgid, @msg)	1660	=item $player->ext_reply ($msgid, @msg)
1712		1661
1713	Sends an ext reply to the player.	1662	Sends an ext reply to the player.
1714		1663
…		…
1927		1876
1928	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;	1877	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1929	"$UNIQUEDIR/$path"	1878	"$UNIQUEDIR/$path"
1930	}	1879	}
1931		1880
1932	# and all this just because we cannot iterate over
1933	# all maps in C++...
1934	sub change_all_map_light {
1935	my ($change) = @_;
1936
1937	$_->change_map_light ($change)
1938	for grep $_->outdoor, values %cf::MAP;
1939	}
1940
1941	sub decay_objects {	1881	sub decay_objects {
1942	my ($self) = @_;	1882	my ($self) = @_;
1943		1883
1944	return if $self->{deny_reset};	1884	return if $self->{deny_reset};
1945		1885
…		…
2027	sub find {	1967	sub find {
2028	my ($path, $origin) = @_;	1968	my ($path, $origin) = @_;
2029		1969
2030	$path = normalise $path, $origin && $origin->path;	1970	$path = normalise $path, $origin && $origin->path;
2031		1971
2032	cf::lock_wait "map_data:$path";#d#remove	1972	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2033	cf::lock_wait "map_find:$path";	1973	my $guard2 = cf::lock_acquire "map_find:$path";
2034		1974
2035	$cf::MAP{$path} \|\| do {	1975	$cf::MAP{$path} \|\| do {
2036	my $guard1 = cf::lock_acquire "map_find:$path";
2037	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2038
2039	my $map = new_from_path cf::map $path	1976	my $map = new_from_path cf::map $path
2040	or return;	1977	or return;
2041		1978
2042	$map->{last_save} = $cf::RUNTIME;	1979	$map->{last_save} = $cf::RUNTIME;
2043		1980
…		…
2045	or return;	1982	or return;
2046		1983
2047	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1984	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2048	# doing this can freeze the server in a sync job, obviously	1985	# doing this can freeze the server in a sync job, obviously
2049	#$cf::WAIT_FOR_TICK->wait;	1986	#$cf::WAIT_FOR_TICK->wait;
		1987	undef $guard2;
2050	undef $guard1;	1988	undef $guard1;
2051	undef $guard2;
2052	$map->reset;	1989	$map->reset;
2053	return find $path;	1990	return find $path;
2054	}	1991	}
2055		1992
2056	$cf::MAP{$path} = $map	1993	$cf::MAP{$path} = $map
…		…
2083	my $f = new_from_file cf::object::thawer $self->{load_path};	2020	my $f = new_from_file cf::object::thawer $self->{load_path};
2084	$f->skip_block;	2021	$f->skip_block;
2085	$self->_load_objects ($f)	2022	$self->_load_objects ($f)
2086	or return;	2023	or return;
2087		2024
2088	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2025	$self->post_load_original
2089	if delete $self->{load_original};	2026	if delete $self->{load_original};
2090		2027
2091	if (my $uniq = $self->uniq_path) {	2028	if (my $uniq = $self->uniq_path) {
2092	utf8::encode $uniq;	2029	utf8::encode $uniq;
2093	unless (aio_stat $uniq) {	2030	unless (aio_stat $uniq) {
…		…
2110		2047
2111	unless ($self->{deny_activate}) {	2048	unless ($self->{deny_activate}) {
2112	$self->decay_objects;	2049	$self->decay_objects;
2113	$self->fix_auto_apply;	2050	$self->fix_auto_apply;
2114	$self->update_buttons;	2051	$self->update_buttons;
2115	cf::cede_to_tick;
2116	$self->set_darkness_map;
2117	cf::cede_to_tick;	2052	cf::cede_to_tick;
2118	$self->activate;	2053	$self->activate;
2119	}	2054	}
2120		2055
2121	$self->{last_save} = $cf::RUNTIME;	2056	$self->{last_save} = $cf::RUNTIME;
…		…
2463		2398
2464	our $SAY_CHANNEL = {	2399	our $SAY_CHANNEL = {
2465	id => "say",	2400	id => "say",
2466	title => "Map",	2401	title => "Map",
2467	reply => "say ",	2402	reply => "say ",
2468	tooltip => "Things said to and replied from npcs near you and other players on the same map only.",	2403	tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2469	};	2404	};
2470		2405
2471	our $CHAT_CHANNEL = {	2406	our $CHAT_CHANNEL = {
2472	id => "chat",	2407	id => "chat",
2473	title => "Chat",	2408	title => "Chat",
…		…
2528		2463
2529	=item $player_object->enter_link	2464	=item $player_object->enter_link
2530		2465
2531	Freezes the player and moves him/her to a special map (C<{link}>).	2466	Freezes the player and moves him/her to a special map (C<{link}>).
2532		2467
2533	The player should be reasonably safe there for short amounts of time. You	2468	The player should be reasonably safe there for short amounts of time (e.g.
2534	I<MUST> call C<leave_link> as soon as possible, though.	2469	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
		2470	though, as the palyer cannot control the character while it is on the link
		2471	map.
2535		2472
2536	Will never block.	2473	Will never block.
2537		2474
2538	=item $player_object->leave_link ($map, $x, $y)	2475	=item $player_object->leave_link ($map, $x, $y)
2539		2476
…		…
2597		2534
2598	$map->load;	2535	$map->load;
2599	$map->load_neighbours;	2536	$map->load_neighbours;
2600		2537
2601	return unless $self->contr->active;	2538	return unless $self->contr->active;
		2539	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2602	$self->activate_recursive;	2540	$self->activate_recursive;
2603		2541
2604	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2542	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2605	$self->enter_map ($map, $x, $y);	2543	$self->enter_map ($map, $x, $y);
2606	}	2544	}
…		…
2610	Moves the player to the given map-path and coordinates by first freezing	2548	Moves the player to the given map-path and coordinates by first freezing
2611	her, loading and preparing them map, calling the provided $check callback	2549	her, loading and preparing them map, calling the provided $check callback
2612	that has to return the map if sucecssful, and then unfreezes the player on	2550	that has to return the map if sucecssful, and then unfreezes the player on
2613	the new (success) or old (failed) map position. In either case, $done will	2551	the new (success) or old (failed) map position. In either case, $done will
2614	be called at the end of this process.	2552	be called at the end of this process.
		2553
		2554	Note that $check will be called with a potentially non-loaded map, so if
		2555	it needs a loaded map it has to call C<< ->load >>.
2615		2556
2616	=cut	2557	=cut
2617		2558
2618	our $GOTOGEN;	2559	our $GOTOGEN;
2619		2560
…		…
2698	}	2639	}
2699		2640
2700	sub prepare_random_map {	2641	sub prepare_random_map {
2701	my ($exit) = @_;	2642	my ($exit) = @_;
2702		2643
2703	my $guard = cf::lock_acquire "exit_prepare:$exit";
2704
2705	# all this does is basically replace the /! path by	2644	# all this does is basically replace the /! path by
2706	# a new random map path (?random/...) with a seed	2645	# a new random map path (?random/...) with a seed
2707	# that depends on the exit object	2646	# that depends on the exit object
2708		2647
2709	my $rmp = parse_random_map_params $exit->msg;	2648	my $rmp = parse_random_map_params $exit->msg;
…		…
2711	if ($exit->map) {	2650	if ($exit->map) {
2712	$rmp->{region} = $exit->region->name;	2651	$rmp->{region} = $exit->region->name;
2713	$rmp->{origin_map} = $exit->map->path;	2652	$rmp->{origin_map} = $exit->map->path;
2714	$rmp->{origin_x} = $exit->x;	2653	$rmp->{origin_x} = $exit->x;
2715	$rmp->{origin_y} = $exit->y;	2654	$rmp->{origin_y} = $exit->y;
		2655
		2656	$exit->map->touch;
2716	}	2657	}
2717		2658
2718	$rmp->{random_seed} \|\|= $exit->random_seed;	2659	$rmp->{random_seed} \|\|= $exit->random_seed;
2719		2660
2720	my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);	2661	my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
…		…
2724	if (my $fh = aio_open "$meta~", O_WRONLY \| O_CREAT, 0666) {	2665	if (my $fh = aio_open "$meta~", O_WRONLY \| O_CREAT, 0666) {
2725	aio_write $fh, 0, (length $data), $data, 0;	2666	aio_write $fh, 0, (length $data), $data, 0;
2726	undef $fh;	2667	undef $fh;
2727	aio_rename "$meta~", $meta;	2668	aio_rename "$meta~", $meta;
2728		2669
		2670	my $slaying = "?random/$md5";
		2671
		2672	if ($exit->valid) {
2729	$exit->slaying ("?random/$md5");	2673	$exit->slaying ("?random/$md5");
2730	$exit->msg (undef);	2674	$exit->msg (undef);
		2675	}
2731	}	2676	}
2732	}	2677	}
2733		2678
2734	sub cf::object::player::enter_exit {	2679	sub cf::object::player::enter_exit {
2735	my ($self, $exit) = @_;	2680	my ($self, $exit) = @_;
2736		2681
2737	return unless $self->type == cf::PLAYER;	2682	return unless $self->type == cf::PLAYER;
2738		2683
2739	if ($exit->slaying eq "/!") {
2740	#TODO: this should de-fi-ni-te-ly not be a sync-job
2741	# the problem is that $exit might not survive long enough
2742	# so it needs to be done right now, right here
2743	cf::sync_job { prepare_random_map $exit };
2744	}
2745
2746	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2747	my $hp = $exit->stats->hp;
2748	my $sp = $exit->stats->sp;
2749
2750	$self->enter_link;	2684	$self->enter_link;
2751		2685
2752	# if exit is damned, update players death & WoR home-position
2753	$self->contr->savebed ($slaying, $hp, $sp)
2754	if $exit->flag (FLAG_DAMNED);
2755
2756	(async {	2686	(async {
2757	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";	2687	$Coro::current->{desc} = "enter_exit";
2758		2688
2759	$self->deactivate_recursive; # just to be sure
2760	unless (eval {	2689	unless (eval {
		2690	$self->deactivate_recursive; # just to be sure
		2691
		2692	# random map handling
		2693	{
		2694	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2695
		2696	prepare_random_map $exit
		2697	if $exit->slaying eq "/!";
		2698	}
		2699
		2700	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
		2701	my $x = $exit->stats->hp;
		2702	my $y = $exit->stats->sp;
		2703
2761	$self->goto ($slaying, $hp, $sp);	2704	$self->goto ($map, $x, $y);
2762		2705
		2706	# if exit is damned, update players death & WoR home-position
		2707	$self->contr->savebed ($map, $x, $y)
		2708	if $exit->flag (cf::FLAG_DAMNED);
		2709
2763	1;	2710	1
2764	}) {	2711	}) {
2765	$self->message ("Something went wrong deep within the crossfire server. "	2712	$self->message ("Something went wrong deep within the deliantra server. "
2766	. "I'll try to bring you back to the map you were before. "	2713	. "I'll try to bring you back to the map you were before. "
2767	. "Please report this to the dungeon master!",	2714	. "Please report this to the dungeon master!",
2768	cf::NDI_UNIQUE \| cf::NDI_RED);	2715	cf::NDI_UNIQUE \| cf::NDI_RED);
2769		2716
2770	warn "ERROR in enter_exit: $@";	2717	warn "ERROR in enter_exit: $@";
…		…
2836	id => "infobox",	2783	id => "infobox",
2837	title => "Body Parts",	2784	title => "Body Parts",
2838	reply => undef,	2785	reply => undef,
2839	tooltip => "Shows which body parts you posess and are available",	2786	tooltip => "Shows which body parts you posess and are available",
2840	},	2787	},
		2788	"c/statistics" => {
		2789	id => "infobox",
		2790	title => "Statistics",
		2791	reply => undef,
		2792	tooltip => "Shows your primary statistics",
		2793	},
		2794	"c/skills" => {
		2795	id => "infobox",
		2796	title => "Skills",
		2797	reply => undef,
		2798	tooltip => "Shows your experience per skill and item power",
		2799	},
		2800	"c/shopitems" => {
		2801	id => "infobox",
		2802	title => "Shop Items",
		2803	reply => undef,
		2804	tooltip => "Shows the items currently for sale in this shop",
		2805	},
		2806	"c/resistances" => {
		2807	id => "infobox",
		2808	title => "Resistances",
		2809	reply => undef,
		2810	tooltip => "Shows your resistances",
		2811	},
		2812	"c/pets" => {
		2813	id => "infobox",
		2814	title => "Pets",
		2815	reply => undef,
		2816	tooltip => "Shows information abotu your pets/a specific pet",
		2817	},
		2818	"c/perceiveself" => {
		2819	id => "infobox",
		2820	title => "Perceive Self",
		2821	reply => undef,
		2822	tooltip => "You gained detailed knowledge about yourself",
		2823	},
2841	"c/uptime" => {	2824	"c/uptime" => {
2842	id => "infobox",	2825	id => "infobox",
2843	title => "Uptime",	2826	title => "Uptime",
2844	reply => undef,	2827	reply => undef,
2845	tooltip => "How long the server has been running since last restart",	2828	tooltip => "How long the server has been running since last restart",
…		…
2854	id => "party",	2837	id => "party",
2855	title => "Party",	2838	title => "Party",
2856	reply => "gsay ",	2839	reply => "gsay ",
2857	tooltip => "Messages and chat related to your party",	2840	tooltip => "Messages and chat related to your party",
2858	},	2841	},
		2842	"c/death" => {
		2843	id => "death",
		2844	title => "Death",
		2845	reply => undef,
		2846	tooltip => "Reason for and more info about your most recent death",
		2847	},
		2848	"c/say" => $SAY_CHANNEL,
		2849	"c/chat" => $CHAT_CHANNEL,
2859	);	2850	);
2860		2851
2861	sub cf::client::send_msg {	2852	sub cf::client::send_msg {
2862	my ($self, $channel, $msg, $color, @extra) = @_;	2853	my ($self, $channel, $msg, $color, @extra) = @_;
2863		2854
2864	$msg = $self->pl->expand_cfpod ($msg);	2855	$msg = $self->pl->expand_cfpod ($msg)
		2856	unless $color & cf::NDI_VERBATIM;
2865		2857
2866	$color &= cf::NDI_CLIENT_MASK; # just in case...	2858	$color &= cf::NDI_CLIENT_MASK; # just in case...
2867		2859
2868	# check predefined channels, for the benefit of C	2860	# check predefined channels, for the benefit of C
2869	if ($CHANNEL{$channel}) {	2861	if ($CHANNEL{$channel}) {
2870	$channel = $CHANNEL{$channel};	2862	$channel = $CHANNEL{$channel};
2871		2863
2872	$self->ext_msg (channel_info => $channel)	2864	$self->ext_msg (channel_info => $channel);
2873	if $self->can_msg;
2874
2875	$channel = $channel->{id};	2865	$channel = $channel->{id};
2876		2866
2877	} elsif (ref $channel) {	2867	} elsif (ref $channel) {
2878	# send meta info to client, if not yet sent	2868	# send meta info to client, if not yet sent
2879	unless (exists $self->{channel}{$channel->{id}}) {	2869	unless (exists $self->{channel}{$channel->{id}}) {
2880	$self->{channel}{$channel->{id}} = $channel;	2870	$self->{channel}{$channel->{id}} = $channel;
2881	$self->ext_msg (channel_info => $channel)	2871	$self->ext_msg (channel_info => $channel);
2882	if $self->can_msg;
2883	}	2872	}
2884		2873
2885	$channel = $channel->{id};	2874	$channel = $channel->{id};
2886	}	2875	}
2887		2876
2888	return unless @extra \|\| length $msg;	2877	return unless @extra \|\| length $msg;
2889		2878
2890	if ($self->can_msg) {
2891	# default colour, mask it out	2879	# default colour, mask it out
2892	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)	2880	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
2893	if $color & cf::NDI_DEF;	2881	if $color & cf::NDI_DEF;
2894		2882
2895	$self->send_packet ("msg " . $self->{json_coder}->encode (	2883	my $pkt = "msg "
		2884	. $self->{json_coder}->encode (
2896	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));	2885	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2897	} else {	2886	);
2898	if ($color >= 0) {
2899	# replace some tags by gcfclient-compatible ones
2900	for ($msg) {
2901	1 while
2902	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2903	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2904	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2905	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2906	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2907	}
2908		2887
2909	$color &= cf::NDI_COLOR_MASK;	2888	# try lzf for large packets
		2889	$pkt = "lzf " . Compress::LZF::compress $pkt
		2890	if 1024 <= length $pkt and $self->{can_lzf};
2910		2891
2911	utf8::encode $msg;	2892	# split very large packets
2912		2893	if (8192 < length $pkt and $self->{can_lzf}) {
2913	if (0 && $msg =~ /\[/) {	2894	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2914	# COMMAND/INFO	2895	$pkt = "frag";
2915	$self->send_packet ("drawextinfo $color 10 8 $msg")
2916	} else {
2917	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2918	$self->send_packet ("drawinfo $color $msg")
2919	}
2920	}
2921	}	2896	}
		2897
		2898	$self->send_packet ($pkt);
2922	}	2899	}
2923		2900
2924	=item $client->ext_msg ($type, @msg)	2901	=item $client->ext_msg ($type, @msg)
2925		2902
2926	Sends an ext event to the client.	2903	Sends an ext event to the client.
…		…
3101	The following functions and methods are available within a safe environment:	3078	The following functions and methods are available within a safe environment:
3102		3079
3103	cf::object	3080	cf::object
3104	contr pay_amount pay_player map x y force_find force_add destroy	3081	contr pay_amount pay_player map x y force_find force_add destroy
3105	insert remove name archname title slaying race decrease split	3082	insert remove name archname title slaying race decrease split
		3083	value
3106		3084
3107	cf::object::player	3085	cf::object::player
3108	player	3086	player
3109		3087
3110	cf::player	3088	cf::player
…		…
3115		3093
3116	=cut	3094	=cut
3117		3095
3118	for (	3096	for (
3119	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3097	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3120	insert remove inv name archname title slaying race	3098	insert remove inv nrof name archname title slaying race
3121	decrease split destroy)],	3099	decrease split destroy change_exp value msg lore send_msg)],
3122	["cf::object::player" => qw(player)],	3100	["cf::object::player" => qw(player)],
3123	["cf::player" => qw(peaceful)],	3101	["cf::player" => qw(peaceful send_msg)],
3124	["cf::map" => qw(trigger)],	3102	["cf::map" => qw(trigger)],
3125	) {	3103	) {
3126	no strict 'refs';	3104	no strict 'refs';
3127	my ($pkg, @funs) = @$_;	3105	my ($pkg, @funs) = @$_;
3128	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3106	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
…		…
3145	my ($code, %vars) = @_;	3123	my ($code, %vars) = @_;
3146		3124
3147	my $qcode = $code;	3125	my $qcode = $code;
3148	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3126	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3149	$qcode =~ s/\n/\\n/g;	3127	$qcode =~ s/\n/\\n/g;
		3128
		3129	%vars = (_dummy => 0) unless %vars;
3150		3130
3151	local $_;	3131	local $_;
3152	local @safe::cf::_safe_eval_args = values %vars;	3132	local @safe::cf::_safe_eval_args = values %vars;
3153		3133
3154	my $eval =	3134	my $eval =
…		…
3384	reload_treasures;	3364	reload_treasures;
3385		3365
3386	warn "finished reloading resource files\n";	3366	warn "finished reloading resource files\n";
3387	}	3367	}
3388		3368
3389	sub init {
3390	my $guard = freeze_mainloop;
3391
3392	reload_resources;
3393	}
3394
3395	sub reload_config {	3369	sub reload_config {
3396	open my $fh, "<:utf8", "$CONFDIR/config"	3370	open my $fh, "<:utf8", "$CONFDIR/config"
3397	or return;	3371	or return;
3398		3372
3399	local $/;	3373	local $/;
…		…
3411	};	3385	};
3412	warn $@ if $@;	3386	warn $@ if $@;
3413	}	3387	}
3414	}	3388	}
3415		3389
		3390	sub pidfile() {
		3391	sysopen my $fh, $PIDFILE, O_RDWR \| O_CREAT
		3392	or die "$PIDFILE: $!";
		3393	flock $fh, &Fcntl::LOCK_EX
		3394	or die "$PIDFILE: flock: $!";
		3395	$fh
		3396	}
		3397
		3398	# make sure only one server instance is running at any one time
		3399	sub atomic {
		3400	my $fh = pidfile;
		3401
		3402	my $pid = <$fh>;
		3403	kill 9, $pid if $pid > 0;
		3404
		3405	seek $fh, 0, 0;
		3406	print $fh $$;
		3407	}
		3408
		3409	sub main_loop {
		3410	warn "EV::loop starting\n";
		3411	if (1) {
		3412	EV::loop;
		3413	}
		3414	warn "EV::loop returned\n";
		3415	goto &main_loop unless $REALLY_UNLOOP;
		3416	}
		3417
3416	sub main {	3418	sub main {
		3419	cf::init_globals; # initialise logging
		3420
		3421	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3422	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
		3423	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
		3424	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
		3425
		3426	cf::init_experience;
		3427	cf::init_anim;
		3428	cf::init_attackmess;
		3429	cf::init_dynamic;
		3430
		3431	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
		3432
3417	# we must not ever block the main coroutine	3433	# we must not ever block the main coroutine
3418	local $Coro::idle = sub {	3434	local $Coro::idle = sub {
3419	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3435	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3420	(async {	3436	(async {
3421	$Coro::current->{desc} = "IDLE BUG HANDLER";	3437	$Coro::current->{desc} = "IDLE BUG HANDLER";
3422	EV::loop EV::LOOP_ONESHOT;	3438	EV::loop EV::LOOP_ONESHOT;
3423	})->prio (Coro::PRIO_MAX);	3439	})->prio (Coro::PRIO_MAX);
3424	};	3440	};
3425		3441
3426	{	3442	evthread_start IO::AIO::poll_fileno;
3427	my $guard = freeze_mainloop;	3443
		3444	cf::sync_job {
		3445	reload_resources;
3428	reload_config;	3446	reload_config;
3429	db_init;	3447	db_init;
		3448
		3449	cf::load_settings;
		3450	cf::load_materials;
		3451	cf::init_uuid;
		3452	cf::init_signals;
		3453	cf::init_commands;
		3454	cf::init_skills;
		3455
		3456	cf::init_beforeplay;
		3457
		3458	atomic;
		3459
3430	load_extensions;	3460	load_extensions;
3431		3461
3432	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3462	utime time, time, $RUNTIMEFILE;
3433	evthread_start IO::AIO::poll_fileno;	3463
		3464	# no (long-running) fork's whatsoever before this point(!)
		3465	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
		3466
		3467	(pop @POST_INIT)->(0) while @POST_INIT;
3434	}	3468	};
3435		3469
3436	EV::loop;	3470	main_loop;
3437	}	3471	}
3438		3472
3439	#############################################################################	3473	#############################################################################
3440	# initialisation and cleanup	3474	# initialisation and cleanup
3441		3475
…		…
3448	};	3482	};
3449	}	3483	}
3450	}	3484	}
3451		3485
3452	sub write_runtime_sync {	3486	sub write_runtime_sync {
3453	my $runtime = "$LOCALDIR/runtime";
3454
3455	# first touch the runtime file to show we are still running:	3487	# first touch the runtime file to show we are still running:
3456	# the fsync below can take a very very long time.	3488	# the fsync below can take a very very long time.
3457		3489
3458	IO::AIO::aio_utime $runtime, undef, undef;	3490	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3459		3491
3460	my $guard = cf::lock_acquire "write_runtime";	3492	my $guard = cf::lock_acquire "write_runtime";
3461		3493
3462	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644	3494	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY \| O_CREAT, 0644
3463	or return;	3495	or return;
3464		3496
3465	my $value = $cf::RUNTIME + 90 + 10;	3497	my $value = $cf::RUNTIME + 90 + 10;
3466	# 10 is the runtime save interval, for a monotonic clock	3498	# 10 is the runtime save interval, for a monotonic clock
3467	# 60 allows for the watchdog to kill the server.	3499	# 60 allows for the watchdog to kill the server.
…		…
3477	aio_utime $fh, undef, undef;	3509	aio_utime $fh, undef, undef;
3478		3510
3479	close $fh	3511	close $fh
3480	or return;	3512	or return;
3481		3513
3482	aio_rename "$runtime~", $runtime	3514	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3483	and return;	3515	and return;
3484		3516
3485	warn "runtime file written.\n";	3517	warn "runtime file written.\n";
3486		3518
3487	1	3519	1
…		…
3499	my $uuid = "$LOCALDIR/uuid";	3531	my $uuid = "$LOCALDIR/uuid";
3500		3532
3501	my $fh = aio_open "$uuid~", O_WRONLY \| O_CREAT, 0644	3533	my $fh = aio_open "$uuid~", O_WRONLY \| O_CREAT, 0644
3502	or return;	3534	or return;
3503		3535
3504	my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;	3536	my $value = uuid_seq uuid_cur;
		3537
		3538	unless ($value) {
		3539	warn "cowardly refusing to write zero uuid value!\n";
		3540	return;
		3541	}
		3542
		3543	my $value = uuid_str $value + $uuid_skip;
3505	$uuid_skip = 0;	3544	$uuid_skip = 0;
3506		3545
3507	(aio_write $fh, 0, (length $value), $value, 0) <= 0	3546	(aio_write $fh, 0, (length $value), $value, 0) <= 0
3508	and return;	3547	and return;
3509		3548
…		…
3531	}	3570	}
3532		3571
3533	sub emergency_save() {	3572	sub emergency_save() {
3534	my $freeze_guard = cf::freeze_mainloop;	3573	my $freeze_guard = cf::freeze_mainloop;
3535		3574
3536	warn "enter emergency perl save\n";	3575	warn "emergency_perl_save: enter\n";
3537		3576
3538	cf::sync_job {	3577	cf::sync_job {
		3578	# this is a trade-off: we want to be very quick here, so
		3579	# save all maps without fsync, and later call a global sync
		3580	# (which in turn might be very very slow)
		3581	local $USE_FSYNC = 0;
		3582
3539	# use a peculiar iteration method to avoid tripping on perl	3583	# use a peculiar iteration method to avoid tripping on perl
3540	# refcount bugs in for. also avoids problems with players	3584	# refcount bugs in for. also avoids problems with players
3541	# and maps saved/destroyed asynchronously.	3585	# and maps saved/destroyed asynchronously.
3542	warn "begin emergency player save\n";	3586	warn "emergency_perl_save: begin player save\n";
3543	for my $login (keys %cf::PLAYER) {	3587	for my $login (keys %cf::PLAYER) {
3544	my $pl = $cf::PLAYER{$login} or next;	3588	my $pl = $cf::PLAYER{$login} or next;
3545	$pl->valid or next;	3589	$pl->valid or next;
3546	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3590	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3547	$pl->save;	3591	$pl->save;
3548	}	3592	}
3549	warn "end emergency player save\n";	3593	warn "emergency_perl_save: end player save\n";
3550		3594
3551	warn "begin emergency map save\n";	3595	warn "emergency_perl_save: begin map save\n";
3552	for my $path (keys %cf::MAP) {	3596	for my $path (keys %cf::MAP) {
3553	my $map = $cf::MAP{$path} or next;	3597	my $map = $cf::MAP{$path} or next;
3554	$map->valid or next;	3598	$map->valid or next;
3555	$map->save;	3599	$map->save;
3556	}	3600	}
3557	warn "end emergency map save\n";	3601	warn "emergency_perl_save: end map save\n";
3558		3602
3559	warn "begin emergency database checkpoint\n";	3603	warn "emergency_perl_save: begin database checkpoint\n";
3560	BDB::db_env_txn_checkpoint $DB_ENV;	3604	BDB::db_env_txn_checkpoint $DB_ENV;
3561	warn "end emergency database checkpoint\n";	3605	warn "emergency_perl_save: end database checkpoint\n";
3562		3606
3563	warn "begin write uuid\n";	3607	warn "emergency_perl_save: begin write uuid\n";
3564	write_uuid_sync 1;	3608	write_uuid_sync 1;
3565	warn "end write uuid\n";	3609	warn "emergency_perl_save: end write uuid\n";
3566	};	3610	};
3567		3611
		3612	warn "emergency_perl_save: starting sync()\n";
		3613	IO::AIO::aio_sync sub {
		3614	warn "emergency_perl_save: finished sync()\n";
		3615	};
		3616
3568	warn "leave emergency perl save\n";	3617	warn "emergency_perl_save: leave\n";
3569	}	3618	}
3570		3619
3571	sub post_cleanup {	3620	sub post_cleanup {
3572	my ($make_core) = @_;	3621	my ($make_core) = @_;
3573		3622
3574	warn Carp::longmess "post_cleanup backtrace"	3623	warn Carp::longmess "post_cleanup backtrace"
3575	if $make_core;	3624	if $make_core;
		3625
		3626	my $fh = pidfile;
		3627	unlink $PIDFILE if <$fh> == $$;
		3628	}
		3629
		3630	# a safer delete_package, copied from Symbol
		3631	sub clear_package($) {
		3632	my $pkg = shift;
		3633
		3634	# expand to full symbol table name if needed
		3635	unless ($pkg =~ /^main::.*::$/) {
		3636	$pkg = "main$pkg" if $pkg =~ /^::/;
		3637	$pkg = "main::$pkg" unless $pkg =~ /^main::/;
		3638	$pkg .= '::' unless $pkg =~ /::$/;
		3639	}
		3640
		3641	my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
		3642	my $stem_symtab = *{$stem}{HASH};
		3643
		3644	defined $stem_symtab and exists $stem_symtab->{$leaf}
		3645	or return;
		3646
		3647	# clear all symbols
		3648	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
		3649	for my $name (keys %$leaf_symtab) {
		3650	_gv_clear *{"$pkg$name"};
		3651	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
		3652	}
		3653	warn "cleared package $pkg\n";#d#
3576	}	3654	}
3577		3655
3578	sub do_reload_perl() {	3656	sub do_reload_perl() {
3579	# can/must only be called in main	3657	# can/must only be called in main
3580	if ($Coro::current != $Coro::main) {	3658	if ($Coro::current != $Coro::main) {
3581	warn "can only reload from main coroutine";	3659	warn "can only reload from main coroutine";
3582	return;	3660	return;
3583	}	3661	}
3584		3662
		3663	return if $RELOAD++;
		3664
		3665	my $t1 = EV::time;
		3666
		3667	while ($RELOAD) {
3585	warn "reloading...";	3668	warn "reloading...";
3586		3669
3587	warn "entering sync_job";	3670	warn "entering sync_job";
3588		3671
3589	cf::sync_job {	3672	cf::sync_job {
3590	cf::write_runtime_sync; # external watchdog should not bark	3673	cf::write_runtime_sync; # external watchdog should not bark
3591	cf::emergency_save;	3674	cf::emergency_save;
3592	cf::write_runtime_sync; # external watchdog should not bark	3675	cf::write_runtime_sync; # external watchdog should not bark
3593		3676
3594	warn "syncing database to disk";	3677	warn "syncing database to disk";
3595	BDB::db_env_txn_checkpoint $DB_ENV;	3678	BDB::db_env_txn_checkpoint $DB_ENV;
3596		3679
3597	# if anything goes wrong in here, we should simply crash as we already saved	3680	# if anything goes wrong in here, we should simply crash as we already saved
3598		3681
3599	warn "flushing outstanding aio requests";	3682	warn "flushing outstanding aio requests";
3600	for (;;) {
3601	BDB::flush;
3602	IO::AIO::flush;
3603	Coro::cede_notself;
3604	last unless IO::AIO::nreqs \|\| BDB::nreqs;	3683	while (IO::AIO::nreqs \|\| BDB::nreqs) {
3605	warn "iterate...";	3684	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3606	}
3607
3608	++$RELOAD;
3609
3610	warn "cancelling all extension coros";
3611	$_->cancel for values %EXT_CORO;
3612	%EXT_CORO = ();
3613
3614	warn "removing commands";
3615	%COMMAND = ();
3616
3617	warn "removing ext/exti commands";
3618	%EXTCMD = ();
3619	%EXTICMD = ();
3620
3621	warn "unloading/nuking all extensions";
3622	for my $pkg (@EXTS) {
3623	warn "... unloading $pkg";
3624
3625	if (my $cb = $pkg->can ("unload")) {
3626	eval {
3627	$cb->($pkg);
3628	1
3629	} or warn "$pkg unloaded, but with errors: $@";
3630	}	3685	}
3631		3686
3632	warn "... nuking $pkg";	3687	warn "cancelling all extension coros";
3633	Symbol::delete_package $pkg;	3688	$_->cancel for values %EXT_CORO;
3634	}	3689	%EXT_CORO = ();
3635		3690
3636	warn "unloading all perl modules loaded from $LIBDIR";	3691	warn "removing commands";
3637	while (my ($k, $v) = each %INC) {	3692	%COMMAND = ();
3638	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3639		3693
		3694	warn "removing ext/exti commands";
		3695	%EXTCMD = ();
		3696	%EXTICMD = ();
		3697
		3698	warn "unloading/nuking all extensions";
		3699	for my $pkg (@EXTS) {
3640	warn "... unloading $k";	3700	warn "... unloading $pkg";
3641	delete $INC{$k};
3642		3701
3643	$k =~ s/\.pm$//;
3644	$k =~ s/\//::/g;
3645
3646	if (my $cb = $k->can ("unload_module")) {	3702	if (my $cb = $pkg->can ("unload")) {
		3703	eval {
3647	$cb->();	3704	$cb->($pkg);
		3705	1
		3706	} or warn "$pkg unloaded, but with errors: $@";
		3707	}
		3708
		3709	warn "... clearing $pkg";
		3710	clear_package $pkg;
3648	}	3711	}
3649		3712
3650	Symbol::delete_package $k;	3713	warn "unloading all perl modules loaded from $LIBDIR";
		3714	while (my ($k, $v) = each %INC) {
		3715	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
		3716
		3717	warn "... unloading $k";
		3718	delete $INC{$k};
		3719
		3720	$k =~ s/\.pm$//;
		3721	$k =~ s/\//::/g;
		3722
		3723	if (my $cb = $k->can ("unload_module")) {
		3724	$cb->();
		3725	}
		3726
		3727	clear_package $k;
3651	}	3728	}
3652		3729
3653	warn "getting rid of safe::, as good as possible";	3730	warn "getting rid of safe::, as good as possible";
3654	Symbol::delete_package "safe::$_"	3731	clear_package "safe::$_"
3655	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3732	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3656		3733
3657	warn "unloading cf.pm \"a bit\"";	3734	warn "unloading cf.pm \"a bit\"";
3658	delete $INC{"cf.pm"};	3735	delete $INC{"cf.pm"};
3659	delete $INC{"cf/pod.pm"};	3736	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3660		3737
3661	# don't, removes xs symbols, too,	3738	# don't, removes xs symbols, too,
3662	# and global variables created in xs	3739	# and global variables created in xs
3663	#Symbol::delete_package __PACKAGE__;	3740	#clear_package __PACKAGE__;
3664		3741
3665	warn "unload completed, starting to reload now";	3742	warn "unload completed, starting to reload now";
3666		3743
3667	warn "reloading cf.pm";	3744	warn "reloading cf.pm";
3668	require cf;	3745	require cf;
3669	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3746	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3670		3747
3671	warn "loading config and database again";	3748	warn "loading config and database again";
3672	cf::reload_config;	3749	cf::reload_config;
3673		3750
3674	warn "loading extensions";	3751	warn "loading extensions";
3675	cf::load_extensions;	3752	cf::load_extensions;
3676		3753
		3754	if ($REATTACH_ON_RELOAD) {
3677	warn "reattaching attachments to objects/players";	3755	warn "reattaching attachments to objects/players";
3678	_global_reattach; # objects, sockets	3756	_global_reattach; # objects, sockets
3679	warn "reattaching attachments to maps";	3757	warn "reattaching attachments to maps";
3680	reattach $_ for values %MAP;	3758	reattach $_ for values %MAP;
3681	warn "reattaching attachments to players";	3759	warn "reattaching attachments to players";
3682	reattach $_ for values %PLAYER;	3760	reattach $_ for values %PLAYER;
		3761	}
3683		3762
		3763	warn "running post_init jobs";
		3764	(pop @POST_INIT)->(1) while @POST_INIT;
		3765
3684	warn "leaving sync_job";	3766	warn "leaving sync_job";
3685		3767
3686	1	3768	1
3687	} or do {	3769	} or do {
3688	warn $@;	3770	warn $@;
3689	cf::cleanup "error while reloading, exiting.";	3771	cf::cleanup "error while reloading, exiting.";
3690	};	3772	};
3691		3773
3692	warn "reloaded";	3774	warn "reloaded";
		3775	--$RELOAD;
		3776	}
		3777
		3778	$t1 = EV::time - $t1;
		3779	warn "reload completed in ${t1}s\n";
3693	};	3780	};
3694		3781
3695	our $RELOAD_WATCHER; # used only during reload	3782	our $RELOAD_WATCHER; # used only during reload
3696		3783
3697	sub reload_perl() {	3784	sub reload_perl() {
3698	# doing reload synchronously and two reloads happen back-to-back,	3785	# doing reload synchronously and two reloads happen back-to-back,
3699	# coro crashes during coro_state_free->destroy here.	3786	# coro crashes during coro_state_free->destroy here.
3700		3787
		3788	$RELOAD_WATCHER \|\|= cf::async {
		3789	Coro::AIO::aio_wait cache_extensions;
		3790
3701	$RELOAD_WATCHER \|\|= EV::timer 0, 0, sub {	3791	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3702	do_reload_perl;	3792	do_reload_perl;
3703	undef $RELOAD_WATCHER;	3793	undef $RELOAD_WATCHER;
		3794	};
3704	};	3795	};
3705	}	3796	}
3706		3797
3707	register_command "reload" => sub {	3798	register_command "reload" => sub {
3708	my ($who, $arg) = @_;	3799	my ($who, $arg) = @_;
…		…
3779	{	3870	{
3780	# configure BDB	3871	# configure BDB
3781		3872
3782	BDB::min_parallel 8;	3873	BDB::min_parallel 8;
3783	BDB::max_poll_reqs $TICK * 0.1;	3874	BDB::max_poll_reqs $TICK * 0.1;
3784	$Coro::BDB::WATCHER->priority (1);	3875	$AnyEvent::BDB::WATCHER->priority (1);
3785		3876
3786	unless ($DB_ENV) {	3877	unless ($DB_ENV) {
3787	$DB_ENV = BDB::db_env_create;	3878	$DB_ENV = BDB::db_env_create;
3788	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC	3879	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);
3789	\| BDB::LOG_AUTOREMOVE, 1);	3880	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
		3881	$DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3790	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);	3882	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3791	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);	3883	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3792		3884
3793	cf::sync_job {	3885	cf::sync_job {
3794	eval {	3886	eval {
…		…
3820	{	3912	{
3821	# configure IO::AIO	3913	# configure IO::AIO
3822		3914
3823	IO::AIO::min_parallel 8;	3915	IO::AIO::min_parallel 8;
3824	IO::AIO::max_poll_time $TICK * 0.1;	3916	IO::AIO::max_poll_time $TICK * 0.1;
3825	$Coro::AIO::WATCHER->priority (1);	3917	undef $AnyEvent::AIO::WATCHER;
3826	}	3918	}
3827		3919
3828	my $_log_backtrace;	3920	my $_log_backtrace;
3829		3921
3830	sub _log_backtrace {	3922	sub _log_backtrace {
…		…
3833	$msg =~ s/\n//;	3925	$msg =~ s/\n//;
3834		3926
3835	# limit the # of concurrent backtraces	3927	# limit the # of concurrent backtraces
3836	if ($_log_backtrace < 2) {	3928	if ($_log_backtrace < 2) {
3837	++$_log_backtrace;	3929	++$_log_backtrace;
		3930	my $perl_bt = Carp::longmess $msg;
3838	async {	3931	async {
3839	$Coro::current->{desc} = "abt $msg";	3932	$Coro::current->{desc} = "abt $msg";
3840		3933
3841	my @bt = fork_call {	3934	my @bt = fork_call {
3842	@addr = map { sprintf "%x", $_ } @addr;	3935	@addr = map { sprintf "%x", $_ } @addr;
…		…
3853	}	3946	}
3854		3947
3855	@funcs	3948	@funcs
3856	};	3949	};
3857		3950
3858	LOG llevInfo, "[ABT] $msg\n";	3951	LOG llevInfo, "[ABT] $perl_bt\n";
		3952	LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3859	LOG llevInfo, "[ABT] $_\n" for @bt;	3953	LOG llevInfo, "[ABT] $_\n" for @bt;
3860	--$_log_backtrace;	3954	--$_log_backtrace;
3861	};	3955	};
3862	} else {	3956	} else {
3863	LOG llevInfo, "[ABT] $msg\n";	3957	LOG llevInfo, "[ABT] $msg\n";
3864	LOG llevInfo, "[ABT] [suppressed]\n";	3958	LOG llevInfo, "[ABT] [suppressed]\n";
3865	}	3959	}
3866	}	3960	}
3867		3961
3868	# load additional modules	3962	# load additional modules
3869	use cf::pod;	3963	require "cf/$_.pm" for @EXTRA_MODULES;
3870		3964
3871	END { cf::emergency_save }	3965	END { cf::emergency_save }
3872		3966
3873	1	3967	1
3874		3968

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.428 by root, Thu May 1 06:33:19 2008 UTC vs. Revision 1.474 by root, Thu Jul 16 21:42:56 2009 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.428 by root, Thu May 1 06:33:19 2008 UTC vs.
Revision 1.474 by root, Thu Jul 16 21:42:56 2009 UTC