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.281 by root, Sat Jun 16 23:22:59 2007 UTC vs.
Revision 1.358 by root, Fri Sep 7 18:10:52 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;
…		…
83	our %CFG;	87	our %CFG;
84		88
85	our $UPTIME; $UPTIME ||= time;	89	our $UPTIME; $UPTIME ||= time;
86	our $RUNTIME;	90	our $RUNTIME;
87		91
88	our %PLAYER; # all users	92	our (%PLAYER, %PLAYER_LOADING); # all users
89	our %MAP; # all maps	93	our (%MAP, %MAP_LOADING ); # all maps
90	our $LINK_MAP; # the special {link} map, which is always available	94	our $LINK_MAP; # the special {link} map, which is always available
91		95
92	# used to convert map paths into valid unix filenames by replacing / by ∕	96	# used to convert map paths into valid unix filenames by replacing / by ∕
93	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	97	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94		98
…		…
163	=item cf::wait_for_tick, cf::wait_for_tick_begin	167	=item cf::wait_for_tick, cf::wait_for_tick_begin
164		168
165	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	169	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	170	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.	171	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
		172
		173	=item @cf::INVOKE_RESULTS
		174
		175	This array contains the results of the last C<invoke ()> call. When
		176	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
		177	that call.
168		178
169	=back	179	=back
170		180
171	=cut	181	=cut
172		182
…		…
236	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	246	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237	$d	247	$d
238	} || "[unable to dump $_[0]: '$@']";	248	} || "[unable to dump $_[0]: '$@']";
239	}	249	}
240		250
241	use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243	=item $ref = cf::from_json $json	251	=item $ref = cf::from_json $json
244		252
245	Converts a JSON string into the corresponding perl data structure.	253	Converts a JSON string into the corresponding perl data structure.
246		254
247	=item $json = cf::to_json $ref	255	=item $json = cf::to_json $ref
248		256
249	Converts a perl data structure into its JSON representation.	257	Converts a perl data structure into its JSON representation.
		258
		259	=cut
		260
		261	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
		262
		263	sub to_json ($) { $json_coder->encode ($_[0]) }
		264	sub from_json ($) { $json_coder->decode ($_[0]) }
250		265
251	=item cf::lock_wait $string	266	=item cf::lock_wait $string
252		267
253	Wait until the given lock is available. See cf::lock_acquire.	268	Wait until the given lock is available. See cf::lock_acquire.
254		269
…		…
257	Wait until the given lock is available and then acquires it and returns	272	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,	273	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	274	for example when the coroutine gets canceled), the lock is automatically
260	returned.	275	returned.
261		276
		277	Locks are *not* recursive, locking from the same coro twice results in a
		278	deadlocked coro.
		279
262	Lock names should begin with a unique identifier (for example, cf::map::find	280	Lock names should begin with a unique identifier (for example, cf::map::find
263	uses map_find and cf::map::load uses map_load).	281	uses map_find and cf::map::load uses map_load).
264		282
265	=item $locked = cf::lock_active $string	283	=item $locked = cf::lock_active $string
266		284
267	Return true if the lock is currently active, i.e. somebody has locked it.	285	Return true if the lock is currently active, i.e. somebody has locked it.
268		286
269	=cut	287	=cut
270		288
271	our %LOCK;	289	our %LOCK;
		290	our %LOCKER;#d#
