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.286 by root, Sun Jun 24 04:27:20 2007 UTC vs.
Revision 1.378 by root, Thu Oct 4 11:36:54 2007 UTC

…		…
10	use Event;	10	use Event;
11	use Opcode;	11	use Opcode;
12	use Safe;	12	use Safe;
13	use Safe::Hole;	13	use Safe::Hole;
14		14
15	use Coro 3.61 ();	15	use Coro 3.64 ();
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.32 ();
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
…		…
49	our %COMMAND = ();	52	our %COMMAND = ();
50	our %COMMAND_TIME = ();	53	our %COMMAND_TIME = ();
51		54
52	our @EXTS = (); # list of extension package names	55	our @EXTS = (); # list of extension package names
53	our %EXTCMD = ();	56	our %EXTCMD = ();
		57	our %EXTICMD = ();
54	our %EXT_CORO = (); # coroutines bound to extensions	58	our %EXT_CORO = (); # coroutines bound to extensions
55	our %EXT_MAP = (); # pluggable maps	59	our %EXT_MAP = (); # pluggable maps
56		60
57	our $RELOAD; # number of reloads so far	61	our $RELOAD; # number of reloads so far
58	our @EVENT;	62	our @EVENT;
…		…
76	our $NEXT_TICK;	80	our $NEXT_TICK;
77	our $NOW;	81	our $NOW;
78	our $USE_FSYNC = 1; # use fsync to write maps - default off	82	our $USE_FSYNC = 1; # use fsync to write maps - default off
79		83
80	our $BDB_POLL_WATCHER;	84	our $BDB_POLL_WATCHER;
		85	our $BDB_DEADLOCK_WATCHER;
		86	our $BDB_CHECKPOINT_WATCHER;
		87	our $BDB_TRICKLE_WATCHER;
81	our $DB_ENV;	88	our $DB_ENV;
82		89
83	our %CFG;	90	our %CFG;
84		91
85	our $UPTIME; $UPTIME ||= time;	92	our $UPTIME; $UPTIME ||= time;
86	our $RUNTIME;	93	our $RUNTIME;
87		94
88	our %PLAYER; # all users	95	our (%PLAYER, %PLAYER_LOADING); # all users
89	our %MAP; # all maps	96	our (%MAP, %MAP_LOADING ); # all maps
90	our $LINK_MAP; # the special {link} map, which is always available	97	our $LINK_MAP; # the special {link} map, which is always available
91		98
92	# 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 ∕
93	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	100	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94		101
…		…
164		171
165	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
166	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
167	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.
168		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
169	=back	182	=back
170		183
171	=cut	184	=cut
172		185
173	BEGIN {	186	BEGIN {
…		…
177	$msg .= "\n"	190	$msg .= "\n"
178	unless $msg =~ /\n$/;	191	unless $msg =~ /\n$/;
179		192
180	$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;
181		194
182	utf8::encode $msg;
183	LOG llevError, $msg;	195	LOG llevError, $msg;
184	};	196	};
185	}	197	}
186		198
187	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	199	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
236	$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;
237	$d	249	$d
238	} || "[unable to dump $_[0]: '$@']";	250	} || "[unable to dump $_[0]: '$@']";
239	}	251	}
240		252
241	use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243	=item $ref = cf::from_json $json	253	=item $ref = cf::from_json $json
244		254
245	Converts a JSON string into the corresponding perl data structure.	255	Converts a JSON string into the corresponding perl data structure.
246		256
247	=item $json = cf::to_json $ref	257	=item $json = cf::to_json $ref
248		258
249	Converts a perl data structure into its JSON representation.	259	Converts a perl data structure into its JSON representation.
		260
		261	=cut
		262
		263	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
		264
		265	sub to_json ($) { $json_coder->encode ($_[0]) }
		266	sub from_json ($) { $json_coder->decode ($_[0]) }
250		267
251	=item cf::lock_wait $string	268	=item cf::lock_wait $string
252		269
253	Wait until the given lock is available. See cf::lock_acquire.	270	Wait until the given lock is available. See cf::lock_acquire.
254		271
…		…
257	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
258	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,
259	for example when the coroutine gets canceled), the lock is automatically	276	for example when the coroutine gets canceled), the lock is automatically
260	returned.	277	returned.
261		278
		279	Locks are *not* recursive, locking from the same coro twice results in a
		280	deadlocked coro.
		281
262	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
263	uses map_find and cf::map::load uses map_load).	283	uses map_find and cf::map::load uses map_load).
264		284
265	=item $locked = cf::lock_active $string	285	=item $locked = cf::lock_active $string
266		286
267	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.
268		288
269	=cut	289	=cut
270		290
271	our %LOCK;	291	our %LOCK;
		292	our %LOCKER;#d#
272		293
273	sub lock_wait($) {	294	sub lock_wait($) {
274	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#
275		301
276	# wait for lock, if any	302	# wait for lock, if any
277	while ($LOCK{$key}) {	303	while ($LOCK{$key}) {
278	push @{ $LOCK{$key} }, $Coro::current;	304	push @{ $LOCK{$key} }, $Coro::current;
279	Coro::schedule;	305	Coro::schedule;
…		…
285		311
286	# wait, to be sure we are not locked	312	# wait, to be sure we are not locked
287	lock_wait $key;	313	lock_wait $key;
288		314
289	$LOCK{$key} = [];	315	$LOCK{$key} = [];
		316	$LOCKER{$key} = $Coro::current;#d#
290		317
291	Coro::guard {	318	Coro::guard {
		319	delete $LOCKER{$key};#d#
292	# wake up all waiters, to be on the safe side	320	# wake up all waiters, to be on the safe side
293	$_->ready for @{ delete $LOCK{$key} };	321	$_->ready for @{ delete $LOCK{$key} };
294	}	322	}
295	}	323	}
296		324
…		…
306	my $guard = Coro::guard {	334	my $guard = Coro::guard {
307	$TICK_WATCHER->start;	335	$TICK_WATCHER->start;
308	};	336	};
309	$TICK_WATCHER->stop;	337	$TICK_WATCHER->stop;
310	$guard	338	$guard
		339	}
		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;
311	}	397	}
312		398
313	=item cf::async { BLOCK }	399	=item cf::async { BLOCK }
314		400
315	Currently the same as Coro::async_pool, meaning you cannot use	401	Currently the same as Coro::async_pool, meaning you cannot use
…		…
349		435
350	my $busy = 1;	436	my $busy = 1;
351	my @res;	437	my @res;
352		438
353	(async {	439	(async {
		440	$Coro::current->desc ("sync job coro");
354	@res = eval { $job->() };	441	@res = eval { $job->() };
355	warn $@ if $@;	442	warn $@ if $@;
356	undef $busy;	443	undef $busy;
357	})->prio (Coro::PRIO_MAX);	444	})->prio (Coro::PRIO_MAX);
358		445
…		…
405	=cut	492	=cut
406		493
407	sub fork_call(&@) {	494	sub fork_call(&@) {
408	my ($cb, @args) = @_;	495	my ($cb, @args) = @_;
409		496
410	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	497	# we seemingly have to make a local copy of the whole thing,
411	# or die "socketpair: $!";	498	# otherwise perl prematurely frees the stuff :/
412	pipe my $fh1, my $fh2	499	# TODO: investigate and fix (likely this will be rather laborious)
413	or die "pipe: $!";
414		500
415	if (my $pid = fork) {	501	my @res = Coro::Util::fork_eval {
416	close $fh2;
417
418	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
419	$res = Coro::Storable::thaw $res;
420
421	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423	die $$res unless "ARRAY" eq ref $res;
424
425	return wantarray ? @$res : $res->[-1];
426	} else {
427	reset_signals;	502	reset_signals;
428	local $SIG{__WARN__};	503	&$cb
429	local $SIG{__DIE__};	504	}, @args;
430	eval {
431	close $fh1;
432		505
433	my @res = eval { $cb->(@args) };	506	wantarray ? @res : $res[-1]
434	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
435	};
436
437	warn $@ if $@;
438	_exit 0;
439	}
440	}	507	}
441		508
442	=item $value = cf::db_get $family => $key	509	=item $value = cf::db_get $family => $key
443		510
444	Returns a single value from the environment database.	511	Returns a single value from the environment database.
…		…
446	=item cf::db_put $family => $key => $value	513	=item cf::db_put $family => $key => $value
447		514
448	Stores the given C<$value> in the family. It can currently store binary	515	Stores the given C<$value> in the family. It can currently store binary
449	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).	516	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
450		517
		518	=item $db = cf::db_table "name"
		519
		520	Create and/or open a new database table. The string must not be "db" and must be unique
		521	within each server.
		522
451	=cut	523	=cut
		524
		525	sub db_table($) {
		526	my ($name) = @_;
		527	my $db = BDB::db_create $DB_ENV;
		528
		529	eval {
		530	$db->set_flags (BDB::CHKSUM);
		531
		532	utf8::encode $name;
		533	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		534	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		535	cf::cleanup "db_open(db): $!" if $!;
		536	};
		537	cf::cleanup "db_open(db): $@" if $@;
		538
		539	$db
		540	}
