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.303 by root, Wed Jul 11 15:57:31 2007 UTC vs.
Revision 1.396 by root, Wed Nov 14 08:09:46 2007 UTC

…		…
4	use strict;	4	use strict;
5		5
6	use Symbol;	6	use Symbol;
7	use List::Util;	7	use List::Util;
8	use Socket;	8	use Socket;
9	use Storable;	9	use EV;
10	use Event;
11	use Opcode;	10	use Opcode;
12	use Safe;	11	use Safe;
13	use Safe::Hole;	12	use Safe::Hole;
		13	use Storable ();
14		14
15	use Coro 3.61 ();	15	use Coro 4.1 ();
16	use Coro::State;	16	use Coro::State;
17	use Coro::Handle;	17	use Coro::Handle;
18	use Coro::Event;	18	use Coro::EV;
19	use Coro::Timer;	19	use Coro::Timer;
20	use Coro::Signal;	20	use Coro::Signal;
21	use Coro::Semaphore;	21	use Coro::Semaphore;
22	use Coro::AIO;	22	use Coro::AIO;
23	use Coro::Storable;	23	use Coro::Storable;
		24	use Coro::Util ();
24		25
25	use JSON::XS 1.4 ();	26	use JSON::XS ();
26	use BDB ();	27	use BDB ();
27	use Data::Dumper;	28	use Data::Dumper;
28	use Digest::MD5;	29	use Digest::MD5;
29	use Fcntl;	30	use Fcntl;
30	use YAML::Syck ();	31	use YAML::Syck ();
31	use IO::AIO 2.32 ();	32	use IO::AIO 2.51 ();
32	use Time::HiRes;	33	use Time::HiRes;
33	use Compress::LZF;	34	use Compress::LZF;
34	use Digest::MD5 ();	35	use Digest::MD5 ();
35		36
36	# configure various modules to our taste	37	# configure various modules to our taste
37	#	38	#
38	$Storable::canonical = 1; # reduce rsync transfers	39	$Storable::canonical = 1; # reduce rsync transfers
39	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	40	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
40	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	41	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
41
42	$Event::Eval = 1; # no idea why this is required, but it is
43		42
44	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?	43	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45	$YAML::Syck::ImplicitUnicode = 1;	44	$YAML::Syck::ImplicitUnicode = 1;
46		45
47	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	46	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
…		…
79	our $NEXT_TICK;	78	our $NEXT_TICK;
80	our $NOW;	79	our $NOW;
81	our $USE_FSYNC = 1; # use fsync to write maps - default off	80	our $USE_FSYNC = 1; # use fsync to write maps - default off
82		81
83	our $BDB_POLL_WATCHER;	82	our $BDB_POLL_WATCHER;
		83	our $BDB_DEADLOCK_WATCHER;
		84	our $BDB_CHECKPOINT_WATCHER;
		85	our $BDB_TRICKLE_WATCHER;
84	our $DB_ENV;	86	our $DB_ENV;
85		87
86	our %CFG;	88	our %CFG;
87		89
88	our $UPTIME; $UPTIME ||= time;	90	our $UPTIME; $UPTIME ||= time;
89	our $RUNTIME;	91	our $RUNTIME;
90		92
91	our %PLAYER; # all users	93	our (%PLAYER, %PLAYER_LOADING); # all users
92	our %MAP; # all maps	94	our (%MAP, %MAP_LOADING ); # all maps
93	our $LINK_MAP; # the special {link} map, which is always available	95	our $LINK_MAP; # the special {link} map, which is always available
94		96
95	# used to convert map paths into valid unix filenames by replacing / by ∕	97	# used to convert map paths into valid unix filenames by replacing / by ∕
96	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	98	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97		99
…		…
158		160
159	The raw value load value from the last tick.	161	The raw value load value from the last tick.
160		162
161	=item %cf::CFG	163	=item %cf::CFG
162		164
163	Configuration for the server, loaded from C</etc/crossfire/config>, or	165	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164	from wherever your confdir points to.	166	from wherever your confdir points to.
165		167
166	=item cf::wait_for_tick, cf::wait_for_tick_begin	168	=item cf::wait_for_tick, cf::wait_for_tick_begin
167		169
168	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	170	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
169	returns directly I<after> the tick processing (and consequently, can only wake one process	171	returns directly I<after> the tick processing (and consequently, can only wake one process
170	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	172	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
171		173
		174	=item @cf::INVOKE_RESULTS
		175
		176	This array contains the results of the last C<invoke ()> call. When
		177	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
		178	that call.
		179
172	=back	180	=back
173		181
174	=cut	182	=cut
175		183
176	BEGIN {	184	BEGIN {
…		…
180	$msg .= "\n"	188	$msg .= "\n"
181	unless $msg =~ /\n$/;	189	unless $msg =~ /\n$/;
182		190
183	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	191	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
184		192
185	utf8::encode $msg;
186	LOG llevError, $msg;	193	LOG llevError, $msg;
187	};	194	};
188	}	195	}
189		196
190	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	197	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
206	)) {	213	)) {
207	no strict 'refs';	214	no strict 'refs';
208	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	215	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
209	}	216	}
210		217
211	$Event::DIED = sub {	218	$EV::DIED = sub {
212	warn "error in event callback: @_";	219	warn "error in event callback: @_";
213	};	220	};
214		221
215	#############################################################################	222	#############################################################################
216		223
…		…
265	Wait until the given lock is available and then acquires it and returns	272	Wait until the given lock is available and then acquires it and returns
266	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	273	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
267	for example when the coroutine gets canceled), the lock is automatically	274	for example when the coroutine gets canceled), the lock is automatically
268	returned.	275	returned.
269		276
		277	Locks are *not* recursive, locking from the same coro twice results in a
		278	deadlocked coro.
		279
270	Lock names should begin with a unique identifier (for example, cf::map::find	280	Lock names should begin with a unique identifier (for example, cf::map::find
271	uses map_find and cf::map::load uses map_load).	281	uses map_find and cf::map::load uses map_load).
272		282
273	=item $locked = cf::lock_active $string	283	=item $locked = cf::lock_active $string
274		284
275	Return true if the lock is currently active, i.e. somebody has locked it.	285	Return true if the lock is currently active, i.e. somebody has locked it.
276		286
277	=cut	287	=cut
278		288
279	our %LOCK;	289	our %LOCK;
		290	our %LOCKER;#d#
280		291
281	sub lock_wait($) {	292	sub lock_wait($) {
282	my ($key) = @_;	293	my ($key) = @_;
		294
		295	if ($LOCKER{$key} == $Coro::current) {#d#
		296	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		297	return;#d#
		298	}#d#
283		299
284	# wait for lock, if any	300	# wait for lock, if any
285	while ($LOCK{$key}) {	301	while ($LOCK{$key}) {
286	push @{ $LOCK{$key} }, $Coro::current;	302	push @{ $LOCK{$key} }, $Coro::current;
287	Coro::schedule;	303	Coro::schedule;
…		…
293		309
294	# wait, to be sure we are not locked	310	# wait, to be sure we are not locked
295	lock_wait $key;	311	lock_wait $key;
296		312
297	$LOCK{$key} = [];	313	$LOCK{$key} = [];
		314	$LOCKER{$key} = $Coro::current;#d#
298		315
299	Coro::guard {	316	Coro::guard {
		317	delete $LOCKER{$key};#d#
300	# wake up all waiters, to be on the safe side	318	# wake up all waiters, to be on the safe side
301	$_->ready for @{ delete $LOCK{$key} };	319	$_->ready for @{ delete $LOCK{$key} };
302	}	320	}
303	}	321	}
304		322
…		…
316	};	334	};
317	$TICK_WATCHER->stop;	335	$TICK_WATCHER->stop;
318	$guard	336	$guard
319	}	337	}
320		338
		339	=item cf::periodic $interval, $cb
		340
		341	Like EV::periodic, but randomly selects a starting point so that the actions
		342	get spread over timer.
		343
		344	=cut
		345
		346	sub periodic($$) {
		347	my ($interval, $cb) = @_;
		348
		349	my $start = rand List::Util::min 180, $interval;
		350
		351	EV::periodic $start, $interval, 0, $cb
		352	}
		353
		354	=item cf::get_slot $time[, $priority[, $name]]
		355
		356	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		357	This call blocks and returns only when you have at least C<$time> seconds
		358	of cpu time till the next tick. The slot is only valid till the next cede.
		359
		360	The optional C<$name> can be used to identify the job to run. It might be
		361	used for statistical purposes and should identify the same time-class.
		362
		363	Useful for short background jobs.
		364
		365	=cut
		366
		367	our @SLOT_QUEUE;
		368	our $SLOT_QUEUE;
		369
		370	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		371	$SLOT_QUEUE = Coro::async {
		372	$Coro::current->desc ("timeslot manager");
		373
		374	my $signal = new Coro::Signal;
		375
		376	while () {
		377	next_job:
		378	my $avail = cf::till_tick;
		379	if ($avail > 0.01) {
		380	for (0 .. $#SLOT_QUEUE) {
		381	if ($SLOT_QUEUE[$_][0] < $avail) {
		382	my $job = splice @SLOT_QUEUE, $_, 1, ();
		383	$job->[2]->send;
		384	Coro::cede;
		385	goto next_job;
		386	}
		387	}
		388	}
		389
		390	if (@SLOT_QUEUE) {
		391	# we do not use wait_for_tick() as it returns immediately when tick is inactive
		392	push @cf::WAIT_FOR_TICK, $signal;
		393	$signal->wait;
		394	} else {
		395	Coro::schedule;
		396	}
		397	}
		398	};
		399
		400	sub get_slot($;$$) {
		401	my ($time, $pri, $name) = @_;
		402
		403	$time = $TICK * .6 if $time > $TICK * .6;
		404	my $sig = new Coro::Signal;
		405
		406	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		407	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		408	$SLOT_QUEUE->ready;
		409	$sig->wait;
		410	}
		411
