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.286 by root, Sun Jun 24 04:27:20 2007 UTC vs.
Revision 1.379 by root, Thu Oct 4 23:59:07 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
…		…
308	};	336	};
309	$TICK_WATCHER->stop;	337	$TICK_WATCHER->stop;
310	$guard	338	$guard
311	}	339	}
312		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	$Coro::current->desc ("timeslot manager");
		360
		361	my $signal = new Coro::Signal;
		362
		363	while () {
		364	next_job:
		365	my $avail = cf::till_tick;
		366	if ($avail > 0.01) {
		367	for (0 .. $#SLOT_QUEUE) {
		368	if ($SLOT_QUEUE[$_][0] < $avail) {
		369	my $job = splice @SLOT_QUEUE, $_, 1, ();
		370	$job->[2]->send;
		371	Coro::cede;
		372	goto next_job;
		373	}
		374	}
		375	}
		376
		377	if (@SLOT_QUEUE) {
		378	# we do not use wait_For_tick() as it returns immediately when tick is inactive
		379	push @cf::WAIT_FOR_TICK, $signal;
		380	$signal->wait;
		381	} else {
		382	Coro::schedule;
		383	}
		384	}
		385	};
		386
		387	sub get_slot($;$$) {
		388	my ($time, $pri, $name) = @_;
		389
		390	$time = $TICK * .6 if $time > $TICK * .6;
		391	my $sig = new Coro::Signal;
		392
		393	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		394	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		395	$SLOT_QUEUE->ready;
		396	$sig->wait;
		397	}
		398
313	=item cf::async { BLOCK }	399	=item cf::async { BLOCK }
314		400
315	Currently the same as Coro::async_pool, meaning you cannot use	401	Currently the same as Coro::async_pool, meaning you cannot use
316	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only	402	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
317	thing you are allowed to do is call C<prio> on it.	403	thing you are allowed to do is call C<prio> on it.
…		…
341	my $time = Event::time;	427	my $time = Event::time;
342		428
343	# this is the main coro, too bad, we have to block	429	# this is the main coro, too bad, we have to block
344	# till the operation succeeds, freezing the server :/	430	# till the operation succeeds, freezing the server :/
345		431
		432	LOG llevError | logBacktrace, Carp::longmess "sync job";#d#
		433
346	# TODO: use suspend/resume instead	434	# TODO: use suspend/resume instead
347	# (but this is cancel-safe)	435	# (but this is cancel-safe)
348	my $freeze_guard = freeze_mainloop;	436	my $freeze_guard = freeze_mainloop;
349		437
350	my $busy = 1;	438	my $busy = 1;
351	my @res;	439	my @res;
352		440
353	(async {	441	(async {
		442	$Coro::current->desc ("sync job coro");
354	@res = eval { $job->() };	443	@res = eval { $job->() };
355	warn $@ if $@;	444	warn $@ if $@;
356	undef $busy;	445	undef $busy;
357	})->prio (Coro::PRIO_MAX);	446	})->prio (Coro::PRIO_MAX);
358		447
…		…
405	=cut	494	=cut
406		495
407	sub fork_call(&@) {	496	sub fork_call(&@) {
408	my ($cb, @args) = @_;	497	my ($cb, @args) = @_;
409		498
410	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	499	# we seemingly have to make a local copy of the whole thing,
411	# or die "socketpair: $!";	500	# otherwise perl prematurely frees the stuff :/
412	pipe my $fh1, my $fh2	501	# TODO: investigate and fix (likely this will be rather laborious)
413	or die "pipe: $!";
414		502
415	if (my $pid = fork) {	503	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;	504	reset_signals;
428	local $SIG{__WARN__};	505	&$cb
429	local $SIG{__DIE__};	506	}, @args;
430	eval {
431	close $fh1;
432		507
433	my @res = eval { $cb->(@args) };	508	wantarray ? @res : $res[-1]
434	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
435	};
436
437	warn $@ if $@;
438	_exit 0;
439	}
440	}	509	}
441		510
442	=item $value = cf::db_get $family => $key	511	=item $value = cf::db_get $family => $key
443		512
444	Returns a single value from the environment database.	513	Returns a single value from the environment database.
…		…
446	=item cf::db_put $family => $key => $value	515	=item cf::db_put $family => $key => $value
447		516
448	Stores the given C<$value> in the family. It can currently store binary	517	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).	518	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
450		519
		520	=item $db = cf::db_table "name"
		521
		522	Create and/or open a new database table. The string must not be "db" and must be unique
		523	within each server.
		524
451	=cut	525	=cut
		526
		527	sub db_table($) {
		528	my ($name) = @_;
		529	my $db = BDB::db_create $DB_ENV;
		530
		531	eval {
		532	$db->set_flags (BDB::CHKSUM);
		533
		534	utf8::encode $name;
		535	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		536	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		537	cf::cleanup "db_open(db): $!" if $!;
		538	};
		539	cf::cleanup "db_open(db): $@" if $@;
		540
		541	$db
		542	}
