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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.444 by root, Mon Sep 8 11:27:25 2008 UTC vs.
Revision 1.471 by root, Mon Apr 27 01:38:48 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
70	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71		76
72	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	77	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73		78
74	our %COMMAND = ();	79	our %COMMAND = ();
75	our %COMMAND_TIME = ();	80	our %COMMAND_TIME = ();
…		…
78	our %EXTCMD = ();	83	our %EXTCMD = ();
79	our %EXTICMD = ();	84	our %EXTICMD = ();
80	our %EXT_CORO = (); # coroutines bound to extensions	85	our %EXT_CORO = (); # coroutines bound to extensions
81	our %EXT_MAP = (); # pluggable maps	86	our %EXT_MAP = (); # pluggable maps
82		87
83	our $RELOAD; # number of reloads so far	88	our $RELOAD; # number of reloads so far, non-zero while in reload
84	our @EVENT;	89	our @EVENT;
85		90
86	our $CONFDIR = confdir;	91	our $CONFDIR = confdir;
87	our $DATADIR = datadir;	92	our $DATADIR = datadir;
88	our $LIBDIR = "$DATADIR/ext";	93	our $LIBDIR = "$DATADIR/ext";
89	our $PODDIR = "$DATADIR/pod";	94	our $PODDIR = "$DATADIR/pod";
90	our $MAPDIR = "$DATADIR/" . mapdir;	95	our $MAPDIR = "$DATADIR/" . mapdir;
91	our $LOCALDIR = localdir;	96	our $LOCALDIR = localdir;
92	our $TMPDIR = "$LOCALDIR/" . tmpdir;	97	our $TMPDIR = "$LOCALDIR/" . tmpdir;
93	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	98	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	99	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95	our $RANDOMDIR = "$LOCALDIR/random";	100	our $RANDOMDIR = "$LOCALDIR/random";
96	our $BDBDIR = "$LOCALDIR/db";	101	our $BDBDIR = "$LOCALDIR/db";
		102	our $PIDFILE = "$LOCALDIR/pid";
		103	our $RUNTIMEFILE = "$LOCALDIR/runtime";
		104
97	our %RESOURCE;	105	our %RESOURCE;
98		106
99	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	107	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
100	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	108	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
101	our $NEXT_TICK;	109	our $NEXT_TICK;
102	our $USE_FSYNC = 1; # use fsync to write maps - default off	110	our $USE_FSYNC = 1; # use fsync to write maps - default on
103		111
104	our $BDB_DEADLOCK_WATCHER;	112	our $BDB_DEADLOCK_WATCHER;
105	our $BDB_CHECKPOINT_WATCHER;	113	our $BDB_CHECKPOINT_WATCHER;
106	our $BDB_TRICKLE_WATCHER;	114	our $BDB_TRICKLE_WATCHER;
107	our $DB_ENV;	115	our $DB_ENV;
108		116
		117	our @EXTRA_MODULES = qw(pod mapscript);
		118
109	our %CFG;	119	our %CFG;
110		120
111	our $UPTIME; $UPTIME \|\|= time;	121	our $UPTIME; $UPTIME \|\|= time;
112	our $RUNTIME;	122	our $RUNTIME;
113	our $NOW;	123	our $NOW;
…		…
122	our $LOAD; # a number between 0 (idle) and 1 (too many objects)	132	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
123	our $LOADAVG; # same thing, but with alpha-smoothing	133	our $LOADAVG; # same thing, but with alpha-smoothing
124	our $JITTER; # average jitter	134	our $JITTER; # average jitter
125	our $TICK_START; # for load detecting purposes	135	our $TICK_START; # for load detecting purposes
126		136
		137	our @POST_INIT;
		138
		139	our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
		140
127	binmode STDOUT;	141	binmode STDOUT;
128	binmode STDERR;	142	binmode STDERR;
129		143
130	# read virtual server time, if available	144	# read virtual server time, if available
131	unless ($RUNTIME \|\| !-e "$LOCALDIR/runtime") {	145	unless ($RUNTIME \|\| !-e $RUNTIMEFILE) {
132	open my $fh, "<", "$LOCALDIR/runtime"	146	open my $fh, "<", $RUNTIMEFILE
133	or die "unable to read runtime file: $!";	147	or die "unable to read $RUNTIMEFILE file: $!";
134	$RUNTIME = <$fh> + 0.;	148	$RUNTIME = <$fh> + 0.;
135	}	149	}
		150
		151	eval "sub TICK() { $TICK } 1" or die;
136		152
137	mkdir $_	153	mkdir $_
138	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	154	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
139		155
140	our $EMERGENCY_POSITION;	156	our $EMERGENCY_POSITION;
…		…
299	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	315	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
300		316
301	sub encode_json($) { $json_coder->encode ($_[0]) }	317	sub encode_json($) { $json_coder->encode ($_[0]) }
302	sub decode_json($) { $json_coder->decode ($_[0]) }	318	sub decode_json($) { $json_coder->decode ($_[0]) }
303		319
		320	=item cf::post_init { BLOCK }
		321
		322	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
		323	but I<before> the server starts ticking again.
		324
		325	The cdoeblock will have a single boolean argument to indicate whether this
		326	is a reload or not.
		327
		328	=cut
		329
		330	sub post_init(&) {
		331	push @POST_INIT, shift;
		332	}
		333
