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.287 by root, Mon Jun 25 05:43:45 2007 UTC vs.
Revision 1.387 by root, Mon Oct 15 23:49:10 2007 UTC

…		…
4	use strict;	4	use strict;
5		5
6	use Symbol;	6	use Symbol;
7	use List::Util;	7	use List::Util;
8	use Socket;	8	use Socket;
9	use Storable;
10	use Event;	9	use Event;
11	use Opcode;	10	use Opcode;
12	use Safe;	11	use Safe;
13	use Safe::Hole;	12	use Safe::Hole;
		13	use Storable ();
14		14
15	use Coro 3.61 ();	15	use Coro 4.1 ();
16	use Coro::State;	16	use Coro::State;
17	use Coro::Handle;	17	use Coro::Handle;
18	use Coro::Event;	18	use Coro::Event;
19	use Coro::Timer;	19	use Coro::Timer;
20	use Coro::Signal;	20	use Coro::Signal;
21	use Coro::Semaphore;	21	use Coro::Semaphore;
22	use Coro::AIO;	22	use Coro::AIO;
23	use Coro::Storable;	23	use Coro::Storable;
		24	use Coro::Util ();
24		25
		26	use JSON::XS ();
25	use BDB ();	27	use BDB ();
26	use Data::Dumper;	28	use Data::Dumper;
27	use Digest::MD5;	29	use Digest::MD5;
28	use Fcntl;	30	use Fcntl;
29	use YAML::Syck ();	31	use YAML::Syck ();
30	use IO::AIO 2.32 ();	32	use IO::AIO 2.51 ();
31	use Time::HiRes;	33	use Time::HiRes;
32	use Compress::LZF;	34	use Compress::LZF;
		35	use Digest::MD5 ();
33		36
34	# configure various modules to our taste	37	# configure various modules to our taste
35	#	38	#
36	$Storable::canonical = 1; # reduce rsync transfers	39	$Storable::canonical = 1; # reduce rsync transfers
37	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	40	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
…		…
77	our $NEXT_TICK;	80	our $NEXT_TICK;
78	our $NOW;	81	our $NOW;
79	our $USE_FSYNC = 1; # use fsync to write maps - default off	82	our $USE_FSYNC = 1; # use fsync to write maps - default off
80		83
81	our $BDB_POLL_WATCHER;	84	our $BDB_POLL_WATCHER;
		85	our $BDB_DEADLOCK_WATCHER;
		86	our $BDB_CHECKPOINT_WATCHER;
		87	our $BDB_TRICKLE_WATCHER;
82	our $DB_ENV;	88	our $DB_ENV;
83		89
84	our %CFG;	90	our %CFG;
85		91
86	our $UPTIME; $UPTIME ||= time;	92	our $UPTIME; $UPTIME ||= time;
87	our $RUNTIME;	93	our $RUNTIME;
88		94
89	our %PLAYER; # all users	95	our (%PLAYER, %PLAYER_LOADING); # all users
90	our %MAP; # all maps	96	our (%MAP, %MAP_LOADING ); # all maps
91	our $LINK_MAP; # the special {link} map, which is always available	97	our $LINK_MAP; # the special {link} map, which is always available
92		98
93	# used to convert map paths into valid unix filenames by replacing / by ∕	99	# used to convert map paths into valid unix filenames by replacing / by ∕
94	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	100	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
95		101
…		…
165		171
166	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	172	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
167	returns directly I<after> the tick processing (and consequently, can only wake one process	173	returns directly I<after> the tick processing (and consequently, can only wake one process
168	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	174	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
169		175
		176	=item @cf::INVOKE_RESULTS
		177
		178	This array contains the results of the last C<invoke ()> call. When
		179	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
		180	that call.
		181
170	=back	182	=back
171		183
172	=cut	184	=cut
173		185
174	BEGIN {	186	BEGIN {
…		…
178	$msg .= "\n"	190	$msg .= "\n"
179	unless $msg =~ /\n$/;	191	unless $msg =~ /\n$/;
180		192
181	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	193	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
182		194
183	utf8::encode $msg;
184	LOG llevError, $msg;	195	LOG llevError, $msg;
185	};	196	};
186	}	197	}
187		198
188	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	199	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
237	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	248	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
238	$d	249	$d
239	} || "[unable to dump $_[0]: '$@']";	250	} || "[unable to dump $_[0]: '$@']";
240	}	251	}
241		252
242	use JSON::XS ();
243
244	=item $ref = cf::from_json $json	253	=item $ref = cf::from_json $json
245		254
246	Converts a JSON string into the corresponding perl data structure.	255	Converts a JSON string into the corresponding perl data structure.
247		256
248	=item $json = cf::to_json $ref	257	=item $json = cf::to_json $ref
249		258
250	Converts a perl data structure into its JSON representation.	259	Converts a perl data structure into its JSON representation.
251		260
252	=cut	261	=cut
253		262
254	our $json_coder = JSON::XS->new->convert_blessed->utf8;	263	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255		264
256	sub to_json ($) { $json_coder->encode ($_[0]) }	265	sub to_json ($) { $json_coder->encode ($_[0]) }
257	sub from_json ($) { $json_coder->decode ($_[0]) }	266	sub from_json ($) { $json_coder->decode ($_[0]) }
258		267
259	=item cf::lock_wait $string	268	=item cf::lock_wait $string
…		…
265	Wait until the given lock is available and then acquires it and returns	274	Wait until the given lock is available and then acquires it and returns
266	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	275	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
267	for example when the coroutine gets canceled), the lock is automatically	276	for example when the coroutine gets canceled), the lock is automatically
268	returned.	277	returned.
269		278
		279	Locks are *not* recursive, locking from the same coro twice results in a
		280	deadlocked coro.
		281
270	Lock names should begin with a unique identifier (for example, cf::map::find	282	Lock names should begin with a unique identifier (for example, cf::map::find
271	uses map_find and cf::map::load uses map_load).	283	uses map_find and cf::map::load uses map_load).
272		284
273	=item $locked = cf::lock_active $string	285	=item $locked = cf::lock_active $string
274		286
275	Return true if the lock is currently active, i.e. somebody has locked it.	287	Return true if the lock is currently active, i.e. somebody has locked it.
276		288
277	=cut	289	=cut
278		290
279	our %LOCK;	291	our %LOCK;
		292	our %LOCKER;#d#
280		293
281	sub lock_wait($) {	294	sub lock_wait($) {
282	my ($key) = @_;	295	my ($key) = @_;
		296
		297	if ($LOCKER{$key} == $Coro::current) {#d#
		298	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		299	return;#d#
		300	}#d#
283		301
284	# wait for lock, if any	302	# wait for lock, if any
285	while ($LOCK{$key}) {	303	while ($LOCK{$key}) {
286	push @{ $LOCK{$key} }, $Coro::current;	304	push @{ $LOCK{$key} }, $Coro::current;
287	Coro::schedule;	305	Coro::schedule;
…		…
293		311
294	# wait, to be sure we are not locked	312	# wait, to be sure we are not locked
295	lock_wait $key;	313	lock_wait $key;
296		314
297	$LOCK{$key} = [];	315	$LOCK{$key} = [];
		316	$LOCKER{$key} = $Coro::current;#d#
298		317
299	Coro::guard {	318	Coro::guard {
		319	delete $LOCKER{$key};#d#
300	# wake up all waiters, to be on the safe side	320	# wake up all waiters, to be on the safe side
301	$_->ready for @{ delete $LOCK{$key} };	321	$_->ready for @{ delete $LOCK{$key} };
302	}	322	}
303	}	323	}
304		324
…		…
316	};	336	};
317	$TICK_WATCHER->stop;	337	$TICK_WATCHER->stop;
318	$guard	338	$guard
319	}	339	}
320		340
		341	=item cf::get_slot $time[, $priority[, $name]]
		342
		343	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		344	This call blocks and returns only when you have at least C<$time> seconds
		345	of cpu time till the next tick. The slot is only valid till the next cede.
		346
		347	The optional C<$name> can be used to identify the job to run. It might be
		348	used for statistical purposes and should identify the same time-class.
		349
		350	Useful for short background jobs.
		351
		352	=cut
		353
		354	our @SLOT_QUEUE;
		355	our $SLOT_QUEUE;
		356
		357	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		358	$SLOT_QUEUE = Coro::async {
		359	$Coro::current->desc ("timeslot manager");
		360
		361	my $signal = new Coro::Signal;
		362
		363	while () {
		364	next_job:
		365	my $avail = cf::till_tick;
		366	if ($avail > 0.01) {
		367	for (0 .. $#SLOT_QUEUE) {
		368	if ($SLOT_QUEUE[$_][0] < $avail) {
		369	my $job = splice @SLOT_QUEUE, $_, 1, ();
		370	$job->[2]->send;
		371	Coro::cede;
		372	goto next_job;
		373	}
		374	}
		375	}
		376
		377	if (@SLOT_QUEUE) {
		378	# we do not use wait_for_tick() as it returns immediately when tick is inactive
		379	push @cf::WAIT_FOR_TICK, $signal;
		380	$signal->wait;
		381	} else {
		382	Coro::schedule;
		383	}
		384	}
		385	};
		386
		387	sub get_slot($;$$) {
		388	my ($time, $pri, $name) = @_;
		389
		390	$time = $TICK * .6 if $time > $TICK * .6;
		391	my $sig = new Coro::Signal;
		392
		393	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		394	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		395	$SLOT_QUEUE->ready;
		396	$sig->wait;
		397	}
		398
321	=item cf::async { BLOCK }	399	=item cf::async { BLOCK }
322		400
323	Currently the same as Coro::async_pool, meaning you cannot use	401	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	402	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.	403	thing you are allowed to do is call C<prio> on it.
…		…
349	my $time = Event::time;	427	my $time = Event::time;
350		428
351	# this is the main coro, too bad, we have to block	429	# this is the main coro, too bad, we have to block
352	# till the operation succeeds, freezing the server :/	430	# till the operation succeeds, freezing the server :/
353		431
		432	LOG llevError, Carp::longmess "sync job";#d#
		433
