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.337 by root, Tue Aug 21 00:54:01 2007 UTC vs.
Revision 1.417 by root, Fri Apr 11 14:09:57 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 1.4 ();	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
…		…
272	Wait until the given lock is available and then acquires it and returns	307	Wait until the given lock is available and then acquires it and returns
273	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	308	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
274	for example when the coroutine gets canceled), the lock is automatically	309	for example when the coroutine gets canceled), the lock is automatically
275	returned.	310	returned.
276		311
		312	Locks are *not* recursive, locking from the same coro twice results in a
		313	deadlocked coro.
		314
277	Lock names should begin with a unique identifier (for example, cf::map::find	315	Lock names should begin with a unique identifier (for example, cf::map::find
278	uses map_find and cf::map::load uses map_load).	316	uses map_find and cf::map::load uses map_load).
279		317
280	=item $locked = cf::lock_active $string	318	=item $locked = cf::lock_active $string
281		319
282	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.
283		321
284	=cut	322	=cut
285		323
286	our %LOCK;	324	our %LOCK;
		325	our %LOCKER;#d#
287		326
288	sub lock_wait($) {	327	sub lock_wait($) {
289	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#
290		334
291	# wait for lock, if any	335	# wait for lock, if any
292	while ($LOCK{$key}) {	336	while ($LOCK{$key}) {
293	push @{ $LOCK{$key} }, $Coro::current;	337	push @{ $LOCK{$key} }, $Coro::current;
294	Coro::schedule;	338	Coro::schedule;
…		…
300		344
301	# wait, to be sure we are not locked	345	# wait, to be sure we are not locked
302	lock_wait $key;	346	lock_wait $key;
303		347
304	$LOCK{$key} = [];	348	$LOCK{$key} = [];
		349	$LOCKER{$key} = $Coro::current;#d#
305		350
306	Coro::guard {	351	Coro::guard {
		352	delete $LOCKER{$key};#d#
307	# wake up all waiters, to be on the safe side	353	# wake up all waiters, to be on the safe side
308	$_->ready for @{ delete $LOCK{$key} };	354	$_->ready for @{ delete $LOCK{$key} };
309	}	355	}
310	}	356	}
311		357
…		…
314		360
315	! ! $LOCK{$key}	361	! ! $LOCK{$key}
316	}	362	}
317		363
318	sub freeze_mainloop {	364	sub freeze_mainloop {
319	return unless $TICK_WATCHER->is_active;	365	tick_inhibit_inc;
320		366
321	my $guard = Coro::guard {	367	Coro::guard \&tick_inhibit_dec;
322	$TICK_WATCHER->start;	368	}
323	};	369
324	$TICK_WATCHER->stop;	370	=item cf::periodic $interval, $cb
325	$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
326	}	383	}
327		384
328	=item cf::get_slot $time[, $priority[, $name]]	385	=item cf::get_slot $time[, $priority[, $name]]
329		386
330	Allocate $time seconds of blocking CPU time at priority C<$priority>:	387	Allocate $time seconds of blocking CPU time at priority C<$priority>:
…		…
341	our @SLOT_QUEUE;	398	our @SLOT_QUEUE;
342	our $SLOT_QUEUE;	399	our $SLOT_QUEUE;
343		400
344	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	401	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345	$SLOT_QUEUE = Coro::async {	402	$SLOT_QUEUE = Coro::async {
		403	$Coro::current->desc ("timeslot manager");
		404
346	my $signal = new Coro::Signal;	405	my $signal = new Coro::Signal;
347		406
348	while () {	407	while () {
349	next_job:	408	next_job:
350	my $avail = cf::till_tick;	409	my $avail = cf::till_tick;
…		…
358	}	417	}
359	}	418	}
360	}	419	}
361		420
362	if (@SLOT_QUEUE) {	421	if (@SLOT_QUEUE) {
363	# 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
364	push @cf::WAIT_FOR_TICK, $signal;	423	push @cf::WAIT_FOR_TICK, $signal;
365	$signal->wait;	424	$signal->wait;
366	} else {	425	} else {
367	Coro::schedule;	426	Coro::schedule;
368	}	427	}
…		…
391		450
392	BEGIN { *async = \&Coro::async_pool }	451	BEGIN { *async = \&Coro::async_pool }
393		452
394	=item cf::sync_job { BLOCK }	453	=item cf::sync_job { BLOCK }
395		454
396	The design of Crossfire TRT requires that the main coroutine ($Coro::main)	455	The design of Deliantra requires that the main coroutine ($Coro::main)
397	is always able to handle events or runnable, as Crossfire TRT is only	456	is always able to handle events or runnable, as Deliantra is only
398	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not	457	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
399	acceptable.	458	acceptable.
400		459
401	If it must be done, put the blocking parts into C<sync_job>. This will run	460	If it must be done, put the blocking parts into C<sync_job>. This will run
402	the given BLOCK in another coroutine while waiting for the result. The	461	the given BLOCK in another coroutine while waiting for the result. The
…		…
407		466
408	sub sync_job(&) {	467	sub sync_job(&) {
409	my ($job) = @_;	468	my ($job) = @_;
410		469
411	if ($Coro::current == $Coro::main) {	470	if ($Coro::current == $Coro::main) {
412	my $time = Event::time;	471	my $time = EV::time;
413		472
414	# this is the main coro, too bad, we have to block	473	# this is the main coro, too bad, we have to block
415	# till the operation succeeds, freezing the server :/	474	# till the operation succeeds, freezing the server :/
416		475
417	# TODO: use suspend/resume instead	476	LOG llevError, Carp::longmess "sync job";#d#
418	# (but this is cancel-safe)	477
419	my $freeze_guard = freeze_mainloop;	478	my $freeze_guard = freeze_mainloop;
420		479
421	my $busy = 1;	480	my $busy = 1;
422	my @res;	481	my @res;
423		482
424	(async {	483	(async {
		484	$Coro::current->desc ("sync job coro");
425	@res = eval { $job->() };	485	@res = eval { $job->() };
426	warn $@ if $@;	486	warn $@ if $@;
427	undef $busy;	487	undef $busy;
428	})->prio (Coro::PRIO_MAX);	488	})->prio (Coro::PRIO_MAX);
429		489
430	while ($busy) {	490	while ($busy) {
431	Coro::cede or Event::one_event;	491	if (Coro::nready) {
		492	Coro::cede_notself;
		493	} else {
		494	EV::loop EV::LOOP_ONESHOT;
432	}	495	}
		496	}
433		497
434	$time = Event::time - $time;	498	my $time = EV::time - $time;
435		499
436	LOG llevError | logBacktrace, Carp::longmess "long sync job"
437	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
438
439	$tick_start += $time; # do not account sync jobs to server load	500	$TICK_START += $time; # do not account sync jobs to server load
440		501
441	wantarray ? @res : $res[0]	502	wantarray ? @res : $res[0]
442	} else {	503	} else {
443	# we are in another coroutine, how wonderful, everything just works	504	# we are in another coroutine, how wonderful, everything just works
444		505
…		…
469	=item fork_call { }, $args	530	=item fork_call { }, $args
470		531
471	Executes the given code block with the given arguments in a seperate	532	Executes the given code block with the given arguments in a seperate
472	process, returning the results. Everything must be serialisable with	533	process, returning the results. Everything must be serialisable with
473	Coro::Storable. May, of course, block. Note that the executed sub may	534	Coro::Storable. May, of course, block. Note that the executed sub may
474	never block itself or use any form of Event handling.	535	never block itself or use any form of event handling.
475		536
476	=cut	537	=cut
477		538
478	sub fork_call(&@) {	539	sub fork_call(&@) {
479	my ($cb, @args) = @_;	540	my ($cb, @args) = @_;
480		541
481	# we seemingly have to make a local copy of the whole thing,	542	# we seemingly have to make a local copy of the whole thing,
482	# otherwise perl prematurely frees the stuff :/	543	# otherwise perl prematurely frees the stuff :/
483	# TODO: investigate and fix (liekly this will be rather laborious)	544	# TODO: investigate and fix (likely this will be rather laborious)
484		545
485	my @res = Coro::Util::fork_eval {	546	my @res = Coro::Util::fork_eval {
486	reset_signals;	547	reset_signals;
487	&$cb	548	&$cb
488	}, @args;	549	}, @args;
489		550
490	wantarray ? @res : $res[-1]	551	wantarray ? @res : $res[-1]
491	}	552	}
492		553
		554	=item $coin = coin_from_name $name
		555
		556	=cut
		557
		558	our %coin_alias = (
		559	"silver" => "silvercoin",
		560	"silvercoin" => "silvercoin",
		561	"silvercoins" => "silvercoin",
		562	"gold" => "goldcoin",
		563	"goldcoin" => "goldcoin",
		564	"goldcoins" => "goldcoin",
		565	"platinum" => "platinacoin",
		566	"platinumcoin" => "platinacoin",
		567	"platinumcoins" => "platinacoin",
		568	"platina" => "platinacoin",
		569	"platinacoin" => "platinacoin",
		570	"platinacoins" => "platinacoin",
		571	"royalty" => "royalty",
		572	"royalties" => "royalty",
		573	);
		574
		575	sub coin_from_name($) {
		576	$coin_alias{$_[0]}
		577	? cf::arch::find $coin_alias{$_[0]}
		578	: undef
		579	}
		580
493	=item $value = cf::db_get $family => $key	581	=item $value = cf::db_get $family => $key
494		582
495	Returns a single value from the environment database.	583	Returns a single value from the environment database.
496		584
497	=item cf::db_put $family => $key => $value	585	=item cf::db_put $family => $key => $value
498		586
499	Stores the given C<$value> in the family. It can currently store binary	587	Stores the given C<$value> in the family. It can currently store binary
500	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).	588	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501		589
		590	=item $db = cf::db_table "name"
		591
		592	Create and/or open a new database table. The string must not be "db" and must be unique
		593	within each server.
		594
502	=cut	595	=cut
		596
		597	sub db_table($) {
		598	my ($name) = @_;
		599	my $db = BDB::db_create $DB_ENV;
		600
		601	eval {
		602	$db->set_flags (BDB::CHKSUM);
		603
		604	utf8::encode $name;
		605	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		606	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		607	cf::cleanup "db_open(db): $!" if $!;
		608	};
		609	cf::cleanup "db_open(db): $@" if $@;
		610
		611	$db
		612	}
503		613
504	our $DB;	614	our $DB;
505		615
506	sub db_init {	616	sub db_init {
507	unless ($DB) {
508	$DB = BDB::db_create $DB_ENV;
509
510	cf::sync_job {	617	cf::sync_job {
511	eval {	618	$DB ||= db_table "db";
512	$DB->set_flags (BDB::CHKSUM);
513
514	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516	cf::cleanup "db_open(db): $!" if $!;
517	};
518	cf::cleanup "db_open(db): $@" if $@;
519	};
520	}	619	};
521	}	620	}
522		621
523	sub db_get($$) {	622	sub db_get($$) {
524	my $key = "$_[0]/$_[1]";	623	my $key = "$_[0]/$_[1]";
525		624
…		…
575	if (1) {	674	if (1) {
576	$md5 =	675	$md5 =
577	join "\x00",	676	join "\x00",
578	$processversion,	677	$processversion,
579	map {	678	map {
580	Coro::cede;	679	cf::cede_to_tick;
581	($src->[$_], Digest::MD5::md5_hex $data[$_])	680	($src->[$_], Digest::MD5::md5_hex $data[$_])
582	} 0.. $#$src;	681	} 0.. $#$src;
583		682
584		683
585	my $dbmd5 = db_get cache => "$id/md5";	684	my $dbmd5 = db_get cache => "$id/md5";
…		…
629	attach callbacks/event handlers (a collection of which is called an "attachment")	728	attach callbacks/event handlers (a collection of which is called an "attachment")
630	to it. All such attachable objects support the following methods.	729	to it. All such attachable objects support the following methods.
631		730
632	In the following description, CLASS can be any of C<global>, C<object>	731	In the following description, CLASS can be any of C<global>, C<object>
633	C<player>, C<client> or C<map> (i.e. the attachable objects in	732	C<player>, C<client> or C<map> (i.e. the attachable objects in
634	Crossfire TRT).	733	Deliantra).
635		734
636	=over 4	735	=over 4
637		736
638	=item $attachable->attach ($attachment, key => $value...)	737	=item $attachable->attach ($attachment, key => $value...)
639		738
…		…
921	}	1020	}
922		1021
923	0	1022	0
924	}	1023	}
925		1024
926	=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...)	1025	=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
927		1026
928	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)	1027	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
929		1028
930	Generate an object-specific event with the given arguments.	1029	Generate an object-specific event with the given arguments.
931		1030
…		…
937		1036
938	=cut	1037	=cut
939		1038
940	#############################################################################	1039	#############################################################################
941	# object support	1040	# object support
942	#
943		1041
		1042	sub _object_equal($$);
		1043	sub _object_equal($$) {
		1044	my ($a, $b) = @_;
		1045
		1046	return 0 unless (ref $a) eq (ref $b);
		1047
		1048	if ("HASH" eq ref $a) {
		1049	my @ka = keys %$a;
		1050	my @kb = keys %$b;
		1051
		1052	return 0 if @ka != @kb;
		1053
		1054	for (0 .. $#ka) {
		1055	return 0 unless $ka[$_] eq $kb[$_];
		1056	return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
		1057	}
		1058
		1059	} elsif ("ARRAY" eq ref $a) {
		1060
		1061	return 0 if @$a != @$b;
		1062
		1063	for (0 .. $#$a) {
		1064	return 0 unless _object_equal $a->[$_], $b->[$_];
		1065	}
		1066
		1067	} elsif ($a ne $b) {
		1068	return 0;
		1069	}
		1070
		1071	1
		1072	}
		1073
		1074	our $SLOW_MERGES;#d#
944	sub _can_merge {	1075	sub _can_merge {
945	my ($ob1, $ob2) = @_;	1076	my ($ob1, $ob2) = @_;
946		1077
947	local $Storable::canonical = 1;	1078	++$SLOW_MERGES;#d#
948	my $fob1 = Storable::freeze $ob1;
949	my $fob2 = Storable::freeze $ob2;
950		1079
951	$fob1 eq $fob2	1080	# we do the slow way here
		1081	return _object_equal $ob1, $ob2
952	}	1082	}
953		1083
954	sub reattach {	1084	sub reattach {
955	# basically do the same as instantiate, without calling instantiate	1085	# basically do the same as instantiate, without calling instantiate
956	my ($obj) = @_;	1086	my ($obj) = @_;
…		…
978	cf::attachable->attach (	1108	cf::attachable->attach (
979	prio => -1000000,	1109	prio => -1000000,
980	on_instantiate => sub {	1110	on_instantiate => sub {
981	my ($obj, $data) = @_;	1111	my ($obj, $data) = @_;
982		1112
983	$data = from_json $data;	1113	$data = decode_json $data;
984		1114
985	for (@$data) {	1115	for (@$data) {
986	my ($name, $args) = @$_;	1116	my ($name, $args) = @$_;
987		1117
988	$obj->attach ($name, %{$args || {} });	1118	$obj->attach ($name, %{$args || {} });
…		…
1004	sub object_freezer_save {	1134	sub object_freezer_save {
1005	my ($filename, $rdata, $objs) = @_;	1135	my ($filename, $rdata, $objs) = @_;
1006		1136
1007	sync_job {	1137	sync_job {
1008	if (length $$rdata) {	1138	if (length $$rdata) {
		1139	utf8::decode (my $decname = $filename);
1009	warn sprintf "saving %s (%d,%d)\n",	1140	warn sprintf "saving %s (%d,%d)\n",
1010	$filename, length $$rdata, scalar @$objs;	1141	$decname, length $$rdata, scalar @$objs;
1011		1142
1012	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1143	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013	chmod SAVE_MODE, $fh;	1144	chmod SAVE_MODE, $fh;
1014	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1145	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015	aio_fsync $fh if $cf::USE_FSYNC;	1146	aio_fsync $fh if $cf::USE_FSYNC;
1016	close $fh;	1147	close $fh;
1017		1148
1018	if (@$objs) {	1149	if (@$objs) {
1019	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1150	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1020	chmod SAVE_MODE, $fh;	1151	chmod SAVE_MODE, $fh;
1021	my $data = Storable::nfreeze { version => 1, objs => $objs };	1152	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1022	aio_write $fh, 0, (length $data), $data, 0;	1153	aio_write $fh, 0, (length $data), $data, 0;
1023	aio_fsync $fh if $cf::USE_FSYNC;	1154	aio_fsync $fh if $cf::USE_FSYNC;
1024	close $fh;	1155	close $fh;
1025	aio_rename "$filename.pst~", "$filename.pst";	1156	aio_rename "$filename.pst~", "$filename.pst";
1026	}	1157	}
…		…
1034	}	1165	}
1035	} else {	1166	} else {
1036	aio_unlink $filename;	1167	aio_unlink $filename;
1037	aio_unlink "$filename.pst";	1168	aio_unlink "$filename.pst";
1038	}	1169	}
1039	}	1170	};
1040	}	1171	}
1041		1172
1042	sub object_freezer_as_string {	1173	sub object_freezer_as_string {
1043	my ($rdata, $objs) = @_;	1174	my ($rdata, $objs) = @_;
1044		1175
…		…
1056	or return;	1187	or return;
1057		1188
1058	unless (aio_stat "$filename.pst") {	1189	unless (aio_stat "$filename.pst") {
1059	(aio_load "$filename.pst", $av) >= 0	1190	(aio_load "$filename.pst", $av) >= 0
1060	or return;	1191	or return;
		1192
1061	$av = eval { (Storable::thaw $av)->{objs} };	1193	my $st = eval { Coro::Storable::thaw $av };
		1194	$av = $st->{objs};
1062	}	1195	}
1063		1196
		1197	utf8::decode (my $decname = $filename);
1064	warn sprintf "loading %s (%d)\n",	1198	warn sprintf "loading %s (%d,%d)\n",
1065	$filename, length $data, scalar @{$av || []};	1199	$decname, length $data, scalar @{$av || []};
		1200
1066	return ($data, $av);	1201	($data, $av)
1067	}	1202	}
1068		1203
1069	=head2 COMMAND CALLBACKS	1204	=head2 COMMAND CALLBACKS
1070		1205
1071	=over 4	1206	=over 4
…		…
1149	my ($type, $reply, @payload) =	1284	my ($type, $reply, @payload) =
1150	"ARRAY" eq ref $msg	1285	"ARRAY" eq ref $msg
1151	? @$msg	1286	? @$msg
1152	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove	1287	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153		1288
		1289	my @reply;
		1290
1154	if (my $cb = $EXTCMD{$type}) {	1291	if (my $cb = $EXTCMD{$type}) {
1155	my @reply = $cb->($pl, @payload);	1292	@reply = $cb->($pl, @payload);
1156
1157	$pl->ext_reply ($reply, @reply)
1158	if $reply;
1159	}	1293	}
		1294
		1295	$pl->ext_reply ($reply, @reply)
		1296	if $reply;
		1297
1160	} else {	1298	} else {
1161	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1299	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162	}	1300	}
1163		1301
1164	cf::override;	1302	cf::override;
…		…
1217	my $msg = $@ ? "$v->{path}: $@\n"	1355	my $msg = $@ ? "$v->{path}: $@\n"
1218	: "$v->{base}: extension inactive.\n";	1356	: "$v->{base}: extension inactive.\n";
1219		1357
1220	if (exists $v->{meta}{mandatory}) {	1358	if (exists $v->{meta}{mandatory}) {
1221	warn $msg;	1359	warn $msg;
1222	warn "mandatory extension failed to load, exiting.\n";	1360	cf::cleanup "mandatory extension failed to load, exiting.";
1223	exit 1;
1224	}	1361	}
1225		1362
1226	warn $msg;	1363	warn $msg;
1227	}	1364	}
1228		1365
…		…
1253	use Coro::AIO;	1390	use Coro::AIO;
1254		1391
1255	=head3 cf::player	1392	=head3 cf::player
1256		1393
1257	=over 4	1394	=over 4
		1395
		1396	=item cf::player::num_playing
		1397
		1398	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1399
		1400	=cut
		1401
		1402	sub num_playing {
		1403	scalar grep
		1404	$_->ob->map
		1405	&& !$_->hidden
		1406	&& !$_->ob->flag (cf::FLAG_WIZ),
		1407	cf::player::list
		1408	}
1258		1409
1259	=item cf::player::find $login	1410	=item cf::player::find $login
1260		1411
1261	Returns the given player object, loading it if necessary (might block).	1412	Returns the given player object, loading it if necessary (might block).
1262		1413
…		…
1298	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1449	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1450	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1451	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301	aio_unlink +(playerdir $login) . "/$login.pl";	1452	aio_unlink +(playerdir $login) . "/$login.pl";
1302		1453
1303	my $pl = load_pl path $login	1454	my $f = new_from_file cf::object::thawer path $login
1304	or return;	1455	or return;
		1456
		1457	my $pl = cf::player::load_pl $f
		1458	or return;
		1459	local $cf::PLAYER_LOADING{$login} = $pl;
		1460	$f->resolve_delayed_derefs;
1305	$cf::PLAYER{$login} = $pl	1461	$cf::PLAYER{$login} = $pl
1306	}	1462	}
1307	}	1463	}
1308	}	1464	}
1309		1465
…		…
1319		1475
1320	aio_mkdir playerdir $pl, 0770;	1476	aio_mkdir playerdir $pl, 0770;
1321	$pl->{last_save} = $cf::RUNTIME;	1477	$pl->{last_save} = $cf::RUNTIME;
1322		1478
1323	$pl->save_pl ($path);	1479	$pl->save_pl ($path);
1324	Coro::cede;	1480	cf::cede_to_tick;
1325	}	1481	}
1326		1482
1327	sub new($) {	1483	sub new($) {
1328	my ($login) = @_;	1484	my ($login) = @_;
1329		1485
…		…
1407	or return [];	1563	or return [];
1408		1564
1409	my @logins;	1565	my @logins;
1410		1566
1411	for my $login (@$dirs) {	1567	for my $login (@$dirs) {
		1568	my $path = path $login;
		1569
		1570	# a .pst is a dead give-away for a valid player
		1571	unless (-e "$path.pst") {
1412	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1572	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413	aio_read $fh, 0, 512, my $buf, 0 or next;	1573	aio_read $fh, 0, 512, my $buf, 0 or next;
1414	$buf !~ /^password -------------$/m or next; # official not-valid tag	1574	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1575	}
1415		1576
1416	utf8::decode $login;	1577	utf8::decode $login;
1417	push @logins, $login;	1578	push @logins, $login;
1418	}	1579	}
1419		1580
…		…
1452		1613
1453	Expand crossfire pod fragments into protocol xml.	1614	Expand crossfire pod fragments into protocol xml.
1454		1615
1455	=cut	1616	=cut
1456		1617
		1618	use re 'eval';
		1619
		1620	my $group;
		1621	my $interior; $interior = qr{
		1622	# match a pod interior sequence sans C<< >>
		1623	(?:
		1624	\ (.*?)\ (?{ $group = $^N })
		1625	| < (??{$interior}) >
		1626	)
		1627	}x;
		1628
1457	sub expand_cfpod {	1629	sub expand_cfpod {
1458	((my $self), (local $_)) = @_;	1630	my ($self, $pod) = @_;
1459		1631
1460	# escape & and <	1632	my $xml;
1461	s/&/&amp;/g;
1462	s/(?<![BIUGH])</&lt;/g;
1463		1633
1464	# this is buggy, it needs to properly take care of nested <'s	1634	while () {
		1635	if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
		1636	$group = $1;
1465		1637
1466	1 while	1638	$group =~ s/&/&amp;/g;
1467	# replace B<>, I<>, U<> etc.	1639	$group =~ s/</&lt;/g;
1468	s/B<([^\>]*)>/<b>$1<\/b>/	1640
1469	|| s/I<([^\>]*)>/<i>$1<\/i>/	1641	$xml .= $group;
1470	|| s/U<([^\>]*)>/<u>$1<\/u>/	1642	} elsif ($pod =~ m%\G
1471	# replace G<male|female> tags	1643	([BCGHITU])
1472	|| s{G<([^>|]*)\|([^>]*)>}{	1644	<
1473	$self->gender ? $2 : $1	1645	(?:
1474	}ge	1646	([^<>]*) (?{ $group = $^N })
1475	# replace H<hint text>	1647	| < $interior >
1476	|| s{H<([^\>]*)>}	1648	)
		1649	>
		1650	%gcsx
1477	{	1651	) {
		1652	my ($code, $data) = ($1, $group);
		1653
		1654	if ($code eq "B") {
		1655	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
		1656	} elsif ($code eq "I") {
		1657	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
		1658	} elsif ($code eq "U") {
		1659	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
		1660	} elsif ($code eq "C") {
		1661	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
		1662	} elsif ($code eq "T") {
		1663	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
		1664	} elsif ($code eq "G") {
		1665	my ($male, $female) = split /\|/, $data;
		1666	$data = $self->gender ? $female : $male;
		1667	$xml .= expand_cfpod ($self, $data);
		1668	} elsif ($code eq "H") {
1478	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",	1669	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1479	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",	1670	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1480	"")	1671	"")
1481	[$self->{hintmode}]	1672	[$self->{hintmode}];
		1673	} else {
		1674	$xml .= "error processing '$code($data)' directive";
1482	}ge;	1675	}
		1676	} else {
		1677	if ($pod =~ /\G(.+)/) {
		1678	warn "parse error while expanding $pod (at $1)";
		1679	}
		1680	last;
		1681	}
		1682	}
1483		1683
		1684	for ($xml) {
1484	# create single paragraphs (very hackish)	1685	# create single paragraphs (very hackish)
1485	s/(?<=\S)\n(?=\w)/ /g;	1686	s/(?<=\S)\n(?=\w)/ /g;
1486		1687
1487	# compress some whitespace	1688	# compress some whitespace
1488	s/\s+\n/\n/g; # ws line-ends	1689	s/\s+\n/\n/g; # ws line-ends
1489	s/\n\n+/\n/g; # double lines	1690	s/\n\n+/\n/g; # double lines
1490	s/^\n+//; # beginning lines	1691	s/^\n+//; # beginning lines
1491	s/\n+$//; # ending lines	1692	s/\n+$//; # ending lines
		1693	}
1492		1694
1493	$_	1695	$xml
1494	}	1696	}
		1697
		1698	no re 'eval';