304	=item cf::lock_wait $string	334	=item cf::lock_wait $string
305		335
306	Wait until the given lock is available. See cf::lock_acquire.	336	Wait until the given lock is available. See cf::lock_acquire.
307		337
308	=item my $lock = cf::lock_acquire $string	338	=item my $lock = cf::lock_acquire $string
309		339
310	Wait until the given lock is available and then acquires it and returns	340	Wait until the given lock is available and then acquires it and returns
311	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	341	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
312	for example when the coroutine gets canceled), the lock is automatically	342	for example when the coroutine gets canceled), the lock is automatically
313	returned.	343	returned.
314		344
315	Locks are not recursive, locking from the same coro twice results in a	345	Locks are not recursive, locking from the same coro twice results in a
316	deadlocked coro.	346	deadlocked coro.
…		…
322		352
323	Return true if the lock is currently active, i.e. somebody has locked it.	353	Return true if the lock is currently active, i.e. somebody has locked it.
324		354
325	=cut	355	=cut
326		356
327	our %LOCK;	357	our $LOCKS = new Coro::SemaphoreSet;
328	our %LOCKER;#d#
329		358
330	sub lock_wait($) {	359	sub lock_wait($) {
331	my ($key) = @_;	360	$LOCKS->wait ($_[0]);
332
333	if ($LOCKER{$key} == $Coro::current) {#d#
334	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335	return;#d#
336	}#d#
337
338	# wait for lock, if any
339	while ($LOCK{$key}) {
340	push @{ $LOCK{$key} }, $Coro::current;
341	Coro::schedule;
342	}
343	}	361	}
344		362
345	sub lock_acquire($) {	363	sub lock_acquire($) {
346	my ($key) = @_;	364	$LOCKS->guard ($_[0])
347
348	# wait, to be sure we are not locked
349	lock_wait $key;
350
351	$LOCK{$key} = [];
352	$LOCKER{$key} = $Coro::current;#d#
353
354	Coro::guard {
355	delete $LOCKER{$key};#d#
356	# wake up all waiters, to be on the safe side
357	$_->ready for @{ delete $LOCK{$key} };
358	}
359	}	365	}
360		366
361	sub lock_active($) {	367	sub lock_active($) {
362	my ($key) = @_;	368	$LOCKS->count ($_[0]) < 1
363
364	! ! $LOCK{$key}
365	}	369	}
366		370
367	sub freeze_mainloop {	371	sub freeze_mainloop {
368	tick_inhibit_inc;	372	tick_inhibit_inc;
369		373
370	Coro::guard \&tick_inhibit_dec;	374	&Guard::guard (\&tick_inhibit_dec);
371	}	375	}
372		376
373	=item cf::periodic $interval, $cb	377	=item cf::periodic $interval, $cb
374		378
375	Like EV::periodic, but randomly selects a starting point so that the actions	379	Like EV::periodic, but randomly selects a starting point so that the actions
…		…
727		731
728	#############################################################################	732	#############################################################################
729		733
730	=head2 ATTACHABLE OBJECTS	734	=head2 ATTACHABLE OBJECTS
731		735
732	Many objects in crossfire are so-called attachable objects. That means you can	736	Many objects in deliantra are so-called attachable objects. That means you can
733	attach callbacks/event handlers (a collection of which is called an "attachment")	737	attach callbacks/event handlers (a collection of which is called an "attachment")
734	to it. All such attachable objects support the following methods.	738	to it. All such attachable objects support the following methods.
735		739
736	In the following description, CLASS can be any of C<global>, C<object>	740	In the following description, CLASS can be any of C<global>, C<object>
737	C<player>, C<client> or C<map> (i.e. the attachable objects in	741	C<player>, C<client> or C<map> (i.e. the attachable objects in
…		…
787	=item cf::CLASS::attachment $name, ...	791	=item cf::CLASS::attachment $name, ...
788		792
789	Register an attachment by C<$name> through which attachable objects of the	793	Register an attachment by C<$name> through which attachable objects of the
790	given CLASS can refer to this attachment.	794	given CLASS can refer to this attachment.
791		795
792	Some classes such as crossfire maps and objects can specify attachments	796	Some classes such as deliantra maps and objects can specify attachments
793	that are attached at load/instantiate time, thus the need for a name.	797	that are attached at load/instantiate time, thus the need for a name.
794		798
795	These calls expect any number of the following handler/hook descriptions:	799	These calls expect any number of the following handler/hook descriptions:
796		800
797	=over 4	801	=over 4
…		…
1164	} else {	1168	} else {
1165	aio_unlink "$filename.pst";	1169	aio_unlink "$filename.pst";
1166	}	1170	}
1167		1171
1168	aio_rename "$filename~", $filename;	1172	aio_rename "$filename~", $filename;
		1173
		1174	$filename =~ s%/[^/]+$%%;
		1175	aio_pathsync $filename if $cf::USE_FSYNC;
1169	} else {	1176	} else {
1170	warn "FATAL: $filename~: $!\n";	1177	warn "unable to save objects: $filename~: $!\n";
1171	}	1178	}
1172	} else {	1179	} else {
1173	aio_unlink $filename;	1180	aio_unlink $filename;
1174	aio_unlink "$filename.pst";	1181	aio_unlink "$filename.pst";
1175	}	1182	}
…		…
1266	my ($name, $cb) = @_;	1273	my ($name, $cb) = @_;
1267		1274
1268	$EXTICMD{$name} = $cb;	1275	$EXTICMD{$name} = $cb;
1269	}	1276	}
1270		1277
		1278	use File::Glob ();
		1279
