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.371 by root, Thu Sep 13 16:16:01 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	my $signal = new Coro::Signal;
		360
		361	while () {
		362	next_job:
		363	my $avail = cf::till_tick;
		364	if ($avail > 0.01) {
		365	for (0 .. $#SLOT_QUEUE) {
		366	if ($SLOT_QUEUE[$_][0] < $avail) {
		367	my $job = splice @SLOT_QUEUE, $_, 1, ();
		368	$job->[2]->send;
		369	Coro::cede;
		370	goto next_job;
		371	}
		372	}
		373	}
		374
		375	if (@SLOT_QUEUE) {
		376	# we do not use wait_For_tick() as it returns immediately when tick is inactive
		377	push @cf::WAIT_FOR_TICK, $signal;
		378	$signal->wait;
		379	} else {
		380	Coro::schedule;
		381	}
		382	}
		383	};
		384
		385	sub get_slot($;$$) {
		386	my ($time, $pri, $name) = @_;
		387
		388	$time = $TICK * .6 if $time > $TICK * .6;
		389	my $sig = new Coro::Signal;
		390
		391	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		392	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		393	$SLOT_QUEUE->ready;
		394	$sig->wait;
311	}	395	}
312		396
313	=item cf::async { BLOCK }	397	=item cf::async { BLOCK }
314		398
315	Currently the same as Coro::async_pool, meaning you cannot use	399	Currently the same as Coro::async_pool, meaning you cannot use
…		…
405	=cut	489	=cut
406		490
407	sub fork_call(&@) {	491	sub fork_call(&@) {
408	my ($cb, @args) = @_;	492	my ($cb, @args) = @_;
409		493
410	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	494	# we seemingly have to make a local copy of the whole thing,
411	# or die "socketpair: $!";	495	# otherwise perl prematurely frees the stuff :/
412	pipe my $fh1, my $fh2	496	# TODO: investigate and fix (likely this will be rather laborious)
413	or die "pipe: $!";
414		497
415	if (my $pid = fork) {	498	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;	499	reset_signals;
428	local $SIG{__WARN__};	500	&$cb
429	local $SIG{__DIE__};	501	}, @args;
430	eval {
431	close $fh1;
432		502
433	my @res = eval { $cb->(@args) };	503	wantarray ? @res : $res[-1]
434	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
435	};
436
437	warn $@ if $@;
438	_exit 0;
439	}
440	}	504	}
441		505
442	=item $value = cf::db_get $family => $key	506	=item $value = cf::db_get $family => $key
443		507
444	Returns a single value from the environment database.	508	Returns a single value from the environment database.
…		…
446	=item cf::db_put $family => $key => $value	510	=item cf::db_put $family => $key => $value
447		511
448	Stores the given C<$value> in the family. It can currently store binary	512	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).	513	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
450		514
		515	=item $db = cf::db_table "name"
		516
		517	Create and/or open a new database table. The string must not be "db" and must be unique
		518	within each server.
		519
451	=cut	520	=cut
		521
		522	sub db_table($) {
		523	my ($name) = @_;
		524	my $db = BDB::db_create $DB_ENV;
		525
		526	eval {
		527	$db->set_flags (BDB::CHKSUM);
		528
		529	utf8::encode $name;
		530	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		531	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		532	cf::cleanup "db_open(db): $!" if $!;
		533	};
		534	cf::cleanup "db_open(db): $@" if $@;
		535
		536	$db
		537	}
