ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.315 by root, Mon Jul 23 17:53:55 2007 UTC vs.
Revision 1.393 by root, Fri Oct 26 04:47:00 2007 UTC

…		…
4	use strict;	4	use strict;
5		5
6	use Symbol;	6	use Symbol;
7	use List::Util;	7	use List::Util;
8	use Socket;	8	use Socket;
9	use Storable;
10	use Event;	9	use Event;
11	use Opcode;	10	use Opcode;
12	use Safe;	11	use Safe;
13	use Safe::Hole;	12	use Safe::Hole;
		13	use Storable ();
14		14
15	use Coro 3.61 ();	15	use Coro 4.1 ();
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 ();
31	use IO::AIO 2.32 ();	32	use IO::AIO 2.51 ();
32	use Time::HiRes;	33	use Time::HiRes;
33	use Compress::LZF;	34	use Compress::LZF;
34	use Digest::MD5 ();	35	use Digest::MD5 ();
35		36
36	# configure various modules to our taste	37	# configure various modules to our taste
…		…
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
…		…
340	our @SLOT_QUEUE;	354	our @SLOT_QUEUE;
341	our $SLOT_QUEUE;	355	our $SLOT_QUEUE;
342		356
343	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	357	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344	$SLOT_QUEUE = Coro::async {	358	$SLOT_QUEUE = Coro::async {
		359	$Coro::current->desc ("timeslot manager");
		360
345	my $signal = new Coro::Signal;	361	my $signal = new Coro::Signal;
346		362
347	while () {	363	while () {
348	next_job:	364	next_job:
349	my $avail = cf::till_tick;	365	my $avail = cf::till_tick;
…		…
357	}	373	}
358	}	374	}
359	}	375	}
360		376
361	if (@SLOT_QUEUE) {	377	if (@SLOT_QUEUE) {
362	# we do not use wait_For_tick() as it returns immediately when tick is inactive	378	# we do not use wait_for_tick() as it returns immediately when tick is inactive
363	push @cf::WAIT_FOR_TICK, $signal;	379	push @cf::WAIT_FOR_TICK, $signal;
364	$signal->wait;	380	$signal->wait;
365	} else {	381	} else {
366	Coro::schedule;	382	Coro::schedule;
367	}	383	}
…		…
411	my $time = Event::time;	427	my $time = Event::time;
412		428
413	# this is the main coro, too bad, we have to block	429	# this is the main coro, too bad, we have to block
414	# till the operation succeeds, freezing the server :/	430	# till the operation succeeds, freezing the server :/
415		431
		432	LOG llevError, Carp::longmess "sync job";#d#
		433
416	# TODO: use suspend/resume instead	434	# TODO: use suspend/resume instead
417	# (but this is cancel-safe)	435	# (but this is cancel-safe)
418	my $freeze_guard = freeze_mainloop;	436	my $freeze_guard = freeze_mainloop;
419		437
420	my $busy = 1;	438	my $busy = 1;
421	my @res;	439	my @res;
422		440
423	(async {	441	(async {
		442	$Coro::current->desc ("sync job coro");
424	@res = eval { $job->() };	443	@res = eval { $job->() };
425	warn $@ if $@;	444	warn $@ if $@;
426	undef $busy;	445	undef $busy;
427	})->prio (Coro::PRIO_MAX);	446	})->prio (Coro::PRIO_MAX);
428		447
429	while ($busy) {	448	while ($busy) {
		449	if (Coro::nready) {
		450	Coro::cede_notself;
		451	} else {
430	Coro::cede or Event::one_event;	452	Event::one_event;
		453	}
431	}	454	}
432		455
433	$time = Event::time - $time;	456	$time = Event::time - $time;
434		457
435	LOG llevError | logBacktrace, Carp::longmess "long sync job"	458	LOG llevError | logBacktrace, Carp::longmess "long sync job"
…		…
472	Coro::Storable. May, of course, block. Note that the executed sub may	495	Coro::Storable. May, of course, block. Note that the executed sub may
473	never block itself or use any form of Event handling.	496	never block itself or use any form of Event handling.
474		497
475	=cut	498	=cut
476		499
477	sub _store_scalar {
478	open my $fh, ">", \my $buf
479	or die "fork_call: cannot open fh-to-buf in child : $!";
480	Storable::store_fd $_[0], $fh;
481	close $fh;
482
483	$buf
484	}
485
486	sub fork_call(&@) {	500	sub fork_call(&@) {
487	my ($cb, @args) = @_;	501	my ($cb, @args) = @_;
488		502
489	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	503	# we seemingly have to make a local copy of the whole thing,
490	# or die "socketpair: $!";	504	# otherwise perl prematurely frees the stuff :/
491	pipe my $fh1, my $fh2	505	# TODO: investigate and fix (likely this will be rather laborious)
492	or die "pipe: $!";
493		506
494	if (my $pid = fork) {	507	my @res = Coro::Util::fork_eval {
495	close $fh2;
496
497	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498	warn "pst<$res>" unless $res =~ /^pst/;
499	$res = Coro::Storable::thaw $res;
500
501	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503	Carp::confess $$res unless "ARRAY" eq ref $res;
504
505	return wantarray ? @$res : $res->[-1];
506	} else {
507	reset_signals;	508	reset_signals;
508	local $SIG{__WARN__};	509	&$cb
509	local $SIG{__DIE__};	510	}, @args;
510	# just in case, this hack effectively disables event
511	# in the child. cleaner and slower would be canceling all watchers,
512	# but this works for the time being.
513	local $Coro::idle;
514	$Coro::current->prio (Coro::PRIO_MAX);
515		511
516	eval {	512	wantarray ? @res : $res[-1]
517	close $fh1;
518
519	my @res = eval { $cb->(@args) };
520
521	syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522	close $fh2;
523	};
524
525	warn $@ if $@;
526	_exit 0;
527	}
528	}	513	}
529		514
530	=item $value = cf::db_get $family => $key	515	=item $value = cf::db_get $family => $key
531		516
532	Returns a single value from the environment database.	517	Returns a single value from the environment database.
…		…
534	=item cf::db_put $family => $key => $value	519	=item cf::db_put $family => $key => $value
535		520
536	Stores the given C<$value> in the family. It can currently store binary	521	Stores the given C<$value> in the family. It can currently store binary
537	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).	522	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538		523
		524	=item $db = cf::db_table "name"
		525
		526	Create and/or open a new database table. The string must not be "db" and must be unique
		527	within each server.
		528
539	=cut	529	=cut
		530
		531	sub db_table($) {
		532	my ($name) = @_;
		533	my $db = BDB::db_create $DB_ENV;
		534
		535	eval {
		536	$db->set_flags (BDB::CHKSUM);
		537
		538	utf8::encode $name;
		539	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		540	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		541	cf::cleanup "db_open(db): $!" if $!;
		542	};
		543	cf::cleanup "db_open(db): $@" if $@;
		544
		545	$db
		546	}
