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.282 by elmex, Tue Jun 19 18:15:34 2007 UTC vs.
Revision 1.374 by root, Wed Sep 19 22:07:16 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
…		…
1347	}	1504	}
1348		1505
1349	\@paths	1506	\@paths
1350	}	1507	}
1351		1508
		1509	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
		1510
		1511	Expand crossfire pod fragments into protocol xml.
		1512
		1513	=cut
		1514
		1515	sub expand_cfpod {
		1516	((my $self), (local $_)) = @_;
		1517
		1518	# escape & and <
		1519	s/&/&amp;/g;
		1520	s/(?<![BIUGHT])</&lt;/g;
		1521
		1522	# this is buggy, it needs to properly take care of nested <'s
		1523
		1524	1 while
		1525	# replace B<>, I<>, U<> etc.
		1526	s/B<([^\>]*)>/<b>$1<\/b>/
		1527	|| s/I<([^\>]*)>/<i>$1<\/i>/
		1528	|| s/U<([^\>]*)>/<u>$1<\/u>/
		1529	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
		1530	# replace G<male|female> tags
		1531	|| s{G<([^>|]*)\|([^>]*)>}{
		1532	$self->gender ? $2 : $1
		1533	}ge
		1534	# replace H<hint text>
		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;
		1542
		1543	# create single paragraphs (very hackish)
		1544	s/(?<=\S)\n(?=\w)/ /g;
		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
		1552	$_
		1553	}
		1554
		1555	sub hintmode {
		1556	$_[0]{hintmode} = $_[1] if @_ > 1;
		1557	$_[0]{hintmode}
		1558	}
		1559
