ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.282 by elmex, Tue Jun 19 18:15:34 2007 UTC vs.
Revision 1.395 by root, Sat Nov 10 22:41:59 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;
10	use Event;	9	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.61 ();	15	use Coro 4.1 ();
16	use Coro::State;	16	use Coro::State;
17	use Coro::Handle;	17	use Coro::Handle;
18	use Coro::Event;	18	use Coro::Event;
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::Storable;	23	use Coro::Storable;
		24	use Coro::Util ();
24		25
		26	use JSON::XS ();
25	use BDB ();	27	use BDB ();
26	use Data::Dumper;	28	use Data::Dumper;
27	use Digest::MD5;	29	use Digest::MD5;
28	use Fcntl;	30	use Fcntl;
29	use YAML::Syck ();	31	use YAML::Syck ();
30	use IO::AIO 2.32 ();	32	use IO::AIO 2.51 ();
31	use Time::HiRes;	33	use Time::HiRes;
32	use Compress::LZF;	34	use Compress::LZF;
		35	use Digest::MD5 ();
33		36
34	# configure various modules to our taste	37	# configure various modules to our taste
35	#	38	#
36	$Storable::canonical = 1; # reduce rsync transfers	39	$Storable::canonical = 1; # reduce rsync transfers
37	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	40	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
…		…
49	our %COMMAND = ();	52	our %COMMAND = ();
50	our %COMMAND_TIME = ();	53	our %COMMAND_TIME = ();
51		54
52	our @EXTS = (); # list of extension package names	55	our @EXTS = (); # list of extension package names
53	our %EXTCMD = ();	56	our %EXTCMD = ();
		57	our %EXTICMD = ();
54	our %EXT_CORO = (); # coroutines bound to extensions	58	our %EXT_CORO = (); # coroutines bound to extensions
55	our %EXT_MAP = (); # pluggable maps	59	our %EXT_MAP = (); # pluggable maps
56		60
57	our $RELOAD; # number of reloads so far	61	our $RELOAD; # number of reloads so far
58	our @EVENT;	62	our @EVENT;
…		…
76	our $NEXT_TICK;	80	our $NEXT_TICK;
77	our $NOW;	81	our $NOW;
78	our $USE_FSYNC = 1; # use fsync to write maps - default off	82	our $USE_FSYNC = 1; # use fsync to write maps - default off
79		83
80	our $BDB_POLL_WATCHER;	84	our $BDB_POLL_WATCHER;
		85	our $BDB_DEADLOCK_WATCHER;
		86	our $BDB_CHECKPOINT_WATCHER;
		87	our $BDB_TRICKLE_WATCHER;
81	our $DB_ENV;	88	our $DB_ENV;
82		89
83	our %CFG;	90	our %CFG;
84		91
85	our $UPTIME; $UPTIME ||= time;	92	our $UPTIME; $UPTIME ||= time;
86	our $RUNTIME;	93	our $RUNTIME;
87		94
88	our %PLAYER; # all users	95	our (%PLAYER, %PLAYER_LOADING); # all users
89	our %MAP; # all maps	96	our (%MAP, %MAP_LOADING ); # all maps
90	our $LINK_MAP; # the special {link} map, which is always available	97	our $LINK_MAP; # the special {link} map, which is always available
91		98
92	# 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 ∕
93	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	100	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94		101
…		…
155		162
156	The raw value load value from the last tick.	163	The raw value load value from the last tick.
157		164
158	=item %cf::CFG	165	=item %cf::CFG
159		166
160	Configuration for the server, loaded from C</etc/crossfire/config>, or	167	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161	from wherever your confdir points to.	168	from wherever your confdir points to.
162		169
163	=item cf::wait_for_tick, cf::wait_for_tick_begin	170	=item cf::wait_for_tick, cf::wait_for_tick_begin
164		171
165	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
166	returns directly I<after> the tick processing (and consequently, can only wake one process	173	returns directly I<after> the tick processing (and consequently, can only wake one process
167	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	174	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168		175
		176	=item @cf::INVOKE_RESULTS
		177
		178	This array contains the results of the last C<invoke ()> call. When
		179	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
		180	that call.
		181
169	=back	182	=back
170		183
171	=cut	184	=cut
172		185
173	BEGIN {	186	BEGIN {
…		…
177	$msg .= "\n"	190	$msg .= "\n"
178	unless $msg =~ /\n$/;	191	unless $msg =~ /\n$/;
179		192
180	$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;
181		194
182	utf8::encode $msg;
183	LOG llevError, $msg;	195	LOG llevError, $msg;
184	};	196	};
185	}	197	}
186		198
187	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	199	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
236	$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;
237	$d	249	$d
238	} || "[unable to dump $_[0]: '$@']";	250	} || "[unable to dump $_[0]: '$@']";
239	}	251	}
240		252
241	use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243	=item $ref = cf::from_json $json	253	=item $ref = cf::from_json $json
244		254
245	Converts a JSON string into the corresponding perl data structure.	255	Converts a JSON string into the corresponding perl data structure.
246		256
247	=item $json = cf::to_json $ref	257	=item $json = cf::to_json $ref
248		258
249	Converts a perl data structure into its JSON representation.	259	Converts a perl data structure into its JSON representation.
		260
		261	=cut
		262
		263	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
		264
		265	sub to_json ($) { $json_coder->encode ($_[0]) }
		266	sub from_json ($) { $json_coder->decode ($_[0]) }
250		267
251	=item cf::lock_wait $string	268	=item cf::lock_wait $string
252		269
253	Wait until the given lock is available. See cf::lock_acquire.	270	Wait until the given lock is available. See cf::lock_acquire.
254		271
…		…
257	Wait until the given lock is available and then acquires it and returns	274	Wait until the given lock is available and then acquires it and returns
258	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	275	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
259	for example when the coroutine gets canceled), the lock is automatically	276	for example when the coroutine gets canceled), the lock is automatically
260	returned.	277	returned.
261		278
		279	Locks are *not* recursive, locking from the same coro twice results in a
		280	deadlocked coro.
		281
262	Lock names should begin with a unique identifier (for example, cf::map::find	282	Lock names should begin with a unique identifier (for example, cf::map::find
263	uses map_find and cf::map::load uses map_load).	283	uses map_find and cf::map::load uses map_load).
264		284
265	=item $locked = cf::lock_active $string	285	=item $locked = cf::lock_active $string
266		286
267	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.
268		288
269	=cut	289	=cut
270		290
271	our %LOCK;	291	our %LOCK;
		292	our %LOCKER;#d#
272		293
273	sub lock_wait($) {	294	sub lock_wait($) {
274	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#
275		301
276	# wait for lock, if any	302	# wait for lock, if any
277	while ($LOCK{$key}) {	303	while ($LOCK{$key}) {
278	push @{ $LOCK{$key} }, $Coro::current;	304	push @{ $LOCK{$key} }, $Coro::current;
279	Coro::schedule;	305	Coro::schedule;
…		…
285		311
286	# wait, to be sure we are not locked	312	# wait, to be sure we are not locked
287	lock_wait $key;	313	lock_wait $key;
288		314
289	$LOCK{$key} = [];	315	$LOCK{$key} = [];
		316	$LOCKER{$key} = $Coro::current;#d#
290		317
291	Coro::guard {	318	Coro::guard {
		319	delete $LOCKER{$key};#d#
292	# wake up all waiters, to be on the safe side	320	# wake up all waiters, to be on the safe side
293	$_->ready for @{ delete $LOCK{$key} };	321	$_->ready for @{ delete $LOCK{$key} };
294	}	322	}
295	}	323	}
296		324
…		…
308	};	336	};
309	$TICK_WATCHER->stop;	337	$TICK_WATCHER->stop;
310	$guard	338	$guard
311	}	339	}
312		340
		341	=item cf::get_slot $time[, $priority[, $name]]
		342
		343	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		344	This call blocks and returns only when you have at least C<$time> seconds
		345	of cpu time till the next tick. The slot is only valid till the next cede.
		346
		347	The optional C<$name> can be used to identify the job to run. It might be
		348	used for statistical purposes and should identify the same time-class.
		349
		350	Useful for short background jobs.
		351
		352	=cut
		353
		354	our @SLOT_QUEUE;
		355	our $SLOT_QUEUE;
		356
		357	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		358	$SLOT_QUEUE = Coro::async {
		359	$Coro::current->desc ("timeslot manager");
		360
		361	my $signal = new Coro::Signal;
		362
		363	while () {
		364	next_job:
		365	my $avail = cf::till_tick;
		366	if ($avail > 0.01) {
		367	for (0 .. $#SLOT_QUEUE) {
		368	if ($SLOT_QUEUE[$_][0] < $avail) {
		369	my $job = splice @SLOT_QUEUE, $_, 1, ();
		370	$job->[2]->send;
		371	Coro::cede;
		372	goto next_job;
		373	}
		374	}
		375	}
		376
		377	if (@SLOT_QUEUE) {
		378	# we do not use wait_for_tick() as it returns immediately when tick is inactive
		379	push @cf::WAIT_FOR_TICK, $signal;
		380	$signal->wait;
		381	} else {
		382	Coro::schedule;
		383	}
		384	}
		385	};
		386
		387	sub get_slot($;$$) {
		388	my ($time, $pri, $name) = @_;
		389
		390	$time = $TICK * .6 if $time > $TICK * .6;
		391	my $sig = new Coro::Signal;
		392
		393	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		394	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		395	$SLOT_QUEUE->ready;
		396	$sig->wait;
		397	}
		398
313	=item cf::async { BLOCK }	399	=item cf::async { BLOCK }
314		400
315	Currently the same as Coro::async_pool, meaning you cannot use	401	Currently the same as Coro::async_pool, meaning you cannot use
316	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only	402	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
317	thing you are allowed to do is call C<prio> on it.	403	thing you are allowed to do is call C<prio> on it.
…		…
320		406
321	BEGIN { *async = \&Coro::async_pool }	407	BEGIN { *async = \&Coro::async_pool }
322		408
323	=item cf::sync_job { BLOCK }	409	=item cf::sync_job { BLOCK }
324		410
325	The design of Crossfire TRT requires that the main coroutine ($Coro::main)	411	The design of Deliantra requires that the main coroutine ($Coro::main)
326	is always able to handle events or runnable, as Crossfire TRT is only	412	is always able to handle events or runnable, as Deliantra is only
327	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not	413	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
328	acceptable.	414	acceptable.
329		415
330	If it must be done, put the blocking parts into C<sync_job>. This will run	416	If it must be done, put the blocking parts into C<sync_job>. This will run
331	the given BLOCK in another coroutine while waiting for the result. The	417	the given BLOCK in another coroutine while waiting for the result. The
…		…
341	my $time = Event::time;	427	my $time = Event::time;
342		428
343	# this is the main coro, too bad, we have to block	429	# this is the main coro, too bad, we have to block
344	# till the operation succeeds, freezing the server :/	430	# till the operation succeeds, freezing the server :/
345		431
		432	LOG llevError, Carp::longmess "sync job";#d#
		433