354	# TODO: use suspend/resume instead	434	# TODO: use suspend/resume instead
355	# (but this is cancel-safe)	435	# (but this is cancel-safe)
356	my $freeze_guard = freeze_mainloop;	436	my $freeze_guard = freeze_mainloop;
357		437
358	my $busy = 1;	438	my $busy = 1;
359	my @res;	439	my @res;
360		440
361	(async {	441	(async {
		442	$Coro::current->desc ("sync job coro");
362	@res = eval { $job->() };	443	@res = eval { $job->() };
363	warn $@ if $@;	444	warn $@ if $@;
364	undef $busy;	445	undef $busy;
365	})->prio (Coro::PRIO_MAX);	446	})->prio (Coro::PRIO_MAX);
366		447
367	while ($busy) {	448	while ($busy) {
		449	if (Coro::nready) {
		450	Coro::cede_notself;
		451	} else {
368	Coro::cede or Event::one_event;	452	Event::one_event;
		453	}
369	}	454	}
370		455
371	$time = Event::time - $time;	456	$time = Event::time - $time;
372		457
373	LOG llevError | logBacktrace, Carp::longmess "long sync job"	458	LOG llevError | logBacktrace, Carp::longmess "long sync job"
…		…
413	=cut	498	=cut
414		499
415	sub fork_call(&@) {	500	sub fork_call(&@) {
416	my ($cb, @args) = @_;	501	my ($cb, @args) = @_;
417		502
418	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	503	# we seemingly have to make a local copy of the whole thing,
419	# or die "socketpair: $!";	504	# otherwise perl prematurely frees the stuff :/
420	pipe my $fh1, my $fh2	505	# TODO: investigate and fix (likely this will be rather laborious)
421	or die "pipe: $!";
422		506
423	if (my $pid = fork) {	507	my @res = Coro::Util::fork_eval {
424	close $fh2;
425
426	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
427	$res = Coro::Storable::thaw $res;
428
429	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431	die $$res unless "ARRAY" eq ref $res;
432
433	return wantarray ? @$res : $res->[-1];
434	} else {
435	reset_signals;	508	reset_signals;
436	local $SIG{__WARN__};	509	&$cb
437	local $SIG{__DIE__};	510	}, @args;
438	eval {
439	close $fh1;
440		511
441	my @res = eval { $cb->(@args) };	512	wantarray ? @res : $res[-1]
442	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
443	};
444
445	warn $@ if $@;
446	_exit 0;
447	}
448	}	513	}
449		514
450	=item $value = cf::db_get $family => $key	515	=item $value = cf::db_get $family => $key
451		516
452	Returns a single value from the environment database.	517	Returns a single value from the environment database.
…		…
454	=item cf::db_put $family => $key => $value	519	=item cf::db_put $family => $key => $value
455		520
456	Stores the given C<$value> in the family. It can currently store binary	521	Stores the given C<$value> in the family. It can currently store binary
457	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).	522	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
458		523
		524	=item $db = cf::db_table "name"
		525
		526	Create and/or open a new database table. The string must not be "db" and must be unique
		527	within each server.
		528
459	=cut	529	=cut
		530
		531	sub db_table($) {
		532	my ($name) = @_;
		533	my $db = BDB::db_create $DB_ENV;
		534
		535	eval {
		536	$db->set_flags (BDB::CHKSUM);
		537
		538	utf8::encode $name;
		539	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		540	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		541	cf::cleanup "db_open(db): $!" if $!;
		542	};
		543	cf::cleanup "db_open(db): $@" if $@;
		544
		545	$db
		546	}
