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.314 by root, Mon Jul 23 16:53:15 2007 UTC vs.
Revision 1.404 by root, Mon Dec 17 07:27:58 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.61 ();	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;
		25	use Coro::Util ();
24		26
25	use JSON::XS 1.4 ();	27	use JSON::XS 2.01 ();
26	use BDB ();	28	use BDB ();
27	use Data::Dumper;	29	use Data::Dumper;
28	use Digest::MD5;	30	use Digest::MD5;
29	use Fcntl;	31	use Fcntl;
30	use YAML::Syck ();	32	use YAML::Syck ();
31	use IO::AIO 2.32 ();	33	use IO::AIO 2.51 ();
32	use Time::HiRes;	34	use Time::HiRes;
33	use Compress::LZF;	35	use Compress::LZF;
34	use Digest::MD5 ();	36	use Digest::MD5 ();
35		37
36	# configure various modules to our taste	38	# configure various modules to our taste
37	#	39	#
38	$Storable::canonical = 1; # reduce rsync transfers	40	$Storable::canonical = 1; # reduce rsync transfers
39	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
40	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
41
42	$Event::Eval = 1; # no idea why this is required, but it is
43		43
44	# 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?
45	$YAML::Syck::ImplicitUnicode = 1;	45	$YAML::Syck::ImplicitUnicode = 1;
46		46
47	$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
…		…
75	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	75	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76	our $TICK_WATCHER;	76	our $TICK_WATCHER;
77	our $AIO_POLL_WATCHER;	77	our $AIO_POLL_WATCHER;
78	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	78	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79	our $NEXT_TICK;	79	our $NEXT_TICK;
80	our $NOW;
81	our $USE_FSYNC = 1; # use fsync to write maps - default off	80	our $USE_FSYNC = 1; # use fsync to write maps - default off
82		81
83	our $BDB_POLL_WATCHER;	82	our $BDB_POLL_WATCHER;
		83	our $BDB_DEADLOCK_WATCHER;
		84	our $BDB_CHECKPOINT_WATCHER;
		85	our $BDB_TRICKLE_WATCHER;
84	our $DB_ENV;	86	our $DB_ENV;
85		87
86	our %CFG;	88	our %CFG;
87		89
88	our $UPTIME; $UPTIME ||= time;	90	our $UPTIME; $UPTIME ||= time;
89	our $RUNTIME;	91	our $RUNTIME;
		92	our $NOW;
90		93
91	our %PLAYER; # all users	94	our (%PLAYER, %PLAYER_LOADING); # all users
92	our %MAP; # all maps	95	our (%MAP, %MAP_LOADING ); # all maps
93	our $LINK_MAP; # the special {link} map, which is always available	96	our $LINK_MAP; # the special {link} map, which is always available
94		97
95	# used to convert map paths into valid unix filenames by replacing / by ∕	98	# used to convert map paths into valid unix filenames by replacing / by ∕
96	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	99	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97		100
…		…
158		161
159	The raw value load value from the last tick.	162	The raw value load value from the last tick.
160		163
161	=item %cf::CFG	164	=item %cf::CFG
162		165
163	Configuration for the server, loaded from C</etc/crossfire/config>, or	166	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164	from wherever your confdir points to.	167	from wherever your confdir points to.
165		168
166	=item cf::wait_for_tick, cf::wait_for_tick_begin	169	=item cf::wait_for_tick, cf::wait_for_tick_begin
167		170
168	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	171	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
…		…
186	$msg .= "\n"	189	$msg .= "\n"
187	unless $msg =~ /\n$/;	190	unless $msg =~ /\n$/;
188		191
189	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	192	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190		193
191	utf8::encode $msg;
192	LOG llevError, $msg;	194	LOG llevError, $msg;
193	};	195	};
194	}	196	}
195		197
196	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	198	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
212	)) {	214	)) {
213	no strict 'refs';	215	no strict 'refs';
214	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	216	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215	}	217	}
216		218
217	$Event::DIED = sub {	219	$EV::DIED = sub {
218	warn "error in event callback: @_";	220	warn "error in event callback: @_";
219	};	221	};
220		222
221	#############################################################################	223	#############################################################################
222		224
…		…
245	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	247	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246	$d	248	$d
247	} || "[unable to dump $_[0]: '$@']";	249	} || "[unable to dump $_[0]: '$@']";
248	}	250	}
249		251
250	=item $ref = cf::from_json $json	252	=item $ref = cf::decode_json $json
251		253
252	Converts a JSON string into the corresponding perl data structure.	254	Converts a JSON string into the corresponding perl data structure.
253		255
254	=item $json = cf::to_json $ref	256	=item $json = cf::encode_json $ref
255		257
256	Converts a perl data structure into its JSON representation.	258	Converts a perl data structure into its JSON representation.
257		259
258	=cut	260	=cut
259		261
260	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	262	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261		263
262	sub to_json ($) { $json_coder->encode ($_[0]) }	264	sub encode_json($) { $json_coder->encode ($_[0]) }
263	sub from_json ($) { $json_coder->decode ($_[0]) }	265	sub decode_json($) { $json_coder->decode ($_[0]) }
264		266
265	=item cf::lock_wait $string	267	=item cf::lock_wait $string
266		268
267	Wait until the given lock is available. See cf::lock_acquire.	269	Wait until the given lock is available. See cf::lock_acquire.
268		270
…		…
271	Wait until the given lock is available and then acquires it and returns	273	Wait until the given lock is available and then acquires it and returns
272	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	274	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273	for example when the coroutine gets canceled), the lock is automatically	275	for example when the coroutine gets canceled), the lock is automatically
274	returned.	276	returned.
275		277
		278	Locks are *not* recursive, locking from the same coro twice results in a
		279	deadlocked coro.
		280
276	Lock names should begin with a unique identifier (for example, cf::map::find	281	Lock names should begin with a unique identifier (for example, cf::map::find
277	uses map_find and cf::map::load uses map_load).	282	uses map_find and cf::map::load uses map_load).
278		283
279	=item $locked = cf::lock_active $string	284	=item $locked = cf::lock_active $string
280		285
281	Return true if the lock is currently active, i.e. somebody has locked it.	286	Return true if the lock is currently active, i.e. somebody has locked it.
282		287
283	=cut	288	=cut
284		289
285	our %LOCK;	290	our %LOCK;
		291	our %LOCKER;#d#
286		292
287	sub lock_wait($) {	293	sub lock_wait($) {
288	my ($key) = @_;	294	my ($key) = @_;
		295
		296	if ($LOCKER{$key} == $Coro::current) {#d#
		297	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		298	return;#d#
		299	}#d#
289		300
290	# wait for lock, if any	301	# wait for lock, if any
291	while ($LOCK{$key}) {	302	while ($LOCK{$key}) {
292	push @{ $LOCK{$key} }, $Coro::current;	303	push @{ $LOCK{$key} }, $Coro::current;
293	Coro::schedule;	304	Coro::schedule;
…		…
299		310
300	# wait, to be sure we are not locked	311	# wait, to be sure we are not locked
301	lock_wait $key;	312	lock_wait $key;
302		313
303	$LOCK{$key} = [];	314	$LOCK{$key} = [];
		315	$LOCKER{$key} = $Coro::current;#d#
304		316
305	Coro::guard {	317	Coro::guard {
		318	delete $LOCKER{$key};#d#
306	# wake up all waiters, to be on the safe side	319	# wake up all waiters, to be on the safe side
307	$_->ready for @{ delete $LOCK{$key} };	320	$_->ready for @{ delete $LOCK{$key} };
308	}	321	}
309	}	322	}
310		323
…		…
322	};	335	};
323	$TICK_WATCHER->stop;	336	$TICK_WATCHER->stop;
324	$guard	337	$guard
325	}	338	}
326		339
		340	=item cf::periodic $interval, $cb
		341
		342	Like EV::periodic, but randomly selects a starting point so that the actions
		343	get spread over timer.
		344
		345	=cut
		346
		347	sub periodic($$) {
		348	my ($interval, $cb) = @_;
		349
		350	my $start = rand List::Util::min 180, $interval;
		351
		352	EV::periodic $start, $interval, 0, $cb
		353	}
		354
327	=item cf::get_slot $time[, $priority]	355	=item cf::get_slot $time[, $priority[, $name]]
328		356
329	Allocate $time seconds of blocking CPU time at priority C<$priority>:	357	Allocate $time seconds of blocking CPU time at priority C<$priority>:
330	This call blocks and returns only when you have at least C<$time> seconds	358	This call blocks and returns only when you have at least C<$time> seconds
331	of cpu time till the next tick. The slot is only valid till the next cede.	359	of cpu time till the next tick. The slot is only valid till the next cede.
332		360
		361	The optional C<$name> can be used to identify the job to run. It might be
		362	used for statistical purposes and should identify the same time-class.
		363
