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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.313 by root, Sun Jul 22 14:17:58 2007 UTC vs.
Revision 1.368 by root, Wed Sep 12 11:18:25 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_CHECKPOINT_WATCHER;
		86	our $BDB_TRICKLE_WATCHER;
84	our $DB_ENV;	87	our $DB_ENV;
85		88
86	our %CFG;	89	our %CFG;
87		90
88	our $UPTIME; $UPTIME \|\|= time;	91	our $UPTIME; $UPTIME \|\|= time;
89	our $RUNTIME;	92	our $RUNTIME;
90		93
91	our %PLAYER; # all users	94	our (%PLAYER, %PLAYER_LOADING); # all users
92	our %MAP; # all maps	95	our (%MAP, %MAP_LOADING ); # all maps
93	our $LINK_MAP; # the special {link} map, which is always available	96	our $LINK_MAP; # the special {link} map, which is always available
94		97
95	# used to convert map paths into valid unix filenames by replacing / by ∕	98	# used to convert map paths into valid unix filenames by replacing / by ∕
96	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	99	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97		100
…		…
186	$msg .= "\n"	189	$msg .= "\n"
187	unless $msg =~ /\n$/;	190	unless $msg =~ /\n$/;
188		191
189	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	192	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190		193
191	utf8::encode $msg;
192	LOG llevError, $msg;	194	LOG llevError, $msg;
193	};	195	};
194	}	196	}
195		197
196	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	198	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
271	Wait until the given lock is available and then acquires it and returns	273	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,	274	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	275	for example when the coroutine gets canceled), the lock is automatically
274	returned.	276	returned.
275		277
		278	Locks are not recursive, locking from the same coro twice results in a
		279	deadlocked coro.
		280
276	Lock names should begin with a unique identifier (for example, cf::map::find	281	Lock names should begin with a unique identifier (for example, cf::map::find
277	uses map_find and cf::map::load uses map_load).	282	uses map_find and cf::map::load uses map_load).
278		283
279	=item $locked = cf::lock_active $string	284	=item $locked = cf::lock_active $string
280		285
281	Return true if the lock is currently active, i.e. somebody has locked it.	286	Return true if the lock is currently active, i.e. somebody has locked it.
282		287
283	=cut	288	=cut
284		289
285	our %LOCK;	290	our %LOCK;
		291	our %LOCKER;#d#
286		292
287	sub lock_wait($) {	293	sub lock_wait($) {
288	my ($key) = @_;	294	my ($key) = @_;
		295
		296	if ($LOCKER{$key} == $Coro::current) {#d#
		297	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		298	return;#d#
		299	}#d#
289		300
290	# wait for lock, if any	301	# wait for lock, if any
291	while ($LOCK{$key}) {	302	while ($LOCK{$key}) {
292	push @{ $LOCK{$key} }, $Coro::current;	303	push @{ $LOCK{$key} }, $Coro::current;
293	Coro::schedule;	304	Coro::schedule;
…		…
299		310
300	# wait, to be sure we are not locked	311	# wait, to be sure we are not locked
301	lock_wait $key;	312	lock_wait $key;
302		313
303	$LOCK{$key} = [];	314	$LOCK{$key} = [];
		315	$LOCKER{$key} = $Coro::current;#d#
304		316
305	Coro::guard {	317	Coro::guard {
		318	delete $LOCKER{$key};#d#
306	# wake up all waiters, to be on the safe side	319	# wake up all waiters, to be on the safe side
307	$_->ready for @{ delete $LOCK{$key} };	320	$_->ready for @{ delete $LOCK{$key} };
308	}	321	}
309	}	322	}
310		323
…		…
320	my $guard = Coro::guard {	333	my $guard = Coro::guard {
321	$TICK_WATCHER->start;	334	$TICK_WATCHER->start;
322	};	335	};
323	$TICK_WATCHER->stop;	336	$TICK_WATCHER->stop;
324	$guard	337	$guard
		338	}
		339
		340	=item cf::get_slot $time[, $priority[, $name]]
		341
		342	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		343	This call blocks and returns only when you have at least C<$time> seconds
		344	of cpu time till the next tick. The slot is only valid till the next cede.
		345
		346	The optional C<$name> can be used to identify the job to run. It might be
		347	used for statistical purposes and should identify the same time-class.
		348
		349	Useful for short background jobs.
		350
		351	=cut
		352
		353	our @SLOT_QUEUE;
		354	our $SLOT_QUEUE;
		355
		356	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		357	$SLOT_QUEUE = Coro::async {
		358	my $signal = new Coro::Signal;
		359
		360	while () {
		361	next_job:
		362	my $avail = cf::till_tick;
		363	if ($avail > 0.01) {
		364	for (0 .. $#SLOT_QUEUE) {
		365	if ($SLOT_QUEUE[$_][0] < $avail) {
		366	my $job = splice @SLOT_QUEUE, $_, 1, ();
		367	$job->[2]->send;
		368	Coro::cede;
		369	goto next_job;
		370	}
		371	}
		372	}
		373
		374	if (@SLOT_QUEUE) {
		375	# we do not use wait_For_tick() as it returns immediately when tick is inactive
		376	push @cf::WAIT_FOR_TICK, $signal;
		377	$signal->wait;
		378	} else {
		379	Coro::schedule;
		380	}
		381	}
		382	};
		383
		384	sub get_slot($;$$) {
		385	my ($time, $pri, $name) = @_;
		386
		387	$time = $TICK * .6 if $time > $TICK * .6;
		388	my $sig = new Coro::Signal;
		389
		390	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		391	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		392	$SLOT_QUEUE->ready;
		393	$sig->wait;
325	}	394	}
326		395
327	=item cf::async { BLOCK }	396	=item cf::async { BLOCK }
328		397
329	Currently the same as Coro::async_pool, meaning you cannot use	398	Currently the same as Coro::async_pool, meaning you cannot use
…		…
416	Coro::Storable. May, of course, block. Note that the executed sub may	485	Coro::Storable. May, of course, block. Note that the executed sub may
417	never block itself or use any form of Event handling.	486	never block itself or use any form of Event handling.
418		487
419	=cut	488	=cut
420		489
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(&@) {	490	sub fork_call(&@) {
431	my ($cb, @args) = @_;	491	my ($cb, @args) = @_;
432		492
433	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	493	# we seemingly have to make a local copy of the whole thing,
434	# or die "socketpair: $!";	494	# otherwise perl prematurely frees the stuff :/
435	pipe my $fh1, my $fh2	495	# TODO: investigate and fix (likely this will be rather laborious)
436	or die "pipe: $!";
437		496
438	if (my $pid = fork) {	497	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;	498	reset_signals;
452	local $SIG{__WARN__};	499	&$cb
453	local $SIG{__DIE__};	500	}, @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		501
460	eval {	502	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	}	503	}
473		504
474	=item $value = cf::db_get $family => $key	505	=item $value = cf::db_get $family => $key
475		506
476	Returns a single value from the environment database.	507	Returns a single value from the environment database.
…		…
478	=item cf::db_put $family => $key => $value	509	=item cf::db_put $family => $key => $value
479		510
480	Stores the given C<$value> in the family. It can currently store binary	511	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).	512	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
482		513
		514	=item $db = cf::db_table "name"
		515
		516	Create and/or open a new database table. The string must not be "db" and must be unique
		517	within each server.
		518
