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

Diff Legend

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