452		538
453	our $DB;	539	our $DB;
454		540
455	sub db_init {	541	sub db_init {
456	unless ($DB) {
457	$DB = BDB::db_create $DB_ENV;
458
459	cf::sync_job {	542	cf::sync_job {
460	eval {	543	$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	}	544	};
470	}	545	}
471		546
472	sub db_get($$) {	547	sub db_get($$) {
473	my $key = "$_[0]/$_[1]";	548	my $key = "$_[0]/$_[1]";
474		549
…		…
524	if (1) {	599	if (1) {
525	$md5 =	600	$md5 =
526	join "\x00",	601	join "\x00",
527	$processversion,	602	$processversion,
528	map {	603	map {
529	Coro::cede;	604	cf::cede_to_tick;
530	($src->[$_], Digest::MD5::md5_hex $data[$_])	605	($src->[$_], Digest::MD5::md5_hex $data[$_])
531	} 0.. $#$src;	606	} 0.. $#$src;
532		607
533		608
534	my $dbmd5 = db_get cache => "$id/md5";	609	my $dbmd5 = db_get cache => "$id/md5";
…		…
840	";	915	";
841	die if $@;	916	die if $@;
842	}	917	}
843		918
844	our $override;	919	our $override;
845	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	920	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846		921
847	sub override {	922	sub override {
848	$override = 1;	923	$override = 1;
849	@invoke_results = ();	924	@INVOKE_RESULTS = (@_);
850	}	925	}
851		926
852	sub do_invoke {	927	sub do_invoke {
853	my $event = shift;	928	my $event = shift;
854	my $callbacks = shift;	929	my $callbacks = shift;
855		930
856	@invoke_results = ();	931	@INVOKE_RESULTS = ();
857		932
858	local $override;	933	local $override;
859		934
860	for (@$callbacks) {	935	for (@$callbacks) {
861	eval { &{$_->[1]} };	936	eval { &{$_->[1]} };
…		…
878		953
879	Generate an object-specific event with the given arguments.	954	Generate an object-specific event with the given arguments.
880		955
881	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	956	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	957	removed in future versions), and there is no public API to access override
883	results (if you must, access C<@cf::invoke_results> directly).	958	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884		959
885	=back	960	=back
886		961
887	=cut	962	=cut
888		963
889	#############################################################################	964	#############################################################################
890	# object support	965	# object support
		966	#
		967
		968	sub _can_merge {
		969	my ($ob1, $ob2) = @_;
		970
		971	local $Storable::canonical = 1;
		972	my $fob1 = Storable::freeze $ob1;
		973	my $fob2 = Storable::freeze $ob2;
		974
		975	$fob1 eq $fob2
		976	}
891		977
892	sub reattach {	978	sub reattach {
893	# basically do the same as instantiate, without calling instantiate	979	# basically do the same as instantiate, without calling instantiate
894	my ($obj) = @_;	980	my ($obj) = @_;
895		981
…		…
940	);	1026	);
941		1027
942	sub object_freezer_save {	1028	sub object_freezer_save {
943	my ($filename, $rdata, $objs) = @_;	1029	my ($filename, $rdata, $objs) = @_;
944		1030
		1031	my $guard = cf::lock_acquire "io";
		1032
945	sync_job {	1033	sync_job {
946	if (length $$rdata) {	1034	if (length $$rdata) {
		1035	utf8::decode (my $decname = $filename);
947	warn sprintf "saving %s (%d,%d)\n",	1036	warn sprintf "saving %s (%d,%d)\n",
948	$filename, length $$rdata, scalar @$objs;	1037	$decname, length $$rdata, scalar @$objs;
949		1038
950	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1039	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951	chmod SAVE_MODE, $fh;	1040	chmod SAVE_MODE, $fh;
952	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1041	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953	aio_fsync $fh if $cf::USE_FSYNC;	1042	aio_fsync $fh if $cf::USE_FSYNC;
…		…
972	}	1061	}
973	} else {	1062	} else {
974	aio_unlink $filename;	1063	aio_unlink $filename;
975	aio_unlink "$filename.pst";	1064	aio_unlink "$filename.pst";
976	}	1065	}
977	}	1066	};
		1067
		1068	undef $guard;
978	}	1069	}
979		1070
980	sub object_freezer_as_string {	1071	sub object_freezer_as_string {
981	my ($rdata, $objs) = @_;	1072	my ($rdata, $objs) = @_;
982		1073
…		…
987		1078
988	sub object_thawer_load {	1079	sub object_thawer_load {
989	my ($filename) = @_;	1080	my ($filename) = @_;
990		1081
991	my ($data, $av);	1082	my ($data, $av);
		1083
		1084	my $guard = cf::lock_acquire "io";
992		1085
993	(aio_load $filename, $data) >= 0	1086	(aio_load $filename, $data) >= 0
994	or return;	1087	or return;
995		1088
996	unless (aio_stat "$filename.pst") {	1089	unless (aio_stat "$filename.pst") {
997	(aio_load "$filename.pst", $av) >= 0	1090	(aio_load "$filename.pst", $av) >= 0
998	or return;	1091	or return;
		1092
		1093	undef $guard;
999	$av = eval { (Storable::thaw $av)->{objs} };	1094	$av = eval { (Storable::thaw $av)->{objs} };
1000	}	1095	}
1001		1096
		1097	utf8::decode (my $decname = $filename);
1002	warn sprintf "loading %s (%d)\n",	1098	warn sprintf "loading %s (%d,%d)\n",
1003	$filename, length $data, scalar @{$av || []};	1099	$decname, length $data, scalar @{$av || []};
		1100
1004	return ($data, $av);	1101	($data, $av)
1005	}	1102	}
1006		1103
1007	=head2 COMMAND CALLBACKS	1104	=head2 COMMAND CALLBACKS
1008		1105
1009	=over 4	1106	=over 4
…		…
1029	push @{ $COMMAND{$name} }, [$caller, $cb];	1126	push @{ $COMMAND{$name} }, [$caller, $cb];
1030	}	1127	}
1031		1128
1032	=item cf::register_extcmd $name => \&callback($pl,$packet);	1129	=item cf::register_extcmd $name => \&callback($pl,$packet);
1033		1130
1034	Register a callback fro execution when the client sends an extcmd packet.	1131	Register a callback for execution when the client sends an (synchronous)
		1132	extcmd packet. Ext commands will be processed in the order they are
		1133	received by the server, like other user commands. The first argument is
		1134	the logged-in player. Ext commands can only be processed after a player
		1135	has logged in successfully.
1035		1136
1036	If the callback returns something, it is sent back as if reply was being	1137	If the callback returns something, it is sent back as if reply was being
1037	called.	1138	called.
1038		1139
		1140	=item cf::register_exticmd $name => \&callback($ns,$packet);
		1141
		1142	Register a callback for execution when the client sends an (asynchronous)
		1143	exticmd packet. Exti commands are processed by the server as soon as they
		1144	are received, i.e. out of order w.r.t. other commands. The first argument
		1145	is a client socket. Exti commands can be received anytime, even before
		1146	log-in.
		1147
		1148	If the callback returns something, it is sent back as if reply was being
		1149	called.
		1150
1039	=cut	1151	=cut
1040		1152
1041	sub register_extcmd {	1153	sub register_extcmd {
1042	my ($name, $cb) = @_;	1154	my ($name, $cb) = @_;
1043		1155
1044	$EXTCMD{$name} = $cb;	1156	$EXTCMD{$name} = $cb;
		1157	}
		1158
		1159	sub register_exticmd {
		1160	my ($name, $cb) = @_;
		1161
		1162	$EXTICMD{$name} = $cb;
1045	}	1163	}
1046		1164
1047	cf::player->attach (	1165	cf::player->attach (
1048	on_command => sub {	1166	on_command => sub {
1049	my ($pl, $name, $params) = @_;	1167	my ($pl, $name, $params) = @_;
…		…
1058	cf::override;	1176	cf::override;
1059	},	1177	},
1060	on_extcmd => sub {	1178	on_extcmd => sub {
1061	my ($pl, $buf) = @_;	1179	my ($pl, $buf) = @_;
1062		1180
1063	my $msg = eval { from_json $buf };	1181	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064		1182
1065	if (ref $msg) {	1183	if (ref $msg) {
		1184	my ($type, $reply, @payload) =
		1185	"ARRAY" eq ref $msg
		1186	? @$msg
		1187	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1188
		1189	my @reply;
		1190
1066	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1191	if (my $cb = $EXTCMD{$type}) {
1067	if (my %reply = $cb->($pl, $msg)) {	1192	@reply = $cb->($pl, @payload);
1068	$pl->ext_reply ($msg->{msgid}, %reply);
1069	}
1070	}	1193	}
		1194
		1195	$pl->ext_reply ($reply, @reply)
		1196	if $reply;
		1197
1071	} else {	1198	} else {
1072	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1199	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073	}	1200	}
1074		1201
1075	cf::override;	1202	cf::override;
…		…
1165		1292
1166	=head3 cf::player	1293	=head3 cf::player
1167		1294
1168	=over 4	1295	=over 4
1169		1296
		1297	=item cf::player::num_playing
		1298
		1299	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1300
		1301	=cut
		1302
		1303	sub num_playing {
		1304	scalar grep
		1305	$_->ob->map
		1306	&& !$_->hidden
		1307	&& !$_->ob->flag (cf::FLAG_WIZ),
		1308	cf::player::list
		1309	}
		1310
1170	=item cf::player::find $login	1311	=item cf::player::find $login
1171		1312
1172	Returns the given player object, loading it if necessary (might block).	1313	Returns the given player object, loading it if necessary (might block).
1173		1314
1174	=cut	1315	=cut
…		…
1209	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1350	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1351	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1352	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212	aio_unlink +(playerdir $login) . "/$login.pl";	1353	aio_unlink +(playerdir $login) . "/$login.pl";
1213		1354
1214	my $pl = load_pl path $login	1355	my $f = new_from_file cf::object::thawer path $login
1215	or return;	1356	or return;
		1357
		1358	$f->next;
		1359	my $pl = cf::player::load_pl $f
		1360	or return;
		1361	local $cf::PLAYER_LOADING{$login} = $pl;
		1362	$f->resolve_delayed_derefs;
1216	$cf::PLAYER{$login} = $pl	1363	$cf::PLAYER{$login} = $pl
1217	}	1364	}
1218	}	1365	}
1219	}	1366	}
1220		1367
…		…
1230		1377
1231	aio_mkdir playerdir $pl, 0770;	1378	aio_mkdir playerdir $pl, 0770;
1232	$pl->{last_save} = $cf::RUNTIME;	1379	$pl->{last_save} = $cf::RUNTIME;
1233		1380
1234	$pl->save_pl ($path);	1381	$pl->save_pl ($path);
1235	Coro::cede;	1382	cf::cede_to_tick;
1236	}	1383	}
1237		1384
1238	sub new($) {	1385	sub new($) {
1239	my ($login) = @_;	1386	my ($login) = @_;
1240		1387
…		…
1244	$self->{deny_save} = 1;	1391	$self->{deny_save} = 1;
1245		1392
1246	$cf::PLAYER{$login} = $self;	1393	$cf::PLAYER{$login} = $self;
1247		1394
1248	$self	1395	$self
		1396	}
		1397
		1398	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1399
		1400	=cut
		1401
		1402	sub send_msg {
		1403	my $ns = shift->ns
		1404	or return;
		1405	$ns->send_msg (@_);
1249	}	1406	}
1250		1407
1251	=item $pl->quit_character	1408	=item $pl->quit_character
1252		1409
1253	Nukes the player without looking back. If logged in, the connection will	1410	Nukes the player without looking back. If logged in, the connection will
…		…
1308	or return [];	1465	or return [];
1309		1466
1310	my @logins;	1467	my @logins;
1311		1468
1312	for my $login (@$dirs) {	1469	for my $login (@$dirs) {
		1470	my $path = path $login;
		1471
		1472	# a .pst is a dead give-away for a valid player
		1473	unless (-e "$path.pst") {
1313	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1474	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314	aio_read $fh, 0, 512, my $buf, 0 or next;	1475	aio_read $fh, 0, 512, my $buf, 0 or next;
1315	$buf !~ /^password -------------$/m or next; # official not-valid tag	1476	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1477	}
1316		1478
1317	utf8::decode $login;	1479	utf8::decode $login;
1318	push @logins, $login;	1480	push @logins, $login;
1319	}	1481	}
1320		1482
…		…
1358	sub expand_cfpod {	1520	sub expand_cfpod {
1359	((my $self), (local $_)) = @_;	1521	((my $self), (local $_)) = @_;
1360		1522
1361	# escape & and <	1523	# escape & and <
1362	s/&/&amp;/g;	1524	s/&/&amp;/g;
1363	s/(?<![BIUGH])</&lt;/g;	1525	s/(?<![BIUGHT])</&lt;/g;
1364		1526
1365	# this is buggy, it needs to properly take care of nested <'s	1527	# this is buggy, it needs to properly take care of nested <'s
1366		1528
1367	1 while	1529	1 while
1368	# replace B<>, I<>, U<> etc.	1530	# replace B<>, I<>, U<> etc.
1369	s/B<([^\>]*)>/<b>$1<\/b>/	1531	s/B<([^\>]*)>/<b>$1<\/b>/
1370	|| s/I<([^\>]*)>/<i>$1<\/i>/	1532	|| s/I<([^\>]*)>/<i>$1<\/i>/
1371	|| s/U<([^\>]*)>/<u>$1<\/u>/	1533	|| s/U<([^\>]*)>/<u>$1<\/u>/
		1534	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1372	# replace G<male|female> tags	1535	# replace G<male|female> tags
1373	|| s{G<([^>|]*)\|([^>]*)>}{	1536	|| s{G<([^>|]*)\|([^>]*)>}{
1374	$self->gender ? $2 : $1	1537	$self->gender ? $2 : $1
1375	}ge	1538	}ge
1376	# replace H<hint text>	1539	# replace H<hint text>
1377	|| s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;	1540	|| s{H<([^\>]*)>}
		1541	{
		1542	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1543	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1544	"")
		1545	[$self->{hintmode}]
		1546	}ge;
1378		1547
1379	# create single paragraphs (very hackish)	1548	# create single paragraphs (very hackish)
1380	s/(?<=\S)\n(?=\w)/ /g;	1549	s/(?<=\S)\n(?=\w)/ /g;
1381		1550
		1551	# compress some whitespace
		1552	s/\s+\n/\n/g; # ws line-ends
		1553	s/\n\n+/\n/g; # double lines
		1554	s/^\n+//; # beginning lines
		1555	s/\n+$//; # ending lines
		1556
1382	$_	1557	$_
1383	}	1558	}
1384		1559
		1560	sub hintmode {
		1561	$_[0]{hintmode} = $_[1] if @_ > 1;
		1562	$_[0]{hintmode}
		1563	}
		1564
1385	=item $player->ext_reply ($msgid, %msg)	1565	=item $player->ext_reply ($msgid, @msg)
1386		1566
1387	Sends an ext reply to the player.	1567	Sends an ext reply to the player.
1388		1568
1389	=cut	1569	=cut
1390		1570
1391	sub ext_reply($$%) {	1571	sub ext_reply($$@) {
1392	my ($self, $id, %msg) = @_;	1572	my ($self, $id, @msg) = @_;
1393		1573
1394	$msg{msgid} = $id;	1574	$self->ns->ext_reply ($id, @msg)
1395
1396	$self->send ("ext " . cf::to_json \%msg);
1397	}	1575	}
1398		1576
1399	=item $player->ext_event ($type, %msg)	1577	=item $player->ext_msg ($type, @msg)
1400		1578
1401	Sends an ext event to the client.	1579	Sends an ext event to the client.
1402		1580
1403	=cut	1581	=cut
1404		1582
1405	sub ext_event($$%) {	1583	sub ext_msg($$@) {
1406	my ($self, $type, %msg) = @_;	1584	my ($self, $type, @msg) = @_;
1407		1585
1408	$self->ns->ext_event ($type, %msg);	1586	$self->ns->ext_msg ($type, @msg);
1409	}	1587	}
1410		1588
1411	=head3 cf::region	1589	=head3 cf::region
1412		1590
1413	=over 4	1591	=over 4
…		…
1426	my ($path) = @_;	1604	my ($path) = @_;
1427		1605
1428	my ($match, $specificity);	1606	my ($match, $specificity);
1429		1607
1430	for my $region (list) {	1608	for my $region (list) {
1431	if ($region->match && $path =~ $region->match) {	1609	if ($region->{match} && $path =~ $region->{match}) {
1432	($match, $specificity) = ($region, $region->specificity)	1610	($match, $specificity) = ($region, $region->specificity)
1433	if $region->specificity > $specificity;	1611	if $region->specificity > $specificity;
1434	}	1612	}
1435	}	1613	}
1436		1614
…		…
1556	$self->init; # pass $1 etc.	1734	$self->init; # pass $1 etc.
1557	return $self;	1735	return $self;
1558	}	1736	}
1559	}	1737	}
1560		1738
1561	Carp::carp "unable to resolve path '$path' (base '$base').";	1739	Carp::cluck "unable to resolve path '$path' (base '$base').";
1562	()	1740	()
1563	}	1741	}
1564		1742
1565	sub init {	1743	sub init {
1566	my ($self) = @_;	1744	my ($self) = @_;
…		…
1629		1807
1630	sub load_header_from($) {	1808	sub load_header_from($) {
1631	my ($self, $path) = @_;	1809	my ($self, $path) = @_;
1632		1810
1633	utf8::encode $path;	1811	utf8::encode $path;
1634	#aio_open $path, O_RDONLY, 0	1812	my $f = new_from_file cf::object::thawer $path
1635	# or return;
1636
1637	$self->_load_header ($path)
1638	or return;	1813	or return;
		1814
		1815	$self->_load_header ($f)
		1816	or return;
		1817
		1818	local $MAP_LOADING{$self->{path}} = $self;
		1819	$f->resolve_delayed_derefs;
1639		1820
1640	$self->{load_path} = $path;	1821	$self->{load_path} = $path;
1641		1822
1642	1	1823	1
1643	}	1824	}
…		…
1697	sub find {	1878	sub find {
1698	my ($path, $origin) = @_;	1879	my ($path, $origin) = @_;
1699		1880
1700	$path = normalise $path, $origin && $origin->path;	1881	$path = normalise $path, $origin && $origin->path;
1701		1882
		1883	cf::lock_wait "map_data:$path";#d#remove
1702	cf::lock_wait "map_find:$path";	1884	cf::lock_wait "map_find:$path";
1703		1885
1704	$cf::MAP{$path} || do {	1886	$cf::MAP{$path} || do {
1705	my $guard = cf::lock_acquire "map_find:$path";	1887	my $guard1 = cf::lock_acquire "map_find:$path";
		1888	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1889
1706	my $map = new_from_path cf::map $path	1890	my $map = new_from_path cf::map $path
1707	or return;	1891	or return;
1708		1892
1709	$map->{last_save} = $cf::RUNTIME;	1893	$map->{last_save} = $cf::RUNTIME;
1710		1894
…		…
1712	or return;	1896	or return;
1713		1897
1714	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1898	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1715	# doing this can freeze the server in a sync job, obviously	1899	# doing this can freeze the server in a sync job, obviously
1716	#$cf::WAIT_FOR_TICK->wait;	1900	#$cf::WAIT_FOR_TICK->wait;
		1901	undef $guard1;
		1902	undef $guard2;
1717	$map->reset;	1903	$map->reset;
1718	undef $guard;
1719	return find $path;	1904	return find $path;
1720	}	1905	}
1721		1906
1722	$cf::MAP{$path} = $map	1907	$cf::MAP{$path} = $map
1723	}	1908	}
…		…
1732	local $self->{deny_reset} = 1; # loading can take a long time	1917	local $self->{deny_reset} = 1; # loading can take a long time
1733		1918
1734	my $path = $self->{path};	1919	my $path = $self->{path};
1735		1920
1736	{	1921	{
1737	my $guard = cf::lock_acquire "map_load:$path";	1922	my $guard = cf::lock_acquire "map_data:$path";
1738		1923
		1924	return unless $self->valid;
1739	return if $self->in_memory != cf::MAP_SWAPPED;	1925	return unless $self->in_memory == cf::MAP_SWAPPED;
1740		1926
1741	$self->in_memory (cf::MAP_LOADING);	1927	$self->in_memory (cf::MAP_LOADING);
1742		1928
1743	$self->alloc;	1929	$self->alloc;
1744		1930
1745	$self->pre_load;	1931	$self->pre_load;
1746	Coro::cede;	1932	cf::cede_to_tick;
1747		1933
		1934	my $f = new_from_file cf::object::thawer $self->{load_path};
		1935	$f->skip_block;
1748	$self->_load_objects ($self->{load_path}, 1)	1936	$self->_load_objects ($f)
1749	or return;	1937	or return;
1750		1938
1751	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1939	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1752	if delete $self->{load_original};	1940	if delete $self->{load_original};
1753		1941
1754	if (my $uniq = $self->uniq_path) {	1942	if (my $uniq = $self->uniq_path) {
1755	utf8::encode $uniq;	1943	utf8::encode $uniq;
1756	if (aio_open $uniq, O_RDONLY, 0) {	1944	unless (aio_stat $uniq) {
		1945	if (my $f = new_from_file cf::object::thawer $uniq) {
1757	$self->clear_unique_items;	1946	$self->clear_unique_items;
1758	$self->_load_objects ($uniq, 0);	1947	$self->_load_objects ($f);
		1948	$f->resolve_delayed_derefs;
		1949	}
1759	}	1950	}
1760	}	1951	}
1761		1952
1762	Coro::cede;	1953	$f->resolve_delayed_derefs;
		1954
		1955	cf::cede_to_tick;
1763	# now do the right thing for maps	1956	# now do the right thing for maps
1764	$self->link_multipart_objects;	1957	$self->link_multipart_objects;
1765	$self->difficulty ($self->estimate_difficulty)	1958	$self->difficulty ($self->estimate_difficulty)
1766	unless $self->difficulty;	1959	unless $self->difficulty;
1767	Coro::cede;	1960	cf::cede_to_tick;
1768		1961
1769	unless ($self->{deny_activate}) {	1962	unless ($self->{deny_activate}) {
1770	$self->decay_objects;	1963	$self->decay_objects;
1771	$self->fix_auto_apply;	1964	$self->fix_auto_apply;
1772	$self->update_buttons;	1965	$self->update_buttons;
1773	Coro::cede;	1966	cf::cede_to_tick;
1774	$self->set_darkness_map;	1967	$self->set_darkness_map;
1775	Coro::cede;	1968	cf::cede_to_tick;
1776	$self->activate;	1969	$self->activate;
1777	}	1970	}
		1971
		1972	$self->{last_save} = $cf::RUNTIME;
		1973	$self->last_access ($cf::RUNTIME);
1778		1974
1779	$self->in_memory (cf::MAP_IN_MEMORY);	1975	$self->in_memory (cf::MAP_IN_MEMORY);
1780	}	1976	}
1781		1977
1782	$self->post_load;	1978	$self->post_load;
…		…
1793		1989
1794	$self	1990	$self
1795	}	1991	}
1796		1992
1797	# find and load all maps in the 3x3 area around a map	1993	# find and load all maps in the 3x3 area around a map
1798	sub load_diag {	1994	sub load_neighbours {
1799	my ($map) = @_;	1995	my ($map) = @_;
1800		1996
1801	my @diag; # diagonal neighbours	1997	my @neigh; # diagonal neighbours
1802		1998
1803	for (0 .. 3) {	1999	for (0 .. 3) {
1804	my $neigh = $map->tile_path ($_)	2000	my $neigh = $map->tile_path ($_)
1805	or next;	2001	or next;
1806	$neigh = find $neigh, $map	2002	$neigh = find $neigh, $map
1807	or next;	2003	or next;
1808	$neigh->load;	2004	$neigh->load;
1809		2005
		2006	push @neigh,
1810	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2007	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1811	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2008	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1812	}	2009	}
1813		2010
1814	for (@diag) {	2011	for (grep defined $_->[0], @neigh) {
		2012	my ($path, $origin) = @$_;
1815	my $neigh = find @$_	2013	my $neigh = find $path, $origin
1816	or next;	2014	or next;
1817	$neigh->load;	2015	$neigh->load;
1818	}	2016	}
1819	}	2017	}
1820		2018
…		…
1825	}	2023	}
1826		2024
1827	sub do_load_sync {	2025	sub do_load_sync {
1828	my ($map) = @_;	2026	my ($map) = @_;
1829		2027
		2028	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2029	if $Coro::current == $Coro::main;
		2030
1830	cf::sync_job { $map->load };	2031	cf::sync_job { $map->load };
1831	}	2032	}
1832		2033
1833	our %MAP_PREFETCH;	2034	our %MAP_PREFETCH;
1834	our $MAP_PREFETCHER = undef;	2035	our $MAP_PREFETCHER = undef;
1835		2036
1836	sub find_async {	2037	sub find_async {
1837	my ($path, $origin) = @_;	2038	my ($path, $origin, $load) = @_;
1838		2039
1839	$path = normalise $path, $origin && $origin->{path};	2040	$path = normalise $path, $origin && $origin->{path};
1840		2041
1841	if (my $map = $cf::MAP{$path}) {	2042	if (my $map = $cf::MAP{$path}) {
1842	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2043	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1843	}	2044	}
1844		2045
1845	undef $MAP_PREFETCH{$path};	2046	$MAP_PREFETCH{$path} |= $load;
		2047
1846	$MAP_PREFETCHER ||= cf::async {	2048	$MAP_PREFETCHER ||= cf::async {
1847	while (%MAP_PREFETCH) {	2049	while (%MAP_PREFETCH) {
1848	for my $path (keys %MAP_PREFETCH) {	2050	while (my ($k, $v) = each %MAP_PREFETCH) {
1849	my $map = find $path	2051	if (my $map = find $k) {
1850	or next;
1851	$map->load;	2052	$map->load if $v;
		2053	}
1852		2054
1853	delete $MAP_PREFETCH{$path};	2055	delete $MAP_PREFETCH{$k};
1854	}	2056	}
1855	}	2057	}
1856	undef $MAP_PREFETCHER;	2058	undef $MAP_PREFETCHER;
1857	};	2059	};
1858	$MAP_PREFETCHER->prio (6);	2060	$MAP_PREFETCHER->prio (6);
…		…
1861	}	2063	}
1862		2064
1863	sub save {	2065	sub save {
1864	my ($self) = @_;	2066	my ($self) = @_;
1865		2067
1866	my $lock = cf::lock_acquire "map_data:" . $self->path;	2068	my $lock = cf::lock_acquire "map_data:$self->{path}";
1867		2069
1868	$self->{last_save} = $cf::RUNTIME;	2070	$self->{last_save} = $cf::RUNTIME;
1869		2071
1870	return unless $self->dirty;	2072	return unless $self->dirty;
1871		2073
…		…
1894	my ($self) = @_;	2096	my ($self) = @_;
1895		2097
1896	# save first because save cedes	2098	# save first because save cedes
1897	$self->save;	2099	$self->save;
1898		2100
1899	my $lock = cf::lock_acquire "map_data:" . $self->path;	2101	my $lock = cf::lock_acquire "map_data:$self->{path}";
1900		2102
1901	return if $self->players;	2103	return if $self->players;
1902	return if $self->in_memory != cf::MAP_IN_MEMORY;	2104	return if $self->in_memory != cf::MAP_IN_MEMORY;
1903	return if $self->{deny_save};	2105	return if $self->{deny_save};
1904		2106
		2107	$self->in_memory (cf::MAP_SWAPPED);
		2108
		2109	$self->deactivate;
		2110	$_->clear_links_to ($self) for values %cf::MAP;
1905	$self->clear;	2111	$self->clear;
1906	$self->in_memory (cf::MAP_SWAPPED);
1907	}	2112	}
1908		2113
1909	sub reset_at {	2114	sub reset_at {
1910	my ($self) = @_;	2115	my ($self) = @_;
1911		2116
…		…
1943	if $uniq;	2148	if $uniq;
1944	}	2149	}
1945		2150
1946	delete $cf::MAP{$self->path};	2151	delete $cf::MAP{$self->path};
1947		2152
		2153	$self->deactivate;
		2154	$_->clear_links_to ($self) for values %cf::MAP;
