[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.311 by root, Fri Jul 20 16:11:10 2007 UTC vs.
Revision 1.373 by root, Sat Sep 15 15:58: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
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
…		…
974	sub object_freezer_save {	1028	sub object_freezer_save {
975	my ($filename, $rdata, $objs) = @_;	1029	my ($filename, $rdata, $objs) = @_;
976		1030
977	sync_job {	1031	sync_job {
978	if (length $$rdata) {	1032	if (length $$rdata) {
		1033	utf8::decode (my $decname = $filename);
979	warn sprintf "saving %s (%d,%d)\n",	1034	warn sprintf "saving %s (%d,%d)\n",
980	$filename, length $$rdata, scalar @$objs;	1035	$decname, length $$rdata, scalar @$objs;
981		1036
982	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1037	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
983	chmod SAVE_MODE, $fh;	1038	chmod SAVE_MODE, $fh;
984	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1039	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
985	aio_fsync $fh if $cf::USE_FSYNC;	1040	aio_fsync $fh if $cf::USE_FSYNC;
…		…
1004	}	1059	}
1005	} else {	1060	} else {
1006	aio_unlink $filename;	1061	aio_unlink $filename;
1007	aio_unlink "$filename.pst";	1062	aio_unlink "$filename.pst";
1008	}	1063	}
1009	}	1064	};
1010	}	1065	}
1011		1066
1012	sub object_freezer_as_string {	1067	sub object_freezer_as_string {
1013	my ($rdata, $objs) = @_;	1068	my ($rdata, $objs) = @_;
1014		1069
…		…
1026	or return;	1081	or return;
1027		1082
1028	unless (aio_stat "$filename.pst") {	1083	unless (aio_stat "$filename.pst") {
1029	(aio_load "$filename.pst", $av) >= 0	1084	(aio_load "$filename.pst", $av) >= 0
1030	or return;	1085	or return;
		1086
1031	$av = eval { (Storable::thaw $av)->{objs} };	1087	$av = eval { (Storable::thaw $av)->{objs} };
1032	}	1088	}
1033		1089
		1090	utf8::decode (my $decname = $filename);
1034	warn sprintf "loading %s (%d)\n",	1091	warn sprintf "loading %s (%d,%d)\n",
1035	$filename, length $data, scalar @{$av \|\| []};	1092	$decname, length $data, scalar @{$av \|\| []};
		1093
1036	return ($data, $av);	1094	($data, $av)
1037	}	1095	}
1038		1096
1039	=head2 COMMAND CALLBACKS	1097	=head2 COMMAND CALLBACKS
1040		1098
1041	=over 4	1099	=over 4
…		…
1114	my ($pl, $buf) = @_;	1172	my ($pl, $buf) = @_;
1115		1173
1116	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1174	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1117		1175
1118	if (ref $msg) {	1176	if (ref $msg) {
		1177	my ($type, $reply, @payload) =
		1178	"ARRAY" eq ref $msg
		1179	? @$msg
		1180	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1181
		1182	my @reply;
		1183
1119	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1184	if (my $cb = $EXTCMD{$type}) {
1120	if (my %reply = $cb->($pl, $msg)) {	1185	@reply = $cb->($pl, @payload);
1121	$pl->ext_reply ($msg->{msgid}, %reply);
1122	}
1123	}	1186	}
		1187
		1188	$pl->ext_reply ($reply, @reply)
		1189	if $reply;
		1190
1124	} else {	1191	} else {
1125	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1192	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1126	}	1193	}
1127		1194
1128	cf::override;	1195	cf::override;
…		…
1218		1285
1219	=head3 cf::player	1286	=head3 cf::player
1220		1287
1221	=over 4	1288	=over 4
1222		1289
		1290	=item cf::player::num_playing
		1291
		1292	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1293
		1294	=cut
		1295
		1296	sub num_playing {
		1297	scalar grep
		1298	$_->ob->map
		1299	&& !$_->hidden
		1300	&& !$_->ob->flag (cf::FLAG_WIZ),
		1301	cf::player::list
		1302	}
		1303
1223	=item cf::player::find $login	1304	=item cf::player::find $login
1224		1305
1225	Returns the given player object, loading it if necessary (might block).	1306	Returns the given player object, loading it if necessary (might block).
1226		1307
1227	=cut	1308	=cut
…		…
1262	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1343	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1263	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1344	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1264	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1345	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1265	aio_unlink +(playerdir $login) . "/$login.pl";	1346	aio_unlink +(playerdir $login) . "/$login.pl";
1266		1347
1267	my $pl = load_pl path $login	1348	my $f = new_from_file cf::object::thawer path $login
1268	or return;	1349	or return;
		1350
		1351	my $pl = cf::player::load_pl $f
		1352	or return;
		1353	local $cf::PLAYER_LOADING{$login} = $pl;
		1354	$f->resolve_delayed_derefs;
