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.288 by root, Mon Jun 25 07:40:53 2007 UTC vs.
Revision 1.370 by root, Thu Sep 13 10:59:41 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 ();
31	use IO::AIO 2.32 ();	32	use IO::AIO 2.32 ();
32	use Time::HiRes;	33	use Time::HiRes;
33	use Compress::LZF;	34	use Compress::LZF;
		35	use Digest::MD5 ();
34		36
35	# configure various modules to our taste	37	# configure various modules to our taste
36	#	38	#
37	$Storable::canonical = 1; # reduce rsync transfers	39	$Storable::canonical = 1; # reduce rsync transfers
38	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	40	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
…		…
78	our $NEXT_TICK;	80	our $NEXT_TICK;
79	our $NOW;	81	our $NOW;
80	our $USE_FSYNC = 1; # use fsync to write maps - default off	82	our $USE_FSYNC = 1; # use fsync to write maps - default off
81		83
82	our $BDB_POLL_WATCHER;	84	our $BDB_POLL_WATCHER;
		85	our $BDB_CHECKPOINT_WATCHER;
		86	our $BDB_TRICKLE_WATCHER;
83	our $DB_ENV;	87	our $DB_ENV;
84		88
85	our %CFG;	89	our %CFG;
86		90
87	our $UPTIME; $UPTIME ||= time;	91	our $UPTIME; $UPTIME ||= time;
88	our $RUNTIME;	92	our $RUNTIME;
89		93
90	our %PLAYER; # all users	94	our (%PLAYER, %PLAYER_LOADING); # all users
91	our %MAP; # all maps	95	our (%MAP, %MAP_LOADING ); # all maps
92	our $LINK_MAP; # the special {link} map, which is always available	96	our $LINK_MAP; # the special {link} map, which is always available
93		97
94	# 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 ∕
95	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	99	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96		100
…		…
166		170
167	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	171	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168	returns directly I<after> the tick processing (and consequently, can only wake one process	172	returns directly I<after> the tick processing (and consequently, can only wake one process
169	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	173	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
170		174
		175	=item @cf::INVOKE_RESULTS
		176
		177	This array contains the results of the last C<invoke ()> call. When
		178	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
		179	that call.
		180
171	=back	181	=back
172		182
173	=cut	183	=cut
174		184
175	BEGIN {	185	BEGIN {
…		…
179	$msg .= "\n"	189	$msg .= "\n"
180	unless $msg =~ /\n$/;	190	unless $msg =~ /\n$/;
181		191
182	$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;
183		193
184	utf8::encode $msg;
185	LOG llevError, $msg;	194	LOG llevError, $msg;
186	};	195	};
187	}	196	}
188		197
189	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	198	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
248		257
249	Converts a perl data structure into its JSON representation.	258	Converts a perl data structure into its JSON representation.
250		259
251	=cut	260	=cut
252		261
253	our $json_coder = JSON::XS->new->convert_blessed->utf8->max_size (1e6); # accept ~1mb max	262	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254		263
255	sub to_json ($) { $json_coder->encode ($_[0]) }	264	sub to_json ($) { $json_coder->encode ($_[0]) }
256	sub from_json ($) { $json_coder->decode ($_[0]) }	265	sub from_json ($) { $json_coder->decode ($_[0]) }
257		266
258	=item cf::lock_wait $string	267	=item cf::lock_wait $string
…		…
264	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
265	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,
266	for example when the coroutine gets canceled), the lock is automatically	275	for example when the coroutine gets canceled), the lock is automatically
267	returned.	276	returned.
268		277
		278	Locks are *not* recursive, locking from the same coro twice results in a
		279	deadlocked coro.
		280
269	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
270	uses map_find and cf::map::load uses map_load).	282	uses map_find and cf::map::load uses map_load).
271		283
272	=item $locked = cf::lock_active $string	284	=item $locked = cf::lock_active $string
273		285
274	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.
275		287
276	=cut	288	=cut
277		289
278	our %LOCK;	290	our %LOCK;
		291	our %LOCKER;#d#