346	# TODO: use suspend/resume instead	434	# TODO: use suspend/resume instead
347	# (but this is cancel-safe)	435	# (but this is cancel-safe)
348	my $freeze_guard = freeze_mainloop;	436	my $freeze_guard = freeze_mainloop;
349		437
350	my $busy = 1;	438	my $busy = 1;
351	my @res;	439	my @res;
352		440
353	(async {	441	(async {
		442	$Coro::current->desc ("sync job coro");
354	@res = eval { $job->() };	443	@res = eval { $job->() };
355	warn $@ if $@;	444	warn $@ if $@;
356	undef $busy;	445	undef $busy;
357	})->prio (Coro::PRIO_MAX);	446	})->prio (Coro::PRIO_MAX);
358		447
359	while ($busy) {	448	while ($busy) {
		449	if (Coro::nready) {
		450	Coro::cede_notself;
		451	} else {
360	Coro::cede or Event::one_event;	452	Event::one_event;
		453	}
361	}	454	}
362		455
363	$time = Event::time - $time;	456	$time = Event::time - $time;
364		457
365	LOG llevError | logBacktrace, Carp::longmess "long sync job"	458	LOG llevError | logBacktrace, Carp::longmess "long sync job"
…		…
405	=cut	498	=cut
406		499
407	sub fork_call(&@) {	500	sub fork_call(&@) {
408	my ($cb, @args) = @_;	501	my ($cb, @args) = @_;
409		502
410	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	503	# we seemingly have to make a local copy of the whole thing,
411	# or die "socketpair: $!";	504	# otherwise perl prematurely frees the stuff :/
412	pipe my $fh1, my $fh2	505	# TODO: investigate and fix (likely this will be rather laborious)
413	or die "pipe: $!";
414		506
415	if (my $pid = fork) {	507	my @res = Coro::Util::fork_eval {
416	close $fh2;
417
418	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
419	$res = Coro::Storable::thaw $res;
420
421	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423	die $$res unless "ARRAY" eq ref $res;
424
425	return wantarray ? @$res : $res->[-1];
426	} else {
427	reset_signals;	508	reset_signals;
428	local $SIG{__WARN__};	509	&$cb
429	local $SIG{__DIE__};	510	}, @args;
430	eval {
431	close $fh1;
432		511
433	my @res = eval { $cb->(@args) };	512	wantarray ? @res : $res[-1]
434	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
435	};
436
437	warn $@ if $@;
438	_exit 0;
439	}
440	}	513	}
441		514
442	=item $value = cf::db_get $family => $key	515	=item $value = cf::db_get $family => $key
443		516
444	Returns a single value from the environment database.	517	Returns a single value from the environment database.
…		…
446	=item cf::db_put $family => $key => $value	519	=item cf::db_put $family => $key => $value
447		520
448	Stores the given C<$value> in the family. It can currently store binary	521	Stores the given C<$value> in the family. It can currently store binary
449	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).	522	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
450		523
		524	=item $db = cf::db_table "name"
		525
		526	Create and/or open a new database table. The string must not be "db" and must be unique
		527	within each server.
		528
451	=cut	529	=cut
		530
		531	sub db_table($) {
		532	my ($name) = @_;
		533	my $db = BDB::db_create $DB_ENV;
		534
		535	eval {
		536	$db->set_flags (BDB::CHKSUM);
		537
		538	utf8::encode $name;
		539	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		540	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		541	cf::cleanup "db_open(db): $!" if $!;
		542	};
		543	cf::cleanup "db_open(db): $@" if $@;
		544
		545	$db
		546	}
