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.347 by root, Thu Aug 30 05:16:09 2007 UTC vs.
Revision 1.428 by root, Thu May 1 06:33:19 2008 UTC

		1	#
		2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
		3	#
		4	# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
		5	#
		6	# Deliantra is free software: you can redistribute it and/or modify
		7	# it under the terms of the GNU General Public License as published by
		8	# the Free Software Foundation, either version 3 of the License, or
		9	# (at your option) any later version.
		10	#
		11	# This program is distributed in the hope that it will be useful,
		12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		14	# GNU General Public License for more details.
		15	#
		16	# You should have received a copy of the GNU General Public License
		17	# along with this program. If not, see <http://www.gnu.org/licenses/>.
		18	#
		19	# The authors can be reached via e-mail to <support@deliantra.net>
		20	#
		21
1	package cf;	22	package cf;
2		23
3	use utf8;	24	use utf8;
4	use strict;	25	use strict;
5		26
6	use Symbol;	27	use Symbol;
7	use List::Util;	28	use List::Util;
8	use Socket;	29	use Socket;
9	use Storable;	30	use EV 3.2;
10	use Event;
11	use Opcode;	31	use Opcode;
12	use Safe;	32	use Safe;
13	use Safe::Hole;	33	use Safe::Hole;
		34	use Storable ();
14		35
15	use Coro 3.64 ();	36	use Coro 4.50 ();
16	use Coro::State;	37	use Coro::State;
17	use Coro::Handle;	38	use Coro::Handle;
18	use Coro::Event;	39	use Coro::EV;
19	use Coro::Timer;	40	use Coro::Timer;
20	use Coro::Signal;	41	use Coro::Signal;
21	use Coro::Semaphore;	42	use Coro::Semaphore;
22	use Coro::AIO;	43	use Coro::AIO;
		44	use Coro::BDB;
23	use Coro::Storable;	45	use Coro::Storable;
24	use Coro::Util ();	46	use Coro::Util ();
25		47
26	use JSON::XS ();	48	use JSON::XS 2.01 ();
27	use BDB ();	49	use BDB ();
28	use Data::Dumper;	50	use Data::Dumper;
29	use Digest::MD5;	51	use Digest::MD5;
30	use Fcntl;	52	use Fcntl;
31	use YAML::Syck ();	53	use YAML ();
32	use IO::AIO 2.32 ();	54	use IO::AIO 2.51 ();
33	use Time::HiRes;	55	use Time::HiRes;
34	use Compress::LZF;	56	use Compress::LZF;
35	use Digest::MD5 ();	57	use Digest::MD5 ();
36		58
37	# configure various modules to our taste	59	# configure various modules to our taste
38	#	60	#
39	$Storable::canonical = 1; # reduce rsync transfers	61	$Storable::canonical = 1; # reduce rsync transfers
40	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	62	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	63	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43	$Event::Eval = 1; # no idea why this is required, but it is
44
45	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46	$YAML::Syck::ImplicitUnicode = 1;
47		64
48	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	65	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49		66
50	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	67	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51		68
…		…
70	our $TMPDIR = "$LOCALDIR/" . tmpdir;	87	our $TMPDIR = "$LOCALDIR/" . tmpdir;
71	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	88	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	89	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73	our $RANDOMDIR = "$LOCALDIR/random";	90	our $RANDOMDIR = "$LOCALDIR/random";
74	our $BDBDIR = "$LOCALDIR/db";	91	our $BDBDIR = "$LOCALDIR/db";
		92	our %RESOURCE;
75		93
76	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	94	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77	our $TICK_WATCHER;
78	our $AIO_POLL_WATCHER;	95	our $AIO_POLL_WATCHER;
79	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	96	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80	our $NEXT_TICK;	97	our $NEXT_TICK;
81	our $NOW;
82	our $USE_FSYNC = 1; # use fsync to write maps - default off	98	our $USE_FSYNC = 1; # use fsync to write maps - default off
83		99
84	our $BDB_POLL_WATCHER;	100	our $BDB_POLL_WATCHER;
		101	our $BDB_DEADLOCK_WATCHER;
		102	our $BDB_CHECKPOINT_WATCHER;
		103	our $BDB_TRICKLE_WATCHER;
85	our $DB_ENV;	104	our $DB_ENV;
86		105
87	our %CFG;	106	our %CFG;
88		107
89	our $UPTIME; $UPTIME ||= time;	108	our $UPTIME; $UPTIME ||= time;
90	our $RUNTIME;	109	our $RUNTIME;
		110	our $NOW;
91		111
92	our %PLAYER; # all users	112	our (%PLAYER, %PLAYER_LOADING); # all users
93	our %MAP; # all maps	113	our (%MAP, %MAP_LOADING ); # all maps
94	our $LINK_MAP; # the special {link} map, which is always available	114	our $LINK_MAP; # the special {link} map, which is always available
95		115
96	# used to convert map paths into valid unix filenames by replacing / by ∕	116	# used to convert map paths into valid unix filenames by replacing / by ∕
97	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	117	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98		118
99	our $LOAD; # a number between 0 (idle) and 1 (too many objects)	119	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100	our $LOADAVG; # same thing, but with alpha-smoothing	120	our $LOADAVG; # same thing, but with alpha-smoothing
		121	our $JITTER; # average jitter
101	our $tick_start; # for load detecting purposes	122	our $TICK_START; # for load detecting purposes
102		123
103	binmode STDOUT;	124	binmode STDOUT;
104	binmode STDERR;	125	binmode STDERR;
105		126
106	# read virtual server time, if available	127	# read virtual server time, if available
…		…
159		180
160	The raw value load value from the last tick.	181	The raw value load value from the last tick.
161		182
162	=item %cf::CFG	183	=item %cf::CFG
163		184
164	Configuration for the server, loaded from C</etc/crossfire/config>, or	185	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165	from wherever your confdir points to.	186	from wherever your confdir points to.
166		187
167	=item cf::wait_for_tick, cf::wait_for_tick_begin	188	=item cf::wait_for_tick, cf::wait_for_tick_begin
168		189
169	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	190	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
…		…
187	$msg .= "\n"	208	$msg .= "\n"
188	unless $msg =~ /\n$/;	209	unless $msg =~ /\n$/;
189		210
190	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	211	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191		212
192	utf8::encode $msg;
193	LOG llevError, $msg;	213	LOG llevError, $msg;
194	};	214	};
195	}	215	}
		216
		217	$Coro::State::DIEHOOK = sub {
		218	return unless $^S eq 0; # "eq", not "=="
		219
		220	if ($Coro::current == $Coro::main) {#d#
		221	warn "DIEHOOK called in main context, Coro bug?\n";#d#
		222	return;#d#
		223	}#d#
		224
		225	# kill coroutine otherwise
		226	warn Carp::longmess $_[0];
		227	Coro::terminate
		228	};
		229
		230	$SIG{__DIE__} = sub { }; #d#?
196		231
197	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	232	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	233	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	234	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	235	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
213	)) {	248	)) {
214	no strict 'refs';	249	no strict 'refs';
215	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	250	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216	}	251	}
217		252
218	$Event::DIED = sub {	253	$EV::DIED = sub {
219	warn "error in event callback: @_";	254	warn "error in event callback: @_";
220	};	255	};
221		256
222	#############################################################################	257	#############################################################################
223		258
…		…
246	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	281	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247	$d	282	$d
248	} || "[unable to dump $_[0]: '$@']";	283	} || "[unable to dump $_[0]: '$@']";
249	}	284	}
250		285
251	=item $ref = cf::from_json $json	286	=item $ref = cf::decode_json $json
252		287
253	Converts a JSON string into the corresponding perl data structure.	288	Converts a JSON string into the corresponding perl data structure.
254		289
255	=item $json = cf::to_json $ref	290	=item $json = cf::encode_json $ref
256		291
257	Converts a perl data structure into its JSON representation.	292	Converts a perl data structure into its JSON representation.
258		293
259	=cut	294	=cut
260		295
261	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	296	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262		297
263	sub to_json ($) { $json_coder->encode ($_[0]) }	298	sub encode_json($) { $json_coder->encode ($_[0]) }
264	sub from_json ($) { $json_coder->decode ($_[0]) }	299	sub decode_json($) { $json_coder->decode ($_[0]) }
265		300
266	=item cf::lock_wait $string	301	=item cf::lock_wait $string
267		302
268	Wait until the given lock is available. See cf::lock_acquire.	303	Wait until the given lock is available. See cf::lock_acquire.
269		304
…		…
285	Return true if the lock is currently active, i.e. somebody has locked it.	320	Return true if the lock is currently active, i.e. somebody has locked it.
286		321
287	=cut	322	=cut
288		323
289	our %LOCK;	324	our %LOCK;
		325	our %LOCKER;#d#