1269	$cf::PLAYER{$login} = $pl	1355	$cf::PLAYER{$login} = $pl
1270	}	1356	}
1271	}	1357	}
1272	}	1358	}
1273		1359
…		…
1283		1369
1284	aio_mkdir playerdir $pl, 0770;	1370	aio_mkdir playerdir $pl, 0770;
1285	$pl->{last_save} = $cf::RUNTIME;	1371	$pl->{last_save} = $cf::RUNTIME;
1286		1372
1287	$pl->save_pl ($path);	1373	$pl->save_pl ($path);
1288	Coro::cede;	1374	cf::cede_to_tick;
1289	}	1375	}
1290		1376
1291	sub new($) {	1377	sub new($) {
1292	my ($login) = @_;	1378	my ($login) = @_;
1293		1379
…		…
1297	$self->{deny_save} = 1;	1383	$self->{deny_save} = 1;
1298		1384
1299	$cf::PLAYER{$login} = $self;	1385	$cf::PLAYER{$login} = $self;
1300		1386
1301	$self	1387	$self
		1388	}
		1389
		1390	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1391
		1392	=cut
		1393
		1394	sub send_msg {
		1395	my $ns = shift->ns
		1396	or return;
		1397	$ns->send_msg (@_);
1302	}	1398	}
1303		1399
1304	=item $pl->quit_character	1400	=item $pl->quit_character
1305		1401
1306	Nukes the player without looking back. If logged in, the connection will	1402	Nukes the player without looking back. If logged in, the connection will
…		…
1361	or return [];	1457	or return [];
1362		1458
1363	my @logins;	1459	my @logins;
1364		1460
1365	for my $login (@$dirs) {	1461	for my $login (@$dirs) {
		1462	my $path = path $login;
		1463
		1464	# a .pst is a dead give-away for a valid player
		1465	unless (-e "$path.pst") {
1366	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1466	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1367	aio_read $fh, 0, 512, my $buf, 0 or next;	1467	aio_read $fh, 0, 512, my $buf, 0 or next;
1368	$buf !~ /^password -------------$/m or next; # official not-valid tag	1468	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1469	}
1369		1470
1370	utf8::decode $login;	1471	utf8::decode $login;
1371	push @logins, $login;	1472	push @logins, $login;
1372	}	1473	}
1373		1474
…		…
1411	sub expand_cfpod {	1512	sub expand_cfpod {
1412	((my $self), (local $_)) = @_;	1513	((my $self), (local $_)) = @_;
1413		1514
1414	# escape & and <	1515	# escape & and <
1415	s/&/&/g;	1516	s/&/&/g;
1416	s/(?<![BIUGH])</</g;	1517	s/(?<![BIUGHT])</</g;
1417		1518
1418	# this is buggy, it needs to properly take care of nested <'s	1519	# this is buggy, it needs to properly take care of nested <'s
1419		1520
1420	1 while	1521	1 while
1421	# replace B<>, I<>, U<> etc.	1522	# replace B<>, I<>, U<> etc.
1422	s/B<([^\>]*)>/<b>$1<\/b>/	1523	s/B<([^\>]*)>/<b>$1<\/b>/
1423	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1524	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
1424	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1525	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1526	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1425	# replace G<male\|female> tags	1527	# replace G<male\|female> tags
1426	\|\| s{G<([^>\|])\\|([^>])>}{	1528	\|\| s{G<([^>\|])\\|([^>])>}{
1427	$self->gender ? $2 : $1	1529	$self->gender ? $2 : $1
1428	}ge	1530	}ge
1429	# replace H<hint text>	1531	# replace H<hint text>
…		…
1450	sub hintmode {	1552	sub hintmode {
1451	$_[0]{hintmode} = $_[1] if @_ > 1;	1553	$_[0]{hintmode} = $_[1] if @_ > 1;
1452	$_[0]{hintmode}	1554	$_[0]{hintmode}
1453	}	1555	}
1454		1556
1455	=item $player->ext_reply ($msgid, %msg)	1557	=item $player->ext_reply ($msgid, @msg)
1456		1558
1457	Sends an ext reply to the player.	1559	Sends an ext reply to the player.
1458		1560
1459	=cut	1561	=cut
1460		1562
1461	sub ext_reply($$%) {	1563	sub ext_reply($$@) {
1462	my ($self, $id, %msg) = @_;	1564	my ($self, $id, @msg) = @_;
1463		1565
1464	$msg{msgid} = $id;	1566	$self->ns->ext_reply ($id, @msg)
1465	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1466	}	1567	}
1467		1568
1468	=item $player->ext_event ($type, %msg)	1569	=item $player->ext_msg ($type, @msg)
1469		1570
1470	Sends an ext event to the client.	1571	Sends an ext event to the client.
1471		1572
1472	=cut	1573	=cut
1473		1574
1474	sub ext_event($$%) {	1575	sub ext_msg($$@) {
1475	my ($self, $type, %msg) = @_;	1576	my ($self, $type, @msg) = @_;
1476		1577
1477	$self->ns->ext_event ($type, %msg);	1578	$self->ns->ext_msg ($type, @msg);
1478	}	1579	}
1479		1580
1480	=head3 cf::region	1581	=head3 cf::region
1481		1582
1482	=over 4	1583	=over 4
…		…
1698		1799
1699	sub load_header_from($) {	1800	sub load_header_from($) {
1700	my ($self, $path) = @_;	1801	my ($self, $path) = @_;
1701		1802
1702	utf8::encode $path;	1803	utf8::encode $path;
1703	#aio_open $path, O_RDONLY, 0	1804	my $f = new_from_file cf::object::thawer $path
1704	# or return;
1705
1706	$self->_load_header ($path)
1707	or return;	1805	or return;
		1806
		1807	$self->_load_header ($f)
		1808	or return;
		1809
		1810	local $MAP_LOADING{$self->{path}} = $self;
		1811	$f->resolve_delayed_derefs;
1708		1812
1709	$self->{load_path} = $path;	1813	$self->{load_path} = $path;
1710		1814
1711	1	1815	1
1712	}	1816	}
…		…
1766	sub find {	1870	sub find {
1767	my ($path, $origin) = @_;	1871	my ($path, $origin) = @_;
1768		1872
1769	$path = normalise $path, $origin && $origin->path;	1873	$path = normalise $path, $origin && $origin->path;
1770		1874
		1875	cf::lock_wait "map_data:$path";#d#remove
1771	cf::lock_wait "map_find:$path";	1876	cf::lock_wait "map_find:$path";
1772		1877
1773	$cf::MAP{$path} \|\| do {	1878	$cf::MAP{$path} \|\| do {
1774	my $guard = cf::lock_acquire "map_find:$path";	1879	my $guard1 = cf::lock_acquire "map_find:$path";
		1880	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1881
1775	my $map = new_from_path cf::map $path	1882	my $map = new_from_path cf::map $path
1776	or return;	1883	or return;
1777		1884
1778	$map->{last_save} = $cf::RUNTIME;	1885	$map->{last_save} = $cf::RUNTIME;
1779		1886
…		…
1781	or return;	1888	or return;
1782		1889
1783	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1890	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1784	# doing this can freeze the server in a sync job, obviously	1891	# doing this can freeze the server in a sync job, obviously
1785	#$cf::WAIT_FOR_TICK->wait;	1892	#$cf::WAIT_FOR_TICK->wait;
		1893	undef $guard1;
		1894	undef $guard2;
1786	$map->reset;	1895	$map->reset;
1787	undef $guard;
1788	return find $path;	1896	return find $path;
1789	}	1897	}
1790		1898
1791	$cf::MAP{$path} = $map	1899	$cf::MAP{$path} = $map
1792	}	1900	}
…		…
1801	local $self->{deny_reset} = 1; # loading can take a long time	1909	local $self->{deny_reset} = 1; # loading can take a long time
1802		1910
1803	my $path = $self->{path};	1911	my $path = $self->{path};
1804		1912
1805	{	1913	{
1806	my $guard = cf::lock_acquire "map_load:$path";	1914	my $guard = cf::lock_acquire "map_data:$path";
1807		1915
		1916	return unless $self->valid;
1808	return if $self->in_memory != cf::MAP_SWAPPED;	1917	return unless $self->in_memory == cf::MAP_SWAPPED;
1809		1918
1810	$self->in_memory (cf::MAP_LOADING);	1919	$self->in_memory (cf::MAP_LOADING);
1811		1920
1812	$self->alloc;	1921	$self->alloc;
1813		1922
1814	$self->pre_load;	1923	$self->pre_load;
1815	Coro::cede;	1924	cf::cede_to_tick;
1816		1925
		1926	my $f = new_from_file cf::object::thawer $self->{load_path};
		1927	$f->skip_block;
1817	$self->_load_objects ($self->{load_path}, 1)	1928	$self->_load_objects ($f)
1818	or return;	1929	or return;
1819		1930
1820	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1931	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1821	if delete $self->{load_original};	1932	if delete $self->{load_original};
1822		1933
1823	if (my $uniq = $self->uniq_path) {	1934	if (my $uniq = $self->uniq_path) {
1824	utf8::encode $uniq;	1935	utf8::encode $uniq;
1825	if (aio_open $uniq, O_RDONLY, 0) {	1936	unless (aio_stat $uniq) {
		1937	if (my $f = new_from_file cf::object::thawer $uniq) {
1826	$self->clear_unique_items;	1938	$self->clear_unique_items;
1827	$self->_load_objects ($uniq, 0);	1939	$self->_load_objects ($f);
		1940	$f->resolve_delayed_derefs;
		1941	}
1828	}	1942	}
1829	}	1943	}
1830		1944
1831	Coro::cede;	1945	$f->resolve_delayed_derefs;
		1946
		1947	cf::cede_to_tick;
1832	# now do the right thing for maps	1948	# now do the right thing for maps
1833	$self->link_multipart_objects;	1949	$self->link_multipart_objects;
1834	$self->difficulty ($self->estimate_difficulty)	1950	$self->difficulty ($self->estimate_difficulty)
1835	unless $self->difficulty;	1951	unless $self->difficulty;
1836	Coro::cede;	1952	cf::cede_to_tick;
1837		1953
1838	unless ($self->{deny_activate}) {	1954	unless ($self->{deny_activate}) {
1839	$self->decay_objects;	1955	$self->decay_objects;
1840	$self->fix_auto_apply;	1956	$self->fix_auto_apply;
1841	$self->update_buttons;	1957	$self->update_buttons;
1842	Coro::cede;	1958	cf::cede_to_tick;
1843	$self->set_darkness_map;	1959	$self->set_darkness_map;
1844	Coro::cede;	1960	cf::cede_to_tick;
1845	$self->activate;	1961	$self->activate;
1846	}	1962	}
		1963
		1964	$self->{last_save} = $cf::RUNTIME;
		1965	$self->last_access ($cf::RUNTIME);
1847		1966
1848	$self->in_memory (cf::MAP_IN_MEMORY);	1967	$self->in_memory (cf::MAP_IN_MEMORY);
1849	}	1968	}
1850		1969
1851	$self->post_load;	1970	$self->post_load;
…		…
1862		1981
1863	$self	1982	$self
1864	}	1983	}
1865		1984
1866	# find and load all maps in the 3x3 area around a map	1985	# find and load all maps in the 3x3 area around a map
1867	sub load_diag {	1986	sub load_neighbours {
1868	my ($map) = @_;	1987	my ($map) = @_;
1869		1988
1870	my @diag; # diagonal neighbours	1989	my @neigh; # diagonal neighbours
1871		1990
1872	for (0 .. 3) {	1991	for (0 .. 3) {
1873	my $neigh = $map->tile_path ($_)	1992	my $neigh = $map->tile_path ($_)
1874	or next;	1993	or next;
1875	$neigh = find $neigh, $map	1994	$neigh = find $neigh, $map
1876	or next;	1995	or next;
1877	$neigh->load;	1996	$neigh->load;
1878		1997
		1998	push @neigh,
1879	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	1999	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1880	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2000	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1881	}	2001	}
1882		2002
1883	for (@diag) {	2003	for (grep defined $_->[0], @neigh) {
		2004	my ($path, $origin) = @$_;
1884	my $neigh = find @$_	2005	my $neigh = find $path, $origin
1885	or next;	2006	or next;
1886	$neigh->load;	2007	$neigh->load;
1887	}	2008	}
1888	}	2009	}
1889		2010
…		…
1894	}	2015	}
1895		2016
1896	sub do_load_sync {	2017	sub do_load_sync {
1897	my ($map) = @_;	2018	my ($map) = @_;
1898		2019
		2020	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2021	if $Coro::current == $Coro::main;
		2022
1899	cf::sync_job { $map->load };	2023	cf::sync_job { $map->load };
1900	}	2024	}
1901		2025
1902	our %MAP_PREFETCH;	2026	our %MAP_PREFETCH;
1903	our $MAP_PREFETCHER = undef;	2027	our $MAP_PREFETCHER = undef;
1904		2028
1905	sub find_async {	2029	sub find_async {
1906	my ($path, $origin) = @_;	2030	my ($path, $origin, $load) = @_;
1907		2031
1908	$path = normalise $path, $origin && $origin->{path};	2032	$path = normalise $path, $origin && $origin->{path};
1909		2033
1910	if (my $map = $cf::MAP{$path}) {	2034	if (my $map = $cf::MAP{$path}) {
1911	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2035	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1912	}	2036	}
1913		2037
1914	undef $MAP_PREFETCH{$path};	2038	$MAP_PREFETCH{$path} \|= $load;
		2039
1915	$MAP_PREFETCHER \|\|= cf::async {	2040	$MAP_PREFETCHER \|\|= cf::async {
1916	while (%MAP_PREFETCH) {	2041	while (%MAP_PREFETCH) {
1917	for my $path (keys %MAP_PREFETCH) {	2042	while (my ($k, $v) = each %MAP_PREFETCH) {
1918	if (my $map = find $path) {	2043	if (my $map = find $k) {
1919	$map->load;	2044	$map->load if $v;
1920	}	2045	}
1921		2046
1922	delete $MAP_PREFETCH{$path};	2047	delete $MAP_PREFETCH{$k};
1923	}	2048	}
1924	}	2049	}
1925	undef $MAP_PREFETCHER;	2050	undef $MAP_PREFETCHER;
1926	};	2051	};
1927	$MAP_PREFETCHER->prio (6);	2052	$MAP_PREFETCHER->prio (6);
…		…
1930	}	2055	}
1931		2056
1932	sub save {	2057	sub save {
1933	my ($self) = @_;	2058	my ($self) = @_;
1934		2059
1935	my $lock = cf::lock_acquire "map_data:" . $self->path;	2060	my $lock = cf::lock_acquire "map_data:$self->{path}";
1936		2061
1937	$self->{last_save} = $cf::RUNTIME;	2062	$self->{last_save} = $cf::RUNTIME;
1938		2063
1939	return unless $self->dirty;	2064	return unless $self->dirty;
1940		2065
…		…
1963	my ($self) = @_;	2088	my ($self) = @_;
1964		2089
1965	# save first because save cedes	2090	# save first because save cedes
1966	$self->save;	2091	$self->save;
1967		2092
1968	my $lock = cf::lock_acquire "map_data:" . $self->path;	2093	my $lock = cf::lock_acquire "map_data:$self->{path}";
1969		2094
1970	return if $self->players;	2095	return if $self->players;
1971	return if $self->in_memory != cf::MAP_IN_MEMORY;	2096	return if $self->in_memory != cf::MAP_IN_MEMORY;
1972	return if $self->{deny_save};	2097	return if $self->{deny_save};
1973		2098
		2099	$self->in_memory (cf::MAP_SWAPPED);
		2100
		2101	$self->deactivate;
		2102	$_->clear_links_to ($self) for values %cf::MAP;
1974	$self->clear;	2103	$self->clear;
1975	$self->in_memory (cf::MAP_SWAPPED);
1976	}	2104	}
1977		2105
1978	sub reset_at {	2106	sub reset_at {
1979	my ($self) = @_;	2107	my ($self) = @_;
1980		2108
…		…
2012	if $uniq;	2140	if $uniq;
2013	}	2141	}
2014		2142
2015	delete $cf::MAP{$self->path};	2143	delete $cf::MAP{$self->path};
2016		2144
		2145	$self->deactivate;
		2146	$_->clear_links_to ($self) for values %cf::MAP;