540		547
541	our $DB;	548	our $DB;
542		549
543	sub db_init {	550	sub db_init {
544	unless ($DB) {
545	$DB = BDB::db_create $DB_ENV;
546
547	cf::sync_job {	551	cf::sync_job {
548	eval {	552	$DB ||= db_table "db";
549	$DB->set_flags (BDB::CHKSUM);
550
551	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553	cf::cleanup "db_open(db): $!" if $!;
554	};
555	cf::cleanup "db_open(db): $@" if $@;
556	};
557	}	553	};
558	}	554	}
559		555
560	sub db_get($$) {	556	sub db_get($$) {
561	my $key = "$_[0]/$_[1]";	557	my $key = "$_[0]/$_[1]";
562		558
…		…
612	if (1) {	608	if (1) {
613	$md5 =	609	$md5 =
614	join "\x00",	610	join "\x00",
615	$processversion,	611	$processversion,
616	map {	612	map {
617	Coro::cede;	613	cf::cede_to_tick;
618	($src->[$_], Digest::MD5::md5_hex $data[$_])	614	($src->[$_], Digest::MD5::md5_hex $data[$_])
619	} 0.. $#$src;	615	} 0.. $#$src;
620		616
621		617
622	my $dbmd5 = db_get cache => "$id/md5";	618	my $dbmd5 = db_get cache => "$id/md5";
…		…
974		970
975	=cut	971	=cut
976		972
977	#############################################################################	973	#############################################################################
978	# object support	974	# object support
979	#
980		975
		976	sub _object_equal($$);
		977	sub _object_equal($$) {
		978	my ($a, $b) = @_;
		979
		980	return 0 unless (ref $a) eq (ref $b);
		981
		982	if ("HASH" eq ref $a) {
		983	my @ka = keys %$a;
		984	my @kb = keys %$b;
		985
		986	return 0 if @ka != @kb;
		987
		988	for (0 .. $#ka) {
		989	return 0 unless $ka[$_] eq $kb[$_];
		990	return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
		991	}
		992
		993	} elsif ("ARRAY" eq ref $a) {
		994
		995	return 0 if @$a != @$b;
		996
		997	for (0 .. $#$a) {
		998	return 0 unless _object_equal $a->[$_], $b->[$_];
		999	}
		1000
		1001	} elsif ($a ne $b) {
		1002	return 0;
		1003	}
		1004
		1005	1
		1006	}
		1007
		1008	our $SLOW_MERGES;#d#
981	sub _can_merge {	1009	sub _can_merge {
982	my ($ob1, $ob2) = @_;	1010	my ($ob1, $ob2) = @_;
983		1011
984	local $Storable::canonical = 1;	1012	++$SLOW_MERGES;#d#
985	my $fob1 = Storable::freeze $ob1;
986	my $fob2 = Storable::freeze $ob2;
987		1013
988	$fob1 eq $fob2	1014	# we do the slow way here
		1015	return _object_equal $ob1, $ob2
989	}	1016	}
990		1017
991	sub reattach {	1018	sub reattach {
992	# basically do the same as instantiate, without calling instantiate	1019	# basically do the same as instantiate, without calling instantiate
993	my ($obj) = @_;	1020	my ($obj) = @_;
…		…
1041	sub object_freezer_save {	1068	sub object_freezer_save {
1042	my ($filename, $rdata, $objs) = @_;	1069	my ($filename, $rdata, $objs) = @_;
1043		1070
1044	sync_job {	1071	sync_job {
1045	if (length $$rdata) {	1072	if (length $$rdata) {
		1073	utf8::decode (my $decname = $filename);
1046	warn sprintf "saving %s (%d,%d)\n",	1074	warn sprintf "saving %s (%d,%d)\n",
1047	$filename, length $$rdata, scalar @$objs;	1075	$decname, length $$rdata, scalar @$objs;
1048		1076
1049	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1077	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050	chmod SAVE_MODE, $fh;	1078	chmod SAVE_MODE, $fh;
1051	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1079	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052	aio_fsync $fh if $cf::USE_FSYNC;	1080	aio_fsync $fh if $cf::USE_FSYNC;
1053	close $fh;	1081	close $fh;
1054		1082
1055	if (@$objs) {	1083	if (@$objs) {
1056	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1084	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1057	chmod SAVE_MODE, $fh;	1085	chmod SAVE_MODE, $fh;
1058	my $data = Storable::nfreeze { version => 1, objs => $objs };	1086	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059	aio_write $fh, 0, (length $data), $data, 0;	1087	aio_write $fh, 0, (length $data), $data, 0;
1060	aio_fsync $fh if $cf::USE_FSYNC;	1088	aio_fsync $fh if $cf::USE_FSYNC;
1061	close $fh;	1089	close $fh;
1062	aio_rename "$filename.pst~", "$filename.pst";	1090	aio_rename "$filename.pst~", "$filename.pst";
1063	}	1091	}
…		…
1071	}	1099	}
1072	} else {	1100	} else {
1073	aio_unlink $filename;	1101	aio_unlink $filename;
1074	aio_unlink "$filename.pst";	1102	aio_unlink "$filename.pst";
1075	}	1103	}
1076	}	1104	};
1077	}	1105	}
1078		1106
1079	sub object_freezer_as_string {	1107	sub object_freezer_as_string {
1080	my ($rdata, $objs) = @_;	1108	my ($rdata, $objs) = @_;
1081		1109
…		…
1093	or return;	1121	or return;
1094		1122
1095	unless (aio_stat "$filename.pst") {	1123	unless (aio_stat "$filename.pst") {
1096	(aio_load "$filename.pst", $av) >= 0	1124	(aio_load "$filename.pst", $av) >= 0
1097	or return;	1125	or return;
		1126
1098	$av = eval { (Storable::thaw $av)->{objs} };	1127	my $st = eval { Coro::Storable::thaw $av };
		1128	$av = $st->{objs};
1099	}	1129	}
1100		1130
		1131	utf8::decode (my $decname = $filename);
1101	warn sprintf "loading %s (%d)\n",	1132	warn sprintf "loading %s (%d,%d)\n",
1102	$filename, length $data, scalar @{$av || []};	1133	$decname, length $data, scalar @{$av || []};
		1134
1103	return ($data, $av);	1135	($data, $av)
1104	}	1136	}
1105		1137
1106	=head2 COMMAND CALLBACKS	1138	=head2 COMMAND CALLBACKS
1107		1139
1108	=over 4	1140	=over 4
…		…
1181	my ($pl, $buf) = @_;	1213	my ($pl, $buf) = @_;
1182		1214
1183	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1215	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1184		1216
1185	if (ref $msg) {	1217	if (ref $msg) {
		1218	my ($type, $reply, @payload) =
		1219	"ARRAY" eq ref $msg
		1220	? @$msg
		1221	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1222
		1223	my @reply;
		1224
1186	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1225	if (my $cb = $EXTCMD{$type}) {
1187	if (my %reply = $cb->($pl, $msg)) {	1226	@reply = $cb->($pl, @payload);
1188	$pl->ext_reply ($msg->{msgid}, %reply);
1189	}
1190	}	1227	}
		1228
		1229	$pl->ext_reply ($reply, @reply)
		1230	if $reply;
		1231
1191	} else {	1232	} else {
1192	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1233	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1193	}	1234	}
1194		1235
1195	cf::override;	1236	cf::override;
…		…
1285		1326
1286	=head3 cf::player	1327	=head3 cf::player
1287		1328
1288	=over 4	1329	=over 4
1289		1330
		1331	=item cf::player::num_playing
		1332
		1333	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1334
		1335	=cut
		1336
		1337	sub num_playing {
		1338	scalar grep
		1339	$_->ob->map
		1340	&& !$_->hidden
		1341	&& !$_->ob->flag (cf::FLAG_WIZ),
		1342	cf::player::list
		1343	}
		1344
1290	=item cf::player::find $login	1345	=item cf::player::find $login
1291		1346
1292	Returns the given player object, loading it if necessary (might block).	1347	Returns the given player object, loading it if necessary (might block).
1293		1348
1294	=cut	1349	=cut
…		…
1329	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1384	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1330	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1385	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1331	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1386	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1332	aio_unlink +(playerdir $login) . "/$login.pl";	1387	aio_unlink +(playerdir $login) . "/$login.pl";
1333		1388
1334	my $pl = load_pl path $login	1389	my $f = new_from_file cf::object::thawer path $login
1335	or return;	1390	or return;
		1391
		1392	my $pl = cf::player::load_pl $f
		1393	or return;
		1394	local $cf::PLAYER_LOADING{$login} = $pl;
		1395	$f->resolve_delayed_derefs;
1336	$cf::PLAYER{$login} = $pl	1396	$cf::PLAYER{$login} = $pl
1337	}	1397	}
1338	}	1398	}
1339	}	1399	}
1340		1400
…		…
1350		1410
1351	aio_mkdir playerdir $pl, 0770;	1411	aio_mkdir playerdir $pl, 0770;
1352	$pl->{last_save} = $cf::RUNTIME;	1412	$pl->{last_save} = $cf::RUNTIME;
1353		1413
1354	$pl->save_pl ($path);	1414	$pl->save_pl ($path);
1355	Coro::cede;	1415	cf::cede_to_tick;
1356	}	1416	}
1357		1417
1358	sub new($) {	1418	sub new($) {
1359	my ($login) = @_;	1419	my ($login) = @_;
1360		1420
…		…
1364	$self->{deny_save} = 1;	1424	$self->{deny_save} = 1;
1365		1425
1366	$cf::PLAYER{$login} = $self;	1426	$cf::PLAYER{$login} = $self;
1367		1427
1368	$self	1428	$self
		1429	}
		1430
		1431	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1432
		1433	=cut
		1434
		1435	sub send_msg {
		1436	my $ns = shift->ns
		1437	or return;
		1438	$ns->send_msg (@_);
1369	}	1439	}
1370		1440
1371	=item $pl->quit_character	1441	=item $pl->quit_character
1372		1442
1373	Nukes the player without looking back. If logged in, the connection will	1443	Nukes the player without looking back. If logged in, the connection will
…		…
1428	or return [];	1498	or return [];
1429		1499
1430	my @logins;	1500	my @logins;
1431		1501
1432	for my $login (@$dirs) {	1502	for my $login (@$dirs) {
		1503	my $path = path $login;
		1504
		1505	# a .pst is a dead give-away for a valid player
		1506	unless (-e "$path.pst") {
1433	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1507	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1434	aio_read $fh, 0, 512, my $buf, 0 or next;	1508	aio_read $fh, 0, 512, my $buf, 0 or next;
1435	$buf !~ /^password -------------$/m or next; # official not-valid tag	1509	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1510	}
1436		1511
1437	utf8::decode $login;	1512	utf8::decode $login;
1438	push @logins, $login;	1513	push @logins, $login;
1439	}	1514	}
1440		1515
…		…
1473		1548
1474	Expand crossfire pod fragments into protocol xml.	1549	Expand crossfire pod fragments into protocol xml.
1475		1550
1476	=cut	1551	=cut
1477		1552
		1553	use re 'eval';
		1554
		1555	my $group;
		1556	my $interior; $interior = qr{
		1557	# match a pod interior sequence sans C<< >>
		1558	(?:
		1559	\ (.*?)\ (?{ $group = $^N })
		1560	| < (??{$interior}) >
		1561	)
		1562	}x;
		1563
1478	sub expand_cfpod {	1564	sub expand_cfpod {
1479	((my $self), (local $_)) = @_;	1565	my ($self, $pod) = @_;
1480		1566
1481	# escape & and <	1567	my $xml;
1482	s/&/&amp;/g;
1483	s/(?<![BIUGH])</&lt;/g;
1484		1568
1485	# this is buggy, it needs to properly take care of nested <'s	1569	while () {
		1570	if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
		1571	$group = $1;
1486		1572
1487	1 while	1573	$group =~ s/&/&amp;/g;
1488	# replace B<>, I<>, U<> etc.	1574	$group =~ s/</&lt;/g;
1489	s/B<([^\>]*)>/<b>$1<\/b>/	1575
1490	|| s/I<([^\>]*)>/<i>$1<\/i>/	1576	$xml .= $group;
1491	|| s/U<([^\>]*)>/<u>$1<\/u>/	1577	} elsif ($pod =~ m%\G
1492	# replace G<male|female> tags	1578	([BCGHITU])
1493	|| s{G<([^>|]*)\|([^>]*)>}{	1579	<
1494	$self->gender ? $2 : $1	1580	(?:
1495	}ge	1581	([^<>]*) (?{ $group = $^N })
1496	# replace H<hint text>	1582	| < $interior >
1497	|| s{H<([^\>]*)>}	1583	)
		1584	>
		1585	%gcsx
1498	{	1586	) {
		1587	my ($code, $data) = ($1, $group);
		1588
		1589	if ($code eq "B") {
		1590	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
		1591	} elsif ($code eq "I") {
		1592	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
		1593	} elsif ($code eq "U") {
		1594	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
		1595	} elsif ($code eq "C") {
		1596	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
		1597	} elsif ($code eq "T") {
		1598	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
		1599	} elsif ($code eq "G") {
		1600	my ($male, $female) = split /\|/, $data;
		1601	$data = $self->gender ? $female : $male;
		1602	$xml .= expand_cfpod ($self, $data);
		1603	} elsif ($code eq "H") {
1499	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",	1604	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1500	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",	1605	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1501	"")	1606	"")
1502	[$self->{hintmode}]	1607	[$self->{hintmode}];
		1608	} else {
		1609	$xml .= "error processing '$code($data)' directive";
1503	}ge;	1610	}
		1611	} else {
		1612	if ($pod =~ /\G(.+)/) {
		1613	warn "parse error while expanding $pod (at $1)";
		1614	}
		1615	last;
		1616	}
		1617	}
