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.282 by elmex, Tue Jun 19 18:15:34 2007 UTC vs.
Revision 1.368 by root, Wed Sep 12 11:18:25 2007 UTC

…		…
10	use Event;	10	use Event;
11	use Opcode;	11	use Opcode;
12	use Safe;	12	use Safe;
13	use Safe::Hole;	13	use Safe::Hole;
14		14
15	use Coro 3.61 ();	15	use Coro 3.64 ();
16	use Coro::State;	16	use Coro::State;
17	use Coro::Handle;	17	use Coro::Handle;
18	use Coro::Event;	18	use Coro::Event;
19	use Coro::Timer;	19	use Coro::Timer;
20	use Coro::Signal;	20	use Coro::Signal;
21	use Coro::Semaphore;	21	use Coro::Semaphore;
22	use Coro::AIO;	22	use Coro::AIO;
23	use Coro::Storable;	23	use Coro::Storable;
		24	use Coro::Util ();
24		25
		26	use JSON::XS ();
25	use BDB ();	27	use BDB ();
26	use Data::Dumper;	28	use Data::Dumper;
27	use Digest::MD5;	29	use Digest::MD5;
28	use Fcntl;	30	use Fcntl;
29	use YAML::Syck ();	31	use YAML::Syck ();
30	use IO::AIO 2.32 ();	32	use IO::AIO 2.32 ();
31	use Time::HiRes;	33	use Time::HiRes;
32	use Compress::LZF;	34	use Compress::LZF;
		35	use Digest::MD5 ();
33		36
34	# configure various modules to our taste	37	# configure various modules to our taste
35	#	38	#
36	$Storable::canonical = 1; # reduce rsync transfers	39	$Storable::canonical = 1; # reduce rsync transfers
37	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
…		…
49	our %COMMAND = ();	52	our %COMMAND = ();
50	our %COMMAND_TIME = ();	53	our %COMMAND_TIME = ();
51		54
52	our @EXTS = (); # list of extension package names	55	our @EXTS = (); # list of extension package names
53	our %EXTCMD = ();	56	our %EXTCMD = ();
		57	our %EXTICMD = ();
54	our %EXT_CORO = (); # coroutines bound to extensions	58	our %EXT_CORO = (); # coroutines bound to extensions
55	our %EXT_MAP = (); # pluggable maps	59	our %EXT_MAP = (); # pluggable maps
56		60
57	our $RELOAD; # number of reloads so far	61	our $RELOAD; # number of reloads so far
58	our @EVENT;	62	our @EVENT;
…		…
76	our $NEXT_TICK;	80	our $NEXT_TICK;
77	our $NOW;	81	our $NOW;
78	our $USE_FSYNC = 1; # use fsync to write maps - default off	82	our $USE_FSYNC = 1; # use fsync to write maps - default off
79		83
80	our $BDB_POLL_WATCHER;	84	our $BDB_POLL_WATCHER;
		85	our $BDB_CHECKPOINT_WATCHER;
		86	our $BDB_TRICKLE_WATCHER;
81	our $DB_ENV;	87	our $DB_ENV;
82		88
83	our %CFG;	89	our %CFG;
84		90
85	our $UPTIME; $UPTIME ||= time;	91	our $UPTIME; $UPTIME ||= time;
86	our $RUNTIME;	92	our $RUNTIME;
87		93
88	our %PLAYER; # all users	94	our (%PLAYER, %PLAYER_LOADING); # all users
89	our %MAP; # all maps	95	our (%MAP, %MAP_LOADING ); # all maps
90	our $LINK_MAP; # the special {link} map, which is always available	96	our $LINK_MAP; # the special {link} map, which is always available
91		97
92	# 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 ∕
93	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	99	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94		100
…		…
164		170
165	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
166	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
167	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.
168		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
169	=back	181	=back
170		182
171	=cut	183	=cut
172		184
173	BEGIN {	185	BEGIN {
…		…
177	$msg .= "\n"	189	$msg .= "\n"
178	unless $msg =~ /\n$/;	190	unless $msg =~ /\n$/;
179		191
180	$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;
181		193
182	utf8::encode $msg;
183	LOG llevError, $msg;	194	LOG llevError, $msg;
184	};	195	};
185	}	196	}
186		197
187	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	198	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
236	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	247	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237	$d	248	$d
238	} || "[unable to dump $_[0]: '$@']";	249	} || "[unable to dump $_[0]: '$@']";
239	}	250	}
240		251
241	use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243	=item $ref = cf::from_json $json	252	=item $ref = cf::from_json $json
244		253
245	Converts a JSON string into the corresponding perl data structure.	254	Converts a JSON string into the corresponding perl data structure.
246		255
247	=item $json = cf::to_json $ref	256	=item $json = cf::to_json $ref
248		257
249	Converts a perl data structure into its JSON representation.	258	Converts a perl data structure into its JSON representation.
		259
		260	=cut
		261
		262	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
		263
		264	sub to_json ($) { $json_coder->encode ($_[0]) }
		265	sub from_json ($) { $json_coder->decode ($_[0]) }
250		266
251	=item cf::lock_wait $string	267	=item cf::lock_wait $string
252		268
253	Wait until the given lock is available. See cf::lock_acquire.	269	Wait until the given lock is available. See cf::lock_acquire.
254		270
…		…
257	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
258	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,
259	for example when the coroutine gets canceled), the lock is automatically	275	for example when the coroutine gets canceled), the lock is automatically
260	returned.	276	returned.
261		277
		278	Locks are *not* recursive, locking from the same coro twice results in a
		279	deadlocked coro.
		280
262	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
263	uses map_find and cf::map::load uses map_load).	282	uses map_find and cf::map::load uses map_load).
264		283
265	=item $locked = cf::lock_active $string	284	=item $locked = cf::lock_active $string
266		285
267	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.
268		287
269	=cut	288	=cut
270		289
271	our %LOCK;	290	our %LOCK;
		291	our %LOCKER;#d#