1352	=item $player->ext_reply ($msgid, %msg)	1560	=item $player->ext_reply ($msgid, @msg)
1353		1561
1354	Sends an ext reply to the player.	1562	Sends an ext reply to the player.
1355		1563
1356	=cut	1564	=cut
1357		1565
1358	sub ext_reply($$%) {	1566	sub ext_reply($$@) {
1359	my ($self, $id, %msg) = @_;	1567	my ($self, $id, @msg) = @_;
1360		1568
1361	$msg{msgid} = $id;	1569	$self->ns->ext_reply ($id, @msg)
1362
1363	$self->send ("ext " . cf::to_json \%msg);
1364	}	1570	}
1365		1571
1366	=item $player->ext_event ($type, %msg)	1572	=item $player->ext_msg ($type, @msg)
1367		1573
1368	Sends an ext event to the client.	1574	Sends an ext event to the client.
1369		1575
1370	=cut	1576	=cut
1371		1577
1372	sub ext_event($$%) {	1578	sub ext_msg($$@) {
1373	my ($self, $type, %msg) = @_;	1579	my ($self, $type, @msg) = @_;
1374		1580
1375	$self->ns->ext_event ($type, %msg);	1581	$self->ns->ext_msg ($type, @msg);
1376	}	1582	}
1377		1583
1378	=head3 cf::region	1584	=head3 cf::region
1379		1585
1380	=over 4	1586	=over 4
…		…
1393	my ($path) = @_;	1599	my ($path) = @_;
1394		1600
1395	my ($match, $specificity);	1601	my ($match, $specificity);
1396		1602
1397	for my $region (list) {	1603	for my $region (list) {
1398	if ($region->match && $path =~ $region->match) {	1604	if ($region->{match} && $path =~ $region->{match}) {
1399	($match, $specificity) = ($region, $region->specificity)	1605	($match, $specificity) = ($region, $region->specificity)
1400	if $region->specificity > $specificity;	1606	if $region->specificity > $specificity;
1401	}	1607	}
1402	}	1608	}
1403		1609
…		…
1523	$self->init; # pass $1 etc.	1729	$self->init; # pass $1 etc.
1524	return $self;	1730	return $self;
1525	}	1731	}
1526	}	1732	}
1527		1733
1528	Carp::carp "unable to resolve path '$path' (base '$base').";	1734	Carp::cluck "unable to resolve path '$path' (base '$base').";
1529	()	1735	()
1530	}	1736	}
1531		1737
1532	sub init {	1738	sub init {
1533	my ($self) = @_;	1739	my ($self) = @_;
…		…
1596		1802
1597	sub load_header_from($) {	1803	sub load_header_from($) {
1598	my ($self, $path) = @_;	1804	my ($self, $path) = @_;
1599		1805
1600	utf8::encode $path;	1806	utf8::encode $path;
1601	#aio_open $path, O_RDONLY, 0	1807	my $f = new_from_file cf::object::thawer $path
1602	# or return;
1603
1604	$self->_load_header ($path)
1605	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;
1606		1815
1607	$self->{load_path} = $path;	1816	$self->{load_path} = $path;
1608		1817
1609	1	1818	1
1610	}	1819	}
…		…
1664	sub find {	1873	sub find {
1665	my ($path, $origin) = @_;	1874	my ($path, $origin) = @_;
1666		1875
1667	$path = normalise $path, $origin && $origin->path;	1876	$path = normalise $path, $origin && $origin->path;
1668		1877
		1878	cf::lock_wait "map_data:$path";#d#remove
1669	cf::lock_wait "map_find:$path";	1879	cf::lock_wait "map_find:$path";
1670		1880
1671	$cf::MAP{$path} || do {	1881	$cf::MAP{$path} || do {
1672	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
1673	my $map = new_from_path cf::map $path	1885	my $map = new_from_path cf::map $path
1674	or return;	1886	or return;
1675		1887
1676	$map->{last_save} = $cf::RUNTIME;	1888	$map->{last_save} = $cf::RUNTIME;
1677		1889
…		…
1679	or return;	1891	or return;
1680		1892
1681	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1893	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1682	# doing this can freeze the server in a sync job, obviously	1894	# doing this can freeze the server in a sync job, obviously
1683	#$cf::WAIT_FOR_TICK->wait;	1895	#$cf::WAIT_FOR_TICK->wait;
		1896	undef $guard1;
		1897	undef $guard2;
1684	$map->reset;	1898	$map->reset;
1685	undef $guard;
1686	return find $path;	1899	return find $path;
1687	}	1900	}
1688		1901
1689	$cf::MAP{$path} = $map	1902	$cf::MAP{$path} = $map
1690	}	1903	}
…		…
1699	local $self->{deny_reset} = 1; # loading can take a long time	1912	local $self->{deny_reset} = 1; # loading can take a long time
1700		1913
1701	my $path = $self->{path};	1914	my $path = $self->{path};
1702		1915
1703	{	1916	{
1704	my $guard = cf::lock_acquire "map_load:$path";	1917	my $guard = cf::lock_acquire "map_data:$path";
1705		1918
		1919	return unless $self->valid;
1706	return if $self->in_memory != cf::MAP_SWAPPED;	1920	return unless $self->in_memory == cf::MAP_SWAPPED;
1707		1921
1708	$self->in_memory (cf::MAP_LOADING);	1922	$self->in_memory (cf::MAP_LOADING);
1709		1923
1710	$self->alloc;	1924	$self->alloc;
1711		1925
1712	$self->pre_load;	1926	$self->pre_load;
1713	Coro::cede;	1927	cf::cede_to_tick;
1714		1928
		1929	my $f = new_from_file cf::object::thawer $self->{load_path};
		1930	$f->skip_block;
1715	$self->_load_objects ($self->{load_path}, 1)	1931	$self->_load_objects ($f)
1716	or return;	1932	or return;
1717		1933
1718	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1934	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1719	if delete $self->{load_original};	1935	if delete $self->{load_original};
1720		1936
1721	if (my $uniq = $self->uniq_path) {	1937	if (my $uniq = $self->uniq_path) {
1722	utf8::encode $uniq;	1938	utf8::encode $uniq;
1723	if (aio_open $uniq, O_RDONLY, 0) {	1939	unless (aio_stat $uniq) {
		1940	if (my $f = new_from_file cf::object::thawer $uniq) {
1724	$self->clear_unique_items;	1941	$self->clear_unique_items;
1725	$self->_load_objects ($uniq, 0);	1942	$self->_load_objects ($f);
		1943	$f->resolve_delayed_derefs;
		1944	}
1726	}	1945	}
1727	}	1946	}
1728		1947
1729	Coro::cede;	1948	$f->resolve_delayed_derefs;
		1949
		1950	cf::cede_to_tick;
1730	# now do the right thing for maps	1951	# now do the right thing for maps
1731	$self->link_multipart_objects;	1952	$self->link_multipart_objects;
1732	$self->difficulty ($self->estimate_difficulty)	1953	$self->difficulty ($self->estimate_difficulty)
1733	unless $self->difficulty;	1954	unless $self->difficulty;
1734	Coro::cede;	1955	cf::cede_to_tick;
1735		1956
1736	unless ($self->{deny_activate}) {	1957	unless ($self->{deny_activate}) {
1737	$self->decay_objects;	1958	$self->decay_objects;
1738	$self->fix_auto_apply;	1959	$self->fix_auto_apply;
1739	$self->update_buttons;	1960	$self->update_buttons;
1740	Coro::cede;	1961	cf::cede_to_tick;
1741	$self->set_darkness_map;	1962	$self->set_darkness_map;
1742	Coro::cede;	1963	cf::cede_to_tick;
1743	$self->activate;	1964	$self->activate;
1744	}	1965	}
		1966
		1967	$self->{last_save} = $cf::RUNTIME;
		1968	$self->last_access ($cf::RUNTIME);
1745		1969
1746	$self->in_memory (cf::MAP_IN_MEMORY);	1970	$self->in_memory (cf::MAP_IN_MEMORY);
1747	}	1971	}
1748		1972
1749	$self->post_load;	1973	$self->post_load;
…		…
1760		1984
1761	$self	1985	$self
1762	}	1986	}
1763		1987
1764	# 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
1765	sub load_diag {	1989	sub load_neighbours {
1766	my ($map) = @_;	1990	my ($map) = @_;
1767		1991
1768	my @diag; # diagonal neighbours	1992	my @neigh; # diagonal neighbours
1769		1993
1770	for (0 .. 3) {	1994	for (0 .. 3) {
1771	my $neigh = $map->tile_path ($_)	1995	my $neigh = $map->tile_path ($_)
1772	or next;	1996	or next;
1773	$neigh = find $neigh, $map	1997	$neigh = find $neigh, $map
1774	or next;	1998	or next;
1775	$neigh->load;	1999	$neigh->load;
1776		2000
		2001	push @neigh,
1777	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2002	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1778	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2003	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1779	}	2004	}
1780		2005
1781	for (@diag) {	2006	for (grep defined $_->[0], @neigh) {
		2007	my ($path, $origin) = @$_;
1782	my $neigh = find @$_	2008	my $neigh = find $path, $origin
1783	or next;	2009	or next;
1784	$neigh->load;	2010	$neigh->load;
1785	}	2011	}
1786	}	2012	}
1787		2013
…		…
1792	}	2018	}
1793		2019
1794	sub do_load_sync {	2020	sub do_load_sync {
1795	my ($map) = @_;	2021	my ($map) = @_;
1796		2022
		2023	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2024	if $Coro::current == $Coro::main;
		2025
1797	cf::sync_job { $map->load };	2026	cf::sync_job { $map->load };
1798	}	2027	}
1799		2028
1800	our %MAP_PREFETCH;	2029	our %MAP_PREFETCH;
1801	our $MAP_PREFETCHER = undef;	2030	our $MAP_PREFETCHER = undef;
1802		2031
1803	sub find_async {	2032	sub find_async {
1804	my ($path, $origin) = @_;	2033	my ($path, $origin, $load) = @_;
1805		2034
1806	$path = normalise $path, $origin && $origin->{path};	2035	$path = normalise $path, $origin && $origin->{path};
1807		2036
1808	if (my $map = $cf::MAP{$path}) {	2037	if (my $map = $cf::MAP{$path}) {
1809	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2038	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1810	}	2039	}
1811		2040
1812	undef $MAP_PREFETCH{$path};	2041	$MAP_PREFETCH{$path} |= $load;
		2042
1813	$MAP_PREFETCHER ||= cf::async {	2043	$MAP_PREFETCHER ||= cf::async {
		2044	$Coro::current->{desc} = "map prefetcher";
		2045
1814	while (%MAP_PREFETCH) {	2046	while (%MAP_PREFETCH) {
1815	for my $path (keys %MAP_PREFETCH) {	2047	while (my ($k, $v) = each %MAP_PREFETCH) {
1816	my $map = find $path	2048	if (my $map = find $k) {
1817	or next;
1818	$map->load;	2049	$map->load if $v;
		2050	}
1819		2051
1820	delete $MAP_PREFETCH{$path};	2052	delete $MAP_PREFETCH{$k};
1821	}	2053	}
1822	}	2054	}
1823	undef $MAP_PREFETCHER;	2055	undef $MAP_PREFETCHER;
1824	};	2056	};
1825	$MAP_PREFETCHER->prio (6);	2057	$MAP_PREFETCHER->prio (6);
…		…
1828	}	2060	}
1829		2061
1830	sub save {	2062	sub save {
1831	my ($self) = @_;	2063	my ($self) = @_;
1832		2064
1833	my $lock = cf::lock_acquire "map_data:" . $self->path;	2065	my $lock = cf::lock_acquire "map_data:$self->{path}";
1834		2066
1835	$self->{last_save} = $cf::RUNTIME;	2067	$self->{last_save} = $cf::RUNTIME;
1836		2068
1837	return unless $self->dirty;	2069	return unless $self->dirty;
1838		2070
…		…
1844	return if $self->{deny_save};	2076	return if $self->{deny_save};
1845		2077
1846	local $self->{last_access} = $self->last_access;#d#	2078	local $self->{last_access} = $self->last_access;#d#
1847		2079
1848	cf::async {	2080	cf::async {
		2081	$Coro::current->{desc} = "map player save";
1849	$_->contr->save for $self->players;	2082	$_->contr->save for $self->players;
1850	};	2083	};
1851		2084
1852	if ($uniq) {	2085	if ($uniq) {
1853	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2086	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
…		…
1861	my ($self) = @_;	2094	my ($self) = @_;
1862		2095
1863	# save first because save cedes	2096	# save first because save cedes
1864	$self->save;	2097	$self->save;
1865		2098
1866	my $lock = cf::lock_acquire "map_data:" . $self->path;	2099	my $lock = cf::lock_acquire "map_data:$self->{path}";
1867		2100
1868	return if $self->players;	2101	return if $self->players;
1869	return if $self->in_memory != cf::MAP_IN_MEMORY;	2102	return if $self->in_memory != cf::MAP_IN_MEMORY;
1870	return if $self->{deny_save};	2103	return if $self->{deny_save};
1871		2104
		2105	$self->in_memory (cf::MAP_SWAPPED);
		2106
		2107	$self->deactivate;
		2108	$_->clear_links_to ($self) for values %cf::MAP;
1872	$self->clear;	2109	$self->clear;
1873	$self->in_memory (cf::MAP_SWAPPED);
1874	}	2110	}
1875		2111
1876	sub reset_at {	2112	sub reset_at {
1877	my ($self) = @_;	2113	my ($self) = @_;
1878		2114
…		…
1910	if $uniq;	2146	if $uniq;
1911	}	2147	}
1912		2148
1913	delete $cf::MAP{$self->path};	2149	delete $cf::MAP{$self->path};
1914		2150
		2151	$self->deactivate;
		2152	$_->clear_links_to ($self) for values %cf::MAP;
1915	$self->clear;	2153	$self->clear;
1916
1917	$_->clear_links_to ($self) for values %cf::MAP;
1918		2154
1919	$self->unlink_save;	2155	$self->unlink_save;
1920	$self->destroy;	2156	$self->destroy;
1921	}	2157	}
1922		2158
1923	my $nuke_counter = "aaaa";	2159	my $nuke_counter = "aaaa";
1924		2160
1925	sub nuke {	2161	sub nuke {
1926	my ($self) = @_;	2162	my ($self) = @_;
1927		2163
		2164	{
		2165	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2166
1928	delete $cf::MAP{$self->path};	2167	delete $cf::MAP{$self->path};
1929		2168
1930	$self->unlink_save;	2169	$self->unlink_save;
1931		2170
1932	bless $self, "cf::map";	2171	bless $self, "cf::map";
1933	delete $self->{deny_reset};	2172	delete $self->{deny_reset};
1934	$self->{deny_save} = 1;	2173	$self->{deny_save} = 1;
1935	$self->reset_timeout (1);	2174	$self->reset_timeout (1);
1936	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2175	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1937		2176
1938	$cf::MAP{$self->path} = $self;	2177	$cf::MAP{$self->path} = $self;
		2178	}
1939		2179
1940	$self->reset; # polite request, might not happen	2180	$self->reset; # polite request, might not happen
1941	}	2181	}
1942		2182
1943	=item $maps = cf::map::tmp_maps	2183	=item $maps = cf::map::tmp_maps
…		…
2019		2259
2020	sub inv_recursive {	2260	sub inv_recursive {
2021	inv_recursive_ inv $_[0]	2261	inv_recursive_ inv $_[0]
2022	}	2262	}
2023		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	# temporary compatibility#TODO#remove
		2279	$ref =~ s{^<}{player/<};
		2280
		2281	if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
		2282	my ($uuid, $name) = ($1, $2);
		2283	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2284	or return;
		2285	$pl->ob->uuid eq $uuid
		2286	or return;
		2287
		2288	$pl->ob
		2289	} else {
		2290	warn "$ref: cannot resolve object reference\n";
		2291	undef
		2292	}
		2293	}
		2294