452		547
453	our $DB;	548	our $DB;
454		549
455	sub db_init {	550	sub db_init {
456	unless ($DB) {
457	$DB = BDB::db_create $DB_ENV;
458
459	cf::sync_job {	551	cf::sync_job {
460	eval {	552	$DB ||= db_table "db";
461	$DB->set_flags (BDB::CHKSUM);
462
463	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
464	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
465	cf::cleanup "db_open(db): $!" if $!;
466	};
467	cf::cleanup "db_open(db): $@" if $@;
468	};
469	}	553	};
470	}	554	}
471		555
472	sub db_get($$) {	556	sub db_get($$) {
473	my $key = "$_[0]/$_[1]";	557	my $key = "$_[0]/$_[1]";
474		558
…		…
524	if (1) {	608	if (1) {
525	$md5 =	609	$md5 =
526	join "\x00",	610	join "\x00",
527	$processversion,	611	$processversion,
528	map {	612	map {
529	Coro::cede;	613	cf::cede_to_tick;
530	($src->[$_], Digest::MD5::md5_hex $data[$_])	614	($src->[$_], Digest::MD5::md5_hex $data[$_])
531	} 0.. $#$src;	615	} 0.. $#$src;
532		616
533		617
534	my $dbmd5 = db_get cache => "$id/md5";	618	my $dbmd5 = db_get cache => "$id/md5";
…		…
578	attach callbacks/event handlers (a collection of which is called an "attachment")	662	attach callbacks/event handlers (a collection of which is called an "attachment")
579	to it. All such attachable objects support the following methods.	663	to it. All such attachable objects support the following methods.
580		664
581	In the following description, CLASS can be any of C<global>, C<object>	665	In the following description, CLASS can be any of C<global>, C<object>
582	C<player>, C<client> or C<map> (i.e. the attachable objects in	666	C<player>, C<client> or C<map> (i.e. the attachable objects in
583	Crossfire TRT).	667	Deliantra).
584		668
585	=over 4	669	=over 4
586		670
587	=item $attachable->attach ($attachment, key => $value...)	671	=item $attachable->attach ($attachment, key => $value...)
588		672
…		…
840	";	924	";
841	die if $@;	925	die if $@;
842	}	926	}
843		927
844	our $override;	928	our $override;
845	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	929	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846		930
847	sub override {	931	sub override {
848	$override = 1;	932	$override = 1;
849	@invoke_results = ();	933	@INVOKE_RESULTS = (@_);
850	}	934	}
851		935
852	sub do_invoke {	936	sub do_invoke {
853	my $event = shift;	937	my $event = shift;
854	my $callbacks = shift;	938	my $callbacks = shift;
855		939
856	@invoke_results = ();	940	@INVOKE_RESULTS = ();
857		941
858	local $override;	942	local $override;
859		943
860	for (@$callbacks) {	944	for (@$callbacks) {
861	eval { &{$_->[1]} };	945	eval { &{$_->[1]} };
…		…
878		962
879	Generate an object-specific event with the given arguments.	963	Generate an object-specific event with the given arguments.
880		964
881	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	965	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
882	removed in future versions), and there is no public API to access override	966	removed in future versions), and there is no public API to access override
883	results (if you must, access C<@cf::invoke_results> directly).	967	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884		968
885	=back	969	=back
886		970
887	=cut	971	=cut
888		972
889	#############################################################################	973	#############################################################################
890	# object support	974	# object support
		975
		976	sub _object_equal($$);
		977	sub _object_equal($$) {
		978	my ($a, $b) = @_;
		979
		980	return 0 unless (ref $a) eq (ref $b);
		981
		982	if ("HASH" eq ref $a) {
		983	my @ka = keys %$a;
		984	my @kb = keys %$b;
		985
		986	return 0 if @ka != @kb;
		987
		988	for (0 .. $#ka) {
		989	return 0 unless $ka[$_] eq $kb[$_];
		990	return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
		991	}
		992
		993	} elsif ("ARRAY" eq ref $a) {
		994
		995	return 0 if @$a != @$b;
		996
		997	for (0 .. $#$a) {
		998	return 0 unless _object_equal $a->[$_], $b->[$_];
		999	}
		1000
		1001	} elsif ($a ne $b) {
		1002	return 0;
		1003	}
		1004
		1005	1
		1006	}
		1007
		1008	our $SLOW_MERGES;#d#
		1009	sub _can_merge {
		1010	my ($ob1, $ob2) = @_;
		1011
		1012	++$SLOW_MERGES;#d#
		1013
		1014	# we do the slow way here
		1015	return _object_equal $ob1, $ob2
		1016	}
891		1017
892	sub reattach {	1018	sub reattach {
893	# basically do the same as instantiate, without calling instantiate	1019	# basically do the same as instantiate, without calling instantiate
894	my ($obj) = @_;	1020	my ($obj) = @_;
895		1021
…		…
942	sub object_freezer_save {	1068	sub object_freezer_save {
943	my ($filename, $rdata, $objs) = @_;	1069	my ($filename, $rdata, $objs) = @_;
944		1070
945	sync_job {	1071	sync_job {
946	if (length $$rdata) {	1072	if (length $$rdata) {
		1073	utf8::decode (my $decname = $filename);
947	warn sprintf "saving %s (%d,%d)\n",	1074	warn sprintf "saving %s (%d,%d)\n",
948	$filename, length $$rdata, scalar @$objs;	1075	$decname, length $$rdata, scalar @$objs;
949		1076
950	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1077	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951	chmod SAVE_MODE, $fh;	1078	chmod SAVE_MODE, $fh;
952	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1079	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953	aio_fsync $fh if $cf::USE_FSYNC;	1080	aio_fsync $fh if $cf::USE_FSYNC;
954	close $fh;	1081	close $fh;
955		1082
956	if (@$objs) {	1083	if (@$objs) {
957	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1084	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
958	chmod SAVE_MODE, $fh;	1085	chmod SAVE_MODE, $fh;
959	my $data = Storable::nfreeze { version => 1, objs => $objs };	1086	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
960	aio_write $fh, 0, (length $data), $data, 0;	1087	aio_write $fh, 0, (length $data), $data, 0;
961	aio_fsync $fh if $cf::USE_FSYNC;	1088	aio_fsync $fh if $cf::USE_FSYNC;
962	close $fh;	1089	close $fh;
963	aio_rename "$filename.pst~", "$filename.pst";	1090	aio_rename "$filename.pst~", "$filename.pst";
964	}	1091	}
…		…
972	}	1099	}
973	} else {	1100	} else {
974	aio_unlink $filename;	1101	aio_unlink $filename;
975	aio_unlink "$filename.pst";	1102	aio_unlink "$filename.pst";
976	}	1103	}
977	}	1104	};
978	}	1105	}
979		1106
980	sub object_freezer_as_string {	1107	sub object_freezer_as_string {
981	my ($rdata, $objs) = @_;	1108	my ($rdata, $objs) = @_;
982		1109
…		…
994	or return;	1121	or return;
995		1122
996	unless (aio_stat "$filename.pst") {	1123	unless (aio_stat "$filename.pst") {
997	(aio_load "$filename.pst", $av) >= 0	1124	(aio_load "$filename.pst", $av) >= 0
998	or return;	1125	or return;
		1126
999	$av = eval { (Storable::thaw $av)->{objs} };	1127	my $st = eval { Coro::Storable::thaw $av };
		1128	$av = $st->{objs};
1000	}	1129	}
1001		1130
		1131	utf8::decode (my $decname = $filename);
1002	warn sprintf "loading %s (%d)\n",	1132	warn sprintf "loading %s (%d,%d)\n",
1003	$filename, length $data, scalar @{$av || []};	1133	$decname, length $data, scalar @{$av || []};
		1134
1004	return ($data, $av);	1135	($data, $av)
1005	}	1136	}
1006		1137
1007	=head2 COMMAND CALLBACKS	1138	=head2 COMMAND CALLBACKS
1008		1139
1009	=over 4	1140	=over 4
…		…
1029	push @{ $COMMAND{$name} }, [$caller, $cb];	1160	push @{ $COMMAND{$name} }, [$caller, $cb];
1030	}	1161	}
1031		1162
1032	=item cf::register_extcmd $name => \&callback($pl,$packet);	1163	=item cf::register_extcmd $name => \&callback($pl,$packet);
1033		1164
1034	Register a callback fro execution when the client sends an extcmd packet.	1165	Register a callback for execution when the client sends an (synchronous)
		1166	extcmd packet. Ext commands will be processed in the order they are
		1167	received by the server, like other user commands. The first argument is
		1168	the logged-in player. Ext commands can only be processed after a player
		1169	has logged in successfully.
1035		1170
1036	If the callback returns something, it is sent back as if reply was being	1171	If the callback returns something, it is sent back as if reply was being
1037	called.	1172	called.
1038		1173
		1174	=item cf::register_exticmd $name => \&callback($ns,$packet);
		1175
		1176	Register a callback for execution when the client sends an (asynchronous)
		1177	exticmd packet. Exti commands are processed by the server as soon as they
		1178	are received, i.e. out of order w.r.t. other commands. The first argument
		1179	is a client socket. Exti commands can be received anytime, even before
		1180	log-in.
		1181
		1182	If the callback returns something, it is sent back as if reply was being
		1183	called.
		1184
1039	=cut	1185	=cut
1040		1186
1041	sub register_extcmd {	1187	sub register_extcmd {
1042	my ($name, $cb) = @_;	1188	my ($name, $cb) = @_;
1043		1189
1044	$EXTCMD{$name} = $cb;	1190	$EXTCMD{$name} = $cb;
		1191	}
		1192
		1193	sub register_exticmd {
		1194	my ($name, $cb) = @_;
		1195
		1196	$EXTICMD{$name} = $cb;
1045	}	1197	}
1046		1198
1047	cf::player->attach (	1199	cf::player->attach (
1048	on_command => sub {	1200	on_command => sub {
1049	my ($pl, $name, $params) = @_;	1201	my ($pl, $name, $params) = @_;
…		…
1058	cf::override;	1210	cf::override;
1059	},	1211	},
1060	on_extcmd => sub {	1212	on_extcmd => sub {
1061	my ($pl, $buf) = @_;	1213	my ($pl, $buf) = @_;
1062		1214
1063	my $msg = eval { from_json $buf };	1215	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064		1216
1065	if (ref $msg) {	1217	if (ref $msg) {
		1218	my ($type, $reply, @payload) =
		1219	"ARRAY" eq ref $msg
		1220	? @$msg
		1221	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1222
		1223	my @reply;
		1224
1066	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1225	if (my $cb = $EXTCMD{$type}) {
1067	if (my %reply = $cb->($pl, $msg)) {	1226	@reply = $cb->($pl, @payload);
1068	$pl->ext_reply ($msg->{msgid}, %reply);
1069	}
1070	}	1227	}
		1228
		1229	$pl->ext_reply ($reply, @reply)
		1230	if $reply;
		1231
1071	} else {	1232	} else {
1072	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1233	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073	}	1234	}
1074		1235
1075	cf::override;	1236	cf::override;
…		…
1165		1326
1166	=head3 cf::player	1327	=head3 cf::player
1167		1328
1168	=over 4	1329	=over 4
1169		1330
		1331	=item cf::player::num_playing
		1332
		1333	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1334
		1335	=cut
		1336
		1337	sub num_playing {
		1338	scalar grep
		1339	$_->ob->map
		1340	&& !$_->hidden
		1341	&& !$_->ob->flag (cf::FLAG_WIZ),
		1342	cf::player::list
		1343	}
		1344
1170	=item cf::player::find $login	1345	=item cf::player::find $login
1171		1346
1172	Returns the given player object, loading it if necessary (might block).	1347	Returns the given player object, loading it if necessary (might block).
1173		1348
1174	=cut	1349	=cut
…		…
1209	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1384	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1385	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1386	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212	aio_unlink +(playerdir $login) . "/$login.pl";	1387	aio_unlink +(playerdir $login) . "/$login.pl";
1213		1388
1214	my $pl = load_pl path $login	1389	my $f = new_from_file cf::object::thawer path $login
1215	or return;	1390	or return;
		1391
		1392	my $pl = cf::player::load_pl $f
		1393	or return;
		1394	local $cf::PLAYER_LOADING{$login} = $pl;
		1395	$f->resolve_delayed_derefs;
1216	$cf::PLAYER{$login} = $pl	1396	$cf::PLAYER{$login} = $pl
1217	}	1397	}
1218	}	1398	}
1219	}	1399	}
1220		1400
…		…
1230		1410
1231	aio_mkdir playerdir $pl, 0770;	1411	aio_mkdir playerdir $pl, 0770;
1232	$pl->{last_save} = $cf::RUNTIME;	1412	$pl->{last_save} = $cf::RUNTIME;
1233		1413
1234	$pl->save_pl ($path);	1414	$pl->save_pl ($path);
1235	Coro::cede;	1415	cf::cede_to_tick;
1236	}	1416	}
1237		1417
1238	sub new($) {	1418	sub new($) {
1239	my ($login) = @_;	1419	my ($login) = @_;
1240		1420
…		…
1244	$self->{deny_save} = 1;	1424	$self->{deny_save} = 1;
1245		1425
1246	$cf::PLAYER{$login} = $self;	1426	$cf::PLAYER{$login} = $self;
1247		1427
1248	$self	1428	$self
		1429	}
		1430
		1431	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1432
		1433	=cut
		1434
		1435	sub send_msg {
		1436	my $ns = shift->ns
		1437	or return;
		1438	$ns->send_msg (@_);
1249	}	1439	}
1250		1440
1251	=item $pl->quit_character	1441	=item $pl->quit_character
1252		1442
1253	Nukes the player without looking back. If logged in, the connection will	1443	Nukes the player without looking back. If logged in, the connection will
…		…
1308	or return [];	1498	or return [];
1309		1499
1310	my @logins;	1500	my @logins;
1311		1501
1312	for my $login (@$dirs) {	1502	for my $login (@$dirs) {
		1503	my $path = path $login;
		1504
		1505	# a .pst is a dead give-away for a valid player
		1506	unless (-e "$path.pst") {
1313	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1507	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314	aio_read $fh, 0, 512, my $buf, 0 or next;	1508	aio_read $fh, 0, 512, my $buf, 0 or next;
1315	$buf !~ /^password -------------$/m or next; # official not-valid tag	1509	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1510	}
1316		1511
1317	utf8::decode $login;	1512	utf8::decode $login;
1318	push @logins, $login;	1513	push @logins, $login;
1319	}	1514	}
1320		1515
…		…
1347	}	1542	}
1348		1543
1349	\@paths	1544	\@paths
1350	}	1545	}
1351		1546
		1547	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
		1548
		1549	Expand crossfire pod fragments into protocol xml.
		1550
		1551	=cut
		1552
		1553	use re 'eval';
		1554
		1555	my $group;
		1556	my $interior; $interior = qr{
		1557	# match a pod interior sequence sans C<< >>
		1558	(?:
		1559	\ (.*?)\ (?{ $group = $^N })
		1560	| < (??{$interior}) >
		1561	)
		1562	}x;
		1563
		1564	sub expand_cfpod {
		1565	my ($self, $pod) = @_;
		1566
		1567	my $xml;
		1568
		1569	while () {
		1570	if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
		1571	$group = $1;
		1572
		1573	$group =~ s/&/&amp;/g;
		1574	$group =~ s/</&lt;/g;
		1575
		1576	$xml .= $group;
		1577	} elsif ($pod =~ m%\G
		1578	([BCGHITU])
		1579	<
		1580	(?:
		1581	([^<>]*) (?{ $group = $^N })
		1582	| < $interior >
		1583	)
		1584	>
		1585	%gcsx
		1586	) {
		1587	my ($code, $data) = ($1, $group);
		1588
		1589	if ($code eq "B") {
		1590	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
		1591	} elsif ($code eq "I") {
		1592	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
		1593	} elsif ($code eq "U") {
		1594	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
		1595	} elsif ($code eq "C") {
		1596	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
		1597	} elsif ($code eq "T") {
		1598	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
		1599	} elsif ($code eq "G") {
		1600	my ($male, $female) = split /\|/, $data;
		1601	$data = $self->gender ? $female : $male;
		1602	$xml .= expand_cfpod ($self, $data);
		1603	} elsif ($code eq "H") {
		1604	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
		1605	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1606	"")
		1607	[$self->{hintmode}];
		1608	} else {
		1609	$xml .= "error processing '$code($data)' directive";
		1610	}
		1611	} else {
		1612	if ($pod =~ /\G(.+)/) {
		1613	warn "parse error while expanding $pod (at $1)";
		1614	}
		1615	last;
		1616	}
		1617	}
		1618
		1619	for ($xml) {
		1620	# create single paragraphs (very hackish)
		1621	s/(?<=\S)\n(?=\w)/ /g;
		1622
		1623	# compress some whitespace
		1624	s/\s+\n/\n/g; # ws line-ends
		1625	s/\n\n+/\n/g; # double lines
		1626	s/^\n+//; # beginning lines
		1627	s/\n+$//; # ending lines
		1628	}
		1629
		1630	$xml
		1631	}
		1632
		1633	no re 'eval';
		1634
		1635	sub hintmode {
		1636	$_[0]{hintmode} = $_[1] if @_ > 1;
		1637	$_[0]{hintmode}
		1638	}
		1639
