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.283 by root, Sun Jun 24 04:09:29 2007 UTC vs.
Revision 1.365 by root, Tue Sep 11 13:27:56 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_CHECKPOINT_WATCHER;
		86	our $BDB_TRICKLE_WATCHER;
81	our $DB_ENV;	87	our $DB_ENV;
82		88
83	our %CFG;	89	our %CFG;
84		90
85	our $UPTIME; $UPTIME ||= time;	91	our $UPTIME; $UPTIME ||= time;
86	our $RUNTIME;	92	our $RUNTIME;
87		93
88	our %PLAYER; # all users	94	our (%PLAYER, %PLAYER_LOADING); # all users
89	our %MAP; # all maps	95	our (%MAP, %MAP_LOADING ); # all maps
90	our $LINK_MAP; # the special {link} map, which is always available	96	our $LINK_MAP; # the special {link} map, which is always available
91		97
92	# used to convert map paths into valid unix filenames by replacing / by ∕	98	# used to convert map paths into valid unix filenames by replacing / by ∕
93	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	99	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94		100
…		…
164		170
165	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	171	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	172	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.	173	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168		174
		175	=item @cf::INVOKE_RESULTS
		176
		177	This array contains the results of the last C<invoke ()> call. When
		178	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
		179	that call.
		180
169	=back	181	=back
170		182
171	=cut	183	=cut
172		184
173	BEGIN {	185	BEGIN {
…		…
177	$msg .= "\n"	189	$msg .= "\n"
178	unless $msg =~ /\n$/;	190	unless $msg =~ /\n$/;
179		191
180	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	192	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181		193
182	utf8::encode $msg;
183	LOG llevError, $msg;	194	LOG llevError, $msg;
184	};	195	};
185	}	196	}
186		197
187	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	198	@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;	247	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237	$d	248	$d
238	} || "[unable to dump $_[0]: '$@']";	249	} || "[unable to dump $_[0]: '$@']";
239	}	250	}
240		251
241	use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243	=item $ref = cf::from_json $json	252	=item $ref = cf::from_json $json
244		253
245	Converts a JSON string into the corresponding perl data structure.	254	Converts a JSON string into the corresponding perl data structure.
246		255
247	=item $json = cf::to_json $ref	256	=item $json = cf::to_json $ref
248		257
249	Converts a perl data structure into its JSON representation.	258	Converts a perl data structure into its JSON representation.
		259
		260	=cut
		261
		262	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
		263
		264	sub to_json ($) { $json_coder->encode ($_[0]) }
		265	sub from_json ($) { $json_coder->decode ($_[0]) }
250		266
251	=item cf::lock_wait $string	267	=item cf::lock_wait $string
252		268
253	Wait until the given lock is available. See cf::lock_acquire.	269	Wait until the given lock is available. See cf::lock_acquire.
254		270
…		…
257	Wait until the given lock is available and then acquires it and returns	273	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,	274	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	275	for example when the coroutine gets canceled), the lock is automatically
260	returned.	276	returned.
261		277
		278	Locks are *not* recursive, locking from the same coro twice results in a
		279	deadlocked coro.
		280
262	Lock names should begin with a unique identifier (for example, cf::map::find	281	Lock names should begin with a unique identifier (for example, cf::map::find
263	uses map_find and cf::map::load uses map_load).	282	uses map_find and cf::map::load uses map_load).
264		283
265	=item $locked = cf::lock_active $string	284	=item $locked = cf::lock_active $string
266		285
267	Return true if the lock is currently active, i.e. somebody has locked it.	286	Return true if the lock is currently active, i.e. somebody has locked it.
268		287
269	=cut	288	=cut
270		289
271	our %LOCK;	290	our %LOCK;
		291	our %LOCKER;#d#
272		292
273	sub lock_wait($) {	293	sub lock_wait($) {
274	my ($key) = @_;	294	my ($key) = @_;
		295
		296	if ($LOCKER{$key} == $Coro::current) {#d#
		297	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		298	return;#d#
		299	}#d#
275		300
276	# wait for lock, if any	301	# wait for lock, if any
277	while ($LOCK{$key}) {	302	while ($LOCK{$key}) {
278	push @{ $LOCK{$key} }, $Coro::current;	303	push @{ $LOCK{$key} }, $Coro::current;
279	Coro::schedule;	304	Coro::schedule;
…		…
285		310
286	# wait, to be sure we are not locked	311	# wait, to be sure we are not locked
287	lock_wait $key;	312	lock_wait $key;
288		313
289	$LOCK{$key} = [];	314	$LOCK{$key} = [];
		315	$LOCKER{$key} = $Coro::current;#d#
290		316
291	Coro::guard {	317	Coro::guard {
		318	delete $LOCKER{$key};#d#
292	# wake up all waiters, to be on the safe side	319	# wake up all waiters, to be on the safe side
293	$_->ready for @{ delete $LOCK{$key} };	320	$_->ready for @{ delete $LOCK{$key} };
294	}	321	}
295	}	322	}
296		323
…		…
306	my $guard = Coro::guard {	333	my $guard = Coro::guard {
307	$TICK_WATCHER->start;	334	$TICK_WATCHER->start;
308	};	335	};
309	$TICK_WATCHER->stop;	336	$TICK_WATCHER->stop;
310	$guard	337	$guard
		338	}
		339
		340	=item cf::get_slot $time[, $priority[, $name]]
		341
		342	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		343	This call blocks and returns only when you have at least C<$time> seconds
		344	of cpu time till the next tick. The slot is only valid till the next cede.
		345
		346	The optional C<$name> can be used to identify the job to run. It might be
		347	used for statistical purposes and should identify the same time-class.
		348
		349	Useful for short background jobs.
		350
		351	=cut
		352
		353	our @SLOT_QUEUE;
		354	our $SLOT_QUEUE;
		355
		356	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		357	$SLOT_QUEUE = Coro::async {
		358	my $signal = new Coro::Signal;
		359
		360	while () {
		361	next_job:
		362	my $avail = cf::till_tick;
		363	if ($avail > 0.01) {
		364	for (0 .. $#SLOT_QUEUE) {
		365	if ($SLOT_QUEUE[$_][0] < $avail) {
		366	my $job = splice @SLOT_QUEUE, $_, 1, ();
		367	$job->[2]->send;
		368	Coro::cede;
		369	goto next_job;
		370	}
		371	}
		372	}
		373
		374	if (@SLOT_QUEUE) {
		375	# we do not use wait_For_tick() as it returns immediately when tick is inactive
		376	push @cf::WAIT_FOR_TICK, $signal;
		377	$signal->wait;
		378	} else {
		379	Coro::schedule;
		380	}
		381	}
		382	};
		383
		384	sub get_slot($;$$) {
		385	my ($time, $pri, $name) = @_;
		386
		387	$time = $TICK * .6 if $time > $TICK * .6;
		388	my $sig = new Coro::Signal;
		389
		390	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		391	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		392	$SLOT_QUEUE->ready;
		393	$sig->wait;
311	}	394	}
312		395
313	=item cf::async { BLOCK }	396	=item cf::async { BLOCK }
314		397
315	Currently the same as Coro::async_pool, meaning you cannot use	398	Currently the same as Coro::async_pool, meaning you cannot use
…		…
405	=cut	488	=cut
406		489
407	sub fork_call(&@) {	490	sub fork_call(&@) {
408	my ($cb, @args) = @_;	491	my ($cb, @args) = @_;
409		492
410	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	493	# we seemingly have to make a local copy of the whole thing,
411	# or die "socketpair: $!";	494	# otherwise perl prematurely frees the stuff :/
412	pipe my $fh1, my $fh2	495	# TODO: investigate and fix (likely this will be rather laborious)
413	or die "pipe: $!";
414		496
415	if (my $pid = fork) {	497	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;	498	reset_signals;
428	local $SIG{__WARN__};	499	&$cb
429	local $SIG{__DIE__};	500	}, @args;
430	eval {
431	close $fh1;
432		501
433	my @res = eval { $cb->(@args) };	502	wantarray ? @res : $res[-1]
434	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
435	};
436
437	warn $@ if $@;
438	_exit 0;
439	}
440	}	503	}
441		504
442	=item $value = cf::db_get $family => $key	505	=item $value = cf::db_get $family => $key
443		506
444	Returns a single value from the environment database.	507	Returns a single value from the environment database.
…		…
446	=item cf::db_put $family => $key => $value	509	=item cf::db_put $family => $key => $value
447		510
448	Stores the given C<$value> in the family. It can currently store binary	511	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).	512	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
450		513
		514	=item $db = cf::db_table "name"
		515
		516	Create and/or open a new database table. The string must not be "db" and must be unique
		517	within each server.
		518