452		541
453	our $DB;	542	our $DB;
454		543
455	sub db_init {	544	sub db_init {
456	unless ($DB) {
457	$DB = BDB::db_create $DB_ENV;
458
459	cf::sync_job {	545	cf::sync_job {
460	eval {	546	$DB ||= db_table "db";
461	$DB->set_flags (BDB::CHKSUM);
462
463	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
464	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
465	cf::cleanup "db_open(db): $!" if $!;
466	};
467	cf::cleanup "db_open(db): $@" if $@;
468	};
469	}	547	};
470	}	548	}
471		549
472	sub db_get($$) {	550	sub db_get($$) {
473	my $key = "$_[0]/$_[1]";	551	my $key = "$_[0]/$_[1]";
474		552
…		…
524	if (1) {	602	if (1) {
525	$md5 =	603	$md5 =
526	join "\x00",	604	join "\x00",
527	$processversion,	605	$processversion,
528	map {	606	map {
529	Coro::cede;	607	cf::cede_to_tick;
530	($src->[$_], Digest::MD5::md5_hex $data[$_])	608	($src->[$_], Digest::MD5::md5_hex $data[$_])
531	} 0.. $#$src;	609	} 0.. $#$src;
532		610
533		611
534	my $dbmd5 = db_get cache => "$id/md5";	612	my $dbmd5 = db_get cache => "$id/md5";
…		…
840	";	918	";
841	die if $@;	919	die if $@;
842	}	920	}
843		921
844	our $override;	922	our $override;
845	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	923	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846		924
847	sub override {	925	sub override {
848	$override = 1;	926	$override = 1;
849	@invoke_results = ();	927	@INVOKE_RESULTS = (@_);
850	}	928	}
851		929
852	sub do_invoke {	930	sub do_invoke {
853	my $event = shift;	931	my $event = shift;
854	my $callbacks = shift;	932	my $callbacks = shift;
855		933
856	@invoke_results = ();	934	@INVOKE_RESULTS = ();
857		935
858	local $override;	936	local $override;
859		937
860	for (@$callbacks) {	938	for (@$callbacks) {
861	eval { &{$_->[1]} };	939	eval { &{$_->[1]} };
…		…
878		956
879	Generate an object-specific event with the given arguments.	957	Generate an object-specific event with the given arguments.
880		958
881	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	959	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
882	removed in future versions), and there is no public API to access override	960	removed in future versions), and there is no public API to access override
883	results (if you must, access C<@cf::invoke_results> directly).	961	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884		962
885	=back	963	=back
886		964
887	=cut	965	=cut
888		966
889	#############################################################################	967	#############################################################################
890	# object support	968	# object support
		969	#
		970
		971	sub _can_merge {
		972	my ($ob1, $ob2) = @_;
		973
		974	local $Storable::canonical = 1;
		975	my $fob1 = Storable::freeze $ob1;
		976	my $fob2 = Storable::freeze $ob2;
		977
		978	$fob1 eq $fob2
		979	}
891		980
892	sub reattach {	981	sub reattach {
893	# basically do the same as instantiate, without calling instantiate	982	# basically do the same as instantiate, without calling instantiate
894	my ($obj) = @_;	983	my ($obj) = @_;
895		984
…		…
942	sub object_freezer_save {	1031	sub object_freezer_save {
943	my ($filename, $rdata, $objs) = @_;	1032	my ($filename, $rdata, $objs) = @_;
944		1033
945	sync_job {	1034	sync_job {
946	if (length $$rdata) {	1035	if (length $$rdata) {
		1036	utf8::decode (my $decname = $filename);
947	warn sprintf "saving %s (%d,%d)\n",	1037	warn sprintf "saving %s (%d,%d)\n",
948	$filename, length $$rdata, scalar @$objs;	1038	$decname, length $$rdata, scalar @$objs;
949		1039
950	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1040	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951	chmod SAVE_MODE, $fh;	1041	chmod SAVE_MODE, $fh;
952	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1042	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953	aio_fsync $fh if $cf::USE_FSYNC;	1043	aio_fsync $fh if $cf::USE_FSYNC;
…		…
972	}	1062	}
973	} else {	1063	} else {
974	aio_unlink $filename;	1064	aio_unlink $filename;
975	aio_unlink "$filename.pst";	1065	aio_unlink "$filename.pst";
976	}	1066	}
977	}	1067	};
978	}	1068	}
979		1069
980	sub object_freezer_as_string {	1070	sub object_freezer_as_string {
981	my ($rdata, $objs) = @_;	1071	my ($rdata, $objs) = @_;
982		1072
…		…
994	or return;	1084	or return;
995		1085
996	unless (aio_stat "$filename.pst") {	1086	unless (aio_stat "$filename.pst") {
997	(aio_load "$filename.pst", $av) >= 0	1087	(aio_load "$filename.pst", $av) >= 0
998	or return;	1088	or return;
		1089
999	$av = eval { (Storable::thaw $av)->{objs} };	1090	$av = eval { (Storable::thaw $av)->{objs} };
1000	}	1091	}
1001		1092
		1093	utf8::decode (my $decname = $filename);
1002	warn sprintf "loading %s (%d)\n",	1094	warn sprintf "loading %s (%d,%d)\n",
1003	$filename, length $data, scalar @{$av || []};	1095	$decname, length $data, scalar @{$av || []};
		1096
1004	return ($data, $av);	1097	($data, $av)
1005	}	1098	}
1006		1099
1007	=head2 COMMAND CALLBACKS	1100	=head2 COMMAND CALLBACKS
1008		1101
1009	=over 4	1102	=over 4
…		…
1029	push @{ $COMMAND{$name} }, [$caller, $cb];	1122	push @{ $COMMAND{$name} }, [$caller, $cb];
1030	}	1123	}
1031		1124
1032	=item cf::register_extcmd $name => \&callback($pl,$packet);	1125	=item cf::register_extcmd $name => \&callback($pl,$packet);
1033		1126
1034	Register a callback fro execution when the client sends an extcmd packet.	1127	Register a callback for execution when the client sends an (synchronous)
		1128	extcmd packet. Ext commands will be processed in the order they are
		1129	received by the server, like other user commands. The first argument is
		1130	the logged-in player. Ext commands can only be processed after a player
		1131	has logged in successfully.
1035		1132
1036	If the callback returns something, it is sent back as if reply was being	1133	If the callback returns something, it is sent back as if reply was being
1037	called.	1134	called.
1038		1135
		1136	=item cf::register_exticmd $name => \&callback($ns,$packet);
		1137
		1138	Register a callback for execution when the client sends an (asynchronous)
		1139	exticmd packet. Exti commands are processed by the server as soon as they
		1140	are received, i.e. out of order w.r.t. other commands. The first argument
		1141	is a client socket. Exti commands can be received anytime, even before
		1142	log-in.
		1143
		1144	If the callback returns something, it is sent back as if reply was being
		1145	called.
		1146
1039	=cut	1147	=cut
1040		1148
1041	sub register_extcmd {	1149	sub register_extcmd {
1042	my ($name, $cb) = @_;	1150	my ($name, $cb) = @_;
1043		1151
1044	$EXTCMD{$name} = $cb;	1152	$EXTCMD{$name} = $cb;
		1153	}
		1154
		1155	sub register_exticmd {
		1156	my ($name, $cb) = @_;
		1157
		1158	$EXTICMD{$name} = $cb;
1045	}	1159	}
1046		1160
1047	cf::player->attach (	1161	cf::player->attach (
1048	on_command => sub {	1162	on_command => sub {
1049	my ($pl, $name, $params) = @_;	1163	my ($pl, $name, $params) = @_;
…		…
1058	cf::override;	1172	cf::override;
1059	},	1173	},
1060	on_extcmd => sub {	1174	on_extcmd => sub {
1061	my ($pl, $buf) = @_;	1175	my ($pl, $buf) = @_;
1062		1176
1063	my $msg = eval { from_json $buf };	1177	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064		1178
1065	if (ref $msg) {	1179	if (ref $msg) {
		1180	my ($type, $reply, @payload) =
		1181	"ARRAY" eq ref $msg
		1182	? @$msg
		1183	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1184
		1185	my @reply;
		1186
1066	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1187	if (my $cb = $EXTCMD{$type}) {
1067	if (my %reply = $cb->($pl, $msg)) {	1188	@reply = $cb->($pl, @payload);
1068	$pl->ext_reply ($msg->{msgid}, %reply);
1069	}
1070	}	1189	}
		1190
		1191	$pl->ext_reply ($reply, @reply)
		1192	if $reply;
		1193
1071	} else {	1194	} else {
1072	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1195	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073	}	1196	}
1074		1197
1075	cf::override;	1198	cf::override;
…		…
1165		1288
1166	=head3 cf::player	1289	=head3 cf::player
1167		1290
1168	=over 4	1291	=over 4
1169		1292
		1293	=item cf::player::num_playing
		1294
		1295	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1296
		1297	=cut
		1298
		1299	sub num_playing {
		1300	scalar grep
		1301	$_->ob->map
		1302	&& !$_->hidden
		1303	&& !$_->ob->flag (cf::FLAG_WIZ),
		1304	cf::player::list
		1305	}
		1306
1170	=item cf::player::find $login	1307	=item cf::player::find $login
1171		1308
1172	Returns the given player object, loading it if necessary (might block).	1309	Returns the given player object, loading it if necessary (might block).
1173		1310
1174	=cut	1311	=cut
…		…
1209	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1346	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1347	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1348	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212	aio_unlink +(playerdir $login) . "/$login.pl";	1349	aio_unlink +(playerdir $login) . "/$login.pl";
1213		1350
1214	my $pl = load_pl path $login	1351	my $f = new_from_file cf::object::thawer path $login
1215	or return;	1352	or return;
		1353
		1354	my $pl = cf::player::load_pl $f
		1355	or return;
		1356	local $cf::PLAYER_LOADING{$login} = $pl;
		1357	$f->resolve_delayed_derefs;
1216	$cf::PLAYER{$login} = $pl	1358	$cf::PLAYER{$login} = $pl
1217	}	1359	}
1218	}	1360	}
1219	}	1361	}
1220		1362
…		…
1230		1372
1231	aio_mkdir playerdir $pl, 0770;	1373	aio_mkdir playerdir $pl, 0770;
1232	$pl->{last_save} = $cf::RUNTIME;	1374	$pl->{last_save} = $cf::RUNTIME;
1233		1375
1234	$pl->save_pl ($path);	1376	$pl->save_pl ($path);
1235	Coro::cede;	1377	cf::cede_to_tick;
1236	}	1378	}
1237		1379
1238	sub new($) {	1380	sub new($) {
1239	my ($login) = @_;	1381	my ($login) = @_;
1240		1382
…		…
1244	$self->{deny_save} = 1;	1386	$self->{deny_save} = 1;
1245		1387
1246	$cf::PLAYER{$login} = $self;	1388	$cf::PLAYER{$login} = $self;
1247		1389
1248	$self	1390	$self
		1391	}
		1392
		1393	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1394
		1395	=cut
		1396
		1397	sub send_msg {
		1398	my $ns = shift->ns
		1399	or return;
		1400	$ns->send_msg (@_);
1249	}	1401	}
1250		1402
1251	=item $pl->quit_character	1403	=item $pl->quit_character
1252		1404
1253	Nukes the player without looking back. If logged in, the connection will	1405	Nukes the player without looking back. If logged in, the connection will
…		…
1308	or return [];	1460	or return [];
1309		1461
1310	my @logins;	1462	my @logins;
1311		1463
1312	for my $login (@$dirs) {	1464	for my $login (@$dirs) {
		1465	my $path = path $login;
		1466
		1467	# a .pst is a dead give-away for a valid player
		1468	unless (-e "$path.pst") {
1313	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1469	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314	aio_read $fh, 0, 512, my $buf, 0 or next;	1470	aio_read $fh, 0, 512, my $buf, 0 or next;
1315	$buf !~ /^password -------------$/m or next; # official not-valid tag	1471	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1472	}
1316		1473
1317	utf8::decode $login;	1474	utf8::decode $login;
1318	push @logins, $login;	1475	push @logins, $login;
1319	}	1476	}
1320		1477
…		…
1358	sub expand_cfpod {	1515	sub expand_cfpod {
1359	((my $self), (local $_)) = @_;	1516	((my $self), (local $_)) = @_;
1360		1517
1361	# escape & and <	1518	# escape & and <
1362	s/&/&amp;/g;	1519	s/&/&amp;/g;
1363	s/(?<![BIUGH])</&lt;/g;	1520	s/(?<![BIUGHT])</&lt;/g;
1364		1521
1365	# this is buggy, it needs to properly take care of nested <'s	1522	# this is buggy, it needs to properly take care of nested <'s
1366		1523
1367	1 while	1524	1 while
1368	# replace B<>, I<>, U<> etc.	1525	# replace B<>, I<>, U<> etc.
1369	s/B<([^\>]*)>/<b>$1<\/b>/	1526	s/B<([^\>]*)>/<b>$1<\/b>/
1370	|| s/I<([^\>]*)>/<i>$1<\/i>/	1527	|| s/I<([^\>]*)>/<i>$1<\/i>/
1371	|| s/U<([^\>]*)>/<u>$1<\/u>/	1528	|| s/U<([^\>]*)>/<u>$1<\/u>/
		1529	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1372	# replace G<male|female> tags	1530	# replace G<male|female> tags
1373	|| s{G<([^>|]*)\|([^>]*)>}{	1531	|| s{G<([^>|]*)\|([^>]*)>}{
1374	$self->gender ? $2 : $1	1532	$self->gender ? $2 : $1
1375	}ge	1533	}ge
1376	# replace H<hint text>	1534	# replace H<hint text>
1377	|| s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;	1535	|| s{H<([^\>]*)>}
		1536	{
		1537	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1538	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1539	"")
		1540	[$self->{hintmode}]
		1541	}ge;
1378		1542
1379	# create single paragraphs (very hackish)	1543	# create single paragraphs (very hackish)
1380	s/(?<=\S)\n(?=\w)/ /g;	1544	s/(?<=\S)\n(?=\w)/ /g;
1381		1545
		1546	# compress some whitespace
		1547	s/\s+\n/\n/g; # ws line-ends
		1548	s/\n\n+/\n/g; # double lines
		1549	s/^\n+//; # beginning lines
		1550	s/\n+$//; # ending lines
		1551
1382	$_	1552	$_
1383	}	1553	}
1384		1554
		1555	sub hintmode {
		1556	$_[0]{hintmode} = $_[1] if @_ > 1;
		1557	$_[0]{hintmode}
		1558	}
		1559