272		292
273	sub lock_wait($) {	293	sub lock_wait($) {
274	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#
275		300
276	# wait for lock, if any	301	# wait for lock, if any
277	while ($LOCK{$key}) {	302	while ($LOCK{$key}) {
278	push @{ $LOCK{$key} }, $Coro::current;	303	push @{ $LOCK{$key} }, $Coro::current;
279	Coro::schedule;	304	Coro::schedule;
…		…
285		310
286	# wait, to be sure we are not locked	311	# wait, to be sure we are not locked
287	lock_wait $key;	312	lock_wait $key;
288		313
289	$LOCK{$key} = [];	314	$LOCK{$key} = [];
		315	$LOCKER{$key} = $Coro::current;#d#
290		316
291	Coro::guard {	317	Coro::guard {
		318	delete $LOCKER{$key};#d#
292	# wake up all waiters, to be on the safe side	319	# wake up all waiters, to be on the safe side
293	$_->ready for @{ delete $LOCK{$key} };	320	$_->ready for @{ delete $LOCK{$key} };
294	}	321	}
295	}	322	}
296		323
…		…
306	my $guard = Coro::guard {	333	my $guard = Coro::guard {
307	$TICK_WATCHER->start;	334	$TICK_WATCHER->start;
308	};	335	};
309	$TICK_WATCHER->stop;	336	$TICK_WATCHER->stop;
310	$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;
311	}	394	}
312		395
313	=item cf::async { BLOCK }	396	=item cf::async { BLOCK }
314		397
315	Currently the same as Coro::async_pool, meaning you cannot use	398	Currently the same as Coro::async_pool, meaning you cannot use
…		…
405	=cut	488	=cut
406		489
407	sub fork_call(&@) {	490	sub fork_call(&@) {
408	my ($cb, @args) = @_;	491	my ($cb, @args) = @_;
409		492
410	# 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,
411	# or die "socketpair: $!";	494	# otherwise perl prematurely frees the stuff :/
412	pipe my $fh1, my $fh2	495	# TODO: investigate and fix (likely this will be rather laborious)
413	or die "pipe: $!";
414		496
415	if (my $pid = fork) {	497	my @res = Coro::Util::fork_eval {
416	close $fh2;
417
418	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
419	$res = Coro::Storable::thaw $res;
420
421	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423	die $$res unless "ARRAY" eq ref $res;
424
425	return wantarray ? @$res : $res->[-1];
426	} else {
427	reset_signals;	498	reset_signals;
428	local $SIG{__WARN__};	499	&$cb
429	local $SIG{__DIE__};	500	}, @args;
430	eval {
431	close $fh1;
432		501
433	my @res = eval { $cb->(@args) };	502	wantarray ? @res : $res[-1]
434	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
435	};
436
437	warn $@ if $@;
438	_exit 0;
439	}
440	}	503	}
441		504
442	=item $value = cf::db_get $family => $key	505	=item $value = cf::db_get $family => $key
443		506
444	Returns a single value from the environment database.	507	Returns a single value from the environment database.
…		…
446	=item cf::db_put $family => $key => $value	509	=item cf::db_put $family => $key => $value
447		510
448	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
449	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).
450		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
451	=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	}
452		537
453	our $DB;	538	our $DB;
454		539
455	sub db_init {	540	sub db_init {
456	unless ($DB) {
457	$DB = BDB::db_create $DB_ENV;
458
459	cf::sync_job {	541	cf::sync_job {
460	eval {	542	$DB ||= db_table "db";
461	$DB->set_flags (BDB::CHKSUM);
462
463	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
464	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
465	cf::cleanup "db_open(db): $!" if $!;
466	};
467	cf::cleanup "db_open(db): $@" if $@;
468	};
469	}	543	};
470	}	544	}
471		545
472	sub db_get($$) {	546	sub db_get($$) {
473	my $key = "$_[0]/$_[1]";	547	my $key = "$_[0]/$_[1]";
474		548
…		…
524	if (1) {	598	if (1) {
525	$md5 =	599	$md5 =
526	join "\x00",	600	join "\x00",
527	$processversion,	601	$processversion,
528	map {	602	map {
529	Coro::cede;	603	cf::cede_to_tick;
530	($src->[$_], Digest::MD5::md5_hex $data[$_])	604	($src->[$_], Digest::MD5::md5_hex $data[$_])
531	} 0.. $#$src;	605	} 0.. $#$src;
532		606
533		607
534	my $dbmd5 = db_get cache => "$id/md5";	608	my $dbmd5 = db_get cache => "$id/md5";
…		…
840	";	914	";
841	die if $@;	915	die if $@;
842	}	916	}
843		917
844	our $override;	918	our $override;
845	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?
846		920
847	sub override {	921	sub override {
848	$override = 1;	922	$override = 1;
849	@invoke_results = ();	923	@INVOKE_RESULTS = (@_);
850	}	924	}
851		925
852	sub do_invoke {	926	sub do_invoke {
853	my $event = shift;	927	my $event = shift;
854	my $callbacks = shift;	928	my $callbacks = shift;
855		929
856	@invoke_results = ();	930	@INVOKE_RESULTS = ();
857		931
858	local $override;	932	local $override;
859		933
860	for (@$callbacks) {	934	for (@$callbacks) {
861	eval { &{$_->[1]} };	935	eval { &{$_->[1]} };
…		…
878		952
879	Generate an object-specific event with the given arguments.	953	Generate an object-specific event with the given arguments.
880		954
881	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
882	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
883	results (if you must, access C<@cf::invoke_results> directly).	957	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884		958
885	=back	959	=back
886		960
887	=cut	961	=cut
888		962
889	#############################################################################	963	#############################################################################
890	# 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	}
891		976
892	sub reattach {	977	sub reattach {
893	# basically do the same as instantiate, without calling instantiate	978	# basically do the same as instantiate, without calling instantiate
894	my ($obj) = @_;	979	my ($obj) = @_;
895		980
…		…
940	);	1025	);
941		1026
942	sub object_freezer_save {	1027	sub object_freezer_save {
943	my ($filename, $rdata, $objs) = @_;	1028	my ($filename, $rdata, $objs) = @_;
944		1029
		1030	my $guard = cf::lock_acquire "io";
		1031
945	sync_job {	1032	sync_job {
946	if (length $$rdata) {	1033	if (length $$rdata) {
		1034	utf8::decode (my $decname = $filename);
947	warn sprintf "saving %s (%d,%d)\n",	1035	warn sprintf "saving %s (%d,%d)\n",
948	$filename, length $$rdata, scalar @$objs;	1036	$decname, length $$rdata, scalar @$objs;
949		1037
950	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1038	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951	chmod SAVE_MODE, $fh;	1039	chmod SAVE_MODE, $fh;
952	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1040	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953	aio_fsync $fh if $cf::USE_FSYNC;	1041	aio_fsync $fh if $cf::USE_FSYNC;
…		…
972	}	1060	}
973	} else {	1061	} else {
974	aio_unlink $filename;	1062	aio_unlink $filename;
975	aio_unlink "$filename.pst";	1063	aio_unlink "$filename.pst";
976	}	1064	}
977	}	1065	};
		1066
		1067	undef $guard;
978	}	1068	}
979		1069
980	sub object_freezer_as_string {	1070	sub object_freezer_as_string {
981	my ($rdata, $objs) = @_;	1071	my ($rdata, $objs) = @_;
982		1072
…		…
987		1077
988	sub object_thawer_load {	1078	sub object_thawer_load {
989	my ($filename) = @_;	1079	my ($filename) = @_;
990		1080
991	my ($data, $av);	1081	my ($data, $av);
		1082
		1083	my $guard = cf::lock_acquire "io";
992		1084
993	(aio_load $filename, $data) >= 0	1085	(aio_load $filename, $data) >= 0
994	or return;	1086	or return;
995		1087
996	unless (aio_stat "$filename.pst") {	1088	unless (aio_stat "$filename.pst") {
997	(aio_load "$filename.pst", $av) >= 0	1089	(aio_load "$filename.pst", $av) >= 0
998	or return;	1090	or return;
		1091
		1092	undef $guard;
999	$av = eval { (Storable::thaw $av)->{objs} };	1093	$av = eval { (Storable::thaw $av)->{objs} };
1000	}	1094	}
1001		1095
		1096	utf8::decode (my $decname = $filename);
1002	warn sprintf "loading %s (%d)\n",	1097	warn sprintf "loading %s (%d,%d)\n",
1003	$filename, length $data, scalar @{$av || []};	1098	$decname, length $data, scalar @{$av || []};
		1099
1004	return ($data, $av);	1100	($data, $av)
1005	}	1101	}
1006		1102
1007	=head2 COMMAND CALLBACKS	1103	=head2 COMMAND CALLBACKS
1008		1104
1009	=over 4	1105	=over 4
…		…
1029	push @{ $COMMAND{$name} }, [$caller, $cb];	1125	push @{ $COMMAND{$name} }, [$caller, $cb];
1030	}	1126	}
1031		1127
1032	=item cf::register_extcmd $name => \&callback($pl,$packet);	1128	=item cf::register_extcmd $name => \&callback($pl,$packet);
1033		1129
1034	Register a callback fro execution when the client sends an extcmd packet.	1130	Register a callback for execution when the client sends an (synchronous)
		1131	extcmd packet. Ext commands will be processed in the order they are
		1132	received by the server, like other user commands. The first argument is
		1133	the logged-in player. Ext commands can only be processed after a player
		1134	has logged in successfully.
1035		1135
1036	If the callback returns something, it is sent back as if reply was being	1136	If the callback returns something, it is sent back as if reply was being
1037	called.	1137	called.
1038		1138
		1139	=item cf::register_exticmd $name => \&callback($ns,$packet);
		1140
		1141	Register a callback for execution when the client sends an (asynchronous)
		1142	exticmd packet. Exti commands are processed by the server as soon as they
		1143	are received, i.e. out of order w.r.t. other commands. The first argument
		1144	is a client socket. Exti commands can be received anytime, even before
		1145	log-in.
		1146
		1147	If the callback returns something, it is sent back as if reply was being
		1148	called.
		1149
1039	=cut	1150	=cut
1040		1151
1041	sub register_extcmd {	1152	sub register_extcmd {
1042	my ($name, $cb) = @_;	1153	my ($name, $cb) = @_;
1043		1154
1044	$EXTCMD{$name} = $cb;	1155	$EXTCMD{$name} = $cb;
		1156	}
		1157
		1158	sub register_exticmd {
		1159	my ($name, $cb) = @_;
		1160
		1161	$EXTICMD{$name} = $cb;
1045	}	1162	}
1046		1163
1047	cf::player->attach (	1164	cf::player->attach (
1048	on_command => sub {	1165	on_command => sub {
1049	my ($pl, $name, $params) = @_;	1166	my ($pl, $name, $params) = @_;
…		…
1058	cf::override;	1175	cf::override;
1059	},	1176	},
1060	on_extcmd => sub {	1177	on_extcmd => sub {
1061	my ($pl, $buf) = @_;	1178	my ($pl, $buf) = @_;
1062		1179
1063	my $msg = eval { from_json $buf };	1180	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064		1181
1065	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
1066	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1190	if (my $cb = $EXTCMD{$type}) {
1067	if (my %reply = $cb->($pl, $msg)) {	1191	@reply = $cb->($pl, @payload);
1068	$pl->ext_reply ($msg->{msgid}, %reply);
1069	}
1070	}	1192	}
		1193
		1194	$pl->ext_reply ($reply, @reply)
		1195	if $reply;
		1196
1071	} else {	1197	} else {
1072	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1198	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073	}	1199	}
1074		1200
1075	cf::override;	1201	cf::override;
…		…
1165		1291
1166	=head3 cf::player	1292	=head3 cf::player
1167		1293
1168	=over 4	1294	=over 4
1169		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
1170	=item cf::player::find $login	1310	=item cf::player::find $login
1171		1311
1172	Returns the given player object, loading it if necessary (might block).	1312	Returns the given player object, loading it if necessary (might block).
1173		1313
1174	=cut	1314	=cut
…		…
1209	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1349	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1350	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1351	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212	aio_unlink +(playerdir $login) . "/$login.pl";	1352	aio_unlink +(playerdir $login) . "/$login.pl";
1213		1353
1214	my $pl = load_pl path $login	1354	my $f = new_from_file cf::object::thawer path $login
1215	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;
1216	$cf::PLAYER{$login} = $pl	1362	$cf::PLAYER{$login} = $pl
1217	}	1363	}
1218	}	1364	}
1219	}	1365	}
1220		1366
…		…
1230		1376
1231	aio_mkdir playerdir $pl, 0770;	1377	aio_mkdir playerdir $pl, 0770;
1232	$pl->{last_save} = $cf::RUNTIME;	1378	$pl->{last_save} = $cf::RUNTIME;
1233		1379
1234	$pl->save_pl ($path);	1380	$pl->save_pl ($path);
1235	Coro::cede;	1381	cf::cede_to_tick;
1236	}	1382	}
1237		1383
1238	sub new($) {	1384	sub new($) {
1239	my ($login) = @_;	1385	my ($login) = @_;
1240		1386
…		…
1244	$self->{deny_save} = 1;	1390	$self->{deny_save} = 1;
1245		1391
1246	$cf::PLAYER{$login} = $self;	1392	$cf::PLAYER{$login} = $self;
1247		1393
1248	$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 (@_);
1249	}	1405	}
1250		1406
1251	=item $pl->quit_character	1407	=item $pl->quit_character
1252		1408
1253	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
…		…
1308	or return [];	1464	or return [];
1309		1465
1310	my @logins;	1466	my @logins;
1311		1467
1312	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") {
1313	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1473	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314	aio_read $fh, 0, 512, my $buf, 0 or next;	1474	aio_read $fh, 0, 512, my $buf, 0 or next;
1315	$buf !~ /^password -------------$/m or next; # official not-valid tag	1475	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1476	}
1316		1477
1317	utf8::decode $login;	1478	utf8::decode $login;
1318	push @logins, $login;	1479	push @logins, $login;
1319	}	1480	}
1320		1481
…		…
1347	}	1508	}
1348		1509
1349	\@paths	1510	\@paths
1350	}	1511	}
1351		1512
		1513	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
		1514
		1515	Expand crossfire pod fragments into protocol xml.
		1516
		1517	=cut
		1518
		1519	sub expand_cfpod {
		1520	((my $self), (local $_)) = @_;
		1521
		1522	# escape & and <
		1523	s/&/&amp;/g;
		1524	s/(?<![BIUGHT])</&lt;/g;
		1525
		1526	# this is buggy, it needs to properly take care of nested <'s
		1527
		1528	1 while
		1529	# replace B<>, I<>, U<> etc.
		1530	s/B<([^\>]*)>/<b>$1<\/b>/
		1531	|| s/I<([^\>]*)>/<i>$1<\/i>/
		1532	|| s/U<([^\>]*)>/<u>$1<\/u>/
		1533	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
		1534	# replace G<male|female> tags
		1535	|| s{G<([^>|]*)\|([^>]*)>}{
		1536	$self->gender ? $2 : $1
		1537	}ge
		1538	# replace H<hint text>
		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;
		1546
		1547	# create single paragraphs (very hackish)
		1548	s/(?<=\S)\n(?=\w)/ /g;
		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
		1556	$_
		1557	}
		1558
		1559	sub hintmode {
		1560	$_[0]{hintmode} = $_[1] if @_ > 1;
		1561	$_[0]{hintmode}
		1562	}
		1563