451	=cut	519	=cut
		520
		521	sub db_table($) {
		522	my ($name) = @_;
		523	my $db = BDB::db_create $DB_ENV;
		524
		525	eval {
		526	$db->set_flags (BDB::CHKSUM);
		527
		528	utf8::encode $name;
		529	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		530	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		531	cf::cleanup "db_open(db): $!" if $!;
		532	};
		533	cf::cleanup "db_open(db): $@" if $@;
		534
		535	$db
		536	}
452		537
453	our $DB;	538	our $DB;
454		539
455	sub db_init {	540	sub db_init {
456	unless ($DB) {
457	$DB = BDB::db_create $DB_ENV;
458
459	cf::sync_job {	541	cf::sync_job {
460	eval {	542	$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	}	543	};
470	}	544	}
471		545
472	sub db_get($$) {	546	sub db_get($$) {
473	my $key = "$_[0]/$_[1]";	547	my $key = "$_[0]/$_[1]";
474		548
…		…
524	if (1) {	598	if (1) {
525	$md5 =	599	$md5 =
526	join "\x00",	600	join "\x00",
527	$processversion,	601	$processversion,
528	map {	602	map {
529	Coro::cede;	603	cf::cede_to_tick;
530	($src->[$_], Digest::MD5::md5_hex $data[$_])	604	($src->[$_], Digest::MD5::md5_hex $data[$_])
531	} 0.. $#$src;	605	} 0.. $#$src;
532		606
533		607
534	my $dbmd5 = db_get cache => "$id/md5";	608	my $dbmd5 = db_get cache => "$id/md5";
…		…
840	";	914	";
841	die if $@;	915	die if $@;
842	}	916	}
843		917
844	our $override;	918	our $override;
845	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	919	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846		920
847	sub override {	921	sub override {
848	$override = 1;	922	$override = 1;
849	@invoke_results = ();	923	@INVOKE_RESULTS = (@_);
850	}	924	}
851		925
852	sub do_invoke {	926	sub do_invoke {
853	my $event = shift;	927	my $event = shift;
854	my $callbacks = shift;	928	my $callbacks = shift;
855		929
856	@invoke_results = ();	930	@INVOKE_RESULTS = ();
857		931
858	local $override;	932	local $override;
859		933
860	for (@$callbacks) {	934	for (@$callbacks) {
861	eval { &{$_->[1]} };	935	eval { &{$_->[1]} };
…		…
878		952
879	Generate an object-specific event with the given arguments.	953	Generate an object-specific event with the given arguments.
880		954
881	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	955	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	956	removed in future versions), and there is no public API to access override
883	results (if you must, access C<@cf::invoke_results> directly).	957	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884		958
885	=back	959	=back
886		960
887	=cut	961	=cut
888		962
889	#############################################################################	963	#############################################################################
890	# object support	964	# object support
		965	#
		966
		967	sub _can_merge {
		968	my ($ob1, $ob2) = @_;
		969
		970	local $Storable::canonical = 1;
		971	my $fob1 = Storable::freeze $ob1;
		972	my $fob2 = Storable::freeze $ob2;
		973
		974	$fob1 eq $fob2
		975	}
891		976
892	sub reattach {	977	sub reattach {
893	# basically do the same as instantiate, without calling instantiate	978	# basically do the same as instantiate, without calling instantiate
894	my ($obj) = @_;	979	my ($obj) = @_;
895		980
…		…
940	);	1025	);
941		1026
942	sub object_freezer_save {	1027	sub object_freezer_save {
943	my ($filename, $rdata, $objs) = @_;	1028	my ($filename, $rdata, $objs) = @_;
944		1029
		1030	my $guard = cf::lock_acquire "io";
		1031
945	sync_job {	1032	sync_job {
946	if (length $$rdata) {	1033	if (length $$rdata) {
		1034	utf8::decode (my $decname = $filename);
947	warn sprintf "saving %s (%d,%d)\n",	1035	warn sprintf "saving %s (%d,%d)\n",
948	$filename, length $$rdata, scalar @$objs;	1036	$decname, length $$rdata, scalar @$objs;
949		1037
950	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1038	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951	chmod SAVE_MODE, $fh;	1039	chmod SAVE_MODE, $fh;
952	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1040	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953	aio_fsync $fh if $cf::USE_FSYNC;	1041	aio_fsync $fh if $cf::USE_FSYNC;
…		…
972	}	1060	}
973	} else {	1061	} else {
974	aio_unlink $filename;	1062	aio_unlink $filename;
975	aio_unlink "$filename.pst";	1063	aio_unlink "$filename.pst";
976	}	1064	}
977	}	1065	};
		1066
		1067	undef $guard;
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
…		…
987		1077
988	sub object_thawer_load {	1078	sub object_thawer_load {
989	my ($filename) = @_;	1079	my ($filename) = @_;
990		1080
991	my ($data, $av);	1081	my ($data, $av);
		1082
		1083	my $guard = cf::lock_acquire "io";
992		1084
993	(aio_load $filename, $data) >= 0	1085	(aio_load $filename, $data) >= 0
994	or return;	1086	or return;
995		1087
996	unless (aio_stat "$filename.pst") {	1088	unless (aio_stat "$filename.pst") {
997	(aio_load "$filename.pst", $av) >= 0	1089	(aio_load "$filename.pst", $av) >= 0
998	or return;	1090	or return;
		1091
		1092	undef $guard;
999	$av = eval { (Storable::thaw $av)->{objs} };	1093	$av = eval { (Storable::thaw $av)->{objs} };
1000	}	1094	}
1001		1095
		1096	utf8::decode (my $decname = $filename);
1002	warn sprintf "loading %s (%d)\n",	1097	warn sprintf "loading %s (%d,%d)\n",
1003	$filename, length $data, scalar @{$av || []};	1098	$decname, length $data, scalar @{$av || []};
		1099
1004	return ($data, $av);	1100	($data, $av)
1005	}	1101	}
1006		1102
1007	=head2 COMMAND CALLBACKS	1103	=head2 COMMAND CALLBACKS
1008		1104
1009	=over 4	1105	=over 4
…		…
1029	push @{ $COMMAND{$name} }, [$caller, $cb];	1125	push @{ $COMMAND{$name} }, [$caller, $cb];
1030	}	1126	}
1031		1127
1032	=item cf::register_extcmd $name => \&callback($pl,$packet);	1128	=item cf::register_extcmd $name => \&callback($pl,$packet);
1033		1129
1034	Register a callback fro execution when the client sends an extcmd packet.	1130	Register a callback for execution when the client sends an (synchronous)
		1131	extcmd packet. Ext commands will be processed in the order they are
		1132	received by the server, like other user commands. The first argument is
		1133	the logged-in player. Ext commands can only be processed after a player
		1134	has logged in successfully.
1035		1135
1036	If the callback returns something, it is sent back as if reply was being	1136	If the callback returns something, it is sent back as if reply was being
1037	called.	1137	called.
1038		1138
		1139	=item cf::register_exticmd $name => \&callback($ns,$packet);
		1140
		1141	Register a callback for execution when the client sends an (asynchronous)
		1142	exticmd packet. Exti commands are processed by the server as soon as they
		1143	are received, i.e. out of order w.r.t. other commands. The first argument
		1144	is a client socket. Exti commands can be received anytime, even before
		1145	log-in.
		1146
		1147	If the callback returns something, it is sent back as if reply was being
		1148	called.
		1149
1039	=cut	1150	=cut
1040		1151
1041	sub register_extcmd {	1152	sub register_extcmd {
1042	my ($name, $cb) = @_;	1153	my ($name, $cb) = @_;
1043		1154
1044	$EXTCMD{$name} = $cb;	1155	$EXTCMD{$name} = $cb;
		1156	}
		1157
		1158	sub register_exticmd {
		1159	my ($name, $cb) = @_;
		1160
		1161	$EXTICMD{$name} = $cb;
1045	}	1162	}
1046		1163
1047	cf::player->attach (	1164	cf::player->attach (
1048	on_command => sub {	1165	on_command => sub {
1049	my ($pl, $name, $params) = @_;	1166	my ($pl, $name, $params) = @_;
…		…
1058	cf::override;	1175	cf::override;
1059	},	1176	},
1060	on_extcmd => sub {	1177	on_extcmd => sub {
1061	my ($pl, $buf) = @_;	1178	my ($pl, $buf) = @_;
1062		1179
1063	my $msg = eval { from_json $buf };	1180	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064		1181
1065	if (ref $msg) {	1182	if (ref $msg) {
		1183	my ($type, $reply, @payload) =
		1184	"ARRAY" eq ref $msg
		1185	? @$msg
		1186	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1187
		1188	my @reply;
		1189
1066	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1190	if (my $cb = $EXTCMD{$type}) {
1067	if (my %reply = $cb->($pl, $msg)) {	1191	@reply = $cb->($pl, @payload);
1068	$pl->ext_reply ($msg->{msgid}, %reply);
1069	}
1070	}	1192	}
		1193
		1194	$pl->ext_reply ($reply, @reply)
		1195	if $reply;
		1196
1071	} else {	1197	} else {
1072	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1198	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073	}	1199	}
1074		1200
1075	cf::override;	1201	cf::override;
…		…
1165		1291
1166	=head3 cf::player	1292	=head3 cf::player
1167		1293
1168	=over 4	1294	=over 4
1169		1295
		1296	=item cf::player::num_playing
		1297
		1298	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1299
		1300	=cut
		1301
		1302	sub num_playing {
		1303	scalar grep
		1304	$_->ob->map
		1305	&& !$_->hidden
		1306	&& !$_->ob->flag (cf::FLAG_WIZ),
		1307	cf::player::list
		1308	}
		1309
1170	=item cf::player::find $login	1310	=item cf::player::find $login
1171		1311
1172	Returns the given player object, loading it if necessary (might block).	1312	Returns the given player object, loading it if necessary (might block).
1173		1313
1174	=cut	1314	=cut
…		…
1209	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1349	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1350	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1351	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212	aio_unlink +(playerdir $login) . "/$login.pl";	1352	aio_unlink +(playerdir $login) . "/$login.pl";
1213		1353
1214	my $pl = load_pl path $login	1354	my $f = new_from_file cf::object::thawer path $login
1215	or return;	1355	or return;
		1356
		1357	$f->next;
		1358	my $pl = cf::player::load_pl $f
		1359	or return;
		1360	local $cf::PLAYER_LOADING{$login} = $pl;
		1361	$f->resolve_delayed_derefs;
1216	$cf::PLAYER{$login} = $pl	1362	$cf::PLAYER{$login} = $pl
1217	}	1363	}
1218	}	1364	}
1219	}	1365	}
1220		1366
…		…
1230		1376
1231	aio_mkdir playerdir $pl, 0770;	1377	aio_mkdir playerdir $pl, 0770;
1232	$pl->{last_save} = $cf::RUNTIME;	1378	$pl->{last_save} = $cf::RUNTIME;
1233		1379
1234	$pl->save_pl ($path);	1380	$pl->save_pl ($path);
1235	Coro::cede;	1381	cf::cede_to_tick;
1236	}	1382	}
1237		1383
1238	sub new($) {	1384	sub new($) {
1239	my ($login) = @_;	1385	my ($login) = @_;
1240		1386
…		…
1244	$self->{deny_save} = 1;	1390	$self->{deny_save} = 1;
1245		1391
1246	$cf::PLAYER{$login} = $self;	1392	$cf::PLAYER{$login} = $self;
1247		1393
1248	$self	1394	$self
		1395	}
		1396
		1397	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1398
		1399	=cut
		1400
		1401	sub send_msg {
		1402	my $ns = shift->ns
		1403	or return;
		1404	$ns->send_msg (@_);
1249	}	1405	}
1250		1406
1251	=item $pl->quit_character	1407	=item $pl->quit_character
1252		1408
1253	Nukes the player without looking back. If logged in, the connection will	1409	Nukes the player without looking back. If logged in, the connection will
…		…
1308	or return [];	1464	or return [];
1309		1465
1310	my @logins;	1466	my @logins;
1311		1467
1312	for my $login (@$dirs) {	1468	for my $login (@$dirs) {
		1469	my $path = path $login;
		1470
		1471	# a .pst is a dead give-away for a valid player
		1472	unless (-e "$path.pst") {
1313	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1473	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314	aio_read $fh, 0, 512, my $buf, 0 or next;	1474	aio_read $fh, 0, 512, my $buf, 0 or next;
1315	$buf !~ /^password -------------$/m or next; # official not-valid tag	1475	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1476	}
1316		1477
1317	utf8::decode $login;	1478	utf8::decode $login;
1318	push @logins, $login;	1479	push @logins, $login;
1319	}	1480	}
1320		1481
…		…
1358	sub expand_cfpod {	1519	sub expand_cfpod {
1359	((my $self), (local $_)) = @_;	1520	((my $self), (local $_)) = @_;
1360		1521
1361	# escape & and <	1522	# escape & and <
1362	s/&/&amp;/g;	1523	s/&/&amp;/g;
1363	s/(?<![BIUGH])</&lt;/g;	1524	s/(?<![BIUGHT])</&lt;/g;
1364		1525
1365	# this is buggy, it needs to properly take care of nested <'s	1526	# this is buggy, it needs to properly take care of nested <'s
1366		1527
1367	1 while	1528	1 while
1368	# replace B<>, I<>, U<> etc.	1529	# replace B<>, I<>, U<> etc.
1369	s/B<([^\>]*)>/<b>$1<\/b>/	1530	s/B<([^\>]*)>/<b>$1<\/b>/
1370	|| s/I<([^\>]*)>/<i>$1<\/i>/	1531	|| s/I<([^\>]*)>/<i>$1<\/i>/
1371	|| s/U<([^\>]*)>/<u>$1<\/u>/	1532	|| s/U<([^\>]*)>/<u>$1<\/u>/
		1533	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1372	# replace G<male|female> tags	1534	# replace G<male|female> tags
1373	|| s{G<([^>|]*)\|([^>]*)>}{	1535	|| s{G<([^>|]*)\|([^>]*)>}{
1374	$self->gender ? $2 : $1	1536	$self->gender ? $2 : $1
1375	}ge	1537	}ge
1376	# replace H<hint text>	1538	# replace H<hint text>
1377	|| s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;	1539	|| s{H<([^\>]*)>}
		1540	{
		1541	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1542	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1543	"")
		1544	[$self->{hintmode}]
		1545	}ge;
1378		1546
1379	# create single paragraphs (very hackish)	1547	# create single paragraphs (very hackish)
1380	s/(?<=\S)\n(?=\w)/ /g;	1548	s/(?<=\S)\n(?=\w)/ /g;
1381		1549
		1550	# compress some whitespace
		1551	s/\s+\n/\n/g; # ws line-ends
		1552	s/\n\n+/\n/g; # double lines
		1553	s/^\n+//; # beginning lines
		1554	s/\n+$//; # ending lines
		1555
1382	$_	1556	$_
1383	}	1557	}
1384		1558
		1559	sub hintmode {
		1560	$_[0]{hintmode} = $_[1] if @_ > 1;
		1561	$_[0]{hintmode}
		1562	}
		1563
1385	=item $player->ext_reply ($msgid, %msg)	1564	=item $player->ext_reply ($msgid, @msg)
1386		1565
1387	Sends an ext reply to the player.	1566	Sends an ext reply to the player.
1388		1567
1389	=cut	1568	=cut
1390		1569
1391	sub ext_reply($$%) {	1570	sub ext_reply($$@) {
1392	my ($self, $id, %msg) = @_;	1571	my ($self, $id, @msg) = @_;
1393		1572
1394	$msg{msgid} = $id;	1573	$self->ns->ext_reply ($id, @msg)
1395
1396	$self->send ("ext " . cf::to_json \%msg);
1397	}	1574	}
1398		1575
1399	=item $player->ext_event ($type, %msg)	1576	=item $player->ext_msg ($type, @msg)
1400		1577
1401	Sends an ext event to the client.	1578	Sends an ext event to the client.
1402		1579
1403	=cut	1580	=cut
1404		1581
1405	sub ext_event($$%) {	1582	sub ext_msg($$@) {
1406	my ($self, $type, %msg) = @_;	1583	my ($self, $type, @msg) = @_;
1407		1584
1408	$self->ns->ext_event ($type, %msg);	1585	$self->ns->ext_msg ($type, @msg);
1409	}	1586	}
1410		1587
1411	=head3 cf::region	1588	=head3 cf::region
1412		1589
1413	=over 4	1590	=over 4
…		…
1426	my ($path) = @_;	1603	my ($path) = @_;
1427		1604
1428	my ($match, $specificity);	1605	my ($match, $specificity);
1429		1606
1430	for my $region (list) {	1607	for my $region (list) {
1431	if ($region->match && $path =~ $region->match) {	1608	if ($region->{match} && $path =~ $region->{match}) {
1432	($match, $specificity) = ($region, $region->specificity)	1609	($match, $specificity) = ($region, $region->specificity)
1433	if $region->specificity > $specificity;	1610	if $region->specificity > $specificity;
1434	}	1611	}
1435	}	1612	}
1436		1613
…		…
1556	$self->init; # pass $1 etc.	1733	$self->init; # pass $1 etc.
1557	return $self;	1734	return $self;
1558	}	1735	}
1559	}	1736	}
1560		1737
1561	Carp::carp "unable to resolve path '$path' (base '$base').";	1738	Carp::cluck "unable to resolve path '$path' (base '$base').";
1562	()	1739	()
1563	}	1740	}
1564		1741
1565	sub init {	1742	sub init {
1566	my ($self) = @_;	1743	my ($self) = @_;
…		…
1629		1806
1630	sub load_header_from($) {	1807	sub load_header_from($) {
1631	my ($self, $path) = @_;	1808	my ($self, $path) = @_;
1632		1809
1633	utf8::encode $path;	1810	utf8::encode $path;
1634	#aio_open $path, O_RDONLY, 0	1811	my $f = new_from_file cf::object::thawer $path
1635	# or return;
1636
1637	$self->_load_header ($path)
1638	or return;	1812	or return;
		1813
		1814	$self->_load_header ($f)
		1815	or return;
		1816
		1817	local $MAP_LOADING{$self->{path}} = $self;
		1818	$f->resolve_delayed_derefs;
1639		1819
1640	$self->{load_path} = $path;	1820	$self->{load_path} = $path;
1641		1821
1642	1	1822	1
1643	}	1823	}
…		…
1697	sub find {	1877	sub find {
1698	my ($path, $origin) = @_;	1878	my ($path, $origin) = @_;
1699		1879
1700	$path = normalise $path, $origin && $origin->path;	1880	$path = normalise $path, $origin && $origin->path;
1701		1881
		1882	cf::lock_wait "map_data:$path";#d#remove
1702	cf::lock_wait "map_find:$path";	1883	cf::lock_wait "map_find:$path";
1703		1884
1704	$cf::MAP{$path} || do {	1885	$cf::MAP{$path} || do {
1705	my $guard = cf::lock_acquire "map_find:$path";	1886	my $guard1 = cf::lock_acquire "map_find:$path";
		1887	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1888
1706	my $map = new_from_path cf::map $path	1889	my $map = new_from_path cf::map $path
1707	or return;	1890	or return;
1708		1891
1709	$map->{last_save} = $cf::RUNTIME;	1892	$map->{last_save} = $cf::RUNTIME;
1710		1893
…		…
1712	or return;	1895	or return;
1713		1896
1714	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1897	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1715	# doing this can freeze the server in a sync job, obviously	1898	# doing this can freeze the server in a sync job, obviously
1716	#$cf::WAIT_FOR_TICK->wait;	1899	#$cf::WAIT_FOR_TICK->wait;
		1900	undef $guard1;
		1901	undef $guard2;
1717	$map->reset;	1902	$map->reset;
1718	undef $guard;
1719	return find $path;	1903	return find $path;
1720	}	1904	}
1721		1905
1722	$cf::MAP{$path} = $map	1906	$cf::MAP{$path} = $map
1723	}	1907	}
…		…
1732	local $self->{deny_reset} = 1; # loading can take a long time	1916	local $self->{deny_reset} = 1; # loading can take a long time
1733		1917
1734	my $path = $self->{path};	1918	my $path = $self->{path};
1735		1919
1736	{	1920	{
1737	my $guard = cf::lock_acquire "map_load:$path";	1921	my $guard = cf::lock_acquire "map_data:$path";
1738		1922
		1923	return unless $self->valid;
1739	return if $self->in_memory != cf::MAP_SWAPPED;	1924	return unless $self->in_memory == cf::MAP_SWAPPED;
1740		1925
1741	$self->in_memory (cf::MAP_LOADING);	1926	$self->in_memory (cf::MAP_LOADING);
1742		1927
1743	$self->alloc;	1928	$self->alloc;
1744		1929
1745	$self->pre_load;	1930	$self->pre_load;
1746	Coro::cede;	1931	cf::cede_to_tick;
1747		1932
		1933	my $f = new_from_file cf::object::thawer $self->{load_path};
		1934	$f->skip_block;
1748	$self->_load_objects ($self->{load_path}, 1)	1935	$self->_load_objects ($f)
1749	or return;	1936	or return;
1750		1937
1751	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1938	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1752	if delete $self->{load_original};	1939	if delete $self->{load_original};
1753		1940
1754	if (my $uniq = $self->uniq_path) {	1941	if (my $uniq = $self->uniq_path) {
1755	utf8::encode $uniq;	1942	utf8::encode $uniq;
1756	if (aio_open $uniq, O_RDONLY, 0) {	1943	unless (aio_stat $uniq) {
		1944	if (my $f = new_from_file cf::object::thawer $uniq) {
1757	$self->clear_unique_items;	1945	$self->clear_unique_items;
1758	$self->_load_objects ($uniq, 0);	1946	$self->_load_objects ($f);
		1947	$f->resolve_delayed_derefs;
		1948	}
1759	}	1949	}
1760	}	1950	}
1761		1951
1762	Coro::cede;	1952	$f->resolve_delayed_derefs;
		1953
		1954	cf::cede_to_tick;
1763	# now do the right thing for maps	1955	# now do the right thing for maps
1764	$self->link_multipart_objects;	1956	$self->link_multipart_objects;
1765	$self->difficulty ($self->estimate_difficulty)	1957	$self->difficulty ($self->estimate_difficulty)
1766	unless $self->difficulty;	1958	unless $self->difficulty;
1767	Coro::cede;	1959	cf::cede_to_tick;
1768		1960
1769	unless ($self->{deny_activate}) {	1961	unless ($self->{deny_activate}) {
1770	$self->decay_objects;	1962	$self->decay_objects;
1771	$self->fix_auto_apply;	1963	$self->fix_auto_apply;
1772	$self->update_buttons;	1964	$self->update_buttons;
1773	Coro::cede;	1965	cf::cede_to_tick;
1774	$self->set_darkness_map;	1966	$self->set_darkness_map;
1775	Coro::cede;	1967	cf::cede_to_tick;
1776	$self->activate;	1968	$self->activate;
1777	}	1969	}
		1970
		1971	$self->{last_save} = $cf::RUNTIME;
		1972	$self->last_access ($cf::RUNTIME);
1778		1973
1779	$self->in_memory (cf::MAP_IN_MEMORY);	1974	$self->in_memory (cf::MAP_IN_MEMORY);
1780	}	1975	}
1781		1976
1782	$self->post_load;	1977	$self->post_load;
…		…
1793		1988
1794	$self	1989	$self
1795	}	1990	}
1796		1991
1797	# find and load all maps in the 3x3 area around a map	1992	# find and load all maps in the 3x3 area around a map
1798	sub load_diag {	1993	sub load_neighbours {
1799	my ($map) = @_;	1994	my ($map) = @_;
1800		1995
1801	my @diag; # diagonal neighbours	1996	my @neigh; # diagonal neighbours
1802		1997
1803	for (0 .. 3) {	1998	for (0 .. 3) {
1804	my $neigh = $map->tile_path ($_)	1999	my $neigh = $map->tile_path ($_)
1805	or next;	2000	or next;
1806	$neigh = find $neigh, $map	2001	$neigh = find $neigh, $map
1807	or next;	2002	or next;
1808	$neigh->load;	2003	$neigh->load;
1809		2004
		2005	push @neigh,
1810	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2006	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1811	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2007	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1812	}	2008	}
1813		2009
1814	for (@diag) {	2010	for (grep defined $_->[0], @neigh) {
		2011	my ($path, $origin) = @$_;
1815	my $neigh = find @$_	2012	my $neigh = find $path, $origin
1816	or next;	2013	or next;
1817	$neigh->load;	2014	$neigh->load;
1818	}	2015	}
1819	}	2016	}
1820		2017
…		…
1825	}	2022	}
1826		2023
1827	sub do_load_sync {	2024	sub do_load_sync {
1828	my ($map) = @_;	2025	my ($map) = @_;
1829		2026
		2027	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2028	if $Coro::current == $Coro::main;
		2029
1830	cf::sync_job { $map->load };	2030	cf::sync_job { $map->load };
1831	}	2031	}
1832		2032
1833	our %MAP_PREFETCH;	2033	our %MAP_PREFETCH;
1834	our $MAP_PREFETCHER = undef;	2034	our $MAP_PREFETCHER = undef;
1835		2035
1836	sub find_async {	2036	sub find_async {
1837	my ($path, $origin) = @_;	2037	my ($path, $origin, $load) = @_;
1838		2038
1839	$path = normalise $path, $origin && $origin->{path};	2039	$path = normalise $path, $origin && $origin->{path};
1840		2040
1841	if (my $map = $cf::MAP{$path}) {	2041	if (my $map = $cf::MAP{$path}) {
1842	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2042	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1843	}	2043	}
1844		2044
1845	undef $MAP_PREFETCH{$path};	2045	$MAP_PREFETCH{$path} |= $load;
		2046
1846	$MAP_PREFETCHER ||= cf::async {	2047	$MAP_PREFETCHER ||= cf::async {
1847	while (%MAP_PREFETCH) {	2048	while (%MAP_PREFETCH) {
1848	for my $path (keys %MAP_PREFETCH) {	2049	while (my ($k, $v) = each %MAP_PREFETCH) {
1849	my $map = find $path	2050	if (my $map = find $k) {
1850	or next;
1851	$map->load;	2051	$map->load if $v;
		2052	}
1852		2053
1853	delete $MAP_PREFETCH{$path};	2054	delete $MAP_PREFETCH{$k};
1854	}	2055	}
1855	}	2056	}
1856	undef $MAP_PREFETCHER;	2057	undef $MAP_PREFETCHER;
1857	};	2058	};
1858	$MAP_PREFETCHER->prio (6);	2059	$MAP_PREFETCHER->prio (6);
…		…
1861	}	2062	}
1862		2063
1863	sub save {	2064	sub save {
1864	my ($self) = @_;	2065	my ($self) = @_;
1865		2066
1866	my $lock = cf::lock_acquire "map_data:" . $self->path;	2067	my $lock = cf::lock_acquire "map_data:$self->{path}";
1867		2068
1868	$self->{last_save} = $cf::RUNTIME;	2069	$self->{last_save} = $cf::RUNTIME;
1869		2070
1870	return unless $self->dirty;	2071	return unless $self->dirty;
1871		2072
…		…
1894	my ($self) = @_;	2095	my ($self) = @_;
1895		2096
1896	# save first because save cedes	2097	# save first because save cedes
1897	$self->save;	2098	$self->save;
1898		2099
1899	my $lock = cf::lock_acquire "map_data:" . $self->path;	2100	my $lock = cf::lock_acquire "map_data:$self->{path}";
1900		2101
1901	return if $self->players;	2102	return if $self->players;
1902	return if $self->in_memory != cf::MAP_IN_MEMORY;	2103	return if $self->in_memory != cf::MAP_IN_MEMORY;
1903	return if $self->{deny_save};	2104	return if $self->{deny_save};
1904		2105
		2106	$self->in_memory (cf::MAP_SWAPPED);
		2107
		2108	$self->deactivate;
		2109	$_->clear_links_to ($self) for values %cf::MAP;
1905	$self->clear;	2110	$self->clear;
1906	$self->in_memory (cf::MAP_SWAPPED);
1907	}	2111	}
1908		2112
1909	sub reset_at {	2113	sub reset_at {
1910	my ($self) = @_;	2114	my ($self) = @_;
1911		2115
…		…
1943	if $uniq;	2147	if $uniq;
1944	}	2148	}
1945		2149
1946	delete $cf::MAP{$self->path};	2150	delete $cf::MAP{$self->path};
1947		2151
		2152	$self->deactivate;
		2153	$_->clear_links_to ($self) for values %cf::MAP;