272		291
273	sub lock_wait($) {	292	sub lock_wait($) {
274	my ($key) = @_;	293	my ($key) = @_;
		294
		295	if ($LOCKER{$key} == $Coro::current) {#d#
		296	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		297	return;#d#
		298	}#d#
275		299
276	# wait for lock, if any	300	# wait for lock, if any
277	while ($LOCK{$key}) {	301	while ($LOCK{$key}) {
278	push @{ $LOCK{$key} }, $Coro::current;	302	push @{ $LOCK{$key} }, $Coro::current;
279	Coro::schedule;	303	Coro::schedule;
…		…
285		309
286	# wait, to be sure we are not locked	310	# wait, to be sure we are not locked
287	lock_wait $key;	311	lock_wait $key;
288		312
289	$LOCK{$key} = [];	313	$LOCK{$key} = [];
		314	$LOCKER{$key} = $Coro::current;#d#
290		315
291	Coro::guard {	316	Coro::guard {
		317	delete $LOCKER{$key};#d#
292	# wake up all waiters, to be on the safe side	318	# wake up all waiters, to be on the safe side
293	$_->ready for @{ delete $LOCK{$key} };	319	$_->ready for @{ delete $LOCK{$key} };
294	}	320	}
295	}	321	}
296		322
…		…
306	my $guard = Coro::guard {	332	my $guard = Coro::guard {
307	$TICK_WATCHER->start;	333	$TICK_WATCHER->start;
308	};	334	};
309	$TICK_WATCHER->stop;	335	$TICK_WATCHER->stop;
310	$guard	336	$guard
		337	}
		338
		339	=item cf::get_slot $time[, $priority[, $name]]
		340
		341	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		342	This call blocks and returns only when you have at least C<$time> seconds
		343	of cpu time till the next tick. The slot is only valid till the next cede.
		344
		345	The optional C<$name> can be used to identify the job to run. It might be
		346	used for statistical purposes and should identify the same time-class.
		347
		348	Useful for short background jobs.
		349
		350	=cut
		351
		352	our @SLOT_QUEUE;
		353	our $SLOT_QUEUE;
		354
		355	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		356	$SLOT_QUEUE = Coro::async {
		357	my $signal = new Coro::Signal;
		358
		359	while () {
		360	next_job:
		361	my $avail = cf::till_tick;
		362	if ($avail > 0.01) {
		363	for (0 .. $#SLOT_QUEUE) {
		364	if ($SLOT_QUEUE[$_][0] < $avail) {
		365	my $job = splice @SLOT_QUEUE, $_, 1, ();
		366	$job->[2]->send;
		367	Coro::cede;
		368	goto next_job;
		369	}
		370	}
		371	}
		372
		373	if (@SLOT_QUEUE) {
		374	# we do not use wait_For_tick() as it returns immediately when tick is inactive
		375	push @cf::WAIT_FOR_TICK, $signal;
		376	$signal->wait;
		377	} else {
		378	Coro::schedule;
		379	}
		380	}
		381	};
		382
		383	sub get_slot($;$$) {
		384	my ($time, $pri, $name) = @_;
		385
		386	$time = $TICK * .6 if $time > $TICK * .6;
		387	my $sig = new Coro::Signal;
		388
		389	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		390	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		391	$SLOT_QUEUE->ready;
		392	$sig->wait;
311	}	393	}
312		394
313	=item cf::async { BLOCK }	395	=item cf::async { BLOCK }
314		396
315	Currently the same as Coro::async_pool, meaning you cannot use	397	Currently the same as Coro::async_pool, meaning you cannot use
…		…
405	=cut	487	=cut
406		488
407	sub fork_call(&@) {	489	sub fork_call(&@) {
408	my ($cb, @args) = @_;	490	my ($cb, @args) = @_;
409		491
410	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	492	# we seemingly have to make a local copy of the whole thing,
411	# or die "socketpair: $!";	493	# otherwise perl prematurely frees the stuff :/
412	pipe my $fh1, my $fh2	494	# TODO: investigate and fix (likely this will be rather laborious)
413	or die "pipe: $!";
414		495
415	if (my $pid = fork) {	496	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;	497	reset_signals;
428	local $SIG{__WARN__};	498	&$cb
429	local $SIG{__DIE__};	499	}, @args;
430	eval {
431	close $fh1;
432		500
433	my @res = eval { $cb->(@args) };	501	wantarray ? @res : $res[-1]
434	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
435	};
436
437	warn $@ if $@;
438	_exit 0;
439	}
440	}	502	}
441		503
442	=item $value = cf::db_get $family => $key	504	=item $value = cf::db_get $family => $key
443		505
444	Returns a single value from the environment database.	506	Returns a single value from the environment database.
…		…
524	if (1) {	586	if (1) {
525	$md5 =	587	$md5 =
526	join "\x00",	588	join "\x00",
527	$processversion,	589	$processversion,
528	map {	590	map {
529	Coro::cede;	591	cf::cede_to_tick;
530	($src->[$_], Digest::MD5::md5_hex $data[$_])	592	($src->[$_], Digest::MD5::md5_hex $data[$_])
531	} 0.. $#$src;	593	} 0.. $#$src;
532		594
533		595
534	my $dbmd5 = db_get cache => "$id/md5";	596	my $dbmd5 = db_get cache => "$id/md5";
…		…
840	";	902	";
841	die if $@;	903	die if $@;
842	}	904	}
843		905
844	our $override;	906	our $override;
845	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	907	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846		908
847	sub override {	909	sub override {
848	$override = 1;	910	$override = 1;
849	@invoke_results = ();	911	@INVOKE_RESULTS = (@_);
850	}	912	}
851		913
852	sub do_invoke {	914	sub do_invoke {
853	my $event = shift;	915	my $event = shift;
854	my $callbacks = shift;	916	my $callbacks = shift;
855		917
856	@invoke_results = ();	918	@INVOKE_RESULTS = ();
857		919
858	local $override;	920	local $override;
859		921
860	for (@$callbacks) {	922	for (@$callbacks) {
861	eval { &{$_->[1]} };	923	eval { &{$_->[1]} };
…		…
878		940
879	Generate an object-specific event with the given arguments.	941	Generate an object-specific event with the given arguments.
880		942
881	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	943	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	944	removed in future versions), and there is no public API to access override
883	results (if you must, access C<@cf::invoke_results> directly).	945	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884		946
885	=back	947	=back
886		948
887	=cut	949	=cut
888		950
889	#############################################################################	951	#############################################################################
890	# object support	952	# object support
		953	#
		954
		955	sub _can_merge {
		956	my ($ob1, $ob2) = @_;
		957
		958	local $Storable::canonical = 1;
		959	my $fob1 = Storable::freeze $ob1;
		960	my $fob2 = Storable::freeze $ob2;
		961
		962	$fob1 eq $fob2
		963	}
891		964
892	sub reattach {	965	sub reattach {
893	# basically do the same as instantiate, without calling instantiate	966	# basically do the same as instantiate, without calling instantiate
894	my ($obj) = @_;	967	my ($obj) = @_;
895		968
…		…
939	},	1012	},
940	);	1013	);
941		1014
942	sub object_freezer_save {	1015	sub object_freezer_save {
943	my ($filename, $rdata, $objs) = @_;	1016	my ($filename, $rdata, $objs) = @_;
		1017
		1018	my $guard = cf::lock_acquire "io";
944		1019
945	sync_job {	1020	sync_job {
946	if (length $$rdata) {	1021	if (length $$rdata) {
947	warn sprintf "saving %s (%d,%d)\n",	1022	warn sprintf "saving %s (%d,%d)\n",
948	$filename, length $$rdata, scalar @$objs;	1023	$filename, length $$rdata, scalar @$objs;
…		…
972	}	1047	}
973	} else {	1048	} else {
974	aio_unlink $filename;	1049	aio_unlink $filename;
975	aio_unlink "$filename.pst";	1050	aio_unlink "$filename.pst";
976	}	1051	}
977	}	1052	};
		1053
		1054	undef $guard;
978	}	1055	}
979		1056
980	sub object_freezer_as_string {	1057	sub object_freezer_as_string {
981	my ($rdata, $objs) = @_;	1058	my ($rdata, $objs) = @_;
982		1059
…		…
987		1064
988	sub object_thawer_load {	1065	sub object_thawer_load {
989	my ($filename) = @_;	1066	my ($filename) = @_;
990		1067
991	my ($data, $av);	1068	my ($data, $av);
		1069
		1070	my $guard = cf::lock_acquire "io";
992		1071
993	(aio_load $filename, $data) >= 0	1072	(aio_load $filename, $data) >= 0
994	or return;	1073	or return;
995		1074
996	unless (aio_stat "$filename.pst") {	1075	unless (aio_stat "$filename.pst") {
997	(aio_load "$filename.pst", $av) >= 0	1076	(aio_load "$filename.pst", $av) >= 0
998	or return;	1077	or return;
		1078
		1079	undef $guard;
999	$av = eval { (Storable::thaw $av)->{objs} };	1080	$av = eval { (Storable::thaw $av)->{objs} };
1000	}	1081	}
1001		1082
1002	warn sprintf "loading %s (%d)\n",	1083	warn sprintf "loading %s (%d)\n",
1003	$filename, length $data, scalar @{$av || []};	1084	$filename, length $data, scalar @{$av || []};
		1085
1004	return ($data, $av);	1086	($data, $av)
1005	}	1087	}
1006		1088
1007	=head2 COMMAND CALLBACKS	1089	=head2 COMMAND CALLBACKS
1008		1090
1009	=over 4	1091	=over 4
…		…
1029	push @{ $COMMAND{$name} }, [$caller, $cb];	1111	push @{ $COMMAND{$name} }, [$caller, $cb];
1030	}	1112	}
1031		1113
1032	=item cf::register_extcmd $name => \&callback($pl,$packet);	1114	=item cf::register_extcmd $name => \&callback($pl,$packet);
1033		1115
1034	Register a callback fro execution when the client sends an extcmd packet.	1116	Register a callback for execution when the client sends an (synchronous)
		1117	extcmd packet. Ext commands will be processed in the order they are
		1118	received by the server, like other user commands. The first argument is
		1119	the logged-in player. Ext commands can only be processed after a player
		1120	has logged in successfully.
1035		1121
1036	If the callback returns something, it is sent back as if reply was being	1122	If the callback returns something, it is sent back as if reply was being
1037	called.	1123	called.
1038		1124
		1125	=item cf::register_exticmd $name => \&callback($ns,$packet);
		1126
		1127	Register a callback for execution when the client sends an (asynchronous)
		1128	exticmd packet. Exti commands are processed by the server as soon as they
		1129	are received, i.e. out of order w.r.t. other commands. The first argument
		1130	is a client socket. Exti commands can be received anytime, even before
		1131	log-in.
		1132
		1133	If the callback returns something, it is sent back as if reply was being
		1134	called.
		1135