1385	=item $player->ext_reply ($msgid, %msg)	1560	=item $player->ext_reply ($msgid, @msg)
1386		1561
1387	Sends an ext reply to the player.	1562	Sends an ext reply to the player.
1388		1563
1389	=cut	1564	=cut
1390		1565
1391	sub ext_reply($$%) {	1566	sub ext_reply($$@) {
1392	my ($self, $id, %msg) = @_;	1567	my ($self, $id, @msg) = @_;
1393		1568
1394	$msg{msgid} = $id;	1569	$self->ns->ext_reply ($id, @msg)
1395
1396	$self->send ("ext " . cf::to_json \%msg);
1397	}	1570	}
1398		1571
1399	=item $player->ext_event ($type, %msg)	1572	=item $player->ext_msg ($type, @msg)
1400		1573
1401	Sends an ext event to the client.	1574	Sends an ext event to the client.
1402		1575
1403	=cut	1576	=cut
1404		1577
1405	sub ext_event($$%) {	1578	sub ext_msg($$@) {
1406	my ($self, $type, %msg) = @_;	1579	my ($self, $type, @msg) = @_;
1407		1580
1408	$self->ns->ext_event ($type, %msg);	1581	$self->ns->ext_msg ($type, @msg);
1409	}	1582	}
1410		1583
1411	=head3 cf::region	1584	=head3 cf::region
1412		1585
1413	=over 4	1586	=over 4
…		…
1426	my ($path) = @_;	1599	my ($path) = @_;
1427		1600
1428	my ($match, $specificity);	1601	my ($match, $specificity);
1429		1602
1430	for my $region (list) {	1603	for my $region (list) {
1431	if ($region->match && $path =~ $region->match) {	1604	if ($region->{match} && $path =~ $region->{match}) {
1432	($match, $specificity) = ($region, $region->specificity)	1605	($match, $specificity) = ($region, $region->specificity)
1433	if $region->specificity > $specificity;	1606	if $region->specificity > $specificity;
1434	}	1607	}
1435	}	1608	}
1436		1609
…		…
1556	$self->init; # pass $1 etc.	1729	$self->init; # pass $1 etc.
1557	return $self;	1730	return $self;
1558	}	1731	}
1559	}	1732	}
1560		1733
1561	Carp::carp "unable to resolve path '$path' (base '$base').";	1734	Carp::cluck "unable to resolve path '$path' (base '$base').";
1562	()	1735	()
1563	}	1736	}
1564		1737
1565	sub init {	1738	sub init {
1566	my ($self) = @_;	1739	my ($self) = @_;
…		…
1629		1802
1630	sub load_header_from($) {	1803	sub load_header_from($) {
1631	my ($self, $path) = @_;	1804	my ($self, $path) = @_;
1632		1805
1633	utf8::encode $path;	1806	utf8::encode $path;
1634	#aio_open $path, O_RDONLY, 0	1807	my $f = new_from_file cf::object::thawer $path
1635	# or return;
1636
1637	$self->_load_header ($path)
1638	or return;	1808	or return;
		1809
		1810	$self->_load_header ($f)
		1811	or return;
		1812
		1813	local $MAP_LOADING{$self->{path}} = $self;
		1814	$f->resolve_delayed_derefs;
1639		1815
1640	$self->{load_path} = $path;	1816	$self->{load_path} = $path;
1641		1817
1642	1	1818	1
1643	}	1819	}
…		…
1697	sub find {	1873	sub find {
1698	my ($path, $origin) = @_;	1874	my ($path, $origin) = @_;
1699		1875
1700	$path = normalise $path, $origin && $origin->path;	1876	$path = normalise $path, $origin && $origin->path;
1701		1877
		1878	cf::lock_wait "map_data:$path";#d#remove
1702	cf::lock_wait "map_find:$path";	1879	cf::lock_wait "map_find:$path";
1703		1880
1704	$cf::MAP{$path} || do {	1881	$cf::MAP{$path} || do {
1705	my $guard = cf::lock_acquire "map_find:$path";	1882	my $guard1 = cf::lock_acquire "map_find:$path";
		1883	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1884
1706	my $map = new_from_path cf::map $path	1885	my $map = new_from_path cf::map $path
1707	or return;	1886	or return;
1708		1887
1709	$map->{last_save} = $cf::RUNTIME;	1888	$map->{last_save} = $cf::RUNTIME;
1710		1889
…		…
1712	or return;	1891	or return;
1713		1892
1714	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1893	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1715	# doing this can freeze the server in a sync job, obviously	1894	# doing this can freeze the server in a sync job, obviously
1716	#$cf::WAIT_FOR_TICK->wait;	1895	#$cf::WAIT_FOR_TICK->wait;
		1896	undef $guard1;
		1897	undef $guard2;
1717	$map->reset;	1898	$map->reset;
1718	undef $guard;
1719	return find $path;	1899	return find $path;
1720	}	1900	}
1721		1901
1722	$cf::MAP{$path} = $map	1902	$cf::MAP{$path} = $map
1723	}	1903	}
…		…
1732	local $self->{deny_reset} = 1; # loading can take a long time	1912	local $self->{deny_reset} = 1; # loading can take a long time
1733		1913
1734	my $path = $self->{path};	1914	my $path = $self->{path};
1735		1915
1736	{	1916	{
1737	my $guard = cf::lock_acquire "map_load:$path";	1917	my $guard = cf::lock_acquire "map_data:$path";
1738		1918
		1919	return unless $self->valid;
1739	return if $self->in_memory != cf::MAP_SWAPPED;	1920	return unless $self->in_memory == cf::MAP_SWAPPED;
1740		1921
1741	$self->in_memory (cf::MAP_LOADING);	1922	$self->in_memory (cf::MAP_LOADING);
1742		1923
1743	$self->alloc;	1924	$self->alloc;
1744		1925
1745	$self->pre_load;	1926	$self->pre_load;
1746	Coro::cede;	1927	cf::cede_to_tick;
1747		1928
		1929	my $f = new_from_file cf::object::thawer $self->{load_path};
		1930	$f->skip_block;
1748	$self->_load_objects ($self->{load_path}, 1)	1931	$self->_load_objects ($f)
1749	or return;	1932	or return;
1750		1933
1751	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1934	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1752	if delete $self->{load_original};	1935	if delete $self->{load_original};
1753		1936
1754	if (my $uniq = $self->uniq_path) {	1937	if (my $uniq = $self->uniq_path) {
1755	utf8::encode $uniq;	1938	utf8::encode $uniq;
1756	if (aio_open $uniq, O_RDONLY, 0) {	1939	unless (aio_stat $uniq) {
		1940	if (my $f = new_from_file cf::object::thawer $uniq) {
1757	$self->clear_unique_items;	1941	$self->clear_unique_items;
1758	$self->_load_objects ($uniq, 0);	1942	$self->_load_objects ($f);
		1943	$f->resolve_delayed_derefs;
		1944	}
1759	}	1945	}
1760	}	1946	}
1761		1947
1762	Coro::cede;	1948	$f->resolve_delayed_derefs;
		1949
		1950	cf::cede_to_tick;
1763	# now do the right thing for maps	1951	# now do the right thing for maps
1764	$self->link_multipart_objects;	1952	$self->link_multipart_objects;
1765	$self->difficulty ($self->estimate_difficulty)	1953	$self->difficulty ($self->estimate_difficulty)
1766	unless $self->difficulty;	1954	unless $self->difficulty;
1767	Coro::cede;	1955	cf::cede_to_tick;
1768		1956
1769	unless ($self->{deny_activate}) {	1957	unless ($self->{deny_activate}) {
1770	$self->decay_objects;	1958	$self->decay_objects;
1771	$self->fix_auto_apply;	1959	$self->fix_auto_apply;
1772	$self->update_buttons;	1960	$self->update_buttons;
1773	Coro::cede;	1961	cf::cede_to_tick;
1774	$self->set_darkness_map;	1962	$self->set_darkness_map;
1775	Coro::cede;	1963	cf::cede_to_tick;
1776	$self->activate;	1964	$self->activate;
1777	}	1965	}
		1966
		1967	$self->{last_save} = $cf::RUNTIME;
		1968	$self->last_access ($cf::RUNTIME);
1778		1969
1779	$self->in_memory (cf::MAP_IN_MEMORY);	1970	$self->in_memory (cf::MAP_IN_MEMORY);
1780	}	1971	}
1781		1972
1782	$self->post_load;	1973	$self->post_load;
…		…
1793		1984
1794	$self	1985	$self
1795	}	1986	}
1796		1987
1797	# find and load all maps in the 3x3 area around a map	1988	# find and load all maps in the 3x3 area around a map
1798	sub load_diag {	1989	sub load_neighbours {
1799	my ($map) = @_;	1990	my ($map) = @_;
1800		1991
1801	my @diag; # diagonal neighbours	1992	my @neigh; # diagonal neighbours
1802		1993
1803	for (0 .. 3) {	1994	for (0 .. 3) {
1804	my $neigh = $map->tile_path ($_)	1995	my $neigh = $map->tile_path ($_)
1805	or next;	1996	or next;
1806	$neigh = find $neigh, $map	1997	$neigh = find $neigh, $map
1807	or next;	1998	or next;
1808	$neigh->load;	1999	$neigh->load;
1809		2000
		2001	push @neigh,
1810	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2002	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1811	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2003	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1812	}	2004	}
1813		2005
1814	for (@diag) {	2006	for (grep defined $_->[0], @neigh) {
		2007	my ($path, $origin) = @$_;
1815	my $neigh = find @$_	2008	my $neigh = find $path, $origin
1816	or next;	2009	or next;
1817	$neigh->load;	2010	$neigh->load;
1818	}	2011	}
1819	}	2012	}
1820		2013
…		…
1825	}	2018	}
1826		2019
1827	sub do_load_sync {	2020	sub do_load_sync {
1828	my ($map) = @_;	2021	my ($map) = @_;
1829		2022
		2023	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2024	if $Coro::current == $Coro::main;
		2025
1830	cf::sync_job { $map->load };	2026	cf::sync_job { $map->load };
1831	}	2027	}
1832		2028
1833	our %MAP_PREFETCH;	2029	our %MAP_PREFETCH;
1834	our $MAP_PREFETCHER = undef;	2030	our $MAP_PREFETCHER = undef;
1835		2031
1836	sub find_async {	2032	sub find_async {
1837	my ($path, $origin) = @_;	2033	my ($path, $origin, $load) = @_;
1838		2034
1839	$path = normalise $path, $origin && $origin->{path};	2035	$path = normalise $path, $origin && $origin->{path};
1840		2036
1841	if (my $map = $cf::MAP{$path}) {	2037	if (my $map = $cf::MAP{$path}) {
1842	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2038	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1843	}	2039	}
1844		2040
1845	undef $MAP_PREFETCH{$path};	2041	$MAP_PREFETCH{$path} |= $load;
		2042
1846	$MAP_PREFETCHER ||= cf::async {	2043	$MAP_PREFETCHER ||= cf::async {
		2044	$Coro::current->{desc} = "map prefetcher";
		2045
1847	while (%MAP_PREFETCH) {	2046	while (%MAP_PREFETCH) {
1848	for my $path (keys %MAP_PREFETCH) {	2047	while (my ($k, $v) = each %MAP_PREFETCH) {
1849	my $map = find $path	2048	if (my $map = find $k) {
1850	or next;
1851	$map->load;	2049	$map->load if $v;
		2050	}
1852		2051
1853	delete $MAP_PREFETCH{$path};	2052	delete $MAP_PREFETCH{$k};
1854	}	2053	}
1855	}	2054	}
1856	undef $MAP_PREFETCHER;	2055	undef $MAP_PREFETCHER;
1857	};	2056	};
1858	$MAP_PREFETCHER->prio (6);	2057	$MAP_PREFETCHER->prio (6);
…		…
1861	}	2060	}
1862		2061
1863	sub save {	2062	sub save {
1864	my ($self) = @_;	2063	my ($self) = @_;
1865		2064
1866	my $lock = cf::lock_acquire "map_data:" . $self->path;	2065	my $lock = cf::lock_acquire "map_data:$self->{path}";
1867		2066
1868	$self->{last_save} = $cf::RUNTIME;	2067	$self->{last_save} = $cf::RUNTIME;
1869		2068
1870	return unless $self->dirty;	2069	return unless $self->dirty;
1871		2070
…		…
1877	return if $self->{deny_save};	2076	return if $self->{deny_save};
1878		2077
1879	local $self->{last_access} = $self->last_access;#d#	2078	local $self->{last_access} = $self->last_access;#d#
1880		2079
1881	cf::async {	2080	cf::async {
		2081	$Coro::current->{desc} = "map player save";
1882	$_->contr->save for $self->players;	2082	$_->contr->save for $self->players;
1883	};	2083	};
1884		2084
1885	if ($uniq) {	2085	if ($uniq) {
1886	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2086	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
…		…
1894	my ($self) = @_;	2094	my ($self) = @_;
1895		2095
1896	# save first because save cedes	2096	# save first because save cedes
1897	$self->save;	2097	$self->save;
1898		2098
1899	my $lock = cf::lock_acquire "map_data:" . $self->path;	2099	my $lock = cf::lock_acquire "map_data:$self->{path}";
1900		2100
1901	return if $self->players;	2101	return if $self->players;
1902	return if $self->in_memory != cf::MAP_IN_MEMORY;	2102	return if $self->in_memory != cf::MAP_IN_MEMORY;
1903	return if $self->{deny_save};	2103	return if $self->{deny_save};
1904		2104
		2105	$self->in_memory (cf::MAP_SWAPPED);
		2106
		2107	$self->deactivate;
		2108	$_->clear_links_to ($self) for values %cf::MAP;
1905	$self->clear;	2109	$self->clear;
1906	$self->in_memory (cf::MAP_SWAPPED);
1907	}	2110	}
1908		2111
1909	sub reset_at {	2112	sub reset_at {
1910	my ($self) = @_;	2113	my ($self) = @_;
1911		2114
…		…
1943	if $uniq;	2146	if $uniq;
1944	}	2147	}
1945		2148
1946	delete $cf::MAP{$self->path};	2149	delete $cf::MAP{$self->path};
1947		2150
		2151	$self->deactivate;
		2152	$_->clear_links_to ($self) for values %cf::MAP;
1948	$self->clear;	2153	$self->clear;
1949
1950	$_->clear_links_to ($self) for values %cf::MAP;
1951		2154
1952	$self->unlink_save;	2155	$self->unlink_save;
1953	$self->destroy;	2156	$self->destroy;
1954	}	2157	}
1955		2158
1956	my $nuke_counter = "aaaa";	2159	my $nuke_counter = "aaaa";
1957		2160
1958	sub nuke {	2161	sub nuke {
1959	my ($self) = @_;	2162	my ($self) = @_;
1960		2163
		2164	{
		2165	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2166
1961	delete $cf::MAP{$self->path};	2167	delete $cf::MAP{$self->path};
1962		2168
1963	$self->unlink_save;	2169	$self->unlink_save;
1964		2170
1965	bless $self, "cf::map";	2171	bless $self, "cf::map";
1966	delete $self->{deny_reset};	2172	delete $self->{deny_reset};
1967	$self->{deny_save} = 1;	2173	$self->{deny_save} = 1;
1968	$self->reset_timeout (1);	2174	$self->reset_timeout (1);
1969	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2175	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1970		2176
1971	$cf::MAP{$self->path} = $self;	2177	$cf::MAP{$self->path} = $self;
		2178	}
1972		2179
1973	$self->reset; # polite request, might not happen	2180	$self->reset; # polite request, might not happen
1974	}	2181	}
1975		2182
1976	=item $maps = cf::map::tmp_maps	2183	=item $maps = cf::map::tmp_maps
…		…
2052		2259
2053	sub inv_recursive {	2260	sub inv_recursive {
2054	inv_recursive_ inv $_[0]	2261	inv_recursive_ inv $_[0]
2055	}	2262	}
2056		2263
		2264	=item $ref = $ob->ref
		2265
		2266	creates and returns a persistent reference to an objetc that can be stored as a string.
		2267
		2268	=item $ob = cf::object::deref ($refstring)
		2269
		2270	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2271	even if the object actually exists. May block.
		2272
		2273	=cut
		2274
		2275	sub deref {
		2276	my ($ref) = @_;
		2277
		2278	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2279	my ($uuid, $name) = ($1, $2);
		2280	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2281	or return;
		2282	$pl->ob->uuid eq $uuid
		2283	or return;
		2284
		2285	$pl->ob
		2286	} else {
		2287	warn "$ref: cannot resolve object reference\n";
		2288	undef
		2289	}
		2290	}
		2291