1948	$self->clear;	2155	$self->clear;
1949
1950	$_->clear_links_to ($self) for values %cf::MAP;
1951		2156
1952	$self->unlink_save;	2157	$self->unlink_save;
1953	$self->destroy;	2158	$self->destroy;
1954	}	2159	}
1955		2160
1956	my $nuke_counter = "aaaa";	2161	my $nuke_counter = "aaaa";
1957		2162
1958	sub nuke {	2163	sub nuke {
1959	my ($self) = @_;	2164	my ($self) = @_;
1960		2165
		2166	{
		2167	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2168
1961	delete $cf::MAP{$self->path};	2169	delete $cf::MAP{$self->path};
1962		2170
1963	$self->unlink_save;	2171	$self->unlink_save;
1964		2172
1965	bless $self, "cf::map";	2173	bless $self, "cf::map";
1966	delete $self->{deny_reset};	2174	delete $self->{deny_reset};
1967	$self->{deny_save} = 1;	2175	$self->{deny_save} = 1;
1968	$self->reset_timeout (1);	2176	$self->reset_timeout (1);
1969	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2177	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1970		2178
1971	$cf::MAP{$self->path} = $self;	2179	$cf::MAP{$self->path} = $self;
		2180	}
1972		2181
1973	$self->reset; # polite request, might not happen	2182	$self->reset; # polite request, might not happen
1974	}	2183	}
1975		2184
1976	=item $maps = cf::map::tmp_maps	2185	=item $maps = cf::map::tmp_maps
…		…
2052		2261
2053	sub inv_recursive {	2262	sub inv_recursive {
2054	inv_recursive_ inv $_[0]	2263	inv_recursive_ inv $_[0]
2055	}	2264	}
2056		2265
		2266	=item $ref = $ob->ref
		2267
		2268	creates and returns a persistent reference to an objetc that can be stored as a string.
		2269
		2270	=item $ob = cf::object::deref ($refstring)
		2271
		2272	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2273	even if the object actually exists. May block.
		2274
		2275	=cut
		2276
		2277	sub deref {
		2278	my ($ref) = @_;
		2279
		2280	# temporary compatibility#TODO#remove
		2281	$ref =~ s{^<}{player/<};
		2282
		2283	if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
		2284	my ($uuid, $name) = ($1, $2);
		2285	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2286	or return;
		2287	$pl->ob->uuid eq $uuid
		2288	or return;
		2289
		2290	$pl->ob
		2291	} else {
		2292	warn "$ref: cannot resolve object reference\n";
		2293	undef
		2294	}
		2295	}
		2296