1352	=item $player->ext_reply ($msgid, %msg)	1640	=item $player->ext_reply ($msgid, @msg)
1353		1641
1354	Sends an ext reply to the player.	1642	Sends an ext reply to the player.
1355		1643
1356	=cut	1644	=cut
1357		1645
1358	sub ext_reply($$%) {	1646	sub ext_reply($$@) {
1359	my ($self, $id, %msg) = @_;	1647	my ($self, $id, @msg) = @_;
1360		1648
1361	$msg{msgid} = $id;	1649	$self->ns->ext_reply ($id, @msg)
1362
1363	$self->send ("ext " . cf::to_json \%msg);
1364	}	1650	}
1365		1651
1366	=item $player->ext_event ($type, %msg)	1652	=item $player->ext_msg ($type, @msg)
1367		1653
1368	Sends an ext event to the client.	1654	Sends an ext event to the client.
1369		1655
1370	=cut	1656	=cut
1371		1657
1372	sub ext_event($$%) {	1658	sub ext_msg($$@) {
1373	my ($self, $type, %msg) = @_;	1659	my ($self, $type, @msg) = @_;
1374		1660
1375	$self->ns->ext_event ($type, %msg);	1661	$self->ns->ext_msg ($type, @msg);
1376	}	1662	}
1377		1663
1378	=head3 cf::region	1664	=head3 cf::region
1379		1665
1380	=over 4	1666	=over 4
…		…
1393	my ($path) = @_;	1679	my ($path) = @_;
1394		1680
1395	my ($match, $specificity);	1681	my ($match, $specificity);
1396		1682
1397	for my $region (list) {	1683	for my $region (list) {
1398	if ($region->match && $path =~ $region->match) {	1684	if ($region->{match} && $path =~ $region->{match}) {
1399	($match, $specificity) = ($region, $region->specificity)	1685	($match, $specificity) = ($region, $region->specificity)
1400	if $region->specificity > $specificity;	1686	if $region->specificity > $specificity;
1401	}	1687	}
1402	}	1688	}
1403		1689
…		…
1523	$self->init; # pass $1 etc.	1809	$self->init; # pass $1 etc.
1524	return $self;	1810	return $self;
1525	}	1811	}
1526	}	1812	}
1527		1813
1528	Carp::carp "unable to resolve path '$path' (base '$base').";	1814	Carp::cluck "unable to resolve path '$path' (base '$base').";
1529	()	1815	()
1530	}	1816	}
1531		1817
1532	sub init {	1818	sub init {
1533	my ($self) = @_;	1819	my ($self) = @_;
…		…
1596		1882
1597	sub load_header_from($) {	1883	sub load_header_from($) {
1598	my ($self, $path) = @_;	1884	my ($self, $path) = @_;
1599		1885
1600	utf8::encode $path;	1886	utf8::encode $path;
1601	#aio_open $path, O_RDONLY, 0	1887	my $f = new_from_file cf::object::thawer $path
1602	# or return;
1603
1604	$self->_load_header ($path)
1605	or return;	1888	or return;
		1889
		1890	$self->_load_header ($f)
		1891	or return;
		1892
		1893	local $MAP_LOADING{$self->{path}} = $self;
		1894	$f->resolve_delayed_derefs;
1606		1895
1607	$self->{load_path} = $path;	1896	$self->{load_path} = $path;
1608		1897
1609	1	1898	1
1610	}	1899	}
…		…
1664	sub find {	1953	sub find {
1665	my ($path, $origin) = @_;	1954	my ($path, $origin) = @_;
1666		1955
1667	$path = normalise $path, $origin && $origin->path;	1956	$path = normalise $path, $origin && $origin->path;
1668		1957
		1958	cf::lock_wait "map_data:$path";#d#remove
1669	cf::lock_wait "map_find:$path";	1959	cf::lock_wait "map_find:$path";
1670		1960
1671	$cf::MAP{$path} || do {	1961	$cf::MAP{$path} || do {
1672	my $guard = cf::lock_acquire "map_find:$path";	1962	my $guard1 = cf::lock_acquire "map_find:$path";
		1963	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1964
1673	my $map = new_from_path cf::map $path	1965	my $map = new_from_path cf::map $path
1674	or return;	1966	or return;
1675		1967
1676	$map->{last_save} = $cf::RUNTIME;	1968	$map->{last_save} = $cf::RUNTIME;
1677		1969
…		…
1679	or return;	1971	or return;
1680		1972
1681	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1973	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1682	# doing this can freeze the server in a sync job, obviously	1974	# doing this can freeze the server in a sync job, obviously
1683	#$cf::WAIT_FOR_TICK->wait;	1975	#$cf::WAIT_FOR_TICK->wait;
		1976	undef $guard1;
		1977	undef $guard2;
1684	$map->reset;	1978	$map->reset;
1685	undef $guard;
1686	return find $path;	1979	return find $path;
1687	}	1980	}
1688		1981
1689	$cf::MAP{$path} = $map	1982	$cf::MAP{$path} = $map
1690	}	1983	}
…		…
1699	local $self->{deny_reset} = 1; # loading can take a long time	1992	local $self->{deny_reset} = 1; # loading can take a long time
1700		1993
1701	my $path = $self->{path};	1994	my $path = $self->{path};
1702		1995
1703	{	1996	{
1704	my $guard = cf::lock_acquire "map_load:$path";	1997	my $guard = cf::lock_acquire "map_data:$path";
1705		1998
		1999	return unless $self->valid;
1706	return if $self->in_memory != cf::MAP_SWAPPED;	2000	return unless $self->in_memory == cf::MAP_SWAPPED;
1707		2001
1708	$self->in_memory (cf::MAP_LOADING);	2002	$self->in_memory (cf::MAP_LOADING);
1709		2003
1710	$self->alloc;	2004	$self->alloc;
1711		2005
1712	$self->pre_load;	2006	$self->pre_load;
1713	Coro::cede;	2007	cf::cede_to_tick;
1714		2008
		2009	my $f = new_from_file cf::object::thawer $self->{load_path};
		2010	$f->skip_block;
1715	$self->_load_objects ($self->{load_path}, 1)	2011	$self->_load_objects ($f)
1716	or return;	2012	or return;
1717		2013
1718	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2014	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1719	if delete $self->{load_original};	2015	if delete $self->{load_original};
1720		2016
1721	if (my $uniq = $self->uniq_path) {	2017	if (my $uniq = $self->uniq_path) {
1722	utf8::encode $uniq;	2018	utf8::encode $uniq;
1723	if (aio_open $uniq, O_RDONLY, 0) {	2019	unless (aio_stat $uniq) {
		2020	if (my $f = new_from_file cf::object::thawer $uniq) {
1724	$self->clear_unique_items;	2021	$self->clear_unique_items;
1725	$self->_load_objects ($uniq, 0);	2022	$self->_load_objects ($f);
		2023	$f->resolve_delayed_derefs;
		2024	}
1726	}	2025	}
1727	}	2026	}
1728		2027
1729	Coro::cede;	2028	$f->resolve_delayed_derefs;
		2029
		2030	cf::cede_to_tick;
1730	# now do the right thing for maps	2031	# now do the right thing for maps
1731	$self->link_multipart_objects;	2032	$self->link_multipart_objects;
1732	$self->difficulty ($self->estimate_difficulty)	2033	$self->difficulty ($self->estimate_difficulty)
1733	unless $self->difficulty;	2034	unless $self->difficulty;
1734	Coro::cede;	2035	cf::cede_to_tick;
1735		2036
1736	unless ($self->{deny_activate}) {	2037	unless ($self->{deny_activate}) {
1737	$self->decay_objects;	2038	$self->decay_objects;
1738	$self->fix_auto_apply;	2039	$self->fix_auto_apply;
1739	$self->update_buttons;	2040	$self->update_buttons;
1740	Coro::cede;	2041	cf::cede_to_tick;
1741	$self->set_darkness_map;	2042	$self->set_darkness_map;
1742	Coro::cede;	2043	cf::cede_to_tick;
1743	$self->activate;	2044	$self->activate;
1744	}	2045	}
		2046
		2047	$self->{last_save} = $cf::RUNTIME;
		2048	$self->last_access ($cf::RUNTIME);
1745		2049
1746	$self->in_memory (cf::MAP_IN_MEMORY);	2050	$self->in_memory (cf::MAP_IN_MEMORY);
1747	}	2051	}
1748		2052
1749	$self->post_load;	2053	$self->post_load;
…		…
1760		2064
1761	$self	2065	$self
1762	}	2066	}
1763		2067
1764	# find and load all maps in the 3x3 area around a map	2068	# find and load all maps in the 3x3 area around a map
1765	sub load_diag {	2069	sub load_neighbours {
1766	my ($map) = @_;	2070	my ($map) = @_;
1767		2071
1768	my @diag; # diagonal neighbours	2072	my @neigh; # diagonal neighbours
1769		2073
1770	for (0 .. 3) {	2074	for (0 .. 3) {
1771	my $neigh = $map->tile_path ($_)	2075	my $neigh = $map->tile_path ($_)
1772	or next;	2076	or next;
1773	$neigh = find $neigh, $map	2077	$neigh = find $neigh, $map
1774	or next;	2078	or next;
1775	$neigh->load;	2079	$neigh->load;
1776		2080
		2081	push @neigh,
1777	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2082	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1778	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2083	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1779	}	2084	}
1780		2085
1781	for (@diag) {	2086	for (grep defined $_->[0], @neigh) {
		2087	my ($path, $origin) = @$_;
1782	my $neigh = find @$_	2088	my $neigh = find $path, $origin
1783	or next;	2089	or next;
1784	$neigh->load;	2090	$neigh->load;
1785	}	2091	}
1786	}	2092	}
1787		2093
…		…
1792	}	2098	}
1793		2099
1794	sub do_load_sync {	2100	sub do_load_sync {
1795	my ($map) = @_;	2101	my ($map) = @_;
1796		2102
		2103	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2104	if $Coro::current == $Coro::main;
		2105
1797	cf::sync_job { $map->load };	2106	cf::sync_job { $map->load };
1798	}	2107	}
1799		2108
1800	our %MAP_PREFETCH;	2109	our %MAP_PREFETCH;
1801	our $MAP_PREFETCHER = undef;	2110	our $MAP_PREFETCHER = undef;
1802		2111
1803	sub find_async {	2112	sub find_async {
1804	my ($path, $origin) = @_;	2113	my ($path, $origin, $load) = @_;
1805		2114
1806	$path = normalise $path, $origin && $origin->{path};	2115	$path = normalise $path, $origin && $origin->{path};
1807		2116
1808	if (my $map = $cf::MAP{$path}) {	2117	if (my $map = $cf::MAP{$path}) {
1809	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2118	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1810	}	2119	}
1811		2120
1812	undef $MAP_PREFETCH{$path};	2121	$MAP_PREFETCH{$path} |= $load;
		2122
1813	$MAP_PREFETCHER ||= cf::async {	2123	$MAP_PREFETCHER ||= cf::async {
		2124	$Coro::current->{desc} = "map prefetcher";
		2125
1814	while (%MAP_PREFETCH) {	2126	while (%MAP_PREFETCH) {
1815	for my $path (keys %MAP_PREFETCH) {	2127	while (my ($k, $v) = each %MAP_PREFETCH) {
1816	my $map = find $path	2128	if (my $map = find $k) {
1817	or next;
1818	$map->load;	2129	$map->load if $v;
		2130	}
1819		2131
1820	delete $MAP_PREFETCH{$path};	2132	delete $MAP_PREFETCH{$k};
1821	}	2133	}
1822	}	2134	}
1823	undef $MAP_PREFETCHER;	2135	undef $MAP_PREFETCHER;
1824	};	2136	};
1825	$MAP_PREFETCHER->prio (6);	2137	$MAP_PREFETCHER->prio (6);
…		…
1828	}	2140	}
1829		2141
1830	sub save {	2142	sub save {
1831	my ($self) = @_;	2143	my ($self) = @_;
1832		2144
1833	my $lock = cf::lock_acquire "map_data:" . $self->path;	2145	my $lock = cf::lock_acquire "map_data:$self->{path}";
1834		2146
1835	$self->{last_save} = $cf::RUNTIME;	2147	$self->{last_save} = $cf::RUNTIME;
1836		2148
1837	return unless $self->dirty;	2149	return unless $self->dirty;
1838		2150
…		…
1844	return if $self->{deny_save};	2156	return if $self->{deny_save};
1845		2157
1846	local $self->{last_access} = $self->last_access;#d#	2158	local $self->{last_access} = $self->last_access;#d#
1847		2159
1848	cf::async {	2160	cf::async {
		2161	$Coro::current->{desc} = "map player save";
1849	$_->contr->save for $self->players;	2162	$_->contr->save for $self->players;
1850	};	2163	};
1851		2164
1852	if ($uniq) {	2165	if ($uniq) {
1853	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2166	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
…		…
1861	my ($self) = @_;	2174	my ($self) = @_;
1862		2175
1863	# save first because save cedes	2176	# save first because save cedes
1864	$self->save;	2177	$self->save;
1865		2178
1866	my $lock = cf::lock_acquire "map_data:" . $self->path;	2179	my $lock = cf::lock_acquire "map_data:$self->{path}";
1867		2180
1868	return if $self->players;	2181	return if $self->players;
1869	return if $self->in_memory != cf::MAP_IN_MEMORY;	2182	return if $self->in_memory != cf::MAP_IN_MEMORY;
1870	return if $self->{deny_save};	2183	return if $self->{deny_save};
1871		2184
		2185	$self->in_memory (cf::MAP_SWAPPED);
		2186
		2187	$self->deactivate;
		2188	$_->clear_links_to ($self) for values %cf::MAP;
1872	$self->clear;	2189	$self->clear;
1873	$self->in_memory (cf::MAP_SWAPPED);
1874	}	2190	}
1875		2191
1876	sub reset_at {	2192	sub reset_at {
1877	my ($self) = @_;	2193	my ($self) = @_;
1878		2194
…		…
1910	if $uniq;	2226	if $uniq;
1911	}	2227	}
1912		2228
1913	delete $cf::MAP{$self->path};	2229	delete $cf::MAP{$self->path};
1914		2230
		2231	$self->deactivate;
		2232	$_->clear_links_to ($self) for values %cf::MAP;
1915	$self->clear;	2233	$self->clear;
1916
1917	$_->clear_links_to ($self) for values %cf::MAP;
1918		2234
1919	$self->unlink_save;	2235	$self->unlink_save;
1920	$self->destroy;	2236	$self->destroy;
1921	}	2237	}
1922		2238
1923	my $nuke_counter = "aaaa";	2239	my $nuke_counter = "aaaa";
1924		2240
1925	sub nuke {	2241	sub nuke {
1926	my ($self) = @_;	2242	my ($self) = @_;
1927		2243
		2244	{
		2245	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2246
1928	delete $cf::MAP{$self->path};	2247	delete $cf::MAP{$self->path};
1929		2248
1930	$self->unlink_save;	2249	$self->unlink_save;
1931		2250
1932	bless $self, "cf::map";	2251	bless $self, "cf::map";
1933	delete $self->{deny_reset};	2252	delete $self->{deny_reset};
1934	$self->{deny_save} = 1;	2253	$self->{deny_save} = 1;
1935	$self->reset_timeout (1);	2254	$self->reset_timeout (1);
1936	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2255	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1937		2256
1938	$cf::MAP{$self->path} = $self;	2257	$cf::MAP{$self->path} = $self;
		2258	}
1939		2259
1940	$self->reset; # polite request, might not happen	2260	$self->reset; # polite request, might not happen
1941	}	2261	}
1942		2262
1943	=item $maps = cf::map::tmp_maps	2263	=item $maps = cf::map::tmp_maps
…		…
2019		2339
2020	sub inv_recursive {	2340	sub inv_recursive {
2021	inv_recursive_ inv $_[0]	2341	inv_recursive_ inv $_[0]
2022	}	2342	}
2023		2343
		2344	=item $ref = $ob->ref
		2345
		2346	creates and returns a persistent reference to an objetc that can be stored as a string.
		2347
		2348	=item $ob = cf::object::deref ($refstring)
		2349
		2350	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2351	even if the object actually exists. May block.
		2352
		2353	=cut
		2354
		2355	sub deref {
		2356	my ($ref) = @_;
		2357
		2358	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2359	my ($uuid, $name) = ($1, $2);
		2360	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2361	or return;
		2362	$pl->ob->uuid eq $uuid
		2363	or return;
		2364
		2365	$pl->ob
		2366	} else {
		2367	warn "$ref: cannot resolve object reference\n";
		2368	undef
		2369	}
		2370	}
		2371