321	=item cf::async { BLOCK }	412	=item cf::async { BLOCK }
322		413
323	Currently the same as Coro::async_pool, meaning you cannot use	414	Currently the same as Coro::async_pool, meaning you cannot use
324	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only	415	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
325	thing you are allowed to do is call C<prio> on it.	416	thing you are allowed to do is call C<prio> on it.
…		…
328		419
329	BEGIN { *async = \&Coro::async_pool }	420	BEGIN { *async = \&Coro::async_pool }
330		421
331	=item cf::sync_job { BLOCK }	422	=item cf::sync_job { BLOCK }
332		423
333	The design of Crossfire TRT requires that the main coroutine ($Coro::main)	424	The design of Deliantra requires that the main coroutine ($Coro::main)
334	is always able to handle events or runnable, as Crossfire TRT is only	425	is always able to handle events or runnable, as Deliantra is only
335	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not	426	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
336	acceptable.	427	acceptable.
337		428
338	If it must be done, put the blocking parts into C<sync_job>. This will run	429	If it must be done, put the blocking parts into C<sync_job>. This will run
339	the given BLOCK in another coroutine while waiting for the result. The	430	the given BLOCK in another coroutine while waiting for the result. The
…		…
344		435
345	sub sync_job(&) {	436	sub sync_job(&) {
346	my ($job) = @_;	437	my ($job) = @_;
347		438
348	if ($Coro::current == $Coro::main) {	439	if ($Coro::current == $Coro::main) {
349	my $time = Event::time;	440	my $time = EV::time;
350		441
351	# this is the main coro, too bad, we have to block	442	# this is the main coro, too bad, we have to block
352	# till the operation succeeds, freezing the server :/	443	# till the operation succeeds, freezing the server :/
353		444
		445	LOG llevError, Carp::longmess "sync job";#d#
		446
354	# TODO: use suspend/resume instead	447	# TODO: use suspend/resume instead
355	# (but this is cancel-safe)	448	# (but this is cancel-safe)
356	my $freeze_guard = freeze_mainloop;	449	my $freeze_guard = freeze_mainloop;
357		450
358	my $busy = 1;	451	my $busy = 1;
359	my @res;	452	my @res;
360		453
361	(async {	454	(async {
		455	$Coro::current->desc ("sync job coro");
362	@res = eval { $job->() };	456	@res = eval { $job->() };
363	warn $@ if $@;	457	warn $@ if $@;
364	undef $busy;	458	undef $busy;
365	})->prio (Coro::PRIO_MAX);	459	})->prio (Coro::PRIO_MAX);
366		460
367	while ($busy) {	461	while ($busy) {
368	Coro::cede or Event::one_event;	462	if (Coro::nready) {
		463	Coro::cede_notself;
		464	} else {
		465	EV::loop EV::LOOP_ONESHOT;
369	}	466	}
		467	}
370		468
371	$time = Event::time - $time;	469	$time = EV::time - $time;
372		470
373	LOG llevError | logBacktrace, Carp::longmess "long sync job"	471	LOG llevError | logBacktrace, Carp::longmess "long sync job"
374	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;	472	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
375		473
376	$tick_start += $time; # do not account sync jobs to server load	474	$tick_start += $time; # do not account sync jobs to server load
…		…
406	=item fork_call { }, $args	504	=item fork_call { }, $args
407		505
408	Executes the given code block with the given arguments in a seperate	506	Executes the given code block with the given arguments in a seperate
409	process, returning the results. Everything must be serialisable with	507	process, returning the results. Everything must be serialisable with
410	Coro::Storable. May, of course, block. Note that the executed sub may	508	Coro::Storable. May, of course, block. Note that the executed sub may
411	never block itself or use any form of Event handling.	509	never block itself or use any form of event handling.
412		510
413	=cut	511	=cut
414
415	sub _store_scalar {
416	open my $fh, ">", \my $buf
417	or die "fork_call: cannot open fh-to-buf in child : $!";
418	Storable::store_fd $_[0], $fh;
419	close $fh;
420
421	$buf
422	}
423		512
424	sub fork_call(&@) {	513	sub fork_call(&@) {
425	my ($cb, @args) = @_;	514	my ($cb, @args) = @_;
426		515
427	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	516	# we seemingly have to make a local copy of the whole thing,
428	# or die "socketpair: $!";	517	# otherwise perl prematurely frees the stuff :/
429	pipe my $fh1, my $fh2	518	# TODO: investigate and fix (likely this will be rather laborious)
430	or die "pipe: $!";
431		519
432	if (my $pid = fork) {	520	my @res = Coro::Util::fork_eval {
433	close $fh2;
434
435	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
436	warn "pst<$res>" unless $res =~ /^pst/;
437	$res = Coro::Storable::thaw $res;
438
439	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
440
441	Carp::confess $$res unless "ARRAY" eq ref $res;
442
443	return wantarray ? @$res : $res->[-1];
444	} else {
445	reset_signals;	521	reset_signals;
446	local $SIG{__WARN__};	522	&$cb
447	local $SIG{__DIE__};	523	}, @args;
448	# just in case, this hack effectively disables event
449	# in the child. cleaner and slower would be canceling all watchers,
450	# but this works for the time being.
451	local $Coro::idle;
452	$Coro::current->prio (Coro::PRIO_MAX);
453		524
454	eval {	525	wantarray ? @res : $res[-1]
455	close $fh1;
456
457	my @res = eval { $cb->(@args) };
458
459	syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
460	close $fh2;
461	};
462
463	warn $@ if $@;
464	_exit 0;
465	}
466	}	526	}
467		527
468	=item $value = cf::db_get $family => $key	528	=item $value = cf::db_get $family => $key
469		529
470	Returns a single value from the environment database.	530	Returns a single value from the environment database.
…		…
472	=item cf::db_put $family => $key => $value	532	=item cf::db_put $family => $key => $value
473		533
474	Stores the given C<$value> in the family. It can currently store binary	534	Stores the given C<$value> in the family. It can currently store binary
475	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).	535	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
476		536
		537	=item $db = cf::db_table "name"
		538
		539	Create and/or open a new database table. The string must not be "db" and must be unique
		540	within each server.
		541
477	=cut	542	=cut
		543
		544	sub db_table($) {
		545	my ($name) = @_;
		546	my $db = BDB::db_create $DB_ENV;
		547
		548	eval {
		549	$db->set_flags (BDB::CHKSUM);
		550
		551	utf8::encode $name;
		552	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		553	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		554	cf::cleanup "db_open(db): $!" if $!;
		555	};
		556	cf::cleanup "db_open(db): $@" if $@;
		557
		558	$db
		559	}
478		560
479	our $DB;	561	our $DB;
480		562
481	sub db_init {	563	sub db_init {
482	unless ($DB) {
483	$DB = BDB::db_create $DB_ENV;
484
485	cf::sync_job {	564	cf::sync_job {
486	eval {	565	$DB ||= db_table "db";
487	$DB->set_flags (BDB::CHKSUM);
488
489	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
490	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
491	cf::cleanup "db_open(db): $!" if $!;
492	};
493	cf::cleanup "db_open(db): $@" if $@;
494	};
495	}	566	};
496	}	567	}
497		568
498	sub db_get($$) {	569	sub db_get($$) {
499	my $key = "$_[0]/$_[1]";	570	my $key = "$_[0]/$_[1]";
500		571
…		…
550	if (1) {	621	if (1) {
551	$md5 =	622	$md5 =
552	join "\x00",	623	join "\x00",
553	$processversion,	624	$processversion,
554	map {	625	map {
555	Coro::cede;	626	cf::cede_to_tick;
556	($src->[$_], Digest::MD5::md5_hex $data[$_])	627	($src->[$_], Digest::MD5::md5_hex $data[$_])
557	} 0.. $#$src;	628	} 0.. $#$src;
558		629
559		630
560	my $dbmd5 = db_get cache => "$id/md5";	631	my $dbmd5 = db_get cache => "$id/md5";
…		…
604	attach callbacks/event handlers (a collection of which is called an "attachment")	675	attach callbacks/event handlers (a collection of which is called an "attachment")
605	to it. All such attachable objects support the following methods.	676	to it. All such attachable objects support the following methods.
606		677
607	In the following description, CLASS can be any of C<global>, C<object>	678	In the following description, CLASS can be any of C<global>, C<object>
608	C<player>, C<client> or C<map> (i.e. the attachable objects in	679	C<player>, C<client> or C<map> (i.e. the attachable objects in
609	Crossfire TRT).	680	Deliantra).
610		681
611	=over 4	682	=over 4
612		683
613	=item $attachable->attach ($attachment, key => $value...)	684	=item $attachable->attach ($attachment, key => $value...)
614		685
…		…
866	";	937	";
867	die if $@;	938	die if $@;
868	}	939	}
869		940
870	our $override;	941	our $override;
871	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	942	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
872		943
873	sub override {	944	sub override {
874	$override = 1;	945	$override = 1;
875	@invoke_results = ();	946	@INVOKE_RESULTS = (@_);
876	}	947	}
877		948
878	sub do_invoke {	949	sub do_invoke {
879	my $event = shift;	950	my $event = shift;
880	my $callbacks = shift;	951	my $callbacks = shift;
881		952
882	@invoke_results = ();	953	@INVOKE_RESULTS = ();
883		954
884	local $override;	955	local $override;
885		956
886	for (@$callbacks) {	957	for (@$callbacks) {
887	eval { &{$_->[1]} };	958	eval { &{$_->[1]} };
…		…
904		975
905	Generate an object-specific event with the given arguments.	976	Generate an object-specific event with the given arguments.
906		977
907	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	978	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
908	removed in future versions), and there is no public API to access override	979	removed in future versions), and there is no public API to access override
909	results (if you must, access C<@cf::invoke_results> directly).	980	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910		981
911	=back	982	=back
912		983
913	=cut	984	=cut
914		985
915	#############################################################################	986	#############################################################################
916	# object support	987	# object support
		988
		989	sub _object_equal($$);
		990	sub _object_equal($$) {
		991	my ($a, $b) = @_;
		992
		993	return 0 unless (ref $a) eq (ref $b);
		994
		995	if ("HASH" eq ref $a) {
		996	my @ka = keys %$a;
		997	my @kb = keys %$b;
		998
		999	return 0 if @ka != @kb;
		1000
		1001	for (0 .. $#ka) {
		1002	return 0 unless $ka[$_] eq $kb[$_];
		1003	return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
		1004	}
		1005
		1006	} elsif ("ARRAY" eq ref $a) {
		1007
		1008	return 0 if @$a != @$b;
		1009
		1010	for (0 .. $#$a) {
		1011	return 0 unless _object_equal $a->[$_], $b->[$_];
		1012	}
		1013
		1014	} elsif ($a ne $b) {
		1015	return 0;
		1016	}
		1017
		1018	1
		1019	}
		1020
		1021	our $SLOW_MERGES;#d#
		1022	sub _can_merge {
		1023	my ($ob1, $ob2) = @_;
		1024
		1025	++$SLOW_MERGES;#d#
		1026
		1027	# we do the slow way here
		1028	return _object_equal $ob1, $ob2
		1029	}
917		1030
918	sub reattach {	1031	sub reattach {
919	# basically do the same as instantiate, without calling instantiate	1032	# basically do the same as instantiate, without calling instantiate
920	my ($obj) = @_;	1033	my ($obj) = @_;
921		1034
…		…
968	sub object_freezer_save {	1081	sub object_freezer_save {
969	my ($filename, $rdata, $objs) = @_;	1082	my ($filename, $rdata, $objs) = @_;
970		1083
971	sync_job {	1084	sync_job {
972	if (length $$rdata) {	1085	if (length $$rdata) {
		1086	utf8::decode (my $decname = $filename);
973	warn sprintf "saving %s (%d,%d)\n",	1087	warn sprintf "saving %s (%d,%d)\n",
974	$filename, length $$rdata, scalar @$objs;	1088	$decname, length $$rdata, scalar @$objs;
975		1089
976	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1090	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
977	chmod SAVE_MODE, $fh;	1091	chmod SAVE_MODE, $fh;
978	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1092	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
979	aio_fsync $fh if $cf::USE_FSYNC;	1093	aio_fsync $fh if $cf::USE_FSYNC;
980	close $fh;	1094	close $fh;
981		1095
982	if (@$objs) {	1096	if (@$objs) {
983	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1097	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
984	chmod SAVE_MODE, $fh;	1098	chmod SAVE_MODE, $fh;
985	my $data = Storable::nfreeze { version => 1, objs => $objs };	1099	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
986	aio_write $fh, 0, (length $data), $data, 0;	1100	aio_write $fh, 0, (length $data), $data, 0;
987	aio_fsync $fh if $cf::USE_FSYNC;	1101	aio_fsync $fh if $cf::USE_FSYNC;
988	close $fh;	1102	close $fh;
989	aio_rename "$filename.pst~", "$filename.pst";	1103	aio_rename "$filename.pst~", "$filename.pst";
990	}	1104	}
…		…
998	}	1112	}
999	} else {	1113	} else {
1000	aio_unlink $filename;	1114	aio_unlink $filename;
1001	aio_unlink "$filename.pst";	1115	aio_unlink "$filename.pst";
1002	}	1116	}
1003	}	1117	};
1004	}	1118	}
1005		1119
1006	sub object_freezer_as_string {	1120	sub object_freezer_as_string {
1007	my ($rdata, $objs) = @_;	1121	my ($rdata, $objs) = @_;
1008		1122
…		…
1020	or return;	1134	or return;
1021		1135
1022	unless (aio_stat "$filename.pst") {	1136	unless (aio_stat "$filename.pst") {
1023	(aio_load "$filename.pst", $av) >= 0	1137	(aio_load "$filename.pst", $av) >= 0
1024	or return;	1138	or return;
		1139
1025	$av = eval { (Storable::thaw $av)->{objs} };	1140	my $st = eval { Coro::Storable::thaw $av };
		1141	$av = $st->{objs};
1026	}	1142	}
1027		1143
		1144	utf8::decode (my $decname = $filename);
1028	warn sprintf "loading %s (%d)\n",	1145	warn sprintf "loading %s (%d,%d)\n",
1029	$filename, length $data, scalar @{$av || []};	1146	$decname, length $data, scalar @{$av || []};
		1147
1030	return ($data, $av);	1148	($data, $av)
1031	}	1149	}
1032		1150
1033	=head2 COMMAND CALLBACKS	1151	=head2 COMMAND CALLBACKS
1034		1152
1035	=over 4	1153	=over 4
…		…
1108	my ($pl, $buf) = @_;	1226	my ($pl, $buf) = @_;
1109		1227
1110	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1228	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111		1229
1112	if (ref $msg) {	1230	if (ref $msg) {
		1231	my ($type, $reply, @payload) =
		1232	"ARRAY" eq ref $msg
		1233	? @$msg
		1234	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1235
		1236	my @reply;
		1237
1113	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1238	if (my $cb = $EXTCMD{$type}) {
1114	if (my %reply = $cb->($pl, $msg)) {	1239	@reply = $cb->($pl, @payload);
1115	$pl->ext_reply ($msg->{msgid}, %reply);
1116	}
1117	}	1240	}
		1241
		1242	$pl->ext_reply ($reply, @reply)
		1243	if $reply;
		1244
1118	} else {	1245	} else {
1119	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1246	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120	}	1247	}
1121		1248
1122	cf::override;	1249	cf::override;
…		…
1212		1339
1213	=head3 cf::player	1340	=head3 cf::player
1214		1341
1215	=over 4	1342	=over 4
1216		1343
		1344	=item cf::player::num_playing
		1345
		1346	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1347
		1348	=cut
		1349
		1350	sub num_playing {
		1351	scalar grep
		1352	$_->ob->map
		1353	&& !$_->hidden
		1354	&& !$_->ob->flag (cf::FLAG_WIZ),
		1355	cf::player::list
		1356	}
		1357
1217	=item cf::player::find $login	1358	=item cf::player::find $login
1218		1359
1219	Returns the given player object, loading it if necessary (might block).	1360	Returns the given player object, loading it if necessary (might block).
1220		1361
1221	=cut	1362	=cut
…		…
1256	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1397	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1257	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1398	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1258	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1399	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1259	aio_unlink +(playerdir $login) . "/$login.pl";	1400	aio_unlink +(playerdir $login) . "/$login.pl";
1260		1401
1261	my $pl = load_pl path $login	1402	my $f = new_from_file cf::object::thawer path $login
1262	or return;	1403	or return;
		1404
		1405	my $pl = cf::player::load_pl $f
		1406	or return;
		1407	local $cf::PLAYER_LOADING{$login} = $pl;
		1408	$f->resolve_delayed_derefs;
1263	$cf::PLAYER{$login} = $pl	1409	$cf::PLAYER{$login} = $pl
1264	}	1410	}
1265	}	1411	}
1266	}	1412	}
1267		1413
…		…
1277		1423
1278	aio_mkdir playerdir $pl, 0770;	1424	aio_mkdir playerdir $pl, 0770;
1279	$pl->{last_save} = $cf::RUNTIME;	1425	$pl->{last_save} = $cf::RUNTIME;
1280		1426
1281	$pl->save_pl ($path);	1427	$pl->save_pl ($path);
1282	Coro::cede;	1428	cf::cede_to_tick;
1283	}	1429	}
1284		1430
1285	sub new($) {	1431	sub new($) {
1286	my ($login) = @_;	1432	my ($login) = @_;
1287		1433
…		…
1291	$self->{deny_save} = 1;	1437	$self->{deny_save} = 1;
1292		1438
1293	$cf::PLAYER{$login} = $self;	1439	$cf::PLAYER{$login} = $self;
1294		1440
1295	$self	1441	$self
		1442	}
		1443
		1444	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1445
		1446	=cut
		1447
		1448	sub send_msg {
		1449	my $ns = shift->ns
		1450	or return;
		1451	$ns->send_msg (@_);
1296	}	1452	}
1297		1453
1298	=item $pl->quit_character	1454	=item $pl->quit_character
1299		1455
1300	Nukes the player without looking back. If logged in, the connection will	1456	Nukes the player without looking back. If logged in, the connection will
…		…
1355	or return [];	1511	or return [];
1356		1512
1357	my @logins;	1513	my @logins;
1358		1514
1359	for my $login (@$dirs) {	1515	for my $login (@$dirs) {
		1516	my $path = path $login;
		1517
		1518	# a .pst is a dead give-away for a valid player
		1519	unless (-e "$path.pst") {
1360	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1520	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1361	aio_read $fh, 0, 512, my $buf, 0 or next;	1521	aio_read $fh, 0, 512, my $buf, 0 or next;
1362	$buf !~ /^password -------------$/m or next; # official not-valid tag	1522	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1523	}
1363		1524
1364	utf8::decode $login;	1525	utf8::decode $login;
1365	push @logins, $login;	1526	push @logins, $login;
1366	}	1527	}
1367		1528
…		…
1400		1561
1401	Expand crossfire pod fragments into protocol xml.	1562	Expand crossfire pod fragments into protocol xml.
1402		1563
1403	=cut	1564	=cut
1404		1565
		1566	use re 'eval';
		1567
		1568	my $group;
		1569	my $interior; $interior = qr{
		1570	# match a pod interior sequence sans C<< >>
		1571	(?:
		1572	\ (.*?)\ (?{ $group = $^N })
		1573	| < (??{$interior}) >
		1574	)
		1575	}x;
		1576
1405	sub expand_cfpod {	1577	sub expand_cfpod {
1406	((my $self), (local $_)) = @_;	1578	my ($self, $pod) = @_;
1407		1579
1408	# escape & and <	1580	my $xml;
1409	s/&/&amp;/g;
1410	s/(?<![BIUGH])</&lt;/g;
1411		1581
1412	# this is buggy, it needs to properly take care of nested <'s	1582	while () {
		1583	if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
		1584	$group = $1;
1413		1585
1414	1 while	1586	$group =~ s/&/&amp;/g;
1415	# replace B<>, I<>, U<> etc.	1587	$group =~ s/</&lt;/g;
1416	s/B<([^\>]*)>/<b>$1<\/b>/	1588
1417	|| s/I<([^\>]*)>/<i>$1<\/i>/	1589	$xml .= $group;
1418	|| s/U<([^\>]*)>/<u>$1<\/u>/	1590	} elsif ($pod =~ m%\G
1419	# replace G<male|female> tags	1591	([BCGHITU])
1420	|| s{G<([^>|]*)\|([^>]*)>}{	1592	<
1421	$self->gender ? $2 : $1	1593	(?:
1422	}ge	1594	([^<>]*) (?{ $group = $^N })
1423	# replace H<hint text>	1595	| < $interior >
1424	|| s{H<([^\>]*)>}	1596	)
		1597	>
		1598	%gcsx
1425	{	1599	) {
		1600	my ($code, $data) = ($1, $group);
		1601
		1602	if ($code eq "B") {
		1603	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
		1604	} elsif ($code eq "I") {
		1605	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
		1606	} elsif ($code eq "U") {
		1607	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
		1608	} elsif ($code eq "C") {
		1609	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
		1610	} elsif ($code eq "T") {
		1611	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
		1612	} elsif ($code eq "G") {
		1613	my ($male, $female) = split /\|/, $data;
		1614	$data = $self->gender ? $female : $male;
		1615	$xml .= expand_cfpod ($self, $data);
		1616	} elsif ($code eq "H") {
1426	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",	1617	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1427	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",	1618	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1428	"")	1619	"")
1429	[$self->{hintmode}]	1620	[$self->{hintmode}];
		1621	} else {
		1622	$xml .= "error processing '$code($data)' directive";
1430	}ge;	1623	}
		1624	} else {
		1625	if ($pod =~ /\G(.+)/) {
		1626	warn "parse error while expanding $pod (at $1)";
		1627	}
		1628	last;
		1629	}
		1630	}