1495		1699
1496	sub hintmode {	1700	sub hintmode {
1497	$_[0]{hintmode} = $_[1] if @_ > 1;	1701	$_[0]{hintmode} = $_[1] if @_ > 1;
1498	$_[0]{hintmode}	1702	$_[0]{hintmode}
1499	}	1703	}
…		…
1743		1947
1744	sub load_header_from($) {	1948	sub load_header_from($) {
1745	my ($self, $path) = @_;	1949	my ($self, $path) = @_;
1746		1950
1747	utf8::encode $path;	1951	utf8::encode $path;
1748	#aio_open $path, O_RDONLY, 0	1952	my $f = new_from_file cf::object::thawer $path
1749	# or return;
1750
1751	$self->_load_header ($path)
1752	or return;	1953	or return;
		1954
		1955	$self->_load_header ($f)
		1956	or return;
		1957
		1958	local $MAP_LOADING{$self->{path}} = $self;
		1959	$f->resolve_delayed_derefs;
1753		1960
1754	$self->{load_path} = $path;	1961	$self->{load_path} = $path;
1755		1962
1756	1	1963	1
1757	}	1964	}
…		…
1811	sub find {	2018	sub find {
1812	my ($path, $origin) = @_;	2019	my ($path, $origin) = @_;
1813		2020
1814	$path = normalise $path, $origin && $origin->path;	2021	$path = normalise $path, $origin && $origin->path;
1815		2022
		2023	cf::lock_wait "map_data:$path";#d#remove
1816	cf::lock_wait "map_find:$path";	2024	cf::lock_wait "map_find:$path";
1817		2025
1818	$cf::MAP{$path} || do {	2026	$cf::MAP{$path} || do {
1819	my $guard = cf::lock_acquire "map_find:$path";	2027	my $guard1 = cf::lock_acquire "map_find:$path";
		2028	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		2029
1820	my $map = new_from_path cf::map $path	2030	my $map = new_from_path cf::map $path
1821	or return;	2031	or return;
1822		2032
1823	$map->{last_save} = $cf::RUNTIME;	2033	$map->{last_save} = $cf::RUNTIME;
1824		2034
…		…
1826	or return;	2036	or return;
1827		2037
1828	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	2038	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1829	# doing this can freeze the server in a sync job, obviously	2039	# doing this can freeze the server in a sync job, obviously
1830	#$cf::WAIT_FOR_TICK->wait;	2040	#$cf::WAIT_FOR_TICK->wait;
		2041	undef $guard1;
		2042	undef $guard2;
1831	$map->reset;	2043	$map->reset;
1832	undef $guard;
1833	return find $path;	2044	return find $path;
1834	}	2045	}
1835		2046
1836	$cf::MAP{$path} = $map	2047	$cf::MAP{$path} = $map
1837	}	2048	}
…		…
1846	local $self->{deny_reset} = 1; # loading can take a long time	2057	local $self->{deny_reset} = 1; # loading can take a long time
1847		2058
1848	my $path = $self->{path};	2059	my $path = $self->{path};
1849		2060
1850	{	2061	{
1851	my $guard = cf::lock_acquire "map_load:$path";	2062	my $guard = cf::lock_acquire "map_data:$path";
1852		2063
		2064	return unless $self->valid;
1853	return if $self->in_memory != cf::MAP_SWAPPED;	2065	return unless $self->in_memory == cf::MAP_SWAPPED;
1854		2066
1855	$self->in_memory (cf::MAP_LOADING);	2067	$self->in_memory (cf::MAP_LOADING);
1856		2068
1857	$self->alloc;	2069	$self->alloc;
1858		2070
1859	$self->pre_load;	2071	$self->pre_load;
1860	Coro::cede;	2072	cf::cede_to_tick;
1861		2073
		2074	my $f = new_from_file cf::object::thawer $self->{load_path};
		2075	$f->skip_block;
1862	$self->_load_objects ($self->{load_path}, 1)	2076	$self->_load_objects ($f)
1863	or return;	2077	or return;
1864		2078
1865	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2079	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1866	if delete $self->{load_original};	2080	if delete $self->{load_original};
1867		2081
1868	if (my $uniq = $self->uniq_path) {	2082	if (my $uniq = $self->uniq_path) {
1869	utf8::encode $uniq;	2083	utf8::encode $uniq;
1870	if (aio_open $uniq, O_RDONLY, 0) {	2084	unless (aio_stat $uniq) {
		2085	if (my $f = new_from_file cf::object::thawer $uniq) {
1871	$self->clear_unique_items;	2086	$self->clear_unique_items;
1872	$self->_load_objects ($uniq, 0);	2087	$self->_load_objects ($f);
		2088	$f->resolve_delayed_derefs;
		2089	}
1873	}	2090	}
1874	}	2091	}
1875		2092
1876	Coro::cede;	2093	$f->resolve_delayed_derefs;
		2094
		2095	cf::cede_to_tick;
1877	# now do the right thing for maps	2096	# now do the right thing for maps
1878	$self->link_multipart_objects;	2097	$self->link_multipart_objects;
1879	$self->difficulty ($self->estimate_difficulty)	2098	$self->difficulty ($self->estimate_difficulty)
1880	unless $self->difficulty;	2099	unless $self->difficulty;
1881	Coro::cede;	2100	cf::cede_to_tick;
1882		2101
1883	unless ($self->{deny_activate}) {	2102	unless ($self->{deny_activate}) {
1884	$self->decay_objects;	2103	$self->decay_objects;
1885	$self->fix_auto_apply;	2104	$self->fix_auto_apply;
1886	$self->update_buttons;	2105	$self->update_buttons;
1887	Coro::cede;	2106	cf::cede_to_tick;
1888	$self->set_darkness_map;	2107	$self->set_darkness_map;
1889	Coro::cede;	2108	cf::cede_to_tick;
1890	$self->activate;	2109	$self->activate;
1891	}	2110	}
1892		2111
1893	$self->{last_save} = $cf::RUNTIME;	2112	$self->{last_save} = $cf::RUNTIME;
1894	$self->last_access ($cf::RUNTIME);	2113	$self->last_access ($cf::RUNTIME);
…		…
1944	}	2163	}
1945		2164
1946	sub do_load_sync {	2165	sub do_load_sync {
1947	my ($map) = @_;	2166	my ($map) = @_;
1948		2167
		2168	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2169	if $Coro::current == $Coro::main;
		2170
1949	cf::sync_job { $map->load };	2171	cf::sync_job { $map->load };
1950	}	2172	}
1951		2173
1952	our %MAP_PREFETCH;	2174	our %MAP_PREFETCH;
1953	our $MAP_PREFETCHER = undef;	2175	our $MAP_PREFETCHER = undef;
1954		2176
1955	sub find_async {	2177	sub find_async {
1956	my ($path, $origin) = @_;	2178	my ($path, $origin, $load) = @_;
1957		2179
1958	$path = normalise $path, $origin && $origin->{path};	2180	$path = normalise $path, $origin && $origin->{path};
1959		2181
1960	if (my $map = $cf::MAP{$path}) {	2182	if (my $map = $cf::MAP{$path}) {
1961	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2183	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1962	}	2184	}
1963		2185
1964	undef $MAP_PREFETCH{$path};	2186	$MAP_PREFETCH{$path} |= $load;
		2187
1965	$MAP_PREFETCHER ||= cf::async {	2188	$MAP_PREFETCHER ||= cf::async {
		2189	$Coro::current->{desc} = "map prefetcher";
		2190
1966	while (%MAP_PREFETCH) {	2191	while (%MAP_PREFETCH) {
1967	for my $path (keys %MAP_PREFETCH) {	2192	while (my ($k, $v) = each %MAP_PREFETCH) {
1968	if (my $map = find $path) {	2193	if (my $map = find $k) {
1969	$map->load;	2194	$map->load if $v;
1970	}	2195	}
1971		2196
1972	delete $MAP_PREFETCH{$path};	2197	delete $MAP_PREFETCH{$k};
1973	}	2198	}
1974	}	2199	}
1975	undef $MAP_PREFETCHER;	2200	undef $MAP_PREFETCHER;
1976	};	2201	};
1977	$MAP_PREFETCHER->prio (6);	2202	$MAP_PREFETCHER->prio (6);
…		…
1980	}	2205	}
1981		2206
1982	sub save {	2207	sub save {
1983	my ($self) = @_;	2208	my ($self) = @_;
1984		2209
1985	my $lock = cf::lock_acquire "map_data:" . $self->path;	2210	my $lock = cf::lock_acquire "map_data:$self->{path}";
1986		2211
1987	$self->{last_save} = $cf::RUNTIME;	2212	$self->{last_save} = $cf::RUNTIME;
1988		2213
1989	return unless $self->dirty;	2214	return unless $self->dirty;
1990		2215
…		…
1996	return if $self->{deny_save};	2221	return if $self->{deny_save};
1997		2222
1998	local $self->{last_access} = $self->last_access;#d#	2223	local $self->{last_access} = $self->last_access;#d#
1999		2224
2000	cf::async {	2225	cf::async {
		2226	$Coro::current->{desc} = "map player save";
2001	$_->contr->save for $self->players;	2227	$_->contr->save for $self->players;
2002	};	2228	};
2003		2229
2004	if ($uniq) {	2230	if ($uniq) {
2005	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2231	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
…		…
2013	my ($self) = @_;	2239	my ($self) = @_;
2014		2240
2015	# save first because save cedes	2241	# save first because save cedes
2016	$self->save;	2242	$self->save;
2017		2243
2018	my $lock = cf::lock_acquire "map_data:" . $self->path;	2244	my $lock = cf::lock_acquire "map_data:$self->{path}";
2019		2245
2020	return if $self->players;	2246	return if $self->players;
2021	return if $self->in_memory != cf::MAP_IN_MEMORY;	2247	return if $self->in_memory != cf::MAP_IN_MEMORY;
2022	return if $self->{deny_save};	2248	return if $self->{deny_save};
2023		2249
		2250	$self->in_memory (cf::MAP_SWAPPED);
		2251
		2252	$self->deactivate;
		2253	$_->clear_links_to ($self) for values %cf::MAP;
2024	$self->clear;	2254	$self->clear;
2025	$self->in_memory (cf::MAP_SWAPPED);
2026	}	2255	}
2027		2256
2028	sub reset_at {	2257	sub reset_at {
2029	my ($self) = @_;	2258	my ($self) = @_;
2030		2259
…		…
2062	if $uniq;	2291	if $uniq;
2063	}	2292	}
2064		2293
2065	delete $cf::MAP{$self->path};	2294	delete $cf::MAP{$self->path};
2066		2295
		2296	$self->deactivate;
		2297	$_->clear_links_to ($self) for values %cf::MAP;
2067	$self->clear;	2298	$self->clear;
2068
2069	$_->clear_links_to ($self) for values %cf::MAP;
2070		2299
2071	$self->unlink_save;	2300	$self->unlink_save;
2072	$self->destroy;	2301	$self->destroy;
2073	}	2302	}
2074		2303
2075	my $nuke_counter = "aaaa";	2304	my $nuke_counter = "aaaa";
2076		2305
2077	sub nuke {	2306	sub nuke {
2078	my ($self) = @_;	2307	my ($self) = @_;
2079		2308
		2309	{
		2310	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2311
2080	delete $cf::MAP{$self->path};	2312	delete $cf::MAP{$self->path};
2081		2313
2082	$self->unlink_save;	2314	$self->unlink_save;
2083		2315
2084	bless $self, "cf::map";	2316	bless $self, "cf::map";
2085	delete $self->{deny_reset};	2317	delete $self->{deny_reset};
2086	$self->{deny_save} = 1;	2318	$self->{deny_save} = 1;
2087	$self->reset_timeout (1);	2319	$self->reset_timeout (1);
2088	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2320	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2089		2321
2090	$cf::MAP{$self->path} = $self;	2322	$cf::MAP{$self->path} = $self;
		2323	}
2091		2324
2092	$self->reset; # polite request, might not happen	2325	$self->reset; # polite request, might not happen
2093	}	2326	}
2094		2327
2095	=item $maps = cf::map::tmp_maps	2328	=item $maps = cf::map::tmp_maps
…		…
2144	: ()	2377	: ()
2145	} @{ aio_readdir $UNIQUEDIR or [] }	2378	} @{ aio_readdir $UNIQUEDIR or [] }
2146	]	2379	]
2147	}	2380	}
2148		2381
2149	package cf;
2150
2151	=back	2382	=back
2152		2383
2153	=head3 cf::object	2384	=head3 cf::object
2154		2385
2155	=cut	2386	=cut
…		…
2169	map { $_, inv_recursive_ $_->inv } @_	2400	map { $_, inv_recursive_ $_->inv } @_
2170	}	2401	}
2171		2402
2172	sub inv_recursive {	2403	sub inv_recursive {
2173	inv_recursive_ inv $_[0]	2404	inv_recursive_ inv $_[0]
		2405	}
		2406
		2407	=item $ref = $ob->ref
		2408
		2409	creates and returns a persistent reference to an objetc that can be stored as a string.
		2410
		2411	=item $ob = cf::object::deref ($refstring)
		2412
		2413	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2414	even if the object actually exists. May block.
		2415
		2416	=cut
		2417
		2418	sub deref {
		2419	my ($ref) = @_;
		2420
		2421	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2422	my ($uuid, $name) = ($1, $2);
		2423	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2424	or return;
		2425	$pl->ob->uuid eq $uuid
		2426	or return;
		2427
		2428	$pl->ob
		2429	} else {
		2430	warn "$ref: cannot resolve object reference\n";
		2431	undef
		2432	}
2174	}	2433	}
2175		2434
2176	package cf;	2435	package cf;
2177		2436
2178	=back	2437	=back
…		…
2338	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2597	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2339		2598
2340	$self->enter_link;	2599	$self->enter_link;
2341		2600
2342	(async {	2601	(async {
		2602	$Coro::current->{desc} = "player::goto $path $x $y";
		2603
		2604	# *tag paths override both path and x|y
		2605	if ($path =~ /^\*(.*)$/) {
		2606	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2607	my $ob = $obs[rand @obs];
		2608
		2609	# see if we actually can go there
		2610	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2611	$ob = $obs[rand @obs];
		2612	} else {
		2613	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2614	}
		2615	# else put us there anyways for now #d#
		2616
		2617	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2618	} else {
		2619	($path, $x, $y) = (undef, undef, undef);
		2620	}
		2621	}
		2622
2343	my $map = eval {	2623	my $map = eval {
2344	my $map = cf::map::find $path;	2624	my $map = defined $path ? cf::map::find $path : undef;
2345		2625
2346	if ($map) {	2626	if ($map) {
2347	$map = $map->customise_for ($self);	2627	$map = $map->customise_for ($self);
2348	$map = $check->($map) if $check && $map;	2628	$map = $check->($map) if $check && $map;
2349	} else {	2629	} else {
2350	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2630	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2351	}	2631	}
2352		2632
2353	$map	2633	$map
2354	};	2634	};
2355		2635
…		…
2408	$rmp->{origin_y} = $exit->y;	2688	$rmp->{origin_y} = $exit->y;
2409	}	2689	}
2410		2690
2411	$rmp->{random_seed} ||= $exit->random_seed;	2691	$rmp->{random_seed} ||= $exit->random_seed;
2412		2692
2413	my $data = cf::to_json $rmp;	2693	my $data = cf::encode_json $rmp;
2414	my $md5 = Digest::MD5::md5_hex $data;	2694	my $md5 = Digest::MD5::md5_hex $data;
2415	my $meta = "$RANDOMDIR/$md5.meta";	2695	my $meta = "$RANDOMDIR/$md5.meta";
2416		2696
2417	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2697	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2418	aio_write $fh, 0, (length $data), $data, 0;	2698	aio_write $fh, 0, (length $data), $data, 0;
…		…
2445	# if exit is damned, update players death & WoR home-position	2725	# if exit is damned, update players death & WoR home-position
2446	$self->contr->savebed ($slaying, $hp, $sp)	2726	$self->contr->savebed ($slaying, $hp, $sp)
2447	if $exit->flag (FLAG_DAMNED);	2727	if $exit->flag (FLAG_DAMNED);
2448		2728
2449	(async {	2729	(async {
		2730	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2731
2450	$self->deactivate_recursive; # just to be sure	2732	$self->deactivate_recursive; # just to be sure
2451	unless (eval {	2733	unless (eval {
2452	$self->goto ($slaying, $hp, $sp);	2734	$self->goto ($slaying, $hp, $sp);
2453		2735
2454	1;	2736	1;
…		…
2489	the message, with C<log> being the default. If C<$color> is negative, suppress	2771	the message, with C<log> being the default. If C<$color> is negative, suppress
2490	the message unless the client supports the msg packet.	2772	the message unless the client supports the msg packet.
2491		2773
2492	=cut	2774	=cut
2493		2775
		2776	# non-persistent channels (usually the info channel)
		2777	our %CHANNEL = (
		2778	"c/identify" => {
		2779	id => "infobox",
		2780	title => "Identify",
		2781	reply => undef,
		2782	tooltip => "Items recently identified",
		2783	},
		2784	"c/examine" => {
		2785	id => "infobox",
		2786	title => "Examine",
		2787	reply => undef,
		2788	tooltip => "Signs and other items you examined",
		2789	},
		2790	"c/book" => {
		2791	id => "infobox",
		2792	title => "Book",
		2793	reply => undef,
		2794	tooltip => "The contents of a note or book",
		2795	},
		2796	"c/lookat" => {
		2797	id => "infobox",
		2798	title => "Look",
		2799	reply => undef,
		2800	tooltip => "What you saw there",
		2801	},
		2802	"c/who" => {
		2803	id => "infobox",
		2804	title => "Players",
		2805	reply => undef,
		2806	tooltip => "Shows players who are currently online",
		2807	},
		2808	"c/body" => {
		2809	id => "infobox",
		2810	title => "Body Parts",
		2811	reply => undef,
		2812	tooltip => "Shows which body parts you posess and are available",
		2813	},
		2814	"c/uptime" => {
		2815	id => "infobox",
		2816	title => "Uptime",
		2817	reply => undef,
		2818	tooltip => "How long the server has been running since last restart",
		2819	},
		2820	"c/mapinfo" => {
		2821	id => "infobox",
		2822	title => "Map Info",
		2823	reply => undef,
		2824	tooltip => "Information related to the maps",
		2825	},
		2826	);
		2827
2494	sub cf::client::send_msg {	2828	sub cf::client::send_msg {
2495	my ($self, $channel, $msg, $color, @extra) = @_;	2829	my ($self, $channel, $msg, $color, @extra) = @_;
2496		2830
2497	$msg = $self->pl->expand_cfpod ($msg);	2831	$msg = $self->pl->expand_cfpod ($msg);
2498		2832
2499	$color &= cf::NDI_CLIENT_MASK; # just in case...	2833	$color &= cf::NDI_CLIENT_MASK; # just in case...
2500		2834
		2835	# check predefined channels, for the benefit of C
		2836	if ($CHANNEL{$channel}) {
		2837	$channel = $CHANNEL{$channel};
		2838
		2839	$self->ext_msg (channel_info => $channel)
		2840	if $self->can_msg;
		2841
		2842	$channel = $channel->{id};
		2843
2501	if (ref $channel) {	2844	} elsif (ref $channel) {
2502	# send meta info to client, if not yet sent	2845	# send meta info to client, if not yet sent
2503	unless (exists $self->{channel}{$channel->{id}}) {	2846	unless (exists $self->{channel}{$channel->{id}}) {
2504	$self->{channel}{$channel->{id}} = $channel;	2847	$self->{channel}{$channel->{id}} = $channel;
2505	$self->ext_msg (channel_info => $channel);	2848	$self->ext_msg (channel_info => $channel)
		2849	if $self->can_msg;
2506	}	2850	}
2507		2851
2508	$channel = $channel->{id};	2852	$channel = $channel->{id};
2509	}	2853	}
2510		2854
…		…
2551	=cut	2895	=cut
2552		2896
2553	sub cf::client::ext_msg($$@) {	2897	sub cf::client::ext_msg($$@) {
2554	my ($self, $type, @msg) = @_;	2898	my ($self, $type, @msg) = @_;
2555		2899
2556	my $extcmd = $self->extcmd;
2557
2558	if ($extcmd == 2) {	2900	if ($self->extcmd == 2) {
2559	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	2901	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2560	} elsif ($extcmd == 1) { # TODO: remove	2902	} elsif ($self->extcmd == 1) { # TODO: remove
2561	push @msg, msgtype => "event_$type";	2903	push @msg, msgtype => "event_$type";
2562	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	2904	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2563	}	2905	}
2564	}	2906	}
2565		2907
…		…
2572	sub cf::client::ext_reply($$@) {	2914	sub cf::client::ext_reply($$@) {
2573	my ($self, $id, @msg) = @_;	2915	my ($self, $id, @msg) = @_;
2574		2916
2575	if ($self->extcmd == 2) {	2917	if ($self->extcmd == 2) {
2576	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	2918	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2577	} elsif ($self->ns->extcmd == 1) {	2919	} elsif ($self->extcmd == 1) {
2578	#TODO: version 1, remove	2920	#TODO: version 1, remove
2579	unshift @msg, msgtype => "reply", msgid => $id;	2921	unshift @msg, msgtype => "reply", msgid => $id;
2580	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	2922	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581	}	2923	}
2582	}	2924	}
…		…
2646	my ($type, $reply, @payload) =	2988	my ($type, $reply, @payload) =
2647	"ARRAY" eq ref $msg	2989	"ARRAY" eq ref $msg
2648	? @$msg	2990	? @$msg
2649	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove	2991	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650		2992
		2993	my @reply;
		2994
2651	if (my $cb = $EXTICMD{$type}) {	2995	if (my $cb = $EXTICMD{$type}) {
2652	my @reply = $cb->($ns, @payload);	2996	@reply = $cb->($ns, @payload);
2653
2654	$ns->ext_reply ($reply, @reply)
2655	if $reply;
2656	}	2997	}
		2998
		2999	$ns->ext_reply ($reply, @reply)
		3000	if $reply;
		3001
2657	} else {	3002	} else {
2658	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3003	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2659	}	3004	}
2660		3005
2661	cf::override;	3006	cf::override;
…		…
2721	=pod	3066	=pod
2722		3067
2723	The following functions and methods are available within a safe environment:	3068	The following functions and methods are available within a safe environment:
2724		3069
2725	cf::object	3070	cf::object
2726	contr pay_amount pay_player map x y force_find force_add	3071	contr pay_amount pay_player map x y force_find force_add destroy
2727	insert remove name archname title slaying race	3072	insert remove name archname title slaying race decrease_ob_nr
2728		3073
2729	cf::object::player	3074	cf::object::player
2730	player	3075	player
2731		3076
2732	cf::player	3077	cf::player
…		…
2737		3082
2738	=cut	3083	=cut
2739		3084
2740	for (	3085	for (
2741	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3086	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2742	insert remove inv name archname title slaying race)],	3087	insert remove inv name archname title slaying race
		3088	decrease_ob_nr destroy)],
2743	["cf::object::player" => qw(player)],	3089	["cf::object::player" => qw(player)],
2744	["cf::player" => qw(peaceful)],	3090	["cf::player" => qw(peaceful)],
2745	["cf::map" => qw(trigger)],	3091	["cf::map" => qw(trigger)],
2746	) {	3092	) {
2747	no strict 'refs';	3093	no strict 'refs';
…		…
2823	# the server's init and main functions	3169	# the server's init and main functions
2824		3170
2825	sub load_facedata($) {	3171	sub load_facedata($) {
2826	my ($path) = @_;	3172	my ($path) = @_;
2827		3173
		3174	# HACK to clear player env face cache, we need some signal framework
		3175	# for this (global event?)
		3176	%ext::player_env::MUSIC_FACE_CACHE = ();
		3177
2828	my $enc = JSON::XS->new->utf8->canonical;	3178	my $enc = JSON::XS->new->utf8->canonical->relaxed;
2829		3179
2830	warn "loading facedata from $path\n";	3180	warn "loading facedata from $path\n";
2831		3181
2832	my $facedata;	3182	my $facedata;
2833	0 < aio_load $path, $facedata	3183	0 < aio_load $path, $facedata
…		…
2848	{	3198	{
2849	my $faces = $facedata->{faceinfo};	3199	my $faces = $facedata->{faceinfo};
2850		3200
2851	while (my ($face, $info) = each %$faces) {	3201	while (my ($face, $info) = each %$faces) {
2852	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3202	my $idx = (cf::face::find $face) || cf::face::alloc $face;
		3203
2853	cf::face::set_visibility $idx, $info->{visibility};	3204	cf::face::set_visibility $idx, $info->{visibility};
2854	cf::face::set_magicmap $idx, $info->{magicmap};	3205	cf::face::set_magicmap $idx, $info->{magicmap};
2855	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3206	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2856	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3207	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2857		3208
2858	cf::cede_to_tick;	3209	cf::cede_to_tick;
2859	}	3210	}
2860		3211
2861	while (my ($face, $info) = each %$faces) {	3212	while (my ($face, $info) = each %$faces) {
2862	next unless $info->{smooth};	3213	next unless $info->{smooth};
		3214
2863	my $idx = cf::face::find $face	3215	my $idx = cf::face::find $face
2864	or next;	3216	or next;
		3217
2865	if (my $smooth = cf::face::find $info->{smooth}) {	3218	if (my $smooth = cf::face::find $info->{smooth}) {
2866	cf::face::set_smooth $idx, $smooth;	3219	cf::face::set_smooth $idx, $smooth;
2867	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3220	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2868	} else {	3221	} else {
2869	warn "smooth face '$info->{smooth}' not found for face '$face'";	3222	warn "smooth face '$info->{smooth}' not found for face '$face'";
…		…
2887	{	3240	{
2888	# TODO: for gcfclient pleasure, we should give resources	3241	# TODO: for gcfclient pleasure, we should give resources
2889	# that gcfclient doesn't grok a >10000 face index.	3242	# that gcfclient doesn't grok a >10000 face index.
2890	my $res = $facedata->{resource};	3243	my $res = $facedata->{resource};
2891		3244
2892	my $soundconf = delete $res->{"res/sound.conf"};
2893
2894	while (my ($name, $info) = each %$res) {	3245	while (my ($name, $info) = each %$res) {
		3246	if (defined $info->{type}) {
2895	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3247	my $idx = (cf::face::find $name) || cf::face::alloc $name;
2896	my $data;	3248	my $data;
2897		3249
2898	if ($info->{type} & 1) {	3250	if ($info->{type} & 1) {
2899	# prepend meta info	3251	# prepend meta info
2900		3252
2901	my $meta = $enc->encode ({	3253	my $meta = $enc->encode ({
2902	name => $name,	3254	name => $name,
2903	%{ $info->{meta} || {} },	3255	%{ $info->{meta} || {} },
2904	});	3256	});
2905		3257
2906	$data = pack "(w/a*)*", $meta, $info->{data};	3258	$data = pack "(w/a*)*", $meta, $info->{data};
		3259	} else {
		3260	$data = $info->{data};
		3261	}
		3262
		3263	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3264	cf::face::set_type $idx, $info->{type};
2907	} else {	3265	} else {
2908	$data = $info->{data};	3266	$RESOURCE{$name} = $info;
2909	}	3267	}
2910		3268
2911	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2912	cf::face::set_type $idx, $info->{type};
2913
2914	cf::cede_to_tick;	3269	cf::cede_to_tick;
2915	}	3270	}
2916
2917	if ($soundconf) {
2918	$soundconf = $enc->decode (delete $soundconf->{data});
2919
2920	for (0 .. SOUND_CAST_SPELL_0 - 1) {
2921	my $sound = $soundconf->{compat}[$_]
2922	or next;
2923
2924	my $face = cf::face::find "sound/$sound->[1]";
2925	cf::sound::set $sound->[0] => $face;
2926	cf::sound::old_sound_index $_, $face; # gcfclient-compat
2927	}
2928
2929	while (my ($k, $v) = each %{$soundconf->{event}}) {
2930	my $face = cf::face::find "sound/$v";
2931	cf::sound::set $k => $face;
2932	}
2933	}
2934	}	3271	}
		3272
		3273	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2935		3274
2936	1	3275	1
2937	}	3276	}
		3277
		3278	cf::global->attach (on_resource_update => sub {
		3279	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
		3280	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
		3281
		3282	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3283	my $sound = $soundconf->{compat}[$_]
		3284	or next;
		3285
		3286	my $face = cf::face::find "sound/$sound->[1]";
		3287	cf::sound::set $sound->[0] => $face;
		3288	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3289	}
		3290
		3291	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3292	my $face = cf::face::find "sound/$v";
		3293	cf::sound::set $k => $face;
		3294	}
		3295	}
		3296	});
2938		3297
2939	register_exticmd fx_want => sub {	3298	register_exticmd fx_want => sub {
2940	my ($ns, $want) = @_;	3299	my ($ns, $want) = @_;
2941		3300
2942	while (my ($k, $v) = each %$want) {	3301	while (my ($k, $v) = each %$want) {
2943	$ns->fx_want ($k, $v);	3302	$ns->fx_want ($k, $v);
2944	}	3303	}
2945	};	3304	};
2946		3305
2947	sub reload_regions {	3306	sub reload_regions {
		3307	# HACK to clear player env face cache, we need some signal framework
		3308	# for this (global event?)
		3309	%ext::player_env::MUSIC_FACE_CACHE = ();
		3310
2948	load_resource_file "$MAPDIR/regions"	3311	load_resource_file "$MAPDIR/regions"
2949	or die "unable to load regions file\n";	3312	or die "unable to load regions file\n";
2950		3313
2951	for (cf::region::list) {	3314	for (cf::region::list) {
2952	$_->{match} = qr/$_->{match}/	3315	$_->{match} = qr/$_->{match}/
…		…
2988		3351
2989	sub init {	3352	sub init {
2990	reload_resources;	3353	reload_resources;
2991	}	3354	}
2992		3355
2993	sub cfg_load {	3356	sub reload_config {
2994	open my $fh, "<:utf8", "$CONFDIR/config"	3357	open my $fh, "<:utf8", "$CONFDIR/config"
2995	or return;	3358	or return;
2996		3359
2997	local $/;	3360	local $/;
2998	*CFG = YAML::Syck::Load <$fh>;	3361	*CFG = YAML::Load <$fh>;
2999		3362
3000	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3363	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3001		3364
3002	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3365	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3003	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3366	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3014	sub main {	3377	sub main {
3015	# we must not ever block the main coroutine	3378	# we must not ever block the main coroutine
3016	local $Coro::idle = sub {	3379	local $Coro::idle = sub {
3017	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3380	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3018	(async {	3381	(async {
3019	Event::one_event;	3382	$Coro::current->{desc} = "IDLE BUG HANDLER";
		3383	EV::loop EV::LOOP_ONESHOT;
3020	})->prio (Coro::PRIO_MAX);	3384	})->prio (Coro::PRIO_MAX);
3021	};	3385	};
3022		3386
3023	cfg_load;	3387	reload_config;
3024	db_init;	3388	db_init;
3025	load_extensions;	3389	load_extensions;
3026		3390
3027	$TICK_WATCHER->start;	3391	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
		3392	evthread_start IO::AIO::poll_fileno;
3028	Event::loop;	3393	EV::loop;
3029	}	3394	}
3030		3395
3031	#############################################################################	3396	#############################################################################
3032	# initialisation and cleanup	3397	# initialisation and cleanup
3033		3398
3034	# install some emergency cleanup handlers	3399	# install some emergency cleanup handlers
3035	BEGIN {	3400	BEGIN {
		3401	our %SIGWATCHER = ();
3036	for my $signal (qw(INT HUP TERM)) {	3402	for my $signal (qw(INT HUP TERM)) {
3037	Event->signal (	3403	$SIGWATCHER{$signal} = EV::signal $signal, sub {
3038	reentrant => 0,
3039	data => WF_AUTOCANCEL,
3040	signal => $signal,
3041	prio => 0,
3042	cb => sub {
3043	cf::cleanup "SIG$signal";	3404	cf::cleanup "SIG$signal";
3044	},
3045	);	3405	};
3046	}	3406	}
3047	}	3407	}
3048		3408
3049	sub write_runtime {	3409	sub write_runtime_sync {
3050	my $runtime = "$LOCALDIR/runtime";	3410	my $runtime = "$LOCALDIR/runtime";
3051		3411
3052	# first touch the runtime file to show we are still running:	3412	# first touch the runtime file to show we are still running:
3053	# the fsync below can take a very very long time.	3413	# the fsync below can take a very very long time.
3054		3414
…		…
3080	and return;	3440	and return;
3081		3441
3082	warn "runtime file written.\n";	3442	warn "runtime file written.\n";
3083		3443
3084	1	3444	1
		3445	}
		3446
		3447	our $uuid_lock;
		3448	our $uuid_skip;
		3449
		3450	sub write_uuid_sync($) {
		3451	$uuid_skip ||= $_[0];
		3452
		3453	return if $uuid_lock;
		3454	local $uuid_lock = 1;
		3455
		3456	my $uuid = "$LOCALDIR/uuid";
		3457
		3458	my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
		3459	or return;
		3460
		3461	my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
		3462	$uuid_skip = 0;
		3463
		3464	(aio_write $fh, 0, (length $value), $value, 0) <= 0
		3465	and return;
		3466
		3467	# always fsync - this file is important
		3468	aio_fsync $fh
		3469	and return;
		3470
		3471	close $fh
		3472	or return;
		3473
		3474	aio_rename "$uuid~", $uuid
		3475	and return;
		3476
		3477	warn "uuid file written ($value).\n";
		3478
		3479	1
		3480
		3481	}
		3482
		3483	sub write_uuid($$) {
		3484	my ($skip, $sync) = @_;
		3485
		3486	$sync ? write_uuid_sync $skip
		3487	: async { write_uuid_sync $skip };
3085	}	3488	}
3086		3489
3087	sub emergency_save() {	3490	sub emergency_save() {
3088	my $freeze_guard = cf::freeze_mainloop;	3491	my $freeze_guard = cf::freeze_mainloop;
3089		3492
…		…
3095	# and maps saved/destroyed asynchronously.	3498	# and maps saved/destroyed asynchronously.
3096	warn "begin emergency player save\n";	3499	warn "begin emergency player save\n";
3097	for my $login (keys %cf::PLAYER) {	3500	for my $login (keys %cf::PLAYER) {
3098	my $pl = $cf::PLAYER{$login} or next;	3501	my $pl = $cf::PLAYER{$login} or next;
3099	$pl->valid or next;	3502	$pl->valid or next;
		3503	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3100	$pl->save;	3504	$pl->save;
3101	}	3505	}
3102	warn "end emergency player save\n";	3506	warn "end emergency player save\n";
3103		3507
3104	warn "begin emergency map save\n";	3508	warn "begin emergency map save\n";
…		…
3110	warn "end emergency map save\n";	3514	warn "end emergency map save\n";
3111		3515
3112	warn "begin emergency database checkpoint\n";	3516	warn "begin emergency database checkpoint\n";
3113	BDB::db_env_txn_checkpoint $DB_ENV;	3517	BDB::db_env_txn_checkpoint $DB_ENV;
3114	warn "end emergency database checkpoint\n";	3518	warn "end emergency database checkpoint\n";
		3519
		3520	warn "begin write uuid\n";
		3521	write_uuid_sync 1;
		3522	warn "end write uuid\n";
3115	};	3523	};
3116		3524
3117	warn "leave emergency perl save\n";	3525	warn "leave emergency perl save\n";
3118	}	3526	}
3119		3527
…		…
3134	warn "reloading...";	3542	warn "reloading...";
3135		3543
3136	warn "entering sync_job";	3544	warn "entering sync_job";
3137		3545
3138	cf::sync_job {	3546	cf::sync_job {
3139	cf::write_runtime; # external watchdog should not bark	3547	cf::write_runtime_sync; # external watchdog should not bark
3140	cf::emergency_save;	3548	cf::emergency_save;
3141	cf::write_runtime; # external watchdog should not bark	3549	cf::write_runtime_sync; # external watchdog should not bark
3142		3550
3143	warn "syncing database to disk";	3551	warn "syncing database to disk";
3144	BDB::db_env_txn_checkpoint $DB_ENV;	3552	BDB::db_env_txn_checkpoint $DB_ENV;
3145		3553
3146	# if anything goes wrong in here, we should simply crash as we already saved	3554	# if anything goes wrong in here, we should simply crash as we already saved
3147
3148	warn "cancelling all WF_AUTOCANCEL watchers";
3149	for (Event::all_watchers) {
3150	$_->cancel if $_->data & WF_AUTOCANCEL;
3151	}
3152		3555
3153	warn "flushing outstanding aio requests";	3556	warn "flushing outstanding aio requests";
3154	for (;;) {	3557	for (;;) {
3155	BDB::flush;	3558	BDB::flush;
3156	IO::AIO::flush;	3559	IO::AIO::flush;
3157	Coro::cede;	3560	Coro::cede_notself;
3158	last unless IO::AIO::nreqs || BDB::nreqs;	3561	last unless IO::AIO::nreqs || BDB::nreqs;
3159	warn "iterate...";	3562	warn "iterate...";
3160	}	3563	}
3161		3564
3162	++$RELOAD;	3565	++$RELOAD;
…		…
3221	warn "reloading cf.pm";	3624	warn "reloading cf.pm";
3222	require cf;	3625	require cf;
3223	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3626	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3224		3627
3225	warn "loading config and database again";	3628	warn "loading config and database again";
3226	cf::cfg_load;	3629	cf::reload_config;
3227		3630
3228	warn "loading extensions";	3631	warn "loading extensions";
3229	cf::load_extensions;	3632	cf::load_extensions;
3230		3633
3231	warn "reattaching attachments to objects/players";	3634	warn "reattaching attachments to objects/players";
…		…
3238	warn "leaving sync_job";	3641	warn "leaving sync_job";
3239		3642
3240	1	3643	1
3241	} or do {	3644	} or do {
3242	warn $@;	3645	warn $@;
3243	warn "error while reloading, exiting.";	3646	cf::cleanup "error while reloading, exiting.";
3244	exit 1;
3245	};	3647	};
3246		3648
3247	warn "reloaded";	3649	warn "reloaded";
3248	};	3650	};
3249		3651
…		…
3251		3653
3252	sub reload_perl() {	3654	sub reload_perl() {
3253	# doing reload synchronously and two reloads happen back-to-back,	3655	# doing reload synchronously and two reloads happen back-to-back,
3254	# coro crashes during coro_state_free->destroy here.	3656	# coro crashes during coro_state_free->destroy here.
3255		3657
3256	$RELOAD_WATCHER ||= Event->timer (	3658	$RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3257	reentrant => 0,
3258	after => 0,
3259	data => WF_AUTOCANCEL,
3260	cb => sub {
3261	do_reload_perl;	3659	do_reload_perl;
3262	undef $RELOAD_WATCHER;	3660	undef $RELOAD_WATCHER;
3263	},
3264	);	3661	};
3265	}	3662	}
3266		3663
3267	register_command "reload" => sub {	3664	register_command "reload" => sub {
3268	my ($who, $arg) = @_;	3665	my ($who, $arg) = @_;
3269		3666
3270	if ($who->flag (FLAG_WIZ)) {	3667	if ($who->flag (FLAG_WIZ)) {
3271	$who->message ("reloading server.");	3668	$who->message ("reloading server.");
		3669	async {
		3670	$Coro::current->{desc} = "perl_reload";
3272	async { reload_perl };	3671	reload_perl;
		3672	};
3273	}	3673	}
3274	};	3674	};
3275		3675
3276	unshift @INC, $LIBDIR;	3676	unshift @INC, $LIBDIR;
3277		3677
…		…
3279		3679
3280	our @WAIT_FOR_TICK;	3680	our @WAIT_FOR_TICK;
3281	our @WAIT_FOR_TICK_BEGIN;	3681	our @WAIT_FOR_TICK_BEGIN;
3282		3682
3283	sub wait_for_tick {	3683	sub wait_for_tick {
3284	return unless $TICK_WATCHER->is_active;	3684	return if tick_inhibit;
3285	return if $Coro::current == $Coro::main;	3685	return if $Coro::current == $Coro::main;
3286		3686
3287	my $signal = new Coro::Signal;	3687	my $signal = new Coro::Signal;
3288	push @WAIT_FOR_TICK, $signal;	3688	push @WAIT_FOR_TICK, $signal;
3289	$signal->wait;	3689	$signal->wait;
3290	}	3690	}
3291		3691
3292	sub wait_for_tick_begin {	3692	sub wait_for_tick_begin {
3293	return unless $TICK_WATCHER->is_active;	3693	return if tick_inhibit;
3294	return if $Coro::current == $Coro::main;	3694	return if $Coro::current == $Coro::main;
3295		3695
3296	my $signal = new Coro::Signal;	3696	my $signal = new Coro::Signal;
3297	push @WAIT_FOR_TICK_BEGIN, $signal;	3697	push @WAIT_FOR_TICK_BEGIN, $signal;
3298	$signal->wait;	3698	$signal->wait;
3299	}	3699	}
3300		3700
3301	my $min = 1e6;#d#	3701	sub tick {
3302	my $avg = 10;
3303	$TICK_WATCHER = Event->timer (
3304	reentrant => 0,
3305	parked => 1,
3306	prio => 0,
3307	at => $NEXT_TICK || $TICK,
3308	data => WF_AUTOCANCEL,
3309	cb => sub {
3310	if ($Coro::current != $Coro::main) {	3702	if ($Coro::current != $Coro::main) {
3311	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3703	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3312	unless ++$bug_warning > 10;	3704	unless ++$bug_warning > 10;
3313	return;	3705	return;
3314	}	3706	}
3315		3707
3316	$NOW = $tick_start = Event::time;
3317
3318	cf::server_tick; # one server iteration	3708	cf::server_tick; # one server iteration
3319		3709
3320	0 && sync_job {#d#	3710	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3321	for(1..10) {	3711	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3322	my $t = Event::time;	3712	Coro::async_pool {
3323	my $map = my $map = new_from_path cf::map "/tmp/x.map"	3713	$Coro::current->{desc} = "runtime saver";
3324	or die;	3714	write_runtime_sync
3325		3715	or warn "ERROR: unable to write runtime file: $!";
3326	$map->width (50);
3327	$map->height (50);
3328	$map->alloc;
3329	$map->_load_objects ("/tmp/x.map", 1);
3330	my $t = Event::time - $t;
3331
3332	#next unless $t < 0.0013;#d#
3333	if ($t < $min) {
3334	$min = $t;
3335	}
3336	$avg = $avg * 0.99 + $t * 0.01;
3337	}
3338	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3339	exit 0;
3340	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3341	};	3716	};
		3717	}
3342		3718
3343	$RUNTIME += $TICK;
3344	$NEXT_TICK += $TICK;
3345
3346	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3347	$NEXT_RUNTIME_WRITE = $NOW + 10;
3348	Coro::async_pool {
3349	write_runtime
3350	or warn "ERROR: unable to write runtime file: $!";
3351	};
3352	}
3353
3354	# my $AFTER = Event::time;
3355	# warn $AFTER - $NOW;#d#
3356
3357	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3719	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3358	$sig->send;	3720	$sig->send;
3359	}	3721	}
3360	while (my $sig = shift @WAIT_FOR_TICK) {	3722	while (my $sig = shift @WAIT_FOR_TICK) {
3361	$sig->send;	3723	$sig->send;
3362	}	3724	}
3363		3725
3364	$NOW = Event::time;	3726	$LOAD = ($NOW - $TICK_START) / $TICK;
3365
3366	# if we are delayed by four ticks or more, skip them all
3367	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3368
3369	$TICK_WATCHER->at ($NEXT_TICK);
3370	$TICK_WATCHER->start;
3371
3372	$LOAD = ($NOW - $tick_start) / $TICK;
3373	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3727	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3374		3728
3375	_post_tick;	3729	if (0) {
3376		3730	if ($NEXT_TICK) {
3377		3731	my $jitter = $TICK_START - $NEXT_TICK;
		3732	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
		3733	warn "jitter $JITTER\n";#d#
		3734	}
3378	},	3735	}
3379	);	3736	}
3380		3737
3381	{	3738	{
3382	BDB::max_poll_time $TICK * 0.1;	3739	# configure BDB
3383	$BDB_POLL_WATCHER = Event->io (	3740
3384	reentrant => 0,
3385	fd => BDB::poll_fileno,
3386	poll => 'r',
3387	prio => 0,
3388	data => WF_AUTOCANCEL,
3389	cb => \&BDB::poll_cb,
3390	);
3391	BDB::min_parallel 8;	3741	BDB::min_parallel 8;
3392		3742	BDB::max_poll_reqs $TICK * 0.1;
3393	BDB::set_sync_prepare {	3743	$Coro::BDB::WATCHER->priority (1);
3394	my $status;
3395	my $current = $Coro::current;
3396	(
3397	sub {
3398	$status = $!;
3399	$current->ready; undef $current;
3400	},
3401	sub {
3402	Coro::schedule while defined $current;
3403	$! = $status;
3404	},
3405	)
3406	};
3407		3744
3408	unless ($DB_ENV) {	3745	unless ($DB_ENV) {
3409	$DB_ENV = BDB::db_env_create;	3746	$DB_ENV = BDB::db_env_create;
		3747	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3748	| BDB::LOG_AUTOREMOVE, 1);
		3749	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3750	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3410		3751
3411	cf::sync_job {	3752	cf::sync_job {
3412	eval {	3753	eval {
3413	BDB::db_env_open	3754	BDB::db_env_open
3414	$DB_ENV,	3755	$DB_ENV,
…		…
3416	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3757	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3417	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3758	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3418	0666;	3759	0666;
3419		3760
3420	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3761	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3421
3422	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3423	$DB_ENV->set_lk_detect;
3424	};	3762	};
3425		3763
3426	cf::cleanup "db_env_open(db): $@" if $@;	3764	cf::cleanup "db_env_open(db): $@" if $@;
3427	};	3765	};
3428	}	3766	}
		3767
		3768	$BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
		3769	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3770	};
		3771	$BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
		3772	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3773	};
		3774	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
		3775	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3776	};
3429	}	3777	}
3430		3778
3431	{	3779	{
		3780	# configure IO::AIO
		3781
3432	IO::AIO::min_parallel 8;	3782	IO::AIO::min_parallel 8;
3433
3434	undef $Coro::AIO::WATCHER;
3435	IO::AIO::max_poll_time $TICK * 0.1;	3783	IO::AIO::max_poll_time $TICK * 0.1;
3436	$AIO_POLL_WATCHER = Event->io (	3784	$Coro::AIO::WATCHER->priority (1);
3437	reentrant => 0,
3438	data => WF_AUTOCANCEL,
3439	fd => IO::AIO::poll_fileno,
3440	poll => 'r',
3441	prio => 6,
3442	cb => \&IO::AIO::poll_cb,
3443	);
3444	}	3785	}
3445		3786
3446	my $_log_backtrace;	3787	my $_log_backtrace;
3447		3788
3448	sub _log_backtrace {	3789	sub _log_backtrace {
…		…
3452		3793
3453	# limit the # of concurrent backtraces	3794	# limit the # of concurrent backtraces
3454	if ($_log_backtrace < 2) {	3795	if ($_log_backtrace < 2) {
3455	++$_log_backtrace;	3796	++$_log_backtrace;
3456	async {	3797	async {
		3798	$Coro::current->{desc} = "abt $msg";
		3799
3457	my @bt = fork_call {	3800	my @bt = fork_call {
3458	@addr = map { sprintf "%x", $_ } @addr;	3801	@addr = map { sprintf "%x", $_ } @addr;
3459	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3802	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3460	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"	3803	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3461	or die "addr2line: $!";	3804	or die "addr2line: $!";

Diff Legend

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