460		547
461	our $DB;	548	our $DB;
462		549
463	sub db_init {	550	sub db_init {
464	unless ($DB) {
465	$DB = BDB::db_create $DB_ENV;
466
467	cf::sync_job {	551	cf::sync_job {
468	eval {	552	$DB ||= db_table "db";
469	$DB->set_flags (BDB::CHKSUM);
470
471	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
472	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
473	cf::cleanup "db_open(db): $!" if $!;
474	};
475	cf::cleanup "db_open(db): $@" if $@;
476	};
477	}	553	};
478	}	554	}
479		555
480	sub db_get($$) {	556	sub db_get($$) {
481	my $key = "$_[0]/$_[1]";	557	my $key = "$_[0]/$_[1]";
482		558
…		…
532	if (1) {	608	if (1) {
533	$md5 =	609	$md5 =
534	join "\x00",	610	join "\x00",
535	$processversion,	611	$processversion,
536	map {	612	map {
537	Coro::cede;	613	cf::cede_to_tick;
538	($src->[$_], Digest::MD5::md5_hex $data[$_])	614	($src->[$_], Digest::MD5::md5_hex $data[$_])
539	} 0.. $#$src;	615	} 0.. $#$src;
540		616
541		617
542	my $dbmd5 = db_get cache => "$id/md5";	618	my $dbmd5 = db_get cache => "$id/md5";
…		…
848	";	924	";
849	die if $@;	925	die if $@;
850	}	926	}
851		927
852	our $override;	928	our $override;
853	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	929	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
854		930
855	sub override {	931	sub override {
856	$override = 1;	932	$override = 1;
857	@invoke_results = ();	933	@INVOKE_RESULTS = (@_);
858	}	934	}
859		935
860	sub do_invoke {	936	sub do_invoke {
861	my $event = shift;	937	my $event = shift;
862	my $callbacks = shift;	938	my $callbacks = shift;
863		939
864	@invoke_results = ();	940	@INVOKE_RESULTS = ();
865		941
866	local $override;	942	local $override;
867		943
868	for (@$callbacks) {	944	for (@$callbacks) {
869	eval { &{$_->[1]} };	945	eval { &{$_->[1]} };
…		…
886		962
887	Generate an object-specific event with the given arguments.	963	Generate an object-specific event with the given arguments.
888		964
889	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	965	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
890	removed in future versions), and there is no public API to access override	966	removed in future versions), and there is no public API to access override
891	results (if you must, access C<@cf::invoke_results> directly).	967	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
892		968
893	=back	969	=back
894		970
895	=cut	971	=cut
896		972
897	#############################################################################	973	#############################################################################
898	# object support	974	# object support
		975
		976	sub _object_equal($$);
		977	sub _object_equal($$) {
		978	my ($a, $b) = @_;
		979
		980	return 0 unless (ref $a) eq (ref $b);
		981
		982	if ("HASH" eq ref $a) {
		983	my @ka = keys %$a;
		984	my @kb = keys %$b;
		985
		986	return 0 if @ka != @kb;
		987
		988	for (0 .. $#ka) {
		989	return 0 unless $ka[$_] eq $kb[$_];
		990	return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
		991	}
		992
		993	} elsif ("ARRAY" eq ref $a) {
		994
		995	return 0 if @$a != @$b;
		996
		997	for (0 .. $#$a) {
		998	return 0 unless _object_equal $a->[$_], $b->[$_];
		999	}
		1000
		1001	} elsif ($a ne $b) {
		1002	return 0;
		1003	}
		1004
		1005	1
		1006	}
		1007
		1008	our $SLOW_MERGES;#d#
		1009	sub _can_merge {
		1010	my ($ob1, $ob2) = @_;
		1011
		1012	++$SLOW_MERGES;#d#
		1013
		1014	# we do the slow way here
		1015	return _object_equal $ob1, $ob2
		1016	}
899		1017
900	sub reattach {	1018	sub reattach {
901	# basically do the same as instantiate, without calling instantiate	1019	# basically do the same as instantiate, without calling instantiate
902	my ($obj) = @_;	1020	my ($obj) = @_;
903		1021
…		…
950	sub object_freezer_save {	1068	sub object_freezer_save {
951	my ($filename, $rdata, $objs) = @_;	1069	my ($filename, $rdata, $objs) = @_;
952		1070
953	sync_job {	1071	sync_job {
954	if (length $$rdata) {	1072	if (length $$rdata) {
		1073	utf8::decode (my $decname = $filename);
955	warn sprintf "saving %s (%d,%d)\n",	1074	warn sprintf "saving %s (%d,%d)\n",
956	$filename, length $$rdata, scalar @$objs;	1075	$decname, length $$rdata, scalar @$objs;
957		1076
958	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1077	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
959	chmod SAVE_MODE, $fh;	1078	chmod SAVE_MODE, $fh;
960	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1079	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
961	aio_fsync $fh if $cf::USE_FSYNC;	1080	aio_fsync $fh if $cf::USE_FSYNC;
962	close $fh;	1081	close $fh;
963		1082
964	if (@$objs) {	1083	if (@$objs) {
965	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1084	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
966	chmod SAVE_MODE, $fh;	1085	chmod SAVE_MODE, $fh;
967	my $data = Storable::nfreeze { version => 1, objs => $objs };	1086	my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
968	aio_write $fh, 0, (length $data), $data, 0;	1087	aio_write $fh, 0, (length $data), $data, 0;
969	aio_fsync $fh if $cf::USE_FSYNC;	1088	aio_fsync $fh if $cf::USE_FSYNC;
970	close $fh;	1089	close $fh;
971	aio_rename "$filename.pst~", "$filename.pst";	1090	aio_rename "$filename.pst~", "$filename.pst";
972	}	1091	}
…		…
980	}	1099	}
981	} else {	1100	} else {
982	aio_unlink $filename;	1101	aio_unlink $filename;
983	aio_unlink "$filename.pst";	1102	aio_unlink "$filename.pst";
984	}	1103	}
985	}	1104	};
986	}	1105	}
987		1106
988	sub object_freezer_as_string {	1107	sub object_freezer_as_string {
989	my ($rdata, $objs) = @_;	1108	my ($rdata, $objs) = @_;
990		1109
…		…
1002	or return;	1121	or return;
1003		1122
1004	unless (aio_stat "$filename.pst") {	1123	unless (aio_stat "$filename.pst") {
1005	(aio_load "$filename.pst", $av) >= 0	1124	(aio_load "$filename.pst", $av) >= 0
1006	or return;	1125	or return;
1007	$av = eval { (Storable::thaw $av)->{objs} };
1008	}
1009		1126
		1127	my $st = eval { Coro::Storable::thaw $av }
		1128	|| eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
		1129	$av = $st->{objs};
		1130	}
		1131
		1132	utf8::decode (my $decname = $filename);
1010	warn sprintf "loading %s (%d)\n",	1133	warn sprintf "loading %s (%d,%d)\n",
1011	$filename, length $data, scalar @{$av || []};	1134	$decname, length $data, scalar @{$av || []};
		1135
1012	return ($data, $av);	1136	($data, $av)
1013	}	1137	}
1014		1138
1015	=head2 COMMAND CALLBACKS	1139	=head2 COMMAND CALLBACKS
1016		1140
1017	=over 4	1141	=over 4
…		…
1087	cf::override;	1211	cf::override;
1088	},	1212	},
1089	on_extcmd => sub {	1213	on_extcmd => sub {
1090	my ($pl, $buf) = @_;	1214	my ($pl, $buf) = @_;
1091		1215
1092	my $msg = eval { from_json $buf };	1216	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1093		1217
1094	if (ref $msg) {	1218	if (ref $msg) {
		1219	my ($type, $reply, @payload) =
		1220	"ARRAY" eq ref $msg
		1221	? @$msg
		1222	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1223
		1224	my @reply;
		1225
1095	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1226	if (my $cb = $EXTCMD{$type}) {
1096	if (my %reply = $cb->($pl, $msg)) {	1227	@reply = $cb->($pl, @payload);
1097	$pl->ext_reply ($msg->{msgid}, %reply);
1098	}
1099	}	1228	}
		1229
		1230	$pl->ext_reply ($reply, @reply)
		1231	if $reply;
		1232
1100	} else {	1233	} else {
1101	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1234	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1102	}	1235	}
1103		1236
1104	cf::override;	1237	cf::override;
…		…
1194		1327
1195	=head3 cf::player	1328	=head3 cf::player
1196		1329
1197	=over 4	1330	=over 4
1198		1331
		1332	=item cf::player::num_playing
		1333
		1334	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1335
		1336	=cut
		1337
		1338	sub num_playing {
		1339	scalar grep
		1340	$_->ob->map
		1341	&& !$_->hidden
		1342	&& !$_->ob->flag (cf::FLAG_WIZ),
		1343	cf::player::list
		1344	}
		1345
1199	=item cf::player::find $login	1346	=item cf::player::find $login
1200		1347
1201	Returns the given player object, loading it if necessary (might block).	1348	Returns the given player object, loading it if necessary (might block).
1202		1349
1203	=cut	1350	=cut
…		…
1238	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1385	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1239	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1386	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1240	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1387	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1241	aio_unlink +(playerdir $login) . "/$login.pl";	1388	aio_unlink +(playerdir $login) . "/$login.pl";
1242		1389
1243	my $pl = load_pl path $login	1390	my $f = new_from_file cf::object::thawer path $login
1244	or return;	1391	or return;
		1392
		1393	my $pl = cf::player::load_pl $f
		1394	or return;
		1395	local $cf::PLAYER_LOADING{$login} = $pl;
		1396	$f->resolve_delayed_derefs;
1245	$cf::PLAYER{$login} = $pl	1397	$cf::PLAYER{$login} = $pl
1246	}	1398	}
1247	}	1399	}
1248	}	1400	}
1249		1401
…		…
1259		1411
1260	aio_mkdir playerdir $pl, 0770;	1412	aio_mkdir playerdir $pl, 0770;
1261	$pl->{last_save} = $cf::RUNTIME;	1413	$pl->{last_save} = $cf::RUNTIME;
1262		1414
1263	$pl->save_pl ($path);	1415	$pl->save_pl ($path);
1264	Coro::cede;	1416	cf::cede_to_tick;
1265	}	1417	}
1266		1418
1267	sub new($) {	1419	sub new($) {
1268	my ($login) = @_;	1420	my ($login) = @_;
1269		1421
…		…
1273	$self->{deny_save} = 1;	1425	$self->{deny_save} = 1;
1274		1426
1275	$cf::PLAYER{$login} = $self;	1427	$cf::PLAYER{$login} = $self;
1276		1428
1277	$self	1429	$self
		1430	}
		1431
		1432	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1433
		1434	=cut
		1435
		1436	sub send_msg {
		1437	my $ns = shift->ns
		1438	or return;
		1439	$ns->send_msg (@_);
1278	}	1440	}
1279		1441
1280	=item $pl->quit_character	1442	=item $pl->quit_character
1281		1443
1282	Nukes the player without looking back. If logged in, the connection will	1444	Nukes the player without looking back. If logged in, the connection will
…		…
1337	or return [];	1499	or return [];
1338		1500
1339	my @logins;	1501	my @logins;
1340		1502
1341	for my $login (@$dirs) {	1503	for my $login (@$dirs) {
		1504	my $path = path $login;
		1505
		1506	# a .pst is a dead give-away for a valid player
		1507	unless (-e "$path.pst") {
1342	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1508	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1343	aio_read $fh, 0, 512, my $buf, 0 or next;	1509	aio_read $fh, 0, 512, my $buf, 0 or next;
1344	$buf !~ /^password -------------$/m or next; # official not-valid tag	1510	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1511	}
1345		1512
1346	utf8::decode $login;	1513	utf8::decode $login;
1347	push @logins, $login;	1514	push @logins, $login;
1348	}	1515	}
1349		1516
…		…
1387	sub expand_cfpod {	1554	sub expand_cfpod {
1388	((my $self), (local $_)) = @_;	1555	((my $self), (local $_)) = @_;
1389		1556
1390	# escape & and <	1557	# escape & and <
1391	s/&/&amp;/g;	1558	s/&/&amp;/g;
1392	s/(?<![BIUGH])</&lt;/g;	1559	s/(?<![BIUGHT])</&lt;/g;
1393		1560
1394	# this is buggy, it needs to properly take care of nested <'s	1561	# this is buggy, it needs to properly take care of nested <'s
1395		1562
1396	1 while	1563	1 while
1397	# replace B<>, I<>, U<> etc.	1564	# replace B<>, I<>, U<> etc.
1398	s/B<([^\>]*)>/<b>$1<\/b>/	1565	s/B<([^\>]*)>/<b>$1<\/b>/
1399	|| s/I<([^\>]*)>/<i>$1<\/i>/	1566	|| s/I<([^\>]*)>/<i>$1<\/i>/
1400	|| s/U<([^\>]*)>/<u>$1<\/u>/	1567	|| s/U<([^\>]*)>/<u>$1<\/u>/
		1568	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1401	# replace G<male|female> tags	1569	# replace G<male|female> tags
1402	|| s{G<([^>|]*)\|([^>]*)>}{	1570	|| s{G<([^>|]*)\|([^>]*)>}{
1403	$self->gender ? $2 : $1	1571	$self->gender ? $2 : $1
1404	}ge	1572	}ge
1405	# replace H<hint text>	1573	# replace H<hint text>
1406	|| s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;	1574	|| s{H<([^\>]*)>}
		1575	{
		1576	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1577	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1578	"")
		1579	[$self->{hintmode}]
		1580	}ge;
1407		1581
1408	# create single paragraphs (very hackish)	1582	# create single paragraphs (very hackish)
1409	s/(?<=\S)\n(?=\w)/ /g;	1583	s/(?<=\S)\n(?=\w)/ /g;
1410		1584
		1585	# compress some whitespace
		1586	s/\s+\n/\n/g; # ws line-ends
		1587	s/\n\n+/\n/g; # double lines
		1588	s/^\n+//; # beginning lines
		1589	s/\n+$//; # ending lines
		1590
1411	$_	1591	$_
1412	}	1592	}
1413		1593
		1594	sub hintmode {
		1595	$_[0]{hintmode} = $_[1] if @_ > 1;
		1596	$_[0]{hintmode}
		1597	}
		1598