2057	package cf;	2292	package cf;
2058		2293
2059	=back	2294	=back
2060		2295
2061	=head3 cf::object::player	2296	=head3 cf::object::player
…		…
2083		2318
2084	} else {	2319	} else {
2085	my $pl = $self->contr;	2320	my $pl = $self->contr;
2086		2321
2087	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2322	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2088	my $diag = $pl->{npc_dialog};	2323	my $dialog = $pl->{npc_dialog};
2089	$diag->{pl}->ext_reply (	2324	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2090	$diag->{id},
2091	msgtype => "reply",
2092	msg => $diag->{pl}->expand_cfpod ($msg),
2093	add_topics => []
2094	);
2095		2325
2096	} else {	2326	} else {
2097	$msg = $npc->name . " says: $msg" if $npc;	2327	$msg = $npc->name . " says: $msg" if $npc;
2098	$self->message ($msg, $flags);	2328	$self->message ($msg, $flags);
2099	}	2329	}
2100	}	2330	}
		2331	}
		2332
		2333	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2334
		2335	=cut
		2336
		2337	sub cf::object::send_msg {
		2338	my $pl = shift->contr
		2339	or return;
		2340	$pl->send_msg (@_);
2101	}	2341	}
2102		2342
2103	=item $player_object->may ("access")	2343	=item $player_object->may ("access")
2104		2344
2105	Returns wether the given player is authorized to access resource "access"	2345	Returns wether the given player is authorized to access resource "access"
…		…
2184	# use -1 or undef as default coordinates, not 0, 0	2424	# use -1 or undef as default coordinates, not 0, 0
2185	($x, $y) = ($map->enter_x, $map->enter_y)	2425	($x, $y) = ($map->enter_x, $map->enter_y)
2186	if $x <=0 && $y <= 0;	2426	if $x <=0 && $y <= 0;
2187		2427
2188	$map->load;	2428	$map->load;
2189	$map->load_diag;	2429	$map->load_neighbours;
2190		2430
2191	return unless $self->contr->active;	2431	return unless $self->contr->active;
2192	$self->activate_recursive;	2432	$self->activate_recursive;
2193		2433
2194	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2434	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2195	$self->enter_map ($map, $x, $y);	2435	$self->enter_map ($map, $x, $y);
2196	}	2436	}
2197		2437
2198	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2438	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2199		2439
2200	Moves the player to the given map-path and coordinates by first freezing	2440	Moves the player to the given map-path and coordinates by first freezing
2201	her, loading and preparing them map, calling the provided $check callback	2441	her, loading and preparing them map, calling the provided $check callback
2202	that has to return the map if sucecssful, and then unfreezes the player on	2442	that has to return the map if sucecssful, and then unfreezes the player on
2203	the new (success) or old (failed) map position.	2443	the new (success) or old (failed) map position. In either case, $done will
		2444	be called at the end of this process.