2024	package cf;	2295	package cf;
2025		2296
2026	=back	2297	=back
2027		2298
2028	=head3 cf::object::player	2299	=head3 cf::object::player
…		…
2050		2321
2051	} else {	2322	} else {
2052	my $pl = $self->contr;	2323	my $pl = $self->contr;
2053		2324
2054	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2325	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2055	my $diag = $pl->{npc_dialog};	2326	my $dialog = $pl->{npc_dialog};
2056	$diag->{pl}->ext_reply (	2327	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2057	$diag->{id}, msgtype => "reply", msg => $msg, add_topics => []
2058	);
2059		2328
2060	} else {	2329	} else {
2061	$msg = $npc->name . " says: $msg" if $npc;	2330	$msg = $npc->name . " says: $msg" if $npc;
2062	$self->message ($msg, $flags);	2331	$self->message ($msg, $flags);
2063	}	2332	}
2064	}	2333	}
		2334	}
		2335
		2336	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2337
		2338	=cut
		2339
		2340	sub cf::object::send_msg {
		2341	my $pl = shift->contr
		2342	or return;
		2343	$pl->send_msg (@_);
2065	}	2344	}
2066		2345
2067	=item $player_object->may ("access")	2346	=item $player_object->may ("access")
2068		2347
2069	Returns wether the given player is authorized to access resource "access"	2348	Returns wether the given player is authorized to access resource "access"
…		…
2148	# use -1 or undef as default coordinates, not 0, 0	2427	# use -1 or undef as default coordinates, not 0, 0
2149	($x, $y) = ($map->enter_x, $map->enter_y)	2428	($x, $y) = ($map->enter_x, $map->enter_y)
2150	if $x <=0 && $y <= 0;	2429	if $x <=0 && $y <= 0;
2151		2430
2152	$map->load;	2431	$map->load;
2153	$map->load_diag;	2432	$map->load_neighbours;
2154		2433
2155	return unless $self->contr->active;	2434	return unless $self->contr->active;
2156	$self->activate_recursive;	2435	$self->activate_recursive;
2157		2436
2158	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2437	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2159	$self->enter_map ($map, $x, $y);	2438	$self->enter_map ($map, $x, $y);
2160	}	2439	}
2161		2440
2162	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2441	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2163		2442
2164	Moves the player to the given map-path and coordinates by first freezing	2443	Moves the player to the given map-path and coordinates by first freezing
2165	her, loading and preparing them map, calling the provided $check callback	2444	her, loading and preparing them map, calling the provided $check callback
2166	that has to return the map if sucecssful, and then unfreezes the player on	2445	that has to return the map if sucecssful, and then unfreezes the player on
2167	the new (success) or old (failed) map position.	2446	the new (success) or old (failed) map position. In either case, $done will
		2447	be called at the end of this process.