452		543
453	our $DB;	544	our $DB;
454		545
455	sub db_init {	546	sub db_init {
456	unless ($DB) {
457	$DB = BDB::db_create $DB_ENV;
458
459	cf::sync_job {	547	cf::sync_job {
460	eval {	548	$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	}	549	};
470	}	550	}
471		551
472	sub db_get($$) {	552	sub db_get($$) {
473	my $key = "$_[0]/$_[1]";	553	my $key = "$_[0]/$_[1]";
474		554
…		…
524	if (1) {	604	if (1) {
525	$md5 =	605	$md5 =
526	join "\x00",	606	join "\x00",
527	$processversion,	607	$processversion,
528	map {	608	map {
529	Coro::cede;	609	cf::cede_to_tick;
530	($src->[$_], Digest::MD5::md5_hex $data[$_])	610	($src->[$_], Digest::MD5::md5_hex $data[$_])
531	} 0.. $#$src;	611	} 0.. $#$src;
532		612
533		613
534	my $dbmd5 = db_get cache => "$id/md5";	614	my $dbmd5 = db_get cache => "$id/md5";
…		…
840	";	920	";
841	die if $@;	921	die if $@;
842	}	922	}
843		923
844	our $override;	924	our $override;
845	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	925	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846		926
847	sub override {	927	sub override {
848	$override = 1;	928	$override = 1;
849	@invoke_results = ();	929	@INVOKE_RESULTS = (@_);
850	}	930	}
851		931
852	sub do_invoke {	932	sub do_invoke {
853	my $event = shift;	933	my $event = shift;
854	my $callbacks = shift;	934	my $callbacks = shift;
855		935
856	@invoke_results = ();	936	@INVOKE_RESULTS = ();
857		937
858	local $override;	938	local $override;
859		939
860	for (@$callbacks) {	940	for (@$callbacks) {
861	eval { &{$_->[1]} };	941	eval { &{$_->[1]} };
…		…
878		958
879	Generate an object-specific event with the given arguments.	959	Generate an object-specific event with the given arguments.
880		960
881	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	961	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	962	removed in future versions), and there is no public API to access override
883	results (if you must, access C<@cf::invoke_results> directly).	963	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884		964
885	=back	965	=back
886		966
887	=cut	967	=cut
888		968
889	#############################################################################	969	#############################################################################
890	# object support	970	# object support
		971	#
		972
		973	sub _can_merge {
		974	my ($ob1, $ob2) = @_;
		975
		976	local $Storable::canonical = 1;
		977	my $fob1 = Storable::freeze $ob1;
		978	my $fob2 = Storable::freeze $ob2;
		979
		980	$fob1 eq $fob2
		981	}
891		982
892	sub reattach {	983	sub reattach {
893	# basically do the same as instantiate, without calling instantiate	984	# basically do the same as instantiate, without calling instantiate
894	my ($obj) = @_;	985	my ($obj) = @_;
895		986
…		…
942	sub object_freezer_save {	1033	sub object_freezer_save {
943	my ($filename, $rdata, $objs) = @_;	1034	my ($filename, $rdata, $objs) = @_;
944		1035
945	sync_job {	1036	sync_job {
946	if (length $$rdata) {	1037	if (length $$rdata) {
		1038	utf8::decode (my $decname = $filename);
947	warn sprintf "saving %s (%d,%d)\n",	1039	warn sprintf "saving %s (%d,%d)\n",
948	$filename, length $$rdata, scalar @$objs;	1040	$decname, length $$rdata, scalar @$objs;
949		1041
950	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1042	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951	chmod SAVE_MODE, $fh;	1043	chmod SAVE_MODE, $fh;
952	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1044	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953	aio_fsync $fh if $cf::USE_FSYNC;	1045	aio_fsync $fh if $cf::USE_FSYNC;
…		…
972	}	1064	}
973	} else {	1065	} else {
974	aio_unlink $filename;	1066	aio_unlink $filename;
975	aio_unlink "$filename.pst";	1067	aio_unlink "$filename.pst";
976	}	1068	}
977	}	1069	};
978	}	1070	}
979		1071
980	sub object_freezer_as_string {	1072	sub object_freezer_as_string {
981	my ($rdata, $objs) = @_;	1073	my ($rdata, $objs) = @_;
982		1074
…		…
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
999	$av = eval { (Storable::thaw $av)->{objs} };	1092	$av = eval { (Storable::thaw $av)->{objs} };
1000	}	1093	}
1001		1094
		1095	utf8::decode (my $decname = $filename);
1002	warn sprintf "loading %s (%d)\n",	1096	warn sprintf "loading %s (%d,%d)\n",
1003	$filename, length $data, scalar @{$av || []};	1097	$decname, length $data, scalar @{$av || []};
		1098
1004	return ($data, $av);	1099	($data, $av)
1005	}	1100	}
1006		1101
1007	=head2 COMMAND CALLBACKS	1102	=head2 COMMAND CALLBACKS
1008		1103
1009	=over 4	1104	=over 4
…		…
1029	push @{ $COMMAND{$name} }, [$caller, $cb];	1124	push @{ $COMMAND{$name} }, [$caller, $cb];
1030	}	1125	}
1031		1126
1032	=item cf::register_extcmd $name => \&callback($pl,$packet);	1127	=item cf::register_extcmd $name => \&callback($pl,$packet);
1033		1128
1034	Register a callback fro execution when the client sends an extcmd packet.	1129	Register a callback for execution when the client sends an (synchronous)
		1130	extcmd packet. Ext commands will be processed in the order they are
		1131	received by the server, like other user commands. The first argument is
		1132	the logged-in player. Ext commands can only be processed after a player
		1133	has logged in successfully.
1035		1134
1036	If the callback returns something, it is sent back as if reply was being	1135	If the callback returns something, it is sent back as if reply was being
1037	called.	1136	called.
1038		1137
		1138	=item cf::register_exticmd $name => \&callback($ns,$packet);
		1139
		1140	Register a callback for execution when the client sends an (asynchronous)
		1141	exticmd packet. Exti commands are processed by the server as soon as they
		1142	are received, i.e. out of order w.r.t. other commands. The first argument
		1143	is a client socket. Exti commands can be received anytime, even before
		1144	log-in.
		1145
		1146	If the callback returns something, it is sent back as if reply was being
		1147	called.
		1148
1039	=cut	1149	=cut
1040		1150
1041	sub register_extcmd {	1151	sub register_extcmd {
1042	my ($name, $cb) = @_;	1152	my ($name, $cb) = @_;
1043		1153
1044	$EXTCMD{$name} = $cb;	1154	$EXTCMD{$name} = $cb;
		1155	}
		1156
		1157	sub register_exticmd {
		1158	my ($name, $cb) = @_;
		1159
		1160	$EXTICMD{$name} = $cb;
1045	}	1161	}
1046		1162
1047	cf::player->attach (	1163	cf::player->attach (
1048	on_command => sub {	1164	on_command => sub {
1049	my ($pl, $name, $params) = @_;	1165	my ($pl, $name, $params) = @_;
…		…
1058	cf::override;	1174	cf::override;
1059	},	1175	},
1060	on_extcmd => sub {	1176	on_extcmd => sub {
1061	my ($pl, $buf) = @_;	1177	my ($pl, $buf) = @_;
1062		1178
1063	my $msg = eval { from_json $buf };	1179	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064		1180
1065	if (ref $msg) {	1181	if (ref $msg) {
		1182	my ($type, $reply, @payload) =
		1183	"ARRAY" eq ref $msg
		1184	? @$msg
		1185	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1186
		1187	my @reply;
		1188
1066	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1189	if (my $cb = $EXTCMD{$type}) {
1067	if (my %reply = $cb->($pl, $msg)) {	1190	@reply = $cb->($pl, @payload);
1068	$pl->ext_reply ($msg->{msgid}, %reply);
1069	}
1070	}	1191	}
		1192
		1193	$pl->ext_reply ($reply, @reply)
		1194	if $reply;
		1195
1071	} else {	1196	} else {
1072	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1197	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073	}	1198	}
1074		1199
1075	cf::override;	1200	cf::override;
…		…
1165		1290
1166	=head3 cf::player	1291	=head3 cf::player
1167		1292
1168	=over 4	1293	=over 4
1169		1294
		1295	=item cf::player::num_playing
		1296
		1297	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1298
		1299	=cut
		1300
		1301	sub num_playing {
		1302	scalar grep
		1303	$_->ob->map
		1304	&& !$_->hidden
		1305	&& !$_->ob->flag (cf::FLAG_WIZ),
		1306	cf::player::list
		1307	}
		1308
1170	=item cf::player::find $login	1309	=item cf::player::find $login
1171		1310
1172	Returns the given player object, loading it if necessary (might block).	1311	Returns the given player object, loading it if necessary (might block).
1173		1312
1174	=cut	1313	=cut
…		…
1209	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1348	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1349	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1350	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212	aio_unlink +(playerdir $login) . "/$login.pl";	1351	aio_unlink +(playerdir $login) . "/$login.pl";
1213		1352
1214	my $pl = load_pl path $login	1353	my $f = new_from_file cf::object::thawer path $login
1215	or return;	1354	or return;
		1355
		1356	my $pl = cf::player::load_pl $f
		1357	or return;
		1358	local $cf::PLAYER_LOADING{$login} = $pl;
		1359	$f->resolve_delayed_derefs;
1216	$cf::PLAYER{$login} = $pl	1360	$cf::PLAYER{$login} = $pl
1217	}	1361	}
1218	}	1362	}
1219	}	1363	}
1220		1364
…		…
1230		1374
1231	aio_mkdir playerdir $pl, 0770;	1375	aio_mkdir playerdir $pl, 0770;
1232	$pl->{last_save} = $cf::RUNTIME;	1376	$pl->{last_save} = $cf::RUNTIME;
1233		1377
1234	$pl->save_pl ($path);	1378	$pl->save_pl ($path);
1235	Coro::cede;	1379	cf::cede_to_tick;
1236	}	1380	}
1237		1381
1238	sub new($) {	1382	sub new($) {
1239	my ($login) = @_;	1383	my ($login) = @_;
1240		1384
…		…
1244	$self->{deny_save} = 1;	1388	$self->{deny_save} = 1;
1245		1389
1246	$cf::PLAYER{$login} = $self;	1390	$cf::PLAYER{$login} = $self;
1247		1391
1248	$self	1392	$self
		1393	}
		1394
		1395	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1396
		1397	=cut
		1398
		1399	sub send_msg {
		1400	my $ns = shift->ns
		1401	or return;
		1402	$ns->send_msg (@_);
1249	}	1403	}
1250		1404
1251	=item $pl->quit_character	1405	=item $pl->quit_character
1252		1406
1253	Nukes the player without looking back. If logged in, the connection will	1407	Nukes the player without looking back. If logged in, the connection will
…		…
1308	or return [];	1462	or return [];
1309		1463
1310	my @logins;	1464	my @logins;
1311		1465
1312	for my $login (@$dirs) {	1466	for my $login (@$dirs) {
		1467	my $path = path $login;
		1468
		1469	# a .pst is a dead give-away for a valid player
		1470	unless (-e "$path.pst") {
1313	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1471	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314	aio_read $fh, 0, 512, my $buf, 0 or next;	1472	aio_read $fh, 0, 512, my $buf, 0 or next;
1315	$buf !~ /^password -------------$/m or next; # official not-valid tag	1473	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1474	}
1316		1475
1317	utf8::decode $login;	1476	utf8::decode $login;
1318	push @logins, $login;	1477	push @logins, $login;
1319	}	1478	}
1320		1479
…		…
1358	sub expand_cfpod {	1517	sub expand_cfpod {
1359	((my $self), (local $_)) = @_;	1518	((my $self), (local $_)) = @_;
1360		1519
1361	# escape & and <	1520	# escape & and <
1362	s/&/&amp;/g;	1521	s/&/&amp;/g;
1363	s/(?<![BIUGH])</&lt;/g;	1522	s/(?<![BIUGHT])</&lt;/g;
1364		1523
1365	# this is buggy, it needs to properly take care of nested <'s	1524	# this is buggy, it needs to properly take care of nested <'s
1366		1525
1367	1 while	1526	1 while
1368	# replace B<>, I<>, U<> etc.	1527	# replace B<>, I<>, U<> etc.
1369	s/B<([^\>]*)>/<b>$1<\/b>/	1528	s/B<([^\>]*)>/<b>$1<\/b>/
1370	|| s/I<([^\>]*)>/<i>$1<\/i>/	1529	|| s/I<([^\>]*)>/<i>$1<\/i>/
1371	|| s/U<([^\>]*)>/<u>$1<\/u>/	1530	|| s/U<([^\>]*)>/<u>$1<\/u>/
		1531	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1372	# replace G<male|female> tags	1532	# replace G<male|female> tags
1373	|| s{G<([^>|]*)\|([^>]*)>}{	1533	|| s{G<([^>|]*)\|([^>]*)>}{
1374	$self->gender ? $2 : $1	1534	$self->gender ? $2 : $1
1375	}ge	1535	}ge
1376	# replace H<hint text>	1536	# replace H<hint text>
1377	|| s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;	1537	|| s{H<([^\>]*)>}
		1538	{
		1539	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1540	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1541	"")
		1542	[$self->{hintmode}]
		1543	}ge;
1378		1544
1379	# create single paragraphs (very hackish)	1545	# create single paragraphs (very hackish)
1380	s/(?<=\S)\n(?=\w)/ /g;	1546	s/(?<=\S)\n(?=\w)/ /g;
1381		1547
		1548	# compress some whitespace
		1549	s/\s+\n/\n/g; # ws line-ends
		1550	s/\n\n+/\n/g; # double lines
		1551	s/^\n+//; # beginning lines
		1552	s/\n+$//; # ending lines
		1553
1382	$_	1554	$_
1383	}	1555	}
1384		1556
		1557	sub hintmode {
		1558	$_[0]{hintmode} = $_[1] if @_ > 1;
		1559	$_[0]{hintmode}
		1560	}
		1561