2204		2445
2205	=cut	2446	=cut
2206		2447
2207	our $GOTOGEN;	2448	our $GOTOGEN;
2208		2449
2209	sub cf::object::player::goto {	2450	sub cf::object::player::goto {
2210	my ($self, $path, $x, $y, $check) = @_;	2451	my ($self, $path, $x, $y, $check, $done) = @_;
2211		2452
2212	# do generation counting so two concurrent goto's will be executed in-order	2453	# do generation counting so two concurrent goto's will be executed in-order
2213	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2454	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2214		2455
2215	$self->enter_link;	2456	$self->enter_link;
2216		2457
2217	(async {	2458	(async {
		2459	$Coro::current->{desc} = "player::goto $path $x $y";
		2460
		2461	# *tag paths override both path and x|y
		2462	if ($path =~ /^\*(.*)$/) {
		2463	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2464	my $ob = $obs[rand @obs];
		2465
		2466	# see if we actually can go there
		2467	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2468	$ob = $obs[rand @obs];
		2469	} else {
		2470	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2471	}
		2472	# else put us there anyways for now #d#
		2473
		2474	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2475	} else {
		2476	($path, $x, $y) = (undef, undef, undef);
		2477	}
		2478	}
		2479
2218	my $map = eval {	2480	my $map = eval {
2219	my $map = cf::map::find $path;	2481	my $map = defined $path ? cf::map::find $path : undef;
2220		2482
2221	if ($map) {	2483	if ($map) {
2222	$map = $map->customise_for ($self);	2484	$map = $map->customise_for ($self);
2223	$map = $check->($map) if $check && $map;	2485	$map = $check->($map) if $check && $map;
2224	} else {	2486	} else {
2225	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2487	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2226	}	2488	}
2227		2489
2228	$map	2490	$map
2229	};	2491	};
2230		2492
…		…
2235		2497
2236	if ($gen == $self->{_goto_generation}) {	2498	if ($gen == $self->{_goto_generation}) {
2237	delete $self->{_goto_generation};	2499	delete $self->{_goto_generation};
2238	$self->leave_link ($map, $x, $y);	2500	$self->leave_link ($map, $x, $y);
2239	}	2501	}
		2502
		2503	$done->() if $done;
2240	})->prio (1);	2504	})->prio (1);
2241	}	2505	}
2242		2506
2243	=item $player_object->enter_exit ($exit_object)	2507	=item $player_object->enter_exit ($exit_object)
2244		2508
…		…
2313	my $hp = $exit->stats->hp;	2577	my $hp = $exit->stats->hp;
2314	my $sp = $exit->stats->sp;	2578	my $sp = $exit->stats->sp;
2315		2579
2316	$self->enter_link;	2580	$self->enter_link;
2317		2581
		2582	# if exit is damned, update players death & WoR home-position
		2583	$self->contr->savebed ($slaying, $hp, $sp)
		2584	if $exit->flag (FLAG_DAMNED);
		2585