2057	package cf;	2297	package cf;
2058		2298
2059	=back	2299	=back
2060		2300
2061	=head3 cf::object::player	2301	=head3 cf::object::player
…		…
2083		2323
2084	} else {	2324	} else {
2085	my $pl = $self->contr;	2325	my $pl = $self->contr;
2086		2326
2087	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2327	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2088	my $diag = $pl->{npc_dialog};	2328	my $dialog = $pl->{npc_dialog};
2089	$diag->{pl}->ext_reply (	2329	$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		2330
2096	} else {	2331	} else {
2097	$msg = $npc->name . " says: $msg" if $npc;	2332	$msg = $npc->name . " says: $msg" if $npc;
2098	$self->message ($msg, $flags);	2333	$self->message ($msg, $flags);
2099	}	2334	}
2100	}	2335	}
		2336	}
		2337
		2338	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2339
		2340	=cut
		2341
		2342	sub cf::object::send_msg {
		2343	my $pl = shift->contr
		2344	or return;
		2345	$pl->send_msg (@_);
2101	}	2346	}
2102		2347
2103	=item $player_object->may ("access")	2348	=item $player_object->may ("access")
2104		2349
2105	Returns wether the given player is authorized to access resource "access"	2350	Returns wether the given player is authorized to access resource "access"
…		…
2184	# use -1 or undef as default coordinates, not 0, 0	2429	# use -1 or undef as default coordinates, not 0, 0
2185	($x, $y) = ($map->enter_x, $map->enter_y)	2430	($x, $y) = ($map->enter_x, $map->enter_y)
2186	if $x <=0 && $y <= 0;	2431	if $x <=0 && $y <= 0;
2187		2432
2188	$map->load;	2433	$map->load;
2189	$map->load_diag;	2434	$map->load_neighbours;
2190		2435
2191	return unless $self->contr->active;	2436	return unless $self->contr->active;
2192	$self->activate_recursive;	2437	$self->activate_recursive;
2193		2438
2194	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2439	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2195	$self->enter_map ($map, $x, $y);	2440	$self->enter_map ($map, $x, $y);
2196	}	2441	}
2197		2442
2198	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2443	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2199		2444
2200	Moves the player to the given map-path and coordinates by first freezing	2445	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	2446	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	2447	that has to return the map if sucecssful, and then unfreezes the player on
2203	the new (success) or old (failed) map position.	2448	the new (success) or old (failed) map position. In either case, $done will
		2449	be called at the end of this process.