1385	=item $player->ext_reply ($msgid, %msg)	1562	=item $player->ext_reply ($msgid, @msg)
1386		1563
1387	Sends an ext reply to the player.	1564	Sends an ext reply to the player.
1388		1565
1389	=cut	1566	=cut
1390		1567
1391	sub ext_reply($$%) {	1568	sub ext_reply($$@) {
1392	my ($self, $id, %msg) = @_;	1569	my ($self, $id, @msg) = @_;
1393		1570
1394	$msg{msgid} = $id;	1571	$self->ns->ext_reply ($id, @msg)
1395
1396	$self->send ("ext " . cf::to_json \%msg);
1397	}	1572	}
1398		1573
1399	=item $player->ext_event ($type, %msg)	1574	=item $player->ext_msg ($type, @msg)
1400		1575
1401	Sends an ext event to the client.	1576	Sends an ext event to the client.
1402		1577
1403	=cut	1578	=cut
1404		1579
1405	sub ext_event($$%) {	1580	sub ext_msg($$@) {
1406	my ($self, $type, %msg) = @_;	1581	my ($self, $type, @msg) = @_;
1407		1582
1408	$self->ns->ext_event ($type, %msg);	1583	$self->ns->ext_msg ($type, @msg);
1409	}	1584	}
1410		1585
1411	=head3 cf::region	1586	=head3 cf::region
1412		1587
1413	=over 4	1588	=over 4
…		…
1426	my ($path) = @_;	1601	my ($path) = @_;
1427		1602
1428	my ($match, $specificity);	1603	my ($match, $specificity);
1429		1604
1430	for my $region (list) {	1605	for my $region (list) {
1431	if ($region->match && $path =~ $region->match) {	1606	if ($region->{match} && $path =~ $region->{match}) {
1432	($match, $specificity) = ($region, $region->specificity)	1607	($match, $specificity) = ($region, $region->specificity)
1433	if $region->specificity > $specificity;	1608	if $region->specificity > $specificity;
1434	}	1609	}
1435	}	1610	}
1436		1611
…		…
1556	$self->init; # pass $1 etc.	1731	$self->init; # pass $1 etc.
1557	return $self;	1732	return $self;
1558	}	1733	}
1559	}	1734	}
1560		1735
1561	Carp::carp "unable to resolve path '$path' (base '$base').";	1736	Carp::cluck "unable to resolve path '$path' (base '$base').";
1562	()	1737	()
1563	}	1738	}
1564		1739
1565	sub init {	1740	sub init {
1566	my ($self) = @_;	1741	my ($self) = @_;
…		…
1629		1804
1630	sub load_header_from($) {	1805	sub load_header_from($) {
1631	my ($self, $path) = @_;	1806	my ($self, $path) = @_;
1632		1807
1633	utf8::encode $path;	1808	utf8::encode $path;
1634	#aio_open $path, O_RDONLY, 0	1809	my $f = new_from_file cf::object::thawer $path
1635	# or return;
1636
1637	$self->_load_header ($path)
1638	or return;	1810	or return;
		1811
		1812	$self->_load_header ($f)
		1813	or return;
		1814
		1815	local $MAP_LOADING{$self->{path}} = $self;
		1816	$f->resolve_delayed_derefs;
1639		1817
1640	$self->{load_path} = $path;	1818	$self->{load_path} = $path;
1641		1819
1642	1	1820	1
1643	}	1821	}
…		…
1697	sub find {	1875	sub find {
1698	my ($path, $origin) = @_;	1876	my ($path, $origin) = @_;
1699		1877
1700	$path = normalise $path, $origin && $origin->path;	1878	$path = normalise $path, $origin && $origin->path;
1701		1879
		1880	cf::lock_wait "map_data:$path";#d#remove
1702	cf::lock_wait "map_find:$path";	1881	cf::lock_wait "map_find:$path";
1703		1882
1704	$cf::MAP{$path} || do {	1883	$cf::MAP{$path} || do {
1705	my $guard = cf::lock_acquire "map_find:$path";	1884	my $guard1 = cf::lock_acquire "map_find:$path";
		1885	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1886
1706	my $map = new_from_path cf::map $path	1887	my $map = new_from_path cf::map $path
1707	or return;	1888	or return;
1708		1889
1709	$map->{last_save} = $cf::RUNTIME;	1890	$map->{last_save} = $cf::RUNTIME;
1710		1891
…		…
1712	or return;	1893	or return;
1713		1894
1714	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1895	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1715	# doing this can freeze the server in a sync job, obviously	1896	# doing this can freeze the server in a sync job, obviously
1716	#$cf::WAIT_FOR_TICK->wait;	1897	#$cf::WAIT_FOR_TICK->wait;
		1898	undef $guard1;
		1899	undef $guard2;
1717	$map->reset;	1900	$map->reset;
1718	undef $guard;
1719	return find $path;	1901	return find $path;
1720	}	1902	}
1721		1903
1722	$cf::MAP{$path} = $map	1904	$cf::MAP{$path} = $map
1723	}	1905	}
…		…
1732	local $self->{deny_reset} = 1; # loading can take a long time	1914	local $self->{deny_reset} = 1; # loading can take a long time
1733		1915
1734	my $path = $self->{path};	1916	my $path = $self->{path};
1735		1917
1736	{	1918	{
1737	my $guard = cf::lock_acquire "map_load:$path";	1919	my $guard = cf::lock_acquire "map_data:$path";
1738		1920
		1921	return unless $self->valid;
1739	return if $self->in_memory != cf::MAP_SWAPPED;	1922	return unless $self->in_memory == cf::MAP_SWAPPED;
1740		1923
1741	$self->in_memory (cf::MAP_LOADING);	1924	$self->in_memory (cf::MAP_LOADING);
1742		1925
1743	$self->alloc;	1926	$self->alloc;
1744		1927
1745	$self->pre_load;	1928	$self->pre_load;
1746	Coro::cede;	1929	cf::cede_to_tick;
1747		1930
		1931	my $f = new_from_file cf::object::thawer $self->{load_path};
		1932	$f->skip_block;
1748	$self->_load_objects ($self->{load_path}, 1)	1933	$self->_load_objects ($f)
1749	or return;	1934	or return;
1750		1935
1751	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1936	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1752	if delete $self->{load_original};	1937	if delete $self->{load_original};
1753		1938
1754	if (my $uniq = $self->uniq_path) {	1939	if (my $uniq = $self->uniq_path) {
1755	utf8::encode $uniq;	1940	utf8::encode $uniq;
1756	if (aio_open $uniq, O_RDONLY, 0) {	1941	unless (aio_stat $uniq) {
		1942	if (my $f = new_from_file cf::object::thawer $uniq) {
1757	$self->clear_unique_items;	1943	$self->clear_unique_items;
1758	$self->_load_objects ($uniq, 0);	1944	$self->_load_objects ($f);
		1945	$f->resolve_delayed_derefs;
		1946	}
1759	}	1947	}
1760	}	1948	}
1761		1949
1762	Coro::cede;	1950	$f->resolve_delayed_derefs;
		1951
		1952	cf::cede_to_tick;
1763	# now do the right thing for maps	1953	# now do the right thing for maps
1764	$self->link_multipart_objects;	1954	$self->link_multipart_objects;
1765	$self->difficulty ($self->estimate_difficulty)	1955	$self->difficulty ($self->estimate_difficulty)
1766	unless $self->difficulty;	1956	unless $self->difficulty;
1767	Coro::cede;	1957	cf::cede_to_tick;
1768		1958
1769	unless ($self->{deny_activate}) {	1959	unless ($self->{deny_activate}) {
1770	$self->decay_objects;	1960	$self->decay_objects;
1771	$self->fix_auto_apply;	1961	$self->fix_auto_apply;
1772	$self->update_buttons;	1962	$self->update_buttons;
1773	Coro::cede;	1963	cf::cede_to_tick;
1774	$self->set_darkness_map;	1964	$self->set_darkness_map;
1775	Coro::cede;	1965	cf::cede_to_tick;
1776	$self->activate;	1966	$self->activate;
1777	}	1967	}
		1968
		1969	$self->{last_save} = $cf::RUNTIME;
		1970	$self->last_access ($cf::RUNTIME);
1778		1971
1779	$self->in_memory (cf::MAP_IN_MEMORY);	1972	$self->in_memory (cf::MAP_IN_MEMORY);
1780	}	1973	}
1781		1974
1782	$self->post_load;	1975	$self->post_load;
…		…
1793		1986
1794	$self	1987	$self
1795	}	1988	}
1796		1989
1797	# find and load all maps in the 3x3 area around a map	1990	# find and load all maps in the 3x3 area around a map
1798	sub load_diag {	1991	sub load_neighbours {
1799	my ($map) = @_;	1992	my ($map) = @_;
1800		1993
1801	my @diag; # diagonal neighbours	1994	my @neigh; # diagonal neighbours
1802		1995
1803	for (0 .. 3) {	1996	for (0 .. 3) {
1804	my $neigh = $map->tile_path ($_)	1997	my $neigh = $map->tile_path ($_)
1805	or next;	1998	or next;
1806	$neigh = find $neigh, $map	1999	$neigh = find $neigh, $map
1807	or next;	2000	or next;
1808	$neigh->load;	2001	$neigh->load;
1809		2002
		2003	push @neigh,
1810	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2004	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1811	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2005	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1812	}	2006	}
1813		2007
1814	for (@diag) {	2008	for (grep defined $_->[0], @neigh) {
		2009	my ($path, $origin) = @$_;
1815	my $neigh = find @$_	2010	my $neigh = find $path, $origin
1816	or next;	2011	or next;
1817	$neigh->load;	2012	$neigh->load;
1818	}	2013	}
1819	}	2014	}
1820		2015
…		…
1825	}	2020	}
1826		2021
1827	sub do_load_sync {	2022	sub do_load_sync {
1828	my ($map) = @_;	2023	my ($map) = @_;
1829		2024
		2025	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2026	if $Coro::current == $Coro::main;
		2027
1830	cf::sync_job { $map->load };	2028	cf::sync_job { $map->load };
1831	}	2029	}
1832		2030
1833	our %MAP_PREFETCH;	2031	our %MAP_PREFETCH;
1834	our $MAP_PREFETCHER = undef;	2032	our $MAP_PREFETCHER = undef;
1835		2033
1836	sub find_async {	2034	sub find_async {
1837	my ($path, $origin) = @_;	2035	my ($path, $origin, $load) = @_;
1838		2036
1839	$path = normalise $path, $origin && $origin->{path};	2037	$path = normalise $path, $origin && $origin->{path};
1840		2038
1841	if (my $map = $cf::MAP{$path}) {	2039	if (my $map = $cf::MAP{$path}) {
1842	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2040	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1843	}	2041	}
1844		2042
1845	undef $MAP_PREFETCH{$path};	2043	$MAP_PREFETCH{$path} |= $load;
		2044
1846	$MAP_PREFETCHER ||= cf::async {	2045	$MAP_PREFETCHER ||= cf::async {
		2046	$Coro::current->{desc} = "map prefetcher";
		2047
1847	while (%MAP_PREFETCH) {	2048	while (%MAP_PREFETCH) {
1848	for my $path (keys %MAP_PREFETCH) {	2049	while (my ($k, $v) = each %MAP_PREFETCH) {
1849	my $map = find $path	2050	if (my $map = find $k) {
1850	or next;
1851	$map->load;	2051	$map->load if $v;
		2052	}
1852		2053
1853	delete $MAP_PREFETCH{$path};	2054	delete $MAP_PREFETCH{$k};
1854	}	2055	}
1855	}	2056	}
1856	undef $MAP_PREFETCHER;	2057	undef $MAP_PREFETCHER;
1857	};	2058	};
1858	$MAP_PREFETCHER->prio (6);	2059	$MAP_PREFETCHER->prio (6);
…		…
1861	}	2062	}
1862		2063
1863	sub save {	2064	sub save {
1864	my ($self) = @_;	2065	my ($self) = @_;
1865		2066
1866	my $lock = cf::lock_acquire "map_data:" . $self->path;	2067	my $lock = cf::lock_acquire "map_data:$self->{path}";
1867		2068
1868	$self->{last_save} = $cf::RUNTIME;	2069	$self->{last_save} = $cf::RUNTIME;
1869		2070
1870	return unless $self->dirty;	2071	return unless $self->dirty;
1871		2072
…		…
1877	return if $self->{deny_save};	2078	return if $self->{deny_save};
1878		2079
1879	local $self->{last_access} = $self->last_access;#d#	2080	local $self->{last_access} = $self->last_access;#d#
1880		2081
1881	cf::async {	2082	cf::async {
		2083	$Coro::current->{desc} = "map player save";
1882	$_->contr->save for $self->players;	2084	$_->contr->save for $self->players;
1883	};	2085	};
1884		2086
1885	if ($uniq) {	2087	if ($uniq) {
1886	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2088	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
…		…
1894	my ($self) = @_;	2096	my ($self) = @_;
1895		2097
1896	# save first because save cedes	2098	# save first because save cedes
1897	$self->save;	2099	$self->save;
1898		2100
1899	my $lock = cf::lock_acquire "map_data:" . $self->path;	2101	my $lock = cf::lock_acquire "map_data:$self->{path}";
1900		2102
1901	return if $self->players;	2103	return if $self->players;
1902	return if $self->in_memory != cf::MAP_IN_MEMORY;	2104	return if $self->in_memory != cf::MAP_IN_MEMORY;
1903	return if $self->{deny_save};	2105	return if $self->{deny_save};
1904		2106
		2107	$self->in_memory (cf::MAP_SWAPPED);
		2108
		2109	$self->deactivate;
		2110	$_->clear_links_to ($self) for values %cf::MAP;
1905	$self->clear;	2111	$self->clear;
1906	$self->in_memory (cf::MAP_SWAPPED);
1907	}	2112	}
1908		2113
1909	sub reset_at {	2114	sub reset_at {
1910	my ($self) = @_;	2115	my ($self) = @_;
1911		2116
…		…
1943	if $uniq;	2148	if $uniq;
1944	}	2149	}
1945		2150
1946	delete $cf::MAP{$self->path};	2151	delete $cf::MAP{$self->path};
1947		2152
		2153	$self->deactivate;
		2154	$_->clear_links_to ($self) for values %cf::MAP;
1948	$self->clear;	2155	$self->clear;
1949
1950	$_->clear_links_to ($self) for values %cf::MAP;
1951		2156
1952	$self->unlink_save;	2157	$self->unlink_save;
1953	$self->destroy;	2158	$self->destroy;
1954	}	2159	}
1955		2160
1956	my $nuke_counter = "aaaa";	2161	my $nuke_counter = "aaaa";
1957		2162
1958	sub nuke {	2163	sub nuke {
1959	my ($self) = @_;	2164	my ($self) = @_;
1960		2165
		2166	{
		2167	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2168
1961	delete $cf::MAP{$self->path};	2169	delete $cf::MAP{$self->path};
1962		2170
1963	$self->unlink_save;	2171	$self->unlink_save;
1964		2172
1965	bless $self, "cf::map";	2173	bless $self, "cf::map";
1966	delete $self->{deny_reset};	2174	delete $self->{deny_reset};
1967	$self->{deny_save} = 1;	2175	$self->{deny_save} = 1;
1968	$self->reset_timeout (1);	2176	$self->reset_timeout (1);
1969	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2177	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1970		2178
1971	$cf::MAP{$self->path} = $self;	2179	$cf::MAP{$self->path} = $self;
		2180	}
1972		2181
1973	$self->reset; # polite request, might not happen	2182	$self->reset; # polite request, might not happen
1974	}	2183	}
1975		2184
1976	=item $maps = cf::map::tmp_maps	2185	=item $maps = cf::map::tmp_maps
…		…
2052		2261
2053	sub inv_recursive {	2262	sub inv_recursive {
2054	inv_recursive_ inv $_[0]	2263	inv_recursive_ inv $_[0]
2055	}	2264	}
2056		2265
		2266	=item $ref = $ob->ref
		2267
		2268	creates and returns a persistent reference to an objetc that can be stored as a string.
		2269
		2270	=item $ob = cf::object::deref ($refstring)
		2271
		2272	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2273	even if the object actually exists. May block.
		2274
		2275	=cut
		2276
		2277	sub deref {
		2278	my ($ref) = @_;
		2279
		2280	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2281	my ($uuid, $name) = ($1, $2);
		2282	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2283	or return;
		2284	$pl->ob->uuid eq $uuid
		2285	or return;
		2286
		2287	$pl->ob
		2288	} else {
		2289	warn "$ref: cannot resolve object reference\n";
		2290	undef
		2291	}
		2292	}
		2293