1414	=item $player->ext_reply ($msgid, %msg)	1599	=item $player->ext_reply ($msgid, @msg)
1415		1600
1416	Sends an ext reply to the player.	1601	Sends an ext reply to the player.
1417		1602
1418	=cut	1603	=cut
1419		1604
1420	sub ext_reply($$%) {	1605	sub ext_reply($$@) {
1421	my ($self, $id, %msg) = @_;	1606	my ($self, $id, @msg) = @_;
1422		1607
1423	$msg{msgid} = $id;	1608	$self->ns->ext_reply ($id, @msg)
1424	$self->send ("ext " . cf::to_json \%msg);
1425	}	1609	}
1426		1610
1427	=item $player->ext_event ($type, %msg)	1611	=item $player->ext_msg ($type, @msg)
1428		1612
1429	Sends an ext event to the client.	1613	Sends an ext event to the client.
1430		1614
1431	=cut	1615	=cut
1432		1616
1433	sub ext_event($$%) {	1617	sub ext_msg($$@) {
1434	my ($self, $type, %msg) = @_;	1618	my ($self, $type, @msg) = @_;
1435		1619
1436	$self->ns->ext_event ($type, %msg);	1620	$self->ns->ext_msg ($type, @msg);
1437	}	1621	}
1438		1622
1439	=head3 cf::region	1623	=head3 cf::region
1440		1624
1441	=over 4	1625	=over 4
…		…
1454	my ($path) = @_;	1638	my ($path) = @_;
1455		1639
1456	my ($match, $specificity);	1640	my ($match, $specificity);
1457		1641
1458	for my $region (list) {	1642	for my $region (list) {
1459	if ($region->match && $path =~ $region->match) {	1643	if ($region->{match} && $path =~ $region->{match}) {
1460	($match, $specificity) = ($region, $region->specificity)	1644	($match, $specificity) = ($region, $region->specificity)
1461	if $region->specificity > $specificity;	1645	if $region->specificity > $specificity;
1462	}	1646	}
1463	}	1647	}
1464		1648
…		…
1584	$self->init; # pass $1 etc.	1768	$self->init; # pass $1 etc.
1585	return $self;	1769	return $self;
1586	}	1770	}
1587	}	1771	}
1588		1772
1589	Carp::carp "unable to resolve path '$path' (base '$base').";	1773	Carp::cluck "unable to resolve path '$path' (base '$base').";
1590	()	1774	()
1591	}	1775	}
1592		1776
1593	sub init {	1777	sub init {
1594	my ($self) = @_;	1778	my ($self) = @_;
…		…
1657		1841
1658	sub load_header_from($) {	1842	sub load_header_from($) {
1659	my ($self, $path) = @_;	1843	my ($self, $path) = @_;
1660		1844
1661	utf8::encode $path;	1845	utf8::encode $path;
1662	#aio_open $path, O_RDONLY, 0	1846	my $f = new_from_file cf::object::thawer $path
1663	# or return;
1664
1665	$self->_load_header ($path)
1666	or return;	1847	or return;
		1848
		1849	$self->_load_header ($f)
		1850	or return;
		1851
		1852	local $MAP_LOADING{$self->{path}} = $self;
		1853	$f->resolve_delayed_derefs;
1667		1854
1668	$self->{load_path} = $path;	1855	$self->{load_path} = $path;
1669		1856
1670	1	1857	1
1671	}	1858	}
…		…
1725	sub find {	1912	sub find {
1726	my ($path, $origin) = @_;	1913	my ($path, $origin) = @_;
1727		1914
1728	$path = normalise $path, $origin && $origin->path;	1915	$path = normalise $path, $origin && $origin->path;
1729		1916
		1917	cf::lock_wait "map_data:$path";#d#remove
1730	cf::lock_wait "map_find:$path";	1918	cf::lock_wait "map_find:$path";
1731		1919
1732	$cf::MAP{$path} || do {	1920	$cf::MAP{$path} || do {
1733	my $guard = cf::lock_acquire "map_find:$path";	1921	my $guard1 = cf::lock_acquire "map_find:$path";
		1922	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1923
1734	my $map = new_from_path cf::map $path	1924	my $map = new_from_path cf::map $path
1735	or return;	1925	or return;
1736		1926
1737	$map->{last_save} = $cf::RUNTIME;	1927	$map->{last_save} = $cf::RUNTIME;
1738		1928
…		…
1740	or return;	1930	or return;
1741		1931
1742	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1932	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1743	# doing this can freeze the server in a sync job, obviously	1933	# doing this can freeze the server in a sync job, obviously
1744	#$cf::WAIT_FOR_TICK->wait;	1934	#$cf::WAIT_FOR_TICK->wait;
		1935	undef $guard1;
		1936	undef $guard2;
1745	$map->reset;	1937	$map->reset;
1746	undef $guard;
1747	return find $path;	1938	return find $path;
1748	}	1939	}
1749		1940
1750	$cf::MAP{$path} = $map	1941	$cf::MAP{$path} = $map
1751	}	1942	}
…		…
1760	local $self->{deny_reset} = 1; # loading can take a long time	1951	local $self->{deny_reset} = 1; # loading can take a long time
1761		1952
1762	my $path = $self->{path};	1953	my $path = $self->{path};
1763		1954
1764	{	1955	{
1765	my $guard = cf::lock_acquire "map_load:$path";	1956	my $guard = cf::lock_acquire "map_data:$path";
1766		1957
		1958	return unless $self->valid;
1767	return if $self->in_memory != cf::MAP_SWAPPED;	1959	return unless $self->in_memory == cf::MAP_SWAPPED;
1768		1960
1769	$self->in_memory (cf::MAP_LOADING);	1961	$self->in_memory (cf::MAP_LOADING);
1770		1962
1771	$self->alloc;	1963	$self->alloc;
1772		1964
1773	$self->pre_load;	1965	$self->pre_load;
1774	Coro::cede;	1966	cf::cede_to_tick;
1775		1967
		1968	my $f = new_from_file cf::object::thawer $self->{load_path};
		1969	$f->skip_block;
1776	$self->_load_objects ($self->{load_path}, 1)	1970	$self->_load_objects ($f)
1777	or return;	1971	or return;
1778		1972
1779	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1973	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1780	if delete $self->{load_original};	1974	if delete $self->{load_original};
1781		1975
1782	if (my $uniq = $self->uniq_path) {	1976	if (my $uniq = $self->uniq_path) {
1783	utf8::encode $uniq;	1977	utf8::encode $uniq;
1784	if (aio_open $uniq, O_RDONLY, 0) {	1978	unless (aio_stat $uniq) {
		1979	if (my $f = new_from_file cf::object::thawer $uniq) {
1785	$self->clear_unique_items;	1980	$self->clear_unique_items;
1786	$self->_load_objects ($uniq, 0);	1981	$self->_load_objects ($f);
		1982	$f->resolve_delayed_derefs;
		1983	}
1787	}	1984	}
1788	}	1985	}
1789		1986
1790	Coro::cede;	1987	$f->resolve_delayed_derefs;
		1988
		1989	cf::cede_to_tick;
1791	# now do the right thing for maps	1990	# now do the right thing for maps
1792	$self->link_multipart_objects;	1991	$self->link_multipart_objects;
1793	$self->difficulty ($self->estimate_difficulty)	1992	$self->difficulty ($self->estimate_difficulty)
1794	unless $self->difficulty;	1993	unless $self->difficulty;
1795	Coro::cede;	1994	cf::cede_to_tick;
1796		1995
1797	unless ($self->{deny_activate}) {	1996	unless ($self->{deny_activate}) {
1798	$self->decay_objects;	1997	$self->decay_objects;
1799	$self->fix_auto_apply;	1998	$self->fix_auto_apply;
1800	$self->update_buttons;	1999	$self->update_buttons;
1801	Coro::cede;	2000	cf::cede_to_tick;
1802	$self->set_darkness_map;	2001	$self->set_darkness_map;
1803	Coro::cede;	2002	cf::cede_to_tick;
1804	$self->activate;	2003	$self->activate;
1805	}	2004	}
		2005
		2006	$self->{last_save} = $cf::RUNTIME;
		2007	$self->last_access ($cf::RUNTIME);
1806		2008
1807	$self->in_memory (cf::MAP_IN_MEMORY);	2009	$self->in_memory (cf::MAP_IN_MEMORY);
1808	}	2010	}
1809		2011
1810	$self->post_load;	2012	$self->post_load;
…		…
1821		2023
1822	$self	2024	$self
1823	}	2025	}
1824		2026
1825	# find and load all maps in the 3x3 area around a map	2027	# find and load all maps in the 3x3 area around a map
1826	sub load_diag {	2028	sub load_neighbours {
1827	my ($map) = @_;	2029	my ($map) = @_;
1828		2030
1829	my @diag; # diagonal neighbours	2031	my @neigh; # diagonal neighbours
1830		2032
1831	for (0 .. 3) {	2033	for (0 .. 3) {
1832	my $neigh = $map->tile_path ($_)	2034	my $neigh = $map->tile_path ($_)
1833	or next;	2035	or next;
1834	$neigh = find $neigh, $map	2036	$neigh = find $neigh, $map
1835	or next;	2037	or next;
1836	$neigh->load;	2038	$neigh->load;
1837		2039
		2040	push @neigh,
1838	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2041	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1839	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2042	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1840	}	2043	}
1841		2044
1842	for (@diag) {	2045	for (grep defined $_->[0], @neigh) {
		2046	my ($path, $origin) = @$_;
1843	my $neigh = find @$_	2047	my $neigh = find $path, $origin
1844	or next;	2048	or next;
1845	$neigh->load;	2049	$neigh->load;
1846	}	2050	}
1847	}	2051	}
1848		2052
…		…
1853	}	2057	}
1854		2058
1855	sub do_load_sync {	2059	sub do_load_sync {
1856	my ($map) = @_;	2060	my ($map) = @_;
1857		2061
		2062	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2063	if $Coro::current == $Coro::main;
		2064
1858	cf::sync_job { $map->load };	2065	cf::sync_job { $map->load };
1859	}	2066	}
1860		2067
1861	our %MAP_PREFETCH;	2068	our %MAP_PREFETCH;
1862	our $MAP_PREFETCHER = undef;	2069	our $MAP_PREFETCHER = undef;
1863		2070
1864	sub find_async {	2071	sub find_async {
1865	my ($path, $origin) = @_;	2072	my ($path, $origin, $load) = @_;
1866		2073
1867	$path = normalise $path, $origin && $origin->{path};	2074	$path = normalise $path, $origin && $origin->{path};
1868		2075
1869	if (my $map = $cf::MAP{$path}) {	2076	if (my $map = $cf::MAP{$path}) {
1870	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2077	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1871	}	2078	}
1872		2079
1873	undef $MAP_PREFETCH{$path};	2080	$MAP_PREFETCH{$path} |= $load;
		2081
1874	$MAP_PREFETCHER ||= cf::async {	2082	$MAP_PREFETCHER ||= cf::async {
		2083	$Coro::current->{desc} = "map prefetcher";
		2084
1875	while (%MAP_PREFETCH) {	2085	while (%MAP_PREFETCH) {
1876	for my $path (keys %MAP_PREFETCH) {	2086	while (my ($k, $v) = each %MAP_PREFETCH) {
1877	my $map = find $path	2087	if (my $map = find $k) {
1878	or next;
1879	$map->load;	2088	$map->load if $v;
		2089	}
1880		2090
1881	delete $MAP_PREFETCH{$path};	2091	delete $MAP_PREFETCH{$k};
1882	}	2092	}
1883	}	2093	}
1884	undef $MAP_PREFETCHER;	2094	undef $MAP_PREFETCHER;
1885	};	2095	};
1886	$MAP_PREFETCHER->prio (6);	2096	$MAP_PREFETCHER->prio (6);
…		…
1889	}	2099	}
1890		2100
1891	sub save {	2101	sub save {
1892	my ($self) = @_;	2102	my ($self) = @_;
1893		2103
1894	my $lock = cf::lock_acquire "map_data:" . $self->path;	2104	my $lock = cf::lock_acquire "map_data:$self->{path}";
1895		2105
1896	$self->{last_save} = $cf::RUNTIME;	2106	$self->{last_save} = $cf::RUNTIME;
1897		2107
1898	return unless $self->dirty;	2108	return unless $self->dirty;
1899		2109
…		…
1905	return if $self->{deny_save};	2115	return if $self->{deny_save};
1906		2116
1907	local $self->{last_access} = $self->last_access;#d#	2117	local $self->{last_access} = $self->last_access;#d#
1908		2118
1909	cf::async {	2119	cf::async {
		2120	$Coro::current->{desc} = "map player save";
1910	$_->contr->save for $self->players;	2121	$_->contr->save for $self->players;
1911	};	2122	};
1912		2123
1913	if ($uniq) {	2124	if ($uniq) {
1914	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2125	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
…		…
1922	my ($self) = @_;	2133	my ($self) = @_;
1923		2134
1924	# save first because save cedes	2135	# save first because save cedes
1925	$self->save;	2136	$self->save;
1926		2137
1927	my $lock = cf::lock_acquire "map_data:" . $self->path;	2138	my $lock = cf::lock_acquire "map_data:$self->{path}";
1928		2139
1929	return if $self->players;	2140	return if $self->players;
1930	return if $self->in_memory != cf::MAP_IN_MEMORY;	2141	return if $self->in_memory != cf::MAP_IN_MEMORY;
1931	return if $self->{deny_save};	2142	return if $self->{deny_save};
1932		2143
		2144	$self->in_memory (cf::MAP_SWAPPED);
		2145
		2146	$self->deactivate;
		2147	$_->clear_links_to ($self) for values %cf::MAP;
1933	$self->clear;	2148	$self->clear;
1934	$self->in_memory (cf::MAP_SWAPPED);
1935	}	2149	}
1936		2150
1937	sub reset_at {	2151	sub reset_at {
1938	my ($self) = @_;	2152	my ($self) = @_;
1939		2153
…		…
1971	if $uniq;	2185	if $uniq;
1972	}	2186	}
1973		2187
1974	delete $cf::MAP{$self->path};	2188	delete $cf::MAP{$self->path};
1975		2189
		2190	$self->deactivate;
		2191	$_->clear_links_to ($self) for values %cf::MAP;
1976	$self->clear;	2192	$self->clear;
1977
1978	$_->clear_links_to ($self) for values %cf::MAP;
1979		2193
1980	$self->unlink_save;	2194	$self->unlink_save;
1981	$self->destroy;	2195	$self->destroy;
1982	}	2196	}
1983		2197
1984	my $nuke_counter = "aaaa";	2198	my $nuke_counter = "aaaa";
1985		2199
1986	sub nuke {	2200	sub nuke {
1987	my ($self) = @_;	2201	my ($self) = @_;
1988		2202
		2203	{
		2204	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2205
1989	delete $cf::MAP{$self->path};	2206	delete $cf::MAP{$self->path};
1990		2207
1991	$self->unlink_save;	2208	$self->unlink_save;
1992		2209
1993	bless $self, "cf::map";	2210	bless $self, "cf::map";
1994	delete $self->{deny_reset};	2211	delete $self->{deny_reset};
1995	$self->{deny_save} = 1;	2212	$self->{deny_save} = 1;
1996	$self->reset_timeout (1);	2213	$self->reset_timeout (1);
1997	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2214	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1998		2215
1999	$cf::MAP{$self->path} = $self;	2216	$cf::MAP{$self->path} = $self;
		2217	}
2000		2218
2001	$self->reset; # polite request, might not happen	2219	$self->reset; # polite request, might not happen
2002	}	2220	}
2003		2221
2004	=item $maps = cf::map::tmp_maps	2222	=item $maps = cf::map::tmp_maps
…		…
2080		2298
2081	sub inv_recursive {	2299	sub inv_recursive {
2082	inv_recursive_ inv $_[0]	2300	inv_recursive_ inv $_[0]
2083	}	2301	}
2084		2302
		2303	=item $ref = $ob->ref
		2304
		2305	creates and returns a persistent reference to an objetc that can be stored as a string.
		2306
		2307	=item $ob = cf::object::deref ($refstring)
		2308
		2309	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2310	even if the object actually exists. May block.
		2311
		2312	=cut
		2313
		2314	sub deref {
		2315	my ($ref) = @_;
		2316
		2317	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2318	my ($uuid, $name) = ($1, $2);
		2319	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2320	or return;
		2321	$pl->ob->uuid eq $uuid
		2322	or return;
		2323
		2324	$pl->ob
		2325	} else {
		2326	warn "$ref: cannot resolve object reference\n";
		2327	undef
		2328	}
		2329	}
		2330