1948	$self->clear;	2154	$self->clear;
1949
1950	$_->clear_links_to ($self) for values %cf::MAP;
1951		2155
1952	$self->unlink_save;	2156	$self->unlink_save;
1953	$self->destroy;	2157	$self->destroy;
1954	}	2158	}
1955		2159
1956	my $nuke_counter = "aaaa";	2160	my $nuke_counter = "aaaa";
1957		2161
1958	sub nuke {	2162	sub nuke {
1959	my ($self) = @_;	2163	my ($self) = @_;
1960		2164
		2165	{
		2166	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2167
1961	delete $cf::MAP{$self->path};	2168	delete $cf::MAP{$self->path};
1962		2169
1963	$self->unlink_save;	2170	$self->unlink_save;
1964		2171
1965	bless $self, "cf::map";	2172	bless $self, "cf::map";
1966	delete $self->{deny_reset};	2173	delete $self->{deny_reset};
1967	$self->{deny_save} = 1;	2174	$self->{deny_save} = 1;
1968	$self->reset_timeout (1);	2175	$self->reset_timeout (1);
1969	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2176	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1970		2177
1971	$cf::MAP{$self->path} = $self;	2178	$cf::MAP{$self->path} = $self;
		2179	}
1972		2180
1973	$self->reset; # polite request, might not happen	2181	$self->reset; # polite request, might not happen
1974	}	2182	}
1975		2183
1976	=item $maps = cf::map::tmp_maps	2184	=item $maps = cf::map::tmp_maps
…		…
2052		2260
2053	sub inv_recursive {	2261	sub inv_recursive {
2054	inv_recursive_ inv $_[0]	2262	inv_recursive_ inv $_[0]
2055	}	2263	}
2056		2264
		2265	=item $ref = $ob->ref
		2266
		2267	creates and returns a persistent reference to an objetc that can be stored as a string.
		2268
		2269	=item $ob = cf::object::deref ($refstring)
		2270
		2271	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2272	even if the object actually exists. May block.
		2273
		2274	=cut
		2275
		2276	sub deref {
		2277	my ($ref) = @_;
		2278
		2279	# temporary compatibility#TODO#remove
		2280	$ref =~ s{^<}{player/<};
		2281
		2282	if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
		2283	my ($uuid, $name) = ($1, $2);
		2284	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2285	or return;
		2286	$pl->ob->uuid eq $uuid
		2287	or return;
		2288
		2289	$pl->ob
		2290	} else {
		2291	warn "$ref: cannot resolve object reference\n";
		2292	undef
		2293	}
		2294	}
		2295