279		292
280	sub lock_wait($) {	293	sub lock_wait($) {
281	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#
282		300
283	# wait for lock, if any	301	# wait for lock, if any
284	while ($LOCK{$key}) {	302	while ($LOCK{$key}) {
285	push @{ $LOCK{$key} }, $Coro::current;	303	push @{ $LOCK{$key} }, $Coro::current;
286	Coro::schedule;	304	Coro::schedule;
…		…
292		310
293	# wait, to be sure we are not locked	311	# wait, to be sure we are not locked
294	lock_wait $key;	312	lock_wait $key;
295		313
296	$LOCK{$key} = [];	314	$LOCK{$key} = [];
		315	$LOCKER{$key} = $Coro::current;#d#
297		316
298	Coro::guard {	317	Coro::guard {
		318	delete $LOCKER{$key};#d#
299	# wake up all waiters, to be on the safe side	319	# wake up all waiters, to be on the safe side
300	$_->ready for @{ delete $LOCK{$key} };	320	$_->ready for @{ delete $LOCK{$key} };
301	}	321	}
302	}	322	}
303		323
…		…
313	my $guard = Coro::guard {	333	my $guard = Coro::guard {
314	$TICK_WATCHER->start;	334	$TICK_WATCHER->start;
315	};	335	};
316	$TICK_WATCHER->stop;	336	$TICK_WATCHER->stop;
317	$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;
318	}	394	}
319		395
320	=item cf::async { BLOCK }	396	=item cf::async { BLOCK }
321		397
322	Currently the same as Coro::async_pool, meaning you cannot use	398	Currently the same as Coro::async_pool, meaning you cannot use
…		…
412	=cut	488	=cut
413		489
414	sub fork_call(&@) {	490	sub fork_call(&@) {
415	my ($cb, @args) = @_;	491	my ($cb, @args) = @_;
416		492
417	# 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,
418	# or die "socketpair: $!";	494	# otherwise perl prematurely frees the stuff :/
419	pipe my $fh1, my $fh2	495	# TODO: investigate and fix (likely this will be rather laborious)
420	or die "pipe: $!";
421		496
422	if (my $pid = fork) {	497	my @res = Coro::Util::fork_eval {
423	close $fh2;
424
425	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426	$res = Coro::Storable::thaw $res;
427
428	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430	die $$res unless "ARRAY" eq ref $res;
431
432	return wantarray ? @$res : $res->[-1];
433	} else {
434	reset_signals;	498	reset_signals;
435	local $SIG{__WARN__};	499	&$cb
436	local $SIG{__DIE__};	500	}, @args;
437	eval {
438	close $fh1;
439		501
440	my @res = eval { $cb->(@args) };	502	wantarray ? @res : $res[-1]
441	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
442	};
443
444	warn $@ if $@;
445	_exit 0;
446	}
447	}	503	}
448		504
449	=item $value = cf::db_get $family => $key	505	=item $value = cf::db_get $family => $key
450		506
451	Returns a single value from the environment database.	507	Returns a single value from the environment database.
…		…
453	=item cf::db_put $family => $key => $value	509	=item cf::db_put $family => $key => $value
454		510
455	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
456	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).
457		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
458	=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	}
459		537
460	our $DB;	538	our $DB;
461		539
462	sub db_init {	540	sub db_init {
463	unless ($DB) {
464	$DB = BDB::db_create $DB_ENV;
465
466	cf::sync_job {	541	cf::sync_job {
467	eval {	542	$DB ||= db_table "db";
468	$DB->set_flags (BDB::CHKSUM);
469
470	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
472	cf::cleanup "db_open(db): $!" if $!;
473	};
474	cf::cleanup "db_open(db): $@" if $@;
475	};
476	}	543	};
477	}	544	}
478		545
479	sub db_get($$) {	546	sub db_get($$) {
480	my $key = "$_[0]/$_[1]";	547	my $key = "$_[0]/$_[1]";
481		548
…		…
531	if (1) {	598	if (1) {
532	$md5 =	599	$md5 =
533	join "\x00",	600	join "\x00",
534	$processversion,	601	$processversion,
535	map {	602	map {
536	Coro::cede;	603	cf::cede_to_tick;
537	($src->[$_], Digest::MD5::md5_hex $data[$_])	604	($src->[$_], Digest::MD5::md5_hex $data[$_])
538	} 0.. $#$src;	605	} 0.. $#$src;
539		606
540		607
541	my $dbmd5 = db_get cache => "$id/md5";	608	my $dbmd5 = db_get cache => "$id/md5";
…		…
847	";	914	";
848	die if $@;	915	die if $@;
849	}	916	}
850		917
851	our $override;	918	our $override;
852	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	919	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
853		920
854	sub override {	921	sub override {
855	$override = 1;	922	$override = 1;
856	@invoke_results = ();	923	@INVOKE_RESULTS = (@_);
857	}	924	}
858		925
859	sub do_invoke {	926	sub do_invoke {
860	my $event = shift;	927	my $event = shift;
861	my $callbacks = shift;	928	my $callbacks = shift;
862		929
863	@invoke_results = ();	930	@INVOKE_RESULTS = ();
864		931
865	local $override;	932	local $override;
866		933
867	for (@$callbacks) {	934	for (@$callbacks) {
868	eval { &{$_->[1]} };	935	eval { &{$_->[1]} };
…		…
885		952
886	Generate an object-specific event with the given arguments.	953	Generate an object-specific event with the given arguments.
887		954
888	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	955	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
889	removed in future versions), and there is no public API to access override	956	removed in future versions), and there is no public API to access override
890	results (if you must, access C<@cf::invoke_results> directly).	957	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891		958
892	=back	959	=back
893		960
894	=cut	961	=cut
895		962
896	#############################################################################	963	#############################################################################
897	# object support	964	# object support
		965	#
		966
		967	sub _can_merge {
		968	my ($ob1, $ob2) = @_;
		969
		970	local $Storable::canonical = 1;
		971	my $fob1 = Storable::freeze $ob1;
		972	my $fob2 = Storable::freeze $ob2;
		973
		974	$fob1 eq $fob2
		975	}
898		976
899	sub reattach {	977	sub reattach {
900	# basically do the same as instantiate, without calling instantiate	978	# basically do the same as instantiate, without calling instantiate
901	my ($obj) = @_;	979	my ($obj) = @_;
902		980
…		…
947	);	1025	);
948		1026
949	sub object_freezer_save {	1027	sub object_freezer_save {
950	my ($filename, $rdata, $objs) = @_;	1028	my ($filename, $rdata, $objs) = @_;
951		1029
		1030	my $guard = cf::lock_acquire "io";
		1031
952	sync_job {	1032	sync_job {
953	if (length $$rdata) {	1033	if (length $$rdata) {
		1034	utf8::decode (my $decname = $filename);
954	warn sprintf "saving %s (%d,%d)\n",	1035	warn sprintf "saving %s (%d,%d)\n",
955	$filename, length $$rdata, scalar @$objs;	1036	$decname, length $$rdata, scalar @$objs;
956		1037
957	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1038	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
958	chmod SAVE_MODE, $fh;	1039	chmod SAVE_MODE, $fh;
959	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1040	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960	aio_fsync $fh if $cf::USE_FSYNC;	1041	aio_fsync $fh if $cf::USE_FSYNC;
…		…
979	}	1060	}
980	} else {	1061	} else {
981	aio_unlink $filename;	1062	aio_unlink $filename;
982	aio_unlink "$filename.pst";	1063	aio_unlink "$filename.pst";
983	}	1064	}
984	}	1065	};
		1066
		1067	undef $guard;
985	}	1068	}
986		1069
987	sub object_freezer_as_string {	1070	sub object_freezer_as_string {
988	my ($rdata, $objs) = @_;	1071	my ($rdata, $objs) = @_;
989		1072
…		…
994		1077
995	sub object_thawer_load {	1078	sub object_thawer_load {
996	my ($filename) = @_;	1079	my ($filename) = @_;
997		1080
998	my ($data, $av);	1081	my ($data, $av);
		1082
		1083	my $guard = cf::lock_acquire "io";
999		1084
1000	(aio_load $filename, $data) >= 0	1085	(aio_load $filename, $data) >= 0
1001	or return;	1086	or return;
1002		1087
1003	unless (aio_stat "$filename.pst") {	1088	unless (aio_stat "$filename.pst") {
1004	(aio_load "$filename.pst", $av) >= 0	1089	(aio_load "$filename.pst", $av) >= 0
1005	or return;	1090	or return;
		1091
		1092	undef $guard;
1006	$av = eval { (Storable::thaw $av)->{objs} };	1093	$av = eval { (Storable::thaw $av)->{objs} };
1007	}	1094	}
1008		1095
		1096	utf8::decode (my $decname = $filename);
1009	warn sprintf "loading %s (%d)\n",	1097	warn sprintf "loading %s (%d,%d)\n",
1010	$filename, length $data, scalar @{$av || []};	1098	$decname, length $data, scalar @{$av || []};
		1099
1011	return ($data, $av);	1100	($data, $av)
1012	}	1101	}
1013		1102
1014	=head2 COMMAND CALLBACKS	1103	=head2 COMMAND CALLBACKS
1015		1104
1016	=over 4	1105	=over 4
…		…
1086	cf::override;	1175	cf::override;
1087	},	1176	},
1088	on_extcmd => sub {	1177	on_extcmd => sub {
1089	my ($pl, $buf) = @_;	1178	my ($pl, $buf) = @_;
1090		1179
1091	my $msg = eval { from_json $buf };	1180	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092		1181
1093	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
1094	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1190	if (my $cb = $EXTCMD{$type}) {
1095	if (my %reply = $cb->($pl, $msg)) {	1191	@reply = $cb->($pl, @payload);
1096	$pl->ext_reply ($msg->{msgid}, %reply);
1097	}
1098	}	1192	}
		1193
		1194	$pl->ext_reply ($reply, @reply)
		1195	if $reply;
		1196
1099	} else {	1197	} else {
1100	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1198	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101	}	1199	}
1102		1200
1103	cf::override;	1201	cf::override;
…		…
1193		1291
1194	=head3 cf::player	1292	=head3 cf::player
1195		1293
1196	=over 4	1294	=over 4
1197		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
1198	=item cf::player::find $login	1310	=item cf::player::find $login
1199		1311
1200	Returns the given player object, loading it if necessary (might block).	1312	Returns the given player object, loading it if necessary (might block).
1201		1313
1202	=cut	1314	=cut
…		…
1237	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1349	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1350	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1351	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240	aio_unlink +(playerdir $login) . "/$login.pl";	1352	aio_unlink +(playerdir $login) . "/$login.pl";
1241		1353
1242	my $pl = load_pl path $login	1354	my $f = new_from_file cf::object::thawer path $login
1243	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;
1244	$cf::PLAYER{$login} = $pl	1362	$cf::PLAYER{$login} = $pl
1245	}	1363	}
1246	}	1364	}
1247	}	1365	}
1248		1366
…		…
1258		1376
1259	aio_mkdir playerdir $pl, 0770;	1377	aio_mkdir playerdir $pl, 0770;
1260	$pl->{last_save} = $cf::RUNTIME;	1378	$pl->{last_save} = $cf::RUNTIME;
1261		1379
1262	$pl->save_pl ($path);	1380	$pl->save_pl ($path);
1263	Coro::cede;	1381	cf::cede_to_tick;
1264	}	1382	}
1265		1383
1266	sub new($) {	1384	sub new($) {
1267	my ($login) = @_;	1385	my ($login) = @_;
1268		1386
…		…
1272	$self->{deny_save} = 1;	1390	$self->{deny_save} = 1;
1273		1391
1274	$cf::PLAYER{$login} = $self;	1392	$cf::PLAYER{$login} = $self;
1275		1393
1276	$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 (@_);
1277	}	1405	}
1278		1406
1279	=item $pl->quit_character	1407	=item $pl->quit_character
1280		1408
1281	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
…		…
1336	or return [];	1464	or return [];
1337		1465
1338	my @logins;	1466	my @logins;
1339		1467
1340	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") {
1341	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1473	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342	aio_read $fh, 0, 512, my $buf, 0 or next;	1474	aio_read $fh, 0, 512, my $buf, 0 or next;
1343	$buf !~ /^password -------------$/m or next; # official not-valid tag	1475	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1476	}
1344		1477
1345	utf8::decode $login;	1478	utf8::decode $login;
1346	push @logins, $login;	1479	push @logins, $login;
1347	}	1480	}
1348		1481
…		…
1386	sub expand_cfpod {	1519	sub expand_cfpod {
1387	((my $self), (local $_)) = @_;	1520	((my $self), (local $_)) = @_;
1388		1521
1389	# escape & and <	1522	# escape & and <
1390	s/&/&amp;/g;	1523	s/&/&amp;/g;
1391	s/(?<![BIUGH])</&lt;/g;	1524	s/(?<![BIUGHT])</&lt;/g;
1392		1525
1393	# 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
1394		1527
1395	1 while	1528	1 while
1396	# replace B<>, I<>, U<> etc.	1529	# replace B<>, I<>, U<> etc.
1397	s/B<([^\>]*)>/<b>$1<\/b>/	1530	s/B<([^\>]*)>/<b>$1<\/b>/
1398	|| s/I<([^\>]*)>/<i>$1<\/i>/	1531	|| s/I<([^\>]*)>/<i>$1<\/i>/
1399	|| s/U<([^\>]*)>/<u>$1<\/u>/	1532	|| s/U<([^\>]*)>/<u>$1<\/u>/
		1533	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1400	# replace G<male|female> tags	1534	# replace G<male|female> tags
1401	|| s{G<([^>|]*)\|([^>]*)>}{	1535	|| s{G<([^>|]*)\|([^>]*)>}{
1402	$self->gender ? $2 : $1	1536	$self->gender ? $2 : $1
1403	}ge	1537	}ge
1404	# replace H<hint text>	1538	# replace H<hint text>
1405	|| s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;	1539	|| s{H<([^\>]*)>}
		1540	{
		1541	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1542	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1543	"")
		1544	[$self->{hintmode}]
		1545	}ge;
1406		1546
1407	# create single paragraphs (very hackish)	1547	# create single paragraphs (very hackish)
1408	s/(?<=\S)\n(?=\w)/ /g;	1548	s/(?<=\S)\n(?=\w)/ /g;
1409		1549
		1550	# compress some whitespace
		1551	s/\s+\n/\n/g; # ws line-ends
		1552	s/\n\n+/\n/g; # double lines
		1553	s/^\n+//; # beginning lines
		1554	s/\n+$//; # ending lines
		1555
1410	$_	1556	$_
1411	}	1557	}
1412		1558
		1559	sub hintmode {
		1560	$_[0]{hintmode} = $_[1] if @_ > 1;
		1561	$_[0]{hintmode}
		1562	}
		1563
