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.287 by root, Mon Jun 25 05:43:45 2007 UTC vs.
Revision 1.362 by root, Mon Sep 10 12:44:06 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
…		…
84	our %CFG;	87	our %CFG;
85		88
86	our $UPTIME; $UPTIME ||= time;	89	our $UPTIME; $UPTIME ||= time;
87	our $RUNTIME;	90	our $RUNTIME;
88		91
89	our %PLAYER; # all users	92	our (%PLAYER, %PLAYER_LOADING); # all users
90	our %MAP; # all maps	93	our (%MAP, %MAP_LOADING ); # all maps
91	our $LINK_MAP; # the special {link} map, which is always available	94	our $LINK_MAP; # the special {link} map, which is always available
92		95
93	# 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 ∕
94	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	97	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
95		98
…		…
165		168
166	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
167	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
168	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.
169		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.
		178
170	=back	179	=back
171		180
172	=cut	181	=cut
173		182
174	BEGIN {	183	BEGIN {
…		…
178	$msg .= "\n"	187	$msg .= "\n"
179	unless $msg =~ /\n$/;	188	unless $msg =~ /\n$/;
180		189
181	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	190	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
182		191
183	utf8::encode $msg;
184	LOG llevError, $msg;	192	LOG llevError, $msg;
185	};	193	};
186	}	194	}
187		195
188	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	196	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
237	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	245	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
238	$d	246	$d
239	} || "[unable to dump $_[0]: '$@']";	247	} || "[unable to dump $_[0]: '$@']";
240	}	248	}
241		249
242	use JSON::XS ();
243
244	=item $ref = cf::from_json $json	250	=item $ref = cf::from_json $json
245		251
246	Converts a JSON string into the corresponding perl data structure.	252	Converts a JSON string into the corresponding perl data structure.
247		253
248	=item $json = cf::to_json $ref	254	=item $json = cf::to_json $ref
249		255
250	Converts a perl data structure into its JSON representation.	256	Converts a perl data structure into its JSON representation.
251		257
252	=cut	258	=cut
253		259
254	our $json_coder = JSON::XS->new->convert_blessed->utf8;	260	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255		261
256	sub to_json ($) { $json_coder->encode ($_[0]) }	262	sub to_json ($) { $json_coder->encode ($_[0]) }
257	sub from_json ($) { $json_coder->decode ($_[0]) }	263	sub from_json ($) { $json_coder->decode ($_[0]) }
258		264
259	=item cf::lock_wait $string	265	=item cf::lock_wait $string
…		…
265	Wait until the given lock is available and then acquires it and returns	271	Wait until the given lock is available and then acquires it and returns
266	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	272	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
267	for example when the coroutine gets canceled), the lock is automatically	273	for example when the coroutine gets canceled), the lock is automatically
268	returned.	274	returned.
269		275
		276	Locks are *not* recursive, locking from the same coro twice results in a
		277	deadlocked coro.
		278
270	Lock names should begin with a unique identifier (for example, cf::map::find	279	Lock names should begin with a unique identifier (for example, cf::map::find
271	uses map_find and cf::map::load uses map_load).	280	uses map_find and cf::map::load uses map_load).
272		281
273	=item $locked = cf::lock_active $string	282	=item $locked = cf::lock_active $string
274		283
275	Return true if the lock is currently active, i.e. somebody has locked it.	284	Return true if the lock is currently active, i.e. somebody has locked it.
276		285
277	=cut	286	=cut
278		287
279	our %LOCK;	288	our %LOCK;
		289	our %LOCKER;#d#