1039	=cut	1136	=cut
1040		1137
1041	sub register_extcmd {	1138	sub register_extcmd {
1042	my ($name, $cb) = @_;	1139	my ($name, $cb) = @_;
1043		1140
1044	$EXTCMD{$name} = $cb;	1141	$EXTCMD{$name} = $cb;
		1142	}
		1143
		1144	sub register_exticmd {
		1145	my ($name, $cb) = @_;
		1146
		1147	$EXTICMD{$name} = $cb;
1045	}	1148	}
1046		1149
1047	cf::player->attach (	1150	cf::player->attach (
1048	on_command => sub {	1151	on_command => sub {
1049	my ($pl, $name, $params) = @_;	1152	my ($pl, $name, $params) = @_;
…		…
1058	cf::override;	1161	cf::override;
1059	},	1162	},
1060	on_extcmd => sub {	1163	on_extcmd => sub {
1061	my ($pl, $buf) = @_;	1164	my ($pl, $buf) = @_;
1062		1165
1063	my $msg = eval { from_json $buf };	1166	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064		1167
1065	if (ref $msg) {	1168	if (ref $msg) {
		1169	my ($type, $reply, @payload) =
		1170	"ARRAY" eq ref $msg
		1171	? @$msg
		1172	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1173
		1174	my @reply;
		1175
1066	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1176	if (my $cb = $EXTCMD{$type}) {
1067	if (my %reply = $cb->($pl, $msg)) {	1177	@reply = $cb->($pl, @payload);
1068	$pl->ext_reply ($msg->{msgid}, %reply);
1069	}
1070	}	1178	}
		1179
		1180	$pl->ext_reply ($reply, @reply)
		1181	if $reply;
		1182
1071	} else {	1183	} else {
1072	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1184	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073	}	1185	}
1074		1186
1075	cf::override;	1187	cf::override;
…		…
1209	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1321	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1322	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1323	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212	aio_unlink +(playerdir $login) . "/$login.pl";	1324	aio_unlink +(playerdir $login) . "/$login.pl";
1213		1325
1214	my $pl = load_pl path $login	1326	my $f = new_from_file cf::object::thawer path $login
1215	or return;	1327	or return;
		1328
		1329	$f->next;
		1330	my $pl = cf::player::load_pl $f
		1331	or return;
		1332	local $cf::PLAYER_LOADING{$login} = $pl;
		1333	$f->resolve_delayed_derefs;
1216	$cf::PLAYER{$login} = $pl	1334	$cf::PLAYER{$login} = $pl
1217	}	1335	}
1218	}	1336	}
1219	}	1337	}
1220		1338
…		…
1230		1348
1231	aio_mkdir playerdir $pl, 0770;	1349	aio_mkdir playerdir $pl, 0770;
1232	$pl->{last_save} = $cf::RUNTIME;	1350	$pl->{last_save} = $cf::RUNTIME;
1233		1351
1234	$pl->save_pl ($path);	1352	$pl->save_pl ($path);
1235	Coro::cede;	1353	cf::cede_to_tick;
1236	}	1354	}
1237		1355
1238	sub new($) {	1356	sub new($) {
1239	my ($login) = @_;	1357	my ($login) = @_;
1240		1358
…		…
1244	$self->{deny_save} = 1;	1362	$self->{deny_save} = 1;
1245		1363
1246	$cf::PLAYER{$login} = $self;	1364	$cf::PLAYER{$login} = $self;
1247		1365
1248	$self	1366	$self
		1367	}
		1368
		1369	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1370
		1371	=cut
		1372
		1373	sub send_msg {
		1374	my $ns = shift->ns
		1375	or return;
		1376	$ns->send_msg (@_);
1249	}	1377	}
1250		1378
1251	=item $pl->quit_character	1379	=item $pl->quit_character
1252		1380
1253	Nukes the player without looking back. If logged in, the connection will	1381	Nukes the player without looking back. If logged in, the connection will
…		…
1308	or return [];	1436	or return [];
1309		1437
1310	my @logins;	1438	my @logins;
1311		1439
1312	for my $login (@$dirs) {	1440	for my $login (@$dirs) {
		1441	my $path = path $login;
		1442
		1443	# a .pst is a dead give-away for a valid player
		1444	unless (-e "$path.pst") {
1313	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1445	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314	aio_read $fh, 0, 512, my $buf, 0 or next;	1446	aio_read $fh, 0, 512, my $buf, 0 or next;
1315	$buf !~ /^password -------------$/m or next; # official not-valid tag	1447	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1448	}
1316		1449
1317	utf8::decode $login;	1450	utf8::decode $login;
1318	push @logins, $login;	1451	push @logins, $login;
1319	}	1452	}
1320		1453
…		…
1347	}	1480	}
1348		1481
1349	\@paths	1482	\@paths
1350	}	1483	}
1351		1484
		1485	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
		1486
		1487	Expand crossfire pod fragments into protocol xml.
		1488
		1489	=cut
		1490
		1491	sub expand_cfpod {
		1492	((my $self), (local $_)) = @_;
		1493
		1494	# escape & and <
		1495	s/&/&amp;/g;
		1496	s/(?<![BIUGHT])</&lt;/g;
		1497
		1498	# this is buggy, it needs to properly take care of nested <'s
		1499
		1500	1 while
		1501	# replace B<>, I<>, U<> etc.
		1502	s/B<([^\>]*)>/<b>$1<\/b>/
		1503	|| s/I<([^\>]*)>/<i>$1<\/i>/
		1504	|| s/U<([^\>]*)>/<u>$1<\/u>/
		1505	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
		1506	# replace G<male|female> tags
		1507	|| s{G<([^>|]*)\|([^>]*)>}{
		1508	$self->gender ? $2 : $1
		1509	}ge
		1510	# replace H<hint text>
		1511	|| s{H<([^\>]*)>}
		1512	{
		1513	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1514	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1515	"")
		1516	[$self->{hintmode}]
		1517	}ge;
		1518
		1519	# create single paragraphs (very hackish)
		1520	s/(?<=\S)\n(?=\w)/ /g;
		1521
		1522	# compress some whitespace
		1523	s/\s+\n/\n/g; # ws line-ends
		1524	s/\n\n+/\n/g; # double lines
		1525	s/^\n+//; # beginning lines
		1526	s/\n+$//; # ending lines
		1527
		1528	$_
		1529	}
		1530
		1531	sub hintmode {
		1532	$_[0]{hintmode} = $_[1] if @_ > 1;
		1533	$_[0]{hintmode}
		1534	}
		1535
