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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.237 by root, Fri Apr 13 05:08:51 2007 UTC vs.
Revision 1.270 by root, Sat May 26 15:44:06 2007 UTC

…		…
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Symbol;	6	use Symbol;
7	use List::Util;	7	use List::Util;
		8	use Socket;
8	use Storable;	9	use Storable;
9	use Event;	10	use Event;
10	use Opcode;	11	use Opcode;
11	use Safe;	12	use Safe;
12	use Safe::Hole;	13	use Safe::Hole;
13		14
14	use Coro 3.52 ();	15	use Coro 3.61 ();
15	use Coro::State;	16	use Coro::State;
		17	use Coro::Handle;
16	use Coro::Event;	18	use Coro::Event;
17	use Coro::Timer;	19	use Coro::Timer;
18	use Coro::Signal;	20	use Coro::Signal;
19	use Coro::Semaphore;	21	use Coro::Semaphore;
20	use Coro::AIO;	22	use Coro::AIO;
…		…
52	our %EXT_CORO = (); # coroutines bound to extensions	54	our %EXT_CORO = (); # coroutines bound to extensions
53	our %EXT_MAP = (); # pluggable maps	55	our %EXT_MAP = (); # pluggable maps
54		56
55	our $RELOAD; # number of reloads so far	57	our $RELOAD; # number of reloads so far
56	our @EVENT;	58	our @EVENT;
57	our $LIBDIR = datadir . "/ext";
58		59
59	our $TICK = MAX_TIME * 1e-6;	60	our $CONFDIR = confdir;
		61	our $DATADIR = datadir;
		62	our $LIBDIR = "$DATADIR/ext";
		63	our $PODDIR = "$DATADIR/pod";
		64	our $MAPDIR = "$DATADIR/" . mapdir;
		65	our $LOCALDIR = localdir;
		66	our $TMPDIR = "$LOCALDIR/" . tmpdir;
		67	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
		68	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
		69	our $RANDOMDIR = "$LOCALDIR/random";
		70	our $BDBDIR = "$LOCALDIR/db";
		71
		72	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
60	our $TICK_WATCHER;	73	our $TICK_WATCHER;
61	our $AIO_POLL_WATCHER;	74	our $AIO_POLL_WATCHER;
62	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	75	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
63	our $NEXT_TICK;	76	our $NEXT_TICK;
64	our $NOW;	77	our $NOW;
…		…
73	our $RUNTIME;	86	our $RUNTIME;
74		87
75	our %PLAYER; # all users	88	our %PLAYER; # all users
76	our %MAP; # all maps	89	our %MAP; # all maps
77	our $LINK_MAP; # the special {link} map, which is always available	90	our $LINK_MAP; # the special {link} map, which is always available
78	our $RANDOM_MAPS = cf::localdir . "/random";
79	our $BDB_ENV_DIR = cf::localdir . "/db";
80
81	our $WAIT_FOR_TICK; $WAIT_FOR_TICK \|\|= new Coro::Signal;
82	our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE \|\|= new Coro::Signal;
83		91
84	# used to convert map paths into valid unix filenames by replacing / by ∕	92	# used to convert map paths into valid unix filenames by replacing / by ∕
85	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	93	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
86		94
		95	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
		96	our $LOADAVG; # same thing, but with alpha-smoothing
		97	our $tick_start; # for load detecting purposes
		98
87	binmode STDOUT;	99	binmode STDOUT;
88	binmode STDERR;	100	binmode STDERR;
89		101
90	# read virtual server time, if available	102	# read virtual server time, if available
91	unless ($RUNTIME \|\| !-e cf::localdir . "/runtime") {	103	unless ($RUNTIME \|\| !-e "$LOCALDIR/runtime") {
92	open my $fh, "<", cf::localdir . "/runtime"	104	open my $fh, "<", "$LOCALDIR/runtime"
93	or die "unable to read runtime file: $!";	105	or die "unable to read runtime file: $!";
94	$RUNTIME = <$fh> + 0.;	106	$RUNTIME = <$fh> + 0.;
95	}	107	}
96		108
97	mkdir cf::localdir;	109	mkdir $_
98	mkdir cf::localdir . "/" . cf::playerdir;	110	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
99	mkdir cf::localdir . "/" . cf::tmpdir;
100	mkdir cf::localdir . "/" . cf::uniquedir;
101	mkdir $RANDOM_MAPS;
102	mkdir $BDB_ENV_DIR;
103		111
104	our $EMERGENCY_POSITION;	112	our $EMERGENCY_POSITION;
105		113
106	sub cf::map::normalise;	114	sub cf::map::normalise;
107		115
…		…
118	=item $cf::RUNTIME	126	=item $cf::RUNTIME
119		127
120	The time this server has run, starts at 0 and is increased by $cf::TICK on	128	The time this server has run, starts at 0 and is increased by $cf::TICK on
121	every server tick.	129	every server tick.
122		130
123	=item $cf::LIBDIR	131	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
		132	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
		133	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
124		134
125	The perl library directory, where extensions and cf-specific modules can	135	Various directories - "/etc", read-only install directory, perl-library
126	be found. It will be added to C<@INC> automatically.	136	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
		137	unique-items directory, player file directory, random maps directory and
		138	database environment.
127		139
128	=item $cf::NOW	140	=item $cf::NOW
129		141
130	The time of the last (current) server tick.	142	The time of the last (current) server tick.
131		143
132	=item $cf::TICK	144	=item $cf::TICK
133		145
134	The interval between server ticks, in seconds.	146	The interval between server ticks, in seconds.
		147
		148	=item $cf::LOADAVG
		149
		150	The current CPU load on the server (alpha-smoothed), as a value between 0
		151	(none) and 1 (overloaded), indicating how much time is spent on processing
		152	objects per tick. Healthy values are < 0.5.
		153
		154	=item $cf::LOAD
		155
		156	The raw value load value from the last tick.