2057	package cf;	2294	package cf;
2058		2295
2059	=back	2296	=back
2060		2297
2061	=head3 cf::object::player	2298	=head3 cf::object::player
…		…
2083		2320
2084	} else {	2321	} else {
2085	my $pl = $self->contr;	2322	my $pl = $self->contr;
2086		2323
2087	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2324	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2088	my $diag = $pl->{npc_dialog};	2325	my $dialog = $pl->{npc_dialog};
2089	$diag->{pl}->ext_reply (	2326	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2090	$diag->{id},
2091	msgtype => "reply",
2092	msg => $diag->{pl}->expand_cfpod ($msg),
2093	add_topics => []
2094	);
2095		2327
2096	} else {	2328	} else {
2097	$msg = $npc->name . " says: $msg" if $npc;	2329	$msg = $npc->name . " says: $msg" if $npc;
2098	$self->message ($msg, $flags);	2330	$self->message ($msg, $flags);
2099	}	2331	}
2100	}	2332	}
		2333	}
		2334
		2335	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2336
		2337	=cut
		2338
		2339	sub cf::object::send_msg {
		2340	my $pl = shift->contr
		2341	or return;
		2342	$pl->send_msg (@_);
2101	}	2343	}
2102		2344
2103	=item $player_object->may ("access")	2345	=item $player_object->may ("access")
2104		2346
2105	Returns wether the given player is authorized to access resource "access"	2347	Returns wether the given player is authorized to access resource "access"
…		…
2184	# use -1 or undef as default coordinates, not 0, 0	2426	# use -1 or undef as default coordinates, not 0, 0
2185	($x, $y) = ($map->enter_x, $map->enter_y)	2427	($x, $y) = ($map->enter_x, $map->enter_y)
2186	if $x <=0 && $y <= 0;	2428	if $x <=0 && $y <= 0;
2187		2429
2188	$map->load;	2430	$map->load;
2189	$map->load_diag;	2431	$map->load_neighbours;
2190		2432
2191	return unless $self->contr->active;	2433	return unless $self->contr->active;
2192	$self->activate_recursive;	2434	$self->activate_recursive;
2193		2435
2194	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2436	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2195	$self->enter_map ($map, $x, $y);	2437	$self->enter_map ($map, $x, $y);
2196	}	2438	}
2197		2439
2198	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2440	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2199		2441
2200	Moves the player to the given map-path and coordinates by first freezing	2442	Moves the player to the given map-path and coordinates by first freezing
2201	her, loading and preparing them map, calling the provided $check callback	2443	her, loading and preparing them map, calling the provided $check callback
2202	that has to return the map if sucecssful, and then unfreezes the player on	2444	that has to return the map if sucecssful, and then unfreezes the player on
2203	the new (success) or old (failed) map position.	2445	the new (success) or old (failed) map position. In either case, $done will
		2446	be called at the end of this process.