280		290
281	sub lock_wait($) {	291	sub lock_wait($) {
282	my ($key) = @_;	292	my ($key) = @_;
		293
		294	if ($LOCKER{$key} == $Coro::current) {#d#
		295	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		296	return;#d#
		297	}#d#
283		298
284	# wait for lock, if any	299	# wait for lock, if any
285	while ($LOCK{$key}) {	300	while ($LOCK{$key}) {
286	push @{ $LOCK{$key} }, $Coro::current;	301	push @{ $LOCK{$key} }, $Coro::current;
287	Coro::schedule;	302	Coro::schedule;
…		…
293		308
294	# wait, to be sure we are not locked	309	# wait, to be sure we are not locked
295	lock_wait $key;	310	lock_wait $key;
296		311
297	$LOCK{$key} = [];	312	$LOCK{$key} = [];
		313	$LOCKER{$key} = $Coro::current;#d#
298		314
299	Coro::guard {	315	Coro::guard {
		316	delete $LOCKER{$key};#d#
300	# wake up all waiters, to be on the safe side	317	# wake up all waiters, to be on the safe side
301	$_->ready for @{ delete $LOCK{$key} };	318	$_->ready for @{ delete $LOCK{$key} };
302	}	319	}
303	}	320	}
304		321
…		…
314	my $guard = Coro::guard {	331	my $guard = Coro::guard {
315	$TICK_WATCHER->start;	332	$TICK_WATCHER->start;
316	};	333	};
317	$TICK_WATCHER->stop;	334	$TICK_WATCHER->stop;
318	$guard	335	$guard
		336	}
		337
		338	=item cf::get_slot $time[, $priority[, $name]]
		339
		340	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		341	This call blocks and returns only when you have at least C<$time> seconds
		342	of cpu time till the next tick. The slot is only valid till the next cede.
		343
		344	The optional C<$name> can be used to identify the job to run. It might be
		345	used for statistical purposes and should identify the same time-class.
		346
		347	Useful for short background jobs.
		348
		349	=cut
		350
		351	our @SLOT_QUEUE;
		352	our $SLOT_QUEUE;
		353
		354	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		355	$SLOT_QUEUE = Coro::async {
		356	my $signal = new Coro::Signal;
		357
		358	while () {
		359	next_job:
		360	my $avail = cf::till_tick;
		361	if ($avail > 0.01) {
		362	for (0 .. $#SLOT_QUEUE) {
		363	if ($SLOT_QUEUE[$_][0] < $avail) {
		364	my $job = splice @SLOT_QUEUE, $_, 1, ();
		365	$job->[2]->send;
		366	Coro::cede;
		367	goto next_job;
		368	}
		369	}
		370	}
		371
		372	if (@SLOT_QUEUE) {
		373	# we do not use wait_For_tick() as it returns immediately when tick is inactive
		374	push @cf::WAIT_FOR_TICK, $signal;
		375	$signal->wait;
		376	} else {
		377	Coro::schedule;
		378	}
		379	}
		380	};
		381
		382	sub get_slot($;$$) {
		383	my ($time, $pri, $name) = @_;
		384
		385	$time = $TICK * .6 if $time > $TICK * .6;
		386	my $sig = new Coro::Signal;
		387
		388	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		389	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		390	$SLOT_QUEUE->ready;
		391	$sig->wait;
319	}	392	}
320		393
321	=item cf::async { BLOCK }	394	=item cf::async { BLOCK }
322		395
323	Currently the same as Coro::async_pool, meaning you cannot use	396	Currently the same as Coro::async_pool, meaning you cannot use
…		…
413	=cut	486	=cut
414		487
415	sub fork_call(&@) {	488	sub fork_call(&@) {
416	my ($cb, @args) = @_;	489	my ($cb, @args) = @_;
417		490
418	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	491	# we seemingly have to make a local copy of the whole thing,
419	# or die "socketpair: $!";	492	# otherwise perl prematurely frees the stuff :/
420	pipe my $fh1, my $fh2	493	# TODO: investigate and fix (likely this will be rather laborious)
421	or die "pipe: $!";
422		494
423	if (my $pid = fork) {	495	my @res = Coro::Util::fork_eval {
424	close $fh2;
425
426	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
427	$res = Coro::Storable::thaw $res;
428
429	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431	die $$res unless "ARRAY" eq ref $res;
432
433	return wantarray ? @$res : $res->[-1];
434	} else {
435	reset_signals;	496	reset_signals;
436	local $SIG{__WARN__};	497	&$cb
437	local $SIG{__DIE__};	498	}, @args;
438	eval {
439	close $fh1;
440		499
441	my @res = eval { $cb->(@args) };	500	wantarray ? @res : $res[-1]
442	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
443	};
444
445	warn $@ if $@;
446	_exit 0;
447	}
448	}	501	}
449		502
450	=item $value = cf::db_get $family => $key	503	=item $value = cf::db_get $family => $key
451		504
452	Returns a single value from the environment database.	505	Returns a single value from the environment database.
…		…
532	if (1) {	585	if (1) {
533	$md5 =	586	$md5 =
534	join "\x00",	587	join "\x00",
535	$processversion,	588	$processversion,
536	map {	589	map {
537	Coro::cede;	590	cf::cede_to_tick;
538	($src->[$_], Digest::MD5::md5_hex $data[$_])	591	($src->[$_], Digest::MD5::md5_hex $data[$_])
539	} 0.. $#$src;	592	} 0.. $#$src;
540		593
541		594
542	my $dbmd5 = db_get cache => "$id/md5";	595	my $dbmd5 = db_get cache => "$id/md5";
…		…
848	";	901	";
849	die if $@;	902	die if $@;
850	}	903	}
851		904
852	our $override;	905	our $override;
853	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	906	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
854		907
855	sub override {	908	sub override {
856	$override = 1;	909	$override = 1;
857	@invoke_results = ();	910	@INVOKE_RESULTS = (@_);
858	}	911	}
859		912
860	sub do_invoke {	913	sub do_invoke {
861	my $event = shift;	914	my $event = shift;
862	my $callbacks = shift;	915	my $callbacks = shift;
863		916
864	@invoke_results = ();	917	@INVOKE_RESULTS = ();
865		918
866	local $override;	919	local $override;
867		920
868	for (@$callbacks) {	921	for (@$callbacks) {
869	eval { &{$_->[1]} };	922	eval { &{$_->[1]} };
…		…
886		939
887	Generate an object-specific event with the given arguments.	940	Generate an object-specific event with the given arguments.
888		941
889	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	942	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
890	removed in future versions), and there is no public API to access override	943	removed in future versions), and there is no public API to access override
891	results (if you must, access C<@cf::invoke_results> directly).	944	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
892		945
893	=back	946	=back
894		947
895	=cut	948	=cut
896		949
897	#############################################################################	950	#############################################################################
898	# object support	951	# object support
		952	#
		953
		954	sub _can_merge {
		955	my ($ob1, $ob2) = @_;
		956
		957	local $Storable::canonical = 1;
		958	my $fob1 = Storable::freeze $ob1;
		959	my $fob2 = Storable::freeze $ob2;
		960
		961	$fob1 eq $fob2
		962	}
899		963
900	sub reattach {	964	sub reattach {
901	# basically do the same as instantiate, without calling instantiate	965	# basically do the same as instantiate, without calling instantiate
902	my ($obj) = @_;	966	my ($obj) = @_;
903		967
…		…
948	);	1012	);
949		1013
950	sub object_freezer_save {	1014	sub object_freezer_save {
951	my ($filename, $rdata, $objs) = @_;	1015	my ($filename, $rdata, $objs) = @_;
952		1016
		1017	my $guard = cf::lock_acquire "io";
		1018
953	sync_job {	1019	sync_job {
954	if (length $$rdata) {	1020	if (length $$rdata) {
		1021	utf8::decode (my $decname = $filename);
955	warn sprintf "saving %s (%d,%d)\n",	1022	warn sprintf "saving %s (%d,%d)\n",
956	$filename, length $$rdata, scalar @$objs;	1023	$decname, length $$rdata, scalar @$objs;
957		1024
958	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1025	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
959	chmod SAVE_MODE, $fh;	1026	chmod SAVE_MODE, $fh;
960	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1027	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
961	aio_fsync $fh if $cf::USE_FSYNC;	1028	aio_fsync $fh if $cf::USE_FSYNC;
…		…
980	}	1047	}
981	} else {	1048	} else {
982	aio_unlink $filename;	1049	aio_unlink $filename;
983	aio_unlink "$filename.pst";	1050	aio_unlink "$filename.pst";
984	}	1051	}
985	}	1052	};
		1053
		1054	undef $guard;
986	}	1055	}
987		1056
988	sub object_freezer_as_string {	1057	sub object_freezer_as_string {
989	my ($rdata, $objs) = @_;	1058	my ($rdata, $objs) = @_;
990		1059
…		…
995		1064
996	sub object_thawer_load {	1065	sub object_thawer_load {
997	my ($filename) = @_;	1066	my ($filename) = @_;
998		1067
999	my ($data, $av);	1068	my ($data, $av);
		1069
		1070	my $guard = cf::lock_acquire "io";
1000		1071
1001	(aio_load $filename, $data) >= 0	1072	(aio_load $filename, $data) >= 0
1002	or return;	1073	or return;
1003		1074
1004	unless (aio_stat "$filename.pst") {	1075	unless (aio_stat "$filename.pst") {
1005	(aio_load "$filename.pst", $av) >= 0	1076	(aio_load "$filename.pst", $av) >= 0
1006	or return;	1077	or return;
		1078
		1079	undef $guard;
1007	$av = eval { (Storable::thaw $av)->{objs} };	1080	$av = eval { (Storable::thaw $av)->{objs} };
1008	}	1081	}
1009		1082
		1083	utf8::decode (my $decname = $filename);
1010	warn sprintf "loading %s (%d)\n",	1084	warn sprintf "loading %s (%d,%d)\n",
1011	$filename, length $data, scalar @{$av || []};	1085	$decname, length $data, scalar @{$av || []};
		1086
1012	return ($data, $av);	1087	($data, $av)
1013	}	1088	}
1014		1089
1015	=head2 COMMAND CALLBACKS	1090	=head2 COMMAND CALLBACKS
1016		1091
1017	=over 4	1092	=over 4
…		…
1087	cf::override;	1162	cf::override;
1088	},	1163	},
1089	on_extcmd => sub {	1164	on_extcmd => sub {
1090	my ($pl, $buf) = @_;	1165	my ($pl, $buf) = @_;
1091		1166
1092	my $msg = eval { from_json $buf };	1167	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1093		1168
1094	if (ref $msg) {	1169	if (ref $msg) {
		1170	my ($type, $reply, @payload) =
		1171	"ARRAY" eq ref $msg
		1172	? @$msg
		1173	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1174
		1175	my @reply;
		1176
1095	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1177	if (my $cb = $EXTCMD{$type}) {
1096	if (my %reply = $cb->($pl, $msg)) {	1178	@reply = $cb->($pl, @payload);
1097	$pl->ext_reply ($msg->{msgid}, %reply);
1098	}
1099	}	1179	}
		1180
		1181	$pl->ext_reply ($reply, @reply)
		1182	if $reply;
		1183
1100	} else {	1184	} else {
1101	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1185	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1102	}	1186	}
1103		1187
1104	cf::override;	1188	cf::override;
…		…
1194		1278
1195	=head3 cf::player	1279	=head3 cf::player
1196		1280
1197	=over 4	1281	=over 4
1198		1282
		1283	=item cf::player::num_playing
		1284
		1285	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1286
		1287	=cut
		1288
		1289	sub num_playing {
		1290	scalar grep
		1291	$_->ob->map
		1292	&& !$_->hidden
		1293	&& !$_->ob->flag (cf::FLAG_WIZ),
		1294	cf::player::list
		1295	}
		1296
1199	=item cf::player::find $login	1297	=item cf::player::find $login
1200		1298
1201	Returns the given player object, loading it if necessary (might block).	1299	Returns the given player object, loading it if necessary (might block).
1202		1300
1203	=cut	1301	=cut
…		…
1238	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1336	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1239	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1337	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1240	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1338	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1241	aio_unlink +(playerdir $login) . "/$login.pl";	1339	aio_unlink +(playerdir $login) . "/$login.pl";
1242		1340
1243	my $pl = load_pl path $login	1341	my $f = new_from_file cf::object::thawer path $login
1244	or return;	1342	or return;
		1343
		1344	$f->next;
		1345	my $pl = cf::player::load_pl $f
		1346	or return;
		1347	local $cf::PLAYER_LOADING{$login} = $pl;
		1348	$f->resolve_delayed_derefs;
1245	$cf::PLAYER{$login} = $pl	1349	$cf::PLAYER{$login} = $pl
1246	}	1350	}
1247	}	1351	}
1248	}	1352	}
1249		1353
…		…
1259		1363
1260	aio_mkdir playerdir $pl, 0770;	1364	aio_mkdir playerdir $pl, 0770;
1261	$pl->{last_save} = $cf::RUNTIME;	1365	$pl->{last_save} = $cf::RUNTIME;
1262		1366
1263	$pl->save_pl ($path);	1367	$pl->save_pl ($path);
1264	Coro::cede;	1368	cf::cede_to_tick;
1265	}	1369	}
1266		1370
1267	sub new($) {	1371	sub new($) {
1268	my ($login) = @_;	1372	my ($login) = @_;
1269		1373
…		…
1273	$self->{deny_save} = 1;	1377	$self->{deny_save} = 1;
1274		1378
1275	$cf::PLAYER{$login} = $self;	1379	$cf::PLAYER{$login} = $self;
1276		1380
1277	$self	1381	$self
		1382	}
		1383
		1384	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1385
		1386	=cut
		1387
		1388	sub send_msg {
		1389	my $ns = shift->ns
		1390	or return;
		1391	$ns->send_msg (@_);
1278	}	1392	}
1279		1393
1280	=item $pl->quit_character	1394	=item $pl->quit_character
1281		1395
1282	Nukes the player without looking back. If logged in, the connection will	1396	Nukes the player without looking back. If logged in, the connection will
…		…
1337	or return [];	1451	or return [];
1338		1452
1339	my @logins;	1453	my @logins;
1340		1454
1341	for my $login (@$dirs) {	1455	for my $login (@$dirs) {
		1456	my $path = path $login;
		1457
		1458	# a .pst is a dead give-away for a valid player
		1459	unless (-e "$path.pst") {
1342	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1460	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1343	aio_read $fh, 0, 512, my $buf, 0 or next;	1461	aio_read $fh, 0, 512, my $buf, 0 or next;
1344	$buf !~ /^password -------------$/m or next; # official not-valid tag	1462	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1463	}
1345		1464
1346	utf8::decode $login;	1465	utf8::decode $login;
1347	push @logins, $login;	1466	push @logins, $login;
1348	}	1467	}
1349		1468
…		…
1387	sub expand_cfpod {	1506	sub expand_cfpod {
1388	((my $self), (local $_)) = @_;	1507	((my $self), (local $_)) = @_;
1389		1508
1390	# escape & and <	1509	# escape & and <
1391	s/&/&amp;/g;	1510	s/&/&amp;/g;
1392	s/(?<![BIUGH])</&lt;/g;	1511	s/(?<![BIUGHT])</&lt;/g;
1393		1512
1394	# this is buggy, it needs to properly take care of nested <'s	1513	# this is buggy, it needs to properly take care of nested <'s
1395		1514
1396	1 while	1515	1 while
1397	# replace B<>, I<>, U<> etc.	1516	# replace B<>, I<>, U<> etc.
1398	s/B<([^\>]*)>/<b>$1<\/b>/	1517	s/B<([^\>]*)>/<b>$1<\/b>/
1399	|| s/I<([^\>]*)>/<i>$1<\/i>/	1518	|| s/I<([^\>]*)>/<i>$1<\/i>/
1400	|| s/U<([^\>]*)>/<u>$1<\/u>/	1519	|| s/U<([^\>]*)>/<u>$1<\/u>/
		1520	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1401	# replace G<male|female> tags	1521	# replace G<male|female> tags
1402	|| s{G<([^>|]*)\|([^>]*)>}{	1522	|| s{G<([^>|]*)\|([^>]*)>}{
1403	$self->gender ? $2 : $1	1523	$self->gender ? $2 : $1
1404	}ge	1524	}ge
1405	# replace H<hint text>	1525	# replace H<hint text>
1406	|| s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;	1526	|| s{H<([^\>]*)>}
		1527	{
		1528	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1529	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1530	"")
		1531	[$self->{hintmode}]
		1532	}ge;
1407		1533
1408	# create single paragraphs (very hackish)	1534	# create single paragraphs (very hackish)
1409	s/(?<=\S)\n(?=\w)/ /g;	1535	s/(?<=\S)\n(?=\w)/ /g;
1410		1536
		1537	# compress some whitespace
		1538	s/\s+\n/\n/g; # ws line-ends
		1539	s/\n\n+/\n/g; # double lines
		1540	s/^\n+//; # beginning lines
		1541	s/\n+$//; # ending lines
		1542
1411	$_	1543	$_
1412	}	1544	}
1413		1545
		1546	sub hintmode {
		1547	$_[0]{hintmode} = $_[1] if @_ > 1;
		1548	$_[0]{hintmode}
		1549	}
		1550