1352	=item $player->ext_reply ($msgid, %msg)	1536	=item $player->ext_reply ($msgid, @msg)
1353		1537
1354	Sends an ext reply to the player.	1538	Sends an ext reply to the player.
1355		1539
1356	=cut	1540	=cut
1357		1541
1358	sub ext_reply($$%) {	1542	sub ext_reply($$@) {
1359	my ($self, $id, %msg) = @_;	1543	my ($self, $id, @msg) = @_;
1360		1544
1361	$msg{msgid} = $id;	1545	$self->ns->ext_reply ($id, @msg)
1362
1363	$self->send ("ext " . cf::to_json \%msg);
1364	}	1546	}
1365		1547
1366	=item $player->ext_event ($type, %msg)	1548	=item $player->ext_msg ($type, @msg)
1367		1549
1368	Sends an ext event to the client.	1550	Sends an ext event to the client.
1369		1551
1370	=cut	1552	=cut
1371		1553
1372	sub ext_event($$%) {	1554	sub ext_msg($$@) {
1373	my ($self, $type, %msg) = @_;	1555	my ($self, $type, @msg) = @_;
1374		1556
1375	$self->ns->ext_event ($type, %msg);	1557	$self->ns->ext_msg ($type, @msg);
1376	}	1558	}
1377		1559
1378	=head3 cf::region	1560	=head3 cf::region
1379		1561
1380	=over 4	1562	=over 4
…		…
1393	my ($path) = @_;	1575	my ($path) = @_;
1394		1576
1395	my ($match, $specificity);	1577	my ($match, $specificity);
1396		1578
1397	for my $region (list) {	1579	for my $region (list) {
1398	if ($region->match && $path =~ $region->match) {	1580	if ($region->{match} && $path =~ $region->{match}) {
1399	($match, $specificity) = ($region, $region->specificity)	1581	($match, $specificity) = ($region, $region->specificity)
1400	if $region->specificity > $specificity;	1582	if $region->specificity > $specificity;
1401	}	1583	}
1402	}	1584	}
1403		1585
…		…
1523	$self->init; # pass $1 etc.	1705	$self->init; # pass $1 etc.
1524	return $self;	1706	return $self;
1525	}	1707	}
1526	}	1708	}
1527		1709
1528	Carp::carp "unable to resolve path '$path' (base '$base').";	1710	Carp::cluck "unable to resolve path '$path' (base '$base').";
1529	()	1711	()
1530	}	1712	}
1531		1713
1532	sub init {	1714	sub init {
1533	my ($self) = @_;	1715	my ($self) = @_;
…		…
1596		1778
1597	sub load_header_from($) {	1779	sub load_header_from($) {
1598	my ($self, $path) = @_;	1780	my ($self, $path) = @_;
1599		1781
1600	utf8::encode $path;	1782	utf8::encode $path;
1601	#aio_open $path, O_RDONLY, 0	1783	my $f = new_from_file cf::object::thawer $path
1602	# or return;
1603
1604	$self->_load_header ($path)
1605	or return;	1784	or return;
		1785
		1786	$self->_load_header ($f)
		1787	or return;
		1788
		1789	local $MAP_LOADING{$self->{path}} = $self;
		1790	$f->resolve_delayed_derefs;
1606		1791
1607	$self->{load_path} = $path;	1792	$self->{load_path} = $path;
1608		1793
1609	1	1794	1
1610	}	1795	}
…		…
1664	sub find {	1849	sub find {
1665	my ($path, $origin) = @_;	1850	my ($path, $origin) = @_;
1666		1851
1667	$path = normalise $path, $origin && $origin->path;	1852	$path = normalise $path, $origin && $origin->path;
1668		1853
		1854	cf::lock_wait "map_data:$path";#d#remove
1669	cf::lock_wait "map_find:$path";	1855	cf::lock_wait "map_find:$path";
1670		1856
1671	$cf::MAP{$path} || do {	1857	$cf::MAP{$path} || do {
1672	my $guard = cf::lock_acquire "map_find:$path";	1858	my $guard1 = cf::lock_acquire "map_find:$path";
		1859	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1860
1673	my $map = new_from_path cf::map $path	1861	my $map = new_from_path cf::map $path
1674	or return;	1862	or return;
1675		1863
1676	$map->{last_save} = $cf::RUNTIME;	1864	$map->{last_save} = $cf::RUNTIME;
1677		1865
…		…
1679	or return;	1867	or return;
1680		1868
1681	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1869	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1682	# doing this can freeze the server in a sync job, obviously	1870	# doing this can freeze the server in a sync job, obviously
1683	#$cf::WAIT_FOR_TICK->wait;	1871	#$cf::WAIT_FOR_TICK->wait;
		1872	undef $guard1;
		1873	undef $guard2;
1684	$map->reset;	1874	$map->reset;
1685	undef $guard;
1686	return find $path;	1875	return find $path;
1687	}	1876	}
1688		1877
1689	$cf::MAP{$path} = $map	1878	$cf::MAP{$path} = $map
1690	}	1879	}
…		…
1699	local $self->{deny_reset} = 1; # loading can take a long time	1888	local $self->{deny_reset} = 1; # loading can take a long time
1700		1889
1701	my $path = $self->{path};	1890	my $path = $self->{path};
1702		1891
1703	{	1892	{
1704	my $guard = cf::lock_acquire "map_load:$path";	1893	my $guard = cf::lock_acquire "map_data:$path";
1705		1894
		1895	return unless $self->valid;
1706	return if $self->in_memory != cf::MAP_SWAPPED;	1896	return if $self->in_memory != cf::MAP_SWAPPED;
1707		1897
1708	$self->in_memory (cf::MAP_LOADING);	1898	$self->in_memory (cf::MAP_LOADING);
1709		1899
1710	$self->alloc;	1900	$self->alloc;
1711		1901
1712	$self->pre_load;	1902	$self->pre_load;
1713	Coro::cede;	1903	cf::cede_to_tick;
1714		1904
		1905	my $f = new_from_file cf::object::thawer $self->{load_path};
		1906	$f->skip_block;
1715	$self->_load_objects ($self->{load_path}, 1)	1907	$self->_load_objects ($f)
1716	or return;	1908	or return;
1717		1909
1718	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1910	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1719	if delete $self->{load_original};	1911	if delete $self->{load_original};
1720		1912
1721	if (my $uniq = $self->uniq_path) {	1913	if (my $uniq = $self->uniq_path) {
1722	utf8::encode $uniq;	1914	utf8::encode $uniq;
1723	if (aio_open $uniq, O_RDONLY, 0) {	1915	unless (aio_stat $uniq) {
		1916	if (my $f = new_from_file cf::object::thawer $uniq) {
1724	$self->clear_unique_items;	1917	$self->clear_unique_items;
1725	$self->_load_objects ($uniq, 0);	1918	$self->_load_objects ($f);
		1919	$f->resolve_delayed_derefs;
		1920	}
1726	}	1921	}
1727	}	1922	}
1728		1923
1729	Coro::cede;	1924	$f->resolve_delayed_derefs;
		1925
		1926	cf::cede_to_tick;
1730	# now do the right thing for maps	1927	# now do the right thing for maps
1731	$self->link_multipart_objects;	1928	$self->link_multipart_objects;
1732	$self->difficulty ($self->estimate_difficulty)	1929	$self->difficulty ($self->estimate_difficulty)
1733	unless $self->difficulty;	1930	unless $self->difficulty;
1734	Coro::cede;	1931	cf::cede_to_tick;
1735		1932
1736	unless ($self->{deny_activate}) {	1933	unless ($self->{deny_activate}) {
1737	$self->decay_objects;	1934	$self->decay_objects;
1738	$self->fix_auto_apply;	1935	$self->fix_auto_apply;
1739	$self->update_buttons;	1936	$self->update_buttons;
1740	Coro::cede;	1937	cf::cede_to_tick;
1741	$self->set_darkness_map;	1938	$self->set_darkness_map;
1742	Coro::cede;	1939	cf::cede_to_tick;
1743	$self->activate;	1940	$self->activate;
1744	}	1941	}
		1942
		1943	$self->{last_save} = $cf::RUNTIME;
		1944	$self->last_access ($cf::RUNTIME);
1745		1945
1746	$self->in_memory (cf::MAP_IN_MEMORY);	1946	$self->in_memory (cf::MAP_IN_MEMORY);
1747	}	1947	}
1748		1948
1749	$self->post_load;	1949	$self->post_load;
…		…
1760		1960
1761	$self	1961	$self
1762	}	1962	}
1763		1963
1764	# find and load all maps in the 3x3 area around a map	1964	# find and load all maps in the 3x3 area around a map
1765	sub load_diag {	1965	sub load_neighbours {
1766	my ($map) = @_;	1966	my ($map) = @_;
1767		1967
1768	my @diag; # diagonal neighbours	1968	my @neigh; # diagonal neighbours
1769		1969
1770	for (0 .. 3) {	1970	for (0 .. 3) {
1771	my $neigh = $map->tile_path ($_)	1971	my $neigh = $map->tile_path ($_)
1772	or next;	1972	or next;
1773	$neigh = find $neigh, $map	1973	$neigh = find $neigh, $map
1774	or next;	1974	or next;
1775	$neigh->load;	1975	$neigh->load;
1776		1976
		1977	push @neigh,
1777	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	1978	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1778	[$neigh->tile_path (($_ + 1) % 4), $neigh];	1979	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1779	}	1980	}
1780		1981
1781	for (@diag) {	1982	for (grep defined $_->[0], @neigh) {
		1983	my ($path, $origin) = @$_;
1782	my $neigh = find @$_	1984	my $neigh = find $path, $origin
1783	or next;	1985	or next;
1784	$neigh->load;	1986	$neigh->load;
1785	}	1987	}
1786	}	1988	}
1787		1989
…		…
1792	}	1994	}
1793		1995
1794	sub do_load_sync {	1996	sub do_load_sync {
1795	my ($map) = @_;	1997	my ($map) = @_;
1796		1998
		1999	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2000	if $Coro::current == $Coro::main;
		2001
1797	cf::sync_job { $map->load };	2002	cf::sync_job { $map->load };
1798	}	2003	}
1799		2004
1800	our %MAP_PREFETCH;	2005	our %MAP_PREFETCH;
1801	our $MAP_PREFETCHER = undef;	2006	our $MAP_PREFETCHER = undef;
1802		2007
1803	sub find_async {	2008	sub find_async {
1804	my ($path, $origin) = @_;	2009	my ($path, $origin, $load) = @_;
1805		2010
1806	$path = normalise $path, $origin && $origin->{path};	2011	$path = normalise $path, $origin && $origin->{path};
1807		2012
1808	if (my $map = $cf::MAP{$path}) {	2013	if (my $map = $cf::MAP{$path}) {
1809	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2014	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1810	}	2015	}
1811		2016
1812	undef $MAP_PREFETCH{$path};	2017	$MAP_PREFETCH{$path} |= $load;
		2018
1813	$MAP_PREFETCHER ||= cf::async {	2019	$MAP_PREFETCHER ||= cf::async {
1814	while (%MAP_PREFETCH) {	2020	while (%MAP_PREFETCH) {
1815	for my $path (keys %MAP_PREFETCH) {	2021	while (my ($k, $v) = each %MAP_PREFETCH) {
1816	my $map = find $path	2022	if (my $map = find $k) {
1817	or next;
1818	$map->load;	2023	$map->load if $v;
		2024	}
1819		2025
1820	delete $MAP_PREFETCH{$path};	2026	delete $MAP_PREFETCH{$k};
1821	}	2027	}
1822	}	2028	}
1823	undef $MAP_PREFETCHER;	2029	undef $MAP_PREFETCHER;
1824	};	2030	};
1825	$MAP_PREFETCHER->prio (6);	2031	$MAP_PREFETCHER->prio (6);
…		…
1828	}	2034	}
1829		2035
1830	sub save {	2036	sub save {
1831	my ($self) = @_;	2037	my ($self) = @_;
1832		2038
1833	my $lock = cf::lock_acquire "map_data:" . $self->path;	2039	my $lock = cf::lock_acquire "map_data:$self->{path}";
1834		2040
1835	$self->{last_save} = $cf::RUNTIME;	2041	$self->{last_save} = $cf::RUNTIME;
1836		2042
1837	return unless $self->dirty;	2043	return unless $self->dirty;
1838		2044
…		…
1861	my ($self) = @_;	2067	my ($self) = @_;
1862		2068
1863	# save first because save cedes	2069	# save first because save cedes
1864	$self->save;	2070	$self->save;
1865		2071
1866	my $lock = cf::lock_acquire "map_data:" . $self->path;	2072	my $lock = cf::lock_acquire "map_data:$self->{path}";
1867		2073
1868	return if $self->players;	2074	return if $self->players;
1869	return if $self->in_memory != cf::MAP_IN_MEMORY;	2075	return if $self->in_memory != cf::MAP_IN_MEMORY;
1870	return if $self->{deny_save};	2076	return if $self->{deny_save};
1871		2077
		2078	$self->deactivate;
1872	$self->clear;	2079	$self->clear;
1873	$self->in_memory (cf::MAP_SWAPPED);	2080	$self->in_memory (cf::MAP_SWAPPED);
1874	}	2081	}
1875		2082
1876	sub reset_at {	2083	sub reset_at {
…		…
1910	if $uniq;	2117	if $uniq;
1911	}	2118	}
1912		2119
1913	delete $cf::MAP{$self->path};	2120	delete $cf::MAP{$self->path};
1914		2121
		2122	$self->deactivate;