2017	$self->clear;	2147	$self->clear;
2018
2019	$_->clear_links_to ($self) for values %cf::MAP;
2020		2148
2021	$self->unlink_save;	2149	$self->unlink_save;
2022	$self->destroy;	2150	$self->destroy;
2023	}	2151	}
2024		2152
2025	my $nuke_counter = "aaaa";	2153	my $nuke_counter = "aaaa";
2026		2154
2027	sub nuke {	2155	sub nuke {
2028	my ($self) = @_;	2156	my ($self) = @_;
2029		2157
		2158	{
		2159	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2160
2030	delete $cf::MAP{$self->path};	2161	delete $cf::MAP{$self->path};
2031		2162
2032	$self->unlink_save;	2163	$self->unlink_save;
2033		2164
2034	bless $self, "cf::map";	2165	bless $self, "cf::map";
2035	delete $self->{deny_reset};	2166	delete $self->{deny_reset};
2036	$self->{deny_save} = 1;	2167	$self->{deny_save} = 1;
2037	$self->reset_timeout (1);	2168	$self->reset_timeout (1);
2038	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2169	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2039		2170
2040	$cf::MAP{$self->path} = $self;	2171	$cf::MAP{$self->path} = $self;
		2172	}
2041		2173
2042	$self->reset; # polite request, might not happen	2174	$self->reset; # polite request, might not happen
2043	}	2175	}
2044		2176
2045	=item $maps = cf::map::tmp_maps	2177	=item $maps = cf::map::tmp_maps
…		…
2121		2253
2122	sub inv_recursive {	2254	sub inv_recursive {
2123	inv_recursive_ inv $_[0]	2255	inv_recursive_ inv $_[0]
2124	}	2256	}
2125		2257
		2258	=item $ref = $ob->ref
		2259
		2260	creates and returns a persistent reference to an objetc that can be stored as a string.
		2261
		2262	=item $ob = cf::object::deref ($refstring)
		2263
		2264	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2265	even if the object actually exists. May block.
		2266
		2267	=cut
		2268
		2269	sub deref {
		2270	my ($ref) = @_;
		2271
		2272	# temporary compatibility#TODO#remove
		2273	$ref =~ s{^<}{player/<};
		2274
		2275	if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
		2276	my ($uuid, $name) = ($1, $2);
		2277	my $pl = $cf::PLAYER_LOADING{$name} \|\| cf::player::find $name
		2278	or return;
		2279	$pl->ob->uuid eq $uuid
		2280	or return;
		2281
		2282	$pl->ob
		2283	} else {
		2284	warn "$ref: cannot resolve object reference\n";
		2285	undef
		2286	}
		2287	}
		2288