2168		2448
2169	=cut	2449	=cut
2170		2450
2171	our $GOTOGEN;	2451	our $GOTOGEN;
2172		2452
2173	sub cf::object::player::goto {	2453	sub cf::object::player::goto {
2174	my ($self, $path, $x, $y, $check) = @_;	2454	my ($self, $path, $x, $y, $check, $done) = @_;
2175		2455
2176	# do generation counting so two concurrent goto's will be executed in-order	2456	# do generation counting so two concurrent goto's will be executed in-order
2177	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2457	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2178		2458
2179	$self->enter_link;	2459	$self->enter_link;
2180		2460
2181	(async {	2461	(async {
		2462	$Coro::current->{desc} = "player::goto $path $x $y";
		2463
		2464	# *tag paths override both path and x|y
		2465	if ($path =~ /^\*(.*)$/) {
		2466	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2467	my $ob = $obs[rand @obs];
		2468
		2469	# see if we actually can go there
		2470	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2471	$ob = $obs[rand @obs];
		2472	} else {
		2473	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2474	}
		2475	# else put us there anyways for now #d#
		2476
		2477	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2478	} else {
		2479	($path, $x, $y) = (undef, undef, undef);
		2480	}
		2481	}
		2482
2182	my $map = eval {	2483	my $map = eval {
2183	my $map = cf::map::find $path;	2484	my $map = defined $path ? cf::map::find $path : undef;
2184		2485
2185	if ($map) {	2486	if ($map) {
2186	$map = $map->customise_for ($self);	2487	$map = $map->customise_for ($self);
2187	$map = $check->($map) if $check && $map;	2488	$map = $check->($map) if $check && $map;
2188	} else {	2489	} else {
2189	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2490	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2190	}	2491	}
2191		2492
2192	$map	2493	$map
2193	};	2494	};
2194		2495
…		…
2199		2500
2200	if ($gen == $self->{_goto_generation}) {	2501	if ($gen == $self->{_goto_generation}) {
2201	delete $self->{_goto_generation};	2502	delete $self->{_goto_generation};
2202	$self->leave_link ($map, $x, $y);	2503	$self->leave_link ($map, $x, $y);
2203	}	2504	}
		2505
		2506	$done->() if $done;
2204	})->prio (1);	2507	})->prio (1);
2205	}	2508	}
2206		2509
2207	=item $player_object->enter_exit ($exit_object)	2510	=item $player_object->enter_exit ($exit_object)
2208		2511
…		…
2277	my $hp = $exit->stats->hp;	2580	my $hp = $exit->stats->hp;
2278	my $sp = $exit->stats->sp;	2581	my $sp = $exit->stats->sp;
2279		2582
2280	$self->enter_link;	2583	$self->enter_link;
2281		2584
		2585	# if exit is damned, update players death & WoR home-position
		2586	$self->contr->savebed ($slaying, $hp, $sp)
		2587	if $exit->flag (FLAG_DAMNED);
		2588