135		157
136	=item %cf::CFG	158	=item %cf::CFG
137		159
138	Configuration for the server, loaded from C</etc/crossfire/config>, or	160	Configuration for the server, loaded from C</etc/crossfire/config>, or
139	from wherever your confdir points to.	161	from wherever your confdir points to.
140		162
141	=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE	163	=item cf::wait_for_tick, cf::wait_for_tick_begin
142		164
143	These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)	165	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
144	or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick	166	returns directly I<after> the tick processing (and consequently, can only wake one process
145	processing has been done. Call C<< ->wait >> on them to maximise the	167	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
146	window of cpu time available, or simply to synchronise to the server tick.
147		168
148	=back	169	=back
149		170
150	=cut	171	=cut
151		172
152	BEGIN {	173	BEGIN {
153	*CORE::GLOBAL::warn = sub {	174	*CORE::GLOBAL::warn = sub {
154	my $msg = join "", @_;	175	my $msg = join "", @_;
155	utf8::encode $msg;
156		176
157	$msg .= "\n"	177	$msg .= "\n"
158	unless $msg =~ /\n$/;	178	unless $msg =~ /\n$/;
159		179
		180	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
		181
		182	utf8::encode $msg;
160	LOG llevError, $msg;	183	LOG llevError, $msg;
161	};	184	};
162	}	185	}
163		186
164	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	187	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
234	returned.	257	returned.
235		258
236	Lock names should begin with a unique identifier (for example, cf::map::find	259	Lock names should begin with a unique identifier (for example, cf::map::find
237	uses map_find and cf::map::load uses map_load).	260	uses map_find and cf::map::load uses map_load).
238		261
		262	=item $locked = cf::lock_active $string
		263
		264	Return true if the lock is currently active, i.e. somebody has locked it.
		265
239	=cut	266	=cut
240		267
241	our %LOCK;	268	our %LOCK;
242		269
243	sub lock_wait($) {	270	sub lock_wait($) {
…		…
260		287
261	Coro::guard {	288	Coro::guard {
262	# wake up all waiters, to be on the safe side	289	# wake up all waiters, to be on the safe side
263	$_->ready for @{ delete $LOCK{$key} };	290	$_->ready for @{ delete $LOCK{$key} };
264	}	291	}
		292	}
		293
		294	sub lock_active($) {
		295	my ($key) = @_;
		296
		297	! ! $LOCK{$key}
265	}	298	}
266		299
267	sub freeze_mainloop {	300	sub freeze_mainloop {
268	return unless $TICK_WATCHER->is_active;	301	return unless $TICK_WATCHER->is_active;
269		302
…		…
299		332
300	sub sync_job(&) {	333	sub sync_job(&) {
301	my ($job) = @_;	334	my ($job) = @_;
302		335
303	if ($Coro::current == $Coro::main) {	336	if ($Coro::current == $Coro::main) {
		337	my $time = Event::time;
		338
304	# this is the main coro, too bad, we have to block	339	# this is the main coro, too bad, we have to block
305	# till the operation succeeds, freezing the server :/	340	# till the operation succeeds, freezing the server :/
306		341
307	# TODO: use suspend/resume instead	342	# TODO: use suspend/resume instead
308	# (but this is cancel-safe)	343	# (but this is cancel-safe)
…		…
319		354
320	while ($busy) {	355	while ($busy) {
321	Coro::cede or Event::one_event;	356	Coro::cede or Event::one_event;
322	}	357	}
323		358
		359	$time = Event::time - $time;
		360
		361	LOG llevError \| logBacktrace, Carp::longmess "long sync job"
		362	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
		363
		364	$tick_start += $time; # do not account sync jobs to server load
		365
324	wantarray ? @res : $res[0]	366	wantarray ? @res : $res[0]
325	} else {	367	} else {
326	# we are in another coroutine, how wonderful, everything just works	368	# we are in another coroutine, how wonderful, everything just works
327		369
328	$job->()	370	$job->()
…		…
348		390
349	$coro	391	$coro
350	}	392	}
351		393
352	sub write_runtime {	394	sub write_runtime {
		395	my $runtime = "$LOCALDIR/runtime";
		396
		397	# first touch the runtime file to show we are still running:
		398	# the fsync below can take a very very long time.
		399
		400	if (my $fh = aio_open $runtime, O_WRONLY, 0) {
		401	utime undef, undef, $fh;
		402	}
		403
353	my $guard = cf::lock_acquire "write_runtime";	404	my $guard = cf::lock_acquire "write_runtime";
354
355	my $runtime = cf::localdir . "/runtime";
356		405
357	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644	406	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644
358	or return;	407	or return;
359		408
360	my $value = $cf::RUNTIME + 90 + 10;	409	my $value = $cf::RUNTIME + 90 + 10;
…		…
366		415
367	# always fsync - this file is important	416	# always fsync - this file is important
368	aio_fsync $fh	417	aio_fsync $fh
369	and return;	418	and return;
370		419
		420	# touch it again to show we are up-to-date
		421	utime undef, undef, $fh;
		422
371	close $fh	423	close $fh
372	or return;	424	or return;
373		425
374	aio_rename "$runtime~", $runtime	426	aio_rename "$runtime~", $runtime
375	and return;	427	and return;
		428
		429	warn "runtime file written.\n";#d#
376		430
377	1	431	1
378	}	432	}
379		433
380	=item cf::datalog type => key => value, ...	434	=item cf::datalog type => key => value, ...
…		…
573	$registry = $CB_TYPE[$object_type] \|\|= [];	627	$registry = $CB_TYPE[$object_type] \|\|= [];
574		628
575	} elsif ($type eq "subtype") {	629	} elsif ($type eq "subtype") {
576	defined $object_type or Carp::croak "subtype specified without type";	630	defined $object_type or Carp::croak "subtype specified without type";
577	my $object_subtype = shift @arg;	631	my $object_subtype = shift @arg;
578	$registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] \|\|= [];	632	$registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] \|\|= [];
579		633
580	} elsif ($type eq "package") {	634	} elsif ($type eq "package") {
581	my $pkg = shift @arg;	635	my $pkg = shift @arg;
582		636
583	while (my ($name, $id) = each %cb_id) {	637	while (my ($name, $id) = each %cb_id) {
…		…
624	if (ref $_[0]) {	678	if (ref $_[0]) {
625	_object_attach @_;	679	_object_attach @_;
626	} else {	680	} else {
627	_attach shift->_attach_registry, @_;	681	_attach shift->_attach_registry, @_;
628	}	682	}
		683	_recalc_want;
629	};	684	};
630		685
631	# all those should be optimised	686	# all those should be optimised
632	sub cf::attachable::detach {	687	sub cf::attachable::detach {
633	my ($obj, $name) = @_;	688	my ($obj, $name) = @_;
…		…
636	delete $obj->{_attachment}{$name};	691	delete $obj->{_attachment}{$name};
637	reattach ($obj);	692	reattach ($obj);
638	} else {	693	} else {
639	Carp::croak "cannot, currently, detach class attachments";	694	Carp::croak "cannot, currently, detach class attachments";
640	}	695	}
		696	_recalc_want;
641	};	697	};
642		698
643	sub cf::attachable::attached {	699	sub cf::attachable::attached {
644	my ($obj, $name) = @_;	700	my ($obj, $name) = @_;
645		701
…		…
955	Returns the given player object, loading it if necessary (might block).	1011	Returns the given player object, loading it if necessary (might block).
956		1012
957	=cut	1013	=cut
958		1014
959	sub playerdir($) {	1015	sub playerdir($) {
960	cf::localdir	1016	"$PLAYERDIR/"
961	. "/"
962	. cf::playerdir
963	. "/"
964	. (ref $_[0] ? $_[0]->ob->name : $_[0])	1017	. (ref $_[0] ? $_[0]->ob->name : $_[0])
965	}	1018	}
966		1019
967	sub path($) {	1020	sub path($) {
968	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];	1021	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
…		…
1088	while and may block, so not sync_job-capable, ever.	1141	while and may block, so not sync_job-capable, ever.
1089		1142
1090	=cut	1143	=cut
1091		1144
1092	sub list_logins {	1145	sub list_logins {
1093	my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir	1146	my $dirs = aio_readdir $PLAYERDIR
1094	or return [];	1147	or return [];
1095		1148
1096	my @logins;	1149	my @logins;
1097		1150
1098	for my $login (@$dirs) {	1151	for my $login (@$dirs) {
…		…
1159	my ($self, $type, %msg) = @_;	1212	my ($self, $type, %msg) = @_;
1160		1213
1161	$self->ns->ext_event ($type, %msg);	1214	$self->ns->ext_event ($type, %msg);
1162	}	1215	}
1163		1216
1164	package cf;	1217	=head3 cf::region
		1218
		1219	=over 4
		1220
		1221	=cut
		1222
		1223	package cf::region;
		1224
		1225	=item cf::region::find_by_path $path
		1226
		1227	Tries to decuce the probable region for a map knowing only its path.
		1228
		1229	=cut
		1230
		1231	sub find_by_path($) {
		1232	my ($path) = @_;
		1233
		1234	my ($match, $specificity);
		1235
		1236	for my $region (list) {
		1237	if ($region->match && $path =~ $region->match) {
		1238	($match, $specificity) = ($region, $region->specificity)
		1239	if $region->specificity > $specificity;
		1240	}
		1241	}
		1242
		1243	$match
		1244	}
1165		1245
1166	=back	1246	=back
1167
1168		1247
1169	=head3 cf::map	1248	=head3 cf::map
1170		1249
1171	=over 4	1250	=over 4
1172		1251
…		…
1310		1389
1311	# the original (read-only) location	1390	# the original (read-only) location
1312	sub load_path {	1391	sub load_path {
1313	my ($self) = @_;	1392	my ($self) = @_;
1314		1393
1315	sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}	1394	"$MAPDIR/$self->{path}.map"
1316	}	1395	}
1317		1396
1318	# the temporary/swap location	1397	# the temporary/swap location
1319	sub save_path {	1398	sub save_path {
1320	my ($self) = @_;	1399	my ($self) = @_;
1321		1400
1322	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1401	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1323	sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path	1402	"$TMPDIR/$path.map"
1324	}	1403	}
1325		1404
1326	# the unique path, undef == no special unique path	1405	# the unique path, undef == no special unique path
1327	sub uniq_path {	1406	sub uniq_path {
1328	my ($self) = @_;	1407	my ($self) = @_;
1329		1408
1330	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1409	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1331	sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path	1410	"$UNIQUEDIR/$path"
1332	}	1411	}
1333		1412
1334	# and all this just because we cannot iterate over	1413	# and all this just because we cannot iterate over
1335	# all maps in C++...	1414	# all maps in C++...
1336	sub change_all_map_light {	1415	sub change_all_map_light {
…		…
1403	$self->load_header_orig	1482	$self->load_header_orig
1404	or return;	1483	or return;
1405	$self->prepare_orig;	1484	$self->prepare_orig;
1406	}	1485	}
1407		1486
		1487	$self->default_region (cf::region::find_by_path $self->{path})
		1488	unless $self->default_region;
		1489
1408	1	1490	1
1409	}	1491	}
1410		1492
1411	sub find;	1493	sub find;
1412	sub find {	1494	sub find {
…		…
1445	my ($self) = @_;	1527	my ($self) = @_;
1446		1528
1447	local $self->{deny_reset} = 1; # loading can take a long time	1529	local $self->{deny_reset} = 1; # loading can take a long time
1448		1530
1449	my $path = $self->{path};	1531	my $path = $self->{path};
		1532
		1533	{
1450	my $guard = cf::lock_acquire "map_load:$path";	1534	my $guard = cf::lock_acquire "map_load:$path";
1451		1535
1452	return if $self->in_memory != cf::MAP_SWAPPED;	1536	return if $self->in_memory != cf::MAP_SWAPPED;
1453		1537
1454	$self->in_memory (cf::MAP_LOADING);	1538	$self->in_memory (cf::MAP_LOADING);
1455		1539
1456	$self->alloc;	1540	$self->alloc;
1457		1541
1458	$self->pre_load;	1542	$self->pre_load;
1459
1460	$self->_load_objects ($self->{load_path}, 1)
1461	or return;
1462
1463	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1464	if delete $self->{load_original};
1465
1466	if (my $uniq = $self->uniq_path) {
1467	utf8::encode $uniq;
1468	if (aio_open $uniq, O_RDONLY, 0) {
1469	$self->clear_unique_items;
1470	$self->_load_objects ($uniq, 0);
1471	}
1472	}
1473
1474	Coro::cede;
1475
1476	# now do the right thing for maps
1477	$self->link_multipart_objects;
1478
1479	unless ($self->{deny_activate}) {
1480	$self->decay_objects;
1481	$self->fix_auto_apply;
1482	$self->update_buttons;
1483	Coro::cede;	1543	Coro::cede;
1484	$self->set_darkness_map;	1544
		1545	$self->_load_objects ($self->{load_path}, 1)
		1546	or return;
		1547
		1548	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
		1549	if delete $self->{load_original};
		1550
		1551	if (my $uniq = $self->uniq_path) {
		1552	utf8::encode $uniq;
		1553	if (aio_open $uniq, O_RDONLY, 0) {
		1554	$self->clear_unique_items;
		1555	$self->_load_objects ($uniq, 0);
		1556	}
		1557	}
		1558
		1559	Coro::cede;
		1560	# now do the right thing for maps
		1561	$self->link_multipart_objects;
1485	$self->difficulty ($self->estimate_difficulty)	1562	$self->difficulty ($self->estimate_difficulty)
1486	unless $self->difficulty;	1563	unless $self->difficulty;
1487	Coro::cede;	1564	Coro::cede;
		1565
		1566	unless ($self->{deny_activate}) {
		1567	$self->decay_objects;
		1568	$self->fix_auto_apply;
		1569	$self->update_buttons;
		1570	Coro::cede;
		1571	$self->set_darkness_map;
		1572	Coro::cede;
1488	$self->activate;	1573	$self->activate;
		1574	}
		1575
		1576	$self->in_memory (cf::MAP_IN_MEMORY);
1489	}	1577	}
1490		1578
1491	$self->post_load;	1579	$self->post_load;
1492
1493	$self->in_memory (cf::MAP_IN_MEMORY);
1494	}	1580	}
1495		1581
1496	sub customise_for {	1582	sub customise_for {
1497	my ($self, $ob) = @_;	1583	my ($self, $ob) = @_;
1498		1584
…		…
1689	instantiated unique items. May block.	1775	instantiated unique items. May block.
1690		1776
1691	=cut	1777	=cut
1692		1778
1693	sub unique_maps() {	1779	sub unique_maps() {
1694	my $files = aio_readdir cf::localdir . "/" . cf::uniquedir	1780	my $files = aio_readdir $UNIQUEDIR
1695	or return;	1781	or return;
1696		1782
1697	my @paths;	1783	my @paths;
1698		1784
1699	for (@$files) {	1785	for (@$files) {
…		…
1818	$self->deactivate_recursive;	1904	$self->deactivate_recursive;
1819		1905
1820	return if UNIVERSAL::isa $self->map, "ext::map_link";	1906	return if UNIVERSAL::isa $self->map, "ext::map_link";
1821		1907
1822	$self->{_link_pos} \|\|= [$self->map->{path}, $self->x, $self->y]	1908	$self->{_link_pos} \|\|= [$self->map->{path}, $self->x, $self->y]
1823	if $self->map;	1909	if $self->map && $self->map->{path} ne "{link}";
1824		1910
1825	$self->enter_map ($LINK_MAP \|\| link_map, 10, 10);	1911	$self->enter_map ($LINK_MAP \|\| link_map, 10, 10);
1826	}	1912	}
1827		1913
1828	sub cf::object::player::leave_link {	1914	sub cf::object::player::leave_link {
1829	my ($self, $map, $x, $y) = @_;	1915	my ($self, $map, $x, $y) = @_;
		1916
		1917	return unless $self->contr->active;
1830		1918
1831	my $link_pos = delete $self->{_link_pos};	1919	my $link_pos = delete $self->{_link_pos};
1832		1920
1833	unless ($map) {	1921	unless ($map) {
1834	# restore original map position	1922	# restore original map position
…		…
1857		1945
1858	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	1946	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1859	$self->enter_map ($map, $x, $y);	1947	$self->enter_map ($map, $x, $y);
1860	}	1948	}
1861		1949
1862	cf::player->attach (
1863	on_logout => sub {
1864	my ($pl) = @_;
1865
1866	# abort map switching before logout
1867	if ($pl->ob->{_link_pos}) {
1868	cf::sync_job {
1869	$pl->ob->leave_link
1870	};
1871	}
1872	},
1873	on_login => sub {
1874	my ($pl) = @_;
1875
1876	# try to abort aborted map switching on player login :)
1877	# should happen only on crashes
1878	if ($pl->ob->{_link_pos}) {
1879	$pl->ob->enter_link;
1880	(async {
1881	$pl->ob->reply (undef,
1882	"There was an internal problem at your last logout, "
1883	. "the server will try to bring you to your intended destination in a second.",
1884	cf::NDI_RED);
1885	# we need this sleep as the login has a concurrent enter_exit running
1886	# and this sleep increases chances of the player not ending up in scorn
1887	Coro::Timer::sleep 1;
1888	$pl->ob->leave_link;
1889	})->prio (2);
1890	}
1891	},
1892	);
1893
1894	=item $player_object->goto ($path, $x, $y)	1950	=item $player_object->goto ($path, $x, $y[, $check->($map)])
1895		1951
		1952	Moves the player to the given map-path and coordinates by first freezing
		1953	her, loading and preparing them map, calling the provided $check callback
		1954	that has to return the map if sucecssful, and then unfreezes the player on
		1955	the new (success) or old (failed) map position.
		1956
1896	=cut	1957	=cut
		1958
		1959	our $GOTOGEN;
1897		1960
1898	sub cf::object::player::goto {	1961	sub cf::object::player::goto {
1899	my ($self, $path, $x, $y) = @_;	1962	my ($self, $path, $x, $y, $check) = @_;
		1963
		1964	# do generation counting so two concurrent goto's will be executed in-order
		1965	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1900		1966
1901	$self->enter_link;	1967	$self->enter_link;
1902		1968
1903	(async {	1969	(async {
1904	my $map = eval {	1970	my $map = eval {
1905	my $map = cf::map::find $path;	1971	my $map = cf::map::find $path;
		1972
		1973	if ($map) {
1906	$map = $map->customise_for ($self) if $map;	1974	$map = $map->customise_for ($self);
		1975	$map = $check->($map) if $check && $map;
		1976	} else {
		1977	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);
		1978	}
		1979
1907	$map	1980	$map
		1981	};
		1982
		1983	if ($@) {
		1984	$self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE \| cf::NDI_RED);
		1985	LOG llevError \| logBacktrace, Carp::longmess $@;
1908	} or	1986	}
1909	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);
1910		1987
		1988	if ($gen == $self->{_goto_generation}) {
		1989	delete $self->{_goto_generation};
1911	$self->leave_link ($map, $x, $y);	1990	$self->leave_link ($map, $x, $y);
		1991	}
1912	})->prio (1);	1992	})->prio (1);
1913	}	1993	}
1914		1994
1915	=item $player_object->enter_exit ($exit_object)	1995	=item $player_object->enter_exit ($exit_object)
1916		1996
…		…
1955		2035
1956	$rmp->{random_seed} \|\|= $exit->random_seed;	2036	$rmp->{random_seed} \|\|= $exit->random_seed;
1957		2037
1958	my $data = cf::to_json $rmp;	2038	my $data = cf::to_json $rmp;
1959	my $md5 = Digest::MD5::md5_hex $data;	2039	my $md5 = Digest::MD5::md5_hex $data;
1960	my $meta = "$cf::RANDOM_MAPS/$md5.meta";	2040	my $meta = "$RANDOMDIR/$md5.meta";
1961		2041
1962	if (my $fh = aio_open "$meta~", O_WRONLY \| O_CREAT, 0666) {	2042	if (my $fh = aio_open "$meta~", O_WRONLY \| O_CREAT, 0666) {
1963	aio_write $fh, 0, (length $data), $data, 0;	2043	aio_write $fh, 0, (length $data), $data, 0;
1964	undef $fh;	2044	undef $fh;
1965	aio_rename "$meta~", $meta;	2045	aio_rename "$meta~", $meta;
…		…
2234	#############################################################################	2314	#############################################################################
2235		2315
2236	=head2 EXTENSION DATABASE SUPPORT	2316	=head2 EXTENSION DATABASE SUPPORT
2237		2317
2238	Crossfire maintains a very simple database for extension use. It can	2318	Crossfire maintains a very simple database for extension use. It can
2239	currently store anything that can be serialised using Storable, which	2319	currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2240	excludes objects.	2320	convert to/from binary).
2241		2321
2242	The parameter C<$family> should best start with the name of the extension	2322	The parameter C<$family> should best start with the name of the extension
2243	using it, it should be unique.	2323	using it, it should be unique.
2244		2324
2245	=over 4	2325	=over 4
…		…
2268	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;	2348	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
2269	cf::cleanup "db_open(db): $!" if $!;	2349	cf::cleanup "db_open(db): $!" if $!;
2270	};	2350	};
2271	cf::cleanup "db_open(db): $@" if $@;	2351	cf::cleanup "db_open(db): $@" if $@;
2272	};	2352	};
2273
2274	my $path = cf::localdir . "/database.pst";
2275	if (stat $path) {
2276	cf::sync_job {
2277	my $pst = Storable::retrieve $path;
2278
2279	cf::db_put (board => data => $pst->{board});
2280	cf::db_put (guildrules => data => $pst->{guildrules});
2281	cf::db_put (rent => balance => $pst->{rent}{balance});
2282	BDB::db_env_txn_checkpoint $DB_ENV;
2283
2284	unlink $path;
2285	};
2286	}
2287	}	2353	}
2288	}	2354	}
2289		2355
2290	sub db_get($$) {	2356	sub db_get($$) {
2291	my $key = "$_[0]/$_[1]";	2357	my $key = "$_[0]/$_[1]";
2292		2358
2293	cf::sync_job {	2359	cf::sync_job {
2294	BDB::db_get $DB, undef, $key, my $data;	2360	BDB::db_get $DB, undef, $key, my $data;
2295		2361
2296	$! ? ()	2362	$! ? ()
2297	: Compress::LZF::sthaw $data	2363	: $data
2298	}	2364	}
2299	}	2365	}
2300		2366
2301	sub db_put($$$) {	2367	sub db_put($$$) {
2302	BDB::dbreq_pri 4;	2368	BDB::dbreq_pri 4;
2303	BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };	2369	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2304	}	2370	}
		2371
		2372	=item cf::cache $id => [$paths...], $processversion => $process
		2373
		2374	Generic caching function that returns the value of the resource $id,
		2375	caching and regenerating as required.
		2376
		2377	This function can block.
		2378
		2379	=cut
		2380
		2381	sub cache {
		2382	my ($id, $src, $processversion, $process) = @_;
		2383
		2384	my $meta =
		2385	join "\x00",
		2386	$processversion,
		2387	map {
		2388	aio_stat $_
		2389	and Carp::croak "$_: $!";
		2390
		2391	($_, (stat _)[7,9])
		2392	} @$src;
		2393
		2394	my $dbmeta = db_get cache => "$id/meta";
		2395	if ($dbmeta ne $meta) {
		2396	# changed, we may need to process
		2397
		2398	my @data;
		2399	my $md5;
		2400
		2401	for (0 .. $#$src) {
		2402	0 <= aio_load $src->[$_], $data[$_]
		2403	or Carp::croak "$src->[$_]: $!";
		2404	}
		2405
		2406	# if processing is expensive, check
		2407	# checksum first
		2408	if (1) {
		2409	$md5 =
		2410	join "\x00",
		2411	$processversion,
		2412	map {
		2413	Coro::cede;
		2414	($src->[$_], Digest::MD5::md5_hex $data[$_])
		2415	} 0.. $#$src;
		2416
		2417
		2418	my $dbmd5 = db_get cache => "$id/md5";
		2419	if ($dbmd5 eq $md5) {
		2420	db_put cache => "$id/meta", $meta;
		2421
		2422	return db_get cache => "$id/data";
		2423	}
		2424	}
		2425
		2426	my $t1 = Time::HiRes::time;
		2427	my $data = $process->(\@data);
		2428	my $t2 = Time::HiRes::time;
		2429
		2430	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
		2431
		2432	db_put cache => "$id/data", $data;
		2433	db_put cache => "$id/md5" , $md5;
		2434	db_put cache => "$id/meta", $meta;
		2435
		2436	return $data;
		2437	}
		2438
		2439	db_get cache => "$id/data"
		2440	}
		2441
		2442	=item fork_call { }, $args
		2443
		2444	Executes the given code block with the given arguments in a seperate
		2445	process, returning the results. Everything must be serialisable with
		2446	Coro::Storable. May, of course, block. Note that the executed sub may
		2447	never block itself or use any form of Event handling.
		2448
		2449	=cut
		2450
		2451	sub fork_call(&@) {
		2452	my ($cb, @args) = @_;
		2453
		2454	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
		2455	# or die "socketpair: $!";
		2456	pipe my $fh1, my $fh2
		2457	or die "pipe: $!";
		2458
		2459	if (my $pid = fork) {
		2460	close $fh2;
		2461
		2462	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
		2463	$res = Coro::Storable::thaw $res;
		2464
		2465	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
		2466
		2467	die $$res unless "ARRAY" eq ref $res;
		2468
		2469	return wantarray ? @$res : $res->[-1];
		2470	} else {
		2471	reset_signals;
		2472	local $SIG{__WARN__};
		2473	local $SIG{__DIE__};
		2474	eval {
		2475	close $fh1;
		2476
		2477	my @res = eval { $cb->(@args) };
		2478	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
		2479	};
		2480
		2481	warn $@ if $@;
		2482	_exit 0;
		2483	}
		2484	}
		2485
		2486