1915	$self->clear;	2123	$self->clear;
1916		2124
1917	$_->clear_links_to ($self) for values %cf::MAP;	2125	$_->clear_links_to ($self) for values %cf::MAP;
1918		2126
1919	$self->unlink_save;	2127	$self->unlink_save;
…		…
1923	my $nuke_counter = "aaaa";	2131	my $nuke_counter = "aaaa";
1924		2132
1925	sub nuke {	2133	sub nuke {
1926	my ($self) = @_;	2134	my ($self) = @_;
1927		2135
		2136	{
		2137	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2138
1928	delete $cf::MAP{$self->path};	2139	delete $cf::MAP{$self->path};
1929		2140
1930	$self->unlink_save;	2141	$self->unlink_save;
1931		2142
1932	bless $self, "cf::map";	2143	bless $self, "cf::map";
1933	delete $self->{deny_reset};	2144	delete $self->{deny_reset};
1934	$self->{deny_save} = 1;	2145	$self->{deny_save} = 1;
1935	$self->reset_timeout (1);	2146	$self->reset_timeout (1);
1936	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2147	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1937		2148
1938	$cf::MAP{$self->path} = $self;	2149	$cf::MAP{$self->path} = $self;
		2150	}
1939		2151
1940	$self->reset; # polite request, might not happen	2152	$self->reset; # polite request, might not happen
1941	}	2153	}
1942		2154
1943	=item $maps = cf::map::tmp_maps	2155	=item $maps = cf::map::tmp_maps
…		…
2019		2231
2020	sub inv_recursive {	2232	sub inv_recursive {
2021	inv_recursive_ inv $_[0]	2233	inv_recursive_ inv $_[0]
2022	}	2234	}
2023		2235
		2236	=item $ref = $ob->ref
		2237
		2238	creates and returns a persistent reference to an objetc that can be stored as a string.
		2239
		2240	=item $ob = cf::object::deref ($refstring)
		2241
		2242	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2243	even if the object actually exists. May block.
		2244
		2245	=cut
		2246
		2247	sub deref {
		2248	my ($ref) = @_;
		2249
		2250	# temporary compatibility#TODO#remove
		2251	$ref =~ s{^<}{player/<};
		2252
		2253	if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
		2254	my ($uuid, $name) = ($1, $2);
		2255	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2256	or return;
		2257	$pl->ob->uuid eq $uuid
		2258	or return;
		2259
		2260	$pl->ob
		2261	} else {
		2262	warn "$ref: cannot resolve object reference\n";
		2263	undef
		2264	}
		2265	}
		2266