1504		1618
		1619	for ($xml) {
1505	# create single paragraphs (very hackish)	1620	# create single paragraphs (very hackish)
1506	s/(?<=\S)\n(?=\w)/ /g;	1621	s/(?<=\S)\n(?=\w)/ /g;
1507		1622
1508	# compress some whitespace	1623	# compress some whitespace
1509	s/\s+\n/\n/g; # ws line-ends	1624	s/\s+\n/\n/g; # ws line-ends
1510	s/\n\n+/\n/g; # double lines	1625	s/\n\n+/\n/g; # double lines
1511	s/^\n+//; # beginning lines	1626	s/^\n+//; # beginning lines
1512	s/\n+$//; # ending lines	1627	s/\n+$//; # ending lines
		1628	}
1513		1629
1514	$_	1630	$xml
1515	}	1631	}
		1632
		1633	no re 'eval';
1516		1634
1517	sub hintmode {	1635	sub hintmode {
1518	$_[0]{hintmode} = $_[1] if @_ > 1;	1636	$_[0]{hintmode} = $_[1] if @_ > 1;
1519	$_[0]{hintmode}	1637	$_[0]{hintmode}
1520	}	1638	}
1521		1639
1522	=item $player->ext_reply ($msgid, %msg)	1640	=item $player->ext_reply ($msgid, @msg)
1523		1641
1524	Sends an ext reply to the player.	1642	Sends an ext reply to the player.
1525		1643
1526	=cut	1644	=cut
1527		1645
1528	sub ext_reply($$%) {	1646	sub ext_reply($$@) {
1529	my ($self, $id, %msg) = @_;	1647	my ($self, $id, @msg) = @_;
1530		1648
1531	$msg{msgid} = $id;	1649	$self->ns->ext_reply ($id, @msg)
1532	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1533	}	1650	}
1534		1651
1535	=item $player->ext_event ($type, %msg)	1652	=item $player->ext_msg ($type, @msg)
1536		1653
1537	Sends an ext event to the client.	1654	Sends an ext event to the client.
1538		1655
1539	=cut	1656	=cut
1540		1657
1541	sub ext_event($$%) {	1658	sub ext_msg($$@) {
1542	my ($self, $type, %msg) = @_;	1659	my ($self, $type, @msg) = @_;
1543		1660
1544	$self->ns->ext_event ($type, %msg);	1661	$self->ns->ext_msg ($type, @msg);
1545	}	1662	}
1546		1663
1547	=head3 cf::region	1664	=head3 cf::region
1548		1665
1549	=over 4	1666	=over 4
…		…
1765		1882
1766	sub load_header_from($) {	1883	sub load_header_from($) {
1767	my ($self, $path) = @_;	1884	my ($self, $path) = @_;
1768		1885
1769	utf8::encode $path;	1886	utf8::encode $path;
1770	#aio_open $path, O_RDONLY, 0	1887	my $f = new_from_file cf::object::thawer $path
1771	# or return;
1772
1773	$self->_load_header ($path)
1774	or return;	1888	or return;
		1889
		1890	$self->_load_header ($f)
		1891	or return;
		1892
		1893	local $MAP_LOADING{$self->{path}} = $self;
		1894	$f->resolve_delayed_derefs;
1775		1895
1776	$self->{load_path} = $path;	1896	$self->{load_path} = $path;
1777		1897
1778	1	1898	1
1779	}	1899	}
…		…
1833	sub find {	1953	sub find {
1834	my ($path, $origin) = @_;	1954	my ($path, $origin) = @_;
1835		1955
1836	$path = normalise $path, $origin && $origin->path;	1956	$path = normalise $path, $origin && $origin->path;
1837		1957
		1958	cf::lock_wait "map_data:$path";#d#remove
1838	cf::lock_wait "map_find:$path";	1959	cf::lock_wait "map_find:$path";
1839		1960
1840	$cf::MAP{$path} || do {	1961	$cf::MAP{$path} || do {
1841	my $guard = cf::lock_acquire "map_find:$path";	1962	my $guard1 = cf::lock_acquire "map_find:$path";
		1963	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1964
1842	my $map = new_from_path cf::map $path	1965	my $map = new_from_path cf::map $path
1843	or return;	1966	or return;
1844		1967
1845	$map->{last_save} = $cf::RUNTIME;	1968	$map->{last_save} = $cf::RUNTIME;
1846		1969
…		…
1848	or return;	1971	or return;
1849		1972
1850	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1973	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1851	# doing this can freeze the server in a sync job, obviously	1974	# doing this can freeze the server in a sync job, obviously
1852	#$cf::WAIT_FOR_TICK->wait;	1975	#$cf::WAIT_FOR_TICK->wait;
		1976	undef $guard1;
		1977	undef $guard2;
1853	$map->reset;	1978	$map->reset;
1854	undef $guard;
1855	return find $path;	1979	return find $path;
1856	}	1980	}
1857		1981
1858	$cf::MAP{$path} = $map	1982	$cf::MAP{$path} = $map
1859	}	1983	}
…		…
1868	local $self->{deny_reset} = 1; # loading can take a long time	1992	local $self->{deny_reset} = 1; # loading can take a long time
1869		1993
1870	my $path = $self->{path};	1994	my $path = $self->{path};
1871		1995
1872	{	1996	{
1873	my $guard = cf::lock_acquire "map_load:$path";	1997	my $guard = cf::lock_acquire "map_data:$path";
1874		1998
		1999	return unless $self->valid;
1875	return if $self->in_memory != cf::MAP_SWAPPED;	2000	return unless $self->in_memory == cf::MAP_SWAPPED;
1876		2001
1877	$self->in_memory (cf::MAP_LOADING);	2002	$self->in_memory (cf::MAP_LOADING);
1878		2003
1879	$self->alloc;	2004	$self->alloc;
1880		2005
1881	$self->pre_load;	2006	$self->pre_load;
1882	Coro::cede;	2007	cf::cede_to_tick;
1883		2008
		2009	my $f = new_from_file cf::object::thawer $self->{load_path};
		2010	$f->skip_block;
1884	$self->_load_objects ($self->{load_path}, 1)	2011	$self->_load_objects ($f)
1885	or return;	2012	or return;
1886		2013
1887	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2014	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1888	if delete $self->{load_original};	2015	if delete $self->{load_original};
1889		2016
1890	if (my $uniq = $self->uniq_path) {	2017	if (my $uniq = $self->uniq_path) {
1891	utf8::encode $uniq;	2018	utf8::encode $uniq;
1892	if (aio_open $uniq, O_RDONLY, 0) {	2019	unless (aio_stat $uniq) {
		2020	if (my $f = new_from_file cf::object::thawer $uniq) {
1893	$self->clear_unique_items;	2021	$self->clear_unique_items;
1894	$self->_load_objects ($uniq, 0);	2022	$self->_load_objects ($f);
		2023	$f->resolve_delayed_derefs;
		2024	}
1895	}	2025	}
1896	}	2026	}
1897		2027
1898	Coro::cede;	2028	$f->resolve_delayed_derefs;
		2029
		2030	cf::cede_to_tick;
1899	# now do the right thing for maps	2031	# now do the right thing for maps
1900	$self->link_multipart_objects;	2032	$self->link_multipart_objects;
1901	$self->difficulty ($self->estimate_difficulty)	2033	$self->difficulty ($self->estimate_difficulty)
1902	unless $self->difficulty;	2034	unless $self->difficulty;
1903	Coro::cede;	2035	cf::cede_to_tick;
1904		2036
1905	unless ($self->{deny_activate}) {	2037	unless ($self->{deny_activate}) {
1906	$self->decay_objects;	2038	$self->decay_objects;
1907	$self->fix_auto_apply;	2039	$self->fix_auto_apply;
1908	$self->update_buttons;	2040	$self->update_buttons;
1909	Coro::cede;	2041	cf::cede_to_tick;
1910	$self->set_darkness_map;	2042	$self->set_darkness_map;
1911	Coro::cede;	2043	cf::cede_to_tick;
1912	$self->activate;	2044	$self->activate;
1913	}	2045	}
		2046
		2047	$self->{last_save} = $cf::RUNTIME;
		2048	$self->last_access ($cf::RUNTIME);
1914		2049
1915	$self->in_memory (cf::MAP_IN_MEMORY);	2050	$self->in_memory (cf::MAP_IN_MEMORY);
1916	}	2051	}
1917		2052
1918	$self->post_load;	2053	$self->post_load;
…		…
1929		2064
1930	$self	2065	$self
1931	}	2066	}
1932		2067
1933	# find and load all maps in the 3x3 area around a map	2068	# find and load all maps in the 3x3 area around a map
1934	sub load_diag {	2069	sub load_neighbours {
1935	my ($map) = @_;	2070	my ($map) = @_;
1936		2071
1937	my @diag; # diagonal neighbours	2072	my @neigh; # diagonal neighbours
1938		2073
1939	for (0 .. 3) {	2074	for (0 .. 3) {
1940	my $neigh = $map->tile_path ($_)	2075	my $neigh = $map->tile_path ($_)
1941	or next;	2076	or next;
1942	$neigh = find $neigh, $map	2077	$neigh = find $neigh, $map
1943	or next;	2078	or next;
1944	$neigh->load;	2079	$neigh->load;
1945		2080
		2081	push @neigh,
1946	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2082	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1947	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2083	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1948	}	2084	}
1949		2085
1950	for (@diag) {	2086	for (grep defined $_->[0], @neigh) {
		2087	my ($path, $origin) = @$_;
1951	my $neigh = find @$_	2088	my $neigh = find $path, $origin
1952	or next;	2089	or next;
1953	$neigh->load;	2090	$neigh->load;
1954	}	2091	}
1955	}	2092	}
1956		2093
…		…
1961	}	2098	}
1962		2099
1963	sub do_load_sync {	2100	sub do_load_sync {
1964	my ($map) = @_;	2101	my ($map) = @_;
1965		2102
		2103	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2104	if $Coro::current == $Coro::main;
		2105
1966	cf::sync_job { $map->load };	2106	cf::sync_job { $map->load };
1967	}	2107	}
1968		2108
1969	our %MAP_PREFETCH;	2109	our %MAP_PREFETCH;
1970	our $MAP_PREFETCHER = undef;	2110	our $MAP_PREFETCHER = undef;
1971		2111
1972	sub find_async {	2112	sub find_async {
1973	my ($path, $origin) = @_;	2113	my ($path, $origin, $load) = @_;
1974		2114
1975	$path = normalise $path, $origin && $origin->{path};	2115	$path = normalise $path, $origin && $origin->{path};
1976		2116
1977	if (my $map = $cf::MAP{$path}) {	2117	if (my $map = $cf::MAP{$path}) {
1978	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2118	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1979	}	2119	}
1980		2120
1981	undef $MAP_PREFETCH{$path};	2121	$MAP_PREFETCH{$path} |= $load;
		2122
1982	$MAP_PREFETCHER ||= cf::async {	2123	$MAP_PREFETCHER ||= cf::async {
		2124	$Coro::current->{desc} = "map prefetcher";
		2125
1983	while (%MAP_PREFETCH) {	2126	while (%MAP_PREFETCH) {
1984	for my $path (keys %MAP_PREFETCH) {	2127	while (my ($k, $v) = each %MAP_PREFETCH) {
1985	if (my $map = find $path) {	2128	if (my $map = find $k) {
1986	$map->load;	2129	$map->load if $v;
1987	}	2130	}
1988		2131
1989	delete $MAP_PREFETCH{$path};	2132	delete $MAP_PREFETCH{$k};
1990	}	2133	}
1991	}	2134	}
1992	undef $MAP_PREFETCHER;	2135	undef $MAP_PREFETCHER;
1993	};	2136	};
1994	$MAP_PREFETCHER->prio (6);	2137	$MAP_PREFETCHER->prio (6);
…		…
1997	}	2140	}
1998		2141
1999	sub save {	2142	sub save {
2000	my ($self) = @_;	2143	my ($self) = @_;
2001		2144
2002	my $lock = cf::lock_acquire "map_data:" . $self->path;	2145	my $lock = cf::lock_acquire "map_data:$self->{path}";
2003		2146
2004	$self->{last_save} = $cf::RUNTIME;	2147	$self->{last_save} = $cf::RUNTIME;
2005		2148
2006	return unless $self->dirty;	2149	return unless $self->dirty;
2007		2150
…		…
2013	return if $self->{deny_save};	2156	return if $self->{deny_save};
2014		2157
2015	local $self->{last_access} = $self->last_access;#d#	2158	local $self->{last_access} = $self->last_access;#d#
2016		2159
2017	cf::async {	2160	cf::async {
		2161	$Coro::current->{desc} = "map player save";
2018	$_->contr->save for $self->players;	2162	$_->contr->save for $self->players;
2019	};	2163	};
2020		2164
2021	if ($uniq) {	2165	if ($uniq) {
2022	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2166	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
…		…
2030	my ($self) = @_;	2174	my ($self) = @_;
2031		2175
2032	# save first because save cedes	2176	# save first because save cedes
2033	$self->save;	2177	$self->save;
2034		2178
2035	my $lock = cf::lock_acquire "map_data:" . $self->path;	2179	my $lock = cf::lock_acquire "map_data:$self->{path}";
2036		2180
2037	return if $self->players;	2181	return if $self->players;
2038	return if $self->in_memory != cf::MAP_IN_MEMORY;	2182	return if $self->in_memory != cf::MAP_IN_MEMORY;
2039	return if $self->{deny_save};	2183	return if $self->{deny_save};
2040		2184
		2185	$self->in_memory (cf::MAP_SWAPPED);
		2186
		2187	$self->deactivate;
		2188	$_->clear_links_to ($self) for values %cf::MAP;
2041	$self->clear;	2189	$self->clear;
2042	$self->in_memory (cf::MAP_SWAPPED);
2043	}	2190	}
2044		2191
2045	sub reset_at {	2192	sub reset_at {
2046	my ($self) = @_;	2193	my ($self) = @_;
2047		2194
…		…
2079	if $uniq;	2226	if $uniq;
2080	}	2227	}
2081		2228
2082	delete $cf::MAP{$self->path};	2229	delete $cf::MAP{$self->path};
2083		2230
		2231	$self->deactivate;
		2232	$_->clear_links_to ($self) for values %cf::MAP;
2084	$self->clear;	2233	$self->clear;
2085
2086	$_->clear_links_to ($self) for values %cf::MAP;
2087		2234
2088	$self->unlink_save;	2235	$self->unlink_save;
2089	$self->destroy;	2236	$self->destroy;
2090	}	2237	}
2091		2238
2092	my $nuke_counter = "aaaa";	2239	my $nuke_counter = "aaaa";
2093		2240
2094	sub nuke {	2241	sub nuke {
2095	my ($self) = @_;	2242	my ($self) = @_;
2096		2243
		2244	{
		2245	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2246
2097	delete $cf::MAP{$self->path};	2247	delete $cf::MAP{$self->path};
2098		2248
2099	$self->unlink_save;	2249	$self->unlink_save;
2100		2250
2101	bless $self, "cf::map";	2251	bless $self, "cf::map";
2102	delete $self->{deny_reset};	2252	delete $self->{deny_reset};
2103	$self->{deny_save} = 1;	2253	$self->{deny_save} = 1;
2104	$self->reset_timeout (1);	2254	$self->reset_timeout (1);
2105	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2255	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2106		2256
2107	$cf::MAP{$self->path} = $self;	2257	$cf::MAP{$self->path} = $self;
		2258	}
2108		2259
2109	$self->reset; # polite request, might not happen	2260	$self->reset; # polite request, might not happen
2110	}	2261	}
2111		2262
2112	=item $maps = cf::map::tmp_maps	2263	=item $maps = cf::map::tmp_maps
…		…
2188		2339
2189	sub inv_recursive {	2340	sub inv_recursive {
2190	inv_recursive_ inv $_[0]	2341	inv_recursive_ inv $_[0]
2191	}	2342	}
2192		2343
		2344	=item $ref = $ob->ref
		2345
		2346	creates and returns a persistent reference to an objetc that can be stored as a string.
		2347
		2348	=item $ob = cf::object::deref ($refstring)
		2349
		2350	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2351	even if the object actually exists. May block.
		2352
		2353	=cut
		2354
		2355	sub deref {
		2356	my ($ref) = @_;
		2357
		2358	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2359	my ($uuid, $name) = ($1, $2);
		2360	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2361	or return;
		2362	$pl->ob->uuid eq $uuid
		2363	or return;
		2364
		2365	$pl->ob
		2366	} else {
		2367	warn "$ref: cannot resolve object reference\n";
		2368	undef
		2369	}
		2370	}
		2371