1413	=item $player->ext_reply ($msgid, %msg)	1564	=item $player->ext_reply ($msgid, @msg)
1414		1565
1415	Sends an ext reply to the player.	1566	Sends an ext reply to the player.
1416		1567
1417	=cut	1568	=cut
1418		1569
1419	sub ext_reply($$%) {	1570	sub ext_reply($$@) {
1420	my ($self, $id, %msg) = @_;	1571	my ($self, $id, @msg) = @_;
1421		1572
1422	$msg{msgid} = $id;	1573	$self->ns->ext_reply ($id, @msg)
1423	$self->send ("ext " . cf::to_json \%msg);
1424	}	1574	}
1425		1575
1426	=item $player->ext_event ($type, %msg)	1576	=item $player->ext_msg ($type, @msg)
1427		1577
1428	Sends an ext event to the client.	1578	Sends an ext event to the client.
1429		1579
1430	=cut	1580	=cut
1431		1581
1432	sub ext_event($$%) {	1582	sub ext_msg($$@) {
1433	my ($self, $type, %msg) = @_;	1583	my ($self, $type, @msg) = @_;
1434		1584
1435	$self->ns->ext_event ($type, %msg);	1585	$self->ns->ext_msg ($type, @msg);
1436	}	1586	}
1437		1587
1438	=head3 cf::region	1588	=head3 cf::region
1439		1589
1440	=over 4	1590	=over 4
…		…
1453	my ($path) = @_;	1603	my ($path) = @_;
1454		1604
1455	my ($match, $specificity);	1605	my ($match, $specificity);
1456		1606
1457	for my $region (list) {	1607	for my $region (list) {
1458	if ($region->match && $path =~ $region->match) {	1608	if ($region->{match} && $path =~ $region->{match}) {
1459	($match, $specificity) = ($region, $region->specificity)	1609	($match, $specificity) = ($region, $region->specificity)
1460	if $region->specificity > $specificity;	1610	if $region->specificity > $specificity;
1461	}	1611	}
1462	}	1612	}
1463		1613
…		…
1583	$self->init; # pass $1 etc.	1733	$self->init; # pass $1 etc.
1584	return $self;	1734	return $self;
1585	}	1735	}
1586	}	1736	}
1587		1737
1588	Carp::carp "unable to resolve path '$path' (base '$base').";	1738	Carp::cluck "unable to resolve path '$path' (base '$base').";
1589	()	1739	()
1590	}	1740	}
1591		1741
1592	sub init {	1742	sub init {
1593	my ($self) = @_;	1743	my ($self) = @_;
…		…
1656		1806
1657	sub load_header_from($) {	1807	sub load_header_from($) {
1658	my ($self, $path) = @_;	1808	my ($self, $path) = @_;
1659		1809
1660	utf8::encode $path;	1810	utf8::encode $path;
1661	#aio_open $path, O_RDONLY, 0	1811	my $f = new_from_file cf::object::thawer $path
1662	# or return;
1663
1664	$self->_load_header ($path)
1665	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;
1666		1819
1667	$self->{load_path} = $path;	1820	$self->{load_path} = $path;
1668		1821
1669	1	1822	1
1670	}	1823	}
…		…
1724	sub find {	1877	sub find {
1725	my ($path, $origin) = @_;	1878	my ($path, $origin) = @_;
1726		1879
1727	$path = normalise $path, $origin && $origin->path;	1880	$path = normalise $path, $origin && $origin->path;
1728		1881
		1882	cf::lock_wait "map_data:$path";#d#remove
1729	cf::lock_wait "map_find:$path";	1883	cf::lock_wait "map_find:$path";
1730		1884
1731	$cf::MAP{$path} || do {	1885	$cf::MAP{$path} || do {
1732	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
1733	my $map = new_from_path cf::map $path	1889	my $map = new_from_path cf::map $path
1734	or return;	1890	or return;
1735		1891
1736	$map->{last_save} = $cf::RUNTIME;	1892	$map->{last_save} = $cf::RUNTIME;
1737		1893
…		…
1739	or return;	1895	or return;
1740		1896
1741	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1897	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1742	# doing this can freeze the server in a sync job, obviously	1898	# doing this can freeze the server in a sync job, obviously
1743	#$cf::WAIT_FOR_TICK->wait;	1899	#$cf::WAIT_FOR_TICK->wait;
		1900	undef $guard1;
		1901	undef $guard2;
1744	$map->reset;	1902	$map->reset;
1745	undef $guard;
1746	return find $path;	1903	return find $path;
1747	}	1904	}
1748		1905
1749	$cf::MAP{$path} = $map	1906	$cf::MAP{$path} = $map
1750	}	1907	}
…		…
1759	local $self->{deny_reset} = 1; # loading can take a long time	1916	local $self->{deny_reset} = 1; # loading can take a long time
1760		1917
1761	my $path = $self->{path};	1918	my $path = $self->{path};
1762		1919
1763	{	1920	{
1764	my $guard = cf::lock_acquire "map_load:$path";	1921	my $guard = cf::lock_acquire "map_data:$path";
1765		1922
		1923	return unless $self->valid;
1766	return if $self->in_memory != cf::MAP_SWAPPED;	1924	return unless $self->in_memory == cf::MAP_SWAPPED;
1767		1925
1768	$self->in_memory (cf::MAP_LOADING);	1926	$self->in_memory (cf::MAP_LOADING);
1769		1927
1770	$self->alloc;	1928	$self->alloc;
1771		1929
1772	$self->pre_load;	1930	$self->pre_load;
1773	Coro::cede;	1931	cf::cede_to_tick;
1774		1932
		1933	my $f = new_from_file cf::object::thawer $self->{load_path};
		1934	$f->skip_block;
1775	$self->_load_objects ($self->{load_path}, 1)	1935	$self->_load_objects ($f)
1776	or return;	1936	or return;
1777		1937
1778	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1938	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1779	if delete $self->{load_original};	1939	if delete $self->{load_original};
1780		1940
1781	if (my $uniq = $self->uniq_path) {	1941	if (my $uniq = $self->uniq_path) {
1782	utf8::encode $uniq;	1942	utf8::encode $uniq;
1783	if (aio_open $uniq, O_RDONLY, 0) {	1943	unless (aio_stat $uniq) {
		1944	if (my $f = new_from_file cf::object::thawer $uniq) {
1784	$self->clear_unique_items;	1945	$self->clear_unique_items;
1785	$self->_load_objects ($uniq, 0);	1946	$self->_load_objects ($f);
		1947	$f->resolve_delayed_derefs;
		1948	}
1786	}	1949	}
1787	}	1950	}
1788		1951
1789	Coro::cede;	1952	$f->resolve_delayed_derefs;
		1953
		1954	cf::cede_to_tick;
1790	# now do the right thing for maps	1955	# now do the right thing for maps
1791	$self->link_multipart_objects;	1956	$self->link_multipart_objects;
1792	$self->difficulty ($self->estimate_difficulty)	1957	$self->difficulty ($self->estimate_difficulty)
1793	unless $self->difficulty;	1958	unless $self->difficulty;
1794	Coro::cede;	1959	cf::cede_to_tick;
1795		1960
1796	unless ($self->{deny_activate}) {	1961	unless ($self->{deny_activate}) {
1797	$self->decay_objects;	1962	$self->decay_objects;
1798	$self->fix_auto_apply;	1963	$self->fix_auto_apply;
1799	$self->update_buttons;	1964	$self->update_buttons;
1800	Coro::cede;	1965	cf::cede_to_tick;
1801	$self->set_darkness_map;	1966	$self->set_darkness_map;
1802	Coro::cede;	1967	cf::cede_to_tick;
1803	$self->activate;	1968	$self->activate;
1804	}	1969	}
		1970
		1971	$self->{last_save} = $cf::RUNTIME;
		1972	$self->last_access ($cf::RUNTIME);
1805		1973
1806	$self->in_memory (cf::MAP_IN_MEMORY);	1974	$self->in_memory (cf::MAP_IN_MEMORY);
1807	}	1975	}
1808		1976
1809	$self->post_load;	1977	$self->post_load;
…		…
1820		1988
1821	$self	1989	$self
1822	}	1990	}
1823		1991
1824	# 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
1825	sub load_diag {	1993	sub load_neighbours {
1826	my ($map) = @_;	1994	my ($map) = @_;
1827		1995
1828	my @diag; # diagonal neighbours	1996	my @neigh; # diagonal neighbours
1829		1997
1830	for (0 .. 3) {	1998	for (0 .. 3) {
1831	my $neigh = $map->tile_path ($_)	1999	my $neigh = $map->tile_path ($_)
1832	or next;	2000	or next;
1833	$neigh = find $neigh, $map	2001	$neigh = find $neigh, $map
1834	or next;	2002	or next;
1835	$neigh->load;	2003	$neigh->load;
1836		2004
		2005	push @neigh,
1837	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2006	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1838	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2007	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1839	}	2008	}
1840		2009
1841	for (@diag) {	2010	for (grep defined $_->[0], @neigh) {
		2011	my ($path, $origin) = @$_;
1842	my $neigh = find @$_	2012	my $neigh = find $path, $origin
1843	or next;	2013	or next;
1844	$neigh->load;	2014	$neigh->load;
1845	}	2015	}
1846	}	2016	}
1847		2017
…		…
1852	}	2022	}
1853		2023
1854	sub do_load_sync {	2024	sub do_load_sync {
1855	my ($map) = @_;	2025	my ($map) = @_;
1856		2026
		2027	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2028	if $Coro::current == $Coro::main;
		2029
1857	cf::sync_job { $map->load };	2030	cf::sync_job { $map->load };
1858	}	2031	}
1859		2032
1860	our %MAP_PREFETCH;	2033	our %MAP_PREFETCH;
1861	our $MAP_PREFETCHER = undef;	2034	our $MAP_PREFETCHER = undef;
1862		2035
1863	sub find_async {	2036	sub find_async {
1864	my ($path, $origin) = @_;	2037	my ($path, $origin, $load) = @_;
1865		2038
1866	$path = normalise $path, $origin && $origin->{path};	2039	$path = normalise $path, $origin && $origin->{path};
1867		2040
1868	if (my $map = $cf::MAP{$path}) {	2041	if (my $map = $cf::MAP{$path}) {
1869	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2042	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1870	}	2043	}
1871		2044
1872	undef $MAP_PREFETCH{$path};	2045	$MAP_PREFETCH{$path} |= $load;
		2046
1873	$MAP_PREFETCHER ||= cf::async {	2047	$MAP_PREFETCHER ||= cf::async {
1874	while (%MAP_PREFETCH) {	2048	while (%MAP_PREFETCH) {
1875	for my $path (keys %MAP_PREFETCH) {	2049	while (my ($k, $v) = each %MAP_PREFETCH) {
1876	my $map = find $path	2050	if (my $map = find $k) {
1877	or next;
1878	$map->load;	2051	$map->load if $v;
		2052	}
1879		2053
1880	delete $MAP_PREFETCH{$path};	2054	delete $MAP_PREFETCH{$k};
1881	}	2055	}
1882	}	2056	}
1883	undef $MAP_PREFETCHER;	2057	undef $MAP_PREFETCHER;
1884	};	2058	};
1885	$MAP_PREFETCHER->prio (6);	2059	$MAP_PREFETCHER->prio (6);
…		…
1888	}	2062	}
1889		2063
1890	sub save {	2064	sub save {
1891	my ($self) = @_;	2065	my ($self) = @_;
1892		2066
1893	my $lock = cf::lock_acquire "map_data:" . $self->path;	2067	my $lock = cf::lock_acquire "map_data:$self->{path}";
1894		2068
1895	$self->{last_save} = $cf::RUNTIME;	2069	$self->{last_save} = $cf::RUNTIME;
1896		2070
1897	return unless $self->dirty;	2071	return unless $self->dirty;
1898		2072
…		…
1921	my ($self) = @_;	2095	my ($self) = @_;
1922		2096
1923	# save first because save cedes	2097	# save first because save cedes
1924	$self->save;	2098	$self->save;
1925		2099
1926	my $lock = cf::lock_acquire "map_data:" . $self->path;	2100	my $lock = cf::lock_acquire "map_data:$self->{path}";
1927		2101
1928	return if $self->players;	2102	return if $self->players;
1929	return if $self->in_memory != cf::MAP_IN_MEMORY;	2103	return if $self->in_memory != cf::MAP_IN_MEMORY;
1930	return if $self->{deny_save};	2104	return if $self->{deny_save};
1931		2105
		2106	$self->in_memory (cf::MAP_SWAPPED);
		2107
		2108	$self->deactivate;
		2109	$_->clear_links_to ($self) for values %cf::MAP;
1932	$self->clear;	2110	$self->clear;
1933	$self->in_memory (cf::MAP_SWAPPED);
1934	}	2111	}
1935		2112
1936	sub reset_at {	2113	sub reset_at {
1937	my ($self) = @_;	2114	my ($self) = @_;
1938		2115
…		…
1970	if $uniq;	2147	if $uniq;
1971	}	2148	}
1972		2149
1973	delete $cf::MAP{$self->path};	2150	delete $cf::MAP{$self->path};
1974		2151
		2152	$self->deactivate;
		2153	$_->clear_links_to ($self) for values %cf::MAP;