2085	package cf;	2331	package cf;
2086		2332
2087	=back	2333	=back
2088		2334
2089	=head3 cf::object::player	2335	=head3 cf::object::player
…		…
2111		2357
2112	} else {	2358	} else {
2113	my $pl = $self->contr;	2359	my $pl = $self->contr;
2114		2360
2115	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2361	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2116	my $diag = $pl->{npc_dialog};	2362	my $dialog = $pl->{npc_dialog};
2117	$diag->{pl}->ext_reply (	2363	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2118	$diag->{id},
2119	msgtype => "reply",
2120	msg => $diag->{pl}->expand_cfpod ($msg),
2121	add_topics => []
2122	);
2123		2364
2124	} else {	2365	} else {
2125	$msg = $npc->name . " says: $msg" if $npc;	2366	$msg = $npc->name . " says: $msg" if $npc;
2126	$self->message ($msg, $flags);	2367	$self->message ($msg, $flags);
2127	}	2368	}
2128	}	2369	}
		2370	}
		2371
		2372	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2373
		2374	=cut
		2375
		2376	sub cf::object::send_msg {
		2377	my $pl = shift->contr
		2378	or return;
		2379	$pl->send_msg (@_);
2129	}	2380	}
2130		2381
2131	=item $player_object->may ("access")	2382	=item $player_object->may ("access")
2132		2383
2133	Returns wether the given player is authorized to access resource "access"	2384	Returns wether the given player is authorized to access resource "access"
…		…
2212	# use -1 or undef as default coordinates, not 0, 0	2463	# use -1 or undef as default coordinates, not 0, 0
2213	($x, $y) = ($map->enter_x, $map->enter_y)	2464	($x, $y) = ($map->enter_x, $map->enter_y)
2214	if $x <=0 && $y <= 0;	2465	if $x <=0 && $y <= 0;
2215		2466
2216	$map->load;	2467	$map->load;
2217	$map->load_diag;	2468	$map->load_neighbours;
2218		2469
2219	return unless $self->contr->active;	2470	return unless $self->contr->active;
2220	$self->activate_recursive;	2471	$self->activate_recursive;
2221		2472
2222	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2473	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2223	$self->enter_map ($map, $x, $y);	2474	$self->enter_map ($map, $x, $y);
2224	}	2475	}
2225		2476
2226	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2477	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2227		2478
2228	Moves the player to the given map-path and coordinates by first freezing	2479	Moves the player to the given map-path and coordinates by first freezing
2229	her, loading and preparing them map, calling the provided $check callback	2480	her, loading and preparing them map, calling the provided $check callback
2230	that has to return the map if sucecssful, and then unfreezes the player on	2481	that has to return the map if sucecssful, and then unfreezes the player on
2231	the new (success) or old (failed) map position.	2482	the new (success) or old (failed) map position. In either case, $done will
		2483	be called at the end of this process.