2126	package cf;	2289	package cf;
2127		2290
2128	=back	2291	=back
2129		2292
2130	=head3 cf::object::player	2293	=head3 cf::object::player
…		…
2152		2315
2153	} else {	2316	} else {
2154	my $pl = $self->contr;	2317	my $pl = $self->contr;
2155		2318
2156	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2319	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157	my $diag = $pl->{npc_dialog};	2320	my $dialog = $pl->{npc_dialog};
2158	$diag->{pl}->ext_reply (	2321	$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		2322
2165	} else {	2323	} else {
2166	$msg = $npc->name . " says: $msg" if $npc;	2324	$msg = $npc->name . " says: $msg" if $npc;
2167	$self->message ($msg, $flags);	2325	$self->message ($msg, $flags);
2168	}	2326	}
2169	}	2327	}
		2328	}
		2329
		2330	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2331
		2332	=cut
		2333
		2334	sub cf::object::send_msg {
		2335	my $pl = shift->contr
		2336	or return;
		2337	$pl->send_msg (@_);
2170	}	2338	}
2171		2339
2172	=item $player_object->may ("access")	2340	=item $player_object->may ("access")
2173		2341
2174	Returns wether the given player is authorized to access resource "access"	2342	Returns wether the given player is authorized to access resource "access"
…		…
2253	# use -1 or undef as default coordinates, not 0, 0	2421	# use -1 or undef as default coordinates, not 0, 0
2254	($x, $y) = ($map->enter_x, $map->enter_y)	2422	($x, $y) = ($map->enter_x, $map->enter_y)
2255	if $x <=0 && $y <= 0;	2423	if $x <=0 && $y <= 0;
2256		2424
2257	$map->load;	2425	$map->load;
2258	$map->load_diag;	2426	$map->load_neighbours;
2259		2427
2260	return unless $self->contr->active;	2428	return unless $self->contr->active;
2261	$self->activate_recursive;	2429	$self->activate_recursive;
2262		2430
2263	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2431	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
…		…
2283	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2451	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2284		2452
2285	$self->enter_link;	2453	$self->enter_link;
2286		2454
2287	(async {	2455	(async {
		2456	# *tag paths override both path and x\|y
		2457	if ($path =~ /^\(.)$/) {
		2458	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2459	my $ob = $obs[rand @obs];
		2460
		2461	# see if we actually can go there
		2462	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2463	$ob = $obs[rand @obs];
		2464	} else {
		2465	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE \| cf::NDI_RED);
		2466	}
		2467	# else put us there anyways for now #d#
		2468
		2469	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2470	} else {
		2471	($path, $x, $y) = (undef, undef, undef);
		2472	}
		2473	}
		2474
2288	my $map = eval {	2475	my $map = eval {
2289	my $map = cf::map::find $path;	2476	my $map = defined $path ? cf::map::find $path : undef;
2290		2477
2291	if ($map) {	2478	if ($map) {
2292	$map = $map->customise_for ($self);	2479	$map = $map->customise_for ($self);
2293	$map = $check->($map) if $check && $map;	2480	$map = $check->($map) if $check && $map;
2294	} else {	2481	} else {
2295	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);	2482	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE \| cf::NDI_RED);
2296	}	2483	}
2297		2484
2298	$map	2485	$map
2299	};	2486	};
2300		2487
…		…
2434	the message, with C<log> being the default. If C<$color> is negative, suppress	2621	the message, with C<log> being the default. If C<$color> is negative, suppress
2435	the message unless the client supports the msg packet.	2622	the message unless the client supports the msg packet.
2436		2623
2437	=cut	2624	=cut
2438		2625
		2626	our %CHANNEL = (
		2627	"c/identify" => {
		2628	id => "identify",
		2629	title => "Identify",
		2630	reply => undef,
		2631	tooltip => "Items recently identified",
		2632	},
		2633	"c/examine" => {
		2634	id => "examine",
		2635	title => "Examine",
		2636	reply => undef,
		2637	tooltip => "Signs and other items you examined",
		2638	},
		2639	);
		2640