1271	cf::player->attach (	1280	cf::player->attach (
1272	on_command => sub {	1281	on_command => sub {
1273	my ($pl, $name, $params) = @_;	1282	my ($pl, $name, $params) = @_;
1274		1283
1275	my $cb = $COMMAND{$name}	1284	my $cb = $COMMAND{$name}
…		…
1306	}	1315	}
1307		1316
1308	cf::override;	1317	cf::override;
1309	},	1318	},
1310	);	1319	);
		1320
		1321	# "readahead" all extensions
		1322	sub cache_extensions {
		1323	my $grp = IO::AIO::aio_group;
		1324
		1325	add $grp IO::AIO::aio_readdir $LIBDIR, sub {
		1326	for (grep /\.ext$/, @{$_[0]}) {
		1327	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
		1328	}
		1329	};
		1330
		1331	$grp
		1332	}
1311		1333
1312	sub load_extensions {	1334	sub load_extensions {
1313	cf::sync_job {	1335	cf::sync_job {
1314	my %todo;	1336	my %todo;
1315		1337
…		…
1385		1407
1386	=back	1408	=back
1387		1409
1388	=head2 CORE EXTENSIONS	1410	=head2 CORE EXTENSIONS
1389		1411
1390	Functions and methods that extend core crossfire objects.	1412	Functions and methods that extend core deliantra objects.
1391		1413
1392	=cut	1414	=cut
1393		1415
1394	package cf::player;	1416	package cf::player;
1395		1417
…		…
1438		1460
1439	sub exists($) {	1461	sub exists($) {
1440	my ($login) = @_;	1462	my ($login) = @_;
1441		1463
1442	$cf::PLAYER{$login}	1464	$cf::PLAYER{$login}
1443	or cf::sync_job { !aio_stat path $login }	1465	or !aio_stat path $login
1444	}	1466	}
1445		1467
1446	sub find($) {	1468	sub find($) {
1447	return $cf::PLAYER{$_[0]} \|\| do {	1469	return $cf::PLAYER{$_[0]} \|\| do {
1448	my $login = $_[0];	1470	my $login = $_[0];
…		…
1619	}	1641	}
1620		1642
1621	\@paths	1643	\@paths
1622	}	1644	}
1623		1645
1624	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)	1646	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1625		1647
1626	Expand crossfire pod fragments into protocol xml.	1648	Expand deliantra pod fragments into protocol xml.
1627		1649
1628	=item $player->ext_reply ($msgid, @msg)	1650	=item $player->ext_reply ($msgid, @msg)
1629		1651
1630	Sends an ext reply to the player.	1652	Sends an ext reply to the player.
1631		1653
…		…
1844		1866
1845	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;	1867	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1846	"$UNIQUEDIR/$path"	1868	"$UNIQUEDIR/$path"
1847	}	1869	}
1848		1870
1849	# and all this just because we cannot iterate over
1850	# all maps in C++...
1851	sub change_all_map_light {
1852	my ($change) = @_;
1853
1854	$_->change_map_light ($change)
1855	for grep $_->outdoor, values %cf::MAP;
1856	}
1857
1858	sub decay_objects {	1871	sub decay_objects {
1859	my ($self) = @_;	1872	my ($self) = @_;
1860		1873
1861	return if $self->{deny_reset};	1874	return if $self->{deny_reset};
1862		1875
…		…
1944	sub find {	1957	sub find {
1945	my ($path, $origin) = @_;	1958	my ($path, $origin) = @_;
1946		1959
1947	$path = normalise $path, $origin && $origin->path;	1960	$path = normalise $path, $origin && $origin->path;
1948		1961
1949	cf::lock_wait "map_data:$path";#d#remove	1962	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1950	cf::lock_wait "map_find:$path";	1963	my $guard2 = cf::lock_acquire "map_find:$path";
1951		1964
1952	$cf::MAP{$path} \|\| do {	1965	$cf::MAP{$path} \|\| do {
1953	my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1954	my $guard2 = cf::lock_acquire "map_find:$path";
1955
1956	my $map = new_from_path cf::map $path	1966	my $map = new_from_path cf::map $path
1957	or return;	1967	or return;
1958		1968
1959	$map->{last_save} = $cf::RUNTIME;	1969	$map->{last_save} = $cf::RUNTIME;
1960		1970
…		…
2027		2037
2028	unless ($self->{deny_activate}) {	2038	unless ($self->{deny_activate}) {
2029	$self->decay_objects;	2039	$self->decay_objects;
2030	$self->fix_auto_apply;	2040	$self->fix_auto_apply;
2031	$self->update_buttons;	2041	$self->update_buttons;
2032	cf::cede_to_tick;
2033	$self->set_darkness_map;
2034	cf::cede_to_tick;	2042	cf::cede_to_tick;
2035	$self->activate;	2043	$self->activate;
2036	}	2044	}
2037		2045
2038	$self->{last_save} = $cf::RUNTIME;	2046	$self->{last_save} = $cf::RUNTIME;
…		…
2380		2388
2381	our $SAY_CHANNEL = {	2389	our $SAY_CHANNEL = {
2382	id => "say",	2390	id => "say",
2383	title => "Map",	2391	title => "Map",
2384	reply => "say ",	2392	reply => "say ",
2385	tooltip => "Things said to and replied from npcs near you and other players on the same map only.",	2393	tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2386	};	2394	};
2387		2395
2388	our $CHAT_CHANNEL = {	2396	our $CHAT_CHANNEL = {
2389	id => "chat",	2397	id => "chat",
2390	title => "Chat",	2398	title => "Chat",
…		…
2445		2453
2446	=item $player_object->enter_link	2454	=item $player_object->enter_link
2447		2455
2448	Freezes the player and moves him/her to a special map (C<{link}>).	2456	Freezes the player and moves him/her to a special map (C<{link}>).
2449		2457
2450	The player should be reasonably safe there for short amounts of time. You	2458	The player should be reasonably safe there for short amounts of time (e.g.
2451	I<MUST> call C<leave_link> as soon as possible, though.	2459	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
		2460	though, as the palyer cannot control the character while it is on the link
		2461	map.
2452		2462
2453	Will never block.	2463	Will never block.
2454		2464
2455	=item $player_object->leave_link ($map, $x, $y)	2465	=item $player_object->leave_link ($map, $x, $y)
2456		2466
…		…
2514		2524
2515	$map->load;	2525	$map->load;
2516	$map->load_neighbours;	2526	$map->load_neighbours;
2517		2527
2518	return unless $self->contr->active;	2528	return unless $self->contr->active;
		2529	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2519	$self->activate_recursive;	2530	$self->activate_recursive;
2520		2531
2521	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2532	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2522	$self->enter_map ($map, $x, $y);	2533	$self->enter_map ($map, $x, $y);
2523	}	2534	}
…		…
2686	$self->contr->savebed ($map, $x, $y)	2697	$self->contr->savebed ($map, $x, $y)
2687	if $exit->flag (cf::FLAG_DAMNED);	2698	if $exit->flag (cf::FLAG_DAMNED);
2688		2699
2689	1	2700	1
2690	}) {	2701	}) {
2691	$self->message ("Something went wrong deep within the crossfire server. "	2702	$self->message ("Something went wrong deep within the deliantra server. "
2692	. "I'll try to bring you back to the map you were before. "	2703	. "I'll try to bring you back to the map you were before. "
2693	. "Please report this to the dungeon master!",	2704	. "Please report this to the dungeon master!",
2694	cf::NDI_UNIQUE \| cf::NDI_RED);	2705	cf::NDI_UNIQUE \| cf::NDI_RED);
2695		2706
2696	warn "ERROR in enter_exit: $@";	2707	warn "ERROR in enter_exit: $@";
…		…
2762	id => "infobox",	2773	id => "infobox",
2763	title => "Body Parts",	2774	title => "Body Parts",
2764	reply => undef,	2775	reply => undef,
2765	tooltip => "Shows which body parts you posess and are available",	2776	tooltip => "Shows which body parts you posess and are available",
2766	},	2777	},
		2778	"c/statistics" => {
		2779	id => "infobox",
		2780	title => "Statistics",
		2781	reply => undef,
		2782	tooltip => "Shows your primary statistics",
		2783	},
		2784	"c/skills" => {
		2785	id => "infobox",
		2786	title => "Skills",
		2787	reply => undef,
		2788	tooltip => "Shows your experience per skill and item power",
		2789	},
		2790	"c/shopitems" => {
		2791	id => "infobox",
		2792	title => "Shop Items",
		2793	reply => undef,
		2794	tooltip => "Shows the items currently for sale in this shop",
		2795	},
		2796	"c/resistances" => {
		2797	id => "infobox",
		2798	title => "Resistances",
		2799	reply => undef,
		2800	tooltip => "Shows your resistances",
		2801	},
		2802	"c/pets" => {
		2803	id => "infobox",
		2804	title => "Pets",
		2805	reply => undef,
		2806	tooltip => "Shows information abotu your pets/a specific pet",
		2807	},
		2808	"c/perceiveself" => {
		2809	id => "infobox",
		2810	title => "Perceive Self",
		2811	reply => undef,
		2812	tooltip => "You gained detailed knowledge about yourself",
		2813	},
2767	"c/uptime" => {	2814	"c/uptime" => {
2768	id => "infobox",	2815	id => "infobox",
2769	title => "Uptime",	2816	title => "Uptime",
2770	reply => undef,	2817	reply => undef,
2771	tooltip => "How long the server has been running since last restart",	2818	tooltip => "How long the server has been running since last restart",
…		…
2780	id => "party",	2827	id => "party",
2781	title => "Party",	2828	title => "Party",
2782	reply => "gsay ",	2829	reply => "gsay ",
2783	tooltip => "Messages and chat related to your party",	2830	tooltip => "Messages and chat related to your party",
2784	},	2831	},
		2832	"c/death" => {
		2833	id => "death",
		2834	title => "Death",
		2835	reply => undef,
		2836	tooltip => "Reason for and more info about your most recent death",
		2837	},
		2838	"c/say" => $SAY_CHANNEL,
		2839	"c/chat" => $CHAT_CHANNEL,
2785	);	2840	);
2786		2841
2787	sub cf::client::send_msg {	2842	sub cf::client::send_msg {
2788	my ($self, $channel, $msg, $color, @extra) = @_;	2843	my ($self, $channel, $msg, $color, @extra) = @_;
2789		2844
2790	$msg = $self->pl->expand_cfpod ($msg);	2845	$msg = $self->pl->expand_cfpod ($msg)
		2846	unless $color & cf::NDI_VERBATIM;
2791		2847
2792	$color &= cf::NDI_CLIENT_MASK; # just in case...	2848	$color &= cf::NDI_CLIENT_MASK; # just in case...
2793		2849
2794	# check predefined channels, for the benefit of C	2850	# check predefined channels, for the benefit of C
2795	if ($CHANNEL{$channel}) {	2851	if ($CHANNEL{$channel}) {
2796	$channel = $CHANNEL{$channel};	2852	$channel = $CHANNEL{$channel};
2797		2853
2798	$self->ext_msg (channel_info => $channel)	2854	$self->ext_msg (channel_info => $channel);
2799	if $self->can_msg;
2800
2801	$channel = $channel->{id};	2855	$channel = $channel->{id};
2802		2856
2803	} elsif (ref $channel) {	2857	} elsif (ref $channel) {
2804	# send meta info to client, if not yet sent	2858	# send meta info to client, if not yet sent
2805	unless (exists $self->{channel}{$channel->{id}}) {	2859	unless (exists $self->{channel}{$channel->{id}}) {
2806	$self->{channel}{$channel->{id}} = $channel;	2860	$self->{channel}{$channel->{id}} = $channel;
2807	$self->ext_msg (channel_info => $channel)	2861	$self->ext_msg (channel_info => $channel);
2808	if $self->can_msg;
2809	}	2862	}
2810		2863
2811	$channel = $channel->{id};	2864	$channel = $channel->{id};
2812	}	2865	}
2813		2866
2814	return unless @extra \|\| length $msg;	2867	return unless @extra \|\| length $msg;
2815		2868
2816	if ($self->can_msg) {
2817	# default colour, mask it out	2869	# default colour, mask it out
2818	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)	2870	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
2819	if $color & cf::NDI_DEF;	2871	if $color & cf::NDI_DEF;
2820		2872
2821	my $pkt = "msg "	2873	my $pkt = "msg "
2822	. $self->{json_coder}->encode (	2874	. $self->{json_coder}->encode (
2823	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	2875	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2824	);	2876	);
2825		2877
2826	# try lzf for large packets	2878	# try lzf for large packets
2827	$pkt = "lzf " . Compress::LZF::compress $pkt	2879	$pkt = "lzf " . Compress::LZF::compress $pkt
2828	if 1024 <= length $pkt and $self->{can_lzf};	2880	if 1024 <= length $pkt and $self->{can_lzf};
2829		2881
2830	# split very large packets	2882	# split very large packets
2831	if (8192 < length $pkt and $self->{can_lzf}) {	2883	if (8192 < length $pkt and $self->{can_lzf}) {
2832	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;	2884	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2833	$pkt = "frag";	2885	$pkt = "frag";
2834	}	2886	}
2835		2887
2836	$self->send_packet ($pkt);	2888	$self->send_packet ($pkt);
2837	} else {
2838	if ($color >= 0) {
2839	# replace some tags by gcfclient-compatible ones
2840	for ($msg) {
2841	1 while
2842	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2843	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2844	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2845	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2846	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2847	}
2848
2849	$color &= cf::NDI_COLOR_MASK;
2850
2851	utf8::encode $msg;
2852
2853	if (0 && $msg =~ /\[/) {
2854	# COMMAND/INFO
2855	$self->send_packet ("drawextinfo $color 10 8 $msg")
2856	} else {
2857	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2858	$self->send_packet ("drawinfo $color $msg")
2859	}
2860	}
2861	}
2862	}	2889	}
2863		2890
2864	=item $client->ext_msg ($type, @msg)	2891	=item $client->ext_msg ($type, @msg)
2865		2892
2866	Sends an ext event to the client.	2893	Sends an ext event to the client.
…		…
3041	The following functions and methods are available within a safe environment:	3068	The following functions and methods are available within a safe environment:
3042		3069
3043	cf::object	3070	cf::object
3044	contr pay_amount pay_player map x y force_find force_add destroy	3071	contr pay_amount pay_player map x y force_find force_add destroy
3045	insert remove name archname title slaying race decrease split	3072	insert remove name archname title slaying race decrease split
		3073	value
3046		3074
3047	cf::object::player	3075	cf::object::player
3048	player	3076	player
3049		3077
3050	cf::player	3078	cf::player
…		…
3056	=cut	3084	=cut
3057		3085
3058	for (	3086	for (
3059	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3087	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3060	insert remove inv nrof name archname title slaying race	3088	insert remove inv nrof name archname title slaying race
3061	decrease split destroy change_exp)],	3089	decrease split destroy change_exp value msg lore send_msg)],
3062	["cf::object::player" => qw(player)],	3090	["cf::object::player" => qw(player)],
3063	["cf::player" => qw(peaceful)],	3091	["cf::player" => qw(peaceful send_msg)],
3064	["cf::map" => qw(trigger)],	3092	["cf::map" => qw(trigger)],
3065	) {	3093	) {
3066	no strict 'refs';	3094	no strict 'refs';
3067	my ($pkg, @funs) = @$_;	3095	my ($pkg, @funs) = @$_;
3068	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3096	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
…		…
3085	my ($code, %vars) = @_;	3113	my ($code, %vars) = @_;
3086		3114
3087	my $qcode = $code;	3115	my $qcode = $code;
3088	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3116	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3089	$qcode =~ s/\n/\\n/g;	3117	$qcode =~ s/\n/\\n/g;
		3118
		3119	%vars = (_dummy => 0) unless %vars;
3090		3120
3091	local $_;	3121	local $_;
3092	local @safe::cf::_safe_eval_args = values %vars;	3122	local @safe::cf::_safe_eval_args = values %vars;
3093		3123
3094	my $eval =	3124	my $eval =
…		…
3324	reload_treasures;	3354	reload_treasures;
3325		3355
3326	warn "finished reloading resource files\n";	3356	warn "finished reloading resource files\n";
3327	}	3357	}
3328		3358
3329	sub init {
3330	my $guard = freeze_mainloop;
3331
3332	evthread_start IO::AIO::poll_fileno;
3333
3334	reload_resources;
3335	}
3336
3337	sub reload_config {	3359	sub reload_config {
3338	open my $fh, "<:utf8", "$CONFDIR/config"	3360	open my $fh, "<:utf8", "$CONFDIR/config"
3339	or return;	3361	or return;
3340		3362
3341	local $/;	3363	local $/;
…		…
3353	};	3375	};
3354	warn $@ if $@;	3376	warn $@ if $@;
3355	}	3377	}
3356	}	3378	}
3357		3379
		3380	sub pidfile() {
		3381	sysopen my $fh, $PIDFILE, O_RDWR \| O_CREAT
		3382	or die "$PIDFILE: $!";
		3383	flock $fh, &Fcntl::LOCK_EX
		3384	or die "$PIDFILE: flock: $!";
		3385	$fh
		3386	}
		3387
		3388	# make sure only one server instance is running at any one time
		3389	sub atomic {
		3390	my $fh = pidfile;
		3391
		3392	my $pid = <$fh>;
		3393	kill 9, $pid if $pid > 0;
		3394
		3395	seek $fh, 0, 0;
		3396	print $fh $$;
		3397	}
		3398