1414	=item $player->ext_reply ($msgid, %msg)	1551	=item $player->ext_reply ($msgid, @msg)
1415		1552
1416	Sends an ext reply to the player.	1553	Sends an ext reply to the player.
1417		1554
1418	=cut	1555	=cut
1419		1556
1420	sub ext_reply($$%) {	1557	sub ext_reply($$@) {
1421	my ($self, $id, %msg) = @_;	1558	my ($self, $id, @msg) = @_;
1422		1559
1423	$msg{msgid} = $id;	1560	$self->ns->ext_reply ($id, @msg)
1424	$self->send ("ext " . cf::to_json \%msg);
1425	}	1561	}
1426		1562
1427	=item $player->ext_event ($type, %msg)	1563	=item $player->ext_msg ($type, @msg)
1428		1564
1429	Sends an ext event to the client.	1565	Sends an ext event to the client.
1430		1566
1431	=cut	1567	=cut
1432		1568
1433	sub ext_event($$%) {	1569	sub ext_msg($$@) {
1434	my ($self, $type, %msg) = @_;	1570	my ($self, $type, @msg) = @_;
1435		1571
1436	$self->ns->ext_event ($type, %msg);	1572	$self->ns->ext_msg ($type, @msg);
1437	}	1573	}
1438		1574
1439	=head3 cf::region	1575	=head3 cf::region
1440		1576
1441	=over 4	1577	=over 4
…		…
1454	my ($path) = @_;	1590	my ($path) = @_;
1455		1591
1456	my ($match, $specificity);	1592	my ($match, $specificity);
1457		1593
1458	for my $region (list) {	1594	for my $region (list) {
1459	if ($region->match && $path =~ $region->match) {	1595	if ($region->{match} && $path =~ $region->{match}) {
1460	($match, $specificity) = ($region, $region->specificity)	1596	($match, $specificity) = ($region, $region->specificity)
1461	if $region->specificity > $specificity;	1597	if $region->specificity > $specificity;
1462	}	1598	}
1463	}	1599	}
1464		1600
…		…
1584	$self->init; # pass $1 etc.	1720	$self->init; # pass $1 etc.
1585	return $self;	1721	return $self;
1586	}	1722	}
1587	}	1723	}
1588		1724
1589	Carp::carp "unable to resolve path '$path' (base '$base').";	1725	Carp::cluck "unable to resolve path '$path' (base '$base').";
1590	()	1726	()
1591	}	1727	}
1592		1728
1593	sub init {	1729	sub init {
1594	my ($self) = @_;	1730	my ($self) = @_;
…		…
1657		1793
1658	sub load_header_from($) {	1794	sub load_header_from($) {
1659	my ($self, $path) = @_;	1795	my ($self, $path) = @_;
1660		1796
1661	utf8::encode $path;	1797	utf8::encode $path;
1662	#aio_open $path, O_RDONLY, 0	1798	my $f = new_from_file cf::object::thawer $path
1663	# or return;
1664
1665	$self->_load_header ($path)
1666	or return;	1799	or return;
		1800
		1801	$self->_load_header ($f)
		1802	or return;
		1803
		1804	local $MAP_LOADING{$self->{path}} = $self;
		1805	$f->resolve_delayed_derefs;
1667		1806
1668	$self->{load_path} = $path;	1807	$self->{load_path} = $path;
1669		1808
1670	1	1809	1
1671	}	1810	}
…		…
1725	sub find {	1864	sub find {
1726	my ($path, $origin) = @_;	1865	my ($path, $origin) = @_;
1727		1866
1728	$path = normalise $path, $origin && $origin->path;	1867	$path = normalise $path, $origin && $origin->path;
1729		1868
		1869	cf::lock_wait "map_data:$path";#d#remove
1730	cf::lock_wait "map_find:$path";	1870	cf::lock_wait "map_find:$path";
1731		1871
1732	$cf::MAP{$path} || do {	1872	$cf::MAP{$path} || do {
1733	my $guard = cf::lock_acquire "map_find:$path";	1873	my $guard1 = cf::lock_acquire "map_find:$path";
		1874	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1875
1734	my $map = new_from_path cf::map $path	1876	my $map = new_from_path cf::map $path
1735	or return;	1877	or return;
1736		1878
1737	$map->{last_save} = $cf::RUNTIME;	1879	$map->{last_save} = $cf::RUNTIME;
1738		1880
…		…
1740	or return;	1882	or return;
1741		1883
1742	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1884	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1743	# doing this can freeze the server in a sync job, obviously	1885	# doing this can freeze the server in a sync job, obviously
1744	#$cf::WAIT_FOR_TICK->wait;	1886	#$cf::WAIT_FOR_TICK->wait;
		1887	undef $guard1;
		1888	undef $guard2;
1745	$map->reset;	1889	$map->reset;
1746	undef $guard;
1747	return find $path;	1890	return find $path;
1748	}	1891	}
1749		1892
1750	$cf::MAP{$path} = $map	1893	$cf::MAP{$path} = $map
1751	}	1894	}
…		…
1760	local $self->{deny_reset} = 1; # loading can take a long time	1903	local $self->{deny_reset} = 1; # loading can take a long time
1761		1904
1762	my $path = $self->{path};	1905	my $path = $self->{path};
1763		1906
1764	{	1907	{
1765	my $guard = cf::lock_acquire "map_load:$path";	1908	my $guard = cf::lock_acquire "map_data:$path";
1766		1909
		1910	return unless $self->valid;
1767	return if $self->in_memory != cf::MAP_SWAPPED;	1911	return unless $self->in_memory == cf::MAP_SWAPPED;
1768		1912
1769	$self->in_memory (cf::MAP_LOADING);	1913	$self->in_memory (cf::MAP_LOADING);
1770		1914
1771	$self->alloc;	1915	$self->alloc;
1772		1916
1773	$self->pre_load;	1917	$self->pre_load;
1774	Coro::cede;	1918	cf::cede_to_tick;
1775		1919
		1920	my $f = new_from_file cf::object::thawer $self->{load_path};
		1921	$f->skip_block;
1776	$self->_load_objects ($self->{load_path}, 1)	1922	$self->_load_objects ($f)
1777	or return;	1923	or return;
1778		1924
1779	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1925	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1780	if delete $self->{load_original};	1926	if delete $self->{load_original};
1781		1927
1782	if (my $uniq = $self->uniq_path) {	1928	if (my $uniq = $self->uniq_path) {
1783	utf8::encode $uniq;	1929	utf8::encode $uniq;
1784	if (aio_open $uniq, O_RDONLY, 0) {	1930	unless (aio_stat $uniq) {
		1931	if (my $f = new_from_file cf::object::thawer $uniq) {
1785	$self->clear_unique_items;	1932	$self->clear_unique_items;
1786	$self->_load_objects ($uniq, 0);	1933	$self->_load_objects ($f);
		1934	$f->resolve_delayed_derefs;
		1935	}
1787	}	1936	}
1788	}	1937	}
1789		1938
1790	Coro::cede;	1939	$f->resolve_delayed_derefs;
		1940
		1941	cf::cede_to_tick;
1791	# now do the right thing for maps	1942	# now do the right thing for maps
1792	$self->link_multipart_objects;	1943	$self->link_multipart_objects;
1793	$self->difficulty ($self->estimate_difficulty)	1944	$self->difficulty ($self->estimate_difficulty)
1794	unless $self->difficulty;	1945	unless $self->difficulty;
1795	Coro::cede;	1946	cf::cede_to_tick;
1796		1947
1797	unless ($self->{deny_activate}) {	1948	unless ($self->{deny_activate}) {
1798	$self->decay_objects;	1949	$self->decay_objects;
1799	$self->fix_auto_apply;	1950	$self->fix_auto_apply;
1800	$self->update_buttons;	1951	$self->update_buttons;
1801	Coro::cede;	1952	cf::cede_to_tick;
1802	$self->set_darkness_map;	1953	$self->set_darkness_map;
1803	Coro::cede;	1954	cf::cede_to_tick;
1804	$self->activate;	1955	$self->activate;
1805	}	1956	}
		1957
		1958	$self->{last_save} = $cf::RUNTIME;
		1959	$self->last_access ($cf::RUNTIME);
1806		1960
1807	$self->in_memory (cf::MAP_IN_MEMORY);	1961	$self->in_memory (cf::MAP_IN_MEMORY);
1808	}	1962	}
1809		1963
1810	$self->post_load;	1964	$self->post_load;
…		…
1821		1975
1822	$self	1976	$self
1823	}	1977	}
1824		1978
1825	# find and load all maps in the 3x3 area around a map	1979	# find and load all maps in the 3x3 area around a map
1826	sub load_diag {	1980	sub load_neighbours {
1827	my ($map) = @_;	1981	my ($map) = @_;
1828		1982
1829	my @diag; # diagonal neighbours	1983	my @neigh; # diagonal neighbours
1830		1984
1831	for (0 .. 3) {	1985	for (0 .. 3) {
1832	my $neigh = $map->tile_path ($_)	1986	my $neigh = $map->tile_path ($_)
1833	or next;	1987	or next;
1834	$neigh = find $neigh, $map	1988	$neigh = find $neigh, $map
1835	or next;	1989	or next;
1836	$neigh->load;	1990	$neigh->load;
1837		1991
		1992	push @neigh,
1838	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	1993	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1839	[$neigh->tile_path (($_ + 1) % 4), $neigh];	1994	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1840	}	1995	}
1841		1996
1842	for (@diag) {	1997	for (grep defined $_->[0], @neigh) {
		1998	my ($path, $origin) = @$_;
1843	my $neigh = find @$_	1999	my $neigh = find $path, $origin
1844	or next;	2000	or next;
1845	$neigh->load;	2001	$neigh->load;
1846	}	2002	}
1847	}	2003	}
1848		2004
…		…
1853	}	2009	}
1854		2010
1855	sub do_load_sync {	2011	sub do_load_sync {
1856	my ($map) = @_;	2012	my ($map) = @_;
1857		2013
		2014	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2015	if $Coro::current == $Coro::main;
		2016
1858	cf::sync_job { $map->load };	2017	cf::sync_job { $map->load };
1859	}	2018	}
1860		2019
1861	our %MAP_PREFETCH;	2020	our %MAP_PREFETCH;
1862	our $MAP_PREFETCHER = undef;	2021	our $MAP_PREFETCHER = undef;
1863		2022
1864	sub find_async {	2023	sub find_async {
1865	my ($path, $origin) = @_;	2024	my ($path, $origin, $load) = @_;
1866		2025
1867	$path = normalise $path, $origin && $origin->{path};	2026	$path = normalise $path, $origin && $origin->{path};
1868		2027
1869	if (my $map = $cf::MAP{$path}) {	2028	if (my $map = $cf::MAP{$path}) {
1870	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2029	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1871	}	2030	}
1872		2031
1873	undef $MAP_PREFETCH{$path};	2032	$MAP_PREFETCH{$path} |= $load;
		2033
1874	$MAP_PREFETCHER ||= cf::async {	2034	$MAP_PREFETCHER ||= cf::async {
1875	while (%MAP_PREFETCH) {	2035	while (%MAP_PREFETCH) {
1876	for my $path (keys %MAP_PREFETCH) {	2036	while (my ($k, $v) = each %MAP_PREFETCH) {
1877	my $map = find $path	2037	if (my $map = find $k) {
1878	or next;
1879	$map->load;	2038	$map->load if $v;
		2039	}
1880		2040
1881	delete $MAP_PREFETCH{$path};	2041	delete $MAP_PREFETCH{$k};
1882	}	2042	}
1883	}	2043	}
1884	undef $MAP_PREFETCHER;	2044	undef $MAP_PREFETCHER;
1885	};	2045	};
1886	$MAP_PREFETCHER->prio (6);	2046	$MAP_PREFETCHER->prio (6);
…		…
1889	}	2049	}
1890		2050
1891	sub save {	2051	sub save {
1892	my ($self) = @_;	2052	my ($self) = @_;
1893		2053
1894	my $lock = cf::lock_acquire "map_data:" . $self->path;	2054	my $lock = cf::lock_acquire "map_data:$self->{path}";
1895		2055
1896	$self->{last_save} = $cf::RUNTIME;	2056	$self->{last_save} = $cf::RUNTIME;
1897		2057
1898	return unless $self->dirty;	2058	return unless $self->dirty;
1899		2059
…		…
1922	my ($self) = @_;	2082	my ($self) = @_;
1923		2083
1924	# save first because save cedes	2084	# save first because save cedes
1925	$self->save;	2085	$self->save;
1926		2086
1927	my $lock = cf::lock_acquire "map_data:" . $self->path;	2087	my $lock = cf::lock_acquire "map_data:$self->{path}";
1928		2088
1929	return if $self->players;	2089	return if $self->players;
1930	return if $self->in_memory != cf::MAP_IN_MEMORY;	2090	return if $self->in_memory != cf::MAP_IN_MEMORY;
1931	return if $self->{deny_save};	2091	return if $self->{deny_save};
1932		2092
		2093	$self->in_memory (cf::MAP_SWAPPED);
		2094
		2095	$self->deactivate;
		2096	$_->clear_links_to ($self) for values %cf::MAP;
1933	$self->clear;	2097	$self->clear;
1934	$self->in_memory (cf::MAP_SWAPPED);
1935	}	2098	}
1936		2099
1937	sub reset_at {	2100	sub reset_at {
1938	my ($self) = @_;	2101	my ($self) = @_;
1939		2102
…		…
1971	if $uniq;	2134	if $uniq;
1972	}	2135	}
1973		2136
1974	delete $cf::MAP{$self->path};	2137	delete $cf::MAP{$self->path};
1975		2138
		2139	$self->deactivate;
		2140	$_->clear_links_to ($self) for values %cf::MAP;