2024	package cf;	2372	package cf;
2025		2373
2026	=back	2374	=back
2027		2375
2028	=head3 cf::object::player	2376	=head3 cf::object::player
…		…
2050		2398
2051	} else {	2399	} else {
2052	my $pl = $self->contr;	2400	my $pl = $self->contr;
2053		2401
2054	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2402	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2055	my $diag = $pl->{npc_dialog};	2403	my $dialog = $pl->{npc_dialog};
2056	$diag->{pl}->ext_reply (	2404	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2057	$diag->{id}, msgtype => "reply", msg => $msg, add_topics => []
2058	);
2059		2405
2060	} else {	2406	} else {
2061	$msg = $npc->name . " says: $msg" if $npc;	2407	$msg = $npc->name . " says: $msg" if $npc;
2062	$self->message ($msg, $flags);	2408	$self->message ($msg, $flags);
2063	}	2409	}
2064	}	2410	}
		2411	}
		2412
		2413	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2414
		2415	=cut
		2416
		2417	sub cf::object::send_msg {
		2418	my $pl = shift->contr
		2419	or return;
		2420	$pl->send_msg (@_);
2065	}	2421	}
2066		2422
2067	=item $player_object->may ("access")	2423	=item $player_object->may ("access")
2068		2424
2069	Returns wether the given player is authorized to access resource "access"	2425	Returns wether the given player is authorized to access resource "access"
…		…
2148	# use -1 or undef as default coordinates, not 0, 0	2504	# use -1 or undef as default coordinates, not 0, 0
2149	($x, $y) = ($map->enter_x, $map->enter_y)	2505	($x, $y) = ($map->enter_x, $map->enter_y)
2150	if $x <=0 && $y <= 0;	2506	if $x <=0 && $y <= 0;
2151		2507
2152	$map->load;	2508	$map->load;
2153	$map->load_diag;	2509	$map->load_neighbours;
2154		2510
2155	return unless $self->contr->active;	2511	return unless $self->contr->active;
2156	$self->activate_recursive;	2512	$self->activate_recursive;
2157		2513
2158	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2514	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2159	$self->enter_map ($map, $x, $y);	2515	$self->enter_map ($map, $x, $y);
2160	}	2516	}
2161		2517
2162	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2518	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2163		2519
2164	Moves the player to the given map-path and coordinates by first freezing	2520	Moves the player to the given map-path and coordinates by first freezing
2165	her, loading and preparing them map, calling the provided $check callback	2521	her, loading and preparing them map, calling the provided $check callback
2166	that has to return the map if sucecssful, and then unfreezes the player on	2522	that has to return the map if sucecssful, and then unfreezes the player on
2167	the new (success) or old (failed) map position.	2523	the new (success) or old (failed) map position. In either case, $done will
		2524	be called at the end of this process.