2204		2447
2205	=cut	2448	=cut
2206		2449
2207	our $GOTOGEN;	2450	our $GOTOGEN;
2208		2451
2209	sub cf::object::player::goto {	2452	sub cf::object::player::goto {
2210	my ($self, $path, $x, $y, $check) = @_;	2453	my ($self, $path, $x, $y, $check, $done) = @_;
2211		2454
2212	# do generation counting so two concurrent goto's will be executed in-order	2455	# do generation counting so two concurrent goto's will be executed in-order
2213	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2456	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2214		2457
2215	$self->enter_link;	2458	$self->enter_link;
2216		2459
2217	(async {	2460	(async {
		2461	$Coro::current->{desc} = "player::goto $path $x $y";
		2462
		2463	# *tag paths override both path and x|y
		2464	if ($path =~ /^\*(.*)$/) {
		2465	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2466	my $ob = $obs[rand @obs];
		2467
		2468	# see if we actually can go there
		2469	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2470	$ob = $obs[rand @obs];
		2471	} else {
		2472	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2473	}
		2474	# else put us there anyways for now #d#
		2475
		2476	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2477	} else {
		2478	($path, $x, $y) = (undef, undef, undef);
		2479	}
		2480	}
		2481
2218	my $map = eval {	2482	my $map = eval {
2219	my $map = cf::map::find $path;	2483	my $map = defined $path ? cf::map::find $path : undef;
2220		2484
2221	if ($map) {	2485	if ($map) {
2222	$map = $map->customise_for ($self);	2486	$map = $map->customise_for ($self);
2223	$map = $check->($map) if $check && $map;	2487	$map = $check->($map) if $check && $map;
2224	} else {	2488	} else {
2225	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2489	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2226	}	2490	}
2227		2491
2228	$map	2492	$map
2229	};	2493	};
2230		2494
…		…
2235		2499
2236	if ($gen == $self->{_goto_generation}) {	2500	if ($gen == $self->{_goto_generation}) {
2237	delete $self->{_goto_generation};	2501	delete $self->{_goto_generation};
2238	$self->leave_link ($map, $x, $y);	2502	$self->leave_link ($map, $x, $y);
2239	}	2503	}
		2504
		2505	$done->() if $done;
2240	})->prio (1);	2506	})->prio (1);
2241	}	2507	}
2242		2508
2243	=item $player_object->enter_exit ($exit_object)	2509	=item $player_object->enter_exit ($exit_object)
2244		2510
…		…
2313	my $hp = $exit->stats->hp;	2579	my $hp = $exit->stats->hp;
2314	my $sp = $exit->stats->sp;	2580	my $sp = $exit->stats->sp;
2315		2581
2316	$self->enter_link;	2582	$self->enter_link;
2317		2583
		2584	# if exit is damned, update players death & WoR home-position
		2585	$self->contr->savebed ($slaying, $hp, $sp)
		2586	if $exit->flag (FLAG_DAMNED);
		2587