1976	$self->clear;	2141	$self->clear;
1977
1978	$_->clear_links_to ($self) for values %cf::MAP;
1979		2142
1980	$self->unlink_save;	2143	$self->unlink_save;
1981	$self->destroy;	2144	$self->destroy;
1982	}	2145	}
1983		2146
1984	my $nuke_counter = "aaaa";	2147	my $nuke_counter = "aaaa";
1985		2148
1986	sub nuke {	2149	sub nuke {
1987	my ($self) = @_;	2150	my ($self) = @_;
1988		2151
		2152	{
		2153	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2154
1989	delete $cf::MAP{$self->path};	2155	delete $cf::MAP{$self->path};
1990		2156
1991	$self->unlink_save;	2157	$self->unlink_save;
1992		2158
1993	bless $self, "cf::map";	2159	bless $self, "cf::map";
1994	delete $self->{deny_reset};	2160	delete $self->{deny_reset};
1995	$self->{deny_save} = 1;	2161	$self->{deny_save} = 1;
1996	$self->reset_timeout (1);	2162	$self->reset_timeout (1);
1997	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2163	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1998		2164
1999	$cf::MAP{$self->path} = $self;	2165	$cf::MAP{$self->path} = $self;
		2166	}
2000		2167
2001	$self->reset; # polite request, might not happen	2168	$self->reset; # polite request, might not happen
2002	}	2169	}
2003		2170
2004	=item $maps = cf::map::tmp_maps	2171	=item $maps = cf::map::tmp_maps
…		…
2080		2247
2081	sub inv_recursive {	2248	sub inv_recursive {
2082	inv_recursive_ inv $_[0]	2249	inv_recursive_ inv $_[0]
2083	}	2250	}
2084		2251
		2252	=item $ref = $ob->ref
		2253
		2254	creates and returns a persistent reference to an objetc that can be stored as a string.
		2255
		2256	=item $ob = cf::object::deref ($refstring)
		2257
		2258	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2259	even if the object actually exists. May block.
		2260
		2261	=cut
		2262
		2263	sub deref {
		2264	my ($ref) = @_;
		2265
		2266	# temporary compatibility#TODO#remove
		2267	$ref =~ s{^<}{player/<};
		2268
		2269	if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
		2270	my ($uuid, $name) = ($1, $2);
		2271	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2272	or return;
		2273	$pl->ob->uuid eq $uuid
		2274	or return;
		2275
		2276	$pl->ob
		2277	} else {
		2278	warn "$ref: cannot resolve object reference\n";
		2279	undef
		2280	}
		2281	}
		2282