2168		2525
2169	=cut	2526	=cut
2170		2527
2171	our $GOTOGEN;	2528	our $GOTOGEN;
2172		2529
2173	sub cf::object::player::goto {	2530	sub cf::object::player::goto {
2174	my ($self, $path, $x, $y, $check) = @_;	2531	my ($self, $path, $x, $y, $check, $done) = @_;
2175		2532
2176	# do generation counting so two concurrent goto's will be executed in-order	2533	# do generation counting so two concurrent goto's will be executed in-order
2177	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2534	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2178		2535
2179	$self->enter_link;	2536	$self->enter_link;
2180		2537
2181	(async {	2538	(async {
		2539	$Coro::current->{desc} = "player::goto $path $x $y";
		2540
		2541	# *tag paths override both path and x|y
		2542	if ($path =~ /^\*(.*)$/) {
		2543	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2544	my $ob = $obs[rand @obs];
		2545
		2546	# see if we actually can go there
		2547	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2548	$ob = $obs[rand @obs];
		2549	} else {
		2550	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2551	}
		2552	# else put us there anyways for now #d#
		2553
		2554	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2555	} else {
		2556	($path, $x, $y) = (undef, undef, undef);
		2557	}
		2558	}
		2559
2182	my $map = eval {	2560	my $map = eval {
2183	my $map = cf::map::find $path;	2561	my $map = defined $path ? cf::map::find $path : undef;
2184		2562
2185	if ($map) {	2563	if ($map) {
2186	$map = $map->customise_for ($self);	2564	$map = $map->customise_for ($self);
2187	$map = $check->($map) if $check && $map;	2565	$map = $check->($map) if $check && $map;
2188	} else {	2566	} else {
2189	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2567	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2190	}	2568	}
2191		2569
2192	$map	2570	$map
2193	};	2571	};
2194		2572
…		…
2199		2577
2200	if ($gen == $self->{_goto_generation}) {	2578	if ($gen == $self->{_goto_generation}) {
2201	delete $self->{_goto_generation};	2579	delete $self->{_goto_generation};
2202	$self->leave_link ($map, $x, $y);	2580	$self->leave_link ($map, $x, $y);
2203	}	2581	}
		2582
		2583	$done->() if $done;
2204	})->prio (1);	2584	})->prio (1);
2205	}	2585	}
2206		2586
2207	=item $player_object->enter_exit ($exit_object)	2587	=item $player_object->enter_exit ($exit_object)
2208		2588
…		…
2277	my $hp = $exit->stats->hp;	2657	my $hp = $exit->stats->hp;
2278	my $sp = $exit->stats->sp;	2658	my $sp = $exit->stats->sp;
2279		2659
2280	$self->enter_link;	2660	$self->enter_link;
2281		2661
		2662	# if exit is damned, update players death & WoR home-position
		2663	$self->contr->savebed ($slaying, $hp, $sp)
		2664	if $exit->flag (FLAG_DAMNED);
		2665
2282	(async {	2666	(async {
		2667	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2668
2283	$self->deactivate_recursive; # just to be sure	2669	$self->deactivate_recursive; # just to be sure
2284	unless (eval {	2670	unless (eval {
2285	$self->goto ($slaying, $hp, $sp);	2671	$self->goto ($slaying, $hp, $sp);
2286		2672
2287	1;	2673	1;
…		…
2313		2699
2314	utf8::encode $text;	2700	utf8::encode $text;
2315	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2701	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2316	}	2702	}
2317		2703
		2704	=item $client->send_msg ($channel, $msg, $color, [extra...])
		2705
		2706	Send a drawinfo or msg packet to the client, formatting the msg for the
		2707	client if neccessary. C<$type> should be a string identifying the type of
		2708	the message, with C<log> being the default. If C<$color> is negative, suppress
		2709	the message unless the client supports the msg packet.
		2710
		2711	=cut
		2712
		2713	# non-persistent channels (usually the info channel)
		2714	our %CHANNEL = (
		2715	"c/identify" => {
		2716	id => "infobox",
		2717	title => "Identify",
		2718	reply => undef,
		2719	tooltip => "Items recently identified",
		2720	},
		2721	"c/examine" => {
		2722	id => "infobox",
		2723	title => "Examine",
		2724	reply => undef,
		2725	tooltip => "Signs and other items you examined",
		2726	},
		2727	"c/book" => {
		2728	id => "infobox",
		2729	title => "Book",
		2730	reply => undef,
		2731	tooltip => "The contents of a note or book",
		2732	},
		2733	"c/lookat" => {
		2734	id => "infobox",
		2735	title => "Look",
		2736	reply => undef,
		2737	tooltip => "What you saw there",
		2738	},
		2739	"c/who" => {
		2740	id => "infobox",
		2741	title => "Players",
		2742	reply => undef,
		2743	tooltip => "Shows players who are currently online",
		2744	},
		2745	"c/body" => {
		2746	id => "infobox",
		2747	title => "Body Parts",
		2748	reply => undef,
		2749	tooltip => "Shows which body parts you posess and are available",
		2750	},
		2751	"c/uptime" => {
		2752	id => "infobox",
		2753	title => "Uptime",
		2754	reply => undef,
		2755	tooltip => "How long the server has been running since last restart",
		2756	},
		2757	"c/mapinfo" => {
		2758	id => "infobox",
		2759	title => "Map Info",
		2760	reply => undef,
		2761	tooltip => "Information related to the maps",
		2762	},
		2763	);
		2764
		2765	sub cf::client::send_msg {
		2766	my ($self, $channel, $msg, $color, @extra) = @_;
		2767
		2768	$msg = $self->pl->expand_cfpod ($msg);
		2769
		2770	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2771
		2772	# check predefined channels, for the benefit of C
		2773	if ($CHANNEL{$channel}) {
		2774	$channel = $CHANNEL{$channel};
		2775
		2776	$self->ext_msg (channel_info => $channel)
		2777	if $self->can_msg;
		2778
		2779	$channel = $channel->{id};
		2780
		2781	} elsif (ref $channel) {
		2782	# send meta info to client, if not yet sent
		2783	unless (exists $self->{channel}{$channel->{id}}) {
		2784	$self->{channel}{$channel->{id}} = $channel;
		2785	$self->ext_msg (channel_info => $channel)
		2786	if $self->can_msg;
		2787	}
		2788
		2789	$channel = $channel->{id};
		2790	}
		2791
		2792	return unless @extra || length $msg;
		2793
		2794	if ($self->can_msg) {
		2795	# default colour, mask it out
		2796	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2797	if $color & cf::NDI_DEF;
		2798
		2799	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2800	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
		2801	} else {
		2802	if ($color >= 0) {
		2803	# replace some tags by gcfclient-compatible ones
		2804	for ($msg) {
		2805	1 while
		2806	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2807	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2808	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2809	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2810	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2811	}
		2812
		2813	$color &= cf::NDI_COLOR_MASK;
		2814
		2815	utf8::encode $msg;
		2816
		2817	if (0 && $msg =~ /\[/) {
		2818	# COMMAND/INFO
		2819	$self->send_packet ("drawextinfo $color 10 8 $msg")
		2820	} else {
		2821	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
		2822	$self->send_packet ("drawinfo $color $msg")
		2823	}
		2824	}
		2825	}
		2826	}
		2827
2318	=item $client->ext_event ($type, %msg)	2828	=item $client->ext_msg ($type, @msg)
2319		2829
2320	Sends an exti event to the client.	2830	Sends an ext event to the client.
2321		2831
2322	=cut	2832	=cut
2323		2833
2324	sub cf::client::ext_event($$%) {	2834	sub cf::client::ext_msg($$@) {
2325	my ($self, $type, %msg) = @_;	2835	my ($self, $type, @msg) = @_;
2326		2836
		2837	if ($self->extcmd == 2) {
		2838	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2839	} elsif ($self->extcmd == 1) { # TODO: remove
2327	$msg{msgtype} = "event_$type";	2840	push @msg, msgtype => "event_$type";
2328	$self->send_packet ("ext " . cf::to_json \%msg);	2841	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2842	}
		2843	}
		2844
		2845	=item $client->ext_reply ($msgid, @msg)
		2846
		2847	Sends an ext reply to the client.
		2848
		2849	=cut
		2850
		2851	sub cf::client::ext_reply($$@) {
		2852	my ($self, $id, @msg) = @_;
		2853
		2854	if ($self->extcmd == 2) {
		2855	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2856	} elsif ($self->extcmd == 1) {
		2857	#TODO: version 1, remove
		2858	unshift @msg, msgtype => "reply", msgid => $id;
		2859	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2860	}
2329	}	2861	}
2330		2862
2331	=item $success = $client->query ($flags, "text", \&cb)	2863	=item $success = $client->query ($flags, "text", \&cb)
2332		2864
2333	Queues a query to the client, calling the given callback with	2865	Queues a query to the client, calling the given callback with
2334	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2866	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2335	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.	2867	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2336		2868
2337	Queries can fail, so check the return code. Or don't, as queries will become	2869	Queries can fail, so check the return code. Or don't, as queries will
2338	reliable at some point in the future.	2870	become reliable at some point in the future.
2339		2871
2340	=cut	2872	=cut
2341		2873
2342	sub cf::client::query {	2874	sub cf::client::query {
2343	my ($self, $flags, $text, $cb) = @_;	2875	my ($self, $flags, $text, $cb) = @_;
…		…
2351	utf8::encode $text;	2883	utf8::encode $text;
2352	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];	2884	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2353		2885
2354	$self->send_packet ($self->{query_queue}[0][0])	2886	$self->send_packet ($self->{query_queue}[0][0])
2355	if @{ $self->{query_queue} } == 1;	2887	if @{ $self->{query_queue} } == 1;
		2888
		2889	1
2356	}	2890	}
2357		2891
2358	cf::client->attach (	2892	cf::client->attach (
		2893	on_connect => sub {
		2894	my ($ns) = @_;
		2895
		2896	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2897	},
2359	on_reply => sub {	2898	on_reply => sub {
2360	my ($ns, $msg) = @_;	2899	my ($ns, $msg) = @_;
2361		2900
2362	# this weird shuffling is so that direct followup queries	2901	# this weird shuffling is so that direct followup queries
2363	# get handled first	2902	# get handled first
…		…
2375	} else {	2914	} else {
2376	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;	2915	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2377	}	2916	}
2378	}	2917	}
2379	},	2918	},
		2919	on_exticmd => sub {
		2920	my ($ns, $buf) = @_;
		2921
		2922	my $msg = eval { $ns->{json_coder}->decode ($buf) };
		2923
		2924	if (ref $msg) {
		2925	my ($type, $reply, @payload) =
		2926	"ARRAY" eq ref $msg
		2927	? @$msg
		2928	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2929
		2930	my @reply;
		2931
		2932	if (my $cb = $EXTICMD{$type}) {
		2933	@reply = $cb->($ns, @payload);
		2934	}
		2935
		2936	$ns->ext_reply ($reply, @reply)
		2937	if $reply;
		2938
		2939	} else {
		2940	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
		2941	}
		2942
		2943	cf::override;
		2944	},
2380	);	2945	);
2381		2946
2382	=item $client->async (\&cb)	2947	=item $client->async (\&cb)
2383		2948
2384	Create a new coroutine, running the specified callback. The coroutine will	2949	Create a new coroutine, running the specified callback. The coroutine will
…		…
2425	our $safe = new Safe "safe";	2990	our $safe = new Safe "safe";
2426	our $safe_hole = new Safe::Hole;	2991	our $safe_hole = new Safe::Hole;
2427		2992
2428	$SIG{FPE} = 'IGNORE';	2993	$SIG{FPE} = 'IGNORE';
2429		2994
2430	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2995	$safe->permit_only (Opcode::opset qw(
		2996	:base_core :base_mem :base_orig :base_math
		2997	grepstart grepwhile mapstart mapwhile
		2998	sort time
		2999	));
2431		3000
2432	# here we export the classes and methods available to script code	3001	# here we export the classes and methods available to script code
2433		3002
2434	=pod	3003	=pod
2435		3004
2436	The following functions and methods are available within a safe environment:	3005	The following functions and methods are available within a safe environment:
2437		3006
2438	cf::object contr pay_amount pay_player map	3007	cf::object
		3008	contr pay_amount pay_player map x y force_find force_add destroy
		3009	insert remove name archname title slaying race decrease_ob_nr
		3010
2439	cf::object::player player	3011	cf::object::player
2440	cf::player peaceful	3012	player
2441	cf::map trigger	3013
		3014	cf::player
		3015	peaceful
		3016
		3017	cf::map
		3018	trigger
2442		3019
2443	=cut	3020	=cut
2444		3021
2445	for (	3022	for (
2446	["cf::object" => qw(contr pay_amount pay_player map)],	3023	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		3024	insert remove inv name archname title slaying race
		3025	decrease_ob_nr destroy)],
2447	["cf::object::player" => qw(player)],	3026	["cf::object::player" => qw(player)],
2448	["cf::player" => qw(peaceful)],	3027	["cf::player" => qw(peaceful)],
2449	["cf::map" => qw(trigger)],	3028	["cf::map" => qw(trigger)],
2450	) {	3029	) {
2451	no strict 'refs';	3030	no strict 'refs';
…		…
2527	# the server's init and main functions	3106	# the server's init and main functions
2528		3107
2529	sub load_facedata($) {	3108	sub load_facedata($) {
2530	my ($path) = @_;	3109	my ($path) = @_;
2531		3110
		3111	# HACK to clear player env face cache, we need some signal framework
		3112	# for this (global event?)
		3113	%ext::player_env::MUSIC_FACE_CACHE = ();
		3114
		3115	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3116
2532	warn "loading facedata from $path\n";	3117	warn "loading facedata from $path\n";
2533		3118
2534	my $facedata;	3119	my $facedata;
2535	0 < aio_load $path, $facedata	3120	0 < aio_load $path, $facedata
2536	or die "$path: $!";	3121	or die "$path: $!";
…		…
2538	$facedata = Coro::Storable::thaw $facedata;	3123	$facedata = Coro::Storable::thaw $facedata;
2539		3124
2540	$facedata->{version} == 2	3125	$facedata->{version} == 2
2541	or cf::cleanup "$path: version mismatch, cannot proceed.";	3126	or cf::cleanup "$path: version mismatch, cannot proceed.";
2542		3127
		3128	# patch in the exptable
		3129	$facedata->{resource}{"res/exp_table"} = {
		3130	type => FT_RSRC,
		3131	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3132	};
		3133	cf::cede_to_tick;
		3134
2543	{	3135	{
2544	my $faces = $facedata->{faceinfo};	3136	my $faces = $facedata->{faceinfo};
2545		3137
2546	while (my ($face, $info) = each %$faces) {	3138	while (my ($face, $info) = each %$faces) {
2547	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3139	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2548	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3140	cf::face::set_visibility $idx, $info->{visibility};
		3141	cf::face::set_magicmap $idx, $info->{magicmap};
2549	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3142	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2550	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3143	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2551	Coro::cede;	3144
		3145	cf::cede_to_tick;
2552	}	3146	}
2553		3147
2554	while (my ($face, $info) = each %$faces) {	3148	while (my ($face, $info) = each %$faces) {
2555	next unless $info->{smooth};	3149	next unless $info->{smooth};
2556	my $idx = cf::face::find $face	3150	my $idx = cf::face::find $face
2557	or next;	3151	or next;
2558	if (my $smooth = cf::face::find $info->{smooth}) {	3152	if (my $smooth = cf::face::find $info->{smooth}) {
		3153	cf::face::set_smooth $idx, $smooth;
2559	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3154	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2560	} else {	3155	} else {
2561	warn "smooth face '$info->{smooth}' not found for face '$face'";	3156	warn "smooth face '$info->{smooth}' not found for face '$face'";
2562	}	3157	}
2563	Coro::cede;	3158
		3159	cf::cede_to_tick;
2564	}	3160	}
2565	}	3161	}
2566		3162
2567	{	3163	{
2568	my $anims = $facedata->{animinfo};	3164	my $anims = $facedata->{animinfo};
2569		3165
2570	while (my ($anim, $info) = each %$anims) {	3166	while (my ($anim, $info) = each %$anims) {
2571	cf::anim::set $anim, $info->{frames}, $info->{facings};	3167	cf::anim::set $anim, $info->{frames}, $info->{facings};
2572	Coro::cede;	3168	cf::cede_to_tick;
2573	}	3169	}
2574		3170
2575	cf::anim::invalidate_all; # d'oh	3171	cf::anim::invalidate_all; # d'oh
2576	}	3172	}
2577		3173
		3174	{
		3175	# TODO: for gcfclient pleasure, we should give resources
		3176	# that gcfclient doesn't grok a >10000 face index.
		3177	my $res = $facedata->{resource};
		3178
		3179	my $soundconf = delete $res->{"res/sound.conf"};
		3180
		3181	while (my ($name, $info) = each %$res) {
		3182	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3183	my $data;
		3184
		3185	if ($info->{type} & 1) {
		3186	# prepend meta info
		3187
		3188	my $meta = $enc->encode ({
		3189	name => $name,
		3190	%{ $info->{meta} || {} },
		3191	});
		3192
		3193	$data = pack "(w/a*)*", $meta, $info->{data};
		3194	} else {
		3195	$data = $info->{data};
		3196	}
		3197
		3198	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3199	cf::face::set_type $idx, $info->{type};
		3200
		3201	cf::cede_to_tick;
		3202	}
		3203
		3204	if ($soundconf) {
		3205	$soundconf = $enc->decode (delete $soundconf->{data});
		3206
		3207	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3208	my $sound = $soundconf->{compat}[$_]
		3209	or next;
		3210
		3211	my $face = cf::face::find "sound/$sound->[1]";
		3212	cf::sound::set $sound->[0] => $face;
		3213	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3214	}
		3215
		3216	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3217	my $face = cf::face::find "sound/$v";
		3218	cf::sound::set $k => $face;
		3219	}
		3220	}
		3221	}
		3222
2578	1	3223	1
2579	}	3224	}
2580		3225
		3226	register_exticmd fx_want => sub {
		3227	my ($ns, $want) = @_;
		3228
		3229	while (my ($k, $v) = each %$want) {
		3230	$ns->fx_want ($k, $v);
		3231	}
		3232	};
		3233