2439	sub cf::client::send_msg {	2641	sub cf::client::send_msg {
2440	my ($self, $channel, $msg, $color, @extra) = @_;	2642	my ($self, $channel, $msg, $color, @extra) = @_;
2441		2643
2442	$msg = $self->pl->expand_cfpod ($msg);	2644	$msg = $self->pl->expand_cfpod ($msg);
2443		2645
2444	return unless @extra \|\| length $msg;
2445
2446	$color &= ~cf::NDI_UNIQUE; # just in case...	2646	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2647
		2648	# check predefined channels, for the benefit of C
		2649	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2447		2650
2448	if (ref $channel) {	2651	if (ref $channel) {
2449	# send meta info to client, if not yet sent	2652	# send meta info to client, if not yet sent
2450	unless (exists $self->{channel}{$channel->{id}}) {	2653	unless (exists $self->{channel}{$channel->{id}}) {
2451	$self->{channel}{$channel->{id}} = $channel;	2654	$self->{channel}{$channel->{id}} = $channel;
2452	$self->ext_event (channel_info => %$channel);	2655	$self->ext_msg (channel_info => $channel)
		2656	if $self->can_msg;
2453	}	2657	}
2454		2658
2455	$channel = $channel->{id};	2659	$channel = $channel->{id};
2456	}	2660	}
2457		2661
		2662	return unless @extra \|\| length $msg;
		2663
2458	if ($self->can_msg) {	2664	if ($self->can_msg) {
		2665	# default colour, mask it out
		2666	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
		2667	if $color & cf::NDI_DEF;
		2668
2459	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));	2669	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2670	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2460	} else {	2671	} else {
2461	# replace some tags by gcfclient-compatible ones
2462	for ($msg) {
2463	1 while
2464	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2465	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2466	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2467	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2468	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2469	}
2470
2471	if ($color >= 0) {	2672	if ($color >= 0) {
		2673	# replace some tags by gcfclient-compatible ones
		2674	for ($msg) {
		2675	1 while
		2676	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2677	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2678	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2679	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2680	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2681	}
		2682
		2683	$color &= cf::NDI_COLOR_MASK;
		2684
		2685	utf8::encode $msg;
		2686
2472	if (0 && $msg =~ /\[/) {	2687	if (0 && $msg =~ /\[/) {
		2688	# COMMAND/INFO
2473	$self->send_packet ("drawextinfo $color 4 0 $msg")	2689	$self->send_packet ("drawextinfo $color 10 8 $msg")
2474	} else {	2690	} else {
2475	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2691	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2476	$self->send_packet ("drawinfo $color $msg")	2692	$self->send_packet ("drawinfo $color $msg")
2477	}	2693	}
2478	}	2694	}
2479	}	2695	}
2480	}	2696	}
2481		2697
2482	=item $client->ext_event ($type, %msg)	2698	=item $client->ext_msg ($type, @msg)
2483		2699
2484	Sends an ext event to the client.	2700	Sends an ext event to the client.
2485		2701
2486	=cut	2702	=cut
2487		2703
2488	sub cf::client::ext_event($$%) {	2704	sub cf::client::ext_msg($$@) {
2489	my ($self, $type, %msg) = @_;	2705	my ($self, $type, @msg) = @_;
2490		2706
2491	return unless $self->extcmd;	2707	if ($self->extcmd == 2) {
2492		2708	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2709	} elsif ($self->extcmd == 1) { # TODO: remove
2493	$msg{msgtype} = "event_$type";	2710	push @msg, msgtype => "event_$type";
2494	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2711	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2712	}
		2713	}
		2714
		2715	=item $client->ext_reply ($msgid, @msg)
		2716
		2717	Sends an ext reply to the client.
		2718
		2719	=cut
		2720
		2721	sub cf::client::ext_reply($$@) {
		2722	my ($self, $id, @msg) = @_;
		2723
		2724	if ($self->extcmd == 2) {
		2725	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2726	} elsif ($self->extcmd == 1) {
		2727	#TODO: version 1, remove
		2728	unshift @msg, msgtype => "reply", msgid => $id;
		2729	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2730	}
2495	}	2731	}
2496		2732
2497	=item $success = $client->query ($flags, "text", \&cb)	2733	=item $success = $client->query ($flags, "text", \&cb)
2498		2734
2499	Queues a query to the client, calling the given callback with	2735	Queues a query to the client, calling the given callback with
…		…
2554	my ($ns, $buf) = @_;	2790	my ($ns, $buf) = @_;
2555		2791
2556	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2792	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2557		2793
2558	if (ref $msg) {	2794	if (ref $msg) {
		2795	my ($type, $reply, @payload) =
		2796	"ARRAY" eq ref $msg
		2797	? @$msg
		2798	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2799
		2800	my @reply;
		2801
2559	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2802	if (my $cb = $EXTICMD{$type}) {
2560	if (my %reply = $cb->($ns, $msg)) {	2803	@reply = $cb->($ns, @payload);
2561	$reply{msgid} = $msg->{msgid};
2562	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2563	}
2564	}	2804	}
		2805
		2806	$ns->ext_reply ($reply, @reply)
		2807	if $reply;
		2808
2565	} else {	2809	} else {
2566	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2810	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2567	}	2811	}
2568		2812
2569	cf::override;	2813	cf::override;
…		…
2616	our $safe = new Safe "safe";	2860	our $safe = new Safe "safe";
2617	our $safe_hole = new Safe::Hole;	2861	our $safe_hole = new Safe::Hole;
2618		2862
2619	$SIG{FPE} = 'IGNORE';	2863	$SIG{FPE} = 'IGNORE';
2620		2864
2621	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2865	$safe->permit_only (Opcode::opset qw(
		2866	:base_core :base_mem :base_orig :base_math
		2867	grepstart grepwhile mapstart mapwhile
		2868	sort time
		2869	));