483	=cut	519	=cut
		520
		521	sub db_table($) {
		522	my ($name) = @_;
		523	my $db = BDB::db_create $DB_ENV;
		524
		525	eval {
		526	$db->set_flags (BDB::CHKSUM);
		527
		528	utf8::encode $name;
		529	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		530	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
		531	cf::cleanup "db_open(db): $!" if $!;
		532	};
		533	cf::cleanup "db_open(db): $@" if $@;
		534
		535	$db
		536	}
484		537
485	our $DB;	538	our $DB;
486		539
487	sub db_init {	540	sub db_init {
488	unless ($DB) {
489	$DB = BDB::db_create $DB_ENV;
490
491	cf::sync_job {	541	cf::sync_job {
492	eval {	542	$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	}	543	};
502	}	544	}
503		545
504	sub db_get($$) {	546	sub db_get($$) {
505	my $key = "$_[0]/$_[1]";	547	my $key = "$_[0]/$_[1]";
506		548
…		…
556	if (1) {	598	if (1) {
557	$md5 =	599	$md5 =
558	join "\x00",	600	join "\x00",
559	$processversion,	601	$processversion,
560	map {	602	map {
561	Coro::cede;	603	cf::cede_to_tick;
562	($src->[$_], Digest::MD5::md5_hex $data[$_])	604	($src->[$_], Digest::MD5::md5_hex $data[$_])
563	} 0.. $#$src;	605	} 0.. $#$src;
564		606
565		607
566	my $dbmd5 = db_get cache => "$id/md5";	608	my $dbmd5 = db_get cache => "$id/md5";
…		…
983	);	1025	);
984		1026
985	sub object_freezer_save {	1027	sub object_freezer_save {
986	my ($filename, $rdata, $objs) = @_;	1028	my ($filename, $rdata, $objs) = @_;
987		1029
		1030	my $guard = cf::lock_acquire "io";
		1031
988	sync_job {	1032	sync_job {
989	if (length $$rdata) {	1033	if (length $$rdata) {
		1034	utf8::decode (my $decname = $filename);
990	warn sprintf "saving %s (%d,%d)\n",	1035	warn sprintf "saving %s (%d,%d)\n",
991	$filename, length $$rdata, scalar @$objs;	1036	$decname, length $$rdata, scalar @$objs;
992		1037
993	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1038	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
994	chmod SAVE_MODE, $fh;	1039	chmod SAVE_MODE, $fh;
995	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1040	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
996	aio_fsync $fh if $cf::USE_FSYNC;	1041	aio_fsync $fh if $cf::USE_FSYNC;
…		…
1015	}	1060	}
1016	} else {	1061	} else {
1017	aio_unlink $filename;	1062	aio_unlink $filename;
1018	aio_unlink "$filename.pst";	1063	aio_unlink "$filename.pst";
1019	}	1064	}
1020	}	1065	};
		1066
		1067	undef $guard;
1021	}	1068	}
1022		1069
1023	sub object_freezer_as_string {	1070	sub object_freezer_as_string {
1024	my ($rdata, $objs) = @_;	1071	my ($rdata, $objs) = @_;
1025		1072
…		…
1030		1077
1031	sub object_thawer_load {	1078	sub object_thawer_load {
1032	my ($filename) = @_;	1079	my ($filename) = @_;
1033		1080
1034	my ($data, $av);	1081	my ($data, $av);
		1082
		1083	my $guard = cf::lock_acquire "io";
1035		1084
1036	(aio_load $filename, $data) >= 0	1085	(aio_load $filename, $data) >= 0
1037	or return;	1086	or return;
1038		1087
1039	unless (aio_stat "$filename.pst") {	1088	unless (aio_stat "$filename.pst") {
1040	(aio_load "$filename.pst", $av) >= 0	1089	(aio_load "$filename.pst", $av) >= 0
1041	or return;	1090	or return;
		1091
		1092	undef $guard;
1042	$av = eval { (Storable::thaw $av)->{objs} };	1093	$av = eval { (Storable::thaw $av)->{objs} };
1043	}	1094	}
1044		1095
		1096	utf8::decode (my $decname = $filename);
1045	warn sprintf "loading %s (%d)\n",	1097	warn sprintf "loading %s (%d,%d)\n",
1046	$filename, length $data, scalar @{$av \|\| []};	1098	$decname, length $data, scalar @{$av \|\| []};
		1099
1047	return ($data, $av);	1100	($data, $av)
1048	}	1101	}
1049		1102
1050	=head2 COMMAND CALLBACKS	1103	=head2 COMMAND CALLBACKS
1051		1104
1052	=over 4	1105	=over 4
…		…
1125	my ($pl, $buf) = @_;	1178	my ($pl, $buf) = @_;
1126		1179
1127	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1180	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1128		1181
1129	if (ref $msg) {	1182	if (ref $msg) {
		1183	my ($type, $reply, @payload) =
		1184	"ARRAY" eq ref $msg
		1185	? @$msg
		1186	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1187
		1188	my @reply;
		1189
1130	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1190	if (my $cb = $EXTCMD{$type}) {
1131	if (my %reply = $cb->($pl, $msg)) {	1191	@reply = $cb->($pl, @payload);
1132	$pl->ext_reply ($msg->{msgid}, %reply);
1133	}
1134	}	1192	}
		1193
		1194	$pl->ext_reply ($reply, @reply)
		1195	if $reply;
		1196
1135	} else {	1197	} else {
1136	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1198	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1137	}	1199	}
1138		1200
1139	cf::override;	1201	cf::override;
…		…
1229		1291
1230	=head3 cf::player	1292	=head3 cf::player
1231		1293
1232	=over 4	1294	=over 4
1233		1295
		1296	=item cf::player::num_playing
		1297
		1298	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1299
		1300	=cut
		1301
		1302	sub num_playing {
		1303	scalar grep
		1304	$_->ob->map
		1305	&& !$_->hidden
		1306	&& !$_->ob->flag (cf::FLAG_WIZ),
		1307	cf::player::list
		1308	}
		1309
1234	=item cf::player::find $login	1310	=item cf::player::find $login
1235		1311
1236	Returns the given player object, loading it if necessary (might block).	1312	Returns the given player object, loading it if necessary (might block).
1237		1313
1238	=cut	1314	=cut
…		…
1273	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1349	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1274	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1350	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1275	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1351	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1276	aio_unlink +(playerdir $login) . "/$login.pl";	1352	aio_unlink +(playerdir $login) . "/$login.pl";
1277		1353
1278	my $pl = load_pl path $login	1354	my $f = new_from_file cf::object::thawer path $login
1279	or return;	1355	or return;
		1356
		1357	$f->next;
		1358	my $pl = cf::player::load_pl $f
		1359	or return;
		1360	local $cf::PLAYER_LOADING{$login} = $pl;
		1361	$f->resolve_delayed_derefs;
1280	$cf::PLAYER{$login} = $pl	1362	$cf::PLAYER{$login} = $pl
1281	}	1363	}
1282	}	1364	}
1283	}	1365	}
1284		1366
…		…
1294		1376
1295	aio_mkdir playerdir $pl, 0770;	1377	aio_mkdir playerdir $pl, 0770;
1296	$pl->{last_save} = $cf::RUNTIME;	1378	$pl->{last_save} = $cf::RUNTIME;
1297		1379
1298	$pl->save_pl ($path);	1380	$pl->save_pl ($path);
1299	Coro::cede;	1381	cf::cede_to_tick;
1300	}	1382	}
1301		1383
1302	sub new($) {	1384	sub new($) {
1303	my ($login) = @_;	1385	my ($login) = @_;
1304		1386
…		…
1308	$self->{deny_save} = 1;	1390	$self->{deny_save} = 1;
1309		1391
1310	$cf::PLAYER{$login} = $self;	1392	$cf::PLAYER{$login} = $self;
1311		1393
1312	$self	1394	$self
		1395	}
		1396
		1397	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1398
		1399	=cut
		1400
		1401	sub send_msg {
		1402	my $ns = shift->ns
		1403	or return;
		1404	$ns->send_msg (@_);
1313	}	1405	}
1314		1406
1315	=item $pl->quit_character	1407	=item $pl->quit_character
1316		1408
1317	Nukes the player without looking back. If logged in, the connection will	1409	Nukes the player without looking back. If logged in, the connection will
…		…
1372	or return [];	1464	or return [];
1373		1465
1374	my @logins;	1466	my @logins;
1375		1467
1376	for my $login (@$dirs) {	1468	for my $login (@$dirs) {
		1469	my $path = path $login;
		1470
		1471	# a .pst is a dead give-away for a valid player
		1472	unless (-e "$path.pst") {
1377	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1473	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1378	aio_read $fh, 0, 512, my $buf, 0 or next;	1474	aio_read $fh, 0, 512, my $buf, 0 or next;
1379	$buf !~ /^password -------------$/m or next; # official not-valid tag	1475	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1476	}
1380		1477
1381	utf8::decode $login;	1478	utf8::decode $login;
1382	push @logins, $login;	1479	push @logins, $login;
1383	}	1480	}
1384		1481
…		…
1422	sub expand_cfpod {	1519	sub expand_cfpod {
1423	((my $self), (local $_)) = @_;	1520	((my $self), (local $_)) = @_;
1424		1521
1425	# escape & and <	1522	# escape & and <
1426	s/&/&/g;	1523	s/&/&/g;
1427	s/(?<![BIUGH])</</g;	1524	s/(?<![BIUGHT])</</g;
1428		1525
1429	# this is buggy, it needs to properly take care of nested <'s	1526	# this is buggy, it needs to properly take care of nested <'s
1430		1527
1431	1 while	1528	1 while
1432	# replace B<>, I<>, U<> etc.	1529	# replace B<>, I<>, U<> etc.
1433	s/B<([^\>]*)>/<b>$1<\/b>/	1530	s/B<([^\>]*)>/<b>$1<\/b>/
1434	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1531	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
1435	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1532	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1533	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1436	# replace G<male\|female> tags	1534	# replace G<male\|female> tags
1437	\|\| s{G<([^>\|])\\|([^>])>}{	1535	\|\| s{G<([^>\|])\\|([^>])>}{
1438	$self->gender ? $2 : $1	1536	$self->gender ? $2 : $1
1439	}ge	1537	}ge
1440	# replace H<hint text>	1538	# replace H<hint text>
…		…
1461	sub hintmode {	1559	sub hintmode {
1462	$_[0]{hintmode} = $_[1] if @_ > 1;	1560	$_[0]{hintmode} = $_[1] if @_ > 1;
1463	$_[0]{hintmode}	1561	$_[0]{hintmode}
1464	}	1562	}
1465		1563
1466	=item $player->ext_reply ($msgid, %msg)	1564	=item $player->ext_reply ($msgid, @msg)
1467		1565
1468	Sends an ext reply to the player.	1566	Sends an ext reply to the player.
1469		1567
1470	=cut	1568	=cut
1471		1569
1472	sub ext_reply($$%) {	1570	sub ext_reply($$@) {
1473	my ($self, $id, %msg) = @_;	1571	my ($self, $id, @msg) = @_;
1474		1572
1475	$msg{msgid} = $id;	1573	$self->ns->ext_reply ($id, @msg)
1476	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1477	}	1574	}
1478		1575
1479	=item $player->ext_event ($type, %msg)	1576	=item $player->ext_msg ($type, @msg)
1480		1577
1481	Sends an ext event to the client.	1578	Sends an ext event to the client.
1482		1579
1483	=cut	1580	=cut
1484		1581
1485	sub ext_event($$%) {	1582	sub ext_msg($$@) {
1486	my ($self, $type, %msg) = @_;	1583	my ($self, $type, @msg) = @_;
1487		1584
1488	$self->ns->ext_event ($type, %msg);	1585	$self->ns->ext_msg ($type, @msg);
1489	}	1586	}
1490		1587
1491	=head3 cf::region	1588	=head3 cf::region
1492		1589
1493	=over 4	1590	=over 4
…		…
1709		1806
1710	sub load_header_from($) {	1807	sub load_header_from($) {
1711	my ($self, $path) = @_;	1808	my ($self, $path) = @_;
1712		1809
1713	utf8::encode $path;	1810	utf8::encode $path;
1714	#aio_open $path, O_RDONLY, 0	1811	my $f = new_from_file cf::object::thawer $path
1715	# or return;
1716
1717	$self->_load_header ($path)
1718	or return;	1812	or return;
		1813
		1814	$self->_load_header ($f)
		1815	or return;
		1816
		1817	local $MAP_LOADING{$self->{path}} = $self;
		1818	$f->resolve_delayed_derefs;
1719		1819
1720	$self->{load_path} = $path;	1820	$self->{load_path} = $path;
1721		1821
1722	1	1822	1
1723	}	1823	}
…		…
1777	sub find {	1877	sub find {
1778	my ($path, $origin) = @_;	1878	my ($path, $origin) = @_;
1779		1879
1780	$path = normalise $path, $origin && $origin->path;	1880	$path = normalise $path, $origin && $origin->path;
1781		1881
		1882	cf::lock_wait "map_data:$path";#d#remove
1782	cf::lock_wait "map_find:$path";	1883	cf::lock_wait "map_find:$path";
1783		1884
1784	$cf::MAP{$path} \|\| do {	1885	$cf::MAP{$path} \|\| do {
1785	my $guard = cf::lock_acquire "map_find:$path";	1886	my $guard1 = cf::lock_acquire "map_find:$path";
		1887	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1888
1786	my $map = new_from_path cf::map $path	1889	my $map = new_from_path cf::map $path
1787	or return;	1890	or return;
1788		1891
1789	$map->{last_save} = $cf::RUNTIME;	1892	$map->{last_save} = $cf::RUNTIME;
1790		1893
…		…
1792	or return;	1895	or return;
1793		1896
1794	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1897	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1795	# doing this can freeze the server in a sync job, obviously	1898	# doing this can freeze the server in a sync job, obviously
1796	#$cf::WAIT_FOR_TICK->wait;	1899	#$cf::WAIT_FOR_TICK->wait;
		1900	undef $guard1;
		1901	undef $guard2;
1797	$map->reset;	1902	$map->reset;
1798	undef $guard;
1799	return find $path;	1903	return find $path;
1800	}	1904	}
1801		1905
1802	$cf::MAP{$path} = $map	1906	$cf::MAP{$path} = $map
1803	}	1907	}
…		…
1812	local $self->{deny_reset} = 1; # loading can take a long time	1916	local $self->{deny_reset} = 1; # loading can take a long time
1813		1917
1814	my $path = $self->{path};	1918	my $path = $self->{path};
1815		1919
1816	{	1920	{
1817	my $guard = cf::lock_acquire "map_load:$path";	1921	my $guard = cf::lock_acquire "map_data:$path";
1818		1922
		1923	return unless $self->valid;
1819	return if $self->in_memory != cf::MAP_SWAPPED;	1924	return unless $self->in_memory == cf::MAP_SWAPPED;
1820		1925
1821	$self->in_memory (cf::MAP_LOADING);	1926	$self->in_memory (cf::MAP_LOADING);
1822		1927
1823	$self->alloc;	1928	$self->alloc;
1824		1929
1825	$self->pre_load;	1930	$self->pre_load;
1826	Coro::cede;	1931	cf::cede_to_tick;
1827		1932
		1933	my $f = new_from_file cf::object::thawer $self->{load_path};
		1934	$f->skip_block;
1828	$self->_load_objects ($self->{load_path}, 1)	1935	$self->_load_objects ($f)
1829	or return;	1936	or return;
1830		1937
1831	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1938	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1832	if delete $self->{load_original};	1939	if delete $self->{load_original};
1833		1940
1834	if (my $uniq = $self->uniq_path) {	1941	if (my $uniq = $self->uniq_path) {
1835	utf8::encode $uniq;	1942	utf8::encode $uniq;
1836	if (aio_open $uniq, O_RDONLY, 0) {	1943	unless (aio_stat $uniq) {
		1944	if (my $f = new_from_file cf::object::thawer $uniq) {
1837	$self->clear_unique_items;	1945	$self->clear_unique_items;
1838	$self->_load_objects ($uniq, 0);	1946	$self->_load_objects ($f);
		1947	$f->resolve_delayed_derefs;
		1948	}
1839	}	1949	}
1840	}	1950	}
1841		1951
1842	Coro::cede;	1952	$f->resolve_delayed_derefs;
		1953
		1954	cf::cede_to_tick;
1843	# now do the right thing for maps	1955	# now do the right thing for maps
1844	$self->link_multipart_objects;	1956	$self->link_multipart_objects;
1845	$self->difficulty ($self->estimate_difficulty)	1957	$self->difficulty ($self->estimate_difficulty)
1846	unless $self->difficulty;	1958	unless $self->difficulty;
1847	Coro::cede;	1959	cf::cede_to_tick;
1848		1960
1849	unless ($self->{deny_activate}) {	1961	unless ($self->{deny_activate}) {
1850	$self->decay_objects;	1962	$self->decay_objects;
1851	$self->fix_auto_apply;	1963	$self->fix_auto_apply;
1852	$self->update_buttons;	1964	$self->update_buttons;
1853	Coro::cede;	1965	cf::cede_to_tick;
1854	$self->set_darkness_map;	1966	$self->set_darkness_map;
1855	Coro::cede;	1967	cf::cede_to_tick;
1856	$self->activate;	1968	$self->activate;
1857	}	1969	}
		1970
		1971	$self->{last_save} = $cf::RUNTIME;
		1972	$self->last_access ($cf::RUNTIME);
1858		1973
1859	$self->in_memory (cf::MAP_IN_MEMORY);	1974	$self->in_memory (cf::MAP_IN_MEMORY);
1860	}	1975	}
1861		1976
1862	$self->post_load;	1977	$self->post_load;
…		…
1873		1988
1874	$self	1989	$self
1875	}	1990	}
1876		1991
1877	# find and load all maps in the 3x3 area around a map	1992	# find and load all maps in the 3x3 area around a map
1878	sub load_diag {	1993	sub load_neighbours {
1879	my ($map) = @_;	1994	my ($map) = @_;
1880		1995
1881	my @diag; # diagonal neighbours	1996	my @neigh; # diagonal neighbours
1882		1997
1883	for (0 .. 3) {	1998	for (0 .. 3) {
1884	my $neigh = $map->tile_path ($_)	1999	my $neigh = $map->tile_path ($_)
1885	or next;	2000	or next;
1886	$neigh = find $neigh, $map	2001	$neigh = find $neigh, $map
1887	or next;	2002	or next;
1888	$neigh->load;	2003	$neigh->load;
1889		2004
		2005	push @neigh,
1890	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2006	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1891	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2007	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1892	}	2008	}
1893		2009
1894	for (@diag) {	2010	for (grep defined $_->[0], @neigh) {
		2011	my ($path, $origin) = @$_;
1895	my $neigh = find @$_	2012	my $neigh = find $path, $origin
1896	or next;	2013	or next;
1897	$neigh->load;	2014	$neigh->load;
1898	}	2015	}
1899	}	2016	}
1900		2017
…		…
1905	}	2022	}
1906		2023
1907	sub do_load_sync {	2024	sub do_load_sync {
1908	my ($map) = @_;	2025	my ($map) = @_;
1909		2026
		2027	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2028	if $Coro::current == $Coro::main;
		2029
1910	cf::sync_job { $map->load };	2030	cf::sync_job { $map->load };
1911	}	2031	}
1912		2032
1913	our %MAP_PREFETCH;	2033	our %MAP_PREFETCH;
1914	our $MAP_PREFETCHER = undef;	2034	our $MAP_PREFETCHER = undef;
1915		2035
1916	sub find_async {	2036	sub find_async {
1917	my ($path, $origin) = @_;	2037	my ($path, $origin, $load) = @_;
1918		2038
1919	$path = normalise $path, $origin && $origin->{path};	2039	$path = normalise $path, $origin && $origin->{path};
1920		2040
1921	if (my $map = $cf::MAP{$path}) {	2041	if (my $map = $cf::MAP{$path}) {
1922	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2042	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1923	}	2043	}
1924		2044
1925	undef $MAP_PREFETCH{$path};	2045	$MAP_PREFETCH{$path} \|= $load;
		2046
1926	$MAP_PREFETCHER \|\|= cf::async {	2047	$MAP_PREFETCHER \|\|= cf::async {
1927	while (%MAP_PREFETCH) {	2048	while (%MAP_PREFETCH) {
1928	for my $path (keys %MAP_PREFETCH) {	2049	while (my ($k, $v) = each %MAP_PREFETCH) {
1929	if (my $map = find $path) {	2050	if (my $map = find $k) {
1930	$map->load;	2051	$map->load if $v;
1931	}	2052	}
1932		2053
1933	delete $MAP_PREFETCH{$path};	2054	delete $MAP_PREFETCH{$k};
1934	}	2055	}
1935	}	2056	}
1936	undef $MAP_PREFETCHER;	2057	undef $MAP_PREFETCHER;
1937	};	2058	};
1938	$MAP_PREFETCHER->prio (6);	2059	$MAP_PREFETCHER->prio (6);
…		…
1941	}	2062	}
1942		2063
1943	sub save {	2064	sub save {
1944	my ($self) = @_;	2065	my ($self) = @_;
1945		2066
1946	my $lock = cf::lock_acquire "map_data:" . $self->path;	2067	my $lock = cf::lock_acquire "map_data:$self->{path}";
1947		2068
1948	$self->{last_save} = $cf::RUNTIME;	2069	$self->{last_save} = $cf::RUNTIME;
1949		2070
1950	return unless $self->dirty;	2071	return unless $self->dirty;
1951		2072
…		…
1974	my ($self) = @_;	2095	my ($self) = @_;
1975		2096
1976	# save first because save cedes	2097	# save first because save cedes
1977	$self->save;	2098	$self->save;
1978		2099
1979	my $lock = cf::lock_acquire "map_data:" . $self->path;	2100	my $lock = cf::lock_acquire "map_data:$self->{path}";
1980		2101
1981	return if $self->players;	2102	return if $self->players;
1982	return if $self->in_memory != cf::MAP_IN_MEMORY;	2103	return if $self->in_memory != cf::MAP_IN_MEMORY;
1983	return if $self->{deny_save};	2104	return if $self->{deny_save};
1984		2105
		2106	$self->in_memory (cf::MAP_SWAPPED);
		2107
		2108	$self->deactivate;
		2109	$_->clear_links_to ($self) for values %cf::MAP;
1985	$self->clear;	2110	$self->clear;
1986	$self->in_memory (cf::MAP_SWAPPED);
1987	}	2111	}
1988		2112
1989	sub reset_at {	2113	sub reset_at {
1990	my ($self) = @_;	2114	my ($self) = @_;
1991		2115
…		…
2023	if $uniq;	2147	if $uniq;
2024	}	2148	}
2025		2149
2026	delete $cf::MAP{$self->path};	2150	delete $cf::MAP{$self->path};
2027		2151
		2152	$self->deactivate;
		2153	$_->clear_links_to ($self) for values %cf::MAP;