2024	package cf;	2267	package cf;
2025		2268
2026	=back	2269	=back
2027		2270
2028	=head3 cf::object::player	2271	=head3 cf::object::player
…		…
2045		2288
2046	$flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;	2289	$flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
2047		2290
2048	if ($self->{record_replies}) {	2291	if ($self->{record_replies}) {
2049	push @{ $self->{record_replies} }, [$npc, $msg, $flags];	2292	push @{ $self->{record_replies} }, [$npc, $msg, $flags];
		2293
2050	} else {	2294	} else {
		2295	my $pl = $self->contr;
		2296
		2297	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
		2298	my $dialog = $pl->{npc_dialog};
		2299	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
		2300
		2301	} else {
2051	$msg = $npc->name . " says: $msg" if $npc;	2302	$msg = $npc->name . " says: $msg" if $npc;
2052	$self->message ($msg, $flags);	2303	$self->message ($msg, $flags);
		2304	}
2053	}	2305	}
		2306	}
		2307
		2308	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2309
		2310	=cut
		2311
		2312	sub cf::object::send_msg {
		2313	my $pl = shift->contr
		2314	or return;
		2315	$pl->send_msg (@_);
2054	}	2316	}
2055		2317
2056	=item $player_object->may ("access")	2318	=item $player_object->may ("access")
2057		2319
2058	Returns wether the given player is authorized to access resource "access"	2320	Returns wether the given player is authorized to access resource "access"
…		…
2137	# use -1 or undef as default coordinates, not 0, 0	2399	# use -1 or undef as default coordinates, not 0, 0
2138	($x, $y) = ($map->enter_x, $map->enter_y)	2400	($x, $y) = ($map->enter_x, $map->enter_y)
2139	if $x <=0 && $y <= 0;	2401	if $x <=0 && $y <= 0;
2140		2402
2141	$map->load;	2403	$map->load;
2142	$map->load_diag;	2404	$map->load_neighbours;
2143		2405
2144	return unless $self->contr->active;	2406	return unless $self->contr->active;
2145	$self->activate_recursive;	2407	$self->activate_recursive;
2146		2408
2147	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2409	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2148	$self->enter_map ($map, $x, $y);	2410	$self->enter_map ($map, $x, $y);
2149	}	2411	}
2150		2412
2151	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2413	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2152		2414
2153	Moves the player to the given map-path and coordinates by first freezing	2415	Moves the player to the given map-path and coordinates by first freezing
2154	her, loading and preparing them map, calling the provided $check callback	2416	her, loading and preparing them map, calling the provided $check callback
2155	that has to return the map if sucecssful, and then unfreezes the player on	2417	that has to return the map if sucecssful, and then unfreezes the player on
2156	the new (success) or old (failed) map position.	2418	the new (success) or old (failed) map position. In either case, $done will
		2419	be called at the end of this process.
2157		2420
2158	=cut	2421	=cut
2159		2422
2160	our $GOTOGEN;	2423	our $GOTOGEN;
2161		2424
2162	sub cf::object::player::goto {	2425	sub cf::object::player::goto {
2163	my ($self, $path, $x, $y, $check) = @_;	2426	my ($self, $path, $x, $y, $check, $done) = @_;
2164		2427
2165	# do generation counting so two concurrent goto's will be executed in-order	2428	# do generation counting so two concurrent goto's will be executed in-order
2166	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2429	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2167		2430
2168	$self->enter_link;	2431	$self->enter_link;
…		…
2188		2451
2189	if ($gen == $self->{_goto_generation}) {	2452	if ($gen == $self->{_goto_generation}) {
2190	delete $self->{_goto_generation};	2453	delete $self->{_goto_generation};
2191	$self->leave_link ($map, $x, $y);	2454	$self->leave_link ($map, $x, $y);
2192	}	2455	}
		2456
		2457	$done->() if $done;
2193	})->prio (1);	2458	})->prio (1);
2194	}	2459	}
2195		2460
2196	=item $player_object->enter_exit ($exit_object)	2461	=item $player_object->enter_exit ($exit_object)
2197		2462
…		…
2266	my $hp = $exit->stats->hp;	2531	my $hp = $exit->stats->hp;
2267	my $sp = $exit->stats->sp;	2532	my $sp = $exit->stats->sp;
2268		2533
2269	$self->enter_link;	2534	$self->enter_link;
2270		2535
		2536	# if exit is damned, update players death & WoR home-position
		2537	$self->contr->savebed ($slaying, $hp, $sp)
		2538	if $exit->flag (FLAG_DAMNED);
		2539