1975	$self->clear;	2154	$self->clear;
1976
1977	$_->clear_links_to ($self) for values %cf::MAP;
1978		2155
1979	$self->unlink_save;	2156	$self->unlink_save;
1980	$self->destroy;	2157	$self->destroy;
1981	}	2158	}
1982		2159
1983	my $nuke_counter = "aaaa";	2160	my $nuke_counter = "aaaa";
1984		2161
1985	sub nuke {	2162	sub nuke {
1986	my ($self) = @_;	2163	my ($self) = @_;
1987		2164
		2165	{
		2166	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2167
1988	delete $cf::MAP{$self->path};	2168	delete $cf::MAP{$self->path};
1989		2169
1990	$self->unlink_save;	2170	$self->unlink_save;
1991		2171
1992	bless $self, "cf::map";	2172	bless $self, "cf::map";
1993	delete $self->{deny_reset};	2173	delete $self->{deny_reset};
1994	$self->{deny_save} = 1;	2174	$self->{deny_save} = 1;
1995	$self->reset_timeout (1);	2175	$self->reset_timeout (1);
1996	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2176	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1997		2177
1998	$cf::MAP{$self->path} = $self;	2178	$cf::MAP{$self->path} = $self;
		2179	}
1999		2180
2000	$self->reset; # polite request, might not happen	2181	$self->reset; # polite request, might not happen
2001	}	2182	}
2002		2183
2003	=item $maps = cf::map::tmp_maps	2184	=item $maps = cf::map::tmp_maps
…		…
2079		2260
2080	sub inv_recursive {	2261	sub inv_recursive {
2081	inv_recursive_ inv $_[0]	2262	inv_recursive_ inv $_[0]
2082	}	2263	}
2083		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
2084	package cf;	2296	package cf;
2085		2297
2086	=back	2298	=back
2087		2299
2088	=head3 cf::object::player	2300	=head3 cf::object::player
…		…
2110		2322
2111	} else {	2323	} else {
2112	my $pl = $self->contr;	2324	my $pl = $self->contr;
2113		2325
2114	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2326	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2115	my $diag = $pl->{npc_dialog};	2327	my $dialog = $pl->{npc_dialog};
2116	$diag->{pl}->ext_reply (	2328	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2117	$diag->{id},
2118	msgtype => "reply",
2119	msg => $diag->{pl}->expand_cfpod ($msg),
2120	add_topics => []
2121	);
2122		2329
2123	} else {	2330	} else {
2124	$msg = $npc->name . " says: $msg" if $npc;	2331	$msg = $npc->name . " says: $msg" if $npc;
2125	$self->message ($msg, $flags);	2332	$self->message ($msg, $flags);
2126	}	2333	}
2127	}	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 (@_);
2128	}	2345	}
2129		2346
2130	=item $player_object->may ("access")	2347	=item $player_object->may ("access")
2131		2348
2132	Returns wether the given player is authorized to access resource "access"	2349	Returns wether the given player is authorized to access resource "access"
…		…
2211	# use -1 or undef as default coordinates, not 0, 0	2428	# use -1 or undef as default coordinates, not 0, 0
2212	($x, $y) = ($map->enter_x, $map->enter_y)	2429	($x, $y) = ($map->enter_x, $map->enter_y)
2213	if $x <=0 && $y <= 0;	2430	if $x <=0 && $y <= 0;
2214		2431
2215	$map->load;	2432	$map->load;
2216	$map->load_diag;	2433	$map->load_neighbours;
2217		2434
2218	return unless $self->contr->active;	2435	return unless $self->contr->active;
2219	$self->activate_recursive;	2436	$self->activate_recursive;
2220		2437
2221	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2438	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2222	$self->enter_map ($map, $x, $y);	2439	$self->enter_map ($map, $x, $y);
2223	}	2440	}
2224		2441
2225	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2442	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2226		2443
2227	Moves the player to the given map-path and coordinates by first freezing	2444	Moves the player to the given map-path and coordinates by first freezing
2228	her, loading and preparing them map, calling the provided $check callback	2445	her, loading and preparing them map, calling the provided $check callback
2229	that has to return the map if sucecssful, and then unfreezes the player on	2446	that has to return the map if sucecssful, and then unfreezes the player on
2230	the new (success) or old (failed) map position.	2447	the new (success) or old (failed) map position. In either case, $done will
		2448	be called at the end of this process.