2028	$self->clear;	2154	$self->clear;
2029
2030	$_->clear_links_to ($self) for values %cf::MAP;
2031		2155
2032	$self->unlink_save;	2156	$self->unlink_save;
2033	$self->destroy;	2157	$self->destroy;
2034	}	2158	}
2035		2159
2036	my $nuke_counter = "aaaa";	2160	my $nuke_counter = "aaaa";
2037		2161
2038	sub nuke {	2162	sub nuke {
2039	my ($self) = @_;	2163	my ($self) = @_;
2040		2164
		2165	{
		2166	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2167
2041	delete $cf::MAP{$self->path};	2168	delete $cf::MAP{$self->path};
2042		2169
2043	$self->unlink_save;	2170	$self->unlink_save;
2044		2171
2045	bless $self, "cf::map";	2172	bless $self, "cf::map";
2046	delete $self->{deny_reset};	2173	delete $self->{deny_reset};
2047	$self->{deny_save} = 1;	2174	$self->{deny_save} = 1;
2048	$self->reset_timeout (1);	2175	$self->reset_timeout (1);
2049	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2176	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2050		2177
2051	$cf::MAP{$self->path} = $self;	2178	$cf::MAP{$self->path} = $self;
		2179	}
2052		2180
2053	$self->reset; # polite request, might not happen	2181	$self->reset; # polite request, might not happen
2054	}	2182	}
2055		2183
2056	=item $maps = cf::map::tmp_maps	2184	=item $maps = cf::map::tmp_maps
…		…
2132		2260
2133	sub inv_recursive {	2261	sub inv_recursive {
2134	inv_recursive_ inv $_[0]	2262	inv_recursive_ inv $_[0]
2135	}	2263	}
2136		2264
		2265	=item $ref = $ob->ref
		2266
		2267	creates and returns a persistent reference to an objetc that can be stored as a string.
		2268
		2269	=item $ob = cf::object::deref ($refstring)
		2270
		2271	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2272	even if the object actually exists. May block.
		2273
		2274	=cut
		2275
		2276	sub deref {
		2277	my ($ref) = @_;
		2278
		2279	# temporary compatibility#TODO#remove
		2280	$ref =~ s{^<}{player/<};
		2281
		2282	if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
		2283	my ($uuid, $name) = ($1, $2);
		2284	my $pl = $cf::PLAYER_LOADING{$name} \|\| cf::player::find $name
		2285	or return;
		2286	$pl->ob->uuid eq $uuid
		2287	or return;
		2288
		2289	$pl->ob
		2290	} else {
		2291	warn "$ref: cannot resolve object reference\n";
		2292	undef
		2293	}
		2294	}
		2295
