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.310 by elmex, Mon Jul 16 15:43:49 2007 UTC vs.
Revision 1.371 by root, Thu Sep 13 16:16:01 2007 UTC

…		…
10	use Event;	10	use Event;
11	use Opcode;	11	use Opcode;
12	use Safe;	12	use Safe;
13	use Safe::Hole;	13	use Safe::Hole;
14		14
15	use Coro 3.61 ();	15	use Coro 3.64 ();
16	use Coro::State;	16	use Coro::State;
17	use Coro::Handle;	17	use Coro::Handle;
18	use Coro::Event;	18	use Coro::Event;
19	use Coro::Timer;	19	use Coro::Timer;
20	use Coro::Signal;	20	use Coro::Signal;
21	use Coro::Semaphore;	21	use Coro::Semaphore;
22	use Coro::AIO;	22	use Coro::AIO;
23	use Coro::Storable;	23	use Coro::Storable;
		24	use Coro::Util ();
24		25
25	use JSON::XS 1.4 ();	26	use JSON::XS ();
26	use BDB ();	27	use BDB ();
27	use Data::Dumper;	28	use Data::Dumper;
28	use Digest::MD5;	29	use Digest::MD5;
29	use Fcntl;	30	use Fcntl;
30	use YAML::Syck ();	31	use YAML::Syck ();
…		…
79	our $NEXT_TICK;	80	our $NEXT_TICK;
80	our $NOW;	81	our $NOW;
81	our $USE_FSYNC = 1; # use fsync to write maps - default off	82	our $USE_FSYNC = 1; # use fsync to write maps - default off
82		83
83	our $BDB_POLL_WATCHER;	84	our $BDB_POLL_WATCHER;
		85	our $BDB_DEADLOCK_WATCHER;
		86	our $BDB_CHECKPOINT_WATCHER;
		87	our $BDB_TRICKLE_WATCHER;
84	our $DB_ENV;	88	our $DB_ENV;
85		89
86	our %CFG;	90	our %CFG;
87		91
88	our $UPTIME; $UPTIME ||= time;	92	our $UPTIME; $UPTIME ||= time;
89	our $RUNTIME;	93	our $RUNTIME;
90		94
91	our %PLAYER; # all users	95	our (%PLAYER, %PLAYER_LOADING); # all users
92	our %MAP; # all maps	96	our (%MAP, %MAP_LOADING ); # all maps
93	our $LINK_MAP; # the special {link} map, which is always available	97	our $LINK_MAP; # the special {link} map, which is always available
94		98
95	# used to convert map paths into valid unix filenames by replacing / by ∕	99	# used to convert map paths into valid unix filenames by replacing / by ∕
96	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	100	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97		101
…		…
186	$msg .= "\n"	190	$msg .= "\n"
187	unless $msg =~ /\n$/;	191	unless $msg =~ /\n$/;
188		192
189	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	193	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190		194
191	utf8::encode $msg;
192	LOG llevError, $msg;	195	LOG llevError, $msg;
193	};	196	};
194	}	197	}
195		198
196	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	199	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
271	Wait until the given lock is available and then acquires it and returns	274	Wait until the given lock is available and then acquires it and returns
272	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	275	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273	for example when the coroutine gets canceled), the lock is automatically	276	for example when the coroutine gets canceled), the lock is automatically
274	returned.	277	returned.
275		278
		279	Locks are *not* recursive, locking from the same coro twice results in a
		280	deadlocked coro.
		281
276	Lock names should begin with a unique identifier (for example, cf::map::find	282	Lock names should begin with a unique identifier (for example, cf::map::find
277	uses map_find and cf::map::load uses map_load).	283	uses map_find and cf::map::load uses map_load).
278		284
279	=item $locked = cf::lock_active $string	285	=item $locked = cf::lock_active $string
280		286
281	Return true if the lock is currently active, i.e. somebody has locked it.	287	Return true if the lock is currently active, i.e. somebody has locked it.
282		288
283	=cut	289	=cut
284		290
285	our %LOCK;	291	our %LOCK;
		292	our %LOCKER;#d#
286		293
287	sub lock_wait($) {	294	sub lock_wait($) {
288	my ($key) = @_;	295	my ($key) = @_;
		296
		297	if ($LOCKER{$key} == $Coro::current) {#d#
		298	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		299	return;#d#
		300	}#d#
289		301
290	# wait for lock, if any	302	# wait for lock, if any
291	while ($LOCK{$key}) {	303	while ($LOCK{$key}) {
292	push @{ $LOCK{$key} }, $Coro::current;	304	push @{ $LOCK{$key} }, $Coro::current;
293	Coro::schedule;	305	Coro::schedule;
…		…
299		311
300	# wait, to be sure we are not locked	312	# wait, to be sure we are not locked
301	lock_wait $key;	313	lock_wait $key;
302		314
303	$LOCK{$key} = [];	315	$LOCK{$key} = [];
		316	$LOCKER{$key} = $Coro::current;#d#
304		317
305	Coro::guard {	318	Coro::guard {
		319	delete $LOCKER{$key};#d#
306	# wake up all waiters, to be on the safe side	320	# wake up all waiters, to be on the safe side
307	$_->ready for @{ delete $LOCK{$key} };	321	$_->ready for @{ delete $LOCK{$key} };
308	}	322	}
309	}	323	}
310		324
…		…
320	my $guard = Coro::guard {	334	my $guard = Coro::guard {
321	$TICK_WATCHER->start;	335	$TICK_WATCHER->start;
322	};	336	};
323	$TICK_WATCHER->stop;	337	$TICK_WATCHER->stop;
324	$guard	338	$guard
		339	}
		340
		341	=item cf::get_slot $time[, $priority[, $name]]
		342
		343	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		344	This call blocks and returns only when you have at least C<$time> seconds
		345	of cpu time till the next tick. The slot is only valid till the next cede.
		346
		347	The optional C<$name> can be used to identify the job to run. It might be
		348	used for statistical purposes and should identify the same time-class.
		349
		350	Useful for short background jobs.
		351
		352	=cut
		353
		354	our @SLOT_QUEUE;
		355	our $SLOT_QUEUE;
		356
		357	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		358	$SLOT_QUEUE = Coro::async {
		359	my $signal = new Coro::Signal;
		360
		361	while () {
		362	next_job:
		363	my $avail = cf::till_tick;
		364	if ($avail > 0.01) {
		365	for (0 .. $#SLOT_QUEUE) {
		366	if ($SLOT_QUEUE[$_][0] < $avail) {
		367	my $job = splice @SLOT_QUEUE, $_, 1, ();
		368	$job->[2]->send;
		369	Coro::cede;
		370	goto next_job;
		371	}
		372	}
		373	}
		374
		375	if (@SLOT_QUEUE) {
		376	# we do not use wait_For_tick() as it returns immediately when tick is inactive
		377	push @cf::WAIT_FOR_TICK, $signal;
		378	$signal->wait;
		379	} else {
		380	Coro::schedule;
		381	}
		382	}
		383	};
		384
		385	sub get_slot($;$$) {
		386	my ($time, $pri, $name) = @_;
		387
		388	$time = $TICK * .6 if $time > $TICK * .6;
		389	my $sig = new Coro::Signal;
		390
		391	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		392	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		393	$SLOT_QUEUE->ready;
		394	$sig->wait;
325	}	395	}
326		396
327	=item cf::async { BLOCK }	397	=item cf::async { BLOCK }
328		398
329	Currently the same as Coro::async_pool, meaning you cannot use	399	Currently the same as Coro::async_pool, meaning you cannot use
…		…
416	Coro::Storable. May, of course, block. Note that the executed sub may	486	Coro::Storable. May, of course, block. Note that the executed sub may
417	never block itself or use any form of Event handling.	487	never block itself or use any form of Event handling.
418		488
419	=cut	489	=cut
420		490
421	sub _store_scalar {
422	open my $fh, ">", \my $buf
423	or die "fork_call: cannot open fh-to-buf in child : $!";
424	Storable::store_fd $_[0], $fh;
425	close $fh;
426
427	$buf
428	}
429
430	sub fork_call(&@) {	491	sub fork_call(&@) {
431	my ($cb, @args) = @_;	492	my ($cb, @args) = @_;
432		493
433	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	494	# we seemingly have to make a local copy of the whole thing,
434	# or die "socketpair: $!";	495	# otherwise perl prematurely frees the stuff :/
435	pipe my $fh1, my $fh2	496	# TODO: investigate and fix (likely this will be rather laborious)
436	or die "pipe: $!";
437		497
438	if (my $pid = fork) {	498	my @res = Coro::Util::fork_eval {
439	close $fh2;
440
441	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442	warn "pst<$res>" unless $res =~ /^pst/;
443	$res = Coro::Storable::thaw $res;
444
445	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447	Carp::confess $$res unless "ARRAY" eq ref $res;
448
449	return wantarray ? @$res : $res->[-1];
450	} else {
451	reset_signals;	499	reset_signals;
452	local $SIG{__WARN__};	500	&$cb
453	local $SIG{__DIE__};	501	}, @args;
454	# just in case, this hack effectively disables event
455	# in the child. cleaner and slower would be canceling all watchers,
456	# but this works for the time being.
457	local $Coro::idle;
458	$Coro::current->prio (Coro::PRIO_MAX);
459		502
460	eval {	503	wantarray ? @res : $res[-1]
461	close $fh1;
462
463	my @res = eval { $cb->(@args) };
464
465	syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466	close $fh2;
467	};
468
469	warn $@ if $@;
470	_exit 0;
471	}
472	}	504	}
473		505
474	=item $value = cf::db_get $family => $key	506	=item $value = cf::db_get $family => $key
475		507
476	Returns a single value from the environment database.	508	Returns a single value from the environment database.
…		…
478	=item cf::db_put $family => $key => $value	510	=item cf::db_put $family => $key => $value
479		511
480	Stores the given C<$value> in the family. It can currently store binary	512	Stores the given C<$value> in the family. It can currently store binary
481	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).	513	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
482		514
		515	=item $db = cf::db_table "name"
		516
		517	Create and/or open a new database table. The string must not be "db" and must be unique
		518	within each server.
		519
