[ViewVC] Diff of: 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.373 by root, Sat Sep 15 15:58:06 2007 UTC

…		…
10	use Event;	10	use Event;
11	use Opcode;	11	use Opcode;
12	use Safe;	12	use Safe;
13	use Safe::Hole;	13	use Safe::Hole;
14		14
15	use Coro 3.61 ();	15	use Coro 3.64 ();
16	use Coro::State;	16	use Coro::State;
17	use Coro::Handle;	17	use Coro::Handle;
18	use Coro::Event;	18	use Coro::Event;
19	use Coro::Timer;	19	use Coro::Timer;
20	use Coro::Signal;	20	use Coro::Signal;
21	use Coro::Semaphore;	21	use Coro::Semaphore;
22	use Coro::AIO;	22	use Coro::AIO;
23	use Coro::Storable;	23	use Coro::Storable;
		24	use Coro::Util ();
24		25
		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_DEADLOCK_WATCHER;
		86	our $BDB_CHECKPOINT_WATCHER;
		87	our $BDB_TRICKLE_WATCHER;
81	our $DB_ENV;	88	our $DB_ENV;
82		89
83	our %CFG;	90	our %CFG;
84		91
85	our $UPTIME; $UPTIME \|\|= time;	92	our $UPTIME; $UPTIME \|\|= time;
86	our $RUNTIME;	93	our $RUNTIME;
87		94
88	our %PLAYER; # all users	95	our (%PLAYER, %PLAYER_LOADING); # all users
89	our %MAP; # all maps	96	our (%MAP, %MAP_LOADING ); # all maps
90	our $LINK_MAP; # the special {link} map, which is always available	97	our $LINK_MAP; # the special {link} map, which is always available
91		98
92	# used to convert map paths into valid unix filenames by replacing / by ∕	99	# used to convert map paths into valid unix filenames by replacing / by ∕
93	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	100	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94		101
…		…
164		171
165	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	172	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	173	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.	174	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168		175
		176	=item @cf::INVOKE_RESULTS
		177
		178	This array contains the results of the last C<invoke ()> call. When
		179	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
		180	that call.
		181
169	=back	182	=back
170		183
171	=cut	184	=cut
172		185
173	BEGIN {	186	BEGIN {
…		…
177	$msg .= "\n"	190	$msg .= "\n"
178	unless $msg =~ /\n$/;	191	unless $msg =~ /\n$/;
179		192
180	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	193	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181		194
182	utf8::encode $msg;
183	LOG llevError, $msg;	195	LOG llevError, $msg;
184	};	196	};
185	}	197	}
186		198
187	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	199	@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;	248	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237	$d	249	$d
238	} \|\| "[unable to dump $_[0]: '$@']";	250	} \|\| "[unable to dump $_[0]: '$@']";
239	}	251	}
240		252
241	use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243	=item $ref = cf::from_json $json	253	=item $ref = cf::from_json $json
244		254
245	Converts a JSON string into the corresponding perl data structure.	255	Converts a JSON string into the corresponding perl data structure.
246		256
247	=item $json = cf::to_json $ref	257	=item $json = cf::to_json $ref
248		258
249	Converts a perl data structure into its JSON representation.	259	Converts a perl data structure into its JSON representation.
		260
		261	=cut
		262
		263	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
		264
		265	sub to_json ($) { $json_coder->encode ($_[0]) }
		266	sub from_json ($) { $json_coder->decode ($_[0]) }
250		267
251	=item cf::lock_wait $string	268	=item cf::lock_wait $string
252		269
253	Wait until the given lock is available. See cf::lock_acquire.	270	Wait until the given lock is available. See cf::lock_acquire.
254		271
…		…
257	Wait until the given lock is available and then acquires it and returns	274	Wait until the given lock is available and then acquires it and returns
258	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	275	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
259	for example when the coroutine gets canceled), the lock is automatically	276	for example when the coroutine gets canceled), the lock is automatically
260	returned.	277	returned.
261		278
		279	Locks are not recursive, locking from the same coro twice results in a
		280	deadlocked coro.
		281
262	Lock names should begin with a unique identifier (for example, cf::map::find	282	Lock names should begin with a unique identifier (for example, cf::map::find
263	uses map_find and cf::map::load uses map_load).	283	uses map_find and cf::map::load uses map_load).
264		284
265	=item $locked = cf::lock_active $string	285	=item $locked = cf::lock_active $string
266		286
267	Return true if the lock is currently active, i.e. somebody has locked it.	287	Return true if the lock is currently active, i.e. somebody has locked it.
268		288
269	=cut	289	=cut
270		290
271	our %LOCK;	291	our %LOCK;
		292	our %LOCKER;#d#
272		293
273	sub lock_wait($) {	294	sub lock_wait($) {
274	my ($key) = @_;	295	my ($key) = @_;
		296
		297	if ($LOCKER{$key} == $Coro::current) {#d#
		298	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		299	return;#d#
		300	}#d#
275		301
276	# wait for lock, if any	302	# wait for lock, if any
277	while ($LOCK{$key}) {	303	while ($LOCK{$key}) {
278	push @{ $LOCK{$key} }, $Coro::current;	304	push @{ $LOCK{$key} }, $Coro::current;
279	Coro::schedule;	305	Coro::schedule;
…		…
285		311
286	# wait, to be sure we are not locked	312	# wait, to be sure we are not locked
287	lock_wait $key;	313	lock_wait $key;
288		314
289	$LOCK{$key} = [];	315	$LOCK{$key} = [];
		316	$LOCKER{$key} = $Coro::current;#d#
290		317
291	Coro::guard {	318	Coro::guard {
		319	delete $LOCKER{$key};#d#
292	# wake up all waiters, to be on the safe side	320	# wake up all waiters, to be on the safe side
293	$_->ready for @{ delete $LOCK{$key} };	321	$_->ready for @{ delete $LOCK{$key} };
294	}	322	}
295	}	323	}
296		324
…		…
306	my $guard = Coro::guard {	334	my $guard = Coro::guard {
307	$TICK_WATCHER->start;	335	$TICK_WATCHER->start;
308	};	336	};
309	$TICK_WATCHER->stop;	337	$TICK_WATCHER->stop;
310	$guard	338	$guard
		339	}
		340
		341	=item cf::get_slot $time[, $priority[, $name]]
		342
		343	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		344	This call blocks and returns only when you have at least C<$time> seconds
		345	of cpu time till the next tick. The slot is only valid till the next cede.
		346
		347	The optional C<$name> can be used to identify the job to run. It might be
		348	used for statistical purposes and should identify the same time-class.
		349
		350	Useful for short background jobs.
		351
		352	=cut
		353
		354	our @SLOT_QUEUE;
		355	our $SLOT_QUEUE;
		356
		357	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		358	$SLOT_QUEUE = Coro::async {
		359	my $signal = new Coro::Signal;
		360
		361	while () {
		362	next_job:
		363	my $avail = cf::till_tick;
		364	if ($avail > 0.01) {
		365	for (0 .. $#SLOT_QUEUE) {
		366	if ($SLOT_QUEUE[$_][0] < $avail) {
		367	my $job = splice @SLOT_QUEUE, $_, 1, ();
		368	$job->[2]->send;
		369	Coro::cede;
		370	goto next_job;
		371	}
		372	}
		373	}
		374
		375	if (@SLOT_QUEUE) {
		376	# we do not use wait_For_tick() as it returns immediately when tick is inactive
		377	push @cf::WAIT_FOR_TICK, $signal;
		378	$signal->wait;
		379	} else {
		380	Coro::schedule;
		381	}
		382	}
		383	};
		384
		385	sub get_slot($;$$) {
		386	my ($time, $pri, $name) = @_;
		387
		388	$time = $TICK * .6 if $time > $TICK * .6;
		389	my $sig = new Coro::Signal;
		390
		391	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		392	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		393	$SLOT_QUEUE->ready;
		394	$sig->wait;
311	}	395	}
312		396
313	=item cf::async { BLOCK }	397	=item cf::async { BLOCK }
314		398
315	Currently the same as Coro::async_pool, meaning you cannot use	399	Currently the same as Coro::async_pool, meaning you cannot use
…		…
405	=cut	489	=cut
406		490
407	sub fork_call(&@) {	491	sub fork_call(&@) {
408	my ($cb, @args) = @_;	492	my ($cb, @args) = @_;
409		493
410	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	494	# we seemingly have to make a local copy of the whole thing,
411	# or die "socketpair: $!";	495	# otherwise perl prematurely frees the stuff :/
412	pipe my $fh1, my $fh2	496	# TODO: investigate and fix (likely this will be rather laborious)
413	or die "pipe: $!";
414		497
415	if (my $pid = fork) {	498	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;	499	reset_signals;
428	local $SIG{__WARN__};	500	&$cb
429	local $SIG{__DIE__};	501	}, @args;
430	eval {
431	close $fh1;
432		502
433	my @res = eval { $cb->(@args) };	503	wantarray ? @res : $res[-1]
434	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
435	};
436
437	warn $@ if $@;
438	_exit 0;
439	}
440	}	504	}
441		505
442	=item $value = cf::db_get $family => $key	506	=item $value = cf::db_get $family => $key
443		507
444	Returns a single value from the environment database.	508	Returns a single value from the environment database.
…		…
446	=item cf::db_put $family => $key => $value	510	=item cf::db_put $family => $key => $value
447		511
448	Stores the given C<$value> in the family. It can currently store binary	512	Stores the given C<$value> in the family. It can currently store binary
449	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).	513	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
450		514
		515	=item $db = cf::db_table "name"
		516
		517	Create and/or open a new database table. The string must not be "db" and must be unique
		518	within each server.
		519