333	Useful for short background jobs.	364	Useful for short background jobs.
334		365
335	=cut	366	=cut
336		367
337	our @SLOT_QUEUE;	368	our @SLOT_QUEUE;
338	our $SLOT_QUEUE;	369	our $SLOT_QUEUE;
339		370
340	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	371	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
341	$SLOT_QUEUE = Coro::async {	372	$SLOT_QUEUE = Coro::async {
		373	$Coro::current->desc ("timeslot manager");
		374
342	my $signal = new Coro::Signal;	375	my $signal = new Coro::Signal;
343		376
344	while () {	377	while () {
345	next_job:	378	next_job:
346	my $avail = cf::till_tick;	379	my $avail = cf::till_tick;
…		…
354	}	387	}
355	}	388	}
356	}	389	}
357		390
358	if (@SLOT_QUEUE) {	391	if (@SLOT_QUEUE) {
359	# we do not use wait_For_tick() as it returns immediately when tick is inactive	392	# we do not use wait_for_tick() as it returns immediately when tick is inactive
360	push @cf::WAIT_FOR_TICK, $signal;	393	push @cf::WAIT_FOR_TICK, $signal;
361	$signal->wait;	394	$signal->wait;
362	} else {	395	} else {
363	Coro::schedule;	396	Coro::schedule;
364	}	397	}
365	}	398	}
366	};	399	};
367		400
368	sub get_slot($;$) {	401	sub get_slot($;$$) {
369	my ($time, $pri) = @_;	402	my ($time, $pri, $name) = @_;
370		403
		404	$time = $TICK * .6 if $time > $TICK * .6;
		405	my $sig = new Coro::Signal;
		406
371	push @SLOT_QUEUE, [$time, $pri, my $sig = new Coro::Signal];	407	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
372	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	408	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
373	$SLOT_QUEUE->ready;	409	$SLOT_QUEUE->ready;
374	$sig->wait;	410	$sig->wait;
375	}	411	}
376		412
…		…
384		420
385	BEGIN { *async = \&Coro::async_pool }	421	BEGIN { *async = \&Coro::async_pool }
386		422
387	=item cf::sync_job { BLOCK }	423	=item cf::sync_job { BLOCK }
388		424
389	The design of Crossfire TRT requires that the main coroutine ($Coro::main)	425	The design of Deliantra requires that the main coroutine ($Coro::main)
390	is always able to handle events or runnable, as Crossfire TRT is only	426	is always able to handle events or runnable, as Deliantra is only
391	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not	427	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
392	acceptable.	428	acceptable.
393		429
394	If it must be done, put the blocking parts into C<sync_job>. This will run	430	If it must be done, put the blocking parts into C<sync_job>. This will run
395	the given BLOCK in another coroutine while waiting for the result. The	431	the given BLOCK in another coroutine while waiting for the result. The
…		…
400		436
401	sub sync_job(&) {	437	sub sync_job(&) {
402	my ($job) = @_;	438	my ($job) = @_;
403		439
404	if ($Coro::current == $Coro::main) {	440	if ($Coro::current == $Coro::main) {
405	my $time = Event::time;	441	my $time = EV::time;
406		442
407	# this is the main coro, too bad, we have to block	443	# this is the main coro, too bad, we have to block
408	# till the operation succeeds, freezing the server :/	444	# till the operation succeeds, freezing the server :/
409		445
		446	LOG llevError, Carp::longmess "sync job";#d#
		447
410	# TODO: use suspend/resume instead	448	# TODO: use suspend/resume instead
411	# (but this is cancel-safe)	449	# (but this is cancel-safe)
412	my $freeze_guard = freeze_mainloop;	450	my $freeze_guard = freeze_mainloop;
413		451
414	my $busy = 1;	452	my $busy = 1;
415	my @res;	453	my @res;
416		454
417	(async {	455	(async {
		456	$Coro::current->desc ("sync job coro");
418	@res = eval { $job->() };	457	@res = eval { $job->() };
419	warn $@ if $@;	458	warn $@ if $@;
420	undef $busy;	459	undef $busy;
421	})->prio (Coro::PRIO_MAX);	460	})->prio (Coro::PRIO_MAX);
422		461
423	while ($busy) {	462	while ($busy) {
424	Coro::cede or Event::one_event;	463	if (Coro::nready) {
		464	Coro::cede_notself;
		465	} else {
		466	EV::loop EV::LOOP_ONESHOT;
425	}	467	}
		468	}
426		469
427	$time = Event::time - $time;	470	$time = EV::time - $time;
428		471
429	LOG llevError | logBacktrace, Carp::longmess "long sync job"	472	LOG llevError | logBacktrace, Carp::longmess "long sync job"
430	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;	473	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
431		474
432	$tick_start += $time; # do not account sync jobs to server load	475	$tick_start += $time; # do not account sync jobs to server load
…		…
462	=item fork_call { }, $args	505	=item fork_call { }, $args
463		506
464	Executes the given code block with the given arguments in a seperate	507	Executes the given code block with the given arguments in a seperate
465	process, returning the results. Everything must be serialisable with	508	process, returning the results. Everything must be serialisable with
466	Coro::Storable. May, of course, block. Note that the executed sub may	509	Coro::Storable. May, of course, block. Note that the executed sub may
467	never block itself or use any form of Event handling.	510	never block itself or use any form of event handling.
468		511
469	=cut	512	=cut
470
471	sub _store_scalar {
472	open my $fh, ">", \my $buf
473	or die "fork_call: cannot open fh-to-buf in child : $!";
474	Storable::store_fd $_[0], $fh;
475	close $fh;
476
477	$buf
478	}
479		513
480	sub fork_call(&@) {	514	sub fork_call(&@) {
481	my ($cb, @args) = @_;	515	my ($cb, @args) = @_;
482		516
483	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	517	# we seemingly have to make a local copy of the whole thing,
484	# or die "socketpair: $!";	518	# otherwise perl prematurely frees the stuff :/
485	pipe my $fh1, my $fh2	519	# TODO: investigate and fix (likely this will be rather laborious)
486	or die "pipe: $!";
487		520
488	if (my $pid = fork) {	521	my @res = Coro::Util::fork_eval {
489	close $fh2;
490
491	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
492	warn "pst<$res>" unless $res =~ /^pst/;
493	$res = Coro::Storable::thaw $res;
494
495	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
496
497	Carp::confess $$res unless "ARRAY" eq ref $res;
498
499	return wantarray ? @$res : $res->[-1];
500	} else {
501	reset_signals;	522	reset_signals;
502	local $SIG{__WARN__};	523	&$cb
503	local $SIG{__DIE__};	524	}, @args;
504	# just in case, this hack effectively disables event
505	# in the child. cleaner and slower would be canceling all watchers,
506	# but this works for the time being.
507	local $Coro::idle;
508	$Coro::current->prio (Coro::PRIO_MAX);
509		525
510	eval {	526	wantarray ? @res : $res[-1]
511	close $fh1;
512
513	my @res = eval { $cb->(@args) };
514
515	syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
516	close $fh2;
517	};
518
519	warn $@ if $@;
520	_exit 0;
521	}
522	}	527	}
523		528
524	=item $value = cf::db_get $family => $key	529	=item $value = cf::db_get $family => $key
525		530
526	Returns a single value from the environment database.	531	Returns a single value from the environment database.
…		…
528	=item cf::db_put $family => $key => $value	533	=item cf::db_put $family => $key => $value
529		534
530	Stores the given C<$value> in the family. It can currently store binary	535	Stores the given C<$value> in the family. It can currently store binary
531	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).	536	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
532		537
		538	=item $db = cf::db_table "name"
		539
		540	Create and/or open a new database table. The string must not be "db" and must be unique
		541	within each server.
		542
533	=cut	543	=cut
		544
		545	sub db_table($) {
		546	my ($name) = @_;
		547	my $db = BDB::db_create $DB_ENV;
		548
		549	eval {
		550	$db->set_flags (BDB::CHKSUM);
		551
		552	utf8::encode $name;
		553	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		554	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		555	cf::cleanup "db_open(db): $!" if $!;
		556	};
		557	cf::cleanup "db_open(db): $@" if $@;
		558
		559	$db
		560	}
534		561
535	our $DB;	562	our $DB;
536		563
537	sub db_init {	564	sub db_init {
538	unless ($DB) {
539	$DB = BDB::db_create $DB_ENV;
540
541	cf::sync_job {	565	cf::sync_job {
542	eval {	566	$DB ||= db_table "db";
543	$DB->set_flags (BDB::CHKSUM);
544
545	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
546	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
547	cf::cleanup "db_open(db): $!" if $!;
548	};
549	cf::cleanup "db_open(db): $@" if $@;
550	};
551	}	567	};
552	}	568	}
553		569
554	sub db_get($$) {	570	sub db_get($$) {
555	my $key = "$_[0]/$_[1]";	571	my $key = "$_[0]/$_[1]";
556		572
…		…
606	if (1) {	622	if (1) {
607	$md5 =	623	$md5 =
608	join "\x00",	624	join "\x00",
609	$processversion,	625	$processversion,
610	map {	626	map {
611	Coro::cede;	627	cf::cede_to_tick;
612	($src->[$_], Digest::MD5::md5_hex $data[$_])	628	($src->[$_], Digest::MD5::md5_hex $data[$_])
613	} 0.. $#$src;	629	} 0.. $#$src;
614		630
615		631
616	my $dbmd5 = db_get cache => "$id/md5";	632	my $dbmd5 = db_get cache => "$id/md5";
…		…
660	attach callbacks/event handlers (a collection of which is called an "attachment")	676	attach callbacks/event handlers (a collection of which is called an "attachment")
661	to it. All such attachable objects support the following methods.	677	to it. All such attachable objects support the following methods.
662		678
663	In the following description, CLASS can be any of C<global>, C<object>	679	In the following description, CLASS can be any of C<global>, C<object>
664	C<player>, C<client> or C<map> (i.e. the attachable objects in	680	C<player>, C<client> or C<map> (i.e. the attachable objects in
665	Crossfire TRT).	681	Deliantra).
666		682
667	=over 4	683	=over 4
668		684
669	=item $attachable->attach ($attachment, key => $value...)	685	=item $attachable->attach ($attachment, key => $value...)
670		686
…		…
968		984
969	=cut	985	=cut
970		986
971	#############################################################################	987	#############################################################################
972	# object support	988	# object support
973	#
974		989
		990	sub _object_equal($$);
		991	sub _object_equal($$) {
		992	my ($a, $b) = @_;
		993
		994	return 0 unless (ref $a) eq (ref $b);
		995
		996	if ("HASH" eq ref $a) {
		997	my @ka = keys %$a;
		998	my @kb = keys %$b;
		999
		1000	return 0 if @ka != @kb;
		1001
		1002	for (0 .. $#ka) {
		1003	return 0 unless $ka[$_] eq $kb[$_];
		1004	return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
		1005	}
		1006
		1007	} elsif ("ARRAY" eq ref $a) {
		1008
		1009	return 0 if @$a != @$b;
		1010
		1011	for (0 .. $#$a) {
		1012	return 0 unless _object_equal $a->[$_], $b->[$_];
		1013	}
		1014
		1015	} elsif ($a ne $b) {
		1016	return 0;
		1017	}
		1018
		1019	1
		1020	}
		1021
		1022	our $SLOW_MERGES;#d#
975	sub _can_merge {	1023	sub _can_merge {
976	my ($ob1, $ob2) = @_;	1024	my ($ob1, $ob2) = @_;
977		1025
978	local $Storable::canonical = 1;	1026	++$SLOW_MERGES;#d#
979	my $fob1 = Storable::freeze $ob1;
980	my $fob2 = Storable::freeze $ob2;
981		1027
982	$fob1 eq $fob2	1028	# we do the slow way here
		1029	return _object_equal $ob1, $ob2
983	}	1030	}
984		1031
985	sub reattach {	1032	sub reattach {
986	# basically do the same as instantiate, without calling instantiate	1033	# basically do the same as instantiate, without calling instantiate
987	my ($obj) = @_;	1034	my ($obj) = @_;
…		…
1009	cf::attachable->attach (	1056	cf::attachable->attach (
1010	prio => -1000000,	1057	prio => -1000000,
1011	on_instantiate => sub {	1058	on_instantiate => sub {
1012	my ($obj, $data) = @_;	1059	my ($obj, $data) = @_;
1013		1060
1014	$data = from_json $data;	1061	$data = decode_json $data;
1015		1062
1016	for (@$data) {	1063	for (@$data) {
1017	my ($name, $args) = @$_;	1064	my ($name, $args) = @$_;
1018		1065
1019	$obj->attach ($name, %{$args || {} });	1066	$obj->attach ($name, %{$args || {} });
…		…
1035	sub object_freezer_save {	1082	sub object_freezer_save {
1036	my ($filename, $rdata, $objs) = @_;	1083	my ($filename, $rdata, $objs) = @_;
1037		1084
1038	sync_job {	1085	sync_job {
1039	if (length $$rdata) {	1086	if (length $$rdata) {
		1087	utf8::decode (my $decname = $filename);
1040	warn sprintf "saving %s (%d,%d)\n",	1088	warn sprintf "saving %s (%d,%d)\n",
1041	$filename, length $$rdata, scalar @$objs;	1089	$decname, length $$rdata, scalar @$objs;
1042		1090
1043	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1091	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1044	chmod SAVE_MODE, $fh;	1092	chmod SAVE_MODE, $fh;
1045	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1093	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1046	aio_fsync $fh if $cf::USE_FSYNC;	1094	aio_fsync $fh if $cf::USE_FSYNC;
1047	close $fh;	1095	close $fh;
1048		1096
1049	if (@$objs) {	1097	if (@$objs) {
1050	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1098	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1051	chmod SAVE_MODE, $fh;	1099	chmod SAVE_MODE, $fh;
1052	my $data = Storable::nfreeze { version => 1, objs => $objs };	1100	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1053	aio_write $fh, 0, (length $data), $data, 0;	1101	aio_write $fh, 0, (length $data), $data, 0;
1054	aio_fsync $fh if $cf::USE_FSYNC;	1102	aio_fsync $fh if $cf::USE_FSYNC;
1055	close $fh;	1103	close $fh;
1056	aio_rename "$filename.pst~", "$filename.pst";	1104	aio_rename "$filename.pst~", "$filename.pst";
1057	}	1105	}
…		…
1065	}	1113	}
1066	} else {	1114	} else {
1067	aio_unlink $filename;	1115	aio_unlink $filename;
1068	aio_unlink "$filename.pst";	1116	aio_unlink "$filename.pst";
1069	}	1117	}
1070	}	1118	};
1071	}	1119	}
1072		1120
1073	sub object_freezer_as_string {	1121	sub object_freezer_as_string {
1074	my ($rdata, $objs) = @_;	1122	my ($rdata, $objs) = @_;
1075		1123
…		…
1087	or return;	1135	or return;
1088		1136
1089	unless (aio_stat "$filename.pst") {	1137	unless (aio_stat "$filename.pst") {
1090	(aio_load "$filename.pst", $av) >= 0	1138	(aio_load "$filename.pst", $av) >= 0
1091	or return;	1139	or return;
		1140
1092	$av = eval { (Storable::thaw $av)->{objs} };	1141	my $st = eval { Coro::Storable::thaw $av };
		1142	$av = $st->{objs};
1093	}	1143	}
1094		1144
		1145	utf8::decode (my $decname = $filename);
1095	warn sprintf "loading %s (%d)\n",	1146	warn sprintf "loading %s (%d,%d)\n",
1096	$filename, length $data, scalar @{$av || []};	1147	$decname, length $data, scalar @{$av || []};
		1148
1097	return ($data, $av);	1149	($data, $av)
1098	}	1150	}
1099		1151
1100	=head2 COMMAND CALLBACKS	1152	=head2 COMMAND CALLBACKS
1101		1153
1102	=over 4	1154	=over 4
…		…
1175	my ($pl, $buf) = @_;	1227	my ($pl, $buf) = @_;
1176		1228
1177	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1229	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1178		1230
1179	if (ref $msg) {	1231	if (ref $msg) {
		1232	my ($type, $reply, @payload) =
		1233	"ARRAY" eq ref $msg
		1234	? @$msg
		1235	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1236
		1237	my @reply;
		1238
1180	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1239	if (my $cb = $EXTCMD{$type}) {
1181	if (my %reply = $cb->($pl, $msg)) {	1240	@reply = $cb->($pl, @payload);
1182	$pl->ext_reply ($msg->{msgid}, %reply);
1183	}
1184	}	1241	}
		1242
		1243	$pl->ext_reply ($reply, @reply)
		1244	if $reply;
		1245
1185	} else {	1246	} else {
1186	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1247	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1187	}	1248	}
1188		1249
1189	cf::override;	1250	cf::override;
…		…
1279		1340
1280	=head3 cf::player	1341	=head3 cf::player
1281		1342
1282	=over 4	1343	=over 4
1283		1344
		1345	=item cf::player::num_playing
		1346
		1347	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1348
		1349	=cut
		1350
		1351	sub num_playing {
		1352	scalar grep
		1353	$_->ob->map
		1354	&& !$_->hidden
		1355	&& !$_->ob->flag (cf::FLAG_WIZ),
		1356	cf::player::list
		1357	}
		1358
1284	=item cf::player::find $login	1359	=item cf::player::find $login
1285		1360
1286	Returns the given player object, loading it if necessary (might block).	1361	Returns the given player object, loading it if necessary (might block).
1287		1362
1288	=cut	1363	=cut
…		…
1323	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1398	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1324	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1399	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1325	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1400	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1326	aio_unlink +(playerdir $login) . "/$login.pl";	1401	aio_unlink +(playerdir $login) . "/$login.pl";
1327		1402
1328	my $pl = load_pl path $login	1403	my $f = new_from_file cf::object::thawer path $login
1329	or return;	1404	or return;
		1405
		1406	my $pl = cf::player::load_pl $f
		1407	or return;
		1408	local $cf::PLAYER_LOADING{$login} = $pl;
		1409	$f->resolve_delayed_derefs;
1330	$cf::PLAYER{$login} = $pl	1410	$cf::PLAYER{$login} = $pl
1331	}	1411	}
1332	}	1412	}
1333	}	1413	}
1334		1414
…		…
1344		1424
1345	aio_mkdir playerdir $pl, 0770;	1425	aio_mkdir playerdir $pl, 0770;
1346	$pl->{last_save} = $cf::RUNTIME;	1426	$pl->{last_save} = $cf::RUNTIME;
1347		1427
1348	$pl->save_pl ($path);	1428	$pl->save_pl ($path);
1349	Coro::cede;	1429	cf::cede_to_tick;
1350	}	1430	}
1351		1431
1352	sub new($) {	1432	sub new($) {
1353	my ($login) = @_;	1433	my ($login) = @_;
1354		1434
…		…
1358	$self->{deny_save} = 1;	1438	$self->{deny_save} = 1;
1359		1439
1360	$cf::PLAYER{$login} = $self;	1440	$cf::PLAYER{$login} = $self;
1361		1441
1362	$self	1442	$self
		1443	}
		1444
		1445	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1446
		1447	=cut
		1448
		1449	sub send_msg {
		1450	my $ns = shift->ns
		1451	or return;
		1452	$ns->send_msg (@_);
1363	}	1453	}
1364		1454
1365	=item $pl->quit_character	1455	=item $pl->quit_character
1366		1456
1367	Nukes the player without looking back. If logged in, the connection will	1457	Nukes the player without looking back. If logged in, the connection will
…		…
1422	or return [];	1512	or return [];
1423		1513
1424	my @logins;	1514	my @logins;
1425		1515
1426	for my $login (@$dirs) {	1516	for my $login (@$dirs) {
		1517	my $path = path $login;
		1518
		1519	# a .pst is a dead give-away for a valid player
		1520	unless (-e "$path.pst") {
1427	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1521	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1428	aio_read $fh, 0, 512, my $buf, 0 or next;	1522	aio_read $fh, 0, 512, my $buf, 0 or next;
1429	$buf !~ /^password -------------$/m or next; # official not-valid tag	1523	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1524	}
1430		1525
1431	utf8::decode $login;	1526	utf8::decode $login;
1432	push @logins, $login;	1527	push @logins, $login;
1433	}	1528	}
1434		1529
…		…
1467		1562
1468	Expand crossfire pod fragments into protocol xml.	1563	Expand crossfire pod fragments into protocol xml.
1469		1564
1470	=cut	1565	=cut
1471		1566
		1567	use re 'eval';
		1568
		1569	my $group;
		1570	my $interior; $interior = qr{
		1571	# match a pod interior sequence sans C<< >>
		1572	(?:
		1573	\ (.*?)\ (?{ $group = $^N })
		1574	| < (??{$interior}) >
		1575	)
		1576	}x;
		1577
1472	sub expand_cfpod {	1578	sub expand_cfpod {
1473	((my $self), (local $_)) = @_;	1579	my ($self, $pod) = @_;
1474		1580
1475	# escape & and <	1581	my $xml;
1476	s/&/&amp;/g;
1477	s/(?<![BIUGH])</&lt;/g;
1478		1582
1479	# this is buggy, it needs to properly take care of nested <'s	1583	while () {
		1584	if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
		1585	$group = $1;
1480		1586
1481	1 while	1587	$group =~ s/&/&amp;/g;
1482	# replace B<>, I<>, U<> etc.	1588	$group =~ s/</&lt;/g;
1483	s/B<([^\>]*)>/<b>$1<\/b>/	1589
1484	|| s/I<([^\>]*)>/<i>$1<\/i>/	1590	$xml .= $group;
1485	|| s/U<([^\>]*)>/<u>$1<\/u>/	1591	} elsif ($pod =~ m%\G
1486	# replace G<male|female> tags	1592	([BCGHITU])
1487	|| s{G<([^>|]*)\|([^>]*)>}{	1593	<
1488	$self->gender ? $2 : $1	1594	(?:
1489	}ge	1595	([^<>]*) (?{ $group = $^N })
1490	# replace H<hint text>	1596	| < $interior >
1491	|| s{H<([^\>]*)>}	1597	)
		1598	>
		1599	%gcsx
1492	{	1600	) {
		1601	my ($code, $data) = ($1, $group);
		1602
		1603	if ($code eq "B") {
		1604	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
		1605	} elsif ($code eq "I") {
		1606	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
		1607	} elsif ($code eq "U") {
		1608	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
		1609	} elsif ($code eq "C") {
		1610	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
		1611	} elsif ($code eq "T") {
		1612	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
		1613	} elsif ($code eq "G") {
		1614	my ($male, $female) = split /\|/, $data;
		1615	$data = $self->gender ? $female : $male;
		1616	$xml .= expand_cfpod ($self, $data);
		1617	} elsif ($code eq "H") {
1493	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",	1618	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1494	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",	1619	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1495	"")	1620	"")
1496	[$self->{hintmode}]	1621	[$self->{hintmode}];
		1622	} else {
		1623	$xml .= "error processing '$code($data)' directive";
1497	}ge;	1624	}
		1625	} else {
		1626	if ($pod =~ /\G(.+)/) {
		1627	warn "parse error while expanding $pod (at $1)";
		1628	}
		1629	last;
		1630	}
		1631	}
1498		1632
		1633	for ($xml) {
1499	# create single paragraphs (very hackish)	1634	# create single paragraphs (very hackish)
1500	s/(?<=\S)\n(?=\w)/ /g;	1635	s/(?<=\S)\n(?=\w)/ /g;
1501		1636
1502	# compress some whitespace	1637	# compress some whitespace
1503	s/\s+\n/\n/g; # ws line-ends	1638	s/\s+\n/\n/g; # ws line-ends
1504	s/\n\n+/\n/g; # double lines	1639	s/\n\n+/\n/g; # double lines
1505	s/^\n+//; # beginning lines	1640	s/^\n+//; # beginning lines
1506	s/\n+$//; # ending lines	1641	s/\n+$//; # ending lines
		1642	}
1507		1643
1508	$_	1644	$xml
1509	}	1645	}
		1646
		1647	no re 'eval';
1510		1648
1511	sub hintmode {	1649	sub hintmode {
1512	$_[0]{hintmode} = $_[1] if @_ > 1;	1650	$_[0]{hintmode} = $_[1] if @_ > 1;
1513	$_[0]{hintmode}	1651	$_[0]{hintmode}
1514	}	1652	}
1515		1653
1516	=item $player->ext_reply ($msgid, %msg)	1654	=item $player->ext_reply ($msgid, @msg)
1517		1655
1518	Sends an ext reply to the player.	1656	Sends an ext reply to the player.
1519		1657
1520	=cut	1658	=cut
1521		1659
1522	sub ext_reply($$%) {	1660	sub ext_reply($$@) {
1523	my ($self, $id, %msg) = @_;	1661	my ($self, $id, @msg) = @_;
1524		1662
1525	$msg{msgid} = $id;	1663	$self->ns->ext_reply ($id, @msg)
1526	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1527	}	1664	}
1528		1665
1529	=item $player->ext_event ($type, %msg)	1666	=item $player->ext_msg ($type, @msg)
1530		1667
1531	Sends an ext event to the client.	1668	Sends an ext event to the client.
1532		1669
1533	=cut	1670	=cut
1534		1671
1535	sub ext_event($$%) {	1672	sub ext_msg($$@) {
1536	my ($self, $type, %msg) = @_;	1673	my ($self, $type, @msg) = @_;
1537		1674
1538	$self->ns->ext_event ($type, %msg);	1675	$self->ns->ext_msg ($type, @msg);
1539	}	1676	}
1540		1677
1541	=head3 cf::region	1678	=head3 cf::region
1542		1679
1543	=over 4	1680	=over 4
…		…
1759		1896
1760	sub load_header_from($) {	1897	sub load_header_from($) {
1761	my ($self, $path) = @_;	1898	my ($self, $path) = @_;
1762		1899
1763	utf8::encode $path;	1900	utf8::encode $path;
1764	#aio_open $path, O_RDONLY, 0	1901	my $f = new_from_file cf::object::thawer $path
1765	# or return;
1766
1767	$self->_load_header ($path)
1768	or return;	1902	or return;
		1903
		1904	$self->_load_header ($f)
		1905	or return;
		1906
		1907	local $MAP_LOADING{$self->{path}} = $self;
		1908	$f->resolve_delayed_derefs;
1769		1909
1770	$self->{load_path} = $path;	1910	$self->{load_path} = $path;
1771		1911
1772	1	1912	1
1773	}	1913	}
…		…
1827	sub find {	1967	sub find {
1828	my ($path, $origin) = @_;	1968	my ($path, $origin) = @_;
1829		1969
1830	$path = normalise $path, $origin && $origin->path;	1970	$path = normalise $path, $origin && $origin->path;
1831		1971
		1972	cf::lock_wait "map_data:$path";#d#remove
1832	cf::lock_wait "map_find:$path";	1973	cf::lock_wait "map_find:$path";
1833		1974
1834	$cf::MAP{$path} || do {	1975	$cf::MAP{$path} || do {
1835	my $guard = cf::lock_acquire "map_find:$path";	1976	my $guard1 = cf::lock_acquire "map_find:$path";
		1977	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1978
1836	my $map = new_from_path cf::map $path	1979	my $map = new_from_path cf::map $path
1837	or return;	1980	or return;
1838		1981
1839	$map->{last_save} = $cf::RUNTIME;	1982	$map->{last_save} = $cf::RUNTIME;
1840		1983
…		…
1842	or return;	1985	or return;
1843		1986
1844	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1987	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1845	# doing this can freeze the server in a sync job, obviously	1988	# doing this can freeze the server in a sync job, obviously
1846	#$cf::WAIT_FOR_TICK->wait;	1989	#$cf::WAIT_FOR_TICK->wait;
		1990	undef $guard1;
		1991	undef $guard2;
1847	$map->reset;	1992	$map->reset;
1848	undef $guard;
1849	return find $path;	1993	return find $path;
1850	}	1994	}
1851		1995
1852	$cf::MAP{$path} = $map	1996	$cf::MAP{$path} = $map
1853	}	1997	}
…		…
1862	local $self->{deny_reset} = 1; # loading can take a long time	2006	local $self->{deny_reset} = 1; # loading can take a long time
1863		2007
1864	my $path = $self->{path};	2008	my $path = $self->{path};
1865		2009
1866	{	2010	{
1867	my $guard = cf::lock_acquire "map_load:$path";	2011	my $guard = cf::lock_acquire "map_data:$path";
1868		2012
		2013	return unless $self->valid;
1869	return if $self->in_memory != cf::MAP_SWAPPED;	2014	return unless $self->in_memory == cf::MAP_SWAPPED;
1870		2015
1871	$self->in_memory (cf::MAP_LOADING);	2016	$self->in_memory (cf::MAP_LOADING);
1872		2017
1873	$self->alloc;	2018	$self->alloc;
1874		2019
1875	$self->pre_load;	2020	$self->pre_load;
1876	Coro::cede;	2021	cf::cede_to_tick;
1877		2022
		2023	my $f = new_from_file cf::object::thawer $self->{load_path};
		2024	$f->skip_block;
1878	$self->_load_objects ($self->{load_path}, 1)	2025	$self->_load_objects ($f)
1879	or return;	2026	or return;
1880		2027
1881	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2028	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1882	if delete $self->{load_original};	2029	if delete $self->{load_original};
1883		2030
1884	if (my $uniq = $self->uniq_path) {	2031	if (my $uniq = $self->uniq_path) {
1885	utf8::encode $uniq;	2032	utf8::encode $uniq;
1886	if (aio_open $uniq, O_RDONLY, 0) {	2033	unless (aio_stat $uniq) {
		2034	if (my $f = new_from_file cf::object::thawer $uniq) {
1887	$self->clear_unique_items;	2035	$self->clear_unique_items;
1888	$self->_load_objects ($uniq, 0);	2036	$self->_load_objects ($f);
		2037	$f->resolve_delayed_derefs;
		2038	}
1889	}	2039	}
1890	}	2040	}
1891		2041
1892	Coro::cede;	2042	$f->resolve_delayed_derefs;
		2043
		2044	cf::cede_to_tick;
1893	# now do the right thing for maps	2045	# now do the right thing for maps
1894	$self->link_multipart_objects;	2046	$self->link_multipart_objects;
1895	$self->difficulty ($self->estimate_difficulty)	2047	$self->difficulty ($self->estimate_difficulty)
1896	unless $self->difficulty;	2048	unless $self->difficulty;
1897	Coro::cede;	2049	cf::cede_to_tick;
1898		2050
1899	unless ($self->{deny_activate}) {	2051	unless ($self->{deny_activate}) {
1900	$self->decay_objects;	2052	$self->decay_objects;
1901	$self->fix_auto_apply;	2053	$self->fix_auto_apply;
1902	$self->update_buttons;	2054	$self->update_buttons;
1903	Coro::cede;	2055	cf::cede_to_tick;
1904	$self->set_darkness_map;	2056	$self->set_darkness_map;
1905	Coro::cede;	2057	cf::cede_to_tick;
1906	$self->activate;	2058	$self->activate;
1907	}	2059	}
		2060
		2061	$self->{last_save} = $cf::RUNTIME;
		2062	$self->last_access ($cf::RUNTIME);
1908		2063
1909	$self->in_memory (cf::MAP_IN_MEMORY);	2064	$self->in_memory (cf::MAP_IN_MEMORY);
1910	}	2065	}
1911		2066
1912	$self->post_load;	2067	$self->post_load;
…		…
1923		2078
1924	$self	2079	$self
1925	}	2080	}
1926		2081
1927	# find and load all maps in the 3x3 area around a map	2082	# find and load all maps in the 3x3 area around a map
1928	sub load_diag {	2083	sub load_neighbours {
1929	my ($map) = @_;	2084	my ($map) = @_;
1930		2085
1931	my @diag; # diagonal neighbours	2086	my @neigh; # diagonal neighbours
1932		2087
1933	for (0 .. 3) {	2088	for (0 .. 3) {
1934	my $neigh = $map->tile_path ($_)	2089	my $neigh = $map->tile_path ($_)
1935	or next;	2090	or next;
1936	$neigh = find $neigh, $map	2091	$neigh = find $neigh, $map
1937	or next;	2092	or next;
1938	$neigh->load;	2093	$neigh->load;
1939		2094
		2095	push @neigh,
1940	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2096	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1941	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2097	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1942	}	2098	}
1943		2099
1944	for (@diag) {	2100	for (grep defined $_->[0], @neigh) {
		2101	my ($path, $origin) = @$_;
1945	my $neigh = find @$_	2102	my $neigh = find $path, $origin
1946	or next;	2103	or next;
1947	$neigh->load;	2104	$neigh->load;
1948	}	2105	}
1949	}	2106	}
1950		2107
…		…
1955	}	2112	}
1956		2113
1957	sub do_load_sync {	2114	sub do_load_sync {
1958	my ($map) = @_;	2115	my ($map) = @_;
1959		2116
		2117	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2118	if $Coro::current == $Coro::main;
		2119
1960	cf::sync_job { $map->load };	2120	cf::sync_job { $map->load };
1961	}	2121	}
1962		2122
1963	our %MAP_PREFETCH;	2123	our %MAP_PREFETCH;
1964	our $MAP_PREFETCHER = undef;	2124	our $MAP_PREFETCHER = undef;
1965		2125
1966	sub find_async {	2126	sub find_async {
1967	my ($path, $origin) = @_;	2127	my ($path, $origin, $load) = @_;
1968		2128
1969	$path = normalise $path, $origin && $origin->{path};	2129	$path = normalise $path, $origin && $origin->{path};
1970		2130
1971	if (my $map = $cf::MAP{$path}) {	2131	if (my $map = $cf::MAP{$path}) {
1972	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2132	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1973	}	2133	}
1974		2134
1975	undef $MAP_PREFETCH{$path};	2135	$MAP_PREFETCH{$path} |= $load;
		2136
1976	$MAP_PREFETCHER ||= cf::async {	2137	$MAP_PREFETCHER ||= cf::async {
		2138	$Coro::current->{desc} = "map prefetcher";
		2139
1977	while (%MAP_PREFETCH) {	2140	while (%MAP_PREFETCH) {
1978	for my $path (keys %MAP_PREFETCH) {	2141	while (my ($k, $v) = each %MAP_PREFETCH) {
1979	if (my $map = find $path) {	2142	if (my $map = find $k) {
1980	$map->load;	2143	$map->load if $v;
1981	}	2144	}
1982		2145
1983	delete $MAP_PREFETCH{$path};	2146	delete $MAP_PREFETCH{$k};
1984	}	2147	}
1985	}	2148	}
1986	undef $MAP_PREFETCHER;	2149	undef $MAP_PREFETCHER;
1987	};	2150	};
1988	$MAP_PREFETCHER->prio (6);	2151	$MAP_PREFETCHER->prio (6);
…		…
1991	}	2154	}
1992		2155
1993	sub save {	2156	sub save {
1994	my ($self) = @_;	2157	my ($self) = @_;
1995		2158
1996	my $lock = cf::lock_acquire "map_data:" . $self->path;	2159	my $lock = cf::lock_acquire "map_data:$self->{path}";
1997		2160
1998	$self->{last_save} = $cf::RUNTIME;	2161	$self->{last_save} = $cf::RUNTIME;
1999		2162
2000	return unless $self->dirty;	2163	return unless $self->dirty;
2001		2164
…		…
2007	return if $self->{deny_save};	2170	return if $self->{deny_save};
2008		2171
2009	local $self->{last_access} = $self->last_access;#d#	2172	local $self->{last_access} = $self->last_access;#d#
2010		2173
2011	cf::async {	2174	cf::async {
		2175	$Coro::current->{desc} = "map player save";
2012	$_->contr->save for $self->players;	2176	$_->contr->save for $self->players;
2013	};	2177	};
2014		2178
2015	if ($uniq) {	2179	if ($uniq) {
2016	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2180	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
…		…
2024	my ($self) = @_;	2188	my ($self) = @_;
2025		2189
2026	# save first because save cedes	2190	# save first because save cedes
2027	$self->save;	2191	$self->save;
2028		2192
2029	my $lock = cf::lock_acquire "map_data:" . $self->path;	2193	my $lock = cf::lock_acquire "map_data:$self->{path}";
2030		2194
2031	return if $self->players;	2195	return if $self->players;
2032	return if $self->in_memory != cf::MAP_IN_MEMORY;	2196	return if $self->in_memory != cf::MAP_IN_MEMORY;
2033	return if $self->{deny_save};	2197	return if $self->{deny_save};
2034		2198
		2199	$self->in_memory (cf::MAP_SWAPPED);
		2200
		2201	$self->deactivate;
		2202	$_->clear_links_to ($self) for values %cf::MAP;
2035	$self->clear;	2203	$self->clear;
2036	$self->in_memory (cf::MAP_SWAPPED);
2037	}	2204	}
2038		2205
2039	sub reset_at {	2206	sub reset_at {
2040	my ($self) = @_;	2207	my ($self) = @_;
2041		2208
…		…
2073	if $uniq;	2240	if $uniq;
2074	}	2241	}
2075		2242
2076	delete $cf::MAP{$self->path};	2243	delete $cf::MAP{$self->path};
2077		2244
		2245	$self->deactivate;
		2246	$_->clear_links_to ($self) for values %cf::MAP;
2078	$self->clear;	2247	$self->clear;
2079
2080	$_->clear_links_to ($self) for values %cf::MAP;
2081		2248
2082	$self->unlink_save;	2249	$self->unlink_save;
2083	$self->destroy;	2250	$self->destroy;
2084	}	2251	}
2085		2252
2086	my $nuke_counter = "aaaa";	2253	my $nuke_counter = "aaaa";
2087		2254
2088	sub nuke {	2255	sub nuke {
2089	my ($self) = @_;	2256	my ($self) = @_;
2090		2257
		2258	{
		2259	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2260
2091	delete $cf::MAP{$self->path};	2261	delete $cf::MAP{$self->path};
2092		2262
2093	$self->unlink_save;	2263	$self->unlink_save;
2094		2264
2095	bless $self, "cf::map";	2265	bless $self, "cf::map";
2096	delete $self->{deny_reset};	2266	delete $self->{deny_reset};
2097	$self->{deny_save} = 1;	2267	$self->{deny_save} = 1;
2098	$self->reset_timeout (1);	2268	$self->reset_timeout (1);
2099	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2269	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100		2270
2101	$cf::MAP{$self->path} = $self;	2271	$cf::MAP{$self->path} = $self;
		2272	}
2102		2273
2103	$self->reset; # polite request, might not happen	2274	$self->reset; # polite request, might not happen
2104	}	2275	}
2105		2276
2106	=item $maps = cf::map::tmp_maps	2277	=item $maps = cf::map::tmp_maps
…		…
2182		2353
2183	sub inv_recursive {	2354	sub inv_recursive {
2184	inv_recursive_ inv $_[0]	2355	inv_recursive_ inv $_[0]
2185	}	2356	}
2186		2357
		2358	=item $ref = $ob->ref
		2359
		2360	creates and returns a persistent reference to an objetc that can be stored as a string.
		2361
		2362	=item $ob = cf::object::deref ($refstring)
		2363
		2364	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2365	even if the object actually exists. May block.
		2366
		2367	=cut
		2368
		2369	sub deref {
		2370	my ($ref) = @_;
		2371
		2372	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2373	my ($uuid, $name) = ($1, $2);
		2374	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2375	or return;
		2376	$pl->ob->uuid eq $uuid
		2377	or return;
		2378
		2379	$pl->ob
		2380	} else {
		2381	warn "$ref: cannot resolve object reference\n";
		2382	undef
		2383	}
		2384	}
		2385