1431		1631
		1632	for ($xml) {
1432	# create single paragraphs (very hackish)	1633	# create single paragraphs (very hackish)
1433	s/(?<=\S)\n(?=\w)/ /g;	1634	s/(?<=\S)\n(?=\w)/ /g;
1434		1635
1435	# compress some whitespace	1636	# compress some whitespace
1436	s/\s+\n/\n/g; # ws line-ends	1637	s/\s+\n/\n/g; # ws line-ends
1437	s/\n\n+/\n/g; # double lines	1638	s/\n\n+/\n/g; # double lines
1438	s/^\n+//; # beginning lines	1639	s/^\n+//; # beginning lines
1439	s/\n+$//; # ending lines	1640	s/\n+$//; # ending lines
		1641	}
1440		1642
1441	$_	1643	$xml
1442	}	1644	}
		1645
		1646	no re 'eval';
1443		1647
1444	sub hintmode {	1648	sub hintmode {
1445	$_[0]{hintmode} = $_[1] if @_ > 1;	1649	$_[0]{hintmode} = $_[1] if @_ > 1;
1446	$_[0]{hintmode}	1650	$_[0]{hintmode}
1447	}	1651	}
1448		1652
1449	=item $player->ext_reply ($msgid, %msg)	1653	=item $player->ext_reply ($msgid, @msg)
1450		1654
1451	Sends an ext reply to the player.	1655	Sends an ext reply to the player.
1452		1656
1453	=cut	1657	=cut
1454		1658
1455	sub ext_reply($$%) {	1659	sub ext_reply($$@) {
1456	my ($self, $id, %msg) = @_;	1660	my ($self, $id, @msg) = @_;
1457		1661
1458	$msg{msgid} = $id;	1662	$self->ns->ext_reply ($id, @msg)
1459	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460	}	1663	}
1461		1664
1462	=item $player->ext_event ($type, %msg)	1665	=item $player->ext_msg ($type, @msg)
1463		1666
1464	Sends an ext event to the client.	1667	Sends an ext event to the client.
1465		1668
1466	=cut	1669	=cut
1467		1670
1468	sub ext_event($$%) {	1671	sub ext_msg($$@) {
1469	my ($self, $type, %msg) = @_;	1672	my ($self, $type, @msg) = @_;
1470		1673
1471	$self->ns->ext_event ($type, %msg);	1674	$self->ns->ext_msg ($type, @msg);
1472	}	1675	}
1473		1676
1474	=head3 cf::region	1677	=head3 cf::region
1475		1678
1476	=over 4	1679	=over 4
…		…
1489	my ($path) = @_;	1692	my ($path) = @_;
1490		1693
1491	my ($match, $specificity);	1694	my ($match, $specificity);
1492		1695
1493	for my $region (list) {	1696	for my $region (list) {
1494	if ($region->match && $path =~ $region->match) {	1697	if ($region->{match} && $path =~ $region->{match}) {
1495	($match, $specificity) = ($region, $region->specificity)	1698	($match, $specificity) = ($region, $region->specificity)
1496	if $region->specificity > $specificity;	1699	if $region->specificity > $specificity;
1497	}	1700	}
1498	}	1701	}
1499		1702
…		…
1619	$self->init; # pass $1 etc.	1822	$self->init; # pass $1 etc.
1620	return $self;	1823	return $self;
1621	}	1824	}
1622	}	1825	}
1623		1826
1624	Carp::carp "unable to resolve path '$path' (base '$base').";	1827	Carp::cluck "unable to resolve path '$path' (base '$base').";
1625	()	1828	()
1626	}	1829	}
1627		1830
1628	sub init {	1831	sub init {
1629	my ($self) = @_;	1832	my ($self) = @_;
…		…
1692		1895
1693	sub load_header_from($) {	1896	sub load_header_from($) {
1694	my ($self, $path) = @_;	1897	my ($self, $path) = @_;
1695		1898
1696	utf8::encode $path;	1899	utf8::encode $path;
1697	#aio_open $path, O_RDONLY, 0	1900	my $f = new_from_file cf::object::thawer $path
1698	# or return;
1699
1700	$self->_load_header ($path)
1701	or return;	1901	or return;
		1902
		1903	$self->_load_header ($f)
		1904	or return;
		1905
		1906	local $MAP_LOADING{$self->{path}} = $self;
		1907	$f->resolve_delayed_derefs;
1702		1908
1703	$self->{load_path} = $path;	1909	$self->{load_path} = $path;
1704		1910
1705	1	1911	1
1706	}	1912	}
…		…
1760	sub find {	1966	sub find {
1761	my ($path, $origin) = @_;	1967	my ($path, $origin) = @_;
1762		1968
1763	$path = normalise $path, $origin && $origin->path;	1969	$path = normalise $path, $origin && $origin->path;
1764		1970
		1971	cf::lock_wait "map_data:$path";#d#remove
1765	cf::lock_wait "map_find:$path";	1972	cf::lock_wait "map_find:$path";
1766		1973
1767	$cf::MAP{$path} || do {	1974	$cf::MAP{$path} || do {
1768	my $guard = cf::lock_acquire "map_find:$path";	1975	my $guard1 = cf::lock_acquire "map_find:$path";
		1976	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1977
1769	my $map = new_from_path cf::map $path	1978	my $map = new_from_path cf::map $path
1770	or return;	1979	or return;
1771		1980
1772	$map->{last_save} = $cf::RUNTIME;	1981	$map->{last_save} = $cf::RUNTIME;
1773		1982
…		…
1775	or return;	1984	or return;
1776		1985
1777	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1986	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778	# doing this can freeze the server in a sync job, obviously	1987	# doing this can freeze the server in a sync job, obviously
1779	#$cf::WAIT_FOR_TICK->wait;	1988	#$cf::WAIT_FOR_TICK->wait;
		1989	undef $guard1;
		1990	undef $guard2;
1780	$map->reset;	1991	$map->reset;
1781	undef $guard;
1782	return find $path;	1992	return find $path;
1783	}	1993	}
1784		1994
1785	$cf::MAP{$path} = $map	1995	$cf::MAP{$path} = $map
1786	}	1996	}
…		…
1795	local $self->{deny_reset} = 1; # loading can take a long time	2005	local $self->{deny_reset} = 1; # loading can take a long time
1796		2006
1797	my $path = $self->{path};	2007	my $path = $self->{path};
1798		2008
1799	{	2009	{
1800	my $guard = cf::lock_acquire "map_load:$path";	2010	my $guard = cf::lock_acquire "map_data:$path";
1801		2011
		2012	return unless $self->valid;
1802	return if $self->in_memory != cf::MAP_SWAPPED;	2013	return unless $self->in_memory == cf::MAP_SWAPPED;
1803		2014
1804	$self->in_memory (cf::MAP_LOADING);	2015	$self->in_memory (cf::MAP_LOADING);
1805		2016
1806	$self->alloc;	2017	$self->alloc;
1807		2018
1808	$self->pre_load;	2019	$self->pre_load;
1809	Coro::cede;	2020	cf::cede_to_tick;
1810		2021
		2022	my $f = new_from_file cf::object::thawer $self->{load_path};
		2023	$f->skip_block;
1811	$self->_load_objects ($self->{load_path}, 1)	2024	$self->_load_objects ($f)
1812	or return;	2025	or return;
1813		2026
1814	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2027	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1815	if delete $self->{load_original};	2028	if delete $self->{load_original};
1816		2029
1817	if (my $uniq = $self->uniq_path) {	2030	if (my $uniq = $self->uniq_path) {
1818	utf8::encode $uniq;	2031	utf8::encode $uniq;
1819	if (aio_open $uniq, O_RDONLY, 0) {	2032	unless (aio_stat $uniq) {
		2033	if (my $f = new_from_file cf::object::thawer $uniq) {
1820	$self->clear_unique_items;	2034	$self->clear_unique_items;
1821	$self->_load_objects ($uniq, 0);	2035	$self->_load_objects ($f);
		2036	$f->resolve_delayed_derefs;
		2037	}
1822	}	2038	}
1823	}	2039	}
1824		2040
1825	Coro::cede;	2041	$f->resolve_delayed_derefs;
		2042
		2043	cf::cede_to_tick;
1826	# now do the right thing for maps	2044	# now do the right thing for maps
1827	$self->link_multipart_objects;	2045	$self->link_multipart_objects;
1828	$self->difficulty ($self->estimate_difficulty)	2046	$self->difficulty ($self->estimate_difficulty)
1829	unless $self->difficulty;	2047	unless $self->difficulty;
1830	Coro::cede;	2048	cf::cede_to_tick;
1831		2049
1832	unless ($self->{deny_activate}) {	2050	unless ($self->{deny_activate}) {
1833	$self->decay_objects;	2051	$self->decay_objects;
1834	$self->fix_auto_apply;	2052	$self->fix_auto_apply;
1835	$self->update_buttons;	2053	$self->update_buttons;
1836	Coro::cede;	2054	cf::cede_to_tick;
1837	$self->set_darkness_map;	2055	$self->set_darkness_map;
1838	Coro::cede;	2056	cf::cede_to_tick;
1839	$self->activate;	2057	$self->activate;
1840	}	2058	}
		2059
		2060	$self->{last_save} = $cf::RUNTIME;
		2061	$self->last_access ($cf::RUNTIME);
1841		2062
1842	$self->in_memory (cf::MAP_IN_MEMORY);	2063	$self->in_memory (cf::MAP_IN_MEMORY);
1843	}	2064	}
1844		2065
1845	$self->post_load;	2066	$self->post_load;
…		…
1856		2077
1857	$self	2078	$self
1858	}	2079	}
1859		2080
1860	# find and load all maps in the 3x3 area around a map	2081	# find and load all maps in the 3x3 area around a map
1861	sub load_diag {	2082	sub load_neighbours {
1862	my ($map) = @_;	2083	my ($map) = @_;
1863		2084
1864	my @diag; # diagonal neighbours	2085	my @neigh; # diagonal neighbours
1865		2086
1866	for (0 .. 3) {	2087	for (0 .. 3) {
1867	my $neigh = $map->tile_path ($_)	2088	my $neigh = $map->tile_path ($_)
1868	or next;	2089	or next;
1869	$neigh = find $neigh, $map	2090	$neigh = find $neigh, $map
1870	or next;	2091	or next;
1871	$neigh->load;	2092	$neigh->load;
1872		2093
		2094	push @neigh,
1873	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2095	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1874	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2096	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1875	}	2097	}
1876		2098
1877	for (@diag) {	2099	for (grep defined $_->[0], @neigh) {
		2100	my ($path, $origin) = @$_;
1878	my $neigh = find @$_	2101	my $neigh = find $path, $origin
1879	or next;	2102	or next;
1880	$neigh->load;	2103	$neigh->load;
1881	}	2104	}
1882	}	2105	}
1883		2106
…		…
1888	}	2111	}
1889		2112
1890	sub do_load_sync {	2113	sub do_load_sync {
1891	my ($map) = @_;	2114	my ($map) = @_;
1892		2115
		2116	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2117	if $Coro::current == $Coro::main;
		2118
1893	cf::sync_job { $map->load };	2119	cf::sync_job { $map->load };
1894	}	2120	}
1895		2121
1896	our %MAP_PREFETCH;	2122	our %MAP_PREFETCH;
1897	our $MAP_PREFETCHER = undef;	2123	our $MAP_PREFETCHER = undef;
1898		2124
1899	sub find_async {	2125	sub find_async {
1900	my ($path, $origin) = @_;	2126	my ($path, $origin, $load) = @_;
1901		2127
1902	$path = normalise $path, $origin && $origin->{path};	2128	$path = normalise $path, $origin && $origin->{path};
1903		2129
1904	if (my $map = $cf::MAP{$path}) {	2130	if (my $map = $cf::MAP{$path}) {
1905	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2131	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1906	}	2132	}
1907		2133
1908	undef $MAP_PREFETCH{$path};	2134	$MAP_PREFETCH{$path} |= $load;
		2135
1909	$MAP_PREFETCHER ||= cf::async {	2136	$MAP_PREFETCHER ||= cf::async {
		2137	$Coro::current->{desc} = "map prefetcher";
		2138
1910	while (%MAP_PREFETCH) {	2139	while (%MAP_PREFETCH) {
1911	for my $path (keys %MAP_PREFETCH) {	2140	while (my ($k, $v) = each %MAP_PREFETCH) {
1912	my $map = find $path	2141	if (my $map = find $k) {
1913	or next;
1914	$map->load;	2142	$map->load if $v;
		2143	}
1915		2144
1916	delete $MAP_PREFETCH{$path};	2145	delete $MAP_PREFETCH{$k};
1917	}	2146	}
1918	}	2147	}
1919	undef $MAP_PREFETCHER;	2148	undef $MAP_PREFETCHER;
1920	};	2149	};
1921	$MAP_PREFETCHER->prio (6);	2150	$MAP_PREFETCHER->prio (6);
…		…
1924	}	2153	}
1925		2154
1926	sub save {	2155	sub save {
1927	my ($self) = @_;	2156	my ($self) = @_;
1928		2157
1929	my $lock = cf::lock_acquire "map_data:" . $self->path;	2158	my $lock = cf::lock_acquire "map_data:$self->{path}";
1930		2159
1931	$self->{last_save} = $cf::RUNTIME;	2160	$self->{last_save} = $cf::RUNTIME;
1932		2161
1933	return unless $self->dirty;	2162	return unless $self->dirty;
1934		2163
…		…
1940	return if $self->{deny_save};	2169	return if $self->{deny_save};
1941		2170
1942	local $self->{last_access} = $self->last_access;#d#	2171	local $self->{last_access} = $self->last_access;#d#
1943		2172
1944	cf::async {	2173	cf::async {
		2174	$Coro::current->{desc} = "map player save";
1945	$_->contr->save for $self->players;	2175	$_->contr->save for $self->players;
1946	};	2176	};
1947		2177
1948	if ($uniq) {	2178	if ($uniq) {
1949	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2179	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
…		…
1957	my ($self) = @_;	2187	my ($self) = @_;
1958		2188
1959	# save first because save cedes	2189	# save first because save cedes
1960	$self->save;	2190	$self->save;
1961		2191
1962	my $lock = cf::lock_acquire "map_data:" . $self->path;	2192	my $lock = cf::lock_acquire "map_data:$self->{path}";
1963		2193
1964	return if $self->players;	2194	return if $self->players;
1965	return if $self->in_memory != cf::MAP_IN_MEMORY;	2195	return if $self->in_memory != cf::MAP_IN_MEMORY;
1966	return if $self->{deny_save};	2196	return if $self->{deny_save};
1967		2197
		2198	$self->in_memory (cf::MAP_SWAPPED);
		2199
		2200	$self->deactivate;
		2201	$_->clear_links_to ($self) for values %cf::MAP;
1968	$self->clear;	2202	$self->clear;
1969	$self->in_memory (cf::MAP_SWAPPED);
1970	}	2203	}
1971		2204
1972	sub reset_at {	2205	sub reset_at {
1973	my ($self) = @_;	2206	my ($self) = @_;
1974		2207
…		…
2006	if $uniq;	2239	if $uniq;
2007	}	2240	}
2008		2241
2009	delete $cf::MAP{$self->path};	2242	delete $cf::MAP{$self->path};
2010		2243
		2244	$self->deactivate;
		2245	$_->clear_links_to ($self) for values %cf::MAP;
2011	$self->clear;	2246	$self->clear;
2012
2013	$_->clear_links_to ($self) for values %cf::MAP;
2014		2247
2015	$self->unlink_save;	2248	$self->unlink_save;
2016	$self->destroy;	2249	$self->destroy;
2017	}	2250	}
2018		2251
2019	my $nuke_counter = "aaaa";	2252	my $nuke_counter = "aaaa";
2020		2253
2021	sub nuke {	2254	sub nuke {
2022	my ($self) = @_;	2255	my ($self) = @_;
2023		2256
		2257	{
		2258	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2259
2024	delete $cf::MAP{$self->path};	2260	delete $cf::MAP{$self->path};
2025		2261
2026	$self->unlink_save;	2262	$self->unlink_save;
2027		2263
2028	bless $self, "cf::map";	2264	bless $self, "cf::map";
2029	delete $self->{deny_reset};	2265	delete $self->{deny_reset};
2030	$self->{deny_save} = 1;	2266	$self->{deny_save} = 1;
2031	$self->reset_timeout (1);	2267	$self->reset_timeout (1);
2032	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2268	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033		2269
2034	$cf::MAP{$self->path} = $self;	2270	$cf::MAP{$self->path} = $self;
		2271	}
2035		2272
2036	$self->reset; # polite request, might not happen	2273	$self->reset; # polite request, might not happen
2037	}	2274	}
2038		2275
2039	=item $maps = cf::map::tmp_maps	2276	=item $maps = cf::map::tmp_maps
…		…
2115		2352
2116	sub inv_recursive {	2353	sub inv_recursive {
2117	inv_recursive_ inv $_[0]	2354	inv_recursive_ inv $_[0]
2118	}	2355	}
2119		2356
		2357	=item $ref = $ob->ref
		2358
		2359	creates and returns a persistent reference to an objetc that can be stored as a string.
		2360
		2361	=item $ob = cf::object::deref ($refstring)
		2362
		2363	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2364	even if the object actually exists. May block.
		2365
		2366	=cut
		2367
		2368	sub deref {
		2369	my ($ref) = @_;
		2370
		2371	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2372	my ($uuid, $name) = ($1, $2);
		2373	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2374	or return;
		2375	$pl->ob->uuid eq $uuid
		2376	or return;
		2377
		2378	$pl->ob
		2379	} else {
		2380	warn "$ref: cannot resolve object reference\n";
		2381	undef
		2382	}
		2383	}
		2384