451	=cut	520	=cut
		521
		522	sub db_table($) {
		523	my ($name) = @_;
		524	my $db = BDB::db_create $DB_ENV;
		525
		526	eval {
		527	$db->set_flags (BDB::CHKSUM);
		528
		529	utf8::encode $name;
		530	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		531	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
		532	cf::cleanup "db_open(db): $!" if $!;
		533	};
		534	cf::cleanup "db_open(db): $@" if $@;
		535
		536	$db
		537	}
452		538
453	our $DB;	539	our $DB;
454		540
455	sub db_init {	541	sub db_init {
456	unless ($DB) {
457	$DB = BDB::db_create $DB_ENV;
458
459	cf::sync_job {	542	cf::sync_job {
460	eval {	543	$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	}	544	};
470	}	545	}
471		546
472	sub db_get($$) {	547	sub db_get($$) {
473	my $key = "$_[0]/$_[1]";	548	my $key = "$_[0]/$_[1]";
474		549
…		…
524	if (1) {	599	if (1) {
525	$md5 =	600	$md5 =
526	join "\x00",	601	join "\x00",
527	$processversion,	602	$processversion,
528	map {	603	map {
529	Coro::cede;	604	cf::cede_to_tick;
530	($src->[$_], Digest::MD5::md5_hex $data[$_])	605	($src->[$_], Digest::MD5::md5_hex $data[$_])
531	} 0.. $#$src;	606	} 0.. $#$src;
532		607
533		608
534	my $dbmd5 = db_get cache => "$id/md5";	609	my $dbmd5 = db_get cache => "$id/md5";
…		…
840	";	915	";
841	die if $@;	916	die if $@;
842	}	917	}
843		918
844	our $override;	919	our $override;
845	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	920	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846		921
847	sub override {	922	sub override {
848	$override = 1;	923	$override = 1;
849	@invoke_results = ();	924	@INVOKE_RESULTS = (@_);
850	}	925	}
851		926
852	sub do_invoke {	927	sub do_invoke {
853	my $event = shift;	928	my $event = shift;
854	my $callbacks = shift;	929	my $callbacks = shift;
855		930
856	@invoke_results = ();	931	@INVOKE_RESULTS = ();
857		932
858	local $override;	933	local $override;
859		934
860	for (@$callbacks) {	935	for (@$callbacks) {
861	eval { &{$_->[1]} };	936	eval { &{$_->[1]} };
…		…
878		953
879	Generate an object-specific event with the given arguments.	954	Generate an object-specific event with the given arguments.
880		955
881	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	956	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	957	removed in future versions), and there is no public API to access override
883	results (if you must, access C<@cf::invoke_results> directly).	958	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884		959
885	=back	960	=back
886		961
887	=cut	962	=cut
888		963
889	#############################################################################	964	#############################################################################
890	# object support	965	# object support
		966	#
		967
		968	sub _can_merge {
		969	my ($ob1, $ob2) = @_;
		970
		971	local $Storable::canonical = 1;
		972	my $fob1 = Storable::freeze $ob1;
		973	my $fob2 = Storable::freeze $ob2;
		974
		975	$fob1 eq $fob2
		976	}
891		977
892	sub reattach {	978	sub reattach {
893	# basically do the same as instantiate, without calling instantiate	979	# basically do the same as instantiate, without calling instantiate
894	my ($obj) = @_;	980	my ($obj) = @_;
895		981
…		…
942	sub object_freezer_save {	1028	sub object_freezer_save {
943	my ($filename, $rdata, $objs) = @_;	1029	my ($filename, $rdata, $objs) = @_;
944		1030
945	sync_job {	1031	sync_job {
946	if (length $$rdata) {	1032	if (length $$rdata) {
		1033	utf8::decode (my $decname = $filename);
947	warn sprintf "saving %s (%d,%d)\n",	1034	warn sprintf "saving %s (%d,%d)\n",
948	$filename, length $$rdata, scalar @$objs;	1035	$decname, length $$rdata, scalar @$objs;
949		1036
950	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1037	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
951	chmod SAVE_MODE, $fh;	1038	chmod SAVE_MODE, $fh;
952	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1039	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953	aio_fsync $fh if $cf::USE_FSYNC;	1040	aio_fsync $fh if $cf::USE_FSYNC;
…		…
972	}	1059	}
973	} else {	1060	} else {
974	aio_unlink $filename;	1061	aio_unlink $filename;
975	aio_unlink "$filename.pst";	1062	aio_unlink "$filename.pst";
976	}	1063	}
977	}	1064	};
978	}	1065	}
979		1066
980	sub object_freezer_as_string {	1067	sub object_freezer_as_string {
981	my ($rdata, $objs) = @_;	1068	my ($rdata, $objs) = @_;
982		1069
…		…
994	or return;	1081	or return;
995		1082
996	unless (aio_stat "$filename.pst") {	1083	unless (aio_stat "$filename.pst") {
997	(aio_load "$filename.pst", $av) >= 0	1084	(aio_load "$filename.pst", $av) >= 0
998	or return;	1085	or return;
		1086
999	$av = eval { (Storable::thaw $av)->{objs} };	1087	$av = eval { (Storable::thaw $av)->{objs} };
1000	}	1088	}
1001		1089
		1090	utf8::decode (my $decname = $filename);
1002	warn sprintf "loading %s (%d)\n",	1091	warn sprintf "loading %s (%d,%d)\n",
1003	$filename, length $data, scalar @{$av \|\| []};	1092	$decname, length $data, scalar @{$av \|\| []};
		1093
1004	return ($data, $av);	1094	($data, $av)
1005	}	1095	}
1006		1096
1007	=head2 COMMAND CALLBACKS	1097	=head2 COMMAND CALLBACKS
1008		1098
1009	=over 4	1099	=over 4
…		…
1029	push @{ $COMMAND{$name} }, [$caller, $cb];	1119	push @{ $COMMAND{$name} }, [$caller, $cb];
1030	}	1120	}
1031		1121
1032	=item cf::register_extcmd $name => \&callback($pl,$packet);	1122	=item cf::register_extcmd $name => \&callback($pl,$packet);
1033		1123
1034	Register a callback fro execution when the client sends an extcmd packet.	1124	Register a callback for execution when the client sends an (synchronous)
		1125	extcmd packet. Ext commands will be processed in the order they are
		1126	received by the server, like other user commands. The first argument is
		1127	the logged-in player. Ext commands can only be processed after a player
		1128	has logged in successfully.
1035		1129
1036	If the callback returns something, it is sent back as if reply was being	1130	If the callback returns something, it is sent back as if reply was being
1037	called.	1131	called.
1038		1132
		1133	=item cf::register_exticmd $name => \&callback($ns,$packet);
		1134
		1135	Register a callback for execution when the client sends an (asynchronous)
		1136	exticmd packet. Exti commands are processed by the server as soon as they
		1137	are received, i.e. out of order w.r.t. other commands. The first argument
		1138	is a client socket. Exti commands can be received anytime, even before
		1139	log-in.
		1140
		1141	If the callback returns something, it is sent back as if reply was being
		1142	called.
		1143
1039	=cut	1144	=cut
1040		1145
1041	sub register_extcmd {	1146	sub register_extcmd {
1042	my ($name, $cb) = @_;	1147	my ($name, $cb) = @_;
1043		1148
1044	$EXTCMD{$name} = $cb;	1149	$EXTCMD{$name} = $cb;
		1150	}
		1151
		1152	sub register_exticmd {
		1153	my ($name, $cb) = @_;
		1154
		1155	$EXTICMD{$name} = $cb;
1045	}	1156	}
1046		1157
1047	cf::player->attach (	1158	cf::player->attach (
1048	on_command => sub {	1159	on_command => sub {
1049	my ($pl, $name, $params) = @_;	1160	my ($pl, $name, $params) = @_;
…		…
1058	cf::override;	1169	cf::override;
1059	},	1170	},
1060	on_extcmd => sub {	1171	on_extcmd => sub {
1061	my ($pl, $buf) = @_;	1172	my ($pl, $buf) = @_;
1062		1173
1063	my $msg = eval { from_json $buf };	1174	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064		1175
1065	if (ref $msg) {	1176	if (ref $msg) {
		1177	my ($type, $reply, @payload) =
		1178	"ARRAY" eq ref $msg
		1179	? @$msg
		1180	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1181
		1182	my @reply;
		1183
1066	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1184	if (my $cb = $EXTCMD{$type}) {
1067	if (my %reply = $cb->($pl, $msg)) {	1185	@reply = $cb->($pl, @payload);
1068	$pl->ext_reply ($msg->{msgid}, %reply);
1069	}
1070	}	1186	}
		1187
		1188	$pl->ext_reply ($reply, @reply)
		1189	if $reply;
		1190
1071	} else {	1191	} else {
1072	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1192	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073	}	1193	}
1074		1194
1075	cf::override;	1195	cf::override;
…		…
1165		1285
1166	=head3 cf::player	1286	=head3 cf::player
1167		1287
1168	=over 4	1288	=over 4
1169		1289
		1290	=item cf::player::num_playing
		1291
		1292	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1293
		1294	=cut
		1295
		1296	sub num_playing {
		1297	scalar grep
		1298	$_->ob->map
		1299	&& !$_->hidden
		1300	&& !$_->ob->flag (cf::FLAG_WIZ),
		1301	cf::player::list
		1302	}
		1303
1170	=item cf::player::find $login	1304	=item cf::player::find $login
1171		1305
1172	Returns the given player object, loading it if necessary (might block).	1306	Returns the given player object, loading it if necessary (might block).
1173		1307
1174	=cut	1308	=cut
…		…
1209	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1343	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1344	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1345	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212	aio_unlink +(playerdir $login) . "/$login.pl";	1346	aio_unlink +(playerdir $login) . "/$login.pl";
1213		1347
1214	my $pl = load_pl path $login	1348	my $f = new_from_file cf::object::thawer path $login
1215	or return;	1349	or return;
		1350
		1351	my $pl = cf::player::load_pl $f
		1352	or return;
		1353	local $cf::PLAYER_LOADING{$login} = $pl;
		1354	$f->resolve_delayed_derefs;
1216	$cf::PLAYER{$login} = $pl	1355	$cf::PLAYER{$login} = $pl
1217	}	1356	}
1218	}	1357	}
1219	}	1358	}
1220		1359
…		…
1230		1369
1231	aio_mkdir playerdir $pl, 0770;	1370	aio_mkdir playerdir $pl, 0770;
1232	$pl->{last_save} = $cf::RUNTIME;	1371	$pl->{last_save} = $cf::RUNTIME;
1233		1372
1234	$pl->save_pl ($path);	1373	$pl->save_pl ($path);
1235	Coro::cede;	1374	cf::cede_to_tick;
1236	}	1375	}
1237		1376
1238	sub new($) {	1377	sub new($) {
1239	my ($login) = @_;	1378	my ($login) = @_;
1240		1379
…		…
1244	$self->{deny_save} = 1;	1383	$self->{deny_save} = 1;
1245		1384
1246	$cf::PLAYER{$login} = $self;	1385	$cf::PLAYER{$login} = $self;
1247		1386
1248	$self	1387	$self
		1388	}
		1389
		1390	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1391
		1392	=cut
		1393
		1394	sub send_msg {
		1395	my $ns = shift->ns
		1396	or return;
		1397	$ns->send_msg (@_);
1249	}	1398	}
1250		1399
1251	=item $pl->quit_character	1400	=item $pl->quit_character
1252		1401
1253	Nukes the player without looking back. If logged in, the connection will	1402	Nukes the player without looking back. If logged in, the connection will
…		…
1308	or return [];	1457	or return [];
1309		1458
1310	my @logins;	1459	my @logins;
1311		1460
1312	for my $login (@$dirs) {	1461	for my $login (@$dirs) {
		1462	my $path = path $login;
		1463
		1464	# a .pst is a dead give-away for a valid player
		1465	unless (-e "$path.pst") {
1313	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1466	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314	aio_read $fh, 0, 512, my $buf, 0 or next;	1467	aio_read $fh, 0, 512, my $buf, 0 or next;
1315	$buf !~ /^password -------------$/m or next; # official not-valid tag	1468	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1469	}
1316		1470
1317	utf8::decode $login;	1471	utf8::decode $login;
1318	push @logins, $login;	1472	push @logins, $login;
1319	}	1473	}
1320		1474
…		…
1347	}	1501	}
1348		1502
1349	\@paths	1503	\@paths
1350	}	1504	}
1351		1505
		1506	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
		1507
		1508	Expand crossfire pod fragments into protocol xml.
		1509
		1510	=cut
		1511
		1512	sub expand_cfpod {
		1513	((my $self), (local $_)) = @_;
		1514
		1515	# escape & and <
		1516	s/&/&/g;
		1517	s/(?<![BIUGHT])</</g;
		1518
		1519	# this is buggy, it needs to properly take care of nested <'s
		1520
		1521	1 while
		1522	# replace B<>, I<>, U<> etc.
		1523	s/B<([^\>]*)>/<b>$1<\/b>/
		1524	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
		1525	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1526	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
		1527	# replace G<male\|female> tags
		1528	\|\| s{G<([^>\|])\\|([^>])>}{
		1529	$self->gender ? $2 : $1
		1530	}ge
		1531	# replace H<hint text>
		1532	\|\| s{H<([^\>]*)>}
		1533	{
		1534	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1535	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1536	"")
		1537	[$self->{hintmode}]
		1538	}ge;
		1539
		1540	# create single paragraphs (very hackish)
		1541	s/(?<=\S)\n(?=\w)/ /g;
		1542
		1543	# compress some whitespace
		1544	s/\s+\n/\n/g; # ws line-ends
		1545	s/\n\n+/\n/g; # double lines
		1546	s/^\n+//; # beginning lines
		1547	s/\n+$//; # ending lines
		1548
		1549	$_
		1550	}
		1551
		1552	sub hintmode {
		1553	$_[0]{hintmode} = $_[1] if @_ > 1;
		1554	$_[0]{hintmode}
		1555	}
		1556