2282	(async {	2589	(async {
		2590	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2591
2283	$self->deactivate_recursive; # just to be sure	2592	$self->deactivate_recursive; # just to be sure
2284	unless (eval {	2593	unless (eval {
2285	$self->goto ($slaying, $hp, $sp);	2594	$self->goto ($slaying, $hp, $sp);
2286		2595
2287	1;	2596	1;
…		…
2313		2622
2314	utf8::encode $text;	2623	utf8::encode $text;
2315	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2624	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2316	}	2625	}
2317		2626
		2627	=item $client->send_msg ($channel, $msg, $color, [extra...])
		2628
		2629	Send a drawinfo or msg packet to the client, formatting the msg for the
		2630	client if neccessary. C<$type> should be a string identifying the type of
		2631	the message, with C<log> being the default. If C<$color> is negative, suppress
		2632	the message unless the client supports the msg packet.
		2633
		2634	=cut
		2635
		2636	our %CHANNEL = (
		2637	"c/identify" => {
		2638	id => "identify",
		2639	title => "Identify",
		2640	reply => undef,
		2641	tooltip => "Items recently identified",
		2642	},
		2643	"c/examine" => {
		2644	id => "examine",
		2645	title => "Examine",
		2646	reply => undef,
		2647	tooltip => "Signs and other items you examined",
		2648	},
		2649	);
		2650
		2651	sub cf::client::send_msg {
		2652	my ($self, $channel, $msg, $color, @extra) = @_;
		2653
		2654	$msg = $self->pl->expand_cfpod ($msg);
		2655
		2656	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2657
		2658	# check predefined channels, for the benefit of C
		2659	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};
		2660
		2661	if (ref $channel) {
		2662	# send meta info to client, if not yet sent
		2663	unless (exists $self->{channel}{$channel->{id}}) {
		2664	$self->{channel}{$channel->{id}} = $channel;
		2665	$self->ext_msg (channel_info => $channel)
		2666	if $self->can_msg;
		2667	}
		2668
		2669	$channel = $channel->{id};
		2670	}
		2671
		2672	return unless @extra || length $msg;
		2673
		2674	if ($self->can_msg) {
		2675	# default colour, mask it out
		2676	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2677	if $color & cf::NDI_DEF;
		2678
		2679	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2680	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
		2681	} else {
		2682	if ($color >= 0) {
		2683	# replace some tags by gcfclient-compatible ones
		2684	for ($msg) {
		2685	1 while
		2686	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2687	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2688	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2689	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2690	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2691	}
		2692
		2693	$color &= cf::NDI_COLOR_MASK;
		2694
		2695	utf8::encode $msg;
		2696
		2697	if (0 && $msg =~ /\[/) {
		2698	# COMMAND/INFO
		2699	$self->send_packet ("drawextinfo $color 10 8 $msg")
		2700	} else {
		2701	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
		2702	$self->send_packet ("drawinfo $color $msg")
		2703	}
		2704	}
		2705	}
		2706	}
		2707
2318	=item $client->ext_event ($type, %msg)	2708	=item $client->ext_msg ($type, @msg)
2319		2709
2320	Sends an exti event to the client.	2710	Sends an ext event to the client.
2321		2711
2322	=cut	2712	=cut
2323		2713
2324	sub cf::client::ext_event($$%) {	2714	sub cf::client::ext_msg($$@) {
2325	my ($self, $type, %msg) = @_;	2715	my ($self, $type, @msg) = @_;
2326		2716
		2717	if ($self->extcmd == 2) {
		2718	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2719	} elsif ($self->extcmd == 1) { # TODO: remove
2327	$msg{msgtype} = "event_$type";	2720	push @msg, msgtype => "event_$type";
2328	$self->send_packet ("ext " . cf::to_json \%msg);	2721	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2722	}
		2723	}
		2724
		2725	=item $client->ext_reply ($msgid, @msg)
		2726
		2727	Sends an ext reply to the client.
		2728
		2729	=cut
		2730
		2731	sub cf::client::ext_reply($$@) {
		2732	my ($self, $id, @msg) = @_;
		2733
		2734	if ($self->extcmd == 2) {
		2735	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2736	} elsif ($self->extcmd == 1) {
		2737	#TODO: version 1, remove
		2738	unshift @msg, msgtype => "reply", msgid => $id;
		2739	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2740	}
2329	}	2741	}
2330		2742
2331	=item $success = $client->query ($flags, "text", \&cb)	2743	=item $success = $client->query ($flags, "text", \&cb)
2332		2744
2333	Queues a query to the client, calling the given callback with	2745	Queues a query to the client, calling the given callback with
2334	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2746	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2335	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.	2747	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2336		2748
2337	Queries can fail, so check the return code. Or don't, as queries will become	2749	Queries can fail, so check the return code. Or don't, as queries will
2338	reliable at some point in the future.	2750	become reliable at some point in the future.
2339		2751
2340	=cut	2752	=cut
2341		2753
2342	sub cf::client::query {	2754	sub cf::client::query {
2343	my ($self, $flags, $text, $cb) = @_;	2755	my ($self, $flags, $text, $cb) = @_;
…		…
2351	utf8::encode $text;	2763	utf8::encode $text;
2352	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];	2764	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2353		2765
2354	$self->send_packet ($self->{query_queue}[0][0])	2766	$self->send_packet ($self->{query_queue}[0][0])
2355	if @{ $self->{query_queue} } == 1;	2767	if @{ $self->{query_queue} } == 1;
		2768
		2769	1
2356	}	2770	}
2357		2771
2358	cf::client->attach (	2772	cf::client->attach (
		2773	on_connect => sub {
		2774	my ($ns) = @_;
		2775
		2776	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2777	},
2359	on_reply => sub {	2778	on_reply => sub {
2360	my ($ns, $msg) = @_;	2779	my ($ns, $msg) = @_;
2361		2780
2362	# this weird shuffling is so that direct followup queries	2781	# this weird shuffling is so that direct followup queries
2363	# get handled first	2782	# get handled first
…		…
2375	} else {	2794	} else {
2376	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;	2795	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2377	}	2796	}
2378	}	2797	}
2379	},	2798	},
		2799	on_exticmd => sub {
		2800	my ($ns, $buf) = @_;
		2801
		2802	my $msg = eval { $ns->{json_coder}->decode ($buf) };
		2803
		2804	if (ref $msg) {
		2805	my ($type, $reply, @payload) =
		2806	"ARRAY" eq ref $msg
		2807	? @$msg
		2808	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2809
		2810	my @reply;
		2811
		2812	if (my $cb = $EXTICMD{$type}) {
		2813	@reply = $cb->($ns, @payload);
		2814	}
		2815
		2816	$ns->ext_reply ($reply, @reply)
		2817	if $reply;
		2818
		2819	} else {
		2820	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
		2821	}
		2822
		2823	cf::override;
		2824	},
2380	);	2825	);
2381		2826
2382	=item $client->async (\&cb)	2827	=item $client->async (\&cb)
2383		2828
2384	Create a new coroutine, running the specified callback. The coroutine will	2829	Create a new coroutine, running the specified callback. The coroutine will
…		…
2425	our $safe = new Safe "safe";	2870	our $safe = new Safe "safe";
2426	our $safe_hole = new Safe::Hole;	2871	our $safe_hole = new Safe::Hole;
2427		2872
2428	$SIG{FPE} = 'IGNORE';	2873	$SIG{FPE} = 'IGNORE';
2429		2874
2430	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2875	$safe->permit_only (Opcode::opset qw(
		2876	:base_core :base_mem :base_orig :base_math
		2877	grepstart grepwhile mapstart mapwhile
		2878	sort time
		2879	));
2431		2880
2432	# here we export the classes and methods available to script code	2881	# here we export the classes and methods available to script code
2433		2882
2434	=pod	2883	=pod
2435		2884
2436	The following functions and methods are available within a safe environment:	2885	The following functions and methods are available within a safe environment:
2437		2886
2438	cf::object contr pay_amount pay_player map	2887	cf::object
		2888	contr pay_amount pay_player map x y force_find force_add
		2889	insert remove name archname title slaying race decrease_ob_nr
		2890
2439	cf::object::player player	2891	cf::object::player
2440	cf::player peaceful	2892	player
2441	cf::map trigger	2893
		2894	cf::player
		2895	peaceful
		2896
		2897	cf::map
		2898	trigger
2442		2899
2443	=cut	2900	=cut
2444		2901
2445	for (	2902	for (
2446	["cf::object" => qw(contr pay_amount pay_player map)],	2903	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2904	insert remove inv name archname title slaying race
		2905	decrease_ob_nr)],
2447	["cf::object::player" => qw(player)],	2906	["cf::object::player" => qw(player)],
2448	["cf::player" => qw(peaceful)],	2907	["cf::player" => qw(peaceful)],
2449	["cf::map" => qw(trigger)],	2908	["cf::map" => qw(trigger)],
2450	) {	2909	) {
2451	no strict 'refs';	2910	no strict 'refs';
…		…
2527	# the server's init and main functions	2986	# the server's init and main functions
2528		2987
2529	sub load_facedata($) {	2988	sub load_facedata($) {
2530	my ($path) = @_;	2989	my ($path) = @_;
2531		2990
		2991	# HACK to clear player env face cache, we need some signal framework
		2992	# for this (global event?)
		2993	%ext::player_env::MUSIC_FACE_CACHE = ();
		2994
		2995	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		2996
2532	warn "loading facedata from $path\n";	2997	warn "loading facedata from $path\n";
2533		2998
2534	my $facedata;	2999	my $facedata;
2535	0 < aio_load $path, $facedata	3000	0 < aio_load $path, $facedata
2536	or die "$path: $!";	3001	or die "$path: $!";
…		…
2538	$facedata = Coro::Storable::thaw $facedata;	3003	$facedata = Coro::Storable::thaw $facedata;
2539		3004
2540	$facedata->{version} == 2	3005	$facedata->{version} == 2
2541	or cf::cleanup "$path: version mismatch, cannot proceed.";	3006	or cf::cleanup "$path: version mismatch, cannot proceed.";
2542		3007
		3008	# patch in the exptable
		3009	$facedata->{resource}{"res/exp_table"} = {
		3010	type => FT_RSRC,
		3011	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3012	};
		3013	cf::cede_to_tick;
		3014
2543	{	3015	{
2544	my $faces = $facedata->{faceinfo};	3016	my $faces = $facedata->{faceinfo};
2545		3017
2546	while (my ($face, $info) = each %$faces) {	3018	while (my ($face, $info) = each %$faces) {
2547	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3019	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2548	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3020	cf::face::set_visibility $idx, $info->{visibility};
		3021	cf::face::set_magicmap $idx, $info->{magicmap};
2549	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3022	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2550	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3023	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2551	Coro::cede;	3024
		3025	cf::cede_to_tick;
2552	}	3026	}
2553		3027
2554	while (my ($face, $info) = each %$faces) {	3028	while (my ($face, $info) = each %$faces) {
2555	next unless $info->{smooth};	3029	next unless $info->{smooth};
2556	my $idx = cf::face::find $face	3030	my $idx = cf::face::find $face
2557	or next;	3031	or next;
2558	if (my $smooth = cf::face::find $info->{smooth}) {	3032	if (my $smooth = cf::face::find $info->{smooth}) {
		3033	cf::face::set_smooth $idx, $smooth;
2559	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3034	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2560	} else {	3035	} else {
2561	warn "smooth face '$info->{smooth}' not found for face '$face'";	3036	warn "smooth face '$info->{smooth}' not found for face '$face'";
2562	}	3037	}
2563	Coro::cede;	3038
		3039	cf::cede_to_tick;
2564	}	3040	}
2565	}	3041	}
2566		3042
2567	{	3043	{
2568	my $anims = $facedata->{animinfo};	3044	my $anims = $facedata->{animinfo};
2569		3045
2570	while (my ($anim, $info) = each %$anims) {	3046	while (my ($anim, $info) = each %$anims) {
2571	cf::anim::set $anim, $info->{frames}, $info->{facings};	3047	cf::anim::set $anim, $info->{frames}, $info->{facings};
2572	Coro::cede;	3048	cf::cede_to_tick;
2573	}	3049	}
2574		3050
2575	cf::anim::invalidate_all; # d'oh	3051	cf::anim::invalidate_all; # d'oh
2576	}	3052	}
2577		3053
		3054	{
		3055	# TODO: for gcfclient pleasure, we should give resources
		3056	# that gcfclient doesn't grok a >10000 face index.
		3057	my $res = $facedata->{resource};
		3058
		3059	my $soundconf = delete $res->{"res/sound.conf"};
		3060
		3061	while (my ($name, $info) = each %$res) {
		3062	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3063	my $data;
		3064
		3065	if ($info->{type} & 1) {
		3066	# prepend meta info
		3067
		3068	my $meta = $enc->encode ({
		3069	name => $name,
		3070	%{ $info->{meta} || {} },
		3071	});
		3072
		3073	$data = pack "(w/a*)*", $meta, $info->{data};
		3074	} else {
		3075	$data = $info->{data};
		3076	}
		3077
		3078	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3079	cf::face::set_type $idx, $info->{type};
		3080
		3081	cf::cede_to_tick;
		3082	}
		3083
		3084	if ($soundconf) {
		3085	$soundconf = $enc->decode (delete $soundconf->{data});
		3086
		3087	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3088	my $sound = $soundconf->{compat}[$_]
		3089	or next;
		3090
		3091	my $face = cf::face::find "sound/$sound->[1]";
		3092	cf::sound::set $sound->[0] => $face;
		3093	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3094	}
		3095
		3096	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3097	my $face = cf::face::find "sound/$v";
		3098	cf::sound::set $k => $face;
		3099	}
		3100	}
		3101	}
		3102
2578	1	3103	1
2579	}	3104	}
2580		3105
		3106	register_exticmd fx_want => sub {
		3107	my ($ns, $want) = @_;
		3108
		3109	while (my ($k, $v) = each %$want) {
		3110	$ns->fx_want ($k, $v);
		3111	}
		3112	};
		3113