2204		2450
2205	=cut	2451	=cut
2206		2452
2207	our $GOTOGEN;	2453	our $GOTOGEN;
2208		2454
2209	sub cf::object::player::goto {	2455	sub cf::object::player::goto {
2210	my ($self, $path, $x, $y, $check) = @_;	2456	my ($self, $path, $x, $y, $check, $done) = @_;
2211		2457
2212	# do generation counting so two concurrent goto's will be executed in-order	2458	# do generation counting so two concurrent goto's will be executed in-order
2213	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2459	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2214		2460
2215	$self->enter_link;	2461	$self->enter_link;
2216		2462
2217	(async {	2463	(async {
		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
2218	my $map = eval {	2483	my $map = eval {
2219	my $map = cf::map::find $path;	2484	my $map = defined $path ? cf::map::find $path : undef;
2220		2485
2221	if ($map) {	2486	if ($map) {
2222	$map = $map->customise_for ($self);	2487	$map = $map->customise_for ($self);
2223	$map = $check->($map) if $check && $map;	2488	$map = $check->($map) if $check && $map;
2224	} else {	2489	} else {
2225	$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);
2226	}	2491	}
2227		2492
2228	$map	2493	$map
2229	};	2494	};
2230		2495
…		…
2235		2500
2236	if ($gen == $self->{_goto_generation}) {	2501	if ($gen == $self->{_goto_generation}) {
2237	delete $self->{_goto_generation};	2502	delete $self->{_goto_generation};
2238	$self->leave_link ($map, $x, $y);	2503	$self->leave_link ($map, $x, $y);
2239	}	2504	}
		2505
		2506	$done->() if $done;
2240	})->prio (1);	2507	})->prio (1);
2241	}	2508	}
2242		2509
2243	=item $player_object->enter_exit ($exit_object)	2510	=item $player_object->enter_exit ($exit_object)
2244		2511
…		…
2313	my $hp = $exit->stats->hp;	2580	my $hp = $exit->stats->hp;
2314	my $sp = $exit->stats->sp;	2581	my $sp = $exit->stats->sp;
2315		2582
2316	$self->enter_link;	2583	$self->enter_link;
2317		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
2318	(async {	2589	(async {
2319	$self->deactivate_recursive; # just to be sure	2590	$self->deactivate_recursive; # just to be sure
2320	unless (eval {	2591	unless (eval {
2321	$self->goto ($slaying, $hp, $sp);	2592	$self->goto ($slaying, $hp, $sp);
2322		2593
…		…
2349		2620
2350	utf8::encode $text;	2621	utf8::encode $text;
2351	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2622	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2352	}	2623	}
2353		2624
2354	=item $client->send_msg ($color, $type, $msg, [extra...])	2625	=item $client->send_msg ($channel, $msg, $color, [extra...])
2355		2626
2356	Send a drawinfo or msg packet to the client, formatting the msg for the	2627	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	2628	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	2629	the message, with C<log> being the default. If C<$color> is negative, suppress
2359	the message unless the client supports the msg packet.	2630	the message unless the client supports the msg packet.
2360		2631
2361	=cut	2632	=cut
2362		2633
		2634	our %CHANNEL = (
		2635	"c/identify" => {
		2636	id => "identify",
		2637	title => "Identify",
		2638	reply => undef,
		2639	tooltip => "Items recently identified",
		2640	},
		2641	"c/examine" => {
		2642	id => "examine",
		2643	title => "Examine",
		2644	reply => undef,
		2645	tooltip => "Signs and other items you examined",
		2646	},
		2647	);
		2648
2363	sub cf::client::send_msg {	2649	sub cf::client::send_msg {
2364	my ($self, $color, $type, $msg, @extra) = @_;	2650	my ($self, $channel, $msg, $color, @extra) = @_;
2365		2651
2366	$msg = $self->pl->expand_cfpod ($msg);	2652	$msg = $self->pl->expand_cfpod ($msg);
2367		2653
		2654	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2655
		2656	# check predefined channels, for the benefit of C
		2657	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};
		2658
		2659	if (ref $channel) {
		2660	# send meta info to client, if not yet sent
		2661	unless (exists $self->{channel}{$channel->{id}}) {
		2662	$self->{channel}{$channel->{id}} = $channel;
		2663	$self->ext_msg (channel_info => $channel)
		2664	if $self->can_msg;
		2665	}
		2666
		2667	$channel = $channel->{id};
		2668	}
		2669
		2670	return unless @extra || length $msg;
		2671
2368	if ($self->can_msg) {	2672	if ($self->can_msg) {
2369	$self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);	2673	# default colour, mask it out
		2674	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2675	if $color & cf::NDI_DEF;
		2676
		2677	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2678	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2370	} else {	2679	} 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) {	2680	if ($color >= 0) {
		2681	# replace some tags by gcfclient-compatible ones
		2682	for ($msg) {
		2683	1 while
		2684	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2685	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2686	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2687	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2688	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2689	}
		2690
		2691	$color &= cf::NDI_COLOR_MASK;
		2692
		2693	utf8::encode $msg;
		2694
2382	if ($msg =~ /\[/) {	2695	if (0 && $msg =~ /\[/) {
		2696	# COMMAND/INFO
2383	$self->send_packet ("drawextinfo $color 4 0 $msg")	2697	$self->send_packet ("drawextinfo $color 10 8 $msg")
2384	} else {	2698	} else {
		2699	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2385	$self->send_packet ("drawinfo $color $msg")	2700	$self->send_packet ("drawinfo $color $msg")
2386	}	2701	}
2387	}	2702	}
2388	}	2703	}
2389	}	2704	}
2390		2705
2391	=item $client->ext_event ($type, %msg)	2706	=item $client->ext_msg ($type, @msg)
2392		2707
2393	Sends an exti event to the client.	2708	Sends an ext event to the client.
2394		2709
2395	=cut	2710	=cut
2396		2711
2397	sub cf::client::ext_event($$%) {	2712	sub cf::client::ext_msg($$@) {
2398	my ($self, $type, %msg) = @_;	2713	my ($self, $type, @msg) = @_;
2399		2714
		2715	if ($self->extcmd == 2) {
		2716	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2717	} elsif ($self->extcmd == 1) { # TODO: remove
2400	$msg{msgtype} = "event_$type";	2718	push @msg, msgtype => "event_$type";
2401	$self->send_packet ("ext " . cf::to_json \%msg);	2719	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2720	}
		2721	}
		2722
		2723	=item $client->ext_reply ($msgid, @msg)
		2724
		2725	Sends an ext reply to the client.
		2726
		2727	=cut
		2728
		2729	sub cf::client::ext_reply($$@) {
		2730	my ($self, $id, @msg) = @_;
		2731
		2732	if ($self->extcmd == 2) {
		2733	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2734	} elsif ($self->extcmd == 1) {
		2735	#TODO: version 1, remove
		2736	unshift @msg, msgtype => "reply", msgid => $id;
		2737	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2738	}
2402	}	2739	}
2403		2740
2404	=item $success = $client->query ($flags, "text", \&cb)	2741	=item $success = $client->query ($flags, "text", \&cb)
2405		2742
2406	Queues a query to the client, calling the given callback with	2743	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>,	2744	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>.	2745	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2409		2746
2410	Queries can fail, so check the return code. Or don't, as queries will become	2747	Queries can fail, so check the return code. Or don't, as queries will
2411	reliable at some point in the future.	2748	become reliable at some point in the future.
2412		2749
2413	=cut	2750	=cut
2414		2751
2415	sub cf::client::query {	2752	sub cf::client::query {
2416	my ($self, $flags, $text, $cb) = @_;	2753	my ($self, $flags, $text, $cb) = @_;
…		…
2424	utf8::encode $text;	2761	utf8::encode $text;
2425	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];	2762	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2426		2763
2427	$self->send_packet ($self->{query_queue}[0][0])	2764	$self->send_packet ($self->{query_queue}[0][0])
2428	if @{ $self->{query_queue} } == 1;	2765	if @{ $self->{query_queue} } == 1;
		2766
		2767	1
2429	}	2768	}
2430		2769
2431	cf::client->attach (	2770	cf::client->attach (
		2771	on_connect => sub {
		2772	my ($ns) = @_;
		2773
		2774	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2775	},
2432	on_reply => sub {	2776	on_reply => sub {
2433	my ($ns, $msg) = @_;	2777	my ($ns, $msg) = @_;
2434		2778
2435	# this weird shuffling is so that direct followup queries	2779	# this weird shuffling is so that direct followup queries
2436	# get handled first	2780	# get handled first
…		…
2448	} else {	2792	} else {
2449	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;	2793	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2450	}	2794	}
2451	}	2795	}
2452	},	2796	},
		2797	on_exticmd => sub {
		2798	my ($ns, $buf) = @_;
		2799
		2800	my $msg = eval { $ns->{json_coder}->decode ($buf) };
		2801
		2802	if (ref $msg) {
		2803	my ($type, $reply, @payload) =
		2804	"ARRAY" eq ref $msg
		2805	? @$msg
		2806	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2807
		2808	my @reply;
		2809
		2810	if (my $cb = $EXTICMD{$type}) {
		2811	@reply = $cb->($ns, @payload);
		2812	}
		2813
		2814	$ns->ext_reply ($reply, @reply)
		2815	if $reply;
		2816
		2817	} else {
		2818	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
		2819	}
		2820
		2821	cf::override;
		2822	},
2453	);	2823	);
2454		2824
2455	=item $client->async (\&cb)	2825	=item $client->async (\&cb)
2456		2826
2457	Create a new coroutine, running the specified callback. The coroutine will	2827	Create a new coroutine, running the specified callback. The coroutine will
…		…
2498	our $safe = new Safe "safe";	2868	our $safe = new Safe "safe";
2499	our $safe_hole = new Safe::Hole;	2869	our $safe_hole = new Safe::Hole;
2500		2870
2501	$SIG{FPE} = 'IGNORE';	2871	$SIG{FPE} = 'IGNORE';
2502		2872
2503	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2873	$safe->permit_only (Opcode::opset qw(
		2874	:base_core :base_mem :base_orig :base_math
		2875	grepstart grepwhile mapstart mapwhile
		2876	sort time
		2877	));