483	=cut	520	=cut
		521
		522	sub db_table($) {
		523	my ($name) = @_;
		524	my $db = BDB::db_create $DB_ENV;
		525
		526	eval {
		527	$db->set_flags (BDB::CHKSUM);
		528
		529	utf8::encode $name;
		530	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		531	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		532	cf::cleanup "db_open(db): $!" if $!;
		533	};
		534	cf::cleanup "db_open(db): $@" if $@;
		535
		536	$db
		537	}
484		538
485	our $DB;	539	our $DB;
486		540
487	sub db_init {	541	sub db_init {
488	unless ($DB) {
489	$DB = BDB::db_create $DB_ENV;
490
491	cf::sync_job {	542	cf::sync_job {
492	eval {	543	$DB ||= db_table "db";
493	$DB->set_flags (BDB::CHKSUM);
494
495	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
496	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
497	cf::cleanup "db_open(db): $!" if $!;
498	};
499	cf::cleanup "db_open(db): $@" if $@;
500	};
501	}	544	};
502	}	545	}
503		546
504	sub db_get($$) {	547	sub db_get($$) {
505	my $key = "$_[0]/$_[1]";	548	my $key = "$_[0]/$_[1]";
506		549
…		…
556	if (1) {	599	if (1) {
557	$md5 =	600	$md5 =
558	join "\x00",	601	join "\x00",
559	$processversion,	602	$processversion,
560	map {	603	map {
561	Coro::cede;	604	cf::cede_to_tick;
562	($src->[$_], Digest::MD5::md5_hex $data[$_])	605	($src->[$_], Digest::MD5::md5_hex $data[$_])
563	} 0.. $#$src;	606	} 0.. $#$src;
564		607
565		608
566	my $dbmd5 = db_get cache => "$id/md5";	609	my $dbmd5 = db_get cache => "$id/md5";
…		…
918		961
919	=cut	962	=cut
920		963
921	#############################################################################	964	#############################################################################
922	# object support	965	# object support
		966	#
		967
		968	sub _can_merge {
		969	my ($ob1, $ob2) = @_;
		970
		971	local $Storable::canonical = 1;
		972	my $fob1 = Storable::freeze $ob1;
		973	my $fob2 = Storable::freeze $ob2;
		974
		975	$fob1 eq $fob2
		976	}
923		977
924	sub reattach {	978	sub reattach {
925	# basically do the same as instantiate, without calling instantiate	979	# basically do the same as instantiate, without calling instantiate
926	my ($obj) = @_;	980	my ($obj) = @_;
927		981
…		…
972	);	1026	);
973		1027
974	sub object_freezer_save {	1028	sub object_freezer_save {
975	my ($filename, $rdata, $objs) = @_;	1029	my ($filename, $rdata, $objs) = @_;
976		1030
		1031	my $guard = cf::lock_acquire "io";
		1032
977	sync_job {	1033	sync_job {
978	if (length $$rdata) {	1034	if (length $$rdata) {
		1035	utf8::decode (my $decname = $filename);
979	warn sprintf "saving %s (%d,%d)\n",	1036	warn sprintf "saving %s (%d,%d)\n",
980	$filename, length $$rdata, scalar @$objs;	1037	$decname, length $$rdata, scalar @$objs;
981		1038
982	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1039	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
983	chmod SAVE_MODE, $fh;	1040	chmod SAVE_MODE, $fh;
984	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1041	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
985	aio_fsync $fh if $cf::USE_FSYNC;	1042	aio_fsync $fh if $cf::USE_FSYNC;
…		…
1004	}	1061	}
1005	} else {	1062	} else {
1006	aio_unlink $filename;	1063	aio_unlink $filename;
1007	aio_unlink "$filename.pst";	1064	aio_unlink "$filename.pst";
1008	}	1065	}
1009	}	1066	};
		1067
		1068	undef $guard;
1010	}	1069	}
1011		1070
1012	sub object_freezer_as_string {	1071	sub object_freezer_as_string {
1013	my ($rdata, $objs) = @_;	1072	my ($rdata, $objs) = @_;
1014		1073
…		…
1019		1078
1020	sub object_thawer_load {	1079	sub object_thawer_load {
1021	my ($filename) = @_;	1080	my ($filename) = @_;
1022		1081
1023	my ($data, $av);	1082	my ($data, $av);
		1083
		1084	my $guard = cf::lock_acquire "io";
1024		1085
1025	(aio_load $filename, $data) >= 0	1086	(aio_load $filename, $data) >= 0
1026	or return;	1087	or return;
1027		1088
1028	unless (aio_stat "$filename.pst") {	1089	unless (aio_stat "$filename.pst") {
1029	(aio_load "$filename.pst", $av) >= 0	1090	(aio_load "$filename.pst", $av) >= 0
1030	or return;	1091	or return;
		1092
		1093	undef $guard;
1031	$av = eval { (Storable::thaw $av)->{objs} };	1094	$av = eval { (Storable::thaw $av)->{objs} };
1032	}	1095	}
1033		1096
		1097	utf8::decode (my $decname = $filename);
1034	warn sprintf "loading %s (%d)\n",	1098	warn sprintf "loading %s (%d,%d)\n",
1035	$filename, length $data, scalar @{$av || []};	1099	$decname, length $data, scalar @{$av || []};
		1100
1036	return ($data, $av);	1101	($data, $av)
1037	}	1102	}
1038		1103
1039	=head2 COMMAND CALLBACKS	1104	=head2 COMMAND CALLBACKS
1040		1105
1041	=over 4	1106	=over 4
…		…
1114	my ($pl, $buf) = @_;	1179	my ($pl, $buf) = @_;
1115		1180
1116	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1181	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1117		1182
1118	if (ref $msg) {	1183	if (ref $msg) {
		1184	my ($type, $reply, @payload) =
		1185	"ARRAY" eq ref $msg
		1186	? @$msg
		1187	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1188
		1189	my @reply;
		1190
1119	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1191	if (my $cb = $EXTCMD{$type}) {
1120	if (my %reply = $cb->($pl, $msg)) {	1192	@reply = $cb->($pl, @payload);
1121	$pl->ext_reply ($msg->{msgid}, %reply);
1122	}
1123	}	1193	}
		1194
		1195	$pl->ext_reply ($reply, @reply)
		1196	if $reply;
		1197
1124	} else {	1198	} else {
1125	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1199	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1126	}	1200	}
1127		1201
1128	cf::override;	1202	cf::override;
…		…
1218		1292
1219	=head3 cf::player	1293	=head3 cf::player
1220		1294
1221	=over 4	1295	=over 4
1222		1296
		1297	=item cf::player::num_playing
		1298
		1299	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1300
		1301	=cut
		1302
		1303	sub num_playing {
		1304	scalar grep
		1305	$_->ob->map
		1306	&& !$_->hidden
		1307	&& !$_->ob->flag (cf::FLAG_WIZ),
		1308	cf::player::list
		1309	}
		1310
1223	=item cf::player::find $login	1311	=item cf::player::find $login
1224		1312
1225	Returns the given player object, loading it if necessary (might block).	1313	Returns the given player object, loading it if necessary (might block).
1226		1314
1227	=cut	1315	=cut
…		…
1262	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1350	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1263	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1351	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1264	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1352	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1265	aio_unlink +(playerdir $login) . "/$login.pl";	1353	aio_unlink +(playerdir $login) . "/$login.pl";
1266		1354
1267	my $pl = load_pl path $login	1355	my $f = new_from_file cf::object::thawer path $login
1268	or return;	1356	or return;
		1357
		1358	$f->next;
		1359	my $pl = cf::player::load_pl $f
		1360	or return;
		1361	local $cf::PLAYER_LOADING{$login} = $pl;
		1362	$f->resolve_delayed_derefs;
1269	$cf::PLAYER{$login} = $pl	1363	$cf::PLAYER{$login} = $pl
1270	}	1364	}
1271	}	1365	}
1272	}	1366	}
1273		1367
…		…
1283		1377
1284	aio_mkdir playerdir $pl, 0770;	1378	aio_mkdir playerdir $pl, 0770;
1285	$pl->{last_save} = $cf::RUNTIME;	1379	$pl->{last_save} = $cf::RUNTIME;
1286		1380
1287	$pl->save_pl ($path);	1381	$pl->save_pl ($path);
1288	Coro::cede;	1382	cf::cede_to_tick;
1289	}	1383	}
1290		1384
1291	sub new($) {	1385	sub new($) {
1292	my ($login) = @_;	1386	my ($login) = @_;
1293		1387
…		…
1297	$self->{deny_save} = 1;	1391	$self->{deny_save} = 1;
1298		1392
1299	$cf::PLAYER{$login} = $self;	1393	$cf::PLAYER{$login} = $self;
1300		1394
1301	$self	1395	$self
		1396	}
		1397
		1398	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1399
		1400	=cut
		1401
		1402	sub send_msg {
		1403	my $ns = shift->ns
		1404	or return;
		1405	$ns->send_msg (@_);
1302	}	1406	}
1303		1407
1304	=item $pl->quit_character	1408	=item $pl->quit_character
1305		1409
1306	Nukes the player without looking back. If logged in, the connection will	1410	Nukes the player without looking back. If logged in, the connection will
…		…
1361	or return [];	1465	or return [];
1362		1466
1363	my @logins;	1467	my @logins;
1364		1468
1365	for my $login (@$dirs) {	1469	for my $login (@$dirs) {
		1470	my $path = path $login;
		1471
		1472	# a .pst is a dead give-away for a valid player
		1473	unless (-e "$path.pst") {
1366	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1474	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1367	aio_read $fh, 0, 512, my $buf, 0 or next;	1475	aio_read $fh, 0, 512, my $buf, 0 or next;
1368	$buf !~ /^password -------------$/m or next; # official not-valid tag	1476	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1477	}
1369		1478
1370	utf8::decode $login;	1479	utf8::decode $login;
1371	push @logins, $login;	1480	push @logins, $login;
1372	}	1481	}
1373		1482
…		…
1411	sub expand_cfpod {	1520	sub expand_cfpod {
1412	((my $self), (local $_)) = @_;	1521	((my $self), (local $_)) = @_;
1413		1522
1414	# escape & and <	1523	# escape & and <
1415	s/&/&amp;/g;	1524	s/&/&amp;/g;
1416	s/(?<![BIUGH])</&lt;/g;	1525	s/(?<![BIUGHT])</&lt;/g;
1417		1526
1418	# this is buggy, it needs to properly take care of nested <'s	1527	# this is buggy, it needs to properly take care of nested <'s
1419		1528
1420	1 while	1529	1 while
1421	# replace B<>, I<>, U<> etc.	1530	# replace B<>, I<>, U<> etc.
1422	s/B<([^\>]*)>/<b>$1<\/b>/	1531	s/B<([^\>]*)>/<b>$1<\/b>/
1423	|| s/I<([^\>]*)>/<i>$1<\/i>/	1532	|| s/I<([^\>]*)>/<i>$1<\/i>/
1424	|| s/U<([^\>]*)>/<u>$1<\/u>/	1533	|| s/U<([^\>]*)>/<u>$1<\/u>/
		1534	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1425	# replace G<male|female> tags	1535	# replace G<male|female> tags
1426	|| s{G<([^>|]*)\|([^>]*)>}{	1536	|| s{G<([^>|]*)\|([^>]*)>}{
1427	$self->gender ? $2 : $1	1537	$self->gender ? $2 : $1
1428	}ge	1538	}ge
1429	# replace H<hint text>	1539	# replace H<hint text>
…		…
1450	sub hintmode {	1560	sub hintmode {
1451	$_[0]{hintmode} = $_[1] if @_ > 1;	1561	$_[0]{hintmode} = $_[1] if @_ > 1;
1452	$_[0]{hintmode}	1562	$_[0]{hintmode}
1453	}	1563	}
1454		1564
1455	=item $player->ext_reply ($msgid, %msg)	1565	=item $player->ext_reply ($msgid, @msg)
1456		1566
1457	Sends an ext reply to the player.	1567	Sends an ext reply to the player.
1458		1568
1459	=cut	1569	=cut
1460		1570
1461	sub ext_reply($$%) {	1571	sub ext_reply($$@) {
1462	my ($self, $id, %msg) = @_;	1572	my ($self, $id, @msg) = @_;
1463		1573
1464	$msg{msgid} = $id;	1574	$self->ns->ext_reply ($id, @msg)
1465	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1466	}	1575	}
1467		1576
1468	=item $player->ext_event ($type, %msg)	1577	=item $player->ext_msg ($type, @msg)
1469		1578
1470	Sends an ext event to the client.	1579	Sends an ext event to the client.
1471		1580
1472	=cut	1581	=cut
1473		1582
1474	sub ext_event($$%) {	1583	sub ext_msg($$@) {
1475	my ($self, $type, %msg) = @_;	1584	my ($self, $type, @msg) = @_;
1476		1585
1477	$self->ns->ext_event ($type, %msg);	1586	$self->ns->ext_msg ($type, @msg);
1478	}	1587	}
1479		1588
1480	=head3 cf::region	1589	=head3 cf::region
1481		1590
1482	=over 4	1591	=over 4
…		…
1698		1807
1699	sub load_header_from($) {	1808	sub load_header_from($) {
1700	my ($self, $path) = @_;	1809	my ($self, $path) = @_;
1701		1810
1702	utf8::encode $path;	1811	utf8::encode $path;
1703	#aio_open $path, O_RDONLY, 0	1812	my $f = new_from_file cf::object::thawer $path
1704	# or return;
1705
1706	$self->_load_header ($path)
1707	or return;	1813	or return;
		1814
		1815	$self->_load_header ($f)
		1816	or return;
		1817
		1818	local $MAP_LOADING{$self->{path}} = $self;
		1819	$f->resolve_delayed_derefs;
1708		1820
1709	$self->{load_path} = $path;	1821	$self->{load_path} = $path;
1710		1822
1711	1	1823	1
1712	}	1824	}
…		…
1766	sub find {	1878	sub find {
1767	my ($path, $origin) = @_;	1879	my ($path, $origin) = @_;
1768		1880
1769	$path = normalise $path, $origin && $origin->path;	1881	$path = normalise $path, $origin && $origin->path;
1770		1882
		1883	cf::lock_wait "map_data:$path";#d#remove
1771	cf::lock_wait "map_find:$path";	1884	cf::lock_wait "map_find:$path";
1772		1885
1773	$cf::MAP{$path} || do {	1886	$cf::MAP{$path} || do {
1774	my $guard = cf::lock_acquire "map_find:$path";	1887	my $guard1 = cf::lock_acquire "map_find:$path";
		1888	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1889
1775	my $map = new_from_path cf::map $path	1890	my $map = new_from_path cf::map $path
1776	or return;	1891	or return;
1777		1892
1778	$map->{last_save} = $cf::RUNTIME;	1893	$map->{last_save} = $cf::RUNTIME;
1779		1894
…		…
1781	or return;	1896	or return;
1782		1897
1783	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1898	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1784	# doing this can freeze the server in a sync job, obviously	1899	# doing this can freeze the server in a sync job, obviously
1785	#$cf::WAIT_FOR_TICK->wait;	1900	#$cf::WAIT_FOR_TICK->wait;
		1901	undef $guard1;
		1902	undef $guard2;
1786	$map->reset;	1903	$map->reset;
1787	undef $guard;
1788	return find $path;	1904	return find $path;
1789	}	1905	}
1790		1906
1791	$cf::MAP{$path} = $map	1907	$cf::MAP{$path} = $map
1792	}	1908	}
…		…
1801	local $self->{deny_reset} = 1; # loading can take a long time	1917	local $self->{deny_reset} = 1; # loading can take a long time
1802		1918
1803	my $path = $self->{path};	1919	my $path = $self->{path};
1804		1920
1805	{	1921	{
1806	my $guard = cf::lock_acquire "map_load:$path";	1922	my $guard = cf::lock_acquire "map_data:$path";
1807		1923
		1924	return unless $self->valid;
1808	return if $self->in_memory != cf::MAP_SWAPPED;	1925	return unless $self->in_memory == cf::MAP_SWAPPED;
1809		1926
1810	$self->in_memory (cf::MAP_LOADING);	1927	$self->in_memory (cf::MAP_LOADING);
1811		1928
1812	$self->alloc;	1929	$self->alloc;
1813		1930
1814	$self->pre_load;	1931	$self->pre_load;
1815	Coro::cede;	1932	cf::cede_to_tick;
1816		1933
		1934	my $f = new_from_file cf::object::thawer $self->{load_path};
		1935	$f->skip_block;
1817	$self->_load_objects ($self->{load_path}, 1)	1936	$self->_load_objects ($f)
1818	or return;	1937	or return;
1819		1938
1820	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1939	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1821	if delete $self->{load_original};	1940	if delete $self->{load_original};
1822		1941
1823	if (my $uniq = $self->uniq_path) {	1942	if (my $uniq = $self->uniq_path) {
1824	utf8::encode $uniq;	1943	utf8::encode $uniq;
1825	if (aio_open $uniq, O_RDONLY, 0) {	1944	unless (aio_stat $uniq) {
		1945	if (my $f = new_from_file cf::object::thawer $uniq) {
1826	$self->clear_unique_items;	1946	$self->clear_unique_items;
1827	$self->_load_objects ($uniq, 0);	1947	$self->_load_objects ($f);
		1948	$f->resolve_delayed_derefs;
		1949	}
1828	}	1950	}
1829	}	1951	}
1830		1952
1831	Coro::cede;	1953	$f->resolve_delayed_derefs;
		1954
		1955	cf::cede_to_tick;
1832	# now do the right thing for maps	1956	# now do the right thing for maps
1833	$self->link_multipart_objects;	1957	$self->link_multipart_objects;
1834	$self->difficulty ($self->estimate_difficulty)	1958	$self->difficulty ($self->estimate_difficulty)
1835	unless $self->difficulty;	1959	unless $self->difficulty;
1836	Coro::cede;	1960	cf::cede_to_tick;
1837		1961
1838	unless ($self->{deny_activate}) {	1962	unless ($self->{deny_activate}) {
1839	$self->decay_objects;	1963	$self->decay_objects;
1840	$self->fix_auto_apply;	1964	$self->fix_auto_apply;
1841	$self->update_buttons;	1965	$self->update_buttons;
1842	Coro::cede;	1966	cf::cede_to_tick;
1843	$self->set_darkness_map;	1967	$self->set_darkness_map;
1844	Coro::cede;	1968	cf::cede_to_tick;
1845	$self->activate;	1969	$self->activate;
1846	}	1970	}
		1971
		1972	$self->{last_save} = $cf::RUNTIME;
		1973	$self->last_access ($cf::RUNTIME);
1847		1974
1848	$self->in_memory (cf::MAP_IN_MEMORY);	1975	$self->in_memory (cf::MAP_IN_MEMORY);
1849	}	1976	}
1850		1977
1851	$self->post_load;	1978	$self->post_load;
…		…
1862		1989
1863	$self	1990	$self
1864	}	1991	}
1865		1992
1866	# find and load all maps in the 3x3 area around a map	1993	# find and load all maps in the 3x3 area around a map
1867	sub load_diag {	1994	sub load_neighbours {
1868	my ($map) = @_;	1995	my ($map) = @_;
1869		1996
1870	my @diag; # diagonal neighbours	1997	my @neigh; # diagonal neighbours
1871		1998
1872	for (0 .. 3) {	1999	for (0 .. 3) {
1873	my $neigh = $map->tile_path ($_)	2000	my $neigh = $map->tile_path ($_)
1874	or next;	2001	or next;
1875	$neigh = find $neigh, $map	2002	$neigh = find $neigh, $map
1876	or next;	2003	or next;
1877	$neigh->load;	2004	$neigh->load;
1878		2005
		2006	push @neigh,
1879	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2007	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1880	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2008	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1881	}	2009	}
1882		2010
1883	for (@diag) {	2011	for (grep defined $_->[0], @neigh) {
		2012	my ($path, $origin) = @$_;
1884	my $neigh = find @$_	2013	my $neigh = find $path, $origin
1885	or next;	2014	or next;
1886	$neigh->load;	2015	$neigh->load;
1887	}	2016	}
1888	}	2017	}
1889		2018
…		…
1894	}	2023	}
1895		2024
1896	sub do_load_sync {	2025	sub do_load_sync {
1897	my ($map) = @_;	2026	my ($map) = @_;
1898		2027
		2028	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2029	if $Coro::current == $Coro::main;
		2030
1899	cf::sync_job { $map->load };	2031	cf::sync_job { $map->load };
1900	}	2032	}
1901		2033
1902	our %MAP_PREFETCH;	2034	our %MAP_PREFETCH;
1903	our $MAP_PREFETCHER = undef;	2035	our $MAP_PREFETCHER = undef;
1904		2036
1905	sub find_async {	2037	sub find_async {
1906	my ($path, $origin) = @_;	2038	my ($path, $origin, $load) = @_;
1907		2039
1908	$path = normalise $path, $origin && $origin->{path};	2040	$path = normalise $path, $origin && $origin->{path};
1909		2041
1910	if (my $map = $cf::MAP{$path}) {	2042	if (my $map = $cf::MAP{$path}) {
1911	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2043	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1912	}	2044	}
1913		2045
1914	undef $MAP_PREFETCH{$path};	2046	$MAP_PREFETCH{$path} |= $load;
		2047
1915	$MAP_PREFETCHER ||= cf::async {	2048	$MAP_PREFETCHER ||= cf::async {
1916	while (%MAP_PREFETCH) {	2049	while (%MAP_PREFETCH) {
1917	for my $path (keys %MAP_PREFETCH) {	2050	while (my ($k, $v) = each %MAP_PREFETCH) {
1918	if (my $map = find $path) {	2051	if (my $map = find $k) {
1919	$map->load;	2052	$map->load if $v;
1920	}	2053	}
1921		2054
1922	delete $MAP_PREFETCH{$path};	2055	delete $MAP_PREFETCH{$k};
1923	}	2056	}
1924	}	2057	}
1925	undef $MAP_PREFETCHER;	2058	undef $MAP_PREFETCHER;
1926	};	2059	};
1927	$MAP_PREFETCHER->prio (6);	2060	$MAP_PREFETCHER->prio (6);
…		…
1930	}	2063	}
1931		2064
1932	sub save {	2065	sub save {
1933	my ($self) = @_;	2066	my ($self) = @_;
1934		2067
1935	my $lock = cf::lock_acquire "map_data:" . $self->path;	2068	my $lock = cf::lock_acquire "map_data:$self->{path}";
1936		2069
1937	$self->{last_save} = $cf::RUNTIME;	2070	$self->{last_save} = $cf::RUNTIME;
1938		2071
1939	return unless $self->dirty;	2072	return unless $self->dirty;
1940		2073
…		…
1963	my ($self) = @_;	2096	my ($self) = @_;
1964		2097
1965	# save first because save cedes	2098	# save first because save cedes
1966	$self->save;	2099	$self->save;
1967		2100
1968	my $lock = cf::lock_acquire "map_data:" . $self->path;	2101	my $lock = cf::lock_acquire "map_data:$self->{path}";
1969		2102
1970	return if $self->players;	2103	return if $self->players;
1971	return if $self->in_memory != cf::MAP_IN_MEMORY;	2104	return if $self->in_memory != cf::MAP_IN_MEMORY;
1972	return if $self->{deny_save};	2105	return if $self->{deny_save};
1973		2106
		2107	$self->in_memory (cf::MAP_SWAPPED);
		2108
		2109	$self->deactivate;
		2110	$_->clear_links_to ($self) for values %cf::MAP;
1974	$self->clear;	2111	$self->clear;
1975	$self->in_memory (cf::MAP_SWAPPED);
1976	}	2112	}
1977		2113
1978	sub reset_at {	2114	sub reset_at {
1979	my ($self) = @_;	2115	my ($self) = @_;
1980		2116
…		…
2012	if $uniq;	2148	if $uniq;
2013	}	2149	}
2014		2150
2015	delete $cf::MAP{$self->path};	2151	delete $cf::MAP{$self->path};
2016		2152
		2153	$self->deactivate;
		2154	$_->clear_links_to ($self) for values %cf::MAP;