2232		2484
2233	=cut	2485	=cut
2234		2486
2235	our $GOTOGEN;	2487	our $GOTOGEN;
2236		2488
2237	sub cf::object::player::goto {	2489	sub cf::object::player::goto {
2238	my ($self, $path, $x, $y, $check) = @_;	2490	my ($self, $path, $x, $y, $check, $done) = @_;
2239		2491
2240	# do generation counting so two concurrent goto's will be executed in-order	2492	# do generation counting so two concurrent goto's will be executed in-order
2241	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2493	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2242		2494
2243	$self->enter_link;	2495	$self->enter_link;
2244		2496
2245	(async {	2497	(async {
		2498	$Coro::current->{desc} = "player::goto $path $x $y";
		2499
		2500	# *tag paths override both path and x|y
		2501	if ($path =~ /^\*(.*)$/) {
		2502	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2503	my $ob = $obs[rand @obs];
		2504
		2505	# see if we actually can go there
		2506	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2507	$ob = $obs[rand @obs];
		2508	} else {
		2509	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2510	}
		2511	# else put us there anyways for now #d#
		2512
		2513	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2514	} else {
		2515	($path, $x, $y) = (undef, undef, undef);
		2516	}
		2517	}
		2518
2246	my $map = eval {	2519	my $map = eval {
2247	my $map = cf::map::find $path;	2520	my $map = defined $path ? cf::map::find $path : undef;
2248		2521
2249	if ($map) {	2522	if ($map) {
2250	$map = $map->customise_for ($self);	2523	$map = $map->customise_for ($self);
2251	$map = $check->($map) if $check && $map;	2524	$map = $check->($map) if $check && $map;
2252	} else {	2525	} else {
2253	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2526	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2254	}	2527	}
2255		2528
2256	$map	2529	$map
2257	};	2530	};
2258		2531
…		…
2263		2536
2264	if ($gen == $self->{_goto_generation}) {	2537	if ($gen == $self->{_goto_generation}) {
2265	delete $self->{_goto_generation};	2538	delete $self->{_goto_generation};
2266	$self->leave_link ($map, $x, $y);	2539	$self->leave_link ($map, $x, $y);
2267	}	2540	}
		2541
		2542	$done->() if $done;
2268	})->prio (1);	2543	})->prio (1);
2269	}	2544	}
2270		2545
2271	=item $player_object->enter_exit ($exit_object)	2546	=item $player_object->enter_exit ($exit_object)
2272		2547
…		…
2341	my $hp = $exit->stats->hp;	2616	my $hp = $exit->stats->hp;
2342	my $sp = $exit->stats->sp;	2617	my $sp = $exit->stats->sp;
2343		2618
2344	$self->enter_link;	2619	$self->enter_link;
2345		2620
		2621	# if exit is damned, update players death & WoR home-position
		2622	$self->contr->savebed ($slaying, $hp, $sp)
		2623	if $exit->flag (FLAG_DAMNED);
		2624