290		326
291	sub lock_wait($) {	327	sub lock_wait($) {
292	my ($key) = @_;	328	my ($key) = @_;
		329
		330	if ($LOCKER{$key} == $Coro::current) {#d#
		331	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		332	return;#d#
		333	}#d#
293		334
294	# wait for lock, if any	335	# wait for lock, if any
295	while ($LOCK{$key}) {	336	while ($LOCK{$key}) {
296	push @{ $LOCK{$key} }, $Coro::current;	337	push @{ $LOCK{$key} }, $Coro::current;
297	Coro::schedule;	338	Coro::schedule;
…		…
303		344
304	# wait, to be sure we are not locked	345	# wait, to be sure we are not locked
305	lock_wait $key;	346	lock_wait $key;
306		347
307	$LOCK{$key} = [];	348	$LOCK{$key} = [];
		349	$LOCKER{$key} = $Coro::current;#d#
308		350
309	Coro::guard {	351	Coro::guard {
		352	delete $LOCKER{$key};#d#
310	# wake up all waiters, to be on the safe side	353	# wake up all waiters, to be on the safe side
311	$_->ready for @{ delete $LOCK{$key} };	354	$_->ready for @{ delete $LOCK{$key} };
312	}	355	}
313	}	356	}
314		357
…		…
317		360
318	! ! $LOCK{$key}	361	! ! $LOCK{$key}
319	}	362	}
320		363
321	sub freeze_mainloop {	364	sub freeze_mainloop {
322	return unless $TICK_WATCHER->is_active;	365	tick_inhibit_inc;
323		366
324	my $guard = Coro::guard {	367	Coro::guard \&tick_inhibit_dec;
325	$TICK_WATCHER->start;	368	}
326	};	369
327	$TICK_WATCHER->stop;	370	=item cf::periodic $interval, $cb
328	$guard	371
		372	Like EV::periodic, but randomly selects a starting point so that the actions
		373	get spread over timer.
		374
		375	=cut
		376
		377	sub periodic($$) {
		378	my ($interval, $cb) = @_;
		379
		380	my $start = rand List::Util::min 180, $interval;
		381
		382	EV::periodic $start, $interval, 0, $cb
329	}	383	}
330		384
331	=item cf::get_slot $time[, $priority[, $name]]	385	=item cf::get_slot $time[, $priority[, $name]]
332		386
333	Allocate $time seconds of blocking CPU time at priority C<$priority>:	387	Allocate $time seconds of blocking CPU time at priority C<$priority>:
…		…
344	our @SLOT_QUEUE;	398	our @SLOT_QUEUE;
345	our $SLOT_QUEUE;	399	our $SLOT_QUEUE;
346		400
347	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	401	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348	$SLOT_QUEUE = Coro::async {	402	$SLOT_QUEUE = Coro::async {
		403	$Coro::current->desc ("timeslot manager");
		404
349	my $signal = new Coro::Signal;	405	my $signal = new Coro::Signal;
350		406
351	while () {	407	while () {
352	next_job:	408	next_job:
353	my $avail = cf::till_tick;	409	my $avail = cf::till_tick;
…		…
361	}	417	}
362	}	418	}
363	}	419	}
364		420
365	if (@SLOT_QUEUE) {	421	if (@SLOT_QUEUE) {
366	# we do not use wait_For_tick() as it returns immediately when tick is inactive	422	# we do not use wait_for_tick() as it returns immediately when tick is inactive
367	push @cf::WAIT_FOR_TICK, $signal;	423	push @cf::WAIT_FOR_TICK, $signal;
368	$signal->wait;	424	$signal->wait;
369	} else {	425	} else {
370	Coro::schedule;	426	Coro::schedule;
371	}	427	}
372	}	428	}
373	};	429	};
374		430
375	sub get_slot($;$$) {	431	sub get_slot($;$$) {
		432	return if tick_inhibit || $Coro::current == $Coro::main;
		433
376	my ($time, $pri, $name) = @_;	434	my ($time, $pri, $name) = @_;
377		435
378	$time = $TICK * .6 if $time > $TICK * .6;	436	$time = $TICK * .6 if $time > $TICK * .6;
379	my $sig = new Coro::Signal;	437	my $sig = new Coro::Signal;
380		438
…		…
394		452
395	BEGIN { *async = \&Coro::async_pool }	453	BEGIN { *async = \&Coro::async_pool }
396		454
397	=item cf::sync_job { BLOCK }	455	=item cf::sync_job { BLOCK }
398		456
399	The design of Crossfire TRT requires that the main coroutine ($Coro::main)	457	The design of Deliantra requires that the main coroutine ($Coro::main)
400	is always able to handle events or runnable, as Crossfire TRT is only	458	is always able to handle events or runnable, as Deliantra is only
401	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not	459	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402	acceptable.	460	acceptable.
403		461
404	If it must be done, put the blocking parts into C<sync_job>. This will run	462	If it must be done, put the blocking parts into C<sync_job>. This will run
405	the given BLOCK in another coroutine while waiting for the result. The	463	the given BLOCK in another coroutine while waiting for the result. The
…		…
410		468
411	sub sync_job(&) {	469	sub sync_job(&) {
412	my ($job) = @_;	470	my ($job) = @_;
413		471
414	if ($Coro::current == $Coro::main) {	472	if ($Coro::current == $Coro::main) {
415	my $time = Event::time;	473	my $time = EV::time;
416		474
417	# this is the main coro, too bad, we have to block	475	# this is the main coro, too bad, we have to block
418	# till the operation succeeds, freezing the server :/	476	# till the operation succeeds, freezing the server :/
419		477
420	# TODO: use suspend/resume instead	478	LOG llevError, Carp::longmess "sync job";#d#
421	# (but this is cancel-safe)	479
422	my $freeze_guard = freeze_mainloop;	480	my $freeze_guard = freeze_mainloop;
423		481
424	my $busy = 1;	482	my $busy = 1;
425	my @res;	483	my @res;
426		484
427	(async {	485	(async {
		486	$Coro::current->desc ("sync job coro");
428	@res = eval { $job->() };	487	@res = eval { $job->() };
429	warn $@ if $@;	488	warn $@ if $@;
430	undef $busy;	489	undef $busy;
431	})->prio (Coro::PRIO_MAX);	490	})->prio (Coro::PRIO_MAX);
432		491
433	while ($busy) {	492	while ($busy) {
434	Coro::cede or Event::one_event;	493	if (Coro::nready) {
		494	Coro::cede_notself;
		495	} else {
		496	EV::loop EV::LOOP_ONESHOT;
435	}	497	}
		498	}
436		499
437	$time = Event::time - $time;	500	my $time = EV::time - $time;
438		501
439	LOG llevError | logBacktrace, Carp::longmess "long sync job"
440	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441
442	$tick_start += $time; # do not account sync jobs to server load	502	$TICK_START += $time; # do not account sync jobs to server load
443		503
444	wantarray ? @res : $res[0]	504	wantarray ? @res : $res[0]
445	} else {	505	} else {
446	# we are in another coroutine, how wonderful, everything just works	506	# we are in another coroutine, how wonderful, everything just works
447		507
…		…
472	=item fork_call { }, $args	532	=item fork_call { }, $args
473		533
474	Executes the given code block with the given arguments in a seperate	534	Executes the given code block with the given arguments in a seperate
475	process, returning the results. Everything must be serialisable with	535	process, returning the results. Everything must be serialisable with
476	Coro::Storable. May, of course, block. Note that the executed sub may	536	Coro::Storable. May, of course, block. Note that the executed sub may
477	never block itself or use any form of Event handling.	537	never block itself or use any form of event handling.
478		538
479	=cut	539	=cut
480		540
481	sub fork_call(&@) {	541	sub fork_call(&@) {
482	my ($cb, @args) = @_;	542	my ($cb, @args) = @_;
483		543
484	# we seemingly have to make a local copy of the whole thing,	544	# we seemingly have to make a local copy of the whole thing,
485	# otherwise perl prematurely frees the stuff :/	545	# otherwise perl prematurely frees the stuff :/
486	# TODO: investigate and fix (liekly this will be rather laborious)	546	# TODO: investigate and fix (likely this will be rather laborious)
487		547
488	my @res = Coro::Util::fork_eval {	548	my @res = Coro::Util::fork_eval {
489	reset_signals;	549	reset_signals;
490	&$cb	550	&$cb
491	}, @args;	551	}, @args;
492		552
493	wantarray ? @res : $res[-1]	553	wantarray ? @res : $res[-1]
494	}	554	}
495		555
		556	=item $coin = coin_from_name $name
		557
		558	=cut
		559
		560	our %coin_alias = (
		561	"silver" => "silvercoin",
		562	"silvercoin" => "silvercoin",
		563	"silvercoins" => "silvercoin",
		564	"gold" => "goldcoin",
		565	"goldcoin" => "goldcoin",
		566	"goldcoins" => "goldcoin",
		567	"platinum" => "platinacoin",
		568	"platinumcoin" => "platinacoin",
		569	"platinumcoins" => "platinacoin",
		570	"platina" => "platinacoin",
		571	"platinacoin" => "platinacoin",
		572	"platinacoins" => "platinacoin",
		573	"royalty" => "royalty",
		574	"royalties" => "royalty",
		575	);
		576
		577	sub coin_from_name($) {
		578	$coin_alias{$_[0]}
		579	? cf::arch::find $coin_alias{$_[0]}
		580	: undef
		581	}
		582
496	=item $value = cf::db_get $family => $key	583	=item $value = cf::db_get $family => $key
497		584
498	Returns a single value from the environment database.	585	Returns a single value from the environment database.
499		586
500	=item cf::db_put $family => $key => $value	587	=item cf::db_put $family => $key => $value
501		588
502	Stores the given C<$value> in the family. It can currently store binary	589	Stores the given C<$value> in the family. It can currently store binary
503	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).	590	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504		591
		592	=item $db = cf::db_table "name"
		593
		594	Create and/or open a new database table. The string must not be "db" and must be unique
		595	within each server.
		596
505	=cut	597	=cut
		598
		599	sub db_table($) {
		600	my ($name) = @_;
		601	my $db = BDB::db_create $DB_ENV;
		602
		603	eval {
		604	$db->set_flags (BDB::CHKSUM);
		605
		606	utf8::encode $name;
		607	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		608	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		609	cf::cleanup "db_open(db): $!" if $!;
		610	};
		611	cf::cleanup "db_open(db): $@" if $@;
		612
		613	$db
		614	}
506		615
507	our $DB;	616	our $DB;
508		617
509	sub db_init {	618	sub db_init {
510	unless ($DB) {
511	$DB = BDB::db_create $DB_ENV;
512
513	cf::sync_job {	619	cf::sync_job {
514	eval {	620	$DB ||= db_table "db";
515	$DB->set_flags (BDB::CHKSUM);
516
517	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519	cf::cleanup "db_open(db): $!" if $!;
520	};
521	cf::cleanup "db_open(db): $@" if $@;
522	};
523	}	621	};
524	}	622	}
525		623
526	sub db_get($$) {	624	sub db_get($$) {
527	my $key = "$_[0]/$_[1]";	625	my $key = "$_[0]/$_[1]";
528		626
…		…
632	attach callbacks/event handlers (a collection of which is called an "attachment")	730	attach callbacks/event handlers (a collection of which is called an "attachment")
633	to it. All such attachable objects support the following methods.	731	to it. All such attachable objects support the following methods.
634		732
635	In the following description, CLASS can be any of C<global>, C<object>	733	In the following description, CLASS can be any of C<global>, C<object>
636	C<player>, C<client> or C<map> (i.e. the attachable objects in	734	C<player>, C<client> or C<map> (i.e. the attachable objects in
637	Crossfire TRT).	735	Deliantra).
638		736
639	=over 4	737	=over 4
640		738
641	=item $attachable->attach ($attachment, key => $value...)	739	=item $attachable->attach ($attachment, key => $value...)
642		740
…		…
924	}	1022	}
925		1023
926	0	1024	0
927	}	1025	}
928		1026
929	=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...)	1027	=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
930		1028
931	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)	1029	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
932		1030
933	Generate an object-specific event with the given arguments.	1031	Generate an object-specific event with the given arguments.
934		1032
…		…
940		1038
941	=cut	1039	=cut
942		1040
943	#############################################################################	1041	#############################################################################
944	# object support	1042	# object support
945	#
946		1043
		1044	sub _object_equal($$);
		1045	sub _object_equal($$) {
		1046	my ($a, $b) = @_;
		1047
		1048	return 0 unless (ref $a) eq (ref $b);
		1049
		1050	if ("HASH" eq ref $a) {
		1051	my @ka = keys %$a;
		1052	my @kb = keys %$b;
		1053
		1054	return 0 if @ka != @kb;
		1055
		1056	for (0 .. $#ka) {
		1057	return 0 unless $ka[$_] eq $kb[$_];
		1058	return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
		1059	}
		1060
		1061	} elsif ("ARRAY" eq ref $a) {
		1062
		1063	return 0 if @$a != @$b;
		1064
		1065	for (0 .. $#$a) {
		1066	return 0 unless _object_equal $a->[$_], $b->[$_];
		1067	}
		1068
		1069	} elsif ($a ne $b) {
		1070	return 0;
		1071	}
		1072
		1073	1
		1074	}
		1075
		1076	our $SLOW_MERGES;#d#
947	sub _can_merge {	1077	sub _can_merge {
948	my ($ob1, $ob2) = @_;	1078	my ($ob1, $ob2) = @_;
949		1079
950	local $Storable::canonical = 1;	1080	++$SLOW_MERGES;#d#
951	my $fob1 = Storable::freeze $ob1;
952	my $fob2 = Storable::freeze $ob2;
953		1081
954	$fob1 eq $fob2	1082	# we do the slow way here
		1083	return _object_equal $ob1, $ob2
955	}	1084	}
956		1085
957	sub reattach {	1086	sub reattach {
958	# basically do the same as instantiate, without calling instantiate	1087	# basically do the same as instantiate, without calling instantiate
959	my ($obj) = @_;	1088	my ($obj) = @_;
…		…
981	cf::attachable->attach (	1110	cf::attachable->attach (
982	prio => -1000000,	1111	prio => -1000000,
983	on_instantiate => sub {	1112	on_instantiate => sub {
984	my ($obj, $data) = @_;	1113	my ($obj, $data) = @_;
985		1114
986	$data = from_json $data;	1115	$data = decode_json $data;
987		1116
988	for (@$data) {	1117	for (@$data) {
989	my ($name, $args) = @$_;	1118	my ($name, $args) = @$_;
990		1119
991	$obj->attach ($name, %{$args || {} });	1120	$obj->attach ($name, %{$args || {} });
…		…
1007	sub object_freezer_save {	1136	sub object_freezer_save {
1008	my ($filename, $rdata, $objs) = @_;	1137	my ($filename, $rdata, $objs) = @_;
1009		1138
1010	sync_job {	1139	sync_job {
1011	if (length $$rdata) {	1140	if (length $$rdata) {
		1141	utf8::decode (my $decname = $filename);
1012	warn sprintf "saving %s (%d,%d)\n",	1142	warn sprintf "saving %s (%d,%d)\n",
1013	$filename, length $$rdata, scalar @$objs;	1143	$decname, length $$rdata, scalar @$objs;
1014		1144
1015	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1145	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1016	chmod SAVE_MODE, $fh;	1146	aio_chmod $fh, SAVE_MODE;
1017	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1147	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018	aio_fsync $fh if $cf::USE_FSYNC;	1148	aio_fsync $fh if $cf::USE_FSYNC;
1019	close $fh;	1149	aio_close $fh;
1020		1150
1021	if (@$objs) {	1151	if (@$objs) {
1022	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1152	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1023	chmod SAVE_MODE, $fh;	1153	aio_chmod $fh, SAVE_MODE;
1024	my $data = Storable::nfreeze { version => 1, objs => $objs };	1154	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1025	aio_write $fh, 0, (length $data), $data, 0;	1155	aio_write $fh, 0, (length $data), $data, 0;
1026	aio_fsync $fh if $cf::USE_FSYNC;	1156	aio_fsync $fh if $cf::USE_FSYNC;
1027	close $fh;	1157	aio_close $fh;
1028	aio_rename "$filename.pst~", "$filename.pst";	1158	aio_rename "$filename.pst~", "$filename.pst";
1029	}	1159	}
1030	} else {	1160	} else {
1031	aio_unlink "$filename.pst";	1161	aio_unlink "$filename.pst";
1032	}	1162	}
…		…
1037	}	1167	}
1038	} else {	1168	} else {
1039	aio_unlink $filename;	1169	aio_unlink $filename;
1040	aio_unlink "$filename.pst";	1170	aio_unlink "$filename.pst";
1041	}	1171	}
1042	}	1172	};
1043	}	1173	}
1044		1174
1045	sub object_freezer_as_string {	1175	sub object_freezer_as_string {
1046	my ($rdata, $objs) = @_;	1176	my ($rdata, $objs) = @_;
1047		1177
…		…
1059	or return;	1189	or return;
1060		1190
1061	unless (aio_stat "$filename.pst") {	1191	unless (aio_stat "$filename.pst") {
1062	(aio_load "$filename.pst", $av) >= 0	1192	(aio_load "$filename.pst", $av) >= 0
1063	or return;	1193	or return;
		1194
1064	$av = eval { (Storable::thaw $av)->{objs} };	1195	my $st = eval { Coro::Storable::thaw $av };
		1196	$av = $st->{objs};
1065	}	1197	}
1066		1198
		1199	utf8::decode (my $decname = $filename);
1067	warn sprintf "loading %s (%d)\n",	1200	warn sprintf "loading %s (%d,%d)\n",
1068	$filename, length $data, scalar @{$av || []};	1201	$decname, length $data, scalar @{$av || []};
		1202
1069	return ($data, $av);	1203	($data, $av)
1070	}	1204	}
1071		1205
1072	=head2 COMMAND CALLBACKS	1206	=head2 COMMAND CALLBACKS
1073		1207
1074	=over 4	1208	=over 4
…		…
1223	my $msg = $@ ? "$v->{path}: $@\n"	1357	my $msg = $@ ? "$v->{path}: $@\n"
1224	: "$v->{base}: extension inactive.\n";	1358	: "$v->{base}: extension inactive.\n";
1225		1359
1226	if (exists $v->{meta}{mandatory}) {	1360	if (exists $v->{meta}{mandatory}) {
1227	warn $msg;	1361	warn $msg;
1228	warn "mandatory extension failed to load, exiting.\n";	1362	cf::cleanup "mandatory extension failed to load, exiting.";
1229	exit 1;
1230	}	1363	}
1231		1364
1232	warn $msg;	1365	warn $msg;
1233	}	1366	}
1234		1367
…		…
1259	use Coro::AIO;	1392	use Coro::AIO;
1260		1393
1261	=head3 cf::player	1394	=head3 cf::player
1262		1395
1263	=over 4	1396	=over 4
		1397
		1398	=item cf::player::num_playing
		1399
		1400	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1401
		1402	=cut
		1403
		1404	sub num_playing {
		1405	scalar grep
		1406	$_->ob->map
		1407	&& !$_->hidden
		1408	&& !$_->ob->flag (cf::FLAG_WIZ),
		1409	cf::player::list
		1410	}
1264		1411
1265	=item cf::player::find $login	1412	=item cf::player::find $login
1266		1413
1267	Returns the given player object, loading it if necessary (might block).	1414	Returns the given player object, loading it if necessary (might block).
1268		1415
…		…
1304	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1451	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1452	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1453	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307	aio_unlink +(playerdir $login) . "/$login.pl";	1454	aio_unlink +(playerdir $login) . "/$login.pl";
1308		1455
1309	my $pl = load_pl path $login	1456	my $f = new_from_file cf::object::thawer path $login
1310	or return;	1457	or return;
		1458
		1459	my $pl = cf::player::load_pl $f
		1460	or return;
		1461
		1462	local $cf::PLAYER_LOADING{$login} = $pl;
		1463	$f->resolve_delayed_derefs;
1311	$cf::PLAYER{$login} = $pl	1464	$cf::PLAYER{$login} = $pl
1312	}	1465	}
1313	}	1466	}
1314	}	1467	}
1315		1468
…		…
1323		1476
1324	return if $pl->{deny_save};	1477	return if $pl->{deny_save};
1325		1478
1326	aio_mkdir playerdir $pl, 0770;	1479	aio_mkdir playerdir $pl, 0770;
1327	$pl->{last_save} = $cf::RUNTIME;	1480	$pl->{last_save} = $cf::RUNTIME;
		1481
		1482	cf::get_slot 0.01;