2581	sub reload_regions {	3234	sub reload_regions {
		3235	# HACK to clear player env face cache, we need some signal framework
		3236	# for this (global event?)
		3237	%ext::player_env::MUSIC_FACE_CACHE = ();
		3238
2582	load_resource_file "$MAPDIR/regions"	3239	load_resource_file "$MAPDIR/regions"
2583	or die "unable to load regions file\n";	3240	or die "unable to load regions file\n";
		3241
		3242	for (cf::region::list) {
		3243	$_->{match} = qr/$_->{match}/
		3244	if exists $_->{match};
		3245	}
2584	}	3246	}
2585		3247
2586	sub reload_facedata {	3248	sub reload_facedata {
2587	load_facedata "$DATADIR/facedata"	3249	load_facedata "$DATADIR/facedata"
2588	or die "unable to load facedata\n";	3250	or die "unable to load facedata\n";
2589	}	3251	}
2590		3252
2591	sub reload_archetypes {	3253	sub reload_archetypes {
		3254	load_resource_file "$DATADIR/archetypes"
		3255	or die "unable to load archetypes\n";
		3256	#d# NEED to laod twice to resolve forward references
		3257	# this really needs to be done in an extra post-pass
		3258	# (which needs to be synchronous, so solve it differently)
2592	load_resource_file "$DATADIR/archetypes"	3259	load_resource_file "$DATADIR/archetypes"
2593	or die "unable to load archetypes\n";	3260	or die "unable to load archetypes\n";
2594	}	3261	}
2595		3262
2596	sub reload_treasures {	3263	sub reload_treasures {
…		…
2612		3279
2613	sub init {	3280	sub init {
2614	reload_resources;	3281	reload_resources;
2615	}	3282	}
2616		3283
2617	sub cfg_load {	3284	sub reload_config {
2618	open my $fh, "<:utf8", "$CONFDIR/config"	3285	open my $fh, "<:utf8", "$CONFDIR/config"
2619	or return;	3286	or return;
2620		3287
2621	local $/;	3288	local $/;
2622	*CFG = YAML::Syck::Load <$fh>;	3289	*CFG = YAML::Syck::Load <$fh>;
…		…
2638	sub main {	3305	sub main {
2639	# we must not ever block the main coroutine	3306	# we must not ever block the main coroutine
2640	local $Coro::idle = sub {	3307	local $Coro::idle = sub {
2641	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3308	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2642	(async {	3309	(async {
		3310	$Coro::current->{desc} = "IDLE BUG HANDLER";
2643	Event::one_event;	3311	Event::one_event;
2644	})->prio (Coro::PRIO_MAX);	3312	})->prio (Coro::PRIO_MAX);
2645	};	3313	};
2646		3314
2647	cfg_load;	3315	reload_config;
2648	db_init;	3316	db_init;
2649	load_extensions;	3317	load_extensions;
2650		3318
2651	$TICK_WATCHER->start;	3319	$TICK_WATCHER->start;
2652	Event::loop;	3320	Event::loop;
…		…
2719	# and maps saved/destroyed asynchronously.	3387	# and maps saved/destroyed asynchronously.
2720	warn "begin emergency player save\n";	3388	warn "begin emergency player save\n";
2721	for my $login (keys %cf::PLAYER) {	3389	for my $login (keys %cf::PLAYER) {
2722	my $pl = $cf::PLAYER{$login} or next;	3390	my $pl = $cf::PLAYER{$login} or next;
2723	$pl->valid or next;	3391	$pl->valid or next;
		3392	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2724	$pl->save;	3393	$pl->save;
2725	}	3394	}
2726	warn "end emergency player save\n";	3395	warn "end emergency player save\n";
2727		3396
2728	warn "begin emergency map save\n";	3397	warn "begin emergency map save\n";
…		…
2776		3445
2777	warn "flushing outstanding aio requests";	3446	warn "flushing outstanding aio requests";
2778	for (;;) {	3447	for (;;) {
2779	BDB::flush;	3448	BDB::flush;
2780	IO::AIO::flush;	3449	IO::AIO::flush;
2781	Coro::cede;	3450	Coro::cede_notself;
2782	last unless IO::AIO::nreqs || BDB::nreqs;	3451	last unless IO::AIO::nreqs || BDB::nreqs;
2783	warn "iterate...";	3452	warn "iterate...";
2784	}	3453	}
2785		3454
2786	++$RELOAD;	3455	++$RELOAD;
…		…
2790	%EXT_CORO = ();	3459	%EXT_CORO = ();
2791		3460
2792	warn "removing commands";	3461	warn "removing commands";
2793	%COMMAND = ();	3462	%COMMAND = ();
2794		3463
2795	warn "removing ext commands";	3464	warn "removing ext/exti commands";
2796	%EXTCMD = ();	3465	%EXTCMD = ();
		3466	%EXTICMD = ();
2797		3467
2798	warn "unloading/nuking all extensions";	3468	warn "unloading/nuking all extensions";
2799	for my $pkg (@EXTS) {	3469	for my $pkg (@EXTS) {
2800	warn "... unloading $pkg";	3470	warn "... unloading $pkg";
2801		3471
…		…
2844	warn "reloading cf.pm";	3514	warn "reloading cf.pm";
2845	require cf;	3515	require cf;
2846	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3516	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2847		3517
2848	warn "loading config and database again";	3518	warn "loading config and database again";
2849	cf::cfg_load;	3519	cf::reload_config;
2850		3520
2851	warn "loading extensions";	3521	warn "loading extensions";
2852	cf::load_extensions;	3522	cf::load_extensions;
2853		3523
2854	warn "reattaching attachments to objects/players";	3524	warn "reattaching attachments to objects/players";
…		…
2890	register_command "reload" => sub {	3560	register_command "reload" => sub {
2891	my ($who, $arg) = @_;	3561	my ($who, $arg) = @_;
2892		3562
2893	if ($who->flag (FLAG_WIZ)) {	3563	if ($who->flag (FLAG_WIZ)) {
2894	$who->message ("reloading server.");	3564	$who->message ("reloading server.");
		3565	async {
		3566	$Coro::current->{desc} = "perl_reload";
2895	async { reload_perl };	3567	reload_perl;
		3568	};
2896	}	3569	}
2897	};	3570	};
2898		3571
2899	unshift @INC, $LIBDIR;	3572	unshift @INC, $LIBDIR;
2900		3573
…		…
2919	my $signal = new Coro::Signal;	3592	my $signal = new Coro::Signal;
2920	push @WAIT_FOR_TICK_BEGIN, $signal;	3593	push @WAIT_FOR_TICK_BEGIN, $signal;
2921	$signal->wait;	3594	$signal->wait;
2922	}	3595	}
2923		3596
2924	my $min = 1e6;#d#
2925	my $avg = 10;
2926	$TICK_WATCHER = Event->timer (	3597	$TICK_WATCHER = Event->timer (
2927	reentrant => 0,	3598	reentrant => 0,
2928	parked => 1,	3599	parked => 1,
2929	prio => 0,	3600	prio => 0,
2930	at => $NEXT_TICK || $TICK,	3601	at => $NEXT_TICK || $TICK,
…		…
2938		3609
2939	$NOW = $tick_start = Event::time;	3610	$NOW = $tick_start = Event::time;
2940		3611
2941	cf::server_tick; # one server iteration	3612	cf::server_tick; # one server iteration
2942		3613
2943	0 && sync_job {#d#
2944	for(1..10) {
2945	my $t = Event::time;
2946	my $map = my $map = new_from_path cf::map "/tmp/x.map"
2947	or die;
2948
2949	$map->width (50);
2950	$map->height (50);
2951	$map->alloc;
2952	$map->_load_objects ("/tmp/x.map", 1);
2953	my $t = Event::time - $t;
2954
2955	#next unless $t < 0.0013;#d#
2956	if ($t < $min) {
2957	$min = $t;
2958	}
2959	$avg = $avg * 0.99 + $t * 0.01;
2960	}
2961	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2962	exit 0;
2963	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2964	};
2965
2966	$RUNTIME += $TICK;	3614	$RUNTIME += $TICK;
2967	$NEXT_TICK += $TICK;	3615	$NEXT_TICK += $TICK;
2968		3616
2969	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3617	if ($NOW >= $NEXT_RUNTIME_WRITE) {
2970	$NEXT_RUNTIME_WRITE = $NOW + 10;	3618	$NEXT_RUNTIME_WRITE = $NOW + 10;
2971	Coro::async_pool {	3619	Coro::async_pool {
		3620	$Coro::current->{desc} = "runtime saver";
2972	write_runtime	3621	write_runtime
2973	or warn "ERROR: unable to write runtime file: $!";	3622	or warn "ERROR: unable to write runtime file: $!";
2974	};	3623	};
2975	}	3624	}
2976		3625
2977	# my $AFTER = Event::time;
2978	# warn $AFTER - $NOW;#d#
2979
2980	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3626	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2981	$sig->send;	3627	$sig->send;
2982	}	3628	}
2983	while (my $sig = shift @WAIT_FOR_TICK) {	3629	while (my $sig = shift @WAIT_FOR_TICK) {
2984	$sig->send;	3630	$sig->send;
…		…
2994		3640
2995	$LOAD = ($NOW - $tick_start) / $TICK;	3641	$LOAD = ($NOW - $tick_start) / $TICK;
2996	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3642	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2997		3643
2998	_post_tick;	3644	_post_tick;
2999
3000
3001	},	3645	},
3002	);	3646	);
3003		3647
3004	{	3648	{
		3649	BDB::min_parallel 8;
3005	BDB::max_poll_time $TICK * 0.1;	3650	BDB::max_poll_time $TICK * 0.1;
3006	$BDB_POLL_WATCHER = Event->io (	3651	$BDB_POLL_WATCHER = Event->io (
3007	reentrant => 0,	3652	reentrant => 0,
3008	fd => BDB::poll_fileno,	3653	fd => BDB::poll_fileno,
3009	poll => 'r',	3654	poll => 'r',
3010	prio => 0,	3655	prio => 0,
3011	data => WF_AUTOCANCEL,	3656	data => WF_AUTOCANCEL,
3012	cb => \&BDB::poll_cb,	3657	cb => \&BDB::poll_cb,
3013	);	3658	);
3014	BDB::min_parallel 8;
3015		3659
3016	BDB::set_sync_prepare {	3660	BDB::set_sync_prepare {
3017	my $status;	3661	my $status;
3018	my $current = $Coro::current;	3662	my $current = $Coro::current;
3019	(	3663	(
…		…
3028	)	3672	)
3029	};	3673	};
3030		3674
3031	unless ($DB_ENV) {	3675	unless ($DB_ENV) {
3032	$DB_ENV = BDB::db_env_create;	3676	$DB_ENV = BDB::db_env_create;
		3677	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3678	| BDB::LOG_AUTOREMOVE, 1);
		3679	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3680	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3033		3681
3034	cf::sync_job {	3682	cf::sync_job {
3035	eval {	3683	eval {
3036	BDB::db_env_open	3684	BDB::db_env_open
3037	$DB_ENV,	3685	$DB_ENV,
…		…
3039	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3687	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3040	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3688	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3041	0666;	3689	0666;
3042		3690
3043	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3691	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3044
3045	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3046	$DB_ENV->set_lk_detect;
3047	};	3692	};
3048		3693
3049	cf::cleanup "db_env_open(db): $@" if $@;	3694	cf::cleanup "db_env_open(db): $@" if $@;
3050	};	3695	};
3051	}	3696	}
		3697
		3698	$BDB_DEADLOCK_WATCHER = Event->timer (
		3699	after => 3,
		3700	interval => 1,
		3701	hard => 1,
		3702	prio => 0,
		3703	data => WF_AUTOCANCEL,
		3704	cb => sub {
		3705	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3706	},
		3707	);
		3708	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3709	after => 11,
		3710	interval => 60,
		3711	hard => 1,
		3712	prio => 0,
		3713	data => WF_AUTOCANCEL,
		3714	cb => sub {
		3715	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3716	},
		3717	);
		3718	$BDB_TRICKLE_WATCHER = Event->timer (
		3719	after => 5,
		3720	interval => 10,
		3721	hard => 1,
		3722	prio => 0,
		3723	data => WF_AUTOCANCEL,
		3724	cb => sub {
		3725	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3726	},
		3727	);
3052	}	3728	}
3053		3729
3054	{	3730	{
3055	IO::AIO::min_parallel 8;	3731	IO::AIO::min_parallel 8;
3056		3732
…		…
3059	$AIO_POLL_WATCHER = Event->io (	3735	$AIO_POLL_WATCHER = Event->io (
3060	reentrant => 0,	3736	reentrant => 0,
3061	data => WF_AUTOCANCEL,	3737	data => WF_AUTOCANCEL,
3062	fd => IO::AIO::poll_fileno,	3738	fd => IO::AIO::poll_fileno,
3063	poll => 'r',	3739	poll => 'r',
3064	prio => 6,	3740	prio => 0,
3065	cb => \&IO::AIO::poll_cb,	3741	cb => \&IO::AIO::poll_cb,
3066	);	3742	);
3067	}	3743	}
3068		3744
3069	my $_log_backtrace;	3745	my $_log_backtrace;
…		…
3075		3751
3076	# limit the # of concurrent backtraces	3752	# limit the # of concurrent backtraces
3077	if ($_log_backtrace < 2) {	3753	if ($_log_backtrace < 2) {
3078	++$_log_backtrace;	3754	++$_log_backtrace;
3079	async {	3755	async {
		3756	$Coro::current->{desc} = "abt $msg";
		3757
3080	my @bt = fork_call {	3758	my @bt = fork_call {
3081	@addr = map { sprintf "%x", $_ } @addr;	3759	@addr = map { sprintf "%x", $_ } @addr;
3082	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3760	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3083	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"	3761	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3084	or die "addr2line: $!";	3762	or die "addr2line: $!";

Diff Legend

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