2187	package cf;	2386	package cf;
2188		2387
2189	=back	2388	=back
2190		2389
2191	=head3 cf::object::player	2390	=head3 cf::object::player
…		…
2213		2412
2214	} else {	2413	} else {
2215	my $pl = $self->contr;	2414	my $pl = $self->contr;
2216		2415
2217	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2416	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218	my $diag = $pl->{npc_dialog};	2417	my $dialog = $pl->{npc_dialog};
2219	$diag->{pl}->ext_reply (	2418	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220	$diag->{id},
2221	msgtype => "reply",
2222	msg => $diag->{pl}->expand_cfpod ($msg),
2223	add_topics => []
2224	);
2225		2419
2226	} else {	2420	} else {
2227	$msg = $npc->name . " says: $msg" if $npc;	2421	$msg = $npc->name . " says: $msg" if $npc;
2228	$self->message ($msg, $flags);	2422	$self->message ($msg, $flags);
2229	}	2423	}
2230	}	2424	}
		2425	}
		2426
		2427	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2428
		2429	=cut
		2430
		2431	sub cf::object::send_msg {
		2432	my $pl = shift->contr
		2433	or return;
		2434	$pl->send_msg (@_);
2231	}	2435	}
2232		2436
2233	=item $player_object->may ("access")	2437	=item $player_object->may ("access")
2234		2438
2235	Returns wether the given player is authorized to access resource "access"	2439	Returns wether the given player is authorized to access resource "access"
…		…
2314	# use -1 or undef as default coordinates, not 0, 0	2518	# use -1 or undef as default coordinates, not 0, 0
2315	($x, $y) = ($map->enter_x, $map->enter_y)	2519	($x, $y) = ($map->enter_x, $map->enter_y)
2316	if $x <=0 && $y <= 0;	2520	if $x <=0 && $y <= 0;
2317		2521
2318	$map->load;	2522	$map->load;
2319	$map->load_diag;	2523	$map->load_neighbours;
2320		2524
2321	return unless $self->contr->active;	2525	return unless $self->contr->active;
2322	$self->activate_recursive;	2526	$self->activate_recursive;
2323		2527
2324	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2528	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
…		…
2344	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2548	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2345		2549
2346	$self->enter_link;	2550	$self->enter_link;
2347		2551
2348	(async {	2552	(async {
		2553	$Coro::current->{desc} = "player::goto $path $x $y";
		2554
		2555	# *tag paths override both path and x|y
		2556	if ($path =~ /^\*(.*)$/) {
		2557	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2558	my $ob = $obs[rand @obs];
		2559
		2560	# see if we actually can go there
		2561	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2562	$ob = $obs[rand @obs];
		2563	} else {
		2564	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2565	}
		2566	# else put us there anyways for now #d#
		2567
		2568	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2569	} else {
		2570	($path, $x, $y) = (undef, undef, undef);
		2571	}
		2572	}
		2573
2349	my $map = eval {	2574	my $map = eval {
2350	my $map = cf::map::find $path;	2575	my $map = defined $path ? cf::map::find $path : undef;
2351		2576
2352	if ($map) {	2577	if ($map) {
2353	$map = $map->customise_for ($self);	2578	$map = $map->customise_for ($self);
2354	$map = $check->($map) if $check && $map;	2579	$map = $check->($map) if $check && $map;
2355	} else {	2580	} else {
2356	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2581	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2357	}	2582	}
2358		2583
2359	$map	2584	$map
2360	};	2585	};
2361		2586
…		…
2414	$rmp->{origin_y} = $exit->y;	2639	$rmp->{origin_y} = $exit->y;
2415	}	2640	}
2416		2641
2417	$rmp->{random_seed} ||= $exit->random_seed;	2642	$rmp->{random_seed} ||= $exit->random_seed;
2418		2643
2419	my $data = cf::to_json $rmp;	2644	my $data = cf::encode_json $rmp;
2420	my $md5 = Digest::MD5::md5_hex $data;	2645	my $md5 = Digest::MD5::md5_hex $data;
2421	my $meta = "$RANDOMDIR/$md5.meta";	2646	my $meta = "$RANDOMDIR/$md5.meta";
2422		2647
2423	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2648	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2424	aio_write $fh, 0, (length $data), $data, 0;	2649	aio_write $fh, 0, (length $data), $data, 0;
…		…
2451	# if exit is damned, update players death & WoR home-position	2676	# if exit is damned, update players death & WoR home-position
2452	$self->contr->savebed ($slaying, $hp, $sp)	2677	$self->contr->savebed ($slaying, $hp, $sp)
2453	if $exit->flag (FLAG_DAMNED);	2678	if $exit->flag (FLAG_DAMNED);
2454		2679
2455	(async {	2680	(async {
		2681	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2682
2456	$self->deactivate_recursive; # just to be sure	2683	$self->deactivate_recursive; # just to be sure
2457	unless (eval {	2684	unless (eval {
2458	$self->goto ($slaying, $hp, $sp);	2685	$self->goto ($slaying, $hp, $sp);
2459		2686
2460	1;	2687	1;
…		…
2495	the message, with C<log> being the default. If C<$color> is negative, suppress	2722	the message, with C<log> being the default. If C<$color> is negative, suppress
2496	the message unless the client supports the msg packet.	2723	the message unless the client supports the msg packet.
2497		2724
2498	=cut	2725	=cut
2499		2726
		2727	# non-persistent channels (usually the info channel)
		2728	our %CHANNEL = (
		2729	"c/identify" => {
		2730	id => "infobox",
		2731	title => "Identify",
		2732	reply => undef,
		2733	tooltip => "Items recently identified",
		2734	},
		2735	"c/examine" => {
		2736	id => "infobox",
		2737	title => "Examine",
		2738	reply => undef,
		2739	tooltip => "Signs and other items you examined",
		2740	},
		2741	"c/book" => {
		2742	id => "infobox",
		2743	title => "Book",
		2744	reply => undef,
		2745	tooltip => "The contents of a note or book",
		2746	},
		2747	"c/lookat" => {
		2748	id => "infobox",
		2749	title => "Look",
		2750	reply => undef,
		2751	tooltip => "What you saw there",
		2752	},
		2753	"c/who" => {
		2754	id => "infobox",
		2755	title => "Players",
		2756	reply => undef,
		2757	tooltip => "Shows players who are currently online",
		2758	},
		2759	"c/body" => {
		2760	id => "infobox",
		2761	title => "Body Parts",
		2762	reply => undef,
		2763	tooltip => "Shows which body parts you posess and are available",
		2764	},
		2765	"c/uptime" => {
		2766	id => "infobox",
		2767	title => "Uptime",
		2768	reply => undef,
		2769	tooltip => "How long the server has been running since last restart",
		2770	},
		2771	"c/mapinfo" => {
		2772	id => "infobox",
		2773	title => "Map Info",
		2774	reply => undef,
		2775	tooltip => "Information related to the maps",
		2776	},
		2777	);
		2778
2500	sub cf::client::send_msg {	2779	sub cf::client::send_msg {
2501	my ($self, $channel, $msg, $color, @extra) = @_;	2780	my ($self, $channel, $msg, $color, @extra) = @_;
2502		2781
2503	$msg = $self->pl->expand_cfpod ($msg);	2782	$msg = $self->pl->expand_cfpod ($msg);
2504		2783
2505	$color &= ~cf::NDI_UNIQUE; # just in case...	2784	$color &= cf::NDI_CLIENT_MASK; # just in case...
2506		2785
		2786	# check predefined channels, for the benefit of C
		2787	if ($CHANNEL{$channel}) {
		2788	$channel = $CHANNEL{$channel};
		2789
		2790	$self->ext_msg (channel_info => $channel)
		2791	if $self->can_msg;
		2792
		2793	$channel = $channel->{id};
		2794
2507	if (ref $channel) {	2795	} elsif (ref $channel) {
2508	# send meta info to client, if not yet sent	2796	# send meta info to client, if not yet sent
2509	unless (exists $self->{channel}{$channel->{id}}) {	2797	unless (exists $self->{channel}{$channel->{id}}) {
2510	$self->{channel}{$channel->{id}} = $channel;	2798	$self->{channel}{$channel->{id}} = $channel;
2511	$self->ext_event (channel_info => %$channel);	2799	$self->ext_msg (channel_info => $channel)
		2800	if $self->can_msg;
2512	}	2801	}
2513		2802
2514	$channel = $channel->{id};	2803	$channel = $channel->{id};
2515	}	2804	}
2516		2805
2517	return unless @extra || length $msg;	2806	return unless @extra || length $msg;
2518		2807
2519	if ($self->can_msg) {	2808	if ($self->can_msg) {
		2809	# default colour, mask it out
		2810	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2811	if $color & cf::NDI_DEF;
		2812
2520	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));	2813	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2814	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2521	} else {	2815	} else {
2522	# replace some tags by gcfclient-compatible ones
2523	for ($msg) {
2524	1 while
2525	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2526	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2527	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2528	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2529	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2530	}
2531
2532	if ($color >= 0) {	2816	if ($color >= 0) {
		2817	# replace some tags by gcfclient-compatible ones
		2818	for ($msg) {
		2819	1 while
		2820	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2821	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2822	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2823	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2824	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2825	}
		2826
		2827	$color &= cf::NDI_COLOR_MASK;
		2828
		2829	utf8::encode $msg;
		2830
2533	if (0 && $msg =~ /\[/) {	2831	if (0 && $msg =~ /\[/) {
		2832	# COMMAND/INFO
2534	$self->send_packet ("drawextinfo $color 4 0 $msg")	2833	$self->send_packet ("drawextinfo $color 10 8 $msg")
2535	} else {	2834	} else {
2536	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;	2835	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2537	$self->send_packet ("drawinfo $color $msg")	2836	$self->send_packet ("drawinfo $color $msg")
2538	}	2837	}
2539	}	2838	}
2540	}	2839	}
2541	}	2840	}
2542		2841
2543	=item $client->ext_event ($type, %msg)	2842	=item $client->ext_msg ($type, @msg)
2544		2843
2545	Sends an ext event to the client.	2844	Sends an ext event to the client.
2546		2845
2547	=cut	2846	=cut
2548		2847
2549	sub cf::client::ext_event($$%) {	2848	sub cf::client::ext_msg($$@) {
2550	my ($self, $type, %msg) = @_;	2849	my ($self, $type, @msg) = @_;
2551		2850
2552	return unless $self->extcmd;	2851	if ($self->extcmd == 2) {
2553		2852	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2853	} elsif ($self->extcmd == 1) { # TODO: remove
2554	$msg{msgtype} = "event_$type";	2854	push @msg, msgtype => "event_$type";
2555	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2855	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2856	}
		2857	}
		2858
		2859	=item $client->ext_reply ($msgid, @msg)
		2860
		2861	Sends an ext reply to the client.
		2862
		2863	=cut
		2864
		2865	sub cf::client::ext_reply($$@) {
		2866	my ($self, $id, @msg) = @_;
		2867
		2868	if ($self->extcmd == 2) {
		2869	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2870	} elsif ($self->extcmd == 1) {
		2871	#TODO: version 1, remove
		2872	unshift @msg, msgtype => "reply", msgid => $id;
		2873	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2874	}
2556	}	2875	}
2557		2876
2558	=item $success = $client->query ($flags, "text", \&cb)	2877	=item $success = $client->query ($flags, "text", \&cb)
2559		2878
2560	Queues a query to the client, calling the given callback with	2879	Queues a query to the client, calling the given callback with
…		…
2615	my ($ns, $buf) = @_;	2934	my ($ns, $buf) = @_;
2616		2935
2617	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2936	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2618		2937
2619	if (ref $msg) {	2938	if (ref $msg) {
		2939	my ($type, $reply, @payload) =
		2940	"ARRAY" eq ref $msg
		2941	? @$msg
		2942	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2943
		2944	my @reply;
		2945
2620	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2946	if (my $cb = $EXTICMD{$type}) {
2621	if (my %reply = $cb->($ns, $msg)) {	2947	@reply = $cb->($ns, @payload);
2622	$reply{msgid} = $msg->{msgid};
2623	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2624	}
2625	}	2948	}
		2949
		2950	$ns->ext_reply ($reply, @reply)
		2951	if $reply;
		2952
2626	} else {	2953	} else {
2627	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2954	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2628	}	2955	}
2629		2956
2630	cf::override;	2957	cf::override;
…		…
2677	our $safe = new Safe "safe";	3004	our $safe = new Safe "safe";
2678	our $safe_hole = new Safe::Hole;	3005	our $safe_hole = new Safe::Hole;
2679		3006
2680	$SIG{FPE} = 'IGNORE';	3007	$SIG{FPE} = 'IGNORE';
2681		3008
2682	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	3009	$safe->permit_only (Opcode::opset qw(
		3010	:base_core :base_mem :base_orig :base_math
		3011	grepstart grepwhile mapstart mapwhile
		3012	sort time
		3013	));
2683		3014
2684	# here we export the classes and methods available to script code	3015	# here we export the classes and methods available to script code
2685		3016
2686	=pod	3017	=pod
2687		3018
2688	The following functions and methods are available within a safe environment:	3019	The following functions and methods are available within a safe environment:
2689		3020
2690	cf::object	3021	cf::object
2691	contr pay_amount pay_player map x y force_find force_add	3022	contr pay_amount pay_player map x y force_find force_add destroy
2692	insert remove	3023	insert remove name archname title slaying race decrease_ob_nr
2693		3024
2694	cf::object::player	3025	cf::object::player
2695	player	3026	player
2696		3027
2697	cf::player	3028	cf::player
…		…
2702		3033
2703	=cut	3034	=cut
2704		3035
2705	for (	3036	for (
2706	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3037	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		3038	insert remove inv name archname title slaying race
2707	insert remove)],	3039	decrease_ob_nr destroy)],
2708	["cf::object::player" => qw(player)],	3040	["cf::object::player" => qw(player)],
2709	["cf::player" => qw(peaceful)],	3041	["cf::player" => qw(peaceful)],
2710	["cf::map" => qw(trigger)],	3042	["cf::map" => qw(trigger)],
2711	) {	3043	) {
2712	no strict 'refs';	3044	no strict 'refs';
…		…
2788	# the server's init and main functions	3120	# the server's init and main functions
2789		3121
2790	sub load_facedata($) {	3122	sub load_facedata($) {
2791	my ($path) = @_;	3123	my ($path) = @_;
2792		3124
		3125	# HACK to clear player env face cache, we need some signal framework
		3126	# for this (global event?)
		3127	%ext::player_env::MUSIC_FACE_CACHE = ();
		3128
		3129	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3130
2793	warn "loading facedata from $path\n";	3131	warn "loading facedata from $path\n";
2794		3132
2795	my $facedata;	3133	my $facedata;
2796	0 < aio_load $path, $facedata	3134	0 < aio_load $path, $facedata
2797	or die "$path: $!";	3135	or die "$path: $!";
2798		3136
2799	$facedata = Coro::Storable::thaw $facedata;	3137	$facedata = Coro::Storable::thaw $facedata;
2800		3138
2801	$facedata->{version} == 2	3139	$facedata->{version} == 2
2802	or cf::cleanup "$path: version mismatch, cannot proceed.";	3140	or cf::cleanup "$path: version mismatch, cannot proceed.";
		3141
		3142	# patch in the exptable
		3143	$facedata->{resource}{"res/exp_table"} = {
		3144	type => FT_RSRC,
		3145	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3146	};
		3147	cf::cede_to_tick;
2803		3148
2804	{	3149	{
2805	my $faces = $facedata->{faceinfo};	3150	my $faces = $facedata->{faceinfo};
2806		3151
2807	while (my ($face, $info) = each %$faces) {	3152	while (my ($face, $info) = each %$faces) {
2808	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3153	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2809	cf::face::set_visibility $idx, $info->{visibility};	3154	cf::face::set_visibility $idx, $info->{visibility};
2810	cf::face::set_magicmap $idx, $info->{magicmap};	3155	cf::face::set_magicmap $idx, $info->{magicmap};
2811	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3156	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2812	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3157	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2813		3158
2814	cf::cede_to_tick;	3159	cf::cede_to_tick;
2815	}	3160	}
2816		3161
2817	while (my ($face, $info) = each %$faces) {	3162	while (my ($face, $info) = each %$faces) {
…		…
2842		3187
2843	{	3188	{
2844	# TODO: for gcfclient pleasure, we should give resources	3189	# TODO: for gcfclient pleasure, we should give resources
2845	# that gcfclient doesn't grok a >10000 face index.	3190	# that gcfclient doesn't grok a >10000 face index.
2846	my $res = $facedata->{resource};	3191	my $res = $facedata->{resource};
2847	my $enc = JSON::XS->new->utf8->canonical;	3192
		3193	my $soundconf = delete $res->{"res/sound.conf"};
2848		3194
2849	while (my ($name, $info) = each %$res) {	3195	while (my ($name, $info) = each %$res) {
2850	my $meta = $enc->encode ({
2851	name => $name,
2852	type => $info->{type},
2853	copyright => $info->{copyright}, #TODO#
2854	});
2855
2856	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3196	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3197	my $data;
2857		3198
2858	if ($name =~ /\.jpg$/) {	3199	if ($info->{type} & 1) {
2859	cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack	3200	# prepend meta info
2860	cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack	3201
		3202	my $meta = $enc->encode ({
		3203	name => $name,
		3204	%{ $info->{meta} || {} },
		3205	});
		3206
		3207	$data = pack "(w/a*)*", $meta, $info->{data};
2861	} else {	3208	} else {
2862	my $data = pack "(w/a*)*", $meta, $info->{data};	3209	$data = $info->{data};
2863	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2864
2865	cf::face::set_type $idx, 1;
2866	cf::face::set_data $idx, 0, $data, $chk;
2867	}	3210	}
2868		3211
		3212	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3213	cf::face::set_type $idx, $info->{type};
		3214
2869	cf::cede_to_tick;	3215	cf::cede_to_tick;
2870	}	3216	}
		3217
		3218	if ($soundconf) {
		3219	$soundconf = $enc->decode (delete $soundconf->{data});
		3220
		3221	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3222	my $sound = $soundconf->{compat}[$_]
		3223	or next;
		3224
		3225	my $face = cf::face::find "sound/$sound->[1]";
		3226	cf::sound::set $sound->[0] => $face;
		3227	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3228	}
		3229
		3230	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3231	my $face = cf::face::find "sound/$v";
		3232	cf::sound::set $k => $face;
		3233	}
		3234	}
2871	}	3235	}
2872		3236
2873	1	3237	1
2874	}	3238	}
2875		3239
		3240	register_exticmd fx_want => sub {
		3241	my ($ns, $want) = @_;
		3242
		3243	while (my ($k, $v) = each %$want) {
		3244	$ns->fx_want ($k, $v);
		3245	}
		3246	};
		3247
2876	sub reload_regions {	3248	sub reload_regions {
		3249	# HACK to clear player env face cache, we need some signal framework
		3250	# for this (global event?)
		3251	%ext::player_env::MUSIC_FACE_CACHE = ();
		3252
2877	load_resource_file "$MAPDIR/regions"	3253	load_resource_file "$MAPDIR/regions"
2878	or die "unable to load regions file\n";	3254	or die "unable to load regions file\n";
2879		3255
2880	for (cf::region::list) {	3256	for (cf::region::list) {
2881	$_->{match} = qr/$_->{match}/	3257	$_->{match} = qr/$_->{match}/
…		…
2917		3293
2918	sub init {	3294	sub init {
2919	reload_resources;	3295	reload_resources;
2920	}	3296	}
2921		3297
2922	sub cfg_load {	3298	sub reload_config {
2923	open my $fh, "<:utf8", "$CONFDIR/config"	3299	open my $fh, "<:utf8", "$CONFDIR/config"
2924	or return;	3300	or return;
2925		3301
2926	local $/;	3302	local $/;
2927	*CFG = YAML::Syck::Load <$fh>;	3303	*CFG = YAML::Syck::Load <$fh>;
…		…
2943	sub main {	3319	sub main {
2944	# we must not ever block the main coroutine	3320	# we must not ever block the main coroutine
2945	local $Coro::idle = sub {	3321	local $Coro::idle = sub {
2946	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3322	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2947	(async {	3323	(async {
2948	Event::one_event;	3324	$Coro::current->{desc} = "IDLE BUG HANDLER";
		3325	EV::loop EV::LOOP_ONESHOT;
2949	})->prio (Coro::PRIO_MAX);	3326	})->prio (Coro::PRIO_MAX);
2950	};	3327	};
2951		3328
2952	cfg_load;	3329	reload_config;
2953	db_init;	3330	db_init;
2954	load_extensions;	3331	load_extensions;
2955		3332
2956	$TICK_WATCHER->start;	3333	$TICK_WATCHER->start;
		3334	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2957	Event::loop;	3335	EV::loop;
2958	}	3336	}
2959		3337
2960	#############################################################################	3338	#############################################################################
2961	# initialisation and cleanup	3339	# initialisation and cleanup
2962		3340
2963	# install some emergency cleanup handlers	3341	# install some emergency cleanup handlers
2964	BEGIN {	3342	BEGIN {
		3343	our %SIGWATCHER = ();
2965	for my $signal (qw(INT HUP TERM)) {	3344	for my $signal (qw(INT HUP TERM)) {
2966	Event->signal (	3345	$SIGWATCHER{$signal} = EV::signal $signal, sub {
2967	reentrant => 0,
2968	data => WF_AUTOCANCEL,
2969	signal => $signal,
2970	prio => 0,
2971	cb => sub {
2972	cf::cleanup "SIG$signal";	3346	cf::cleanup "SIG$signal";
2973	},
2974	);	3347	};
2975	}	3348	}
2976	}	3349	}
2977		3350
2978	sub write_runtime {	3351	sub write_runtime {
2979	my $runtime = "$LOCALDIR/runtime";	3352	my $runtime = "$LOCALDIR/runtime";
…		…
3024	# and maps saved/destroyed asynchronously.	3397	# and maps saved/destroyed asynchronously.
3025	warn "begin emergency player save\n";	3398	warn "begin emergency player save\n";
3026	for my $login (keys %cf::PLAYER) {	3399	for my $login (keys %cf::PLAYER) {
3027	my $pl = $cf::PLAYER{$login} or next;	3400	my $pl = $cf::PLAYER{$login} or next;
3028	$pl->valid or next;	3401	$pl->valid or next;
		3402	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3029	$pl->save;	3403	$pl->save;
3030	}	3404	}
3031	warn "end emergency player save\n";	3405	warn "end emergency player save\n";
3032		3406
3033	warn "begin emergency map save\n";	3407	warn "begin emergency map save\n";
…		…
3072	warn "syncing database to disk";	3446	warn "syncing database to disk";
3073	BDB::db_env_txn_checkpoint $DB_ENV;	3447	BDB::db_env_txn_checkpoint $DB_ENV;
3074		3448
3075	# if anything goes wrong in here, we should simply crash as we already saved	3449	# if anything goes wrong in here, we should simply crash as we already saved
3076		3450
3077	warn "cancelling all WF_AUTOCANCEL watchers";
3078	for (Event::all_watchers) {
3079	$_->cancel if $_->data & WF_AUTOCANCEL;
3080	}
3081
3082	warn "flushing outstanding aio requests";	3451	warn "flushing outstanding aio requests";
3083	for (;;) {	3452	for (;;) {
3084	BDB::flush;	3453	BDB::flush;
3085	IO::AIO::flush;	3454	IO::AIO::flush;
3086	Coro::cede;	3455	Coro::cede_notself;
3087	last unless IO::AIO::nreqs || BDB::nreqs;	3456	last unless IO::AIO::nreqs || BDB::nreqs;
3088	warn "iterate...";	3457	warn "iterate...";
3089	}	3458	}
3090		3459
3091	++$RELOAD;	3460	++$RELOAD;
…		…
3150	warn "reloading cf.pm";	3519	warn "reloading cf.pm";
3151	require cf;	3520	require cf;
3152	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3521	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3153		3522
3154	warn "loading config and database again";	3523	warn "loading config and database again";
3155	cf::cfg_load;	3524	cf::reload_config;
3156		3525
3157	warn "loading extensions";	3526	warn "loading extensions";
3158	cf::load_extensions;	3527	cf::load_extensions;
3159		3528
3160	warn "reattaching attachments to objects/players";	3529	warn "reattaching attachments to objects/players";
…		…
3180		3549
3181	sub reload_perl() {	3550	sub reload_perl() {
3182	# doing reload synchronously and two reloads happen back-to-back,	3551	# doing reload synchronously and two reloads happen back-to-back,
3183	# coro crashes during coro_state_free->destroy here.	3552	# coro crashes during coro_state_free->destroy here.
3184		3553
3185	$RELOAD_WATCHER ||= Event->timer (	3554	$RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3186	reentrant => 0,
3187	after => 0,
3188	data => WF_AUTOCANCEL,
3189	cb => sub {
3190	do_reload_perl;
3191	undef $RELOAD_WATCHER;	3555	undef $RELOAD_WATCHER;
3192	},	3556	do_reload_perl;
3193	);	3557	};
3194	}	3558	}
3195		3559
3196	register_command "reload" => sub {	3560	register_command "reload" => sub {
3197	my ($who, $arg) = @_;	3561	my ($who, $arg) = @_;
3198		3562
3199	if ($who->flag (FLAG_WIZ)) {	3563	if ($who->flag (FLAG_WIZ)) {
3200	$who->message ("reloading server.");	3564	$who->message ("reloading server.");
		3565	async {
		3566	$Coro::current->{desc} = "perl_reload";
3201	async { reload_perl };	3567	reload_perl;
		3568	};
3202	}	3569	}
3203	};	3570	};
3204		3571
3205	unshift @INC, $LIBDIR;	3572	unshift @INC, $LIBDIR;
3206		3573
…		…
3225	my $signal = new Coro::Signal;	3592	my $signal = new Coro::Signal;
3226	push @WAIT_FOR_TICK_BEGIN, $signal;	3593	push @WAIT_FOR_TICK_BEGIN, $signal;
3227	$signal->wait;	3594	$signal->wait;
3228	}	3595	}
3229		3596
3230	my $min = 1e6;#d#	3597	$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3231	my $avg = 10;
3232	$TICK_WATCHER = Event->timer (
3233	reentrant => 0,
3234	parked => 1,
3235	prio => 0,
3236	at => $NEXT_TICK || $TICK,
3237	data => WF_AUTOCANCEL,
3238	cb => sub {
3239	if ($Coro::current != $Coro::main) {	3598	if ($Coro::current != $Coro::main) {
3240	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3599	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3241	unless ++$bug_warning > 10;	3600	unless ++$bug_warning > 10;
3242	return;	3601	return;
3243	}	3602	}
3244		3603
3245	$NOW = $tick_start = Event::time;	3604	$NOW = $tick_start = EV::now;
3246		3605
3247	cf::server_tick; # one server iteration	3606	cf::server_tick; # one server iteration
3248		3607
3249	0 && sync_job {#d#	3608	$RUNTIME += $TICK;
3250	for(1..10) {	3609	$NEXT_TICK = $_[0]->at;
3251	my $t = Event::time;
3252	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3253	or die;
3254		3610
3255	$map->width (50);	3611	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3256	$map->height (50);	3612	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3257	$map->alloc;	3613	Coro::async_pool {
3258	$map->_load_objects ("/tmp/x.map", 1);	3614	$Coro::current->{desc} = "runtime saver";
3259	my $t = Event::time - $t;	3615	write_runtime
3260		3616	or warn "ERROR: unable to write runtime file: $!";
3261	#next unless $t < 0.0013;#d#
3262	if ($t < $min) {
3263	$min = $t;
3264	}
3265	$avg = $avg * 0.99 + $t * 0.01;
3266	}
3267	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3268	exit 0;
3269	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3270	};	3617	};
		3618	}
3271		3619
3272	$RUNTIME += $TICK;
3273	$NEXT_TICK += $TICK;
3274
3275	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3276	$NEXT_RUNTIME_WRITE = $NOW + 10;
3277	Coro::async_pool {
3278	write_runtime
3279	or warn "ERROR: unable to write runtime file: $!";
3280	};
3281	}
3282
3283	# my $AFTER = Event::time;
3284	# warn $AFTER - $NOW;#d#
3285
3286	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3620	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3287	$sig->send;	3621	$sig->send;
3288	}	3622	}
3289	while (my $sig = shift @WAIT_FOR_TICK) {	3623	while (my $sig = shift @WAIT_FOR_TICK) {
3290	$sig->send;	3624	$sig->send;
3291	}	3625	}
3292		3626
3293	$NOW = Event::time;
3294
3295	# if we are delayed by four ticks or more, skip them all
3296	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3297
3298	$TICK_WATCHER->at ($NEXT_TICK);
3299	$TICK_WATCHER->start;
3300
3301	$LOAD = ($NOW - $tick_start) / $TICK;	3627	$LOAD = ($NOW - $tick_start) / $TICK;
3302	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3628	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3303		3629
3304	_post_tick;	3630	_post_tick;
3305		3631	};
3306		3632	$TICK_WATCHER->priority (EV::MAXPRI);
3307	},
3308	);
3309		3633
3310	{	3634	{
3311	BDB::max_poll_time $TICK * 0.1;	3635	# configure BDB
3312	$BDB_POLL_WATCHER = Event->io (	3636
3313	reentrant => 0,
3314	fd => BDB::poll_fileno,
3315	poll => 'r',
3316	prio => 0,
3317	data => WF_AUTOCANCEL,
3318	cb => \&BDB::poll_cb,
3319	);
3320	BDB::min_parallel 8;	3637	BDB::min_parallel 8;
3321		3638	BDB::max_poll_reqs $TICK * 0.1;
3322	BDB::set_sync_prepare {	3639	$Coro::BDB::WATCHER->priority (1);
3323	my $status;
3324	my $current = $Coro::current;
3325	(
3326	sub {
3327	$status = $!;
3328	$current->ready; undef $current;
3329	},
3330	sub {
3331	Coro::schedule while defined $current;
3332	$! = $status;
3333	},
3334	)
3335	};
3336		3640
3337	unless ($DB_ENV) {	3641	unless ($DB_ENV) {
3338	$DB_ENV = BDB::db_env_create;	3642	$DB_ENV = BDB::db_env_create;
		3643	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3644	| BDB::LOG_AUTOREMOVE, 1);
		3645	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3646	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3339		3647
3340	cf::sync_job {	3648	cf::sync_job {
3341	eval {	3649	eval {
3342	BDB::db_env_open	3650	BDB::db_env_open
3343	$DB_ENV,	3651	$DB_ENV,
…		…
3345	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3653	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3346	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3654	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3347	0666;	3655	0666;
3348		3656
3349	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3657	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3350
3351	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3352	$DB_ENV->set_lk_detect;
3353	};	3658	};
3354		3659
3355	cf::cleanup "db_env_open(db): $@" if $@;	3660	cf::cleanup "db_env_open(db): $@" if $@;
3356	};	3661	};
3357	}	3662	}
		3663
		3664	$BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
		3665	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3666	};
		3667	$BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
		3668	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3669	};
		3670	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
		3671	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3672	};
3358	}	3673	}
3359		3674
3360	{	3675	{
		3676	# configure IO::AIO
		3677
3361	IO::AIO::min_parallel 8;	3678	IO::AIO::min_parallel 8;
3362
3363	undef $Coro::AIO::WATCHER;
3364	IO::AIO::max_poll_time $TICK * 0.1;	3679	IO::AIO::max_poll_time $TICK * 0.1;
3365	$AIO_POLL_WATCHER = Event->io (	3680	$Coro::AIO::WATCHER->priority (1);
3366	reentrant => 0,
3367	data => WF_AUTOCANCEL,
3368	fd => IO::AIO::poll_fileno,
3369	poll => 'r',
3370	prio => 6,
3371	cb => \&IO::AIO::poll_cb,
3372	);
3373	}	3681	}
3374		3682
3375	my $_log_backtrace;	3683	my $_log_backtrace;
3376		3684
3377	sub _log_backtrace {	3685	sub _log_backtrace {
…		…
3381		3689
3382	# limit the # of concurrent backtraces	3690	# limit the # of concurrent backtraces
3383	if ($_log_backtrace < 2) {	3691	if ($_log_backtrace < 2) {
3384	++$_log_backtrace;	3692	++$_log_backtrace;
3385	async {	3693	async {
		3694	$Coro::current->{desc} = "abt $msg";
		3695
3386	my @bt = fork_call {	3696	my @bt = fork_call {
3387	@addr = map { sprintf "%x", $_ } @addr;	3697	@addr = map { sprintf "%x", $_ } @addr;
3388	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3698	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3389	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"	3699	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3390	or die "addr2line: $!";	3700	or die "addr2line: $!";

Diff Legend

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