2085	package cf;	2283	package cf;
2086		2284
2087	=back	2285	=back
2088		2286
2089	=head3 cf::object::player	2287	=head3 cf::object::player
…		…
2111		2309
2112	} else {	2310	} else {
2113	my $pl = $self->contr;	2311	my $pl = $self->contr;
2114		2312
2115	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2313	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2116	my $diag = $pl->{npc_dialog};	2314	my $dialog = $pl->{npc_dialog};
2117	$diag->{pl}->ext_reply (	2315	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2118	$diag->{id},
2119	msgtype => "reply",
2120	msg => $diag->{pl}->expand_cfpod ($msg),
2121	add_topics => []
2122	);
2123		2316
2124	} else {	2317	} else {
2125	$msg = $npc->name . " says: $msg" if $npc;	2318	$msg = $npc->name . " says: $msg" if $npc;
2126	$self->message ($msg, $flags);	2319	$self->message ($msg, $flags);
2127	}	2320	}
2128	}	2321	}
		2322	}
		2323
		2324	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2325
		2326	=cut
		2327
		2328	sub cf::object::send_msg {
		2329	my $pl = shift->contr
		2330	or return;
		2331	$pl->send_msg (@_);
2129	}	2332	}
2130		2333
2131	=item $player_object->may ("access")	2334	=item $player_object->may ("access")
2132		2335
2133	Returns wether the given player is authorized to access resource "access"	2336	Returns wether the given player is authorized to access resource "access"
…		…
2212	# use -1 or undef as default coordinates, not 0, 0	2415	# use -1 or undef as default coordinates, not 0, 0
2213	($x, $y) = ($map->enter_x, $map->enter_y)	2416	($x, $y) = ($map->enter_x, $map->enter_y)
2214	if $x <=0 && $y <= 0;	2417	if $x <=0 && $y <= 0;
2215		2418
2216	$map->load;	2419	$map->load;
2217	$map->load_diag;	2420	$map->load_neighbours;
2218		2421
2219	return unless $self->contr->active;	2422	return unless $self->contr->active;
2220	$self->activate_recursive;	2423	$self->activate_recursive;
2221		2424
2222	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2425	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2223	$self->enter_map ($map, $x, $y);	2426	$self->enter_map ($map, $x, $y);
2224	}	2427	}
2225		2428
2226	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2429	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2227		2430
2228	Moves the player to the given map-path and coordinates by first freezing	2431	Moves the player to the given map-path and coordinates by first freezing
2229	her, loading and preparing them map, calling the provided $check callback	2432	her, loading and preparing them map, calling the provided $check callback
2230	that has to return the map if sucecssful, and then unfreezes the player on	2433	that has to return the map if sucecssful, and then unfreezes the player on
2231	the new (success) or old (failed) map position.	2434	the new (success) or old (failed) map position. In either case, $done will
		2435	be called at the end of this process.