2120	package cf;	2385	package cf;
2121		2386
2122	=back	2387	=back
2123		2388
2124	=head3 cf::object::player	2389	=head3 cf::object::player
…		…
2146		2411
2147	} else {	2412	} else {
2148	my $pl = $self->contr;	2413	my $pl = $self->contr;
2149		2414
2150	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2415	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151	my $diag = $pl->{npc_dialog};	2416	my $dialog = $pl->{npc_dialog};
2152	$diag->{pl}->ext_reply (	2417	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153	$diag->{id},
2154	msgtype => "reply",
2155	msg => $diag->{pl}->expand_cfpod ($msg),
2156	add_topics => []
2157	);
2158		2418
2159	} else {	2419	} else {
2160	$msg = $npc->name . " says: $msg" if $npc;	2420	$msg = $npc->name . " says: $msg" if $npc;
2161	$self->message ($msg, $flags);	2421	$self->message ($msg, $flags);
2162	}	2422	}
2163	}	2423	}
		2424	}
		2425
		2426	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2427
		2428	=cut
		2429
		2430	sub cf::object::send_msg {
		2431	my $pl = shift->contr
		2432	or return;
		2433	$pl->send_msg (@_);
2164	}	2434	}
2165		2435
2166	=item $player_object->may ("access")	2436	=item $player_object->may ("access")
2167		2437
2168	Returns wether the given player is authorized to access resource "access"	2438	Returns wether the given player is authorized to access resource "access"
…		…
2247	# use -1 or undef as default coordinates, not 0, 0	2517	# use -1 or undef as default coordinates, not 0, 0
2248	($x, $y) = ($map->enter_x, $map->enter_y)	2518	($x, $y) = ($map->enter_x, $map->enter_y)
2249	if $x <=0 && $y <= 0;	2519	if $x <=0 && $y <= 0;
2250		2520
2251	$map->load;	2521	$map->load;
2252	$map->load_diag;	2522	$map->load_neighbours;
2253		2523
2254	return unless $self->contr->active;	2524	return unless $self->contr->active;
2255	$self->activate_recursive;	2525	$self->activate_recursive;
2256		2526
2257	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2527	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258	$self->enter_map ($map, $x, $y);	2528	$self->enter_map ($map, $x, $y);
2259	}	2529	}
2260		2530
2261	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2531	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2262		2532
2263	Moves the player to the given map-path and coordinates by first freezing	2533	Moves the player to the given map-path and coordinates by first freezing
2264	her, loading and preparing them map, calling the provided $check callback	2534	her, loading and preparing them map, calling the provided $check callback
2265	that has to return the map if sucecssful, and then unfreezes the player on	2535	that has to return the map if sucecssful, and then unfreezes the player on
2266	the new (success) or old (failed) map position.	2536	the new (success) or old (failed) map position. In either case, $done will
		2537	be called at the end of this process.