2305		2487
2306	#############################################################################	2488	#############################################################################
2307	# the server's init and main functions	2489	# the server's init and main functions
2308		2490
2309	sub load_facedata {	2491	sub load_facedata($) {
2310	my $path = sprintf "%s/facedata", cf::datadir;	2492	my ($path) = @_;
2311		2493
2312	warn "loading facedata from $path\n";	2494	warn "loading facedata from $path\n";
2313		2495
2314	my $facedata;	2496	my $facedata;
2315	0 < aio_load $path, $facedata	2497	0 < aio_load $path, $facedata
…		…
2356	}	2538	}
2357		2539
2358	1	2540	1
2359	}	2541	}
2360		2542
		2543	sub reload_regions {
		2544	load_resource_file "$MAPDIR/regions"
		2545	or die "unable to load regions file\n";
		2546	}
		2547
		2548	sub reload_facedata {
		2549	load_facedata "$DATADIR/facedata"
		2550	or die "unable to load facedata\n";
		2551	}
		2552
		2553	sub reload_archetypes {
		2554	load_resource_file "$DATADIR/archetypes"
		2555	or die "unable to load archetypes\n";
		2556	}
		2557
		2558	sub reload_treasures {
		2559	load_resource_file "$DATADIR/treasures"
		2560	or die "unable to load treasurelists\n";
		2561	}
		2562