2057	package cf;	2296	package cf;
2058		2297
2059	=back	2298	=back
2060		2299
2061	=head3 cf::object::player	2300	=head3 cf::object::player
…		…
2083		2322
2084	} else {	2323	} else {
2085	my $pl = $self->contr;	2324	my $pl = $self->contr;
2086		2325
2087	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2326	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2088	my $diag = $pl->{npc_dialog};	2327	my $dialog = $pl->{npc_dialog};
2089	$diag->{pl}->ext_reply (	2328	$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		2329
2096	} else {	2330	} else {
2097	$msg = $npc->name . " says: $msg" if $npc;	2331	$msg = $npc->name . " says: $msg" if $npc;
2098	$self->message ($msg, $flags);	2332	$self->message ($msg, $flags);
2099	}	2333	}
2100	}	2334	}
		2335	}
		2336
		2337	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2338
		2339	=cut
		2340
		2341	sub cf::object::send_msg {
		2342	my $pl = shift->contr
		2343	or return;
		2344	$pl->send_msg (@_);
2101	}	2345	}
2102		2346
2103	=item $player_object->may ("access")	2347	=item $player_object->may ("access")
2104		2348
2105	Returns wether the given player is authorized to access resource "access"	2349	Returns wether the given player is authorized to access resource "access"
…		…
2184	# use -1 or undef as default coordinates, not 0, 0	2428	# use -1 or undef as default coordinates, not 0, 0
2185	($x, $y) = ($map->enter_x, $map->enter_y)	2429	($x, $y) = ($map->enter_x, $map->enter_y)
2186	if $x <=0 && $y <= 0;	2430	if $x <=0 && $y <= 0;
2187		2431
2188	$map->load;	2432	$map->load;
2189	$map->load_diag;	2433	$map->load_neighbours;
2190		2434
2191	return unless $self->contr->active;	2435	return unless $self->contr->active;
2192	$self->activate_recursive;	2436	$self->activate_recursive;
2193		2437
2194	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2438	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2195	$self->enter_map ($map, $x, $y);	2439	$self->enter_map ($map, $x, $y);
2196	}	2440	}
2197		2441
2198	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2442	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2199		2443
2200	Moves the player to the given map-path and coordinates by first freezing	2444	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	2445	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	2446	that has to return the map if sucecssful, and then unfreezes the player on
2203	the new (success) or old (failed) map position.	2447	the new (success) or old (failed) map position. In either case, $done will
		2448	be called at the end of this process.