2504		2878
2505	# here we export the classes and methods available to script code	2879	# here we export the classes and methods available to script code
2506		2880
2507	=pod	2881	=pod
2508		2882
2509	The following functions and methods are available within a safe environment:	2883	The following functions and methods are available within a safe environment:
2510		2884
2511	cf::object contr pay_amount pay_player map	2885	cf::object
		2886	contr pay_amount pay_player map x y force_find force_add
		2887	insert remove name archname title slaying race decrease_ob_nr
		2888
2512	cf::object::player player	2889	cf::object::player
2513	cf::player peaceful	2890	player
2514	cf::map trigger	2891
		2892	cf::player
		2893	peaceful
		2894
		2895	cf::map
		2896	trigger
2515		2897
2516	=cut	2898	=cut
2517		2899
2518	for (	2900	for (
2519	["cf::object" => qw(contr pay_amount pay_player map)],	2901	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2902	insert remove inv name archname title slaying race
		2903	decrease_ob_nr)],
2520	["cf::object::player" => qw(player)],	2904	["cf::object::player" => qw(player)],
2521	["cf::player" => qw(peaceful)],	2905	["cf::player" => qw(peaceful)],
2522	["cf::map" => qw(trigger)],	2906	["cf::map" => qw(trigger)],
2523	) {	2907	) {
2524	no strict 'refs';	2908	no strict 'refs';
…		…
2600	# the server's init and main functions	2984	# the server's init and main functions
2601		2985
2602	sub load_facedata($) {	2986	sub load_facedata($) {
2603	my ($path) = @_;	2987	my ($path) = @_;
2604		2988
		2989	# HACK to clear player env face cache, we need some signal framework
		2990	# for this (global event?)
		2991	%ext::player_env::MUSIC_FACE_CACHE = ();
		2992
		2993	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		2994
2605	warn "loading facedata from $path\n";	2995	warn "loading facedata from $path\n";
2606		2996
2607	my $facedata;	2997	my $facedata;
2608	0 < aio_load $path, $facedata	2998	0 < aio_load $path, $facedata
2609	or die "$path: $!";	2999	or die "$path: $!";
…		…
2611	$facedata = Coro::Storable::thaw $facedata;	3001	$facedata = Coro::Storable::thaw $facedata;
2612		3002
2613	$facedata->{version} == 2	3003	$facedata->{version} == 2
2614	or cf::cleanup "$path: version mismatch, cannot proceed.";	3004	or cf::cleanup "$path: version mismatch, cannot proceed.";
2615		3005
		3006	# patch in the exptable
		3007	$facedata->{resource}{"res/exp_table"} = {
		3008	type => FT_RSRC,
		3009	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3010	};
		3011	cf::cede_to_tick;
		3012
2616	{	3013	{
2617	my $faces = $facedata->{faceinfo};	3014	my $faces = $facedata->{faceinfo};
2618		3015
2619	while (my ($face, $info) = each %$faces) {	3016	while (my ($face, $info) = each %$faces) {
2620	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3017	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2621	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3018	cf::face::set_visibility $idx, $info->{visibility};
		3019	cf::face::set_magicmap $idx, $info->{magicmap};
2622	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3020	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2623	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3021	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2624	Coro::cede;	3022
		3023	cf::cede_to_tick;
2625	}	3024	}
2626		3025
2627	while (my ($face, $info) = each %$faces) {	3026	while (my ($face, $info) = each %$faces) {
2628	next unless $info->{smooth};	3027	next unless $info->{smooth};
2629	my $idx = cf::face::find $face	3028	my $idx = cf::face::find $face
2630	or next;	3029	or next;
2631	if (my $smooth = cf::face::find $info->{smooth}) {	3030	if (my $smooth = cf::face::find $info->{smooth}) {
		3031	cf::face::set_smooth $idx, $smooth;
2632	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3032	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2633	} else {	3033	} else {
2634	warn "smooth face '$info->{smooth}' not found for face '$face'";	3034	warn "smooth face '$info->{smooth}' not found for face '$face'";
2635	}	3035	}
2636	Coro::cede;	3036
		3037	cf::cede_to_tick;
2637	}	3038	}
2638	}	3039	}
2639		3040
2640	{	3041	{
2641	my $anims = $facedata->{animinfo};	3042	my $anims = $facedata->{animinfo};
2642		3043
2643	while (my ($anim, $info) = each %$anims) {	3044	while (my ($anim, $info) = each %$anims) {
2644	cf::anim::set $anim, $info->{frames}, $info->{facings};	3045	cf::anim::set $anim, $info->{frames}, $info->{facings};
2645	Coro::cede;	3046	cf::cede_to_tick;
2646	}	3047	}
2647		3048
2648	cf::anim::invalidate_all; # d'oh	3049	cf::anim::invalidate_all; # d'oh
2649	}	3050	}
2650		3051
		3052	{
		3053	# TODO: for gcfclient pleasure, we should give resources
		3054	# that gcfclient doesn't grok a >10000 face index.
		3055	my $res = $facedata->{resource};
		3056
		3057	my $soundconf = delete $res->{"res/sound.conf"};
		3058
		3059	while (my ($name, $info) = each %$res) {
		3060	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3061	my $data;
		3062
		3063	if ($info->{type} & 1) {
		3064	# prepend meta info
		3065
		3066	my $meta = $enc->encode ({
		3067	name => $name,
		3068	%{ $info->{meta} || {} },
		3069	});
		3070
		3071	$data = pack "(w/a*)*", $meta, $info->{data};
		3072	} else {
		3073	$data = $info->{data};
		3074	}
		3075
		3076	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3077	cf::face::set_type $idx, $info->{type};
		3078
		3079	cf::cede_to_tick;
		3080	}
		3081
		3082	if ($soundconf) {
		3083	$soundconf = $enc->decode (delete $soundconf->{data});
		3084
		3085	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3086	my $sound = $soundconf->{compat}[$_]
		3087	or next;
		3088
		3089	my $face = cf::face::find "sound/$sound->[1]";
		3090	cf::sound::set $sound->[0] => $face;
		3091	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3092	}
		3093
		3094	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3095	my $face = cf::face::find "sound/$v";
		3096	cf::sound::set $k => $face;
		3097	}
		3098	}
		3099	}
		3100
2651	1	3101	1
2652	}	3102	}
2653		3103
		3104	register_exticmd fx_want => sub {
		3105	my ($ns, $want) = @_;
		3106
		3107	while (my ($k, $v) = each %$want) {
		3108	$ns->fx_want ($k, $v);
		3109	}
		3110	};
		3111