2318	(async {	2586	(async {
		2587	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2588
2319	$self->deactivate_recursive; # just to be sure	2589	$self->deactivate_recursive; # just to be sure
2320	unless (eval {	2590	unless (eval {
2321	$self->goto ($slaying, $hp, $sp);	2591	$self->goto ($slaying, $hp, $sp);
2322		2592
2323	1;	2593	1;
…		…
2349		2619
2350	utf8::encode $text;	2620	utf8::encode $text;
2351	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2621	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2352	}	2622	}
2353		2623
2354	=item $client->send_msg ($color, $type, $msg, [extra...])	2624	=item $client->send_msg ($channel, $msg, $color, [extra...])
2355		2625
2356	Send a drawinfo or msg packet to the client, formatting the msg for the	2626	Send a drawinfo or msg packet to the client, formatting the msg for the
2357	client if neccessary. C<$type> should be a string identifying the type of	2627	client if neccessary. C<$type> should be a string identifying the type of
2358	the message, with C<log> being the default. If C<$color> is negative, suppress	2628	the message, with C<log> being the default. If C<$color> is negative, suppress
2359	the message unless the client supports the msg packet.	2629	the message unless the client supports the msg packet.
2360		2630
2361	=cut	2631	=cut
2362		2632
		2633	our %CHANNEL = (
		2634	"c/identify" => {
		2635	id => "infobox",
		2636	title => "Identify",
		2637	reply => undef,
		2638	tooltip => "Items recently identified",
		2639	},
		2640	"c/examine" => {
		2641	id => "infobox",
		2642	title => "Examine",
		2643	reply => undef,
		2644	tooltip => "Signs and other items you examined",
		2645	},
		2646	"c/lookat" => {
		2647	id => "infobox",
		2648	title => "Look",
		2649	reply => undef,
		2650	tooltip => "What you saw there",
		2651	},
		2652	);
		2653
2363	sub cf::client::send_msg {	2654	sub cf::client::send_msg {
2364	my ($self, $color, $type, $msg, @extra) = @_;	2655	my ($self, $channel, $msg, $color, @extra) = @_;
2365		2656
2366	$msg = $self->pl->expand_cfpod ($msg);	2657	$msg = $self->pl->expand_cfpod ($msg);
2367		2658
		2659	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2660
		2661	# check predefined channels, for the benefit of C
		2662	if ($CHANNEL{$channel}) {
		2663	$channel = $CHANNEL{$channel};
		2664
		2665	$self->ext_msg (channel_info => $channel)
		2666	if $self->can_msg;
		2667
		2668	$channel = $channel->{id};
		2669
		2670	} elsif (ref $channel) {
		2671	# send meta info to client, if not yet sent
		2672	unless (exists $self->{channel}{$channel->{id}}) {
		2673	$self->{channel}{$channel->{id}} = $channel;
		2674	$self->ext_msg (channel_info => $channel)
		2675	if $self->can_msg;
		2676	}
		2677
		2678	$channel = $channel->{id};
		2679	}
		2680
		2681	return unless @extra || length $msg;
		2682
2368	if ($self->can_msg) {	2683	if ($self->can_msg) {
2369	$self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);	2684	# default colour, mask it out
		2685	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2686	if $color & cf::NDI_DEF;
		2687
		2688	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2689	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2370	} else {	2690	} else {
2371	# replace some tags by gcfclient-compatible ones
2372	for ($msg) {
2373	1 while
2374	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2379	}
2380
2381	if ($color >= 0) {	2691	if ($color >= 0) {
		2692	# replace some tags by gcfclient-compatible ones
		2693	for ($msg) {
		2694	1 while
		2695	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2696	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2697	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2698	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2699	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2700	}
		2701
		2702	$color &= cf::NDI_COLOR_MASK;
		2703
		2704	utf8::encode $msg;
		2705
2382	if (0 && $msg =~ /\[/) {	2706	if (0 && $msg =~ /\[/) {
		2707	# COMMAND/INFO
2383	$self->send_packet ("drawextinfo $color 4 0 $msg")	2708	$self->send_packet ("drawextinfo $color 10 8 $msg")
2384	} else {	2709	} else {
2385	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;	2710	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2386	$self->send_packet ("drawinfo $color $msg")	2711	$self->send_packet ("drawinfo $color $msg")
2387	}	2712	}
2388	}	2713	}
2389	}	2714	}
2390	}	2715	}
2391		2716
2392	=item $client->ext_event ($type, %msg)	2717	=item $client->ext_msg ($type, @msg)
2393		2718
2394	Sends an exti event to the client.	2719	Sends an ext event to the client.
2395		2720
2396	=cut	2721	=cut
2397		2722
2398	sub cf::client::ext_event($$%) {	2723	sub cf::client::ext_msg($$@) {
2399	my ($self, $type, %msg) = @_;	2724	my ($self, $type, @msg) = @_;
2400		2725
		2726	if ($self->extcmd == 2) {
		2727	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2728	} elsif ($self->extcmd == 1) { # TODO: remove
2401	$msg{msgtype} = "event_$type";	2729	push @msg, msgtype => "event_$type";
2402	$self->send_packet ("ext " . cf::to_json \%msg);	2730	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2731	}
		2732	}
		2733
		2734	=item $client->ext_reply ($msgid, @msg)
		2735
		2736	Sends an ext reply to the client.
		2737
		2738	=cut
		2739
		2740	sub cf::client::ext_reply($$@) {
		2741	my ($self, $id, @msg) = @_;
		2742
		2743	if ($self->extcmd == 2) {
		2744	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2745	} elsif ($self->extcmd == 1) {
		2746	#TODO: version 1, remove
		2747	unshift @msg, msgtype => "reply", msgid => $id;
		2748	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2749	}
2403	}	2750	}
2404		2751
2405	=item $success = $client->query ($flags, "text", \&cb)	2752	=item $success = $client->query ($flags, "text", \&cb)
2406		2753
2407	Queues a query to the client, calling the given callback with	2754	Queues a query to the client, calling the given callback with
2408	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2755	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2409	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.	2756	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2410		2757
2411	Queries can fail, so check the return code. Or don't, as queries will become	2758	Queries can fail, so check the return code. Or don't, as queries will
2412	reliable at some point in the future.	2759	become reliable at some point in the future.
2413		2760
2414	=cut	2761	=cut
2415		2762
2416	sub cf::client::query {	2763	sub cf::client::query {
2417	my ($self, $flags, $text, $cb) = @_;	2764	my ($self, $flags, $text, $cb) = @_;
…		…
2425	utf8::encode $text;	2772	utf8::encode $text;
2426	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];	2773	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2427		2774
2428	$self->send_packet ($self->{query_queue}[0][0])	2775	$self->send_packet ($self->{query_queue}[0][0])
2429	if @{ $self->{query_queue} } == 1;	2776	if @{ $self->{query_queue} } == 1;
		2777
		2778	1
2430	}	2779	}
2431		2780
2432	cf::client->attach (	2781	cf::client->attach (
		2782	on_connect => sub {
		2783	my ($ns) = @_;
		2784
		2785	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2786	},
2433	on_reply => sub {	2787	on_reply => sub {
2434	my ($ns, $msg) = @_;	2788	my ($ns, $msg) = @_;
2435		2789
2436	# this weird shuffling is so that direct followup queries	2790	# this weird shuffling is so that direct followup queries
2437	# get handled first	2791	# get handled first
…		…
2449	} else {	2803	} else {
2450	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;	2804	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2451	}	2805	}
2452	}	2806	}
2453	},	2807	},
		2808	on_exticmd => sub {
		2809	my ($ns, $buf) = @_;
		2810
		2811	my $msg = eval { $ns->{json_coder}->decode ($buf) };
		2812
		2813	if (ref $msg) {
		2814	my ($type, $reply, @payload) =
		2815	"ARRAY" eq ref $msg
		2816	? @$msg
		2817	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2818
		2819	my @reply;
		2820
		2821	if (my $cb = $EXTICMD{$type}) {
		2822	@reply = $cb->($ns, @payload);
		2823	}
		2824
		2825	$ns->ext_reply ($reply, @reply)
		2826	if $reply;
		2827
		2828	} else {
		2829	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
		2830	}
		2831
		2832	cf::override;
		2833	},
2454	);	2834	);
2455		2835
2456	=item $client->async (\&cb)	2836	=item $client->async (\&cb)
2457		2837
2458	Create a new coroutine, running the specified callback. The coroutine will	2838	Create a new coroutine, running the specified callback. The coroutine will
…		…
2499	our $safe = new Safe "safe";	2879	our $safe = new Safe "safe";
2500	our $safe_hole = new Safe::Hole;	2880	our $safe_hole = new Safe::Hole;
2501		2881
2502	$SIG{FPE} = 'IGNORE';	2882	$SIG{FPE} = 'IGNORE';
2503		2883
2504	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2884	$safe->permit_only (Opcode::opset qw(
		2885	:base_core :base_mem :base_orig :base_math
		2886	grepstart grepwhile mapstart mapwhile
		2887	sort time
		2888	));
2505		2889
2506	# here we export the classes and methods available to script code	2890	# here we export the classes and methods available to script code
2507		2891
2508	=pod	2892	=pod
2509		2893
2510	The following functions and methods are available within a safe environment:	2894	The following functions and methods are available within a safe environment:
2511		2895
2512	cf::object contr pay_amount pay_player map	2896	cf::object
		2897	contr pay_amount pay_player map x y force_find force_add
		2898	insert remove name archname title slaying race decrease_ob_nr
		2899
2513	cf::object::player player	2900	cf::object::player
2514	cf::player peaceful	2901	player
2515	cf::map trigger	2902
		2903	cf::player
		2904	peaceful
		2905
		2906	cf::map
		2907	trigger
2516		2908
2517	=cut	2909	=cut
2518		2910
2519	for (	2911	for (
2520	["cf::object" => qw(contr pay_amount pay_player map)],	2912	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2913	insert remove inv name archname title slaying race
		2914	decrease_ob_nr)],
2521	["cf::object::player" => qw(player)],	2915	["cf::object::player" => qw(player)],
2522	["cf::player" => qw(peaceful)],	2916	["cf::player" => qw(peaceful)],
2523	["cf::map" => qw(trigger)],	2917	["cf::map" => qw(trigger)],
2524	) {	2918	) {
2525	no strict 'refs';	2919	no strict 'refs';
…		…
2601	# the server's init and main functions	2995	# the server's init and main functions
2602		2996
2603	sub load_facedata($) {	2997	sub load_facedata($) {
2604	my ($path) = @_;	2998	my ($path) = @_;
2605		2999
		3000	# HACK to clear player env face cache, we need some signal framework
		3001	# for this (global event?)
		3002	%ext::player_env::MUSIC_FACE_CACHE = ();
		3003
		3004	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3005
2606	warn "loading facedata from $path\n";	3006	warn "loading facedata from $path\n";
2607		3007
2608	my $facedata;	3008	my $facedata;
2609	0 < aio_load $path, $facedata	3009	0 < aio_load $path, $facedata
2610	or die "$path: $!";	3010	or die "$path: $!";
…		…
2612	$facedata = Coro::Storable::thaw $facedata;	3012	$facedata = Coro::Storable::thaw $facedata;
2613		3013
2614	$facedata->{version} == 2	3014	$facedata->{version} == 2
2615	or cf::cleanup "$path: version mismatch, cannot proceed.";	3015	or cf::cleanup "$path: version mismatch, cannot proceed.";
2616		3016
		3017	# patch in the exptable
		3018	$facedata->{resource}{"res/exp_table"} = {
		3019	type => FT_RSRC,
		3020	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3021	};
		3022	cf::cede_to_tick;
		3023
2617	{	3024	{
2618	my $faces = $facedata->{faceinfo};	3025	my $faces = $facedata->{faceinfo};
2619		3026
2620	while (my ($face, $info) = each %$faces) {	3027	while (my ($face, $info) = each %$faces) {
2621	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3028	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2622	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3029	cf::face::set_visibility $idx, $info->{visibility};
		3030	cf::face::set_magicmap $idx, $info->{magicmap};
2623	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3031	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2624	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3032	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2625	Coro::cede;	3033
		3034	cf::cede_to_tick;
2626	}	3035	}
2627		3036
2628	while (my ($face, $info) = each %$faces) {	3037	while (my ($face, $info) = each %$faces) {
2629	next unless $info->{smooth};	3038	next unless $info->{smooth};
2630	my $idx = cf::face::find $face	3039	my $idx = cf::face::find $face
2631	or next;	3040	or next;
2632	if (my $smooth = cf::face::find $info->{smooth}) {	3041	if (my $smooth = cf::face::find $info->{smooth}) {
		3042	cf::face::set_smooth $idx, $smooth;
2633	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3043	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2634	} else {	3044	} else {
2635	warn "smooth face '$info->{smooth}' not found for face '$face'";	3045	warn "smooth face '$info->{smooth}' not found for face '$face'";
2636	}	3046	}
2637	Coro::cede;	3047
		3048	cf::cede_to_tick;
2638	}	3049	}
2639	}	3050	}
2640		3051
2641	{	3052	{
2642	my $anims = $facedata->{animinfo};	3053	my $anims = $facedata->{animinfo};
2643		3054
2644	while (my ($anim, $info) = each %$anims) {	3055	while (my ($anim, $info) = each %$anims) {
2645	cf::anim::set $anim, $info->{frames}, $info->{facings};	3056	cf::anim::set $anim, $info->{frames}, $info->{facings};
2646	Coro::cede;	3057	cf::cede_to_tick;
2647	}	3058	}
2648		3059
2649	cf::anim::invalidate_all; # d'oh	3060	cf::anim::invalidate_all; # d'oh
2650	}	3061	}
2651		3062
		3063	{
		3064	# TODO: for gcfclient pleasure, we should give resources
		3065	# that gcfclient doesn't grok a >10000 face index.
		3066	my $res = $facedata->{resource};
		3067
		3068	my $soundconf = delete $res->{"res/sound.conf"};
		3069
		3070	while (my ($name, $info) = each %$res) {
		3071	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3072	my $data;
		3073
		3074	if ($info->{type} & 1) {
		3075	# prepend meta info
		3076
		3077	my $meta = $enc->encode ({
		3078	name => $name,
		3079	%{ $info->{meta} || {} },
		3080	});
		3081
		3082	$data = pack "(w/a*)*", $meta, $info->{data};
		3083	} else {
		3084	$data = $info->{data};
		3085	}
		3086
		3087	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3088	cf::face::set_type $idx, $info->{type};
		3089
		3090	cf::cede_to_tick;
		3091	}
		3092
		3093	if ($soundconf) {
		3094	$soundconf = $enc->decode (delete $soundconf->{data});
		3095
		3096	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3097	my $sound = $soundconf->{compat}[$_]
		3098	or next;
		3099
		3100	my $face = cf::face::find "sound/$sound->[1]";
		3101	cf::sound::set $sound->[0] => $face;
		3102	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3103	}
		3104
		3105	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3106	my $face = cf::face::find "sound/$v";
		3107	cf::sound::set $k => $face;
		3108	}
		3109	}
		3110	}
		3111
2652	1	3112	1
2653	}	3113	}
2654		3114
		3115	register_exticmd fx_want => sub {
		3116	my ($ns, $want) = @_;
		3117
		3118	while (my ($k, $v) = each %$want) {
		3119	$ns->fx_want ($k, $v);
		3120	}
		3121	};
		3122