2204		2449
2205	=cut	2450	=cut
2206		2451
2207	our $GOTOGEN;	2452	our $GOTOGEN;
2208		2453
2209	sub cf::object::player::goto {	2454	sub cf::object::player::goto {
2210	my ($self, $path, $x, $y, $check) = @_;	2455	my ($self, $path, $x, $y, $check, $done) = @_;
2211		2456
2212	# do generation counting so two concurrent goto's will be executed in-order	2457	# do generation counting so two concurrent goto's will be executed in-order
2213	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2458	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2214		2459
2215	$self->enter_link;	2460	$self->enter_link;
2216		2461
2217	(async {	2462	(async {
		2463	# *tag paths override both path and x|y
		2464	if ($path =~ /^\*(.*)$/) {
		2465	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2466	my $ob = $obs[rand @obs];
		2467	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2468	}
		2469	}
		2470
2218	my $map = eval {	2471	my $map = eval {
2219	my $map = cf::map::find $path;	2472	my $map = cf::map::find $path;
2220		2473
2221	if ($map) {	2474	if ($map) {
2222	$map = $map->customise_for ($self);	2475	$map = $map->customise_for ($self);
…		…
2235		2488
2236	if ($gen == $self->{_goto_generation}) {	2489	if ($gen == $self->{_goto_generation}) {
2237	delete $self->{_goto_generation};	2490	delete $self->{_goto_generation};
2238	$self->leave_link ($map, $x, $y);	2491	$self->leave_link ($map, $x, $y);
2239	}	2492	}
		2493
		2494	$done->() if $done;
2240	})->prio (1);	2495	})->prio (1);
2241	}	2496	}
2242		2497
2243	=item $player_object->enter_exit ($exit_object)	2498	=item $player_object->enter_exit ($exit_object)
2244		2499
…		…
2313	my $hp = $exit->stats->hp;	2568	my $hp = $exit->stats->hp;
2314	my $sp = $exit->stats->sp;	2569	my $sp = $exit->stats->sp;
2315		2570
2316	$self->enter_link;	2571	$self->enter_link;
2317		2572
		2573	# if exit is damned, update players death & WoR home-position
		2574	$self->contr->savebed ($slaying, $hp, $sp)
		2575	if $exit->flag (FLAG_DAMNED);
		2576
2318	(async {	2577	(async {
2319	$self->deactivate_recursive; # just to be sure	2578	$self->deactivate_recursive; # just to be sure
2320	unless (eval {	2579	unless (eval {
2321	$self->goto ($slaying, $hp, $sp);	2580	$self->goto ($slaying, $hp, $sp);
2322		2581
…		…
2349		2608
2350	utf8::encode $text;	2609	utf8::encode $text;
2351	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2610	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2352	}	2611	}
2353		2612
2354	=item $client->send_msg ($color, $type, $msg, [extra...])	2613	=item $client->send_msg ($channel, $msg, $color, [extra...])
2355		2614
2356	Send a drawinfo or msg packet to the client, formatting the msg for the	2615	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	2616	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	2617	the message, with C<log> being the default. If C<$color> is negative, suppress
2359	the message unless the client supports the msg packet.	2618	the message unless the client supports the msg packet.
2360		2619
2361	=cut	2620	=cut
2362		2621
		2622	our %CHANNEL = (
		2623	"c/identify" => {
		2624	id => "identify",
		2625	title => "Identify",
		2626	reply => undef,
		2627	tooltip => "Items recently identified",
		2628	},
		2629	"c/examine" => {
		2630	id => "examine",
		2631	title => "Examine",
		2632	reply => undef,
		2633	tooltip => "Signs and other items you examined",
		2634	},
		2635	);
		2636
2363	sub cf::client::send_msg {	2637	sub cf::client::send_msg {
2364	my ($self, $color, $type, $msg, @extra) = @_;	2638	my ($self, $channel, $msg, $color, @extra) = @_;
2365		2639
2366	$msg = $self->pl->expand_cfpod ($msg);	2640	$msg = $self->pl->expand_cfpod ($msg);
2367		2641
		2642	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2643
		2644	# check predefined channels, for the benefit of C
		2645	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};
		2646
		2647	if (ref $channel) {
		2648	# send meta info to client, if not yet sent
		2649	unless (exists $self->{channel}{$channel->{id}}) {
		2650	$self->{channel}{$channel->{id}} = $channel;
		2651	$self->ext_msg (channel_info => $channel)
		2652	if $self->can_msg;
		2653	}
		2654
		2655	$channel = $channel->{id};
		2656	}
		2657
		2658	return unless @extra || length $msg;
		2659
2368	if ($self->can_msg) {	2660	if ($self->can_msg) {
2369	$self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);	2661	# default colour, mask it out
		2662	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2663	if $color & cf::NDI_DEF;
		2664
		2665	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2666	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2370	} else {	2667	} 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]${1}[\/color]/;
2379	}
2380
2381	if ($color >= 0) {	2668	if ($color >= 0) {
		2669	# replace some tags by gcfclient-compatible ones
		2670	for ($msg) {
		2671	1 while
		2672	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2673	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2674	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2675	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2676	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2677	}
		2678
		2679	$color &= cf::NDI_COLOR_MASK;
		2680
		2681	utf8::encode $msg;
		2682
2382	if ($msg =~ /\[/) {	2683	if (0 && $msg =~ /\[/) {
		2684	# COMMAND/INFO
2383	$self->send_packet ("drawextinfo $color 4 0 $msg")	2685	$self->send_packet ("drawextinfo $color 10 8 $msg")
2384	} else {	2686	} else {
		2687	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2385	$self->send_packet ("drawinfo $color $msg")	2688	$self->send_packet ("drawinfo $color $msg")
2386	}	2689	}
2387	}	2690	}
2388	}	2691	}
2389	}	2692	}
2390		2693
2391	=item $client->ext_event ($type, %msg)	2694	=item $client->ext_msg ($type, @msg)
2392		2695
2393	Sends an exti event to the client.	2696	Sends an ext event to the client.
2394		2697
2395	=cut	2698	=cut
2396		2699
2397	sub cf::client::ext_event($$%) {	2700	sub cf::client::ext_msg($$@) {
2398	my ($self, $type, %msg) = @_;	2701	my ($self, $type, @msg) = @_;
2399		2702
		2703	if ($self->extcmd == 2) {
		2704	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2705	} elsif ($self->extcmd == 1) { # TODO: remove
2400	$msg{msgtype} = "event_$type";	2706	push @msg, msgtype => "event_$type";
2401	$self->send_packet ("ext " . cf::to_json \%msg);	2707	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2708	}
		2709	}
		2710
		2711	=item $client->ext_reply ($msgid, @msg)
		2712
		2713	Sends an ext reply to the client.
		2714
		2715	=cut
		2716
		2717	sub cf::client::ext_reply($$@) {
		2718	my ($self, $id, @msg) = @_;
		2719
		2720	if ($self->extcmd == 2) {
		2721	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2722	} elsif ($self->extcmd == 1) {
		2723	#TODO: version 1, remove
		2724	unshift @msg, msgtype => "reply", msgid => $id;
		2725	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2726	}
2402	}	2727	}
2403		2728
2404	=item $success = $client->query ($flags, "text", \&cb)	2729	=item $success = $client->query ($flags, "text", \&cb)
2405		2730
2406	Queues a query to the client, calling the given callback with	2731	Queues a query to the client, calling the given callback with
2407	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2732	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2408	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.	2733	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2409		2734
2410	Queries can fail, so check the return code. Or don't, as queries will become	2735	Queries can fail, so check the return code. Or don't, as queries will
2411	reliable at some point in the future.	2736	become reliable at some point in the future.
2412		2737
2413	=cut	2738	=cut
2414		2739
2415	sub cf::client::query {	2740	sub cf::client::query {
2416	my ($self, $flags, $text, $cb) = @_;	2741	my ($self, $flags, $text, $cb) = @_;
…		…
2424	utf8::encode $text;	2749	utf8::encode $text;
2425	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];	2750	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2426		2751
2427	$self->send_packet ($self->{query_queue}[0][0])	2752	$self->send_packet ($self->{query_queue}[0][0])
2428	if @{ $self->{query_queue} } == 1;	2753	if @{ $self->{query_queue} } == 1;
		2754
		2755	1
2429	}	2756	}
2430		2757
2431	cf::client->attach (	2758	cf::client->attach (
		2759	on_connect => sub {
		2760	my ($ns) = @_;
		2761
		2762	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2763	},
2432	on_reply => sub {	2764	on_reply => sub {
2433	my ($ns, $msg) = @_;	2765	my ($ns, $msg) = @_;
2434		2766
2435	# this weird shuffling is so that direct followup queries	2767	# this weird shuffling is so that direct followup queries
2436	# get handled first	2768	# get handled first
…		…
2448	} else {	2780	} else {
2449	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;	2781	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2450	}	2782	}
2451	}	2783	}
2452	},	2784	},
		2785	on_exticmd => sub {
		2786	my ($ns, $buf) = @_;
		2787
		2788	my $msg = eval { $ns->{json_coder}->decode ($buf) };
		2789
		2790	if (ref $msg) {
		2791	my ($type, $reply, @payload) =
		2792	"ARRAY" eq ref $msg
		2793	? @$msg
		2794	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2795
		2796	my @reply;
		2797
		2798	if (my $cb = $EXTICMD{$type}) {
		2799	@reply = $cb->($ns, @payload);
		2800	}
		2801
		2802	$ns->ext_reply ($reply, @reply)
		2803	if $reply;
		2804
		2805	} else {
		2806	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
		2807	}
		2808
		2809	cf::override;
		2810	},
2453	);	2811	);
2454		2812
2455	=item $client->async (\&cb)	2813	=item $client->async (\&cb)
2456		2814
2457	Create a new coroutine, running the specified callback. The coroutine will	2815	Create a new coroutine, running the specified callback. The coroutine will
…		…
2498	our $safe = new Safe "safe";	2856	our $safe = new Safe "safe";
2499	our $safe_hole = new Safe::Hole;	2857	our $safe_hole = new Safe::Hole;
2500		2858
2501	$SIG{FPE} = 'IGNORE';	2859	$SIG{FPE} = 'IGNORE';
2502		2860
2503	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2861	$safe->permit_only (Opcode::opset qw(
		2862	:base_core :base_mem :base_orig :base_math
		2863	grepstart grepwhile mapstart mapwhile
		2864	sort time
		2865	));
2504		2866
2505	# here we export the classes and methods available to script code	2867	# here we export the classes and methods available to script code
2506		2868
2507	=pod	2869	=pod
2508		2870
2509	The following functions and methods are available within a safe environment:	2871	The following functions and methods are available within a safe environment:
2510		2872
2511	cf::object contr pay_amount pay_player map	2873	cf::object
		2874	contr pay_amount pay_player map x y force_find force_add
		2875	insert remove name archname title slaying race decrease_ob_nr
		2876
2512	cf::object::player player	2877	cf::object::player
2513	cf::player peaceful	2878	player
2514	cf::map trigger	2879
		2880	cf::player
		2881	peaceful
		2882
		2883	cf::map
		2884	trigger
2515		2885
2516	=cut	2886	=cut
2517		2887
2518	for (	2888	for (
2519	["cf::object" => qw(contr pay_amount pay_player map)],	2889	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2890	insert remove inv name archname title slaying race
		2891	decrease_ob_nr)],
2520	["cf::object::player" => qw(player)],	2892	["cf::object::player" => qw(player)],
2521	["cf::player" => qw(peaceful)],	2893	["cf::player" => qw(peaceful)],
2522	["cf::map" => qw(trigger)],	2894	["cf::map" => qw(trigger)],
2523	) {	2895	) {
2524	no strict 'refs';	2896	no strict 'refs';
…		…
2600	# the server's init and main functions	2972	# the server's init and main functions
2601		2973
2602	sub load_facedata($) {	2974	sub load_facedata($) {
2603	my ($path) = @_;	2975	my ($path) = @_;
2604		2976
		2977	# HACK to clear player env face cache, we need some signal framework
		2978	# for this (global event?)
		2979	%ext::player_env::MUSIC_FACE_CACHE = ();
		2980
		2981	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		2982
2605	warn "loading facedata from $path\n";	2983	warn "loading facedata from $path\n";
2606		2984
2607	my $facedata;	2985	my $facedata;
2608	0 < aio_load $path, $facedata	2986	0 < aio_load $path, $facedata
2609	or die "$path: $!";	2987	or die "$path: $!";
…		…
2611	$facedata = Coro::Storable::thaw $facedata;	2989	$facedata = Coro::Storable::thaw $facedata;
2612		2990
2613	$facedata->{version} == 2	2991	$facedata->{version} == 2
2614	or cf::cleanup "$path: version mismatch, cannot proceed.";	2992	or cf::cleanup "$path: version mismatch, cannot proceed.";
2615		2993
		2994	# patch in the exptable
		2995	$facedata->{resource}{"res/exp_table"} = {
		2996	type => FT_RSRC,
		2997	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		2998	};
		2999	cf::cede_to_tick;
		3000
2616	{	3001	{
2617	my $faces = $facedata->{faceinfo};	3002	my $faces = $facedata->{faceinfo};
2618		3003
2619	while (my ($face, $info) = each %$faces) {	3004	while (my ($face, $info) = each %$faces) {
2620	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3005	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2621	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3006	cf::face::set_visibility $idx, $info->{visibility};
		3007	cf::face::set_magicmap $idx, $info->{magicmap};
2622	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3008	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2623	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3009	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2624	Coro::cede;	3010
		3011	cf::cede_to_tick;
2625	}	3012	}
2626		3013
2627	while (my ($face, $info) = each %$faces) {	3014	while (my ($face, $info) = each %$faces) {
2628	next unless $info->{smooth};	3015	next unless $info->{smooth};
2629	my $idx = cf::face::find $face	3016	my $idx = cf::face::find $face
2630	or next;	3017	or next;
2631	if (my $smooth = cf::face::find $info->{smooth}) {	3018	if (my $smooth = cf::face::find $info->{smooth}) {
		3019	cf::face::set_smooth $idx, $smooth;
2632	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3020	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2633	} else {	3021	} else {
2634	warn "smooth face '$info->{smooth}' not found for face '$face'";	3022	warn "smooth face '$info->{smooth}' not found for face '$face'";
2635	}	3023	}
2636	Coro::cede;	3024
		3025	cf::cede_to_tick;
2637	}	3026	}
2638	}	3027	}
2639		3028
2640	{	3029	{
2641	my $anims = $facedata->{animinfo};	3030	my $anims = $facedata->{animinfo};
2642		3031
2643	while (my ($anim, $info) = each %$anims) {	3032	while (my ($anim, $info) = each %$anims) {
2644	cf::anim::set $anim, $info->{frames}, $info->{facings};	3033	cf::anim::set $anim, $info->{frames}, $info->{facings};
2645	Coro::cede;	3034	cf::cede_to_tick;
2646	}	3035	}
2647		3036
2648	cf::anim::invalidate_all; # d'oh	3037	cf::anim::invalidate_all; # d'oh
2649	}	3038	}
2650		3039
		3040	{
		3041	# TODO: for gcfclient pleasure, we should give resources
		3042	# that gcfclient doesn't grok a >10000 face index.
		3043	my $res = $facedata->{resource};
		3044
		3045	my $soundconf = delete $res->{"res/sound.conf"};
		3046
		3047	while (my ($name, $info) = each %$res) {
		3048	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3049	my $data;
		3050
		3051	if ($info->{type} & 1) {
		3052	# prepend meta info
		3053
		3054	my $meta = $enc->encode ({
		3055	name => $name,
		3056	%{ $info->{meta} || {} },
		3057	});
		3058
		3059	$data = pack "(w/a*)*", $meta, $info->{data};
		3060	} else {
		3061	$data = $info->{data};
		3062	}
		3063
		3064	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3065	cf::face::set_type $idx, $info->{type};
		3066
		3067	cf::cede_to_tick;
		3068	}
		3069
		3070	if ($soundconf) {
		3071	$soundconf = $enc->decode (delete $soundconf->{data});
		3072
		3073	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3074	my $sound = $soundconf->{compat}[$_]
		3075	or next;
		3076
		3077	my $face = cf::face::find "sound/$sound->[1]";
		3078	cf::sound::set $sound->[0] => $face;
		3079	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3080	}
		3081
		3082	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3083	my $face = cf::face::find "sound/$v";
		3084	cf::sound::set $k => $face;
		3085	}
		3086	}
		3087	}
		3088
2651	1	3089	1
2652	}	3090	}
2653		3091
		3092	register_exticmd fx_want => sub {
		3093	my ($ns, $want) = @_;
		3094
		3095	while (my ($k, $v) = each %$want) {
		3096	$ns->fx_want ($k, $v);
		3097	}
		3098	};
		3099