2271	(async {	2540	(async {
2272	$self->deactivate_recursive; # just to be sure	2541	$self->deactivate_recursive; # just to be sure
2273	unless (eval {	2542	unless (eval {
2274	$self->goto ($slaying, $hp, $sp);	2543	$self->goto ($slaying, $hp, $sp);
2275		2544
…		…
2302		2571
2303	utf8::encode $text;	2572	utf8::encode $text;
2304	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2573	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2305	}	2574	}
2306		2575
		2576	=item $client->send_msg ($channel, $msg, $color, [extra...])
		2577
		2578	Send a drawinfo or msg packet to the client, formatting the msg for the
		2579	client if neccessary. C<$type> should be a string identifying the type of
		2580	the message, with C<log> being the default. If C<$color> is negative, suppress
		2581	the message unless the client supports the msg packet.
		2582
		2583	=cut
		2584
		2585	our %CHANNEL = (
		2586	"c/identify" => {
		2587	id => "identify",
		2588	title => "Identify",
		2589	reply => undef,
		2590	tooltip => "Items recently identified",
		2591	},
		2592	"c/examine" => {
		2593	id => "examine",
		2594	title => "Examine",
		2595	reply => undef,
		2596	tooltip => "Signs and other items you examined",
		2597	},
		2598	);
		2599
		2600	sub cf::client::send_msg {
		2601	my ($self, $channel, $msg, $color, @extra) = @_;
		2602
		2603	$msg = $self->pl->expand_cfpod ($msg);
		2604
		2605	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2606
		2607	# check predefined channels, for the benefit of C
		2608	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};
		2609
		2610	if (ref $channel) {
		2611	# send meta info to client, if not yet sent
		2612	unless (exists $self->{channel}{$channel->{id}}) {
		2613	$self->{channel}{$channel->{id}} = $channel;
		2614	$self->ext_msg (channel_info => $channel)
		2615	if $self->can_msg;
		2616	}
		2617
		2618	$channel = $channel->{id};
		2619	}
		2620
		2621	return unless @extra || length $msg;
		2622
		2623	if ($self->can_msg) {
		2624	# default colour, mask it out
		2625	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2626	if $color & cf::NDI_DEF;
		2627
		2628	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2629	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
		2630	} else {
		2631	if ($color >= 0) {
		2632	# replace some tags by gcfclient-compatible ones
		2633	for ($msg) {
		2634	1 while
		2635	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2636	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2637	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2638	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2639	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2640	}
		2641
		2642	$color &= cf::NDI_COLOR_MASK;
		2643
		2644	utf8::encode $msg;
		2645
		2646	if (0 && $msg =~ /\[/) {
		2647	# COMMAND/INFO
		2648	$self->send_packet ("drawextinfo $color 10 8 $msg")
		2649	} else {
		2650	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
		2651	$self->send_packet ("drawinfo $color $msg")
		2652	}
		2653	}
		2654	}
		2655	}
		2656
2307	=item $client->ext_event ($type, %msg)	2657	=item $client->ext_msg ($type, @msg)
2308		2658
2309	Sends an exti event to the client.	2659	Sends an ext event to the client.
2310		2660
2311	=cut	2661	=cut
2312		2662
2313	sub cf::client::ext_event($$%) {	2663	sub cf::client::ext_msg($$@) {
2314	my ($self, $type, %msg) = @_;	2664	my ($self, $type, @msg) = @_;
2315		2665
		2666	if ($self->extcmd == 2) {
		2667	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2668	} elsif ($self->extcmd == 1) { # TODO: remove
2316	$msg{msgtype} = "event_$type";	2669	push @msg, msgtype => "event_$type";
2317	$self->send_packet ("ext " . cf::to_json \%msg);	2670	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2671	}
		2672	}
		2673
		2674	=item $client->ext_reply ($msgid, @msg)
		2675
		2676	Sends an ext reply to the client.
		2677
		2678	=cut
		2679
		2680	sub cf::client::ext_reply($$@) {
		2681	my ($self, $id, @msg) = @_;
		2682
		2683	if ($self->extcmd == 2) {
		2684	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2685	} elsif ($self->extcmd == 1) {
		2686	#TODO: version 1, remove
		2687	unshift @msg, msgtype => "reply", msgid => $id;
		2688	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2689	}
2318	}	2690	}
2319		2691
2320	=item $success = $client->query ($flags, "text", \&cb)	2692	=item $success = $client->query ($flags, "text", \&cb)
2321		2693
2322	Queues a query to the client, calling the given callback with	2694	Queues a query to the client, calling the given callback with
2323	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2695	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2324	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.	2696	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2325		2697
2326	Queries can fail, so check the return code. Or don't, as queries will become	2698	Queries can fail, so check the return code. Or don't, as queries will
2327	reliable at some point in the future.	2699	become reliable at some point in the future.
2328		2700
2329	=cut	2701	=cut
2330		2702
2331	sub cf::client::query {	2703	sub cf::client::query {
2332	my ($self, $flags, $text, $cb) = @_;	2704	my ($self, $flags, $text, $cb) = @_;
…		…
2340	utf8::encode $text;	2712	utf8::encode $text;
2341	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];	2713	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2342		2714
2343	$self->send_packet ($self->{query_queue}[0][0])	2715	$self->send_packet ($self->{query_queue}[0][0])
2344	if @{ $self->{query_queue} } == 1;	2716	if @{ $self->{query_queue} } == 1;
		2717
		2718	1
2345	}	2719	}
2346		2720
2347	cf::client->attach (	2721	cf::client->attach (
		2722	on_connect => sub {
		2723	my ($ns) = @_;
		2724
		2725	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2726	},
2348	on_reply => sub {	2727	on_reply => sub {
2349	my ($ns, $msg) = @_;	2728	my ($ns, $msg) = @_;
2350		2729
2351	# this weird shuffling is so that direct followup queries	2730	# this weird shuffling is so that direct followup queries
2352	# get handled first	2731	# get handled first
…		…
2364	} else {	2743	} else {
2365	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;	2744	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2366	}	2745	}
2367	}	2746	}
2368	},	2747	},
		2748	on_exticmd => sub {
		2749	my ($ns, $buf) = @_;
		2750
		2751	my $msg = eval { $ns->{json_coder}->decode ($buf) };
		2752
		2753	if (ref $msg) {
		2754	my ($type, $reply, @payload) =
		2755	"ARRAY" eq ref $msg
		2756	? @$msg
		2757	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2758
		2759	my @reply;
		2760
		2761	if (my $cb = $EXTICMD{$type}) {
		2762	@reply = $cb->($ns, @payload);
		2763	}
		2764
		2765	$ns->ext_reply ($reply, @reply)
		2766	if $reply;
		2767
		2768	} else {
		2769	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
		2770	}
		2771
		2772	cf::override;
		2773	},
2369	);	2774	);
2370		2775
2371	=item $client->async (\&cb)	2776	=item $client->async (\&cb)
2372		2777
2373	Create a new coroutine, running the specified callback. The coroutine will	2778	Create a new coroutine, running the specified callback. The coroutine will
…		…
2414	our $safe = new Safe "safe";	2819	our $safe = new Safe "safe";
2415	our $safe_hole = new Safe::Hole;	2820	our $safe_hole = new Safe::Hole;
2416		2821
2417	$SIG{FPE} = 'IGNORE';	2822	$SIG{FPE} = 'IGNORE';
2418		2823
2419	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2824	$safe->permit_only (Opcode::opset qw(
		2825	:base_core :base_mem :base_orig :base_math
		2826	grepstart grepwhile mapstart mapwhile
		2827	sort time
		2828	));
2420		2829
2421	# here we export the classes and methods available to script code	2830	# here we export the classes and methods available to script code
2422		2831
2423	=pod	2832	=pod
2424		2833
2425	The following functions and methods are available within a safe environment:	2834	The following functions and methods are available within a safe environment:
2426		2835
2427	cf::object contr pay_amount pay_player map	2836	cf::object
		2837	contr pay_amount pay_player map x y force_find force_add
		2838	insert remove name archname title slaying race decrease_ob_nr
		2839
2428	cf::object::player player	2840	cf::object::player
2429	cf::player peaceful	2841	player
2430	cf::map trigger	2842
		2843	cf::player
		2844	peaceful
		2845
		2846	cf::map
		2847	trigger
2431		2848
2432	=cut	2849	=cut
2433		2850
2434	for (	2851	for (
2435	["cf::object" => qw(contr pay_amount pay_player map)],	2852	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2853	insert remove inv name archname title slaying race
		2854	decrease_ob_nr)],
2436	["cf::object::player" => qw(player)],	2855	["cf::object::player" => qw(player)],
2437	["cf::player" => qw(peaceful)],	2856	["cf::player" => qw(peaceful)],
2438	["cf::map" => qw(trigger)],	2857	["cf::map" => qw(trigger)],
2439	) {	2858	) {
2440	no strict 'refs';	2859	no strict 'refs';
…		…
2516	# the server's init and main functions	2935	# the server's init and main functions
2517		2936
2518	sub load_facedata($) {	2937	sub load_facedata($) {
2519	my ($path) = @_;	2938	my ($path) = @_;
2520		2939
		2940	# HACK to clear player env face cache, we need some signal framework
		2941	# for this (global event?)
		2942	%ext::player_env::MUSIC_FACE_CACHE = ();
		2943
		2944	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		2945
2521	warn "loading facedata from $path\n";	2946	warn "loading facedata from $path\n";
2522		2947
2523	my $facedata;	2948	my $facedata;
2524	0 < aio_load $path, $facedata	2949	0 < aio_load $path, $facedata
2525	or die "$path: $!";	2950	or die "$path: $!";
…		…
2527	$facedata = Coro::Storable::thaw $facedata;	2952	$facedata = Coro::Storable::thaw $facedata;
2528		2953
2529	$facedata->{version} == 2	2954	$facedata->{version} == 2
2530	or cf::cleanup "$path: version mismatch, cannot proceed.";	2955	or cf::cleanup "$path: version mismatch, cannot proceed.";
2531		2956
		2957	# patch in the exptable
		2958	$facedata->{resource}{"res/exp_table"} = {
		2959	type => FT_RSRC,
		2960	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		2961	};
		2962	cf::cede_to_tick;
		2963
2532	{	2964	{
2533	my $faces = $facedata->{faceinfo};	2965	my $faces = $facedata->{faceinfo};
2534		2966
2535	while (my ($face, $info) = each %$faces) {	2967	while (my ($face, $info) = each %$faces) {
2536	my $idx = (cf::face::find $face) || cf::face::alloc $face;	2968	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2537	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	2969	cf::face::set_visibility $idx, $info->{visibility};
		2970	cf::face::set_magicmap $idx, $info->{magicmap};
2538	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	2971	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2539	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	2972	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2540	Coro::cede;	2973
		2974	cf::cede_to_tick;
2541	}	2975	}
2542		2976
2543	while (my ($face, $info) = each %$faces) {	2977	while (my ($face, $info) = each %$faces) {
2544	next unless $info->{smooth};	2978	next unless $info->{smooth};
2545	my $idx = cf::face::find $face	2979	my $idx = cf::face::find $face
2546	or next;	2980	or next;
2547	if (my $smooth = cf::face::find $info->{smooth}) {	2981	if (my $smooth = cf::face::find $info->{smooth}) {
		2982	cf::face::set_smooth $idx, $smooth;
2548	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	2983	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2549	} else {	2984	} else {
2550	warn "smooth face '$info->{smooth}' not found for face '$face'";	2985	warn "smooth face '$info->{smooth}' not found for face '$face'";
2551	}	2986	}
2552	Coro::cede;	2987
		2988	cf::cede_to_tick;
2553	}	2989	}
2554	}	2990	}
2555		2991
2556	{	2992	{
2557	my $anims = $facedata->{animinfo};	2993	my $anims = $facedata->{animinfo};
2558		2994
2559	while (my ($anim, $info) = each %$anims) {	2995	while (my ($anim, $info) = each %$anims) {
2560	cf::anim::set $anim, $info->{frames}, $info->{facings};	2996	cf::anim::set $anim, $info->{frames}, $info->{facings};
2561	Coro::cede;	2997	cf::cede_to_tick;
2562	}	2998	}
2563		2999
2564	cf::anim::invalidate_all; # d'oh	3000	cf::anim::invalidate_all; # d'oh
2565	}	3001	}
2566		3002
		3003	{
		3004	# TODO: for gcfclient pleasure, we should give resources
		3005	# that gcfclient doesn't grok a >10000 face index.
		3006	my $res = $facedata->{resource};
		3007
		3008	my $soundconf = delete $res->{"res/sound.conf"};
		3009
		3010	while (my ($name, $info) = each %$res) {
		3011	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3012	my $data;
		3013
		3014	if ($info->{type} & 1) {
		3015	# prepend meta info
		3016
		3017	my $meta = $enc->encode ({
		3018	name => $name,
		3019	%{ $info->{meta} || {} },
		3020	});
		3021
		3022	$data = pack "(w/a*)*", $meta, $info->{data};
		3023	} else {
		3024	$data = $info->{data};
		3025	}
		3026
		3027	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3028	cf::face::set_type $idx, $info->{type};
		3029
		3030	cf::cede_to_tick;
		3031	}
		3032
		3033	if ($soundconf) {
		3034	$soundconf = $enc->decode (delete $soundconf->{data});
		3035
		3036	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3037	my $sound = $soundconf->{compat}[$_]
		3038	or next;
		3039
		3040	my $face = cf::face::find "sound/$sound->[1]";
		3041	cf::sound::set $sound->[0] => $face;
		3042	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3043	}
		3044
		3045	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3046	my $face = cf::face::find "sound/$v";
		3047	cf::sound::set $k => $face;
		3048	}
		3049	}
		3050	}
		3051
2567	1	3052	1
2568	}	3053	}
2569		3054
		3055	register_exticmd fx_want => sub {
		3056	my ($ns, $want) = @_;
		3057
		3058	while (my ($k, $v) = each %$want) {
		3059	$ns->fx_want ($k, $v);
		3060	}
		3061	};
		3062