2017	$self->clear;	2155	$self->clear;
2018
2019	$_->clear_links_to ($self) for values %cf::MAP;
2020		2156
2021	$self->unlink_save;	2157	$self->unlink_save;
2022	$self->destroy;	2158	$self->destroy;
2023	}	2159	}
2024		2160
2025	my $nuke_counter = "aaaa";	2161	my $nuke_counter = "aaaa";
2026		2162
2027	sub nuke {	2163	sub nuke {
2028	my ($self) = @_;	2164	my ($self) = @_;
2029		2165
		2166	{
		2167	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2168
2030	delete $cf::MAP{$self->path};	2169	delete $cf::MAP{$self->path};
2031		2170
2032	$self->unlink_save;	2171	$self->unlink_save;
2033		2172
2034	bless $self, "cf::map";	2173	bless $self, "cf::map";
2035	delete $self->{deny_reset};	2174	delete $self->{deny_reset};
2036	$self->{deny_save} = 1;	2175	$self->{deny_save} = 1;
2037	$self->reset_timeout (1);	2176	$self->reset_timeout (1);
2038	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2177	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2039		2178
2040	$cf::MAP{$self->path} = $self;	2179	$cf::MAP{$self->path} = $self;
		2180	}
2041		2181
2042	$self->reset; # polite request, might not happen	2182	$self->reset; # polite request, might not happen
2043	}	2183	}
2044		2184
2045	=item $maps = cf::map::tmp_maps	2185	=item $maps = cf::map::tmp_maps
…		…
2121		2261
2122	sub inv_recursive {	2262	sub inv_recursive {
2123	inv_recursive_ inv $_[0]	2263	inv_recursive_ inv $_[0]
2124	}	2264	}
2125		2265
		2266	=item $ref = $ob->ref
		2267
		2268	creates and returns a persistent reference to an objetc that can be stored as a string.
		2269
		2270	=item $ob = cf::object::deref ($refstring)
		2271
		2272	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2273	even if the object actually exists. May block.
		2274
		2275	=cut
		2276
		2277	sub deref {
		2278	my ($ref) = @_;
		2279
		2280	# temporary compatibility#TODO#remove
		2281	$ref =~ s{^<}{player/<};
		2282
		2283	if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
		2284	my ($uuid, $name) = ($1, $2);
		2285	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2286	or return;
		2287	$pl->ob->uuid eq $uuid
		2288	or return;
		2289
		2290	$pl->ob
		2291	} else {
		2292	warn "$ref: cannot resolve object reference\n";
		2293	undef
		2294	}
		2295	}
		2296