3358	sub main {	3399	sub main {
		3400	cf::init_globals; # initialise logging
		3401
		3402	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3403	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
		3404	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
		3405	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
		3406
		3407	cf::init_experience;
		3408	cf::init_anim;
		3409	cf::init_attackmess;
		3410	cf::init_dynamic;
		3411
		3412	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
		3413
3359	# we must not ever block the main coroutine	3414	# we must not ever block the main coroutine
3360	local $Coro::idle = sub {	3415	local $Coro::idle = sub {
3361	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3416	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3362	(async {	3417	(async {
3363	$Coro::current->{desc} = "IDLE BUG HANDLER";	3418	$Coro::current->{desc} = "IDLE BUG HANDLER";
3364	EV::loop EV::LOOP_ONESHOT;	3419	EV::loop EV::LOOP_ONESHOT;
3365	})->prio (Coro::PRIO_MAX);	3420	})->prio (Coro::PRIO_MAX);
3366	};	3421	};
3367		3422
3368	{	3423	evthread_start IO::AIO::poll_fileno;
3369	my $guard = freeze_mainloop;	3424
		3425	cf::sync_job {
		3426	reload_resources;
3370	reload_config;	3427	reload_config;
3371	db_init;	3428	db_init;
		3429
		3430	cf::load_settings;
		3431	cf::load_materials;
		3432	cf::init_uuid;
		3433	cf::init_signals;
		3434	cf::init_commands;
		3435	cf::init_skills;
		3436
		3437	cf::init_beforeplay;
		3438
		3439	atomic;
		3440
3372	load_extensions;	3441	load_extensions;
3373		3442
3374	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3443	utime time, time, $RUNTIMEFILE;
		3444
		3445	# no (long-running) fork's whatsoever before this point(!)
		3446	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
		3447
		3448	(pop @POST_INIT)->(0) while @POST_INIT;
3375	}	3449	};
3376		3450
3377	EV::loop;	3451	EV::loop;
3378	}	3452	}
3379		3453
3380	#############################################################################	3454	#############################################################################
…		…
3389	};	3463	};
3390	}	3464	}
3391	}	3465	}
3392		3466
3393	sub write_runtime_sync {	3467	sub write_runtime_sync {
3394	my $runtime = "$LOCALDIR/runtime";
3395
3396	# first touch the runtime file to show we are still running:	3468	# first touch the runtime file to show we are still running:
3397	# the fsync below can take a very very long time.	3469	# the fsync below can take a very very long time.
3398		3470
3399	IO::AIO::aio_utime $runtime, undef, undef;	3471	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3400		3472
3401	my $guard = cf::lock_acquire "write_runtime";	3473	my $guard = cf::lock_acquire "write_runtime";
3402		3474
3403	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644	3475	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY \| O_CREAT, 0644
3404	or return;	3476	or return;
3405		3477
3406	my $value = $cf::RUNTIME + 90 + 10;	3478	my $value = $cf::RUNTIME + 90 + 10;
3407	# 10 is the runtime save interval, for a monotonic clock	3479	# 10 is the runtime save interval, for a monotonic clock
3408	# 60 allows for the watchdog to kill the server.	3480	# 60 allows for the watchdog to kill the server.
…		…
3418	aio_utime $fh, undef, undef;	3490	aio_utime $fh, undef, undef;
3419		3491
3420	close $fh	3492	close $fh
3421	or return;	3493	or return;
3422		3494
3423	aio_rename "$runtime~", $runtime	3495	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3424	and return;	3496	and return;
3425		3497
3426	warn "runtime file written.\n";	3498	warn "runtime file written.\n";
3427		3499
3428	1	3500	1
…		…
3440	my $uuid = "$LOCALDIR/uuid";	3512	my $uuid = "$LOCALDIR/uuid";
3441		3513
3442	my $fh = aio_open "$uuid~", O_WRONLY \| O_CREAT, 0644	3514	my $fh = aio_open "$uuid~", O_WRONLY \| O_CREAT, 0644
3443	or return;	3515	or return;
3444		3516
3445	my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;	3517	my $value = uuid_seq uuid_cur;
		3518
		3519	unless ($value) {
		3520	warn "cowardly refusing to write zero uuid value!\n";
		3521	return;
		3522	}
		3523
		3524	my $value = uuid_str $value + $uuid_skip;
3446	$uuid_skip = 0;	3525	$uuid_skip = 0;
3447		3526
3448	(aio_write $fh, 0, (length $value), $value, 0) <= 0	3527	(aio_write $fh, 0, (length $value), $value, 0) <= 0
3449	and return;	3528	and return;
3450		3529
…		…
3472	}	3551	}
3473		3552
3474	sub emergency_save() {	3553	sub emergency_save() {
3475	my $freeze_guard = cf::freeze_mainloop;	3554	my $freeze_guard = cf::freeze_mainloop;
3476		3555
3477	warn "enter emergency perl save\n";	3556	warn "emergency_perl_save: enter\n";
3478		3557
3479	cf::sync_job {	3558	cf::sync_job {
		3559	# this is a trade-off: we want to be very quick here, so
		3560	# save all maps without fsync, and later call a global sync
		3561	# (which in turn might be very very slow)
		3562	local $USE_FSYNC = 0;
		3563
3480	# use a peculiar iteration method to avoid tripping on perl	3564	# use a peculiar iteration method to avoid tripping on perl
3481	# refcount bugs in for. also avoids problems with players	3565	# refcount bugs in for. also avoids problems with players
3482	# and maps saved/destroyed asynchronously.	3566	# and maps saved/destroyed asynchronously.
3483	warn "begin emergency player save\n";	3567	warn "emergency_perl_save: begin player save\n";
3484	for my $login (keys %cf::PLAYER) {	3568	for my $login (keys %cf::PLAYER) {
3485	my $pl = $cf::PLAYER{$login} or next;	3569	my $pl = $cf::PLAYER{$login} or next;
3486	$pl->valid or next;	3570	$pl->valid or next;
3487	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3571	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3488	$pl->save;	3572	$pl->save;
3489	}	3573	}
3490	warn "end emergency player save\n";	3574	warn "emergency_perl_save: end player save\n";
3491		3575
3492	warn "begin emergency map save\n";	3576	warn "emergency_perl_save: begin map save\n";
3493	for my $path (keys %cf::MAP) {	3577	for my $path (keys %cf::MAP) {
3494	my $map = $cf::MAP{$path} or next;	3578	my $map = $cf::MAP{$path} or next;
3495	$map->valid or next;	3579	$map->valid or next;
3496	$map->save;	3580	$map->save;
3497	}	3581	}
3498	warn "end emergency map save\n";	3582	warn "emergency_perl_save: end map save\n";
3499		3583
3500	warn "begin emergency database checkpoint\n";	3584	warn "emergency_perl_save: begin database checkpoint\n";
3501	BDB::db_env_txn_checkpoint $DB_ENV;	3585	BDB::db_env_txn_checkpoint $DB_ENV;
3502	warn "end emergency database checkpoint\n";	3586	warn "emergency_perl_save: end database checkpoint\n";
3503		3587
3504	warn "begin write uuid\n";	3588	warn "emergency_perl_save: begin write uuid\n";
3505	write_uuid_sync 1;	3589	write_uuid_sync 1;
3506	warn "end write uuid\n";	3590	warn "emergency_perl_save: end write uuid\n";
3507	};	3591	};
3508		3592
		3593	warn "emergency_perl_save: starting sync()\n";
		3594	IO::AIO::aio_sync sub {
		3595	warn "emergency_perl_save: finished sync()\n";
		3596	};
		3597
3509	warn "leave emergency perl save\n";	3598	warn "emergency_perl_save: leave\n";
3510	}	3599	}
3511		3600
3512	sub post_cleanup {	3601	sub post_cleanup {
3513	my ($make_core) = @_;	3602	my ($make_core) = @_;
3514		3603
3515	warn Carp::longmess "post_cleanup backtrace"	3604	warn Carp::longmess "post_cleanup backtrace"
3516	if $make_core;	3605	if $make_core;
		3606
		3607	my $fh = pidfile;
		3608	unlink $PIDFILE if <$fh> == $$;
3517	}	3609	}
3518		3610
3519	# a safer delete_package, copied from Symbol	3611	# a safer delete_package, copied from Symbol
3520	sub clear_package($) {	3612	sub clear_package($) {
3521	my $pkg = shift;	3613	my $pkg = shift;
…		…
3537	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3629	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3538	for my $name (keys %$leaf_symtab) {	3630	for my $name (keys %$leaf_symtab) {
3539	_gv_clear *{"$pkg$name"};	3631	_gv_clear *{"$pkg$name"};
3540	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3632	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3541	}	3633	}
3542	warn "cleared package #$pkg\n";#d#	3634	warn "cleared package $pkg\n";#d#
3543	}	3635	}
3544
3545	our $RELOAD; # how many times to reload
3546		3636
3547	sub do_reload_perl() {	3637	sub do_reload_perl() {
3548	# can/must only be called in main	3638	# can/must only be called in main
3549	if ($Coro::current != $Coro::main) {	3639	if ($Coro::current != $Coro::main) {
3550	warn "can only reload from main coroutine";	3640	warn "can only reload from main coroutine";
3551	return;	3641	return;
3552	}	3642	}
3553		3643
3554	return if $RELOAD++;	3644	return if $RELOAD++;
		3645
		3646	my $t1 = EV::time;
3555		3647
3556	while ($RELOAD) {	3648	while ($RELOAD) {
3557	warn "reloading...";	3649	warn "reloading...";
3558		3650
3559	warn "entering sync_job";	3651	warn "entering sync_job";
…		…
3620	clear_package "safe::$_"	3712	clear_package "safe::$_"
3621	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3713	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3622		3714
3623	warn "unloading cf.pm \"a bit\"";	3715	warn "unloading cf.pm \"a bit\"";
3624	delete $INC{"cf.pm"};	3716	delete $INC{"cf.pm"};
3625	delete $INC{"cf/pod.pm"};	3717	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3626		3718
3627	# don't, removes xs symbols, too,	3719	# don't, removes xs symbols, too,
3628	# and global variables created in xs	3720	# and global variables created in xs
3629	#clear_package __PACKAGE__;	3721	#clear_package __PACKAGE__;
3630		3722
…		…
3638	cf::reload_config;	3730	cf::reload_config;
3639		3731
3640	warn "loading extensions";	3732	warn "loading extensions";
3641	cf::load_extensions;	3733	cf::load_extensions;
3642		3734
		3735	if ($REATTACH_ON_RELOAD) {
3643	warn "reattaching attachments to objects/players";	3736	warn "reattaching attachments to objects/players";
3644	_global_reattach; # objects, sockets	3737	_global_reattach; # objects, sockets
3645	warn "reattaching attachments to maps";	3738	warn "reattaching attachments to maps";
3646	reattach $_ for values %MAP;	3739	reattach $_ for values %MAP;
3647	warn "reattaching attachments to players";	3740	warn "reattaching attachments to players";
3648	reattach $_ for values %PLAYER;	3741	reattach $_ for values %PLAYER;
		3742	}
		3743
		3744	warn "running post_init jobs";
		3745	(pop @POST_INIT)->(1) while @POST_INIT;
3649		3746
3650	warn "leaving sync_job";	3747	warn "leaving sync_job";
3651		3748
3652	1	3749	1
3653	} or do {	3750	} or do {
…		…
3656	};	3753	};
3657		3754
3658	warn "reloaded";	3755	warn "reloaded";
3659	--$RELOAD;	3756	--$RELOAD;
3660	}	3757	}
		3758
		3759	$t1 = EV::time - $t1;
		3760	warn "reload completed in ${t1}s\n";