2622		2870
2623	# here we export the classes and methods available to script code	2871	# here we export the classes and methods available to script code
2624		2872
2625	=pod	2873	=pod
2626		2874
2627	The following functions and methods are available within a safe environment:	2875	The following functions and methods are available within a safe environment:
2628		2876
2629	cf::object	2877	cf::object
2630	contr pay_amount pay_player map x y force_find force_add	2878	contr pay_amount pay_player map x y force_find force_add
2631	insert remove	2879	insert remove name archname title slaying race decrease_ob_nr
2632		2880
2633	cf::object::player	2881	cf::object::player
2634	player	2882	player
2635		2883
2636	cf::player	2884	cf::player
…		…
2641		2889
2642	=cut	2890	=cut
2643		2891
2644	for (	2892	for (
2645	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	2893	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2894	insert remove inv name archname title slaying race
2646	insert remove)],	2895	decrease_ob_nr)],
2647	["cf::object::player" => qw(player)],	2896	["cf::object::player" => qw(player)],
2648	["cf::player" => qw(peaceful)],	2897	["cf::player" => qw(peaceful)],
2649	["cf::map" => qw(trigger)],	2898	["cf::map" => qw(trigger)],
2650	) {	2899	) {
2651	no strict 'refs';	2900	no strict 'refs';
…		…
2727	# the server's init and main functions	2976	# the server's init and main functions
2728		2977
2729	sub load_facedata($) {	2978	sub load_facedata($) {
2730	my ($path) = @_;	2979	my ($path) = @_;
2731		2980
		2981	# HACK to clear player env face cache, we need some signal framework
		2982	# for this (global event?)
		2983	%ext::player_env::MUSIC_FACE_CACHE = ();
		2984
		2985	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		2986
2732	warn "loading facedata from $path\n";	2987	warn "loading facedata from $path\n";
2733		2988
2734	my $facedata;	2989	my $facedata;
2735	0 < aio_load $path, $facedata	2990	0 < aio_load $path, $facedata
2736	or die "$path: $!";	2991	or die "$path: $!";
2737		2992
2738	$facedata = Coro::Storable::thaw $facedata;	2993	$facedata = Coro::Storable::thaw $facedata;
2739		2994
2740	$facedata->{version} == 2	2995	$facedata->{version} == 2
2741	or cf::cleanup "$path: version mismatch, cannot proceed.";	2996	or cf::cleanup "$path: version mismatch, cannot proceed.";
		2997
		2998	# patch in the exptable
		2999	$facedata->{resource}{"res/exp_table"} = {
		3000	type => FT_RSRC,
		3001	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3002	};
		3003	cf::cede_to_tick;
2742		3004
2743	{	3005	{
2744	my $faces = $facedata->{faceinfo};	3006	my $faces = $facedata->{faceinfo};
2745		3007
2746	while (my ($face, $info) = each %$faces) {	3008	while (my ($face, $info) = each %$faces) {
2747	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3009	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2748	cf::face::set_visibility $idx, $info->{visibility};	3010	cf::face::set_visibility $idx, $info->{visibility};
2749	cf::face::set_magicmap $idx, $info->{magicmap};	3011	cf::face::set_magicmap $idx, $info->{magicmap};
2750	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3012	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2751	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3013	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2752		3014
2753	cf::cede_to_tick;	3015	cf::cede_to_tick;
2754	}	3016	}
2755		3017
2756	while (my ($face, $info) = each %$faces) {	3018	while (my ($face, $info) = each %$faces) {
…		…
2781		3043
2782	{	3044	{
2783	# TODO: for gcfclient pleasure, we should give resources	3045	# TODO: for gcfclient pleasure, we should give resources
2784	# that gcfclient doesn't grok a >10000 face index.	3046	# that gcfclient doesn't grok a >10000 face index.
2785	my $res = $facedata->{resource};	3047	my $res = $facedata->{resource};
2786	my $enc = JSON::XS->new->utf8->canonical;	3048
		3049	my $soundconf = delete $res->{"res/sound.conf"};
2787		3050
2788	while (my ($name, $info) = each %$res) {	3051	while (my ($name, $info) = each %$res) {
2789	my $meta = $enc->encode ({
2790	name => $name,
2791	type => $info->{type},
2792	copyright => $info->{copyright}, #TODO#
2793	});
2794
2795	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3052	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		3053	my $data;
2796		3054
2797	if ($name =~ /\.jpg$/) {	3055	if ($info->{type} & 1) {
2798	cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack	3056	# prepend meta info
2799	cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack	3057
		3058	my $meta = $enc->encode ({
		3059	name => $name,
		3060	%{ $info->{meta} \|\| {} },
		3061	});
		3062
		3063	$data = pack "(w/a)", $meta, $info->{data};
2800	} else {	3064	} else {
2801	my $data = pack "(w/a)", $meta, $info->{data};	3065	$data = $info->{data};
2802	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2803
2804	cf::face::set_type $idx, 1;
2805	cf::face::set_data $idx, 0, $data, $chk;
2806	}	3066	}
2807		3067
		3068	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3069	cf::face::set_type $idx, $info->{type};
		3070
2808	cf::cede_to_tick;	3071	cf::cede_to_tick;
2809	}	3072	}
		3073
		3074	if ($soundconf) {
		3075	$soundconf = $enc->decode (delete $soundconf->{data});
		3076
		3077	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3078	my $sound = $soundconf->{compat}[$_]
		3079	or next;
		3080
		3081	my $face = cf::face::find "sound/$sound->[1]";
		3082	cf::sound::set $sound->[0] => $face;
		3083	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3084	}
		3085
		3086	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3087	my $face = cf::face::find "sound/$v";
		3088	cf::sound::set $k => $face;
		3089	}
		3090	}
2810	}	3091	}
2811		3092
2812	1	3093	1
2813	}	3094	}
2814		3095
		3096	register_exticmd fx_want => sub {
		3097	my ($ns, $want) = @_;
		3098
		3099	while (my ($k, $v) = each %$want) {
		3100	$ns->fx_want ($k, $v);
		3101	}
		3102	};
		3103
2815	sub reload_regions {	3104	sub reload_regions {
		3105	# HACK to clear player env face cache, we need some signal framework
		3106	# for this (global event?)
		3107	%ext::player_env::MUSIC_FACE_CACHE = ();
		3108
2816	load_resource_file "$MAPDIR/regions"	3109	load_resource_file "$MAPDIR/regions"
2817	or die "unable to load regions file\n";	3110	or die "unable to load regions file\n";
2818		3111
2819	for (cf::region::list) {	3112	for (cf::region::list) {
2820	$_->{match} = qr/$_->{match}/	3113	$_->{match} = qr/$_->{match}/
…		…
2856		3149
2857	sub init {	3150	sub init {
2858	reload_resources;	3151	reload_resources;
2859	}	3152	}
2860		3153
2861	sub cfg_load {	3154	sub reload_config {
2862	open my $fh, "<:utf8", "$CONFDIR/config"	3155	open my $fh, "<:utf8", "$CONFDIR/config"
2863	or return;	3156	or return;
2864		3157
2865	local $/;	3158	local $/;
2866	*CFG = YAML::Syck::Load <$fh>;	3159	*CFG = YAML::Syck::Load <$fh>;
…		…
2886	(async {	3179	(async {
2887	Event::one_event;	3180	Event::one_event;
2888	})->prio (Coro::PRIO_MAX);	3181	})->prio (Coro::PRIO_MAX);
2889	};	3182	};
2890		3183
2891	cfg_load;	3184	reload_config;
2892	db_init;	3185	db_init;
2893	load_extensions;	3186	load_extensions;
2894		3187
2895	$TICK_WATCHER->start;	3188	$TICK_WATCHER->start;
2896	Event::loop;	3189	Event::loop;
…		…
3089	warn "reloading cf.pm";	3382	warn "reloading cf.pm";
3090	require cf;	3383	require cf;
3091	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3384	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3092		3385
3093	warn "loading config and database again";	3386	warn "loading config and database again";
3094	cf::cfg_load;	3387	cf::reload_config;
3095		3388
3096	warn "loading extensions";	3389	warn "loading extensions";
3097	cf::load_extensions;	3390	cf::load_extensions;
3098		3391
3099	warn "reattaching attachments to objects/players";	3392	warn "reattaching attachments to objects/players";
…		…
3164	my $signal = new Coro::Signal;	3457	my $signal = new Coro::Signal;
3165	push @WAIT_FOR_TICK_BEGIN, $signal;	3458	push @WAIT_FOR_TICK_BEGIN, $signal;
3166	$signal->wait;	3459	$signal->wait;
3167	}	3460	}
3168		3461
3169	my $min = 1e6;#d#
3170	my $avg = 10;
3171	$TICK_WATCHER = Event->timer (	3462	$TICK_WATCHER = Event->timer (
3172	reentrant => 0,	3463	reentrant => 0,
3173	parked => 1,	3464	parked => 1,
3174	prio => 0,	3465	prio => 0,
3175	at => $NEXT_TICK \|\| $TICK,	3466	at => $NEXT_TICK \|\| $TICK,
…		…
3183		3474
3184	$NOW = $tick_start = Event::time;	3475	$NOW = $tick_start = Event::time;
3185		3476
3186	cf::server_tick; # one server iteration	3477	cf::server_tick; # one server iteration
3187		3478
3188	0 && sync_job {#d#
3189	for(1..10) {
3190	my $t = Event::time;
3191	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3192	or die;
3193
3194	$map->width (50);
3195	$map->height (50);
3196	$map->alloc;
3197	$map->_load_objects ("/tmp/x.map", 1);
3198	my $t = Event::time - $t;
3199
3200	#next unless $t < 0.0013;#d#
3201	if ($t < $min) {
3202	$min = $t;
3203	}
3204	$avg = $avg * 0.99 + $t * 0.01;
3205	}
3206	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3207	exit 0;
3208	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3209	};
3210
3211	$RUNTIME += $TICK;	3479	$RUNTIME += $TICK;
3212	$NEXT_TICK += $TICK;	3480	$NEXT_TICK += $TICK;
3213		3481
3214	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3482	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3215	$NEXT_RUNTIME_WRITE = $NOW + 10;	3483	$NEXT_RUNTIME_WRITE = $NOW + 10;
…		…
3217	write_runtime	3485	write_runtime
3218	or warn "ERROR: unable to write runtime file: $!";	3486	or warn "ERROR: unable to write runtime file: $!";
3219	};	3487	};
3220	}	3488	}
3221		3489
3222	# my $AFTER = Event::time;
3223	# warn $AFTER - $NOW;#d#
3224
3225	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3490	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3226	$sig->send;	3491	$sig->send;
3227	}	3492	}
3228	while (my $sig = shift @WAIT_FOR_TICK) {	3493	while (my $sig = shift @WAIT_FOR_TICK) {
3229	$sig->send;	3494	$sig->send;
…		…
3239		3504
3240	$LOAD = ($NOW - $tick_start) / $TICK;	3505	$LOAD = ($NOW - $tick_start) / $TICK;
3241	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3506	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3242		3507
3243	_post_tick;	3508	_post_tick;
3244
3245
3246	},	3509	},
3247	);	3510	);
3248		3511
3249	{	3512	{
		3513	BDB::min_parallel 8;
3250	BDB::max_poll_time $TICK * 0.1;	3514	BDB::max_poll_time $TICK * 0.1;
3251	$BDB_POLL_WATCHER = Event->io (	3515	$BDB_POLL_WATCHER = Event->io (
3252	reentrant => 0,	3516	reentrant => 0,
3253	fd => BDB::poll_fileno,	3517	fd => BDB::poll_fileno,
3254	poll => 'r',	3518	poll => 'r',
3255	prio => 0,	3519	prio => 0,
3256	data => WF_AUTOCANCEL,	3520	data => WF_AUTOCANCEL,
3257	cb => \&BDB::poll_cb,	3521	cb => \&BDB::poll_cb,
3258	);	3522	);
3259	BDB::min_parallel 8;
3260		3523
3261	BDB::set_sync_prepare {	3524	BDB::set_sync_prepare {
3262	my $status;	3525	my $status;
3263	my $current = $Coro::current;	3526	my $current = $Coro::current;
3264	(	3527	(
…		…
3273	)	3536	)
3274	};	3537	};
3275		3538
3276	unless ($DB_ENV) {	3539	unless ($DB_ENV) {
3277	$DB_ENV = BDB::db_env_create;	3540	$DB_ENV = BDB::db_env_create;
		3541	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC
		3542	\| BDB::LOG_AUTOREMOVE, 1);
		3543	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3544	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3278		3545
3279	cf::sync_job {	3546	cf::sync_job {
3280	eval {	3547	eval {
3281	BDB::db_env_open	3548	BDB::db_env_open
3282	$DB_ENV,	3549	$DB_ENV,
…		…
3284	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN	3551	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN
3285	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3552	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3286	0666;	3553	0666;
3287		3554
3288	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3555	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3289
3290	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
3291	$DB_ENV->set_lk_detect;
3292	};	3556	};
3293		3557
3294	cf::cleanup "db_env_open(db): $@" if $@;	3558	cf::cleanup "db_env_open(db): $@" if $@;
3295	};	3559	};
3296	}	3560	}
		3561
		3562	$BDB_DEADLOCK_WATCHER = Event->timer (
		3563	after => 3,
		3564	interval => 1,
		3565	hard => 1,
		3566	prio => 0,
		3567	data => WF_AUTOCANCEL,
		3568	cb => sub {
		3569	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3570	},
		3571	);
		3572	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3573	after => 11,
		3574	interval => 60,
		3575	hard => 1,
		3576	prio => 0,
		3577	data => WF_AUTOCANCEL,
		3578	cb => sub {
		3579	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3580	},
		3581	);
		3582	$BDB_TRICKLE_WATCHER = Event->timer (
		3583	after => 5,
		3584	interval => 10,
		3585	hard => 1,
		3586	prio => 0,
		3587	data => WF_AUTOCANCEL,
		3588	cb => sub {
		3589	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3590	},
		3591	);
3297	}	3592	}
3298		3593
3299	{	3594	{
3300	IO::AIO::min_parallel 8;	3595	IO::AIO::min_parallel 8;
3301		3596

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.311 by root, Fri Jul 20 16:11:10 2007 UTC vs. Revision 1.373 by root, Sat Sep 15 15:58:06 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.311 by root, Fri Jul 20 16:11:10 2007 UTC vs.
Revision 1.373 by root, Sat Sep 15 15:58:06 2007 UTC