1352	=item $player->ext_reply ($msgid, %msg)	1557	=item $player->ext_reply ($msgid, @msg)
1353		1558
1354	Sends an ext reply to the player.	1559	Sends an ext reply to the player.
1355		1560
1356	=cut	1561	=cut
1357		1562
1358	sub ext_reply($$%) {	1563	sub ext_reply($$@) {
1359	my ($self, $id, %msg) = @_;	1564	my ($self, $id, @msg) = @_;
1360		1565
1361	$msg{msgid} = $id;	1566	$self->ns->ext_reply ($id, @msg)
1362
1363	$self->send ("ext " . cf::to_json \%msg);
1364	}	1567	}
1365		1568
1366	=item $player->ext_event ($type, %msg)	1569	=item $player->ext_msg ($type, @msg)
1367		1570
1368	Sends an ext event to the client.	1571	Sends an ext event to the client.
1369		1572
1370	=cut	1573	=cut
1371		1574
1372	sub ext_event($$%) {	1575	sub ext_msg($$@) {
1373	my ($self, $type, %msg) = @_;	1576	my ($self, $type, @msg) = @_;
1374		1577
1375	$self->ns->ext_event ($type, %msg);	1578	$self->ns->ext_msg ($type, @msg);
1376	}	1579	}
1377		1580
1378	=head3 cf::region	1581	=head3 cf::region
1379		1582
1380	=over 4	1583	=over 4
…		…
1393	my ($path) = @_;	1596	my ($path) = @_;
1394		1597
1395	my ($match, $specificity);	1598	my ($match, $specificity);
1396		1599
1397	for my $region (list) {	1600	for my $region (list) {
1398	if ($region->match && $path =~ $region->match) {	1601	if ($region->{match} && $path =~ $region->{match}) {
1399	($match, $specificity) = ($region, $region->specificity)	1602	($match, $specificity) = ($region, $region->specificity)
1400	if $region->specificity > $specificity;	1603	if $region->specificity > $specificity;
1401	}	1604	}
1402	}	1605	}
1403		1606
…		…
1523	$self->init; # pass $1 etc.	1726	$self->init; # pass $1 etc.
1524	return $self;	1727	return $self;
1525	}	1728	}
1526	}	1729	}
1527		1730
1528	Carp::carp "unable to resolve path '$path' (base '$base').";	1731	Carp::cluck "unable to resolve path '$path' (base '$base').";
1529	()	1732	()
1530	}	1733	}
1531		1734
1532	sub init {	1735	sub init {
1533	my ($self) = @_;	1736	my ($self) = @_;
…		…
1596		1799
1597	sub load_header_from($) {	1800	sub load_header_from($) {
1598	my ($self, $path) = @_;	1801	my ($self, $path) = @_;
1599		1802
1600	utf8::encode $path;	1803	utf8::encode $path;
1601	#aio_open $path, O_RDONLY, 0	1804	my $f = new_from_file cf::object::thawer $path
1602	# or return;
1603
1604	$self->_load_header ($path)
1605	or return;	1805	or return;
		1806
		1807	$self->_load_header ($f)
		1808	or return;
		1809
		1810	local $MAP_LOADING{$self->{path}} = $self;
		1811	$f->resolve_delayed_derefs;
1606		1812
1607	$self->{load_path} = $path;	1813	$self->{load_path} = $path;
1608		1814
1609	1	1815	1
1610	}	1816	}
…		…
1664	sub find {	1870	sub find {
1665	my ($path, $origin) = @_;	1871	my ($path, $origin) = @_;
1666		1872
1667	$path = normalise $path, $origin && $origin->path;	1873	$path = normalise $path, $origin && $origin->path;
1668		1874
		1875	cf::lock_wait "map_data:$path";#d#remove
1669	cf::lock_wait "map_find:$path";	1876	cf::lock_wait "map_find:$path";
1670		1877
1671	$cf::MAP{$path} \|\| do {	1878	$cf::MAP{$path} \|\| do {
1672	my $guard = cf::lock_acquire "map_find:$path";	1879	my $guard1 = cf::lock_acquire "map_find:$path";
		1880	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1881
1673	my $map = new_from_path cf::map $path	1882	my $map = new_from_path cf::map $path
1674	or return;	1883	or return;
1675		1884
1676	$map->{last_save} = $cf::RUNTIME;	1885	$map->{last_save} = $cf::RUNTIME;
1677		1886
…		…
1679	or return;	1888	or return;
1680		1889
1681	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1890	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1682	# doing this can freeze the server in a sync job, obviously	1891	# doing this can freeze the server in a sync job, obviously
1683	#$cf::WAIT_FOR_TICK->wait;	1892	#$cf::WAIT_FOR_TICK->wait;
		1893	undef $guard1;
		1894	undef $guard2;
1684	$map->reset;	1895	$map->reset;
1685	undef $guard;
1686	return find $path;	1896	return find $path;
1687	}	1897	}
1688		1898
1689	$cf::MAP{$path} = $map	1899	$cf::MAP{$path} = $map
1690	}	1900	}
…		…
1699	local $self->{deny_reset} = 1; # loading can take a long time	1909	local $self->{deny_reset} = 1; # loading can take a long time
1700		1910
1701	my $path = $self->{path};	1911	my $path = $self->{path};
1702		1912
1703	{	1913	{
1704	my $guard = cf::lock_acquire "map_load:$path";	1914	my $guard = cf::lock_acquire "map_data:$path";
1705		1915
		1916	return unless $self->valid;
1706	return if $self->in_memory != cf::MAP_SWAPPED;	1917	return unless $self->in_memory == cf::MAP_SWAPPED;
1707		1918
1708	$self->in_memory (cf::MAP_LOADING);	1919	$self->in_memory (cf::MAP_LOADING);
1709		1920
1710	$self->alloc;	1921	$self->alloc;
1711		1922
1712	$self->pre_load;	1923	$self->pre_load;
1713	Coro::cede;	1924	cf::cede_to_tick;
1714		1925
		1926	my $f = new_from_file cf::object::thawer $self->{load_path};
		1927	$f->skip_block;
1715	$self->_load_objects ($self->{load_path}, 1)	1928	$self->_load_objects ($f)
1716	or return;	1929	or return;
1717		1930
1718	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1931	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1719	if delete $self->{load_original};	1932	if delete $self->{load_original};
1720		1933
1721	if (my $uniq = $self->uniq_path) {	1934	if (my $uniq = $self->uniq_path) {
1722	utf8::encode $uniq;	1935	utf8::encode $uniq;
1723	if (aio_open $uniq, O_RDONLY, 0) {	1936	unless (aio_stat $uniq) {
		1937	if (my $f = new_from_file cf::object::thawer $uniq) {
1724	$self->clear_unique_items;	1938	$self->clear_unique_items;
1725	$self->_load_objects ($uniq, 0);	1939	$self->_load_objects ($f);
		1940	$f->resolve_delayed_derefs;
		1941	}
1726	}	1942	}
1727	}	1943	}
1728		1944
1729	Coro::cede;	1945	$f->resolve_delayed_derefs;
		1946
		1947	cf::cede_to_tick;
1730	# now do the right thing for maps	1948	# now do the right thing for maps
1731	$self->link_multipart_objects;	1949	$self->link_multipart_objects;
1732	$self->difficulty ($self->estimate_difficulty)	1950	$self->difficulty ($self->estimate_difficulty)
1733	unless $self->difficulty;	1951	unless $self->difficulty;
1734	Coro::cede;	1952	cf::cede_to_tick;
1735		1953
1736	unless ($self->{deny_activate}) {	1954	unless ($self->{deny_activate}) {
1737	$self->decay_objects;	1955	$self->decay_objects;
1738	$self->fix_auto_apply;	1956	$self->fix_auto_apply;
1739	$self->update_buttons;	1957	$self->update_buttons;
1740	Coro::cede;	1958	cf::cede_to_tick;
1741	$self->set_darkness_map;	1959	$self->set_darkness_map;
1742	Coro::cede;	1960	cf::cede_to_tick;
1743	$self->activate;	1961	$self->activate;
1744	}	1962	}
		1963
		1964	$self->{last_save} = $cf::RUNTIME;
		1965	$self->last_access ($cf::RUNTIME);
1745		1966
1746	$self->in_memory (cf::MAP_IN_MEMORY);	1967	$self->in_memory (cf::MAP_IN_MEMORY);
1747	}	1968	}
1748		1969
1749	$self->post_load;	1970	$self->post_load;
…		…
1760		1981
1761	$self	1982	$self
1762	}	1983	}
1763		1984
1764	# find and load all maps in the 3x3 area around a map	1985	# find and load all maps in the 3x3 area around a map
1765	sub load_diag {	1986	sub load_neighbours {
1766	my ($map) = @_;	1987	my ($map) = @_;
1767		1988
1768	my @diag; # diagonal neighbours	1989	my @neigh; # diagonal neighbours
1769		1990
1770	for (0 .. 3) {	1991	for (0 .. 3) {
1771	my $neigh = $map->tile_path ($_)	1992	my $neigh = $map->tile_path ($_)
1772	or next;	1993	or next;
1773	$neigh = find $neigh, $map	1994	$neigh = find $neigh, $map
1774	or next;	1995	or next;
1775	$neigh->load;	1996	$neigh->load;
1776		1997
		1998	push @neigh,
1777	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	1999	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1778	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2000	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1779	}	2001	}
1780		2002
1781	for (@diag) {	2003	for (grep defined $_->[0], @neigh) {
		2004	my ($path, $origin) = @$_;
1782	my $neigh = find @$_	2005	my $neigh = find $path, $origin
1783	or next;	2006	or next;
1784	$neigh->load;	2007	$neigh->load;
1785	}	2008	}
1786	}	2009	}
1787		2010
…		…
1792	}	2015	}
1793		2016
1794	sub do_load_sync {	2017	sub do_load_sync {
1795	my ($map) = @_;	2018	my ($map) = @_;
1796		2019
		2020	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2021	if $Coro::current == $Coro::main;
		2022
1797	cf::sync_job { $map->load };	2023	cf::sync_job { $map->load };
1798	}	2024	}
1799		2025
1800	our %MAP_PREFETCH;	2026	our %MAP_PREFETCH;
1801	our $MAP_PREFETCHER = undef;	2027	our $MAP_PREFETCHER = undef;
1802		2028
1803	sub find_async {	2029	sub find_async {
1804	my ($path, $origin) = @_;	2030	my ($path, $origin, $load) = @_;
1805		2031
1806	$path = normalise $path, $origin && $origin->{path};	2032	$path = normalise $path, $origin && $origin->{path};
1807		2033
1808	if (my $map = $cf::MAP{$path}) {	2034	if (my $map = $cf::MAP{$path}) {
1809	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2035	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1810	}	2036	}
1811		2037
1812	undef $MAP_PREFETCH{$path};	2038	$MAP_PREFETCH{$path} \|= $load;
		2039
1813	$MAP_PREFETCHER \|\|= cf::async {	2040	$MAP_PREFETCHER \|\|= cf::async {
1814	while (%MAP_PREFETCH) {	2041	while (%MAP_PREFETCH) {
1815	for my $path (keys %MAP_PREFETCH) {	2042	while (my ($k, $v) = each %MAP_PREFETCH) {
1816	my $map = find $path	2043	if (my $map = find $k) {
1817	or next;
1818	$map->load;	2044	$map->load if $v;
		2045	}
1819		2046
1820	delete $MAP_PREFETCH{$path};	2047	delete $MAP_PREFETCH{$k};
1821	}	2048	}
1822	}	2049	}
1823	undef $MAP_PREFETCHER;	2050	undef $MAP_PREFETCHER;
1824	};	2051	};
1825	$MAP_PREFETCHER->prio (6);	2052	$MAP_PREFETCHER->prio (6);
…		…
1828	}	2055	}
1829		2056
1830	sub save {	2057	sub save {
1831	my ($self) = @_;	2058	my ($self) = @_;
1832		2059
1833	my $lock = cf::lock_acquire "map_data:" . $self->path;	2060	my $lock = cf::lock_acquire "map_data:$self->{path}";
1834		2061
1835	$self->{last_save} = $cf::RUNTIME;	2062	$self->{last_save} = $cf::RUNTIME;
1836		2063
1837	return unless $self->dirty;	2064	return unless $self->dirty;
1838		2065
…		…
1861	my ($self) = @_;	2088	my ($self) = @_;
1862		2089
1863	# save first because save cedes	2090	# save first because save cedes
1864	$self->save;	2091	$self->save;
1865		2092
1866	my $lock = cf::lock_acquire "map_data:" . $self->path;	2093	my $lock = cf::lock_acquire "map_data:$self->{path}";
1867		2094
1868	return if $self->players;	2095	return if $self->players;
1869	return if $self->in_memory != cf::MAP_IN_MEMORY;	2096	return if $self->in_memory != cf::MAP_IN_MEMORY;
1870	return if $self->{deny_save};	2097	return if $self->{deny_save};
1871		2098
		2099	$self->in_memory (cf::MAP_SWAPPED);
		2100
		2101	$self->deactivate;
		2102	$_->clear_links_to ($self) for values %cf::MAP;
1872	$self->clear;	2103	$self->clear;
1873	$self->in_memory (cf::MAP_SWAPPED);
1874	}	2104	}
1875		2105
1876	sub reset_at {	2106	sub reset_at {
1877	my ($self) = @_;	2107	my ($self) = @_;
1878		2108
…		…
1910	if $uniq;	2140	if $uniq;
1911	}	2141	}
1912		2142
1913	delete $cf::MAP{$self->path};	2143	delete $cf::MAP{$self->path};
1914		2144
		2145	$self->deactivate;
		2146	$_->clear_links_to ($self) for values %cf::MAP;