2654	sub reload_regions {	3112	sub reload_regions {
		3113	# HACK to clear player env face cache, we need some signal framework
		3114	# for this (global event?)
		3115	%ext::player_env::MUSIC_FACE_CACHE = ();
		3116
2655	load_resource_file "$MAPDIR/regions"	3117	load_resource_file "$MAPDIR/regions"
2656	or die "unable to load regions file\n";	3118	or die "unable to load regions file\n";
		3119
		3120	for (cf::region::list) {
		3121	$_->{match} = qr/$_->{match}/
		3122	if exists $_->{match};
		3123	}
2657	}	3124	}
2658		3125
2659	sub reload_facedata {	3126	sub reload_facedata {
2660	load_facedata "$DATADIR/facedata"	3127	load_facedata "$DATADIR/facedata"
2661	or die "unable to load facedata\n";	3128	or die "unable to load facedata\n";
2662	}	3129	}
2663		3130
2664	sub reload_archetypes {	3131	sub reload_archetypes {
		3132	load_resource_file "$DATADIR/archetypes"
		3133	or die "unable to load archetypes\n";
		3134	#d# NEED to laod twice to resolve forward references
		3135	# this really needs to be done in an extra post-pass
		3136	# (which needs to be synchronous, so solve it differently)
2665	load_resource_file "$DATADIR/archetypes"	3137	load_resource_file "$DATADIR/archetypes"
2666	or die "unable to load archetypes\n";	3138	or die "unable to load archetypes\n";
2667	}	3139	}
2668		3140
2669	sub reload_treasures {	3141	sub reload_treasures {
…		…
2685		3157
2686	sub init {	3158	sub init {
2687	reload_resources;	3159	reload_resources;
2688	}	3160	}
2689		3161
2690	sub cfg_load {	3162	sub reload_config {
2691	open my $fh, "<:utf8", "$CONFDIR/config"	3163	open my $fh, "<:utf8", "$CONFDIR/config"
2692	or return;	3164	or return;
2693		3165
2694	local $/;	3166	local $/;
2695	*CFG = YAML::Syck::Load <$fh>;	3167	*CFG = YAML::Syck::Load <$fh>;
…		…
2715	(async {	3187	(async {
2716	Event::one_event;	3188	Event::one_event;
2717	})->prio (Coro::PRIO_MAX);	3189	})->prio (Coro::PRIO_MAX);
2718	};	3190	};
2719		3191
2720	cfg_load;	3192	reload_config;
2721	db_init;	3193	db_init;
2722	load_extensions;	3194	load_extensions;
2723		3195
2724	$TICK_WATCHER->start;	3196	$TICK_WATCHER->start;
2725	Event::loop;	3197	Event::loop;
…		…
2863	%EXT_CORO = ();	3335	%EXT_CORO = ();
2864		3336
2865	warn "removing commands";	3337	warn "removing commands";
2866	%COMMAND = ();	3338	%COMMAND = ();
2867		3339
2868	warn "removing ext commands";	3340	warn "removing ext/exti commands";
2869	%EXTCMD = ();	3341	%EXTCMD = ();
		3342	%EXTICMD = ();
2870		3343
2871	warn "unloading/nuking all extensions";	3344	warn "unloading/nuking all extensions";
2872	for my $pkg (@EXTS) {	3345	for my $pkg (@EXTS) {
2873	warn "... unloading $pkg";	3346	warn "... unloading $pkg";
2874		3347
…		…
2917	warn "reloading cf.pm";	3390	warn "reloading cf.pm";
2918	require cf;	3391	require cf;
2919	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3392	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2920		3393
2921	warn "loading config and database again";	3394	warn "loading config and database again";
2922	cf::cfg_load;	3395	cf::reload_config;
2923		3396
2924	warn "loading extensions";	3397	warn "loading extensions";
2925	cf::load_extensions;	3398	cf::load_extensions;
2926		3399
2927	warn "reattaching attachments to objects/players";	3400	warn "reattaching attachments to objects/players";
…		…
2992	my $signal = new Coro::Signal;	3465	my $signal = new Coro::Signal;
2993	push @WAIT_FOR_TICK_BEGIN, $signal;	3466	push @WAIT_FOR_TICK_BEGIN, $signal;
2994	$signal->wait;	3467	$signal->wait;
2995	}	3468	}
2996		3469
2997	my $min = 1e6;#d#
2998	my $avg = 10;
2999	$TICK_WATCHER = Event->timer (	3470	$TICK_WATCHER = Event->timer (
3000	reentrant => 0,	3471	reentrant => 0,
3001	parked => 1,	3472	parked => 1,
3002	prio => 0,	3473	prio => 0,
3003	at => $NEXT_TICK || $TICK,	3474	at => $NEXT_TICK || $TICK,
…		…
3011		3482
3012	$NOW = $tick_start = Event::time;	3483	$NOW = $tick_start = Event::time;
3013		3484
3014	cf::server_tick; # one server iteration	3485	cf::server_tick; # one server iteration
3015		3486
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
3039	$RUNTIME += $TICK;	3487	$RUNTIME += $TICK;
3040	$NEXT_TICK += $TICK;	3488	$NEXT_TICK += $TICK;
3041		3489
3042	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3490	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3043	$NEXT_RUNTIME_WRITE = $NOW + 10;	3491	$NEXT_RUNTIME_WRITE = $NOW + 10;
…		…
3045	write_runtime	3493	write_runtime
3046	or warn "ERROR: unable to write runtime file: $!";	3494	or warn "ERROR: unable to write runtime file: $!";
3047	};	3495	};
3048	}	3496	}
3049		3497
3050	# my $AFTER = Event::time;
3051	# warn $AFTER - $NOW;#d#
3052
3053	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3498	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3054	$sig->send;	3499	$sig->send;
3055	}	3500	}
3056	while (my $sig = shift @WAIT_FOR_TICK) {	3501	while (my $sig = shift @WAIT_FOR_TICK) {
3057	$sig->send;	3502	$sig->send;
…		…
3067		3512
3068	$LOAD = ($NOW - $tick_start) / $TICK;	3513	$LOAD = ($NOW - $tick_start) / $TICK;
3069	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3514	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3070		3515
3071	_post_tick;	3516	_post_tick;
3072
3073
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	(
…		…
3101	)	3544	)
3102	};	3545	};
3103		3546
3104	unless ($DB_ENV) {	3547	unless ($DB_ENV) {
3105	$DB_ENV = BDB::db_env_create;	3548	$DB_ENV = BDB::db_env_create;
		3549	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3550	| BDB::LOG_AUTOREMOVE, 1);
		3551	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3552	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3106		3553
3107	cf::sync_job {	3554	cf::sync_job {
3108	eval {	3555	eval {
3109	BDB::db_env_open	3556	BDB::db_env_open
3110	$DB_ENV,	3557	$DB_ENV,
…		…
3112	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3559	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3113	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3560	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3114	0666;	3561	0666;
3115		3562
3116	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3563	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3117
3118	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3119	$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_DEADLOCK_WATCHER = Event->timer (
		3571	after => 3,
		3572	interval => 1,
		3573	hard => 1,
		3574	prio => 0,
		3575	data => WF_AUTOCANCEL,
		3576	cb => sub {
		3577	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3578	},
		3579	);
		3580	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3581	after => 11,
		3582	interval => 60,
		3583	hard => 1,
		3584	prio => 0,
		3585	data => WF_AUTOCANCEL,
		3586	cb => sub {
		3587	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3588	},
		3589	);
		3590	$BDB_TRICKLE_WATCHER = Event->timer (
		3591	after => 5,
		3592	interval => 10,
		3593	hard => 1,
		3594	prio => 0,
		3595	data => WF_AUTOCANCEL,
		3596	cb => sub {
		3597	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3598	},
		3599	);
3125	}	3600	}
3126		3601
3127	{	3602	{
3128	IO::AIO::min_parallel 8;	3603	IO::AIO::min_parallel 8;
3129		3604

Diff Legend

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