2267		2538
2268	=cut	2539	=cut
2269		2540
2270	our $GOTOGEN;	2541	our $GOTOGEN;
2271		2542
2272	sub cf::object::player::goto {	2543	sub cf::object::player::goto {
2273	my ($self, $path, $x, $y, $check) = @_;	2544	my ($self, $path, $x, $y, $check, $done) = @_;
2274		2545
2275	# do generation counting so two concurrent goto's will be executed in-order	2546	# do generation counting so two concurrent goto's will be executed in-order
2276	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2547	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2277		2548
2278	$self->enter_link;	2549	$self->enter_link;
2279		2550
2280	(async {	2551	(async {
		2552	$Coro::current->{desc} = "player::goto $path $x $y";
		2553
		2554	# *tag paths override both path and x|y
		2555	if ($path =~ /^\*(.*)$/) {
		2556	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2557	my $ob = $obs[rand @obs];
		2558
		2559	# see if we actually can go there
		2560	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2561	$ob = $obs[rand @obs];
		2562	} else {
		2563	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2564	}
		2565	# else put us there anyways for now #d#
		2566
		2567	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2568	} else {
		2569	($path, $x, $y) = (undef, undef, undef);
		2570	}
		2571	}
		2572
2281	my $map = eval {	2573	my $map = eval {
2282	my $map = cf::map::find $path;	2574	my $map = defined $path ? cf::map::find $path : undef;
2283		2575
2284	if ($map) {	2576	if ($map) {
2285	$map = $map->customise_for ($self);	2577	$map = $map->customise_for ($self);
2286	$map = $check->($map) if $check && $map;	2578	$map = $check->($map) if $check && $map;
2287	} else {	2579	} else {
2288	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2580	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2289	}	2581	}
2290		2582
2291	$map	2583	$map
2292	};	2584	};
2293		2585
…		…
2298		2590
2299	if ($gen == $self->{_goto_generation}) {	2591	if ($gen == $self->{_goto_generation}) {
2300	delete $self->{_goto_generation};	2592	delete $self->{_goto_generation};
2301	$self->leave_link ($map, $x, $y);	2593	$self->leave_link ($map, $x, $y);
2302	}	2594	}
		2595
		2596	$done->() if $done;
2303	})->prio (1);	2597	})->prio (1);
2304	}	2598	}
2305		2599
2306	=item $player_object->enter_exit ($exit_object)	2600	=item $player_object->enter_exit ($exit_object)
2307		2601
…		…
2381	# if exit is damned, update players death & WoR home-position	2675	# if exit is damned, update players death & WoR home-position
2382	$self->contr->savebed ($slaying, $hp, $sp)	2676	$self->contr->savebed ($slaying, $hp, $sp)
2383	if $exit->flag (FLAG_DAMNED);	2677	if $exit->flag (FLAG_DAMNED);
2384		2678
2385	(async {	2679	(async {
		2680	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2681
2386	$self->deactivate_recursive; # just to be sure	2682	$self->deactivate_recursive; # just to be sure
2387	unless (eval {	2683	unless (eval {
2388	$self->goto ($slaying, $hp, $sp);	2684	$self->goto ($slaying, $hp, $sp);
2389		2685
2390	1;	2686	1;
…		…
2416		2712
2417	utf8::encode $text;	2713	utf8::encode $text;
2418	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2714	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2419	}	2715	}
2420		2716
2421	=item $client->send_msg ($color, $type, $msg, [extra...])	2717	=item $client->send_msg ($channel, $msg, $color, [extra...])
2422		2718
2423	Send a drawinfo or msg packet to the client, formatting the msg for the	2719	Send a drawinfo or msg packet to the client, formatting the msg for the
2424	client if neccessary. C<$type> should be a string identifying the type of	2720	client if neccessary. C<$type> should be a string identifying the type of
2425	the message, with C<log> being the default. If C<$color> is negative, suppress	2721	the message, with C<log> being the default. If C<$color> is negative, suppress
2426	the message unless the client supports the msg packet.	2722	the message unless the client supports the msg packet.
2427		2723
2428	=cut	2724	=cut
2429		2725
		2726	# non-persistent channels (usually the info channel)
		2727	our %CHANNEL = (
		2728	"c/identify" => {
		2729	id => "infobox",
		2730	title => "Identify",
		2731	reply => undef,
		2732	tooltip => "Items recently identified",
		2733	},
		2734	"c/examine" => {
		2735	id => "infobox",
		2736	title => "Examine",
		2737	reply => undef,
		2738	tooltip => "Signs and other items you examined",
		2739	},
		2740	"c/book" => {
		2741	id => "infobox",
		2742	title => "Book",
		2743	reply => undef,
		2744	tooltip => "The contents of a note or book",
		2745	},
		2746	"c/lookat" => {
		2747	id => "infobox",
		2748	title => "Look",
		2749	reply => undef,
		2750	tooltip => "What you saw there",
		2751	},
		2752	"c/who" => {
		2753	id => "infobox",
		2754	title => "Players",
		2755	reply => undef,
		2756	tooltip => "Shows players who are currently online",
		2757	},
		2758	"c/body" => {
		2759	id => "infobox",
		2760	title => "Body Parts",
		2761	reply => undef,
		2762	tooltip => "Shows which body parts you posess and are available",
		2763	},
		2764	"c/uptime" => {
		2765	id => "infobox",
		2766	title => "Uptime",
		2767	reply => undef,
		2768	tooltip => "How long the server has been running since last restart",
		2769	},
		2770	"c/mapinfo" => {
		2771	id => "infobox",
		2772	title => "Map Info",
		2773	reply => undef,
		2774	tooltip => "Information related to the maps",
		2775	},
		2776	);
		2777
2430	sub cf::client::send_msg {	2778	sub cf::client::send_msg {
2431	my ($self, $color, $type, $msg, @extra) = @_;	2779	my ($self, $channel, $msg, $color, @extra) = @_;
2432		2780
2433	$msg = $self->pl->expand_cfpod ($msg);	2781	$msg = $self->pl->expand_cfpod ($msg);
2434		2782
		2783	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2784
		2785	# check predefined channels, for the benefit of C
		2786	if ($CHANNEL{$channel}) {
		2787	$channel = $CHANNEL{$channel};
		2788
		2789	$self->ext_msg (channel_info => $channel)
		2790	if $self->can_msg;
		2791
		2792	$channel = $channel->{id};
		2793
		2794	} elsif (ref $channel) {
		2795	# send meta info to client, if not yet sent
		2796	unless (exists $self->{channel}{$channel->{id}}) {
		2797	$self->{channel}{$channel->{id}} = $channel;
		2798	$self->ext_msg (channel_info => $channel)
		2799	if $self->can_msg;
		2800	}
		2801
		2802	$channel = $channel->{id};
		2803	}
		2804
2435	return unless @extra || length $msg;	2805	return unless @extra || length $msg;
2436		2806
2437	if ($self->can_msg) {	2807	if ($self->can_msg) {
		2808	# default colour, mask it out
		2809	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2810	if $color & cf::NDI_DEF;
		2811
2438	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));	2812	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2813	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2439	} else {	2814	} else {
2440	# replace some tags by gcfclient-compatible ones
2441	for ($msg) {
2442	1 while
2443	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2444	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2445	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2446	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2447	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2448	}
2449
2450	if ($color >= 0) {	2815	if ($color >= 0) {
		2816	# replace some tags by gcfclient-compatible ones
		2817	for ($msg) {
		2818	1 while
		2819	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2820	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2821	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2822	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2823	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2824	}
		2825
		2826	$color &= cf::NDI_COLOR_MASK;
		2827
		2828	utf8::encode $msg;
		2829
2451	if (0 && $msg =~ /\[/) {	2830	if (0 && $msg =~ /\[/) {
		2831	# COMMAND/INFO
2452	$self->send_packet ("drawextinfo $color 4 0 $msg")	2832	$self->send_packet ("drawextinfo $color 10 8 $msg")
2453	} else {	2833	} else {
2454	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;	2834	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2455	$self->send_packet ("drawinfo $color $msg")	2835	$self->send_packet ("drawinfo $color $msg")
2456	}	2836	}
2457	}	2837	}
2458	}	2838	}
2459	}	2839	}
2460		2840
2461	=item $client->ext_event ($type, %msg)	2841	=item $client->ext_msg ($type, @msg)
2462		2842
2463	Sends an ext event to the client.	2843	Sends an ext event to the client.
2464		2844
2465	=cut	2845	=cut
2466		2846
2467	sub cf::client::ext_event($$%) {	2847	sub cf::client::ext_msg($$@) {
2468	my ($self, $type, %msg) = @_;	2848	my ($self, $type, @msg) = @_;
2469		2849
		2850	if ($self->extcmd == 2) {
		2851	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2852	} elsif ($self->extcmd == 1) { # TODO: remove
2470	$msg{msgtype} = "event_$type";	2853	push @msg, msgtype => "event_$type";
2471	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2854	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2855	}
		2856	}
		2857
		2858	=item $client->ext_reply ($msgid, @msg)
		2859
		2860	Sends an ext reply to the client.
		2861
		2862	=cut
		2863
		2864	sub cf::client::ext_reply($$@) {
		2865	my ($self, $id, @msg) = @_;
		2866
		2867	if ($self->extcmd == 2) {
		2868	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2869	} elsif ($self->extcmd == 1) {
		2870	#TODO: version 1, remove
		2871	unshift @msg, msgtype => "reply", msgid => $id;
		2872	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2873	}
2472	}	2874	}
2473		2875
2474	=item $success = $client->query ($flags, "text", \&cb)	2876	=item $success = $client->query ($flags, "text", \&cb)
2475		2877
2476	Queues a query to the client, calling the given callback with	2878	Queues a query to the client, calling the given callback with
…		…
2531	my ($ns, $buf) = @_;	2933	my ($ns, $buf) = @_;
2532		2934
2533	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2935	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2534		2936
2535	if (ref $msg) {	2937	if (ref $msg) {
		2938	my ($type, $reply, @payload) =
		2939	"ARRAY" eq ref $msg
		2940	? @$msg
		2941	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2942
		2943	my @reply;
		2944
2536	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2945	if (my $cb = $EXTICMD{$type}) {
2537	if (my %reply = $cb->($ns, $msg)) {	2946	@reply = $cb->($ns, @payload);
2538	$reply{msgid} = $msg->{msgid};
2539	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2540	}
2541	}	2947	}
		2948
		2949	$ns->ext_reply ($reply, @reply)
		2950	if $reply;
		2951
2542	} else {	2952	} else {
2543	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2953	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2544	}	2954	}
2545		2955
2546	cf::override;	2956	cf::override;
…		…
2593	our $safe = new Safe "safe";	3003	our $safe = new Safe "safe";
2594	our $safe_hole = new Safe::Hole;	3004	our $safe_hole = new Safe::Hole;
2595		3005
2596	$SIG{FPE} = 'IGNORE';	3006	$SIG{FPE} = 'IGNORE';
2597		3007
2598	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	3008	$safe->permit_only (Opcode::opset qw(
		3009	:base_core :base_mem :base_orig :base_math
		3010	grepstart grepwhile mapstart mapwhile
		3011	sort time
		3012	));
2599		3013
2600	# here we export the classes and methods available to script code	3014	# here we export the classes and methods available to script code
2601		3015
2602	=pod	3016	=pod
2603		3017
2604	The following functions and methods are available within a safe environment:	3018	The following functions and methods are available within a safe environment:
2605		3019
2606	cf::object	3020	cf::object
2607	contr pay_amount pay_player map x y force_find force_add	3021	contr pay_amount pay_player map x y force_find force_add destroy
2608	insert remove	3022	insert remove name archname title slaying race decrease_ob_nr
2609		3023
2610	cf::object::player	3024	cf::object::player
2611	player	3025	player
2612		3026
2613	cf::player	3027	cf::player
…		…
2618		3032
2619	=cut	3033	=cut
2620		3034
2621	for (	3035	for (
2622	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3036	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		3037	insert remove inv name archname title slaying race
2623	insert remove)],	3038	decrease_ob_nr destroy)],
2624	["cf::object::player" => qw(player)],	3039	["cf::object::player" => qw(player)],
2625	["cf::player" => qw(peaceful)],	3040	["cf::player" => qw(peaceful)],
2626	["cf::map" => qw(trigger)],	3041	["cf::map" => qw(trigger)],
2627	) {	3042	) {
2628	no strict 'refs';	3043	no strict 'refs';
…		…
2704	# the server's init and main functions	3119	# the server's init and main functions
2705		3120
2706	sub load_facedata($) {	3121	sub load_facedata($) {
2707	my ($path) = @_;	3122	my ($path) = @_;
2708		3123
		3124	# HACK to clear player env face cache, we need some signal framework
		3125	# for this (global event?)
		3126	%ext::player_env::MUSIC_FACE_CACHE = ();
		3127
		3128	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3129
2709	warn "loading facedata from $path\n";	3130	warn "loading facedata from $path\n";
2710		3131
2711	my $facedata;	3132	my $facedata;
2712	0 < aio_load $path, $facedata	3133	0 < aio_load $path, $facedata
2713	or die "$path: $!";	3134	or die "$path: $!";
2714		3135
2715	$facedata = Coro::Storable::thaw $facedata;	3136	$facedata = Coro::Storable::thaw $facedata;
2716		3137
2717	$facedata->{version} == 2	3138	$facedata->{version} == 2
2718	or cf::cleanup "$path: version mismatch, cannot proceed.";	3139	or cf::cleanup "$path: version mismatch, cannot proceed.";
		3140
		3141	# patch in the exptable
		3142	$facedata->{resource}{"res/exp_table"} = {
		3143	type => FT_RSRC,
		3144	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3145	};
		3146	cf::cede_to_tick;
2719		3147
2720	{	3148	{
2721	my $faces = $facedata->{faceinfo};	3149	my $faces = $facedata->{faceinfo};
2722		3150
2723	while (my ($face, $info) = each %$faces) {	3151	while (my ($face, $info) = each %$faces) {
2724	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3152	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2725	cf::face::set_visibility $idx, $info->{visibility};	3153	cf::face::set_visibility $idx, $info->{visibility};
2726	cf::face::set_magicmap $idx, $info->{magicmap};	3154	cf::face::set_magicmap $idx, $info->{magicmap};
2727	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3155	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2728	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3156	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2729		3157
2730	cf::cede_to_tick;	3158	cf::cede_to_tick;
2731	}	3159	}
2732		3160
2733	while (my ($face, $info) = each %$faces) {	3161	while (my ($face, $info) = each %$faces) {
…		…
2758		3186
2759	{	3187	{
2760	# TODO: for gcfclient pleasure, we should give resources	3188	# TODO: for gcfclient pleasure, we should give resources
2761	# that gcfclient doesn't grok a >10000 face index.	3189	# that gcfclient doesn't grok a >10000 face index.
2762	my $res = $facedata->{resource};	3190	my $res = $facedata->{resource};
2763	my $enc = JSON::XS->new->utf8->canonical;	3191
		3192	my $soundconf = delete $res->{"res/sound.conf"};
2764		3193
2765	while (my ($name, $info) = each %$res) {	3194	while (my ($name, $info) = each %$res) {
2766	my $meta = $enc->encode ({
2767	name => $name,
2768	type => $info->{type},
2769	copyright => $info->{copyright}, #TODO#
2770	});
2771	my $data = pack "(w/a*)*", $meta, $info->{data};
2772	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2773
2774	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3195	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3196	my $data;
		3197
		3198	if ($info->{type} & 1) {
		3199	# prepend meta info
		3200
		3201	my $meta = $enc->encode ({
		3202	name => $name,
		3203	%{ $info->{meta} || {} },
		3204	});
		3205
		3206	$data = pack "(w/a*)*", $meta, $info->{data};
		3207	} else {
		3208	$data = $info->{data};
		3209	}
		3210
		3211	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2775	cf::face::set_type $idx, 1;	3212	cf::face::set_type $idx, $info->{type};
2776	cf::face::set_data $idx, 0, $data, $chk;
2777		3213
2778	cf::cede_to_tick;	3214	cf::cede_to_tick;
2779	}	3215	}
		3216
		3217	if ($soundconf) {
		3218	$soundconf = $enc->decode (delete $soundconf->{data});
		3219
		3220	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3221	my $sound = $soundconf->{compat}[$_]
		3222	or next;
		3223
		3224	my $face = cf::face::find "sound/$sound->[1]";
		3225	cf::sound::set $sound->[0] => $face;
		3226	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3227	}
		3228
		3229	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3230	my $face = cf::face::find "sound/$v";
		3231	cf::sound::set $k => $face;
		3232	}
		3233	}
2780	}	3234	}
2781		3235
2782	1	3236	1
2783	}	3237	}
2784		3238
		3239	register_exticmd fx_want => sub {
		3240	my ($ns, $want) = @_;
		3241
		3242	while (my ($k, $v) = each %$want) {
		3243	$ns->fx_want ($k, $v);
		3244	}
		3245	};
		3246
2785	sub reload_regions {	3247	sub reload_regions {
		3248	# HACK to clear player env face cache, we need some signal framework
		3249	# for this (global event?)
		3250	%ext::player_env::MUSIC_FACE_CACHE = ();
		3251
2786	load_resource_file "$MAPDIR/regions"	3252	load_resource_file "$MAPDIR/regions"
2787	or die "unable to load regions file\n";	3253	or die "unable to load regions file\n";
		3254
		3255	for (cf::region::list) {
		3256	$_->{match} = qr/$_->{match}/
		3257	if exists $_->{match};
		3258	}
2788	}	3259	}
2789		3260
2790	sub reload_facedata {	3261	sub reload_facedata {
2791	load_facedata "$DATADIR/facedata"	3262	load_facedata "$DATADIR/facedata"
2792	or die "unable to load facedata\n";	3263	or die "unable to load facedata\n";
…		…
2821		3292
2822	sub init {	3293	sub init {
2823	reload_resources;	3294	reload_resources;
2824	}	3295	}
2825		3296
2826	sub cfg_load {	3297	sub reload_config {
2827	open my $fh, "<:utf8", "$CONFDIR/config"	3298	open my $fh, "<:utf8", "$CONFDIR/config"
2828	or return;	3299	or return;
2829		3300
2830	local $/;	3301	local $/;
2831	*CFG = YAML::Syck::Load <$fh>;	3302	*CFG = YAML::Syck::Load <$fh>;
…		…
2847	sub main {	3318	sub main {
2848	# we must not ever block the main coroutine	3319	# we must not ever block the main coroutine
2849	local $Coro::idle = sub {	3320	local $Coro::idle = sub {
2850	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3321	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2851	(async {	3322	(async {
2852	Event::one_event;	3323	$Coro::current->{desc} = "IDLE BUG HANDLER";
		3324	EV::loop EV::LOOP_ONESHOT;
2853	})->prio (Coro::PRIO_MAX);	3325	})->prio (Coro::PRIO_MAX);
2854	};	3326	};
2855		3327
2856	cfg_load;	3328	reload_config;
2857	db_init;	3329	db_init;
2858	load_extensions;	3330	load_extensions;
2859		3331
2860	$TICK_WATCHER->start;	3332	$TICK_WATCHER->start;
2861	Event::loop;	3333	EV::loop;
2862	}	3334	}
2863		3335
2864	#############################################################################	3336	#############################################################################
2865	# initialisation and cleanup	3337	# initialisation and cleanup
2866		3338
2867	# install some emergency cleanup handlers	3339	# install some emergency cleanup handlers
2868	BEGIN {	3340	BEGIN {
		3341	our %SIGWATCHER = ();
2869	for my $signal (qw(INT HUP TERM)) {	3342	for my $signal (qw(INT HUP TERM)) {
2870	Event->signal (	3343	$SIGWATCHER{$signal} = EV::signal $signal, sub {
2871	reentrant => 0,
2872	data => WF_AUTOCANCEL,
2873	signal => $signal,
2874	prio => 0,
2875	cb => sub {
2876	cf::cleanup "SIG$signal";	3344	cf::cleanup "SIG$signal";
2877	},
2878	);	3345	};
2879	}	3346	}
2880	}	3347	}
2881		3348
2882	sub write_runtime {	3349	sub write_runtime {
2883	my $runtime = "$LOCALDIR/runtime";	3350	my $runtime = "$LOCALDIR/runtime";
…		…
2928	# and maps saved/destroyed asynchronously.	3395	# and maps saved/destroyed asynchronously.
2929	warn "begin emergency player save\n";	3396	warn "begin emergency player save\n";
2930	for my $login (keys %cf::PLAYER) {	3397	for my $login (keys %cf::PLAYER) {
2931	my $pl = $cf::PLAYER{$login} or next;	3398	my $pl = $cf::PLAYER{$login} or next;
2932	$pl->valid or next;	3399	$pl->valid or next;
		3400	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2933	$pl->save;	3401	$pl->save;
2934	}	3402	}
2935	warn "end emergency player save\n";	3403	warn "end emergency player save\n";
2936		3404
2937	warn "begin emergency map save\n";	3405	warn "begin emergency map save\n";
…		…
2976	warn "syncing database to disk";	3444	warn "syncing database to disk";
2977	BDB::db_env_txn_checkpoint $DB_ENV;	3445	BDB::db_env_txn_checkpoint $DB_ENV;
2978		3446
2979	# if anything goes wrong in here, we should simply crash as we already saved	3447	# if anything goes wrong in here, we should simply crash as we already saved
2980		3448
2981	warn "cancelling all WF_AUTOCANCEL watchers";
2982	for (Event::all_watchers) {
2983	$_->cancel if $_->data & WF_AUTOCANCEL;
2984	}
2985
2986	warn "flushing outstanding aio requests";	3449	warn "flushing outstanding aio requests";
2987	for (;;) {	3450	for (;;) {
2988	BDB::flush;	3451	BDB::flush;
2989	IO::AIO::flush;	3452	IO::AIO::flush;
2990	Coro::cede;	3453	Coro::cede_notself;
2991	last unless IO::AIO::nreqs || BDB::nreqs;	3454	last unless IO::AIO::nreqs || BDB::nreqs;
2992	warn "iterate...";	3455	warn "iterate...";
2993	}	3456	}
2994		3457
2995	++$RELOAD;	3458	++$RELOAD;
…		…
3054	warn "reloading cf.pm";	3517	warn "reloading cf.pm";
3055	require cf;	3518	require cf;
3056	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3519	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3057		3520
3058	warn "loading config and database again";	3521	warn "loading config and database again";
3059	cf::cfg_load;	3522	cf::reload_config;
3060		3523
3061	warn "loading extensions";	3524	warn "loading extensions";
3062	cf::load_extensions;	3525	cf::load_extensions;
3063		3526
3064	warn "reattaching attachments to objects/players";	3527	warn "reattaching attachments to objects/players";
…		…
3084		3547
3085	sub reload_perl() {	3548	sub reload_perl() {
3086	# doing reload synchronously and two reloads happen back-to-back,	3549	# doing reload synchronously and two reloads happen back-to-back,
3087	# coro crashes during coro_state_free->destroy here.	3550	# coro crashes during coro_state_free->destroy here.
3088		3551
3089	$RELOAD_WATCHER ||= Event->timer (	3552	$RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3090	reentrant => 0,
3091	after => 0,
3092	data => WF_AUTOCANCEL,
3093	cb => sub {
3094	do_reload_perl;
3095	undef $RELOAD_WATCHER;	3553	undef $RELOAD_WATCHER;
3096	},	3554	do_reload_perl;
3097	);	3555	};
3098	}	3556	}
3099		3557
3100	register_command "reload" => sub {	3558	register_command "reload" => sub {
3101	my ($who, $arg) = @_;	3559	my ($who, $arg) = @_;
3102		3560
3103	if ($who->flag (FLAG_WIZ)) {	3561	if ($who->flag (FLAG_WIZ)) {
3104	$who->message ("reloading server.");	3562	$who->message ("reloading server.");
		3563	async {
		3564	$Coro::current->{desc} = "perl_reload";
3105	async { reload_perl };	3565	reload_perl;
		3566	};
3106	}	3567	}
3107	};	3568	};
3108		3569
3109	unshift @INC, $LIBDIR;	3570	unshift @INC, $LIBDIR;
3110		3571
…		…
3129	my $signal = new Coro::Signal;	3590	my $signal = new Coro::Signal;
3130	push @WAIT_FOR_TICK_BEGIN, $signal;	3591	push @WAIT_FOR_TICK_BEGIN, $signal;
3131	$signal->wait;	3592	$signal->wait;
3132	}	3593	}
3133		3594
3134	my $min = 1e6;#d#	3595	$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3135	my $avg = 10;
3136	$TICK_WATCHER = Event->timer (
3137	reentrant => 0,
3138	parked => 1,
3139	prio => 0,
3140	at => $NEXT_TICK || $TICK,
3141	data => WF_AUTOCANCEL,
3142	cb => sub {
3143	if ($Coro::current != $Coro::main) {	3596	if ($Coro::current != $Coro::main) {
3144	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3597	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3145	unless ++$bug_warning > 10;	3598	unless ++$bug_warning > 10;
3146	return;	3599	return;
3147	}	3600	}
3148		3601
3149	$NOW = $tick_start = Event::time;	3602	$NOW = $tick_start = EV::now;
3150		3603
3151	cf::server_tick; # one server iteration	3604	cf::server_tick; # one server iteration
3152		3605
3153	0 && sync_job {#d#	3606	$RUNTIME += $TICK;
3154	for(1..10) {	3607	$NEXT_TICK += $TICK;
3155	my $t = Event::time;
3156	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3157	or die;
3158		3608
3159	$map->width (50);	3609	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3160	$map->height (50);	3610	$NEXT_RUNTIME_WRITE = $NOW + 10;
3161	$map->alloc;	3611	Coro::async_pool {
3162	$map->_load_objects ("/tmp/x.map", 1);	3612	$Coro::current->{desc} = "runtime saver";
3163	my $t = Event::time - $t;	3613	write_runtime
3164		3614	or warn "ERROR: unable to write runtime file: $!";
3165	#next unless $t < 0.0013;#d#
3166	if ($t < $min) {
3167	$min = $t;
3168	}
3169	$avg = $avg * 0.99 + $t * 0.01;
3170	}
3171	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3172	exit 0;
3173	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3174	};	3615	};
		3616	}
3175		3617
3176	$RUNTIME += $TICK;
3177	$NEXT_TICK += $TICK;
3178
3179	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3180	$NEXT_RUNTIME_WRITE = $NOW + 10;
3181	Coro::async_pool {
3182	write_runtime
3183	or warn "ERROR: unable to write runtime file: $!";
3184	};
3185	}
3186
3187	# my $AFTER = Event::time;
3188	# warn $AFTER - $NOW;#d#
3189
3190	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3618	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3191	$sig->send;	3619	$sig->send;
3192	}	3620	}
3193	while (my $sig = shift @WAIT_FOR_TICK) {	3621	while (my $sig = shift @WAIT_FOR_TICK) {
3194	$sig->send;	3622	$sig->send;
3195	}	3623	}
3196		3624
3197	$NOW = Event::time;
3198
3199	# if we are delayed by four ticks or more, skip them all
3200	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3201
3202	$TICK_WATCHER->at ($NEXT_TICK);
3203	$TICK_WATCHER->start;
3204
3205	$LOAD = ($NOW - $tick_start) / $TICK;	3625	$LOAD = ($NOW - $tick_start) / $TICK;
3206	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3626	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3207		3627
3208	_post_tick;	3628	_post_tick;
3209		3629	};
3210		3630	$TICK_WATCHER->priority (EV::MAXPRI);
3211	},
3212	);
3213		3631
3214	{	3632	{
		3633	BDB::min_parallel 8;
3215	BDB::max_poll_time $TICK * 0.1;	3634	BDB::max_poll_time $TICK * 0.1;
3216	$BDB_POLL_WATCHER = Event->io (	3635	$BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb;
3217	reentrant => 0,
3218	fd => BDB::poll_fileno,
3219	poll => 'r',
3220	prio => 0,
3221	data => WF_AUTOCANCEL,
3222	cb => \&BDB::poll_cb,
3223	);
3224	BDB::min_parallel 8;
3225		3636
3226	BDB::set_sync_prepare {	3637	BDB::set_sync_prepare {
3227	my $status;	3638	my $status;
3228	my $current = $Coro::current;	3639	my $current = $Coro::current;
3229	(	3640	(
…		…
3238	)	3649	)
3239	};	3650	};
3240		3651
3241	unless ($DB_ENV) {	3652	unless ($DB_ENV) {
3242	$DB_ENV = BDB::db_env_create;	3653	$DB_ENV = BDB::db_env_create;
		3654	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3655	| BDB::LOG_AUTOREMOVE, 1);
		3656	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3657	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3243		3658
3244	cf::sync_job {	3659	cf::sync_job {
3245	eval {	3660	eval {
3246	BDB::db_env_open	3661	BDB::db_env_open
3247	$DB_ENV,	3662	$DB_ENV,
…		…
3249	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3664	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3250	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3665	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3251	0666;	3666	0666;
3252		3667
3253	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3668	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3254
3255	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3256	$DB_ENV->set_lk_detect;
3257	};	3669	};
3258		3670
3259	cf::cleanup "db_env_open(db): $@" if $@;	3671	cf::cleanup "db_env_open(db): $@" if $@;
3260	};	3672	};
3261	}	3673	}
		3674
		3675	$BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
		3676	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3677	};
		3678	$BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
		3679	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3680	};
		3681	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
		3682	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3683	};
3262	}	3684	}
3263		3685
3264	{	3686	{
3265	IO::AIO::min_parallel 8;	3687	IO::AIO::min_parallel 8;
3266		3688
3267	undef $Coro::AIO::WATCHER;	3689	undef $Coro::AIO::WATCHER;
3268	IO::AIO::max_poll_time $TICK * 0.1;	3690	IO::AIO::max_poll_time $TICK * 0.1;
3269	$AIO_POLL_WATCHER = Event->io (	3691	$AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
3270	reentrant => 0,
3271	data => WF_AUTOCANCEL,
3272	fd => IO::AIO::poll_fileno,
3273	poll => 'r',
3274	prio => 6,
3275	cb => \&IO::AIO::poll_cb,
3276	);
3277	}	3692	}
3278		3693
3279	my $_log_backtrace;	3694	my $_log_backtrace;
3280		3695
3281	sub _log_backtrace {	3696	sub _log_backtrace {
…		…
3285		3700
3286	# limit the # of concurrent backtraces	3701	# limit the # of concurrent backtraces
3287	if ($_log_backtrace < 2) {	3702	if ($_log_backtrace < 2) {
3288	++$_log_backtrace;	3703	++$_log_backtrace;
3289	async {	3704	async {
		3705	$Coro::current->{desc} = "abt $msg";
		3706
3290	my @bt = fork_call {	3707	my @bt = fork_call {
3291	@addr = map { sprintf "%x", $_ } @addr;	3708	@addr = map { sprintf "%x", $_ } @addr;
3292	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3709	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3293	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"	3710	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3294	or die "addr2line: $!";	3711	or die "addr2line: $!";

Diff Legend

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