2137	package cf;	2296	package cf;
2138		2297
2139	=back	2298	=back
2140		2299
2141	=head3 cf::object::player	2300	=head3 cf::object::player
…		…
2163		2322
2164	} else {	2323	} else {
2165	my $pl = $self->contr;	2324	my $pl = $self->contr;
2166		2325
2167	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2326	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2168	my $diag = $pl->{npc_dialog};	2327	my $dialog = $pl->{npc_dialog};
2169	$diag->{pl}->ext_reply (	2328	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2170	$diag->{id},
2171	msgtype => "reply",
2172	msg => $diag->{pl}->expand_cfpod ($msg),
2173	add_topics => []
2174	);
2175		2329
2176	} else {	2330	} else {
2177	$msg = $npc->name . " says: $msg" if $npc;	2331	$msg = $npc->name . " says: $msg" if $npc;
2178	$self->message ($msg, $flags);	2332	$self->message ($msg, $flags);
2179	}	2333	}
2180	}	2334	}
		2335	}
		2336
		2337	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2338
		2339	=cut
		2340
		2341	sub cf::object::send_msg {
		2342	my $pl = shift->contr
		2343	or return;
		2344	$pl->send_msg (@_);
2181	}	2345	}
2182		2346
2183	=item $player_object->may ("access")	2347	=item $player_object->may ("access")
2184		2348
2185	Returns wether the given player is authorized to access resource "access"	2349	Returns wether the given player is authorized to access resource "access"
…		…
2264	# use -1 or undef as default coordinates, not 0, 0	2428	# use -1 or undef as default coordinates, not 0, 0
2265	($x, $y) = ($map->enter_x, $map->enter_y)	2429	($x, $y) = ($map->enter_x, $map->enter_y)
2266	if $x <=0 && $y <= 0;	2430	if $x <=0 && $y <= 0;
2267		2431
2268	$map->load;	2432	$map->load;
2269	$map->load_diag;	2433	$map->load_neighbours;
2270		2434
2271	return unless $self->contr->active;	2435	return unless $self->contr->active;
2272	$self->activate_recursive;	2436	$self->activate_recursive;
2273		2437
2274	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2438	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
…		…
2294	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2458	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2295		2459
2296	$self->enter_link;	2460	$self->enter_link;
2297		2461
2298	(async {	2462	(async {
		2463	# *tag paths override both path and x\|y
		2464	if ($path =~ /^\(.)$/) {
		2465	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2466	my $ob = $obs[rand @obs];
		2467
		2468	# see if we actually can go there
		2469	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2470	$ob = $obs[rand @obs];
		2471	}
		2472	# else put him there anyways for now #d#
		2473
		2474	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2475	}
		2476	}
		2477
2299	my $map = eval {	2478	my $map = eval {
2300	my $map = cf::map::find $path;	2479	my $map = cf::map::find $path;
2301		2480
2302	if ($map) {	2481	if ($map) {
2303	$map = $map->customise_for ($self);	2482	$map = $map->customise_for ($self);
…		…
2445	the message, with C<log> being the default. If C<$color> is negative, suppress	2624	the message, with C<log> being the default. If C<$color> is negative, suppress
2446	the message unless the client supports the msg packet.	2625	the message unless the client supports the msg packet.
2447		2626
2448	=cut	2627	=cut
2449		2628
		2629	our %CHANNEL = (
		2630	"c/identify" => {
		2631	id => "identify",
		2632	title => "Identify",
		2633	reply => undef,
		2634	tooltip => "Items recently identified",
		2635	},
		2636	"c/examine" => {
		2637	id => "examine",
		2638	title => "Examine",
		2639	reply => undef,
		2640	tooltip => "Signs and other items you examined",
		2641	},
		2642	);
		2643
2450	sub cf::client::send_msg {	2644	sub cf::client::send_msg {
2451	my ($self, $channel, $msg, $color, @extra) = @_;	2645	my ($self, $channel, $msg, $color, @extra) = @_;
2452		2646
2453	$msg = $self->pl->expand_cfpod ($msg);	2647	$msg = $self->pl->expand_cfpod ($msg);
2454		2648
2455	$color &= ~cf::NDI_UNIQUE; # just in case...	2649	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2650
		2651	# check predefined channels, for the benefit of C
		2652	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2456		2653
2457	if (ref $channel) {	2654	if (ref $channel) {
2458	# send meta info to client, if not yet sent	2655	# send meta info to client, if not yet sent
2459	unless (exists $self->{channel}{$channel->{id}}) {	2656	unless (exists $self->{channel}{$channel->{id}}) {
2460	$self->{channel}{$channel->{id}} = $channel;	2657	$self->{channel}{$channel->{id}} = $channel;
2461	$self->ext_event (channel_info => %$channel);	2658	$self->ext_msg (channel_info => $channel)
		2659	if $self->can_msg;
2462	}	2660	}
2463		2661
2464	$channel = $channel->{id};	2662	$channel = $channel->{id};
2465	}	2663	}
2466		2664
2467	return unless @extra \|\| length $msg;	2665	return unless @extra \|\| length $msg;
2468		2666
2469	if ($self->can_msg) {	2667	if ($self->can_msg) {
		2668	# default colour, mask it out
		2669	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
		2670	if $color & cf::NDI_DEF;
		2671
2470	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));	2672	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2673	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2471	} else {	2674	} else {
2472	# replace some tags by gcfclient-compatible ones
2473	for ($msg) {
2474	1 while
2475	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2476	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2477	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2478	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2479	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2480	}
2481
2482	if ($color >= 0) {	2675	if ($color >= 0) {
		2676	# replace some tags by gcfclient-compatible ones
		2677	for ($msg) {
		2678	1 while
		2679	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2680	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2681	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2682	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2683	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2684	}
		2685
		2686	$color &= cf::NDI_COLOR_MASK;
		2687
		2688	utf8::encode $msg;
		2689
2483	if (0 && $msg =~ /\[/) {	2690	if (0 && $msg =~ /\[/) {
		2691	# COMMAND/INFO
2484	$self->send_packet ("drawextinfo $color 4 0 $msg")	2692	$self->send_packet ("drawextinfo $color 10 8 $msg")
2485	} else {	2693	} else {
2486	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2694	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2487	$self->send_packet ("drawinfo $color $msg")	2695	$self->send_packet ("drawinfo $color $msg")
2488	}	2696	}
2489	}	2697	}
2490	}	2698	}
2491	}	2699	}
2492		2700
2493	=item $client->ext_event ($type, %msg)	2701	=item $client->ext_msg ($type, @msg)
2494		2702
2495	Sends an ext event to the client.	2703	Sends an ext event to the client.
2496		2704
2497	=cut	2705	=cut
2498		2706
2499	sub cf::client::ext_event($$%) {	2707	sub cf::client::ext_msg($$@) {
2500	my ($self, $type, %msg) = @_;	2708	my ($self, $type, @msg) = @_;
2501		2709
2502	return unless $self->extcmd;	2710	if ($self->extcmd == 2) {
2503		2711	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2712	} elsif ($self->extcmd == 1) { # TODO: remove
2504	$msg{msgtype} = "event_$type";	2713	push @msg, msgtype => "event_$type";
2505	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2714	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2715	}
		2716	}
		2717
		2718	=item $client->ext_reply ($msgid, @msg)
		2719
		2720	Sends an ext reply to the client.
		2721
		2722	=cut
		2723
		2724	sub cf::client::ext_reply($$@) {
		2725	my ($self, $id, @msg) = @_;
		2726
		2727	if ($self->extcmd == 2) {
		2728	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2729	} elsif ($self->extcmd == 1) {
		2730	#TODO: version 1, remove
		2731	unshift @msg, msgtype => "reply", msgid => $id;
		2732	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2733	}
2506	}	2734	}
2507		2735
2508	=item $success = $client->query ($flags, "text", \&cb)	2736	=item $success = $client->query ($flags, "text", \&cb)
2509		2737
2510	Queues a query to the client, calling the given callback with	2738	Queues a query to the client, calling the given callback with
…		…
2565	my ($ns, $buf) = @_;	2793	my ($ns, $buf) = @_;
2566		2794
2567	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2795	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2568		2796
2569	if (ref $msg) {	2797	if (ref $msg) {
		2798	my ($type, $reply, @payload) =
		2799	"ARRAY" eq ref $msg
		2800	? @$msg
		2801	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2802
		2803	my @reply;
		2804
2570	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2805	if (my $cb = $EXTICMD{$type}) {
2571	if (my %reply = $cb->($ns, $msg)) {	2806	@reply = $cb->($ns, @payload);
2572	$reply{msgid} = $msg->{msgid};
2573	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2574	}
2575	}	2807	}
		2808
		2809	$ns->ext_reply ($reply, @reply)
		2810	if $reply;
		2811
2576	} else {	2812	} else {
2577	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2813	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2578	}	2814	}
2579		2815
2580	cf::override;	2816	cf::override;
…		…
2627	our $safe = new Safe "safe";	2863	our $safe = new Safe "safe";
2628	our $safe_hole = new Safe::Hole;	2864	our $safe_hole = new Safe::Hole;
2629		2865
2630	$SIG{FPE} = 'IGNORE';	2866	$SIG{FPE} = 'IGNORE';
2631		2867
2632	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2868	$safe->permit_only (Opcode::opset qw(
		2869	:base_core :base_mem :base_orig :base_math
		2870	grepstart grepwhile mapstart mapwhile
		2871	sort time
		2872	));
2633		2873
2634	# here we export the classes and methods available to script code	2874	# here we export the classes and methods available to script code
2635		2875
2636	=pod	2876	=pod
2637		2877
2638	The following functions and methods are available within a safe environment:	2878	The following functions and methods are available within a safe environment:
2639		2879
2640	cf::object	2880	cf::object
2641	contr pay_amount pay_player map x y force_find force_add	2881	contr pay_amount pay_player map x y force_find force_add
2642	insert remove	2882	insert remove name archname title slaying race decrease_ob_nr
2643		2883
2644	cf::object::player	2884	cf::object::player
2645	player	2885	player
2646		2886
2647	cf::player	2887	cf::player
…		…
2652		2892
2653	=cut	2893	=cut
2654		2894
2655	for (	2895	for (
2656	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	2896	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2897	insert remove inv name archname title slaying race
2657	insert remove)],	2898	decrease_ob_nr)],
2658	["cf::object::player" => qw(player)],	2899	["cf::object::player" => qw(player)],
2659	["cf::player" => qw(peaceful)],	2900	["cf::player" => qw(peaceful)],
2660	["cf::map" => qw(trigger)],	2901	["cf::map" => qw(trigger)],
2661	) {	2902	) {
2662	no strict 'refs';	2903	no strict 'refs';
…		…
2738	# the server's init and main functions	2979	# the server's init and main functions
2739		2980
2740	sub load_facedata($) {	2981	sub load_facedata($) {
2741	my ($path) = @_;	2982	my ($path) = @_;
2742		2983
		2984	# HACK to clear player env face cache, we need some signal framework
		2985	# for this (global event?)
		2986	%ext::player_env::MUSIC_FACE_CACHE = ();
		2987
		2988	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		2989
2743	warn "loading facedata from $path\n";	2990	warn "loading facedata from $path\n";
2744		2991
2745	my $facedata;	2992	my $facedata;
2746	0 < aio_load $path, $facedata	2993	0 < aio_load $path, $facedata
2747	or die "$path: $!";	2994	or die "$path: $!";
2748		2995
2749	$facedata = Coro::Storable::thaw $facedata;	2996	$facedata = Coro::Storable::thaw $facedata;
2750		2997
2751	$facedata->{version} == 2	2998	$facedata->{version} == 2
2752	or cf::cleanup "$path: version mismatch, cannot proceed.";	2999	or cf::cleanup "$path: version mismatch, cannot proceed.";
		3000
		3001	# patch in the exptable
		3002	$facedata->{resource}{"res/exp_table"} = {
		3003	type => FT_RSRC,
		3004	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3005	};
		3006	cf::cede_to_tick;
2753		3007
2754	{	3008	{
2755	my $faces = $facedata->{faceinfo};	3009	my $faces = $facedata->{faceinfo};
2756		3010
2757	while (my ($face, $info) = each %$faces) {	3011	while (my ($face, $info) = each %$faces) {
2758	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3012	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2759	cf::face::set_visibility $idx, $info->{visibility};	3013	cf::face::set_visibility $idx, $info->{visibility};
2760	cf::face::set_magicmap $idx, $info->{magicmap};	3014	cf::face::set_magicmap $idx, $info->{magicmap};
2761	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3015	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2762	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3016	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2763		3017
2764	cf::cede_to_tick;	3018	cf::cede_to_tick;
2765	}	3019	}
2766		3020
2767	while (my ($face, $info) = each %$faces) {	3021	while (my ($face, $info) = each %$faces) {
…		…
2792		3046
2793	{	3047	{
2794	# TODO: for gcfclient pleasure, we should give resources	3048	# TODO: for gcfclient pleasure, we should give resources
2795	# that gcfclient doesn't grok a >10000 face index.	3049	# that gcfclient doesn't grok a >10000 face index.
2796	my $res = $facedata->{resource};	3050	my $res = $facedata->{resource};
2797	my $enc = JSON::XS->new->utf8->canonical;	3051
		3052	my $soundconf = delete $res->{"res/sound.conf"};
2798		3053
2799	while (my ($name, $info) = each %$res) {	3054	while (my ($name, $info) = each %$res) {
2800	my $meta = $enc->encode ({
2801	name => $name,
2802	type => $info->{type},
2803	copyright => $info->{copyright}, #TODO#
2804	});
2805
2806	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3055	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		3056	my $data;
2807		3057
2808	if ($name =~ /\.jpg$/) {	3058	if ($info->{type} & 1) {
2809	cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack	3059	# prepend meta info
2810	cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack	3060
		3061	my $meta = $enc->encode ({
		3062	name => $name,
		3063	%{ $info->{meta} \|\| {} },
		3064	});
		3065
		3066	$data = pack "(w/a)", $meta, $info->{data};
2811	} else {	3067	} else {
2812	my $data = pack "(w/a)", $meta, $info->{data};	3068	$data = $info->{data};
2813	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2814
2815	cf::face::set_type $idx, 1;
2816	cf::face::set_data $idx, 0, $data, $chk;
2817	}	3069	}
2818		3070
		3071	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3072	cf::face::set_type $idx, $info->{type};
		3073
2819	cf::cede_to_tick;	3074	cf::cede_to_tick;
2820	}	3075	}
		3076
		3077	if ($soundconf) {
		3078	$soundconf = $enc->decode (delete $soundconf->{data});
		3079
		3080	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3081	my $sound = $soundconf->{compat}[$_]
		3082	or next;
		3083
		3084	my $face = cf::face::find "sound/$sound->[1]";
		3085	cf::sound::set $sound->[0] => $face;
		3086	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3087	}
		3088
		3089	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3090	my $face = cf::face::find "sound/$v";
		3091	cf::sound::set $k => $face;
		3092	}
		3093	}
2821	}	3094	}
2822		3095
2823	1	3096	1
2824	}	3097	}
2825		3098
		3099	register_exticmd fx_want => sub {
		3100	my ($ns, $want) = @_;
		3101
		3102	while (my ($k, $v) = each %$want) {
		3103	$ns->fx_want ($k, $v);
		3104	}
		3105	};
		3106
2826	sub reload_regions {	3107	sub reload_regions {
		3108	# HACK to clear player env face cache, we need some signal framework
		3109	# for this (global event?)
		3110	%ext::player_env::MUSIC_FACE_CACHE = ();
		3111
2827	load_resource_file "$MAPDIR/regions"	3112	load_resource_file "$MAPDIR/regions"
2828	or die "unable to load regions file\n";	3113	or die "unable to load regions file\n";
2829		3114
2830	for (cf::region::list) {	3115	for (cf::region::list) {
2831	$_->{match} = qr/$_->{match}/	3116	$_->{match} = qr/$_->{match}/
…		…
2867		3152
2868	sub init {	3153	sub init {
2869	reload_resources;	3154	reload_resources;
2870	}	3155	}
2871		3156
2872	sub cfg_load {	3157	sub reload_config {
2873	open my $fh, "<:utf8", "$CONFDIR/config"	3158	open my $fh, "<:utf8", "$CONFDIR/config"
2874	or return;	3159	or return;
2875		3160
2876	local $/;	3161	local $/;
2877	*CFG = YAML::Syck::Load <$fh>;	3162	*CFG = YAML::Syck::Load <$fh>;
…		…
2897	(async {	3182	(async {
2898	Event::one_event;	3183	Event::one_event;
2899	})->prio (Coro::PRIO_MAX);	3184	})->prio (Coro::PRIO_MAX);
2900	};	3185	};
2901		3186
2902	cfg_load;	3187	reload_config;
2903	db_init;	3188	db_init;
2904	load_extensions;	3189	load_extensions;
2905		3190
2906	$TICK_WATCHER->start;	3191	$TICK_WATCHER->start;
2907	Event::loop;	3192	Event::loop;
…		…
3100	warn "reloading cf.pm";	3385	warn "reloading cf.pm";
3101	require cf;	3386	require cf;
3102	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3387	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3103		3388
3104	warn "loading config and database again";	3389	warn "loading config and database again";
3105	cf::cfg_load;	3390	cf::reload_config;
3106		3391
3107	warn "loading extensions";	3392	warn "loading extensions";
3108	cf::load_extensions;	3393	cf::load_extensions;
3109		3394
3110	warn "reattaching attachments to objects/players";	3395	warn "reattaching attachments to objects/players";
…		…
3175	my $signal = new Coro::Signal;	3460	my $signal = new Coro::Signal;
3176	push @WAIT_FOR_TICK_BEGIN, $signal;	3461	push @WAIT_FOR_TICK_BEGIN, $signal;
3177	$signal->wait;	3462	$signal->wait;
3178	}	3463	}
3179		3464
3180	my $min = 1e6;#d#	3465	our $stat_fh;
3181	my $avg = 10;	3466	sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND \| Fcntl::O_CREAT \| Fcntl::O_WRONLY, 0600;#d#
		3467
3182	$TICK_WATCHER = Event->timer (	3468	$TICK_WATCHER = Event->timer (
3183	reentrant => 0,	3469	reentrant => 0,
3184	parked => 1,	3470	parked => 1,
3185	prio => 0,	3471	prio => 0,
3186	at => $NEXT_TICK \|\| $TICK,	3472	at => $NEXT_TICK \|\| $TICK,
…		…
3190	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3476	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3191	unless ++$bug_warning > 10;	3477	unless ++$bug_warning > 10;
3192	return;	3478	return;
3193	}	3479	}
3194		3480
		3481	my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
		3482
3195	$NOW = $tick_start = Event::time;	3483	$NOW = $tick_start = Event::time;
3196		3484
3197	cf::server_tick; # one server iteration	3485	cf::server_tick; # one server iteration
3198
3199	0 && sync_job {#d#
3200	for(1..10) {
3201	my $t = Event::time;
3202	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3203	or die;
3204
3205	$map->width (50);
3206	$map->height (50);
3207	$map->alloc;
3208	$map->_load_objects ("/tmp/x.map", 1);
3209	my $t = Event::time - $t;
3210
3211	#next unless $t < 0.0013;#d#
3212	if ($t < $min) {
3213	$min = $t;
3214	}
3215	$avg = $avg * 0.99 + $t * 0.01;
3216	}
3217	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3218	exit 0;
3219	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3220	};
3221		3486
3222	$RUNTIME += $TICK;	3487	$RUNTIME += $TICK;
3223	$NEXT_TICK += $TICK;	3488	$NEXT_TICK += $TICK;
3224		3489
3225	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3490	if ($NOW >= $NEXT_RUNTIME_WRITE) {
…		…
3251	$LOAD = ($NOW - $tick_start) / $TICK;	3516	$LOAD = ($NOW - $tick_start) / $TICK;
3252	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3517	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3253		3518
3254	_post_tick;	3519	_post_tick;
3255		3520
3256		3521	# gather some statistics#d#
		3522	$stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d#
		3523	IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d#
3257	},	3524	},
3258	);	3525	);
3259		3526
3260	{	3527	{
		3528	BDB::min_parallel 8;
3261	BDB::max_poll_time $TICK * 0.1;	3529	BDB::max_poll_time $TICK * 0.1;
3262	$BDB_POLL_WATCHER = Event->io (	3530	$BDB_POLL_WATCHER = Event->io (
3263	reentrant => 0,	3531	reentrant => 0,
3264	fd => BDB::poll_fileno,	3532	fd => BDB::poll_fileno,
3265	poll => 'r',	3533	poll => 'r',
3266	prio => 0,	3534	prio => 0,
3267	data => WF_AUTOCANCEL,	3535	data => WF_AUTOCANCEL,
3268	cb => \&BDB::poll_cb,	3536	cb => \&BDB::poll_cb,
3269	);	3537	);
3270	BDB::min_parallel 8;
3271		3538
3272	BDB::set_sync_prepare {	3539	BDB::set_sync_prepare {
3273	my $status;	3540	my $status;
3274	my $current = $Coro::current;	3541	my $current = $Coro::current;
3275	(	3542	(
…		…
3296	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3563	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3297	0666;	3564	0666;
3298		3565
3299	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3566	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3300		3567
3301	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);	3568	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC
		3569	\| BDB::LOG_AUTOREMOVE, 1);
3302	$DB_ENV->set_lk_detect;	3570	$DB_ENV->set_lk_detect;
3303	};	3571	};
3304		3572
3305	cf::cleanup "db_env_open(db): $@" if $@;	3573	cf::cleanup "db_env_open(db): $@" if $@;
3306	};	3574	};
3307	}	3575	}
		3576
		3577	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3578	after => 11,
		3579	interval => 60,
		3580	hard => 1,
		3581	prio => 0,
		3582	data => WF_AUTOCANCEL,
		3583	cb => sub {
		3584	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3585	},
		3586	);
		3587	$BDB_TRICKLE_WATCHER = Event->timer (
		3588	after => 5,
		3589	interval => 10,
		3590	hard => 1,
		3591	prio => 0,
		3592	data => WF_AUTOCANCEL,
		3593	cb => sub {
		3594	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3595	},
		3596	);
3308	}	3597	}
3309		3598
3310	{	3599	{
3311	IO::AIO::min_parallel 8;	3600	IO::AIO::min_parallel 8;
3312		3601

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.313 by root, Sun Jul 22 14:17:58 2007 UTC vs. Revision 1.368 by root, Wed Sep 12 11:18:25 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.313 by root, Sun Jul 22 14:17:58 2007 UTC vs.
Revision 1.368 by root, Wed Sep 12 11:18:25 2007 UTC