2126	package cf;	2297	package cf;
2127		2298
2128	=back	2299	=back
2129		2300
2130	=head3 cf::object::player	2301	=head3 cf::object::player
…		…
2152		2323
2153	} else {	2324	} else {
2154	my $pl = $self->contr;	2325	my $pl = $self->contr;
2155		2326
2156	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2327	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157	my $diag = $pl->{npc_dialog};	2328	my $dialog = $pl->{npc_dialog};
2158	$diag->{pl}->ext_reply (	2329	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2159	$diag->{id},
2160	msgtype => "reply",
2161	msg => $diag->{pl}->expand_cfpod ($msg),
2162	add_topics => []
2163	);
2164		2330
2165	} else {	2331	} else {
2166	$msg = $npc->name . " says: $msg" if $npc;	2332	$msg = $npc->name . " says: $msg" if $npc;
2167	$self->message ($msg, $flags);	2333	$self->message ($msg, $flags);
2168	}	2334	}
2169	}	2335	}
		2336	}
		2337
		2338	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2339
		2340	=cut
		2341
		2342	sub cf::object::send_msg {
		2343	my $pl = shift->contr
		2344	or return;
		2345	$pl->send_msg (@_);
2170	}	2346	}
2171		2347
2172	=item $player_object->may ("access")	2348	=item $player_object->may ("access")
2173		2349
2174	Returns wether the given player is authorized to access resource "access"	2350	Returns wether the given player is authorized to access resource "access"
…		…
2253	# use -1 or undef as default coordinates, not 0, 0	2429	# use -1 or undef as default coordinates, not 0, 0
2254	($x, $y) = ($map->enter_x, $map->enter_y)	2430	($x, $y) = ($map->enter_x, $map->enter_y)
2255	if $x <=0 && $y <= 0;	2431	if $x <=0 && $y <= 0;
2256		2432
2257	$map->load;	2433	$map->load;
2258	$map->load_diag;	2434	$map->load_neighbours;
2259		2435
2260	return unless $self->contr->active;	2436	return unless $self->contr->active;
2261	$self->activate_recursive;	2437	$self->activate_recursive;
2262		2438
2263	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2439	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
…		…
2283	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2459	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2284		2460
2285	$self->enter_link;	2461	$self->enter_link;
2286		2462
2287	(async {	2463	(async {
		2464	# *tag paths override both path and x|y
		2465	if ($path =~ /^\*(.*)$/) {
		2466	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2467	my $ob = $obs[rand @obs];
		2468
		2469	# see if we actually can go there
		2470	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2471	$ob = $obs[rand @obs];
		2472	} else {
		2473	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2474	}
		2475	# else put us there anyways for now #d#
		2476
		2477	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2478	} else {
		2479	($path, $x, $y) = (undef, undef, undef);
		2480	}
		2481	}
		2482
2288	my $map = eval {	2483	my $map = eval {
2289	my $map = cf::map::find $path;	2484	my $map = defined $path ? cf::map::find $path : undef;
2290		2485
2291	if ($map) {	2486	if ($map) {
2292	$map = $map->customise_for ($self);	2487	$map = $map->customise_for ($self);
2293	$map = $check->($map) if $check && $map;	2488	$map = $check->($map) if $check && $map;
2294	} else {	2489	} else {
2295	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2490	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2296	}	2491	}
2297		2492
2298	$map	2493	$map
2299	};	2494	};
2300		2495
…		…
2425		2620
2426	utf8::encode $text;	2621	utf8::encode $text;
2427	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2622	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2428	}	2623	}
2429		2624
2430	=item $client->send_msg ($color, $type, $msg, [extra...])	2625	=item $client->send_msg ($channel, $msg, $color, [extra...])
2431		2626
2432	Send a drawinfo or msg packet to the client, formatting the msg for the	2627	Send a drawinfo or msg packet to the client, formatting the msg for the
2433	client if neccessary. C<$type> should be a string identifying the type of	2628	client if neccessary. C<$type> should be a string identifying the type of
2434	the message, with C<log> being the default. If C<$color> is negative, suppress	2629	the message, with C<log> being the default. If C<$color> is negative, suppress
2435	the message unless the client supports the msg packet.	2630	the message unless the client supports the msg packet.
2436		2631
2437	=cut	2632	=cut
2438		2633
		2634	our %CHANNEL = (
		2635	"c/identify" => {
		2636	id => "identify",
		2637	title => "Identify",
		2638	reply => undef,
		2639	tooltip => "Items recently identified",
		2640	},
		2641	"c/examine" => {
		2642	id => "examine",
		2643	title => "Examine",
		2644	reply => undef,
		2645	tooltip => "Signs and other items you examined",
		2646	},
		2647	);
		2648