2361	sub reload_resources {	2563	sub reload_resources {
2362	load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir	2564	warn "reloading resource files...\n";
2363	or die "unable to load regions file\n";#d#	2565
		2566	reload_regions;
2364	load_facedata	2567	reload_facedata;
2365	or die "unable to load facedata\n";#d#	2568	reload_archetypes;
		2569	reload_treasures;
		2570
		2571	warn "finished reloading resource files\n";
2366	}	2572	}
2367		2573
2368	sub init {	2574	sub init {
2369	reload_resources;	2575	reload_resources;
2370	}	2576	}
2371		2577
2372	sub cfg_load {	2578	sub cfg_load {
2373	open my $fh, "<:utf8", cf::confdir . "/config"	2579	open my $fh, "<:utf8", "$CONFDIR/config"
2374	or return;	2580	or return;
2375		2581
2376	local $/;	2582	local $/;
2377	*CFG = YAML::Syck::Load <$fh>;	2583	*CFG = YAML::Syck::Load <$fh>;
2378		2584
…		…
2463		2669
2464	warn Carp::longmess "post_cleanup backtrace"	2670	warn Carp::longmess "post_cleanup backtrace"
2465	if $make_core;	2671	if $make_core;
2466	}	2672	}
2467		2673
2468	sub reload() {	2674	sub do_reload_perl() {
2469	# can/must only be called in main	2675	# can/must only be called in main
2470	if ($Coro::current != $Coro::main) {	2676	if ($Coro::current != $Coro::main) {
2471	warn "can only reload from main coroutine";	2677	warn "can only reload from main coroutine";
2472	return;	2678	return;
2473	}	2679	}
…		…
2548	Symbol::delete_package "safe::$_"	2754	Symbol::delete_package "safe::$_"
2549	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	2755	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2550		2756
2551	warn "unloading cf.pm \"a bit\"";	2757	warn "unloading cf.pm \"a bit\"";
2552	delete $INC{"cf.pm"};	2758	delete $INC{"cf.pm"};
		2759	delete $INC{"cf/pod.pm"};
2553		2760
2554	# don't, removes xs symbols, too,	2761	# don't, removes xs symbols, too,
2555	# and global variables created in xs	2762	# and global variables created in xs
2556	#Symbol::delete_package __PACKAGE__;	2763	#Symbol::delete_package __PACKAGE__;
2557		2764
…		…
2572	warn "reattaching attachments to maps";	2779	warn "reattaching attachments to maps";
2573	reattach $_ for values %MAP;	2780	reattach $_ for values %MAP;
2574	warn "reattaching attachments to players";	2781	warn "reattaching attachments to players";
2575	reattach $_ for values %PLAYER;	2782	reattach $_ for values %PLAYER;
2576		2783
2577	warn "loading reloadable resources";
2578	reload_resources;
2579
2580	warn "leaving sync_job";	2784	warn "leaving sync_job";
2581		2785
2582	1	2786	1
2583	} or do {	2787	} or do {
2584	warn $@;	2788	warn $@;
…		…
2589	warn "reloaded";	2793	warn "reloaded";
2590	};	2794	};
2591		2795
2592	our $RELOAD_WATCHER; # used only during reload	2796	our $RELOAD_WATCHER; # used only during reload
2593		2797
		2798	sub reload_perl() {
		2799	# doing reload synchronously and two reloads happen back-to-back,
		2800	# coro crashes during coro_state_free->destroy here.
		2801
		2802	$RELOAD_WATCHER \|\|= Event->timer (
		2803	reentrant => 0,
		2804	after => 0,
		2805	data => WF_AUTOCANCEL,
		2806	cb => sub {
		2807	do_reload_perl;
		2808	undef $RELOAD_WATCHER;
		2809	},
		2810	);
		2811	}
		2812