1915	$self->clear;	2147	$self->clear;
1916
1917	$_->clear_links_to ($self) for values %cf::MAP;
1918		2148
1919	$self->unlink_save;	2149	$self->unlink_save;
1920	$self->destroy;	2150	$self->destroy;
1921	}	2151	}
1922		2152
1923	my $nuke_counter = "aaaa";	2153	my $nuke_counter = "aaaa";
1924		2154
1925	sub nuke {	2155	sub nuke {
1926	my ($self) = @_;	2156	my ($self) = @_;
1927		2157
		2158	{
		2159	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2160
1928	delete $cf::MAP{$self->path};	2161	delete $cf::MAP{$self->path};
1929		2162
1930	$self->unlink_save;	2163	$self->unlink_save;
1931		2164
1932	bless $self, "cf::map";	2165	bless $self, "cf::map";
1933	delete $self->{deny_reset};	2166	delete $self->{deny_reset};
1934	$self->{deny_save} = 1;	2167	$self->{deny_save} = 1;
1935	$self->reset_timeout (1);	2168	$self->reset_timeout (1);
1936	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2169	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1937		2170
1938	$cf::MAP{$self->path} = $self;	2171	$cf::MAP{$self->path} = $self;
		2172	}
1939		2173
1940	$self->reset; # polite request, might not happen	2174	$self->reset; # polite request, might not happen
1941	}	2175	}
1942		2176
1943	=item $maps = cf::map::tmp_maps	2177	=item $maps = cf::map::tmp_maps
…		…
2019		2253
2020	sub inv_recursive {	2254	sub inv_recursive {
2021	inv_recursive_ inv $_[0]	2255	inv_recursive_ inv $_[0]
2022	}	2256	}
2023		2257
		2258	=item $ref = $ob->ref
		2259
		2260	creates and returns a persistent reference to an objetc that can be stored as a string.
		2261
		2262	=item $ob = cf::object::deref ($refstring)
		2263
		2264	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2265	even if the object actually exists. May block.
		2266
		2267	=cut
		2268
		2269	sub deref {
		2270	my ($ref) = @_;
		2271
		2272	# temporary compatibility#TODO#remove
		2273	$ref =~ s{^<}{player/<};
		2274
		2275	if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
		2276	my ($uuid, $name) = ($1, $2);
		2277	my $pl = $cf::PLAYER_LOADING{$name} \|\| cf::player::find $name
		2278	or return;
		2279	$pl->ob->uuid eq $uuid
		2280	or return;
		2281
		2282	$pl->ob
		2283	} else {
		2284	warn "$ref: cannot resolve object reference\n";
		2285	undef
		2286	}
		2287	}
		2288