1328		1483
1329	$pl->save_pl ($path);	1484	$pl->save_pl ($path);
1330	cf::cede_to_tick;	1485	cf::cede_to_tick;
1331	}	1486	}
1332		1487
…		…
1413	or return [];	1568	or return [];
1414		1569
1415	my @logins;	1570	my @logins;
1416		1571
1417	for my $login (@$dirs) {	1572	for my $login (@$dirs) {
		1573	my $path = path $login;
		1574
		1575	# a .pst is a dead give-away for a valid player
		1576	# if no pst file found, open and chekc for blocked users
		1577	if (aio_stat "$path.pst") {
1418	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1578	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1419	aio_read $fh, 0, 512, my $buf, 0 or next;	1579	aio_read $fh, 0, 512, my $buf, 0 or next;
1420	$buf !~ /^password -------------$/m or next; # official not-valid tag	1580	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1581	}
1421		1582
1422	utf8::decode $login;	1583	utf8::decode $login;
1423	push @logins, $login;	1584	push @logins, $login;
1424	}	1585	}
1425		1586
…		…
1458		1619
1459	Expand crossfire pod fragments into protocol xml.	1620	Expand crossfire pod fragments into protocol xml.
1460		1621
1461	=cut	1622	=cut
1462		1623
		1624	use re 'eval';
		1625
		1626	my $group;
		1627	my $interior; $interior = qr{
		1628	# match a pod interior sequence sans C<< >>
		1629	(?:
		1630	\ (.*?)\ (?{ $group = $^N })
		1631	| < (??{$interior}) >
		1632	)
		1633	}x;
		1634
1463	sub expand_cfpod {	1635	sub expand_cfpod {
1464	((my $self), (local $_)) = @_;	1636	my ($self, $pod) = @_;
1465		1637
1466	# escape & and <	1638	my $xml;
1467	s/&/&amp;/g;
1468	s/(?<![BIUGH])</&lt;/g;
1469		1639
1470	# this is buggy, it needs to properly take care of nested <'s	1640	while () {
		1641	if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
		1642	$group = $1;
1471		1643
1472	1 while	1644	$group =~ s/&/&amp;/g;
1473	# replace B<>, I<>, U<> etc.	1645	$group =~ s/</&lt;/g;
1474	s/B<([^\>]*)>/<b>$1<\/b>/	1646
1475	|| s/I<([^\>]*)>/<i>$1<\/i>/	1647	$xml .= $group;
1476	|| s/U<([^\>]*)>/<u>$1<\/u>/	1648	} elsif ($pod =~ m%\G
1477	# replace G<male|female> tags	1649	([BCGHITU])
1478	|| s{G<([^>|]*)\|([^>]*)>}{	1650	<
1479	$self->gender ? $2 : $1	1651	(?:
1480	}ge	1652	([^<>]*) (?{ $group = $^N })
1481	# replace H<hint text>	1653	| < $interior >
1482	|| s{H<([^\>]*)>}	1654	)
		1655	>
		1656	%gcsx
1483	{	1657	) {
		1658	my ($code, $data) = ($1, $group);
		1659
		1660	if ($code eq "B") {
		1661	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
		1662	} elsif ($code eq "I") {
		1663	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
		1664	} elsif ($code eq "U") {
		1665	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
		1666	} elsif ($code eq "C") {
		1667	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
		1668	} elsif ($code eq "T") {
		1669	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
		1670	} elsif ($code eq "G") {
		1671	my ($male, $female) = split /\|/, $data;
		1672	$data = $self->gender ? $female : $male;
		1673	$xml .= expand_cfpod ($self, $data);
		1674	} elsif ($code eq "H") {
1484	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",	1675	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1485	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",	1676	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1486	"")	1677	"")
1487	[$self->{hintmode}]	1678	[$self->{hintmode}];
		1679	} else {
		1680	$xml .= "error processing '$code($data)' directive";
1488	}ge;	1681	}
		1682	} else {
		1683	if ($pod =~ /\G(.+)/) {
		1684	warn "parse error while expanding $pod (at $1)";
		1685	}
		1686	last;
		1687	}
		1688	}