2232		2436
2233	=cut	2437	=cut
2234		2438
2235	our $GOTOGEN;	2439	our $GOTOGEN;
2236		2440
2237	sub cf::object::player::goto {	2441	sub cf::object::player::goto {
2238	my ($self, $path, $x, $y, $check) = @_;	2442	my ($self, $path, $x, $y, $check, $done) = @_;
2239		2443
2240	# do generation counting so two concurrent goto's will be executed in-order	2444	# do generation counting so two concurrent goto's will be executed in-order
2241	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2445	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2242		2446
2243	$self->enter_link;	2447	$self->enter_link;
…		…
2263		2467
2264	if ($gen == $self->{_goto_generation}) {	2468	if ($gen == $self->{_goto_generation}) {
2265	delete $self->{_goto_generation};	2469	delete $self->{_goto_generation};
2266	$self->leave_link ($map, $x, $y);	2470	$self->leave_link ($map, $x, $y);
2267	}	2471	}
		2472
		2473	$done->() if $done;
2268	})->prio (1);	2474	})->prio (1);
2269	}	2475	}
2270		2476
2271	=item $player_object->enter_exit ($exit_object)	2477	=item $player_object->enter_exit ($exit_object)
2272		2478
…		…
2341	my $hp = $exit->stats->hp;	2547	my $hp = $exit->stats->hp;
2342	my $sp = $exit->stats->sp;	2548	my $sp = $exit->stats->sp;
2343		2549
2344	$self->enter_link;	2550	$self->enter_link;
2345		2551
		2552	# if exit is damned, update players death & WoR home-position
		2553	$self->contr->savebed ($slaying, $hp, $sp)
		2554	if $exit->flag (FLAG_DAMNED);
		2555