2346	(async {	2625	(async {
		2626	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2627
2347	$self->deactivate_recursive; # just to be sure	2628	$self->deactivate_recursive; # just to be sure
2348	unless (eval {	2629	unless (eval {
2349	$self->goto ($slaying, $hp, $sp);	2630	$self->goto ($slaying, $hp, $sp);
2350		2631
2351	1;	2632	1;
…		…
2377		2658
2378	utf8::encode $text;	2659	utf8::encode $text;
2379	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2660	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2380	}	2661	}
2381		2662
2382	=item $client->send_msg ($color, $type, $msg, [extra...])	2663	=item $client->send_msg ($channel, $msg, $color, [extra...])
2383		2664
2384	Send a drawinfo or msg packet to the client, formatting the msg for the	2665	Send a drawinfo or msg packet to the client, formatting the msg for the
2385	client if neccessary. C<$type> should be a string identifying the type of	2666	client if neccessary. C<$type> should be a string identifying the type of
2386	the message, with C<log> being the default. If C<$color> is negative, suppress	2667	the message, with C<log> being the default. If C<$color> is negative, suppress
2387	the message unless the client supports the msg packet.	2668	the message unless the client supports the msg packet.
2388		2669
2389	=cut	2670	=cut
2390		2671
		2672	our %CHANNEL = (
		2673	"c/identify" => {
		2674	id => "infobox",
		2675	title => "Identify",
		2676	reply => undef,
		2677	tooltip => "Items recently identified",
		2678	},
		2679	"c/examine" => {
		2680	id => "infobox",
		2681	title => "Examine",
		2682	reply => undef,
		2683	tooltip => "Signs and other items you examined",
		2684	},
		2685	"c/lookat" => {
		2686	id => "infobox",
		2687	title => "Look",
		2688	reply => undef,
		2689	tooltip => "What you saw there",
		2690	},
		2691	);
		2692
2391	sub cf::client::send_msg {	2693	sub cf::client::send_msg {
2392	my ($self, $color, $type, $msg, @extra) = @_;	2694	my ($self, $channel, $msg, $color, @extra) = @_;
2393		2695
2394	$msg = $self->pl->expand_cfpod ($msg);	2696	$msg = $self->pl->expand_cfpod ($msg);
2395		2697
		2698	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2699
		2700	# check predefined channels, for the benefit of C
		2701	if ($CHANNEL{$channel}) {
		2702	$channel = $CHANNEL{$channel};
		2703
		2704	$self->ext_msg (channel_info => $channel)
		2705	if $self->can_msg;
		2706
		2707	$channel = $channel->{id};
		2708
		2709	} elsif (ref $channel) {
		2710	# send meta info to client, if not yet sent
		2711	unless (exists $self->{channel}{$channel->{id}}) {
		2712	$self->{channel}{$channel->{id}} = $channel;
		2713	$self->ext_msg (channel_info => $channel)
		2714	if $self->can_msg;
		2715	}
		2716
		2717	$channel = $channel->{id};
		2718	}
		2719
		2720	return unless @extra || length $msg;
		2721
2396	if ($self->can_msg) {	2722	if ($self->can_msg) {
2397	$self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);	2723	# default colour, mask it out
		2724	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2725	if $color & cf::NDI_DEF;
		2726
		2727	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2728	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2398	} else {	2729	} else {
2399	# replace some tags by gcfclient-compatible ones
2400	for ($msg) {
2401	1 while
2402	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2403	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2404	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2405	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2406	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2407	}
2408
2409	if ($color >= 0) {	2730	if ($color >= 0) {
		2731	# replace some tags by gcfclient-compatible ones
		2732	for ($msg) {
		2733	1 while
		2734	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2735	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2736	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2737	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2738	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2739	}
		2740
		2741	$color &= cf::NDI_COLOR_MASK;
		2742
		2743	utf8::encode $msg;
		2744
2410	if (0 && $msg =~ /\[/) {	2745	if (0 && $msg =~ /\[/) {
		2746	# COMMAND/INFO
2411	$self->send_packet ("drawextinfo $color 4 0 $msg")	2747	$self->send_packet ("drawextinfo $color 10 8 $msg")
2412	} else {	2748	} else {
2413	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;	2749	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2414	$self->send_packet ("drawinfo $color $msg")	2750	$self->send_packet ("drawinfo $color $msg")
2415	}	2751	}
2416	}	2752	}
2417	}	2753	}
2418	}	2754	}
2419		2755
2420	=item $client->ext_event ($type, %msg)	2756	=item $client->ext_msg ($type, @msg)
2421		2757
2422	Sends an ext event to the client.	2758	Sends an ext event to the client.
2423		2759
2424	=cut	2760	=cut
2425		2761
2426	sub cf::client::ext_event($$%) {	2762	sub cf::client::ext_msg($$@) {
2427	my ($self, $type, %msg) = @_;	2763	my ($self, $type, @msg) = @_;
2428		2764
		2765	if ($self->extcmd == 2) {
		2766	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2767	} elsif ($self->extcmd == 1) { # TODO: remove
2429	$msg{msgtype} = "event_$type";	2768	push @msg, msgtype => "event_$type";
2430	$self->send_packet ("ext " . cf::to_json \%msg);	2769	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2770	}
		2771	}
		2772
		2773	=item $client->ext_reply ($msgid, @msg)
		2774
		2775	Sends an ext reply to the client.
		2776
		2777	=cut
		2778
		2779	sub cf::client::ext_reply($$@) {
		2780	my ($self, $id, @msg) = @_;
		2781
		2782	if ($self->extcmd == 2) {
		2783	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2784	} elsif ($self->extcmd == 1) {
		2785	#TODO: version 1, remove
		2786	unshift @msg, msgtype => "reply", msgid => $id;
		2787	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2788	}
2431	}	2789	}
2432		2790
2433	=item $success = $client->query ($flags, "text", \&cb)	2791	=item $success = $client->query ($flags, "text", \&cb)
2434		2792
2435	Queues a query to the client, calling the given callback with	2793	Queues a query to the client, calling the given callback with
…		…
2458		2816
2459	1	2817	1
2460	}	2818	}
2461		2819
2462	cf::client->attach (	2820	cf::client->attach (
		2821	on_connect => sub {
		2822	my ($ns) = @_;
		2823
		2824	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2825	},
2463	on_reply => sub {	2826	on_reply => sub {
2464	my ($ns, $msg) = @_;	2827	my ($ns, $msg) = @_;
2465		2828
2466	# this weird shuffling is so that direct followup queries	2829	# this weird shuffling is so that direct followup queries
2467	# get handled first	2830	# get handled first
…		…
2482	}	2845	}
2483	},	2846	},
2484	on_exticmd => sub {	2847	on_exticmd => sub {
2485	my ($ns, $buf) = @_;	2848	my ($ns, $buf) = @_;
2486		2849
2487	my $msg = eval { from_json $buf };	2850	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2488		2851
2489	if (ref $msg) {	2852	if (ref $msg) {
		2853	my ($type, $reply, @payload) =
		2854	"ARRAY" eq ref $msg
		2855	? @$msg
		2856	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2857
		2858	my @reply;
		2859
2490	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2860	if (my $cb = $EXTICMD{$type}) {
2491	if (my %reply = $cb->($ns, $msg)) {	2861	@reply = $cb->($ns, @payload);
2492	$reply{msgid} = $msg->{msgid};
2493	$ns->send ("ext " . cf::to_json \%reply);
2494	}
2495	}	2862	}
		2863
		2864	$ns->ext_reply ($reply, @reply)
		2865	if $reply;
		2866
2496	} else {	2867	} else {
2497	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2868	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2498	}	2869	}
2499		2870
2500	cf::override;	2871	cf::override;
…		…
2547	our $safe = new Safe "safe";	2918	our $safe = new Safe "safe";
2548	our $safe_hole = new Safe::Hole;	2919	our $safe_hole = new Safe::Hole;
2549		2920
2550	$SIG{FPE} = 'IGNORE';	2921	$SIG{FPE} = 'IGNORE';
2551		2922
2552	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2923	$safe->permit_only (Opcode::opset qw(
		2924	:base_core :base_mem :base_orig :base_math
		2925	grepstart grepwhile mapstart mapwhile
		2926	sort time
		2927	));
2553		2928
2554	# here we export the classes and methods available to script code	2929	# here we export the classes and methods available to script code
2555		2930
2556	=pod	2931	=pod
2557		2932
2558	The following functions and methods are available within a safe environment:	2933	The following functions and methods are available within a safe environment:
2559		2934
2560	cf::object contr pay_amount pay_player map	2935	cf::object
		2936	contr pay_amount pay_player map x y force_find force_add destroy
		2937	insert remove name archname title slaying race decrease_ob_nr
		2938
2561	cf::object::player player	2939	cf::object::player
2562	cf::player peaceful	2940	player
2563	cf::map trigger	2941
		2942	cf::player
		2943	peaceful
		2944
		2945	cf::map
		2946	trigger
2564		2947
2565	=cut	2948	=cut
2566		2949
2567	for (	2950	for (
2568	["cf::object" => qw(contr pay_amount pay_player map)],	2951	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2952	insert remove inv name archname title slaying race
		2953	decrease_ob_nr destroy)],
2569	["cf::object::player" => qw(player)],	2954	["cf::object::player" => qw(player)],
2570	["cf::player" => qw(peaceful)],	2955	["cf::player" => qw(peaceful)],
2571	["cf::map" => qw(trigger)],	2956	["cf::map" => qw(trigger)],
2572	) {	2957	) {
2573	no strict 'refs';	2958	no strict 'refs';
…		…
2649	# the server's init and main functions	3034	# the server's init and main functions
2650		3035
2651	sub load_facedata($) {	3036	sub load_facedata($) {
2652	my ($path) = @_;	3037	my ($path) = @_;
2653		3038
		3039	# HACK to clear player env face cache, we need some signal framework
		3040	# for this (global event?)
		3041	%ext::player_env::MUSIC_FACE_CACHE = ();
		3042
		3043	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3044
2654	warn "loading facedata from $path\n";	3045	warn "loading facedata from $path\n";
2655		3046
2656	my $facedata;	3047	my $facedata;
2657	0 < aio_load $path, $facedata	3048	0 < aio_load $path, $facedata
2658	or die "$path: $!";	3049	or die "$path: $!";
…		…
2660	$facedata = Coro::Storable::thaw $facedata;	3051	$facedata = Coro::Storable::thaw $facedata;
2661		3052
2662	$facedata->{version} == 2	3053	$facedata->{version} == 2
2663	or cf::cleanup "$path: version mismatch, cannot proceed.";	3054	or cf::cleanup "$path: version mismatch, cannot proceed.";
2664		3055
		3056	# patch in the exptable
		3057	$facedata->{resource}{"res/exp_table"} = {
		3058	type => FT_RSRC,
		3059	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3060	};
		3061	cf::cede_to_tick;
		3062
2665	{	3063	{
2666	my $faces = $facedata->{faceinfo};	3064	my $faces = $facedata->{faceinfo};
2667		3065
2668	while (my ($face, $info) = each %$faces) {	3066	while (my ($face, $info) = each %$faces) {
2669	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3067	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2670	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3068	cf::face::set_visibility $idx, $info->{visibility};
		3069	cf::face::set_magicmap $idx, $info->{magicmap};
2671	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3070	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2672	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3071	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2673	Coro::cede;	3072
		3073	cf::cede_to_tick;
2674	}	3074	}
2675		3075
2676	while (my ($face, $info) = each %$faces) {	3076	while (my ($face, $info) = each %$faces) {
2677	next unless $info->{smooth};	3077	next unless $info->{smooth};
2678	my $idx = cf::face::find $face	3078	my $idx = cf::face::find $face
2679	or next;	3079	or next;
2680	if (my $smooth = cf::face::find $info->{smooth}) {	3080	if (my $smooth = cf::face::find $info->{smooth}) {
		3081	cf::face::set_smooth $idx, $smooth;
2681	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3082	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2682	} else {	3083	} else {
2683	warn "smooth face '$info->{smooth}' not found for face '$face'";	3084	warn "smooth face '$info->{smooth}' not found for face '$face'";
2684	}	3085	}
2685	Coro::cede;	3086
		3087	cf::cede_to_tick;
2686	}	3088	}
2687	}	3089	}
2688		3090
2689	{	3091	{
2690	my $anims = $facedata->{animinfo};	3092	my $anims = $facedata->{animinfo};
2691		3093
2692	while (my ($anim, $info) = each %$anims) {	3094	while (my ($anim, $info) = each %$anims) {
2693	cf::anim::set $anim, $info->{frames}, $info->{facings};	3095	cf::anim::set $anim, $info->{frames}, $info->{facings};
2694	Coro::cede;	3096	cf::cede_to_tick;
2695	}	3097	}
2696		3098
2697	cf::anim::invalidate_all; # d'oh	3099	cf::anim::invalidate_all; # d'oh
2698	}	3100	}
2699		3101
		3102	{
		3103	# TODO: for gcfclient pleasure, we should give resources
		3104	# that gcfclient doesn't grok a >10000 face index.
		3105	my $res = $facedata->{resource};
		3106
		3107	my $soundconf = delete $res->{"res/sound.conf"};
		3108
		3109	while (my ($name, $info) = each %$res) {
		3110	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3111	my $data;
		3112
		3113	if ($info->{type} & 1) {
		3114	# prepend meta info
		3115
		3116	my $meta = $enc->encode ({
		3117	name => $name,
		3118	%{ $info->{meta} || {} },
		3119	});
		3120
		3121	$data = pack "(w/a*)*", $meta, $info->{data};
		3122	} else {
		3123	$data = $info->{data};
		3124	}
		3125
		3126	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3127	cf::face::set_type $idx, $info->{type};
		3128
		3129	cf::cede_to_tick;
		3130	}
		3131
		3132	if ($soundconf) {
		3133	$soundconf = $enc->decode (delete $soundconf->{data});
		3134
		3135	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3136	my $sound = $soundconf->{compat}[$_]
		3137	or next;
		3138
		3139	my $face = cf::face::find "sound/$sound->[1]";
		3140	cf::sound::set $sound->[0] => $face;
		3141	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3142	}
		3143
		3144	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3145	my $face = cf::face::find "sound/$v";
		3146	cf::sound::set $k => $face;
		3147	}
		3148	}
		3149	}
		3150
2700	1	3151	1
2701	}	3152	}
2702		3153
		3154	register_exticmd fx_want => sub {
		3155	my ($ns, $want) = @_;
		3156
		3157	while (my ($k, $v) = each %$want) {
		3158	$ns->fx_want ($k, $v);
		3159	}
		3160	};
		3161
2703	sub reload_regions {	3162	sub reload_regions {
		3163	# HACK to clear player env face cache, we need some signal framework
		3164	# for this (global event?)
		3165	%ext::player_env::MUSIC_FACE_CACHE = ();
		3166
2704	load_resource_file "$MAPDIR/regions"	3167	load_resource_file "$MAPDIR/regions"
2705	or die "unable to load regions file\n";	3168	or die "unable to load regions file\n";
		3169
		3170	for (cf::region::list) {
		3171	$_->{match} = qr/$_->{match}/
		3172	if exists $_->{match};
		3173	}
2706	}	3174	}
2707		3175
2708	sub reload_facedata {	3176	sub reload_facedata {
2709	load_facedata "$DATADIR/facedata"	3177	load_facedata "$DATADIR/facedata"
2710	or die "unable to load facedata\n";	3178	or die "unable to load facedata\n";
2711	}	3179	}
2712		3180
2713	sub reload_archetypes {	3181	sub reload_archetypes {
		3182	load_resource_file "$DATADIR/archetypes"
		3183	or die "unable to load archetypes\n";
		3184	#d# NEED to laod twice to resolve forward references
		3185	# this really needs to be done in an extra post-pass
		3186	# (which needs to be synchronous, so solve it differently)
2714	load_resource_file "$DATADIR/archetypes"	3187	load_resource_file "$DATADIR/archetypes"
2715	or die "unable to load archetypes\n";	3188	or die "unable to load archetypes\n";
2716	}	3189	}
2717		3190
2718	sub reload_treasures {	3191	sub reload_treasures {
…		…
2734		3207
2735	sub init {	3208	sub init {
2736	reload_resources;	3209	reload_resources;
2737	}	3210	}
2738		3211
2739	sub cfg_load {	3212	sub reload_config {
2740	open my $fh, "<:utf8", "$CONFDIR/config"	3213	open my $fh, "<:utf8", "$CONFDIR/config"
2741	or return;	3214	or return;
2742		3215
2743	local $/;	3216	local $/;
2744	*CFG = YAML::Syck::Load <$fh>;	3217	*CFG = YAML::Syck::Load <$fh>;
…		…
2760	sub main {	3233	sub main {
2761	# we must not ever block the main coroutine	3234	# we must not ever block the main coroutine
2762	local $Coro::idle = sub {	3235	local $Coro::idle = sub {
2763	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3236	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2764	(async {	3237	(async {
		3238	$Coro::current->{desc} = "IDLE BUG HANDLER";
2765	Event::one_event;	3239	Event::one_event;
2766	})->prio (Coro::PRIO_MAX);	3240	})->prio (Coro::PRIO_MAX);
2767	};	3241	};
2768		3242
2769	cfg_load;	3243	reload_config;
2770	db_init;	3244	db_init;
2771	load_extensions;	3245	load_extensions;
2772		3246
2773	$TICK_WATCHER->start;	3247	$TICK_WATCHER->start;
2774	Event::loop;	3248	Event::loop;
…		…
2841	# and maps saved/destroyed asynchronously.	3315	# and maps saved/destroyed asynchronously.
2842	warn "begin emergency player save\n";	3316	warn "begin emergency player save\n";
2843	for my $login (keys %cf::PLAYER) {	3317	for my $login (keys %cf::PLAYER) {
2844	my $pl = $cf::PLAYER{$login} or next;	3318	my $pl = $cf::PLAYER{$login} or next;
2845	$pl->valid or next;	3319	$pl->valid or next;
		3320	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2846	$pl->save;	3321	$pl->save;
2847	}	3322	}
2848	warn "end emergency player save\n";	3323	warn "end emergency player save\n";
2849		3324
2850	warn "begin emergency map save\n";	3325	warn "begin emergency map save\n";
…		…
2898		3373
2899	warn "flushing outstanding aio requests";	3374	warn "flushing outstanding aio requests";
2900	for (;;) {	3375	for (;;) {
2901	BDB::flush;	3376	BDB::flush;
2902	IO::AIO::flush;	3377	IO::AIO::flush;
2903	Coro::cede;	3378	Coro::cede_notself;
2904	last unless IO::AIO::nreqs || BDB::nreqs;	3379	last unless IO::AIO::nreqs || BDB::nreqs;
2905	warn "iterate...";	3380	warn "iterate...";
2906	}	3381	}
2907		3382
2908	++$RELOAD;	3383	++$RELOAD;
…		…
2967	warn "reloading cf.pm";	3442	warn "reloading cf.pm";
2968	require cf;	3443	require cf;
2969	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3444	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2970		3445
2971	warn "loading config and database again";	3446	warn "loading config and database again";
2972	cf::cfg_load;	3447	cf::reload_config;
2973		3448
2974	warn "loading extensions";	3449	warn "loading extensions";
2975	cf::load_extensions;	3450	cf::load_extensions;
2976		3451
2977	warn "reattaching attachments to objects/players";	3452	warn "reattaching attachments to objects/players";
…		…
3013	register_command "reload" => sub {	3488	register_command "reload" => sub {
3014	my ($who, $arg) = @_;	3489	my ($who, $arg) = @_;
3015		3490
3016	if ($who->flag (FLAG_WIZ)) {	3491	if ($who->flag (FLAG_WIZ)) {
3017	$who->message ("reloading server.");	3492	$who->message ("reloading server.");
		3493	async {
		3494	$Coro::current->{desc} = "perl_reload";
3018	async { reload_perl };	3495	reload_perl;
		3496	};
3019	}	3497	}
3020	};	3498	};
3021		3499
3022	unshift @INC, $LIBDIR;	3500	unshift @INC, $LIBDIR;
3023		3501
…		…
3042	my $signal = new Coro::Signal;	3520	my $signal = new Coro::Signal;
3043	push @WAIT_FOR_TICK_BEGIN, $signal;	3521	push @WAIT_FOR_TICK_BEGIN, $signal;
3044	$signal->wait;	3522	$signal->wait;
3045	}	3523	}
3046		3524
3047	my $min = 1e6;#d#
3048	my $avg = 10;
3049	$TICK_WATCHER = Event->timer (	3525	$TICK_WATCHER = Event->timer (
3050	reentrant => 0,	3526	reentrant => 0,
3051	parked => 1,	3527	parked => 1,
3052	prio => 0,	3528	prio => 0,
3053	at => $NEXT_TICK || $TICK,	3529	at => $NEXT_TICK || $TICK,
…		…
3061		3537
3062	$NOW = $tick_start = Event::time;	3538	$NOW = $tick_start = Event::time;
3063		3539
3064	cf::server_tick; # one server iteration	3540	cf::server_tick; # one server iteration
3065		3541
3066	0 && sync_job {#d#
3067	for(1..10) {
3068	my $t = Event::time;
3069	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3070	or die;
3071
3072	$map->width (50);
3073	$map->height (50);
3074	$map->alloc;
3075	$map->_load_objects ("/tmp/x.map", 1);
3076	my $t = Event::time - $t;
3077
3078	#next unless $t < 0.0013;#d#
3079	if ($t < $min) {
3080	$min = $t;
3081	}
3082	$avg = $avg * 0.99 + $t * 0.01;
3083	}
3084	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3085	exit 0;
3086	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3087	};
3088
3089	$RUNTIME += $TICK;	3542	$RUNTIME += $TICK;
3090	$NEXT_TICK += $TICK;	3543	$NEXT_TICK += $TICK;
3091		3544
3092	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3545	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3093	$NEXT_RUNTIME_WRITE = $NOW + 10;	3546	$NEXT_RUNTIME_WRITE = $NOW + 10;
3094	Coro::async_pool {	3547	Coro::async_pool {
		3548	$Coro::current->{desc} = "runtime saver";
3095	write_runtime	3549	write_runtime
3096	or warn "ERROR: unable to write runtime file: $!";	3550	or warn "ERROR: unable to write runtime file: $!";
3097	};	3551	};
3098	}	3552	}
3099		3553
3100	# my $AFTER = Event::time;
3101	# warn $AFTER - $NOW;#d#
3102
3103	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3554	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3104	$sig->send;	3555	$sig->send;
3105	}	3556	}
3106	while (my $sig = shift @WAIT_FOR_TICK) {	3557	while (my $sig = shift @WAIT_FOR_TICK) {
3107	$sig->send;	3558	$sig->send;
…		…
3117		3568
3118	$LOAD = ($NOW - $tick_start) / $TICK;	3569	$LOAD = ($NOW - $tick_start) / $TICK;
3119	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3570	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3120		3571
3121	_post_tick;	3572	_post_tick;
3122
3123
3124	},	3573	},
3125	);	3574	);
3126		3575
3127	{	3576	{
		3577	BDB::min_parallel 8;
3128	BDB::max_poll_time $TICK * 0.1;	3578	BDB::max_poll_time $TICK * 0.1;
3129	$BDB_POLL_WATCHER = Event->io (	3579	$BDB_POLL_WATCHER = Event->io (
3130	reentrant => 0,	3580	reentrant => 0,
3131	fd => BDB::poll_fileno,	3581	fd => BDB::poll_fileno,
3132	poll => 'r',	3582	poll => 'r',
3133	prio => 0,	3583	prio => 0,
3134	data => WF_AUTOCANCEL,	3584	data => WF_AUTOCANCEL,
3135	cb => \&BDB::poll_cb,	3585	cb => \&BDB::poll_cb,
3136	);	3586	);
3137	BDB::min_parallel 8;
3138		3587
3139	BDB::set_sync_prepare {	3588	BDB::set_sync_prepare {
3140	my $status;	3589	my $status;
3141	my $current = $Coro::current;	3590	my $current = $Coro::current;
3142	(	3591	(
…		…
3151	)	3600	)
3152	};	3601	};
3153		3602
3154	unless ($DB_ENV) {	3603	unless ($DB_ENV) {
3155	$DB_ENV = BDB::db_env_create;	3604	$DB_ENV = BDB::db_env_create;
		3605	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3606	| BDB::LOG_AUTOREMOVE, 1);
		3607	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3608	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3156		3609
3157	cf::sync_job {	3610	cf::sync_job {
3158	eval {	3611	eval {
3159	BDB::db_env_open	3612	BDB::db_env_open
3160	$DB_ENV,	3613	$DB_ENV,
…		…
3162	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3615	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3163	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3616	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3164	0666;	3617	0666;
3165		3618
3166	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3619	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3167
3168	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3169	$DB_ENV->set_lk_detect;
3170	};	3620	};
3171		3621
3172	cf::cleanup "db_env_open(db): $@" if $@;	3622	cf::cleanup "db_env_open(db): $@" if $@;
3173	};	3623	};
3174	}	3624	}
		3625
		3626	$BDB_DEADLOCK_WATCHER = Event->timer (
		3627	after => 3,
		3628	interval => 1,
		3629	hard => 1,
		3630	prio => 0,
		3631	data => WF_AUTOCANCEL,
		3632	cb => sub {
		3633	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3634	},
		3635	);
		3636	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3637	after => 11,
		3638	interval => 60,
		3639	hard => 1,
		3640	prio => 0,
		3641	data => WF_AUTOCANCEL,
		3642	cb => sub {
		3643	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3644	},
		3645	);
		3646	$BDB_TRICKLE_WATCHER = Event->timer (
		3647	after => 5,
		3648	interval => 10,
		3649	hard => 1,
		3650	prio => 0,
		3651	data => WF_AUTOCANCEL,
		3652	cb => sub {
		3653	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3654	},
		3655	);
3175	}	3656	}
3176		3657
3177	{	3658	{
3178	IO::AIO::min_parallel 8;	3659	IO::AIO::min_parallel 8;
3179		3660
…		…
3182	$AIO_POLL_WATCHER = Event->io (	3663	$AIO_POLL_WATCHER = Event->io (
3183	reentrant => 0,	3664	reentrant => 0,
3184	data => WF_AUTOCANCEL,	3665	data => WF_AUTOCANCEL,
3185	fd => IO::AIO::poll_fileno,	3666	fd => IO::AIO::poll_fileno,
3186	poll => 'r',	3667	poll => 'r',
3187	prio => 6,	3668	prio => 0,
3188	cb => \&IO::AIO::poll_cb,	3669	cb => \&IO::AIO::poll_cb,
3189	);	3670	);
3190	}	3671	}
3191		3672
3192	my $_log_backtrace;	3673	my $_log_backtrace;
…		…
3198		3679
3199	# limit the # of concurrent backtraces	3680	# limit the # of concurrent backtraces
3200	if ($_log_backtrace < 2) {	3681	if ($_log_backtrace < 2) {
3201	++$_log_backtrace;	3682	++$_log_backtrace;
3202	async {	3683	async {
		3684	$Coro::current->{desc} = "abt $msg";
		3685
3203	my @bt = fork_call {	3686	my @bt = fork_call {
3204	@addr = map { sprintf "%x", $_ } @addr;	3687	@addr = map { sprintf "%x", $_ } @addr;
3205	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3688	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3206	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"	3689	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3207	or die "addr2line: $!";	3690	or die "addr2line: $!";

Diff Legend

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