1489		1689
		1690	for ($xml) {
1490	# create single paragraphs (very hackish)	1691	# create single paragraphs (very hackish)
1491	s/(?<=\S)\n(?=\w)/ /g;	1692	s/(?<=\S)\n(?=\w)/ /g;
1492		1693
1493	# compress some whitespace	1694	# compress some whitespace
1494	s/\s+\n/\n/g; # ws line-ends	1695	s/\s+\n/\n/g; # ws line-ends
1495	s/\n\n+/\n/g; # double lines	1696	s/\n\n+/\n/g; # double lines
1496	s/^\n+//; # beginning lines	1697	s/^\n+//; # beginning lines
1497	s/\n+$//; # ending lines	1698	s/\n+$//; # ending lines
		1699	}
1498		1700
1499	$_	1701	$xml
1500	}	1702	}
		1703
		1704	no re 'eval';
1501		1705
1502	sub hintmode {	1706	sub hintmode {
1503	$_[0]{hintmode} = $_[1] if @_ > 1;	1707	$_[0]{hintmode} = $_[1] if @_ > 1;
1504	$_[0]{hintmode}	1708	$_[0]{hintmode}
1505	}	1709	}
…		…
1577	our $MAX_RESET = 3600;	1781	our $MAX_RESET = 3600;
1578	our $DEFAULT_RESET = 3000;	1782	our $DEFAULT_RESET = 3000;
1579		1783
1580	sub generate_random_map {	1784	sub generate_random_map {
1581	my ($self, $rmp) = @_;	1785	my ($self, $rmp) = @_;
		1786
		1787	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
		1788
1582	# mit "rum" bekleckern, nicht	1789	# mit "rum" bekleckern, nicht
1583	$self->_create_random_map (	1790	$self->_create_random_map (
1584	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1791	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1585	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1792	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1586	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1793	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
…		…
1708		1915
1709	# the temporary/swap location	1916	# the temporary/swap location
1710	sub save_path {	1917	sub save_path {
1711	my ($self) = @_;	1918	my ($self) = @_;
1712		1919
1713	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1920	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1714	"$TMPDIR/$path.map"	1921	"$TMPDIR/$path.map"
1715	}	1922	}
1716		1923
1717	# the unique path, undef == no special unique path	1924	# the unique path, undef == no special unique path
1718	sub uniq_path {	1925	sub uniq_path {
1719	my ($self) = @_;	1926	my ($self) = @_;
1720		1927
1721	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1928	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1722	"$UNIQUEDIR/$path"	1929	"$UNIQUEDIR/$path"
1723	}	1930	}
1724		1931
1725	# and all this just because we cannot iterate over	1932	# and all this just because we cannot iterate over
1726	# all maps in C++...	1933	# all maps in C++...
…		…
1749		1956
1750	sub load_header_from($) {	1957	sub load_header_from($) {
1751	my ($self, $path) = @_;	1958	my ($self, $path) = @_;
1752		1959
1753	utf8::encode $path;	1960	utf8::encode $path;
1754	#aio_open $path, O_RDONLY, 0	1961	my $f = new_from_file cf::object::thawer $path
1755	# or return;
1756
1757	$self->_load_header ($path)
1758	or return;	1962	or return;
		1963
		1964	$self->_load_header ($f)
		1965	or return;
		1966
		1967	local $MAP_LOADING{$self->{path}} = $self;
		1968	$f->resolve_delayed_derefs;
1759		1969
1760	$self->{load_path} = $path;	1970	$self->{load_path} = $path;
1761		1971
1762	1	1972	1
1763	}	1973	}
…		…
1817	sub find {	2027	sub find {
1818	my ($path, $origin) = @_;	2028	my ($path, $origin) = @_;
1819		2029
1820	$path = normalise $path, $origin && $origin->path;	2030	$path = normalise $path, $origin && $origin->path;
1821		2031
		2032	cf::lock_wait "map_data:$path";#d#remove
1822	cf::lock_wait "map_find:$path";	2033	cf::lock_wait "map_find:$path";
1823		2034
1824	$cf::MAP{$path} || do {	2035	$cf::MAP{$path} || do {
1825	my $guard = cf::lock_acquire "map_find:$path";	2036	my $guard1 = cf::lock_acquire "map_find:$path";
		2037	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		2038
1826	my $map = new_from_path cf::map $path	2039	my $map = new_from_path cf::map $path
1827	or return;	2040	or return;
1828		2041
1829	$map->{last_save} = $cf::RUNTIME;	2042	$map->{last_save} = $cf::RUNTIME;
1830		2043
…		…
1832	or return;	2045	or return;
1833		2046
1834	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	2047	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835	# doing this can freeze the server in a sync job, obviously	2048	# doing this can freeze the server in a sync job, obviously
1836	#$cf::WAIT_FOR_TICK->wait;	2049	#$cf::WAIT_FOR_TICK->wait;
		2050	undef $guard1;
		2051	undef $guard2;
1837	$map->reset;	2052	$map->reset;
1838	undef $guard;
1839	return find $path;	2053	return find $path;
1840	}	2054	}
1841		2055
1842	$cf::MAP{$path} = $map	2056	$cf::MAP{$path} = $map
1843	}	2057	}
…		…
1852	local $self->{deny_reset} = 1; # loading can take a long time	2066	local $self->{deny_reset} = 1; # loading can take a long time
1853		2067
1854	my $path = $self->{path};	2068	my $path = $self->{path};
1855		2069
1856	{	2070	{
1857	my $guard1 = cf::lock_acquire "map_data:$path";	2071	my $guard = cf::lock_acquire "map_data:$path";
1858	my $guard2 = cf::lock_acquire "map_load:$path";
1859		2072
		2073	return unless $self->valid;
1860	return if $self->in_memory != cf::MAP_SWAPPED;	2074	return unless $self->in_memory == cf::MAP_SWAPPED;
1861		2075
1862	$self->in_memory (cf::MAP_LOADING);	2076	$self->in_memory (cf::MAP_LOADING);
1863		2077
1864	$self->alloc;	2078	$self->alloc;
1865		2079
1866	$self->pre_load;	2080	$self->pre_load;
1867	cf::cede_to_tick;	2081	cf::cede_to_tick;
1868		2082
		2083	my $f = new_from_file cf::object::thawer $self->{load_path};
		2084	$f->skip_block;
1869	$self->_load_objects ($self->{load_path}, 1)	2085	$self->_load_objects ($f)
1870	or return;	2086	or return;
1871		2087
1872	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2088	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1873	if delete $self->{load_original};	2089	if delete $self->{load_original};
1874		2090
1875	if (my $uniq = $self->uniq_path) {	2091	if (my $uniq = $self->uniq_path) {
1876	utf8::encode $uniq;	2092	utf8::encode $uniq;
1877	if (aio_open $uniq, O_RDONLY, 0) {	2093	unless (aio_stat $uniq) {
		2094	if (my $f = new_from_file cf::object::thawer $uniq) {
1878	$self->clear_unique_items;	2095	$self->clear_unique_items;
1879	$self->_load_objects ($uniq, 0);	2096	$self->_load_objects ($f);
		2097	$f->resolve_delayed_derefs;
		2098	}
1880	}	2099	}
1881	}	2100	}
		2101
		2102	$f->resolve_delayed_derefs;
1882		2103
1883	cf::cede_to_tick;	2104	cf::cede_to_tick;
1884	# now do the right thing for maps	2105	# now do the right thing for maps
1885	$self->link_multipart_objects;	2106	$self->link_multipart_objects;
1886	$self->difficulty ($self->estimate_difficulty)	2107	$self->difficulty ($self->estimate_difficulty)
…		…
1898	}	2119	}
1899		2120
1900	$self->{last_save} = $cf::RUNTIME;	2121	$self->{last_save} = $cf::RUNTIME;
1901	$self->last_access ($cf::RUNTIME);	2122	$self->last_access ($cf::RUNTIME);
1902		2123
1903	$self->in_memory (cf::MAP_IN_MEMORY);	2124	$self->in_memory (cf::MAP_ACTIVE);
1904	}	2125	}
1905		2126
1906	$self->post_load;	2127	$self->post_load;
1907	}	2128	}
1908		2129
…		…
1966	my ($path, $origin, $load) = @_;	2187	my ($path, $origin, $load) = @_;
1967		2188
1968	$path = normalise $path, $origin && $origin->{path};	2189	$path = normalise $path, $origin && $origin->{path};
1969		2190
1970	if (my $map = $cf::MAP{$path}) {	2191	if (my $map = $cf::MAP{$path}) {
1971	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;	2192	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1972	}	2193	}
1973		2194
1974	$MAP_PREFETCH{$path} |= $load;	2195	$MAP_PREFETCH{$path} |= $load;
1975		2196
1976	$MAP_PREFETCHER ||= cf::async {	2197	$MAP_PREFETCHER ||= cf::async {
		2198	$Coro::current->{desc} = "map prefetcher";
		2199
1977	while (%MAP_PREFETCH) {	2200	while (%MAP_PREFETCH) {
1978	while (my ($k, $v) = each %MAP_PREFETCH) {	2201	while (my ($k, $v) = each %MAP_PREFETCH) {
1979	if (my $map = find $k) {	2202	if (my $map = find $k) {
1980	$map->load if $v;	2203	$map->load if $v;
1981	}	2204	}
…		…
2007	return if $self->{deny_save};	2230	return if $self->{deny_save};
2008		2231
2009	local $self->{last_access} = $self->last_access;#d#	2232	local $self->{last_access} = $self->last_access;#d#
2010		2233
2011	cf::async {	2234	cf::async {
		2235	$Coro::current->{desc} = "map player save";
2012	$_->contr->save for $self->players;	2236	$_->contr->save for $self->players;
2013	};	2237	};
		2238
		2239	cf::get_slot 0.02;
2014		2240
2015	if ($uniq) {	2241	if ($uniq) {
2016	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2242	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2017	$self->_save_objects ($uniq, cf::IO_UNIQUES);	2243	$self->_save_objects ($uniq, cf::IO_UNIQUES);
2018	} else {	2244	} else {
…		…
2027	$self->save;	2253	$self->save;
2028		2254
2029	my $lock = cf::lock_acquire "map_data:$self->{path}";	2255	my $lock = cf::lock_acquire "map_data:$self->{path}";
2030		2256
2031	return if $self->players;	2257	return if $self->players;
2032	return if $self->in_memory != cf::MAP_IN_MEMORY;	2258	return if $self->in_memory != cf::MAP_ACTIVE;
2033	return if $self->{deny_save};	2259	return if $self->{deny_save};
2034		2260
		2261	$self->in_memory (cf::MAP_SWAPPED);
		2262
		2263	$self->deactivate;
		2264	$_->clear_links_to ($self) for values %cf::MAP;
2035	$self->clear;	2265	$self->clear;
2036	$self->in_memory (cf::MAP_SWAPPED);
2037	}	2266	}
2038		2267
2039	sub reset_at {	2268	sub reset_at {
2040	my ($self) = @_;	2269	my ($self) = @_;
2041		2270
…		…
2073	if $uniq;	2302	if $uniq;
2074	}	2303	}
2075		2304
2076	delete $cf::MAP{$self->path};	2305	delete $cf::MAP{$self->path};
2077		2306
		2307	$self->deactivate;
		2308	$_->clear_links_to ($self) for values %cf::MAP;
2078	$self->clear;	2309	$self->clear;
2079
2080	$_->clear_links_to ($self) for values %cf::MAP;
2081		2310
2082	$self->unlink_save;	2311	$self->unlink_save;
2083	$self->destroy;	2312	$self->destroy;
2084	}	2313	}
2085		2314
2086	my $nuke_counter = "aaaa";	2315	my $nuke_counter = "aaaa";
2087		2316
2088	sub nuke {	2317	sub nuke {
2089	my ($self) = @_;	2318	my ($self) = @_;
2090		2319
		2320	{
		2321	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2322
2091	delete $cf::MAP{$self->path};	2323	delete $cf::MAP{$self->path};
2092		2324
2093	$self->unlink_save;	2325	$self->unlink_save;
2094		2326
2095	bless $self, "cf::map";	2327	bless $self, "cf::map";
2096	delete $self->{deny_reset};	2328	delete $self->{deny_reset};
2097	$self->{deny_save} = 1;	2329	$self->{deny_save} = 1;
2098	$self->reset_timeout (1);	2330	$self->reset_timeout (1);
2099	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2331	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100		2332
2101	$cf::MAP{$self->path} = $self;	2333	$cf::MAP{$self->path} = $self;
		2334	}
2102		2335
2103	$self->reset; # polite request, might not happen	2336	$self->reset; # polite request, might not happen
2104	}	2337	}
2105		2338
2106	=item $maps = cf::map::tmp_maps	2339	=item $maps = cf::map::tmp_maps
…		…
2148		2381
2149	sub unique_maps() {	2382	sub unique_maps() {
2150	[	2383	[
2151	map {	2384	map {
2152	utf8::decode $_;	2385	utf8::decode $_;
2153	/\.map$/	2386	s/\.map$//; # TODO future compatibility hack
		2387	/\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
		2388	? ()
2154	? normalise $_	2389	: normalise $_
2155	: ()
2156	} @{ aio_readdir $UNIQUEDIR or [] }	2390	} @{ aio_readdir $UNIQUEDIR or [] }
2157	]	2391	]
2158	}	2392	}
2159		2393
2160	package cf;
2161
2162	=back	2394	=back
2163		2395
2164	=head3 cf::object	2396	=head3 cf::object
2165		2397
2166	=cut	2398	=cut
…		…
2169		2401
2170	=over 4	2402	=over 4
2171		2403
2172	=item $ob->inv_recursive	2404	=item $ob->inv_recursive
2173		2405
2174	Returns the inventory of the object _and_ their inventories, recursively.	2406	Returns the inventory of the object I<and> their inventories, recursively,
		2407	but I<not> the object itself.
2175		2408
2176	=cut	2409	=cut
2177		2410
2178	sub inv_recursive_;	2411	sub inv_recursive_;
2179	sub inv_recursive_ {	2412	sub inv_recursive_ {
…		…
2182		2415
2183	sub inv_recursive {	2416	sub inv_recursive {
2184	inv_recursive_ inv $_[0]	2417	inv_recursive_ inv $_[0]
2185	}	2418	}
2186		2419
		2420	=item $ref = $ob->ref
		2421
		2422	Creates and returns a persistent reference to an object that can be stored as a string.
		2423
		2424	=item $ob = cf::object::deref ($refstring)
		2425
		2426	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2427	even if the object actually exists. May block.
		2428
		2429	=cut
		2430
		2431	sub deref {
		2432	my ($ref) = @_;
		2433
		2434	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2435	my ($uuid, $name) = ($1, $2);
		2436	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2437	or return;
		2438	$pl->ob->uuid eq $uuid
		2439	or return;
		2440
		2441	$pl->ob
		2442	} else {
		2443	warn "$ref: cannot resolve object reference\n";
		2444	undef
		2445	}
		2446	}
		2447
2187	package cf;	2448	package cf;
2188		2449
2189	=back	2450	=back
2190		2451
2191	=head3 cf::object::player	2452	=head3 cf::object::player
…		…
2197	Sends a message to the player, as if the npc C<$npc> replied. C<$npc>	2458	Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2198	can be C<undef>. Does the right thing when the player is currently in a	2459	can be C<undef>. Does the right thing when the player is currently in a
2199	dialogue with the given NPC character.	2460	dialogue with the given NPC character.
2200		2461
2201	=cut	2462	=cut
		2463
		2464	our $SAY_CHANNEL = {
		2465	id => "say",
		2466	title => "Map",
		2467	reply => "say ",
		2468	tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
		2469	};
		2470
		2471	our $CHAT_CHANNEL = {
		2472	id => "chat",
		2473	title => "Chat",
		2474	reply => "chat ",
		2475	tooltip => "Player chat and shouts, global to the server.",
		2476	};
2202		2477
2203	# rough implementation of a future "reply" method that works	2478	# rough implementation of a future "reply" method that works
2204	# with dialog boxes.	2479	# with dialog boxes.
2205	#TODO: the first argument must go, split into a $npc->reply_to ( method	2480	#TODO: the first argument must go, split into a $npc->reply_to ( method
2206	sub cf::object::player::reply($$$;$) {	2481	sub cf::object::player::reply($$$;$) {
…		…
2218	my $dialog = $pl->{npc_dialog};	2493	my $dialog = $pl->{npc_dialog};
2219	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));	2494	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220		2495
2221	} else {	2496	} else {
2222	$msg = $npc->name . " says: $msg" if $npc;	2497	$msg = $npc->name . " says: $msg" if $npc;
2223	$self->message ($msg, $flags);	2498	$self->send_msg ($SAY_CHANNEL => $msg, $flags);
2224	}	2499	}
2225	}	2500	}
2226	}	2501	}
2227		2502
2228	=item $object->send_msg ($channel, $msg, $color, [extra...])	2503	=item $object->send_msg ($channel, $msg, $color, [extra...])
…		…
2349	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2624	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2350		2625
2351	$self->enter_link;	2626	$self->enter_link;
2352		2627
2353	(async {	2628	(async {
		2629	$Coro::current->{desc} = "player::goto $path $x $y";
		2630
		2631	# *tag paths override both path and x|y
		2632	if ($path =~ /^\*(.*)$/) {
		2633	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2634	my $ob = $obs[rand @obs];
		2635
		2636	# see if we actually can go there
		2637	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2638	$ob = $obs[rand @obs];
		2639	} else {
		2640	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2641	}
		2642	# else put us there anyways for now #d#
		2643
		2644	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2645	} else {
		2646	($path, $x, $y) = (undef, undef, undef);
		2647	}
		2648	}
		2649
2354	my $map = eval {	2650	my $map = eval {
2355	my $map = cf::map::find $path;	2651	my $map = defined $path ? cf::map::find $path : undef;
2356		2652
2357	if ($map) {	2653	if ($map) {
2358	$map = $map->customise_for ($self);	2654	$map = $map->customise_for ($self);
2359	$map = $check->($map) if $check && $map;	2655	$map = $check->($map) if $check && $map;
2360	} else {	2656	} else {
2361	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2657	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2362	}	2658	}
2363		2659
2364	$map	2660	$map
2365	};	2661	};
2366		2662
…		…
2419	$rmp->{origin_y} = $exit->y;	2715	$rmp->{origin_y} = $exit->y;
2420	}	2716	}
2421		2717
2422	$rmp->{random_seed} ||= $exit->random_seed;	2718	$rmp->{random_seed} ||= $exit->random_seed;
2423		2719
2424	my $data = cf::to_json $rmp;	2720	my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2425	my $md5 = Digest::MD5::md5_hex $data;	2721	my $md5 = Digest::MD5::md5_hex $data;
2426	my $meta = "$RANDOMDIR/$md5.meta";	2722	my $meta = "$RANDOMDIR/$md5.meta";
2427		2723
2428	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2724	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2429	aio_write $fh, 0, (length $data), $data, 0;	2725	aio_write $fh, 0, (length $data), $data, 0;
…		…
2456	# if exit is damned, update players death & WoR home-position	2752	# if exit is damned, update players death & WoR home-position
2457	$self->contr->savebed ($slaying, $hp, $sp)	2753	$self->contr->savebed ($slaying, $hp, $sp)
2458	if $exit->flag (FLAG_DAMNED);	2754	if $exit->flag (FLAG_DAMNED);
2459		2755
2460	(async {	2756	(async {
		2757	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2758
2461	$self->deactivate_recursive; # just to be sure	2759	$self->deactivate_recursive; # just to be sure
2462	unless (eval {	2760	unless (eval {
2463	$self->goto ($slaying, $hp, $sp);	2761	$self->goto ($slaying, $hp, $sp);
2464		2762
2465	1;	2763	1;
…		…
2500	the message, with C<log> being the default. If C<$color> is negative, suppress	2798	the message, with C<log> being the default. If C<$color> is negative, suppress
2501	the message unless the client supports the msg packet.	2799	the message unless the client supports the msg packet.
2502		2800
2503	=cut	2801	=cut
2504		2802
		2803	# non-persistent channels (usually the info channel)
		2804	our %CHANNEL = (
		2805	"c/identify" => {
		2806	id => "infobox",
		2807	title => "Identify",
		2808	reply => undef,
		2809	tooltip => "Items recently identified",
		2810	},
		2811	"c/examine" => {
		2812	id => "infobox",
		2813	title => "Examine",
		2814	reply => undef,
		2815	tooltip => "Signs and other items you examined",
		2816	},
		2817	"c/book" => {
		2818	id => "infobox",
		2819	title => "Book",
		2820	reply => undef,
		2821	tooltip => "The contents of a note or book",
		2822	},
		2823	"c/lookat" => {
		2824	id => "infobox",
		2825	title => "Look",
		2826	reply => undef,
		2827	tooltip => "What you saw there",
		2828	},
		2829	"c/who" => {
		2830	id => "infobox",
		2831	title => "Players",
		2832	reply => undef,
		2833	tooltip => "Shows players who are currently online",
		2834	},
		2835	"c/body" => {
		2836	id => "infobox",
		2837	title => "Body Parts",
		2838	reply => undef,
		2839	tooltip => "Shows which body parts you posess and are available",
		2840	},
		2841	"c/uptime" => {
		2842	id => "infobox",
		2843	title => "Uptime",
		2844	reply => undef,
		2845	tooltip => "How long the server has been running since last restart",
		2846	},
		2847	"c/mapinfo" => {
		2848	id => "infobox",
		2849	title => "Map Info",
		2850	reply => undef,
		2851	tooltip => "Information related to the maps",
		2852	},
		2853	"c/party" => {
		2854	id => "party",
		2855	title => "Party",
		2856	reply => "gsay ",
		2857	tooltip => "Messages and chat related to your party",
		2858	},
		2859	);
		2860
2505	sub cf::client::send_msg {	2861	sub cf::client::send_msg {
2506	my ($self, $channel, $msg, $color, @extra) = @_;	2862	my ($self, $channel, $msg, $color, @extra) = @_;
2507		2863
2508	$msg = $self->pl->expand_cfpod ($msg);	2864	$msg = $self->pl->expand_cfpod ($msg);
2509		2865
2510	$color &= cf::NDI_CLIENT_MASK; # just in case...	2866	$color &= cf::NDI_CLIENT_MASK; # just in case...
2511		2867
		2868	# check predefined channels, for the benefit of C
		2869	if ($CHANNEL{$channel}) {
		2870	$channel = $CHANNEL{$channel};
		2871
		2872	$self->ext_msg (channel_info => $channel)
		2873	if $self->can_msg;
		2874
		2875	$channel = $channel->{id};
		2876
2512	if (ref $channel) {	2877	} elsif (ref $channel) {
2513	# send meta info to client, if not yet sent	2878	# send meta info to client, if not yet sent
2514	unless (exists $self->{channel}{$channel->{id}}) {	2879	unless (exists $self->{channel}{$channel->{id}}) {
2515	$self->{channel}{$channel->{id}} = $channel;	2880	$self->{channel}{$channel->{id}} = $channel;
2516	$self->ext_msg (channel_info => $channel);	2881	$self->ext_msg (channel_info => $channel)
		2882	if $self->can_msg;
2517	}	2883	}
2518		2884
2519	$channel = $channel->{id};	2885	$channel = $channel->{id};
2520	}	2886	}
2521		2887
…		…
2733	=pod	3099	=pod
2734		3100
2735	The following functions and methods are available within a safe environment:	3101	The following functions and methods are available within a safe environment:
2736		3102
2737	cf::object	3103	cf::object
2738	contr pay_amount pay_player map x y force_find force_add	3104	contr pay_amount pay_player map x y force_find force_add destroy
2739	insert remove name archname title slaying race decrease_ob_nr	3105	insert remove name archname title slaying race decrease split
2740		3106
2741	cf::object::player	3107	cf::object::player
2742	player	3108	player
2743		3109
2744	cf::player	3110	cf::player
…		…
2750	=cut	3116	=cut
2751		3117
2752	for (	3118	for (
2753	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3119	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2754	insert remove inv name archname title slaying race	3120	insert remove inv name archname title slaying race
2755	decrease_ob_nr)],	3121	decrease split destroy)],
2756	["cf::object::player" => qw(player)],	3122	["cf::object::player" => qw(player)],
2757	["cf::player" => qw(peaceful)],	3123	["cf::player" => qw(peaceful)],
2758	["cf::map" => qw(trigger)],	3124	["cf::map" => qw(trigger)],
2759	) {	3125	) {
2760	no strict 'refs';	3126	no strict 'refs';
…		…
2836	# the server's init and main functions	3202	# the server's init and main functions
2837		3203
2838	sub load_facedata($) {	3204	sub load_facedata($) {
2839	my ($path) = @_;	3205	my ($path) = @_;
2840		3206
		3207	# HACK to clear player env face cache, we need some signal framework
		3208	# for this (global event?)
		3209	%ext::player_env::MUSIC_FACE_CACHE = ();
		3210
2841	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3211	my $enc = JSON::XS->new->utf8->canonical->relaxed;
2842		3212
2843	warn "loading facedata from $path\n";	3213	warn "loading facedata from $path\n";
2844		3214
2845	my $facedata;	3215	my $facedata;
…		…
2861	{	3231	{
2862	my $faces = $facedata->{faceinfo};	3232	my $faces = $facedata->{faceinfo};
2863		3233
2864	while (my ($face, $info) = each %$faces) {	3234	while (my ($face, $info) = each %$faces) {
2865	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3235	my $idx = (cf::face::find $face) || cf::face::alloc $face;
		3236
2866	cf::face::set_visibility $idx, $info->{visibility};	3237	cf::face::set_visibility $idx, $info->{visibility};
2867	cf::face::set_magicmap $idx, $info->{magicmap};	3238	cf::face::set_magicmap $idx, $info->{magicmap};
2868	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3239	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2869	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3240	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2870		3241
2871	cf::cede_to_tick;	3242	cf::cede_to_tick;
2872	}	3243	}
2873		3244
2874	while (my ($face, $info) = each %$faces) {	3245	while (my ($face, $info) = each %$faces) {
2875	next unless $info->{smooth};	3246	next unless $info->{smooth};
		3247
2876	my $idx = cf::face::find $face	3248	my $idx = cf::face::find $face
2877	or next;	3249	or next;
		3250
2878	if (my $smooth = cf::face::find $info->{smooth}) {	3251	if (my $smooth = cf::face::find $info->{smooth}) {
2879	cf::face::set_smooth $idx, $smooth;	3252	cf::face::set_smooth $idx, $smooth;
2880	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3253	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2881	} else {	3254	} else {
2882	warn "smooth face '$info->{smooth}' not found for face '$face'";	3255	warn "smooth face '$info->{smooth}' not found for face '$face'";
…		…
2900	{	3273	{
2901	# TODO: for gcfclient pleasure, we should give resources	3274	# TODO: for gcfclient pleasure, we should give resources
2902	# that gcfclient doesn't grok a >10000 face index.	3275	# that gcfclient doesn't grok a >10000 face index.
2903	my $res = $facedata->{resource};	3276	my $res = $facedata->{resource};
2904		3277
2905	my $soundconf = delete $res->{"res/sound.conf"};
2906
2907	while (my ($name, $info) = each %$res) {	3278	while (my ($name, $info) = each %$res) {
		3279	if (defined $info->{type}) {
2908	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3280	my $idx = (cf::face::find $name) || cf::face::alloc $name;
2909	my $data;	3281	my $data;
2910		3282
2911	if ($info->{type} & 1) {	3283	if ($info->{type} & 1) {
2912	# prepend meta info	3284	# prepend meta info
2913		3285
2914	my $meta = $enc->encode ({	3286	my $meta = $enc->encode ({
2915	name => $name,	3287	name => $name,
2916	%{ $info->{meta} || {} },	3288	%{ $info->{meta} || {} },
2917	});	3289	});
2918		3290
2919	$data = pack "(w/a*)*", $meta, $info->{data};	3291	$data = pack "(w/a*)*", $meta, $info->{data};
		3292	} else {
		3293	$data = $info->{data};
		3294	}
		3295
		3296	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3297	cf::face::set_type $idx, $info->{type};
2920	} else {	3298	} else {
2921	$data = $info->{data};	3299	$RESOURCE{$name} = $info;
2922	}	3300	}
2923		3301
2924	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2925	cf::face::set_type $idx, $info->{type};
2926
2927	cf::cede_to_tick;	3302	cf::cede_to_tick;
2928	}	3303	}
2929
2930	if ($soundconf) {
2931	$soundconf = $enc->decode (delete $soundconf->{data});
2932
2933	for (0 .. SOUND_CAST_SPELL_0 - 1) {
2934	my $sound = $soundconf->{compat}[$_]
2935	or next;
2936
2937	my $face = cf::face::find "sound/$sound->[1]";
2938	cf::sound::set $sound->[0] => $face;
2939	cf::sound::old_sound_index $_, $face; # gcfclient-compat
2940	}
2941
2942	while (my ($k, $v) = each %{$soundconf->{event}}) {
2943	my $face = cf::face::find "sound/$v";
2944	cf::sound::set $k => $face;
2945	}
2946	}
2947	}	3304	}
		3305
		3306	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2948		3307
2949	1	3308	1
2950	}	3309	}
		3310
		3311	cf::global->attach (on_resource_update => sub {
		3312	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
		3313	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
		3314
		3315	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3316	my $sound = $soundconf->{compat}[$_]
		3317	or next;
		3318
		3319	my $face = cf::face::find "sound/$sound->[1]";
		3320	cf::sound::set $sound->[0] => $face;
		3321	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3322	}
		3323
		3324	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3325	my $face = cf::face::find "sound/$v";
		3326	cf::sound::set $k => $face;
		3327	}
		3328	}
		3329	});
2951		3330
2952	register_exticmd fx_want => sub {	3331	register_exticmd fx_want => sub {
2953	my ($ns, $want) = @_;	3332	my ($ns, $want) = @_;
2954		3333
2955	while (my ($k, $v) = each %$want) {	3334	while (my ($k, $v) = each %$want) {
2956	$ns->fx_want ($k, $v);	3335	$ns->fx_want ($k, $v);
2957	}	3336	}
2958	};	3337	};
2959		3338
		3339	sub load_resource_file($) {
		3340	my $guard = lock_acquire "load_resource_file";
		3341
		3342	my $status = load_resource_file_ $_[0];
		3343	get_slot 0.1, 100;
		3344	cf::arch::commit_load;
		3345
		3346	$status
		3347	}
		3348
2960	sub reload_regions {	3349	sub reload_regions {
		3350	# HACK to clear player env face cache, we need some signal framework
		3351	# for this (global event?)
		3352	%ext::player_env::MUSIC_FACE_CACHE = ();
		3353
2961	load_resource_file "$MAPDIR/regions"	3354	load_resource_file "$MAPDIR/regions"
2962	or die "unable to load regions file\n";	3355	or die "unable to load regions file\n";
2963		3356
2964	for (cf::region::list) {	3357	for (cf::region::list) {
2965	$_->{match} = qr/$_->{match}/	3358	$_->{match} = qr/$_->{match}/
…		…
2973	}	3366	}
2974		3367
2975	sub reload_archetypes {	3368	sub reload_archetypes {
2976	load_resource_file "$DATADIR/archetypes"	3369	load_resource_file "$DATADIR/archetypes"
2977	or die "unable to load archetypes\n";	3370	or die "unable to load archetypes\n";
2978	#d# NEED to laod twice to resolve forward references
2979	# this really needs to be done in an extra post-pass
2980	# (which needs to be synchronous, so solve it differently)
2981	load_resource_file "$DATADIR/archetypes"
2982	or die "unable to load archetypes\n";
2983	}	3371	}
2984		3372
2985	sub reload_treasures {	3373	sub reload_treasures {
2986	load_resource_file "$DATADIR/treasures"	3374	load_resource_file "$DATADIR/treasures"
2987	or die "unable to load treasurelists\n";	3375	or die "unable to load treasurelists\n";
2988	}	3376	}
2989		3377
2990	sub reload_resources {	3378	sub reload_resources {
2991	warn "reloading resource files...\n";	3379	warn "reloading resource files...\n";
2992		3380
		3381	reload_facedata;
		3382	reload_archetypes;
2993	reload_regions;	3383	reload_regions;
2994	reload_facedata;
2995	#reload_archetypes;#d#
2996	reload_archetypes;
2997	reload_treasures;	3384	reload_treasures;
2998		3385
2999	warn "finished reloading resource files\n";	3386	warn "finished reloading resource files\n";
3000	}	3387	}
3001		3388
3002	sub init {	3389	sub init {
		3390	my $guard = freeze_mainloop;
		3391
3003	reload_resources;	3392	reload_resources;
3004	}	3393	}
3005		3394
3006	sub reload_config {	3395	sub reload_config {
3007	open my $fh, "<:utf8", "$CONFDIR/config"	3396	open my $fh, "<:utf8", "$CONFDIR/config"
3008	or return;	3397	or return;
3009		3398
3010	local $/;	3399	local $/;
3011	*CFG = YAML::Syck::Load <$fh>;	3400	*CFG = YAML::Load <$fh>;
3012		3401
3013	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3402	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3014		3403
3015	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3404	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3016	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3405	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3027	sub main {	3416	sub main {
3028	# we must not ever block the main coroutine	3417	# we must not ever block the main coroutine
3029	local $Coro::idle = sub {	3418	local $Coro::idle = sub {
3030	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3419	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3031	(async {	3420	(async {
3032	Event::one_event;	3421	$Coro::current->{desc} = "IDLE BUG HANDLER";
		3422	EV::loop EV::LOOP_ONESHOT;
3033	})->prio (Coro::PRIO_MAX);	3423	})->prio (Coro::PRIO_MAX);
3034	};	3424	};
3035		3425
		3426	{
		3427	my $guard = freeze_mainloop;
3036	reload_config;	3428	reload_config;
3037	db_init;	3429	db_init;
3038	load_extensions;	3430	load_extensions;
3039		3431
3040	$TICK_WATCHER->start;	3432	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
		3433	evthread_start IO::AIO::poll_fileno;
		3434	}
		3435
3041	Event::loop;	3436	EV::loop;
3042	}	3437	}
3043		3438
3044	#############################################################################	3439	#############################################################################
3045	# initialisation and cleanup	3440	# initialisation and cleanup
3046		3441
3047	# install some emergency cleanup handlers	3442	# install some emergency cleanup handlers
3048	BEGIN {	3443	BEGIN {
		3444	our %SIGWATCHER = ();
3049	for my $signal (qw(INT HUP TERM)) {	3445	for my $signal (qw(INT HUP TERM)) {
3050	Event->signal (	3446	$SIGWATCHER{$signal} = EV::signal $signal, sub {
3051	reentrant => 0,
3052	data => WF_AUTOCANCEL,
3053	signal => $signal,
3054	prio => 0,
3055	cb => sub {
3056	cf::cleanup "SIG$signal";	3447	cf::cleanup "SIG$signal";
3057	},
3058	);	3448	};
3059	}	3449	}
3060	}	3450	}
3061		3451
3062	sub write_runtime {	3452	sub write_runtime_sync {
3063	my $runtime = "$LOCALDIR/runtime";	3453	my $runtime = "$LOCALDIR/runtime";
3064		3454
3065	# first touch the runtime file to show we are still running:	3455	# first touch the runtime file to show we are still running:
3066	# the fsync below can take a very very long time.	3456	# the fsync below can take a very very long time.
3067		3457
…		…
3093	and return;	3483	and return;
3094		3484
3095	warn "runtime file written.\n";	3485	warn "runtime file written.\n";
3096		3486
3097	1	3487	1
		3488	}
		3489
		3490	our $uuid_lock;
		3491	our $uuid_skip;
		3492
		3493	sub write_uuid_sync($) {
		3494	$uuid_skip ||= $_[0];
		3495
		3496	return if $uuid_lock;
		3497	local $uuid_lock = 1;
		3498
		3499	my $uuid = "$LOCALDIR/uuid";
		3500
		3501	my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
		3502	or return;
		3503
		3504	my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
		3505	$uuid_skip = 0;
		3506
		3507	(aio_write $fh, 0, (length $value), $value, 0) <= 0
		3508	and return;
		3509
		3510	# always fsync - this file is important
		3511	aio_fsync $fh
		3512	and return;
		3513
		3514	close $fh
		3515	or return;
		3516
		3517	aio_rename "$uuid~", $uuid
		3518	and return;
		3519
		3520	warn "uuid file written ($value).\n";
		3521
		3522	1
		3523
		3524	}
		3525
		3526	sub write_uuid($$) {
		3527	my ($skip, $sync) = @_;
		3528
		3529	$sync ? write_uuid_sync $skip
		3530	: async { write_uuid_sync $skip };
3098	}	3531	}
3099		3532
3100	sub emergency_save() {	3533	sub emergency_save() {
3101	my $freeze_guard = cf::freeze_mainloop;	3534	my $freeze_guard = cf::freeze_mainloop;
3102		3535
…		…
3108	# and maps saved/destroyed asynchronously.	3541	# and maps saved/destroyed asynchronously.
3109	warn "begin emergency player save\n";	3542	warn "begin emergency player save\n";
3110	for my $login (keys %cf::PLAYER) {	3543	for my $login (keys %cf::PLAYER) {
3111	my $pl = $cf::PLAYER{$login} or next;	3544	my $pl = $cf::PLAYER{$login} or next;
3112	$pl->valid or next;	3545	$pl->valid or next;
		3546	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3113	$pl->save;	3547	$pl->save;
3114	}	3548	}
3115	warn "end emergency player save\n";	3549	warn "end emergency player save\n";
3116		3550
3117	warn "begin emergency map save\n";	3551	warn "begin emergency map save\n";
…		…
3123	warn "end emergency map save\n";	3557	warn "end emergency map save\n";
3124		3558
3125	warn "begin emergency database checkpoint\n";	3559	warn "begin emergency database checkpoint\n";
3126	BDB::db_env_txn_checkpoint $DB_ENV;	3560	BDB::db_env_txn_checkpoint $DB_ENV;
3127	warn "end emergency database checkpoint\n";	3561	warn "end emergency database checkpoint\n";
		3562
		3563	warn "begin write uuid\n";
		3564	write_uuid_sync 1;
		3565	warn "end write uuid\n";
3128	};	3566	};
3129		3567
3130	warn "leave emergency perl save\n";	3568	warn "leave emergency perl save\n";
3131	}	3569	}
3132		3570
…		…
3147	warn "reloading...";	3585	warn "reloading...";
3148		3586
3149	warn "entering sync_job";	3587	warn "entering sync_job";
3150		3588
3151	cf::sync_job {	3589	cf::sync_job {
3152	cf::write_runtime; # external watchdog should not bark	3590	cf::write_runtime_sync; # external watchdog should not bark
3153	cf::emergency_save;	3591	cf::emergency_save;
3154	cf::write_runtime; # external watchdog should not bark	3592	cf::write_runtime_sync; # external watchdog should not bark
3155		3593
3156	warn "syncing database to disk";	3594	warn "syncing database to disk";
3157	BDB::db_env_txn_checkpoint $DB_ENV;	3595	BDB::db_env_txn_checkpoint $DB_ENV;
3158		3596
3159	# if anything goes wrong in here, we should simply crash as we already saved	3597	# if anything goes wrong in here, we should simply crash as we already saved
3160
3161	warn "cancelling all WF_AUTOCANCEL watchers";
3162	for (Event::all_watchers) {
3163	$_->cancel if $_->data & WF_AUTOCANCEL;
3164	}
3165		3598
3166	warn "flushing outstanding aio requests";	3599	warn "flushing outstanding aio requests";
3167	for (;;) {	3600	for (;;) {
3168	BDB::flush;	3601	BDB::flush;
3169	IO::AIO::flush;	3602	IO::AIO::flush;
3170	Coro::cede;	3603	Coro::cede_notself;
3171	last unless IO::AIO::nreqs || BDB::nreqs;	3604	last unless IO::AIO::nreqs || BDB::nreqs;
3172	warn "iterate...";	3605	warn "iterate...";
3173	}	3606	}
3174		3607
3175	++$RELOAD;	3608	++$RELOAD;
…		…
3251	warn "leaving sync_job";	3684	warn "leaving sync_job";
3252		3685
3253	1	3686	1
3254	} or do {	3687	} or do {
3255	warn $@;	3688	warn $@;
3256	warn "error while reloading, exiting.";	3689	cf::cleanup "error while reloading, exiting.";
3257	exit 1;
3258	};	3690	};
3259		3691
3260	warn "reloaded";	3692	warn "reloaded";
3261	};	3693	};
3262		3694
…		…
3264		3696
3265	sub reload_perl() {	3697	sub reload_perl() {
3266	# doing reload synchronously and two reloads happen back-to-back,	3698	# doing reload synchronously and two reloads happen back-to-back,
3267	# coro crashes during coro_state_free->destroy here.	3699	# coro crashes during coro_state_free->destroy here.
3268		3700
3269	$RELOAD_WATCHER ||= Event->timer (	3701	$RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3270	reentrant => 0,
3271	after => 0,
3272	data => WF_AUTOCANCEL,
3273	cb => sub {
3274	do_reload_perl;	3702	do_reload_perl;
3275	undef $RELOAD_WATCHER;	3703	undef $RELOAD_WATCHER;
3276	},
3277	);	3704	};
3278	}	3705	}
3279		3706
3280	register_command "reload" => sub {	3707	register_command "reload" => sub {
3281	my ($who, $arg) = @_;	3708	my ($who, $arg) = @_;
3282		3709
3283	if ($who->flag (FLAG_WIZ)) {	3710	if ($who->flag (FLAG_WIZ)) {
3284	$who->message ("reloading server.");	3711	$who->message ("reloading server.");
		3712	async {
		3713	$Coro::current->{desc} = "perl_reload";
3285	async { reload_perl };	3714	reload_perl;
		3715	};
3286	}	3716	}
3287	};	3717	};
3288		3718
3289	unshift @INC, $LIBDIR;	3719	unshift @INC, $LIBDIR;
3290		3720
…		…
3292		3722
3293	our @WAIT_FOR_TICK;	3723	our @WAIT_FOR_TICK;
3294	our @WAIT_FOR_TICK_BEGIN;	3724	our @WAIT_FOR_TICK_BEGIN;
3295		3725
3296	sub wait_for_tick {	3726	sub wait_for_tick {
3297	return unless $TICK_WATCHER->is_active;
3298	return if $Coro::current == $Coro::main;	3727	return if tick_inhibit || $Coro::current == $Coro::main;
3299		3728
3300	my $signal = new Coro::Signal;	3729	my $signal = new Coro::Signal;
3301	push @WAIT_FOR_TICK, $signal;	3730	push @WAIT_FOR_TICK, $signal;
3302	$signal->wait;	3731	$signal->wait;
3303	}	3732	}
3304		3733
3305	sub wait_for_tick_begin {	3734	sub wait_for_tick_begin {
3306	return unless $TICK_WATCHER->is_active;
3307	return if $Coro::current == $Coro::main;	3735	return if tick_inhibit || $Coro::current == $Coro::main;
3308		3736
3309	my $signal = new Coro::Signal;	3737	my $signal = new Coro::Signal;
3310	push @WAIT_FOR_TICK_BEGIN, $signal;	3738	push @WAIT_FOR_TICK_BEGIN, $signal;
3311	$signal->wait;	3739	$signal->wait;
3312	}	3740	}
3313		3741
3314	my $min = 1e6;#d#	3742	sub tick {
3315	my $avg = 10;
3316	$TICK_WATCHER = Event->timer (
3317	reentrant => 0,
3318	parked => 1,
3319	prio => 0,
3320	at => $NEXT_TICK || $TICK,
3321	data => WF_AUTOCANCEL,
3322	cb => sub {
3323	if ($Coro::current != $Coro::main) {	3743	if ($Coro::current != $Coro::main) {
3324	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3744	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3325	unless ++$bug_warning > 10;	3745	unless ++$bug_warning > 10;
3326	return;	3746	return;
3327	}	3747	}
3328		3748
3329	$NOW = $tick_start = Event::time;
3330
3331	cf::server_tick; # one server iteration	3749	cf::server_tick; # one server iteration
3332		3750
3333	0 && sync_job {#d#	3751	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3334	for(1..10) {	3752	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3335	my $t = Event::time;	3753	Coro::async_pool {
3336	my $map = my $map = new_from_path cf::map "/tmp/x.map"	3754	$Coro::current->{desc} = "runtime saver";
3337	or die;	3755	write_runtime_sync
3338		3756	or warn "ERROR: unable to write runtime file: $!";
3339	$map->width (50);
3340	$map->height (50);
3341	$map->alloc;
3342	$map->_load_objects ("/tmp/x.map", 1);
3343	my $t = Event::time - $t;
3344
3345	#next unless $t < 0.0013;#d#
3346	if ($t < $min) {
3347	$min = $t;
3348	}
3349	$avg = $avg * 0.99 + $t * 0.01;
3350	}
3351	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3352	exit 0;
3353	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3354	};	3757	};
		3758	}
3355		3759
3356	$RUNTIME += $TICK;
3357	$NEXT_TICK += $TICK;
3358
3359	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3360	$NEXT_RUNTIME_WRITE = $NOW + 10;
3361	Coro::async_pool {
3362	write_runtime
3363	or warn "ERROR: unable to write runtime file: $!";
3364	};
3365	}
3366
3367	# my $AFTER = Event::time;
3368	# warn $AFTER - $NOW;#d#
3369
3370	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3760	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3371	$sig->send;	3761	$sig->send;
3372	}	3762	}
3373	while (my $sig = shift @WAIT_FOR_TICK) {	3763	while (my $sig = shift @WAIT_FOR_TICK) {
3374	$sig->send;	3764	$sig->send;
3375	}	3765	}
3376		3766
3377	$NOW = Event::time;	3767	$LOAD = ($NOW - $TICK_START) / $TICK;
3378
3379	# if we are delayed by four ticks or more, skip them all
3380	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3381
3382	$TICK_WATCHER->at ($NEXT_TICK);
3383	$TICK_WATCHER->start;
3384
3385	$LOAD = ($NOW - $tick_start) / $TICK;
3386	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3768	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3387		3769
3388	_post_tick;	3770	if (0) {
3389		3771	if ($NEXT_TICK) {
3390		3772	my $jitter = $TICK_START - $NEXT_TICK;
		3773	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
		3774	warn "jitter $JITTER\n";#d#
		3775	}
3391	},	3776	}
3392	);	3777	}
3393		3778
3394	{	3779	{
3395	BDB::max_poll_time $TICK * 0.1;	3780	# configure BDB
3396	$BDB_POLL_WATCHER = Event->io (	3781
3397	reentrant => 0,
3398	fd => BDB::poll_fileno,
3399	poll => 'r',
3400	prio => 0,
3401	data => WF_AUTOCANCEL,
3402	cb => \&BDB::poll_cb,
3403	);
3404	BDB::min_parallel 8;	3782	BDB::min_parallel 8;
3405		3783	BDB::max_poll_reqs $TICK * 0.1;
3406	BDB::set_sync_prepare {	3784	$Coro::BDB::WATCHER->priority (1);
3407	my $status;
3408	my $current = $Coro::current;
3409	(
3410	sub {
3411	$status = $!;
3412	$current->ready; undef $current;
3413	},
3414	sub {
3415	Coro::schedule while defined $current;
3416	$! = $status;
3417	},
3418	)
3419	};
3420		3785
3421	unless ($DB_ENV) {	3786	unless ($DB_ENV) {
3422	$DB_ENV = BDB::db_env_create;	3787	$DB_ENV = BDB::db_env_create;
		3788	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3789	| BDB::LOG_AUTOREMOVE, 1);
		3790	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3791	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3423		3792
3424	cf::sync_job {	3793	cf::sync_job {
3425	eval {	3794	eval {
3426	BDB::db_env_open	3795	BDB::db_env_open
3427	$DB_ENV,	3796	$DB_ENV,
…		…
3429	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3798	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3430	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3799	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3431	0666;	3800	0666;
3432		3801
3433	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3802	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3434
3435	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3436	$DB_ENV->set_lk_detect;
3437	};	3803	};
3438		3804
3439	cf::cleanup "db_env_open(db): $@" if $@;	3805	cf::cleanup "db_env_open(db): $@" if $@;
3440	};	3806	};
3441	}	3807	}
		3808
		3809	$BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
		3810	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3811	};
		3812	$BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
		3813	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3814	};
		3815	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
		3816	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3817	};
3442	}	3818	}
3443		3819
3444	{	3820	{
		3821	# configure IO::AIO
		3822
3445	IO::AIO::min_parallel 8;	3823	IO::AIO::min_parallel 8;
3446
3447	undef $Coro::AIO::WATCHER;
3448	IO::AIO::max_poll_time $TICK * 0.1;	3824	IO::AIO::max_poll_time $TICK * 0.1;
3449	$AIO_POLL_WATCHER = Event->io (	3825	$Coro::AIO::WATCHER->priority (1);
3450	reentrant => 0,
3451	data => WF_AUTOCANCEL,
3452	fd => IO::AIO::poll_fileno,
3453	poll => 'r',
3454	prio => 6,
3455	cb => \&IO::AIO::poll_cb,
3456	);
3457	}	3826	}
3458		3827
3459	my $_log_backtrace;	3828	my $_log_backtrace;
3460		3829
3461	sub _log_backtrace {	3830	sub _log_backtrace {
…		…
3465		3834
3466	# limit the # of concurrent backtraces	3835	# limit the # of concurrent backtraces
3467	if ($_log_backtrace < 2) {	3836	if ($_log_backtrace < 2) {
3468	++$_log_backtrace;	3837	++$_log_backtrace;
3469	async {	3838	async {
		3839	$Coro::current->{desc} = "abt $msg";
		3840
3470	my @bt = fork_call {	3841	my @bt = fork_call {
3471	@addr = map { sprintf "%x", $_ } @addr;	3842	@addr = map { sprintf "%x", $_ } @addr;
3472	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3843	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3473	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"	3844	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3474	or die "addr2line: $!";	3845	or die "addr2line: $!";

Diff Legend

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