2655	sub reload_regions {	3123	sub reload_regions {
		3124	# HACK to clear player env face cache, we need some signal framework
		3125	# for this (global event?)
		3126	%ext::player_env::MUSIC_FACE_CACHE = ();
		3127
2656	load_resource_file "$MAPDIR/regions"	3128	load_resource_file "$MAPDIR/regions"
2657	or die "unable to load regions file\n";	3129	or die "unable to load regions file\n";
		3130
		3131	for (cf::region::list) {
		3132	$_->{match} = qr/$_->{match}/
		3133	if exists $_->{match};
		3134	}
2658	}	3135	}
2659		3136
2660	sub reload_facedata {	3137	sub reload_facedata {
2661	load_facedata "$DATADIR/facedata"	3138	load_facedata "$DATADIR/facedata"
2662	or die "unable to load facedata\n";	3139	or die "unable to load facedata\n";
2663	}	3140	}
2664		3141
2665	sub reload_archetypes {	3142	sub reload_archetypes {
		3143	load_resource_file "$DATADIR/archetypes"
		3144	or die "unable to load archetypes\n";
		3145	#d# NEED to laod twice to resolve forward references
		3146	# this really needs to be done in an extra post-pass
		3147	# (which needs to be synchronous, so solve it differently)
2666	load_resource_file "$DATADIR/archetypes"	3148	load_resource_file "$DATADIR/archetypes"
2667	or die "unable to load archetypes\n";	3149	or die "unable to load archetypes\n";
2668	}	3150	}
2669		3151
2670	sub reload_treasures {	3152	sub reload_treasures {
…		…
2686		3168
2687	sub init {	3169	sub init {
2688	reload_resources;	3170	reload_resources;
2689	}	3171	}
2690		3172
2691	sub cfg_load {	3173	sub reload_config {
2692	open my $fh, "<:utf8", "$CONFDIR/config"	3174	open my $fh, "<:utf8", "$CONFDIR/config"
2693	or return;	3175	or return;
2694		3176
2695	local $/;	3177	local $/;
2696	*CFG = YAML::Syck::Load <$fh>;	3178	*CFG = YAML::Syck::Load <$fh>;
…		…
2712	sub main {	3194	sub main {
2713	# we must not ever block the main coroutine	3195	# we must not ever block the main coroutine
2714	local $Coro::idle = sub {	3196	local $Coro::idle = sub {
2715	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3197	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2716	(async {	3198	(async {
		3199	$Coro::current->{desc} = "IDLE BUG HANDLER";
2717	Event::one_event;	3200	Event::one_event;
2718	})->prio (Coro::PRIO_MAX);	3201	})->prio (Coro::PRIO_MAX);
2719	};	3202	};
2720		3203
2721	cfg_load;	3204	reload_config;
2722	db_init;	3205	db_init;
2723	load_extensions;	3206	load_extensions;
2724		3207
2725	$TICK_WATCHER->start;	3208	$TICK_WATCHER->start;
2726	Event::loop;	3209	Event::loop;
…		…
2864	%EXT_CORO = ();	3347	%EXT_CORO = ();
2865		3348
2866	warn "removing commands";	3349	warn "removing commands";
2867	%COMMAND = ();	3350	%COMMAND = ();
2868		3351
2869	warn "removing ext commands";	3352	warn "removing ext/exti commands";
2870	%EXTCMD = ();	3353	%EXTCMD = ();
		3354	%EXTICMD = ();
2871		3355
2872	warn "unloading/nuking all extensions";	3356	warn "unloading/nuking all extensions";
2873	for my $pkg (@EXTS) {	3357	for my $pkg (@EXTS) {
2874	warn "... unloading $pkg";	3358	warn "... unloading $pkg";
2875		3359
…		…
2918	warn "reloading cf.pm";	3402	warn "reloading cf.pm";
2919	require cf;	3403	require cf;
2920	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3404	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2921		3405
2922	warn "loading config and database again";	3406	warn "loading config and database again";
2923	cf::cfg_load;	3407	cf::reload_config;
2924		3408
2925	warn "loading extensions";	3409	warn "loading extensions";
2926	cf::load_extensions;	3410	cf::load_extensions;
2927		3411
2928	warn "reattaching attachments to objects/players";	3412	warn "reattaching attachments to objects/players";
…		…
2964	register_command "reload" => sub {	3448	register_command "reload" => sub {
2965	my ($who, $arg) = @_;	3449	my ($who, $arg) = @_;
2966		3450
2967	if ($who->flag (FLAG_WIZ)) {	3451	if ($who->flag (FLAG_WIZ)) {
2968	$who->message ("reloading server.");	3452	$who->message ("reloading server.");
		3453	async {
		3454	$Coro::current->{desc} = "perl_reload";
2969	async { reload_perl };	3455	reload_perl;
		3456	};
2970	}	3457	}
2971	};	3458	};
2972		3459
2973	unshift @INC, $LIBDIR;	3460	unshift @INC, $LIBDIR;
2974		3461
…		…
2993	my $signal = new Coro::Signal;	3480	my $signal = new Coro::Signal;
2994	push @WAIT_FOR_TICK_BEGIN, $signal;	3481	push @WAIT_FOR_TICK_BEGIN, $signal;
2995	$signal->wait;	3482	$signal->wait;
2996	}	3483	}
2997		3484
2998	my $min = 1e6;#d#
2999	my $avg = 10;
3000	$TICK_WATCHER = Event->timer (	3485	$TICK_WATCHER = Event->timer (
3001	reentrant => 0,	3486	reentrant => 0,
3002	parked => 1,	3487	parked => 1,
3003	prio => 0,	3488	prio => 0,
3004	at => $NEXT_TICK || $TICK,	3489	at => $NEXT_TICK || $TICK,
…		…
3012		3497
3013	$NOW = $tick_start = Event::time;	3498	$NOW = $tick_start = Event::time;
3014		3499
3015	cf::server_tick; # one server iteration	3500	cf::server_tick; # one server iteration
3016		3501
3017	0 && sync_job {#d#
3018	for(1..10) {
3019	my $t = Event::time;
3020	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3021	or die;
3022
3023	$map->width (50);
3024	$map->height (50);
3025	$map->alloc;
3026	$map->_load_objects ("/tmp/x.map", 1);
3027	my $t = Event::time - $t;
3028
3029	#next unless $t < 0.0013;#d#
3030	if ($t < $min) {
3031	$min = $t;
3032	}
3033	$avg = $avg * 0.99 + $t * 0.01;
3034	}
3035	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3036	exit 0;
3037	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3038	};
3039
3040	$RUNTIME += $TICK;	3502	$RUNTIME += $TICK;
3041	$NEXT_TICK += $TICK;	3503	$NEXT_TICK += $TICK;
3042		3504
3043	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3505	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3044	$NEXT_RUNTIME_WRITE = $NOW + 10;	3506	$NEXT_RUNTIME_WRITE = $NOW + 10;
3045	Coro::async_pool {	3507	Coro::async_pool {
		3508	$Coro::current->{desc} = "runtime saver";
3046	write_runtime	3509	write_runtime
3047	or warn "ERROR: unable to write runtime file: $!";	3510	or warn "ERROR: unable to write runtime file: $!";
3048	};	3511	};
3049	}	3512	}
3050		3513
3051	# my $AFTER = Event::time;
3052	# warn $AFTER - $NOW;#d#
3053
3054	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3514	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3055	$sig->send;	3515	$sig->send;
3056	}	3516	}
3057	while (my $sig = shift @WAIT_FOR_TICK) {	3517	while (my $sig = shift @WAIT_FOR_TICK) {
3058	$sig->send;	3518	$sig->send;
…		…
3068		3528
3069	$LOAD = ($NOW - $tick_start) / $TICK;	3529	$LOAD = ($NOW - $tick_start) / $TICK;
3070	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3530	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3071		3531
3072	_post_tick;	3532	_post_tick;
3073
3074
3075	},	3533	},
3076	);	3534	);
3077		3535
3078	{	3536	{
		3537	BDB::min_parallel 8;
3079	BDB::max_poll_time $TICK * 0.1;	3538	BDB::max_poll_time $TICK * 0.1;
3080	$BDB_POLL_WATCHER = Event->io (	3539	$BDB_POLL_WATCHER = Event->io (
3081	reentrant => 0,	3540	reentrant => 0,
3082	fd => BDB::poll_fileno,	3541	fd => BDB::poll_fileno,
3083	poll => 'r',	3542	poll => 'r',
3084	prio => 0,	3543	prio => 0,
3085	data => WF_AUTOCANCEL,	3544	data => WF_AUTOCANCEL,
3086	cb => \&BDB::poll_cb,	3545	cb => \&BDB::poll_cb,
3087	);	3546	);
3088	BDB::min_parallel 8;
3089		3547
3090	BDB::set_sync_prepare {	3548	BDB::set_sync_prepare {
3091	my $status;	3549	my $status;
3092	my $current = $Coro::current;	3550	my $current = $Coro::current;
3093	(	3551	(
…		…
3102	)	3560	)
3103	};	3561	};
3104		3562
3105	unless ($DB_ENV) {	3563	unless ($DB_ENV) {
3106	$DB_ENV = BDB::db_env_create;	3564	$DB_ENV = BDB::db_env_create;
		3565	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3566	| BDB::LOG_AUTOREMOVE, 1);
		3567	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3568	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3107		3569
3108	cf::sync_job {	3570	cf::sync_job {
3109	eval {	3571	eval {
3110	BDB::db_env_open	3572	BDB::db_env_open
3111	$DB_ENV,	3573	$DB_ENV,
…		…
3113	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3575	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3114	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3576	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3115	0666;	3577	0666;
3116		3578
3117	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3579	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3118
3119	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3120	$DB_ENV->set_lk_detect;
3121	};	3580	};
3122		3581
3123	cf::cleanup "db_env_open(db): $@" if $@;	3582	cf::cleanup "db_env_open(db): $@" if $@;
3124	};	3583	};
3125	}	3584	}
		3585
		3586	$BDB_DEADLOCK_WATCHER = Event->timer (
		3587	after => 3,
		3588	interval => 1,
		3589	hard => 1,
		3590	prio => 0,
		3591	data => WF_AUTOCANCEL,
		3592	cb => sub {
		3593	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3594	},
		3595	);
		3596	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3597	after => 11,
		3598	interval => 60,
		3599	hard => 1,
		3600	prio => 0,
		3601	data => WF_AUTOCANCEL,
		3602	cb => sub {
		3603	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3604	},
		3605	);
		3606	$BDB_TRICKLE_WATCHER = Event->timer (
		3607	after => 5,
		3608	interval => 10,
		3609	hard => 1,
		3610	prio => 0,
		3611	data => WF_AUTOCANCEL,
		3612	cb => sub {
		3613	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3614	},
		3615	);
3126	}	3616	}
3127		3617
3128	{	3618	{
3129	IO::AIO::min_parallel 8;	3619	IO::AIO::min_parallel 8;
3130		3620
…		…
3133	$AIO_POLL_WATCHER = Event->io (	3623	$AIO_POLL_WATCHER = Event->io (
3134	reentrant => 0,	3624	reentrant => 0,
3135	data => WF_AUTOCANCEL,	3625	data => WF_AUTOCANCEL,
3136	fd => IO::AIO::poll_fileno,	3626	fd => IO::AIO::poll_fileno,
3137	poll => 'r',	3627	poll => 'r',
3138	prio => 6,	3628	prio => 0,
3139	cb => \&IO::AIO::poll_cb,	3629	cb => \&IO::AIO::poll_cb,
3140	);	3630	);
3141	}	3631	}
3142		3632
3143	my $_log_backtrace;	3633	my $_log_backtrace;
…		…
3149		3639
3150	# limit the # of concurrent backtraces	3640	# limit the # of concurrent backtraces
3151	if ($_log_backtrace < 2) {	3641	if ($_log_backtrace < 2) {
3152	++$_log_backtrace;	3642	++$_log_backtrace;
3153	async {	3643	async {
		3644	$Coro::current->{desc} = "abt $msg";
		3645
3154	my @bt = fork_call {	3646	my @bt = fork_call {
3155	@addr = map { sprintf "%x", $_ } @addr;	3647	@addr = map { sprintf "%x", $_ } @addr;
3156	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3648	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3157	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"	3649	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3158	or die "addr2line: $!";	3650	or die "addr2line: $!";

Diff Legend

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