2024	package cf;	2289	package cf;
2025		2290
2026	=back	2291	=back
2027		2292
2028	=head3 cf::object::player	2293	=head3 cf::object::player
…		…
2050		2315
2051	} else {	2316	} else {
2052	my $pl = $self->contr;	2317	my $pl = $self->contr;
2053		2318
2054	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2319	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2055	my $diag = $pl->{npc_dialog};	2320	my $dialog = $pl->{npc_dialog};
2056	$diag->{pl}->ext_reply (	2321	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2057	$diag->{id}, msgtype => "reply", msg => $msg, add_topics => []
2058	);
2059		2322
2060	} else {	2323	} else {
2061	$msg = $npc->name . " says: $msg" if $npc;	2324	$msg = $npc->name . " says: $msg" if $npc;
2062	$self->message ($msg, $flags);	2325	$self->message ($msg, $flags);
2063	}	2326	}
2064	}	2327	}
		2328	}
		2329
		2330	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2331
		2332	=cut
		2333
		2334	sub cf::object::send_msg {
		2335	my $pl = shift->contr
		2336	or return;
		2337	$pl->send_msg (@_);
2065	}	2338	}
2066		2339
2067	=item $player_object->may ("access")	2340	=item $player_object->may ("access")
2068		2341
2069	Returns wether the given player is authorized to access resource "access"	2342	Returns wether the given player is authorized to access resource "access"
…		…
2148	# use -1 or undef as default coordinates, not 0, 0	2421	# use -1 or undef as default coordinates, not 0, 0
2149	($x, $y) = ($map->enter_x, $map->enter_y)	2422	($x, $y) = ($map->enter_x, $map->enter_y)
2150	if $x <=0 && $y <= 0;	2423	if $x <=0 && $y <= 0;
2151		2424
2152	$map->load;	2425	$map->load;
2153	$map->load_diag;	2426	$map->load_neighbours;
2154		2427
2155	return unless $self->contr->active;	2428	return unless $self->contr->active;
2156	$self->activate_recursive;	2429	$self->activate_recursive;
2157		2430
2158	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2431	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2159	$self->enter_map ($map, $x, $y);	2432	$self->enter_map ($map, $x, $y);
2160	}	2433	}
2161		2434
2162	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2435	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2163		2436
2164	Moves the player to the given map-path and coordinates by first freezing	2437	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	2438	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	2439	that has to return the map if sucecssful, and then unfreezes the player on
2167	the new (success) or old (failed) map position.	2440	the new (success) or old (failed) map position. In either case, $done will
		2441	be called at the end of this process.