1352	=item $player->ext_reply ($msgid, %msg)	1564	=item $player->ext_reply ($msgid, @msg)
1353		1565
1354	Sends an ext reply to the player.	1566	Sends an ext reply to the player.
1355		1567
1356	=cut	1568	=cut
1357		1569
1358	sub ext_reply($$%) {	1570	sub ext_reply($$@) {
1359	my ($self, $id, %msg) = @_;	1571	my ($self, $id, @msg) = @_;
1360		1572
1361	$msg{msgid} = $id;	1573	$self->ns->ext_reply ($id, @msg)
1362
1363	$self->send ("ext " . cf::to_json \%msg);
1364	}	1574	}
1365		1575
1366	=item $player->ext_event ($type, %msg)	1576	=item $player->ext_msg ($type, @msg)
1367		1577
1368	Sends an ext event to the client.	1578	Sends an ext event to the client.
1369		1579
1370	=cut	1580	=cut
1371		1581
1372	sub ext_event($$%) {	1582	sub ext_msg($$@) {
1373	my ($self, $type, %msg) = @_;	1583	my ($self, $type, @msg) = @_;
1374		1584
1375	$self->ns->ext_event ($type, %msg);	1585	$self->ns->ext_msg ($type, @msg);
1376	}	1586	}
1377		1587
1378	=head3 cf::region	1588	=head3 cf::region
1379		1589
1380	=over 4	1590	=over 4
…		…
1393	my ($path) = @_;	1603	my ($path) = @_;
1394		1604
1395	my ($match, $specificity);	1605	my ($match, $specificity);
1396		1606
1397	for my $region (list) {	1607	for my $region (list) {
1398	if ($region->match && $path =~ $region->match) {	1608	if ($region->{match} && $path =~ $region->{match}) {
1399	($match, $specificity) = ($region, $region->specificity)	1609	($match, $specificity) = ($region, $region->specificity)
1400	if $region->specificity > $specificity;	1610	if $region->specificity > $specificity;
1401	}	1611	}
1402	}	1612	}
1403		1613
…		…
1523	$self->init; # pass $1 etc.	1733	$self->init; # pass $1 etc.
1524	return $self;	1734	return $self;
1525	}	1735	}
1526	}	1736	}
1527		1737
1528	Carp::carp "unable to resolve path '$path' (base '$base').";	1738	Carp::cluck "unable to resolve path '$path' (base '$base').";
1529	()	1739	()
1530	}	1740	}
1531		1741
1532	sub init {	1742	sub init {
1533	my ($self) = @_;	1743	my ($self) = @_;
…		…
1596		1806
1597	sub load_header_from($) {	1807	sub load_header_from($) {
1598	my ($self, $path) = @_;	1808	my ($self, $path) = @_;
1599		1809
1600	utf8::encode $path;	1810	utf8::encode $path;
1601	#aio_open $path, O_RDONLY, 0	1811	my $f = new_from_file cf::object::thawer $path
1602	# or return;
1603
1604	$self->_load_header ($path)
1605	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;
1606		1819
1607	$self->{load_path} = $path;	1820	$self->{load_path} = $path;
1608		1821
1609	1	1822	1
1610	}	1823	}
…		…
1664	sub find {	1877	sub find {
1665	my ($path, $origin) = @_;	1878	my ($path, $origin) = @_;
1666		1879
1667	$path = normalise $path, $origin && $origin->path;	1880	$path = normalise $path, $origin && $origin->path;
1668		1881
		1882	cf::lock_wait "map_data:$path";#d#remove
1669	cf::lock_wait "map_find:$path";	1883	cf::lock_wait "map_find:$path";
1670		1884
1671	$cf::MAP{$path} || do {	1885	$cf::MAP{$path} || do {
1672	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
1673	my $map = new_from_path cf::map $path	1889	my $map = new_from_path cf::map $path
1674	or return;	1890	or return;
1675		1891
1676	$map->{last_save} = $cf::RUNTIME;	1892	$map->{last_save} = $cf::RUNTIME;
1677		1893
…		…
1679	or return;	1895	or return;
1680		1896
1681	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1897	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1682	# doing this can freeze the server in a sync job, obviously	1898	# doing this can freeze the server in a sync job, obviously
1683	#$cf::WAIT_FOR_TICK->wait;	1899	#$cf::WAIT_FOR_TICK->wait;
		1900	undef $guard1;
		1901	undef $guard2;
1684	$map->reset;	1902	$map->reset;
1685	undef $guard;
1686	return find $path;	1903	return find $path;
1687	}	1904	}
1688		1905
1689	$cf::MAP{$path} = $map	1906	$cf::MAP{$path} = $map
1690	}	1907	}
…		…
1699	local $self->{deny_reset} = 1; # loading can take a long time	1916	local $self->{deny_reset} = 1; # loading can take a long time
1700		1917
1701	my $path = $self->{path};	1918	my $path = $self->{path};
1702		1919
1703	{	1920	{
1704	my $guard = cf::lock_acquire "map_load:$path";	1921	my $guard = cf::lock_acquire "map_data:$path";
1705		1922
		1923	return unless $self->valid;
1706	return if $self->in_memory != cf::MAP_SWAPPED;	1924	return unless $self->in_memory == cf::MAP_SWAPPED;
1707		1925
1708	$self->in_memory (cf::MAP_LOADING);	1926	$self->in_memory (cf::MAP_LOADING);
1709		1927
1710	$self->alloc;	1928	$self->alloc;
1711		1929
1712	$self->pre_load;	1930	$self->pre_load;
1713	Coro::cede;	1931	cf::cede_to_tick;
1714		1932
		1933	my $f = new_from_file cf::object::thawer $self->{load_path};
		1934	$f->skip_block;
1715	$self->_load_objects ($self->{load_path}, 1)	1935	$self->_load_objects ($f)
1716	or return;	1936	or return;
1717		1937
1718	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1938	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1719	if delete $self->{load_original};	1939	if delete $self->{load_original};
1720		1940
1721	if (my $uniq = $self->uniq_path) {	1941	if (my $uniq = $self->uniq_path) {
1722	utf8::encode $uniq;	1942	utf8::encode $uniq;
1723	if (aio_open $uniq, O_RDONLY, 0) {	1943	unless (aio_stat $uniq) {
		1944	if (my $f = new_from_file cf::object::thawer $uniq) {
1724	$self->clear_unique_items;	1945	$self->clear_unique_items;
1725	$self->_load_objects ($uniq, 0);	1946	$self->_load_objects ($f);
		1947	$f->resolve_delayed_derefs;
		1948	}
1726	}	1949	}
1727	}	1950	}
1728		1951
1729	Coro::cede;	1952	$f->resolve_delayed_derefs;
		1953
		1954	cf::cede_to_tick;
1730	# now do the right thing for maps	1955	# now do the right thing for maps
1731	$self->link_multipart_objects;	1956	$self->link_multipart_objects;
1732	$self->difficulty ($self->estimate_difficulty)	1957	$self->difficulty ($self->estimate_difficulty)
1733	unless $self->difficulty;	1958	unless $self->difficulty;
1734	Coro::cede;	1959	cf::cede_to_tick;
1735		1960
1736	unless ($self->{deny_activate}) {	1961	unless ($self->{deny_activate}) {
1737	$self->decay_objects;	1962	$self->decay_objects;
1738	$self->fix_auto_apply;	1963	$self->fix_auto_apply;
1739	$self->update_buttons;	1964	$self->update_buttons;
1740	Coro::cede;	1965	cf::cede_to_tick;
1741	$self->set_darkness_map;	1966	$self->set_darkness_map;
1742	Coro::cede;	1967	cf::cede_to_tick;
1743	$self->activate;	1968	$self->activate;
1744	}	1969	}
		1970
		1971	$self->{last_save} = $cf::RUNTIME;
		1972	$self->last_access ($cf::RUNTIME);
1745		1973
1746	$self->in_memory (cf::MAP_IN_MEMORY);	1974	$self->in_memory (cf::MAP_IN_MEMORY);
1747	}	1975	}
1748		1976
1749	$self->post_load;	1977	$self->post_load;
…		…
1760		1988
1761	$self	1989	$self
1762	}	1990	}
1763		1991
1764	# 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
1765	sub load_diag {	1993	sub load_neighbours {
1766	my ($map) = @_;	1994	my ($map) = @_;
1767		1995
1768	my @diag; # diagonal neighbours	1996	my @neigh; # diagonal neighbours
1769		1997
1770	for (0 .. 3) {	1998	for (0 .. 3) {
1771	my $neigh = $map->tile_path ($_)	1999	my $neigh = $map->tile_path ($_)
1772	or next;	2000	or next;
1773	$neigh = find $neigh, $map	2001	$neigh = find $neigh, $map
1774	or next;	2002	or next;
1775	$neigh->load;	2003	$neigh->load;
1776		2004
		2005	push @neigh,
1777	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2006	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1778	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2007	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1779	}	2008	}
1780		2009
1781	for (@diag) {	2010	for (grep defined $_->[0], @neigh) {
		2011	my ($path, $origin) = @$_;
1782	my $neigh = find @$_	2012	my $neigh = find $path, $origin
1783	or next;	2013	or next;
1784	$neigh->load;	2014	$neigh->load;
1785	}	2015	}
1786	}	2016	}
1787		2017
…		…
1792	}	2022	}
1793		2023
1794	sub do_load_sync {	2024	sub do_load_sync {
1795	my ($map) = @_;	2025	my ($map) = @_;
1796		2026
		2027	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2028	if $Coro::current == $Coro::main;
		2029
1797	cf::sync_job { $map->load };	2030	cf::sync_job { $map->load };
1798	}	2031	}
1799		2032
1800	our %MAP_PREFETCH;	2033	our %MAP_PREFETCH;
1801	our $MAP_PREFETCHER = undef;	2034	our $MAP_PREFETCHER = undef;
1802		2035
1803	sub find_async {	2036	sub find_async {
1804	my ($path, $origin) = @_;	2037	my ($path, $origin, $load) = @_;
1805		2038
1806	$path = normalise $path, $origin && $origin->{path};	2039	$path = normalise $path, $origin && $origin->{path};
1807		2040
1808	if (my $map = $cf::MAP{$path}) {	2041	if (my $map = $cf::MAP{$path}) {
1809	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2042	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1810	}	2043	}
1811		2044
1812	undef $MAP_PREFETCH{$path};	2045	$MAP_PREFETCH{$path} |= $load;
		2046
1813	$MAP_PREFETCHER ||= cf::async {	2047	$MAP_PREFETCHER ||= cf::async {
1814	while (%MAP_PREFETCH) {	2048	while (%MAP_PREFETCH) {
1815	for my $path (keys %MAP_PREFETCH) {	2049	while (my ($k, $v) = each %MAP_PREFETCH) {
1816	my $map = find $path	2050	if (my $map = find $k) {
1817	or next;
1818	$map->load;	2051	$map->load if $v;
		2052	}
1819		2053
1820	delete $MAP_PREFETCH{$path};	2054	delete $MAP_PREFETCH{$k};
1821	}	2055	}
1822	}	2056	}
1823	undef $MAP_PREFETCHER;	2057	undef $MAP_PREFETCHER;
1824	};	2058	};
1825	$MAP_PREFETCHER->prio (6);	2059	$MAP_PREFETCHER->prio (6);
…		…
1828	}	2062	}
1829		2063
1830	sub save {	2064	sub save {
1831	my ($self) = @_;	2065	my ($self) = @_;
1832		2066
1833	my $lock = cf::lock_acquire "map_data:" . $self->path;	2067	my $lock = cf::lock_acquire "map_data:$self->{path}";
1834		2068
1835	$self->{last_save} = $cf::RUNTIME;	2069	$self->{last_save} = $cf::RUNTIME;
1836		2070
1837	return unless $self->dirty;	2071	return unless $self->dirty;
1838		2072
…		…
1861	my ($self) = @_;	2095	my ($self) = @_;
1862		2096
1863	# save first because save cedes	2097	# save first because save cedes
1864	$self->save;	2098	$self->save;
1865		2099
1866	my $lock = cf::lock_acquire "map_data:" . $self->path;	2100	my $lock = cf::lock_acquire "map_data:$self->{path}";
1867		2101
1868	return if $self->players;	2102	return if $self->players;
1869	return if $self->in_memory != cf::MAP_IN_MEMORY;	2103	return if $self->in_memory != cf::MAP_IN_MEMORY;
1870	return if $self->{deny_save};	2104	return if $self->{deny_save};
1871		2105
		2106	$self->in_memory (cf::MAP_SWAPPED);
		2107
		2108	$self->deactivate;
		2109	$_->clear_links_to ($self) for values %cf::MAP;
1872	$self->clear;	2110	$self->clear;
1873	$self->in_memory (cf::MAP_SWAPPED);
1874	}	2111	}
1875		2112
1876	sub reset_at {	2113	sub reset_at {
1877	my ($self) = @_;	2114	my ($self) = @_;
1878		2115
…		…
1910	if $uniq;	2147	if $uniq;
1911	}	2148	}
1912		2149
1913	delete $cf::MAP{$self->path};	2150	delete $cf::MAP{$self->path};
1914		2151
		2152	$self->deactivate;
		2153	$_->clear_links_to ($self) for values %cf::MAP;