2318	(async {	2588	(async {
		2589	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2590
2319	$self->deactivate_recursive; # just to be sure	2591	$self->deactivate_recursive; # just to be sure
2320	unless (eval {	2592	unless (eval {
2321	$self->goto ($slaying, $hp, $sp);	2593	$self->goto ($slaying, $hp, $sp);
2322		2594
2323	1;	2595	1;
…		…
2349		2621
2350	utf8::encode $text;	2622	utf8::encode $text;
2351	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2623	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2352	}	2624	}
2353		2625
2354	=item $client->send_msg ($color, $type, $msg, [extra...])	2626	=item $client->send_msg ($channel, $msg, $color, [extra...])
2355		2627
2356	Send a drawinfo or msg packet to the client, formatting the msg for the	2628	Send a drawinfo or msg packet to the client, formatting the msg for the
2357	client if neccessary. C<$type> should be a string identifying the type of	2629	client if neccessary. C<$type> should be a string identifying the type of
2358	the message, with C<log> being the default. If C<$color> is negative, suppress	2630	the message, with C<log> being the default. If C<$color> is negative, suppress
2359	the message unless the client supports the msg packet.	2631	the message unless the client supports the msg packet.
2360		2632
2361	=cut	2633	=cut
2362		2634
		2635	our %CHANNEL = (
		2636	"c/identify" => {
		2637	id => "infobox",
		2638	title => "Identify",
		2639	reply => undef,
		2640	tooltip => "Items recently identified",
		2641	},
		2642	"c/examine" => {
		2643	id => "infobox",
		2644	title => "Examine",
		2645	reply => undef,
		2646	tooltip => "Signs and other items you examined",
		2647	},
		2648	"c/lookat" => {
		2649	id => "infobox",
		2650	title => "Look",
		2651	reply => undef,
		2652	tooltip => "What you saw there",
		2653	},
		2654	);
		2655
2363	sub cf::client::send_msg {	2656	sub cf::client::send_msg {
2364	my ($self, $color, $type, $msg, @extra) = @_;	2657	my ($self, $channel, $msg, $color, @extra) = @_;
2365		2658
2366	$msg = $self->pl->expand_cfpod ($msg);	2659	$msg = $self->pl->expand_cfpod ($msg);
2367		2660
		2661	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2662
		2663	# check predefined channels, for the benefit of C
		2664	if ($CHANNEL{$channel}) {
		2665	$channel = $CHANNEL{$channel};
		2666
		2667	$self->ext_msg (channel_info => $channel)
		2668	if $self->can_msg;
		2669
		2670	$channel = $channel->{id};
		2671
		2672	} elsif (ref $channel) {
		2673	# send meta info to client, if not yet sent
		2674	unless (exists $self->{channel}{$channel->{id}}) {
		2675	$self->{channel}{$channel->{id}} = $channel;
		2676	$self->ext_msg (channel_info => $channel)
		2677	if $self->can_msg;
		2678	}
		2679
		2680	$channel = $channel->{id};
		2681	}
		2682
		2683	return unless @extra || length $msg;
		2684
2368	if ($self->can_msg) {	2685	if ($self->can_msg) {
2369	$self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);	2686	# default colour, mask it out
		2687	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2688	if $color & cf::NDI_DEF;
		2689
		2690	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2691	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2370	} else {	2692	} else {
2371	# replace some tags by gcfclient-compatible ones
2372	for ($msg) {
2373	1 while
2374	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2379	}
2380
2381	if ($color >= 0) {	2693	if ($color >= 0) {
		2694	# replace some tags by gcfclient-compatible ones
		2695	for ($msg) {
		2696	1 while
		2697	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2698	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2699	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2700	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2701	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2702	}
		2703
		2704	$color &= cf::NDI_COLOR_MASK;
		2705
		2706	utf8::encode $msg;
		2707
2382	if (0 && $msg =~ /\[/) {	2708	if (0 && $msg =~ /\[/) {
		2709	# COMMAND/INFO
2383	$self->send_packet ("drawextinfo $color 4 0 $msg")	2710	$self->send_packet ("drawextinfo $color 10 8 $msg")
2384	} else {	2711	} else {
2385	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;	2712	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2386	$self->send_packet ("drawinfo $color $msg")	2713	$self->send_packet ("drawinfo $color $msg")
2387	}	2714	}
2388	}	2715	}
2389	}	2716	}
2390	}	2717	}
2391		2718
2392	=item $client->ext_event ($type, %msg)	2719	=item $client->ext_msg ($type, @msg)
2393		2720
2394	Sends an exti event to the client.	2721	Sends an ext event to the client.
2395		2722
2396	=cut	2723	=cut
2397		2724
2398	sub cf::client::ext_event($$%) {	2725	sub cf::client::ext_msg($$@) {
2399	my ($self, $type, %msg) = @_;	2726	my ($self, $type, @msg) = @_;
2400		2727
		2728	if ($self->extcmd == 2) {
		2729	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2730	} elsif ($self->extcmd == 1) { # TODO: remove
2401	$msg{msgtype} = "event_$type";	2731	push @msg, msgtype => "event_$type";
2402	$self->send_packet ("ext " . cf::to_json \%msg);	2732	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2733	}
		2734	}
		2735
		2736	=item $client->ext_reply ($msgid, @msg)
		2737
		2738	Sends an ext reply to the client.
		2739
		2740	=cut
		2741
		2742	sub cf::client::ext_reply($$@) {
		2743	my ($self, $id, @msg) = @_;
		2744
		2745	if ($self->extcmd == 2) {
		2746	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2747	} elsif ($self->extcmd == 1) {
		2748	#TODO: version 1, remove
		2749	unshift @msg, msgtype => "reply", msgid => $id;
		2750	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2751	}
2403	}	2752	}
2404		2753
2405	=item $success = $client->query ($flags, "text", \&cb)	2754	=item $success = $client->query ($flags, "text", \&cb)
2406		2755
2407	Queues a query to the client, calling the given callback with	2756	Queues a query to the client, calling the given callback with
2408	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2757	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2409	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.	2758	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2410		2759
2411	Queries can fail, so check the return code. Or don't, as queries will become	2760	Queries can fail, so check the return code. Or don't, as queries will
2412	reliable at some point in the future.	2761	become reliable at some point in the future.
2413		2762
2414	=cut	2763	=cut
2415		2764
2416	sub cf::client::query {	2765	sub cf::client::query {
2417	my ($self, $flags, $text, $cb) = @_;	2766	my ($self, $flags, $text, $cb) = @_;
…		…
2425	utf8::encode $text;	2774	utf8::encode $text;
2426	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];	2775	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2427		2776
2428	$self->send_packet ($self->{query_queue}[0][0])	2777	$self->send_packet ($self->{query_queue}[0][0])
2429	if @{ $self->{query_queue} } == 1;	2778	if @{ $self->{query_queue} } == 1;
		2779
		2780	1
2430	}	2781	}
2431		2782
2432	cf::client->attach (	2783	cf::client->attach (
		2784	on_connect => sub {
		2785	my ($ns) = @_;
		2786
		2787	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2788	},
2433	on_reply => sub {	2789	on_reply => sub {
2434	my ($ns, $msg) = @_;	2790	my ($ns, $msg) = @_;
2435		2791
2436	# this weird shuffling is so that direct followup queries	2792	# this weird shuffling is so that direct followup queries
2437	# get handled first	2793	# get handled first
…		…
2449	} else {	2805	} else {
2450	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;	2806	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2451	}	2807	}
2452	}	2808	}
2453	},	2809	},
		2810	on_exticmd => sub {
		2811	my ($ns, $buf) = @_;
		2812
		2813	my $msg = eval { $ns->{json_coder}->decode ($buf) };
		2814
		2815	if (ref $msg) {
		2816	my ($type, $reply, @payload) =
		2817	"ARRAY" eq ref $msg
		2818	? @$msg
		2819	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2820
		2821	my @reply;
		2822
		2823	if (my $cb = $EXTICMD{$type}) {
		2824	@reply = $cb->($ns, @payload);
		2825	}
		2826
		2827	$ns->ext_reply ($reply, @reply)
		2828	if $reply;
		2829
		2830	} else {
		2831	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
		2832	}
		2833
		2834	cf::override;
		2835	},
2454	);	2836	);
2455		2837
2456	=item $client->async (\&cb)	2838	=item $client->async (\&cb)
2457		2839
2458	Create a new coroutine, running the specified callback. The coroutine will	2840	Create a new coroutine, running the specified callback. The coroutine will
…		…
2499	our $safe = new Safe "safe";	2881	our $safe = new Safe "safe";
2500	our $safe_hole = new Safe::Hole;	2882	our $safe_hole = new Safe::Hole;
2501		2883
2502	$SIG{FPE} = 'IGNORE';	2884	$SIG{FPE} = 'IGNORE';
2503		2885
2504	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2886	$safe->permit_only (Opcode::opset qw(
		2887	:base_core :base_mem :base_orig :base_math
		2888	grepstart grepwhile mapstart mapwhile
		2889	sort time
		2890	));
2505		2891
2506	# here we export the classes and methods available to script code	2892	# here we export the classes and methods available to script code
2507		2893
2508	=pod	2894	=pod
2509		2895
2510	The following functions and methods are available within a safe environment:	2896	The following functions and methods are available within a safe environment:
2511		2897
2512	cf::object contr pay_amount pay_player map	2898	cf::object
		2899	contr pay_amount pay_player map x y force_find force_add
		2900	insert remove name archname title slaying race decrease_ob_nr
		2901
2513	cf::object::player player	2902	cf::object::player
2514	cf::player peaceful	2903	player
2515	cf::map trigger	2904
		2905	cf::player
		2906	peaceful
		2907
		2908	cf::map
		2909	trigger
2516		2910
2517	=cut	2911	=cut
2518		2912
2519	for (	2913	for (
2520	["cf::object" => qw(contr pay_amount pay_player map)],	2914	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2915	insert remove inv name archname title slaying race
		2916	decrease_ob_nr)],
2521	["cf::object::player" => qw(player)],	2917	["cf::object::player" => qw(player)],
2522	["cf::player" => qw(peaceful)],	2918	["cf::player" => qw(peaceful)],
2523	["cf::map" => qw(trigger)],	2919	["cf::map" => qw(trigger)],
2524	) {	2920	) {
2525	no strict 'refs';	2921	no strict 'refs';
…		…
2601	# the server's init and main functions	2997	# the server's init and main functions
2602		2998
2603	sub load_facedata($) {	2999	sub load_facedata($) {
2604	my ($path) = @_;	3000	my ($path) = @_;
2605		3001
		3002	# HACK to clear player env face cache, we need some signal framework
		3003	# for this (global event?)
		3004	%ext::player_env::MUSIC_FACE_CACHE = ();
		3005
		3006	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3007
2606	warn "loading facedata from $path\n";	3008	warn "loading facedata from $path\n";
2607		3009
2608	my $facedata;	3010	my $facedata;
2609	0 < aio_load $path, $facedata	3011	0 < aio_load $path, $facedata
2610	or die "$path: $!";	3012	or die "$path: $!";
…		…
2612	$facedata = Coro::Storable::thaw $facedata;	3014	$facedata = Coro::Storable::thaw $facedata;
2613		3015
2614	$facedata->{version} == 2	3016	$facedata->{version} == 2
2615	or cf::cleanup "$path: version mismatch, cannot proceed.";	3017	or cf::cleanup "$path: version mismatch, cannot proceed.";
2616		3018
		3019	# patch in the exptable
		3020	$facedata->{resource}{"res/exp_table"} = {
		3021	type => FT_RSRC,
		3022	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3023	};
		3024	cf::cede_to_tick;
		3025
2617	{	3026	{
2618	my $faces = $facedata->{faceinfo};	3027	my $faces = $facedata->{faceinfo};
2619		3028
2620	while (my ($face, $info) = each %$faces) {	3029	while (my ($face, $info) = each %$faces) {
2621	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3030	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2622	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3031	cf::face::set_visibility $idx, $info->{visibility};
		3032	cf::face::set_magicmap $idx, $info->{magicmap};
2623	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3033	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2624	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3034	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2625	Coro::cede;	3035
		3036	cf::cede_to_tick;
2626	}	3037	}
2627		3038
2628	while (my ($face, $info) = each %$faces) {	3039	while (my ($face, $info) = each %$faces) {
2629	next unless $info->{smooth};	3040	next unless $info->{smooth};
2630	my $idx = cf::face::find $face	3041	my $idx = cf::face::find $face
2631	or next;	3042	or next;
2632	if (my $smooth = cf::face::find $info->{smooth}) {	3043	if (my $smooth = cf::face::find $info->{smooth}) {
		3044	cf::face::set_smooth $idx, $smooth;
2633	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3045	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2634	} else {	3046	} else {
2635	warn "smooth face '$info->{smooth}' not found for face '$face'";	3047	warn "smooth face '$info->{smooth}' not found for face '$face'";
2636	}	3048	}
2637	Coro::cede;	3049
		3050	cf::cede_to_tick;
2638	}	3051	}
2639	}	3052	}
2640		3053
2641	{	3054	{
2642	my $anims = $facedata->{animinfo};	3055	my $anims = $facedata->{animinfo};
2643		3056
2644	while (my ($anim, $info) = each %$anims) {	3057	while (my ($anim, $info) = each %$anims) {
2645	cf::anim::set $anim, $info->{frames}, $info->{facings};	3058	cf::anim::set $anim, $info->{frames}, $info->{facings};
2646	Coro::cede;	3059	cf::cede_to_tick;
2647	}	3060	}
2648		3061
2649	cf::anim::invalidate_all; # d'oh	3062	cf::anim::invalidate_all; # d'oh
2650	}	3063	}
2651		3064
		3065	{
		3066	# TODO: for gcfclient pleasure, we should give resources
		3067	# that gcfclient doesn't grok a >10000 face index.
		3068	my $res = $facedata->{resource};
		3069
		3070	my $soundconf = delete $res->{"res/sound.conf"};
		3071
		3072	while (my ($name, $info) = each %$res) {
		3073	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3074	my $data;
		3075
		3076	if ($info->{type} & 1) {
		3077	# prepend meta info
		3078
		3079	my $meta = $enc->encode ({
		3080	name => $name,
		3081	%{ $info->{meta} || {} },
		3082	});
		3083
		3084	$data = pack "(w/a*)*", $meta, $info->{data};
		3085	} else {
		3086	$data = $info->{data};
		3087	}
		3088
		3089	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3090	cf::face::set_type $idx, $info->{type};
		3091
		3092	cf::cede_to_tick;
		3093	}
		3094
		3095	if ($soundconf) {
		3096	$soundconf = $enc->decode (delete $soundconf->{data});
		3097
		3098	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3099	my $sound = $soundconf->{compat}[$_]
		3100	or next;
		3101
		3102	my $face = cf::face::find "sound/$sound->[1]";
		3103	cf::sound::set $sound->[0] => $face;
		3104	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3105	}
		3106
		3107	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3108	my $face = cf::face::find "sound/$v";
		3109	cf::sound::set $k => $face;
		3110	}
		3111	}
		3112	}
		3113
2652	1	3114	1
2653	}	3115	}
2654		3116
		3117	register_exticmd fx_want => sub {
		3118	my ($ns, $want) = @_;
		3119
		3120	while (my ($k, $v) = each %$want) {
		3121	$ns->fx_want ($k, $v);
		3122	}
		3123	};
		3124