2168		2442
2169	=cut	2443	=cut
2170		2444
2171	our $GOTOGEN;	2445	our $GOTOGEN;
2172		2446
2173	sub cf::object::player::goto {	2447	sub cf::object::player::goto {
2174	my ($self, $path, $x, $y, $check) = @_;	2448	my ($self, $path, $x, $y, $check, $done) = @_;
2175		2449
2176	# do generation counting so two concurrent goto's will be executed in-order	2450	# do generation counting so two concurrent goto's will be executed in-order
2177	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2451	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2178		2452
2179	$self->enter_link;	2453	$self->enter_link;
2180		2454
2181	(async {	2455	(async {
		2456	# *tag paths override both path and x\|y
		2457	if ($path =~ /^\(.)$/) {
		2458	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2459	my $ob = $obs[rand @obs];
		2460
		2461	# see if we actually can go there
		2462	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2463	$ob = $obs[rand @obs];
		2464	} else {
		2465	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE \| cf::NDI_RED);
		2466	}
		2467	# else put us there anyways for now #d#
		2468
		2469	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2470	} else {
		2471	($path, $x, $y) = (undef, undef, undef);
		2472	}
		2473	}
		2474
2182	my $map = eval {	2475	my $map = eval {
2183	my $map = cf::map::find $path;	2476	my $map = defined $path ? cf::map::find $path : undef;
2184		2477
2185	if ($map) {	2478	if ($map) {
2186	$map = $map->customise_for ($self);	2479	$map = $map->customise_for ($self);
2187	$map = $check->($map) if $check && $map;	2480	$map = $check->($map) if $check && $map;
2188	} else {	2481	} else {
2189	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);	2482	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE \| cf::NDI_RED);
2190	}	2483	}
2191		2484
2192	$map	2485	$map
2193	};	2486	};
2194		2487
…		…
2199		2492
2200	if ($gen == $self->{_goto_generation}) {	2493	if ($gen == $self->{_goto_generation}) {
2201	delete $self->{_goto_generation};	2494	delete $self->{_goto_generation};
2202	$self->leave_link ($map, $x, $y);	2495	$self->leave_link ($map, $x, $y);
2203	}	2496	}
		2497
		2498	$done->() if $done;
2204	})->prio (1);	2499	})->prio (1);
2205	}	2500	}
2206		2501
2207	=item $player_object->enter_exit ($exit_object)	2502	=item $player_object->enter_exit ($exit_object)
2208		2503
…		…
2277	my $hp = $exit->stats->hp;	2572	my $hp = $exit->stats->hp;
2278	my $sp = $exit->stats->sp;	2573	my $sp = $exit->stats->sp;
2279		2574
2280	$self->enter_link;	2575	$self->enter_link;
2281		2576
		2577	# if exit is damned, update players death & WoR home-position
		2578	$self->contr->savebed ($slaying, $hp, $sp)
		2579	if $exit->flag (FLAG_DAMNED);
		2580