2594	register_command "reload" => sub {	2813	register_command "reload" => sub {
2595	my ($who, $arg) = @_;	2814	my ($who, $arg) = @_;
2596		2815
2597	if ($who->flag (FLAG_WIZ)) {	2816	if ($who->flag (FLAG_WIZ)) {
2598	$who->message ("reloading server.");	2817	$who->message ("reloading server.");
2599		2818	async { reload_perl };
2600	# doing reload synchronously and two reloads happen back-to-back,
2601	# coro crashes during coro_state_free->destroy here.
2602
2603	$RELOAD_WATCHER \|\|= Event->timer (
2604	reentrant => 0,
2605	after => 0,
2606	data => WF_AUTOCANCEL,
2607	cb => sub {
2608	reload;
2609	undef $RELOAD_WATCHER;
2610	},
2611	);
2612	}	2819	}
2613	};	2820	};
2614		2821
2615	unshift @INC, $LIBDIR;	2822	unshift @INC, $LIBDIR;
2616		2823
2617	my $bug_warning = 0;	2824	my $bug_warning = 0;
2618		2825
		2826	our @WAIT_FOR_TICK;
		2827	our @WAIT_FOR_TICK_BEGIN;
		2828
		2829	sub wait_for_tick {
		2830	return unless $TICK_WATCHER->is_active;
		2831	return if $Coro::current == $Coro::main;
		2832
		2833	my $signal = new Coro::Signal;
		2834	push @WAIT_FOR_TICK, $signal;
		2835	$signal->wait;
		2836	}
		2837
		2838	sub wait_for_tick_begin {
		2839	return unless $TICK_WATCHER->is_active;
		2840	return if $Coro::current == $Coro::main;
		2841
		2842	my $signal = new Coro::Signal;
		2843	push @WAIT_FOR_TICK_BEGIN, $signal;
		2844	$signal->wait;
		2845	}
		2846
		2847	my $min = 1e6;#d#
		2848	my $avg = 10;