2655	sub reload_regions {	3125	sub reload_regions {
		3126	# HACK to clear player env face cache, we need some signal framework
		3127	# for this (global event?)
		3128	%ext::player_env::MUSIC_FACE_CACHE = ();
		3129
2656	load_resource_file "$MAPDIR/regions"	3130	load_resource_file "$MAPDIR/regions"
2657	or die "unable to load regions file\n";	3131	or die "unable to load regions file\n";
		3132
		3133	for (cf::region::list) {
		3134	$_->{match} = qr/$_->{match}/
		3135	if exists $_->{match};
		3136	}
2658	}	3137	}
2659		3138
2660	sub reload_facedata {	3139	sub reload_facedata {
2661	load_facedata "$DATADIR/facedata"	3140	load_facedata "$DATADIR/facedata"
2662	or die "unable to load facedata\n";	3141	or die "unable to load facedata\n";
2663	}	3142	}
2664		3143
2665	sub reload_archetypes {	3144	sub reload_archetypes {
		3145	load_resource_file "$DATADIR/archetypes"
		3146	or die "unable to load archetypes\n";
		3147	#d# NEED to laod twice to resolve forward references
		3148	# this really needs to be done in an extra post-pass
		3149	# (which needs to be synchronous, so solve it differently)
2666	load_resource_file "$DATADIR/archetypes"	3150	load_resource_file "$DATADIR/archetypes"
2667	or die "unable to load archetypes\n";	3151	or die "unable to load archetypes\n";
2668	}	3152	}
2669		3153
2670	sub reload_treasures {	3154	sub reload_treasures {
…		…
2686		3170
2687	sub init {	3171	sub init {
2688	reload_resources;	3172	reload_resources;
2689	}	3173	}
2690		3174
2691	sub cfg_load {	3175	sub reload_config {
2692	open my $fh, "<:utf8", "$CONFDIR/config"	3176	open my $fh, "<:utf8", "$CONFDIR/config"
2693	or return;	3177	or return;
2694		3178
2695	local $/;	3179	local $/;
2696	*CFG = YAML::Syck::Load <$fh>;	3180	*CFG = YAML::Syck::Load <$fh>;
…		…
2712	sub main {	3196	sub main {
2713	# we must not ever block the main coroutine	3197	# we must not ever block the main coroutine
2714	local $Coro::idle = sub {	3198	local $Coro::idle = sub {
2715	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3199	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2716	(async {	3200	(async {
		3201	$Coro::current->{desc} = "IDLE BUG HANDLER";
2717	Event::one_event;	3202	Event::one_event;
2718	})->prio (Coro::PRIO_MAX);	3203	})->prio (Coro::PRIO_MAX);
2719	};	3204	};
2720		3205
2721	cfg_load;	3206	reload_config;
2722	db_init;	3207	db_init;
2723	load_extensions;	3208	load_extensions;
2724		3209
2725	$TICK_WATCHER->start;	3210	$TICK_WATCHER->start;
2726	Event::loop;	3211	Event::loop;
…		…
2864	%EXT_CORO = ();	3349	%EXT_CORO = ();
2865		3350
2866	warn "removing commands";	3351	warn "removing commands";
2867	%COMMAND = ();	3352	%COMMAND = ();
2868		3353
2869	warn "removing ext commands";	3354	warn "removing ext/exti commands";
2870	%EXTCMD = ();	3355	%EXTCMD = ();
		3356	%EXTICMD = ();
2871		3357
2872	warn "unloading/nuking all extensions";	3358	warn "unloading/nuking all extensions";
2873	for my $pkg (@EXTS) {	3359	for my $pkg (@EXTS) {
2874	warn "... unloading $pkg";	3360	warn "... unloading $pkg";
2875		3361
…		…
2918	warn "reloading cf.pm";	3404	warn "reloading cf.pm";
2919	require cf;	3405	require cf;
2920	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3406	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2921		3407
2922	warn "loading config and database again";	3408	warn "loading config and database again";
2923	cf::cfg_load;	3409	cf::reload_config;
2924		3410
2925	warn "loading extensions";	3411	warn "loading extensions";
2926	cf::load_extensions;	3412	cf::load_extensions;
2927		3413
2928	warn "reattaching attachments to objects/players";	3414	warn "reattaching attachments to objects/players";
…		…
2964	register_command "reload" => sub {	3450	register_command "reload" => sub {
2965	my ($who, $arg) = @_;	3451	my ($who, $arg) = @_;
2966		3452
2967	if ($who->flag (FLAG_WIZ)) {	3453	if ($who->flag (FLAG_WIZ)) {
2968	$who->message ("reloading server.");	3454	$who->message ("reloading server.");
		3455	async {
		3456	$Coro::current->{desc} = "perl_reload";
2969	async { reload_perl };	3457	reload_perl;
		3458	};
2970	}	3459	}
2971	};	3460	};
2972		3461
2973	unshift @INC, $LIBDIR;	3462	unshift @INC, $LIBDIR;
2974		3463
…		…
2993	my $signal = new Coro::Signal;	3482	my $signal = new Coro::Signal;
2994	push @WAIT_FOR_TICK_BEGIN, $signal;	3483	push @WAIT_FOR_TICK_BEGIN, $signal;
2995	$signal->wait;	3484	$signal->wait;
2996	}	3485	}
2997		3486
2998	my $min = 1e6;#d#
2999	my $avg = 10;
3000	$TICK_WATCHER = Event->timer (	3487	$TICK_WATCHER = Event->timer (
3001	reentrant => 0,	3488	reentrant => 0,
3002	parked => 1,	3489	parked => 1,
3003	prio => 0,	3490	prio => 0,
3004	at => $NEXT_TICK || $TICK,	3491	at => $NEXT_TICK || $TICK,
…		…
3012		3499
3013	$NOW = $tick_start = Event::time;	3500	$NOW = $tick_start = Event::time;
3014		3501
3015	cf::server_tick; # one server iteration	3502	cf::server_tick; # one server iteration
3016		3503
3017	0 && sync_job {#d#
3018	for(1..10) {
3019	my $t = Event::time;
3020	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3021	or die;
3022
3023	$map->width (50);
3024	$map->height (50);
3025	$map->alloc;
3026	$map->_load_objects ("/tmp/x.map", 1);
3027	my $t = Event::time - $t;
3028
3029	#next unless $t < 0.0013;#d#
3030	if ($t < $min) {
3031	$min = $t;
3032	}
3033	$avg = $avg * 0.99 + $t * 0.01;
3034	}
3035	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3036	exit 0;
3037	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3038	};
3039
3040	$RUNTIME += $TICK;	3504	$RUNTIME += $TICK;
3041	$NEXT_TICK += $TICK;	3505	$NEXT_TICK += $TICK;
3042		3506
3043	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3507	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3044	$NEXT_RUNTIME_WRITE = $NOW + 10;	3508	$NEXT_RUNTIME_WRITE = $NOW + 10;
3045	Coro::async_pool {	3509	Coro::async_pool {
		3510	$Coro::current->{desc} = "runtime saver";
3046	write_runtime	3511	write_runtime
3047	or warn "ERROR: unable to write runtime file: $!";	3512	or warn "ERROR: unable to write runtime file: $!";
3048	};	3513	};
3049	}	3514	}
3050		3515
3051	# my $AFTER = Event::time;
3052	# warn $AFTER - $NOW;#d#
3053
3054	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3516	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3055	$sig->send;	3517	$sig->send;
3056	}	3518	}
3057	while (my $sig = shift @WAIT_FOR_TICK) {	3519	while (my $sig = shift @WAIT_FOR_TICK) {
3058	$sig->send;	3520	$sig->send;
…		…
3068		3530
3069	$LOAD = ($NOW - $tick_start) / $TICK;	3531	$LOAD = ($NOW - $tick_start) / $TICK;
3070	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3532	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3071		3533
3072	_post_tick;	3534	_post_tick;
3073
3074
3075	},	3535	},
3076	);	3536	);
3077		3537
3078	{	3538	{
		3539	BDB::min_parallel 8;
3079	BDB::max_poll_time $TICK * 0.1;	3540	BDB::max_poll_time $TICK * 0.1;
3080	$BDB_POLL_WATCHER = Event->io (	3541	$BDB_POLL_WATCHER = Event->io (
3081	reentrant => 0,	3542	reentrant => 0,
3082	fd => BDB::poll_fileno,	3543	fd => BDB::poll_fileno,
3083	poll => 'r',	3544	poll => 'r',
3084	prio => 0,	3545	prio => 0,
3085	data => WF_AUTOCANCEL,	3546	data => WF_AUTOCANCEL,
3086	cb => \&BDB::poll_cb,	3547	cb => \&BDB::poll_cb,
3087	);	3548	);
3088	BDB::min_parallel 8;
3089		3549
3090	BDB::set_sync_prepare {	3550	BDB::set_sync_prepare {
3091	my $status;	3551	my $status;
3092	my $current = $Coro::current;	3552	my $current = $Coro::current;
3093	(	3553	(
…		…
3102	)	3562	)
3103	};	3563	};
3104		3564
3105	unless ($DB_ENV) {	3565	unless ($DB_ENV) {
3106	$DB_ENV = BDB::db_env_create;	3566	$DB_ENV = BDB::db_env_create;
		3567	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3568	| BDB::LOG_AUTOREMOVE, 1);
		3569	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3570	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3107		3571
3108	cf::sync_job {	3572	cf::sync_job {
3109	eval {	3573	eval {
3110	BDB::db_env_open	3574	BDB::db_env_open
3111	$DB_ENV,	3575	$DB_ENV,
…		…
3113	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3577	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3114	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3578	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3115	0666;	3579	0666;
3116		3580
3117	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3581	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3118
3119	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3120	$DB_ENV->set_lk_detect;
3121	};	3582	};
3122		3583
3123	cf::cleanup "db_env_open(db): $@" if $@;	3584	cf::cleanup "db_env_open(db): $@" if $@;
3124	};	3585	};
3125	}	3586	}
		3587
		3588	$BDB_DEADLOCK_WATCHER = Event->timer (
		3589	after => 3,
		3590	interval => 1,
		3591	hard => 1,
		3592	prio => 0,
		3593	data => WF_AUTOCANCEL,
		3594	cb => sub {
		3595	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3596	},
		3597	);
		3598	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3599	after => 11,
		3600	interval => 60,
		3601	hard => 1,
		3602	prio => 0,
		3603	data => WF_AUTOCANCEL,
		3604	cb => sub {
		3605	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3606	},
		3607	);
		3608	$BDB_TRICKLE_WATCHER = Event->timer (
		3609	after => 5,
		3610	interval => 10,
		3611	hard => 1,
		3612	prio => 0,
		3613	data => WF_AUTOCANCEL,
		3614	cb => sub {
		3615	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3616	},
		3617	);
3126	}	3618	}
3127		3619
3128	{	3620	{
3129	IO::AIO::min_parallel 8;	3621	IO::AIO::min_parallel 8;
3130		3622
…		…
3133	$AIO_POLL_WATCHER = Event->io (	3625	$AIO_POLL_WATCHER = Event->io (
3134	reentrant => 0,	3626	reentrant => 0,
3135	data => WF_AUTOCANCEL,	3627	data => WF_AUTOCANCEL,
3136	fd => IO::AIO::poll_fileno,	3628	fd => IO::AIO::poll_fileno,
3137	poll => 'r',	3629	poll => 'r',
3138	prio => 6,	3630	prio => 0,
3139	cb => \&IO::AIO::poll_cb,	3631	cb => \&IO::AIO::poll_cb,
3140	);	3632	);
3141	}	3633	}
3142		3634
3143	my $_log_backtrace;	3635	my $_log_backtrace;
…		…
3149		3641
3150	# limit the # of concurrent backtraces	3642	# limit the # of concurrent backtraces
3151	if ($_log_backtrace < 2) {	3643	if ($_log_backtrace < 2) {
3152	++$_log_backtrace;	3644	++$_log_backtrace;
3153	async {	3645	async {
		3646	$Coro::current->{desc} = "abt $msg";
		3647
3154	my @bt = fork_call {	3648	my @bt = fork_call {
3155	@addr = map { sprintf "%x", $_ } @addr;	3649	@addr = map { sprintf "%x", $_ } @addr;
3156	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3650	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3157	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"	3651	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3158	or die "addr2line: $!";	3652	or die "addr2line: $!";

Diff Legend

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