2282	(async {	2581	(async {
2283	$self->deactivate_recursive; # just to be sure	2582	$self->deactivate_recursive; # just to be sure
2284	unless (eval {	2583	unless (eval {
2285	$self->goto ($slaying, $hp, $sp);	2584	$self->goto ($slaying, $hp, $sp);
2286		2585
…		…
2313		2612
2314	utf8::encode $text;	2613	utf8::encode $text;
2315	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2614	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2316	}	2615	}
2317		2616
		2617	=item $client->send_msg ($channel, $msg, $color, [extra...])
		2618
		2619	Send a drawinfo or msg packet to the client, formatting the msg for the
		2620	client if neccessary. C<$type> should be a string identifying the type of
		2621	the message, with C<log> being the default. If C<$color> is negative, suppress
		2622	the message unless the client supports the msg packet.
		2623
		2624	=cut
		2625
		2626	our %CHANNEL = (
		2627	"c/identify" => {
		2628	id => "identify",
		2629	title => "Identify",
		2630	reply => undef,
		2631	tooltip => "Items recently identified",
		2632	},
		2633	"c/examine" => {
		2634	id => "examine",
		2635	title => "Examine",
		2636	reply => undef,
		2637	tooltip => "Signs and other items you examined",
		2638	},
		2639	);
		2640
		2641	sub cf::client::send_msg {
		2642	my ($self, $channel, $msg, $color, @extra) = @_;
		2643
		2644	$msg = $self->pl->expand_cfpod ($msg);
		2645
		2646	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2647
		2648	# check predefined channels, for the benefit of C
		2649	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};
		2650
		2651	if (ref $channel) {
		2652	# send meta info to client, if not yet sent
		2653	unless (exists $self->{channel}{$channel->{id}}) {
		2654	$self->{channel}{$channel->{id}} = $channel;
		2655	$self->ext_msg (channel_info => $channel)
		2656	if $self->can_msg;
		2657	}
		2658
		2659	$channel = $channel->{id};
		2660	}
		2661
		2662	return unless @extra \|\| length $msg;
		2663
		2664	if ($self->can_msg) {
		2665	# default colour, mask it out
		2666	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
		2667	if $color & cf::NDI_DEF;
		2668
		2669	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2670	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
		2671	} else {
		2672	if ($color >= 0) {
		2673	# replace some tags by gcfclient-compatible ones
		2674	for ($msg) {
		2675	1 while
		2676	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2677	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2678	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2679	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2680	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2681	}
		2682
		2683	$color &= cf::NDI_COLOR_MASK;
		2684
		2685	utf8::encode $msg;
		2686
		2687	if (0 && $msg =~ /\[/) {
		2688	# COMMAND/INFO
		2689	$self->send_packet ("drawextinfo $color 10 8 $msg")
		2690	} else {
		2691	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
		2692	$self->send_packet ("drawinfo $color $msg")
		2693	}
		2694	}
		2695	}
		2696	}
		2697
2318	=item $client->ext_event ($type, %msg)	2698	=item $client->ext_msg ($type, @msg)
2319		2699
2320	Sends an exti event to the client.	2700	Sends an ext event to the client.
2321		2701
2322	=cut	2702	=cut
2323		2703
2324	sub cf::client::ext_event($$%) {	2704	sub cf::client::ext_msg($$@) {
2325	my ($self, $type, %msg) = @_;	2705	my ($self, $type, @msg) = @_;
2326		2706
		2707	if ($self->extcmd == 2) {
		2708	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2709	} elsif ($self->extcmd == 1) { # TODO: remove
2327	$msg{msgtype} = "event_$type";	2710	push @msg, msgtype => "event_$type";
2328	$self->send_packet ("ext " . cf::to_json \%msg);	2711	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2712	}
		2713	}
		2714
		2715	=item $client->ext_reply ($msgid, @msg)
		2716
		2717	Sends an ext reply to the client.
		2718
		2719	=cut
		2720
		2721	sub cf::client::ext_reply($$@) {
		2722	my ($self, $id, @msg) = @_;
		2723
		2724	if ($self->extcmd == 2) {
		2725	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2726	} elsif ($self->extcmd == 1) {
		2727	#TODO: version 1, remove
		2728	unshift @msg, msgtype => "reply", msgid => $id;
		2729	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2730	}
2329	}	2731	}
2330		2732
2331	=item $success = $client->query ($flags, "text", \&cb)	2733	=item $success = $client->query ($flags, "text", \&cb)
2332		2734
2333	Queues a query to the client, calling the given callback with	2735	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>,	2736	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>.	2737	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2336		2738
2337	Queries can fail, so check the return code. Or don't, as queries will become	2739	Queries can fail, so check the return code. Or don't, as queries will
2338	reliable at some point in the future.	2740	become reliable at some point in the future.
2339		2741
2340	=cut	2742	=cut
2341		2743
2342	sub cf::client::query {	2744	sub cf::client::query {
2343	my ($self, $flags, $text, $cb) = @_;	2745	my ($self, $flags, $text, $cb) = @_;
…		…
2351	utf8::encode $text;	2753	utf8::encode $text;
2352	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];	2754	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2353		2755
2354	$self->send_packet ($self->{query_queue}[0][0])	2756	$self->send_packet ($self->{query_queue}[0][0])
2355	if @{ $self->{query_queue} } == 1;	2757	if @{ $self->{query_queue} } == 1;
		2758
		2759	1
2356	}	2760	}
2357		2761
2358	cf::client->attach (	2762	cf::client->attach (
		2763	on_connect => sub {
		2764	my ($ns) = @_;
		2765
		2766	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2767	},
2359	on_reply => sub {	2768	on_reply => sub {
2360	my ($ns, $msg) = @_;	2769	my ($ns, $msg) = @_;
2361		2770
2362	# this weird shuffling is so that direct followup queries	2771	# this weird shuffling is so that direct followup queries
2363	# get handled first	2772	# get handled first
…		…
2375	} else {	2784	} else {
2376	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;	2785	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2377	}	2786	}
2378	}	2787	}
2379	},	2788	},
		2789	on_exticmd => sub {
		2790	my ($ns, $buf) = @_;
		2791
		2792	my $msg = eval { $ns->{json_coder}->decode ($buf) };
		2793
		2794	if (ref $msg) {
		2795	my ($type, $reply, @payload) =
		2796	"ARRAY" eq ref $msg
		2797	? @$msg
		2798	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2799
		2800	my @reply;
		2801
		2802	if (my $cb = $EXTICMD{$type}) {
		2803	@reply = $cb->($ns, @payload);
		2804	}
		2805
		2806	$ns->ext_reply ($reply, @reply)
		2807	if $reply;
		2808
		2809	} else {
		2810	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
		2811	}
		2812
		2813	cf::override;
		2814	},
2380	);	2815	);
2381		2816
2382	=item $client->async (\&cb)	2817	=item $client->async (\&cb)
2383		2818
2384	Create a new coroutine, running the specified callback. The coroutine will	2819	Create a new coroutine, running the specified callback. The coroutine will
…		…
2425	our $safe = new Safe "safe";	2860	our $safe = new Safe "safe";
2426	our $safe_hole = new Safe::Hole;	2861	our $safe_hole = new Safe::Hole;
2427		2862
2428	$SIG{FPE} = 'IGNORE';	2863	$SIG{FPE} = 'IGNORE';
2429		2864
2430	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2865	$safe->permit_only (Opcode::opset qw(
		2866	:base_core :base_mem :base_orig :base_math
		2867	grepstart grepwhile mapstart mapwhile
		2868	sort time
		2869	));
2431		2870
2432	# here we export the classes and methods available to script code	2871	# here we export the classes and methods available to script code
2433		2872
2434	=pod	2873	=pod
2435		2874
2436	The following functions and methods are available within a safe environment:	2875	The following functions and methods are available within a safe environment:
2437		2876
2438	cf::object contr pay_amount pay_player map	2877	cf::object
		2878	contr pay_amount pay_player map x y force_find force_add
		2879	insert remove name archname title slaying race decrease_ob_nr
		2880
2439	cf::object::player player	2881	cf::object::player
2440	cf::player peaceful	2882	player
2441	cf::map trigger	2883
		2884	cf::player
		2885	peaceful
		2886
		2887	cf::map
		2888	trigger
2442		2889
2443	=cut	2890	=cut
2444		2891
2445	for (	2892	for (
2446	["cf::object" => qw(contr pay_amount pay_player map)],	2893	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2894	insert remove inv name archname title slaying race
		2895	decrease_ob_nr)],
2447	["cf::object::player" => qw(player)],	2896	["cf::object::player" => qw(player)],
2448	["cf::player" => qw(peaceful)],	2897	["cf::player" => qw(peaceful)],
2449	["cf::map" => qw(trigger)],	2898	["cf::map" => qw(trigger)],
2450	) {	2899	) {
2451	no strict 'refs';	2900	no strict 'refs';
…		…
2527	# the server's init and main functions	2976	# the server's init and main functions
2528		2977
2529	sub load_facedata($) {	2978	sub load_facedata($) {
2530	my ($path) = @_;	2979	my ($path) = @_;
2531		2980
		2981	# HACK to clear player env face cache, we need some signal framework
		2982	# for this (global event?)
		2983	%ext::player_env::MUSIC_FACE_CACHE = ();
		2984
		2985	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		2986
2532	warn "loading facedata from $path\n";	2987	warn "loading facedata from $path\n";
2533		2988
2534	my $facedata;	2989	my $facedata;
2535	0 < aio_load $path, $facedata	2990	0 < aio_load $path, $facedata
2536	or die "$path: $!";	2991	or die "$path: $!";
…		…
2538	$facedata = Coro::Storable::thaw $facedata;	2993	$facedata = Coro::Storable::thaw $facedata;
2539		2994
2540	$facedata->{version} == 2	2995	$facedata->{version} == 2
2541	or cf::cleanup "$path: version mismatch, cannot proceed.";	2996	or cf::cleanup "$path: version mismatch, cannot proceed.";
2542		2997
		2998	# patch in the exptable
		2999	$facedata->{resource}{"res/exp_table"} = {
		3000	type => FT_RSRC,
		3001	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3002	};
		3003	cf::cede_to_tick;
		3004
2543	{	3005	{
2544	my $faces = $facedata->{faceinfo};	3006	my $faces = $facedata->{faceinfo};
2545		3007
2546	while (my ($face, $info) = each %$faces) {	3008	while (my ($face, $info) = each %$faces) {
2547	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3009	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2548	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3010	cf::face::set_visibility $idx, $info->{visibility};
		3011	cf::face::set_magicmap $idx, $info->{magicmap};
2549	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3012	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2550	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3013	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2551	Coro::cede;	3014
		3015	cf::cede_to_tick;
2552	}	3016	}
2553		3017
2554	while (my ($face, $info) = each %$faces) {	3018	while (my ($face, $info) = each %$faces) {
2555	next unless $info->{smooth};	3019	next unless $info->{smooth};
2556	my $idx = cf::face::find $face	3020	my $idx = cf::face::find $face
2557	or next;	3021	or next;
2558	if (my $smooth = cf::face::find $info->{smooth}) {	3022	if (my $smooth = cf::face::find $info->{smooth}) {
		3023	cf::face::set_smooth $idx, $smooth;
2559	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3024	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2560	} else {	3025	} else {
2561	warn "smooth face '$info->{smooth}' not found for face '$face'";	3026	warn "smooth face '$info->{smooth}' not found for face '$face'";
2562	}	3027	}
2563	Coro::cede;	3028
		3029	cf::cede_to_tick;
2564	}	3030	}
2565	}	3031	}
2566		3032
2567	{	3033	{
2568	my $anims = $facedata->{animinfo};	3034	my $anims = $facedata->{animinfo};
2569		3035
2570	while (my ($anim, $info) = each %$anims) {	3036	while (my ($anim, $info) = each %$anims) {
2571	cf::anim::set $anim, $info->{frames}, $info->{facings};	3037	cf::anim::set $anim, $info->{frames}, $info->{facings};
2572	Coro::cede;	3038	cf::cede_to_tick;
2573	}	3039	}
2574		3040
2575	cf::anim::invalidate_all; # d'oh	3041	cf::anim::invalidate_all; # d'oh
2576	}	3042	}
2577		3043
		3044	{
		3045	# TODO: for gcfclient pleasure, we should give resources
		3046	# that gcfclient doesn't grok a >10000 face index.
		3047	my $res = $facedata->{resource};
		3048
		3049	my $soundconf = delete $res->{"res/sound.conf"};
		3050
		3051	while (my ($name, $info) = each %$res) {
		3052	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		3053	my $data;
		3054
		3055	if ($info->{type} & 1) {
		3056	# prepend meta info
		3057
		3058	my $meta = $enc->encode ({
		3059	name => $name,
		3060	%{ $info->{meta} \|\| {} },
		3061	});
		3062
		3063	$data = pack "(w/a)", $meta, $info->{data};
		3064	} else {
		3065	$data = $info->{data};
		3066	}
		3067
		3068	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3069	cf::face::set_type $idx, $info->{type};
		3070
		3071	cf::cede_to_tick;
		3072	}
		3073
		3074	if ($soundconf) {
		3075	$soundconf = $enc->decode (delete $soundconf->{data});
		3076
		3077	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3078	my $sound = $soundconf->{compat}[$_]
		3079	or next;
		3080
		3081	my $face = cf::face::find "sound/$sound->[1]";
		3082	cf::sound::set $sound->[0] => $face;
		3083	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3084	}
		3085
		3086	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3087	my $face = cf::face::find "sound/$v";
		3088	cf::sound::set $k => $face;
		3089	}
		3090	}
		3091	}
		3092
2578	1	3093	1
2579	}	3094	}
2580		3095
		3096	register_exticmd fx_want => sub {
		3097	my ($ns, $want) = @_;
		3098
		3099	while (my ($k, $v) = each %$want) {
		3100	$ns->fx_want ($k, $v);
		3101	}
		3102	};
		3103