2619	$TICK_WATCHER = Event->timer (	2849	$TICK_WATCHER = Event->timer (
2620	reentrant => 0,	2850	reentrant => 0,
2621	parked => 1,	2851	parked => 1,
2622	prio => 0,	2852	prio => 0,
2623	at => $NEXT_TICK \|\| $TICK,	2853	at => $NEXT_TICK \|\| $TICK,
…		…
2627	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	2857	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2628	unless ++$bug_warning > 10;	2858	unless ++$bug_warning > 10;
2629	return;	2859	return;
2630	}	2860	}
2631		2861
2632	$NOW = Event::time;	2862	$NOW = $tick_start = Event::time;
2633		2863
2634	cf::server_tick; # one server iteration	2864	cf::server_tick; # one server iteration
		2865
		2866	0 && sync_job {#d#
		2867	for(1..10) {
		2868	my $t = Event::time;
		2869	my $map = my $map = new_from_path cf::map "/tmp/x.map"
		2870	or die;
		2871
		2872	$map->width (50);
		2873	$map->height (50);
		2874	$map->alloc;
		2875	$map->_load_objects ("/tmp/x.map", 1);
		2876	my $t = Event::time - $t;
		2877
		2878	#next unless $t < 0.0013;#d#
		2879	if ($t < $min) {
		2880	$min = $t;
		2881	}
		2882	$avg = $avg * 0.99 + $t * 0.01;
		2883	}
		2884	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
		2885	exit 0;
		2886	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
		2887	};
		2888