1915	$self->clear;	2154	$self->clear;
1916
1917	$_->clear_links_to ($self) for values %cf::MAP;
1918		2155
1919	$self->unlink_save;	2156	$self->unlink_save;
1920	$self->destroy;	2157	$self->destroy;
1921	}	2158	}
1922		2159
1923	my $nuke_counter = "aaaa";	2160	my $nuke_counter = "aaaa";
1924		2161
1925	sub nuke {	2162	sub nuke {
1926	my ($self) = @_;	2163	my ($self) = @_;
1927		2164
		2165	{
		2166	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2167
1928	delete $cf::MAP{$self->path};	2168	delete $cf::MAP{$self->path};
1929		2169
1930	$self->unlink_save;	2170	$self->unlink_save;
1931		2171
1932	bless $self, "cf::map";	2172	bless $self, "cf::map";
1933	delete $self->{deny_reset};	2173	delete $self->{deny_reset};
1934	$self->{deny_save} = 1;	2174	$self->{deny_save} = 1;
1935	$self->reset_timeout (1);	2175	$self->reset_timeout (1);
1936	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2176	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1937		2177
1938	$cf::MAP{$self->path} = $self;	2178	$cf::MAP{$self->path} = $self;
		2179	}
1939		2180
1940	$self->reset; # polite request, might not happen	2181	$self->reset; # polite request, might not happen
1941	}	2182	}
1942		2183
1943	=item $maps = cf::map::tmp_maps	2184	=item $maps = cf::map::tmp_maps
…		…
2019		2260
2020	sub inv_recursive {	2261	sub inv_recursive {
2021	inv_recursive_ inv $_[0]	2262	inv_recursive_ inv $_[0]
2022	}	2263	}
2023		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
2024	package cf;	2296	package cf;
2025		2297
2026	=back	2298	=back
2027		2299
2028	=head3 cf::object::player	2300	=head3 cf::object::player
…		…
2050		2322
2051	} else {	2323	} else {
2052	my $pl = $self->contr;	2324	my $pl = $self->contr;
2053		2325
2054	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2326	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2055	my $diag = $pl->{npc_dialog};	2327	my $dialog = $pl->{npc_dialog};
2056	$diag->{pl}->ext_reply (	2328	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2057	$diag->{id}, msgtype => "reply", msg => $msg, add_topics => []
2058	);
2059		2329
2060	} else {	2330	} else {
2061	$msg = $npc->name . " says: $msg" if $npc;	2331	$msg = $npc->name . " says: $msg" if $npc;
2062	$self->message ($msg, $flags);	2332	$self->message ($msg, $flags);
2063	}	2333	}
2064	}	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 (@_);
2065	}	2345	}
2066		2346
2067	=item $player_object->may ("access")	2347	=item $player_object->may ("access")
2068		2348
2069	Returns wether the given player is authorized to access resource "access"	2349	Returns wether the given player is authorized to access resource "access"
…		…
2148	# use -1 or undef as default coordinates, not 0, 0	2428	# use -1 or undef as default coordinates, not 0, 0
2149	($x, $y) = ($map->enter_x, $map->enter_y)	2429	($x, $y) = ($map->enter_x, $map->enter_y)
2150	if $x <=0 && $y <= 0;	2430	if $x <=0 && $y <= 0;
2151		2431
2152	$map->load;	2432	$map->load;
2153	$map->load_diag;	2433	$map->load_neighbours;
2154		2434
2155	return unless $self->contr->active;	2435	return unless $self->contr->active;
2156	$self->activate_recursive;	2436	$self->activate_recursive;
2157		2437
2158	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2438	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2159	$self->enter_map ($map, $x, $y);	2439	$self->enter_map ($map, $x, $y);
2160	}	2440	}
2161		2441
2162	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2442	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2163		2443
2164	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
2165	her, loading and preparing them map, calling the provided $check callback	2445	her, loading and preparing them map, calling the provided $check callback
2166	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
2167	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.
2168		2449
2169	=cut	2450	=cut
2170		2451
2171	our $GOTOGEN;	2452	our $GOTOGEN;
2172		2453
2173	sub cf::object::player::goto {	2454	sub cf::object::player::goto {
2174	my ($self, $path, $x, $y, $check) = @_;	2455	my ($self, $path, $x, $y, $check, $done) = @_;
2175		2456
2176	# 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
2177	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2458	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2178		2459
2179	$self->enter_link;	2460	$self->enter_link;
2180		2461
2181	(async {	2462	(async {
		2463	# *tag paths override both path and x|y
		2464	if ($path =~ /^\*(.*)$/) {
		2465	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2466	my $ob = $obs[rand @obs];
		2467
		2468	# see if we actually can go there
		2469	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2470	$ob = $obs[rand @obs];
		2471	}
		2472	# else put him there anyways for now #d#
		2473
		2474	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2475	}
		2476	}
		2477
2182	my $map = eval {	2478	my $map = eval {
2183	my $map = cf::map::find $path;	2479	my $map = cf::map::find $path;
2184		2480
2185	if ($map) {	2481	if ($map) {
2186	$map = $map->customise_for ($self);	2482	$map = $map->customise_for ($self);
…		…
2199		2495
2200	if ($gen == $self->{_goto_generation}) {	2496	if ($gen == $self->{_goto_generation}) {
2201	delete $self->{_goto_generation};	2497	delete $self->{_goto_generation};
2202	$self->leave_link ($map, $x, $y);	2498	$self->leave_link ($map, $x, $y);
2203	}	2499	}
		2500
		2501	$done->() if $done;
2204	})->prio (1);	2502	})->prio (1);
2205	}	2503	}
2206		2504
2207	=item $player_object->enter_exit ($exit_object)	2505	=item $player_object->enter_exit ($exit_object)
2208		2506
…		…
2277	my $hp = $exit->stats->hp;	2575	my $hp = $exit->stats->hp;
2278	my $sp = $exit->stats->sp;	2576	my $sp = $exit->stats->sp;
2279		2577
2280	$self->enter_link;	2578	$self->enter_link;
2281		2579
		2580	# if exit is damned, update players death & WoR home-position
		2581	$self->contr->savebed ($slaying, $hp, $sp)
		2582	if $exit->flag (FLAG_DAMNED);
		2583
2282	(async {	2584	(async {
2283	$self->deactivate_recursive; # just to be sure	2585	$self->deactivate_recursive; # just to be sure
2284	unless (eval {	2586	unless (eval {
2285	$self->goto ($slaying, $hp, $sp);	2587	$self->goto ($slaying, $hp, $sp);
2286		2588
…		…
2313		2615
2314	utf8::encode $text;	2616	utf8::encode $text;
2315	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2617	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2316	}	2618	}
2317		2619
		2620	=item $client->send_msg ($channel, $msg, $color, [extra...])
		2621
		2622	Send a drawinfo or msg packet to the client, formatting the msg for the
		2623	client if neccessary. C<$type> should be a string identifying the type of
		2624	the message, with C<log> being the default. If C<$color> is negative, suppress
		2625	the message unless the client supports the msg packet.
		2626
		2627	=cut
		2628
		2629	our %CHANNEL = (
		2630	"c/identify" => {
		2631	id => "identify",
		2632	title => "Identify",
		2633	reply => undef,
		2634	tooltip => "Items recently identified",
		2635	},
		2636	"c/examine" => {
		2637	id => "examine",
		2638	title => "Examine",
		2639	reply => undef,
		2640	tooltip => "Signs and other items you examined",
		2641	},
		2642	);
		2643
		2644	sub cf::client::send_msg {
		2645	my ($self, $channel, $msg, $color, @extra) = @_;
		2646
		2647	$msg = $self->pl->expand_cfpod ($msg);
		2648
		2649	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2650
		2651	# check predefined channels, for the benefit of C
		2652	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};
		2653
		2654	if (ref $channel) {
		2655	# send meta info to client, if not yet sent
		2656	unless (exists $self->{channel}{$channel->{id}}) {
		2657	$self->{channel}{$channel->{id}} = $channel;
		2658	$self->ext_msg (channel_info => $channel)
		2659	if $self->can_msg;
		2660	}
		2661
		2662	$channel = $channel->{id};
		2663	}
		2664
		2665	return unless @extra || length $msg;
		2666
		2667	if ($self->can_msg) {
		2668	# default colour, mask it out
		2669	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2670	if $color & cf::NDI_DEF;
		2671
		2672	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2673	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
		2674	} else {
		2675	if ($color >= 0) {
		2676	# replace some tags by gcfclient-compatible ones
		2677	for ($msg) {
		2678	1 while
		2679	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2680	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2681	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2682	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2683	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2684	}
		2685
		2686	$color &= cf::NDI_COLOR_MASK;
		2687
		2688	utf8::encode $msg;
		2689
		2690	if (0 && $msg =~ /\[/) {
		2691	# COMMAND/INFO
		2692	$self->send_packet ("drawextinfo $color 10 8 $msg")
		2693	} else {
		2694	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
		2695	$self->send_packet ("drawinfo $color $msg")
		2696	}
		2697	}
		2698	}
		2699	}
		2700
2318	=item $client->ext_event ($type, %msg)	2701	=item $client->ext_msg ($type, @msg)
2319		2702
2320	Sends an exti event to the client.	2703	Sends an ext event to the client.
2321		2704
2322	=cut	2705	=cut
2323		2706
2324	sub cf::client::ext_event($$%) {	2707	sub cf::client::ext_msg($$@) {
2325	my ($self, $type, %msg) = @_;	2708	my ($self, $type, @msg) = @_;
2326		2709
		2710	if ($self->extcmd == 2) {
		2711	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2712	} elsif ($self->extcmd == 1) { # TODO: remove
2327	$msg{msgtype} = "event_$type";	2713	push @msg, msgtype => "event_$type";
2328	$self->send_packet ("ext " . cf::to_json \%msg);	2714	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2715	}
		2716	}
		2717
		2718	=item $client->ext_reply ($msgid, @msg)
		2719
		2720	Sends an ext reply to the client.
		2721
		2722	=cut
		2723
		2724	sub cf::client::ext_reply($$@) {
		2725	my ($self, $id, @msg) = @_;
		2726
		2727	if ($self->extcmd == 2) {
		2728	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2729	} elsif ($self->extcmd == 1) {
		2730	#TODO: version 1, remove
		2731	unshift @msg, msgtype => "reply", msgid => $id;
		2732	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2733	}
2329	}	2734	}
2330		2735
2331	=item $success = $client->query ($flags, "text", \&cb)	2736	=item $success = $client->query ($flags, "text", \&cb)
2332		2737
2333	Queues a query to the client, calling the given callback with	2738	Queues a query to the client, calling the given callback with
2334	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2739	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2335	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.	2740	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2336		2741
2337	Queries can fail, so check the return code. Or don't, as queries will become	2742	Queries can fail, so check the return code. Or don't, as queries will
2338	reliable at some point in the future.	2743	become reliable at some point in the future.
2339		2744
2340	=cut	2745	=cut
2341		2746
2342	sub cf::client::query {	2747	sub cf::client::query {
2343	my ($self, $flags, $text, $cb) = @_;	2748	my ($self, $flags, $text, $cb) = @_;
…		…
2351	utf8::encode $text;	2756	utf8::encode $text;
2352	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];	2757	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2353		2758
2354	$self->send_packet ($self->{query_queue}[0][0])	2759	$self->send_packet ($self->{query_queue}[0][0])
2355	if @{ $self->{query_queue} } == 1;	2760	if @{ $self->{query_queue} } == 1;
		2761
		2762	1
2356	}	2763	}
2357		2764
2358	cf::client->attach (	2765	cf::client->attach (
		2766	on_connect => sub {
		2767	my ($ns) = @_;
		2768
		2769	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2770	},
2359	on_reply => sub {	2771	on_reply => sub {
2360	my ($ns, $msg) = @_;	2772	my ($ns, $msg) = @_;
2361		2773
2362	# this weird shuffling is so that direct followup queries	2774	# this weird shuffling is so that direct followup queries
2363	# get handled first	2775	# get handled first
…		…
2375	} else {	2787	} else {
2376	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;	2788	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2377	}	2789	}
2378	}	2790	}
2379	},	2791	},
		2792	on_exticmd => sub {
		2793	my ($ns, $buf) = @_;
		2794
		2795	my $msg = eval { $ns->{json_coder}->decode ($buf) };
		2796
		2797	if (ref $msg) {
		2798	my ($type, $reply, @payload) =
		2799	"ARRAY" eq ref $msg
		2800	? @$msg
		2801	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2802
		2803	my @reply;
		2804
		2805	if (my $cb = $EXTICMD{$type}) {
		2806	@reply = $cb->($ns, @payload);
		2807	}
		2808
		2809	$ns->ext_reply ($reply, @reply)
		2810	if $reply;
		2811
		2812	} else {
		2813	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
		2814	}
		2815
		2816	cf::override;
		2817	},
2380	);	2818	);
2381		2819
2382	=item $client->async (\&cb)	2820	=item $client->async (\&cb)
2383		2821
2384	Create a new coroutine, running the specified callback. The coroutine will	2822	Create a new coroutine, running the specified callback. The coroutine will
…		…
2425	our $safe = new Safe "safe";	2863	our $safe = new Safe "safe";
2426	our $safe_hole = new Safe::Hole;	2864	our $safe_hole = new Safe::Hole;
2427		2865
2428	$SIG{FPE} = 'IGNORE';	2866	$SIG{FPE} = 'IGNORE';
2429		2867
2430	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2868	$safe->permit_only (Opcode::opset qw(
		2869	:base_core :base_mem :base_orig :base_math
		2870	grepstart grepwhile mapstart mapwhile
		2871	sort time
		2872	));
2431		2873
2432	# here we export the classes and methods available to script code	2874	# here we export the classes and methods available to script code
2433		2875
2434	=pod	2876	=pod
2435		2877
2436	The following functions and methods are available within a safe environment:	2878	The following functions and methods are available within a safe environment:
2437		2879
2438	cf::object contr pay_amount pay_player map	2880	cf::object
		2881	contr pay_amount pay_player map x y force_find force_add
		2882	insert remove name archname title slaying race decrease_ob_nr
		2883
2439	cf::object::player player	2884	cf::object::player
2440	cf::player peaceful	2885	player
2441	cf::map trigger	2886
		2887	cf::player
		2888	peaceful
		2889
		2890	cf::map
		2891	trigger
2442		2892
2443	=cut	2893	=cut
2444		2894
2445	for (	2895	for (
2446	["cf::object" => qw(contr pay_amount pay_player map)],	2896	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2897	insert remove inv name archname title slaying race
		2898	decrease_ob_nr)],
2447	["cf::object::player" => qw(player)],	2899	["cf::object::player" => qw(player)],
2448	["cf::player" => qw(peaceful)],	2900	["cf::player" => qw(peaceful)],
2449	["cf::map" => qw(trigger)],	2901	["cf::map" => qw(trigger)],
2450	) {	2902	) {
2451	no strict 'refs';	2903	no strict 'refs';
…		…
2527	# the server's init and main functions	2979	# the server's init and main functions
2528		2980
2529	sub load_facedata($) {	2981	sub load_facedata($) {
2530	my ($path) = @_;	2982	my ($path) = @_;
2531		2983
		2984	# HACK to clear player env face cache, we need some signal framework
		2985	# for this (global event?)
		2986	%ext::player_env::MUSIC_FACE_CACHE = ();
		2987
		2988	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		2989
2532	warn "loading facedata from $path\n";	2990	warn "loading facedata from $path\n";
2533		2991
2534	my $facedata;	2992	my $facedata;
2535	0 < aio_load $path, $facedata	2993	0 < aio_load $path, $facedata
2536	or die "$path: $!";	2994	or die "$path: $!";
…		…
2538	$facedata = Coro::Storable::thaw $facedata;	2996	$facedata = Coro::Storable::thaw $facedata;
2539		2997
2540	$facedata->{version} == 2	2998	$facedata->{version} == 2
2541	or cf::cleanup "$path: version mismatch, cannot proceed.";	2999	or cf::cleanup "$path: version mismatch, cannot proceed.";
2542		3000
		3001	# patch in the exptable
		3002	$facedata->{resource}{"res/exp_table"} = {
		3003	type => FT_RSRC,
		3004	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3005	};
		3006	cf::cede_to_tick;
		3007
2543	{	3008	{
2544	my $faces = $facedata->{faceinfo};	3009	my $faces = $facedata->{faceinfo};
2545		3010
2546	while (my ($face, $info) = each %$faces) {	3011	while (my ($face, $info) = each %$faces) {
2547	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3012	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2548	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3013	cf::face::set_visibility $idx, $info->{visibility};
		3014	cf::face::set_magicmap $idx, $info->{magicmap};
2549	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3015	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2550	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3016	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2551	Coro::cede;	3017
		3018	cf::cede_to_tick;
2552	}	3019	}
2553		3020
2554	while (my ($face, $info) = each %$faces) {	3021	while (my ($face, $info) = each %$faces) {
2555	next unless $info->{smooth};	3022	next unless $info->{smooth};
2556	my $idx = cf::face::find $face	3023	my $idx = cf::face::find $face
2557	or next;	3024	or next;
2558	if (my $smooth = cf::face::find $info->{smooth}) {	3025	if (my $smooth = cf::face::find $info->{smooth}) {
		3026	cf::face::set_smooth $idx, $smooth;
2559	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3027	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2560	} else {	3028	} else {
2561	warn "smooth face '$info->{smooth}' not found for face '$face'";	3029	warn "smooth face '$info->{smooth}' not found for face '$face'";
2562	}	3030	}
2563	Coro::cede;	3031
		3032	cf::cede_to_tick;
2564	}	3033	}
2565	}	3034	}
2566		3035
2567	{	3036	{
2568	my $anims = $facedata->{animinfo};	3037	my $anims = $facedata->{animinfo};
2569		3038
2570	while (my ($anim, $info) = each %$anims) {	3039	while (my ($anim, $info) = each %$anims) {
2571	cf::anim::set $anim, $info->{frames}, $info->{facings};	3040	cf::anim::set $anim, $info->{frames}, $info->{facings};
2572	Coro::cede;	3041	cf::cede_to_tick;
2573	}	3042	}
2574		3043
2575	cf::anim::invalidate_all; # d'oh	3044	cf::anim::invalidate_all; # d'oh
2576	}	3045	}
2577		3046
		3047	{
		3048	# TODO: for gcfclient pleasure, we should give resources
		3049	# that gcfclient doesn't grok a >10000 face index.
		3050	my $res = $facedata->{resource};
		3051
		3052	my $soundconf = delete $res->{"res/sound.conf"};
		3053
		3054	while (my ($name, $info) = each %$res) {
		3055	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3056	my $data;
		3057
		3058	if ($info->{type} & 1) {
		3059	# prepend meta info
		3060
		3061	my $meta = $enc->encode ({
		3062	name => $name,
		3063	%{ $info->{meta} || {} },
		3064	});
		3065
		3066	$data = pack "(w/a*)*", $meta, $info->{data};
		3067	} else {
		3068	$data = $info->{data};
		3069	}
		3070
		3071	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3072	cf::face::set_type $idx, $info->{type};
		3073
		3074	cf::cede_to_tick;
		3075	}
		3076
		3077	if ($soundconf) {
		3078	$soundconf = $enc->decode (delete $soundconf->{data});
		3079
		3080	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3081	my $sound = $soundconf->{compat}[$_]
		3082	or next;
		3083
		3084	my $face = cf::face::find "sound/$sound->[1]";
		3085	cf::sound::set $sound->[0] => $face;
		3086	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3087	}
		3088
		3089	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3090	my $face = cf::face::find "sound/$v";
		3091	cf::sound::set $k => $face;
		3092	}
		3093	}
		3094	}
		3095
2578	1	3096	1
2579	}	3097	}
2580		3098
		3099	register_exticmd fx_want => sub {
		3100	my ($ns, $want) = @_;
		3101
		3102	while (my ($k, $v) = each %$want) {
		3103	$ns->fx_want ($k, $v);
		3104	}
		3105	};
		3106
2581	sub reload_regions {	3107	sub reload_regions {
		3108	# HACK to clear player env face cache, we need some signal framework
		3109	# for this (global event?)
		3110	%ext::player_env::MUSIC_FACE_CACHE = ();
		3111
2582	load_resource_file "$MAPDIR/regions"	3112	load_resource_file "$MAPDIR/regions"
2583	or die "unable to load regions file\n";	3113	or die "unable to load regions file\n";
		3114
		3115	for (cf::region::list) {
		3116	$_->{match} = qr/$_->{match}/
		3117	if exists $_->{match};
		3118	}
2584	}	3119	}
2585		3120
2586	sub reload_facedata {	3121	sub reload_facedata {
2587	load_facedata "$DATADIR/facedata"	3122	load_facedata "$DATADIR/facedata"
2588	or die "unable to load facedata\n";	3123	or die "unable to load facedata\n";
2589	}	3124	}
2590		3125
2591	sub reload_archetypes {	3126	sub reload_archetypes {
		3127	load_resource_file "$DATADIR/archetypes"
		3128	or die "unable to load archetypes\n";
		3129	#d# NEED to laod twice to resolve forward references
		3130	# this really needs to be done in an extra post-pass
		3131	# (which needs to be synchronous, so solve it differently)
2592	load_resource_file "$DATADIR/archetypes"	3132	load_resource_file "$DATADIR/archetypes"
2593	or die "unable to load archetypes\n";	3133	or die "unable to load archetypes\n";
2594	}	3134	}
2595		3135
2596	sub reload_treasures {	3136	sub reload_treasures {
…		…
2612		3152
2613	sub init {	3153	sub init {
2614	reload_resources;	3154	reload_resources;
2615	}	3155	}
2616		3156
2617	sub cfg_load {	3157	sub reload_config {
2618	open my $fh, "<:utf8", "$CONFDIR/config"	3158	open my $fh, "<:utf8", "$CONFDIR/config"
2619	or return;	3159	or return;
2620		3160
2621	local $/;	3161	local $/;
2622	*CFG = YAML::Syck::Load <$fh>;	3162	*CFG = YAML::Syck::Load <$fh>;
…		…
2642	(async {	3182	(async {
2643	Event::one_event;	3183	Event::one_event;
2644	})->prio (Coro::PRIO_MAX);	3184	})->prio (Coro::PRIO_MAX);
2645	};	3185	};
2646		3186
2647	cfg_load;	3187	reload_config;
2648	db_init;	3188	db_init;
2649	load_extensions;	3189	load_extensions;
2650		3190
2651	$TICK_WATCHER->start;	3191	$TICK_WATCHER->start;
2652	Event::loop;	3192	Event::loop;
…		…
2790	%EXT_CORO = ();	3330	%EXT_CORO = ();
2791		3331
2792	warn "removing commands";	3332	warn "removing commands";
2793	%COMMAND = ();	3333	%COMMAND = ();
2794		3334
2795	warn "removing ext commands";	3335	warn "removing ext/exti commands";
2796	%EXTCMD = ();	3336	%EXTCMD = ();
		3337	%EXTICMD = ();
2797		3338
2798	warn "unloading/nuking all extensions";	3339	warn "unloading/nuking all extensions";
2799	for my $pkg (@EXTS) {	3340	for my $pkg (@EXTS) {
2800	warn "... unloading $pkg";	3341	warn "... unloading $pkg";
2801		3342
…		…
2844	warn "reloading cf.pm";	3385	warn "reloading cf.pm";
2845	require cf;	3386	require cf;
2846	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3387	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2847		3388
2848	warn "loading config and database again";	3389	warn "loading config and database again";
2849	cf::cfg_load;	3390	cf::reload_config;
2850		3391
2851	warn "loading extensions";	3392	warn "loading extensions";
2852	cf::load_extensions;	3393	cf::load_extensions;
2853		3394
2854	warn "reattaching attachments to objects/players";	3395	warn "reattaching attachments to objects/players";
…		…
2919	my $signal = new Coro::Signal;	3460	my $signal = new Coro::Signal;
2920	push @WAIT_FOR_TICK_BEGIN, $signal;	3461	push @WAIT_FOR_TICK_BEGIN, $signal;
2921	$signal->wait;	3462	$signal->wait;
2922	}	3463	}
2923		3464
2924	my $min = 1e6;#d#	3465	our $stat_fh;
2925	my $avg = 10;	3466	sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
		3467
2926	$TICK_WATCHER = Event->timer (	3468	$TICK_WATCHER = Event->timer (
2927	reentrant => 0,	3469	reentrant => 0,
2928	parked => 1,	3470	parked => 1,
2929	prio => 0,	3471	prio => 0,
2930	at => $NEXT_TICK || $TICK,	3472	at => $NEXT_TICK || $TICK,
…		…
2934	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3476	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2935	unless ++$bug_warning > 10;	3477	unless ++$bug_warning > 10;
2936	return;	3478	return;
2937	}	3479	}
2938		3480
		3481	my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
		3482
2939	$NOW = $tick_start = Event::time;	3483	$NOW = $tick_start = Event::time;
2940		3484
2941	cf::server_tick; # one server iteration	3485	cf::server_tick; # one server iteration
2942
2943	0 && sync_job {#d#
2944	for(1..10) {
2945	my $t = Event::time;
2946	my $map = my $map = new_from_path cf::map "/tmp/x.map"
2947	or die;
2948
2949	$map->width (50);
2950	$map->height (50);
2951	$map->alloc;
2952	$map->_load_objects ("/tmp/x.map", 1);
2953	my $t = Event::time - $t;
2954
2955	#next unless $t < 0.0013;#d#
2956	if ($t < $min) {
2957	$min = $t;
2958	}
2959	$avg = $avg * 0.99 + $t * 0.01;
2960	}
2961	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2962	exit 0;
2963	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2964	};
2965		3486
2966	$RUNTIME += $TICK;	3487	$RUNTIME += $TICK;
2967	$NEXT_TICK += $TICK;	3488	$NEXT_TICK += $TICK;
2968		3489
2969	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3490	if ($NOW >= $NEXT_RUNTIME_WRITE) {
…		…
2995	$LOAD = ($NOW - $tick_start) / $TICK;	3516	$LOAD = ($NOW - $tick_start) / $TICK;
2996	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3517	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2997		3518
2998	_post_tick;	3519	_post_tick;
2999		3520
3000		3521	# gather some statistics#d#
		3522	$stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d#
		3523	IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d#
3001	},	3524	},
3002	);	3525	);
3003		3526
3004	{	3527	{
		3528	BDB::min_parallel 8;
3005	BDB::max_poll_time $TICK * 0.1;	3529	BDB::max_poll_time $TICK * 0.1;
3006	$BDB_POLL_WATCHER = Event->io (	3530	$BDB_POLL_WATCHER = Event->io (
3007	reentrant => 0,	3531	reentrant => 0,
3008	fd => BDB::poll_fileno,	3532	fd => BDB::poll_fileno,
3009	poll => 'r',	3533	poll => 'r',
3010	prio => 0,	3534	prio => 0,
3011	data => WF_AUTOCANCEL,	3535	data => WF_AUTOCANCEL,
3012	cb => \&BDB::poll_cb,	3536	cb => \&BDB::poll_cb,
3013	);	3537	);
3014	BDB::min_parallel 8;
3015		3538
3016	BDB::set_sync_prepare {	3539	BDB::set_sync_prepare {
3017	my $status;	3540	my $status;
3018	my $current = $Coro::current;	3541	my $current = $Coro::current;
3019	(	3542	(
…		…
3040	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3563	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3041	0666;	3564	0666;
3042		3565
3043	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3566	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3044		3567
3045	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);	3568	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3569	| BDB::LOG_AUTOREMOVE, 1);
3046	$DB_ENV->set_lk_detect;	3570	$DB_ENV->set_lk_detect;
3047	};	3571	};
3048		3572
3049	cf::cleanup "db_env_open(db): $@" if $@;	3573	cf::cleanup "db_env_open(db): $@" if $@;
3050	};	3574	};
3051	}	3575	}
		3576
		3577	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3578	after => 11,
		3579	interval => 60,
		3580	hard => 1,
		3581	prio => 0,
		3582	data => WF_AUTOCANCEL,
		3583	cb => sub {
		3584	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3585	},
		3586	);
		3587	$BDB_TRICKLE_WATCHER = Event->timer (
		3588	after => 5,
		3589	interval => 10,
		3590	hard => 1,
		3591	prio => 0,
		3592	data => WF_AUTOCANCEL,
		3593	cb => sub {
		3594	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3595	},
		3596	);
3052	}	3597	}
3053		3598
3054	{	3599	{
3055	IO::AIO::min_parallel 8;	3600	IO::AIO::min_parallel 8;
3056		3601

Diff Legend

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