2654	sub reload_regions {	3100	sub reload_regions {
		3101	# HACK to clear player env face cache, we need some signal framework
		3102	# for this (global event?)
		3103	%ext::player_env::MUSIC_FACE_CACHE = ();
		3104
2655	load_resource_file "$MAPDIR/regions"	3105	load_resource_file "$MAPDIR/regions"
2656	or die "unable to load regions file\n";	3106	or die "unable to load regions file\n";
		3107
		3108	for (cf::region::list) {
		3109	$_->{match} = qr/$_->{match}/
		3110	if exists $_->{match};
		3111	}
2657	}	3112	}
2658		3113
2659	sub reload_facedata {	3114	sub reload_facedata {
2660	load_facedata "$DATADIR/facedata"	3115	load_facedata "$DATADIR/facedata"
2661	or die "unable to load facedata\n";	3116	or die "unable to load facedata\n";
2662	}	3117	}
2663		3118
2664	sub reload_archetypes {	3119	sub reload_archetypes {
		3120	load_resource_file "$DATADIR/archetypes"
		3121	or die "unable to load archetypes\n";
		3122	#d# NEED to laod twice to resolve forward references
		3123	# this really needs to be done in an extra post-pass
		3124	# (which needs to be synchronous, so solve it differently)
2665	load_resource_file "$DATADIR/archetypes"	3125	load_resource_file "$DATADIR/archetypes"
2666	or die "unable to load archetypes\n";	3126	or die "unable to load archetypes\n";
2667	}	3127	}
2668		3128
2669	sub reload_treasures {	3129	sub reload_treasures {
…		…
2685		3145
2686	sub init {	3146	sub init {
2687	reload_resources;	3147	reload_resources;
2688	}	3148	}
2689		3149
2690	sub cfg_load {	3150	sub reload_config {
2691	open my $fh, "<:utf8", "$CONFDIR/config"	3151	open my $fh, "<:utf8", "$CONFDIR/config"
2692	or return;	3152	or return;
2693		3153
2694	local $/;	3154	local $/;
2695	*CFG = YAML::Syck::Load <$fh>;	3155	*CFG = YAML::Syck::Load <$fh>;
…		…
2715	(async {	3175	(async {
2716	Event::one_event;	3176	Event::one_event;
2717	})->prio (Coro::PRIO_MAX);	3177	})->prio (Coro::PRIO_MAX);
2718	};	3178	};
2719		3179
2720	cfg_load;	3180	reload_config;
2721	db_init;	3181	db_init;
2722	load_extensions;	3182	load_extensions;
2723		3183
2724	$TICK_WATCHER->start;	3184	$TICK_WATCHER->start;
2725	Event::loop;	3185	Event::loop;
…		…
2863	%EXT_CORO = ();	3323	%EXT_CORO = ();
2864		3324
2865	warn "removing commands";	3325	warn "removing commands";
2866	%COMMAND = ();	3326	%COMMAND = ();
2867		3327
2868	warn "removing ext commands";	3328	warn "removing ext/exti commands";
2869	%EXTCMD = ();	3329	%EXTCMD = ();
		3330	%EXTICMD = ();
2870		3331
2871	warn "unloading/nuking all extensions";	3332	warn "unloading/nuking all extensions";
2872	for my $pkg (@EXTS) {	3333	for my $pkg (@EXTS) {
2873	warn "... unloading $pkg";	3334	warn "... unloading $pkg";
2874		3335
…		…
2917	warn "reloading cf.pm";	3378	warn "reloading cf.pm";
2918	require cf;	3379	require cf;
2919	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3380	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2920		3381
2921	warn "loading config and database again";	3382	warn "loading config and database again";
2922	cf::cfg_load;	3383	cf::reload_config;
2923		3384
2924	warn "loading extensions";	3385	warn "loading extensions";
2925	cf::load_extensions;	3386	cf::load_extensions;
2926		3387
2927	warn "reattaching attachments to objects/players";	3388	warn "reattaching attachments to objects/players";
…		…
2992	my $signal = new Coro::Signal;	3453	my $signal = new Coro::Signal;
2993	push @WAIT_FOR_TICK_BEGIN, $signal;	3454	push @WAIT_FOR_TICK_BEGIN, $signal;
2994	$signal->wait;	3455	$signal->wait;
2995	}	3456	}
2996		3457
2997	my $min = 1e6;#d#	3458	our $stat_fh;
2998	my $avg = 10;	3459	sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
		3460
2999	$TICK_WATCHER = Event->timer (	3461	$TICK_WATCHER = Event->timer (
3000	reentrant => 0,	3462	reentrant => 0,
3001	parked => 1,	3463	parked => 1,
3002	prio => 0,	3464	prio => 0,
3003	at => $NEXT_TICK || $TICK,	3465	at => $NEXT_TICK || $TICK,
…		…
3007	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3469	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3008	unless ++$bug_warning > 10;	3470	unless ++$bug_warning > 10;
3009	return;	3471	return;
3010	}	3472	}
3011		3473
		3474	my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
		3475
3012	$NOW = $tick_start = Event::time;	3476	$NOW = $tick_start = Event::time;
3013		3477
3014	cf::server_tick; # one server iteration	3478	cf::server_tick; # one server iteration
3015
3016	0 && sync_job {#d#
3017	for(1..10) {
3018	my $t = Event::time;
3019	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3020	or die;
3021
3022	$map->width (50);
3023	$map->height (50);
3024	$map->alloc;
3025	$map->_load_objects ("/tmp/x.map", 1);
3026	my $t = Event::time - $t;
3027
3028	#next unless $t < 0.0013;#d#
3029	if ($t < $min) {
3030	$min = $t;
3031	}
3032	$avg = $avg * 0.99 + $t * 0.01;
3033	}
3034	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3035	exit 0;
3036	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3037	};
3038		3479
3039	$RUNTIME += $TICK;	3480	$RUNTIME += $TICK;
3040	$NEXT_TICK += $TICK;	3481	$NEXT_TICK += $TICK;
3041		3482
3042	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3483	if ($NOW >= $NEXT_RUNTIME_WRITE) {
…		…
3068	$LOAD = ($NOW - $tick_start) / $TICK;	3509	$LOAD = ($NOW - $tick_start) / $TICK;
3069	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3510	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3070		3511
3071	_post_tick;	3512	_post_tick;
3072		3513
3073		3514	# gather some statistics#d#
		3515	$stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d#
		3516	IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d#
3074	},	3517	},
3075	);	3518	);
3076		3519
3077	{	3520	{
		3521	BDB::min_parallel 8;
3078	BDB::max_poll_time $TICK * 0.1;	3522	BDB::max_poll_time $TICK * 0.1;
3079	$BDB_POLL_WATCHER = Event->io (	3523	$BDB_POLL_WATCHER = Event->io (
3080	reentrant => 0,	3524	reentrant => 0,
3081	fd => BDB::poll_fileno,	3525	fd => BDB::poll_fileno,
3082	poll => 'r',	3526	poll => 'r',
3083	prio => 0,	3527	prio => 0,
3084	data => WF_AUTOCANCEL,	3528	data => WF_AUTOCANCEL,
3085	cb => \&BDB::poll_cb,	3529	cb => \&BDB::poll_cb,
3086	);	3530	);
3087	BDB::min_parallel 8;
3088		3531
3089	BDB::set_sync_prepare {	3532	BDB::set_sync_prepare {
3090	my $status;	3533	my $status;
3091	my $current = $Coro::current;	3534	my $current = $Coro::current;
3092	(	3535	(
…		…
3113	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3556	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3114	0666;	3557	0666;
3115		3558
3116	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3559	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3117		3560
3118	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);	3561	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3562	| BDB::LOG_AUTOREMOVE, 1);
3119	$DB_ENV->set_lk_detect;	3563	$DB_ENV->set_lk_detect;
3120	};	3564	};
3121		3565
3122	cf::cleanup "db_env_open(db): $@" if $@;	3566	cf::cleanup "db_env_open(db): $@" if $@;
3123	};	3567	};
3124	}	3568	}
		3569
		3570	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3571	after => 11,
		3572	interval => 60,
		3573	hard => 1,
		3574	prio => 0,
		3575	data => WF_AUTOCANCEL,
		3576	cb => sub {
		3577	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3578	},
		3579	);
		3580	$BDB_TRICKLE_WATCHER = Event->timer (
		3581	after => 5,
		3582	interval => 10,
		3583	hard => 1,
		3584	prio => 0,
		3585	data => WF_AUTOCANCEL,
		3586	cb => sub {
		3587	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3588	},
		3589	);
3125	}	3590	}
3126		3591
3127	{	3592	{
3128	IO::AIO::min_parallel 8;	3593	IO::AIO::min_parallel 8;
3129		3594

Diff Legend

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