2581	sub reload_regions {	3114	sub reload_regions {
		3115	# HACK to clear player env face cache, we need some signal framework
		3116	# for this (global event?)
		3117	%ext::player_env::MUSIC_FACE_CACHE = ();
		3118
2582	load_resource_file "$MAPDIR/regions"	3119	load_resource_file "$MAPDIR/regions"
2583	or die "unable to load regions file\n";	3120	or die "unable to load regions file\n";
		3121
		3122	for (cf::region::list) {
		3123	$_->{match} = qr/$_->{match}/
		3124	if exists $_->{match};
		3125	}
2584	}	3126	}
2585		3127
2586	sub reload_facedata {	3128	sub reload_facedata {
2587	load_facedata "$DATADIR/facedata"	3129	load_facedata "$DATADIR/facedata"
2588	or die "unable to load facedata\n";	3130	or die "unable to load facedata\n";
2589	}	3131	}
2590		3132
2591	sub reload_archetypes {	3133	sub reload_archetypes {
		3134	load_resource_file "$DATADIR/archetypes"
		3135	or die "unable to load archetypes\n";
		3136	#d# NEED to laod twice to resolve forward references
		3137	# this really needs to be done in an extra post-pass
		3138	# (which needs to be synchronous, so solve it differently)
2592	load_resource_file "$DATADIR/archetypes"	3139	load_resource_file "$DATADIR/archetypes"
2593	or die "unable to load archetypes\n";	3140	or die "unable to load archetypes\n";
2594	}	3141	}
2595		3142
2596	sub reload_treasures {	3143	sub reload_treasures {
…		…
2612		3159
2613	sub init {	3160	sub init {
2614	reload_resources;	3161	reload_resources;
2615	}	3162	}
2616		3163
2617	sub cfg_load {	3164	sub reload_config {
2618	open my $fh, "<:utf8", "$CONFDIR/config"	3165	open my $fh, "<:utf8", "$CONFDIR/config"
2619	or return;	3166	or return;
2620		3167
2621	local $/;	3168	local $/;
2622	*CFG = YAML::Syck::Load <$fh>;	3169	*CFG = YAML::Syck::Load <$fh>;
…		…
2638	sub main {	3185	sub main {
2639	# we must not ever block the main coroutine	3186	# we must not ever block the main coroutine
2640	local $Coro::idle = sub {	3187	local $Coro::idle = sub {
2641	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3188	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2642	(async {	3189	(async {
		3190	$Coro::current->{desc} = "IDLE BUG HANDLER";
2643	Event::one_event;	3191	Event::one_event;
2644	})->prio (Coro::PRIO_MAX);	3192	})->prio (Coro::PRIO_MAX);
2645	};	3193	};
2646		3194
2647	cfg_load;	3195	reload_config;
2648	db_init;	3196	db_init;
2649	load_extensions;	3197	load_extensions;
2650		3198
2651	$TICK_WATCHER->start;	3199	$TICK_WATCHER->start;
2652	Event::loop;	3200	Event::loop;
…		…
2790	%EXT_CORO = ();	3338	%EXT_CORO = ();
2791		3339
2792	warn "removing commands";	3340	warn "removing commands";
2793	%COMMAND = ();	3341	%COMMAND = ();
2794		3342
2795	warn "removing ext commands";	3343	warn "removing ext/exti commands";
2796	%EXTCMD = ();	3344	%EXTCMD = ();
		3345	%EXTICMD = ();
2797		3346
2798	warn "unloading/nuking all extensions";	3347	warn "unloading/nuking all extensions";
2799	for my $pkg (@EXTS) {	3348	for my $pkg (@EXTS) {
2800	warn "... unloading $pkg";	3349	warn "... unloading $pkg";
2801		3350
…		…
2844	warn "reloading cf.pm";	3393	warn "reloading cf.pm";
2845	require cf;	3394	require cf;
2846	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3395	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2847		3396
2848	warn "loading config and database again";	3397	warn "loading config and database again";
2849	cf::cfg_load;	3398	cf::reload_config;
2850		3399
2851	warn "loading extensions";	3400	warn "loading extensions";
2852	cf::load_extensions;	3401	cf::load_extensions;
2853		3402
2854	warn "reattaching attachments to objects/players";	3403	warn "reattaching attachments to objects/players";
…		…
2890	register_command "reload" => sub {	3439	register_command "reload" => sub {
2891	my ($who, $arg) = @_;	3440	my ($who, $arg) = @_;
2892		3441
2893	if ($who->flag (FLAG_WIZ)) {	3442	if ($who->flag (FLAG_WIZ)) {
2894	$who->message ("reloading server.");	3443	$who->message ("reloading server.");
		3444	async {
		3445	$Coro::current->{desc} = "perl_reload";
2895	async { reload_perl };	3446	reload_perl;
		3447	};
2896	}	3448	}
2897	};	3449	};
2898		3450
2899	unshift @INC, $LIBDIR;	3451	unshift @INC, $LIBDIR;
2900		3452
…		…
2919	my $signal = new Coro::Signal;	3471	my $signal = new Coro::Signal;
2920	push @WAIT_FOR_TICK_BEGIN, $signal;	3472	push @WAIT_FOR_TICK_BEGIN, $signal;
2921	$signal->wait;	3473	$signal->wait;
2922	}	3474	}
2923		3475
2924	my $min = 1e6;#d#
2925	my $avg = 10;
2926	$TICK_WATCHER = Event->timer (	3476	$TICK_WATCHER = Event->timer (
2927	reentrant => 0,	3477	reentrant => 0,
2928	parked => 1,	3478	parked => 1,
2929	prio => 0,	3479	prio => 0,
2930	at => $NEXT_TICK || $TICK,	3480	at => $NEXT_TICK || $TICK,
…		…
2938		3488
2939	$NOW = $tick_start = Event::time;	3489	$NOW = $tick_start = Event::time;
2940		3490
2941	cf::server_tick; # one server iteration	3491	cf::server_tick; # one server iteration
2942		3492
2943	0 && sync_job {#d#
2944	for(1..10) {
2945	my $t = Event::time;
2946	my $map = my $map = new_from_path cf::map "/tmp/x.map"
2947	or die;
2948
2949	$map->width (50);
2950	$map->height (50);
2951	$map->alloc;
2952	$map->_load_objects ("/tmp/x.map", 1);
2953	my $t = Event::time - $t;
2954
2955	#next unless $t < 0.0013;#d#
2956	if ($t < $min) {
2957	$min = $t;
2958	}
2959	$avg = $avg * 0.99 + $t * 0.01;
2960	}
2961	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2962	exit 0;
2963	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2964	};
2965
2966	$RUNTIME += $TICK;	3493	$RUNTIME += $TICK;
2967	$NEXT_TICK += $TICK;	3494	$NEXT_TICK += $TICK;
2968		3495
2969	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3496	if ($NOW >= $NEXT_RUNTIME_WRITE) {
2970	$NEXT_RUNTIME_WRITE = $NOW + 10;	3497	$NEXT_RUNTIME_WRITE = $NOW + 10;
2971	Coro::async_pool {	3498	Coro::async_pool {
		3499	$Coro::current->{desc} = "runtime saver";
2972	write_runtime	3500	write_runtime
2973	or warn "ERROR: unable to write runtime file: $!";	3501	or warn "ERROR: unable to write runtime file: $!";
2974	};	3502	};
2975	}	3503	}
2976		3504
2977	# my $AFTER = Event::time;
2978	# warn $AFTER - $NOW;#d#
2979
2980	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3505	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2981	$sig->send;	3506	$sig->send;
2982	}	3507	}
2983	while (my $sig = shift @WAIT_FOR_TICK) {	3508	while (my $sig = shift @WAIT_FOR_TICK) {
2984	$sig->send;	3509	$sig->send;
…		…
2994		3519
2995	$LOAD = ($NOW - $tick_start) / $TICK;	3520	$LOAD = ($NOW - $tick_start) / $TICK;
2996	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3521	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2997		3522
2998	_post_tick;	3523	_post_tick;
2999
3000
3001	},	3524	},
3002	);	3525	);
3003		3526
3004	{	3527	{
		3528	BDB::min_parallel 8;
3005	BDB::max_poll_time $TICK * 0.1;	3529	BDB::max_poll_time $TICK * 0.1;
3006	$BDB_POLL_WATCHER = Event->io (	3530	$BDB_POLL_WATCHER = Event->io (
3007	reentrant => 0,	3531	reentrant => 0,
3008	fd => BDB::poll_fileno,	3532	fd => BDB::poll_fileno,
3009	poll => 'r',	3533	poll => 'r',
3010	prio => 0,	3534	prio => 0,
3011	data => WF_AUTOCANCEL,	3535	data => WF_AUTOCANCEL,
3012	cb => \&BDB::poll_cb,	3536	cb => \&BDB::poll_cb,
3013	);	3537	);
3014	BDB::min_parallel 8;
3015		3538
3016	BDB::set_sync_prepare {	3539	BDB::set_sync_prepare {
3017	my $status;	3540	my $status;
3018	my $current = $Coro::current;	3541	my $current = $Coro::current;
3019	(	3542	(
…		…
3028	)	3551	)
3029	};	3552	};
3030		3553
3031	unless ($DB_ENV) {	3554	unless ($DB_ENV) {
3032	$DB_ENV = BDB::db_env_create;	3555	$DB_ENV = BDB::db_env_create;
		3556	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3557	| BDB::LOG_AUTOREMOVE, 1);
		3558	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3559	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3033		3560
3034	cf::sync_job {	3561	cf::sync_job {
3035	eval {	3562	eval {
3036	BDB::db_env_open	3563	BDB::db_env_open
3037	$DB_ENV,	3564	$DB_ENV,
…		…
3039	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3566	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3040	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3567	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3041	0666;	3568	0666;
3042		3569
3043	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3570	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3044
3045	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3046	$DB_ENV->set_lk_detect;
3047	};	3571	};
3048		3572
3049	cf::cleanup "db_env_open(db): $@" if $@;	3573	cf::cleanup "db_env_open(db): $@" if $@;
3050	};	3574	};
3051	}	3575	}
		3576
		3577	$BDB_DEADLOCK_WATCHER = Event->timer (
		3578	after => 3,
		3579	interval => 1,
		3580	hard => 1,
		3581	prio => 0,
		3582	data => WF_AUTOCANCEL,
		3583	cb => sub {
		3584	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3585	},
		3586	);
		3587	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3588	after => 11,
		3589	interval => 60,
		3590	hard => 1,
		3591	prio => 0,
		3592	data => WF_AUTOCANCEL,
		3593	cb => sub {
		3594	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3595	},
		3596	);
		3597	$BDB_TRICKLE_WATCHER = Event->timer (
		3598	after => 5,
		3599	interval => 10,
		3600	hard => 1,
		3601	prio => 0,
		3602	data => WF_AUTOCANCEL,
		3603	cb => sub {
		3604	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3605	},
		3606	);
3052	}	3607	}
3053		3608
3054	{	3609	{
3055	IO::AIO::min_parallel 8;	3610	IO::AIO::min_parallel 8;
3056		3611
…		…
3075		3630
3076	# limit the # of concurrent backtraces	3631	# limit the # of concurrent backtraces
3077	if ($_log_backtrace < 2) {	3632	if ($_log_backtrace < 2) {
3078	++$_log_backtrace;	3633	++$_log_backtrace;
3079	async {	3634	async {
		3635	$Coro::current->{desc} = "abt $msg";
		3636
3080	my @bt = fork_call {	3637	my @bt = fork_call {
3081	@addr = map { sprintf "%x", $_ } @addr;	3638	@addr = map { sprintf "%x", $_ } @addr;
3082	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3639	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3083	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"	3640	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3084	or die "addr2line: $!";	3641	or die "addr2line: $!";

Diff Legend

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