2581	sub reload_regions {	3104	sub reload_regions {
		3105	# HACK to clear player env face cache, we need some signal framework
		3106	# for this (global event?)
		3107	%ext::player_env::MUSIC_FACE_CACHE = ();
		3108
2582	load_resource_file "$MAPDIR/regions"	3109	load_resource_file "$MAPDIR/regions"
2583	or die "unable to load regions file\n";	3110	or die "unable to load regions file\n";
		3111
		3112	for (cf::region::list) {
		3113	$_->{match} = qr/$_->{match}/
		3114	if exists $_->{match};
		3115	}
2584	}	3116	}
2585		3117
2586	sub reload_facedata {	3118	sub reload_facedata {
2587	load_facedata "$DATADIR/facedata"	3119	load_facedata "$DATADIR/facedata"
2588	or die "unable to load facedata\n";	3120	or die "unable to load facedata\n";
2589	}	3121	}
2590		3122
2591	sub reload_archetypes {	3123	sub reload_archetypes {
		3124	load_resource_file "$DATADIR/archetypes"
		3125	or die "unable to load archetypes\n";
		3126	#d# NEED to laod twice to resolve forward references
		3127	# this really needs to be done in an extra post-pass
		3128	# (which needs to be synchronous, so solve it differently)
2592	load_resource_file "$DATADIR/archetypes"	3129	load_resource_file "$DATADIR/archetypes"
2593	or die "unable to load archetypes\n";	3130	or die "unable to load archetypes\n";
2594	}	3131	}
2595		3132
2596	sub reload_treasures {	3133	sub reload_treasures {
…		…
2612		3149
2613	sub init {	3150	sub init {
2614	reload_resources;	3151	reload_resources;
2615	}	3152	}
2616		3153
2617	sub cfg_load {	3154	sub reload_config {
2618	open my $fh, "<:utf8", "$CONFDIR/config"	3155	open my $fh, "<:utf8", "$CONFDIR/config"
2619	or return;	3156	or return;
2620		3157
2621	local $/;	3158	local $/;
2622	*CFG = YAML::Syck::Load <$fh>;	3159	*CFG = YAML::Syck::Load <$fh>;
…		…
2642	(async {	3179	(async {
2643	Event::one_event;	3180	Event::one_event;
2644	})->prio (Coro::PRIO_MAX);	3181	})->prio (Coro::PRIO_MAX);
2645	};	3182	};
2646		3183
2647	cfg_load;	3184	reload_config;
2648	db_init;	3185	db_init;
2649	load_extensions;	3186	load_extensions;
2650		3187
2651	$TICK_WATCHER->start;	3188	$TICK_WATCHER->start;
2652	Event::loop;	3189	Event::loop;
…		…
2790	%EXT_CORO = ();	3327	%EXT_CORO = ();
2791		3328
2792	warn "removing commands";	3329	warn "removing commands";
2793	%COMMAND = ();	3330	%COMMAND = ();
2794		3331
2795	warn "removing ext commands";	3332	warn "removing ext/exti commands";
2796	%EXTCMD = ();	3333	%EXTCMD = ();
		3334	%EXTICMD = ();
2797		3335
2798	warn "unloading/nuking all extensions";	3336	warn "unloading/nuking all extensions";
2799	for my $pkg (@EXTS) {	3337	for my $pkg (@EXTS) {
2800	warn "... unloading $pkg";	3338	warn "... unloading $pkg";
2801		3339
…		…
2844	warn "reloading cf.pm";	3382	warn "reloading cf.pm";
2845	require cf;	3383	require cf;
2846	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3384	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2847		3385
2848	warn "loading config and database again";	3386	warn "loading config and database again";
2849	cf::cfg_load;	3387	cf::reload_config;
2850		3388
2851	warn "loading extensions";	3389	warn "loading extensions";
2852	cf::load_extensions;	3390	cf::load_extensions;
2853		3391
2854	warn "reattaching attachments to objects/players";	3392	warn "reattaching attachments to objects/players";
…		…
2919	my $signal = new Coro::Signal;	3457	my $signal = new Coro::Signal;
2920	push @WAIT_FOR_TICK_BEGIN, $signal;	3458	push @WAIT_FOR_TICK_BEGIN, $signal;
2921	$signal->wait;	3459	$signal->wait;
2922	}	3460	}
2923		3461
2924	my $min = 1e6;#d#
2925	my $avg = 10;
2926	$TICK_WATCHER = Event->timer (	3462	$TICK_WATCHER = Event->timer (
2927	reentrant => 0,	3463	reentrant => 0,
2928	parked => 1,	3464	parked => 1,
2929	prio => 0,	3465	prio => 0,
2930	at => $NEXT_TICK \|\| $TICK,	3466	at => $NEXT_TICK \|\| $TICK,
…		…
2938		3474
2939	$NOW = $tick_start = Event::time;	3475	$NOW = $tick_start = Event::time;
2940		3476
2941	cf::server_tick; # one server iteration	3477	cf::server_tick; # one server iteration
2942		3478
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
2966	$RUNTIME += $TICK;	3479	$RUNTIME += $TICK;
2967	$NEXT_TICK += $TICK;	3480	$NEXT_TICK += $TICK;
2968		3481
2969	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3482	if ($NOW >= $NEXT_RUNTIME_WRITE) {
2970	$NEXT_RUNTIME_WRITE = $NOW + 10;	3483	$NEXT_RUNTIME_WRITE = $NOW + 10;
…		…
2972	write_runtime	3485	write_runtime
2973	or warn "ERROR: unable to write runtime file: $!";	3486	or warn "ERROR: unable to write runtime file: $!";
2974	};	3487	};
2975	}	3488	}
2976		3489
2977	# my $AFTER = Event::time;
2978	# warn $AFTER - $NOW;#d#
2979
2980	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3490	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2981	$sig->send;	3491	$sig->send;
2982	}	3492	}
2983	while (my $sig = shift @WAIT_FOR_TICK) {	3493	while (my $sig = shift @WAIT_FOR_TICK) {
2984	$sig->send;	3494	$sig->send;
…		…
2994		3504
2995	$LOAD = ($NOW - $tick_start) / $TICK;	3505	$LOAD = ($NOW - $tick_start) / $TICK;
2996	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3506	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2997		3507
2998	_post_tick;	3508	_post_tick;
2999
3000
3001	},	3509	},
3002	);	3510	);
3003		3511
3004	{	3512	{
		3513	BDB::min_parallel 8;
3005	BDB::max_poll_time $TICK * 0.1;	3514	BDB::max_poll_time $TICK * 0.1;
3006	$BDB_POLL_WATCHER = Event->io (	3515	$BDB_POLL_WATCHER = Event->io (
3007	reentrant => 0,	3516	reentrant => 0,
3008	fd => BDB::poll_fileno,	3517	fd => BDB::poll_fileno,
3009	poll => 'r',	3518	poll => 'r',
3010	prio => 0,	3519	prio => 0,
3011	data => WF_AUTOCANCEL,	3520	data => WF_AUTOCANCEL,
3012	cb => \&BDB::poll_cb,	3521	cb => \&BDB::poll_cb,
3013	);	3522	);
3014	BDB::min_parallel 8;
3015		3523
3016	BDB::set_sync_prepare {	3524	BDB::set_sync_prepare {
3017	my $status;	3525	my $status;
3018	my $current = $Coro::current;	3526	my $current = $Coro::current;
3019	(	3527	(
…		…
3028	)	3536	)
3029	};	3537	};
3030		3538
3031	unless ($DB_ENV) {	3539	unless ($DB_ENV) {
3032	$DB_ENV = BDB::db_env_create;	3540	$DB_ENV = BDB::db_env_create;
		3541	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC
		3542	\| BDB::LOG_AUTOREMOVE, 1);
		3543	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3544	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3033		3545
3034	cf::sync_job {	3546	cf::sync_job {
3035	eval {	3547	eval {
3036	BDB::db_env_open	3548	BDB::db_env_open
3037	$DB_ENV,	3549	$DB_ENV,
…		…
3039	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN	3551	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN
3040	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3552	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3041	0666;	3553	0666;
3042		3554
3043	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3555	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3044
3045	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
3046	$DB_ENV->set_lk_detect;
3047	};	3556	};
3048		3557
3049	cf::cleanup "db_env_open(db): $@" if $@;	3558	cf::cleanup "db_env_open(db): $@" if $@;
3050	};	3559	};
3051	}	3560	}
		3561
		3562	$BDB_DEADLOCK_WATCHER = Event->timer (
		3563	after => 3,
		3564	interval => 1,
		3565	hard => 1,
		3566	prio => 0,
		3567	data => WF_AUTOCANCEL,
		3568	cb => sub {
		3569	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3570	},
		3571	);
		3572	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3573	after => 11,
		3574	interval => 60,
		3575	hard => 1,
		3576	prio => 0,
		3577	data => WF_AUTOCANCEL,
		3578	cb => sub {
		3579	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3580	},
		3581	);
		3582	$BDB_TRICKLE_WATCHER = Event->timer (
		3583	after => 5,
		3584	interval => 10,
		3585	hard => 1,
		3586	prio => 0,
		3587	data => WF_AUTOCANCEL,
		3588	cb => sub {
		3589	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3590	},
		3591	);
3052	}	3592	}
3053		3593
3054	{	3594	{
3055	IO::AIO::min_parallel 8;	3595	IO::AIO::min_parallel 8;
3056		3596

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.282 by elmex, Tue Jun 19 18:15:34 2007 UTC vs. Revision 1.373 by root, Sat Sep 15 15:58:06 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.282 by elmex, Tue Jun 19 18:15:34 2007 UTC vs.
Revision 1.373 by root, Sat Sep 15 15:58:06 2007 UTC