2231		2449
2232	=cut	2450	=cut
2233		2451
2234	our $GOTOGEN;	2452	our $GOTOGEN;
2235		2453
2236	sub cf::object::player::goto {	2454	sub cf::object::player::goto {
2237	my ($self, $path, $x, $y, $check) = @_;	2455	my ($self, $path, $x, $y, $check, $done) = @_;
2238		2456
2239	# do generation counting so two concurrent goto's will be executed in-order	2457	# do generation counting so two concurrent goto's will be executed in-order
2240	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2458	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2241		2459
2242	$self->enter_link;	2460	$self->enter_link;
2243		2461
2244	(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	} else {
		2472	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2473	}
		2474	# else put us there anyways for now #d#
		2475
		2476	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2477	} else {
		2478	($path, $x, $y) = (undef, undef, undef);
		2479	}
		2480	}
		2481
2245	my $map = eval {	2482	my $map = eval {
2246	my $map = cf::map::find $path;	2483	my $map = defined $path ? cf::map::find $path : undef;
2247		2484
2248	if ($map) {	2485	if ($map) {
2249	$map = $map->customise_for ($self);	2486	$map = $map->customise_for ($self);
2250	$map = $check->($map) if $check && $map;	2487	$map = $check->($map) if $check && $map;
2251	} else {	2488	} else {
2252	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2489	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2253	}	2490	}
2254		2491
2255	$map	2492	$map
2256	};	2493	};
2257		2494
…		…
2262		2499
2263	if ($gen == $self->{_goto_generation}) {	2500	if ($gen == $self->{_goto_generation}) {
2264	delete $self->{_goto_generation};	2501	delete $self->{_goto_generation};
2265	$self->leave_link ($map, $x, $y);	2502	$self->leave_link ($map, $x, $y);
2266	}	2503	}
		2504
		2505	$done->() if $done;