2635	$RUNTIME += $TICK;	2889	$RUNTIME += $TICK;
2636	$NEXT_TICK += $TICK;	2890	$NEXT_TICK += $TICK;
2637		2891
2638	if ($NOW >= $NEXT_RUNTIME_WRITE) {	2892	if ($NOW >= $NEXT_RUNTIME_WRITE) {
2639	$NEXT_RUNTIME_WRITE = $NOW + 10;	2893	$NEXT_RUNTIME_WRITE = $NOW + 10;
…		…
2641	write_runtime	2895	write_runtime
2642	or warn "ERROR: unable to write runtime file: $!";	2896	or warn "ERROR: unable to write runtime file: $!";
2643	};	2897	};
2644	}	2898	}
2645		2899
2646	$WAIT_FOR_TICK->broadcast;
2647	$WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2648
2649	# my $AFTER = Event::time;	2900	# my $AFTER = Event::time;
2650	# warn $AFTER - $NOW;#d#	2901	# warn $AFTER - $NOW;#d#
2651		2902
		2903	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
		2904	$sig->send;
		2905	}
		2906	while (my $sig = shift @WAIT_FOR_TICK) {
		2907	$sig->send;
		2908	}
		2909
		2910	$NOW = Event::time;
		2911
2652	# if we are delayed by four ticks or more, skip them all	2912	# if we are delayed by four ticks or more, skip them all
2653	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2913	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2654		2914
2655	$TICK_WATCHER->at ($NEXT_TICK);	2915	$TICK_WATCHER->at ($NEXT_TICK);
2656	$TICK_WATCHER->start;	2916	$TICK_WATCHER->start;
		2917
		2918	$LOAD = ($NOW - $tick_start) / $TICK;
		2919	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
		2920
		2921	_post_tick;
		2922
		2923