2570	sub reload_regions {	3063	sub reload_regions {
		3064	# HACK to clear player env face cache, we need some signal framework
		3065	# for this (global event?)
		3066	%ext::player_env::MUSIC_FACE_CACHE = ();
		3067
2571	load_resource_file "$MAPDIR/regions"	3068	load_resource_file "$MAPDIR/regions"
2572	or die "unable to load regions file\n";	3069	or die "unable to load regions file\n";
		3070
		3071	for (cf::region::list) {
		3072	$_->{match} = qr/$_->{match}/
		3073	if exists $_->{match};
		3074	}
2573	}	3075	}
2574		3076
2575	sub reload_facedata {	3077	sub reload_facedata {
2576	load_facedata "$DATADIR/facedata"	3078	load_facedata "$DATADIR/facedata"
2577	or die "unable to load facedata\n";	3079	or die "unable to load facedata\n";
2578	}	3080	}
2579		3081
2580	sub reload_archetypes {	3082	sub reload_archetypes {
		3083	load_resource_file "$DATADIR/archetypes"
		3084	or die "unable to load archetypes\n";
		3085	#d# NEED to laod twice to resolve forward references
		3086	# this really needs to be done in an extra post-pass
		3087	# (which needs to be synchronous, so solve it differently)
2581	load_resource_file "$DATADIR/archetypes"	3088	load_resource_file "$DATADIR/archetypes"
2582	or die "unable to load archetypes\n";	3089	or die "unable to load archetypes\n";
2583	}	3090	}
2584		3091
2585	sub reload_treasures {	3092	sub reload_treasures {
…		…
2601		3108
2602	sub init {	3109	sub init {
2603	reload_resources;	3110	reload_resources;
2604	}	3111	}
2605		3112
2606	sub cfg_load {	3113	sub reload_config {
2607	open my $fh, "<:utf8", "$CONFDIR/config"	3114	open my $fh, "<:utf8", "$CONFDIR/config"
2608	or return;	3115	or return;
2609		3116
2610	local $/;	3117	local $/;
2611	*CFG = YAML::Syck::Load <$fh>;	3118	*CFG = YAML::Syck::Load <$fh>;
…		…
2631	(async {	3138	(async {
2632	Event::one_event;	3139	Event::one_event;
2633	})->prio (Coro::PRIO_MAX);	3140	})->prio (Coro::PRIO_MAX);
2634	};	3141	};
2635		3142
2636	cfg_load;	3143	reload_config;
2637	db_init;	3144	db_init;
2638	load_extensions;	3145	load_extensions;
2639		3146
2640	$TICK_WATCHER->start;	3147	$TICK_WATCHER->start;
2641	Event::loop;	3148	Event::loop;
…		…
2779	%EXT_CORO = ();	3286	%EXT_CORO = ();
2780		3287
2781	warn "removing commands";	3288	warn "removing commands";
2782	%COMMAND = ();	3289	%COMMAND = ();
2783		3290
2784	warn "removing ext commands";	3291	warn "removing ext/exti commands";
2785	%EXTCMD = ();	3292	%EXTCMD = ();
		3293	%EXTICMD = ();
2786		3294
2787	warn "unloading/nuking all extensions";	3295	warn "unloading/nuking all extensions";
2788	for my $pkg (@EXTS) {	3296	for my $pkg (@EXTS) {
2789	warn "... unloading $pkg";	3297	warn "... unloading $pkg";
2790		3298
…		…
2833	warn "reloading cf.pm";	3341	warn "reloading cf.pm";
2834	require cf;	3342	require cf;
2835	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3343	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2836		3344
2837	warn "loading config and database again";	3345	warn "loading config and database again";
2838	cf::cfg_load;	3346	cf::reload_config;
2839		3347
2840	warn "loading extensions";	3348	warn "loading extensions";
2841	cf::load_extensions;	3349	cf::load_extensions;
2842		3350
2843	warn "reattaching attachments to objects/players";	3351	warn "reattaching attachments to objects/players";
…		…
2936	or die;	3444	or die;
2937		3445
2938	$map->width (50);	3446	$map->width (50);
2939	$map->height (50);	3447	$map->height (50);
2940	$map->alloc;	3448	$map->alloc;
2941	$map->_load_objects ("/tmp/x.map", 1);	3449	$map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
2942	my $t = Event::time - $t;	3450	my $t = Event::time - $t;
2943		3451
2944	#next unless $t < 0.0013;#d#	3452	#next unless $t < 0.0013;#d#
2945	if ($t < $min) {	3453	if ($t < $min) {
2946	$min = $t;	3454	$min = $t;

Diff Legend

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