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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.348 by root, Thu Aug 30 08:34:40 2007 UTC vs.
Revision 1.405 by root, Mon Dec 17 08:03:22 2007 UTC

…		…
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 Socket;
9	use Storable;	9	use EV 1.86;
10	use Event;
11	use Opcode;	10	use Opcode;
12	use Safe;	11	use Safe;
13	use Safe::Hole;	12	use Safe::Hole;
		13	use Storable ();
14		14
15	use Coro 3.64 ();	15	use Coro 4.32 ();
16	use Coro::State;	16	use Coro::State;
17	use Coro::Handle;	17	use Coro::Handle;
18	use Coro::Event;	18	use Coro::EV;
19	use Coro::Timer;	19	use Coro::Timer;
20	use Coro::Signal;	20	use Coro::Signal;
21	use Coro::Semaphore;	21	use Coro::Semaphore;
22	use Coro::AIO;	22	use Coro::AIO;
		23	use Coro::BDB;
23	use Coro::Storable;	24	use Coro::Storable;
24	use Coro::Util ();	25	use Coro::Util ();
25		26
26	use JSON::XS ();	27	use JSON::XS 2.01 ();
27	use BDB ();	28	use BDB ();
28	use Data::Dumper;	29	use Data::Dumper;
29	use Digest::MD5;	30	use Digest::MD5;
30	use Fcntl;	31	use Fcntl;
31	use YAML::Syck ();	32	use YAML::Syck ();
32	use IO::AIO 2.32 ();	33	use IO::AIO 2.51 ();
33	use Time::HiRes;	34	use Time::HiRes;
34	use Compress::LZF;	35	use Compress::LZF;
35	use Digest::MD5 ();	36	use Digest::MD5 ();
36		37
37	# configure various modules to our taste	38	# configure various modules to our taste
38	#	39	#
39	$Storable::canonical = 1; # reduce rsync transfers	40	$Storable::canonical = 1; # reduce rsync transfers
40	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	41	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	42	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43	$Event::Eval = 1; # no idea why this is required, but it is
44		43
45	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?	44	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46	$YAML::Syck::ImplicitUnicode = 1;	45	$YAML::Syck::ImplicitUnicode = 1;
47		46
48	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	47	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
…		…
70	our $TMPDIR = "$LOCALDIR/" . tmpdir;	69	our $TMPDIR = "$LOCALDIR/" . tmpdir;
71	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	70	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	71	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73	our $RANDOMDIR = "$LOCALDIR/random";	72	our $RANDOMDIR = "$LOCALDIR/random";
74	our $BDBDIR = "$LOCALDIR/db";	73	our $BDBDIR = "$LOCALDIR/db";
		74	our %RESOURCE;
75		75
76	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	76	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77	our $TICK_WATCHER;	77	our $TICK_WATCHER;
78	our $AIO_POLL_WATCHER;	78	our $AIO_POLL_WATCHER;
79	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	79	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80	our $NEXT_TICK;	80	our $NEXT_TICK;
81	our $NOW;
82	our $USE_FSYNC = 1; # use fsync to write maps - default off	81	our $USE_FSYNC = 1; # use fsync to write maps - default off
83		82
84	our $BDB_POLL_WATCHER;	83	our $BDB_POLL_WATCHER;
		84	our $BDB_DEADLOCK_WATCHER;
		85	our $BDB_CHECKPOINT_WATCHER;
		86	our $BDB_TRICKLE_WATCHER;
85	our $DB_ENV;	87	our $DB_ENV;
86		88
87	our %CFG;	89	our %CFG;
88		90
89	our $UPTIME; $UPTIME \|\|= time;	91	our $UPTIME; $UPTIME \|\|= time;
90	our $RUNTIME;	92	our $RUNTIME;
		93	our $NOW;
91		94
92	our %PLAYER; # all users	95	our (%PLAYER, %PLAYER_LOADING); # all users
93	our %MAP; # all maps	96	our (%MAP, %MAP_LOADING ); # all maps
94	our $LINK_MAP; # the special {link} map, which is always available	97	our $LINK_MAP; # the special {link} map, which is always available
95		98
96	# used to convert map paths into valid unix filenames by replacing / by ∕	99	# used to convert map paths into valid unix filenames by replacing / by ∕
97	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	100	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98		101
…		…
159		162
160	The raw value load value from the last tick.	163	The raw value load value from the last tick.
161		164
162	=item %cf::CFG	165	=item %cf::CFG
163		166
164	Configuration for the server, loaded from C</etc/crossfire/config>, or	167	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165	from wherever your confdir points to.	168	from wherever your confdir points to.
166		169
167	=item cf::wait_for_tick, cf::wait_for_tick_begin	170	=item cf::wait_for_tick, cf::wait_for_tick_begin
168		171
169	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	172	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
…		…
187	$msg .= "\n"	190	$msg .= "\n"
188	unless $msg =~ /\n$/;	191	unless $msg =~ /\n$/;
189		192
190	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	193	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191		194
192	utf8::encode $msg;
193	LOG llevError, $msg;	195	LOG llevError, $msg;
194	};	196	};
195	}	197	}
196		198
197	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	199	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
213	)) {	215	)) {
214	no strict 'refs';	216	no strict 'refs';
215	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	217	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216	}	218	}
217		219
218	$Event::DIED = sub {	220	$EV::DIED = sub {
219	warn "error in event callback: @_";	221	warn "error in event callback: @_";
220	};	222	};
221		223
222	#############################################################################	224	#############################################################################
223		225
…		…
246	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	248	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247	$d	249	$d
248	} \|\| "[unable to dump $_[0]: '$@']";	250	} \|\| "[unable to dump $_[0]: '$@']";
249	}	251	}
250		252
251	=item $ref = cf::from_json $json	253	=item $ref = cf::decode_json $json
252		254
253	Converts a JSON string into the corresponding perl data structure.	255	Converts a JSON string into the corresponding perl data structure.
254		256
255	=item $json = cf::to_json $ref	257	=item $json = cf::encode_json $ref
256		258
257	Converts a perl data structure into its JSON representation.	259	Converts a perl data structure into its JSON representation.
258		260
259	=cut	261	=cut
260		262
261	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	263	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262		264
263	sub to_json ($) { $json_coder->encode ($_[0]) }	265	sub encode_json($) { $json_coder->encode ($_[0]) }
264	sub from_json ($) { $json_coder->decode ($_[0]) }	266	sub decode_json($) { $json_coder->decode ($_[0]) }
265		267
266	=item cf::lock_wait $string	268	=item cf::lock_wait $string
267		269
268	Wait until the given lock is available. See cf::lock_acquire.	270	Wait until the given lock is available. See cf::lock_acquire.
269		271
…		…
285	Return true if the lock is currently active, i.e. somebody has locked it.	287	Return true if the lock is currently active, i.e. somebody has locked it.
286		288
287	=cut	289	=cut
288		290
289	our %LOCK;	291	our %LOCK;
		292	our %LOCKER;#d#
290		293
291	sub lock_wait($) {	294	sub lock_wait($) {
292	my ($key) = @_;	295	my ($key) = @_;
		296
		297	if ($LOCKER{$key} == $Coro::current) {#d#
		298	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		299	return;#d#
		300	}#d#
293		301
294	# wait for lock, if any	302	# wait for lock, if any
295	while ($LOCK{$key}) {	303	while ($LOCK{$key}) {
296	push @{ $LOCK{$key} }, $Coro::current;	304	push @{ $LOCK{$key} }, $Coro::current;
297	Coro::schedule;	305	Coro::schedule;
…		…
303		311
304	# wait, to be sure we are not locked	312	# wait, to be sure we are not locked
305	lock_wait $key;	313	lock_wait $key;
306		314
307	$LOCK{$key} = [];	315	$LOCK{$key} = [];
		316	$LOCKER{$key} = $Coro::current;#d#
308		317
309	Coro::guard {	318	Coro::guard {
		319	delete $LOCKER{$key};#d#
310	# wake up all waiters, to be on the safe side	320	# wake up all waiters, to be on the safe side
311	$_->ready for @{ delete $LOCK{$key} };	321	$_->ready for @{ delete $LOCK{$key} };
312	}	322	}
313	}	323	}
314		324
…		…
326	};	336	};
327	$TICK_WATCHER->stop;	337	$TICK_WATCHER->stop;
328	$guard	338	$guard
329	}	339	}
330		340
		341	=item cf::periodic $interval, $cb
		342
		343	Like EV::periodic, but randomly selects a starting point so that the actions
		344	get spread over timer.
		345
		346	=cut
		347
		348	sub periodic($$) {
		349	my ($interval, $cb) = @_;
		350
		351	my $start = rand List::Util::min 180, $interval;
		352
		353	EV::periodic $start, $interval, 0, $cb
		354	}
		355