2346	(async {	2556	(async {
2347	$self->deactivate_recursive; # just to be sure	2557	$self->deactivate_recursive; # just to be sure
2348	unless (eval {	2558	unless (eval {
2349	$self->goto ($slaying, $hp, $sp);	2559	$self->goto ($slaying, $hp, $sp);
2350		2560
…		…
2377		2587
2378	utf8::encode $text;	2588	utf8::encode $text;
2379	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2589	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2380	}	2590	}
2381		2591
2382	=item $client->send_msg ($color, $type, $msg, [extra...])	2592	=item $client->send_msg ($channel, $msg, $color, [extra...])
2383		2593
2384	Send a drawinfo or msg packet to the client, formatting the msg for the	2594	Send a drawinfo or msg packet to the client, formatting the msg for the
2385	client if neccessary. C<$type> should be a string identifying the type of	2595	client if neccessary. C<$type> should be a string identifying the type of
2386	the message, with C<log> being the default. If C<$color> is negative, suppress	2596	the message, with C<log> being the default. If C<$color> is negative, suppress
2387	the message unless the client supports the msg packet.	2597	the message unless the client supports the msg packet.
2388		2598
2389	=cut	2599	=cut
2390		2600
		2601	our %CHANNEL = (
		2602	"c/identify" => {
		2603	id => "identify",
		2604	title => "Identify",
		2605	reply => undef,
		2606	tooltip => "Items recently identified",
		2607	},
		2608	"c/examine" => {
		2609	id => "examine",
		2610	title => "Examine",
		2611	reply => undef,
		2612	tooltip => "Signs and other items you examined",
		2613	},
		2614	);
		2615
2391	sub cf::client::send_msg {	2616	sub cf::client::send_msg {
2392	my ($self, $color, $type, $msg, @extra) = @_;	2617	my ($self, $channel, $msg, $color, @extra) = @_;
2393		2618
2394	$msg = $self->pl->expand_cfpod ($msg);	2619	$msg = $self->pl->expand_cfpod ($msg);
2395		2620
		2621	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2622
		2623	# check predefined channels, for the benefit of C
		2624	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};
		2625
		2626	if (ref $channel) {
		2627	# send meta info to client, if not yet sent
		2628	unless (exists $self->{channel}{$channel->{id}}) {
		2629	$self->{channel}{$channel->{id}} = $channel;
		2630	$self->ext_msg (channel_info => $channel)
		2631	if $self->can_msg;
		2632	}
		2633
		2634	$channel = $channel->{id};
		2635	}
		2636
		2637	return unless @extra || length $msg;
		2638
2396	if ($self->can_msg) {	2639	if ($self->can_msg) {
2397	$self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);	2640	# default colour, mask it out
		2641	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2642	if $color & cf::NDI_DEF;
		2643
		2644	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2645	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2398	} else {	2646	} else {
2399	# replace some tags by gcfclient-compatible ones
2400	for ($msg) {
2401	1 while
2402	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2403	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2404	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2405	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2406	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2407	}
2408
2409	if ($color >= 0) {	2647	if ($color >= 0) {
		2648	# replace some tags by gcfclient-compatible ones
		2649	for ($msg) {
		2650	1 while
		2651	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2652	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2653	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2654	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2655	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2656	}
		2657
		2658	$color &= cf::NDI_COLOR_MASK;
		2659
		2660	utf8::encode $msg;
		2661
2410	if (0 && $msg =~ /\[/) {	2662	if (0 && $msg =~ /\[/) {
		2663	# COMMAND/INFO
2411	$self->send_packet ("drawextinfo $color 4 0 $msg")	2664	$self->send_packet ("drawextinfo $color 10 8 $msg")
2412	} else {	2665	} else {
2413	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;	2666	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2414	$self->send_packet ("drawinfo $color $msg")	2667	$self->send_packet ("drawinfo $color $msg")
2415	}	2668	}
2416	}	2669	}
2417	}	2670	}
2418	}	2671	}
2419		2672
2420	=item $client->ext_event ($type, %msg)	2673	=item $client->ext_msg ($type, @msg)
2421		2674
2422	Sends an ext event to the client.	2675	Sends an ext event to the client.
2423		2676
2424	=cut	2677	=cut
2425		2678
2426	sub cf::client::ext_event($$%) {	2679	sub cf::client::ext_msg($$@) {
2427	my ($self, $type, %msg) = @_;	2680	my ($self, $type, @msg) = @_;
2428		2681
		2682	if ($self->extcmd == 2) {
		2683	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2684	} elsif ($self->extcmd == 1) { # TODO: remove
2429	$msg{msgtype} = "event_$type";	2685	push @msg, msgtype => "event_$type";
2430	$self->send_packet ("ext " . cf::to_json \%msg);	2686	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2687	}
		2688	}
		2689
		2690	=item $client->ext_reply ($msgid, @msg)
		2691
		2692	Sends an ext reply to the client.
		2693
		2694	=cut
		2695
		2696	sub cf::client::ext_reply($$@) {
		2697	my ($self, $id, @msg) = @_;
		2698
		2699	if ($self->extcmd == 2) {
		2700	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2701	} elsif ($self->extcmd == 1) {
		2702	#TODO: version 1, remove
		2703	unshift @msg, msgtype => "reply", msgid => $id;
		2704	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2705	}
2431	}	2706	}
2432		2707
2433	=item $success = $client->query ($flags, "text", \&cb)	2708	=item $success = $client->query ($flags, "text", \&cb)
2434		2709
2435	Queues a query to the client, calling the given callback with	2710	Queues a query to the client, calling the given callback with
…		…
2458		2733
2459	1	2734	1
2460	}	2735	}
2461		2736
2462	cf::client->attach (	2737	cf::client->attach (
		2738	on_connect => sub {
		2739	my ($ns) = @_;
		2740
		2741	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2742	},
2463	on_reply => sub {	2743	on_reply => sub {
2464	my ($ns, $msg) = @_;	2744	my ($ns, $msg) = @_;
2465		2745
2466	# this weird shuffling is so that direct followup queries	2746	# this weird shuffling is so that direct followup queries
2467	# get handled first	2747	# get handled first
…		…
2482	}	2762	}
2483	},	2763	},
2484	on_exticmd => sub {	2764	on_exticmd => sub {
2485	my ($ns, $buf) = @_;	2765	my ($ns, $buf) = @_;
2486		2766
2487	my $msg = eval { from_json $buf };	2767	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2488		2768
2489	if (ref $msg) {	2769	if (ref $msg) {
		2770	my ($type, $reply, @payload) =
		2771	"ARRAY" eq ref $msg
		2772	? @$msg
		2773	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2774
		2775	my @reply;
		2776
2490	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2777	if (my $cb = $EXTICMD{$type}) {
2491	if (my %reply = $cb->($ns, $msg)) {	2778	@reply = $cb->($ns, @payload);
2492	$reply{msgid} = $msg->{msgid};
2493	$ns->send ("ext " . cf::to_json \%reply);
2494	}
2495	}	2779	}
		2780
		2781	$ns->ext_reply ($reply, @reply)
		2782	if $reply;
		2783
2496	} else {	2784	} else {
2497	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2785	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2498	}	2786	}
2499		2787
2500	cf::override;	2788	cf::override;
…		…
2547	our $safe = new Safe "safe";	2835	our $safe = new Safe "safe";
2548	our $safe_hole = new Safe::Hole;	2836	our $safe_hole = new Safe::Hole;
2549		2837
2550	$SIG{FPE} = 'IGNORE';	2838	$SIG{FPE} = 'IGNORE';
2551		2839
2552	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2840	$safe->permit_only (Opcode::opset qw(
		2841	:base_core :base_mem :base_orig :base_math
		2842	grepstart grepwhile mapstart mapwhile
		2843	sort time
		2844	));
2553		2845
2554	# here we export the classes and methods available to script code	2846	# here we export the classes and methods available to script code
2555		2847
2556	=pod	2848	=pod
2557		2849
2558	The following functions and methods are available within a safe environment:	2850	The following functions and methods are available within a safe environment:
2559		2851
2560	cf::object contr pay_amount pay_player map	2852	cf::object
		2853	contr pay_amount pay_player map x y force_find force_add
		2854	insert remove name archname title slaying race decrease_ob_nr
		2855
2561	cf::object::player player	2856	cf::object::player
2562	cf::player peaceful	2857	player
2563	cf::map trigger	2858
		2859	cf::player
		2860	peaceful
		2861
		2862	cf::map
		2863	trigger
2564		2864
2565	=cut	2865	=cut
2566		2866
2567	for (	2867	for (
2568	["cf::object" => qw(contr pay_amount pay_player map)],	2868	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2869	insert remove inv name archname title slaying race
		2870	decrease_ob_nr)],
2569	["cf::object::player" => qw(player)],	2871	["cf::object::player" => qw(player)],
2570	["cf::player" => qw(peaceful)],	2872	["cf::player" => qw(peaceful)],
2571	["cf::map" => qw(trigger)],	2873	["cf::map" => qw(trigger)],
2572	) {	2874	) {
2573	no strict 'refs';	2875	no strict 'refs';
…		…
2649	# the server's init and main functions	2951	# the server's init and main functions
2650		2952
2651	sub load_facedata($) {	2953	sub load_facedata($) {
2652	my ($path) = @_;	2954	my ($path) = @_;
2653		2955
		2956	# HACK to clear player env face cache, we need some signal framework
		2957	# for this (global event?)
		2958	%ext::player_env::MUSIC_FACE_CACHE = ();
		2959
		2960	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		2961
2654	warn "loading facedata from $path\n";	2962	warn "loading facedata from $path\n";
2655		2963
2656	my $facedata;	2964	my $facedata;
2657	0 < aio_load $path, $facedata	2965	0 < aio_load $path, $facedata
2658	or die "$path: $!";	2966	or die "$path: $!";
…		…
2660	$facedata = Coro::Storable::thaw $facedata;	2968	$facedata = Coro::Storable::thaw $facedata;
2661		2969
2662	$facedata->{version} == 2	2970	$facedata->{version} == 2
2663	or cf::cleanup "$path: version mismatch, cannot proceed.";	2971	or cf::cleanup "$path: version mismatch, cannot proceed.";
2664		2972
		2973	# patch in the exptable
		2974	$facedata->{resource}{"res/exp_table"} = {
		2975	type => FT_RSRC,
		2976	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		2977	};
		2978	cf::cede_to_tick;
		2979
2665	{	2980	{
2666	my $faces = $facedata->{faceinfo};	2981	my $faces = $facedata->{faceinfo};
2667		2982
2668	while (my ($face, $info) = each %$faces) {	2983	while (my ($face, $info) = each %$faces) {
2669	my $idx = (cf::face::find $face) || cf::face::alloc $face;	2984	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2670	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	2985	cf::face::set_visibility $idx, $info->{visibility};
		2986	cf::face::set_magicmap $idx, $info->{magicmap};
2671	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	2987	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2672	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	2988	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2673	Coro::cede;	2989
		2990	cf::cede_to_tick;
2674	}	2991	}
2675		2992
2676	while (my ($face, $info) = each %$faces) {	2993	while (my ($face, $info) = each %$faces) {
2677	next unless $info->{smooth};	2994	next unless $info->{smooth};
2678	my $idx = cf::face::find $face	2995	my $idx = cf::face::find $face
2679	or next;	2996	or next;
2680	if (my $smooth = cf::face::find $info->{smooth}) {	2997	if (my $smooth = cf::face::find $info->{smooth}) {
		2998	cf::face::set_smooth $idx, $smooth;
2681	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	2999	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2682	} else {	3000	} else {
2683	warn "smooth face '$info->{smooth}' not found for face '$face'";	3001	warn "smooth face '$info->{smooth}' not found for face '$face'";
2684	}	3002	}
2685	Coro::cede;	3003
		3004	cf::cede_to_tick;
2686	}	3005	}
2687	}	3006	}
2688		3007
2689	{	3008	{
2690	my $anims = $facedata->{animinfo};	3009	my $anims = $facedata->{animinfo};
2691		3010
2692	while (my ($anim, $info) = each %$anims) {	3011	while (my ($anim, $info) = each %$anims) {
2693	cf::anim::set $anim, $info->{frames}, $info->{facings};	3012	cf::anim::set $anim, $info->{frames}, $info->{facings};
2694	Coro::cede;	3013	cf::cede_to_tick;
2695	}	3014	}
2696		3015
2697	cf::anim::invalidate_all; # d'oh	3016	cf::anim::invalidate_all; # d'oh
2698	}	3017	}
2699		3018
		3019	{
		3020	# TODO: for gcfclient pleasure, we should give resources
		3021	# that gcfclient doesn't grok a >10000 face index.
		3022	my $res = $facedata->{resource};
		3023
		3024	my $soundconf = delete $res->{"res/sound.conf"};
		3025
		3026	while (my ($name, $info) = each %$res) {
		3027	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3028	my $data;
		3029
		3030	if ($info->{type} & 1) {
		3031	# prepend meta info
		3032
		3033	my $meta = $enc->encode ({
		3034	name => $name,
		3035	%{ $info->{meta} || {} },
		3036	});
		3037
		3038	$data = pack "(w/a*)*", $meta, $info->{data};
		3039	} else {
		3040	$data = $info->{data};
		3041	}
		3042
		3043	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3044	cf::face::set_type $idx, $info->{type};
		3045
		3046	cf::cede_to_tick;
		3047	}
		3048
		3049	if ($soundconf) {
		3050	$soundconf = $enc->decode (delete $soundconf->{data});
		3051
		3052	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3053	my $sound = $soundconf->{compat}[$_]
		3054	or next;
		3055
		3056	my $face = cf::face::find "sound/$sound->[1]";
		3057	cf::sound::set $sound->[0] => $face;
		3058	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3059	}
		3060
		3061	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3062	my $face = cf::face::find "sound/$v";
		3063	cf::sound::set $k => $face;
		3064	}
		3065	}
		3066	}
		3067
2700	1	3068	1
2701	}	3069	}
2702		3070
		3071	register_exticmd fx_want => sub {
		3072	my ($ns, $want) = @_;
		3073
		3074	while (my ($k, $v) = each %$want) {
		3075	$ns->fx_want ($k, $v);
		3076	}
		3077	};
		3078
2703	sub reload_regions {	3079	sub reload_regions {
		3080	# HACK to clear player env face cache, we need some signal framework
		3081	# for this (global event?)
		3082	%ext::player_env::MUSIC_FACE_CACHE = ();
		3083
2704	load_resource_file "$MAPDIR/regions"	3084	load_resource_file "$MAPDIR/regions"
2705	or die "unable to load regions file\n";	3085	or die "unable to load regions file\n";
		3086
		3087	for (cf::region::list) {
		3088	$_->{match} = qr/$_->{match}/
		3089	if exists $_->{match};
		3090	}
2706	}	3091	}
2707		3092
2708	sub reload_facedata {	3093	sub reload_facedata {
2709	load_facedata "$DATADIR/facedata"	3094	load_facedata "$DATADIR/facedata"
2710	or die "unable to load facedata\n";	3095	or die "unable to load facedata\n";
2711	}	3096	}
2712		3097
2713	sub reload_archetypes {	3098	sub reload_archetypes {
		3099	load_resource_file "$DATADIR/archetypes"
		3100	or die "unable to load archetypes\n";
		3101	#d# NEED to laod twice to resolve forward references
		3102	# this really needs to be done in an extra post-pass
		3103	# (which needs to be synchronous, so solve it differently)
2714	load_resource_file "$DATADIR/archetypes"	3104	load_resource_file "$DATADIR/archetypes"
2715	or die "unable to load archetypes\n";	3105	or die "unable to load archetypes\n";
2716	}	3106	}
2717		3107
2718	sub reload_treasures {	3108	sub reload_treasures {
…		…
2734		3124
2735	sub init {	3125	sub init {
2736	reload_resources;	3126	reload_resources;
2737	}	3127	}
2738		3128
2739	sub cfg_load {	3129	sub reload_config {
2740	open my $fh, "<:utf8", "$CONFDIR/config"	3130	open my $fh, "<:utf8", "$CONFDIR/config"
2741	or return;	3131	or return;
2742		3132
2743	local $/;	3133	local $/;
2744	*CFG = YAML::Syck::Load <$fh>;	3134	*CFG = YAML::Syck::Load <$fh>;
…		…
2764	(async {	3154	(async {
2765	Event::one_event;	3155	Event::one_event;
2766	})->prio (Coro::PRIO_MAX);	3156	})->prio (Coro::PRIO_MAX);
2767	};	3157	};
2768		3158
2769	cfg_load;	3159	reload_config;
2770	db_init;	3160	db_init;
2771	load_extensions;	3161	load_extensions;
2772		3162
2773	$TICK_WATCHER->start;	3163	$TICK_WATCHER->start;
2774	Event::loop;	3164	Event::loop;
…		…
2967	warn "reloading cf.pm";	3357	warn "reloading cf.pm";
2968	require cf;	3358	require cf;
2969	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3359	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2970		3360
2971	warn "loading config and database again";	3361	warn "loading config and database again";
2972	cf::cfg_load;	3362	cf::reload_config;
2973		3363
2974	warn "loading extensions";	3364	warn "loading extensions";
2975	cf::load_extensions;	3365	cf::load_extensions;
2976		3366
2977	warn "reattaching attachments to objects/players";	3367	warn "reattaching attachments to objects/players";
…		…
3070	or die;	3460	or die;
3071		3461
3072	$map->width (50);	3462	$map->width (50);
3073	$map->height (50);	3463	$map->height (50);
3074	$map->alloc;	3464	$map->alloc;
3075	$map->_load_objects ("/tmp/x.map", 1);	3465	$map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3076	my $t = Event::time - $t;	3466	my $t = Event::time - $t;
3077		3467
3078	#next unless $t < 0.0013;#d#	3468	#next unless $t < 0.0013;#d#
3079	if ($t < $min) {	3469	if ($t < $min) {
3080	$min = $t;	3470	$min = $t;

Diff Legend

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