3661	};	3761	};
3662		3762
3663	our $RELOAD_WATCHER; # used only during reload	3763	our $RELOAD_WATCHER; # used only during reload
3664		3764
3665	sub reload_perl() {	3765	sub reload_perl() {
3666	# doing reload synchronously and two reloads happen back-to-back,	3766	# doing reload synchronously and two reloads happen back-to-back,
3667	# coro crashes during coro_state_free->destroy here.	3767	# coro crashes during coro_state_free->destroy here.
3668		3768
		3769	$RELOAD_WATCHER \|\|= cf::async {
		3770	Coro::AIO::aio_wait cache_extensions;
		3771
3669	$RELOAD_WATCHER \|\|= EV::timer 0, 0, sub {	3772	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3670	do_reload_perl;	3773	do_reload_perl;
3671	undef $RELOAD_WATCHER;	3774	undef $RELOAD_WATCHER;
		3775	};
3672	};	3776	};
3673	}	3777	}
3674		3778
3675	register_command "reload" => sub {	3779	register_command "reload" => sub {
3676	my ($who, $arg) = @_;	3780	my ($who, $arg) = @_;
…		…
3802	$msg =~ s/\n//;	3906	$msg =~ s/\n//;
3803		3907
3804	# limit the # of concurrent backtraces	3908	# limit the # of concurrent backtraces
3805	if ($_log_backtrace < 2) {	3909	if ($_log_backtrace < 2) {
3806	++$_log_backtrace;	3910	++$_log_backtrace;
		3911	my $perl_bt = Carp::longmess $msg;
3807	async {	3912	async {
3808	$Coro::current->{desc} = "abt $msg";	3913	$Coro::current->{desc} = "abt $msg";
3809		3914
3810	my @bt = fork_call {	3915	my @bt = fork_call {
3811	@addr = map { sprintf "%x", $_ } @addr;	3916	@addr = map { sprintf "%x", $_ } @addr;
…		…
3822	}	3927	}
3823		3928
3824	@funcs	3929	@funcs
3825	};	3930	};
3826		3931
3827	LOG llevInfo, "[ABT] $msg\n";	3932	LOG llevInfo, "[ABT] $perl_bt\n";
		3933	LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3828	LOG llevInfo, "[ABT] $_\n" for @bt;	3934	LOG llevInfo, "[ABT] $_\n" for @bt;
3829	--$_log_backtrace;	3935	--$_log_backtrace;
3830	};	3936	};
3831	} else {	3937	} else {
3832	LOG llevInfo, "[ABT] $msg\n";	3938	LOG llevInfo, "[ABT] $msg\n";
3833	LOG llevInfo, "[ABT] [suppressed]\n";	3939	LOG llevInfo, "[ABT] [suppressed]\n";
3834	}	3940	}
3835	}	3941	}
3836		3942
3837	# load additional modules	3943	# load additional modules
3838	use cf::pod;	3944	require "cf/$_.pm" for @EXTRA_MODULES;
3839		3945
3840	END { cf::emergency_save }	3946	END { cf::emergency_save }
3841		3947
3842	1	3948	1
3843		3949

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.444 by root, Mon Sep 8 11:27:25 2008 UTC vs. Revision 1.471 by root, Mon Apr 27 01:38:48 2009 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.444 by root, Mon Sep 8 11:27:25 2008 UTC vs.
Revision 1.471 by root, Mon Apr 27 01:38:48 2009 UTC