2439	sub cf::client::send_msg {	2649	sub cf::client::send_msg {
2440	my ($self, $color, $type, $msg, @extra) = @_;	2650	my ($self, $channel, $msg, $color, @extra) = @_;
2441		2651
2442	$msg = $self->pl->expand_cfpod ($msg);	2652	$msg = $self->pl->expand_cfpod ($msg);
2443		2653
		2654	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2655
		2656	# check predefined channels, for the benefit of C
		2657	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};
		2658
		2659	if (ref $channel) {
		2660	# send meta info to client, if not yet sent
		2661	unless (exists $self->{channel}{$channel->{id}}) {
		2662	$self->{channel}{$channel->{id}} = $channel;
		2663	$self->ext_msg (channel_info => $channel)
		2664	if $self->can_msg;
		2665	}
		2666
		2667	$channel = $channel->{id};
		2668	}
		2669
2444	return unless @extra || length $msg;	2670	return unless @extra || length $msg;
2445		2671
2446	if ($self->can_msg) {	2672	if ($self->can_msg) {
		2673	# default colour, mask it out
		2674	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2675	if $color & cf::NDI_DEF;
		2676
2447	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));	2677	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2678	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2448	} else {	2679	} else {
2449	# replace some tags by gcfclient-compatible ones
2450	for ($msg) {
2451	1 while
2452	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2453	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2454	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2455	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2456	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2457	}
2458
2459	if ($color >= 0) {	2680	if ($color >= 0) {
		2681	# replace some tags by gcfclient-compatible ones
		2682	for ($msg) {
		2683	1 while
		2684	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2685	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2686	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2687	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2688	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2689	}
		2690
		2691	$color &= cf::NDI_COLOR_MASK;
		2692
		2693	utf8::encode $msg;
		2694
2460	if (0 && $msg =~ /\[/) {	2695	if (0 && $msg =~ /\[/) {
		2696	# COMMAND/INFO
2461	$self->send_packet ("drawextinfo $color 4 0 $msg")	2697	$self->send_packet ("drawextinfo $color 10 8 $msg")
2462	} else {	2698	} else {
2463	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;	2699	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2464	$self->send_packet ("drawinfo $color $msg")	2700	$self->send_packet ("drawinfo $color $msg")
2465	}	2701	}
2466	}	2702	}
2467	}	2703	}
2468	}	2704	}
2469		2705
2470	=item $client->ext_event ($type, %msg)	2706	=item $client->ext_msg ($type, @msg)
2471		2707
2472	Sends an ext event to the client.	2708	Sends an ext event to the client.
2473		2709
2474	=cut	2710	=cut
2475		2711
2476	sub cf::client::ext_event($$%) {	2712	sub cf::client::ext_msg($$@) {
2477	my ($self, $type, %msg) = @_;	2713	my ($self, $type, @msg) = @_;
2478		2714
2479	return unless $self->extcmd;	2715	if ($self->extcmd == 2) {
2480		2716	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2717	} elsif ($self->extcmd == 1) { # TODO: remove
2481	$msg{msgtype} = "event_$type";	2718	push @msg, msgtype => "event_$type";
2482	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2719	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2720	}
		2721	}
		2722
		2723	=item $client->ext_reply ($msgid, @msg)
		2724
		2725	Sends an ext reply to the client.
		2726
		2727	=cut
		2728
		2729	sub cf::client::ext_reply($$@) {
		2730	my ($self, $id, @msg) = @_;
		2731
		2732	if ($self->extcmd == 2) {
		2733	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2734	} elsif ($self->extcmd == 1) {
		2735	#TODO: version 1, remove
		2736	unshift @msg, msgtype => "reply", msgid => $id;
		2737	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2738	}
2483	}	2739	}
2484		2740
2485	=item $success = $client->query ($flags, "text", \&cb)	2741	=item $success = $client->query ($flags, "text", \&cb)
2486		2742
2487	Queues a query to the client, calling the given callback with	2743	Queues a query to the client, calling the given callback with
…		…
2542	my ($ns, $buf) = @_;	2798	my ($ns, $buf) = @_;
2543		2799
2544	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2800	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2545		2801
2546	if (ref $msg) {	2802	if (ref $msg) {
		2803	my ($type, $reply, @payload) =
		2804	"ARRAY" eq ref $msg
		2805	? @$msg
		2806	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2807
		2808	my @reply;
		2809
2547	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2810	if (my $cb = $EXTICMD{$type}) {
2548	if (my %reply = $cb->($ns, $msg)) {	2811	@reply = $cb->($ns, @payload);
2549	$reply{msgid} = $msg->{msgid};
2550	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2551	}
2552	}	2812	}
		2813
		2814	$ns->ext_reply ($reply, @reply)
		2815	if $reply;
		2816
2553	} else {	2817	} else {
2554	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2818	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2555	}	2819	}
2556		2820
2557	cf::override;	2821	cf::override;
…		…
2604	our $safe = new Safe "safe";	2868	our $safe = new Safe "safe";
2605	our $safe_hole = new Safe::Hole;	2869	our $safe_hole = new Safe::Hole;
2606		2870
2607	$SIG{FPE} = 'IGNORE';	2871	$SIG{FPE} = 'IGNORE';
2608		2872
2609	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2873	$safe->permit_only (Opcode::opset qw(
		2874	:base_core :base_mem :base_orig :base_math
		2875	grepstart grepwhile mapstart mapwhile
		2876	sort time
		2877	));