2193	package cf;	2372	package cf;
2194		2373
2195	=back	2374	=back
2196		2375
2197	=head3 cf::object::player	2376	=head3 cf::object::player
…		…
2219		2398
2220	} else {	2399	} else {
2221	my $pl = $self->contr;	2400	my $pl = $self->contr;
2222		2401
2223	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2402	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2224	my $diag = $pl->{npc_dialog};	2403	my $dialog = $pl->{npc_dialog};
2225	$diag->{pl}->ext_reply (	2404	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2226	$diag->{id},
2227	msgtype => "reply",
2228	msg => $diag->{pl}->expand_cfpod ($msg),
2229	add_topics => []
2230	);
2231		2405
2232	} else {	2406	} else {
2233	$msg = $npc->name . " says: $msg" if $npc;	2407	$msg = $npc->name . " says: $msg" if $npc;
2234	$self->message ($msg, $flags);	2408	$self->message ($msg, $flags);
2235	}	2409	}
2236	}	2410	}
		2411	}
		2412
		2413	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2414
		2415	=cut
		2416
		2417	sub cf::object::send_msg {
		2418	my $pl = shift->contr
		2419	or return;
		2420	$pl->send_msg (@_);
2237	}	2421	}
2238		2422
2239	=item $player_object->may ("access")	2423	=item $player_object->may ("access")
2240		2424
2241	Returns wether the given player is authorized to access resource "access"	2425	Returns wether the given player is authorized to access resource "access"
…		…
2320	# use -1 or undef as default coordinates, not 0, 0	2504	# use -1 or undef as default coordinates, not 0, 0
2321	($x, $y) = ($map->enter_x, $map->enter_y)	2505	($x, $y) = ($map->enter_x, $map->enter_y)
2322	if $x <=0 && $y <= 0;	2506	if $x <=0 && $y <= 0;
2323		2507
2324	$map->load;	2508	$map->load;
2325	$map->load_diag;	2509	$map->load_neighbours;
2326		2510
2327	return unless $self->contr->active;	2511	return unless $self->contr->active;
2328	$self->activate_recursive;	2512	$self->activate_recursive;
2329		2513
2330	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2514	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
…		…
2350	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2534	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2351		2535
2352	$self->enter_link;	2536	$self->enter_link;
2353		2537
2354	(async {	2538	(async {
		2539	$Coro::current->{desc} = "player::goto $path $x $y";
		2540
		2541	# *tag paths override both path and x|y
		2542	if ($path =~ /^\*(.*)$/) {
		2543	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2544	my $ob = $obs[rand @obs];
		2545
		2546	# see if we actually can go there
		2547	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2548	$ob = $obs[rand @obs];
		2549	} else {
		2550	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2551	}
		2552	# else put us there anyways for now #d#
		2553
		2554	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2555	} else {
		2556	($path, $x, $y) = (undef, undef, undef);
		2557	}
		2558	}
		2559
2355	my $map = eval {	2560	my $map = eval {
2356	my $map = cf::map::find $path;	2561	my $map = defined $path ? cf::map::find $path : undef;
2357		2562
2358	if ($map) {	2563	if ($map) {
2359	$map = $map->customise_for ($self);	2564	$map = $map->customise_for ($self);
2360	$map = $check->($map) if $check && $map;	2565	$map = $check->($map) if $check && $map;
2361	} else {	2566	} else {
2362	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2567	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2363	}	2568	}
2364		2569
2365	$map	2570	$map
2366	};	2571	};
2367		2572
…		…
2457	# if exit is damned, update players death & WoR home-position	2662	# if exit is damned, update players death & WoR home-position
2458	$self->contr->savebed ($slaying, $hp, $sp)	2663	$self->contr->savebed ($slaying, $hp, $sp)
2459	if $exit->flag (FLAG_DAMNED);	2664	if $exit->flag (FLAG_DAMNED);
2460		2665
2461	(async {	2666	(async {
		2667	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2668
2462	$self->deactivate_recursive; # just to be sure	2669	$self->deactivate_recursive; # just to be sure
2463	unless (eval {	2670	unless (eval {
2464	$self->goto ($slaying, $hp, $sp);	2671	$self->goto ($slaying, $hp, $sp);
2465		2672
2466	1;	2673	1;
…		…
2501	the message, with C<log> being the default. If C<$color> is negative, suppress	2708	the message, with C<log> being the default. If C<$color> is negative, suppress
2502	the message unless the client supports the msg packet.	2709	the message unless the client supports the msg packet.
2503		2710
2504	=cut	2711	=cut
2505		2712
		2713	# non-persistent channels (usually the info channel)
		2714	our %CHANNEL = (
		2715	"c/identify" => {
		2716	id => "infobox",
		2717	title => "Identify",
		2718	reply => undef,
		2719	tooltip => "Items recently identified",
		2720	},
		2721	"c/examine" => {
		2722	id => "infobox",
		2723	title => "Examine",
		2724	reply => undef,
		2725	tooltip => "Signs and other items you examined",
		2726	},
		2727	"c/book" => {
		2728	id => "infobox",
		2729	title => "Book",
		2730	reply => undef,
		2731	tooltip => "The contents of a note or book",
		2732	},
		2733	"c/lookat" => {
		2734	id => "infobox",
		2735	title => "Look",
		2736	reply => undef,
		2737	tooltip => "What you saw there",
		2738	},
		2739	"c/who" => {
		2740	id => "infobox",
		2741	title => "Players",
		2742	reply => undef,
		2743	tooltip => "Shows players who are currently online",
		2744	},
		2745	"c/body" => {
		2746	id => "infobox",
		2747	title => "Body Parts",
		2748	reply => undef,
		2749	tooltip => "Shows which body parts you posess and are available",
		2750	},
		2751	"c/uptime" => {
		2752	id => "infobox",
		2753	title => "Uptime",
		2754	reply => undef,
		2755	tooltip => "How long the server has been running since last restart",
		2756	},
		2757	"c/mapinfo" => {
		2758	id => "infobox",
		2759	title => "Map Info",
		2760	reply => undef,
		2761	tooltip => "Information related to the maps",
		2762	},
		2763	);
		2764
2506	sub cf::client::send_msg {	2765	sub cf::client::send_msg {
2507	my ($self, $channel, $msg, $color, @extra) = @_;	2766	my ($self, $channel, $msg, $color, @extra) = @_;
2508		2767
2509	$msg = $self->pl->expand_cfpod ($msg);	2768	$msg = $self->pl->expand_cfpod ($msg);
2510		2769
2511	$color &= ~cf::NDI_UNIQUE; # just in case...	2770	$color &= cf::NDI_CLIENT_MASK; # just in case...
2512		2771
		2772	# check predefined channels, for the benefit of C
		2773	if ($CHANNEL{$channel}) {
		2774	$channel = $CHANNEL{$channel};
		2775
		2776	$self->ext_msg (channel_info => $channel)
		2777	if $self->can_msg;
		2778
		2779	$channel = $channel->{id};
		2780
2513	if (ref $channel) {	2781	} elsif (ref $channel) {
2514	# send meta info to client, if not yet sent	2782	# send meta info to client, if not yet sent
2515	unless (exists $self->{channel}{$channel->{id}}) {	2783	unless (exists $self->{channel}{$channel->{id}}) {
2516	$self->{channel}{$channel->{id}} = $channel;	2784	$self->{channel}{$channel->{id}} = $channel;
2517	$self->ext_event (channel_info => %$channel);	2785	$self->ext_msg (channel_info => $channel)
		2786	if $self->can_msg;
2518	}	2787	}
2519		2788
2520	$channel = $channel->{id};	2789	$channel = $channel->{id};
2521	}	2790	}
2522		2791
2523	return unless @extra || length $msg;	2792	return unless @extra || length $msg;
2524		2793
2525	if ($self->can_msg) {	2794	if ($self->can_msg) {
		2795	# default colour, mask it out
		2796	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2797	if $color & cf::NDI_DEF;
		2798
2526	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));	2799	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2800	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2527	} else {	2801	} else {
2528	# replace some tags by gcfclient-compatible ones
2529	for ($msg) {
2530	1 while
2531	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2532	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2533	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2534	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2535	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2536	}
2537
2538	if ($color >= 0) {	2802	if ($color >= 0) {
		2803	# replace some tags by gcfclient-compatible ones
		2804	for ($msg) {
		2805	1 while
		2806	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2807	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2808	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2809	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2810	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2811	}
		2812
		2813	$color &= cf::NDI_COLOR_MASK;
		2814
		2815	utf8::encode $msg;
		2816
2539	if (0 && $msg =~ /\[/) {	2817	if (0 && $msg =~ /\[/) {
		2818	# COMMAND/INFO
2540	$self->send_packet ("drawextinfo $color 4 0 $msg")	2819	$self->send_packet ("drawextinfo $color 10 8 $msg")
2541	} else {	2820	} else {
2542	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;	2821	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2543	$self->send_packet ("drawinfo $color $msg")	2822	$self->send_packet ("drawinfo $color $msg")
2544	}	2823	}
2545	}	2824	}
2546	}	2825	}
2547	}	2826	}
2548		2827
2549	=item $client->ext_event ($type, %msg)	2828	=item $client->ext_msg ($type, @msg)
2550		2829
2551	Sends an ext event to the client.	2830	Sends an ext event to the client.
2552		2831
2553	=cut	2832	=cut
2554		2833
2555	sub cf::client::ext_event($$%) {	2834	sub cf::client::ext_msg($$@) {
2556	my ($self, $type, %msg) = @_;	2835	my ($self, $type, @msg) = @_;
2557		2836
2558	return unless $self->extcmd;	2837	if ($self->extcmd == 2) {
2559		2838	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2839	} elsif ($self->extcmd == 1) { # TODO: remove
2560	$msg{msgtype} = "event_$type";	2840	push @msg, msgtype => "event_$type";
2561	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2841	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2842	}
		2843	}
		2844
		2845	=item $client->ext_reply ($msgid, @msg)
		2846
		2847	Sends an ext reply to the client.
		2848
		2849	=cut
		2850
		2851	sub cf::client::ext_reply($$@) {
		2852	my ($self, $id, @msg) = @_;
		2853
		2854	if ($self->extcmd == 2) {
		2855	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2856	} elsif ($self->extcmd == 1) {
		2857	#TODO: version 1, remove
		2858	unshift @msg, msgtype => "reply", msgid => $id;
		2859	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2860	}
2562	}	2861	}
2563		2862
2564	=item $success = $client->query ($flags, "text", \&cb)	2863	=item $success = $client->query ($flags, "text", \&cb)
2565		2864
2566	Queues a query to the client, calling the given callback with	2865	Queues a query to the client, calling the given callback with
…		…
2621	my ($ns, $buf) = @_;	2920	my ($ns, $buf) = @_;
2622		2921
2623	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2922	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2624		2923
2625	if (ref $msg) {	2924	if (ref $msg) {
		2925	my ($type, $reply, @payload) =
		2926	"ARRAY" eq ref $msg
		2927	? @$msg
		2928	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2929
		2930	my @reply;
		2931
2626	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2932	if (my $cb = $EXTICMD{$type}) {
2627	if (my %reply = $cb->($ns, $msg)) {	2933	@reply = $cb->($ns, @payload);
2628	$reply{msgid} = $msg->{msgid};
2629	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2630	}
2631	}	2934	}
		2935
		2936	$ns->ext_reply ($reply, @reply)
		2937	if $reply;
		2938
2632	} else {	2939	} else {
2633	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2940	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2634	}	2941	}
2635		2942
2636	cf::override;	2943	cf::override;
…		…
2683	our $safe = new Safe "safe";	2990	our $safe = new Safe "safe";
2684	our $safe_hole = new Safe::Hole;	2991	our $safe_hole = new Safe::Hole;
2685		2992
2686	$SIG{FPE} = 'IGNORE';	2993	$SIG{FPE} = 'IGNORE';
2687		2994
2688	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2995	$safe->permit_only (Opcode::opset qw(
		2996	:base_core :base_mem :base_orig :base_math
		2997	grepstart grepwhile mapstart mapwhile
		2998	sort time
		2999	));
2689		3000
2690	# here we export the classes and methods available to script code	3001	# here we export the classes and methods available to script code
2691		3002
2692	=pod	3003	=pod
2693		3004
2694	The following functions and methods are available within a safe environment:	3005	The following functions and methods are available within a safe environment:
2695		3006
2696	cf::object	3007	cf::object
2697	contr pay_amount pay_player map x y force_find force_add	3008	contr pay_amount pay_player map x y force_find force_add destroy
2698	insert remove	3009	insert remove name archname title slaying race decrease_ob_nr
2699		3010
2700	cf::object::player	3011	cf::object::player
2701	player	3012	player
2702		3013
2703	cf::player	3014	cf::player
…		…
2708		3019
2709	=cut	3020	=cut
2710		3021
2711	for (	3022	for (
2712	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3023	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		3024	insert remove inv name archname title slaying race
2713	insert remove)],	3025	decrease_ob_nr destroy)],
2714	["cf::object::player" => qw(player)],	3026	["cf::object::player" => qw(player)],
2715	["cf::player" => qw(peaceful)],	3027	["cf::player" => qw(peaceful)],
2716	["cf::map" => qw(trigger)],	3028	["cf::map" => qw(trigger)],
2717	) {	3029	) {
2718	no strict 'refs';	3030	no strict 'refs';
…		…
2794	# the server's init and main functions	3106	# the server's init and main functions
2795		3107
2796	sub load_facedata($) {	3108	sub load_facedata($) {
2797	my ($path) = @_;	3109	my ($path) = @_;
2798		3110
		3111	# HACK to clear player env face cache, we need some signal framework
		3112	# for this (global event?)
		3113	%ext::player_env::MUSIC_FACE_CACHE = ();
		3114
		3115	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3116
2799	warn "loading facedata from $path\n";	3117	warn "loading facedata from $path\n";
2800		3118
2801	my $facedata;	3119	my $facedata;
2802	0 < aio_load $path, $facedata	3120	0 < aio_load $path, $facedata
2803	or die "$path: $!";	3121	or die "$path: $!";
2804		3122
2805	$facedata = Coro::Storable::thaw $facedata;	3123	$facedata = Coro::Storable::thaw $facedata;
2806		3124
2807	$facedata->{version} == 2	3125	$facedata->{version} == 2
2808	or cf::cleanup "$path: version mismatch, cannot proceed.";	3126	or cf::cleanup "$path: version mismatch, cannot proceed.";
		3127
		3128	# patch in the exptable
		3129	$facedata->{resource}{"res/exp_table"} = {
		3130	type => FT_RSRC,
		3131	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3132	};
		3133	cf::cede_to_tick;
2809		3134
2810	{	3135	{
2811	my $faces = $facedata->{faceinfo};	3136	my $faces = $facedata->{faceinfo};
2812		3137
2813	while (my ($face, $info) = each %$faces) {	3138	while (my ($face, $info) = each %$faces) {
2814	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3139	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2815	cf::face::set_visibility $idx, $info->{visibility};	3140	cf::face::set_visibility $idx, $info->{visibility};
2816	cf::face::set_magicmap $idx, $info->{magicmap};	3141	cf::face::set_magicmap $idx, $info->{magicmap};
2817	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3142	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2818	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3143	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2819		3144
2820	cf::cede_to_tick;	3145	cf::cede_to_tick;
2821	}	3146	}
2822		3147
2823	while (my ($face, $info) = each %$faces) {	3148	while (my ($face, $info) = each %$faces) {
…		…
2848		3173
2849	{	3174	{
2850	# TODO: for gcfclient pleasure, we should give resources	3175	# TODO: for gcfclient pleasure, we should give resources
2851	# that gcfclient doesn't grok a >10000 face index.	3176	# that gcfclient doesn't grok a >10000 face index.
2852	my $res = $facedata->{resource};	3177	my $res = $facedata->{resource};
2853	my $enc = JSON::XS->new->utf8->canonical;	3178
		3179	my $soundconf = delete $res->{"res/sound.conf"};
2854		3180
2855	while (my ($name, $info) = each %$res) {	3181	while (my ($name, $info) = each %$res) {
2856	my $meta = $enc->encode ({
2857	name => $name,
2858	type => $info->{type},
2859	copyright => $info->{copyright}, #TODO#
2860	});
2861
2862	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3182	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3183	my $data;
2863		3184
2864	if ($name =~ /\.jpg$/) {	3185	if ($info->{type} & 1) {
2865	cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack	3186	# prepend meta info
2866	cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack	3187
		3188	my $meta = $enc->encode ({
		3189	name => $name,
		3190	%{ $info->{meta} || {} },
		3191	});
		3192
		3193	$data = pack "(w/a*)*", $meta, $info->{data};
2867	} else {	3194	} else {
2868	my $data = pack "(w/a*)*", $meta, $info->{data};	3195	$data = $info->{data};
2869	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2870
2871	cf::face::set_type $idx, 1;
2872	cf::face::set_data $idx, 0, $data, $chk;
2873	}	3196	}
2874		3197
		3198	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3199	cf::face::set_type $idx, $info->{type};
		3200
2875	cf::cede_to_tick;	3201	cf::cede_to_tick;
2876	}	3202	}
		3203
		3204	if ($soundconf) {
		3205	$soundconf = $enc->decode (delete $soundconf->{data});
		3206
		3207	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3208	my $sound = $soundconf->{compat}[$_]
		3209	or next;
		3210
		3211	my $face = cf::face::find "sound/$sound->[1]";
		3212	cf::sound::set $sound->[0] => $face;
		3213	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3214	}
		3215
		3216	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3217	my $face = cf::face::find "sound/$v";
		3218	cf::sound::set $k => $face;
		3219	}
		3220	}
2877	}	3221	}
2878		3222
2879	1	3223	1
2880	}	3224	}
2881		3225
		3226	register_exticmd fx_want => sub {
		3227	my ($ns, $want) = @_;
		3228
		3229	while (my ($k, $v) = each %$want) {
		3230	$ns->fx_want ($k, $v);
		3231	}
		3232	};
		3233
2882	sub reload_regions {	3234	sub reload_regions {
		3235	# HACK to clear player env face cache, we need some signal framework
		3236	# for this (global event?)
		3237	%ext::player_env::MUSIC_FACE_CACHE = ();
		3238
2883	load_resource_file "$MAPDIR/regions"	3239	load_resource_file "$MAPDIR/regions"
2884	or die "unable to load regions file\n";	3240	or die "unable to load regions file\n";
2885		3241
2886	for (cf::region::list) {	3242	for (cf::region::list) {
2887	$_->{match} = qr/$_->{match}/	3243	$_->{match} = qr/$_->{match}/
…		…
2923		3279
2924	sub init {	3280	sub init {
2925	reload_resources;	3281	reload_resources;
2926	}	3282	}
2927		3283
2928	sub cfg_load {	3284	sub reload_config {
2929	open my $fh, "<:utf8", "$CONFDIR/config"	3285	open my $fh, "<:utf8", "$CONFDIR/config"
2930	or return;	3286	or return;
2931		3287
2932	local $/;	3288	local $/;
2933	*CFG = YAML::Syck::Load <$fh>;	3289	*CFG = YAML::Syck::Load <$fh>;
…		…
2949	sub main {	3305	sub main {
2950	# we must not ever block the main coroutine	3306	# we must not ever block the main coroutine
2951	local $Coro::idle = sub {	3307	local $Coro::idle = sub {
2952	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3308	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2953	(async {	3309	(async {
		3310	$Coro::current->{desc} = "IDLE BUG HANDLER";
2954	Event::one_event;	3311	Event::one_event;
2955	})->prio (Coro::PRIO_MAX);	3312	})->prio (Coro::PRIO_MAX);
2956	};	3313	};
2957		3314
2958	cfg_load;	3315	reload_config;
2959	db_init;	3316	db_init;
2960	load_extensions;	3317	load_extensions;
2961		3318
2962	$TICK_WATCHER->start;	3319	$TICK_WATCHER->start;
2963	Event::loop;	3320	Event::loop;
…		…
3030	# and maps saved/destroyed asynchronously.	3387	# and maps saved/destroyed asynchronously.
3031	warn "begin emergency player save\n";	3388	warn "begin emergency player save\n";
3032	for my $login (keys %cf::PLAYER) {	3389	for my $login (keys %cf::PLAYER) {
3033	my $pl = $cf::PLAYER{$login} or next;	3390	my $pl = $cf::PLAYER{$login} or next;
3034	$pl->valid or next;	3391	$pl->valid or next;
		3392	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3035	$pl->save;	3393	$pl->save;
3036	}	3394	}
3037	warn "end emergency player save\n";	3395	warn "end emergency player save\n";
3038		3396
3039	warn "begin emergency map save\n";	3397	warn "begin emergency map save\n";
…		…
3087		3445
3088	warn "flushing outstanding aio requests";	3446	warn "flushing outstanding aio requests";
3089	for (;;) {	3447	for (;;) {
3090	BDB::flush;	3448	BDB::flush;
3091	IO::AIO::flush;	3449	IO::AIO::flush;
3092	Coro::cede;	3450	Coro::cede_notself;
3093	last unless IO::AIO::nreqs || BDB::nreqs;	3451	last unless IO::AIO::nreqs || BDB::nreqs;
3094	warn "iterate...";	3452	warn "iterate...";
3095	}	3453	}
3096		3454
3097	++$RELOAD;	3455	++$RELOAD;
…		…
3156	warn "reloading cf.pm";	3514	warn "reloading cf.pm";
3157	require cf;	3515	require cf;
3158	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3516	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3159		3517
3160	warn "loading config and database again";	3518	warn "loading config and database again";
3161	cf::cfg_load;	3519	cf::reload_config;
3162		3520
3163	warn "loading extensions";	3521	warn "loading extensions";
3164	cf::load_extensions;	3522	cf::load_extensions;
3165		3523
3166	warn "reattaching attachments to objects/players";	3524	warn "reattaching attachments to objects/players";
…		…
3202	register_command "reload" => sub {	3560	register_command "reload" => sub {
3203	my ($who, $arg) = @_;	3561	my ($who, $arg) = @_;
3204		3562
3205	if ($who->flag (FLAG_WIZ)) {	3563	if ($who->flag (FLAG_WIZ)) {
3206	$who->message ("reloading server.");	3564	$who->message ("reloading server.");
		3565	async {
		3566	$Coro::current->{desc} = "perl_reload";
3207	async { reload_perl };	3567	reload_perl;
		3568	};
3208	}	3569	}
3209	};	3570	};
3210		3571
3211	unshift @INC, $LIBDIR;	3572	unshift @INC, $LIBDIR;
3212		3573
…		…
3231	my $signal = new Coro::Signal;	3592	my $signal = new Coro::Signal;
3232	push @WAIT_FOR_TICK_BEGIN, $signal;	3593	push @WAIT_FOR_TICK_BEGIN, $signal;
3233	$signal->wait;	3594	$signal->wait;
3234	}	3595	}
3235		3596
3236	my $min = 1e6;#d#
3237	my $avg = 10;
3238	$TICK_WATCHER = Event->timer (	3597	$TICK_WATCHER = Event->timer (
3239	reentrant => 0,	3598	reentrant => 0,
3240	parked => 1,	3599	parked => 1,
3241	prio => 0,	3600	prio => 0,
3242	at => $NEXT_TICK || $TICK,	3601	at => $NEXT_TICK || $TICK,
…		…
3250		3609
3251	$NOW = $tick_start = Event::time;	3610	$NOW = $tick_start = Event::time;
3252		3611
3253	cf::server_tick; # one server iteration	3612	cf::server_tick; # one server iteration
3254		3613
3255	0 && sync_job {#d#
3256	for(1..10) {
3257	my $t = Event::time;
3258	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3259	or die;
3260
3261	$map->width (50);
3262	$map->height (50);
3263	$map->alloc;
3264	$map->_load_objects ("/tmp/x.map", 1);
3265	my $t = Event::time - $t;
3266
3267	#next unless $t < 0.0013;#d#
3268	if ($t < $min) {
3269	$min = $t;
3270	}
3271	$avg = $avg * 0.99 + $t * 0.01;
3272	}
3273	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3274	exit 0;
3275	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3276	};
3277
3278	$RUNTIME += $TICK;	3614	$RUNTIME += $TICK;
3279	$NEXT_TICK += $TICK;	3615	$NEXT_TICK += $TICK;
3280		3616
3281	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3617	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3282	$NEXT_RUNTIME_WRITE = $NOW + 10;	3618	$NEXT_RUNTIME_WRITE = $NOW + 10;
3283	Coro::async_pool {	3619	Coro::async_pool {
		3620	$Coro::current->{desc} = "runtime saver";
3284	write_runtime	3621	write_runtime
3285	or warn "ERROR: unable to write runtime file: $!";	3622	or warn "ERROR: unable to write runtime file: $!";
3286	};	3623	};
3287	}	3624	}
3288		3625
3289	# my $AFTER = Event::time;
3290	# warn $AFTER - $NOW;#d#
3291
3292	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3626	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3293	$sig->send;	3627	$sig->send;
3294	}	3628	}
3295	while (my $sig = shift @WAIT_FOR_TICK) {	3629	while (my $sig = shift @WAIT_FOR_TICK) {
3296	$sig->send;	3630	$sig->send;
…		…
3306		3640
3307	$LOAD = ($NOW - $tick_start) / $TICK;	3641	$LOAD = ($NOW - $tick_start) / $TICK;
3308	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3642	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3309		3643
3310	_post_tick;	3644	_post_tick;
3311
3312
3313	},	3645	},
3314	);	3646	);
3315		3647
3316	{	3648	{
		3649	BDB::min_parallel 8;
3317	BDB::max_poll_time $TICK * 0.1;	3650	BDB::max_poll_time $TICK * 0.1;
3318	$BDB_POLL_WATCHER = Event->io (	3651	$BDB_POLL_WATCHER = Event->io (
3319	reentrant => 0,	3652	reentrant => 0,
3320	fd => BDB::poll_fileno,	3653	fd => BDB::poll_fileno,
3321	poll => 'r',	3654	poll => 'r',
3322	prio => 0,	3655	prio => 0,
3323	data => WF_AUTOCANCEL,	3656	data => WF_AUTOCANCEL,
3324	cb => \&BDB::poll_cb,	3657	cb => \&BDB::poll_cb,
3325	);	3658	);
3326	BDB::min_parallel 8;
3327		3659
3328	BDB::set_sync_prepare {	3660	BDB::set_sync_prepare {
3329	my $status;	3661	my $status;
3330	my $current = $Coro::current;	3662	my $current = $Coro::current;
3331	(	3663	(
…		…
3340	)	3672	)
3341	};	3673	};
3342		3674
3343	unless ($DB_ENV) {	3675	unless ($DB_ENV) {
3344	$DB_ENV = BDB::db_env_create;	3676	$DB_ENV = BDB::db_env_create;
		3677	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3678	| BDB::LOG_AUTOREMOVE, 1);
		3679	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3680	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3345		3681
3346	cf::sync_job {	3682	cf::sync_job {
3347	eval {	3683	eval {
3348	BDB::db_env_open	3684	BDB::db_env_open
3349	$DB_ENV,	3685	$DB_ENV,
…		…
3351	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3687	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3352	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3688	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3353	0666;	3689	0666;
3354		3690
3355	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3691	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3356
3357	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3358	$DB_ENV->set_lk_detect;
3359	};	3692	};
3360		3693
3361	cf::cleanup "db_env_open(db): $@" if $@;	3694	cf::cleanup "db_env_open(db): $@" if $@;
3362	};	3695	};
3363	}	3696	}
		3697
		3698	$BDB_DEADLOCK_WATCHER = Event->timer (
		3699	after => 3,
		3700	interval => 1,
		3701	hard => 1,
		3702	prio => 0,
		3703	data => WF_AUTOCANCEL,
		3704	cb => sub {
		3705	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3706	},
		3707	);
		3708	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3709	after => 11,
		3710	interval => 60,
		3711	hard => 1,
		3712	prio => 0,
		3713	data => WF_AUTOCANCEL,
		3714	cb => sub {
		3715	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3716	},
		3717	);
		3718	$BDB_TRICKLE_WATCHER = Event->timer (
		3719	after => 5,
		3720	interval => 10,
		3721	hard => 1,
		3722	prio => 0,
		3723	data => WF_AUTOCANCEL,
		3724	cb => sub {
		3725	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3726	},
		3727	);
3364	}	3728	}
3365		3729
3366	{	3730	{
3367	IO::AIO::min_parallel 8;	3731	IO::AIO::min_parallel 8;
3368		3732
…		…
3371	$AIO_POLL_WATCHER = Event->io (	3735	$AIO_POLL_WATCHER = Event->io (
3372	reentrant => 0,	3736	reentrant => 0,
3373	data => WF_AUTOCANCEL,	3737	data => WF_AUTOCANCEL,
3374	fd => IO::AIO::poll_fileno,	3738	fd => IO::AIO::poll_fileno,
3375	poll => 'r',	3739	poll => 'r',
3376	prio => 6,	3740	prio => 0,
3377	cb => \&IO::AIO::poll_cb,	3741	cb => \&IO::AIO::poll_cb,
3378	);	3742	);
3379	}	3743	}
3380		3744
3381	my $_log_backtrace;	3745	my $_log_backtrace;
…		…
3387		3751
3388	# limit the # of concurrent backtraces	3752	# limit the # of concurrent backtraces
3389	if ($_log_backtrace < 2) {	3753	if ($_log_backtrace < 2) {
3390	++$_log_backtrace;	3754	++$_log_backtrace;
3391	async {	3755	async {
		3756	$Coro::current->{desc} = "abt $msg";
		3757
3392	my @bt = fork_call {	3758	my @bt = fork_call {
3393	@addr = map { sprintf "%x", $_ } @addr;	3759	@addr = map { sprintf "%x", $_ } @addr;
3394	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3760	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3395	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"	3761	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3396	or die "addr2line: $!";	3762	or die "addr2line: $!";

Diff Legend

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