2657	},	2924	},
2658	);	2925	);
2659		2926
2660	{	2927	{
2661	BDB::max_poll_time $TICK * 0.1;	2928	BDB::max_poll_time $TICK * 0.1;
…		…
2689		2956
2690	cf::sync_job {	2957	cf::sync_job {
2691	eval {	2958	eval {
2692	BDB::db_env_open	2959	BDB::db_env_open
2693	$DB_ENV,	2960	$DB_ENV,
2694	$BDB_ENV_DIR,	2961	$BDBDIR,
2695	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN	2962	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN
2696	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	2963	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
2697	0666;	2964	0666;
2698		2965
2699	cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;	2966	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2700		2967
2701	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);	2968	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
2702	$DB_ENV->set_lk_detect;	2969	$DB_ENV->set_lk_detect;
2703	};	2970	};
2704		2971
…		…
2720	prio => 6,	2987	prio => 6,
2721	cb => \&IO::AIO::poll_cb,	2988	cb => \&IO::AIO::poll_cb,
2722	);	2989	);
2723	}	2990	}
2724		2991
		2992	my $_log_backtrace;
		2993
		2994	sub _log_backtrace {
		2995	my ($msg, @addr) = @_;
		2996
		2997	$msg =~ s/\n//;
		2998
		2999	# limit the # of concurrent backtraces
		3000	if ($_log_backtrace < 2) {
		3001	++$_log_backtrace;
		3002	async {
		3003	my @bt = fork_call {
		3004	@addr = map { sprintf "%x", $_ } @addr;
		3005	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
		3006	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"
		3007	or die "addr2line: $!";
		3008
		3009	my @funcs;
		3010	my @res = <$fh>;
		3011	chomp for @res;
		3012	while (@res) {
		3013	my ($func, $line) = splice @res, 0, 2, ();
		3014	push @funcs, "[$func] $line";
		3015	}
		3016
		3017	@funcs
		3018	};
		3019
		3020	LOG llevInfo, "[ABT] $msg\n";
		3021	LOG llevInfo, "[ABT] $_\n" for @bt;
		3022	--$_log_backtrace;
		3023	};
		3024	} else {
		3025	LOG llevInfo, "[ABT] $msg\n";
		3026	LOG llevInfo, "[ABT] [suppressed]\n";
		3027	}
		3028	}
		3029
		3030	# load additional modules
		3031	use cf::pod;
		3032
2725	END { cf::emergency_save }	3033	END { cf::emergency_save }
2726		3034
2727	1	3035	1
2728		3036

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.237 by root, Fri Apr 13 05:08:51 2007 UTC vs. Revision 1.270 by root, Sat May 26 15:44:06 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.237 by root, Fri Apr 13 05:08:51 2007 UTC vs.
Revision 1.270 by root, Sat May 26 15:44:06 2007 UTC