2267	})->prio (1);	2506	})->prio (1);
2268	}	2507	}
2269		2508
2270	=item $player_object->enter_exit ($exit_object)	2509	=item $player_object->enter_exit ($exit_object)
2271		2510
…		…
2340	my $hp = $exit->stats->hp;	2579	my $hp = $exit->stats->hp;
2341	my $sp = $exit->stats->sp;	2580	my $sp = $exit->stats->sp;
2342		2581
2343	$self->enter_link;	2582	$self->enter_link;
2344		2583
		2584	# if exit is damned, update players death & WoR home-position
		2585	$self->contr->savebed ($slaying, $hp, $sp)
		2586	if $exit->flag (FLAG_DAMNED);
		2587
2345	(async {	2588	(async {
2346	$self->deactivate_recursive; # just to be sure	2589	$self->deactivate_recursive; # just to be sure
2347	unless (eval {	2590	unless (eval {
2348	$self->goto ($slaying, $hp, $sp);	2591	$self->goto ($slaying, $hp, $sp);
2349		2592
…		…
2376		2619
2377	utf8::encode $text;	2620	utf8::encode $text;
2378	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2621	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2379	}	2622	}
2380		2623
2381	=item $client->send_msg ($color, $type, $msg, [extra...])	2624	=item $client->send_msg ($channel, $msg, $color, [extra...])
2382		2625
2383	Send a drawinfo or msg packet to the client, formatting the msg for the	2626	Send a drawinfo or msg packet to the client, formatting the msg for the
2384	client if neccessary. C<$type> should be a string identifying the type of	2627	client if neccessary. C<$type> should be a string identifying the type of
2385	the message, with C<log> being the default. If C<$color> is negative, suppress	2628	the message, with C<log> being the default. If C<$color> is negative, suppress
2386	the message unless the client supports the msg packet.	2629	the message unless the client supports the msg packet.
2387		2630
2388	=cut	2631	=cut
2389		2632
		2633	our %CHANNEL = (
		2634	"c/identify" => {
		2635	id => "identify",
		2636	title => "Identify",
		2637	reply => undef,
		2638	tooltip => "Items recently identified",
		2639	},
		2640	"c/examine" => {
		2641	id => "examine",
		2642	title => "Examine",
		2643	reply => undef,
		2644	tooltip => "Signs and other items you examined",
		2645	},
		2646	);
		2647
2390	sub cf::client::send_msg {	2648	sub cf::client::send_msg {
2391	my ($self, $color, $type, $msg, @extra) = @_;	2649	my ($self, $channel, $msg, $color, @extra) = @_;
2392		2650
2393	$msg = $self->pl->expand_cfpod ($msg);	2651	$msg = $self->pl->expand_cfpod ($msg);
2394		2652
		2653	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2654
		2655	# check predefined channels, for the benefit of C
		2656	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};
		2657
		2658	if (ref $channel) {
		2659	# send meta info to client, if not yet sent
		2660	unless (exists $self->{channel}{$channel->{id}}) {
		2661	$self->{channel}{$channel->{id}} = $channel;
		2662	$self->ext_msg (channel_info => $channel)
		2663	if $self->can_msg;
		2664	}
		2665
		2666	$channel = $channel->{id};
		2667	}
		2668
		2669	return unless @extra || length $msg;
		2670
2395	if ($self->can_msg) {	2671	if ($self->can_msg) {
2396	$self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);	2672	# default colour, mask it out
		2673	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2674	if $color & cf::NDI_DEF;
		2675
		2676	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2677	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2397	} else {	2678	} else {
2398	# replace some tags by gcfclient-compatible ones
2399	for ($msg) {
2400	1 while
2401	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2402	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2403	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2404	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2405	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2406	}
2407
2408	if ($color >= 0) {	2679	if ($color >= 0) {
		2680	# replace some tags by gcfclient-compatible ones
		2681	for ($msg) {
		2682	1 while
		2683	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2684	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2685	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2686	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2687	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2688	}
		2689
		2690	$color &= cf::NDI_COLOR_MASK;
		2691
		2692	utf8::encode $msg;
		2693
2409	if (0 && $msg =~ /\[/) {	2694	if (0 && $msg =~ /\[/) {
		2695	# COMMAND/INFO
2410	$self->send_packet ("drawextinfo $color 4 0 $msg")	2696	$self->send_packet ("drawextinfo $color 10 8 $msg")
2411	} else {	2697	} else {
2412	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;	2698	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2413	$self->send_packet ("drawinfo $color $msg")	2699	$self->send_packet ("drawinfo $color $msg")
2414	}	2700	}
2415	}	2701	}
2416	}	2702	}
2417	}	2703	}
2418		2704
2419	=item $client->ext_event ($type, %msg)	2705	=item $client->ext_msg ($type, @msg)
2420		2706
2421	Sends an ext event to the client.	2707	Sends an ext event to the client.
2422		2708
2423	=cut	2709	=cut
2424		2710
2425	sub cf::client::ext_event($$%) {	2711	sub cf::client::ext_msg($$@) {
2426	my ($self, $type, %msg) = @_;	2712	my ($self, $type, @msg) = @_;
2427		2713
		2714	if ($self->extcmd == 2) {
		2715	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2716	} elsif ($self->extcmd == 1) { # TODO: remove
2428	$msg{msgtype} = "event_$type";	2717	push @msg, msgtype => "event_$type";
2429	$self->send_packet ("ext " . cf::to_json \%msg);	2718	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2719	}
		2720	}
		2721
		2722	=item $client->ext_reply ($msgid, @msg)
		2723
		2724	Sends an ext reply to the client.
		2725
		2726	=cut
		2727
		2728	sub cf::client::ext_reply($$@) {
		2729	my ($self, $id, @msg) = @_;
		2730
		2731	if ($self->extcmd == 2) {
		2732	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2733	} elsif ($self->extcmd == 1) {
		2734	#TODO: version 1, remove
		2735	unshift @msg, msgtype => "reply", msgid => $id;
		2736	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2737	}
2430	}	2738	}
2431		2739
2432	=item $success = $client->query ($flags, "text", \&cb)	2740	=item $success = $client->query ($flags, "text", \&cb)
2433		2741
2434	Queues a query to the client, calling the given callback with	2742	Queues a query to the client, calling the given callback with
…		…
2457		2765
2458	1	2766	1
2459	}	2767	}
2460		2768
2461	cf::client->attach (	2769	cf::client->attach (
		2770	on_connect => sub {
		2771	my ($ns) = @_;
		2772
		2773	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2774	},
2462	on_reply => sub {	2775	on_reply => sub {
2463	my ($ns, $msg) = @_;	2776	my ($ns, $msg) = @_;
2464		2777
2465	# this weird shuffling is so that direct followup queries	2778	# this weird shuffling is so that direct followup queries
2466	# get handled first	2779	# get handled first
…		…
2481	}	2794	}
2482	},	2795	},
2483	on_exticmd => sub {	2796	on_exticmd => sub {
2484	my ($ns, $buf) = @_;	2797	my ($ns, $buf) = @_;
2485		2798
2486	my $msg = eval { from_json $buf };	2799	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2487		2800
2488	if (ref $msg) {	2801	if (ref $msg) {
		2802	my ($type, $reply, @payload) =
		2803	"ARRAY" eq ref $msg
		2804	? @$msg
		2805	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2806
		2807	my @reply;
		2808
2489	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2809	if (my $cb = $EXTICMD{$type}) {
2490	if (my %reply = $cb->($ns, $msg)) {	2810	@reply = $cb->($ns, @payload);
2491	$reply{msgid} = $msg->{msgid};
2492	$ns->send ("ext " . cf::to_json \%reply);
2493	}
2494	}	2811	}
		2812
		2813	$ns->ext_reply ($reply, @reply)
		2814	if $reply;
		2815
2495	} else {	2816	} else {
2496	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2817	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2497	}	2818	}
2498		2819
2499	cf::override;	2820	cf::override;
…		…
2546	our $safe = new Safe "safe";	2867	our $safe = new Safe "safe";
2547	our $safe_hole = new Safe::Hole;	2868	our $safe_hole = new Safe::Hole;
2548		2869
2549	$SIG{FPE} = 'IGNORE';	2870	$SIG{FPE} = 'IGNORE';
2550		2871
2551	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2872	$safe->permit_only (Opcode::opset qw(
		2873	:base_core :base_mem :base_orig :base_math
		2874	grepstart grepwhile mapstart mapwhile
		2875	sort time
		2876	));
2552		2877
2553	# here we export the classes and methods available to script code	2878	# here we export the classes and methods available to script code
2554		2879
2555	=pod	2880	=pod
2556		2881
2557	The following functions and methods are available within a safe environment:	2882	The following functions and methods are available within a safe environment:
2558		2883
2559	cf::object contr pay_amount pay_player map	2884	cf::object
		2885	contr pay_amount pay_player map x y force_find force_add
		2886	insert remove name archname title slaying race decrease_ob_nr
		2887
2560	cf::object::player player	2888	cf::object::player
2561	cf::player peaceful	2889	player
2562	cf::map trigger	2890
		2891	cf::player
		2892	peaceful
		2893
		2894	cf::map
		2895	trigger
2563		2896
2564	=cut	2897	=cut
2565		2898
2566	for (	2899	for (
2567	["cf::object" => qw(contr pay_amount pay_player map)],	2900	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2901	insert remove inv name archname title slaying race
		2902	decrease_ob_nr)],
2568	["cf::object::player" => qw(player)],	2903	["cf::object::player" => qw(player)],
2569	["cf::player" => qw(peaceful)],	2904	["cf::player" => qw(peaceful)],
2570	["cf::map" => qw(trigger)],	2905	["cf::map" => qw(trigger)],
2571	) {	2906	) {
2572	no strict 'refs';	2907	no strict 'refs';
…		…
2648	# the server's init and main functions	2983	# the server's init and main functions
2649		2984
2650	sub load_facedata($) {	2985	sub load_facedata($) {
2651	my ($path) = @_;	2986	my ($path) = @_;
2652		2987
		2988	# HACK to clear player env face cache, we need some signal framework
		2989	# for this (global event?)
		2990	%ext::player_env::MUSIC_FACE_CACHE = ();
		2991
		2992	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		2993
2653	warn "loading facedata from $path\n";	2994	warn "loading facedata from $path\n";
2654		2995
2655	my $facedata;	2996	my $facedata;
2656	0 < aio_load $path, $facedata	2997	0 < aio_load $path, $facedata
2657	or die "$path: $!";	2998	or die "$path: $!";
…		…
2659	$facedata = Coro::Storable::thaw $facedata;	3000	$facedata = Coro::Storable::thaw $facedata;
2660		3001
2661	$facedata->{version} == 2	3002	$facedata->{version} == 2
2662	or cf::cleanup "$path: version mismatch, cannot proceed.";	3003	or cf::cleanup "$path: version mismatch, cannot proceed.";
2663		3004
		3005	# patch in the exptable
		3006	$facedata->{resource}{"res/exp_table"} = {
		3007	type => FT_RSRC,
		3008	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3009	};
		3010	cf::cede_to_tick;
		3011
2664	{	3012	{
2665	my $faces = $facedata->{faceinfo};	3013	my $faces = $facedata->{faceinfo};
2666		3014
2667	while (my ($face, $info) = each %$faces) {	3015	while (my ($face, $info) = each %$faces) {
2668	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3016	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2669	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3017	cf::face::set_visibility $idx, $info->{visibility};
		3018	cf::face::set_magicmap $idx, $info->{magicmap};
2670	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3019	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2671	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3020	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2672	Coro::cede;	3021
		3022	cf::cede_to_tick;
2673	}	3023	}
2674		3024
2675	while (my ($face, $info) = each %$faces) {	3025	while (my ($face, $info) = each %$faces) {
2676	next unless $info->{smooth};	3026	next unless $info->{smooth};
2677	my $idx = cf::face::find $face	3027	my $idx = cf::face::find $face
2678	or next;	3028	or next;
2679	if (my $smooth = cf::face::find $info->{smooth}) {	3029	if (my $smooth = cf::face::find $info->{smooth}) {
		3030	cf::face::set_smooth $idx, $smooth;
2680	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3031	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2681	} else {	3032	} else {
2682	warn "smooth face '$info->{smooth}' not found for face '$face'";	3033	warn "smooth face '$info->{smooth}' not found for face '$face'";
2683	}	3034	}
2684	Coro::cede;	3035
		3036	cf::cede_to_tick;
2685	}	3037	}
2686	}	3038	}
2687		3039
2688	{	3040	{
2689	my $anims = $facedata->{animinfo};	3041	my $anims = $facedata->{animinfo};
2690		3042
2691	while (my ($anim, $info) = each %$anims) {	3043	while (my ($anim, $info) = each %$anims) {
2692	cf::anim::set $anim, $info->{frames}, $info->{facings};	3044	cf::anim::set $anim, $info->{frames}, $info->{facings};
2693	Coro::cede;	3045	cf::cede_to_tick;
2694	}	3046	}
2695		3047
2696	cf::anim::invalidate_all; # d'oh	3048	cf::anim::invalidate_all; # d'oh
2697	}	3049	}
2698		3050
		3051	{
		3052	# TODO: for gcfclient pleasure, we should give resources
		3053	# that gcfclient doesn't grok a >10000 face index.
		3054	my $res = $facedata->{resource};
		3055
		3056	my $soundconf = delete $res->{"res/sound.conf"};
		3057
		3058	while (my ($name, $info) = each %$res) {
		3059	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3060	my $data;
		3061
		3062	if ($info->{type} & 1) {
		3063	# prepend meta info
		3064
		3065	my $meta = $enc->encode ({
		3066	name => $name,
		3067	%{ $info->{meta} || {} },
		3068	});
		3069
		3070	$data = pack "(w/a*)*", $meta, $info->{data};
		3071	} else {
		3072	$data = $info->{data};
		3073	}
		3074
		3075	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3076	cf::face::set_type $idx, $info->{type};
		3077
		3078	cf::cede_to_tick;
		3079	}
		3080
		3081	if ($soundconf) {
		3082	$soundconf = $enc->decode (delete $soundconf->{data});
		3083
		3084	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3085	my $sound = $soundconf->{compat}[$_]
		3086	or next;
		3087
		3088	my $face = cf::face::find "sound/$sound->[1]";
		3089	cf::sound::set $sound->[0] => $face;
		3090	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3091	}
		3092
		3093	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3094	my $face = cf::face::find "sound/$v";
		3095	cf::sound::set $k => $face;
		3096	}
		3097	}
		3098	}
		3099
2699	1	3100	1
2700	}	3101	}
2701		3102
		3103	register_exticmd fx_want => sub {
		3104	my ($ns, $want) = @_;
		3105
		3106	while (my ($k, $v) = each %$want) {
		3107	$ns->fx_want ($k, $v);
		3108	}
		3109	};
		3110
2702	sub reload_regions {	3111	sub reload_regions {
		3112	# HACK to clear player env face cache, we need some signal framework
		3113	# for this (global event?)
		3114	%ext::player_env::MUSIC_FACE_CACHE = ();
		3115
2703	load_resource_file "$MAPDIR/regions"	3116	load_resource_file "$MAPDIR/regions"
2704	or die "unable to load regions file\n";	3117	or die "unable to load regions file\n";
		3118
		3119	for (cf::region::list) {
		3120	$_->{match} = qr/$_->{match}/
		3121	if exists $_->{match};
		3122	}
2705	}	3123	}
2706		3124
2707	sub reload_facedata {	3125	sub reload_facedata {
2708	load_facedata "$DATADIR/facedata"	3126	load_facedata "$DATADIR/facedata"
2709	or die "unable to load facedata\n";	3127	or die "unable to load facedata\n";
2710	}	3128	}
2711		3129
2712	sub reload_archetypes {	3130	sub reload_archetypes {
		3131	load_resource_file "$DATADIR/archetypes"
		3132	or die "unable to load archetypes\n";
		3133	#d# NEED to laod twice to resolve forward references
		3134	# this really needs to be done in an extra post-pass
		3135	# (which needs to be synchronous, so solve it differently)
2713	load_resource_file "$DATADIR/archetypes"	3136	load_resource_file "$DATADIR/archetypes"
2714	or die "unable to load archetypes\n";	3137	or die "unable to load archetypes\n";
2715	}	3138	}
2716		3139
2717	sub reload_treasures {	3140	sub reload_treasures {
…		…
2733		3156
2734	sub init {	3157	sub init {
2735	reload_resources;	3158	reload_resources;
2736	}	3159	}
2737		3160
2738	sub cfg_load {	3161	sub reload_config {
2739	open my $fh, "<:utf8", "$CONFDIR/config"	3162	open my $fh, "<:utf8", "$CONFDIR/config"
2740	or return;	3163	or return;
2741		3164
2742	local $/;	3165	local $/;
2743	*CFG = YAML::Syck::Load <$fh>;	3166	*CFG = YAML::Syck::Load <$fh>;
…		…
2763	(async {	3186	(async {
2764	Event::one_event;	3187	Event::one_event;
2765	})->prio (Coro::PRIO_MAX);	3188	})->prio (Coro::PRIO_MAX);
2766	};	3189	};
2767		3190
2768	cfg_load;	3191	reload_config;
2769	db_init;	3192	db_init;
2770	load_extensions;	3193	load_extensions;
2771		3194
2772	$TICK_WATCHER->start;	3195	$TICK_WATCHER->start;
2773	Event::loop;	3196	Event::loop;
…		…
2966	warn "reloading cf.pm";	3389	warn "reloading cf.pm";
2967	require cf;	3390	require cf;
2968	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3391	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2969		3392
2970	warn "loading config and database again";	3393	warn "loading config and database again";
2971	cf::cfg_load;	3394	cf::reload_config;
2972		3395
2973	warn "loading extensions";	3396	warn "loading extensions";
2974	cf::load_extensions;	3397	cf::load_extensions;
2975		3398
2976	warn "reattaching attachments to objects/players";	3399	warn "reattaching attachments to objects/players";
…		…
3041	my $signal = new Coro::Signal;	3464	my $signal = new Coro::Signal;
3042	push @WAIT_FOR_TICK_BEGIN, $signal;	3465	push @WAIT_FOR_TICK_BEGIN, $signal;
3043	$signal->wait;	3466	$signal->wait;
3044	}	3467	}
3045		3468
3046	my $min = 1e6;#d#
3047	my $avg = 10;
3048	$TICK_WATCHER = Event->timer (	3469	$TICK_WATCHER = Event->timer (
3049	reentrant => 0,	3470	reentrant => 0,
3050	parked => 1,	3471	parked => 1,
3051	prio => 0,	3472	prio => 0,
3052	at => $NEXT_TICK || $TICK,	3473	at => $NEXT_TICK || $TICK,
…		…
3060		3481
3061	$NOW = $tick_start = Event::time;	3482	$NOW = $tick_start = Event::time;
3062		3483
3063	cf::server_tick; # one server iteration	3484	cf::server_tick; # one server iteration
3064		3485
3065	0 && sync_job {#d#
3066	for(1..10) {
3067	my $t = Event::time;
3068	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3069	or die;
3070
3071	$map->width (50);
3072	$map->height (50);
3073	$map->alloc;
3074	$map->_load_objects ("/tmp/x.map", 1);
3075	my $t = Event::time - $t;
3076
3077	#next unless $t < 0.0013;#d#
3078	if ($t < $min) {
3079	$min = $t;
3080	}
3081	$avg = $avg * 0.99 + $t * 0.01;
3082	}
3083	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3084	exit 0;
3085	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3086	};
3087
3088	$RUNTIME += $TICK;	3486	$RUNTIME += $TICK;
3089	$NEXT_TICK += $TICK;	3487	$NEXT_TICK += $TICK;
3090		3488
3091	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3489	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3092	$NEXT_RUNTIME_WRITE = $NOW + 10;	3490	$NEXT_RUNTIME_WRITE = $NOW + 10;
…		…
3094	write_runtime	3492	write_runtime
3095	or warn "ERROR: unable to write runtime file: $!";	3493	or warn "ERROR: unable to write runtime file: $!";
3096	};	3494	};
3097	}	3495	}
3098		3496
3099	# my $AFTER = Event::time;
3100	# warn $AFTER - $NOW;#d#
3101
3102	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3497	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3103	$sig->send;	3498	$sig->send;
3104	}	3499	}
3105	while (my $sig = shift @WAIT_FOR_TICK) {	3500	while (my $sig = shift @WAIT_FOR_TICK) {
3106	$sig->send;	3501	$sig->send;
…		…
3116		3511
3117	$LOAD = ($NOW - $tick_start) / $TICK;	3512	$LOAD = ($NOW - $tick_start) / $TICK;
3118	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3513	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3119		3514
3120	_post_tick;	3515	_post_tick;
3121
3122
3123	},	3516	},
3124	);	3517	);
3125		3518
3126	{	3519	{
		3520	BDB::min_parallel 8;
3127	BDB::max_poll_time $TICK * 0.1;	3521	BDB::max_poll_time $TICK * 0.1;
3128	$BDB_POLL_WATCHER = Event->io (	3522	$BDB_POLL_WATCHER = Event->io (
3129	reentrant => 0,	3523	reentrant => 0,
3130	fd => BDB::poll_fileno,	3524	fd => BDB::poll_fileno,
3131	poll => 'r',	3525	poll => 'r',
3132	prio => 0,	3526	prio => 0,
3133	data => WF_AUTOCANCEL,	3527	data => WF_AUTOCANCEL,
3134	cb => \&BDB::poll_cb,	3528	cb => \&BDB::poll_cb,
3135	);	3529	);
3136	BDB::min_parallel 8;
3137		3530
3138	BDB::set_sync_prepare {	3531	BDB::set_sync_prepare {
3139	my $status;	3532	my $status;
3140	my $current = $Coro::current;	3533	my $current = $Coro::current;
3141	(	3534	(
…		…
3162	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3555	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3163	0666;	3556	0666;
3164		3557
3165	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3558	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3166		3559
3167	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);	3560	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3561	| BDB::LOG_AUTOREMOVE, 1);
3168	$DB_ENV->set_lk_detect;	3562	$DB_ENV->set_lk_detect;
3169	};	3563	};
3170		3564
3171	cf::cleanup "db_env_open(db): $@" if $@;	3565	cf::cleanup "db_env_open(db): $@" if $@;
3172	};	3566	};
3173	}	3567	}
		3568
		3569	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3570	after => 11,
		3571	interval => 60,
		3572	hard => 1,
		3573	prio => 0,
		3574	data => WF_AUTOCANCEL,
		3575	cb => sub {
		3576	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3577	},
		3578	);
		3579	$BDB_TRICKLE_WATCHER = Event->timer (
		3580	after => 5,
		3581	interval => 10,
		3582	hard => 1,
		3583	prio => 0,
		3584	data => WF_AUTOCANCEL,
		3585	cb => sub {
		3586	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3587	},
		3588	);
3174	}	3589	}
3175		3590
3176	{	3591	{
3177	IO::AIO::min_parallel 8;	3592	IO::AIO::min_parallel 8;
3178		3593

Diff Legend

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