2610		2878
2611	# here we export the classes and methods available to script code	2879	# here we export the classes and methods available to script code
2612		2880
2613	=pod	2881	=pod
2614		2882
2615	The following functions and methods are available within a safe environment:	2883	The following functions and methods are available within a safe environment:
2616		2884
2617	cf::object	2885	cf::object
2618	contr pay_amount pay_player map x y force_find force_add	2886	contr pay_amount pay_player map x y force_find force_add
2619	insert remove	2887	insert remove name archname title slaying race decrease_ob_nr
2620		2888
2621	cf::object::player	2889	cf::object::player
2622	player	2890	player
2623		2891
2624	cf::player	2892	cf::player
…		…
2629		2897
2630	=cut	2898	=cut
2631		2899
2632	for (	2900	for (
2633	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	2901	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2902	insert remove inv name archname title slaying race
2634	insert remove)],	2903	decrease_ob_nr)],
2635	["cf::object::player" => qw(player)],	2904	["cf::object::player" => qw(player)],
2636	["cf::player" => qw(peaceful)],	2905	["cf::player" => qw(peaceful)],
2637	["cf::map" => qw(trigger)],	2906	["cf::map" => qw(trigger)],
2638	) {	2907	) {
2639	no strict 'refs';	2908	no strict 'refs';
…		…
2715	# the server's init and main functions	2984	# the server's init and main functions
2716		2985
2717	sub load_facedata($) {	2986	sub load_facedata($) {
2718	my ($path) = @_;	2987	my ($path) = @_;
2719		2988
		2989	# HACK to clear player env face cache, we need some signal framework
		2990	# for this (global event?)
		2991	%ext::player_env::MUSIC_FACE_CACHE = ();
		2992
		2993	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		2994
2720	warn "loading facedata from $path\n";	2995	warn "loading facedata from $path\n";
2721		2996
2722	my $facedata;	2997	my $facedata;
2723	0 < aio_load $path, $facedata	2998	0 < aio_load $path, $facedata
2724	or die "$path: $!";	2999	or die "$path: $!";
2725		3000
2726	$facedata = Coro::Storable::thaw $facedata;	3001	$facedata = Coro::Storable::thaw $facedata;
2727		3002
2728	$facedata->{version} == 2	3003	$facedata->{version} == 2
2729	or cf::cleanup "$path: version mismatch, cannot proceed.";	3004	or cf::cleanup "$path: version mismatch, cannot proceed.";
		3005
		3006	# patch in the exptable
		3007	$facedata->{resource}{"res/exp_table"} = {
		3008	type => FT_RSRC,
		3009	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3010	};
		3011	cf::cede_to_tick;
2730		3012
2731	{	3013	{
2732	my $faces = $facedata->{faceinfo};	3014	my $faces = $facedata->{faceinfo};
2733		3015
2734	while (my ($face, $info) = each %$faces) {	3016	while (my ($face, $info) = each %$faces) {
2735	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3017	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2736	cf::face::set_visibility $idx, $info->{visibility};	3018	cf::face::set_visibility $idx, $info->{visibility};
2737	cf::face::set_magicmap $idx, $info->{magicmap};	3019	cf::face::set_magicmap $idx, $info->{magicmap};
2738	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3020	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2739	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3021	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2740		3022
2741	cf::cede_to_tick;	3023	cf::cede_to_tick;
2742	}	3024	}
2743		3025
2744	while (my ($face, $info) = each %$faces) {	3026	while (my ($face, $info) = each %$faces) {
…		…
2769		3051
2770	{	3052	{
2771	# TODO: for gcfclient pleasure, we should give resources	3053	# TODO: for gcfclient pleasure, we should give resources
2772	# that gcfclient doesn't grok a >10000 face index.	3054	# that gcfclient doesn't grok a >10000 face index.
2773	my $res = $facedata->{resource};	3055	my $res = $facedata->{resource};
2774	my $enc = JSON::XS->new->utf8->canonical;	3056
		3057	my $soundconf = delete $res->{"res/sound.conf"};
2775		3058
2776	while (my ($name, $info) = each %$res) {	3059	while (my ($name, $info) = each %$res) {
2777	my $meta = $enc->encode ({
2778	name => $name,
2779	type => $info->{type},
2780	copyright => $info->{copyright}, #TODO#
2781	});
2782
2783	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3060	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3061	my $data;
2784		3062
2785	if ($name =~ /\.jpg$/) {	3063	if ($info->{type} & 1) {
2786	cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack	3064	# prepend meta info
2787	cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack	3065
		3066	my $meta = $enc->encode ({
		3067	name => $name,
		3068	%{ $info->{meta} || {} },
		3069	});
		3070
		3071	$data = pack "(w/a*)*", $meta, $info->{data};
2788	} else {	3072	} else {
2789	my $data = pack "(w/a*)*", $meta, $info->{data};	3073	$data = $info->{data};
2790	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2791
2792	cf::face::set_type $idx, 1;
2793	cf::face::set_data $idx, 0, $data, $chk;
2794	}	3074	}
2795		3075
		3076	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3077	cf::face::set_type $idx, $info->{type};
		3078
2796	cf::cede_to_tick;	3079	cf::cede_to_tick;
2797	}	3080	}
		3081
		3082	if ($soundconf) {
		3083	$soundconf = $enc->decode (delete $soundconf->{data});
		3084
		3085	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3086	my $sound = $soundconf->{compat}[$_]
		3087	or next;
		3088
		3089	my $face = cf::face::find "sound/$sound->[1]";
		3090	cf::sound::set $sound->[0] => $face;
		3091	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3092	}
		3093
		3094	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3095	my $face = cf::face::find "sound/$v";
		3096	cf::sound::set $k => $face;
		3097	}
		3098	}
2798	}	3099	}
2799		3100
2800	1	3101	1
2801	}	3102	}
2802		3103
		3104	register_exticmd fx_want => sub {
		3105	my ($ns, $want) = @_;
		3106
		3107	while (my ($k, $v) = each %$want) {
		3108	$ns->fx_want ($k, $v);
		3109	}
		3110	};
		3111
2803	sub reload_regions {	3112	sub reload_regions {
		3113	# HACK to clear player env face cache, we need some signal framework
		3114	# for this (global event?)
		3115	%ext::player_env::MUSIC_FACE_CACHE = ();
		3116
2804	load_resource_file "$MAPDIR/regions"	3117	load_resource_file "$MAPDIR/regions"
2805	or die "unable to load regions file\n";	3118	or die "unable to load regions file\n";
2806		3119
2807	for (cf::region::list) {	3120	for (cf::region::list) {
2808	$_->{match} = qr/$_->{match}/	3121	$_->{match} = qr/$_->{match}/
…		…
2844		3157
2845	sub init {	3158	sub init {
2846	reload_resources;	3159	reload_resources;
2847	}	3160	}
2848		3161
2849	sub cfg_load {	3162	sub reload_config {
2850	open my $fh, "<:utf8", "$CONFDIR/config"	3163	open my $fh, "<:utf8", "$CONFDIR/config"
2851	or return;	3164	or return;
2852		3165
2853	local $/;	3166	local $/;
2854	*CFG = YAML::Syck::Load <$fh>;	3167	*CFG = YAML::Syck::Load <$fh>;
…		…
2874	(async {	3187	(async {
2875	Event::one_event;	3188	Event::one_event;
2876	})->prio (Coro::PRIO_MAX);	3189	})->prio (Coro::PRIO_MAX);
2877	};	3190	};
2878		3191
2879	cfg_load;	3192	reload_config;
2880	db_init;	3193	db_init;
2881	load_extensions;	3194	load_extensions;
2882		3195
2883	$TICK_WATCHER->start;	3196	$TICK_WATCHER->start;
2884	Event::loop;	3197	Event::loop;
…		…
3077	warn "reloading cf.pm";	3390	warn "reloading cf.pm";
3078	require cf;	3391	require cf;
3079	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3392	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3080		3393
3081	warn "loading config and database again";	3394	warn "loading config and database again";
3082	cf::cfg_load;	3395	cf::reload_config;
3083		3396
3084	warn "loading extensions";	3397	warn "loading extensions";
3085	cf::load_extensions;	3398	cf::load_extensions;
3086		3399
3087	warn "reattaching attachments to objects/players";	3400	warn "reattaching attachments to objects/players";
…		…
3152	my $signal = new Coro::Signal;	3465	my $signal = new Coro::Signal;
3153	push @WAIT_FOR_TICK_BEGIN, $signal;	3466	push @WAIT_FOR_TICK_BEGIN, $signal;
3154	$signal->wait;	3467	$signal->wait;
3155	}	3468	}
3156		3469
3157	my $min = 1e6;#d#
3158	my $avg = 10;
3159	$TICK_WATCHER = Event->timer (	3470	$TICK_WATCHER = Event->timer (
3160	reentrant => 0,	3471	reentrant => 0,
3161	parked => 1,	3472	parked => 1,
3162	prio => 0,	3473	prio => 0,
3163	at => $NEXT_TICK || $TICK,	3474	at => $NEXT_TICK || $TICK,
…		…
3171		3482
3172	$NOW = $tick_start = Event::time;	3483	$NOW = $tick_start = Event::time;
3173		3484
3174	cf::server_tick; # one server iteration	3485	cf::server_tick; # one server iteration
3175		3486
3176	0 && sync_job {#d#
3177	for(1..10) {
3178	my $t = Event::time;
3179	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3180	or die;
3181
3182	$map->width (50);
3183	$map->height (50);
3184	$map->alloc;
3185	$map->_load_objects ("/tmp/x.map", 1);
3186	my $t = Event::time - $t;
3187
3188	#next unless $t < 0.0013;#d#
3189	if ($t < $min) {
3190	$min = $t;
3191	}
3192	$avg = $avg * 0.99 + $t * 0.01;
3193	}
3194	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3195	exit 0;
3196	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3197	};
3198
3199	$RUNTIME += $TICK;	3487	$RUNTIME += $TICK;
3200	$NEXT_TICK += $TICK;	3488	$NEXT_TICK += $TICK;
3201		3489
3202	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3490	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3203	$NEXT_RUNTIME_WRITE = $NOW + 10;	3491	$NEXT_RUNTIME_WRITE = $NOW + 10;
…		…
3205	write_runtime	3493	write_runtime
3206	or warn "ERROR: unable to write runtime file: $!";	3494	or warn "ERROR: unable to write runtime file: $!";
3207	};	3495	};
3208	}	3496	}
3209		3497
3210	# my $AFTER = Event::time;
3211	# warn $AFTER - $NOW;#d#
3212
3213	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3498	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3214	$sig->send;	3499	$sig->send;
3215	}	3500	}
3216	while (my $sig = shift @WAIT_FOR_TICK) {	3501	while (my $sig = shift @WAIT_FOR_TICK) {
3217	$sig->send;	3502	$sig->send;
…		…
3227		3512
3228	$LOAD = ($NOW - $tick_start) / $TICK;	3513	$LOAD = ($NOW - $tick_start) / $TICK;
3229	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3514	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3230		3515
3231	_post_tick;	3516	_post_tick;
3232
3233
3234	},	3517	},
3235	);	3518	);
3236		3519
3237	{	3520	{
		3521	BDB::min_parallel 8;
3238	BDB::max_poll_time $TICK * 0.1;	3522	BDB::max_poll_time $TICK * 0.1;
3239	$BDB_POLL_WATCHER = Event->io (	3523	$BDB_POLL_WATCHER = Event->io (
3240	reentrant => 0,	3524	reentrant => 0,
3241	fd => BDB::poll_fileno,	3525	fd => BDB::poll_fileno,
3242	poll => 'r',	3526	poll => 'r',
3243	prio => 0,	3527	prio => 0,
3244	data => WF_AUTOCANCEL,	3528	data => WF_AUTOCANCEL,
3245	cb => \&BDB::poll_cb,	3529	cb => \&BDB::poll_cb,
3246	);	3530	);
3247	BDB::min_parallel 8;
3248		3531
3249	BDB::set_sync_prepare {	3532	BDB::set_sync_prepare {
3250	my $status;	3533	my $status;
3251	my $current = $Coro::current;	3534	my $current = $Coro::current;
3252	(	3535	(
…		…
3261	)	3544	)
3262	};	3545	};
3263		3546
3264	unless ($DB_ENV) {	3547	unless ($DB_ENV) {
3265	$DB_ENV = BDB::db_env_create;	3548	$DB_ENV = BDB::db_env_create;
		3549	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3550	| BDB::LOG_AUTOREMOVE, 1);
		3551	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3552	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3266		3553
3267	cf::sync_job {	3554	cf::sync_job {
3268	eval {	3555	eval {
3269	BDB::db_env_open	3556	BDB::db_env_open
3270	$DB_ENV,	3557	$DB_ENV,
…		…
3272	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3559	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3273	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3560	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3274	0666;	3561	0666;
3275		3562
3276	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3563	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3277
3278	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3279	$DB_ENV->set_lk_detect;
3280	};	3564	};
3281		3565
3282	cf::cleanup "db_env_open(db): $@" if $@;	3566	cf::cleanup "db_env_open(db): $@" if $@;
3283	};	3567	};
3284	}	3568	}
		3569
		3570	$BDB_DEADLOCK_WATCHER = Event->timer (
		3571	after => 3,
		3572	interval => 1,
		3573	hard => 1,
		3574	prio => 0,
		3575	data => WF_AUTOCANCEL,
		3576	cb => sub {
		3577	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3578	},
		3579	);
		3580	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3581	after => 11,
		3582	interval => 60,
		3583	hard => 1,
		3584	prio => 0,
		3585	data => WF_AUTOCANCEL,
		3586	cb => sub {
		3587	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3588	},
		3589	);
		3590	$BDB_TRICKLE_WATCHER = Event->timer (
		3591	after => 5,
		3592	interval => 10,
		3593	hard => 1,
		3594	prio => 0,
		3595	data => WF_AUTOCANCEL,
		3596	cb => sub {
		3597	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3598	},
		3599	);
3285	}	3600	}
3286		3601
3287	{	3602	{
3288	IO::AIO::min_parallel 8;	3603	IO::AIO::min_parallel 8;
3289		3604

Diff Legend

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