331	=item cf::get_slot $time[, $priority[, $name]]	356	=item cf::get_slot $time[, $priority[, $name]]
332		357
333	Allocate $time seconds of blocking CPU time at priority C<$priority>:	358	Allocate $time seconds of blocking CPU time at priority C<$priority>:
334	This call blocks and returns only when you have at least C<$time> seconds	359	This call blocks and returns only when you have at least C<$time> seconds
335	of cpu time till the next tick. The slot is only valid till the next cede.	360	of cpu time till the next tick. The slot is only valid till the next cede.
…		…
344	our @SLOT_QUEUE;	369	our @SLOT_QUEUE;
345	our $SLOT_QUEUE;	370	our $SLOT_QUEUE;
346		371
347	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	372	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348	$SLOT_QUEUE = Coro::async {	373	$SLOT_QUEUE = Coro::async {
		374	$Coro::current->desc ("timeslot manager");
		375
349	my $signal = new Coro::Signal;	376	my $signal = new Coro::Signal;
350		377
351	while () {	378	while () {
352	next_job:	379	next_job:
353	my $avail = cf::till_tick;	380	my $avail = cf::till_tick;
…		…
361	}	388	}
362	}	389	}
363	}	390	}
364		391
365	if (@SLOT_QUEUE) {	392	if (@SLOT_QUEUE) {
366	# we do not use wait_For_tick() as it returns immediately when tick is inactive	393	# we do not use wait_for_tick() as it returns immediately when tick is inactive
367	push @cf::WAIT_FOR_TICK, $signal;	394	push @cf::WAIT_FOR_TICK, $signal;
368	$signal->wait;	395	$signal->wait;
369	} else {	396	} else {
370	Coro::schedule;	397	Coro::schedule;
371	}	398	}
…		…
394		421
395	BEGIN { *async = \&Coro::async_pool }	422	BEGIN { *async = \&Coro::async_pool }
396		423
397	=item cf::sync_job { BLOCK }	424	=item cf::sync_job { BLOCK }
398		425
399	The design of Crossfire TRT requires that the main coroutine ($Coro::main)	426	The design of Deliantra requires that the main coroutine ($Coro::main)
400	is always able to handle events or runnable, as Crossfire TRT is only	427	is always able to handle events or runnable, as Deliantra is only
401	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not	428	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402	acceptable.	429	acceptable.
403		430
404	If it must be done, put the blocking parts into C<sync_job>. This will run	431	If it must be done, put the blocking parts into C<sync_job>. This will run
405	the given BLOCK in another coroutine while waiting for the result. The	432	the given BLOCK in another coroutine while waiting for the result. The
…		…
410		437
411	sub sync_job(&) {	438	sub sync_job(&) {
412	my ($job) = @_;	439	my ($job) = @_;
413		440
414	if ($Coro::current == $Coro::main) {	441	if ($Coro::current == $Coro::main) {
415	my $time = Event::time;	442	my $time = EV::time;
416		443
417	# this is the main coro, too bad, we have to block	444	# this is the main coro, too bad, we have to block
418	# till the operation succeeds, freezing the server :/	445	# till the operation succeeds, freezing the server :/
419		446
		447	LOG llevError, Carp::longmess "sync job";#d#
		448
420	# TODO: use suspend/resume instead	449	# TODO: use suspend/resume instead
421	# (but this is cancel-safe)	450	# (but this is cancel-safe)
422	my $freeze_guard = freeze_mainloop;	451	my $freeze_guard = freeze_mainloop;
423		452
424	my $busy = 1;	453	my $busy = 1;
425	my @res;	454	my @res;
426		455
427	(async {	456	(async {
		457	$Coro::current->desc ("sync job coro");
428	@res = eval { $job->() };	458	@res = eval { $job->() };
429	warn $@ if $@;	459	warn $@ if $@;
430	undef $busy;	460	undef $busy;
431	})->prio (Coro::PRIO_MAX);	461	})->prio (Coro::PRIO_MAX);
432		462
433	while ($busy) {	463	while ($busy) {
434	Coro::cede or Event::one_event;	464	if (Coro::nready) {
		465	Coro::cede_notself;
		466	} else {
		467	EV::loop EV::LOOP_ONESHOT;
435	}	468	}
		469	}
436		470
437	$time = Event::time - $time;	471	$time = EV::time - $time;
438		472
439	LOG llevError \| logBacktrace, Carp::longmess "long sync job"	473	LOG llevError \| logBacktrace, Carp::longmess "long sync job"
440	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;	474	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441		475
442	$tick_start += $time; # do not account sync jobs to server load	476	$tick_start += $time; # do not account sync jobs to server load
…		…
472	=item fork_call { }, $args	506	=item fork_call { }, $args
473		507
474	Executes the given code block with the given arguments in a seperate	508	Executes the given code block with the given arguments in a seperate
475	process, returning the results. Everything must be serialisable with	509	process, returning the results. Everything must be serialisable with
476	Coro::Storable. May, of course, block. Note that the executed sub may	510	Coro::Storable. May, of course, block. Note that the executed sub may
477	never block itself or use any form of Event handling.	511	never block itself or use any form of event handling.
478		512
479	=cut	513	=cut
480		514
481	sub fork_call(&@) {	515	sub fork_call(&@) {
482	my ($cb, @args) = @_;	516	my ($cb, @args) = @_;
483		517
484	# we seemingly have to make a local copy of the whole thing,	518	# we seemingly have to make a local copy of the whole thing,
485	# otherwise perl prematurely frees the stuff :/	519	# otherwise perl prematurely frees the stuff :/
486	# TODO: investigate and fix (liekly this will be rather laborious)	520	# TODO: investigate and fix (likely this will be rather laborious)
487		521
488	my @res = Coro::Util::fork_eval {	522	my @res = Coro::Util::fork_eval {
489	reset_signals;	523	reset_signals;
490	&$cb	524	&$cb
491	}, @args;	525	}, @args;
…		…
500	=item cf::db_put $family => $key => $value	534	=item cf::db_put $family => $key => $value
501		535
502	Stores the given C<$value> in the family. It can currently store binary	536	Stores the given C<$value> in the family. It can currently store binary
503	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).	537	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504		538
		539	=item $db = cf::db_table "name"
		540
		541	Create and/or open a new database table. The string must not be "db" and must be unique
		542	within each server.
		543
505	=cut	544	=cut
		545
		546	sub db_table($) {
		547	my ($name) = @_;
		548	my $db = BDB::db_create $DB_ENV;
		549
		550	eval {
		551	$db->set_flags (BDB::CHKSUM);
		552
		553	utf8::encode $name;
		554	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		555	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
		556	cf::cleanup "db_open(db): $!" if $!;
		557	};
		558	cf::cleanup "db_open(db): $@" if $@;
		559
		560	$db
		561	}
506		562
507	our $DB;	563	our $DB;
508		564
509	sub db_init {	565	sub db_init {
510	unless ($DB) {
511	$DB = BDB::db_create $DB_ENV;
512
513	cf::sync_job {	566	cf::sync_job {
514	eval {	567	$DB \|\|= db_table "db";
515	$DB->set_flags (BDB::CHKSUM);
516
517	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
519	cf::cleanup "db_open(db): $!" if $!;
520	};
521	cf::cleanup "db_open(db): $@" if $@;
522	};
523	}	568	};
524	}	569	}
525		570
526	sub db_get($$) {	571	sub db_get($$) {
527	my $key = "$_[0]/$_[1]";	572	my $key = "$_[0]/$_[1]";
528		573
…		…
632	attach callbacks/event handlers (a collection of which is called an "attachment")	677	attach callbacks/event handlers (a collection of which is called an "attachment")
633	to it. All such attachable objects support the following methods.	678	to it. All such attachable objects support the following methods.
634		679
635	In the following description, CLASS can be any of C<global>, C<object>	680	In the following description, CLASS can be any of C<global>, C<object>
636	C<player>, C<client> or C<map> (i.e. the attachable objects in	681	C<player>, C<client> or C<map> (i.e. the attachable objects in
637	Crossfire TRT).	682	Deliantra).
638		683
639	=over 4	684	=over 4
640		685
641	=item $attachable->attach ($attachment, key => $value...)	686	=item $attachable->attach ($attachment, key => $value...)
642		687
…		…
940		985
941	=cut	986	=cut
942		987
943	#############################################################################	988	#############################################################################
944	# object support	989	# object support
945	#
946		990
		991	sub _object_equal($$);
		992	sub _object_equal($$) {
		993	my ($a, $b) = @_;
		994
		995	return 0 unless (ref $a) eq (ref $b);
		996
		997	if ("HASH" eq ref $a) {
		998	my @ka = keys %$a;
		999	my @kb = keys %$b;
		1000
		1001	return 0 if @ka != @kb;
		1002
		1003	for (0 .. $#ka) {
		1004	return 0 unless $ka[$_] eq $kb[$_];
		1005	return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
		1006	}
		1007
		1008	} elsif ("ARRAY" eq ref $a) {
		1009
		1010	return 0 if @$a != @$b;
		1011
		1012	for (0 .. $#$a) {
		1013	return 0 unless _object_equal $a->[$_], $b->[$_];
		1014	}
		1015
		1016	} elsif ($a ne $b) {
		1017	return 0;
		1018	}
		1019
		1020	1
		1021	}
		1022
		1023	our $SLOW_MERGES;#d#
947	sub _can_merge {	1024	sub _can_merge {
948	my ($ob1, $ob2) = @_;	1025	my ($ob1, $ob2) = @_;
949		1026
950	local $Storable::canonical = 1;	1027	++$SLOW_MERGES;#d#
951	my $fob1 = Storable::freeze $ob1;
952	my $fob2 = Storable::freeze $ob2;
953		1028
954	$fob1 eq $fob2	1029	# we do the slow way here
		1030	return _object_equal $ob1, $ob2
955	}	1031	}
956		1032
957	sub reattach {	1033	sub reattach {
958	# basically do the same as instantiate, without calling instantiate	1034	# basically do the same as instantiate, without calling instantiate
959	my ($obj) = @_;	1035	my ($obj) = @_;
…		…
981	cf::attachable->attach (	1057	cf::attachable->attach (
982	prio => -1000000,	1058	prio => -1000000,
983	on_instantiate => sub {	1059	on_instantiate => sub {
984	my ($obj, $data) = @_;	1060	my ($obj, $data) = @_;
985		1061
986	$data = from_json $data;	1062	$data = decode_json $data;
987		1063
988	for (@$data) {	1064	for (@$data) {
989	my ($name, $args) = @$_;	1065	my ($name, $args) = @$_;
990		1066
991	$obj->attach ($name, %{$args \|\| {} });	1067	$obj->attach ($name, %{$args \|\| {} });
…		…
1007	sub object_freezer_save {	1083	sub object_freezer_save {
1008	my ($filename, $rdata, $objs) = @_;	1084	my ($filename, $rdata, $objs) = @_;
1009		1085
1010	sync_job {	1086	sync_job {
1011	if (length $$rdata) {	1087	if (length $$rdata) {
		1088	utf8::decode (my $decname = $filename);
1012	warn sprintf "saving %s (%d,%d)\n",	1089	warn sprintf "saving %s (%d,%d)\n",
1013	$filename, length $$rdata, scalar @$objs;	1090	$decname, length $$rdata, scalar @$objs;
1014		1091
1015	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1092	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
1016	chmod SAVE_MODE, $fh;	1093	chmod SAVE_MODE, $fh;
1017	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1094	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018	aio_fsync $fh if $cf::USE_FSYNC;	1095	aio_fsync $fh if $cf::USE_FSYNC;
1019	close $fh;	1096	close $fh;
1020		1097
1021	if (@$objs) {	1098	if (@$objs) {
1022	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {	1099	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {
1023	chmod SAVE_MODE, $fh;	1100	chmod SAVE_MODE, $fh;
1024	my $data = Storable::nfreeze { version => 1, objs => $objs };	1101	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1025	aio_write $fh, 0, (length $data), $data, 0;	1102	aio_write $fh, 0, (length $data), $data, 0;
1026	aio_fsync $fh if $cf::USE_FSYNC;	1103	aio_fsync $fh if $cf::USE_FSYNC;
1027	close $fh;	1104	close $fh;
1028	aio_rename "$filename.pst~", "$filename.pst";	1105	aio_rename "$filename.pst~", "$filename.pst";
1029	}	1106	}
…		…
1037	}	1114	}
1038	} else {	1115	} else {
1039	aio_unlink $filename;	1116	aio_unlink $filename;
1040	aio_unlink "$filename.pst";	1117	aio_unlink "$filename.pst";
1041	}	1118	}
1042	}	1119	};
1043	}	1120	}
1044		1121
1045	sub object_freezer_as_string {	1122	sub object_freezer_as_string {
1046	my ($rdata, $objs) = @_;	1123	my ($rdata, $objs) = @_;
1047		1124
…		…
1059	or return;	1136	or return;
1060		1137
1061	unless (aio_stat "$filename.pst") {	1138	unless (aio_stat "$filename.pst") {
1062	(aio_load "$filename.pst", $av) >= 0	1139	(aio_load "$filename.pst", $av) >= 0
1063	or return;	1140	or return;
		1141
1064	$av = eval { (Storable::thaw $av)->{objs} };	1142	my $st = eval { Coro::Storable::thaw $av };
		1143	$av = $st->{objs};
1065	}	1144	}
1066		1145
		1146	utf8::decode (my $decname = $filename);
1067	warn sprintf "loading %s (%d)\n",	1147	warn sprintf "loading %s (%d,%d)\n",
1068	$filename, length $data, scalar @{$av \|\| []};	1148	$decname, length $data, scalar @{$av \|\| []};
		1149
1069	return ($data, $av);	1150	($data, $av)
1070	}	1151	}
1071		1152
1072	=head2 COMMAND CALLBACKS	1153	=head2 COMMAND CALLBACKS
1073		1154
1074	=over 4	1155	=over 4
…		…
1260		1341
1261	=head3 cf::player	1342	=head3 cf::player
1262		1343
1263	=over 4	1344	=over 4
1264		1345
		1346	=item cf::player::num_playing
		1347
		1348	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1349
		1350	=cut
		1351
		1352	sub num_playing {
		1353	scalar grep
		1354	$_->ob->map
		1355	&& !$_->hidden
		1356	&& !$_->ob->flag (cf::FLAG_WIZ),
		1357	cf::player::list
		1358	}
		1359
1265	=item cf::player::find $login	1360	=item cf::player::find $login
1266		1361
1267	Returns the given player object, loading it if necessary (might block).	1362	Returns the given player object, loading it if necessary (might block).
1268		1363
1269	=cut	1364	=cut
…		…
1304	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1399	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1400	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1401	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307	aio_unlink +(playerdir $login) . "/$login.pl";	1402	aio_unlink +(playerdir $login) . "/$login.pl";
1308		1403
1309	my $pl = load_pl path $login	1404	my $f = new_from_file cf::object::thawer path $login
1310	or return;	1405	or return;
		1406
		1407	my $pl = cf::player::load_pl $f
		1408	or return;
		1409	local $cf::PLAYER_LOADING{$login} = $pl;
		1410	$f->resolve_delayed_derefs;
1311	$cf::PLAYER{$login} = $pl	1411	$cf::PLAYER{$login} = $pl
1312	}	1412	}
1313	}	1413	}
1314	}	1414	}
1315		1415
…		…
1413	or return [];	1513	or return [];
1414		1514
1415	my @logins;	1515	my @logins;
1416		1516
1417	for my $login (@$dirs) {	1517	for my $login (@$dirs) {
		1518	my $path = path $login;
		1519
		1520	# a .pst is a dead give-away for a valid player
		1521	unless (-e "$path.pst") {
1418	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1522	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1419	aio_read $fh, 0, 512, my $buf, 0 or next;	1523	aio_read $fh, 0, 512, my $buf, 0 or next;
1420	$buf !~ /^password -------------$/m or next; # official not-valid tag	1524	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1525	}
1421		1526
1422	utf8::decode $login;	1527	utf8::decode $login;
1423	push @logins, $login;	1528	push @logins, $login;
1424	}	1529	}
1425		1530
…		…
1458		1563
1459	Expand crossfire pod fragments into protocol xml.	1564	Expand crossfire pod fragments into protocol xml.
1460		1565
1461	=cut	1566	=cut
1462		1567
		1568	use re 'eval';
		1569
		1570	my $group;
		1571	my $interior; $interior = qr{
		1572	# match a pod interior sequence sans C<< >>
		1573	(?:
		1574	\ (.*?)\ (?{ $group = $^N })
		1575	\| < (??{$interior}) >
		1576	)
		1577	}x;
		1578
1463	sub expand_cfpod {	1579	sub expand_cfpod {
1464	((my $self), (local $_)) = @_;	1580	my ($self, $pod) = @_;
1465		1581
1466	# escape & and <	1582	my $xml;
1467	s/&/&/g;
1468	s/(?<![BIUGH])</</g;
1469		1583
1470	# this is buggy, it needs to properly take care of nested <'s	1584	while () {
		1585	if ($pod =~ /\G( (?: [^BCGHITU]+ \| .(?!<) )+ )/xgcs) {
		1586	$group = $1;
1471		1587
1472	1 while	1588	$group =~ s/&/&/g;
1473	# replace B<>, I<>, U<> etc.	1589	$group =~ s/</</g;
1474	s/B<([^\>]*)>/<b>$1<\/b>/	1590
1475	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1591	$xml .= $group;
1476	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1592	} elsif ($pod =~ m%\G
1477	# replace G<male\|female> tags	1593	([BCGHITU])
1478	\|\| s{G<([^>\|])\\|([^>])>}{	1594	<
1479	$self->gender ? $2 : $1	1595	(?:
1480	}ge	1596	([^<>]*) (?{ $group = $^N })
1481	# replace H<hint text>	1597	\| < $interior >
1482	\|\| s{H<([^\>]*)>}	1598	)
		1599	>
		1600	%gcsx
1483	{	1601	) {
		1602	my ($code, $data) = ($1, $group);
		1603
		1604	if ($code eq "B") {
		1605	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
		1606	} elsif ($code eq "I") {
		1607	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
		1608	} elsif ($code eq "U") {
		1609	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
		1610	} elsif ($code eq "C") {
		1611	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
		1612	} elsif ($code eq "T") {
		1613	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
		1614	} elsif ($code eq "G") {
		1615	my ($male, $female) = split /\\|/, $data;
		1616	$data = $self->gender ? $female : $male;
		1617	$xml .= expand_cfpod ($self, $data);
		1618	} elsif ($code eq "H") {
1484	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",	1619	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1485	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",	1620	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1486	"")	1621	"")
1487	[$self->{hintmode}]	1622	[$self->{hintmode}];
		1623	} else {
		1624	$xml .= "error processing '$code($data)' directive";
1488	}ge;	1625	}
		1626	} else {
		1627	if ($pod =~ /\G(.+)/) {
		1628	warn "parse error while expanding $pod (at $1)";
		1629	}
		1630	last;
		1631	}
		1632	}
1489		1633
		1634	for ($xml) {
1490	# create single paragraphs (very hackish)	1635	# create single paragraphs (very hackish)
1491	s/(?<=\S)\n(?=\w)/ /g;	1636	s/(?<=\S)\n(?=\w)/ /g;
1492		1637
1493	# compress some whitespace	1638	# compress some whitespace
1494	s/\s+\n/\n/g; # ws line-ends	1639	s/\s+\n/\n/g; # ws line-ends
1495	s/\n\n+/\n/g; # double lines	1640	s/\n\n+/\n/g; # double lines
1496	s/^\n+//; # beginning lines	1641	s/^\n+//; # beginning lines
1497	s/\n+$//; # ending lines	1642	s/\n+$//; # ending lines
		1643	}
1498		1644
1499	$_	1645	$xml
1500	}	1646	}
		1647
		1648	no re 'eval';
1501		1649
1502	sub hintmode {	1650	sub hintmode {
1503	$_[0]{hintmode} = $_[1] if @_ > 1;	1651	$_[0]{hintmode} = $_[1] if @_ > 1;
1504	$_[0]{hintmode}	1652	$_[0]{hintmode}
1505	}	1653	}
…		…
1749		1897
1750	sub load_header_from($) {	1898	sub load_header_from($) {
1751	my ($self, $path) = @_;	1899	my ($self, $path) = @_;
1752		1900
1753	utf8::encode $path;	1901	utf8::encode $path;
1754	#aio_open $path, O_RDONLY, 0	1902	my $f = new_from_file cf::object::thawer $path
1755	# or return;
1756
1757	$self->_load_header ($path)
1758	or return;	1903	or return;
		1904
		1905	$self->_load_header ($f)
		1906	or return;
		1907
		1908	local $MAP_LOADING{$self->{path}} = $self;
		1909	$f->resolve_delayed_derefs;
1759		1910
1760	$self->{load_path} = $path;	1911	$self->{load_path} = $path;
1761		1912
1762	1	1913	1
1763	}	1914	}
…		…
1817	sub find {	1968	sub find {
1818	my ($path, $origin) = @_;	1969	my ($path, $origin) = @_;
1819		1970
1820	$path = normalise $path, $origin && $origin->path;	1971	$path = normalise $path, $origin && $origin->path;
1821		1972
		1973	cf::lock_wait "map_data:$path";#d#remove
1822	cf::lock_wait "map_find:$path";	1974	cf::lock_wait "map_find:$path";
1823		1975
1824	$cf::MAP{$path} \|\| do {	1976	$cf::MAP{$path} \|\| do {
1825	my $guard = cf::lock_acquire "map_find:$path";	1977	my $guard1 = cf::lock_acquire "map_find:$path";
		1978	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1979
1826	my $map = new_from_path cf::map $path	1980	my $map = new_from_path cf::map $path
1827	or return;	1981	or return;
1828		1982
1829	$map->{last_save} = $cf::RUNTIME;	1983	$map->{last_save} = $cf::RUNTIME;
1830		1984
…		…
1832	or return;	1986	or return;
1833		1987
1834	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1988	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835	# doing this can freeze the server in a sync job, obviously	1989	# doing this can freeze the server in a sync job, obviously
1836	#$cf::WAIT_FOR_TICK->wait;	1990	#$cf::WAIT_FOR_TICK->wait;
		1991	undef $guard1;
		1992	undef $guard2;
1837	$map->reset;	1993	$map->reset;
1838	undef $guard;
1839	return find $path;	1994	return find $path;
1840	}	1995	}
1841		1996
1842	$cf::MAP{$path} = $map	1997	$cf::MAP{$path} = $map
1843	}	1998	}
…		…
1852	local $self->{deny_reset} = 1; # loading can take a long time	2007	local $self->{deny_reset} = 1; # loading can take a long time
1853		2008
1854	my $path = $self->{path};	2009	my $path = $self->{path};
1855		2010
1856	{	2011	{
1857	my $guard1 = cf::lock_acquire "map_data:$path";	2012	my $guard = cf::lock_acquire "map_data:$path";
1858	my $guard2 = cf::lock_acquire "map_load:$path";
1859		2013
		2014	return unless $self->valid;
1860	return if $self->in_memory != cf::MAP_SWAPPED;	2015	return unless $self->in_memory == cf::MAP_SWAPPED;
1861		2016
1862	$self->in_memory (cf::MAP_LOADING);	2017	$self->in_memory (cf::MAP_LOADING);
1863		2018
1864	$self->alloc;	2019	$self->alloc;
1865		2020
1866	$self->pre_load;	2021	$self->pre_load;
1867	cf::cede_to_tick;	2022	cf::cede_to_tick;
1868		2023
		2024	my $f = new_from_file cf::object::thawer $self->{load_path};
		2025	$f->skip_block;
1869	$self->_load_objects ($self->{load_path}, 1)	2026	$self->_load_objects ($f)
1870	or return;	2027	or return;
1871		2028
1872	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2029	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1873	if delete $self->{load_original};	2030	if delete $self->{load_original};
1874		2031
1875	if (my $uniq = $self->uniq_path) {	2032	if (my $uniq = $self->uniq_path) {
1876	utf8::encode $uniq;	2033	utf8::encode $uniq;
1877	if (aio_open $uniq, O_RDONLY, 0) {	2034	unless (aio_stat $uniq) {
		2035	if (my $f = new_from_file cf::object::thawer $uniq) {
1878	$self->clear_unique_items;	2036	$self->clear_unique_items;
1879	$self->_load_objects ($uniq, 0);	2037	$self->_load_objects ($f);
		2038	$f->resolve_delayed_derefs;
		2039	}
1880	}	2040	}
1881	}	2041	}
		2042
		2043	$f->resolve_delayed_derefs;
1882		2044
1883	cf::cede_to_tick;	2045	cf::cede_to_tick;
1884	# now do the right thing for maps	2046	# now do the right thing for maps
1885	$self->link_multipart_objects;	2047	$self->link_multipart_objects;
1886	$self->difficulty ($self->estimate_difficulty)	2048	$self->difficulty ($self->estimate_difficulty)
…		…
1972	}	2134	}
1973		2135
1974	$MAP_PREFETCH{$path} \|= $load;	2136	$MAP_PREFETCH{$path} \|= $load;
1975		2137
1976	$MAP_PREFETCHER \|\|= cf::async {	2138	$MAP_PREFETCHER \|\|= cf::async {
		2139	$Coro::current->{desc} = "map prefetcher";
		2140
1977	while (%MAP_PREFETCH) {	2141	while (%MAP_PREFETCH) {
1978	while (my ($k, $v) = each %MAP_PREFETCH) {	2142	while (my ($k, $v) = each %MAP_PREFETCH) {
1979	if (my $map = find $k) {	2143	if (my $map = find $k) {
1980	$map->load if $v;	2144	$map->load if $v;
1981	}	2145	}
…		…
2007	return if $self->{deny_save};	2171	return if $self->{deny_save};
2008		2172
2009	local $self->{last_access} = $self->last_access;#d#	2173	local $self->{last_access} = $self->last_access;#d#
2010		2174
2011	cf::async {	2175	cf::async {
		2176	$Coro::current->{desc} = "map player save";
2012	$_->contr->save for $self->players;	2177	$_->contr->save for $self->players;
2013	};	2178	};
2014		2179
2015	if ($uniq) {	2180	if ($uniq) {
2016	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	2181	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
…		…
2030		2195
2031	return if $self->players;	2196	return if $self->players;
2032	return if $self->in_memory != cf::MAP_IN_MEMORY;	2197	return if $self->in_memory != cf::MAP_IN_MEMORY;
2033	return if $self->{deny_save};	2198	return if $self->{deny_save};
2034		2199
		2200	$self->in_memory (cf::MAP_SWAPPED);
		2201
		2202	$self->deactivate;
		2203	$_->clear_links_to ($self) for values %cf::MAP;
2035	$self->clear;	2204	$self->clear;
2036	$self->in_memory (cf::MAP_SWAPPED);
2037	}	2205	}
2038		2206
2039	sub reset_at {	2207	sub reset_at {
2040	my ($self) = @_;	2208	my ($self) = @_;
2041		2209
…		…
2073	if $uniq;	2241	if $uniq;
2074	}	2242	}
2075		2243
2076	delete $cf::MAP{$self->path};	2244	delete $cf::MAP{$self->path};
2077		2245
		2246	$self->deactivate;
		2247	$_->clear_links_to ($self) for values %cf::MAP;
2078	$self->clear;	2248	$self->clear;
2079
2080	$_->clear_links_to ($self) for values %cf::MAP;
2081		2249
2082	$self->unlink_save;	2250	$self->unlink_save;
2083	$self->destroy;	2251	$self->destroy;
2084	}	2252	}
2085		2253
2086	my $nuke_counter = "aaaa";	2254	my $nuke_counter = "aaaa";
2087		2255
2088	sub nuke {	2256	sub nuke {
2089	my ($self) = @_;	2257	my ($self) = @_;
2090		2258
		2259	{
		2260	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2261
2091	delete $cf::MAP{$self->path};	2262	delete $cf::MAP{$self->path};
2092		2263
2093	$self->unlink_save;	2264	$self->unlink_save;
2094		2265
2095	bless $self, "cf::map";	2266	bless $self, "cf::map";
2096	delete $self->{deny_reset};	2267	delete $self->{deny_reset};
2097	$self->{deny_save} = 1;	2268	$self->{deny_save} = 1;
2098	$self->reset_timeout (1);	2269	$self->reset_timeout (1);
2099	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2270	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100		2271
2101	$cf::MAP{$self->path} = $self;	2272	$cf::MAP{$self->path} = $self;
		2273	}
2102		2274
2103	$self->reset; # polite request, might not happen	2275	$self->reset; # polite request, might not happen
2104	}	2276	}
2105		2277
2106	=item $maps = cf::map::tmp_maps	2278	=item $maps = cf::map::tmp_maps
…		…
2182		2354
2183	sub inv_recursive {	2355	sub inv_recursive {
2184	inv_recursive_ inv $_[0]	2356	inv_recursive_ inv $_[0]
2185	}	2357	}
2186		2358
		2359	=item $ref = $ob->ref
		2360
		2361	creates and returns a persistent reference to an objetc that can be stored as a string.
		2362
		2363	=item $ob = cf::object::deref ($refstring)
		2364
		2365	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2366	even if the object actually exists. May block.
		2367
		2368	=cut
		2369
		2370	sub deref {
		2371	my ($ref) = @_;
		2372
		2373	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2374	my ($uuid, $name) = ($1, $2);
		2375	my $pl = $cf::PLAYER_LOADING{$name} \|\| cf::player::find $name
		2376	or return;
		2377	$pl->ob->uuid eq $uuid
		2378	or return;
		2379
		2380	$pl->ob
		2381	} else {
		2382	warn "$ref: cannot resolve object reference\n";
		2383	undef
		2384	}
		2385	}
		2386
2187	package cf;	2387	package cf;
2188		2388
2189	=back	2389	=back
2190		2390
2191	=head3 cf::object::player	2391	=head3 cf::object::player
…		…
2349	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2549	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2350		2550
2351	$self->enter_link;	2551	$self->enter_link;
2352		2552
2353	(async {	2553	(async {
		2554	$Coro::current->{desc} = "player::goto $path $x $y";
		2555
		2556	# *tag paths override both path and x\|y
		2557	if ($path =~ /^\(.)$/) {
		2558	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2559	my $ob = $obs[rand @obs];
		2560
		2561	# see if we actually can go there
		2562	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2563	$ob = $obs[rand @obs];
		2564	} else {
		2565	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE \| cf::NDI_RED);
		2566	}
		2567	# else put us there anyways for now #d#
		2568
		2569	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2570	} else {
		2571	($path, $x, $y) = (undef, undef, undef);
		2572	}
		2573	}
		2574
2354	my $map = eval {	2575	my $map = eval {
2355	my $map = cf::map::find $path;	2576	my $map = defined $path ? cf::map::find $path : undef;
2356		2577
2357	if ($map) {	2578	if ($map) {
2358	$map = $map->customise_for ($self);	2579	$map = $map->customise_for ($self);
2359	$map = $check->($map) if $check && $map;	2580	$map = $check->($map) if $check && $map;
2360	} else {	2581	} else {
2361	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);	2582	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE \| cf::NDI_RED);
2362	}	2583	}
2363		2584
2364	$map	2585	$map
2365	};	2586	};
2366		2587
…		…
2419	$rmp->{origin_y} = $exit->y;	2640	$rmp->{origin_y} = $exit->y;
2420	}	2641	}
2421		2642
2422	$rmp->{random_seed} \|\|= $exit->random_seed;	2643	$rmp->{random_seed} \|\|= $exit->random_seed;
2423		2644
2424	my $data = cf::to_json $rmp;	2645	my $data = cf::encode_json $rmp;
2425	my $md5 = Digest::MD5::md5_hex $data;	2646	my $md5 = Digest::MD5::md5_hex $data;
2426	my $meta = "$RANDOMDIR/$md5.meta";	2647	my $meta = "$RANDOMDIR/$md5.meta";
2427		2648
2428	if (my $fh = aio_open "$meta~", O_WRONLY \| O_CREAT, 0666) {	2649	if (my $fh = aio_open "$meta~", O_WRONLY \| O_CREAT, 0666) {
2429	aio_write $fh, 0, (length $data), $data, 0;	2650	aio_write $fh, 0, (length $data), $data, 0;
…		…
2456	# if exit is damned, update players death & WoR home-position	2677	# if exit is damned, update players death & WoR home-position
2457	$self->contr->savebed ($slaying, $hp, $sp)	2678	$self->contr->savebed ($slaying, $hp, $sp)
2458	if $exit->flag (FLAG_DAMNED);	2679	if $exit->flag (FLAG_DAMNED);
2459		2680
2460	(async {	2681	(async {
		2682	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2683
2461	$self->deactivate_recursive; # just to be sure	2684	$self->deactivate_recursive; # just to be sure
2462	unless (eval {	2685	unless (eval {
2463	$self->goto ($slaying, $hp, $sp);	2686	$self->goto ($slaying, $hp, $sp);
2464		2687
2465	1;	2688	1;
…		…
2500	the message, with C<log> being the default. If C<$color> is negative, suppress	2723	the message, with C<log> being the default. If C<$color> is negative, suppress
2501	the message unless the client supports the msg packet.	2724	the message unless the client supports the msg packet.
2502		2725
2503	=cut	2726	=cut
2504		2727
		2728	# non-persistent channels (usually the info channel)
		2729	our %CHANNEL = (
		2730	"c/identify" => {
		2731	id => "infobox",
		2732	title => "Identify",
		2733	reply => undef,
		2734	tooltip => "Items recently identified",
		2735	},
		2736	"c/examine" => {
		2737	id => "infobox",
		2738	title => "Examine",
		2739	reply => undef,
		2740	tooltip => "Signs and other items you examined",
		2741	},
		2742	"c/book" => {
		2743	id => "infobox",
		2744	title => "Book",
		2745	reply => undef,
		2746	tooltip => "The contents of a note or book",
		2747	},
		2748	"c/lookat" => {
		2749	id => "infobox",
		2750	title => "Look",
		2751	reply => undef,
		2752	tooltip => "What you saw there",
		2753	},
		2754	"c/who" => {
		2755	id => "infobox",
		2756	title => "Players",
		2757	reply => undef,
		2758	tooltip => "Shows players who are currently online",
		2759	},
		2760	"c/body" => {
		2761	id => "infobox",
		2762	title => "Body Parts",
		2763	reply => undef,
		2764	tooltip => "Shows which body parts you posess and are available",
		2765	},
		2766	"c/uptime" => {
		2767	id => "infobox",
		2768	title => "Uptime",
		2769	reply => undef,
		2770	tooltip => "How long the server has been running since last restart",
		2771	},
		2772	"c/mapinfo" => {
		2773	id => "infobox",
		2774	title => "Map Info",
		2775	reply => undef,
		2776	tooltip => "Information related to the maps",
		2777	},
		2778	);
		2779
2505	sub cf::client::send_msg {	2780	sub cf::client::send_msg {
2506	my ($self, $channel, $msg, $color, @extra) = @_;	2781	my ($self, $channel, $msg, $color, @extra) = @_;
2507		2782
2508	$msg = $self->pl->expand_cfpod ($msg);	2783	$msg = $self->pl->expand_cfpod ($msg);
2509		2784
2510	$color &= cf::NDI_CLIENT_MASK; # just in case...	2785	$color &= cf::NDI_CLIENT_MASK; # just in case...
2511		2786
		2787	# check predefined channels, for the benefit of C
		2788	if ($CHANNEL{$channel}) {
		2789	$channel = $CHANNEL{$channel};
		2790
		2791	$self->ext_msg (channel_info => $channel)
		2792	if $self->can_msg;
		2793
		2794	$channel = $channel->{id};
		2795
2512	if (ref $channel) {	2796	} elsif (ref $channel) {
2513	# send meta info to client, if not yet sent	2797	# send meta info to client, if not yet sent
2514	unless (exists $self->{channel}{$channel->{id}}) {	2798	unless (exists $self->{channel}{$channel->{id}}) {
2515	$self->{channel}{$channel->{id}} = $channel;	2799	$self->{channel}{$channel->{id}} = $channel;
2516	$self->ext_msg (channel_info => $channel);	2800	$self->ext_msg (channel_info => $channel)
		2801	if $self->can_msg;
2517	}	2802	}
2518		2803
2519	$channel = $channel->{id};	2804	$channel = $channel->{id};
2520	}	2805	}
2521		2806
…		…
2733	=pod	3018	=pod
2734		3019
2735	The following functions and methods are available within a safe environment:	3020	The following functions and methods are available within a safe environment:
2736		3021
2737	cf::object	3022	cf::object
2738	contr pay_amount pay_player map x y force_find force_add	3023	contr pay_amount pay_player map x y force_find force_add destroy
2739	insert remove name archname title slaying race decrease_ob_nr	3024	insert remove name archname title slaying race decrease_ob_nr
2740		3025
2741	cf::object::player	3026	cf::object::player
2742	player	3027	player
2743		3028
…		…
2750	=cut	3035	=cut
2751		3036
2752	for (	3037	for (
2753	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3038	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2754	insert remove inv name archname title slaying race	3039	insert remove inv name archname title slaying race
2755	decrease_ob_nr)],	3040	decrease_ob_nr destroy)],
2756	["cf::object::player" => qw(player)],	3041	["cf::object::player" => qw(player)],
2757	["cf::player" => qw(peaceful)],	3042	["cf::player" => qw(peaceful)],
2758	["cf::map" => qw(trigger)],	3043	["cf::map" => qw(trigger)],
2759	) {	3044	) {
2760	no strict 'refs';	3045	no strict 'refs';
…		…
2865	{	3150	{
2866	my $faces = $facedata->{faceinfo};	3151	my $faces = $facedata->{faceinfo};
2867		3152
2868	while (my ($face, $info) = each %$faces) {	3153	while (my ($face, $info) = each %$faces) {
2869	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3154	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
		3155
2870	cf::face::set_visibility $idx, $info->{visibility};	3156	cf::face::set_visibility $idx, $info->{visibility};
2871	cf::face::set_magicmap $idx, $info->{magicmap};	3157	cf::face::set_magicmap $idx, $info->{magicmap};
2872	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3158	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2873	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3159	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2874		3160
2875	cf::cede_to_tick;	3161	cf::cede_to_tick;
2876	}	3162	}
2877		3163
2878	while (my ($face, $info) = each %$faces) {	3164	while (my ($face, $info) = each %$faces) {
2879	next unless $info->{smooth};	3165	next unless $info->{smooth};
		3166
2880	my $idx = cf::face::find $face	3167	my $idx = cf::face::find $face
2881	or next;	3168	or next;
		3169
2882	if (my $smooth = cf::face::find $info->{smooth}) {	3170	if (my $smooth = cf::face::find $info->{smooth}) {
2883	cf::face::set_smooth $idx, $smooth;	3171	cf::face::set_smooth $idx, $smooth;
2884	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3172	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2885	} else {	3173	} else {
2886	warn "smooth face '$info->{smooth}' not found for face '$face'";	3174	warn "smooth face '$info->{smooth}' not found for face '$face'";
…		…
2904	{	3192	{
2905	# TODO: for gcfclient pleasure, we should give resources	3193	# TODO: for gcfclient pleasure, we should give resources
2906	# that gcfclient doesn't grok a >10000 face index.	3194	# that gcfclient doesn't grok a >10000 face index.
2907	my $res = $facedata->{resource};	3195	my $res = $facedata->{resource};
2908		3196
2909	my $soundconf = delete $res->{"res/sound.conf"};
2910
2911	while (my ($name, $info) = each %$res) {	3197	while (my ($name, $info) = each %$res) {
		3198	if (defined $info->{type}) {
2912	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3199	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
2913	my $data;	3200	my $data;
2914		3201
2915	if ($info->{type} & 1) {	3202	if ($info->{type} & 1) {
2916	# prepend meta info	3203	# prepend meta info
2917		3204
2918	my $meta = $enc->encode ({	3205	my $meta = $enc->encode ({
2919	name => $name,	3206	name => $name,
2920	%{ $info->{meta} \|\| {} },	3207	%{ $info->{meta} \|\| {} },
2921	});	3208	});
2922		3209
2923	$data = pack "(w/a)", $meta, $info->{data};	3210	$data = pack "(w/a)", $meta, $info->{data};
		3211	} else {
		3212	$data = $info->{data};
		3213	}
		3214
		3215	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3216	cf::face::set_type $idx, $info->{type};
2924	} else {	3217	} else {
2925	$data = $info->{data};	3218	$RESOURCE{$name} = $info;
2926	}	3219	}
2927		3220
2928	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2929	cf::face::set_type $idx, $info->{type};
2930
2931	cf::cede_to_tick;	3221	cf::cede_to_tick;
2932	}	3222	}
2933		3223
2934	if ($soundconf) {	3224	if (my $soundconf = delete $res->{"res/sound.conf"}) {
2935	$soundconf = $enc->decode (delete $soundconf->{data});	3225	$soundconf = $enc->decode (delete $soundconf->{data});
2936		3226
2937	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3227	for (0 .. SOUND_CAST_SPELL_0 - 1) {
2938	my $sound = $soundconf->{compat}[$_]	3228	my $sound = $soundconf->{compat}[$_]
2939	or next;	3229	or next;
…		…
3035	sub main {	3325	sub main {
3036	# we must not ever block the main coroutine	3326	# we must not ever block the main coroutine
3037	local $Coro::idle = sub {	3327	local $Coro::idle = sub {
3038	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3328	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3039	(async {	3329	(async {
3040	Event::one_event;	3330	$Coro::current->{desc} = "IDLE BUG HANDLER";
		3331	EV::loop EV::LOOP_ONESHOT;
3041	})->prio (Coro::PRIO_MAX);	3332	})->prio (Coro::PRIO_MAX);
3042	};	3333	};
3043		3334
3044	reload_config;	3335	reload_config;
3045	db_init;	3336	db_init;
3046	load_extensions;	3337	load_extensions;
3047		3338
3048	$TICK_WATCHER->start;	3339	$TICK_WATCHER->start;
		3340	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3049	Event::loop;	3341	EV::loop;
3050	}	3342	}
3051		3343
3052	#############################################################################	3344	#############################################################################
3053	# initialisation and cleanup	3345	# initialisation and cleanup
3054		3346
3055	# install some emergency cleanup handlers	3347	# install some emergency cleanup handlers
3056	BEGIN {	3348	BEGIN {
		3349	our %SIGWATCHER = ();
3057	for my $signal (qw(INT HUP TERM)) {	3350	for my $signal (qw(INT HUP TERM)) {
3058	Event->signal (	3351	$SIGWATCHER{$signal} = EV::signal $signal, sub {
3059	reentrant => 0,
3060	data => WF_AUTOCANCEL,
3061	signal => $signal,
3062	prio => 0,
3063	cb => sub {
3064	cf::cleanup "SIG$signal";	3352	cf::cleanup "SIG$signal";
3065	},
3066	);	3353	};
3067	}	3354	}
3068	}	3355	}
3069		3356
3070	sub write_runtime {	3357	sub write_runtime {
3071	my $runtime = "$LOCALDIR/runtime";	3358	my $runtime = "$LOCALDIR/runtime";
…		…
3116	# and maps saved/destroyed asynchronously.	3403	# and maps saved/destroyed asynchronously.
3117	warn "begin emergency player save\n";	3404	warn "begin emergency player save\n";
3118	for my $login (keys %cf::PLAYER) {	3405	for my $login (keys %cf::PLAYER) {
3119	my $pl = $cf::PLAYER{$login} or next;	3406	my $pl = $cf::PLAYER{$login} or next;
3120	$pl->valid or next;	3407	$pl->valid or next;
		3408	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3121	$pl->save;	3409	$pl->save;
3122	}	3410	}
3123	warn "end emergency player save\n";	3411	warn "end emergency player save\n";
3124		3412
3125	warn "begin emergency map save\n";	3413	warn "begin emergency map save\n";
…		…
3164	warn "syncing database to disk";	3452	warn "syncing database to disk";
3165	BDB::db_env_txn_checkpoint $DB_ENV;	3453	BDB::db_env_txn_checkpoint $DB_ENV;
3166		3454
3167	# if anything goes wrong in here, we should simply crash as we already saved	3455	# if anything goes wrong in here, we should simply crash as we already saved
3168		3456
3169	warn "cancelling all WF_AUTOCANCEL watchers";
3170	for (Event::all_watchers) {
3171	$_->cancel if $_->data & WF_AUTOCANCEL;
3172	}
3173
3174	warn "flushing outstanding aio requests";	3457	warn "flushing outstanding aio requests";
3175	for (;;) {	3458	for (;;) {
3176	BDB::flush;	3459	BDB::flush;
3177	IO::AIO::flush;	3460	IO::AIO::flush;
3178	Coro::cede;	3461	Coro::cede_notself;
3179	last unless IO::AIO::nreqs \|\| BDB::nreqs;	3462	last unless IO::AIO::nreqs \|\| BDB::nreqs;
3180	warn "iterate...";	3463	warn "iterate...";
3181	}	3464	}
3182		3465
3183	++$RELOAD;	3466	++$RELOAD;
…		…
3272		3555
3273	sub reload_perl() {	3556	sub reload_perl() {
3274	# doing reload synchronously and two reloads happen back-to-back,	3557	# doing reload synchronously and two reloads happen back-to-back,
3275	# coro crashes during coro_state_free->destroy here.	3558	# coro crashes during coro_state_free->destroy here.
3276		3559
3277	$RELOAD_WATCHER \|\|= Event->timer (	3560	$RELOAD_WATCHER \|\|= EV::timer 0, 0, sub {
3278	reentrant => 0,
3279	after => 0,
3280	data => WF_AUTOCANCEL,
3281	cb => sub {
3282	do_reload_perl;
3283	undef $RELOAD_WATCHER;	3561	undef $RELOAD_WATCHER;
3284	},	3562	do_reload_perl;
3285	);	3563	};
3286	}	3564	}
3287		3565
3288	register_command "reload" => sub {	3566	register_command "reload" => sub {
3289	my ($who, $arg) = @_;	3567	my ($who, $arg) = @_;
3290		3568
3291	if ($who->flag (FLAG_WIZ)) {	3569	if ($who->flag (FLAG_WIZ)) {
3292	$who->message ("reloading server.");	3570	$who->message ("reloading server.");
		3571	async {
		3572	$Coro::current->{desc} = "perl_reload";
3293	async { reload_perl };	3573	reload_perl;
		3574	};
3294	}	3575	}
3295	};	3576	};
3296		3577
3297	unshift @INC, $LIBDIR;	3578	unshift @INC, $LIBDIR;
3298		3579
…		…
3317	my $signal = new Coro::Signal;	3598	my $signal = new Coro::Signal;
3318	push @WAIT_FOR_TICK_BEGIN, $signal;	3599	push @WAIT_FOR_TICK_BEGIN, $signal;
3319	$signal->wait;	3600	$signal->wait;
3320	}	3601	}
3321		3602
3322	my $min = 1e6;#d#	3603	$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3323	my $avg = 10;
3324	$TICK_WATCHER = Event->timer (
3325	reentrant => 0,
3326	parked => 1,
3327	prio => 0,
3328	at => $NEXT_TICK \|\| $TICK,
3329	data => WF_AUTOCANCEL,
3330	cb => sub {
3331	if ($Coro::current != $Coro::main) {	3604	if ($Coro::current != $Coro::main) {
3332	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3605	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3333	unless ++$bug_warning > 10;	3606	unless ++$bug_warning > 10;
3334	return;	3607	return;
3335	}	3608	}
3336		3609
3337	$NOW = $tick_start = Event::time;	3610	$NOW = $tick_start = EV::now;
3338		3611
3339	cf::server_tick; # one server iteration	3612	cf::server_tick; # one server iteration
3340		3613
3341	0 && sync_job {#d#	3614	$RUNTIME += $TICK;
3342	for(1..10) {	3615	$NEXT_TICK = $_[0]->at;
3343	my $t = Event::time;
3344	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3345	or die;
3346		3616
3347	$map->width (50);	3617	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3348	$map->height (50);	3618	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3349	$map->alloc;	3619	Coro::async_pool {
3350	$map->_load_objects ("/tmp/x.map", 1);	3620	$Coro::current->{desc} = "runtime saver";
3351	my $t = Event::time - $t;	3621	write_runtime
3352		3622	or warn "ERROR: unable to write runtime file: $!";
3353	#next unless $t < 0.0013;#d#
3354	if ($t < $min) {
3355	$min = $t;
3356	}
3357	$avg = $avg * 0.99 + $t * 0.01;
3358	}
3359	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3360	exit 0;
3361	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3362	};	3623	};
		3624	}
3363		3625
3364	$RUNTIME += $TICK;
3365	$NEXT_TICK += $TICK;
3366
3367	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3368	$NEXT_RUNTIME_WRITE = $NOW + 10;
3369	Coro::async_pool {
3370	write_runtime
3371	or warn "ERROR: unable to write runtime file: $!";
3372	};
3373	}
3374
3375	# my $AFTER = Event::time;
3376	# warn $AFTER - $NOW;#d#
3377
3378	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3626	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3379	$sig->send;	3627	$sig->send;
3380	}	3628	}
3381	while (my $sig = shift @WAIT_FOR_TICK) {	3629	while (my $sig = shift @WAIT_FOR_TICK) {
3382	$sig->send;	3630	$sig->send;
3383	}	3631	}
3384		3632
3385	$NOW = Event::time;
3386
3387	# if we are delayed by four ticks or more, skip them all
3388	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3389
3390	$TICK_WATCHER->at ($NEXT_TICK);
3391	$TICK_WATCHER->start;
3392
3393	$LOAD = ($NOW - $tick_start) / $TICK;	3633	$LOAD = ($NOW - $tick_start) / $TICK;
3394	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3634	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3395		3635
3396	_post_tick;	3636	_post_tick;
3397		3637	};
3398		3638	$TICK_WATCHER->priority (EV::MAXPRI);
3399	},
3400	);
3401		3639
3402	{	3640	{
3403	BDB::max_poll_time $TICK * 0.1;	3641	# configure BDB
3404	$BDB_POLL_WATCHER = Event->io (	3642
3405	reentrant => 0,
3406	fd => BDB::poll_fileno,
3407	poll => 'r',
3408	prio => 0,
3409	data => WF_AUTOCANCEL,
3410	cb => \&BDB::poll_cb,
3411	);
3412	BDB::min_parallel 8;	3643	BDB::min_parallel 8;
3413		3644	BDB::max_poll_reqs $TICK * 0.1;
3414	BDB::set_sync_prepare {	3645	$Coro::BDB::WATCHER->priority (1);
3415	my $status;
3416	my $current = $Coro::current;
3417	(
3418	sub {
3419	$status = $!;
3420	$current->ready; undef $current;
3421	},
3422	sub {
3423	Coro::schedule while defined $current;
3424	$! = $status;
3425	},
3426	)
3427	};
3428		3646
3429	unless ($DB_ENV) {	3647	unless ($DB_ENV) {
3430	$DB_ENV = BDB::db_env_create;	3648	$DB_ENV = BDB::db_env_create;
		3649	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC
		3650	\| BDB::LOG_AUTOREMOVE, 1);
		3651	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3652	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3431		3653
3432	cf::sync_job {	3654	cf::sync_job {
3433	eval {	3655	eval {
3434	BDB::db_env_open	3656	BDB::db_env_open
3435	$DB_ENV,	3657	$DB_ENV,
…		…
3437	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN	3659	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN
3438	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3660	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3439	0666;	3661	0666;
3440		3662
3441	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3663	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3442
3443	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
3444	$DB_ENV->set_lk_detect;
3445	};	3664	};
3446		3665
3447	cf::cleanup "db_env_open(db): $@" if $@;	3666	cf::cleanup "db_env_open(db): $@" if $@;
3448	};	3667	};
3449	}	3668	}
		3669
		3670	$BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
		3671	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3672	};
		3673	$BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
		3674	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3675	};
		3676	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
		3677	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3678	};
3450	}	3679	}
3451		3680
3452	{	3681	{
		3682	# configure IO::AIO
		3683
3453	IO::AIO::min_parallel 8;	3684	IO::AIO::min_parallel 8;
3454
3455	undef $Coro::AIO::WATCHER;
3456	IO::AIO::max_poll_time $TICK * 0.1;	3685	IO::AIO::max_poll_time $TICK * 0.1;
3457	$AIO_POLL_WATCHER = Event->io (	3686	$Coro::AIO::WATCHER->priority (1);
3458	reentrant => 0,
3459	data => WF_AUTOCANCEL,
3460	fd => IO::AIO::poll_fileno,
3461	poll => 'r',
3462	prio => 6,
3463	cb => \&IO::AIO::poll_cb,
3464	);
3465	}	3687	}
3466		3688
3467	my $_log_backtrace;	3689	my $_log_backtrace;
3468		3690
3469	sub _log_backtrace {	3691	sub _log_backtrace {
…		…
3473		3695
3474	# limit the # of concurrent backtraces	3696	# limit the # of concurrent backtraces
3475	if ($_log_backtrace < 2) {	3697	if ($_log_backtrace < 2) {
3476	++$_log_backtrace;	3698	++$_log_backtrace;
3477	async {	3699	async {
		3700	$Coro::current->{desc} = "abt $msg";
		3701
3478	my @bt = fork_call {	3702	my @bt = fork_call {
3479	@addr = map { sprintf "%x", $_ } @addr;	3703	@addr = map { sprintf "%x", $_ } @addr;
3480	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3704	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3481	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"	3705	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"
3482	or die "addr2line: $!";	3706	or die "addr2line: $!";

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.348 by root, Thu Aug 30 08:34:40 2007 UTC vs. Revision 1.405 by root, Mon Dec 17 08:03:22 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.348 by root, Thu Aug 30 08:34:40 2007 UTC vs.
Revision 1.405 by root, Mon Dec 17 08:03:22 2007 UTC